@pkmn/engine 0.1.0-dev.30c63015 → 0.1.0-dev.32adfe77

package/src/lib/gen2/mechanics.zig

@@ -26,15 +26,10 @@ const Result = common.Result;
 
 const Activate = protocol.Activate;
 const Boost = protocol.Boost;
-const Cant = protocol.Cant;
-const CureStatus = protocol.CureStatus;
 const Damage = protocol.Damage;
 const End = protocol.End;
-const EndItem = protocol.EndItem;
 const Fail = protocol.Fail;
 const Heal = protocol.Heal;
-const Immune = protocol.Immune;
-const SetHP = protocol.SetHP;
 const Start = protocol.Start;
 
 const Gen12 = rng.Gen12;
@@ -145,11 +140,11 @@ 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;
 
-    var p2_slot = findFirstAlive(p2);
+    const p2_slot = findFirstAlive(p2);
     assert(!showdown or p2_slot == 1);
     if (p2_slot == 0) return Result.Win;
 
@@ -265,7 +260,7 @@ fn switchIn(battle: anytype, player: Player, slot: u8, kind: SwitchIn, options:
 
     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, Damage.Spikes });
+        try options.log.damage(.{ battle.active(player), incoming, .Spikes });
     }
 }
 
@@ -408,7 +403,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;
 
@@ -438,7 +435,7 @@ fn beforeMove(battle: anytype, player: Player, move: Move, options: anytype) !bo
     if (volatiles.Recharging) {
         volatiles.Recharging = false;
         resetCant(volatiles);
-        try log.cant(.{ ident, Cant.Recharge });
+        try log.cant(.{ ident, .Recharge });
         return false;
     }
 
@@ -457,12 +454,12 @@ fn beforeMove(battle: anytype, player: Player, move: Move, options: anytype) !bo
         }
 
         if (duration == 0) {
-            try log.curestatus(.{ ident, before, CureStatus.Message });
+            try log.curestatus(.{ ident, before, .Message });
             stored.status = 0; // clears EXT if present
             resetCant(volatiles);
             volatiles.Nightmare = false;
         } else {
-            try log.cant(.{ ident, Cant.Sleep });
+            try log.cant(.{ ident, .Sleep });
             if (move == .Snore or move == .SleepTalk) break :slp;
             resetCant(volatiles);
             return false;
@@ -471,7 +468,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, Cant.Freeze });
+        try log.cant(.{ ident, .Freeze });
         return false;
     }
 
@@ -481,7 +478,7 @@ 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, Cant.Flinch });
+        try log.cant(.{ ident, .Flinch });
         return false;
     }
 
@@ -495,7 +492,7 @@ fn beforeMove(battle: anytype, player: Player, move: Move, options: anytype) !bo
 
         if (volatiles.disable.duration == 0) {
             volatiles.disable.move = 0;
-            try log.end(.{ ident, End.Disable });
+            try log.end(.{ ident, .Disable });
         }
     }
 
@@ -511,9 +508,9 @@ fn beforeMove(battle: anytype, player: Player, move: Move, options: anytype) !bo
 
         if (volatiles.confusion == 0) {
             volatiles.Confusion = false;
-            try log.end(.{ ident, End.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;
@@ -528,11 +525,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, Cant.Attract });
+            try log.cant(.{ ident, .Attract });
             return false;
         }
     }
@@ -543,14 +540,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.cant(.{ ident, Cant.Disable, 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, Cant.Paralysis });
+        try log.cant(.{ ident, .Paralysis });
         return false;
     }
 
@@ -570,7 +567,7 @@ 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();
@@ -953,26 +950,26 @@ 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 damage [of] but its not relevant
-        try options.log.damage(.{ ident, stored, Damage.LeechSeed });
+        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, Heal.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, Damage.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, Damage.Curse });
+        try options.log.damage(.{ ident, stored, .Curse });
         if (stored.hp == 0) return true;
     }
 
@@ -993,7 +990,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), End.FutureSight });
+                try options.log.end(.{ battle.active(player), .FutureSight });
                 // TODO doMove
             }
         }
