Remove grade text when no grades!

This commit is contained in:
Randy Thiemann 2023-11-09 21:35:36 +01:00
parent f4429139d4
commit 6e7b020e72
8 changed files with 2207 additions and 2011 deletions

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@ -382,5 +382,76 @@ sBigGameplayTileMap::
DB $00,$00 DB $00,$00
sBigGameplayTileMapEnd:: sBigGameplayTileMapEnd::
sBigGameplayUngradedTileMap::
DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
DB $6D,$01,$01,$01,$01,$01,$01,$01,$01,$6F
DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
DB $00,$00,$01,$01,$01,$01,$01,$01,$01,$01
DB $01,$01,$6D,$19,$10,$23,$1F,$01,$01,$01
DB $01,$6F,$00,$00,$00,$00,$00,$00,$00,$00
DB $00,$00,$00,$00,$01,$01,$01,$01,$01,$01
DB $01,$01,$01,$01,$6D,$01,$01,$01,$01,$01
DB $01,$01,$01,$6F,$00,$00,$00,$00,$00,$00
DB $00,$00,$00,$00,$00,$00,$01,$01,$01,$01
DB $01,$01,$01,$01,$01,$01,$6D,$01,$01,$01
DB $01,$01,$E2,$01,$01,$6F,$00,$00,$00,$00
DB $00,$00,$00,$00,$00,$00,$00,$00,$01,$01
DB $01,$01,$01,$01,$01,$01,$01,$01,$6D,$01
DB $01,$01,$01,$01,$01,$01,$01,$6F,$00,$00
DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
DB $6D,$E1,$01,$01,$01,$01,$E3,$01,$01,$6F
DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
DB $00,$00,$01,$01,$01,$01,$01,$01,$01,$01
DB $01,$01,$6E,$70,$70,$70,$70,$70,$70,$70
DB $70,$71,$00,$00,$00,$00,$00,$00,$00,$00
DB $00,$00,$00,$00,$01,$01,$01,$01,$01,$01
DB $01,$01,$01,$01,$6D,$13,$1A,$17,$0F,$01
DB $01,$01,$01,$6F,$00,$00,$00,$00,$00,$00
DB $00,$00,$00,$00,$00,$00,$01,$01,$01,$01
DB $01,$01,$01,$01,$01,$01,$6D,$01,$01,$01
DB $01,$01,$01,$01,$01,$6F,$00,$00,$00,$00
DB $00,$00,$00,$00,$00,$00,$00,$00,$01,$01
DB $01,$01,$01,$01,$01,$01,$01,$01,$6D,$01
DB $01,$01,$01,$01,$01,$01,$01,$6F,$00,$00
DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
DB $6D,$01,$01,$01,$01,$01,$01,$01,$01,$6F
DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
DB $00,$00,$01,$01,$01,$01,$01,$01,$01,$01
DB $01,$01,$6E,$70,$70,$70,$70,$70,$70,$70
DB $70,$71,$00,$00,$00,$00,$00,$00,$00,$00
DB $00,$00,$00,$00,$01,$01,$01,$01,$01,$01
DB $01,$01,$01,$01,$6D,$1E,$0E,$1A,$1D,$10
DB $01,$01,$01,$6F,$00,$00,$00,$00,$00,$00
DB $00,$00,$00,$00,$00,$00,$01,$01,$01,$01
DB $01,$01,$01,$01,$01,$01,$6D,$01,$01,$01
DB $01,$01,$01,$01,$01,$6F,$00,$00,$00,$00
DB $00,$00,$00,$00,$00,$00,$00,$00,$01,$01
DB $01,$01,$01,$01,$01,$01,$01,$01,$6E,$70
DB $70,$70,$70,$70,$F4,$70,$70,$71,$00,$00
DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
DB $6D,$17,$10,$21,$10,$17,$6F,$01,$01,$6F
DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
DB $00,$00,$01,$01,$01,$01,$01,$01,$01,$01
DB $01,$01,$6D,$01,$01,$01,$01,$01,$6F,$01
DB $01,$6F,$00,$00,$00,$00,$00,$00,$00,$00
DB $00,$00,$00,$00,$01,$01,$01,$01,$01,$01
DB $01,$01,$01,$01,$6D,$F8,$F9,$FA,$FB,$FC
DB $6F,$01,$01,$6F,$00,$00,$00,$00,$00,$00
DB $00,$00,$00,$00,$00,$00,$01,$01,$01,$01
DB $01,$01,$01,$01,$01,$01,$6D,$01,$01,$01
DB $01,$01,$6F,$01,$01,$6F,$00,$00,$00,$00
DB $00,$00,$00,$00,$00,$00,$00,$00,$01,$01
DB $01,$01,$01,$01,$01,$01,$01,$01,$E6,$E7
DB $E7,$E7,$E7,$E7,$F5,$E7,$E7,$E8,$00,$00
DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
DB $E5,$E4,$E4,$D4,$E4,$E4,$DF,$E4,$E4,$E9
DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
DB $00,$00
sBigGameplayUngradedTileMapEnd::
ENDC ENDC

