Build with rgbds >= 0.6.0

- Change `name: MACRO` to `MACRO name` - Pass either `-h` or `-Z` to rgbgfx
Rangi42 · Jun 14, 2024 · 22d6f8e · 22d6f8e
1 parent 3c76999
commit 22d6f8e
Show file tree

Hide file tree

Showing 79 changed files with 673 additions and 667 deletions.
diff --git a/Makefile b/Makefile
@@ -13,6 +13,12 @@ else
 RGBDS_DIR =
 endif
 
+ifeq ($(filter $(shell echo 'print __RGBDS_MAJOR__ || (!__RGBDS_MAJOR__ && __RGBDS_MINOR__ < 6)' | $(RGBDS_DIR)rgbasm -),$$0),)
+RGBGFX_FLAGS := -h
+else
+RGBGFX_FLAGS := -Z
+endif
+
 RGBASM_FLAGS = -E -Weverything -Wnumeric-string=2 -Wtruncation=1
 RGBLINK_FLAGS = -n $(ROM_NAME).sym -m $(ROM_NAME).map -l layout.link -p $(FILLER)
 RGBFIX_FLAGS = -csjv -t $(TITLE) -i $(MCODE) -n $(ROMVERSION) -p $(FILLER) -k 01 -l 0x33 -m 0x10 -r 3
@@ -119,7 +125,7 @@ endif
 	cd bsp; ../tools/bspcomp patch.txt ../$@; cd ..
 
 
-gfx/battle/lyra_back.2bpp: rgbgfx += -h
+gfx/battle/lyra_back.2bpp: rgbgfx += $(RGBGFX_FLAGS)
 
 gfx/battle_anims/angels.2bpp: tools/gfx += --trim-whitespace
 gfx/battle_anims/beam.2bpp: tools/gfx += --remove-xflip --remove-yflip --remove-whitespace
@@ -150,27 +156,27 @@ gfx/mail/surf_mail_border.1bpp: tools/gfx += --remove-whitespace
 gfx/music_player/music_player.2bpp: tools/gfx += --trim-whitespace
 gfx/music_player/note_lines.2bpp: tools/gfx += --interleave --png=$<
 
-gfx/new_game/shrink1.2bpp: rgbgfx += -h
-gfx/new_game/shrink2.2bpp: rgbgfx += -h
+gfx/new_game/shrink1.2bpp: rgbgfx += $(RGBGFX_FLAGS)
+gfx/new_game/shrink2.2bpp: rgbgfx += $(RGBGFX_FLAGS)
 
 gfx/overworld/overworld.2bpp: gfx/overworld/puddle_splash.2bpp gfx/overworld/cut_grass.2bpp gfx/overworld/cut_tree.2bpp gfx/overworld/heal_machine.2bpp gfx/overworld/fishing_rod.2bpp gfx/overworld/shadow.2bpp gfx/overworld/shaking_grass.2bpp gfx/overworld/boulder_dust.2bpp ; cat $^ > $@
 
 gfx/pack/pack_left.2bpp: tools/gfx += --trim-whitespace
 gfx/pack/pack_top_left.2bpp: gfx/pack/pack_top.2bpp gfx/pack/pack_left.2bpp ; cat $^ > $@
 
-gfx/paintings/%.2bpp: rgbgfx += -h
+gfx/paintings/%.2bpp: rgbgfx += $(RGBGFX_FLAGS)
 
-gfx/player/chris_back.2bpp: rgbgfx += -h
-gfx/player/kris_back.2bpp: rgbgfx += -h
+gfx/player/chris_back.2bpp: rgbgfx += $(RGBGFX_FLAGS)
+gfx/player/kris_back.2bpp: rgbgfx += $(RGBGFX_FLAGS)
 
 gfx/pokedex/pokedex.2bpp: tools/gfx += --trim-whitespace
-gfx/pokedex/question_mark.2bpp: rgbgfx += -h
+gfx/pokedex/question_mark.2bpp: rgbgfx += $(RGBGFX_FLAGS)
 gfx/pokedex/slowpoke.2bpp: tools/gfx += --trim-whitespace
 
 gfx/pokegear/pokegear.2bpp: tools/gfx += --trim-whitespace
 gfx/pokegear/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace
 
-gfx/pokemon/%/back.2bpp: rgbgfx += -h
+gfx/pokemon/%/back.2bpp: rgbgfx += $(RGBGFX_FLAGS)
 
 gfx/pc/obj.2bpp: gfx/pc/modes.2bpp gfx/pc/bags.2bpp ; cat $^ > $@
 
