14 files changed, 31 insertions, 6 deletions
diff --git a/include/bg_regs.h b/include/bg_regs.h
index 660b47d1e..e16cf3119 100644
--- a/include/bg_regs.h
+++ b/include/bg_regs.h
@@ -2,5 +2,6 @@
 #define GUARD_BG_REGS_H
 
 extern const u8 gBGControlRegOffsets[];
+extern const u16 gOverworldBackgroundLayerFlags[];
 
 #endif //GUARD_BG_REGS_H
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 792118c00..0c383b2bb 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -71,7 +71,7 @@ void LoadPlayerObjectReflectionPalette(u16, u8);
 void LoadSpecialObjectReflectionPalette(u16, u8);
 void TryMoveObjectEventToMapCoords(u8, u8, u8, s16, s16);
 void PatchObjectPalette(u16, u8);
-void sub_808E16C(s16, s16);
+void sub_805EDF0(s16, s16);
 void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat);
 void sub_8063AD4(s16, s16, s16 *, s16 *);
 u8 GetFaceDirectionAnimNum(u8);
@@ -221,5 +221,7 @@ u8 GetAcroPopWheelieMoveDirectionMovementAction(u32 direction);
 u8 GetAcroWheelieMoveDirectionMovementAction(u32 direction);
 u8 sub_80641EC(u32 direction);
 u8 GetFishingBiteDirectionAnimNum(u8 direction);
+void TrySpawnObjectEvents(s16 cameraX, s16 cameraY);
+void ResetObjectEvents(void);
 
 #endif // GUARD_EVENT_OBJECT_MOVEMENT_H
diff --git a/include/field_camera.h b/include/field_camera.h
index 270aac57a..9a76e6bfc 100644
--- a/include/field_camera.h
+++ b/include/field_camera.h
@@ -34,5 +34,8 @@ void DrawDoorMetatileAt(int x, int y, const u16 *data);
 void move_tilemap_camera_to_upper_left_corner(void);
 void CameraUpdate(void);
 void FieldUpdateBgTilemapScroll(void);
+void ResetCameraUpdateInfo(void);
+u32 InitCameraUpdateCallback(u8 trackedSpriteId);
+void sub_805ACF0(void);
 
 #endif //GUARD_FIELD_CAMERA_H
diff --git a/include/field_effect.h b/include/field_effect.h
index 40c58f44e..f9760d87f 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -27,5 +27,6 @@ void ReturnToFieldFromFlyMapSelect(void);
 void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b);
 void SpriteCB_PopOutOfAsh(struct Sprite * sprite);
 void SpriteCB_LavaridgeGymWarp(struct Sprite * sprite);
+void FieldEffectActiveListClear(void);
 
 #endif //GUARD_FIELD_EFFECTS_H
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index 73109ae1e..56e821fbd 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -60,5 +60,6 @@ void sub_805C260(void);
 void player_step(u8 direction, u16 newKeys, u16 heldKeys);
 bool32 PlayerIsMovingOnRockStairs(u8 direction);
 void sub_805BEB8(void);
+void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender);
 
 #endif //GUARD_FIELD_PLAYER_AVATAR_H
diff --git a/include/field_specials.h b/include/field_specials.h
index 447eb2c53..5beeba928 100644
--- a/include/field_specials.h
+++ b/include/field_specials.h
@@ -34,5 +34,7 @@ void IncrementBirthIslandRockStepCount(void);
 void ResetCyclingRoadChallengeData(void);
 void ResetFieldTasksArgs(void);
 bool8 UsedPokemonCenterWarp(void);
+void sub_80CC534(void);
+void sub_80CC59C(void);
 
 #endif // GUARD_FIELD_SPECIALS_H
diff --git a/include/field_tasks.h b/include/field_tasks.h
index aba2a9eee..b037e382d 100644
--- a/include/field_tasks.h
+++ b/include/field_tasks.h
@@ -4,5 +4,6 @@
 #include "global.h"
 
 void ActivatePerStepCallback(u8);
+void SetUpFieldTasks(void);
 
 #endif // GUARD_FIELD_TASKS_H
