UI interface and added different modes for result of crash

Author: HydrantDude

src/constants.asm

@@ -85,9 +85,10 @@ MODE_LINECAP
 MODE_DASONLY
 MODE_QUAL
 MODE_PAL
+MODE_CRASH
 .endenum
 
-MODE_QUANTITY = MODE_PAL + 1
+MODE_QUANTITY = MODE_CRASH + 1
 MODE_GAME_QUANTITY = MODE_HARDDROP + 1
 
 SCORING_CLASSIC := 0 ; for scoringModifier
@@ -102,6 +103,11 @@ 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
 
@@ -144,6 +150,7 @@ MENU_TOP_MARGIN_SCROLL := 7 ; in blocks
     .byte $1    ; MODE_DASONLY
     .byte $1    ; MODE_QUAL
     .byte $1    ; MODE_PAL
+	.byte $3	; MODE_CRASH
 .endmacro
 
 .macro MODENAMES

src/gamemode/gametypemenu/menu.asm

@@ -487,6 +487,9 @@ menuYTmp := tmp2
         lda menuCounter
         cmp #MODE_SCORE_DISPLAY
         beq @renderScoreName
+		
+        cmp #MODE_CRASH
+        beq @renderCrashMode
 
         ldx oamStagingLength
 
@@ -547,6 +550,28 @@ menuYTmp := tmp2
         jsr stringSpriteAlignRight
         jmp @loopNext
 
+@renderCrashMode:
+		lda menuScrollY
+		cmp #$58
+		bcs @doRender
+		jmp @loopNext
+@doRender:
+        lda crashMode
+		cmp #CRASH_OFF
+		bne @notOff
+		lda #$F1
+@notOff:
+		adc #$16
+		sta spriteIndexInOamContentLookup
+        lda #(MODE_CRASH*8)-256 + 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/gamemodestate/initstate.asm

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

src/nametables/game_type_menu.js

@@ -75,7 +75,7 @@ drawTiles(buffer, lookup, `
 #a    DAS ONLY                d#
 #a    QUAL MODE               d#
 #a    PAL MODE                d#
-#a                            d#
+#a    CRASH MODE              d#
 #a                            d#
 #a V5                         d#
 #a                            d#

src/nametables/game_type_menu_nametable_extra.bin

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

src/nmi/render_mode_play_and_demo.asm

@@ -90,9 +90,13 @@ render_mode_play_and_demo:
         ; 3 added in float
 
         ; scorecap
+		lda crashMode
+		cmp #CRASH_SHOW
+		bne @noCrash
 		lda crashFlag
 		cmp #$F0
 		bne @noCrash
+		
 		lda #$20
 		sta PPUADDR
 		lda #$FD

src/playstate/updatestats.asm

@@ -654,16 +654,17 @@ testCrash:
 		sta allegroIndex
 		lda frameCounter
 		and #$01 ; RNG for frame length
+		ora startParity ; set to 0 or 1 at start of game, so result isn't always 0
 		adc allegroIndex
 		sta allegroIndex
-		lda rng_seed ; RNG for RNG
+		lda rng_seed ; checking whether PRNG had extra cycle
 		asl
 		bcc @newBit0
 		inc allegroIndex
 @newBit0:
 		lda nmiReturnAddr
 		cmp #<updateAudioWaitForNmiAndResetOamStaging+10
-		beq @returnLate ; RNG for which instruction returned to
+		beq @returnLate ; checking which instruction returned to
 		lda #$03
 		clc
 		adc allegroIndex
@@ -715,13 +716,31 @@ testCrash:
 @crashGraphics:
 		lda #$00
 		sta allegroIndex
+		lda crashMode
+		bne @otherMode
 		lda outOfDateRenderFlags
 		ora #$04
 		sta outOfDateRenderFlags
 		lda #$02
         sta soundEffectSlot0Init
 		rts
-	
+@otherMode:
+		cmp #CRASH_CRASH
+		bcc @topout
+		bne @allegroClear
+		.byte 02
+@topout:
+		lda outOfDateRenderFlags ; Flag needed to reveal hidden score
+        ora #$04
+        sta outOfDateRenderFlags
+        lda #$02
+        sta soundEffectSlot0Init
+        lda #$0A ; playState_checkStartGameOver
+        sta playState
+        lda #$F0
+        sta curtainRow
+        jsr updateAudio2
+		rts
 factorTable:
 	.byte $53, $88, $7D, $7D, $7D
 sumTable:

src/ram.asm

@@ -22,7 +22,8 @@ pointerAddr: .res 2 ; $001B ; used in debug, harddrop
 pointerAddrB: .res 2 ; $001D ; used in harddrop
 allegroIndex: .res 1 ; $001F for crash
 wasAllegro: .res 1 ; $0020 for crash
-    .res $12
+startParity: .res 1 ; $0021 for crash
+    .res $11
 
 verticalBlankingInterval: .res 1 ; $0033
 set_seed: .res 3 ; $0034 ; rng_seed, rng_seed+1, spawnCount
@@ -342,5 +343,6 @@ linecapFlag: .res 1
 dasOnlyFlag: .res 1
 qualFlag: .res 1
 palFlag: .res 1
+crashMode: .res 1
 
 ; ... $7FF

src/util/strings.asm

@@ -92,6 +92,9 @@ stringLookup:
         .byte stringFromBelow-stringLookup
         .byte stringInviz-stringLookup
         .byte stringHalt-stringLookup
+		.byte stringShown-stringLookup ;16
+		.byte stringTopout-stringLookup
+		.byte stringCrash-stringLookup
 stringClassic:
         .byte $7,'C','L','A','S','S','I','C'
 stringLetters:
@@ -138,3 +141,9 @@ stringHalt:
         .byte $4,'H','A','L','T'
 stringNull:
         .byte $0
+stringShown:
+		.byte $5,'S','H','O','W','N'
+stringTopout:
+		.byte $6,'T','O','P','O','U','T'
+stringCrash:
+		.byte $5,'C','R','A','S','H'