move dark mode in menu

Author: kirjavascript

src/constants.asm

@@ -93,10 +93,10 @@ MODE_DISABLE_FLASH
 MODE_DISABLE_PAUSE
 MODE_GOOFY
 MODE_DEBUG
+MODE_DARK
 MODE_LINECAP
 MODE_DASONLY
 MODE_QUAL
-MODE_DARK
 MODE_PAL
 .endenum
 
@@ -161,10 +161,10 @@ MENU_TOP_MARGIN_SCROLL := 7 ; in blocks
     .byte $1    ; MODE_DISABLE_PAUSE
     .byte $1    ; MODE_GOOFY
     .byte $1    ; MODE_DEBUG
+    .byte $1    ; MODE_DARK
     .byte $1    ; MODE_LINECAP
     .byte $1    ; MODE_DASONLY
     .byte $1    ; MODE_QUAL
-    .byte $1    ; MODE_DARK
     .byte $1    ; MODE_PAL
 .endmacro
 

src/gamemodestate/initbackground.asm

@@ -1,4 +1,3 @@
-
 gameModeState_initGameBackground:
         jsr updateAudioWaitForNmiAndDisablePpuRendering
         jsr disableNmi
@@ -255,6 +254,9 @@ savestate_nametable_patch:
         .byte   $23,$37,$3B,$FF,$FF,$FF,$FF,$FF,$FF,$3C,$FE
         .byte   $23,$57,$3D,$3E,$3E,$3E,$3E,$3E,$3E,$3F,$FD
 
+DARK_CORNER_TILES := $94
+DARK_CORNER_TILES2 := $90
+
 drawDarkMode:
         jsr bulkCopyToPpu
         .addr darkmode_stripes
@@ -289,9 +291,6 @@ drawDarkMode:
 stripeHoriz = $40
 stripeVert = $C0
 
-DARK_CORNER_TILES := $94
-DARK_CORNER_TILES2 := $90
-
 darkmode_stripes:
         .byte  $20,$00
         .byte  $00|stripeHoriz,$FF

src/nametables/game_type_menu.js

@@ -71,10 +71,10 @@ drawTiles(buffer, lookup, `
 #a    DISABLE PAUSE           d#
 #a    GOOFY FOOT              d#
 #a    BLOCK TOOL              d#
+#a    DARK MODE               d#
 #a    LINECAP                 d#
 #a    DAS ONLY                d#
 #a    QUAL MODE               d#
-#a    DARK MODE               d#
 #a    PAL MODE                d#
 #a                            d#
 #a                            d#

src/ram.asm

@@ -349,10 +349,10 @@ disableFlashFlag: .res 1
 disablePauseFlag: .res 1
 goofyFlag: .res 1
 debugFlag: .res 1
+darkMode: .res 1
 linecapFlag: .res 1
 dasOnlyFlag: .res 1
 qualFlag: .res 1
-darkMode: .res 1
 palFlag: .res 1
 
 ; ... $7FF