From c1ef7b75972fa4fbdf125bc85cc1a66f358151cd Mon Sep 17 00:00:00 2001
From: vulcandth <vulcandth@gmail.com>
Date: Mon, 6 Jun 2022 16:25:34 -0500
Subject: RGBDS syntax updates (#86)

New MACRO and DEF syntax
---
 engine/movie/intro.asm                       | 2 +-
 engine/movie/oak_speech/init_player_data.asm | 2 +-
 engine/movie/trade.asm                       | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'engine/movie')

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
-- 
cgit v1.3.1-sl0p