@pkmn/engine 0.1.0-dev.4eeb346e → 0.1.0-dev.53335a32

package/src/lib/gen1/mechanics.zig

@@ -56,8 +56,6 @@ 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);
@@ -187,7 +185,6 @@ fn selectMove(
     }
 
     // move select
-    volatiles.state = 0;
     if (choice.data == 0) {
         const struggle = ok: {
             for (side.active.moves, 0..) |move, i| {
@@ -304,7 +301,11 @@ fn turnOrder(battle: anytype, c1: Choice, c2: Choice) Player {
         // Pokémon Showdown's beforeTurnCallback shenanigans
         if (showdown and m1 == .Counter and m2 == .Counter) battle.rng.advance(1);
 
-        const p1 = Rolls.speedTie(battle);
+        const p1 = if (showdown)
+            battle.rng.range(u8, 0, 2) == 0
+        else
+            battle.rng.next() < Gen12.percent(50) + 1;
+
         if (!showdown) return if (p1) .P1 else .P2;
 
         // Pokémon Showdown's "lockedmove" volatile's onBeforeTurn uses BattleQueue#changeAction,
@@ -314,7 +315,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 regardless of who
+        // that out and enforce host ordering of events, so P1 just goes first reqgardless 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;
@@ -449,7 +450,7 @@ fn executeMove(
     return doMove(battle, player, mslot, auto, residual, log);
 }
 
-const BeforeMove = enum { done, skip_can, skip_pp, ok, err };
+const BeforeMove = union(enum) { done, skip_can, skip_pp, ok, err };
 
 fn beforeMove(
     battle: anytype,
@@ -536,7 +537,12 @@ fn beforeMove(
         } else {
             try log.activate(ident, .Confusion);
 
-            if (Rolls.confused(battle)) {
+            const confused = if (showdown)
+                !battle.rng.chance(u8, 128, 256)
+            else
+                battle.rng.next() >= Gen12.percent(50) + 1;
+
+            if (confused) {
                 assert(!volatiles.MultiHit);
                 if (!volatiles.Rage) volatiles.state = 0;
                 volatiles.Bide = false;
@@ -562,12 +568,8 @@ fn beforeMove(
                     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;
             }
@@ -576,15 +578,22 @@ fn beforeMove(
 
     if (!showdown and try disabled(side, ident, log)) 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 (Status.is(stored.status, .PAR)) {
+        const paralyzed = if (showdown)
+            battle.rng.chance(u8, 63, 256)
+        else
+            battle.rng.next() < Gen12.percent(25);
+
+        if (paralyzed) {
+            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) {
@@ -611,9 +620,8 @@ fn beforeMove(
             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);
+        if (foe.stored().hp > 0) 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
@@ -779,15 +787,12 @@ 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) {
-            battle.last_damage = 0;
-            break :miss true;
-        }
+        if (move.effect == .OHKO and side.active.stats.spe < foe.active.stats.spe) 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;
+    var late = showdown;
     const skip = status or immune;
     if ((!showdown or (!skip or counter)) and !miss) blk: {
         if (showdown and move.effect.isMulti()) {
@@ -889,9 +894,6 @@ 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) {
@@ -907,7 +909,7 @@ fn doMove(
         if (hit == 0 and ohko) try log.ohko();
         hit += 1;
         if (foe.stored().hp == 0) break;
-        if (!late and (!sub or move.effect == .Explode)) try buildRage(battle, player.foe(), log);
+        if (!late) try buildRage(battle, player.foe(), log);
         // If the substitute breaks during a multi-hit attack, the attack ends
         if (nullified) break;
     }
@@ -944,8 +946,8 @@ 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);
+    // Pokémon Showdown builds Rage at the wrong time for non-MultiHit moves
+    if (late 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
@@ -978,7 +980,8 @@ 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;
 
-    return Rolls.criticalHit(battle, chance);
+    if (showdown) return battle.rng.chance(u8, @intCast(u8, chance), 256);
+    return std.math.rotl(u8, battle.rng.next(), 3) < chance;
 }
 
 fn calcDamage(
@@ -1082,36 +1085,50 @@ fn adjustDamage(battle: anytype, player: Player) u16 {
 
 fn randomizeDamage(battle: anytype) void {
     if (battle.last_damage <= 1) return;
-    const random = Rolls.damage(battle);
+
+    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;
+        }
+    };
+
     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(foe.stored().hp / 2, 1),
+        .SuperFang => @max(battle.foe(player).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);
-            // GLITCH: Psywave infinite glitch loop
-            if (!showdown and max <= 1) return Result.Error;
-            break :power Rolls.psywave(battle, max);
+            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;
+                }
+            }
         },
         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);
+    if (battle.foe(player).stored().hp > 0) try buildRage(battle, player.foe(), log);
 
     return null;
 }
@@ -1234,7 +1251,19 @@ fn metronome(
 ) !?Result {
     var side = battle.side(player);
 
-    side.last_selected_move = Rolls.metronome(battle);
+    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);
+        }
+    };
+
     incrementPP(side, mslot);
 
     if (!try canMove(battle, player, mslot, auto, false, .Metronome, residual, log)) return null;
@@ -1292,24 +1321,23 @@ fn moveHit(battle: anytype, player: Player, move: Move.Data, immune: *bool, mist
         }
 
         // GLITCH: Thrash / Petal Dance / Rage get their accuracy overwritten on subsequent hits
-        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 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));
         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));
 
-        // 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;
+        if (move.effect == .Thrashing or move.effect == .Rage) state.* = accuracy;
 
         // GLITCH: max accuracy is 255 so 1/256 chance of miss
-        break :miss !Rolls.hit(battle, accuracy);
+        break :miss if (showdown)
+            !battle.rng.chance(u8, @intCast(u8, accuracy), 256)
+        else
+            battle.rng.next() >= accuracy;
     };
 
     // Pokémon Showdown reports miss instead of fail for moves blocked by Mist that 1/256 miss
