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,21 +1,21 @@
MAPGROUP_N_A EQU -1
GROUP_N_A EQU -1
MAP_N_A EQU -1
MAPGROUP_NONE EQU 0
GROUP_NONE EQU 0
MAP_NONE EQU 0
DEF MAPGROUP_N_A EQU -1
DEF GROUP_N_A EQU -1
DEF MAP_N_A EQU -1
DEF MAPGROUP_NONE EQU 0
DEF GROUP_NONE EQU 0
DEF MAP_NONE EQU 0
; map struct members (see data/maps/maps.asm)
rsreset
MAP_MAPATTRIBUTES_BANK rb ; 0
MAP_TILESET rb ; 1
MAP_ENVIRONMENT rb ; 2
MAP_MAPATTRIBUTES rw ; 3
MAP_LOCATION rb ; 5
MAP_MUSIC rb ; 6
MAP_PALETTE rb ; 7
MAP_FISHGROUP rb ; 8
MAP_LENGTH EQU _RS
DEF MAP_MAPATTRIBUTES_BANK rb ; 0
DEF MAP_TILESET rb ; 1
DEF MAP_ENVIRONMENT rb ; 2
DEF MAP_MAPATTRIBUTES rw ; 3
DEF MAP_LOCATION rb ; 5
DEF MAP_MUSIC rb ; 6
DEF MAP_PALETTE rb ; 7
DEF MAP_FISHGROUP rb ; 8
DEF MAP_LENGTH EQU _RS
; map environments (wEnvironment)
; EnvironmentColorsPointers indexes (see data/maps/environment_colors.asm)
@@ -27,7 +27,7 @@ MAP_LENGTH EQU _RS
const ENVIRONMENT_5
const GATE
const DUNGEON
NUM_ENVIRONMENTS EQU const_value - 1
DEF NUM_ENVIRONMENTS EQU const_value - 1
; map palettes (wEnvironment)
const_def
@@ -36,7 +36,7 @@ NUM_ENVIRONMENTS EQU const_value - 1
const PALETTE_NITE
const PALETTE_MORN
const PALETTE_DARK
NUM_MAP_PALETTES EQU const_value
DEF NUM_MAP_PALETTES EQU const_value
; FishGroups indexes (see data/wild/fish.asm)
const_def
@@ -54,7 +54,7 @@ NUM_MAP_PALETTES EQU const_value
const FISHGROUP_QWILFISH
const FISHGROUP_REMORAID
const FISHGROUP_QWILFISH_NO_SWARM
NUM_FISHGROUPS EQU const_value - 1
DEF NUM_FISHGROUPS EQU const_value - 1
; connection directions (see data/maps/data.asm)
const_def
@@ -102,14 +102,14 @@ NUM_FISHGROUPS EQU const_value - 1
const SPAWN_BLACKTHORN
const SPAWN_MT_SILVER
const SPAWN_FAST_SHIP
NUM_SPAWNS EQU const_value
DEF NUM_SPAWNS EQU const_value
SPAWN_N_A EQU -1
DEF SPAWN_N_A EQU -1
; Flypoints indexes (see data/maps/flypoints.asm)
const_def
; johto
JOHTO_FLYPOINT EQU const_value
DEF JOHTO_FLYPOINT EQU const_value
const FLY_NEW_BARK
const FLY_CHERRYGROVE
const FLY_VIOLET
@@ -123,7 +123,7 @@ JOHTO_FLYPOINT EQU const_value
const FLY_BLACKTHORN
const FLY_MT_SILVER
; kanto
KANTO_FLYPOINT EQU const_value
DEF KANTO_FLYPOINT EQU const_value
const FLY_PALLET
const FLY_VIRIDIAN
const FLY_PEWTER
@@ -136,6 +136,6 @@ KANTO_FLYPOINT EQU const_value
const FLY_FUCHSIA
const FLY_CINNABAR
const FLY_INDIGO
NUM_FLYPOINTS EQU const_value
DEF NUM_FLYPOINTS EQU const_value
MAX_OUTDOOR_SPRITES EQU 23 ; see engine/overworld/overworld.asm
DEF MAX_OUTDOOR_SPRITES EQU 23 ; see engine/overworld/overworld.asm