diff --git a/include/field_weather.h b/include/field_weather.h
index 44d9e5268..195b35318 100644
--- a/include/field_weather.h
+++ b/include/field_weather.h
@@ -144,6 +144,9 @@ void SetRainStrengthFromSoundEffect(u16 soundEffect);
 void sub_807A790(s8 gammaIndex);
 void sub_807A7C4(u8 gammaIndex, u8 gammaTargetIndex, u8 gammaStepDelay);
 void ApplyWeatherGammaShiftToPal(u8 paletteIndex);
+void StartWeather(void);
+void ResumePausedWeather(void);
+void FadeSelectedPals(u8 mode, s8 delay, u32 selectedPalettes);
 
 extern const u16 gCloudsWeatherPalette[];
 extern const u16 gSandstormWeatherPalette[];
diff --git a/include/fieldmap.h b/include/fieldmap.h
index 66928fab2..40aa1c916 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -40,5 +40,9 @@ void InitMap(void);
 void copy_map_tileset2_to_vram_2(const struct MapLayout * mapLayout);
 void apply_map_tileset2_palette(const struct MapLayout * mapLayout);
 void InitMapFromSavedGame(void);
+void copy_map_tileset1_to_vram(const struct MapLayout *mapLayout);
+void copy_map_tileset2_to_vram(const struct MapLayout *mapLayout);
+void GetCameraFocusCoords(u16 *x, u16 *y);
+void SetCameraFocusCoords(u16 x, u16 y);
 
 #endif //GUARD_FIELDMAP_H
diff --git a/include/map_preview_screen.h b/include/map_preview_screen.h
index a287c6f89..228d37d54 100644
--- a/include/map_preview_screen.h
+++ b/include/map_preview_screen.h
@@ -59,5 +59,6 @@ void MapPreview_InitBgs(void);
 void MapPreview_LoadGfx(u8 mapsec);
 bool32 MapPreview_IsGfxLoadFinished(void);
 void MapPreview_Unload(s32 windowId);
+void MapPreview_StartForestTransition(u8 mapsec);
 
 #endif //GUARD_MAP_PREVIEW_SCREEN_H
diff --git a/include/overworld.h b/include/overworld.h
index d8f72de27..c4d4520bf 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -44,8 +44,8 @@ struct LinkPlayerObjectEvent
 struct CreditsOverworldCmd
 {
     s16 unk_0;
-    u16 unk_2;
-    u16 unk_4;
+    s16 unk_2;
+    s16 unk_4;
 };
 
 /* gDisableMapMusicChangeOnMapLoad */
diff --git a/include/quest_log.h b/include/quest_log.h
index 3a751e51d..54da8822a 100644
--- a/include/quest_log.h
+++ b/include/quest_log.h
@@ -57,5 +57,10 @@ bool8 sub_8111CD0(void);
 void sub_8115798(void);
 bool8 sub_8113748(void);
 void sub_81119C8(void);
+void sub_8111F14(void);
+void sub_8110FCC(void);
+u8 sub_8110AC8(void);
+void sub_81113E4(void);
+void sub_8111438(void);
 
 #endif //GUARD_QUEST_LOG_H
diff --git a/include/quest_log_objects.h b/include/quest_log_objects.h
index d3e11d11f..fbf73f504 100644
--- a/include/quest_log_objects.h
+++ b/include/quest_log_objects.h
@@ -5,5 +5,6 @@
 
 void SetQuestLogObjectEventsData(struct QuestLog *);
 void SetSav1ObjectEventsFromQuestLog(struct QuestLog *, struct ObjectEventTemplate *);
+void sub_815A540(void);
 
 #endif //GUARD_QUEST_LOG_OBJECTS_H
diff --git a/include/script.h b/include/script.h
index 48b169ef1..a37909137 100644
--- a/include/script.h
+++ b/include/script.h
@@ -50,11 +50,11 @@ void mapheader_run_script_by_tag(u8 tag);
 u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag);
 void RunOnLoadMapScript(void);
 void RunOnTransitionMapScript(void);
-void mapheader_run_script_with_tag_x5(void);
-void mapheader_run_script_with_tag_x7(void);
+void RunOnResumeMapScript(void);
+void RunOnReturnToFieldMapScript(void);
 void RunOnDiveWarpMapScript(void);
 bool8 TryRunOnFrameMapScript(void);
-void mapheader_run_first_tag4_script_list_match(void);
+void TryRunOnWarpIntoMapScript(void);
 u32 CalculateRamScriptChecksum(void);
 void ClearRamScript(void);
 bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId);