@pkmn/engine 0.1.0-dev.80019d10 → 0.1.0-dev.8058a1d0

package/src/lib/gen1/mechanics.zig

@@ -1,37 +1,29 @@
-const std = @import("std");
-
-const pkmn = @import("../pkmn.zig");
+const DEBUG = @import("../common/debug.zig").print;
 
+const builtin = @import("builtin");
+const chance = @import("chance.zig");
 const common = @import("../common/data.zig");
-const DEBUG = @import("../common/debug.zig").print;
+const data = @import("data.zig");
+const pkmn = @import("../pkmn.zig");
 const protocol = @import("../common/protocol.zig");
 const rng = @import("../common/rng.zig");
-
-const data = @import("data.zig");
+const std = @import("std");
 
 const assert = std.debug.assert;
-
-const expectEqual = std.testing.expectEqual;
-
-const showdown = pkmn.options.showdown;
-
-const Choice = common.Choice;
-const ID = common.ID;
-const Player = common.Player;
-const Result = common.Result;
-
 const Boost = protocol.Boost;
+const Choice = common.Choice;
 const Damage = protocol.Damage;
+const Effectiveness = data.Effectiveness;
+const expectEqual = std.testing.expectEqual;
 const Fail = protocol.Fail;
-const Heal = protocol.Heal;
-
 const Gen12 = rng.Gen12;
-
-const ActivePokemon = data.ActivePokemon;
-const Effectiveness = data.Effectiveness;
+const Heal = protocol.Heal;
+const ID = common.ID;
 const Move = data.Move;
 const MoveSlot = data.MoveSlot;
-const Pokemon = data.Pokemon;
+const Player = common.Player;
+const Result = common.Result;
+const showdown = pkmn.options.showdown;
 const Side = data.Side;
 const Species = data.Species;
 const Stats = data.Stats;
@@ -71,8 +63,8 @@ pub fn update(battle: anytype, c1: Choice, c2: Choice, options: anytype) !Result
     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;
