From eb0bc2b7f658bb2c734edcd395e20a5318a391a7 Mon Sep 17 00:00:00 2001 From: aerinon Date: Wed, 27 Apr 2022 13:47:12 -0600 Subject: [PATCH] Moved doorrando code. Fixed a multiclient issue with pot switches. --- LTTP_RND_GeneralBugfixes.asm | 2 +- doorrando.asm => doorrando/doorrando.asm | 0 doortables.asm => doorrando/doortables.asm | 0 dr_lobby.asm => doorrando/dr_lobby.asm | 0 drhooks.asm => doorrando/drhooks.asm | 0 edges.asm => doorrando/edges.asm | 0 gfx.asm => doorrando/gfx.asm | 0 hudadditions.asm => doorrando/hudadditions.asm | 0 keydoors.asm => doorrando/keydoors.asm | 0 math.asm => doorrando/math.asm | 0 normal.asm => doorrando/normal.asm | 0 overrides.asm => doorrando/overrides.asm | 0 scroll.asm => doorrando/scroll.asm | 0 spiral.asm => doorrando/spiral.asm | 0 keydrop/standing_items.asm | 8 +++++++- 15 files changed, 8 insertions(+), 2 deletions(-) rename doorrando.asm => doorrando/doorrando.asm (100%) rename doortables.asm => doorrando/doortables.asm (100%) rename dr_lobby.asm => doorrando/dr_lobby.asm (100%) rename drhooks.asm => doorrando/drhooks.asm (100%) rename edges.asm => doorrando/edges.asm (100%) rename gfx.asm => doorrando/gfx.asm (100%) rename hudadditions.asm => doorrando/hudadditions.asm (100%) rename keydoors.asm => doorrando/keydoors.asm (100%) rename math.asm => doorrando/math.asm (100%) rename normal.asm => doorrando/normal.asm (100%) rename overrides.asm => doorrando/overrides.asm (100%) rename scroll.asm => doorrando/scroll.asm (100%) rename spiral.asm => doorrando/spiral.asm (100%) diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index 05f6585..c93f8f4 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -222,7 +222,7 @@ org $A38000 incsrc stats/main.asm incsrc menu/overworldmap.asm ; overwrites some code in bank 0A -incsrc doorrando.asm ; bank 27 likely A7 in the future +incsrc doorrando/doorrando.asm ; bank 27 likely A7 in the future ;bank 28/A8 for keydropshuffle / standing items incsrc keydrop/standing_items.asm incsrc enemizer/main.asm ; this is originally in bank 36, but is currently in migratory status in bank 37 diff --git a/doorrando.asm b/doorrando/doorrando.asm similarity index 100% rename from doorrando.asm rename to doorrando/doorrando.asm diff --git a/doortables.asm b/doorrando/doortables.asm similarity index 100% rename from doortables.asm rename to doorrando/doortables.asm diff --git a/dr_lobby.asm b/doorrando/dr_lobby.asm similarity index 100% rename from dr_lobby.asm rename to doorrando/dr_lobby.asm diff --git a/drhooks.asm b/doorrando/drhooks.asm similarity index 100% rename from drhooks.asm rename to doorrando/drhooks.asm diff --git a/edges.asm b/doorrando/edges.asm similarity index 100% rename from edges.asm rename to doorrando/edges.asm diff --git a/gfx.asm b/doorrando/gfx.asm similarity index 100% rename from gfx.asm rename to doorrando/gfx.asm diff --git a/hudadditions.asm b/doorrando/hudadditions.asm similarity index 100% rename from hudadditions.asm rename to doorrando/hudadditions.asm diff --git a/keydoors.asm b/doorrando/keydoors.asm similarity index 100% rename from keydoors.asm rename to doorrando/keydoors.asm diff --git a/math.asm b/doorrando/math.asm similarity index 100% rename from math.asm rename to doorrando/math.asm diff --git a/normal.asm b/doorrando/normal.asm similarity index 100% rename from normal.asm rename to doorrando/normal.asm diff --git a/overrides.asm b/doorrando/overrides.asm similarity index 100% rename from overrides.asm rename to doorrando/overrides.asm diff --git a/scroll.asm b/doorrando/scroll.asm similarity index 100% rename from scroll.asm rename to doorrando/scroll.asm diff --git a/spiral.asm b/doorrando/spiral.asm similarity index 100% rename from spiral.asm rename to doorrando/spiral.asm diff --git a/keydrop/standing_items.asm b/keydrop/standing_items.asm index 25ad856..3ad3d2d 100644 --- a/keydrop/standing_items.asm +++ b/keydrop/standing_items.asm @@ -168,12 +168,18 @@ RevealPotItem: STZ.w SpawnedItemIsMultiWorld BIT.b $08 BVS LoadMultiWorldPotItem - BMI LoadMajorPotItem + BMI .major + BRA .normal_secret +.major + JMP LoadMajorPotItem .normal_secret STA $08 PHX : PHY + INY : INY + LDA.b [$00],Y : AND.w #$00FF + CMP #$0088 : BEQ .obtained ; skip this step for switches ; set bit and count if first time lifting this pot LDA.b $A0 : ASL : TAY TXA : ASL : TAX : LDA.l BitFieldMasks, X : STA $0A