diff options
| author | Garrett Cox <garrettjcox@gmail.com> | 2025-01-06 14:53:06 -0600 |
|---|---|---|
| committer | Garrett Cox <garrettjcox@gmail.com> | 2025-01-06 14:53:06 -0600 |
| commit | 45f828e8ea1fa877cd9b8edbdba437e2a7b459a8 (patch) | |
| tree | cc525618dda37012d2a104c51dfdfeec72a82e6e /mm/src/code | |
| parent | 3cf540de9cfb53a28d4f1c365f393715359ac639 (diff) | |
| parent | f5c0d21a5e9b62842506a01e3be7fa66afa01cf6 (diff) | |
Merge branch 'develop' of garrettjoecox.github.com:HarbourMasters/2ship2harkinian into develop-rando
Diffstat (limited to 'mm/src/code')
| -rw-r--r-- | mm/src/code/z_map_exp.c | 15 |
1 files changed, 9 insertions, 6 deletions
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); |