@pkmn/engine 0.1.0-dev.d56bdadd → 0.1.0-dev.d73cd76c

package/src/lib/gen2/mechanics.zig

@@ -1,50 +1,37 @@
-const std = @import("std");
-
-const pkmn = @import("../pkmn.zig");
-
-const common = @import("../common/data.zig");
 const DEBUG = @import("../common/debug.zig").print;
-const protocol = @import("../common/protocol.zig");
-const rng = @import("../common/rng.zig");
-const util = @import("../common/util.zig");
 
+const builtin = @import("builtin");
+const common = @import("../common/data.zig");
 const data = @import("data.zig");
 const generated = @import("generated.zig");
-
-const assert = std.debug.assert;
-
-const expectEqual = std.testing.expectEqual;
-const expectEqualSlices = std.testing.expectEqualSlices;
-const expectEqualStrings = std.testing.expectEqualStrings;
-
-const showdown = pkmn.options.showdown;
-
-const Choice = common.Choice;
-const ID = common.ID;
-const Player = common.Player;
-const Result = common.Result;
+const pkmn = @import("../pkmn.zig");
+const protocol = @import("../common/protocol.zig");
+const rng = @import("../common/rng.zig");
+const std = @import("std");
 
 const Activate = protocol.Activate;
+const ActivePokemon = data.ActivePokemon;
+const assert = std.debug.assert;
 const Boost = protocol.Boost;
-const Cant = protocol.Cant;
+const Boosts = data.Boosts;
+const Choice = common.Choice;
 const Damage = protocol.Damage;
+const Effectiveness = data.Effectiveness;
 const End = protocol.End;
-const Heal = protocol.Heal;
-const Start = protocol.Start;
-
+const expectEqual = std.testing.expectEqual;
+const expectEqualSlices = std.testing.expectEqualSlices;
+const expectEqualStrings = std.testing.expectEqualStrings;
+const Fail = protocol.Fail;
 const Gen12 = rng.Gen12;
-
-const PointerType = util.PointerType;
-
-const ActivePokemon = data.ActivePokemon;
-const Boosts = data.Boosts;
-const Effectiveness = data.Effectiveness;
+const Heal = protocol.Heal;
+const ID = common.ID;
 const Item = data.Item;
 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 Start = protocol.Start;
 const Stats = data.Stats;
 const Status = data.Status;
 const TriAttack = data.TriAttack;
@@ -106,6 +93,7 @@ pub const State = struct {
     type: Type, // BATTLE_VARS_MOVE_TYPE
     accuracy: u8, // wEnemyMoveStruct + MOVE_ACC
     move: Move, // wCurPlayerMove
+    hit: u3 = 0,
     from: Move = .None,
     mslot: u4, // wCurMoveNum
     first: bool, // wEnemyGoesFirst
@@ -140,13 +128,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, .Initial, options);
     try switchIn(battle, .P2, p2_slot, .Initial, options);
@@ -252,15 +240,14 @@ fn switchIn(battle: anytype, player: Player, slot: u8, kind: SwitchIn, options:
     statusModify(incoming.status, &active.stats);
 
     if (kind == .Drag) {
-        try options.log.drag(battle.active(player), incoming);
+        try options.log.drag(.{ battle.active(player), incoming });
     } else {
-        try options.log.switched(battle.active(player), incoming);
+        try options.log.switched(.{ battle.active(player), incoming });
     }
-    options.chance.switched(player, side.pokemon[0].position, out);
 
     if (side.conditions.Spikes and !active.types.includes(.Flying)) {
         incoming.hp -|= @max(incoming.stats.hp / 8, 1);
-        try options.log.damage(battle.active(player), incoming, .Spikes);
+        try options.log.damage(.{ battle.active(player), incoming, .Spikes });
     }
 }
 
