From 955766dc2a16bc49144212b082c96932e33c7be0 Mon Sep 17 00:00:00 2001 From: aerinon Date: Mon, 5 Dec 2022 08:19:59 -0700 Subject: [PATCH] Door state fix attempt2 --- doorrando/drhooks.asm | 3 --- doorrando/overrides.asm | 5 ----- keydrop/standing_items.asm | 1 + 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/doorrando/drhooks.asm b/doorrando/drhooks.asm index 69e5d73..3f786b0 100644 --- a/doorrando/drhooks.asm +++ b/doorrando/drhooks.asm @@ -214,6 +214,3 @@ jsl CheckIfDoorsOpen bcs .normal rts .normal - -org $0282D1 ; Module08_00_LoadProperties -JSL ClearDoorState diff --git a/doorrando/overrides.asm b/doorrando/overrides.asm index e62c3ee..09b8c64 100644 --- a/doorrando/overrides.asm +++ b/doorrando/overrides.asm @@ -164,8 +164,3 @@ BigKeyDoorCheck: LDA.l DRFlags : AND #$0400 : BNE + ; skip if the flag is set - bk doors can be double-sided PLA : PEA.w RoomDraw_OneSidedShutters_South_onesided_shutter_or_big_key_door-1 + LDA.w #$0000 : RTL - -ClearDoorState: - STZ.b $6C - LDA.b #$82 : STA.b $99 ; what was wrote over -RTL diff --git a/keydrop/standing_items.asm b/keydrop/standing_items.asm index 76a7100..85737a0 100644 --- a/keydrop/standing_items.asm +++ b/keydrop/standing_items.asm @@ -599,6 +599,7 @@ CheckIfPotIsSpecial: RTL SetTheSceneFix: + STZ.b $6C JSL InitializeMirrorHDMA JSL LoadCommonSprites_long RTL