dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made variable for Oak's introduction Pokemon

Browse Source
This commit is contained in:
Frank
2023-04-10 15:00:20 -04:00
parent 74782403c1
commit 82b3d51743
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/oak_speech.c
+6 -4
View File
@@ -17,6 +17,8 @@
#include "data.h" #include "data.h"
#include "constants/songs.h" #include "constants/songs.h"
#define INTRO_SPECIES SPECIES_NIDORAN_F
enum enum
{ {
WIN_INTRO_TEXTBOX, WIN_INTRO_TEXTBOX,
@@ -1191,7 +1193,7 @@ static void Task_OakSpeech_IsInhabitedFarAndWide(u8 taskId)
if (gTasks[taskId].tTimer == 32) if (gTasks[taskId].tTimer == 32)
{ {
OakSpeechPrintMessage(gOakSpeech_Text_IsInhabitedFarAndWide, sOakSpeechResources->textSpeed); 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; u8 spriteId;
DecompressPicFromTable(&gMonFrontPicTable[SPECIES_NIDORAN_F], MonSpritesGfxManager_GetSpritePtr(0), SPECIES_NIDORAN_F); DecompressPicFromTable(&gMonFrontPicTable[INTRO_SPECIES], MonSpritesGfxManager_GetSpritePtr(0), INTRO_SPECIES);
LoadCompressedSpritePaletteUsingHeap(&gMonPaletteTable[SPECIES_NIDORAN_F]); LoadCompressedSpritePaletteUsingHeap(&gMonPaletteTable[INTRO_SPECIES]);
SetMultiuseSpriteTemplateToPokemon(SPECIES_NIDORAN_F, 0); SetMultiuseSpriteTemplateToPokemon(INTRO_SPECIES, 0);
spriteId = CreateSprite(&gMultiuseSpriteTemplate, 96, 96, 1); spriteId = CreateSprite(&gMultiuseSpriteTemplate, 96, 96, 1);
gSprites[spriteId].callback = SpriteCallbackDummy; gSprites[spriteId].callback = SpriteCallbackDummy;
gSprites[spriteId].oam.priority = 1; gSprites[spriteId].oam.priority = 1;