Unmark MapSwapping as NYI

HUD as well

LTTP_RND_GeneralBugfixes.asm

@@ -213,6 +213,7 @@ incsrc gk/variable_ganon_vulnerability.asm
 incsrc gk/pseudoflute.asm
 incsrc gk/fast_junk.asm
 incsrc gk/dungeon_maps.asm
+incsrc gk/dungeon_indicator.asm
 print "End of B9: ", pc
 
 warnpc $B9EE00

bugfixes.asm

@@ -246,7 +246,7 @@ FixSwimBump:
 .normal
 	LDA.b LinkJumping : BNE .continue ; what we wrote over
 .not_diving
-	PLA : PLA : PEA.w $87964E ; skip ahead, not diving
+	PLA : PLA : PEA.w $87964D ; skip ahead, not diving
 .continue
 	RTL
 ;--------------------------------------------------------------------------------

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:

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
+RTL
-	.rain
+.rain
-		LDA.l StartingEntrance
+	LDA.l StartingEntrance : BEQ .uncle
-		+ CMP.b #$03 : BNE + ; Uncle
+	CMP.b #$03 : BNE + ; Uncle
-			%SetMinimum(CurrentMagic,MagicFiller,RainDeathRefillMagic_Uncle)
+		.uncle
-			%SetMinimum(BombsEquipment,BombsFiller,RainDeathRefillBombs_Uncle)
+		LDA.l RainDeathRefillMagic_Uncle : JSR .refillMagic
-			LDA.l ArrowMode : BEQ ++
+		LDA.l RainDeathRefillBombs_Uncle : JSR .refillBombs
-			LDA.l BowEquipment : BEQ +++
+		LDA.l ArrowMode : BNE .rupeeBow
-			++ %SetMinimum(CurrentArrows,ArrowsFiller,RainDeathRefillArrows_Uncle)
+		LDA.l RainDeathRefillArrows_Uncle : JSR .refillArrows
-			+++ BRA .done
+		BRA .done
 	+ CMP.b #$02 : BNE + ; Cell
-			%SetMinimum(CurrentMagic,MagicFiller,RainDeathRefillMagic_Cell)
+		LDA.l RainDeathRefillMagic_Cell : JSR .refillMagic
-			%SetMinimum(BombsEquipment,BombsFiller,RainDeathRefillBombs_Cell)
+		LDA.l RainDeathRefillBombs_Cell : JSR .refillBombs
-			LDA.l ArrowMode : BEQ ++
+		LDA.l ArrowMode : BNE .rupeeBow
-			LDA.l BowEquipment : BEQ .done
+		LDA.l RainDeathRefillArrows_Cell : JSR .refillArrows
-			++ %SetMinimum(CurrentArrows,ArrowsFiller,RainDeathRefillArrows_Cell)
 		BRA .done
 	+ CMP.b #$04 : BNE + ; Mantle
-			%SetMinimum(CurrentMagic,MagicFiller,RainDeathRefillMagic_Mantle)
+		LDA.l RainDeathRefillMagic_Mantle : JSR .refillMagic
-			%SetMinimum(BombsEquipment,BombsFiller,RainDeathRefillBombs_Mantle)
+		LDA.l RainDeathRefillBombs_Mantle : JSR .refillBombs
-			LDA.l ArrowMode : BEQ ++
+		LDA.l ArrowMode : BNE .rupeeBow
-			LDA.l BowEquipment : BEQ .done
+		LDA.l RainDeathRefillArrows_Mantle : JSR .refillArrows
-			++ %SetMinimum(CurrentArrows,ArrowsFiller,RainDeathRefillArrows_Mantle)
+		BRA .done
-		+
+	+ BRA .done
-	.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

data/creditscharmapsmall_yellow.txt

@@ -29,3 +29,4 @@ Z=33
 '=35
 -=36
 .=37
+*=FF

dialog.asm

@@ -74,60 +74,71 @@ FreeDungeonItemNotice:
 	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 +
 		%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
@@ -141,7 +152,10 @@ FreeDungeonItemNotice:
 	LDA.l ScratchBufferNV+1
 	ASL : TAX
 	REP #$20
-        LDA.l DungeonItemIDMap,X : CMP.w #$0003 : BCC .hc_sewers
+
+	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

doorrando/doortables.asm

@@ -599,7 +599,7 @@ skip $10
 BigKeyStatus: ;27f040 (status 2 indicate BnC guard)
 dw $0002, $0002, $0001, $0001, $0000, $0001, $0001, $0001, $0001, $0001, $0001, $0001, $0001, $0001, $0000, $0000
 DungeonReminderTable: ;27f060
-dw $2D50, $2D50, $2D51, $2D52, $2D54, $2D56, $2D55, $2D5A, $2D57, $2D59, $2D53, $2D58, $2D5B, $2D5C, $0000, $0000
+dw $2DA4, $2DA4, $2DA5, $2DA6, $2DA8, $2DAA, $2DA9, $2DAE, $2DAB, $2DAD, $2DA7, $2DAC, $2DAF, $2DB0, $0000, $0000
 TotalLocationsLow: ;27f080
 db $08, $08, $06, $06, $02, $00, $04, $08, $08, $08, $06, $08, $02, $07, $00, $00
 TotalLocationsHigh: ;27f090

doorrando/hudadditions.asm

@@ -1,10 +1,12 @@
 !BlankTile = $207F
 !SlashTile = $2830
+!PlusTile = $2404
 !HyphenTile = $2405
 !LTile = $2D68
 !DTile = $2D60
-!RedSquare = $345E
 !BlueSquare = $2C5E
+!BossIcon = $253C
+!NPCIcon = $253B
 
 DrHudOverride:
 	PHB
@@ -29,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 HudItems_enabled : 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
@@ -46,7 +55,7 @@ DRHUD_BossIndicator:
 	SEP #$20
 	BEQ .draw_indicator
 	LDA.l CompassBossIndicator, x : CMP.b RoomIndex : BNE .draw_indicator
-	LDY.w #!RedSquare
+	LDY.w #!BossIcon
 .draw_indicator
 	STY.w HUDMultiIndicator
 	BRA DRHUD_DrawCurrentDungeonIndicator
@@ -71,13 +80,12 @@ DRHUD_DrawCurrentDungeonIndicator: ; mX
 	CMP.b #$06 : BEQ .draw_indicator
 
 .get_indicator
-	REP #$20 : LDA.l DungeonReminderTable,X : TAY
+	LDY.w #$2C28
-	SEP #$20
 .draw_indicator
 	STY.w HUDCurrentDungeonWorld
 
 DRHUD_DrawKeyCounter:
-	LDA.l DRFlags : AND.b #$04 : BEQ DRHUD_Finished
+	LDA.l DRFlags : AND.b #$04 : BEQ .to_finished
 	LDA.l CompassMode : BIT.b #$03 : BEQ DRHUD_Finished
 	REP #$20
 	BIT.w #$0002 : BNE .skip_map_check
@@ -90,8 +98,17 @@ DRHUD_DrawKeyCounter:
 	LDA.l GenericKeys : LSR : BCS .total_only
 	LDA.w DungeonCollectedKeys, X : JSR ConvertToDisplay : STA.w HUDKeysObtained
 	LDA.w #!SlashTile : STA.w HUDKeysSlash
+
+	LDA.l ExtraChestKeys, X : AND.w #$00FF : BEQ .total_only
+	JSR ConvertToDisplay : STA.w HUDKeysExtraCount
+	LDA.w #!PlusTile : STA.w HUDKeysExtraPlus
+
 .total_only
