From b6b60742bb059295fd4332b2ae319a0d21dc1e34 Mon Sep 17 00:00:00 2001 From: Randy Thiemann Date: Wed, 25 Oct 2023 04:29:14 +0200 Subject: [PATCH] Scoring and graphics fixes. --- DMGTRIS.GBC | Bin 32768 -> 32768 bytes Makefile | 2 +- project.mk | 7 ++++--- src/gbc.asm | 8 ++++---- src/main.asm | 4 ++-- src/res/sources/tiles.gbr | Bin 39009 -> 39009 bytes src/res/tiles.inc | 8 ++++---- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/DMGTRIS.GBC b/DMGTRIS.GBC index 3564e3ea52b3db5e1a44b616c73e96255dc119c3..eb673bc96448f724f62ec768fa433f7671352152 100644 GIT binary patch delta 3136 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 TGv4OwQNu~VXML@w#r*#Ps@q}K diff --git a/Makefile b/Makefile index 8aeba6c..5f17674 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ INCDIRS = src/ src/include/ WARNINGS = all extra ASFLAGS = -p 0xFF $(addprefix -i,$(INCDIRS)) $(addprefix -W,$(WARNINGS)) LDFLAGS = -p 0xFF -FIXFLAGS = -p 0xFF -l 0x33 -m 0x03 -r 0x02 -v -i $(GAMEID) -k $(LICENSEE) -t $(TITLE) -n $(VERSION) +FIXFLAGS = -p 0xFF -l 0x33 -r 0x02 -v -i $(GAMEID) -k $(LICENSEE) -t $(TITLE) -n $(VERSION) -m $(MAPPER) # The list of "root" ASM files that RGBASM will be invoked on SRCS = $(wildcard src/*.asm) diff --git a/project.mk b/project.mk index d1afdee..a106ecc 100644 --- a/project.mk +++ b/project.mk @@ -14,16 +14,17 @@ LICENSEE := NR ROMNAME := DMGTRIS ROMEXT := GBC +# Mapper +MAPPER := 0x03 + # Extra assembler flags # Do not insert nop after halt ASFLAGS += -h -# Do optimize ld to ldh -ASFLAGS += -l # Extra linker flags # Tiny Rom LDFLAGS += -t # Extra fix flags -# SEt as gbc compatible +# Set as gbc compatible FIXFLAGS += -c diff --git a/src/gbc.asm b/src/gbc.asm index eaa1179..5c2614e 100644 --- a/src/gbc.asm +++ b/src/gbc.asm @@ -754,7 +754,7 @@ GBCGameplayProcess:: ld a, [wSpeedCurveState] cp a, SCURVE_SHIR ld a, $00 ;Red - jr z, .colorfield ;Always red + jr z, .higoverride ;Always red ld a, [wSpeedCurveState] cp a, SCURVE_CHIL ld a, $01 ;Green @@ -896,13 +896,13 @@ GBCGameplayProcess:: jr nz, .black ld hl, hFrameCtr - bit 1, [hl] + bit 4, [hl] jr z, .lighter .darker ld a, OCPSF_AUTOINC | (7*8)+(3*2) ldh [rOCPS], a - ld bc, R2 | G2 + ld bc, R1 | G1 wait_vram ld a, c ldh [rOCPD], a @@ -913,7 +913,7 @@ GBCGameplayProcess:: .lighter ld a, OCPSF_AUTOINC | (7*8)+(3*2) ldh [rOCPS], a - ld bc, R3 | G3 + ld bc, R2 | G2 wait_vram ld a, c ldh [rOCPD], a diff --git a/src/main.asm b/src/main.asm index 0599344..f83d15f 100644 --- a/src/main.asm +++ b/src/main.asm @@ -123,7 +123,7 @@ Main:: cp a, "G" jr nz, .nosavedata ld a, [rMagic+3] - cp a, "1" + cp a, "2" jr nz, .nosavedata .savedata @@ -152,7 +152,7 @@ Main:: ld [rMagic+1], a ld a, "G" ld [rMagic+2], a - ld a, "1" + ld a, "2" ld [rMagic+3], a ld a, BUTTON_MODE_NORM diff --git a/src/res/sources/tiles.gbr b/src/res/sources/tiles.gbr index 11afa881838b455d918908d2d877b3a5fa1b6bb7..d40779d3eccd041c2b77d677af3442a471fa2f14 100644 GIT binary patch delta 74 zcmaF3f$8A}rVSVRC778R7#Ns=5Cot!ki$GVqhDq6pG?ll{El3c&%1L>zMd(_jihR` L^8^Wwi3Mx`g`E&s delta 122 zcmaF3f$8A}rVSVR0~weZ7=RcA;WUuR%nT8MhykTQDu7}j8U}!T2!IHHbOF(1Lpc#X Uun0_=d9(8b2@W<621cMT0N1q$xBvhE diff --git a/src/res/tiles.inc b/src/res/tiles.inc index e8b011b..8bb3c14 100644 --- a/src/res/tiles.inc +++ b/src/res/tiles.inc @@ -528,10 +528,10 @@ Tiles:: DB $82,$82,$82,$82,$EC,$EC,$00,$00 DB $44,$44,$CA,$CA,$4A,$4A,$4A,$4A DB $4A,$4A,$4A,$4A,$E4,$E4,$00,$00 - DB $CA,$CA,$2A,$2A,$2A,$2A,$4E,$4E - DB $82,$82,$82,$82,$E2,$E2,$00,$00 - DB $FF,$FF,$81,$81,$24,$24,$3C,$3C - DB $24,$24,$81,$81,$FF,$FF,$00,$00 + DB $CE,$CE,$28,$28,$28,$28,$4C,$4C + DB $82,$82,$82,$82,$EC,$EC,$00,$00 + DB $18,$18,$3C,$3C,$30,$30,$3C,$3C + DB $3C,$3C,$1C,$1C,$14,$14,$00,$00 TilesEnd::