diff options
| author | U-User-PC\User <golemgalvanize@github.com> | 2017-08-30 16:23:19 -0400 |
|---|---|---|
| committer | U-User-PC\User <golemgalvanize@github.com> | 2017-08-30 16:23:19 -0400 |
| commit | 1ca1651cdcdfc2ca2f8c9214c88fd23b5196f85e (patch) | |
| tree | a6c9f2edfb0f5c380cc35175024d18bd77ea243a /include/field_effect.h | |
| parent | 7c32f9d05f06303f5350eb079960e0d4fab40dcd (diff) | |
| parent | d7a6ff0e4dab0c96ac49975a0695014bff2b9654 (diff) | |
attempting to resolve conflict
Diffstat (limited to 'include/field_effect.h')
| -rw-r--r-- | include/field_effect.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/field_effect.h b/include/field_effect.h index ea02c4131..f43b15afb 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -244,7 +244,7 @@ void sub_808948C(struct Task *); void sub_80894C4(struct Task *); void fishE(struct Task *); -u8 CreateTrainerSprite_BirchSpeech(u8 gender, s16 x, s16 y, u8 subpriority, u8 *buffer); +u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buffer); void LoadTrainerGfx_TrainerCard(u8 gender, u16 palOffset, u8 *dest); u8 CreateBirchSprite(s16 x, s16 y, u8 subpriority); u8 CreateMonSprite_PicBox(u16, s16, s16, u8); |