diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-21 12:46:19 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-21 12:46:19 +0100 |
commit | ad2ef517bd702c352d7a4d5b64db0e99f04721c2 (patch) | |
tree | 540ef4c700ee35c2b177e219a9c0092a3a9aa29c /include/field_effect.h | |
parent | 77352c7ee480fe3127692ce50a6bdd019de87291 (diff) | |
parent | 8a60952fc01ada92e029be488481a29da32f47eb (diff) |
option menu fix conflicts
Diffstat (limited to 'include/field_effect.h')
-rw-r--r-- | include/field_effect.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/field_effect.h b/include/field_effect.h index fb0f20f6f..1fdcbe22c 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -75,6 +75,7 @@ u32 FieldEffectStart(u8); bool8 FieldEffectActiveListContains(u8 id); void sub_80B69DC(void); void FieldEffectStop(struct Sprite *sprite, u8 id); +u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buffer); void sub_80B7FC8(void); void FieldEffectActiveListRemove(u8 id); |