@@ -1002,7 +999,6 @@ 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) {
@@ -1019,7 +1015,7 @@ fn betweenTurns(battle: anytype, mslot: u4, options: anytype) !?Result {
                         try options.log.damage(.{
                             battle.active(player),
                             side.stored(),
-                            Damage.Sandstorm,
+                            .Sandstorm,
                         });
                     }
                 }
@@ -1032,20 +1028,21 @@ 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), @as(End, @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),
+                    ident,
                     side.stored(),
                     @as(Damage, @enumFromInt(reason)),
                 });
@@ -1060,12 +1057,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;
@@ -1083,14 +1079,14 @@ fn betweenTurns(battle: anytype, mslot: u4, options: anytype) !?Result {
             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, Heal.Leftovers });
+                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
@@ -1105,8 +1101,7 @@ fn betweenTurns(battle: anytype, mslot: u4, options: anytype) !?Result {
             !side.active.volatiles.frozen and
             try Rolls.defrost(battle, player, options))
         {
-            const reason: CureStatus = .Message;
-            try options.log.curestatus(.{ battle.active(player), side.stored().status, reason });
+            try options.log.curestatus(.{ battle.active(player), side.stored().status, .Message });
             side.stored().status = 0;
         }
     }
@@ -1147,7 +1142,7 @@ 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, EndItem.Eat });
+                    try options.log.enditem(.{ ident, stored.item, .Eat });
                     stored.item = .None;
 
                     const offset = num - @intFromEnum(Item.Berry);
@@ -1164,7 +1159,7 @@ fn betweenTurns(battle: anytype, mslot: u4, options: anytype) !?Result {
 
                 if (proc) {
                     assert(Status.any(stored.status));
-                    try options.log.enditem(.{ ident, stored.item, EndItem.Eat });
+                    try options.log.enditem(.{ ident, stored.item, .Eat });
                     stored.item = .None;
 
                     // FIXME wtf?
@@ -1172,21 +1167,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, End.Confusion });
+                        try options.log.end(.{ ident, .Confusion });
                     }
                     stored.status = 0;
 
                     // FIXME recalc stats
 
-                    try options.log.curestatus(.{ ident, stored.status, CureStatus.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, EndItem.Eat });
+                    try options.log.enditem(.{ ident, stored.item, .Eat });
                     stored.item = .None;
 
                     side.active.volatiles.Confusion = false;
-                    try options.log.end(.{ ident, End.Confusion });
+                    try options.log.end(.{ ident, .Confusion });
                 }
             }
         }
@@ -1198,12 +1193,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), End.Encore });
+                try options.log.end(.{ battle.active(player), .Encore });
             }
         }
     }
@@ -1220,7 +1214,6 @@ 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) {
@@ -1256,7 +1249,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 });
         }
     }
 }
@@ -1279,7 +1272,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;
 }
@@ -1292,14 +1285,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()), Immune.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)});
         }
 
         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 {
@@ -1330,7 +1323,6 @@ 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 {
@@ -1338,10 +1330,10 @@ pub const Effects = struct {
             // }
             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, End.Bide });
+            try options.log.end(.{ ident, .Bide });
 
             state.damage = volatiles.bide *% 2;
             volatiles.bide = 0;
@@ -1378,7 +1370,7 @@ pub const Effects = struct {
                 try options.log.curestatus(.{
                     battle.active(player.foe()),
                     foe_stored.status,
-                    CureStatus.Message,
+                    .Message,
                 });
                 foe_stored.status = 0;
             }
@@ -1395,8 +1387,7 @@ pub const Effects = struct {
         foe_stored.status = Status.init(.BRN);
         foe.active.stats.atk = @max(foe.active.stats.atk / 2, 1);
 
-        const reason: protocol.Status = .None;
-        try options.log.status(.{ battle.active(player.foe()), foe_stored.status, reason });
+        try options.log.status(.{ battle.active(player.foe()), foe_stored.status, .None });
 
         // TODO: check for status berry
     }
@@ -1416,7 +1407,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), Fail.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;
@@ -1426,9 +1417,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), Fail.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), Fail.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;
@@ -1473,38 +1464,38 @@ pub const Effects = struct {
                 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, Fail.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(), Damage.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, Fail.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, Boost.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, Boost.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, Boost.Defense, @as(i8, 1) });
