Merge pull request #76 from zohassadar/marathon_options

Add marathon options

Author: kirjavascript

README.md

@@ -196,7 +196,11 @@ Setting the value to G causes the mode to act identical to the game genie code `
 
 ### Marathon
 
-Play as long as you are able to survive 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.
+Play as long as you are able to survive at a consistent speed.
+
+0. Level transitions do not happen, game remains on the same level for as long as you are able to survive.
+1. Levels will transition normally, but speed and points will remain fixed based on your starting level.
+2. Similar to 1, speed and points will remain fixed based on the starting level you choose, but actual game will begin at level 0.
 
 ### Garbage
 

src/constants.asm

@@ -123,7 +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 $2    ; MODE_MARATHON
     .byte $1F   ; MODE_TAPQTY
     .byte $8    ; MODE_CHECKERBOARD
     .byte $4    ; MODE_GARBAGE

src/gamemode/levelmenu.asm

@@ -132,6 +132,14 @@ levelMenuCheckStartGame:
         sta startLevel
 @startGame:
         ; lda startLevel
+        ldy practiseType
+        cpy #MODE_MARATHON
+        bne @noLevelModification
+        ldy marathonModifier
+        cpy #2 ; marathon mode 2 starts at level 0
+        bne @noLevelModification
+        lda #0
+@noLevelModification:
         sta levelNumber
         lda #$00
         sta gameModeState

src/playstate/updatestats.asm

@@ -78,6 +78,12 @@ checkLevelUp:
         lda practiseType
         cmp #MODE_TAPQTY
         beq @lineLoop
+        cmp #MODE_MARATHON
+        bne @notMarathon
+        lda marathonModifier
+        beq @lineLoop ; marathon mode 0 does not transition
+        bne @notSXTOKL
+@notMarathon:
         cmp #MODE_TRANSITION
         bne @notSXTOKL
         lda transitionModifier

src/ram.asm

@@ -320,6 +320,7 @@ floorModifier: .res 1
 crunchModifier: .res 1
 tapModifier: .res 1
 transitionModifier: .res 1
+marathonModifier: .res 1
 tapqtyModifier: .res 1
 checkerModifier: .res 1
 garbageModifier: .res 1