Merge pull request #45 from zohassadar/marathon_mode

marathon mode

Author: kirjavascript

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

@@ -193,6 +193,10 @@ Puts you ten lines before transition. The value given will be added to your scor
 
 Setting the value to G causes the mode to act identical to the game genie code `SXTOKL`
 
+### 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.
+
 ### Garbage
 
 ![Garbage](./assets/screens/garbage.png)

src/constants.asm

@@ -64,6 +64,7 @@ MODE_FLOOR
 MODE_CRUNCH
 MODE_TAP
 MODE_TRANSITION
+MODE_MARATHON
 MODE_TAPQTY
 MODE_CHECKERBOARD
 MODE_GARBAGE
@@ -122,6 +123,7 @@ MENU_TOP_MARGIN_SCROLL := 7 ; in blocks
     .byte $F    ; MODE_CRUNCH
     .byte $20   ; MODE_TAP
     .byte $10   ; MODE_TRANSITION
+    .byte $0    ; MODE_MARATHON
     .byte $1F   ; MODE_TAPQTY
     .byte $8    ; MODE_CHECKERBOARD
     .byte $4    ; MODE_GARBAGE
@@ -156,6 +158,7 @@ MENU_TOP_MARGIN_SCROLL := 7 ; in blocks
     .byte   "CRUNCH"
     .byte   "QCKTAP"
     .byte   "TRNSTN"
+    .byte   "MARTHN"
     .byte   "TAPQTY"
     .byte   "CKRBRD"
     .byte   "GARBGE"

src/nametables/game_type_menu.js

@@ -53,6 +53,7 @@ drawTiles(buffer, lookup, `
 #a    CRUNCH                  d#
 #a    (QUICK)TAP              d#
 #a    TRANSITION              d#
+#a    MARATHON                d#
 #a    TAP QUANTITY            d#
 #a    CHECKERBOARD            d#
 #a    GARBAGE                 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

@@ -2,14 +2,16 @@
 ��<�r;��
 ��<��;����<a`;��$"��<�p;�����<��;����<�a;��^_
 ��<��;��
-��<bs;��
+��<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