@pkmn/engine 0.1.0-dev.6ef582f1 → 0.1.0-dev.72514829

package/src/lib/common/protocol.zig

@@ -1,16 +1,17 @@
-const std = @import("std");
 const builtin = @import("builtin");
-
-const data = @import("./data.zig");
-const options = @import("./options.zig");
+const data = @import("data.zig");
+const options = @import("options.zig");
+const pkmn = @import("../pkmn.zig");
+const std = @import("std");
 
 const assert = std.debug.assert;
-const print = std.debug.print;
-
 const enabled = options.log;
-
-const Player = data.Player;
 const ID = data.ID;
+const Player = data.Player;
+const print = std.debug.print;
+
+const endian = builtin.cpu.arch.endian();
+const Endian = std.builtin.Endian;
 
 pub const ArgType = enum(u8) {
     None,
@@ -69,7 +70,7 @@ pub const ArgType = enum(u8) {
     EndAbility,
     ClearNegativeBoost,
     FormeChange,
-    NoTarget,
+    LastNoTarget, // FIXME
 
     // Gen 4
     SwapBoost,
@@ -102,6 +103,7 @@ pub const ArgType = enum(u8) {
     // Gen 8
     CanDynamax,
     SwapSideConditions,
+    UpdatePoke,
 
     // Gen 9
     Terastallize,
@@ -121,12 +123,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) {
@@ -136,6 +145,17 @@ pub const Damage = enum(u8) {
     Confusion,
     LeechSeed,
     RecoilOf,
+
+    Bind,
+    Wrap,
+    FireSpin,
+    Clamp,
+    Whirlpool,
+    Spikes,
+
+    Nightmare,
+    Curse,
+    Sandstorm,
 };
 
 pub const Status = enum(u8) {
@@ -178,8 +198,26 @@ 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,
+    Spite,
 };
 
 pub const Start = enum(u8) {
@@ -197,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) {
@@ -205,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) {
@@ -222,376 +287,534 @@ pub const Immune = enum(u8) {
     OHKO,
 };
 
-/// 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`.
-pub const NULL = Log(@TypeOf(std.io.null_writer)){ .writer = std.io.null_writer };
+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,
+};
 
-/// Logs protocol information to its `Writer` during a battle update when `options.log` is enabled.
-pub fn Log(comptime Writer: type) type {
+/// Logs protocol information to its `WriterT` during a battle update when `options.log` is enabled.
+pub fn Log(comptime WriterT: type) type {
     return struct {
         const Self = @This();
 
-        writer: Writer,
+        writer: WriterT,
 
-        pub const Error = Writer.Error;
+        pub const Error = err(WriterT);
+
+        fn err(comptime T: type) type {
+            const msg = "Invalid Writer type " ++ @typeName(T) ++ "'";
+            return switch (@typeInfo(T)) {
+                .pointer => |ptr_info| switch (ptr_info.size) {
+                    .one => switch (@typeInfo(ptr_info.child)) {
+                        .@"struct" => err(ptr_info.child),
+                        else => @compileError(msg),
+                    },
+                    else => @compileError(msg),
+                },
+                .@"struct" => if (@hasDecl(T, "Error")) T.Error else @compileError(msg),
+                else => @compileError(msg),
+            };
+        }
 
-        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]) });
         }
 
-        pub fn switched(self: Self, ident: ID, pokemon: anytype) Error!void {
-            if (!enabled) return;
-
-            try self.writer.writeAll(&.{ @intFromEnum(ArgType.Switch), @as(u8, @bitCast(ident)) });
-            try self.writer.writeAll(&.{ @intFromEnum(pokemon.species), pokemon.level });
-            try self.writer.writeIntNative(u16, pokemon.hp);
-            try self.writer.writeIntNative(u16, pokemon.stats.hp);
-            try self.writer.writeAll(&.{pokemon.status});
+        // ident: ID, pokemon: <Pokemon>
+        pub fn switched(self: Self, args: anytype) Error!void {
+            return switchDrag(self, .Switch, args);
         }
 
-        pub fn cant(self: Self, ident: ID, reason: Cant) Error!void {
+        // ident: ID, pokemon: <Pokemon>
+        fn switchDrag(self: Self, arg: ArgType, args: anytype) Error!void {
             if (!enabled) return;
 
-            assert(reason != .Disable);
-            try self.writer.writeAll(&.{
-                @intFromEnum(ArgType.Cant),
-                @as(u8, @bitCast(ident)),
-                @intFromEnum(reason),
-            });
+            try self.writer.writeAll(&.{ @intFromEnum(arg), @as(u8, @bitCast(args[0])) });
+            if (@hasField(@TypeOf(args[1].*), "dvs")) {
+                try self.writer.writeAll(&.{
+                    @intFromEnum(args[1].species),
+                    @intFromEnum(args[1].dvs.gender),
+                    args[1].level,
+                });
+            } else {
+                try self.writer.writeAll(&.{ @intFromEnum(args[1].species), args[1].level });
+            }
+            try self.writer.writeInt(u16, args[1].hp, endian);
+            try self.writer.writeInt(u16, args[1].stats.hp, endian);
+            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.writeInt(u16, args[0], endian);
             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.writeInt(u16, args[1].hp, endian);
+            try self.writer.writeInt(u16, args[1].stats.hp, endian);
+            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.writeInt(u16, args[1].hp, endian);
+            try self.writer.writeInt(u16, args[1].stats.hp, endian);
+            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
+        // ident: ID, reason: .Spite, m: <Move>, 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]);
+                }
+            } else if (args.len == 4) {
+                assert(reason == .Spite);
+                try self.writer.writeAll(&.{ @intFromEnum(args[2]), args[3] });
+            }
         }
 
-        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.writeInt(u16, args[1].hp, endian);
+            try self.writer.writeInt(u16, args[1].stats.hp, endian);
+            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])));
         }
 