-	LDA.l ChestKeys, x : JSR ConvertToDisplay : STA.w HUDKeysTotal
+	SEP #$20
+	LDA.l ChestKeys, X : SEC : SBC.l ExtraChestKeys, X
+	REP #$20
+	JSR ConvertToDisplay : STA.w HUDKeysTotal
+.to_finished
 	JMP DRHUD_Finished
 
 OWRHUD_DrawWorldIndicator:
@@ -292,17 +309,29 @@ BossStatus:
 	; default palette 3 - white
 	LDA.l DungeonReminderTable, X : RTS
 
-ConvertToDisplay:
+ConvertToDisplay: ; transparent background
-    and.w #$00ff : cmp.w #$000a : !BLT +
+	AND.w #$00FF
-        !ADD.w #$2519 : rts
+		CMP.w #$000A : BCC .under10
-    + !ADD.w #$2490 : rts
+		CMP.w #$000C : BCC .under12
+	.over11
+		CLC : ADC.w #$2553 : RTS
+	.under12
+		CLC : ADC.w #$2519 : RTS
+	.under10
+		CLC : ADC.w #$2490 : RTS
 
-ConvertToDisplay2:
+ConvertToDisplay2: ; solid background
-    and.w #$00ff : beq ++
+	AND.w #$00FF : BEQ .zero
-        cmp.w #$000a : !BLT +
+		CMP.w #$000A : BCC .under10
-            !ADD.w #$2517 : rts ; 2580 with 258A as "A" for non transparent digits
+		CMP.w #$000C : BCC .under12
-        + !ADD.w #$2816 : rts
+	.over11
-    ++ lda.w #$2827 : rts ; 0/O for 0 or placeholder digit ;2483
+		CLC : ADC.w #$2580 : RTS
+	.under12
+		CLC : ADC.w #$2517 : RTS
+	.under10
+		CLC : ADC.w #$2816 : RTS
+	.zero
+		LDA.w #$2827 : RTS
 
 CountAbsorbedKeys:
 	JML IncrementSmallKeysNoPrimary

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
+.abort
-    SEP #$30 : stz.w $045e : lda.b PreviousRoom : and.b #$0f : rtl ; clear,run hijacked code and get out
+    SEP #$30
-    .inroom
+    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
 }

events.asm

@@ -79,29 +79,19 @@ 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 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 ProgressIndicator : BNE +
-                LDA.b #$01 : STA.l ProgressIndicator ; handle rain state
+		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 RainDeathRefillRupeeBow : ORA.l RainDeathRefillRupeeBow+1 : BEQ +
+		LDA.b #$01 : STA.l ArrowsFiller
 	+
 RTL
 ;--------------------------------------------------------------------------------

follower.asm

@@ -857,6 +857,7 @@ RTL
 Kiki_DontScareTheMonke:
     LDA.b LinkJumping : BEQ .return
     CMP.b #$02 : BEQ .no_spook ; needed for quake usage
+    LDA.b GameMode : CMP.b #$0F : BEQ .no_spook ; needed for entrance transitions
     LDA.w NoDamage : BNE .no_spook
     LDA.w LinkThud : BNE .no_spook
 .spook

framehook.asm

@@ -11,12 +11,19 @@ FrameHookAction:
 		LDA.l LoopFrames : INC : STA.l LoopFrames : BNE +
 		LDA.l LoopFrames+2 : INC : STA.l LoopFrames+2
 		+
-                                LDA.l GameMode : CMP.w #$010E : BNE ++ ; move this to nmi hook?
+		; move this to nmi hook?
+		LDA.l GameMode : CMP.w #$010E : BNE +
+		; item select menu
 		LDA.l MenuFrames : INC : STA.l MenuFrames : BNE ++
 		LDA.l MenuFrames+2 : INC : STA.l MenuFrames+2
+		+
+		LDA.l GameMode : CMP.w #$030E : BEQ .map ; underworld map
+		LDA.l GameMode : CMP.w #$070E : BNE ++ ; overworld map
+		.map
+		LDA.l MapFrames : INC : STA.l MapFrames : BNE ++
+		LDA.l MapFrames+2 : INC : STA.l MapFrames+2
 		++
 	REP #$30 : PLA : PLP
-
 RTL
 
 !NMI_MW = "$7F5047"

gk/check_loot.asm

@@ -1,42 +1,43 @@
 ; A = room_id
 ; out A = level of loot
-CheckLoot:
+CheckMapLoot:
 	PHP
 	REP #$30
-	PHB : PHX : PHY
+	PHX
 
 	STA.b $CA
 
-	LDA.b $06 : PHA
 	LDA.b $0E : PHA
 
-	STZ.b $02 ; best item class found
+	LDA.l MapItems_default
-
-	LDA.l ShowItems_default
 	AND.w #$00FF
 	STA.b $0E
 
 	LDA.b $CA
-	AND.w #$00FF
+	AND.w #$01FF
 	ASL A
 	TAX
 
 	LDA.l SaveDataWRAM, X
 	AND.w #$000F
 	BEQ +
-	LDA.l ShowItems_visited_tile
+	LDA.l MapItems_visited_tile
 	AND.w #$00FF
 	CMP.b $0E
 	BCC +
 	STA.b $0E
 
 +	LDA.w DungeonID
+	AND.w #$00FF
+	CMP.w #$00FF
+	BEQ .skip_dungeon_checks
+
 	TAX
 
 	LDA.l MapField
 	AND.l DungeonMask, X
 	BEQ +
-	LDA.l ShowItems_have_map
+	LDA.l MapItems_have_map
 	AND.w #$00FF
 	CMP.b $0E
 	BCC +
@@ -45,13 +46,93 @@ CheckLoot:
 +	LDA.l CompassField
 	AND.l DungeonMask, X
 	BEQ +
-	LDA.l ShowItems_have_compass
+	LDA.l MapItems_have_compass
 	AND.w #$00FF
 	CMP.b $0E
 	BCC +
 	STA.b $0E
 +
 
+.skip_dungeon_checks
+	JMP GetLootLevelAndCleanUp
+
+; A = room_id
+; out A = level of loot
+CheckHudLoot:
+	PHP
+	REP #$30
+	PHX
+
+	STA.b $CA
+
+	LDA.b $0E : PHA
+
++	LDA.w DungeonID
+	AND.w #$00FF
+	CMP.w #$00FF
+	BEQ .cave
+
+	TAX
+
+	LDA.l HudItems_default_dungeon
+	AND.w #$00FF
+	STA.b $0E
+
+	LDA.l MapField
+	AND.l DungeonMask, X
+	BEQ +
+	LDA.l HudItems_have_map
+	AND.w #$00FF
+	CMP.b $0E
+	BCC +
+	STA.b $0E
+
++	LDA.l CompassField
+	AND.l DungeonMask, X
+	BEQ +
+	LDA.l HudItems_have_compass
+	AND.w #$00FF
+	CMP.b $0E
+	BCC +
+	STA.b $0E
++
+
+	BRA GetLootLevelAndCleanUp
+
+.cave
+	LDA.l HudItems_cave
+	AND.w #$00FF
+	STA.b $0E
+	; intentional fall-through
+
+GetLootLevelAndCleanUp:
+	STZ.b $02
+
+	LDA.b $0E
+	AND.w #$00FF
+	BEQ +
+		JSL GetLootLevel
++
+
+	PLA : STA.b $0E
+	PLX
+	PLP
+
+	LDA.b $02
+RTL
+
+; $CA = room_id
+; $0E = level of details to return
+;       (1 - presence, 2 - compass or presence, 3 - value)
+; out $02 = level of loot
+GetLootLevel:
+	PHP
+	REP #$30
+	PHB : PHX : PHY
+	LDA.b $06 : PHA
+
+	STZ.b $02 ; best item class found
+
 	LDA.l ItemSources : BIT.w #$0001 : BEQ +
 	JSR CheckChests
 +
