scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disallow Minish form during intro

Browse Source
This commit is contained in:
scawful
2024-11-27 19:24:13 -05:00
parent 0fb961e146
commit 194695abf8
1 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Masks/minish_form.asm
View File

@@ -27,7 +27,7 @@ pullpc
LinkState_CheckForMinishForm: LinkState_CheckForMinishForm:
{ {
SEP #$30 SEP #$30
LDA.l GAMESTATE : BEQ .return
JSL $0FF979 ; AncillaSpawn_SwordChargeSparkle JSL $0FF979 ; AncillaSpawn_SwordChargeSparkle
; Check for the R button (like minish cap) ; Check for the R button (like minish cap)
@@ -41,11 +41,9 @@ LinkState_CheckForMinishForm:
; Check if the value in A (from $0202) is GTE to $16. ; Check if the value in A (from $0202) is GTE to $16.
CMP.b #$17 : BCS .continue CMP.b #$17 : BCS .continue
LDA.b #$3C : STA.w $012E ; Error beep LDA.b #$3C : STA.w $012E ; Error beep
JMP .return JMP .return
.continue
.continue
LDA !CurrentMask LDA !CurrentMask
CMP.b #$05 : BEQ .already_minish ; return to human form CMP.b #$05 : BEQ .already_minish ; return to human form
@@ -58,12 +56,11 @@ LinkState_CheckForMinishForm:
LDA #$05 : STA $02B2 ; Set the current mask form LDA #$05 : STA $02B2 ; Set the current mask form
BRA .return BRA .return
.already_minish .already_minish
%PlayerTransform() %PlayerTransform()
%ResetToLinkGraphics() %ResetToLinkGraphics()
.return .return
REP #$30 REP #$30
RTS RTS
} }