diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-06-19 15:29:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-19 15:29:24 +0200 |
| commit | 11ad653b57d811dbe8df831d4987128da39bdcb5 (patch) | |
| tree | 9e9a793c7dc9a4af7992e6b65c0418d16b25a400 /src/starter_choose.c | |
| parent | 48a15638c63f2b3d4b2d12d346e466ddca006570 (diff) | |
| parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) | |
Merge pull request #1 from pret/master
be up to date with the master
Diffstat (limited to 'src/starter_choose.c')
| -rw-r--r-- | src/starter_choose.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/starter_choose.c b/src/starter_choose.c index 32b6adf36..f30be8e08 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -1,6 +1,5 @@ #include "global.h" #include "starter_choose.h" -#include "asm.h" #include "data2.h" #include "decompress.h" #include "main.h" @@ -15,6 +14,7 @@ #include "strings.h" #include "task.h" #include "trig.h" +#include "unknown_task.h" extern u16 gScriptResult; extern struct SpriteTemplate gUnknown_02024E8C; @@ -23,7 +23,7 @@ extern struct SpriteTemplate gUnknown_02024E8C; // Graphics Data //-------------------------------------------------- -const u16 gBirchBagGrassPal[][16] = +const u16 gBirchBagGrassPal[2][16] = { INCBIN_U16("graphics/misc/birch_bag.gbapal"), INCBIN_U16("graphics/misc/birch_grass.gbapal"), @@ -483,7 +483,7 @@ static void AddTextColorCtrlCode(u8 *string, u8 bgColor, u8 textColor, u8 shadow static void CreateStarterPokemonLabel(u8 prevSelection, u8 selection) { u8 labelText[72]; - u8 *category; + const u8 *category; u8 srcIndex; u8 dstIndex; u16 species; |