Shield handling for pots and enemy drops and a few more NPCs

2026-02-07 16:51:21 -06:00
parent 381868c3ce
commit 779c9a27ce
12 changed files with 112 additions and 40 deletions
--- a/keydrop/standing_items.asm
+++ b/keydrop/standing_items.asm
@@ -696,6 +696,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