From e4242d04abf2a1c3e906283302a4fe3aee1ac2a8 Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Mon, 1 Nov 2021 14:28:41 -0400 Subject: [PATCH] remove battler skipping in neutralizing gas exit bs --- data/battle_scripts_1.s | 2 -- src/battle_script_commands.c | 1 - 2 files changed, 3 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 3549a1f7f0..59941ec23e 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -8962,9 +8962,7 @@ BattleScript_NeutralizingGasExits:: waitmessage B_WAIT_TIME_LONG setbyte gBattlerTarget, 0 BattleScript_NeutralizingGasExitsLoop: - jumpifbyteequal gEffectBattler, gBattlerTarget, BattleScript_NeutralizingGasExitsIncrement @ skip over battler switching out switchinabilities BS_TARGET -BattleScript_NeutralizingGasExitsIncrement: addbyte gBattlerTarget, 1 jumpifbytenotequal gBattlerTarget, sByteFour, BattleScript_NeutralizingGasExitsLoop @ SOMEHOW, comparing to gBattlersCount is problematic. restoretarget diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 5c61b9278c..b4345bff5a 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -12312,7 +12312,6 @@ static void Cmd_switchoutabilities(void) if (gBattleMons[gActiveBattler].ability == ABILITY_NEUTRALIZING_GAS) { gBattleMons[gActiveBattler].ability = ABILITY_NONE; - gEffectBattler = gActiveBattler; BattleScriptPush(gBattlescriptCurrInstr); gBattlescriptCurrInstr = BattleScript_NeutralizingGasExits; }