diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-06-21 20:47:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-21 20:47:58 +0200 |
| commit | c84bb67156d6ab822b6ff1b508e9fae73f054675 (patch) | |
| tree | 5973f1e72156bb75cb6561a11dd7f333b90fcb3f /src/field_effect.c | |
| parent | 11ad653b57d811dbe8df831d4987128da39bdcb5 (diff) | |
| parent | 42ae04c74fe07d05175efb4df143dbcf1b2752bc (diff) | |
Merge pull request #2 from pret/master
be up to date with master2
Diffstat (limited to 'src/field_effect.c')
| -rwxr-xr-x | src/field_effect.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/field_effect.c b/src/field_effect.c index 9591bb6a0..a7f0e4129 100755 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -657,7 +657,8 @@ u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority) u8 CreateMonSprite_FieldMove(u16 species, u32 d, u32 g, s16 x, s16 y, u8 subpriority) { - const struct SpritePalette *spritePalette; + 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); LoadCompressedObjectPalette(spritePalette); |