summaryrefslogtreecommitdiff
path: root/src/fldeff_emotion.c
diff options
context:
space:
mode:
authorMarijn van der Werf <marijn.vanderwerf@gmail.com>2016-12-01 03:51:24 +0100
committerYamaArashi <YamaArashi@users.noreply.github.com>2016-11-30 18:51:24 -0800
commit4258e60771aa9fdabd678930eca534423bd371b8 (patch)
treeecca2ee7641abc0562f39b6c7dd907af2184e102 /src/fldeff_emotion.c
parent831f8cd4fd94613d6b52d87df1b4903bedfaa717 (diff)
Declare more non-static functions in header files (#111)
* Declare more non-static functions in header files * Use `(void)` for functions without arguments. * Move global-included data to seperate headers * Don't import types or global in header * Fix fieldmap imports * Revert in-code changes * Add missing newlines
Diffstat (limited to 'src/fldeff_emotion.c')
-rw-r--r--src/fldeff_emotion.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fldeff_emotion.c b/src/fldeff_emotion.c
index 06eb7bd9e..81ab135c4 100644
--- a/src/fldeff_emotion.c
+++ b/src/fldeff_emotion.c
@@ -1,6 +1,7 @@
#include "global.h"
#include "sprite.h"
-#include "fieldmap.h"
+#include "asm_fieldmap.h"
+#include "field_effect.h"
extern u32 gUnknown_0202FF84[];
@@ -9,7 +10,6 @@ extern struct SpriteTemplate gSpriteTemplate_839B528;
bool8 TryGetFieldObjectIdByLocalIdAndMap(u8, u8, u8, u8 *);
-void FieldEffectStop(struct Sprite *sprite, u16 a2);
void sub_8084894(struct Sprite *sprite, u16 a2, u8 a3);
void objc_exclamation_mark_probably(struct Sprite *sprite);