diff options
Diffstat (limited to 'battle/effects')
| -rw-r--r-- | battle/effects/curse.asm | 12 | ||||
| -rw-r--r-- | battle/effects/endure.asm | 2 | ||||
| -rw-r--r-- | battle/effects/foresight.asm | 2 | ||||
| -rw-r--r-- | battle/effects/metronome.asm | 2 | ||||
| -rw-r--r-- | battle/effects/mirror_move.asm | 4 | ||||
| -rw-r--r-- | battle/effects/nightmare.asm | 2 | ||||
| -rw-r--r-- | battle/effects/perish_song.asm | 2 | ||||
| -rw-r--r-- | battle/effects/protect.asm | 2 | ||||
| -rw-r--r-- | battle/effects/rollout.asm | 4 | ||||
| -rw-r--r-- | battle/effects/sandstorm.asm | 2 | ||||
| -rw-r--r-- | battle/effects/spikes.asm | 2 | ||||
| -rw-r--r-- | battle/effects/thief.asm | 2 |
12 files changed, 19 insertions, 19 deletions
diff --git a/battle/effects/curse.asm b/battle/effects/curse.asm index 06706aba1..2c9ce4365 100644 --- a/battle/effects/curse.asm +++ b/battle/effects/curse.asm @@ -1,4 +1,4 @@ -BattleCommand54: ; 37588 +BattleCommand_Curse: ; 37588 ; curse ld de, BattleMonType1 @@ -45,14 +45,14 @@ BattleCommand54: ; 37588 ld a, $2 call Function36532 call BattleCommand_SwitchTurn - call BattleCommand8d + call BattleCommand_StatMessageTarget call ResetMiss call BattleCommand_SwitchTurn - call BattleCommand70 - call BattleCommand8c + call BattleCommand_AttackUp + call BattleCommand_StatMessageUser call ResetMiss - call BattleCommand71 - jp BattleCommand8c + call BattleCommand_DefenseUp + jp BattleCommand_StatMessageUser .ghost diff --git a/battle/effects/endure.asm b/battle/effects/endure.asm index 026fde417..ed4329ff5 100644 --- a/battle/effects/endure.asm +++ b/battle/effects/endure.asm @@ -1,4 +1,4 @@ -BattleCommand5a: ; 3766f +BattleCommand_Endure: ; 3766f ; endure ; Endure shares code with Protect. See protect.asm. diff --git a/battle/effects/foresight.asm b/battle/effects/foresight.asm index 775fbd78d..a8834fd9c 100644 --- a/battle/effects/foresight.asm +++ b/battle/effects/foresight.asm @@ -1,4 +1,4 @@ -BattleCommand57: ; 376a0 +BattleCommand_Foresight: ; 376a0 ; foresight ld a, [AttackMissed] diff --git a/battle/effects/metronome.asm b/battle/effects/metronome.asm index 6815377d0..ba20de47d 100644 --- a/battle/effects/metronome.asm +++ b/battle/effects/metronome.asm @@ -1,4 +1,4 @@ -BattleCommand34: ; 37418 +BattleCommand_Metronome: ; 37418 ; metronome call Function372d8 diff --git a/battle/effects/mirror_move.asm b/battle/effects/mirror_move.asm index 32a1998bb..146c6df03 100644 --- a/battle/effects/mirror_move.asm +++ b/battle/effects/mirror_move.asm @@ -1,4 +1,4 @@ -BattleCommand1b: ; 373c9 +BattleCommand_MirrorMove: ; 373c9 ; mirrormove call Function372d8 @@ -47,6 +47,6 @@ BattleCommand1b: ; 373c9 ld [wc689], a .done - call BattleCommandaa + call BattleCommand_MoveDelay jp ResetTurn ; 37418 diff --git a/battle/effects/nightmare.asm b/battle/effects/nightmare.asm index da39affc1..788e3de41 100644 --- a/battle/effects/nightmare.asm +++ b/battle/effects/nightmare.asm @@ -1,4 +1,4 @@ -BattleCommand52: ; 37536 +BattleCommand_Nightmare: ; 37536 ; nightmare ; Can't hit an absent opponent. diff --git a/battle/effects/perish_song.asm b/battle/effects/perish_song.asm index 95391f3bd..ac491ef6b 100644 --- a/battle/effects/perish_song.asm +++ b/battle/effects/perish_song.asm @@ -1,4 +1,4 @@ -BattleCommand58: ; 376c2 +BattleCommand_PerishSong: ; 376c2 ; perishsong diff --git a/battle/effects/protect.asm b/battle/effects/protect.asm index eaf011ffe..ada796001 100644 --- a/battle/effects/protect.asm +++ b/battle/effects/protect.asm @@ -1,4 +1,4 @@ -BattleCommand55: ; 37618 +BattleCommand_Protect: ; 37618 ; protect call ProtectChance ret c diff --git a/battle/effects/rollout.asm b/battle/effects/rollout.asm index 3826734b4..fe4c9189b 100644 --- a/battle/effects/rollout.asm +++ b/battle/effects/rollout.asm @@ -1,7 +1,7 @@ MAX_ROLLOUT_COUNT EQU 5 -BattleCommand5b: ; 37718 +BattleCommand_CheckCurl: ; 37718 ; checkcurl ld de, PlayerRolloutCount @@ -25,7 +25,7 @@ BattleCommand5b: ; 37718 ; 37734 -BattleCommand5c: ; 37734 +BattleCommand_RolloutPower: ; 37734 ; rolloutpower ld a, BATTLE_VARS_STATUS diff --git a/battle/effects/sandstorm.asm b/battle/effects/sandstorm.asm index a33db7f8c..27b8e8e2c 100644 --- a/battle/effects/sandstorm.asm +++ b/battle/effects/sandstorm.asm @@ -1,4 +1,4 @@ -BattleCommand59: ; 376f8 +BattleCommand_StartSandstorm: ; 376f8 ; startsandstorm ld a, [Weather] diff --git a/battle/effects/spikes.asm b/battle/effects/spikes.asm index 68894b1c1..16a2c035d 100644 --- a/battle/effects/spikes.asm +++ b/battle/effects/spikes.asm @@ -1,4 +1,4 @@ -BattleCommand56: ; 37683 +BattleCommand_Spikes: ; 37683 ; spikes ld hl, EnemyScreens diff --git a/battle/effects/thief.asm b/battle/effects/thief.asm index 730fcd66c..f344edef9 100644 --- a/battle/effects/thief.asm +++ b/battle/effects/thief.asm @@ -1,4 +1,4 @@ -BattleCommand50: ; 37492 +BattleCommand_Thief: ; 37492 ; thief ld a, [hBattleTurn] |