ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

starter choose review changes

Browse Source
This commit is contained in:
DizzyEggg 2017-11-13 18:30:17 +01:00
parent 045e7d6382
commit bb9c928330
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/starter_choose.s
View File

@ -32,7 +32,7 @@ sPokeballCoords:: @ 85B1DEC
gStarterChoose_LabelCoords:: @ 85B1DF2 gStarterChoose_LabelCoords:: @ 85B1DF2
.incbin "baserom.gba", 0x5b1df2, 0x6 .incbin "baserom.gba", 0x5b1df2, 0x6
sStarterMons:: @ 85B1DF8 sStarterMon:: @ 85B1DF8
.incbin "baserom.gba", 0x5b1df8, 0x8 .incbin "baserom.gba", 0x5b1df8, 0x8
gUnknown_085B1E00:: @ 85B1E00 gUnknown_085B1E00:: @ 85B1E00

8
src/starter_choose.c
View File

@ -25,8 +25,6 @@
#define STARTER_PKMN_POS_X 120 #define STARTER_PKMN_POS_X 120
#define STARTER_PKMN_POS_Y 64 #define STARTER_PKMN_POS_Y 64
extern u16 sStarterChooseWindowId;
// graphics // graphics
extern const u32 gBirchHelpGfx[]; extern const u32 gBirchHelpGfx[];
extern const u32 gBirchBagTilemap[]; extern const u32 gBirchBagTilemap[];
@ -37,7 +35,7 @@ extern const u16 gBirchBagGrassPal[];
extern const u8 gText_BirchInTrouble[]; extern const u8 gText_BirchInTrouble[];
extern const u8 gText_ConfirmStarterChoice[]; 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 BgTemplate gUnknown_085B1E00[3];
extern const struct WindowTemplate gUnknown_085B1DCC[]; extern const struct WindowTemplate gUnknown_085B1DCC[];
extern const struct WindowTemplate gUnknown_085B1DDC; 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 u8 CreatePokemonFrontSprite(u16 species, u8 x, u8 y);
static void StarterPokemonSpriteCallback(struct Sprite *sprite); static void StarterPokemonSpriteCallback(struct Sprite *sprite);
static IWRAM_DATA u16 sStarterChooseWindowId;
u16 GetStarterPokemon(u16 chosenStarterId) u16 GetStarterPokemon(u16 chosenStarterId)
{ {
if (chosenStarterId > STARTER_MON_COUNT) if (chosenStarterId > STARTER_MON_COUNT)
chosenStarterId = 0; chosenStarterId = 0;
return sStarterMons[chosenStarterId]; return sStarterMon[chosenStarterId];
} }
static void VblankCB_StarterChoose(void) static void VblankCB_StarterChoose(void)

4
sym_bss.txt
View File

@ -55,8 +55,8 @@ gUnknown_030011F6: @ 30011F6
gUnknown_030011F7: @ 30011F7 gUnknown_030011F7: @ 30011F7
.space 0x1 .space 0x1
sStarterChooseWindowId: @ 30011F8 .include "src/starter_choose.o"
.space 0x4 .space 0x2
gUnknown_030011FC: @ 30011FC gUnknown_030011FC: @ 30011FC
.space 0x2 .space 0x2