From 1f222c04ef1d10ff5a5c6bb98cd4380ecf2bba86 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 2 Dec 2016 19:06:22 +0100 Subject: [WIP] Extract all external function declarations to headers (#114) * Extract other external function declarations * Fix GBA compilation * Revert `sub_803C434` to asm --- src/trainer_see.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'src/trainer_see.c') diff --git a/src/trainer_see.c b/src/trainer_see.c index 6e2292067..ed0b5caf4 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -1,5 +1,7 @@ #include "global.h" #include "trainer_see.h" +#include "asm.h" +#include "battle_setup.h" #include "field_player_avatar.h" #include "field_map_obj.h" #include "asm_fieldmap.h" @@ -8,24 +10,6 @@ #include "field_effect.h" #include "script.h" -extern u8 * GetFieldObjectScriptPointerByFieldObjectId(u8); -extern u8 * GetTrainerFlagFromScriptPointer(u8 *); -extern u8 sub_8060024(struct MapObject *, s16, s16, u8); -extern u8 npc_block_way(struct MapObject *, s16, s16, u8); -extern u8 npc_running_behaviour_by_direction(u8); -extern u8 GetGoSpeed0AnimId(u8); -extern u8 GetOppositeDirection(u8); -extern u8 GetFaceDirectionAnimId(u8); -extern bool8 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct MapObject *); -extern bool8 FieldObjectCheckIfSpecialAnimFinishedOrInactive(struct MapObject *); -extern bool8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *); -extern void FieldObjectClearAnim(struct MapObject *); -extern void TrainerWantsBattle(u8, u8 *); -extern void FieldObjectSetSpecialAnim(struct MapObject *, u8); -extern void LoadWordFromTwoHalfwords(u32, u8 *); -extern void StoreWordInTwoHalfwords(u32, u8 *); - - extern bool8 (*gIsTrainerInRange[])(struct MapObject *, u16, s16, s16); extern bool8 (*gTrainerSeeFuncList[])(u8, struct Task *, struct MapObject *); extern bool8 (*gTrainerSeeFuncList2[])(u8, struct Task *, struct MapObject *); -- cgit v1.2.3