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 move defrosting for both Freeze and Frostbite

Browse Source
This commit is contained in:
Bassoonian 2023-04-28 11:26:31 +02:00
parent d5fb13ca17
commit 854e9be325
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/battle_script_commands.c
View File

@ -5596,7 +5596,6 @@ static void Cmd_moveend(void)
if (gBattleMons[gBattlerTarget].status1 & STATUS1_FREEZE
&& gBattleMons[gBattlerTarget].hp != 0
&& gBattlerAttacker != gBattlerTarget
&& gSpecialStatuses[gBattlerTarget].specialDmg
&& (moveType == TYPE_FIRE
#if B_BURN_HIT_THAW >= GEN_6
|| gBattleMoves[gCurrentMove].effect == EFFECT_BURN_HIT
@ -5615,12 +5614,7 @@ static void Cmd_moveend(void)
if (gBattleMons[gBattlerTarget].status1 & STATUS1_FROSTBITE
&& gBattleMons[gBattlerTarget].hp != 0
&& gBattlerAttacker != gBattlerTarget
&& gSpecialStatuses[gBattlerTarget].specialDmg
&& (moveType == TYPE_FIRE
#if B_BURN_HIT_THAW >= GEN_6
|| gBattleMoves[gCurrentMove].effect == EFFECT_BURN_HIT
#endif
)
&& gBattleMoves[originallyUsedMove].flags & FLAG_THAW_USER
&& !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
{
gBattleMons[gBattlerTarget].status1 &= ~STATUS1_FROSTBITE;