@pkmn/engine 0.1.0-dev.2c13d3ec → 0.1.0-dev.305a932f

package/README.md

@@ -12,6 +12,14 @@
     <img alt="License" src="https://img.shields.io/badge/License-MIT-blue.svg" />
   </a>
 </p>
+
+> [!WARNING]  
+> **This project is under heavy development** and currently the `main` branch contains numerous breaking
+> changes which may not work and which are not fully documented. Please **wait for the forthcoming
+> initial v0.1 release** before depending on this project (code from the
+> [`old`](https://github.com/pkmn/engine/releases/tag/old) tag can also be used to experiment with a
+> more stable version of the codebase).
+
 <hr />
 
 A minimal, complete, Pokémon battle simulation engine optimized for performance and
@@ -49,9 +57,9 @@ $ zig build --prefix /usr/local -Doptimize=ReleaseFast
 ```
 
 The Zig website has [installation instructions](https://ziglang.org/learn/getting-started/) which
-walk through how to install Zig on each platform - the engine code should work on Zig v0.11.0 dev
-build 3859 or greater, though tracks Zig's master branch so this may change in the future if
-breaking language changes are introduced:
+walk through how to install Zig on each platform - the engine code should work on Zig v0.11.0 or
+greater, though tracks Zig's master branch so this may change in the future if breaking language
+changes are introduced.
 
 `libpkmn` can be built with `-Dshowdown` to instead produce the Pokémon Showdown compatible
 `libpkmn-showdown` library. Furthermore, protocol message logging can be enabled through `-Dlog`.
@@ -67,12 +75,12 @@ $ npm install @pkmn/engine
 ```
 
 The driver depends on being able to find compiled Node/WASM addons in
-`node_modules/@pkmn/engine/build/lib` in order to be useful. When you install the package a
-[`postinstall` lifecycle script](https://docs.npmjs.com/cli/v8/using-npm/scripts) will run
-[`install-pkmn-engine`](src/bin/install-pkmn-engine) which will check for a compatible `zig`
-compiler (see above regarding minimum version) and download one to
-`node_module/@pkmn/engine/build/bin` if it can't find one, as well as looking for (and downloading,
-if necessary) the required Node headers needed to successfully build the addons natively.
+`node_modules/@pkmn/engine/build/lib` to be useful. When you install the package a [`postinstall`
+lifecycle script](https://docs.npmjs.com/cli/v8/using-npm/scripts) runs
+[`install-pkmn-engine`](src/bin/install-pkmn-engine) which checks for a compatible `zig` compiler
+(see earlier regarding minimum version) and download one to `node_module/@pkmn/engine/build/bin` if
+it can't find one, as well as looking for (and downloading, if necessary) the required Node headers
+needed to successfully build the addons natively.
 
 **If you have configured `npm` to `--ignore-scripts` you must either run `npx install-pkmn-engine`
 directly or build the addons manually and place the artifacts in the expected paths.**
@@ -100,7 +108,7 @@ configuring whether or not Pokémon Showdown compatibility mode or protocol mess
 enabled. Alternatively, you may set options via a `pkmn_options` [root source file
 declaration](https://ziglang.org/documentation/master/#Root-Source-File). There are several
 undocumented internal options that can be tweaked as well via build or root options, though these
-options are not officially supported, affect correctness, and may change meaning or behavior without
+options aren't officially supported, affect correctness, and may change meaning or behavior without
 warning. Use at your own risk.
 
 ```zig
@@ -112,11 +120,11 @@ pub const pkmn_options = .{ .showdown = true, .log = true };
 For each Pokémon generation, the engine provides a battle structure with two functions - a function
 to `update` the battle's state based on both players' choices and a function that defines which
 `choices` are valid at that decision point (at the beginning of a battle both player's must "pass"
-as their first choice in order to switch in the first member of their party). If `-Dlog` protocol
-logging is enabled each update will produce logs which can be decoded into a buffer (`LOGS_SIZE`
-constants are provided to make it easy to allocate a buffer of the correct size). Each `update` will
-return a result to indicate either that the battle has terminated or which types of choices will be
-available for each player.
+as their first choice to switch in the first member of their party). If `-Dlog` protocol logging is
+enabled each update produces logs which can be decoded into a buffer (`LOGS_SIZE` constants are
+provided to make it easy to allocate a buffer of the correct size). Each `update` returns a result
+to indicate either that the battle has terminated or which types of choices are available for each
+player.
 
 Unlike [Pokémon Showdown's
 SIM-PROTOCOL](https://github.com/smogon/pokemon-showdown/blob/master/sim/SIM-PROTOCOL.md#choice-requests)
@@ -128,7 +136,7 @@ state or cause the engine to crash.**
 
 Battles may be played out from any point but to freshly initialize a battle which is yet to start
 the turn count and active Pokémon should be zeroed out (driver code should handle this for you).
-Most driver code should also provide helpers to make initialize a battle convenient - check the
+Most driver code should also provide helpers to make initializing battle convenient - check the
 respective documentation and examples for the bindings being used. The engine's [protocol
 documentation](docs/PROTOCOL.md) goes into greater detail on the specifics of updates and the
 potential logs that may result.
@@ -140,7 +148,7 @@ potential logs that may result.
 
 [`pkmn.h`](src/include/pkmn.h) exports the C API for `libpkmn`. Symbols are all prefixed with
 `pkmn_` to avoid name collisions. If `-Dlog` is enabled and logging throws an error then the error
-will be encoded in the `pkmn_result` and can be checked with `pkmn_error`.
+is encoded in the `pkmn_result` and can be checked with `pkmn_error`.
 
 ```c
 #include <pkmn.h>
@@ -161,17 +169,17 @@ if (pkmn_error(result)) exit(1);
 
 [(full code)](src/examples/c/example.c)
 
-The C API does not export any helpers for creating or accessing the opaque battle objects - it is
+The C API doesn't export any helpers for creating or accessing the opaque battle objects - it's
 instead intended to be used as the foundation for more ergonomic bindings in [other
 languages](#other) (the lack of namespaces and bit fields having an implementation-defined layout in
 C are the main contributing factors to the sparseness of what `libpkmn` chooses to expose).
 
 ### JavaScript / TypeScript
 
-`@pkmn/engine` depends on the [`@pkmn/data`](https://www.npmjs.com/package/@pkmn/data) which
+`@pkmn/engine` depends on the [`@pkmn/data`](https://www.npmjs.com/package/@pkmn/data) package which
 requires a `Dex` implementation to be provided as well. The `Battle.create` function can be used to
 initialize a `Battle` from the beginning, or `Battle.restore` can be used to re-instantiate a battle
-which is in already progress. If logging is enabled the output can be turned into Pokémon Showdown
+which is already in progress. If logging is enabled the output can be turned into Pokémon Showdown
 protocol via `Log.parse`.
 
 ```ts
@@ -196,18 +204,18 @@ console.log(result);
 
 [(full code)](src/examples/js/example.ts)
 
-By default, the `@pkmn/engine` package will compile the engine with `-Dshowdown`, though by running
+By default, the `@pkmn/engine` package compiles the engine with `-Dshowdown`, though by running
 `install-pkmn-engine` directly and passing in `--options` you can override this default and build
 different configurations of the extension for the driver to use. The driver can support
 configurations both with and without Pokémon Showdown compatibility simultaneously if present. On
-update, the post-install script will attempt to rebuild whichever extensions it finds with the same
+update, the post-install script attempts to rebuild whichever extensions it finds with the same
 configuration parameters that were originally used meaning updating to the newest version of the
 library should be seamless.
 
 Despite relying on the native engine code, the `@pkmn/engine` code is designed to also work in
 browsers which support [WebAssembly](https://webassembly.org/). Running `npm run start:web` from the
-[`examples`](src/examples/js) directory will start a server that can be used to demonstrate the
-engine running in the browser.
+[`examples`](src/examples/js) directory starts a server that can be used to demonstrate the engine
+running in the browser.
 
 ### Zig
 
@@ -240,7 +248,7 @@ std.debug.print("{}\n", .{result.type});
 
 The Zig package also supports some APIs which are difficult to expose elsewhere such as the
 `FixedRNG` which allows you to fully specify the exact RNG frames (which can be useful for ensuring
-certain outcomes/effects always occur) for a battle, though doing so will change the size of the
+certain outcomes/effects always occur) for a battle, though doing so changes the size of the
 `Battle` object.
 
 ### Other
@@ -251,7 +259,7 @@ simplify the process even further [`src/data`](src/data) contains JSON dumps of
 data, structure sizes and offsets, and protocol information used by the reference driver code. The
 following is a list of known `libpkmn` bindings written by developers outside of the [pkmn
 organization](https://github.com/pkmn) that may be helpful (though note that these projects may not
-necessarily be up-to-date/complete/correct - inclusion in this list does not imply endorsement):
+necessarily be up-to-date/complete/correct - inclusion in this list doesn't imply endorsement):
 
 | Language   | License   | URL                                  |
 | ---------- | --------- | ------------------------------------ |
@@ -279,7 +287,7 @@ By default, `pkmn-debug` expects to read [binary debug protocol](docs/PROTOCOL.m
 $ <cmd> | pkmn-debug > index.html
 ```
 
-Alternatively, if a single filename argument is passed to the `pkmn-debug` it will read from that
+Alternatively, if a single filename argument is passed to the `pkmn-debug` it reads from that
 instead:
 
 ```sh
@@ -301,14 +309,14 @@ Currently, most of the foundational work from stage 0 is done:
   
 - [benchmark and integration testing](src/test) infrastructure
 - [documentation](docs) about design, research, methodology, etc
-- definition and implementation of the [protocol](docs/PROTOCOL.md) that will be used by the engine
+- definition and implementation of the [protocol](docs/PROTOCOL.md) that's used by the engine
 
-**Stage 1 is currently in progress** and will see the implementation of the actual Generation I & II
+**Stage 1 is currently in progress** and involves the implementation of the actual Generation I & II
 battle engines, followed by Generation III & IV in stage 2. The implementation of further Pokémon
-generations is in scope for the project but should not be considered as part of the immediate
-roadmap (i.e. exploring the options for broadening support for old generation APIs will be given
-higher priority than implementing more modern generations). Furthermore, implementation of modern
-generations is soft-blocked on the [availability of high quality
+generations is in scope for the project but shouldn't be considered part of the immediate roadmap
+(i.e. exploring the options for broadening support for old generation APIs is given higher priority
+than implementing more modern generations). Furthermore, implementation of modern generations is
+soft-blocked on the [availability of high quality
 decompilations](https://github.com/orgs/pret/repositories) of the original games in question.
 
 Certain features will always be deemed **out of scope**:
@@ -326,10 +334,10 @@ The pkmn engine is distributed under the terms of the [MIT License](LICENSE).
 [^1]: In the case of Pokémon Showdown, only bugs which stem from a misimplementation of specific
   effects are reproduced in the engine, bugs which are the result of a misunderstanding of the
   fundamental mechanics of Pokémon or which simply arise due to specific Pokémon Showdown
-  implementation details that are not replicable without making the same (incorrect) architectural
-  choices are not. Furthermore, the "Pokémon Showdown" code referenced by this project includes
+  implementation details that aren't replicable without making the same (incorrect) architectural
+  choices aren't. Furthermore, the "Pokémon Showdown" code referenced by this project includes
   several [patches](docs/TESTING.md#patches) to improve accuracy and smooth over some of the more
   egregious implementation issues. In practical terms, the vast majority of games played out in the
-  pkmn engine's compatibility mode and on this patched Pokémon Showdown simulator will be the same,
-  it is only in a well defined and documented set of circumstances where the two implementations
+  pkmn engine's compatibility mode and on this patched Pokémon Showdown simulator are the same,
+  it's only in a well defined and documented set of circumstances where the two implementations
   diverge.

package/build/pkg/data/ids.json

@@ -20,15 +20,15 @@
     },
     {
         "types": [
+            "Ground",
+            "Rock",
+            "Steel",
             "Normal",
             "Fighting",
             "Flying",
             "Poison",
-            "Ground",
-            "Rock",
             "Bug",
             "Ghost",
-            "Steel",
             "???",
             "Fire",
             "Water",
@@ -40,15 +40,15 @@
             "Dark"
         ],
         "items": [
+            "softsand",
+            "hardstone",
+            "metalcoat",
             "pinkbow",
             "blackbelt",
             "sharpbeak",
             "poisonbarb",
-            "softsand",
-            "hardstone",
             "silverpowder",
             "spelltag",
-            "metalcoat",
             "polkadotbow",
             "charcoal",
             "mysticwater",
@@ -65,21 +65,21 @@
             "stick",
             "thickclub",
             "focusband",
-            "berryjuice",
             "scopelens",
             "leftovers",
             "berserkgene",
             "lightball",
+            "berry",
+            "berryjuice",
+            "goldberry",
+            "mintberry",
             "psncureberry",
             "przcureberry",
-            "burntberry",
             "iceberry",
-            "bitterberry",
-            "mintberry",
+            "burntberry",
             "miracleberry",
+            "bitterberry",
             "mysteryberry",
-            "berry",
-            "goldberry",
             "masterball",
             "ultraball",
             "greatball",

package/build/pkg/data/protocol.json

@@ -70,7 +70,8 @@
         "Burst",
         "ClearPositiveBoost",
         "CanDynamax",
-        "SwapSideConditions"
+        "SwapSideConditions",
+        "Terastallize"
     ],
     "Move": [
         "None",
@@ -84,12 +85,14 @@
         "Flinch",
         "Disable",
         "Recharge",
-        "PP"
+        "PP",
+        "Attract"
     ],
     "Heal": [
         "None",
         "Silent",
-        "Drain"
+        "Drain",
+        "Leftovers"
     ],
     "Damage": [
         "None",
@@ -97,7 +100,13 @@
         "Burn",
         "Confusion",
         "LeechSeed",
-        "RecoilOf"
+        "RecoilOf",
+        "Bind",
+        "Wrap",
+        "FireSpin",
+        "Clamp",
+        "Whirlpool",
+        "Spikes"
     ],
     "Status": [
         "None",
@@ -136,7 +145,15 @@
         "Mist",
         "Struggle",
         "Substitute",
-        "Splash"
+        "Splash",
+        "Attract",
+        "LockOn",
+        "Bind",
+        "Wrap",
+        "FireSpin",
+        "Clamp",
+        "Whirlpool",
+        "BeatUp"
     ],
     "Start": [
         "Bide",
@@ -150,24 +167,64 @@
         "Substitute",
         "TypeChange",
         "Disable",
-        "Mimic"
+        "Mimic",
+        "Nightmare",
+        "Curse",
+        "Foresight",
+        "Encore",
+        "FutureSight",
+        "PerishSong3Silent",
+        "PerishSong3",
+        "PerishSong2",
+        "PerishSong1",
+        "PerishSong0"
     ],
     "End": [
         "Disable",
         "Confusion",
         "Bide",
         "Substitute",
+        "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"
     ],
     "Immune": [
         "None",
         "OHKO"
+    ],
+    "EndItem": [
+        "None",
+        "Eat"
+    ],
+    "SetHP": [
+        "None",
+        "Silent"
+    ],
+    "Side": [
+        "Safeguard",
+        "Reflect",
+        "LightScreen",
+        "Spikes"
+    ],
+    "Weather": [
+        "None",
+        "Upkeep"
     ]
 }

package/build/pkg/data.d.ts

@@ -2,11 +2,11 @@ import { Generation, ID, TypeName } from '@pkmn/data';
 export declare const LE: boolean;
 export type IDs = [
     {
-        types: TypeName[];
+        types: Exclude<TypeName, 'Dark' | 'Steel' | 'Fairy'>[];
     },
     {
         items: ID[];
-        types: TypeName[];
+        types: Exclude<TypeName, 'Fairy'>[];
     }
 ];
 export declare const IDS: IDs;

package/build/pkg/protocol.js

@@ -99,6 +99,7 @@ class Log {
     }
 }
 exports.Log = Log;
+const GENDERS = ['M', 'F', 'N'];
 const CANT = new Array(data_1.PROTOCOL.Cant.length);
 CANT[data_1.PROTOCOL.Cant.Sleep] = 'slp';
 CANT[data_1.PROTOCOL.Cant.Freeze] = 'frz';
@@ -129,37 +130,51 @@ FAIL[data_1.PROTOCOL.Fail.Burn] = 'brn';
 FAIL[data_1.PROTOCOL.Fail.Freeze] = 'frz';
 FAIL[data_1.PROTOCOL.Fail.Paralysis] = 'par';
 FAIL[data_1.PROTOCOL.Fail.Toxic] = 'tox';
-const ACTIVATE = new Array(data_1.PROTOCOL.Activate.length);
-ACTIVATE[data_1.PROTOCOL.Activate.Bide] = 'Bide';
-ACTIVATE[data_1.PROTOCOL.Activate.Confusion] = 'confusion';
-ACTIVATE[data_1.PROTOCOL.Activate.Haze] = 'move: Haze';
-ACTIVATE[data_1.PROTOCOL.Activate.Mist] = 'move: Mist';
-ACTIVATE[data_1.PROTOCOL.Activate.Struggle] = 'move: Struggle';
-ACTIVATE[data_1.PROTOCOL.Activate.Substitute] = 'Substitute';
-ACTIVATE[data_1.PROTOCOL.Activate.Splash] = 'move: Splash';
-const START = new Array(data_1.PROTOCOL.Start.length);
-START[data_1.PROTOCOL.Start.Bide] = 'Bide';
-START[data_1.PROTOCOL.Start.Confusion] = 'confusion';
-START[data_1.PROTOCOL.Start.ConfusionSilent] = 'confusion';
-START[data_1.PROTOCOL.Start.FocusEnergy] = 'move: Focus Energy';
-START[data_1.PROTOCOL.Start.LeechSeed] = 'move: Leech Seed';
-START[data_1.PROTOCOL.Start.LightScreen] = 'Light Screen';
-START[data_1.PROTOCOL.Start.Mist] = 'Mist';
-START[data_1.PROTOCOL.Start.Reflect] = 'Reflect';
-START[data_1.PROTOCOL.Start.Substitute] = 'Substitute';
-const END = new Array(data_1.PROTOCOL.End.length);
-END[data_1.PROTOCOL.End.Disable] = 'Disable';
-END[data_1.PROTOCOL.End.Confusion] = 'confusion';
-END[data_1.PROTOCOL.End.Bide] = 'Bide';
-END[data_1.PROTOCOL.End.Substitute] = 'Substitute';
-END[data_1.PROTOCOL.End.DisableSilent] = 'Disable';
-END[data_1.PROTOCOL.End.ConfusionSilent] = 'confusion';
-END[data_1.PROTOCOL.End.Mist] = 'Mist';
-END[data_1.PROTOCOL.End.FocusEnergy] = 'move: Focus Energy';
-END[data_1.PROTOCOL.End.LeechSeed] = 'move: Leech Seed';
-END[data_1.PROTOCOL.End.Toxic] = 'Toxic counter';
-END[data_1.PROTOCOL.End.LightScreen] = 'Light Screen';
-END[data_1.PROTOCOL.End.Reflect] = 'Reflect';
+const ACTIVATE = [new Array(data_1.PROTOCOL.Activate.length)];
+ACTIVATE[0][data_1.PROTOCOL.Activate.Bide] = 'Bide';
+ACTIVATE[0][data_1.PROTOCOL.Activate.Confusion] = 'confusion';
+ACTIVATE[0][data_1.PROTOCOL.Activate.Haze] = 'move: Haze';
+ACTIVATE[0][data_1.PROTOCOL.Activate.Mist] = 'move: Mist';
+ACTIVATE[0][data_1.PROTOCOL.Activate.Struggle] = 'move: Struggle';
+ACTIVATE[0][data_1.PROTOCOL.Activate.Substitute] = 'Substitute';
+ACTIVATE[0][data_1.PROTOCOL.Activate.Splash] = 'move: Splash';
+ACTIVATE[1] = ACTIVATE[0].slice(0);
+ACTIVATE[1][data_1.PROTOCOL.Activate.Bide] = 'move: Bide';
+const START = [new Array(data_1.PROTOCOL.Start.length)];
+START[0][data_1.PROTOCOL.Start.Bide] = 'Bide';
+START[0][data_1.PROTOCOL.Start.Confusion] = 'confusion';
+START[0][data_1.PROTOCOL.Start.ConfusionSilent] = 'confusion';
+START[0][data_1.PROTOCOL.Start.FocusEnergy] = 'move: Focus Energy';
+START[0][data_1.PROTOCOL.Start.LeechSeed] = 'move: Leech Seed';
+START[0][data_1.PROTOCOL.Start.LightScreen] = 'Light Screen';
+START[0][data_1.PROTOCOL.Start.Mist] = 'Mist';
+START[0][data_1.PROTOCOL.Start.Reflect] = 'Reflect';
+START[0][data_1.PROTOCOL.Start.Substitute] = 'Substitute';
+START[1] = START[0].slice(0);
+START[1][data_1.PROTOCOL.Start.Bide] = 'move: Bide';
+const END = [new Array(data_1.PROTOCOL.End.length)];
+END[0][data_1.PROTOCOL.End.Disable] = 'Disable';
+END[0][data_1.PROTOCOL.End.Confusion] = 'confusion';
+END[0][data_1.PROTOCOL.End.Bide] = 'Bide';
+END[0][data_1.PROTOCOL.End.Substitute] = 'Substitute';
+END[0][data_1.PROTOCOL.End.DisableSilent] = 'Disable';
+END[0][data_1.PROTOCOL.End.ConfusionSilent] = 'confusion';
+END[0][data_1.PROTOCOL.End.MistSilent] = 'Mist';
+END[0][data_1.PROTOCOL.End.FocusEnergySilent] = 'move: Focus Energy';
+END[0][data_1.PROTOCOL.End.LeechSeedSilent] = 'move: Leech Seed';
+END[0][data_1.PROTOCOL.End.ToxicSilent] = 'Toxic counter';
+END[0][data_1.PROTOCOL.End.LightScreenSilent] = 'Light Screen';
+END[0][data_1.PROTOCOL.End.ReflectSilent] = 'Reflect';
+END[0][data_1.PROTOCOL.End.BideSilent] = 'move: Bide';
+END[1] = END[0].slice(0);
+END[1][data_1.PROTOCOL.End.Disable] = 'move: Disable';
+END[1][data_1.PROTOCOL.End.Bide] = 'move: Bide';
+END[1][data_1.PROTOCOL.End.LeechSeed] = 'Leech Seed';
+const SIDE = new Array(data_1.PROTOCOL.Side.length);
+SIDE[data_1.PROTOCOL.Side.Safeguard] = 'Safeguard';
+SIDE[data_1.PROTOCOL.Side.Reflect] = 'Reflect';
+SIDE[data_1.PROTOCOL.Side.LightScreen] = 'move: Light Screen';
+SIDE[data_1.PROTOCOL.Side.Spikes] = 'Spikes';
 const DECODERS = new Array(ArgType.length);
 DECODERS[ArgType.Move] = function (offset, data) {
     const source = decodeIdent(this.info, data.getUint8(offset++));
@@ -179,7 +194,7 @@ DECODERS[ArgType.Move] = function (offset, data) {
 DECODERS[ArgType.Switch] = function (offset, data) {
     const ident = decodeIdent(this.info, data.getUint8(offset++));
     const details = decodeDetails(offset, data, this.gen, this.lookup);
-    offset += 2;
+    offset += this.gen.num > 1 ? 3 : 2;
     const hpStatus = decodeHPStatus(offset, data);
     offset += 5;
     const args = ['switch', ident, details, hpStatus];
@@ -334,9 +349,10 @@ DECODERS[ArgType.Activate] = function (offset, data) {
     const ident = decodeIdent(this.info, data.getUint8(offset++));
     const reason = data.getUint8(offset++);
     const type = reason === data_1.PROTOCOL.Activate.Mist ? '-block' : '-activate';
+    const activate = ACTIVATE[this.gen.num - 1];
     const args = reason === data_1.PROTOCOL.Activate.Splash
-        ? [type, '', ACTIVATE[reason]]
-        : [type, ident, ACTIVATE[reason], ''];
+        ? [type, '', activate[reason]]
+        : [type, ident, activate[reason], ''];
     const kwArgs = reason === data_1.PROTOCOL.Activate.Substitute ? { damage: true } : {};
     return { offset, line: { args, kwArgs } };
 };
@@ -351,7 +367,7 @@ DECODERS[ArgType.Start] = function (offset, data) {
     let args;
     const kwArgs = {};
     if (reason < data_1.PROTOCOL.Start.TypeChange) {
-        args = ['-start', ident, START[reason]];
+        args = ['-start', ident, START[this.gen.num - 1][reason]];
         if (reason === data_1.PROTOCOL.Start.ConfusionSilent)
             kwArgs.silent = true;
     }
@@ -372,7 +388,7 @@ DECODERS[ArgType.Start] = function (offset, data) {
 DECODERS[ArgType.End] = function (offset, data) {
     const ident = decodeIdent(this.info, data.getUint8(offset++));
     const reason = data.getUint8(offset++);
-    const args = ['-end', ident, END[reason]];
+    const args = ['-end', ident, END[this.gen.num - 1][reason]];
     const kwArgs = reason >= data_1.PROTOCOL.End.DisableSilent ? { silent: true } : {};
     return { offset, line: { args, kwArgs } };
 };
@@ -411,8 +427,11 @@ function decodeIdent(info, byte) {
 }
 function decodeDetails(offset, data, gen, lookup) {
     const species = gen.species.get(lookup.speciesByNum(data.getUint8(offset++))).name;
+    const gender = gen.num > 1 ? GENDERS[data.getUint8(offset++)] : 'N';
     const level = data.getUint8(offset);
-    return (level === 100 ? species : `${species}, L${level}`);
+    const mf = gender === 'N' ? '' : `, ${gender}`;
+    const lvl = level === 100 ? '' : `, L${level}`;
+    return `${species}${mf}${lvl}`;
 }
 function decodeHPStatus(offset, data) {
     const hp = data.getUint16(offset, data_1.LE);