Resolve remaining FRLG code differences

This commit is contained in:
PikalaxALT
2019-12-19 14:51:18 -05:00
parent f6cdd87633
commit 18139c4aa4
2 changed files with 11 additions and 1 deletions
+7 -1
View File
@@ -750,6 +750,12 @@ bool32 sub_8144254(const u16 * data)
return FALSE;
}
#if defined(FIRERED)
#define MEVENT_HEADER_VERSION_CODE 1
#elif defined(LEAFGREEN)
#define MEVENT_HEADER_VERSION_CODE 2
#endif
void BuildMEventClientHeader(struct MEventClientHeaderStruct * data)
{
s32 i;
@@ -759,7 +765,7 @@ void BuildMEventClientHeader(struct MEventClientHeaderStruct * data)
data->unk_04 = 1;
data->unk_08 = 1;
data->unk_0C = 1;
data->unk_10 = 1;
data->unk_10 = MEVENT_HEADER_VERSION_CODE;
// Check whether a card already exists
if (ValidateReceivedWonderCard())
+4
View File
@@ -22,7 +22,11 @@ extern ScrCmdFunc gMysteryEventScriptCmdTable[];
extern ScrCmdFunc gMysteryEventScriptCmdTableEnd[];
#define LANGUAGE_MASK 0x1
#if defined(FIRERED)
#define VERSION_MASK 0x1
#elif defined(LEAFGREEN)
#define VERSION_MASK 0x2
#endif
EWRAM_DATA static struct ScriptContext sMysteryEventScriptContext = {0};