+                try options.log.boost(.{ ident, .Defense, @as(i8, 1) });
             }
         }
     }
@@ -1516,9 +1507,7 @@ 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));
-
-        const reason: CureStatus = .Message;
-        try options.log.curestatus(.{ battle.active(player), side.stored().status, reason });
+        try options.log.curestatus(.{ battle.active(player), side.stored().status, .Message });
         side.stored().status = 0;
     }
 
@@ -1532,14 +1521,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, Fail.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, Fail.None });
-        }
+        if (last == .None or last == .Struggle) return options.log.fail(.{ foe_ident, .None });
 
         var slot: u3 = 0;
         for (foe.active.moves) |m| {
@@ -1548,12 +1533,12 @@ 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, Fail.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 {
@@ -1579,7 +1564,7 @@ pub const Effects = struct {
         if (stored.hp == stored.stats.hp) return;
         stored.hp = @min(stored.stats.hp, stored.hp + @max(state.damage / 2, 1));
 
-        try options.log.heal(.{ ident, stored, Heal.Drain, 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 {
@@ -1591,7 +1576,7 @@ pub const Effects = struct {
         const failed = volatiles.Encore or
             (last == .None or last == .Struggle or
             last == .Encore or .last == .MirrorMove);
-        if (failed) return options.log.fail(.{ foe_ident, Fail.None });
+        if (failed) return options.log.fail(.{ foe_ident, .None });
 
         var slot: u3 = 0;
         for (foe.active.moves) |m| {
@@ -1600,7 +1585,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, Fail.None });
+        if (move.pp == 0) return options.log.fail(.{ foe_ident, .None });
 
         volatiles.Encore = true;
         volatiles.encore = Rolls.encoreDuration(battle, player, options);
@@ -1608,7 +1593,7 @@ 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 {
@@ -1662,12 +1647,11 @@ pub const Effects = struct {
         var side = battle.side(player);
 
         if (side.active.volatiles.FocusEnergy) {
-            if (!showdown) try options.log.fail(.{ battle.active(player), Fail.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 };
@@ -1677,7 +1661,7 @@ pub const Effects = struct {
 
         const foe = battle.foe(player);
 
-        if (state.first) return options.log.fail(.{ battle.active(player), Fail.None });
+        if (state.first) return options.log.fail(.{ battle.active(player), .None });
 
         var n: u4 = 0;
         var i: u4 = 0;
@@ -1691,7 +1675,7 @@ pub const Effects = struct {
             }
         }
 
-        if (n == 0) return options.log.fail(.{ battle.active(player), Fail.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);
@@ -1704,11 +1688,11 @@ pub const Effects = struct {
             try options.log.lastmiss(.{});
             return options.log.miss(.{battle.active(player)});
         } else if (foe.active.volatiles.Foresight) {
-            return options.log.fail(.{ battle.active(player), Fail.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 {
@@ -1731,7 +1715,7 @@ pub const Effects = struct {
         if (showdown) 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, protocol.Status.None });
+        try options.log.status(.{ foe_ident, foe_stored.status, .None });
 
         // TODO: check for status berry
 
@@ -1774,7 +1758,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, Fail.None });
+        if (stored.stats.hp == stored.hp) return options.log.fail(.{ ident, .None });
 
         const rest = state.move == .Rest;
         if (rest) {
@@ -1783,7 +1767,7 @@ pub const Effects = struct {
             side.active.volatiles.Toxic = false;
             stored.status = Status.slf(2);
             recomputeStats(battle, side);
-            try options.log.status(.{ ident, stored.status, protocol.Status.From, 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));
@@ -1821,7 +1805,7 @@ 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()), Immune.None });
+                return options.log.immune(.{ battle.active(player.foe()), .None });
             }
             try checkHit(battle, player, state, options);
             if (state.miss) {
@@ -1841,7 +1825,7 @@ pub const Effects = struct {
 
         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 {
@@ -1849,20 +1833,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, Fail.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];
     }
 
@@ -1870,11 +1854,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()), Fail.None });
+            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()), Fail.None });
+            return options.log.fail(.{ battle.active(player.foe()), .None });
         }
 
         foe.active.volatiles.Trapped = true;
@@ -1918,11 +1902,11 @@ pub const Effects = struct {
 
         const last = foe.lastMove(false);
 
-        if (last == .None) return options.log.fail(.{ battle.active(player), Fail.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), Fail.None });
+        if (knows) return options.log.fail(.{ battle.active(player), .None });
 
         // if (wPlayerCharging) ???
         // wPlayerCharging = 1
@@ -1936,19 +1920,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), Fail.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, Fail.None });
+        if (stored.hp == stored.stats.hp) return options.log.fail(.{ ident, .None });
 
         stored.hp = switch (battle.field.weather) {
             .Sun => stored.stats.hp,
@@ -1956,7 +1938,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 {
@@ -1969,17 +1951,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()), Fail.None });
+            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, Fail.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 {
@@ -2003,9 +1985,9 @@ pub const Effects = struct {
             const foe_ident = battle.active(player.foe());
 
             state.damage = 0;
-            if (state.immune()) return options.log.immune(.{ foe_ident, Immune.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, Immune.OHKO });
+            if (delta == 0) return options.log.immune(.{ foe_ident, .OHKO });
 
             state.accuracy = 2 * delta +| Gen12.percent(30);
             try checkHit(battle, player, state, options);
@@ -2021,17 +2003,17 @@ 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, Fail.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(), SetHP.Silent });
-        try options.log.sethp(.{ ident, side.stored(), SetHP.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 {
@@ -2039,21 +2021,21 @@ pub const Effects = struct {
         const foe_ident = battle.active(player.foe());
 
         if (Status.is(foe.stored().status, .PAR)) {
-            return options.log.fail(.{ foe_ident, Fail.Paralysis });
+            return options.log.fail(.{ foe_ident, .Paralysis });
         }
-        if (state.immune()) return options.log.immune(.{ foe_ident, Immune.None });
-        if (Status.any(foe.stored().status)) return options.log.fail(.{ foe_ident, Fail.None });
+        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)});
         } 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, protocol.Status.None });
