Merge in dungeon map changes #1

Merged
karafruit merged 75 commits from FancyDoorsMap into GKNew 2026-01-25 22:43:02 +00:00
4 changed files with 13 additions and 1 deletions
Showing only changes of commit 973bf35666 - Show all commits

View File

@@ -247,6 +247,7 @@ CheckPots:
LDA.b [$04], Y LDA.b [$04], Y
CMP.w #$FFFF : BEQ .done CMP.w #$FFFF : BEQ .done
INX : INY : INY INX : INY : INY
BIT.w #$4000 : BNE .multi_item ; marked as multi item
BIT.w #$8000 : BNE .major_item ; marked as major item BIT.w #$8000 : BNE .major_item ; marked as major item
LDA.b [$04], Y LDA.b [$04], Y
AND.w #$00FF AND.w #$00FF
@@ -266,8 +267,19 @@ CheckPots:
INY INY
BRA .mask_set BRA .mask_set
.multi_item
LDA.b [$04], Y
PHX
AND.w #$00FF
ASL A
TAX
LDA.l PotMultiWorldTable, X
PLX
BRA .item_id_set
.major_item .major_item
LDA.b [$04], Y LDA.b [$04], Y
.item_id_set
PHA PHA
PHX PHX
INY INY

View File

@@ -62,7 +62,7 @@ dw $29ED, $69ED, $29FD, $69FD ; 0B - important inventory item - big chest
dw $29CC, $29CD, $29DC, $69DC ; 0C - pendant dw $29CC, $29CD, $29DC, $69DC ; 0C - pendant
dw $2DC9, $69C9, $A9C9, $EDC9 ; 0D - crystal dw $2DC9, $69C9, $A9C9, $EDC9 ; 0D - crystal
dw $29E9, $69E9, $29F9, $69F9 ; 0E - triforce piece dw $29E9, $69E9, $29F9, $69F9 ; 0E - triforce piece
dw $29EA, $69EA, $29EB, $69EB ; 0F - triforce dw $29EA, $69EA, $29FA, $69FA ; 0F - triforce
warnpc $B9F900 warnpc $B9F900
org $B9F900 org $B9F900

Binary file not shown.

Binary file not shown.