ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2430 from AsparagusEduardo/RHH/pr/fix/BadDreams

Browse Source 
Fixed Bad Dream's ability popup message
This commit is contained in:
BuffelSaft 2022-11-05 03:42:44 +13:00 committed by GitHub
commit d05c74b9e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle_util.c
View File

@ -5003,9 +5003,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move
gDisableStructs[gBattlerAttacker].truantCounter ^= 1; gDisableStructs[gBattlerAttacker].truantCounter ^= 1;
break; break;
case ABILITY_BAD_DREAMS: case ABILITY_BAD_DREAMS:
if (gBattleMons[battler].status1 & STATUS1_SLEEP if (gBattleMons[BATTLE_PARTNER(BATTLE_OPPOSITE(battler))].status1 & STATUS1_SLEEP
|| gBattleMons[BATTLE_OPPOSITE(battler)].status1 & STATUS1_SLEEP || gBattleMons[BATTLE_OPPOSITE(battler)].status1 & STATUS1_SLEEP
|| GetBattlerAbility(battler) == ABILITY_COMATOSE || GetBattlerAbility(BATTLE_PARTNER(BATTLE_OPPOSITE(battler))) == ABILITY_COMATOSE
|| GetBattlerAbility(BATTLE_OPPOSITE(battler)) == ABILITY_COMATOSE) || GetBattlerAbility(BATTLE_OPPOSITE(battler)) == ABILITY_COMATOSE)
{ {
BattleScriptPushCursorAndCallback(BattleScript_BadDreamsActivates); BattleScriptPushCursorAndCallback(BattleScript_BadDreamsActivates);