RGBDS syntax updates (#905)

New MACRO and DEF syntax
2022-06-06 16:25:42 -05:00
parent a4d346cc8c
commit 3648afda16
179 changed files with 2546 additions and 2545 deletions
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -1,44 +1,44 @@
 ; base data struct members (see data/pokemon/base_stats/*.asm)
 rsreset
-BASE_DEX_NO      rb
-BASE_STATS       rb NUM_STATS
+DEF BASE_DEX_NO      rb
+DEF BASE_STATS       rb NUM_STATS
 rsset BASE_STATS
-BASE_HP          rb
-BASE_ATK         rb
-BASE_DEF         rb
-BASE_SPD         rb
-BASE_SAT         rb
-BASE_SDF         rb
-BASE_TYPES       rw
+DEF BASE_HP          rb
+DEF BASE_ATK         rb
+DEF BASE_DEF         rb
+DEF BASE_SPD         rb
+DEF BASE_SAT         rb
+DEF BASE_SDF         rb
+DEF BASE_TYPES       rw
 rsset BASE_TYPES
-BASE_TYPE_1      rb
-BASE_TYPE_2      rb
-BASE_CATCH_RATE  rb
-BASE_EXP         rb
-BASE_ITEMS       rw
+DEF BASE_TYPE_1      rb
+DEF BASE_TYPE_2      rb
+DEF BASE_CATCH_RATE  rb
+DEF BASE_EXP         rb
+DEF BASE_ITEMS       rw
 rsset BASE_ITEMS
-BASE_ITEM_1      rb
-BASE_ITEM_2      rb
-BASE_GENDER      rb
-                 rb_skip
-BASE_EGG_STEPS   rb
-                 rb_skip
-BASE_PIC_SIZE    rb
-BASE_FRONTPIC    rw
-BASE_BACKPIC     rw
-BASE_GROWTH_RATE rb
-BASE_EGG_GROUPS  rb
-BASE_TMHM        rb (NUM_TM_HM_TUTOR + 7) / 8
-BASE_DATA_SIZE EQU _RS
+DEF BASE_ITEM_1      rb
+DEF BASE_ITEM_2      rb
+DEF BASE_GENDER      rb
+                     rb_skip
+DEF BASE_EGG_STEPS   rb
+                     rb_skip
+DEF BASE_PIC_SIZE    rb
+DEF BASE_FRONTPIC    rw
+DEF BASE_BACKPIC     rw
+DEF BASE_GROWTH_RATE rb
+DEF BASE_EGG_GROUPS  rb
+DEF BASE_TMHM        rb (NUM_TM_HM_TUTOR + 7) / 8
+DEF BASE_DATA_SIZE EQU _RS

 ; gender ratio constants
-GENDER_F0      EQU   0 percent
-GENDER_F12_5   EQU  12 percent + 1
-GENDER_F25     EQU  25 percent
-GENDER_F50     EQU  50 percent
-GENDER_F75     EQU  75 percent
-GENDER_F100    EQU 100 percent - 1
-GENDER_UNKNOWN EQU -1
+DEF GENDER_F0      EQU   0 percent
+DEF GENDER_F12_5   EQU  12 percent + 1
+DEF GENDER_F25     EQU  25 percent
+DEF GENDER_F50     EQU  50 percent
+DEF GENDER_F75     EQU  75 percent
+DEF GENDER_F100    EQU 100 percent - 1
+DEF GENDER_UNKNOWN EQU -1

 ; wBaseGrowthRate values
 ; GrowthRates indexes (see data/growth_rates.asm)
@@ -49,7 +49,7 @@ GENDER_UNKNOWN EQU -1
 	const GROWTH_MEDIUM_SLOW
 	const GROWTH_FAST
 	const GROWTH_SLOW
-NUM_GROWTH_RATES EQU const_value
+DEF NUM_GROWTH_RATES EQU const_value

 ; wBaseEggGroups values
 	const_def 1
@@ -70,82 +70,82 @@ NUM_GROWTH_RATES EQU const_value
 	const EGG_NONE          ; f (Undiscovered)

 ; pokedex entries (see data/pokemon/dex_entries.asm)
-NUM_DEX_ENTRY_BANKS EQU 4
+DEF NUM_DEX_ENTRY_BANKS EQU 4

 ; party_struct members (see macros/wram.asm)
 rsreset
-MON_SPECIES            rb
-MON_ITEM               rb
-MON_MOVES              rb NUM_MOVES
-MON_ID                 rw
-MON_EXP                rb 3
-MON_STAT_EXP           rw NUM_EXP_STATS
+DEF MON_SPECIES            rb
+DEF MON_ITEM               rb
+DEF MON_MOVES              rb NUM_MOVES
+DEF MON_ID                 rw
+DEF MON_EXP                rb 3
+DEF MON_STAT_EXP           rw NUM_EXP_STATS
 rsset MON_STAT_EXP
-MON_HP_EXP             rw
-MON_ATK_EXP            rw
-MON_DEF_EXP            rw
-MON_SPD_EXP            rw
-MON_SPC_EXP            rw
-MON_DVS                rw
-MON_PP                 rb NUM_MOVES
-MON_HAPPINESS          rb
-MON_POKERUS            rb
-MON_CAUGHTDATA         rw
+DEF MON_HP_EXP             rw
+DEF MON_ATK_EXP            rw
+DEF MON_DEF_EXP            rw
+DEF MON_SPD_EXP            rw
+DEF MON_SPC_EXP            rw
+DEF MON_DVS                rw
+DEF MON_PP                 rb NUM_MOVES
+DEF MON_HAPPINESS          rb
+DEF MON_POKERUS            rb
+DEF MON_CAUGHTDATA         rw
 rsset MON_CAUGHTDATA
-MON_CAUGHTTIME         rb
-MON_CAUGHTGENDER       rb
+DEF MON_CAUGHTTIME         rb
+DEF MON_CAUGHTGENDER       rb
 rsset MON_CAUGHTDATA
-MON_CAUGHTLEVEL        rb
-MON_CAUGHTLOCATION     rb
-MON_LEVEL              rb
-BOXMON_STRUCT_LENGTH EQU _RS
-MON_STATUS             rb
-                       rb_skip
-MON_HP                 rw
-MON_MAXHP              rw
-MON_STATS              rw NUM_BATTLE_STATS
+DEF MON_CAUGHTLEVEL        rb
+DEF MON_CAUGHTLOCATION     rb
+DEF MON_LEVEL              rb
+DEF BOXMON_STRUCT_LENGTH EQU _RS
+DEF MON_STATUS             rb
+                           rb_skip
+DEF MON_HP                 rw
+DEF MON_MAXHP              rw
+DEF MON_STATS              rw NUM_BATTLE_STATS
 rsset MON_STATS
-MON_ATK                rw
-MON_DEF                rw
-MON_SPD                rw
-MON_SAT                rw
-MON_SDF                rw
-PARTYMON_STRUCT_LENGTH EQU _RS
+DEF MON_ATK                rw
+DEF MON_DEF                rw
+DEF MON_SPD                rw
+DEF MON_SAT                rw
+DEF MON_SDF                rw
+DEF PARTYMON_STRUCT_LENGTH EQU _RS

-NICKNAMED_MON_STRUCT_LENGTH EQU PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH
-REDMON_STRUCT_LENGTH EQU 44
+DEF NICKNAMED_MON_STRUCT_LENGTH EQU PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH
+DEF REDMON_STRUCT_LENGTH EQU 44

 ; caught data

-CAUGHT_TIME_MASK  EQU %11000000
-CAUGHT_LEVEL_MASK EQU %00111111
+DEF CAUGHT_TIME_MASK  EQU %11000000
+DEF CAUGHT_LEVEL_MASK EQU %00111111

-CAUGHT_GENDER_MASK   EQU %10000000
-CAUGHT_LOCATION_MASK EQU %01111111
+DEF CAUGHT_GENDER_MASK   EQU %10000000
+DEF CAUGHT_LOCATION_MASK EQU %01111111

-CAUGHT_BY_UNKNOWN EQU 0
-CAUGHT_BY_GIRL    EQU 1
-CAUGHT_BY_BOY     EQU 2
+DEF CAUGHT_BY_UNKNOWN EQU 0
+DEF CAUGHT_BY_GIRL    EQU 1
+DEF CAUGHT_BY_BOY     EQU 2

-CAUGHT_EGG_LEVEL EQU 1
+DEF CAUGHT_EGG_LEVEL EQU 1

-MON_CRY_LENGTH EQU 6
+DEF MON_CRY_LENGTH EQU 6

 ; maximum number of party pokemon
-PARTY_LENGTH EQU 6
+DEF PARTY_LENGTH EQU 6

 ; boxes
-MONS_PER_BOX EQU 20
+DEF MONS_PER_BOX EQU 20
 ; box: count, species, mons, OTs, nicknames, padding
-BOX_LENGTH EQU 1 + MONS_PER_BOX + 1 + (BOXMON_STRUCT_LENGTH + NAME_LENGTH + MON_NAME_LENGTH) * MONS_PER_BOX + 2 ; $450
-NUM_BOXES EQU 14
+DEF BOX_LENGTH EQU 1 + MONS_PER_BOX + 1 + (BOXMON_STRUCT_LENGTH + NAME_LENGTH + MON_NAME_LENGTH) * MONS_PER_BOX + 2 ; $450
+DEF NUM_BOXES EQU 14

 ; hall of fame
 ; hof_mon: species, id, dvs, level, nicknames
-HOF_MON_LENGTH EQU 1 + 2 + 2 + 1 + (MON_NAME_LENGTH - 1) ; $10
+DEF HOF_MON_LENGTH EQU 1 + 2 + 2 + 1 + (MON_NAME_LENGTH - 1) ; $10
 ; hall_of_fame: win count, party, terminator
-HOF_LENGTH EQU 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; $62
-NUM_HOF_TEAMS EQU 30
+DEF HOF_LENGTH EQU 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; $62
+DEF NUM_HOF_TEAMS EQU 30

 ; evolution types (used in data/pokemon/evos_attacks.asm)
 	const_def 1
@@ -169,14 +169,14 @@ NUM_HOF_TEAMS EQU 30

 ; wild data

-NUM_GRASSMON EQU 7 ; data/wild/*_grass.asm table size
-NUM_WATERMON EQU 3 ; data/wild/*_water.asm table size
+DEF NUM_GRASSMON EQU 7 ; data/wild/*_grass.asm table size
+DEF NUM_WATERMON EQU 3 ; data/wild/*_water.asm table size

-GRASS_WILDDATA_LENGTH EQU 2 + 3 + NUM_GRASSMON * 2 * 3
-WATER_WILDDATA_LENGTH EQU 2 + 1 + NUM_WATERMON * 2
-FISHGROUP_DATA_LENGTH EQU 1 + 2 * 3
+DEF GRASS_WILDDATA_LENGTH EQU 2 + 3 + NUM_GRASSMON * 2 * 3
+DEF WATER_WILDDATA_LENGTH EQU 2 + 1 + NUM_WATERMON * 2
+DEF FISHGROUP_DATA_LENGTH EQU 1 + 2 * 3

-NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.asm)
+DEF NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.asm)

 ; treemon sets
 ; TreeMons indexes (see data/wild/treemons.asm)
@@ -189,7 +189,7 @@ NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.asm)
 	const TREEMON_SET_LAKE
 	const TREEMON_SET_FOREST
 	const TREEMON_SET_ROCK
-NUM_TREEMON_SETS EQU const_value
+DEF NUM_TREEMON_SETS EQU const_value

 ; treemon scores
 	const_def
@@ -218,16 +218,16 @@ NUM_TREEMON_SETS EQU const_value
 	const HAPPINESS_REVIVALHERB       ; 11
 	const HAPPINESS_GROOMING          ; 12
 	const HAPPINESS_GAINLEVELATHOME   ; 13
-NUM_HAPPINESS_CHANGES EQU const_value - 1
+DEF NUM_HAPPINESS_CHANGES EQU const_value - 1

 ; significant happiness values
-BASE_HAPPINESS        EQU 70
-FRIEND_BALL_HAPPINESS EQU 200
-HAPPINESS_TO_EVOLVE   EQU 220
-HAPPINESS_THRESHOLD_1 EQU 100
-HAPPINESS_THRESHOLD_2 EQU 200
+DEF BASE_HAPPINESS        EQU 70
+DEF FRIEND_BALL_HAPPINESS EQU 200
+DEF HAPPINESS_TO_EVOLVE   EQU 220
+DEF HAPPINESS_THRESHOLD_1 EQU 100
+DEF HAPPINESS_THRESHOLD_2 EQU 200

 ; PP
-PP_UP_MASK EQU %11000000
-PP_UP_ONE  EQU %01000000
-PP_MASK    EQU %00111111
+DEF PP_UP_MASK EQU %11000000
+DEF PP_UP_ONE  EQU %01000000
+DEF PP_MASK    EQU %00111111