Scoring and graphics fixes.

This commit is contained in:
Randy Thiemann 2023-10-25 04:29:14 +02:00
parent fd1a1f47c0
commit b6b60742bb
7 changed files with 15 additions and 14 deletions

Binary file not shown.

View File

@ -43,7 +43,7 @@ INCDIRS = src/ src/include/
WARNINGS = all extra WARNINGS = all extra
ASFLAGS = -p 0xFF $(addprefix -i,$(INCDIRS)) $(addprefix -W,$(WARNINGS)) ASFLAGS = -p 0xFF $(addprefix -i,$(INCDIRS)) $(addprefix -W,$(WARNINGS))
LDFLAGS = -p 0xFF 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 # The list of "root" ASM files that RGBASM will be invoked on
SRCS = $(wildcard src/*.asm) SRCS = $(wildcard src/*.asm)

View File

@ -14,16 +14,17 @@ LICENSEE := NR
ROMNAME := DMGTRIS ROMNAME := DMGTRIS
ROMEXT := GBC ROMEXT := GBC
# Mapper
MAPPER := 0x03
# Extra assembler flags # Extra assembler flags
# Do not insert nop after halt # Do not insert nop after halt
ASFLAGS += -h ASFLAGS += -h
# Do optimize ld to ldh
ASFLAGS += -l
# Extra linker flags # Extra linker flags
# Tiny Rom # Tiny Rom
LDFLAGS += -t LDFLAGS += -t
# Extra fix flags # Extra fix flags
# SEt as gbc compatible # Set as gbc compatible
FIXFLAGS += -c FIXFLAGS += -c

View File

@ -754,7 +754,7 @@ GBCGameplayProcess::
ld a, [wSpeedCurveState] ld a, [wSpeedCurveState]
cp a, SCURVE_SHIR cp a, SCURVE_SHIR
ld a, $00 ;Red ld a, $00 ;Red
jr z, .colorfield ;Always red jr z, .higoverride ;Always red
ld a, [wSpeedCurveState] ld a, [wSpeedCurveState]
cp a, SCURVE_CHIL cp a, SCURVE_CHIL
ld a, $01 ;Green ld a, $01 ;Green
@ -896,13 +896,13 @@ GBCGameplayProcess::
jr nz, .black jr nz, .black
ld hl, hFrameCtr ld hl, hFrameCtr
bit 1, [hl] bit 4, [hl]
jr z, .lighter jr z, .lighter
.darker .darker
ld a, OCPSF_AUTOINC | (7*8)+(3*2) ld a, OCPSF_AUTOINC | (7*8)+(3*2)
ldh [rOCPS], a ldh [rOCPS], a
ld bc, R2 | G2 ld bc, R1 | G1
wait_vram wait_vram
ld a, c ld a, c
ldh [rOCPD], a ldh [rOCPD], a
@ -913,7 +913,7 @@ GBCGameplayProcess::
.lighter .lighter
ld a, OCPSF_AUTOINC | (7*8)+(3*2) ld a, OCPSF_AUTOINC | (7*8)+(3*2)
ldh [rOCPS], a ldh [rOCPS], a
ld bc, R3 | G3 ld bc, R2 | G2
wait_vram wait_vram
ld a, c ld a, c
ldh [rOCPD], a ldh [rOCPD], a

View File

@ -123,7 +123,7 @@ Main::
cp a, "G" cp a, "G"
jr nz, .nosavedata jr nz, .nosavedata
ld a, [rMagic+3] ld a, [rMagic+3]
cp a, "1" cp a, "2"
jr nz, .nosavedata jr nz, .nosavedata
.savedata .savedata
@ -152,7 +152,7 @@ Main::
ld [rMagic+1], a ld [rMagic+1], a
ld a, "G" ld a, "G"
ld [rMagic+2], a ld [rMagic+2], a
ld a, "1" ld a, "2"
ld [rMagic+3], a ld [rMagic+3], a
ld a, BUTTON_MODE_NORM ld a, BUTTON_MODE_NORM

Binary file not shown.

View File

@ -528,10 +528,10 @@ Tiles::
DB $82,$82,$82,$82,$EC,$EC,$00,$00 DB $82,$82,$82,$82,$EC,$EC,$00,$00
DB $44,$44,$CA,$CA,$4A,$4A,$4A,$4A DB $44,$44,$CA,$CA,$4A,$4A,$4A,$4A
DB $4A,$4A,$4A,$4A,$E4,$E4,$00,$00 DB $4A,$4A,$4A,$4A,$E4,$E4,$00,$00
DB $CA,$CA,$2A,$2A,$2A,$2A,$4E,$4E DB $CE,$CE,$28,$28,$28,$28,$4C,$4C
DB $82,$82,$82,$82,$E2,$E2,$00,$00 DB $82,$82,$82,$82,$EC,$EC,$00,$00
DB $FF,$FF,$81,$81,$24,$24,$3C,$3C DB $18,$18,$3C,$3C,$30,$30,$3C,$3C
DB $24,$24,$81,$81,$FF,$FF,$00,$00 DB $3C,$3C,$1C,$1C,$14,$14,$00,$00
TilesEnd:: TilesEnd::