diff --git a/include/JAZelAudio/JAIZelBasic.h b/include/JAZelAudio/JAIZelBasic.h
index 2a0197aed..493d07ebf 100644
--- a/include/JAZelAudio/JAIZelBasic.h
+++ b/include/JAZelAudio/JAIZelBasic.h
@@ -202,7 +202,7 @@ public:
     /* 0x0021 */ u8 field_0x0021;
     /* 0x0022 */ u8 field_0x0022[0x0024 - 0x0022];
     /* 0x0024 */ u8* field_0x0024;
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     /* 0x0028 */ int field_0x0028;
 #endif
     /* Offsets below are for USA/PAL */
@@ -228,7 +228,7 @@ public:
     /* 0x0054 */ Vec field_0x0054;
     /* 0x0060 */ u8 mbLandingDemoStarted;
     /* 0x0061 */ u8 field_0x0061;
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     /* 0x0062 */ u8 field_0x0062;
 #endif
     /* 0x0063 */ u8 field_0x0063;
@@ -266,7 +266,7 @@ public:
     /* 0x00BC */ u8 field_0x00bc;
     /* 0x00BD */ u8 field_0x00bd;
     /* 0x00BE */ u8 field_0x00be;
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     /* 0x00BF */ u8 field_0x00bf;
 #endif
     /* 0x00C0 */ u8 field_0x00c0;
diff --git a/include/d/actor/d_a_agb.h b/include/d/actor/d_a_agb.h
index 2c5b2e28d..cfef2c1ce 100644
--- a/include/d/actor/d_a_agb.h
+++ b/include/d/actor/d_a_agb.h
@@ -60,7 +60,7 @@ public:
         /* 0x6 */ UpAct_UNK6,
         /* 0x7 */ UpAct_UNK7,
         /* 0x8 */ UpAct_UNK8,
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
         /* 0x9 */ UpAct_UNK9,
 #endif
         /* 0xA */ UpAct_UNKA,
@@ -172,7 +172,7 @@ public:
 
     static int mEffect;
     static daAgb_ItemBuy mItemBuy;
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     static daAgb_GbaFlg mGbaFlg;
     static daAgb_Switch mSwitch;
     static daAgb_Item mItem;
@@ -241,7 +241,7 @@ public:
     /* 0x628 */ f32 field_0x628;
     /* 0x62C */ f32 field_0x62c;
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     /* 0x630 */ daAgb_Switch mSwitch;
     /* 0x638 */ daAgb_Item mItem;
     /* 0x63C */ daAgb_Shop mShop;
diff --git a/include/d/actor/d_a_agbsw0.h b/include/d/actor/d_a_agbsw0.h
index 5a75da5cb..19040dd35 100644
--- a/include/d/actor/d_a_agbsw0.h
+++ b/include/d/actor/d_a_agbsw0.h
@@ -54,7 +54,7 @@ public:
     BOOL ExeSubM();
     BOOL ExeSubM2();
     BOOL ExeSubM3();
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     u32 TriforceCheck();
 #else
     u32 TriforceCheck(daAgb_c*);
diff --git a/include/d/actor/d_a_npc_ba1.h b/include/d/actor/d_a_npc_ba1.h
index 502fc36fc..5fc6ccb3e 100644
--- a/include/d/actor/d_a_npc_ba1.h
+++ b/include/d/actor/d_a_npc_ba1.h
@@ -108,7 +108,7 @@ public:
 
 public:
     /* 0x290 */ u8 m290[0x7F8 - 0x290];
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     /* 0x7F8 */ u8 m7F8;
 #endif
     /* Offsets below are for USA/PAL */