+        try options.log.status(.{ foe_ident, foe.stored().status, .None });
     }
 
     pub fn paralyzeChance(battle: anytype, player: Player, state: *State, options: anytype) !void {
@@ -2069,8 +2051,7 @@ pub const Effects = struct {
         foe_stored.status = Status.init(.PAR);
         foe.active.stats.spe = @max(foe.active.stats.spe / 4, 1);
 
-        const reason: protocol.Status = .None;
-        try options.log.status(.{ battle.active(player.foe()), foe_stored.status, reason });
+        try options.log.status(.{ battle.active(player.foe()), foe_stored.status, .None });
 
         // TODO: check for status berry
     }
@@ -2086,15 +2067,15 @@ pub const Effects = struct {
         var foe = battle.foe(player);
 
         if (foe.active.volatiles.PerishSong) {
-            return options.log.fail(.{ battle.active(player.foe()), Fail.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
     }
@@ -2106,7 +2087,7 @@ pub const Effects = struct {
 
         const toxic = state.move == .Toxic;
         if (state.immune() or foe.active.types.includes(.Poison)) {
-            return options.log.immune(.{ foe_ident, Immune.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...
@@ -2120,7 +2101,7 @@ pub const Effects = struct {
             else
                 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)});
@@ -2133,7 +2114,7 @@ pub const Effects = struct {
             foe.active.volatiles.toxic = 0;
         }
 
-        try options.log.status(.{ foe_ident, foe_stored.status, protocol.Status.None });
+        try options.log.status(.{ foe_ident, foe_stored.status, .None });
 
         // TODO: check for status berry
     }
@@ -2149,8 +2130,8 @@ pub const Effects = struct {
         if (foe.conditions.Safeguard) return;
 
         foe_stored.status = Status.init(.PSN);
-        const reason: protocol.Status = .None;
-        try options.log.status(.{ battle.active(player.foe()), foe_stored.status, reason });
+
+        try options.log.status(.{ battle.active(player.foe()), foe_stored.status, .None });
 
         // TODO: check for status berry
     }
@@ -2165,9 +2146,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), Fail.None });
-        }
+        if (failed) return options.log.fail(.{ battle.active(player), .None });
 
         volatiles.protect = @max(8, volatiles.protect + 1);
         if (state.move == .Endure) {
@@ -2184,7 +2163,7 @@ 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), Fail.None });
+            return options.log.fail(.{ battle.active(player), .None });
         }
 
         side.active.boosts = foe.active.boosts;
