dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some extern declarations

Browse Source
This commit is contained in:
PikalaxALT
2020-03-02 10:26:42 -05:00
parent d758ae0dc2
commit d975572a6a
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.c
+2 -4
View File
@@ -20,6 +20,7 @@
#include "battle_controllers.h" #include "battle_controllers.h"
#include "scanline_effect.h" #include "scanline_effect.h"
#include "save_failed_screen.h" #include "save_failed_screen.h"
#include "quest_log.h"
extern u32 intr_main[]; extern u32 intr_main[];
@@ -77,9 +78,6 @@ static IntrFunc * const sTimerIntrFunc = gIntrTable + 0x7;
EWRAM_DATA u8 gDecompressionBuffer[0x4000] = {0}; EWRAM_DATA u8 gDecompressionBuffer[0x4000] = {0};
EWRAM_DATA u16 gTrainerId = 0; EWRAM_DATA u16 gTrainerId = 0;
extern bool8 gWirelessCommType;
extern bool8 gUnknown_3005E88;
static void UpdateLinkAndCallCallbacks(void); static void UpdateLinkAndCallCallbacks(void);
static void InitMainCallbacks(void); static void InitMainCallbacks(void);
static void CallCallbacks(void); static void CallCallbacks(void);
@@ -178,7 +176,7 @@ static void InitMainCallbacks(void)
gSaveBlock2Ptr = &gSaveBlock2; gSaveBlock2Ptr = &gSaveBlock2;
gSaveBlock1Ptr = &gSaveBlock1; gSaveBlock1Ptr = &gSaveBlock1;
gSaveBlock2.encryptionKey = 0; gSaveBlock2.encryptionKey = 0;
gUnknown_3005E88 = FALSE; gUnknown_3005E88 = 0;
} }
static void CallCallbacks(void) static void CallCallbacks(void)
src/quest_log.c
+1 -1
View File
@@ -2761,7 +2761,7 @@ static bool8 TrySetTrainerBattleQuestLogEvent(u16 eventId, const u16 *eventData)
return FALSE; return FALSE;
sub_81138F8(); sub_81138F8();
if (gUnknown_3005E88 || FlagGet(FLAG_SYS_GAME_CLEAR) || sub_81137E4(eventId, eventData) != TRUE) if (gUnknown_3005E88 != 0 || FlagGet(FLAG_SYS_GAME_CLEAR) || sub_81137E4(eventId, eventData) != TRUE)
{ {
gUnknown_203B024.unk_00 = eventId; gUnknown_203B024.unk_00 = eventId;
memcpy(gUnknown_203B024.unk_04, eventData, 8); memcpy(gUnknown_203B024.unk_04, eventData, 8);