neon and teal

Author: kirjavascript

src/constants.asm

@@ -161,7 +161,7 @@ MENU_TOP_MARGIN_SCROLL := 7 ; in blocks
     .byte $1    ; MODE_INPUT_DISPLAY
     .byte $1    ; MODE_DISABLE_FLASH
     .byte $1    ; MODE_DISABLE_PAUSE
-    .byte $1    ; MODE_DARK
+    .byte $3    ; MODE_DARK
     .byte $1    ; MODE_GOOFY
     .byte $1    ; MODE_DEBUG
     .byte $1    ; MODE_LINECAP

src/gamemode/gametypemenu/menu.asm

@@ -468,6 +468,8 @@ menuYTmp := tmp2
         cmp #MODE_CRASH
         beq @renderCrashMode
 
+        cmp #MODE_DARK
+        beq @renderDarkMode
 
         jsr menuItemY16Offset
         bne @loopNext
@@ -518,25 +520,26 @@ menuYTmp := tmp2
         lda scoringModifier
         sta spriteIndexInOamContentLookup
         lda #(MODE_SCORE_DISPLAY*8) + MENU_SPRITE_Y_BASE + 1
-        sbc menuScrollY
-        sta spriteYOffset
-        lda #$e9
-        sta spriteXOffset
-        jsr stringSpriteAlignRight
-        jmp @loopNext
+        jmp @renderOption
 
 @renderCrashMode:
         jsr menuItemY16Offset
         bne @loopNext
-@doRender:
-        lda crashModifier
-        cmp #CRASH_OFF
-        bne @notOff
-        lda #$F3
-@notOff:
-        adc #$14
+        ldx crashModifier
+        lda crashOptions, x
         sta spriteIndexInOamContentLookup
         lda #(MODE_CRASH*8) + MENU_SPRITE_Y_BASE + 1
+        jmp @renderOption
+
+@renderDarkMode:
+        jsr menuItemY16Offset
+        bne @loopNext
+        ldx darkModifier
+        lda darkOptions, x
+        sta spriteIndexInOamContentLookup
+        lda #(MODE_DARK*8) + MENU_SPRITE_Y_BASE + 1
+
+@renderOption:
         sec
         sbc menuScrollY
         sta spriteYOffset
@@ -545,6 +548,12 @@ menuYTmp := tmp2
         jsr stringSpriteAlignRight
         jmp @loopNext
 
+crashOptions:
+        .byte $8, $16, $17, $18
+
+darkOptions:
+        .byte $8, $9, $1B, $1C
+
 ; <- menu item index in A
 ; -> high byte of offset in A
 ; -> low byte in X

src/gamemodestate/initbackground.asm

@@ -12,15 +12,9 @@ gameModeState_initGameBackground:
         jsr scoringBackground
         jsr debugNametableUI
 
-        lda darkMode
+        ldy darkModifier
         beq @notDarkMode
         jsr drawDarkMode
-        lda #$3F
-        sta PPUADDR
-        lda #$D
-        sta PPUADDR
-        lda #$2D
-        sta PPUDATA
 @notDarkMode:
 
         lda hzFlag
@@ -239,6 +233,18 @@ drawDarkMode:
 
 darkBuffer := playfield ; cleared right after in initGameState
 
+        ; set the border colour
+        lda #$3F
+        sta PPUADDR
+        lda #$D
+        sta PPUADDR
+        lda #$2D
+        cpy #3 ; teal
+        bne :+
+        lda #$C
+:
+        sta PPUDATA
+
         ; process the playfield in 60 chunks
         lda #60
         sta tmpZ

src/nmi/render_mode_play_and_demo.asm

@@ -93,14 +93,14 @@ render_mode_play_and_demo:
         and #RENDER_SCORE
         beq @renderHz
 
-        ; 7 safe tile writes freed from stats / hz
-        ; (lazy render hz for 10 more)
+        ; (lazy render hz for 10 free writes)
         ; 1 added in level (3 total)
         ; 2 added in lines (5 total)
-        ; 2 added on crash
         ; independent writes;
         ; 1 added in 7digit
         ; 3 added in float
+        ; 2 added in neon
+        ; 2 added on crash
 
         ; scorecap
         lda crashModifier
@@ -337,6 +337,12 @@ updatePaletteForLevel:
         sta PPUDATA
         lda colorTable2,x
         sta PPUDATA
+        ldy darkModifier
+        cpy #2 ; neon
+        bne @notNeon
+        sta PPUDATA
+        sta PPUDATA
+@notNeon:
         lda #$3F
         sta PPUADDR
         lda #$19

src/ram.asm

@@ -344,7 +344,7 @@ hzFlag: .res 1
 inputDisplayFlag: .res 1
 disableFlashFlag: .res 1
 disablePauseFlag: .res 1
-darkMode: .res 1
+darkModifier: .res 1
 goofyFlag: .res 1
 debugFlag: .res 1
 linecapFlag: .res 1

src/util/strings.asm

@@ -97,6 +97,8 @@ stringLookup:
         .byte stringCrash-stringLookup
         .byte stringConfetti-stringLookup ;19
         .byte stringStrict-stringLookup
+        .byte stringNeon-stringLookup
+        .byte stringTeal-stringLookup
 stringClassic:
         .byte $7,'C','L','A','S','S','I','C'
 stringLetters:
@@ -153,3 +155,7 @@ stringConfetti:
         .byte $8,'C','O','N','F','E','T','T','I'
 stringStrict:
         .byte $6,'S','T','R','I','C','T'
+stringNeon:
+        .byte $4,'N','E','O','N'
+stringTeal:
+        .byte $4,'T','E','A','L'