Quick fixes for shop fighter shield and retro shop arrow

2023-08-13 19:51:29 -04:00
parent cc83fef9b0
commit a3bc24c383
2 changed files with 15 additions and 5 deletions
--- a/newitems.asm
+++ b/newitems.asm
@@ -202,18 +202,24 @@ ItemBehavior:

        .fighter_shield
        SEP #$10
-        LDX.b #$01
-        JSR .increment_shield
+        LDA.w ShopPurchaseFlag : BNE ..shop_shield
+                -
+                LDX.b #$01
+                JSR .increment_shield
+                RTS
+        ..shop_shield
+        TYX
+        LDA.l InventoryTable_properties,X : BIT.b #$02 : BNE -
        RTS

        .red_shield
        SEP #$10
-        LDA.w ShopPurchaseFlag : BNE .shop_shield
+        LDA.w ShopPurchaseFlag : BNE ..shop_shield
                -
                LDX.b #$02
                JSR .increment_shield
                RTS
-        .shop_shield
+        ..shop_shield
        TYX
        LDA.l InventoryTable_properties,X : BIT.b #$02 : BNE -
        RTS
@@ -411,6 +417,10 @@ ItemBehavior:
        +
        RTS

+        .single_arrow
+        INC.w UpdateHUD
+        RTS
+
        .rupoor
        REP #$20 : LDA.l CurrentRupees : !SUB RupoorDeduction : STA.l CurrentRupees : SEP #$20 ; Take 1 rupee
        RTS