diff options
author | Marcus Huderle <huderlem@gmail.com> | 2019-03-17 17:20:40 -0500 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2019-03-17 17:20:40 -0500 |
commit | e9a3cc6d51ce3818eed11de585f5084342450093 (patch) | |
tree | 414ed687f836521c1a966531e87122951c070083 /include/field_effect_helpers.h | |
parent | c3feb9871f4d05cd9874dd8fc0c2016eaa072864 (diff) | |
parent | 4ae8a52473a0e4842cf140bf0c59f0276125a896 (diff) |
Merge remote-tracking branch 'upstream/master' into move-tutor
# Conflicts:
# include/pokenav.h
# src/battle_script_commands.c
Diffstat (limited to 'include/field_effect_helpers.h')
-rw-r--r-- | include/field_effect_helpers.h | 1 |
1 files changed, 1 insertions, 0 deletions
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 |