diff --git a/bin/DMGTRIS.GBC b/bin/DMGTRIS.GBC index 99e5892..1e6e1a7 100644 Binary files a/bin/DMGTRIS.GBC and b/bin/DMGTRIS.GBC differ diff --git a/bin/DMGTRIS.pocket b/bin/DMGTRIS.pocket index 785fb2d..240d656 100644 Binary files a/bin/DMGTRIS.pocket and b/bin/DMGTRIS.pocket differ diff --git a/src/gbc.asm b/src/gbc.asm index 5125e7a..ae71675 100644 --- a/src/gbc.asm +++ b/src/gbc.asm @@ -737,39 +737,52 @@ GBCGameplayProcess:: ; Color based on mode. ld a, [wSpeedCurveState] cp a, SCURVE_DMGT - ld a, $03 ;Blue - jr z, .higoverride + ld a, $05 ;Blue + jr z, .goverride ld a, [wSpeedCurveState] cp a, SCURVE_TGM1 - ld a, $05 ;Yellow - jr z, .higoverride + ld a, $06 ;Cyan + jr z, .goverride ld a, [wSpeedCurveState] cp a, SCURVE_TGM3 - ld a, $04 ;Orange - jr z, .higoverride + ld a, $03 ;Blue + jr z, .goverride ld a, [wSpeedCurveState] cp a, SCURVE_DEAT - ld a, $06 ;Cyan - jr z, .higoverride + ld a, $00 ;Red + jr z, .goverride ld a, [wSpeedCurveState] cp a, SCURVE_SHIR ld a, $00 ;Red - jr z, .higoverride ;Always red + jr z, .goverride ;Always red ld a, [wSpeedCurveState] cp a, SCURVE_CHIL ld a, $01 ;Green - jr z, .higoverride ; Are we 20G? -.higoverride +.goverride ld d, a ldh a, [hCurrentIntegerGravity] cp a, 20 - jr nz, .colorfield - - ; Strobe the frame. + jr c, :+ ld a, $00 ld d, a + jr .colorfield +: cp a, 3 + jr c, :+ + ld a, $04 + ld d, a + jr .colorfield +: cp a, 2 + jr c, :+ + ld a, $05 + ld d, a + jr .colorfield +: ldh a, [hCurrentFractionalGravity] + cp a, 0 + jr nz, .colorfield + ld a, $05 + ld d, a .colorfield ld hl, wShadowTileAttrs