fix battle transition conflicts

This commit is contained in:
DizzyEggg
2018-01-14 22:19:26 +01:00
806 changed files with 26595 additions and 2758 deletions

View File

@@ -76,5 +76,7 @@ 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);
#endif //GUARD_FIELD_EFFECTS_H