diff options
| author | Deokishisu <edsaletto@gmail.com> | 2018-10-14 14:19:23 -0400 |
|---|---|---|
| committer | Deokishisu <edsaletto@gmail.com> | 2018-10-14 14:19:23 -0400 |
| commit | c89b14f5ef16609779f9bd85cf4e4efa090caad7 (patch) | |
| tree | 850ae8e4df1d421e39f54ab8d0a0da9d9ffb7e18 /src/battle_ai_switch_items.c | |
| parent | e129f4864fa342fdca46399f216ee0c0c46c26b4 (diff) | |
| parent | 43316ffae83d49be09969e291779cc9e448b83a1 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly
Diffstat (limited to 'src/battle_ai_switch_items.c')
| -rw-r--r-- | src/battle_ai_switch_items.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index a105e7edf..40fffd6e5 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -17,7 +17,7 @@ static bool8 ShouldUseItem(void); static bool8 ShouldSwitchIfPerishSong(void) { if (gStatuses3[gActiveBattler] & STATUS3_PERISH_SONG - && gDisableStructs[gActiveBattler].perishSongTimer1 == 0) + && gDisableStructs[gActiveBattler].perishSongTimer == 0) { *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = PARTY_SIZE; BtlController_EmitTwoReturnValues(1, B_ACTION_SWITCH, 0); |