scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix LostWoods hook bug, inject into ZSCustomOverworld

Browse Source
This commit is contained in:
scawful
2025-09-14 13:45:04 -04:00
parent c5474fae5d
commit 3c36567947
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Overworld/ZSCustomOverworld.asm
View File

@@ -4739,7 +4739,7 @@ OverworldHandleTransitions:
; Set the OW area number. ; Set the OW area number.
; LDA.l Pool_Overworld_ActualScreenID_New, X ; LDA.l Pool_Overworld_ActualScreenID_New, X
JSL Oracle_LOST_WOOD_HOOK JSL Oracle_LostWoods
STA.b $8A STA.b $8A
STA.w $040A STA.w $040A
TAX TAX

7
Overworld/lost_woods.asm
View File

@@ -25,15 +25,14 @@ Overworld_ActualScreenID = $02A5EC
; At this stage the accumulator contains area currently in ; At this stage the accumulator contains area currently in
; X contains the area you're moving to. ; X contains the area you're moving to.
org $A0F000 org $A0F000
LOST_WOOD_HOOK: LostWoods:
{ {
LDA.l Pool_Overworld_ActualScreenID_New, X
; are we in the right area? ; are we in the right area?
CMP #$29 : BEQ begincode CMP #$29 : BEQ begincode
; not right area so return. ; not right area so return.
normalfinish: normalfinish:
LDA !RestoreCam : BEQ + LDA Pool_Overworld_ActualScreenID_New, X
+
LDA Overworld_ActualScreenID, X
STZ !ComboCounter STZ !ComboCounter
RTL RTL