Use features of RGBDS 1.0.0 (#138)

Author: Rangi42

.github/workflows/main.yml

@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@master
         with:
           path: rgbds
-          ref: v0.9.3
+          ref: v1.0.0
           repository: gbdev/rgbds
 
       - name: Install rgbds

.rgbds-version

@@ -1 +1 @@
-0.9.3
+1.0.0

INSTALL.md

@@ -42,9 +42,9 @@ Run setup and leave the default settings. At the "**Select Packages**" step, cho
 
 Double click on the text that says "**Skip**" next to each package to select the most recent version to install.
 
-Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#pre-built) for Windows with Cygwin to install **rgbds 0.9.3**.
+Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#pre-built) for Windows with Cygwin to install **rgbds 1.0.0**.
 
-**Note:** If you already have an installed rgbds older than 0.9.3, you will need to update to 0.9.3. Ignore this if you have never installed rgbds before. If a version newer than 0.9.3 does not work, try downloading 0.9.3.
+**Note:** If you already have an installed rgbds older than 1.0.0, you will need to update to 1.0.0. Ignore this if you have never installed rgbds before. If a version newer than 1.0.0 does not work, try downloading 1.0.0.
 
 Now open the **Cygwin terminal** and enter the following commands.
 
@@ -67,7 +67,7 @@ Install [**Homebrew**](https://brew.sh/). Follow the official instructions.
 
 Open **Terminal** and prepare to enter commands.
 
-Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#pre-built) for macOS to install **rgbds 0.9.3**.
+Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#pre-built) for macOS to install **rgbds 1.0.0**.
 
 Now you're ready to [build **pokegold**](#build-pokegold).
 
@@ -84,7 +84,7 @@ To install the software required for **pokegold**:
 sudo apt-get install make gcc git
 ```
 
-Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.9.3** from source.
+Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 1.0.0** from source.
 
 ### OpenSUSE
 
@@ -94,7 +94,7 @@ To install the software required for **pokegold**:
 sudo zypper install make gcc git
 ```
 
-Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.9.3** from source.
+Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 1.0.0** from source.
 
 ### Arch Linux
 
@@ -104,7 +104,7 @@ To install the software required for **pokegold**:
 sudo pacman -S make gcc git rgbds
 ```
 
-If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.9.3** from source.
+If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 1.0.0** from source.
 
 ### Termux
 
@@ -120,7 +120,7 @@ To install **rgbds**:
 pkg install rgbds
 ```
 
-If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.9.3** from source.
+If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 1.0.0** from source.
 
 ### Other distros
 
@@ -131,7 +131,7 @@ If your distro is not listed here, try to find the required software in its repo
 - `git`
 - `rgbds`
 
-If `rgbds` is not available, you'll need to follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.9.3** from source.
+If `rgbds` is not available, you'll need to follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 1.0.0** from source.
 
 Now you're ready to [build **pokegold**](#build-pokegold).
 
@@ -165,12 +165,12 @@ make
 
 ### Build with a local rgbds version
 
-If you have different projects that require different versions of `rgbds`, it might not be convenient to install rgbds 0.9.3 globally. Instead, you can put its files in a directory within pokegold, such as `pokegold/rgbds-0.9.3/`. Then specify it when you run `make`:
+If you have different projects that require different versions of `rgbds`, it might not be convenient to install rgbds 1.0.0 globally. Instead, you can put its files in a directory within pokegold, such as `pokegold/rgbds-1.0.0/`. Then specify it when you run `make`:
 
 ```bash
-make RGBDS=rgbds-0.9.3/ gold
+make RGBDS=rgbds-1.0.0/ gold
 ```
 
 ```bash
-make RGBDS=rgbds-0.9.3/ silver
+make RGBDS=rgbds-1.0.0/ silver
 ```

Makefile

@@ -56,6 +56,11 @@ RGBFIX  ?= $(RGBDS)rgbfix
 RGBGFX  ?= $(RGBDS)rgbgfx
 RGBLINK ?= $(RGBDS)rgblink
 
+RGBASMFLAGS  ?= -Weverything -Wtruncation=1
+RGBLINKFLAGS ?= -Weverything -Wtruncation=1
+RGBFIXFLAGS  ?= -Weverything
+RGBGFXFLAGS  ?= -Weverything
+
 
 ### Build targets
 
@@ -107,7 +112,7 @@ tools:
 	$(MAKE) -C tools/
 
 
-RGBASMFLAGS = -Q8 -P includes.asm -Weverything -Wtruncation=1
+RGBASMFLAGS += -Q8 -P includes.asm
 # Create a sym/map for debug purposes if `make` run with `DEBUG=1`
 ifeq ($(DEBUG),1)
 RGBASMFLAGS += -E
@@ -171,16 +176,17 @@ $(foreach obj, $(silver_vc_excl_obj), \
 endif
 
 
-pokegold_opt         = -cjsv -t POKEMON_GLD -i AAUE -k 01 -l 0x33 -m MBC3+TIMER+RAM+BATTERY -r 3 -p 0
-pokesilver_opt       = -cjsv -t POKEMON_SLV -i AAXE -k 01 -l 0x33 -m MBC3+TIMER+RAM+BATTERY -r 3 -p 0
-pokegold_debug_opt   = -cjsv -t POKEMON_GLD -i AAUE -k 01 -l 0x33 -m MBC3+TIMER+RAM+BATTERY -r 3 -p 0
-pokesilver_debug_opt = -cjsv -t POKEMON_SLV -i AAXE -k 01 -l 0x33 -m MBC3+TIMER+RAM+BATTERY -r 3 -p 0
-pokegold_vc_opt      = -cjsv -t POKEMON_GLD -i AAUE -k 01 -l 0x33 -m MBC3+TIMER+RAM+BATTERY -r 3 -p 0
-pokesilver_vc_opt    = -cjsv -t POKEMON_SLV -i AAXE -k 01 -l 0x33 -m MBC3+TIMER+RAM+BATTERY -r 3 -p 0
+RGBFIXFLAGS += -cjsv -k 01 -l 0x33 -m MBC3+TIMER+RAM+BATTERY -r 3 -p 0
+pokegold.gbc:         RGBFIXFLAGS += -t POKEMON_GLD -i AAUE
+pokesilver.gbc:       RGBFIXFLAGS += -t POKEMON_SLV -i AAXE
+pokegold_debug.gbc:   RGBFIXFLAGS += -t POKEMON_GLD -i AAUE
+pokesilver_debug.gbc: RGBFIXFLAGS += -t POKEMON_SLV -i AAXE
+pokegold_vc.gbc:      RGBFIXFLAGS += -t POKEMON_GLD -i AAUE
+pokesilver_vc.gbc:    RGBFIXFLAGS += -t POKEMON_SLV -i AAXE
 
 %.gbc: $$(%_obj) layout.link
-	$(RGBLINK) -n $*.sym -m $*.map -l layout.link -o $@ $(filter %.o,$^)
-	$(RGBFIX) $($*_opt) $@
+	$(RGBLINK) $(RGBLINKFLAGS) -l layout.link -n $*.sym -m $*.map -o $@ $(filter %.o,$^)
+	$(RGBFIX) $(RGBFIXFLAGS) $@
 	tools/stadium $@
 
 
@@ -196,52 +202,52 @@ include gfx/lz.mk
 ### Pokemon and trainer sprite rules
 
 define PIC
-$1/back.2bpp: rgbgfx += --columns
+$1/back.2bpp: RGBGFXFLAGS += --columns
 $1/back.2bpp: $1/back.png $1/normal.gbcpal
-	$$(RGBGFX) $$(rgbgfx) --colors gbc:$$(word 2,$$^) -o $$@ $$<
-$1/front.2bpp: rgbgfx += --columns
+	$$(RGBGFX) $$(RGBGFXFLAGS) --colors gbc:$$(word 2,$$^) -o $$@ $$<
+$1/front.2bpp: RGBGFXFLAGS += --columns
 $1/front.2bpp: $1/front.png $1/normal.gbcpal
-	$$(RGBGFX) $$(rgbgfx) --colors gbc:$$(word 2,$$^) -o $$@ $$<
+	$$(RGBGFX) $$(RGBGFXFLAGS) --colors gbc:$$(word 2,$$^) -o $$@ $$<
 $1/normal.gbcpal: $1/front.gbcpal $1/back.gbcpal
 	tools/gbcpal $$(tools/gbcpal) $$@ $$^
 endef
 $(foreach pic, $(wildcard gfx/pokemon/*/front.png),\
 	$(eval $(call PIC,$(pic:/front.png=))))
 
 define PIC_GS
-$1/back.2bpp: rgbgfx += --columns
+$1/back.2bpp: RGBGFXFLAGS += --columns
 $1/back.2bpp: $1/back.png $1/normal.gbcpal
-	$$(RGBGFX) $$(rgbgfx) --colors gbc:$$(word 2,$$^) -o $$@ $$<
-$1/front_gold.2bpp: rgbgfx += --columns
+	$$(RGBGFX) $$(RGBGFXFLAGS) --colors gbc:$$(word 2,$$^) -o $$@ $$<
+$1/front_gold.2bpp: RGBGFXFLAGS += --columns
 $1/front_gold.2bpp: $1/front_gold.png $1/normal.gbcpal
-	$$(RGBGFX) $$(rgbgfx) --colors gbc:$$(word 2,$$^) -o $$@ $$<
-$1/front_silver.2bpp: rgbgfx += --columns
+	$$(RGBGFX) $$(RGBGFXFLAGS) --colors gbc:$$(word 2,$$^) -o $$@ $$<
+$1/front_silver.2bpp: RGBGFXFLAGS += --columns
 $1/front_silver.2bpp: $1/front_silver.png $1/normal.gbcpal
-	$$(RGBGFX) $$(rgbgfx) --colors gbc:$$(word 2,$$^) -o $$@ $$<
+	$$(RGBGFX) $$(RGBGFXFLAGS) --colors gbc:$$(word 2,$$^) -o $$@ $$<
 $1/normal.gbcpal: $1/front_gold.gbcpal $1/front_silver.gbcpal $1/back.gbcpal
 	tools/gbcpal $$(tools/gbcpal) $$@ $$^
 endef
 $(foreach pic, $(wildcard gfx/pokemon/*/front_gold.png),\
 	$(eval $(call PIC_GS,$(pic:/front_gold.png=))))
 
-gfx/trainers/%.2bpp: rgbgfx += --columns
+gfx/trainers/%.2bpp: RGBGFXFLAGS += --columns
 gfx/trainers/%.2bpp: gfx/trainers/%.png gfx/trainers/%.gbcpal
-	$(RGBGFX) $(rgbgfx) --colors gbc:$(word 2,$^) -o $@ $<
+	$(RGBGFX) $(RGBGFXFLAGS) --colors gbc:$(word 2,$^) -o $@ $<
 
 # A few back sprites have different compression settings for Gold and Silver
 gfx/pokemon/%/back_gold.2bpp: gfx/pokemon/%/back.2bpp ; cp -f $^ $@
 gfx/pokemon/%/back_silver.2bpp: gfx/pokemon/%/back.2bpp ; cp -f $^ $@
 
 # Egg does not have a back sprite, so it only uses egg.gbcpal
 gfx/pokemon/egg/egg.2bpp: gfx/pokemon/egg/egg.png gfx/pokemon/egg/egg.gbcpal
-gfx/pokemon/egg/egg.2bpp: rgbgfx += --columns --colors gbc:$(word 2,$^)
+gfx/pokemon/egg/egg.2bpp: RGBGFXFLAGS += --columns --colors gbc:$(word 2,$^)
 
 # Unown letters share one normal.gbcpal
 unown_pngs := $(wildcard gfx/pokemon/unown_*/front.png) $(wildcard gfx/pokemon/unown_*/back.png)
 $(foreach png, $(unown_pngs),\
 	$(eval $(png:.png=.2bpp): $(png) gfx/pokemon/unown/normal.gbcpal))
-gfx/pokemon/unown_%/back.2bpp: rgbgfx += --colors gbc:$(word 2,$^)
-gfx/pokemon/unown_%/front.2bpp: rgbgfx += --colors gbc:$(word 2,$^)
+gfx/pokemon/unown_%/back.2bpp: RGBGFXFLAGS += --colors gbc:$(word 2,$^)
+gfx/pokemon/unown_%/front.2bpp: RGBGFXFLAGS += --colors gbc:$(word 2,$^)
 gfx/pokemon/unown/normal.gbcpal: $(subst .png,.gbcpal,$(unown_pngs))
 	tools/gbcpal $(tools/gbcpal) $@ $^
 
@@ -264,8 +270,8 @@ gfx/intro/fire1.2bpp: gfx/intro/charizard1.2bpp gfx/intro/charizard2_top.2bpp gf
 gfx/intro/fire2.2bpp: gfx/intro/charizard2_bottom.2bpp gfx/intro/charizard3.2bpp ; cat $^ > $@
 gfx/intro/fire3.2bpp: gfx/intro/fire.2bpp gfx/intro/unused_blastoise_venusaur.2bpp ; cat $^ > $@
 
-gfx/new_game/shrink1.2bpp: rgbgfx += --columns
-gfx/new_game/shrink2.2bpp: rgbgfx += --columns
+gfx/new_game/shrink1.2bpp: RGBGFXFLAGS += --columns
+gfx/new_game/shrink2.2bpp: RGBGFXFLAGS += --columns
 
 gfx/mail/dragonite.1bpp: tools/gfx += --remove-whitespace
 gfx/mail/large_note.1bpp: tools/gfx += --remove-whitespace
@@ -275,10 +281,10 @@ gfx/mail/litebluemail_border.1bpp: tools/gfx += --remove-whitespace
 
 gfx/pokedex/pokedex.2bpp: tools/gfx += --trim-whitespace
 gfx/pokedex/pokedex_sgb.2bpp: tools/gfx += --trim-whitespace
-gfx/pokedex/question_mark.2bpp: rgbgfx += --columns
+gfx/pokedex/question_mark.2bpp: RGBGFXFLAGS += --columns
 gfx/pokedex/slowpoke.2bpp: tools/gfx += --trim-whitespace
 
-gfx/pokegear/pokegear.2bpp: rgbgfx += --trim-end 2
+gfx/pokegear/pokegear.2bpp: RGBGFXFLAGS += --trim-end 2
 gfx/pokegear/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace
 
 gfx/mystery_gift/mystery_gift.2bpp: tools/gfx += --remove-whitespace
@@ -319,16 +325,16 @@ gfx/battle_anims/rocks.2bpp: tools/gfx += --remove-whitespace
 gfx/battle_anims/skyattack.2bpp: tools/gfx += --remove-whitespace
 gfx/battle_anims/status.2bpp: tools/gfx += --remove-whitespace
 
-gfx/player/chris.2bpp: rgbgfx += --columns
-gfx/player/chris_back.2bpp: rgbgfx += --columns
+gfx/player/chris.2bpp: RGBGFXFLAGS += --columns
+gfx/player/chris_back.2bpp: RGBGFXFLAGS += --columns
 
 gfx/trainer_card/leaders.2bpp: tools/gfx += --trim-whitespace
 
 gfx/overworld/chris_fish.2bpp: tools/gfx += --trim-whitespace
 
 gfx/sprites/big_onix.2bpp: tools/gfx += --remove-whitespace --remove-xflip
 
-gfx/battle/dude.2bpp: rgbgfx += --columns
+gfx/battle/dude.2bpp: RGBGFXFLAGS += --columns
 
 gfx/font/unused_bold_font.1bpp: tools/gfx += --trim-whitespace
 
@@ -341,12 +347,12 @@ gfx/sgb/silver_border.sgb.tilemap: gfx/sgb/silver_border.bin ; tr < $< -d '\000'
 ### Catch-all graphics rules
 
 %.2bpp: %.png
-	$(RGBGFX) --colors dmg=e4 $(rgbgfx) -o $@ $<
+	$(RGBGFX) --colors dmg $(RGBGFXFLAGS) -o $@ $<
 	$(if $(tools/gfx),\
 		tools/gfx $(tools/gfx) -o $@ $@ || $$($(RM) $@ && false))
 
 %.1bpp: %.png
-	$(RGBGFX) --colors dmg=e4 $(rgbgfx) --depth 1 -o $@ $<
+	$(RGBGFX) --colors dmg $(RGBGFXFLAGS) --depth 1 -o $@ $<
 	$(if $(tools/gfx),\
 		tools/gfx $(tools/gfx) --depth 1 -o $@ $@ || $$($(RM) $@ && false))
 

data/maps/attributes.asm

@@ -37,7 +37,7 @@ MACRO connection
 			DEF _tgt = 0
 		endc
 
-		if !STRCMP("\1", "north")
+		if "\1" === "north"
 			DEF _blk = \3_WIDTH * (\3_HEIGHT - 3) + _src
 			DEF _map = _tgt
 			DEF _win = (\3_WIDTH + 6) * \3_HEIGHT + 1
@@ -48,7 +48,7 @@ MACRO connection
 				DEF _len = \3_WIDTH
 			endc
 
-		elif !STRCMP("\1", "south")
+		elif "\1" === "south"
 			DEF _blk = _src
 			DEF _map = (CURRENT_MAP_WIDTH + 6) * (CURRENT_MAP_HEIGHT + 3) + _tgt
 			DEF _win = \3_WIDTH + 7
@@ -59,7 +59,7 @@ MACRO connection
 				DEF _len = \3_WIDTH
 			endc
 
-		elif !STRCMP("\1", "west")
+		elif "\1" === "west"
 			DEF _blk = (\3_WIDTH * _src) + \3_WIDTH - 3
 			DEF _map = (CURRENT_MAP_WIDTH + 6) * _tgt
 			DEF _win = (\3_WIDTH + 6) * 2 - 6
@@ -70,7 +70,7 @@ MACRO connection
 				DEF _len = \3_HEIGHT
 			endc
 
-		elif !STRCMP("\1", "east")
+		elif "\1" === "east"
 			DEF _blk = (\3_WIDTH * _src)
 			DEF _map = (CURRENT_MAP_WIDTH + 6) * _tgt + CURRENT_MAP_WIDTH + 3
 			DEF _win = \3_WIDTH + 7

data/pokemon/unown_words.asm

@@ -1,6 +1,6 @@
 MACRO unownword
 for n, CHARLEN(\1)
-	db STRCHAR(\1, n) - "A" + FIRST_UNOWN_CHAR
+	db CHARVAL(STRCHAR(\1, n)) - 'A' + FIRST_UNOWN_CHAR
 endr
 	db -1
 ENDM

engine/battle/anim_hp_bar.asm

@@ -257,7 +257,7 @@ HPBarAnim_UpdateHPRemaining:
 .loaded_de
 	push hl
 	add hl, de
-	ld a, " "
+	ld a, ' '
 	ld [hli], a
 	ld [hli], a
 	ld [hld], a

engine/battle/battle_transition.asm

@@ -5,8 +5,8 @@ DEF BATTLETRANSITION_NO_CAVE          EQU $10
 DEF BATTLETRANSITION_NO_CAVE_STRONGER EQU $18
 DEF BATTLETRANSITION_FINISH           EQU $20
 
-DEF BATTLETRANSITION_SQUARE EQU "8" ; $fe
-DEF BATTLETRANSITION_BLACK  EQU "9" ; $ff
+DEF BATTLETRANSITION_SQUARE EQU '8' ; $fe
+DEF BATTLETRANSITION_BLACK  EQU '9' ; $ff
 
 DoBattleTransition:
 	call .InitGFX