Wait on the startup screen for the SPC to be ready before accepting button inputs

2019-09-26 12:25:48 -07:00
parent 5adee10378
commit 60c66a6944
2 changed files with 12 additions and 0 deletions
--- a/hooks.asm
+++ b/hooks.asm
@@ -1470,6 +1470,9 @@ crystal_done:
 org $08C637
 crystal_continue:

+org $0CC100 ; <- A511 C904 - Bank0C.asm:07 (LDA $11 : CMP.b #$04)
+JSL.l startup_wait
+
 org $0EE6EC ; <- E220 A922 - Bank0E.asm:2892 (SEP #$20 : LDA.b #$22 : STA $012C)
 JSL.l ending_wait

--- a/msu.asm
+++ b/msu.asm
@@ -655,6 +655,15 @@ crystal_fanfare:
    jml crystal_done


+startup_wait:
+    LDA $11 : CMP.b #$04 : BCC .done    ; thing we wrote over
+    LDA !REG_SPC_CONTROL : BEQ .done-1
+    CMP.b #$01 : BEQ .done
+    CLC
+.done
+    RTL
+
+
 ending_wait:
    REP #$20
    LDA !REG_MSU_ID_01 : CMP !VAL_MSU_ID_01 : BNE .done