diff options
| author | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2016-12-02 21:16:56 +0100 |
|---|---|---|
| committer | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2016-12-02 22:33:56 +0100 |
| commit | 45e09dba8be5fc3fb6c91a0712766c3f22dfebf2 (patch) | |
| tree | 9a586adb9c3089be108f243299cf526fa6e34bde /src/starter_choose.c | |
| parent | fe79b6c4e3bbd092c856e3f0cd23d55202e2ec33 (diff) | |
Pass spritesheets to LoadCompressedObjectPic
Diffstat (limited to 'src/starter_choose.c')
| -rw-r--r-- | src/starter_choose.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/starter_choose.c b/src/starter_choose.c index f21ddde1c..341f73e4c 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -11,6 +11,7 @@ #include "task.h" #include "trig.h" #include "decompress.h" +#include "sprite.h" struct MonCoords { @@ -22,8 +23,8 @@ extern const u8 gStarterChoose_PokeballCoords[][2]; extern u8 gUnknown_083F66F0[]; extern u8 gBirchBagTilemap[]; extern u8 gBirchGrassTilemap[]; -extern u8 gUnknown_083F7794[]; -extern u8 gUnknown_083F77A4[]; +extern struct SpriteSheet gUnknown_083F7794; +extern struct SpriteSheet gUnknown_083F77A4; extern u8 gUnknown_083F62EC[]; extern const u8 gStarterChoose_LabelCoords[][2]; extern u16 gStarterMons[]; @@ -116,8 +117,8 @@ void CB2_ChooseStarter(void) ResetPaletteFade(); FreeAllSpritePalettes(); LoadPalette(gUnknown_083F62EC, 0, 0x40); - LoadCompressedObjectPic(gUnknown_083F7794); - LoadCompressedObjectPic(gUnknown_083F77A4); + LoadCompressedObjectPic(&gUnknown_083F7794); + LoadCompressedObjectPic(&gUnknown_083F77A4); LoadSpritePalettes(gUnknown_083F77B4); SetUpWindowConfig(&gWindowConfig_81E6C3C); InitMenuWindow(&gWindowConfig_81E6CE4); |