From e5aa8e8c31c7f66e019e194bd09ba157cee6a198 Mon Sep 17 00:00:00 2001 From: zohassadar Date: Wed, 22 May 2024 17:48:53 +0000 Subject: [PATCH] Pride toggle --- src/constants.asm | 2 ++ src/nametables/game_type_menu.js | 2 +- src/nmi/render_mode_play_and_demo.asm | 19 +++++++++++++++++++ src/ram.asm | 1 + 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/constants.asm b/src/constants.asm index 3fb96acf..c245523f 100644 --- a/src/constants.asm +++ b/src/constants.asm @@ -94,6 +94,7 @@ MODE_INPUT_DISPLAY MODE_DISABLE_FLASH MODE_DISABLE_PAUSE MODE_DARK +MODE_PRIDE MODE_GOOFY MODE_DEBUG MODE_LINECAP @@ -162,6 +163,7 @@ MENU_TOP_MARGIN_SCROLL := 7 ; in blocks .byte $1 ; MODE_DISABLE_FLASH .byte $1 ; MODE_DISABLE_PAUSE .byte $5 ; MODE_DARK + .byte $1 ; MODE_PRIDE .byte $1 ; MODE_GOOFY .byte $1 ; MODE_DEBUG .byte $1 ; MODE_LINECAP diff --git a/src/nametables/game_type_menu.js b/src/nametables/game_type_menu.js index 45cc8a47..f53cf588 100644 --- a/src/nametables/game_type_menu.js +++ b/src/nametables/game_type_menu.js @@ -70,6 +70,7 @@ drawTiles(buffer, lookup, ` #a DISABLE FLASH d# #a DISABLE PAUSE d# #a DARK MODE d# +#a PRIDE COLORS d# #a GOOFY FOOT d# #a BLOCK TOOL d# #a LINECAP d# @@ -77,7 +78,6 @@ drawTiles(buffer, lookup, ` #a QUAL MODE d# #a PAL MODE d# #a d# -#a d# #a V6 d# #a d# #a d# diff --git a/src/nmi/render_mode_play_and_demo.asm b/src/nmi/render_mode_play_and_demo.asm index 3bc2f9cb..f6389e89 100644 --- a/src/nmi/render_mode_play_and_demo.asm +++ b/src/nmi/render_mode_play_and_demo.asm @@ -321,6 +321,13 @@ updatePaletteForLevel: @copyPalettes: and #$3F tax + ldy prideFlag + beq @checkPal + cpx #$0A ; only modify 0-9 + bcs @checkPal + adc #$41 ; clc unnecessary, carry already clear + tax +@checkPal: lda palFlag beq @renderPalettes cpx #$35 ; Level 181 & 245 and'd with $3F (level 53 & 117 are properly mod10'd) @@ -375,6 +382,10 @@ colorTable0: .byte $06,$4C,$BD,$19 .byte $00,$01,$03,$05 .byte $21 ; level 181/245 pal (different from NTSC) +; pride colors + .byte $30,$30,$25,$30 + .byte $30,$30,$30,$30 + .byte $30,$30 colorTable1: .byte $21,$29,$24,$2A @@ -394,6 +405,10 @@ colorTable1: .byte $38,$2A,$4E,$60 .byte $00,$01,$04,$05 .byte $2b ; level 181/245 pal (same as NTSC) +; pride colors + .byte $00,$00,$11,$00 + .byte $28,$21,$27,$00 + .byte $25,$27 colorTable2: .byte $12,$1A,$14,$12 @@ -413,6 +428,10 @@ colorTable2: .byte $E9,$99,$99,$00 .byte $01,$02,$04,$05 .byte $25 ; level 181/245 pal (same as NTSC) +; pride colors + .byte $21,$1a,$14,$25 + .byte $14,$2b,$11,$14 + .byte $21,$15 incrementPieceStat: tax diff --git a/src/ram.asm b/src/ram.asm index f021f206..7ce8f481 100755 --- a/src/ram.asm +++ b/src/ram.asm @@ -345,6 +345,7 @@ inputDisplayFlag: .res 1 disableFlashFlag: .res 1 disablePauseFlag: .res 1 darkModifier: .res 1 +prideFlag: .res 1 goofyFlag: .res 1 debugFlag: .res 1 linecapFlag: .res 1