Combomenu

.gitignore

@@ -10,6 +10,7 @@ tetris.lst
 tetris.lbl
 tetris.map
 tetris.dbg
+src/magicnumbers.asm
 release/*
 target
 .env

TODO.md

@@ -0,0 +1,15 @@
+# Pending
+* lowstack should be option instead of mode
+* pressing b on multi page should go to top of page
+* rework tests to fit multi mode
+* add animation to cursor arrows
+* multiple scoreboards
+* clear scoreboard individually
+* decimal display
+* height 6-8 logic can be rearranged to be closer to vanilla
+
+# Bugs
+* lowstack & crunch do not work together
+* garbage + crunch or floor does not work well
+* lowstack line doesn't respond to vert mirror flag
+* lowstack nope gets mirrored with horiz mirror flag

build.js

@@ -1,6 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const crypto = require('crypto');
+const { writeFileSync } = require("fs");
 
 console.log('TetrisGYM buildscript');
 console.time('build');
@@ -23,6 +24,7 @@ if (args.includes('-h')) {
 
 -m  mapper
 -a  faster aeppoz + press select to end game
+-A  build anydas
 -s  disable highscores/SRAM
 -k  Famicom Keyboard support
 -w  force WASM compiler
@@ -97,6 +99,13 @@ if (args.includes('--')) {
 
 console.log();
 
+// build menu
+if (!args.includes('-M')) {
+    console.time('menu');
+    require('./src/gamemode/gametypemenu/menu');
+    console.timeEnd('menu');
+}
+
 // build / compress nametables
 
 console.time('nametables');
@@ -158,6 +167,23 @@ const flags = compileFlags.join(' ');
 
 console.time('assemble');
 
+// embed latest commit id as magic number
+const magicNumbers = spawnSync("git", ["log", "-1", "--pretty='%H'"])
+    .stdout.toString()
+    .trim()
+    .slice(1, 9)
+    .toUpperCase()
+    .match(/../g)
+    .map((b, i) => `HIGH_SCORE_MAGIC${i} = $${b}`);
+
+const magicNumbersAsm = `; generated by build.js
+
+${magicNumbers.join("\n")}
+`;
+
+writeFileSync("src/magicnumbers.asm", magicNumbersAsm);
+
+
 exec(`${ca65bin} ${flags} -g src/header.asm -o header.o`);
 exec(`${ca65bin} ${flags} -l tetris.lst -g src/main.asm -o main.o`);
 

src/boot.asm

@@ -26,27 +26,14 @@
         ; cpx #0 ; dex sets z flag
         bne @loop
 
-        ; default pace to A
-        lda #$A
-        sta paceModifier
-
-        lda #$10
-        sta dasModifier
-
-        lda #INITIAL_LINECAP_LEVEL
-        sta linecapLevel
-        lda #INITIAL_LINECAP_LINES
-        sta linecapLines
-        lda #INITIAL_LINECAP_LINES_1
-        sta linecapLines+1
-
         jsr resetScores
 
 .if SAVE_HIGHSCORES
         jsr detectSRAM
         beq @noSRAM
         jsr checkSavedInit
         jsr copyScoresFromSRAM
+        jsr copyVarsFromSRAM
 @noSRAM:
 .endif
 

src/constants.asm

@@ -1,3 +1,5 @@
+.include "magicnumbers.asm"
+
 .ifndef INES_MAPPER ; is set via ca65 flags
 INES_MAPPER := 1000 ; 0 (NROM), 1 (MMC1), 3 (CNROM), 4 (MMC3), 5 (MMC5), and 1000 (autodetect 1/3)
 .endif
@@ -31,8 +33,12 @@ SWAP_DUTY_CYCLES := 0 ; counters the duty cycle swap present in some clone conso
 
 INITIAL_CUSTOM_LEVEL := 29
 INITIAL_LINECAP_LEVEL := 39
-INITIAL_LINECAP_LINES := $30 ; bcd
-INITIAL_LINECAP_LINES_1 := 3 ; hex (lol)
+
+; these bytes are currently 2 byte bcd in the menu
+; they are swapped and will not work
+INITIAL_LINECAP_LINES_LO := $30 ; bcd
+INITIAL_LINECAP_LINES_HI := $03 ; bcd (tbd)
+
 BTYPE_START_LINES := $25 ; bcd
 MENU_HIGHLIGHT_COLOR := $12 ; $12 in gym, $16 in original
 BLOCK_TILES := $7B
@@ -56,152 +62,117 @@ BUTTON_SELECT := $20
 BUTTON_START := $10
 BUTTON_DPAD := BUTTON_UP | BUTTON_DOWN | BUTTON_LEFT | BUTTON_RIGHT
 
-RENDER_LINES = $01
-RENDER_LEVEL = $02
-RENDER_SCORE = $04
-RENDER_DEBUG = $08
-RENDER_HZ = $10
-RENDER_STATS = $40
-RENDER_HIGH_SCORE_LETTER = $80
+RENDER_LINES := $01
+RENDER_LEVEL := $02
+RENDER_SCORE := $04
+RENDER_DEBUG := $08
+RENDER_HZ := $10
+RENDER_STATS := $40
+RENDER_HIGH_SCORE_LETTER := $80
 
 .enum
+MODE_DEFAULT
 MODE_TETRIS
 MODE_TSPINS
-MODE_SEED
-MODE_PARITY
-MODE_PACE
 MODE_PRESETS
+MODE_STACKING
 MODE_TYPEB
-MODE_FLOOR
-MODE_CRUNCH
 MODE_TAP
+MODE_TAPQTY
 MODE_TRANSITION
 MODE_MARATHON
-MODE_TAPQTY
+MODE_DROUGHT
 MODE_CHECKERBOARD
 MODE_GARBAGE
-MODE_DROUGHT
-MODE_DAS
 MODE_LOWSTACK
 MODE_KILLX2
-MODE_INVISIBLE
-MODE_HARDDROP
+MODE_ANYDAS
 MODE_SPEED_TEST
-MODE_SCORE_DISPLAY
-MODE_CRASH
-MODE_STRICT
-MODE_HZ_DISPLAY
-MODE_INPUT_DISPLAY
-MODE_DISABLE_FLASH
-MODE_DISABLE_PAUSE
-MODE_DARK
-MODE_GOOFY
-MODE_DEBUG
-MODE_LINECAP
-MODE_DASONLY
-MODE_QUAL
-MODE_PAL
-.if KEYBOARD = 1
-MODE_KEYBOARD
-.endif
 .endenum
 
-.if KEYBOARD = 1
-MODE_QUANTITY = MODE_KEYBOARD + 1
-.else
-MODE_QUANTITY = MODE_PAL + 1
-.endif
+; .endum
+; MODE_FLOOR
+; MODE_CRUNCH
+; MODE_DAS
+; MODE_KILLX2
+; MODE_INVISIBLE
+; MODE_HARDDROP
+; MODE_SCORE_DISPLAY
+; MODE_CRASH
+; MODE_STRICT
+; MODE_HZ_DISPLAY
+; MODE_INPUT_DISPLAY
+; MODE_DISABLE_FLASH
+; MODE_DISABLE_PAUSE
+; MODE_DARK
+; MODE_GOOFY
+; MODE_DEBUG
+; MODE_LINECAP
+; MODE_DASONLY
+; MODE_QUAL
+; MODE_PAL
+; .if KEYBOARD = 1
+; MODE_KEYBOARD
+; .endif
+; .endenum
 
-MODE_GAME_QUANTITY = MODE_HARDDROP + 1
+.enum
+SCORING_CLASSIC
+SCORING_LETTERS
+SCORING_SEVENDIGIT
+SCORING_FLOAT
+SCORING_SCORECAP
+SCORING_HIDDEN
+.endenum
 
-SCORING_CLASSIC := 0 ; for scoringModifier
-SCORING_LETTERS := 1
-SCORING_SEVENDIGIT := 2
-SCORING_FLOAT := 3
-SCORING_SCORECAP := 4
-SCORING_HIDDEN := 5
+.enum
+LINECAP_INACTIVE
+LINECAP_KILLX2
+LINECAP_FLOOR
+LINECAP_INVISIBLE
+LINECAP_HALT
+.endenum
 
-LINECAP_KILLX2 := 1
-LINECAP_FLOOR := 2
-LINECAP_INVISIBLE := 3
-LINECAP_HALT := 4
+.enum
+LINECAP_OFF
+LINECAP_LEVEL
+LINECAP_LINES
+.endenum
 
-CRASH_OFF := 0
-CRASH_SHOW := 1
-CRASH_TOPOUT := 2
-CRASH_CRASH := 3
+.enum
+CRASH_OFF
+CRASH_SHOW
+CRASH_TOPOUT
+CRASH_CRASH
+.endenum
 
-LINECAP_WHEN_STRING_OFFSET := $10
-LINECAP_HOW_STRING_OFFSET := $12
+LINECAP_WHEN_STRING_OFFSET := $FF
+LINECAP_HOW_STRING_OFFSET := $2
 
 MENU_SPRITE_Y_BASE := $46
 MENU_MAX_Y_SCROLL := $A0
 MENU_TOP_MARGIN_SCROLL := 7 ; in blocks
 
-; menuConfigSizeLookup
-; menu ram is defined at menuRAM in ./ram.asm
-.macro MENUSIZES
-    .byte $0    ; MODE_TETRIS
-    .byte $0    ; MODE_TSPINS
-    .byte $0    ; MODE_SEED
-    .byte $0    ; MODE_PARITY
-    .byte $F    ; MODE_PACE
-    .byte $7    ; MODE_PRESETS
-    .byte $8    ; MODE_TYPEB
-    .byte $C    ; MODE_FLOOR
-    .byte $F    ; MODE_CRUNCH
-    .byte $20   ; MODE_TAP
-    .byte $10   ; MODE_TRANSITION
-    .byte $4    ; MODE_MARATHON
-    .byte $1F   ; MODE_TAPQTY
-    .byte $8    ; MODE_CHECKERBOARD
-    .byte $4    ; MODE_GARBAGE
-    .byte $12   ; MODE_DROUGHT
-    .byte $10   ; MODE_DAS
-    .byte $12   ; MODE_LOWSTACK
-    .byte $0    ; MODE_KILLX2
-    .byte $0    ; MODE_INVISIBLE
-    .byte $0    ; MODE_HARDDROP
-    .byte $0    ; MODE_SPEED_TEST
-    .byte $5    ; MODE_SCORE_DISPLAY
-    .byte $3	; MODE_CRASH
-    .byte $1	; MODE_STRICT
-    .byte $1    ; MODE_HZ_DISPLAY
-    .byte $1    ; MODE_INPUT_DISPLAY
-    .byte $1    ; MODE_DISABLE_FLASH
-    .byte $1    ; MODE_DISABLE_PAUSE
-    .byte $5    ; MODE_DARK
-    .byte $1    ; MODE_GOOFY
-    .byte $1    ; MODE_DEBUG
-    .byte $1    ; MODE_LINECAP
-    .byte $1    ; MODE_DASONLY
-    .byte $1    ; MODE_QUAL
-    .byte $1    ; MODE_PAL
-.if KEYBOARD = 1
-    .byte $1    ; MODE_KEYBOARD
-.endif
-.endmacro
+NTSC_DAS = 16
+NTSC_ARR = 6
+
+PAL_DAS = 12
+PAL_ARR = 4
 
 .macro MODENAMES
     .byte   "TETRIS"
     .byte   "TSPINS"
-    .byte   " SEED "
-    .byte   "STACKN"
-    .byte   " PACE "
     .byte   "SETUPS"
+    .byte   "STACKN"
     .byte   "B-TYPE"
-    .byte   "FLOOR "
-    .byte   "CRUNCH"
     .byte   "QCKTAP"
+    .byte   "TAPQTY"
     .byte   "TRNSTN"
     .byte   "MARTHN"
-    .byte   "TAPQTY"
+    .byte   "LOBARS"
     .byte   "CKRBRD"
     .byte   "GARBGE"
-    .byte   "LOBARS"
-    .byte   "DASDLY"
     .byte   "LOWSTK"
     .byte   "KILLX2"
-    .byte   "INVZBL"
-    .byte   "HRDDRP"
+    .byte   "ANYDAS"
 .endmacro

src/gamemode/bootscreen.asm

@@ -4,7 +4,6 @@ gameMode_bootScreen: ; boot
         ; reset cursors
         lda #$0
         sta practiseType
-        sta menuSeedCursorIndex
 
         ; levelMenu stuff
         sta levelControlMode
@@ -33,6 +32,8 @@ gameMode_bootScreen: ; boot
         sta gameMode
         lda #1
         sta qualFlag
+        jsr resetMenuVars
+        jsr resetSavedVars
         jmp gameMode_waitScreen
 
 @nonQualBoot:

src/gamemode/gametypemenu/.gitignore

@@ -0,0 +1,2 @@
+menudata.asm
+menuram.asm