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,7 +1,7 @@
CARDFLIP_LIGHT_OFF EQU "♂" ; $ef
CARDFLIP_LIGHT_ON EQU "♀" ; $f5
DEF CARDFLIP_LIGHT_OFF EQU "♂" ; $ef
DEF CARDFLIP_LIGHT_ON EQU "♀" ; $f5
CARDFLIP_DECK_SIZE EQUS "(wDeckEnd - wDeck)"
DEF CARDFLIP_DECK_SIZE EQUS "(wDeckEnd - wDeck)"
assert wDiscardPileEnd - wDiscardPile == wDeckEnd - wDeck
MemoryGameGFX:
@@ -1337,14 +1337,14 @@ CardFlip_UpdateCursorOAM:
ret
.OAMData:
cardflip_cursor: MACRO
if _NARG >= 5
dbpixel \1, \2, \3, \4
dw \5
else
dbpixel \1, \2
dw \3
endc
MACRO cardflip_cursor
if _NARG >= 5
dbpixel \1, \2, \3, \4
dw \5
else
dbpixel \1, \2
dw \3
endc
ENDM
cardflip_cursor 11, 2, .Impossible

View File

@@ -6,26 +6,26 @@
const SLOTS_PIKACHU ; $0c
const SLOTS_SQUIRTLE ; $10
const SLOTS_STARYU ; $14
NUM_SLOT_REELS EQU const_value / 4 ; 6
SLOTS_NO_MATCH EQU -1
DEF NUM_SLOT_REELS EQU const_value / 4 ; 6
DEF SLOTS_NO_MATCH EQU -1
; wSlotBias values
SLOTS_NO_BIAS EQU -1
DEF SLOTS_NO_BIAS EQU -1
REEL_SIZE EQU 15
DEF REEL_SIZE EQU 15
; Constants for slot_reel offsets (see macros/wram.asm)
REEL_ACTION EQUS "(wReel1ReelAction - wReel1)"
REEL_TILEMAP_ADDR EQUS "(wReel1TilemapAddr - wReel1)"
REEL_POSITION EQUS "(wReel1Position - wReel1)"
REEL_SPIN_DISTANCE EQUS "(wReel1SpinDistance - wReel1)"
REEL_SPIN_RATE EQUS "(wReel1SpinRate - wReel1)"
REEL_OAM_ADDR EQUS "(wReel1OAMAddr - wReel1)"
REEL_X_COORD EQUS "(wReel1XCoord - wReel1)"
REEL_MANIP_COUNTER EQUS "(wReel1ManipCounter - wReel1)"
REEL_MANIP_DELAY EQUS "(wReel1ManipDelay - wReel1)"
REEL_FIELD_0B EQUS "(wReel1Field0b - wReel1)"
REEL_STOP_DELAY EQUS "(wReel1StopDelay - wReel1)"
DEF REEL_ACTION EQUS "(wReel1ReelAction - wReel1)"
DEF REEL_TILEMAP_ADDR EQUS "(wReel1TilemapAddr - wReel1)"
DEF REEL_POSITION EQUS "(wReel1Position - wReel1)"
DEF REEL_SPIN_DISTANCE EQUS "(wReel1SpinDistance - wReel1)"
DEF REEL_SPIN_RATE EQUS "(wReel1SpinRate - wReel1)"
DEF REEL_OAM_ADDR EQUS "(wReel1OAMAddr - wReel1)"
DEF REEL_X_COORD EQUS "(wReel1XCoord - wReel1)"
DEF REEL_MANIP_COUNTER EQUS "(wReel1ManipCounter - wReel1)"
DEF REEL_MANIP_DELAY EQUS "(wReel1ManipDelay - wReel1)"
DEF REEL_FIELD_0B EQUS "(wReel1Field0b - wReel1)"
DEF REEL_STOP_DELAY EQUS "(wReel1StopDelay - wReel1)"
; SlotsJumptable constants
const_def
@@ -48,7 +48,7 @@ REEL_STOP_DELAY EQUS "(wReel1StopDelay - wReel1)"
const SLOTS_PAYOUT_ANIM
const SLOTS_RESTART_OF_QUIT
const SLOTS_QUIT
SLOTS_END_LOOP_F EQU 7
DEF SLOTS_END_LOOP_F EQU 7
; ReelActionJumptable constants
const_def

View File

@@ -1,7 +1,7 @@
PUZZLE_BORDER EQU $ee
PUZZLE_VOID EQU $ef
DEF PUZZLE_BORDER EQU $ee
DEF PUZZLE_VOID EQU $ef
puzcoord EQUS "* 6 +"
DEF puzcoord EQUS "* 6 +"
_UnownPuzzle:
ldh a, [hInMenu]
@@ -112,11 +112,11 @@ InitUnownPuzzlePiecePositions:
ret
.PuzzlePieceInitialPositions:
initpuzcoord: MACRO
rept _NARG / 2
db \1 puzcoord \2
shift 2
endr
MACRO initpuzcoord
rept _NARG / 2
db \1 puzcoord \2
shift 2
endr
ENDM
initpuzcoord 0,0, 0,1, 0,2, 0,3, 0,4, 0,5
initpuzcoord 1,0, 1,5
@@ -568,7 +568,7 @@ RedrawUnownPuzzlePieces:
UnownPuzzleCoordData:
puzzle_coords: MACRO
MACRO puzzle_coords
dbpixel \1, \2, \3, \4
dwcoord \5, \6
db \7, \8