alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
aerinon
2022-04-27 13:47:12 -06:00
parent f0b767885c
commit eb0bc2b7f6
15 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LTTP_RND_GeneralBugfixes.asm
View File

@@ -222,7 +222,7 @@ org $A38000
incsrc stats/main.asm incsrc stats/main.asm
incsrc menu/overworldmap.asm ; overwrites some code in bank 0A 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 ;bank 28/A8 for keydropshuffle / standing items
incsrc keydrop/standing_items.asm incsrc keydrop/standing_items.asm
incsrc enemizer/main.asm ; this is originally in bank 36, but is currently in migratory status in bank 37 incsrc enemizer/main.asm ; this is originally in bank 36, but is currently in migratory status in bank 37

0
doorrando.asm → doorrando/doorrando.asm
View File

0
doortables.asm → doorrando/doortables.asm
View File

0
dr_lobby.asm → doorrando/dr_lobby.asm
View File

0
drhooks.asm → doorrando/drhooks.asm
View File

0
edges.asm → doorrando/edges.asm
View File

0
gfx.asm → doorrando/gfx.asm
View File

0
hudadditions.asm → doorrando/hudadditions.asm
View File

0
keydoors.asm → doorrando/keydoors.asm
View File

0
math.asm → doorrando/math.asm
View File

0
normal.asm → doorrando/normal.asm
View File

0
overrides.asm → doorrando/overrides.asm
View File

0
scroll.asm → doorrando/scroll.asm
View File

0
spiral.asm → doorrando/spiral.asm
View File

8
keydrop/standing_items.asm
View File

@@ -168,12 +168,18 @@ RevealPotItem:
STZ.w SpawnedItemIsMultiWorld STZ.w SpawnedItemIsMultiWorld
BIT.b $08 BIT.b $08
BVS LoadMultiWorldPotItem BVS LoadMultiWorldPotItem
BMI LoadMajorPotItem BMI .major
BRA .normal_secret
.major
JMP LoadMajorPotItem
.normal_secret .normal_secret
STA $08 STA $08
PHX : PHY 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 ; set bit and count if first time lifting this pot
LDA.b $A0 : ASL : TAY LDA.b $A0 : ASL : TAY
TXA : ASL : TAX : LDA.l BitFieldMasks, X : STA $0A TXA : ASL : TAX : LDA.l BitFieldMasks, X : STA $0A