From 8aa63389e1e362ab1e0e6862a4cf067fd7fe9010 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Wed, 29 Jan 2020 22:23:55 -0500 Subject: [PATCH] ootw: fix bug where the door limits were only calculated at beginning this doesn't work if we're falling and so no doors are on our Y so re-call the room-limit routine once we land --- ootw/ootw_c1.s | 4 ++++ ootw/physicist.s | 2 ++ 2 files changed, 6 insertions(+) diff --git a/ootw/ootw_c1.s b/ootw/ootw_c1.s index b5fbe026..8bd9f419 100644 --- a/ootw/ootw_c1.s +++ b/ootw/ootw_c1.s @@ -118,6 +118,10 @@ wait_loop: jmp ootw + ; hack, we don't have doors in l1 +recalc_walk_collision: + rts + end_message: .byte 8,10,"PRESS RETURN TO CONTINUE",0 .byte 11,20,"ACCESS CODE: IH8S",0 diff --git a/ootw/physicist.s b/ootw/physicist.s index a868b734..480574a4 100644 --- a/ootw/physicist.s +++ b/ootw/physicist.s @@ -515,6 +515,8 @@ fall_down_destination_smc: bne still_falling_down done_falling_down: + jsr recalc_walk_collision + lda #P_CROUCHING sta PHYSICIST_STATE jmp physicist_crouching