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

Merge pull request #2389 from AsparagusEduardo/RHH/pr/FixZMove

Browse Source 
Fixed Z-Move not being cleared if Pokémon faints
This commit is contained in:
ghoulslash 2022-10-16 09:27:23 -04:00 committed by GitHub
commit e3f37ad825
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/battle_main.c
View File

@ -3303,6 +3303,11 @@ void FaintClearSetData(void)
}
}
}
// Clear Z-Move data
gBattleStruct->zmove.active = FALSE;
gBattleStruct->zmove.toBeUsed[gActiveBattler] = MOVE_NONE;
gBattleStruct->zmove.effect = EFFECT_HIT;
}
static void DoBattleIntro(void)