Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-09-29 04:19:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

warnings++

Browse Source
This commit is contained in:
cawtds
2024-06-14 18:21:10 +02:00
parent bbfd9114d5
commit 225dd615f5
6 changed files with 8 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/AgbRfu_LinkManager.c
View File

@@ -229,7 +229,7 @@ u8 rfu_LMAN_CHILD_connectParent(u16 parentId, u16 connect_period)
return 0;
}
static void rfu_LMAN_PARENT_stopWaitLinkRecoveryAndDisconnect(u8 bm_targetSlot)
static void UNUSED rfu_LMAN_PARENT_stopWaitLinkRecoveryAndDisconnect(u8 bm_targetSlot)
{
u8 i;
@@ -1295,7 +1295,7 @@ void rfu_LMAN_setMSCCallback(void (*MSC_callback_p)(u16))
rfu_setMSCCallback(rfu_LMAN_MSC_callback);
}
static void rfu_LMAN_setLMANCallback(void (*func)(u8, u8))
static void UNUSED rfu_LMAN_setLMANCallback(void (*func)(u8, u8))
{
lman.LMAN_callback = func;
}
@@ -1315,7 +1315,7 @@ u8 rfu_LMAN_setLinkRecovery(u8 enable_flag, u16 recovery_period)
return 0;
}
static u8 rfu_LMAN_setNIFailCounterLimit(u16 NI_failCounter_limit)
static u8 UNUSED rfu_LMAN_setNIFailCounterLimit(u16 NI_failCounter_limit)
{
if (gRfuLinkStatus->sendSlotNIFlag | gRfuLinkStatus->recvSlotNIFlag)
{
@@ -1327,7 +1327,7 @@ static u8 rfu_LMAN_setNIFailCounterLimit(u16 NI_failCounter_limit)
return 0;
}
static u8 rfu_LMAN_setFastSearchParent(u8 enable_flag)
static u8 UNUSED rfu_LMAN_setFastSearchParent(u8 enable_flag)
{
if (lman.state == LMAN_STATE_START_SEARCH_PARENT || lman.state == LMAN_STATE_POLL_SEARCH_PARENT || lman.state == LMAN_STATE_END_SEARCH_PARENT)
{

47
src/text_printer.c
View File

@@ -190,7 +190,7 @@ void DecompressGlyphTile(const u16 *src, u16 *dest)
for (i = 0; i < 16; i++)
{
int offsetIndex = (i << 31) ? (u8)*src++ : (*src >> 8);
int offsetIndex = (i << 31) != 0 ? (u8)*src++ : (*src >> 8);
dest[i] = sFontHalfRowLookupTable[sFontHalfRowOffsets[offsetIndex]];
}
}
@@ -276,51 +276,6 @@ void CopyGlyphToWindow(struct TextPrinter *textPrinter)
}
}
// Unused
static void CopyGlyphToWindow_Parameterized(void *tileData, u16 currentX, u16 currentY, u16 width, u16 height)
{
int glyphWidth, glyphHeight;
u8 sizeType;
u16 sizeX;
if (width - currentX < gGlyphInfo.width)
glyphWidth = width - currentX;
else
glyphWidth = gGlyphInfo.width;
if (height - currentY < gGlyphInfo.height)
glyphHeight = height - currentY;
else
glyphHeight = gGlyphInfo.height;
sizeType = 0;
sizeX = (width + (width & 7)) >> 3;
if (glyphWidth > 8)
sizeType |= 1;
if (glyphHeight > 8)
sizeType |= 2;
switch (sizeType)
{
case 0:
GLYPH_COPY(0, 0, glyphWidth, glyphHeight, tileData, currentX, currentY, sizeX);
return;
case 1:
GLYPH_COPY(0, 0, 8, glyphHeight, tileData, currentX, currentY, sizeX);
GLYPH_COPY(8, 0, glyphWidth - 8, glyphHeight, tileData, currentX, currentY, sizeX);
return;
case 2:
GLYPH_COPY(0, 0, glyphWidth, 8, tileData, currentX, currentY, sizeX);
GLYPH_COPY(0, 8, glyphWidth, glyphHeight - 8, tileData, currentX, currentY, sizeX);
return;
case 3:
GLYPH_COPY(0, 0, 8, 8, tileData, currentX, currentY, sizeX);
GLYPH_COPY(8, 0, glyphWidth - 8, 8, tileData, currentX, currentY, sizeX);
GLYPH_COPY(0, 8, 8, glyphHeight - 8, tileData, currentX, currentY, sizeX);
GLYPH_COPY(8, 8, glyphWidth - 8, glyphHeight - 8, tileData, currentX, currentY, sizeX);
return;
}
}
void ClearTextSpan(struct TextPrinter *textPrinter, u32 width)
{
}

