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

Fix bonk torches and smithy

Browse Source
This commit is contained in:
karafruit
2026-02-07 23:52:47 -06:00
parent 2a31b7763b
commit 9208d06f3a
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bookofmudora.asm
View File

@@ -57,8 +57,13 @@ GiveBonkItem:
PHY : TAY PHY : TAY
JSL ShieldCheck JSL ShieldCheck
TYA : PLY TYA : PLY
BCC .done BCS +
STZ.w $0DD0, X
PLA : PLA : PLA ; remove the stored return address
JML $85FC9D
+
JSR AbsorbKeyCheck : BCC .notKey JSR AbsorbKeyCheck : BCC .notKey
PHY : LDY.b #$24 : JSL AddInventory : PLY ; do inventory processing for a small key PHY : LDY.b #$24 : JSL AddInventory : PLY ; do inventory processing for a small key
LDA.l CurrentSmallKeys : INC A : STA.l CurrentSmallKeys LDA.l CurrentSmallKeys : INC A : STA.l CurrentSmallKeys
@@ -67,7 +72,6 @@ GiveBonkItem:
RTL RTL
.notKey .notKey
PHY : TAY : JSL Link_ReceiveItem : PLY PHY : TAY : JSL Link_ReceiveItem : PLY
.done
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
LoadBonkItem: LoadBonkItem:

4
swordswap.asm
View File

@@ -134,8 +134,10 @@ GetSmithSword:
LDA.l SmithItem : TAY LDA.l SmithItem : TAY
JSL ShieldCheck JSL ShieldCheck
BCC .done BCS +
JML $86B4A5
+
STZ.w ItemReceiptMethod ; Item from NPC STZ.w ItemReceiptMethod ; Item from NPC
PHX : JSL Link_ReceiveItem : PLX PHX : JSL Link_ReceiveItem : PLX