@pkmn/engine 0.1.0-dev.b9fb6eab → 0.1.0-dev.c4dec0f7

package/build.zig

@@ -1,6 +1,8 @@
 const std = @import("std");
 const builtin = @import("builtin");
 
+const NativeTargetInfo = std.zig.system.NativeTargetInfo;
+
 pub const Options = struct { showdown: ?bool = null, trace: ?bool = null };
 
 pub fn module(b: *std.Build, options: Options) *std.Build.Module {
@@ -28,7 +30,7 @@ pub fn build(b: *std.Build) !void {
     const strip = b.option(bool, "strip", "Strip debugging symbols from binary") orelse false;
     const pic = b.option(bool, "pic", "Force position independent code") orelse false;
 
-    const cmd = b.findProgram(&.{"strip"}, &.{}) catch null;
+    const cmd = b.findProgram(&[_][]const u8{"strip"}, &[_][]const u8{}) catch null;
 
     var parser = std.json.Parser.init(b.allocator, false);
     defer parser.deinit();
@@ -64,7 +66,7 @@ pub fn build(b: *std.Build) !void {
         lib.linkLibC();
         if (node_import_lib) |il| {
             lib.addObjectFile(il);
-        } else if ((try std.zig.system.NativeTargetInfo.detect(target)).target.os.tag == .windows) {
+        } else if ((try NativeTargetInfo.detect(target)).target.os.tag == .windows) {
             try std.io.getStdErr().writeAll("Must provide --node-import-library path on Windows\n");
             std.process.exit(1);
         }
@@ -72,7 +74,7 @@ pub fn build(b: *std.Build) !void {
         maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
         if (pic) lib.force_pic = pic;
         // Always emit to build/lib because this is where the driver code expects to find it
-        // TODO(ziglang/zig#2231): using the following used to work (though was hacky):
+        // TODO(ziglang/zig#2231): using the following used to work (though be hacky):
         //
         //    lib.emit_bin = .{ .emit_to = b.fmt("build/lib/{s}", .{addon}) };
         //    b.getInstallStep().dependOn(&lib.step);
@@ -96,10 +98,13 @@ pub fn build(b: *std.Build) !void {
         lib.rdynamic = true;
         lib.strip = strip;
         if (pic) lib.force_pic = pic;
-        const opt = b.findProgram(&.{"wasm-opt"}, &.{"./node_modules/.bin"}) catch null;
+        const opt = b.findProgram(
+            &[_][]const u8{"wasm-opt"},
+            &[_][]const u8{"./node_modules/.bin"},
+        ) catch null;
         if (optimize != .Debug and opt != null) {
             const out = b.fmt("build/lib/{s}.wasm", .{name});
-            const sh = b.addSystemCommand(&.{ opt.?, "-O4" });
+            const sh = b.addSystemCommand(&[_][]const u8{ opt.?, "-O4" });
             sh.addArtifactArg(lib);
             sh.addArg("-o");
             sh.addFileSourceArg(.{ .path = out });
@@ -230,7 +235,7 @@ fn maybeStrip(
     if (mac and artifact.isDynamicLibrary()) return;
     // Assuming GNU strip, which complains "illegal pathname found in archive member"...
     if (!mac and artifact.isStaticLibrary()) return;
-    const sh = b.addSystemCommand(&.{ cmd.?, if (mac) "-x" else "-s" });
+    const sh = b.addSystemCommand(&[_][]const u8{ cmd.?, if (mac) "-x" else "-s" });
     sh.addArtifactArg(artifact);
     step.dependOn(&sh.step);
 }
@@ -243,7 +248,7 @@ const Config = struct {
     cmd: ?[]const u8,
 };
 
-const TESTS = .{
+const TESTS = [_][]const u8{
     "src/lib/common/test.zig",
     "src/lib/gen1/test.zig",
     "src/lib/gen2/test.zig",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/engine",
-  "version": "0.1.0-dev.b9fb6eab",
+  "version": "0.1.0-dev.c4dec0f7",
   "description": "A minimal, complete, Pokémon battle simulation engine optimized for performance",
   "repository": "github:pkmn/engine",
   "license": "MIT",

package/src/bin/install-pkmn-engine

@@ -15,10 +15,8 @@ const DEV = ZIG_VERSION.dev ? `-dev.${ZIG_VERSION.dev}` : '';
 const VERSION = `${ZIG_VERSION.major}.${ZIG_VERSION.minor}.${ZIG_VERSION.patch}${DEV}`;
 const INDEX = 'https://ziglang.org/download/index.json';
 const ROOT = path.resolve(__dirname, '..', '..');
-let SILENT = false;
 
 const sh = (cmd, args) => execFileSync(cmd, args, {encoding: 'utf8', cwd: ROOT});
-const log = (...args) => { if (!SILENT) console.log(...args); };
 
 // This is hardly the browser fetch API, but it works for our primitive needs
 const fetch = url => new Promise((resolve, reject) => {
@@ -63,7 +61,7 @@ const unpack7 = (input, output) => new Promise((resolve, reject) => {
     require.resolve('7zip-min');
   } catch (err) {
     if (err.code !== 'MODULE_NOT_FOUND') throw err;
-    log('Installing 7zip-min package locally to unpack the archive...');
+    console.log('Installing 7zip-min package locally to unpack the archive...');
     sh('npm', ['install', '7zip-min', '--no-audit', '--no-save']);
   }
 
@@ -85,7 +83,7 @@ const unpack = async (input, output) => {
       sh('tar', ['xf', input, '-C', output]);
       return;
     } catch {
-      log('tar command not found, falling back to 7z');
+      console.log('tar command not found, falling back to 7z');
     }
   }
   // Try to use a 7z binary if we can, and only install 7zip-min as a last resort
@@ -122,10 +120,10 @@ const find = zig => {
         (!ZIG_VERSION.dev || (dev && dev >= ZIG_VERSION.dev)));
 
     if (compatible) {
-      log('Found existing compatible Zig executable:', zig_exe);
+      console.log('Found existing compatible Zig executable:', zig_exe);
       return zig_exe;
     } else {
-      log(`Existing Zig executable is not compatible (${version} < ${VERSION}):`, zig_exe);
+      console.log(`Existing Zig executable is not compatible (${version} < ${VERSION}):`, zig_exe);
     }
   } catch (err) {
     if (err.code !== 'ENOENT') throw err;
@@ -170,11 +168,11 @@ const install = async () => {
   let base = path.basename(url);
   const archive = path.join(dir, path.basename(url));
 
-  log(`Downloading Zig tarball from ${url} to ${archive}`);
+  console.log(`Downloading Zig tarball from ${url} to ${archive}`);
   try {
     await download(url, archive, release.shasum);
 
-    log(`Extracting tarball and installing to ${dir}`);
+    console.log(`Extracting tarball and installing to ${dir}`);
     await unpack(archive, dir);
     if (archive.endsWith('.zip')) {
       base = base.slice(0, -4);
@@ -189,17 +187,17 @@ const install = async () => {
     } catch (err) {
       if (err.code !== 'ENOENT') throw err;
     }
-    log(`Zig${version === 'master' ? '' : ` v${version}`} executable:`, zig,
+    console.log(`Zig${version === 'master' ? '' : ` v${version}`} executable:`, zig,
       '(this version of Zig will be retained to speed up future updates)');
     const [pre, post] = tty.isatty(1) ? ['\x1b[1m\x1b[35m', '\x1b[0m'] : ['', ''];
-    log(
+    console.log(
       `${pre}Consider moving the ${path.dirname(zig)} directory and adding it to your PATH`,
       `to use Zig on other projects, or delete this if you wish to save space.${post}`
     );
 
     return zig;
   } finally {
-    log(`Cleaning up ${archive}`);
+    console.log(`Cleaning up ${archive}`);
     try { fs.rmSync(archive); } catch {}
   }
 };
@@ -208,17 +206,17 @@ const install = async () => {
 const downloadHeaders = async () => {
   const include = path.resolve(process.execPath, '..', '..', 'include', 'node');
   if (fs.existsSync(path.join(include, 'node.h'))) {
-    log('Node headers:', include);
+    console.log('Node headers:', include);
     return include;
   }
 
   const dir = path.join(ROOT, 'build', 'include');
-  const dest = path.join(dir, 'node');
+  const dest = path.join(dir, `node-${process.version}`, 'include', 'node');
   if (fs.existsSync(path.join(dest, 'node.h'))) {
-    log('Node headers:', dest);
+    console.log('Node headers:', dest);
     return dest;
   } else {
-    log(`Could not find Node headers at ${include}, downloading...`);
+    console.log(`Could not find Node headers at ${include}, downloading...`);
   }
 
   try {
@@ -229,28 +227,20 @@ const downloadHeaders = async () => {
 
   const url = process.release.headersUrl;
   const targz = path.join(dir, path.basename(url));
-  const unpacked = path.join(dir, `node-${process.version}`, 'include');
 
-  log(`Downloading Node headers from ${url} to ${targz}`);
+  console.log(`Downloading Node headers from ${url} to ${targz}`);
+  await download(url, targz);
+  await unpack(targz, dir);
 
-  try {
-    await download(url, targz);
-    await unpack(targz, dir);
-    fs.renameSync(path.join(unpacked, 'node'), dest);
-
-    log('Node headers:', dest);
+  console.log('Node headers:', dest);
 
-    return dest;
-  } finally {
-    try { fs.rmSync(targz); } catch {}
-    try { fs.rmSync(unpacked, {recursive: true}); } catch {}
-  }
+  return dest;
 };
 
 const downloadImportLib = async () => {
   const library = path.resolve(process.execPath, '..', 'node.lib');
   if (fs.existsSync(path.join(library, 'node.h'))) {
-    log('Node import library:', library);
+    console.log('Node import library:', library);
     return library;
   }
 
@@ -258,10 +248,10 @@ const downloadImportLib = async () => {
   const url = new URL('./win-x64/node.lib', process.release.headersUrl).href;
   const dest = path.join(dir, path.basename(url));
   if (fs.existsSync(path.join(dest))) {
-    log('Node import library:', dest);
+    console.log('Node import library:', dest);
     return dest;
   } else {
-    log(`Could not find Node import library at ${library}, downloading...`);
+    console.log(`Could not find Node import library at ${library}, downloading...`);
   }
 
   try {
@@ -270,41 +260,24 @@ const downloadImportLib = async () => {
     if (err.code !== 'EEXIST') throw err;
   }
 
-  log(`Downloading Node import library from ${url} to ${dest}`);
+  console.log(`Downloading Node import library from ${url} to ${dest}`);
   await download(url, dest);
-  log('Node import library:', dest);
+  console.log('Node import library:', dest);
 
   return dest;
 };
 
 (async () => {
-  let only = false;
-  let options = undefined;
-  let error = false;
-  for (let i = 2; i < process.argv.length; i++) {
-    switch (process.argv[i]) {
-    case "--silent": {
-      SILENT = true;
-      break;
-    }
-    case "--zig": {
-      if (options || only) error = true;
-      only = true;
-      break;
-    }
-    default: {
-      if (options || only || !process.argv[i].startsWith('--options=')) error = true;
-      options = process.argv[i].slice(10).split(' ');
-    }
-    }
-  }
-  if (error) {
+  const options = (process.argv[2] || '').startsWith('--options=')
+    ? process.argv[2].slice(10).split(' ') : undefined;
+  if (process.argv.length > 3 ||
+    process.argv.length === 3 && !(process.argv[2] === '--zig' || options)) {
     console.error('Invalid arguments');
     process.exit(1);
   }
 
   const zig = await install();
-  if (only) process.exit(0);
+  if (process.argv[2] === '--zig') process.exit(0);
 
   let tmp;
   try {
@@ -374,7 +347,7 @@ const downloadImportLib = async () => {
       opts.includes('-Dshowdown') || opts.includes('-Dshowdown=true') ? '-showdown' : '';
     const flags = opts.length ? ` (${opts.join(' ')})` : '';
     const artifact = path.join('build', 'lib', `pkmn${suffix}.${config.type}`);
-    log(`Building ${artifact}${flags}`);
+    console.log(`Building ${artifact}${flags}`);
     sh(zig, args);
     // TODO: ziglang/zig#14647 broke emit_to so we get to rename the file ourselves...
     if (config.type === 'node') {
@@ -382,7 +355,7 @@ const downloadImportLib = async () => {
       const ext = process.platform === 'darwin'
         ? 'dylib' : process.platform === 'win32' ? 'dll' : 'so';
       const actual = path.join('build', 'lib', `${prefix}pkmn${suffix}.node.${ext}`);
-      fs.renameSync(path.join(ROOT, actual), path.join(ROOT, artifact));
+      fs.renameSync(actual, artifact);
     }
   }
 })().catch(e => {

package/src/lib/gen1/README.md

@@ -467,7 +467,7 @@ Documentation of the wire protocol used for logging traces when `-Dtrace` is ena
 
 In addition to its alternative [RNG semantics](#rng), Pokémon Showdown's implementation of the first
 generation of Pokémon contains a number bugs, [many of which are known and have been documented on
-Smogon](https://www.smogon.com/forums/posts/5933177/show):
+Smogon](https://www.smogon.com/forums/threads/rby-tradebacks-bug-report-thread.3524844/#post-5933177):
 
 - moves on Pokémon Showdown can do 0 damage instead of failing or causing a [division-by-zero
   freeze](https://pkmn.cc/bulba-glitch-1#Division_by_0).
@@ -482,19 +482,14 @@ Beyond the general bugs listed above, several move effects are implemented incor
 Showdown. Some of these moves are [too fundamentally broken to be implemented](#unimplementable) by
 the pkmn engine, but the following moves have their broken behavior preserved in `-Dshowdown` mode:
 
-- **Bide**: If the opponent faints after Bide inflicts damage on Pokémon Showdown residual damage
-  incorrectly still gets applied to Bide's user.
 - **Leech Seed**: Leech Seed fails to heal its source side if a seeded target faints due to
-  recoil/crash damage on Pokémon Showdown. Pokémon Showdown also updates the battle's last damage
-  field with the uncapped Leech Seed damage which has consequences for Bide and Counter.
+  recoil/crash damage on Pokémon Showdown.
 - **Pay Day**: Pay Day should still scatter coins if it hits (but doesn't break) and opponent's
   Substitute but doesn't on Pokémon Showdown.
 - **Flinch**: Flinching does not get cleared during move selection on Pokémon Showdown and is
   instead cleared in Pokémon Showdown's "residual" phase, meaning the flinch status gets erroneously
   preserved across fainting (as fainting triggers Pokémon Showdown's "instaswitch" behavior which
   skips end-of-turn residuals).
-- **Rage**: Rage boosts should still result in burn/paralysis [stat modification
-  errors](https://pkmn.cc/bulba-glitch-1#Stat_modification_errors) but don't on Pokémon Showdown.
 - **Thrash** / **Petal Dance**: once a Pokémon is locked into a thrashing move they will lose all
   speed ties on Pokémon Showdown (due to the fact that if they win the speed tie their action will
   then get "changed" and inserted back into the queue after their opponent's action).
@@ -513,8 +508,7 @@ the pkmn engine, but the following moves have their broken behavior preserved in
   implement by Pokémon Showdown.
 - **Roar** / **Whirlwind**: these moves can miss on Pokémon Showdown (and advance the RNG when
   checking) which is incorrect (these moves should always fail, but do not check accuracy or advance
-  the RNG). More importantly, these moves should *not* cause the tracked last battle damage to be
-  zeroed, but on Pokémon Showdown they do.
+  the RNG).
 - **Substitute**: in addition to the [Substitute + Confusion
   glitch](https://pkmn.cc/bulba-glitch-1#Substitute_.2B_Confusion_glitch) not being implemented
   correctly (covered above), the [Substitute 1/4
@@ -556,7 +550,7 @@ called out in the `|rule|` section at the beginning of a battle's log):
   `|rule|` section** in Generation I (or II) as the actual order of switches here does not have
   competitive implications like it does in Generation III, but it is still contrary to how the games
   work where the [host (Player 1)'s Pokemon would switch
-  first](https://www.smogon.com/forums/posts/5989318/show).
+  first](https://www.smogon.com/forums/threads/gen-3-on-ps-final-fixes.3527268/post-5989318).
 
 Pokémon Showdown enforces several clauses *before* the battle: **Cleric Clause** (all Pokémon must
 have full HP and PP, and not have any status conditions prior to the battle), **Stat Tradeback
@@ -577,12 +571,13 @@ left up to a client to support.
 
 Numerous moves on Pokémon Showdown are broken not simply due to local issues in the implementation
 of their effects but instead due to **global issues** related to fundamental mechanics such as
-[broken move selection](https://www.smogon.com/forums/posts/8655897/show), using move name instead
-of slot to determine move identity, implementing volatile statuses incorrectly or not understanding
-how moves which call other moves work means that it isn't possible to completely implement Pokémon
-Showdown's behavior for the following moves (the pkmn engine attempts to reproduce as much of the
-behavior that can be reproduced without making data structure changes or dramatically deviating from
-the correct control flow):
+[broken move
+selection](https://www.smogon.com/forums/threads/rby-fight-button-simulation-improvements-fix-partial-trapping-improve-counter.3673280/#post-8655897),
+using move name instead of slot to determine move identity, implementing volatile statuses
+incorrectly or not understanding how moves which call other moves work means that it isn't possible
+to completely implement Pokémon Showdown's behavior for the following moves (the pkmn engine
+attempts to reproduce as much of the behavior that can be reproduced without making data structure
+changes or dramatically deviating from the correct control flow):
 
 - **Wrap**: Binding moves like Wrap are implemented on Pokémon Showdown with an artificial
   `partialtrappinglock` volatile as opposed to how it works on the cartridge which simply relies on
@@ -671,10 +666,10 @@ compatibility mode, the implications of these differences are outlined below:
 Finally, the **initial 10-byte seed for link battles on Pokémon Red cannot include bytes larger than
 the `SERIAL_PREAMBLE_BYTE`**, so must be in the range $\left[0, 252\right]$. This has implications
 on the first 10 random numbers generated during the battle and has [**non-trivial competitive
-implications**](https://www.smogon.com/forums/posts/9068411/show) (at the start of the battle move
-effects become more likely, the ["1/256-miss" glitch](https://glitchcity.wiki/1/256_miss_glitch)
-cannot happen, Player 1 is more likely to win speed ties, etc) that Pokémon Showdown cannot
-replicate due to everything described above.
+implications**](https://www.smogon.com/forums/threads/rby-tradebacks-bug-report-thread.3524844/page-16#post-9068411)
+(at the start of the battle move effects become more likely, the ["1/256-miss"
+glitch](https://glitchcity.wiki/1/256_miss_glitch) cannot happen, Player 1 is more likely to win
+speed ties, etc) that Pokémon Showdown cannot replicate due to everything described above.
 
 All of places in the link battle code where randomness is required are outlined below:
 
@@ -773,8 +768,11 @@ The pkmn engine attempts to adhere to certain naming conventions:
 ## Resources
 
 - [pret/pokered](https://github.com/pret/pokered/) disassembly
-- [Gen I Main Battle Function](https://www.smogon.com/forums/posts/5878612/show) - Crystal_
+- [Gen I Main Battle
+  Function](https://www.smogon.com/forums/threads/past-gens-research-thread.3506992/#post-5878612) -
+  Crystal_
 - [Pokemon Showdown!](https://github.com/smogon/pokemon-showdown)
 - [List of glitches (Generation
   I)](https://bulbapedia.bulbagarden.net/wiki/List_of_glitches_(Generation_I))
-- [Pokémon Showdown RBY Bugs](https://www.smogon.com/forums/posts/5933177/show)
+- [Pokémon Showdown RBY
+  Bugs](https://www.smogon.com/forums/threads/rby-tradebacks-bug-report-thread.3524844/#post-5933177)

package/src/lib/gen1/mechanics.zig

@@ -347,7 +347,6 @@ fn doTurn(
         if (try checkFaint(battle, player, log)) |r| return r;
     } else if (foe_choice.type == .Pass) return null;
 
-    residual = true;
     replace = battle.side(foe_player).stored().hp == 0;
     if (try executeMove(battle, foe_player, foe_choice, foe_from, &residual, log)) |r| return r;
     if (!replace) {
@@ -435,7 +434,7 @@ fn executeMove(
 
     var skip_can = false;
     var skip_pp = false;
-    switch (try beforeMove(battle, player, from, residual, log)) {
+    switch (try beforeMove(battle, player, from, log)) {
         .done => return null,
         .skip_can => skip_can = true,
         .skip_pp => skip_pp = true,
@@ -452,13 +451,7 @@ fn executeMove(
 
 const BeforeMove = union(enum) { done, skip_can, skip_pp, ok, err };
 
-fn beforeMove(
-    battle: anytype,
-    player: Player,
-    from: ?Move,
-    residual: *bool,
-    log: anytype,
-) !BeforeMove {
+fn beforeMove(battle: anytype, player: Player, from: ?Move, log: anytype) !BeforeMove {
     var side = battle.side(player);
     const foe = battle.foe(player);
     var active = &side.active;
@@ -544,7 +537,7 @@ fn beforeMove(
 
             if (confused) {
                 assert(!volatiles.MultiHit);
-                if (!volatiles.Rage) volatiles.state = 0;
+                volatiles.state = 0;
                 volatiles.Bide = false;
                 volatiles.Thrashing = false;
                 volatiles.MultiHit = false;
@@ -585,7 +578,7 @@ fn beforeMove(
             battle.rng.next() < Gen12.percent(25);
 
         if (paralyzed) {
-            if (!volatiles.Rage) volatiles.state = 0;
+            volatiles.state = 0;
             volatiles.Bide = false;
             volatiles.Thrashing = false;
             volatiles.Charging = false;
@@ -621,15 +614,7 @@ fn beforeMove(
         }
 
         _ = try applyDamage(battle, player.foe(), player.foe(), .None, log);
-        if (foe.stored().hp > 0) try buildRage(battle, player.foe(), log);
-
-        // For reasons passing understanding, Pokémon Showdown still inflicts residual damage to
-        // Bide's user even if the above damage has caused the foe to faint. It's simpler to always
-        // run residual here regardless of whether the foe fainted and opt-out of the default flow
-        if (showdown) {
-            residual.* = false;
-            try handleResidual(battle, player, log);
-        }
+        try buildRage(battle, player.foe(), log);
 
         return .done;
     }
@@ -947,7 +932,7 @@ fn doMove(
     if (foe.stored().hp == 0) return null;
 
     // Pokémon Showdown builds Rage at the wrong time for non-MultiHit moves
-    if (late and move.effect != .Disable) try buildRage(battle, player.foe(), log);
+    if (late) try buildRage(battle, player.foe(), log);
 
     if (!move.effect.isSpecial()) {
         // On the cartridge Rage is not considered to be "special" and thus gets executed for a
@@ -960,9 +945,7 @@ fn doMove(
         if (move.effect == .Twineedle) {
             if (!showdown) try Effects.poison(battle, player, Move.get(.PoisonSting), log);
         } else if (move.effect == .Disable) {
-            const result = try Effects.disable(battle, player, move, log);
-            if (showdown) try buildRage(battle, player.foe(), log);
-            return result;
+            return Effects.disable(battle, player, move, log);
         } else {
             try moveEffect(battle, player, move, log);
         }
@@ -1128,7 +1111,7 @@ fn specialDamage(battle: anytype, player: Player, move: Move.Data, log: anytype)
     if (battle.last_damage == 0) return if (showdown) null else Result.Error;
 
     _ = try applyDamage(battle, player.foe(), player.foe(), .None, log);
-    if (battle.foe(player).stored().hp > 0) try buildRage(battle, player.foe(), log);
+    try buildRage(battle, player.foe(), log);
 
     return null;
 }
@@ -1452,15 +1435,6 @@ fn handleResidual(battle: anytype, player: Player, log: anytype) !void {
     }
 
     if (volatiles.LeechSeed) {
-        var foe = battle.foe(player);
-        var foe_stored = foe.stored();
-        const foe_ident = battle.active(player.foe());
-
-        if (foe_stored.hp == 0) {
-            assert(showdown);
-            return;
-        }
-
         var damage = @max(stored.stats.hp / 16, 1);
 
         // GLITCH: Leech Seed + Toxic glitch
@@ -1469,12 +1443,13 @@ fn handleResidual(battle: anytype, player: Player, log: anytype) !void {
             damage *= volatiles.toxic;
         }
 
-        // Pokémon Showdown erroneously updates last damage with uncapped Leech Seed damage
-        if (showdown) battle.last_damage = damage;
-
         const amount = @min(damage, stored.hp);
         stored.hp -= amount;
 
+        var foe = battle.foe(player);
+        var foe_stored = foe.stored();
+        const foe_ident = battle.active(player.foe());
+
         // As above, Pokémon Showdown uses damageOf but its not relevant
         if (amount > 0) try log.damage(ident, stored, .LeechSeed);
 
@@ -2256,9 +2231,8 @@ pub const Effects = struct {
     fn switchAndTeleport(battle: anytype, player: Player, move: Move.Data, log: anytype) !void {
         if (!showdown or battle.side(player).last_selected_move == .Teleport) return;
 
-        // Whirlwind/Roar should not roll to hit/reset damage but Pokémon Showdown does anyway
+        // Whirlwind/Roar should not roll to hit but Pokémon Showdown does anyway
         _ = try checkHit(battle, player, move, log);
-        battle.last_damage = 0;
     }
 
     fn thrashing(battle: anytype, player: Player) void {
@@ -2343,8 +2317,6 @@ pub const Effects = struct {
                 const stat = unmodifiedStats(battle, player).atk;
                 stats.atk = @min(MAX_STAT_VALUE, stat * mod[0] / mod[1]);
                 try log.boost(ident, reason, n);
-                // Pokémon Showdown doesn't re-apply status modifiers after Rage boosts
-                if (showdown and move.effect == .Rage) return;
             },
             .DefenseUp1, .DefenseUp2 => {
                 assert(boosts.def >= -6 and boosts.def <= 6);
@@ -2595,14 +2567,9 @@ fn disabled(side: *Side, ident: ID, log: anytype) !bool {
     if (side.active.volatiles.disabled_move != 0) {
         // A Pokémon that transforms after being disabled may end up with less move slots
         const m = side.active.moves[side.active.volatiles.disabled_move - 1].id;
-        // side.last_selected_move can be Struggle here on Pokemon Showdown we need an extra check
-        const last = if (showdown and m == .Bide and side.active.volatiles.Bide)
-            m
-        else
-            side.last_selected_move;
-        if (m != .None and m == last) {
+        if (m != .None and m == side.last_selected_move) {
             side.active.volatiles.Charging = false;
-            try log.disabled(ident, last);
+            try log.disabled(ident, side.last_selected_move);
             return true;
         }
     }
@@ -2765,10 +2732,8 @@ pub fn choices(battle: anytype, player: Player, request: Choice.Type, out: []Cho
                     const m = active.moves[slot - 1];
                     if (m.id == .None) break;
                     if (m.id == side.last_selected_move) {
-                        // Pokémon Showdown displays Struggle if limited to Bide but unable to pick
-                        const struggle =
-                            m.id == .Bide and (m.pp == 0 or active.volatiles.disabled_move == slot);
-                        const s = if (struggle) 0 else slot;
+                        // Pokémon Showdown displays Struggle if limited to Bide when out of PP
+                        const s = if (m.pp == 0 and m.id == .Bide) 0 else slot;
                         out[n] = .{ .type = .Move, .data = s };
                         n += 1;
                         return n;