Skip to content

Pride toggle #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/constants.asm
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ MODE_INPUT_DISPLAY
MODE_DISABLE_FLASH
MODE_DISABLE_PAUSE
MODE_DARK
MODE_PRIDE
MODE_GOOFY
MODE_DEBUG
MODE_LINECAP
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/nametables/game_type_menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,14 @@ 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#
#a DAS ONLY d#
#a QUAL MODE d#
#a PAL MODE d#
#a d#
#a d#
#a V6 d#
#a d#
#a d#
Expand Down
19 changes: 19 additions & 0 deletions src/nmi/render_mode_play_and_demo.asm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/ram.asm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down