diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-29 23:07:14 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-29 23:07:14 -0400 |
| commit | 4b39fed48e533f276a713b2af3ff318f9ab49687 (patch) | |
| tree | 9aeac3da65258b98e2d73e818c1dae1ebc95ddc7 /include/field_effect_helpers.h | |
| parent | 33e4b85704e13e33d014fad6476f324116e80873 (diff) | |
| parent | 13f16b577935635546698aca88b3d1780cbc4991 (diff) | |
Merge branch 'master' into field_map_obj
Diffstat (limited to 'include/field_effect_helpers.h')
| -rw-r--r-- | include/field_effect_helpers.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index 11e96254d..7bba24fa6 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -1,6 +1,8 @@ #ifndef GUARD_FIELD_EFFECT_HELPERS_H #define GUARD_FIELD_EFFECT_HELPERS_H +extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; + void sub_812869C(struct MapObject *); bool8 sub_81286C4(struct MapObject *); void oamc_shadow(struct Sprite *); @@ -26,9 +28,9 @@ void sub_8126BC4(u8 unk_1B, u8 r6, s16 x, s16 y); void sub_8127ED0(u8, u8); void sub_8127F28(u8, u8, s16); u8 sub_8128124(u8 id); -void ash(s16, s16, u16, u8); +void ash(s16, s16, u16, s16); void SetUpReflection(struct MapObject *mapObj, struct Sprite *sprite, u8 a); u32 oe_exec_and_other_stuff(u8 fieldEffectId, struct MapObject *mapObject); -u8 sub_8126FF0(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y); +u8 sub_8126FF0(u8, u8, u8, s16, s16); #endif // GUARD_FIELD_EFFECT_HELPERS_H |