Require rgbds 0.6.0

Rangi42 · Oct 3, 2022 · e64b4ac · e64b4ac
1 parent 4c7bea9
commit e64b4ac
Show file tree

Hide file tree

Showing 22 changed files with 30 additions and 80 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,7 +14,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get install make python gcc git bison
-        git clone -b v0.6.0-rc2 --depth=1 https://github.com/gbdev/rgbds
+        git clone -b v0.6.0 --depth=1 https://github.com/gbdev/rgbds
         pushd rgbds
         git fetch
         git checkout 3e945679ad615692c3e9c07f52a21922b561c9a6

diff --git a/INSTALL.md b/INSTALL.md
@@ -22,7 +22,7 @@ cd polishedcrystal
 mkdir rgbds
 ```
 
-Then download [**rgbds**](https://rgbds.gbdev.io/). If you're building Polished Crystal 2.2.0, get rgbds version 0.3.9. If you're building the 3.0.0 beta, you'll need version **0.6.0-rc2**. Extract the archive and put all the .exe and .dll files in polishedcrystal/rgbds.
+Then download [**rgbds**](https://rgbds.gbdev.io/). If you're building Polished Crystal 2.2.0, get rgbds version 0.3.9. If you're building the 3.0.0 beta, you'll need version **0.6.0**. Extract the archive and put all the .exe and .dll files in polishedcrystal/rgbds.
 
 To build **polishedcrystal.gbc**:
 

diff --git a/Makefile b/Makefile
@@ -21,7 +21,7 @@ Q :=
 
 .SECONDEXPANSION:
 
-RGBASM_FLAGS     = -EhL -Q8 -Weverything -Wnumeric-string=2 -Wtruncation=1
+RGBASM_FLAGS     = -EhL -Q8 -P constants.asm -Weverything -Wnumeric-string=2 -Wtruncation=1
 RGBASM_VC_FLAGS  = $(RGBASM_FLAGS) -DVIRTUAL_CONSOLE
 RGBLINK_FLAGS    = -M -n $(ROM_NAME).sym    -m $(ROM_NAME).map    -p $(FILLER)
 RGBLINK_VC_FLAGS = -M -n $(ROM_NAME)_vc.sym -m $(ROM_NAME)_vc.map -p $(FILLER)
@@ -64,25 +64,25 @@ RGBASM_FLAGS += -DHUFFMAN
 endif
 
 rom_obj := \
-main.o \
-home.o \
-ram.o \
-audio.o \
-audio/music_player.o \
-data/pokemon/dex_entries.o \
-data/pokemon/egg_moves.o \
-data/pokemon/evos_attacks.o \
-data/maps/map_data.o \
-data/text/common.o \
-data/tilesets.o \
-engine/movie/credits.o \
-engine/overworld/events.o \
-gfx/minis_icons.o \
-gfx/pokemon.o \
-gfx/sprites.o \
-gfx/trainers.o \
-gfx/items.o \
-gfx/misc.o
+	main.o \
+	home.o \
+	ram.o \
+	audio.o \
+	audio/music_player.o \
+	data/pokemon/dex_entries.o \
+	data/pokemon/egg_moves.o \
+	data/pokemon/evos_attacks.o \
+	data/maps/map_data.o \
+	data/text/common.o \
+	data/tilesets.o \
+	engine/movie/credits.o \
+	engine/overworld/events.o \
+	gfx/minis_icons.o \
+	gfx/pokemon.o \
+	gfx/sprites.o \
+	gfx/trainers.o \
+	gfx/items.o \
+	gfx/misc.o
 
 crystal_obj    := $(rom_obj:.o=.o)
 crystal_vc_obj :=$(rom_obj:.o=_vc.o)
@@ -130,12 +130,12 @@ rgbdscheck.o: rgbdscheck.asm
 	$Q$(RGBDS_DIR)rgbasm -o $@ $<
 
 define DEP
-$1: $2 $$(shell tools/scan_includes $2) | rgbdscheck.o
+$1: $2 $$(shell tools/scan_includes $2) | constants.asm rgbdscheck.o
 	$Q$$(RGBDS_DIR)rgbasm $$(RGBASM_FLAGS) -L -o $$@ $$<
 endef
 
 define VCDEP
-$1: $2 $$(shell tools/scan_includes $2) | rgbdscheck.o
+$1: $2 $$(shell tools/scan_includes $2) | constants.asm rgbdscheck.o
 	$Q$$(RGBDS_DIR)rgbasm $$(RGBASM_VC_FLAGS) -L -o $$@ $$<
 endef
 

diff --git a/audio.asm b/audio.asm
@@ -1,6 +1,3 @@
-INCLUDE "constants.asm"
-
-
 SECTION "Audio", ROMX
 
 INCLUDE "audio/engine.asm"

diff --git a/audio/music_player.asm b/audio/music_player.asm
@@ -1,8 +1,6 @@
 ; Written by Sanqui
 ; https://github.com/froggestspirit/CrystalComplete/blob/master/misc/musicplayer.asm
 
-INCLUDE "constants.asm"
-
 DEF MP_METER0 EQU $20
 DEF MP_METER8 EQU $28
 DEF MP_DUTY0 EQU $29

diff --git a/data/maps/map_data.asm b/data/maps/map_data.asm
@@ -1,6 +1,3 @@
-INCLUDE "constants.asm"
-
-
 SECTION "Map Headers", ROMX
 
 INCLUDE "data/maps/maps.asm"

diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm
@@ -1,6 +1,3 @@
-INCLUDE "constants.asm"
-
-
 SECTION "BulbasaurPokedexEntry", ROMX
 BulbasaurPokedexEntry::
 	db "Seed@"

diff --git a/data/pokemon/egg_moves.asm b/data/pokemon/egg_moves.asm
@@ -1,6 +1,3 @@
-INCLUDE "constants.asm"
-
-
 SECTION "Egg Moves", ROMX
 
 INCLUDE "data/pokemon/egg_move_pointers.asm"

diff --git a/data/pokemon/evos_attacks.asm b/data/pokemon/evos_attacks.asm
@@ -1,5 +1,3 @@
-INCLUDE "constants.asm"
-
 MACRO evo_data
 	db \1, \2 ; evolution type, parameter
 	if (\1 == EVOLVE_STAT) || (\1 == EVOLVE_HOLDING)
@@ -13,6 +11,7 @@ MACRO evo_data
 	endc
 ENDM
 
+
 SECTION "Evolutions and Attacks", ROMX
 
 INCLUDE "data/pokemon/evolution_moves.asm"

diff --git a/data/text/common.asm b/data/text/common.asm
@@ -1,6 +1,3 @@
-INCLUDE "constants.asm"
-
-
 SECTION "_FruitBearingTreeText", ROMX
 _FruitBearingTreeText::
 	text "It's a fruit-"

diff --git a/data/tilesets.asm b/data/tilesets.asm
@@ -1,6 +1,3 @@
-INCLUDE "constants.asm"
-
-
 SECTION "Tileset Headers", ROMX
 
 MACRO tileset

diff --git a/engine/events/magikarp.asm b/engine/events/magikarp.asm
@@ -106,10 +106,7 @@ PrintMagikarpLength:
 	ld b, a
 	ld a, [wMagikarpLengthMmLo]
 	ld c, a
-pusho
-opt Q16
-	ld de, div(1.0, 25.4) ; 1 in / 25.4 mm = 0.03937 in/mm
-popo
+	ld de, div(1.0q16, 25.4q16, 16) ; 1 in / 25.4 mm = 0.03937 in/mm
 	xor a
 	ldh [hTmpd], a
 	ldh [hTmpe], a

diff --git a/engine/math/sine.asm b/engine/math/sine.asm
@@ -45,7 +45,7 @@ _Sine::
 	ret
 
 .sinewave
-; sample sin(x) from x=0 to x=pi radians
+; sample sin(x) from x=0 to x=0.5 turns (pi radians)
 for x, 32
-	dw sin(x * div(0.5, 32))
+	dw sin(x * 0.5 / 32)
 endr
diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm
@@ -1,6 +1,3 @@
-INCLUDE "constants.asm"
-
-
 SECTION "Credits", ROMX
 
 	const_def

diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm
@@ -1,6 +1,3 @@
-INCLUDE "constants.asm"
-
-
 SECTION "Events", ROMX
 
 OverworldLoop::

diff --git a/gfx/pokemon.asm b/gfx/pokemon.asm
@@ -1,6 +1,3 @@
-INCLUDE "constants.asm"
-
-
 SECTION "Pokemon Pic Pointers", ROMX
 
 INCLUDE "data/pokemon/pic_pointers.asm"

diff --git a/gfx/sprites.asm b/gfx/sprites.asm
@@ -1,6 +1,3 @@
-INCLUDE "constants.asm"
-
-
 SECTION "ChrisSpriteGFX", ROMX
 ChrisSpriteGFX:: INCBIN "gfx/sprites/chris.2bpp.lz"
 

diff --git a/gfx/trainers.asm b/gfx/trainers.asm
@@ -1,6 +1,3 @@
-INCLUDE "constants.asm"
-
-
 SECTION "Trainer Pic Pointers", ROMX
 
 INCLUDE "data/trainers/pic_pointers.asm"

diff --git a/home.asm b/home.asm
@@ -1,6 +1,3 @@
-INCLUDE "constants.asm"
-
-
 SECTION "NULL", ROM0
 NULL::
 

diff --git a/main.asm b/main.asm
@@ -1,6 +1,3 @@
-INCLUDE "constants.asm"
-
-
 SECTION "bank1", ROMX
 
 INCLUDE "engine/gfx/load_push_oam.asm"

diff --git a/ram.asm b/ram.asm
@@ -1,5 +1,3 @@
-INCLUDE "constants.asm"
-
 INCLUDE "macros/wram.asm"
 
 INCLUDE "ram/vram.asm"

diff --git a/rgbdscheck.asm b/rgbdscheck.asm
@@ -1,9 +1,8 @@
 MAJOR EQU 0
 MINOR EQU 6
 PATCH EQU 0
-RC    EQU 2
 
-WRONG_RGBDS EQUS "fail \"polishedcrystal requires rgbds v0.6.0-rc2 or newer.\""
+WRONG_RGBDS EQUS "fail \"polishedcrystal requires rgbds v0.6.0 or newer.\""
 
 if !DEF(__RGBDS_MAJOR__) || !DEF(__RGBDS_MINOR__) || !DEF(__RGBDS_PATCH__)
 	WRONG_RGBDS
@@ -14,9 +13,7 @@ else
 		WRONG_RGBDS
 	else
 		if DEF(__RGBDS_RC__)
-			if __RGBDS_RC__ < RC
-				WRONG_RGBDS
-			endc
+			WRONG_RGBDS
 		endc
 	endc
 endc