Merge branch 'master' of github.com:pret/pokefirered into script_menu

2019-10-26 10:23:13 -04:00
parent fd78afa5a7 1f569f0136
commit 93f0703fcd
188 changed files with 9474 additions and 26062 deletions
@@ -2,6 +2,7 @@
 #define GUARD_QUEST_LOG_H

 #include "global.h"
+#include "quest_log_battle.h"

 struct UnkStruct_3005E90
 {
@@ -14,6 +15,7 @@ struct UnkStruct_3005E90
    u8 unk_2;
 };

+extern u8 gUnknown_203ADFA;
 extern u8 gUnknown_3005E88;
 extern u16 sNumQuestLogs;
 extern struct UnkStruct_3005E90 gUnknown_3005E90;
@@ -40,6 +42,8 @@ void sub_8112450(void);
 void sub_8112364(void);
 u8 sub_8112CAC(void);
 void sub_81138F8(void);
+void sub_811231C(void);
+void sub_81139BC(void);
 void *QuestLogGetFlagOrVarPtr(bool8 isFlag, u16 idx);
 void QuestLogSetFlagOrVar(bool8 isFlag, u16 idx, u16 value);