diff --git a/include/d/d_cam_param.h b/include/d/d_cam_param.h
index 384fb1293..91824a65f 100644
--- a/include/d/d_cam_param.h
+++ b/include/d/d_cam_param.h
@@ -64,7 +64,7 @@ enum dCamStyle_e {
     /* 0x37 */ dCamStyle_LW01_e,
     /* 0x38 */ dCamStyle_GN01_e,
     /* 0x39 */ dCamStyle_MM01_e,
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     dCamStyle_MM03_e,
 #endif
     /* Value comments below are for USA/PAL */
@@ -120,7 +120,7 @@ enum dCamStyle_e {
     /* 0x6B */ dCamStyle_FN35_e,
     /* 0x6C */ dCamStyle_LL17_e,
     /* 0x6D */ dCamStyle_FN37_e,
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     dCamStyle_FN38_e,
 #endif
     /* 0x6E */ dCamStyle_BE08_e,
@@ -155,7 +155,7 @@ enum dCamStyle_e {
     /* 0x8B */ dCamStyle_MM22_e,
     /* 0x8C */ dCamStyle_MM18_e,
     /* 0x8D */ dCamStyle_MM17_e,
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     /* 0x8E */ dCamStyle_MM03_e,
     /* 0x8F */ dCamStyle_MM23_e,
     /* 0x90 */ dCamStyle_FN38_e,
diff --git a/include/d/d_cc_d.h b/include/d/d_cc_d.h
index f0338812b..020e82827 100644
--- a/include/d/d_cc_d.h
+++ b/include/d/d_cc_d.h
@@ -371,7 +371,7 @@ public:
     virtual ~dCcD_GObjInf();
     virtual cCcD_GObjInf* GetGObjInf();
     virtual void ClrAtHit();
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     u32 ChkAtHit();
 #endif
     void ResetAtHit();
@@ -379,7 +379,7 @@ public:
     cCcD_GObjInf* GetAtHitGObj();
     u8 ChkAtNoGuard();
     virtual void ClrTgHit();
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     u32 ChkTgHit();
 #endif
     void ResetTgHit();
@@ -387,7 +387,7 @@ public:
     dCcD_GObjInf* GetTgHitGObj();
     u8 GetTgHitObjSe();
     virtual void ClrCoHit();
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     u32 ChkCoHit();
 #endif
     void ResetCoHit();
diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h
index ecd0fb51b..3e7d8eace 100644
--- a/include/d/d_com_inf_game.h
+++ b/include/d/d_com_inf_game.h
@@ -226,7 +226,7 @@ public:
 
 class dComIfG_play_c {
 public:
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     dComIfG_play_c();
 #else
     dComIfG_play_c() { ct(); }
@@ -554,7 +554,7 @@ public:
     inline u8 getNowVibration() { return mNowVibration; }
     inline void setNowVibration(u8 vibration) { mNowVibration = vibration; }
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     // Inline name is fake (not present in JP debug maps), but was guessed based on the similar
     // dSv_player_config_c::getPalLanguage() const inline in TP debug.
     inline u8 getPalLanguage() { return mPalLanguage; }
@@ -597,7 +597,7 @@ public:
     void setFontArchive(JKRArchive * pArc) { mpFont0Archive = pArc; }
     void setMsgDtArchive(JKRArchive * pArc) { mpEnglishTextArchive = pArc; }
     JKRArchive* getMsgDtArchive() { return mpEnglishTextArchive; }
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     void setMsgDt2Archive(JKRArchive * pArc) { mpHyruleTextArchive = pArc; }
     JKRArchive* getMsgDt2Archive() { return mpHyruleTextArchive; }
 #endif
@@ -700,7 +700,7 @@ public:
     /* 0x47F0 */ JKRArchive* mpSwimResArchive;
     /* 0x47F4 */ JKRArchive* mpWindResArchive;
     /* 0x47F8 */ JKRArchive* mpEnglishTextArchive;
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     /* 0x47FC */ JKRArchive* mpHyruleTextArchive;
     /* 0x4800 */ JKRAramBlock* mPictureBoxData[3];
     /* 0x480C */ JKRAramBlock* mBossBattleData[4];
@@ -804,7 +804,7 @@ public:
     /* 0x4961 */ u8 field_0x4961;
     /* 0x4962 */ u8 mHeapLockFlag;
     /* 0x4963 */ u8 mNowVibration;
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     /* 0x4964 */ u8 mPalLanguage;
 #endif
     /* 0x4965 */ u8 field_0x4965;
@@ -840,7 +840,7 @@ public:
 
 class dComIfG_inf_c {
 public:
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     dComIfG_inf_c();
 #else
     dComIfG_inf_c() { ct(); }
@@ -858,7 +858,7 @@ public:
     /* 0x1D1C1 */ u8 mBrightness;
 };
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
 STATIC_ASSERT(sizeof(dComIfG_inf_c) == 0x1D1C8);
 #endif
 
@@ -2790,7 +2790,7 @@ inline void dComIfGp_setNowVibration(u8 vibration) {
     g_dComIfG_gameInfo.play.setNowVibration(vibration);
 }
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
 // Inline name is official because while it's not present in the JPN debug maps, it is present in
 // the USA release maps because there was one TU where it failed to get inlined (f_op_msg_mng).
 inline u8 dComIfGs_getPalLanguage() {
@@ -3531,7 +3531,7 @@ inline void dComIfGp_setWindResArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.p
 inline void dComIfGp_setFontArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setFontArchive(pArc); }
 inline void dComIfGp_setMsgDtArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setMsgDtArchive(pArc); }
 inline JKRArchive* dComIfGp_getMsgDtArchive() { return g_dComIfG_gameInfo.play.getMsgDtArchive(); }
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
 inline void dComIfGp_setMsgDt2Archive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setMsgDt2Archive(pArc); }
 inline JKRArchive* dComIfGp_getMsgDt2Archive() { return g_dComIfG_gameInfo.play.getMsgDt2Archive(); }
 #endif
diff --git a/include/d/d_gameover.h b/include/d/d_gameover.h
index 921381808..1effa5cf8 100644
--- a/include/d/d_gameover.h
+++ b/include/d/d_gameover.h
@@ -57,7 +57,7 @@ public:
 private:
     /* 0x004 */ J2DScreen* scrn;
     /* 0x008 */ fopMsgM_pane_class letter[8];
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     /* 0x1C8 */ u8 field_0x1c8[0x318 - 0x1c8];
 #endif
     /* Offsets below are for USA/PAL */
diff --git a/include/d/res/res_demo06.h b/include/d/res/res_demo06.h
index 7961df032..b7d495cbe 100644
--- a/include/d/res/res_demo06.h
+++ b/include/d/res/res_demo06.h
@@ -10,7 +10,7 @@ enum DEMO06_RES_FILE_ID {
     DEMO06_BTK_02_ZL_CD=0xB,
     DEMO06_BTK_02_ZL_EW=0xC,
     DEMO06_BTK_CENTER=0xD,
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     DEMO06_BTK_02_ZL_LOOK_MAJUTOU=0x30,
 #endif
     
@@ -22,7 +22,7 @@ enum DEMO06_RES_FILE_ID {
     DEMO06_BTP_02_ZL_CW=0x12,
     DEMO06_BTP_02_ZL_EW=0x13,
     DEMO06_BTP_HANG=0x14,
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     DEMO06_BTP_02_ZL_LOOK_MAJUTOU=0x31,
 #endif
     
@@ -44,7 +44,7 @@ enum DEMO06_RES_FILE_ID {
     DEMO06_BCK_02_TR_FL=0x2C,
     DEMO06_BCK_02_TR_IN=0x2D,
     DEMO06_BCK_02_TR_RL=0x2E,
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     DEMO06_BCK_02_ZL_LOOK_MAJUTOU=0x32,
 #endif
     
@@ -54,7 +54,7 @@ enum DEMO06_RES_FILE_ID {
     DEMO06_BDL_KTARU_02=0x2F,
 };
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
 enum DEMO06_RES_FILE_INDEX {
     /* BTK */
     DEMO06_INDEX_BTK_02_ZL_BC=0x7,
diff --git a/include/d/res/res_demo07.h b/include/d/res/res_demo07.h
index 6447bedff..867716529 100644
--- a/include/d/res/res_demo07.h
+++ b/include/d/res/res_demo07.h
@@ -44,7 +44,7 @@ enum DEMO07_RES_FILE_ID {
     DEMO07_BCK_WAIT=0x21,
     DEMO07_BCK_07B_GND_CUT06_WAIT_L=0x24,
     DEMO07_BCK_07B_GND_CUT09_AGO_O=0x25,
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     DEMO07_BCK_FN_SET=0x2C,
 #endif
     
@@ -58,7 +58,7 @@ enum DEMO07_RES_FILE_ID {
     /* BDL */
     DEMO07_BDL_PM=0x28,
     DEMO07_BDL_KM=0x29,
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     DEMO07_BDL_SDOOR01=0x2D,
     DEMO07_BDL_FN_COMP=0x2E,
 #endif
@@ -67,7 +67,7 @@ enum DEMO07_RES_FILE_ID {
     DEMO07_BRK_FADE_OUT30F=0x2B,
 };
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
 enum DEMO07_RES_FILE_INDEX {
     /* BTK */
     DEMO07_INDEX_BTK_LS_DEMOLOOK=0x9,
diff --git a/include/d/res/res_demo30.h b/include/d/res/res_demo30.h
index 1b8b5bb75..46af6496c 100644
--- a/include/d/res/res_demo30.h
+++ b/include/d/res/res_demo30.h
@@ -23,14 +23,14 @@ enum DEMO30_RES_FILE_ID {
     
     /* BRK */
     DEMO30_BRK_30_FD_LOOP_L=0x7,
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     DEMO30_BRK_30_FD_TOIKAKE_O=0x8,
     DEMO30_BRK_30_FD_TOIKAKEB_O=0xA,
 #endif
     DEMO30_BRK_30_FD_TOIKAKE2_O=0xB,
     DEMO30_BRK_30_FD_TOIKAKEB2_L=0xC,
     DEMO30_BRK_GDEMO27_TFG00=0x15,
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     DEMO30_BRK_30_FD_IBARI_L=0x19,
 #endif
     
@@ -43,7 +43,7 @@ enum DEMO30_RES_FILE_ID {
     DEMO30_BTK_GDEMO27_APPR00=0x18,
 };
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
 enum DEMO30_RES_FILE_INDEX {
     /* STB */
     DEMO30_INDEX_STB_DANCE_KOKIRI=0x8,
diff --git a/include/d/res/res_demo31.h b/include/d/res/res_demo31.h
index c7ee21d85..3e9a9b4e4 100644
--- a/include/d/res/res_demo31.h
+++ b/include/d/res/res_demo31.h
@@ -40,23 +40,23 @@ enum DEMO31_RES_FILE_ID {
     /* BRK */
     DEMO31_BRK_30_FD_TOIKAKEB2_L=0x8,
     DEMO31_BRK_30_FD_TOIKAKE2_O=0x9,
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     DEMO31_BRK_30_FD_LOOP_L=0xA,
 #endif
     DEMO31_BRK_30_FD_TOIKAKE_O=0x13,
     DEMO31_BRK_30_FD_TOIKAKEB_O=0x14,
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     DEMO31_BRK_27_ZS_WAITA_L=0x15,
     DEMO31_BRK_27_ZS_WAITAA_O=0x16,
     DEMO31_BRK_27_ZS_WAITAB_O=0x17,
 #endif
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     DEMO31_BRK_30_FD_IBARI_L=0x24,
     DEMO31_BRK_30_FD_LOOP_L=0x26,
 #endif
 };
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
 enum DEMO31_RES_FILE_INDEX {
     /* STB */
     DEMO31_INDEX_STB_AWAKE_KOKIRI=0x8,
diff --git a/include/d/res/res_demo32.h b/include/d/res/res_demo32.h
index 658db5467..4475ef1a4 100644
--- a/include/d/res/res_demo32.h
+++ b/include/d/res/res_demo32.h
@@ -45,7 +45,7 @@ enum DEMO32_RES_FILE_ID {
     DEMO32_BRK_GDEMO29_A01=0x26,
     DEMO32_BRK_GDEMO29_C00=0x2E,
     DEMO32_BRK_GDEMO29_C01=0x2F,
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     DEMO32_BRK_30_FD_IBARI_L=0x33,
 #endif
     
@@ -67,7 +67,7 @@ enum DEMO32_RES_FILE_ID {
     DEMO32_BTK_GDEMO29_B00=0x2C,
 };
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
 enum DEMO32_RES_FILE_INDEX {
     /* STB */
     DEMO32_INDEX_STB_PRAY_KOKIRI=0x9,
diff --git a/include/d/res/res_kaisen_e.h b/include/d/res/res_kaisen_e.h
index d3c027155..d44d74a65 100644
--- a/include/d/res/res_kaisen_e.h
+++ b/include/d/res/res_kaisen_e.h
@@ -3,7 +3,7 @@
 
 #include "global.h"
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
 enum KAISEN_E_RES_FILE_ID { // IDs and indexes are synced
     /* BDL */
     KAISEN_E_BDL_AK2SH=0x4,
diff --git a/include/d/res/res_lkd00.h b/include/d/res/res_lkd00.h
index 570b95550..017449e9c 100644
--- a/include/d/res/res_lkd00.h
+++ b/include/d/res/res_lkd00.h
@@ -158,7 +158,7 @@ enum LKD00_RES_FILE_ID {
     LKD00_BTP_47_CL_WAKEUPWAIT_L=0x26F,
     LKD00_BTP_TWARPIN=0x27D,
     LKD00_BTP_30_CL_UNAZUKI_O=0x27F,
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     LKD00_BTP_44_CL_KYOROKYORO_L=0x283,
 #endif
     
@@ -294,7 +294,7 @@ enum LKD00_RES_FILE_ID {
     LKD00_BTK_47_CL_WAKEUP_O=0x274,
     LKD00_BTK_47_CL_WAKEUPWAIT_L=0x275,
     LKD00_BTK_30_CL_UNAZUKI_O=0x280,
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     LKD00_BTK_44_CL_KYOROKYORO_L=0x284,
 #endif
     
@@ -456,13 +456,13 @@ enum LKD00_RES_FILE_ID {
     LKD00_BCK_47_CL_WAKEUPWAIT_L=0x27C,
     LKD00_BCK_WARPIN=0x27E,
     LKD00_BCK_30_CL_UNAZUKI_O=0x281,
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     LKD00_BCK_37_CL_CUT12_FAINTAWAY_L=0x282,
     LKD00_BCK_44_CL_KYOROKYORO_L=0x285,
 #endif
 };
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
 enum LKD00_RES_FILE_INDEX {
     /* BTP */
     LKD00_INDEX_BTP_02_CL_C1=0x5,
diff --git a/include/d/res/res_lkd01.h b/include/d/res/res_lkd01.h
index fab2c2017..19a3eb621 100644
--- a/include/d/res/res_lkd01.h
+++ b/include/d/res/res_lkd01.h
@@ -156,7 +156,7 @@ enum LKD01_RES_FILE_ID {
     LKD01_BCK_WARPOUTFIRST=0x19F,
     LKD01_BCK_35_CL_CUT5_HAKKENWAIT_O=0x1A2,
     LKD01_BCK_21_CL_CUT12A_O=0x1A9,
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     LKD01_BCK_TAKTCHISIN_B=0x1AC,
     LKD01_BCK_TAKTFUJIN_B=0x1AD,
     LKD01_BCK_PRESENTATIONB=0x1B0,
@@ -289,7 +289,7 @@ enum LKD01_RES_FILE_ID {
     LKD01_BTK_35_CL_CUT5_HAKKEN_O=0x1A6,
     LKD01_BTK_35_CL_CUT18_MAWARIKUMI_L=0x1A7,
     LKD01_BTK_21_CL_CUT12A_O=0x1AA,
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     LKD01_BTK_TPRESENTATIONB=0x1B1,
 #endif
     
@@ -446,7 +446,7 @@ enum LKD01_RES_FILE_ID {
     LKD01_BTP_21_CL_CUT12A_O=0x1AB,
 };
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
 enum LKD01_RES_FILE_INDEX {
     /* BCKS */
     LKD01_INDEX_BCK_24_CL_CUT01_RUNSTOP_O=0x5,
diff --git a/include/d/res/res_mgtem.h b/include/d/res/res_mgtem.h
index 220052161..a3702ade8 100644
--- a/include/d/res/res_mgtem.h
+++ b/include/d/res/res_mgtem.h
@@ -3,7 +3,7 @@
 
 #include "global.h"
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
 enum MGTEM_RES_FILE_ID { // IDs and indexes are synced
     /* SCRN */
     MGTEM_BLO_SHIP_RACE2=0x4,
diff --git a/include/d/res/res_timer.h b/include/d/res/res_timer.h
index 3509a3119..d4ab2bf29 100644
--- a/include/d/res/res_timer.h
+++ b/include/d/res/res_timer.h
@@ -3,7 +3,7 @@
 
 #include "global.h"
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
 enum TIMER_RES_FILE_ID { // IDs and indexes are synced
     /* SCRN */
     TIMER_BLO_SHIP_RACE0=0x3,
diff --git a/include/global.h b/include/global.h
index be3a78a67..1dc605591 100644
--- a/include/global.h
+++ b/include/global.h
@@ -49,16 +49,19 @@ extern void __dcbz(void*, int);
 extern void __sync();
 #endif
 
-#define VERSION_JPN 0
-#define VERSION_USA 1
-#define VERSION_PAL 2
+#define VERSION_DEMO 0
+#define VERSION_JPN 1
+#define VERSION_USA 2
+#define VERSION_PAL 3
 
-#if VERSION == VERSION_USA
-    #define VERSION_SELECT(JPN, USA, PAL) (USA)
+#if VERSION == VERSION_DEMO
+    #define VERSION_SELECT(DEMO, JPN, USA, PAL) (DEMO)
+#elif VERSION <= VERSION_JPN
+    #define VERSION_SELECT(DEMO, JPN, USA, PAL) (JPN)
+#elif VERSION == VERSION_USA
+    #define VERSION_SELECT(DEMO, JPN, USA, PAL) (USA)
 #elif VERSION == VERSION_PAL
-    #define VERSION_SELECT(JPN, USA, PAL) (PAL)
-#elif VERSION == VERSION_JPN
-    #define VERSION_SELECT(JPN, USA, PAL) (JPN)
+    #define VERSION_SELECT(DEMO, JPN, USA, PAL) (PAL)
 #endif
 
 #endif
diff --git a/include/m_Do/m_Do_Reset.h b/include/m_Do/m_Do_Reset.h
index e7a320406..05ba20688 100644
--- a/include/m_Do/m_Do_Reset.h
+++ b/include/m_Do/m_Do_Reset.h
@@ -1,7 +1,7 @@
 #ifndef M_DO_M_DO_RESET_H
 #define M_DO_M_DO_RESET_H
 
-#include "dolphin/types.h"
+#include "global.h"
 
 void mDoRst_reset(int, u32, int);
 void mDoRst_resetCallBack(int, void*);
@@ -17,7 +17,7 @@ struct mDoRstData {
 
 class mDoRst {
 public:
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     static void set3ButtonResetPort(int port) { mResetData->m3ButtonResetPort = port; }
     static void off3ButtonReset() { mResetData->m3ButtonReset = 0; }
     static void offResetPrepare() { mResetData->mResetPrepare = 0; }
diff --git a/src/JAZelAudio/JAIZelBasic.cpp b/src/JAZelAudio/JAIZelBasic.cpp
index a85eb070c..e49be4c87 100644
--- a/src/JAZelAudio/JAIZelBasic.cpp
+++ b/src/JAZelAudio/JAIZelBasic.cpp
@@ -138,7 +138,7 @@ JAIZelBasic::JAIZelBasic() {
     field_0x0200 = 0;
     field_0x0205 = 0;
     field_0x0066 = 0;
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     field_0x00bf = 0;
     field_0x0028 = 0;
     field_0x0062 = 0;
@@ -248,7 +248,7 @@ void JAIZelBasic::resetRecover() {
     field_0x0206 = 0;
     field_0x0207 = 0;
     field_0x0201 = 0;
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     field_0x00bf = 0;
 #endif
 }
@@ -995,7 +995,7 @@ void JAIZelBasic::setCameraGroupInfo(u8 param_1) {
     if (field_0x00bd) {
         return;
     }
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     if (field_0x00bf) {
         return;
     }
@@ -1041,7 +1041,7 @@ void JAIZelBasic::changeSeaBgm() {
     if (field_0x022d == 0) { return; }
     if (field_0x01f8 != 0) { return; }
     if (mbLandingDemoStarted) { return; }
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     if (field_0x0062) { return; }
 #endif
     if (!checkDayTime() && checkSeaBgmID() != JA_BGM_SEA_STORM) { return; }
@@ -1404,7 +1404,7 @@ void JAIZelBasic::setSceneName(char* param_1, s32 roomNo, s32 param_3) {
         }
         menuOut();
         field_0x0066 = 1;
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
         field_0x00bf = 0;
 #endif
     } else {
diff --git a/src/JSystem/JFramework/JFWDisplay.cpp b/src/JSystem/JFramework/JFWDisplay.cpp
index de0423c3d..3a62e7362 100644
--- a/src/JSystem/JFramework/JFWDisplay.cpp
+++ b/src/JSystem/JFramework/JFWDisplay.cpp
@@ -75,7 +75,7 @@ JFWDisplay::~JFWDisplay() {
 
 /* 80255354-802553EC       .text createManager__10JFWDisplayFP7JKRHeapQ26JUTXfb10EXfbNumberb */
 JFWDisplay* JFWDisplay::createManager(JKRHeap* p_heap, JUTXfb::EXfbNumber xfb_num, bool enableAlpha) {
-    JUT_CONFIRM(VERSION_SELECT(244, 243, 243), sManager == 0);
+    JUT_CONFIRM(VERSION_SELECT(244, 244, 243, 243), sManager == 0);
     if(sManager == 0) {
         sManager = new JFWDisplay(0, p_heap, xfb_num, enableAlpha);
     }
@@ -100,14 +100,14 @@ void JFWDisplay::prepareCopyDisp() {
     u16 width, height;
     JUTVideo::getManager()->getBounds(width, height);
     u16 xfb_height = JUTVideo::getManager()->getXfbHeight();
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     f32 y_scaleF = GXGetYScaleFactor(height, xfb_height);
 #endif
 
     GXSetCopyClear(mClearColor, mZClear);
     GXSetDispCopySrc(0, 0, width, height);
     GXSetDispCopyDst(width, xfb_height);
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     GXSetDispCopyYScale(xfb_height / (f32)height);
 #else
     GXSetDispCopyYScale(y_scaleF);
@@ -497,12 +497,12 @@ void JFWGXAbortAlarmHandler(OSAlarm*, OSContext*) {
     diagnoseGpHang();
     if(JFWAutoAbortGfx != 1) {
         OSReport("自動復帰しません\n");
-        JUT_WARN(VERSION_SELECT(1351, 1350, 1350), "GP FREEZE!");
-        JUT_ASSERT(VERSION_SELECT(1352, 1351, 1351), 0);
+        JUT_WARN(VERSION_SELECT(1351, 1351, 1350, 1350), "GP FREEZE!");
+        JUT_ASSERT(VERSION_SELECT(1352, 1352, 1351, 1351), 0);
     }
     else {
         OSReport("GXAbortFrame() を呼び出し、復帰します\n");
-        JUT_WARN(VERSION_SELECT(1356, 1355, 1355), "GP FREEZE! AUTO RESUME");
+        JUT_WARN(VERSION_SELECT(1356, 1356, 1355, 1355), "GP FREEZE! AUTO RESUME");
         GXAbortFrame();
         GXSetDrawDone();
     }
diff --git a/src/JSystem/JKernel/JKRAram.cpp b/src/JSystem/JKernel/JKRAram.cpp
index 995d1af85..b01aab218 100644
--- a/src/JSystem/JKernel/JKRAram.cpp
+++ b/src/JSystem/JKernel/JKRAram.cpp
@@ -286,7 +286,7 @@ u8* JKRAram::aramToMainRam(JKRAramBlock* block, u8 *buf, u32 p3, u32 p4, JKRExpa
     }
     checkOkAddress(buf, 0, block, p4);
     if (!block) {
-        OSPanic(__FILE__, VERSION_SELECT(690, 683, 683), ":::Bad Aram Block specified.\n");
+        OSPanic(__FILE__, VERSION_SELECT(690, 690, 683, 683), ":::Bad Aram Block specified.\n");
     }
     if (p4 >= block->mSize) {
         return NULL;
@@ -330,12 +330,12 @@ static int JKRDecompressFromAramToMainRam(u32 src, void* dst, u32 srcLength, u32
 
     u32 szsBufferSize = JKRAram::getSzpBufferSize();
     szpBuf = (u8 *)JKRAllocFromSysHeap(szsBufferSize, 32);
-    JUT_ASSERT(VERSION_SELECT(1091, 1077, 1077), szpBuf != NULL);
+    JUT_ASSERT(VERSION_SELECT(1091, 1091, 1077, 1077), szpBuf != NULL);
 
     szpEnd = szpBuf + szsBufferSize;
     if (offset != 0) {
         refBuf = (u8 *)JKRAllocFromSysHeap(0x1120, 0);
-        JUT_ASSERT(VERSION_SELECT(1100, 1086, 1086), refBuf != NULL);
+        JUT_ASSERT(VERSION_SELECT(1100, 1100, 1086, 1086), refBuf != NULL);
         refEnd = refBuf + 0x1120;
         refCurrent = refBuf;
     }
@@ -523,7 +523,7 @@ static u8* nextSrcData(u8* current) {
     if (transSize > transLeft) {
         transSize = transLeft;
     }
-    JUT_ASSERT(VERSION_SELECT(1376, 1361, 1361), transSize > 0);
+    JUT_ASSERT(VERSION_SELECT(1376, 1376, 1361, 1361), transSize > 0);
 
     JKRAramPcs(1, (u32)(srcAddress + srcOffset), ((u32)dest + left), ALIGN_NEXT(transSize, 0x20),
                NULL);
diff --git a/src/JSystem/JKernel/JKRAramArchive.cpp b/src/JSystem/JKernel/JKRAramArchive.cpp
index c6be4b92d..02a39153f 100644
--- a/src/JSystem/JKernel/JKRAramArchive.cpp
+++ b/src/JSystem/JKernel/JKRAramArchive.cpp
@@ -147,7 +147,7 @@ cleanup:
         JKRFreeToSysHeap(mem);
     }
     if (mMountMode == 0) {
-        OSReport(":::[%s: %d] Cannot alloc memory\n", __FILE__, VERSION_SELECT(407, 400, 400));
+        OSReport(":::[%s: %d] Cannot alloc memory\n", __FILE__, VERSION_SELECT(407, 407, 400, 400));
         if (mDvdFile != NULL) {
             delete mDvdFile;
         }
@@ -158,7 +158,7 @@ cleanup:
 
 /* 802BA4EC-802BA640       .text fetchResource__14JKRAramArchiveFPQ210JKRArchive12SDIFileEntryPUl */
 void* JKRAramArchive::fetchResource(SDIFileEntry* pEntry, u32* pOutSize) {
-    JUT_ASSERT(VERSION_SELECT(434, 427, 427), isMounted());
+    JUT_ASSERT(VERSION_SELECT(434, 434, 427, 427), isMounted());
     u32 outSize;
     u8* outBuf;
     if (pOutSize == NULL) {
@@ -193,7 +193,7 @@ void* JKRAramArchive::fetchResource(SDIFileEntry* pEntry, u32* pOutSize) {
 
 /* 802BA640-802BA788       .text fetchResource__14JKRAramArchiveFPvUlPQ210JKRArchive12SDIFileEntryPUl */
 void* JKRAramArchive::fetchResource(void* buffer, u32 bufferSize, SDIFileEntry* pEntry, u32* resourceSize) {
-    JUT_ASSERT(VERSION_SELECT(514, 500, 500), isMounted());
+    JUT_ASSERT(VERSION_SELECT(514, 514, 500, 500), isMounted());
     u32 size = pEntry->data_size;
     if (size > bufferSize) {
         size = bufferSize;
@@ -223,7 +223,7 @@ void* JKRAramArchive::fetchResource(void* buffer, u32 bufferSize, SDIFileEntry*
 
 /* 802BA788-802BA894       .text fetchResource_subroutine__14JKRAramArchiveFUlUlPUcUli */
 u32 JKRAramArchive::fetchResource_subroutine(u32 srcAram, u32 srcLength, u8* dst, u32 dstLength, int compression) {
-    JUT_ASSERT(VERSION_SELECT(627, 613, 613), ( srcAram & 0x1f ) == 0);
+    JUT_ASSERT(VERSION_SELECT(627, 627, 613, 613), ( srcAram & 0x1f ) == 0);
     u32 outLen;
     u32 srcSize = ALIGN_NEXT(srcLength, 0x20);
     u32 dstSize = ALIGN_PREV(dstLength, 0x20);
@@ -240,7 +240,7 @@ u32 JKRAramArchive::fetchResource_subroutine(u32 srcAram, u32 srcLength, u8* dst
         JKRAramToMainRam(srcAram, dst, srcSize, EXPAND_SWITCH_UNKNOWN1, dstSize, NULL, -1, &outLen);
         return outLen;
     default:
-        OSPanic(__FILE__, VERSION_SELECT(654, 640, 640), ":::??? bad sequence\n");
+        OSPanic(__FILE__, VERSION_SELECT(654, 654, 640, 640), ":::??? bad sequence\n");
         return 0;
     }
 }
@@ -254,7 +254,7 @@ u32 JKRAramArchive::fetchResource_subroutine(u32 entryNum, u32 length, JKRHeap*
     case COMPRESSION_NONE:
         {
             buffer = (u8*)(JKRAllocFromHeap(pHeap, alignedLen, 0x20));
-            JUT_ASSERT(VERSION_SELECT(676, 662, 662), buffer != NULL);
+            JUT_ASSERT(VERSION_SELECT(676, 676, 662, 662), buffer != NULL);
             JKRAramToMainRam(entryNum, buffer, alignedLen, EXPAND_SWITCH_UNKNOWN0, alignedLen, NULL, -1, NULL);
             *out = buffer;
             return length;
@@ -267,14 +267,14 @@ u32 JKRAramArchive::fetchResource_subroutine(u32 entryNum, u32 length, JKRHeap*
             JKRAramToMainRam(entryNum, alignHeader, sizeof(SArcHeader), EXPAND_SWITCH_UNKNOWN0, 0, NULL, -1, NULL);
             u32 decompressedLen = ALIGN_NEXT(JKRDecompExpandSize(alignHeader), sizeof(SArcHeader));
             buffer = (u8*)(JKRAllocFromHeap(pHeap, decompressedLen, sizeof(SArcHeader)));
-            JUT_ASSERT(VERSION_SELECT(709, 688, 688), buffer);
+            JUT_ASSERT(VERSION_SELECT(709, 709, 688, 688), buffer);
             u32 readLen;
             JKRAramToMainRam(entryNum, buffer, alignedLen, EXPAND_SWITCH_UNKNOWN1, decompressedLen, pHeap, -1, &readLen);
             *out = buffer;
             return readLen;
         }
     default:
-        OSPanic(__FILE__, VERSION_SELECT(719, 698, 698), ":::??? bad sequence\n");
+        OSPanic(__FILE__, VERSION_SELECT(719, 719, 698, 698), ":::??? bad sequence\n");
         return 0;
     }
 }
diff --git a/src/JSystem/JKernel/JKRArchivePub.cpp b/src/JSystem/JKernel/JKRArchivePub.cpp
index d74db7b01..62a951139 100644
--- a/src/JSystem/JKernel/JKRArchivePub.cpp
+++ b/src/JSystem/JKernel/JKRArchivePub.cpp
@@ -134,7 +134,7 @@ void* JKRArchive::getGlbResource(u32 param_0, const char* path, JKRArchive* arch
 
 /* 802B8380-802B8450       .text getResource__10JKRArchiveFPCc */
 void* JKRArchive::getResource(const char* path) {
-    JUT_ASSERT(VERSION_SELECT(337, 285, 285), isMounted());
+    JUT_ASSERT(VERSION_SELECT(337, 337, 285, 285), isMounted());
 
     SDIFileEntry* fileEntry;
     if (*path == '/') {
@@ -152,7 +152,7 @@ void* JKRArchive::getResource(const char* path) {
 
 /* 802B8450-802B8528       .text getResource__10JKRArchiveFUlPCc */
 void* JKRArchive::getResource(u32 type, const char* path) {
-    JUT_ASSERT(VERSION_SELECT(384, 332, 332), isMounted());
+    JUT_ASSERT(VERSION_SELECT(384, 384, 332, 332), isMounted());
 
     SDIFileEntry* fileEntry;
     if (type == 0 || type == '\?\?\?\?') {
@@ -190,7 +190,7 @@ u32 JKRArchive::readTypeResource(void* buffer, u32 bufferSize, u32 type, const c
 
 /* 802B85F0-802B86DC       .text readResource__10JKRArchiveFPvUlUlPCc */
 u32 JKRArchive::readResource(void* buffer, u32 bufferSize, u32 type, const char* path) {
-    JUT_ASSERT(VERSION_SELECT(543, 491, 491), isMounted());
+    JUT_ASSERT(VERSION_SELECT(543, 543, 491, 491), isMounted());
 
     SDIFileEntry* fileEntry;
     if (type == 0 || type == '\?\?\?\?') {
@@ -210,7 +210,7 @@ u32 JKRArchive::readResource(void* buffer, u32 bufferSize, u32 type, const char*
 
 /* 802B86DC-802B87C0       .text readResource__10JKRArchiveFPvUlPCc */
 u32 JKRArchive::readResource(void* buffer, u32 bufferSize, const char* path) {
-    JUT_ASSERT(VERSION_SELECT(589, 537, 537), isMounted());
+    JUT_ASSERT(VERSION_SELECT(589, 589, 537, 537), isMounted());
 
     SDIFileEntry* fileEntry;
     if (*path == '/') {
@@ -230,7 +230,7 @@ u32 JKRArchive::readResource(void* buffer, u32 bufferSize, const char* path) {
 
 /* 802B87C0-802B8878       .text readIdxResource__10JKRArchiveFPvUlUl */
 u32 JKRArchive::readIdxResource(void* buffer, u32 bufferSize, u32 index) {
-    JUT_ASSERT(VERSION_SELECT(645, 593, 593), isMounted());
+    JUT_ASSERT(VERSION_SELECT(645, 645, 593, 593), isMounted());
 
     SDIFileEntry* fileEntry = findIdxResource(index);
     if (fileEntry) {
@@ -244,7 +244,7 @@ u32 JKRArchive::readIdxResource(void* buffer, u32 bufferSize, u32 index) {
 
 /* 802B8878-802B8930       .text readResource__10JKRArchiveFPvUlUs */
 u32 JKRArchive::readResource(void* buffer, u32 bufferSize, u16 id) {
-    JUT_ASSERT(VERSION_SELECT(679, 627, 627), isMounted());
+    JUT_ASSERT(VERSION_SELECT(679, 679, 627, 627), isMounted());
 
     SDIFileEntry* fileEntry = findIdResource(id);
     if (fileEntry) {
@@ -271,7 +271,7 @@ void JKRArchive::removeResourceAll() {
 
 /* 802B89B8-802B8A54       .text removeResource__10JKRArchiveFPv */
 bool JKRArchive::removeResource(void* resource) {
-    JUT_ASSERT(VERSION_SELECT(755, 687, 687), resource != NULL);
+    JUT_ASSERT(VERSION_SELECT(755, 755, 687, 687), resource != NULL);
 
     SDIFileEntry* fileEntry = findPtrResource(resource);
     if (fileEntry == NULL)
@@ -284,7 +284,7 @@ bool JKRArchive::removeResource(void* resource) {
 
 /* 802B8A54-802B8AE4       .text detachResource__10JKRArchiveFPv */
 bool JKRArchive::detachResource(void* resource) {
-    JUT_ASSERT(VERSION_SELECT(787, 719, 719), resource != NULL);
+    JUT_ASSERT(VERSION_SELECT(787, 787, 719, 719), resource != NULL);
 
     SDIFileEntry* fileEntry = findPtrResource(resource);
     if (fileEntry == NULL)
@@ -296,7 +296,7 @@ bool JKRArchive::detachResource(void* resource) {
 
 /* 802B8AE4-802B8B6C       .text getResSize__10JKRArchiveCFPCv */
 u32 JKRArchive::getResSize(const void* resource) const {
-    JUT_ASSERT(VERSION_SELECT(814, 746, 746), resource != NULL);
+    JUT_ASSERT(VERSION_SELECT(814, 814, 746, 746), resource != NULL);
 
     SDIFileEntry* fileEntry = findPtrResource(resource);
     if (fileEntry == NULL)
diff --git a/src/JSystem/JKernel/JKRCompArchive.cpp b/src/JSystem/JKernel/JKRCompArchive.cpp
index 39b4cd00e..f2ab63283 100644
--- a/src/JSystem/JKernel/JKRCompArchive.cpp
+++ b/src/JSystem/JKernel/JKRCompArchive.cpp
@@ -381,7 +381,7 @@ u32 JKRCompArchive::getExpandedResSize(const void* resource) const {
         JKRDvdToMainRam(mEntryNum, bufPtr, EXPAND_SWITCH_UNKNOWN2, sizeof(buf) / 2, NULL, JKRDvdRipper::ALLOC_DIRECTION_FORWARD, field_0x6c + fileEntry->data_offset, NULL);
         DCInvalidateRange(bufPtr, sizeof(buf) / 2);
     } else {
-        OSPanic(__FILE__, VERSION_SELECT(948, 944, 944), "illegal resource.");
+        OSPanic(__FILE__, VERSION_SELECT(948, 948, 944, 944), "illegal resource.");
     }
     u32 expandSize = JKRDecompExpandSize(bufPtr);
     const_cast<JKRCompArchive *>(this)->setExpandSize(fileEntry, expandSize);
diff --git a/src/JSystem/JKernel/JKRDvdAramRipper.cpp b/src/JSystem/JKernel/JKRDvdAramRipper.cpp
index ccfa563da..39d257ed6 100644
--- a/src/JSystem/JKernel/JKRDvdAramRipper.cpp
+++ b/src/JSystem/JKernel/JKRDvdAramRipper.cpp
@@ -249,14 +249,14 @@ static int JKRDecompressFromDVDToAram(JKRDvdFile* dvdFile, u32 param_1, u32 file
     OSLockMutex(&decompMutex);
     u32 bufferSize = JKRDvdAramRipper::getSzpBufferSize();
     szpBuf = (u8*)JKRAllocFromSysHeap(bufferSize, 0x20);
-    JUT_ASSERT(VERSION_SELECT(703, 693, 693), szpBuf != NULL);
+    JUT_ASSERT(VERSION_SELECT(703, 703, 693, 693), szpBuf != NULL);
     szpEnd = szpBuf + bufferSize;
     refBuf = (u8*)JKRAllocFromSysHeap(0x1120, 0);
-    JUT_ASSERT(VERSION_SELECT(711, 701, 701), refBuf != NULL);
+    JUT_ASSERT(VERSION_SELECT(711, 711, 701, 701), refBuf != NULL);
     refEnd = refBuf + 0x1120;
     refCurrent = refBuf;
     dmaBuf = (u8*)JKRAllocFromSysHeap(0x100, 0x20);
-    JUT_ASSERT(VERSION_SELECT(720, 710, 710), dmaBuf != NULL);
+    JUT_ASSERT(VERSION_SELECT(720, 720, 710, 710), dmaBuf != NULL);
     dmaEnd = dmaBuf + 0x100;
     dmaCurrent = dmaBuf;
     srcFile = dvdFile;
@@ -398,7 +398,7 @@ static u8* nextSrcData(u8* src) {
     if (transSize > transLeft) {
         transSize = transLeft;
     }
-    JUT_ASSERT(VERSION_SELECT(979, 966, 966), transSize > 0);
+    JUT_ASSERT(VERSION_SELECT(979, 979, 966, 966), transSize > 0);
     while (true) {
         s32 result = DVDReadPrio(&srcFile->mFileInfo, dest + size, transSize, srcOffset, 2);
         if (result >= 0) {
diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/src/JSystem/JKernel/JKRDvdArchive.cpp
index b8237278f..3d7d11773 100644
--- a/src/JSystem/JKernel/JKRDvdArchive.cpp
+++ b/src/JSystem/JKernel/JKRDvdArchive.cpp
@@ -264,12 +264,12 @@ u32 JKRDvdArchive::fetchResource_subroutine(s32 entryNum, u32 offset, u32 size,
     }
 
     case COMPRESSION_YAY0: {
-        OSPanic(__FILE__, VERSION_SELECT(610, 603, 603), "Sorry, not prepared for SZP archive.\n");
+        OSPanic(__FILE__, VERSION_SELECT(610, 610, 603, 603), "Sorry, not prepared for SZP archive.\n");
         return 0;
     }
 
     default: {
-        OSPanic(__FILE__, VERSION_SELECT(616, 609, 609), ":::??? bad sequence\n");
+        OSPanic(__FILE__, VERSION_SELECT(616, 616, 609, 609), ":::??? bad sequence\n");
         return 0;
     }
     }
@@ -285,7 +285,7 @@ u32 JKRDvdArchive::fetchResource_subroutine(s32 entryNum, u32 offset, u32 size,
         switch (fileCompression) {
         case COMPRESSION_NONE:
             buffer = (u8*)JKRAllocFromHeap(heap, alignedSize, sizeof(SArcHeader));
-            JUT_ASSERT(VERSION_SELECT(638, 631, 631), buffer != NULL);
+            JUT_ASSERT(VERSION_SELECT(638, 638, 631, 631), buffer != NULL);
 
             JKRDvdToMainRam(entryNum, buffer, EXPAND_SWITCH_UNKNOWN0, alignedSize, NULL,
                             JKRDvdRipper::ALLOC_DIRECTION_FORWARD, offset, NULL);
@@ -304,7 +304,7 @@ u32 JKRDvdArchive::fetchResource_subroutine(s32 entryNum, u32 offset, u32 size,
 
             alignedSize = JKRDecompExpandSize(arcHeader);
             buffer = (u8*)JKRAllocFromHeap(heap, alignedSize, sizeof(SArcHeader));
-            JUT_ASSERT(VERSION_SELECT(674, 660, 660), buffer);
+            JUT_ASSERT(VERSION_SELECT(674, 674, 660, 660), buffer);
             JKRDvdToMainRam(entryNum, buffer, EXPAND_SWITCH_UNKNOWN1, alignedSize, NULL,
                             JKRDvdRipper::ALLOC_DIRECTION_FORWARD, offset, NULL);
 
@@ -315,7 +315,7 @@ u32 JKRDvdArchive::fetchResource_subroutine(s32 entryNum, u32 offset, u32 size,
 
     case COMPRESSION_YAZ0: {
         buffer = (u8*)JKRAllocFromHeap(heap, alignedSize, sizeof(SArcHeader));
-        JUT_ASSERT(VERSION_SELECT(686, 672, 672), buffer);
+        JUT_ASSERT(VERSION_SELECT(686, 686, 672, 672), buffer);
 
         JKRDvdToMainRam(entryNum, buffer, EXPAND_SWITCH_UNKNOWN1, size, NULL,
                         JKRDvdRipper::ALLOC_DIRECTION_FORWARD, offset, NULL);
@@ -325,12 +325,12 @@ u32 JKRDvdArchive::fetchResource_subroutine(s32 entryNum, u32 offset, u32 size,
     }
 
     case COMPRESSION_YAY0: {
-        OSPanic(__FILE__, VERSION_SELECT(697, 683, 683), "Sorry, not prepared for SZP archive.\n");
+        OSPanic(__FILE__, VERSION_SELECT(697, 697, 683, 683), "Sorry, not prepared for SZP archive.\n");
         return 0;
     }
 
     default: {
-        OSPanic(__FILE__, VERSION_SELECT(702, 688, 688), ":::??? bad sequence\n");
+        OSPanic(__FILE__, VERSION_SELECT(702, 702, 688, 688), ":::??? bad sequence\n");
         return 0;
     }
     }
diff --git a/src/JSystem/JKernel/JKRDvdRipper.cpp b/src/JSystem/JKernel/JKRDvdRipper.cpp
index 7c1583807..aa1eb1ad6 100644
--- a/src/JSystem/JKernel/JKRDvdRipper.cpp
+++ b/src/JSystem/JKernel/JKRDvdRipper.cpp
@@ -148,7 +148,7 @@ void* JKRDvdRipper::loadToMainRAM(JKRDvdFile* dvdFile, u8* dst, JKRExpandSwitch
         else if (compression2 == COMPRESSION_YAZ0) {
             JKRDecompressFromDVD(dvdFile, dst, fileSizeAligned, dstLength, 0, offset);
         } else {
-            OSPanic(__FILE__, VERSION_SELECT(337, 314, 314), "Sorry, not prepared for SZP resource\n");
+            OSPanic(__FILE__, VERSION_SELECT(337, 337, 314, 314), "Sorry, not prepared for SZP resource\n");
         }
         return dst;
     }
@@ -157,7 +157,7 @@ void* JKRDvdRipper::loadToMainRAM(JKRDvdFile* dvdFile, u8* dst, JKRExpandSwitch
         // SZP decompression
         // s32 readoffset = startOffset;
         if (offset != 0) {
-            OSPanic(__FILE__, VERSION_SELECT(347, 324, 324), ":::Not support SZP with offset read");
+            OSPanic(__FILE__, VERSION_SELECT(347, 347, 324, 324), ":::Not support SZP with offset read");
         }
         while (true) {
             int readBytes = DVDReadPrio(dvdFile->getFileInfo(), mem, fileSizeAligned, 0, 2);
@@ -221,12 +221,12 @@ static int JKRDecompressFromDVD(JKRDvdFile* dvdFile, void* dst, u32 fileSize, u3
     OSLockMutex(&decompMutex);
     int bufSize = JKRDvdRipper::getSzpBufferSize();
     szpBuf = (u8 *)JKRAllocFromSysHeap(bufSize, -0x20);
-    JUT_ASSERT(VERSION_SELECT(913, 884, 884), szpBuf != NULL);
+    JUT_ASSERT(VERSION_SELECT(913, 913, 884, 884), szpBuf != NULL);
 
     szpEnd = szpBuf + bufSize;
     if (inFileOffset != 0) {
         refBuf = (u8 *)JKRAllocFromSysHeap(0x1120, -4);
-        JUT_ASSERT(VERSION_SELECT(922, 893, 893), refBuf != NULL);
+        JUT_ASSERT(VERSION_SELECT(922, 922, 893, 893), refBuf != NULL);
         refEnd = refBuf + 0x1120;
         refCurrent = refBuf;
     } else {
@@ -407,7 +407,7 @@ static u8* nextSrcData(u8* src) {
     if (transSize > transLeft) {
         transSize = transLeft;
     }
-    JUT_ASSERT(VERSION_SELECT(1228, 1176, 1176), transSize > 0);
+    JUT_ASSERT(VERSION_SELECT(1228, 1228, 1176, 1176), transSize > 0);
 
     while (true) {
         s32 result = DVDReadPrio(srcFile->getFileInfo(), (buf + limit), transSize, srcOffset, 2);
diff --git a/src/JSystem/JKernel/JKRExpHeap.cpp b/src/JSystem/JKernel/JKRExpHeap.cpp
index ee4620840..29467c419 100644
--- a/src/JSystem/JKernel/JKRExpHeap.cpp
+++ b/src/JSystem/JKernel/JKRExpHeap.cpp
@@ -955,8 +955,8 @@ static void dummy2() {
 
 /* 802B30A4-802B31D4       .text state_register__10JKRExpHeapCFPQ27JKRHeap6TStateUl */
 void JKRExpHeap::state_register(TState* p, u32 param_1) const {
-    JUT_ASSERT(VERSION_SELECT(2420, 2423, 2423), p != NULL);
-    JUT_ASSERT(VERSION_SELECT(2421, 2424, 2424), p->getHeap() == this);
+    JUT_ASSERT(VERSION_SELECT(2420, 2420, 2423, 2423), p != NULL);
+    JUT_ASSERT(VERSION_SELECT(2421, 2421, 2424, 2424), p->getHeap() == this);
     p->mId = param_1;
     if (param_1 <= 0xff) {
         p->mUsedSize = getUsedSize(param_1);
@@ -981,7 +981,7 @@ void JKRExpHeap::state_register(TState* p, u32 param_1) const {
 
 /* 802B31D4-802B327C       .text state_compare__10JKRExpHeapCFRCQ27JKRHeap6TStateRCQ27JKRHeap6TState */
 bool JKRExpHeap::state_compare(const JKRHeap::TState& r1, const JKRHeap::TState& r2) const {
-    JUT_ASSERT(VERSION_SELECT(2468, 2471, 2471), r1.getHeap() == r2.getHeap());
+    JUT_ASSERT(VERSION_SELECT(2468, 2468, 2471, 2471), r1.getHeap() == r2.getHeap());
     bool result = true;
     if (r1.mCheckCode != r2.mCheckCode) {
         result = false;
diff --git a/src/JSystem/JKernel/JKRHeap.cpp b/src/JSystem/JKernel/JKRHeap.cpp
index 8af2e2ffd..4a6647efd 100644
--- a/src/JSystem/JKernel/JKRHeap.cpp
+++ b/src/JSystem/JKernel/JKRHeap.cpp
@@ -407,7 +407,7 @@ void operator delete[](void* ptr) {
 }
 
 static void dummy3() {
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     OSReport("\x1B[41;37m:::addr %08x size %08x: Freeされた領域が浸食されている (%08x=%02x)\n\x1B[m");
 #endif
     OSReport("%s");
@@ -420,13 +420,13 @@ static void dummy3() {
 
 /* 802B0D70-802B0E14       .text state_register__7JKRHeapCFPQ27JKRHeap6TStateUl */
 void JKRHeap::state_register(JKRHeap::TState* p, u32 id) const {
-    JUT_ASSERT(VERSION_SELECT(1034, 1090, 1090), p != NULL);
-    JUT_ASSERT(VERSION_SELECT(1035, 1091, 1091), p->getHeap() == this);
+    JUT_ASSERT(VERSION_SELECT(1034, 1034, 1090, 1090), p != NULL);
+    JUT_ASSERT(VERSION_SELECT(1035, 1035, 1091, 1091), p->getHeap() == this);
 }
 
 /* 802B0E14-802B0E9C       .text state_compare__7JKRHeapCFRCQ27JKRHeap6TStateRCQ27JKRHeap6TState */
 bool JKRHeap::state_compare(const JKRHeap::TState& r1, const JKRHeap::TState& r2) const {
-    JUT_ASSERT(VERSION_SELECT(1043, 1099, 1099), r1.getHeap() == r2.getHeap());
+    JUT_ASSERT(VERSION_SELECT(1043, 1043, 1099, 1099), r1.getHeap() == r2.getHeap());
     return r1.getCheckCode() == r2.getCheckCode();
 }
 
@@ -439,9 +439,9 @@ static void dummy4() {
 
 /* 802B0E9C-802B0F24       .text state_dump__7JKRHeapCFRCQ27JKRHeap6TState */
 void JKRHeap::state_dump(const JKRHeap::TState& p) const {
-    JUT_LOG(VERSION_SELECT(1067, 1123, 1123), "check-code : 0x%08x", p.getCheckCode());
-    JUT_LOG(VERSION_SELECT(1068, 1124, 1124), "id         : 0x%08x", p.getId());
-    JUT_LOG(VERSION_SELECT(1069, 1125, 1125), "used size  : %u", p.getUsedSize());
+    JUT_LOG(VERSION_SELECT(1067, 1067, 1123, 1123), "check-code : 0x%08x", p.getCheckCode());
+    JUT_LOG(VERSION_SELECT(1068, 1068, 1124, 1124), "id         : 0x%08x", p.getId());
+    JUT_LOG(VERSION_SELECT(1069, 1069, 1125, 1125), "used size  : %u", p.getUsedSize());
 }
 
 /* 802B0F24-802B0F2C       .text do_changeGroupID__7JKRHeapFUc */
@@ -454,7 +454,7 @@ u8 JKRHeap::do_getCurrentGroupId() {
     return 0;
 }
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
 static void dummy5() {
     OSReport("\x1B[41;37m:::addr %08x size %08x: Freeされた領域が浸食されている (%08x=%02x)\n\x1B[m");
 }
diff --git a/src/JSystem/JKernel/JKRSolidHeap.cpp b/src/JSystem/JKernel/JKRSolidHeap.cpp
index cc15f8987..99eb967e1 100644
--- a/src/JSystem/JKernel/JKRSolidHeap.cpp
+++ b/src/JSystem/JKernel/JKRSolidHeap.cpp
@@ -236,8 +236,8 @@ bool JKRSolidHeap::dump() {
 
 /* 802B3A68-802B3B4C       .text state_register__12JKRSolidHeapCFPQ27JKRHeap6TStateUl */
 void JKRSolidHeap::state_register(JKRHeap::TState* p, u32 id) const {
-    JUT_ASSERT(VERSION_SELECT(610, 607, 607), p != NULL);
-    JUT_ASSERT(VERSION_SELECT(611, 608, 608), p->getHeap() == this);
+    JUT_ASSERT(VERSION_SELECT(610, 610, 607, 607), p != NULL);
+    JUT_ASSERT(VERSION_SELECT(611, 611, 608, 608), p->getHeap() == this);
 
     getState_(p);
     setState_u32ID_(p, id);
@@ -249,7 +249,7 @@ void JKRSolidHeap::state_register(JKRHeap::TState* p, u32 id) const {
 
 /* 802B3B4C-802B3BF4       .text state_compare__12JKRSolidHeapCFRCQ27JKRHeap6TStateRCQ27JKRHeap6TState */
 bool JKRSolidHeap::state_compare(const JKRHeap::TState& r1, const JKRHeap::TState& r2) const {
-    JUT_ASSERT(VERSION_SELECT(638, 635, 635), r1.getHeap() == r2.getHeap());
+    JUT_ASSERT(VERSION_SELECT(638, 638, 635, 635), r1.getHeap() == r2.getHeap());
 
     bool result = true;
     if (r1.getCheckCode() != r2.getCheckCode()) {
diff --git a/src/JSystem/JUtility/JUTXfb.cpp b/src/JSystem/JUtility/JUTXfb.cpp
index 469db037e..29bdd55c0 100644
--- a/src/JSystem/JUtility/JUTXfb.cpp
+++ b/src/JSystem/JUtility/JUTXfb.cpp
@@ -31,7 +31,7 @@ JUTXfb::JUTXfb(const GXRenderModeObj* pObj, JKRHeap* pHeap, JUTXfb::EXfbNumber x
     if (pObj) {
         initiate(pObj->fb_width, pObj->xfb_height, pHeap, xfbNum);
     } else {
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
         GXRenderModeObj* obj = JUTVideo::getManager()->getRenderMode();
         initiate(obj->fb_width, obj->xfb_height, pHeap, xfbNum);
 #else
@@ -63,7 +63,7 @@ void JUTXfb::delXfb(int xfbIdx) {
 
 /* 802C837C-802C8410       .text createManager__6JUTXfbFPC16_GXRenderModeObjP7JKRHeapQ26JUTXfb10EXfbNumber */
 JUTXfb* JUTXfb::createManager(const GXRenderModeObj* pObj, JKRHeap* pHeap, JUTXfb::EXfbNumber xfbNum) {
-    JUT_CONFIRM(VERSION_SELECT(198, 203, 203), sManager == 0);
+    JUT_CONFIRM(VERSION_SELECT(198, 198, 203, 203), sManager == 0);
     if (sManager == NULL) {
         sManager = new JUTXfb(pObj, pHeap, xfbNum);
     }
@@ -72,7 +72,7 @@ JUTXfb* JUTXfb::createManager(const GXRenderModeObj* pObj, JKRHeap* pHeap, JUTXf
 
 /* 802C8410-802C8468       .text destroyManager__6JUTXfbFv */
 void JUTXfb::destroyManager() {
-    JUT_CONFIRM(VERSION_SELECT(339, 344, 344), sManager);
+    JUT_CONFIRM(VERSION_SELECT(339, 339, 344, 344), sManager);
     delete sManager;
     sManager = NULL;
 }
diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp
index 9d4574805..a195fa374 100644
--- a/src/d/actor/d_a_agb.cpp
+++ b/src/d/actor/d_a_agb.cpp
@@ -31,7 +31,7 @@ static mDoDvdThd_toMainRam_c* l_gbaCommand;
 
 int daAgb_c::mEffect;
 daAgb_c::daAgb_ItemBuy daAgb_c::mItemBuy;
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
 daAgb_c::daAgb_GbaFlg daAgb_c::mGbaFlg;
 daAgb_c::daAgb_Switch daAgb_c::mSwitch;
 daAgb_c::daAgb_Item daAgb_c::mItem;
@@ -90,7 +90,7 @@ int dMsgCtrl_c::execute() {
 
 static dMsgCtrl_c l_msgCtrl;
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
 u8 sjis2chrNo(const char* i_chr) {
     static u8 l_sjis1chrNo[] = {
         0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A,
@@ -267,7 +267,7 @@ void daAgb_c::NameConv() {
     mPlayerName = 0;
 
     for (i = 0; i < 8; i++) {
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
         u8 chr = sjis2chrNo(name);
         mPlayerName |= chr;
         if (*name & 0x80)
@@ -364,7 +364,7 @@ int daAgb_c::uploadSelect() {
             fopMsgM_messageSet(6);  // "Now calling Tingle..."
             mUploadAction  = UpAct_UNK3;
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
             l_gbaCommand = mDoDvdThd_toMainRam_c::create("/res/Gba/client.bin", 0, dMsg_getAgbWorkArea());
 #elif VERSION == VERSION_USA
             l_gbaCommand = mDoDvdThd_toMainRam_c::create("/res/Gba/client_u.bin", 0, dMsg_getAgbWorkArea());
@@ -377,7 +377,7 @@ int daAgb_c::uploadSelect() {
             strcat(path, ".bin");
             l_gbaCommand = mDoDvdThd_toMainRam_c::create(path, 0, dMsg_getAgbWorkArea());
 #endif
-            JUT_ASSERT(VERSION_SELECT(591, 860, 861), l_gbaCommand != NULL);
+            JUT_ASSERT(VERSION_SELECT(591, 591, 860, 861), l_gbaCommand != NULL);
 
             mDoGaC_GbaReboot();
             mDoGaC_setPortNo(mPortNo);
@@ -393,7 +393,7 @@ int daAgb_c::uploadSelect() {
 int daAgb_c::uploadJoyboot1() {
     if (l_gbaCommand->sync()) {
         void* programp = l_gbaCommand->getMemAddress();
-        JUT_ASSERT(VERSION_SELECT(622, 891, 892), programp != NULL);
+        JUT_ASSERT(VERSION_SELECT(622, 622, 891, 892), programp != NULL);
 
         JUTGba::getManager()->doJoyBoot(mDoGaC_getPortNo(), 3, -1, (u8*)programp,
                                         l_gbaCommand->getMemSize() - 4, NULL, NULL);
@@ -453,7 +453,7 @@ int daAgb_c::uploadMessageLoad() {
         strcat(path, ".bin");
         l_gbaCommand = mDoDvdThd_toMainRam_c::create(path, 0, NULL);
 #endif
-        JUT_ASSERT(VERSION_SELECT(715, 1000, 1001), l_gbaCommand != NULL);
+        JUT_ASSERT(VERSION_SELECT(715, 715, 1000, 1001), l_gbaCommand != NULL);
 
         mUploadAction  = UpAct_UNK7;
         mDoGaC_onComEnable();
@@ -476,7 +476,7 @@ int daAgb_c::uploadMessageLoad2() {
 int daAgb_c::uploadConnect() {
     if (mDoGaC_getComEnable() && mDoGaC_GbaLink()) {
         void* programp = l_gbaCommand->getMemAddress();
-        JUT_ASSERT(VERSION_SELECT(760, 1045, 1046), programp != NULL);
+        JUT_ASSERT(VERSION_SELECT(760, 760, 1045, 1046), programp != NULL);
         mDoGac_SendDataSet((u32*)programp, l_gbaCommand->getMemSize(), 0, 0);
 
         mUploadAction  = UpAct_UNK8;
@@ -516,7 +516,7 @@ int daAgb_c::uploadMessageSend() {
             delete l_gbaCommand;
         }
     } else if (mDoGaC_getDataStatus(0) == 9) {
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
         mUploadAction = UpAct_UNK5;
 #else
         field_0x664 = 5;
@@ -527,7 +527,7 @@ int daAgb_c::uploadMessageSend() {
     return 1;
 }
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
 /* 800D01F4-800D021C       .text uploadRetryWait__7daAgb_cFv */
 int daAgb_c::uploadRetryWait() {
     field_0x664--;
@@ -575,7 +575,7 @@ daAgb_c::uploadFunc daAgb_c::uploadFuncTable[] = {
     &daAgb_c::uploadMessageLoad,
     &daAgb_c::uploadMessageLoad2,
     &daAgb_c::uploadMessageSend,
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     &daAgb_c::uploadRetryWait,
 #endif
     &daAgb_c::uploadMsgEndWait,
@@ -1716,7 +1716,7 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) {
 /* 800D396C-800D3B58       .text createHeap__7daAgb_cFv */
 BOOL daAgb_c::createHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Agb", AGB_BDL_AGBCURSOR);
-    JUT_ASSERT(VERSION_SELECT(2960, 3277, 3286), modelData != NULL);
+    JUT_ASSERT(VERSION_SELECT(2960, 2960, 3277, 3286), modelData != NULL);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002);
     if (mpModel == NULL) {
diff --git a/src/d/actor/d_a_agbsw0.cpp b/src/d/actor/d_a_agbsw0.cpp
index 86f483c7d..9b2d29a5f 100644
--- a/src/d/actor/d_a_agbsw0.cpp
+++ b/src/d/actor/d_a_agbsw0.cpp
@@ -366,7 +366,7 @@ BOOL daAgbsw0_c::ExeSubA() {
             if(!fopAcM_isSwitch(this, sw0)) {
                 if(field_0x298 == 1) {
                     if(mDoGaC_GbaLink()) {
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
                         if(mDoGac_SendStatusCheck(5)) {
 #else
                         if(!mDoGac_SendStatusCheck(5)) {
@@ -404,7 +404,7 @@ BOOL daAgbsw0_c::ExeSubA() {
     }
 
     if(MoveCheck(conditionNo)) {
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
         if(field_0x298 == 1) {
             if(mDoGaC_GbaLink()) {
                 if(!mDoGac_SendStatusCheck(5)) {
@@ -450,7 +450,7 @@ BOOL daAgbsw0_c::ExeSubAT() {
             if(!dComIfGs_isTbox(flag)) {
                 if(field_0x298 == 1) {
                     if(mDoGaC_GbaLink()) {
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
                         if(mDoGac_SendStatusCheck(5)) {
 #else
                         if(!mDoGac_SendStatusCheck(5)) {
@@ -574,7 +574,7 @@ BOOL daAgbsw0_c::ExeSubA2() {
     }
     
     if(MoveCheck(conditionNo)) {
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
         if(field_0x298 == 1) {
             if(mDoGaC_GbaLink()) {
                 if(!mDoGac_SendStatusCheck(5)) {
@@ -837,7 +837,7 @@ BOOL daAgbsw0_c::ExeSubM3() {
             if(mDoGaC_GbaLink() && mDoGac_SendStatusCheck(5)) {
                 daAgb_c* agb = dComIfGp_getAgb();
                 if(agb && agb->isActive() && (agb->isFree() || agb->getFollowTarget() != 1) && HitCheck(agb)) {
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
                     u16 gbaMsgNo = TriforceCheck();
 #else
                     u16 gbaMsgNo = TriforceCheck(agb);
@@ -858,7 +858,7 @@ BOOL daAgbsw0_c::ExeSubM3() {
     }
 }
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
 u32 daAgbsw0_c::TriforceCheck()
 #else
 /* 00001368-000017B0       .text TriforceCheck__10daAgbsw0_cFP7daAgb_c */
@@ -896,7 +896,7 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb)
     }
     if(!dComIfGs_isGetCollectMap(2) && dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e)) {
         if(dComIfGs_checkGetItem(COTTAGE_PAPER)) {
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
             s8 roomNo = dComIfGp_roomControl_getStayNo();
 #else
             int roomNo = agb->field_0x66d;
@@ -911,7 +911,7 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb)
     if(!dComIfGs_isGetCollectMap(3)) {
         if(dComIfGs_checkGetItem(dItem_BAIT_BAG_e)) {
             if(dComIfGs_checkBaitItem(dItem_HYOI_PEAR_e)) {
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
                 s8 roomNo = dComIfGp_roomControl_getStayNo();
 #else
                 int roomNo = agb->field_0x66d;
@@ -930,7 +930,7 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb)
             s32 hour = dKy_getdaytime_hour();
             if(hour < 6 || hour >= 0x13) {
                 u32 moonType = dKy_moon_type_chk();
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
                 int roomNo = dComIfGp_roomControl_getStayNo();
 #else
                 int roomNo = agb->field_0x66d;
@@ -993,7 +993,7 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb)
     }
     if(!dComIfGs_isGetCollectMap(5)) {
         if(dComIfGs_isEventBit(0x3E80)) {
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
             if (!dComIfGs_isGetCollectMap(0x1C)) {
                 return 0x31E;
             } else if (!dComIfGs_isCompleteCollectMap(0x1C)) {
@@ -1010,7 +1010,7 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb)
 #endif
         }
         else {
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
             s8 roomNo = dComIfGp_roomControl_getStayNo();
 #else
             int roomNo = agb->field_0x66d;
@@ -1028,7 +1028,7 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb)
     }
 
     if(!dComIfGs_isGetCollectMap(6)) {
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
         s8 roomNo = dComIfGp_roomControl_getStayNo();
 #else
         int roomNo = agb->field_0x66d;
@@ -1036,7 +1036,7 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb)
         return roomNo == dIsleRoom_OutsetIsland_e ? 0x325 : 0x324;
     }
     if(!dComIfGs_isGetCollectMap(7)) {
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
         s8 roomNo = dComIfGp_roomControl_getStayNo();
 #else
         int roomNo = agb->field_0x66d;
@@ -1044,7 +1044,7 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb)
         return roomNo == dIsleRoom_StoneWatcherIsland_e ? 0x327 : 0x326;
     }
     if(dComIfGs_checkGetItem(dItem_HOOKSHOT_e)) {
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
         s8 roomNo = dComIfGp_roomControl_getStayNo();
 #else
         int roomNo = agb->field_0x66d;
@@ -1184,7 +1184,7 @@ BOOL daAgbsw0_c::ExeSubS() {
         return true;
     }
     else {
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
         if(strcmp(dComIfGp_getStartStageName(), "M_NewD2") == 0 && fopAcM_GetHomeRoomNo(this) == 0xC && dComIfGs_isTbox(0xC)) {
             fopAcM_delete(this);
             return true;
@@ -1559,7 +1559,7 @@ BOOL daAgbsw0_c::ExeSubFA() {
             if(!fopAcM_isSwitch(this, sw0)) {
                 if(field_0x298 == 1) {
                     if(mDoGaC_GbaLink()) {
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
                         if(mDoGac_SendStatusCheck(5)) {
 #else
                         if(!mDoGac_SendStatusCheck(5)) {
@@ -1613,7 +1613,7 @@ BOOL daAgbsw0_c::ExeSubFA() {
     }
     
     if(MoveCheck(conditionNo)) {
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
         if(field_0x298 == 1) {
             if(mDoGaC_GbaLink()) {
                 if(!mDoGac_SendStatusCheck(5)) {
@@ -2502,7 +2502,7 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) {
             }
 
             break;
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
         case 0x82:
             if(field_0x29B == 0) {
                 if(daNpc_Md_c::isPlayerRoom()) {
diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp
index b51b20f41..6eb844f31 100644
--- a/src/d/actor/d_a_am.cpp
+++ b/src/d/actor/d_a_am.cpp
@@ -143,7 +143,7 @@ static void anm_init(am_class* i_this, int bckFileIdx, f32 morf, u8 loopMode, f3
 static void body_atari_check(am_class* i_this) {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     if (i_this->mStartsInactive == 1 && i_this->mSwitch != 0xFF && !dComIfGs_isSwitch(i_this->mSwitch, dComIfGp_roomControl_getStayNo())) {
         return;
     }
@@ -183,7 +183,7 @@ static void body_atari_check(am_class* i_this) {
             break;
         case AT_TYPE_SKULL_HAMMER:
             fopAcM_seStart(i_this, JA_SE_LK_HAMMER_HIT, 0x42);
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
             if (i_this->mStartsInactive == 1 && i_this->mSwitch != 0xFF && !dComIfGs_isSwitch(i_this->mSwitch, dComIfGp_roomControl_getStayNo())) {
                 return;
             }
diff --git a/src/d/actor/d_a_auction.cpp b/src/d/actor/d_a_auction.cpp
index 42c1d411c..744937837 100644
--- a/src/d/actor/d_a_auction.cpp
+++ b/src/d/actor/d_a_auction.cpp
@@ -67,8 +67,8 @@ static NpcDatStruct l_npc_dat[7] = {
     {0.3f, 0.5f, 0x4, 0x6, 450 },
     {0.3f, 0.6f, 0x3, 0x7, 500 },
     {0.4f, 0.7f, 0x2, 0x4, 250 },
-    {0.5f, 1.0f, 0x2, 0x3, VERSION_SELECT(998, 990, 990) },
-    {0.4f, 0.5f, 0x3, 0x4, VERSION_SELECT(998, 990, 990) },
+    {0.5f, 1.0f, 0x2, 0x3, VERSION_SELECT(998, 998, 990, 990) },
+    {0.4f, 0.5f, 0x3, 0x4, VERSION_SELECT(998, 998, 990, 990) },
     {0.7f, 1.2f, 0x2, 0x2, 150 },
 };
 
diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp
index 2e755d486..595386ac1 100644
--- a/src/d/actor/d_a_bg.cpp
+++ b/src/d/actor/d_a_bg.cpp
@@ -276,7 +276,7 @@ static BOOL daBg_Draw(daBg_c* i_this) {
 
 BOOL daBg_c::execute() {
     if (mUnloadTimer != 0) {
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
         mUnloadTimer = 0;
         fopAcM_delete(this);
 #else
@@ -287,7 +287,7 @@ BOOL daBg_c::execute() {
     }
 
     if (dComIfGp_roomControl_checkStatusFlag(fopAcM_GetParam(this), 0x04)) {
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
         mUnloadTimer = 1;
 #else
         if (strcmp(dComIfGp_getStartStageName(), "sea") == 0)
diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp
index c5f008ff6..d4e3511db 100644
--- a/src/d/actor/d_a_bk.cpp
+++ b/src/d/actor/d_a_bk.cpp
@@ -1070,7 +1070,7 @@ static void jyunkai(bk_class* i_this) {
                     }
                     if ((i_this->ppd->m_nextID & 0xFFFF) != 0xFFFF) {
                         i_this->ppd = dPath_GetRoomPath(i_this->ppd->m_nextID, fopAcM_GetRoomNo(i_this));
-                        JUT_ASSERT(VERSION_SELECT(2907, 2924, 2924), i_this->ppd != NULL);
+                        JUT_ASSERT(VERSION_SELECT(2907, 2907, 2924, 2924), i_this->ppd != NULL);
                     }
                 } else if (i_this->m1216 < 0) {
                     i_this->m1217 = 1;
@@ -4562,7 +4562,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
     
     J3DModelData* modelData;
     modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", BK_BMD_BK_KB);
-    JUT_ASSERT(VERSION_SELECT(9398, 9418, 9418), modelData != NULL);
+    JUT_ASSERT(VERSION_SELECT(9398, 9398, 9418, 9418), modelData != NULL);
     if (i_this->m02D5 & 0x40) {
         J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", BK_BMT_BK_KEN);
         modelData->setMaterialTable(bmt, J3DMatCopyFlag_Material);
@@ -4581,13 +4581,13 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
     if (i_this->m02D4 != 0) {
         modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", BK_BMD_BK_TATE);
         i_this->m02D0 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
-        JUT_ASSERT(VERSION_SELECT(9425, 9445, 9445), modelData != NULL);
+        JUT_ASSERT(VERSION_SELECT(9425, 9425, 9445, 9445), modelData != NULL);
     }
     
     if (i_this->m02DC != 0) {
         modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", BK_BDL_BOUEN);
         i_this->m02D8 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
-        JUT_ASSERT(VERSION_SELECT(9434, 9454, 9454), modelData != NULL);
+        JUT_ASSERT(VERSION_SELECT(9434, 9434, 9454, 9454), modelData != NULL);
     }
     
     static Vec hip_offset[] = {
diff --git a/src/d/actor/d_a_dai_item.cpp b/src/d/actor/d_a_dai_item.cpp
index 70510f67e..a22a07c5c 100644
--- a/src/d/actor/d_a_dai_item.cpp
+++ b/src/d/actor/d_a_dai_item.cpp
@@ -368,7 +368,7 @@ void daStandItem_c::CreateInit() {
     m690 = NULL;
     m694 = NULL;
     m698 = NULL;
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
 #endif
 }
diff --git a/src/d/actor/d_a_lod_bg.cpp b/src/d/actor/d_a_lod_bg.cpp
index d7d4ba21e..053c59891 100644
--- a/src/d/actor/d_a_lod_bg.cpp
+++ b/src/d/actor/d_a_lod_bg.cpp
@@ -164,7 +164,7 @@ BOOL daLodbg_c::createModelData() {
         if (!loadModelData("/lod11/bdl/shikari.bdl", mModelData2, mDataHeap2, mDataSize2))
             return FALSE;
     }
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     else if (getRoomNo() == dIsleRoom_ForsakenFortress_e && !dComIfGs_isEventBit(0x1820)) {
         if (!loadModelData("/lod01/bdl/model1.bdl", mModelData2, mDataHeap2, mDataSize2))
             return FALSE;
@@ -176,12 +176,12 @@ BOOL daLodbg_c::createModelData() {
 
 /* 000008B8-00000A38       .text createHeap__9daLodbg_cFv */
 BOOL daLodbg_c::createHeap() {
-    JUT_ASSERT(VERSION_SELECT(419, 436, 436), mModelData != NULL);
+    JUT_ASSERT(VERSION_SELECT(419, 419, 436, 436), mModelData != NULL);
     mModel = mDoExt_J3DModel__create(mModelData, 0x80000, 0x11000022);
     if (mModel == NULL)
         return FALSE;
     if (getRoomNo() == dIsleRoom_WindfallIsland_e) {
-        JUT_ASSERT(VERSION_SELECT(430, 447, 447), mModelData2 != NULL);
+        JUT_ASSERT(VERSION_SELECT(430, 430, 447, 447), mModelData2 != NULL);
         for (s32 i = 0; i < 2; i++) {
             mModel2[i] = mDoExt_J3DModel__create(mModelData2, 0x80000, 0x11000022);
             if (mModel2[i] == NULL) {
@@ -191,7 +191,7 @@ BOOL daLodbg_c::createHeap() {
             }
         }
     }
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     else if (getRoomNo() == dIsleRoom_ForsakenFortress_e && mModelData2 != NULL) {
         mModel2[0] = mDoExt_J3DModel__create(mModelData2, 0x80000, 0x11000022);
         if (mModel2[0] == NULL) {
@@ -215,10 +215,10 @@ BOOL daLodbg_c::execCreateWait() {
     if (dist > scale.x)
         return TRUE;
 
-    JUT_ASSERT(VERSION_SELECT(474, 503, 503), mMountCommand == NULL);
+    JUT_ASSERT(VERSION_SELECT(474, 474, 503, 503), mMountCommand == NULL);
     mMountCommand = mDoDvdThd_mountXArchive_c::create(LodAllPath, 0, JKRArchive::MOUNT_ARAM);
     if (mMountCommand == NULL) {
-        JUT_WARN(VERSION_SELECT(478, 507, 507), "LODALL archive nothing !! <LODALL.arc>");
+        JUT_WARN(VERSION_SELECT(478, 478, 507, 507), "LODALL archive nothing !! <LODALL.arc>");
         return FALSE;
     }
 
@@ -231,7 +231,7 @@ BOOL daLodbg_c::execReadWait() {
     if (!mMountCommand->sync())
         return TRUE;
 
-    JUT_ASSERT(VERSION_SELECT(506, 535, 535), mArchive == NULL);
+    JUT_ASSERT(VERSION_SELECT(506, 506, 535, 535), mArchive == NULL);
     mArchive = mMountCommand->getArchive();
     delete mMountCommand;
     mMountCommand = NULL;
@@ -242,9 +242,9 @@ BOOL daLodbg_c::execReadWait() {
     }
 
     createModelData();
-    JUT_ASSERT(VERSION_SELECT(542, 571, 571), mModel == NULL);
-    JUT_ASSERT(VERSION_SELECT(543, 572, 572), mModel2[0] == NULL);
-    JUT_ASSERT(VERSION_SELECT(544, 573, 573), mModel2[1] == NULL);
+    JUT_ASSERT(VERSION_SELECT(542, 542, 571, 571), mModel == NULL);
+    JUT_ASSERT(VERSION_SELECT(543, 543, 572, 572), mModel2[0] == NULL);
+    JUT_ASSERT(VERSION_SELECT(544, 544, 573, 573), mModel2[1] == NULL);
 
     if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0)) {
         mModel = NULL;
@@ -284,11 +284,11 @@ BOOL daLodbg_c::execDeleteWait() {
                 mDoMtx_stack_c::transS(current.pos.x, current.pos.y + y, current.pos.z);
                 mDoMtx_stack_c::YrotM(shape_angle.y);
                 mModel->setBaseTRMtx(mDoMtx_stack_c::get());
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
                 mModel->setBaseTRMtx(mDoMtx_stack_c::get());
 #endif
                 if (mModel2[0] != NULL) {
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
                     if (roomNo == dIsleRoom_WindfallIsland_e) {
 #endif
                         mDrawModel2 = daObjLight::Act_c::renew_light_angle();
@@ -299,7 +299,7 @@ BOOL daLodbg_c::execDeleteWait() {
                             mDoMtx_stack_c::YrotM(-0x8000);
                             mModel2[1]->setBaseTRMtx(mDoMtx_stack_c::get());
                         }
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
                     }
                     else if (roomNo == dIsleRoom_ForsakenFortress_e) {
                         mModel2[0]->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -343,7 +343,7 @@ BOOL daLodbg_c::draw() {
     mDoExt_modelEntryDL(mModel);
 
     if (mModel2[0] != NULL && mDrawModel2) {
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
         if (roomNo == dIsleRoom_WindfallIsland_e) {
 #endif
             J3DModelData* modelData = mModel2[0]->getModelData();
@@ -355,7 +355,7 @@ BOOL daLodbg_c::draw() {
                 mDoLib_clipper::clip(mModel2[i]);
                 mDoExt_modelEntryDL(mModel2[i]);
             }
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
         } else if (roomNo == dIsleRoom_ForsakenFortress_e) {
             g_env_light.setLightTevColorType(mModel2[0], &tevStr);
             J3DModelData* modelData = mModel2[0]->getModelData(); // ??? was this supposed to modify mModel2?
diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp
index 18ce1869f..7b987ccd0 100644
--- a/src/d/actor/d_a_npc_kamome.cpp
+++ b/src/d/actor/d_a_npc_kamome.cpp
@@ -449,7 +449,7 @@ void daNpc_kam_c::npcAction(void* arg) {
         speedF = 0.0f;
         offHyoiKamome();
         setNpcAction(&daNpc_kam_c::waitNpcAction, NULL);
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
         mDoAud_zelAudio_c::getInterface()->field_0x0062 = 0;
 #endif
     }
@@ -887,7 +887,7 @@ BOOL daNpc_kam_c::checkCommandTalk() {
 void daNpc_kam_c::returnLinkPlayer() {
     changePlayer(dComIfGp_getLinkPlayer());
     offHyoiKamome();
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     mDoAud_zelAudio_c::getInterface()->field_0x0062 = 0;
 #endif
 }
@@ -1016,7 +1016,7 @@ void daNpc_kam_c::initialDescendEvent(int evtStaffId) {
     mTargetAngVelX = l_HIO.mHio1.mGlidingAngVelX;
     
     mDoAud_seStart(JA_SE_HYOI_USE_DEMO, NULL, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     mDoAud_zelAudio_c::getInterface()->field_0x0062 = 1;
 #endif
     
diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp
index dff276a63..a4ce95c8d 100644
--- a/src/d/actor/d_a_obj_mknjd.cpp
+++ b/src/d/actor/d_a_obj_mknjd.cpp
@@ -837,7 +837,7 @@ BOOL daObjMknjD::Act_c::Execute(Mtx** i_mtx) {
                     m0500 = 0;
                     m043F = 9;
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
                     fopAcM_seStart(this, JA_SE_PRE_TAKT, 0);
 #endif
                 }
diff --git a/src/d/actor/d_a_obj_vmc.cpp b/src/d/actor/d_a_obj_vmc.cpp
index 744e8eee0..70f571636 100644
--- a/src/d/actor/d_a_obj_vmc.cpp
+++ b/src/d/actor/d_a_obj_vmc.cpp
@@ -270,14 +270,14 @@ bool daObjVmc::Act_c::_execute() {
 
     cXyz dist = dComIfGp_getLinkPlayer()->current.pos - current.pos;
     if (!mLinkRangeCheck) {
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
         if (dist.absXZ() > 110.0f)
 #else
         if (dist.absXZ() > 110.0f || dist.y < -500.0f || dist.y > 500.0f)
 #endif
             mLinkRangeCheck = true;
     } else {
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
         if (dist.absXZ() < 100.0f)
 #else
         if (dist.absXZ() < 100.0f && dist.y > -490.0f && dist.y < 490.0f)
diff --git a/src/d/actor/d_a_pirate_flag.cpp b/src/d/actor/d_a_pirate_flag.cpp
index 33a179f61..80ae6054c 100644
--- a/src/d/actor/d_a_pirate_flag.cpp
+++ b/src/d/actor/d_a_pirate_flag.cpp
@@ -189,7 +189,7 @@ void daPirate_Flag_packet_c::setNrmVtx(cXyz* param_0, int param_1, int param_2)
 void daPirate_Flag_packet_c::draw() {
     j3dSys.reinitGX();
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     GXSetNumIndStages(0);
 #endif
 
@@ -278,7 +278,7 @@ void daPirate_Flag_packet_c::draw() {
     GXSetArray(GX_VA_NRM, m4F4[m87E], sizeof(cXyz));
     GXCallDisplayList(l_pirate_flag_DL, sizeof(l_pirate_flag_DL) - 0x04);
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     J3DShape::resetVcdVatCache();
 #endif
 }
@@ -449,7 +449,7 @@ static void pirate_flag_move(pirate_flag_class* i_this) {
 
     i_this->mPacket.setBackNrm();
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     // Bug: The number of bytes (0x1D4C) passed here is way too large and causes an overflow.
     // The below sizeof calculation is a guess as to what led the devs to arriving at this wrong number.
     DCStoreRangeNoSync(i_this->mPacket.getPos(), sizeof(*i_this->mPacket.mPos) * sizeof(*i_this->mPacket.mNrm) / sizeof(cXyz));
diff --git a/src/d/actor/d_a_sail.cpp b/src/d/actor/d_a_sail.cpp
index aaca939b5..a61b40ff4 100644
--- a/src/d/actor/d_a_sail.cpp
+++ b/src/d/actor/d_a_sail.cpp
@@ -344,7 +344,7 @@ void daSail_packet_c::setNrmVtx(cXyz* param_0, int param_1, int param_2) {
 void daSail_packet_c::draw() {
     j3dSys.reinitGX();
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     GXSetNumIndStages(0);
 #endif
 
@@ -466,7 +466,7 @@ void daSail_packet_c::draw() {
     GXSetArray(GX_VA_NRM, getNrm() + 2 * 0x54, sizeof(cXyz));
     GXCallDisplayList(l_sail_DL, 0x200);
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     J3DShape::resetVcdVatCache();
 #endif
 }
@@ -709,7 +709,7 @@ static void sail_move(sail_class* i_this) {
     }
     i_this->mSailPacket.setBackNrm();
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     // Bug: The number of bytes (0x14AC0) passed here is way too large and causes an overflow.
     // The below sizeof calculation is a guess as to what led the devs to arriving at this wrong number.
     DCStoreRangeNoSync(i_this->mSailPacket.getPos(), sizeof(*i_this->mSailPacket.mPos) * sizeof(*i_this->mSailPacket.mNrm) / sizeof(cXyz));
diff --git a/src/d/actor/d_a_sea.cpp b/src/d/actor/d_a_sea.cpp
index 3b9bb2ae0..727c87d0b 100644
--- a/src/d/actor/d_a_sea.cpp
+++ b/src/d/actor/d_a_sea.cpp
@@ -656,9 +656,9 @@ void daSea_packet_c::draw() {
         return;
     }
 
-    JUT_ASSERT(VERSION_SELECT(0x519, 0x518, 0x518), m_draw_vtx != NULL); // Redundant assert
+    JUT_ASSERT(VERSION_SELECT(0x519, 0x519, 0x518, 0x518), m_draw_vtx != NULL); // Redundant assert
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     j3dSys.reinitGX();
 #endif
 
@@ -680,7 +680,7 @@ void daSea_packet_c::draw() {
         minZ += GRID_SIZE;
     }
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     DCFlushRange(m_draw_vtx, sizeof(cXyz) * GRID_CELLS * GRID_CELLS);
 #else
     DCStoreRange(m_draw_vtx, sizeof(cXyz) * GRID_CELLS * GRID_CELLS);
@@ -800,19 +800,19 @@ void daSea_packet_c::draw() {
     GXSetTexCoordGen(GX_TEXCOORD1, GX_TG_MTX2x4, GX_TG_TEX0, GX_TEXMTX1);
     GXSetTexCoordGen(GX_TEXCOORD2, GX_TG_MTX2x4, GX_TG_TEX0, GX_TEXMTX2);
 
-    GXSetTevOrder(GX_TEVSTAGE0,GX_TEXCOORD0,GX_TEXMAP0, VERSION_SELECT(GX_COLOR_ZERO, GX_COLOR_NULL, GX_COLOR_NULL));
+    GXSetTevOrder(GX_TEVSTAGE0,GX_TEXCOORD0,GX_TEXMAP0, VERSION_SELECT(GX_COLOR_ZERO, GX_COLOR_ZERO, GX_COLOR_NULL, GX_COLOR_NULL));
     GXSetTevColorIn(GX_TEVSTAGE0,GX_CC_C0,GX_CC_KONST,GX_CC_TEXC,GX_CC_ZERO);
     GXSetTevColorOp(GX_TEVSTAGE0,GX_TEV_ADD,GX_TB_ZERO,GX_CS_SCALE_1,true,GX_TEVREG2);
     GXSetTevAlphaIn(GX_TEVSTAGE0,GX_CA_ZERO,GX_CA_KONST,GX_CA_TEXA,GX_CA_ZERO);
     GXSetTevAlphaOp(GX_TEVSTAGE0,GX_TEV_ADD,GX_TB_ZERO,GX_CS_SCALE_1,true,GX_TEVPREV);
     GXSetTevSwapMode(GX_TEVSTAGE0,GX_TEV_SWAP0,GX_TEV_SWAP0);
-    GXSetTevOrder(GX_TEVSTAGE1,GX_TEXCOORD2,GX_TEXMAP2, VERSION_SELECT(GX_COLOR_ZERO, GX_COLOR_NULL, GX_COLOR_NULL));
+    GXSetTevOrder(GX_TEVSTAGE1,GX_TEXCOORD2,GX_TEXMAP2, VERSION_SELECT(GX_COLOR_ZERO, GX_COLOR_ZERO, GX_COLOR_NULL, GX_COLOR_NULL));
     GXSetTevColorIn(GX_TEVSTAGE1,GX_CC_C0,GX_CC_KONST,GX_CC_TEXC,GX_CC_ZERO);
     GXSetTevColorOp(GX_TEVSTAGE1,GX_TEV_ADD,GX_TB_ZERO,GX_CS_SCALE_1,true,GX_TEVPREV);
     GXSetTevAlphaIn(GX_TEVSTAGE1,GX_CA_APREV,GX_CA_ZERO,GX_CA_ZERO,GX_CA_ZERO);
     GXSetTevAlphaOp(GX_TEVSTAGE1,GX_TEV_ADD,GX_TB_ZERO,GX_CS_SCALE_1,true,GX_TEVPREV);
     GXSetTevSwapMode(GX_TEVSTAGE1,GX_TEV_SWAP0,GX_TEV_SWAP0);
-    GXSetTevOrder(GX_TEVSTAGE2,GX_TEXCOORD_NULL,GX_TEXMAP_NULL, VERSION_SELECT(GX_COLOR_ZERO, GX_COLOR_NULL, GX_COLOR_NULL));
+    GXSetTevOrder(GX_TEVSTAGE2,GX_TEXCOORD_NULL,GX_TEXMAP_NULL, VERSION_SELECT(GX_COLOR_ZERO, GX_COLOR_ZERO, GX_COLOR_NULL, GX_COLOR_NULL));
     GXSetTevColorIn(GX_TEVSTAGE2,GX_CC_CPREV,GX_CC_C2,GX_CC_APREV,GX_CC_ZERO);
     GXSetTevColorOp(GX_TEVSTAGE2,GX_TEV_ADD,GX_TB_ZERO,GX_CS_SCALE_1,true,GX_TEVPREV);
     GXSetTevAlphaIn(GX_TEVSTAGE2,GX_CA_ZERO,GX_CA_KONST,GX_CA_APREV,GX_CA_ZERO);
@@ -1131,7 +1131,7 @@ void daSea_packet_c::draw() {
     }
 
     GXSetNumIndStages(0);
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     J3DShape::resetVcdVatCache();
 #endif
 }
diff --git a/src/d/actor/d_a_tag_kb_item.cpp b/src/d/actor/d_a_tag_kb_item.cpp
index 25c7b1cc5..76cfcf708 100644
--- a/src/d/actor/d_a_tag_kb_item.cpp
+++ b/src/d/actor/d_a_tag_kb_item.cpp
@@ -9,7 +9,7 @@
 
 /* 00000078-000000C8       .text _delete__13daTagKbItem_cFv */
 bool daTagKbItem_c::_delete() {
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     if (field_0x2a0 != 0xff && field_0x2a4 != 0xff) {
         dComIfGs_offSwitch(field_0x2a4, home.roomNo);
     }
@@ -44,7 +44,7 @@ cPhs_State daTagKbItem_c::_create() {
 
 /* 000001BC-000001C4       .text _execute__13daTagKbItem_cFv */
 bool daTagKbItem_c::_execute() {
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     if (field_0x29c != 0x1f && dComIfGs_isItem(field_0x29c, home.roomNo) ||
         field_0x2a4 != 0xff && dComIfGs_isSwitch(field_0x2a4, home.roomNo))
     {
diff --git a/src/d/actor/d_a_tag_volcano.cpp b/src/d/actor/d_a_tag_volcano.cpp
index 70be1cccb..903bccc08 100644
--- a/src/d/actor/d_a_tag_volcano.cpp
+++ b/src/d/actor/d_a_tag_volcano.cpp
@@ -154,7 +154,7 @@ bool daTagvolcano::Act_c::_execute() {
                 field_0x2a4 = 1;
                 fopAcM_orderOtherEvent(this, "TAG_VOLCANO");
             }
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
         } else {
             mDoAud_seStart(JA_SE_ISLE_TIMER_0);
             dComIfGp_getVibration().StartShock(6, -33, cXyz(0.0f, 1.0f, 0.0f));
diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp
index ed57112e5..c5c0f0638 100644
--- a/src/d/actor/d_a_title.cpp
+++ b/src/d/actor/d_a_title.cpp
@@ -15,7 +15,7 @@
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "stdio.h"
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
 #include "d/res/res_tlogo.h"
 #endif
 #if VERSION == VERSION_USA
@@ -26,7 +26,7 @@
 #endif
 
 // Note: For VERSION_PAL the "TlogoE0" string literal is modified at runtime.
-#define ARCNAME VERSION_SELECT("Tlogo", "TlogoE", "TlogoE0")
+#define ARCNAME VERSION_SELECT("Tlogo", "Tlogo", "TlogoE", "TlogoE0")
 
 namespace {
     struct Attr_c {
@@ -53,7 +53,7 @@ namespace {
         0.9f,
         0.1f,
         -57.0f,
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
         -19.0f,
 #else
         -3.0f,
@@ -64,7 +64,7 @@ namespace {
         10.0f,
         120.0f,
         10.0f,
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
         78.0f,
         8.0f,
 #else
@@ -80,50 +80,50 @@ namespace {
 void daTitle_proc_c::proc_init3D() {
     m_solid_heap = mDoExt_createSolidHeapFromGameToCurrent(0x40000U, 0x20);
 
-    J3DModelData* modelData_ship = (J3DModelData*)dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BDL_TITLE_SHIP, TLOGOE_BDL_TITLE_SHIP, TLOGOE0_BDL_TITLE_SHIP));
-    JUT_ASSERT(VERSION_SELECT(0xD1, 0xFC, 0xFC), modelData_ship != NULL);
+    J3DModelData* modelData_ship = (J3DModelData*)dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BDL_TITLE_SHIP, TLOGO_BDL_TITLE_SHIP, TLOGOE_BDL_TITLE_SHIP, TLOGOE0_BDL_TITLE_SHIP));
+    JUT_ASSERT(VERSION_SELECT(0xD1, 0xD1, 0xFC, 0xFC), modelData_ship != NULL);
 
     mModel_ship = mDoExt_J3DModel__create(modelData_ship, 0x80000U, 0x37441423U);
-    JUT_ASSERT(VERSION_SELECT(0xD6, 0x101, 0x101), mModel_ship != NULL);
+    JUT_ASSERT(VERSION_SELECT(0xD6, 0xD6, 0x101, 0x101), mModel_ship != NULL);
 
-    J3DModelData* modelData_sub = (J3DModelData*)dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BDL_SUBTITLE_START_ANIM, TLOGOE_BDL_SUBTITLE_START_ANIM_E, TLOGOE0_BDL_SUBTITLE_START_ANIM_E));
-    JUT_ASSERT(VERSION_SELECT(0xDA, 0x105, 0x105), modelData_sub != NULL);
+    J3DModelData* modelData_sub = (J3DModelData*)dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BDL_SUBTITLE_START_ANIM, TLOGO_BDL_SUBTITLE_START_ANIM, TLOGOE_BDL_SUBTITLE_START_ANIM_E, TLOGOE0_BDL_SUBTITLE_START_ANIM_E));
+    JUT_ASSERT(VERSION_SELECT(0xDA, 0xDA, 0x105, 0x105), modelData_sub != NULL);
 
     mModel_subtitle = mDoExt_J3DModel__create(modelData_sub, 0x80000U, 0x37441422U);
-    JUT_ASSERT(VERSION_SELECT(0xDF, 0x10A, 0x10A), mModel_subtitle != NULL);
+    JUT_ASSERT(VERSION_SELECT(0xDF, 0xDF, 0x10A, 0x10A), mModel_subtitle != NULL);
 
-    J3DModelData* modelData_kirari = (J3DModelData*)dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BDL_SUBTITLE_KIRARI, TLOGOE_BDL_SUBTITLE_KIRARI_E, TLOGOE0_BDL_SUBTITLE_KIRARI_E));
-    JUT_ASSERT(VERSION_SELECT(0xE3, 0x10E, 0x10E), modelData_kirari != NULL);
+    J3DModelData* modelData_kirari = (J3DModelData*)dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BDL_SUBTITLE_KIRARI, TLOGO_BDL_SUBTITLE_KIRARI, TLOGOE_BDL_SUBTITLE_KIRARI_E, TLOGOE0_BDL_SUBTITLE_KIRARI_E));
+    JUT_ASSERT(VERSION_SELECT(0xE3, 0xE3, 0x10E, 0x10E), modelData_kirari != NULL);
 
     mModel_kirari = mDoExt_J3DModel__create(modelData_kirari, 0x80000U, 0x37441422U);
-    JUT_ASSERT(VERSION_SELECT(0xE8, 0x113, 0x113), mModel_kirari != NULL);
+    JUT_ASSERT(VERSION_SELECT(0xE8, 0xE8, 0x113, 0x113), mModel_kirari != NULL);
 
-    J3DAnmTransform* bck_ship = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BCK_TITLE_SHIP, TLOGOE_BCK_TITLE_SHIP, TLOGOE0_BCK_TITLE_SHIP)));
-    JUT_ASSERT(VERSION_SELECT(0xED, 0x118, 0x118), bck_ship != NULL);
+    J3DAnmTransform* bck_ship = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BCK_TITLE_SHIP, TLOGO_BCK_TITLE_SHIP, TLOGOE_BCK_TITLE_SHIP, TLOGOE0_BCK_TITLE_SHIP)));
+    JUT_ASSERT(VERSION_SELECT(0xED, 0xED, 0x118, 0x118), bck_ship != NULL);
 
     BOOL ok_bck = mBckShip.init(modelData_ship, bck_ship, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false);
-    JUT_ASSERT(VERSION_SELECT(0xF4, 0x11F, 0x11F), ok_bck != FALSE);
+    JUT_ASSERT(VERSION_SELECT(0xF4, 0xF4, 0x11F, 0x11F), ok_bck != FALSE);
 
-    J3DAnmColor* bpk_ship = static_cast<J3DAnmColor*>(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BPK_TITLE_SHIP, TLOGOE_BPK_TITLE_SHIP, TLOGOE0_BPK_TITLE_SHIP)));
-    JUT_ASSERT(VERSION_SELECT(0xF9, 0x124, 0x124), bpk_ship != NULL);
+    J3DAnmColor* bpk_ship = static_cast<J3DAnmColor*>(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BPK_TITLE_SHIP, TLOGO_BPK_TITLE_SHIP, TLOGOE_BPK_TITLE_SHIP, TLOGOE0_BPK_TITLE_SHIP)));
+    JUT_ASSERT(VERSION_SELECT(0xF9, 0xF9, 0x124, 0x124), bpk_ship != NULL);
 
     BOOL ok_bpk = mBpkShip.init(modelData_ship, bpk_ship, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0);
-    JUT_ASSERT(VERSION_SELECT(0xFF, 0x12A, 0x12A), ok_bpk != FALSE);
+    JUT_ASSERT(VERSION_SELECT(0xFF, 0xFF, 0x12A, 0x12A), ok_bpk != FALSE);
 
     mBpkShip.setFrame(0.0f);
     mBpkShip.setPlaySpeed(1.0f);
 
-    J3DAnmTextureSRTKey* btk_sub = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BTK_SUBTITLE_START_ANIM, TLOGOE_BTK_SUBTITLE_START_ANIM_E, TLOGOE0_BTK_SUBTITLE_START_ANIM_E)));
-    JUT_ASSERT(VERSION_SELECT(0x106, 0x131, 0x131), btk_sub != NULL);
+    J3DAnmTextureSRTKey* btk_sub = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BTK_SUBTITLE_START_ANIM, TLOGO_BTK_SUBTITLE_START_ANIM, TLOGOE_BTK_SUBTITLE_START_ANIM_E, TLOGOE0_BTK_SUBTITLE_START_ANIM_E)));
+    JUT_ASSERT(VERSION_SELECT(0x106, 0x106, 0x131, 0x131), btk_sub != NULL);
 
     BOOL ok_btk_subtitle = mBtkSub.init(modelData_sub, btk_sub, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0);
-    JUT_ASSERT(VERSION_SELECT(0x10D, 0x138, 0x138), ok_btk_subtitle != FALSE);
+    JUT_ASSERT(VERSION_SELECT(0x10D, 0x10D, 0x138, 0x138), ok_btk_subtitle != FALSE);
 
-    J3DAnmTextureSRTKey* btk_kirari = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BTK_SUBTITLE_KIRARI, TLOGOE_BTK_SUBTITLE_KIRARI_E, TLOGOE0_BTK_SUBTITLE_KIRARI_E)));
-    JUT_ASSERT(VERSION_SELECT(0x112, 0x13D, 0x13D), btk_kirari != NULL);
+    J3DAnmTextureSRTKey* btk_kirari = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(ARCNAME, VERSION_SELECT(TLOGO_BTK_SUBTITLE_KIRARI, TLOGO_BTK_SUBTITLE_KIRARI, TLOGOE_BTK_SUBTITLE_KIRARI_E, TLOGOE0_BTK_SUBTITLE_KIRARI_E)));
+    JUT_ASSERT(VERSION_SELECT(0x112, 0x112, 0x13D, 0x13D), btk_kirari != NULL);
 
     BOOL ok_btk_kirari = mBtkKirari.init(modelData_kirari, btk_kirari, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0);
-    JUT_ASSERT(VERSION_SELECT(0x119, 0x144, 0x144), ok_btk_kirari != FALSE);
+    JUT_ASSERT(VERSION_SELECT(0x119, 0x119, 0x144, 0x144), ok_btk_kirari != FALSE);
 
     mDoExt_restoreCurrentHeap();
     set_mtx();
@@ -132,17 +132,17 @@ void daTitle_proc_c::proc_init3D() {
 /* 00000638-00000900       .text proc_init2D__14daTitle_proc_cFv */
 void daTitle_proc_c::proc_init2D() {
     m_exp_heap = fopMsgM_createExpHeap(0x30000U);
-    JUT_ASSERT(VERSION_SELECT(0x122, 0x14D, 0x14D), m_exp_heap != NULL);
+    JUT_ASSERT(VERSION_SELECT(0x122, 0x122, 0x14D, 0x14D), m_exp_heap != NULL);
 
     JKRHeap* oldHeap = mDoExt_setCurrentHeap(m_exp_heap);
 
     m_Screen = new J2DScreen();
-    JUT_ASSERT(VERSION_SELECT(0x128, 0x153, 0x153), m_Screen != NULL);
+    JUT_ASSERT(VERSION_SELECT(0x128, 0x128, 0x153, 0x153), m_Screen != NULL);
 
     dRes_info_c* resInfo = dComIfG_getObjectResInfo(ARCNAME);
-    JUT_ASSERT(VERSION_SELECT(0x12A, 0x155, 0x155), resInfo != NULL);
+    JUT_ASSERT(VERSION_SELECT(0x12A, 0x12A, 0x155, 0x155), resInfo != NULL);
 
-    m_Screen->set(VERSION_SELECT("title_logo.blo", "title_logo_e.blo", "title_logo_e.blo"), resInfo->getArchive());
+    m_Screen->set(VERSION_SELECT("title_logo.blo", "title_logo.blo", "title_logo_e.blo", "title_logo_e.blo"), resInfo->getArchive());
 
     m0A0[2] = m_Screen->search('pres');
     m0A0[3] = m_Screen->search('nint');
@@ -263,7 +263,7 @@ void daTitle_proc_c::calc_2d_alpha() {
             fopMsgM_setNowAlpha(&pane[0], 1.0f);
         }
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
         if (m018 <= 75) {
             fopMsgM_setNowAlpha(&pane[1], 0.0f);
         } else if (m018 <= 130) {
@@ -326,7 +326,7 @@ void daTitle_proc_c::calc_2d_alpha() {
         }
 
         fopMsgM_setNowAlpha(&pane[0], 1.0f);
-        fopMsgM_setNowAlpha(&pane[1], VERSION_SELECT(1.0f, 0.0f, 0.0f));
+        fopMsgM_setNowAlpha(&pane[1], VERSION_SELECT(1.0f, 1.0f, 0.0f, 0.0f));
 
         if (mpEmitter2 != NULL) {
             mpEmitter2->becomeInvalidEmitter();
@@ -425,7 +425,7 @@ void daTitle_proc_c::proc_execute() {
 void daTitle_proc_c::model_draw() {
     dComIfGd_setList2D();
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     if (mBtkSub.getFrame() != 0.0f) {
 #endif
         mBtkKirari.entry(mModel_kirari->getModelData());
@@ -435,11 +435,11 @@ void daTitle_proc_c::model_draw() {
         mBtkSub.entry(mModel_subtitle->getModelData());
         mDoExt_modelUpdateDL(mModel_subtitle);
         mBtkSub.remove(mModel_subtitle->getModelData());
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     }
 #endif
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     if (mBpkShip.getFrame() != 0.0f) {
 #endif
         mBckShip.entry(mModel_ship->getModelData());
@@ -447,7 +447,7 @@ void daTitle_proc_c::model_draw() {
         mDoExt_modelUpdateDL(mModel_ship);
         mBpkShip.remove(mModel_ship->getModelData());
         mBckShip.remove(mModel_ship->getModelData());
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     }
 #endif
 
@@ -513,20 +513,20 @@ BOOL daTitle_c::execute() {
             mpTitleProc->setEnterMode();
         } else if(mpTitleProc->getEnterMode() == 3) {
             scene_class* stageProc = fopScnM_SearchByID(dStage_roomControl_c::getProcID());
-            JUT_ASSERT(VERSION_SELECT(0x2B1, 0x2EF, 0x2EF), stageProc != NULL);
+            JUT_ASSERT(VERSION_SELECT(0x2B1, 0x2B1, 0x2EF, 0x2EF), stageProc != NULL);
 
             if (!m29C && fopScnM_ChangeReq(stageProc, PROC_NAME_SCENE, 0, 5)) {
                 mDoAud_seStart(JA_SE_OP_ENTER_GAME);
                 m29C = true;
             }
         } else if (
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
             !mDoRst::isReset() &&
 #endif
             dComIfGp_isEnableNextStage()
         ) {
             scene_class* stageProc = fopScnM_SearchByID(dStage_roomControl_c::getProcID());
-            JUT_ASSERT(VERSION_SELECT(0x2BD, 0x2FC, 0x2FC), stageProc != NULL);
+            JUT_ASSERT(VERSION_SELECT(0x2BD, 0x2BD, 0x2FC, 0x2FC), stageProc != NULL);
 
             if (!m29C) {
                 s16 procName = fpcM_GetName(stageProc) == PROC_OPENING_SCENE ? PROC_OPEN2_SCENE : PROC_TITLE_SCENE;
diff --git a/src/d/d_bg_w_hf.cpp b/src/d/d_bg_w_hf.cpp
index 6c1082b02..70b8c7bfc 100644
--- a/src/d/d_bg_w_hf.cpp
+++ b/src/d/d_bg_w_hf.cpp
@@ -88,7 +88,7 @@ void dBgWHf::ClassifyPlane() {
     }
     
     for (int b = 0; b < pm_bgd->m_b_num; b++) {
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
         JUT_ASSERT(140, 0 <= b && b < pm_bgd->m_b_num);
 #endif
         
@@ -106,7 +106,7 @@ void dBgWHf::ClassifyPlane() {
         int sp8 = (u16)-1;
         
         for (int t = r6; t <= r29; t++) {
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
             JUT_ASSERT(159, 0 <= t && t < pm_bgd->m_t_num);
 #endif
             BlckConnect(&pm_blk[b].ground, &sp8, t);
@@ -127,7 +127,7 @@ void dBgWHf::MoveHf() {
 
 /* 800A9EDC-800A9FA0       .text MakeBlckMinMaxHf__6dBgWHfFiPfPf */
 void dBgWHf::MakeBlckMinMaxHf(int v_index, f32* r30, f32* r31) {
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     JUT_ASSERT(198, 0 <= v_index && v_index < pm_bgd->m_v_num);
 #endif
     Vec* vtx = &pm_vtx_tbl[v_index];
@@ -141,7 +141,7 @@ void dBgWHf::MakeBlckMinMaxHf(int v_index, f32* r30, f32* r31) {
 
 /* 800A9FA0-800AA164       .text MakeBlckBndHf__6dBgWHfFiPfPf */
 void dBgWHf::MakeBlckBndHf(int blck_id, f32* r28, f32* r29) {
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     JUT_ASSERT(221, blck_id >= 0 && blck_id < pm_bgd->m_b_num);
 #endif
     
@@ -157,7 +157,7 @@ void dBgWHf::MakeBlckBndHf(int blck_id, f32* r28, f32* r29) {
     *r29 = C_BG_MIN_HEIGHT;
     
     for (int t = r7; t <= r31; t++) {
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
         JUT_ASSERT(238, 0 <= t && t < pm_bgd->m_t_num);
 #endif
         MakeBlckMinMaxHf(pm_bgd->m_t_tbl[t].vtx0, r28, r29);
@@ -171,7 +171,7 @@ void dBgWHf::MakeBlckBndHf(int blck_id, f32* r28, f32* r29) {
 
 /* 800AA164-800AA8AC       .text MakeNodeTreeRpHf__6dBgWHfFi */
 void dBgWHf::MakeNodeTreeRpHf(int node_index) {
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     JUT_ASSERT(258, 0 <= node_index && node_index < pm_bgd->m_tree_num);
 #endif
     
@@ -224,7 +224,7 @@ void dBgWHf::MakeNodeTreeRpHf(int node_index) {
         }
     }
     
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     CHECK_MINMAX_1(353, m_nt_tbl[node_index].GetMinP(), m_nt_tbl[node_index].GetMaxP());
     CHECK_MINMAX_2(365, m_nt_tbl[node_index].GetMinP(), m_nt_tbl[node_index].GetMaxP());
 #endif
@@ -232,7 +232,7 @@ void dBgWHf::MakeNodeTreeRpHf(int node_index) {
 
 /* 800AA8AC-800AAA70       .text MakeNodeTreeGrpRpHf__6dBgWHfFi */
 void dBgWHf::MakeNodeTreeGrpRpHf(int g) {
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     JUT_ASSERT(377, 0 <= g && g < pm_bgd->m_g_num);
 #endif
     
diff --git a/src/d/d_cam_style.cpp b/src/d/d_cam_style.cpp
index 99c51d724..d7ccc514b 100644
--- a/src/d/d_cam_style.cpp
+++ b/src/d/d_cam_style.cpp
@@ -356,7 +356,7 @@ const dCamera__Style dCamParam_c::styles[] = {
         {0.0f, 0.0f, -99999.99f, 0.7f, 0.25f, 0.0f, 0.0f, 30.0f, 0.0f, 1.0f, 320.0f, 240.0f, 700.0f, 0.0f, 20.0f, 0.0f, 0.0f, 30.0f, 0.0f, 0.6f, 0.33f, 0.66f, -99999.99f, 0.0f, 8.0f, 55.0f, 50.0f, 60.0f, 0.0f, 0.4f},
         dCamPrmFlg_UNK002,
     },
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     {
         'MM03',
         0xA,
@@ -676,7 +676,7 @@ const dCamera__Style dCamParam_c::styles[] = {
         {1.0f, 0.0f, -99999.99f, 0.75f, 0.25f, 15.0f, -99999.99f, -99999.99f, -99999.99f, -99999.99f, 1050.0f, 950.0f, -99999.99f, 0.66f, 0.05f, 20.0f, 15.0f, 45.0f, 2.0f, 0.05f, 0.12f, -99999.99f, -99999.99f, 1.0f, 0.2f, 60.0f, -99999.99f, -99999.99f, -99999.99f, 0.05f},
         dCamPrmFlg_UNK001 | dCamPrmFlg_UNK400,
     },
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     {
         'FN38',
         0x1,
@@ -876,7 +876,7 @@ const dCamera__Style dCamParam_c::styles[] = {
         {0.0f, 0.0f, -99999.99f, 0.7f, 0.25f, 30.0f, 25.0f, 30.0f, 0.0f, 0.5f, 250.0f, 160.0f, 420.0f, 0.0f, 20.0f, 20.0f, 40.0f, 5.0f, 0.0f, 2.4f, 0.33f, 0.66f, -99999.99f, 0.0f, 8.0f, 55.0f, 55.0f, 58.0f, 0.0f, 0.45f},
         dCamPrmFlg_UNK002,
     },
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     {
         'MM03',
         0xA,
diff --git a/src/d/d_cam_type.cpp b/src/d/d_cam_type.cpp
index 4f4d022f4..377b493f0 100644
--- a/src/d/d_cam_type.cpp
+++ b/src/d/d_cam_type.cpp
@@ -114,7 +114,7 @@ const dCamera__Type dCamera_c::types[] = {
         "Jump",
         {dCamStyle_FN08_e, dCamStyle_FN08_e, dCamStyle_LL02_e, dCamStyle_TT02_e, dCamStyle_SS01_e, dCamStyle_LW01_e, dCamStyle_LE01_e, dCamStyle_LH02_e, dCamStyle_LA02_e, dCamStyle_LB02_e, dCamStyle_SX01_e, dCamStyle_SY01_e, dCamStyle_MM03_e, dCamStyle_CC01_e, dCamStyle_SN15_e, dCamStyle_JN05_e, dCamStyle_EN00_e, dCamStyle_HN18_e, dCamStyle_HN16_e, dCamStyle_DD02_e},
     },
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     {
         "DungeonUp",
         {dCamStyle_FN04_e, dCamStyle_FN04_e, dCamStyle_LL06_e, dCamStyle_TT02_e, dCamStyle_SS01_e, dCamStyle_LW02_e, dCamStyle_LE01_e, dCamStyle_LH02_e, dCamStyle_LA02_e, dCamStyle_LB02_e, dCamStyle_SX01_e, dCamStyle_SY01_e, dCamStyle_MM02_e, dCamStyle_CC01_e, dCamStyle_SN15_e, dCamStyle_JN05_e, dCamStyle_EN00_e, dCamStyle_HN18_e, dCamStyle_HN16_e, dCamStyle_DD02_e},
@@ -168,7 +168,7 @@ const dCamera__Type dCamera_c::types[] = {
         "BoatBattle",
         {dCamStyle_BN08_e, dCamStyle_BP08_e, dCamStyle_LL17_e, dCamStyle_TT01_e, dCamStyle_SS01_e, dCamStyle_BW07_e, dCamStyle_BE07_e, dCamStyle_NONE_e, dCamStyle_NONE_e, dCamStyle_NONE_e, dCamStyle_SX01_e, dCamStyle_SY01_e, dCamStyle_MM07_e, dCamStyle_NONE_e, dCamStyle_SN15_e, dCamStyle_JN05_e, dCamStyle_EN00_e, dCamStyle_HN18_e, dCamStyle_HN16_e, dCamStyle_DD01_e},
     },
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     {
         "Water",
         {dCamStyle_FN14_e, dCamStyle_FN14_e, dCamStyle_LL02_e, dCamStyle_TT02_e, dCamStyle_SS01_e, dCamStyle_NONE_e, dCamStyle_NONE_e, dCamStyle_NONE_e, dCamStyle_NONE_e, dCamStyle_NONE_e, dCamStyle_SX01_e, dCamStyle_SY01_e, dCamStyle_MM14_e, dCamStyle_CC01_e, dCamStyle_SN15_e, dCamStyle_NONE_e, dCamStyle_EN00_e, dCamStyle_NONE_e, dCamStyle_NONE_e, dCamStyle_NONE_e},
@@ -258,7 +258,7 @@ const dCamera__Type dCamera_c::types[] = {
         "Restrict",
         {dCamStyle_LN01_e, dCamStyle_NONE_e, dCamStyle_NONE_e, dCamStyle_NONE_e, dCamStyle_SS01_e, dCamStyle_NONE_e, dCamStyle_NONE_e, dCamStyle_NONE_e, dCamStyle_NONE_e, dCamStyle_NONE_e, dCamStyle_SX01_e, dCamStyle_SY01_e, dCamStyle_NONE_e, dCamStyle_CC01_e, dCamStyle_SN15_e, dCamStyle_NONE_e, dCamStyle_EN00_e, dCamStyle_NONE_e, dCamStyle_NONE_e, dCamStyle_NONE_e},
     },
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     {
         "DungeonUp",
         {dCamStyle_FN04_e, dCamStyle_FN04_e, dCamStyle_LL06_e, dCamStyle_TT02_e, dCamStyle_SS01_e, dCamStyle_LW02_e, dCamStyle_LE01_e, dCamStyle_LH02_e, dCamStyle_LA02_e, dCamStyle_LB02_e, dCamStyle_SX01_e, dCamStyle_SY01_e, dCamStyle_MM08_e, dCamStyle_CC01_e, dCamStyle_SN15_e, dCamStyle_JN05_e, dCamStyle_EN00_e, dCamStyle_HN18_e, dCamStyle_HN16_e, dCamStyle_DD02_e},
diff --git a/src/d/d_cc_d.cpp b/src/d/d_cc_d.cpp
index c26683cad..c669bad27 100644
--- a/src/d/d_cc_d.cpp
+++ b/src/d/d_cc_d.cpp
@@ -132,7 +132,7 @@ void dCcD_GObjInf::ClrAtHit() {
     SubtractAtEffCounter();
 }
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
 /* 800AB81C-800AB874       .text ChkAtHit__12dCcD_GObjInfFv */
 u32 dCcD_GObjInf::ChkAtHit() {
     if (!cCcD_ObjHitInf::ChkAtHit())
@@ -182,7 +182,7 @@ void dCcD_GObjInf::ClrTgHit() {
     SubtractTgEffCounter();
 }
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
 /* 800AB9B0-800ABA08       .text ChkTgHit__12dCcD_GObjInfFv */
 u32 dCcD_GObjInf::ChkTgHit() {
     if (!cCcD_ObjHitInf::ChkTgHit())
@@ -232,7 +232,7 @@ void dCcD_GObjInf::ClrCoHit() {
     SubtractCoEffCounter();
 }
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
 /* 800ABB4C-800ABBA4       .text ChkCoHit__12dCcD_GObjInfFv */
 u32 dCcD_GObjInf::ChkCoHit() {
     if (!cCcD_ObjHitInf::ChkCoHit())
@@ -263,7 +263,7 @@ void dCcD_GObjInf::Set(const dCcD_SrcGObjInf& src) {
 
 /* 800ABC54-800ABCC4       .text dCcD_GetGObjInf__FP8cCcD_Obj */
 dCcD_GObjInf* dCcD_GetGObjInf(cCcD_Obj* pobj) {
-    JUT_ASSERT(VERSION_SELECT(466, 531, 531), pobj != NULL);
+    JUT_ASSERT(VERSION_SELECT(466, 466, 531, 531), pobj != NULL);
     return (dCcD_GObjInf*)pobj->GetGObjInf();
 }
 
diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp
index 301535b54..737dda2af 100644
--- a/src/d/d_com_inf_game.cpp
+++ b/src/d/d_com_inf_game.cpp
@@ -32,7 +32,7 @@ GXColor g_whiteColor      = {0xFF, 0xFF, 0xFF, 0xFF};
 GXColor g_saftyWhiteColor = {0xA0, 0xA0, 0xA0, 0xFF};
 
 /* 80052134-800521A4       .text ct__14dComIfG_play_cFv */
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
 dComIfG_play_c::dComIfG_play_c()
 #else
 void dComIfG_play_c::ct()
@@ -228,7 +228,7 @@ int dComIfG_play_c::getLayerNo(int i_roomNo) {
                 return layer | 6;
             }
         } else if (strcmp(dComIfGp_getStartStageName(), "kenroom") == 0) {
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
             if (dComIfGs_isEventBit(0x2C01)) {
 #else
             if (dComIfGs_isEventBit(0x2C01) ||
@@ -238,7 +238,7 @@ int dComIfG_play_c::getLayerNo(int i_roomNo) {
                 return layer | 6;
             } else if (dComIfGs_getTriforceNum() == 8) {
                 return layer | 4;
-            } else if (dComIfGs_isEventBit(VERSION_SELECT(0x3280, dSv_evtBit_c::COLORS_IN_HYRULE, dSv_evtBit_c::COLORS_IN_HYRULE))) {
+            } else if (dComIfGs_isEventBit(VERSION_SELECT(0x3280, 0x3280, dSv_evtBit_c::COLORS_IN_HYRULE, dSv_evtBit_c::COLORS_IN_HYRULE))) {
                 return layer | 2;
             }
         } else if (strcmp(dComIfGp_getStartStageName(), "M2tower") == 0) {
@@ -265,14 +265,14 @@ int dComIfG_play_c::getLayerNo(int i_roomNo) {
 void dComIfG_play_c::createParticle() {
     mParticle = new dPa_control_c();
 
-    JUT_ASSERT(VERSION_SELECT(358, 360, 360), mParticle != NULL);
+    JUT_ASSERT(VERSION_SELECT(358, 358, 360, 360), mParticle != NULL);
 }
 
 /* 800528F4-8005297C       .text createDemo__14dComIfG_play_cFv */
 void dComIfG_play_c::createDemo() {
     mDemo = new dDemo_manager_c();
 
-    JUT_ASSERT(VERSION_SELECT(388, 390, 390), mDemo != NULL);
+    JUT_ASSERT(VERSION_SELECT(388, 388, 390, 390), mDemo != NULL);
 }
 
 /* 8005297C-800529B8       .text removeDemo__14dComIfG_play_cFv */
@@ -462,7 +462,7 @@ void dComIfG_play_c::drawWood() {
     }
 }
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
 dComIfG_inf_c::dComIfG_inf_c() {
     mBrightness = 0xFF;
 }
@@ -544,7 +544,7 @@ cPhs_State dComIfG_resLoad(request_of_phase_process_class* i_phase, const char*
 
 /* 800533D0-8005347C       .text dComIfG_resDelete__FP30request_of_phase_process_classPCc */
 int dComIfG_resDelete(request_of_phase_process_class* i_phase, const char* i_resName) {
-    JUT_ASSERT(VERSION_SELECT(1045, 1048, 1048), i_phase->id != 1);
+    JUT_ASSERT(VERSION_SELECT(1045, 1045, 1048, 1048), i_phase->id != 1);
 
     if (i_phase->id == 2) {
         dComIfG_deleteObjectRes(i_resName);
@@ -1063,12 +1063,12 @@ static void dummy() {
 /* 8005468C-800547BC       .text getSceneList__Fi */
 stage_scls_info_class* getSceneList(int i_no) {
     stage_scls_info_dummy_class* sclsInfo = dComIfGp_getStage().getSclsInfo();
-    JUT_ASSERT(VERSION_SELECT(2129, 2132, 2132), sclsInfo != NULL);
+    JUT_ASSERT(VERSION_SELECT(2129, 2129, 2132, 2132), sclsInfo != NULL);
 
-    JUT_ASSERT(VERSION_SELECT(2131, 2134, 2134), 0 <= i_no && i_no < sclsInfo->num);
+    JUT_ASSERT(VERSION_SELECT(2131, 2131, 2134, 2134), 0 <= i_no && i_no < sclsInfo->num);
 
     stage_scls_info_class* sclsData = sclsInfo->m_entries;
-    JUT_ASSERT(VERSION_SELECT(2133, 2136, 2136), sclsData != NULL);
+    JUT_ASSERT(VERSION_SELECT(2133, 2133, 2136, 2136), sclsData != NULL);
 
     return &sclsData[i_no];
 }
@@ -1208,7 +1208,7 @@ void dComIfGs_setGameStartStage() {
             strcpy(stage_name, "sea");
 
             stage_map_info_class* mapInfo = dComIfGp_getStage().getMapInfo();
-            JUT_ASSERT(VERSION_SELECT(2359, 2362, 2362), mapInfo != NULL);
+            JUT_ASSERT(VERSION_SELECT(2359, 2359, 2362, 2362), mapInfo != NULL);
 
             room_no = 4 + dStage_mapInfo_GetOceanX(mapInfo) + ((dStage_mapInfo_GetOceanZ(mapInfo) + 3) * 7);
             point = 0;
@@ -1265,7 +1265,7 @@ void dComIfGs_copyPlayerRecollectionData() {
 
 /* 80054E9C-80055318       .text dComIfGs_setPlayerRecollectionData__Fv */
 void dComIfGs_setPlayerRecollectionData() {
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     daArrow_c::setKeepType(daArrow_c::TYPE_NORMAL);
 #endif
 
diff --git a/src/d/d_com_static.cpp b/src/d/d_com_static.cpp
index b2eb30f13..9db000a18 100644
--- a/src/d/d_com_static.cpp
+++ b/src/d/d_com_static.cpp
@@ -359,7 +359,7 @@ void daTagKbItem_c::kb_dig(fopAc_ac_c* i_actor) {
 
 /* 80056AFC-80056CC0       .text dig_main__13daTagKbItem_cFv */
 void daTagKbItem_c::dig_main() {
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     if (fopAcM_isSwitch(this, field_0x2a4)) {
         return;
     }
@@ -381,7 +381,7 @@ void daTagKbItem_c::dig_main() {
         // Not a pig.
         return;
     }
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     if (field_0x2a0 != 0xFF && field_0x298 == 0) {
 #else
     if (field_0x2a0 != 0xFF) {
@@ -395,7 +395,7 @@ void daTagKbItem_c::dig_main() {
         if (item) {
             fopAcM_OnStatus(item, fopAcStts_UNK4000_e);
         }
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
         fopAcM_delete(this);
 #else
         if (field_0x2a4 != 0xFF) {
diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp
index 7db5f320d..a13c87025 100644
--- a/src/d/d_drawlist.cpp
+++ b/src/d/d_drawlist.cpp
@@ -1732,7 +1732,7 @@ void dDlst_shadowControl_c::imageDraw(Mtx mtx) {
 /* 80084EF0-800850D4       .text draw__21dDlst_shadowControl_cFPA4_f */
 void dDlst_shadowControl_c::draw(Mtx drawMtx) {
     j3dSys.reinitGX();
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     GXSetNumIndStages(0);
 #endif
     dKy_GxFog_set();
@@ -1846,7 +1846,7 @@ void dDlst_shadowControl_c::setSimpleTex(void* pImg) {
 /* 80085348-800855B4       .text draw__18dDlst_mirrorPacketFv */
 void dDlst_mirrorPacket::draw() {
     j3dSys.reinitGX();
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     GXSetNumIndStages(0);
 #endif
     dKy_GxFog_set();
@@ -1894,7 +1894,7 @@ void dDlst_mirrorPacket::draw() {
     GXCallDisplayList(l_shadowVolDL, 0x40);
     GXSetColorUpdate(GX_TRUE);
     GXSetAlphaUpdate(GX_FALSE);
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     J3DShape::resetVcdVatCache();
 #endif
 }
@@ -1995,7 +1995,7 @@ void dDlst_alphaVolPacket::draw() {
     GXCallDisplayList(l_shadowVolumeDL, 0x40);
     GXSetColorUpdate(GX_TRUE);
     GXSetAlphaUpdate(GX_FALSE);
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     J3DShape::resetVcdVatCache();
 #endif
 }
@@ -2015,7 +2015,7 @@ void dDlst_alphaInvVolPacket::draw() {
     GXCallDisplayList(l_shadowVolumeDL, 0x40);
     GXSetColorUpdate(GX_TRUE);
     GXSetAlphaUpdate(GX_FALSE);
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     J3DShape::resetVcdVatCache();
 #endif
 }
@@ -2223,7 +2223,7 @@ void dDlst_list_c::wipeIn(f32 speed, GXColor& color) {
         mWipeRate = 1.0f;
     }
     ResTIMG* texture = (ResTIMG*)JKRGetResource('TIMG', "wipe_00.bti", dComIfGp_getMenuArchive());
-    JUT_ASSERT(VERSION_SELECT(5679, 5687, 5687), texture != NULL);
+    JUT_ASSERT(VERSION_SELECT(5679, 5679, 5687, 5687), texture != NULL);
     mWipeDlst.init(texture, -9.0f, -21.0f, 659.0f, 524.0f, 0, 1, 1, 2.0f, 2.436f);
 }
 
diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp
index aab7f24c8..adbd7f85f 100644
--- a/src/d/d_gameover.cpp
+++ b/src/d/d_gameover.cpp
@@ -73,7 +73,7 @@ cPhs_State dGameover_c::_create() {
     if (rt == cPhs_COMPLEATE_e) {
         dComIfGs_addDeathCount();
         dRes_info_c* resInfo = dComIfG_getObjectResInfo("Gover");
-        JUT_ASSERT(VERSION_SELECT(0x9c, 0xa0, 0xa0), resInfo != NULL);
+        JUT_ASSERT(VERSION_SELECT(0x9c, 0x9c, 0xa0, 0xa0), resInfo != NULL);
 
         mpHeap = dComIfGp_getExpHeap2D();
         dComIfGp_setHeapLockFlag(4);
@@ -83,12 +83,12 @@ cPhs_State dGameover_c::_create() {
         dgo_scrn_c->setScreen("gameover.blo", resInfo->getArchive());
 
         dMs_c = new dMenu_save_c();
-        JUT_ASSERT(VERSION_SELECT(0xa7, 0xb6, 0xb6), dMs_c != NULL);
+        JUT_ASSERT(VERSION_SELECT(0xa7, 0xa7, 0xb6, 0xb6), dMs_c != NULL);
         dMs_c->setUseType(2);
         dMs_c->_create();
 
         dgo_capture_c = new dDlst_Gameover_CAPTURE_c();
-        JUT_ASSERT(VERSION_SELECT(0xac, 0xbb, 0xbb), dgo_capture_c != NULL);
+        JUT_ASSERT(VERSION_SELECT(0xac, 0xac, 0xbb, 0xbb), dgo_capture_c != NULL);
 
         mDoExt_setCurrentHeap(oldHeap);
     } else {
@@ -186,7 +186,7 @@ BOOL dGameover_c::deleteCheck() {
     return mState == 6;
 }
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
 static const s16 dGover_tex_number = 8;
 #else
 static s16 dGover_tex_number = 8;
diff --git a/src/d/d_grass.cpp b/src/d/d_grass.cpp
index 5ac30c2e3..ea321a38f 100644
--- a/src/d/d_grass.cpp
+++ b/src/d/d_grass.cpp
@@ -358,7 +358,7 @@ dGrass_data_c::dGrass_data_c() {
 
 /* 80077CDC-80077E58       .text draw__15dGrass_packet_cFv */
 void dGrass_packet_c::draw() {
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     j3dSys.reinitGX();
     GXSetNumIndStages(0);
 #endif
@@ -401,7 +401,7 @@ void dGrass_packet_c::draw() {
         }
     }
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     J3DShape::resetVcdVatCache();
 #endif
 }
@@ -518,7 +518,7 @@ void dGrass_packet_c::setData(dGrass_data_c* data, int nextIdx, cXyz& pos, int i
 
 /* 800785C0-800786FC       .text newData__15dGrass_packet_cFR4cXyziSc */
 dGrass_data_c* dGrass_packet_c::newData(cXyz& pos, int i_roomNo, s8 itemIdx) {
-    JUT_ASSERT(VERSION_SELECT(1530, 1536, 1536), 0 <= i_roomNo && i_roomNo < 64);
+    JUT_ASSERT(VERSION_SELECT(1530, 1530, 1536, 1536), 0 <= i_roomNo && i_roomNo < 64);
 
     dGrass_data_c* data = &mGrassData[mNextIdx];
     s32 i = mNextIdx;
diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp
index 4e5536315..995ea7744 100644
--- a/src/d/d_item.cpp
+++ b/src/d/d_item.cpp
@@ -814,7 +814,7 @@ void item_func_magic_arrow() {
     dComIfGs_onGetItem(dInvSlot_BOW_e, 1);
     dComIfGs_setItem(dInvSlot_BOW_e, dItem_MAGIC_ARROW_e);
     
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     // If the regular bow was equipped on an X/Y/Z button, force it to update.
     for (int itemBtn = 0; itemBtn < dItemBtn_COUNT_e; itemBtn++) {
         if (dComIfGp_getSelectItem(itemBtn) == dItem_BOW_e) {
@@ -829,7 +829,7 @@ void item_func_light_arrow() {
     dComIfGs_onGetItem(dInvSlot_BOW_e, 2);
     dComIfGs_setItem(dInvSlot_BOW_e, dItem_LIGHT_ARROW_e);
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     // If the fire/ice bow was equipped on an X/Y/Z button, force it to update.
     for (int itemBtn = 0; itemBtn < dItemBtn_COUNT_e; itemBtn++) {
         if (dComIfGp_getSelectItem(itemBtn) == dItem_MAGIC_ARROW_e) {
diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp
index 13d713175..1c70d5509 100644
--- a/src/d/d_kankyo.cpp
+++ b/src/d/d_kankyo.cpp
@@ -503,7 +503,7 @@ void dScnKy_env_light_c::setDaytime() {
     mCurTime = dComIfGs_getTime();
     mDayOfWeek = dComIfGs_getDate();
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     if (strcmp(dComIfGp_getStartStageName(), "sea") == 0 && dComIfGp_roomControl_getStayNo() == 14)
     {
         if (dComIfGp_getStartStageLayer() == 2 || dComIfGp_getStartStageLayer() == 3) {
@@ -2551,7 +2551,7 @@ cXyz dKy_plight_near_pos() {
 
 /* 801952E0-80195364       .text dKy_plight_set__FP15LIGHT_INFLUENCE */
 void dKy_plight_set(LIGHT_INFLUENCE* param_0) {
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     for (int i = 0; i < 200; i++) {
         if (g_env_light.mpPLights[i] == param_0) {
             return;
@@ -2560,7 +2560,7 @@ void dKy_plight_set(LIGHT_INFLUENCE* param_0) {
 #endif
 
     for (int i = 0; i < 200; i++) {
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
         if (g_env_light.mpPLights[i] == param_0) {
             return;
         }
@@ -2613,7 +2613,7 @@ void dKy_plight_cut(LIGHT_INFLUENCE* param_0) {
 
 /* 80195454-801954D8       .text dKy_efplight_set__FP15LIGHT_INFLUENCE */
 void dKy_efplight_set(LIGHT_INFLUENCE* param_0) {
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     for (int i = 0; i < 10; i++) {
         if (g_env_light.mpEfLights[i] == param_0) {
             return;
@@ -2622,7 +2622,7 @@ void dKy_efplight_set(LIGHT_INFLUENCE* param_0) {
 #endif
 
     for (int i = 0; i < 10; i++) {
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
         if (g_env_light.mpEfLights[i] == param_0) {
             return;
         }
diff --git a/src/d/d_kankyo_dayproc.inc b/src/d/d_kankyo_dayproc.inc
index 04b3d078c..e01919929 100644
--- a/src/d/d_kankyo_dayproc.inc
+++ b/src/d/d_kankyo_dayproc.inc
@@ -70,12 +70,12 @@ static void dKankyo_DayProc() {
 
     dComIfGs_offEventBit(0x2680);
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     if (dComIfGs_isEventBit(0x2a20)) {
 #endif
         clamped = cLib_maxLimit(dComIfGs_getEventReg(0xa60f) + 1, 3);
         dComIfGs_setEventReg(0xa60f, clamped);
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     }
 #endif
 
diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp
index 4598bef3c..56fb25e20 100644
--- a/src/d/d_kankyo_rain.cpp
+++ b/src/d/d_kankyo_rain.cpp
@@ -1661,7 +1661,7 @@ void dKyr_drawSun(Mtx drawMtx, cXyz* pPos, GXColor& reg0, u8** pImg) {
                 GXEnd();
             }
         }
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
         J3DShape::resetVcdVatCache();
 #endif
     }
@@ -1733,7 +1733,7 @@ void dKyr_drawRain(Mtx drawMtx, u8** pImg) {
             GXSetAlphaCompare(GX_GREATER, 0, GX_AOP_OR, GX_GREATER, 0);
             GXSetZMode(true, GX_LEQUAL, false);
             GXSetCullMode(GX_CULL_NONE);
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
             GXSetClipMode(GX_CLIP_DISABLE);
 #endif
             GXSetNumIndStages(0);
@@ -1823,7 +1823,7 @@ void dKyr_drawRain(Mtx drawMtx, u8** pImg) {
                 }
             }
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
             GXSetClipMode(GX_CLIP_ENABLE);
             J3DShape::resetVcdVatCache();
 #endif
@@ -1891,7 +1891,7 @@ void dKyr_drawSibuki(Mtx drawMtx, u8** pImg) {
     GXSetAlphaCompare(GX_GREATER, 0, GX_AOP_OR, GX_GREATER, 0);
     GXSetZMode(true, GX_GEQUAL, false);
     GXSetCullMode(GX_CULL_NONE);
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     GXSetClipMode(GX_CLIP_DISABLE);
 #endif
     GXSetNumIndStages(0);
@@ -1954,7 +1954,7 @@ void dKyr_drawSibuki(Mtx drawMtx, u8** pImg) {
         GXEnd();
     }
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     GXSetClipMode(GX_CLIP_ENABLE);
     J3DShape::resetVcdVatCache();
 #endif
@@ -2098,7 +2098,7 @@ void drawPoison(Mtx drawMtx, u8** pImg) {
         GXEnd();
     }
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     GXSetClipMode(GX_CLIP_ENABLE);
     J3DShape::resetVcdVatCache();
 #endif
@@ -2272,7 +2272,7 @@ void drawWave(Mtx drawMtx, u8** pImg) {
         }
     }
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     J3DShape::resetVcdVatCache();
 #endif
 }
@@ -2304,7 +2304,7 @@ void drawCloudShadow(Mtx drawMtx, u8** pImg) {
         return;
     }
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     GXSetClipMode(GX_CLIP_DISABLE);
 #endif
 
@@ -2417,7 +2417,7 @@ void drawCloudShadow(Mtx drawMtx, u8** pImg) {
         GXEnd();
     }
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     GXSetClipMode(GX_CLIP_ENABLE);
     J3DShape::resetVcdVatCache();
 #endif
diff --git a/src/d/d_mesg.cpp b/src/d/d_mesg.cpp
index 68b1370fa..035fc0901 100644
--- a/src/d/d_mesg.cpp
+++ b/src/d/d_mesg.cpp
@@ -465,7 +465,7 @@ bool dMesg_tSequenceProcessor::do_tag(u32 param_1, const void* param_2, u32 para
             unk_messageData stack_a8 = *(unk_messageData*)messageData;
 
             strcpy(local_8c, dComIfGs_getPlayerName());
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
             if (dComIfGs_getPalLanguage() == 1) {
                 if (stack_a8.field_0x4 == 0x33b ||
                     stack_a8.field_0x4 == 0xc8b ||
@@ -873,7 +873,7 @@ bool dMesg_tMeasureProcessor::do_tag(u32 param_1, const void* param_2, u32 param
             unk_messageData stack_98 = *(unk_messageData*)messageData;
 
             strcpy(local_7c, dComIfGs_getPlayerName());
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
             if (dComIfGs_getPalLanguage() == 1) {
                 if (stack_98.field_0x4 == 0x33b ||
                     stack_98.field_0x4 == 0xc8b ||
@@ -1782,12 +1782,12 @@ void dMesg_finalize() {
 
 /* 801E5C8C-801E5E14       .text dMesg_parse__Fv */
 int dMesg_parse() {
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     headerFlag = false;
 #endif
     header = JKRGetResource('ROOT', "zel_00.bmg", dComIfGp_getMsgDtArchive());
     JUT_ASSERT(2956, header != NULL);
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     header2 = JKRGetResource('ROOT', "zel_01.bmg", dComIfGp_getMsgDt2Archive());
     JUT_ASSERT(2961, header2 != NULL);
 #endif
@@ -1795,7 +1795,7 @@ int dMesg_parse() {
     JUT_ASSERT(2964, oParse != NULL);
 
     oParse->parse(header, 0);
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     oParse->parse(header2, 0);
 #endif
     return 1;
diff --git a/src/d/d_ovlp_fade2.cpp b/src/d/d_ovlp_fade2.cpp
index 823000753..b8227613a 100644
--- a/src/d/d_ovlp_fade2.cpp
+++ b/src/d/d_ovlp_fade2.cpp
@@ -257,7 +257,7 @@ overlap_process_profile_definition g_profile_OVERLAP2 = {
     &l_dOvlpFd2_Method,
 };
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
 overlap_process_profile_definition g_profile_OVERLAP3 = {
     fpcLy_ROOT_e,
     2,
diff --git a/src/d/d_place_name.cpp b/src/d/d_place_name.cpp
index 93ee3b561..4f75d2b21 100644
--- a/src/d/d_place_name.cpp
+++ b/src/d/d_place_name.cpp
@@ -70,7 +70,7 @@ const char * name_texture[] = {
 /* 80160F60-801610A8       .text setScreen__13dPlace_name_cFPCcP10JKRArchive */
 void dPlace_name_c::setScreen(const char* name, JKRArchive* arc) {
     scrn = new J2DScreen();
-    JUT_ASSERT(VERSION_SELECT(69, 91, 91), scrn != NULL);
+    JUT_ASSERT(VERSION_SELECT(69, 69, 91, 91), scrn != NULL);
 
     scrn->set(name, arc);
     fopMsgM_setPaneData(&pane, scrn, 0x706e);
@@ -124,13 +124,13 @@ cPhs_State dPn_c::_create() {
     if (mState == 0) {
         if (rt == cPhs_COMPLEATE_e) {
             dRes_info_c * resInfo = dComIfG_getObjectResInfo("PName");
-            JUT_ASSERT(VERSION_SELECT(147, 169, 169), resInfo != NULL);
+            JUT_ASSERT(VERSION_SELECT(147, 147, 169, 169), resInfo != NULL);
 
             mpHeap = dComIfGp_getExpHeap2D();
             dComIfGp_setHeapLockFlag(10);
             JKRHeap * oldHeap = mDoExt_setCurrentHeap(mpHeap);
             dPn_scrn = new dPlace_name_c();
-            JUT_ASSERT(VERSION_SELECT(155, 177, 177), dPn_scrn != NULL);
+            JUT_ASSERT(VERSION_SELECT(155, 155, 177, 177), dPn_scrn != NULL);
             dPn_scrn->setScreen("place_name.blo", resInfo->getArchive());
             mpTIMG = (ResTIMG*)mpHeap->alloc(0x3c00, 0x20);
             mDoExt_setCurrentHeap(oldHeap);
@@ -148,7 +148,7 @@ cPhs_State dPn_c::_create() {
         }
     } else if (mState == 1) {
         JKRHeap * oldHeap = mDoExt_setCurrentHeap(mpHeap);
-        JUT_ASSERT(VERSION_SELECT(175, 201, 201), dComIfGp_getNowStageNum() < dPn_stage_max_e);
+        JUT_ASSERT(VERSION_SELECT(175, 175, 201, 201), dComIfGp_getNowStageNum() < dPn_stage_max_e);
 
 #if VERSION == VERSION_PAL
         u32 lang = dComIfGs_getPalLanguage();
@@ -166,7 +166,7 @@ cPhs_State dPn_c::_create() {
         JKRHeap * oldHeap = mDoExt_setCurrentHeap(mpHeap);
         if (dvd->sync()) {
             memcpy(mpTIMG, dvd->getMemAddress(), 0x3c00);
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
             DCFlushRangeNoSync(mpTIMG, 0x3c00);
 #else
             DCStoreRangeNoSync(mpTIMG, 0x3c00);
diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp
index c2ec594ec..846b9687f 100644
--- a/src/d/d_resorce.cpp
+++ b/src/d/d_resorce.cpp
@@ -455,7 +455,7 @@ int dRes_info_c::setRes() {
 
         u32 heapSize = mDataHeap->getHeapSize();
         void* heapStartAddr = mDataHeap->getStartAddr();
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
         DCFlushRangeNoSync(heapStartAddr, heapSize);
 #else
         DCStoreRangeNoSync(heapStartAddr, heapSize);
diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp
index 7791ef4a7..5694b905a 100644
--- a/src/d/d_s_logo.cpp
+++ b/src/d/d_s_logo.cpp
@@ -52,7 +52,7 @@ mDoDvdThd_mountXArchive_c * l_tmsgCommand;
 mDoDvdThd_mountXArchive_c * l_dmsgCommand;
 mDoDvdThd_mountXArchive_c * l_errorResCommand;
 mDoDvdThd_mountXArchive_c * l_msgDtCommand;
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
 mDoDvdThd_mountXArchive_c * l_msgDtCommand2;
 #endif
 mDoDvdThd_mountXArchive_c * l_msgCommand;
@@ -168,7 +168,7 @@ BOOL progInDraw(dScnLogo_c* i_this) {
 
     if (i_this->mTimer == 0) {
         i_this->mAction = ACT_progSelDraw;
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
         i_this->mTimer = 300;
 #else
         i_this->mTimer = 600;
@@ -214,7 +214,7 @@ BOOL progSelDraw(dScnLogo_c* i_this) {
             else
                 mDoAud_seStart(JA_SE_TALK_SEL_CANCEL);
 
-            const int temp = VERSION_SELECT(240, 540, 540);
+            const int temp = VERSION_SELECT(240, 240, 540, 540);
             if (i_this->mTimer > temp) {
                 i_this->field_0x1eb = 1;
                 i_this->field_0x1f4 = i_this->mTimer - temp;
@@ -419,7 +419,7 @@ BOOL dvdWaitDraw(dScnLogo_c* i_this) {
         && l_dmsgCommand->sync()
         && l_errorResCommand->sync()
         && l_msgDtCommand->sync()
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
         && l_msgDtCommand2->sync()
 #endif
         && l_msgCommand->sync()
@@ -506,7 +506,7 @@ static BOOL dScnLogo_Delete(dScnLogo_c* i_this) {
     dComIfGp_setDmsgArchive(l_dmsgCommand->getArchive());
     dComIfGp_setErrorResArchive(l_errorResCommand->getArchive());
     dComIfGp_setMsgDtArchive(l_msgDtCommand->getArchive());
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     dComIfGp_setMsgDt2Archive(l_msgDtCommand2->getArchive());
 #endif
     dComIfGp_setMsgArchive(l_msgCommand->getArchive());
@@ -534,7 +534,7 @@ static BOOL dScnLogo_Delete(dScnLogo_c* i_this) {
     delete l_dmsgCommand;
     delete l_errorResCommand;
     delete l_msgDtCommand;
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     delete l_msgDtCommand2;
 #endif
     delete l_msgCommand;
@@ -546,7 +546,7 @@ static BOOL dScnLogo_Delete(dScnLogo_c* i_this) {
     mDoExt_getMesgFont();
     mDoExt_getRubyFont();
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     if (g_msgDHIO.field_0x08 == 0 && dComIfGp_getFontArchive() != NULL) {
         dComIfGp_getFontArchive()->unmount();
         dComIfGp_setFontArchive(NULL);
@@ -616,10 +616,10 @@ cPhs_State phase_0(dScnLogo_c* i_this) {
     
     rt = dComIfG_setObjectRes("System", JKRArchive::DEFAULT_MOUNT_DIRECTION, NULL);
 
-    JUT_ASSERT(VERSION_SELECT(1169, 1350, 1378), rt == 1);
+    JUT_ASSERT(VERSION_SELECT(1169, 1169, 1350, 1378), rt == 1);
 
     rt = dComIfG_setObjectRes("Logo", JKRArchive::MOUNT_DIRECTION_TAIL, NULL);
-    JUT_ASSERT(VERSION_SELECT(1173, 1354, 1382), rt == 1);
+    JUT_ASSERT(VERSION_SELECT(1173, 1173, 1354, 1382), rt == 1);
 
 #if VERSION == VERSION_PAL
     g_mDoMemCd_control.load2();
@@ -658,11 +658,11 @@ cPhs_State phase_1(dScnLogo_c* i_this) {
 
     toonImage = (ResTIMG *)dComIfG_getObjectRes("System", SYSTEM_BTI_TOON);
 
-    JUT_ASSERT(VERSION_SELECT(1208, 1426, 1466), toonImage != NULL);
+    JUT_ASSERT(VERSION_SELECT(1208, 1208, 1426, 1466), toonImage != NULL);
     dDlst_list_c::setToonImage(toonImage);
 
     toonImage = (ResTIMG *)dComIfG_getObjectRes("System", SYSTEM_BTI_TOONEX);
-    JUT_ASSERT(VERSION_SELECT(1213, 1431, 1471), toonImage != NULL);
+    JUT_ASSERT(VERSION_SELECT(1213, 1213, 1431, 1471), toonImage != NULL);
     dDlst_list_c::setToonExImage(toonImage);
 
     i_this->field_0x1f8 = mDoExt_getGameHeap()->alloc(0x3c8a0, 4);
@@ -684,7 +684,7 @@ cPhs_State phase_2(dScnLogo_c* i_this) {
     s32 rt;
     
     rt = dComIfG_syncObjectRes("Logo");
-    JUT_ASSERT(VERSION_SELECT(1251, 1469, 1509), rt >= 0);
+    JUT_ASSERT(VERSION_SELECT(1251, 1251, 1469, 1509), rt >= 0);
 
     if (rt != 0)
         return cPhs_INIT_e;
@@ -694,11 +694,11 @@ cPhs_State phase_2(dScnLogo_c* i_this) {
     ResTIMG * timg;
     
     timg = (ResTIMG *)dComIfG_getObjectRes("Logo", LOGO_BTI_NINTENDO_376X104);
-    JUT_ASSERT(VERSION_SELECT(1264, 1482, 1522), timg != NULL);
+    JUT_ASSERT(VERSION_SELECT(1264, 1264, 1482, 1522), timg != NULL);
     i_this->nintendoImg = new dDlst_2D_c(timg, 133, 170, 0);
-    JUT_ASSERT(VERSION_SELECT(1267, 1485, 1525), i_this->nintendoImg != NULL);
+    JUT_ASSERT(VERSION_SELECT(1267, 1267, 1485, 1525), i_this->nintendoImg != NULL);
     i_this->nintendoImg->setAlpha(0xFF);
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     // Blue Nintendo logo for JPN.
     i_this->nintendoImg->getPicture()->setWhite((GXColor){0x00, 0x46, 0xFF, 0xFF});
 #else
@@ -707,9 +707,9 @@ cPhs_State phase_2(dScnLogo_c* i_this) {
 #endif
 
     timg = (ResTIMG *)dComIfG_getObjectRes("Logo", LOGO_BTI_TITLE_DOLBY_MARK);
-    JUT_ASSERT(VERSION_SELECT(1276, 1498, 1538), timg != NULL);
+    JUT_ASSERT(VERSION_SELECT(1276, 1276, 1498, 1538), timg != NULL);
     i_this->dolbyImg = new dDlst_2D_c(timg, 218, 166, 0);
-    JUT_ASSERT(VERSION_SELECT(1280, 1502, 1542), i_this->dolbyImg != NULL);
+    JUT_ASSERT(VERSION_SELECT(1280, 1280, 1502, 1542), i_this->dolbyImg != NULL);
     i_this->dolbyImg->setAlpha(0xFF);
 
 #if VERSION == VERSION_PAL
@@ -755,9 +755,9 @@ cPhs_State phase_2(dScnLogo_c* i_this) {
 #else
     timg = (ResTIMG *)dComIfG_getObjectRes("Logo", LOGO_BTI_PROGRESSIVE_CHOICE);
 #endif
-    JUT_ASSERT(VERSION_SELECT(1286, 1565, 1605), timg != NULL);
+    JUT_ASSERT(VERSION_SELECT(1286, 1286, 1565, 1605), timg != NULL);
     i_this->progchoiceImg = new dDlst_2D_c(timg, 113, 281, 0);
-    JUT_ASSERT(VERSION_SELECT(1288, 1567, 1607), i_this->progchoiceImg != NULL);
+    JUT_ASSERT(VERSION_SELECT(1288, 1288, 1567, 1607), i_this->progchoiceImg != NULL);
     i_this->progchoiceImg->setAlpha(0x00);
 
 #if VERSION == VERSION_PAL
@@ -765,9 +765,9 @@ cPhs_State phase_2(dScnLogo_c* i_this) {
 #else
     timg = (ResTIMG *)dComIfG_getObjectRes("Logo", LOGO_BTI_PROGRESSIVE_YES);
 #endif
-    JUT_ASSERT(VERSION_SELECT(1295, 1579, 1619), timg != NULL);
+    JUT_ASSERT(VERSION_SELECT(1295, 1295, 1579, 1619), timg != NULL);
     i_this->progyesImg = new dDlst_2D_c(timg, 211, 372, 0);
-    JUT_ASSERT(VERSION_SELECT(1297, 1581, 1621), i_this->progyesImg != NULL);
+    JUT_ASSERT(VERSION_SELECT(1297, 1297, 1581, 1621), i_this->progyesImg != NULL);
     i_this->progyesImg->getPicture()->setWhite((GXColor){0xFF, 0xC8, 0x00, 0xFF});
     i_this->progyesImg->setAlpha(0x00);
 
@@ -776,9 +776,9 @@ cPhs_State phase_2(dScnLogo_c* i_this) {
 #else
     timg = (ResTIMG *)dComIfG_getObjectRes("Logo", LOGO_BTI_PROGRESSIVE_NO);
 #endif
-    JUT_ASSERT(VERSION_SELECT(1305, 1594, 1634), timg != NULL);
+    JUT_ASSERT(VERSION_SELECT(1305, 1305, 1594, 1634), timg != NULL);
     i_this->prognoImg = new dDlst_2D_c(timg, 350, 372, 0);
-    JUT_ASSERT(VERSION_SELECT(1307, 1596, 1636), i_this->prognoImg != NULL);
+    JUT_ASSERT(VERSION_SELECT(1307, 1307, 1596, 1636), i_this->prognoImg != NULL);
     i_this->prognoImg->getPicture()->setWhite((GXColor){0xA0, 0xA0, 0xA0, 0xFF});
     i_this->prognoImg->setAlpha(0x00);
 
@@ -787,9 +787,9 @@ cPhs_State phase_2(dScnLogo_c* i_this) {
 #else
     timg = (ResTIMG *)dComIfG_getObjectRes("Logo", LOGO_BTI_PROGRESSIVE_PRO);
 #endif
-    JUT_ASSERT(VERSION_SELECT(1315, 1609, 1649), timg != NULL);
+    JUT_ASSERT(VERSION_SELECT(1315, 1315, 1609, 1649), timg != NULL);
     i_this->progImg = new dDlst_2D_c(timg, 153, 309, 0);
-    JUT_ASSERT(VERSION_SELECT(1317, 1611, 1651), i_this->progImg != NULL);
+    JUT_ASSERT(VERSION_SELECT(1317, 1317, 1611, 1651), i_this->progImg != NULL);
     i_this->progImg->setAlpha(0x00);
 
 #if VERSION == VERSION_PAL
@@ -797,26 +797,26 @@ cPhs_State phase_2(dScnLogo_c* i_this) {
 #else
     timg = (ResTIMG *)dComIfG_getObjectRes("Logo", LOGO_BTI_PROGRESSIVE_INTER);
 #endif
-    JUT_ASSERT(VERSION_SELECT(1324, 1623, 1663), timg != NULL);
+    JUT_ASSERT(VERSION_SELECT(1324, 1324, 1623, 1663), timg != NULL);
     i_this->interImg = new dDlst_2D_c(timg, 153, 309, 0);
-    JUT_ASSERT(VERSION_SELECT(1326, 1625, 1665), i_this->interImg != NULL);
+    JUT_ASSERT(VERSION_SELECT(1326, 1326, 1625, 1665), i_this->interImg != NULL);
     i_this->interImg->setAlpha(0x00);
 
     JKRHeap::free(i_this->field_0x1f8, NULL);
 
     l_lodCommand = aramMount("/res/Stage/sea/LODALL.arc");
-    JUT_ASSERT(VERSION_SELECT(1346, 1645, 1685), l_lodCommand != NULL);
+    JUT_ASSERT(VERSION_SELECT(1346, 1346, 1645, 1685), l_lodCommand != NULL);
     
     rt = dComIfG_setObjectRes("Always", JKRArchive::DEFAULT_MOUNT_DIRECTION, NULL);
-    JUT_ASSERT(VERSION_SELECT(1351, 1650, 1690), rt == 1);
+    JUT_ASSERT(VERSION_SELECT(1351, 1351, 1650, 1690), rt == 1);
 
     archiveHeap->dump_sort();
 
     rt = dComIfG_setObjectRes("Link", JKRArchive::DEFAULT_MOUNT_DIRECTION, NULL);
-    JUT_ASSERT(VERSION_SELECT(1356, 1655, 1695), rt == 1);
+    JUT_ASSERT(VERSION_SELECT(1356, 1356, 1655, 1695), rt == 1);
 
     rt = dComIfG_setObjectRes("Agb", JKRArchive::DEFAULT_MOUNT_DIRECTION, NULL);
-    JUT_ASSERT(VERSION_SELECT(1360, 1659, 1699), rt == 1);
+    JUT_ASSERT(VERSION_SELECT(1360, 1360, 1659, 1699), rt == 1);
 
     l_anmCommand = aramMount("/res/Object/LkAnm.arc");
     l_fmapCommand = aramMount("/res/Fmap/Fmap.arc");
@@ -854,12 +854,12 @@ cPhs_State phase_2(dScnLogo_c* i_this) {
     l_msgDtCommand = onMemMount("/res/Msg/bmgres.arc");
 #endif
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     l_msgDtCommand2 = onMemMount("/res/Msg/bmgresh.arc");
 #endif
     l_msgCommand = aramMount("/res/Msg/msgres.arc");
     l_menuCommand = onMemMount("/res/Msg/menures.arc");
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     l_fontCommand = mDoDvdThd_mountXArchive_c::create("/res/Msg/fontres.arc", JKRArchive::MOUNT_DIRECTION_HEAD, JKRArchive::MOUNT_MEM);
 #else
     l_fontCommand = onMemMount("/res/Msg/fontres.arc");
@@ -867,11 +867,11 @@ cPhs_State phase_2(dScnLogo_c* i_this) {
     l_rubyCommand = onMemMount("/res/Msg/rubyres.arc");
     l_particleCommand = mDoDvdThd_toMainRam_c::create("/res/Particle/common.jpc", JKRArchive::DEFAULT_MOUNT_DIRECTION, dComIfGp_particle_getCommonHeap());
     l_itemTableCommand = mDoDvdThd_toMainRam_c::create("/res/ItemTable/item_table.bin", JKRArchive::DEFAULT_MOUNT_DIRECTION, NULL);
-    JUT_ASSERT(VERSION_SELECT(1418, 1743, 1783), l_itemTableCommand != NULL);
+    JUT_ASSERT(VERSION_SELECT(1418, 1418, 1743, 1783), l_itemTableCommand != NULL);
     l_ActorDataCommand = mDoDvdThd_toMainRam_c::create("/res/ActorDat/ActorDat.bin", JKRArchive::DEFAULT_MOUNT_DIRECTION, NULL);
-    JUT_ASSERT(VERSION_SELECT(1422, 1747, 1787), l_ActorDataCommand != NULL);
+    JUT_ASSERT(VERSION_SELECT(1422, 1422, 1747, 1787), l_ActorDataCommand != NULL);
     l_FmapDataCommand = mDoDvdThd_toMainRam_c::create("/res/FmapDat/FmapDat.bin", JKRArchive::DEFAULT_MOUNT_DIRECTION, NULL);
-    JUT_ASSERT(VERSION_SELECT(1426, 1751, 1791), l_FmapDataCommand != NULL);
+    JUT_ASSERT(VERSION_SELECT(1426, 1426, 1751, 1791), l_FmapDataCommand != NULL);
 
     JAIZelBasic::getInterface()->loadStaticWaves();
     mDoGph_gInf_c::setTickRate((OS_BUS_CLOCK / 4) / 60);
@@ -879,7 +879,7 @@ cPhs_State phase_2(dScnLogo_c* i_this) {
     mDoGph_gInf_c::startFadeIn(30);
     i_this->mTimer = 90;
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     mDoRst::offReset();
     mDoRst::offResetPrepare();
 #endif
diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp
index 60c3b9d99..c16faa859 100644
--- a/src/d/d_s_menu.cpp
+++ b/src/d/d_s_menu.cpp
@@ -114,7 +114,7 @@ static BOOL dScnMenu_Draw(menu_of_scene_class* i_this) {
     }
     JUTReport(40, 420, "十字右：進む　十字左：戻る");
     JUTReport(200, 400, "曜日：%s", weekpat_str[l_weekpat]);
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     static const char* language[] = {"ENGLISH", "GERMAN", "FRENCH", "SPANISH", "ITALIAN"};
     JUTReport(40, 440, "%s", language[dComIfGs_getPalLanguage()]);
 #endif
@@ -214,7 +214,7 @@ static BOOL dScnMenu_Execute(menu_of_scene_class* i_this) {
     }
     dComIfGs_setDate(l_weekpat);
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     static const u8 language[] = { 0, 1, 2, 3, 4, };
     if (CPad_CHECK_TRIG_Z(3)) {
         if (++l_languageType > 4)
@@ -302,9 +302,9 @@ static BOOL dScnMenu_Delete(menu_of_scene_class* i_this) {
 /* 8022F3C4-8022F4B0       .text phase_1__FP19menu_of_scene_class */
 cPhs_State phase_1(menu_of_scene_class* i_this) {
     i_this->command = mDoDvdThd_toMainRam_c::create("/res/Menu/Menu1.dat", 0, NULL);
-    JUT_ASSERT(VERSION_SELECT(616, 732, 732), i_this->command != NULL);
+    JUT_ASSERT(VERSION_SELECT(616, 616, 732, 732), i_this->command != NULL);
     i_this->fontCommand = mDoDvdThd_toMainRam_c::create("/res/Menu/kanfont_fix16.bfn", 0, NULL);
-    JUT_ASSERT(VERSION_SELECT(619, 735, 735), i_this->fontCommand != NULL);
+    JUT_ASSERT(VERSION_SELECT(619, 619, 735, 735), i_this->fontCommand != NULL);
     return cPhs_NEXT_e;
 }
 
@@ -314,7 +314,7 @@ cPhs_State phase_2(menu_of_scene_class* i_this) {
         return cPhs_INIT_e;
     }
     i_this->info = (menu_of_scene_class::menu_inf*)i_this->command->getMemAddress();
-    JUT_ASSERT(VERSION_SELECT(663, 779, 779), i_this->info != NULL);
+    JUT_ASSERT(VERSION_SELECT(663, 663, 779, 779), i_this->info != NULL);
     delete i_this->command;
     menu_of_scene_class::menu_inf* info = i_this->info;
     info->stage = (menu_of_scene_class::stage_inf*)(u32(info->stage) + u32(info));
@@ -323,7 +323,7 @@ cPhs_State phase_2(menu_of_scene_class* i_this) {
     }
     if (!l_groupPoint) {
         l_groupPoint = new s8[info->num];
-        JUT_ASSERT(VERSION_SELECT(676, 792, 792), l_groupPoint != NULL);
+        JUT_ASSERT(VERSION_SELECT(676, 676, 792, 792), l_groupPoint != NULL);
         for (int i = 0; i < info->num; i++) {
             l_groupPoint[i] = 0;
         }
@@ -349,7 +349,7 @@ static cPhs_State dScnMenu_Create(scene_class* i_scn) {
         (cPhs__Handler)phase_2,
     };
     menu_of_scene_class* i_this = (menu_of_scene_class *)i_scn;
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     l_languageType = dComIfGs_getPalLanguage();
 #endif
     return dComLbG_PhaseHandler(&i_this->mPhs, l_method, i_this);
diff --git a/src/d/d_s_open.cpp b/src/d/d_s_open.cpp
index 11e59f1b1..7cb6ef4bb 100644
--- a/src/d/d_s_open.cpp
+++ b/src/d/d_s_open.cpp
@@ -39,7 +39,7 @@ cPhs_State dScnOpen_c::create() {
 
 /* 80232BC4-80232CAC       .text execute__10dScnOpen_cFv */
 BOOL dScnOpen_c::execute() {
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     if (mpProc->mState >= 5 && !fopOvlpM_IsPeek() && !dComIfG_resetToOpening(this)) {
 #else
     if (!fopOvlpM_IsPeek() && !dComIfG_resetToOpening(this)) {
diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp
index b96fe05a4..1bfb1ef28 100644
--- a/src/d/d_s_play.cpp
+++ b/src/d/d_s_play.cpp
@@ -306,7 +306,7 @@ static BOOL dScnPly_Draw(dScnPly_ply_c* i_this) {
                 PROC_OVERLAP8,
             };
 
-            JUT_ASSERT(VERSION_SELECT(997, 1001, 1001),
+            JUT_ASSERT(VERSION_SELECT(997, 997, 1001, 1001),
                        dComIfGp_getNextStageWipe() < ARRAY_SIZE(l_wipeType));
 
             if (strcmp(dComIfGp_getNextStageName(), "ENDING") == 0) {
@@ -1154,7 +1154,7 @@ BOOL heapSizeCheck() {
     f32 temp_f28 = (f32)game_free / (f32)game_total_free;
 
     mDoExt_getZeldaHeap()->getFreeSize();
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     int zelda_total_free = mDoExt_getZeldaHeap()->getFreeSize();
 #else
     int zelda_total_free = mDoExt_getZeldaHeap()->getTotalFreeSize();
@@ -1162,7 +1162,7 @@ BOOL heapSizeCheck() {
     f32 temp_f27 = (f32)zelda_total_free / (f32)mDoExt_getSafeZeldaHeapSize();
 
     mDoExt_getCommandHeap()->getFreeSize();
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     int command_total_free = mDoExt_getCommandHeap()->getFreeSize();
 #else
     int command_total_free = mDoExt_getCommandHeap()->getTotalFreeSize();
@@ -1208,7 +1208,7 @@ cPhs_State phase_00(dScnPly_ply_c* i_this) {
         dComIfGs_init();
     } else {
         if (!heapSizeCheck()) {
-            JUT_WARN(VERSION_SELECT(3356, 3372, 3372), "%s", "Memory Danger !!");
+            JUT_WARN(VERSION_SELECT(3356, 3356, 3372, 3372), "%s", "Memory Danger !!");
         }
     }
 
@@ -1243,7 +1243,7 @@ cPhs_State phase_0(dScnPly_ply_c* i_this) {
             char buf[32];
             sprintf(buf, "/res/Object/LkD%02d.arc", dComIfGp_getLkDemoAnmNo());
             l_lkDemoAnmCommand = mDoDvdThd_mountXArchive_c::create(buf, 0, JKRArchive::MOUNT_ARAM);
-            JUT_ASSERT(VERSION_SELECT(3399, 3414, 3414), l_lkDemoAnmCommand != NULL);
+            JUT_ASSERT(VERSION_SELECT(3399, 3399, 3414, 3414), l_lkDemoAnmCommand != NULL);
         }
 
         return cPhs_NEXT_e;
@@ -1257,7 +1257,7 @@ cPhs_State phase_1(dScnPly_ply_c* i_this) {
             return cPhs_INIT_e;
         }
 
-        JUT_ASSERT(VERSION_SELECT(3424, 3439, 3439), l_lkDemoAnmCommand->getArchive());
+        JUT_ASSERT(VERSION_SELECT(3424, 3424, 3439, 3439), l_lkDemoAnmCommand->getArchive());
         dComIfGp_setLkDemoAnmArchive(l_lkDemoAnmCommand->getArchive());
 
         delete l_lkDemoAnmCommand;
@@ -1274,7 +1274,7 @@ cPhs_State phase_1(dScnPly_ply_c* i_this) {
     dComIfGp_setStatus(0);
 
     int rt = dComIfG_setStageRes("Stage", NULL);
-    JUT_ASSERT(VERSION_SELECT(3443, 3458, 3458), rt == 1);
+    JUT_ASSERT(VERSION_SELECT(3443, 3443, 3458, 3458), rt == 1);
 
     dMat_control_c::create((J3DMaterialTable*)dComIfG_getObjectRes("Always", ALWAYS_BMT_ICE),
                            (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Always", ALWAYS_BTK_ICE));
@@ -1285,7 +1285,7 @@ cPhs_State phase_1(dScnPly_ply_c* i_this) {
 /* 802359DC-80235ABC       .text phase_2__FP13dScnPly_ply_c */
 cPhs_State phase_2(dScnPly_ply_c* i_this) {
     int rt = dComIfG_syncStageRes("Stage");
-    JUT_ASSERT(VERSION_SELECT(3470, 3485, 3485), rt >= 0)
+    JUT_ASSERT(VERSION_SELECT(3470, 3470, 3485, 3485), rt >= 0)
 
     if (rt != 0) {
         return cPhs_INIT_e;
@@ -1311,7 +1311,7 @@ cPhs_State phase_3(dScnPly_ply_c* i_this) {
 /* 80235B0C-80236334       .text phase_4__FP13dScnPly_ply_c */
 cPhs_State phase_4(dScnPly_ply_c* i_this) {
     if (i_this->sceneCommand != NULL) {
-        JUT_ASSERT(VERSION_SELECT(3552, 3567, 3567), i_this->sceneCommand->getMemAddress() != NULL);
+        JUT_ASSERT(VERSION_SELECT(3552, 3552, 3567, 3567), i_this->sceneCommand->getMemAddress() != NULL);
         dComIfGp_particle_createScene(i_this->sceneCommand->getMemAddress());
         delete i_this->sceneCommand;
     } else {
@@ -1336,8 +1336,8 @@ cPhs_State phase_4(dScnPly_ply_c* i_this) {
     dComIfGd_setViewport(NULL);
     dComIfGd_setView(NULL);
 
-    JKRExpHeap* heap = fopMsgM_createExpHeap(VERSION_SELECT(0x736A1, 0x73EA1, 0x73EA1));
-    JUT_ASSERT(VERSION_SELECT(3633, 3653, 3653), heap != NULL);
+    JKRExpHeap* heap = fopMsgM_createExpHeap(VERSION_SELECT(0x736A1, 0x736A1, 0x73EA1, 0x73EA1));
+    JUT_ASSERT(VERSION_SELECT(3633, 3633, 3653, 3653), heap != NULL);
     dComIfGp_setExpHeap2D(heap);
 
     dStage_Create();
@@ -1446,7 +1446,7 @@ cPhs_State phase_5(dScnPly_ply_c* i_this) {
         const char** resName = PreLoadInfoT[preLoadNo].resName;
         s32 resNameNum = PreLoadInfoT[preLoadNo].resNameNum;
         if (resName != NULL && resName[0] != NULL) {
-            JUT_ASSERT(VERSION_SELECT(3804, 3824, 3824), resNameNum <= ARRAY_SIZE(resPhase));
+            JUT_ASSERT(VERSION_SELECT(3804, 3804, 3824, 3824), resNameNum <= ARRAY_SIZE(resPhase));
             for (int i = 0; i < resNameNum; i++) {
                 if (dComIfG_resLoad(&resPhase[i], resName[i]) != cPhs_COMPLEATE_e) {
                     rt = cPhs_INIT_e;
@@ -1469,7 +1469,7 @@ cPhs_State phase_6(dScnPly_ply_c* i_this) {
         const s16* dylKeyTbl = PreLoadInfoT[preLoadNo].dylKeyTbl;
         s32 dylKeyTblNum = PreLoadInfoT[preLoadNo].dylKeyTblNum;
         if (dylKeyTbl != NULL && dylKeyTbl[0] != NULL) {
-            JUT_ASSERT(VERSION_SELECT(3838, 3858, 3858), dylKeyTblNum <= ARRAY_SIZE(dylPhase));
+            JUT_ASSERT(VERSION_SELECT(3838, 3838, 3858, 3858), dylKeyTblNum <= ARRAY_SIZE(dylPhase));
             for (int i = 0; i < dylKeyTblNum; i++) {
                 if (cDylPhs::Link(&dylPhase[i], dylKeyTbl[i]) != cPhs_COMPLEATE_e) {
                     rt = cPhs_INIT_e;
diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp
index c8e1aa6c4..bd6f57c59 100644
--- a/src/d/d_save.cpp
+++ b/src/d/d_save.cpp
@@ -8,7 +8,7 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_item_data.h"
 #include "m_Do/m_Do_MemCardRWmng.h"
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
 #include "d/d_s_play.h"
 #endif
 #include "d/actor/d_a_npc_sarace.h"
@@ -931,10 +931,10 @@ BOOL dSv_player_map_c::isSaveArriveGridForAgb(int no) {
 
 /* 8005BE84-8005BF2C       .text init__17dSv_player_info_cFv */
 void dSv_player_info_c::init() {
-    static char l_defaultName[] = VERSION_SELECT("リンク", "Link", "Link");
+    static char l_defaultName[] = VERSION_SELECT("リンク", "リンク", "Link", "Link");
 
     strcpy(mPlayerName, l_defaultName);
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     if (g_msgDHIO.field_0x08 == 1) {
         strcpy(mPlayerName, "Link");
     }
@@ -958,7 +958,7 @@ void dSv_player_info_c::init() {
 
 /* 8005BF2C-8005BFA4       .text init__19dSv_player_config_cFv */
 void dSv_player_config_c::init() {
-    mRuby = VERSION_SELECT(0, 1, 0);
+    mRuby = VERSION_SELECT(0, 0, 1, 0);
 
     u32 soundMode = OSGetSoundMode();
     if (soundMode == 0) {
@@ -1035,37 +1035,37 @@ void dSv_memBit_c::init() {
 
 /* 8005C0EC-8005C188       .text onTbox__12dSv_memBit_cFi */
 void dSv_memBit_c::onTbox(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(2225, 2252, 2252), 0 <= i_no && i_no < 32);
+    JUT_ASSERT(VERSION_SELECT(2225, 2225, 2252, 2252), 0 <= i_no && i_no < 32);
     mTbox |= (1 << i_no);
 }
 
 /* 8005C188-8005C228       .text isTbox__12dSv_memBit_cFi */
 BOOL dSv_memBit_c::isTbox(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(2253, 2280, 2280), 0 <= i_no && i_no < 32);
+    JUT_ASSERT(VERSION_SELECT(2253, 2253, 2280, 2280), 0 <= i_no && i_no < 32);
     return mTbox & (1 << i_no) ? TRUE : FALSE;
 }
 
 /* 8005C228-8005C2D4       .text onSwitch__12dSv_memBit_cFi */
 void dSv_memBit_c::onSwitch(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(2284, 2311, 2311), 0 <= i_no && i_no < 128);
+    JUT_ASSERT(VERSION_SELECT(2284, 2284, 2311, 2311), 0 <= i_no && i_no < 128);
     mSwitch[i_no >> 5] |= (1 << (i_no & 0x1F));
 }
 
 /* 8005C2D4-8005C380       .text offSwitch__12dSv_memBit_cFi */
 void dSv_memBit_c::offSwitch(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(2298, 2325, 2325), 0 <= i_no && i_no < 128);
+    JUT_ASSERT(VERSION_SELECT(2298, 2298, 2325, 2325), 0 <= i_no && i_no < 128);
     mSwitch[i_no >> 5] &= ~(1 << (i_no & 0x1F));
 }
 
 /* 8005C380-8005C430       .text isSwitch__12dSv_memBit_cFi */
 BOOL dSv_memBit_c::isSwitch(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(2312, 2339, 2339), 0 <= i_no && i_no < 128);
+    JUT_ASSERT(VERSION_SELECT(2312, 2312, 2339, 2339), 0 <= i_no && i_no < 128);
     return mSwitch[i_no >> 5] & (1 << (i_no & 0x1F)) ? TRUE : FALSE;
 }
 
 /* 8005C430-8005C4EC       .text revSwitch__12dSv_memBit_cFi */
 BOOL dSv_memBit_c::revSwitch(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(2326, 2353, 2353), 0 <= i_no && i_no < 128);
+    JUT_ASSERT(VERSION_SELECT(2326, 2326, 2353, 2353), 0 <= i_no && i_no < 128);
 
     u32 idx = i_no >> 5;
     u32 sw = 1 << (i_no & 0x1F);
@@ -1075,37 +1075,37 @@ BOOL dSv_memBit_c::revSwitch(int i_no) {
 
 /* 8005C4EC-8005C598       .text onItem__12dSv_memBit_cFi */
 void dSv_memBit_c::onItem(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(2345, 2372, 2372), 0 <= i_no && i_no < 64);
+    JUT_ASSERT(VERSION_SELECT(2345, 2345, 2372, 2372), 0 <= i_no && i_no < 64);
     mItem[i_no >> 5] |= (1 << (i_no & 0x1F));
 }
 
 /* 8005C598-8005C648       .text isItem__12dSv_memBit_cFi */
 BOOL dSv_memBit_c::isItem(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(2373, 2400, 2400), 0 <= i_no && i_no < 64);
+    JUT_ASSERT(VERSION_SELECT(2373, 2373, 2400, 2400), 0 <= i_no && i_no < 64);
     return mItem[i_no >> 5] & (1 << (i_no & 0x1F)) ? TRUE : FALSE;
 }
 
 /* 8005C648-8005C6F4       .text onVisitedRoom__12dSv_memBit_cFi */
 void dSv_memBit_c::onVisitedRoom(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(2405, 2432, 2432), 0 <= i_no && i_no < 64);
+    JUT_ASSERT(VERSION_SELECT(2405, 2405, 2432, 2432), 0 <= i_no && i_no < 64);
     mVisitedRoom[i_no >> 5] |= (1 << (i_no & 0x1F));
 }
 
 /* 8005C6F4-8005C7A4       .text isVisitedRoom__12dSv_memBit_cFi */
 BOOL dSv_memBit_c::isVisitedRoom(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(2433, 2460, 2460), 0 <= i_no && i_no < 64);
+    JUT_ASSERT(VERSION_SELECT(2433, 2433, 2460, 2460), 0 <= i_no && i_no < 64);
     return mVisitedRoom[i_no >> 5] & (1 << (i_no & 0x1F)) ? TRUE : FALSE;
 }
 
 /* 8005C7A4-8005C844       .text onDungeonItem__12dSv_memBit_cFi */
 void dSv_memBit_c::onDungeonItem(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(2465, 2492, 2492), 0 <= i_no && i_no < 6);
+    JUT_ASSERT(VERSION_SELECT(2465, 2465, 2492, 2492), 0 <= i_no && i_no < 6);
     mDungeonItem |= (u8)(1 << i_no);
 }
 
 /* 8005C844-8005C8E8       .text isDungeonItem__12dSv_memBit_cFi */
 BOOL dSv_memBit_c::isDungeonItem(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(2494, 2521, 2521), 0 <= i_no && i_no < 6);
+    JUT_ASSERT(VERSION_SELECT(2494, 2494, 2521, 2521), 0 <= i_no && i_no < 6);
     return mDungeonItem & (u8)(1 << i_no) ? TRUE : FALSE;
 }
 
@@ -1122,15 +1122,15 @@ void dSv_ocean_c::init() {
 
 /* 8005C908-8005C9E8       .text onOceanSvBit__11dSv_ocean_cFUcUs */
 void dSv_ocean_c::onOceanSvBit(u8 i_grid, u16 i_bit) {
-    JUT_ASSERT(VERSION_SELECT(2613, 2640, 2640), (0 <= i_grid) && (i_grid <= 0x31));
-    JUT_ASSERT(VERSION_SELECT(2614, 2641, 2641), (0 <= i_bit) && (i_bit < 16));
+    JUT_ASSERT(VERSION_SELECT(2613, 2613, 2640, 2640), (0 <= i_grid) && (i_grid <= 0x31));
+    JUT_ASSERT(VERSION_SELECT(2614, 2614, 2641, 2641), (0 <= i_bit) && (i_bit < 16));
     field_0x0[i_grid] |= (u16)(1 << i_bit);
 }
 
 /* 8005C9E8-8005CACC       .text isOceanSvBit__11dSv_ocean_cFUcUs */
 BOOL dSv_ocean_c::isOceanSvBit(u8 i_grid, u16 i_bit) {
-    JUT_ASSERT(VERSION_SELECT(2645, 2672, 2672), (0 <= i_grid) && (i_grid <= 0x31));
-    JUT_ASSERT(VERSION_SELECT(2646, 2673, 2673), (0 <= i_bit) && (i_bit < 16));
+    JUT_ASSERT(VERSION_SELECT(2645, 2645, 2672, 2672), (0 <= i_grid) && (i_grid <= 0x31));
+    JUT_ASSERT(VERSION_SELECT(2646, 2646, 2673, 2673), (0 <= i_bit) && (i_bit < 16));
     return field_0x0[i_grid] & (u16)(1 << i_bit) ? TRUE : FALSE;
 }
 
@@ -1196,25 +1196,25 @@ int dSv_danBit_c::init(s8 i_stageNo) {
 
 /* 8005CC08-8005CCB4       .text onSwitch__12dSv_danBit_cFi */
 void dSv_danBit_c::onSwitch(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(2790, 2817, 2817), 0 <= i_no && i_no < 64);
+    JUT_ASSERT(VERSION_SELECT(2790, 2790, 2817, 2817), 0 <= i_no && i_no < 64);
     mSwitch[i_no >> 5] |= (1 << (i_no & 0x1F));
 }
 
 /* 8005CCB4-8005CD60       .text offSwitch__12dSv_danBit_cFi */
 void dSv_danBit_c::offSwitch(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(2804, 2831, 2831), 0 <= i_no && i_no < 64);
+    JUT_ASSERT(VERSION_SELECT(2804, 2804, 2831, 2831), 0 <= i_no && i_no < 64);
     mSwitch[i_no >> 5] &= ~(1 << (i_no & 0x1F));
 }
 
 /* 8005CD60-8005CE10       .text isSwitch__12dSv_danBit_cFi */
 BOOL dSv_danBit_c::isSwitch(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(2818, 2845, 2845), 0 <= i_no && i_no < 64);
+    JUT_ASSERT(VERSION_SELECT(2818, 2818, 2845, 2845), 0 <= i_no && i_no < 64);
     return mSwitch[i_no >> 5] & (1 << (i_no & 0x1F)) ? TRUE : FALSE;
 }
 
 /* 8005CE10-8005CECC       .text revSwitch__12dSv_danBit_cFi */
 BOOL dSv_danBit_c::revSwitch(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(2832, 2859, 2859), 0 <= i_no && i_no < 64);
+    JUT_ASSERT(VERSION_SELECT(2832, 2832, 2859, 2859), 0 <= i_no && i_no < 64);
 
     int sw = 1 << (i_no & 0x1F);
     mSwitch[i_no >> 5] ^= sw;
@@ -1237,25 +1237,25 @@ void dSv_zoneBit_c::clearRoomSwitch() {
 
 /* 8005CF00-8005CFAC       .text onSwitch__13dSv_zoneBit_cFi */
 void dSv_zoneBit_c::onSwitch(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(2876, 2903, 2903), 0 <= i_no && i_no < SWITCH_MAX);
+    JUT_ASSERT(VERSION_SELECT(2876, 2876, 2903, 2903), 0 <= i_no && i_no < SWITCH_MAX);
     mSwitch[i_no >> 4] |= (u16)(1 << (i_no & 0xF));
 }
 
 /* 8005CFAC-8005D054       .text offSwitch__13dSv_zoneBit_cFi */
 void dSv_zoneBit_c::offSwitch(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(2890, 2917, 2917), 0 <= i_no && i_no < SWITCH_MAX);
+    JUT_ASSERT(VERSION_SELECT(2890, 2890, 2917, 2917), 0 <= i_no && i_no < SWITCH_MAX);
     mSwitch[i_no >> 4] &= ~(1 << (i_no & 0xF));
 }
 
 /* 8005D054-8005D100       .text isSwitch__13dSv_zoneBit_cFi */
 BOOL dSv_zoneBit_c::isSwitch(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(2904, 2931, 2931), 0 <= i_no && i_no < SWITCH_MAX);
+    JUT_ASSERT(VERSION_SELECT(2904, 2904, 2931, 2931), 0 <= i_no && i_no < SWITCH_MAX);
     return mSwitch[i_no >> 4] & 1 << (i_no & 0xF) ? TRUE : FALSE;
 }
 
 /* 8005D100-8005D1B8       .text revSwitch__13dSv_zoneBit_cFi */
 BOOL dSv_zoneBit_c::revSwitch(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(2918, 2945, 2945), 0 <= i_no && i_no < SWITCH_MAX);
+    JUT_ASSERT(VERSION_SELECT(2918, 2918, 2945, 2945), 0 <= i_no && i_no < SWITCH_MAX);
 
     u32 idx = i_no >> 4;
     int sw = 1 << (i_no & 0xF);
@@ -1265,13 +1265,13 @@ BOOL dSv_zoneBit_c::revSwitch(int i_no) {
 
 /* 8005D1B8-8005D254       .text onItem__13dSv_zoneBit_cFi */
 void dSv_zoneBit_c::onItem(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(2937, 2964, 2964), 0 <= i_no && i_no < 16);
+    JUT_ASSERT(VERSION_SELECT(2937, 2937, 2964, 2964), 0 <= i_no && i_no < 16);
     mItem |= (1 << i_no);
 }
 
 /* 8005D254-8005D2F4       .text isItem__13dSv_zoneBit_cFi */
 BOOL dSv_zoneBit_c::isItem(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(2965, 2992, 2992), 0 <= i_no && i_no < 16);
+    JUT_ASSERT(VERSION_SELECT(2965, 2965, 2992, 2992), 0 <= i_no && i_no < 16);
     return mItem & (1 << i_no) ? TRUE : FALSE;
 }
 
@@ -1284,13 +1284,13 @@ void dSv_zoneActor_c::init() {
 
 /* 8005D314-8005D3BC       .text on__15dSv_zoneActor_cFi */
 void dSv_zoneActor_c::on(int i_id) {
-    JUT_ASSERT(VERSION_SELECT(3010, 3037, 3037), 0 <= i_id && i_id < ACTOR_MAX);
+    JUT_ASSERT(VERSION_SELECT(3010, 3010, 3037, 3037), 0 <= i_id && i_id < ACTOR_MAX);
     mActorFlags[i_id >> 5] |= (1 << (i_id & 0x1F));
 }
 
 /* 8005D3BC-8005D468       .text is__15dSv_zoneActor_cFi */
 BOOL dSv_zoneActor_c::is(int i_id) {
-    JUT_ASSERT(VERSION_SELECT(3038, 3065, 3065), 0 <= i_id && i_id < ACTOR_MAX);
+    JUT_ASSERT(VERSION_SELECT(3038, 3038, 3065, 3065), 0 <= i_id && i_id < ACTOR_MAX);
     return mActorFlags[i_id >> 5] & (1 << (i_id & 0x1F)) ? TRUE : FALSE;
 }
 
@@ -1430,13 +1430,13 @@ void dSv_save_c::init() {
 
 /* 8005D8C8-8005D988       .text getSave__10dSv_info_cFi */
 void dSv_info_c::getSave(int i_stageNo) {
-    JUT_ASSERT(VERSION_SELECT(3308, 3335, 3335), 0 <= i_stageNo && i_stageNo < dSv_save_c::STAGE_MAX);
+    JUT_ASSERT(VERSION_SELECT(3308, 3308, 3335, 3335), 0 <= i_stageNo && i_stageNo < dSv_save_c::STAGE_MAX);
     mMemory = mSavedata.getSave(i_stageNo);
 }
 
 /* 8005D988-8005DA70       .text putSave__10dSv_info_cFi */
 void dSv_info_c::putSave(int i_stageNo) {
-    JUT_ASSERT(VERSION_SELECT(3324, 3351, 3351), 0 <= i_stageNo && i_stageNo < dSv_save_c::STAGE_MAX);
+    JUT_ASSERT(VERSION_SELECT(3324, 3324, 3351, 3351), 0 <= i_stageNo && i_stageNo < dSv_save_c::STAGE_MAX);
     mSavedata.putSave(i_stageNo, mMemory);
 }
 
@@ -1464,7 +1464,7 @@ int dSv_info_c::createZone(int i_roomNo) {
 
 /* 8005DB24-8005DCD0       .text onSwitch__10dSv_info_cFii */
 void dSv_info_c::onSwitch(int i_no, int i_roomNo) {
-    JUT_ASSERT(VERSION_SELECT(3384, 3411, 3411),
+    JUT_ASSERT(VERSION_SELECT(3384, 3384, 3411, 3411),
                (0 <= i_no && i_no < (MEMORY_SWITCH+ DAN_SWITCH+ ZONE_SWITCH)) || i_no == -1 || i_no == 255);
 
     if (i_no == -1 || i_no == 255) {
@@ -1476,10 +1476,10 @@ void dSv_info_c::onSwitch(int i_no, int i_roomNo) {
     } else if (i_no < (MEMORY_SWITCH + DAN_SWITCH)) {
         mDan.onSwitch(i_no - MEMORY_SWITCH);
     } else {
-        JUT_ASSERT(VERSION_SELECT(3397, 3424, 3424), 0 <= i_roomNo && i_roomNo < 64);
+        JUT_ASSERT(VERSION_SELECT(3397, 3397, 3424, 3424), 0 <= i_roomNo && i_roomNo < 64);
 
         int zoneId = dComIfGp_roomControl_getZoneNo(i_roomNo);
-        JUT_ASSERT(VERSION_SELECT(3399, 3426, 3426), 0 <= zoneId && zoneId < ZONE_MAX);
+        JUT_ASSERT(VERSION_SELECT(3399, 3399, 3426, 3426), 0 <= zoneId && zoneId < ZONE_MAX);
 
         mZone[zoneId].getZoneBit().onSwitch(i_no - (MEMORY_SWITCH + DAN_SWITCH));
     }
@@ -1487,7 +1487,7 @@ void dSv_info_c::onSwitch(int i_no, int i_roomNo) {
 
 /* 8005DCEC-8005DE98       .text offSwitch__10dSv_info_cFii */
 void dSv_info_c::offSwitch(int i_no, int i_roomNo) {
-    JUT_ASSERT(VERSION_SELECT(3421, 3448, 3448),
+    JUT_ASSERT(VERSION_SELECT(3421, 3421, 3448, 3448),
                (0 <= i_no && i_no < (MEMORY_SWITCH+ DAN_SWITCH+ ZONE_SWITCH)) || i_no == -1 || i_no == 255);
 
     if (i_no == -1 || i_no == 255) {
@@ -1499,10 +1499,10 @@ void dSv_info_c::offSwitch(int i_no, int i_roomNo) {
     } else if (i_no < (MEMORY_SWITCH + DAN_SWITCH)) {
         mDan.offSwitch(i_no - MEMORY_SWITCH);
     } else {
-        JUT_ASSERT(VERSION_SELECT(3434, 3461, 3461), 0 <= i_roomNo && i_roomNo < 64);
+        JUT_ASSERT(VERSION_SELECT(3434, 3434, 3461, 3461), 0 <= i_roomNo && i_roomNo < 64);
 
         int zoneNo = dComIfGp_roomControl_getZoneNo(i_roomNo);
-        JUT_ASSERT(VERSION_SELECT(3436, 3463, 3463), 0 <= zoneNo && zoneNo < ZONE_MAX);
+        JUT_ASSERT(VERSION_SELECT(3436, 3436, 3463, 3463), 0 <= zoneNo && zoneNo < ZONE_MAX);
 
         mZone[zoneNo].getZoneBit().offSwitch(i_no - (MEMORY_SWITCH + DAN_SWITCH));
     }
@@ -1519,10 +1519,10 @@ BOOL dSv_info_c::isSwitch(int i_no, int i_roomNo) {
     } else if (i_no < (MEMORY_SWITCH + DAN_SWITCH)) {
         return mDan.isSwitch(i_no - MEMORY_SWITCH);
     } else {
-        JUT_ASSERT(VERSION_SELECT(3482, 3509, 3509), 0 <= i_roomNo && i_roomNo < 64);
+        JUT_ASSERT(VERSION_SELECT(3482, 3482, 3509, 3509), 0 <= i_roomNo && i_roomNo < 64);
 
         int zoneNo = dComIfGp_roomControl_getZoneNo(i_roomNo);
-        JUT_ASSERT(VERSION_SELECT(3484, 3511, 3511), 0 <= zoneNo && zoneNo < ZONE_MAX);
+        JUT_ASSERT(VERSION_SELECT(3484, 3484, 3511, 3511), 0 <= zoneNo && zoneNo < ZONE_MAX);
 
         return mZone[zoneNo].getZoneBit().isSwitch(i_no - (MEMORY_SWITCH + DAN_SWITCH));
     }
@@ -1530,7 +1530,7 @@ BOOL dSv_info_c::isSwitch(int i_no, int i_roomNo) {
 
 /* 8005DFE0-8005E190       .text revSwitch__10dSv_info_cFii */
 BOOL dSv_info_c::revSwitch(int i_no, int i_roomNo) {
-    JUT_ASSERT(VERSION_SELECT(3505, 3532, 3532),
+    JUT_ASSERT(VERSION_SELECT(3505, 3505, 3532, 3532),
                (0 <= i_no && i_no < (MEMORY_SWITCH+ DAN_SWITCH+ ZONE_SWITCH)) || i_no == -1 || i_no == 255);
 
     if (i_no == -1 || i_no == 255) {
@@ -1542,10 +1542,10 @@ BOOL dSv_info_c::revSwitch(int i_no, int i_roomNo) {
     } else if (i_no < (MEMORY_SWITCH + DAN_SWITCH)) {
         return mDan.revSwitch(i_no - MEMORY_SWITCH);
     } else {
-        JUT_ASSERT(VERSION_SELECT(3517, 3544, 3544), 0 <= i_roomNo && i_roomNo < 64);
+        JUT_ASSERT(VERSION_SELECT(3517, 3517, 3544, 3544), 0 <= i_roomNo && i_roomNo < 64);
 
         int zoneNo = dComIfGp_roomControl_getZoneNo(i_roomNo);
-        JUT_ASSERT(VERSION_SELECT(3519, 3546, 3546), 0 <= zoneNo && zoneNo < ZONE_MAX);
+        JUT_ASSERT(VERSION_SELECT(3519, 3519, 3546, 3546), 0 <= zoneNo && zoneNo < ZONE_MAX);
 
         return mZone[zoneNo].getZoneBit().revSwitch(i_no - (MEMORY_SWITCH + DAN_SWITCH));
     }
@@ -1553,7 +1553,7 @@ BOOL dSv_info_c::revSwitch(int i_no, int i_roomNo) {
 
 /* 8005E190-8005E324       .text onItem__10dSv_info_cFii */
 void dSv_info_c::onItem(int i_no, int i_roomNo) {
-    JUT_ASSERT(VERSION_SELECT(3538, 3565, 3565),
+    JUT_ASSERT(VERSION_SELECT(3538, 3538, 3565, 3565),
                (0 <= i_no && i_no < (MEMORY_ITEM+ZONE_ITEM)) || i_no == -1 || i_no == 127);
 
     if (i_no == -1 || i_no == 127) {
@@ -1563,10 +1563,10 @@ void dSv_info_c::onItem(int i_no, int i_roomNo) {
     if (i_no < MEMORY_ITEM) {
         mMemory.getBit().onItem(i_no);
     } else {
-        JUT_ASSERT(VERSION_SELECT(3548, 3575, 3575), 0 <= i_roomNo && i_roomNo < 64);
+        JUT_ASSERT(VERSION_SELECT(3548, 3548, 3575, 3575), 0 <= i_roomNo && i_roomNo < 64);
 
         int zoneNo = dComIfGp_roomControl_getZoneNo(i_roomNo);
-        JUT_ASSERT(VERSION_SELECT(3550, 3577, 3577), 0 <= zoneNo && zoneNo < ZONE_MAX);
+        JUT_ASSERT(VERSION_SELECT(3550, 3550, 3577, 3577), 0 <= zoneNo && zoneNo < ZONE_MAX);
 
         mZone[zoneNo].getZoneBit().onItem(i_no - MEMORY_ITEM);
     }
@@ -1574,7 +1574,7 @@ void dSv_info_c::onItem(int i_no, int i_roomNo) {
 
 /* 8005E324-8005E4BC       .text isItem__10dSv_info_cFii */
 BOOL dSv_info_c::isItem(int i_no, int i_roomNo) {
-    JUT_ASSERT(VERSION_SELECT(3602, 3629, 3629),
+    JUT_ASSERT(VERSION_SELECT(3602, 3602, 3629, 3629),
                (0 <= i_no && i_no < (MEMORY_ITEM+ZONE_ITEM)) || i_no == -1 || i_no == 127);
 
     if (i_no == -1 || i_no == 127) {
@@ -1584,10 +1584,10 @@ BOOL dSv_info_c::isItem(int i_no, int i_roomNo) {
     if (i_no < MEMORY_ITEM) {
         return mMemory.getBit().isItem(i_no);
     } else {
-        JUT_ASSERT(VERSION_SELECT(3611, 3638, 3638), 0 <= i_roomNo && i_roomNo < 64);
+        JUT_ASSERT(VERSION_SELECT(3611, 3611, 3638, 3638), 0 <= i_roomNo && i_roomNo < 64);
 
         int zoneNo = dComIfGp_roomControl_getZoneNo(i_roomNo);
-        JUT_ASSERT(VERSION_SELECT(3613, 3640, 3640), 0 <= zoneNo && zoneNo < ZONE_MAX);
+        JUT_ASSERT(VERSION_SELECT(3613, 3613, 3640, 3640), 0 <= zoneNo && zoneNo < ZONE_MAX);
 
         return mZone[zoneNo].getZoneBit().isItem(i_no - MEMORY_ITEM);
     }
@@ -1599,10 +1599,10 @@ void dSv_info_c::onActor(int i_id, int i_roomNo) {
         return;
     }
 
-    JUT_ASSERT(VERSION_SELECT(3666, 3693, 3693), (0 <= i_id && i_id < dSv_zoneActor_c::ACTOR_MAX) && (0 <= i_roomNo && i_roomNo < 64));
+    JUT_ASSERT(VERSION_SELECT(3666, 3666, 3693, 3693), (0 <= i_id && i_id < dSv_zoneActor_c::ACTOR_MAX) && (0 <= i_roomNo && i_roomNo < 64));
 
     int zoneNo = dComIfGp_roomControl_getZoneNo(i_roomNo);
-    JUT_ASSERT(VERSION_SELECT(3668, 3695, 3695), 0 <= zoneNo && zoneNo < ZONE_MAX);
+    JUT_ASSERT(VERSION_SELECT(3668, 3668, 3695, 3695), 0 <= zoneNo && zoneNo < ZONE_MAX);
 
     mZone[zoneNo].getActor().on(i_id);
 }
@@ -1614,13 +1614,13 @@ BOOL dSv_info_c::isActor(int i_id, int i_roomNo) {
     }
 
     if (0 > i_id || i_id >= dSv_zoneActor_c::ACTOR_MAX) {
-        JUT_ASSERT(VERSION_SELECT(3717, 3744, 3744), 0 <= i_id && i_id < dSv_zoneActor_c::ACTOR_MAX);
+        JUT_ASSERT(VERSION_SELECT(3717, 3717, 3744, 3744), 0 <= i_id && i_id < dSv_zoneActor_c::ACTOR_MAX);
     }
 
-    JUT_ASSERT(VERSION_SELECT(3719, 3746, 3746), 0 <= i_roomNo && i_roomNo < 64);
+    JUT_ASSERT(VERSION_SELECT(3719, 3719, 3746, 3746), 0 <= i_roomNo && i_roomNo < 64);
 
     int zoneNo = dComIfGp_roomControl_getZoneNo(i_roomNo);
-    JUT_ASSERT(VERSION_SELECT(3721, 3748, 3748), 0 <= zoneNo && zoneNo < ZONE_MAX);
+    JUT_ASSERT(VERSION_SELECT(3721, 3721, 3748, 3748), 0 <= zoneNo && zoneNo < ZONE_MAX);
 
     return mZone[zoneNo].getActor().is(i_id);
 }
@@ -1678,7 +1678,7 @@ int dSv_info_c::memory_to_card(char* i_cardPtr, int i_dataNum) {
 
     memcpy(buffer, dComIfGs_getpConfig(), sizeof(dSv_player_config_c));
     buffer += sizeof(dSv_player_config_c);
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     if (dComIfGs_getOptSound() == 0) {
         OSSetSoundMode(0);
     } else {
diff --git a/src/d/d_snap.cpp b/src/d/d_snap.cpp
index e1a0a3a9d..82ac5ae88 100644
--- a/src/d/d_snap.cpp
+++ b/src/d/d_snap.cpp
@@ -818,7 +818,7 @@ static const CharaData l_CharaData[] = {
         /* radius    */ 60,
         /* height    */ 90,
         /* minRatio  */ 500,
-        /* cullAngle */ VERSION_SELECT(0x2000, 0x6000, 0x6000),
+        /* cullAngle */ VERSION_SELECT(0x2000, 0x2000, 0x6000, 0x6000),
         /* minPixels */ 5000,
         /* figRoom   */ 0x06,
         /* m11       */ 0x02,
@@ -1889,7 +1889,7 @@ void dSnap_packet::draw() {
     if (!ChkReleaseShutter()) {
         return;
     }
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     j3dSys.reinitGX();
 #endif
     ClearAlphaBuffer();
@@ -2142,7 +2142,7 @@ void dSnap_packet::SetResult() {
         if (m_tbl[col].m_obj.mCapturedPixels == 0 || m_tbl[col].m_obj.GetPhoto() == 0) {
             continue;
         }
-        JUT_ASSERT(VERSION_SELECT(2325, 2327, 2327), 0 <= m_tbl[col].m_obj.GetPhoto() && m_tbl[col].m_obj.GetPhoto() < DSNAP_TYPE_LAST_INDEX);
+        JUT_ASSERT(VERSION_SELECT(2325, 2325, 2327, 2327), 0 <= m_tbl[col].m_obj.GetPhoto() && m_tbl[col].m_obj.GetPhoto() < DSNAP_TYPE_LAST_INDEX);
         if (m_tbl[col].m_obj.GetPhoto() < (s32)ARRAY_SIZE(sp8)) {
             if (sp8[m_tbl[col].m_obj.GetPhoto()] != 0) {
                 continue;
diff --git a/src/d/d_wood.cpp b/src/d/d_wood.cpp
index 6f9116fad..b9e771687 100644
--- a/src/d/d_wood.cpp
+++ b/src/d/d_wood.cpp
@@ -1048,7 +1048,7 @@ void dWood::Packet_c::draw() {
         }
     }
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     J3DShape::resetVcdVatCache();
 #endif
 }
@@ -1074,7 +1074,7 @@ s32 dWood::Packet_c::search_empty_UnitID() const {
 dWood::AnmID_e dWood::Packet_c::search_anm(dWood::Anm_c::Mode_e i_mode) {
     u32 animIdx;
 
-    JUT_ASSERT(VERSION_SELECT(2059, 2061, 2061), (i_mode >= 0) && (i_mode < Anm_c::Mode_Max));
+    JUT_ASSERT(VERSION_SELECT(2059, 2059, 2061, 2061), (i_mode >= 0) && (i_mode < Anm_c::Mode_Max));
 
     if (i_mode == Anm_c::Mode_Norm) {
         static s32 anm_norm_num = 0;
diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp
index bb371bc0a..00ebfb66b 100644
--- a/src/f_op/f_op_msg_mng.cpp
+++ b/src/f_op/f_op_msg_mng.cpp
@@ -7,7 +7,7 @@
 #include "JSystem/JKernel/JKRArchive.h"
 #include "JSystem/JUtility/JUTDataHeader.h"
 #include "d/d_meter.h"
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
 #include "d/d_s_play.h"
 #endif
 #include "f_op/f_op_scene_mng.h"
@@ -617,7 +617,7 @@ char* fopMsgM_messageGet(char* dst, u32 msgNo) {
         if(*cursor == 0x1A) {
             if((cursor[1] & 0xFFFFFF) == 0) {
                 strcpy(dstBuf, dComIfGs_getPlayerName());
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
                 if(msgNo == 0x33B || msgNo == 0xC8B || msgNo == 0x1D21 || msgNo == 0x31D7 || msgNo == 0x37DD || msgNo == 0x37DE) {
 #else
                 if(dComIfGs_getPalLanguage() == 1 && (msgNo == 0x33B || msgNo == 0xC8B || msgNo == 0x1D21 || msgNo == 0x31D7 || msgNo == 0x37DD || msgNo == 0x37DE)) {
@@ -676,7 +676,7 @@ void fopMsgM_passwordGet(char* dst, u32 msgNo) {
         if(*cursor == 0x1A) {
             if((cursor[1] & 0xFFFFFF) == 0) {
                 strcpy(dstBuf, dComIfGs_getPlayerName());
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
                 if(msgNo == 0x33B || msgNo == 0xC8B || msgNo == 0x1D21 || msgNo == 0x31D7 || msgNo == 0x37DD || msgNo == 0x37DE) {
 #else
                 if(dComIfGs_getPalLanguage() == 1 && (msgNo == 0x33B || msgNo == 0xC8B || msgNo == 0x1D21 || msgNo == 0x31D7 || msgNo == 0x37DD || msgNo == 0x37DE)) {
@@ -1401,7 +1401,7 @@ mesg_header* fopMsgM_msgGet_c::getMesgHeader(u32 msg) {
     mGroupID = (msg >> 16);
     mMsgID = msg;
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     char path[12];
     if (g_msgDHIO.field_0x08 == 0) {
         sprintf(path, "zel_%02d.bmg", mGroupID);
@@ -1462,12 +1462,12 @@ const char* fopMsgM_msgGet_c::getMessage(mesg_header* msg) {
 
 /* 8002E430-8002E4AC       .text getMesgHeader__20fopMsgM_itemMsgGet_cFUl */
 mesg_header* fopMsgM_itemMsgGet_c::getMesgHeader(u32 msg) {
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     u16 groupID = msg >> 16;
 #endif
     mMsgID = msg;
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     char path[12];
     if (g_msgDHIO.field_0x08 == 0) {
         sprintf(path, "zel_%02d.bmg", groupID);
@@ -2187,7 +2187,7 @@ void fopMsgM_msgDataProc_c::stringSet() {
             else if(temp[2] == 0 && temp[3] == 0 && temp[4] == 0) {
                 char buf[12];
                 strcpy(buf, dComIfGs_getPlayerName());
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
                 if(field_0x0C->mMesgID == 0x33B || field_0x0C->mMesgID == 0xC8B || field_0x0C->mMesgID == 0x1D21 || field_0x0C->mMesgID == 0x31D7 || field_0x0C->mMesgID == 0x37DD || field_0x0C->mMesgID == 0x37DE) {
 #else
                 if(dComIfGs_getPalLanguage() == 1 && (field_0x0C->mMesgID == 0x33B || field_0x0C->mMesgID == 0xC8B || field_0x0C->mMesgID == 0x1D21 || field_0x0C->mMesgID == 0x31D7 || field_0x0C->mMesgID == 0x37DD || field_0x0C->mMesgID == 0x37DE)) {
@@ -2411,7 +2411,7 @@ void fopMsgM_msgDataProc_c::getString(char* dst, u32 msgNo) {
             int codeLen = cursor[1];
             if(cursor[2] == 0 && cursor[3] == 0 && cursor[4] == 0) {
                 strcpy(dstBuf, dComIfGs_getPlayerName());
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
                 if(msgNo == 0x33B || msgNo == 0xC8B || msgNo == 0x1D21 || msgNo == 0x31D7 || msgNo == 0x37DD || msgNo == 0x37DE) {
 #else
                 if(dComIfGs_getPalLanguage() == 1 && (msgNo == 0x33B || msgNo == 0xC8B || msgNo == 0x1D21 || msgNo == 0x31D7 || msgNo == 0x37DD || msgNo == 0x37DE)) {
@@ -2475,7 +2475,7 @@ void fopMsgM_msgDataProc_c::getString(char* dst, char*, char*, char*, u32 msgNo,
             int codeLen = cursor[1];
             if(cursor[2] == 0 && cursor[3] == 0 && cursor[4] == 0) {
                 strcpy(dstBuf, dComIfGs_getPlayerName());
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
                 if(msgNo == 0x33B || msgNo == 0xC8B || msgNo == 0x1D21 || msgNo == 0x31D7 || msgNo == 0x37DD || msgNo == 0x37DE) {
 #else
                 if(dComIfGs_getPalLanguage() == 1 && (msgNo == 0x33B || msgNo == 0xC8B || msgNo == 0x1D21 || msgNo == 0x31D7 || msgNo == 0x37DD || msgNo == 0x37DE)) {
diff --git a/src/f_pc/f_pc_fstcreate_req.cpp b/src/f_pc/f_pc_fstcreate_req.cpp
index cbda235e1..095302dc8 100644
--- a/src/f_pc/f_pc_fstcreate_req.cpp
+++ b/src/f_pc/f_pc_fstcreate_req.cpp
@@ -8,6 +8,7 @@
 #include "f_pc/f_pc_layer.h"
 #include "f_pc/f_pc_load.h"
 #include "SSystem/SComponent/c_phase.h"
+#include "global.h"
 
 /* 80040520-80040570       .text fpcFCtRq_Do__FP19fast_create_request */
 cPhs_State fpcFCtRq_Do(fast_create_request* i_createReq) {
@@ -50,7 +51,7 @@ base_process_class* fpcFCtRq_Request(layer_class* i_layer, s16 i_procTypeID,
                     return proc;
                 }
             }
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
             fpcCtRq_Delete(&request->base);
 #else
             fpcCtRq_Cancel(&request->base);
diff --git a/src/f_pc/f_pc_manager.cpp b/src/f_pc/f_pc_manager.cpp
index 087d8fd26..29f83c50c 100644
--- a/src/f_pc/f_pc_manager.cpp
+++ b/src/f_pc/f_pc_manager.cpp
@@ -87,13 +87,13 @@ void messageSet(u32 status) {
     const char * msg = (const char*)((u8*)inf1->getNext() + sizeof(JUTDataBlockHeader) + inf1->entries[status]);
 
     J2DTextBox * tpane = new J2DTextBox('TXT1', JGeometry::TBox2<f32>(0.0f, 0.0f, 660.0f, 200.0f), (ResFONT*)font_data, msg, HBIND_CENTER, VBIND_CENTER);
-    JUT_ASSERT(VERSION_SELECT(0x12b, 0x141, 0x141), tpane != NULL);
+    JUT_ASSERT(VERSION_SELECT(0x12b, 0x12b, 0x141, 0x141), tpane != NULL);
 
     J2DTextBox * spane = new J2DTextBox('TXT2', JGeometry::TBox2<f32>(0.0f, 0.0f, 660.0f, 200.0f), (ResFONT*)font_data, msg, HBIND_CENTER, VBIND_CENTER);
-    JUT_ASSERT(VERSION_SELECT(0x133, 0x149, 0x149), spane != NULL);
+    JUT_ASSERT(VERSION_SELECT(0x133, 0x133, 0x149, 0x149), spane != NULL);
 
     J2DPicture * ppane = new J2DPicture('PIC1', JGeometry::TBox2<f32>(0.0f, 0.0f, 665.0f, 530.0f), (ResTIMG*)black_tex, NULL);
-    JUT_ASSERT(VERSION_SELECT(0x138, 0x14e, 0x14e), ppane != NULL);
+    JUT_ASSERT(VERSION_SELECT(0x138, 0x138, 0x14e, 0x14e), ppane != NULL);
 
     J2DTextBox::TFontSize size;
     size.mSizeX = 27.0f;
@@ -113,12 +113,12 @@ void messageSet(u32 status) {
 
     ppane->setAlpha(130);
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     JUTResFont * font = new JUTResFont((ResFONT*)font_data, NULL);
 #endif
 
     s16 height = 27;
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     f32 maxWidth = 0.0f;
     s32 curLine = 0;
     f32 lineWidth[6];
@@ -129,18 +129,18 @@ void messageSet(u32 status) {
     for (; *msg != '\0'; msg++) {
         if (*msg == '\n') {
             height += 27;
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
             curLine++;
 #endif
             continue;
         }
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
         lineWidth[curLine] += font->JUTFont::getWidth((u8)*msg);
 #endif
     }
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     for (s32 i = 0; i < (s32)ARRAY_SIZE(lineWidth); i++) {
         f32 width = lineWidth[i];
         if (maxWidth < width)
@@ -148,7 +148,7 @@ void messageSet(u32 status) {
     }
 #endif
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     f32 x = -9.5f;
 #else
     f32 x = (659.0f - maxWidth) / 2.0f + -9.0f;
@@ -165,11 +165,11 @@ void messageSet(u32 status) {
         tpane->draw(-9.0f, y + 10.0f, 660.0f, HBIND_CENTER);
     }
 #else
-    spane->draw(x + 2.0f, y + 10.0f + 2.0f, 660.0f, VERSION_SELECT(HBIND_CENTER, HBIND_LEFT, HBIND_LEFT));
-    tpane->draw(x, y + 10.0f, 660.0f, VERSION_SELECT(HBIND_CENTER, HBIND_LEFT, HBIND_LEFT));
+    spane->draw(x + 2.0f, y + 10.0f + 2.0f, 660.0f, VERSION_SELECT(HBIND_CENTER, HBIND_CENTER, HBIND_LEFT, HBIND_LEFT));
+    tpane->draw(x, y + 10.0f, 660.0f, VERSION_SELECT(HBIND_CENTER, HBIND_CENTER, HBIND_LEFT, HBIND_LEFT));
 #endif
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     delete font;
 #endif
     delete ppane;
@@ -207,11 +207,11 @@ void drawDvdCondition(long status) {
         messageSet(0);
     } else if (status == -1) {
         messageSet(5);
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
         JAInter::StreamLib::stop();
 #endif
     } else {
-        JUT_WARN(VERSION_SELECT(423, 481, 478), "Dvd Error !! <%d>\n", status);
+        JUT_WARN(VERSION_SELECT(423, 423, 481, 478), "Dvd Error !! <%d>\n", status);
     }
 
     JFWDisplay::getManager()->endRender();
@@ -252,10 +252,10 @@ void fpcM_Management(fpcM_ManagementFunc callBack1, fpcM_ManagementFunc callBack
     cAPIGph_Painter();
     fpcDt_Handler();
     if (!fpcPi_Handler())
-        JUT_ASSERT(VERSION_SELECT(490, 548, 547), 0);
+        JUT_ASSERT(VERSION_SELECT(490, 490, 548, 547), 0);
 
     if (!fpcCt_Handler())
-        JUT_ASSERT(VERSION_SELECT(494, 552, 551), 0);
+        JUT_ASSERT(VERSION_SELECT(494, 494, 552, 551), 0);
 
     if (callBack1 != NULL)
         callBack1();
diff --git a/src/m_Do/m_Do_MemCard.cpp b/src/m_Do/m_Do_MemCard.cpp
index 233d3eef8..1c8a19d3d 100644
--- a/src/m_Do/m_Do_MemCard.cpp
+++ b/src/m_Do/m_Do_MemCard.cpp
@@ -199,7 +199,7 @@ s32 mDoMemCd_Ctrl_c::SaveSync() {
         if (field_0x1660 == 4) {
             field_0x1660 = 1;
             ret = 1;
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
         } else if (field_0x1660 == 1) {
             ret = 0;
 #endif
diff --git a/src/m_Do/m_Do_MemCardRWmng.cpp b/src/m_Do/m_Do_MemCardRWmng.cpp
index 4555ae168..521462655 100644
--- a/src/m_Do/m_Do_MemCardRWmng.cpp
+++ b/src/m_Do/m_Do_MemCardRWmng.cpp
@@ -192,7 +192,7 @@ s32 mDoMemCdRWm_Restore2(CARDFileInfo* card) {
 
 /* 80019F4C-8001A0A8       .text mDoMemCdRWm_BuildHeader__FP22mDoMemCdRWm_HeaderData */
 void mDoMemCdRWm_BuildHeader(mDoMemCdRWm_HeaderData* header) {
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     snprintf(header->comment, sizeof(header->comment), "ゼルダの伝説～風のタクト～");
 #else
     snprintf(header->comment, sizeof(header->comment), "Zelda: The Wind Waker");
@@ -200,7 +200,7 @@ void mDoMemCdRWm_BuildHeader(mDoMemCdRWm_HeaderData* header) {
     OSTime time = OSGetTime();
     OSCalendarTime cal;
     OSTicksToCalendarTime(time, &cal);
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     snprintf(header->info, sizeof(header->info), "%d月%d日のセーブデータです", cal.month + 1, cal.day_of_month);
 #elif VERSION == VERSION_USA
     snprintf(header->info, sizeof(header->info), "%d/%d Save Data", cal.month + 1, cal.day_of_month);
diff --git a/src/m_Do/m_Do_Reset.cpp b/src/m_Do/m_Do_Reset.cpp
index 62c5c6274..e43f39e18 100644
--- a/src/m_Do/m_Do_Reset.cpp
+++ b/src/m_Do/m_Do_Reset.cpp
@@ -23,7 +23,7 @@ void destroyVideo() {
     VIWaitForRetrace();
 }
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
 int mDoRst::mResetFlag;
 int mDoRst::mResetPrepare;
 int mDoRst::m3ButtonResetFlag;
@@ -44,7 +44,7 @@ void mDoRst_reset(int param_0, u32 param_1, int param_2) {
     JUTGamePad::clearForReset();
     mDoAud_zelAudio_c::offInitFlag();
 
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     VIWaitForRetrace();
     VIWaitForRetrace();
 #endif
@@ -64,7 +64,7 @@ void mDoRst_reset(int param_0, u32 param_1, int param_2) {
     destroyVideo();
     my_OSCancelAlarmAll();
     LCDisable();
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     OSSetSaveRegion(mDoRst::mResetData, (u8*)&mDoRst::getResetData + 0x10);
 #endif
     OSResetSystem(param_0, param_1, param_2);
@@ -92,7 +92,7 @@ void mDoRst_resetCallBack(int port, void*) {
             JUTGamePad::clearForReset();
             JUTGamePad::CRumble::setEnabled(0xF0000000);
         }
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
         if (DVDCheckDisk() == 0) {
             mDoRst_reset(1, 0x80000000, 0);
         }
diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp
index 908a5bb06..c51fb1109 100644
--- a/src/m_Do/m_Do_audio.cpp
+++ b/src/m_Do/m_Do_audio.cpp
@@ -8,7 +8,7 @@
 #include "JSystem/JAudio/JAISequenceMgr.h"
 #include "JSystem/JAudio/JAIStreamMgr.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
 #include "JSystem/JUtility/JUTConsole.h"
 #endif
 #include "SSystem/SComponent/c_lib.h"
@@ -132,13 +132,13 @@ void mDoAud_Create() {
         JAInter::SequenceMgr::setArchivePointer(l_arcCommand->getArchive());
         mDoAud_setupStreamBuffer();
         if (g_mDoAud_audioHeap) {
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
             JUTReportConsole("mDoAud_Create g_mDoAud_zelAudio.init before\n");
 #endif
             JKRSetCurrentHeap(NULL);
             g_mDoAud_zelAudio.init(g_mDoAud_audioHeap, 0x00a00000);
             JKRSetCurrentHeap(zeldaHeap);
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
             JUTReportConsole("mDoAud_Create g_mDoAud_zelAudio.init after\n");
 #endif
             g_mDoAud_audioHeap->adjustSize();
diff --git a/src/m_Do/m_Do_controller_pad.cpp b/src/m_Do/m_Do_controller_pad.cpp
index 2eb9a94dc..eb0693c02 100644
--- a/src/m_Do/m_Do_controller_pad.cpp
+++ b/src/m_Do/m_Do_controller_pad.cpp
@@ -137,7 +137,7 @@ int mDoCPd_Create() {
 
     JUTGamePad::setAnalogMode(3);
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     JUTGamePad::clearResetOccurred();
     JUTGamePad::setResetCallback(mDoRst_resetCallBack, NULL);
 #else
diff --git a/src/m_Do/m_Do_gba_com.cpp b/src/m_Do/m_Do_gba_com.cpp
index affd09176..46b8a257e 100644
--- a/src/m_Do/m_Do_gba_com.cpp
+++ b/src/m_Do/m_Do_gba_com.cpp
@@ -412,7 +412,7 @@ void mDoGaC_agbCom_c::mDoGaC_ProbeCheck1() {
 /* 8001AFDC-8001B060       .text mDoGaC_CodeExchange0__15mDoGaC_agbCom_cFv */
 void mDoGaC_agbCom_c::mDoGaC_CodeExchange0() {
     u8 sp8[16];
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     // Bug: Missing parentheses cause the second half of this condition to always evaluate to true on JPN.
     if (!JUTGba::getManager()->resultGetStatus(mDoGaC_getPortNo(), sp8) && sp8[0] == 0x20 | 0x08) {
 #else
@@ -428,7 +428,7 @@ void mDoGaC_agbCom_c::mDoGaC_CodeExchange0() {
 void mDoGaC_agbCom_c::mDoGaC_CodeExchange1() {
     u8 sp8[16];
     if (!JUTGba::getManager()->resultRead(mDoGaC_getPortNo(), sp8)) {
-        if (field_0x118 == *(u32*) VERSION_SELECT("GZLJ", "GZLE", "GZLP")) {
+        if (field_0x118 == *(u32*) VERSION_SELECT("GZLJ", "GZLJ", "GZLE", "GZLP")) {
             JUTGba::getManager()->doGetStatus(mDoGaC_getPortNo(), CodeExchange_2, NULL);
         } else {
             mDoGaC_GbaReboot();
@@ -442,7 +442,7 @@ void mDoGaC_agbCom_c::mDoGaC_CodeExchange1() {
 void mDoGaC_agbCom_c::mDoGaC_CodeExchange2() {
     u8 sp8[16];
     if (!JUTGba::getManager()->resultGetStatus(mDoGaC_getPortNo(), sp8) && sp8[0] == 0x20) {
-        field_0x114 = *(u32*) VERSION_SELECT("GZLJ", "GZLE", "GZLP");
+        field_0x114 = *(u32*) VERSION_SELECT("GZLJ", "GZLJ", "GZLE", "GZLP");
         JUTGba::getManager()->doWrite(mDoGaC_getPortNo(), (u8*)&field_0x114, CodeExchange_3, NULL);
     } else {
         field_0x2 = 0;
@@ -462,7 +462,7 @@ void mDoGaC_agbCom_c::mDoGaC_CodeExchange3() {
 /* 8001B1F8-8001B298       .text mDoGaC_CodeExchange4__15mDoGaC_agbCom_cFv */
 void mDoGaC_agbCom_c::mDoGaC_CodeExchange4() {
     u8 sp8[16];
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     // Bug: Missing parentheses cause the second half of this condition to always evaluate to true on JPN.
     if (!JUTGba::getManager()->resultGetStatus(mDoGaC_getPortNo(), sp8) && sp8[0] == 0x10 | 0x20) {
 #else
@@ -510,7 +510,7 @@ void mDoGaC_agbCom_c::mDoGaC_ContextSend() {
 /* 8001B3A8-8001B42C       .text mDoGaC_ContextRead__15mDoGaC_agbCom_cFv */
 void mDoGaC_agbCom_c::mDoGaC_ContextRead() {
     u8 sp8[16];
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     // Bug: Missing parentheses cause the second half of this condition to always evaluate to true on JPN.
     if (!JUTGba::getManager()->resultGetStatus(mDoGaC_getPortNo(), sp8) && sp8[0] == 0x20 | 0x08) {
 #else
diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp
index e43ebd119..521d53787 100644
--- a/src/m_Do/m_Do_machine.cpp
+++ b/src/m_Do/m_Do_machine.cpp
@@ -40,7 +40,7 @@ static int archiveHeapErrors;
 static int unknownHeapErrors;
 static u32 heapErrors;
 
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
 const int FifoBufSize = 0x80000; // 512 KB
 const int CommandHeapSize = 0x1000; // 4 KB
 const int ArchiveHeapSize = 0xA3F000; // 10492 KB
@@ -485,11 +485,11 @@ bool mDoMch_Create() {
     JFWSystem::getSystemHeap()->setErrorFlag(true);
 
     JKRHeap* rootHeap = JKRHeap::getRootHeap();
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     rootHeap->dump_sort();
 #endif
     mDoExt_createCommandHeap(CommandHeapSize, rootHeap);
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     rootHeap->dump_sort();
 #endif
 
@@ -500,7 +500,7 @@ bool mDoMch_Create() {
 
     JKRHeap* sysHeap = JKRGetSystemHeap();
     s32 size = sysHeap->getFreeSize() - SysHeapNonZeldaSize;
-    JUT_ASSERT(VERSION_SELECT(996, 1104, 1143), size > 0);
+    JUT_ASSERT(VERSION_SELECT(996, 996, 1104, 1143), size > 0);
     JKRHeap* zeldaHeap = mDoExt_createZeldaHeap(size, sysHeap);
     zeldaHeap->becomeCurrentHeap();
 
diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp
index dd9307c4f..d616f43d0 100644
--- a/src/m_Do/m_Do_main.cpp
+++ b/src/m_Do/m_Do_main.cpp
@@ -207,7 +207,7 @@ void debugDisplay() {
             return;
         }
     } else if (mHeapBriefType != 0) {
-        JUT_ASSERT(VERSION_SELECT(530, 531, 531), mHeapBriefType < HeapCheckTableNum);
+        JUT_ASSERT(VERSION_SELECT(530, 530, 531, 531), mHeapBriefType < HeapCheckTableNum);
 
         JUTReport(500, 100, "%s", desc1[mHeapBriefType]);
         JUTReport(500, 114, "%s", desc2[mHeapBriefType]);
@@ -409,7 +409,7 @@ void main01() {
 
     mDoDvdThd_callback_c::create((mDoDvdThd_callback_func)LOAD_COPYDATE, NULL);
     fapGm_Create();  // init framework
-#if VERSION == VERSION_JPN
+#if VERSION <= VERSION_JPN
     mDisplayHeapSize = 1;
 #else
     mDisplayHeapSize = 0;
@@ -445,7 +445,7 @@ int main() {
     mDoMain::sPowerOnTime = OSGetTime();
     OSReportInit();
     version_check();
-#if VERSION != VERSION_JPN
+#if VERSION > VERSION_JPN
     mDoRstData* reset_data = (mDoRstData*)OSAllocFromArenaLo(0x10, 4);
     mDoRst::setResetData(reset_data);