diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-21 12:43:59 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-21 12:43:59 -0400 |
| commit | 99f9d40be14633630503ebcd75787fc7fdfe1486 (patch) | |
| tree | c3962867c76bca0f06311bc39791aa42889e877d /src/field_effect.c | |
| parent | 294cbd8beb08b14a24385a78f1a8435f5fbe2f8c (diff) | |
| parent | 42ae04c74fe07d05175efb4df143dbcf1b2752bc (diff) | |
Merge remote-tracking branch 'origin/master' into field_specials
Diffstat (limited to 'src/field_effect.c')
| -rw-r--r-- | 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 100644 --- 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); |