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

Fix Flame Burst crashing the game

Browse Source
This commit is contained in:
DizzyEggg 2019-05-23 10:02:04 +02:00
parent 01ee73adf6
commit 1b7493e47a
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/battle_scripts_1.s
View File

@ -737,12 +737,16 @@ BattleScript_EffectFlameBurst:
goto BattleScript_EffectHit goto BattleScript_EffectHit
BattleScript_MoveEffectFlameBurst:: BattleScript_MoveEffectFlameBurst::
tryfaintmon BS_TARGET, FALSE, NULL
printstring STRINGID_BURSTINGFLAMESHIT printstring STRINGID_BURSTINGFLAMESHIT
waitmessage 0x40 waitmessage 0x40
healthbarupdate BS_SCRIPTING savetarget
datahpupdate BS_SCRIPTING copybyte gBattlerTarget, sBATTLER
tryfaintmon BS_SCRIPTING, FALSE, NULL healthbarupdate BS_TARGET
return datahpupdate BS_TARGET
tryfaintmon BS_TARGET, FALSE, NULL
restoretarget
goto BattleScript_MoveEnd
BattleScript_EffectPowerTrick: BattleScript_EffectPowerTrick:
attackcanceler attackcanceler

1
src/battle_script_commands.c
View File

@ -2794,7 +2794,6 @@ void SetMoveEffect(bool32 primary, u32 certain)
gBattleMoveDamage = gBattleMons[BATTLE_PARTNER(gBattlerTarget)].hp / 16; gBattleMoveDamage = gBattleMons[BATTLE_PARTNER(gBattlerTarget)].hp / 16;
if (gBattleMoveDamage == 0) if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1; gBattleMoveDamage = 1;
BattleScriptPush(gBattlescriptCurrInstr + 1);
gBattlescriptCurrInstr = BattleScript_MoveEffectFlameBurst; gBattlescriptCurrInstr = BattleScript_MoveEffectFlameBurst;
} }
break; break;