From 3d1ea38096953fb1bbe7047446f5e17a8825b037 Mon Sep 17 00:00:00 2001 From: scawful Date: Sat, 17 Aug 2024 18:32:41 -0400 Subject: [PATCH] diagnose and add todo for lost woods scroll bug --- Overworld/lost_woods.asm | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/Overworld/lost_woods.asm b/Overworld/lost_woods.asm index f8e9911..88707e8 100644 --- a/Overworld/lost_woods.asm +++ b/Overworld/lost_woods.asm @@ -18,7 +18,8 @@ ; ========================================================== -org $02AA7D +; OverworldHandleTransitions +org $02AA7D JSL LOST_WOOD_HOOK ; At this stage the accumulator contains area currently in @@ -31,6 +32,8 @@ LOST_WOOD_HOOK: normalfinish: { + ; Overworld_ActualScreenID + ; Gets the small/large map true ID of the current screen LDA $02A5EC, x ; not right area so return. STZ !ComboCounter RTL @@ -158,4 +161,38 @@ LOST_WOOD_HOOK: LDA #$29 ; load the same area. RTL } + + ; TODO: Restore camera values on invalid combinations. + RestoreCameraNorth: + { + LDA $700 + SEC + SBC #$10 + STA $700 + RTS + } + + RestoreCameraSouth: + { + LDA $700 + CLC + ADC #$10 + STA $700 + RTS + } + + RestoreCameraWest: + { + DEC $700 + DEC $700 + RTS + } + + RestoreCameraEast: + { + INC $700 + INC $700 + RTS + } + } ; label LOST_WOOD_HOOK \ No newline at end of file