diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-23 20:13:45 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-23 20:13:45 +0200 |
| commit | 601fc9e85b383792819768c31728e4855e854f32 (patch) | |
| tree | 6801a88b11184dbfb28cb94e73d955cb78e1667f /src/battle_3.c | |
| parent | fc57c6c817bcb8bed4469b5114ced17129bdca81 (diff) | |
atk49 is matching baby WOHOHOHOHO
Diffstat (limited to 'src/battle_3.c')
| -rw-r--r-- | src/battle_3.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/battle_3.c b/src/battle_3.c index 1b62e3bb8..4453545d3 100644 --- a/src/battle_3.c +++ b/src/battle_3.c @@ -186,7 +186,6 @@ extern void b_call_bc_move_exec(const u8 *); extern void BattleTurnPassed(void); extern void SetMoveEffect(bool8 primary, u8 certainArg); extern bool8 UproarWakeUpCheck(u8 bank); -extern u8 sub_803F90C(u8 bank); extern void sub_803F9EC(); extern bool8 sub_80423F4(u8 bank, u8, u8); extern u8 sub_806D864(u8); @@ -848,7 +847,7 @@ u8 TurnBasedEffects(void) { gBankAttacker = gActiveBank; gBattleMons[gActiveBank].status2 -= 0x10; // uproar timer goes down - if (sub_803F90C(gActiveBank)) + if (HasMoveFailed(gActiveBank)) { CancelMultiTurnMoves(gActiveBank); gBattleCommunication[MULTISTRING_CHOOSER] = 1; @@ -874,7 +873,7 @@ u8 TurnBasedEffects(void) if (gBattleMons[gActiveBank].status2 & STATUS2_LOCK_CONFUSE) { gBattleMons[gActiveBank].status2 -= 0x400; - if (sub_803F90C(gActiveBank)) + if (HasMoveFailed(gActiveBank)) CancelMultiTurnMoves(gActiveBank); else if (!(gBattleMons[gActiveBank].status2 & STATUS2_LOCK_CONFUSE) && (gBattleMons[gActiveBank].status2 & STATUS2_MULTIPLETURNS)) |