Reduce externs

18 files changed, 49 insertions, 4 deletions

diff --git a/include/battle_anim.h b/include/battle_anim.h
index d0d323216..4e241686f 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -204,6 +204,9 @@ void sub_80A718C(struct Sprite *sprite);
 #define STAT_ANIM_MULTIPLE_MINUS2 58
 void LaunchStatusAnimation(u8 battlerId, u8 statusAnimId);
 
+// battle_anim_8170478.c
+void sub_8172EF0(u8 battler, struct Pokemon *mon);
+
 // ground.c
 void sub_81152DC(u8 taskId);
 
@@ -216,6 +219,12 @@ u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 selectedPalettes,
 void sub_8116EB4(u8);
 void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u32 *arg8, const u32 *arg9, const u32 *palette);
 
+// battle_anim_effects_1.c
+void sub_810310C(u8 battler, struct Sprite* sprite);
+
+// smokescreen.c
+u8 sub_807521C(s16 x, s16 y, u8 a3);
+
 u32 UnpackSelectedBattleAnimPalettes(s16);
 
 u8 GetBattlerSpriteFinal_Y(u8, u16, u8);
diff --git a/include/contest.h b/include/contest.h
index e4391a327..8146486cb 100644
--- a/include/contest.h
+++ b/include/contest.h
@@ -478,5 +478,6 @@ bool32 sub_80FC4F4(void *, u16);
 bool8 sub_80FC55C(void);
 bool8 sub_80FC530(u8);
 u8 sub_80F86E0(u8 *);
+void sub_80FC9F8(u8 taskId);
 
 #endif //GUARD_CONTEST_H
diff --git a/include/event_obj_lock.h b/include/event_obj_lock.h
index 59532fdcb..2f09ad36a 100644
--- a/include/event_obj_lock.h
+++ b/include/event_obj_lock.h
@@ -7,5 +7,6 @@ bool8 sub_809847C(void);
 void LockSelectedEventObject(void);
 void sub_8098630(void);
 bool8 sub_8098734(void);
+void ScriptUnfreezeEventObjects(void);
 
 #endif // GUARD_EVENT_OBJ_LOCK_H
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 284bbe8db..63ac09f2d 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -193,6 +193,9 @@ void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible);
 s16 sub_809773C(s16 a1);
 s16 sub_8097728(s16 a1);
 void CameraObjectReset2(void);
+u8 EventObjectGetBerryTreeId(u8 eventObjectId);
+void sub_8092EF0(u8 mapId, u8 mapNumber, u8 mapGroup);
+bool8 IsBerryTreeSparkling(u8, u8, u8);
 
 void MovementType_None(struct Sprite *);
 void MovementType_LookAround(struct Sprite *);
diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h
index 738cceb3e..feb20cef6 100644
--- a/include/field_control_avatar.h
+++ b/include/field_control_avatar.h
@@ -39,5 +39,6 @@ int SetCableClubWarp(void);
 u8 TrySetDiveWarp(void);
 const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatileBehavior, u8 direction);
 u8 *GetCoordEventScriptAtMapPosition(struct MapPosition *position);
+void ClearPoisonStepCounter(void);
 
 #endif // GUARD_FIELDCONTROLAVATAR_H
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h
index 6022467e4..6ea9771e6 100644
--- a/include/field_effect_helpers.h
+++ b/include/field_effect_helpers.h
@@ -34,5 +34,6 @@ void UpdateSparkleFieldEffect(struct Sprite*);
 void SetSpriteInvisible(u8 spriteId);
 void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y);
 void sub_8155604(u8 spriteId, u8 value, s16 data1);
+void sub_81555D8(u8 spriteId, u8 value);
 
 #endif //GUARD_FIELD_EFFECT_HELPERS_H
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index 45cd0dbd9..ae7aa92d2 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -63,5 +63,12 @@ u8 sub_808BCD0(void);
 void sub_808B578(void);
 u8 GetFRLGAvatarGraphicsIdByGender(u8);
 u8 GetRSAvatarGraphicsIdByGender(u8);
+void sub_808B980(u8 direction);
+void sub_808B9BC(u8 direction);
+void sub_808B9A4(u8 direction);
+void sub_808C1B4(u8 direction);
+void sub_808B9D4(u8 direction);
+void sub_808D194(void);
+void sub_808D1C8(void);
 
 #endif // GUARD_FIELD_PLAYER_AVATAR_H
diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h
index 2b8b3a5a3..b4429c167 100644
--- a/include/field_screen_effect.h
+++ b/include/field_screen_effect.h
@@ -41,5 +41,6 @@ void sub_80B0534(void);
 void sub_80B058C(void);
 void sub_80B05B4(void);
 void WriteFlashScanlineEffectBuffer(u8 flashLevel);
+bool8 walkrun_is_standing_still(void);
 
 #endif // GUARD_FIELD_SCREEN_EFFECT_H
diff --git a/include/field_special_scene.h b/include/field_special_scene.h
index 240e9ecb6..2219c9433 100644
--- a/include/field_special_scene.h
+++ b/include/field_special_scene.h
@@ -10,5 +10,6 @@ void Task_HandleTruckSequence(u8 taskId);
 void ExecuteTruckSequence(void);
 void EndTruckSequence(u8);
 void sub_80C791C(void);
