fix highscores for 10+ million games

Author: kirjavascript

CHANGELOG.md

@@ -17,6 +17,7 @@
 * Floor no longer gobbled up by top line clear
 * Floor 0 has original no-burns behaviour again
 * [Fixed ingame score display at 8/9 million with Classic Scoring](https://www.youtube.com/watch?v=fYdXky2i5AE)
+* Fixed highscore layout for 10million+ score games
 * Fixed CNROM legal screen CHR bank
 * Fixed CNROM legal to title flicker
 * Fixed piece skip when doing Sonic Drop then Hard Drop immediately

src/gamemodestate/handlegameover.asm

@@ -2,7 +2,11 @@ gameModeState_handleGameOver:
 .if AUTO_WIN
         lda newlyPressedButtons_player1
         and #BUTTON_SELECT
-        bne @gameOver
+        beq @continue
+        lda #$0A ; playState_checkStartGameOver
+        sta playState
+        jmp @ret
+@continue:
 .endif
         lda #$05
         sta generalCounter2

src/highscores/render_menu.asm

@@ -28,11 +28,16 @@ showHighScores:
         lda #$FF
         sta PPUDATA
 
+        lda #0 ; 8 digit flag
+        sta tmpZ
+
         ; score
         lda highscores,y
         cmp #$A
         bmi @scoreHighWrite
         jsr twoDigsToPPU
+        lda #1
+        sta tmpZ
         jmp @scoreEnd
 @scoreHighWrite:
         sta PPUDATA
@@ -63,8 +68,19 @@ showHighScores:
         sta PPUDATA
 
         ; levels
+        lda tmpZ
+        beq @normalLevel
+        lda highscores,y
+        cmp #100
+        bpl @normalLevel
+        tax
+        lda byteToBcdTable, x
+        jsr twoDigsToPPU
+        jmp @levelContinue
+@normalLevel:
         lda highscores,y ; startlevel
         jsr renderByteBCD
+@levelContinue:
         iny
 
         ; update PPUADDR for start level

src/playstate/gameover_rocket.asm

@@ -1,4 +1,7 @@
 playState_checkStartGameOver:
+.if AUTO_WIN
+        jmp @exitGame
+.endif
         jsr hzControl
 .if !ALWAYS_CURTAIN
         ; skip curtain / rocket when not qualling