mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-09-29 01:04:28 +02:00
remove battler skipping in neutralizing gas exit bs
This commit is contained in:
parent
48bea554a3
commit
e4242d04ab
|
@ -8962,9 +8962,7 @@ BattleScript_NeutralizingGasExits::
|
||||||
waitmessage B_WAIT_TIME_LONG
|
waitmessage B_WAIT_TIME_LONG
|
||||||
setbyte gBattlerTarget, 0
|
setbyte gBattlerTarget, 0
|
||||||
BattleScript_NeutralizingGasExitsLoop:
|
BattleScript_NeutralizingGasExitsLoop:
|
||||||
jumpifbyteequal gEffectBattler, gBattlerTarget, BattleScript_NeutralizingGasExitsIncrement @ skip over battler switching out
|
|
||||||
switchinabilities BS_TARGET
|
switchinabilities BS_TARGET
|
||||||
BattleScript_NeutralizingGasExitsIncrement:
|
|
||||||
addbyte gBattlerTarget, 1
|
addbyte gBattlerTarget, 1
|
||||||
jumpifbytenotequal gBattlerTarget, sByteFour, BattleScript_NeutralizingGasExitsLoop @ SOMEHOW, comparing to gBattlersCount is problematic.
|
jumpifbytenotequal gBattlerTarget, sByteFour, BattleScript_NeutralizingGasExitsLoop @ SOMEHOW, comparing to gBattlersCount is problematic.
|
||||||
restoretarget
|
restoretarget
|
||||||
|
|
|
@ -12312,7 +12312,6 @@ static void Cmd_switchoutabilities(void)
|
||||||
if (gBattleMons[gActiveBattler].ability == ABILITY_NEUTRALIZING_GAS)
|
if (gBattleMons[gActiveBattler].ability == ABILITY_NEUTRALIZING_GAS)
|
||||||
{
|
{
|
||||||
gBattleMons[gActiveBattler].ability = ABILITY_NONE;
|
gBattleMons[gActiveBattler].ability = ABILITY_NONE;
|
||||||
gEffectBattler = gActiveBattler;
|
|
||||||
BattleScriptPush(gBattlescriptCurrInstr);
|
BattleScriptPush(gBattlescriptCurrInstr);
|
||||||
gBattlescriptCurrInstr = BattleScript_NeutralizingGasExits;
|
gBattlescriptCurrInstr = BattleScript_NeutralizingGasExits;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user