@@ -1441,15 +1469,14 @@ fn handleResidual(battle: anytype, player: Player, log: anytype) !void {
             damage *= volatiles.toxic;
         }
 
+        // Pokémon Showdown erroneously updates last damage with uncapped Leech Seed damage
+        if (showdown) battle.last_damage = damage;
+
         const amount = @min(damage, stored.hp);
         stored.hp -= amount;
 
         // As above, Pokémon Showdown uses damageOf but its not relevant
-        if (amount > 0) {
-            try log.damage(ident, stored, .LeechSeed);
-            // Pokémon Showdown erroneously updates last damage with uncapped Leech Seed damage
-            if (showdown) battle.last_damage = damage;
-        }
+        if (amount > 0) try log.damage(ident, stored, .LeechSeed);
 
         const before = foe_stored.hp;
         // Uncapped damage is added back to the foe
@@ -1536,42 +1563,6 @@ fn checkEBC(battle: anytype) bool {
     return false;
 }
 
-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,
@@ -1662,7 +1653,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.bideThrashDuration(battle);
+        side.active.volatiles.attacks = @intCast(u3, if (showdown)
+            battle.rng.range(u4, 2, 4)
+        else
+            (battle.rng.next() & 1) + 2);
 
         try log.start(battle.active(player), .Bide);
     }
@@ -1684,8 +1678,14 @@ pub const Effects = struct {
             return;
         }
 
-        if (foe.active.types.includes(move.type)) return;
-        if (!Rolls.secondaryChance(battle, move.effect == .BurnChance1)) 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;
 
         foe_stored.status = Status.init(.BRN);
         foe.active.stats.atk = @max(foe.active.stats.atk / 2, 1);