@@ -65,24 +146,25 @@ 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
 	PLY : PLX : PLB
 	PLP
-	LDA.b $02
 	RTL
 
 CheckChests:
 	LDA.b $CA
-	AND.w #$00FF
+	AND.w #$01FF
 	STA.b $00
 	ASL A
 	TAX
@@ -127,25 +209,22 @@ CheckChests:
 .done
 	RTS
 
-CheckBoss:
+CheckMisc:
-	; we assume all bosses are in section 1 of split sections
+	; this includes bosses, bonk torches, and standing items (in caves + hera cage key)
-	; mainly to simplify hera cage key and GT torch
+	; all dungeon items in this section are in section 1 of split sections
-	; which use the same flow
+	; for cave items we'll always know what section we're in
-	; and bosses are always in their own section anyway
+	; 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
+	BIT.w #$F000
-	XBA
+	BNE +
-	CMP.w #$0020
+	ORA.w #$1000
-	BCC +
-	RTS
-
 +
-	LDA.b $CA
+	AND.w #$F1FF
-	AND.w #$00FF
 	STA.b $04
 
 	LDX.w #$FFFA
-.next_boss
+.next_misc
 	INX #6
 	LDA.l MiscLocations, X
 	BPL .check
@@ -153,9 +232,10 @@ CheckBoss:
 
 .check
 	CMP.b $04
-	BNE .next_boss
+	BNE .next_misc
 
 	TXY
+	AND.w #$01FF
 	CMP.b RoomIndex
 	BEQ .current_room
 
@@ -180,7 +260,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
@@ -192,11 +272,28 @@ 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
-	AND.w #$00FF
+	AND.w #$01FF
 	STA.b $04
 
 	LDX.w #$FFFD
@@ -230,9 +327,44 @@ 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 #$00FF
+	AND.w #$01FF
 	ASL A
 	TAX
 
@@ -298,7 +430,7 @@ CheckPots:
 +
 
 	LDA.b $CA
-	AND.w #$00FF
+	AND.w #$01FF
 	ASL A
 	TAX
 if !FEATURE_FIX_BASEROM
@@ -336,7 +468,7 @@ CheckJunkPot:
 	+
 
 	LDA.b $CA
-	AND.w #$00FF
+	AND.w #$01FF
 	ASL A
 	TAX
 	LDA.l PotCollectionRateTable, X
@@ -364,7 +496,7 @@ endif
 
 CheckEnemies:
 	LDA.b $CA
-	AND.w #$00FF
+	AND.w #$01FF
 	ASL A
 	TAX
 
@@ -454,7 +586,7 @@ CheckEnemies:
 +
 
 	LDA.b $CA
-	AND.w #$00FF
+	AND.w #$01FF
 	ASL A
 	TAX
 
@@ -484,13 +616,19 @@ GetLootClass:
 	CMP.w #$0080 : BNE .not_compass
 
 .compass
-	LDA.l AlwaysShowCompass : BNE .check_value
+	LDA.b $0E
+	AND.w #$00FF
+	CMP.w #$0002
+	BEQ .check_value
 
 .not_compass
 	LDA.b $0E
 	BEQ .done
-	CMP.w #$0001
+	CMP.w #$0003
-	BEQ .value_set
+	BCS .check_value
+
+	LDA.w #$0001
+	BRA .value_set
 
 .check_value
 	LDA.l LootTypeMapping, X
@@ -513,9 +651,13 @@ GetPotJunkClass:
 
 	LDA.b $0E
 	BEQ .done
-	CMP.w #$0001
+	CMP.w #$0003
-	BEQ .value_set
+	BCS .check_value
 
+	LDA.w #$0001
+	BRA .value_set
+
+.check_value
 	; hardcode as junk for now
 	LDA.w #$0002
 
@@ -532,7 +674,7 @@ macro DefineGetFooSection(type, offset)
 Get<type>Section:
 	PHX
 	LDA.b $CA
-	AND.w #$00FF
+	AND.w #$01FF
 	ASL A
 	TAX
 	LDA.l SplitRooms, X
@@ -580,13 +722,13 @@ Check<type>Section:
 	STA.b $CC
 
 	LDA.b $CB
-	AND.w #$00FF
+	AND.w #$00F0
 	BEQ .yes
 
 	JSR Get<type>Section
 
 	LDA.b $CB
-	AND.w #$00FF
+	AND.w #$00F0
 	LSR A : LSR A : LSR A : LSR A
 	DEC A
 	CMP.b $CE

gk/data/item_mapping.asm

@@ -3,8 +3,8 @@
 !TIER_LOW_KEY = $03
 !TIER_HEALTH = $05
 !TIER_MINOR = $06
-!TIER_MAP = $07
+!TIER_COMPASS = $07
-!TIER_COMPASS = $08
+!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

gk/data/split_room.asm

@@ -61,7 +61,24 @@ SplitRooms:
 %d(.no) : %d(.d1) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.d6) : %d(.no)
 %d(.no) : %d(.no) : %d(.no) : %d(.db) : %d(.no) : %d(.no) : %d(.no) : %d(.no)
 
-%d(.no)
+; E0
+%d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no)
+%d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no)
+
+; F0
+%d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no)
+%d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no)
+
+; 100
+%d(.no) : %d(.101) : %d(.no) : %d(.103) : %d(.no) : %d(.no) : %d(.106) : %d(.107)
+%d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.10c) : %d(.no) : %d(.10e) : %d(.no)
+
+; 110
+%d(.no) : %d(.no) : %d(.112) : %d(.no) : %d(.114) : %d(.115) : %d(.no) : %d(.no)
+%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(.127)
 
 .no
 db $00
@@ -435,7 +452,7 @@ db $01
 %d(..areas) : %d(..doors) : %d(.no_items) : %d(.no_items) : %d(.no_items) : %d(.no_items)
 ..areas
 db $02, $00, $80, $00, $FF
-db $01, $34, $D4, $B8, $FF
+db $01, $34, $44, $B4, $FF
 db $FF
 ..doors
 db $03, $06
@@ -569,3 +586,344 @@ db $FF
 ..chests
 db $01
 db $FF
