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

[Inverted] TR entrance fix

Browse Source
This commit is contained in:
Kevin Cathcart
2018-09-22 23:54:24 -04:00
parent 41ba91e884
commit e123c6a95f
4 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
entrances.asm
View File

@@ -183,3 +183,11 @@ PreventEnterOnBonk:
LDX.w #$0102 ; rest of what we wrote over LDX.w #$0102 ; rest of what we wrote over
JML.l PreventEnterOnBonk_return JML.l PreventEnterOnBonk_return
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
TurtleRockEntranceFix:
LDA TurtleRockAutoOpenFix : BEQ .done
LDA $8A : CMP.b #$47 : BNE .done
;If exiting to turtle rock ensure the entrance is open
LDA.l $7EF2C7 : ORA.b #$20 : STA.l $7EF2C7
.done
RTL
;--------------------------------------------------------------------------------

2
inventory.asm
View File

@@ -872,6 +872,8 @@ RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
ClearOWKeys: ClearOWKeys:
PHA PHA
JSL.l TurtleRockEntranceFix
JSL.l FakeWorldFix JSL.l FakeWorldFix
JSR.w FixBunnyOnExitToLightWorld JSR.w FixBunnyOnExitToLightWorld
LDA.l GenericKeys : BEQ + LDA.l GenericKeys : BEQ +

2
sandbox.asm
View File

@@ -180,6 +180,8 @@ org $1FED41 : db $0E ; pre-open open TR bomb door
org $0ABFBB : db $90 ; Show portal on dark world map org $0ABFBB : db $90 ; Show portal on dark world map
org $308089 : db $01 ; Open TR Entrance if exiting from it
; Write to StartingAreaOverworldDoor table to indicate the overworld door being used for ; Write to StartingAreaOverworldDoor table to indicate the overworld door being used for
; the single entrance spawn point ; the single entrance spawn point
org $308247 ; PC 0x180247 org $308247 ; PC 0x180247

6
tables.asm
View File

@@ -359,7 +359,11 @@ org $308087 ; PC 0x180087
IsEncrypted: IsEncrypted:
dw #$0000 ; $0000 = not encrypted, $0001 = encrypted with static key, $0002 = Encrypted w/ passcode entry screen (Not implemented yet) dw #$0000 ; $0000 = not encrypted, $0001 = encrypted with static key, $0002 = Encrypted w/ passcode entry screen (Not implemented yet)
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; 0x180089 - 0x18008F (unused) org $308089 ; PC 0x180089
TurtleRockAutoOpenFix:
db #$00 ; #$00 - Normal, #$01 - Open TR Entrance if exiting from it
;--------------------------------------------------------------------------------
; 0x18008A - 0x18008F (unused)
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $308090 ; PC 0x180090 - 0x180097 org $308090 ; PC 0x180090 - 0x180097
ProgressiveSwordLimit: ProgressiveSwordLimit: