@pkmn/engine 0.1.0-dev.dd5b9081 → 0.1.0-dev.e0e37c1b

package/src/lib/common/protocol.zig

@@ -1,6 +1,8 @@
 const std = @import("std");
 const builtin = @import("builtin");
 
+const pkmn = @import("../pkmn.zig");
+
 const data = @import("./data.zig");
 const options = @import("./options.zig");
 
@@ -102,6 +104,7 @@ pub const ArgType = enum(u8) {
     // Gen 8
     CanDynamax,
     SwapSideConditions,
+    UpdatePoke,
 
     // Gen 9
     Terastallize,
@@ -121,12 +124,19 @@ pub const Cant = enum(u8) {
     Disable,
     Recharge,
     PP,
+
+    Attract,
 };
 
 pub const Heal = enum(u8) {
     None,
     Silent,
     Drain,
+
+    Leftovers,
+    Berry,
+    BerryJuice,
+    GoldBerry,
 };
 
 pub const Damage = enum(u8) {
@@ -137,7 +147,16 @@ pub const Damage = enum(u8) {
     LeechSeed,
     RecoilOf,
 
+    Bind,
+    Wrap,
+    FireSpin,
+    Clamp,
+    Whirlpool,
     Spikes,
+
+    Nightmare,
+    Curse,
+    Sandstorm,
 };
 
 pub const Status = enum(u8) {
@@ -180,8 +199,25 @@ pub const Activate = enum(u8) {
     Haze,
     Mist,
     Struggle,
-    Substitute,
+    Substitute, // FIXME SubstituteDamage
     Splash,
+
+    Rage, // TODO
+
+    Attract,
+    LockOn,
+    Bind,
+    Wrap,
+    FireSpin,
+    Clamp,
+    Whirlpool,
+    SubstituteBlock,
+
+    DestinyBond,
+
+    BeatUp, // FIXME of
+
+    Magnitude,
 };
 
 pub const Start = enum(u8) {
@@ -199,6 +235,19 @@ pub const Start = enum(u8) {
 
     Disable,
     Mimic,
+
+    Attract,
+    Nightmare,
+    Curse,
+    Foresight,
+    Encore,
+    FutureSight,
+
+    PerishSong0,
+    PerishSong1,
+    PerishSong2,
+    PerishSong3,
+    PerishSong3Silent,
 };
 
 pub const End = enum(u8) {
@@ -207,16 +256,30 @@ pub const End = enum(u8) {
     Bide,
     Substitute,
 
-    // Silent
+    Nightmare,
+    Curse,
+    Foresight,
+    Encore,
+    FutureSight,
+    LeechSeed,
+
+    Bind,
+    Wrap,
+    FireSpin,
+    Clamp,
+    Whirlpool,
+
     DisableSilent,
     ConfusionSilent,
-
-    Mist,
-    FocusEnergy,
-    LeechSeed,
-    Toxic,
-    LightScreen,
-    Reflect,
+    MistSilent,
+    FocusEnergySilent,
+    LeechSeedSilent,
+    ToxicSilent,
+    LightScreenSilent,
+    ReflectSilent,
+    BideSilent,
+
+    LeechSeedFrom,
 };
 
 pub const Immune = enum(u8) {
@@ -224,6 +287,28 @@ pub const Immune = enum(u8) {
     OHKO,
 };
 
+pub const EndItem = enum(u8) {
+    None,
+    Eat,
+};
+
+pub const SetHP = enum(u8) {
+    None,
+    Silent,
+};
+
+pub const Side = enum(u8) {
+    Safeguard,
+    Reflect,
+    LightScreen,
+    Spikes,
+};
+
+pub const Weather = enum(u8) {
+    None,
+    Upkeep,
+};
+
 /// Null object pattern implementation of `Log` backed by a `std.io.null_writer`.
 /// Ignores anything sent to it, though protocol logging should additionally be turned off
 /// entirely with `options.log`.
@@ -238,370 +323,484 @@ pub fn Log(comptime Writer: type) type {
 
         pub const Error = Writer.Error;
 
-        pub fn move(self: Self, source: ID, m: anytype, target: ID, from: anytype) Error!void {
+        // source: ID, move: <Move>, target: ID, from?: <Move>
+        pub fn move(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
-            assert(m != .None);
+            assert(args[1] != .None);
             try self.writer.writeAll(&.{
                 @intFromEnum(ArgType.Move),
-                @as(u8, @bitCast(source)),
-                @intFromEnum(m),
-                @as(u8, @bitCast(target)),
-            });
-            const none = &[_]u8{@intFromEnum(Move.None)};
-            try self.writer.writeAll(switch (@typeInfo(@TypeOf(from))) {
-                .Null => none,
-                .Optional => if (from) |f| blk: {
-                    assert(@intFromEnum(f) != 0);
-                    break :blk &[_]u8{ @intFromEnum(Move.From), @intFromEnum(f) };
-                } else none,
-                else => blk: {
-                    assert(@intFromEnum(from) != 0);
-                    break :blk &[_]u8{ @intFromEnum(Move.From), @intFromEnum(from) };
-                },
+                @as(u8, @bitCast(args[0])),
+                @intFromEnum(args[1]),
+                @as(u8, @bitCast(args[2])),
             });
+            try self.writer.writeAll(if (args.len < 4 or @intFromEnum(args[3]) == 0)
+                &.{@intFromEnum(Move.None)}
+            else
+                &.{ @intFromEnum(Move.From), @intFromEnum(args[3]) });
+        }
+
+        // ident: ID, pokemon: <Pokemon>
+        pub fn switched(self: Self, args: anytype) Error!void {
+            return switchDrag(self, .Switch, args);
         }
 
-        pub fn switched(self: Self, ident: ID, pokemon: anytype) Error!void {
+        // ident: ID, pokemon: <Pokemon>
+        fn switchDrag(self: Self, arg: ArgType, args: anytype) Error!void {
             if (!enabled) return;
 
-            try self.writer.writeAll(&.{ @intFromEnum(ArgType.Switch), @as(u8, @bitCast(ident)) });
-            if (@hasField(@TypeOf(pokemon.*), "dvs")) {
+            try self.writer.writeAll(&.{ @intFromEnum(arg), @as(u8, @bitCast(args[0])) });
+            if (@hasField(@TypeOf(args[1].*), "dvs")) {
                 try self.writer.writeAll(&.{
-                    @intFromEnum(pokemon.species),
-                    @intFromEnum(pokemon.dvs.gender),
-                    pokemon.level,
+                    @intFromEnum(args[1].species),
+                    @intFromEnum(args[1].dvs.gender),
+                    args[1].level,
                 });
             } else {
-                try self.writer.writeAll(&.{ @intFromEnum(pokemon.species), pokemon.level });
+                try self.writer.writeAll(&.{ @intFromEnum(args[1].species), args[1].level });
             }
-            try self.writer.writeIntNative(u16, pokemon.hp);
-            try self.writer.writeIntNative(u16, pokemon.stats.hp);
-            try self.writer.writeAll(&.{pokemon.status});
-        }
-
-        pub fn cant(self: Self, ident: ID, reason: Cant) Error!void {
-            if (!enabled) return;
-
-            assert(reason != .Disable);
-            try self.writer.writeAll(&.{
-                @intFromEnum(ArgType.Cant),
-                @as(u8, @bitCast(ident)),
-                @intFromEnum(reason),
-            });
+            try self.writer.writeIntNative(u16, args[1].hp);
+            try self.writer.writeIntNative(u16, args[1].stats.hp);
+            try self.writer.writeAll(&.{args[1].status});
         }
 
-        pub fn disabled(self: Self, ident: ID, m: anytype) Error!void {
+        // ident: ID, reason: Cant
+        // ident: ID, reason: .Disable, move: <Move>
+        pub fn cant(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
+            assert(args[1] != .Disable or args.len == 3);
             try self.writer.writeAll(&.{
                 @intFromEnum(ArgType.Cant),
-                @as(u8, @bitCast(ident)),
-                @intFromEnum(Cant.Disable),
-                @intFromEnum(m),
+                @as(u8, @bitCast(args[0])),
+                @intFromEnum(@as(Cant, args[1])),
             });
+            if (args.len == 3) try self.writer.writeByte(@intFromEnum(args[2]));
         }
 
-        pub fn faint(self: Self, ident: ID, done: bool) Error!void {
+        // ident: ID, done: bool
+        pub fn faint(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
-            try self.writer.writeAll(&.{ @intFromEnum(ArgType.Faint), @as(u8, @bitCast(ident)) });
-            if (done) try self.writer.writeByte(@intFromEnum(ArgType.None));
+            try self.writer.writeAll(&.{ @intFromEnum(ArgType.Faint), @as(u8, @bitCast(args[0])) });
+            if (args[1]) try self.writer.writeByte(@intFromEnum(ArgType.None));
         }
 
-        pub fn turn(self: Self, num: u16) Error!void {
+        // num: u16
+        pub fn turn(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
             try self.writer.writeByte(@intFromEnum(ArgType.Turn));
-            try self.writer.writeIntNative(u16, num);
+            try self.writer.writeIntNative(u16, args[0]);
             try self.writer.writeByte(@intFromEnum(ArgType.None));
         }
 
-        pub fn win(self: Self, player: Player) Error!void {
+        // player: Player
+        pub fn win(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
             try self.writer.writeAll(&.{
                 @intFromEnum(ArgType.Win),
-                @intFromEnum(player),
+                @intFromEnum(@as(Player, args[0])),
                 @intFromEnum(ArgType.None),
             });
         }
 
-        pub fn tie(self: Self) Error!void {
+        // -
+        pub fn tie(self: Self, _: anytype) Error!void {
             if (!enabled) return;
 
             try self.writer.writeAll(&.{ @intFromEnum(ArgType.Tie), @intFromEnum(ArgType.None) });
         }
 
-        pub fn damage(self: Self, ident: ID, pokemon: anytype, reason: Damage) Error!void {
+        // ident: ID, pokemon: <Pokemon>, reason: Damage
+        // ident: ID, pokemon: <Pokemon>, reason: .RecoilOf, source: ID
+        pub fn damage(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
-            assert(@intFromEnum(reason) <= @intFromEnum(Damage.LeechSeed));
-            try self.writer.writeAll(&.{ @intFromEnum(ArgType.Damage), @as(u8, @bitCast(ident)) });
-            try self.writer.writeIntNative(u16, pokemon.hp);
-            try self.writer.writeIntNative(u16, pokemon.stats.hp);
-            try self.writer.writeAll(&.{ pokemon.status, @intFromEnum(reason) });
+            assert(args[2] != .RecoilOf or args.len == 4);
+            try self.writer.writeAll(&.{
+                @intFromEnum(ArgType.Damage),
+                @as(u8, @bitCast(args[0])),
+            });
+            try self.writer.writeIntNative(u16, args[1].hp);
+            try self.writer.writeIntNative(u16, args[1].stats.hp);
+            try self.writer.writeAll(&.{ args[1].status, @intFromEnum(@as(Damage, args[2])) });
+            if (args.len == 4) try self.writer.writeByte(@as(u8, @bitCast(args[3])));
         }
 
-        pub fn damageOf(
-            self: Self,
-            ident: ID,
-            pokemon: anytype,
-            reason: Damage,
-            source: ID,
-        ) Error!void {
+        // ident: ID, pokemon: <Pokemon>, reason: Heal
+        // ident: ID, pokemon: <Pokemon>, reason: .Drain, target: ID
+        pub fn heal(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
-            assert(@intFromEnum(reason) == @intFromEnum(Damage.RecoilOf));
-            try self.writer.writeAll(&.{ @intFromEnum(ArgType.Damage), @as(u8, @bitCast(ident)) });
-            try self.writer.writeIntNative(u16, pokemon.hp);
-            try self.writer.writeIntNative(u16, pokemon.stats.hp);
-            try self.writer.writeAll(&.{
-                pokemon.status,
-                @intFromEnum(reason),
-                @as(u8, @bitCast(source)),
-            });
+            assert(args[2] != .Drain or args.len == 4);
+            try self.writer.writeAll(&.{ @intFromEnum(ArgType.Heal), @as(u8, @bitCast(args[0])) });
+            try self.writer.writeIntNative(u16, args[1].hp);
+            try self.writer.writeIntNative(u16, args[1].stats.hp);
+            try self.writer.writeAll(&.{ args[1].status, @intFromEnum(@as(Heal, args[2])) });
+            if (args.len == 4) try self.writer.writeByte(@as(u8, @bitCast(args[3])));
         }
 
-        pub fn heal(self: Self, ident: ID, pokemon: anytype, reason: Heal) Error!void {
+        // ident: ID, value: u8, reason: Status
+        // ident: ID, value: u8, reason: .From, m: <Move>
+        pub fn status(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
-            assert(reason != .Drain);
-            try self.writer.writeAll(&.{ @intFromEnum(ArgType.Heal), @as(u8, @bitCast(ident)) });
-            try self.writer.writeIntNative(u16, pokemon.hp);
-            try self.writer.writeIntNative(u16, pokemon.stats.hp);
-            try self.writer.writeAll(&.{ pokemon.status, @intFromEnum(reason) });
+            assert(args[2] != .From or args.len == 4);
+            try self.writer.writeAll(&.{
+                @intFromEnum(ArgType.Status),
+                @as(u8, @bitCast(args[0])),
+                args[1],
+                @intFromEnum(@as(Status, args[2])),
+            });
+            if (args.len == 4) try self.writer.writeByte(@intFromEnum(args[3]));
         }
 
-        pub fn drain(self: Self, source: ID, pokemon: anytype, target: ID) Error!void {
+        // ident: ID, value: u8, reason: CureStatus
+        pub fn curestatus(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
-            try self.writer.writeAll(&.{ @intFromEnum(ArgType.Heal), @as(u8, @bitCast(source)) });
-            try self.writer.writeIntNative(u16, pokemon.hp);
-            try self.writer.writeIntNative(u16, pokemon.stats.hp);
             try self.writer.writeAll(&.{
-                pokemon.status,
-                @intFromEnum(Heal.Drain),
-                @as(u8, @bitCast(target)),
+                @intFromEnum(ArgType.CureStatus),
+                @as(u8, @bitCast(args[0])),
+                args[1],
+                @intFromEnum(@as(CureStatus, args[2])),
             });
         }
 
-        pub fn status(self: Self, ident: ID, value: u8, reason: Status) Error!void {
+        // ident: ID, reason: Boost, num: i8
+        pub fn boost(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
-            assert(reason != .From);
+            assert(args[2] != 0 and (args[1] != .Rage or args[2] > 0));
             try self.writer.writeAll(&.{
-                @intFromEnum(ArgType.Status),
-                @as(u8, @bitCast(ident)),
-                value,
-                @intFromEnum(reason),
+                @intFromEnum(ArgType.Boost),
+                @as(u8, @bitCast(args[0])),
+                @intFromEnum(@as(Boost, args[1])),
+                @as(u8, @intCast(@as(i8, args[2]) + 6)),
             });
         }
 
-        pub fn statusFrom(self: Self, ident: ID, value: u8, m: anytype) Error!void {
+        // -
+        pub fn clearallboost(self: Self, _: anytype) Error!void {
+            if (!enabled) return;
+
+            try self.writer.writeAll(&.{@intFromEnum(ArgType.ClearAllBoost)});
+        }
+
+        // ident: ID, reason: Fail
+        pub fn fail(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
             try self.writer.writeAll(&.{
-                @intFromEnum(ArgType.Status),
-                @as(u8, @bitCast(ident)),
-                value,
-                @intFromEnum(Status.From),
-                @intFromEnum(m),
+                @intFromEnum(ArgType.Fail),
+                @as(u8, @bitCast(args[0])),
+                @intFromEnum(@as(Fail, args[1])),
             });
         }
 
-        pub fn curestatus(self: Self, ident: ID, value: u8, reason: CureStatus) Error!void {
+        // source: ID
+        pub fn miss(self: Self, args: anytype) Error!void {
+            if (!enabled) return;
+
+            try self.writer.writeAll(&.{ @intFromEnum(ArgType.Miss), @as(u8, @bitCast(args[0])) });
+        }
+
+        // ident: ID, num: u8
+        pub fn hitcount(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
             try self.writer.writeAll(&.{
-                @intFromEnum(ArgType.CureStatus),
-                @as(u8, @bitCast(ident)),
-                value,
-                @intFromEnum(reason),
+                @intFromEnum(ArgType.HitCount),
+                @as(u8, @bitCast(args[0])),
+                args[1],
             });
         }
 
-        pub fn boost(self: Self, ident: ID, reason: Boost, num: i8) Error!void {
+        // source: ID, m: <Move>
+        pub fn prepare(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
-            assert(num != 0 and (reason != .Rage or num > 0));
             try self.writer.writeAll(&.{
-                @intFromEnum(ArgType.Boost),
-                @as(u8, @bitCast(ident)),
-                @intFromEnum(reason),
-                @as(u8, @intCast(num + 6)),
+                @intFromEnum(ArgType.Prepare),
+                @as(u8, @bitCast(args[0])),
+                @intFromEnum(args[1]),
             });
         }
 
-        pub fn clearallboost(self: Self) Error!void {
+        // ident: ID
+        pub fn mustrecharge(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
-            try self.writer.writeAll(&.{@intFromEnum(ArgType.ClearAllBoost)});
+            try self.writer.writeAll(&.{
+                @intFromEnum(ArgType.MustRecharge),
+                @as(u8, @bitCast(args[0])),
+            });
         }
 
-        pub fn fail(self: Self, ident: ID, reason: Fail) Error!void {
+        // ident: ID, reason: Activate
+        // ident: ID, reason: .SubstituteBlock, m: <Move>
+        // ident: ID, reason: .Magnitude, num: u8
+        pub fn activate(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
+            assert(args.len <= 4);
+            const reason: Activate = args[1];
             try self.writer.writeAll(&.{
-                @intFromEnum(ArgType.Fail),
-                @as(u8, @bitCast(ident)),
+                @intFromEnum(ArgType.Activate),
+                @as(u8, @bitCast(args[0])),
                 @intFromEnum(reason),
             });
+            if (args.len == 3) {
+                if (reason == .SubstituteBlock) {
+                    try self.writer.writeByte(@intFromEnum(args[2]));
+                } else {
+                    assert(reason == .Magnitude);
+                    try self.writer.writeByte(args[2]);
+                }
+            }
         }
 
-        pub fn miss(self: Self, source: ID) Error!void {
+        // -
+        pub fn fieldactivate(self: Self, _: anytype) Error!void {
             if (!enabled) return;
 
-            try self.writer.writeAll(&.{ @intFromEnum(ArgType.Miss), @as(u8, @bitCast(source)) });
+            try self.writer.writeAll(&.{@intFromEnum(ArgType.FieldActivate)});
         }
 
-        pub fn hitcount(self: Self, ident: ID, num: u8) Error!void {
+        // ident: ID, reason: Start
+        // ident: ID, reason: .Disable | .Mimic | .Encore, m: <Move>
+        // ident: ID, reason: .TypeChange, types: <Types>, target: ID
+        pub fn start(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
+            assert(args.len <= 4);
+            const reason: Start = args[1];
             try self.writer.writeAll(&.{
-                @intFromEnum(ArgType.HitCount),
-                @as(u8, @bitCast(ident)),
-                num,
+                @intFromEnum(ArgType.Start),
+                @as(u8, @bitCast(args[0])),
+                @intFromEnum(reason),
             });
+            if (args.len == 3) {
+                assert(reason == .Disable or reason == .Mimic or reason == .Encore);
+                try self.writer.writeByte(@intFromEnum(args[2]));
+            } else if (args.len == 4) {
+                assert(reason == .TypeChange);
+                // FIXME: u16 types in Generation II
+                try self.writer.writeAll(&.{
+                    @as(u8, @bitCast(args[2])),
+                    @as(u8, @bitCast(args[3])),
+                });
+            }
         }
 
-        pub fn prepare(self: Self, source: ID, m: anytype) Error!void {
+        // ident: ID, reason: End
+        pub fn end(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
             try self.writer.writeAll(&.{
-                @intFromEnum(ArgType.Prepare),
-                @as(u8, @bitCast(source)),
-                @intFromEnum(m),
+                @intFromEnum(ArgType.End),
+                @as(u8, @bitCast(args[0])),
+                @intFromEnum(@as(End, args[1])),
             });
         }
 
-        pub fn mustrecharge(self: Self, ident: ID) Error!void {
+        // -
+        pub fn ohko(self: Self, _: anytype) Error!void {
+            if (!enabled) return;
+
+            try self.writer.writeAll(&.{@intFromEnum(ArgType.OHKO)});
+        }
+
+        // ident: ID
+        pub fn crit(self: Self, args: anytype) Error!void {
+            if (!enabled) return;
+
+            try self.writer.writeAll(&.{ @intFromEnum(ArgType.Crit), @as(u8, @bitCast(args[0])) });
+        }
+
+        // ident: ID
+        pub fn supereffective(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
             try self.writer.writeAll(&.{
-                @intFromEnum(ArgType.MustRecharge),
-                @as(u8, @bitCast(ident)),
+                @intFromEnum(ArgType.SuperEffective),
+                @as(u8, @bitCast(args[0])),
             });
         }
 
-        pub fn activate(self: Self, ident: ID, reason: Activate) Error!void {
+        // ident: ID
+        pub fn resisted(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
             try self.writer.writeAll(&.{
-                @intFromEnum(ArgType.Activate),
-                @as(u8, @bitCast(ident)),
-                @intFromEnum(reason),
+                @intFromEnum(ArgType.Resisted),
+                @as(u8, @bitCast(args[0])),
             });
         }
 
-        pub fn fieldactivate(self: Self) Error!void {
+        // ident: ID, reason: Immune
+        pub fn immune(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
-            try self.writer.writeAll(&.{@intFromEnum(ArgType.FieldActivate)});
+            try self.writer.writeAll(&.{
+                @intFromEnum(ArgType.Immune),
+                @as(u8, @bitCast(args[0])),
+                @intFromEnum(@as(Immune, args[1])),
+            });
         }
 
-        pub fn start(self: Self, ident: ID, reason: Start) Error!void {
+        // source: ID, target: ID
+        pub fn transform(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
-            assert(@intFromEnum(reason) < @intFromEnum(Start.TypeChange));
             try self.writer.writeAll(&.{
-                @intFromEnum(ArgType.Start),
-                @as(u8, @bitCast(ident)),
-                @intFromEnum(reason),
+                @intFromEnum(ArgType.Transform),
+                @as(u8, @bitCast(args[0])),
+                @as(u8, @bitCast(args[1])),
             });
         }
 
-        pub fn typechange(self: Self, source: ID, types: anytype, target: ID) Error!void {
+        // ident: ID, pokemon: <Pokemon>
+        pub fn drag(self: Self, args: anytype) Error!void {
+            return switchDrag(self, .Drag, args);
+        }
+
+        // target: ID, item: <Item>, source: ID
+        pub fn item(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
             try self.writer.writeAll(&.{
-                @intFromEnum(ArgType.Start),
-                @as(u8, @bitCast(source)),
-                @intFromEnum(Start.TypeChange),
-                @as(u8, @bitCast(types)),
-                @as(u8, @bitCast(target)),
+                @intFromEnum(ArgType.Item),
+                @as(u8, @bitCast(args[0])),
+                @intFromEnum(args[1]),
+                @as(u8, @bitCast(args[2])),
             });
         }
 
-        pub fn startEffect(self: Self, ident: ID, reason: Start, m: anytype) Error!void {
+        // ident: ID, item: <Item>, reason: EndItem
+        pub fn enditem(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
-            assert(@intFromEnum(reason) > @intFromEnum(Start.TypeChange));
             try self.writer.writeAll(&.{
-                @intFromEnum(ArgType.Start),
-                @as(u8, @bitCast(ident)),
-                @intFromEnum(reason),
-                @intFromEnum(m),
+                @intFromEnum(ArgType.EndItem),
+                @as(u8, @bitCast(args[0])),
+                @intFromEnum(args[1]),
+                @intFromEnum(@as(EndItem, args[2])),
             });
         }
 
-        pub fn end(self: Self, ident: ID, reason: End) Error!void {
+        // source: ID
+        pub fn cureteam(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
             try self.writer.writeAll(&.{
-                @intFromEnum(ArgType.End),
-                @as(u8, @bitCast(ident)),
-                @intFromEnum(reason),
+                @intFromEnum(ArgType.CureTeam),
+                @as(u8, @bitCast(args[0])),
             });
         }
 
-        pub fn ohko(self: Self) Error!void {
+        // ident: ID, pokemon: <Pokemon>, reason: SetHP
+        pub fn sethp(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
-            try self.writer.writeAll(&.{@intFromEnum(ArgType.OHKO)});
+            try self.writer.writeAll(&.{ @intFromEnum(ArgType.SetHP), @as(u8, @bitCast(args[0])) });
+            try self.writer.writeIntNative(u16, args[1].hp);
+            try self.writer.writeIntNative(u16, args[1].stats.hp);
+            try self.writer.writeAll(&.{args[1].status});
+            try self.writer.writeByte(@intFromEnum(@as(SetHP, args[2])));
         }
 
-        pub fn crit(self: Self, ident: ID) Error!void {
+        // ident: ID, num: i8
+        pub fn setboost(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
-            try self.writer.writeAll(&.{ @intFromEnum(ArgType.Crit), @as(u8, @bitCast(ident)) });
+            try self.writer.writeAll(&.{
+                @intFromEnum(ArgType.SetBoost),
+                @as(u8, @bitCast(args[0])),
+                @as(u8, @intCast(args[1] + 6)),
+            });
         }
 
-        pub fn supereffective(self: Self, ident: ID) Error!void {
+        // source: ID, target: ID
+        pub fn copyboost(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
             try self.writer.writeAll(&.{
-                @intFromEnum(ArgType.SuperEffective),
-                @as(u8, @bitCast(ident)),
+                @intFromEnum(ArgType.CopyBoost),
+                @as(u8, @bitCast(args[0])),
+                @as(u8, @bitCast(args[1])),
             });
         }
 
-        pub fn resisted(self: Self, ident: ID) Error!void {
+        // player: Player, reason: Side
+        pub fn sidestart(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
             try self.writer.writeAll(&.{
-                @intFromEnum(ArgType.Resisted),
-                @as(u8, @bitCast(ident)),
+                @intFromEnum(ArgType.SideStart),
+                @intFromEnum(@as(Player, args[0])),
+                @intFromEnum(@as(Side, args[1])),
             });
         }
 
-        pub fn immune(self: Self, ident: ID, reason: Immune) Error!void {
+        // player: Player, reason: Side
+        // player: Player, reason: .Spikes, source: ID
+        pub fn sideend(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
+            assert(args[1] != .Spikes or args.len == 3);
             try self.writer.writeAll(&.{
-                @intFromEnum(ArgType.Immune),
-                @as(u8, @bitCast(ident)),
-                @intFromEnum(reason),
+                @intFromEnum(ArgType.SideEnd),
+                @intFromEnum(@as(Player, args[0])),
+                @intFromEnum(@as(Side, args[1])),
             });
+            if (args.len == 3) try self.writer.writeByte(@as(u8, @bitCast(args[2])));
+        }
+
+        // ident: ID, move: <Move>
+        pub fn singlemove(self: Self, args: anytype) Error!void {
+            return single(self, .SingleMove, args);
+        }
+
+        // ident: ID, move: <Move>
+        pub fn singleturn(self: Self, args: anytype) Error!void {
+            return single(self, .SingleTurn, args);
         }
 
-        pub fn transform(self: Self, source: ID, target: ID) Error!void {
+        // ident: ID, move: <Move>
+        fn single(self: Self, arg: ArgType, args: anytype) Error!void {
             if (!enabled) return;
 
             try self.writer.writeAll(&.{
-                @intFromEnum(ArgType.Transform),
-                @as(u8, @bitCast(source)),
-                @as(u8, @bitCast(target)),
+                @intFromEnum(arg),
+                @as(u8, @bitCast(args[0])),
+                @intFromEnum(args[1]),
             });
         }
 
-        pub fn laststill(self: Self) Error!void {
+        // weather: <Weather>, reason: Weather
+        pub fn weather(self: Self, args: anytype) Error!void {
+            if (!enabled) return;
+
+            assert(!(args[0] == .None and args[1] == .Upkeep));
+            try self.writer.writeAll(&.{
+                @intFromEnum(ArgType.Weather),
+                @intFromEnum(args[0]),
+                @intFromEnum(@as(Weather, args[1])),
+            });
+        }
+
+        // -
+        pub fn laststill(self: Self, _: anytype) Error!void {
             if (!enabled) return;
 
             try self.writer.writeAll(&.{@intFromEnum(ArgType.LastStill)});
         }
 
-        pub fn lastmiss(self: Self) Error!void {
+        // -
+        pub fn lastmiss(self: Self, _: anytype) Error!void {
             if (!enabled) return;
 
             try self.writer.writeAll(&.{@intFromEnum(ArgType.LastMiss)});
@@ -655,7 +854,7 @@ pub const ByteStream = struct {
     }
 };
 
-pub const Kind = enum { Move, Species, Type, Status };
+pub const Kind = enum { Move, Species, Type, Status, Item, Weather };
 
 pub fn format(
     comptime gen: anytype,
@@ -700,6 +899,18 @@ pub fn format(
             .Resisted => "|-resisted|",
             .Immune => "|-immune|",
             .Transform => "|-transform|",
+            .Drag => "|drag|",
+            .Item => "|-item|",
+            .EndItem => "|-enditem|",
+            .CureTeam => "|-cureteam|",
+            .SetHP => "|-sethp|",
+            .SetBoost => "|-setboost|",
+            .CopyBoost => "|-copyboost|",
+            .SideStart => "|-sidestart|",
+            .SideEnd => "|-sideend|",
+            .SingleMove => "|-singlemove|",
+            .SingleTurn => "|-singleturn|",
+            .Weather => "|-weather|",
             else => unreachable,
         };
         printc("{s}", .{name}, a, b, &i, 1, color);
@@ -724,7 +935,7 @@ pub fn format(
                     printc(" {s}", .{formatter(gen, .Move, a[i])}, a, b, &i, 1, color);
                 }
             },
-            .Switch => {
+            .Switch, .Drag => {
                 const id = ID.from(@intCast(a[i]));
                 printc(" {s}({d})", .{ @tagName(id.player), id.id }, a, b, &i, 1, color);
                 printc(" {s}", .{formatter(gen, .Species, a[i])}, a, b, &i, 1, color);
@@ -768,6 +979,7 @@ pub fn format(
             .Crit,
             .SuperEffective,
             .Resisted,
+            .CureTeam,
             => {
                 const id = ID.from(@intCast(a[i]));
                 printc(" {s}({d})", .{ @tagName(id.player), id.id }, a, b, &i, 1, color);
@@ -844,12 +1056,12 @@ pub fn format(
                 printc(" {s}({d})", .{ @tagName(id.player), id.id }, a, b, &i, 1, color);
                 printc(" {s}", .{@tagName(@as(Fail, @enumFromInt(a[i])))}, a, b, &i, 1, color);
             },
-            .HitCount => {
+            .HitCount, .SetBoost => {
                 const id = ID.from(@intCast(a[i]));
                 printc(" {s}({d})", .{ @tagName(id.player), id.id }, a, b, &i, 1, color);
                 printc(" {d}", .{a[i]}, a, b, &i, 1, color);
             },
-            .Prepare => {
+            .Prepare, .SingleMove, .SingleTurn => {
                 const id = ID.from(@intCast(a[i]));
                 printc(" {s}({d})", .{ @tagName(id.player), id.id }, a, b, &i, 1, color);
                 printc(" {s}", .{formatter(gen, .Move, a[i])}, a, b, &i, 1, color);
@@ -857,7 +1069,13 @@ pub fn format(
             .Activate => {
                 const id = ID.from(@intCast(a[i]));
                 printc(" {s}({d})", .{ @tagName(id.player), id.id }, a, b, &i, 1, color);
-                printc(" {s}", .{@tagName(@as(Activate, @enumFromInt(a[i])))}, a, b, &i, 1, color);
+                const reason: Activate = @enumFromInt(a[i]);
+                printc(" {s}", .{@tagName(reason)}, a, b, &i, 1, color);
+                if (reason == .SubstituteBlock) {
+                    printc(" {s}", .{formatter(gen, .Move, a[i])}, a, b, &i, 1, color);
+                } else if (reason == .Magnitude) {
+                    printc(" {d}", .{a[i]}, a, b, &i, 1, color);
+                }
             },
             .Start => {
                 const id = ID.from(@intCast(a[i]));
@@ -865,7 +1083,7 @@ pub fn format(
                 const reason = a[i];
                 printc(" {s}", .{@tagName(@as(Start, @enumFromInt(reason)))}, a, b, &i, 1, color);
                 if (@as(Start, @enumFromInt(reason)) == .TypeChange) {
-                    const types = @as(gen1.Types, @bitCast(a[i]));
+                    const types = @as(gen.Types, @bitCast(a[i]));
                     const args = .{
                         formatter(gen, .Type, @intFromEnum(types.type1)),
                         formatter(gen, .Type, @intFromEnum(types.type2)),
@@ -885,12 +1103,64 @@ pub fn format(
                 printc(" {s}({d})", .{ @tagName(id.player), id.id }, a, b, &i, 1, color);
                 printc(" {s}", .{@tagName(@as(Immune, @enumFromInt(a[i])))}, a, b, &i, 1, color);
             },
-            .Transform => {
+            .Transform, .CopyBoost => {
                 const source = ID.from(@intCast(a[i]));
                 printc(" {s}({d})", .{ @tagName(source.player), source.id }, a, b, &i, 1, color);
                 const target = ID.from(@intCast(a[i]));
                 printc(" {s}({d})", .{ @tagName(target.player), target.id }, a, b, &i, 1, color);
             },
+            .Item, .EndItem => {
+                var id = ID.from(@intCast(a[i]));
+                printc(" {s}({d})", .{ @tagName(id.player), id.id }, a, b, &i, 1, color);
+                printc(" {s}", .{formatter(gen, .Item, a[i])}, a, b, &i, 1, color);
+                if (arg == .Item) {
+                    id = ID.from(@intCast(a[i]));
+                    printc(" {s}({d})", .{ @tagName(id.player), id.id }, a, b, &i, 1, color);
+                } else {
+                    const reason: EndItem = @enumFromInt(a[i]);
+                    printc(" {s}", .{@tagName(reason)}, a, b, &i, 1, color);
+                }
+            },
+            .SetHP => {
+                const id = ID.from(@intCast(a[i]));
+                printc(" {s}({d})", .{ @tagName(id.player), id.id }, a, b, &i, 1, color);
+                switch (endian) {
+                    .Big => {
+                        var hp = @as(u16, a[i]) << 8 | @as(u16, a[i + 1]);
+                        printc(" {d}", .{hp}, a, b, &i, 2, color);
+                        hp = @as(u16, a[i]) << 8 | @as(u16, a[i + 1]);
+                        printc("/{d}", .{hp}, a, b, &i, 2, color);
+                    },
+                    .Little => {
+                        var hp = @as(u16, a[i + 1]) << 8 | @as(u16, a[i]);
+                        printc(" {d}", .{hp}, a, b, &i, 2, color);
+                        hp = @as(u16, a[i + 1]) << 8 | @as(u16, a[i]);
+                        printc("/{d}", .{hp}, a, b, &i, 2, color);
+                    },
+                }
+                printc(" {s}", .{formatter(gen, .Status, a[i])}, a, b, &i, 1, color);
+                printc(" {s}", .{@tagName(@as(SetHP, @enumFromInt(a[i])))}, a, b, &i, 1, color);
+            },
+            .SideStart => {
+                const id = ID.from(@intCast(a[i]));
+                printc(" {s}({d})", .{ @tagName(id.player), id.id }, a, b, &i, 1, color);
+                printc(" {s}", .{@tagName(@as(Side, @enumFromInt(a[i])))}, a, b, &i, 1, color);
+            },
+            .SideEnd => {
+                var id = ID.from(@intCast(a[i]));
+                printc(" {s}({d})", .{ @tagName(id.player), id.id }, a, b, &i, 1, color);
+                const reason: Side = @enumFromInt(a[i]);
+                printc(" {s}", .{@tagName(reason)}, a, b, &i, 1, color);
+                if (reason == .Spikes) {
+                    printc(" {s}", .{formatter(gen, .Move, a[i])}, a, b, &i, 1, color);
+                    id = ID.from(@intCast(a[i]));
+                    printc(" {s}({d})", .{ @tagName(id.player), id.id }, a, b, &i, 1, color);
+                }
+            },
+            .Weather => {
+                printc(" {s}", .{formatter(gen, .Weather, a[i])}, a, b, &i, 1, color);
+                printc(" {s}", .{@tagName(@as(Weather, @enumFromInt(a[i])))}, a, b, &i, 1, color);
+            },
             else => unreachable,
         }
         print("\n", .{});
@@ -987,12 +1257,17 @@ const gen2 = struct {
     pub const helpers = @import("../gen2/helpers.zig");
 };
 
-var buf: [gen1.LOGS_SIZE]u8 = undefined;
-var stream = ByteStream{ .buffer = &buf };
+var buf: [pkmn.LOGS_SIZE]u8 = undefined;
+var stream: ByteStream = .{ .buffer = &buf };
 var log: FixedLog = .{ .writer = stream.writer() };
 
-const M = gen1.Move;
-const S = gen1.Species;
+const M1 = gen1.Move;
+const S1 = gen1.Species;
+
+const M2 = gen2.Move;
+const S2 = gen2.Species;
+const I2 = gen2.Item;
+const W2 = gen2.Weather;
 
 fn expectLog1(expected: []const u8, actual: []const u8) !void {
     return expectLog(gen1, expected, actual, 0);
@@ -1008,32 +1283,39 @@ fn formatter(comptime gen: anytype, kind: Kind, byte: u8) []const u8 {
         .Species => @tagName(@as(gen.Species, @enumFromInt(byte))),
         .Type => @tagName(@as(gen.Type, @enumFromInt(byte))),
         .Status => gen.Status.name(byte),
+        .Item => if (@hasDecl(gen, "Item"))
+            @tagName(@as(gen.Item, @enumFromInt(byte)))
+        else
+            unreachable,
+        .Weather => if (@hasDecl(gen, "Weather"))
+            @tagName(@as(gen.Weather, @enumFromInt(byte)))
+        else
+            unreachable,
     };
 }
 
 test "|move|" {
-    try log.move(p2.ident(4), M.Thunderbolt, p1.ident(5), null);
+    try log.move(.{ p2.ident(4), M1.Thunderbolt, p1.ident(5) });
     try expectLog1(
-        &.{ N(ArgType.Move), 0b1100, N(M.Thunderbolt), 0b0101, N(Move.None) },
+        &.{ N(ArgType.Move), 0b1100, N(M1.Thunderbolt), 0b0101, N(Move.None) },
         buf[0..5],
     );
     stream.reset();
 
-    try log.move(p2.ident(4), M.Wrap, p1.ident(5), M.Wrap);
-    const wrap = N(M.Wrap);
+    try log.move(.{ p2.ident(4), M1.Pound, p1.ident(5), M1.Metronome });
     try expectLog1(
-        &.{ N(ArgType.Move), 0b1100, wrap, 0b0101, N(Move.From), wrap },
+        &.{ N(ArgType.Move), 0b1100, N(M1.Pound), 0b0101, N(Move.From), N(M1.Metronome) },
         buf[0..6],
     );
     stream.reset();
 
-    try log.move(p2.ident(4), M.SkullBash, .{}, null);
-    try log.laststill();
+    try log.move(.{ p2.ident(4), M1.SkullBash, ID{} });
+    try log.laststill(.{});
     try expectLog1(
         &.{
             N(ArgType.Move),
             0b1100,
-            N(M.SkullBash),
+            N(M1.SkullBash),
             0,
             N(Move.None),
             N(ArgType.LastStill),
@@ -1042,13 +1324,13 @@ test "|move|" {
     );
     stream.reset();
 
-    try log.move(p2.ident(4), M.Tackle, p1.ident(5), null);
-    try log.lastmiss();
+    try log.move(.{ p2.ident(4), M1.Tackle, p1.ident(5) });
+    try log.lastmiss(.{});
     try expectLog1(
         &.{
             N(ArgType.Move),
             0b1100,
-            N(M.Tackle),
+            N(M1.Tackle),
             0b0101,
             N(Move.None),
             N(ArgType.LastMiss),
@@ -1064,11 +1346,11 @@ test "|switch|" {
     snorlax.hp = 200;
     snorlax.stats.hp = 400;
     snorlax.status = gen1.Status.init(.PAR);
-    try log.switched(p2.ident(3), &snorlax);
+    try log.switched(.{ p2.ident(3), &snorlax });
     const par = 0b1000000;
     var expected: []const u8 = switch (endian) {
-        .Big => &.{ N(ArgType.Switch), 0b1011, N(S.Snorlax), 91, 0, 200, 1, 144, par },
-        .Little => &.{ N(ArgType.Switch), 0b1011, N(S.Snorlax), 91, 200, 0, 144, 1, par },
+        .Big => &.{ N(ArgType.Switch), 0b1011, N(S1.Snorlax), 91, 0, 200, 1, 144, par },
+        .Little => &.{ N(ArgType.Switch), 0b1011, N(S1.Snorlax), 91, 200, 0, 144, 1, par },
     };
     try expectLog1(expected, buf[0..9]);
     stream.reset();
@@ -1076,19 +1358,19 @@ test "|switch|" {
     snorlax.level = 100;
     snorlax.hp = 0;
     snorlax.status = 0;
-    try log.switched(p2.ident(3), &snorlax);
+    try log.switched(.{ p2.ident(3), &snorlax });
     expected = switch (endian) {
-        .Big => &.{ N(ArgType.Switch), 0b1011, N(S.Snorlax), 100, 0, 0, 1, 144, 0 },
-        .Little => &.{ N(ArgType.Switch), 0b1011, N(S.Snorlax), 100, 0, 0, 144, 1, 0 },
+        .Big => &.{ N(ArgType.Switch), 0b1011, N(S1.Snorlax), 100, 0, 0, 1, 144, 0 },
+        .Little => &.{ N(ArgType.Switch), 0b1011, N(S1.Snorlax), 100, 0, 0, 144, 1, 0 },
     };
     try expectLog1(expected, buf[0..9]);
     stream.reset();
 
     snorlax.hp = 400;
-    try log.switched(p2.ident(3), &snorlax);
+    try log.switched(.{ p2.ident(3), &snorlax });
     expected = switch (endian) {
-        .Big => &.{ N(ArgType.Switch), 0b1011, N(S.Snorlax), 100, 1, 144, 1, 144, 0 },
-        .Little => &.{ N(ArgType.Switch), 0b1011, N(S.Snorlax), 100, 144, 1, 144, 1, 0 },
+        .Big => &.{ N(ArgType.Switch), 0b1011, N(S1.Snorlax), 100, 1, 144, 1, 144, 0 },
+        .Little => &.{ N(ArgType.Switch), 0b1011, N(S1.Snorlax), 100, 144, 1, 144, 1, 0 },
     };
     try expectLog1(expected, buf[0..9]);
     stream.reset();
@@ -1098,11 +1380,11 @@ test "|switch|" {
     blissey.hp = 200;
     blissey.stats.hp = 400;
     blissey.status = gen2.Status.init(.PAR);
-    try log.switched(p2.ident(3), &blissey);
+    try log.switched(.{ p2.ident(3), &blissey });
     expected = &(.{
         N(ArgType.Switch),
         0b1011,
-        N(gen2.Species.Blissey),
+        N(S2.Blissey),
         N(gen2.Gender.Female),
         91,
     } ++ switch (endian) {
@@ -1114,27 +1396,27 @@ test "|switch|" {
 }
 
 test "|cant|" {
-    try log.cant(p2.ident(6), .Bound);
+    try log.cant(.{ p2.ident(6), .Bound });
     try expectLog1(&.{ N(ArgType.Cant), 0b1110, N(Cant.Bound) }, buf[0..3]);
     stream.reset();
 
-    try log.disabled(p1.ident(2), M.Earthquake);
-    try expectLog1(&.{ N(ArgType.Cant), 2, N(Cant.Disable), N(M.Earthquake) }, buf[0..4]);
+    try log.cant(.{ p1.ident(2), .Disable, M1.Earthquake });
+    try expectLog1(&.{ N(ArgType.Cant), 2, N(Cant.Disable), N(M1.Earthquake) }, buf[0..4]);
     stream.reset();
 }
 
 test "|faint|" {
-    try log.faint(p2.ident(2), false);
+    try log.faint(.{ p2.ident(2), false });
     try expectLog1(&.{ N(ArgType.Faint), 0b1010 }, buf[0..2]);
     stream.reset();
 
-    try log.faint(p2.ident(2), true);
+    try log.faint(.{ p2.ident(2), true });
     try expectLog1(&.{ N(ArgType.Faint), 0b1010, N(ArgType.None) }, buf[0..3]);
     stream.reset();
 }
 
 test "|turn|" {
-    try log.turn(42);
+    try log.turn(.{42});
     var expected = switch (endian) {
         .Big => &.{ N(ArgType.Turn), 0, 42, N(ArgType.None) },
         .Little => &.{ N(ArgType.Turn), 42, 0, N(ArgType.None) },
@@ -1144,13 +1426,13 @@ test "|turn|" {
 }
 
 test "|win|" {
-    try log.win(.P2);
+    try log.win(.{.P2});
     try expectLog1(&.{ N(ArgType.Win), 1, N(ArgType.None) }, buf[0..3]);
     stream.reset();
 }
 
 test "|tie|" {
-    try log.tie();
+    try log.tie(.{});
     try expectLog1(&.{ N(ArgType.Tie), N(ArgType.None) }, buf[0..2]);
     stream.reset();
 }
@@ -1159,7 +1441,7 @@ test "|-damage|" {
     var chansey = gen1.helpers.Pokemon.init(.{ .species = .Chansey, .moves = &.{.Splash} });
     chansey.hp = 612;
     chansey.status = gen1.Status.slp(1);
-    try log.damage(p2.ident(2), &chansey, .None);
+    try log.damage(.{ p2.ident(2), &chansey, .None });
     var expected: []const u8 = switch (endian) {
         .Big => &.{ N(ArgType.Damage), 0b1010, 2, 100, 2, 191, 1, N(Damage.None) },
         .Little => &.{ N(ArgType.Damage), 0b1010, 100, 2, 191, 2, 1, N(Damage.None) },
@@ -1170,7 +1452,7 @@ test "|-damage|" {
     chansey.hp = 100;
     chansey.stats.hp = 256;
     chansey.status = 0;
-    try log.damage(p2.ident(2), &chansey, .Confusion);
+    try log.damage(.{ p2.ident(2), &chansey, .Confusion });
     expected = switch (endian) {
         .Big => &.{ N(ArgType.Damage), 0b1010, 0, 100, 1, 0, 0, N(Damage.Confusion) },
         .Little => &.{ N(ArgType.Damage), 0b1010, 100, 0, 0, 1, 0, N(Damage.Confusion) },
@@ -1179,7 +1461,7 @@ test "|-damage|" {
     stream.reset();
 
     chansey.status = gen1.Status.init(.PSN);
-    try log.damageOf(p2.ident(2), &chansey, .RecoilOf, p1.ident(1));
+    try log.damage(.{ p2.ident(2), &chansey, .RecoilOf, p1.ident(1) });
     expected = switch (endian) {
         .Big => &.{ N(ArgType.Damage), 0b1010, 0, 100, 1, 0, 0b1000, N(Damage.RecoilOf), 1 },
         .Little => &.{ N(ArgType.Damage), 0b1010, 100, 0, 0, 1, 0b1000, N(Damage.RecoilOf), 1 },
@@ -1192,7 +1474,7 @@ test "|-heal|" {
     var chansey = gen1.helpers.Pokemon.init(.{ .species = .Chansey, .moves = &.{.Splash} });
     chansey.hp = 612;
     chansey.status = gen1.Status.slp(1);
-    try log.heal(p2.ident(2), &chansey, .None);
+    try log.heal(.{ p2.ident(2), &chansey, .None });
     var expected: []const u8 = switch (endian) {
         .Big => &.{ N(ArgType.Heal), 0b1010, 2, 100, 2, 191, 1, N(Heal.None) },
         .Little => &.{ N(ArgType.Heal), 0b1010, 100, 2, 191, 2, 1, N(Heal.None) },
@@ -1203,7 +1485,7 @@ test "|-heal|" {
     chansey.hp = 100;
     chansey.stats.hp = 256;
     chansey.status = 0;
-    try log.heal(p2.ident(2), &chansey, .Silent);
+    try log.heal(.{ p2.ident(2), &chansey, .Silent });
     expected = switch (endian) {
         .Big => &.{ N(ArgType.Heal), 0b1010, 0, 100, 1, 0, 0, N(Heal.Silent) },
         .Little => &.{ N(ArgType.Heal), 0b1010, 100, 0, 0, 1, 0, N(Heal.Silent) },
@@ -1211,7 +1493,7 @@ test "|-heal|" {
     try expectLog1(expected, buf[0..8]);
     stream.reset();
 
-    try log.drain(p2.ident(2), &chansey, p1.ident(1));
+    try log.heal(.{ p2.ident(2), &chansey, .Drain, p1.ident(1) });
     expected = switch (endian) {
         .Big => &.{ N(ArgType.Heal), 0b1010, 0, 100, 1, 0, 0, N(Heal.Drain), 1 },
         .Little => &.{ N(ArgType.Heal), 0b1010, 100, 0, 0, 1, 0, N(Heal.Drain), 1 },
@@ -1221,28 +1503,28 @@ test "|-heal|" {
 }
 
 test "|-status|" {
-    try log.status(p2.ident(6), gen1.Status.init(.BRN), .None);
+    try log.status(.{ p2.ident(6), gen1.Status.init(.BRN), .None });
     try expectLog1(&.{ N(ArgType.Status), 0b1110, 0b10000, N(Status.None) }, buf[0..4]);
     stream.reset();
 
-    try log.status(p2.ident(2), gen1.Status.init(.PSN), .Silent);
+    try log.status(.{ p2.ident(2), gen1.Status.init(.PSN), .Silent });
     try expectLog1(&.{ N(ArgType.Status), 0b1010, 0b1000, N(Status.Silent) }, buf[0..4]);
     stream.reset();
 
-    try log.statusFrom(p1.ident(1), gen1.Status.init(.PAR), M.BodySlam);
+    try log.status(.{ p1.ident(1), gen1.Status.init(.PAR), .From, M1.BodySlam });
     try expectLog1(
-        &.{ N(ArgType.Status), 0b0001, 0b1000000, N(Status.From), N(M.BodySlam) },
+        &.{ N(ArgType.Status), 0b0001, 0b1000000, N(Status.From), N(M1.BodySlam) },
         buf[0..5],
     );
     stream.reset();
 }
 
 test "|-curestatus|" {
-    try log.curestatus(p2.ident(6), gen1.Status.slp(7), .Message);
+    try log.curestatus(.{ p2.ident(6), gen1.Status.slp(7), .Message });
     try expectLog1(&.{ N(ArgType.CureStatus), 0b1110, 0b111, N(CureStatus.Message) }, buf[0..4]);
     stream.reset();
 
-    try log.curestatus(p1.ident(2), gen1.Status.TOX, .Silent);
+    try log.curestatus(.{ p1.ident(2), gen1.Status.TOX, .Silent });
     try expectLog1(&.{
         N(ArgType.CureStatus),
         0b0010,
@@ -1253,163 +1535,306 @@ test "|-curestatus|" {
 }
 
 test "|-boost|" {
-    try log.boost(p2.ident(6), .Speed, 2);
+    try log.boost(.{ p2.ident(6), .Speed, 2 });
     try expectLog1(&.{ N(ArgType.Boost), 0b1110, N(Boost.Speed), 8 }, buf[0..4]);
     stream.reset();
 
-    try log.boost(p1.ident(2), .Rage, 1);
+    try log.boost(.{ p1.ident(2), .Rage, 1 });
     try expectLog1(&.{ N(ArgType.Boost), 0b0010, N(Boost.Rage), 7 }, buf[0..4]);
     stream.reset();
 
-    try log.boost(p2.ident(3), .Defense, -2);
+    try log.boost(.{ p2.ident(3), .Defense, -2 });
     try expectLog1(&.{ N(ArgType.Boost), 0b1011, N(Boost.Defense), 4 }, buf[0..4]);
     stream.reset();
 }
 
 test "|-clearallboost|" {
-    try log.clearallboost();
+    try log.clearallboost(.{});
     try expectLog1(&.{N(ArgType.ClearAllBoost)}, buf[0..1]);
     stream.reset();
 }
 
 test "|-fail|" {
-    try log.fail(p2.ident(6), .None);
+    try log.fail(.{ p2.ident(6), .None });
     try expectLog1(&.{ N(ArgType.Fail), 0b1110, N(Fail.None) }, buf[0..3]);
     stream.reset();
 
-    try log.fail(p2.ident(6), .Sleep);
+    try log.fail(.{ p2.ident(6), .Sleep });
     try expectLog1(&.{ N(ArgType.Fail), 0b1110, N(Fail.Sleep) }, buf[0..3]);
     stream.reset();
 
-    try log.fail(p2.ident(6), .Substitute);
+    try log.fail(.{ p2.ident(6), .Substitute });
     try expectLog1(&.{ N(ArgType.Fail), 0b1110, N(Fail.Substitute) }, buf[0..3]);
     stream.reset();
 
-    try log.fail(p2.ident(6), .Weak);
+    try log.fail(.{ p2.ident(6), .Weak });
     try expectLog1(&.{ N(ArgType.Fail), 0b1110, N(Fail.Weak) }, buf[0..3]);
     stream.reset();
 }
 
 test "|-miss|" {
-    try log.miss(p2.ident(4));
+    try log.miss(.{p2.ident(4)});
     try expectLog1(&.{ N(ArgType.Miss), 0b1100 }, buf[0..2]);
     stream.reset();
 }
 test "|-hitcount|" {
-    try log.hitcount(p2.ident(1), 5);
+    try log.hitcount(.{ p2.ident(1), 5 });
     try expectLog1(&.{ N(ArgType.HitCount), 0b1001, 5 }, buf[0..3]);
     stream.reset();
 }
 
 test "|-prepare|" {
-    try log.prepare(p2.ident(2), M.Dig);
-    try expectLog1(&.{ N(ArgType.Prepare), 0b1010, N(M.Dig) }, buf[0..3]);
+    try log.prepare(.{ p2.ident(2), M1.Dig });
+    try expectLog1(&.{ N(ArgType.Prepare), 0b1010, N(M1.Dig) }, buf[0..3]);
     stream.reset();
 }
 
 test "|-mustrecharge|" {
-    try log.mustrecharge(p1.ident(6));
+    try log.mustrecharge(.{p1.ident(6)});
     try expectLog1(&.{ N(ArgType.MustRecharge), 0b0110 }, buf[0..2]);
     stream.reset();
 }
 
 test "|-activate|" {
-    try log.activate(p1.ident(2), .Struggle);
+    try log.activate(.{ p1.ident(2), .Struggle });
     try expectLog1(&.{ N(ArgType.Activate), 0b0010, N(Activate.Struggle) }, buf[0..3]);
     stream.reset();
 
-    try log.activate(p2.ident(4), .Mist);
+    try log.activate(.{ p2.ident(4), .Mist });
     try expectLog1(&.{ N(ArgType.Activate), 0b1100, N(Activate.Mist) }, buf[0..3]);
     stream.reset();
 
-    try log.activate(p2.ident(6), .Substitute);
+    try log.activate(.{ p2.ident(6), .Substitute });
     try expectLog1(&.{ N(ArgType.Activate), 0b1110, N(Activate.Substitute) }, buf[0..3]);
     stream.reset();
 
-    try log.activate(p1.ident(2), .Splash);
+    try log.activate(.{ p1.ident(2), .Splash });
     try expectLog1(&.{ N(ArgType.Activate), 0b0010, N(Activate.Splash) }, buf[0..3]);
     stream.reset();
+
+    try log.activate(.{ p1.ident(4), .SubstituteBlock, M2.Spite });
+    try expectLog1(&.{
+        N(ArgType.Activate),
+        0b0100,
+        N(Activate.SubstituteBlock),
+        N(M2.Spite),
+    }, buf[0..4]);
+    stream.reset();
+
+    try log.activate(.{ p1.ident(3), .Magnitude, 5 });
+    try expectLog1(&.{ N(ArgType.Activate), 0b0011, N(Activate.Magnitude), 5 }, buf[0..4]);
+    stream.reset();
 }
 
 test "|-fieldactivate|" {
-    try log.fieldactivate();
+    try log.fieldactivate(.{});
     try expectLog1(&.{N(ArgType.FieldActivate)}, buf[0..1]);
     stream.reset();
 }
 
 test "|-start|" {
-    try log.start(p2.ident(6), .Bide);
+    try log.start(.{ p2.ident(6), .Bide });
     try expectLog1(&.{ N(ArgType.Start), 0b1110, N(Start.Bide) }, buf[0..3]);
     stream.reset();
 
-    try log.start(p1.ident(2), .ConfusionSilent);
+    try log.start(.{ p1.ident(2), .ConfusionSilent });
     try expectLog1(&.{ N(ArgType.Start), 0b0010, N(Start.ConfusionSilent) }, buf[0..3]);
     stream.reset();
 
-    try log.typechange(p2.ident(6), gen1.Types{ .type1 = .Fire, .type2 = .Fire }, p2.ident(5));
+    try log.start(.{
+        p2.ident(6),
+        .TypeChange,
+        gen1.Types{ .type1 = .Fire, .type2 = .Fire },
+        p2.ident(5),
+    });
     try expectLog1(
         &.{ N(ArgType.Start), 0b1110, N(Start.TypeChange), 0b1000_1000, 0b1101 },
         buf[0..5],
     );
     stream.reset();
 
-    try log.typechange(p1.ident(2), gen1.Types{ .type1 = .Bug, .type2 = .Poison }, p2.ident(4));
+    try log.start(.{
+        p1.ident(2),
+        .TypeChange,
+        gen1.Types{ .type1 = .Bug, .type2 = .Poison },
+        p2.ident(4),
+    });
     try expectLog1(
         &.{ N(ArgType.Start), 0b0010, N(Start.TypeChange), 0b0011_0110, 0b1100 },
         buf[0..5],
     );
     stream.reset();
 
-    try log.startEffect(p1.ident(2), .Disable, M.Surf);
-    try expectLog1(&.{ N(ArgType.Start), 0b0010, N(Start.Disable), N(M.Surf) }, buf[0..4]);
+    try log.start(.{ p1.ident(2), .Disable, M1.Surf });
+    try expectLog1(&.{ N(ArgType.Start), 0b0010, N(Start.Disable), N(M1.Surf) }, buf[0..4]);
     stream.reset();
 
-    try log.startEffect(p1.ident(2), .Mimic, M.Surf);
-    try expectLog1(&.{ N(ArgType.Start), 0b0010, N(Start.Mimic), N(M.Surf) }, buf[0..4]);
+    try log.start(.{ p1.ident(2), .Mimic, M1.Surf });
+    try expectLog1(&.{ N(ArgType.Start), 0b0010, N(Start.Mimic), N(M1.Surf) }, buf[0..4]);
     stream.reset();
 }
 
 test "|-end|" {
-    try log.end(p2.ident(6), .Bide);
+    try log.end(.{ p2.ident(6), .Bide });
     try expectLog1(&.{ N(ArgType.End), 0b1110, N(End.Bide) }, buf[0..3]);
     stream.reset();
 
-    try log.end(p1.ident(2), .ConfusionSilent);
+    try log.end(.{ p1.ident(2), .ConfusionSilent });
     try expectLog1(&.{ N(ArgType.End), 0b0010, N(End.ConfusionSilent) }, buf[0..3]);
     stream.reset();
 }
 
 test "|-ohko|" {
-    try log.ohko();
+    try log.ohko(.{});
     try expectLog1(&.{N(ArgType.OHKO)}, buf[0..1]);
     stream.reset();
 }
+
 test "|-crit|" {
-    try log.crit(p2.ident(5));
+    try log.crit(.{p2.ident(5)});
     try expectLog1(&.{ N(ArgType.Crit), 0b1101 }, buf[0..2]);
     stream.reset();
 }
+
 test "|-supereffective|" {
-    try log.supereffective(p1.ident(1));
+    try log.supereffective(.{p1.ident(1)});
     try expectLog1(&.{ N(ArgType.SuperEffective), 0b0001 }, buf[0..2]);
     stream.reset();
 }
+
 test "|-resisted|" {
-    try log.resisted(p2.ident(2));
+    try log.resisted(.{p2.ident(2)});
     try expectLog1(&.{ N(ArgType.Resisted), 0b1010 }, buf[0..2]);
     stream.reset();
 }
+
 test "|-immune|" {
-    try log.immune(p1.ident(3), .None);
+    try log.immune(.{ p1.ident(3), .None });
     try expectLog1(&.{ N(ArgType.Immune), 0b0011, N(Immune.None) }, buf[0..3]);
     stream.reset();
 
-    try log.immune(p2.ident(2), .OHKO);
+    try log.immune(.{ p2.ident(2), .OHKO });
     try expectLog1(&.{ N(ArgType.Immune), 0b1010, N(Immune.OHKO) }, buf[0..3]);
     stream.reset();
 }
+
 test "|-transform|" {
-    try log.transform(p2.ident(4), p1.ident(5));
+    try log.transform(.{ p2.ident(4), p1.ident(5) });
     try expectLog1(&.{ N(ArgType.Transform), 0b1100, 0b0101 }, buf[0..3]);
     stream.reset();
 }
+
+test "|drag|" {
+    var blissey = gen2.helpers.Pokemon.init(.{ .species = .Blissey, .moves = &.{.Splash} });
+    blissey.level = 91;
+    blissey.hp = 200;
+    blissey.stats.hp = 400;
+    blissey.status = gen2.Status.init(.PAR);
+    try log.drag(.{ p2.ident(3), &blissey });
+    const par = 0b1000000;
+    const expected = &(.{
+        N(ArgType.Drag),
+        0b1011,
+        N(S2.Blissey),
+        N(gen2.Gender.Female),
+        91,
+    } ++ switch (endian) {
+        .Big => .{ 0, 200, 1, 144, par },
+        .Little => .{ 200, 0, 144, 1, par },
+    });
+    try expectLog2(expected, buf[0..10]);
+    stream.reset();
+}
+
+test "|-item|" {
+    try log.item(.{ p2.ident(2), I2.GoldBerry, p1.ident(4) });
+    try expectLog2(&.{ N(ArgType.Item), 0b1010, N(I2.GoldBerry), 0b0100 }, buf[0..4]);
+    stream.reset();
+}
+
+test "|-enditem|" {
+    try log.enditem(.{ p1.ident(1), I2.BerserkGene, .None });
+    try expectLog2(&.{ N(ArgType.EndItem), 0b0001, N(I2.BerserkGene), N(EndItem.None) }, buf[0..4]);
+    stream.reset();
+
+    try log.enditem(.{ p2.ident(4), I2.PRZCureBerry, .Eat });
+    try expectLog2(&.{ N(ArgType.EndItem), 0b1100, N(I2.PRZCureBerry), N(EndItem.Eat) }, buf[0..4]);
+    stream.reset();
+}
+
+test "|-cureteam|" {
+    try log.cureteam(.{p2.ident(5)});
+    try expectLog2(&.{ N(ArgType.CureTeam), 0b1101 }, buf[0..2]);
+    stream.reset();
+}
+
+test "|-sethp|" {
+    var blissey = gen2.helpers.Pokemon.init(.{ .species = .Blissey, .moves = &.{.PainSplit} });
+    blissey.hp = 612;
+    try log.sethp(.{ p2.ident(2), &blissey, .Silent });
+    var expected: []const u8 = switch (endian) {
+        .Big => &.{ N(ArgType.SetHP), 0b1010, 2, 100, 2, 201, 0, N(SetHP.Silent) },
+        .Little => &.{ N(ArgType.SetHP), 0b1010, 100, 2, 201, 2, 0, N(SetHP.Silent) },
+    };
+    try expectLog2(expected, buf[0..8]);
+    stream.reset();
+}
+
+test "|-setboost|" {
+    try log.setboost(.{ p2.ident(6), 6 });
+    try expectLog2(&.{ N(ArgType.SetBoost), 0b1110, 12 }, buf[0..3]);
+    stream.reset();
+
+    try log.setboost(.{ p2.ident(3), 2 });
+    try expectLog2(&.{ N(ArgType.SetBoost), 0b1011, 8 }, buf[0..3]);
+    stream.reset();
+}
+
+test "|-copyboost|" {
+    try log.copyboost(.{ p2.ident(3), p1.ident(6) });
+    try expectLog2(&.{ N(ArgType.CopyBoost), 0b1011, 0b0110 }, buf[0..3]);
+    stream.reset();
+}
+
+test "|-sidestart|" {
+    try log.sidestart(.{ .P2, .Reflect });
+    try expectLog2(&.{ N(ArgType.SideStart), 1, N(Side.Reflect) }, buf[0..3]);
+    stream.reset();
+}
+
+test "|-sideend|" {
+    try log.sideend(.{ .P2, .LightScreen });
+    try expectLog2(&.{ N(ArgType.SideEnd), 1, N(Side.LightScreen) }, buf[0..3]);
+    stream.reset();
+
+    try log.sideend(.{ .P1, .Spikes, p1.ident(3) });
+    try expectLog2(&.{
+        N(ArgType.SideEnd),
+        0,
+        N(Side.Spikes),
+        0b0011,
+    }, buf[0..4]);
+    stream.reset();
+}
+
+test "|-singlemove|" {
+    try log.singlemove(.{ p2.ident(2), M2.DestinyBond });
+    try expectLog2(&.{ N(ArgType.SingleMove), 0b1010, N(M2.DestinyBond) }, buf[0..3]);
+    stream.reset();
+}
+
+test "|-singleturn|" {
+    try log.singleturn(.{ p1.ident(3), M2.Protect });
+    try expectLog2(&.{ N(ArgType.SingleTurn), 0b0011, N(M2.Protect) }, buf[0..3]);
+    stream.reset();
+}
+
+test "|-weather|" {
+    try log.weather(.{ W2.Rain, .Upkeep });
+    try expectLog2(&.{ N(ArgType.Weather), N(W2.Rain), N(Weather.Upkeep) }, buf[0..3]);
+    stream.reset();
+
+    try log.weather(.{ W2.None, .None });
+    try expectLog2(&.{ N(ArgType.Weather), N(W2.None), N(Weather.None) }, buf[0..3]);
+    stream.reset();
+}