Merge pull request #98 from kirjavascript/crash_tweaks

Crash tweaks

Author: kirjavascript

src/constants.asm

@@ -115,10 +115,10 @@ LINECAP_FLOOR := 2
 LINECAP_INVISIBLE := 3
 LINECAP_HALT := 4
 
-CRASH_SHOW := 0
-CRASH_TOPOUT := 1
-CRASH_CRASH := 2
-CRASH_OFF := 3
+CRASH_OFF := 0
+CRASH_SHOW := 1
+CRASH_TOPOUT := 2
+CRASH_CRASH := 3
 
 LINECAP_WHEN_STRING_OFFSET := $10
 LINECAP_HOW_STRING_OFFSET := $12

src/gamemode/gametypemenu/menu.asm

@@ -555,9 +555,9 @@ menuYTmp := tmp2
         lda crashModifier
         cmp #CRASH_OFF
         bne @notOff
-        lda #$F1
+        lda #$F3
 @notOff:
-        adc #$16
+        adc #$14
         sta spriteIndexInOamContentLookup
         lda #(MODE_CRASH*8) + MENU_SPRITE_Y_BASE + 1
         sec

src/modes/crash.asm

@@ -419,6 +419,7 @@ testCrash:
         lda #$00
         sta allegroIndex ; resetting variable
         lda crashModifier
+        cmp #CRASH_SHOW
         bne @otherMode
         lda renderFlags ; if mode = 0, tell score to update (might not be necessary?) so that crash info is printed
         ora #RENDER_SCORE

src/nmi/render.asm

@@ -10,8 +10,7 @@ render: lda renderMode
         .addr   render_mode_level_menu
         .addr   render_mode_linecap_menu
 
-.include "render_mode_level_menu.asm"
-    ; no rts / jmp
+.include "render_mode_level_menu.asm" ; no rts / jmp
 
 render_mode_static:
         lda currentPpuCtrl

src/nmi/render_mode_play_and_demo.asm

@@ -97,6 +97,7 @@ render_mode_play_and_demo:
         ; (lazy render hz for 10 more)
         ; 1 added in level (3 total)
         ; 2 added in lines (5 total)
+        ; 2 added on crash
         ; independent writes;
         ; 1 added in 7digit
         ; 3 added in float
@@ -109,12 +110,14 @@ render_mode_play_and_demo:
         cmp #$F0
         bne @noCrash
 
+        ; crash face
         lda #$20
         sta PPUADDR
         lda #$FD
         sta PPUADDR
         lda #$D8
         sta PPUDATA
+        ; grey palette
         lda #$3F
         sta PPUADDR
         lda #$0D