@@ -1709,7 +1709,11 @@ pub const Effects = struct {
         const sub = foe.active.volatiles.Substitute;
 
         if (move.effect == .ConfusionChance) {
-            if (!Rolls.confusionChance(battle)) return;
+            const chance = if (showdown)
+                battle.rng.chance(u8, 25, 256)
+            else
+                battle.rng.next() < Gen12.percent(10);
+            if (!chance) return;
         } else {
             if (showdown) {
                 if (!try checkHit(battle, player, move, log)) {
@@ -1728,7 +1732,10 @@ pub const Effects = struct {
 
         if (foe.active.volatiles.Confusion) return;
         foe.active.volatiles.Confusion = true;
-        foe.active.volatiles.confusion = Rolls.confusionDuration(battle);
+        foe.active.volatiles.confusion = @intCast(u3, if (showdown)
+            battle.rng.range(u8, 2, 6)
+        else
+            (battle.rng.next() & 3) + 2);
 
         try log.start(battle.active(player.foe()), .Confusion);
     }
@@ -1778,8 +1785,11 @@ pub const Effects = struct {
             return Result.Error;
         }
 
-        volatiles.disabled_move = @intCast(u3, Rolls.moveSlot(battle, &foe.active.moves, n));
-        volatiles.disabled_duration = Rolls.disableDuration(battle);
+        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);
 
         try log.startEffect(foe_ident, .Disable, foe.active.move(volatiles.disabled_move).id);
         return null;
@@ -1791,7 +1801,7 @@ pub const Effects = struct {
 
         if (battle.last_damage == 0) {
             assert(showdown);
-            if (!battle.foe(player).active.volatiles.Substitute) return;
+            return;
         }
 
         const drain = @max(battle.last_damage / 2, 1);
@@ -1818,7 +1828,15 @@ pub const Effects = struct {
         var volatiles = &battle.foe(player).active.volatiles;
 
         if (volatiles.Substitute) return;
-        if (!Rolls.secondaryChance(battle, move.effect == .FlinchChance1)) 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;
 
         volatiles.Flinch = true;
         volatiles.Recharging = false;
@@ -1844,8 +1862,12 @@ pub const Effects = struct {
             return if (showdown and !foe.active.types.includes(move.type)) battle.rng.advance(1);
         }
 
-        if (foe.active.types.includes(move.type)) return;
-        if (!Rolls.secondaryChance(battle, true)) return;
+        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;
+
         // Freeze Clause Mod
         if (showdown) for (foe.pokemon) |p| if (Status.is(p.status, .FRZ)) return;
 
@@ -1990,7 +2012,7 @@ pub const Effects = struct {
         }
         if (!try checkHit(battle, player, move, log)) return;
 
-        const rslot = Rolls.moveSlot(battle, &foe.active.moves, 0);
+        const rslot = randomMoveSlot(&battle.rng, &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);
@@ -2011,8 +2033,7 @@ pub const Effects = struct {
         assert(!side.active.volatiles.MultiHit);
         side.active.volatiles.MultiHit = true;
 
-        side.active.volatiles.attacks =
-            if (move.effect == .MultiHit) Rolls.distribution(battle) else 2;
+        side.active.volatiles.attacks = if (move.effect == .MultiHit) distribution(battle) else 2;
     }
 
     fn paralyze(battle: anytype, player: Player, move: Move.Data, log: anytype) !void {
@@ -2056,8 +2077,14 @@ pub const Effects = struct {
         }
 
         // Body Slam can't paralyze a Normal type Pokémon
-        if (foe.active.types.includes(move.type)) return;
-        if (!Rolls.secondaryChance(battle, move.effect == .ParalyzeChance1)) return;
+        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;
 
         foe_stored.status = Status.init(.PAR);
         foe.active.stats.spe = @max(foe.active.stats.spe / 4, 1);
@@ -2100,7 +2127,16 @@ pub const Effects = struct {
 
         if (move.effect == .Poison) {
             if (!showdown and !try checkHit(battle, player, move, log)) return;
-        } else if (!Rolls.poisonChance(battle, move.effect == .PoisonChance1)) 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;
+        }
 
         foe_stored.status = Status.init(.PSN);
         if (toxic) {
@@ -2114,8 +2150,10 @@ pub const Effects = struct {
 
     fn rage(battle: anytype, player: Player) !void {
         var volatiles = &battle.side(player).active.volatiles;
-        assert(!volatiles.Bide);
+        if (volatiles.Rage) return;
         volatiles.Rage = true;
+        assert(!volatiles.Bide);
+        volatiles.state = 0;
     }
 
     fn recoil(battle: anytype, player: Player, residual: *bool, log: anytype) !void {
@@ -2167,7 +2205,16 @@ pub const Effects = struct {
         }
         foe.active.volatiles.Recharging = false;
 
-        foe_stored.status = Status.slp(Rolls.sleepDuration(battle));
+        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);
         try log.statusFrom(foe_ident, foe_stored.status, battle.side(player).last_selected_move);
     }
 
@@ -2220,7 +2267,11 @@ pub const Effects = struct {
         assert(!volatiles.Bide);
 
         volatiles.Thrashing = true;
-        volatiles.attacks = Rolls.bideThrashDuration(battle);
+        volatiles.state = 0;
+        volatiles.attacks = @intCast(u3, if (showdown)
+            battle.rng.range(u8, 2, 4)
+        else
+            (battle.rng.next() & 1) + 2);
     }
 
     fn transform(battle: anytype, player: Player, log: anytype) !void {
@@ -2262,7 +2313,7 @@ pub const Effects = struct {
         // (Pokémon Showdown unitentionally patches this glitch, preventing automatic selection)
         if (!showdown) foe.active.volatiles.Recharging = false;
 
-        side.active.volatiles.attacks = Rolls.distribution(battle) - 1;
+        side.active.volatiles.attacks = distribution(battle) - 1;
     }
 
     fn boost(battle: anytype, player: Player, move: Move.Data, log: anytype) !void {
@@ -2289,11 +2340,9 @@ pub const Effects = struct {
                     return try log.fail(ident, .None);
                 }
                 var mod = BOOSTS[@intCast(u4, @as(i8, boosts.atk) + 6)];
-                const stat = unmodifiedStats(battle, side).atk;
+                const stat = unmodifiedStats(battle, player).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);
@@ -2309,7 +2358,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, side).def;
+                const stat = unmodifiedStats(battle, player).def;
                 stats.def = @min(MAX_STAT_VALUE, stat * mod[0] / mod[1]);
                 try log.boost(ident, .Defense, n);
             },
@@ -2326,7 +2375,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, side).spe;
+                const stat = unmodifiedStats(battle, player).spe;
                 stats.spe = @min(MAX_STAT_VALUE, stat * mod[0] / mod[1]);
                 try log.boost(ident, .Speed, 2);
             },
@@ -2346,7 +2395,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, side).spc;
+                const stat = unmodifiedStats(battle, player).spc;
                 stats.spc = @min(MAX_STAT_VALUE, stat * mod[0] / mod[1]);
                 try log.boost(ident, .SpecialAttack, n);
                 try log.boost(ident, .SpecialDefense, n);
@@ -2373,7 +2422,11 @@ pub const Effects = struct {
         }
 
         if (move.effect.isStatDownChance()) {
-            if (!Rolls.unboost(battle) or foe.active.volatiles.Invulnerable) return;
+            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;
         } else if (!showdown and !try checkHit(battle, player, move, log)) {
             return; // checkHit already checks for Invulnerable
         }
@@ -2395,7 +2448,7 @@ 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, foe).atk;
+                const stat = unmodifiedStats(battle, player.foe()).atk;
                 stats.atk = @max(1, stat * mod[0] / mod[1]);
                 try log.boost(foe_ident, .Attack, -1);
             },
@@ -2413,7 +2466,7 @@ 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, foe).def;
+                const stat = unmodifiedStats(battle, player.foe()).def;
                 stats.def = @max(1, stat * mod[0] / mod[1]);
                 try log.boost(foe_ident, .Defense, -@as(i8, n));
             },
