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

Merge pull request #1 from wulfy83/master

Browse Source 
Add PersistentFloodgate flag
This commit is contained in:
Karkat
2017-05-23 21:44:58 -04:00
committed by GitHub
parent 611b644e29 6322ce4677
commit 99a35850ac
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
floodgatesoftlock.asm
View File

@@ -8,6 +8,11 @@ FloodGateReset:
LDA $7EF06E : AND.b #$7F : STA $7EF06E ; clear water room 55 LDA $7EF06E : AND.b #$7F : STA $7EF06E ; clear water room 55
LDA $7EF06A : AND.b #$7F : STA $7EF06A ; clear water room 53 LDA $7EF06A : AND.b #$7F : STA $7EF06A ; clear water room 53
+ +
LDA $7EF051 : AND.b #$FE : STA $7EF051 ; clear water room 40 - thing we wrote over LDA.l PersistentFloodgate : BNE +
LDA $7EF2BB : AND.b #$DF : STA $7EF2BB ; reset water outside floodgate
LDA $7EF2FB : AND.b #$DF : STA $7EF2FB ; reset water outside swamp palace
LDA $7EF216 : AND.b #$7F : STA $7EF216 ; clear water inside floodgate
LDA $7EF051 : AND.b #$FE : STA $7EF051 ; clear water room 40
+
RTL RTL
;================================================================================ ;================================================================================

8
hooks.asm
View File

@@ -1524,14 +1524,14 @@ JSL.l FlipperReset
;================================================================================ ;================================================================================
; Floodgate Softlock Fix ; Floodgate Softlock Fix
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $0AB903 ; <- 53903 org $0AB8E5 ; <- 538E5
JSL.l FloodGateAndMasterSwordFollowerReset JSL.l FloodGateAndMasterSwordFollowerReset
JSL.l IncrementFlute JSL.l IncrementFlute
NOP #2 NOP #32
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $02AAA5 ; <- 12AA5 org $02AA87 ; <- 12A87
JSL.l OnOWTransition JSL.l OnOWTransition
NOP #6 NOP #36
;================================================================================ ;================================================================================
;================================================================================ ;================================================================================

4
tables.asm
View File

@@ -133,6 +133,10 @@ db #$00 ; #$00 = Always On (default) - #$01 = Require Map Item
CompassMode: CompassMode:
db #$00 ; #$00 = Off (default) - #$01 = Display Dungeon Count db #$00 ; #$00 = Off (default) - #$01 = Display Dungeon Count
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $30803D ; PC 0x18003D
PersistentFloodgate:
db #$00 ; #$00 = Off (default) - #$01 = On
;--------------------------------------------------------------------------------
org $308080 ; PC 0x180080 org $308080 ; PC 0x180080
Upgrade5BombsRefill: Upgrade5BombsRefill:
db #$00 db #$00