diff --git a/include/battle_controllers.h b/include/battle_controllers.h index 6bd17f90b9..0e5f11e82e 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -168,10 +168,6 @@ enum CONTROLLER_CHOSENMONRETURNVALUE, CONTROLLER_ONERETURNVALUE, CONTROLLER_ONERETURNVALUE_DUPLICATE, - CONTROLLER_CLEARUNKVAR, - CONTROLLER_SETUNKVAR, - CONTROLLER_CLEARUNKFLAG, - CONTROLLER_TOGGLEUNKFLAG, CONTROLLER_HITANIMATION, CONTROLLER_CANTSWITCH, CONTROLLER_PLAYSE, diff --git a/include/contest.h b/include/contest.h index 8a3b6a3c65..acd12a4ebc 100644 --- a/include/contest.h +++ b/include/contest.h @@ -109,7 +109,6 @@ struct ContestPokemon bool8 gameCleared; u8 isShiny:1; u8 unused1:7; - u8 unused2[9]; u32 personality; u32 otId; }; diff --git a/include/field_weather.h b/include/field_weather.h index ba45d161b7..cff2eb5bc3 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -33,7 +33,6 @@ struct Weather } s1; struct { - u8 filler0[0xA0]; struct Sprite *fogHSprites[NUM_FOG_HORIZONTAL_SPRITES]; struct Sprite *ashSprites[NUM_ASH_SPRITES]; struct Sprite *fogDSprites[NUM_FOG_DIAGONAL_SPRITES]; @@ -129,7 +128,6 @@ struct Weather s16 droughtLastBrightnessStage; s16 droughtTimer; s16 droughtState; - u8 droughtUnused[9]; u8 loadDroughtPalsIndex; u8 loadDroughtPalsOffset; }; diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 8ca0422cc8..8540d7b185 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -324,7 +324,7 @@ struct PlayerAvatar /*0x00*/ u8 flags; /*0x01*/ u8 transitionFlags; // used to be named bike, but its definitely not that. seems to be some transition flags /*0x02*/ u8 runningState:7; // this is a static running state. 00 is not moving, 01 is turn direction, 02 is moving. - u8 creeping:1; + u8 creeping:1; /*0x03*/ u8 tileTransitionState; // this is a transition running state: 00 is not moving, 01 is transition between tiles, 02 means you are on the frame in which you have centered on a tile but are about to keep moving, even if changing directions. 2 is also used for a ledge hop, since you are transitioning. /*0x04*/ u8 spriteId; /*0x05*/ u8 objectEventId; diff --git a/include/player_pc.h b/include/player_pc.h index 2521eac131..305c661766 100644 --- a/include/player_pc.h +++ b/include/player_pc.h @@ -9,7 +9,6 @@ struct PlayerPCItemPageStruct u16 itemsAbove; u8 pageItems; u8 count; - u8 filler[3]; u8 scrollIndicatorTaskId; }; diff --git a/include/scanline_effect.h b/include/scanline_effect.h index 80d9df764d..0b395d4f60 100644 --- a/include/scanline_effect.h +++ b/include/scanline_effect.h @@ -30,8 +30,6 @@ struct ScanlineEffect void (*setFirstScanlineReg)(void); u8 srcBuffer; u8 state; - u8 unused16; - u8 unused17; u8 waveTaskId; }; diff --git a/include/trainer_card.h b/include/trainer_card.h index 7c37a84a6c..9e5e53df66 100644 --- a/include/trainer_card.h +++ b/include/trainer_card.h @@ -50,7 +50,6 @@ struct TrainerCard u32 frontier; } linkPoints; // This field is used differently by FRLG vs Emerald /*0x40*/ u32 unionRoomNum; - /*0x44*/ u8 filler[8]; /*0x4C*/ bool8 shouldDrawStickers; // FRLG only /*0x4D*/ u8 unused; /*0x4E*/ u8 monIconTint; // FRLG only diff --git a/src/battle_anim.c b/src/battle_anim.c index 3e079647d2..640e0044ea 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -112,7 +112,7 @@ EWRAM_DATA static u16 sSoundAnimFramesToWait = 0; EWRAM_DATA static u8 sMonAnimTaskIdArray[2] = {0}; EWRAM_DATA u8 gAnimMoveTurn = 0; EWRAM_DATA static u8 sAnimBackgroundFadeState = 0; -EWRAM_DATA u16 gAnimMoveIndex = 0; // Set but unused. +EWRAM_DATA u16 gAnimMoveIndex = 0; EWRAM_DATA u8 gBattleAnimAttacker = 0; EWRAM_DATA u8 gBattleAnimTarget = 0; EWRAM_DATA u16 gAnimBattlerSpecies[MAX_BATTLERS_COUNT] = {0}; diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 7aeefa54b6..c437a687bd 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -87,10 +87,6 @@ static void (*const sLinkOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(u32 batt [CONTROLLER_CHOSENMONRETURNVALUE] = BtlController_Empty, [CONTROLLER_ONERETURNVALUE] = BtlController_Empty, [CONTROLLER_ONERETURNVALUE_DUPLICATE] = BtlController_Empty, - [CONTROLLER_CLEARUNKVAR] = BtlController_HandleClearUnkVar, - [CONTROLLER_SETUNKVAR] = BtlController_HandleSetUnkVar, - [CONTROLLER_CLEARUNKFLAG] = BtlController_HandleClearUnkFlag, - [CONTROLLER_TOGGLEUNKFLAG] = BtlController_HandleToggleUnkFlag, [CONTROLLER_HITANIMATION] = BtlController_HandleHitAnimation, [CONTROLLER_CANTSWITCH] = BtlController_Empty, [CONTROLLER_PLAYSE] = BtlController_HandlePlaySE, diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 283b492a91..795b885f95 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -86,10 +86,6 @@ static void (*const sLinkPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(u32 battl [CONTROLLER_CHOSENMONRETURNVALUE] = BtlController_Empty, [CONTROLLER_ONERETURNVALUE] = BtlController_Empty, [CONTROLLER_ONERETURNVALUE_DUPLICATE] = BtlController_Empty, - [CONTROLLER_CLEARUNKVAR] = BtlController_HandleClearUnkVar, - [CONTROLLER_SETUNKVAR] = BtlController_HandleSetUnkVar, - [CONTROLLER_CLEARUNKFLAG] = BtlController_HandleClearUnkFlag, - [CONTROLLER_TOGGLEUNKFLAG] = BtlController_HandleToggleUnkFlag, [CONTROLLER_HITANIMATION] = BtlController_HandleHitAnimation, [CONTROLLER_CANTSWITCH] = BtlController_Empty, [CONTROLLER_PLAYSE] = BtlController_HandlePlaySE, diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 898a59c2ee..822b04e04f 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -101,10 +101,6 @@ static void (*const sOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(u32 battler) [CONTROLLER_CHOSENMONRETURNVALUE] = BtlController_Empty, [CONTROLLER_ONERETURNVALUE] = BtlController_Empty, [CONTROLLER_ONERETURNVALUE_DUPLICATE] = BtlController_Empty, - [CONTROLLER_CLEARUNKVAR] = BtlController_HandleClearUnkVar, - [CONTROLLER_SETUNKVAR] = BtlController_HandleSetUnkVar, - [CONTROLLER_CLEARUNKFLAG] = BtlController_HandleClearUnkFlag, - [CONTROLLER_TOGGLEUNKFLAG] = BtlController_HandleToggleUnkFlag, [CONTROLLER_HITANIMATION] = BtlController_HandleHitAnimation, [CONTROLLER_CANTSWITCH] = BtlController_Empty, [CONTROLLER_PLAYSE] = BtlController_HandlePlaySE, diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index bdf13d3101..eacf2d3fb7 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -138,10 +138,6 @@ static void (*const sPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(u32 battler) = [CONTROLLER_CHOSENMONRETURNVALUE] = PlayerHandleChosenMonReturnValue, [CONTROLLER_ONERETURNVALUE] = PlayerHandleOneReturnValue, [CONTROLLER_ONERETURNVALUE_DUPLICATE] = PlayerHandleOneReturnValue_Duplicate, - [CONTROLLER_CLEARUNKVAR] = BtlController_HandleClearUnkVar, - [CONTROLLER_SETUNKVAR] = BtlController_HandleSetUnkVar, - [CONTROLLER_CLEARUNKFLAG] = BtlController_HandleClearUnkFlag, - [CONTROLLER_TOGGLEUNKFLAG] = BtlController_HandleToggleUnkFlag, [CONTROLLER_HITANIMATION] = BtlController_HandleHitAnimation, [CONTROLLER_CANTSWITCH] = BtlController_Empty, [CONTROLLER_PLAYSE] = BtlController_HandlePlaySE, diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index 8bb2bd9993..1fcc4fbef7 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -90,10 +90,6 @@ static void (*const sPlayerPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(u32 bat [CONTROLLER_CHOSENMONRETURNVALUE] = BtlController_Empty, [CONTROLLER_ONERETURNVALUE] = BtlController_Empty, [CONTROLLER_ONERETURNVALUE_DUPLICATE] = BtlController_Empty, - [CONTROLLER_CLEARUNKVAR] = BtlController_HandleClearUnkVar, - [CONTROLLER_SETUNKVAR] = BtlController_HandleSetUnkVar, - [CONTROLLER_CLEARUNKFLAG] = BtlController_HandleClearUnkFlag, - [CONTROLLER_TOGGLEUNKFLAG] = BtlController_HandleToggleUnkFlag, [CONTROLLER_HITANIMATION] = BtlController_HandleHitAnimation, [CONTROLLER_CANTSWITCH] = BtlController_Empty, [CONTROLLER_PLAYSE] = BtlController_HandlePlaySE, diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index afd56a9faf..7cffc5fd5b 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -93,10 +93,6 @@ static void (*const sRecordedOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(u32 [CONTROLLER_CHOSENMONRETURNVALUE] = BtlController_Empty, [CONTROLLER_ONERETURNVALUE] = BtlController_Empty, [CONTROLLER_ONERETURNVALUE_DUPLICATE] = BtlController_Empty, - [CONTROLLER_CLEARUNKVAR] = BtlController_HandleClearUnkVar, - [CONTROLLER_SETUNKVAR] = BtlController_HandleSetUnkVar, - [CONTROLLER_CLEARUNKFLAG] = BtlController_HandleClearUnkFlag, - [CONTROLLER_TOGGLEUNKFLAG] = BtlController_HandleToggleUnkFlag, [CONTROLLER_HITANIMATION] = BtlController_HandleHitAnimation, [CONTROLLER_CANTSWITCH] = BtlController_Empty, [CONTROLLER_PLAYSE] = BtlController_HandlePlaySE, diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index 2bb64f3066..568051bd8c 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -90,10 +90,6 @@ static void (*const sRecordedPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(u32 ba [CONTROLLER_CHOSENMONRETURNVALUE] = BtlController_Empty, [CONTROLLER_ONERETURNVALUE] = BtlController_Empty, [CONTROLLER_ONERETURNVALUE_DUPLICATE] = BtlController_Empty, - [CONTROLLER_CLEARUNKVAR] = BtlController_HandleClearUnkVar, - [CONTROLLER_SETUNKVAR] = BtlController_HandleSetUnkVar, - [CONTROLLER_CLEARUNKFLAG] = BtlController_HandleClearUnkFlag, - [CONTROLLER_TOGGLEUNKFLAG] = BtlController_HandleToggleUnkFlag, [CONTROLLER_HITANIMATION] = BtlController_HandleHitAnimation, [CONTROLLER_CANTSWITCH] = BtlController_Empty, [CONTROLLER_PLAYSE] = BtlController_HandlePlaySE, diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index abb2aba946..2d85ddaaec 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -82,10 +82,6 @@ static void (*const sSafariBufferCommands[CONTROLLER_CMDS_COUNT])(u32 battler) = [CONTROLLER_CHOSENMONRETURNVALUE] = BtlController_Empty, [CONTROLLER_ONERETURNVALUE] = BtlController_Empty, [CONTROLLER_ONERETURNVALUE_DUPLICATE] = BtlController_Empty, - [CONTROLLER_CLEARUNKVAR] = BtlController_Empty, - [CONTROLLER_SETUNKVAR] = BtlController_Empty, - [CONTROLLER_CLEARUNKFLAG] = BtlController_Empty, - [CONTROLLER_TOGGLEUNKFLAG] = BtlController_Empty, [CONTROLLER_HITANIMATION] = BtlController_Empty, [CONTROLLER_CANTSWITCH] = BtlController_Empty, [CONTROLLER_PLAYSE] = BtlController_HandlePlaySE, diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index 66d3932694..bba1ffd1da 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -94,10 +94,6 @@ static void (*const sWallyBufferCommands[CONTROLLER_CMDS_COUNT])(u32 battler) = [CONTROLLER_CHOSENMONRETURNVALUE] = BtlController_Empty, [CONTROLLER_ONERETURNVALUE] = BtlController_Empty, [CONTROLLER_ONERETURNVALUE_DUPLICATE] = BtlController_Empty, - [CONTROLLER_CLEARUNKVAR] = BtlController_Empty, - [CONTROLLER_SETUNKVAR] = BtlController_Empty, - [CONTROLLER_CLEARUNKFLAG] = BtlController_Empty, - [CONTROLLER_TOGGLEUNKFLAG] = BtlController_Empty, [CONTROLLER_HITANIMATION] = BtlController_HandleHitAnimation, [CONTROLLER_CANTSWITCH] = BtlController_Empty, [CONTROLLER_PLAYSE] = WallyHandlePlaySE, diff --git a/src/battle_controllers.c b/src/battle_controllers.c index f9106eb764..d60cd34312 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -28,7 +28,6 @@ static EWRAM_DATA u8 sLinkSendTaskId = 0; static EWRAM_DATA u8 sLinkReceiveTaskId = 0; -EWRAM_DATA struct UnusedControllerStruct gUnusedControllerStruct = {}; // Debug? Unused code that writes to it, never read COMMON_DATA void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(u32 battler) = {0}; COMMON_DATA u8 gBattleControllerData[MAX_BATTLERS_COUNT] = {0}; // Used by the battle controllers to store misc sprite/task IDs for each battler @@ -1371,40 +1370,6 @@ void BtlController_EmitOneReturnValue_Duplicate(u32 battler, u32 bufferId, u16 r PrepareBufferDataTransfer(battler, bufferId, gBattleResources->transferBuffer, 4); } -static void UNUSED BtlController_EmitClearUnkVar(u32 battler, u32 bufferId) -{ - gBattleResources->transferBuffer[0] = CONTROLLER_CLEARUNKVAR; - gBattleResources->transferBuffer[1] = CONTROLLER_CLEARUNKVAR; - gBattleResources->transferBuffer[2] = CONTROLLER_CLEARUNKVAR; - gBattleResources->transferBuffer[3] = CONTROLLER_CLEARUNKVAR; - PrepareBufferDataTransfer(battler, bufferId, gBattleResources->transferBuffer, 4); -} - -static void UNUSED BtlController_EmitSetUnkVar(u32 battler, u32 bufferId, u8 b) -{ - gBattleResources->transferBuffer[0] = CONTROLLER_SETUNKVAR; - gBattleResources->transferBuffer[1] = b; - PrepareBufferDataTransfer(battler, bufferId, gBattleResources->transferBuffer, 2); -} - -static void UNUSED BtlController_EmitClearUnkFlag(u32 battler, u32 bufferId) -{ - gBattleResources->transferBuffer[0] = CONTROLLER_CLEARUNKFLAG; - gBattleResources->transferBuffer[1] = CONTROLLER_CLEARUNKFLAG; - gBattleResources->transferBuffer[2] = CONTROLLER_CLEARUNKFLAG; - gBattleResources->transferBuffer[3] = CONTROLLER_CLEARUNKFLAG; - PrepareBufferDataTransfer(battler, bufferId, gBattleResources->transferBuffer, 4); -} - -static void UNUSED BtlController_EmitToggleUnkFlag(u32 battler, u32 bufferId) -{ - gBattleResources->transferBuffer[0] = CONTROLLER_TOGGLEUNKFLAG; - gBattleResources->transferBuffer[1] = CONTROLLER_TOGGLEUNKFLAG; - gBattleResources->transferBuffer[2] = CONTROLLER_TOGGLEUNKFLAG; - gBattleResources->transferBuffer[3] = CONTROLLER_TOGGLEUNKFLAG; - PrepareBufferDataTransfer(battler, bufferId, gBattleResources->transferBuffer, 4); -} - void BtlController_EmitHitAnimation(u32 battler, u32 bufferId) { gBattleResources->transferBuffer[0] = CONTROLLER_HITANIMATION; @@ -2761,30 +2726,6 @@ void BtlController_HandleStatusAnimation(u32 battler) } } -void BtlController_HandleClearUnkVar(u32 battler) -{ - gUnusedControllerStruct.unk = 0; - BattleControllerComplete(battler); -} - -void BtlController_HandleSetUnkVar(u32 battler) -{ - gUnusedControllerStruct.unk = gBattleResources->bufferA[battler][1]; - BattleControllerComplete(battler); -} - -void BtlController_HandleClearUnkFlag(u32 battler) -{ - gUnusedControllerStruct.flag = 0; - BattleControllerComplete(battler); -} - -void BtlController_HandleToggleUnkFlag(u32 battler) -{ - gUnusedControllerStruct.flag ^= 1; - BattleControllerComplete(battler); -} - void BtlController_HandleHitAnimation(u32 battler) { if (gSprites[gBattlerSpriteIds[battler]].invisible == TRUE) diff --git a/src/bike.c b/src/bike.c index 5bbf647ce9..afc3099ab7 100644 --- a/src/bike.c +++ b/src/bike.c @@ -996,8 +996,6 @@ bool8 IsPlayerNotUsingAcroBikeOnBumpySlope(void) void GetOnOffBike(u8 transitionFlags) { - gUnusedBikeCameraAheadPanback = FALSE; - if (gPlayerAvatar.flags & (PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE)) { SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT); diff --git a/src/credits.c b/src/credits.c index 5d5a80cf78..9269460e92 100644 --- a/src/credits.c +++ b/src/credits.c @@ -81,10 +81,8 @@ struct CreditsEntry const u8 *text; }; -static EWRAM_DATA s16 UNUSED sUnkVar = 0; // Never read, only set to 0 static EWRAM_DATA u16 sSavedTaskId = 0; EWRAM_DATA bool8 gHasHallOfFameRecords = 0; -static EWRAM_DATA bool8 sUsedSpeedUp = 0; // Never read static EWRAM_DATA struct CreditsData *sCreditsData = {0}; static const u16 sCredits_Pal[] = INCBIN_U16("graphics/credits/credits.gbapal"); @@ -355,7 +353,6 @@ static void CB2_Credits(void) VBlankCB_Credits(); RunTasks(); AnimateSprites(); - sUsedSpeedUp = TRUE; } BuildOamBuffer(); UpdatePaletteFade(); @@ -448,7 +445,6 @@ void CB2_StartCreditsSequence(void) SetVBlankCallback(VBlankCB_Credits); m4aSongNumStart(MUS_CREDITS); SetMainCallback2(CB2_Credits); - sUsedSpeedUp = FALSE; sCreditsData = AllocZeroed(sizeof(struct CreditsData)); DeterminePokemonToShow(); @@ -480,7 +476,6 @@ static void Task_CreditsMain(u8 taskId) return; } - sUnkVar = 0; mode = gTasks[taskId].tNextMode; if (gTasks[taskId].tNextMode == MODE_BIKE_SCENE) @@ -740,7 +735,6 @@ static void Task_UpdatePage(u8 taskId) gTasks[taskId].tState = 1; gTasks[taskId].tDelay = 72; gTasks[gTasks[taskId].tMainTaskId].tPrintedPage = FALSE; - sUnkVar = 0; } return; case 1: diff --git a/src/decoration.c b/src/decoration.c index d450ad7dfb..2b8973c815 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -113,7 +113,6 @@ EWRAM_DATA static u16 sDecorationsCursorPos = 0; EWRAM_DATA static u16 sDecorationsScrollOffset = 0; EWRAM_DATA u8 gCurDecorationIndex = 0; EWRAM_DATA static u8 sCurDecorationCategory = DECORCAT_DESK; -EWRAM_DATA static u32 UNUSED sFiller[2] = {}; EWRAM_DATA static struct DecorationPCContext sDecorationContext = {}; EWRAM_DATA static u8 sDecorMenuWindowIds[WINDOW_COUNT] = {}; EWRAM_DATA static struct DecorationItemsMenu *sDecorationItemsMenu = NULL; diff --git a/src/field_camera.c b/src/field_camera.c index e76ba3d855..89f73ccbec 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -12,7 +12,7 @@ #include "sprite.h" #include "text.h" -EWRAM_DATA bool8 gUnusedBikeCameraAheadPanback = FALSE; +//EWRAM_DATA bool8 gUnusedBikeCameraAheadPanback = FALSE; // Old EWRAM variable that was never set to anything other than false struct FieldCameraOffset { @@ -464,6 +464,11 @@ void UpdateCameraPanning(void) static void CameraPanningCB_PanAhead(void) { + InstallCameraPanAheadCallback(); + // Old code kept for archival purposes + // The else condition could never run since gUnusedBikeCameraAheadPanback was never set to TRUE + // So the behavior should not change + /* u8 var; if (gUnusedBikeCameraAheadPanback == FALSE) @@ -504,4 +509,5 @@ static void CameraPanningCB_PanAhead(void) sVerticalCameraPan -= 2; } } + */ } diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c index cf31e862c3..234c9c56d3 100644 --- a/src/field_weather_effect.c +++ b/src/field_weather_effect.c @@ -15,7 +15,6 @@ #include "gpu_regs.h" EWRAM_DATA static u8 sCurrentAbnormalWeather = 0; -EWRAM_DATA static u16 sUnusedWeatherRelated = 0; const u16 gCloudsWeatherPalette[] = INCBIN_U16("graphics/weather/cloud.gbapal"); const u16 gSandstormWeatherPalette[] = INCBIN_U16("graphics/weather/sandstorm.gbapal"); @@ -2407,12 +2406,6 @@ static void UpdateBubbleSprite(struct Sprite *sprite) //------------------------------------------------------------------------------ -static void UNUSED UnusedSetCurrentAbnormalWeather(u32 weather, u32 unknown) -{ - sCurrentAbnormalWeather = weather; - sUnusedWeatherRelated = unknown; -} - #define tState data[0] #define tWeatherA data[1] #define tWeatherB data[2] diff --git a/src/fieldmap.c b/src/fieldmap.c index 34a654861a..84e3c564fc 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -30,7 +30,6 @@ EWRAM_DATA u16 ALIGNED(4) sBackupMapData[MAX_MAP_DATA_SIZE] = {0}; EWRAM_DATA struct MapHeader gMapHeader = {0}; EWRAM_DATA struct Camera gCamera = {0}; EWRAM_DATA static struct ConnectionFlags sMapConnectionFlags = {0}; -EWRAM_DATA static u32 UNUSED sFiller = 0; // without this, the next file won't align properly COMMON_DATA struct BackupMapLayout gBackupMapLayout = {0}; diff --git a/src/intro.c b/src/intro.c index 5409833733..93417bc4a1 100644 --- a/src/intro.c +++ b/src/intro.c @@ -176,7 +176,6 @@ enum { #define TIMER_START_LEGENDARIES 43 static EWRAM_DATA u16 sIntroCharacterGender = 0; -static EWRAM_DATA u16 UNUSED sUnusedVar = 0; static EWRAM_DATA u16 sFlygonYOffset = 0; COMMON_DATA u32 gIntroFrameCounter = 0; diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c index 79cab2b050..67ec7855ad 100644 --- a/src/mystery_event_menu.c +++ b/src/mystery_event_menu.c @@ -28,8 +28,6 @@ enum { static void CB2_MysteryEventMenu(void); static void PrintMysteryMenuText(u8 windowId, const u8 *text, u8 x, u8 y, s32 speed); -static EWRAM_DATA u8 sUnused = 0; // set but unused - static const struct BgTemplate sBgTemplates[] = { { @@ -270,10 +268,7 @@ static void CB2_MysteryEventMenu(void) break; case 13: if (!IsTextPrinterActive(WIN_MSG)) - { gMain.state++; - sUnused = 0; - } break; case 14: if (JOY_NEW(A_BUTTON)) diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 4498832743..81dff0f435 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -371,35 +371,15 @@ struct StorageMenu int textId; }; -struct UnkUtilData -{ - const u8 *src; - u8 *dest; - u16 size; - u16 unk; - u16 height; - void (*func)(struct UnkUtilData *data); -}; - -struct UnkUtil -{ - struct UnkUtilData *data; - u8 numActive; - u8 max; -}; - struct ChooseBoxMenu { struct Sprite *menuSprite; struct Sprite *menuSideSprites[4]; - u32 unused1[3]; struct Sprite *arrowSprites[2]; - u8 unused2[0x214]; bool32 loadedPalette; u16 tileTag; u16 paletteTag; u8 curBox; - u8 unused3; u8 subpriority; }; @@ -420,12 +400,8 @@ struct PokemonStorageSystemData u8 screenChangeType; bool8 isReopening; u8 taskId; - struct UnkUtil unkUtil; - struct UnkUtilData unkUtilData[8]; u16 partyMenuTilemapBuffer[0x108]; - u16 partyMenuUnused1; // Never read u16 partyMenuY; - u8 partyMenuUnused2; // Unused u8 partyMenuMoveTimer; u8 showPartyMenuState; bool8 closeBoxFlashing; @@ -436,18 +412,8 @@ struct PokemonStorageSystemData s16 scrollSpeed; u16 scrollTimer; u8 wallpaperOffset; - u8 scrollUnused1; // Never read - u8 scrollToBoxIdUnused; // Never read - u16 scrollUnused2; // Never read - s16 scrollDirectionUnused; // Never read. - u16 scrollUnused3; // Never read - u16 scrollUnused4; // Never read - u16 scrollUnused5; // Never read - u16 scrollUnused6; // Never read - u8 filler1[22]; - u8 boxTitleTiles[1024]; + u8 ALIGNED(2) boxTitleTiles[1024]; u8 boxTitleCycleId; - u8 wallpaperLoadState; // Written to, but never read. u8 wallpaperLoadBoxId; s8 wallpaperLoadDir; u16 boxTitlePal[16]; @@ -457,8 +423,6 @@ struct PokemonStorageSystemData struct Sprite *nextBoxTitleSprites[2]; struct Sprite *arrowSprites[2]; u32 wallpaperPalBits; - u8 filler2[80]; // Unused - u16 unkUnused1; // Never read. s16 wallpaperSetId; s16 wallpaperId; u16 wallpaperTilemap[360]; @@ -486,12 +450,10 @@ struct PokemonStorageSystemData u8 iconScrollCurColumn; s8 iconScrollDirection; // Unnecessary duplicate of scrollDirection u8 iconScrollState; - u8 iconScrollToBoxId; // Unused duplicate of scrollToBoxId struct WindowTemplate menuWindow; struct StorageMenu menuItems[7]; u8 menuItemsCount; u8 menuWidth; - u8 menuUnusedField; // Never read. u16 menuWindowId; struct Sprite *cursorSprite; struct Sprite *cursorShadowSprite; @@ -559,7 +521,6 @@ struct PokemonStorageSystemData struct ItemIcon itemIcons[MAX_ITEM_ICONS]; u16 movingItemId; u16 itemInfoWindowOffset; - u8 unkUnused2; // Unused u16 displayMonPalOffset; u16 *displayMonTilePtr; struct Sprite *displayMonSprite; @@ -882,12 +843,6 @@ static void TilemapUtil_Update(u8); static void TilemapUtil_DrawPrev(u8); static void TilemapUtil_Draw(u8); -// Unknown utility -static void UnkUtil_Init(struct UnkUtil *, struct UnkUtilData *, u32); -static void UnkUtil_Run(void); -static void UnkUtil_CpuRun(struct UnkUtilData *); -static void UnkUtil_DmaRun(struct UnkUtilData *); - // Form changing void SetMonFormPSS(struct BoxPokemon *boxMon); void UpdateSpeciesSpritePSS(struct BoxPokemon *boxmon); @@ -2002,7 +1957,6 @@ static void VBlankCB_PokeStorage(void) { LoadOam(); ProcessSpriteCopyRequests(); - UnkUtil_Run(); TransferPlttBuffer(); if (sStorage != NULL) { @@ -2079,7 +2033,6 @@ static void ResetForPokeStorage(void) FreeAllSpritePalettes(); ClearDma3Requests(); gReservedSpriteTileCount = 0x280; - UnkUtil_Init(&sStorage->unkUtil, sStorage->unkUtilData, ARRAY_COUNT(sStorage->unkUtilData)); gKeyRepeatStartDelay = 20; ClearScheduledBgCopiesToVram(); TilemapUtil_Init(TILEMAPID_COUNT); @@ -4116,7 +4069,6 @@ static void InitSupplementalTilemaps(void) static void SetUpShowPartyMenu(void) { - sStorage->partyMenuUnused1 = 20; sStorage->partyMenuY = 2; sStorage->partyMenuMoveTimer = 0; CreatePartyMonsSprites(FALSE); @@ -4127,7 +4079,6 @@ static bool8 ShowPartyMenu(void) if (sStorage->partyMenuMoveTimer == 20) return FALSE; - sStorage->partyMenuUnused1--; sStorage->partyMenuY++; TilemapUtil_Move(TILEMAPID_PARTY_MENU, 3, 1); TilemapUtil_Update(TILEMAPID_PARTY_MENU); @@ -4146,7 +4097,6 @@ static bool8 ShowPartyMenu(void) static void SetUpHidePartyMenu(void) { - sStorage->partyMenuUnused1 = 0; sStorage->partyMenuY = 22; sStorage->partyMenuMoveTimer = 0; if (sStorage->boxOption == OPTION_MOVE_ITEMS) @@ -4157,7 +4107,6 @@ static bool8 HidePartyMenu(void) { if (sStorage->partyMenuMoveTimer != 20) { - sStorage->partyMenuUnused1++; sStorage->partyMenuY--; TilemapUtil_Move(TILEMAPID_PARTY_MENU, 3, -1); TilemapUtil_Update(TILEMAPID_PARTY_MENU); @@ -4465,7 +4414,6 @@ static void InitMonIconFields(void) sStorage->boxMonsSprites[i] = NULL; sStorage->movingMonSprite = NULL; - sStorage->unkUnused1 = 0; } static u8 GetMonIconPriorityByCursorPos(void) @@ -4686,7 +4634,6 @@ static u8 CreateBoxMonIconsInColumn(u8 column, u16 distance, s16 speed) static void InitBoxMonIconScroll(u8 boxId, s8 direction) { sStorage->iconScrollState = 0; - sStorage->iconScrollToBoxId = boxId; sStorage->iconScrollDirection = direction; sStorage->iconScrollDistance = 32; sStorage->iconScrollSpeed = -(6 * direction); @@ -5318,16 +5265,8 @@ static void SetUpScrollToBox(u8 boxId) s8 direction = DetermineBoxScrollDirection(boxId); sStorage->scrollSpeed = (direction > 0) ? 6 : -6; - sStorage->scrollUnused1 = (direction > 0) ? 1 : 2; sStorage->scrollTimer = 32; - sStorage->scrollToBoxIdUnused = boxId; - sStorage->scrollUnused2 = (direction <= 0) ? 5 : 0; - sStorage->scrollDirectionUnused = direction; - sStorage->scrollUnused3 = (direction > 0) ? 264 : 56; - sStorage->scrollUnused4 = (direction <= 0) ? 5 : 0; - sStorage->scrollUnused5 = 0; - sStorage->scrollUnused6 = 2; sStorage->scrollToBoxId = boxId; sStorage->scrollDirection = direction; sStorage->scrollState = 0; @@ -5437,7 +5376,6 @@ static void LoadWallpaperGfx(u8 boxId, s8 direction) void *iconGfx; u32 tilesSize, iconSize; - sStorage->wallpaperLoadState = 0; sStorage->wallpaperLoadBoxId = boxId; sStorage->wallpaperLoadDir = direction; if (sStorage->wallpaperLoadDir != 0) @@ -8133,7 +8071,6 @@ static void AddMenu(void) PrintMenuTable(sStorage->menuWindowId, sStorage->menuItemsCount, (void *)sStorage->menuItems); InitMenuInUpperLeftCornerNormal(sStorage->menuWindowId, sStorage->menuItemsCount, 0); ScheduleBgCopyTilemapToVram(0); - sStorage->menuUnusedField = 0; } // Called after AddMenu to determine whether or not the handler callback should @@ -10103,88 +10040,6 @@ static void TilemapUtil_Draw(u8 id) // so UnkUtil_Run performs no actions. //------------------------------------------------------------------------------ - -EWRAM_DATA static struct UnkUtil *sUnkUtil = NULL; - -static void UnkUtil_Init(struct UnkUtil *util, struct UnkUtilData *data, u32 max) -{ - sUnkUtil = util; - util->data = data; - util->max = max; - util->numActive = 0; -} - -static void UnkUtil_Run(void) -{ - u16 i; - if (sUnkUtil->numActive) - { - for (i = 0; i < sUnkUtil->numActive; i++) - { - struct UnkUtilData *data = &sUnkUtil->data[i]; - data->func(data); - } - sUnkUtil->numActive = 0; - } -} - -static bool8 UNUSED UnkUtil_CpuAdd(u8 *dest, u16 dLeft, u16 dTop, const u8 *src, u16 sLeft, u16 sTop, u16 width, u16 height, u16 unkArg) -{ - struct UnkUtilData *data; - - if (sUnkUtil->numActive >= sUnkUtil->max) - return FALSE; - - data = &sUnkUtil->data[sUnkUtil->numActive++]; - data->size = width * 2; - data->dest = dest + 2 * (dTop * 32 + dLeft); - data->src = src + 2 * (sTop * unkArg + sLeft); - data->height = height; - data->unk = unkArg; - data->func = UnkUtil_CpuRun; - return TRUE; -} - -// Functionally unused -static void UnkUtil_CpuRun(struct UnkUtilData *data) -{ - u16 i; - - for (i = 0; i < data->height; i++) - { - CpuCopy16(data->src, data->dest, data->size); - data->dest += 64; - data->src += data->unk * 2; - } -} - -static bool8 UNUSED UnkUtil_DmaAdd(void *dest, u16 dLeft, u16 dTop, u16 width, u16 height) -{ - struct UnkUtilData *data; - - if (sUnkUtil->numActive >= sUnkUtil->max) - return FALSE; - - data = &sUnkUtil->data[sUnkUtil->numActive++]; - data->size = width * 2; - data->dest = dest + (dTop * 32 + dLeft) * 2; - data->height = height; - data->func = UnkUtil_DmaRun; - return TRUE; -} - -// Functionally unused -static void UnkUtil_DmaRun(struct UnkUtilData *data) -{ - u16 i; - - for (i = 0; i < data->height; i++) - { - Dma3FillLarge16_(0, data->dest, data->size); - data->dest += 64; - } -} - void UpdateSpeciesSpritePSS(struct BoxPokemon *boxMon) { u16 species = GetBoxMonData(boxMon, MON_DATA_SPECIES); diff --git a/src/scanline_effect.c b/src/scanline_effect.c index 684c89546a..ce9bf190ab 100644 --- a/src/scanline_effect.c +++ b/src/scanline_effect.c @@ -38,8 +38,6 @@ void ScanlineEffect_Clear(void) gScanlineEffect.dmaControl = 0; gScanlineEffect.srcBuffer = 0; gScanlineEffect.state = 0; - gScanlineEffect.unused16 = 0; - gScanlineEffect.unused17 = 0; gScanlineEffect.waveTaskId = TASK_NONE; } @@ -65,8 +63,6 @@ void ScanlineEffect_SetParams(struct ScanlineEffectParams params) gScanlineEffect.dmaControl = params.dmaControl; gScanlineEffect.dmaDest = params.dmaDest; gScanlineEffect.state = params.initState; - gScanlineEffect.unused16 = params.unused9; - gScanlineEffect.unused17 = params.unused9; } void ScanlineEffect_InitHBlankDmaTransfer(void)