-        pub fn transform(self: Self, source: ID, target: ID) Error!void {
+        // 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);
+        }
+
+        // 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]),
+            });
+        }
+
+        // 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) Error!void {
+        // -
+        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)});
@@ -599,56 +822,72 @@ pub fn Log(comptime Writer: type) type {
     };
 }
 
-/// `Log` type backed by the optimized `ByteStream.Writer`.
-pub const FixedLog = Log(ByteStream.Writer);
+/// `Log` type backed by the optimized `Writer`.
+pub const FixedLog = Log(*Writer);
 
-/// Stripped down version of `std.io.FixedBufferStream` optimized for efficiently writing the
-/// individual protocol bytes. Note that the `ByteStream.Writer` is **not** a `std.io.Writer` and
-/// should not be used for general purpose writing.
-pub const ByteStream = struct {
+/// Minimal logging helper optimized for efficiently writing the individual protocol bytes into a
+/// fixed buffer. Note that this is **not** a `std.Io.Writer` and should not be used for general
+/// purpose writing.
+pub const Writer = struct {
     buffer: []u8,
     pos: usize = 0,
 
-    pub const Writer = struct {
-        stream: *ByteStream,
+    pub const Error = error{NoSpaceLeft};
 
-        pub const Error = error{NoSpaceLeft};
+    pub fn writeByte(self: *Writer, byte: u8) Error!void {
+        if (self.pos >= self.buffer.len) return error.NoSpaceLeft;
+        self.buffer[self.pos] = byte;
+        self.pos += 1;
+    }
 
-        pub fn writeAll(self: Writer, bytes: []const u8) Error!void {
-            for (bytes) |b| try self.writeByte(b);
-        }
+    pub fn writeAll(self: *Writer, bytes: []const u8) Error!void {
+        const npos = self.pos + bytes.len;
+        if (npos > self.buffer.len) return error.NoSpaceLeft;
+        @memcpy(self.buffer[self.pos..npos], bytes);
+        self.pos = npos;
+    }
 
-        pub fn writeByte(self: Writer, byte: u8) Error!void {
-            try self.stream.writeByte(byte);
-        }
+    pub fn writeInt(self: *Writer, comptime T: type, v: T, end: std.builtin.Endian) Error!void {
+        const bytes = @divExact(@typeInfo(T).int.bits, 8);
+        const npos = self.pos + bytes;
+        if (npos > self.buffer.len) return error.NoSpaceLeft;
+        std.mem.writeInt(T, self.buffer[self.pos..][0..bytes], v, end);
+        self.pos = npos;
+    }
 
-        pub fn writeIntNative(self: Writer, comptime T: type, value: T) Error!void {
-            // TODO: rework this to write directly to the buffer?
-            var bytes: [(@typeInfo(T).Int.bits + 7) / 8]u8 = undefined;
-            std.mem.writeIntNative(T, &bytes, value);
-            return self.writeAll(&bytes);
-        }
-    };
+    pub fn reset(self: *Writer) void {
+        self.pos = 0;
+    }
+};
 
-    pub fn writer(self: *ByteStream) Writer {
-        return .{ .stream = self };
+/// Null object pattern implementation of `Log` backed by a null writer. Ignores anything sent to
+/// it, though protocol logging should additionally be turned off entirely with `options.log`.
+pub const NULL = Log(NullWriter){ .writer = .{} };
+
+const NullWriter = struct {
+    pub const Error = error{};
+
+    pub fn writeByte(self: NullWriter, byte: u8) Error!void {
+        _ = .{ self, byte };
     }
 
-    pub fn writeByte(self: *ByteStream, byte: u8) Writer.Error!void {
-        if (self.pos >= self.buffer.len) return error.NoSpaceLeft;
-        self.buffer[self.pos] = byte;
-        self.pos += 1;
+    pub fn writeAll(self: NullWriter, bytes: []const u8) Error!void {
+        _ = .{ self, bytes };
     }
 
-    pub fn reset(self: *ByteStream) void {
-        self.pos = 0;
+    pub fn writeInt(self: NullWriter, comptime T: type, v: T, end: std.builtin.Endian) Error!void {
+        _ = .{ self, T, v, end };
     }
 };
 
-pub const Kind = enum { Move, Species, Type, Status };
-pub const Formatter = fn (Kind, u8) []const u8;
+pub const Kind = enum { Move, Species, Type, Status, Item, Weather };
 
-pub fn format(comptime formatter: Formatter, a: []const u8, b: ?[]const u8, color: bool) void {
+pub fn format(
+    gen: anytype,
+    a: []const u8,
+    b: ?[]const u8,
+    color: bool,
+) void {
     print("\n", .{});
 
     var i: usize = 0;
@@ -686,6 +925,18 @@ pub fn format(comptime formatter: Formatter, a: []const u8, b: ?[]const u8, colo
             .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);
@@ -699,43 +950,53 @@ pub fn format(comptime formatter: Formatter, a: []const u8, b: ?[]const u8, colo
             .OHKO,
             => {},
             .Move => {
-                const source = ID.from(@intCast(a[i]));
+                const source: ID = .from(@intCast(a[i]));
                 printc(" {s}({d})", .{ @tagName(source.player), source.id }, a, b, &i, 1, color);
-                printc(" {s}", .{formatter(.Move, a[i])}, a, b, &i, 1, color);
-                const target = ID.from(@intCast(a[i]));
+                printc(" {s}", .{formatter(gen, .Move, a[i])}, 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);
                 const reason: Move = @enumFromInt(a[i]);
                 printc(" {s}", .{@tagName(reason)}, a, b, &i, 1, color);
-                if (reason == .From) printc(" {s}", .{formatter(.Move, a[i])}, a, b, &i, 1, color);
+                if (reason == .From) {
+                    printc(" {s}", .{formatter(gen, .Move, a[i])}, a, b, &i, 1, color);
+                }
             },
-            .Switch => {
-                const id = ID.from(@intCast(a[i]));
+            .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(.Species, a[i])}, a, b, &i, 1, color);
+                printc(" {s}", .{formatter(gen, .Species, a[i])}, a, b, &i, 1, color);
+                if (@hasDecl(gen, "Gender")) {
+                    if (a[i] == N(gen.Gender.Unknown)) {
+                        i += 1;
+                    } else {
+                        const gender = if (a[i] == N(gen.Gender.Male)) "M" else "F";
+                        printc(", {s}", .{gender}, a, b, &i, 1, color);
+                    }
+                }
                 printc(" L{d}", .{a[i]}, a, b, &i, 1, color);
                 switch (endian) {
-                    .Big => {
+                    .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 => {
+                    .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(.Status, a[i])}, a, b, &i, 1, color);
+                printc(" {s}", .{formatter(gen, .Status, a[i])}, a, b, &i, 1, color);
             },
             .Cant => {
-                const id = ID.from(@intCast(a[i]));
+                const id: ID = .from(@intCast(a[i]));
                 printc(" {s}({d})", .{ @tagName(id.player), id.id }, a, b, &i, 1, color);
                 const reason: Cant = @enumFromInt(a[i]);
                 printc(" {s}", .{@tagName(reason)}, a, b, &i, 1, color);
                 if (reason == .Disable) {
-                    printc(" {s}", .{formatter(.Move, a[i])}, a, b, &i, 1, color);
+                    printc(" {s}", .{formatter(gen, .Move, a[i])}, a, b, &i, 1, color);
                 }
             },
             .Faint,
@@ -744,14 +1005,15 @@ pub fn format(comptime formatter: Formatter, a: []const u8, b: ?[]const u8, colo
             .Crit,
             .SuperEffective,
             .Resisted,
+            .CureTeam,
             => {
-                const id = ID.from(@intCast(a[i]));
+                const id: ID = .from(@intCast(a[i]));
                 printc(" {s}({d})", .{ @tagName(id.player), id.id }, a, b, &i, 1, color);
             },
             .Turn => {
                 const turn = switch (endian) {
-                    .Big => @as(u16, a[i]) << 8 | @as(u16, a[i + 1]),
-                    .Little => @as(u16, a[i + 1]) << 8 | @as(u16, a[i]),
+                    .big => @as(u16, a[i]) << 8 | @as(u16, a[i + 1]),
+                    .little => @as(u16, a[i + 1]) << 8 | @as(u16, a[i]),
                 };
                 printc(" {d}", .{turn}, a, b, &i, 2, color);
             },
@@ -759,112 +1021,173 @@ pub fn format(comptime formatter: Formatter, a: []const u8, b: ?[]const u8, colo
                 printc(" {s}", .{@tagName(@as(Player, @enumFromInt(a[i])))}, a, b, &i, 1, color);
             },
             .Damage, .Heal => {
-                var id = ID.from(@intCast(a[i]));
+                var id: ID = .from(@intCast(a[i]));
                 printc(" {s}({d})", .{ @tagName(id.player), id.id }, a, b, &i, 1, color);
                 switch (endian) {
-                    .Big => {
+                    .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 => {
+                    .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(.Status, a[i])}, a, b, &i, 1, color);
+                printc(" {s}", .{formatter(gen, .Status, a[i])}, a, b, &i, 1, color);
                 if (arg == .Damage) {
                     const reason: Damage = @enumFromInt(a[i]);
                     printc(" {s}", .{@tagName(reason)}, a, b, &i, 1, color);
                     if (reason == .RecoilOf) {
-                        id = ID.from(@intCast(a[i]));
+                        id = .from(@intCast(a[i]));
                         printc(" {s}({d})", .{ @tagName(id.player), id.id }, a, b, &i, 1, color);
                     }
                 } else {
                     const reason: Heal = @enumFromInt(a[i]);
                     printc(" {s}", .{@tagName(reason)}, a, b, &i, 1, color);
                     if (reason == .Drain) {
-                        id = ID.from(@intCast(a[i]));
+                        id = .from(@intCast(a[i]));
                         printc(" {s}({d})", .{ @tagName(id.player), id.id }, a, b, &i, 1, color);
                     }
                 }
             },
             .Status => {
-                const id = ID.from(@intCast(a[i]));
+                const id: ID = .from(@intCast(a[i]));
                 printc(" {s}({d})", .{ @tagName(id.player), id.id }, a, b, &i, 1, color);
-                printc(" {s}", .{formatter(.Status, a[i])}, a, b, &i, 1, color);
+                printc(" {s}", .{formatter(gen, .Status, a[i])}, a, b, &i, 1, color);
                 const reason: Status = @enumFromInt(a[i]);
                 printc(" {s}", .{@tagName(reason)}, a, b, &i, 1, color);
-                if (reason == .From) printc(" {s}", .{formatter(.Move, a[i])}, a, b, &i, 1, color);
+                if (reason == .From) {
+                    printc(" {s}", .{formatter(gen, .Move, a[i])}, a, b, &i, 1, color);
+                }
             },
             .CureStatus => {
-                const id = ID.from(@intCast(a[i]));
+                const id: ID = .from(@intCast(a[i]));
                 printc(" {s}({d})", .{ @tagName(id.player), id.id }, a, b, &i, 1, color);
-                printc(" {s}", .{formatter(.Status, a[i])}, a, b, &i, 1, color);
+                printc(" {s}", .{formatter(gen, .Status, a[i])}, a, b, &i, 1, color);
                 const reason: CureStatus = @enumFromInt(a[i]);
                 printc(" {s}", .{@tagName(reason)}, a, b, &i, 1, color);
             },
             .Boost => {
-                const id = ID.from(@intCast(a[i]));
+                const id: ID = .from(@intCast(a[i]));
                 printc(" {s}({d})", .{ @tagName(id.player), id.id }, a, b, &i, 1, color);
                 printc(" {s}", .{@tagName(@as(Boost, @enumFromInt(a[i])))}, a, b, &i, 1, color);
                 printc(" {d}", .{a[i]}, a, b, &i, 1, color);
             },
             .Fail => {
-                const id = ID.from(@intCast(a[i]));
+                const id: ID = .from(@intCast(a[i]));
                 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 => {
-                const id = ID.from(@intCast(a[i]));
+            .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 => {
-                const id = ID.from(@intCast(a[i]));
+            .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(.Move, a[i])}, a, b, &i, 1, color);
+                printc(" {s}", .{formatter(gen, .Move, a[i])}, a, b, &i, 1, color);
             },
             .Activate => {
-                const id = ID.from(@intCast(a[i]));
+                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]));
+                const id: ID = .from(@intCast(a[i]));
                 printc(" {s}({d})", .{ @tagName(id.player), id.id }, a, b, &i, 1, color);
                 const reason = a[i];
                 printc(" {s}", .{@tagName(@as(Start, @enumFromInt(reason)))}, a, b, &i, 1, color);
                 if (@as(Start, @enumFromInt(reason)) == .TypeChange) {
+                    // FIXME
                     const types = @as(gen1.Types, @bitCast(a[i]));
                     const args = .{
-                        formatter(.Type, @intFromEnum(types.type1)),
-                        formatter(.Type, @intFromEnum(types.type2)),
+                        formatter(gen, .Type, @intFromEnum(types.type1)),
+                        formatter(gen, .Type, @intFromEnum(types.type2)),
                     };
                     printc(" {s}/{s}", args, a, b, &i, 1, color);
                 } else if (reason >= @intFromEnum(Start.Disable)) {
-                    printc(" {s}", .{formatter(.Move, a[i])}, a, b, &i, 1, color);
+                    printc(" {s}", .{formatter(gen, .Move, a[i])}, a, b, &i, 1, color);
                 }
             },
             .End => {
-                const id = ID.from(@intCast(a[i]));
+                const id: ID = .from(@intCast(a[i]));
                 printc(" {s}({d})", .{ @tagName(id.player), id.id }, a, b, &i, 1, color);
                 printc(" {s}", .{@tagName(@as(End, @enumFromInt(a[i])))}, a, b, &i, 1, color);
             },
             .Immune => {
-                const id = ID.from(@intCast(a[i]));
+                const id: ID = .from(@intCast(a[i]));
                 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 => {
-                const source = ID.from(@intCast(a[i]));
+            .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]));
+                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 = .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 = .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", .{});
@@ -896,30 +1219,44 @@ fn printc(
 }
 
 pub fn expectLog(
-    comptime formatter: Formatter,
+    comptime gen: anytype,
     expected: []const u8,
     actual: []const u8,
     offset: usize,
 ) !void {
     if (!enabled) return;
 
-    const color = color: {
-        if (std.process.hasEnvVarConstant("ZIG_DEBUG_COLOR")) {
-            break :color true;
-        } else if (std.process.hasEnvVarConstant("NO_COLOR")) {
-            break :color false;
-        } else {
-            break :color std.io.getStdErr().supportsAnsiEscapeCodes();
-        }
-    };
+    const color = detect();
 
     expectEqualBytes(expected, actual, offset) catch |err| switch (err) {
         error.TestExpectedEqual => {
-            format(formatter, expected, null, color);
-            format(formatter, actual, expected, color);
+            format(gen, expected, null, color);
+            format(gen, actual, expected, color);
             return err;
         },
-        else => return err,
+    };
+}
+
+fn detect() bool {
+    const io = std.testing.io;
+    var env = std.testing.environ.createMap(std.testing.allocator) catch unreachable;
+    defer env.deinit();
+
+    const val = env.get("ZIG_DEBUG_COLOR");
+    if (val != null and val.?.len != 0) return true;
+
+    const NO_COLOR = std.zig.EnvVar.NO_COLOR.isSet(&env);
+    const CLICOLOR_FORCE = std.zig.EnvVar.CLICOLOR_FORCE.isSet(&env);
+
+    const stderr = std.Io.File.stderr().writer(io, &.{});
+    return switch (std.Io.Terminal.Mode.detect(
+        io,
+        stderr.file,
+        NO_COLOR,
+        CLICOLOR_FORCE,
+    ) catch unreachable) {
+        .escape_codes => true,
+        else => false,
     };
 }
 
@@ -927,7 +1264,7 @@ fn expectEqualBytes(expected: []const u8, actual: []const u8, offset: usize) !vo
     for (offset..@min(expected.len, actual.len)) |i| {
         if (expected[i] != actual[i]) {
             print(
-                "index {} incorrect. expected 0x{X:0>2}, found 0x{X:0>2}\n",
+                "index {d} incorrect. expected 0x{X:0>2}, found 0x{X:0>2}\n",
                 .{ i, expected[i], actual[i] },
             );
             return error.TestExpectedEqual;
@@ -942,8 +1279,6 @@ fn expectEqualBytes(expected: []const u8, actual: []const u8, offset: usize) !vo
     }
 }
 
-const endian = builtin.target.cpu.arch.endian();
-
 fn N(e: anytype) u8 {
     return @intFromEnum(e);
 }
@@ -951,76 +1286,90 @@ fn N(e: anytype) u8 {
 const p1 = Player.P1;
 const p2 = Player.P2;
 
-const gen1 = struct {
-    pub usingnamespace @import("../gen1/data.zig");
-    pub const helpers = @import("../gen1/helpers.zig");
-};
+var buf: [pkmn.LOGS_SIZE]u8 = undefined;
+var writer: Writer = .{ .buffer = &buf };
+var log: FixedLog = .{ .writer = &writer };
 
-var buf: [gen1.LOGS_SIZE]u8 = undefined;
-var stream = ByteStream{ .buffer = &buf };
-var log: FixedLog = .{ .writer = stream.writer() };
+const gen1 = pkmn.gen1;
+const gen2 = pkmn.gen2;
 
-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(gen1Formatter, expected, actual, 0);
+    return expectLog(gen1, expected, actual, 0);
+}
+
+fn expectLog2(expected: []const u8, actual: []const u8) !void {
+    return expectLog(gen2, expected, actual, 0);
 }
 
-fn gen1Formatter(kind: Kind, byte: u8) []const u8 {
+fn formatter(comptime gen: anytype, kind: Kind, byte: u8) []const u8 {
     return switch (kind) {
-        .Move => @tagName(@as(M, @enumFromInt(byte))),
-        .Species => @tagName(@as(S, @enumFromInt(byte))),
-        .Type => @tagName(@as(gen1.Type, @enumFromInt(byte))),
-        .Status => gen1.Status.name(byte),
+        .Move => @tagName(@as(gen.Move, @enumFromInt(byte))),
+        .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();
+    writer.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();
+    writer.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),
         },
         buf[0..6],
     );
-    stream.reset();
+    writer.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),
         },
         buf[0..6],
     );
-    stream.reset();
+    writer.reset();
 }
 
 test "|switch|" {
@@ -1029,333 +1378,495 @@ 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();
+    writer.reset();
 
     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();
+    writer.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();
+    writer.reset();
+
+    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.switched(.{ p2.ident(3), &blissey });
+    expected = &(.{
+        N(ArgType.Switch),
+        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]);
+    writer.reset();
 }
 
 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();
