From 2dfbe75b05cd6ec6e686d5e58de9a0a58e5af408 Mon Sep 17 00:00:00 2001 From: KDSKardabox Date: Sat, 8 Dec 2018 23:52:52 +0530 Subject: [PATCH] Shift externs to header file --- include/battle_anim.h | 6 ++++++ src/fire.c | 8 -------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/include/battle_anim.h b/include/battle_anim.h index c3601bbd9..8d73ea9b3 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -3,6 +3,7 @@ #include "battle.h" #include "constants/battle_anim.h" +#include "task.h" enum { @@ -124,6 +125,11 @@ void sub_80A6D60(struct UnknownAnimStruct2*, const void*, u32); void sub_80A6CC0(u32, const void*, u32); void sub_80A6DAC(bool8); void sub_80A634C(struct Sprite *); +void sub_80A653C(struct Sprite *); +void sub_80A7E6C(u8 spriteId); +void sub_80A805C(struct Task *task, u8 a2, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7); +u8 sub_80A80C8(struct Task *task); +void sub_80A8EE4(struct Sprite *); enum { diff --git a/src/fire.c b/src/fire.c index c5db6dbce..c054f154e 100644 --- a/src/fire.c +++ b/src/fire.c @@ -7,12 +7,6 @@ #include "task.h" #include "trig.h" -//battle anim -extern void sub_80A7E6C(u8 spriteId); -extern void sub_80A805C(struct Task *task, u8 a2, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7); -extern u8 sub_80A80C8(struct Task *task); - -extern void sub_80A653C(struct Sprite *); static void sub_8108EC8(struct Sprite *); static void sub_8108F08(struct Sprite *); static void sub_8108F4C(struct Sprite *); @@ -21,7 +15,6 @@ static void sub_8109028(struct Sprite *); static void sub_8109064(struct Sprite *); static void sub_81090D8(struct Sprite *); static void sub_810916C(struct Sprite *); -extern void TranslateAnimSpriteToTargetMonLocation(struct Sprite *); static void AnimEmberFlare(struct Sprite *); static void sub_8109200(struct Sprite *); static void AnimFireRing(struct Sprite *); @@ -35,7 +28,6 @@ static void sub_81093E4(struct Sprite *); static void sub_810940C(struct Sprite *); static void sub_81094D0(u8 taskId); static void sub_81097B4(u8 spriteId, u8 taskId, u8 a3); -extern void sub_80A8EE4(struct Sprite *); static void sub_81098EC(struct Sprite *); static u16 sub_8109930(u8 spriteId); static void sub_8109984(struct Sprite *sprite, s16 x, s16 y);