@pkmn/engine 0.1.0-dev.729b1e87 → 0.1.0-dev.7679dad9

package/src/lib/gen1/mechanics.zig

@@ -56,30 +56,34 @@ const BOOSTS = &[_][2]u8{
 
 const MAX_STAT_VALUE = 999;
 
+const DISTRIBUTION = [_]u3{ 2, 2, 2, 3, 3, 3, 4, 5 };
+
 pub fn update(battle: anytype, c1: Choice, c2: Choice, log: anytype) !Result {
     assert(c1.type != .Pass or c2.type != .Pass or battle.turn == 0);
     if (battle.turn == 0) return start(battle, log);
 
+    var s1 = false;
+    var s2 = false;
     var f1: ?Move = null;
     var f2: ?Move = null;
 
-    if (selectMove(battle, .P1, c1, c2, &f1)) |r| return r;
-    if (selectMove(battle, .P2, c2, c1, &f2)) |r| return r;
+    if (selectMove(battle, .P1, c1, c2, &s1, &f1)) |r| return r;
+    if (selectMove(battle, .P2, c2, c1, &s2, &f2)) |r| return r;
+
+    var p1 = battle.side(.P1);
+    var p2 = battle.side(.P2);
+
+    var r1 = showdown and p1.active.volatiles.Binding and c2.type == .Switch;
+    var r2 = showdown and p2.active.volatiles.Binding and c1.type == .Switch;
 
     if (turnOrder(battle, c1, c2) == .P1) {
-        if (try doTurn(battle, .P1, c1, f1, .P2, c2, f2, log)) |r| return r;
+        if (try doTurn(battle, .P1, c1, r1, s1, f1, .P2, c2, r2, s2, f2, log)) |r| return r;
     } else {
-        if (try doTurn(battle, .P2, c2, f2, .P1, c1, f1, log)) |r| return r;
+        if (try doTurn(battle, .P2, c2, r2, s2, f2, .P1, c1, r1, s1, f1, log)) |r| return r;
     }
 
-    var p1 = battle.side(.P1);
-    if (p1.active.volatiles.attacks == 0) {
-        p1.active.volatiles.Binding = false;
-    }
-    var p2 = battle.side(.P2);
-    if (p2.active.volatiles.attacks == 0) {
-        p2.active.volatiles.Binding = false;
-    }
+    if (p1.active.volatiles.attacks == 0) p1.active.volatiles.Binding = false;
+    if (p2.active.volatiles.attacks == 0) p2.active.volatiles.Binding = false;
 
     return endTurn(battle, log);
 }
@@ -112,6 +116,7 @@ fn selectMove(
     player: Player,
     choice: Choice,
     foe_choice: Choice,
+    skip_turn: *bool,
     from: *?Move,
 ) ?Result {
     if (choice.type == .Pass) return null;
@@ -124,17 +129,26 @@ fn selectMove(
         (choice.type == .Move and choice.data == @boolToInt(showdown)));
 
     // pre-battle menu
-    if (volatiles.Recharging) return null;
+    if (volatiles.Recharging) {
+        if (showdown and battle.foe(player).active.volatiles.Binding) skip_turn.* = true;
+        return null;
+    }
     if (volatiles.Rage) {
         from.* = side.last_used_move;
-        if (showdown) saveMove(battle, player, null);
+        if (showdown) {
+            if (battle.foe(player).active.volatiles.Binding) skip_turn.* = true;
+            saveMove(battle, player, null);
+        }
         return null;
     }
     // Pokémon Showdown removes Flinch at the end-of-turn in its residual handler
     if (!showdown) volatiles.Flinch = false;
     if (volatiles.Thrashing or volatiles.Charging) {
         from.* = side.last_selected_move;
-        if (showdown) saveMove(battle, player, null);
+        if (showdown) {
+            if (battle.foe(player).active.volatiles.Binding) skip_turn.* = true;
+            saveMove(battle, player, null);
+        }
         return null;
     }
 
@@ -144,7 +158,10 @@ fn selectMove(
     // pre-move select
     if (Status.is(stored.status, .FRZ) or Status.is(stored.status, .SLP) or volatiles.Bide) {
         assert(showdown or choice.data == 0);
-        if (showdown) saveMove(battle, player, choice);
+        if (showdown) {
+            if (volatiles.Bide and battle.foe(player).active.volatiles.Binding) skip_turn.* = true;
+            saveMove(battle, player, choice);
+        }
         return null;
     }
     if (volatiles.Binding) {
@@ -163,9 +180,9 @@ fn selectMove(
             // GLITCH: https://glitchcity.wiki/Partial_trapping_move_Mirror_Move_link_battle_glitch
             if (foe_choice.type == .Switch) {
                 const slot = if (player == .P1)
-                    battle.last_selected_indexes.p1
+                    battle.last_moves.p1_index
                 else
-                    battle.last_selected_indexes.p2;
+                    battle.last_moves.p2_index;
                 const last = side.active.move(@intCast(u4, slot));
                 if (last.id == .Metronome) side.last_selected_move = last.id;
                 if (last.id == .MirrorMove) return Result.Error;
@@ -175,6 +192,7 @@ fn selectMove(
     }
 
     if (battle.foe(player).active.volatiles.Binding) {
+        skip_turn.* = true;
         if (showdown) {
             saveMove(battle, player, choice);
         } else {
@@ -185,6 +203,7 @@ fn selectMove(
     }
 
     // move select
+    volatiles.state = 0;
     if (choice.data == 0) {
         const struggle = ok: {
             for (side.active.moves, 0..) |move, i| {
@@ -218,9 +237,9 @@ fn saveMove(battle: anytype, player: Player, choice: ?Choice) void {
 
             side.last_selected_move = move.id;
             if (player == .P1) {
-                battle.last_selected_indexes.p1 = @intCast(u4, c.data);
+                battle.last_moves.p1_index = @intCast(u3, c.data);
             } else {
-                battle.last_selected_indexes.p2 = @intCast(u4, c.data);
+                battle.last_moves.p2_index = @intCast(u3, c.data);
             }
         }
     }
@@ -240,9 +259,9 @@ fn switchIn(battle: anytype, player: Player, slot: u8, initial: bool, log: anyty
     side.order[slot - 1] = out;
 
     if (player == .P1) {
-        battle.last_selected_indexes.p1 = 1;
+        battle.last_moves.p1_index = 1;
     } else {
-        battle.last_selected_indexes.p2 = 1;
+        battle.last_moves.p2_index = 1;
     }
 
     side.last_used_move = .None;
@@ -299,13 +318,11 @@ fn turnOrder(battle: anytype, c1: Choice, c2: Choice) Player {
     const spe2 = battle.side(.P2).active.stats.spe;
     if (spe1 == spe2) {
         // Pokémon Showdown's beforeTurnCallback shenanigans
-        if (showdown and m1 == .Counter and m2 == .Counter) battle.rng.advance(1);
-
-        const p1 = if (showdown)
-            battle.rng.range(u8, 0, 2) == 0
-        else
-            battle.rng.next() < Gen12.percent(50) + 1;
+        if (showdown and !double_switch and m1 == .Counter and m2 == .Counter) {
+            battle.rng.advance(1);
+        }
 
+        const p1 = Rolls.speedTie(battle);
         if (!showdown) return if (p1) .P1 else .P2;
 
         // Pokémon Showdown's "lockedmove" volatile's onBeforeTurn uses BattleQueue#changeAction,
@@ -315,7 +332,7 @@ fn turnOrder(battle: anytype, c1: Choice, c2: Choice) Player {
         const t1 = battle.side(.P1).active.volatiles.Thrashing;
         const t2 = battle.side(.P2).active.volatiles.Thrashing;
         // If *both* sides are thrashing it really should be another speed tie, but we've patched
-        // that out and enforce host ordering of events, so P1 just goes first reqgardless of who
+        // that out and enforce host ordering of events, so P1 just goes first regardless of who
         // won the original coin flip
         if (t1 and t2) return .P1;
         return if (p1) if (t1 and !t2) .P2 else .P1 else if (t2 and !t1) .P1 else .P2;
@@ -328,9 +345,13 @@ fn doTurn(
     battle: anytype,
     player: Player,
     player_choice: Choice,
+    player_rewrap: bool,
+    player_skip: bool,
     player_from: ?Move,
     foe_player: Player,
     foe_choice: Choice,
+    foe_rewrap: bool,
+    foe_skip: bool,
     foe_from: ?Move,
     log: anytype,
 ) !?Result {
@@ -338,7 +359,16 @@ fn doTurn(
 
     var residual = true;
     var replace = battle.side(player).stored().hp == 0;
-    if (try executeMove(battle, player, player_choice, player_from, &residual, log)) |r| return r;
+    if (try executeMove(
+        battle,
+        player,
+        player_choice,
+        player_rewrap,
+        player_skip,
+        player_from,
+        &residual,
+        log,
+    )) |r| return r;
     if (!replace) {
         if (player_choice.type != .Switch) {
             if (try checkFaint(battle, foe_player, log)) |r| return r;
@@ -347,8 +377,18 @@ fn doTurn(
         if (try checkFaint(battle, player, log)) |r| return r;
     } else if (foe_choice.type == .Pass) return null;
 
+    residual = true;
     replace = battle.side(foe_player).stored().hp == 0;
-    if (try executeMove(battle, foe_player, foe_choice, foe_from, &residual, log)) |r| return r;
+    if (try executeMove(
+        battle,
+        foe_player,
+        foe_choice,
+        foe_rewrap,
+        foe_skip,
+        foe_from,
+        &residual,
+        log,
+    )) |r| return r;
     if (!replace) {
         if (foe_choice.type != .Switch) {
             if (try checkFaint(battle, player, log)) |r| return r;
@@ -371,6 +411,8 @@ fn executeMove(
     battle: anytype,
     player: Player,
     choice: Choice,
+    rewrap: bool,
+    skip: bool,
     from: ?Move,
     residual: *bool,
     log: anytype,
@@ -382,9 +424,10 @@ fn executeMove(
         return null;
     }
 
+    // This is the correct place to check for SKIP_TURN and abort early, however since Pokémon
+    // Showdown overwrites the SKIP_TURN sentinel with its botched move select we need to add an
+    // additional skip boolean to accomplish the same thing in the Binding check of BeforeMove
     if (side.last_selected_move == .SKIP_TURN) {
-        // Pokémon Showdown overwrites the SKIP_TURN sentinel with its botched move select,
-        // Binding instead gets handled in beforeMove after sleep and freeze
         assert(!showdown);
         if (battle.foe(player).active.volatiles.Binding) {
             try log.cant(battle.active(player), .Bound);
@@ -403,9 +446,9 @@ fn executeMove(
         // choice.data == 0 only happens with Struggle on Pokémon Showdown
         assert(!showdown);
         mslot = @intCast(u4, if (player == .P1)
-            battle.last_selected_indexes.p1
+            battle.last_moves.p1_index
         else
-            battle.last_selected_indexes.p2);
+            battle.last_moves.p2_index);
         const stored = side.stored();
         // GLITCH: Struggle bypass PP underflow via Hyper Beam / Trapping-switch auto selection
         auto = side.last_selected_move == .HyperBeam or side.active.volatiles.Bide or
@@ -427,14 +470,14 @@ fn executeMove(
         // Incorrect mslot with Pokémon Showdown choice semantics so we need to recover from index
         assert(mslot == 1);
         mslot = @intCast(u4, if (player == .P1)
-            battle.last_selected_indexes.p1
+            battle.last_moves.p1_index
         else
-            battle.last_selected_indexes.p2);
+            battle.last_moves.p2_index);
     }
 
     var skip_can = false;
     var skip_pp = false;
-    switch (try beforeMove(battle, player, from, log)) {
+    switch (try beforeMove(battle, player, skip, from, residual, log)) {
         .done => return null,
         .skip_can => skip_can = true,
         .skip_pp => skip_pp = true,
@@ -442,14 +485,23 @@ fn executeMove(
         .err => return @as(?Result, Result.Error),
     }
 
-    if (!skip_can and !try canMove(battle, player, mslot, auto, skip_pp, from, log)) return null;
+    if (!skip_can and !try canMove(battle, player, mslot, auto, skip_pp, from, residual, log)) {
+        return null;
+    }
 
-    return doMove(battle, player, mslot, auto, residual, log);
+    return doMove(battle, player, mslot, rewrap, auto, residual, log);
 }
 
-const BeforeMove = union(enum) { done, skip_can, skip_pp, ok, err };
+const BeforeMove = enum { done, skip_can, skip_pp, ok, err };
 
-fn beforeMove(battle: anytype, player: Player, from: ?Move, log: anytype) !BeforeMove {
+fn beforeMove(
+    battle: anytype,
+    player: Player,
+    skip: bool,
+    from: ?Move,
+    residual: *bool,
+    log: anytype,
+) !BeforeMove {
     var side = battle.side(player);
     const foe = battle.foe(player);
     var active = &side.active;
@@ -477,13 +529,15 @@ fn beforeMove(battle: anytype, player: Player, from: ?Move, log: anytype) !Befor
         return .done;
     }
 
-    if (foe.active.volatiles.Binding) {
+    if (skip or foe.active.volatiles.Binding) {
         try log.cant(ident, .Bound);
         return .done;
     }
 
-    if (!showdown and volatiles.Flinch) {
-        volatiles.Flinch = false;
+    if (volatiles.Flinch) {
+        // Pokémon Showdown doesn't clear Flinch until its imaginary "residual" phase, meaning
+        // Pokémon can sometimes flinch multiple times from the same original hit
+        if (!showdown) volatiles.Flinch = false;
         try log.cant(ident, .Flinch);
         return .done;
     }
@@ -504,13 +558,6 @@ fn beforeMove(battle: anytype, player: Player, from: ?Move, log: anytype) !Befor
     // Pokémon Showdown's disable condition has a single onBeforeMove handler
     if (showdown and try disabled(side, ident, log)) return .done;
 
-    // Pokémon Showdown checks for Flinch *after* instead of before
-    if (showdown and volatiles.Flinch) {
-        volatiles.Flinch = false;
-        try log.cant(ident, .Flinch);
-        return .done;
-    }
-
     // This can only happen if a Pokémon started the battle frozen/sleeping and was thawed/woken
     // before the side had a selected a move - we simply need to assume this leads to a desync
     if (side.last_selected_move == .None) {
@@ -528,14 +575,9 @@ fn beforeMove(battle: anytype, player: Player, from: ?Move, log: anytype) !Befor
         } else {
             try log.activate(ident, .Confusion);
 
-            const confused = if (showdown)
-                !battle.rng.chance(u8, 128, 256)
-            else
-                battle.rng.next() >= Gen12.percent(50) + 1;
-
-            if (confused) {
+            if (Rolls.confused(battle)) {
                 assert(!volatiles.MultiHit);
-                volatiles.state = 0;
+                if (!volatiles.Rage) volatiles.state = 0;
                 volatiles.Bide = false;
                 volatiles.Thrashing = false;
                 volatiles.MultiHit = false;
@@ -559,8 +601,12 @@ fn beforeMove(battle: anytype, player: Player, from: ?Move, log: anytype) !Befor
                     player
                 else
                     player.foe();
+
+                const uncapped = battle.last_damage;
                 // Skipping adjustDamage / randomizeDamage / checkHit
                 _ = try applyDamage(battle, player, target, .Confusion, log);
+                // Pokémon Showdown thinks that confusion damage is uncapped ¯\_(ツ)_/¯
+                if (showdown) battle.last_damage = uncapped;
 
                 return .done;
             }
@@ -569,28 +615,28 @@ fn beforeMove(battle: anytype, player: Player, from: ?Move, log: anytype) !Befor
 
     if (!showdown and try disabled(side, ident, log)) return .done;
 
-    if (Status.is(stored.status, .PAR)) {
-        const paralyzed = if (showdown)
-            battle.rng.chance(u8, 63, 256)
-        else
-            battle.rng.next() < Gen12.percent(25);
-
-        if (paralyzed) {
-            volatiles.state = 0;
-            volatiles.Bide = false;
-            volatiles.Thrashing = false;
-            volatiles.Charging = false;
-            volatiles.Binding = false;
-            // GLITCH: Invulnerable is not cleared, resulting in permanent Fly/Dig invulnerability
-            try log.cant(ident, .Paralysis);
-            return .done;
-        }
+    if (Status.is(stored.status, .PAR) and Rolls.paralyzed(battle)) {
+        if (!volatiles.Rage) volatiles.state = 0;
+        volatiles.Bide = false;
+        volatiles.Thrashing = false;
+        volatiles.Charging = false;
+        volatiles.Binding = false;
+        // GLITCH: Invulnerable is not cleared, resulting in permanent Fly/Dig invulnerability
+        try log.cant(ident, .Paralysis);
+        return .done;
     }
 
     if (volatiles.Bide) {
         assert(!volatiles.Thrashing and !volatiles.Rage);
 
-        volatiles.state +%= battle.last_damage;
+        if (showdown) {
+            // Pokémon Showdown doesn't implement Bide potentially overflowing in the event of
+            // OHKO-move damage, but we can fake this incorrect behavior by simply saturating the
+            // addition because 65535 is sufficient to faint any Pokémon anyway
+            volatiles.state +|= battle.last_damage;
+        } else {
+            volatiles.state +%= battle.last_damage;
+        }
 
         assert(volatiles.attacks > 0);
 
@@ -611,7 +657,18 @@ fn beforeMove(battle: anytype, player: Player, from: ?Move, log: anytype) !Befor
             return .done;
         }
 
+        const sub = showdown and foe.active.volatiles.Substitute;
         _ = try applyDamage(battle, player.foe(), player.foe(), .None, log);
+        if (foe.stored().hp > 0 and !sub) try buildRage(battle, player.foe(), log);
+
+        // For reasons passing understanding, Pokémon Showdown still inflicts residual damage to
+        // Bide's user even if the above damage has caused the foe to faint. It's simpler to always
+        // run residual here regardless of whether the foe fainted and opt-out of the default flow
+        if (showdown) {
+            residual.* = false;
+            try handleResidual(battle, player, log);
+        }
+
         return .done;
     }
 
@@ -623,8 +680,13 @@ fn beforeMove(battle: anytype, player: Player, from: ?Move, log: anytype) !Befor
             try log.start(battle.active(player), .ConfusionSilent);
         }
         try log.move(ident, side.last_selected_move, battle.active(player.foe()), from);
-        if (showdown and handleThrashing(battle, active)) {
-            try log.start(battle.active(player), .ConfusionSilent);
+        if (showdown) {
+            // This shouldn't actually set last_used_move, but Pokémon Showdown sets last
+            // used in useMove and doesn't have the notion of skipping canMove semantics
+            side.last_used_move = side.last_selected_move;
+            if (handleThrashing(battle, active)) {
+                try log.start(battle.active(player), .ConfusionSilent);
+            }
         }
         return .skip_can;
     }
@@ -639,7 +701,11 @@ fn beforeMove(battle: anytype, player: Player, from: ?Move, log: anytype) !Befor
             side.last_selected_move,
         );
         if (showdown or battle.last_damage != 0) {
+            const sub = showdown and foe.active.volatiles.Substitute;
             _ = try applyDamage(battle, player.foe(), player.foe(), .None, log);
+            if (battle.foe(player).stored().hp > 0 and !sub) {
+                try buildRage(battle, player.foe(), log);
+            }
         }
         return .done;
     }
@@ -654,6 +720,7 @@ fn canMove(
     auto: bool,
     skip_pp: bool,
     from: ?Move,
+    residual: *bool,
     log: anytype,
 ) !bool {
     var side = battle.side(player);
@@ -670,6 +737,7 @@ fn canMove(
         side.active.volatiles.Invulnerable = false;
     } else if (move.effect == .Charge) {
         try log.move(player_ident, side.last_selected_move, .{}, from);
+        setCounterable(battle, player, side, move);
         try Effects.charge(battle, player, log);
         return false;
     }
@@ -686,9 +754,10 @@ fn canMove(
     // regrettable, but this information is more "nice to have" than required
     const f = if (from != null and from.? == .None) null else from;
     try log.move(player_ident, side.last_selected_move, battle.active(target), f);
+    setCounterable(battle, player, side, move);
 
     if (move.effect.onBegin()) {
-        try onBegin(battle, player, move, mslot, log);
+        try onBegin(battle, player, move, mslot, residual, log);
         return false;
     }
 
@@ -696,12 +765,27 @@ fn canMove(
         Effects.thrashing(battle, player);
     } else if (!showdown and move.effect == .Binding) {
         // Pokémon Showdown handles this after hit/miss checks and damage calculation
-        Effects.binding(battle, player);
+        Effects.binding(battle, player, false);
     }
 
     return true;
 }
 
+fn setCounterable(battle: anytype, player: Player, side: *Side, move: Move.Data) void {
+    // The Counter desync is caused by the cartridge not calling GetCurrentMove until now, meaning
+    // in cases where an early return happens the data for a players last selected move does not get
+    // reloaded and HandleCounterMove actually bases its success/failure off of stale information.
+    // This boolean state we track here doesn't exist on the cartridge because it instead manifests
+    // as the desync results from actually having two separate battle states that subtly disagree
+    const counterable = side.last_selected_move != .Counter and move.bp > 0 and
+        (move.type == .Normal or move.type == .Fighting);
+    if (player == .P1) {
+        battle.last_moves.p1_counterable = @boolToInt(counterable);
+    } else {
+        battle.last_moves.p2_counterable = @boolToInt(counterable);
+    }
+}
+
 fn decrementPP(side: *Side, mslot: u4, auto: bool) void {
     if (side.last_selected_move == .Struggle) return;
 
@@ -737,6 +821,7 @@ fn doMove(
     battle: anytype,
     player: Player,
     mslot: u4,
+    rewrap: bool,
     auto: bool,
     residual: *bool,
     log: anytype,
@@ -767,16 +852,21 @@ fn doMove(
             (@enumToInt(move.type.effectiveness(foe.active.types.type1)) == 0 or
             @enumToInt(move.type.effectiveness(foe.active.types.type2)) == 0);
         if (immune and move.effect != .Binding) break :miss true;
-        if (move.effect == .OHKO and side.active.stats.spe < foe.active.stats.spe) break :miss true;
+        if (move.effect == .OHKO and side.active.stats.spe < foe.active.stats.spe) {
+            battle.last_damage = 0;
+            break :miss true;
+        }
         break :miss move.target != .Self and !moveHit(battle, player, move, &immune, &mist);
     };
     assert(!immune or miss or (showdown and move.effect == .Binding));
 
+    var late = showdown and move.effect != .Explode;
     const skip = status or immune;
     if ((!showdown or (!skip or counter)) and !miss) blk: {
         if (showdown and move.effect.isMulti()) {
             Effects.multiHit(battle, player, move);
             hits = side.active.volatiles.attacks;
+            late = false;
         }
 
         // Cartridge rolls for crit even for moves that can't crit (Counter/Metronome/status/OHKO)
@@ -810,7 +900,7 @@ fn doMove(
     }
 
     // Due to control flow shenanigans we need to clear last_damage for Pokémon Showdown
-    if (showdown and skip and move.effect != .Bide) battle.last_damage = 0;
+    if (showdown and skip) battle.last_damage = 0;
 
     miss = if (showdown or skip)
         miss
@@ -823,9 +913,9 @@ fn doMove(
 
     if (!showdown or !miss) {
         if (move.effect == .MirrorMove) {
-            return mirrorMove(battle, player, mslot, auto, residual, log);
+            return mirrorMove(battle, player, mslot, rewrap, auto, residual, log);
         } else if (move.effect == .Metronome) {
-            return metronome(battle, player, mslot, auto, residual, log);
+            return metronome(battle, player, mslot, rewrap, auto, residual, log);
         } else if (move.effect.onEnd()) {
             try onEnd(battle, player, move, log);
             return null;
@@ -840,7 +930,7 @@ fn doMove(
             move.effect == .OHKO and side.active.stats.spe < foe.active.stats.spe;
         if (ohko) {
             try log.immune(foe_ident, .OHKO);
-        } else if (immune and !invulnerable) {
+        } else if (immune and !invulnerable and (!showdown or move.effect != .Binding)) {
             try log.immune(foe_ident, .None);
         } else if (mist) {
             if (!foe.active.volatiles.Substitute) try log.activate(foe_ident, .Mist);
@@ -857,15 +947,9 @@ fn doMove(
             if (showdown and side.stored().hp == 0) residual.* = false;
         } else if (move.effect == .Explode) {
             try Effects.explode(battle, player);
-            if (foe.active.volatiles.Rage and foe.active.boosts.atk < 6) {
-                try Effects.boost(battle, player.foe(), Move.get(.Rage), log);
-            }
-        } else if (showdown) {
-            if (move.effect == .Disable) {
-                if (foe.active.volatiles.Rage and foe.active.boosts.atk < 6) {
-                    try Effects.boost(battle, player.foe(), Move.get(.Rage), log);
-                }
-            }
+            try buildRage(battle, player.foe(), log);
+        } else if (showdown and move.effect == .Disable) {
+            try buildRage(battle, player.foe(), log);
         }
         return null;
     }
@@ -878,6 +962,9 @@ fn doMove(
         hits = side.active.volatiles.attacks;
     }
 
+    // Pokémon Showdown only builds Rage for Disable/Explosion (hit/miss) when attacking into a sub
+    const sub = showdown and foe.active.volatiles.Substitute;
+
     var nullified = false;
     var hit: u4 = 0;
     while (hit < hits) {
@@ -893,9 +980,7 @@ fn doMove(
         if (hit == 0 and ohko) try log.ohko();
         hit += 1;
         if (foe.stored().hp == 0) break;
-        if (foe.active.volatiles.Rage and foe.active.boosts.atk < 6) {
-            try Effects.boost(battle, player.foe(), Move.get(.Rage), log);
-        }
+        if (!late and (!sub or move.effect == .Explode)) try buildRage(battle, player.foe(), log);
         // If the substitute breaks during a multi-hit attack, the attack ends
         if (nullified) break;
     }
@@ -911,11 +996,17 @@ fn doMove(
     } else if (showdown) {
         // This should be handled much earlier but Pokémon Showdown does it here... ¯\_(ツ)_/¯
         if (move.effect == .Binding) {
-            Effects.binding(battle, player);
+            Effects.binding(battle, player, rewrap);
             if (immune) {
                 battle.last_damage = 0;
+                assert(foe.stored().hp > 0);
                 // Pokémon Showdown logs |-damage| here instead of |-immune| because logic...
-                try log.damage(battle.active(player.foe()), foe.stored(), .None);
+                if (sub) {
+                    try log.activate(battle.active(player.foe()), .Substitute);
+                } else {
+                    try log.damage(battle.active(player.foe()), foe.stored(), .None);
+                    try buildRage(battle, player.foe(), log);
+                }
                 return null;
             }
         }
@@ -932,6 +1023,9 @@ fn doMove(
 
     if (foe.stored().hp == 0) return null;
 
+    // Pokémon Showdown builds Rage at the wrong time for non-MultiHit move
+    if (late and !sub and move.effect != .Disable) try buildRage(battle, player.foe(), log);
+
     if (!move.effect.isSpecial()) {
         // On the cartridge Rage is not considered to be "special" and thus gets executed for a
         // second time here (after being executed in the "always happens" block above) but that
@@ -943,7 +1037,9 @@ fn doMove(
         if (move.effect == .Twineedle) {
             if (!showdown) try Effects.poison(battle, player, Move.get(.PoisonSting), log);
         } else if (move.effect == .Disable) {
-            return Effects.disable(battle, player, move, log);
+            const result = try Effects.disable(battle, player, move, log);
+            if (showdown) try buildRage(battle, player.foe(), log);
+            return result;
         } else {
             try moveEffect(battle, player, move, log);
         }
@@ -961,8 +1057,7 @@ fn checkCriticalHit(battle: anytype, player: Player, move: Move.Data) bool {
     chance = if (side.active.volatiles.FocusEnergy) chance / 2 else @min(chance * 2, 255);
     chance = if (move.effect == .HighCritical) @min(chance * 4, 255) else chance / 2;
 
-    if (showdown) return battle.rng.chance(u8, @intCast(u8, chance), 256);
-    return std.math.rotl(u8, battle.rng.next(), 3) < chance;
+    return Rolls.criticalHit(battle, chance);
 }
 
 fn calcDamage(
@@ -1066,49 +1161,37 @@ fn adjustDamage(battle: anytype, player: Player) u16 {
 
 fn randomizeDamage(battle: anytype) void {
     if (battle.last_damage <= 1) return;
-
-    const random = if (showdown)
-        battle.rng.range(u8, 217, 256)
-    else loop: {
-        while (true) {
-            const r = std.math.rotr(u8, battle.rng.next(), 1);
-            if (r >= 217) break :loop r;
-        }
-    };
-
+    const random = Rolls.damage(battle);
     battle.last_damage = @intCast(u16, @as(u32, battle.last_damage) *% random / 255);
 }
 
 fn specialDamage(battle: anytype, player: Player, move: Move.Data, log: anytype) !?Result {
     const side = battle.side(player);
+    const foe = battle.foe(player);
 
     if (!try checkHit(battle, player, move, log)) return null;
 
     battle.last_damage = switch (side.last_selected_move) {
-        .SuperFang => @max(battle.foe(player).stored().hp / 2, 1),
+        .SuperFang => @max(foe.stored().hp / 2, 1),
         .SeismicToss, .NightShade => side.stored().level,
         .SonicBoom => 20,
         .DragonRage => 40,
         // GLITCH: if power = 0 then a desync occurs (or a miss on Pokémon Showdown)
         .Psywave => power: {
             const max = @intCast(u8, @as(u16, side.stored().level) * 3 / 2);
-            if (showdown) {
-                break :power battle.rng.range(u8, 0, max);
-            } else {
-                // GLITCH: Psywave infinite glitch loop
-                if (max <= 1) return Result.Error;
-                while (true) {
-                    const r = battle.rng.next();
-                    if (r < max) break :power r;
-                }
-            }
+            // GLITCH: Psywave infinite glitch loop
+            if (!showdown and max <= 1) return Result.Error;
+            break :power Rolls.psywave(battle, max);
         },
         else => unreachable,
     };
 
     if (battle.last_damage == 0) return if (showdown) null else Result.Error;
 
+    const sub = showdown and foe.active.volatiles.Substitute;
     _ = try applyDamage(battle, player.foe(), player.foe(), .None, log);
+    if (battle.foe(player).stored().hp > 0 and !sub) try buildRage(battle, player.foe(), log);
+
     return null;
 }
 
@@ -1120,19 +1203,17 @@ fn counterDamage(battle: anytype, player: Player, move: Move.Data, log: anytype)
         return null;
     }
 
-    // Pretend Counter was used as a stand-in when no move has been used to fail below with 0 BP
-    const foe_last_used_move =
-        Move.get(if (foe.last_used_move == .None) .Counter else foe.last_used_move);
+    // Pretend Splash was used as a stand-in when no move has been used to fail below with 0 BP
     const foe_last_selected_move =
         Move.get(if (foe.last_selected_move == .None or foe.last_selected_move == .SKIP_TURN)
-        .Counter
+        .Splash
     else
         foe.last_selected_move);
 
-    const used = foe_last_used_move.bp > 0 and
-        foe.last_used_move != .Counter and
-        (foe_last_used_move.type == .Normal or
-        foe_last_used_move.type == .Fighting);
+    const used = (if (player.foe() == .P1)
+        battle.last_moves.p1_counterable
+    else
+        battle.last_moves.p2_counterable) != 0;
 
     const selected = foe_last_selected_move.bp > 0 and
         foe.last_selected_move != .Counter and
@@ -1151,12 +1232,14 @@ fn counterDamage(battle: anytype, player: Player, move: Move.Data, log: anytype)
         return null;
     }
 
-    battle.last_damage = if (battle.last_damage > 0x7FFF) 0xFFFF else battle.last_damage * 2;
+    battle.last_damage *|= 2;
 
     // Pokémon Showdown calls checkHit before Counter
     if (!showdown and !try checkHit(battle, player, move, log)) return null;
 
+    const sub = showdown and foe.active.volatiles.Substitute;
     _ = try applyDamage(battle, player.foe(), player.foe(), .None, log);
+    if (battle.foe(player).stored().hp > 0 and !sub) try buildRage(battle, player.foe(), log);
     return null;
 }
 
@@ -1200,6 +1283,7 @@ fn mirrorMove(
     battle: anytype,
     player: Player,
     mslot: u4,
+    rewrap: bool,
     auto: bool,
     residual: *bool,
     log: anytype,
@@ -1212,41 +1296,30 @@ fn mirrorMove(
     if (foe.last_used_move == .None or foe.last_used_move == .MirrorMove) {
         try log.fail(battle.active(player), .None);
         return null;
+    } else if (!showdown or foe.last_used_move != .Struggle) {
+        incrementPP(side, mslot);
     }
 
-    incrementPP(side, mslot);
-
-    if (!try canMove(battle, player, mslot, auto, false, .MirrorMove, log)) return null;
-    return doMove(battle, player, mslot, auto, residual, log);
+    if (!try canMove(battle, player, mslot, auto, false, .MirrorMove, residual, log)) return null;
+    return doMove(battle, player, mslot, rewrap, auto, residual, log);
 }
 
 fn metronome(
     battle: anytype,
     player: Player,
     mslot: u4,
+    rewrap: bool,
     auto: bool,
     residual: *bool,
     log: anytype,
 ) !?Result {
     var side = battle.side(player);
 
-    side.last_selected_move = if (showdown) blk: {
-        const r = battle.rng.range(u8, 0, @enumToInt(Move.Struggle) - 2);
-        const mod = @as(u2, (if (r < @enumToInt(Move.Metronome) - 1) 1 else 2));
-        break :blk @intToEnum(Move, r + mod);
-    } else loop: {
-        while (true) {
-            const r = battle.rng.next();
-            if (r == 0 or r == @enumToInt(Move.Metronome)) continue;
-            if (r >= @enumToInt(Move.Struggle)) continue;
-            break :loop @intToEnum(Move, r);
-        }
-    };
-
+    side.last_selected_move = Rolls.metronome(battle);
     incrementPP(side, mslot);
 
-    if (!try canMove(battle, player, mslot, auto, false, .Metronome, log)) return null;
-    return doMove(battle, player, mslot, auto, residual, log);
+    if (!try canMove(battle, player, mslot, auto, false, .Metronome, residual, log)) return null;
+    return doMove(battle, player, mslot, rewrap, auto, residual, log);
 }
 
 fn checkHit(battle: anytype, player: Player, move: Move.Data, log: anytype) !bool {
@@ -1300,23 +1373,24 @@ fn moveHit(battle: anytype, player: Player, move: Move.Data, immune: *bool, mist
         }
 
         // GLITCH: Thrash / Petal Dance / Rage get their accuracy overwritten on subsequent hits
-        var state = &side.active.volatiles.state;
-        const overwritten = (move.effect == .Thrashing or move.effect == .Rage) and state.* > 0;
-        assert(!overwritten or (0 < state.* and state.* <= 255 and !side.active.volatiles.Bide));
-        var accuracy = if (overwritten) state.* else @as(u16, Gen12.percent(move.accuracy));
+        const state = side.active.volatiles.state;
+        var overwrite = move.effect == .Rage or move.effect == .Thrashing;
+        const overwritten = overwrite and state > 0;
+        assert(!overwritten or (0 < state and state <= 255 and !side.active.volatiles.Bide));
+
+        var accuracy = if (overwritten) state else @as(u16, Gen12.percent(move.accuracy));
         var boost = BOOSTS[@intCast(u4, @as(i8, side.active.boosts.accuracy) + 6)];
         accuracy = accuracy * boost[0] / boost[1];
         boost = BOOSTS[@intCast(u4, @as(i8, -foe.active.boosts.evasion) + 6)];
         accuracy = accuracy * boost[0] / boost[1];
         accuracy = @min(255, @max(1, accuracy));
 
-        if (move.effect == .Thrashing or move.effect == .Rage) state.* = accuracy;
+        // Pokémon Showdown only overwrites if the volatile is present
+        if (showdown) overwrite = side.active.volatiles.Rage or side.active.volatiles.Thrashing;
+        if (overwrite) side.active.volatiles.state = accuracy;
 
         // GLITCH: max accuracy is 255 so 1/256 chance of miss
-        break :miss if (showdown)
-            !battle.rng.chance(u8, @intCast(u8, accuracy), 256)
-        else
-            battle.rng.next() >= accuracy;
+        break :miss !Rolls.hit(battle, accuracy);
     };
 
     // Pokémon Showdown reports miss instead of fail for moves blocked by Mist that 1/256 miss
@@ -1431,6 +1505,15 @@ fn handleResidual(battle: anytype, player: Player, log: anytype) !void {
     }
 
     if (volatiles.LeechSeed) {
+        var foe = battle.foe(player);
+        var foe_stored = foe.stored();
+        const foe_ident = battle.active(player.foe());
+
+        if (foe_stored.hp == 0) {
+            assert(showdown);
+            return;
+        }
+
         var damage = @max(stored.stats.hp / 16, 1);
 
         // GLITCH: Leech Seed + Toxic glitch
@@ -1442,10 +1525,6 @@ fn handleResidual(battle: anytype, player: Player, log: anytype) !void {
         const amount = @min(damage, stored.hp);
         stored.hp -= amount;
 
-        var foe = battle.foe(player);
-        var foe_stored = foe.stored();
-        const foe_ident = battle.active(player.foe());
-
         // As above, Pokémon Showdown uses damageOf but its not relevant
         if (amount > 0) try log.damage(ident, stored, .LeechSeed);
 
@@ -1461,13 +1540,13 @@ fn endTurn(battle: anytype, log: anytype) @TypeOf(log).Error!Result {
     assert(!battle.side(.P1).active.volatiles.MultiHit);
     assert(!battle.side(.P2).active.volatiles.MultiHit);
 
+    battle.turn += 1;
+
     if (showdown and options.ebc and checkEBC(battle)) {
         try log.tie();
         return Result.Tie;
     }
 
-    battle.turn += 1;
-
     if (showdown and battle.turn >= 1000) {
         try log.tie();
         return Result.Tie;
@@ -1534,7 +1613,50 @@ fn checkEBC(battle: anytype) bool {
     return false;
 }
 
-inline fn onBegin(battle: anytype, player: Player, move: Move.Data, mslot: u8, log: anytype) !void {
+fn disabled(side: *Side, ident: ID, log: anytype) !bool {
+    if (side.active.volatiles.disabled_move != 0) {
+        // A Pokémon that transforms after being disabled may end up with less move slots
+        const m = side.active.moves[side.active.volatiles.disabled_move - 1].id;
+        // side.last_selected_move can be Struggle here on Pokemon Showdown we need an extra check
+        const last = if (showdown and m == .Bide and side.active.volatiles.Bide)
+            m
+        else
+            side.last_selected_move;
+        if (m != .None and m == last) {
+            side.active.volatiles.Charging = false;
+            try log.disabled(ident, last);
+            return true;
+        }
+    }
+    return false;
+}
+
+inline fn buildRage(battle: anytype, who: Player, log: anytype) !void {
+    const side = battle.side(who);
+    if (side.active.volatiles.Rage and side.active.boosts.atk < 6) {
+        try Effects.boost(battle, who, Move.get(.Rage), log);
+    }
+}
+
+fn handleThrashing(battle: anytype, active: *ActivePokemon) bool {
+    var volatiles = &active.volatiles;
+    assert(volatiles.Thrashing);
+    if (volatiles.attacks > 0) return false;
+
+    volatiles.Thrashing = false;
+    volatiles.Confusion = true;
+    volatiles.confusion = Rolls.confusionDuration(battle);
+    return true;
+}
+
+inline fn onBegin(
+    battle: anytype,
+    player: Player,
+    move: Move.Data,
+    mslot: u8,
+    residual: *bool,
+    log: anytype,
+) !void {
     assert(move.effect.onBegin());
     return switch (move.effect) {
         .Confusion => Effects.confusion(battle, player, move, log),
@@ -1550,7 +1672,7 @@ inline fn onBegin(battle: anytype, player: Player, move: Move.Data, mslot: u8, l
         .Poison => Effects.poison(battle, player, move, log),
         .Reflect => Effects.reflect(battle, player, log),
         .Splash => Effects.splash(battle, player, log),
-        .Substitute => Effects.substitute(battle, player, log),
+        .Substitute => Effects.substitute(battle, player, residual, log),
         .SwitchAndTeleport => Effects.switchAndTeleport(battle, player, move, log),
         .Transform => Effects.transform(battle, player, log),
         else => unreachable,
@@ -1617,10 +1739,7 @@ pub const Effects = struct {
         side.active.volatiles.Bide = true;
         assert(!side.active.volatiles.Thrashing and !side.active.volatiles.Rage);
         side.active.volatiles.state = 0;
-        side.active.volatiles.attacks = @intCast(u3, if (showdown)
-            battle.rng.range(u4, 2, 4)
-        else
-            (battle.rng.next() & 1) + 2);
+        side.active.volatiles.attacks = Rolls.bideThrashDuration(battle);
 
         try log.start(battle.active(player), .Bide);
     }
@@ -1642,14 +1761,8 @@ pub const Effects = struct {
             return;
         }
 
-        const chance = !foe.active.types.includes(move.type) and if (showdown)
-            battle.rng.chance(u8, @as(u8, if (move.effect == .BurnChance1) 26 else 77), 256)
-        else
-            battle.rng.next() < 1 + (if (move.effect == .BurnChance1)
-                Gen12.percent(10)
-            else
-                Gen12.percent(30));
-        if (!chance) return;
+        if (foe.active.types.includes(move.type)) return;
+        if (!Rolls.secondaryChance(battle, move.effect == .BurnChance1)) return;
 
         foe_stored.status = Status.init(.BRN);
         foe.active.stats.atk = @max(foe.active.stats.atk / 2, 1);
@@ -1673,11 +1786,7 @@ pub const Effects = struct {
         const sub = foe.active.volatiles.Substitute;
 
         if (move.effect == .ConfusionChance) {
-            const chance = if (showdown)
-                battle.rng.chance(u8, 25, 256)
-            else
-                battle.rng.next() < Gen12.percent(10);
-            if (!chance) return;
+            if (!Rolls.confusionChance(battle)) return;
         } else {
             if (showdown) {
                 if (!try checkHit(battle, player, move, log)) {
@@ -1696,10 +1805,7 @@ pub const Effects = struct {
 
         if (foe.active.volatiles.Confusion) return;
         foe.active.volatiles.Confusion = true;
-        foe.active.volatiles.confusion = @intCast(u3, if (showdown)
-            battle.rng.range(u8, 2, 6)
-        else
-            (battle.rng.next() & 3) + 2);
+        foe.active.volatiles.confusion = Rolls.confusionDuration(battle);
 
         try log.start(battle.active(player.foe()), .Confusion);
     }
@@ -1749,11 +1855,8 @@ pub const Effects = struct {
             return Result.Error;
         }
 
-        volatiles.disabled_move = @intCast(u3, randomMoveSlot(&battle.rng, &foe.active.moves, n));
-        volatiles.disabled_duration = @intCast(u4, if (showdown)
-            battle.rng.range(u8, 1, 9)
-        else
-            (battle.rng.next() & 7) + 1);
+        volatiles.disabled_move = @intCast(u3, Rolls.moveSlot(battle, &foe.active.moves, n));
+        volatiles.disabled_duration = Rolls.disableDuration(battle);
 
         try log.startEffect(foe_ident, .Disable, foe.active.move(volatiles.disabled_move).id);
         return null;
@@ -1765,7 +1868,7 @@ pub const Effects = struct {
 
         if (battle.last_damage == 0) {
             assert(showdown);
-            return;
+            if (!battle.foe(player).active.volatiles.Substitute) return;
         }
 
         const drain = @max(battle.last_damage / 2, 1);
@@ -1792,15 +1895,7 @@ pub const Effects = struct {
         var volatiles = &battle.foe(player).active.volatiles;
 
         if (volatiles.Substitute) return;
-
-        const chance = if (showdown)
-            battle.rng.chance(u8, @as(u8, if (move.effect == .FlinchChance1) 26 else 77), 256)
-        else
-            battle.rng.next() < 1 + (if (move.effect == .FlinchChance1)
-                Gen12.percent(10)
-            else
-                Gen12.percent(30));
-        if (!chance) return;
+        if (!Rolls.secondaryChance(battle, move.effect == .FlinchChance1)) return;
 
         volatiles.Flinch = true;
         volatiles.Recharging = false;
@@ -1826,12 +1921,8 @@ pub const Effects = struct {
             return if (showdown and !foe.active.types.includes(move.type)) battle.rng.advance(1);
         }
 
-        const chance = !foe.active.types.includes(move.type) and if (showdown)
-            battle.rng.chance(u8, 26, 256)
-        else
-            battle.rng.next() < 1 + Gen12.percent(10);
-        if (!chance) return;
-
+        if (foe.active.types.includes(move.type)) return;
+        if (!Rolls.secondaryChance(battle, true)) return;
         // Freeze Clause Mod
         if (showdown) for (foe.pokemon) |p| if (Status.is(p.status, .FRZ)) return;
 
@@ -1968,15 +2059,15 @@ pub const Effects = struct {
                 }
                 break :has_mimic false;
             };
-            // If the foe is Invulnerable we still want to fall through to checkHit to be able to
-            // trigger |-miss| instead of |-fail|
-            if (!has_mimic and !foe.active.volatiles.Invulnerable) {
+            if (!has_mimic) {
+                // Invulnerable foes or 1/256 miss can trigger |-miss| instead of |-fail|
+                if (!try checkHit(battle, player, move, log)) return;
                 return try log.fail(battle.active(player.foe()), .None);
             }
         }
         if (!try checkHit(battle, player, move, log)) return;
 
-        const rslot = randomMoveSlot(&battle.rng, &foe.active.moves, 0);
+        const rslot = Rolls.moveSlot(battle, &foe.active.moves, 0);
         side.active.move(oslot).id = foe.active.move(rslot).id;
 
         try log.startEffect(battle.active(player), .Mimic, side.active.move(oslot).id);
@@ -1997,7 +2088,8 @@ pub const Effects = struct {
         assert(!side.active.volatiles.MultiHit);
         side.active.volatiles.MultiHit = true;
 
-        side.active.volatiles.attacks = if (move.effect == .MultiHit) distribution(battle) else 2;
+        side.active.volatiles.attacks =
+            if (move.effect == .MultiHit) Rolls.distribution(battle) else 2;
     }
 
     fn paralyze(battle: anytype, player: Player, move: Move.Data, log: anytype) !void {
@@ -2041,14 +2133,8 @@ pub const Effects = struct {
         }
 
         // Body Slam can't paralyze a Normal type Pokémon
-        const chance = !foe.active.types.includes(move.type) and if (showdown)
-            battle.rng.chance(u8, @as(u8, if (move.effect == .ParalyzeChance1) 26 else 77), 256)
-        else
-            battle.rng.next() < 1 + (if (move.effect == .ParalyzeChance1)
-                Gen12.percent(10)
-            else
-                Gen12.percent(30));
-        if (!chance) return;
+        if (foe.active.types.includes(move.type)) return;
+        if (!Rolls.secondaryChance(battle, move.effect == .ParalyzeChance1)) return;
 
         foe_stored.status = Status.init(.PAR);
         foe.active.stats.spe = @max(foe.active.stats.spe / 4, 1);
@@ -2091,16 +2177,7 @@ pub const Effects = struct {
 
         if (move.effect == .Poison) {
             if (!showdown and !try checkHit(battle, player, move, log)) return;
-        } else {
-            const chance = if (showdown)
-                battle.rng.chance(u8, @as(u8, if (move.effect == .PoisonChance1) 52 else 103), 256)
-            else
-                battle.rng.next() < 1 + (if (move.effect == .PoisonChance1)
-                    Gen12.percent(20)
-                else
-                    Gen12.percent(40));
-            if (!chance) return;
-        }
+        } else if (!Rolls.poisonChance(battle, move.effect == .PoisonChance1)) return;
 
         foe_stored.status = Status.init(.PSN);
         if (toxic) {
@@ -2114,16 +2191,17 @@ pub const Effects = struct {
 
     fn rage(battle: anytype, player: Player) !void {
         var volatiles = &battle.side(player).active.volatiles;
-        if (volatiles.Rage) return;
-        volatiles.Rage = true;
         assert(!volatiles.Bide);
-        volatiles.state = 0;
+        volatiles.Rage = true;
     }
 
     fn recoil(battle: anytype, player: Player, residual: *bool, log: anytype) !void {
         var side = battle.side(player);
         var stored = side.stored();
 
+        assert(showdown or battle.last_damage > 0);
+        if (showdown and battle.last_damage == 0) return;
+
         const damage = @intCast(i16, @max(battle.last_damage /
             @as(u8, if (side.last_selected_move == .Struggle) 2 else 4), 1));
         stored.hp = @intCast(u16, @max(@intCast(i16, stored.hp) - damage, 0));
@@ -2169,16 +2247,7 @@ pub const Effects = struct {
         }
         foe.active.volatiles.Recharging = false;
 
-        const duration = @intCast(u3, if (showdown)
-            battle.rng.range(u8, 1, 8)
-        else loop: {
-            while (true) {
-                const r = battle.rng.next() & 7;
-                if (r != 0) break :loop r;
-            }
-        });
-
-        foe_stored.status = Status.slp(duration);
+        foe_stored.status = Status.slp(Rolls.sleepDuration(battle));
         try log.statusFrom(foe_ident, foe_stored.status, battle.side(player).last_selected_move);
     }
 
@@ -2186,7 +2255,7 @@ pub const Effects = struct {
         try log.activate(battle.active(player), .Splash);
     }
 
-    fn substitute(battle: anytype, player: Player, log: anytype) !void {
+    fn substitute(battle: anytype, player: Player, residual: *bool, log: anytype) !void {
         var side = battle.side(player);
         if (side.active.volatiles.Substitute) {
             try log.fail(battle.active(player), .Substitute);
@@ -2211,14 +2280,18 @@ pub const Effects = struct {
         side.active.volatiles.substitute = hp + 1;
         side.active.volatiles.Substitute = true;
         try log.start(battle.active(player), .Substitute);
-        if (hp > 0) try log.damage(battle.active(player), side.stored(), .None);
+        if (hp > 0) {
+            try log.damage(battle.active(player), side.stored(), .None);
+            if (showdown and side.stored().hp == 0) residual.* = false;
+        }
     }
 
     fn switchAndTeleport(battle: anytype, player: Player, move: Move.Data, log: anytype) !void {
         if (!showdown or battle.side(player).last_selected_move == .Teleport) return;
 
-        // Whirlwind/Roar should not roll to hit but Pokémon Showdown does anyway
+        // Whirlwind/Roar should not roll to hit/reset damage but Pokémon Showdown does anyway
         _ = try checkHit(battle, player, move, log);
+        battle.last_damage = 0;
     }
 
     fn thrashing(battle: anytype, player: Player) void {
@@ -2227,11 +2300,7 @@ pub const Effects = struct {
         assert(!volatiles.Bide);
 
         volatiles.Thrashing = true;
-        volatiles.state = 0;
-        volatiles.attacks = @intCast(u3, if (showdown)
-            battle.rng.range(u8, 2, 4)
-        else
-            (battle.rng.next() & 1) + 2);
+        volatiles.attacks = Rolls.bideThrashDuration(battle);
     }
 
     fn transform(battle: anytype, player: Player, log: anytype) !void {
@@ -2263,7 +2332,7 @@ pub const Effects = struct {
         try log.transform(battle.active(player), foe_ident);
     }
 
-    fn binding(battle: anytype, player: Player) void {
+    fn binding(battle: anytype, player: Player, rewrap: bool) void {
         var side = battle.side(player);
         var foe = battle.foe(player);
 
@@ -2271,9 +2340,11 @@ pub const Effects = struct {
         side.active.volatiles.Binding = true;
         // GLITCH: Hyper Beam automatic selection glitch if Recharging gets cleared on miss
         // (Pokémon Showdown unitentionally patches this glitch, preventing automatic selection)
-        if (!showdown) foe.active.volatiles.Recharging = false;
+        if (!showdown) {
+            foe.active.volatiles.Recharging = false;
+        } else if (foe.stored().hp == 0) return if (!rewrap) battle.rng.advance(1);
 
-        side.active.volatiles.attacks = distribution(battle) - 1;
+        side.active.volatiles.attacks = Rolls.distribution(battle) - 1;
     }
 
     fn boost(battle: anytype, player: Player, move: Move.Data, log: anytype) !void {
@@ -2300,9 +2371,11 @@ pub const Effects = struct {
                     return try log.fail(ident, .None);
                 }
                 var mod = BOOSTS[@intCast(u4, @as(i8, boosts.atk) + 6)];
-                const stat = unmodifiedStats(battle, player).atk;
+                const stat = unmodifiedStats(battle, side).atk;
                 stats.atk = @min(MAX_STAT_VALUE, stat * mod[0] / mod[1]);
                 try log.boost(ident, reason, n);
+                // Pokémon Showdown doesn't re-apply status modifiers after Rage boosts
+                if (showdown and move.effect == .Rage) return;
             },
             .DefenseUp1, .DefenseUp2 => {
                 assert(boosts.def >= -6 and boosts.def <= 6);
@@ -2318,7 +2391,7 @@ pub const Effects = struct {
                     return try log.fail(ident, .None);
                 }
                 var mod = BOOSTS[@intCast(u4, @as(i8, boosts.def) + 6)];
-                const stat = unmodifiedStats(battle, player).def;
+                const stat = unmodifiedStats(battle, side).def;
                 stats.def = @min(MAX_STAT_VALUE, stat * mod[0] / mod[1]);
                 try log.boost(ident, .Defense, n);
             },
@@ -2335,7 +2408,7 @@ pub const Effects = struct {
                     return try log.fail(ident, .None);
                 }
                 var mod = BOOSTS[@intCast(u4, @as(i8, boosts.spe) + 6)];
-                const stat = unmodifiedStats(battle, player).spe;
+                const stat = unmodifiedStats(battle, side).spe;
                 stats.spe = @min(MAX_STAT_VALUE, stat * mod[0] / mod[1]);
                 try log.boost(ident, .Speed, 2);
             },
@@ -2355,7 +2428,7 @@ pub const Effects = struct {
                     return try log.fail(ident, .None);
                 }
                 var mod = BOOSTS[@intCast(u4, @as(i8, boosts.spc) + 6)];
-                const stat = unmodifiedStats(battle, player).spc;
+                const stat = unmodifiedStats(battle, side).spc;
                 stats.spc = @min(MAX_STAT_VALUE, stat * mod[0] / mod[1]);
                 try log.boost(ident, .SpecialAttack, n);
                 try log.boost(ident, .SpecialDefense, n);
@@ -2376,28 +2449,24 @@ pub const Effects = struct {
     fn unboost(battle: anytype, player: Player, move: Move.Data, log: anytype) !void {
         var foe = battle.foe(player);
         const foe_ident = battle.active(player.foe());
+        const secondary = move.effect.isStatDownChance();
 
-        if (foe.active.volatiles.Substitute) {
-            return if (!move.effect.isStatDownChance()) log.fail(foe_ident, .None);
-        }
+        if (foe.active.volatiles.Substitute) return if (!secondary) log.fail(foe_ident, .None);
 
-        if (move.effect.isStatDownChance()) {
-            const chance = if (showdown)
-                battle.rng.chance(u8, 85, 256)
-            else
-                battle.rng.next() < Gen12.percent(33) + 1;
-            if (!chance or foe.active.volatiles.Invulnerable) return;
+        if (secondary) {
+            if (!Rolls.unboost(battle) or foe.active.volatiles.Invulnerable) return;
         } else if (!showdown and !try checkHit(battle, player, move, log)) {
             return; // checkHit already checks for Invulnerable
         }
 
         var stats = &foe.active.stats;
         var boosts = &foe.active.boosts;
+        const fail = showdown or !secondary;
 
         switch (move.effect) {
             .AttackDown1, .AttackDownChance => {
                 assert(boosts.atk >= -6 and boosts.atk <= 6);
-                if (boosts.atk == -6) return try log.fail(foe_ident, .None);
+                if (boosts.atk == -6) return if (fail) try log.fail(foe_ident, .None);
                 boosts.atk = @intCast(i4, @max(-6, @as(i8, boosts.atk) - 1));
                 if (stats.atk == 1) {
                     boosts.atk += 1;
@@ -2408,13 +2477,13 @@ pub const Effects = struct {
                     return try log.fail(foe_ident, .None);
                 }
                 var mod = BOOSTS[@intCast(u4, @as(i8, boosts.atk) + 6)];
-                const stat = unmodifiedStats(battle, player.foe()).atk;
+                const stat = unmodifiedStats(battle, foe).atk;
                 stats.atk = @max(1, stat * mod[0] / mod[1]);
                 try log.boost(foe_ident, .Attack, -1);
             },
             .DefenseDown1, .DefenseDown2, .DefenseDownChance => {
                 assert(boosts.def >= -6 and boosts.def <= 6);
-                if (boosts.def == -6) return try log.fail(foe_ident, .None);
+                if (boosts.def == -6) return if (fail) try log.fail(foe_ident, .None);
                 const n: u2 = if (move.effect == .DefenseDown2) 2 else 1;
                 boosts.def = @intCast(i4, @max(-6, @as(i8, boosts.def) - n));
                 if (stats.def == 1) {
@@ -2426,13 +2495,13 @@ pub const Effects = struct {
                     return try log.fail(foe_ident, .None);
                 }
                 var mod = BOOSTS[@intCast(u4, @as(i8, boosts.def) + 6)];
-                const stat = unmodifiedStats(battle, player.foe()).def;
+                const stat = unmodifiedStats(battle, foe).def;
                 stats.def = @max(1, stat * mod[0] / mod[1]);
                 try log.boost(foe_ident, .Defense, -@as(i8, n));
             },
             .SpeedDown1, .SpeedDownChance => {
                 assert(boosts.spe >= -6 and boosts.spe <= 6);
-                if (boosts.spe == -6) return try log.fail(foe_ident, .None);
+                if (boosts.spe == -6) return if (fail) try log.fail(foe_ident, .None);
                 boosts.spe = @intCast(i4, @max(-6, @as(i8, boosts.spe) - 1));
                 if (stats.spe == 1) {
                     boosts.spe += 1;
@@ -2443,14 +2512,14 @@ pub const Effects = struct {
                     return try log.fail(foe_ident, .None);
                 }
                 var mod = BOOSTS[@intCast(u4, @as(i8, boosts.spe) + 6)];
-                const stat = unmodifiedStats(battle, player.foe()).spe;
+                const stat = unmodifiedStats(battle, foe).spe;
                 stats.spe = @max(1, stat * mod[0] / mod[1]);
                 try log.boost(foe_ident, .Speed, -1);
                 assert(boosts.spe >= -6);
             },
             .SpecialDownChance => {
                 assert(boosts.spc >= -6 and boosts.spc <= 6);
-                if (boosts.spc == -6) return try log.fail(foe_ident, .None);
+                if (boosts.spc == -6) return if (fail) try log.fail(foe_ident, .None);
                 boosts.spc = @intCast(i4, @max(-6, @as(i8, boosts.spc) - 1));
                 if (stats.spc == 1) {
                     boosts.spc += 1;
@@ -2463,14 +2532,14 @@ pub const Effects = struct {
                     return try log.fail(foe_ident, .None);
                 }
                 var mod = BOOSTS[@intCast(u4, @as(i8, boosts.spc) + 6)];
-                const stat = unmodifiedStats(battle, player.foe()).spc;
+                const stat = unmodifiedStats(battle, foe).spc;
                 stats.spc = @max(1, stat * mod[0] / mod[1]);
                 try log.boost(foe_ident, .SpecialAttack, -1);
                 try log.boost(foe_ident, .SpecialDefense, -1);
             },
             .AccuracyDown1 => {
                 assert(boosts.accuracy >= -6 and boosts.accuracy <= 6);
-                if (boosts.accuracy == -6) return try log.fail(foe_ident, .None);
+                if (boosts.accuracy == -6) return if (fail) try log.fail(foe_ident, .None);
                 boosts.accuracy = @intCast(i4, @max(-6, @as(i8, boosts.accuracy) - 1));
                 try log.boost(foe_ident, .Accuracy, -1);
             },
@@ -2482,8 +2551,7 @@ pub const Effects = struct {
     }
 };
 
-fn unmodifiedStats(battle: anytype, who: Player) *Stats(u16) {
-    const side = battle.side(who);
+fn unmodifiedStats(battle: anytype, side: *Side) *Stats(u16) {
     if (!side.active.volatiles.Transform) return &side.stored().stats;
     const id = ID.from(side.active.volatiles.transform);
     return &battle.side(id.player).pokemon[id.id - 1].stats;
@@ -2497,7 +2565,7 @@ fn statusModify(status: u8, stats: *Stats(u16)) void {
     }
 }
 
-fn isForced(active: ActivePokemon) bool {
+inline fn isForced(active: ActivePokemon) bool {
     return active.volatiles.Recharging or active.volatiles.Rage or
         active.volatiles.Thrashing or active.volatiles.Charging;
 }
@@ -2549,68 +2617,140 @@ fn clearVolatiles(battle: anytype, who: Player, log: anytype) !void {
     }
 }
 
-fn disabled(side: *Side, ident: ID, log: anytype) !bool {
-    if (side.active.volatiles.disabled_move != 0) {
-        // A Pokémon that transforms after being disabled may end up with less move slots
-        const m = side.active.moves[side.active.volatiles.disabled_move - 1].id;
-        if (m != .None and m == side.last_selected_move) {
-            side.active.volatiles.Charging = false;
-            try log.disabled(ident, side.last_selected_move);
-            return true;
+pub const Rolls = struct {
+    inline fn speedTie(battle: anytype) bool {
+        if (showdown) return battle.rng.range(u8, 0, 2) == 0;
+        return battle.rng.next() < Gen12.percent(50) + 1;
+    }
+
+    inline fn criticalHit(battle: anytype, chance: u16) bool {
+        if (showdown) return battle.rng.chance(u8, @intCast(u8, chance), 256);
+        return std.math.rotl(u8, battle.rng.next(), 3) < chance;
+    }
+
+    inline fn damage(battle: anytype) u8 {
+        if (showdown) return battle.rng.range(u8, 217, 256);
+        while (true) {
+            const r = std.math.rotr(u8, battle.rng.next(), 1);
+            if (r >= 217) return r;
         }
     }
-    return false;
-}
 
-fn handleThrashing(battle: anytype, active: *ActivePokemon) bool {
-    var volatiles = &active.volatiles;
-    assert(volatiles.Thrashing);
-    if (volatiles.attacks > 0) return false;
+    inline fn hit(battle: anytype, accuracy: u16) bool {
+        if (showdown) return battle.rng.chance(u8, @intCast(u8, accuracy), 256);
+        return battle.rng.next() < accuracy;
+    }
 
-    volatiles.Thrashing = false;
-    volatiles.Confusion = true;
-    volatiles.confusion = @intCast(u3, if (showdown)
-        battle.rng.range(u8, 2, 6)
-    else
-        (battle.rng.next() & 3) + 2);
+    inline fn confusionDuration(battle: anytype) u3 {
+        if (showdown) return @intCast(u3, battle.rng.range(u8, 2, 6));
+        return @intCast(u3, (battle.rng.next() & 3) + 2);
+    }
 
-    return true;
-}
+    inline fn confused(battle: anytype) bool {
+        if (showdown) return !battle.rng.chance(u8, 128, 256);
+        return battle.rng.next() >= Gen12.percent(50) + 1;
+    }
 
-const DISTRIBUTION = [_]u3{ 2, 2, 2, 3, 3, 3, 4, 5 };
+    inline fn paralyzed(battle: anytype) bool {
+        if (showdown) return battle.rng.chance(u8, 63, 256);
+        return battle.rng.next() < Gen12.percent(25);
+    }
 
-fn distribution(battle: anytype) u3 {
-    if (showdown) return DISTRIBUTION[battle.rng.range(u8, 0, DISTRIBUTION.len)];
-    const r = (battle.rng.next() & 3);
-    return @intCast(u3, (if (r < 2) r else battle.rng.next() & 3) + 2);
-}
+    inline fn confusionChance(battle: anytype) bool {
+        if (showdown) return battle.rng.chance(u8, 25, 256);
+        return battle.rng.next() < Gen12.percent(10);
+    }
 
-fn randomMoveSlot(rand: anytype, moves: []MoveSlot, check_pp: u4) u4 {
-    if (showdown) {
-        if (check_pp == 0) {
-            var i: usize = moves.len;
-            while (i > 0) {
-                i -= 1;
-                if (moves[i].id != .None) return rand.range(u4, 0, @intCast(u4, i + 1)) + 1;
-            }
-        } else {
-            var r = rand.range(u4, 0, @intCast(u4, check_pp)) + 1;
-            var i: usize = 0;
-            while (i < moves.len and r > 0) : (i += 1) {
-                if (moves[i].pp > 0) {
-                    r -= 1;
-                    if (r == 0) break;
+    inline fn secondaryChance(battle: anytype, low: bool) bool {
+        if (showdown) return battle.rng.chance(u8, @as(u8, if (low) 26 else 77), 256);
+        return battle.rng.next() < 1 + (if (low) Gen12.percent(10) else Gen12.percent(30));
+    }
+
+    inline fn poisonChance(battle: anytype, low: bool) bool {
+        if (showdown) return battle.rng.chance(u8, @as(u8, if (low) 52 else 103), 256);
+        return battle.rng.next() < 1 + (if (low) Gen12.percent(20) else Gen12.percent(40));
+    }
+
+    inline fn sleepDuration(battle: anytype) u3 {
+        if (showdown) return @intCast(u3, battle.rng.range(u8, 1, 8));
+        while (true) {
+            const r = battle.rng.next() & 7;
+            if (r != 0) return @intCast(u3, r);
+        }
+    }
+
+    inline fn bideThrashDuration(battle: anytype) u3 {
+        if (showdown) return @intCast(u3, battle.rng.range(u4, 2, 4));
+        return @intCast(u3, (battle.rng.next() & 1) + 2);
+    }
+
+    fn moveSlot(battle: anytype, moves: []MoveSlot, check_pp: u4) u4 {
+        if (showdown) {
+            if (check_pp == 0) {
+                var i: usize = moves.len;
+                while (i > 0) {
+                    i -= 1;
+                    if (moves[i].id != .None) {
+                        return battle.rng.range(u4, 0, @intCast(u4, i + 1)) + 1;
+                    }
                 }
+            } else {
+                var r = battle.rng.range(u4, 0, @intCast(u4, check_pp)) + 1;
+                var i: usize = 0;
+                while (i < moves.len and r > 0) : (i += 1) {
+                    if (moves[i].pp > 0) {
+                        r -= 1;
+                        if (r == 0) break;
+                    }
+                }
+                return @intCast(u4, i + 1);
             }
-            return @intCast(u4, i + 1);
+        }
+
+        while (true) {
+            const r = @intCast(u4, battle.rng.next() & 3);
+            if (moves[r].id != .None and (check_pp == 0 or moves[r].pp > 0)) return r + 1;
         }
     }
 
-    while (true) {
-        const r = @intCast(u4, rand.next() & 3);
-        if (moves[r].id != .None and (check_pp == 0 or moves[r].pp > 0)) return r + 1;
+    inline fn disableDuration(battle: anytype) u4 {
+        if (showdown) return @intCast(u4, battle.rng.range(u8, 1, 9));
+        return @intCast(u4, (battle.rng.next() & 7) + 1);
     }
-}
+
+    inline fn metronome(battle: anytype) Move {
+        if (showdown) {
+            const r = battle.rng.range(u8, 0, @enumToInt(Move.Struggle) - 2);
+            const mod = @as(u2, (if (r < @enumToInt(Move.Metronome) - 1) 1 else 2));
+            return @intToEnum(Move, r + mod);
+        }
+        while (true) {
+            const r = battle.rng.next();
+            if (r == 0 or r == @enumToInt(Move.Metronome)) continue;
+            if (r >= @enumToInt(Move.Struggle)) continue;
+            return @intToEnum(Move, r);
+        }
+    }
+
+    inline fn psywave(battle: anytype, max: u8) u8 {
+        if (showdown) return battle.rng.range(u8, 0, max);
+        while (true) {
+            const r = battle.rng.next();
+            if (r < max) return r;
+        }
+    }
+
+    inline fn distribution(battle: anytype) u3 {
+        if (showdown) return DISTRIBUTION[battle.rng.range(u8, 0, DISTRIBUTION.len)];
+        const r = (battle.rng.next() & 3);
+        return @intCast(u3, (if (r < 2) r else battle.rng.next() & 3) + 2);
+    }
+
+    inline fn unboost(battle: anytype) bool {
+        if (showdown) return battle.rng.chance(u8, 85, 256);
+        return battle.rng.next() < Gen12.percent(33) + 1;
+    }
+};
 
 test "RNG agreement" {
     if (!showdown) return;
@@ -2710,9 +2850,11 @@ pub fn choices(battle: anytype, player: Player, request: Choice.Type, out: []Cho
                 while (slot <= 4) : (slot += 1) {
                     const m = active.moves[slot - 1];
                     if (m.id == .None) break;
-                    if (m.id == side.last_selected_move) {
-                        // Pokémon Showdown displays Struggle if limited to Bide when out of PP
-                        const s = if (m.pp == 0 and m.id == .Bide) 0 else slot;
+                    if (m.id == if (active.volatiles.Bide) .Bide else side.last_selected_move) {
+                        // Pokémon Showdown displays Struggle if limited to Bide but unable to pick
+                        const struggle =
+                            m.id == .Bide and (m.pp == 0 or active.volatiles.disabled_move == slot);
+                        const s = if (struggle) 0 else slot;
                         out[n] = .{ .type = .Move, .data = s };
                         n += 1;
                         return n;