diff options
author | camthesaxman <cameronghall@cox.net> | 2017-06-17 19:46:25 -0500 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2017-06-17 19:46:25 -0500 |
commit | 82ddae9db42f45abf876e68dc9b0b69a00b44070 (patch) | |
tree | 26e39c75e92ca8cf128b9143c0e664b06bff23a9 /include/starter_choose.h | |
parent | c56305607a1bad264b89d07b7539eff3fe010e0d (diff) | |
parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) |
fix merge conflicts
Diffstat (limited to 'include/starter_choose.h')
-rw-r--r-- | include/starter_choose.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/starter_choose.h b/include/starter_choose.h index 008d1b14e..44ca8c34c 100644 --- a/include/starter_choose.h +++ b/include/starter_choose.h @@ -3,6 +3,11 @@ #include "sprite.h" +extern const u16 gBirchBagGrassPal[2][16]; +extern const u8 gBirchBagTilemap[]; +extern const u8 gBirchGrassTilemap[]; +extern const u8 gBirchHelpGfx[]; + u16 GetStarterPokemon(u16); void CB2_ChooseStarter(void); |