Merge branch 'master' into mapper_edit

Author: zohassadar

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ## [unreleased]
+* Crash Detection / Simulation
 * Crunch Mode
 * Marathon Mode
 * Hidden Score Mode
@@ -13,6 +14,7 @@
 * Fixed CNROM legal screen CHR bank
 * Fixed CNROM legal to title flicker
 * Block Tool pieces wrap around
+* Always Next Box removed
 * 0001 seeds are ignored
 * Famicom Keyboard support
 * Autodetect MMC1/CNROM

README.md

@@ -76,7 +76,7 @@ Like in the original ROM, holding `a` `b` `select` and then pressing `start` wil
 
 ![Tetris](./assets/screens/levelmenu.png)
 
-Same gameplay as A-Type, with some improvements: no score cap, no rocket, no curtain, no music, always next box, better pause, start on any level.
+Same gameplay as A-Type, with some improvements: no score cap, no rocket, no curtain, no music, better pause, start on any level.
 
 ### T-Spins
 
@@ -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/chr/game_tileset.png

@@ -77,6 +77,7 @@ MODE_INVISIBLE
 MODE_HARDDROP
 MODE_SPEED_TEST
 MODE_SCORE_DISPLAY
+MODE_CRASH
 MODE_HZ_DISPLAY
 MODE_INPUT_DISPLAY
 MODE_DISABLE_FLASH
@@ -104,11 +105,16 @@ LINECAP_FLOOR := 2
 LINECAP_INVISIBLE := 3
 LINECAP_HALT := 4
 
+CRASH_SHOW := 0
+CRASH_TOPOUT := 1
+CRASH_CRASH := 2
+CRASH_OFF := 3
+
 LINECAP_WHEN_STRING_OFFSET := $10
 LINECAP_HOW_STRING_OFFSET := $12
 
 MENU_SPRITE_Y_BASE := $47
-MENU_MAX_Y_SCROLL := $78
+MENU_MAX_Y_SCROLL := $80
 MENU_TOP_MARGIN_SCROLL := 7 ; in blocks
 
 ; menuConfigSizeLookup
@@ -125,7 +131,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
@@ -136,6 +142,7 @@ MENU_TOP_MARGIN_SCROLL := 7 ; in blocks
     .byte $0    ; MODE_HARDDROP
     .byte $0    ; MODE_SPEED_TEST
     .byte $5    ; MODE_SCORE_DISPLAY
+    .byte $3	; MODE_CRASH
     .byte $1    ; MODE_HZ_DISPLAY
     .byte $1    ; MODE_INPUT_DISPLAY
     .byte $1    ; MODE_DISABLE_FLASH

src/constants.asm

@@ -465,15 +465,16 @@ menuYTmp := tmp2
         cmp #MODE_SCORE_DISPLAY
         beq @renderScoreName
 
+        cmp #MODE_CRASH
+        beq @renderCrashMode
+
+
+        jsr menuItemY16Offset
+        bne @loopNext
+        txa
+
         ldx oamStagingLength
 
-        ; get Y offset
-        lda menuCounter
-        asl
-        asl
-        asl
-        adc #MENU_SPRITE_Y_BASE + 1
-        sbc menuScrollY
         sta oamStaging, x
         inx
         lda menuVars, y
@@ -524,6 +525,26 @@ menuYTmp := tmp2
         jsr stringSpriteAlignRight
         jmp @loopNext
 
+@renderCrashMode:
+        jsr menuItemY16Offset
+        bne @loopNext
+@doRender:
+        lda crashModifier
+        cmp #CRASH_OFF
+        bne @notOff
+        lda #$F1
+@notOff:
+        adc #$16
+        sta spriteIndexInOamContentLookup
+        lda #(MODE_CRASH*8) + MENU_SPRITE_Y_BASE + 1
+        sec
+        sbc menuScrollY
+        sta spriteYOffset
+        lda #$e9
+        sta spriteXOffset
+        jsr stringSpriteAlignRight
+        jmp @loopNext
+
 ; <- menu item index in A
 ; -> high byte of offset in A
 ; -> low byte in X

src/gamemode/gametypemenu/menu.asm

@@ -126,6 +126,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/gamemode/levelmenu.asm

@@ -13,6 +13,11 @@ gameModeState_initGameState:
         lda #$05
         sta tetriminoX
 
+        ;init for crash frame parity
+        lda frameCounter
+        and #$01
+        sta startParity
+
         ; set seed init
         lda set_seed_input
         sta set_seed

src/gamemodestate/initstate.asm

@@ -6,7 +6,7 @@ gameModeState_updateCountersAndNonPlayerState:
         ; next code makes acc behave as normal
         ; (dont edit unless you know what you're doing)
         lda newlyPressedButtons_player1
-        and #$20
+        and #BUTTON_SELECT
         beq @ret
         lda displayNextPiece
         eor #$01

src/gamemodestate/updatecounters.asm

@@ -65,6 +65,7 @@ drawTiles(buffer, lookup, `
 #a    TAP/ROLL SPEED          d#
 `);drawTiles(extra, lookup, `
 #a    SCORING                 d#
+#a    CRASH                   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 = 13;
+const urlY = 14;
 drawRect(extra, urlX, urlY, 12, 1, 0x74);
 drawRect(extra, urlX+12, urlY, 12, 1, 0x84);
 
@@ -134,8 +134,8 @@ drawAttrs(extra, [`
     2222222222222222
     2222222222222222
     2222222222222222
-    2333333333333332
     2222222222222222
+    2333333333333332
 `, screen]);
 
 writeRLE(

src/nametables/game_type_menu.js

@@ -27,6 +27,8 @@ nmi:    pha
         jsr generateNextPseudorandomNumber
         jsr copyCurrentScrollAndCtrlToPPU
         jsr pollControllerButtons
+        lda #$00
+        sta lagState ; clear flag after lag frame achieved
 .if KEYBOARD
 ; Read Family BASIC Keyboard
         jsr pollKeyboard
@@ -35,6 +37,9 @@ nmi:    pha
         sta verticalBlankingInterval
         pla
         tay
+        tsx
+        lda stack+4,x
+        sta nmiReturnAddr
         pla
         tax
         pla