3 files changed, 8 insertions, 65 deletions
diff --git a/src/field_specials.c b/src/field_specials.c
index f2ebf2b8e..3c26085dd 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -1956,7 +1956,7 @@ void sub_8139D98(void)
     }
 }
 
-bool32 warp0_in_pokecenter(void)
+bool8 warp0_in_pokecenter(void)
 {
     static const u16 gUnknown_085B2C2A[] = { 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a, 0x1a35, 0x193c, 0xFFFF };
 
diff --git a/src/new_game.c b/src/new_game.c
index 158120245..f68ed3d4f 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -8,6 +8,7 @@
 #include "lottery_corner.h"
 #include "play_time.h"
 #include "mauville_old_man.h"
+#include "match_call.h"
 #include "lilycove_lady.h"
 #include "load_save.h"
 #include "pokeblock.h"
@@ -47,7 +48,6 @@ extern void NewGameInitPCItems(void);
 extern void ClearDecorationInventories(void);
 extern void ResetFanClub(void);
 extern void copy_strings_to_sav1(void);
-extern void InitMatchCallCounters(void);
 extern void sub_801AFD8(void);
 extern void sub_800E5AC(void);
 extern void ResetContestLinkResults(void);
diff --git a/src/overworld.c b/src/overworld.c
index 2bc4f96d5..43610fe09 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -19,6 +19,7 @@
 #include "field_tasks.h"
 #include "field_weather.h"
 #include "fieldmap.h"
+#include "fldeff.h"
 #include "gpu_regs.h"
 #include "heal_location.h"
 #include "link.h"
@@ -28,6 +29,7 @@
 #include "alloc.h"
 #include "m4a.h"
 #include "map_name_popup.h"
+#include "match_call.h"
 #include "menu.h"
 #include "metatile_behavior.h"
 #include "mirage_tower.h"
@@ -42,14 +44,15 @@
 #include "save.h"
 #include "save_location.h"
 #include "script.h"
-// #include "script_pokemon_80C4.h"
+#include "script_pokemon_util_80F87D8.h"
 #include "secret_base.h"
 #include "sound.h"
 #include "start_menu.h"
 #include "task.h"
-// #include "tileset_anim.h"
+#include "tileset_anims.h"
 #include "time_events.h"
 #include "trainer_hill.h"
+#include "trainer_pokemon_sprites.h"
 #include "tv.h"
 #include "scanline_effect.h"
 #include "wild_encounter.h"
@@ -85,71 +88,11 @@ extern const u8 gUnknown_082773F5[];
 extern const u8 gUnknown_082774EF[];
 extern const u8 gUnknown_08277509[];
 
-// vars
 extern const struct MapLayout *const gMapLayouts[];
 extern const struct MapHeader *const *const gMapGroups[];
-extern const s32 gMaxFlashLevel;
+extern const int gMaxFlashLevel;
 extern const u16 gUnknown_82EC7C4[];
 
-// functions
-extern void HealPlayerParty(void);
-extern void move_tilemap_camera_to_upper_left_corner(void);
-extern void cur_mapheader_run_tileset_funcs_after_some_cpuset(void);
-extern void DrawWholeMapView(void);
-extern void copy_map_tileset1_tileset2_to_vram(const struct MapLayout *);
-extern void apply_map_tileset1_tileset2_palette(const struct MapLayout *);
-extern void ResetCyclingRoadChallengeData(void);
-extern void ApplyNewEncryptionKeyToWord(u32 *word, u32 newKey);
-extern void mapheader_run_script_with_tag_x5(void);
-extern void ResetFieldTasksArgs(void);
-extern void sub_80A0A2C(void);
-extern void apply_map_tileset2_palette(const struct MapLayout *);
-extern void copy_map_tileset2_to_vram_2(const struct MapLayout *);
-extern void RestartWildEncounterImmunitySteps(void);
-extern void ShowMapNamePopup(void);
-extern bool32 sub_808651C(void);
-extern bool8 sub_80AF6A4(void);
-extern bool8 sub_80E909C(void);
-extern void c2_change_map(void);
-extern void sub_81D5DF8(void);
-extern void sub_80EB218(void);
-extern void sub_80AF3C8(void);
-extern void sub_808B578(void);
-extern void sub_80AF314(void);
-extern void sub_80AF214(void);
-extern void sub_80AF188(void);
-extern void RotatingGate_InitPuzzleAndGraphics(void);
-extern void sub_80AF168(void);
-extern void sub_80AF3C8(void);
-extern void ExecuteTruckSequence(void);
-extern void sub_80A0A38(void);
-extern void WriteFlashScanlineEffectBuffer(u8);
-extern void InitMatchCallCounters(void);
-extern void sub_80EDB44(void);
-extern void InitFieldMessageBox(void);
-extern void copy_map_tileset1_to_vram(const struct MapLayout *);
-extern void copy_map_tileset2_to_vram(const struct MapLayout *);
-extern void FieldUpdateBgTilemapScroll(void);
-extern void TransferTilesetAnimsBuffer(void);
-extern bool8 warp0_in_pokecenter(void);
-extern void ResetAllPicSprites(void);
-extern void FieldEffectActiveListClear(void);
-extern void SetUpFieldTasks(void);
-extern void ShowStartMenu(void);
-extern void sub_80AEE84(void);
-extern void mapldr_default(void);
-extern bool32 sub_800F0B8(void);
-extern bool32 sub_8009F3C(void);
-extern void sub_8010198(void);
-extern u32 sub_800B4DC(void);
-extern bool32 sub_80B39D4(u8);
-extern const u8* GetInteractedLinkPlayerScript(struct MapPosition *a1, u8, u8);
-extern u8 *GetCoordEventScriptAtMapPosition(void*);
-extern u8 GetFRLGAvatarGraphicsIdByGender(u8);
-extern u8 GetRSAvatarGraphicsIdByGender(u8);
-extern void UpdateEventObjectSpriteVisibility(struct Sprite*, u8);
-
-// this file's functions
 static void Overworld_ResetStateAfterWhiteOut(void);
 static void c2_80567AC(void);
 static void CB2_LoadMap2(void);