From 72dc8f4ef64d3ef1674beb5fc8ebd15768174891 Mon Sep 17 00:00:00 2001
From: LagoLunatic <LagoLunatic@users.noreply.github.com>
Date: Fri, 25 Jul 2025 21:05:36 -0400
Subject: [PATCH] DEMO_SELECT

---
 include/global.h                   |  4 ++
 src/DynamicLink.cpp                |  8 ++--
 src/JSystem/JKernel/JKRDvdFile.cpp |  2 +-
 src/JSystem/JKernel/JKRExpHeap.cpp |  6 +--
 src/JSystem/JUtility/JUTGba.cpp    |  2 +-
 src/SSystem/SComponent/c_bg_w.cpp  |  6 +--
 src/SSystem/SComponent/c_m3d.cpp   | 64 +++++++++++++--------------
 src/c/c_dylink.cpp                 | 18 ++++----
 src/d/actor/d_a_acorn_leaf.cpp     |  4 +-
 src/d/actor/d_a_amiprop.cpp        |  2 +-
 src/d/actor/d_a_bb.cpp             |  6 +--
 src/d/actor/d_a_bridge.cpp         |  4 +-
 src/d/actor/d_a_demo00.cpp         |  4 +-
 src/d/actor/d_a_dk.cpp             |  2 +-
 src/d/actor/d_a_door10.cpp         |  8 ++--
 src/d/actor/d_a_dr2.cpp            |  8 ++--
 src/d/actor/d_a_ep.cpp             |  4 +-
 src/d/actor/d_a_fallrock.cpp       |  2 +-
 src/d/actor/d_a_ff.cpp             |  2 +-
 src/d/actor/d_a_ghostship.cpp      |  6 +--
 src/d/actor/d_a_msw.cpp            |  2 +-
 src/d/actor/d_a_nh.cpp             |  4 +-
 src/d/actor/d_a_npc_km1.cpp        |  6 +--
 src/d/actor/d_a_obj_Ygush00.cpp    |  2 +-
 src/d/actor/d_a_obj_dragonhead.cpp |  4 +-
 src/d/actor/d_a_obj_figure.cpp     |  6 +--
 src/d/actor/d_a_obj_hami3.cpp      |  4 +-
 src/d/actor/d_a_obj_hfuck1.cpp     |  2 +-
 src/d/actor/d_a_obj_hha.cpp        | 10 ++---
 src/d/actor/d_a_obj_homen.cpp      |  4 +-
 src/d/actor/d_a_obj_ladder.cpp     |  2 +-
 src/d/actor/d_a_player_main.cpp    | 12 ++---
 src/d/actor/d_a_rd.cpp             |  6 +--
 src/d/actor/d_a_ship.cpp           | 12 ++---
 src/d/actor/d_a_vrbox2.cpp         |  2 +-
 src/d/actor/d_a_windmill.cpp       |  2 +-
 src/d/d_door.cpp                   | 14 +++---
 src/d/d_event.cpp                  | 12 ++---
 src/d/d_ky_thunder.cpp             |  6 +--
 src/d/d_save.cpp                   | 70 +++++++++++++++---------------
 src/d/d_stage.cpp                  | 28 ++++++------
 src/f_op/f_op_actor_mng.cpp        | 34 +++++++--------
 src/m_Do/m_Do_graphic.cpp          | 10 ++---
 43 files changed, 210 insertions(+), 206 deletions(-)

diff --git a/include/global.h b/include/global.h
index 2ee40b945..0e94189f4 100644
--- a/include/global.h
+++ b/include/global.h
@@ -54,12 +54,16 @@ extern void __sync();
 
 #if VERSION == VERSION_DEMO
     #define VERSION_SELECT(DEMO, JPN, USA, PAL) (DEMO)
+    #define DEMO_SELECT(DEMO, RETAIL) (DEMO)
 #elif VERSION <= VERSION_JPN
     #define VERSION_SELECT(DEMO, JPN, USA, PAL) (JPN)
+    #define DEMO_SELECT(DEMO, RETAIL) (RETAIL)
 #elif VERSION == VERSION_USA
     #define VERSION_SELECT(DEMO, JPN, USA, PAL) (USA)
+    #define DEMO_SELECT(DEMO, RETAIL) (RETAIL)
 #elif VERSION == VERSION_PAL
     #define VERSION_SELECT(DEMO, JPN, USA, PAL) (PAL)
+    #define DEMO_SELECT(DEMO, RETAIL) (RETAIL)
 #endif
 
 #endif
diff --git a/src/DynamicLink.cpp b/src/DynamicLink.cpp
index 304c787f3..b7a2f66e0 100644
--- a/src/DynamicLink.cpp
+++ b/src/DynamicLink.cpp
@@ -406,7 +406,7 @@ BOOL DynamicModuleControl::do_link() {
         do_load();
     }
     if (mModule != NULL) {
-        JUT_ASSERT(VERSION_SELECT(501, 613, 613, 613), mModule->info.sectionInfoOffset < 0x80000000);
+        JUT_ASSERT(DEMO_SELECT(501, 613), mModule->info.sectionInfoOffset < 0x80000000);
 #if VERSION != VERSION_DEMO
         JUT_ASSERT(615, (u32)mModule + mModule->fixSize < 0x82000000);
 #endif
@@ -477,7 +477,7 @@ BOOL DynamicModuleControl::do_link() {
                 }
             }
         } else {
-            JUT_ASSERT(VERSION_SELECT(610, 724, 724, 724), FALSE);
+            JUT_ASSERT(DEMO_SELECT(610, 724), FALSE);
         }
         OSGetTime();
         sAllocBytes = sAllocBytes + getModuleSize();
@@ -565,7 +565,7 @@ extern "C" void ModuleUnresolved() {
 }
 
 extern "C" void ModuleConstructorsX(void (**_ctors)()) {
-    JUT_ASSERT(VERSION_SELECT(726, 850, 850, 850), _ctors);
+    JUT_ASSERT(DEMO_SELECT(726, 850), _ctors);
     while (*_ctors != 0) {
         (**_ctors)();
         _ctors++;
@@ -573,7 +573,7 @@ extern "C" void ModuleConstructorsX(void (**_ctors)()) {
 }
 
 extern "C" void ModuleDestructorsX(void (**_dtors)()) {
-    JUT_ASSERT(VERSION_SELECT(740, 864, 864, 864), _dtors);
+    JUT_ASSERT(DEMO_SELECT(740, 864), _dtors);
     while (*_dtors != 0) {
         (**_dtors)();
         _dtors++;
diff --git a/src/JSystem/JKernel/JKRDvdFile.cpp b/src/JSystem/JKernel/JKRDvdFile.cpp
index 4935763c1..545c0da74 100644
--- a/src/JSystem/JKernel/JKRDvdFile.cpp
+++ b/src/JSystem/JKernel/JKRDvdFile.cpp
@@ -124,7 +124,7 @@ s32 JKRDvdFile::readData(void* param_1, s32 length, s32 param_3) {
 /* 802BCBCC-802BCC24       .text writeData__10JKRDvdFileFPCvll */
 s32 JKRDvdFile::writeData(const void* param_0, s32 length, s32 param_2) {
     /* clang-format off */
-    JUT_ASSERT(VERSION_SELECT(364, 340, 340, 340), ( length & 0x1f ) == 0);
+    JUT_ASSERT(DEMO_SELECT(364, 340), ( length & 0x1f ) == 0);
     /* clang-format on */
 
     return -1;
diff --git a/src/JSystem/JKernel/JKRExpHeap.cpp b/src/JSystem/JKernel/JKRExpHeap.cpp
index a1eb5c7cc..39758d2fa 100644
--- a/src/JSystem/JKernel/JKRExpHeap.cpp
+++ b/src/JSystem/JKernel/JKRExpHeap.cpp
@@ -361,7 +361,7 @@ void JKRExpHeap::do_free(void* ptr) {
             block->free(this);
         }
     } else {
-        JUT_WARN(VERSION_SELECT(885, 888, 888, 888), "free: memblock %x not in heap %x", ptr, this);
+        JUT_WARN(DEMO_SELECT(885, 888), "free: memblock %x not in heap %x", ptr, this);
     }
     unlock();
 }
@@ -548,7 +548,7 @@ static void dummy1() {
 /* 802B24EC-802B2584       .text appendUsedList__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock */
 void JKRExpHeap::appendUsedList(CMemBlock* newblock) {
     if (!newblock) {
-        OSPanic(__FILE__, VERSION_SELECT(1458, 1466, 1466, 1466), ":::ERROR! appendUsedList\n");
+        OSPanic(__FILE__, DEMO_SELECT(1458, 1466), ":::ERROR! appendUsedList\n");
     }
 
     CMemBlock* block = mTailUsedList;
@@ -691,7 +691,7 @@ void JKRExpHeap::joinTwoBlocks(CMemBlock* block) {
         OSReport(":::: endAddr = %x\n", endAddr);
         OSReport(":::: nextAddr = %x\n", nextAddr);
         JKRGetCurrentHeap()->dump();
-        OSPanic(__FILE__, VERSION_SELECT(1710, 1718, 1718, 1718), ":::: Bad Block\n");
+        OSPanic(__FILE__, DEMO_SELECT(1710, 1718), ":::: Bad Block\n");
     }
 
     if (endAddr == nextAddr) {
diff --git a/src/JSystem/JUtility/JUTGba.cpp b/src/JSystem/JUtility/JUTGba.cpp
index e251dbd16..c1e261601 100644
--- a/src/JSystem/JUtility/JUTGba.cpp
+++ b/src/JSystem/JUtility/JUTGba.cpp
@@ -281,7 +281,7 @@ void* JUTGba::gbaThreadMain(void* param_1) {
                 sManager->gbaThread_GetStatus(&threadVar);
                 break;
             default:
-                OSPanic(__FILE__, VERSION_SELECT(622, 623, 623, 623), "UNKNOWN GBA COMMAND.");
+                OSPanic(__FILE__, DEMO_SELECT(622, 623), "UNKNOWN GBA COMMAND.");
                 break;
             }
             if (threadVar.field_0x14) {
diff --git a/src/SSystem/SComponent/c_bg_w.cpp b/src/SSystem/SComponent/c_bg_w.cpp
index 3c59ebda2..c29f4a361 100644
--- a/src/SSystem/SComponent/c_bg_w.cpp
+++ b/src/SSystem/SComponent/c_bg_w.cpp
@@ -657,7 +657,7 @@ void cBgW::RwgShdwDraw(int index, cBgS_ShdwDraw* shdw) {
         if (rwg->next == 0xFFFF)
             break;
         index = rwg->next;
-        JUT_ASSERT(VERSION_SELECT(3013, 3014, 3014, 3014), 0 <= index && index < pm_bgd->m_t_num);
+        JUT_ASSERT(DEMO_SELECT(3013, 3014), 0 <= index && index < pm_bgd->m_t_num);
     }
 }
 
@@ -730,7 +730,7 @@ bool cBgW::ChkGrpThrough(int, cBgS_GrpPassChk*, int) {
 
 /* 80249940-80249A18       .text GetGrpToRoomIndex__4cBgWCFi */
 u32 cBgW::GetGrpToRoomIndex(int grp_index) const {
-    JUT_ASSERT(VERSION_SELECT(3190, 3191, 3191, 3191), 0 <= grp_index && grp_index < pm_bgd->m_g_num);
+    JUT_ASSERT(DEMO_SELECT(3190, 3191), 0 <= grp_index && grp_index < pm_bgd->m_g_num);
     cBgD_Grp_t * g_tbl = pm_bgd->m_g_tbl;
     if (g_tbl[grp_index].m_parent == 0xFFFF || g_tbl[g_tbl[grp_index].m_parent].m_parent == 0xFFFF)
         return 0xFFFF;
@@ -746,7 +746,7 @@ void cBgW::GetTrans(cXyz* dst) const {
 
 /* 80249A58-80249B64       .text GetTriPnt__4cBgWCFiP4cXyzP4cXyzP4cXyz */
 void cBgW::GetTriPnt(int i_no, cXyz* p0, cXyz* p1, cXyz* p2) const {
-    JUT_ASSERT(VERSION_SELECT(3250, 3251, 3251, 3251), pm_bgd != NULL);
+    JUT_ASSERT(DEMO_SELECT(3250, 3251), pm_bgd != NULL);
 
     cBgD_Tri_t * tri = &pm_bgd->m_t_tbl[i_no];
     p0->set(pm_vtx_tbl[tri->vtx0]);
diff --git a/src/SSystem/SComponent/c_m3d.cpp b/src/SSystem/SComponent/c_m3d.cpp
index 0e790ca7a..6a365069e 100644
--- a/src/SSystem/SComponent/c_m3d.cpp
+++ b/src/SSystem/SComponent/c_m3d.cpp
@@ -1377,16 +1377,16 @@ int cM3d_Cross_LinSph_CrossPos(const cM3dGSph& sph, const cM3dGLin& line, Vec* p
 /* 8024D378-8024DB34       .text cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphP3VecPf */
 bool cM3d_Cross_CylSph(const cM3dGCyl* pcyl, const cM3dGSph* psph, Vec* param_2, f32* pcross_len) {
     const Vec* pnow_sph_center = psph->GetCP();
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2499, 2498, 2498, 2498), pnow_sph_center->x);
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2500, 2499, 2499, 2499), pnow_sph_center->y);
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2501, 2500, 2500, 2500), pnow_sph_center->z);
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2502, 2501, 2501, 2501), psph->GetR());
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2499, 2498), pnow_sph_center->x);
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2500, 2499), pnow_sph_center->y);
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2501, 2500), pnow_sph_center->z);
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2502, 2501), psph->GetR());
     const Vec* pnow_cyl_center = pcyl->GetCP();
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2504, 2503, 2503, 2503), pnow_cyl_center->x);
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2505, 2504, 2504, 2504), pnow_cyl_center->y);
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2506, 2505, 2505, 2505), pnow_cyl_center->z);
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2507, 2506, 2506, 2506), pcyl->GetH());
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2508, 2507, 2507, 2507), pcyl->GetR());
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2504, 2503), pnow_cyl_center->x);
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2505, 2504), pnow_cyl_center->y);
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2506, 2505), pnow_cyl_center->z);
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2507, 2506), pcyl->GetH());
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2508, 2507), pcyl->GetR());
     f32 radius_sum = pcyl->GetR() + psph->GetR();
     f32 dist = std::sqrtf(cM3d_Len2dSq(pnow_sph_center->x, pnow_sph_center->z, pnow_cyl_center->x, pnow_cyl_center->z));
 
