diff options
Diffstat (limited to 'src/starter_choose.c')
| -rw-r--r-- | src/starter_choose.c | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/src/starter_choose.c b/src/starter_choose.c index a80401e8b..68e644353 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -1,22 +1,17 @@ #include "global.h" +#include "starter_choose.h" +#include "asm.h" #include "main.h" #include "menu.h" #include "palette.h" -#include "pokemon.h" +#include "pokedex.h" #include "songs.h" #include "sound.h" -#include "sprite.h" #include "string_util.h" #include "task.h" -#include "text.h" #include "trig.h" - -//Functions that need to be put in headers -void remove_some_task(void); -void LoadCompressedObjectPic(void *); -void LoadCompressedObjectPalette(const struct SpritePalette *); -u16 SpeciesToNationalPokedexNum(u16); -void DecompressPicFromTable_2(const struct SpriteSheet *, u8, u8, void *, void *, u32); +#include "decompress.h" +#include "sprite.h" struct MonCoords { @@ -25,12 +20,12 @@ struct MonCoords extern void * const gUnknown_081FAF4C[]; extern const u8 gStarterChoose_PokeballCoords[][2]; -extern u8 gUnknown_083F66F0[]; +extern u8 gBirchHelpGfx[]; extern u8 gBirchBagTilemap[]; extern u8 gBirchGrassTilemap[]; -extern u8 gUnknown_083F7794[]; -extern u8 gUnknown_083F77A4[]; -extern u8 gUnknown_083F62EC[]; +extern struct SpriteSheet gUnknown_083F7794; +extern struct SpriteSheet gUnknown_083F77A4; +extern u8 gBirchBagGrassPal[]; extern const u8 gStarterChoose_LabelCoords[][2]; extern u16 gStarterMons[]; extern union AffineAnimCmd *gUnknown_083F778C[]; @@ -50,7 +45,6 @@ extern struct SpritePalette gUnknown_083F77B4[]; extern struct SpriteTemplate gSpriteTemplate_83F77FC; extern struct SpriteTemplate gUnknown_02024E8C; -u16 GetStarterPokemon(u16); static void MainCallback2(void); static void Task_StarterChoose1(u8 taskId); static void Task_StarterChoose2(u8 taskId); @@ -59,10 +53,8 @@ static void Task_StarterChoose4(u8 taskId); static void Task_StarterChoose5(u8 taskId); static void Task_StarterChoose6(u8 taskId); -extern u8 *GetPokemonCategory(u16); static void CreateStarterPokemonLabel(u8, u8); static u8 CreatePokemonFrontSprite(u16, u8, u8); -void StarterPokemonSpriteAnimCallback(struct Sprite *); //Position of the sprite of the selected starter Pokemon #define STARTER_PKMN_POS_X 120 @@ -116,7 +108,7 @@ void CB2_ChooseStarter(void) DmaFill32(3, 0, OAM, OAM_SIZE); DmaFill16(3, 0, PLTT, PLTT_SIZE); - LZ77UnCompVram(&gUnknown_083F66F0, (void *)VRAM); + LZ77UnCompVram(&gBirchHelpGfx, (void *)VRAM); LZ77UnCompVram(&gBirchBagTilemap, (void *)(VRAM + 0x3000)); LZ77UnCompVram(&gBirchGrassTilemap, (void *)(VRAM + 0x3800)); remove_some_task(); @@ -124,9 +116,9 @@ void CB2_ChooseStarter(void) ResetSpriteData(); ResetPaletteFade(); FreeAllSpritePalettes(); - LoadPalette(gUnknown_083F62EC, 0, 0x40); - LoadCompressedObjectPic(gUnknown_083F7794); - LoadCompressedObjectPic(gUnknown_083F77A4); + LoadPalette(gBirchBagGrassPal, 0, 0x40); + LoadCompressedObjectPic(&gUnknown_083F7794); + LoadCompressedObjectPic(&gUnknown_083F77A4); LoadSpritePalettes(gUnknown_083F77B4); SetUpWindowConfig(&gWindowConfig_81E6C3C); InitMenuWindow(&gWindowConfig_81E6CE4); @@ -274,7 +266,7 @@ static void Task_StarterChoose5(u8 taskId) case 0: //YES //Return the starter choice and exit. gScriptResult = gTasks[taskId].data[TD_STARTERSELECTION]; - SetMainCallback2(gMain.field_8); + SetMainCallback2(gMain.savedCallback); break; case 1: //NO case -1: //B button |