summaryrefslogtreecommitdiff
path: root/mm/src/code/z_player_lib.c
diff options
context:
space:
mode:
authormckinlee <mckinlee@ymail.com>2026-03-19 21:41:24 -0400
committerGitHub <noreply@github.com>2026-03-19 21:41:24 -0400
commitcfd5cc483ae2da52ccc8e00082ef2f8e3d969863 (patch)
tree7f949e637b9627975e6e08bfdec8bbfb32df5565 /mm/src/code/z_player_lib.c
parentf7ccda83aab44cf532798aba306b2cf12a3ea8fb (diff)
[Enhancement] Song Items (#1566)
* equip songs * feedback
Diffstat (limited to 'mm/src/code/z_player_lib.c')
-rw-r--r--mm/src/code/z_player_lib.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/mm/src/code/z_player_lib.c b/mm/src/code/z_player_lib.c
index 5ba73fc3f..3ab319529 100644
--- a/mm/src/code/z_player_lib.c
+++ b/mm/src/code/z_player_lib.c
@@ -760,7 +760,9 @@ ItemId Player_Dpad_GetItemOnButton(PlayState* play, Player* player, DpadEquipSlo
return ITEM_NONE;
}
- return DPAD_BTN_ITEM(slot);
+ ItemId item = DPAD_BTN_ITEM(slot);
+ GameInteractor_Should(VB_GET_ITEM_ON_BUTTON, item, slot, &item);
+ return item;
}
// #endregion
@@ -797,16 +799,23 @@ ItemId Player_GetItemOnButton(PlayState* play, Player* player, EquipSlot slot) {
}
if (slot == EQUIP_SLOT_C_LEFT) {
- return C_BTN_ITEM(EQUIP_SLOT_C_LEFT);
+ ItemId item = C_BTN_ITEM(EQUIP_SLOT_C_LEFT);
+ GameInteractor_Should(VB_GET_ITEM_ON_BUTTON, item, slot, &item);
+ return item;
}
if (slot == EQUIP_SLOT_C_DOWN) {
- return C_BTN_ITEM(EQUIP_SLOT_C_DOWN);
+ ItemId item = C_BTN_ITEM(EQUIP_SLOT_C_DOWN);
+ GameInteractor_Should(VB_GET_ITEM_ON_BUTTON, item, slot, &item);
+ return item;
}
// EQUIP_SLOT_C_RIGHT
-
- return C_BTN_ITEM(EQUIP_SLOT_C_RIGHT);
+ {
+ ItemId item = C_BTN_ITEM(EQUIP_SLOT_C_RIGHT);
+ GameInteractor_Should(VB_GET_ITEM_ON_BUTTON, item, slot, &item);
+ return item;
+ }
}
// #region 2S2H [Dpad]