Skip to content

[Enhancement] Bomb Arrows #1496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mckinlee wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

[Enhancement] Bomb Arrows #1496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
03c963c
shoot and go boom
mckinlee Jan 23, 2026
d9d78d2
add bomb model to arrow tip
Jameriquiah Jan 24, 2026
ff6277d
simplify bomb draw and effects
mckinlee Jan 25, 2026
3b0bbae
add bomb arrows to arrow cycling
Jameriquiah Jan 25, 2026
695c3aa
use ObjectExtension and simplify arrow cycle handling
mckinlee Jan 25, 2026
ed541ba
Merge branch 'main' into bomb-arrows
mckinlee Feb 8, 2026
2c7c06b
overhaul
mckinlee Feb 12, 2026
cd09121
feedback/fixes
mckinlee Feb 22, 2026
a7e10ca
clean up diff
mckinlee Feb 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions mm/2s2h/BenGui/BenMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1024,6 +1024,10 @@ void BenMenu::AddEnhancements() {
.CVar("gEnhancements.PlayerActions.ArrowCycle")
.Options(CheckboxOptions().Tooltip(
"While aiming the bow, use R to cycle between Normal, Fire, Ice and Light arrows."));
AddWidget(path, "Bomb Arrows", WIDGET_CVAR_CHECKBOX)
.CVar("gEnhancements.Equipment.BombArrows")
.Options(CheckboxOptions().Tooltip(
"Allows equipping Bomb Arrows by equipping Bombs onto a bow button in the pause menu."));
AddWidget(path, "Remote Bombchu Control", WIDGET_CVAR_CHECKBOX)
.CVar("gEnhancements.PlayerActions.RemoteBombchu")
.Options(CheckboxOptions().Tooltip(
Expand Down
143 changes: 99 additions & 44 deletions mm/2s2h/Enhancements/Equipment/ArrowCycle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,12 @@ s32 Player_UpperAction_7(Player* thisx, PlayState* play);
s32 Player_UpperAction_8(Player* thisx, PlayState* play);
}

extern bool IsBombArrowButton(s32 slot, bool isDpad);
extern void SetBombArrowButton(s32 slot, bool state, bool isDpad);

#define CVAR_NAME "gEnhancements.PlayerActions.ArrowCycle"
#define CVAR CVarGetInteger(CVAR_NAME, 0)
#define BOMB_ARROW_CVAR_NAME "gEnhancements.Equipment.BombArrows"

// Magic arrow costs based on z_player.c
static const s16 sMagicArrowCosts[] = { 4, 4, 8 };
Expand All @@ -29,61 +33,96 @@ static s16 sButtonFlashTimer = 0;
static s16 sButtonFlashCount = 0;
static s8 sJustCycledFrames = 0;

// Arrow Type Definitions
static const PlayerItemAction ARROW_NORMAL = PLAYER_IA_BOW;
static const PlayerItemAction ARROW_FIRE = PLAYER_IA_BOW_FIRE;
static const PlayerItemAction ARROW_ICE = PLAYER_IA_BOW_ICE;
static const PlayerItemAction ARROW_LIGHT = PLAYER_IA_BOW_LIGHT;

static const PlayerItemAction sArrowCycleOrder[] = {
ARROW_NORMAL,
ARROW_FIRE,
ARROW_ICE,
ARROW_LIGHT,
enum ArrowCycleType {
ARROW_CYCLE_NORMAL,
ARROW_CYCLE_FIRE,
ARROW_CYCLE_ICE,
ARROW_CYCLE_LIGHT,
ARROW_CYCLE_BOMB,
ARROW_CYCLE_MAX
};

static const PlayerItemAction sArrowCycleToPlayerIA[] = {
PLAYER_IA_BOW, // ARROW_CYCLE_NORMAL
PLAYER_IA_BOW_FIRE, // ARROW_CYCLE_FIRE
PLAYER_IA_BOW_ICE, // ARROW_CYCLE_ICE
PLAYER_IA_BOW_LIGHT, // ARROW_CYCLE_LIGHT
PLAYER_IA_BOW, // ARROW_CYCLE_BOMB
};

// Utility Functions
static bool IsHoldingBow(Player* player) {
return player->heldItemAction >= ARROW_NORMAL && player->heldItemAction <= ARROW_LIGHT;
return player->heldItemAction >= PLAYER_IA_BOW && player->heldItemAction <= PLAYER_IA_BOW_LIGHT;
}

static bool IsHoldingMagicBow(Player* player) {
return player->heldItemAction >= ARROW_FIRE && player->heldItemAction <= ARROW_LIGHT;
return player->heldItemAction >= PLAYER_IA_BOW_FIRE && player->heldItemAction <= PLAYER_IA_BOW_LIGHT;
}

static bool IsAimingBow(Player* player) {
return IsHoldingBow(player) && ((player->unk_AA5 == PLAYER_UNKAA5_3) || /* Aiming box in first person */
(player->upperActionFunc == Player_UpperAction_7) /* Arrow pulled back on bow */);
}

static bool HasArrowType(PlayerItemAction arrowType) {
switch (arrowType) {
case ARROW_NORMAL:
static bool IsBombArrowEnhancementEnabled() {
return CVarGetInteger(BOMB_ARROW_CVAR_NAME, 0);
}

static bool HasBombArrows() {
return IsBombArrowEnhancementEnabled() && (INV_CONTENT(ITEM_BOMB) == ITEM_BOMB);
}

static bool IsBombArrowButton(const Player* player) {
if (player->heldItemButton < 0) {
return false;
}

if (IS_HELD_DPAD(player->heldItemButton)) {
s32 dpadSlot = HELD_ITEM_TO_DPAD(player->heldItemButton);
return IsBombArrowButton(dpadSlot, true);
}

if (player->heldItemButton == EQUIP_SLOT_B) {
return false;
}

return IsBombArrowButton(player->heldItemButton, false);
}

static bool HasArrowType(ArrowCycleType cycleType) {
switch (cycleType) {
case ARROW_CYCLE_NORMAL:
return true;
case ARROW_FIRE:
case ARROW_CYCLE_FIRE:
return (INV_CONTENT(ITEM_ARROW_FIRE) == ITEM_ARROW_FIRE);
case ARROW_ICE:
case ARROW_CYCLE_ICE:
return (INV_CONTENT(ITEM_ARROW_ICE) == ITEM_ARROW_ICE);
case ARROW_LIGHT:
case ARROW_CYCLE_LIGHT:
return (INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT);
case ARROW_CYCLE_BOMB:
return HasBombArrows();
default:
return false;
}
}

static s32 GetBowItemForArrow(PlayerItemAction arrowType) {
switch (arrowType) {
case ARROW_FIRE:
static s32 GetBowItemForCycleType(ArrowCycleType cycleType) {
switch (cycleType) {
case ARROW_CYCLE_FIRE:
return ITEM_BOW_FIRE;
case ARROW_ICE:
case ARROW_CYCLE_ICE:
return ITEM_BOW_ICE;
case ARROW_LIGHT:
case ARROW_CYCLE_LIGHT:
return ITEM_BOW_LIGHT;
default:
return ITEM_BOW;
}
}

static s32 GetSlotForCycleType(ArrowCycleType cycleType) {
return cycleType == ARROW_CYCLE_BOMB ? SLOT_BOMB : SLOT_BOW;
}

static bool CanCycleArrows() {
Player* player = GET_PLAYER(gPlayState);

Expand All @@ -97,27 +136,37 @@ static bool CanCycleArrows() {

return !gHorseIsMounted && player->rideActor == NULL && INV_CONTENT(SLOT_BOW) == ITEM_BOW &&
(INV_CONTENT(ITEM_ARROW_FIRE) == ITEM_ARROW_FIRE || INV_CONTENT(ITEM_ARROW_ICE) == ITEM_ARROW_ICE ||
INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT);
INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT || HasBombArrows());
}

// Arrow Cycling Logic
static s8 GetNextArrowType(s8 currentArrowType) {
int currentIndex = 0;
for (int i = 0; i < (int)ARRAY_COUNT(sArrowCycleOrder); i++) {
if (sArrowCycleOrder[i] == currentArrowType) {
currentIndex = i;
break;
}
static ArrowCycleType GetCurrentCycleType(Player* player) {
if (IsBombArrowButton(player)) {
return ARROW_CYCLE_BOMB;
}
switch (player->heldItemAction) {
case PLAYER_IA_BOW_FIRE:
return ARROW_CYCLE_FIRE;
case PLAYER_IA_BOW_ICE:
return ARROW_CYCLE_ICE;
case PLAYER_IA_BOW_LIGHT:
return ARROW_CYCLE_LIGHT;
default:
return ARROW_CYCLE_NORMAL;
}
}

for (int offset = 1; offset <= (int)ARRAY_COUNT(sArrowCycleOrder); offset++) {
int nextIndex = (currentIndex + offset) % ARRAY_COUNT(sArrowCycleOrder);
if (HasArrowType(sArrowCycleOrder[nextIndex])) {
return sArrowCycleOrder[nextIndex];
static ArrowCycleType GetNextArrowCycleType(Player* player) {
ArrowCycleType current = GetCurrentCycleType(player);

for (int offset = 1; offset < ARROW_CYCLE_MAX; offset++) {
ArrowCycleType next = static_cast<ArrowCycleType>((current + offset) % ARROW_CYCLE_MAX);
if (HasArrowType(next)) {
return next;
}
}

return ARROW_NORMAL;
return ARROW_CYCLE_NORMAL;
}

// UI Update Functions
Expand Down Expand Up @@ -188,19 +237,22 @@ static void UpdateFlashEffect(PlayState* play) {
&play->interfaceCtx.shipInterface.dpad.dUpAlpha);
}

static void UpdateEquippedBow(PlayState* play, s8 arrowType) {
s32 bowItem = GetBowItemForArrow(static_cast<PlayerItemAction>(arrowType));
static void UpdateEquippedBow(PlayState* play, ArrowCycleType cycleType) {
s32 bowItem = GetBowItemForCycleType(cycleType);
s32 slot = GetSlotForCycleType(cycleType);

// Update C-buttons
for (s32 i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) {
if ((BUTTON_ITEM_EQUIP(0, i) == ITEM_BOW) ||
(BUTTON_ITEM_EQUIP(0, i) >= ITEM_BOW_FIRE && BUTTON_ITEM_EQUIP(0, i) <= ITEM_BOW_LIGHT)) {
BUTTON_ITEM_EQUIP(0, i) = bowItem;
C_SLOT_EQUIP(0, i) = SLOT_BOW;
C_SLOT_EQUIP(0, i) = slot;
Interface_LoadItemIcon(play, i);
gSaveContext.buttonStatus[i] = BTN_ENABLED;
sButtonFlashTimer = BUTTON_FLASH_DURATION;
sButtonFlashCount = 0;

SetBombArrowButton(i, cycleType == ARROW_CYCLE_BOMB, false);
}
}

Expand All @@ -209,11 +261,13 @@ static void UpdateEquippedBow(PlayState* play, s8 arrowType) {
if ((DPAD_BUTTON_ITEM_EQUIP(0, i) == ITEM_BOW) ||
(DPAD_BUTTON_ITEM_EQUIP(0, i) >= ITEM_BOW_FIRE && DPAD_BUTTON_ITEM_EQUIP(0, i) <= ITEM_BOW_LIGHT)) {
DPAD_BUTTON_ITEM_EQUIP(0, i) = bowItem;
DPAD_SLOT_EQUIP(0, i) = SLOT_BOW;
DPAD_SLOT_EQUIP(0, i) = slot;
Interface_Dpad_LoadItemIcon(play, i);
gSaveContext.shipSaveContext.dpad.status[i] = BTN_ENABLED;
sButtonFlashTimer = BUTTON_FLASH_DURATION;
sButtonFlashCount = 0;

SetBombArrowButton(i, cycleType == ARROW_CYCLE_BOMB, true);
}
}

Expand All @@ -222,7 +276,8 @@ static void UpdateEquippedBow(PlayState* play, s8 arrowType) {

// Core Arrow Cycling Function
static void CycleToNextArrow(PlayState* play, Player* player) {
s8 nextArrow = GetNextArrowType(player->heldItemAction);
ArrowCycleType nextType = GetNextArrowCycleType(player);
PlayerItemAction nextIA = sArrowCycleToPlayerIA[nextType];

if (player->heldActor != NULL && player->heldActor->id == ACTOR_EN_ARROW) {
EnArrow* arrow = (EnArrow*)player->heldActor;
Expand All @@ -234,8 +289,8 @@ static void CycleToNextArrow(PlayState* play, Player* player) {
Actor_Kill(&arrow->actor);
}

Player_InitItemAction(play, player, static_cast<PlayerItemAction>(nextArrow));
UpdateEquippedBow(play, nextArrow);
Player_InitItemAction(play, player, nextIA);
UpdateEquippedBow(play, nextType);
Audio_PlaySfx(NA_SE_PL_CHANGE_ARMS);
}

Expand Down
Loading
Loading