@pkmn/engine 0.1.0-dev.979a393a → 0.1.0-dev.a324c50f

package/README.md

@@ -18,7 +18,7 @@ A minimal, complete, Pokémon battle simulation engine optimized for performance
 [designed](docs/DESIGN.md) for tooling, embedded systems, and [artificial
 intelligence](https://github.com/pkmn/0-ERROR) use cases. This engine aims to be a frame-accurate and
 [bug-for-bug compatible](http://www.catb.org/jargon/html/B/bug-for-bug-compatible.html)
-implementation of both Pokémon battles as defined by the original game code, and the [Pokémon
+implementation of both Pokémon battles as defined by the original game code and the [Pokémon
 Showdown](https://pokemonshowdown.com/)[^1] simulator which represents Pokémon battling as practically
 interpreted online.
 
@@ -50,13 +50,13 @@ $ 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 2168 or greater, though tracks Zig's master branch so this may change in the future if
+build 3859 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, trace logging can be enabled through `-Dtrace`. The
-`libpkmn` and `libpkmn-showdown` objects available in the binary release are compiled with and
-without the `-Dtrace` flag respectively.
+`libpkmn-showdown` library. Furthermore, protocol message logging can be enabled through `-Dlog`.
+The `libpkmn` and `libpkmn-showdown` objects available in the binary release are both compiled with
+the `-Dlog` flag by default.
 
 ### `@pkmn/engine`
 
@@ -88,23 +88,23 @@ adding the following to your `build.zig`:
 const std = @import("std");
 const pkmn = @import("lib/pkmn/build.zig");
 
-pub fn build(b: *std.build.Builder) void {
+pub fn build(b: *std.Build) void {
     ...
-    exe.addModule("pkmn", pkmn.module(b, .{ .showdown = true, .trace = true }));
+    exe.addModule("pkmn", pkmn.module(b, .{ .showdown = true, .log = true }));
     ...
 }
 ```
 
 The engine's `build.zig` exposes a `module` function that takes an options structure to allow for
-configuring whether or not Pokémon Showdown compatibility mode or trace logs should be enabled.
-Alternatively, you may set options via a `pkmn_options` [root source file
+configuring whether or not Pokémon Showdown compatibility mode or protocol message logging should be
+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
 warning. Use at your own risk.
 
 ```zig
-pub const pkmn_options = .{ .showdown = true, .trace = true };
+pub const pkmn_options = .{ .showdown = true, .log = true };
 ```
 
 ## Usage
@@ -112,16 +112,16 @@ pub const pkmn_options = .{ .showdown = true, .trace = 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 `-Dtrace` 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 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.
 
 Unlike [Pokémon Showdown's
 SIM-PROTOCOL](https://github.com/smogon/pokemon-showdown/blob/master/sim/SIM-PROTOCOL.md#choice-requests)
 which provides a rich request object at each decision point, the pkmn engine computes the possible
-choices on demand based on the result of the previous `update` and the battle state (`OPTIONS_SIZE`
+choices on demand based on the result of the previous `update` and the battle state (`CHOICES_SIZE`
 is a good size to initialize the buffer passed to `choices`). **Attempting to update the battle with
 a choice not present in the options returned by `choices` is undefined behavior and may corrupt
 state or cause the engine to crash.**
@@ -139,19 +139,22 @@ potential logs that may result.
 ### C
 
 [`pkmn.h`](src/include/pkmn.h) exports the C API for `libpkmn`. Symbols are all prefixed with
-`pkmn_` to avoid name collisions. If `-Dtrace` is enabled and logging throws an error then the error
+`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`.
 
 ```c
 #include <pkmn.h>
 
+pkmn_battle_options options;
+pkmn_gen1_battle_options_set(&options, ...);
 pkmn_battle battle = ...;
-uint8_t buf[PKMN_LOGS_SIZE];
+
 pkmn_result result;
 pkmn_choice c1 = 0, c2 = 0;
-while (!pkmn_result_type(result = pkmn_battle_update(&battle, c1, c2, buf, PKMN_LOGS_SIZE))) {
+while (!pkmn_result_type(result = pkmn_battle_update(&battle, c1, c2, &options))) {
   c1 = choose(PKMN_PLAYER_P1, pkmn_result_p1(result));
   c2 = choose(PKMN_PLAYER_P2, pkmn_result_p2(result));
+  pkmn_gen1_battle_options_set(&options, ...);
 }
 if (pkmn_error(result)) exit(1);
 ```
@@ -216,18 +219,18 @@ const std = @import("std");
 const pkmn = @import("pkmn");
 
 var random = std.rand.DefaultPrng.init(seed).random();
-var options: [pkmn.OPTIONS_SIZE]pkmn.Choice = undefined;
+var choices: [pkmn.CHOICES_SIZE]pkmn.Choice = undefined;
 
 var battle = ...
-var log = ...
+var options = pkmn.battle.options(...);
 
 var c1 = pkmn.Choice{};
 var c2 = pkmn.Choice{};
 
-var result = try battle.update(c1, c2, log);
-while (result.type == .None) : (result = try battle.update(c1, c2, log)) {
-    c1 = options[random.uintLessThan(u8, battle.choices(.P1, result.p1, &options))];
-    c2 = options[random.uintLessThan(u8, battle.choices(.P2, result.p2, &options))];
+var result = try battle.update(c1, c2, &options);
+while (result.type == .None) : (result = try battle.update(c1, c2, &options)) {
+    c1 = choices[random.uintLessThan(u8, battle.choices(.P1, result.p1, &choices))];
+    c2 = choices[random.uintLessThan(u8, battle.choices(.P2, result.p2, &choices))];
 }
 
 std.debug.print("{}\n", .{result.type});
@@ -250,10 +253,10 @@ following is a list of known `libpkmn` bindings written by developers outside of
 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):
 
-| Language   | License   | URL                                     |
-| ---------- | --------- | --------------------------------------- |
-| **C++**    | `BSL-1.0` | https://github.com/pasyg/engine-wrapper |
-| **Python** | `MIT`     | https://github.com/AnnikaCodes/PyKMN    |
+| Language   | License   | URL                                  |
+| ---------- | --------- | ------------------------------------ |
+| **C++**    | `BSL-1.0` | https://github.com/pasyg/wrapsire    |
+| **Python** | `MIT`     | https://github.com/AnnikaCodes/PyKMN |
 
 
 #### `pkmn-debug`

package/build/pkg/addon.d.ts

@@ -0,0 +1,7 @@
+import { Choice, Player, Result } from '.';
+export declare function check(showdown: boolean): void;
+export declare function supports(showdown: boolean, log?: boolean): boolean;
+export declare function update(index: number, showdown: boolean, battle: ArrayBuffer, c1?: Choice, c2?: Choice, log?: ArrayBuffer): Result;
+export declare function choices(index: number, showdown: boolean, battle: ArrayBuffer, player: Player, choice: Choice['type'], buf: ArrayBuffer): Choice[];
+export declare function choose(index: number, showdown: boolean, battle: ArrayBuffer, player: Player, choice: Choice['type'], buf: ArrayBuffer, fn: (n: number) => number): Choice;
+export declare function size(index: number, type: 'choices' | 'log'): number;

package/build/pkg/addon.js

@@ -0,0 +1,112 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.size = exports.choose = exports.choices = exports.update = exports.supports = exports.check = void 0;
+const path = __importStar(require("path"));
+const _1 = require(".");
+const ROOT = path.join(__dirname, '..', '..');
+let ADDON = undefined;
+function load() {
+    if (ADDON)
+        return ADDON;
+    let pkmn = undefined;
+    let showdown = undefined;
+    try {
+        pkmn = require(path.join(ROOT, 'build', 'lib', 'pkmn.node')).engine;
+    }
+    catch { }
+    try {
+        showdown =
+            require(path.join(ROOT, 'build', 'lib', 'pkmn-showdown.node')).engine;
+    }
+    catch { }
+    if (!pkmn && !showdown) {
+        throw new Error('Could not find native addons - did you run `npx install-pkmn-engine`?');
+    }
+    return (ADDON = [pkmn, showdown]);
+}
+function check(showdown) {
+    if (!load()[+showdown]) {
+        const opts = ADDON[+!showdown].options.log ? ['-log'] : [];
+        if (showdown)
+            opts.push('-Dshowdown');
+        throw new Error(`@pkmn/engine has ${showdown ? 'not' : 'only'} been configured to support Pokémon Showdown.` +
+            `\n(running \`npx install-pkmn-engine --options='${opts.join(' ')}'\` can fix this issue).`);
+    }
+}
+exports.check = check;
+function supports(showdown, log) {
+    if (!load()[+showdown])
+        return false;
+    if (log === undefined)
+        return true;
+    return ADDON[+showdown].options.log === log;
+}
+exports.supports = supports;
+function update(index, showdown, battle, c1, c2, log) {
+    return _1.Result.decode(ADDON[+showdown].bindings[index]
+        .update(battle, _1.Choice.encode(c1), _1.Choice.encode(c2), log));
+}
+exports.update = update;
+function choices(index, showdown, battle, player, choice, buf) {
+    const request = choice[0] === 'p' ? 0 : choice[0] === 'm' ? 1 : 2;
+    const n = ADDON[+showdown].bindings[index].choices(battle, +(player !== 'p1'), request, buf);
+    // The top-level API signature means our hands our tied with respect to
+    // writing really fast bindings here. The simplest approach would be to return
+    // the ArrayBuffer the bindings populate as well as its size and only decode a
+    // Choice after the selection. However, given that we need to return
+    // `Choices[]` we need to decode all of them even if they're not all being
+    // used which is wasteful. This shouldn't be *that* bad as its a very small
+    // list, but its still wasted work. Switching the top-level API to return an
+    // Iterable<Choice> doesn't help as we need both the length and the ability to
+    // randomly access it, so the best way to make the current API fast would be
+    // to have the Zig bindings create Choice objects directly, only that won't
+    // scale well as it would require us to basically rewrite the low-level
+    // choices function for each generation within node.zig. We could do something
+    // really galaxy-brained and return some sort of frankenstein subclass of
+    // Array backed by ArrayBuffer which would lazily decode the Choice on access,
+    // but thats ultimately not worth the effort. You can't have both a high-level
+    // idiomatic API and performance here, hence why the choose function below
+    // exists.
+    const options = new Array(n);
+    const data = new Uint8Array(buf);
+    for (let i = 0; i < n; i++)
+        options[i] = _1.Choice.decode(data[i]);
+    return options;
+}
+exports.choices = choices;
+function choose(index, showdown, battle, player, choice, buf, fn) {
+    const request = choice[0] === 'p' ? 0 : choice[0] === 'm' ? 1 : 2;
+    const n = ADDON[+showdown].bindings[index].choices(battle, +(player !== 'p1'), request, buf);
+    const data = new Uint8Array(buf);
+    return _1.Choice.decode(data[fn(n)]);
+}
+exports.choose = choose;
+function size(index, type) {
+    const bindings = (ADDON[1] ?? ADDON[0]).bindings[index];
+    return type[0] === 'c' ? bindings.CHOICES_SIZE : bindings.LOGS_SIZE;
+}
+exports.size = size;
+//# sourceMappingURL=addon.js.map

package/build/pkg/addon.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"addon.js","sourceRoot":"","sources":["../../src/pkg/addon.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAE7B,wBAAyC;AAEzC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAE9C,IAAI,KAAK,GAAoD,SAAS,CAAC;AAcvE,SAAS,IAAI;IACX,IAAI,KAAK;QAAE,OAAO,KAAK,CAAC;IACxB,IAAI,IAAI,GAAgC,SAAS,CAAC;IAClD,IAAI,QAAQ,GAA+B,SAAS,CAAC;IACrD,IAAI;QACF,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,MAAyB,CAAC;KACxF;IAAC,MAAM,GAAG;IACX,IAAI;QACF,QAAQ;YACN,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC,CAAC,MAAwB,CAAC;KAC3F;IAAC,MAAM,GAAG;IACX,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,uEAAuE,CAAC,CAAC;KAC1F;IACD,OAAO,CAAC,KAAK,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;AACpC,CAAC;AAED,SAAgB,KAAK,CAAC,QAAiB;IACrC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE;QACtB,MAAM,IAAI,GAAG,KAAM,CAAC,CAAC,CAAC,QAAQ,CAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7D,IAAI,QAAQ;YAAE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACtC,MAAM,IAAI,KAAK,CACb,oBAAoB,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,+CAA+C;YAC5F,mDAAmD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,0BAA0B,CAC5F,CAAC;KACH;AACH,CAAC;AATD,sBASC;AAED,SAAgB,QAAQ,CAAC,QAAiB,EAAE,GAAa;IACvD,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC;QAAE,OAAO,KAAK,CAAC;IACrC,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IACnC,OAAO,KAAM,CAAC,CAAC,QAAQ,CAAE,CAAC,OAAO,CAAC,GAAG,KAAK,GAAG,CAAC;AAChD,CAAC;AAJD,4BAIC;AAED,SAAgB,MAAM,CACpB,KAAa,EACb,QAAiB,EACjB,MAAmB,EACnB,EAAW,EACX,EAAW,EACX,GAAiB;IAEjB,OAAO,SAAM,CAAC,MAAM,CAAC,KAAM,CAAC,CAAC,QAAQ,CAAE,CAAC,QAAQ,CAAC,KAAK,CAAC;SACpD,MAAM,CAAC,MAAM,EAAE,SAAM,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,SAAM,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;AAChE,CAAC;AAVD,wBAUC;AAED,SAAgB,OAAO,CACrB,KAAa,EACb,QAAiB,EACjB,MAAmB,EACnB,MAAc,EACd,MAAsB,EACtB,GAAgB;IAEhB,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAClE,MAAM,CAAC,GAAG,KAAM,CAAC,CAAC,QAAQ,CAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;IAC/F,uEAAuE;IACvE,8EAA8E;IAC9E,8EAA8E;IAC9E,oEAAoE;IACpE,0EAA0E;IAC1E,2EAA2E;IAC3E,4EAA4E;IAC5E,8EAA8E;IAC9E,4EAA4E;IAC5E,2EAA2E;IAC3E,uEAAuE;IACvE,8EAA8E;IAC9E,yEAAyE;IACzE,8EAA8E;IAC9E,8EAA8E;IAC9E,0EAA0E;IAC1E,UAAU;IACV,MAAM,OAAO,GAAG,IAAI,KAAK,CAAS,CAAC,CAAC,CAAC;IACrC,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC;IACjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;QAAE,OAAO,CAAC,CAAC,CAAC,GAAG,SAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAChE,OAAO,OAAO,CAAC;AACjB,CAAC;AA/BD,0BA+BC;AAED,SAAgB,MAAM,CACpB,KAAa,EACb,QAAiB,EACjB,MAAmB,EACnB,MAAc,EACd,MAAsB,EACtB,GAAgB,EAChB,EAAyB;IAEzB,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAClE,MAAM,CAAC,GAAG,KAAM,CAAC,CAAC,QAAQ,CAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;IAC/F,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC;IACjC,OAAO,SAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACpC,CAAC;AAbD,wBAaC;AAED,SAAgB,IAAI,CAAC,KAAa,EAAE,IAAuB;IACzD,MAAM,QAAQ,GAAG,CAAC,KAAM,CAAC,CAAC,CAAC,IAAI,KAAM,CAAC,CAAC,CAAC,CAAE,CAAC,QAAQ,CAAC,KAAK,CAAE,CAAC;IAC5D,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC;AACtE,CAAC;AAHD,oBAGC"}

package/build/pkg/data/layout.json

@@ -4,15 +4,17 @@
             "Battle": 384,
             "Side": 184,
             "Pokemon": 24,
-            "ActivePokemon": 32
+            "ActivePokemon": 32,
+            "Actions": 16,
+            "Summaries": 12
         },
         "offsets": {
             "Battle": {
                 "sides": 0,
                 "turn": 368,
                 "last_damage": 370,
-                "last_selected_indexes": 372,
-                "rng": 373
+                "last_moves": 372,
+                "rng": 374
             },
             "Side": {
                 "pokemon": 0,
@@ -80,6 +82,26 @@
                 "disabled_duration": 52,
                 "disabled_move": 56,
                 "toxic": 59
+            },
+            "Action": {
+                "damage": 0,
+                "hit": 8,
+                "critical_hit": 10,
+                "secondary_chance": 12,
+                "speed_tie": 14,
+                "confused": 16,
+                "paralyzed": 18,
+                "duration": 20,
+                "durations": 24,
+                "move_slot": 40,
+                "multi_hit": 44,
+                "psywave": 48,
+                "metronome": 56
+            },
+            "Damage": {
+                "base": 0,
+                "final": 2,
+                "capped": 4
             }
         }
     }

package/build/pkg/gen1.d.ts

@@ -39,10 +39,11 @@ export declare class Side implements Gen1.Side {
     get(slot: Slot): Pokemon | undefined;
     get lastUsedMove(): ID | undefined;
     get lastSelectedMove(): ID | undefined;
-    get lastSelectedIndex(): 1 | 2 | 3 | 4 | undefined;
+    get lastMoveIndex(): 1 | 2 | 3 | 4 | undefined;
+    get lastMoveCounterable(): boolean;
     toJSON(): Gen1.Side;
     static init(gen: Generation, lookup: Lookup, team: Partial<PokemonSet>[], data: DataView, offset: number): void;
-    static encode(gen: Generation, lookup: Lookup, battle: Data<Gen1.Battle>, side: Gen1.Side, data: DataView, offset: number): void;
+    static encode(gen: Generation, showdown: boolean, lookup: Lookup, battle: Data<Gen1.Battle>, side: Gen1.Side, data: DataView, offset: number): void;
 }
 export declare class Pokemon implements Gen1.Pokemon {
     static Volatiles: {
@@ -77,11 +78,11 @@ export declare class Pokemon implements Gen1.Pokemon {
         toxic: number;
     };
     private get sleep();
-    private get self();
+    private get ext();
     private get toxic();
     toJSON(): Gen1.Pokemon;
     static init(gen: Generation, lookup: Lookup, set: Partial<PokemonSet>, data: DataView, offset: number, index: number): void;
-    static encodeStored(gen: Generation, lookup: Lookup, pokemon: Gen1.Pokemon, data: DataView, offset: number): void;
+    static encodeStored(gen: Generation, showdown: boolean, lookup: Lookup, pokemon: Gen1.Pokemon, data: DataView, offset: number): void;
     static encodeActive(gen: Generation, lookup: Lookup, battle: Data<Gen1.Battle>, pokemon: Gen1.Pokemon | undefined, data: DataView, offset: number): void;
 }
 export declare class StoredPokemon {

package/build/pkg/gen1.js

@@ -50,7 +50,7 @@ class Battle {
         this.config = config;
         this.lookup = lookup;
         this.data = data;
-        this.options = new ArrayBuffer(addon.size(0, 'options'));
+        this.options = new ArrayBuffer(addon.size(0, 'choices'));
         this.buf = config.log ? new ArrayBuffer(addon.size(0, 'log')) : undefined;
         this.log = config.log ? new DataView(this.buf) : undefined;
         this.cache = [undefined, undefined];
@@ -86,7 +86,7 @@ class Battle {
         return this.data.getUint16(OFFSETS.Battle.last_damage, data_2.LE);
     }
     get prng() {
-        const offset = OFFSETS.Battle.last_selected_indexes + (this.config.showdown ? 4 : 1);
+        const offset = OFFSETS.Battle.last_moves + (this.config.showdown ? 4 : 2);
         // Pokémon Showdown's PRNGSeed is always big-endian
         const seed = [0, 0, 0, 0];
         if (this.config.showdown) {
@@ -99,10 +99,10 @@ class Battle {
             // Gen12RNG seed requires an index, but if we always rotate the seed based on the index when
             // reading we can avoid tracking the index as it will always be zero. NB: the exact bits of
             // the Battle will not roundtrip, but the *logical* Battle state will.
-            const index = this.data.getUint8(offset + 10);
-            for (let i = 0; i < 10; i++) {
+            const index = this.data.getUint8(offset + 9);
+            for (let i = 0; i < 9; i++) {
                 const j = i - index;
-                seed[j < 0 ? j + 10 : j] = this.data.getUint8(offset + i);
+                seed[j < 0 ? j + 9 : j] = this.data.getUint8(offset + i);
             }
         }
         return seed;
@@ -127,20 +127,25 @@ class Battle {
         const buf = new ArrayBuffer(SIZES.Battle);
         const data = new DataView(buf);
         let offset = OFFSETS.Battle.p1;
-        const indexes = [];
+        const lastMoves = [];
         for (const side of battle.sides) {
-            Side.encode(gen, lookup, battle, side, data, offset);
+            Side.encode(gen, !!options.showdown, lookup, battle, side, data, offset);
             offset += SIZES.Side;
-            indexes.push(side.lastSelectedIndex ?? 0);
+            if (options.showdown) {
+                lastMoves.push(+!!side.lastMoveCounterable);
+                lastMoves.push((side.lastMoveIndex ?? 0));
+            }
+            else {
+                lastMoves.push((+!!side.lastMoveCounterable << 4) | (side.lastMoveIndex ?? 0));
+            }
         }
         data.setUint16(OFFSETS.Battle.turn, battle.turn, data_2.LE);
         data.setUint16(OFFSETS.Battle.last_damage, battle.lastDamage, data_2.LE);
+        data.setUint8(OFFSETS.Battle.last_moves, lastMoves[0]);
+        data.setUint8(OFFSETS.Battle.last_moves + 1, lastMoves[1]);
         if (options.showdown) {
-            data.setUint16(OFFSETS.Battle.last_selected_indexes, indexes[0], data_2.LE);
-            data.setUint16(OFFSETS.Battle.last_selected_indexes + 2, indexes[1], data_2.LE);
-        }
-        else {
-            data.setUint8(OFFSETS.Battle.last_selected_indexes, (indexes[1] << 4) | indexes[0]);
+            data.setUint8(OFFSETS.Battle.last_moves + 2, lastMoves[2]);
+            data.setUint8(OFFSETS.Battle.last_moves + 3, lastMoves[3]);
         }
         encodePRNG(data, battle.prng);
         return new Battle(lookup, data, options);
@@ -201,25 +206,38 @@ class Side {
         const m = this.data.getUint8(this.offset + OFFSETS.Side.last_selected_move);
         return m === 0 ? undefined : this.lookup.moveByNum(m);
     }
-    get lastSelectedIndex() {
+    get lastMoveIndex() {
         let m;
         if (this.battle.config.showdown) {
             const off = this.id === 'p1' ? 0 : 2;
-            m = this.data.getUint16(OFFSETS.Battle.last_selected_indexes + off, data_2.LE);
+            m = this.data.getUint8(OFFSETS.Battle.last_moves + off);
         }
         else {
-            m = this.data.getUint8(OFFSETS.Battle.last_selected_indexes);
-            m = this.id === 'p1' ? (m & 0xF) : (m >> 4);
+            const off = this.id === 'p1' ? 0 : 1;
+            m = this.data.getUint8(OFFSETS.Battle.last_moves + off) & 0x0F;
         }
         return m === 0 ? undefined : m;
     }
+    get lastMoveCounterable() {
+        let m;
+        if (this.battle.config.showdown) {
+            const off = this.id === 'p1' ? 1 : 3;
+            m = this.data.getUint8(OFFSETS.Battle.last_moves + off);
+        }
+        else {
+            const off = this.id === 'p1' ? 0 : 1;
+            m = this.data.getUint8(OFFSETS.Battle.last_moves + off) & 0xF0;
+        }
+        return m !== 0;
+    }
     toJSON() {
         return {
             active: this.active?.toJSON(),
             pokemon: Array.from(this.pokemon).map(p => p.toJSON()),
             lastSelectedMove: this.lastSelectedMove,
             lastUsedMove: this.lastUsedMove,
-            lastSelectedIndex: this.lastSelectedIndex,
+            lastMoveIndex: this.lastMoveIndex,
+            lastMoveCounterable: this.lastMoveCounterable,
         };
     }
     static init(gen, lookup, team, data, offset) {
@@ -230,11 +248,11 @@ class Side {
             data.setUint8(offset + OFFSETS.Side.order + i, i + 1);
         }
     }
-    static encode(gen, lookup, battle, side, data, offset) {
+    static encode(gen, showdown, lookup, battle, side, data, offset) {
         let i = 0;
         for (const pokemon of side.pokemon) {
             const off = offset + OFFSETS.Side.pokemon + SIZES.Pokemon * (pokemon.position - 1);
-            Pokemon.encodeStored(gen, lookup, pokemon, data, off);
+            Pokemon.encodeStored(gen, showdown, lookup, pokemon, data, off);
             data.setUint8(offset + OFFSETS.Side.order + (pokemon.position - 1), i + 1);
             i++;
         }
@@ -424,13 +442,14 @@ class Pokemon {
         return status === 'psn' && this.toxic ? 'tox' : status;
     }
     get statusData() {
-        return { sleep: this.sleep, self: this.self, toxic: this.toxic };
+        const sleep = this.sleep;
+        return { sleep, self: !!sleep && this.ext, toxic: this.toxic };
     }
     get sleep() {
         const val = this.data.getUint8(this.offset.stored + OFFSETS.Pokemon.status);
         return val & 0b111;
     }
-    get self() {
+    get ext() {
         return (this.data.getUint8(this.offset.stored + OFFSETS.Pokemon.status) >> 7) === 1;
     }
     get toxic() {
@@ -480,7 +499,7 @@ class Pokemon {
         data.setUint8(stored + OFFSETS.Pokemon.types, encodeTypes(lookup, species.types));
         data.setUint8(stored + OFFSETS.Pokemon.level, set.level ?? 100);
     }
-    static encodeStored(gen, lookup, pokemon, data, offset) {
+    static encodeStored(gen, showdown, lookup, pokemon, data, offset) {
         let off = 0;
         const stats = pokemon.stored.stats;
         for (const stat of gen.stats) {
@@ -499,7 +518,7 @@ class Pokemon {
         data.setUint8(offset + OFFSETS.Pokemon.species, species.num);
         data.setUint8(offset + OFFSETS.Pokemon.types, encodeTypes(lookup, species.types));
         data.setUint8(offset + OFFSETS.Pokemon.level, pokemon.level);
-        data.setUint8(offset + OFFSETS.Pokemon.status, encodeStatus(pokemon));
+        data.setUint8(offset + OFFSETS.Pokemon.status, encodeStatus(pokemon, showdown));
     }
     static encodeActive(gen, lookup, battle, pokemon, data, offset) {
         if (!pokemon)
@@ -620,7 +639,7 @@ class StoredPokemon {
 }
 exports.StoredPokemon = StoredPokemon;
 function encodePRNG(data, seed) {
-    const offset = OFFSETS.Battle.last_damage + 2 + (seed.length === 4 ? 4 : 1);
+    const offset = OFFSETS.Battle.last_damage + 2 + (seed.length === 4 ? 4 : 2);
     if (seed.length === 4) {
         data.setUint16(offset, seed[data_2.LE ? 3 : 0], data_2.LE);
         data.setUint16(offset + 2, seed[data_2.LE ? 2 : 1], data_2.LE);
@@ -628,7 +647,7 @@ function encodePRNG(data, seed) {
         data.setUint16(offset + 6, seed[data_2.LE ? 0 : 3], data_2.LE);
     }
     else {
-        for (let i = 0; i < 10; i++) {
+        for (let i = 0; i < 9; i++) {
             data.setUint8(offset + i, seed[i]);
         }
         // NB: ArrayBuffer is zero initialized already so we don't need to set the index to zero
@@ -646,18 +665,15 @@ function decodeSigned(n) {
 function encodeSigned(n) {
     return (n < 0) ? 0b10000 + n : n;
 }
-function encodeStatus(pokemon) {
+function encodeStatus(pokemon, showdown) {
     if (pokemon.statusData.sleep) {
         if (pokemon.status !== 'slp') {
             throw new Error('Pokemon is not asleep but has non-zero sleep turns');
         }
         return (pokemon.statusData.self ? 0x80 : 0) | pokemon.statusData.sleep;
     }
-    else if (pokemon.statusData.self) {
-        throw new Error('Pokemon is not asleep but has self-inflicted sleep bit set');
-    }
     switch (pokemon.status) {
-        case 'tox':
+        case 'tox': return showdown ? 0b10001000 : 1 << 3;
         case 'psn': return 1 << 3;
         case 'brn': return 1 << 4;
         case 'frz': return 1 << 5;