alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Quick fixes for shop fighter shield and retro shop arrow

Browse Source
This commit is contained in:
cassidoxa
2023-08-13 19:51:29 -04:00
parent cc83fef9b0
commit a3bc24c383
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
itemdatatables.asm
View File

@@ -89,7 +89,7 @@ endmacro
%ReceiptProps($40, -4, 0, $34, $F360, $9C, skip, skip) ; 40 - 100 rupees %ReceiptProps($40, -4, 0, $34, $F360, $9C, skip, skip) ; 40 - 100 rupees
%ReceiptProps($41, -4, 0, $35, $F360, $CE, skip, skip) ; 41 - 50 rupees %ReceiptProps($41, -4, 0, $35, $F360, $CE, skip, skip) ; 41 - 50 rupees
%ReceiptProps($42, -2, 4, $31, $F372, $FF, skip, skip) ; 42 - Heart %ReceiptProps($42, -2, 4, $31, $F372, $FF, skip, skip) ; 42 - Heart
%ReceiptProps($43, -2, 4, $33, $F376, $01, skip, skip) ; 43 - Arrow %ReceiptProps($43, -2, 4, $33, $F376, $01, single_arrow, skip) ; 43 - Arrow
%ReceiptProps($44, -4, 0, $02, $F376, $0A, skip, skip) ; 44 - 10 arrows %ReceiptProps($44, -4, 0, $02, $F376, $0A, skip, skip) ; 44 - 10 arrows
%ReceiptProps($45, -2, 4, $32, $F373, $FF, skip, skip) ; 45 - Small magic %ReceiptProps($45, -2, 4, $32, $F373, $FF, skip, skip) ; 45 - Small magic
%ReceiptProps($46, -4, 0, $36, $F360, $FF, skip, skip) ; 46 - 300 rupees %ReceiptProps($46, -4, 0, $36, $F360, $FF, skip, skip) ; 46 - 300 rupees

18
newitems.asm
View File

@@ -202,18 +202,24 @@ ItemBehavior:
.fighter_shield .fighter_shield
SEP #$10 SEP #$10
LDX.b #$01 LDA.w ShopPurchaseFlag : BNE ..shop_shield
JSR .increment_shield -
LDX.b #$01
JSR .increment_shield
RTS
..shop_shield
TYX
LDA.l InventoryTable_properties,X : BIT.b #$02 : BNE -
RTS RTS
.red_shield .red_shield
SEP #$10 SEP #$10
LDA.w ShopPurchaseFlag : BNE .shop_shield LDA.w ShopPurchaseFlag : BNE ..shop_shield
- -
LDX.b #$02 LDX.b #$02
JSR .increment_shield JSR .increment_shield
RTS RTS
.shop_shield ..shop_shield
TYX TYX
LDA.l InventoryTable_properties,X : BIT.b #$02 : BNE - LDA.l InventoryTable_properties,X : BIT.b #$02 : BNE -
RTS RTS
@@ -411,6 +417,10 @@ ItemBehavior:
+ +
RTS RTS
.single_arrow
INC.w UpdateHUD
RTS
.rupoor .rupoor
REP #$20 : LDA.l CurrentRupees : !SUB RupoorDeduction : STA.l CurrentRupees : SEP #$20 ; Take 1 rupee REP #$20 : LDA.l CurrentRupees : !SUB RupoorDeduction : STA.l CurrentRupees : SEP #$20 ; Take 1 rupee
RTS RTS