alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Actually fixed Mixed flag problems

Browse Source
This commit is contained in:
codemann8
2021-08-19 21:53:26 -05:00
parent 58bf92ba04
commit a8e119285e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
entrances.asm
View File

@@ -204,7 +204,7 @@ RTL
AnimatedEntranceFix: ;when an entrance animation tries to start AnimatedEntranceFix: ;when an entrance animation tries to start
PHA : PHX PHA : PHX
LDA.l InvertedMode : BEQ + ;If we are in inverted mode LDA.l InvertedMode : BEQ + ;If we are in inverted mode
LDA.l OWMode+1 : AND.b #!FLAG_OW_MIXED : BEQ + ;If we are in Mixed OW shuffle mode LDA.l OWMode+1 : AND.b #!FLAG_OW_MIXED : BNE + ;If we are in Mixed OW shuffle mode
LDA $8A : AND #$40 : BNE + ;and in the light world LDA $8A : AND #$40 : BNE + ;and in the light world
PLX : PLA PLX : PLA
STZ $04C6 ; skip it. STZ $04C6 ; skip it.

2
flute.asm
View File

@@ -61,7 +61,7 @@ FluteBoy:
JML.l FluteBoy_Continue JML.l FluteBoy_Continue
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
FreeDuckCheck: FreeDuckCheck:
LDA.l OWMode+1 : AND.b #!FLAG_OW_MIXED : BEQ .skipInvertedCheck LDA.l OWMode+1 : AND.w #!FLAG_OW_MIXED : BNE .skipInvertedCheck
LDA.l InvertedMode : BEQ .done LDA.l InvertedMode : BEQ .done
.skipInvertedCheck .skipInvertedCheck