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

Merge branch 'master' of https://github.com/pret/pokefirered into doc-ql

Browse Source
This commit is contained in:
GriffinR
2023-08-18 11:26:22 -04:00
parent 45e4c30d38 e72a26a6c1
commit 10c1e1298f
221 changed files with 3371 additions and 3779 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/script_menu.c
+5 -3
View File
@@ -1140,6 +1140,8 @@ void Task_WaitMuseumFossilPic(u8 taskId)
}
}
#define FOSSIL_PIC_PAL_NUM 13
bool8 OpenMuseumFossilPic(void)
{
u8 spriteId;
@@ -1151,19 +1153,19 @@ bool8 OpenMuseumFossilPic(void)
if (gSpecialVar_0x8004 == SPECIES_KABUTOPS)
{
LoadSpriteSheets(sMuseumKabutopsSprSheets);
LoadPalette(sMuseumKabutopsSprPalette, 0x1D0, 0x20);
LoadPalette(sMuseumKabutopsSprPalette, OBJ_PLTT_ID(FOSSIL_PIC_PAL_NUM), sizeof(sMuseumKabutopsSprPalette));
}
else if (gSpecialVar_0x8004 == SPECIES_AERODACTYL)
{
LoadSpriteSheets(sMuseumAerodactylSprSheets);
LoadPalette(sMuseumAerodactylSprPalette, 0x1D0, 0x20);
LoadPalette(sMuseumAerodactylSprPalette, OBJ_PLTT_ID(FOSSIL_PIC_PAL_NUM), sizeof(sMuseumAerodactylSprPalette));
}
else
{
return FALSE;
}
spriteId = CreateSprite(&sMuseumFossilSprTemplate, gSpecialVar_0x8005 * 8 + 40, gSpecialVar_0x8006 * 8 + 40, 0);
gSprites[spriteId].oam.paletteNum = 13;
gSprites[spriteId].oam.paletteNum = FOSSIL_PIC_PAL_NUM;
taskId = CreateTask(Task_WaitMuseumFossilPic, 80);
gTasks[taskId].tWindowId = CreateWindowFromRect(gSpecialVar_0x8005, gSpecialVar_0x8006, 8, 8);
gTasks[taskId].tState = 0;