alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed missing OW flag check changes

Browse Source
This commit is contained in:
codemann8
2021-08-19 18:47:29 -05:00
parent ad8c4e8e70
commit 94a987f23f
3 changed files with 6 additions and 6 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 : CMP #$01 : BEQ + ;If we are in Mixed OW shuffle mode LDA.l OWMode+1 : CMP #$04 : BEQ + ;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 : CMP.b #$01 : BEQ .skipInvertedCheck LDA.l OWMode+1 : CMP.b #$04 : BEQ .skipInvertedCheck
LDA.l InvertedMode : BEQ .done LDA.l InvertedMode : BEQ .done
.skipInvertedCheck .skipInvertedCheck

8
invertedmaps.asm
View File

@@ -93,8 +93,8 @@ LDA.l OWTileMapAlt+3 : AND #$0001 : BEQ .notInverted
LDA #$0034 : STA $2BE0 LDA #$0034 : STA $2BE0
.notInverted .notInverted
LDA.l OWTileMapAlt+3 : AND #$0002 : BEQ .return LDA.l OWTileMapAlt+3 : AND #$0002 : BEQ .return
LDA.l OWMode : AND #$00FF : BEQ .return LDA.l OWMode : AND #$00FF : BEQ .return
LDA $2BE0 : STA $38B4 ;adding convenient WDM portal in OW Shuffle LDA $2BE0 : STA $38B4 ;adding convenient WDM portal in OW Shuffle
.return .return
RTS RTS
} }
@@ -969,8 +969,8 @@ LDA.l OWTileMapAlt+$43 : AND #$0001 : BEQ .owshuffle
LDA #$0212 : STA $2BE0 ; portal LDA #$0212 : STA $2BE0 ; portal
.owshuffle .owshuffle
LDA.l OWTileMapAlt+$43 : AND #$0002 : BEQ .return LDA.l OWTileMapAlt+$43 : AND #$0002 : BEQ .return
LDA.l OWMode : AND #$00FF : BEQ .return LDA.l OWMode : AND #$00FF : BEQ .return
LDA $2BE0 : STA $38B4 ; adding convenient WDM portal in OW Shuffle LDA $2BE0 : STA $38B4 ; adding convenient WDM portal in OW Shuffle
.return .return
RTS RTS
} }