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

Merge pull request #1708 from AsparagusEduardo/fix_SleepTalk

Browse Source 
Fixed Sleep talk being canceled by the user being asleep..
This commit is contained in:
BuffelSaft 2021-10-04 00:35:00 +13:00 committed by GitHub
commit 142a83ca96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle_util.c
View File

@ -3131,7 +3131,7 @@ u8 AtkCanceller_UnableToUseMove(void)
gBattleMons[gBattlerAttacker].status1 -= toSub; gBattleMons[gBattlerAttacker].status1 -= toSub;
if (gBattleMons[gBattlerAttacker].status1 & STATUS1_SLEEP) if (gBattleMons[gBattlerAttacker].status1 & STATUS1_SLEEP)
{ {
if (gCurrentMove != MOVE_SNORE && gCurrentMove != MOVE_SLEEP_TALK) if (gChosenMove != MOVE_SNORE && gChosenMove != MOVE_SLEEP_TALK)
{ {
gBattlescriptCurrInstr = BattleScript_MoveUsedIsAsleep; gBattlescriptCurrInstr = BattleScript_MoveUsedIsAsleep;
gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;