Fix map/compass icons

Shift item tiers slightly -> map above compass, small keys in dungeon higher
Update crystal indicator icons on HUD
2026-05-28 22:34:51 -05:00 · 2026-05-28 06:29:14 -05:00 · 2026-05-27 23:16:04 -05:00 · 2026-05-27 23:01:02 -05:00 · 2026-05-25 00:16:48 -05:00 · 2026-05-24 19:09:33 -05:00
28 changed files with 505 additions and 281 deletions
--- a/controllerjank.asm
+++ b/controllerjank.asm
@@ -49,14 +49,14 @@ InvertDPad_DPadLROnly:
 	LDA.w JOY1L : STA.b Scrap00
 	LDA.w JOY1H
 		BIT.b #$03 : BEQ + : EOR.b #$03 : + ; swap left/right
-	STA.b Scrap00
+	STA.b Scrap01
 JML InvertDPadReturn

 InvertDPad_DPadUDOnly:
 	LDA.w JOY1L : STA.b Scrap00
 	LDA.w JOY1H
 		BIT.b #$0C : BEQ + : EOR.b #$0C : + ; swap up/down
-	STA.b Scrap00
+	STA.b Scrap01
 JML InvertDPadReturn

 InvertDPad:
--- a/darkworldspawn.asm
+++ b/darkworldspawn.asm
@@ -146,32 +146,57 @@ macro SetMinimum(base,filler,compare)
 endmacro
 RefreshRainAmmo:
 	LDA.l ProgressIndicator : CMP.b #$01 : BEQ .rain ; check if we're in rain state
-	RTL
-	.rain
-		LDA.l StartingEntrance
-		+ CMP.b #$03 : BNE + ; Uncle
-			%SetMinimum(CurrentMagic,MagicFiller,RainDeathRefillMagic_Uncle)
-			%SetMinimum(BombsEquipment,BombsFiller,RainDeathRefillBombs_Uncle)
-			LDA.l ArrowMode : BEQ ++
-			LDA.l BowEquipment : BEQ +++
-			++ %SetMinimum(CurrentArrows,ArrowsFiller,RainDeathRefillArrows_Uncle)
-			+++ BRA .done
-		+ CMP.b #$02 : BNE + ; Cell
-			%SetMinimum(CurrentMagic,MagicFiller,RainDeathRefillMagic_Cell)
-			%SetMinimum(BombsEquipment,BombsFiller,RainDeathRefillBombs_Cell)
-			LDA.l ArrowMode : BEQ ++
-			LDA.l BowEquipment : BEQ .done
-			++ %SetMinimum(CurrentArrows,ArrowsFiller,RainDeathRefillArrows_Cell)
-			BRA .done
-		+ CMP.b #$04 : BNE + ; Mantle
-			%SetMinimum(CurrentMagic,MagicFiller,RainDeathRefillMagic_Mantle)
-			%SetMinimum(BombsEquipment,BombsFiller,RainDeathRefillBombs_Mantle)
-			LDA.l ArrowMode : BEQ ++
-			LDA.l BowEquipment : BEQ .done
-			++ %SetMinimum(CurrentArrows,ArrowsFiller,RainDeathRefillArrows_Mantle)
-		+
-	.done
 RTL
+.rain
+	LDA.l StartingEntrance : BEQ .uncle
+	CMP.b #$03 : BNE + ; Uncle
+		.uncle
+		LDA.l RainDeathRefillMagic_Uncle : JSR .refillMagic
+		LDA.l RainDeathRefillBombs_Uncle : JSR .refillBombs
+		LDA.l ArrowMode : BNE .rupeeBow
+		LDA.l RainDeathRefillArrows_Uncle : JSR .refillArrows
+		BRA .done
+	+ CMP.b #$02 : BNE + ; Cell
+		LDA.l RainDeathRefillMagic_Cell : JSR .refillMagic
+		LDA.l RainDeathRefillBombs_Cell : JSR .refillBombs
+		LDA.l ArrowMode : BNE .rupeeBow
+		LDA.l RainDeathRefillArrows_Cell : JSR .refillArrows
+		BRA .done
+	+ CMP.b #$04 : BNE + ; Mantle
+		LDA.l RainDeathRefillMagic_Mantle : JSR .refillMagic
+		LDA.l RainDeathRefillBombs_Mantle : JSR .refillBombs
+		LDA.l ArrowMode : BNE .rupeeBow
+		LDA.l RainDeathRefillArrows_Mantle : JSR .refillArrows
+		BRA .done
+	+ BRA .done
+
+	.rupeeBow
+		REP #$20
+		LDA.l RainDeathRefillRupeeBow : JSR .refillRupees
+		SEP #$20
+
+.done
+RTL
+
+.refillMagic
+	SEC : SBC.l CurrentMagic : BCC +
+		STA.l MagicFiller
+	+ RTS
+
+.refillBombs
+	SEC : SBC.l BombsEquipment : BCC +
+		STA.l BombsFiller
+	+ RTS
+
+.refillArrows
+	SEC : SBC.l CurrentArrows : BCC +
+		STA.l ArrowsFiller
+	+ RTS
+
+.refillRupees
+	CMP.l CurrentRupees : BCC +
+		STA.l CurrentRupees
+	+ RTS
 ;--------------------------------------------------------------------------------
 SetEscapeAssist:
 	LDA.l ProgressIndicator : CMP.b #$01 : BNE .no_train ; check if we're in rain state
--- a/dialog.asm
+++ b/dialog.asm
@@ -61,73 +61,84 @@ LoadDialogAddressIndirect:
 RTL
 ;--------------------------------------------------------------------------------
 FreeDungeonItemNotice:
-        STA.l ScratchBufferV
+	STA.l ScratchBufferV

-        PHA : PHX : PHY
-        PHP
-        PHB : PHK : PLB
-        SEP #$20 ; set 8-bit accumulator
-        REP #$10 ; set 16-bit index registers
-        PEI.b (Scrap00)
-        LDA.b Scrap02 : PHA
-        LDA.l ScratchBufferNV : PHA
-        LDA.l ScratchBufferNV+1 : PHA
+	PHA : PHX : PHY
+	PHP
+	PHB : PHK : PLB
+	SEP #$20 ; set 8-bit accumulator
+	REP #$10 ; set 16-bit index registers
+	PEI.b (Scrap00)
+	LDA.b Scrap02 : PHA
+	LDA.l ScratchBufferNV : PHA
+	LDA.l ScratchBufferNV+1 : PHA
 	;--------------------------------

-	LDA.l FreeItemText : BNE + : JMP .skip : +
+	LDA.l !MULTIWORLD_ITEM_PLAYER_ID : BEQ +
+	LDA.b #$2F ; if not from our world, show all dungeon item and crystal notices
+	ORA.l FreeItemText : BNE + : JMP .skip : +

+	STA.b Scrap00
 	LDA.b #$00 : STA.l ScratchBufferNV ; initialize scratch
-	LDA.l FreeItemText : AND.b #$01 : BEQ + ; show message for general small key
+
+	LDA.b Scrap00 : AND.b #$01 : BEQ + ; show message for general small key
 	LDA.l ScratchBufferV : CMP.b #$24 : BNE + ; general small key
 		%CopyDialog(Notice_SmallKeyOf)
 		LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer
 		%CopyDialog(Notice_Self)
 		JMP .done
-	+ : LDA.l FreeItemText : AND.b #$02 : BEQ + ; show message for general compass
+
+	LDA.b Scrap00 : AND.b #$02 : BEQ + ; show message for general compass
 	LDA.l ScratchBufferV : CMP.b #$25 : BNE + ; general compass
 		%CopyDialog(Notice_CompassOf)
 		LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer
 		%CopyDialog(Notice_Self)
 		JMP .done
-	+ : LDA.l FreeItemText : AND.b #$04 : BEQ + ; show message for general map
+
+	LDA.b Scrap00 : AND.b #$04 : BEQ + ; show message for general map
 	LDA.l ScratchBufferV : CMP.b #$33 : BNE + ; general map
 		%CopyDialog(Notice_MapOf)
 		LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer
 		%CopyDialog(Notice_Self)
 		JMP .done
