RGBDS syntax updates (#86)

New MACRO and DEF syntax

1 files changed, 25 insertions, 25 deletions

diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm
index 8db305a5..8f602d3a 100644
--- a/constants/battle_constants.asm
+++ b/constants/battle_constants.asm
@@ -1,6 +1,6 @@
-MAX_LEVEL EQU 100
+DEF MAX_LEVEL EQU 100
 
-NUM_MOVES EQU 4
+DEF NUM_MOVES EQU 4
 
 ; VitaminStats indexes (see data/battle/stat_names.asm)
 	const_def
@@ -9,7 +9,7 @@ NUM_MOVES EQU 4
 	const STAT_DEFENSE
 	const STAT_SPEED
 	const STAT_SPECIAL
-NUM_STATS EQU const_value
+DEF NUM_STATS EQU const_value
 
 ; StatModTextStrings indexes (see data/battle/stat_mod_names.asm)
 	const_def
@@ -20,20 +20,20 @@ NUM_STATS EQU const_value
 	const MOD_ACCURACY
 	const MOD_EVASION
 	const_skip 2
-NUM_STAT_MODS EQU const_value
+DEF NUM_STAT_MODS EQU const_value
 
 ; Moves struct fields (see data/moves/moves.asm)
 rsreset
-MOVE_ANIM   rb
-MOVE_EFFECT rb
-MOVE_POWER  rb
-MOVE_TYPE   rb
-MOVE_ACC    rb
-MOVE_PP     rb
-MOVE_LENGTH EQU _RS
+DEF MOVE_ANIM   rb
+DEF MOVE_EFFECT rb
+DEF MOVE_POWER  rb
+DEF MOVE_TYPE   rb
+DEF MOVE_ACC    rb
+DEF MOVE_PP     rb
+DEF MOVE_LENGTH EQU _RS
 
 ; D733 flags
-BIT_TEST_BATTLE EQU 0
+DEF BIT_TEST_BATTLE EQU 0
 
 ; battle type constants (wBattleType values)
 	const_def
@@ -44,33 +44,33 @@ BIT_TEST_BATTLE EQU 0
 	const BATTLE_TYPE_PIKACHU ; 4
 
 ; damage limits before type effectiveness
-MIN_NEUTRAL_DAMAGE EQU 2
-MAX_NEUTRAL_DAMAGE EQU 999
+DEF MIN_NEUTRAL_DAMAGE EQU 2
+DEF MAX_NEUTRAL_DAMAGE EQU 999
 
 ; fixed damage constants
-SONICBOOM_DAMAGE   EQU 20
-DRAGON_RAGE_DAMAGE EQU 40
+DEF SONICBOOM_DAMAGE   EQU 20
+DEF DRAGON_RAGE_DAMAGE EQU 40
 
 ; type effectiveness factors, scaled by 10
-SUPER_EFFECTIVE    EQU 20
-MORE_EFFECTIVE     EQU 15
-EFFECTIVE          EQU 10
-NOT_VERY_EFFECTIVE EQU 05
-NO_EFFECT          EQU 00
+DEF SUPER_EFFECTIVE    EQU 20
+DEF MORE_EFFECTIVE     EQU 15
+DEF EFFECTIVE          EQU 10
+DEF NOT_VERY_EFFECTIVE EQU 05
+DEF NO_EFFECT          EQU 00
 
 ; non-volatile statuses
-SLP EQU %111 ; sleep counter
+DEF SLP EQU %111 ; sleep counter
 	const_def 3
 	const PSN ; 3
 	const BRN ; 4
 	const FRZ ; 5
 	const PAR ; 6
 
-MAX_STAT_VALUE EQU 999
+DEF MAX_STAT_VALUE EQU 999
 
 ; trainer dvs
-ATKDEFDV_TRAINER EQU $98
-SPDSPCDV_TRAINER EQU $88
+DEF ATKDEFDV_TRAINER EQU $98
+DEF SPDSPCDV_TRAINER EQU $88
 
 ; wPlayerBattleStatus1 or wEnemyBattleStatus1 bit flags
 	const_def