diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-16 17:55:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-16 17:55:56 -0500 |
| commit | 33126a06331f8afce668a1152a26e9ed6f5d9a16 (patch) | |
| tree | 0d603397418119f4f055b29a339e094fba1a4141 /src/battle_util.c | |
| parent | bc4f88d72c5efd05f6dd5ee76966a1fc7c69bc3a (diff) | |
| parent | 57e3f5e0f8743191420de5d5569680ade54c4619 (diff) | |
Merge pull request #392 from Deokishisu/ExternalEvents-doc
Mirror pokeemerald PR#1329 & PR#1335 to pokefirered
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 45025ae1a..27d90b0d4 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -3095,13 +3095,13 @@ u8 GetMoveTarget(u16 move, u8 setTarget) return targetBattler; } -static bool32 HasObedientBitSet(u8 battlerId) +static bool32 IsNotEventLegalMewOrDeoxys(u8 battlerId) { if (GetBattlerSide(battlerId) == B_SIDE_OPPONENT || (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) @@ -3112,7 +3112,7 @@ u8 IsMonDisobedient(void) if ((gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_POKEDUDE)) || 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 (!IsOtherTrainer(gBattleMons[gBattlerAttacker].otId, gBattleMons[gBattlerAttacker].otName) || FlagGet(FLAG_BADGE08_GET)) return 0; |