RGBDS syntax updates (#86)

New MACRO and DEF syntax

36 files changed, 68 insertions, 68 deletions

diff --git a/data/battle_anims/special_effect_pointers.asm b/data/battle_anims/special_effect_pointers.asm
index 4e2fb857..4089d557 100644
--- a/data/battle_anims/special_effect_pointers.asm
+++ b/data/battle_anims/special_effect_pointers.asm
@@ -1,4 +1,4 @@
-special_effect: MACRO
+MACRO special_effect
 	db \1
 	dw \2
 ENDM
diff --git a/data/battle_anims/special_effects.asm b/data/battle_anims/special_effects.asm
index dd73ff8d..382c701d 100644
--- a/data/battle_anims/special_effects.asm
+++ b/data/battle_anims/special_effects.asm
@@ -1,4 +1,4 @@
-anim_special_effect: MACRO
+MACRO anim_special_effect
 	db \1
 	dw \2
 ENDM
diff --git a/data/battle_anims/subanimations.asm b/data/battle_anims/subanimations.asm
index 54d346a6..d67d4641 100644
--- a/data/battle_anims/subanimations.asm
+++ b/data/battle_anims/subanimations.asm
@@ -94,7 +94,7 @@ SubanimationPointers:
 ;     db frame block id, base coordinate id, frame block mode
 ; ENDR
 
-subanim: MACRO
+MACRO subanim
 	db (\1 << 5) | \2
 ENDM
 
diff --git a/data/events/bench_guys.asm b/data/events/bench_guys.asm
index f597a26d..363b1887 100644
--- a/data/events/bench_guys.asm
+++ b/data/events/bench_guys.asm
@@ -1,4 +1,4 @@
-bench_guy_text: MACRO
+MACRO bench_guy_text
 	db \1, \2
 	db_tx_pre \3
 ENDM
diff --git a/data/events/hidden_coins.asm b/data/events/hidden_coins.asm
index bcdbcd80..f2485f50 100644
--- a/data/events/hidden_coins.asm
+++ b/data/events/hidden_coins.asm
@@ -1,4 +1,4 @@
-hidden_coin: MACRO
+MACRO hidden_coin
 	db \1, \3, \2
 ENDM
 
diff --git a/data/events/hidden_item_coords.asm b/data/events/hidden_item_coords.asm
index 5705feed..1201c270 100644
--- a/data/events/hidden_item_coords.asm
+++ b/data/events/hidden_item_coords.asm
@@ -1,4 +1,4 @@
-hidden_item: MACRO
+MACRO hidden_item
 	db \1, \3, \2
 ENDM
 
diff --git a/data/events/hidden_objects.asm b/data/events/hidden_objects.asm
index 2afd1275..3e8ea745 100644
--- a/data/events/hidden_objects.asm
+++ b/data/events/hidden_objects.asm
@@ -82,14 +82,14 @@ HiddenObjectMaps:
 	dbw CINNABAR_POKECENTER,          CinnabarPokecenterHiddenObjects
 	db -1 ; end
 
-hidden_object: MACRO
+MACRO hidden_object
 	db \2 ; y coord
 	db \1 ; x coord
 	db \3 ; item id
 	dba \4 ; object routine
 ENDM
 
-hidden_text_predef: MACRO
+MACRO hidden_text_predef
 	db \2 ; y coord
 	db \1 ; x coord
 	db_tx_pre \3 ; text id
@@ -99,7 +99,7 @@ ENDM
 ; Some hidden objects use SPRITE_FACING_* values,
 ; but these do not actually prevent the player
 ; from interacting with them in any direction.
-ANY_FACING EQU $d0
+DEF ANY_FACING EQU $d0
 
 SilphCo11FHiddenObjects:
 	hidden_object 10, 12, SPRITE_FACING_UP, OpenPokemonCenterPC
diff --git a/data/growth_rates.asm b/data/growth_rates.asm
index cc0955e4..aaba27a8 100644
--- a/data/growth_rates.asm
+++ b/data/growth_rates.asm
@@ -1,4 +1,4 @@
-growth_rate: MACRO
+MACRO growth_rate
 ; [1]/[2]*n**3 + [3]*n**2 + [4]*n - [5]
 	dn \1, \2
 	if \3 < 0
diff --git a/data/icon_pointers.asm b/data/icon_pointers.asm
index 9092e1b1..c7441e8b 100644
--- a/data/icon_pointers.asm
+++ b/data/icon_pointers.asm
@@ -1,4 +1,4 @@
-mon_icon_header: MACRO
+MACRO mon_icon_header
 	dw \1 tile \2
 	db \3
 	db BANK(\1)
diff --git a/data/items/vending_prices.asm b/data/items/vending_prices.asm
index 9680c48d..39f6dfde 100644
--- a/data/items/vending_prices.asm
+++ b/data/items/vending_prices.asm
@@ -1,4 +1,4 @@
-vend_item: MACRO
+MACRO vend_item
 	db \1
 	bcd3 \2
 ENDM
diff --git a/data/maps/force_bike_surf.asm b/data/maps/force_bike_surf.asm
index 74eba325..01416d89 100644
--- a/data/maps/force_bike_surf.asm
+++ b/data/maps/force_bike_surf.asm
@@ -1,4 +1,4 @@
-force_bike_surf: MACRO
+MACRO force_bike_surf
 	db \1, \3, \2
 ENDM
 
diff --git a/data/maps/special_warps.asm b/data/maps/special_warps.asm
index 56dac3a5..cad320ed 100644
--- a/data/maps/special_warps.asm
+++ b/data/maps/special_warps.asm
@@ -17,7 +17,7 @@ DungeonWarpList:
 	db -1 ; end
 
 
-fly_warp: MACRO
+MACRO fly_warp
 	event_displacement \1_WIDTH, \2, \3
 	db ((\3) & $01) ;sub-block Y
 	db ((\2) & $01) ;sub-block X
@@ -38,7 +38,7 @@ DungeonWarpData:
 	fly_warp POKEMON_MANSION_2F,  18, 14
 
 
-special_warp_spec: MACRO
+MACRO special_warp_spec
 	db \1
 	fly_warp \1, \2, \3
 	db \4
@@ -56,7 +56,7 @@ ColosseumSpec2:
 	special_warp_spec COLOSSEUM,     6, 4, CLUB
 
 
-fly_warp_spec: MACRO
+MACRO fly_warp_spec
 	db \1, 0
 	dw \2
 ENDM
diff --git a/data/maps/sprite_sets.asm b/data/maps/sprite_sets.asm
index b42e9245..b12ba9ce 100644
--- a/data/maps/sprite_sets.asm
+++ b/data/maps/sprite_sets.asm
@@ -39,8 +39,8 @@ MapSpriteSets:
 	db $02 ; ROUTE_25
 	assert_table_length FIRST_INDOOR_MAP
 
-EAST_WEST   EQU 1
-NORTH_SOUTH EQU 2
+DEF EAST_WEST   EQU 1
+DEF NORTH_SOUTH EQU 2
 
 ; Format:
 ; 00: determines whether the map is split EAST_WEST or NORTH_SOUTH
@@ -64,7 +64,7 @@ SplitMapSpriteSets:
 SpriteSets:
 
 ; each sprite set has 9 walking sprites and 2 still sprites
-SPRITE_SET_LENGTH EQU 9 + 2
+DEF SPRITE_SET_LENGTH EQU 9 + 2
 
 ; sprite set $01
 	table_width 1
diff --git a/data/maps/town_map_entries.asm b/data/maps/town_map_entries.asm
index 954a3ee9..5fd77c7c 100644
--- a/data/maps/town_map_entries.asm
+++ b/data/maps/town_map_entries.asm
@@ -1,4 +1,4 @@
-external_map: MACRO
+MACRO external_map
 	dn \2, \1
 	dw \3
 ENDM
@@ -47,7 +47,7 @@ ExternalMapEntries:
 	assert_table_length FIRST_INDOOR_MAP
 
 
-internal_map: MACRO
+MACRO internal_map
 	db \1 + 1
 	dn \3, \2
 	dw \4
diff --git a/data/moves/animations.asm b/data/moves/animations.asm
index 15f1ad52..1cc44fe7 100644
--- a/data/moves/animations.asm
+++ b/data/moves/animations.asm
@@ -213,7 +213,7 @@ AttackAnimationPointers:
 ; if \2 is a subanimation_id:
 ;\3: tileset_id
 ;\4: delay
-battle_anim: MACRO
+MACRO battle_anim
 	IF _NARG == 4
 		db (\3 << 6) | \4
 		db \1 - 1
diff --git a/data/moves/moves.asm b/data/moves/moves.asm
index 0e52e01c..b7e5e7af 100644
--- a/data/moves/moves.asm
+++ b/data/moves/moves.asm
@@ -1,4 +1,4 @@
-move: MACRO
+MACRO move
 	db \1 ; animation (interchangeable with move id)
 	db \2 ; effect
 	db \3 ; power
diff --git a/data/pikachu/pikachu_pic_animation.asm b/data/pikachu/pikachu_pic_animation.asm
index 89eedc8d..746db750 100644
--- a/data/pikachu/pikachu_pic_animation.asm
+++ b/data/pikachu/pikachu_pic_animation.asm
@@ -326,15 +326,15 @@ PikaPicAnimScript28:
 	pikapic_cry
 	pikapic_looptofinish
 
-pikapicanimgfx: MACRO
-IF _NARG == 2
-\2_id::
-	db \1  ; size (-1 if compressed)
-	dba \2 ; pointer
-ELSE
-	db \1 ; size
-	dbw \2, \3 ; bank, address
-ENDC
+MACRO pikapicanimgfx
+	IF _NARG == 2
+	\2_id::
+		db \1  ; size (-1 if compressed)
+		dba \2 ; pointer
+	ELSE
+		db \1 ; size
+		dbw \2, \3 ; bank, address
+	ENDC
 ENDM
 
 PikaPicAnimGFXHeaders:
diff --git a/data/pikachu/pikachu_pic_objects.asm b/data/pikachu/pikachu_pic_objects.asm
index 7a1f2746..ac866345 100644
--- a/data/pikachu/pikachu_pic_objects.asm
+++ b/data/pikachu/pikachu_pic_objects.asm
@@ -1,4 +1,4 @@
-pikaanim_def: MACRO
+MACRO pikaanim_def
 \1_id:
 	dw \1
 ENDM
@@ -41,12 +41,12 @@ PikaPicAnimBGFramesPointers:
 	pikaanim_def PikaPicAnimBGFrames_34 ; 22
 	pikaanim_def PikaPicAnimBGFrames_35 ; 23
 
-pikaframe: MACRO
+MACRO pikaframe
 	db (\1_id - PikaPicTilemapPointers) / 2, \2
 ENDM
 
-pikaframedelay EQUS "db 0,"
-pikaframeend EQUS "db $e0"
+DEF pikaframedelay EQUS "db 0,"
+DEF pikaframeend EQUS "db $e0"
 
 PikaPicAnimBGFrames_0:
 PikaPicAnimBGFrames_1:
diff --git a/data/pikachu/pikachu_pic_tilemaps.asm b/data/pikachu/pikachu_pic_tilemaps.asm
index d11ba04e..df06b2a1 100644
--- a/data/pikachu/pikachu_pic_tilemaps.asm
+++ b/data/pikachu/pikachu_pic_tilemaps.asm
@@ -1,4 +1,4 @@
-pikatilemap_def: MACRO
+MACRO pikatilemap_def
 \1_id:
 	dw \1
 ENDM
diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm
index f823cdef..290f5625 100644
--- a/data/pokemon/cries.asm
+++ b/data/pokemon/cries.asm
@@ -1,4 +1,4 @@
-mon_cry: MACRO
+MACRO mon_cry
 	db (\1 - CRY_SFX_START) / 3
 	db \2, \3
 ENDM
diff --git a/data/predef_pointers.asm b/data/predef_pointers.asm
index b8911f3c..eaef75f6 100644
--- a/data/predef_pointers.asm
+++ b/data/predef_pointers.asm
@@ -1,10 +1,10 @@
-add_predef: MACRO
+MACRO add_predef
 \1Predef::
-IF _NARG == 1
-	dba \1
-ELSE
-	dbw \2, \1
-ENDC
+	IF _NARG == 1
+		dba \1
+	ELSE
+		dbw \2, \1
+	ENDC
 ENDM
 
 PredefPointers::
diff --git a/data/sgb/sgb_packets.asm b/data/sgb/sgb_packets.asm
index 38257fa1..a4dab95a 100644
--- a/data/sgb/sgb_packets.asm
+++ b/data/sgb/sgb_packets.asm
@@ -1,51 +1,51 @@
-ATTR_BLK: MACRO
+MACRO ATTR_BLK
 ; This is a command macro.
 ; Use ATTR_BLK_DATA for data sets.
 	db ($4 << 3) + ((\1 * 6) / 16 + 1)
 	db \1
 ENDM
 
-ATTR_BLK_DATA: MACRO
+MACRO ATTR_BLK_DATA
 	db \1 ; which regions are affected
 	db \2 + (\3 << 2) + (\4 << 4) ; palette for each region
 	db \5, \6, \7, \8 ; x1, y1, x2, y2
 ENDM
 
-PAL_SET: MACRO
+MACRO PAL_SET
 	db ($a << 3) + 1
 	dw \1, \2, \3, \4
 	ds 7, 0
 ENDM
 
-PAL_TRN: MACRO
+MACRO PAL_TRN
 	db ($b << 3) + 1
 	ds 15, 0
 ENDM
 
-MLT_REQ: MACRO
+MACRO MLT_REQ
 	db ($11 << 3) + 1
 	db \1 - 1
 	ds 14, 0
 ENDM
 
-CHR_TRN: MACRO
+MACRO CHR_TRN
 	db ($13 << 3) + 1
 	db \1 + (\2 << 1)
 	ds 14, 0
 ENDM
 
-PCT_TRN: MACRO
+MACRO PCT_TRN
 	db ($14 << 3) + 1
 	ds 15, 0
 ENDM
 
-MASK_EN: MACRO
+MACRO MASK_EN
 	db ($17 << 3) + 1
 	db \1
 	ds 14, 0
 ENDM
 
-DATA_SND: MACRO
+MACRO DATA_SND
 	db ($f << 3) + 1
 	dw \1 ; address
 	db \2 ; bank
diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm
index 47b52b1c..f033230b 100644
--- a/data/sprites/sprites.asm
+++ b/data/sprites/sprites.asm
@@ -1,4 +1,4 @@
-overworld_sprite: MACRO
+MACRO overworld_sprite
 	dw \1
 	db \2 tiles
 	db BANK(\1)
diff --git a/data/text_boxes.asm b/data/text_boxes.asm
index 34e6a414..f96f2d68 100644
--- a/data/text_boxes.asm
+++ b/data/text_boxes.asm
@@ -15,7 +15,7 @@ TextBoxCoordTable:
 	db MON_SPRITE_POPUP,  6,  4, 14, 13
 	db -1 ; end
 
-text_box_text: MACRO
+MACRO text_box_text
 	db \1 ; text box ID
 	db \2, \3, \4, \5 ; text box coordinates
 	dw \6 ; text pointer
diff --git a/data/text_predef_pointers.asm b/data/text_predef_pointers.asm
index df882ebd..f16ec383 100644
--- a/data/text_predef_pointers.asm
+++ b/data/text_predef_pointers.asm
@@ -1,4 +1,4 @@
-add_tx_pre: MACRO
+MACRO add_tx_pre
 \1_id::
 	dw \1
 ENDM
diff --git a/data/tilemaps.asm b/data/tilemaps.asm
index 3b1e24c9..3e1033be 100644
--- a/data/tilemaps.asm
+++ b/data/tilemaps.asm
@@ -1,4 +1,4 @@
-tile_ids: MACRO
+MACRO tile_ids
 	dw \1
 	dn \3, \2
 ENDM
diff --git a/data/tilesets/bookshelf_tile_ids.asm b/data/tilesets/bookshelf_tile_ids.asm
index 55143d73..71529761 100644
--- a/data/tilesets/bookshelf_tile_ids.asm
+++ b/data/tilesets/bookshelf_tile_ids.asm
@@ -1,4 +1,4 @@
-bookshelf_tile: MACRO
+MACRO bookshelf_tile
 	db \1, \2
 	db_tx_pre \3
 ENDM
diff --git a/data/tilesets/collision_tile_ids.asm b/data/tilesets/collision_tile_ids.asm
index eb09f4fb..79eee75b 100644
--- a/data/tilesets/collision_tile_ids.asm
+++ b/data/tilesets/collision_tile_ids.asm
@@ -1,4 +1,4 @@
-coll_tiles: MACRO
+MACRO coll_tiles
 	IF _NARG
 		db \# ; all args
 	ENDC
diff --git a/data/tilesets/door_tile_ids.asm b/data/tilesets/door_tile_ids.asm
index 950115e0..ef47113a 100644
--- a/data/tilesets/door_tile_ids.asm
+++ b/data/tilesets/door_tile_ids.asm
@@ -15,7 +15,7 @@ DoorTileIDPointers:
 	dbw INTERIOR,    .InteriorDoorTileIDs
 	db -1 ; end
 
-door_tiles: MACRO
+MACRO door_tiles
 	IF _NARG
 		db \# ; all args
 	ENDC
diff --git a/data/tilesets/spinner_tiles.asm b/data/tilesets/spinner_tiles.asm
index 82506b6d..9ce3deb3 100644
--- a/data/tilesets/spinner_tiles.asm
+++ b/data/tilesets/spinner_tiles.asm
@@ -1,4 +1,4 @@
-spinner: MACRO
+MACRO spinner
 ; \1: source
 ; \2: offset (BANK() chokes on literals)
 ; \3: dest
diff --git a/data/tilesets/tileset_headers.asm b/data/tilesets/tileset_headers.asm
index 3355de6d..76f4fc63 100644
--- a/data/tilesets/tileset_headers.asm
+++ b/data/tilesets/tileset_headers.asm
@@ -1,4 +1,4 @@
-tileset: MACRO
+MACRO tileset
 	db BANK(\1_GFX)
 	dw \1_Block, \1_GFX, \1_Coll
 	db \2, \3, \4 ; counter tiles
diff --git a/data/tilesets/warp_carpet_tile_ids.asm b/data/tilesets/warp_carpet_tile_ids.asm
index a8a19011..1b8ebbbe 100644
--- a/data/tilesets/warp_carpet_tile_ids.asm
+++ b/data/tilesets/warp_carpet_tile_ids.asm
@@ -4,7 +4,7 @@ WarpTileListPointers:
 	dw .FacingLeftWarpTiles
 	dw .FacingRightWarpTiles
 
-warp_carpet_tiles: MACRO
+MACRO warp_carpet_tiles
 	IF _NARG
 		db \# ; all args
 	ENDC
diff --git a/data/tilesets/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm
index 61b93a36..2f976cdd 100644
--- a/data/tilesets/warp_tile_ids.asm
+++ b/data/tilesets/warp_tile_ids.asm
@@ -27,7 +27,7 @@ WarpTileIDPointers:
 	dw .BeachHouseWarpTileIDs
 	assert_table_length NUM_TILESETS
 
-warp_tiles: MACRO
+MACRO warp_tiles
 	IF _NARG
 		db \# ; all args
 	ENDC
diff --git a/data/trainers/move_choices.asm b/data/trainers/move_choices.asm
index 4f694cce..e02381a8 100644
--- a/data/trainers/move_choices.asm
+++ b/data/trainers/move_choices.asm
@@ -1,9 +1,9 @@
-move_choices: MACRO
+MACRO move_choices
 	IF _NARG
 		db \# ; all args
 	ENDC
 	db 0 ; end
-list_index += 1
+	DEF list_index += 1
 ENDM
 
 ; move choice modification methods that are applied for each trainer class
diff --git a/data/trainers/pic_pointers_money.asm b/data/trainers/pic_pointers_money.asm
index c60a3ef9..ada0afc2 100644
--- a/data/trainers/pic_pointers_money.asm
+++ b/data/trainers/pic_pointers_money.asm
@@ -1,4 +1,4 @@
-pic_money: MACRO
+MACRO pic_money
 	dw \1
 	bcd3 \2
 ENDM
diff --git a/data/yes_no_menu_strings.asm b/data/yes_no_menu_strings.asm
index e6e23279..82c3a3a5 100644
--- a/data/yes_no_menu_strings.asm
+++ b/data/yes_no_menu_strings.asm
@@ -1,4 +1,4 @@
-two_option_menu: MACRO
+MACRO two_option_menu
 	db \1, \2, \3
 	dw \4
 ENDM