summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris <f1ana@users.noreply.github.com>2026-04-19 11:04:13 -0400
committerGitHub <noreply@github.com>2026-04-19 15:04:13 +0000
commit3be7eff02c7c85dab4127aeb0d6379398e3496b1 (patch)
treedadf9d4e9e3634d811693740feb613f31703c946
parent39dcc0a73c561850279be1d6d1ff548cd443ee6d (diff)
Arrow cycle should check for sufficient magic (#6532)
-rw-r--r--soh/soh/Enhancements/ArrowCycle.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/soh/soh/Enhancements/ArrowCycle.cpp b/soh/soh/Enhancements/ArrowCycle.cpp
index 202f24c4e..f8b9a84fb 100644
--- a/soh/soh/Enhancements/ArrowCycle.cpp
+++ b/soh/soh/Enhancements/ArrowCycle.cpp
@@ -43,11 +43,11 @@ static bool HasArrowType(PlayerItemAction itemAction) {
case PLAYER_IA_BOW:
return true;
case PLAYER_IA_BOW_FIRE:
- return INV_CONTENT(ITEM_ARROW_FIRE) == ITEM_ARROW_FIRE;
+ return INV_CONTENT(ITEM_ARROW_FIRE) == ITEM_ARROW_FIRE && gSaveContext.magic >= sMagicArrowCosts[0];
case PLAYER_IA_BOW_ICE:
- return INV_CONTENT(ITEM_ARROW_ICE) == ITEM_ARROW_ICE;
+ return INV_CONTENT(ITEM_ARROW_ICE) == ITEM_ARROW_ICE && gSaveContext.magic >= sMagicArrowCosts[1];
case PLAYER_IA_BOW_LIGHT:
- return INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT;
+ return INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT && gSaveContext.magic >= sMagicArrowCosts[2];
default:
return false;
}