@@ -2430,7 +2483,7 @@ 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, foe).spe;
+                const stat = unmodifiedStats(battle, player.foe()).spe;
                 stats.spe = @max(1, stat * mod[0] / mod[1]);
                 try log.boost(foe_ident, .Speed, -1);
                 assert(boosts.spe >= -6);
@@ -2450,7 +2503,7 @@ 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, foe).spc;
+                const stat = unmodifiedStats(battle, player.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);
@@ -2469,7 +2522,8 @@ pub const Effects = struct {
     }
 };
 
-fn unmodifiedStats(battle: anytype, side: *Side) *Stats(u16) {
+fn unmodifiedStats(battle: anytype, who: Player) *Stats(u16) {
+    const side = battle.side(who);
     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;
@@ -2535,140 +2589,75 @@ fn clearVolatiles(battle: anytype, who: Player, log: anytype) !void {
     }
 }
 
-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;
+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;
         }
     }
+    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;
-    }
-
-    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);
-    }
-
-    inline fn confused(battle: anytype) bool {
-        if (showdown) return !battle.rng.chance(u8, 128, 256);
-        return battle.rng.next() >= Gen12.percent(50) + 1;
-    }
-
-    inline fn paralyzed(battle: anytype) bool {
-        if (showdown) return battle.rng.chance(u8, 63, 256);
-        return battle.rng.next() < Gen12.percent(25);
+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);
     }
+}
 
-    inline fn confusionChance(battle: anytype) bool {
-        if (showdown) return battle.rng.chance(u8, 25, 256);
-        return battle.rng.next() < Gen12.percent(10);
-    }
+fn handleThrashing(battle: anytype, active: *ActivePokemon) bool {
+    var volatiles = &active.volatiles;
+    assert(volatiles.Thrashing);
+    if (volatiles.attacks > 0) return false;
 
-    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));
-    }
+    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 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));
-    }
+    return true;
+}
 
-    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);
-        }
-    }
+const DISTRIBUTION = [_]u3{ 2, 2, 2, 3, 3, 3, 4, 5 };
 
-    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 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);
+}
 
-    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;
-                    }
+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;
                 }
-                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;
+            return @intCast(u4, i + 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);
+    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 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;
@@ -2768,11 +2757,9 @@ 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 == 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;
+                    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;
                         out[n] = .{ .type = .Move, .data = s };
                         n += 1;
                         return n;