Fix max frame count

Merge branch 'beta' into pikit_mode_merge
Minor fixups
2026-06-08 16:11:51 -05:00 · 2026-06-07 13:39:04 -05:00 · 2026-06-07 01:27:54 -05:00 · 2026-06-06 12:43:06 -05:00 · 2026-06-05 01:07:17 -05:00 · 2026-05-02 23:22:37 -05:00
41 changed files with 1012 additions and 296 deletions
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -206,7 +206,6 @@ warnpc $A38000

 org $B98000
 incsrc gk/crystalswitchbook.asm
-incsrc gk/orange_potion.asm
 incsrc gk/mimicdash.asm
 incsrc gk/gloom.asm
 incsrc gk/special_weapons.asm
@@ -215,6 +214,7 @@ incsrc gk/pseudoflute.asm
 incsrc gk/fast_junk.asm
 incsrc gk/dungeon_maps.asm
 incsrc gk/dungeon_indicator.asm
+incsrc pikit.asm
 print "End of B9: ", pc

 warnpc $B9EE00
--- a/bookofmudora.asm
+++ b/bookofmudora.asm
@@ -53,13 +53,24 @@ RTL
 GiveBonkItem:
    LDA.w SprItemMWPlayer, X : STA.l !MULTIWORLD_ITEM_PLAYER_ID
    LDA.w SprSourceItemId, X
+
+    PHY : TAY
+    JSL ShieldCheck
+    TYA : PLY
+    BCS +
+
+    STZ.w $0DD0, X
+    PLA : PLA : PLA ; remove the stored return address
+    JML $85FC9D
+
+
    JSR AbsorbKeyCheck : BCC .notKey
        PHY : LDY.b #$24 : JSL AddInventory : PLY ; do inventory processing for a small key
        LDA.l CurrentSmallKeys : INC A : STA.l CurrentSmallKeys
        LDA.b #$2F : JSL Sound_SetSfx3PanLong
        LDA.b #$01 : STA.l UpdateHUDFlag
        RTL
-	.notKey
+    .notKey
    PHY : TAY : JSL Link_ReceiveItem : PLY
 RTL
 ;--------------------------------------------------------------------------------
--- a/data/c2e3e.bin
+++ b/data/c2e3e.bin
--- a/data/c2e3e.gfx
+++ b/data/c2e3e.gfx
--- a/data/customitems.4bpp
+++ b/data/customitems.4bpp
--- a/data/newitems.pal
+++ b/data/newitems.pal
--- a/decryption.asm
+++ b/decryption.asm
@@ -78,10 +78,23 @@ JML Dungeon_OpenKeyedObject_nextChest

 	LDA.l ChestData, X : ASL A : BCC .smallChest

