Use const_skip and const_next macros for brevity

pret · Jul 8, 2020 · 24d8599 · 24d8599
1 parent 6ca82e5
commit 24d8599
Show file tree

Hide file tree

Showing 25 changed files with 178 additions and 799 deletions.
diff --git a/constants/battle_anim_constants.asm b/constants/battle_anim_constants.asm
@@ -17,13 +17,7 @@
 	const BATTLEANIMSTRUCT_ANON_JT_INDEX
 	const BATTLEANIMSTRUCT_0F
 	const BATTLEANIMSTRUCT_10
-	const BATTLEANIMSTRUCT_11
-	const BATTLEANIMSTRUCT_12
-	const BATTLEANIMSTRUCT_13
-	const BATTLEANIMSTRUCT_14
-	const BATTLEANIMSTRUCT_15
-	const BATTLEANIMSTRUCT_16
-	const BATTLEANIMSTRUCT_17
+	const_skip 7
 BATTLEANIMSTRUCT_LENGTH EQU const_value
 NUM_ANIM_OBJECTS EQU 10 ; see wActiveAnimObjects
 

diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm
@@ -192,7 +192,7 @@ ALL_STATUS EQU (1 << PSN) | (1 << BRN) | (1 << FRZ) | (1 << PAR) | SLP
 	const SUBSTATUS_X_ACCURACY
 	const SUBSTATUS_MIST
 	const SUBSTATUS_FOCUS_ENERGY
-	const SUBSTATUS_UNKNOWN_1
+	const_skip
 	const SUBSTATUS_SUBSTITUTE
 	const SUBSTATUS_RECHARGE
 	const SUBSTATUS_RAGE
@@ -201,8 +201,8 @@ ALL_STATUS EQU (1 << PSN) | (1 << BRN) | (1 << FRZ) | (1 << PAR) | SLP
 ; wPlayerSubStatus5 or wEnemySubStatus5 bit flags
 	const_def
 	const SUBSTATUS_TOXIC
-	const SUBSTATUS_UNKNOWN_2
-	const SUBSTATUS_UNKNOWN_3
+	const_skip
+	const_skip
 	const SUBSTATUS_TRANSFORMED
 	const SUBSTATUS_ENCORED
 	const SUBSTATUS_LOCK_ON
@@ -212,7 +212,7 @@ ALL_STATUS EQU (1 << PSN) | (1 << BRN) | (1 << FRZ) | (1 << PAR) | SLP
 ; wPlayerScreens or wEnemyScreens bit flags
 	const_def
 	const SCREENS_SPIKES
-	const SCREENS_UNUSED
+	const_skip
 	const SCREENS_SAFEGUARD
 	const SCREENS_LIGHT_SCREEN
 	const SCREENS_REFLECT
@@ -239,9 +239,9 @@ ALL_STATUS EQU (1 << PSN) | (1 << BRN) | (1 << FRZ) | (1 << PAR) | SLP
 	const BATTLEACTION_SWITCH4
 	const BATTLEACTION_SWITCH5
 	const BATTLEACTION_SWITCH6
-	const BATTLEACTION_A
-	const BATTLEACTION_B
-	const BATTLEACTION_C
+	const_skip
+	const_skip
+	const_skip
 	const BATTLEACTION_SKIPTURN
 	const BATTLEACTION_STRUGGLE
 	const BATTLEACTION_FORFEIT

diff --git a/constants/credits_constants.asm b/constants/credits_constants.asm
@@ -105,11 +105,11 @@
 	const PAAD_TESTING
 
 ; CreditsScript indexes (see data/credits_script.asm)
-	const_def -7
-	const CREDITS_THEEND
-	const CREDITS_WAIT2
-	const CREDITS_MUSIC
-	const CREDITS_CLEAR
-	const CREDITS_SCENE
-	const CREDITS_WAIT
+	const_def -1, -1
 	const CREDITS_END
+	const CREDITS_WAIT
+	const CREDITS_SCENE
+	const CREDITS_CLEAR
+	const CREDITS_MUSIC
+	const CREDITS_WAIT2
+	const CREDITS_THEEND
diff --git a/constants/deco_constants.asm b/constants/deco_constants.asm
@@ -1,5 +1,5 @@
 ; decoration types
-const_value = 1
+	const_def 1
 	const DECO_PLANT
 	const DECO_BED
 	const DECO_CARPET
@@ -8,7 +8,7 @@ const_value = 1
 	const DECO_BIGDOLL
 
 ; DecorationNames indexes (see data/decorations/names.asm)
-const_value = 1
+	const_def 1
 	const PUT_IT_AWAY
 	const MAGNAPLANT
 	const TROPICPLANT
@@ -36,7 +36,7 @@ const_value = 1
 	const GREEN_CARPET
 
 ; DoDecorationAction2.DecoActions indexes (see engine/overworld/decorations.asm)
-const_value = 1
+	const_def 1
 	const SET_UP_BED
 	const PUT_AWAY_BED
 	const SET_UP_CARPET