Skip to content

Commit 0ccaa38

Browse files
committed
changed topout mode to use code from halt linecap and display "crash" text
1 parent 0a931e8 commit 0ccaa38

File tree

2 files changed

+24
-10
lines changed

2 files changed

+24
-10
lines changed

src/playstate/preparenext.asm

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,29 @@ playState_prepareNext:
4444
lda linecapState
4545
cmp #LINECAP_HALT
4646
bne @linecapHaltEnd
47+
lda crashFlag
48+
cmp #$F0
49+
bne @gg
50+
lda #'C'
51+
sta playfield+$66
52+
lda #'R'
53+
sta playfield+$67
54+
lda #'A'
55+
sta playfield+$68
56+
lda #'S'
57+
sta playfield+$69
58+
lda #'H'
59+
sta playfield+$6A
60+
lda #$28
61+
sta playfield+$6B
62+
bne @finish
63+
@gg:
4764
lda #'G'
4865
sta playfield+$67
4966
sta playfield+$68
5067
lda #$28
5168
sta playfield+$6A
69+
@finish:
5270
lda #0
5371
sta vramRow
5472
jsr typeBEndingStuffEnd

src/playstate/updatestats.asm

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,11 @@ addPointsRaw:
201201
lda #4
202202
sta completedLines
203203
@notTapQuantity:
204+
lda crashMode
205+
cmp #CRASH_OFF
206+
beq @crashDisabled
204207
jsr testCrash
208+
@crashDisabled:
205209
lda holdDownPoints
206210
cmp #$02
207211
bmi @noPushDown
@@ -730,16 +734,8 @@ testCrash:
730734
bne @allegroClear
731735
.byte 02
732736
@topout:
733-
lda outOfDateRenderFlags ; Flag needed to reveal hidden score
734-
ora #$04
735-
sta outOfDateRenderFlags
736-
lda #$02
737-
sta soundEffectSlot0Init
738-
lda #$0A ; playState_checkStartGameOver
739-
sta playState
740-
lda #$F0
741-
sta curtainRow
742-
jsr updateAudio2
737+
lda #LINECAP_HALT
738+
sta linecapState
743739
rts
744740
factorTable:
745741
.byte $53, $88, $7D, $7D, $7D

0 commit comments

Comments
 (0)