@@ -1422,26 +1422,26 @@ bool cM3d_Cross_CylSph(const cM3dGCyl* pcyl, const cM3dGSph* psph, Vec* param_2,
 
 /* 8024DB34-8024E1B4       .text cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphPfPf */
 bool cM3d_Cross_SphSph(const cM3dGSph* i_a, const cM3dGSph* i_b, f32* param_2, f32* i_pcc_crosslen) {
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2566, 2565, 2565, 2565), i_a->GetCP()->x);
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2567, 2566, 2566, 2566), i_a->GetCP()->y);
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2568, 2567, 2567, 2567), i_a->GetCP()->z);
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2569, 2568, 2568, 2568), i_a->GetR());
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2566, 2565), i_a->GetCP()->x);
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2567, 2566), i_a->GetCP()->y);
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2568, 2567), i_a->GetCP()->z);
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2569, 2568), i_a->GetR());
 
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2570, 2569, 2569, 2569), i_b->GetCP()->x);
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2571, 2570, 2570, 2570), i_b->GetCP()->y);
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2572, 2571, 2571, 2571), i_b->GetCP()->z);
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2573, 2572, 2572, 2572), i_b->GetR());
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2570, 2569), i_b->GetCP()->x);
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2571, 2570), i_b->GetCP()->y);
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2572, 2571), i_b->GetCP()->z);
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2573, 2572), i_b->GetR());
 
     Vec delta;
     VECSubtract(i_a->GetCP(), i_b->GetCP(), &delta);
     *param_2 = VECMag(&delta);
     *i_pcc_crosslen = i_a->GetR() + i_b->GetR() - *param_2;
     if (*i_pcc_crosslen > G_CM3D_F_ABS_MIN) {
-        CHECK_FLOAT_CLASS(VERSION_SELECT(2583, 2582, 2582, 2582), *i_pcc_crosslen);
+        CHECK_FLOAT_CLASS(DEMO_SELECT(2583, 2582), *i_pcc_crosslen);
         return true;
     } else {
         *i_pcc_crosslen = 0.0f;
-        CHECK_FLOAT_CLASS(VERSION_SELECT(2588, 2587, 2587, 2587), *i_pcc_crosslen);
+        CHECK_FLOAT_CLASS(DEMO_SELECT(2588, 2587), *i_pcc_crosslen);
         return false;
     }
 }
@@ -1554,17 +1554,17 @@ bool cM3d_Cross_SphTri(const cM3dGSph* sph, const cM3dGTri* tri, Vec* param_2) {
 /* 8024E694-8024EF80       .text cM3d_Cross_CylCyl__FPC8cM3dGCylPC8cM3dGCylPf */
 bool cM3d_Cross_CylCyl(const cM3dGCyl* i_cyl1, const cM3dGCyl* i_cyl2, f32* i_pcross_len) {
     const Vec& c1 = i_cyl1->GetC();
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2827, 2826, 2826, 2826), c1.x);
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2828, 2827, 2827, 2827), c1.y);
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2829, 2828, 2828, 2828), c1.z);
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2830, 2829, 2829, 2829), i_cyl1->GetR());
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2831, 2830, 2830, 2830), i_cyl1->GetH());
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2827, 2826), c1.x);
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2828, 2827), c1.y);
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2829, 2828), c1.z);
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2830, 2829), i_cyl1->GetR());
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2831, 2830), i_cyl1->GetH());
     const Vec& c2 = i_cyl2->GetC();
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2833, 2832, 2832, 2832), c2.x);
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2834, 2833, 2833, 2833), c2.y);
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2835, 2834, 2834, 2834), c2.z);
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2836, 2835, 2835, 2835), i_cyl2->GetR());
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2837, 2836, 2836, 2836), i_cyl2->GetH());
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2833, 2832), c2.x);
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2834, 2833), c2.y);
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2835, 2834), c2.z);
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2836, 2835), i_cyl2->GetR());
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2837, 2836), i_cyl2->GetH());
     
     f32 delta_x = c1.x - c2.x;
     f32 delta_z = c1.z - c2.z;
@@ -1573,18 +1573,18 @@ bool cM3d_Cross_CylCyl(const cM3dGCyl* i_cyl1, const cM3dGCyl* i_cyl2, f32* i_pc
     
     if (dist_sq > radius_sum * radius_sum) {
         *i_pcross_len = 0.0f;
-        CHECK_FLOAT_CLASS(VERSION_SELECT(2850, 2849, 2849, 2849), *i_pcross_len);
+        CHECK_FLOAT_CLASS(DEMO_SELECT(2850, 2849), *i_pcross_len);
         return false;
     }
 
     if (c1.y + i_cyl1->GetH() < c2.y || c1.y > c2.y + i_cyl2->GetH()) {
         *i_pcross_len = 0.0f;
-        CHECK_FLOAT_CLASS(VERSION_SELECT(2858, 2857, 2857, 2857), *i_pcross_len);
+        CHECK_FLOAT_CLASS(DEMO_SELECT(2858, 2857), *i_pcross_len);
         return false;
     }
 
     *i_pcross_len = radius_sum - std::sqrtf(dist_sq);
-    CHECK_FLOAT_CLASS(VERSION_SELECT(2865, 2864, 2864, 2864), *i_pcross_len);
+    CHECK_FLOAT_CLASS(DEMO_SELECT(2865, 2864), *i_pcross_len);
     return true;
 }
 
diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp
index 6e0019bf4..9f533eb36 100644
--- a/src/c/c_dylink.cpp
+++ b/src/c/c_dylink.cpp
@@ -482,8 +482,8 @@ BOOL cCc_Init() {
         if (d.name == NULL)
             continue;
 
-        JUT_ASSERT(VERSION_SELECT(47, 57, 57, 57), d.mKey < ARRAY_SIZE(DMC));
-        JUT_ASSERT(VERSION_SELECT(48, 58, 58, 58), DMC[d.mKey] == NULL);
+        JUT_ASSERT(DEMO_SELECT(47, 57), d.mKey < ARRAY_SIZE(DMC));
+        JUT_ASSERT(DEMO_SELECT(48, 58), DMC[d.mKey] == NULL);
 
         for (int j = 0; j < ARRAY_SIZE(DMC); j++) {
             if (DMC[j] != NULL) {
@@ -516,7 +516,7 @@ BOOL cCc_Init() {
 
 /* 800229E0-80022A80       .text cDyl_IsLinked__Fs */
 BOOL cDyl_IsLinked(s16 i_ProfName) {
-    JUT_ASSERT(VERSION_SELECT(134, 174, 174, 174), cDyl_Initialized);
+    JUT_ASSERT(DEMO_SELECT(134, 174), cDyl_Initialized);
 
     if (DMC[i_ProfName] != NULL)
         return DMC[i_ProfName]->isLinked();
@@ -526,8 +526,8 @@ BOOL cDyl_IsLinked(s16 i_ProfName) {
 
 /* 80022A80-80022B58       .text cDyl_Unlink__Fs */
 BOOL cDyl_Unlink(s16 i_ProfName) {
-    JUT_ASSERT(VERSION_SELECT(154, 197, 197, 197), cDyl_Initialized);
-    JUT_ASSERT(VERSION_SELECT(155, 198, 198, 198), i_ProfName < ARRAY_SIZE(DMC));
+    JUT_ASSERT(DEMO_SELECT(154, 197), cDyl_Initialized);
+    JUT_ASSERT(DEMO_SELECT(155, 198), i_ProfName < ARRAY_SIZE(DMC));
 
     if (DMC[i_ProfName] != NULL)
         return DMC[i_ProfName]->unlink();
@@ -578,7 +578,7 @@ cPhs_State cDyl_LinkASync(s16 i_ProfName) {
         return cPhs_ERROR_e;
     }
 
-    JUT_ASSERT(VERSION_SELECT(208, 273, 273, 273), i_ProfName < ARRAY_SIZE(DMC));
+    JUT_ASSERT(DEMO_SELECT(208, 273), i_ProfName < ARRAY_SIZE(DMC));
     DynamicModuleControlBase * d = DMC[i_ProfName];
     if (d != NULL) {
 #if VERSION != VERSION_DEMO
@@ -603,7 +603,7 @@ cPhs_State cDyl_LinkASync(s16 i_ProfName) {
 
 /* 80022CEC-80022DF8       .text cDyl_InitCallback__FPv */
 BOOL cDyl_InitCallback(void*) {
-    JUT_ASSERT(VERSION_SELECT(230, 303, 303, 303), !cDyl_Initialized);
+    JUT_ASSERT(DEMO_SELECT(230, 303), !cDyl_Initialized);
     JKRFileCache* loader = JKRMountDvdDrive("/", mDoExt_getArchiveHeap(), NULL);
     DynamicModuleControl::initialize();
 
@@ -627,7 +627,7 @@ void cDyl_InitAsync() {
     cCc_Init();
 #endif
 
-    JUT_ASSERT(VERSION_SELECT(252, 325, 325, 325), cDyl_DVD == NULL);
+    JUT_ASSERT(DEMO_SELECT(252, 325), cDyl_DVD == NULL);
     cDyl_DVD = mDoDvdThd_callback_c::create((mDoDvdThd_callback_func) cDyl_InitCallback, NULL);
 }
 
@@ -677,7 +677,7 @@ cPhs_State cDylPhs::Link(request_of_phase_process_class* i_phase, s16 profName)
 
 /* 80022F68-80023004       .text Unlink__7cDylPhsFP30request_of_phase_process_classs */
 BOOL cDylPhs::Unlink(request_of_phase_process_class* i_phase, s16 profName) {
-    JUT_ASSERT(VERSION_SELECT(357, 422, 422, 422), i_phase->id != 1);
+    JUT_ASSERT(DEMO_SELECT(357, 422), i_phase->id != 1);
 
     BOOL ret;
     if (i_phase->id == 2) {
diff --git a/src/d/actor/d_a_acorn_leaf.cpp b/src/d/actor/d_a_acorn_leaf.cpp
index dd65281ea..d381c18e8 100644
--- a/src/d/actor/d_a_acorn_leaf.cpp
+++ b/src/d/actor/d_a_acorn_leaf.cpp
@@ -66,7 +66,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_actor) {
 /* 0000010C-00000258       .text CreateHeap__9daAleaf_cFv */
 BOOL daAleaf_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(daAleaf_c::m_arcname, VIGAH_BDL_VIGAH);
-    JUT_ASSERT(VERSION_SELECT(258, 262, 262, 262), modelData != NULL);
+    JUT_ASSERT(DEMO_SELECT(258, 262), modelData != NULL);
 
     unk_298 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
     if (unk_298 == NULL) {
@@ -74,7 +74,7 @@ BOOL daAleaf_c::CreateHeap() {
     }
 
     J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(daAleaf_c::m_arcname, VIGAH_BCK_VIGAH);
-    JUT_ASSERT(VERSION_SELECT(273, 277, 277, 277), pbck != NULL);
+    JUT_ASSERT(DEMO_SELECT(273, 277), pbck != NULL);
 
     if (!unk_408.init(modelData, pbck, 1, 1, 1.0f, 0, -1, 0)) {
         return FALSE;
diff --git a/src/d/actor/d_a_amiprop.cpp b/src/d/actor/d_a_amiprop.cpp
index 84e087247..257a2fdf0 100644
--- a/src/d/actor/d_a_amiprop.cpp
+++ b/src/d/actor/d_a_amiprop.cpp
@@ -76,7 +76,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
 /* 000000F4-00000244       .text CreateHeap__11daAmiProp_cFv */
 BOOL daAmiProp_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(daAmiProp_c::m_arcname, HAMI1_BDL_HAMI1);
-    JUT_ASSERT(VERSION_SELECT(250, 255, 255, 255), modelData != NULL);
+    JUT_ASSERT(DEMO_SELECT(250, 255), modelData != NULL);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
     if (mpModel == NULL) {
diff --git a/src/d/actor/d_a_bb.cpp b/src/d/actor/d_a_bb.cpp
index 362b308a5..51414df80 100644
--- a/src/d/actor/d_a_bb.cpp
+++ b/src/d/actor/d_a_bb.cpp
@@ -744,7 +744,7 @@ void bb_path_move(bb_class* i_this) {
 
                 if (i_this->ppd->m_nextID + 0 != 0xFFFF) {
                     i_this->ppd = dPath_GetRoomPath(i_this->ppd->m_nextID, fopAcM_GetRoomNo(a_this));
-                    JUT_ASSERT(VERSION_SELECT(1476, 1479, 1479, 1479), i_this->ppd != NULL);
+                    JUT_ASSERT(DEMO_SELECT(1476, 1479), i_this->ppd != NULL);
                 }
             } else if (i_this->unk_35E < 0) {
                 i_this->unk_35F = 1;
@@ -2525,7 +2525,7 @@ static BOOL useHeapInit(fopAc_ac_c* ac) {
     }
 
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Bb", BB_BDL_BB_TAIL));
-    JUT_ASSERT(VERSION_SELECT(4508, 4535, 4535, 4535), modelData != NULL);
+    JUT_ASSERT(DEMO_SELECT(4508, 4535), modelData != NULL);
     
     for (s32 i = 0; i < 9; i++) {
         i_this->unk_A84[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x33221202);
@@ -2535,7 +2535,7 @@ static BOOL useHeapInit(fopAc_ac_c* ac) {
     }
 
     J3DAnmTexPattern* btp = static_cast<J3DAnmTexPattern*>(dComIfG_getObjectRes("Bb", bb_tex_anm_idx[4]));
-    JUT_ASSERT(VERSION_SELECT(4529, 4556, 4556, 4556), btp);
+    JUT_ASSERT(DEMO_SELECT(4529, 4556), btp);
 
     s32 ret = i_this->mBtpAnm.init(i_this->mpMorf->getModel()->getModelData(), btp, 0, 2, 1.0f, 0, -1, false, 0);
     if (ret == 0) {
diff --git a/src/d/actor/d_a_bridge.cpp b/src/d/actor/d_a_bridge.cpp
index a5a9e0038..dcefde997 100644
--- a/src/d/actor/d_a_bridge.cpp
+++ b/src/d/actor/d_a_bridge.cpp
@@ -1315,12 +1315,12 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* a_this) {
     }
 
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Bridge", bridge_bmd[modelNum]);
-    JUT_ASSERT(VERSION_SELECT(2334, 2336, 2336, 2336), modelData != NULL);
+    JUT_ASSERT(DEMO_SELECT(2334, 2336), modelData != NULL);
 
     J3DModelData* modelData2;
     if (modelNum == 1) {
         modelData2 = (J3DModelData*)dComIfG_getObjectRes("Bridge", BRIDGE_BDL_OBM_CHAIN1);
-        JUT_ASSERT(VERSION_SELECT(2340, 2342, 2342, 2342), modelData2 != NULL);
+        JUT_ASSERT(DEMO_SELECT(2340, 2342), modelData2 != NULL);
     }
 
     br_s* pBr = i_this->mBr;
diff --git a/src/d/actor/d_a_demo00.cpp b/src/d/actor/d_a_demo00.cpp
index 3e6e9f84c..dded7d4e4 100644
--- a/src/d/actor/d_a_demo00.cpp
+++ b/src/d/actor/d_a_demo00.cpp
@@ -290,7 +290,7 @@ BOOL daDemo00_c::execute() {
                 if (!spCC.isEnd() && spCC.isValid()) {
                     TValueIterator_raw<u8> it = spCC.begin();
                     int argID = *it;
-                    JUT_ASSERT(VERSION_SELECT(771, 832, 832, 832), argID < (sizeof(l_eventBit)/sizeof(u16)));
+                    JUT_ASSERT(DEMO_SELECT(771, 832), argID < (sizeof(l_eventBit)/sizeof(u16)));
                     if (l_eventBit[argID] != 0xFFFF) {
                         dComIfGs_onEventBit(l_eventBit[argID]);
                     }
@@ -313,7 +313,7 @@ BOOL daDemo00_c::execute() {
                 if (!spB8.isEnd() && spB8.isValid()) {
                     TValueIterator_raw<u8> it = spB8.begin();
                     int argID = *it;
-                    JUT_ASSERT(VERSION_SELECT(797, 858, 858, 858), argID < (sizeof(l_itemNo)/sizeof(u8)));
+                    JUT_ASSERT(DEMO_SELECT(797, 858), argID < (sizeof(l_itemNo)/sizeof(u8)));
                     if (l_itemNo[argID] != dItem_NONE_e) {
                         execItemGet(l_itemNo[argID]);
                     }
diff --git a/src/d/actor/d_a_dk.cpp b/src/d/actor/d_a_dk.cpp
index 6d9489030..243597b2f 100644
--- a/src/d/actor/d_a_dk.cpp
+++ b/src/d/actor/d_a_dk.cpp
@@ -350,7 +350,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
 #endif
 
     modelData = (J3DModelData*) dComIfG_getObjectIDRes("Dk", DK_BDL_DK_TAIL);
-    JUT_ASSERT(VERSION_SELECT(817, 819, 819, 819), modelData != NULL);
+    JUT_ASSERT(DEMO_SELECT(817, 819), modelData != NULL);
 
     for (s32 i = 0; i < 4; i++) {
         for (s32 j = 0; j < 9; j++) {
diff --git a/src/d/actor/d_a_door10.cpp b/src/d/actor/d_a_door10.cpp
index cf17eeca7..aa5c3dbb3 100644
--- a/src/d/actor/d_a_door10.cpp
+++ b/src/d/actor/d_a_door10.cpp
@@ -275,7 +275,7 @@ BOOL daDoor10_c::CreateHeap() {
         modelData = (J3DModelData*)dComIfG_getStageRes("Stage", getBdlName());
     }
 
-    JUT_ASSERT(VERSION_SELECT(354, 356, 356, 356), modelData);
+    JUT_ASSERT(DEMO_SELECT(354, 356), modelData);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
     if (mpModel == NULL) {
@@ -425,7 +425,7 @@ void daDoor10_c::openEnd() {
 void daDoor10_c::closeInit() {
     onFlag(2);
     bool rt = dComIfG_Bgsp()->Regist(mpBgW, this);
-    JUT_ASSERT(VERSION_SELECT(539, 541, 541, 541), !rt);
+    JUT_ASSERT(DEMO_SELECT(539, 541), !rt);
     dComIfGp_map_clrAGBMapSendStopFlg();
     fopAcM_seStart(this, JA_SE_OBJ_STN_DOOR_MOVE_D, 0);
 }
@@ -463,7 +463,7 @@ void daDoor10_c::calcMtx() {
 /* 000010FC-0000125C       .text CreateInit__10daDoor10_cFv */
 BOOL daDoor10_c::CreateInit() {
     if (dComIfG_Bgsp()->Regist(mpBgW, this)) {
-        JUT_ASSERT(VERSION_SELECT(605, 607, 607, 607), NULL);
+        JUT_ASSERT(DEMO_SELECT(605, 607), NULL);
     }
 
     tevStr.mRoomNo = current.roomNo;
@@ -823,7 +823,7 @@ BOOL daDoor10_c::execute() {
             break;
 
         default:
-            JUT_ASSERT(VERSION_SELECT(1028, 1032, 1032, 1032), NULL);
+            JUT_ASSERT(DEMO_SELECT(1028, 1032), NULL);
             break;
     }
 
diff --git a/src/d/actor/d_a_dr2.cpp b/src/d/actor/d_a_dr2.cpp
index 061c6ef5a..05dca7b2e 100644
--- a/src/d/actor/d_a_dr2.cpp
+++ b/src/d/actor/d_a_dr2.cpp
@@ -664,7 +664,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
     i_this->mpMorf1->getModel()->setUserArea((u32)i_this);
 
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BDL_IWA00);
-    JUT_ASSERT(VERSION_SELECT(1347, 1361, 1361, 1361), modelData != NULL);
+    JUT_ASSERT(DEMO_SELECT(1347, 1361), modelData != NULL);
 
     i_this->unk_418 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
     if (i_this->unk_418 == NULL) {
@@ -672,7 +672,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
     }
 
     modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BMD_GAN_MAGMA);
-    JUT_ASSERT(VERSION_SELECT(1356, 1370, 1370, 1370), modelData != NULL);
+    JUT_ASSERT(DEMO_SELECT(1356, 1370), modelData != NULL);
 
     i_this->unk_41C = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
     if (i_this->unk_41C == NULL) {
@@ -711,7 +711,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
     }
 
     modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BMD_MBYO1);
-    JUT_ASSERT(VERSION_SELECT(1405, 1429, 1429, 1429), modelData != NULL);
+    JUT_ASSERT(DEMO_SELECT(1405, 1429), modelData != NULL);
 
     i_this->unk_428 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
     if (i_this->unk_428 == NULL) {
@@ -719,7 +719,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
     }
 
     modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BMD_MBYO2);
-    JUT_ASSERT(VERSION_SELECT(1412, 1436, 1436, 1436), modelData != NULL);
+    JUT_ASSERT(DEMO_SELECT(1412, 1436), modelData != NULL);
 
     i_this->unk_42C = mDoExt_J3DModel__create(modelData,0,0x11020203);
     if (i_this->unk_42C == NULL) {
diff --git a/src/d/actor/d_a_ep.cpp b/src/d/actor/d_a_ep.cpp
index 8de36b1a4..da8c98b0e 100644
--- a/src/d/actor/d_a_ep.cpp
+++ b/src/d/actor/d_a_ep.cpp
@@ -514,7 +514,7 @@ static BOOL daEp_CreateHeap(fopAc_ac_c* a_this) {
     } else {
         modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Ep", EP_BDL_OBM_SHOKUDAI1));
     }
-    JUT_ASSERT(VERSION_SELECT(996, 997, 997, 997), modelData != NULL);
+    JUT_ASSERT(DEMO_SELECT(996, 997), modelData != NULL);
 
 #if VERSION == VERSION_DEMO
     i_this->mpModel = mDoExt_J3DModel__create(modelData, 0x0, 0x11020203);
@@ -527,7 +527,7 @@ static BOOL daEp_CreateHeap(fopAc_ac_c* a_this) {
 
     if (i_this->mbHasGa != 0) {
         modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Ep", EP_BDL_EP_GA));
-        JUT_ASSERT(VERSION_SELECT(1007, 1010, 1010, 1010), modelData != NULL);
+        JUT_ASSERT(DEMO_SELECT(1007, 1010), modelData != NULL);
         
         for (s32 i = 0; i < 2; i++) {
 #if VERSION == VERSION_DEMO
diff --git a/src/d/actor/d_a_fallrock.cpp b/src/d/actor/d_a_fallrock.cpp
index 4f92ea48a..a2d3f01b1 100644
--- a/src/d/actor/d_a_fallrock.cpp
+++ b/src/d/actor/d_a_fallrock.cpp
@@ -56,7 +56,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
 /* 00000098-00000140       .text CreateHeap__12daFallRock_cFv */
 BOOL daFallRock_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(m_arcname, ALWAYS_BDL_KROCK_00);
-    JUT_ASSERT(VERSION_SELECT(159, 161, 161, 161), modelData != NULL);
+    JUT_ASSERT(DEMO_SELECT(159, 161), modelData != NULL);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000,0x11020002);
     return TRUE;
diff --git a/src/d/actor/d_a_ff.cpp b/src/d/actor/d_a_ff.cpp
index e01607217..b5f81b88a 100644
--- a/src/d/actor/d_a_ff.cpp
+++ b/src/d/actor/d_a_ff.cpp
@@ -257,7 +257,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
 
     for (int i = 0; i < 2; i++) {
         J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Ff", ho_bmd[i]);
-        JUT_ASSERT(VERSION_SELECT(717, 719, 719, 719), modelData != NULL);
+        JUT_ASSERT(DEMO_SELECT(717, 719), modelData != NULL);
 #if VERSION > VERSION_DEMO
         if (modelData == NULL) {
             return FALSE;
diff --git a/src/d/actor/d_a_ghostship.cpp b/src/d/actor/d_a_ghostship.cpp
index 08a4684d8..2362fdfbc 100644
--- a/src/d/actor/d_a_ghostship.cpp
+++ b/src/d/actor/d_a_ghostship.cpp
@@ -35,7 +35,7 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) {
 /* 00000118-0000032C .text _createHeap__13daGhostship_cFv */
 BOOL daGhostship_c::_createHeap() {
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arc_name, AYUSH_BDL_AYUSH));
-    JUT_ASSERT(VERSION_SELECT(80, 88, 88, 88), modelData != NULL);
+    JUT_ASSERT(DEMO_SELECT(80, 88), modelData != NULL);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
     if(!mpModel) {
@@ -43,7 +43,7 @@ BOOL daGhostship_c::_createHeap() {
     }
 
     J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(m_arc_name, AYUSH_BTK_AYUSH));
-    JUT_ASSERT(VERSION_SELECT(87, 95, 95, 95), btk != NULL);
+    JUT_ASSERT(DEMO_SELECT(87, 95), btk != NULL);
 
     if(!mBtk.init(modelData, btk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0)) {
         return false;
@@ -369,7 +369,7 @@ bool daGhostship_c::_execute() {
         ) {
             mDoAud_seStart(JA_SE_LK_WARP_TO_G_SHIP);
             stage_scls_info_class* scls_data = dComIfGd_getMeshSceneList(current.pos);
-            JUT_ASSERT(VERSION_SELECT(457, 463, 463, 463), scls_data != NULL)
+            JUT_ASSERT(DEMO_SELECT(457, 463), scls_data != NULL)
 
             u8 startCode = scls_data->mStart;
             dComIfGs_setEventReg(0xC3FF, scls_data->mRoom);
diff --git a/src/d/actor/d_a_msw.cpp b/src/d/actor/d_a_msw.cpp
index b9f4306fc..cc27988d7 100644
--- a/src/d/actor/d_a_msw.cpp
+++ b/src/d/actor/d_a_msw.cpp
@@ -219,7 +219,7 @@ BOOL daMsw_CreateInit(fopAc_ac_c* i_this) {
     }
 
     modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Msw", MSW_BDL_OBM_CHAIN1));
-    JUT_ASSERT(VERSION_SELECT(519, 523, 523, 523), modelData != NULL);
+    JUT_ASSERT(DEMO_SELECT(519, 523), modelData != NULL);
 
     for (int chainIdx = 0; chainIdx < 4; chainIdx++) {
         pActor->mpChainModels[chainIdx] = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
diff --git a/src/d/actor/d_a_nh.cpp b/src/d/actor/d_a_nh.cpp
index 04f8a6ec5..ac33a8c12 100644
--- a/src/d/actor/d_a_nh.cpp
+++ b/src/d/actor/d_a_nh.cpp
@@ -112,7 +112,7 @@ void daNh_c::setBaseMtx() {
 /* 800F9980-800F9A54       .text createHeap__6daNh_cFv */
 BOOL daNh_c::createHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_NH);
-    JUT_ASSERT(VERSION_SELECT(357, 359, 359, 359), modelData != NULL);
+    JUT_ASSERT(DEMO_SELECT(357, 359), modelData != NULL);
     
     mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
     if (!mpModel) {
@@ -438,7 +438,7 @@ BOOL daNh_c::initBrkAnm(bool i_modify) {
     bool success = false;
     
     J3DAnmTevRegKey* a_brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Always", ALWAYS_BRK_TNH);
-    JUT_ASSERT(VERSION_SELECT(881, 883, 883, 883), a_brk != NULL);
+    JUT_ASSERT(DEMO_SELECT(881, 883), a_brk != NULL);
     
     if (mBrkAnm.init(modelData, a_brk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, i_modify, false)) {
         success = true;
diff --git a/src/d/actor/d_a_npc_km1.cpp b/src/d/actor/d_a_npc_km1.cpp
index f97f7dda5..703110aac 100644
--- a/src/d/actor/d_a_npc_km1.cpp
+++ b/src/d/actor/d_a_npc_km1.cpp
@@ -724,7 +724,7 @@ BOOL daNpc_Km1_c::CreateHeap() {
 
  
     a_mdl_data = (J3DModelData*)dComIfG_getObjectIDRes("Km",KM_BDL_KM);
-    JUT_ASSERT(VERSION_SELECT(1316, 1325, 1325, 1325) ,a_mdl_data != NULL);
+    JUT_ASSERT(DEMO_SELECT(1316, 1325) ,a_mdl_data != NULL);
     mpMorf = new mDoExt_McaMorf(
         a_mdl_data,
         NULL, NULL,
@@ -735,9 +735,9 @@ BOOL daNpc_Km1_c::CreateHeap() {
     if (mpMorf){
         if(mpMorf->getModel()) {
             m_head_jnt_num = a_mdl_data->getJointName()->getIndex("head");
-            JUT_ASSERT(VERSION_SELECT(1335, 1344, 1344, 1344), m_head_jnt_num >= 0);
+            JUT_ASSERT(DEMO_SELECT(1335, 1344), m_head_jnt_num >= 0);
             m_backbone_jnt_num = a_mdl_data->getJointName()->getIndex("backbone");
-            JUT_ASSERT(VERSION_SELECT(1337, 1346, 1346, 1346), m_backbone_jnt_num >= 0);
+            JUT_ASSERT(DEMO_SELECT(1337, 1346), m_backbone_jnt_num >= 0);
             field_0x7CD = a_tex_pattern_num_tbl[field_0x7D3];
             if (initTexPatternAnm(false) != 0) {
                 field_0x6D4 = mDoExt_J3DModel__create(a_mdl_data,0x20000,0x11020203);
diff --git a/src/d/actor/d_a_obj_Ygush00.cpp b/src/d/actor/d_a_obj_Ygush00.cpp
index 8bd9e5179..9bdf14512 100644
--- a/src/d/actor/d_a_obj_Ygush00.cpp
+++ b/src/d/actor/d_a_obj_Ygush00.cpp
@@ -53,7 +53,7 @@ bool daObjYgush00_c::create_heap() {
     J3DAnmTransform * pBck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(l_arcname, bck_table[mType]));
 
     if (!pModelData || !pBtk || !pBck) {
-        JUT_ASSERT(VERSION_SELECT(203, 207, 207, 207), FALSE);
+        JUT_ASSERT(DEMO_SELECT(203, 207), FALSE);
         ret = false;
     } else {
         mpModel = mDoExt_J3DModel__create(pModelData, 0x80000, 0x11000222);
diff --git a/src/d/actor/d_a_obj_dragonhead.cpp b/src/d/actor/d_a_obj_dragonhead.cpp
index a36db003d..7badce575 100644
--- a/src/d/actor/d_a_obj_dragonhead.cpp
+++ b/src/d/actor/d_a_obj_dragonhead.cpp
@@ -56,7 +56,7 @@ namespace daObjDragonhead_prm {
 /* 00000098-00000228       .text CreateHeap__17daObjDragonhead_cFv */
 BOOL daObjDragonhead_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)(dComIfG_getObjectRes("Qdghd", QDGHD_BDL_QDGHD));
-    JUT_ASSERT(VERSION_SELECT(158, 160, 160, 160), model_data != NULL);
+    JUT_ASSERT(DEMO_SELECT(158, 160), model_data != NULL);
     mpModel = mDoExt_J3DModel__create(model_data, 0x00, 0x11020203);
     if (!mpModel)
         return FALSE;
@@ -117,7 +117,7 @@ cPhs_State daObjDragonhead_c::_create() {
     cPhs_State ret = dComIfG_resLoad(&mPhs, "Qdghd");
 
     if (ret == cPhs_COMPLEATE_e) {
-        if (fopAcM_entrySolidHeap(this, CheckCreateHeap, VERSION_SELECT(0x300, 0x10500, 0x10500, 0x10500)) == 0) {
+        if (fopAcM_entrySolidHeap(this, CheckCreateHeap, DEMO_SELECT(0x300, 0x10500)) == 0) {
             ret = cPhs_ERROR_e;
         } else {
             CreateInit();
diff --git a/src/d/actor/d_a_obj_figure.cpp b/src/d/actor/d_a_obj_figure.cpp
index ed1a1d50d..2733a6da7 100644
--- a/src/d/actor/d_a_obj_figure.cpp
+++ b/src/d/actor/d_a_obj_figure.cpp
@@ -1088,14 +1088,14 @@ void linkDraw(mDoExt_McaMorf* pMorf) {
             if (mtl->getZMode()->getCompareEnable() == 0) {
                 if ((u8)mtl->getBlend()->getType() == GX_BM_BLEND) {
                     ZOffBlendShape[zoff_blend_cnt++] = mtl->getShape();
-                    JUT_ASSERT(VERSION_SELECT(1713, 1767, 1767, 1767), zoff_blend_cnt <= 4);
+                    JUT_ASSERT(DEMO_SELECT(1713, 1767), zoff_blend_cnt <= 4);
                 } else {
                     ZOffNoneShape[zoff_none_cnt++] = mtl->getShape();
-                    JUT_ASSERT(VERSION_SELECT(1717, 1770, 1770, 1770), zoff_none_cnt <= 4);
+                    JUT_ASSERT(DEMO_SELECT(1717, 1770), zoff_none_cnt <= 4);
                 }
             } else {
                 ZOnShape[zon_cnt++] = mtl->getShape();
-                JUT_ASSERT(VERSION_SELECT(1722, 1774, 1774, 1774), zon_cnt <= 4);
+                JUT_ASSERT(DEMO_SELECT(1722, 1774), zon_cnt <= 4);
             }
             mtl = mtl->getNext();
         }
diff --git a/src/d/actor/d_a_obj_hami3.cpp b/src/d/actor/d_a_obj_hami3.cpp
index ff253b209..499cccaab 100644
--- a/src/d/actor/d_a_obj_hami3.cpp
+++ b/src/d/actor/d_a_obj_hami3.cpp
@@ -39,7 +39,7 @@ static BOOL nodeCallBack(J3DNode *node, int calcTiming) {
 /* 0000012C-0000026C       .text CreateHeap__Q210daObjHami35Act_cFv */
 BOOL daObjHami3::Act_c::CreateHeap() {
     J3DModelData *modelData = (J3DModelData *)dComIfG_getObjectRes(M_arcname, HAMI3_BDL_HAMI3);
-    JUT_ASSERT(VERSION_SELECT(112, 113, 113, 113), modelData != NULL);
+    JUT_ASSERT(DEMO_SELECT(112, 113), modelData != NULL);
 
     field_0x2D4 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
     if (field_0x2D4 != NULL) {
@@ -86,7 +86,7 @@ cPhs_State daObjHami3::Act_c::Mthd_Create() {
     if (phase_state == cPhs_COMPLEATE_e) {
         phase_state = MoveBGCreate(M_arcname, HAMI3_DZB_HAMI3, dBgS_MoveBGProc_Typical, 0x1fc0);
 
-        JUT_ASSERT(VERSION_SELECT(182, 183, 183, 183),
+        JUT_ASSERT(DEMO_SELECT(182, 183),
                    (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e));
     }
     return phase_state;
diff --git a/src/d/actor/d_a_obj_hfuck1.cpp b/src/d/actor/d_a_obj_hfuck1.cpp
index b7d847ad3..a2ea16975 100644
--- a/src/d/actor/d_a_obj_hfuck1.cpp
+++ b/src/d/actor/d_a_obj_hfuck1.cpp
@@ -87,7 +87,7 @@ bool daObjHfuck1_c::create_heap() {
     J3DModelData* pModelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcname, HFUCK1_BDL_HFUCK1));
 
     if (!pModelData) {
-        JUT_ASSERT(VERSION_SELECT(241, 245, 245, 245), FALSE);
+        JUT_ASSERT(DEMO_SELECT(241, 245), FALSE);
         ret = false;
     } else {
         mpModel = mDoExt_J3DModel__create(pModelData, 0x80000, 0x11000022);
diff --git a/src/d/actor/d_a_obj_hha.cpp b/src/d/actor/d_a_obj_hha.cpp
index d80ca3e47..2d30c94cf 100644
--- a/src/d/actor/d_a_obj_hha.cpp
+++ b/src/d/actor/d_a_obj_hha.cpp
@@ -106,7 +106,7 @@ BOOL daObjHhaPart_c::set_mdl_area(const char* arcname, int index) {
     BOOL ret;
     ret = FALSE;
     mdl_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(arcname, index));
-    JUT_ASSERT(VERSION_SELECT(410, 473, 473, 473), mdl_data != NULL);
+    JUT_ASSERT(DEMO_SELECT(410, 473), mdl_data != NULL);
     if(mdl_data != NULL){
         mpModel = mDoExt_J3DModel__create(mdl_data, 0, 0x11020203); 
         ret = TRUE;
@@ -204,19 +204,19 @@ BOOL daObjHhaYgush_c::create_area(const char* arcname) {
     BOOL ret = FALSE;
 
     J3DModelData* mdl_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(arcname, HHA_BDL_YGSTP00));
-    JUT_ASSERT(VERSION_SELECT(577, 640, 640, 640), mdl_data != NULL);
+    JUT_ASSERT(DEMO_SELECT(577, 640), mdl_data != NULL);
     
     if(mdl_data != NULL){
         M_mdl = mDoExt_J3DModel__create(mdl_data, 0x80000, 0x11000222);
-        JUT_ASSERT(VERSION_SELECT(586, 649, 649, 649), M_mdl != NULL);
+        JUT_ASSERT(DEMO_SELECT(586, 649), M_mdl != NULL);
 
         if(M_mdl != NULL){
             J3DAnmTextureSRTKey* btk_data = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(arcname, HHA_BTK_YGSTP00));
-            JUT_ASSERT(VERSION_SELECT(593, 656, 656, 656), btk_data != NULL);
+            JUT_ASSERT(DEMO_SELECT(593, 656), btk_data != NULL);
             
             if(mBtk.init(M_mdl->getModelData(), btk_data, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, false) != false){  
                 J3DAnmTransform* bck_data = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(arcname, HHA_BCK_YGSTP00));
-                JUT_ASSERT(VERSION_SELECT(598, 661, 661, 661), bck_data != NULL);
+                JUT_ASSERT(DEMO_SELECT(598, 661), bck_data != NULL);
                 
                 if(mBck.init(M_mdl->getModelData(), bck_data, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false) != false){
                     ret = TRUE;
diff --git a/src/d/actor/d_a_obj_homen.cpp b/src/d/actor/d_a_obj_homen.cpp
index 7e3e5e32f..5d3a6d47a 100644
--- a/src/d/actor/d_a_obj_homen.cpp
+++ b/src/d/actor/d_a_obj_homen.cpp
@@ -224,7 +224,7 @@ bool Act_c::create_heap() {
     };
     
     J3DModelData* mdl_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, bdl_idx[mType]);
-    JUT_ASSERT(VERSION_SELECT(578, 615, 615, 615), mdl_data != NULL);
+    JUT_ASSERT(DEMO_SELECT(578, 615), mdl_data != NULL);
 #if VERSION > VERSION_DEMO
     if (mdl_data != NULL)
 #endif
@@ -239,7 +239,7 @@ bool Act_c::create_heap() {
 #endif
     
     cBgD_t* bgw_data = (cBgD_t*)dComIfG_getObjectRes(M_arcname, dzb_idx[mType]);
-    JUT_ASSERT(VERSION_SELECT(590, 628, 628, 628), bgw_data != NULL);
+    JUT_ASSERT(DEMO_SELECT(590, 628), bgw_data != NULL);
 #if VERSION > VERSION_DEMO
     if (bgw_data != NULL)
 #endif
diff --git a/src/d/actor/d_a_obj_ladder.cpp b/src/d/actor/d_a_obj_ladder.cpp
index 6b4aa89f7..c2449f7bb 100644
--- a/src/d/actor/d_a_obj_ladder.cpp
+++ b/src/d/actor/d_a_obj_ladder.cpp
@@ -113,7 +113,7 @@ cPhs_State daObjLadder::Act_c::Mthd_Create() {
         mType = prm_get_type();
         phase_state = MoveBGCreate(
             M_arcname, attr_type(mType).dzbId, dBgS_MoveBGProc_Trans,
-            VERSION_SELECT(0x1700, 0x900, 0x900, 0x900)
+            DEMO_SELECT(0x1700, 0x900)
         );
 
         JUT_ASSERT(0x1DE, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e));
diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp
index a0256f9be..9da5a25d4 100644
--- a/src/d/actor/d_a_player_main.cpp
+++ b/src/d/actor/d_a_player_main.cpp
@@ -11878,16 +11878,16 @@ void daPy_lk_c::initTextureAnime() {
 /* 80123360-80123830       .text initTextureScroll__9daPy_lk_cFv */
 void daPy_lk_c::initTextureScroll() {
     m_tex_scroll_heap.m_buffer = new(0x20) u8[0x800];
-    JUT_ASSERT(VERSION_SELECT(20757, 20944, 20944, 20944), m_tex_scroll_heap.m_buffer != NULL);
+    JUT_ASSERT(DEMO_SELECT(20757, 20944), m_tex_scroll_heap.m_buffer != NULL);
     
     JKRReadIdxResource(m_tex_scroll_heap.m_buffer, 0x800, LKANM_BTK_TMABA, dComIfGp_getAnmArchive());
     J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(J3DAnmLoaderDataBase::load(m_tex_scroll_heap.m_buffer));
     btk->searchUpdateMaterialID(mpCLModelData);
     u16 material_num = btk->getUpdateMaterialNum();
-    JUT_ASSERT(VERSION_SELECT(20771, 20958, 20958, 20958), material_num == 2);
+    JUT_ASSERT(DEMO_SELECT(20771, 20958), material_num == 2);
     
     m_texMtxAnm = new J3DTexMtxAnm[material_num];
-    JUT_ASSERT(VERSION_SELECT(20774, 20961, 20961, 20961), m_texMtxAnm != NULL);
+    JUT_ASSERT(DEMO_SELECT(20774, 20961), m_texMtxAnm != NULL);
     
     for (u16 no = 0; no < material_num; no++) {
         u16 matID = btk->getUpdateMaterialID(no);
@@ -11896,7 +11896,7 @@ void daPy_lk_c::initTextureScroll() {
         }
         
         m_tex_eye_scroll[no] = new daPy_matAnm_c();
-        JUT_ASSERT(VERSION_SELECT(20785, 20972, 20972, 20972), m_tex_eye_scroll[no] != NULL);
+        JUT_ASSERT(DEMO_SELECT(20785, 20972), m_tex_eye_scroll[no] != NULL);
         
         mpCLModelData->getMaterialNodePointer(matID)->change();
         mpCLModelData->getMaterialNodePointer(matID)->setMaterialAnm(m_tex_eye_scroll[no]);
@@ -11910,7 +11910,7 @@ void daPy_lk_c::initTextureScroll() {
         J3DTexMtx* tmtx;
         if (mtl->getTexMtx(texMtxID) == NULL) {
             tmtx = new J3DTexMtx();
-            JUT_ASSERT(VERSION_SELECT(20797, 20984, 20984, 20984), tmtx != NULL);
+            JUT_ASSERT(DEMO_SELECT(20797, 20984), tmtx != NULL);
             mtl->setTexMtx(texMtxID, tmtx);
         }
         if (mtl->getTexCoord(texMtxID) != NULL) {
@@ -11927,7 +11927,7 @@ void daPy_lk_c::initTextureScroll() {
         tmtxinfo.mCenter.y = btk->getSRTCenter(no).y;
         tmtxinfo.mCenter.z = btk->getSRTCenter(no).z;
         
-        JUT_ASSERT(VERSION_SELECT(20814, 21001, 21001, 21001), mtl->getMaterialAnm() != NULL);
+        JUT_ASSERT(DEMO_SELECT(20814, 21001), mtl->getMaterialAnm() != NULL);
         
         mtl->getMaterialAnm()->setTexMtxAnm(texMtxID, &m_texMtxAnm[no]);
     }
diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp
index af2b8837c..c26d4e85a 100644
--- a/src/d/actor/d_a_rd.cpp
+++ b/src/d/actor/d_a_rd.cpp
@@ -199,7 +199,7 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) {
 /* 000006C0-0000096C       .text _createHeap__6daRd_cFv */
 BOOL daRd_c::_createHeap() {
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arc_name, RD_BDL_RD));
-    JUT_ASSERT(VERSION_SELECT(502, 504, 504, 504), modelData != NULL);
+    JUT_ASSERT(DEMO_SELECT(502, 504), modelData != NULL);
     
     mpMorf = new mDoExt_McaMorf(
         modelData,
@@ -220,7 +220,7 @@ BOOL daRd_c::_createHeap() {
     }
     
     J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(m_arc_name, RD_BTK_RD_CLOSE));
-    JUT_ASSERT(VERSION_SELECT(528, 525, 525, 525), btk != NULL);
+    JUT_ASSERT(DEMO_SELECT(528, 525), btk != NULL);
     if (!mBtkAnm.init(modelData, btk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) {
         return FALSE;
     }
@@ -228,7 +228,7 @@ BOOL daRd_c::_createHeap() {
     modelData->getJointNodePointer(0x0C)->setCallBack(nodeHeadControl_CB); // ree_atama_1
     
     J3DAnmTevRegKey* brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(m_arc_name, RD_BRK_NML));
-    JUT_ASSERT(VERSION_SELECT(553, 550, 550, 550), brk != NULL);
+    JUT_ASSERT(DEMO_SELECT(553, 550), brk != NULL);
     if (!mBrkAnm.init(modelData, brk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0)) {
         return FALSE;
     }
diff --git a/src/d/actor/d_a_ship.cpp b/src/d/actor/d_a_ship.cpp
index 93536ce65..f0da1c1c3 100644
--- a/src/d/actor/d_a_ship.cpp
+++ b/src/d/actor/d_a_ship.cpp
@@ -2183,7 +2183,7 @@ BOOL daShip_c::procZevDemo() {
                 fVar17 = local_70.absXZ();
 
                 if (!dComIfGp_evmng_getMyFloatP(mEvtStaffId, "rad")) {
-                    JUT_ASSERT(VERSION_SELECT(3722, 3741, 3741, 3741), 0);
+                    JUT_ASSERT(DEMO_SELECT(3722, 3741), 0);
                 }
 
                 fVar3 = *dComIfGp_evmng_getMyFloatP(mEvtStaffId, "rad");
@@ -4384,7 +4384,7 @@ BOOL daShip_c::createHeap() {
         m0392 = SHIP_BCK_FN_MAST_OFF2;
     }
     modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, SHIP_BDL_FN_BODY);
-    JUT_ASSERT(VERSION_SELECT(6969, 7004, 7004, 7004), modelData != NULL);
+    JUT_ASSERT(DEMO_SELECT(6969, 7004), modelData != NULL);
 
     mpBodyAnm = new mDoExt_McaMorf(
         modelData, NULL, NULL,
@@ -4409,7 +4409,7 @@ BOOL daShip_c::createHeap() {
     }
 
     modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, SHIP_BDL_VFNCN);
-    JUT_ASSERT(VERSION_SELECT(7006, 7041, 7041, 7041), modelData != NULL);
+    JUT_ASSERT(DEMO_SELECT(7006, 7041), modelData != NULL);
     mpCannonModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002);
     
     if (mpCannonModel == NULL) {
@@ -4417,7 +4417,7 @@ BOOL daShip_c::createHeap() {
     }
 
     modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, SHIP_BDL_VFNCR);
-    JUT_ASSERT(VERSION_SELECT(7019, 7054, 7054, 7054), modelData != NULL);
+    JUT_ASSERT(DEMO_SELECT(7019, 7054), modelData != NULL);
     mpSalvageArmModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002);
 
     if (mpSalvageArmModel == NULL) {
@@ -4425,7 +4425,7 @@ BOOL daShip_c::createHeap() {
     }
 
     modelData = (J3DModelData *)dComIfG_getObjectRes("Link", LINK_BDL_ROPEEND);
-    JUT_ASSERT(VERSION_SELECT(7032, 7067, 7067, 7067), modelData != NULL);
+    JUT_ASSERT(DEMO_SELECT(7032, 7067), modelData != NULL);
     mpLinkModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002);
 
     if (mpLinkModel == NULL) {
@@ -4433,7 +4433,7 @@ BOOL daShip_c::createHeap() {
     }
 
     modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, SHIP_BDL_FN_HEAD_H);
-    JUT_ASSERT(VERSION_SELECT(7045, 7080, 7080, 7080), modelData != NULL);
+    JUT_ASSERT(DEMO_SELECT(7045, 7080), modelData != NULL);
 
     m03B4 = SHIP_BCK_FN_LOOK_L;
 
diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp
index 10e5b5715..1664cd591 100644
--- a/src/d/actor/d_a_vrbox2.cpp
+++ b/src/d/actor/d_a_vrbox2.cpp
@@ -264,7 +264,7 @@ static BOOL daVrbox2_solidHeapCB(fopAc_ac_c* i_actor) {
     vrbox2_class* i_this = static_cast<vrbox2_class*>(i_actor);
 
     J3DModelData* modelData = (J3DModelData*)dComIfG_getStageRes("Stage", "vr_back_cloud.bdl");
-    JUT_ASSERT(VERSION_SELECT(511, 529, 529, 529), modelData != NULL);
+    JUT_ASSERT(DEMO_SELECT(511, 529), modelData != NULL);
     i_this->mpBackCloud = mDoExt_J3DModel__create(modelData, 0x80000, 0x11020202);
 
     modelData = (J3DModelData*)dComIfG_getStageRes("Stage", "vr_kasumi_mae.bdl");
diff --git a/src/d/actor/d_a_windmill.cpp b/src/d/actor/d_a_windmill.cpp
index 6ddad754f..393180956 100644
--- a/src/d/actor/d_a_windmill.cpp
+++ b/src/d/actor/d_a_windmill.cpp
@@ -140,7 +140,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_ac) {
 /* 00000108-000002A0       .text CreateHeap__12daWindMill_cFv */
 BOOL daWindMill_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(m_arcname[mType], m_bmdidx[mType]);
-    JUT_ASSERT(VERSION_SELECT(399, 405, 405, 405), modelData != NULL);
+    JUT_ASSERT(DEMO_SELECT(399, 405), modelData != NULL);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000,0x11000222);
     if (mpModel == NULL) {
diff --git a/src/d/d_door.cpp b/src/d/d_door.cpp
index 89e4827dd..d402ccc53 100644
--- a/src/d/d_door.cpp
+++ b/src/d/d_door.cpp
@@ -179,7 +179,7 @@ void dDoor_info_c::startDemoProc() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     mStaffId = dComIfGp_evmng_getMyStaffId("SHUTTER_DOOR");
     shape_angle.y = current.angle.y;
-    JUT_ASSERT(VERSION_SELECT(271, 274, 274, 274), player);
+    JUT_ASSERT(DEMO_SELECT(271, 274), player);
     s16 delta = player->home.angle.y - home.angle.y;
     if (delta < 0)
         delta = -delta;
@@ -469,7 +469,7 @@ BOOL dDoor_key2_c::keyProc() {
 /* 8006C650-8006C764       .text keyCreate_Nkey__12dDoor_key2_cFv */
 BOOL dDoor_key2_c::keyCreate_Nkey() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Key", KEY_BDL_VLOCN);
-    JUT_ASSERT(VERSION_SELECT(713, 716, 716, 716), modelData != NULL);
+    JUT_ASSERT(DEMO_SELECT(713, 716), modelData != NULL);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
     if (mpModel == NULL)
@@ -485,7 +485,7 @@ BOOL dDoor_key2_c::keyCreate_Nkey() {
 /* 8006C764-8006C910       .text keyCreate_Bkey__12dDoor_key2_cFv */
 BOOL dDoor_key2_c::keyCreate_Bkey() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Key", KEY_BDL_VLOCB);
-    JUT_ASSERT(VERSION_SELECT(737, 740, 740, 740), modelData != NULL);
+    JUT_ASSERT(DEMO_SELECT(737, 740), modelData != NULL);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
     if (mpModel == NULL)
@@ -503,7 +503,7 @@ BOOL dDoor_key2_c::keyCreate_Bkey() {
     case J3DErrType_OutOfMemory:
         return FALSE;
     default:
-        JUT_ASSERT(VERSION_SELECT(771, 774, 774, 774), FALSE);
+        JUT_ASSERT(DEMO_SELECT(771, 774), FALSE);
     case J3DErrType_Success:
         return TRUE;
     }
@@ -650,7 +650,7 @@ BOOL dDoor_msg_c::proc(cXyz* pos) {
             mState++;
         break;
     case 2:
-        JUT_ASSERT(VERSION_SELECT(951, 954, 954, 954), m_msg);
+        JUT_ASSERT(DEMO_SELECT(951, 954), m_msg);
         if (m_msg->mStatus == fopMsgStts_MSG_TYPING_e) {
             switch (mMsgId) {
             case 0x1BBD:
@@ -662,7 +662,7 @@ BOOL dDoor_msg_c::proc(cXyz* pos) {
         }
         break;
     case 3:
-        JUT_ASSERT(VERSION_SELECT(967, 970, 970, 970), m_msg);
+        JUT_ASSERT(DEMO_SELECT(967, 970), m_msg);
         if (m_msg->mStatus == fopMsgStts_MSG_DISPLAYED_e) {
             switch (mMsgId) {
             case 0x1BBD:
@@ -712,7 +712,7 @@ BOOL dDoor_hkyo_c::create() {
         return TRUE;
 
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Hkyo", HKYO_BDL_HKYO1);
-    JUT_ASSERT(VERSION_SELECT(1049, 1052, 1052, 1052), modelData != NULL);
+    JUT_ASSERT(DEMO_SELECT(1049, 1052), modelData != NULL);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000202);
     if (mpModel == NULL)
diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp
index 9647b1acc..46526dc1c 100644
--- a/src/d/d_event.cpp
+++ b/src/d/d_event.cpp
@@ -300,7 +300,7 @@ BOOL dEvt_control_c::demoCheck(dEvt_order_c* order) {
     s16 eventId = order->mEventId;
 
     if (actor2 == NULL) {
-        JUT_ASSERT(VERSION_SELECT(541, 543, 543, 543), FALSE);
+        JUT_ASSERT(DEMO_SELECT(541, 543), FALSE);
         return FALSE;
     }
 
@@ -348,7 +348,7 @@ BOOL dEvt_control_c::potentialCheck(dEvt_order_c* order) {
     fopAc_ac_c* actor1 = order->mActor1;
     fopAc_ac_c* actor2 = order->mActor2;
     if (actor1 == NULL || actor2 == NULL)
-        JUT_ASSERT(VERSION_SELECT(638, 640, 640, 640), FALSE);
+        JUT_ASSERT(DEMO_SELECT(638, 640), FALSE);
 
     if (!beforeFlagProc(order))
         return FALSE;
@@ -369,7 +369,7 @@ BOOL dEvt_control_c::doorCheck(dEvt_order_c* order) {
             mEventId = actor2->eventInfo.getEventId();
         if (mEventId != -1 && dComIfGp_getPEvtManager()->getEventData(mEventId) != NULL) {
             if (!dComIfGp_evmng_order(mEventId))
-                JUT_ASSERT(VERSION_SELECT(702, 704, 704, 704), FALSE);
+                JUT_ASSERT(DEMO_SELECT(702, 704), FALSE);
         } else {
             mEventId = -1;
             reset();
@@ -391,7 +391,7 @@ BOOL dEvt_control_c::itemCheck(dEvt_order_c* order) {
         mMode = dEvtMode_DEMO_e;
         mEventId = dComIfGp_evmng_getEventIdx(defaultEventName);
         if (!dComIfGp_evmng_order(mEventId))
-            JUT_ASSERT(VERSION_SELECT(744, 746, 746, 746), FALSE);
+            JUT_ASSERT(DEMO_SELECT(744, 746), FALSE);
         return TRUE;
     } else {
         return FALSE;
@@ -410,7 +410,7 @@ BOOL dEvt_control_c::endProc() {
     case dEvtMode_COMPULSORY_e:
         break;
     default:
-        JUT_ASSERT(VERSION_SELECT(787, 789, 789, 789), FALSE);
+        JUT_ASSERT(DEMO_SELECT(787, 789), FALSE);
     }
 
     mMode = dEvtMode_NONE_e;
@@ -518,7 +518,7 @@ BOOL dEvt_control_c::checkStart() {
             case dEvtType_CHANGE_e:
                 break;
             default:
-                JUT_ASSERT(VERSION_SELECT(922, 924, 924, 924), FALSE);
+                JUT_ASSERT(DEMO_SELECT(922, 924), FALSE);
                 break;
             }
 
diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp
index 19daa5186..fde1a55d2 100644
--- a/src/d/d_ky_thunder.cpp
+++ b/src/d/d_ky_thunder.cpp
@@ -114,7 +114,7 @@ cPhs_State dThunder_c::create() {
 
     new (this) dThunder_c();
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_YTHDR00);
-    JUT_ASSERT(VERSION_SELECT(111, 110, 110, 110), modelData != NULL);
+    JUT_ASSERT(DEMO_SELECT(111, 110), modelData != NULL);
 
     mModelInfo.mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x01000200);
     if (mModelInfo.mpModel == NULL)
@@ -124,12 +124,12 @@ cPhs_State dThunder_c::create() {
         return cPhs_ERROR_e;
 
     J3DAnmTextureSRTKey * anm = (J3DAnmTextureSRTKey *)dComIfG_getObjectRes("Always", ALWAYS_BTK_YTHDR00);
-    JUT_ASSERT(VERSION_SELECT(126, 125, 125, 125), anm != NULL);
+    JUT_ASSERT(DEMO_SELECT(126, 125), anm != NULL);
     if (!mModelInfo.mBtk.init(modelData, anm, false, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0))
         return cPhs_ERROR_e;
 
     J3DAnmTevRegKey * canm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Always", ALWAYS_BRK_YTHDR00);
-    JUT_ASSERT(VERSION_SELECT(141, 140, 140, 140), canm != NULL);
+    JUT_ASSERT(DEMO_SELECT(141, 140), canm != NULL);
     if (!mModelInfo.mBrk.init(modelData, canm, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0))
         return cPhs_ERROR_e;
 
diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp
index 0ff54fb08..612fd4bb8 100644
--- a/src/d/d_save.cpp
+++ b/src/d/d_save.cpp
@@ -67,7 +67,7 @@ void dSv_player_return_place_c::init() {
 
 /* 80058BC8-80058C60       .text set__25dSv_player_return_place_cFPCcScUc */
 void dSv_player_return_place_c::set(const char* i_name, s8 i_roomNo, u8 i_status) {
-    JUT_ASSERT(VERSION_SELECT(173, 179, 179, 179), strlen(i_name) <= 7);
+    JUT_ASSERT(DEMO_SELECT(173, 179), strlen(i_name) <= 7);
 
     strcpy(mName, i_name);
     mRoomNo = i_roomNo;
@@ -201,14 +201,14 @@ void dSv_player_get_item_c::init() {
 
 /* 800594C4-8005955C       .text onItem__21dSv_player_get_item_cFiUc */
 void dSv_player_get_item_c::onItem(int i_field, u8 i_item) {
-    JUT_ASSERT(VERSION_SELECT(393, 399, 399, 399), 0 <= i_item && i_item < 8);
+    JUT_ASSERT(DEMO_SELECT(393, 399), 0 <= i_item && i_item < 8);
 
     mItemFlags[i_field] |= (u8)(1 << i_item);
 }
 
 /* 8005955C-800595F8       .text isItem__21dSv_player_get_item_cFiUc */
 BOOL dSv_player_get_item_c::isItem(int i_field, u8 i_item) {
-    JUT_ASSERT(VERSION_SELECT(423, 429, 429, 429), 0 <= i_item && i_item < 8);
+    JUT_ASSERT(DEMO_SELECT(423, 429), 0 <= i_item && i_item < 8);
 
     return mItemFlags[i_field] & (u8)(1 << i_item) ? TRUE : FALSE;
 }
@@ -667,37 +667,37 @@ void dSv_player_get_bag_item_c::init() {
 
 /* 8005A8CC-8005A960       .text onBeast__25dSv_player_get_bag_item_cFUc */
 void dSv_player_get_bag_item_c::onBeast(u8 i_no) {
-    JUT_ASSERT(VERSION_SELECT(1229, 1235, 1235, 1235), 0 <= i_no && i_no < 8);
+    JUT_ASSERT(DEMO_SELECT(1229, 1235), 0 <= i_no && i_no < 8);
     mBeastFlags |= (u8)(1 << i_no);
 }
 
 /* 8005A960-8005A9F8       .text isBeast__25dSv_player_get_bag_item_cFUc */
 BOOL dSv_player_get_bag_item_c::isBeast(u8 i_no) {
-    JUT_ASSERT(VERSION_SELECT(1259, 1265, 1265, 1265), 0 <= i_no && i_no < 8);
+    JUT_ASSERT(DEMO_SELECT(1259, 1265), 0 <= i_no && i_no < 8);
     return mBeastFlags & (u8)(1 << i_no) ? TRUE : FALSE;
 }
 
 /* 8005A9F8-8005AA8C       .text onBait__25dSv_player_get_bag_item_cFUc */
 void dSv_player_get_bag_item_c::onBait(u8 i_no) {
-    JUT_ASSERT(VERSION_SELECT(1274, 1280, 1280, 1280), 0 <= i_no && i_no < 8);
+    JUT_ASSERT(DEMO_SELECT(1274, 1280), 0 <= i_no && i_no < 8);
     mBaitFlags |= (u8)(1 << i_no);
 }
 
 /* 8005AA8C-8005AB24       .text isBait__25dSv_player_get_bag_item_cFUc */
 BOOL dSv_player_get_bag_item_c::isBait(u8 i_no) {
-    JUT_ASSERT(VERSION_SELECT(1304, 1310, 1310, 1310), 0 <= i_no && i_no < 8);
+    JUT_ASSERT(DEMO_SELECT(1304, 1310), 0 <= i_no && i_no < 8);
     return mBaitFlags & (u8)(1 << i_no) ? TRUE : FALSE;
 }
 
 /* 8005AB24-8005ABB4       .text onReserve__25dSv_player_get_bag_item_cFUc */
 void dSv_player_get_bag_item_c::onReserve(u8 i_no) {
-    JUT_ASSERT(VERSION_SELECT(1319, 1325, 1325, 1325), 0 <= i_no && i_no < 32);
+    JUT_ASSERT(DEMO_SELECT(1319, 1325), 0 <= i_no && i_no < 32);
     mReserveFlags |= (1 << i_no);
 }
 
 /* 8005ABB4-8005AC48       .text isReserve__25dSv_player_get_bag_item_cFUc */
 BOOL dSv_player_get_bag_item_c::isReserve(u8 i_no) {
-    JUT_ASSERT(VERSION_SELECT(1349, 1355, 1355, 1355), 0 <= i_no && i_no < 32);
+    JUT_ASSERT(DEMO_SELECT(1349, 1355), 0 <= i_no && i_no < 32);
     return mReserveFlags & (1 << i_no) ? TRUE : FALSE;
 }
 
@@ -731,55 +731,55 @@ void dSv_player_collect_c::init() {
 
 /* 8005ACE0-8005AD78       .text onCollect__20dSv_player_collect_cFiUc */
 void dSv_player_collect_c::onCollect(int i_idx, u8 i_item) {
-    JUT_ASSERT(VERSION_SELECT(1406, 1412, 1412, 1412), 0 <= i_item && i_item < 8);
+    JUT_ASSERT(DEMO_SELECT(1406, 1412), 0 <= i_item && i_item < 8);
     mCollect[i_idx] |= (u8)(1 << i_item);
 }
 
 /* 8005AD78-8005AE10       .text offCollect__20dSv_player_collect_cFiUc */
 void dSv_player_collect_c::offCollect(int i_idx, u8 i_item) {
-    JUT_ASSERT(VERSION_SELECT(1421, 1427, 1427, 1427), 0 <= i_item && i_item < 8);
+    JUT_ASSERT(DEMO_SELECT(1421, 1427), 0 <= i_item && i_item < 8);
     mCollect[i_idx] &= ~(u8)(1 << i_item);
 }
 
 /* 8005AE10-8005AEAC       .text isCollect__20dSv_player_collect_cFiUc */
 BOOL dSv_player_collect_c::isCollect(int i_idx, u8 i_item) {
-    JUT_ASSERT(VERSION_SELECT(1436, 1442, 1442, 1442), 0 <= i_item && i_item < 8);
+    JUT_ASSERT(DEMO_SELECT(1436, 1442), 0 <= i_item && i_item < 8);
     return mCollect[i_idx] & (u8)(1 << i_item) ? TRUE : FALSE;
 }
 
 /* 8005AEAC-8005AF40       .text onTact__20dSv_player_collect_cFUc */
 void dSv_player_collect_c::onTact(u8 i_no) {
-    JUT_ASSERT(VERSION_SELECT(1496, 1502, 1502, 1502), 0 <= i_no && i_no < 8);
+    JUT_ASSERT(DEMO_SELECT(1496, 1502), 0 <= i_no && i_no < 8);
     mTact |= (u8)(1 << i_no);
 }
 
 /* 8005AF40-8005AFD8       .text isTact__20dSv_player_collect_cFUc */
 BOOL dSv_player_collect_c::isTact(u8 i_no) {
-    JUT_ASSERT(VERSION_SELECT(1526, 1532, 1532, 1532), 0 <= i_no && i_no < 8);
+    JUT_ASSERT(DEMO_SELECT(1526, 1532), 0 <= i_no && i_no < 8);
     return mTact & (u8)(1 << i_no) ? TRUE : FALSE;
 }
 
 /* 8005AFD8-8005B06C       .text onTriforce__20dSv_player_collect_cFUc */
 void dSv_player_collect_c::onTriforce(u8 i_no) {
-    JUT_ASSERT(VERSION_SELECT(1541, 1547, 1547, 1547), 0 <= i_no && i_no < 8);
+    JUT_ASSERT(DEMO_SELECT(1541, 1547), 0 <= i_no && i_no < 8);
     mTriforce |= (u8)(1 << i_no);
 }
 
 /* 8005B06C-8005B104       .text isTriforce__20dSv_player_collect_cFUc */
 BOOL dSv_player_collect_c::isTriforce(u8 i_no) {
-    JUT_ASSERT(VERSION_SELECT(1571, 1577, 1577, 1577), 0 <= i_no && i_no < 8);
+    JUT_ASSERT(DEMO_SELECT(1571, 1577), 0 <= i_no && i_no < 8);
     return mTriforce & (u8)(1 << i_no) ? TRUE : FALSE;
 }
 
 /* 8005B104-8005B198       .text onSymbol__20dSv_player_collect_cFUc */
 void dSv_player_collect_c::onSymbol(u8 i_no) {
-    JUT_ASSERT(VERSION_SELECT(1586, 1592, 1592, 1592), 0 <= i_no && i_no < 8);
+    JUT_ASSERT(DEMO_SELECT(1586, 1592), 0 <= i_no && i_no < 8);
     mSymbol |= (u8)(1 << i_no);
 }
 
 /* 8005B198-8005B230       .text isSymbol__20dSv_player_collect_cFUc */
 BOOL dSv_player_collect_c::isSymbol(u8 i_no) {
-    JUT_ASSERT(VERSION_SELECT(1616, 1622, 1622, 1622), 0 <= i_no && i_no < 8);
+    JUT_ASSERT(DEMO_SELECT(1616, 1622), 0 <= i_no && i_no < 8);
     return mSymbol & (u8)(1 << i_no) ? TRUE : FALSE;
 }
 
@@ -823,67 +823,67 @@ void dSv_player_map_c::init() {
 
 /* 8005B320-8005B3CC       .text onGetMap__16dSv_player_map_cFi */
 void dSv_player_map_c::onGetMap(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(1680, 1690, 1690, 1690), 0 <= i_no && i_no < 128);
+    JUT_ASSERT(DEMO_SELECT(1680, 1690), 0 <= i_no && i_no < 128);
     field_0x0[1][i_no >> 5] |= (1 << (i_no & 0x1F));
 }
 
 /* 8005B3CC-8005B47C       .text isGetMap__16dSv_player_map_cFi */
 BOOL dSv_player_map_c::isGetMap(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(1708, 1718, 1718, 1718), 0 <= i_no && i_no < 128);
+    JUT_ASSERT(DEMO_SELECT(1708, 1718), 0 <= i_no && i_no < 128);
     return field_0x0[1][i_no >> 5] & (1 << (i_no & 0x1F)) ? TRUE : FALSE;
 }
 
 /* 8005B47C-8005B528       .text onOpenMap__16dSv_player_map_cFi */
 void dSv_player_map_c::onOpenMap(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(1741, 1751, 1751, 1751), 0 <= i_no && i_no < 128);
+    JUT_ASSERT(DEMO_SELECT(1741, 1751), 0 <= i_no && i_no < 128);
     field_0x0[2][i_no >> 5] |= (1 << (i_no & 0x1F));
 }
 
 /* 8005B528-8005B5D4       .text offOpenMap__16dSv_player_map_cFi */
 void dSv_player_map_c::offOpenMap(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(0, 1765, 1765, 1765), 0 <= i_no && i_no < 128);
+    JUT_ASSERT(DEMO_SELECT(0, 1765), 0 <= i_no && i_no < 128);
     field_0x0[2][i_no >> 5] &= ~(1 << (i_no & 0x1F));
 }
 
 /* 8005B5D4-8005B684       .text isOpenMap__16dSv_player_map_cFi */
 BOOL dSv_player_map_c::isOpenMap(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(1769, 1779, 1779, 1779), 0 <= i_no && i_no < 128);
+    JUT_ASSERT(DEMO_SELECT(1769, 1779), 0 <= i_no && i_no < 128);
     return field_0x0[2][i_no >> 5] & (1 << (i_no & 0x1F)) ? TRUE : FALSE;
 }
 
 /* 8005B684-8005B730       .text onCompleteMap__16dSv_player_map_cFi */
 void dSv_player_map_c::onCompleteMap(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(1802, 1812, 1812, 1812), 0 <= i_no && i_no < 128);
+    JUT_ASSERT(DEMO_SELECT(1802, 1812), 0 <= i_no && i_no < 128);
     field_0x0[3][i_no >> 5] |= (1 << (i_no & 0x1F));
 }
 
 /* 8005B730-8005B7DC       .text offCompleteMap__16dSv_player_map_cFi */
 void dSv_player_map_c::offCompleteMap(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(0, 1826, 1826, 1826), 0 <= i_no && i_no < 128);
+    JUT_ASSERT(DEMO_SELECT(0, 1826), 0 <= i_no && i_no < 128);
     field_0x0[3][i_no >> 5] &= ~(1 << (i_no & 0x1F));
 }
 
 /* 8005B7DC-8005B88C       .text isCompleteMap__16dSv_player_map_cFi */
 BOOL dSv_player_map_c::isCompleteMap(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(1830, 1840, 1840, 1840), 0 <= i_no && i_no < 128);
+    JUT_ASSERT(DEMO_SELECT(1830, 1840), 0 <= i_no && i_no < 128);
     return field_0x0[3][i_no >> 5] & (1 << (i_no & 0x1F)) ? TRUE : FALSE;
 }
 
 /* 8005B88C-8005B92C       .text onTriforce__16dSv_player_map_cFi */
 void dSv_player_map_c::onTriforce(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(1864, 1874, 1874, 1874), 0 <= i_no && i_no < 8);
+    JUT_ASSERT(DEMO_SELECT(1864, 1874), 0 <= i_no && i_no < 8);
     field_0x81 |= (u8)(1 << i_no);
 }
 
 /* 8005B92C-8005B9CC       .text offTriforce__16dSv_player_map_cFi */
 void dSv_player_map_c::offTriforce(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(0, 1888, 1888, 1888), 0 <= i_no && i_no < 8);
+    JUT_ASSERT(DEMO_SELECT(0, 1888), 0 <= i_no && i_no < 8);
     field_0x81 &= ~(u8)(1 << i_no);
 }
 
 /* 8005B9CC-8005BA70       .text isTriforce__16dSv_player_map_cFi */
 BOOL dSv_player_map_c::isTriforce(int i_no) {
-    JUT_ASSERT(VERSION_SELECT(1892, 1902, 1902, 1902), 0 <= i_no && i_no < 8);
+    JUT_ASSERT(DEMO_SELECT(1892, 1902), 0 <= i_no && i_no < 8);
     return field_0x81 & (u8)(1 << i_no) ? TRUE : FALSE;
 }
 
@@ -901,37 +901,37 @@ int dSv_player_map_c::getCollectMapNum() {
 
 /* 8005BAE8-8005BB84       .text onFmapBit__16dSv_player_map_cFiUc */
 void dSv_player_map_c::onFmapBit(int i_idx, u8 i_no) {
-    JUT_ASSERT(VERSION_SELECT(1947, 1957, 1957, 1957), 0 <= i_no && i_no < 8);
+    JUT_ASSERT(DEMO_SELECT(1947, 1957), 0 <= i_no && i_no < 8);
     mFmapBits[i_idx] |= (u8)(1 << i_no);
 }
 
 /* 8005BB84-8005BC24       .text isFmapBit__16dSv_player_map_cFiUc */
 BOOL dSv_player_map_c::isFmapBit(int i_idx, u8 i_no) {
-    JUT_ASSERT(VERSION_SELECT(1977, 1987, 1987, 1987), 0 <= i_no && i_no < 8);
+    JUT_ASSERT(DEMO_SELECT(1977, 1987), 0 <= i_no && i_no < 8);
     return mFmapBits[i_idx] & (u8)(1 << i_no) ? TRUE : FALSE;
 }
 
 /* 8005BC24-8005BCBC       .text onSaveArriveGrid__16dSv_player_map_cFi */
 void dSv_player_map_c::onSaveArriveGrid(int no) {
-    JUT_ASSERT(VERSION_SELECT(1986, 1996, 1996, 1996), (no >= 0) && (no < 49));
+    JUT_ASSERT(DEMO_SELECT(1986, 1996), (no >= 0) && (no < 49));
     onFmapBit(no, 0);
 }
 
 /* 8005BCBC-8005BD54       .text isSaveArriveGrid__16dSv_player_map_cFi */
 BOOL dSv_player_map_c::isSaveArriveGrid(int no) {
-    JUT_ASSERT(VERSION_SELECT(2000, 2010, 2010, 2010), (no >= 0) && (no < 49));
+    JUT_ASSERT(DEMO_SELECT(2000, 2010), (no >= 0) && (no < 49));
     return isFmapBit(no, 0);
 }
 
 /* 8005BD54-8005BDEC       .text onSaveArriveGridForAgb__16dSv_player_map_cFi */
 void dSv_player_map_c::onSaveArriveGridForAgb(int no) {
-    JUT_ASSERT(VERSION_SELECT(2007, 2017, 2017, 2017), (no >= 0) && (no < 49));
+    JUT_ASSERT(DEMO_SELECT(2007, 2017), (no >= 0) && (no < 49));
     onFmapBit(no, 1);
 }
 
 /* 8005BDEC-8005BE84       .text isSaveArriveGridForAgb__16dSv_player_map_cFi */
 BOOL dSv_player_map_c::isSaveArriveGridForAgb(int no) {
-    JUT_ASSERT(VERSION_SELECT(2019, 2029, 2029, 2029), (no >= 0) && (no < 49));
+    JUT_ASSERT(DEMO_SELECT(2019, 2029), (no >= 0) && (no < 49));
     return isFmapBit(no, 1);
 }
 
diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp
index afbf8d2c9..b228b4eba 100644
--- a/src/d/d_stage.cpp
+++ b/src/d/d_stage.cpp
@@ -1387,7 +1387,7 @@ stage_actor_data_class* dStage_decodeSearchIkada(void* i_file, int ikadaShipId)
 /* 8004184C-800419D0       .text dStage_playerInitIkada__FP16fopAcM_prm_classPv */
 void dStage_playerInitIkada(fopAcM_prm_class* player_prm, void* i_file) {
     stage_actor_data_class* ikada_data = dStage_decodeSearchIkada(i_file, dComIfGp_getIkadaShipId());
-    JUT_ASSERT(VERSION_SELECT(1560, 1590, 1590, 1590), ikada_data != NULL);
+    JUT_ASSERT(DEMO_SELECT(1560, 1590), ikada_data != NULL);
     
     u8 roomNo = dComIfGp_getIkadaShipBeforeRoomId();
     player_prm->base.parameters = 0xFF000000 | roomNo;
@@ -1419,7 +1419,7 @@ bool dStage_chkPlayerId(int playerId, int room_no) {
     if (room_no == -1) {
         player = dComIfGp_getStage().getPlayer();
     } else {
-        JUT_ASSERT(VERSION_SELECT(1643, 1673, 1673, 1673), 0 <= room_no && room_no < 64);
+        JUT_ASSERT(DEMO_SELECT(1643, 1673), 0 <= room_no && room_no < 64);
         player = dComIfGp_roomControl_getStatusRoomDt(room_no)->getPlayer();
     }
 
@@ -1447,7 +1447,7 @@ int dStage_playerInit(dStage_dt_c* i_stage, void* i_data, int num, void* i_file)
     i_stage->setPlayerNum(num);
 
     fopAcM_prm_class* appen = fopAcM_CreateAppend();
-    JUT_ASSERT(VERSION_SELECT(1705, 1735, 1735, 1735), appen != NULL);
+    JUT_ASSERT(DEMO_SELECT(1705, 1735), appen != NULL);
 
     int point = dComIfGp_getStartStagePoint();
     u32 roomParam = dComIfGs_getRestartRoomParam();
@@ -1470,7 +1470,7 @@ int dStage_playerInit(dStage_dt_c* i_stage, void* i_data, int num, void* i_file)
             player_data++;
         }
 
-        JUT_ASSERT(VERSION_SELECT(1757, 1787, 1787, 1787), i != num);
+        JUT_ASSERT(DEMO_SELECT(1757, 1787), i != num);
 
         appen->base.parameters = player_data->base.parameters;
         appen->base.position = player_data->base.position;
@@ -1494,7 +1494,7 @@ int dStage_playerInit(dStage_dt_c* i_stage, void* i_data, int num, void* i_file)
     dStage_actorCreate(player_data, appen);
 
     scene_class* stageProc = fopScnM_SearchByID(dStage_roomControl_c::getProcID());
-    JUT_ASSERT(VERSION_SELECT(1812, 1842, 1842, 1842), stageProc != NULL);
+    JUT_ASSERT(DEMO_SELECT(1812, 1842), stageProc != NULL);
 
     if (stageProc->base.base.mProcName != PROC_PLAY_SCENE) {
         fopAcM_create(PROC_TITLE, 0);
@@ -1829,7 +1829,7 @@ int dStage_memaInfoInit(dStage_dt_c* i_stage, void* i_data, int i_num, void*) {
 
         for (int i = 0; i < pd->num; i++) {
             JKRExpHeap* heap = dStage_roomControl_c::createMemoryBlock(i, *entry_p + 0x300);
-            JUT_ASSERT(VERSION_SELECT(2903, 2932, 2932, 2932), heap != NULL);
+            JUT_ASSERT(DEMO_SELECT(2903, 2932), heap != NULL);
             entry_p++;
         }
     }
@@ -2069,8 +2069,8 @@ void dStage_dt_c_offsetToPtr(void* i_data) {
 void dStage_dt_c_stageInitLoader(void* i_data, dStage_dt_c* i_stage) {
     static FuncTable l_funcTable[] = {"STAG", dStage_stagInfoInit};
 
-    JUT_ASSERT(VERSION_SELECT(3529, 3557, 3557, 3557), i_data != NULL);
-    JUT_ASSERT(VERSION_SELECT(3530, 3558, 3558, 3558), i_stage != NULL);
+    JUT_ASSERT(DEMO_SELECT(3529, 3557), i_data != NULL);
+    JUT_ASSERT(DEMO_SELECT(3530, 3558), i_stage != NULL);
 
     dStage_dt_c_offsetToPtr(i_data);
     i_stage->init();
@@ -2223,7 +2223,7 @@ void dStage_dt_c_roomReLoader(void* i_data, dStage_dt_c* i_stage, int param_2) {
 /* 8004324C-800432EC       .text dStage_infoCreate__Fv */
 void dStage_infoCreate() {
     void* stageRsrc = dComIfG_getStageRes("Stage", "stage.dzs");
-    JUT_ASSERT(VERSION_SELECT(3806, 3834, 3834, 3834), stageRsrc != NULL)
+    JUT_ASSERT(DEMO_SELECT(3806, 3834), stageRsrc != NULL)
 
     dStage_dt_c_stageInitLoader(stageRsrc, &dComIfGp_getStage());
 }
@@ -2233,14 +2233,14 @@ void dStage_Create() {
     dKankyo_create();
 
     void* stageRsrc = dComIfG_getStageRes("Stage", "stage.dzs");
-    JUT_ASSERT(VERSION_SELECT(3834, 3862, 3862, 3862), stageRsrc != NULL)
+    JUT_ASSERT(DEMO_SELECT(3834, 3862), stageRsrc != NULL)
 
     dComIfGp_roomControl_init();
     dStage_dt_c_stageLoader(stageRsrc, &dComIfGp_getStage());
 
     if (dComIfGp_getStartStageRoomNo() >= 0) {
         int status = dStage_roomInit(dComIfGp_getStartStageRoomNo());
-        JUT_ASSERT(VERSION_SELECT(3845, 3873, 3873, 3873), status);
+        JUT_ASSERT(DEMO_SELECT(3845, 3873), status);
     }
 
     dMap_c::create();
@@ -2325,7 +2325,7 @@ int dStage_changeSceneExitId(cBgS_PolyInfo& i_poly, f32 i_speed, u32 i_mode, s8
         dComIfGp_setIkadaShipBeforePos(actor_p->current.pos);
         return 1;
     } else if (exit_id == 0x3D) {
-        JUT_ASSERT(VERSION_SELECT(4106, 4134, 4134, 4134), dComIfGp_getIkadaShipBeforeRoomId() >= 0 &&
+        JUT_ASSERT(DEMO_SELECT(4106, 4134), dComIfGp_getIkadaShipBeforeRoomId() >= 0 &&
                              dComIfGp_getIkadaShipBeforeRoomId() < 64);
         dComIfGp_setNextStage("sea", -2, dComIfGp_getIkadaShipBeforeRoomId(), -1, i_speed, i_mode);
         return 1;
@@ -2356,7 +2356,7 @@ int dStage_changeScene(int i_exitId, f32 speed, u32 mode, s8 room_no) {
     if (room_no == -1) {
         scls = dComIfGp_getStageSclsInfo();
     } else {
-        JUT_ASSERT(VERSION_SELECT(4164, 4192, 4192, 4192), 0 <= room_no && room_no < 64);
+        JUT_ASSERT(DEMO_SELECT(4164, 4192), 0 <= room_no && room_no < 64);
         scls = dComIfGp_roomControl_getStatusRoomDt(room_no)->getSclsInfo();
     }
 
@@ -2364,7 +2364,7 @@ int dStage_changeScene(int i_exitId, f32 speed, u32 mode, s8 room_no) {
         return 0;
     }
 
-    JUT_ASSERT(VERSION_SELECT(4174, 4202, 4202, 4202), 0 <= i_exitId && i_exitId < scls->num);
+    JUT_ASSERT(DEMO_SELECT(4174, 4202), 0 <= i_exitId && i_exitId < scls->num);
 
     stage_scls_info_class* scls_info = &scls->m_entries[i_exitId];
     s32 wipe = dStage_sclsInfo_getWipe(scls_info);
diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp
index ffe757f01..23aedc0ae 100644
--- a/src/f_op/f_op_actor_mng.cpp
+++ b/src/f_op/f_op_actor_mng.cpp
@@ -356,7 +356,7 @@ bool fopAcM_entrySolidHeap(fopAc_ac_c* i_this, heapCallbackFunc createHeapCB, u3
 
     if (heap == NULL) {
         heap = mDoExt_createSolidHeapFromGameToCurrent(-1, 0x20);
-        JUT_ASSERT(VERSION_SELECT(1103, 1107, 1107, 1107), heap);
+        JUT_ASSERT(DEMO_SELECT(1103, 1107), heap);
 
         bool result = createHeapCB(i_this);
         mDoExt_restoreCurrentHeap();
@@ -393,7 +393,7 @@ bool fopAcM_entrySolidHeap(fopAc_ac_c* i_this, heapCallbackFunc createHeapCB, u3
                 heap = NULL;
                 bool result = createHeapCB(i_this);
                 mDoExt_restoreCurrentHeap();
-                JUT_ASSERT(VERSION_SELECT(1161, 1165, 1165, 1165), result != FALSE);
+                JUT_ASSERT(DEMO_SELECT(1161, 1165), result != FALSE);
                 if (result == FALSE) {
                     // "Entry failed with the exact size heap? (Bug)\n"
                     OSReport_Error("ぴったりサイズで、登録失敗？(バグ)\n");
@@ -421,7 +421,7 @@ bool fopAcM_entrySolidHeap(fopAc_ac_c* i_this, heapCallbackFunc createHeapCB, u3
 
         // "Buggy!\n"
         OSReport_Error("ばぐばぐです\n");
-        JUT_ASSERT(VERSION_SELECT(1201, 1205, 1205, 1205), FALSE);
+        JUT_ASSERT(DEMO_SELECT(1201, 1205), FALSE);
     }
 
     // "fopAcM_entrySolidHeap failed. [%s]\n"
@@ -776,7 +776,7 @@ fopAc_ac_c* fopAcM_getEventPartner(fopAc_ac_c* i_this) {
 
 /* 80026118-800261E8       .text fopAcM_createItemForPresentDemo__FP4cXyziUciiP5csXyzP4cXyz */
 fpc_ProcID fopAcM_createItemForPresentDemo(cXyz* pos, int i_itemNo, u8 argFlag, int roomNo, int param_5, csXyz* angle, cXyz* scale) {
-    JUT_ASSERT(VERSION_SELECT(2409, 2413, 2413, 2413), 0 <= i_itemNo && i_itemNo < 256);
+    JUT_ASSERT(DEMO_SELECT(2409, 2413), 0 <= i_itemNo && i_itemNo < 256);
 
     dComIfGp_event_setGtItm(i_itemNo);
 
@@ -789,7 +789,7 @@ fpc_ProcID fopAcM_createItemForPresentDemo(cXyz* pos, int i_itemNo, u8 argFlag,
 
 /* 800261E8-800262B4       .text fopAcM_createItemForTrBoxDemo__FP4cXyziiiP5csXyzP4cXyz */
 fpc_ProcID fopAcM_createItemForTrBoxDemo(cXyz* pos, int i_itemNo, int roomNo, int param_5, csXyz* angle, cXyz* scale) {
-    JUT_ASSERT(VERSION_SELECT(2454, 2458, 2458, 2458), 0 <= i_itemNo && i_itemNo < 256);
+    JUT_ASSERT(DEMO_SELECT(2454, 2458), 0 <= i_itemNo && i_itemNo < 256);
 
     dComIfGp_event_setGtItm(i_itemNo);
 
@@ -802,7 +802,7 @@ fpc_ProcID fopAcM_createItemForTrBoxDemo(cXyz* pos, int i_itemNo, int roomNo, in
 
 /* 800262B4-80026694       .text fopAcM_createItemFromTable__FP4cXyziiiiP5csXyziP4cXyz */
 fpc_ProcID fopAcM_createItemFromTable(cXyz* p_pos, int i_itemNo, int i_itemBitNo, int roomNo, int type, csXyz* p_angle, int action, cXyz* p_scale) {
-    JUT_ASSERT(VERSION_SELECT(2510, 2514, 2514, 2514), 0 <= i_itemNo && i_itemNo < 64 && (-1 <= i_itemBitNo && i_itemBitNo <= 79) || i_itemBitNo == 127);
+    JUT_ASSERT(DEMO_SELECT(2510, 2514), 0 <= i_itemNo && i_itemNo < 64 && (-1 <= i_itemBitNo && i_itemBitNo <= 79) || i_itemBitNo == 127);
 
     static cXyz fairy_offset_tbl[3] = {
         cXyz(40.0f, 0.0f, 0.0f),
@@ -899,7 +899,7 @@ fpc_ProcID fopAcM_createItemFromTable(cXyz* p_pos, int i_itemNo, int i_itemBitNo
 
 /* 80026694-800267C8       .text fopAcM_createRaceItemFromTable__FP4cXyziiiP5csXyzP4cXyzi */
 fpc_ProcID fopAcM_createRaceItemFromTable(cXyz* pos, int i_itemNo, int i_itemBitNo, int i_roomNo, csXyz* angle, cXyz* scale, int param_7) {
-    JUT_ASSERT(VERSION_SELECT(2654, 2660, 2660, 2660), 0 <= i_itemNo && i_itemNo < 64 && (-1 <= i_itemBitNo && i_itemBitNo <= 79) || i_itemBitNo == 127);
+    JUT_ASSERT(DEMO_SELECT(2654, 2660), 0 <= i_itemNo && i_itemNo < 64 && (-1 <= i_itemBitNo && i_itemBitNo <= 79) || i_itemBitNo == 127);
     
     if (i_itemNo >= 0x20 && i_itemNo <= 0x3E) {
         i_itemNo -= 0x20;
@@ -920,7 +920,7 @@ fpc_ProcID fopAcM_createRaceItemFromTable(cXyz* pos, int i_itemNo, int i_itemBit
 /* 800267C8-8002688C       .text fopAcM_createShopItem__FP4cXyziP5csXyziP4cXyzPFPv_i */
 fpc_ProcID fopAcM_createShopItem(cXyz* pos, int i_itemNo, csXyz* angle, int roomNo, cXyz* scale,
                            createFunc createFunc) {
-    JUT_ASSERT(VERSION_SELECT(2710, 2716, 2716, 2716), 0 <= i_itemNo && i_itemNo < 256);
+    JUT_ASSERT(DEMO_SELECT(2710, 2716), 0 <= i_itemNo && i_itemNo < 256);
     if (i_itemNo == dItem_NONE_e) {
         return fpcM_ERROR_PROCESS_ID_e;
     }
@@ -930,7 +930,7 @@ fpc_ProcID fopAcM_createShopItem(cXyz* pos, int i_itemNo, csXyz* angle, int room
 
 /* 8002688C-80026980       .text fopAcM_createRaceItem__FP4cXyziiP5csXyziP4cXyzi */
 fpc_ProcID fopAcM_createRaceItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* angle, int roomNo, cXyz* scale, int param_7) {
-    JUT_ASSERT(VERSION_SELECT(2757, 2763, 2763, 2763), 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo <= 79) || i_itemBitNo == 127);
+    JUT_ASSERT(DEMO_SELECT(2757, 2763), 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo <= 79) || i_itemBitNo == 127);
     if (i_itemNo == dItem_NONE_e) {
         return fpcM_ERROR_PROCESS_ID_e;
     }
@@ -942,7 +942,7 @@ fpc_ProcID fopAcM_createRaceItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz
 
 /* 80026980-80026A68       .text fopAcM_createDemoItem__FP4cXyziiP5csXyziP4cXyzUc */
 fpc_ProcID fopAcM_createDemoItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* i_angle, int i_roomNo, cXyz* i_scale, u8 i_argFlag) {
-    JUT_ASSERT(VERSION_SELECT(2807, 2813, 2813, 2813), 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo <= 79) || i_itemBitNo == 127);
+    JUT_ASSERT(DEMO_SELECT(2807, 2813), 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo <= 79) || i_itemBitNo == 127);
     if (i_itemNo == dItem_NONE_e) {
         return fpcM_ERROR_PROCESS_ID_e;
     }
@@ -964,7 +964,7 @@ fpc_ProcID fopAcM_createItemForBoss(cXyz* pos, int unused, int roomNo, csXyz* an
 
 /* 80026ADC-80026C90       .text fopAcM_createItem__FP4cXyziiiiP5csXyziP4cXyz */
 fpc_ProcID fopAcM_createItem(cXyz* pos, int i_itemNo, int i_itemBitNo, int roomNo, int type, csXyz* angle, int action, cXyz* scale) {
-    JUT_ASSERT(VERSION_SELECT(2909, 2915, 2915, 2915), 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo <= 79) || i_itemBitNo == 127);
+    JUT_ASSERT(DEMO_SELECT(2909, 2915), 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo <= 79) || i_itemBitNo == 127);
     
     if (i_itemNo == dItem_NONE_e) {
         return fpcM_ERROR_PROCESS_ID_e;
@@ -1000,7 +1000,7 @@ void* fopAcM_fastCreateItem2(cXyz* pos, int i_itemNo, int i_itemBitNo, int roomN
                              csXyz* angle, int action, cXyz* scale)
 {
 
-    JUT_ASSERT(VERSION_SELECT(2989, 2995, 2995, 2995), 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo <= 79) || i_itemBitNo == 127);
+    JUT_ASSERT(DEMO_SELECT(2989, 2995), 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo <= 79) || i_itemBitNo == 127);
 
     int i;
     
@@ -1036,7 +1036,7 @@ void* fopAcM_fastCreateItem2(cXyz* pos, int i_itemNo, int i_itemBitNo, int roomN
 
 /* 80026E5C-80026F5C       .text fopAcM_createItemForKP2__FP4cXyziiP5csXyzP4cXyzfffUs */
 fopAc_ac_c* fopAcM_createItemForKP2(cXyz* pos, int i_itemNo, int roomNo, csXyz* angle, cXyz* scale, f32 speedF, f32 speedY, f32 gravity, u16 i_itemBitNo) {
-    JUT_ASSERT(VERSION_SELECT(3103, 3109, 3109, 3109), 0 <= i_itemNo && i_itemNo < 256);
+    JUT_ASSERT(DEMO_SELECT(3103, 3109), 0 <= i_itemNo && i_itemNo < 256);
     if (i_itemNo == dItem_NONE_e)
         return NULL;
 
@@ -1061,7 +1061,7 @@ daItem_c* fopAcM_createItemForSimpleDemo(cXyz* pos, int i_itemNo, int roomNo, cs
 /* 80026F98-80027254       .text fopAcM_fastCreateItem__FP4cXyziiP5csXyzP4cXyzfffiPFPv_i */
 void* fopAcM_fastCreateItem(cXyz* pos, int i_itemNo, int roomNo, csXyz* angle, cXyz* scale,
                             f32 speedF, f32 speedY, f32 gravity, int i_itemBitNo, createFunc createFunc) {
-    JUT_ASSERT(VERSION_SELECT(3195, 3201, 3201, 3201), 0 <= i_itemNo && i_itemNo < 256);
+    JUT_ASSERT(DEMO_SELECT(3195, 3201), 0 <= i_itemNo && i_itemNo < 256);
     if (i_itemNo == dItem_NONE_e) {
         return NULL;
     }
@@ -1278,10 +1278,10 @@ fopAc_ac_c * enemySearchJugge(void* ptr, void*) {
 
 /* 80027970-80027A9C       .text fopAcM_myRoomSearchEnemy__FSc */
 fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo) {
-    JUT_ASSERT(VERSION_SELECT(3569, 3591, 3591, 3591), roomNo >= 0);
+    JUT_ASSERT(DEMO_SELECT(3569, 3591), roomNo >= 0);
 
     scene_class* roomProc = fopScnM_SearchByID(dStage_roomControl_c::getStatusProcID(roomNo));
-    JUT_ASSERT(VERSION_SELECT(3572, 3594, 3594, 3594), roomProc != NULL);
+    JUT_ASSERT(DEMO_SELECT(3572, 3594), roomProc != NULL);
 
     fpc_ProcID grabProcID = daPy_getPlayerActorClass()->getGrabActorID();
     fopAc_ac_c* enemy = fopAcM_SearchByID(grabProcID);
@@ -1410,7 +1410,7 @@ const char * fopAcM_getProcNameString(fopAc_ac_c* i_this) {
 /* 8002833C-80028410       .text fopAcM_findObjectCB__FP10fopAc_ac_cPv */
 fopAc_ac_c* fopAcM_findObjectCB(fopAc_ac_c* it, void* i_prm) {
     fopAcM_search_prm* Prm = (fopAcM_search_prm*)i_prm;
-    JUT_ASSERT(VERSION_SELECT(4071, 4095, 4095, 4095), Prm);
+    JUT_ASSERT(DEMO_SELECT(4071, 4095), Prm);
 
     dStage_objectNameInf *inf = dStage_searchName(Prm->procname);
     if (inf == NULL)
diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp
index 03295a5ee..e71c579a7 100644
--- a/src/m_Do/m_Do_graphic.cpp
+++ b/src/m_Do/m_Do_graphic.cpp
@@ -88,7 +88,7 @@ void mDoGph_gInf_c::create() {
     JFWDisplay::createManager(heap, JUTXfb::Double, true);
     JFWDisplay::getManager()->setDrawDoneMethod(JFWDisplay::Async);
     JUTFader* faderPtr = new JUTFader(0, 0, JUTVideo::getManager()->getRenderMode()->fb_width, JUTVideo::getManager()->getRenderMode()->efb_height, JUtility::TColor(0, 0, 0, 0));
-    JUT_ASSERT(VERSION_SELECT(414, 416, 416, 416), faderPtr != NULL);
+    JUT_ASSERT(DEMO_SELECT(414, 416), faderPtr != NULL);
     setFader(faderPtr);
     JFWDisplay::getManager()->setFader(faderPtr);
     JUTProcBar::getManager()->setVisibleHeapBar(false);
@@ -129,10 +129,10 @@ void mDoGph_gInf_c::createHeap() {
 #endif
 
     mHeap[0] = JKRSolidHeap::create(0x10000, parentHeap, false);
-    JUT_ASSERT(VERSION_SELECT(488, 491, 491, 491), mHeap[0] != NULL);
+    JUT_ASSERT(DEMO_SELECT(488, 491), mHeap[0] != NULL);
 
     mHeap[1] = JKRSolidHeap::create(0x10000, parentHeap, false);
-    JUT_ASSERT(VERSION_SELECT(490, 493, 493, 493), mHeap[1] != NULL);
+    JUT_ASSERT(DEMO_SELECT(490, 493), mHeap[1] != NULL);
 
     mCurrentHeap = 0;
 }
@@ -1471,7 +1471,7 @@ void mCaptureGXDrawSyncCallback(u16) {
     if (mCaptureStep == 2) {
 #endif
         void* oldcb = (void*)GXSetDrawSyncCallback(mCaptureOldCB);
-        JUT_ASSERT(VERSION_SELECT(2580, 2655, 2655, 2655), oldcb == mCaptureGXDrawSyncCallback);
+        JUT_ASSERT(DEMO_SELECT(2580, 2655), oldcb == mCaptureGXDrawSyncCallback);
         mCaptureOldCB = NULL;
         mCaptureStep++;
 #if VERSION > VERSION_DEMO
@@ -1556,7 +1556,7 @@ bool mDoGph_screenCapture() {
     GXCopyTex(mCaptureCaptureBuffer, GX_FALSE);
     GXPixModeSync();
 
-    JUT_ASSERT(VERSION_SELECT(2657, 2753, 2753, 2753), mCaptureOldCB == NULL);
+    JUT_ASSERT(DEMO_SELECT(2657, 2753), mCaptureOldCB == NULL);
     mCaptureOldCB = GXSetDrawSyncCallback(mCaptureGXDrawSyncCallback);
 #if VERSION > VERSION_DEMO
     OSCreateAlarm(&mCaptureTimeOutAlarm);