RGBDS syntax updates (#86)

New MACRO and DEF syntax

15 files changed, 20 insertions, 20 deletions

diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index 61ad93dc..8cd62d2b 100644
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -392,7 +392,7 @@ LoadAnimationTileset:
 	ld c, a ; number of tiles
 	jp CopyVideoData ; load tileset
 
-anim_tileset: MACRO
+MACRO anim_tileset
 	db \1
 	dw \2
 	db -1 ; padding
diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm
index 6d3a4f9c..88cd1d6e 100644
--- a/engine/battle/battle_transitions.asm
+++ b/engine/battle/battle_transitions.asm
@@ -666,7 +666,7 @@ BattleTransition_Circle_Sub2:
 	const CIRCLE_LEFT
 	const CIRCLE_RIGHT
 
-half_circle: MACRO
+MACRO half_circle
 	; quadrant x, circle data, target coord
 	db \1
 	dw \2
diff --git a/engine/events/diploma2.asm b/engine/events/diploma2.asm
index 75ac104a..efc3b9cd 100644
--- a/engine/events/diploma2.asm
+++ b/engine/events/diploma2.asm
@@ -1,4 +1,4 @@
-CIRCLE_TILE_ID EQU $10
+DEF CIRCLE_TILE_ID EQU $10
 
 _DisplayDiploma:
 	call GBPalWhiteOutWithDelay3
diff --git a/engine/events/hidden_objects/cinnabar_gym_quiz.asm b/engine/events/hidden_objects/cinnabar_gym_quiz.asm
index da550c76..629f2dce 100644
--- a/engine/events/hidden_objects/cinnabar_gym_quiz.asm
+++ b/engine/events/hidden_objects/cinnabar_gym_quiz.asm
@@ -201,12 +201,12 @@ UpdateCinnabarGymGateTileBlocks_::
 	callfar RedrawMapView
 	ret
 
-gym_gate_coord: MACRO
+MACRO gym_gate_coord
 	db \1, \2, \3, 0
 ENDM
 
-HORIZONTAL_GATE_BLOCK EQU $54
-VERTICAL_GATE_BLOCK   EQU $5f
+DEF HORIZONTAL_GATE_BLOCK EQU $54
+DEF VERTICAL_GATE_BLOCK   EQU $5f
 
 CinnabarGymGateCoords:
 	; x coord, y coord, block id
diff --git a/engine/gfx/mon_icons.asm b/engine/gfx/mon_icons.asm
index 6e2cf0ba..cb5534d0 100644
--- a/engine/gfx/mon_icons.asm
+++ b/engine/gfx/mon_icons.asm
@@ -292,8 +292,8 @@ GetPartyMonSpriteID:
 
 INCLUDE "data/pokemon/menu_icons.asm"
 
-INC_FRAME_1 EQUS "0, $20"
-INC_FRAME_2 EQUS "$20, $20"
+DEF INC_FRAME_1 EQUS "0, $20"
+DEF INC_FRAME_2 EQUS "$20, $20"
 
 BugIconFrame1:       INCBIN "gfx/icons/bug.2bpp", INC_FRAME_1
 PlantIconFrame1:     INCBIN "gfx/icons/plant.2bpp", INC_FRAME_1
diff --git a/engine/items/town_map.asm b/engine/items/town_map.asm
index 700be30c..ebd1d4b9 100644
--- a/engine/items/town_map.asm
+++ b/engine/items/town_map.asm
@@ -1,4 +1,4 @@
-NOT_VISITED EQU $fe
+DEF NOT_VISITED EQU $fe
 
 DisplayTownMap:
 	call LoadTownMap
diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm
index a9774ff9..8d431aae 100644
--- a/engine/movie/intro.asm
+++ b/engine/movie/intro.asm
@@ -3,7 +3,7 @@
 	const MOVE_GENGAR_RIGHT
 	const MOVE_GENGAR_LEFT
 
-ANIMATION_END EQU 80
+DEF ANIMATION_END EQU 80
 
 PlayIntro:
 	xor a
diff --git a/engine/movie/oak_speech/init_player_data.asm b/engine/movie/oak_speech/init_player_data.asm
index ca7f203d..592aa5f0 100644
--- a/engine/movie/oak_speech/init_player_data.asm
+++ b/engine/movie/oak_speech/init_player_data.asm
@@ -26,7 +26,7 @@ InitPlayerData2:
 	ld hl, wNumBoxItems
 	call InitializeEmptyList
 
-START_MONEY EQU $3000
+DEF START_MONEY EQU $3000
 	ld hl, wPlayerMoney + 1
 	ld a, HIGH(START_MONEY)
 	ld [hld], a
diff --git a/engine/movie/trade.asm b/engine/movie/trade.asm
index a71ef745..c7503072 100644
--- a/engine/movie/trade.asm
+++ b/engine/movie/trade.asm
@@ -57,12 +57,12 @@ TradeAnimCommon:
 	ld [wOptions], a
 	ret
 
-addtradefunc: MACRO
+MACRO addtradefunc
 \1TradeFunc::
 	dw \1
 ENDM
 
-tradefunc: MACRO
+MACRO tradefunc
 	db (\1TradeFunc - TradeFuncPointerTable) / 2
 ENDM
 
@@ -701,7 +701,7 @@ Trade_WriteCircleOAM:
 	jr nz, .loop
 	ret
 
-trade_circle_oam: MACRO
+MACRO trade_circle_oam
 	dw \1
 	db \2, \3
 ENDM
diff --git a/engine/overworld/dust_smoke.asm b/engine/overworld/dust_smoke.asm
index ed016107..ebc80f69 100644
--- a/engine/overworld/dust_smoke.asm
+++ b/engine/overworld/dust_smoke.asm
@@ -53,7 +53,7 @@ GetMoveBoulderDustFunctionPointer:
 	pop hl
 	ret
 
-boulder_dust_adjust: MACRO
+MACRO boulder_dust_adjust
 	db \1, \2 ; coords
 	dw \3 ; function
 ENDM
diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm
index dadf2194..e6ca8748 100644
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -1,4 +1,4 @@
-MAP_TILESET_SIZE EQU $60
+DEF MAP_TILESET_SIZE EQU $60
 
 UpdatePlayerSprite:
 	ld a, [wSpritePlayerStateData2WalkAnimationCounter]
diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm
index 5056c0b2..d3cc22be 100644
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
@@ -483,7 +483,7 @@ FishingRodOAM:
 	dbsprite  8, 10,  0,  0, $fe, 0         ; left
 	dbsprite 11, 10,  0,  0, $fe, OAM_HFLIP ; right
 
-fishing_gfx: MACRO
+MACRO fishing_gfx
 	dw \1
 	db \2
 	db BANK(\1)
diff --git a/engine/overworld/unused_load_missable_object_data.asm b/engine/overworld/unused_load_missable_object_data.asm
index 5888b091..8a519350 100644
--- a/engine/overworld/unused_load_missable_object_data.asm
+++ b/engine/overworld/unused_load_missable_object_data.asm
@@ -28,7 +28,7 @@ LoadMissableObjectData::
 	call CopyData
 	ret
 
-missable_object_map: MACRO
+MACRO missable_object_map
 	db \1
 	db \3 - \2
 	dw \2
diff --git a/engine/pikachu/pikachu_emotions.asm b/engine/pikachu/pikachu_emotions.asm
index 6647c4cc..03717916 100644
--- a/engine/pikachu/pikachu_emotions.asm
+++ b/engine/pikachu/pikachu_emotions.asm
@@ -256,7 +256,7 @@ load_expression:
 	call DoStarterPikachuEmotions
 	ret
 
-pikaemotion_def: MACRO
+MACRO pikaemotion_def
 \1_id:
 	dw \1
 ENDM
diff --git a/engine/pikachu/pikachu_pic_animation.asm b/engine/pikachu/pikachu_pic_animation.asm
index a5d9087f..125313ac 100644
--- a/engine/pikachu/pikachu_pic_animation.asm
+++ b/engine/pikachu/pikachu_pic_animation.asm
@@ -163,7 +163,7 @@ LoadCurrentPikaPicAnimScriptPointer:
 	call UpdatePikaPicAnimPointer
 	ret
 
-pikapic_def: MACRO
+MACRO pikapic_def
 \1_id:
 	dw \1
 ENDM