Merge pull request #70 from JonHanon/bow-and-silvers-fix

Fixed Bow and Silvers item (#636 in /alttp_vt_randomizer)
2019-06-17 22:48:07 -04:00
parent 246bbf2560 fc25718757
commit 79bb2728f3
1 changed files with 3 additions and 0 deletions
--- a/inventory.asm
+++ b/inventory.asm
@@ -232,6 +232,9 @@ AddInventory:
 		BRL .incrementCounts
 	+ CPY.b #$3B : BNE + ; Bow & Silver Arrows
 		LDA !INVENTORY_SWAP_2 : ORA #$40 : STA !INVENTORY_SWAP_2
+		LDA ArrowMode : BNE +++
+			LDA !INVENTORY_SWAP_2 : ORA #$80 : STA !INVENTORY_SWAP_2 ; activate wood arrows when not in rupee bow
+		+++
 		BRL .incrementCounts
 	+ CPY.b #$43 : BNE + ; Single arrow
 		LDA ArrowMode : BEQ +++