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
---
 constants/script_constants.asm | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'constants/script_constants.asm')

diff --git a/constants/script_constants.asm b/constants/script_constants.asm
index 3195e7f4..ed2ffe31 100644
--- a/constants/script_constants.asm
+++ b/constants/script_constants.asm
@@ -10,17 +10,17 @@
 	const FISH_BUBBLE        ; 7
 
 ; slot symbols
-SLOTS7      EQU $0200
-SLOTSBAR    EQU $0604
-SLOTSCHERRY EQU $0A08
-SLOTSFISH   EQU $0E0C
-SLOTSBIRD   EQU $1210
-SLOTSMOUSE  EQU $1614
+DEF SLOTS7      EQU $0200
+DEF SLOTSBAR    EQU $0604
+DEF SLOTSCHERRY EQU $0A08
+DEF SLOTSFISH   EQU $0E0C
+DEF SLOTSBIRD   EQU $1210
+DEF SLOTSMOUSE  EQU $1614
 
 ; StartSlotMachine dialogs
-SLOTS_OUTOFORDER   EQU $fd
-SLOTS_OUTTOLUNCH   EQU $fe
-SLOTS_SOMEONESKEYS EQU $ff
+DEF SLOTS_OUTOFORDER   EQU $fd
+DEF SLOTS_OUTTOLUNCH   EQU $fe
+DEF SLOTS_SOMEONESKEYS EQU $ff
 
 ; in game trades
 ; TradeMons indexes (see data/events/trades.asm)
@@ -35,7 +35,7 @@ SLOTS_SOMEONESKEYS EQU $ff
 	const TRADE_FOR_DORIS
 	const TRADE_FOR_CRINKLES
 	const TRADE_FOR_SPOT
-NUM_NPC_TRADES EQU const_value
+DEF NUM_NPC_TRADES EQU const_value
 
 ; in game trade dialog sets
 ; InGameTradeTextPointers indexes (see engine/events/in_game_trades.asm)
@@ -55,10 +55,10 @@ NUM_NPC_TRADES EQU const_value
 	const BIT_MARSHBADGE   ; 5
 	const BIT_VOLCANOBADGE ; 6
 	const BIT_EARTHBADGE   ; 7
-NUM_BADGES EQU const_value
+DEF NUM_BADGES EQU const_value
 
 ; OaksAideScript results
-OAKS_AIDE_BAG_FULL        EQU $00
-OAKS_AIDE_GOT_ITEM        EQU $01
-OAKS_AIDE_NOT_ENOUGH_MONS EQU $80
-OAKS_AIDE_REFUSED         EQU $ff
+DEF OAKS_AIDE_BAG_FULL        EQU $00
+DEF OAKS_AIDE_GOT_ITEM        EQU $01
+DEF OAKS_AIDE_NOT_ENOUGH_MONS EQU $80
+DEF OAKS_AIDE_REFUSED         EQU $ff
-- 
cgit v1.3.1-sl0p