View File

@ -395,5 +395,76 @@ sGameplayTileMap::
DB $00,$00 DB $00,$00
sGameplayTileMapEnd:: sGameplayTileMapEnd::
sGameplayUngradedTileMap::
DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
DB $6D,$01,$01,$01,$01,$01,$01,$01,$01,$6F
DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
DB $00,$00,$01,$01,$01,$01,$01,$01,$01,$01
DB $01,$01,$6D,$19,$10,$23,$1F,$01,$01,$01
DB $01,$6F,$00,$00,$00,$00,$00,$00,$00,$00
DB $00,$00,$00,$00,$01,$01,$01,$01,$01,$01
DB $01,$01,$01,$01,$6D,$01,$01,$01,$01,$01
DB $01,$01,$01,$6F,$00,$00,$00,$00,$00,$00
DB $00,$00,$00,$00,$00,$00,$01,$01,$01,$01
DB $01,$01,$01,$01,$01,$01,$6D,$01,$01,$01
DB $01,$01,$E2,$01,$01,$6F,$00,$00,$00,$00
DB $00,$00,$00,$00,$00,$00,$00,$00,$01,$01
DB $01,$01,$01,$01,$01,$01,$01,$01,$6D,$01
DB $01,$01,$01,$01,$01,$01,$01,$6F,$00,$00
DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
DB $6D,$E1,$01,$01,$01,$01,$E3,$01,$01,$6F
DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
DB $00,$00,$01,$01,$01,$01,$01,$01,$01,$01
DB $01,$01,$6E,$70,$70,$70,$70,$70,$70,$70
DB $70,$71,$00,$00,$00,$00,$00,$00,$00,$00
DB $00,$00,$00,$00,$01,$01,$01,$01,$01,$01
DB $01,$01,$01,$01,$6D,$13,$1A,$17,$0F,$01
DB $01,$01,$01,$6F,$00,$00,$00,$00,$00,$00
DB $00,$00,$00,$00,$00,$00,$01,$01,$01,$01
DB $01,$01,$01,$01,$01,$01,$6D,$01,$01,$01
DB $01,$01,$01,$01,$01,$6F,$00,$00,$00,$00
DB $00,$00,$00,$00,$00,$00,$00,$00,$01,$01
DB $01,$01,$01,$01,$01,$01,$01,$01,$6D,$01
DB $01,$01,$01,$01,$01,$01,$01,$6F,$00,$00
DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
DB $6D,$01,$01,$01,$01,$01,$01,$01,$01,$6F
DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
DB $00,$00,$01,$01,$01,$01,$01,$01,$01,$01
DB $01,$01,$6E,$70,$70,$70,$70,$70,$70,$70
DB $70,$71,$00,$00,$00,$00,$00,$00,$00,$00
DB $00,$00,$00,$00,$01,$01,$01,$01,$01,$01
DB $01,$01,$01,$01,$6D,$1E,$0E,$1A,$1D,$10
DB $01,$01,$01,$6F,$00,$00,$00,$00,$00,$00
DB $00,$00,$00,$00,$00,$00,$01,$01,$01,$01
DB $01,$01,$01,$01,$01,$01,$6D,$01,$01,$01
DB $01,$01,$01,$01,$01,$6F,$00,$00,$00,$00
DB $00,$00,$00,$00,$00,$00,$00,$00,$01,$01
DB $01,$01,$01,$01,$01,$01,$01,$01,$6E,$70
DB $70,$70,$70,$70,$F4,$70,$70,$71,$00,$00
DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
DB $6D,$17,$10,$21,$10,$17,$6F,$01,$01,$6F
DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
DB $00,$00,$01,$01,$01,$01,$01,$01,$01,$01
DB $01,$01,$6D,$01,$01,$01,$01,$01,$6F,$01
DB $01,$6F,$00,$00,$00,$00,$00,$00,$00,$00
DB $00,$00,$00,$00,$01,$01,$01,$01,$01,$01
DB $01,$01,$01,$01,$6D,$F8,$F9,$FA,$FB,$FC
DB $6F,$01,$01,$6F,$00,$00,$00,$00,$00,$00
DB $00,$00,$00,$00,$00,$00,$01,$01,$01,$01
DB $01,$01,$01,$01,$01,$01,$6D,$01,$01,$01
DB $01,$01,$6F,$01,$01,$6F,$00,$00,$00,$00
DB $00,$00,$00,$00,$00,$00,$00,$00,$01,$01
DB $01,$01,$01,$01,$01,$01,$01,$01,$E6,$E7
DB $E7,$E7,$E7,$E7,$F5,$E7,$E7,$E8,$00,$00
DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01
DB $E5,$E4,$E4,$D4,$E4,$E4,$DF,$E4,$E4,$E9
DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00
DB $00,$00
sGameplayUngradedTileMapEnd::
ENDC ENDC