+
+.101 ; East Snitch House (2) // West Snitch House (1)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(.no_items) : %d(..pots) : %d(..enemies)
+..areas
+db $03, $00, $7F, $00, $FF
+db $FF
+..doors
+db $06
+db $FF
+..pots
+db $00
+db $FF
+..enemies
+db $00
+db $FF
+
+.103 ; Man With Beds (3) // Front of Tavern (2) // Back of Tavern (1)
+db $02
+%sq($00)
+%d(..areas3) : %d(..doors3) : %d(.no_items)
+%d(.no_items) : %d(.no_items) : %d(..enemies3)
+%sq($00)
+%d(..areas2) : %d(..doors2) : %d(.no_items)
+%d(.no_items) : %d(..pots2) : %d(..enemies2)
+..areas3
+db $03, $80, $FF, $00, $FF
+db $FF
+..doors3
+db $08
+db $FF
+..enemies3
+db $02
+db $FF
+..areas2
+db $03, $00, $7F, $50, $FF
+db $FF
+..doors2
+db $06
+db $FF
+..pots2
+db $02
+db $FF
+..enemies2
+db $00
+db $01
+db $FF
+
+.106 ; VoO Chest Game (2) // Brewery (1)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(.no_items) : %d(.no_items) : %d(..enemies)
+..areas
+db $03, $00, $7F, $00, $FF
+db $FF
+..doors
+db $06
+db $FF
+..enemies
+db $00
+db $FF
+
+.107 ; Library (2) // Bomb Refill Hut (1)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(.no_items) : %d(.no_items) : %d(.no_items)
+..areas
+db $03, $00, $7F, $00, $FF
+db $FF
+..doors
+db $06
+db $FF
+
+.10c ; Mimic Cave (2) // Hookshot Fairy Pot (1)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(..chests) : %d(.no_items) : %d(..enemies)
+..areas
+db $03, $00, $7F, $00, $FF
+db $FF
+..doors
+db $06
+db $FF
+..chests
+db $00
+db $FF
+..enemies
+db $04
+db $05
+db $06
+db $07
+db $FF
+
+.10e ; Storyteller (2) // Storyteller (1)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(.no_items) : %d(.no_items) : %d(..enemies)
+..areas
+db $03, $00, $7F, $00, $FF
+db $FF
+..doors
+db $06
+db $FF
+..chests
+db $FF
+..pots
+db $FF
+..enemies
+db $00
+db $FF
+
+.112 ; Dark Chapel (2) // Store (1)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(.no_items) : %d(.no_items) : %d(..enemies)
+..areas
+db $03, $00, $7F, $00, $FF
+db $FF
+..doors
+db $06
+db $FF
+..enemies
+db $00
+db $FF
+
+.114 ; Waterfall Fairy (2) // Hint NPC (1)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(..chests) : %d(.no_items) : %d(..enemies)
+..areas
+db $03, $00, $7F, $00, $FF
+db $FF
+..doors
+db $06
+db $FF
+..chests
+db $00
+db $01
+db $FF
+..enemies
+db $00
+db $FF
+
+.115 ; Capacity Fairy (1) // Healing Fairy (2)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(.no_items) : %d(.no_items) : %d(..enemies)
+..areas
+db $03, $80, $FF, $80, $FF
+db $FF
+..doors
+db $08
+db $FF
+..enemies
+db $00
+db $FF
+
+.11b ; Cave 45 (2) // Graveyard Ledge (1)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(.no_items) : %d(..pots) : %d(..enemies)
+..areas
+db $03, $00, $7F, $00, $FF
+db $FF
+..doors
+db $06
+db $FF
+..pots
+db $00
+db $01
+db $02
+db $03
+db $04
+db $05
+db $FF
+..enemies
+db $01
+db $FF
+
+.11c ; Bomb Shop (2) // C-Shaped House (1)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(.no_items) : %d(.no_items) : %d(..enemies)
+..areas
+db $03, $00, $7F, $00, $FF
+db $FF
+..doors
+db $06
+db $FF
+..enemies
+db $00
+db $FF
+
+.11e ; Long Fairy Cave (2) // Hype Cave (1)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(.no_items) : %d(.no_items) : %d(..enemies)
+..areas
+db $03, $00, $7F, $00, $FF
+db $FF
+..doors
+db $06
+db $FF
+..enemies
+db $00
+db $01
+db $02
+db $03
+db $FF
+
+.11f ; Lumberjack House (1) // Store (2)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(.no_items) : %d(.no_items) : %d(..enemies)
+..areas
+db $03, $80, $FF, $00, $FF
+db $FF
+..doors
+db $08
+db $FF
+..enemies
+db $00
+db $FF
+
+.120 ; Ice Rod Cave (1) // Cool Bee Cave (2)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(.no_items) : %d(.no_items) : %d(..enemies)
+..areas
+db $03, $80, $FF, $00, $FF
+db $03, $80, $FF, $00, $FF
+db $FF
+..doors
+db $08
+db $FF
+..enemies
+db $00
+db $01
+db $02
+db $FF
+
+.122 ; Fortune Teller (2) // Other Fortune Teller (1)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(.no_items) : %d(.no_items) : %d(..enemies)
+..areas
+db $03, $00, $7F, $00, $FF
+db $FF
+..doors
+db $06
+db $FF
+..enemies
+db $00
+db $FF
+
+.124 ; 50-Rupee Cave (1) // Bonk Rocks (2)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(..chests) : %d(.no_items) : %d(.no_items)
+..areas
+db $03, $80, $FF, $00, $FF
+db $FF
+..doors
+db $08
+db $FF
+..chests
+db $00
+db $FF
+
+.125 ; 20-Rupee Cave (2) // Spiky Hint Cave (1)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(.no_items) : %d(..pots) : %d(..enemies)
+..areas
+db $03, $00, $7F, $00, $FF
+db $FF
+..doors
+db $06
+db $FF
+..pots
+db $00
+db $01
+db $02
+db $03
+db $FF
+..enemies
+db $00
+db $FF
+
+.126 ; Bonk Fairy Pool (2) // Checkerboard Cave (1)
+db $01
+%sq($00)
+%d(..areas) : %d(..doors) : %d(.no_items)
+%d(.no_items) : %d(.no_items) : %d(..enemies)
+..areas
+db $03, $00, $7F, $00, $FF
+db $FF
+..doors
+db $06
+db $FF
+..enemies
+db $01
+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

gk/doors_dungeon_map.asm

@@ -150,7 +150,10 @@ DrawFullRoomTile:
 	RTL
 
 DrawSingleRoomLoot:
-	PHX : PHY
+	LDA.l MapItems_enabled : AND.w #$00FF : BNE +
+		RTL
+
++	PHX : PHY
 
 	TYX
 
@@ -172,7 +175,8 @@ DrawSingleRoomLoot:
 	STA.w GFXStripes+$0C, Y
 
 	LDA.b $CA
-	JSL CheckLoot
+	AND.w #$F0FF
+	JSL CheckMapLoot
 
 	ASL A : ASL A : ASL A
 
@@ -687,6 +691,13 @@ GetSpecificRoomVisibility:
 	STA.b $0A
 +
 
+	SEP #$20
+	LDA.b $0A
+	CMP.b $0B
+	BCC +
+	STA.b $0B
++
+
 	REP #$20
 	LDA.b $CA
 	AND.w #$00FF
@@ -1229,7 +1240,7 @@ DrawDoorsMapBlinker:
 	AND.w #$01E0
 	ASL A : ASL A : ASL A
 	XBA
-	CLC : ADC.w #$00A4
+	CLC : ADC.w #$00A5
 	STA.w OAMBuffer, X
 
 	LDA.b LinkPosY
@@ -1707,10 +1718,13 @@ DoorsMapChangeDungeon:
 	BNE +
 	INX
 +	LDA.l DungeonMapData.prev, X
+	STA.w DungeonID
 	CMP.b $00
 	BEQ .done
 
-	STA.w DungeonID
+	JSL IsValidDungeonToSwapTo
+	BCC .next
+
 	JSL FindFirstEntrance
 	CPY.b #$FF
 	BEQ .next
@@ -2105,6 +2119,13 @@ DrawDoorsStairs:
 
 DetectLinksSection:
 	LDA.b RoomIndex
+	CMP.w #$0128
+	BCC +
+
+	LDA.w #$0000
+	RTL
++
+
 	ASL A
 	TAX
 	LDA.l SplitRooms, X

