diff --git a/Overworld/ZSCustomOverworld.asm b/Overworld/ZSCustomOverworld.asm index 821b0c8..3a0efe7 100644 --- a/Overworld/ZSCustomOverworld.asm +++ b/Overworld/ZSCustomOverworld.asm @@ -4739,7 +4739,7 @@ OverworldHandleTransitions: ; Set the OW area number. ; LDA.l Pool_Overworld_ActualScreenID_New, X - JSL Oracle_LOST_WOOD_HOOK + JSL Oracle_LostWoods STA.b $8A STA.w $040A TAX diff --git a/Overworld/lost_woods.asm b/Overworld/lost_woods.asm index 45d03ea..b0f0e36 100644 --- a/Overworld/lost_woods.asm +++ b/Overworld/lost_woods.asm @@ -25,15 +25,14 @@ Overworld_ActualScreenID = $02A5EC ; At this stage the accumulator contains area currently in ; X contains the area you're moving to. org $A0F000 -LOST_WOOD_HOOK: +LostWoods: { + LDA.l Pool_Overworld_ActualScreenID_New, X ; are we in the right area? CMP #$29 : BEQ begincode ; not right area so return. normalfinish: - LDA !RestoreCam : BEQ + - + - LDA Overworld_ActualScreenID, X + LDA Pool_Overworld_ActualScreenID_New, X STZ !ComboCounter RTL