diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-05-19 20:17:13 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-05-19 20:17:13 -0400 |
| commit | 99c78680de41fc627ec5d2737b2639605e87ae32 (patch) | |
| tree | a3e5eb7c03f1de53dc6a0461d88527a6f1b8fd05 /src/f_op | |
| parent | 6610bf1d1ca48bacda8fcbe3803a7c3b8c6cf214 (diff) | |
Fix version defines
Diffstat (limited to 'src/f_op')
| -rw-r--r-- | src/f_op/f_op_msg_mng.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index bb371bc0..00ebfb66 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)) { |