@@ -190,10 +196,10 @@ gfx/trade/ball_poof_cable.2bpp: gfx/trade/ball.2bpp gfx/trade/poof.2bpp gfx/trad
 gfx/trade/game_boy_cable.2bpp: gfx/trade/game_boy.2bpp gfx/trade/link_cable.2bpp ; cat $^ > $@
 gfx/trade/trade_screen.2bpp: gfx/trade/border.2bpp gfx/trade/textbox.2bpp ; cat $^ > $@
 
-gfx/trainer_card/chris_card.2bpp: rgbgfx += -h
-gfx/trainer_card/kris_card.2bpp: rgbgfx += -h
+gfx/trainer_card/chris_card.2bpp: rgbgfx += $(RGBGFX_FLAGS)
+gfx/trainer_card/kris_card.2bpp: rgbgfx += $(RGBGFX_FLAGS)
 
-gfx/trainers/%.2bpp: rgbgfx += -h
+gfx/trainers/%.2bpp: rgbgfx += $(RGBGFX_FLAGS)
 
 gfx/type_chart/bg.2bpp: tools/gfx += --remove-duplicates --remove-xflip --remove-yflip
 gfx/type_chart/bg0.2bpp: gfx/type_chart/bg.2bpp.vram1p gfx/type_chart/bg.2bpp.vram0p ; cat $^ > $@

diff --git a/audio/alternate_music.asm b/audio/alternate_music.asm
@@ -1,4 +1,4 @@
-alternate_music: MACRO
+MACRO alternate_music
 ; pointer, bitmask, unset music id, set music id
 	dw \1
 	db \2, \3, \4

diff --git a/audio/music_player.asm b/audio/music_player.asm
@@ -19,21 +19,21 @@ INCBIN "gfx/music_player/note_lines.2bpp.lz"
 
 SECTION "Music Player", ROMX
 
-jrbutton: MACRO
+MACRO jrbutton
 ; assumes hl == hJoyPressed
 	ld a, [hl]
 	and \1
 	jr nz, \2
 ENDM
 
-jpbutton: MACRO
+MACRO jpbutton
 ; assumes hl == hJoyPressed
 	ld a, [hl]
 	and \1
 	jmp nz, \2
 ENDM
 
-jrheldbutton: MACRO
+MACRO jrheldbutton
 ; assumes hl == hJoyDown
 	ld a, [wTextDelayFrames]
 	and a
@@ -47,7 +47,7 @@ jrheldbutton: MACRO
 .no\@:
 ENDM
 
-jpheldbutton: MACRO
+MACRO jpheldbutton
 ; assumes hl == hJoyDown
 	ld a, [wTextDelayFrames]
 	and a

diff --git a/charmap.asm b/charmap.asm
@@ -300,7 +300,7 @@ NGRAMS_END EQU $52
 	setcharmap default
 
 
-rawchar: MACRO
+MACRO rawchar
 	setcharmap no_ngrams
 	db \#
 	setcharmap default

diff --git a/constants/deco_constants.asm b/constants/deco_constants.asm
@@ -68,7 +68,7 @@ NUM_DECO_ACTIONS EQU const_value - 1
 
 __deco_value__ = 0
 
-deco: MACRO
+MACRO deco
 	const DECO_\1
 DECOFLAG_\1 EQU __deco_value__
 __deco_value__ += 1

diff --git a/constants/map_constants.asm b/constants/map_constants.asm
@@ -1,9 +1,9 @@
-newgroup: MACRO
+MACRO newgroup
 const_value += 1
 __map_value__ = 1
 ENDM
 
-map_const: MACRO
+MACRO map_const
 ;\1: map id
 ;\2: width: in blocks
 ;\3: height: in blocks

diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
@@ -285,7 +285,7 @@ CANCEL EQU -1
 ; - CosmeticSpeciesAndFormTable (see data/pokemon/variant_forms.asm)
 ; - ValidVariantRanges (see data/pokemon/valid_variants.asm)
 
-ext_const_def: MACRO
+MACRO ext_const_def
 	if _NARG >= 1
 		def ext_const_value = \1
 	else
@@ -297,7 +297,7 @@ ext_const_def: MACRO
 	endc
 ENDM
 
-ext_const: MACRO
+MACRO ext_const
 	const_skip
 	DEF \1 EQU ext_const_value
 	redef ext_const_value += const_inc

diff --git a/constants/tmhm_constants.asm b/constants/tmhm_constants.asm
@@ -5,12 +5,12 @@
 
 __tmhm_value__ = 1
 