@@ -2203,11 +2182,10 @@ pub const Effects = struct {
         }
 
         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 *|= (side.active.volatiles.rage +| 1);
         }
     };
 
@@ -2219,7 +2197,7 @@ pub const Effects = struct {
         var side = battle.side(player);
 
         if (side.active.volatiles.LeechSeed) {
-            try options.log.end(.{ battle.active(player), End.LeechSeedFrom });
+            try options.log.end(.{ battle.active(player), .LeechSeedFrom });
             side.active.volatiles.LeechSeed = false;
         }
 
@@ -2238,18 +2216,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.damage(.{
-            battle.active(player),
-            stored,
-            Damage.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 {
@@ -2312,7 +2286,7 @@ pub const Effects = struct {
 
     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), Fail.None });
+        return options.log.fail(.{ battle.active(player), .None });
     }
 
     pub fn safeguard(battle: anytype, player: Player, _: *State, options: anytype) !void {
@@ -2337,7 +2311,7 @@ pub const Effects = struct {
         var side = battle.side(player);
 
         if (@field(side.conditions, key)) {
-            return options.log.fail(.{ battle.active(player), Fail.None });
+            return options.log.fail(.{ battle.active(player), .None });
         }
 
         @field(side.conditions, key) = true;
@@ -2353,9 +2327,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), Fail.None });
+            try options.log.fail(.{ battle.active(player), .None });
         }
     }
 
@@ -2372,7 +2346,7 @@ pub const Effects = struct {
         }
 
         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
@@ -2383,22 +2357,21 @@ pub const Effects = struct {
         }
 
         foe_stored.status = Status.slp(Rolls.sleepDuration(battle, player, options));
-        try options.log.status(.{ foe_ident, foe_stored.status, protocol.Status.From, 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), Fail.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), Fail.None });
+        if (n == 0) return options.log.fail(.{ battle.active(player), .None });
 
         _ = try Rolls.sleepTalk(battle, player, n, state.mslot, options); // TODO
     }
@@ -2407,13 +2380,13 @@ 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), Fail.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), Fail.None });
+        if (foe.conditions.Spikes) return options.log.fail(.{ battle.active(player), .None });
 
         foe.conditions.Spikes = true;
         try options.log.sidestart(.{ player.foe(), protocol.Side.Spikes });
@@ -2423,7 +2396,7 @@ pub const Effects = struct {
         _ = .{ battle, player, state, options }; // TODO
         // var foe = battle.foe(player);
 
-        // if (state.miss) return options.log.fail(.{ battle.active(player), Fail.None });
+        // if (state.miss) return options.log.fail(.{ battle.active(player), .None });
 
         // const last = foe.lastMove(false);
         // if (showdown) {
@@ -2434,28 +2407,28 @@ pub const Effects = struct {
     }
 
     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), Fail.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), Fail.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(), Damage.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 {
@@ -2471,7 +2444,7 @@ pub const Effects = struct {
     pub fn teleport(battle: anytype, player: Player, _: *State, options: anytype) !void {
         if (showdown) return;
 
-        try options.log.fail(.{ battle.active(player), Fail.None });
+        try options.log.fail(.{ battle.active(player), .None });
         try options.log.laststill(.{});
     }
 
@@ -2513,9 +2486,9 @@ pub const Effects = struct {
         side.active.volatiles.dirty = false;
 
         if (foe.active.volatiles.Transform) {
-            return options.log.fail(.{ battle.active(player), Fail.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), Fail.None });
+            if (!showdown) return options.log.fail(.{ battle.active(player), .None });
             try options.log.lastmiss(.{});
             return options.log.miss(.{battle.active(player)});
         }
@@ -2564,8 +2537,8 @@ 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| {
@@ -2584,9 +2557,9 @@ pub const Effects = struct {
         var side = battle.side(player);
         const ident = battle.active(player);
 
-        if (state.miss) return log.fail(.{ ident, Fail.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);
@@ -2594,7 +2567,7 @@ pub const Effects = struct {
             .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, Fail.None });
+                    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);
@@ -2604,41 +2577,41 @@ pub const Effects = struct {
             .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, Fail.None });
+                    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, Boost.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, Fail.None });
+                    return log.fail(.{ ident, .None });
                 }
                 try boostStat(battle, side, stats, boosts, "spe", 2);
