diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-28 17:41:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-28 17:41:34 -0400 |
| commit | 5eecaf92ba035d7b5ef8c52b5ce99d1868bc6c10 (patch) | |
| tree | 9a90ec855adff455c7b4689efda6737eb46098ef /src/battle_util.c | |
| parent | 1f4813bfd2c9774b4bcbb83e6b27c994d7ad478c (diff) | |
| parent | 96b904bf808805daa3de09080e10cc92e24c1f8e (diff) | |
Merge branch 'master' into doc-slotmachine
Diffstat (limited to 'src/battle_util.c')
| -rw-r--r-- | src/battle_util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_util.c b/src/battle_util.c index 9cc2252b6..89fe95fbc 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -259,7 +259,7 @@ void ResetSentPokesToOpponentValue(void) gSentPokesToOpponent[(i & BIT_FLANK) >> 1] = bits; } -void sub_803F9EC(u8 battler) +void OpponentSwitchInResetSentPokesToOpponentValue(u8 battler) { s32 i = 0; u32 bits = 0; @@ -279,11 +279,11 @@ void sub_803F9EC(u8 battler) } } -void sub_803FA70(u8 battler) +void UpdateSentPokesToOpponentValue(u8 battler) { if (GetBattlerSide(battler) == B_SIDE_OPPONENT) { - sub_803F9EC(battler); + OpponentSwitchInResetSentPokesToOpponentValue(battler); } else { @@ -1250,7 +1250,7 @@ bool8 HandleFaintedMonActions(void) gBattleStruct->faintedActionsState = 3; break; case 2: - sub_803F9EC(gBattlerFainted); + OpponentSwitchInResetSentPokesToOpponentValue(gBattlerFainted); if (++gBattleStruct->faintedActionsBattlerId == gBattlersCount) gBattleStruct->faintedActionsState = 3; else |