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

Fix quick search activating some Inverted features

Browse Source
This commit is contained in:
Kevin Cathcart
2018-09-18 09:49:56 -04:00
parent 4aeec98197
commit c55ff5aa84
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
entrances.asm
View File

@@ -15,7 +15,7 @@ LockAgahnimDoors:
LDA $7EF37A : AND.w #$007F : CMP.w #$007F : BEQ .crystalOrUnlock LDA $7EF37A : AND.w #$007F : CMP.w #$007F : BEQ .crystalOrUnlock
LDA #$0001 : RTL LDA #$0001 : RTL
.crystalOrUnlock .crystalOrUnlock
LDA InvertedMode : BEQ .unlock LDA InvertedMode : AND.w #$00FF : BEQ .unlock
LDA $7EF2C3 : AND.w #$0020 : BNE .unlock ; Check if GT overlay is already on or not LDA $7EF2C3 : AND.w #$0020 : BNE .unlock ; Check if GT overlay is already on or not
SEP #$30 SEP #$30

6
inverted.asm
View File

@@ -80,7 +80,7 @@ Overworld_CreatePyramidHoleModified:
RTL RTL
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
Draw_PyramidOverlay: Draw_PyramidOverlay:
LDA.l InvertedMode : BNE .done LDA.l InvertedMode : AND.w #$00FF : BNE .done
.normal .normal
LDA.w #$0E39 : STA $23BC LDA.w #$0E39 : STA $23BC
INC A : STA $23BE INC A : STA $23BE
@@ -174,7 +174,7 @@ GanonTowerInvertedCheck:
;Hard coded rock removed in LW for Inverted mode ;Hard coded rock removed in LW for Inverted mode
HardcodedRocks: HardcodedRocks:
LDA InvertedMode : BEQ .normalrocks LDA InvertedMode : AND.w #$00FF : BEQ .normalrocks
BRA .noRock2 BRA .noRock2
.normalrocks .normalrocks
LDA.w #$020F : LDX $8A : CPX.w #$0033 : BNE .noRock LDA.w #$020F : LDX $8A : CPX.w #$0033 : BNE .noRock
@@ -186,7 +186,7 @@ HardcodedRocks:
RTL RTL
TurtleRockPegSolved: TurtleRockPegSolved:
LDA.l InvertedMode : BNE + LDA.l InvertedMode : AND.w #$00FF : BNE +
LDA.l $7ef287 ; What we wrote over (reading flags for this screen) LDA.l $7ef287 ; What we wrote over (reading flags for this screen)
RTL RTL
+ +