+    writer.reset();
 
-    try log.disabled(p1.ident(2), M.Earthquake);
-    try expectLog1(&.{ N(ArgType.Cant), 2, N(Cant.Disable), N(M.Earthquake) }, buf[0..4]);
-    stream.reset();
+    try log.cant(.{ p1.ident(2), .Disable, M1.Earthquake });
+    try expectLog1(&.{ N(ArgType.Cant), 2, N(Cant.Disable), N(M1.Earthquake) }, buf[0..4]);
+    writer.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();
+    writer.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();
+    writer.reset();
 }
 
 test "|turn|" {
-    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) },
+    try log.turn(.{42});
+    const expected = switch (endian) {
+        .big => &.{ N(ArgType.Turn), 0, 42, N(ArgType.None) },
+        .little => &.{ N(ArgType.Turn), 42, 0, N(ArgType.None) },
     };
     try expectLog1(expected, buf[0..4]);
-    stream.reset();
+    writer.reset();
 }
 
 test "|win|" {
-    try log.win(.P2);
+    try log.win(.{.P2});
     try expectLog1(&.{ N(ArgType.Win), 1, N(ArgType.None) }, buf[0..3]);
-    stream.reset();
+    writer.reset();
 }
 
 test "|tie|" {
-    try log.tie();
+    try log.tie(.{});
     try expectLog1(&.{ N(ArgType.Tie), N(ArgType.None) }, buf[0..2]);
-    stream.reset();
+    writer.reset();
 }
 
 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) },
