Moved doorrando code. Fixed a multiclient issue with pot switches.

2022-04-27 13:47:12 -06:00
parent f0b767885c
commit eb0bc2b7f6
15 changed files with 8 additions and 2 deletions
--- 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
--- a/doorrando/doorrando.asm
+++ b/doorrando/doorrando.asm
--- a/doorrando/doortables.asm
+++ b/doorrando/doortables.asm
--- a/doorrando/dr_lobby.asm
+++ b/doorrando/dr_lobby.asm
--- a/doorrando/drhooks.asm
+++ b/doorrando/drhooks.asm
--- a/doorrando/edges.asm
+++ b/doorrando/edges.asm
--- a/doorrando/gfx.asm
+++ b/doorrando/gfx.asm
--- a/doorrando/hudadditions.asm
+++ b/doorrando/hudadditions.asm
--- a/doorrando/keydoors.asm
+++ b/doorrando/keydoors.asm
--- a/doorrando/math.asm
+++ b/doorrando/math.asm
--- a/doorrando/normal.asm
+++ b/doorrando/normal.asm
--- a/doorrando/overrides.asm
+++ b/doorrando/overrides.asm
--- a/doorrando/scroll.asm
+++ b/doorrando/scroll.asm
--- a/doorrando/spiral.asm
+++ b/doorrando/spiral.asm
--- 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