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

Merge branch 'DRUnstable' into OWMain

Browse Source
This commit is contained in:
codemann8
2022-09-07 19:38:34 -05:00
parent ee7e08f46c 9cdca6edb3
commit 223c086c82
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
doorrando/overrides.asm
View File

@@ -133,7 +133,7 @@ RainPrevention:
- INX #2 : LDA.l RemoveRainDoorsRoom, X : CMP #$FFFF : BEQ .done
CMP $A0 : BNE -
SEP #$20 : LDA.l RainDoorMatch, X : CMP $00 : BNE .continue
REP #$20 : PLA : SEC : RTL
INC.w $0460 : INC.w $0460 : REP #$20 : PLA : SEC : RTL
.continue
REP #$20 : BRA -
.done PLA : CLC : RTL
@@ -153,3 +153,10 @@ BlindsAtticHint:
SEP #$20 : RTL ; skip the dialog box if the hole is already open
+ SEP #$20 : JML Main_ShowTextMessage
BlindZeldaDespawnFix:
CMP.b #06 : BEQ +
LDA.w $0D00,X : BEQ + ; don't despawn follower if maiden isn't "present"
PLA : PLA : PEA.w SpritePrep_BlindMaiden_despawn_follower-1 : RTL
+ PLA : PLA : PEA.w SpritePrep_BlindMaiden_kill_the_girl-1 : RTL