diff options
Diffstat (limited to 'battle/effects')
| -rwxr-xr-x | battle/effects/attract.asm | 2 | ||||
| -rw-r--r-- | battle/effects/foresight.asm | 2 | ||||
| -rw-r--r-- | battle/effects/metronome.asm | 6 | ||||
| -rw-r--r-- | battle/effects/mirror_move.asm | 4 | ||||
| -rw-r--r-- | battle/effects/protect.asm | 2 | ||||
| -rw-r--r-- | battle/effects/spikes.asm | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/battle/effects/attract.asm b/battle/effects/attract.asm index 5e9561206..f1bc590eb 100755 --- a/battle/effects/attract.asm +++ b/battle/effects/attract.asm @@ -20,7 +20,7 @@ BattleCommand_Attract: ; 377ce jp StdBattleTextBox .failed - jp Function37354 + jp FailAttract ; 377f5 diff --git a/battle/effects/foresight.asm b/battle/effects/foresight.asm index a8834fd9c..6f4f97cd2 100644 --- a/battle/effects/foresight.asm +++ b/battle/effects/foresight.asm @@ -19,5 +19,5 @@ BattleCommand_Foresight: ; 376a0 jp StdBattleTextBox .failed - jp Function37354 + jp FailForesight ; 376c2 diff --git a/battle/effects/metronome.asm b/battle/effects/metronome.asm index af574061d..ddc1bf62e 100644 --- a/battle/effects/metronome.asm +++ b/battle/effects/metronome.asm @@ -1,8 +1,8 @@ BattleCommand_Metronome: ; 37418 ; metronome - call Function372d8 - call Function34548 + call ClearLastMove + call CheckUserIsCharging jr nz, .asm_3742b ld a, [wKickCounter] @@ -12,7 +12,7 @@ BattleCommand_Metronome: ; 37418 ld [wKickCounter], a .asm_3742b - call PlayPlayerMoveAnim_ClearHiID + call LoadMoveAnim .GetMove call BattleRandom diff --git a/battle/effects/mirror_move.asm b/battle/effects/mirror_move.asm index e6196466b..c4f208d77 100644 --- a/battle/effects/mirror_move.asm +++ b/battle/effects/mirror_move.asm @@ -1,7 +1,7 @@ BattleCommand_MirrorMove: ; 373c9 ; mirrormove - call Function372d8 + call ClearLastMove ld a, BATTLE_VARS_MOVE call GetBattleVarAddr @@ -37,7 +37,7 @@ BattleCommand_MirrorMove: ; 373c9 call GetMoveData call GetMoveName call CopyName1 - call Function34548 + call CheckUserIsCharging jr nz, .done ld a, [wKickCounter] diff --git a/battle/effects/protect.asm b/battle/effects/protect.asm index ada796001..568ac00f8 100644 --- a/battle/effects/protect.asm +++ b/battle/effects/protect.asm @@ -23,7 +23,7 @@ ProtectChance: ; 3762c ld de, EnemyProtectCount .asm_37637 - call Function36abf + call CheckOpponentWentFirst jr nz, .failed ; Can't have a substitute. diff --git a/battle/effects/spikes.asm b/battle/effects/spikes.asm index 16a2c035d..3d15e4cfd 100644 --- a/battle/effects/spikes.asm +++ b/battle/effects/spikes.asm @@ -23,5 +23,5 @@ BattleCommand_Spikes: ; 37683 jp StdBattleTextBox .failed - jp Function37354 + jp FailSpikes ; 376a0 |