More Battle Tower map script constants, fewer raw hex values

2 files changed, 25 insertions, 18 deletions

diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm
index 852ebf297..58853da3a 100755
--- a/constants/battle_tower_constants.asm
+++ b/constants/battle_tower_constants.asm
@@ -1,4 +1,13 @@
-; BattleTowerAction arguments (see mobile/battle_tower_5c.asm)
+BATTLETOWER_NROFPKMNS EQU 3
+BATTLETOWER_NROFTRAINERS EQU 7
+
+BATTLETOWER_NUM_UNIQUE_PKMN EQU 21
+BATTLETOWER_NUM_UNIQUE_TRAINERS EQU 70
+
+BATTLETOWER_TRAINERDATALENGTH EQU $24
+BATTLE_TOWER_STRUCT_LENGTH EQU $e0 ; NAME_LENGTH + BATTLETOWER_NROFPKMNS * (PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH) + BATTLETOWER_TRAINERDATALENGTH
+
+; BattleTowerAction writebyte arguments (see engine/events/battle_tower/battle_tower.asm)
 	const_def
 	const BATTLETOWERACTION_CHECK_EXPLANATION_READ
 	const BATTLETOWERACTION_SET_EXPLANATION_READ
@@ -33,22 +42,20 @@
 	const BATTLETOWERACTION_CHOOSEREWARD ; save options
 	const BATTLETOWERACTION_SAVEOPTIONS
 
-; sBattleTowerChallengeState
+; BattleTowerAction return values
+; - from BATTLETOWERACTION_CHECKMOBILEEVENT
+MOBILE_EVENT_OBJECT_GS_BALL EQU $b
+
+; BattleTowerText arguments (see engine/events/battle_tower/trainer_text.asm)
+const_value set 1
+	const BATTLETOWERTEXT_INTRO
+	const BATTLETOWERTEXT_WIN_TEXT
+	const BATTLETOWERTEXT_LOSS_TEXT
+
+; sBattleTowerChallengeState values
 	const_def
 	const BATTLETOWER_NO_CHALLENGE
 	const BATTLETOWER_SAVED_AND_LEFT
 	const BATTLETOWER_CHALLENGE_IN_PROGESS
 	const BATTLETOWER_WON_CHALLENGE
 	const BATTLETOWER_RECEIVED_REWARD
-
-BATTLETOWER_NROFPKMNS EQU 3
-BATTLETOWER_NROFTRAINERS EQU 7
-
-BATTLETOWER_NUM_UNIQUE_TRAINERS EQU 70
-BATTLETOWER_NUM_UNIQUE_PKMN EQU 21
-
-BATTLETOWER_TRAINERDATALENGTH EQU $24
-BATTLE_TOWER_STRUCT_LENGTH EQU $e0 ; NAME_LENGTH + BATTLETOWER_NROFPKMNS * (PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH) + BATTLETOWER_TRAINERDATALENGTH
-
-; return value from BattleTowerAction(BATTLETOWERACTION_CHECKMOBILEEVENT)
-MOBILE_EVENT_OBJECT_GS_BALL EQU $b
diff --git a/constants/script_constants.asm b/constants/script_constants.asm
index fcda68744..fd5affce6 100644
--- a/constants/script_constants.asm
+++ b/constants/script_constants.asm
@@ -240,14 +240,14 @@ CMDQUEUE_STONETABLE EQU 2
 	const BUGCONTEST_BOXED_MON  ; 1
 	const BUGCONTEST_NO_CATCH   ; 2
 
-; used by HealMachineAnim
+; HealMachineAnim writebyte arguments
 ; HealMachineAnim.Pointers indexes (see engine/events/heal_machine_anim.asm)
 	const_def
 	const HEALMACHINE_POKECENTER   ; 0
 	const HEALMACHINE_ELMS_LAB     ; 1
 	const HEALMACHINE_HALL_OF_FAME ; 2
 
-; used by Special_UnownPuzzle
+; Special_UnownPuzzle writebyte arguments
 ; LoadUnownPuzzlePiecesGFX.LZPointers indexes (see engine/unown_puzzle.asm)
 	const_def
 	const UNOWNPUZZLE_KABUTO     ; 0
@@ -256,7 +256,7 @@ CMDQUEUE_STONETABLE EQU 2
 	const UNOWNPUZZLE_HO_OH      ; 3
 NUM_UNOWN_PUZZLES EQU const_value
 
-; used by Special_DisplayUnownWords
+; Special_DisplayUnownWords writebyte arguments
 ; UnownWalls and MenuDataHeaders_UnownWalls indexes (see data/unown_walls.asm)
 	const_def
 	const UNOWNWORDS_ESCAPE ; 0
@@ -264,7 +264,7 @@ NUM_UNOWN_PUZZLES EQU const_value
 	const UNOWNWORDS_WATER  ; 2
 	const UNOWNWORDS_HO_OH  ; 3
 
-; used by Special_MoveTutor
+; Special_MoveTutor writebyte arguments
 const_value set 1
 	const MOVETUTOR_FLAMETHROWER ; 1
 	const MOVETUTOR_THUNDERBOLT  ; 2