favour SSI over SC in Berzap, fix Crime Wave

2024-12-29 10:33:08 +00:00 · 2024-01-18 08:25:13 -08:00 · 2024-01-18 08:25:13 -08:00 · eb48e6534a
commit eb48e6534a
parent 1f81a4f130
2 changed files with 9 additions and 9 deletions
--- a/src/prelaunch/berzap.mb.a
+++ b/src/prelaunch/berzap.mb.a
@ -98,17 +98,19 @@ setopt

         ldy   #0
         sty   $382       ; joystick
-         ldx   #2
-         iny

+         ldx   #4
+         ldy   #2
         +READ_RAM2_NO_WRITE
         bit   MockingboardStuff
-         bmi   +          ; Sounds / Speech (mono, SC-01)
-         dex
+         bvs   +          ; Mockingboard "C"
+         php
+         ldx   #2
         dey
-         bvc   +          ; Sound II / A (stereo, no speech)
-         ldx   #4
-         ldy   #2         ; Mockingboard "C"
+         plp
+         bmi   +          ; Sound / Speech (mono, SC-01)
+         dex
+         dey              ; Sound II / A (stereo, no speech)
 +        stx   $380
         sty   $381
         lda   #$0D
--- a/src/prelaunch/crime.wave.a
+++ b/src/prelaunch/crime.wave.a
@ -22,9 +22,7 @@
                          ; reset vector in high score file
                          ; gets loaded directly to $300
         lda   MockingboardStuff
-         asl
         bpl   skipmb
-         lsr
         and   #7
         sta   $A0C9
         lda   #2