diff options
Diffstat (limited to 'battle/effects')
| -rw-r--r-- | battle/effects/curse.asm | 8 | ||||
| -rw-r--r-- | battle/effects/endure.asm | 2 | ||||
| -rw-r--r-- | battle/effects/foresight.asm | 2 | ||||
| -rw-r--r-- | battle/effects/mirror_move.asm | 2 | ||||
| -rw-r--r-- | battle/effects/nightmare.asm | 4 | ||||
| -rw-r--r-- | battle/effects/perish_song.asm | 4 | ||||
| -rw-r--r-- | battle/effects/protect.asm | 4 | ||||
| -rw-r--r-- | battle/effects/sandstorm.asm | 4 | ||||
| -rw-r--r-- | battle/effects/spikes.asm | 2 |
9 files changed, 16 insertions, 16 deletions
diff --git a/battle/effects/curse.asm b/battle/effects/curse.asm index c9dc3d374..fc08beae6 100644 --- a/battle/effects/curse.asm +++ b/battle/effects/curse.asm @@ -41,7 +41,7 @@ BattleCommand54: ; 37588 ld a, $1 ld [$c689], a - call Function37e01 + call AnimateCurrentMove ld a, $2 call Function36532 call SwitchTurn @@ -71,7 +71,7 @@ BattleCommand54: ; 37588 jr nz, .failed set 1, [hl] - call Function37e01 + call AnimateCurrentMove ld hl, GetHalfMaxHP call CallBattleCore ld hl, Function3cc3f @@ -81,7 +81,7 @@ BattleCommand54: ; 37588 jp StdBattleTextBox .failed - call Function37e77 + call AnimateFailedMove jp PrintButItFailed @@ -91,7 +91,7 @@ BattleCommand54: ; 37588 ld b, $8 ; ABILITY call GetStatName - call Function37e77 + call AnimateFailedMove ld hl, WontRiseAnymoreText jp StdBattleTextBox ; 37618 diff --git a/battle/effects/endure.asm b/battle/effects/endure.asm index b8ab5dee4..f449dcebd 100644 --- a/battle/effects/endure.asm +++ b/battle/effects/endure.asm @@ -10,7 +10,7 @@ BattleCommand5a: ; 3766f call _GetBattleVar set SUBSTATUS_ENDURE, [hl] - call Function37e01 + call AnimateCurrentMove ld hl, BracedItselfText jp StdBattleTextBox diff --git a/battle/effects/foresight.asm b/battle/effects/foresight.asm index 144bd1e26..7a8f33493 100644 --- a/battle/effects/foresight.asm +++ b/battle/effects/foresight.asm @@ -14,7 +14,7 @@ BattleCommand57: ; 376a0 jr nz, .failed set SUBSTATUS_IDENTIFIED, [hl] - call Function37e01 + call AnimateCurrentMove ld hl, IdentifiedText jp StdBattleTextBox diff --git a/battle/effects/mirror_move.asm b/battle/effects/mirror_move.asm index 09d62f6b2..60748bdae 100644 --- a/battle/effects/mirror_move.asm +++ b/battle/effects/mirror_move.asm @@ -15,7 +15,7 @@ BattleCommand1b: ; 373c9 jr nz, .use .failed - call Function37e77 + call AnimateFailedMove ld hl, MirrorMoveFailedText call StdBattleTextBox diff --git a/battle/effects/nightmare.asm b/battle/effects/nightmare.asm index 1573979a8..cd3210cab 100644 --- a/battle/effects/nightmare.asm +++ b/battle/effects/nightmare.asm @@ -28,12 +28,12 @@ BattleCommand52: ; 37536 ; Otherwise give the opponent a nightmare. set SUBSTATUS_NIGHTMARE, [hl] - call Function37e01 + call AnimateCurrentMove ld hl, StartedNightmareText jp StdBattleTextBox .failed - call Function37e77 + call AnimateFailedMove jp PrintButItFailed ; 37563 diff --git a/battle/effects/perish_song.asm b/battle/effects/perish_song.asm index 06a22aa56..423d299fa 100644 --- a/battle/effects/perish_song.asm +++ b/battle/effects/perish_song.asm @@ -30,12 +30,12 @@ BattleCommand58: ; 376c2 ld [EnemyPerishCount], a .done - call Function37e01 + call AnimateCurrentMove ld hl, StartPerishText jp StdBattleTextBox .failed - call Function37e77 + call AnimateFailedMove jp PrintButItFailed ; 376f8 diff --git a/battle/effects/protect.asm b/battle/effects/protect.asm index a24df82d7..a28c0461e 100644 --- a/battle/effects/protect.asm +++ b/battle/effects/protect.asm @@ -7,7 +7,7 @@ BattleCommand55: ; 37618 call _GetBattleVar set SUBSTATUS_PROTECT, [hl] - call Function37e01 + call AnimateCurrentMove ld hl, ProtectedItselfText jp StdBattleTextBox @@ -73,7 +73,7 @@ ProtectChance: ; 3762c .failed xor a ld [de], a - call Function37e77 + call AnimateFailedMove call PrintButItFailed scf ret diff --git a/battle/effects/sandstorm.asm b/battle/effects/sandstorm.asm index c90e22957..b4f782721 100644 --- a/battle/effects/sandstorm.asm +++ b/battle/effects/sandstorm.asm @@ -9,12 +9,12 @@ BattleCommand59: ; 376f8 ld [Weather], a ld a, 5 ld [WeatherCount], a - call Function37e01 + call AnimateCurrentMove ld hl, SandstormBrewedText jp StdBattleTextBox .failed - call Function37e77 + call AnimateFailedMove jp PrintButItFailed ; 37718 diff --git a/battle/effects/spikes.asm b/battle/effects/spikes.asm index d40bbfe8c..2d9357941 100644 --- a/battle/effects/spikes.asm +++ b/battle/effects/spikes.asm @@ -17,7 +17,7 @@ BattleCommand56: ; 37683 set SCREENS_SPIKES, [hl] - call Function37e01 + call AnimateCurrentMove ld hl, SpikesText jp StdBattleTextBox |