gk/draw_loot.asm

@@ -1,4 +1,5 @@
 RedrawLoot:
+	SEP #$20
 	JSL DrawLoot
 
 	; what we wrote over
@@ -32,6 +33,9 @@ DrawLoot:
 	LDA.l DRMode
 	BNE .skip
 
+	LDA.l MapItems_enabled
+	BEQ .skip
+
 	REP #$30
 	PHX : PHY
 
@@ -125,7 +129,7 @@ DrawSingleFloorLoot:
 	LDA.w #$0000
 	BRA +
 .valid_room
-	JSL CheckLoot
+	JSL CheckMapLoot
 +
 	ASL A : ASL A : ASL A
 

gk/dungeon_indicator.asm

@@ -0,0 +1,59 @@
+LoadDungeonIndicator:
+	; what we wrote over
+	JSL InitializeTilesets
+
+	LDA.w DungeonID
+	CMP.b #DungeonIndicatorMap_end-DungeonIndicatorMap : BCS .done
+	TAX
+
+	; mark dungeon as entered
+	REP #$20
+	LDA.w DungeonMask, X
+	ORA.l DungeonVisited
+	STA.l DungeonVisited
+	SEP #$20
+
+	; load indicator
+	LDA.l DungeonIndicatorMap, X
+	TAX
+
+	LDA.b #$80
+	STA.w $2115
+
+	REP #$20
+	LDA.w #$7140
+	STA.w $2116
+
+	LDY.b #$10
+
+-	LDA.l DungeonIndicatorGfx, X
+	STA.w $2118
+	INX #2
+	DEY #2
+	BNE -
+
+	SEP #$20
+.done
+	RTL
+
+DungeonIndicatorMap:
+dw $0000
+dw $0000
+dw $0010
+dw $0020
+dw $0040
+dw $0060
+dw $0050
+dw $00A0
+dw $0070
+dw $0090
+dw $0030
+dw $0080
+dw $00B0
+dw $00C0
+.end
+
+DungeonIndicatorGfx:
+	incbin "menu/dr_dungeon_indicators.2bpp"
+.end
+

gk/dungeon_maps.asm

@@ -34,6 +34,7 @@ incsrc map_bg3.asm
 incsrc dungeon_switch.asm
 incsrc draw_loot.asm
 incsrc check_loot.asm
+incsrc loot_hud.asm
 incsrc blink_loot.asm
 incsrc data/doors_display.asm
 incsrc data/spiral_stairs.asm

gk/dungeon_switch.asm

@@ -42,6 +42,8 @@ CheckSwitchMap:
 	BRA .doors_done
 
 .change_dungeon
+	LDA.l MapSwapping
+	BEQ .doors_done
 	JSL DoorsMapChangeDungeon
 	BRA .doors_done
 
@@ -59,10 +61,14 @@ CheckSwitchMap:
 
 .not_fancy_door_map
 	SEP #$20
+	LDA.l MapSwapping
+	BEQ .no_swap
+
 	LDA.b $F6
 	AND.b #$30
-	BNE +
+	BNE .do_swap
 
+.no_swap
 	; what we wrote over
 	REP #$20
 	LDA.w DungeonMapFloorCountData, X
@@ -70,15 +76,20 @@ CheckSwitchMap:
 	CLC : ADC.b $00
 	RTL
 
-+	PHA
+.do_swap
 	TXA
+.try_next
 	ASL A
 	TAX
-	PLA
+	LDA.b $F6
 	BIT.b #$20
 	BNE +
 	INX
-+	LDA.l DungeonMapData.prev, X
++
+
+	LDA.l DungeonMapData.prev, X
+	JSL IsValidDungeonToSwapTo
+	BCC .try_next
 	STA.w DungeonID
 
 	LDA.b #$04
@@ -87,6 +98,58 @@ CheckSwitchMap:
 	LDA.w #$0000
 	RTL
 
+; in A = dungeon ID to check
+; out C - CC = not valid, CS = valid
+IsValidDungeonToSwapTo:
+	CMP.l CachedDungeonID ; dungeon we're in is always valid
+	BNE +
+		SEC
+		RTL
++
+
+	PHP
+	REP #$20
+	PHX : PHA
+	TAX
+
+	LDA.l MapSwapping
+	BIT.w #$0080
+	BNE .yes
+
+	BIT.w #$0001
+	BEQ +
+	; check visited flag
+	LDA.l SwapMasks, X
+	AND.l DungeonVisited
+	BNE .yes
++
+
+	LDA.l MapSwapping : BIT.w #$0002
+	BEQ +
+	; check map flag
+	LDA.l SwapMasks, X
+	AND.l MapField
+	BNE .yes
++
+
+.no
+	PLA : PLX
+	PLP
+	CLC
+	RTL
+
+.yes
+	PLA : PLX
+	PLP
+	SEC
+	RTL
+
+SwapMasks:
+	dw $C000, $C000, $2000, $1000
+	dw $0800, $0400, $0200, $0100
+	dw $0080, $0040, $0020, $0010
+	dw $0008, $0004, $0002, $0001
+
 DungeonMapSwitch_Submodule:
 	JSL $80893D
 	JSL $80833F
@@ -224,39 +287,32 @@ DrawDungeonLabel:
 	CLC : ADC.w #$0008
 	TAY
 
+	LDA.l MapSwapping
+	BEQ +
 	; L/R switch indicators
-	LDA.w #$E310
+	LDA.w #$E360
 	STA.w GFXStripes+$02, Y
-	LDA.w #$E910
+	LDA.w #$E960
 	STA.w GFXStripes+$0A, Y
-	LDA.w #$E318
-	STA.w GFXStripes+$12, Y
-	LDA.w #$E918
-	STA.w GFXStripes+$1A, Y
 
 	LDA.w #$0300
 	STA.w GFXStripes+$04, Y
 	STA.w GFXStripes+$0C, Y
-	STA.w GFXStripes+$14, Y
-	STA.w GFXStripes+$1C, Y
 
-	LDA.w #$49AF
+	LDA.w #$65BF
 	STA.w GFXStripes+$06, Y
-	STA.w GFXStripes+$16, Y
+	LDA.w #$25BD
-	LDA.w #$099E
 	STA.w GFXStripes+$08, Y
-	STA.w GFXStripes+$18, Y
 
-	LDA.w #$099F
+	LDA.w #$25BE
 	STA.w GFXStripes+$0E, Y
-	STA.w GFXStripes+$1E, Y
+	LDA.w #$25BF
-	LDA.w #$09AF
 	STA.w GFXStripes+$10, Y
-	STA.w GFXStripes+$20, Y
 
 	TYA
-	CLC : ADC.w #$0020
+	CLC : ADC.w #$0010
 	TAY
++
 
 	LDA.l DRMode
 	BNE .doors

gk/loot_hud.asm

@@ -0,0 +1,101 @@
+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
+	PHX : PHY
+	SEP #$30
+
+	LDA.l HudItems_enabled : BEQ .setting_off
+	LDA.b IndoorsFlag : BEQ .done
+
+	REP #$30
+	LDA.b $00 : PHA
+	LDA.b $02 : PHA
+	LDA.b $04 : PHA
+	LDA.b $06 : PHA
+	LDA.b $08 : PHA
+	LDA.b $0E : PHA
+
+	; if if door rando, check for section of supertile
+	LDA.l DRMode
+	BNE +
+
+	; if not in door rando, check for section of supertile if we're not in a dungeon
+	LDA.w DungeonID
+	AND.w #$00FF
+	CMP.w #$00FF
+	BEQ +
+
+	; just load the room id, we don't care about sections
+	LDA.b RoomIndex
+	BRA .check
+
++	; figure out section before checking
+	JSL DetectLinksSection
+	INC A
+	XBA
+	ASL A : ASL A : ASL A : ASL A
+	ORA.b RoomIndex
+.check
+	JSL CheckHudLoot
+
+	ASL A : TAX
+	LDA.l HUDLootTypeIcons, X
+	STA.w EnemyDropIndicator
+
+	PLA : STA.b $0E
+	PLA : STA.b $08
+	PLA : STA.b $06
+	PLA : STA.b $04
+	PLA : STA.b $02
+	PLA : STA.b $00
+	BRA .done
+
+.setting_off
+	JSL SetupEnemyDropIndicator
+
+.done
+	REP #$30
+	PLY : PLX
+	PLP
+	RTL

gk/settings.asm

@@ -52,10 +52,10 @@ dw $2DCB, $6DCB, $ADCB, $EDCB ; 01 - unknown - dot
 dw $29EB, $69EB, $29FB, $69FB ; 02 - junk - pot
 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 $29DD, $69DD, $A9DD, $E9DD ; 05 - health - plus
 dw $29EC, $69EC, $29FC, $69FC ; 06 - less important item - small chest
-dw $29CE, $29CF, $29DE, $29DF ; 07 - map
+dw $29E8, $69E8, $29F8, $69F8 ; 07 - compass
-dw $29E8, $69E8, $29F8, $69F8 ; 08 - 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 $10C8 : db $04 : dl HeartContainer_ArmosKnights
-dw $0033 : db $04 : dl HeartContainer_Lanmolas
+dw $1033 : db $04 : dl HeartContainer_Lanmolas
-dw $0007 : db $04 : dl HeartContainer_Moldorm
+dw $1007 : db $04 : dl HeartContainer_Moldorm
 
-dw $005A : db $04 : dl HeartContainer_HelmasaurKing
+dw $105A : db $04 : dl HeartContainer_HelmasaurKing
-dw $0006 : db $04 : dl HeartContainer_Arrghus
+dw $1006 : db $04 : dl HeartContainer_Arrghus
-dw $0029 : db $04 : dl HeartContainer_Mothula
+dw $1029 : db $04 : dl HeartContainer_Mothula
-dw $00AC : db $04 : dl HeartContainer_Blind
+dw $10AC : db $04 : dl HeartContainer_Blind
-dw $00DE : db $04 : dl HeartContainer_Kholdstare
+dw $10DE : db $04 : dl HeartContainer_Kholdstare
-dw $0090 : db $04 : dl HeartContainer_Vitreous
+dw $1090 : db $04 : dl HeartContainer_Vitreous
-dw $00A4 : db $04 : dl HeartContainer_Trinexx
+dw $10A4 : db $04 : dl HeartContainer_Trinexx
 
-dw $0073 : db $05 : dl BonkKey_Desert ; torch
+dw $1073 : db $05 : dl BonkKey_Desert ; torch
-dw $008C : db $05 : dl BonkKey_GTower ; torch
+dw $108C : db $05 : dl BonkKey_GTower ; torch
-dw $0087 : db $05 : dl StandingKey_Hera
+dw $1087 : db $05 : dl StandingKey_Hera
+
+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
@@ -146,6 +149,44 @@ dw $25A4, $25A4 ; Reserved
 dw $25A4, $25A4 ; Reserved
 
 ; $B9FB40
+HUDLootTypeIcons:
+dw $287F ; 00 - nothing
+dw $295C ; 01 - unknown - dot
+dw $2954 ; 02 - junk - pot
+dw $2950 ; 03 - small key
+dw $2952 ; 04 - triforce piece
+dw $2955 ; 05 - health - plus
+dw $2953 ; 06 - less important item - small chest
+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
+dw $2D58 ; 0C - pendant
+dw $2D59 ; 0D - crystal
+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
@@ -179,30 +220,53 @@ warnpc $B9FF08
 org $B9FF08
 ; $00 - do not show anything
 ; $01 - show presence of unobtained items
-; $02 - show category of item
+; $02 - show compass if presence, otherwise presence of unobtained items
-ShowItems:
+; $03 - show category of item
+MapItems:
 .default
 	db $00
 .have_map
 	db $00
 .have_compass
-	db $02
+	db $03
 .visited_tile
-	db $01
+	db $02
 .reserved
-	skip 4
+	skip 3
+.enabled
+	db $01
 warnpc $B9FF10
 
 org $B9FF10
-; ---P bepc
+HudItems:
+.cave
+	db $00
+.default_dungeon
+	db $00
+.have_map
+	db $01
+.have_compass
+	db $03
+.reserved
+	skip 3
+.enabled
+	db $01
+warnpc $B9FF18
+
+org $B9FF20
+; ---P sepc
 ; P - dungeon prizes
-; b - bosses (and torches in GT and desert, plus hera basement standing item)
+; s - standing items (plus torches in GT and desert and bosses)
 ; e - enemy drops
 ; p - pots
 ; c - chests
 ItemSources:
 	db $09
 
-; $B9FF11
+; B9FF21
-AlwaysShowCompass:
+; a--- --mv
+; a - always
+; m - have map
+; v - have visited dungeon
+MapSwapping:
 	db $01

gk_meta.asm

@@ -13,7 +13,8 @@ GKRomVersion:
 ; $01 = Dungeon Maps
 ;  .., $01 = Dark rooms don't show on map from visition
 ;  .., $02 = OW Fog and Grid modes
-db $01, $02, $00
+;  .., $03 = Loot level of current supertile in HUD
+db $01, $03, $00
 ;--------------------------------------------------------------------------------
 
 ;================================================================================

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,23 @@ JSL MimicDirection
 org $828068
 JSL AdjustDefaultGraphics
 
+;================================================================================
+;--------------------------------------------------------------------------------
+; Remove Overwriting HUD gfx on game over
+;--------------------------------------------------------------------------------
+org $809038
+RTS
+
+;================================================================================
+;--------------------------------------------------------------------------------
+; Dungeon Indicator VRAM overwrite
+;--------------------------------------------------------------------------------
+org $828190
+JSL LoadDungeonIndicator
+
+org $829AA2
+JSL LoadDungeonIndicator
+
 ;================================================================================
 ; Special Weapons Modes
 ;--------------------------------------------------------------------------------

inventory.asm

@@ -165,6 +165,7 @@ AddInventory:
                         		LDA.l !MULTIWORLD_RECEIVING_ITEM : BNE .done
                                 REP #$30
                                 LDA.l TotalItemCounter : INC : TAY
+                                JSL UpdateLootHUD
                                 LDA.l BootsEquipment : AND.w #$00FF : BNE +
                                         TYA : STA.l PreBootsLocations
                                 +

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

keydrop/standing_items.asm

@@ -221,7 +221,8 @@ RevealPotItem:
 	STZ.w SpawnedItemIsMultiWorld
 	BIT.b Scrap08
 	BVS LoadMultiWorldPotItem
-	BMI LoadMajorPotItem
+	BPL .normal_secret
+	JMP LoadMajorPotItem
 
 .normal_secret
 	STA.b Scrap08
@@ -242,6 +243,7 @@ RevealPotItem:
 				; Could increment GT Tower Pre Big Key but we aren't showing that stat right now
 			+ REP #$10
 			LDA.l TotalItemCounter : INC : STA.l TotalItemCounter ; Increment Item Total
