enumerate battle var constants

1 files changed, 28 insertions, 26 deletions

diff --git a/main.asm b/main.asm
index ad55b66e0..bfbf10508 100644
--- a/main.asm
+++ b/main.asm
@@ -2271,32 +2271,34 @@ _GetBattleVar: ; 39e7
 	dw .curmove, .lastcounter, .lastcounteropp, .lastmove, .lastmoveopp
 
 
-PLAYER_SUBSTATUS_1    EQU 0
-ENEMY_SUBSTATUS_1     EQU 1
-PLAYER_SUBSTATUS_2    EQU 2
-ENEMY_SUBSTATUS_2     EQU 3
-PLAYER_SUBSTATUS_3    EQU 4
-ENEMY_SUBSTATUS_3     EQU 5
-PLAYER_SUBSTATUS_4    EQU 6
-ENEMY_SUBSTATUS_4     EQU 7
-PLAYER_SUBSTATUS_5    EQU 8
-ENEMY_SUBSTATUS_5     EQU 9
-PLAYER_STATUS         EQU 10
-ENEMY_STATUS          EQU 11
-PLAYER_MOVE_ANIMATION EQU 12
-ENEMY_MOVE_ANIMATION  EQU 13
-PLAYER_MOVE_EFFECT    EQU 14
-ENEMY_MOVE_EFFECT     EQU 15
-PLAYER_MOVE_POWER     EQU 16
-ENEMY_MOVE_POWER      EQU 17
-PLAYER_MOVE_TYPE      EQU 18
-ENEMY_MOVE_TYPE       EQU 19
-PLAYER_CUR_MOVE       EQU 20
-ENEMY_CUR_MOVE        EQU 21
-PLAYER_COUNTER_MOVE   EQU 22
-ENEMY_COUNTER_MOVE    EQU 23
-PLAYER_LAST_MOVE      EQU 24
-ENEMY_LAST_MOVE       EQU 25
+	const_def
+	const PLAYER_SUBSTATUS_1
+	const ENEMY_SUBSTATUS_1
+	const PLAYER_SUBSTATUS_2
+	const ENEMY_SUBSTATUS_2
+	const PLAYER_SUBSTATUS_3
+	const ENEMY_SUBSTATUS_3
+	const PLAYER_SUBSTATUS_4
+	const ENEMY_SUBSTATUS_4
+	const PLAYER_SUBSTATUS_5
+	const ENEMY_SUBSTATUS_5
+	const PLAYER_STATUS
+	const ENEMY_STATUS
+	const PLAYER_MOVE_ANIMATION
+	const ENEMY_MOVE_ANIMATION
+	const PLAYER_MOVE_EFFECT
+	const ENEMY_MOVE_EFFECT
+	const PLAYER_MOVE_POWER
+	const ENEMY_MOVE_POWER
+	const PLAYER_MOVE_TYPE
+	const ENEMY_MOVE_TYPE
+	const PLAYER_CUR_MOVE
+	const ENEMY_CUR_MOVE
+	const PLAYER_COUNTER_MOVE
+	const ENEMY_COUNTER_MOVE
+	const PLAYER_LAST_MOVE
+	const ENEMY_LAST_MOVE
+
 
 ;                       player                     enemy
 .substatus1     db PLAYER_SUBSTATUS_1,    ENEMY_SUBSTATUS_1