fix menu, add tests, move dark mode

Author: kirjavascript

src/constants.asm

@@ -91,9 +91,9 @@ MODE_HZ_DISPLAY
 MODE_INPUT_DISPLAY
 MODE_DISABLE_FLASH
 MODE_DISABLE_PAUSE
+MODE_DARK
 MODE_GOOFY
 MODE_DEBUG
-MODE_DARK
 MODE_LINECAP
 MODE_DASONLY
 MODE_QUAL
@@ -124,7 +124,7 @@ LINECAP_WHEN_STRING_OFFSET := $10
 LINECAP_HOW_STRING_OFFSET := $12
 
 MENU_SPRITE_Y_BASE := $47
-MENU_MAX_Y_SCROLL := $98
+MENU_MAX_Y_SCROLL := $A0
 MENU_TOP_MARGIN_SCROLL := 7 ; in blocks
 
 ; menuConfigSizeLookup
@@ -159,9 +159,9 @@ 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 $1    ; MODE_GOOFY
     .byte $1    ; MODE_DEBUG
-    .byte $1    ; MODE_DARK
     .byte $1    ; MODE_LINECAP
     .byte $1    ; MODE_DASONLY
     .byte $1    ; MODE_QUAL

src/nametables/game_type_menu.js

@@ -69,9 +69,9 @@ drawTiles(buffer, lookup, `
 #a    INPUT DISPLAY           d#
 #a    DISABLE FLASH           d#
 #a    DISABLE PAUSE           d#
+#a    DARK MODE               d#
 #a    GOOFY FOOT              d#
 #a    BLOCK TOOL              d#
-#a    DARK MODE               d#
 #a    LINECAP                 d#
 #a    DAS ONLY                d#
 #a    QUAL MODE               d#
@@ -134,7 +134,7 @@ drawTiles(extra, lookup, background);
 drawRect(buffer, 8, 2, 10, 5, 0xB0); // draw logo
 
 const urlX = 3;
-const urlY = 15;
+const urlY = 17;
 drawRect(extra, urlX, urlY, 12, 1, 0x74);
 drawRect(extra, urlX+12, urlY, 12, 1, 0x84);
 
@@ -158,8 +158,6 @@ drawAttrs(buffer, [`
     2222222222222222
 `]);
 
-const line = '2'.repeat(16);
-const screen = Array.from({ length: 8 }, () => line).join('\n');
 drawAttrs(extra, [`
     2222222222222222
     2222222222222222
@@ -168,8 +166,17 @@ drawAttrs(extra, [`
     2222222222222222
     2222222222222222
     2222222222222222
+    2222222222222222
+`, `
     2333333333333332
-`, screen]);
+    2222222222222222
+    2222222222222222
+    2222222222222222
+    2222222222222222
+    2222222222222222
+    2222222222222222
+    2222222222222222
+`]);
 
 writeRLE(
     __dirname + '/game_type_menu_nametable_practise.bin',

src/ram.asm

@@ -347,9 +347,9 @@ hzFlag: .res 1
 inputDisplayFlag: .res 1
 disableFlashFlag: .res 1
 disablePauseFlag: .res 1
+darkMode: .res 1
 goofyFlag: .res 1
 debugFlag: .res 1
-darkMode: .res 1
 linecapFlag: .res 1
 dasOnlyFlag: .res 1
 qualFlag: .res 1

tests/src/constants.rs

@@ -20,4 +20,9 @@ pub fn test() {
     }
 
     assert_eq!(menu_options, labels::get("palFlag") + 1 - labels::get("menuVars"));
+
+    // check the menu scroll is correct
+    let y_scroll = labels::get("MENU_MAX_Y_SCROLL");
+
+    assert_eq!(menu_options - 8, y_scroll / 8);
 }