-add_tmnum: MACRO
+MACRO add_tmnum
 \1_TMNUM EQU __tmhm_value__
 __tmhm_value__ += 1
 ENDM
 
-add_tm: MACRO
+MACRO add_tm
 if !DEF(TM01)
 TM01 = const_value
 endc
@@ -99,7 +99,7 @@ endc
 	add_tm SWORDS_DANCE ; $4a
 NUM_TMS = __tmhm_value__ - 1
 
-add_hm: MACRO
+MACRO add_hm
 if !DEF(HM01)
 HM01 = const_value
 endc
@@ -115,7 +115,7 @@ ENDM
 	add_hm WATERFALL    ; $50
 NUM_HMS = __tmhm_value__ - NUM_TMS - 1
 
-add_mt: MACRO
+MACRO add_mt
 if !DEF(MT01)
 MT01 = const_value
 endc

diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm
@@ -1,6 +1,6 @@
 __trainer_class__ = 0
 
-trainerclass: MACRO
+MACRO trainerclass
 \1 EQU __trainer_class__
 __trainer_class__ += 1
 	const_def 1

diff --git a/data/battle/effect_command_pointers.asm b/data/battle/effect_command_pointers.asm
@@ -1,16 +1,16 @@
-command: MACRO
+MACRO command
 	const \1_command
 \1 EQUS "db \1_command"
 	dw BattleCommand_\1
 ENDM
 
-commandx: MACRO
+MACRO commandx
 	const \1_command
 \1 EQUS "db \1_command,"
 	dw BattleCommand_\1
 ENDM
 
-commandonly: MACRO
+MACRO commandonly
 	const \1_command
 \1 EQUS "db \1_command"
 ENDM

diff --git a/data/battle_anims/oam.asm b/data/battle_anims/oam.asm
@@ -1,4 +1,4 @@
-battleanimoam: MACRO
+MACRO battleanimoam
 	db \1 ; vtile offset
 	db \2 ; data length
 	dw \3 ; data pointer

diff --git a/data/battle_anims/object_gfx.asm b/data/battle_anims/object_gfx.asm
@@ -1,4 +1,4 @@
-anim_obj_gfx: MACRO
+MACRO anim_obj_gfx
 ; # tiles, label
 	db  \1
 	dba \2

diff --git a/data/battle_anims/objects.asm b/data/battle_anims/objects.asm
@@ -1,7 +1,7 @@
 ABSOLUTE_X EQU $00
 RELATIVE_X EQU $01
 
-battleanimobj: MACRO
+MACRO battleanimobj
 	db \1 ; flags
 	; bit 7: priority
 	; bit 6: y flip (for enemy)

diff --git a/data/decorations/attributes.asm b/data/decorations/attributes.asm
@@ -1,4 +1,4 @@
-decoration: MACRO
+MACRO decoration
 	; type, name, command, event flag, tile/sprite
 	db \1, \2, \3
 	dw \4

diff --git a/data/events/engine_flags.asm b/data/events/engine_flags.asm
@@ -1,4 +1,4 @@
-engine_flag: MACRO
+MACRO engine_flag
 ; location, bit
 ; (all locations are in WRAM bank 1)
 	dwb \1 + (\2 / 8), 1 << (\2 % 8)

diff --git a/data/events/odd_eggs.asm b/data/events/odd_eggs.asm
@@ -1,7 +1,7 @@
 NUM_ODD_EGGS EQU 5
 ODD_EGG_LENGTH EQU 10
 
-prob: MACRO
+MACRO prob
 prob_total += \1
 	dw prob_total * $ffff / 100
 ENDM

diff --git a/data/events/special_pointers.asm b/data/events/special_pointers.asm
@@ -1,4 +1,4 @@
-add_special: MACRO
+MACRO add_special
 \1Special::
 	dba \1
 ENDM

diff --git a/data/growth_rates.asm b/data/growth_rates.asm
@@ -1,4 +1,4 @@
-growth_rate: MACRO
+MACRO growth_rate
 ; [1]/[2]*n**3 + [3]*n**2 + [4]*n - [5]
 	dn \1, \2
 	if \3 < 0

diff --git a/data/items/attributes.asm b/data/items/attributes.asm
@@ -1,4 +1,4 @@
-item_attribute: MACRO
+MACRO item_attribute
 ; price, held effect, parameter, pocket, field menu, battle menu
 	dw \1
 	db \2, \3, \4
