Merge branch 'master' into event_object_movement

include/quest_log.h

@@ -26,10 +26,10 @@ extern const u16 gUnknown_84566A8[];
 void sub_8112720(u8);
 void SetQuestLogEvent(u16, const u16 *);
 void sub_811539C(void);
-void sub_8115748(u16);
+void QuestLog_RecordEnteredMap(u16);
 u8 sub_8112CAC(void);
 bool8 QuestLog_SchedulePlaybackCB(void (*func)(void));
-void sub_8111F38(u16, u16);
+void sub_8111F38(u16 offset, u16 idx);
 void sub_8111134(void);
 void DestroyHelpMessageWindow(u8 a0);
 u8 CreateHelpMessageWindow(void);
@@ -51,5 +51,9 @@ void sub_8110840(void *oldSave);
 void sub_8112F18(u8 windowId);
 void sub_811246C(struct Sprite *sprite);
 void sub_81124EC(u8 a0, u8 a1, u8 a2, u8 a3);
+bool8 sub_8111C2C(void);
+void sub_81128BC(u8 a0);
+void sub_811278C(u8, u8);
+void Special_UpdateTrainerFansAfterLinkBattle(void);
 
 #endif //GUARD_QUEST_LOG_H