-                try log.boost(.{ ident, Boost.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, Fail.None });
+                    return log.fail(.{ ident, .None });
                 }
                 try boostStat(battle, side, stats, boosts, "spa", 1);
-                try log.boost(.{ ident, Boost.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, Fail.None });
+                    return log.fail(.{ ident, .None });
                 }
                 try boostStat(battle, side, stats, boosts, "spd", 2);
-                try log.boost(.{ ident, Boost.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, Fail.None });
+                if (boosts.evasion == 6) return log.fail(.{ ident, .None });
                 boosts.evasion = @intCast(@min(6, @as(i8, boosts.evasion) + 1));
-                try log.boost(.{ ident, Boost.Evasion, 1 });
+                try log.boost(.{ ident, .Evasion, 1 });
                 if (state.move == .Minimize) side.active.volatiles.minimized = true;
             },
             else => unreachable,
@@ -2651,13 +2624,13 @@ 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, Fail.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);
@@ -2675,7 +2648,7 @@ pub const Effects = struct {
                 }
                 const n: u2 = if (move.effect == .AttackDown2) 2 else 1;
                 try unboostStat(battle, foe, stats, boosts, "atk", n);
-                try log.boost(.{ foe_ident, Boost.Attack, -@as(i8, n) });
+                try log.boost(.{ foe_ident, .Attack, -@as(i8, n) });
             },
             .DefenseDown1, .DefenseDown2, .DefenseDownChance => {
                 assert(boosts.def >= -6 and boosts.def <= 6);
@@ -2691,7 +2664,7 @@ pub const Effects = struct {
                 }
                 const n: u2 = if (move.effect == .DefenseDown2) 2 else 1;
                 try unboostStat(battle, foe, stats, boosts, "def", n);
-                try log.boost(.{ foe_ident, Boost.Defense, -@as(i8, n) });
+                try log.boost(.{ foe_ident, .Defense, -@as(i8, n) });
             },
             .SpeedDown1, .SpeedDown2, .SpeedDownChance => {
                 assert(boosts.spe >= -6 and boosts.spe <= 6);
@@ -2705,7 +2678,7 @@ pub const Effects = struct {
                 }
                 const n: u2 = if (move.effect == .SpeedDown2) 2 else 1;
                 try unboostStat(battle, foe, stats, boosts, "spe", n);
-                try log.boost(.{ foe_ident, Boost.Speed, -@as(i8, n) });
+                try log.boost(.{ foe_ident, .Speed, -@as(i8, n) });
             },
             .SpDefDownChance => {
                 assert(boosts.spd >= -6 and boosts.spd <= 6);
@@ -2715,7 +2688,7 @@ pub const Effects = struct {
                     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, Boost.SpecialDefense, -1 });
+                try log.boost(.{ foe_ident, .SpecialDefense, -1 });
             },
             .AccuracyDown1, .AccuracyDownChance => {
                 assert(boosts.accuracy >= -6 and boosts.accuracy <= 6);
@@ -2727,7 +2700,7 @@ pub const Effects = struct {
                     return options.log.miss(.{battle.active(player)});
                 }
                 boosts.accuracy = @intCast(@max(-6, @as(i8, boosts.accuracy) - 1));
-                try log.boost(.{ foe_ident, Boost.Accuracy, -1 });
+                try log.boost(.{ foe_ident, .Accuracy, -1 });
             },
             else => unreachable,
         }
@@ -2741,9 +2714,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));
     }
@@ -2766,7 +2739,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")) {
@@ -2789,7 +2762,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")) {
@@ -3490,7 +3463,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,