RGBDS syntax updates (#905)

New MACRO and DEF syntax

engine/battle/battle_transition.asm

@@ -1,13 +1,13 @@
 ; BattleTransitionJumptable.Jumptable indexes
-BATTLETRANSITION_CAVE             EQU $01
-BATTLETRANSITION_CAVE_STRONGER    EQU $09
-BATTLETRANSITION_NO_CAVE          EQU $10
-BATTLETRANSITION_NO_CAVE_STRONGER EQU $18
-BATTLETRANSITION_FINISH           EQU $20
-BATTLETRANSITION_END              EQU $80
+DEF BATTLETRANSITION_CAVE             EQU $01
+DEF BATTLETRANSITION_CAVE_STRONGER    EQU $09
+DEF BATTLETRANSITION_NO_CAVE          EQU $10
+DEF BATTLETRANSITION_NO_CAVE_STRONGER EQU $18
+DEF BATTLETRANSITION_FINISH           EQU $20
+DEF BATTLETRANSITION_END              EQU $80
 
-BATTLETRANSITION_SQUARE EQU "8" ; $fe
-BATTLETRANSITION_BLACK  EQU "9" ; $ff
+DEF BATTLETRANSITION_SQUARE EQU "8" ; $fe
+DEF BATTLETRANSITION_BLACK  EQU "9" ; $ff
 
 DoBattleTransition:
 	call .InitGFX
@@ -208,8 +208,8 @@ BattleTransitionJumptable:
 	const TRANS_NO_CAVE_STRONGER
 
 ; transition animation bits
-TRANS_STRONGER_F EQU 0 ; bit set in TRANS_CAVE_STRONGER and TRANS_NO_CAVE_STRONGER
-TRANS_NO_CAVE_F EQU 1 ; bit set in TRANS_NO_CAVE and TRANS_NO_CAVE_STRONGER
+DEF TRANS_STRONGER_F EQU 0 ; bit set in TRANS_CAVE_STRONGER and TRANS_NO_CAVE_STRONGER
+DEF TRANS_NO_CAVE_F  EQU 1 ; bit set in TRANS_NO_CAVE and TRANS_NO_CAVE_STRONGER
 
 StartTrainerBattle_DetermineWhichAnimation:
 ; The screen flashes a different number of times depending on the level of
@@ -422,11 +422,11 @@ endr
 	const LOWER_RIGHT
 
 ; quadrant bits
-RIGHT_QUADRANT_F EQU 0 ; bit set in UPPER_RIGHT and LOWER_RIGHT
-LOWER_QUADRANT_F EQU 1 ; bit set in LOWER_LEFT and LOWER_RIGHT
+DEF RIGHT_QUADRANT_F EQU 0 ; bit set in UPPER_RIGHT and LOWER_RIGHT
+DEF LOWER_QUADRANT_F EQU 1 ; bit set in LOWER_LEFT and LOWER_RIGHT
 
 .spin_quadrants:
-spin_quadrant: MACRO
+MACRO spin_quadrant
 	db \1
 	dw \2
 	dwcoord \3, \4
@@ -799,7 +799,7 @@ StartTrainerBattle_ZoomToBlack:
 	ret
 
 .boxes
-zoombox: MACRO
+MACRO zoombox
 ; width, height, start y, start x
 	db \1, \2
 	dwcoord \3, \4

engine/battle/effect_commands.asm

@@ -3067,9 +3067,9 @@ BattleCommand_DamageCalc:
 	call .CriticalMultiplier
 
 ; Update wCurDamage. Max 999 (capped at 997, then add 2).
-MAX_DAMAGE EQU 999
-MIN_DAMAGE EQU 2
-DAMAGE_CAP EQU MAX_DAMAGE - MIN_DAMAGE
+DEF MAX_DAMAGE EQU 999
+DEF MIN_DAMAGE EQU 2
+DEF DAMAGE_CAP EQU MAX_DAMAGE - MIN_DAMAGE
 
 	ld hl, wCurDamage
 	ld b, [hl]

engine/battle/move_effects/rollout.asm

@@ -1,4 +1,4 @@
-MAX_ROLLOUT_COUNT EQU 5
+DEF MAX_ROLLOUT_COUNT EQU 5
 
 BattleCommand_CheckCurl:
 ; checkcurl

engine/battle_anims/bg_effects.asm

@@ -852,7 +852,7 @@ BattleBGEffect_RunPicResizeScript:
 	dwcoord 14,  4
 
 .BGSquares:
-bgsquare: MACRO
+MACRO bgsquare
 	dn \1, \2
 	dw \3
 ENDM

engine/debug/debug_room.asm

@@ -3,7 +3,7 @@
 	const DEBUGROOMMENU_PAGE_1 ; 0
 	const DEBUGROOMMENU_PAGE_2 ; 1
 	const DEBUGROOMMENU_PAGE_3 ; 2
-DEBUGROOMMENU_NUM_PAGES EQU const_value
+DEF DEBUGROOMMENU_NUM_PAGES EQU const_value
 
 	; _DebugRoom.Strings and _DebugRoom.Jumptable indexes
 	const_def
@@ -538,7 +538,7 @@ DebugRoomMenu_DecorateAll:
 	call DebugRoom_SaveChecksum
 	ret
 
-paged_value: MACRO
+MACRO paged_value
 	dw \1 ; value address
 	db \2 ; min value
 	db \3 ; max value
@@ -548,7 +548,7 @@ paged_value: MACRO
 	db \7 ; is hex value?
 ENDM
 
-PAGED_VALUE_SIZE EQU 10
+DEF PAGED_VALUE_SIZE EQU 10
 
 DebugRoom_EditPagedValues:
 	xor a

engine/events/celebi.asm

@@ -1,4 +1,4 @@
-SPECIALCELEBIEVENT_CELEBI EQU $84
+DEF SPECIALCELEBIEVENT_CELEBI EQU $84
 
 UnusedForestTreeFrames: ; unreferenced
 INCBIN "gfx/tilesets/forest-tree/1.2bpp"

engine/events/field_moves.asm

@@ -1,6 +1,6 @@
-FIELDMOVE_GRASS EQU $80
-FIELDMOVE_TREE EQU $84
-FIELDMOVE_FLY EQU $84
+DEF FIELDMOVE_GRASS EQU $80
+DEF FIELDMOVE_TREE  EQU $84
+DEF FIELDMOVE_FLY   EQU $84
 
 PlayWhirlpoolSound:
 	call WaitSFX

engine/events/halloffame.asm

@@ -1,4 +1,4 @@
-HALLOFFAME_COLON EQU $63
+DEF HALLOFFAME_COLON EQU $63
 
 HallOfFame::
 	call HallOfFame_FadeOutMusic

engine/events/heal_machine_anim.asm

@@ -59,11 +59,11 @@ HealMachineAnim:
 	dw .ElmsLab
 	dw .HallOfFame
 
-healmachineanimseq: MACRO
-rept _NARG
-	db HEALMACHINESTATE_\1
-	shift
-endr
+MACRO healmachineanimseq
+	rept _NARG
+		db HEALMACHINESTATE_\1
+		shift
+	endr
 ENDM
 
 .Pokecenter:

engine/events/map_name_sign.asm

@@ -1,4 +1,4 @@
-MAP_NAME_SIGN_START EQU $60
+DEF MAP_NAME_SIGN_START EQU $60
 
 InitMapNameSign::
 	xor a

engine/events/mom_phone.asm

@@ -1,5 +1,5 @@
-NUM_MOM_ITEMS_1 EQUS "((MomItems_1.End - MomItems_1) / 8)"
-NUM_MOM_ITEMS_2 EQUS "((MomItems_2.End - MomItems_2) / 8)"
+DEF NUM_MOM_ITEMS_1 EQUS "((MomItems_1.End - MomItems_1) / 8)"
+DEF NUM_MOM_ITEMS_2 EQUS "((MomItems_2.End - MomItems_2) / 8)"
 
 	const_def 1
 	const MOM_ITEM

engine/events/print_unown.asm

@@ -1,5 +1,5 @@
-UNOWNSTAMP_BOLD_A EQU "♂" ; $ef
-UNOWNSTAMP_BOLD_B EQU "♀" ; $f5
+DEF UNOWNSTAMP_BOLD_A EQU "♂" ; $ef
+DEF UNOWNSTAMP_BOLD_B EQU "♀" ; $f5
 
 _UnownPrinter:
 	ld a, [wUnownDex]

engine/events/shuckle.asm

@@ -1,4 +1,4 @@
-MANIA_OT_ID EQU 00518
+DEF MANIA_OT_ID EQU 00518
 
 GiveShuckle:
 ; Adding to the party.

engine/events/std_scripts.asm

@@ -1,4 +1,4 @@
-add_stdscript: MACRO
+MACRO add_stdscript
 \1StdScript::
 	dba \1
 ENDM

engine/games/card_flip.asm

@@ -1,7 +1,7 @@
-CARDFLIP_LIGHT_OFF EQU "♂" ; $ef
-CARDFLIP_LIGHT_ON  EQU "♀" ; $f5
+DEF CARDFLIP_LIGHT_OFF EQU "♂" ; $ef
+DEF CARDFLIP_LIGHT_ON  EQU "♀" ; $f5
 
-CARDFLIP_DECK_SIZE EQUS "(wDeckEnd - wDeck)"
+DEF CARDFLIP_DECK_SIZE EQUS "(wDeckEnd - wDeck)"
 	assert wDiscardPileEnd - wDiscardPile == wDeckEnd - wDeck
 
 MemoryGameGFX:
@@ -1337,14 +1337,14 @@ CardFlip_UpdateCursorOAM:
 	ret
 
 .OAMData:
-cardflip_cursor: MACRO
-if _NARG >= 5
-	dbpixel \1, \2, \3, \4
-	dw \5
-else
-	dbpixel \1, \2
-	dw \3
-endc
+MACRO cardflip_cursor
+	if _NARG >= 5
+		dbpixel \1, \2, \3, \4
+		dw \5
+	else
+		dbpixel \1, \2
+		dw \3
+	endc
 ENDM
 
 	cardflip_cursor 11,  2,       .Impossible

engine/games/slot_machine.asm

@@ -6,26 +6,26 @@
 	const SLOTS_PIKACHU  ; $0c
 	const SLOTS_SQUIRTLE ; $10
 	const SLOTS_STARYU   ; $14
-NUM_SLOT_REELS EQU const_value / 4 ; 6
-SLOTS_NO_MATCH EQU -1
+DEF NUM_SLOT_REELS EQU const_value / 4 ; 6
+DEF SLOTS_NO_MATCH EQU -1
 
 ; wSlotBias values
-SLOTS_NO_BIAS  EQU -1
+DEF SLOTS_NO_BIAS EQU -1
 
-REEL_SIZE EQU 15
+DEF REEL_SIZE EQU 15
 
 ; Constants for slot_reel offsets (see macros/wram.asm)
-REEL_ACTION        EQUS "(wReel1ReelAction - wReel1)"
-REEL_TILEMAP_ADDR  EQUS "(wReel1TilemapAddr - wReel1)"
-REEL_POSITION      EQUS "(wReel1Position - wReel1)"
-REEL_SPIN_DISTANCE EQUS "(wReel1SpinDistance - wReel1)"
-REEL_SPIN_RATE     EQUS "(wReel1SpinRate - wReel1)"
-REEL_OAM_ADDR      EQUS "(wReel1OAMAddr - wReel1)"
-REEL_X_COORD       EQUS "(wReel1XCoord - wReel1)"
-REEL_MANIP_COUNTER EQUS "(wReel1ManipCounter - wReel1)"
-REEL_MANIP_DELAY   EQUS "(wReel1ManipDelay - wReel1)"
-REEL_FIELD_0B      EQUS "(wReel1Field0b - wReel1)"
-REEL_STOP_DELAY    EQUS "(wReel1StopDelay - wReel1)"
+DEF REEL_ACTION        EQUS "(wReel1ReelAction - wReel1)"
+DEF REEL_TILEMAP_ADDR  EQUS "(wReel1TilemapAddr - wReel1)"
+DEF REEL_POSITION      EQUS "(wReel1Position - wReel1)"
+DEF REEL_SPIN_DISTANCE EQUS "(wReel1SpinDistance - wReel1)"
+DEF REEL_SPIN_RATE     EQUS "(wReel1SpinRate - wReel1)"
+DEF REEL_OAM_ADDR      EQUS "(wReel1OAMAddr - wReel1)"
+DEF REEL_X_COORD       EQUS "(wReel1XCoord - wReel1)"
+DEF REEL_MANIP_COUNTER EQUS "(wReel1ManipCounter - wReel1)"
+DEF REEL_MANIP_DELAY   EQUS "(wReel1ManipDelay - wReel1)"
+DEF REEL_FIELD_0B      EQUS "(wReel1Field0b - wReel1)"
+DEF REEL_STOP_DELAY    EQUS "(wReel1StopDelay - wReel1)"
 
 ; SlotsJumptable constants
 	const_def
@@ -48,7 +48,7 @@ REEL_STOP_DELAY    EQUS "(wReel1StopDelay - wReel1)"
 	const SLOTS_PAYOUT_ANIM
 	const SLOTS_RESTART_OF_QUIT
 	const SLOTS_QUIT
-SLOTS_END_LOOP_F EQU 7
+DEF SLOTS_END_LOOP_F EQU 7
 
 ; ReelActionJumptable constants
 	const_def

engine/games/unown_puzzle.asm

@@ -1,7 +1,7 @@
-PUZZLE_BORDER EQU $ee
-PUZZLE_VOID   EQU $ef
+DEF PUZZLE_BORDER EQU $ee
+DEF PUZZLE_VOID   EQU $ef
 
-puzcoord EQUS "* 6 +"
+DEF puzcoord EQUS "* 6 +"
 
 _UnownPuzzle:
 	ldh a, [hInMenu]
@@ -112,11 +112,11 @@ InitUnownPuzzlePiecePositions:
 	ret
 
 .PuzzlePieceInitialPositions:
-initpuzcoord: MACRO
-rept _NARG / 2
-	db \1 puzcoord \2
-	shift 2
-endr
+MACRO initpuzcoord
+	rept _NARG / 2
+		db \1 puzcoord \2
+		shift 2
+	endr
 ENDM
 	initpuzcoord 0,0, 0,1, 0,2, 0,3, 0,4, 0,5
 	initpuzcoord 1,0,                     1,5
@@ -568,7 +568,7 @@ RedrawUnownPuzzlePieces:
 
 UnownPuzzleCoordData:
 
-puzzle_coords: MACRO
+MACRO puzzle_coords
 	dbpixel \1, \2, \3, \4
 	dwcoord \5, \6
 	db \7, \8

engine/gfx/color.asm

@@ -1,9 +1,9 @@
 INCLUDE "engine/gfx/sgb_layouts.asm"
 
-SHINY_ATK_BIT EQU 5
-SHINY_DEF_VAL EQU 10
-SHINY_SPD_VAL EQU 10
-SHINY_SPC_VAL EQU 10
+DEF SHINY_ATK_BIT EQU 5
+DEF SHINY_DEF_VAL EQU 10
+DEF SHINY_SPD_VAL EQU 10
+DEF SHINY_SPC_VAL EQU 10
 
 CheckShininess:
 ; Check if a mon is shiny by DVs at bc.

engine/gfx/load_pics.asm

@@ -247,7 +247,7 @@ GetMonBackpic:
 FixPicBank:
 ; This is a thing for some reason.
 
-PICS_FIX EQU $36
+DEF PICS_FIX EQU $36
 EXPORT PICS_FIX
 
 	push hl

engine/gfx/pic_animation.asm

@@ -46,11 +46,11 @@ AnimateMon_HOF:
 	call AnimateFrontpic
 	ret
 
-pokeanim: MACRO
-rept _NARG
-	db (PokeAnim_\1_SetupCommand - PokeAnim_SetupCommands) / 2
-	shift
-endr
+MACRO pokeanim
+	rept _NARG
+		db (PokeAnim_\1_SetupCommand - PokeAnim_SetupCommands) / 2
+		shift
+	endr
 	db (PokeAnim_Finish_SetupCommand - PokeAnim_SetupCommands) / 2
 ENDM
 
@@ -128,7 +128,7 @@ SetUpPokeAnim:
 	scf
 	ret
 
-add_setup_command: MACRO
+MACRO add_setup_command
 \1_SetupCommand:
 	dw \1
 ENDM
@@ -533,12 +533,12 @@ PokeAnim_CopyBitmaskToBuffer:
 
 .Sizes: db 4, 5, 7
 
-poke_anim_box: MACRO
-for y, 1, \1 + 1
-for x, 7 - \1, 7
-	db y * 7 + x
-endr
-endr
+MACRO poke_anim_box
+	for y, 1, \1 + 1
+		for x, 7 - \1, 7
+			db y * 7 + x
+		endr
+	endr
 ENDM
 
 PokeAnim_ConvertAndApplyBitmask: