ArchipelagoMW · Alchav · Apr 22, 2026 · Apr 23, 2026 · Apr 23, 2026 · Apr 23, 2026
diff --git a/2026items.bin b/2026items.bin
diff --git a/2026items.gfx b/2026items.gfx
diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
@@ -116,7 +116,7 @@ incsrc itemdowngrade.asm
 incsrc bugfixes.asm
 incsrc darkworldspawn.asm
 incsrc lampmantlecone.asm
-incsrc floodgatesoftlock.asm
+incsrc floodgates.asm
 incsrc heartpieces.asm
 incsrc npcitems.asm
 incsrc utilities.asm
@@ -138,7 +138,6 @@ incsrc maidencrystals.asm
 incsrc zoraking.asm
 incsrc catfish.asm
 incsrc flute.asm
-incsrc dungeondrops.asm
 incsrc halfmagicbat.asm
 incsrc newitems.asm
 incsrc mantle.asm
@@ -148,10 +147,6 @@ incsrc map.asm
 incsrc msu.asm
 incsrc dialog.asm
 incsrc entrances.asm
-incsrc clock.asm
-incsrc accessability.asm
-incsrc heartbeep.asm
-incsrc capacityupgrades.asm
 print "End of Coda Bank $20: ", pc
 warnpc $A18000
 
@@ -179,6 +174,52 @@ org $A1FF00 ; static mapping area
 incsrc init.asm
 
 org $A48000 ; code bank - PUT NEW CODE HERE
+
+; Current-dungeon key rings picked up from floor objects should add the
+; dungeon's key quantity and update HUD/stats without the normal item fanfare.
+Link_ReceiveItem_HandleCurrentDungeonKeyRing:
+	CPY.b #$CE : BNE .normalReceive
+	LDA !MULTIWORLD_ITEM_PLAYER_ID : BNE .normalReceive
+	JSL.l BossPrizeReceiveContextMatches : BCS .normalReceive
+	LDA $02E9 : CMP.b #$03 : BNE .normalReceive
+	JSL.l ReceiveCurrentDungeonKeyRingQuiet
+	JSL.l Player_HaltDashAttackLong
+	CLC
+	PLB
+	RTL
+
+	.normalReceive
+	LDA $02E9
+	BEQ .fromTextOrObject
+	CMP.b #$03 : BEQ .fromTextOrObject
+	.fromChestOrSprite
+	JML $0799F2
+	.fromTextOrObject
+	JML $0799C8
+
+; Grant floor-object current-dungeon key rings directly because they should not
+; use the normal hold-up animation.
+ReceiveCurrentDungeonKeyRingQuiet:
+	PHX : PHY
+		LDA $040C : CMP.b #$FF : BEQ .cleanup
+		LSR : TAX
+		LDA.l KeyRingQuantities, X : BEQ .cleanup
+		CLC : ADC $7EF36F : STA $7EF36F
+		JSL.l UpdateKeys
+		LDY.b #$CE
+		JSL.l FullInventoryExternal
+		JSL.l CountChestKeyLong
+		JSL.l HUD_RebuildLong
+	.cleanup
+		STZ $02D8 : STZ $02D9 : STZ $02E9
+		STZ $02DA : STZ $037B : STZ $02E4
+	PLY : PLX
+RTL
+
+incsrc clock.asm
+incsrc accessability.asm
+incsrc heartbeep.asm
+incsrc capacityupgrades.asm
 incsrc timer.asm
 incsrc doorframefixes.asm
 incsrc music.asm
@@ -217,6 +258,7 @@ incsrc darkroomitems.asm
 incsrc multiworld.asm
 incsrc terrorpin.asm
 incsrc RandSprite.asm
+incsrc dungeondrops.asm
 print "End of Coda Bank $24: ", pc
 warnpc $A58000
 
@@ -264,8 +306,10 @@ warnpc $31A800
 
 org $31A800
 GFX_New_Items:
-incbin newitems.gfx
+;incbin newitems.gfx
 ;incbin eventitems.gfx ; *EVENT*
+; 2026 item graphics include the key ring art
+incbin 2026items.gfx
 warnpc $31B000
 
 org $31B000

diff --git a/c2e3e.bin b/c2e3e.bin
diff --git a/c2e3e.gfx b/c2e3e.gfx
diff --git a/contrib.asm b/contrib.asm
@@ -109,6 +109,7 @@ Sprite_ShowSolicitedMessageIfPlayerFacing_Alt:
 
 	.SahasrahlaDialogs
 		REP #$20 : LDA.l MapReveal_Sahasrahla : ORA !MAP_OVERLAY : STA !MAP_OVERLAY : SEP #$20
+		JSL.l TrackHintRead
 		JSL DialogSahasrahla : BRA .SayNothing
 
 	.BombShopGuyDialog

diff --git a/damage_table.bin b/damage_table.bin
diff --git a/darkroomitems.asm b/darkroomitems.asm
@@ -1,27 +1,79 @@
-CheckReceivedItemPropertiesBeforeLoad:
-    LDA $A0 : BEQ .normalCode
-    LDA $7EC005 : BNE .lightOff
-    .normalCode
-    LDA.l AddReceivedItemExpanded_properties, X ;Restore Rando Code
-    RTL
-
-.lightOff
-    PHX : PHY : PHB
-    LDA.l AddReceivedItemExpanded_properties, X ; get palette
-
-    REP #$30
-    AND #$0007 ; mask out palette
-    ASL #5 ; multiply by 32
+; Load received-item palette properties, using the boss-prize display item when
+; the receive animation is showing a substituted/progressive prize.
+CheckReceivedItemPropertiesBeforeLoad:
+    PHX
+    LDA $7F504C : BEQ +
+        LDA $7F504D : TAX
+    +
+    LDA $A0 : BEQ .normalCode
+    LDA $7EC005 : BNE .lightOff
+    .normalCode
+    JSR .loadProperty
+    PLX
+    CMP.b #$00 ; preserve vanilla BPL behavior by setting flags from the loaded property, not restored X
+    RTL
+
+    .lightOff
+    PHY : PHB
+    JSR .loadProperty
+
+    REP #$30
+    AND #$0007 ; mask out palette
+    ASL #5 ; multiply by 32
     ADC #$C610 ; offset to latter half
 
     TAX ; give to destination
     LDY #$C610 ; target palette SP0 colors 8-F
 
     LDA #$000F ; 16 bytes
     MVN $7E, $7E ; move palette
-
-    SEP #$30
-    PLB : PLY : PLX
-    INC $15
-    LDA #$00
-    RTL
+
+    SEP #$30
+    PLB : PLY : PLX
+    INC $15
+    LDA #$00
+    RTL
+
+    ; Swords and shields use inventory-dependent palette properties, so boss
+    ; prizes need the resolved display item rather than the original item ID.
+    .loadProperty
+    LDA $7F504C : BEQ .normalProperty
+    TXA : CMP.b #$49 : BEQ .masterSword
+          CMP.b #$01 : BEQ .masterSword
+          CMP.b #$50 : BEQ .masterSword
+          CMP.b #$02 : BEQ .temperedSword
+          CMP.b #$03 : BEQ .goldenSword
+          CMP.b #$04 : BCC .normalProperty
+          CMP.b #$07 : BCC .shield
+
+    .normalProperty
+    LDA.l AddReceivedItemExpanded_properties, X ; Restore Rando Code
+    RTS
+
+    .masterSword
+    LDA.b #$02
+    RTS
+
+    .temperedSword
+    LDA.b #$01
+    RTS
+
+    .goldenSword
+    LDA.b #$04
+    RTS
+
+    .shield
+    LDA.b #$05
+    RTS
+
+; Boss-prize crystals are spawned as ordinary receive-item objects, but still
+; need the crystal-specific fanfare/state path once they are collected.
+CrystalItemBehaviorCheck:
+    LDA $0C5E, X : CMP.b #$20 : BNE .ordinaryItem
+    LDA $0C54, X : CMP.b #$03 : BEQ .bossPrizeCrystal
+
+.ordinaryItem
+    JML.l CrystalFanfareContinue
+
+.bossPrizeCrystal
+    JML.l CrystalSpecialBehaviorContinue
diff --git a/dialog.asm b/dialog.asm
@@ -177,14 +177,24 @@ FreeDungeonItemNotice:
 	+ : LDA.l FreeItemText : AND.b #$08 : CMP.b #$08 : BNE + ; show message for dungeon big key
 	LDA !ITEM_TEMPORARY : AND.b #$F0 : CMP.b #$90 : BNE + ; big key of...
 		%CopyDialog(Notice_BigKeyOf)