@@ -517,7 +517,7 @@ ItemAttributes:
 	item_attribute 50, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 	assert_table_length NUM_ITEMS
 
-key_item_attribute: MACRO
+MACRO key_item_attribute
 ; selectable, field menu, battle menu
 	db \1
 	dn \2, \3

diff --git a/data/items/mom_phone.asm b/data/items/mom_phone.asm
@@ -1,4 +1,4 @@
-momitem: MACRO
+MACRO momitem
 ; money to trigger, cost, kind, item
 	dt \1
 	dt \2

diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm
@@ -1,4 +1,4 @@
-map_attributes: MACRO
+MACRO map_attributes
 ; label, map, border block, connections
 CURRENT_MAP_WIDTH = \2_WIDTH
 CURRENT_MAP_HEIGHT = \2_HEIGHT
@@ -13,7 +13,7 @@ CURRENT_MAP_HEIGHT = \2_HEIGHT
 ENDM
 
 ; Connections go in order: north, south, west, east
-connection: MACRO
+MACRO connection
 ;\1: direction
 ;\2: map name
 ;\3: map id

diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm
@@ -1,4 +1,4 @@
-landmark: MACRO
+MACRO landmark
 	db \1, \2
 	dw \3
 ENDM

diff --git a/data/maps/maps.asm b/data/maps/maps.asm
@@ -1,4 +1,4 @@
-map: MACRO
+MACRO map
 ;\1: map name: for the MapAttributes pointer (see data/maps/attributes.asm)
 ;\2: tileset: a TILESET_* constant
 ;\3: environment: TOWN, ROUTE, INDOOR, CAVE, ENVIRONMENT_5, GATE, or DUNGEON

diff --git a/data/maps/palettes.asm b/data/maps/palettes.asm
@@ -1,4 +1,4 @@
-special_pal_for: MACRO
+MACRO special_pal_for
 if !STRCMP("\1", "map")
 	db PAL_FOR_MAP
 	map_id \2 ; map id
@@ -16,7 +16,7 @@ endc
 ENDM
 
 SpecialBGPalettes:
-special_bg_pal: MACRO
+MACRO special_bg_pal
 	special_pal_for \1, \2
 	db \3 ; type
 	dw \4 ; source
@@ -94,7 +94,7 @@ ENDM
 	db 0 ; end
 
 SpecialOBPalettes:
-special_ob_pal: MACRO
+MACRO special_ob_pal
 	special_pal_for \1, \2
 	dw \3 ; source
 if _NARG == 6

diff --git a/data/maps/scenes.asm b/data/maps/scenes.asm
@@ -1,4 +1,4 @@
-scene_var: MACRO
+MACRO scene_var
 ; db group, map
 ; dw address
 	map_id \1

diff --git a/data/maps/setup_script_pointers.asm b/data/maps/setup_script_pointers.asm
@@ -1,4 +1,4 @@
-add_mapsetup: MACRO
+MACRO add_mapsetup
 \1_MapSetupCmd:
 	dba \1
 ENDM

diff --git a/data/maps/setup_scripts.asm b/data/maps/setup_scripts.asm
@@ -16,7 +16,7 @@ MapSetupScripts:
 	assert_table_length NUM_MAPSETUP_SCRIPTS
 
 ; valid commands are listed in MapSetupCommands (see data/maps/setup_script_pointers.asm)
-mapsetup: MACRO
+MACRO mapsetup
 	db (\1_MapSetupCmd - MapSetupCommands) / 3
 ENDM
 

diff --git a/data/maps/spawn_points.asm b/data/maps/spawn_points.asm
@@ -1,4 +1,4 @@
-spawn: MACRO
+MACRO spawn
 ; map, y, x
 	map_id \1
 	db \2, \3

diff --git a/data/maps/special_music.asm b/data/maps/special_music.asm
@@ -1,7 +1,7 @@
 ; Functions are defined in home/audio.asm.
 ; Specifying GetMapMusic makes the Bicycle music not play.
 
-music_map: MACRO
+MACRO music_map
 	map_id \1
 	dw \2
 ENDM

diff --git a/data/moves/moves.asm b/data/moves/moves.asm
@@ -1,4 +1,4 @@
-move: MACRO
+MACRO move
 	db \1 ; animation
 	db \2 ; effect
 	db \3 ; power

diff --git a/data/music_player/song_info.asm b/data/music_player/song_info.asm
@@ -1,4 +1,4 @@
-song_info: MACRO
+MACRO song_info
 	li \1
 	db \2, \3, \4
 ENDM