Fix version defines

1 files changed, 12 insertions, 12 deletions

diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp
index 9d457480..a195fa37 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) {