RGBDS DEF Syntax Update

Author: vulcandth

constants.asm

@@ -19,5 +19,5 @@ INCLUDE "constants/species_constants.asm"
 INCLUDE "constants/stage_constants.asm"
 INCLUDE "constants/special_collision_constants.asm"
 
-FALSE EQU 0
-TRUE  EQU 1
+DEF FALSE EQU 0
+DEF TRUE  EQU 1

constants/ball_types.asm

@@ -1,4 +1,4 @@
-POKE_BALL   EQU $0
-GREAT_BALL  EQU $2
-ULTRA_BALL  EQU $3
-MASTER_BALL EQU $5
+DEF POKE_BALL   EQU $0
+DEF GREAT_BALL  EQU $2
+DEF ULTRA_BALL  EQU $3
+DEF MASTER_BALL EQU $5

constants/bonus_stage_order_constants.asm

@@ -1,6 +1,6 @@
 ; See wNextBonusStage
-BONUS_STAGE_ORDER_GENGAR  EQU 0
-BONUS_STAGE_ORDER_MEWTWO  EQU 1
-BONUS_STAGE_ORDER_MEOWTH  EQU 2
-BONUS_STAGE_ORDER_DIGLETT EQU 3
-BONUS_STAGE_ORDER_SEEL    EQU 4
+DEF BONUS_STAGE_ORDER_GENGAR  EQU 0
+DEF BONUS_STAGE_ORDER_MEWTWO  EQU 1
+DEF BONUS_STAGE_ORDER_MEOWTH  EQU 2
+DEF BONUS_STAGE_ORDER_DIGLETT EQU 3
+DEF BONUS_STAGE_ORDER_SEEL    EQU 4

constants/catchem_pokemon_constants.asm

@@ -1,4 +1,4 @@
-const_value = 0
+DEF const_value = 0
 	
 	const CATCHEM_BULBASAUR     ; $0
 	const CATCHEM_CHARMANDER    ; $1

constants/diglett_stage_constants.asm

@@ -1,2 +1,2 @@
-NUM_DIGLETTS EQU $1F  ; 31 total digletts in the Diglett Bonus Stage
-DIGLETT_INITIALIZE_DELAY EQU $88  ; number to delay how fast each diglett is initialized
+DEF NUM_DIGLETTS EQU $1F  ; 31 total digletts in the Diglett Bonus Stage
+DEF DIGLETT_INITIALIZE_DELAY EQU $88  ; number to delay how fast each diglett is initialized

constants/evolution_type_constants.asm

@@ -1,7 +1,7 @@
-EVO_THUNDER_STONE  EQU $01
-EVO_MOON_STONE     EQU $02
-EVO_FIRE_STONE     EQU $03
-EVO_LEAF_STONE     EQU $04
-EVO_WATER_STONE    EQU $05
-EVO_LINK_CABLE     EQU $06
-EVO_EXPERIENCE     EQU $07
+DEF EVO_THUNDER_STONE  EQU $01
+DEF EVO_MOON_STONE     EQU $02
+DEF EVO_FIRE_STONE     EQU $03
+DEF EVO_LEAF_STONE     EQU $04
+DEF EVO_WATER_STONE    EQU $05
+DEF EVO_LINK_CABLE     EQU $06
+DEF EVO_EXPERIENCE     EQU $07

constants/joy_constants.asm

@@ -1,21 +1,21 @@
-BIT_A_BUTTON EQU 0
-BIT_B_BUTTON EQU 1
-BIT_SELECT   EQU 2
-BIT_START    EQU 3
-BIT_D_RIGHT  EQU 4
-BIT_D_LEFT   EQU 5
-BIT_D_UP     EQU 6
-BIT_D_DOWN   EQU 7
+DEF BIT_A_BUTTON EQU 0
+DEF BIT_B_BUTTON EQU 1
+DEF BIT_SELECT   EQU 2
+DEF BIT_START    EQU 3
+DEF BIT_D_RIGHT  EQU 4
+DEF BIT_D_LEFT   EQU 5
+DEF BIT_D_UP     EQU 6
+DEF BIT_D_DOWN   EQU 7
 
-A_BUTTON EQU %00000001
-B_BUTTON EQU %00000010
-SELECT   EQU %00000100
-START    EQU %00001000
-D_RIGHT  EQU %00010000
-D_LEFT   EQU %00100000
-D_UP     EQU %01000000
-D_DOWN   EQU %10000000
+DEF A_BUTTON EQU %00000001
+DEF B_BUTTON EQU %00000010
+DEF SELECT   EQU %00000100
+DEF START    EQU %00001000
+DEF D_RIGHT  EQU %00010000
+DEF D_LEFT   EQU %00100000
+DEF D_UP     EQU %01000000
+DEF D_DOWN   EQU %10000000
 