+        .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) },
     };
     try expectLog1(expected, buf[0..8]);
-    stream.reset();
+    writer.reset();
 
     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) },
+        .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) },
     };
     try expectLog1(expected, buf[0..8]);
-    stream.reset();
+    writer.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 },
+        .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 },
     };
     try expectLog1(expected, buf[0..9]);
-    stream.reset();
+    writer.reset();
 }
 
 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) },
+        .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) },
     };
     try expectLog1(expected, buf[0..8]);
-    stream.reset();
+    writer.reset();
 
     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) },
+        .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) },
     };
     try expectLog1(expected, buf[0..8]);
-    stream.reset();
+    writer.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 },
+        .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 },
     };
     try expectLog1(expected, buf[0..9]);
-    stream.reset();
+    writer.reset();
 }
 
 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();
+    writer.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();
+    writer.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();
+    writer.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();
+    writer.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,
         0b10001000,
         N(CureStatus.Silent),
     }, buf[0..4]);
-    stream.reset();
+    writer.reset();
 }
 
 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();
+    writer.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();
+    writer.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();
+    writer.reset();
 }
 
 test "|-clearallboost|" {
-    try log.clearallboost();
+    try log.clearallboost(.{});
     try expectLog1(&.{N(ArgType.ClearAllBoost)}, buf[0..1]);
-    stream.reset();
+    writer.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();
+    writer.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();
+    writer.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();
+    writer.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();
+    writer.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();
+    writer.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();
+    writer.reset();
 }
 
 test "|-prepare|" {
-    try log.prepare(p2.ident(2), M.Dig);
-    try expectLog1(&.{ N(ArgType.Prepare), 0b1010, N(M.Dig) }, buf[0..3]);
-    stream.reset();
+    try log.prepare(.{ p2.ident(2), M1.Dig });
+    try expectLog1(&.{ N(ArgType.Prepare), 0b1010, N(M1.Dig) }, buf[0..3]);
+    writer.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();
+    writer.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();
+    writer.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();
+    writer.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();
+    writer.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();
+    writer.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]);
+    writer.reset();
+
+    try log.activate(.{ p1.ident(3), .Magnitude, 5 });
+    try expectLog1(&.{ N(ArgType.Activate), 0b0011, N(Activate.Magnitude), 5 }, buf[0..4]);
+    writer.reset();
 }
 
 test "|-fieldactivate|" {
-    try log.fieldactivate();
+    try log.fieldactivate(.{});
     try expectLog1(&.{N(ArgType.FieldActivate)}, buf[0..1]);
-    stream.reset();
+    writer.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();
+    writer.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));
+    writer.reset();
+
+    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));
+    writer.reset();
+
+    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();
+    writer.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]);
-    stream.reset();
+    try log.start(.{ p1.ident(2), .Disable, M1.Surf });
+    try expectLog1(&.{ N(ArgType.Start), 0b0010, N(Start.Disable), N(M1.Surf) }, buf[0..4]);
+    writer.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]);
-    stream.reset();
+    try log.start(.{ p1.ident(2), .Mimic, M1.Surf });
+    try expectLog1(&.{ N(ArgType.Start), 0b0010, N(Start.Mimic), N(M1.Surf) }, buf[0..4]);
+    writer.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();
+    writer.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();
+    writer.reset();
 }
 
 test "|-ohko|" {
-    try log.ohko();
+    try log.ohko(.{});
     try expectLog1(&.{N(ArgType.OHKO)}, buf[0..1]);
-    stream.reset();
+    writer.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();
+    writer.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();
+    writer.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();
+    writer.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();
+    writer.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();
+    writer.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();
+    writer.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]);
+    writer.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]);
+    writer.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]);
+    writer.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]);
+    writer.reset();
+}
+
+test "|-cureteam|" {
+    try log.cureteam(.{p2.ident(5)});
+    try expectLog2(&.{ N(ArgType.CureTeam), 0b1101 }, buf[0..2]);
+    writer.reset();
+}
+
+test "|-sethp|" {
+    var blissey = gen2.helpers.Pokemon.init(.{ .species = .Blissey, .moves = &.{.PainSplit} });
+    blissey.hp = 612;
+    try log.sethp(.{ p2.ident(2), &blissey, .Silent });
+    const 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]);
+    writer.reset();
+}
+
+test "|-setboost|" {
+    try log.setboost(.{ p2.ident(6), 6 });
+    try expectLog2(&.{ N(ArgType.SetBoost), 0b1110, 12 }, buf[0..3]);
+    writer.reset();
+
+    try log.setboost(.{ p2.ident(3), 2 });
+    try expectLog2(&.{ N(ArgType.SetBoost), 0b1011, 8 }, buf[0..3]);
+    writer.reset();
+}
+
+test "|-copyboost|" {
+    try log.copyboost(.{ p2.ident(3), p1.ident(6) });
+    try expectLog2(&.{ N(ArgType.CopyBoost), 0b1011, 0b0110 }, buf[0..3]);
+    writer.reset();
+}
+
+test "|-sidestart|" {
+    try log.sidestart(.{ .P2, .Reflect });
+    try expectLog2(&.{ N(ArgType.SideStart), 1, N(Side.Reflect) }, buf[0..3]);
+    writer.reset();
+}
+
+test "|-sideend|" {
+    try log.sideend(.{ .P2, .LightScreen });
+    try expectLog2(&.{ N(ArgType.SideEnd), 1, N(Side.LightScreen) }, buf[0..3]);
+    writer.reset();
+
+    try log.sideend(.{ .P1, .Spikes, p1.ident(3) });
+    try expectLog2(&.{
+        N(ArgType.SideEnd),
+        0,
+        N(Side.Spikes),
+        0b0011,
+    }, buf[0..4]);
+    writer.reset();
+}
+
+test "|-singlemove|" {
+    try log.singlemove(.{ p2.ident(2), M2.DestinyBond });
+    try expectLog2(&.{ N(ArgType.SingleMove), 0b1010, N(M2.DestinyBond) }, buf[0..3]);
+    writer.reset();
+}
+
+test "|-singleturn|" {
+    try log.singleturn(.{ p1.ident(3), M2.Protect });
+    try expectLog2(&.{ N(ArgType.SingleTurn), 0b0011, N(M2.Protect) }, buf[0..3]);
+    writer.reset();
+}
+
+test "|-weather|" {
+    try log.weather(.{ W2.Rain, .Upkeep });
+    try expectLog2(&.{ N(ArgType.Weather), N(W2.Rain), N(Weather.Upkeep) }, buf[0..3]);
+    writer.reset();
+
+    try log.weather(.{ W2.None, .None });
+    try expectLog2(&.{ N(ArgType.Weather), N(W2.None), N(Weather.None) }, buf[0..3]);
+    writer.reset();
 }