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 | |
| parent | 045e7d63822a0bc62b1d3ffac79180df89ba01b4 (diff) | |
starter choose review changes
| -rw-r--r-- | data/starter_choose.s | 2 | ||||
| -rw-r--r-- | src/starter_choose.c | 8 | ||||
| -rw-r--r-- | sym_bss.txt | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/data/starter_choose.s b/data/starter_choose.s index 6ab5a6376..ae81aae20 100644 --- a/data/starter_choose.s +++ b/data/starter_choose.s @@ -32,7 +32,7 @@ sPokeballCoords:: @ 85B1DEC gStarterChoose_LabelCoords:: @ 85B1DF2 .incbin "baserom.gba", 0x5b1df2, 0x6 -sStarterMons:: @ 85B1DF8 +sStarterMon:: @ 85B1DF8 .incbin "baserom.gba", 0x5b1df8, 0x8 gUnknown_085B1E00:: @ 85B1E00 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) diff --git a/sym_bss.txt b/sym_bss.txt index bb9e21359..3746598fa 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -55,8 +55,8 @@ gUnknown_030011F6: @ 30011F6 gUnknown_030011F7: @ 30011F7 .space 0x1 -sStarterChooseWindowId: @ 30011F8 - .space 0x4 + .include "src/starter_choose.o" + .space 0x2 gUnknown_030011FC: @ 30011FC .space 0x2 |