From b9f1143d3e9b32120cc62fcc7a822d3bca8ef976 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Sat, 28 Jan 2017 01:31:09 -0500 Subject: define more data in C (#220) * define more data in C * correct typo in comments --- include/starter_choose.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'include/starter_choose.h') diff --git a/include/starter_choose.h b/include/starter_choose.h index 4a7e0514c..008d1b14e 100644 --- a/include/starter_choose.h +++ b/include/starter_choose.h @@ -5,9 +5,5 @@ u16 GetStarterPokemon(u16); void CB2_ChooseStarter(void); -void nullsub_72(struct Sprite *sprite); -void sub_810A62C(struct Sprite *sprite); -void sub_810A68C(struct Sprite *sprite); -void StarterPokemonSpriteAnimCallback(struct Sprite *sprite); #endif // GUARD_STARTER_CHOOSE_H -- cgit v1.2.3 From 4d2b22a899c11dfcacfec6889968ab01655a3fe3 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 26 May 2017 14:53:51 +0200 Subject: Add headers --- include/starter_choose.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include/starter_choose.h') diff --git a/include/starter_choose.h b/include/starter_choose.h index 008d1b14e..c835d9c59 100644 --- a/include/starter_choose.h +++ b/include/starter_choose.h @@ -3,6 +3,11 @@ #include "sprite.h" +extern u16 gBirchBagGrassPal[32]; +extern u8 gBirchBagTilemap[]; +extern u8 gBirchGrassTilemap[]; +extern u8 gBirchHelpGfx[]; + u16 GetStarterPokemon(u16); void CB2_ChooseStarter(void); -- cgit v1.2.3 From 2aae7e99d52fc488e75309909d279b459f5e1d80 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 26 May 2017 15:35:40 +0200 Subject: Make rom build again --- include/starter_choose.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/starter_choose.h') diff --git a/include/starter_choose.h b/include/starter_choose.h index c835d9c59..44ca8c34c 100644 --- a/include/starter_choose.h +++ b/include/starter_choose.h @@ -3,10 +3,10 @@ #include "sprite.h" -extern u16 gBirchBagGrassPal[32]; -extern u8 gBirchBagTilemap[]; -extern u8 gBirchGrassTilemap[]; -extern u8 gBirchHelpGfx[]; +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); -- cgit v1.2.3