39
src/text_window.c
View File

@@ -7,30 +7,6 @@
static void LoadUserWindowGfxByFrame(u8 windowId, u8 frameType, u16 destOffset, u8 palOffset);
// Unused
// Equivalent to LoadHelpMessageWindowGfx, but takes a bg id directly
static void LoadHelpMessageWindowGfxOnBg(u8 bgId, u16 destOffset, u8 palOffset)
{
LoadBgTiles(bgId, gHelpMessageWindow_Gfx, 0x280, destOffset);
LoadPalette(GetTextWindowPalette(2), palOffset, PLTT_SIZE_4BPP);
}
// Unused
// Equivalent to LoadMenuMessageWindowGfx, but takes a bg id directly
static void LoadMenuMessageWindowGfxOnBg(u8 bgId, u16 destOffset, u8 palOffset)
{
LoadBgTiles(bgId, gMenuMessageWindow_Gfx, 0x280, destOffset);
LoadPalette(GetTextWindowPalette(0), palOffset, PLTT_SIZE_4BPP);
}
// Unused
// Equivalent to LoadSignpostWindowGfx, but takes a bg id directly
static void LoadSignpostWindowGfxOnBg(u8 bgId, u16 destOffset, u8 palOffset)
{
LoadBgTiles(bgId, gSignpostWindow_Gfx, 0x260, destOffset);
LoadPalette(GetTextWindowPalette(1), palOffset, PLTT_SIZE_4BPP);
}
// Equivalent to LoadStdWindowGfx, but takes a bg id directly
void LoadStdWindowGfxOnBg(u8 bgId, u16 destOffset, u8 palOffset)
{
@@ -38,21 +14,6 @@ void LoadStdWindowGfxOnBg(u8 bgId, u16 destOffset, u8 palOffset)
LoadPalette(GetTextWindowPalette(3), palOffset, PLTT_SIZE_4BPP);
}
// Unused
// Equivalent to LoadQuestLogWindowTiles, but takes a bg id directly
static void LoadQuestLogWindowTilesOnBg(u8 bgId, u16 destOffset)
{
LoadBgTiles(bgId, gQuestLogWindow_Gfx, 0x280, destOffset);
}
// Unused
// Equivalent to LoadUserWindowGfxByFrame, but takes a bg id directly
static void LoadUserWindowGfxByFrameOnBg(u8 bgId, u8 frameType, u16 destOffset, u8 palOffset)
{
LoadBgTiles(bgId, gUserFrames[frameType].tiles, 0x120, destOffset);
LoadPalette(gUserFrames[frameType].palette, palOffset, PLTT_SIZE_4BPP);
}
// Identical to LoadUserWindowGfx
void LoadUserWindowGfx2(u8 windowId, u16 destOffset, u8 palOffset)
{

1
src/title_screen.c
View File

@@ -57,7 +57,6 @@ static void UpdateScanlineEffectRegBuffer(s16 y);
static void ScheduleStopScanlineEffect(void);
static void LoadMainTitleScreenPalsAndResetBgs(void);
static void CB2_FadeOutTransitionToSaveClearScreen(void);
static void CB2_GoToResetRtcScreen(void);
static void CB2_FadeOutTransitionToResetRtcScreen(void);
static void CB2_FadeOutTransitionToBerryFix(void);
static void LoadSpriteGfxAndPals(void);

6
src/tm_case.c
View File

@@ -216,9 +216,9 @@ static void (*const sSelectTMActionTasks[])(u8 taskId) = {
};
static const struct MenuAction sMenuActions[] = {
[ACTION_USE] = {gOtherText_Use, Action_Use },
[ACTION_GIVE] = {gOtherText_Give, Action_Give},
[ACTION_EXIT] = {gOtherText_Exit, Action_Exit},
[ACTION_USE] = {gOtherText_Use, {Action_Use} },
[ACTION_GIVE] = {gOtherText_Give, {Action_Give} },
[ACTION_EXIT] = {gOtherText_Exit, {Action_Exit} },
};
static const u8 sMenuActionIndices_Field[] = {ACTION_USE, ACTION_GIVE, ACTION_EXIT};

2
src/trade.c
View File

@@ -777,7 +777,6 @@ static const u8 sSelectedMonLevelGenderCoords[][2] = {
static void InitTradeMenu(void)
{
static u16 dummy;
ResetSpriteData();
FreeAllSpritePalettes();
@@ -797,7 +796,6 @@ static void InitTradeMenu(void)
{
int i;
DeactivateAllTextPrinters();
dummy = 590; // ?
for (i = 0; i < ARRAY_COUNT(sWindowTemplates) - 1; i++)
{
ClearWindowTilemap(i);