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/link.c
+9 -16
View File
@@ -278,8 +278,7 @@ static void InitLinkTestBG(u8 paletteNum, u8 bgNum, u8 screenBaseBlock, u8 charB
SetGpuReg(REG_OFFSET_BG0VOFS + bgNum * 4, 0);
}
// Unused
static void LoadLinkTestBgGfx(u8 paletteNum, u8 bgNum, u8 screenBaseBlock, u8 charBaseBlock)
static void UNUSED LoadLinkTestBgGfx(u8 paletteNum, u8 bgNum, u8 screenBaseBlock, u8 charBaseBlock)
{
LoadPalette(sLinkTestDigitsPal, BG_PLTT_ID(paletteNum), PLTT_SIZE_4BPP);
DmaCopy16(3, sLinkTestDigitsGfx, (u16 *)BG_CHAR_ADDR(charBaseBlock), sizeof sLinkTestDigitsGfx);
@@ -289,8 +288,7 @@ static void LoadLinkTestBgGfx(u8 paletteNum, u8 bgNum, u8 screenBaseBlock, u8 ch
SetGpuReg(sBGControlRegs[bgNum], BGCNT_SCREENBASE(screenBaseBlock) | BGCNT_CHARBASE(charBaseBlock));
}
// Unused
static void LinkTestScreen(void)
static void UNUSED LinkTestScreen(void)
{
int i;
@@ -779,8 +777,7 @@ u32 LinkDummy_Return2(void)
return 2;
}
// Unused
static bool32 IsFullLinkGroupWithNoRS(void)
static bool32 UNUSED IsFullLinkGroupWithNoRS(void)
{
if (GetLinkPlayerCount() != MAX_LINK_PLAYERS || AreAnyLinkPlayersUsingVersions(VERSION_RUBY, VERSION_SAPPHIRE) < 0)
{
@@ -1012,14 +1009,12 @@ void SetBerryBlenderLinkCallback(void)
gLinkCallback = LinkCB_BerryBlenderSendHeldKeys;
}
// Unused
static u32 GetBerryBlenderKeySendAttempts(void)
static u32 UNUSED GetBerryBlenderKeySendAttempts(void)
{
return gBerryBlenderKeySendAttempts;
}
// Unused
static void SendBerryBlenderNoSpaceForPokeblocks(void)
static void UNUSED SendBerryBlenderNoSpaceForPokeblocks(void)
{
BuildSendCmd(LINKCMD_BLENDER_NO_PBLOCK_SPACE);
}
@@ -1165,7 +1160,7 @@ static void LinkTest_PrintHex(u32 num, u8 x, u8 y, u8 length)
}
}
static void LinkTest_PrintInt(int num, u8 x, u8 y, u8 length)
static void UNUSED LinkTest_PrintInt(int num, u8 x, u8 y, u8 length)
{
char buff[16];
int negX;
@@ -1297,8 +1292,7 @@ u8 GetSavedPlayerCount(void)
return gSavedLinkPlayerCount;
}
// Unused
static u8 GetSavedMultiplayerId(void)
static u8 UNUSED GetSavedMultiplayerId(void)
{
return gSavedMultiplayerId;
}
@@ -1335,13 +1329,13 @@ bool8 DoesLinkPlayerCountMatchSaved(void)
void ClearSavedLinkPlayers(void)
{
int i;
// The CpuSet loop below is incorrectly writing to NULL
// instead of sSavedLinkPlayers.
// Additionally it's using the wrong array size.
#ifdef UBFIX
memset(sSavedLinkPlayers, 0, sizeof(sSavedLinkPlayers));
#else
int i;
for (i = 0; i < MAX_LINK_PLAYERS; i++)
CpuSet(&sSavedLinkPlayers[i], NULL, sizeof(struct LinkPlayer));
#endif
@@ -1382,8 +1376,7 @@ bool8 IsLinkMaster(void)
return EXTRACT_MASTER(gLinkStatus);
}
// Unused
static u8 GetDummy2(void)
static u8 UNUSED GetDummy2(void)
{
return sDummy2;
}