diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-26 17:07:52 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-26 17:07:52 -0400 |
| commit | 402f2643bd9159638002b18010d09fa3309c1f9f (patch) | |
| tree | 2ccf4cd24a17630ed107bc5749eaf998927d5476 /src/trainer_see.c | |
| parent | d69a051df50232dbc0c2d0b595d5eeb0d5fb3133 (diff) | |
| parent | 7a6d4525c4066038832d85a45ed6df6ab4660309 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into field_player_avatar
Diffstat (limited to 'src/trainer_see.c')
| -rw-r--r-- | src/trainer_see.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/trainer_see.c b/src/trainer_see.c index 6fad80468..5681c4344 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -42,7 +42,7 @@ static void Task_DestroyTrainerApproachTask(u8 taskId); static void SpriteCB_TrainerIcons(struct Sprite * sprite); static void SetIconSpriteData(struct Sprite *sprite, u16 fldEffId, u8 spriteAnimNum); -static const u16 sGfx_Emoticons[] = INCBIN_U16("graphics/object_events/emoticons.4bpp"); +static const u16 sGfx_Emoticons[] = INCBIN_U16("graphics/misc/emoticons.4bpp"); // u8 func(struct ObjectEvent * trainerObj, s16 range, s16 x, s16 y) // range is the maximum distance the trainer can see |