+void sub_80FB768(void);
 
 #endif // GUARD_FIELD_SPECIAL_SCENE_H
diff --git a/include/field_specials.h b/include/field_specials.h
index bff04a739..e6ed60593 100644
--- a/include/field_specials.h
+++ b/include/field_specials.h
@@ -26,6 +26,6 @@ void UpdateFrontierGambler(u16 a0);
 void ResetCyclingRoadChallengeData(void);
 bool8 warp0_in_pokecenter(void);
 void ResetFanClub(void);
-
+bool8 sub_813B21C(void);
 
 #endif // GUARD_FIELD_SPECIALS_H
diff --git a/include/fieldmap.h b/include/fieldmap.h
index 24bc4989a..8e10240d2 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -37,8 +37,8 @@ void copy_map_tileset1_tileset2_to_vram(struct MapLayout const *mapLayout);
 void apply_map_tileset1_tileset2_palette(struct MapLayout const *mapLayout);
 void apply_map_tileset2_palette(struct MapLayout const *mapLayout);
 void copy_map_tileset2_to_vram_2(struct MapLayout const *mapLayout);
-extern void copy_map_tileset1_to_vram(const struct MapLayout *);
-extern void copy_map_tileset2_to_vram(const struct MapLayout *);
+void copy_map_tileset1_to_vram(const struct MapLayout *);
+void copy_map_tileset2_to_vram(const struct MapLayout *);
 
 void SpriteCB_PokeballGlow(struct Sprite *);
 void SpriteCB_PokecenterMonitor(struct Sprite *);
diff --git a/include/flying.h b/include/flying.h
new file mode 100644
index 000000000..062320b4d
--- /dev/null
+++ b/include/flying.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_FLYING_H
+#define GUARD_FLYING_H
+
+void sub_810E2C8(struct Sprite *sprite);
+
+#endif // GUARD_FLYING_H
\ No newline at end of file
diff --git a/include/item_menu.h b/include/item_menu.h
index 2ca1af200..465e5966e 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -71,6 +71,7 @@ void sub_81AAC14(void);
 void sub_81AAC50(void);
 void sub_81AAC70(void);
 void sub_81AAC28(void);
+void sub_81AABB0(void);
 void SetInitialScrollAndCursorPositions(u8 pocketId);
 void bag_menu_mail_related(void);
 void CB2_BagMenuFromStartMenu(void);
@@ -80,6 +81,8 @@ void CB2_GoToSellMenu(void);
 void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)());
 void DoWallyTutorialBagMenu(void);
 void ResetBagScrollPositions(void);
+void sub_81AABF0(void (*callback)(void));
+void CB2_ChooseBerry(void);
 
 
 #endif //GUARD_item_menu_H
diff --git a/include/link.h b/include/link.h
index 83deab88f..400816fd0 100644
--- a/include/link.h
+++ b/include/link.h
@@ -261,6 +261,7 @@ void sub_800B3A4(u32 who);
 bool32 sub_800A07C(void);
 void sub_800AB98(void);
 void sub_800AA04(u8 a0);
+void sub_800B4C0(void);
 
 extern u16 gLinkPartnersHeldKeys[6];
 extern u32 gLinkDebugSeed;
diff --git a/include/main.h b/include/main.h
index 728064288..1b312550e 100644
--- a/include/main.h
+++ b/include/main.h
@@ -68,7 +68,7 @@ void ClearPokemonCrySongs(void);
 void RestoreSerialTimer3IntrHandlers(void);
 void StartTimer1(void);
 void SeedRngAndSetTrainerId(void);
-extern u16 GetGeneratedTrainerIdLower(void);
+u16 GetGeneratedTrainerIdLower(void);
 
 
 #endif // GUARD_MAIN_H
diff --git a/include/match_call.h b/include/match_call.h
index 17d40d41c..1bf654937 100644
--- a/include/match_call.h
+++ b/include/match_call.h
@@ -12,5 +12,8 @@ enum {
 
 s32 GetRematchIdxByTrainerIdx(s32 trainerIdx);
 void InitMatchCallCounters(void);
+bool32 TryStartMatchCall(void);
+bool32 IsMatchCallTaskActive(void);
+void StartMatchCallFromScript(u8* script);
 
 #endif //GUARD_MATCH_CALL_H
diff --git a/include/pokedex.h b/include/pokedex.h
index 6136f7786..c3700c811 100644
--- a/include/pokedex.h
+++ b/include/pokedex.h
@@ -43,5 +43,6 @@ s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId);
 u16 CreateMonSpriteFromNationalDexNumber(u16, s16, s16, u16);
 bool16 HasAllHoennMons(void);
 void ResetPokedexScrollPositions(void);
+u16 sub_80C0944(void);
 
 #endif // GUARD_POKEDEX_H
diff --git a/include/water.h b/include/water.h
new file mode 100644
index 000000000..9f876021c
--- /dev/null
+++ b/include/water.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_WATER_H
+#define GUARD_WATER_H
+
+void sub_8108C94(struct Sprite *sprite);
+
+#endif // GUARD_WATER_H
\ No newline at end of file