+			JSL UpdateLootHUD
 			LDA.w #$0001 : STA.l UpdateHUDFlag
 		.obtained
 	PLY : PLX
@@ -341,6 +343,7 @@ IncrementCountsForSubstitute:
 			; Could increment GT Tower Pre Big Key but we aren't showing that stat right now
 		+
 		LDA.l TotalItemCounter : INC : STA.l TotalItemCounter ; Increment Item Total
+		JSL UpdateLootHUD
 		LDA.w #$0001 : STA.l UpdateHUDFlag
 	.obtained
 	SEP #$30 : PLX
@@ -357,7 +360,7 @@ ClearSpriteData:
 			STZ.w SprSourceItemId, X : STZ.w SprItemReceipt, X : STZ.w SprItemMWPlayer, X
 			STZ.w SprRedrawFlag, X
 			DEX : BPL .loop
-		JSR SetupEnemyDropIndicator
+		JSL ClearLootHUD
 	PLX
 	RTL
 
@@ -404,7 +407,7 @@ SetupEnemyDropIndicator:
 
 .done
 SEP #$20
-RTS
+RTL
 
 
 ; Runs during sprite load of the room
@@ -571,7 +574,7 @@ IncrementCountForMinor:
 	LDA.l SpriteDropData, X : BIT.b Scrap0A : BNE .obtained
 		ORA.b Scrap0A : STA.l SpriteDropData, X
 		SEP #$10
-		JSR SetupEnemyDropIndicator
+		JSL UpdateLootHUD
 		REP #$20
 		LDX.w DungeonID : CPX.b #$FF : BEQ +
 			CPX.b #$00 : BNE ++
@@ -627,10 +630,10 @@ MarkSRAMForItem:
 		TYX
 		LDA.w SpawnedItemFlag : CMP.w #$0001 : BEQ +
 			LDA.l SpriteDropData, X : ORA.b Scrap00 : STA.l SpriteDropData, X
-			SEP #$10 : JSR SetupEnemyDropIndicator
 			BRA .end
 		+ LDA.l RoomPotData, X : ORA.b Scrap00 : STA.l RoomPotData, X
 	.end
+	JSL UpdateLootHUD
 	SEP #$30 : PLY : PLX
 	LDA.w RoomItemsTaken
 	RTL

menu/hudalpha.asm

@@ -9,7 +9,7 @@ UploadMenuOnlyIcons:
     REP #$20
     LDA.w #MenuOnlyIcons : STA.w $4342
     LDA.w #$1801 : STA.w $4340
-    LDA.w #$0240 : STA.w $4345
+    LDA.w #$0400 : STA.w $4345
     LDA.w #$0F800>>1 : STA.w $2116
 
     SEP #$20

multiworld.asm

@@ -123,6 +123,11 @@ GetMultiworldItem:
 		BRL .return
 	+
 
+	LDA.b LinkPushDirection
+	BEQ +
+		BRL .return
+	+
+
 	LDA.l !MULTIWORLD_ITEM : BNE +
 		BRL .return
 	+

newhud.asm

@@ -309,16 +309,16 @@ MagicMeterColorMasks:
 ;================================================================================
 PrizeIconTiles_Transparent:
 dw $0000  ; no icon
-dw $2978  ; crystal 1
+dw $2891  ; crystal 1
-dw $2979  ; crystal 2
+dw $2892  ; crystal 2
-dw $297A  ; crystal 3
+dw $2893  ; crystal 3
-dw $297B  ; crystal 4
+dw $2894  ; crystal 4
-dw $297C  ; crystal 5
+dw $2895  ; crystal 5
-dw $297D  ; crystal 6
+dw $2896  ; crystal 6
-dw $297E  ; crystal 7
+dw $2897  ; crystal 7
-dw $2963  ; green pendant
+dw $2935  ; green pendant
-dw $295E  ; blue pendant
+dw $2936  ; blue pendant
-dw $296E  ; red pendant
+dw $2937  ; red pendant
 
 ;================================================================================
 DrawCompassCounts:
@@ -386,6 +386,7 @@ RTS
 ;================================================================================
 DrawMapCounts:
         LDA.l MapHUDMode : BEQ .done
+        LDA.l GenericKeys : BNE .done ; generator don't have an accurrate count of key doors in this case
 
         ; no map needed if this bit is set
         BIT.b #$02 : BNE .draw_map_count

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
 ;================================================================================
 

pendantcrystalhud.asm

@@ -291,7 +291,7 @@ RTL
         REP #$30
 ;-------------------------------------------------------------------------------
 	; dungeon names
-	LDA.w #$2D50
+	LDA.w #$2DA4
 	LDY.w #00
 
 	.next_dungeon_name

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
@@ -597,6 +598,8 @@ HUDMultiIndicator = $7EC790       ;
 HUDKeysObtained = $7EC7A2         ;
 HUDKeysSlash = $7EC7A4            ;
 HUDKeysTotal = $7EC7A6            ;
+HUDKeysExtraPlus = $7EC7E4        ;
+HUDKeysExtraCount = $7EC7E6       ;
                                   ;
 BigRAM = $7EC900                  ; Big buffer of free ram (0x1F00)
 ItemGFXStack = $7ECB00            ; Pointers to source of decompressed item tiles deferred to NMI loading.

shopkeeper.asm

@@ -433,9 +433,11 @@ Shopkeeper_BuyItem:
     CMP.b #$2E : BEQ .refill ; Red Potion Refill
     CMP.b #$2F : BEQ .refill ; Green Potion Refill
     CMP.b #$30 : BEQ .refill ; Blue Potion Refill
+    CMP.b #$AF : BEQ .generic_key
     BRA +
     .refill
         JSL Sprite_GetEmptyBottleIndex : BMI .full_bottles
+    .generic_key
         LDA.b #$1 : STA.l ShopkeeperRefill ; If this is on, don't toggle bit to remove from shop
     +
 

sram.asm

@@ -240,7 +240,9 @@ CompassCountDisplay: skip 2     ; Compass count display flags (bitfield)
                                 ; High Byte: x c e d a s p m
                                 ; x = Sewers       | c = Hyrule Castle | e = Eastern Palace | d = Desert Palace
                                 ; a = Castle Tower | s = Swamp Palace  | p = PoD            | m = Mire
-skip 10                         ;
+DungeonVisited: skip 2          ; Whether each dungeon has been entered (bitfield)
+                                ; same order of bits as CompassCountDisplay above
+skip 8                          ;
 Aga2Duck: skip 1                ; Used in lieu of pyramid hole for checking if the duck should come
                                 ; 0 = Haven't called post-Aga 2 bird | 1 = Have called post-Aga 2 bird
 NpcFlags: skip 2                ; l - c s t k z o (bitfield)
