Merge branch 'beta' into pikit_mode_merge

2026-06-07 13:39:04 -05:00
parent dc05aca244 6bf2051bab
commit 88d731cf9b
9 changed files with 166 additions and 154 deletions
@@ -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
-        BRA +
+    CMP.b #$AF : BEQ .generic_key
+    BRA +
    .refill
        JSL Sprite_GetEmptyBottleIndex : BMI .full_bottles
+    .generic_key
        LDA.b #$01 : STA.l ShopkeeperRefill ; If this is on, don't toggle bit to remove from shop
    +