diff options
| author | YamaArashi <YamaArashi@users.noreply.github.com> | 2016-12-02 14:56:56 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-02 14:56:56 -0800 |
| commit | 14d9b188cd8f16b4403280ae24fc7b8c059d0fc1 (patch) | |
| tree | df08926aef4bfc16f0b3f1ed16b1bc656d908e70 /src/starter_choose.c | |
| parent | 506587c676fb18a289d19561ca0de67004c7656e (diff) | |
| parent | 4d2d30beb113f5f987c73cdf1b818e0079222093 (diff) | |
Merge pull request #116 from marijnvdwerf/clean/warnings-0
Fix various warnings
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); |