-JML Dungeon_OpenKeyedObject_bigChest ;(bank01.asm line #13783)
+	PHY
+	LDY.b Scrap0C
+	JSL ShieldCheck
+	STY.b Scrap0C
+	PLY
+	BCC .couldntFindChest
+	JML Dungeon_OpenKeyedObject_bigChest ;(bank01.asm line #13783)

 .smallChest
-JML Dungeon_OpenKeyedObject_smallChest
+	PHY
+	LDY.b Scrap0C
+	JSL ShieldCheck
+	STY.b Scrap0C
+	PLY
+	BCC .couldntFindChest
+	JML Dungeon_OpenKeyedObject_smallChest
+
 .couldntFindChest
-JML Dungeon_OpenKeyedObject_couldntFindChest
+	JML Dungeon_OpenKeyedObject_couldntFindChest
 ;--------------------------------------------------------------------------------
--- a/dialog.asm
+++ b/dialog.asm
@@ -304,7 +304,7 @@ DialogGanon2:
 	BCS +
 		LDA.w #$018D : JMP .done
 	+
-	LDA.l GanonVulnerabilityItem : AND.w #$007F
+	LDA.l GanonVulnerabilityItem : AND.w #$00FF
 	BEQ .silver_arrows
 	CMP.w #$0001 : BEQ .silver_arrows
 	CMP.w #$0004 : BEQ .bombs
--- a/dungeondrops.asm
+++ b/dungeondrops.asm
@@ -88,6 +88,7 @@ RTL

 PrizeReceiveItem:
        PHA
+        LDA.b #$00 : STA.l BossDropTouched
        JSL BossPrizeGetPlayer : STA.l !MULTIWORLD_ITEM_PLAYER_ID
        PLA
        CMP.b #$6A : BNE +
@@ -105,7 +106,7 @@ RTL
 SetItemPose:
        PHA
        LDA.w DungeonID : BMI .one_handed
-        LDA.w RoomItemsTaken : BIT.b #$80 : BNE +
+        JSL CheckBossDropTouched : BNE +
                .one_handed
                PLA
                JML Link_ReceiveItem_not_cool_pose
@@ -134,7 +135,7 @@ SetCutsceneFlag:
        PHX
        LDY.b #$01 ; wrote over
        LDA.w DungeonID : BMI .no_cutscene
-        LDA.w RoomItemsTaken : BIT.b #$80 : BNE .dungeon_prize
+        JSL CheckBossDropTouched : BNE .dungeon_prize
                .no_cutscene
                SEP #$30
                PLX
@@ -155,7 +156,7 @@ AnimatePrizeCutscene:
        LDA.w ItemReceiptMethod : CMP.b #$03 : BNE +
                JSR CrystalOrPendantBehavior : BCC +
                        LDA.w DungeonID : BMI +
-                        LDA.w RoomItemsTaken : BIT.b #$80 : BEQ +
+                        JSL CheckBossDropTouched : BEQ +
                                SEC
                                RTL
        +
@@ -172,13 +173,13 @@ PrizeDropSparkle:
 RTL

 HandleDropSFX:
-        LDA.w RoomItemsTaken : BIT.b #$80 : BEQ .no_sound
-                JSR CrystalOrPendantBehavior : BCC .no_sound
-                        SEC
-                        RTL
-        .no_sound
-        CLC
-RTL
+	JSL CheckBossDropTouched : BEQ .no_sound
+	JSR CrystalOrPendantBehavior : BCC .no_sound
+	SEC
+	RTL
+.no_sound
+	CLC
+	RTL

 HandleCrystalsField:
        TAX
@@ -192,7 +193,7 @@ RTL
 MaybeKeepLootID:
        PHA
        LDA.w DungeonID : BMI .no_prize
-        LDA.w RoomItemsTaken : BIT.b #$80 : BNE .prize
+        JSL CheckBossDropTouched : BNE .prize
                .no_prize
                STZ.w ItemReceiptID
                STZ.w ItemReceiptPose
@@ -216,6 +217,15 @@ CheckSpawnPrize:
        SEP #$21
 RTL

+CheckBossDropTouched:
+; Out: z - boss drop not touched
+	LDA.w RoomItemsTaken
+	AND.b #$80
+	BNE .done
+	LDA.l BossDropTouched
+.done
+	RTL
+
 CheckDungeonCompletion:
        LDX.w DungeonID
        REP #$20
--- a/events.asm
+++ b/events.asm
@@ -1,14 +1,14 @@
 OnPrepFileSelect:
-	LDA.b GameSubMode : CMP.b #$03 : BNE +
-		LDA.b #$06 : STA.b NMISTRIPES ; thing we wrote over
-		RTL
-	+
-	PHA : PHX
-	REP #$10
-	JSL LoadAlphabetTilemap
-	JSL LoadFullItemTiles
-	SEP #$10
-	PLX : PLA
+        LDA.b GameSubMode : CMP.b #$03 : BNE +
+                LDA.b #$06 : STA.b NMISTRIPES ; thing we wrote over
+                RTL
+        +
+        PHA : PHX
+        REP #$10
+        JSL LoadAlphabetTilemap
+        JSL LoadFullItemTiles
+        SEP #$10
+        PLX : PLA
 RTL
 ;--------------------------------------------------------------------------------
 OnDrawHud:
@@ -22,17 +22,17 @@ JML ReturnFromOnDrawHud
 ;--------------------------------------------------------------------------------
 OnDungeonEntrance:
 	STA.l PegColor ; thing we wrote over
-	JSL MaybeFlagDungeonTotalsEntrance
-	LDA.w #$0001 : STA.l UpdateHUDFlag
-	SEP #$30
-	JSL DynamicDropGFXClear
-	REP #$30
+        JSL MaybeFlagDungeonTotalsEntrance
+        LDA.w #$0001 : STA.l UpdateHUDFlag
+        SEP #$30
+        JSL DynamicDropGFXClear
+        REP #$30
 RTL
 ;--------------------------------------------------------------------------------
 OnDungeonBossExit:
-	JSL StatTransitionCounter
-	JSL ClearMultiworldText
-	JSL DynamicDropGFXClear
+        JSL StatTransitionCounter
+        JSL ClearMultiworldText
+        JSL DynamicDropGFXClear
 RTL
 ;--------------------------------------------------------------------------------
 OnPlayerDead:
@@ -41,44 +41,40 @@ OnPlayerDead:
 		JSL DynamicDropGFXClear
 		JSL SetSilverBowMode
 		JSL RefreshRainAmmo
-		LDA.b #$00
-		STA.l InfiniteMagic
 	PLA
 RTL
 ;--------------------------------------------------------------------------------
 OnDungeonExit:
-	PHA : PHP
-	SEP #$20 ; set 8-bit accumulator
-	JSL SQEGFix
-	JSL DynamicDropGFXClear
-	PLP : PLA
+        PHA : PHP
+        SEP #$20 ; set 8-bit accumulator
+        JSL SQEGFix
+        JSL DynamicDropGFXClear
+        PLP : PLA

-	STA.w DungeonID : STZ.w Map16ChangeIndex ; thing we wrote over
+        STA.w DungeonID : STZ.w Map16ChangeIndex ; thing we wrote over

-	PHA : PHP
-	LDA.w #$0001 : STA.l UpdateHUDFlag
-	JSL HUD_RebuildLong
-	JSL FloodGateResetInner
-	JSL SetSilverBowMode
-	PLP : PLA
+        PHA : PHP
+        LDA.w #$0001 : STA.l UpdateHUDFlag
+        JSL HUD_RebuildLong
+        JSL FloodGateResetInner
+        JSL SetSilverBowMode
+        PLP : PLA
 RTL
 ;--------------------------------------------------------------------------------
 OnSave:
-	LDA.b #$70 : PHA : PLB ; thing we wrote over - data bank change
+        LDA.b #$70 : PHA : PLB ; thing we wrote over - data bank change
 	JSL DarkWorldSaveFix
-	JML MSUResumeReset
+        JML MSUResumeReset
 ;--------------------------------------------------------------------------------
 OnQuit:
 	JSL SQEGFix
 	LDA.b #$00 : STA.l AltTextFlag ; bandaid patch bug with mirroring away from text
 	LDA.b #$10 : STA.b MAINDESQ ; thing we wrote over
-	LDA.b #$00
-	STA.l InfiniteMagic
 RTL
 ;--------------------------------------------------------------------------------
 OnDeathNoSave:
-	JSL MSUResumeReset
-	LDA.b #$05 : STA.b $10 ; what we wrote over
+        JSL MSUResumeReset
+        LDA.b #$05 : STA.b $10 ; what we wrote over
 RTL
 ;--------------------------------------------------------------------------------
 OnUncleItemGet:
--- a/fileselect.asm
+++ b/fileselect.asm
@@ -82,10 +82,7 @@ DrawBottle:
 	AND.w #$00FF : BNE +
 		LDX.w #FileSelectItems_empty_bottle
 		JMP DrawItemGray
-	+ : DEC : BNE +
-		LDX.w #FileSelectItems_orange_potion
-		JMP DrawItem
-	+ : DEC : BNE +
+	+ : DEC #2 : BNE +
 		LDX.w #FileSelectItems_empty_bottle
 		JMP DrawItem
 	+ : DEC : BNE +
@@ -622,8 +619,6 @@ FileSelectItems:
 	dw #$0282|!FS_COLOR_GREEN, #$0282|!FS_COLOR_GREEN|!FS_HFLIP, #$0292|!FS_COLOR_GREEN, #$0284|!FS_COLOR_GREEN
 	.blue_potion
 	dw #$0282|!FS_COLOR_BLUE, #$0282|!FS_COLOR_BLUE|!FS_HFLIP, #$0292|!FS_COLOR_BLUE, #$0285|!FS_COLOR_BLUE
-	.orange_potion
-	dw #$0282|!FS_COLOR_BROWN, #$0282|!FS_COLOR_BROWN|!FS_HFLIP, #$0292|!FS_COLOR_BROWN, #$0286|!FS_COLOR_BROWN
 	.fairy_bottle
 	dw #$0287|!FS_COLOR_YELLOW|!FS_HFLIP, #$0287|!FS_COLOR_YELLOW, #$0296|!FS_COLOR_BLUE, #$0297|!FS_COLOR_BLUE
 	.bee_bottle
--- a/gk/data/item_mapping.asm
+++ b/gk/data/item_mapping.asm
@@ -116,7 +116,7 @@ db !TIER_JUNK    ; 62 - RNG pool item (single)
 db !TIER_JUNK    ; 63 - RNG pool item (multi)
 db !TIER_MAJOR   ; 64 - Progressive bow
 db !TIER_MAJOR   ; 65 - Progressive bow
-db !TIER_HEALTH  ; 66 - Potion refill (orange)
+db !TIER_JUNK    ; 66 -
 db !TIER_JUNK    ; 67 -
 db !TIER_JUNK    ; 68 -
 db !TIER_JUNK    ; 69 -
--- a/gk/data/junk_items.asm
+++ b/gk/data/junk_items.asm
@@ -101,7 +101,7 @@ db $00 ; 62 - RNG pool item (single)
 db $00 ; 63 - RNG pool item (multi)
 db $00 ; 64 - Progressive bow
 db $00 ; 65 - Progressive bow
-db $00 ; 66 - Potion refill (orange)
+db $00 ; 66 -
 db $00 ; 67 -
 db $00 ; 68 -
 db $00 ; 69 -
--- a/gk/orange_potion.asm
+++ b/gk/orange_potion.asm
@@ -1,31 +0,0 @@
-CheckOrangePotion:
-	LDA.l BottleContents, X
-	CMP.b #$01
-	BEQ .orange
-
-	; return to vanilla behavior
-	CMP.b #$00
-	RTL
-
-.orange
-	LDA.l InfiniteMagic
-	BNE .nope
-
-	LDA.b #$02
-	STA.l BottleContents, X
-
-	STZ.w $0301
-
-	LDA.b #$01
-	STA.l InfiniteMagic
-
-	JSL RebuildHUD_update_long
-	LDA.b #$00
-	RTL
-
-.nope
-	JSL Sound_SetSfxPanWithPlayerCoords
-	ORA.b #$3C
-	STA.w SFX2
-	LDA.b #$00
-	RTL
--- a/gk/settings.asm
+++ b/gk/settings.asm
@@ -269,4 +269,4 @@ ItemSources:
 ; m - have map
 ; v - have visited dungeon
 MapSwapping:
-	db $01
+	db $01 ; NYI
--- a/gk/special_weapons.asm
+++ b/gk/special_weapons.asm
@@ -1,6 +1,6 @@
 DamageClassCalc:
 	PHA
-	LDA.l GanonVulnerabilityItem : AND.b #$7F : BEQ +
+	LDA.l GanonVulnerabilityItem : BEQ +
 	LDA.w SpriteTypeTable, X : CMP.b #$D7 : BNE +
 	PLA
 	JSL Ganon_CheckAncillaVulnerability
--- a/gk/variable_ganon_vulnerability.asm
+++ b/gk/variable_ganon_vulnerability.asm
@@ -4,14 +4,12 @@ Ganon_CheckAncillaVulnerability:
 	PLA
 	PHX : PHA
 	LDA.l GanonVulnerabilityItem
-	BVS .no_weakness
-	AND.b #$7F
+	BMI .no_weakness
 	TAX : PLA
 	CMP.l Ganon_CheckByAncilla, X : BNE +
 	PLX : BRA .vulnerable
 +	PLX : PHA
 	LDA.l GanonVulnerabilityItem
-	AND.b #$7F
 	BEQ .silver_arrows
 	CMP.b #$01 : BEQ .silver_arrows
 	CMP.b #$11 : BEQ .somaria
@@ -36,7 +34,6 @@ Ganon_CheckAncillaVulnerability:
 .vulnerable
 	PHX
 	LDA.l GanonVulnerabilityItem
-	AND.b #$7F
 	TAX
 	LDA.l Ganon_IFrameDuration, X
 	PLX
@@ -55,7 +52,7 @@ Ganon_CheckAncillaVulnerability:
 	RTL
 ;--------------------------------------------------------------------------------
 Ganon_CheckPowderVulnerability:
-	LDA.l GanonVulnerabilityItem : AND.b #$7F : CMP.b #$05 : BNE .normal
+	LDA.l GanonVulnerabilityItem : CMP.b #$05 : BNE .normal
 	LDA.w SpriteTypeTable, X : CMP.b #$D7 : BNE .normal
 	LDA.w $0EE0, X : BNE .normal ; ganon has i-frames
 	LDA.l Ganon_IFrameDuration+$05
@@ -72,7 +69,7 @@ Ganon_CheckPowderVulnerability:
 Ganon_CheckBeeVulnerability:
 ; X is bee sprite index
 ; Y is target sprite index
-	LDA.l GanonVulnerabilityItem : AND.b #$7F : CMP.b #$10 : BNE .normal
+	LDA.l GanonVulnerabilityItem : CMP.b #$10 : BNE .normal
 	LDA.w SpriteTypeTable, Y : CMP.b #$D7 : BNE .normal
 	LDA.w $0EE0, Y : BNE .normal ; ganon has i-frames
 	LDA.l Ganon_IFrameDuration+$10
@@ -91,14 +88,14 @@ Ganon_CheckInvincible:
 	LDA.w $04C5 : CMP.b #$02 : BEQ .not_transparent
 	LDA.w SpriteTypeTable, X : CMP.b #$D7 : BNE .transparent ; non-stunned ganon
 	LDA.w UseY1 : AND.b #$0A : BEQ .transparent ; normal behavior if not hammering
-	LDA.l GanonVulnerabilityItem : AND.b #$7F : CMP.b #$0C : BNE .transparent
+	LDA.l GanonVulnerabilityItem : CMP.b #$0C : BNE .transparent
 .not_transparent
 	LDA.b #$00 : RTL
 .transparent
 	LDA.b #$01 : RTL
 ;--------------------------------------------------------------------------------
 Ganon_CheckHammerVulnerability:
-	LDA.l GanonVulnerabilityItem : AND.b #$7F : CMP.b #$0C : BNE .normal
+	LDA.l GanonVulnerabilityItem : CMP.b #$0C : BNE .normal
 	LDA.w SpriteTypeTable, X : CMP.b #$D7 : BNE .normal
 	LDA.w $0EE0, X : BNE .normal ; ganon has i-frames
 	LDA.l Ganon_IFrameDuration+$0C
@@ -111,7 +108,7 @@ Ganon_CheckHammerVulnerability:
 ;--------------------------------------------------------------------------------
 CheckBeeBoss:
 ; Y is sprite index
-	LDA.l GanonVulnerabilityItem : AND.b #$7F : CMP.b #$10 : BNE .normal
+	LDA.l GanonVulnerabilityItem : CMP.b #$10 : BNE .normal
 	LDA.w SpriteTypeTable, Y : CMP.b #$D7 : BNE .normal
 	LDA.b #$00 : RTL
 .normal
--- a/glitched.asm
+++ b/glitched.asm
@@ -70,7 +70,7 @@ GetAgahnimLightning:
 ;1 = Forbid
 AllowJoypadInput:
 	LDA.l PermitSQFromBosses : BEQ .fullCheck
-	LDA.w RoomItemsTaken : AND.b #$80 : BEQ .fullCheck
+	JSL CheckBossDropTouched : BEQ .fullCheck
 		LDA.w MedallionFlag : ORA.w CutsceneFlag ; we have heart container, do short check
 RTL
 	.fullCheck
--- a/goalitem.asm
+++ b/goalitem.asm
@@ -1,8 +1,5 @@
 GoalItemGanonCheck:
 	LDA.w SpriteTypeTable, X : CMP.b #$D6 : BNE .success ; skip if not ganon
-		LDA.l GanonVulnerabilityItem : BPL +
-		LDA.w SpriteActivity, X : CMP.b #$12 : BEQ .fail
-		+
 		LDA.b #$01 : JSL CheckConditionPass
 		BCS .success

--- a/halfmagicbat.asm
+++ b/halfmagicbat.asm
@@ -2,13 +2,20 @@
 ; Randomize Half Magic Bat
 ;--------------------------------------------------------------------------------
 GetMagicBatItem:
-	JSL ItemSet_MagicBat
 	%GetPossiblyEncryptedItem(MagicBatItem, SpriteItemValues)
 	CMP.b #$FF : BEQ .normalLogic
 	TAY
-	PHA : LDA.l MagicBatItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID : PLA
+	PHA
+	JSL ShieldCheck
+	BCC .have_shield
+	LDA.l MagicBatItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
+	JSL ItemSet_MagicBat
+	PLA
 	STZ.b ItemReceiptMethod ; 0 = Receiving item from an NPC or message
 	JML Link_ReceiveItem
+.have_shield
+	PLA
+	RTL
 .normalLogic
 	LDA.l HalfMagic
 	STA.l MagicConsumption
--- a/heartpieces.asm
+++ b/heartpieces.asm
@@ -5,8 +5,17 @@ HeartPieceGet:
    PHX : PHY
    LDA.w SprItemMWPlayer, X : STA.l !MULTIWORLD_SPRITEITEM_PLAYER_ID
    LDY.w SprSourceItemId, X
+    JSL HeartGet
+    BCC +
    JSL MaybeMarkDigSpotCollected
-    .skipLoad
+    +
+    PLY : PLX
+    RTL
+;--------------------------------------------------------------------------------
+HeartGet:
+    JSL ShieldCheck
+    BCC .skip
+
    LDA.w SprItemMWPlayer, X : STA.l !MULTIWORLD_ITEM_PLAYER_ID
    CPY.b #$26 : BNE .not_heart ; don't add a 1/4 heart if it's not a heart piece
        CMP.b #$00 : BNE .not_heart
@@ -16,15 +25,27 @@ HeartPieceGet:
    STZ.w ItemReceiptMethod ; 0 = Receiving item from an NPC or message
    JSL Link_ReceiveItem
    JSL MaybeUnlockTabletAnimation
-
-    PLY : PLX
-RTL
+    SEC
+    RTL
+.skip
+    JSL MaybeFreeLinkFromTablet
+    CLC
+    RTL
 ;--------------------------------------------------------------------------------
 HeartContainerGet:
    PHX : PHY
    JSL IncrementBossSword
    LDY.w SprSourceItemId, X
-    BRA HeartPieceGet_skipLoad
+    JSL HeartGet
+    PLY : PLX
+    BCC +
+    LDA.w RoomItemsTaken
+    ORA.b #$80
+    STA.w RoomItemsTaken
+
+    LDA.b #$01
+    STA.l BossDropTouched
+RTL
 ;--------------------------------------------------------------------------------
 DrawHeartPieceGFX:
    PHP
--- a/hooks.asm
+++ b/hooks.asm
@@ -997,12 +997,6 @@ LDA.w BottleListExpanded, X

 org $89895C ; 4895C - ancilla_init.asm:1344 (LDA PotionList, X)
 LDA.w PotionListExpanded, X
-
-org $89895A
-LDX.b #$06
-
-org $89896A
-ADC.b #$01
 ;--------------------------------------------------------------------------------
 org $86D1EB ; 351EB - sprite_absorbable.asm:364 (STA $7EF375) ; bugbug commented out until i figure out why it doesn't work
 JSL HandleBombAbsorbtion
@@ -1035,7 +1029,6 @@ JSL RefillHealth
 ;--------------------------------------------------------------------------------
 org $80F922 ; <- 7922 - Bank00.asm:8543 - (JSL HUD.RefillMagicPower : BCC .beta)
 JSL RefillMagic
-;--------------------------------------------------------------------------------

 ;================================================================================
 ; Early Bottle Fix
@@ -1060,8 +1053,12 @@ Overworld_Entrance_BRANCH_EPSILON: ; go here to lock doors
 org $81C50D : JSL CheckDungeonWorld
 org $81C517 : JSL CheckDungeonCompletion
 org $81C523 : JSL CheckDungeonCompletion
-org $81C710 : JSL CheckSpawnPrize
-BCS RoomTag_GetHeartForPrize_spawn_prize : BRA RoomTag_GetHeartForPrize_delete_tag
+org $81C709 : JSL CheckBossDropTouched : NOP
+org $81C710
+	JSL CheckSpawnPrize
+	BCS RoomTag_GetHeartForPrize_spawn_prize
+	BRA RoomTag_GetHeartForPrize_delete_tag
+	warnpc $81C731
 org $81C742 : JSL SpawnDungeonPrize : PLA : RTS
 org $8799EA : JML SetItemPose
 org $88C415 : JSL PendantMusicCheck
@@ -1073,6 +1070,7 @@ org $88C622 : BCC ItemReceipt_Animate_continue
 org $88C6BA : JSL CheckPoseItemCoordinates
 org $88C6C3 : JSL PrepPrizeVRAMHigh
 org $88C6F4 : JSL PrepPrizeVRAMLow
+org $88CAC4 : JSL CheckBossDropTouched : NOP
 org $88CAD6 : JSL HandleDropSFX : NOP #2
 org $88CADC : BCC Ancilla29_MilestoneItemReceipt_skip_crystal_sfx
 org $88CAE9 : JSL PrepPrizeTile
@@ -1172,8 +1170,6 @@ ORA.w #$8000 : STA.w $007E, Y
 ORA.w #$4000 : STA.w $0084, Y
 JSL AddYMarker : NOP #2
 ;--------------------------------------------------------------------------------
-org $8DF779 ; <- 6F779 (not in disassembly) - mushroom bottle hud tile
-dw $20D2, $60D2, $20E2, $202D ; (Orig: $2044, $2045, $2046, $2047)
 org $8DF789+6 ; <- 6F789+6 (not in disassembly) - red bottle hud tile, lower right
 dw $2413 ; (Orig: #$24E3)
 org $8DF789+6+8  ; green bottle hud tile, lower right
@@ -1527,8 +1523,9 @@ JSL DrawHeartPiecesMenu : BRA DrawEquipment_in_a_dungeon
 ;================================================================================
 ; 300 Rupee NPC
 ;--------------------------------------------------------------------------------
-org $9EF060 ; <- F7060 - sprite_shopkeeper.asm:242 (INC $0D80, X)
-JSL Set300RupeeNPCItem : NOP
+org $9EF058 ; <- F7060 - sprite_shopkeeper.asm:242 (INC $0D80, X)
+JSL Set300RupeeNPCItem
+BCS + : RTS : NOP #6 : +

 ;================================================================================
 ; Tree Kid Fix
@@ -2016,7 +2013,7 @@ org $85EE53 ; <- 2EE53 - mushroom.asm : 22
 JSL ItemCheck_Mushroom : NOP #2
 ;--------------------------------------------------------------------------------
 org $85EE8C ; <- 2EE8C - mushroom.asm : 69
-JSL ItemSet_Mushroom : NOP
+JSL ItemSet_Mushroom : NOP #5
 ;--------------------------------------------------------------------------------
 org $85F53E ; <- 2F53E - sprite_potion_shop.asm : 40
 JSL ItemCheck_Powder : CMP.b #$20
@@ -2030,8 +2027,15 @@ JSL ItemCheck_MagicBat : BEQ + : RTS : NOP : +
 ;================================================================================
 org $86BD6C ; <- 33D6C - sprite_middle_aged_man.asm:143 (JSL Link_ReceiveItem)
 JSL Multiworld_MiddleAgedMan_ReactToSecretKeepingResponse
+BRA + : NOP #8 : +
+;--------------------------------------------------------------------------------
+org $86BE70 ; <- 33E72 - bank_06.asm:11877
+BRA + : NOP #10 : +
+
 org $86BE81 ; <- 33E81 - sprite_hobo.asm:150 (JSL Link_ReceiveItem)
 JSL Multiworld_Hobo_GrantBottle
+BRA + : NOP #8 : +
+;--------------------------------------------------------------------------------
 org $8589B4 ; <- 289B4 ; sprite_master_sword.asm:183 (JSL Link_ReceiveItem)
 JSL Multiworld_MasterSword_GrantToPlayer
 ;================================================================================
@@ -2044,7 +2048,10 @@ org $85EF79 ; <- 2EF79 - sprite_heart_upgrades.asm:128 (JSL Sprite_PrepAndDrawSi
 JSL DrawHeartContainerGFX
 ;--------------------------------------------------------------------------------
 org $85EFCE ; <- 2EFCE - sprite_heart_upgrades.asm:176 (JSL Link_ReceiveItem)
-JSL HeartContainerGet
+JSL HeartContainerGet ; this also handles setting the boss-killed flag if appropriate
+PLX
+RTS
+warnpc $85EFDC
 ;--------------------------------------------------------------------------------
 ;--------------------------------------------------------------------------------
 org $8799B1 ; 399B1 - Bank07.asm:4063 (CPY.b #$3E : BNE .notHeartContainer)
@@ -2070,10 +2077,13 @@ JSL HeartPieceSpawnDelayFix
 ;--------------------------------------------------------------------------------
 org $85F08A ; <- 2F08A - sprite_heart_upgrades.asm : 324 - (LDA $7EF36B : INC A : AND.b #$03 : STA $7EF36B : BNE .got_4_piecese) item determination
 JSL HeartPieceGet
+PHP
 JSL DynamicDrawCleanup
+PLP : BCC +
 JSL IsMedallion
 BCS + : BRA Sprite_EB_HeartPiece_handle_flags : + ; Don't change OW flags if we're
 STZ.w SpriteAITable, X : RTS                      ; getting a tablet item
+warnpc $85F0C0
 ;--------------------------------------------------------------------------------
 org $86C0B0 ; <- 340B0 - sprite prep
 JSL HeartPieceSpritePrep
@@ -2857,9 +2867,43 @@ JSL CheckFluteInHUD
 NOP #3
 ;--------------------------------------------------------------------------------

+
 ;================================================================================
-; Orange Potion (Chateau Romani)
-;--------------------------------------------------------------------------------
-org $87A15C ; bank_07.asm@6963 (LDA.l $7EF35C, X)
-JSL CheckOrangePotion
+; Pikit Nonsense
 ;--------------------------------------------------------------------------------
+org $81EC39
+JSL SmallChest_ShieldCheck
+BCC Dungeon_OpenKeyedObject_couldntFindChest+1
+
+org $81EC17
+JSL BigChest_ShieldCheck
+BCC Dungeon_OpenKeyedObject_couldntFindChest
+NOP #2
+
+org $9E8D6F
+JML PikitSteal
+
+org $9E8CF2
+JSL PikitDigest
+NOP #2
+
+org $879A52
+JSL LinkSnoring
+
+org $879AAD
+JSL LinkAwaken
+
+org $879A31
+JSL TuckLink
+NOP #2
+
+org $80F950
+NOP #2
+
+org $81EEB3
+JSL MaybeFlagVoOChestGamePrize
+BCS ContinueVoOCheck
+PLB : RTL
+
+org $81EEC7
+ContinueVoOCheck:
--- a/initsramtable.asm
+++ b/initsramtable.asm
@@ -114,14 +114,15 @@ StartingGenericKeys: skip 1             ; PC 0x18338B
 InitInventoryTracking: skip 2           ; PC 0x18338C \ Need to set bits here for silver arrows,
 InitBowTracking: skip 2                 ; PC 0x18338E / boomerangs, powder/mushroom, etc 
 InitItemLimitCounts: skip 16            ; PC 0x183390
-skip 34                                 ;
+skip 32                                 ;
+InitPikitItem: dw $0004                 ;
 InitFluteBitfield: db $00               ;
 InitSpecialWeaponLevel: db $00          ;
 InitItemOnB: db $00                     ;
-InitProgressIndicator: db $02           ; PC 0x1833C5 - Set to $80 for instant post-aga with standard
-InitProgressFlags: db $14               ; PC 0x1833C6 - Set to $00 for standard
+InitProgressIndicator: db $00           ; PC 0x1833C5 - Set to $80 for instant post-aga with standard
+InitProgressFlags: db $04               ; PC 0x1833C6 - Set to $00 for standard
 InitMapIcons: skip 1                    ; PC 0x1833C7
-InitStartingEntrance: db $01            ; PC 0x1833C8 - Set to $00 for standard
+InitStartingEntrance: db $00            ; PC 0x1833C8 - Set to $00 for standard
 InitNpcFlagsVanilla: skip 1             ; PC 0x1833C9
 InitCurrentWorld: skip 1                ; PC 0x1833CA
 skip 1                                  ; PC 0x1833CB
--- a/inventory.asm
+++ b/inventory.asm
@@ -649,16 +649,23 @@ RTL
 CollectPowder:
  LDY.w SprSourceItemId, X ; Retrieve stored item type
  BNE +
-	; if for any reason the item value is 0 reload it, just in case
-	  %GetPossiblyEncryptedItem(WitchItem, SpriteItemValues) : TAY
-  + PHA
-    LDA.l WitchItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
-    LDA.b #$01 : STA.l ShopEnableCount
+  ; if for any reason the item value is 0 reload it, just in case
+    %GetPossiblyEncryptedItem(WitchItem, SpriteItemValues) : TAY
+  +
+  PHA
+  JSL ShieldCheck
+  BCC .skip
+
+
+  LDA.l WitchItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
+  LDA.b #$01 : STA.l ShopEnableCount
  PLA
  STZ.w ItemReceiptMethod ; item from NPC
  JSL Link_ReceiveItem
-  PHA : LDA.b #$00 : STA.l ShopEnableCount : STA.l PowderFlag : PLA
+  PHA : LDA.b #$00 : STA.l ShopEnableCount : STA.l PowderFlag
  JSL ItemSet_Powder
+.skip
+  PLA
 RTL
 ;--------------------------------------------------------------------------------

--- a/itemdatatables.asm
+++ b/itemdatatables.asm
@@ -239,7 +239,7 @@ endmacro
 %ReceiptProps($63, -4, 0, $FF, $F36A, $FF, skip, rng_multi) ; 63 - RNG pool item (multi)
 %ReceiptProps($64, -4, 0, $FF, $F340, $FF, skip, progressive_bow) ; 64 - Progressive bow
 %ReceiptProps($65, -4, 0, $FF, $F340, $FF, skip, progressive_bow_2) ; 65 - Progressive bow
-%ReceiptProps($66, -4, 0, $51, $F36E, $FF, skip, skip) ; 66 - Potion refill (yellow)
+%ReceiptProps($66, -4, 0, $FF, $F36A, $FF, skip, skip) ; 66 - 
 %ReceiptProps($67, -4, 0, $FF, $F36A, $FF, skip, skip) ; 67 - 
 %ReceiptProps($68, -4, 0, $FF, $F36A, $FF, skip, skip) ; 68 - 
 %ReceiptProps($69, -4, 0, $FF, $F36A, $FF, skip, skip) ; 69 - 
@@ -416,40 +416,40 @@ macro SpriteProps(id, chest_width, standing_width, chest_pal, standing_pal, addr
 	pullpc
 endmacro

-%SpriteProps($00, 0, 2, $05, $02, PalettesVanilla_blue_ice+$0E)         ; 00 - Fighter sword & Shield
-%SpriteProps($01, 0, 2, $05, $05, PalettesCustom_master_sword)          ; 01 - Master sword
-%SpriteProps($02, 0, 2, $05, $01, PalettesCustom_tempered_sword)        ; 02 - Tempered sword
-%SpriteProps($03, 0, 2, $05, $04, PalettesCustom_golden_sword)          ; 03 - Golden sword
+%SpriteProps($00, 0, 0, $05, $80, PalettesCustom_fighter_shield)        ; 00 - Fighter sword & Shield
+%SpriteProps($01, 0, 0, $05, $80, PalettesCustom_fighter_shield)        ; 01 - Master sword
+%SpriteProps($02, 0, 0, $05, $80, PalettesCustom_fighter_shield)        ; 02 - Tempered sword
+%SpriteProps($03, 0, 0, $05, $80, PalettesCustom_fighter_shield)        ; 03 - Golden sword
 %SpriteProps($04, 0, 0, $05, $80, PalettesCustom_fighter_shield)        ; 04 - Fighter shield
 %SpriteProps($05, 2, 2, $05, $80, PalettesCustom_red_shield)            ; 05 - Fire shield
 %SpriteProps($06, 2, 2, $05, $80, PalettesCustom_mirror_shield)         ; 06 - Mirror shield
-%SpriteProps($07, 0, 0, $01, $01, PalettesVanilla_red_melon+$0E)        ; 07 - Fire rod
-%SpriteProps($08, 0, 0, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 08 - Ice rod
-%SpriteProps($09, 0, 0, $01, $01, PalettesVanilla_red_melon+$0E)        ; 09 - Hammer
-%SpriteProps($0A, 0, 0, $01, $01, PalettesVanilla_red_melon+$0E)        ; 0A - Hookshot
-%SpriteProps($0B, 0, 0, $01, $01, PalettesVanilla_red_melon+$0E)        ; 0B - Bow
-%SpriteProps($0C, 0, 0, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 0C - Blue Boomerang
-%SpriteProps($0D, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 0D - Powder
+%SpriteProps($07, 0, 0, $01, $80, PalettesCustom_fighter_shield)        ; 07 - Fire rod
+%SpriteProps($08, 0, 0, $02, $80, PalettesCustom_fighter_shield)        ; 08 - Ice rod
+%SpriteProps($09, 0, 0, $01, $80, PalettesCustom_fighter_shield)        ; 09 - Hammer
+%SpriteProps($0A, 0, 0, $01, $80, PalettesCustom_fighter_shield)        ; 0A - Hookshot
+%SpriteProps($0B, 0, 0, $01, $80, PalettesCustom_fighter_shield)        ; 0B - Bow
+%SpriteProps($0C, 0, 0, $02, $80, PalettesCustom_fighter_shield)        ; 0C - Blue Boomerang
+%SpriteProps($0D, 2, 0, $02, $80, PalettesCustom_fighter_shield)        ; 0D - Powder
 %SpriteProps($0E, 2, 0, $02, $03, PalettesVanilla_blue_ice+$0E)         ; 0E - Bottle refill (bee)
-%SpriteProps($0F, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 0F - Bombos
-%SpriteProps($10, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 10 - Ether
-%SpriteProps($11, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 11 - Quake
-%SpriteProps($12, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 12 - Lamp
-%SpriteProps($13, 0, 0, $01, $01, PalettesVanilla_red_melon+$0E)        ; 13 - Shovel
-%SpriteProps($14, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 14 - Flute
-%SpriteProps($15, 0, 0, $01, $01, PalettesVanilla_red_melon+$0E)        ; 15 - Somaria
-%SpriteProps($16, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 16 - Bottle
+%SpriteProps($0F, 2, 0, $04, $80, PalettesCustom_fighter_shield)        ; 0F - Bombos
+%SpriteProps($10, 2, 0, $04, $80, PalettesCustom_fighter_shield)        ; 10 - Ether
+%SpriteProps($11, 2, 0, $04, $80, PalettesCustom_fighter_shield)        ; 11 - Quake
+%SpriteProps($12, 2, 0, $01, $80, PalettesCustom_fighter_shield)        ; 12 - Lamp
+%SpriteProps($13, 0, 0, $01, $80, PalettesCustom_fighter_shield)        ; 13 - Shovel
+%SpriteProps($14, 2, 0, $02, $80, PalettesCustom_fighter_shield)        ; 14 - Flute
+%SpriteProps($15, 0, 0, $01, $80, PalettesCustom_fighter_shield)        ; 15 - Somaria
+%SpriteProps($16, 2, 0, $01, $80, PalettesCustom_fighter_shield)        ; 16 - Bottle
 %SpriteProps($17, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 17 - Heart piece
-%SpriteProps($18, 0, 0, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 18 - Byrna
-%SpriteProps($19, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 19 - Cape
-%SpriteProps($1A, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 1A - Mirror
-%SpriteProps($1B, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 1B - Glove
-%SpriteProps($1C, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 1C - Mitts
-%SpriteProps($1D, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 1D - Book
-%SpriteProps($1E, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 1E - Flippers
-%SpriteProps($1F, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 1F - Pearl
+%SpriteProps($18, 0, 0, $02, $80, PalettesCustom_fighter_shield)        ; 18 - Byrna
+%SpriteProps($19, 2, 0, $01, $80, PalettesCustom_fighter_shield)        ; 19 - Cape
+%SpriteProps($1A, 2, 0, $02, $80, PalettesCustom_fighter_shield)        ; 1A - Mirror
+%SpriteProps($1B, 2, 0, $01, $80, PalettesCustom_fighter_shield)        ; 1B - Glove
+%SpriteProps($1C, 2, 0, $04, $80, PalettesCustom_fighter_shield)        ; 1C - Mitts
+%SpriteProps($1D, 2, 0, $04, $80, PalettesCustom_fighter_shield)        ; 1D - Book
+%SpriteProps($1E, 2, 0, $02, $80, PalettesCustom_fighter_shield)        ; 1E - Flippers
+%SpriteProps($1F, 2, 0, $01, $80, PalettesCustom_fighter_shield)        ; 1F - Pearl
 %SpriteProps($20, 2, 2, $86, $86, PalettesCustom_crystal)               ; 20 - Crystal
-%SpriteProps($21, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 21 - Net
+%SpriteProps($21, 2, 0, $01, $80, PalettesCustom_fighter_shield)        ; 21 - Net
 %SpriteProps($22, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 22 - Blue mail
 %SpriteProps($23, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 23 - Red mail
 %SpriteProps($24, 0, 0, $02, $04, PalettesVanilla_blue_ice+$0E)         ; 24 - Small key
@@ -457,11 +457,11 @@ endmacro
 %SpriteProps($26, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 26 - Heart container from 4/4
 %SpriteProps($27, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 27 - Bomb
 %SpriteProps($28, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 28 - 3 bombs
-%SpriteProps($29, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 29 - Mushroom
-%SpriteProps($2A, 0, 0, $01, $01, PalettesVanilla_red_melon+$0E)        ; 2A - Red boomerang
-%SpriteProps($2B, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 2B - Full bottle (red)
-%SpriteProps($2C, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 2C - Full bottle (green)
-%SpriteProps($2D, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 2D - Full bottle (blue)
+%SpriteProps($29, 2, 0, $04, $80, PalettesCustom_fighter_shield)        ; 29 - Mushroom
+%SpriteProps($2A, 0, 0, $01, $80, PalettesCustom_fighter_shield)        ; 2A - Red boomerang
+%SpriteProps($2B, 2, 0, $01, $80, PalettesCustom_fighter_shield)        ; 2B - Full bottle (red)
+%SpriteProps($2C, 2, 0, $04, $80, PalettesCustom_fighter_shield)        ; 2C - Full bottle (green)
+%SpriteProps($2D, 2, 0, $02, $80, PalettesCustom_fighter_shield)        ; 2D - Full bottle (blue)
 %SpriteProps($2E, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 2E - Potion refill (red)
 %SpriteProps($2F, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 2F - Potion refill (green)
 %SpriteProps($30, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 30 - Potion refill (blue)
@@ -474,10 +474,10 @@ endmacro
 %SpriteProps($37, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 37 - Green pendant
 %SpriteProps($38, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 38 - Red pendant
 %SpriteProps($39, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 39 - Blue pendant
-%SpriteProps($3A, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 3A - Bow And Arrows
-%SpriteProps($3B, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 3B - Silver Bow
-%SpriteProps($3C, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 3C - Full bottle (bee)
-%SpriteProps($3D, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 3D - Full bottle (fairy)
+%SpriteProps($3A, 2, 0, $02, $80, PalettesCustom_fighter_shield)        ; 3A - Bow And Arrows
+%SpriteProps($3B, 2, 0, $01, $80, PalettesCustom_fighter_shield)        ; 3B - Silver Bow
+%SpriteProps($3C, 2, 0, $02, $80, PalettesCustom_fighter_shield)        ; 3C - Full bottle (bee)
+%SpriteProps($3D, 2, 0, $02, $80, PalettesCustom_fighter_shield)        ; 3D - Full bottle (fairy)
 %SpriteProps($3E, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 3E - Boss heart
 %SpriteProps($3F, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 3F - Sanc heart
 %SpriteProps($40, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 40 - 100 rupees
@@ -488,23 +488,23 @@ endmacro
 %SpriteProps($45, 0, 0, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 45 - Small magic
 %SpriteProps($46, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 46 - 300 rupees
 %SpriteProps($47, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 47 - 20 rupees green
-%SpriteProps($48, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 48 - Full bottle (good bee)
-%SpriteProps($49, 0, 2, $05, $02, PalettesCustom_fighter_shield)        ; 49 - Tossed fighter sword
-%SpriteProps($4A, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 4A - Active Flute
-%SpriteProps($4B, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 4B - Boots
+%SpriteProps($48, 2, 0, $02, $80, PalettesCustom_fighter_shield)        ; 48 - Full bottle (good bee)
+%SpriteProps($49, 0, 0, $05, $80, PalettesCustom_fighter_shield)        ; 49 - Tossed fighter sword
+%SpriteProps($4A, 2, 0, $02, $80, PalettesCustom_fighter_shield)        ; 4A - Active Flute
+%SpriteProps($4B, 2, 0, $01, $80, PalettesCustom_fighter_shield)        ; 4B - Boots
 %SpriteProps($4C, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 4C - Bomb capacity (50)
 %SpriteProps($4D, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 4D - Arrow capacity (70)
-%SpriteProps($4E, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 4E - 1/2 magic
-%SpriteProps($4F, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 4F - 1/4 magic
-%SpriteProps($50, 0, 2, $05, $02, PalettesCustom_master_sword)          ; 50 - Safe master sword
+%SpriteProps($4E, 2, 0, $04, $80, PalettesCustom_fighter_shield)        ; 4E - 1/2 magic
+%SpriteProps($4F, 2, 0, $04, $80, PalettesCustom_fighter_shield)        ; 4F - 1/4 magic
+%SpriteProps($50, 0, 0, $05, $80, PalettesCustom_fighter_shield)        ; 50 - Safe master sword
 %SpriteProps($51, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 51 - Bomb capacity (+5)
-%SpriteProps($52, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 52 - Bomb capacity (+10)
+%SpriteProps($52, 2, 0, $04, $80, PalettesCustom_fighter_shield)        ; 52 - Bomb capacity (+10)
 %SpriteProps($53, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 53 - Arrow capacity (+5)
 %SpriteProps($54, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 54 - Arrow capacity (+10)
 %SpriteProps($55, 2, 2, $04, $04, $0000)                                ; 55 - Programmable item 1
 %SpriteProps($56, 2, 2, $04, $04, $0000)                                ; 56 - Programmable item 2
 %SpriteProps($57, 2, 2, $04, $04, $0000)                                ; 57 - Programmable item 3
-%SpriteProps($58, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 58 - Upgrade-only Silver Arrows
+%SpriteProps($58, 2, 0, $01, $80, PalettesCustom_fighter_shield)        ; 58 - Upgrade-only Silver Arrows
 %SpriteProps($59, 0, 0, $03, $03, PalettesCustom_off_black)             ; 59 - Rupoor
 %SpriteProps($5A, 2, 2, $01, $01, $0000)                                ; 5A - Nothing
 %SpriteProps($5B, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 5B - Red clock
@@ -518,7 +518,7 @@ endmacro
 %SpriteProps($63, 2, 2, $FF, $FF, $0000)                                ; 63 - RNG pool item (multi)
 %SpriteProps($64, 2, 2, $FF, $FF, $0000)                                ; 64 - Progressive bow
 %SpriteProps($65, 2, 2, $FF, $FF, $0000)                                ; 65 - Progressive bow
-%SpriteProps($66, 2, 2, $02, $02, $0000)                                ; 66 - Potion refill (yellow)
+%SpriteProps($66, 2, 2, $00, $00, $0000)                                ; 66 - 
 %SpriteProps($67, 2, 2, $00, $00, $0000)                                ; 67 - 
 %SpriteProps($68, 2, 2, $00, $00, $0000)                                ; 68 - 
 %SpriteProps($69, 2, 2, $00, $00, $0000)                                ; 69 - 
@@ -696,7 +696,7 @@ endmacro
 %InventoryItem($01, $0081, SwordTime, $0000) ; 01 - Master sword
 %InventoryItem($02, $0001, SwordTime, $0000) ; 02 - Tempered sword
 %InventoryItem($03, $0081, SwordTime, $0000) ; 03 - Butter sword
-%InventoryItem($04, $0081, $0000, $0000) ; 04 - Fighter shield
+%InventoryItem($04, $0080, $0000, $0000) ; 04 - Fighter shield
 %InventoryItem($05, $0081, $0000, $0000) ; 05 - Fire shield
 %InventoryItem($06, $0081, $0000, $0000) ; 06 - Mirror shield
 %InventoryItem($07, $0085, $0000, $0000) ; 07 - Fire rod
@@ -794,7 +794,7 @@ endmacro
 %InventoryItem($63, $0001, $0000, $0000) ; 63 - RNG pool item (multi)
 %InventoryItem($64, $00A5, $0000, $0000) ; 64 - Progressive bow
 %InventoryItem($65, $00A5, $0000, $0000) ; 65 - Progressive bow
-%InventoryItem($66, $0081, $0000, $0000) ; 66 - Potion refill (yellow)
+%InventoryItem($66, $0001, $0000, $0000) ; 66 -
 %InventoryItem($67, $0001, $0000, $0000) ; 67 -
 %InventoryItem($68, $0001, $0000, $0000) ; 68 -
 %InventoryItem($69, $0001, $0000, $0000) ; 69 -
@@ -1054,7 +1054,7 @@ ItemReceiptGraphicsOffsets:
 	dw $0                                  ; 63 - RNG pool item (multi)
 	dw $0                                  ; 64 - Progressive bow
 	dw $0                                  ; 65 - Progressive bow
-	dw $0CE0                               ; 66 - Potion refill (yellow)
+	dw $0                                  ; 66 -
 	dw $0                                  ; 67 -
 	dw $0                                  ; 68 -
 	dw $0                                  ; 69 -
@@ -1220,40 +1220,40 @@ ItemReceiptGraphicsOffsets:
 ; for receipt and non-receipt drawing.
 ;===================================================================================================
 StandingItemGraphicsOffsets:
-	dw $0860                               ; 00 - Fighter Sword and Shield
-	dw $00E0                               ; 01 - Master Sword
-	dw $0120                               ; 02 - Tempered Sword
-	dw $0160                               ; 03 - Butter Sword
+	dw BigDecompressionBuffer+$09E0        ; 00 - Fighter Sword and Shield
+	dw BigDecompressionBuffer+$09E0        ; 01 - Master Sword
+	dw BigDecompressionBuffer+$09E0        ; 02 - Tempered Sword
+	dw BigDecompressionBuffer+$09E0        ; 03 - Butter Sword
 	dw BigDecompressionBuffer+$09E0        ; 04 - Fighter Shield
 	dw BigDecompressionBuffer+$1940        ; 05 - Fire Shield
 	dw BigDecompressionBuffer+$0C80        ; 06 - Mirror Shield
-	dw BigDecompressionBuffer+$1C80        ; 07 - Fire Rod
-	dw BigDecompressionBuffer+$1C80        ; 08 - Ice Rod
-	dw BigDecompressionBuffer+$1CA0        ; 09 - Hammer
-	dw BigDecompressionBuffer+$1C60        ; 0A - Hookshot
-	dw BigDecompressionBuffer+$1C00        ; 0B - Bow
-	dw BigDecompressionBuffer+$1DE0        ; 0C - Boomerang
-	dw BigDecompressionBuffer+$1CC0        ; 0D - Powder
+	dw BigDecompressionBuffer+$09E0        ; 07 - Fire Rod
+	dw BigDecompressionBuffer+$09E0        ; 08 - Ice Rod
+	dw BigDecompressionBuffer+$09E0        ; 09 - Hammer
+	dw BigDecompressionBuffer+$09E0        ; 0A - Hookshot
+	dw BigDecompressionBuffer+$09E0        ; 0B - Bow
+	dw BigDecompressionBuffer+$09E0        ; 0C - Boomerang
+	dw BigDecompressionBuffer+$09E0        ; 0D - Powder
 	dw 0                                   ; 0E - Bottle Refill (bee)
-	dw BigDecompressionBuffer+$1440        ; 0F - Bombos
-	dw BigDecompressionBuffer+$1400        ; 10 - Ether
-	dw BigDecompressionBuffer+$1480        ; 11 - Quake
-	dw BigDecompressionBuffer+$10C0        ; 12 - Lamp
-	dw BigDecompressionBuffer+$11E0        ; 13 - Shovel
-	dw BigDecompressionBuffer+$0C40        ; 14 - Flute
-	dw BigDecompressionBuffer+$1C40        ; 15 - Somaria
-	dw BigDecompressionBuffer+$14C0        ; 16 - Bottle
+	dw BigDecompressionBuffer+$09E0        ; 0F - Bombos
+	dw BigDecompressionBuffer+$09E0        ; 10 - Ether
+	dw BigDecompressionBuffer+$09E0        ; 11 - Quake
+	dw BigDecompressionBuffer+$09E0        ; 12 - Lamp
+	dw BigDecompressionBuffer+$09E0        ; 13 - Shovel
+	dw BigDecompressionBuffer+$09E0        ; 14 - Flute
+	dw BigDecompressionBuffer+$09E0        ; 15 - Somaria
+	dw BigDecompressionBuffer+$09E0        ; 16 - Bottle
 	dw BigDecompressionBuffer+$0C00        ; 17 - Heartpiece
-	dw BigDecompressionBuffer+$1C40        ; 18 - Byrna
-	dw BigDecompressionBuffer+$1100        ; 19 - Cape
-	dw BigDecompressionBuffer+$1040        ; 1A - Mirror
-	dw BigDecompressionBuffer+$1D40        ; 1B - Glove
-	dw BigDecompressionBuffer+$1D40        ; 1C - Mitts
-	dw BigDecompressionBuffer+$1D80        ; 1D - Book
-	dw BigDecompressionBuffer+$1000        ; 1E - Flippers
-	dw BigDecompressionBuffer+$1180        ; 1F - Pearl
+	dw BigDecompressionBuffer+$09E0        ; 18 - Byrna
+	dw BigDecompressionBuffer+$09E0        ; 19 - Cape
+	dw BigDecompressionBuffer+$09E0        ; 1A - Mirror
+	dw BigDecompressionBuffer+$09E0        ; 1B - Glove
+	dw BigDecompressionBuffer+$09E0        ; 1C - Mitts
+	dw BigDecompressionBuffer+$09E0        ; 1D - Book
+	dw BigDecompressionBuffer+$09E0        ; 1E - Flippers
+	dw BigDecompressionBuffer+$09E0        ; 1F - Pearl
 	dw BigDecompressionBuffer+$08A0        ; 20 - Crystal
-	dw BigDecompressionBuffer+$0860        ; 21 - Net
+	dw BigDecompressionBuffer+$09E0        ; 21 - Net
 	dw BigDecompressionBuffer+$1900        ; 22 - Blue Mail
 	dw BigDecompressionBuffer+$1900        ; 23 - Red Mail
 	dw BigDecompressionBuffer+$1DC0        ; 24 - Small Key
@@ -1261,11 +1261,11 @@ StandingItemGraphicsOffsets:
 	dw BigDecompressionBuffer+$18C0        ; 26 - Heart Container from 4/4
 	dw BigDecompressionBuffer+$1080        ; 27 - Bomb
 	dw BigDecompressionBuffer+$1840        ; 28 - 3 bombs
-	dw BigDecompressionBuffer+$1540        ; 29 - Mushroom
-	dw BigDecompressionBuffer+$1DE0        ; 2A - Red boomerang
-	dw BigDecompressionBuffer+$1500        ; 2B - Full bottle (red)
-	dw BigDecompressionBuffer+$1500        ; 2C - Full bottle (green)
-	dw BigDecompressionBuffer+$1500        ; 2D - Full bottle (blue)
+	dw BigDecompressionBuffer+$09E0        ; 29 - Mushroom
+	dw BigDecompressionBuffer+$09E0        ; 2A - Red boomerang
+	dw BigDecompressionBuffer+$09E0        ; 2B - Full bottle (red)
+	dw BigDecompressionBuffer+$09E0        ; 2C - Full bottle (green)
+	dw BigDecompressionBuffer+$09E0        ; 2D - Full bottle (blue)
 	dw $0920                               ; 2E - Potion refill (red)
 	dw $08A0                               ; 2F - Potion refill (green)
 	dw $08E0                               ; 30 - Potion refill (blue)
@@ -1278,10 +1278,10 @@ StandingItemGraphicsOffsets:
 	dw $0820                               ; 37 - Green pendant
 	dw BigDecompressionBuffer+$0080        ; 38 - Blue pendant
 	dw BigDecompressionBuffer+$0080        ; 39 - Red pendant
-	dw BigDecompressionBuffer+$0920        ; 3A - Tossed bow
-	dw BigDecompressionBuffer+$08E0        ; 3B - Silvers
-	dw BigDecompressionBuffer+$09A0        ; 3C - Full bottle (bee)
-	dw BigDecompressionBuffer+$0960        ; 3D - Full bottle (fairy)
+	dw BigDecompressionBuffer+$09E0        ; 3A - Tossed bow
+	dw BigDecompressionBuffer+$09E0        ; 3B - Silvers
+	dw BigDecompressionBuffer+$09E0        ; 3C - Full bottle (bee)
+	dw BigDecompressionBuffer+$09E0        ; 3D - Full bottle (fairy)
 	dw BigDecompressionBuffer+$18C0        ; 3E - Boss heart
 	dw BigDecompressionBuffer+$18C0        ; 3F - Sanc heart
 	dw BigDecompressionBuffer+$0D20        ; 40 - 100 rupees
@@ -1292,25 +1292,25 @@ StandingItemGraphicsOffsets:
 	dw BigDecompressionBuffer+$0CE0        ; 45 - Small magic
 	dw BigDecompressionBuffer+$0DA0        ; 46 - 300 rupees
 	dw BigDecompressionBuffer+$0000        ; 47 - 20 rupees green
-	dw BigDecompressionBuffer+$09A0        ; 48 - Full bottle (good bee)
-	dw $00A0                               ; 49 - Tossed fighter sword
-	dw BigDecompressionBuffer+$0C40        ; 4A - Active Flute
-	dw BigDecompressionBuffer+$0040        ; 4B - Boots
+	dw BigDecompressionBuffer+$09E0        ; 48 - Full bottle (good bee)
+	dw BigDecompressionBuffer+$09E0        ; 49 - Tossed fighter sword
+	dw BigDecompressionBuffer+$09E0        ; 4A - Active Flute
+	dw BigDecompressionBuffer+$09E0        ; 4B - Boots

 	; Rando items
 	dw $04A0                               ; 4C - Bomb capacity (50)
 	dw $05A0                               ; 4D - Arrow capacity (70)
-	dw $01A0                               ; 4E - 1/2 magic
-	dw $01E0                               ; 4F - 1/4 magic
-	dw $00E0                               ; 50 - Safe master sword
+	dw BigDecompressionBuffer+$09E0        ; 4E - 1/2 magic
+	dw BigDecompressionBuffer+$09E0        ; 4F - 1/4 magic
+	dw BigDecompressionBuffer+$09E0        ; 50 - Safe master sword
 	dw $0420                               ; 51 - Bomb capacity (+5)
-	dw $0460                               ; 52 - Bomb capacity (+10)
+	dw BigDecompressionBuffer+$09E0        ; 52 - Bomb capacity (+10)
 	dw $0520                               ; 53 - Arrow capacity (+5)
 	dw $0560                               ; 54 - Arrow capacity (+10)
 	dw $0                                  ; 55 - Programmable item 1
 	dw $0                                  ; 56 - Programmable item 2
 	dw $0                                  ; 57 - Programmable item 3
-	dw $05E0                               ; 58 - Upgrade-only silver arrows
+	dw BigDecompressionBuffer+$09E0        ; 58 - Upgrade-only silver arrows
 	dw $0                                  ; 59 - Rupoor
 	dw $0020                               ; 5A - Nothing
 	dw $0DE0                               ; 5B - Red clock
@@ -1324,7 +1324,7 @@ StandingItemGraphicsOffsets:
 	dw $0                                  ; 63 - RNG pool item (multi)
 	dw $0                                  ; 64 - Progressive bow
 	dw $0                                  ; 65 - Progressive bow
-	dw $0CA0                               ; 66 - Potion refill (yellow)
+	dw $0                                  ; 66 -
 	dw $0                                  ; 67 -
 	dw $0                                  ; 68 -
 	dw $0                                  ; 69 -
@@ -1590,7 +1590,7 @@ VRAMAddressOffset:
 	dw $0024                               ; 63 - RNG pool item (multi)
 	dw $0024                               ; 64 - Progressive bow
 	dw $0024                               ; 65 - Progressive bow
-	dw $0024                               ; 66 - Potion refill (yellow)
+	dw $0024                               ; 66 -
 	dw $0024                               ; 67 -
 	dw $0024                               ; 68 -
 	dw $0024                               ; 69 -
--- a/keydrop/standing_items.asm
+++ b/keydrop/standing_items.asm
@@ -699,6 +699,14 @@ KeyGet:
        LDA.l StandingItemsOn : BNE +
            PLA : RTL
        + LDY.w SprSourceItemId, X
+
+        JSL ShieldCheck
+        BCS .not_replaced
+            PLA : PLA : PLA ; remove stored address to jump back to
+            PLA ; restore the A value going into KeyGet
+            JML $86D1A8
+        .not_replaced
+
        LDA.w SprItemIndex, X : STA.w SpawnedItemIndex
        LDA.w SprItemFlags, X : STA.w SpawnedItemFlag
        STY.b Scrap00
--- a/multiworld.asm
+++ b/multiworld.asm
@@ -89,6 +89,9 @@ GetMultiworldItem:
 	PHP
 	LDA.l !MULTIWORLD_ITEM : BNE +
 	LDA.l !MULTIWORLD_HUD_TIMER : BNE +
+	LDA.l ShieldEquipment : BNE ++
+	LDA.l PikitItem : CMP.b #$04 : BNE +
+	++
 		BRL .return
 	+

@@ -128,6 +131,34 @@ GetMultiworldItem:
 		BRL .return
 	+

+	LDA.l ShieldEquipment : BNE +
+	LDA.l PikitItem : CMP.b #$04 : BEQ +
+
+	LDY.b #$10
+	-
+		DEY
+		BMI .restore_shield
+		LDA.w $0E20, Y
+		CMP.b #$AA
+		BNE - ; go to next sprite if this sprite isn't a pikit
+		LDA.w $0DD0, Y
+		BEQ - ; go to next sprite if this sprite is dead/inactive
+		LDA.w $0ED0, Y
+		CMP.b #$04
+		BNE - ; go to next sprite if this pikit isn't grabbing a shield
+		LDA.w $0E90, Y
+		CMP.b #$04
+		BNE - ; go to next sprite if this pikit isn't grabbing a shield
+
+		BRA + ; active pikit has a shield
+
+	.restore_shield
+		; we have a pikit item, but no shield, and there's no pikit actively
+		; eating a shield, so return the shield to prevent a softlock
+		LDA.b #$01
+		STA.l ShieldEquipment
+	+
+
 	LDA.l !MULTIWORLD_ITEM : BNE +
 		BRL .return
 	+
@@ -207,35 +238,69 @@ RTL

 Multiworld_BottleVendor_GiveBottle:
 {
+	PHA
+	JSL ShieldCheck
+	PLA
+	BCC .no_take_shield
+
 	PHA : PHP
 	SEP #$20
 	LDA.l BottleMerchant_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
 	PLP : PLA

 	JSL Link_ReceiveItem ; thing we wrote over
-RTL
+	RTL
+
+.no_take_shield
+	PLA : PLA : PLA : PLX
+	JML $85EB3A
 }

 Multiworld_MiddleAgedMan_ReactToSecretKeepingResponse:
 {
+	PHA
+	JSL ShieldCheck
+	PLA
+	BCC .no_take_shield
+
 	PHA : PHP
 	SEP #$20
 	LDA.l PurpleChest_Item_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
 	PLP : PLA

-	JSL Link_ReceiveItem ; thing we wrote over
-RTL
+	; what we wrote over
+	JSL Link_ReceiveItem
+	LDA.l NpcFlagsVanilla
+	ORA.b #$10
+	STA.l NpcFlagsVanilla
+
+.no_take_shield
+	RTL
 }

 Multiworld_Hobo_GrantBottle:
 {
-	PHA : PHP
-	SEP #$20
-	LDA.l HoboItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
-	PLP : PLA
+	PHA
+	JSL ShieldCheck
+	PLA
+	BCC .no_take_shield

-	JSL Link_ReceiveItem ; thing we wrote over
-RTL
+	; first bit we wrote over
+	LDX.b OverworldIndex
+	LDA.l OverworldEventDataWRAM, X
+	ORA.b #$20
+	STA.l OverworldEventDataWRAM, X
+
+	LDA.l HoboItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
+
+	; second bit we wrote over
+	JSL Link_ReceiveItem
+	LDA.l NpcFlagsVanilla
+	ORA.b #$01
+	STA.l NpcFlagsVanilla
+
+.no_take_shield
+	RTL
 }

 Multiworld_MasterSword_GrantToPlayer:
--- a/newhud.asm
+++ b/newhud.asm
@@ -273,15 +273,10 @@ NewHUD_DrawMagicMeter:
        STA.w CurrentMagic
        TAY

+        LDA.b FrameCounter
        REP #$30
-        LDA.w #$0002
-
-        ; ; cycle through colors
-        ; LDA.b FrameCounter
-        ; REP #$30
-        ; AND.w #$000C
-        ; LSR
-
+        AND.w #$000C
+        LSR
        BRA .recolor

 .set_index ; this branch is always 0000 when taken
--- a/newitems.asm
+++ b/newitems.asm
@@ -935,7 +935,7 @@ BottleListExpanded:
    db $16, $2B, $2C, $2D, $3D, $3C, $48

 PotionListExpanded:
-    db $66, $FF, $2E, $2F, $30, $FF, $0E
+    db $2E, $2F, $30, $FF, $0E
 ;--------------------------------------------------------------------------------
 HandleBowTracking:
 ; In: A - Item Receipt ID
@@ -1159,12 +1159,12 @@ JML StatsFinalPrep
 ;--------------------------------------------------------------------------------
 ChestPrep:
 	LDA.b #$01 : STA.w ItemReceiptMethod
-        JSL IncrementChestCounter
+	JSL IncrementChestCounter
 	LDA.l ServerRequestMode : BEQ +
 		JSL ChestItemServiceRequest
 		RTL
 	+
-    LDY.b Scrap0C ; get item value
+	LDY.b Scrap0C ; get item value
 	SEC
 RTL

--- a/npcitems.asm
+++ b/npcitems.asm
@@ -104,9 +104,17 @@ ItemSet_MagicBat:
 RTL

 ItemSet_OldMan:
-	PHA : LDA.l OldManItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID : PLA
+	PHA
+	JSL ShieldCheck
+	BCC .skip
+
+	LDA.l OldManItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
+	PLA
 	JSL Link_ReceiveItem ; thing we wrote over
-	PHA : LDA.l NpcFlags : ORA.b #$01 : STA.l NpcFlags : PLA
+	PHA
+	LDA.l NpcFlags : ORA.b #$01 : STA.l NpcFlags
+.skip
+	PLA
 RTL

 ItemSet_ZoraKing:
@@ -114,26 +122,46 @@ ItemSet_ZoraKing:
 RTL

 ItemSet_SickKid:
-	PHA : LDA.l SickKidItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID : PLA
+	PHA
+	JSL ShieldCheck
+	BCC .skip
+
+	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
 	JSL UpdateLootHUD
+.skip
 	PLA
 RTL

 ItemSet_TreeKid:
-	PHA : LDA.l TreeKidItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID : PLA
+	PHA
+	JSL ShieldCheck
+	BCC .skip
+
+	LDA.l TreeKidItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
+	PLA
 	JSL Link_ReceiveItem ; thing we wrote over
-	PHA : LDA.l NpcFlags : ORA.b #$08 : STA.l NpcFlags : PLA
+	PHA
+	LDA.l NpcFlags : ORA.b #$08 : STA.l NpcFlags
+.skip
+	PLA
 RTL

 ItemSet_Sahasrala:
-	PHA : LDA.l SahasralaItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID : PLA
+	PHA
+	JSL ShieldCheck
+	BCC .skip
+
+	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
 	JSL UpdateLootHUD
+.skip
 	PLA
 RTL

@@ -142,25 +170,39 @@ ItemSet_Catfish:
 RTL

 ItemSet_Library:
-	PHA : LDA.l LibraryItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID : PLA
+	PHA
+	JSL ShieldCheck
+	BCC .skip
+
+	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
 	JSL UpdateLootHUD
+.skip
 	PLA
 RTL

 ItemSet_Mushroom:
 	PHA
-		LDA.l NpcFlags+1 : ORA.b #$10 : STA.l NpcFlags+1
 		LDY.w SprSourceItemId, X ; Retrieve stored item type
 		BNE +
 			; if for any reason the item value is 0 reload it, just in case
 			%GetPossiblyEncryptedItem(MushroomItem, SpriteItemValues) : TAY
 		+
+
+		JSL ShieldCheck
+		BCC .skip
 	LDA.l MushroomItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
-	PLA
 	STZ.w ItemReceiptMethod ; thing we wrote over - the mushroom is an npc for item purposes apparently
+	PLA
+
+	JSL Link_ReceiveItem
+	PHA
+	LDA.l NpcFlags+1 : ORA.b #$10 : STA.l NpcFlags+1
+.skip
+	PLA
 RTL

 ItemSet_Powder:
@@ -193,11 +235,25 @@ Set300RupeeNPCItem:
 	+
 	LDA.w #$0000
 	LDY.b #$46 ; default to a normal 300 rupees
-	.done
+
+.done
 	SEP #$20
 	STA.l !MULTIWORLD_ITEM_PLAYER_ID
+	JSL ShieldCheck
+	BCC .cant_take
+
+	LDA.w RoomItemsTaken
+	ORA.b #$40
+	STA.w RoomItemsTaken
+
 	PLP : PLA
-RTL
+	SEC
+	RTL
+
+.cant_take
+	PLP : PLA
+	CLC
+	RTL

 ;================================================================================
 ; Randomize Zora King
@@ -241,16 +297,26 @@ MarkThrownItem:
 	LDA.b OverworldIndex : CMP.b #$81 : BNE .catfish

 	.zora
-    JSL ItemSet_ZoraKing
+	JSL ShieldCheck
+	BCC .skip
+
+	JSL ItemSet_ZoraKing
 	LDA.l ZoraItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
 	BRA .done

 	.catfish
-    JSL ItemSet_Catfish
+	JSL ShieldCheck
+	BCC .skip
+	JSL ItemSet_Catfish
+
 	LDA.l CatfishItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID

 	.done
 	PLA
 	JSL Link_ReceiveItem ; thing we wrote over
-RTL
+	RTL
+
+	.skip
+	PLA
+	RTL
 ;--------------------------------------------------------------------------------
--- a/pikit.asm
+++ b/pikit.asm
@@ -0,0 +1,471 @@
+pushpc
+org $89EB78
+db $18, $1A, $AA ; replace uncle with pikit
+
+org $80DCCE
+db $1B ; load sprite sheet for pikit in link's house
+
+org $80FC74
+NOP #2 ; do not load rain-state sprites
+
+org $8A8029
+; move table slightly to center under pikit
+db $C9, $C0, $DD
+db $D0, $B8, $3C
+pullpc
+
+TuckLink:
+	; what we wrote over
+	STZ.w $037C
+	STZ.w $037D
+
+	LDA.b #$40 : STA.w $0FC2
+	LDA.b #$09 : STA.w $0FC3
+
+	LDA.b #$5A : STA.w $0FC4
+	LDA.b #$21 : STA.w $0FC5
+
+	RTL
+
+LinkSnoring:
+	LDA.l ProgressIndicator
+	BNE +
+
+	LDA.b #$02
+	STA.l ProgressIndicator
+	LDA.b #$1D
+	LDY.b #$00
+	JSL Sprite_ShowMessageUnconditional
+	BRA ++
+
+
+	LDA.b FrameCounter
+	AND.b #$03
+	BNE ++
+
+	LDA.b $9C
+	CMP.b #$20
+	BEQ .lightened
+
+	DEC.b $9C
+	DEC.b $9D
+
++
+	; what we wrote over
+	LDA.b FrameCounter
+	AND.b #$1F
+	RTL
+
+.lightened
+	INC.w $037C
+	INC.w $037D
+	RTL
+
+LinkAwaken:
+	; what we wrote over
+	LDA.b #$06
+	STA.b LinkState
+
+	LDA.l ProgressFlags
+	ORA.b #$10
+	STA.l ProgressFlags
+	LDA.b #$01
+	STA.l StartingEntrance
+	RTL
+
+BigChest_ShieldCheck:
+	PHY
+	LDY.b $0C
+	JSL ShieldCheck
+	STY.b $0C
+	PLY
+	BCC .no_open
+	LDA.l BigKeyField
+	AND.l BitMasks, X
+.no_open
+	RTL
+
+SmallChest_ShieldCheck:
+	PHY
+	LDY.b $0C
+	JSL ShieldCheck
+	STY.b $0C
+	PLY
+	BCC .no_open
+	LDA.w $0402
+	ORA.w RoomFlagMask, Y
+.no_open
+	RTL
+
+ShieldCheck:
+	PHP
+	REP #$30
+	PHX
+	TYA
+	AND.w #$00FF
+	TAX
+	LDA.l PikitItemList, X
+	AND.w #$00FF
+	BNE .replace
+	PLX
+	PLP
+	SEC
+	RTL
+
+.replace
+	LDA.l ShieldEquipment
+	AND.w #$00FF
+	BNE .already_have_shield
+	TXA
+	STA.l PikitItem
+	LDY.w #$0004
+	PLX
+	PLP
+	SEC
+	RTL
+
+.already_have_shield
+	SEP #$30
+	LDA.b #$3C
+	STA.w $012E
+
+	PHY
+	LDA.b #$98
+	LDY.b #$01
+	JSL Sprite_ShowMessageUnconditional
+	PLY
+
+	REP #$30
+
+	PLX
+	PLP
+	CLC
+	RTL
+
+PikitSteal:
+	LDA.l ShieldEquipment
+	BNE .has_shield
+	JSL GetRandomInt
+	JML $9E8D73
+
+.has_shield
+	LDA.b #$04
+	STA.w $0ED0, X
+	STA.w $0E90, X
+	LDA.b #$01
+	STA.w $0E30, X
+
+	STZ.w $012E
+
+	JML $9E8DC3
+
+PikitDigest:
+	LDA.w $0ED0, X
+	CMP.b #$04
+	BNE +
+
+	STZ.w $0E90, X
+
+	LDA.b $6C
+	BNE + ; link is in a doorway; giving him an item could be scary :<
+
+	JSL IncrementPikitCounter
+
+	LDA.l PikitItem
+	CMP.b #$04
+	BEQ +
+
+	TAY
+	STZ.w ItemReceiptMethod
+	JSL Link_ReceiveItem
+
+	LDA.b #$04
+	STA.l PikitItem
+
+
+	; what we wrote over
+	STZ.w $0DA0, X
+	STZ.w $0ED0, X
+
+	RTL
+
+MaybeFlagVoOChestGamePrize:
+	LDA.l $81EDA1, X
+	TAY
+	JSL ShieldCheck
+	BCC .cant_take
+
+	LDA.w RoomItemsTaken
+	ORA.b #$40
+	STA.w RoomItemsTaken
+
+	STX.b $C8
+	STY.b $0C
+
+	SEC
+
+.cant_take
+	RTL
+
+PikitItemList:
+db $01 ; 00 - Fighter Sword and Shield
+db $01 ; 01 - Master Sword
+db $01 ; 02 - Tempered Sword
+db $01 ; 03 - Butter Sword
+db $00 ; 04 - Fighter Shield
+db $00 ; 05 - Fire Shield
+db $00 ; 06 - Mirror Shield
+db $01 ; 07 - Fire Rod
+db $01 ; 08 - Ice Rod
+db $01 ; 09 - Hammer
+db $01 ; 0A - Hookshot
+db $01 ; 0B - Bow
+db $01 ; 0C - Boomerang
+db $01 ; 0D - Powder
+db $00 ; 0E - Bottle Refill (bee)
+db $01 ; 0F - Bombos
+db $01 ; 10 - Ether
+db $01 ; 11 - Quake
+db $01 ; 12 - Lamp
+db $01 ; 13 - Shovel
+db $01 ; 14 - Flute
+db $01 ; 15 - Somaria
+db $01 ; 16 - Bottle
+db $00 ; 17 - Heartpiece
+db $01 ; 18 - Byrna
+db $01 ; 19 - Cape
+db $01 ; 1A - Mirror
+db $01 ; 1B - Glove
+db $01 ; 1C - Mitts
+db $01 ; 1D - Book
+db $01 ; 1E - Flippers
+db $01 ; 1F - Pearl
+db $00 ; 20 - Crystal
+db $01 ; 21 - Net
+db $00 ; 22 - Blue Mail
+db $00 ; 23 - Red Mail
+db $00 ; 24 - Small Key
+db $00 ; 25 - Compass
+db $00 ; 26 - Heart Container from 4/4
+db $00 ; 27 - Bomb
+db $00 ; 28 - 3 bombs
+db $01 ; 29 - Mushroom
+db $01 ; 2A - Red boomerang
+db $01 ; 2B - Full bottle (red)
+db $01 ; 2C - Full bottle (green)
+db $01 ; 2D - Full bottle (blue)
+db $00 ; 2E - Potion refill (red)
+db $00 ; 2F - Potion refill (green)
+db $00 ; 30 - Potion refill (blue)
+db $00 ; 31 - 10 bombs
+db $00 ; 32 - Big key
+db $00 ; 33 - Map
+db $00 ; 34 - 1 rupee
+db $00 ; 35 - 5 rupees
+db $00 ; 36 - 20 rupees
+db $00 ; 37 - Green pendant
+db $00 ; 38 - Blue pendant
+db $00 ; 39 - Red pendant
+db $01 ; 3A - Tossed bow
+db $01 ; 3B - Silvers
+db $01 ; 3C - Full bottle (bee)
+db $01 ; 3D - Full bottle (fairy)
+db $00 ; 3E - Boss heart
+db $00 ; 3F - Sanc heart
+db $00 ; 40 - 100 rupees
+db $00 ; 41 - 50 rupees
+db $00 ; 42 - Heart
+db $00 ; 43 - Arrow
+db $00 ; 44 - 10 arrows
+db $00 ; 45 - Small magic
+db $00 ; 46 - 300 rupees
+db $00 ; 47 - 20 rupees green
+db $01 ; 48 - Full bottle (good bee)
+db $01 ; 49 - Tossed fighter sword
+db $01 ; 4A - Active Flute
+db $01 ; 4B - Boots
+
+db $00 ; 4C - Bomb capacity (50)
+db $00 ; 4D - Arrow capacity (70)
+db $01 ; 4E - 1/2 magic
+db $01 ; 4F - 1/4 magic
+db $01 ; 50 - Safe master sword
+db $00 ; 51 - Bomb capacity (+5)
+db $01 ; 52 - Bomb capacity (+10)
+db $00 ; 53 - Arrow capacity (+5)
+db $00 ; 54 - Arrow capacity (+10)
+db $00 ; 55 - Programmable item 1
+db $00 ; 56 - Programmable item 2
+db $00 ; 57 - Programmable item 3
+db $01 ; 58 - Upgrade-only silver arrows
+db $00 ; 59 - Rupoor
+db $00 ; 5A - Nothing
+db $00 ; 5B - Red clock
+db $00 ; 5C - Blue clock
+db $00 ; 5D - Green clock
+db $01 ; 5E - Progressive sword
+db $00 ; 5F - Progressive shield
+db $00 ; 60 - Progressive armor
+db $01 ; 61 - Progressive glove
+db $00 ; 62 - RNG pool item (single)
+db $00 ; 63 - RNG pool item (multi)
+db $01 ; 64 - Progressive bow
+db $01 ; 65 - Progressive bow
+db $00 ; 66 -
+db $00 ; 67 -
+db $00 ; 68 -
+db $00 ; 69 -
+db $00 ; 6A - Triforce
+db $00 ; 6B - Power star
+db $00 ; 6C - Triforce Piece
+db $00 ; 6D - Server request item
+db $00 ; 6E - Server request item (dungeon drop)
+db $00 ; 6F -
+
+db $00 ; 70 - Map of Light World
+db $00 ; 71 - Map of Dark World
+db $00 ; 72 - Map of Ganon's Tower
+db $00 ; 73 - Map of Turtle Rock
+db $00 ; 74 - Map of Thieves' Town
+db $00 ; 75 - Map of Tower of Hera
+db $00 ; 76 - Map of Ice Palace
+db $00 ; 77 - Map of Skull Woods
+db $00 ; 78 - Map of Misery Mire
+db $00 ; 79 - Map of Dark Palace
+db $00 ; 7A - Map of Swamp Palace
+db $00 ; 7B - Map of Agahnim's Tower
+db $00 ; 7C - Map of Desert Palace
+db $00 ; 7D - Map of Eastern Palace
+db $00 ; 7E - Map of Hyrule Castle
+db $00 ; 7F - Map of Sewers
+
+db $00 ; 80 - Compass of Light World
+db $00 ; 81 - Compass of Dark World
+db $00 ; 82 - Compass of Ganon's Tower
+db $00 ; 83 - Compass of Turtle Rock
+db $00 ; 84 - Compass of Thieves' Town
+db $00 ; 85 - Compass of Tower of Hera
+db $00 ; 86 - Compass of Ice Palace
+db $00 ; 87 - Compass of Skull Woods
+db $00 ; 88 - Compass of Misery Mire
+db $00 ; 89 - Compass of Dark Palace
+db $00 ; 8A - Compass of Swamp Palace
+db $00 ; 8B - Compass of Agahnim's Tower
+db $00 ; 8C - Compass of Desert Palace
+db $00 ; 8D - Compass of Eastern Palace
+db $00 ; 8E - Compass of Hyrule Castle
+db $00 ; 8F - Compass of Sewers
+
+db $00 ; 90 - Skull key
+db $00 ; 91 - Reserved
+db $00 ; 92 - Big key of Ganon's Tower
+db $00 ; 93 - Big key of Turtle Rock
+db $00 ; 94 - Big key of Thieves' Town
+db $00 ; 95 - Big key of Tower of Hera
+db $00 ; 96 - Big key of Ice Palace
+db $00 ; 97 - Big key of Skull Woods
+db $00 ; 98 - Big key of Misery Mire
+db $00 ; 99 - Big key of Dark Palace
+db $00 ; 9A - Big key of Swamp Palace
+db $00 ; 9B - Big key of Agahnim's Tower
+db $00 ; 9C - Big key of Desert Palace
+db $00 ; 9D - Big key of Eastern Palace
+db $00 ; 9E - Big key of Hyrule Castle
+db $00 ; 9F - Big key of Sewers
+
+db $00 ; A0 - Small key of Sewers
+db $00 ; A1 - Small key of Hyrule Castle
+db $00 ; A2 - Small key of Eastern Palace
+db $00 ; A3 - Small key of Desert Palace
+db $00 ; A4 - Small key of Agahnim's Tower
+db $00 ; A5 - Small key of Swamp Palace
+db $00 ; A6 - Small key of Dark Palace
+db $00 ; A7 - Small key of Misery Mire
+db $00 ; A8 - Small key of Skull Woods
+db $00 ; A9 - Small key of Ice Palace
+db $00 ; AA - Small key of Tower of Hera
+db $00 ; AB - Small key of Thieves' Town
+db $00 ; AC - Small key of Turtle Rock
+db $00 ; AD - Small key of Ganon's Tower
+db $00 ; AE - Reserved
+db $00 ; AF - Generic small key
+db $00 ; B0 - Crystal 6
+db $00 ; B1 - Crystal 1
+db $00 ; B2 - Crystal 5
+db $00 ; B3 - Crystal 7
+db $00 ; B4 - Crystal 2
+db $00 ; B5 - Crystal 4
+db $00 ; B6 - Crystal 3
+db $00 ; B7 - Reserved
+db $00 ; B8 -
+db $00 ; B9 -
+db $00 ; BA -
+db $00 ; BB -
+db $00 ; BC -
+db $00 ; BD -
+db $00 ; BE -
+db $00 ; BF -
+db $00 ; C0 -
+db $00 ; C1 -
+db $00 ; C2 -
+db $00 ; C3 -
+db $00 ; C4 -
+db $00 ; C5 -
+db $00 ; C6 -
+db $00 ; C7 -
+db $00 ; C8 -
+db $00 ; C9 -
+db $00 ; CA -
+db $00 ; CB -
+db $00 ; CC -
+db $00 ; CD -
+db $00 ; CE -
+db $00 ; CF -
+db $00 ; D0 - Bee trap
+db $00 ; D1 - Apples
+db $00 ; D2 - Fairy
+db $00 ; D3 - Chicken
+db $00 ; D4 - Big Magic
+db $00 ; D5 - 5 Arrows
+db $00 ; D6 - Good Bee
+db $00 ; D7 -
+db $00 ; D8 -
+db $00 ; D9 -
+db $00 ; DA -
+db $00 ; DB -
+db $00 ; DC -
+db $00 ; DD -
+db $00 ; DE -
+db $00 ; DF -
+db $00 ; E0 -
+db $00 ; E1 -
+db $00 ; E2 -
+db $00 ; E3 -
+db $00 ; E4 -
+db $00 ; E5 -
+db $00 ; E6 -
+db $00 ; E7 -
+db $00 ; E8 -
+db $00 ; E9 -
+db $00 ; EA -
+db $00 ; EB -
+db $00 ; EC -
+db $00 ; ED -
+db $00 ; EE -
+db $00 ; EF -
+db $00 ; F0 -
+db $00 ; F1 -
+db $00 ; F2 -
+db $00 ; F3 -
+db $00 ; F4 -
+db $00 ; F5 -
+db $00 ; F6 -
+db $00 ; F7 -
+db $00 ; F8 -
+db $00 ; F9 -
+db $00 ; FA -
+db $00 ; FB -
+db $00 ; FC -
+db $00 ; FD -
+db $00 ; FE - Server request (async)
+db $00 ; FF -
--- a/ram.asm
+++ b/ram.asm
@@ -622,7 +622,8 @@ HexToDecDigit3: skip 1             ;
 HexToDecDigit4: skip 1             ;
 HexToDecDigit5: skip 1             ;
 SpriteSkipEOR: skip 2              ; Used in utilities.asm to determine when to skip drawing sprites. Zero-padded
-skip $2B                           ; Unused
+skip $2A                           ; Unused
+BossDropTouched: skip 1
 AltTextFlag: skip 2                ; dialog.asm: Determines whether to load from vanilla decompression buffer
                                   ; or from a secondary buffer (used for things like free dungeon item text)
 BossKills: skip 1                  ;
--- a/shopkeeper.asm
+++ b/shopkeeper.asm
@@ -433,13 +433,12 @@ 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 #$66 : BEQ .refill ; Yellow 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
+        LDA.b #$01 : STA.l ShopkeeperRefill ; If this is on, don't toggle bit to remove from shop
    +

        LDA.l ShopType : AND.b #$80 : BNE .buy ; don't charge if this is a take-any
@@ -456,6 +455,16 @@ Shopkeeper_BuyItem:
    LDA.b #$3C : STA.w SFX2 ; error sound
    JMP .done
    .buy
+
+    LDA.l ShopInventory, X
+    TAY
+    JSL ShieldCheck
+    BCS +
+        JMP .done
+    +
+    ; Y now has the (possibly-substituted) item ID
+
+
    LDA.l ShopType : AND.b #$80 : BNE ++ ; don't charge if this is a take-any
        REP #$20 : LDA.l CurrentRupees : !SUB.l ShopInventory+1, X : STA.l CurrentRupees : SEP #$20 ; Take price away
    ++
@@ -467,9 +476,9 @@ Shopkeeper_BuyItem:
            LDA.l EnableShopItemCount, X : STA.l ShopEnableCount ; If so, store the permission to count the item here.
        +++
    PLX
-    LDA.l ShopInventory, X
-    JSL AttemptItemSubstitution
-    TAY : JSL Link_ReceiveItem
+
+    ; Y still has item ID
+    JSL Link_ReceiveItem
    LDA.l ShopInventory+3, X : INC : STA.l ShopInventory+3, X
    LDA.b #$00 : STA.l ShopEnableCount
    TXA : LSR #2 : TAX
--- a/sram.asm
+++ b/sram.asm
@@ -190,7 +190,8 @@ ItemLimitCounts: skip 16        ; Keeps track of limited non-progressive items s
                                ; See: ItemSubstitutionRules in tables.asm
                                ; Right now this is only used for three items but extra space is
                                ; reserved
-skip 34                         ; Unused
+skip 32                         ; Unused
+PikitItem: skip 2               ; Item stored in shield player is carrying
 FluteBitfield: skip 1           ; 
 SpecialWeaponLevel: skip 1      ; keeps track of level in special weapon modes
 ItemOnB: skip 1                 ; NYI
@@ -324,7 +325,7 @@ MagicCounter: skip 2            ; Magic used by player (16-bit integer)
 HighestMail: skip 1             ; Highest mail level
 SmallKeyCounter: skip 1         ; Total Number of small keys collected (integer)
 HeartPieceCounter: skip 1       ; Total Number of heartpieces collected (integer)
-skip 1                          ; Unused
+PikitFed: skip 1                ; Total Number of shields fed to pikit
 DungeonsCompleted: skip 2       ; Bitfield indicating whether a dungeon's prize has been collected.
                                ; This has the same shape as the dungeon item bitfields.
 MapCountDisplay: skip 2         ;
--- a/stats.asm
+++ b/stats.asm
@@ -5,6 +5,13 @@
 ;
 ; See sram.asm for adresses and documentation of stat values
 ;--------------------------------------------------------------------------------
+IncrementPikitCounter:
+	LDA.l StatsLocked : BNE +
+	LDA.l PikitFed : INC A : BEQ + ; overflow
+		STA.l PikitFed
+	+
+RTL
+;--------------------------------------------------------------------------------
 IncrementBonkCounter:
 	LDA.l StatsLocked : BNE +
 	LDA.l BonkCounter : INC : BEQ + ; overflow
--- a/stats/credits.asm
+++ b/stats/credits.asm
@@ -504,7 +504,7 @@ CreditsLineBlank:
 %blankline()
 %blankline()

-%smallcredits("GWAAKIWI * DUNGEON MAPS", "yellow")
+%smallcredits("PIKIT FEEDER", "red")

 %blankline()

@@ -763,9 +763,7 @@ endif

 %blankline()

-
-%blankline()
-%blankline()
+%bigcreditsleft("SHIELDS EATEN")


 %blankline()
--- a/stats/statConfig.asm
+++ b/stats/statConfig.asm
@@ -34,6 +34,8 @@
 !TOTAL_MAP_TIME_Y = 367
 !TOTAL_LAG_TIME_X = 19
 !TOTAL_LAG_TIME_Y = 370
+!PIKIT_FED_X = 26
+!PIKIT_FED_Y = 373
 !COLLECTION_RATE_X = 22
 !COLLECTION_RATE_Y = 380
 !TOTAL_TIME_X = 19
@@ -67,6 +69,7 @@ CreditsStats:
 %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)
+%AddStat(PikitFed, 0, 0, 8, 3, !PIKIT_FED_X, !PIKIT_FED_Y)
 print "Collection Rate config: ", pc
 %AddStat(TotalItemCounter, 0, 0, 16, 3, !COLLECTION_RATE_X, !COLLECTION_RATE_Y)
 %AddStat(NMIFrames, 1, 0, 32, 4, !TOTAL_TIME_X, !TOTAL_TIME_Y)
--- a/swordswap.asm
+++ b/swordswap.asm
@@ -101,7 +101,7 @@ CheckGanonHammerDamage:
 		LDA.w SpriteTypeTable, X : CMP.b #$D8 ; original behavior except ganon
 		RTL
 	+
-	LDA.l GanonVulnerabilityItem : AND.b #$7F : CMP.b #$0C : BEQ .hammer_silvers
+	LDA.l GanonVulnerabilityItem : CMP.b #$0C : BEQ .hammer_silvers
 	LDA.w SpriteTypeTable, X : CMP.b #$D6 ; original behavior
 	RTL

@@ -132,6 +132,12 @@ GetSmithSword:
 	.buy
 		LDA.l SmithItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
 		LDA.l SmithItem : TAY
+
+		JSL ShieldCheck
+		BCS +
+		JML $86B4A5
+
+		+
 		STZ.w ItemReceiptMethod ; Item from NPC
 		PHX : JSL Link_ReceiveItem : PLX

--- a/tables.asm
+++ b/tables.asm
@@ -105,10 +105,6 @@ db $00
 ;--------------------------------------------------------------------------------
 org $B0802E
 GanonVulnerabilityItem:
-; sn-i iiii
-; s - immune to sword spins in phase 4
-; n - immune to all items
-; i - index of item vulnerability
 db $00 ; $00 = default behavior (silver arrows)
 ;--------------------------------------------------------------------------------
 org $B0902F
--- a/tablets.asm
+++ b/tablets.asm
@@ -57,7 +57,7 @@ RTL
 MaybeUnlockTabletAnimation:
 	PHA : PHP
 		JSL IsMedallion : BCC +
-                        JSR SetTabletItemFlag
+			JSR SetTabletItemFlag
 			STZ.w MedallionFlag ; disable falling-medallion mode
 			STZ.w ForceSwordUp ; release link from item-up pose
 			LDA.b #$00 : STA.b LinkState ; set link to ground state
@@ -73,6 +73,26 @@ MaybeUnlockTabletAnimation:
 	PLP : PLA
 RTL
 ;--------------------------------------------------------------------------------
+MaybeFreeLinkFromTablet:
+	PHA : PHP
+		JSL IsMedallion : BCC +
+			STZ.w MedallionFlag ; disable falling-medallion mode
+			STZ.w ForceSwordUp ; release link from item-up pose
+			LDA.b #$00 : STA.b LinkState ; set link to ground state
+			STZ.w CutsceneFlag
+			STZ.w NoDamage
+
+			REP #$20 ; set 16-bit accumulator
+				LDA.b OverworldIndex : CMP.w #$0030 : BNE ++ ; Desert
+					SEP #$20 ; set 8-bit accumulator
+					LDA.b #$02 : STA.b LinkDirection ; face link forward
+					LDA.b #$3C : STA.b LinkIncapacitatedTimer ; lock link for 60f
+				++
+			SEP #$20 ; set 8-bit accumulator
+		+
+	PLP : PLA
+RTL
+;--------------------------------------------------------------------------------
 IsMedallion:
 	REP #$20 ; set 16-bit accumulator
 	LDA.b OverworldIndex
--- a/vanillalabels.asm
+++ b/vanillalabels.asm
@@ -192,6 +192,7 @@ LoadBackgroundGraphics_arbitrary                           = $80E64D
 RoomTag_GetHeartForPrize                                   = $81C709
 RoomTag_GetHeartForPrize_spawn_prize                       = $81C731
 RoomTag_GetHeartForPrize_delete_tag                        = $81C749
+RoomTag_GetHeartForPrize_exit                              = $81C74D
 Underworld_SetBossOrSancMusicUponEntry                     = $828AD9
 ResetThenCacheRoomEntryProperties                          = $828C73
 RecoverPositionAfterDrowning                               = $829485
@@ -273,6 +274,7 @@ PalettesVanilla_spraux09                                   = $9BD47E
 ; Misc. Data
 ;===================================================================================================
 DungeonMask                                                = $8098C0
+RoomFlagMask                                               = $809900
 GFXSheetPointers_background_bank                           = $80CFC0
 GFXSheetPointers_background_high                           = $80D09F
 GFXSheetPointers_background_low                            = $80D17E
Author	SHA1	Message	Date
Kara Alexandra	079a3ae9a8	Fix max frame count	2026-06-08 16:11:51 -05:00
Kara Alexandra	88d731cf9b	Merge branch 'beta' into pikit_mode_merge	2026-06-07 13:39:04 -05:00
Kara Alexandra	dc05aca244	Minor fixups	2026-06-07 01:27:54 -05:00
Kara Alexandra	440beffc94	Merge branch 'beta' into pikit_mode	2026-06-06 12:43:06 -05:00
Kara Alexandra	0264a85511	Add shop shield handling, credits counter, softlock protection	2026-06-05 01:07:17 -05:00
Kara Alexandra	0f36eca4ab	Add more shield logic	2026-05-02 23:22:37 -05:00
Kara Alexandra	bd722bef33	Fix dig game	2026-02-08 00:33:19 -06:00
Kara Alexandra	9208d06f3a	Fix bonk torches and smithy	2026-02-07 23:52:47 -06:00
Kara Alexandra	2a31b7763b	Fix small chest bug	2026-02-07 21:23:01 -06:00
Kara Alexandra	779c9a27ce	Shield handling for pots and enemy drops and a few more NPCs	2026-02-07 16:51:21 -06:00
Kara Alexandra	381868c3ce	Heart pieces and containers shielding, fix some GFX (swords)	2026-02-05 22:10:53 -06:00
Kara Alexandra	f6c0de88fb	Make valuable items all look like shields, implement a few NPCs	2026-02-01 23:25:24 -06:00
Kara Alexandra	f609727647	Start link with home-pikit telling him to bring shields	2026-02-01 21:33:44 -06:00
Kara Alexandra	2dcfd8e67a	First pass at pikit mode	2026-02-01 00:10:55 -06:00