@@ -306,7 +308,7 @@ HeartContainerCounter: skip 1   ; Total number of heart containers collected (in
 DeathCounter: skip 1            ; Number of deaths (integer)
 skip 1                          ; Reserved
 FluteCounter: skip 1            ; Number of times fluted (integer)
-skip 4                          ;
+MapFrames: skip 4               ; Total map time in frames (32-bit integer)
 RNGItem: skip 2                 ; RNG Item
 SwordlessBossKills: skip 1      ; Number of bosses killed without a sword (integer)
 FaerieRevivalCounter: skip 1    ; Number of faerie revivals (integer)

stats/credits.asm

@@ -504,7 +504,16 @@ CreditsLineBlank:
 %blankline()
 %blankline()
 
-%smallcredits("SPRITE DEVELOPMENT", "yellow")
+%smallcredits("GWAAKIWI * DUNGEON MAPS", "yellow")
+
+%blankline()
+
+%bigcredits("KARAFRUIT")
+
+%blankline()
+%blankline()
+
+%smallcredits("SPRITE DEVELOPMENT", "green")
 
 %blankline()
 
@@ -525,7 +534,7 @@ CreditsLineBlank:
 %blankline()
 %blankline()
 
-%smallcredits("YOUR SPRITE BY", "green")
+%smallcredits("YOUR SPRITE BY", "yellow")
 
 %blankline()
 
@@ -535,7 +544,7 @@ CreditsLineBlank:
 %blankline()
 %blankline()
 
-%smallcredits("MSU SUPPORT", "yellow")
+%smallcredits("MSU SUPPORT", "green")
 
 %blankline()
 
@@ -544,7 +553,7 @@ CreditsLineBlank:
 %blankline()
 %blankline()
 
-%smallcredits("PALETTE SHUFFLER", "green")
+%smallcredits("PALETTE SHUFFLER", "yellow")
 
 %blankline()
 
@@ -553,7 +562,7 @@ CreditsLineBlank:
 %blankline()
 %blankline()
 
-%smallcredits("WEBSITE LOGO", "yellow")
+%smallcredits("WEBSITE LOGO", "green")
 
 %blankline()
 
@@ -623,12 +632,6 @@ endif
 
 %bigcredits("HTTPS://ALTTPR.COM/DISCORD")
 
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
 %emptyline()
 %emptyline()
 
@@ -752,14 +755,13 @@ endif
 
 %blankline()
 
+%bigcreditsleft("TOTAL MAP TIME")
+
+%blankline()
+
 %bigcreditsleft("TOTAL LAG TIME")
 
 %blankline()
-%blankline()
-
-
-%blankline()
-%blankline()
 
 
 %blankline()

stats/fonttable.asm

@@ -265,4 +265,6 @@ dw $3D99 ; -               ; $FB
 dw $0000 ;                 ;
 dw $0000 ;                 ;
 dw $0000 ;                 ;
-dw $0000 ;                 ;
+
+; yellow dot
+dw $2DFA ;                 ; FF

stats/main.asm

@@ -174,7 +174,7 @@ FindLine:
 !FRAMES_PER_SECOND = 60
 !FRAMES_PER_MINUTE = 60*60
 !FRAMES_PER_HOUR = 60*60*60
-!MAX_FRAME_COUNT = 59*60+59*60+59*60+99
+!MAX_FRAME_COUNT = (99*60)+(59*60)+(59*60)+59
 
 macro CountUnits(framesPerUnit, unitCounter)
 	STZ.b <unitCounter>
@@ -196,7 +196,7 @@ endmacro
 
 !ColonOffset = $8A
 !PeriodOffset = $4D
-BlankCreditsTile = $883D
+BlankCreditsTile = $3D88
 
 RenderCreditsStatCounter:
 	PHB
@@ -591,7 +591,7 @@ EndingSequenceTableLookupOverride:
 	PHK : PLB
 	TYX
 	LDA.l EndingSequenceText, X : AND.w #$00FF
-        ASL
+	ASL A
 	TAY
 	LDA.w FontTable,Y
 	PLB : PLX

stats/statConfig.asm

@@ -30,8 +30,10 @@
 !FAERIE_REVIVALS_Y = 361
 !TOTAL_MENU_TIME_X = 19
 !TOTAL_MENU_TIME_Y = 364
+!TOTAL_MAP_TIME_X = 19
+!TOTAL_MAP_TIME_Y = 367
 !TOTAL_LAG_TIME_X = 19
-!TOTAL_LAG_TIME_Y = 367
+!TOTAL_LAG_TIME_Y = 370
 !COLLECTION_RATE_X = 22
 !COLLECTION_RATE_Y = 380
 !TOTAL_TIME_X = 19
@@ -62,10 +64,10 @@ CreditsStats:
 %AddStat(SaveQuitCounter, 0, 0, 08, 2, !SAVE_AND_QUITS_X, !SAVE_AND_QUITS_Y)
 %AddStat(DeathCounter, 0, 0, 08, 2, !DEATHS_X, !DEATHS_Y)
 %AddStat(FaerieRevivalCounter, 0, 0, 08, 3, !FAERIE_REVIVALS_X, !FAERIE_REVIVALS_Y)
-%AddStat(MenuFrames, 1, 8, 32, 4, !TOTAL_MENU_TIME_X, !TOTAL_MENU_TIME_Y)
+%AddStat(MenuFrames, 1, 0, 32, 4, !TOTAL_MENU_TIME_X, !TOTAL_MENU_TIME_Y)
+%AddStat(MapFrames, 1, 0, 32, 4, !TOTAL_MAP_TIME_X, !TOTAL_MAP_TIME_Y)
 %AddStat(LagTime, 1, 0, 32, 4, !TOTAL_LAG_TIME_X, !TOTAL_LAG_TIME_Y)
 print "Collection Rate config: ", pc
-warnpc $A39864
 %AddStat(TotalItemCounter, 0, 0, 16, 3, !COLLECTION_RATE_X, !COLLECTION_RATE_Y)
 %AddStat(NMIFrames, 1, 0, 32, 4, !TOTAL_TIME_X, !TOTAL_TIME_Y)
 

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:
+RainDeathRefillRupeeBow:
-dw $12C ; 300 rupees (Default)
+dw $012C ; 300 rupees (Default)
 ;--------------------------------------------------------------------------------
 org $B08185 ; PC 0x180185
 RainDeathRefillTable:
@@ -1532,7 +1528,7 @@ db $19,$1A,$1B,$1C,$1D,$1E,$1F,$20
 db $21,$22,$11,$11,$10,$16,$16,$16
 db $16,$16,$11,$16,$16,$16,$15,$15
 db $15,$15,$15,$15,$15,$15,$15,$15
-db $15,$15,$16,$02,$09,$00,$00,$00
+db $15,$15,$2E,$02,$09,$00,$00,$00
 
 MusicShuffleTable:
 db $01,$02,$03,$04,$05,$06,$07,$08
@@ -2686,9 +2682,9 @@ org $B0EFFF ; PC 0x186FFF
 BallNChainDungeon: ; Dungeon ID where ball n chain guard is located. Write
 db $02             ; $FF to count ball and chain item for collection stats.
 
-;--------------------------------------------------------------------------------
+org $B0F000
-; 0x187000 - 18700F (unused)
+ExtraChestKeys: ; PC 0x187000-0x18700F
-;--------------------------------------------------------------------------------
+db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 
 org $B0F010
 ChestKeys: ; PC 0x187010-0x18701F

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

zelda.asm

@@ -1,10 +1,14 @@
 ;--------------------------------------------------------------------------------
 EndRainState:
-        LDA.l InitProgressIndicator : BIT.b #$80 : BNE + ; check for instant post-aga
+	LDA.l InitProgressIndicator : BIT.b #$80 : BEQ + ; check for instant post-aga
-                LDA.b #$02 : STA.l ProgressIndicator
-                RTL
-	+
-        LDA.b #$03 : STA.l ProgressIndicator
 		LDA.l InitLumberjackOW : STA.l OverworldEventDataWRAM+$02
+		LDA.b #$03
+		BRA ++
+	+
+	LDA.b #$02
+	++
+	STA.l ProgressIndicator
+
+	JSL SetEscapeAssist
 RTL
 ;--------------------------------------------------------------------------------