summaryrefslogtreecommitdiff
path: root/include/field_effect.h
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-11-03 18:00:47 -0700
committerMarcus Huderle <huderlem@gmail.com>2017-11-03 18:14:15 -0700
commit415fb6738308a9bfa2217419d3861784dcd8e5d9 (patch)
tree8793240342d37104610f34756f6fee9db706ee8f /include/field_effect.h
parentae56f7859fe17915d3fb33713dfef2fe31fe2a1d (diff)
parent1698e882b4760bcfe8cf91073cf7e46541ae6392 (diff)
Merge remote-tracking branch 'upstream/master' into pokenav
Diffstat (limited to 'include/field_effect.h')
-rw-r--r--include/field_effect.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/field_effect.h b/include/field_effect.h
index ea02c4131..a509697e4 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);
@@ -253,6 +253,6 @@ void MultiplyInvertedPaletteRGBComponents(u16, u8, u8, u8);
void sub_80878A8(void);
void sub_8087BA8(void);
-extern u32 gUnknown_0202FF84[8];
+extern u32 gFieldEffectArguments[8];
#endif // GUARD_FIELD_EFFECT_H