Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-23 06:06:12 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

even more warnings fixed

Browse Source
This commit is contained in:
cawtds 2024-06-16 16:37:50 +02:00
parent a108f6ac88
commit 856e49c286
6 changed files with 3378 additions and 3409 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3210
src/data/pointillism_points.h Normal file
View File

File diff suppressed because it is too large Load Diff

34
src/fieldmap.c
View File

@ -36,23 +36,23 @@ static bool8 IsPosInIncomingConnectingMap(u8, s32, s32, const struct MapConnecti
static bool8 IsCoordInIncomingConnectingMap(s32, s32, s32, s32);
static u32 GetAttributeByMetatileIdAndMapLayout(const struct MapLayout *, u16, u8);
#define GetBorderBlockAt(x, y) ({ \
u16 block; \
s32 xprime; \
s32 yprime; \
\
const struct MapLayout *mapLayout = gMapHeader.mapLayout; \
\
xprime = x - MAP_OFFSET; \
xprime += 8 * mapLayout->borderWidth; \
xprime %= mapLayout->borderWidth; \
\
yprime = y - MAP_OFFSET; \
yprime += 8 * mapLayout->borderHeight; \
yprime %= mapLayout->borderHeight; \
\
block = mapLayout->border[xprime + yprime * mapLayout->borderWidth] | MAPGRID_COLLISION_MASK; \
})
static inline u16 GetBorderBlockAt(s32 x, s32 y)
{
s32 xprime;
s32 yprime;
const struct MapLayout *mapLayout = gMapHeader.mapLayout;
xprime = x - MAP_OFFSET;
xprime += 8 * mapLayout->borderWidth;
xprime %= mapLayout->borderWidth;
yprime = y - MAP_OFFSET;
yprime += 8 * mapLayout->borderHeight;
yprime %= mapLayout->borderHeight;
return mapLayout->border[xprime + yprime * mapLayout->borderWidth] | MAPGRID_COLLISION_MASK;
}
#define AreCoordsWithinMapGridBounds(x, y) (x >= 0 && x < VMap.Xsize && y >= 0 && y < VMap.Ysize)

3496
src/image_processing_effects.c
View File

File diff suppressed because it is too large Load Diff

4
src/intro.c
View File

@ -2282,9 +2282,9 @@ static void SpriteCB_Star(struct Sprite *sprite)
sprite->sStar_SparkleTimer++;
if (sprite->sStar_SparkleTimer % sStarSparklesSpawnRate)
{
LoadWordFromTwoHalfwords(&sprite->sStar_SparkleRngSeed, &random);
LoadWordFromTwoHalfwords((u16*)&sprite->sStar_SparkleRngSeed, (uintptr_t *)&random);
random = ISO_RANDOMIZE1(random);
StoreWordInTwoHalfwords(&sprite->sStar_SparkleRngSeed, random);
StoreWordInTwoHalfwords((u16*)&sprite->sStar_SparkleRngSeed, random);
random >>= 16;
GFScene_CreateStarSparkle(sprite->x, sprite->y + sprite->y2, random);
}

18
src/item_menu.c
View File

@ -1029,11 +1029,6 @@ void ItemMenu_SetExitCallback(MainCallback cb)
sBagMenuDisplay->exitCB = cb;
}
static u8 GetSelectedItemIndex(u8 pocket)
{
return gBagMenuState.cursorPos[pocket] + gBagMenuState.itemsAbove[pocket];
}
static void Task_BagMenu_HandleInput(u8 taskId)
{
s16 *data = gTasks[taskId].data;
@ -1659,19 +1654,6 @@ void Task_ReturnToBagFromContextMenu(u8 taskId)
Task_RedrawArrowsAndReturnToBagMenuSelect(taskId);
}
static void Task_UnusedReturnToBag(u8 taskId)
{
s16 *data = gTasks[taskId].data;
u16 itemsAbove;
u16 cursorPos;
ListMenuGetScrollAndRow(data[0], &cursorPos, &itemsAbove);
PrintItemDescriptionOnMessageWindow(cursorPos + itemsAbove);
PutWindowTilemap(0);
ScheduleBgCopyTilemapToVram(0);
bag_menu_print_cursor_(data[0], 1);
Task_RedrawArrowsAndReturnToBagMenuSelect(taskId);
}
static void Task_ItemMenuAction_Cancel(u8 taskId)
{
HideBagWindow(10);

25
src/item_pc.c
View File

@ -1084,26 +1084,6 @@ static void ItemPc_InitWindows(void)
sSubmenuWindowIds[i] = 0xFF;
}
static void unused_ItemPc_AddTextPrinterParameterized(u8 windowId, const u8 * string, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, u8 speed)
{
struct TextPrinterTemplate template;
template.currentChar = string;
template.windowId = windowId;
template.fontId = FONT_NORMAL_COPY_2;
template.x = x;
template.y = y;
template.currentX = x;
template.currentY = y;
template.fgColor = 2;
template.bgColor = 0;
template.shadowColor = 3;
template.unk = GetFontAttribute(FONT_NORMAL_COPY_2, FONTATTR_UNKNOWN);
template.letterSpacing = letterSpacing + GetFontAttribute(FONT_NORMAL_COPY_2, FONTATTR_LETTER_SPACING);
template.lineSpacing = lineSpacing + GetFontAttribute(FONT_NORMAL_COPY_2, FONTATTR_LINE_SPACING);
AddTextPrinter(&template, speed, NULL);
}
static void ItemPc_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, u8 speed, u8 colorIdx)
{
AddTextPrinterParameterized4(windowId, fontId, x, y, letterSpacing, lineSpacing, sTextColors[colorIdx], speed, str);
@ -1133,11 +1113,6 @@ static void ItemPc_DestroySubwindow(u8 idx)
sSubmenuWindowIds[idx] = 0xFF;
}
static u8 ItemPc_GetSubwindow(u8 idx)
{
return sSubmenuWindowIds[idx];
}
static void ItemPc_PrintOnWindow5WithContinueTask(u8 taskId, const u8 * str, TaskFunc taskFunc)
{
DisplayMessageAndContinueTask(taskId, 5, 0x3AC, 0x0B, FONT_NORMAL, GetTextSpeedSetting(), str, taskFunc);