fix: remove always next box, move git link down

Author: kirjavascript

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ## [unreleased]
+* Crash Detection / Simulation
 * Crunch Mode
 * Marathon Mode
 * Added hidden score option
@@ -14,6 +15,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
 
 ## [v5 tournament]

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
 

src/constants.asm

@@ -103,7 +103,7 @@ LINECAP_FLOOR := 2
 LINECAP_INVISIBLE := 3
 LINECAP_HALT := 4
 
-CRASH_SHOW := 0 
+CRASH_SHOW := 0
 CRASH_TOPOUT := 1
 CRASH_CRASH := 2
 CRASH_OFF := 3
@@ -112,12 +112,12 @@ 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
 ; menu ram is defined at menuRAM in ./ram.asm
-.macro MENUSIZES 
+.macro MENUSIZES
     .byte $0    ; MODE_TETRIS
     .byte $0    ; MODE_TSPINS
     .byte $0    ; MODE_SEED

src/gamemode/gametypemenu/menu.asm

@@ -487,19 +487,18 @@ menuYTmp := tmp2
         lda menuCounter
         cmp #MODE_SCORE_DISPLAY
         beq @renderScoreName
-		
+
         cmp #MODE_CRASH
         beq @renderCrashMode
 
-        ldx oamStagingLength
 
-        ; get Y offset
         lda menuCounter
-        asl
-        asl
-        asl
-        adc #MENU_SPRITE_Y_BASE + 1
-        sbc menuScrollY
+        jsr menuItemY16Offset
+        bne @loopNext
+        txa
+
+        ldx oamStagingLength
+
         sta oamStaging, x
         inx
         lda menuVars, y

src/nametables/game_type_menu.js

@@ -77,8 +77,8 @@ drawTiles(buffer, lookup, `
 #a    PAL MODE                d#
 #a    CRASH MODE              d#
 #a                            d#
-#a V5                         d#
 #a                            d#
+#a V5                         d#
 #a                            d#
 #a                            d#
 #a                            d#
@@ -101,7 +101,7 @@ 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_nametable_extra.bin

@@ -9,4 +9,4 @@
 �"��<B�;��
 ���<�r;��
 ���<a�;��
-���<rb;��<�r;��tuvwxyz{|}~������������<��;��<a`;��<�p;��<��;��<�a;��<��;��<bs;��<��;��<sa;��<aq;��<�a;��<a�;��<qb;��<�r;��<br;��<r�;��<������� ��
+���<rb;��<�r;��<��;��tuvwxyz{|}~������������<a`;��<�p;��<��;��<�a;��<��;��<bs;��<��;��<sa;��<aq;��<�a;��<a�;��<qb;��<�r;��<br;��<r�;��<������� ��

src/sprites/piece.asm

@@ -83,7 +83,7 @@ stageSpriteForCurrentPiece_actual:
         ldy oamStagingLength
         lda #$04
         sta generalCounter2
-@stageMino:  
+@stageMino:
         lda orientationTable,x
         asl a
         asl a
@@ -116,7 +116,7 @@ stageSpriteForCurrentPiece_actual:
         sta oamStaging,y
         jmp @finishLoop
 
-@validYCoordinate:  
+@validYCoordinate:
         inc oamStagingLength
         iny
         lda orientationTable,x
@@ -126,7 +126,7 @@ stageSpriteForCurrentPiece_actual:
         clc
         adc generalCounter3
         sta oamStaging,y
-@finishLoop:  
+@finishLoop:
         inc oamStagingLength
         iny
         inx
@@ -136,12 +136,6 @@ stageSpriteForCurrentPiece_return:
         rts
 
 stageSpriteForNextPiece:
-        lda crashMode
-		cmp #CRASH_OFF
-        bne @sometimesNextBox
-		lda qualFlag
-        beq @alwaysNextBox
-@sometimesNextBox:
         lda displayNextPiece
         bne @ret