Binary file not shown.

View File

@ -88,12 +88,29 @@ SwitchToGameplayB:
; Load the gameplay tilemap. ; Load the gameplay tilemap.
.loadtilemap .loadtilemap
ld a, [wSpeedCurveState]
cp a, SCURVE_CHIL
jr z, .ungraded
cp a, SCURVE_MYCO
jr z, .ungraded
cp a, SCURVE_TGM3 ; TODO: Remove when this one has grades.
jr z, .ungraded
.graded
ld de, sGameplayTileMap ld de, sGameplayTileMap
ld hl, $9800 ld hl, $9800
ld bc, sGameplayTileMapEnd - sGameplayTileMap ld bc, sGameplayTileMapEnd - sGameplayTileMap
call UnsafeMemCopy call UnsafeMemCopy
jr .loadtiles
.ungraded
ld de, sGameplayUngradedTileMap
ld hl, $9800
ld bc, sGameplayUngradedTileMapEnd - sGameplayUngradedTileMap
call UnsafeMemCopy
; And the tiles. ; And the tiles.
.loadtiles
call LoadGameplayTiles call LoadGameplayTiles
; Zero out SCX. ; Zero out SCX.
@ -845,12 +862,29 @@ SwitchToGameplayBigB:
; Load the gameplay tilemap. ; Load the gameplay tilemap.
.loadtilemap .loadtilemap
ld a, [wSpeedCurveState]
cp a, SCURVE_CHIL
jr z, .ungraded
cp a, SCURVE_MYCO
jr z, .ungraded
cp a, SCURVE_TGM3 ; TODO: Remove when this one has grades.
jr z, .ungraded
.graded
ld de, sBigGameplayTileMap ld de, sBigGameplayTileMap
ld hl, $9800 ld hl, $9800
ld bc, sBigGameplayTileMapEnd - sBigGameplayTileMap ld bc, sBigGameplayTileMapEnd - sBigGameplayTileMap
call UnsafeMemCopy call UnsafeMemCopy
jr .loadtiles
.ungraded
ld de, sBigGameplayUngradedTileMap
ld hl, $9800
ld bc, sBigGameplayUngradedTileMapEnd - sBigGameplayUngradedTileMap
call UnsafeMemCopy
; And the tiles. ; And the tiles.
.loadtiles
call LoadGameplayTiles call LoadGameplayTiles
; Zero out SCX. ; Zero out SCX.