From bfa9d905e1bde63bc0d7f5f95891ec302567a7d6 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 11 Jan 2025 13:30:11 +0100 Subject: [PATCH] Free some IWRAM (#6000) --- src/battle_anim_dragon.c | 5 ----- src/digit_obj_util.c | 6 +++--- src/ereader_screen.c | 3 --- src/link.c | 28 ---------------------------- src/pokedex_area_screen.c | 10 +++++----- 5 files changed, 8 insertions(+), 44 deletions(-) mode change 100755 => 100644 src/ereader_screen.c mode change 100755 => 100644 src/pokedex_area_screen.c diff --git a/src/battle_anim_dragon.c b/src/battle_anim_dragon.c index f3ee2a3818..55ecd5d0c1 100644 --- a/src/battle_anim_dragon.c +++ b/src/battle_anim_dragon.c @@ -14,8 +14,6 @@ static void AnimSpinningDracoMeteor(struct Sprite *sprite); static void AnimSpinningDracoMeteorFinish(struct Sprite *sprite); static void AnimDracoMeteorRock_Step(struct Sprite *sprite); -EWRAM_DATA static u16 sUnusedOverheatData[7] = {0}; - static const union AnimCmd sAnim_OutrageOverheatFire_0[] = { ANIMCMD_FRAME(0, 4), @@ -601,7 +599,6 @@ static void UpdateDragonDanceScanlineEffect(struct Task *task) void AnimOverheatFlame(struct Sprite *sprite) { - int i; int yAmplitude = (gBattleAnimArgs[2] * 3) / 5; sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2); sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[4]; @@ -611,8 +608,6 @@ void AnimOverheatFlame(struct Sprite *sprite) sprite->y += sprite->data[2] * gBattleAnimArgs[0]; sprite->data[3] = gBattleAnimArgs[3]; sprite->callback = AnimOverheatFlame_Step; - for (i = 0; i < 7; i++) - sUnusedOverheatData[i] = sprite->data[i]; } static void AnimOverheatFlame_Step(struct Sprite *sprite) diff --git a/src/digit_obj_util.c b/src/digit_obj_util.c index f66dc80cb7..f9e3ed1c01 100644 --- a/src/digit_obj_util.c +++ b/src/digit_obj_util.c @@ -239,9 +239,9 @@ static void DrawNumObjsLeadingZeros(struct DigitPrinter *objWork, s32 num, bool3 static void DrawNumObjsMinusInFront(struct DigitPrinter *objWork, s32 num, bool32 sign) { u32 pow10 = objWork->pow10; - static int oamId; - static int curDigit; - static int firstDigit; + int oamId; + int curDigit; + int firstDigit; oamId = objWork->firstOamId; curDigit = 0; diff --git a/src/ereader_screen.c b/src/ereader_screen.c old mode 100755 new mode 100644 index 556acf8e3c..ef1f45d49a --- a/src/ereader_screen.c +++ b/src/ereader_screen.c @@ -40,9 +40,6 @@ struct EReaderData static void Task_EReader(u8); -// This belongs in COMMON somewhere between party_menu and ereader_screen, but it's unused so it's unclear where. -COMMON_DATA UNUSED u8 gUnknownSpace[64] = {0}; - COMMON_DATA struct EReaderData gEReaderData = {0}; extern const u8 gMultiBootProgram_EReader_Start[]; diff --git a/src/link.c b/src/link.c index ef928e8d62..501aacad2c 100644 --- a/src/link.c +++ b/src/link.c @@ -55,10 +55,7 @@ struct LinkTestBGInfo static struct BlockTransfer sBlockSend; static struct BlockTransfer sBlockRecv[MAX_LINK_PLAYERS]; static u32 sBlockSendDelayCounter; -static bool32 sDummy1; // Never read -static bool8 sDummy2; // Never assigned, read in unused function static u32 sPlayerDataExchangeStatus; -static bool32 sDummy3; // Never read static u8 sLinkTestLastBlockSendPos; static u8 sLinkTestLastBlockRecvPos[MAX_LINK_PLAYERS]; static u8 sNumVBlanksWithoutSerialIntr; @@ -73,15 +70,11 @@ COMMON_DATA u32 gLinkDebugSeed = 0; COMMON_DATA struct LinkPlayerBlock gLocalLinkPlayerBlock = {0}; COMMON_DATA bool8 gLinkErrorOccurred = 0; COMMON_DATA u32 gLinkDebugFlags = 0; -COMMON_DATA u32 gLinkFiller1 = 0; COMMON_DATA bool8 gRemoteLinkPlayersNotReceived[MAX_LINK_PLAYERS] = {0}; COMMON_DATA u8 gBlockReceivedStatus[MAX_LINK_PLAYERS] = {0}; -COMMON_DATA u32 gLinkFiller2 = 0; COMMON_DATA u16 gLinkHeldKeys = 0; COMMON_DATA u16 ALIGNED(4) gRecvCmds[MAX_RFU_PLAYERS][CMD_LENGTH] = {0}; COMMON_DATA u32 gLinkStatus = 0; -COMMON_DATA bool8 gLinkDummy1 = 0; // Never read -COMMON_DATA bool8 gLinkDummy2 = 0; // Never read COMMON_DATA bool8 gReadyToExitStandby[MAX_LINK_PLAYERS] = {0}; COMMON_DATA bool8 gReadyToCloseLink[MAX_LINK_PLAYERS] = {0}; COMMON_DATA u16 gReadyCloseLinkType = 0; // Never read @@ -96,9 +89,6 @@ COMMON_DATA void (*gLinkCallback)(void) = NULL; COMMON_DATA u8 gShouldAdvanceLinkState = 0; COMMON_DATA u16 gLinkTestBlockChecksums[MAX_LINK_PLAYERS] = {0}; COMMON_DATA u8 gBlockRequestType = 0; -COMMON_DATA u32 gLinkFiller3 = 0; -COMMON_DATA u32 gLinkFiller4 = 0; -COMMON_DATA u32 gLinkFiller5 = 0; COMMON_DATA u8 gLastSendQueueCount = 0; COMMON_DATA struct Link gLink = {0}; COMMON_DATA u8 gLastRecvQueueCount = 0; @@ -310,7 +300,6 @@ static void UNUSED LinkTestScreen(void) AnimateSprites(); BuildOamBuffer(); UpdatePaletteFade(); - sDummy3 = FALSE; InitLocalLinkPlayer(); CreateTask(Task_PrintTestData, 0); SetMainCallback2(CB2_LinkTest); @@ -378,9 +367,6 @@ void OpenLink(void) gSuppressLinkErrorMessage = FALSE; ResetBlockReceivedFlags(); ResetBlockSend(); - sDummy1 = FALSE; - gLinkDummy2 = FALSE; - gLinkDummy1 = FALSE; gReadyCloseLinkType = 0; CreateTask(Task_TriggerHandshake, 2); } @@ -552,10 +538,8 @@ static void ProcessRecvCmds(u8 unused) gLinkPartnersHeldKeys[i] = gRecvCmds[i][1]; break; case LINKCMD_DUMMY_1: - gLinkDummy2 = TRUE; break; case LINKCMD_DUMMY_2: - gLinkDummy2 = TRUE; break; case LINKCMD_INIT_BLOCK: { @@ -1376,11 +1360,6 @@ bool8 IsLinkMaster(void) return EXTRACT_MASTER(gLinkStatus); } -static u8 UNUSED GetDummy2(void) -{ - return sDummy2; -} - void SetCloseLinkCallbackAndType(u16 type) { if (gWirelessCommType == TRUE) @@ -1392,7 +1371,6 @@ void SetCloseLinkCallbackAndType(u16 type) if (gLinkCallback == NULL) { gLinkCallback = LinkCB_ReadyCloseLink; - gLinkDummy1 = FALSE; gReadyCloseLinkType = type; } } @@ -1413,7 +1391,6 @@ void SetCloseLinkCallback(void) else { gLinkCallback = LinkCB_ReadyCloseLink; - gLinkDummy1 = FALSE; gReadyCloseLinkType = 0; } } @@ -1449,7 +1426,6 @@ static void LinkCB_WaitCloseLink(void) gLinkVSyncDisabled = TRUE; CloseLink(); gLinkCallback = NULL; - gLinkDummy1 = TRUE; } } @@ -1469,7 +1445,6 @@ void SetCloseLinkCallbackHandleJP(void) else { gLinkCallback = LinkCB_ReadyCloseLinkWithJP; - gLinkDummy1 = FALSE; gReadyCloseLinkType = 0; } } @@ -1511,7 +1486,6 @@ static void LinkCB_WaitCloseLinkWithJP(void) gLinkVSyncDisabled = TRUE; CloseLink(); gLinkCallback = NULL; - gLinkDummy1 = TRUE; } } @@ -1525,8 +1499,6 @@ void SetLinkStandbyCallback(void) { if (gLinkCallback == NULL) gLinkCallback = LinkCB_Standby; - - gLinkDummy1 = FALSE; } } diff --git a/src/pokedex_area_screen.c b/src/pokedex_area_screen.c old mode 100755 new mode 100644 index a3bbafa926..dd45335afb --- a/src/pokedex_area_screen.c +++ b/src/pokedex_area_screen.c @@ -718,11 +718,11 @@ static void ResetPokedexAreaMapBg(void) static void CreateAreaMarkerSprites(void) { u8 spriteId; - static s16 x; - static s16 y; - static s16 i; - static s16 mapSecId; - static s16 numSprites; + s16 x; + s16 y; + s16 i; + s16 mapSecId; + s16 numSprites; LoadSpriteSheet(&sAreaMarkerSpriteSheet); LoadSpritePalette(&sAreaMarkerSpritePalette);