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

Solved a bunch of -Wall errors on modern

Browse Source
This commit is contained in:
Eduardo Quezada
2023-09-20 19:01:08 -03:00
parent 003d7d7e2e
commit af210da972
122 changed files with 862 additions and 992 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokemon_summary_screen.c
+12 -6
View File
@@ -702,8 +702,10 @@ static const u8 sTextColors[][3] =
{0, 7, 8}
};
static const u8 sAButton_Gfx[] = INCBIN_U8("graphics/summary_screen/a_button.4bpp");
static const u8 sBButton_Gfx[] = INCBIN_U8("graphics/summary_screen/b_button.4bpp");
static const u8 sButtons_Gfx[][4 * TILE_SIZE_4BPP] = {
INCBIN_U8("graphics/summary_screen/a_button.4bpp"),
INCBIN_U8("graphics/summary_screen/b_button.4bpp"),
};
static void (*const sTextPrinterFunctions[])(void) =
{
@@ -2790,8 +2792,13 @@ static void PrintGenderSymbol(struct Pokemon *mon, u16 species)
static void PrintAOrBButtonIcon(u8 windowId, bool8 bButton, u32 x)
{
// sBButton_Gfx - sizeof(sBButton_Gfx) = sAButton_Gfx
BlitBitmapToWindow(windowId, (bButton) ? sBButton_Gfx : sBButton_Gfx - sizeof(sBButton_Gfx), x, 0, 16, 16);
const u8 *button;
if (!bButton)
button = sButtons_Gfx[0];
else
button = sButtons_Gfx[1];
BlitBitmapToWindow(windowId, button, x, 0, 16, 16);
}
static void PrintPageNamesAndStats(void)
@@ -3984,8 +3991,7 @@ static void SummaryScreen_DestroyAnimDelayTask(void)
}
}
// unused
static bool32 IsMonAnimationFinished(void)
static bool32 UNUSED IsMonAnimationFinished(void)
{
if (gSprites[sMonSummaryScreen->spriteIds[SPRITE_ARR_ID_MON]].callback == SpriteCallbackDummy)
return FALSE;