diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-15 17:33:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-15 17:33:29 -0500 |
| commit | f8a70fdf24aa9e405af7abbbcf22ffa1c12c89a2 (patch) | |
| tree | e0b21e29ff6fd427d48ed1d55f57d119ab192836 /src/battle_util.c | |
| parent | 5f58ea02c66a7e1a7d0164ba497bfa2d7527328b (diff) | |
| parent | d418321627afa2e5796fe8287ba880b0c84c81fa (diff) | |
Merge pull request #1334 from Deokishisu/giftRibbons-doc
[LEAK-INFORMED] Fix giftRibbons Field in SaveBlock1 & Relabel Gift Ribbons in pokemon.h
Diffstat (limited to 'src/battle_util.c')
| -rw-r--r-- | src/battle_util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_util.c b/src/battle_util.c index 210e418c6..2bf06f331 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -3949,14 +3949,14 @@ u8 GetMoveTarget(u16 move, u8 setTarget) return targetBattler; } -static bool32 HasObedientBitSet(u8 battlerId) +static bool32 IsNotEventLegalMewOrDeoxys(u8 battlerId) { if (GetBattlerSide(battlerId) == B_SIDE_OPPONENT) return TRUE; if (GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES, NULL) != SPECIES_DEOXYS && GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES, NULL) != SPECIES_MEW) return TRUE; - return GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_OBEDIENCE, NULL); + return GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_EVENT_LEGAL, NULL); } u8 IsMonDisobedient(void) @@ -3970,7 +3970,7 @@ u8 IsMonDisobedient(void) if (GetBattlerSide(gBattlerAttacker) == B_SIDE_OPPONENT) return 0; - if (HasObedientBitSet(gBattlerAttacker)) // only if species is Mew or Deoxys + if (IsNotEventLegalMewOrDeoxys(gBattlerAttacker)) // only if species is Mew or Deoxys { if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && GetBattlerPosition(gBattlerAttacker) == 2) return 0; |