dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #549 from AsparagusEduardo/pret_unused

Browse Source 
Removed UNUSED attribute
This commit is contained in:
GriffinR
2022-09-12 14:47:25 -04:00
committed by GitHub
parent 0a01d8f31b b6bc114ef1
commit 398417593b
19 changed files with 122 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/weather.h
+17
View File
@@ -20,4 +20,21 @@
#define WEATHER_ROUTE119_CYCLE 20 // unused #define WEATHER_ROUTE119_CYCLE 20 // unused
#define WEATHER_ROUTE123_CYCLE 21 // 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 #endif // GUARD_CONSTANTS_WEATHER_H
include/party_menu.h
+4 -4
View File
@@ -53,14 +53,14 @@ void SetUsedFlyQuestLogEvent(const u8 *healLocCtrlData);
void CB2_ShowPartyMenuForItemUse(void); void CB2_ShowPartyMenuForItemUse(void);
void ItemUseCB_Medicine(u8 taskId, TaskFunc func); void ItemUseCB_Medicine(u8 taskId, TaskFunc func);
void ItemUseCB_MedicineStep(u8 taskId, TaskFunc func); void ItemUseCB_MedicineStep(u8 taskId, TaskFunc func);
void ItemUseCB_PPRecovery(u8 taskId, UNUSED TaskFunc func); void ItemUseCB_PPRecovery(u8 taskId, TaskFunc func);
void ItemUseCB_PPUp(u8 taskId, UNUSED TaskFunc func); void ItemUseCB_PPUp(u8 taskId, TaskFunc func);
u16 ItemIdToBattleMoveId(u16 item); u16 ItemIdToBattleMoveId(u16 item);
bool8 IsMoveHm(u16 move); bool8 IsMoveHm(u16 move);
bool8 MonKnowsMove(struct Pokemon *mon, 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_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); void ItemUseCB_EvolutionStone(u8 taskId, TaskFunc func);
u8 GetItemEffectType(u16 item); u8 GetItemEffectType(u16 item);
void CB2_PartyMenuFromStartMenu(void); void CB2_PartyMenuFromStartMenu(void);
src/battle_anim_special.c
+7 -5
View File
@@ -35,9 +35,9 @@
#define TAG_HEALTHBOX_PALS_2 55050 #define TAG_HEALTHBOX_PALS_2 55050
// RAM // RAM
UNUSED u32 gMonShrinkDuration; u32 gMonShrinkDuration;
UNUSED u16 gMonShrinkDelta; u16 gMonShrinkDelta;
UNUSED u16 gMonShrinkDistance; u16 gMonShrinkDistance;
// Function Declarations // Function Declarations
static void AnimTask_UnusedLevelUpHealthBox_Step(u8); static void AnimTask_UnusedLevelUpHealthBox_Step(u8);
@@ -409,7 +409,9 @@ const struct SpriteTemplate gSafariRockTemplate =
}; };
// Functions // Functions
UNUSED void AnimTask_UnusedLevelUpHealthBox(u8 taskId)
// Unused
void AnimTask_LevelUpHealthBox(u8 taskId)
{ {
struct BattleAnimBgData animBgData; struct BattleAnimBgData animBgData;
u8 healthBoxSpriteId; u8 healthBoxSpriteId;
@@ -2205,7 +2207,7 @@ static void SpriteCB_ShinySparkles_2(struct Sprite *sprite)
void AnimTask_LoadBaitGfx(u8 taskId) void AnimTask_LoadBaitGfx(u8 taskId)
{ {
UNUSED u8 paletteIndex; u8 paletteIndex;
LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[ANIM_TAG_SAFARI_BAIT - ANIM_SPRITES_START]); LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[ANIM_TAG_SAFARI_BAIT - ANIM_SPRITES_START]);
LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[ANIM_TAG_SAFARI_BAIT - ANIM_SPRITES_START]); LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[ANIM_TAG_SAFARI_BAIT - ANIM_SPRITES_START]);
src/battle_bg.c
+4 -2
View File
@@ -588,7 +588,8 @@ static const struct {
{MAP_BATTLE_SCENE_LINK, BATTLE_TERRAIN_LINK} {MAP_BATTLE_SCENE_LINK, BATTLE_TERRAIN_LINK}
}; };
UNUSED void CreateUnknownDebugSprite(void) // Unused
void CreateUnknownDebugSprite(void)
{ {
u8 spriteId; u8 spriteId;
@@ -634,7 +635,8 @@ static void LoadBattleTerrainEntryGfx(u16 terrain)
LZDecompressVram(sBattleTerrainTable[terrain].entryTilemap, (void *)BG_SCREEN_ADDR(28)); 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) if (terrain > BATTLE_TERRAIN_PLAIN)
terrain = BATTLE_TERRAIN_PLAIN; terrain = BATTLE_TERRAIN_PLAIN;
src/battle_controller_player.c
+2 -1
View File
@@ -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_HEALTHBOX);
EndBounceEffect(gActiveBattler, BOUNCE_MON); EndBounceEffect(gActiveBattler, BOUNCE_MON);
src/battle_gfx_sfx_util.c
+2 -2
View File
@@ -146,8 +146,8 @@ void SpriteCB_WaitForBattlerBallReleaseAnim(struct Sprite *sprite)
} }
} }
// not used // Unused
UNUSED static void UnusedDoBattleSpriteAffineAnim(struct Sprite *sprite, bool8 arg1) static void DoBattleSpriteAffineAnim(struct Sprite *sprite, bool8 arg1)
{ {
sprite->animPaused = 1; sprite->animPaused = 1;
sprite->callback = SpriteCallbackDummy; sprite->callback = SpriteCallbackDummy;
src/battle_main.c
+18 -13
View File
@@ -76,7 +76,7 @@ static void CB2_EndLinkBattle(void);
static void EndLinkBattleInSteps(void); static void EndLinkBattleInSteps(void);
static void SpriteCB_MoveWildMonToRight(struct Sprite *sprite); static void SpriteCB_MoveWildMonToRight(struct Sprite *sprite);
static void SpriteCB_WildMonShowHealthbox(struct Sprite *sprite); static void SpriteCB_WildMonShowHealthbox(struct Sprite *sprite);
static void SpriteCB_Unused_8011E28_Step(struct Sprite *sprite); static void SpriteCB_Flicker(struct Sprite *sprite);
static void SpriteCB_AnimFaintOpponent(struct Sprite *sprite); static void SpriteCB_AnimFaintOpponent(struct Sprite *sprite);
static void SpriteCB_BlinkVisible(struct Sprite *sprite); static void SpriteCB_BlinkVisible(struct Sprite *sprite);
static void oac_poke_ally_(struct Sprite *sprite); static void oac_poke_ally_(struct Sprite *sprite);
@@ -1917,24 +1917,26 @@ void SpriteCallbackDummy_2(struct Sprite *sprite)
{ {
} }
// not used #define sNumFlickers data[3]
UNUSED static void SpriteCB_Unused_8011E28(struct Sprite *sprite) #define sDelay data[4]
// Unused
static void SpriteCB_InitFlicker(struct Sprite *sprite)
{ {
sprite->data[3] = 6; sprite->sNumFlickers = 6;
sprite->data[4] = 1; sprite->sDelay = 1;
sprite->callback = SpriteCB_Unused_8011E28_Step; sprite->callback = SpriteCB_Flicker;
} }
// not used static void SpriteCB_Flicker(struct Sprite *sprite)
static void SpriteCB_Unused_8011E28_Step(struct Sprite *sprite)
{ {
--sprite->data[4]; sprite->sDelay--;
if (sprite->data[4] == 0) if (sprite->sDelay == 0)
{ {
sprite->data[4] = 8; sprite->sDelay = 8;
sprite->invisible ^= 1; sprite->invisible ^= 1;
--sprite->data[3]; sprite->sNumFlickers--;
if (sprite->data[3] == 0) if (sprite->sNumFlickers == 0)
{ {
sprite->invisible = FALSE; sprite->invisible = FALSE;
sprite->callback = SpriteCallbackDummy_2; sprite->callback = SpriteCallbackDummy_2;
@@ -1943,6 +1945,9 @@ static void SpriteCB_Unused_8011E28_Step(struct Sprite *sprite)
} }
} }
#undef sNumFlickers
#undef sDelay
void SpriteCB_FaintOpponentMon(struct Sprite *sprite) void SpriteCB_FaintOpponentMon(struct Sprite *sprite)
{ {
u8 battler = sprite->sBattler; u8 battler = sprite->sBattler;
src/berry_crush.c
+17 -17
View File
@@ -1299,21 +1299,21 @@ static u32 Cmd_PrintMessage(struct BerryCrushGame * game, u8 *args)
return 0; return 0;
} }
static u32 Cmd_ShowGameDisplay(struct BerryCrushGame * game, UNUSED u8 *args) static u32 Cmd_ShowGameDisplay(struct BerryCrushGame * game, u8 *args)
{ {
if (ShowGameDisplay()) if (ShowGameDisplay())
RunOrScheduleCommand(game->nextCmd, RUN_CMD, game->commandParams); RunOrScheduleCommand(game->nextCmd, RUN_CMD, game->commandParams);
return 0; return 0;
} }
static u32 Cmd_HideGameDisplay(struct BerryCrushGame * game, UNUSED u8 *args) static u32 Cmd_HideGameDisplay(struct BerryCrushGame * game, u8 *args)
{ {
if (HideGameDisplay()) if (HideGameDisplay())
RunOrScheduleCommand(game->nextCmd, RUN_CMD, game->commandParams); RunOrScheduleCommand(game->nextCmd, RUN_CMD, game->commandParams);
return 0; return 0;
} }
static u32 Cmd_SignalReadyToBegin(struct BerryCrushGame * game, UNUSED u8 *args) static u32 Cmd_SignalReadyToBegin(struct BerryCrushGame * game, u8 *args)
{ {
switch (game->cmdState) switch (game->cmdState)
{ {
@@ -1356,7 +1356,7 @@ static u32 Cmd_AskPickBerry(struct BerryCrushGame * game, u8 *args)
return 0; return 0;
} }
static u32 Cmd_GoToBerryPouch(struct BerryCrushGame * game, UNUSED u8 *args) static u32 Cmd_GoToBerryPouch(struct BerryCrushGame * game, u8 *args)
{ {
game->cmdCallback = NULL; game->cmdCallback = NULL;
SetMainCallback2(ChooseBerry); SetMainCallback2(ChooseBerry);
@@ -1415,7 +1415,7 @@ static u32 Cmd_WaitForOthersToPickBerries(struct BerryCrushGame * game, u8 *args
return 0; return 0;
} }
static u32 Cmd_DropBerriesIntoCrusher(struct BerryCrushGame * game, UNUSED u8 *args) static u32 Cmd_DropBerriesIntoCrusher(struct BerryCrushGame * game, u8 *args)
{ {
switch (game->cmdState) switch (game->cmdState)
{ {
@@ -1470,7 +1470,7 @@ static u32 Cmd_DropBerriesIntoCrusher(struct BerryCrushGame * game, UNUSED u8 *a
return 0; return 0;
} }
static u32 Cmd_DropLid(struct BerryCrushGame * game, UNUSED u8 *args) static u32 Cmd_DropLid(struct BerryCrushGame * game, u8 *args)
{ {
switch (game->cmdState) switch (game->cmdState)
{ {
@@ -1517,7 +1517,7 @@ static u32 Cmd_DropLid(struct BerryCrushGame * game, UNUSED u8 *args)
return 0; return 0;
} }
static u32 Cmd_Countdown(struct BerryCrushGame * game, UNUSED u8 *args) static u32 Cmd_Countdown(struct BerryCrushGame * game, u8 *args)
{ {
switch (game-> cmdState) switch (game-> cmdState)
{ {
@@ -1822,7 +1822,7 @@ static void RecvLinkData(struct BerryCrushGame * game)
game->endGame = TRUE; 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->localState, 0, sizeof(game->localState));
memset(&game->recvCmd, 0, sizeof(game->recvCmd)); 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->localState, 0, sizeof(game->localState));
memset(&game->recvCmd, 0, sizeof(game->recvCmd)); 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 // 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) switch (game->cmdState)
{ {
@@ -1983,7 +1983,7 @@ static u32 Cmd_HandleTimeUp(struct BerryCrushGame * game, u8 *args)
return 0; 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; u8 i, j, tempPlayerId;
s32 temp1, temp2; s32 temp1, temp2;
@@ -2283,7 +2283,7 @@ static u32 Cmd_AskPlayAgain(struct BerryCrushGame * game, u8 *args)
return 0; return 0;
} }
static u32 Cmd_CommunicatePlayAgainResponses(struct BerryCrushGame * game, UNUSED u8 *args) static u32 Cmd_CommunicatePlayAgainResponses(struct BerryCrushGame * game, u8 *args)
{ {
u8 i = 0; u8 i = 0;
@@ -2330,7 +2330,7 @@ static u32 Cmd_CommunicatePlayAgainResponses(struct BerryCrushGame * game, UNUSE
return 0; return 0;
} }
static u32 Cmd_PlayAgain(struct BerryCrushGame * game, UNUSED u8 *args) static u32 Cmd_PlayAgain(struct BerryCrushGame * game, u8 *args)
{ {
switch (game->cmdState) switch (game->cmdState)
{ {
@@ -2360,7 +2360,7 @@ static u32 Cmd_PlayAgain(struct BerryCrushGame * game, UNUSED u8 *args)
return 0; return 0;
} }
static u32 Cmd_StopGame(struct BerryCrushGame * game, UNUSED u8 *args) static u32 Cmd_StopGame(struct BerryCrushGame * game, u8 *args)
{ {
switch (game->cmdState) switch (game->cmdState)
{ {
@@ -2391,7 +2391,7 @@ static u32 Cmd_StopGame(struct BerryCrushGame * game, UNUSED u8 *args)
return 0; return 0;
} }
static u32 Cmd_CloseLink(struct BerryCrushGame * game, UNUSED u8 *args) static u32 Cmd_CloseLink(struct BerryCrushGame * game, u8 *args)
{ {
switch (game->cmdState) switch (game->cmdState)
{ {
@@ -2415,7 +2415,7 @@ static u32 Cmd_CloseLink(struct BerryCrushGame * game, UNUSED u8 *args)
return 0; return 0;
} }
static u32 Cmd_Quit(UNUSED struct BerryCrushGame * game, UNUSED u8 *args) static u32 Cmd_Quit(struct BerryCrushGame * game, u8 *args)
{ {
QuitBerryCrush(NULL); QuitBerryCrush(NULL);
return 0; return 0;
@@ -2766,7 +2766,7 @@ static void SpriteCB_DropBerryIntoCrusher(struct Sprite *sprite)
#undef MASK_TARGET_Y #undef MASK_TARGET_Y
#undef F_MOVE_HORIZ #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; u8 i;
for (i = 0; i < game->playerCount; i++) for (i = 0; i < game->playerCount; i++)
src/bike.c
+2 -2
View File
@@ -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; *direction_p = gPlayerAvatar.newDirBackup;
gPlayerAvatar.runningState = TURN_DIRECTION; 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); u8 collision = GetBikeCollision(DIR_SOUTH);
src/credits.c
+1 -1
View File
@@ -776,7 +776,7 @@ static void DestroyCreditsWindow(void)
} }
} }
static bool32 DoOverworldMapScrollScene(UNUSED u8 unused) static bool32 DoOverworldMapScrollScene(u8 whichMon)
{ {
switch (sCreditsMgr->subseqno) switch (sCreditsMgr->subseqno)
{ {
src/data/object_events/object_event_graphics.h
+3 -3
View File
@@ -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 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U16("graphics/field_effects/pics/shadow_extra_large.4bpp");
const u16 filler_8398188[0x90] = {}; const u16 filler_8398188[0x90] = {};
const u16 gFieldEffectObjectPic_CutGrass[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp"); 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 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_Ripple[] = INCBIN_U16("graphics/field_effects/pics/ripple.4bpp");
const u16 gFieldEffectObjectPic_Ash[] = INCBIN_U16("graphics/field_effects/pics/ash.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 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/field_effects/palettes/general_1.gbapal");
const u16 filler_8398FE8[16] = {0}; const u16 filler_8398FE8[16] = {0};
const u16 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U16("graphics/field_effects/pics/ground_impact_dust.4bpp"); 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"); 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_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_UnusedGrass[] = INCBIN_U16("graphics/field_effects/pics/unused_grass.4bpp");
const u16 gFieldEffectObjectPic_UnusedGrass2[] = INCBIN_U16("graphics/field_effects/pics/unused_grass_2.4bpp"); const u16 gFieldEffectObjectPic_UnusedGrass2[] = INCBIN_U16("graphics/field_effects/pics/unused_grass_2.4bpp");
src/field_weather.c
+13 -12
View File
@@ -1045,38 +1045,39 @@ bool8 Weather_UpdateBlend(void)
return FALSE; 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); SetWeather(WEATHER_SUNNY_CLOUDS);
break; break;
case 2: case COORD_EVENT_WEATHER_SUNNY:
SetWeather(WEATHER_SUNNY); SetWeather(WEATHER_SUNNY);
break; break;
case 3: case COORD_EVENT_WEATHER_RAIN:
SetWeather(WEATHER_RAIN); SetWeather(WEATHER_RAIN);
break; break;
case 4: case COORD_EVENT_WEATHER_SNOW:
SetWeather(WEATHER_SNOW); SetWeather(WEATHER_SNOW);
break; break;
case 5: case COORD_EVENT_WEATHER_RAIN_THUNDERSTORM:
SetWeather(WEATHER_RAIN_THUNDERSTORM); SetWeather(WEATHER_RAIN_THUNDERSTORM);
break; break;
case 6: case COORD_EVENT_WEATHER_FOG_HORIZONTAL:
SetWeather(WEATHER_FOG_HORIZONTAL); SetWeather(WEATHER_FOG_HORIZONTAL);
break; break;
case 7: case COORD_EVENT_WEATHER_FOG_DIAGONAL:
SetWeather(WEATHER_FOG_DIAGONAL); SetWeather(WEATHER_FOG_DIAGONAL);
break; break;
case 8: case COORD_EVENT_WEATHER_VOLCANIC_ASH:
SetWeather(WEATHER_VOLCANIC_ASH); SetWeather(WEATHER_VOLCANIC_ASH);
break; break;
case 9: case COORD_EVENT_WEATHER_SANDSTORM:
SetWeather(WEATHER_SANDSTORM); SetWeather(WEATHER_SANDSTORM);
break; break;
case 10: case COORD_EVENT_WEATHER_SHADE:
SetWeather(WEATHER_SHADE); SetWeather(WEATHER_SHADE);
break; break;
} }
src/librfu_rfu.c
+5 -5
View File
@@ -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_pollConnectParent(u8 reqCommand, u16 reqResult);
static void rfu_CB_disconnect(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_CHILD_pollConnectRecovery(u8 reqCommand, u16 reqResult);
static void rfu_CB_sendData(UNUSED u8 reqCommand, u16 reqResult); static void rfu_CB_sendData(u8 reqCommand, u16 reqResult);
static void rfu_CB_sendData2(UNUSED 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_sendData3(u8 reqCommand, u16 reqResult);
static void rfu_CB_recvData(u8 reqCommand, u16 reqResult); static void rfu_CB_recvData(u8 reqCommand, u16 reqResult);
static void rfu_enableREQCallback(bool8 enable); 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 u16 rfu_STC_analyzeLLSF(u8, const u8 *, u16);
static void rfu_STC_UNI_receive(u8, const struct RfuLocalStruct *, const u8 *); 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_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_asRecvDataEntity(u8, struct NIComm *);
static void rfu_STC_NI_initSlot_asRecvControllData(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; u8 i;
struct NIComm *NI_comm; 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); 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); rfu_STC_REQ_callback(ID_DATA_TX_REQ, reqResult);
} }
src/link_rfu_2.c
+1 -1
View File
@@ -640,7 +640,7 @@ void sub_80F8FA0(void)
Rfu.state = 14; Rfu.state = 14;
} }
UNUSED // Unused
static void sub_80F8FAC(u8 a0) static void sub_80F8FAC(u8 a0)
{ {
u8 i; u8 i;
src/link_rfu_3.c
+1 -1
View File
@@ -558,7 +558,7 @@ static bool8 RfuUnusedQueue_Enqueue(struct RfuUnusedQueue *queue, u8 *dest)
return TRUE; return TRUE;
} }
UNUSED // Unused
static void sub_80FC9B8(u8 *q1, u8 mode) static void sub_80FC9B8(u8 *q1, u8 mode)
{ {
s32 i; s32 i;
src/party_menu.c
+12 -12
View File
@@ -300,7 +300,7 @@ static void Task_DisplayHPRestoredMessage(u8 taskId);
static void SetSelectedMoveForPPItem(u8 taskId); static void SetSelectedMoveForPPItem(u8 taskId);
static void ReturnToUseOnWhichMon(u8 taskId); static void ReturnToUseOnWhichMon(u8 taskId);
static void TryUsePPItem(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_LearnedMove(u8 taskId);
static void Task_ReplaceMoveYesNo(u8 taskId); static void Task_ReplaceMoveYesNo(u8 taskId);
static void Task_DoLearnedMoveFanfareAfterText(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_StopLearningMoveYesNo(u8 taskId);
static void Task_HandleStopLearningMoveYesNoInput(u8 taskId); static void Task_HandleStopLearningMoveYesNoInput(u8 taskId);
static void Task_TryLearningNextMoveAfterText(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_DisplayLevelUpStatsPg1(u8 taskId);
static void Task_DisplayLevelUpStatsPg2(u8 taskId); static void Task_DisplayLevelUpStatsPg2(u8 taskId);
static void UpdateMonDisplayInfoAfterRareCandy(u8 slot, struct Pokemon *mon); 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_8124DE0(void);
static void sub_8124E48(void); static void sub_8124E48(void);
static void sub_812580C(u8 taskId); static void sub_812580C(u8 taskId);
static void sub_8125898(u8 taskId, UNUSED TaskFunc func); static void sub_8125898(u8 taskId, TaskFunc func);
static void sub_8125F4C(u8 taskId, UNUSED TaskFunc func); static void sub_8125F4C(u8 taskId, TaskFunc func);
static void sub_8125F5C(u8 taskId); static void sub_8125F5C(u8 taskId);
static void sub_8126BD4(void); static void sub_8126BD4(void);
static bool8 MonCanEvolve(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; const u8 *effect;
u16 item = gSpecialVar_ItemId; 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; u16 move;
struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId]; 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); PlaySE(SE_SELECT);
DisplayPartyMenuStdMessage(PARTY_MSG_BOOST_PP_WHICH_MOVE); DisplayPartyMenuStdMessage(PARTY_MSG_BOOST_PP_WHICH_MOVE);
@@ -4789,7 +4789,7 @@ static void DisplayLearnMoveMessageAndClose(u8 taskId, const u8 *str)
gTasks[taskId].func = Task_ClosePartyMenuAfterText; gTasks[taskId].func = Task_ClosePartyMenuAfterText;
} }
void ItemUseCB_TMHM(u8 taskId, UNUSED TaskFunc func) void ItemUseCB_TMHM(u8 taskId, TaskFunc func)
{ {
struct Pokemon *mon; struct Pokemon *mon;
s16 *move; 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); 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); 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 Pokemon *mon = &gPlayerParty[gPartyMenu.slotId];
struct PartyMenuInternal *ptr = sPartyMenuInternal; struct PartyMenuInternal *ptr = sPartyMenuInternal;
@@ -5239,7 +5239,7 @@ static void DisplayMonLearnedMove(u8 taskId, u16 move)
#define tHadEffect data[1] #define tHadEffect data[1]
#define tLastSlotUsed data[2] #define tLastSlotUsed data[2]
void ItemUseCB_SacredAsh(u8 taskId, UNUSED TaskFunc func) void ItemUseCB_SacredAsh(u8 taskId, TaskFunc func)
{ {
sPartyMenuInternal->tUsedOnSlot = FALSE; sPartyMenuInternal->tUsedOnSlot = FALSE;
sPartyMenuInternal->tHadEffect = FALSE; sPartyMenuInternal->tHadEffect = FALSE;
src/pc_screen_effect.c
+2 -2
View File
@@ -16,7 +16,7 @@
#define tBldCntBak data[7] #define tBldCntBak data[7]
#define tBldYBak data[8] #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_TurnOn(u8 taskId);
static void Task_PCScreenEffect_TurnOff(u8 taskId); static void Task_PCScreenEffect_TurnOff(u8 taskId);
@@ -40,7 +40,7 @@ bool8 IsPCScreenEffectRunning_TurnOff(void)
return FuncIsActiveTask(Task_PCScreenEffect_TurnOff); 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); u8 taskId = CreateTask(func, priority);
src/pokemon_special_anim_scene.c
+9 -4
View File
@@ -597,7 +597,8 @@ bool8 PSA_UseTM_RunMachineSetWobble(void)
// anim in with using Rare Candy, but they were scrapped // anim in with using Rare Candy, but they were scrapped
// at a later stage of development // at a later stage of development
UNUSED void PSA_CreateLevelUpVerticalSpritesTask(void) // Unused
void PSA_CreateLevelUpVerticalSpritesTask(void)
{ {
CreateLevelUpVerticalSpritesTask(120, 56, 4, 4, 2, 0); CreateLevelUpVerticalSpritesTask(120, 56, 4, 4, 2, 0);
} }
@@ -607,20 +608,24 @@ bool8 PSA_LevelUpVerticalSpritesTaskIsRunning(void)
return LevelUpVerticalSpritesTaskIsRunning(); return LevelUpVerticalSpritesTaskIsRunning();
} }
UNUSED void PSA_DrawLevelUpWindowPg1(u16 *statsBefore, u16 *statsAfter) // Unused
void PSA_DrawLevelUpWindowPg1(u16 *statsBefore, u16 *statsAfter)
{ {
DrawTextBorderOuter(1, 0x001, 0xE); DrawTextBorderOuter(1, 0x001, 0xE);
DrawLevelUpWindowPg1(1, statsBefore, statsAfter, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY); DrawLevelUpWindowPg1(1, statsBefore, statsAfter, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY);
PutWindowTilemap(1); PutWindowTilemap(1);
CopyWindowToVram(1, COPYWIN_FULL); 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); DrawLevelUpWindowPg2(1, currStats, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(1, COPYWIN_GFX); CopyWindowToVram(1, COPYWIN_GFX);
} }
UNUSED bool8 PSA_IsCopyingLevelUpWindowToVram(void) // Unused
bool8 PSA_IsCopyingLevelUpWindowToVram(void)
{ {
return IsDma3ManagerBusyWithBgCopy(); return IsDma3ManagerBusyWithBgCopy();
} }
src/pokemon_summary_screen.c
+2 -2
View File
@@ -5218,8 +5218,8 @@ static bool32 MapSecIsInKantoOrSevii(u8 mapSec)
return FALSE; return FALSE;
} }
UNUSED // Unused
static void Unused_ShowPokemonSummaryScreen_NullParty(void) static void ShowPokemonSummaryScreen_NullParty(void)
{ {
ShowPokemonSummaryScreen(NULL, 0, 0, CB2_ReturnToField, PSS_MODE_NORMAL); ShowPokemonSummaryScreen(NULL, 0, 0, CB2_ReturnToField, PSS_MODE_NORMAL);
} }