From 81ef26732d3967c02637f82c07192505d341d016 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 4 Sep 2022 18:06:58 -0300 Subject: [PATCH] Removed UNUSED attribute --- include/constants/weather.h | 17 ++++++++++ include/party_menu.h | 8 ++--- src/battle_anim_special.c | 12 ++++--- src/battle_bg.c | 6 ++-- src/battle_controller_player.c | 3 +- src/battle_gfx_sfx_util.c | 4 +-- src/battle_main.c | 12 +++---- src/berry_crush.c | 34 +++++++++---------- src/bike.c | 4 +-- src/credits.c | 2 +- .../object_events/object_event_graphics.h | 6 ++-- src/field_weather.c | 25 +++++++------- src/librfu_rfu.c | 10 +++--- src/link_rfu_2.c | 2 +- src/link_rfu_3.c | 2 +- src/party_menu.c | 24 ++++++------- src/pc_screen_effect.c | 4 +-- src/pokemon_special_anim_scene.c | 13 ++++--- src/pokemon_summary_screen.c | 4 +-- 19 files changed, 110 insertions(+), 82 deletions(-) diff --git a/include/constants/weather.h b/include/constants/weather.h index b02496bff..d7572f91b 100644 --- a/include/constants/weather.h +++ b/include/constants/weather.h @@ -20,4 +20,21 @@ #define WEATHER_ROUTE119_CYCLE 20 // unused #define WEATHER_ROUTE123_CYCLE 21 // unused +// These are used in maps' coord_weather_event entries. +// They are not a one-to-one mapping with the engine's +// internal weather constants above. +#define COORD_EVENT_WEATHER_SUNNY_CLOUDS 1 +#define COORD_EVENT_WEATHER_SUNNY 2 +#define COORD_EVENT_WEATHER_RAIN 3 +#define COORD_EVENT_WEATHER_SNOW 4 +#define COORD_EVENT_WEATHER_RAIN_THUNDERSTORM 5 +#define COORD_EVENT_WEATHER_FOG_HORIZONTAL 6 +#define COORD_EVENT_WEATHER_FOG_DIAGONAL 7 +#define COORD_EVENT_WEATHER_VOLCANIC_ASH 8 +#define COORD_EVENT_WEATHER_SANDSTORM 9 +#define COORD_EVENT_WEATHER_SHADE 10 +#define COORD_EVENT_WEATHER_DROUGHT 11 +#define COORD_EVENT_WEATHER_ROUTE119_CYCLE 20 +#define COORD_EVENT_WEATHER_ROUTE123_CYCLE 21 + #endif // GUARD_CONSTANTS_WEATHER_H diff --git a/include/party_menu.h b/include/party_menu.h index 69f25e319..5d329d246 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -53,14 +53,14 @@ void SetUsedFlyQuestLogEvent(const u8 *healLocCtrlData); void CB2_ShowPartyMenuForItemUse(void); void ItemUseCB_Medicine(u8 taskId, TaskFunc func); void ItemUseCB_MedicineStep(u8 taskId, TaskFunc func); -void ItemUseCB_PPRecovery(u8 taskId, UNUSED TaskFunc func); -void ItemUseCB_PPUp(u8 taskId, UNUSED TaskFunc func); +void ItemUseCB_PPRecovery(u8 taskId, TaskFunc func); +void ItemUseCB_PPUp(u8 taskId, TaskFunc func); u16 ItemIdToBattleMoveId(u16 item); bool8 IsMoveHm(u16 move); bool8 MonKnowsMove(struct Pokemon *mon, u16 move); -void ItemUseCB_TMHM(u8 taskId, UNUSED TaskFunc func); +void ItemUseCB_TMHM(u8 taskId, TaskFunc func); void ItemUseCB_RareCandy(u8 taskId, TaskFunc func); -void ItemUseCB_SacredAsh(u8 taskId, UNUSED TaskFunc func); +void ItemUseCB_SacredAsh(u8 taskId, TaskFunc func); void ItemUseCB_EvolutionStone(u8 taskId, TaskFunc func); u8 GetItemEffectType(u16 item); void CB2_PartyMenuFromStartMenu(void); diff --git a/src/battle_anim_special.c b/src/battle_anim_special.c index 8850ebc3a..b4197d598 100644 --- a/src/battle_anim_special.c +++ b/src/battle_anim_special.c @@ -35,9 +35,9 @@ #define TAG_HEALTHBOX_PALS_2 55050 // RAM -UNUSED u32 gMonShrinkDuration; -UNUSED u16 gMonShrinkDelta; -UNUSED u16 gMonShrinkDistance; +u32 gMonShrinkDuration; +u16 gMonShrinkDelta; +u16 gMonShrinkDistance; // Function Declarations static void AnimTask_UnusedLevelUpHealthBox_Step(u8); @@ -409,7 +409,9 @@ const struct SpriteTemplate gSafariRockTemplate = }; // Functions -UNUSED void AnimTask_UnusedLevelUpHealthBox(u8 taskId) + +// Unused +void AnimTask_LevelUpHealthBox(u8 taskId) { struct BattleAnimBgData animBgData; u8 healthBoxSpriteId; @@ -2205,7 +2207,7 @@ static void SpriteCB_ShinySparkles_2(struct Sprite *sprite) void AnimTask_LoadBaitGfx(u8 taskId) { - UNUSED u8 paletteIndex; + u8 paletteIndex; LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[ANIM_TAG_SAFARI_BAIT - ANIM_SPRITES_START]); LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[ANIM_TAG_SAFARI_BAIT - ANIM_SPRITES_START]); diff --git a/src/battle_bg.c b/src/battle_bg.c index dd9666499..c141d3d51 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -588,7 +588,8 @@ static const struct { {MAP_BATTLE_SCENE_LINK, BATTLE_TERRAIN_LINK} }; -UNUSED void CreateUnknownDebugSprite(void) +// Unused +void CreateUnknownDebugSprite(void) { u8 spriteId; @@ -634,7 +635,8 @@ static void LoadBattleTerrainEntryGfx(u16 terrain) LZDecompressVram(sBattleTerrainTable[terrain].entryTilemap, (void *)BG_SCREEN_ADDR(28)); } -UNUSED void GetBattleTerrainGfxPtrs(u8 terrain, const u32 **tilesPtr, const u32 **mapPtr, const u32 **palPtr) +// Unused +void GetBattleTerrainGfxPtrs(u8 terrain, const u32 **tilesPtr, const u32 **mapPtr, const u32 **palPtr) { if (terrain > BATTLE_TERRAIN_PLAIN) terrain = BATTLE_TERRAIN_PLAIN; diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index d12b8a4e7..a1204de6f 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -309,7 +309,8 @@ static void HandleInputChooseAction(void) } } -UNUSED static void UnusedEndBounceEffect(void) +// Unused +static void EndBounceEffect2(void) { EndBounceEffect(gActiveBattler, BOUNCE_HEALTHBOX); EndBounceEffect(gActiveBattler, BOUNCE_MON); diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 327253c04..42f7ed4fc 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -146,8 +146,8 @@ void SpriteCB_WaitForBattlerBallReleaseAnim(struct Sprite *sprite) } } -// not used -UNUSED static void UnusedDoBattleSpriteAffineAnim(struct Sprite *sprite, bool8 arg1) +// Unused +static void DoBattleSpriteAffineAnim(struct Sprite *sprite, bool8 arg1) { sprite->animPaused = 1; sprite->callback = SpriteCallbackDummy; diff --git a/src/battle_main.c b/src/battle_main.c index 349d5e12f..b727437f1 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -76,7 +76,7 @@ static void CB2_EndLinkBattle(void); static void EndLinkBattleInSteps(void); static void SpriteCB_MoveWildMonToRight(struct Sprite *sprite); static void SpriteCB_WildMonShowHealthbox(struct Sprite *sprite); -static void SpriteCB_Unused_8011E28_Step(struct Sprite *sprite); +static void SpriteCB_8011E28_Step(struct Sprite *sprite); static void SpriteCB_AnimFaintOpponent(struct Sprite *sprite); static void SpriteCB_BlinkVisible(struct Sprite *sprite); static void oac_poke_ally_(struct Sprite *sprite); @@ -1917,16 +1917,16 @@ void SpriteCallbackDummy_2(struct Sprite *sprite) { } -// not used -UNUSED static void SpriteCB_Unused_8011E28(struct Sprite *sprite) +// Unused +static void SpriteCB_8011E28(struct Sprite *sprite) { sprite->data[3] = 6; sprite->data[4] = 1; - sprite->callback = SpriteCB_Unused_8011E28_Step; + sprite->callback = SpriteCB_8011E28_Step; } -// not used -static void SpriteCB_Unused_8011E28_Step(struct Sprite *sprite) +// Unused +static void SpriteCB_8011E28_Step(struct Sprite *sprite) { --sprite->data[4]; if (sprite->data[4] == 0) diff --git a/src/berry_crush.c b/src/berry_crush.c index b21158cbb..464e629c5 100644 --- a/src/berry_crush.c +++ b/src/berry_crush.c @@ -1299,21 +1299,21 @@ static u32 Cmd_PrintMessage(struct BerryCrushGame * game, u8 *args) return 0; } -static u32 Cmd_ShowGameDisplay(struct BerryCrushGame * game, UNUSED u8 *args) +static u32 Cmd_ShowGameDisplay(struct BerryCrushGame * game, u8 *args) { if (ShowGameDisplay()) RunOrScheduleCommand(game->nextCmd, RUN_CMD, game->commandParams); return 0; } -static u32 Cmd_HideGameDisplay(struct BerryCrushGame * game, UNUSED u8 *args) +static u32 Cmd_HideGameDisplay(struct BerryCrushGame * game, u8 *args) { if (HideGameDisplay()) RunOrScheduleCommand(game->nextCmd, RUN_CMD, game->commandParams); return 0; } -static u32 Cmd_SignalReadyToBegin(struct BerryCrushGame * game, UNUSED u8 *args) +static u32 Cmd_SignalReadyToBegin(struct BerryCrushGame * game, u8 *args) { switch (game->cmdState) { @@ -1356,7 +1356,7 @@ static u32 Cmd_AskPickBerry(struct BerryCrushGame * game, u8 *args) return 0; } -static u32 Cmd_GoToBerryPouch(struct BerryCrushGame * game, UNUSED u8 *args) +static u32 Cmd_GoToBerryPouch(struct BerryCrushGame * game, u8 *args) { game->cmdCallback = NULL; SetMainCallback2(ChooseBerry); @@ -1415,7 +1415,7 @@ static u32 Cmd_WaitForOthersToPickBerries(struct BerryCrushGame * game, u8 *args return 0; } -static u32 Cmd_DropBerriesIntoCrusher(struct BerryCrushGame * game, UNUSED u8 *args) +static u32 Cmd_DropBerriesIntoCrusher(struct BerryCrushGame * game, u8 *args) { switch (game->cmdState) { @@ -1470,7 +1470,7 @@ static u32 Cmd_DropBerriesIntoCrusher(struct BerryCrushGame * game, UNUSED u8 *a return 0; } -static u32 Cmd_DropLid(struct BerryCrushGame * game, UNUSED u8 *args) +static u32 Cmd_DropLid(struct BerryCrushGame * game, u8 *args) { switch (game->cmdState) { @@ -1517,7 +1517,7 @@ static u32 Cmd_DropLid(struct BerryCrushGame * game, UNUSED u8 *args) return 0; } -static u32 Cmd_Countdown(struct BerryCrushGame * game, UNUSED u8 *args) +static u32 Cmd_Countdown(struct BerryCrushGame * game, u8 *args) { switch (game-> cmdState) { @@ -1822,7 +1822,7 @@ static void RecvLinkData(struct BerryCrushGame * game) game->endGame = TRUE; } -static u32 Cmd_PlayGame_Leader(struct BerryCrushGame * game, UNUSED u8 *args) +static u32 Cmd_PlayGame_Leader(struct BerryCrushGame * game, u8 *args) { memset(&game->localState, 0, sizeof(game->localState)); memset(&game->recvCmd, 0, sizeof(game->recvCmd)); @@ -1855,7 +1855,7 @@ static u32 Cmd_PlayGame_Leader(struct BerryCrushGame * game, UNUSED u8 *args) } } -static u32 Cmd_PlayGame_Member(struct BerryCrushGame * game, UNUSED u8 *args) +static u32 Cmd_PlayGame_Member(struct BerryCrushGame * game, u8 *args) { memset(&game->localState, 0, sizeof(game->localState)); memset(&game->recvCmd, 0, sizeof(game->recvCmd)); @@ -1886,7 +1886,7 @@ static u32 Cmd_PlayGame_Member(struct BerryCrushGame * game, UNUSED u8 *args) } // Game was 'won', crusher was pushed down fully before time was up -static u32 Cmd_FinishGame(struct BerryCrushGame * game, UNUSED u8 *args) +static u32 Cmd_FinishGame(struct BerryCrushGame * game, u8 *args) { switch (game->cmdState) { @@ -1983,7 +1983,7 @@ static u32 Cmd_HandleTimeUp(struct BerryCrushGame * game, u8 *args) return 0; } -static u32 Cmd_TabulateResults(struct BerryCrushGame * game, UNUSED u8 *args) +static u32 Cmd_TabulateResults(struct BerryCrushGame * game, u8 *args) { u8 i, j, tempPlayerId; s32 temp1, temp2; @@ -2283,7 +2283,7 @@ static u32 Cmd_AskPlayAgain(struct BerryCrushGame * game, u8 *args) return 0; } -static u32 Cmd_CommunicatePlayAgainResponses(struct BerryCrushGame * game, UNUSED u8 *args) +static u32 Cmd_CommunicatePlayAgainResponses(struct BerryCrushGame * game, u8 *args) { u8 i = 0; @@ -2330,7 +2330,7 @@ static u32 Cmd_CommunicatePlayAgainResponses(struct BerryCrushGame * game, UNUSE return 0; } -static u32 Cmd_PlayAgain(struct BerryCrushGame * game, UNUSED u8 *args) +static u32 Cmd_PlayAgain(struct BerryCrushGame * game, u8 *args) { switch (game->cmdState) { @@ -2360,7 +2360,7 @@ static u32 Cmd_PlayAgain(struct BerryCrushGame * game, UNUSED u8 *args) return 0; } -static u32 Cmd_StopGame(struct BerryCrushGame * game, UNUSED u8 *args) +static u32 Cmd_StopGame(struct BerryCrushGame * game, u8 *args) { switch (game->cmdState) { @@ -2391,7 +2391,7 @@ static u32 Cmd_StopGame(struct BerryCrushGame * game, UNUSED u8 *args) return 0; } -static u32 Cmd_CloseLink(struct BerryCrushGame * game, UNUSED u8 *args) +static u32 Cmd_CloseLink(struct BerryCrushGame * game, u8 *args) { switch (game->cmdState) { @@ -2415,7 +2415,7 @@ static u32 Cmd_CloseLink(struct BerryCrushGame * game, UNUSED u8 *args) return 0; } -static u32 Cmd_Quit(UNUSED struct BerryCrushGame * game, UNUSED u8 *args) +static u32 Cmd_Quit(struct BerryCrushGame * game, u8 *args) { QuitBerryCrush(NULL); return 0; @@ -2766,7 +2766,7 @@ static void SpriteCB_DropBerryIntoCrusher(struct Sprite *sprite) #undef MASK_TARGET_Y #undef F_MOVE_HORIZ -static void BerryCrushFreeBerrySpriteGfx(struct BerryCrushGame * game, UNUSED struct BerryCrushGame_Gfx * gfx) +static void BerryCrushFreeBerrySpriteGfx(struct BerryCrushGame * game, struct BerryCrushGame_Gfx * gfx) { u8 i; for (i = 0; i < game->playerCount; i++) diff --git a/src/bike.c b/src/bike.c index 4a24fb2a3..941a9773a 100644 --- a/src/bike.c +++ b/src/bike.c @@ -100,7 +100,7 @@ static u8 BikeInputHandler_Normal(u8 *direction_p, u16 newKeys, u16 heldKeys) } } -static u8 BikeInputHandler_Turning(u8 *direction_p, UNUSED u16 newKeys, UNUSED u16 heldKeys) +static u8 BikeInputHandler_Turning(u8 *direction_p, u16 newKeys, u16 heldKeys) { *direction_p = gPlayerAvatar.newDirBackup; gPlayerAvatar.runningState = TURN_DIRECTION; @@ -196,7 +196,7 @@ static void BikeTransition_MoveDirection(u8 direction) } } -static void BikeTransition_Downhill(UNUSED u8 v) +static void BikeTransition_Downhill(u8 v) { u8 collision = GetBikeCollision(DIR_SOUTH); diff --git a/src/credits.c b/src/credits.c index af2ea3889..5252ea682 100644 --- a/src/credits.c +++ b/src/credits.c @@ -776,7 +776,7 @@ static void DestroyCreditsWindow(void) } } -static bool32 DoOverworldMapScrollScene(UNUSED u8 unused) +static bool32 DoOverworldMapScrollScene(u8 whichMon) { switch (sCreditsMgr->subseqno) { diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index 6e6831a82..97da9e822 100644 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -192,7 +192,7 @@ const u16 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U16("graphics/field_effec const u16 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U16("graphics/field_effects/pics/shadow_extra_large.4bpp"); const u16 filler_8398188[0x90] = {}; const u16 gFieldEffectObjectPic_CutGrass[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp"); -UNUSED const u16 gFieldEffectObjectPic_CutGrass2[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp"); +const u16 gFieldEffectObjectPic_CutGrass2[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp"); // Unused const u16 gFieldEffectPal_CutGrass[] = INCBIN_U16("graphics/field_effects/fldeff_cut.gbapal"); const u16 gFieldEffectObjectPic_Ripple[] = INCBIN_U16("graphics/field_effects/pics/ripple.4bpp"); const u16 gFieldEffectObjectPic_Ash[] = INCBIN_U16("graphics/field_effects/pics/ash.4bpp"); @@ -201,9 +201,9 @@ const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/field_effects/pale const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/field_effects/palettes/general_1.gbapal"); const u16 filler_8398FE8[16] = {0}; const u16 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U16("graphics/field_effects/pics/ground_impact_dust.4bpp"); -UNUSED const u16 gFieldEffectObjectPic_UnusedGrass3[] = INCBIN_U16("graphics/field_effects/pics/unused_grass_3.4bpp"); +const u16 gFieldEffectObjectPic_UnusedGrass3[] = INCBIN_U16("graphics/field_effects/pics/unused_grass_3.4bpp"); // Unused const u16 gFieldEffectObjectPic_JumpTallGrass[] = INCBIN_U16("graphics/field_effects/pics/jump_tall_grass.4bpp"); -UNUSED const u16 gFieldEffectObjectPic_UnusedGrass4[] = INCBIN_U16("graphics/field_effects/pics/unused_grass_4.4bpp"); +const u16 gFieldEffectObjectPic_UnusedGrass4[] = INCBIN_U16("graphics/field_effects/pics/unused_grass_4.4bpp"); // Unused const u16 gFieldEffectObjectPic_JumpLongGrass[] = INCBIN_U16("graphics/field_effects/pics/jump_long_grass.4bpp"); const u16 gFieldEffectObjectPic_UnusedGrass[] = INCBIN_U16("graphics/field_effects/pics/unused_grass.4bpp"); const u16 gFieldEffectObjectPic_UnusedGrass2[] = INCBIN_U16("graphics/field_effects/pics/unused_grass_2.4bpp"); diff --git a/src/field_weather.c b/src/field_weather.c index 6322306c6..e088f22df 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -1045,38 +1045,39 @@ bool8 Weather_UpdateBlend(void) return FALSE; } -UNUSED static void Unused_SetWeather(u8 a) +// Unused. Uses the same numbering scheme as the coord events +static void SetFieldWeather(u8 weather) { - switch (a) + switch (weather) { - case 1: + case COORD_EVENT_WEATHER_SUNNY_CLOUDS: SetWeather(WEATHER_SUNNY_CLOUDS); break; - case 2: + case COORD_EVENT_WEATHER_SUNNY: SetWeather(WEATHER_SUNNY); break; - case 3: + case COORD_EVENT_WEATHER_RAIN: SetWeather(WEATHER_RAIN); break; - case 4: + case COORD_EVENT_WEATHER_SNOW: SetWeather(WEATHER_SNOW); break; - case 5: + case COORD_EVENT_WEATHER_RAIN_THUNDERSTORM: SetWeather(WEATHER_RAIN_THUNDERSTORM); break; - case 6: + case COORD_EVENT_WEATHER_FOG_HORIZONTAL: SetWeather(WEATHER_FOG_HORIZONTAL); break; - case 7: + case COORD_EVENT_WEATHER_FOG_DIAGONAL: SetWeather(WEATHER_FOG_DIAGONAL); break; - case 8: + case COORD_EVENT_WEATHER_VOLCANIC_ASH: SetWeather(WEATHER_VOLCANIC_ASH); break; - case 9: + case COORD_EVENT_WEATHER_SANDSTORM: SetWeather(WEATHER_SANDSTORM); break; - case 10: + case COORD_EVENT_WEATHER_SHADE: SetWeather(WEATHER_SHADE); break; } diff --git a/src/librfu_rfu.c b/src/librfu_rfu.c index 9f642907b..69fbbd13f 100644 --- a/src/librfu_rfu.c +++ b/src/librfu_rfu.c @@ -42,8 +42,8 @@ static void rfu_CB_pollConnectParent(u8 reqCommand, u16 reqResult); static void rfu_CB_pollConnectParent(u8 reqCommand, u16 reqResult); static void rfu_CB_disconnect(u8 reqCommand, u16 reqResult); static void rfu_CB_CHILD_pollConnectRecovery(u8 reqCommand, u16 reqResult); -static void rfu_CB_sendData(UNUSED u8 reqCommand, u16 reqResult); -static void rfu_CB_sendData2(UNUSED u8 reqCommand, u16 reqResult); +static void rfu_CB_sendData(u8 reqCommand, u16 reqResult); +static void rfu_CB_sendData2(u8 reqCommand, u16 reqResult); static void rfu_CB_sendData3(u8 reqCommand, u16 reqResult); static void rfu_CB_recvData(u8 reqCommand, u16 reqResult); static void rfu_enableREQCallback(bool8 enable); @@ -64,7 +64,7 @@ static void rfu_STC_CHILD_analyzeRecvPacket(void); static u16 rfu_STC_analyzeLLSF(u8, const u8 *, u16); static void rfu_STC_UNI_receive(u8, const struct RfuLocalStruct *, const u8 *); static void rfu_STC_NI_receive_Receiver(u8, const struct RfuLocalStruct *, const u8 *); -static void rfu_STC_NI_receive_Sender(u8, u8, const struct RfuLocalStruct *, UNUSED const u8 *); +static void rfu_STC_NI_receive_Sender(u8, u8, const struct RfuLocalStruct *, const u8 *); static void rfu_STC_NI_initSlot_asRecvDataEntity(u8, struct NIComm *); static void rfu_STC_NI_initSlot_asRecvControllData(u8, struct NIComm *); @@ -1680,7 +1680,7 @@ void rfu_REQ_sendData(bool8 clockChangeFlag) } } -static void rfu_CB_sendData(UNUSED u8 reqCommand, u16 reqResult) +static void rfu_CB_sendData(u8 reqCommand, u16 reqResult) { u8 i; struct NIComm *NI_comm; @@ -1706,7 +1706,7 @@ static void rfu_CB_sendData(UNUSED u8 reqCommand, u16 reqResult) rfu_STC_REQ_callback(ID_DATA_TX_REQ, reqResult); } -static void rfu_CB_sendData2(UNUSED u8 reqCommand, u16 reqResult) +static void rfu_CB_sendData2(u8 reqCommand, u16 reqResult) { rfu_STC_REQ_callback(ID_DATA_TX_REQ, reqResult); } diff --git a/src/link_rfu_2.c b/src/link_rfu_2.c index 8860deb4f..170b4080a 100644 --- a/src/link_rfu_2.c +++ b/src/link_rfu_2.c @@ -640,7 +640,7 @@ void sub_80F8FA0(void) Rfu.state = 14; } -UNUSED +// Unused static void sub_80F8FAC(u8 a0) { u8 i; diff --git a/src/link_rfu_3.c b/src/link_rfu_3.c index de0a63490..06f01ad80 100644 --- a/src/link_rfu_3.c +++ b/src/link_rfu_3.c @@ -558,7 +558,7 @@ static bool8 RfuUnusedQueue_Enqueue(struct RfuUnusedQueue *queue, u8 *dest) return TRUE; } -UNUSED +// Unused static void sub_80FC9B8(u8 *q1, u8 mode) { s32 i; diff --git a/src/party_menu.c b/src/party_menu.c index 49f51829d..8cc148d48 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -300,7 +300,7 @@ static void Task_DisplayHPRestoredMessage(u8 taskId); static void SetSelectedMoveForPPItem(u8 taskId); static void ReturnToUseOnWhichMon(u8 taskId); static void TryUsePPItem(u8 taskId); -static void ItemUseCB_LearnedMove(u8 taskId, UNUSED TaskFunc func); +static void ItemUseCB_LearnedMove(u8 taskId, TaskFunc func); static void Task_LearnedMove(u8 taskId); static void Task_ReplaceMoveYesNo(u8 taskId); static void Task_DoLearnedMoveFanfareAfterText(u8 taskId); @@ -317,7 +317,7 @@ static void Task_PartyMenuReplaceMove(u8 taskId); static void Task_StopLearningMoveYesNo(u8 taskId); static void Task_HandleStopLearningMoveYesNoInput(u8 taskId); static void Task_TryLearningNextMoveAfterText(u8 taskId); -static void ItemUseCB_RareCandyStep(u8 taskId, UNUSED TaskFunc func); +static void ItemUseCB_RareCandyStep(u8 taskId, TaskFunc func); static void Task_DisplayLevelUpStatsPg1(u8 taskId); static void Task_DisplayLevelUpStatsPg2(u8 taskId); static void UpdateMonDisplayInfoAfterRareCandy(u8 slot, struct Pokemon *mon); @@ -376,8 +376,8 @@ static void SetUsedFieldMoveQuestLogEvent(struct Pokemon *mon, u8 fieldMove); static void sub_8124DE0(void); static void sub_8124E48(void); static void sub_812580C(u8 taskId); -static void sub_8125898(u8 taskId, UNUSED TaskFunc func); -static void sub_8125F4C(u8 taskId, UNUSED TaskFunc func); +static void sub_8125898(u8 taskId, TaskFunc func); +static void sub_8125F4C(u8 taskId, TaskFunc func); static void sub_8125F5C(u8 taskId); static void sub_8126BD4(void); static bool8 MonCanEvolve(void); @@ -4623,7 +4623,7 @@ static void Task_HandleWhichMoveInput(u8 taskId) } } -void ItemUseCB_PPRecovery(u8 taskId, UNUSED TaskFunc func) +void ItemUseCB_PPRecovery(u8 taskId, TaskFunc func) { const u8 *effect; u16 item = gSpecialVar_ItemId; @@ -4689,7 +4689,7 @@ static void sub_812580C(u8 taskId) } } -static void sub_8125898(u8 taskId, UNUSED TaskFunc func) +static void sub_8125898(u8 taskId, TaskFunc func) { u16 move; struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId]; @@ -4739,7 +4739,7 @@ static void TryUsePPItem(u8 taskId) } } -void ItemUseCB_PPUp(u8 taskId, UNUSED TaskFunc func) +void ItemUseCB_PPUp(u8 taskId, TaskFunc func) { PlaySE(SE_SELECT); DisplayPartyMenuStdMessage(PARTY_MSG_BOOST_PP_WHICH_MOVE); @@ -4789,7 +4789,7 @@ static void DisplayLearnMoveMessageAndClose(u8 taskId, const u8 *str) gTasks[taskId].func = Task_ClosePartyMenuAfterText; } -void ItemUseCB_TMHM(u8 taskId, UNUSED TaskFunc func) +void ItemUseCB_TMHM(u8 taskId, TaskFunc func) { struct Pokemon *mon; s16 *move; @@ -4825,7 +4825,7 @@ void ItemUseCB_TMHM(u8 taskId, UNUSED TaskFunc func) } } -static void ItemUseCB_LearnedMove(u8 taskId, UNUSED TaskFunc func) +static void ItemUseCB_LearnedMove(u8 taskId, TaskFunc func) { Task_LearnedMove(taskId); } @@ -4944,7 +4944,7 @@ static void Task_ReturnToPartyMenuWhileLearningMove(u8 taskId) } } -static void sub_8125F4C(u8 taskId, UNUSED TaskFunc func) +static void sub_8125F4C(u8 taskId, TaskFunc func) { sub_8125F5C(taskId); } @@ -5072,7 +5072,7 @@ void ItemUseCB_RareCandy(u8 taskId, TaskFunc func) } } -static void ItemUseCB_RareCandyStep(u8 taskId, UNUSED TaskFunc func) +static void ItemUseCB_RareCandyStep(u8 taskId, TaskFunc func) { struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId]; struct PartyMenuInternal *ptr = sPartyMenuInternal; @@ -5239,7 +5239,7 @@ static void DisplayMonLearnedMove(u8 taskId, u16 move) #define tHadEffect data[1] #define tLastSlotUsed data[2] -void ItemUseCB_SacredAsh(u8 taskId, UNUSED TaskFunc func) +void ItemUseCB_SacredAsh(u8 taskId, TaskFunc func) { sPartyMenuInternal->tUsedOnSlot = FALSE; sPartyMenuInternal->tHadEffect = FALSE; diff --git a/src/pc_screen_effect.c b/src/pc_screen_effect.c index 99a73d427..e7303a030 100644 --- a/src/pc_screen_effect.c +++ b/src/pc_screen_effect.c @@ -16,7 +16,7 @@ #define tBldCntBak data[7] #define tBldYBak data[8] -static void BeginPCScreenEffect(TaskFunc func, u16 a2, UNUSED u16 a3, u8 priority); +static void BeginPCScreenEffect(TaskFunc func, u16 a2, u16 a3, u8 priority); static void Task_PCScreenEffect_TurnOn(u8 taskId); static void Task_PCScreenEffect_TurnOff(u8 taskId); @@ -40,7 +40,7 @@ bool8 IsPCScreenEffectRunning_TurnOff(void) return FuncIsActiveTask(Task_PCScreenEffect_TurnOff); } -static void BeginPCScreenEffect(TaskFunc func, u16 speed, UNUSED u16 unused, u8 priority) +static void BeginPCScreenEffect(TaskFunc func, u16 speed, u16 unused, u8 priority) { u8 taskId = CreateTask(func, priority); diff --git a/src/pokemon_special_anim_scene.c b/src/pokemon_special_anim_scene.c index 0b1277113..65d362e26 100644 --- a/src/pokemon_special_anim_scene.c +++ b/src/pokemon_special_anim_scene.c @@ -597,7 +597,8 @@ bool8 PSA_UseTM_RunMachineSetWobble(void) // anim in with using Rare Candy, but they were scrapped // at a later stage of development -UNUSED void PSA_CreateLevelUpVerticalSpritesTask(void) +// Unused +void PSA_CreateLevelUpVerticalSpritesTask(void) { CreateLevelUpVerticalSpritesTask(120, 56, 4, 4, 2, 0); } @@ -607,20 +608,24 @@ bool8 PSA_LevelUpVerticalSpritesTaskIsRunning(void) return LevelUpVerticalSpritesTaskIsRunning(); } -UNUSED void PSA_DrawLevelUpWindowPg1(u16 *statsBefore, u16 *statsAfter) +// Unused +void PSA_DrawLevelUpWindowPg1(u16 *statsBefore, u16 *statsAfter) { DrawTextBorderOuter(1, 0x001, 0xE); DrawLevelUpWindowPg1(1, statsBefore, statsAfter, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY); PutWindowTilemap(1); CopyWindowToVram(1, COPYWIN_FULL); } -UNUSED void PSA_DrawLevelUpWindowPg2(u16 *currStats) + +// Unused +void PSA_DrawLevelUpWindowPg2(u16 *currStats) { DrawLevelUpWindowPg2(1, currStats, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY); CopyWindowToVram(1, COPYWIN_GFX); } -UNUSED bool8 PSA_IsCopyingLevelUpWindowToVram(void) +// Unused +bool8 PSA_IsCopyingLevelUpWindowToVram(void) { return IsDma3ManagerBusyWithBgCopy(); } diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 3c8967f72..6f7a06d9c 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -5218,8 +5218,8 @@ static bool32 MapSecIsInKantoOrSevii(u8 mapSec) return FALSE; } -UNUSED -static void Unused_ShowPokemonSummaryScreen_NullParty(void) +// Unused +static void ShowPokemonSummaryScreen_NullParty(void) { ShowPokemonSummaryScreen(NULL, 0, 0, CB2_ReturnToField, PSS_MODE_NORMAL); }