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

egg_hatch as part of daycare

Browse Source
This commit is contained in:
PikalaxALT
2019-05-06 10:49:10 -04:00
parent 5f49353de4
commit e9e87a0fe4
76 changed files with 3042 additions and 2254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/oak_speech.c
+3 -3
View File
@@ -1246,7 +1246,7 @@ static void Task_OakSpeech26(u8 taskId)
data[3]--;
else
{
sub_810FF60(&sNewGameAdventureIntroWindowTemplates[2], 2, 0, 2, sub_80F796C(), 14, 0);
CreateYesNoMenu(&sNewGameAdventureIntroWindowTemplates[2], 2, 0, 2, sub_80F796C(), 14, 0);
gTasks[taskId].func = Task_OakSpeech27;
}
}
@@ -1255,7 +1255,7 @@ static void Task_OakSpeech26(u8 taskId)
static void Task_OakSpeech27(u8 taskId)
{
s8 input = ProcessMenuInputNoWrap_();
s8 input = Menu_ProcessInputNoWrapClearOnChoose();
switch (input)
{
case 0:
@@ -1614,7 +1614,7 @@ static void CreateNidoranFSprite(u8 taskId)
DecompressPicFromTable(gUnknown_8235194, sub_8044E00(0), SPECIES_NIDORAN_F);
sub_800F078(&gUnknown_82373F4);
sub_803F7D4(SPECIES_NIDORAN_F, 0);
SetMultiuseSpriteTemplateToPokemon(SPECIES_NIDORAN_F, 0);
spriteId = CreateSprite(&gMultiuseSpriteTemplate, 0x60, 0x60, 1);
gSprites[spriteId].callback = SpriteCallbackDummy;
gSprites[spriteId].oam.priority = 1;