Resolve remaining FRLG code differences
This commit is contained in:
+7
-1
@@ -750,6 +750,12 @@ bool32 sub_8144254(const u16 * data)
|
|||||||
return FALSE;
|
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)
|
void BuildMEventClientHeader(struct MEventClientHeaderStruct * data)
|
||||||
{
|
{
|
||||||
s32 i;
|
s32 i;
|
||||||
@@ -759,7 +765,7 @@ void BuildMEventClientHeader(struct MEventClientHeaderStruct * data)
|
|||||||
data->unk_04 = 1;
|
data->unk_04 = 1;
|
||||||
data->unk_08 = 1;
|
data->unk_08 = 1;
|
||||||
data->unk_0C = 1;
|
data->unk_0C = 1;
|
||||||
data->unk_10 = 1;
|
data->unk_10 = MEVENT_HEADER_VERSION_CODE;
|
||||||
|
|
||||||
// Check whether a card already exists
|
// Check whether a card already exists
|
||||||
if (ValidateReceivedWonderCard())
|
if (ValidateReceivedWonderCard())
|
||||||
|
|||||||
@@ -22,7 +22,11 @@ extern ScrCmdFunc gMysteryEventScriptCmdTable[];
|
|||||||
extern ScrCmdFunc gMysteryEventScriptCmdTableEnd[];
|
extern ScrCmdFunc gMysteryEventScriptCmdTableEnd[];
|
||||||
|
|
||||||
#define LANGUAGE_MASK 0x1
|
#define LANGUAGE_MASK 0x1
|
||||||
|
#if defined(FIRERED)
|
||||||
#define VERSION_MASK 0x1
|
#define VERSION_MASK 0x1
|
||||||
|
#elif defined(LEAFGREEN)
|
||||||
|
#define VERSION_MASK 0x2
|
||||||
|
#endif
|
||||||
|
|
||||||
EWRAM_DATA static struct ScriptContext sMysteryEventScriptContext = {0};
|
EWRAM_DATA static struct ScriptContext sMysteryEventScriptContext = {0};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user