Skip to content
This repository has been archived by the owner on Nov 24, 2024. It is now read-only.

Commit

Permalink
Added SPECIES_INTRO constant for Professor Birch Intro Pokemon
Browse files Browse the repository at this point in the history
Added SPECIES_INTRO constant for Professor Birch Intro Pokemon, assigned it to SPECIES_ZORUA_HISUIAN
  • Loading branch information
damon-murdoch committed Nov 13, 2023
1 parent dd1d28b commit 3822a88
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/main_menu.c
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,9 @@ static const u16 sBirchSpeechPlatformBlackPal[] = {RGB_BLACK, RGB_BLACK, RGB_BLA
#define MENU_WIN_VCOORDS(n) WIN_RANGE(((MENU_TOP_WIN##n - 1) * 8) + MENU_SHADOW_PADDING, (MENU_TOP_WIN##n + MENU_HEIGHT_WIN##n + 1) * 8 - MENU_SHADOW_PADDING)
#define MENU_SCROLL_SHIFT WIN_RANGE(32, 32)

// Pokemon Displayed by Professor Birch
#define SPECIES_INTRO SPECIES_ZORUA_HISUIAN

static const struct WindowTemplate sWindowTemplates_MainMenu[] =
{
// No saved game
Expand Down Expand Up @@ -1374,7 +1377,7 @@ static void Task_NewGameBirchSpeechSub_InitPokeBall(u8 taskId)
gSprites[spriteId].invisible = FALSE;
gSprites[spriteId].data[0] = 0;

CreatePokeballSpriteToReleaseMon(spriteId, gSprites[spriteId].oam.paletteNum, 112, 58, 0, 0, 32, PALETTES_BG, SPECIES_LOTAD);
CreatePokeballSpriteToReleaseMon(spriteId, gSprites[spriteId].oam.paletteNum, 112, 58, 0, 0, 32, PALETTES_BG, SPECIES_INTRO);
gTasks[taskId].func = Task_NewGameBirchSpeechSub_WaitForLotad;
gTasks[sBirchSpeechMainTaskId].tTimer = 0;
}
Expand Down Expand Up @@ -1876,7 +1879,7 @@ static void SpriteCB_MovePlayerDownWhileShrinking(struct Sprite *sprite)

static u8 NewGameBirchSpeech_CreateLotadSprite(u8 x, u8 y)
{
return CreateMonPicSprite_Affine(SPECIES_LOTAD, SHINY_ODDS, 0, MON_PIC_AFFINE_FRONT, x, y, 14, TAG_NONE);
return CreateMonPicSprite_Affine(SPECIES_INTRO, SHINY_ODDS, 0, MON_PIC_AFFINE_FRONT, x, y, 14, TAG_NONE);
}

static void AddBirchSpeechObjects(u8 taskId)
Expand Down

0 comments on commit 3822a88

Please sign in to comment.