-R_FLIPPER EQU A_BUTTON
-L_FLIPPER EQU D_LEFT
-FLIPPERS EQU L_FLIPPER | R_FLIPPER
+DEF R_FLIPPER EQU A_BUTTON
+DEF L_FLIPPER EQU D_LEFT
+DEF FLIPPERS EQU L_FLIPPER | R_FLIPPER

constants/map_constants.asm

@@ -1,4 +1,4 @@
-const_value = 0
+DEF const_value = 0
 
 	const PALLET_TOWN        ; $0
 	const VIRIDIAN_CITY      ; $1

constants/pinball_game_constants.asm

@@ -1,19 +1,19 @@
-MAX_PIKACHU_SAVER_CHARGE EQU 15
+DEF MAX_PIKACHU_SAVER_CHARGE EQU 15
 
-CATCHEM_MODE_SLOT_REWARD   EQU 1
-EVOLUTION_MODE_SLOT_REWARD EQU 2
+DEF CATCHEM_MODE_SLOT_REWARD   EQU 1
+DEF EVOLUTION_MODE_SLOT_REWARD EQU 2
 
-SPECIAL_MODE_CATCHEM   EQU 0
-SPECIAL_MODE_EVOLUTION EQU 1
-SPECIAL_MODE_MAP_MOVE  EQU 2
+DEF SPECIAL_MODE_CATCHEM   EQU 0
+DEF SPECIAL_MODE_EVOLUTION EQU 1
+DEF SPECIAL_MODE_MAP_MOVE  EQU 2
 
 ; To encounter Mew, you must first beat Mewtwo's bonus stage 2 times.
-NUM_MEWTWO_COMPLETIONS_FOR_MEW EQU 2
+DEF NUM_MEWTWO_COMPLETIONS_FOR_MEW EQU 2
 
-MAX_BONUS_MULTIPLIER              EQU 99
-MAX_BONUS_MULTIPLIER_FIELD_EVENTS EQU 11
+DEF MAX_BONUS_MULTIPLIER              EQU 99
+DEF MAX_BONUS_MULTIPLIER_FIELD_EVENTS EQU 11
 
-MAP_MOVE_FRAMES_COUNTER        EQU  480 ; 8 seconds until the map move counter decrease by 1
-PINBALL_UPGRADE_FRAMES_COUNTER EQU 3600 ; ~1 minute until the pinball type degrades one stage. (e.g. Great Ball -> Pokeball)
+DEF MAP_MOVE_FRAMES_COUNTER        EQU  480 ; 8 seconds until the map move counter decrease by 1
+DEF PINBALL_UPGRADE_FRAMES_COUNTER EQU 3600 ; ~1 minute until the pinball type degrades one stage. (e.g. Great Ball -> Pokeball)
 
 

constants/pokemon_constants.asm

@@ -1,4 +1,4 @@
-const_value = 1
+DEF const_value = 1
 
 	const BULBASAUR   ; $1
 	const IVYSAUR     ; $2
@@ -152,4 +152,4 @@ const_value = 1
 	const MEWTWO      ; $96
 	const MEW         ; $97
 
-NUM_POKEMON EQU 151
+DEF NUM_POKEMON EQU 151

constants/screen_constants.asm

@@ -1,13 +1,13 @@
 ; See wCurrentScreen in wram.asm
 
 ; unreachable debug menu, which allows selecting DMG or Game Boy Color during boot
-SCREEN_SELECT_GAMEBOY_TARGET   EQU $0
+DEF SCREEN_SELECT_GAMEBOY_TARGET   EQU $0
 
-SCREEN_ERASE_ALL_DATA  EQU $1
-SCREEN_COPYRIGHT       EQU $2
-SCREEN_TITLESCREEN     EQU $3
-SCREEN_PINBALL_GAME    EQU $4
-SCREEN_POKEDEX         EQU $5
-SCREEN_OPTIONS         EQU $6
-SCREEN_HIGH_SCORES     EQU $7
-SCREEN_FIELD_SELECT    EQU $8
+DEF SCREEN_ERASE_ALL_DATA  EQU $1
+DEF SCREEN_COPYRIGHT       EQU $2
+DEF SCREEN_TITLESCREEN     EQU $3
+DEF SCREEN_PINBALL_GAME    EQU $4
+DEF SCREEN_POKEDEX         EQU $5
+DEF SCREEN_OPTIONS         EQU $6
+DEF SCREEN_HIGH_SCORES     EQU $7
+DEF SCREEN_FIELD_SELECT    EQU $8

constants/song_constants.asm

@@ -1,35 +1,35 @@
-NUM_SONGS EQU $17
+DEF NUM_SONGS EQU $17
 
