From f5c0d21a5e9b62842506a01e3be7fa66afa01cf6 Mon Sep 17 00:00:00 2001 From: mckinlee Date: Mon, 6 Jan 2025 14:41:58 -0500 Subject: [Enhancement] Cycle Arrows (#901) * initial implementation * update tooltip * clang format * Fix linux? * how bout now? * pain * ... * linux fix Co-Authored-By: sitton76 <58642183+sitton76@users.noreply.github.com> * clang format * add sfx, requirements, cooldown, etc. * clang format * bug fix and remove unneeded logic * bug fix for the bug fix lol * add auto cycling when out of magic and visual/sfx indicators * forgot about clang format as usual * forgot about that while refactoring * le sigh * Feedback Changes and Refactor Co-Authored-By: Archez * remove VB_MAGIC_ARROW_CONSUME * add more restrictions * Update mm/2s2h/Enhancements/Equipment/ArrowCycle.cpp Co-authored-by: Garrett Cox --------- Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com> Co-authored-by: Archez Co-authored-by: Garrett Cox --- mm/src/code/z_map_exp.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'mm/src/code') diff --git a/mm/src/code/z_map_exp.c b/mm/src/code/z_map_exp.c index 0e4849f3a..2a7a3fec4 100644 --- a/mm/src/code/z_map_exp.c +++ b/mm/src/code/z_map_exp.c @@ -1,6 +1,8 @@ #include "global.h" #include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h" +#include "2s2h/GameInteractor/GameInteractor.h" + s16 sPlayerInitPosX = 0; s16 sPlayerInitPosZ = 0; s16 sPlayerInitDir = 0; @@ -242,13 +244,14 @@ void Map_Update(PlayState* play) { if ((play->pauseCtx.state <= PAUSE_STATE_OPENING_2) && (CHECK_BTN_ALL(controller->press.button, BTN_L)) && !Play_InCsMode(play) && !MapDisp_IsMinimapToggleBlocked(play)) { - if (!R_MINIMAP_DISABLED) { - Audio_PlaySfx(NA_SE_SY_CAMERA_ZOOM_UP); - } else { - Audio_PlaySfx(NA_SE_SY_CAMERA_ZOOM_DOWN); + if (GameInteractor_Should(VB_MINIMAP_TOGGLE, true)) { + if (!R_MINIMAP_DISABLED) { + Audio_PlaySfx(NA_SE_SY_CAMERA_ZOOM_UP); + } else { + Audio_PlaySfx(NA_SE_SY_CAMERA_ZOOM_DOWN); + } + R_MINIMAP_DISABLED ^= 1; } - - R_MINIMAP_DISABLED ^= 1; } MapDisp_Update(play); -- cgit v1.2.3