Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

neutralizing gas switchout

Browse Source
This commit is contained in:
ghoulslash 2021-10-30 09:13:08 -04:00
parent 28bc7dc14d
commit 4b0325dbe4
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
data/battle_scripts_1.s
View File

@ -8916,13 +8916,20 @@ BattleScript_DarkTypePreventsPrankster::
orhalfword gMoveResultFlags, MOVE_RESULT_NO_EFFECT orhalfword gMoveResultFlags, MOVE_RESULT_NO_EFFECT
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
sByteFour:
.byte MAX_BATTLERS_COUNT
BattleScript_NeutralizingGasExits:: BattleScript_NeutralizingGasExits::
savetarget
pause B_WAIT_TIME_SHORT pause B_WAIT_TIME_SHORT
printstring STRINGID_NEUTRALIZINGGASOVER printstring STRINGID_NEUTRALIZINGGASOVER
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, gBattlersCount, BattleScript_NeutralizingGasExitsLoop jumpifbytenotequal gBattlerTarget, sByteFour, BattleScript_NeutralizingGasExitsLoop @ SOMEHOW, comparing to gBattlersCount is problematic.
restoretarget
return return

5
src/battle_script_commands.c
View File

@ -12293,8 +12293,9 @@ static void Cmd_switchoutabilities(void)
if (gBattleMons[gActiveBattler].ability == ABILITY_NEUTRALIZING_GAS) if (gBattleMons[gActiveBattler].ability == ABILITY_NEUTRALIZING_GAS)
{ {
gBattleMons[gActiveBattler].ability = 0; gBattleMons[gActiveBattler].ability = ABILITY_NONE;
BattleScriptPushCursor(); gEffectBattler = gActiveBattler;
BattleScriptPush(gBattlescriptCurrInstr);
gBattlescriptCurrInstr = BattleScript_NeutralizingGasExits; gBattlescriptCurrInstr = BattleScript_NeutralizingGasExits;
} }
else else