marathon mode

Author: zohassadar

CHANGELOG.md

@@ -12,6 +12,7 @@
 * Fixed CNROM legal to title flicker
 * Block Tool pieces wrap around
 * Added hidden score option
+* Added marathon mode
 
 ## [v5 tournament]
 * Linecap Menu (from CTM Masters September 2022)

README.md

@@ -124,6 +124,10 @@ This can be adjusted for transition or PAL games;
 | E | 706051 |
 | F | 752310 |
 
+### Marathon
+
+Play as long as you are able to surive at a consistent speed.  While the level will increase normally, the drop rate and the points rewarded will remain fixed based on the starting level.  
+
 ### Setups
 
 ![Setups](./assets/screens/setups.png)

src/constants.asm

@@ -57,6 +57,7 @@ MODE_TETRIS
 MODE_TSPINS
 MODE_SEED
 MODE_PARITY
+MODE_MARATHON
 MODE_PACE
 MODE_PRESETS
 MODE_TYPEB
@@ -115,6 +116,7 @@ MENU_TOP_MARGIN_SCROLL := 7 ; in blocks
     .byte $0    ; MODE_TSPINS
     .byte $0    ; MODE_SEED
     .byte $0    ; MODE_PARITY
+    .byte $0    ; MODE_MARATHON
     .byte $F    ; MODE_PACE
     .byte $7    ; MODE_PRESETS
     .byte $8    ; MODE_TYPEB
@@ -149,6 +151,7 @@ MENU_TOP_MARGIN_SCROLL := 7 ; in blocks
     .byte   "TSPINS"
     .byte   " SEED "
     .byte   "STACKN"
+    .byte   "MARTHN"
     .byte   " PACE "
     .byte   "SETUPS"
     .byte   "B-TYPE"

src/nametables/game_type_menu.js

@@ -46,6 +46,7 @@ drawTiles(buffer, lookup, `
 #a    T-SPINS                 d#
 #a    SEED                    d#
 #a    STACKING                d#
+#a    MARATHON                d#
 #a    PACE                    d#
 #a    SETUPS                  d#
 #a    B-TYPE                  d#
@@ -62,8 +63,8 @@ drawTiles(buffer, lookup, `
 #a    INVISIBLE               d#
 #a    HARD DROP               d#
 #a    TAP/ROLL SPEED          d#
-#a    SCORING                 d#
 `);drawTiles(extra, lookup, `
+#a    SCORING                 d#
 #a    HZ DISPLAY              d#
 #a    INPUT DISPLAY           d#
 #a    DISABLE FLASH           d#
@@ -93,15 +94,14 @@ drawTiles(buffer, lookup, `
 #a                            d#
 #a                            d#
 #a                            d#
-#a                            d#
 `);
 
 
 drawRect(buffer, 8, 2, 10, 5, 0xB0); // draw logo
 // drawRect(extra, 20, 0, 5, 5, 0x9A); // draw QR code
 
 const urlX = 3;
-const urlY = 12;
+const urlY = 13;
 drawRect(extra, urlX, urlY, 12, 1, 0x74);
 drawRect(extra, urlX+12, urlY, 12, 1, 0x84);
 

src/nametables/game_type_menu_nametable_extra.bin

@@ -1,11 +1,11 @@
-�b;��#�
-"��<sr;���
-"��<br;��
+�b;����<sr;��#�
+"��<br;���
+"��<r�;��
 �
-��<r�;��
+��<��;��
 �
-��<��;���"����<b�;������<B@;��
-��<��;��
-�"��<b�;��
-���<B�;��
-���<�r;��<a�;��<rb;��tuvwxyz{|}~������������<�r;��<��;��<a`;��<�p;��<��;��<�a;��<��;��<bs;��<��;��<sa;��<aq;��<�a;��<a�;��<qb;��<�r;��<br;��<r�;��<������� ��
+��<b�;���"����<B@;������<��;��
+��<b�;��
+�"��<B�;��
+���<�r;��
+���<a�;��<rb;��<�r;��tuvwxyz{|}~������������<��;��<a`;��<�p;��<��;��<�a;��<��;��<bs;��<��;��<sa;��<aq;��<�a;��<a�;��<qb;��<�r;��<br;��<r�;��<������� ��

src/nametables/game_type_menu_nametable_practise.bin

@@ -1,15 +1,17 @@
 �b;��<sr;��<br;	������������	��<r�;	������������	��<��;	������������	��<b�;	������������	��<B@;	������������	��<��;��<b�;��<B�;����<�r;��$��<a�;�����<rb;��
-��<�r;��
-��<��;����<a`;��$"��<�p;�����<��;����<�a;��^_
-��<��;��
-��<bs;��
+��<�r;��
+
+��<��;��
+��<a`;����<�p;��$"��<��;�����<�a;����<��;��^_
+��<bs;��
+��<��;��
 �
-"��<��;��
-��<sa;��
+"��<sa;��
+��<aq;��
 
-��<aq;����<�a;��
+��<�a;����<a�;��
 �
-"��<a�;�����i��<qb;����<�r;��
-���<br;��
+"��<qb;�����i��<�r;����<br;��
+���<r�;��
 O���
-��<r�;����<���jZ����fU��2��
+��<���jZ����fU��2��

src/playstate/active.asm

@@ -369,6 +369,11 @@ drop_tetrimino_actual:
 lookupDropSpeed:
         lda #$01
         ldx levelNumber
+        ldy practiseType
+        cpy #MODE_MARATHON
+        bne @notMarathon
+        ldx startLevel
+@notMarathon:
         cpx #$1D
         bcs @noTableLookup
         lda framesPerDropTableNTSC,x

src/playstate/updatestats.asm

@@ -323,6 +323,11 @@ addLineClearPoints:
         sta factorA24+1
         sta factorA24+2
         lda levelNumber
+        ldy practiseType
+        cpy #MODE_MARATHON
+        bne @notMarathon
+        lda startLevel
+@notMarathon:
         cmp #$FF
         bne @noverflow
         lda #1