-		BRA .dungeon
+		BRL .dungeon
 	+ : LDA.l FreeItemText : AND.b #$01 : CMP.b #$01 : BNE + ; show message for dungeon small key
 	LDA !ITEM_TEMPORARY : AND.b #$F0 : CMP.b #$A0 : BNE + ; small key of...
 		LDA !ITEM_TEMPORARY : CMP.b #$AF : BNE ++ : BRL .skip : ++
 		%CopyDialog(Notice_SmallKeyOf)
 		PLA : AND.b #$0F : STA $7F5020 : LDA.b #$0F : !SUB $7F5020 : PHA
 		LDA #$01 : STA $7F5010 ; set up a flip for small keys
 		BRA .dungeon
+	; Key rings share the small-key notice flag but use their own text prefix.
+	+ : LDA.l FreeItemText : AND.b #$01 : CMP.b #$01 : BNE + ; show message for dungeon key ring
+	LDA !ITEM_TEMPORARY : AND.b #$F0 : CMP.b #$C0 : BNE + ; key ring of...
+		LDA !ITEM_TEMPORARY : CMP.b #$CE : !BLT .keyRingNotice
+			BRL .skip
+		.keyRingNotice
+		%CopyDialog(Notice_KeyRingOf)
+		PLA : AND.b #$0F : STA $7F5020 : LDA.b #$0F : !SUB $7F5020 : PHA
+		LDA #$01 : STA $7F5010 ; set up a flip for key rings
+		BRA .dungeon
 	+
 	BRL .skip ; it's not something we are going to give a notice for
 
@@ -398,20 +408,71 @@ DialogBombShopGuy:
 	JSL.l Sprite_ShowMessageUnconditional
 RTL
 ;--------------------------------------------------------------------------------
+!HINT_READ_FLAGS = "$7EF4F1"
+;--------------------------------------------------------------------------------
+TrackHintRead:
+	PHX : PHP
+		REP #$30
+		LDA.w $1CF0
+		LDX.w #$0000
+
+		-
+			CMP.l HintReadTable, X : BEQ .match
+			LDA.l HintReadTable, X : CMP.w #$FFFF : BEQ .done
+			INX #4
+			LDA.w $1CF0
+		BRA -
+
+		.match
+			LDA.l HintReadTable+2, X
+			PHA
+				AND.w #$00FF
+				TAX
+			PLA
+			XBA
+			SEP #$20
+			ORA.l !HINT_READ_FLAGS, X
+			STA.l !HINT_READ_FLAGS, X
+	.done
+	PLP : PLX
+RTL
+;--------------------------------------------------------------------------------
+Main_ShowTextMessage_TrackHintRead:
+	; Are we in text mode? If so then end the routine.
+	LDA $10 : CMP.b #$0E : BEQ .already_in_text_mode
+
+	JSL.l TrackHintRead
+
+	STZ $0223   ; Otherwise set it so we are in text mode.
+	STZ $1CD8   ; Initialize the step in the submodule
+
+	; Go to text display mode (as opposed to maps, etc)
+	LDA.b #$02 : STA $11
+
+	; Store the current module in the temporary location.
+	LDA $10 : STA $010C
+
+	; Switch the main module ($10) to text mode.
+	LDA.b #$0E : STA $10
+
+.already_in_text_mode
+RTL
+;--------------------------------------------------------------------------------
 Main_ShowTextMessage_Alt:
 	; Are we in text mode? If so then end the routine.
 	LDA $10 : CMP.b #$0E : BEQ .already_in_text_mode
 Sprite_ShowMessageMinimal_Alt:
 	STZ $11
 
-	PHX : PHY
+	PHX : PHY : PHP
+	SEP #$20
 	LDA.b $00 : PHA
 	LDA.b $01 : PHA
 	LDA.b $02 : PHA
 
 	LDA.b #$1C : STA.b $02
 	REP #$30
-		LDA.w $1CF0 : ASL : TAX
+		LDA.w $1CF0 : ASL : CLC : ADC.w $1CF0 : TAX
 		LDA.l $7f71c0, X
 		STA.b $00
 	SEP #$30
@@ -427,6 +488,8 @@ Sprite_ShowMessageMinimal_Alt:
 		BRL .end
 	+
 
+	JSL.l TrackHintRead
+
 	STZ $0223   ; Otherwise set it so we are in text mode.
 	STZ $1CD8   ; Initialize the step in the submodule
 
@@ -442,7 +505,7 @@ Sprite_ShowMessageMinimal_Alt:
 	PLA : STA.b $02
 	PLA : STA.b $01
 	PLA : STA.b $00
-	PLY : PLX
+	PLP : PLY : PLX
 
 Main_ShowTextMessage_Alt_already_in_text_mode:
 RTL