diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-13 18:30:17 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-13 18:30:17 +0100 |
| commit | bb9c928330fb91426e2ad0c68e6f30f2a867d611 (patch) | |
| tree | 014977d52b266c08857cbba61d5abf321d4821df /src | |
| parent | 045e7d63822a0bc62b1d3ffac79180df89ba01b4 (diff) | |
starter choose review changes
Diffstat (limited to 'src')
| -rw-r--r-- | src/starter_choose.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/starter_choose.c b/src/starter_choose.c index c730e0978..1f64a5db7 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -25,8 +25,6 @@ #define STARTER_PKMN_POS_X 120 #define STARTER_PKMN_POS_Y 64 -extern u16 sStarterChooseWindowId; - // graphics extern const u32 gBirchHelpGfx[]; extern const u32 gBirchBagTilemap[]; @@ -37,7 +35,7 @@ extern const u16 gBirchBagGrassPal[]; extern const u8 gText_BirchInTrouble[]; extern const u8 gText_ConfirmStarterChoice[]; -extern const u16 sStarterMons[STARTER_MON_COUNT]; +extern const u16 sStarterMon[STARTER_MON_COUNT]; extern const struct BgTemplate gUnknown_085B1E00[3]; extern const struct WindowTemplate gUnknown_085B1DCC[]; extern const struct WindowTemplate gUnknown_085B1DDC; @@ -78,11 +76,13 @@ static void CreateStarterPokemonLabel(u8 selection); static u8 CreatePokemonFrontSprite(u16 species, u8 x, u8 y); static void StarterPokemonSpriteCallback(struct Sprite *sprite); +static IWRAM_DATA u16 sStarterChooseWindowId; + u16 GetStarterPokemon(u16 chosenStarterId) { if (chosenStarterId > STARTER_MON_COUNT) chosenStarterId = 0; - return sStarterMons[chosenStarterId]; + return sStarterMon[chosenStarterId]; } static void VblankCB_StarterChoose(void) |