convert jpn logic changes to runtime checks

src/d/d_menu_fmap.cpp

@@ -21,8 +21,9 @@
 #include "d/d_msg_object.h"
 #include "d/d_msg_scrn_explain.h"
 #include "d/d_stage.h"
-#include "helpers/string.hpp"
+#include "dusk/version.hpp"
 #include "f_op/f_op_msg_mng.h"
+#include "helpers/string.hpp"
 
 #if TARGET_PC
 #include "dusk/frame_interpolation.h"
@@ -1217,7 +1218,8 @@ void dMenu_Fmap_c::spot_map_proc() {
     {
         mpDraw2DBack->stageMapMove(mpStick, 1, true);
     } else if (dMw_Z_TRIGGER() && mpDraw2DTop->isWarpAccept()) {
-#if VERSION >= VERSION_GCN_JPN
+#if TARGET_PC || VERSION >= VERSION_GCN_JPN
+        IF_DUSK_BLOCK(dusk::version::isRegionJpn())
         //! 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])) {
@@ -1227,7 +1229,7 @@ void dMenu_Fmap_c::spot_map_proc() {
             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 
+        } IF_DUSK_BLOCK_END else
 #endif
         if (mpDraw2DTop->checkPlayerWarpAccept()) {
             mIsWarpMap = true;