diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2025-04-06 11:08:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-06 21:08:25 +0300 |
| commit | 54dd7640969e1f414f9b1111f874f85171ab6987 (patch) | |
| tree | 8f83caa22c5ab811736e3625be599061d478af10 /src/d/d_menu_fmap.cpp | |
| parent | 4361019959acf84f347fec62315f8aefb2d63a6f (diff) | |
GCN pal / jpn support, some debug work (#2375)
* d_save debug cleanup / d_s_menu debug
* gameinfo / kankyo struct debug fixes
* pal building ok
* jp building ok
* some tests with jp
* some more pal/jp tests
Diffstat (limited to 'src/d/d_menu_fmap.cpp')
| -rw-r--r-- | src/d/d_menu_fmap.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/d/d_menu_fmap.cpp b/src/d/d_menu_fmap.cpp index 719e23b047..94fe704c83 100644 --- a/src/d/d_menu_fmap.cpp +++ b/src/d/d_menu_fmap.cpp @@ -1209,6 +1209,18 @@ void dMenu_Fmap_c::spot_map_proc() { { mpDraw2DBack->stageMapMove(mpStick, 1, true); } else if (dMw_Z_TRIGGER() && mpDraw2DTop->isWarpAccept()) { +#if VERSION >= VERSION_GCN_JPN + //! JPN version added a check to make sure if Arbiter's Grounds is cleared that + //! the Mirror Chamber Statue has been spun before allowing portal warping from the map screen. + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[265]) && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361])) { + mpDraw2DTop->createExplain(mpTalkHeap, mpStick); + mpDraw2DTop->getScrnExplainPtr()->openExplain(0x8B4, 0, 0, 0xff, true); + + mPrevProcessAlt = mProcess; + setProcess(PROC_PORTAL_WARP_FORBID); + Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + } else +#endif if (mpDraw2DTop->checkPlayerWarpAccept()) { mIsWarpMap = true; setProcess(PROC_ZOOM_SPOT_TO_REGION); |