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

fix even more warnings

Browse Source
This commit is contained in:
cawtds
2024-06-14 22:26:48 +02:00
parent 9f945f58e2
commit 1713087c9e
7 changed files with 4 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/data/object_events/movement_action_func_tables.h
View File

@@ -182,13 +182,9 @@ static bool8 MovementAction_AcroWheelieFaceUp_Step0(struct ObjectEvent *, struct
static bool8 MovementAction_AcroWheelieFaceLeft_Step0(struct ObjectEvent *, struct Sprite *);
static bool8 MovementAction_AcroWheelieFaceRight_Step0(struct ObjectEvent *, struct Sprite *);
static bool8 MovementAction_AcroPopWheelieDown_Step0(struct ObjectEvent *, struct Sprite *);
static bool8 MovementAction_AcroPopWheelieDown_Step1(struct ObjectEvent *, struct Sprite *);
static bool8 MovementAction_AcroPopWheelieUp_Step0(struct ObjectEvent *, struct Sprite *);
static bool8 MovementAction_AcroPopWheelieUp_Step1(struct ObjectEvent *, struct Sprite *);
static bool8 MovementAction_AcroPopWheelieLeft_Step0(struct ObjectEvent *, struct Sprite *);
static bool8 MovementAction_AcroPopWheelieLeft_Step1(struct ObjectEvent *, struct Sprite *);
static bool8 MovementAction_AcroPopWheelieRight_Step0(struct ObjectEvent *, struct Sprite *);
static bool8 MovementAction_AcroPopWheelieRight_Step1(struct ObjectEvent *, struct Sprite *);
static bool8 MovementAction_AcroEndWheelieFaceDown_Step0(struct ObjectEvent *, struct Sprite *);
static bool8 MovementAction_AcroEndWheelieFaceUp_Step0(struct ObjectEvent *, struct Sprite *);
static bool8 MovementAction_AcroEndWheelieFaceLeft_Step0(struct ObjectEvent *, struct Sprite *);

53
src/event_object_movement.c
View File

@@ -2234,21 +2234,6 @@ void LoadSpecialObjectReflectionPalette(u16 tag, u8 slot)
}
}
// Unused
static u8 GetReflectionEffectPaletteSlot(u8 slot)
{
return gReflectionEffectPaletteMap[slot];
}
// Unused
void IncrementObjectEventCoords(struct ObjectEvent *objectEvent, s16 x, s16 y)
{
objectEvent->previousCoords.x = objectEvent->currentCoords.x;
objectEvent->previousCoords.y = objectEvent->currentCoords.y;
objectEvent->currentCoords.x += x;
objectEvent->currentCoords.y += y;
}
void ShiftObjectEventCoords(struct ObjectEvent *objectEvent, s16 x, s16 y)
{
objectEvent->previousCoords.x = objectEvent->currentCoords.x;
@@ -4927,27 +4912,12 @@ bool8 IsBerryTreeSparkling(u8 localId, u8 mapNum, u8 mapGroup)
return FALSE;
}
static void SetBerryTreeJustPicked(u8 localId, u8 mapNum, u8 mapGroup)
{
u8 objectEventId;
if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId))
gSprites[gObjectEvents[objectEventId].spriteId].data[7] |= 0x04;
}
void MoveCoords(u8 direction, s16 *x, s16 *y)
{
*x += sDirectionToVectors[direction].x;
*y += sDirectionToVectors[direction].y;
}
// Unused
static void MoveCoordsInMapCoordIncrement(u8 direction, s16 *x, s16 *y)
{
*x += sDirectionToVectors[direction].x << 4;
*y += sDirectionToVectors[direction].y << 4;
}
static void MoveCoordsInDirection(u32 dir, s16 *x, s16 *y, s16 deltaX, s16 deltaY)
{
u8 direction = dir;
@@ -8254,8 +8224,6 @@ static void GetGroundEffectFlags_JumpLanding(struct ObjectEvent *objEvent, u32 *
static u8 ObjectEventCheckForReflectiveSurface(struct ObjectEvent *objEvent)
{
const struct ObjectEventGraphicsInfo *info = GetObjectEventGraphicsInfo(objEvent->graphicsId);
// ceil div by tile width?
s16 width = 1;
s16 height = 2;
@@ -8552,10 +8520,10 @@ static void DoTracksGroundEffect_BikeTireTracks(struct ObjectEvent *objEvent, st
// each byte in that row is for the next direction of the bike in the order
// of down, up, left, right.
static const u8 bikeTireTracks_Transitions[4][4] = {
1, 2, 7, 8,
1, 2, 6, 5,
5, 8, 3, 4,
6, 7, 3, 4,
{1, 2, 7, 8},
{1, 2, 6, 5},
{5, 8, 3, 4},
{6, 7, 3, 4},
};
if (objEvent->currentCoords.x != objEvent->previousCoords.x || objEvent->currentCoords.y != objEvent->previousCoords.y)
@@ -9219,18 +9187,6 @@ void SpriteCB_VirtualObject(struct Sprite *sprite)
UpdateObjectEventSpriteInvisibility(sprite, sprite->sInvisible);
}
// Unused
static void DestroyVirtualObjects(void)
{
s32 i;
for (i = 0; i < MAX_SPRITES; i++)
{
struct Sprite *sprite = &gSprites[i];
if (sprite->inUse && sprite->callback == SpriteCB_VirtualObject)
DestroySprite(sprite);
}
}
static int GetVirtualObjectSpriteId(u8 virtualObjId)
{
int i;
@@ -9245,7 +9201,6 @@ static int GetVirtualObjectSpriteId(u8 virtualObjId)
void TurnVirtualObject(u8 virtualObjId, u8 direction)
{
u8 animNum;
u8 spriteId = GetVirtualObjectSpriteId(virtualObjId);
if (spriteId != MAX_SPRITES)
{

2
src/field_effect_helpers.c
View File

@@ -1391,7 +1391,6 @@ static void UpdateGrassFieldEffectSubpriority(struct Sprite *sprite, u8 z, u8 of
{
u8 i;
s16 var, xhi, lyhi, yhi, ylo;
const struct ObjectEventGraphicsInfo * graphicsInfo; // Unused Variable
struct Sprite *linkedSprite;
SetObjectSubpriorityByElevation(z, sprite, offset);
@@ -1400,7 +1399,6 @@ static void UpdateGrassFieldEffectSubpriority(struct Sprite *sprite, u8 z, u8 of
struct ObjectEvent * objectEvent = &gObjectEvents[i];
if (objectEvent->active)
{
graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId);
linkedSprite = &gSprites[objectEvent->spriteId];
xhi = sprite->x + sprite->centerToCornerVecX;
var = sprite->x - sprite->centerToCornerVecX;

35
src/field_message_box.c
View File

@@ -9,7 +9,6 @@
static EWRAM_DATA u8 sMessageBoxType = 0;
static void ExpandStringAndStartDrawFieldMessageBox(const u8 *str);
static void StartDrawFieldMessageBox(void);
void InitFieldMessageBox(void)
{
@@ -80,26 +79,6 @@ bool8 ShowFieldAutoScrollMessage(const u8 *str)
return TRUE;
}
// Unused
static bool8 ForceShowFieldAutoScrollMessage(const u8 *str)
{
sMessageBoxType = FIELD_MESSAGE_BOX_AUTO_SCROLL;
ExpandStringAndStartDrawFieldMessageBox(str);
return TRUE;
}
// Unused
// Same as ShowFieldMessage, but instead of accepting a string argument,
// it just prints whatever that's already in gStringVar4
static bool8 ShowFieldMessageFromBuffer(void)
{
if (sMessageBoxType != FIELD_MESSAGE_BOX_HIDDEN)
return FALSE;
sMessageBoxType = FIELD_MESSAGE_BOX_NORMAL;
StartDrawFieldMessageBox();
return TRUE;
}
static void ExpandStringAndStartDrawFieldMessageBox(const u8 *str)
{
StringExpandPlaceholders(gStringVar4, str);
@@ -107,12 +86,6 @@ static void ExpandStringAndStartDrawFieldMessageBox(const u8 *str)
CreateTask_DrawFieldMessageBox();
}
static void StartDrawFieldMessageBox(void)
{
AddTextPrinterDiffStyle(TRUE);
CreateTask_DrawFieldMessageBox();
}
void HideFieldMessageBox(void)
{
DestroyTask_DrawFieldMessageBox();
@@ -132,11 +105,3 @@ bool8 IsFieldMessageBoxHidden(void)
else
return FALSE;
}
// Unused
static void ReplaceFieldMessageWithFrame(void)
{
DestroyTask_DrawFieldMessageBox();
DrawStdWindowFrame(0, TRUE);
sMessageBoxType = FIELD_MESSAGE_BOX_HIDDEN;
}

17
src/field_special_scene.c
View File

@@ -1,22 +1,5 @@
#include "global.h"
static u32 FieldSpecialScene_Dummy0(void)
{
return 0;
}
static void FieldSpecialScene_Dummy1(void)
{
}
static void FieldSpecialScene_Dummy2(void)
{
}
static void FieldSpecialScene_Dummy3(void)
{
}
void FieldCB_ShowPortholeView(void)
{
}

2
src/itemfinder.c
View File

@@ -594,7 +594,6 @@ static void CreateArrowSprite(u8 animNum, u8 direction)
static void SpriteCallback_Arrow(struct Sprite *sprite)
{
s16 x, y;
sprite->spCurX += sprite->spDeltaX;
sprite->spCurY += sprite->spDeltaY;
sprite->x = sprite->spCenterX + (sprite->spCurX >> 8);
@@ -631,7 +630,6 @@ static u8 CreateStarSprite(void)
static void SpriteCallback_Star(struct Sprite *sprite)
{
s16 x, y;
sprite->spCurX += sprite->spDeltaX;
sprite->spCurY += sprite->spDeltaY;
sprite->x = sprite->spCenterX + (sprite->spCurX >> 8);

29
src/naming_screen.c
View File

@@ -2041,35 +2041,6 @@ static bool8 IsWideLetter(u8 character)
return FALSE;
}
//--------------------------------------------------
// Unused debug functions
//--------------------------------------------------
static void Debug_NamingScreenPlayer(void)
{
DoNamingScreen(NAMING_SCREEN_PLAYER, gSaveBlock2Ptr->playerName, gSaveBlock2Ptr->playerGender, MON_MALE, 0, CB2_ReturnToFieldWithOpenMenu);
}
static void Debug_NamingScreenBox(void)
{
DoNamingScreen(NAMING_SCREEN_BOX, gSaveBlock2Ptr->playerName, gSaveBlock2Ptr->playerGender, MON_MALE, 0, CB2_ReturnToFieldWithOpenMenu);
}
static void Debug_NamingScreenCaughtMon(void)
{
DoNamingScreen(NAMING_SCREEN_CAUGHT_MON, gSaveBlock2Ptr->playerName, gSaveBlock2Ptr->playerGender, MON_MALE, 0, CB2_ReturnToFieldWithOpenMenu);
}
static void Debug_NamingScreenNickname(void)
{
DoNamingScreen(NAMING_SCREEN_NICKNAME, gSaveBlock2Ptr->playerName, gSaveBlock2Ptr->playerGender, MON_MALE, 0, CB2_ReturnToFieldWithOpenMenu);
}
static void Debug_NamingScreenRival(void)
{
DoNamingScreen(NAMING_SCREEN_RIVAL, gSaveBlock2Ptr->playerName, gSaveBlock2Ptr->playerGender, MON_MALE, 0, CB2_ReturnToFieldWithOpenMenu);
}
//--------------------------------------------------
// Forward-declared variables
//--------------------------------------------------