diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-09-30 16:55:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-30 16:55:19 -0700 |
| commit | 5fb9b9052276243d54ecfc27d0514e9c35825e8c (patch) | |
| tree | 7546411871d12a05f370b529341ebfd656334af1 /src/field_effect.c | |
| parent | f74d4742f597a423b7a8685d72c06597c8c78db7 (diff) | |
| parent | 37b891cbd49780d63fe2295add70bf003c59de48 (diff) | |
Merge pull request #437 from huderlem/name_labels
Name labels
Diffstat (limited to 'src/field_effect.c')
| -rw-r--r-- | src/field_effect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/field_effect.c b/src/field_effect.c index 72224f299..1bdf82991 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -660,7 +660,7 @@ u8 CreateMonSprite_FieldMove(u16 species, u32 d, u32 g, s16 x, s16 y, u8 subprio const struct CompressedSpritePalette *spritePalette; HandleLoadSpecialPokePic(&gMonFrontPicTable[species], gMonFrontPicCoords[species].coords, gMonFrontPicCoords[species].y_offset, (u32)gUnknown_081FAF4C[3] /* this is actually u8* or something, pointing to ewram */, gUnknown_081FAF4C[3], species, g); - spritePalette = sub_80409C8(species, d, g); + spritePalette = GetMonSpritePalStructFromOtIdPersonality(species, d, g); LoadCompressedObjectPalette(spritePalette); GetMonSpriteTemplate_803C56C(species, 3); gUnknown_02024E8C.paletteTag = spritePalette->tag; |