-MUSIC_NOTHING EQU $00
+DEF MUSIC_NOTHING EQU $00
 
 ; Bank $F Songs
-MUSIC_RED_FIELD         EQU $01
-MUSIC_CATCH_EM_RED      EQU $02
-MUSIC_HURRY_UP_RED      EQU $03
-MUSIC_POKEDEX           EQU $04
-MUSIC_GASTLY_GRAVEYARD  EQU $05
-MUSIC_HAUNTER_GRAVEYARD EQU $06
-MUSIC_GENGAR_GRAVEYARD  EQU $07
+DEF MUSIC_RED_FIELD         EQU $01
+DEF MUSIC_CATCH_EM_RED      EQU $02
+DEF MUSIC_HURRY_UP_RED      EQU $03
+DEF MUSIC_POKEDEX           EQU $04
+DEF MUSIC_GASTLY_GRAVEYARD  EQU $05
+DEF MUSIC_HAUNTER_GRAVEYARD EQU $06
+DEF MUSIC_GENGAR_GRAVEYARD  EQU $07
 
 ; Bank $10 Songs
-MUSIC_BLUE_FIELD    EQU $01
-MUSIC_CATCH_EM_BLUE EQU $02
-MUSIC_HURRY_UP_BLUE EQU $03
-MUSIC_HI_SCORE      EQU $04
-MUSIC_GAME_OVER     EQU $05
+DEF MUSIC_BLUE_FIELD    EQU $01
+DEF MUSIC_CATCH_EM_BLUE EQU $02
+DEF MUSIC_HURRY_UP_BLUE EQU $03
+DEF MUSIC_HI_SCORE      EQU $04
+DEF MUSIC_GAME_OVER     EQU $05
 
 ; Bank $11 Songs
-MUSIC_WHACK_DIGLETT EQU $01
-MUSIC_WHACK_DUGTRIO EQU $02
-MUSIC_SEEL_STAGE    EQU $03
-MUSIC_TITLE_SCREEN  EQU $04
+DEF MUSIC_WHACK_DIGLETT EQU $01
+DEF MUSIC_WHACK_DUGTRIO EQU $02
+DEF MUSIC_SEEL_STAGE    EQU $03
+DEF MUSIC_TITLE_SCREEN  EQU $04
 
 ; Bank $12 Songs
-MUSIC_MEWTWO_STAGE EQU $01
-MUSIC_OPTIONS      EQU $02
-MUSIC_FIELD_SELECT EQU $03
-MUSIC_MEOWTH_STAGE EQU $04
+DEF MUSIC_MEWTWO_STAGE EQU $01
+DEF MUSIC_OPTIONS      EQU $02
+DEF MUSIC_FIELD_SELECT EQU $03
+DEF MUSIC_MEOWTH_STAGE EQU $04
 
 ; Bank $13 Songs
-MUSIC_END_CREDITS EQU $01
-MUSIC_NAME_ENTRY  EQU $02
+DEF MUSIC_END_CREDITS EQU $01
+DEF MUSIC_NAME_ENTRY  EQU $02

constants/sound_effect_constants.asm

@@ -1 +1 @@
-NUM_SOUND_EFFECTS EQU $4e
+DEF NUM_SOUND_EFFECTS EQU $4e

constants/special_collision_constants.asm

@@ -1,19 +1,19 @@
-SPECIAL_COLLISION_NOTHING EQU 0
-SPECIAL_COLLISION_LEFT_TRIGGER EQU 1
-SPECIAL_COLLISION_RIGHT_TRIGGER EQU 2
-SPECIAL_COLLISION_STARYU_ALLEY_TRIGGER EQU 3
-SPECIAL_COLLISION_VOLTORB EQU 4
-SPECIAL_COLLISION_SHELLDER EQU 4
-SPECIAL_COLLISION_BELLSPROUT EQU 5
-SPECIAL_COLLISION_STARYU EQU 6
-SPECIAL_COLLISION_LEFT_DIGLETT EQU 7
-SPECIAL_COLLISION_POLIWAG EQU 7
-SPECIAL_COLLISION_RIGHT_DIGLETT EQU 8
-SPECIAL_COLLISION_PSYDUCK EQU 8
-SPECIAL_COLLISION_LEFT_BONUS_MULTIPLIER EQU 9
-SPECIAL_COLLISION_RIGHT_BONUS_MULTIPLIER EQU 10
-SPECIAL_COLLISION_BALL_UPGRADE EQU 11
-SPECIAL_COLLISION_SPINNER EQU 12
-SPECIAL_COLLISION_SLOT_HOLE EQU 13
-SPECIAL_COLLISION_CLOYSTER EQU 14
-SPECIAL_COLLISION_SLOWPOKE EQU 15
+DEF SPECIAL_COLLISION_NOTHING EQU 0
+DEF SPECIAL_COLLISION_LEFT_TRIGGER EQU 1
+DEF SPECIAL_COLLISION_RIGHT_TRIGGER EQU 2
+DEF SPECIAL_COLLISION_STARYU_ALLEY_TRIGGER EQU 3
+DEF SPECIAL_COLLISION_VOLTORB EQU 4
+DEF SPECIAL_COLLISION_SHELLDER EQU 4
+DEF SPECIAL_COLLISION_BELLSPROUT EQU 5
+DEF SPECIAL_COLLISION_STARYU EQU 6
+DEF SPECIAL_COLLISION_LEFT_DIGLETT EQU 7
+DEF SPECIAL_COLLISION_POLIWAG EQU 7
+DEF SPECIAL_COLLISION_RIGHT_DIGLETT EQU 8
+DEF SPECIAL_COLLISION_PSYDUCK EQU 8
+DEF SPECIAL_COLLISION_LEFT_BONUS_MULTIPLIER EQU 9
+DEF SPECIAL_COLLISION_RIGHT_BONUS_MULTIPLIER EQU 10
+DEF SPECIAL_COLLISION_BALL_UPGRADE EQU 11
+DEF SPECIAL_COLLISION_SPINNER EQU 12
+DEF SPECIAL_COLLISION_SLOT_HOLE EQU 13
+DEF SPECIAL_COLLISION_CLOYSTER EQU 14
+DEF SPECIAL_COLLISION_SLOWPOKE EQU 15