@@ -403,7 +390,9 @@ fn executeMove(
 
     assert(choice.type == .Move);
     var mslot: u4 = @intCast(choice.data);
+    _ = &mslot;
     var move = Move.Pound; // TODO
+    _ = &move;
 
     if (!try beforeMove(battle, player, move, options)) return null;
 
@@ -433,31 +422,22 @@ fn beforeMove(battle: anytype, player: Player, move: Move, options: anytype) !bo
     if (volatiles.Recharging) {
         volatiles.Recharging = false;
         resetCant(volatiles);
-        try log.cant(ident, .Recharge);
+        try log.cant(.{ ident, .Recharge });
         return false;
     }
 
     if (Status.is(stored.status, .SLP)) slp: {
         const before = stored.status;
         // 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;
-        // } else {
         stored.status -= 1;
-        // }
-
-        const duration = Status.duration(stored.status);
-        if (!Status.is(stored.status, .EXT)) {
-            try options.chance.sleep(player, duration);
-        }
 
-        if (duration == 0) {
-            try log.curestatus(ident, before, .Message);
+        if (Status.duration(stored.status) == 0) {
+            try log.curestatus(.{ ident, before, .Message });
             stored.status = 0; // clears EXT if present
             resetCant(volatiles);
             volatiles.Nightmare = false;
         } else {
-            try log.cant(ident, .Sleep);
+            try log.cant(.{ ident, .Sleep });
             if (move == .Snore or move == .SleepTalk) break :slp;
             resetCant(volatiles);
             return false;
@@ -466,7 +446,7 @@ fn beforeMove(battle: anytype, player: Player, move: Move, options: anytype) !bo
 
     if (Status.is(stored.status, .FRZ) and !(move == .FlameWheel or move == .SacredFire)) {
         resetCant(volatiles);
-        try log.cant(ident, .Freeze);
+        try log.cant(.{ ident, .Freeze });
         return false;
     }
 
@@ -476,39 +456,28 @@ fn beforeMove(battle: anytype, player: Player, move: Move, options: anytype) !bo
         // if (!showdown) volatiles.Flinch = false;
         volatiles.Flinch = false;
         resetCant(volatiles);
-        try log.cant(ident, .Flinch);
+        try log.cant(.{ ident, .Flinch });
         return false;
     }
 
     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);
 
         if (volatiles.disable.duration == 0) {
             volatiles.disable.move = 0;
-            try log.end(ident, .Disable);
+            try log.end(.{ ident, .Disable });
         }
     }
 
     if (volatiles.Confusion) {
         assert(volatiles.confusion > 0);
-
-        // if (options.calc.modify(player, .confusion)) |extend| {
-        //     if (!extend) volatiles.confusion = 0;
-        // } else {
         volatiles.confusion -= 1;
-        // }
-        try options.chance.confusion(player, volatiles.confusion);
 
         if (volatiles.confusion == 0) {
             volatiles.Confusion = false;
-            try log.end(ident, .Confusion);
+            try log.end(.{ ident, .Confusion });
         } else {
-            try log.activate(ident, .Confusion);
+            try log.activate(.{ ident, .Confusion });
 
             if (try Rolls.confused(battle, player, options)) {
                 volatiles.BeatUp = false;
@@ -523,11 +492,11 @@ fn beforeMove(battle: anytype, player: Player, move: Move, options: anytype) !bo
     }
 
     if (volatiles.Attract) {
-        try log.activate(ident, .Attract);
+        try log.activate(.{ ident, .Attract });
 
         if (try Rolls.attract(battle, player, options)) {
             resetCant(volatiles);
-            try log.cant(ident, .Attract);
+            try log.cant(.{ ident, .Attract });
             return false;
         }
     }
@@ -538,14 +507,14 @@ fn beforeMove(battle: anytype, player: Player, move: Move, options: anytype) !bo
         if (m != .None and m == move) {
             side.active.volatiles.Charging = false;
             resetCant(volatiles);
-            try options.log.disabled(ident, move);
+            try options.log.cant(.{ ident, .Disable, move });
             return false;
         }
     }
 
     if (Status.is(stored.status, .PAR) and try Rolls.paralyzed(battle, player, options)) {
         resetCant(volatiles);
-        try log.cant(ident, .Paralysis);
+        try log.cant(.{ ident, .Paralysis });
         return false;
     }
 
@@ -565,11 +534,11 @@ fn resetCant(volatiles: *align(8) Volatiles) void {
 
 pub fn canMove(battle: anytype, player: Player, state: *State, options: anytype) !bool {
     var side = battle.side(player);
-    var volatiles = &side.active.volatiles;
+    const volatiles = &side.active.volatiles;
 
     // FIXME: pass in target to avoid lookup?
     const target = if (Move.get(state.move).target == .Self) player else player.foe();
-    try options.log.moveFrom(battle.active(player), state.move, battle.active(target), state.from);
+    try options.log.move(.{ battle.active(player), state.move, battle.active(target), state.from });
 
     const charging = false; // TODO charging uses doUse
     const skip_pp = charging or state.move == .Struggle or
@@ -663,7 +632,7 @@ pub fn checkCriticalHit(battle: anytype, player: Player, state: *State, options:
     }
     assert(stage <= 4);
 
-    state.crit = try Rolls.criticalHit(battle, player, CRITICAL_HITS[stage], options);
+    state.crit = try Rolls.criticalHit(battle, player, state.hit, CRITICAL_HITS[stage], options);
 }
 
 pub fn calcDamage(
@@ -713,7 +682,7 @@ pub fn adjustDamage(battle: anytype, player: Player, state: *State, _: anytype)
 
     // Type effectiveness matchup precedence only matters with (NVE, SE)
     if (!showdown and (eff1 + eff2) == Effectiveness.mismatch and
-        types.type1.precedence() > types.type2.precedence())
+        Type.precedence(state.type, types.type1) > Type.precedence(state.type, types.type2))
     {
         assert(eff2 != neutral);
         d = d *% eff2 / 10;
@@ -731,7 +700,7 @@ pub fn adjustDamage(battle: anytype, player: Player, state: *State, _: anytype)
 
 pub fn randomizeDamage(battle: anytype, player: Player, state: *State, options: anytype) !void {
     if (state.damage <= 1) return;
-    const random = try Rolls.damage(battle, player, options);
+    const random = try Rolls.damage(battle, player, state.hit, options);
     options.calc.base(player.foe(), state.damage);
     state.damage = @intCast(@as(u32, state.damage) *% random / 255);
     options.calc.final(player.foe(), state.damage);
@@ -849,14 +818,14 @@ fn checkFaint(
     if (foe_fainted) try faint(battle, player.foe(), !more, options);
 
     if (player_out and foe_out) {
-        try options.log.tie();
-        return Result.Tie;
+        try options.log.tie(.{});
+        return .Tie;
     } else if (player_out) {
-        try options.log.win(player.foe());
-        return if (player == .P1) Result.Lose else Result.Win;
+        try options.log.win(.{player.foe()});
+        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;
+        try options.log.win(.{player});
+        return if (player == .P1) .Win else .Lose;
     }
 
     const foe_choice: Choice.Type = if (foe_fainted) .Switch else .Pass;
@@ -885,19 +854,19 @@ fn faint(battle: anytype, player: Player, done: bool, options: anytype) !void {
             side.stored().stats.spe;
     }
 
-    try options.log.faint(battle.active(player), done);
+    try options.log.faint(.{ battle.active(player), done });
     options.calc.capped(player);
 }
 
 // TODO: see if we can move *before* applyDamage and include failuretext logic
 pub fn reportOutcome(battle: anytype, player: Player, state: *State, options: anytype) !void {
     const foe_ident = battle.active(player.foe());
-    if (state.crit) try options.log.crit(foe_ident);
+    if (state.crit) try options.log.crit(.{foe_ident});
     if (!state.immune()) {
         if (state.effectiveness > Effectiveness.neutral) {
-            try options.log.supereffective(foe_ident);
+            try options.log.supereffective(.{foe_ident});
         } else if (state.effectiveness < Effectiveness.neutral) {
-            try options.log.resisted(foe_ident);
+            try options.log.resisted(.{foe_ident});
         }
     }
 }
@@ -930,8 +899,8 @@ fn handleResidual(battle: anytype, player: Player, options: anytype) !bool {
         }
 
         stored.hp -|= damage;
-        // Pokémon Showdown uses damageOf here but its not relevant in Generation II
-        try options.log.damage(ident, stored, if (brn) Damage.Burn else Damage.Poison);
+        // Pokémon Showdown uses damage [of] here but its not relevant in Generation II
+        try options.log.damage(.{ ident, stored, if (brn) Damage.Burn else Damage.Poison });
         if (stored.hp == 0) return true;
     }
 
@@ -947,27 +916,27 @@ fn handleResidual(battle: anytype, player: Player, options: anytype) !bool {
 
         const damage = @max(stored.stats.hp / 8, 1);
         stored.hp -|= damage;
-        // As above, Pokémon Showdown uses damageOf but its not relevant
-        try options.log.damage(ident, stored, .LeechSeed);
+        // As above, Pokémon Showdown uses damage [of] but its not relevant
+        try options.log.damage(.{ ident, stored, .LeechSeed });
 
         const before = foe_stored.hp;
         foe_stored.hp = @min(foe_stored.hp + damage, foe_stored.stats.hp);
         // Pokémon Showdown uses the less specific heal here instead of drain... because reasons?
-        if (foe_stored.hp > before) try options.log.heal(foe_ident, foe_stored, .Silent);
+        if (foe_stored.hp > before) try options.log.heal(.{ foe_ident, foe_stored, .Silent });
         if (stored.hp == 0) return true;
     }
 
     if (volatiles.Nightmare) {
         stored.hp -= @max(stored.stats.hp / 4, 1);
         // ibid
-        try options.log.damage(ident, stored, .Nightmare);
+        try options.log.damage(.{ ident, stored, .Nightmare });
         if (stored.hp == 0) return true;
     }
 
     if (volatiles.Curse) {
         stored.hp -= @max(stored.stats.hp / 4, 1);
         // ibid
-        try options.log.damage(ident, stored, .Curse);
+        try options.log.damage(.{ ident, stored, .Curse });
         if (stored.hp == 0) return true;
     }
 
@@ -988,7 +957,7 @@ fn betweenTurns(battle: anytype, mslot: u4, options: anytype) !?Result {
             future_sight.count -= 1;
             assert(future_sight.count != 0);
             if (future_sight.count == 1) {
-                try options.log.end(battle.active(player), .FutureSight);
+                try options.log.end(.{ battle.active(player), .FutureSight });
                 // TODO doMove
             }
         }
@@ -997,21 +966,24 @@ fn betweenTurns(battle: anytype, mslot: u4, options: anytype) !?Result {
 
     // Weather
     if (battle.field.weather != .None) {
-        assert(battle.field.weather_duration > 0);
         battle.field.weather_duration -= 1;
 
         if (battle.field.weather_duration == 0) {
             battle.field.weather = .None;
-            try options.log.weather(battle.field.weather, .None);
+            try options.log.weather(.{ battle.field.weather, protocol.Weather.None });
         } else {
-            try options.log.weather(battle.field.weather, .Upkeep);
+            try options.log.weather(.{ battle.field.weather, protocol.Weather.Upkeep });
             if (battle.field.weather == .Sandstorm) {
                 inline for (players) |player| {
                     var side = battle.side(player);
                     const active = side.active;
                     if (!(active.volatiles.Underground or active.types.sandstormImmune())) {
                         side.stored().hp -|= @max(side.stored().stats.hp / 8, 1);
-                        try options.log.damage(battle.active(player), side.stored(), .Sandstorm);
+                        try options.log.damage(.{
+                            battle.active(player),
+                            side.stored(),
+                            .Sandstorm,
+                        });
                     }
                 }
                 if (try checkFaint(battle, .P1, options)) |r| return r;
@@ -1023,19 +995,24 @@ fn betweenTurns(battle: anytype, mslot: u4, options: anytype) !?Result {
     inline for (players) |player| {
         var side = battle.side(player);
         var volatiles = &side.active.volatiles;
+        const ident = battle.active(player);
 
         if (volatiles.bind.duration > 0 and !volatiles.Substitute) {
             volatiles.bind.duration -= 1;
             if (volatiles.bind.duration == 0) {
                 const reason = @intFromEnum(End.Bind) + volatiles.bind.reason - 1;
-                try options.log.end(battle.active(player), @enumFromInt(reason));
+                try options.log.end(.{ ident, @as(End, @enumFromInt(reason)) });
             } else {
                 var reason = @intFromEnum(Activate.Bind) + volatiles.bind.reason - 1;
-                try options.log.activate(battle.active(player), @enumFromInt(reason));
+                try options.log.activate(.{ ident, @as(Activate, @enumFromInt(reason)) });
 
                 reason = @intFromEnum(Damage.Bind) + volatiles.bind.reason - 1;
                 side.stored().hp -|= @max(side.stored().stats.hp / 16, 1);
-                try options.log.damage(battle.active(player), side.stored(), @enumFromInt(reason));
+                try options.log.damage(.{
+                    ident,
+                    side.stored(),
+                    @as(Damage, @enumFromInt(reason)),
+                });
             }
         }
     }
@@ -1047,12 +1024,11 @@ fn betweenTurns(battle: anytype, mslot: u4, options: anytype) !?Result {
         var volatiles = &side.active.volatiles;
 
         if (volatiles.PerishSong) {
-            assert(volatiles.perish_song > 0);
             volatiles.perish_song -= 1;
 
             assert(volatiles.perish_song < 3);
             const reason = @intFromEnum(Start.PerishSong0) + volatiles.perish_song;
-            try options.log.start(battle.active(player), @enumFromInt(reason));
+            try options.log.start(.{ battle.active(player), @as(Start, @enumFromInt(reason)) });
 
             if (volatiles.perish_song == 0) {
                 volatiles.PerishSong = false;
@@ -1069,13 +1045,15 @@ fn betweenTurns(battle: anytype, mslot: u4, options: anytype) !?Result {
         if (stored.item == .Leftovers) {
             const before = stored.hp;
             stored.hp = @min(stored.hp + @max(stored.stats.hp / 16, 1), stored.stats.hp);
-            if (stored.hp > before) try options.log.heal(battle.active(player), stored, .Leftovers);
+            if (stored.hp > before) {
+                try options.log.heal(.{ battle.active(player), stored, .Leftovers });
+            }
         }
     }
 
     // Mystery Berry
     inline for (players) |player| {
-        var stored = battle.side(player).stored();
+        const stored = battle.side(player).stored();
 
         if (stored.item == .MysteryBerry) {
             // TODO stored and active moves, transform, etc
@@ -1090,7 +1068,7 @@ fn betweenTurns(battle: anytype, mslot: u4, options: anytype) !?Result {
             !side.active.volatiles.frozen and
             try Rolls.defrost(battle, player, options))
         {
-            try options.log.curestatus(battle.active(player), side.stored().status, .Message);
+            try options.log.curestatus(.{ battle.active(player), side.stored().status, .Message });
             side.stored().status = 0;
         }
     }
@@ -1131,14 +1109,14 @@ fn betweenTurns(battle: anytype, mslot: u4, options: anytype) !?Result {
                     stored.hp < stored.stats.hp;
                 if (proc) {
                     assert(stored.hp != 0);
-                    try options.log.enditem(ident, stored.item, .Eat);
+                    try options.log.enditem(.{ ident, stored.item, .Eat });
                     stored.item = .None;
 
                     const offset = num - @intFromEnum(Item.Berry);
                     assert(offset < 3);
                     stored.hp = @min(stored.hp + ((offset + 1) * 10), stored.stats.hp);
                     const reason: Heal = @enumFromInt(@intFromEnum(Heal.Berry) + offset);
-                    try options.log.heal(ident, stored, reason);
+                    try options.log.heal(.{ ident, stored, reason });
                 }
             } else if (num < @intFromEnum(Item.BitterBerry)) {
                 const proc = if (stored.item == .MiracleBerry)
@@ -1148,7 +1126,7 @@ fn betweenTurns(battle: anytype, mslot: u4, options: anytype) !?Result {
 
                 if (proc) {
                     assert(Status.any(stored.status));
-                    try options.log.enditem(ident, stored.item, .Eat);
+                    try options.log.enditem(.{ ident, stored.item, .Eat });
                     stored.item = .None;
 
                     // FIXME wtf?
@@ -1156,21 +1134,21 @@ fn betweenTurns(battle: anytype, mslot: u4, options: anytype) !?Result {
                     // side.active.volatiles.Nightmare = false;
                     if (stored.item == .MiracleBerry) {
                         side.active.volatiles.Confusion = false;
-                        try options.log.end(ident, .Confusion);
+                        try options.log.end(.{ ident, .Confusion });
                     }
                     stored.status = 0;
 
                     // FIXME recalc stats
 
-                    try options.log.curestatus(ident, stored.status, .Message);
+                    try options.log.curestatus(.{ ident, stored.status, .Message });
                 }
             } else if (num == @intFromEnum(Item.BitterBerry)) {
                 if (side.active.volatiles.Confusion) {
-                    try options.log.enditem(ident, stored.item, .Eat);
+                    try options.log.enditem(.{ ident, stored.item, .Eat });
                     stored.item = .None;
 
                     side.active.volatiles.Confusion = false;
-                    try options.log.end(ident, .Confusion);
+                    try options.log.end(.{ ident, .Confusion });
                 }
             }
         }
@@ -1182,12 +1160,11 @@ fn betweenTurns(battle: anytype, mslot: u4, options: anytype) !?Result {
         var volatiles = &side.active.volatiles;
 
         if (volatiles.Encore) {
-            assert(volatiles.encore > 0);
             volatiles.encore -= 1;
 
             if (volatiles.encore == 0 or side.active.move(mslot).pp == 0) {
                 volatiles.Encore = false;
-                try options.log.end(battle.active(player), .Encore);
+                try options.log.end(.{ battle.active(player), .Encore });
             }
         }
     }
@@ -1204,12 +1181,11 @@ fn updateSideCondition(
 ) !void {
     var side = battle.side(player);
     if (@field(side.conditions, key)) {
-        assert(@field(side.conditions, value) > 0);
         @field(side.conditions, value) -= 1;
 
         if (@field(side.conditions, value) == 0) {
             @field(side.conditions, key) = false;
-            try options.log.sideend(player, @field(protocol.Side, key));
+            try options.log.sideend(.{ player, @field(protocol.Side, key) });
         }
     }
 }
@@ -1217,16 +1193,16 @@ fn updateSideCondition(
 fn endTurn(battle: anytype, options: anytype) @TypeOf(options.log).Error!Result {
     battle.turn += 1;
 
-    if (showdown and battle.turn >= 1000) {
-        try options.log.tie();
-        return Result.Tie;
+    if (pkmn.options.mod and battle.turn >= 1000) {
+        try options.log.tie(.{});
+        return .Tie;
     } else if (battle.turn >= 65535) {
-        return Result.Error;
+        return .Error;
     }
 
-    try options.log.turn(battle.turn);
+    try options.log.turn(.{battle.turn});
 
-    return Result.Default;
+    return .Default;
 }
 
 pub fn buildRage(battle: anytype, player: Player, state: *State, options: anytype) !void {
@@ -1240,7 +1216,7 @@ pub fn buildRage(battle: anytype, player: Player, state: *State, options: anytyp
             }
         } else {
             foe.active.volatiles.rage +|= 1;
-            try options.log.activate(battle.active(player), .Rage);
+            try options.log.activate(.{ battle.active(player), .Rage });
         }
     }
 }
@@ -1263,7 +1239,7 @@ pub fn destinyBond(battle: anytype, player: Player, _: *State, options: anytype)
 
     if (foe.active.volatiles.DestinyBond) {
         battle.side(player).stored().hp = 0;
-        try options.log.activate(battle.active(player.foe()), .DestinyBond);
+        try options.log.activate(.{ battle.active(player.foe()), .DestinyBond });
     }
     return true;
 }
@@ -1276,14 +1252,14 @@ pub const Effects = struct {
         const gender: u8 = @intFromEnum(side.stored().dvs.gender);
         const foe_gender: u8 = @intFromEnum(foe.stored().dvs.gender);
         if (gender + foe_gender != 1) {
-            return options.log.immune(battle.active(player.foe()), .None);
+            return options.log.immune(.{ battle.active(player.foe()), .None });
         } else if (foe.active.volatiles.Flying or foe.active.volatiles.Underground) {
-            try options.log.lastmiss();
-            return options.log.miss(battle.active(player));
+            try options.log.lastmiss(.{});
+            return options.log.miss(.{battle.active(player)});
         }
 
         foe.active.volatiles.Attract = true;
-        try options.log.start(battle.active(player.foe()), .Attract);
+        try options.log.start(.{ battle.active(player.foe()), .Attract });
     }
 
     pub fn batonPass(battle: anytype, player: Player, state: *State, options: anytype) !void {
@@ -1295,14 +1271,32 @@ pub const Effects = struct {
     }
 
     pub fn bellyDrum(battle: anytype, player: Player, state: *State, options: anytype) !void {
-        _ = .{ battle, player, state, options }; // TODO
-        // assert(!state.miss);
-        // var side = battle.side(player);
-        // try boostStat(battle, side, &side.active.stats, &side.active.boosts, "atk", 2);
-        // TODO
-        // |-boost|p1a: Poliwag|atk|2|[silent]
-        // |-fail|p1a: Poliwag
-        //
+        assert(!state.miss);
+        var side = battle.side(player);
+
+        const ident = battle.active(player);
+
+        assert(side.active.boosts.atk >= -6 and side.active.boosts.atk <= 6);
+        if (side.active.boosts.atk == 6 or side.active.boosts.atk == MAX_STAT_VALUE) {
+            return options.log.fail(.{ ident, .None });
+        }
+
+        const hp = @max(side.stored().stats.hp / 2, 1);
+        if (side.stored().hp <= hp) {
+            try boostStat(battle, side, &side.active.stats, &side.active.boosts, "atk", 2);
+            try options.log.boost(.{ ident, .Attack, @as(i8, 2), .Silent });
+            return options.log.fail(.{ ident, .None });
+        } else {
+            side.stored().hp -= hp;
+            try options.log.damage(.{ ident, side.stored(), .None });
+
+            const before = side.active.boosts.atk;
+            var i: usize = 0;
+            while (i < 6 and side.active.stats.atk < MAX_STAT_VALUE) : (i += 1) {
+                try boostStat(battle, side, &side.active.stats, &side.active.boosts, "atk", 2);
+            }
+            try options.log.boost(.{ ident, .Attack, @as(i8, side.active.boosts.atk - before) });
+        }
     }
 
     pub const bide = struct {
@@ -1314,18 +1308,11 @@ pub const Effects = struct {
 
             if (!volatiles.Bide) return;
 
-            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);
-
-            if (volatiles.attacks != 0) return options.log.activate(ident, .Bide);
+            if (volatiles.attacks != 0) return options.log.activate(.{ ident, .Bide });
 
             volatiles.Bide = false;
-            try options.log.end(ident, .Bide);
+            try options.log.end(.{ ident, .Bide });
 
             state.damage = volatiles.bide *% 2;
             volatiles.bide = 0;
@@ -1359,11 +1346,11 @@ pub const Effects = struct {
         if (Status.any(foe_stored.status)) {
             if (Status.is(foe_stored.status, .FRZ)) {
                 assert(Move.get(state.move).type == .Fire or state.move == .TriAttack);
-                try options.log.curestatus(
+                try options.log.curestatus(.{
                     battle.active(player.foe()),
                     foe_stored.status,
                     .Message,
-                );
+                });
                 foe_stored.status = 0;
             }
             return;
@@ -1378,7 +1365,8 @@ pub const Effects = struct {
 
         foe_stored.status = Status.init(.BRN);
         foe.active.stats.atk = @max(foe.active.stats.atk / 2, 1);
-        try options.log.status(battle.active(player.foe()), foe_stored.status, .None);
+
+        try options.log.status(.{ battle.active(player.foe()), foe_stored.status, .None });
 
         // TODO: check for status berry
     }
@@ -1398,7 +1386,7 @@ pub const Effects = struct {
         for (side.active.moves) |m| {
             if (convertible(side.active, m.id)) n += 1;
         }
-        if (n == 0) return options.log.fail(battle.active(player), .None);
+        if (n == 0) return options.log.fail(.{ battle.active(player), .None });
 
         side.active.types.type1 = try Rolls.conversion(battle, player, n, options);
         side.active.types.type2 = side.active.types.type1;
@@ -1408,9 +1396,9 @@ pub const Effects = struct {
         var side = battle.side(player);
 
         const last = battle.foe(player).lastMove(false);
-        if (last == .None) return options.log.fail(battle.active(player), .None);
+        if (last == .None) return options.log.fail(.{ battle.active(player), .None });
         const move = Move.get(last);
-        if (move.type == .@"???") return options.log.fail(battle.active(player), .None);
+        if (move.type == .@"???") return options.log.fail(.{ battle.active(player), .None });
 
         side.active.types.type1 = try Rolls.conversion2(battle, player, move.type, options);
         side.active.types.type2 = side.active.types.type1;
@@ -1439,7 +1427,8 @@ pub const Effects = struct {
         if (move.type.special() != (last == .MirrorCoat)) return;
         if (state.damage == 0) return;
 
-        state.damage *|= 2;
+        // NOTE: llvm/llvm-project#58557
+        state.damage = smul(state.damage, 2);
         state.miss = false;
     }
 
@@ -1452,41 +1441,41 @@ pub const Effects = struct {
 
         if (side.active.types.includes(.Ghost)) {
             if (foe.active.volatiles.Flying or foe.active.volatiles.Underground) {
-                try options.log.lastmiss();
-                return options.log.miss(battle.active(player));
+                try options.log.lastmiss(.{});
+                return options.log.miss(.{battle.active(player)});
             } else if (foe.active.volatiles.Substitute) {
-                return options.log.activateMove(foe_ident, .SubstituteBlock, state.move);
+                return options.log.activate(.{ foe_ident, .SubstituteBlock, state.move });
             } else if (foe.active.volatiles.Curse) {
-                return options.log.fail(foe_ident, .None);
+                return options.log.fail(.{ foe_ident, .None });
             }
 
             foe.active.volatiles.Curse = true;
-            try options.log.start(foe_ident, .Curse);
+            try options.log.start(.{ foe_ident, .Curse });
 
             side.stored().hp -= @max(side.stored().stats.hp / 2, 1);
-            try options.log.damage(ident, side.stored(), .Curse);
+            try options.log.damage(.{ ident, side.stored(), .Curse });
         } else {
-            var stats = &side.active.stats;
-            var boosts = &side.active.boosts;
+            const stats = &side.active.stats;
+            const boosts = &side.active.boosts;
 
             const max_atk = boosts.atk == 6 or stats.atk == MAX_STAT_VALUE;
             const max_def = boosts.def == 6 or stats.def == MAX_STAT_VALUE;
-            if (max_atk and max_def) return options.log.fail(ident, .None);
+            if (max_atk and max_def) return options.log.fail(.{ ident, .None });
 
             if (!(boosts.spe == -6 or stats.spe == 1)) {
                 assert(boosts.spe >= -6 and boosts.spe <= 6);
                 try unboostStat(battle, side, stats, boosts, "spe", 1);
-                try options.log.boost(ident, .Speed, @as(i8, -1));
+                try options.log.boost(.{ ident, .Speed, @as(i8, -1) });
             }
             if (!max_atk) {
                 assert(boosts.atk >= -6 and boosts.atk <= 6);
                 try boostStat(battle, side, stats, boosts, "atk", 1);
-                try options.log.boost(ident, .Attack, @as(i8, 1));
+                try options.log.boost(.{ ident, .Attack, @as(i8, 1) });
             }
             if (!max_def) {
                 assert(boosts.def >= -6 and boosts.def <= 6);
                 try boostStat(battle, side, stats, boosts, "def", 1);
-                try options.log.boost(ident, .Defense, @as(i8, 1));
+                try options.log.boost(.{ ident, .Defense, @as(i8, 1) });
             }
         }
     }
@@ -1498,14 +1487,13 @@ pub const Effects = struct {
     pub fn defrost(battle: anytype, player: Player, _: *State, options: anytype) !void {
         var side = battle.side(player);
         assert(Status.is(side.stored().status, .FRZ));
-
-        try options.log.curestatus(battle.active(player), side.stored().status, .Message);
+        try options.log.curestatus(.{ battle.active(player), side.stored().status, .Message });
         side.stored().status = 0;
     }
 
     pub fn destinyBond(battle: anytype, player: Player, _: *State, options: anytype) !void {
         battle.side(player).active.volatiles.DestinyBond = true;
-        try options.log.singlemove(battle.active(player), Move.DestinyBond);
+        try options.log.singlemove(.{ battle.active(player), Move.DestinyBond });
     }
 
     pub fn disable(battle: anytype, player: Player, _: *State, options: anytype) !void {
@@ -1513,14 +1501,10 @@ pub const Effects = struct {
         var volatiles = &foe.active.volatiles;
         const foe_ident = battle.active(player.foe());
 
-        if (volatiles.disable.move != 0) {
-            return options.log.fail(foe_ident, .None);
-        }
+        if (volatiles.disable.move != 0) return options.log.fail(.{ foe_ident, .None });
 
         const last = battle.foe(player).lastMove(false);
-        if (last == .None or last == .Struggle) {
-            return options.log.fail(foe_ident, .None);
-        }
+        if (last == .None or last == .Struggle) return options.log.fail(.{ foe_ident, .None });
 
         var slot: u3 = 0;
         for (foe.active.moves) |m| {
@@ -1529,37 +1513,41 @@ pub const Effects = struct {
             if (m.id == last) break;
         }
         const move = foe.active.move(slot);
-        if (move.pp == 0) return options.log.fail(foe_ident, .None);
+        if (move.pp == 0) return options.log.fail(.{ foe_ident, .None });
 
         volatiles.disable.move = slot;
         volatiles.disable.duration = Rolls.disableDuration(battle, player, options);
 
-        try options.log.startEffect(foe_ident, .Disable, move.id);
+        try options.log.start(.{ foe_ident, .Disable, move.id });
     }
 
     pub const double = struct {
         pub fn flying(battle: anytype, player: Player, state: *State, _: anytype) !void {
-            if (battle.foe(player).active.volatiles.Flying) state.damage *|= 2;
+            if (!battle.foe(player).active.volatiles.Flying) return;
+            state.damage = smul(state.damage, 2);
         }
 
         pub fn underground(battle: anytype, player: Player, state: *State, _: anytype) !void {
-            if (battle.foe(player).active.volatiles.Underground) state.damage *|= 2;
+            if (!battle.foe(player).active.volatiles.Underground) return;
+            state.damage = smul(state.damage, 2);
         }
 
         pub fn minimize(battle: anytype, player: Player, state: *State, _: anytype) !void {
-            if (battle.foe(player).active.volatiles.minimized) state.damage *|= 2;
+            if (!battle.foe(player).active.volatiles.minimized) return;
+            state.damage = smul(state.damage, 2);
         }
     };
 
     pub fn drainHP(battle: anytype, player: Player, state: *State, options: anytype) !void {
         var stored = battle.side(player).stored();
+        const ident = battle.active(player);
 
         assert(state.damage != 0);
 
         if (stored.hp == stored.stats.hp) return;
         stored.hp = @min(stored.stats.hp, stored.hp + @max(state.damage / 2, 1));
 
-        try options.log.drain(battle.active(player), stored, battle.active(player.foe()));
+        try options.log.heal(.{ ident, stored, .Drain, battle.active(player.foe()) });
     }
 
     pub fn encore(battle: anytype, player: Player, state: *State, options: anytype) !void {
@@ -1570,8 +1558,8 @@ pub const Effects = struct {
         const last = battle.foe(player).lastMove(true);
         const failed = volatiles.Encore or
             (last == .None or last == .Struggle or
-            last == .Encore or .last == .MirrorMove);
-        if (failed) return options.log.fail(foe_ident, .None);
+                last == .Encore or .last == .MirrorMove);
+        if (failed) return options.log.fail(.{ foe_ident, .None });
 
         var slot: u3 = 0;
         for (foe.active.moves) |m| {
@@ -1580,7 +1568,7 @@ pub const Effects = struct {
             if (m.id == last) break;
         }
         const move = foe.active.move(slot);
-        if (move.pp == 0) return options.log.fail(foe_ident, .None);
+        if (move.pp == 0) return options.log.fail(.{ foe_ident, .None });
 
         volatiles.Encore = true;
         volatiles.encore = Rolls.encoreDuration(battle, player, options);
@@ -1588,11 +1576,19 @@ pub const Effects = struct {
         // TODO ???
         _ = state;
 
-        try options.log.startEffect(foe_ident, .Encore, move.id);
+        try options.log.start(.{ foe_ident, .Encore, move.id });
     }
 
-    pub fn explode(battle: anytype, player: Player, state: *State, options: anytype) !void {
-        _ = .{ battle, player, state, options }; // TODO
+    pub fn explode(battle: anytype, player: Player, _: *State, _: anytype) !void {
+        var side = battle.side(player);
+        var stored = side.stored();
+
+        stored.hp = 0;
+        // Pokémon Showdown sets the status to 0 on faint(), and we need to do the same to be able
+        // to correctly implement Pokémon Showdown's dumb speed-based switch mechanics
+        if (!showdown) stored.status = 0;
+        side.active.volatiles.LeechSeed = false;
+        side.active.volatiles.DestinyBond = false;
     }
 
     pub fn falseSwipe(battle: anytype, player: Player, state: *State, _: anytype) !void {
@@ -1642,12 +1638,11 @@ pub const Effects = struct {
         var side = battle.side(player);
 
         if (side.active.volatiles.FocusEnergy) {
-            if (!showdown) try options.log.fail(battle.active(player), .None);
-            return;
+            return if (!showdown) try options.log.fail(.{ battle.active(player), .None });
         }
 
         side.active.volatiles.FocusEnergy = true;
-        try options.log.start(battle.active(player), .FocusEnergy);
+        try options.log.start(.{ battle.active(player), .FocusEnergy });
     }
 
     var SLOTS: [5]u4 = .{ 0, 0, 0, 0, 0 };
@@ -1657,7 +1652,7 @@ pub const Effects = struct {
 
         const foe = battle.foe(player);
 
-        if (state.first) return options.log.fail(battle.active(player), .None);
+        if (state.first) return options.log.fail(.{ battle.active(player), .None });
 
         var n: u4 = 0;
         var i: u4 = 0;
@@ -1671,7 +1666,7 @@ pub const Effects = struct {
             }
         }
 
-        if (n == 0) return options.log.fail(battle.active(player), .None);
+        if (n == 0) return options.log.fail(.{ battle.active(player), .None });
 
         const slot = try Rolls.forceSwitch(battle, player, SLOTS[0..i], n, options);
         try switchIn(battle, player.foe(), slot, .Drag, options);
@@ -1681,14 +1676,14 @@ pub const Effects = struct {
         var foe = battle.foe(player);
 
         if (foe.active.volatiles.Flying or foe.active.volatiles.Underground) {
-            try options.log.lastmiss();
-            return options.log.miss(battle.active(player));
+            try options.log.lastmiss(.{});
+            return options.log.miss(.{battle.active(player)});
         } else if (foe.active.volatiles.Foresight) {
-            return options.log.fail(battle.active(player), .None);
+            return options.log.fail(.{ battle.active(player), .None });
         }
 
         foe.active.volatiles.Foresight = true;
-        try options.log.start(battle.active(player.foe()), .FocusEnergy);
+        try options.log.start(.{ battle.active(player.foe()), .FocusEnergy });
     }
 
     pub fn freezeChance(battle: anytype, player: Player, state: *State, options: anytype) !void {
@@ -1708,10 +1703,10 @@ pub const Effects = struct {
         if (!state.proc) return;
         if (foe.conditions.Safeguard) 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);
-        try options.log.status(foe_ident, foe_stored.status, .None);
+        try options.log.status(.{ foe_ident, foe_stored.status, .None });
 
         // TODO: check for status berry
 
@@ -1719,8 +1714,26 @@ pub const Effects = struct {
         foe.active.volatiles.frozen = true;
     }
 
-    pub fn furyCutter(battle: anytype, player: Player, state: *State, options: anytype) !void {
-        _ = .{ battle, player, state, options }; // TODO
+    // TODO FIXME showdown calls this before calcDamage (after checkHit) and modifies state.bp!
+    pub fn furyCutter(battle: anytype, player: Player, state: *State, _: anytype) !void {
+        var side = battle.side(player);
+        var volatiles = &side.active.volatiles;
+
+        if (state.miss) {
+            volatiles.fury_cutter = 0;
+            return;
+        }
+
+        assert(volatiles.fury_cutter >= 0 and volatiles.fury_cutter <= 5);
+        if (volatiles.fury_cutter == 5) return;
+        volatiles.fury_cutter += 1;
+
+        if (showdown) {
+            state.bp *= 2;
+            assert(state.bp <= 160);
+        } else {
+            state.damage = smul(state.damage, 2);
+        }
     }
 
     pub fn futureSight(battle: anytype, player: Player, state: *State, options: anytype) !void {
@@ -1746,7 +1759,7 @@ pub const Effects = struct {
         inline for (STATS) |s| @field(foe.active.stats, s) = @field(stats, s);
         statusModify(foe.stored().status, &foe.active.stats);
 
-        try options.log.clearallboost();
+        try options.log.clearallboost(.{});
     }
 
     pub fn heal(battle: anytype, player: Player, state: *State, options: anytype) !void {
@@ -1754,7 +1767,7 @@ pub const Effects = struct {
         var stored = side.stored();
         const ident = battle.active(player);
 
-        if (stored.stats.hp == stored.hp) return options.log.fail(ident, .None);
+        if (stored.stats.hp == stored.hp) return options.log.fail(.{ ident, .None });
 
         const rest = state.move == .Rest;
         if (rest) {
@@ -1763,19 +1776,19 @@ pub const Effects = struct {
             side.active.volatiles.Toxic = false;
             stored.status = Status.slf(2);
             recomputeStats(battle, side);
-            try options.log.statusFrom(ident, stored.status, Move.Rest);
+            try options.log.status(.{ ident, stored.status, .From, Move.Rest });
             stored.hp = stored.stats.hp;
         } else {
             stored.hp = @min(stored.stats.hp, stored.hp + (stored.stats.hp / 2));
         }
-        try options.log.heal(ident, stored, if (rest) Heal.Silent else Heal.None);
+        try options.log.heal(.{ ident, stored, if (rest) Heal.Silent else Heal.None });
     }
 
     pub fn healBell(battle: anytype, player: Player, _: *State, options: anytype) !void {
         var side = battle.side(player);
         side.active.volatiles.Nightmare = false;
 
-        try options.log.cureteam(battle.active(player));
+        try options.log.cureteam(.{battle.active(player)});
         for (&side.pokemon) |*p| p.status = 0;
 
         // We technically only need to recompute stats if the active Pokémon was burned/paralyzed,
@@ -1791,7 +1804,7 @@ pub const Effects = struct {
 
     pub fn hyperBeam(battle: anytype, player: Player, _: *State, options: anytype) !void {
         battle.side(player).active.volatiles.Recharging = true;
-        try options.log.mustrecharge(battle.active(player));
+        try options.log.mustrecharge(.{battle.active(player)});
     }
 
     pub fn leechSeed(battle: anytype, player: Player, state: *State, options: anytype) !void {
@@ -1801,12 +1814,12 @@ pub const Effects = struct {
             // Invulnerability trumps type immunity on Pokémon Showdown
             const invulnerable = foe.active.volatiles.Underground or foe.active.volatiles.Flying;
             if (!invulnerable and foe.active.types.includes(.Grass)) {
-                return options.log.immune(battle.active(player.foe()), .None);
+                return options.log.immune(.{ battle.active(player.foe()), .None });
             }
             try checkHit(battle, player, state, options);
             if (state.miss) {
-                try options.log.lastmiss();
-                return options.log.miss(battle.active(player));
+                try options.log.lastmiss(.{});
+                return options.log.miss(.{battle.active(player)});
             }
             if (foe.active.volatiles.LeechSeed) return;
         } else {
@@ -1814,14 +1827,14 @@ pub const Effects = struct {
             const miss =
                 state.miss or foe.active.types.includes(.Grass) or foe.active.volatiles.LeechSeed;
             if (miss) {
-                try options.log.lastmiss();
-                return options.log.miss(battle.active(player));
+                try options.log.lastmiss(.{});
+                return options.log.miss(.{battle.active(player)});
             }
         }
 
         foe.active.volatiles.LeechSeed = true;
 
-        try options.log.start(battle.active(player.foe()), .LeechSeed);
+        try options.log.start(.{ battle.active(player.foe()), .LeechSeed });
     }
 
     pub fn lockOn(battle: anytype, player: Player, state: *State, options: anytype) !void {
@@ -1829,20 +1842,20 @@ pub const Effects = struct {
         const foe_ident = battle.active(player.foe());
 
         if (foe.active.volatiles.Substitute) {
-            return options.log.activateMove(foe_ident, .SubstituteBlock, state.move);
+            return options.log.activate(.{ foe_ident, .SubstituteBlock, state.move });
         } else if (state.miss) {
-            return options.log.fail(foe_ident, .None);
+            return options.log.fail(.{ foe_ident, .None });
         }
 
         foe.active.volatiles.LockOn = true;
-        try options.log.activate(battle.active(player), .LockOn);
+        try options.log.activate(.{ battle.active(player), .LockOn });
     }
 
     const MAGNITUDE_POWER = [_]u8{ 10, 30, 50, 70, 90, 110, 150 };
 
     pub fn magnitude(battle: anytype, player: Player, state: *State, options: anytype) !void {
         const num = try Rolls.magnitude(battle, player, options);
-        try options.log.magnitude(battle.active(player), num);
+        try options.log.activate(.{ battle.active(player), .Magnitude, num });
         state.bp = MAGNITUDE_POWER[num - 4];
     }
 
@@ -1850,11 +1863,11 @@ pub const Effects = struct {
         var foe = battle.foe(player);
 
         if (foe.active.volatiles.Flying or foe.active.volatiles.Underground) {
-            if (!showdown) return options.log.fail(battle.active(player.foe()), .None);
-            try options.log.lastmiss();
-            return options.log.miss(battle.active(player));
+            if (!showdown) return options.log.fail(.{ battle.active(player.foe()), .None });
+            try options.log.lastmiss(.{});
+            return options.log.miss(.{battle.active(player)});
         } else if (foe.active.volatiles.Trapped) {
-            return options.log.fail(battle.active(player.foe()), .None);
+            return options.log.fail(.{ battle.active(player.foe()), .None });
         }
 
         foe.active.volatiles.Trapped = true;
@@ -1881,7 +1894,29 @@ pub const Effects = struct {
     }
 
     pub fn mimic(battle: anytype, player: Player, state: *State, options: anytype) !void {
-        _ = .{ battle, player, state, options }; // TODO
+        var side = battle.side(player);
+
+        if (state.miss) {
+            if (!showdown) return options.log.fail(.{ battle.active(player.foe()), .None });
+            try options.log.lastmiss(.{});
+            return options.log.miss(.{battle.active(player)});
+        }
+
+        const move = battle.foe(player).lastMove(false);
+        if (move == .None or move == .Struggle) {
+            return options.log.fail(.{ battle.active(player.foe()), .None });
+        }
+
+        var slot: u4 = 0;
+        for (side.active.moves, 0..) |m, i| {
+            if (m.id == move) return options.log.fail(.{ battle.active(player.foe()), .None });
+            if (m.id == .Mimic) slot = @intCast(i + 1);
+        }
+        assert(slot != 0 and slot == state.mslot);
+
+        side.active.move(slot).id = move;
+        side.active.move(slot).pp = 5;
+        try options.log.start(.{ battle.active(player), .Mimic, move });
     }
 
     pub fn mirrorMove(
@@ -1898,11 +1933,11 @@ pub const Effects = struct {
 
         const last = foe.lastMove(false);
 
-        if (last == .None) return options.log.fail(battle.active(player), .None);
+        if (last == .None) return options.log.fail(.{ battle.active(player), .None });
         const knows = knows: for (side.active.moves) |m| {
             if (last == m.id) break :knows true;
         } else false;
-        if (knows) return options.log.fail(battle.active(player), .None);
+        if (knows) return options.log.fail(.{ battle.active(player), .None });
 
         // if (wPlayerCharging) ???
         // wPlayerCharging = 1
@@ -1916,17 +1951,17 @@ pub const Effects = struct {
     pub fn mist(battle: anytype, player: Player, _: *State, options: anytype) !void {
         var side = battle.side(player);
 
-        if (side.active.volatiles.Mist) return options.log.fail(battle.active(player), .None);
+        if (side.active.volatiles.Mist) return options.log.fail(.{ battle.active(player), .None });
         side.active.volatiles.Mist = true;
 
-        try options.log.start(battle.active(player), .Mist);
+        try options.log.start(.{ battle.active(player), .Mist });
     }
 
     pub fn weatherHeal(battle: anytype, player: Player, _: *State, options: anytype) !void {
         var stored = battle.side(player).stored();
         const ident = battle.active(player);
 
-        if (stored.hp == stored.stats.hp) return options.log.fail(ident, .None);
+        if (stored.hp == stored.stats.hp) return options.log.fail(.{ ident, .None });
 
         stored.hp = switch (battle.field.weather) {
             .Sun => stored.stats.hp,
@@ -1934,7 +1969,7 @@ pub const Effects = struct {
             else => @min(stored.stats.hp, stored.hp + (stored.stats.hp / 4)),
         };
 
-        try options.log.heal(ident, stored, Heal.None);
+        try options.log.heal(.{ ident, stored, .None });
     }
 
     pub fn multiHit(battle: anytype, player: Player, state: *State, options: anytype) !void {
@@ -1947,17 +1982,17 @@ pub const Effects = struct {
         const foe_ident = battle.active(player.foe());
 
         if (foe_volatiles.Flying or foe_volatiles.Underground) {
-            if (!showdown) return options.log.fail(battle.active(player.foe()), .None);
-            try options.log.lastmiss();
-            return options.log.miss(battle.active(player));
+            if (!showdown) return options.log.fail(.{ battle.active(player.foe()), .None });
+            try options.log.lastmiss(.{});
+            return options.log.miss(.{battle.active(player)});
         } else if (foe_volatiles.Substitute) {
-            return options.log.activateMove(foe_ident, .SubstituteBlock, state.move);
+            return options.log.activate(.{ foe_ident, .SubstituteBlock, state.move });
         } else if (!Status.is(foe.stored().status, .SLP) or foe_volatiles.Nightmare) {
-            return options.log.fail(foe_ident, .None);
+            return options.log.fail(.{ foe_ident, .None });
         }
 
         foe_volatiles.Nightmare = true;
-        try options.log.start(battle.active(player.foe()), .Nightmare);
+        try options.log.start(.{ battle.active(player.foe()), .Nightmare });
     }
 
     pub const ohko = struct {
@@ -1981,9 +2016,9 @@ pub const Effects = struct {
             const foe_ident = battle.active(player.foe());
 
             state.damage = 0;
-            if (state.immune()) return options.log.immune(foe_ident, .None);
+            if (state.immune()) return options.log.immune(.{ foe_ident, .None });
             const delta = side.stored().level -| foe.stored().level;
-            if (delta == 0) return options.log.immune(foe_ident, .OHKO);
+            if (delta == 0) return options.log.immune(.{ foe_ident, .OHKO });
 
             state.accuracy = 2 * delta +| Gen12.percent(30);
             try checkHit(battle, player, state, options);
@@ -1999,37 +2034,39 @@ pub const Effects = struct {
         const ident = battle.active(player);
         const foe_ident = battle.active(player.foe());
 
-        if (state.miss) return options.log.fail(foe_ident, .None);
+        if (state.miss) return options.log.fail(.{ foe_ident, .None });
         if (foe.active.volatiles.Substitute) {
-            return options.log.activateMove(foe_ident, .SubstituteBlock, state.move);
+            return options.log.activate(.{ foe_ident, .SubstituteBlock, state.move });
         }
 
         const avg = @max((foe.stored().hp + side.stored().hp) / 2, 1);
         foe.stored().hp -= avg;
         side.stored().hp = avg;
 
-        try options.log.sethp(foe_ident, foe.stored(), .Silent);
-        try options.log.sethp(ident, side.stored(), .None);
+        try options.log.sethp(.{ foe_ident, foe.stored(), .Silent });
+        try options.log.sethp(.{ ident, side.stored(), .None });
     }
 
     pub fn paralyze(battle: anytype, player: Player, state: *State, options: anytype) !void {
         var foe = battle.foe(player);
         const foe_ident = battle.active(player.foe());
 
-        if (Status.is(foe.stored().status, .PAR)) return options.log.fail(foe_ident, .Paralysis);
-        if (state.immune()) return options.log.immune(foe_ident, .None);
-        if (Status.any(foe.stored().status)) return options.log.fail(foe_ident, .None);
+        if (Status.is(foe.stored().status, .PAR)) {
+            return options.log.fail(.{ foe_ident, .Paralysis });
+        }
+        if (state.immune()) return options.log.immune(.{ foe_ident, .None });
+        if (Status.any(foe.stored().status)) return options.log.fail(.{ foe_ident, .None });
         if (state.miss) {
-            try options.log.lastmiss();
-            return options.log.miss(battle.active(player));
+            try options.log.lastmiss(.{});
+            return options.log.miss(.{battle.active(player)});
         } else if (foe.active.volatiles.Substitute) {
-            return options.log.activateMove(foe_ident, .SubstituteBlock, state.move);
+            return options.log.activate(.{ foe_ident, .SubstituteBlock, state.move });
         }
 
         foe.stored().status = Status.init(.PAR);
         foe.active.stats.spe = @max(foe.active.stats.spe / 4, 1);
 
-        try options.log.status(foe_ident, foe.stored().status, .None);
+        try options.log.status(.{ foe_ident, foe.stored().status, .None });
     }
 
     pub fn paralyzeChance(battle: anytype, player: Player, state: *State, options: anytype) !void {
@@ -2044,14 +2081,15 @@ pub const Effects = struct {
 
         foe_stored.status = Status.init(.PAR);
         foe.active.stats.spe = @max(foe.active.stats.spe / 4, 1);
-        try options.log.status(battle.active(player.foe()), foe_stored.status, .None);
+
+        try options.log.status(.{ battle.active(player.foe()), foe_stored.status, .None });
 
         // TODO: check for status berry
     }
 
     pub fn payDay(battle: anytype, player: Player, _: *State, options: anytype) !void {
         if (!showdown or !battle.foe(player).active.volatiles.Substitute) {
-            try options.log.fieldactivate(); // FIXME .PayDay
+            try options.log.fieldactivate(.{}); // FIXME .PayDay
         }
     }
 
@@ -2060,17 +2098,17 @@ pub const Effects = struct {
         var foe = battle.foe(player);
 
         if (foe.active.volatiles.PerishSong) {
-            return options.log.fail(battle.active(player.foe()), .None);
+            return options.log.fail(.{ battle.active(player.foe()), .None });
         } else if (!side.active.volatiles.PerishSong) {
             side.active.volatiles.PerishSong = true;
             side.active.volatiles.perish_song = 4;
-            try options.log.start(battle.active(player), .PerishSong3Silent);
+            try options.log.start(.{ battle.active(player), .PerishSong3Silent });
         }
         foe.active.volatiles.PerishSong = true;
         foe.active.volatiles.perish_song = 4;
-        try options.log.start(battle.active(player.foe()), .PerishSong3Silent);
+        try options.log.start(.{ battle.active(player.foe()), .PerishSong3Silent });
 
-        try options.log.fieldactivate(); // FIXME .PerishSong
+        try options.log.fieldactivate(.{}); // FIXME .PerishSong
     }
 
     pub fn poison(battle: anytype, player: Player, state: *State, options: anytype) !void {
@@ -2080,24 +2118,24 @@ pub const Effects = struct {
 
         const toxic = state.move == .Toxic;
         if (state.immune() or foe.active.types.includes(.Poison)) {
-            return options.log.immune(foe_ident, .None);
+            return options.log.immune(.{ foe_ident, .None });
         } else if (Status.any(foe_stored.status)) {
             // Pokémon Showdown considers Toxic to be a status even in Generation II and so
             // will not include a fail reason for Toxic vs. Poison or vice-versa...
-            return options.log.fail(foe_ident, if (Status.is(foe_stored.status, .PSN))
+            return options.log.fail(.{ foe_ident, if (Status.is(foe_stored.status, .PSN))
                 if (!showdown)
-                    .Poison
+                    Fail.Poison
                 else if (toxic == (foe_stored.status == Status.TOX))
-                    if (toxic) .Toxic else .Poison
+                    if (toxic) Fail.Toxic else Fail.Poison
                 else
-                    .None
+                    Fail.None
             else
-                .None);
+                Fail.None });
         } else if (foe.active.volatiles.Substitute) {
-            return options.log.activateMove(foe_ident, .SubstituteBlock, state.move);
+            return options.log.activate(.{ foe_ident, .SubstituteBlock, state.move });
         } else if (state.miss) {
-            try options.log.lastmiss();
-            return options.log.miss(battle.active(player));
+            try options.log.lastmiss(.{});
+            return options.log.miss(.{battle.active(player)});
         }
 
         foe_stored.status = Status.init(.PSN);
@@ -2107,7 +2145,7 @@ pub const Effects = struct {
             foe.active.volatiles.toxic = 0;
         }
 
-        try options.log.status(foe_ident, foe_stored.status, .None);
+        try options.log.status(.{ foe_ident, foe_stored.status, .None });
 
         // TODO: check for status berry
     }
@@ -2123,7 +2161,8 @@ pub const Effects = struct {
         if (foe.conditions.Safeguard) return;
 
         foe_stored.status = Status.init(.PSN);
-        try options.log.status(battle.active(player.foe()), foe_stored.status, .None);
+
+        try options.log.status(.{ battle.active(player.foe()), foe_stored.status, .None });
 
         // TODO: check for status berry
     }
@@ -2138,9 +2177,7 @@ pub const Effects = struct {
 
         const failed = !state.first or volatiles.Substitute or
             !try Rolls.protect(battle, player, volatiles.protect, options);
-        if (failed) {
-            return options.log.fail(battle.active(player), .None);
-        }
+        if (failed) return options.log.fail(.{ battle.active(player), .None });
 
         volatiles.protect = @max(8, volatiles.protect + 1);
         if (state.move == .Endure) {
@@ -2148,7 +2185,7 @@ pub const Effects = struct {
         } else {
             volatiles.Protect = true;
         }
-        try options.log.singleturn(battle.active(player), state.move);
+        try options.log.singleturn(.{ battle.active(player), state.move });
     }
 
     pub fn psychUp(battle: anytype, player: Player, _: *State, options: anytype) !void {
@@ -2157,30 +2194,29 @@ pub const Effects = struct {
 
         // Pokémon Showdown should fail when the enemy has no boosts/unboosts but doesn't
         if (!showdown and @as(u32, @bitCast(foe.active.boosts)) == 0) {
-            return options.log.fail(battle.active(player), .None);
+            return options.log.fail(.{ battle.active(player), .None });
         }
 
         side.active.boosts = foe.active.boosts;
-        try options.log.copyboost(battle.active(player), battle.active(player.foe()));
+        try options.log.copyboost(.{ battle.active(player), battle.active(player.foe()) });
     }
 
     pub fn pursuit(battle: anytype, player: Player, state: *State, _: anytype) !void {
         // TODO: remove switching variable and just look at Choice saved in Battle struct?
-        if (battle.foe(player).active.volatiles.switching) state.damage *|= 2;
+        if (battle.foe(player).active.volatiles.switching) state.damage = smul(state.damage, 2);
     }
 
     pub const rage = struct {
         pub fn start(battle: anytype, player: Player, _: *State, options: anytype) !void {
             battle.side(player).active.volatiles.Rage = true;
-            try options.log.singlemove(battle.active(player), Move.Rage);
+            try options.log.singlemove(.{ battle.active(player), Move.Rage });
         }
 
         pub fn damage(battle: anytype, player: Player, state: *State, _: anytype) !void {
-            var side = battle.side(player);
-            var volatiles = &side.active.volatiles;
+            const side = battle.side(player);
 
-            assert(volatiles.Rage);
-            state.damage *|= (volatiles.rage +| 1);
+            assert(side.active.volatiles.Rage);
+            state.damage = smul(state.damage, (side.active.volatiles.rage +| 1)); // TODO: |+
         }
     };
 
@@ -2192,18 +2228,18 @@ pub const Effects = struct {
         var side = battle.side(player);
 
         if (side.active.volatiles.LeechSeed) {
-            try options.log.end(battle.active(player), .LeechSeedFrom);
+            try options.log.end(.{ battle.active(player), .LeechSeedFrom });
             side.active.volatiles.LeechSeed = false;
         }
 
         if (side.conditions.Spikes) {
-            try options.log.spikesend(battle.active(player));
+            try options.log.sideend(.{ player, protocol.Side.Spikes, battle.active(player) });
             side.conditions.Spikes = false;
         }
 
         if (side.active.volatiles.bind.duration > 0) {
             const reason = @intFromEnum(End.Bind) + side.active.volatiles.bind.reason - 1;
-            try options.log.end(battle.active(player), @enumFromInt(reason));
+            try options.log.end(.{ battle.active(player), @as(End, @enumFromInt(reason)) });
             side.active.volatiles.bind = .{};
         }
     }
@@ -2211,18 +2247,14 @@ pub const Effects = struct {
     pub fn recoil(battle: anytype, player: Player, state: *State, options: anytype) !void {
         var side = battle.side(player);
         var stored = side.stored();
+        const ident = battle.active(player);
 
         assert(state.damage > 0);
 
         const damage: i16 = @intCast(@max(state.damage / 4, 1));
         stored.hp = @intCast(@max(@as(i16, @intCast(stored.hp)) - damage, 0));
 
-        try options.log.damageOf(
-            battle.active(player),
-            stored,
-            .RecoilOf,
-            battle.active(player.foe()),
-        );
+        try options.log.damage(.{ ident, stored, .RecoilOf, battle.active(player.foe()) });
     }
 
     pub fn reversal(battle: anytype, player: Player, state: *State, options: anytype) !void {
@@ -2279,13 +2311,13 @@ pub const Effects = struct {
             side.active.volatiles.attacks += 1;
             side.active.volatiles.Rollout = side.active.volatiles.attacks != 5;
 
-            if (side.active.volatiles.DefenseCurl) state.damage *|= 2;
+            if (side.active.volatiles.DefenseCurl) state.damage = smul(state.damage, 2);
         }
     };
 
     pub fn sandstorm(battle: anytype, player: Player, _: *State, options: anytype) !void {
         if (battle.field.weather != .Sandstorm) return weather(battle, .Sandstorm, options);
-        return options.log.fail(battle.active(player), .None);
+        return options.log.fail(.{ battle.active(player), .None });
     }
 
     pub fn safeguard(battle: anytype, player: Player, _: *State, options: anytype) !void {
@@ -2309,11 +2341,13 @@ pub const Effects = struct {
     ) !void {
         var side = battle.side(player);
 
-        if (@field(side.conditions, key)) return options.log.fail(battle.active(player), .None);
+        if (@field(side.conditions, key)) {
+            return options.log.fail(.{ battle.active(player), .None });
+        }
 
         @field(side.conditions, key) = true;
         @field(side.conditions, value) = 5;
-        try options.log.sidestart(player, @field(protocol.Side, key));
+        try options.log.sidestart(.{ player, @field(protocol.Side, key) });
     }
 
     pub fn sketch(battle: anytype, player: Player, _: *State, options: anytype) !void {
@@ -2324,9 +2358,9 @@ pub const Effects = struct {
 
         if (showdown) {
             // yes, actually "Splash". '|nothing' gets blindly mapped to  '|-activate||move:Splash'
-            try options.log.activate(battle.active(player), .Splash);
+            try options.log.activate(.{ battle.active(player), .Splash });
         } else {
-            try options.log.fail(battle.active(player), .None);
+            try options.log.fail(.{ battle.active(player), .None });
         }
     }
 
@@ -2336,40 +2370,39 @@ pub const Effects = struct {
         const foe_ident = battle.active(player.foe());
 
         if (Status.any(foe_stored.status)) {
-            return options.log.fail(
+            return options.log.fail(.{
                 foe_ident,
-                if (Status.is(foe_stored.status, .SLP)) .Sleep else .None,
-            );
+                if (Status.is(foe_stored.status, .SLP)) Fail.Sleep else Fail.None,
+            });
         }
 
         if (foe.active.volatiles.Substitute) {
-            return options.log.activateMove(foe_ident, .SubstituteBlock, state.move);
+            return options.log.activate(.{ foe_ident, .SubstituteBlock, state.move });
         }
 
         // 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;
             }
         }
 
         foe_stored.status = Status.slp(Rolls.sleepDuration(battle, player, options));
-        try options.log.statusFrom(foe_ident, foe_stored.status, state.move);
+        try options.log.status(.{ foe_ident, foe_stored.status, .From, state.move });
     }
 
     pub fn sleepTalk(battle: anytype, player: Player, state: *State, options: anytype) !void {
         const side = battle.side(player);
 
         if (!Status.is(side.stored().status, .SLP)) {
-            if (!showdown) try options.log.fail(battle.active(player), .None);
-            return;
+            return if (!showdown) try options.log.fail(.{ battle.active(player), .None });
         }
 
         var n: u3 = 0;
         for (side.active.moves, 0..) |m, i| {
             if (state.mslot - 1 != i and Move.get(m.id).extra.sleep_talk) n += 1;
         }
-        if (n == 0) return options.log.fail(battle.active(player), .None);
+        if (n == 0) return options.log.fail(.{ battle.active(player), .None });
 
         _ = try Rolls.sleepTalk(battle, player, n, state.mslot, options); // TODO
     }
@@ -2378,55 +2411,75 @@ pub const Effects = struct {
         if (Status.is(battle.side(player).stored().status, .SLP)) return true;
         state.damage = 0;
         state.miss = true; // TODO is this necessary?
-        if (!showdown) try options.log.fail(battle.active(player), .None);
+        if (!showdown) try options.log.fail(.{ battle.active(player), .None });
         return false;
     }
 
     pub fn spikes(battle: anytype, player: Player, _: *State, options: anytype) !void {
         var foe = battle.foe(player);
-        if (foe.conditions.Spikes) return options.log.fail(battle.active(player), .None);
+        if (foe.conditions.Spikes) return options.log.fail(.{ battle.active(player), .None });
 
         foe.conditions.Spikes = true;
-        try options.log.sidestart(player.foe(), .Spikes);
+        try options.log.sidestart(.{ player.foe(), protocol.Side.Spikes });
     }
 
     pub fn spite(battle: anytype, player: Player, state: *State, options: anytype) !void {
-        _ = .{ battle, player, state, options }; // TODO
-        // var foe = battle.foe(player);
+        var foe = battle.foe(player);
 
-        // if (state.miss) return options.log.fail(battle.active(player), .None);
+        const last = foe.lastMove(false);
+        if (state.miss or last == .None or last == .Struggle) {
+            return options.log.fail(.{ battle.active(player.foe()), .None });
+        }
 
-        // const last = foe.lastMove(false);
-        // if (showdown) {
-        //     const roll = try Rolls.spite(battle, player, options);
-        // } else {
-        //     if (last != .None) {}
-        // }
+        var slot: u4 = 0;
+        for (foe.active.moves, 0..) |m, i| {
+            if (m.id == last) slot = @intCast(i + 1);
+        }
+        // If the move was called via Metronome it might not exist
+        if (slot == 0 or foe.active.move(slot).pp == 0) {
+            return options.log.fail(.{ battle.active(player.foe()), .None });
+        }
+
+        // Pokémon Showdown always deducts 4 instead of randomizing
+        const pp = @min(
+            foe.active.move(slot).pp,
+            if (showdown) 4 else try Rolls.spite(battle, player, options),
+        );
+        foe.active.move(slot).pp -= pp;
+        if (!foe.active.volatiles.Transform) {
+            var move_slot = foe.stored().move(slot);
+            assert(move_slot.pp > 0);
+
+            move_slot.pp = @as(u6, @intCast(move_slot.pp)) -% 1;
+            assert(foe.active.move(slot).pp == foe.stored().move(slot).pp);
+        }
+
+        try options.log.activate(.{ battle.active(player.foe()), .Spite, last, pp });
     }
 
     pub fn splash(battle: anytype, player: Player, _: *State, options: anytype) !void {
-        try options.log.activate(battle.active(player), .Splash);
+        try options.log.activate(.{ battle.active(player), .Splash });
     }
 
     pub fn substitute(battle: anytype, player: Player, _: *State, options: anytype) !void {
         var side = battle.side(player);
         if (side.active.volatiles.Substitute) {
-            return options.log.fail(battle.active(player), .Substitute);
+            return options.log.fail(.{ battle.active(player), .Substitute });
         }
 
         assert(side.stored().stats.hp <= 1023);
         const hp: u8 = @intCast(side.stored().stats.hp / 4);
 
         if (hp == 0 or side.stored().hp <= hp) {
-            return options.log.fail(battle.active(player), .Weak);
+            return options.log.fail(.{ battle.active(player), .Weak });
         }
 
         side.stored().hp -= hp;
         side.active.volatiles.substitute = hp;
         side.active.volatiles.Substitute = true;
         side.active.volatiles.bind = .{};
-        try options.log.start(battle.active(player), .Substitute);
-        try options.log.damage(battle.active(player), side.stored(), .None);
+        try options.log.start(.{ battle.active(player), .Substitute });
+        try options.log.damage(.{ battle.active(player), side.stored(), .None });
     }
 
     pub fn sunnyDay(battle: anytype, _: Player, _: *State, options: anytype) !void {
@@ -2436,14 +2489,14 @@ pub const Effects = struct {
     fn weather(battle: anytype, w: Weather, options: anytype) !void {
         battle.field.weather = w;
         battle.field.weather_duration = 5;
-        try options.log.weather(w, .None);
+        try options.log.weather(.{ w, protocol.Weather.None });
     }
 
     pub fn teleport(battle: anytype, player: Player, _: *State, options: anytype) !void {
         if (showdown) return;
 
-        try options.log.fail(battle.active(player), .None);
-        try options.log.laststill();
+        try options.log.fail(.{ battle.active(player), .None });
+        try options.log.laststill(.{});
     }
 
     pub fn thief(battle: anytype, player: Player, state: *State, options: anytype) !void {
@@ -2458,11 +2511,11 @@ pub const Effects = struct {
         side.stored().item = foe.stored().item;
         foe.stored().item = .None;
 
-        try options.log.item(
+        try options.log.item(.{
             battle.active(player),
             side.stored().item,
             battle.active(player.foe()),
-        );
+        });
     }
 
     pub fn thrashing(battle: anytype, player: Player, _: *State, options: anytype) !void {
@@ -2484,11 +2537,11 @@ pub const Effects = struct {
         side.active.volatiles.dirty = false;
 
         if (foe.active.volatiles.Transform) {
-            return options.log.fail(battle.active(player), .None);
+            return options.log.fail(.{ battle.active(player), .None });
         } else if (foe.active.volatiles.Flying or foe.active.volatiles.Underground) {
-            if (!showdown) return options.log.fail(battle.active(player), .None);
-            try options.log.lastmiss();
-            return options.log.miss(battle.active(player));
+            if (!showdown) return options.log.fail(.{ battle.active(player), .None });
+            try options.log.lastmiss(.{});
+            return options.log.miss(.{battle.active(player)});
         }
 
         side.active.volatiles.Transform = true;
@@ -2510,7 +2563,7 @@ pub const Effects = struct {
             side.active.moves[i].pp = if (m.id != .None) if (m.id == .Sketch) 1 else 5 else 0;
         }
 
-        try options.log.transform(battle.active(player), foe_ident);
+        try options.log.transform(.{ battle.active(player), foe_ident });
     }
 
     pub fn triAttack(battle: anytype, player: Player, state: *State, options: anytype) !void {
@@ -2535,17 +2588,17 @@ pub const Effects = struct {
     pub fn allStatUpChance(battle: anytype, player: Player, state: *State, options: anytype) !void {
         var side = battle.side(player);
 
-        var stats = &side.active.stats;
-        var boosts = &side.active.boosts;
+        const stats = &side.active.stats;
+        const boosts = &side.active.boosts;
 
         if (!state.proc) return;
         inline for (STATS, STAT_UP_REASONS) |s, r| {
             assert(@field(boosts, s) >= -6 and @field(boosts, s) <= 6);
             if (@field(boosts, s) == 6 or @field(stats, s) == MAX_STAT_VALUE) {
-                try options.log.boost(battle.active(player), r, 0);
+                try options.log.boost(.{ battle.active(player), r, 0 });
             } else {
                 try boostStat(battle, side, stats, boosts, s, 1);
-                try options.log.boost(battle.active(player), r, 1);
+                try options.log.boost(.{ battle.active(player), r, 1 });
             }
         }
     }
@@ -2555,51 +2608,61 @@ pub const Effects = struct {
         var side = battle.side(player);
         const ident = battle.active(player);
 
-        if (state.miss) return log.fail(ident, .None);
+        if (state.miss) return log.fail(.{ ident, .None });
 
-        var stats = &side.active.stats;
+        const stats = &side.active.stats;
         var boosts = &side.active.boosts;
 
         const move = Move.get(state.move);
         switch (move.effect) {
             .AttackUp1, .AttackUp2, .Rage, .Swagger => {
                 assert(boosts.atk >= -6 and boosts.atk <= 6);
-                if (boosts.atk == 6 or stats.atk == MAX_STAT_VALUE) return log.fail(ident, .None);
+                if (boosts.atk == 6 or stats.atk == MAX_STAT_VALUE) {
+                    return log.fail(.{ ident, .None });
+                }
                 const n: u2 = if (move.effect == .AttackUp2 or move.effect == .Swagger) 2 else 1;
                 try boostStat(battle, side, stats, boosts, "atk", n);
                 const reason = if (showdown and move.effect == .Rage) Boost.Rage else Boost.Attack;
-                try log.boost(ident, reason, n);
+                try log.boost(.{ ident, reason, n });
             },
             .DefenseUp1, .DefenseUp2, .SkullBash => {
                 assert(boosts.def >= -6 and boosts.def <= 6);
-                if (boosts.def == 6 or stats.def == MAX_STAT_VALUE) return log.fail(ident, .None);
+                if (boosts.def == 6 or stats.def == MAX_STAT_VALUE) {
+                    return log.fail(.{ ident, .None });
+                }
                 const n: u2 = if (move.effect == .DefenseUp2) 2 else 1;
                 try boostStat(battle, side, stats, boosts, "def", n);
-                try log.boost(ident, .Defense, n);
+                try log.boost(.{ ident, .Defense, n });
             },
             .SpeedUp2 => {
                 assert(boosts.spe >= -6 and boosts.spe <= 6);
-                if (boosts.spe == 6 or stats.spe == MAX_STAT_VALUE) return log.fail(ident, .None);
+                if (boosts.spe == 6 or stats.spe == MAX_STAT_VALUE) {
+                    return log.fail(.{ ident, .None });
+                }
                 try boostStat(battle, side, stats, boosts, "spe", 2);
-                try log.boost(ident, .Speed, 2);
+                try log.boost(.{ ident, .Speed, 2 });
             },
             .SpAtkUp1 => {
                 assert(boosts.spa >= -6 and boosts.spa <= 6);
-                if (boosts.spa == 6 or stats.spa == MAX_STAT_VALUE) return log.fail(ident, .None);
+                if (boosts.spa == 6 or stats.spa == MAX_STAT_VALUE) {
+                    return log.fail(.{ ident, .None });
+                }
                 try boostStat(battle, side, stats, boosts, "spa", 1);
-                try log.boost(ident, .SpecialAttack, 1);
+                try log.boost(.{ ident, .SpecialAttack, 1 });
             },
             .SpDefUp2 => {
                 assert(boosts.spd >= -6 and boosts.spd <= 6);
-                if (boosts.spd == 6 or stats.spd == MAX_STAT_VALUE) return log.fail(ident, .None);
+                if (boosts.spd == 6 or stats.spd == MAX_STAT_VALUE) {
+                    return log.fail(.{ ident, .None });
+                }
                 try boostStat(battle, side, stats, boosts, "spd", 2);
-                try log.boost(ident, .SpecialDefense, 2);
+                try log.boost(.{ ident, .SpecialDefense, 2 });
             },
             .EvasionUp1 => {
                 assert(boosts.evasion >= -6 and boosts.evasion <= 6);
-                if (boosts.evasion == 6) return log.fail(ident, .None);
+                if (boosts.evasion == 6) return log.fail(.{ ident, .None });
                 boosts.evasion = @intCast(@min(6, @as(i8, boosts.evasion) + 1));
-                try log.boost(ident, .Evasion, 1);
+                try log.boost(.{ ident, .Evasion, 1 });
                 if (state.move == .Minimize) side.active.volatiles.minimized = true;
             },
             else => unreachable,
@@ -2612,79 +2675,83 @@ pub const Effects = struct {
         const foe_ident = battle.active(player.foe());
 
         if (foe.active.volatiles.Mist) {
-            try log.activate(foe_ident, .Mist);
-            return log.fail(foe_ident, .None);
+            try log.activate(.{ foe_ident, .Mist });
+            return log.fail(.{ foe_ident, .None });
         }
 
         const fail = foe.active.volatiles.Substitute or state.miss or !state.proc;
 
-        var stats = &foe.active.stats;
+        const stats = &foe.active.stats;
         var boosts = &foe.active.boosts;
 
         const move = Move.get(state.move);
+        const none: Fail = .None;
         switch (move.effect) {
             .AttackDown1, .AttackDown2, .AttackDownChance => {
                 assert(boosts.atk >= -6 and boosts.atk <= 6);
                 if (fail or boosts.atk == -6) {
-                    return if (move.effect != .AttackDownChance) try log.fail(foe_ident, .None);
+                    return if (move.effect != .AttackDownChance) try log.fail(.{ foe_ident, none });
                 } else if (foe.active.volatiles.Flying or foe.active.volatiles.Underground) {
-                    try options.log.lastmiss();
-                    return options.log.miss(battle.active(player));
+                    try options.log.lastmiss(.{});
+                    return options.log.miss(.{battle.active(player)});
                 } else if (stats.atk == 1) {
-                    return if (move.effect != .AttackDownChance) try log.fail(foe_ident, .None);
+                    return if (move.effect != .AttackDownChance) try log.fail(.{ foe_ident, none });
                 }
                 const n: u2 = if (move.effect == .AttackDown2) 2 else 1;
                 try unboostStat(battle, foe, stats, boosts, "atk", n);
-                try log.boost(foe_ident, .Attack, -@as(i8, n));
+                try log.boost(.{ foe_ident, .Attack, -@as(i8, n) });
             },
             .DefenseDown1, .DefenseDown2, .DefenseDownChance => {
                 assert(boosts.def >= -6 and boosts.def <= 6);
                 if (fail or boosts.def == -6) {
-                    return if (move.effect != .DefenseDownChance) try log.fail(foe_ident, .None);
+                    if (move.effect != .DefenseDownChance) try log.fail(.{ foe_ident, none });
+                    return;
                 } else if (foe.active.volatiles.Flying or foe.active.volatiles.Underground) {
-                    try options.log.lastmiss();
-                    return options.log.miss(battle.active(player));
+                    try options.log.lastmiss(.{});
+                    return options.log.miss(.{battle.active(player)});
                 } else if (stats.def == 1) {
-                    return if (move.effect != .DefenseDownChance) try log.fail(foe_ident, .None);
+                    if (move.effect != .DefenseDownChance) try log.fail(.{ foe_ident, none });
+                    return;
                 }
                 const n: u2 = if (move.effect == .DefenseDown2) 2 else 1;
                 try unboostStat(battle, foe, stats, boosts, "def", n);
-                try log.boost(foe_ident, .Defense, -@as(i8, n));
+                try log.boost(.{ foe_ident, .Defense, -@as(i8, n) });
             },
             .SpeedDown1, .SpeedDown2, .SpeedDownChance => {
                 assert(boosts.spe >= -6 and boosts.spe <= 6);
                 if (fail or boosts.spe == -6) {
-                    return if (move.effect != .SpeedDownChance) try log.fail(foe_ident, .None);
+                    return if (move.effect != .SpeedDownChance) try log.fail(.{ foe_ident, none });
                 } else if (foe.active.volatiles.Flying or foe.active.volatiles.Underground) {
-                    try options.log.lastmiss();
-                    return options.log.miss(battle.active(player));
+                    try options.log.lastmiss(.{});
+                    return options.log.miss(.{battle.active(player)});
                 } else if (stats.spe == 1) {
-                    return if (move.effect != .SpeedDownChance) try log.fail(foe_ident, .None);
+                    return if (move.effect != .SpeedDownChance) try log.fail(.{ foe_ident, none });
                 }
                 const n: u2 = if (move.effect == .SpeedDown2) 2 else 1;
                 try unboostStat(battle, foe, stats, boosts, "spe", n);
-                try log.boost(foe_ident, .Speed, -@as(i8, n));
+                try log.boost(.{ foe_ident, .Speed, -@as(i8, n) });
             },
             .SpDefDownChance => {
                 assert(boosts.spd >= -6 and boosts.spd <= 6);
                 if (fail or boosts.spd == -6) return;
                 if (foe.active.volatiles.Flying or foe.active.volatiles.Underground) {
-                    try options.log.lastmiss();
-                    return options.log.miss(battle.active(player));
+                    try options.log.lastmiss(.{});
+                    return options.log.miss(.{battle.active(player)});
                 } else if (stats.spd == 1) return;
                 try unboostStat(battle, foe, stats, boosts, "spd", 1);
-                try log.boost(foe_ident, .SpecialDefense, -1);
+                try log.boost(.{ foe_ident, .SpecialDefense, -1 });
             },
             .AccuracyDown1, .AccuracyDownChance => {
                 assert(boosts.accuracy >= -6 and boosts.accuracy <= 6);
                 if (fail or boosts.accuracy == -6) {
-                    return if (move.effect != .AccuracyDownChance) try log.fail(foe_ident, .None);
+                    if (move.effect != .AccuracyDownChance) try log.fail(.{ foe_ident, none });
+                    return;
                 } else if (foe.active.volatiles.Flying or foe.active.volatiles.Underground) {
-                    try options.log.lastmiss();
-                    return options.log.miss(battle.active(player));
+                    try options.log.lastmiss(.{});
+                    return options.log.miss(.{battle.active(player)});
                 }
                 boosts.accuracy = @intCast(@max(-6, @as(i8, boosts.accuracy) - 1));
-                try log.boost(foe_ident, .Accuracy, -1);
+                try log.boost(.{ foe_ident, .Accuracy, -1 });
             },
             else => unreachable,
         }
@@ -2698,9 +2765,9 @@ fn unmodifiedStats(battle: anytype, side: *Side) *Stats(u16) {
 }
 
 fn recomputeStats(battle: anytype, side: *Side) void {
-    var stats = unmodifiedStats(battle, side);
+    const stats = unmodifiedStats(battle, side);
     inline for (STATS) |s| {
-        var mod = STAT_BOOSTS[@as(u4, @intCast(@as(i8, @field(side.active.boosts, s)) + 6))];
+        const mod = STAT_BOOSTS[@as(u4, @intCast(@as(i8, @field(side.active.boosts, s)) + 6))];
         const val = @field(stats, s) * mod[0] / mod[1];
         @field(side.active.stats, s) = @max(1, @min(MAX_STAT_VALUE, val));
     }
@@ -2723,7 +2790,7 @@ fn boostStat(
     n: u2,
 ) !void {
     @field(boosts, s) = @intCast(@min(6, @as(i8, @field(boosts, s)) + n));
-    var mod = STAT_BOOSTS[@as(u4, @intCast(@as(i8, @field(boosts, s)) + 6))];
+    const mod = STAT_BOOSTS[@as(u4, @intCast(@as(i8, @field(boosts, s)) + 6))];
     const stat = @field(unmodifiedStats(battle, side), s);
     @field(stats, s) = @min(MAX_STAT_VALUE, stat * mod[0] / mod[1]);
     if (comptime std.mem.eql(u8, s, "atk")) {
@@ -2746,7 +2813,7 @@ fn unboostStat(
     n: u2,
 ) !void {
     @field(boosts, s) = @intCast(@max(-6, @as(i8, @field(boosts, s)) - n));
-    var mod = STAT_BOOSTS[@as(u4, @intCast(@as(i8, @field(boosts, s)) + 6))];
+    const mod = STAT_BOOSTS[@as(u4, @intCast(@as(i8, @field(boosts, s)) + 6))];
     const stat = @field(unmodifiedStats(battle, side), s);
     @field(stats, s) = @max(1, stat * mod[0] / mod[1]);
     if (comptime std.mem.eql(u8, s, "atk")) {
@@ -2772,9 +2839,15 @@ fn convertible(active: ActivePokemon, m: Move) bool {
     return t != .@"???" and !active.types.includes(t);
 }
 
+// NOTE: llvm/llvm-project#58557
+fn smul(a: anytype, b: @TypeOf(a)) @TypeOf(a) {
+    if (!comptime builtin.target.cpu.arch.isWasm()) return a *| b;
+    return @max(a *% b, std.math.maxInt(@TypeOf(a)));
+}
+
 pub const Rolls = struct {
     fn speedTie(battle: anytype, options: anytype) !bool {
-        const p1 = if (options.calc.overridden(.P1, .speed_tie)) |player|
+        const p1 = if (options.calc.overridden(.P1, 0, .speed_tie)) |player|
             player == .P1
         else if (showdown)
             battle.rng.range(u8, 0, 2) == 0
@@ -2786,7 +2859,7 @@ pub const Rolls = struct {
     }
 
     fn quickClaw(battle: anytype, player: Player, options: anytype) !bool {
-        const qkc = if (options.calc.overridden(player, .quick_claw)) |val|
+        const qkc = if (options.calc.overridden(player, 0, .quick_claw)) |val|
             val == .true
         else if (showdown)
             battle.rng.chance(u8, 60, 256)
@@ -2798,7 +2871,7 @@ pub const Rolls = struct {
     }
 
     fn hit(battle: anytype, player: Player, accuracy: u8, options: anytype) !bool {
-        const ok = if (options.calc.overridden(player, .hit)) |val|
+        const ok = if (options.calc.overridden(player, 0, .hit)) |val|
             val == .true
         else if (showdown)
             battle.rng.chance(u8, accuracy, 256)
@@ -2809,20 +2882,22 @@ pub const Rolls = struct {
         return ok;
     }
 
-    fn criticalHit(battle: anytype, player: Player, rate: u8, options: anytype) !bool {
-        const crit = if (options.calc.overridden(player, .critical_hit)) |val|
+    fn criticalHit(battle: anytype, player: Player, i: u3, rate: u8, options: anytype) !bool {
+        _ = .{ player, options };
+        const crit = if (options.calc.overridden(player, i, .critical_hits)) |val|
             val == .true
         else if (showdown)
             battle.rng.chance(u8, rate, 256)
         else
             battle.rng.next() < rate;
 
-        try options.chance.criticalHit(player, crit, rate);
+        try options.chance.criticalHit(player, i, crit, rate);
         return crit;
     }
 
-    fn damage(battle: anytype, player: Player, options: anytype) !u8 {
-        const roll = if (options.calc.overridden(player, .damage)) |val|
+    fn damage(battle: anytype, player: Player, i: u3, options: anytype) !u8 {
+        _ = .{ player, options };
+        const roll = if (options.calc.overridden(player, i, .damages)) |val|
             val
         else roll: {
             if (showdown) break :roll battle.rng.range(u8, 217, 256);
@@ -2833,12 +2908,12 @@ pub const Rolls = struct {
         };
 
         assert(roll >= 217 and roll <= 255);
-        try options.chance.damage(player, roll);
+        try options.chance.damage(player, i, roll);
         return roll;
     }
 
     fn confused(battle: anytype, player: Player, options: anytype) !bool {
-        const cfz = if (options.calc.overridden(player, .confused)) |val|
+        const cfz = if (options.calc.overridden(player, 0, .confused)) |val|
             val == .true
         else if (showdown)
             !battle.rng.chance(u8, 128, 256)
@@ -2850,7 +2925,7 @@ pub const Rolls = struct {
     }
 
     fn attract(battle: anytype, player: Player, options: anytype) !bool {
-        const cant = if (options.calc.overridden(player, .attract)) |val|
+        const cant = if (options.calc.overridden(player, 0, .attract)) |val|
             val == .true
         else if (showdown)
             battle.rng.chance(u8, 1, 2)
@@ -2862,7 +2937,7 @@ pub const Rolls = struct {
     }
 
     fn paralyzed(battle: anytype, player: Player, options: anytype) !bool {
-        const par = if (options.calc.overridden(player, .paralyzed)) |val|
+        const par = if (options.calc.overridden(player, 0, .paralyzed)) |val|
             val == .true
         else if (showdown)
             battle.rng.chance(u8, 63, 256)
@@ -2874,7 +2949,7 @@ pub const Rolls = struct {
     }
 
     fn defrost(battle: anytype, player: Player, options: anytype) !bool {
-        const thaw = if (options.calc.overridden(player, .defrost)) |val|
+        const thaw = if (options.calc.overridden(player, 0, .defrost)) |val|
             val == .true
         else if (showdown)
             battle.rng.chance(u8, 25, 256)
@@ -2887,7 +2962,7 @@ pub const Rolls = struct {
 
     fn secondaryChance(battle: anytype, player: Player, rate: u8, options: anytype) !bool {
         // GLITCH: 100% secondary chance will still fail 1/256 of the time
-        const proc = if (options.calc.overridden(player, .secondary_chance)) |val|
+        const proc = if (options.calc.overridden(player, 0, .secondary_chance)) |val|
             val == .true
         else if (showdown)
             battle.rng.chance(u8, rate, 256)
@@ -2899,7 +2974,7 @@ pub const Rolls = struct {
     }
 
     fn item(battle: anytype, player: Player, options: anytype) !bool {
-        const proc = if (options.calc.overridden(player, .item)) |val|
+        const proc = if (options.calc.overridden(player, 0, .item)) |val|
             val == .true
         else if (showdown)
             battle.rng.chance(u8, 30, 256)
@@ -2911,7 +2986,7 @@ pub const Rolls = struct {
     }
 
     fn triAttack(battle: anytype, player: Player, options: anytype) !TriAttack {
-        const status: TriAttack = if (options.calc.overridden(player, .tri_attack)) |val|
+        const status: TriAttack = if (options.calc.overridden(player, 0, .tri_attack)) |val|
             @enumFromInt(@intFromEnum(val) - 1)
         else if (showdown)
             @enumFromInt(battle.rng.range(u2, 0, 2))
@@ -2927,7 +3002,7 @@ pub const Rolls = struct {
     }
 
     fn present(battle: anytype, player: Player, options: anytype) !u8 {
-        const power = if (options.calc.overridden(player, .present)) |val|
+        const power = if (options.calc.overridden(player, 0, .present)) |val|
             (val - 1) * 40
         else if (showdown) power: {
             const r = battle.rng.range(u8, 0, 10);
@@ -2949,7 +3024,7 @@ pub const Rolls = struct {
     }
 
     fn magnitude(battle: anytype, player: Player, options: anytype) !u8 {
-        const num: u8 = if (options.calc.overridden(player, .magnitude)) |val|
+        const num: u8 = if (options.calc.overridden(player, 0, .magnitude)) |val|
             val + 3
         else if (showdown) num: {
             const r = battle.rng.range(u8, 0, 100);
@@ -2977,7 +3052,7 @@ pub const Rolls = struct {
     }
 
     fn tripleKick(battle: anytype, player: Player, options: anytype) !u2 {
-        const hits = if (options.calc.overridden(player, .triple_kick)) |val|
+        const hits = if (options.calc.overridden(player, 0, .triple_kick)) |val|
             val
         else if (showdown)
             battle.rng.range(u2, 1, 4)
@@ -2993,13 +3068,12 @@ pub const Rolls = struct {
         return hits;
     }
 
-    fn spite(battle: anytype, player: Player, options: anytype) !u8 {
-        const pp = if (options.calc.overridden(player, .spite)) |val|
+    fn spite(battle: anytype, player: Player, options: anytype) !u3 {
+        assert(!showdown);
+        const pp: u3 = if (options.calc.overridden(player, 0, .spite)) |val|
             val + 1
-        else if (showdown)
-            battle.rng.range(u8, 2, 6)
         else
-            (battle.rng.next() & 3) + 2;
+            @intCast((battle.rng.next() & 3) + 2);
 
         assert(pp >= 2 and pp <= 5);
         try options.chance.spite(player, pp);
@@ -3007,13 +3081,13 @@ pub const Rolls = struct {
     }
 
     // Conversion 2 can at most choose between 7 types (vs. a Grass-type attack)
-    var CONVERSION_2: [7]Type = [_]Type{.@"???"} ** 7;
+    var CONVERSION_2: [7]Type = @splat(.@"???");
 
     fn conversion2(battle: anytype, player: Player, mtype: Type, options: anytype) !Type {
         var i: u8 = 0;
         const neutral = @intFromEnum(Effectiveness.Neutral);
         assert(mtype != .@"???");
-        const ty: Type = if (options.calc.overridden(player, .conversion_2)) |val|
+        const ty: Type = if (options.calc.overridden(player, 0, .conversion_2)) |val|
             @enumFromInt(@intFromEnum(val) - 1)
         else if (showdown) ty: {
             for (Type.SHOWDOWN) |t| {
@@ -3047,7 +3121,7 @@ pub const Rolls = struct {
         assert(count <= 8);
         const num = if (count == 8) 0 else @as(u8, 255) >> @intCast(count);
 
-        const ok = if (options.calc.overridden(player, .protect)) |val|
+        const ok = if (options.calc.overridden(player, 0, .protect)) |val|
             val == .true
         else if (showdown)
             battle.rng.chance(u8, num, 255)
@@ -3069,7 +3143,7 @@ pub const Rolls = struct {
         const moves = active.moves;
 
         // TODO: consider throwing error instead of rerolling?
-        const overridden = if (options.calc.overridden(player, .move_slot)) |val|
+        const overridden = if (options.calc.overridden(player, 0, .move_slot)) |val|
             if (convertible(active, moves[val - 1].id)) val else null
         else
             null;
@@ -3106,7 +3180,7 @@ pub const Rolls = struct {
         const moves = active.moves;
 
         // TODO: consider throwing error instead of rerolling?
-        const overridden = if (options.calc.overridden(player, .move_slot)) |val|
+        const overridden = if (options.calc.overridden(player, 0, .move_slot)) |val|
             if (val != mslot and Move.get(moves[val - 1].id).extra.sleep_talk) val else null
         else
             null;
@@ -3150,7 +3224,7 @@ pub const Rolls = struct {
         assert(n > 0 and n <= 6);
 
         // TODO: consider throwing error instead of rerolling?
-        const overridden = if (options.calc.overridden(player, .force_switch)) |val| val: {
+        const overridden = if (options.calc.overridden(player, 0, .force_switch)) |val| val: {
             for (slots) |slot| if (slot == val) break :val if (foe.get(slot).hp > 0) val else null;
             break :val null;
         } else null;
@@ -3176,7 +3250,7 @@ pub const Rolls = struct {
     const DISTRIBUTION = [_]u3{ 2, 2, 2, 3, 3, 3, 4, 5 };
 
     fn multiHit(battle: anytype, player: Player, options: anytype) !u3 {
-        const n: u3 = if (options.calc.overridden(player, .multi_hit)) |val|
+        const n: u3 = if (options.calc.overridden(player, 0, .multi_hit)) |val|
             @intCast(val)
         else if (showdown)
             DISTRIBUTION[battle.rng.range(u3, 0, DISTRIBUTION.len)]
@@ -3191,7 +3265,7 @@ pub const Rolls = struct {
     }
 
     fn psywave(battle: anytype, player: Player, max: u8, options: anytype) !u8 {
-        const power = if (options.calc.overridden(player, .psywave)) |val|
+        const power = if (options.calc.overridden(player, 0, .psywave)) |val|
             val
         else if (showdown)
             battle.rng.range(u8, 1, max)
@@ -3217,14 +3291,14 @@ pub const Rolls = struct {
         }
 
         // TODO: consider throwing error instead of rerolling?
-        const overridden = if (options.calc.overridden(player, .metronome)) |val| val: {
+        const overridden = if (options.calc.overridden(player, 0, .metronome)) |val| val: {
             for (moves) |m| if (m.id == val) break :val null;
             break :val val;
         } else null;
 
         const move: Move = overridden orelse move: {
             if (showdown) {
-                var r = battle.rng.range(u8, 0, @intCast(Move.METRONOME.len - n));
+                var r = battle.rng.range(u8, 0, @as(u8, @intCast(Move.METRONOME.len - n)));
                 for (moves) |m| {
                     if (m.id == .None) break;
                     if (@intFromEnum(m.id) > @intFromEnum(Move.METRONOME[r])) break;
@@ -3249,7 +3323,7 @@ pub const Rolls = struct {
     }
 
     fn sleepDuration(battle: anytype, player: Player, options: anytype) u3 {
-        const duration: u3 = if (options.calc.overridden(player, .duration)) |val|
+        const duration: u3 = if (options.calc.overridden(player, 0, .duration)) |val|
             @intCast(val)
         else if (showdown)
             battle.rng.range(u3, 1, 7)
@@ -3261,12 +3335,12 @@ pub const Rolls = struct {
         };
 
         assert(duration >= 1 and duration <= 6);
-        options.chance.duration(.sleep, player, player.foe(), duration);
+        options.chance.duration(player, duration);
         return duration + 1;
     }
 
     fn confusionDuration(battle: anytype, player: Player, self: bool, options: anytype) u3 {
-        const duration: u3 = if (options.calc.overridden(player, .duration)) |val|
+        const duration: u3 = if (options.calc.overridden(player, 0, .duration)) |val|
             @intCast(val)
         else if (showdown)
             // Pokémon Showdown incorrectly uses the same duration for self-confusion
@@ -3275,16 +3349,16 @@ pub const Rolls = struct {
             @intCast((battle.rng.next() & if (self) 1 else 3) + 2);
 
         assert(duration >= 2 and duration <= if (!showdown and self) 3 else 5);
-        options.chance.duration(.confusion, player, if (self) player else 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|
+        const duration: u3 = if (options.calc.overridden(player, 0, .duration)) |val|
             @intCast(val)
         else if (showdown)
             // Pokémon Showdown incorrectly inherits Generation III's Disable duration
-            battle.rng.range(u4, 2, 6)
+            battle.rng.range(u3, 2, 6)
         else duration: {
             while (true) {
                 const r = battle.rng.next() & 7;
@@ -3293,12 +3367,12 @@ pub const Rolls = struct {
         };
 
         assert(duration >= 2 and duration <= (if (showdown) 5 else 7));
-        options.chance.duration(.disable, player, 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|
+        const duration: u3 = if (options.calc.overridden(player, 0, .duration)) |val|
             @intCast(val)
         else if (showdown)
             battle.rng.range(u3, 2, 4)
@@ -3306,12 +3380,12 @@ pub const Rolls = struct {
             @intCast((battle.rng.next() & 1) + 2); // BUG: thrash is + 1 not +2
 
         assert(duration >= 2 and duration <= 3);
-        options.chance.duration(.attacking, player, player, duration);
+        options.chance.duration(player, duration);
         return duration;
     }
 
     fn bindingDuration(battle: anytype, player: Player, options: anytype) u3 {
-        const duration: u3 = (if (options.calc.overridden(player, .duration)) |val|
+        const duration: u3 = (if (options.calc.overridden(player, 0, .duration)) |val|
             @intCast(val)
         else if (showdown)
             // TODO: PS does range(3, 6) here which after subtracting 1 is actually 2-4 not 2-5!
@@ -3320,13 +3394,13 @@ pub const Rolls = struct {
             @intCast(battle.rng.next() & 3 + 2));
 
         assert(duration >= 2 and duration <= 5);
-        options.chance.duration(.binding, player, player.foe(), duration);
+        options.chance.duration(player, duration);
         return duration + 1;
     }
 
     // TODO: consider sharing implementation with bindingDuration
     fn encoreDuration(battle: anytype, player: Player, options: anytype) u3 {
-        const duration: u3 = (if (options.calc.overridden(player, .duration)) |val|
+        const duration: u3 = (if (options.calc.overridden(player, 0, .duration)) |val|
             @intCast(val)
         else if (showdown)
             battle.rng.range(u3, 2, 6)
@@ -3334,7 +3408,7 @@ pub const Rolls = struct {
             @intCast(battle.rng.next() & 3 + 2));
 
         assert(duration >= 2 and duration <= 5);
-        options.chance.duration(.encore, player, player.foe(), duration);
+        options.chance.duration(player, duration);
         return duration + 1;
     }
 };
@@ -3432,11 +3506,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) {
@@ -3447,7 +3521,7 @@ pub fn choices(battle: anytype, player: Player, request: Choice.Type, out: []Cho
         .Move => {
             const side = battle.side(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,
@@ -3466,11 +3540,11 @@ pub fn choices(battle: anytype, player: Player, request: Choice.Type, out: []Cho
                 return n;
             }
 
-            var slot: u4 = 2;
+            var slot: usize = 2;
             while (!active.volatiles.Trapped and 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;
             }
 
@@ -3503,7 +3577,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;
                     }
@@ -3517,7 +3591,7 @@ 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)