6 files changed, 24 insertions, 11 deletions
diff --git a/include/event_scripts.h b/include/event_scripts.h
index 3fda94a5f..c211e3a34 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -1209,4 +1209,7 @@ extern const u8 CableClub_Text_AwaitingLinkupBCancel[];
 extern const u8 CableClub_Text_StartLinkWithXPlayersAConfirmBCancel[];
 extern const u8 CableClub_Text_PleaseWaitBCancel[];
 
+// fldeff_flash
+extern const u8 EventScript_FldEffFlash[];
+
 #endif //GUARD_EVENT_SCRIPTS_H
diff --git a/include/field_weather.h b/include/field_weather.h
index 115cc0dca..6b62f0edd 100644
--- a/include/field_weather.h
+++ b/include/field_weather.h
@@ -3,7 +3,7 @@
 
 #include "global.h"
 
-void FadeScreen(u8, s8);
+void FadeScreen(u8 mode, s8 delay);
 
 void SetSav1Weather(u32);
 u8 GetSav1Weather(void);
diff --git a/include/fldeff.h b/include/fldeff.h
index 00f2d01f4..9dd6121b2 100644
--- a/include/fldeff.h
+++ b/include/fldeff.h
@@ -13,8 +13,8 @@ bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId);
 u8 CreateFieldEffectShowMon(void);
 
 // flash
-u8 sub_80C9DCC(u8 lightLevel, u8 mapType);
-u8 sub_80C9D7C(u8 mapType1, u8 mapType2);
+u8 MapTransitionIsExit(u8 lightLevel, u8 mapType);
+u8 MapTransitionIsEnter(u8 mapType1, u8 mapType2);
 bool8 SetUpFieldMove_Flash(void);
 
 // cut
diff --git a/include/map_preview_screen.h b/include/map_preview_screen.h
index ea85baf71..a287c6f89 100644
--- a/include/map_preview_screen.h
+++ b/include/map_preview_screen.h
@@ -34,21 +34,30 @@ enum MapPreviewScreenId
     MPS_COUNT
 };
 
+#define MPS_TYPE_CAVE   0
+#define MPS_TYPE_FOREST 1
+#define MPS_TYPE_ANY    2
+
 struct MapPreviewScreen
 {
     u8 mapsec;
-    bool8 forceFirstTime;
+    u8 type;
     u16 flagId;
     const void * tilesptr;
     const void * tilemapptr;
     const void * palptr;
 };
 
-u16 sub_80F8318(u8 id);
-void sub_80F85BC(u16 a0);
-u16 sub_80F856C(u8 id);
-bool8 sub_80F8110(u8 mapsec, bool8 forceFirstTime);
-bool32 sub_80F83B0(void);
+u16 MapPreview_CreateMapNameWindow(u8 id);
+void MapPreview_SetFlag(u16 a0);
+u16 MapPreview_GetDuration(u8 id);
+bool8 MapHasPreviewScreen(u8 mapsec, u8 type);
+bool32 ForestMapPreviewScreenIsRunning(void);
 const struct MapPreviewScreen * GetDungeonMapPreviewScreenInfo(u8 mapsec);
+bool32 MapHasPreviewScreen_HandleQLState2(u8 mapsec, u8 type);
+void MapPreview_InitBgs(void);
+void MapPreview_LoadGfx(u8 mapsec);
+bool32 MapPreview_IsGfxLoadFinished(void);
+void MapPreview_Unload(s32 windowId);
 
 #endif //GUARD_MAP_PREVIEW_SCREEN_H
diff --git a/include/overworld.h b/include/overworld.h
index daaa5e6e8..02492f74b 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -157,7 +157,7 @@ void Overworld_ResetStateAfterDigEscRope(void);
 bool32 sub_8058244(void);
 u8 GetCurrentMapType(void);
 
-u8 get_map_light_from_warp0(void);
+u8 GetLastUsedWarpMapType(void);
 const struct MapHeader *warp1_get_mapheader(void);
 void TryFadeOutOldMapMusic(void);
 void CB2_ReturnToFieldCableClub(void);
@@ -192,6 +192,7 @@ void sub_8057F48(void);
 void SetMainCallback1(MainCallback cb);
 void CB1_Overworld(void);
 void sub_80568C4(void);
+u8 GetLastUsedWarpMapSectionId(void);
 
 extern u16 gHeldKeyCodeToSend;
 
diff --git a/include/quest_log.h b/include/quest_log.h
index 3241046bc..b2645954f 100644
--- a/include/quest_log.h
+++ b/include/quest_log.h
@@ -26,7 +26,7 @@ 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 offset, u16 idx);