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

Merge pull request #138 from spannerisms/master

Browse Source 
Fix Aga door bug
This commit is contained in:
KatDevsGames
2021-07-18 13:25:46 -05:00
committed by GitHub
parent df7ce30bbe b726ea1d0a
commit 8da0dcf3e0
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
entrances.asm
View File

@@ -24,11 +24,12 @@ LockAgahnimDoors:
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
LDA $0308 : AND.w #$0080 : BEQ ++ ;If we are holding an item LDA $0308 : AND.w #$0080 : BEQ ++ ;If we are holding an item
.locked
LDA #$0001 : RTL ;Keep the door locked LDA #$0001 : RTL ;Keep the door locked
++ ++
SEP #$30 SEP #$30
JSL $099B6F ;Add tower break seal JSL $099B6F ;Add tower break seal
LDA $7EF2C3 : ORA #$20 : STA $7EF2C3 ; activate GT overlay
REP #$30 REP #$30
LDA #$0001 ;Prevent door from opening that frame otherwise it glitchy LDA #$0001 ;Prevent door from opening that frame otherwise it glitchy
RTL RTL
@@ -39,6 +40,17 @@ LockAgahnimDoors:
LDA.w #$0000 ; fallback to never locked LDA.w #$0000 ; fallback to never locked
RTL RTL
;---------------------------------------------------------------------------------
FlagAgahnimDoor:
LDA.l InvertedMode : BEQ .vanilla
LDA $7EF2C3 : ORA #$20 : STA $7EF2C3 ; activate GT overlay
.vanilla
LDA.b #$28 : STA.b $72
RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
LockAgahnimDoorsCore: LockAgahnimDoorsCore:
LDA $22 : CMP.w #1992 : !BLT + ; door too far left, skip LDA $22 : CMP.w #1992 : !BLT + ; door too far left, skip

3
hooks.asm
View File

@@ -1068,6 +1068,9 @@ JSL.l InitializeBottles
;================================================================================ ;================================================================================
; Agahnim Doors Fix ; Agahnim Doors Fix
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $099BBA
JSL FlagAgahnimDoor
org $1BBC94 ; <- DBC94 - Bank1B.asm : 201 (LDA $7EF3C5 : AND.w #$000F : CMP.w #$0003 : BCS BRANCH_EPSILON) org $1BBC94 ; <- DBC94 - Bank1B.asm : 201 (LDA $7EF3C5 : AND.w #$000F : CMP.w #$0003 : BCS BRANCH_EPSILON)
JSL.l LockAgahnimDoors : BNE Overworld_Entrance_BRANCH_EPSILON : NOP #6 JSL.l LockAgahnimDoors : BNE Overworld_Entrance_BRANCH_EPSILON : NOP #6