constants/species_constants.asm

@@ -1,4 +1,4 @@
-const_value = 0
+DEF const_value = 0
 
 	const SPECIES_SEED       ; $0
 	const SPECIES_LIZARD     ; $1

constants/stage_constants.asm

@@ -1,18 +1,18 @@
-STAGE_RED_FIELD_TOP      EQU $0
-STAGE_RED_FIELD_BOTTOM   EQU $1
+DEF STAGE_RED_FIELD_TOP      EQU $0
+DEF STAGE_RED_FIELD_BOTTOM   EQU $1
 ; XXX EQU $2
 ; XXX EQU $3
-STAGE_BLUE_FIELD_TOP     EQU $4
-STAGE_BLUE_FIELD_BOTTOM  EQU $5
+DEF STAGE_BLUE_FIELD_TOP     EQU $4
+DEF STAGE_BLUE_FIELD_BOTTOM  EQU $5
 
-FIRST_BONUS_STAGE        EQU $6
+DEF FIRST_BONUS_STAGE        EQU $6
 ; STAGE_GENGAR_BONUS     EQU $6  ; buggy
-STAGE_GENGAR_BONUS       EQU $7
+DEF STAGE_GENGAR_BONUS       EQU $7
 ; STAGE_MEWTWO_BONUS     EQU $8  ; buggy
-STAGE_MEWTWO_BONUS       EQU $9
+DEF STAGE_MEWTWO_BONUS       EQU $9
 ; STAGE_MEOWTH_BONUS     EQU $a  ; buggy
-STAGE_MEOWTH_BONUS       EQU $b
+DEF STAGE_MEOWTH_BONUS       EQU $b
 ; STAGE_DIGLETT_BONUS    EQU $c  ; buggy
-STAGE_DIGLETT_BONUS      EQU $d
+DEF STAGE_DIGLETT_BONUS      EQU $d
 ; STAGE_SEEL_BONUS       EQU $e  ; buggy
-STAGE_SEEL_BONUS         EQU $f
+DEF STAGE_SEEL_BONUS         EQU $f

data/unused/unused_9800.asm

@@ -12,7 +12,7 @@ endm
 
 Data_9800:
 
-w = $100
+DEF w = $100
 rept 8
 	macro_9800 w
 	DEF w = w >> 1

engine/pinball_game/end_of_ball_bonus.asm

@@ -543,15 +543,15 @@ Func_f8d5: ; 0xf8d5
 	ret
 
 AddBigBCD6: ; 0xf902
-x = 0
+DEF x = 0
 rept 6
 	ld a, [de]
 if x == 0
 	add [hl]
 else
 	adc [hl]
 endc
-x = x + 1
+DEF x = x + 1
 	daa
 	ld [hli], a
 	inc de

engine/pinball_game/score.asm

@@ -83,7 +83,7 @@ AddBigBCD6FromQueue: ; 0x8588
 	ld b, $1
 asm_8592:
 	push hl
-x = 0
+DEF x = 0
 rept 6
 	ld a, [de]
 if x == 0
@@ -95,7 +95,7 @@ endc
 	ld [de], a
 	inc de
 	inc hl
-x = x + 1
+DEF x = x + 1
 endr
 	ld a, e
 	cp wAddScoreQueueEnd % $100