+    const r1 = showdown and p1.active.volatiles.Binding and c2.type == .Switch;
+    const r2 = showdown and p2.active.volatiles.Binding and c1.type == .Switch;
 
     if (try turnOrder(battle, c1, c2, options) == .P1) {
         if (try doTurn(battle, .P1, c1, r1, s1, .P2, c2, r2, s2, options)) |r| return r;
@@ -90,13 +82,13 @@ fn start(battle: anytype, options: anytype) !Result {
     const p1 = battle.side(.P1);
     const p2 = battle.side(.P2);
 
-    var p1_slot = findFirstAlive(p1);
+    const p1_slot = findFirstAlive(p1);
     assert(!showdown or p1_slot == 1);
-    if (p1_slot == 0) return if (findFirstAlive(p2) == 0) Result.Tie else Result.Lose;
+    if (p1_slot == 0) return if (findFirstAlive(p2) == 0) .Tie else .Lose;
 
-    var p2_slot = findFirstAlive(p2);
+    const p2_slot = findFirstAlive(p2);
     assert(!showdown or p2_slot == 1);
-    if (p2_slot == 0) return Result.Win;
+    if (p2_slot == 0) return .Win;
 
     try switchIn(battle, .P1, p1_slot, true, options);
     try switchIn(battle, .P2, p2_slot, true, options);
@@ -166,7 +158,7 @@ fn selectMove(
             // to satisfy the conditions of the Desync Clause Mod. However, because Binding is still
             // set the selected move will not actually be used, it will just be reported as having
             // been used (this differs from how Pokémon Showdown works, but its impossible to
-            // replicate the incorrect behavior with the correct mechanisms).
+            // replicate the incorrect behavior with the correct mechanisms)
             saveMove(battle, player, choice);
         } else {
             assert(choice.data == 0);
@@ -174,7 +166,10 @@ fn selectMove(
             if (foe_choice.type == .Switch) {
                 const last = side.active.move(battle.lastMove(player).index);
                 if (last.id == .Metronome) side.last_selected_move = last.id;
-                if (last.id == .MirrorMove) return Result.Error;
+                if (last.id == .MirrorMove) {
+                    if (!pkmn.options.mod) return .Error;
+                    side.last_selected_move = last.id;
+                }
             }
         }
         return null;
@@ -253,11 +248,11 @@ fn switchIn(battle: anytype, player: Player, slot: u8, initial: bool, options: a
     active.moves = incoming.moves;
 
     statusModify(incoming.status, &active.stats);
+    options.chance.switched(player, slot);
 
     foe.active.volatiles.Binding = false;
 
     try options.log.switched(.{ battle.active(player), incoming });
-    options.chance.switched(player, side.order[0], out);
 
     if (showdown and incoming.status == Status.TOX) {
         incoming.status = Status.init(.PSN);
@@ -347,13 +342,13 @@ fn doTurn(
     )) |r| return r;
     if (!replace) {
         if (player_choice.type != .Switch) {
-            if (try checkFaint(battle, foe_player, options)) |r| return r;
+            if (try checkFaint(battle, foe_player, true, options)) |r| return r;
         }
         if (residual) try handleResidual(battle, player, options);
-        if (try checkFaint(battle, player, options)) |r| return r;
+        if (try checkFaint(battle, player, false, options)) |r| return r;
     } else if (foe_choice.type == .Pass) return null;
 
-    options.chance.clearPending();
+    if (!showdown) options.chance.clearPending();
 
     residual = true;
     replace = battle.side(foe_player).stored().hp == 0;
@@ -369,10 +364,10 @@ fn doTurn(
     )) |r| return r;
     if (!replace) {
         if (!calc and foe_choice.type != .Switch) {
-            if (try checkFaint(battle, player, options)) |r| return r;
+            if (try checkFaint(battle, player, true, options)) |r| return r;
         }
         if (residual) try handleResidual(battle, foe_player, options);
-        if (try checkFaint(battle, foe_player, options)) |r| return r;
+        if (try checkFaint(battle, foe_player, false, options)) |r| return r;
     }
 
     // Flinch is bugged on Pokémon Showdown because it gets implemented with a duration which causes
@@ -425,19 +420,19 @@ fn executeMove(
         mslot = @intCast(battle.lastMove(player).index);
         const stored = side.stored();
         // GLITCH: Struggle bypass PP underflow via Hyper Beam / Trapping-switch auto selection
-        auto = isForced(&side.active) or
+        auto = pkmn.options.mod or isForced(&side.active) or
             side.active.volatiles.Binding or side.active.volatiles.Bide or
             side.last_selected_move == .HyperBeam or
             Status.is(stored.status, .FRZ) or Status.is(stored.status, .SLP);
         // If it wasn't Hyper Beam or the continuation of a move effect then we must have just
         // thawed, in which case we will desync unless the last_selected_move happened to be at
-        // index 1 and the current Pokémon has the same move in its first slot.
+        // index 1 and the current Pokémon has the same move in its first slot
         if (!auto) {
             // side.active.moves(slot) is safe to check even though the slot in question might not
             // technically be from this Pokémon because it must be exactly 1 to not desync and
             // every Pokémon must have at least one move
             if (mslot != 1 or side.active.move(mslot).id != side.last_selected_move) {
-                return Result.Error;
+                return .Error;
             } else {
                 auto = true;
             }
@@ -455,7 +450,26 @@ fn executeMove(
         .skip_can => skip_can = true,
         .skip_pp => skip_pp = true,
         .ok => {},
-        .err => return @as(?Result, Result.Error),
+        .err => return .Error,
+    }
+
+    // Pokémon Showdown incorrectly implements PP deduction when handling the Hyper Beam automatic
+    // selection glitch - if the move was proced due to Metronome / Mirror Move it either subtracts
+    // from the Hyper Beam slot if present or skips PP deduction entirely...
+    if (showdown and !skip_pp and side.last_selected_move == .HyperBeam and
+        side.last_selected_move != side.active.move(mslot).id)
+    {
+        assert(mslot == 1);
+        const has_beam = has_beam: {
+            for (side.active.moves, 0..) |m, i| {
+                if (m.id == .HyperBeam) {
+                    mslot = @intCast(i + 1);
+                    break :has_beam true;
+                }
+            }
+            break :has_beam false;
+        };
+        if (!has_beam) skip_pp = true;
     }
 
     const can = skip_can or
@@ -484,17 +498,22 @@ fn beforeMove(
 
     if (Status.is(stored.status, .SLP)) {
         const before = stored.status;
+        const slf = Status.is(stored.status, .EXT);
         // Even if the EXT bit is set this will still correctly modify the sleep duration
-        if (options.calc.modify(player, .sleep)) |extend| {
-            if (!extend) stored.status = 0;
+        if (options.calc.overridden(player, .sleep)) |obs| switch (obs) {
+            .started, .ended => stored.status = 0,
+            .continuing => if (Status.duration(stored.status) > 1) {
+                stored.status -= 1;
+            },
+            else => unreachable,
         } else {
             stored.status -= 1;
         }
 
         const duration = Status.duration(stored.status);
-        if (!Status.is(stored.status, .EXT)) {
-            try options.chance.sleep(player, duration);
-        }
+        try options.chance.sleep(player, if (slf)
+            .None
+        else if (duration == 0) .ended else .continuing);
 
         if (duration == 0) {
             try log.curestatus(.{ ident, before, .Message });
@@ -532,12 +551,12 @@ fn beforeMove(
     }
 
     if (volatiles.disable_duration > 0) {
-        if (options.calc.modify(player, .disable)) |extend| {
-            if (!extend) volatiles.disable_duration = 0;
-        } else {
-            volatiles.disable_duration -= 1;
-        }
-        try options.chance.disable(player, volatiles.disable_duration);
+        volatiles.disable_duration =
+            decrement(.disable, player, options, volatiles.disable_duration);
+        try options.chance.disable(
+            player,
+            if (volatiles.disable_duration == 0) .ended else .continuing,
+        );
 
         if (volatiles.disable_duration == 0) {
             volatiles.disable_move = 0;
@@ -550,19 +569,24 @@ fn beforeMove(
     // 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) {
-        assert(!showdown);
+        assert(!pkmn.options.mod);
         return .err;
     }
 
     if (volatiles.Confusion) {
         assert(volatiles.confusion > 0);
-
-        if (options.calc.modify(player, .confusion)) |extend| {
-            if (!extend) volatiles.confusion = 0;
+        if (options.calc.overridden(player, .confusion)) |obs| switch (obs) {
+            .started, .ended => volatiles.confusion = 0,
+            .continuing => if (volatiles.confusion > 1) {
+                volatiles.confusion -= 1;
+            },
+            .overwritten => {},
+            else => unreachable,
         } else {
             volatiles.confusion -= 1;
         }
-        try options.chance.confusion(player, volatiles.confusion);
+
+        try options.chance.confusion(player, if (volatiles.confusion == 0) .ended else .continuing);
 
         if (volatiles.confusion == 0) {
             volatiles.Confusion = false;
@@ -580,7 +604,9 @@ fn beforeMove(
                 volatiles.Charging = false;
                 volatiles.Binding = false;
                 volatiles.Invulnerable = false;
-                options.chance.clearDurations(player, null);
+
+                options.chance.observe(.attacking, player, .None);
+                options.chance.observe(.binding, player, .None);
                 {
                     // This feels (and is) disgusting but the cartridge literally just overwrites
                     // the opponent's defense with the user's defense and resets it after. As a
@@ -588,19 +614,14 @@ fn beforeMove(
                     const def = foe.active.stats.def;
                     foe.active.stats.def = active.stats.def;
                     defer foe.active.stats.def = def;
-                    if (!calcDamage(battle, player, player.foe(), null, false)) return .err;
+                    if (!calcDamage(battle, player, player.foe(), null, false, options)) {
+                        return .err;
+                    }
                 }
-                // Pokémon Showdown incorrectly changes the "target" of the confusion self-hit based
-                // on the targeting behavior of the confused Pokémon's selected move which results
-                // in the wrong behavior with respect to the Substitute + Confusion glitch
-                const target = if (showdown and Move.get(side.last_selected_move).target == .Self)
-                    player
-                else
-                    player.foe();
 
                 const uncapped = battle.last_damage;
                 // Skipping adjustDamage / randomizeDamage / checkHit
-                _ = try applyDamage(battle, player, target, .Confusion, options);
+                _ = try applyDamage(battle, player, player.foe(), .Confusion, options);
                 // Pokémon Showdown thinks that confusion damage is uncapped ¯\_(ツ)_/¯
                 if (showdown) battle.last_damage = uncapped;
 
@@ -617,7 +638,10 @@ fn beforeMove(
         volatiles.Thrashing = false;
         volatiles.Charging = false;
         volatiles.Binding = false;
-        options.chance.clearDurations(player, null);
+
+        options.chance.observe(.attacking, player, .None);
+        options.chance.observe(.binding, player, .None);
+
         // GLITCH: Invulnerable is not cleared, resulting in permanent Fly/Dig invulnerability
         try log.cant(.{ ident, .Paralysis });
         return .done;
@@ -635,14 +659,8 @@ fn beforeMove(
             volatiles.state +%= battle.last_damage;
         }
 
-        assert(volatiles.attacks > 0);
-
-        if (options.calc.modify(player, .attacking)) |extend| {
-            if (!extend) volatiles.attacks = 0;
-        } else {
-            volatiles.attacks -= 1;
-        }
-        try options.chance.attacking(player, volatiles.attacks);
+        volatiles.attacks = decrement(.attacking, player, options, volatiles.attacks);
+        try options.chance.attacking(player, if (volatiles.attacks == 0) .ended else .continuing);
 
         if (volatiles.attacks != 0) {
             try log.activate(.{ ident, .Bide });
@@ -676,39 +694,40 @@ fn beforeMove(
     }
 
     if (volatiles.Thrashing) {
-        assert(volatiles.attacks > 0);
+        try log.move(.{ ident, side.last_selected_move, battle.active(player.foe()) });
 
-        if (options.calc.modify(player, .attacking)) |extend| {
-            if (!extend) volatiles.attacks = 0;
-        } else {
-            volatiles.attacks -= 1;
-        }
-        try options.chance.attacking(player, volatiles.attacks);
+        volatiles.attacks = decrement(.attacking, player, options, volatiles.attacks);
+        try options.chance.attacking(player, if (volatiles.attacks == 0) .ended else .continuing);
+
+        if (volatiles.attacks == 0) {
+            const overwritten = volatiles.Confusion;
+
+            volatiles.Thrashing = false;
+            volatiles.Confusion = true;
+            volatiles.confusion = Rolls.confusionDuration(battle, player, options);
 
-        if (!showdown and handleThrashing(battle, active, player, options)) {
+            // On Pokémon Showdown this could leak information to the opponent that thrashing has
+            // ended (the engine's protocol is always from the omniscient perspective and clients
+            // can be expected to recognize this pattern and pass the information only to the
+            // correct player)
             try log.start(.{ battle.active(player), .ConfusionSilent });
+            options.chance.observe(.confusion, player, if (overwritten)
+                if (pkmn.options.overwrite) .overwritten else .continuing
+            else
+                .started);
+            if (!overwritten) options.calc.confusion(player);
         }
-        try log.move(.{ ident, side.last_selected_move, battle.active(player.foe()) });
-        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, player, options)) {
-                try log.start(.{ battle.active(player), .ConfusionSilent });
-            }
-        }
+
+        // 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
+        if (showdown) side.last_used_move = side.last_selected_move;
+
         return .skip_can;
     }
 
     if (volatiles.Binding) {
-        assert(volatiles.attacks > 0);
-
-        if (options.calc.modify(player, .binding)) |extend| {
-            if (!extend) volatiles.attacks = 0;
-        } else {
-            volatiles.attacks -= 1;
-        }
-        try options.chance.binding(player, volatiles.attacks);
+        volatiles.attacks = decrement(.binding, player, options, volatiles.attacks);
+        try options.chance.binding(player, if (volatiles.attacks == 0) .ended else .continuing);
 
         try log.move(.{ ident, side.last_selected_move, battle.active(player.foe()) });
         if (showdown or battle.last_damage != 0) {
@@ -738,7 +757,6 @@ fn canMove(
     const player_ident = battle.active(player);
     const move = Move.get(side.last_selected_move);
 
-    var skip = skip_pp;
     if (side.active.volatiles.Charging) {
         side.active.volatiles.Charging = false;
         side.active.volatiles.Invulnerable = false;
@@ -750,7 +768,7 @@ fn canMove(
     }
 
     side.last_used_move = side.last_selected_move;
-    if (!skip) decrementPP(side, mslot, auto);
+    if (!skip_pp) decrementPP(side, mslot, auto);
 
     const target = if (move.target == .Self) player else player.foe();
     try options.log.move(.{ player_ident, side.last_selected_move, battle.active(target), from });
@@ -763,9 +781,14 @@ fn canMove(
 
     if (move.effect == .Thrashing) {
         Effects.thrashing(battle, player, options);
-    } else if (!showdown and move.effect == .Binding) {
-        // Pokémon Showdown handles this after hit/miss checks and damage calculation
-        try Effects.binding(battle, player, false, options);
+    } else if (move.effect == .Binding) {
+        // Pokémon Showdown handles this after hit/miss checks and damage calculation, though clears
+        // Recharging in onTryMove (required for the Hyper Beam automatic selection glitch)
+        if (showdown) {
+            battle.foe(player).active.volatiles.Recharging = false;
+        } else {
+            try Effects.binding(battle, player, false, options);
+        }
     }
 
     return true;
@@ -802,7 +825,7 @@ fn decrementPP(side: *Side, mslot: u4, auto: bool) void {
     assert(active.move(mslot).pp == side.stored().move(mslot).pp);
 }
 
-fn incrementPP(side: *Side, mslot: u4) void {
+fn incrementPP(side: *Side, player: Player, mslot: u4, options: anytype) void {
     var active = &side.active;
     const volatiles = &active.volatiles;
 
@@ -810,8 +833,11 @@ fn incrementPP(side: *Side, mslot: u4) void {
     // GLITCH: No check for Transform means an empty/incorrect stored slot can get incremented
     if (showdown and volatiles.Transform) return;
 
+    const n = options.calc.overridden(player, .pp) orelse 1;
+    if (volatiles.Transform and !options.chance.pp(player, n)) return;
+
     assert(mslot > 0 and mslot <= 4);
-    side.stored().moves[mslot - 1].pp = @as(u6, @intCast(side.stored().moves[mslot - 1].pp)) +% 1;
+    side.stored().moves[mslot - 1].pp = @as(u6, @intCast(side.stored().moves[mslot - 1].pp)) +% n;
 }
 
 // Pokémon Showdown does hit/multi/crit/damage instead of crit/damage/hit/multi
@@ -852,20 +878,20 @@ fn doMove(
     var miss = showdown and miss: {
         immune = move.target != .Self and !status and !counter and
             (@intFromEnum(move.type.effectiveness(foe.active.types.type1)) == 0 or
-            @intFromEnum(move.type.effectiveness(foe.active.types.type2)) == 0);
+                @intFromEnum(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) {
             battle.last_damage = 0;
             break :miss true;
         }
         break :miss (move.target != .Self and
-            !moveHit(battle, player, move, &immune, &mist, options));
+            !try moveHit(battle, player, move, &immune, &mist, options));
     };
     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 or (!skip or counter)) and !miss) damage: {
         if (showdown and move.effect.isMulti()) {
             try Effects.multiHit(battle, player, move, options);
             hits = side.active.volatiles.attacks;
@@ -887,9 +913,10 @@ fn doMove(
                 ohko = if (!showdown) side.active.stats.spe >= foe.active.stats.spe else true;
                 // This can overflow after adjustDamage, but will still be sufficient to OHKO
                 battle.last_damage = if (ohko) 65535 else 0;
-                if (showdown) break :blk; // skip adjustDamage / randomizeDamage
-            } else if (!calcDamage(battle, player, player.foe(), move, crit)) {
-                return @as(?Result, Result.Error);
+                if (showdown) break :damage; // skip adjustDamage / randomizeDamage
+            } else if (!calcDamage(battle, player, player.foe(), move, crit, options)) {
+                if (!showdown) try options.chance.commit(player, .err);
+                return .Error;
             }
             if (battle.last_damage == 0) {
                 immune = true;
@@ -902,11 +929,12 @@ fn doMove(
         }
     }
 
-    var zero = battle.last_damage == 0;
-    miss = if (showdown or skip)
-        miss
-    else
-        (!moveHit(battle, player, move, &immune, &mist, options) or zero);
+    var missed: bool = undefined;
+    const zero = battle.last_damage == 0;
+    if (!showdown and !skip) {
+        missed = !try moveHit(battle, player, move, &immune, &mist, options);
+        miss = missed or zero;
+    }
 
     assert(showdown or miss or battle.last_damage > 0 or skip);
     assert((!showdown and miss) or !(ohko and immune));
@@ -933,11 +961,32 @@ fn doMove(
             try log.immune(.{ foe_ident, .OHKO });
         } else if (immune and !invulnerable and (!showdown or move.effect != .Binding)) {
             try log.immune(.{ foe_ident, .None });
+            if (!showdown) {
+                if (move.effect == .Binding) {
+                    // Rather obnoxiously, the cartridge sets the Binding volatile in canMove and
+                    // then simply clears it later on if the move happens to miss in moveHit.
+                    // However, moveHit can return true and we'll still end up in the outer miss
+                    // handling block because attacking into an immune Pokemon does zero damage
+                    // (considered missing)
+                    assert(zero);
+                    // Thus we still need to actually save the hit result (but not the crit roll).
+                    // Using .miss for this commit would accomplish what we want, but is somewhat
+                    // misleading as its entirely possible the move actually did hit (and the target
+                    // is now trapped) so we use the .binding value instead which is effectively
+                    // identical, just doesn't claim to know about the actual results of the hit
+                    // roll)
+                    try options.chance.commit(player, .binding);
+                } else {
+                    // The .glitch option allows for conditionally committing if we are in a
+                    // division-by-zero freeze alternative timeline scenario
+                    try options.chance.commit(player, .glitch);
+                }
+            }
         } else if (mist) {
             if (!foe.active.volatiles.Substitute) try log.activate(.{ foe_ident, .Mist });
             try log.fail(.{ foe_ident, .None });
         } else {
-            if (showdown or !zero) try options.chance.commit(player, .miss);
+            if (!showdown) try options.chance.commit(player, if (zero and !missed) .hit else .miss);
             try log.lastmiss(.{});
             try log.miss(.{battle.active(player)});
         }
@@ -952,17 +1001,15 @@ fn doMove(
             try buildRage(battle, player.foe(), options);
         } else if (showdown and move.effect == .Disable) {
             try buildRage(battle, player.foe(), options);
-        } else if (!showdown and immune and move.effect == .Binding) {
-            try options.chance.commit(player, .binding);
         }
         return null;
-    } else {
+    } else if (!showdown) {
         try options.chance.commit(player, .hit);
     }
 
     // On the cartridge MultiHit doesn't get set up until after damage has been applied for the
     // first time but its more convenient and efficient to set it up here (Pokémon Showdown sets
-    // it up above before damage calculation).
+    // it up above before damage calculation)
     if (!showdown and move.effect.isMulti()) {
         try Effects.multiHit(battle, player, move, options);
         hits = side.active.volatiles.attacks;
@@ -972,7 +1019,7 @@ fn doMove(
     const sub = showdown and foe.active.volatiles.Substitute;
 
     var nullified = false;
-    var hit: u4 = 0;
+    var hit: usize = 0;
     while (hit < hits) {
         if (hit == 0) {
             if (crit) try log.crit(.{battle.active(player.foe())});
@@ -1000,33 +1047,31 @@ fn doMove(
         if (showdown and move.effect == .Twineedle and !nullified and foe.stored().hp > 0) {
             try Effects.poison(battle, player, Move.get(.PoisonSting), options);
         }
-        try log.hitcount(.{ battle.active(player.foe()), hit });
-    } else if (showdown) {
+        try log.hitcount(.{ battle.active(player.foe()), @as(u4, @intCast(hit)) });
+    } else if (showdown and move.effect == .Binding) {
         // This should be handled much earlier but Pokémon Showdown does it here... ¯\_(ツ)_/¯
-        if (move.effect == .Binding) {
-            try Effects.binding(battle, player, rewrap, options);
-            if (immune) {
-                battle.last_damage = 0;
-                assert(foe.stored().hp > 0);
-                // Pokémon Showdown logs |-damage| here instead of |-immune| because logic...
-                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(), options);
-                }
-                return null;
+        try Effects.binding(battle, player, rewrap, options);
+        if (immune) {
+            battle.last_damage = 0;
+            assert(foe.stored().hp > 0);
+            // Pokémon Showdown logs |-damage| here instead of |-immune| because logic...
+            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(), options);
             }
+            return null;
         }
     }
 
     // Substitute being broken nullifies the move's effect completely so even
-    // if an effect was intended to "always happen" it will still get skipped.
+    // if an effect was intended to "always happen" it will still get skipped
     if (nullified) return null;
 
     // On the cartridge, "always happen" effect handlers are called in the applyDamage loop above,
     // but this is only done to setup the MultiHit looping in the first place. Moving the MultiHit
-    // setup before the loop means we can avoid having to waste time doing no-op handler searches.
+    // setup before the loop means we can avoid having to waste time doing no-op handler searches
     if (move.effect.alwaysHappens()) try alwaysHappens(battle, player, move, residual, options);
 
     if (foe.stored().hp == 0) return null;
@@ -1041,7 +1086,7 @@ fn doMove(
         // below). For Twineedle we change the data to that of one with PoisonChance1 given its
         // MultiHit behavior is complete after the loop above, though Pokémon Showdown handles the
         // Twineedle secondary effect in the MultiHit cleanup block above because it incorrectly
-        // puts the |-status| message before |-hitcount| instead of after.
+        // puts the |-status| message before |-hitcount| instead of after
         if (move.effect == .Twineedle) {
             if (!showdown) try Effects.poison(battle, player, Move.get(.PoisonSting), options);
         } else if (move.effect == .Disable) {
@@ -1060,12 +1105,14 @@ fn checkCriticalHit(battle: anytype, player: Player, move: Move.Data, options: a
     const side = battle.side(player);
 
     // Base speed is used for the critical hit calculation, even when Transform-ed
-    var rate = @as(u16, Species.chance(side.stored().species));
+    var rate: u16 = Species.chance(side.stored().species);
     // GLITCH: Focus Energy reduces critical hit rate instead of increasing it
     rate = if (side.active.volatiles.FocusEnergy) rate / 2 else @min(rate * 2, 255);
     rate = if (move.effect == .HighCritical) @min(rate * 4, 255) else rate / 2;
 
-    return Rolls.criticalHit(battle, player, @intCast(rate), options);
+    const spurious =
+        !showdown and ((move.bp == 0 and move.effect != .OHKO) or move.target == .Depends);
+    return Rolls.criticalHit(battle, player, @intCast(rate), spurious, options);
 }
 
 fn calcDamage(
@@ -1074,6 +1121,7 @@ fn calcDamage(
     target_player: Player,
     m: ?Move.Data,
     crit: bool,
+    options: anytype,
 ) bool {
     // Confusion (indicated when m == null) just needs a 40 BP physical move
     const cfz = m == null;
@@ -1085,28 +1133,8 @@ fn calcDamage(
 
     const special = move.type.special();
 
-    // zig fmt: off
-    var atk: u32 =
-        if (crit)
-            if (special) side.stored().stats.spc
-            else side.stored().stats.atk
-        else
-            if (special) side.active.stats.spc
-            else side.active.stats.atk;
-    var def: u32 =
-        if (crit)
-            if (special) target.stored().stats.spc
-            else target.stored().stats.def
-        else
-            // GLITCH: not capped to MAX_STAT_VALUE, can be 999 * 2 = 1998
-            if (special)
-                target.active.stats.spc *
-                    @as(u2, if (target.active.volatiles.LightScreen) 2 else 1)
-            // Pokémon Showdown doesn't apply the opponent's Reflect to confusion's self-hit
-            else
-                target.active.stats.def *
-                    @as(u2, if ((!showdown or !cfz) and target.active.volatiles.Reflect) 2 else 1);
-    // zig fmt: on
+    var atk = attack(side, crit, special);
+    var def = defense(target, crit, special, cfz);
 
     // Pokémon Showdown erroneously skips this for confusion's self-hit damage, but thankfully we
     // will not overflow because the hit is only 40 BP and unboosted (the highest legal unboosted
@@ -1114,12 +1142,12 @@ fn calcDamage(
     if ((!showdown or !cfz) and (atk > 255 or def > 255)) {
         atk = @max((atk / 4) & 255, 1);
         // GLITCH: not adjusted to be a min of 1 on cartridge (can lead to division-by-zero freeze)
-        def = @max((def / 4) & 255, if (showdown) 1 else 0);
+        def = @max((def / 4) & 255, if (pkmn.options.mod) 1 else 0);
     }
 
-    const lvl = @as(u32, side.stored().level * @as(u2, if (crit) 2 else 1));
+    const lvl: u32 = side.stored().level * @as(u2, if (crit) 2 else 1);
 
-    def = @as(u32, if (move.effect == .Explode) @max(def / 2, 1) else def);
+    def = if (move.effect == .Explode) @max(def / 2, 1) else def;
 
     if (def == 0) return false;
 
@@ -1131,11 +1159,41 @@ fn calcDamage(
     d = @min(997, d);
     d += 2;
 
+    // Whether or not a critical hit occurred can change whether a division-by-zero freeze is
+    // encountered so we need to make sure that in the event of a miss we commit the status of the
+    // crit roll. The alternative to doing this extra work is to *always* commit the crit roll but
+    // that results in counter intuitive probabilities in the common case
+    if (pkmn.options.chance and !pkmn.options.mod and move.effect != .Explode) {
+        atk = attack(side, !crit, special);
+        def = defense(target, !crit, special, false);
+        if ((atk > 255 or def > 255) and (def / 4) & 255 == 0) options.chance.glitch();
+    }
+
     battle.last_damage = @intCast(d);
 
     return true;
 }
 
+fn attack(side: *Side, crit: bool, special: bool) u32 {
+    return if (crit)
+        if (special) side.stored().stats.spc else side.stored().stats.atk
+    else if (special) side.active.stats.spc else side.active.stats.atk;
+}
+
+fn defense(target: *Side, crit: bool, special: bool, cfz: bool) u32 {
+    return if (crit)
+        if (special) target.stored().stats.spc else target.stored().stats.def
+    else
+    // GLITCH: not capped to MAX_STAT_VALUE, can be 999 * 2 = 1998
+    if (special)
+        target.active.stats.spc *
+            @as(u2, if (target.active.volatiles.LightScreen) 2 else 1)
+    else
+        // Pokémon Showdown doesn't apply the opponent's Reflect to confusion's self-hit
+        target.active.stats.def *
+            @as(u2, if ((!showdown or !cfz) and target.active.volatiles.Reflect) 2 else 1);
+}
+
 fn adjustDamage(battle: anytype, player: Player) u16 {
     const side = battle.side(player);
     const foe = battle.foe(player);
@@ -1180,7 +1238,6 @@ fn specialDamage(battle: anytype, player: Player, move: Move.Data, options: anyt
     const foe = battle.foe(player);
 
     if (!try checkHit(battle, player, move, options)) return null;
-    try options.chance.commit(player, .hit);
 
     battle.last_damage = switch (side.last_selected_move) {
         .SuperFang => @max(foe.stored().hp / 2, 1),
@@ -1191,13 +1248,13 @@ fn specialDamage(battle: anytype, player: Player, move: Move.Data, options: anyt
         .Psywave => power: {
             const max: u8 = @intCast(@as(u16, side.stored().level) * 3 / 2);
             // GLITCH: Psywave infinite glitch loop
-            if (!showdown and max <= 1) return Result.Error;
+            if (!pkmn.options.mod and max <= 1) return .Error;
             break :power try Rolls.psywave(battle, player, max, options);
         },
         else => unreachable,
     };
 
-    if (battle.last_damage == 0) return if (showdown) null else Result.Error;
+    if (battle.last_damage == 0) return if (pkmn.options.mod) null else .Error;
 
     const sub = showdown and foe.active.volatiles.Substitute;
     _ = try applyDamage(battle, player.foe(), player.foe(), .None, options);
@@ -1217,15 +1274,15 @@ fn counterDamage(battle: anytype, player: Player, move: Move.Data, options: anyt
     // 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)
-        .Splash
-    else
-        foe.last_selected_move);
+            .Splash
+        else
+            foe.last_selected_move);
 
     const used = battle.lastMove(player.foe()).counterable != 0;
     const selected = foe_last_selected_move.bp > 0 and
         foe.last_selected_move != .Counter and
         (foe_last_selected_move.type == .Normal or
-        foe_last_selected_move.type == .Fighting);
+            foe_last_selected_move.type == .Fighting);
 
     if (!used and !selected) {
         try options.log.fail(.{ battle.active(player), .None });
@@ -1234,16 +1291,19 @@ fn counterDamage(battle: anytype, player: Player, move: Move.Data, options: anyt
 
     if (!used or !selected) {
         // GLITCH: Counter desync (covered by Desync Clause Mod on Pokémon Showdown)
-        if (!showdown) return Result.Error;
+        if (!pkmn.options.mod) return .Error;
         try options.log.fail(.{ battle.active(player), .None });
         return null;
     }
 
-    battle.last_damage *|= 2;
+    // NOTE: llvm/llvm-project#58557
+    battle.last_damage = if (comptime builtin.target.cpu.arch.isWasm())
+        @max(battle.last_damage *% 2, std.math.maxInt(u16))
+    else
+        battle.last_damage *| 2;
 
-    // Pokémon Showdown calls checkHit before Counter
+    // Pokémon Showdown calls moveHit before Counter
     if (!showdown and !try checkHit(battle, player, move, options)) return null;
-    try options.chance.commit(player, .hit);
 
     const sub = showdown and foe.active.volatiles.Substitute;
     _ = try applyDamage(battle, player.foe(), player.foe(), .None, options);
@@ -1272,7 +1332,7 @@ fn applyDamage(
             subbed.active.volatiles.Substitute = false;
             // battle.last_damage is not updated with the amount of HP the Substitute had
             try options.log.end(.{ battle.active(sub_player), .Substitute });
-            options.calc.capped(target_player);
+            if (reason != .Confusion) options.calc.capped(sub_player);
             return true;
         } else {
             // Safe to truncate since less than subbed.volatiles.substitute which is a u8
@@ -1306,7 +1366,7 @@ fn mirrorMove(
         try options.log.fail(.{ battle.active(player), .None });
         return null;
     } else if (!showdown or foe.last_used_move != .Struggle) {
-        incrementPP(side, mslot);
+        incrementPP(side, player, mslot, options);
     }
 
     if (!try canMove(battle, player, mslot, auto, false, .MirrorMove, residual, options)) {
@@ -1327,7 +1387,7 @@ fn metronome(
     var side = battle.side(player);
 
     side.last_selected_move = try Rolls.metronome(battle, player, options);
-    incrementPP(side, mslot);
+    incrementPP(side, player, mslot, options);
 
     if (!try canMove(battle, player, mslot, auto, false, .Metronome, residual, options)) {
         return null;
@@ -1339,7 +1399,10 @@ fn checkHit(battle: anytype, player: Player, move: Move.Data, options: anytype)
     var immune = false;
     var mist = false;
 
-    if (moveHit(battle, player, move, &immune, &mist, options)) return true;
+    if (try moveHit(battle, player, move, &immune, &mist, options)) {
+        if (!showdown) try options.chance.commit(player, .hit);
+        return true;
+    }
 
     assert(!immune);
     if (mist) {
@@ -1348,11 +1411,11 @@ fn checkHit(battle: anytype, player: Player, move: Move.Data, options: anytype)
         try options.log.activate(.{ foe_ident, .Mist });
         try options.log.fail(.{ foe_ident, .None });
     } else {
-        try options.chance.commit(player, .miss);
         try options.log.lastmiss(.{});
         try options.log.miss(.{battle.active(player)});
     }
 
+    if (!showdown) try options.chance.commit(player, .miss);
     return false;
 }
 
@@ -1363,7 +1426,7 @@ fn moveHit(
     immune: *bool,
     mist: *bool,
     options: anytype,
-) bool {
+) !bool {
     var side = battle.side(player);
     const foe = battle.foe(player);
 
@@ -1383,7 +1446,16 @@ fn moveHit(
             break :miss true;
         }
         if (!showdown) {
-            if (move.effect == .Swift) return true;
+            if (move.effect == .Swift) {
+                // If Swift could cause a division-by-zero freeze (which doesn't exist on Pokémon
+                // Showdown, hence why the block above doesn't include this code), we need the
+                // damage roll to be committed. However, the commit code will not save this roll if
+                // the glitch occurs and the move was not marked as having hit. To work around this
+                // we flag that the move hit (as Swift trivially does), but pass the probability of
+                // the hit as zero to ensure it doesn't actually get saved.
+                try options.chance.hit(player, true, 0);
+                return true;
+            }
             if (foe.active.volatiles.Invulnerable) break :miss true;
         }
 
@@ -1402,7 +1474,7 @@ fn moveHit(
         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, move.accuracy);
+        var accuracy: u16 = if (overwritten) state else move.accuracy;
         var boost = BOOSTS[@as(u4, @intCast(@as(i8, side.active.boosts.accuracy) + 6))];
         accuracy = accuracy * boost[0] / boost[1];
         boost = BOOSTS[@as(u4, @intCast(@as(i8, -foe.active.boosts.evasion) + 6))];
@@ -1414,7 +1486,7 @@ fn moveHit(
         if (overwrite) side.active.volatiles.state = accuracy;
 
         // GLITCH: max accuracy is 255 so 1/256 chance of miss
-        break :miss !Rolls.hit(battle, player, @intCast(accuracy), options);
+        break :miss !try Rolls.hit(battle, player, @intCast(accuracy), options);
     };
 
     // Pokémon Showdown reports miss instead of fail for moves blocked by Mist that 1/256 miss
@@ -1425,13 +1497,17 @@ fn moveHit(
 
     if (!miss) return true;
     if (!showdown or !foe.active.volatiles.Invulnerable) battle.last_damage = 0;
+
     side.active.volatiles.Binding = false;
+    options.chance.observe(.binding, player, .None);
+
     return false;
 }
 
 fn checkFaint(
     battle: anytype,
     player: Player,
+    cap: bool,
     options: anytype,
 ) @TypeOf(options.log).Error!?Result {
     const side = battle.side(player);
@@ -1444,21 +1520,21 @@ fn checkFaint(
     const foe_out = foe_fainted and findFirstAlive(foe) == 0;
     const more = player_out or foe_out;
 
-    if (try faint(battle, player, !(more or foe_fainted), options)) |r| return r;
-    if (foe_fainted) if (try faint(battle, player.foe(), !more, options)) |r| return r;
+    if (try faint(battle, player, !(more or foe_fainted), cap, options)) |r| return r;
+    if (foe_fainted) if (try faint(battle, player.foe(), !more, false, options)) |r| return r;
 
     assert(!side.active.volatiles.MultiHit);
     assert(!foe.active.volatiles.MultiHit);
 
     if (player_out and foe_out) {
         try options.log.tie(.{});
-        return Result.Tie;
+        return .Tie;
     } else if (player_out) {
         try options.log.win(.{player.foe()});
-        return if (player == .P1) Result.Lose else Result.Win;
+        return if (player == .P1) .Lose else .Win;
     } else if (foe_out) {
         try options.log.win(.{player});
-        return if (player == .P1) Result.Win else Result.Lose;
+        return if (player == .P1) .Win else .Lose;
     }
 
     const foe_choice: Choice.Type = if (foe_fainted) .Switch else .Pass;
@@ -1466,7 +1542,7 @@ fn checkFaint(
     return .{ .p1 = foe_choice, .p2 = .Switch };
 }
 
-fn faint(battle: anytype, player: Player, done: bool, options: anytype) !?Result {
+fn faint(battle: anytype, player: Player, done: bool, cap: bool, options: anytype) !?Result {
     var side = battle.side(player);
     var foe = battle.foe(player);
     assert(side.stored().hp == 0);
@@ -1475,8 +1551,8 @@ fn faint(battle: anytype, player: Player, done: bool, options: anytype) !?Result
     assert(!foe_volatiles.MultiHit);
     if (foe_volatiles.Bide) {
         assert(!foe_volatiles.Thrashing and !foe_volatiles.Rage);
-        foe_volatiles.state = if (showdown) 0 else foe_volatiles.state & 255;
-        if (foe_volatiles.state != 0) return Result.Error;
+        foe_volatiles.state = if (pkmn.options.mod) 0 else foe_volatiles.state & 255;
+        if (foe_volatiles.state != 0) return .Error;
     }
 
     // Clearing these is not strictly necessary as provided the battle hasn't ended the side that
@@ -1500,7 +1576,9 @@ fn faint(battle: anytype, player: Player, done: bool, options: anytype) !?Result
     }
 
     try options.log.faint(.{ battle.active(player), done });
-    options.calc.capped(player);
+    // We can only safely set capped if the faint occured as the direct result of an opponent's
+    // move (as opposed to due to residual damage, recoil, Explosion, etc)
+    if (cap) options.calc.capped(player);
     return null;
 }
 
@@ -1564,21 +1642,21 @@ fn endTurn(battle: anytype, options: anytype) @TypeOf(options.log).Error!Result
 
     battle.turn += 1;
 
-    if (showdown and pkmn.options.ebc and checkEBC(battle)) {
+    if (pkmn.options.mod and pkmn.options.ebc and checkEBC(battle)) {
         try options.log.tie(.{});
-        return Result.Tie;
+        return .Tie;
     }
 
-    if (showdown and battle.turn >= 1000) {
+    if (pkmn.options.mod and battle.turn >= 1000) {
         try options.log.tie(.{});
-        return Result.Tie;
+        return .Tie;
     } else if (battle.turn >= 65535) {
-        return Result.Error;
+        return .Error;
     }
 
     try options.log.turn(.{battle.turn});
 
-    return Result.Default;
+    return .Default;
 }
 
 fn checkEBC(battle: anytype) bool {
@@ -1660,17 +1738,6 @@ fn buildRage(battle: anytype, who: Player, options: anytype) !void {
     }
 }
 
-fn handleThrashing(battle: anytype, active: *ActivePokemon, player: Player, options: anytype) 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, player, true, options);
-    return true;
-}
-
 fn onBegin(
     battle: anytype,
     player: Player,
@@ -1679,7 +1746,6 @@ fn onBegin(
     residual: *bool,
     options: anytype,
 ) !void {
-    assert(move.effect.onBegin());
     return switch (move.effect) {
         .Confusion => Effects.confusion(battle, player, move, options),
         .Conversion => Effects.conversion(battle, player, options),
@@ -1702,7 +1768,6 @@ fn onBegin(
 }
 
 fn onEnd(battle: anytype, player: Player, move: Move.Data, options: anytype) !void {
-    assert(move.effect.onEnd());
     return switch (move.effect) {
         .Bide => Effects.bide(battle, player, options),
         // zig fmt: off
@@ -1724,7 +1789,6 @@ fn alwaysHappens(
     residual: *bool,
     options: anytype,
 ) !void {
-    assert(move.effect.alwaysHappens());
     return switch (move.effect) {
         .DrainHP, .DreamEater => Effects.drainHP(battle, player, options),
         .Explode => Effects.explode(battle, player),
@@ -1760,8 +1824,10 @@ 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 = Rolls.attackingDuration(battle, player, options);
+        options.chance.observe(.attacking, player, .started);
 
         try options.log.start(.{ battle.active(player), .Bide });
     }
@@ -1823,12 +1889,14 @@ pub const Effects = struct {
                 if (sub) return options.log.fail(.{ battle.active(player.foe()), .None });
                 if (!try checkHit(battle, player, move, options)) return;
             }
-            try options.chance.commit(player, .hit);
         }
 
         if (foe.active.volatiles.Confusion) return;
         foe.active.volatiles.Confusion = true;
-        foe.active.volatiles.confusion = Rolls.confusionDuration(battle, player, false, options);
+
+        foe.active.volatiles.confusion = Rolls.confusionDuration(battle, player, options);
+        options.chance.observe(.confusion, player.foe(), .started);
+        options.calc.confusion(player.foe());
 
         try options.log.start(.{ battle.active(player.foe()), .Confusion });
     }
@@ -1856,10 +1924,7 @@ pub const Effects = struct {
         const foe_ident = battle.active(player.foe());
 
         // Pokémon Showdown handles hit/miss earlier in doMove
-        if (!showdown) {
-            if (!try checkHit(battle, player, move, options)) return null;
-            try options.chance.commit(player, .hit);
-        }
+        if (!showdown and !try checkHit(battle, player, move, options)) return null;
 
         if (volatiles.disable_move != 0) {
             try options.log.fail(.{ foe_ident, .None });
@@ -1877,18 +1942,18 @@ pub const Effects = struct {
 
         // Technically this is still considered simply a "miss" on the cartridge,
         // but diverging from Pokémon Showdown here would mostly just be pedantic
-        if (n == 0) {
+        if (n == 0 or (pkmn.options.mod and err)) {
             try options.log.fail(.{ foe_ident, .None });
             return null;
         } else if (err) {
             // GLITCH: Transform + Mirror Move / Metronome PP softlock
-            assert(!showdown);
-            return Result.Error;
+            return .Error;
         }
 
         volatiles.disable_move =
             @intCast(try Rolls.moveSlot(battle, player, &foe.active.moves, n, options));
         volatiles.disable_duration = Rolls.disableDuration(battle, player, options);
+        options.chance.observe(.disable, player.foe(), .started);
 
         const id = foe.active.move(volatiles.disable_move).id;
         try options.log.start(.{ foe_ident, .Disable, id });
@@ -1959,7 +2024,7 @@ pub const Effects = struct {
         if (foe.active.types.includes(move.type)) return;
         if (!try Rolls.secondaryChance(battle, player, true, options)) return;
         // Freeze Clause Mod
-        if (showdown) for (foe.pokemon) |p| if (Status.is(p.status, .FRZ)) return;
+        if (pkmn.options.mod) for (foe.pokemon) |p| if (Status.is(p.status, .FRZ)) return;
 
         foe_stored.status = Status.init(.FRZ);
         // GLITCH: Hyper Beam recharging status is not cleared
@@ -1972,7 +2037,7 @@ pub const Effects = struct {
         var side = battle.side(player);
         var foe = battle.foe(player);
 
-        var side_stored = side.stored();
+        const side_stored = side.stored();
         var foe_stored = foe.stored();
 
         const player_ident = battle.active(player);
@@ -1995,22 +2060,24 @@ pub const Effects = struct {
                 if (p != player and Status.any(s.stored().status)) {
                     try log.curestatus(.{ foe_ident, foe_stored.status, .Silent });
                     s.stored().status = 0;
+                    options.chance.observe(.sleep, p, .None);
                 } else if (showdown and s.stored().status == Status.TOX) {
                     s.stored().status = Status.init(.PSN);
                     try log.status(.{ battle.active(p), s.stored().status, .None });
                 }
-                try clearVolatiles(battle, p, p != player, options);
+                try clearVolatiles(battle, p, options);
             }
         } else {
             if (Status.any(foe_stored.status)) {
                 if (Status.is(foe_stored.status, .FRZ) or Status.is(foe_stored.status, .SLP)) {
                     foe.last_selected_move = .SKIP_TURN;
+                    options.chance.observe(.sleep, player.foe(), .None);
                 }
                 try log.curestatus(.{ foe_ident, foe_stored.status, .Silent });
                 foe_stored.status = 0;
             }
-            try clearVolatiles(battle, player, false, options);
-            try clearVolatiles(battle, player.foe(), true, options);
+            try clearVolatiles(battle, player, options);
+            try clearVolatiles(battle, player.foe(), options);
         }
     }
 
@@ -2061,7 +2128,6 @@ pub const Effects = struct {
             }
         }
 
-        try options.chance.commit(player, .hit);
         foe.active.volatiles.LeechSeed = true;
 
         try options.log.start(.{ battle.active(player.foe()), .LeechSeed });
@@ -2102,12 +2168,10 @@ pub const Effects = struct {
             if (!has_mimic) {
                 // Invulnerable foes or 1/256 miss can trigger |-miss| instead of |-fail|
                 if (!try checkHit(battle, player, move, options)) return;
-                try options.chance.commit(player, .hit);
                 return options.log.fail(.{ battle.active(player.foe()), .None });
             }
         }
         if (!try checkHit(battle, player, move, options)) return;
-        try options.chance.commit(player, .hit);
 
         const rslot = try Rolls.moveSlot(battle, player, &foe.active.moves, 0, options);
         side.active.move(oslot).id = foe.active.move(rslot).id;
@@ -2161,7 +2225,6 @@ pub const Effects = struct {
             if (immune) return log.immune(.{ foe_ident, .None });
             if (!try checkHit(battle, player, move, options)) return;
         }
-        try options.chance.commit(player, .hit);
 
         foe_stored.status = Status.init(.PAR);
         foe.active.stats.spe = @max(foe.active.stats.spe / 4, 1);
@@ -2229,7 +2292,6 @@ pub const Effects = struct {
 
         if (move.effect == .Poison) {
             if (!showdown and !try checkHit(battle, player, move, options)) return;
-            try options.chance.commit(player, .hit);
         } else {
             if (!try Rolls.poisonChance(battle, player, move.effect == .PoisonChance1, options)) {
                 return;
@@ -2298,13 +2360,12 @@ pub const Effects = struct {
                     if (Status.is(foe_stored.status, .SLP)) Fail.Sleep else Fail.None,
                 });
             }
-            // If checkHit in doMove didn't return true Pokémon Showdown wouldn't be in here
+            // If moveHit in doMove didn't return true Pokémon Showdown wouldn't be in here
             if (!showdown and !try checkHit(battle, player, move, options)) return;
-            try options.chance.commit(player, .hit);
         }
 
         // Sleep Clause Mod
-        if (showdown) {
+        if (pkmn.options.mod) {
             for (foe.pokemon) |p| {
                 if (Status.is(p.status, .SLP) and !Status.is(p.status, .EXT)) return;
             }
@@ -2312,6 +2373,8 @@ pub const Effects = struct {
         foe.active.volatiles.Recharging = false;
 
         foe_stored.status = Status.slp(Rolls.sleepDuration(battle, player, options));
+        options.chance.observe(.sleep, player.foe(), .started);
+
         const last = battle.side(player).last_selected_move;
         try options.log.status(.{ foe_ident, foe_stored.status, .From, last });
     }
@@ -2353,9 +2416,7 @@ pub const Effects = struct {
         // Whirlwind/Roar should not roll to hit/reset damage but Pokémon Showdown does anyway
         if (showdown) {
             if (battle.side(player).last_selected_move == .Teleport) return;
-            if (try checkHit(battle, player, move, options)) {
-                try options.chance.commit(player, .hit);
-            }
+            _ = try checkHit(battle, player, move, options);
             battle.last_damage = 0;
         } else {
             try options.log.fail(.{ battle.active(player), .None });
@@ -2370,6 +2431,8 @@ pub const Effects = struct {
 
         volatiles.Thrashing = true;
         volatiles.attacks = Rolls.attackingDuration(battle, player, options);
+
+        options.chance.observe(.attacking, player, .started);
     }
 
     fn transform(battle: anytype, player: Player, options: anytype) !void {
@@ -2408,13 +2471,14 @@ pub const Effects = struct {
         if (side.active.volatiles.Binding) return;
         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)
+        // (Pokémon Showdown clears Recharging in onTryMove instead)
         if (!showdown) {
             foe.active.volatiles.Recharging = false;
         } else if (foe.stored().hp == 0) return if (!rewrap) battle.rng.advance(1);
 
         side.active.volatiles.attacks =
             try Rolls.distribution(battle, .Binding, player, options) - 1;
+        options.chance.observe(.binding, player, .started);
     }
 
     fn boost(battle: anytype, player: Player, move: Move.Data, options: anytype) !void {
@@ -2441,7 +2505,7 @@ pub const Effects = struct {
                     }
                     return log.fail(.{ ident, .None });
                 }
-                var mod = BOOSTS[@as(u4, @intCast(@as(i8, boosts.atk) + 6))];
+                const mod = BOOSTS[@as(u4, @intCast(@as(i8, boosts.atk) + 6))];
                 const stat = unmodifiedStats(battle, side).atk;
                 stats.atk = @min(MAX_STAT_VALUE, stat * mod[0] / mod[1]);
                 try log.boost(.{ ident, reason, n });
@@ -2461,7 +2525,7 @@ pub const Effects = struct {
                     }
                     return log.fail(.{ ident, .None });
                 }
-                var mod = BOOSTS[@as(u4, @intCast(@as(i8, boosts.def) + 6))];
+                const mod = BOOSTS[@as(u4, @intCast(@as(i8, boosts.def) + 6))];
                 const stat = unmodifiedStats(battle, side).def;
                 stats.def = @min(MAX_STAT_VALUE, stat * mod[0] / mod[1]);
                 try log.boost(.{ ident, .Defense, n });
@@ -2478,7 +2542,7 @@ pub const Effects = struct {
                     }
                     return log.fail(.{ ident, .None });
                 }
-                var mod = BOOSTS[@as(u4, @intCast(@as(i8, boosts.spe) + 6))];
+                const mod = BOOSTS[@as(u4, @intCast(@as(i8, boosts.spe) + 6))];
                 const stat = unmodifiedStats(battle, side).spe;
                 stats.spe = @min(MAX_STAT_VALUE, stat * mod[0] / mod[1]);
                 try log.boost(.{ ident, .Speed, 2 });
@@ -2498,7 +2562,7 @@ pub const Effects = struct {
                     }
                     return log.fail(.{ ident, .None });
                 }
-                var mod = BOOSTS[@as(u4, @intCast(@as(i8, boosts.spc) + 6))];
+                const mod = BOOSTS[@as(u4, @intCast(@as(i8, boosts.spc) + 6))];
                 const stat = unmodifiedStats(battle, side).spc;
                 stats.spc = @min(MAX_STAT_VALUE, stat * mod[0] / mod[1]);
                 try log.boost(.{ ident, .SpecialAttack, n });
@@ -2531,7 +2595,6 @@ pub const Effects = struct {
         } else {
             // checkHit already checks for Invulnerable
             if (!showdown and !try checkHit(battle, player, move, options)) return;
-            try options.chance.commit(player, .hit);
         }
 
         var stats = &foe.active.stats;
@@ -2551,7 +2614,7 @@ pub const Effects = struct {
                     }
                     return log.fail(.{ foe_ident, .None });
                 }
-                var mod = BOOSTS[@as(u4, @intCast(@as(i8, boosts.atk) + 6))];
+                const mod = BOOSTS[@as(u4, @intCast(@as(i8, boosts.atk) + 6))];
                 const stat = unmodifiedStats(battle, foe).atk;
                 stats.atk = @max(1, stat * mod[0] / mod[1]);
                 try log.boost(.{ foe_ident, .Attack, -1 });
@@ -2569,7 +2632,7 @@ pub const Effects = struct {
                     }
                     return log.fail(.{ foe_ident, .None });
                 }
-                var mod = BOOSTS[@as(u4, @intCast(@as(i8, boosts.def) + 6))];
+                const mod = BOOSTS[@as(u4, @intCast(@as(i8, boosts.def) + 6))];
                 const stat = unmodifiedStats(battle, foe).def;
                 stats.def = @max(1, stat * mod[0] / mod[1]);
                 try log.boost(.{ foe_ident, .Defense, -@as(i8, n) });
@@ -2586,7 +2649,7 @@ pub const Effects = struct {
                     }
                     return log.fail(.{ foe_ident, .None });
                 }
-                var mod = BOOSTS[@as(u4, @intCast(@as(i8, boosts.spe) + 6))];
+                const mod = BOOSTS[@as(u4, @intCast(@as(i8, boosts.spe) + 6))];
                 const stat = unmodifiedStats(battle, foe).spe;
                 stats.spe = @max(1, stat * mod[0] / mod[1]);
                 try log.boost(.{ foe_ident, .Speed, -1 });
@@ -2606,7 +2669,7 @@ pub const Effects = struct {
                     }
                     return log.fail(.{ foe_ident, .None });
                 }
-                var mod = BOOSTS[@as(u4, @intCast(@as(i8, boosts.spc) + 6))];
+                const mod = BOOSTS[@as(u4, @intCast(@as(i8, boosts.spc) + 6))];
                 const stat = unmodifiedStats(battle, foe).spc;
                 stats.spc = @max(1, stat * mod[0] / mod[1]);
                 try log.boost(.{ foe_ident, .SpecialAttack, -1 });
@@ -2645,22 +2708,22 @@ fn isForced(active: anytype) bool {
         active.volatiles.Thrashing or active.volatiles.Charging;
 }
 
-fn clearVolatiles(battle: anytype, who: Player, clear: bool, options: anytype) !void {
+fn clearVolatiles(battle: anytype, who: Player, options: anytype) !void {
     var log = options.log;
     var side = battle.side(who);
     var volatiles = &side.active.volatiles;
     const ident = battle.active(who);
 
-    options.chance.clearDurations(who, clear);
-
     if (volatiles.disable_move != 0) {
         volatiles.disable_move = 0;
         volatiles.disable_duration = 0;
+        options.chance.observe(.disable, who, .None);
         try log.end(.{ ident, .DisableSilent });
     }
     if (volatiles.Confusion) {
         // volatiles.confusion is left unchanged
         volatiles.Confusion = false;
+        options.chance.observe(.confusion, who, .None);
         try log.end(.{ ident, .ConfusionSilent });
     }
     if (volatiles.Mist) {
@@ -2695,10 +2758,25 @@ fn clearVolatiles(battle: anytype, who: Player, clear: bool, options: anytype) !
     }
 }
 
+fn decrement(
+    comptime field: chance.Action.Field,
+    player: Player,
+    options: anytype,
+    n: anytype,
+) @TypeOf(n) {
+    return if (options.calc.overridden(player, field)) |obs| switch (obs) {
+        .started, .ended => 0,
+        .continuing => if (n > 1) n - 1 else n,
+        else => unreachable,
+    } else n - 1;
+}
+
 pub const Rolls = struct {
     fn speedTie(battle: anytype, options: anytype) !bool {
         const p1 = if (options.calc.overridden(.P1, .speed_tie)) |player|
             player == .P1
+        else if (@hasDecl(@TypeOf(battle.rng), "speedTie"))
+            battle.rng.speedTie()
         else if (showdown)
             battle.rng.range(u8, 0, 2) == 0
         else
@@ -2708,21 +2786,31 @@ pub const Rolls = struct {
         return p1;
     }
 
-    fn criticalHit(battle: anytype, player: Player, rate: u8, options: anytype) !bool {
+    fn criticalHit(
+        battle: anytype,
+        player: Player,
+        rate: u8,
+        spurious: bool,
+        options: anytype,
+    ) !bool {
         const crit = if (options.calc.overridden(player, .critical_hit)) |val|
             val == .true
+        else if (@hasDecl(@TypeOf(battle.rng), "criticalHit"))
+            battle.rng.criticalHit(player, rate)
         else if (showdown)
             battle.rng.chance(u8, rate, 256)
         else
             std.math.rotl(u8, battle.rng.next(), 3) < rate;
 
-        try options.chance.criticalHit(player, crit, rate);
+        if (!spurious) try options.chance.criticalHit(player, crit, rate);
         return crit;
     }
 
     fn damage(battle: anytype, player: Player, options: anytype) !u8 {
         const roll = if (options.calc.overridden(player, .damage)) |val|
             val
+        else if (@hasDecl(@TypeOf(battle.rng), "damage"))
+            battle.rng.damage(player)
         else roll: {
             if (showdown) break :roll battle.rng.range(u8, 217, 256);
             while (true) {
@@ -2736,21 +2824,27 @@ pub const Rolls = struct {
         return roll;
     }
 
-    fn hit(battle: anytype, player: Player, accuracy: u8, options: anytype) bool {
+    const uN = if (pkmn.options.miss) u8 else u9;
+    fn hit(battle: anytype, player: Player, accuracy: u8, options: anytype) !bool {
+        const acc: uN = if (pkmn.options.miss) accuracy else @as(uN, accuracy) + 1;
         const ok = if (options.calc.overridden(player, .hit)) |val|
             val == .true
+        else if (@hasDecl(@TypeOf(battle.rng), "hit"))
+            battle.rng.hit(player, acc)
         else if (showdown)
-            battle.rng.chance(u8, accuracy, 256)
+            battle.rng.chance(uN, acc, 256)
         else
-            battle.rng.next() < accuracy;
+            battle.rng.next() < acc;
 
-        options.chance.hit(ok, accuracy);
+        try options.chance.hit(player, ok, acc);
         return ok;
     }
 
     fn confused(battle: anytype, player: Player, options: anytype) !bool {
         const cfz = if (options.calc.overridden(player, .confused)) |val|
             val == .true
+        else if (@hasDecl(@TypeOf(battle.rng), "confused"))
+            battle.rng.confused(player)
         else if (showdown)
             !battle.rng.chance(u8, 128, 256)
         else
@@ -2763,6 +2857,8 @@ pub const Rolls = struct {
     fn paralyzed(battle: anytype, player: Player, options: anytype) !bool {
         const par = if (options.calc.overridden(player, .paralyzed)) |val|
             val == .true
+        else if (@hasDecl(@TypeOf(battle.rng), "paralyzed"))
+            battle.rng.paralyzed(player)
         else if (showdown)
             battle.rng.chance(u8, 63, 256)
         else
@@ -2775,6 +2871,8 @@ pub const Rolls = struct {
     fn confusionChance(battle: anytype, player: Player, options: anytype) !bool {
         const proc = if (options.calc.overridden(player, .secondary_chance)) |val|
             val == .true
+        else if (@hasDecl(@TypeOf(battle.rng), "secondaryChance"))
+            battle.rng.secondaryChance(player, 25)
         else if (showdown)
             battle.rng.chance(u8, 25, 256)
         else
@@ -2789,6 +2887,8 @@ pub const Rolls = struct {
 
         const proc = if (options.calc.overridden(player, .secondary_chance)) |val|
             val == .true
+        else if (@hasDecl(@TypeOf(battle.rng), "secondaryChance"))
+            battle.rng.secondaryChance(player, rate)
         else if (showdown)
             battle.rng.chance(u8, rate, 256)
         else
@@ -2803,6 +2903,8 @@ pub const Rolls = struct {
 
         const proc = if (options.calc.overridden(player, .secondary_chance)) |val|
             val == .true
+        else if (@hasDecl(@TypeOf(battle.rng), "secondaryChance"))
+            battle.rng.secondaryChance(player, rate)
         else if (showdown)
             battle.rng.chance(u8, rate, 256)
         else
@@ -2815,6 +2917,8 @@ pub const Rolls = struct {
     fn unboost(battle: anytype, player: Player, options: anytype) !bool {
         const proc = if (options.calc.overridden(player, .secondary_chance)) |val|
             val == .true
+        else if (@hasDecl(@TypeOf(battle.rng), "secondaryChance"))
+            battle.rng.secondaryChance(player, 85)
         else if (showdown)
             battle.rng.chance(u8, 85, 256)
         else
@@ -2827,6 +2931,8 @@ pub const Rolls = struct {
     fn metronome(battle: anytype, player: Player, options: anytype) !Move {
         const move: Move = if (options.calc.overridden(player, .metronome)) |val|
             val
+        else if (@hasDecl(@TypeOf(battle.rng), "metronome"))
+            battle.rng.metronome(player)
         else if (showdown)
             Move.METRONOME[battle.rng.range(u8, 0, Move.METRONOME.len)]
         else move: {
@@ -2845,6 +2951,8 @@ pub const Rolls = struct {
     fn psywave(battle: anytype, player: Player, max: u8, options: anytype) !u8 {
         const power = if (options.calc.overridden(player, .psywave)) |val|
             val - 1
+        else if (@hasDecl(@TypeOf(battle.rng), "psywave"))
+            battle.rng.psywave(player)
         else if (showdown)
             battle.rng.range(u8, 0, max)
         else power: {
@@ -2860,8 +2968,11 @@ pub const Rolls = struct {
     }
 
     fn sleepDuration(battle: anytype, player: Player, options: anytype) u3 {
-        const duration: u3 = if (options.calc.overridden(player, .duration)) |val|
-            @intCast(val)
+        const duration: u3 = (if (options.calc.overridden(player, .duration)) |val|
+            if (val >= 1 and val <= 7) @as(u3, @intCast(val)) else null
+        else
+            null) orelse if (@hasDecl(@TypeOf(battle.rng), "sleepDuration"))
+            battle.rng.sleepDuration(player)
         else if (showdown)
             battle.rng.range(u3, 1, 8)
         else duration: {
@@ -2872,46 +2983,55 @@ pub const Rolls = struct {
         };
 
         assert(duration >= 1 and duration <= 7);
-        options.chance.duration(.sleep, player, player.foe(), duration);
+        options.chance.duration(player, duration);
         return duration;
     }
 
     fn disableDuration(battle: anytype, player: Player, options: anytype) u4 {
-        const duration: u4 = if (options.calc.overridden(player, .duration)) |val|
-            val
+        const duration: u4 = (if (options.calc.overridden(player, .duration)) |val|
+            if (val >= 1 and val <= 8) val else null
+        else
+            null) orelse if (@hasDecl(@TypeOf(battle.rng), "disableDuration"))
+            battle.rng.disableDuration(player)
         else if (showdown)
             battle.rng.range(u4, 1, 9)
         else
             @intCast((battle.rng.next() & 7) + 1);
 
         assert(duration >= 1 and duration <= 8);
-        options.chance.duration(.disable, player, player.foe(), duration);
+        options.chance.duration(player, duration);
         return duration;
     }
 
-    fn confusionDuration(battle: anytype, player: Player, self: bool, options: anytype) u3 {
-        const duration: u3 = if (options.calc.overridden(player, .duration)) |val|
-            @intCast(val)
+    fn confusionDuration(battle: anytype, player: Player, options: anytype) u3 {
+        const duration: u3 = (if (options.calc.overridden(player, .duration)) |val|
+            if (val >= 2 and val <= 5) @as(u3, @intCast(val)) else null
+        else
+            null) orelse if (@hasDecl(@TypeOf(battle.rng), "confusionDuration"))
+            battle.rng.confusionDuration(player)
         else if (showdown)
             battle.rng.range(u3, 2, 6)
         else
             @intCast((battle.rng.next() & 3) + 2);
 
         assert(duration >= 2 and duration <= 5);
-        options.chance.duration(.confusion, player, if (self) player else player.foe(), duration);
+        options.chance.duration(player, duration);
         return duration;
     }
 
     fn attackingDuration(battle: anytype, player: Player, options: anytype) u3 {
-        const duration: u3 = if (options.calc.overridden(player, .duration)) |val|
-            @intCast(val)
+        const duration: u3 = (if (options.calc.overridden(player, .duration)) |val|
+            if (val >= 2 and val <= 3) @as(u3, @intCast(val)) else null
+        else
+            null) orelse if (@hasDecl(@TypeOf(battle.rng), "attackingDuration"))
+            battle.rng.attackingDuration(player)
         else if (showdown)
             battle.rng.range(u3, 2, 4)
         else
             @intCast((battle.rng.next() & 1) + 2);
 
         assert(duration >= 2 and duration <= 3);
-        options.chance.duration(.attacking, player, player, duration);
+        options.chance.duration(player, duration);
         return duration;
     }
 
@@ -2924,8 +3044,11 @@ pub const Rolls = struct {
         options: anytype,
     ) !u3 {
         const roll = if (effect == .Binding) .duration else .multi_hit;
-        const n: u3 = if (options.calc.overridden(player, roll)) |val|
-            @intCast(val)
+        const n: u3 = (if (options.calc.overridden(player, roll)) |val|
+            if (val >= 2 and val <= 5) @as(u3, @intCast(val)) else null
+        else
+            null) orelse if (@hasDecl(@TypeOf(battle.rng), "distribution"))
+            battle.rng.distribution(player)
         else if (showdown)
             DISTRIBUTION[battle.rng.range(u3, 0, DISTRIBUTION.len)]
         else n: {
@@ -2935,7 +3058,7 @@ pub const Rolls = struct {
 
         assert(n >= 2 and n <= 5);
         if (effect == .Binding) {
-            options.chance.duration(.binding, player, player, n);
+            options.chance.duration(player, n);
         } else {
             try options.chance.multiHit(player, n);
         }
@@ -2950,15 +3073,15 @@ pub const Rolls = struct {
         options: anytype,
     ) !u4 {
         // TODO: consider throwing error instead of rerolling?
-        const overridden = if (options.calc.overridden(player, .move_slot)) |val|
+        const slot: u4 = (if (options.calc.overridden(player, .move_slot)) |val|
             if (moves[val - 1].id != .None and (check_pp == 0 or moves[val - 1].pp > 0))
                 val
             else
                 null
         else
-            null;
-
-        const slot: u4 = overridden orelse slot: {
+            null) orelse if (@hasDecl(@TypeOf(battle.rng), "moveSlot"))
+            battle.rng.moveSlot(player, moves, check_pp)
+        else slot: {
             if (showdown) {
                 if (check_pp == 0) {
                     var i: usize = moves.len;
@@ -3022,11 +3145,11 @@ pub fn choices(battle: anytype, player: Player, request: Choice.Type, out: []Cho
         },
         .Switch => {
             const side = battle.side(player);
-            var slot: u4 = 2;
+            var slot: usize = 2;
             while (slot <= 6) : (slot += 1) {
                 const id = side.order[slot - 1];
                 if (id == 0 or side.pokemon[id - 1].hp == 0) continue;
-                out[n] = .{ .type = .Switch, .data = slot };
+                out[n] = .{ .type = .Switch, .data = @intCast(slot) };
                 n += 1;
             }
             if (n == 0) {
@@ -3038,11 +3161,11 @@ pub fn choices(battle: anytype, player: Player, request: Choice.Type, out: []Cho
             const side = battle.side(player);
             const foe = battle.foe(player);
 
-            var active = &side.active;
+            const active = &side.active;
             const stored = side.stored();
 
             // While players are not given any input options on the cartridge in these cases,
-            // Pokémon Showdown instead produces a list with a single move that must be chosen.
+            // Pokémon Showdown instead produces a list with a single move that must be chosen
             //
             // Given that no input is allowed on the cartridge 'Pass' seems like it would be logical
             // here when not in compatibility mode, but the engine needs to be able to differentiate
@@ -3050,18 +3173,18 @@ pub fn choices(battle: anytype, player: Player, request: Choice.Type, out: []Cho
             // passing due to being forced into using a move. Instead of introducing another option
             // we simply repurpose Move with no move slot, even though pedantically this is not
             // strictly correct as the player would not have been presented the option to move or
-            // switch at all.
+            // switch at all
             if (isForced(active)) {
                 out[n] = .{ .type = .Move, .data = @intFromBool(showdown) };
                 n += 1;
                 return n;
             }
 
-            var slot: u4 = 2;
+            var slot: usize = 2;
             while (slot <= 6) : (slot += 1) {
                 const id = side.order[slot - 1];
                 if (id == 0 or side.pokemon[id - 1].hp == 0) continue;
-                out[n] = .{ .type = .Switch, .data = slot };
+                out[n] = .{ .type = .Switch, .data = @intCast(slot) };
                 n += 1;
             }
 
@@ -3069,7 +3192,7 @@ pub fn choices(battle: anytype, player: Player, request: Choice.Type, out: []Cho
             // On the cartridge, all of these happen after "FIGHT" (indicating you are not
             // switching) but before you are allowed to select a move. Pokémon Showdown instead
             // either disables all other moves in the case of limited or requires you to select a
-            // move normally if sleeping/frozen/bound.
+            // move normally if sleeping/frozen/bound
             if (!showdown and (limited or foe.active.volatiles.Binding or
                 Status.is(stored.status, .FRZ) or Status.is(stored.status, .SLP)))
             {
@@ -3082,7 +3205,7 @@ pub fn choices(battle: anytype, player: Player, request: Choice.Type, out: []Cho
             // Pokémon Showdown handles Bide and Binding moves by checking if the move in question
             // is present in the Pokémon's moveset (which means moves called via Metronome / Mirror
             // Move will not result in forcing the subsequent use unless the user also had the
-            // proc-ed move in their moveset) and disabling all other moves.
+            // proc-ed move in their moveset) and disabling all other moves
             if (limited) {
                 assert(showdown);
                 assert(side.last_selected_move != .None);
@@ -3094,7 +3217,7 @@ pub fn choices(battle: anytype, player: Player, request: Choice.Type, out: []Cho
                         const struggle =
                             m.id == .Bide and (m.pp == 0 or active.volatiles.disable_move == slot);
                         const s = if (struggle) 0 else slot;
-                        out[n] = .{ .type = .Move, .data = s };
+                        out[n] = .{ .type = .Move, .data = @intCast(s) };
                         n += 1;
                         return n;
                     }
@@ -3108,13 +3231,13 @@ pub fn choices(battle: anytype, player: Player, request: Choice.Type, out: []Cho
                 if (m.id == .None) break;
                 if (m.pp == 0) continue;
                 if (active.volatiles.disable_move == slot) continue;
-                out[n] = .{ .type = .Move, .data = slot };
+                out[n] = .{ .type = .Move, .data = @intCast(slot) };
                 n += 1;
             }
             // Struggle (Pokémon Showdown would use 'move 1' here)
             if (n == before) {
                 // GLITCH: Transform + Mirror Move / Metronome PP softlock
-                if (!showdown) {
+                if (!pkmn.options.mod) {
                     while (slot <= 4) : (slot += 1) {
                         if (active.moves[slot - 1].pp != 0) return n;
                     }