ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-13 23:23:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove battler skipping in neutralizing gas exit bs

Browse Source
This commit is contained in:
ghoulslash 2021-11-01 14:28:41 -04:00
parent 48bea554a3
commit e4242d04ab
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/battle_scripts_1.s
View File

@ -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

1
src/battle_script_commands.c
View File

@ -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;
}