RGBDS syntax updates (#905)

New MACRO and DEF syntax

constants/wram_constants.asm

@@ -1,5 +1,5 @@
 ; wInputType::
-AUTO_INPUT EQU $ff
+DEF AUTO_INPUT EQU $ff
 
 ; wDebugFlags::
 	const_def
@@ -22,24 +22,24 @@ AUTO_INPUT EQU $ff
 	const WILDMON    ; 4
 
 ; wGameTimerPaused::
-GAME_TIMER_PAUSED_F EQU 0
-GAME_TIMER_MOBILE_F EQU 7
+DEF GAME_TIMER_PAUSED_F EQU 0
+DEF GAME_TIMER_MOBILE_F EQU 7
 
 ; wJoypadDisable::
-JOYPAD_DISABLE_MON_FAINT_F    EQU 6
-JOYPAD_DISABLE_SGB_TRANSFER_F EQU 7
+DEF JOYPAD_DISABLE_MON_FAINT_F    EQU 6
+DEF JOYPAD_DISABLE_SGB_TRANSFER_F EQU 7
 
 ; wOptions1::
-TEXT_DELAY_MASK EQU %111
+DEF TEXT_DELAY_MASK EQU %111
 	const_def 4
 	const NO_TEXT_SCROLL ; 4
 	const STEREO         ; 5
 	const BATTLE_SHIFT   ; 6
 	const BATTLE_SCENE   ; 7
 
-TEXT_DELAY_FAST EQU %001 ; 1
-TEXT_DELAY_MED  EQU %011 ; 3
-TEXT_DELAY_SLOW EQU %101 ; 5
+DEF TEXT_DELAY_FAST EQU %001 ; 1
+DEF TEXT_DELAY_MED  EQU %011 ; 3
+DEF TEXT_DELAY_SLOW EQU %101 ; 5
 
 ; wTextboxFrame::
 	const_def
@@ -51,7 +51,7 @@ TEXT_DELAY_SLOW EQU %101 ; 5
 	const FRAME_6 ; 5
 	const FRAME_7 ; 6
 	const FRAME_8 ; 7
-NUM_FRAMES EQU const_value
+DEF NUM_FRAMES EQU const_value
 
 ; wTextboxFlags::
 	const_def
@@ -59,11 +59,11 @@ NUM_FRAMES EQU const_value
 	const NO_TEXT_DELAY_F   ; 1
 
 ; wGBPrinterBrightness::
-GBPRINTER_LIGHTEST EQU $00
-GBPRINTER_LIGHTER  EQU $20
-GBPRINTER_NORMAL   EQU $40
-GBPRINTER_DARKER   EQU $60
-GBPRINTER_DARKEST  EQU $7f
+DEF GBPRINTER_LIGHTEST EQU $00
+DEF GBPRINTER_LIGHTER  EQU $20
+DEF GBPRINTER_NORMAL   EQU $40
+DEF GBPRINTER_DARKER   EQU $60
+DEF GBPRINTER_DARKEST  EQU $7f
 
 ; wOptions2::
 	const_def
@@ -76,12 +76,12 @@ GBPRINTER_DARKEST  EQU $7f
 	const UP       ; 1
 	const LEFT     ; 2
 	const RIGHT    ; 3
-NUM_DIRECTIONS EQU const_value
+DEF NUM_DIRECTIONS EQU const_value
 
-DOWN_MASK  EQU 1 << DOWN
-UP_MASK    EQU 1 << UP
-LEFT_MASK  EQU 1 << LEFT
-RIGHT_MASK EQU 1 << RIGHT
+DEF DOWN_MASK  EQU 1 << DOWN
+DEF UP_MASK    EQU 1 << UP
+DEF LEFT_MASK  EQU 1 << LEFT
+DEF RIGHT_MASK EQU 1 << RIGHT
 
 ; wFacingDirection::
 	const_def NUM_DIRECTIONS - 1, -1
@@ -89,15 +89,15 @@ RIGHT_MASK EQU 1 << RIGHT
 	shift_const FACE_UP    ; 4
 	shift_const FACE_LEFT  ; 2
 	shift_const FACE_RIGHT ; 1
-FACE_CURRENT EQU 0
+DEF FACE_CURRENT EQU 0
 
 ; wPokemonWithdrawDepositParameter::
-PC_WITHDRAW       EQU 0
-PC_DEPOSIT        EQU 1
-REMOVE_PARTY      EQU 0
-REMOVE_BOX        EQU 1
-DAY_CARE_WITHDRAW EQU 2
-DAY_CARE_DEPOSIT  EQU 3
+DEF PC_WITHDRAW       EQU 0
+DEF PC_DEPOSIT        EQU 1
+DEF REMOVE_PARTY      EQU 0
+DEF REMOVE_BOX        EQU 1
+DEF DAY_CARE_WITHDRAW EQU 2
+DEF DAY_CARE_DEPOSIT  EQU 3
 
 ; wPlayerStepFlags::
 	const_def 4
@@ -107,11 +107,11 @@ DAY_CARE_DEPOSIT  EQU 3
 	const PLAYERSTEP_START_F    ; 7
 
 ; wInitListType::
-INIT_ENEMYOT_LIST    EQU 1
-INIT_BAG_ITEM_LIST   EQU 2
-INIT_OTHER_ITEM_LIST EQU 3
-INIT_PLAYEROT_LIST   EQU 4
-INIT_MON_LIST        EQU 5
+DEF INIT_ENEMYOT_LIST    EQU 1
+DEF INIT_BAG_ITEM_LIST   EQU 2
+DEF INIT_OTHER_ITEM_LIST EQU 3
+DEF INIT_PLAYEROT_LIST   EQU 4
+DEF INIT_MON_LIST        EQU 5
 
 ; wTimeOfDay::
 	const_def
@@ -119,17 +119,17 @@ INIT_MON_LIST        EQU 5
 	const DAY_F      ; 1
 	const NITE_F     ; 2
 	const DARKNESS_F ; 3
-NUM_DAYTIMES EQU const_value
+DEF NUM_DAYTIMES EQU const_value
 
-MORN     EQU 1 << MORN_F
-DAY      EQU 1 << DAY_F
-NITE     EQU 1 << NITE_F
-DARKNESS EQU 1 << DARKNESS_F
+DEF MORN     EQU 1 << MORN_F
+DEF DAY      EQU 1 << DAY_F
+DEF NITE     EQU 1 << NITE_F
+DEF DARKNESS EQU 1 << DARKNESS_F
 
-ANYTIME EQU MORN | DAY | NITE
+DEF ANYTIME EQU MORN | DAY | NITE
 
 ; wTimeOfDayPalset::
-DARKNESS_PALSET EQU (DARKNESS_F << 6) | (DARKNESS_F << 4) | (DARKNESS_F << 2) | DARKNESS_F
+DEF DARKNESS_PALSET EQU (DARKNESS_F << 6) | (DARKNESS_F << 4) | (DARKNESS_F << 2) | DARKNESS_F
 
 ; wBattleAnimFlags::
 	const_def
@@ -139,14 +139,14 @@ DARKNESS_PALSET EQU (DARKNESS_F << 6) | (DARKNESS_F << 4) | (DARKNESS_F << 2) |
 	const BATTLEANIM_KEEPSPRITES_F   ; 3
 
 ; wPlayerSpriteSetupFlags::
-PLAYERSPRITESETUP_FACING_MASK       EQU %11
-PLAYERSPRITESETUP_FEMALE_TO_MALE_F  EQU 2
-PLAYERSPRITESETUP_CUSTOM_FACING_F   EQU 5
-PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F EQU 6
-PLAYERSPRITESETUP_RESET_ACTION_F    EQU 7
+DEF PLAYERSPRITESETUP_FACING_MASK       EQU %11
+DEF PLAYERSPRITESETUP_FEMALE_TO_MALE_F  EQU 2
+DEF PLAYERSPRITESETUP_CUSTOM_FACING_F   EQU 5
+DEF PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F EQU 6
+DEF PLAYERSPRITESETUP_RESET_ACTION_F    EQU 7
 
 ; wPlayerGender::
-PLAYERGENDER_FEMALE_F EQU 0
+DEF PLAYERGENDER_FEMALE_F EQU 0
 
 ; wMapStatus::
 	const_def
@@ -161,7 +161,7 @@ PLAYERGENDER_FEMALE_F EQU 0
 	const MAPEVENTS_OFF ; 1
 
 ; wScriptFlags::
-SCRIPT_RUNNING EQU 2
+DEF SCRIPT_RUNNING EQU 2
 
 ; wScriptMode::
 	const_def
@@ -171,8 +171,8 @@ SCRIPT_RUNNING EQU 2
 	const SCRIPT_WAIT
 
 ; wSpawnAfterChampion::
-SPAWN_LANCE EQU 1
-SPAWN_RED   EQU 2
+DEF SPAWN_LANCE EQU 1
+DEF SPAWN_RED   EQU 2
 
 ; wCurDay::
 	const_def
@@ -207,12 +207,12 @@ SPAWN_RED   EQU 2
 	const STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F    ; 7
 
 ; wMomSavingMoney::
-MOM_SAVING_SOME_MONEY_F EQU 0
-MOM_SAVING_HALF_MONEY_F EQU 1
-MOM_SAVING_ALL_MONEY_F  EQU 2
-MOM_ACTIVE_F            EQU 7
+DEF MOM_SAVING_SOME_MONEY_F EQU 0
+DEF MOM_SAVING_HALF_MONEY_F EQU 1
+DEF MOM_SAVING_ALL_MONEY_F  EQU 2
+DEF MOM_ACTIVE_F            EQU 7
 
-MOM_SAVING_MONEY_MASK EQU (1 << MOM_SAVING_SOME_MONEY_F) | (1 << MOM_SAVING_HALF_MONEY_F) | (1 << MOM_SAVING_ALL_MONEY_F)
+DEF MOM_SAVING_MONEY_MASK EQU (1 << MOM_SAVING_SOME_MONEY_F) | (1 << MOM_SAVING_HALF_MONEY_F) | (1 << MOM_SAVING_ALL_MONEY_F)
 
 ; wJohtoBadges::
 	const_def
@@ -224,7 +224,7 @@ MOM_SAVING_MONEY_MASK EQU (1 << MOM_SAVING_SOME_MONEY_F) | (1 << MOM_SAVING_HALF
 	const STORMBADGE
 	const GLACIERBADGE
 	const RISINGBADGE
-NUM_JOHTO_BADGES EQU const_value
+DEF NUM_JOHTO_BADGES EQU const_value
 
 ; wKantoBadges::
 	const_def
@@ -236,8 +236,8 @@ NUM_JOHTO_BADGES EQU const_value
 	const MARSHBADGE
 	const VOLCANOBADGE
 	const EARTHBADGE
-NUM_KANTO_BADGES EQU const_value
-NUM_BADGES EQU NUM_JOHTO_BADGES + NUM_KANTO_BADGES
+DEF NUM_KANTO_BADGES EQU const_value
+DEF NUM_BADGES       EQU NUM_JOHTO_BADGES + NUM_KANTO_BADGES
 
 ; wPokegearFlags::
 	const_def
@@ -249,18 +249,18 @@ NUM_BADGES EQU NUM_JOHTO_BADGES + NUM_KANTO_BADGES
 	const POKEGEAR_OBTAINED_F   ; 7
 
 ; wWhichRegisteredItem::
-REGISTERED_POCKET EQU %11000000
-REGISTERED_NUMBER EQU %00111111
+DEF REGISTERED_POCKET EQU %11000000
+DEF REGISTERED_NUMBER EQU %00111111
 
 ; wPlayerState::
-PLAYER_NORMAL    EQU 0
-PLAYER_BIKE      EQU 1
-PLAYER_SKATE     EQU 2
-PLAYER_SURF      EQU 4
-PLAYER_SURF_PIKA EQU 8
+DEF PLAYER_NORMAL    EQU 0
+DEF PLAYER_BIKE      EQU 1
+DEF PLAYER_SKATE     EQU 2
+DEF PLAYER_SURF      EQU 4
+DEF PLAYER_SURF_PIKA EQU 8
 
 ; wCelebiEvent::
-CELEBIEVENT_FOREST_IS_RESTLESS_F EQU 2
+DEF CELEBIEVENT_FOREST_IS_RESTLESS_F EQU 2
 
 ; wBikeFlags::
 	const_def
@@ -299,14 +299,14 @@ CELEBIEVENT_FOREST_IS_RESTLESS_F EQU 2
 	const SWARMFLAGS_MOBILE_4_F                  ; 4
 
 ; wLuckyNumberShowFlag::
-LUCKYNUMBERSHOW_GAME_OVER_F EQU 0
+DEF LUCKYNUMBERSHOW_GAME_OVER_F EQU 0
 
 ; wDayCareMan::
-DAYCAREMAN_HAS_MON_F         EQU 0
-DAYCAREMAN_MONS_COMPATIBLE_F EQU 5
-DAYCAREMAN_HAS_EGG_F         EQU 6
-DAYCAREMAN_ACTIVE_F          EQU 7
+DEF DAYCAREMAN_HAS_MON_F         EQU 0
+DEF DAYCAREMAN_MONS_COMPATIBLE_F EQU 5
+DEF DAYCAREMAN_HAS_EGG_F         EQU 6
+DEF DAYCAREMAN_ACTIVE_F          EQU 7
 
 ; wDayCareLady::
-DAYCARELADY_HAS_MON_F        EQU 0
-DAYCARELADY_ACTIVE_F         EQU 7
+DEF DAYCARELADY_HAS_MON_F        EQU 0
+DEF DAYCARELADY_ACTIVE_F         EQU 7