diff options
Diffstat (limited to 'battle/effects')
| -rw-r--r-- | battle/effects/curse.asm | 14 | ||||
| -rw-r--r-- | battle/effects/endure.asm | 2 | ||||
| -rw-r--r-- | battle/effects/foresight.asm | 4 | ||||
| -rw-r--r-- | battle/effects/metronome.asm | 6 | ||||
| -rw-r--r-- | battle/effects/mirror_move.asm | 6 | ||||
| -rw-r--r-- | battle/effects/nightmare.asm | 4 | ||||
| -rw-r--r-- | battle/effects/perish_song.asm | 4 | ||||
| -rw-r--r-- | battle/effects/protect.asm | 6 | ||||
| -rw-r--r-- | battle/effects/sandstorm.asm | 4 | ||||
| -rw-r--r-- | battle/effects/spikes.asm | 4 |
10 files changed, 27 insertions, 27 deletions
diff --git a/battle/effects/curse.asm b/battle/effects/curse.asm index 9dc7f4b1d..fc08beae6 100644 --- a/battle/effects/curse.asm +++ b/battle/effects/curse.asm @@ -41,9 +41,9 @@ BattleCommand54: ; 37588 ld a, $1 ld [$c689], a - call Function0x37e01 + call AnimateCurrentMove ld a, $2 - call Function0x36532 + call Function36532 call SwitchTurn call BattleCommand8d call ResetMiss @@ -71,17 +71,17 @@ BattleCommand54: ; 37588 jr nz, .failed set 1, [hl] - call Function0x37e01 + call AnimateCurrentMove ld hl, GetHalfMaxHP - call CallBankF + call CallBattleCore ld hl, Function3cc3f - call CallBankF + call CallBattleCore call UpdateUserInParty ld hl, PutACurseText jp StdBattleTextBox .failed - call Function0x37e77 + call AnimateFailedMove jp PrintButItFailed @@ -91,7 +91,7 @@ BattleCommand54: ; 37588 ld b, $8 ; ABILITY call GetStatName - call Function0x37e77 + call AnimateFailedMove ld hl, WontRiseAnymoreText jp StdBattleTextBox ; 37618 diff --git a/battle/effects/endure.asm b/battle/effects/endure.asm index b2c622079..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 Function0x37e01 + call AnimateCurrentMove ld hl, BracedItselfText jp StdBattleTextBox diff --git a/battle/effects/foresight.asm b/battle/effects/foresight.asm index ed2e629a0..7a8f33493 100644 --- a/battle/effects/foresight.asm +++ b/battle/effects/foresight.asm @@ -14,11 +14,11 @@ BattleCommand57: ; 376a0 jr nz, .failed set SUBSTATUS_IDENTIFIED, [hl] - call Function0x37e01 + call AnimateCurrentMove ld hl, IdentifiedText jp StdBattleTextBox .failed - jp Function0x37354 + jp Function37354 ; 376c2 diff --git a/battle/effects/metronome.asm b/battle/effects/metronome.asm index fd3d151f0..3762ec372 100644 --- a/battle/effects/metronome.asm +++ b/battle/effects/metronome.asm @@ -1,8 +1,8 @@ BattleCommand34: ; 37418 ; metronome - call Function0x372d8 - call Function0x34548 + call Function372d8 + call Function34548 jr nz, .asm_3742b ld a, [$c689] @@ -12,7 +12,7 @@ BattleCommand34: ; 37418 ld [$c689], a .asm_3742b - call Function0x37e36 + call Function37e36 .GetMove call BattleRandom diff --git a/battle/effects/mirror_move.asm b/battle/effects/mirror_move.asm index c54977a91..60748bdae 100644 --- a/battle/effects/mirror_move.asm +++ b/battle/effects/mirror_move.asm @@ -1,7 +1,7 @@ BattleCommand1b: ; 373c9 ; mirrormove - call Function0x372d8 + call Function372d8 ld a, BATTLE_VARS_MOVE call _GetBattleVar @@ -15,7 +15,7 @@ BattleCommand1b: ; 373c9 jr nz, .use .failed - call Function0x37e77 + call AnimateFailedMove ld hl, MirrorMoveFailedText call StdBattleTextBox @@ -37,7 +37,7 @@ BattleCommand1b: ; 373c9 call GetMoveData call GetMoveName call CopyName1 - call Function0x34548 + call Function34548 jr nz, .done ld a, [$c689] diff --git a/battle/effects/nightmare.asm b/battle/effects/nightmare.asm index 6cd1f0a64..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 Function0x37e01 + call AnimateCurrentMove ld hl, StartedNightmareText jp StdBattleTextBox .failed - call Function0x37e77 + call AnimateFailedMove jp PrintButItFailed ; 37563 diff --git a/battle/effects/perish_song.asm b/battle/effects/perish_song.asm index 4f206d5d2..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 Function0x37e01 + call AnimateCurrentMove ld hl, StartPerishText jp StdBattleTextBox .failed - call Function0x37e77 + call AnimateFailedMove jp PrintButItFailed ; 376f8 diff --git a/battle/effects/protect.asm b/battle/effects/protect.asm index 45e9a75d4..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 Function0x37e01 + call AnimateCurrentMove ld hl, ProtectedItselfText jp StdBattleTextBox @@ -23,7 +23,7 @@ ProtectChance: ; 3762c ld de, EnemyProtectCount .asm_37637 - call Function0x36abf + call Function36abf jr nz, .failed ; Can't have a substitute. @@ -73,7 +73,7 @@ ProtectChance: ; 3762c .failed xor a ld [de], a - call Function0x37e77 + call AnimateFailedMove call PrintButItFailed scf ret diff --git a/battle/effects/sandstorm.asm b/battle/effects/sandstorm.asm index ad3bac9d1..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 Function0x37e01 + call AnimateCurrentMove ld hl, SandstormBrewedText jp StdBattleTextBox .failed - call Function0x37e77 + call AnimateFailedMove jp PrintButItFailed ; 37718 diff --git a/battle/effects/spikes.asm b/battle/effects/spikes.asm index 1b93f9fa1..2d9357941 100644 --- a/battle/effects/spikes.asm +++ b/battle/effects/spikes.asm @@ -17,12 +17,12 @@ BattleCommand56: ; 37683 set SCREENS_SPIKES, [hl] - call Function0x37e01 + call AnimateCurrentMove ld hl, SpikesText jp StdBattleTextBox .failed - jp Function0x37354 + jp Function37354 ; 376a0 |