-	+ : LDA.l FreeItemText : AND.b #$08 : BEQ + ; show message for general big key
+
+	LDA.b Scrap00 : AND.b #$08 : BEQ + ; show message for general big key
 	LDA.l ScratchBufferV : CMP.b #$32 : BNE + ; general big key
 		%CopyDialog(Notice_BigKeyOf)
 		LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer
 		%CopyDialog(Notice_Self)
 		JMP .done
-	+
-	LDA.l FreeItemText : AND.b #$04 : BEQ + ; show message for dungeon map
+
+	LDA.b Scrap00 : AND.b #$04 : BEQ + ; show message for dungeon map
 	LDA.l ScratchBufferV : AND.b #$F0 ; looking at high bits only
 	CMP.b #$70 : BNE + ; map of...
 		%CopyDialog(Notice_MapOf)
 		JMP .dungeon
-	+ : LDA.l FreeItemText : AND.b #$02 : BEQ + ; show message for dungeon compass
+
+	LDA.b Scrap00 : AND.b #$02 : BEQ + ; show message for dungeon compass
 	LDA.l ScratchBufferV : AND.b #$F0 : CMP.b #$80 : BNE + ; compass of...
 		%CopyDialog(Notice_CompassOf)
 		JMP .dungeon
-	+ : LDA.l FreeItemText : AND.b #$08 : BEQ + ; show message for dungeon big key
+
+	LDA.b Scrap00 : AND.b #$08 : BEQ + ; show message for dungeon big key
 	LDA.l ScratchBufferV : AND.b #$F0 : CMP.b #$90 : BNE + ; big key of...
 		%CopyDialog(Notice_BigKeyOf)
 		JMP .dungeon
-	+ : LDA.l FreeItemText : AND.b #$01 : BEQ + ; show message for dungeon small key
+
+	LDA.b Scrap00 : AND.b #$01 : BEQ + ; show message for dungeon small key
 	LDA.l ScratchBufferV : AND.b #$F0 : CMP.b #$A0 : BNE + ; small key of...
 		LDA.l ScratchBufferV : CMP.b #$AF : BNE ++ : JMP .skip : ++
 		%CopyDialog(Notice_SmallKeyOf)
 		LDA.b #$01 : STA.l ScratchBufferNV ; set up a flip for small keys
 		BRA .dungeon
-	+ : LDA.l FreeItemText : AND.b #$20 : BEQ + ; show message for crystal
+
+	LDA.b Scrap00 : AND.b #$20 : BEQ + ; show message for crystal
 	LDA.l ScratchBufferV : CMP.b #$B0 : !BLT + ;  crystal #
-                               CMP.b #$B7 : !BGE +
+	                       CMP.b #$B7 : !BGE +
 		%CopyDialog(Notice_Crystal)
 		JMP .crystal
-        +
-	JMP .skip ; it's not something we are going to give a notice for
+
+	JMP .skip ; it's not something we are going to give a notice for

 	.dungeon
 	LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer
@@ -139,23 +150,26 @@ FreeDungeonItemNotice:
 		LDA.b #$0F : !SUB.l ScratchBufferNV+1 : STA.l ScratchBufferNV+1 ; flip the values for small keys
 	+
 	LDA.l ScratchBufferNV+1
-        ASL : TAX
-        REP #$20
-        LDA.l DungeonItemIDMap,X : CMP.w #$0003 : BCC .hc_sewers
-                                   CMP.w DungeonID : BNE +
-                BRA .self_notice
-                .hc_sewers
-                LDA.w DungeonID : CMP.w #$0003 : BCS +
-                        .self_notice
-                        SEP #$20
-                        LDA.l FreeItemText : AND.b #$40 : BEQ ++
-                                LDA.b #$00 : STA.l DialogOffsetPointer : STA.l DialogOffsetPointer+1
-                                JMP .skip
-                        ++
-                        %CopyDialog(Notice_Self)
-                        JMP .done
-        +
-        SEP #$20
+	ASL : TAX
+	REP #$20
+
+	LDA.l !MULTIWORLD_ITEM_PLAYER_ID : AND.w #$00FF : BNE +
+
+	LDA.l DungeonItemIDMap, X : CMP.w #$0003 : BCC .hc_sewers
+	                            CMP.w DungeonID : BNE +
+		BRA .self_notice
+		.hc_sewers
+		LDA.w DungeonID : CMP.w #$0003 : BCS +
+			.self_notice
+			SEP #$20
+			LDA.l FreeItemText : AND.b #$40 : BEQ ++
+				LDA.b #$00 : STA.l DialogOffsetPointer : STA.l DialogOffsetPointer+1
+				JMP .skip
+			++
+			%CopyDialog(Notice_Self)
+			JMP .done
+	+
+	SEP #$20
 	LDA.l ScratchBufferNV+1
 	CMP.b #$00 : BNE + ; ...light world
 		%CopyDialog(Notice_LightWorld) : JMP .done
@@ -190,9 +204,9 @@ FreeDungeonItemNotice:
 	+ : CMP.b #$0F : BNE + ; ...sewers
 		%CopyDialog(Notice_Sewers)
 	+
-        JMP .done
+	JMP .done

-        .crystal
+	.crystal
 	LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer
 	LDA.l ScratchBufferV
 	AND.b #$0F ; looking at low bits only
@@ -210,7 +224,7 @@ FreeDungeonItemNotice:
 		%CopyDialog(Notice_Four) : JMP .done
 	+ : CMP.b #$06 : BNE +
 		%CopyDialog(Notice_Three) : JMP .done
-        +
+	+

 	.done

@@ -220,14 +234,14 @@ FreeDungeonItemNotice:

 	;--------------------------------
 	.skip
-        PLA : STA.l ScratchBufferNV+1
-        PLA : STA.l ScratchBufferNV
-        PLA : STA.b Scrap02
-        REP #$20
-        PLA : STA.b Scrap00
-        PLB
-        PLP
-        PLY : PLX : PLA
+	PLA : STA.l ScratchBufferNV+1
+	PLA : STA.l ScratchBufferNV
+	PLA : STA.b Scrap02
+	REP #$20
+	PLA : STA.b Scrap00
+	PLB
+	PLP
+	PLY : PLX : PLA
 RTL

 ;--------------------------------------------------------------------------------
--- a/doorrando/hudadditions.asm
+++ b/doorrando/hudadditions.asm
@@ -6,6 +6,7 @@
 !DTile = $2D60
 !BlueSquare = $2C5E
 !BossIcon = $253C
+!NPCIcon = $253B

 DrHudOverride:
 	PHB
@@ -30,6 +31,13 @@ DRHUD_DrawIndicators:
 	LDA.b FrameCounter : AND.b #$10 : BEQ DRHUD_EnemyDropIndicator

 DRHUD_BossIndicator:
+	LDA.w DungeonID : CMP.b #$FF : BNE .in_dungeon
+	LDA.w NpcItemIndicator : BEQ .early_exit
+	LDA.l ShowLootInHUD : BEQ .early_exit
+	REP #$10
+	LDY.w #!NPCIcon : STY.w HUDMultiIndicator
+	JMP DRHUD_Finished
+.in_dungeon
 	LDA.l DRMode : BNE .continue
 .early_exit
 	REP #$10
