diff --git a/src/oak_speech.c b/src/oak_speech.c index 4d2e4ccb8..e2e7eb9b0 100644 --- a/src/oak_speech.c +++ b/src/oak_speech.c @@ -17,6 +17,8 @@ #include "data.h" #include "constants/songs.h" +#define INTRO_SPECIES SPECIES_NIDORAN_F + enum { WIN_INTRO_TEXTBOX, @@ -1191,7 +1193,7 @@ static void Task_OakSpeech_IsInhabitedFarAndWide(u8 taskId) if (gTasks[taskId].tTimer == 32) { OakSpeechPrintMessage(gOakSpeech_Text_IsInhabitedFarAndWide, sOakSpeechResources->textSpeed); - PlayCry_Normal(SPECIES_NIDORAN_F, 0); + PlayCry_Normal(INTRO_SPECIES, 0); } } } @@ -1876,9 +1878,9 @@ static void CreateNidoranFSprite(u8 taskId) { u8 spriteId; - DecompressPicFromTable(&gMonFrontPicTable[SPECIES_NIDORAN_F], MonSpritesGfxManager_GetSpritePtr(0), SPECIES_NIDORAN_F); - LoadCompressedSpritePaletteUsingHeap(&gMonPaletteTable[SPECIES_NIDORAN_F]); - SetMultiuseSpriteTemplateToPokemon(SPECIES_NIDORAN_F, 0); + DecompressPicFromTable(&gMonFrontPicTable[INTRO_SPECIES], MonSpritesGfxManager_GetSpritePtr(0), INTRO_SPECIES); + LoadCompressedSpritePaletteUsingHeap(&gMonPaletteTable[INTRO_SPECIES]); + SetMultiuseSpriteTemplateToPokemon(INTRO_SPECIES, 0); spriteId = CreateSprite(&gMultiuseSpriteTemplate, 96, 96, 1); gSprites[spriteId].callback = SpriteCallbackDummy; gSprites[spriteId].oam.priority = 1;