BattleCommand labels copied from macros

2025-09-08 08:13:02 -07:00 · 2015-11-06 14:45:10 -05:00
parent f0830f084f
commit 46e66077a5
22 changed files with 549 additions and 542 deletions
--- 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
--- 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.
--- a/battle/effects/foresight.asm
+++ b/battle/effects/foresight.asm
@@ -1,4 +1,4 @@
-BattleCommand57: ; 376a0
+BattleCommand_Foresight: ; 376a0
 ; foresight

 	ld a, [AttackMissed]
--- a/battle/effects/metronome.asm
+++ b/battle/effects/metronome.asm
@@ -1,4 +1,4 @@
-BattleCommand34: ; 37418
+BattleCommand_Metronome: ; 37418
 ; metronome

 	call Function372d8
--- 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
--- 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.
--- a/battle/effects/perish_song.asm
+++ b/battle/effects/perish_song.asm
@@ -1,4 +1,4 @@
-BattleCommand58: ; 376c2
+BattleCommand_PerishSong: ; 376c2
 ; perishsong


--- a/battle/effects/protect.asm
+++ b/battle/effects/protect.asm
@@ -1,4 +1,4 @@
-BattleCommand55: ; 37618
+BattleCommand_Protect: ; 37618
 ; protect
 	call ProtectChance
 	ret c
--- 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
--- a/battle/effects/sandstorm.asm
+++ b/battle/effects/sandstorm.asm
@@ -1,4 +1,4 @@
-BattleCommand59: ; 376f8
+BattleCommand_StartSandstorm: ; 376f8
 ; startsandstorm

 	ld a, [Weather]
--- a/battle/effects/spikes.asm
+++ b/battle/effects/spikes.asm
@@ -1,4 +1,4 @@
-BattleCommand56: ; 37683
+BattleCommand_Spikes: ; 37683
 ; spikes

 	ld hl, EnemyScreens
--- a/battle/effects/thief.asm
+++ b/battle/effects/thief.asm
@@ -1,4 +1,4 @@
-BattleCommand50: ; 37492
+BattleCommand_Thief: ; 37492
 ; thief

 	ld a, [hBattleTurn]