--- a/doorrando/spiral.asm
+++ b/doorrando/spiral.asm
@@ -21,14 +21,18 @@ SpiralWarp: {
    lda.w $045e : cmp.b #$5e : beq .gtg ; abort if not spiral - intended room is in A!
    cmp.b #$5f : beq .gtg
    cmp.b #$26 : beq .inroom
-    .abort
-    SEP #$30 : stz.w $045e : lda.b PreviousRoom : and.b #$0f : rtl ; clear,run hijacked code and get out
-    .inroom
+.abort
+    SEP #$30
+    stz.w $045e
+    lda.b PreviousRoom : and.b #$0f
+    rtl ; clear,run hijacked code and get out
+
+.inroom
    jsr InroomStairsWarp
    lda.b PreviousRoom : and.b #$0f ; this is the code we are hijacking
    rtl

-    .gtg
+.gtg
    phb : phk : plb : phx : phy ; push stuff
    jsr LookupSpiralOffset
    rep #$30 : and.w #$00FF : asl #2 : tax
@@ -81,6 +85,7 @@ SpiralWarp: {
    ldy.b #$01 : jsr SetCamera

    jsr StairCleanup
+
    ply : plx : plb ; pull the stuff we pushed
    lda.b PreviousRoom : and.b #$0f ; this is the code we are hijacking
    rtl
@@ -261,6 +266,7 @@ InroomStairsWarp: {
    .skipCamera

    jsr StairCleanup
+
    ply : plx : plb ; pull the stuff we pushed
    rts
 }
@@ -335,4 +341,4 @@ SpiralPriorityHack: {
        lda.b #$01 : rtl ; always skip the priority code - until I figure out how to fix it
    + lda.w $0462 : and.b #$04 ; what we wrote over
    rtl
-}
+}
--- a/events.asm
+++ b/events.asm
@@ -38,7 +38,7 @@ RTL
 OnPlayerDead:
 	PHA
 		JSL SetDeathWorldChecked
-                JSL DynamicDropGFXClear
+		JSL DynamicDropGFXClear
 		JSL SetSilverBowMode
 		JSL RefreshRainAmmo
 	PLA
@@ -79,30 +79,20 @@ RTL
 ;--------------------------------------------------------------------------------
 OnUncleItemGet:
 	PHA
-
-	LDA.l EscapeAssist
-	BIT.b #$04 : BEQ + : STA.l InfiniteMagic : +
-	BIT.b #$02 : BEQ + : STA.l InfiniteBombs : +
-	BIT.b #$01 : BEQ + : STA.l InfiniteArrows : +
-
 	LDA.l UncleItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
 	PLA
 	JSL Link_ReceiveItem

-	LDA.l UncleRefill : BIT.b #$04 : BEQ + : LDA.b #$80 : STA.l MagicFiller : + ; refill magic
-	LDA.l UncleRefill : BIT.b #$02 : BEQ + : LDA.b #50 : STA.l BombsFiller : + ; refill bombs
-	LDA.l UncleRefill : BIT.b #$01 : BEQ + ; refill arrows
-		LDA.b #70 : STA.l ArrowsFiller
+	LDA.l ProgressIndicator : BNE +
+		LDA.b #$01 : STA.l ProgressIndicator ; set rain state
+		JSL SetEscapeAssist
+		JSL RefreshRainAmmo

+		; grant arrows if we started with a bow in retro mode
 		LDA.l ArrowMode : BEQ +
-			LDA.l BowTracking : ORA.b #$80 : STA.l BowTracking ; enable bow toggle
-			REP #$20 ; set 16-bit accumulator
-			LDA.l CurrentRupees : !ADD.l FreeUncleItemAmount : STA.l CurrentRupees ; rupee arrows, so also give the player some money to start
-			SEP #$20 ; set 8-bit accumulator
+		LDA.l RainDeathRefillRupeeBow : ORA.l RainDeathRefillRupeeBow+1 : BEQ +
+		LDA.b #$01 : STA.l ArrowsFiller
 	+
-        LDA.l ProgressIndicator : BNE +
-                LDA.b #$01 : STA.l ProgressIndicator ; handle rain state
-        +
 RTL
 ;--------------------------------------------------------------------------------
 OnAga1Defeated:
@@ -201,12 +191,12 @@ OnNewFile:
 		STZ.w TreePullKills
 		STZ.w TreePullHits
 		STZ.w PrizePackIndexes
-                STZ.w PrizePackIndexes+1
-                STZ.w PrizePackIndexes+2
-                STZ.w PrizePackIndexes+3
-                STZ.w PrizePackIndexes+4
-                STZ.w PrizePackIndexes+5
-                STZ.w PrizePackIndexes+6
+		STZ.w PrizePackIndexes+1
+		STZ.w PrizePackIndexes+2
+		STZ.w PrizePackIndexes+3
+		STZ.w PrizePackIndexes+4
+		STZ.w PrizePackIndexes+5
+		STZ.w PrizePackIndexes+6
 		LDA.b #$00 : STA.l MosaicLevel
 		JSL InitRNGPointerTable
 	PLP : PLX
--- a/gk/check_loot.asm
+++ b/gk/check_loot.asm
@@ -71,13 +71,16 @@ CheckLoot:
 +

 	LDA.l ItemSources : BIT.w #$0008 : BEQ +
-	JSR CheckBoss
+	JSR CheckMisc
+	JSR CheckMisc2
 +

 	LDA.l ItemSources : BIT.w #$0010 : BEQ +
 	JSR CheckPrize
 +

+JSR CheckNpcs
+
 .done
 	PLA : STA.b $0E
 	PLA : STA.b $06
@@ -133,25 +136,22 @@ CheckChests:
 .done
 	RTS

-CheckBoss:
-	; we assume all bosses are in section 1 of split sections
-	; mainly to simplify hera cage key and GT torch
-	; which use the same flow
-	; and bosses are always in their own section anyway
+CheckMisc:
+	; this includes bosses, bonk torches, and standing items (in caves + hera cage key)
+	; all dungeon items in this section are in section 1 of split sections
+	; for cave items we'll always know what section we're in
+	; but for dungeon items, we won't have a section specified in door rando
+	; so if we don't have a section, assume it's 1, and it'll match all the dungeon items anyway
 	LDA.b $CA
-	AND.w #$F000
-	XBA
-	CMP.w #$0020
-	BCC +
-	RTS
-
+	BIT.w #$F000
+	BNE +
+	ORA.w #$1000
 +
-	LDA.b $CA
-	AND.w #$01FF
+	AND.w #$F1FF
 	STA.b $04

 	LDX.w #$FFFA
-.next_boss
+.next_misc
 	INX #6
 	LDA.l MiscLocations, X
 	BPL .check
@@ -159,9 +159,10 @@ CheckBoss:

 .check
 	CMP.b $04
-	BNE .next_boss
+	BNE .next_misc

 	TXY
+	AND.w #$01FF
 	CMP.b RoomIndex
 	BEQ .current_room

@@ -186,7 +187,7 @@ CheckBoss:

 	TYX
 	BIT.b $04
-	BNE .next_boss ; continue checking if we already got the item
+	BNE .next_misc ; continue checking if we already got the item

 	LDA.l MiscLocations+4, X
 	STA.b $05
@@ -198,7 +199,24 @@ CheckBoss:
 	AND.w #$00FF
 	JSR GetLootClass

-	BRA .next_boss
+	BRA .next_misc
+
+CheckMisc2:
+	; this currently only includes the library and Uncle
+	; so let's just hard-code them for now
+	LDA.b $CA
+	CMP.w #$2107 : BNE +
+	LDA.l NpcFlags : AND.w #$0080 : BNE +
+	LDA.l LibraryItem : AND.w #$00FF : JSR GetLootClass
+
+
+	LDA.b $CA
+	CMP.w #$1055 : BNE +
+	LDA.l ProgressFlags : AND.w #$0001 : BNE +
+	LDA.l UncleItem : AND.w #$00FF : JSR GetLootClass
+
+
+	RTS

 CheckPrize:
 	LDA.b $CA
@@ -236,6 +254,41 @@ CheckPrize:

 	BRA .next_prize

+CheckNpcs:
+	LDA.b $CA
+
+	LDX.w #$FFFA
+.next_npc
+	INX #6
+	LDA.l NpcItems, X
+	BMI .nope
+
+	CMP.b $CA
+	BNE .next_npc
+
+	LDA.l NpcItems+3, X ; get location of data to check
+	STA.b $05
+
+	LDA.l NpcItems+2, X
+	STA.b $04
+
+	LDA.b [$04]
+	AND.w #$00FF
+	AND.l NpcItems+5, X
+	BNE .next_npc
+
+.yep
+	LDA.w NpcItemIndicator
+	ORA.w #$0001
+	STA.w NpcItemIndicator
+	RTS
+
+.nope
+	LDA.w NpcItemIndicator
+	AND.w #$FF00
+	STA.w NpcItemIndicator
+	RTS
+
 CheckPots:
 	LDA.b $CA
 	AND.w #$01FF
--- a/gk/data/item_mapping.asm
+++ b/gk/data/item_mapping.asm
@@ -3,8 +3,8 @@
 !TIER_LOW_KEY = $03
 !TIER_HEALTH = $05
 !TIER_MINOR = $06
-!TIER_MAP = $07
-!TIER_COMPASS = $08
+!TIER_COMPASS = $07
+!TIER_MAP = $08
 !TIER_SM_KEY = $09
 !TIER_BIG_KEY = $0A
 !TIER_MAJOR = $0B
@@ -49,7 +49,7 @@ db !TIER_CRYSTAL ; 20 - Crystal
 db !TIER_MINOR   ; 21 - Net
 db !TIER_MINOR   ; 22 - Blue Mail
 db !TIER_MINOR   ; 23 - Red Mail
-db !TIER_LOW_KEY ; 24 - Small Key
+db !TIER_SM_KEY  ; 24 - Small Key
 db !TIER_COMPASS ; 25 - Compass
 db !TIER_HEALTH  ; 26 - Heart Container from 4/4
 db !TIER_JUNK    ; 27 - Bomb
--- a/gk/data/split_room.asm
+++ b/gk/data/split_room.asm
@@ -78,7 +78,7 @@ SplitRooms:
 %d(.no) : %d(.no) : %d(.no) : %d(.11b) : %d(.11c) : %d(.no) : %d(.11e) : %d(.11f)

 ; 120
-%d(.120) : %d(.no) : %d(.122) : %d(.no) : %d(.124) : %d(.125) : %d(.126) : %d(.no)
+%d(.120) : %d(.no) : %d(.122) : %d(.no) : %d(.124) : %d(.125) : %d(.126) : %d(.127)

 .no
 db $00
@@ -909,3 +909,21 @@ db $02
 db $03
 db $04
 db $FF
+
+.127 ; Hammer Pegs Cave (1) // Fake Dark Lake Hylia Spike Hint Cave (2)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(.no_items) : %d(..pots) : %d(.no_items)
+..areas
+db $03, $80, $FF, $00, $FF
+db $FF
+..doors
+db $08
+db $FF
+..pots
+db $04
+db $05
+db $06
+db $07
+db $FF
--- a/gk/doors_dungeon_map.asm
+++ b/gk/doors_dungeon_map.asm
@@ -150,7 +150,10 @@ DrawFullRoomTile:
 	RTL

 DrawSingleRoomLoot:
-	PHX : PHY
+	LDA.l ShowLootOnMap : AND.w #$00FF : BNE +
+		RTL
+
+	PHX : PHY

 	TYX

--- a/gk/draw_loot.asm
+++ b/gk/draw_loot.asm
@@ -32,6 +32,9 @@ DrawLoot:
 	LDA.l DRMode
 	BNE .skip

+	LDA.l ShowLootOnMap
+	BEQ .skip
+
 	REP #$30
 	PHX : PHY

--- a/gk/loot_hud.asm
+++ b/gk/loot_hud.asm
@@ -1,3 +1,44 @@
+pushpc
+org $828C73
+JSL EnterRoom
+NOP
+
+org $86C0AB
+JSL CollectHeartPieceAndUpdate
+
+org $86D1A8
+JSL SetDeathFlagAndUpdate
+
+pullpc
+
+SetDeathFlagAndUpdate:
+	JSL UpdateLootHUD
+	JSL Sprite_ManuallySetDeathFlagUW
+	RTL
+
+CollectHeartPieceAndUpdate:
+	JSL $85F018
+	JSL UpdateLootHUD
+	RTL
+
+ClearLootHUD:
+	LDA.b GameMode
+	CMP.b #$07
+	BNE UpdateLootHUD
+;
+	PHP
+	REP #$20
+	LDA.w #!BlankTile : STA.w EnemyDropIndicator
+	PLP
+	RTL
+
+EnterRoom:
+	; what we wrote over
+	STZ.w $0200
+	STZ.b $B0
+
+; fall into UpdateLootHUD
+
 UpdateLootHUD:
 	PHP
 	REP #$30
--- a/gk/settings.asm
+++ b/gk/settings.asm
@@ -54,8 +54,8 @@ dw $29CA, $69CA, $29DA, $29DB ; 03 - small key
 dw $29E9, $69E9, $29F9, $69F9 ; 04 - triforce piece
 dw $29DD, $69DD, $A9DD, $E9DD ; 05 - safety - plus
 dw $29EC, $69EC, $29FC, $69FC ; 06 - less important item - small chest
-dw $29CE, $29CF, $29DE, $29DF ; 07 - map
-dw $29E8, $69E8, $29F8, $69F8 ; 08 - compass
+dw $29E8, $69E8, $29F8, $69F8 ; 07 - compass
+dw $29CE, $29CF, $29DE, $29DF ; 08 - map
 dw $29CA, $69CA, $29DA, $29DB ; 09 - small key
 dw $29C8, $69C8, $29D8, $29D9 ; 0A - big key
 dw $29ED, $69ED, $29FD, $69FD ; 0B - important inventory item - big chest
@@ -73,29 +73,32 @@ warnpc $B9FA00
 org $B9FA00
 ; Room ID mappings to bit to check for presence and address of item drop
 MiscLocations:
-dw $00C8 : db $04 : dl HeartContainer_ArmosKnights
-dw $0033 : db $04 : dl HeartContainer_Lanmolas
-dw $0007 : db $04 : dl HeartContainer_Moldorm
+dw $10C8 : db $04 : dl HeartContainer_ArmosKnights
+dw $1033 : db $04 : dl HeartContainer_Lanmolas
+dw $1007 : db $04 : dl HeartContainer_Moldorm

-dw $005A : db $04 : dl HeartContainer_HelmasaurKing
-dw $0006 : db $04 : dl HeartContainer_Arrghus
-dw $0029 : db $04 : dl HeartContainer_Mothula
-dw $00AC : db $04 : dl HeartContainer_Blind
-dw $00DE : db $04 : dl HeartContainer_Kholdstare
-dw $0090 : db $04 : dl HeartContainer_Vitreous
-dw $00A4 : db $04 : dl HeartContainer_Trinexx
+dw $105A : db $04 : dl HeartContainer_HelmasaurKing
+dw $1006 : db $04 : dl HeartContainer_Arrghus
+dw $1029 : db $04 : dl HeartContainer_Mothula
+dw $10AC : db $04 : dl HeartContainer_Blind
+dw $10DE : db $04 : dl HeartContainer_Kholdstare
+dw $1090 : db $04 : dl HeartContainer_Vitreous
+dw $10A4 : db $04 : dl HeartContainer_Trinexx

-dw $0073 : db $05 : dl BonkKey_Desert ; torch
-dw $008C : db $05 : dl BonkKey_GTower ; torch
-dw $0087 : db $05 : dl StandingKey_Hera
+dw $1073 : db $05 : dl BonkKey_Desert ; torch
+dw $108C : db $05 : dl BonkKey_GTower ; torch
+dw $1087 : db $05 : dl StandingKey_Hera ; investigate
+
+dw $10E1 : db $06 : dl HeartPiece_Forest_Thieves
+dw $10E2 : db $06 : dl HeartPiece_Lumberjack_Tree
+dw $10EA : db $05 : dl HeartPiece_Spectacle_Cave
+dw $111B : db $06 : dl HeartPiece_Graveyard_Warp
+dw $211B : db $05 : dl HeartPiece_Circle_Bushes
+dw $111E : db $05 : dl RupeeNPC_NortheastDarkSwampCave
+dw $1123 : db $05 : dl RupeeNPC_MoldormCave
+dw $1126 : db $06 : dl HeartPiece_Mire_Warp
+dw $1127 : db $05 : dl HeartPiece_Smith_Pegs

-dw $FFFF : db $FF : dl $FFFFFF ; Placeholders
-dw $FFFF : db $FF : dl $FFFFFF
-dw $FFFF : db $FF : dl $FFFFFF ; Aga 1? ($0020)
-dw $FFFF : db $FF : dl $FFFFFF ; Ice Armos? ($001C)
-dw $FFFF : db $FF : dl $FFFFFF ; Lanmolas 2? ($0033)
-dw $FFFF : db $FF : dl $FFFFFF ; Moldorm 2? ($004D)
-dw $FFFF : db $FF : dl $FFFFFF ; Aga 2? ($000D)
 dw $FFFF

 warnpc $B9FA9A
@@ -128,7 +131,7 @@ pad $B9FB00

 ; $B9FB00
 DungeonLabels:
-dw $2550, $2579 ; Sewers
+dw $25A4, $2579 ; Sewers
 dw $2564, $255F ; Hyrule Castle
 dw $2561, $256C ; Eastern Palace
 dw $2560, $256C ; Desert Palace
@@ -154,8 +157,8 @@ dw $2950 ; 03 - small key
 dw $2952 ; 04 - triforce piece
 dw $2955 ; 05 - safety - plus
 dw $2953 ; 06 - less important item - small chest
-dw $2957 ; 07 - map
-dw $2D56 ; 08 - compass
+dw $2D56 ; 07 - compass
+dw $2957 ; 08 - map
 dw $2950 ; 09 - small key
 dw $2951 ; 0A - big key
 dw $295A ; 0B - important inventory item - big chest
@@ -165,6 +168,25 @@ dw $2952 ; 0E - triforce piece
 dw $295B ; 0F - triforce

 ; $B9FB60
+NpcItems:
+dw $10E3 : dl $7EF411 : db $80 ; Magic Bat
+dw $1102 : dl $7EF410 : db $04 ; Sick Kid
+dw $1105 : dl $7EF410 : db $10 ; Sahasrahla
+dw $1109 : dl $7EF411 : db $20 ; Potion Shop
+dw $1121 : dl $7EF411 : db $04 ; Blacksmith
+dw $FFFF
+
+warnpc $B9FBA0
+padbyte $FF
+pad $B9FBA0
+
+; $B9FBA0
+; Currently these two are hard-coded checks
+; but maybe that will change if more show up someday?
+MiscLocations2:
+dw $1055 : dw $7EF3C6 : db $01 : dl UncleItem
+dw $2107 : dw $7EF410 : db $80 : dl LibraryItem
+dw $FFFF

 warnpc $B9FE00
 org $B9FE00
@@ -231,5 +253,9 @@ AlwaysShowCompass:
 	db $01

 ; $B9FF12
+ShowLootOnMap:
+	db $01
+
+; $B9FF13
 ShowLootInHUD:
 	db $01
--- a/hooks.asm
+++ b/hooks.asm
@@ -1117,7 +1117,8 @@ JSL CompareBombsToMax : NOP #11
 org $85FC7E ; <- 2FC7E - sprite_dash_item.asm : 118 (LDA $7EF36F : INC A : STA $7EF36F)
 JSL GiveBonkItem : NOP #5
 org $85FC97 ; <- 2FC97 - sprite_dash_item.asm : 126 (LDA.b #$2F : JSL Sound_SetSfx3PanLong)
-NOP #6
+JSL UpdateLootHUD
+NOP #2
 ;--------------------------------------------------------------------------------
 org $868D39 ; <- 30D39 - sprite_prep.asm : 1435 - (LDA.b #$08 : STA $0F50, X)
 JSL LoadBonkItemGFX
@@ -1643,7 +1644,8 @@ JSL FixAga2Bunny : NOP
 ; Open Mode Fixes
 ;--------------------------------------------------------------------------------
 org $85DF65 ; <- 2DF65 - sprite_uncle_and_priest.asm:994 - (LDA.b #$01 : STA $7EF3C5)
-NOP #6
+JSL UpdateLootHUD
+NOP #2
 ;--------------------------------------------------------------------------------
 org $85EDDF ; <- 2EDDF - sprite_zelda.asm:398 - (LDA.b #$02 : STA $7EF3C5)
 JSL EndRainState : NOP #2
@@ -2758,6 +2760,13 @@ JSL MimicDirection
 org $828068
 JSL AdjustDefaultGraphics

+;================================================================================
+;--------------------------------------------------------------------------------
+; Remove Overwriting HUD gfx on game over
+;--------------------------------------------------------------------------------
+org $809038
+RTS
+
 ;================================================================================
 ;--------------------------------------------------------------------------------
 ; Dungeon Indicator VRAM overwrite
@@ -2765,6 +2774,9 @@ JSL AdjustDefaultGraphics
 org $828190
 JSL LoadDungeonIndicator

+org $829AA2
+JSL LoadDungeonIndicator
+
 ;================================================================================
 ; Special Weapons Modes
 ;--------------------------------------------------------------------------------
--- a/itemtext.asm
+++ b/itemtext.asm
@@ -46,7 +46,7 @@ dw $7F7F

 ; Ganons Tower
 Notice_GTower:
-db $76 : dw "Ganons Tower"
+db $76 : dw "Ganon's Tower"
 dw $7F7F

 ; Turtle Rock
@@ -81,7 +81,7 @@ dw $7F7F

 ; Dark Palace
 Notice_PoD:
-db $76 : dw "Dark Palace"
+db $76 : dw "Palace of Darkness"
 dw $7F7F

 ; Swamp Palace
--- a/keydrop/standing_items.asm
+++ b/keydrop/standing_items.asm
@@ -360,7 +360,7 @@ ClearSpriteData:
 			STZ.w SprSourceItemId, X : STZ.w SprItemReceipt, X : STZ.w SprItemMWPlayer, X
 			STZ.w SprRedrawFlag, X
 			DEX : BPL .loop
-		JSL UpdateLootHUD
+		JSL ClearLootHUD
 	PLX
 	RTL

--- a/menu/door_connectors.3bpp
+++ b/menu/door_connectors.3bpp
--- a/menu/door_connectors.3bppc
+++ b/menu/door_connectors.3bppc
--- a/menu/dr_sheet_dc.2bpp
+++ b/menu/dr_sheet_dc.2bpp
--- a/menu/dr_sheet_dc.2bppc
+++ b/menu/dr_sheet_dc.2bppc
--- a/multiworld.asm
+++ b/multiworld.asm
@@ -123,6 +123,11 @@ GetMultiworldItem:
 		BRL .return
 	+

+	LDA.b LinkPushDirection
+	BEQ +
+		BRL .return
+	+
+
 	LDA.l !MULTIWORLD_ITEM : BNE +
 		BRL .return
 	+
--- a/newhud.asm
+++ b/newhud.asm
@@ -309,13 +309,13 @@ MagicMeterColorMasks:
 ;================================================================================
 PrizeIconTiles_Transparent:
 dw $0000  ; no icon
-dw $2978  ; crystal 1
-dw $2979  ; crystal 2
-dw $297A  ; crystal 3
-dw $297B  ; crystal 4
-dw $297C  ; crystal 5
-dw $297D  ; crystal 6
-dw $297E  ; crystal 7
+dw $2891  ; crystal 1
+dw $2892  ; crystal 2
+dw $2893  ; crystal 3
+dw $2894  ; crystal 4
+dw $2895  ; crystal 5
+dw $2896  ; crystal 6
+dw $2897  ; crystal 7
 dw $2963  ; green pendant
 dw $295E  ; blue pendant
 dw $296E  ; red pendant
--- a/newitems.asm
+++ b/newitems.asm
@@ -155,8 +155,8 @@ AddReceivedItemExpandedGetItem:
 	PHA : LDA.l !MULTIWORLD_ITEM_PLAYER_ID : BEQ +
 		PLA : BRA .done
 	+ PLA
-        JSR ItemBehavior
-        SEP #$30
+	JSR ItemBehavior
+	SEP #$30
 .done
 	PLB : PLX
 	LDA.w ItemReceiptMethod : CMP.b #$01 ; thing we wrote over
@@ -229,13 +229,13 @@ ItemBehavior:
        JSR .increment_sword
        RTS

-		.fighter_shield
+        .fighter_shield
        .red_shield
        .mirror_shield
        SEP #$10
        LDA.l ProgressiveFlag : BEQ +
-		   LDA.l HighestShield : INC : TAX
-		   JSR .increment_shield
+            LDA.l HighestShield : INC : TAX
+            JSR .increment_shield
        + RTS

        .blue_mail
@@ -269,7 +269,7 @@ ItemBehavior:
        .prog_shield
        SEP #$10
        LDA.l HighestShield : INC : TAX
-		JSR .increment_shield
+        JSR .increment_shield
        REP #$10
        RTS

@@ -282,13 +282,13 @@ ItemBehavior:

        .bow
        BIT.b #$40 : BNE .silversbow
-                LDA.b #$01 : STA.l BowEquipment
+            LDA.b #$01 : STA.l BowEquipment
        RTS

        .silversbow
        LDA.l BowTracking : ORA.b #$40 : STA.l BowTracking
        LDA.l SilverArrowsUseRestriction : BNE +
-                LDA.b #03 : STA.l BowEquipment ; set bow to silver
+            LDA.b #03 : STA.l BowEquipment ; set bow to silver
        +
        LDA.b #$01 : STA.l BowEquipment
        RTS
@@ -331,16 +331,16 @@ ItemBehavior:
        .bow_and_arrows
        LDA.l BowTracking : BIT.b #$40 : BEQ .no_silvers
        LDA.l SilverArrowsUseRestriction : BNE .no_silvers
-                LDA.l CurrentArrows : BEQ +
-                        LDA.b #04 : STA.l BowEquipment
-                        BRA .store_bow
-                +
-                LDA.b #$03
+            LDA.l CurrentArrows : BEQ +
+                LDA.b #04 : STA.l BowEquipment
                BRA .store_bow
+            +
+            LDA.b #$03
+            BRA .store_bow
        .no_silvers
        LDA.l CurrentArrows : BEQ +
-                LDA.b #02
-                BRA .store_bow
+            LDA.b #02
+            BRA .store_bow
        +
        LDA.b #$01
        .store_bow
@@ -350,13 +350,13 @@ ItemBehavior:
        .silver_bow
        LDA.b #$40 : ORA.l BowTracking : STA.l BowTracking
        LDA.l SilverArrowsUseRestriction : BNE .noequip
-                LDA.l SilverArrowsAutoEquip : AND.b #$01 : BEQ .noequip
-                LDA.l CurrentArrows : BNE + ; check arrows
-                                LDA.b #$03 : BRA ++ ; bow without arrow
-                        +
-                        LDA.b #$04 ; bow with arrow
-                ++
-                STA.l BowEquipment
+            LDA.l SilverArrowsAutoEquip : AND.b #$01 : BEQ .noequip
+            LDA.l CurrentArrows : BNE + ; check arrows
+                    LDA.b #$03 : BRA ++ ; bow without arrow
+                +
+                LDA.b #$04 ; bow with arrow
+            ++
+            STA.l BowEquipment
        .noequip
        RTS

@@ -385,7 +385,7 @@ ItemBehavior:
        .master_sword_safe
        SEP #$10
        LDA.l SwordEquipment : CMP.b #$02 : !BGE + ; skip if we have a better sword
-                LDA.b #$02 : STA.l SwordEquipment ; set master sword
+            LDA.b #$02 : STA.l SwordEquipment ; set master sword
        +
        LDX.b #$02
        JSR .increment_sword
@@ -426,20 +426,20 @@ ItemBehavior:
        .silver_arrows
        LDA.l BowTracking : ORA.b #$40 : STA.l BowTracking
        LDA.l SilverArrowsUseRestriction : BNE ++
-                LDA.l SilverArrowsAutoEquip : AND.b #$01 : BEQ ++
-                        LDA.l BowEquipment : BEQ ++ : CMP.b #$03 : !BGE +
-                                !ADD.b #$02 : STA.l BowEquipment ; switch to silver bow
-                        +
-                ++
+            LDA.l SilverArrowsAutoEquip : AND.b #$01 : BEQ ++
+                LDA.l BowEquipment : BEQ ++ : CMP.b #$03 : !BGE +
+                    !ADD.b #$02 : STA.l BowEquipment ; switch to silver bow
+                +
+            ++
        LDA.l ArrowMode : BEQ +
-                LDA.b #$01 : STA.l ArrowsFiller
+            LDA.b #$01 : STA.l ArrowsFiller
        +
        RTS

        .single_arrow
        LDA.l ArrowMode : BEQ +
-                LDA.l CurrentArrows : INC : STA.l CurrentArrows ; Should be sole write to this address
-                LDA.b #$01 : STA.l UpdateHUDFlag                             ; in retro/rupee bow mode.
+            LDA.l CurrentArrows : INC : STA.l CurrentArrows ; Should be sole write to this address
+            LDA.b #$01 : STA.l UpdateHUDFlag                             ; in retro/rupee bow mode.
        +
        RTS

@@ -474,7 +474,7 @@ ItemBehavior:
        .triforce
        LDA.b OverworldIndex : CMP.b #$80 : BNE +
        LDA.b LinkPosX+1 : BNE +
-                JSL ActivateGoal
+            JSL ActivateGoal
        +
        RTS

@@ -484,10 +484,10 @@ ItemBehavior:
        LDA.l GoalCounter : INC : STA.l GoalCounter
        CMP.w GoalItemRequirement : BCC +
        LDA.l TurnInGoalItems : AND.w #$00FF : BNE +
-                SEP #$20 ; set 8-bit accumulator
-                LDA.b OverworldIndex : CMP.b #$80 : BNE +
-                LDA.b LinkPosX+1 : BNE +
-                        JSL ActivateGoal
+            SEP #$20 ; set 8-bit accumulator
+            LDA.b OverworldIndex : CMP.b #$80 : BNE +
+            LDA.b LinkPosX+1 : BNE +
+                JSL ActivateGoal
        +
        SEP #$20 ; set 8-bit accumulator
        RTS
@@ -559,8 +559,8 @@ ItemBehavior:
        LSR
        AND.w #$000F : TAX
        ASL : CMP.w DungeonID : BEQ .same_dungeon
-                LDA.l DungeonKeys,X : INC : STA.l DungeonKeys,X
-                RTS
+            LDA.l DungeonKeys,X : INC : STA.l DungeonKeys,X
+            RTS
        .same_dungeon
        SEP #$20
        LDA.l CurrentSmallKeys : INC : STA.l CurrentSmallKeys : STA.l DungeonKeys,X
@@ -575,69 +575,69 @@ ItemBehavior:

        .hc_smallkey
        LDA.w DungeonID : CMP.b #$03 : BCC .same_dungeon_hc
-                LDA.l HyruleCastleKeys : INC : STA.l HyruleCastleKeys
-                LDA.l SewerKeys : INC : STA.l SewerKeys
-                RTS
+            LDA.l HyruleCastleKeys : INC : STA.l HyruleCastleKeys
+            LDA.l SewerKeys : INC : STA.l SewerKeys
+            RTS

        .generic_smallkey
        LDA.l GenericKeys : BEQ .normal
-                LDA.l CurrentSmallKeys : INC
-                STA.l CurrentGenericKeys : STA.l CurrentSmallKeys
-                RTS
+            LDA.l CurrentSmallKeys : INC
+            STA.l CurrentGenericKeys : STA.l CurrentSmallKeys
+            RTS
        .normal
        LDA.w DungeonID : BMI +
-                LDA.l CurrentSmallKeys : INC : STA.l CurrentSmallKeys
-                RTS
+            LDA.l CurrentSmallKeys : INC : STA.l CurrentSmallKeys
+            RTS
        +
        RTS

        .increment_sword
        LDA.l HighestSword
        INC : STA.b Scrap04 : CPX.b Scrap04 : BCC + ; don't increment unless we're getting a better sword
-                TXA : STA.l HighestSword
+            TXA : STA.l HighestSword
        +
        RTS

        .increment_shield
        LDA.l HighestShield
        INC : STA.b Scrap04 : CPX.b Scrap04 : BCC + ; don't increment unless we're getting a better shield
-                TXA : STA.l HighestShield
+            TXA : STA.l HighestShield
        +
        RTS

        .increment_mail
        LDA.l HighestMail
        INC : STA.b Scrap04 : CPX.b Scrap04 : BCC +   ; don't increment unless we're getting a better mail
-                TXA : STA.l HighestMail
+            TXA : STA.l HighestMail
        +
        RTS

        .increment_bigkey
        SEP #$20
        LDA.l StatsLocked : BNE +
-                LDA.l BigKeysBigChests
-                CLC : ADC.b #$10
-                STA.l BigKeysBigChests
+            LDA.l BigKeysBigChests
+            CLC : ADC.b #$10
+            STA.l BigKeysBigChests
        +
        RTS

        .increment_map
        SEP #$20
        LDA.l StatsLocked : BNE +
-                LDA.l MapsCompasses
-                CLC : ADC.b #$10
-                STA.l MapsCompasses
-                JSL MaybeFlagMapTotalPickup
+            LDA.l MapsCompasses
+            CLC : ADC.b #$10
+            STA.l MapsCompasses
+            JSL MaybeFlagMapTotalPickup
        +
        RTS

        .increment_compass
        SEP #$20
        LDA.l StatsLocked : BNE +
-                LDA.l MapsCompasses : INC : AND.b #$0F : TAX
-                LDA.l MapsCompasses : AND.b #$F0 : STA.l MapsCompasses
-                TXA : ORA.l MapsCompasses : STA.l MapsCompasses
-                JSL MaybeFlagCompassTotalPickup
+            LDA.l MapsCompasses : INC : AND.b #$0F : TAX
+            LDA.l MapsCompasses : AND.b #$F0 : STA.l MapsCompasses
+            TXA : ORA.l MapsCompasses : STA.l MapsCompasses
+            JSL MaybeFlagCompassTotalPickup
        +
        RTS

@@ -647,7 +647,7 @@ ItemBehavior:
        SEC : SBC.b #$37
        TAX
        LDA.w PendantMasks,X : AND.l PendantsField : BNE +
-                LDA.l PendantCounter : INC : STA.l PendantCounter
+            LDA.l PendantCounter : INC : STA.l PendantCounter
        +
        RTS

@@ -663,15 +663,15 @@ ItemBehavior:
        LDA.w #$0000
        SEC
        -
-                ROL
-                DEX
+            ROL
+            DEX
        BPL -
        SEP #$20
        TAX
        AND.l CrystalsField : BNE +
-                TXA
-                ORA.l CrystalsField : STA.l CrystalsField
-                LDA.l CrystalCounter : INC : STA.l CrystalCounter
+            TXA
+            ORA.l CrystalsField : STA.l CrystalsField
+            LDA.l CrystalCounter : INC : STA.l CrystalCounter
        +
        .done
        RTS
@@ -682,56 +682,56 @@ ItemBehavior:
        .bee_trap
        SEP #$30
        LDA.b #$79 : JSL Sprite_SpawnDynamically : BMI + ; DashBeeHive_SpawnBee
-                LDA.b LinkPosX : CLC : ADC.b #$03 : AND.b #$F8 : STA.w SpritePosXLow,Y
-                LDA.b LinkPosX+1 : ADC.b #$00 : STA.w SpritePosXHigh,Y ; round X to nearest 8
-                LDA.b LinkPosY : STA.w SpritePosYLow, Y : LDA.b LinkPosY+1 : STA.w SpritePosYHigh, Y
-                LDA.b LinkLayer : STA.w SpriteLayer,Y ; spawns on same layer as link
+            LDA.b LinkPosX : CLC : ADC.b #$03 : AND.b #$F8 : STA.w SpritePosXLow,Y
+            LDA.b LinkPosX+1 : ADC.b #$00 : STA.w SpritePosXHigh,Y ; round X to nearest 8
+            LDA.b LinkPosY : STA.w SpritePosYLow, Y : LDA.b LinkPosY+1 : STA.w SpritePosYHigh, Y
+            LDA.b LinkLayer : STA.w SpriteLayer,Y ; spawns on same layer as link
        +
        RTS

        .good_bee
        SEP #$30
        LDA.b #$79 : JSL Sprite_SpawnDynamically : BMI + ; DashBeeHive_SpawnBee
-                LDA.b LinkPosX : CLC : ADC.b #$03 : AND.b #$F8 : STA.w SpritePosXLow,Y
-                LDA.b LinkPosX+1 : ADC.b #$00 : STA.w SpritePosXHigh,Y ; round X to nearest 8
-                LDA.b LinkPosY : STA.w SpritePosYLow, Y : LDA.b LinkPosY+1 : STA.w SpritePosYHigh, Y
-                LDA.b LinkLayer : STA.w SpriteLayer,Y ; spawns on same layer as link
-                JSL GoldBee_SpawnSelf_SetProperties
+            LDA.b LinkPosX : CLC : ADC.b #$03 : AND.b #$F8 : STA.w SpritePosXLow,Y
+            LDA.b LinkPosX+1 : ADC.b #$00 : STA.w SpritePosXHigh,Y ; round X to nearest 8
+            LDA.b LinkPosY : STA.w SpritePosYLow, Y : LDA.b LinkPosY+1 : STA.w SpritePosYHigh, Y
+            LDA.b LinkLayer : STA.w SpriteLayer,Y ; spawns on same layer as link
+            JSL GoldBee_SpawnSelf_SetProperties
        +
        RTS

        .apples
        SEP #$30
        LDA.b #$AC : JSL Sprite_SpawnDynamically : BMI +
-                LDA.b LinkPosX : CLC : ADC.b #$03 : AND.b #$F8 : STA.w SpritePosXLow,Y
-                LDA.b LinkPosX+1 : ADC.b #$00 : STA.w SpritePosXHigh,Y ; round X to nearest 8
-                LDA.b LinkPosY : SEC : SBC.b #$10 : STA.w SpritePosYLow,Y
-                LDA.b LinkPosY+1 : SBC.b #$00 : STA.w SpritePosYHigh,Y ; move up 16 pixels
-                LDA.b LinkLayer : STA.w SpriteLayer,Y ; spawns on same layer as link
-                LDA.b #$FF : STA.w EnemyStunTimer,Y ; allows them to expire
+            LDA.b LinkPosX : CLC : ADC.b #$03 : AND.b #$F8 : STA.w SpritePosXLow,Y
+            LDA.b LinkPosX+1 : ADC.b #$00 : STA.w SpritePosXHigh,Y ; round X to nearest 8
+            LDA.b LinkPosY : SEC : SBC.b #$10 : STA.w SpritePosYLow,Y
+            LDA.b LinkPosY+1 : SBC.b #$00 : STA.w SpritePosYHigh,Y ; move up 16 pixels
+            LDA.b LinkLayer : STA.w SpriteLayer,Y ; spawns on same layer as link
+            LDA.b #$FF : STA.w EnemyStunTimer,Y ; allows them to expire
        +
        RTS

        .fairy
        SEP #$30
        LDA.b #$E3 : JSL Sprite_SpawnDynamically : BMI +
-                LDA.b LinkPosX : CLC : ADC.b #$03 : AND.b #$F8 : STA.w SpritePosXLow,Y
-                LDA.b LinkPosX+1 : ADC.b #$00 : STA.w SpritePosXHigh,Y ; round X to nearest 8
-                LDA.b LinkPosY : SEC : SBC.b #$10 : STA.w SpritePosYLow,Y
-                LDA.b LinkPosY+1 : SBC.b #$00 : STA.w SpritePosYHigh,Y ; move up 16 pixels
-                LDA.b LinkLayer : STA.w SpriteLayer,Y ; spawns on same layer as link
-                LDA.b #$FF : STA.w EnemyStunTimer,Y ; allows them to expire
+            LDA.b LinkPosX : CLC : ADC.b #$03 : AND.b #$F8 : STA.w SpritePosXLow,Y
+            LDA.b LinkPosX+1 : ADC.b #$00 : STA.w SpritePosXHigh,Y ; round X to nearest 8
+            LDA.b LinkPosY : SEC : SBC.b #$10 : STA.w SpritePosYLow,Y
+            LDA.b LinkPosY+1 : SBC.b #$00 : STA.w SpritePosYHigh,Y ; move up 16 pixels
+            LDA.b LinkLayer : STA.w SpriteLayer,Y ; spawns on same layer as link
+            LDA.b #$FF : STA.w EnemyStunTimer,Y ; allows them to expire
        +
        RTS

        .chicken
        SEP #$30
        LDA.b #$0B : JSL Sprite_SpawnDynamically : BMI +
-                LDA.b LinkPosX : CLC : ADC.b #$03 : AND.b #$F8 : STA.w SpritePosXLow,Y
-                LDA.b LinkPosX+1 : ADC.b #$00 : STA.w SpritePosXHigh,Y ; round X to nearest 8
-                LDA.b LinkPosY : SEC : SBC.b #$08 : STA.w SpritePosYLow,Y
-                LDA.b LinkPosY+1 : SBC.b #$00 : STA.w SpritePosYHigh,Y ; move up 8 pixels
-                LDA.b LinkLayer : STA.w SpriteLayer,Y ; spawns on same layer as link
+            LDA.b LinkPosX : CLC : ADC.b #$03 : AND.b #$F8 : STA.w SpritePosXLow,Y
+            LDA.b LinkPosX+1 : ADC.b #$00 : STA.w SpritePosXHigh,Y ; round X to nearest 8
+            LDA.b LinkPosY : SEC : SBC.b #$08 : STA.w SpritePosYLow,Y
+            LDA.b LinkPosY+1 : SBC.b #$00 : STA.w SpritePosYHigh,Y ; move up 8 pixels
+            LDA.b LinkLayer : STA.w SpriteLayer,Y ; spawns on same layer as link
        +
        RTS

@@ -804,7 +804,7 @@ ResolveLootID:
        CMP.l ProgressiveSwordLimit : BCC +
                LDA.l ProgressiveSwordReplacement
                JMP .get_item
-			++ LDA.l SwordEquipment
+        ++ LDA.l SwordEquipment
        +
        TAX
        LDA.w .prog_sword_ids,X
@@ -820,7 +820,7 @@ ResolveLootID:
        CMP.l ProgressiveShieldLimit : BCC +
                LDA.l ProgressiveShieldReplacement
                JMP .get_item
-        	++ LDA.l HighestShield
+        ++ LDA.l HighestShield
        +
        TAX
        LDA.w .shields_ids,X
@@ -836,7 +836,7 @@ ResolveLootID:
                LDA.l ProgressiveArmorReplacement
                JMP .get_item
        +
-        	++ LDA.l ArmorEquipment
+        ++ LDA.l ArmorEquipment
        TAX
        LDA.w .armor_ids,X
        JMP .have_item
--- a/npcitems.asm
+++ b/npcitems.asm
@@ -90,11 +90,17 @@ ItemSet_FairySword:
 RTL

 ItemSet_SmithSword:
-	PHA : LDA.l NpcFlags+1 : ORA.b #$04 : STA.l NpcFlags+1 : PLA
+	PHA
+	LDA.l NpcFlags+1 : ORA.b #$04 : STA.l NpcFlags+1
+	JSL UpdateLootHUD
+	PLA
 RTL

 ItemSet_MagicBat:
-	PHA : LDA.l NpcFlags+1 : ORA.b #$80 : STA.l NpcFlags+1 : PLA
+	PHA
+	LDA.l NpcFlags+1 : ORA.b #$80 : STA.l NpcFlags+1
+	JSL UpdateLootHUD
+	PLA
 RTL

 ItemSet_OldMan:
@@ -110,7 +116,10 @@ RTL
 ItemSet_SickKid:
 	PHA : LDA.l SickKidItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID : PLA
 	JSL Link_ReceiveItem ; thing we wrote over
-	PHA : LDA.l NpcFlags : ORA.b #$04 : STA.l NpcFlags : PLA
+	PHA
+	LDA.l NpcFlags : ORA.b #$04 : STA.l NpcFlags
+	JSL UpdateLootHUD
+	PLA
 RTL

 ItemSet_TreeKid:
@@ -122,7 +131,10 @@ RTL
 ItemSet_Sahasrala:
 	PHA : LDA.l SahasralaItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID : PLA
 	JSL Link_ReceiveItem ; thing we wrote over
-	PHA : LDA.l NpcFlags : ORA.b #$10 : STA.l NpcFlags : PLA
+	PHA
+	LDA.l NpcFlags : ORA.b #$10 : STA.l NpcFlags
+	JSL UpdateLootHUD
+	PLA
 RTL

 ItemSet_Catfish:
@@ -132,7 +144,10 @@ RTL
 ItemSet_Library:
 	PHA : LDA.l LibraryItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID : PLA
 	JSL Link_ReceiveItem ; thing we wrote over
-	PHA : LDA.l NpcFlags : ORA.b #$80 : STA.l NpcFlags : PLA
+	PHA
+	LDA.l NpcFlags : ORA.b #$80 : STA.l NpcFlags
+	JSL UpdateLootHUD
+	PLA
 RTL

 ItemSet_Mushroom:
@@ -149,7 +164,10 @@ ItemSet_Mushroom:
 RTL

 ItemSet_Powder:
-	PHA : LDA.l NpcFlags+1 : ORA.b #$20 : STA.l NpcFlags+1 : PLA
+	PHA
+	LDA.l NpcFlags+1 : ORA.b #$20 : STA.l NpcFlags+1
+	JSL UpdateLootHUD
+	PLA
 RTL
 ;================================================================================

--- a/ram.asm
+++ b/ram.asm
@@ -338,6 +338,7 @@ SpawnedItemFlag = $7E0726         ; 0x02 - one for pot, 2 for sprite drop
 SpawnedItemMWPlayer = $7E0728     ; Player Id for spawned item if Multiworld item 0x02
                                  ;
 EnemyDropIndicator = $7E072A      ; Used by HUD to indicate enemy drops remaining
+NpcItemIndicator = $7E072C        ; Flag used by HUD to indicate NPC item present
 SkipBeeTrapDisguise = $7E072D     ; Flag to skip bee trap disguise during draw routine

 SprDropsItem = $7E0730            ; Array for whether a sprite drops an item 0x16
--- a/tables.asm
+++ b/tables.asm
@@ -237,12 +237,8 @@ db $00
 ;a - Infinite Arrows
 ;--------------------------------------------------------------------------------
 org $B0804E ; PC 0x18004E
-UncleRefill:
+UncleRefill_deprecated: ; no longer used
 db $00
-;---- -mba
-;m - Refill Magic
-;b - Refill Bombs
-;a - Refill Arrows
 ;--------------------------------------------------------------------------------
 org $B0804F ; PC 0x18004F
 ByrnaInvulnerability:
@@ -890,8 +886,8 @@ SilverArrowsAutoEquip:
 db $01 ; #$00 = Off - #$01 = Collection Time (Default) - #$02 = Entering Ganon - #$03 = Collection Time & Entering Ganon
 ;================================================================================
 org $B08183 ; PC 0x180183
-FreeUncleItemAmount:
-dw $12C ; 300 rupees (Default)
+RainDeathRefillRupeeBow:
+dw $012C ; 300 rupees (Default)
 ;--------------------------------------------------------------------------------
 org $B08185 ; PC 0x180185
 RainDeathRefillTable:
--- a/vanillalabels.asm
+++ b/vanillalabels.asm
@@ -292,6 +292,7 @@ EntranceData_song                                          = $82D592
 SpawnPointData_room_id                                     = $82D8D2
 Overworld_CheckForSpecialOverworldTrigger_Direction        = $84E879
 RoomHeaderPointers                                         = $84F1E2
+UncleItem                                                  = $85DF45
 Sprite_ShowSolicitedMessage_Direction                      = $85E1A3
 FluteMenuNumbers_bits                                      = $8AB7A3
 WorldMap_RedXChars                                         = $8ABF70
--- a/zelda.asm
+++ b/zelda.asm
@@ -1,10 +1,14 @@
 ;--------------------------------------------------------------------------------
 EndRainState:
-        LDA.l InitProgressIndicator : BIT.b #$80 : BNE + ; check for instant post-aga
-                LDA.b #$02 : STA.l ProgressIndicator
-                RTL
+	LDA.l InitProgressIndicator : BIT.b #$80 : BEQ + ; check for instant post-aga
+		LDA.l InitLumberjackOW : STA.l OverworldEventDataWRAM+$02
+		LDA.b #$03
+		BRA ++
 	+
-        LDA.b #$03 : STA.l ProgressIndicator
-        LDA.l InitLumberjackOW : STA.l OverworldEventDataWRAM+$02
+	LDA.b #$02
+	++
+	STA.l ProgressIndicator
+
+	JSL SetEscapeAssist
 RTL
 ;--------------------------------------------------------------------------------
Author	SHA1	Message	Date
Kara Alexandra	6b3a05b9de	Fix map/compass icons	2026-05-28 22:34:51 -05:00
Kara Alexandra	4168bdbeb6	Shift item tiers slightly -> map above compass, small keys in dungeon higher	2026-05-28 06:29:14 -05:00
Kara Alexandra	67a1ebb50c	Update crystal indicator icons on HUD	2026-05-27 23:16:04 -05:00
Kara Alexandra	85ea4477d2	NPC icon for NPC requiring item turnin; include standing items in loot HUD as well	2026-05-27 23:01:02 -05:00
Kara Alexandra	05172929a3	Clean up loot icon room transition handling	2026-05-25 00:16:48 -05:00
Kara Alexandra	e749b6d6bc	Fix several foutonFindings: - Dark Palace -> Palace of Darkness - show dungeon name for multi keys - fix IP block drop lock - HUD improvements	2026-05-24 19:09:33 -05:00
Kara Alexandra	333159ac53	Unify standard escape ammo fills	2026-05-19 22:44:21 -05:00
Kara Alexandra	2f404873b8	Fix dungeon indicator not updating on falling into dungeons	2026-05-16 21:27:22 -05:00
Kara Alexandra	fd3f7f4513	Fix loothud on door rando transitions	2026-05-16 21:10:09 -05:00