summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2018-01-20 16:22:40 -0600
committerDiegoisawesome <diego@domoreaweso.me>2018-01-20 16:22:40 -0600
commitaca539d5dd97b55d149ca59c0561a721544d3298 (patch)
treedf337726adbc6b03cccbfaf6b7a0e862fc798433 /src
parent692ed13fe75a7e2f90d7aa0d5571a11fced0d262 (diff)
parentb47b9e57589cbe0334a5a370d35bd44592c806e3 (diff)
Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald
Diffstat (limited to 'src')
-rw-r--r--src/starter_choose.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/starter_choose.c b/src/starter_choose.c
index 2d78af8fb..c2c553d46 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -74,7 +74,7 @@ static void Task_MoveStarterChooseCursor(u8 taskId);
static void sub_8134668(u8 taskId);
static void CreateStarterPokemonLabel(u8 selection);
static u8 CreatePokemonFrontSprite(u16 species, u8 x, u8 y);
-static void StarterPokemonSpriteCallback(struct Sprite *sprite);
+void StarterPokemonSpriteCallback(struct Sprite *sprite);
static IWRAM_DATA u16 sStarterChooseWindowId;
@@ -361,7 +361,7 @@ static u8 CreatePokemonFrontSprite(u16 species, u8 x, u8 y)
return spriteId;
}
-static void sub_81346DC(struct Sprite *sprite)
+void sub_81346DC(struct Sprite *sprite)
{
sprite->pos1.x = gUnknown_085B1E28[gTasks[sprite->data[0]].tStarterSelection][0];
sprite->pos1.y = gUnknown_085B1E28[gTasks[sprite->data[0]].tStarterSelection][1];
@@ -369,7 +369,7 @@ static void sub_81346DC(struct Sprite *sprite)
sprite->data[1] = (u8)(sprite->data[1]) + 4;
}
-static void sub_813473C(struct Sprite *sprite)
+void sub_813473C(struct Sprite *sprite)
{
if (gTasks[sprite->data[0]].tStarterSelection == sprite->data[1])
StartSpriteAnimIfDifferent(sprite, 1);
@@ -377,7 +377,7 @@ static void sub_813473C(struct Sprite *sprite)
StartSpriteAnimIfDifferent(sprite, 0);
}
-static void StarterPokemonSpriteCallback(struct Sprite *sprite)
+void StarterPokemonSpriteCallback(struct Sprite *sprite)
{
//Move sprite to upper center of screen
if (sprite->pos1.x > STARTER_PKMN_POS_X)