From 60c66a6944e33f127d49a73275464a7bfc3f33fc Mon Sep 17 00:00:00 2001
From: qwertymodo <qwertymodo@qwertymodo.com>
Date: Thu, 26 Sep 2019 12:25:48 -0700
Subject: [PATCH] Wait on the startup screen for the SPC to be ready before
 accepting button inputs

---
 hooks.asm | 3 +++
 msu.asm   | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/hooks.asm b/hooks.asm
index 7ee6486..be5b455 100755
--- 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
 
diff --git a/msu.asm b/msu.asm
index ae3543b..5b50a82 100644
--- 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