RGBDS syntax updates (#905)

New MACRO and DEF syntax
This commit is contained in:
vulcandth
2022-06-06 16:25:42 -05:00
committed by GitHub
parent a4d346cc8c
commit 3648afda16
179 changed files with 2546 additions and 2545 deletions

View File

@@ -1,11 +1,11 @@
; decoration attributes
rsreset
DECOATTR_TYPE rb
DECOATTR_NAME rb
DECOATTR_ACTION rb
DECOATTR_EVENT_FLAG rw
DECOATTR_SPRITE rb
DECOATTR_STRUCT_LENGTH EQU _RS
DEF DECOATTR_TYPE rb
DEF DECOATTR_NAME rb
DEF DECOATTR_ACTION rb
DEF DECOATTR_EVENT_FLAG rw
DEF DECOATTR_SPRITE rb
DEF DECOATTR_STRUCT_LENGTH EQU _RS
; decoration types
const_def 1
@@ -15,7 +15,7 @@ DECOATTR_STRUCT_LENGTH EQU _RS
const DECO_POSTER
const DECO_DOLL
const DECO_BIGDOLL
NUM_DECO_TYPES EQU const_value - 1
DEF NUM_DECO_TYPES EQU const_value - 1
; DecorationNames indexes (see data/decorations/names.asm)
const_def
@@ -45,7 +45,7 @@ NUM_DECO_TYPES EQU const_value - 1
const BLUE_CARPET
const YELLOW_CARPET
const GREEN_CARPET
NUM_DECO_NAMES EQU const_value
DEF NUM_DECO_NAMES EQU const_value
; DoDecorationAction2.DecoActions indexes (see engine/overworld/decorations.asm)
const_def 1
@@ -63,14 +63,14 @@ NUM_DECO_NAMES EQU const_value
const PUT_AWAY_BIG_DOLL
const SET_UP_DOLL
const PUT_AWAY_DOLL
NUM_DECO_ACTIONS EQU const_value - 1
DEF NUM_DECO_ACTIONS EQU const_value - 1
__deco_value__ = 0
DEF __deco_value__ = 0
deco: MACRO
MACRO deco
const DECO_\1
DECOFLAG_\1 EQU __deco_value__
__deco_value__ += 1
DEF DECOFLAG_\1 EQU __deco_value__
DEF __deco_value__ += 1
ENDM
; decorations:
@@ -134,8 +134,8 @@ ENDM
deco GEODUDE_DOLL
deco MACHOP_DOLL
deco TENTACOOL_DOLL
NUM_NON_TROPHY_DECOS EQU __deco_value__
DEF NUM_NON_TROPHY_DECOS EQU __deco_value__
deco GOLD_TROPHY_DOLL
deco SILVER_TROPHY_DOLL
NUM_DECOS EQU __deco_value__
NUM_DECO_CATEGORIES EQU const_value - 1 - NUM_DECOS
DEF NUM_DECOS EQU __deco_value__
DEF NUM_DECO_CATEGORIES EQU const_value - 1 - NUM_DECOS