diff options
| author | yenatch <yenatch@gmail.com> | 2017-06-20 20:26:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-20 20:26:44 -0400 |
| commit | b22e5219ba01c70da9a03397430bff10d0b99060 (patch) | |
| tree | 7db3364ee8ccda2ca66606ef1b65ebc4113a3660 /src/field_effect.c | |
| parent | 102f5b1e15e7295e30a3cebfbbad3c8af4cc1d37 (diff) | |
| parent | a80eef47ca3fea61b9345ae791056c9ca2650f97 (diff) | |
Merge pull request #335 from marijnvdwerf/camthesaxman/decompile_pokeball
Decompile pokeball
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); |