Disallow Minish form during intro

2024-11-27 19:24:13 -05:00
parent 0fb961e146
commit 194695abf8
1 changed files with 30 additions and 33 deletions
--- a/Masks/minish_form.asm
+++ b/Masks/minish_form.asm
@@ -27,7 +27,7 @@ pullpc
 LinkState_CheckForMinishForm:
 {
  SEP #$30
-
+  LDA.l GAMESTATE : BEQ .return
    JSL $0FF979 ; AncillaSpawn_SwordChargeSparkle

    ; Check for the R button (like minish cap)
@@ -41,10 +41,8 @@ LinkState_CheckForMinishForm:

      ; Check if the value in A (from $0202) is GTE to $16.
      CMP.b #$17 : BCS .continue
-
        LDA.b #$3C : STA.w $012E ; Error beep
        JMP .return
-
      .continue

      LDA   !CurrentMask
@@ -63,7 +61,6 @@ LinkState_CheckForMinishForm:
      %ResetToLinkGraphics()

  .return
-
  REP #$30
  RTS
 }