dionmoustos/PokemonEmeraldSafariFrontier
1
0 Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix inconsistent static s/g names

Browse Source
This commit is contained in:
GriffinR committed 2022-05-17 14:00:02 -04:00
1 parent ef4d99c87e
commit 593e2c9be0
42 files changed
+528 -534
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/pokenav_main_menu.c
+5 -5
View File
@@ -105,7 +105,7 @@ static const u8 sHelpBarTextColors[3] =
TEXT_COLOR_RED, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY
};
static const struct CompressedSpriteSheet gSpinningPokenavSpriteSheet[] =
static const struct CompressedSpriteSheet sSpinningPokenavSpriteSheet[] =
{
{
.data = sSpinningPokenav_Gfx,
@@ -114,7 +114,7 @@ static const struct CompressedSpriteSheet gSpinningPokenavSpriteSheet[] =
}
};
static const struct SpritePalette gSpinningNavgearPalettes[] =
static const struct SpritePalette sSpinningNavgearPalettes[] =
{
{
.data = sSpinningPokenav_Pal,
@@ -583,10 +583,10 @@ static void InitPokenavMainMenuResources(void)
u8 spriteId;
struct Pokenav_MainMenu *menu = GetSubstructPtr(POKENAV_SUBSTRUCT_MAIN_MENU);
for (i = 0; i < ARRAY_COUNT(gSpinningPokenavSpriteSheet); i++)
LoadCompressedSpriteSheet(&gSpinningPokenavSpriteSheet[i]);
for (i = 0; i < ARRAY_COUNT(sSpinningPokenavSpriteSheet); i++)
LoadCompressedSpriteSheet(&sSpinningPokenavSpriteSheet[i]);
Pokenav_AllocAndLoadPalettes(gSpinningNavgearPalettes);
Pokenav_AllocAndLoadPalettes(sSpinningNavgearPalettes);
menu->palettes = ~1 & ~(0x10000 << IndexOfSpritePaletteTag(0));
spriteId = CreateSprite(&sSpinningPokenavSpriteTemplate, 220, 12, 0);
menu->spinningPokenav = &gSprites[spriteId];