diff --git a/include/battle.h b/include/battle.h index 6d3516d928..c32c03fc55 100644 --- a/include/battle.h +++ b/include/battle.h @@ -1010,7 +1010,6 @@ extern u8 gBattleTextBuff2[TEXT_BUFF_ARRAY_COUNT]; extern u8 gBattleTextBuff3[TEXT_BUFF_ARRAY_COUNT + 13]; //to handle stupidly large z move names extern u32 gBattleTypeFlags; extern u8 gBattleTerrain; -extern u32 gUnusedFirstBattleVar1; extern u8 *gBattleAnimBgTileBuffer; extern u8 *gBattleAnimBgTilemapBuffer; extern u32 gBattleControllerExecFlags; @@ -1057,7 +1056,6 @@ extern u16 gChosenMoveByBattler[MAX_BATTLERS_COUNT]; extern u16 gMoveResultFlags; extern u32 gHitMarker; extern u8 gBideTarget[MAX_BATTLERS_COUNT]; -extern u8 gUnusedFirstBattleVar2; extern u32 gSideStatuses[NUM_BATTLE_SIDES]; extern struct SideTimer gSideTimers[NUM_BATTLE_SIDES]; extern u32 gStatuses3[MAX_BATTLERS_COUNT]; @@ -1089,8 +1087,6 @@ extern bool8 gTransformedShininess[MAX_BATTLERS_COUNT]; extern u8 gPlayerDpadHoldFrames; extern struct BattleSpriteData *gBattleSpritesDataPtr; extern struct MonSpritesGfx *gMonSpritesGfxPtr; -extern struct BattleHealthboxInfo *gBattleControllerOpponentHealthboxData; -extern struct BattleHealthboxInfo *gBattleControllerOpponentFlankHealthboxData; extern u16 gBattleMovePower; extern u16 gMoveToLearn; extern u32 gFieldStatuses; diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c index 491ca77a96..a8de8eddd9 100644 --- a/src/battle_anim_utility_funcs.c +++ b/src/battle_anim_utility_funcs.c @@ -40,11 +40,6 @@ static void AnimTask_WaitAndRestoreVisibility(u8); static const u16 sCurseLinesPalette[] = { RGB_WHITE }; -// These belong in battle_intro.c, but putting them there causes 2 bytes of alignment padding -// between the two .rodata segments. Perhaps battle_intro.c actually belongs in this file, too. -const u8 gBattleAnimBgCntSet[] = {REG_OFFSET_BG0CNT, REG_OFFSET_BG1CNT, REG_OFFSET_BG2CNT, REG_OFFSET_BG3CNT}; -const u8 gBattleAnimBgCntGet[] = {REG_OFFSET_BG0CNT, REG_OFFSET_BG1CNT, REG_OFFSET_BG2CNT, REG_OFFSET_BG3CNT}; - void AnimTask_BlendBattleAnimPal(u8 taskId) { u32 selectedPalettes = UnpackSelectedBattlePalettes(gBattleAnimArgs[0]); diff --git a/src/battle_bg.c b/src/battle_bg.c index 8f647f8d59..0f802d52de 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -29,7 +29,6 @@ #include "constants/battle_partner.h" // .rodata -static const u16 sUnrefArray[] = {0x0300, 0x0000}; //OamData? static const struct OamData sVsLetter_V_OamData = { diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 395ad81ad9..97b0a061bb 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -170,9 +170,6 @@ static void Intro_WaitForShinyAnimAndHealthbox(u32 battler) twoMons = TRUE; } - gBattleControllerOpponentHealthboxData = &gBattleSpritesDataPtr->healthBoxesData[battler]; - gBattleControllerOpponentFlankHealthboxData = &gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)]; - if (healthboxAnimDone) { if (twoMons == TRUE) diff --git a/src/battle_controllers.c b/src/battle_controllers.c index a7d9610dac..b2ae3039df 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -83,10 +83,6 @@ void SetUpBattleVarsAndBirchZigzagoon(void) i = 0; SetMonData(&gEnemyParty[0], MON_DATA_HELD_ITEM, &i); } - - // Below are never read - gUnusedFirstBattleVar1 = 0; - gUnusedFirstBattleVar2 = 0; } void InitBattleControllers(void) diff --git a/src/battle_dome.c b/src/battle_dome.c index 539bf12a32..0978ae4888 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -198,17 +198,6 @@ static const u8 sBattleStyleThresholds[NUM_BATTLE_STYLES - 1][NUM_MOVE_POINT_TYP [DOME_BATTLE_STYLE_UNUSED3] = {0}, //[DOME_BATTLE_STYLE_UNUSED4] = {0}, // Excluded here, presumably was meant to be a style just for Dome Ace Tucker }; -static const u8 sUnusedArray[] = -{ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 3, 0, 0, 0, - 0, 0, 3, 0, 0, 0, 0, 0, 3, 2, 0, 0, 0, 0, 0, 2, - 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, - 0, 2, 253, 0, 0, 0, 0, 0, 253, 0, 0, 0, 0, 0, 253, 0, - 0, 0, 0, 0, 253, 0, 0, 0, 0, 0, 253, 254, 0, 0, 0, 0, - 0, 254, 0, 0, 0, 0, 0, 254, 0, 0, 0, 0, 0, 254, 0, 0, - 0, 0, 0, 254, 0, 0, 0, 0, 0, -}; // 1st array is for cursor position (sprite id): cursor can be on a trainer info button, a match info button, or the exit/cancel button // 2nd array is for round count. For some reason this array contains an inaccessible Round 5 which is identical to Round 4 diff --git a/src/battle_intro.c b/src/battle_intro.c index 5bb6ce9648..858a32b13b 100644 --- a/src/battle_intro.c +++ b/src/battle_intro.c @@ -12,15 +12,14 @@ #include "constants/battle_partner.h" #include "constants/trainers.h" -extern const u8 gBattleAnimBgCntSet[]; -extern const u8 gBattleAnimBgCntGet[]; - static void BattleIntroSlide1(u8); static void BattleIntroSlide2(u8); static void BattleIntroSlide3(u8); static void BattleIntroSlideLink(u8); static void BattleIntroSlidePartner(u8); +static const u8 sBattleAnimBgCnts[] = {REG_OFFSET_BG0CNT, REG_OFFSET_BG1CNT, REG_OFFSET_BG2CNT, REG_OFFSET_BG3CNT}; + static const TaskFunc sBattleIntroSlideFuncs[] = { [BATTLE_TERRAIN_GRASS] = BattleIntroSlide1, @@ -39,7 +38,7 @@ void SetAnimBgAttribute(u8 bgId, u8 attributeId, u8 value) { if (bgId < 4) { - u32 bgCnt = GetGpuReg(gBattleAnimBgCntSet[bgId]); + u32 bgCnt = GetGpuReg(sBattleAnimBgCnts[bgId]); switch (attributeId) { case BG_ANIM_SCREEN_SIZE: @@ -65,7 +64,7 @@ void SetAnimBgAttribute(u8 bgId, u8 attributeId, u8 value) break; } - SetGpuReg(gBattleAnimBgCntSet[bgId], bgCnt); + SetGpuReg(sBattleAnimBgCnts[bgId], bgCnt); } } @@ -75,7 +74,7 @@ int GetAnimBgAttribute(u8 bgId, u8 attributeId) if (bgId < 4) { - bgCnt = GetGpuReg(gBattleAnimBgCntGet[bgId]); + bgCnt = GetGpuReg(sBattleAnimBgCnts[bgId]); switch (attributeId) { case BG_ANIM_SCREEN_SIZE: diff --git a/src/battle_main.c b/src/battle_main.c index b4430100d2..c592eb6688 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -137,7 +137,6 @@ EWRAM_DATA u8 gBattleTextBuff2[TEXT_BUFF_ARRAY_COUNT] = {0}; EWRAM_DATA u8 gBattleTextBuff3[TEXT_BUFF_ARRAY_COUNT + 13] = {0}; // expanded for stupidly long z move names EWRAM_DATA u32 gBattleTypeFlags = 0; EWRAM_DATA u8 gBattleTerrain = 0; -EWRAM_DATA u32 gUnusedFirstBattleVar1 = 0; // Never read EWRAM_DATA struct MultiPartnerMenuPokemon gMultiPartnerParty[MULTI_PARTY_SIZE] = {0}; EWRAM_DATA static struct MultiPartnerMenuPokemon* sMultiPartnerPartyBuffer = NULL; EWRAM_DATA u8 *gBattleAnimBgTileBuffer = NULL; @@ -186,7 +185,6 @@ EWRAM_DATA u16 gChosenMoveByBattler[MAX_BATTLERS_COUNT] = {0}; EWRAM_DATA u16 gMoveResultFlags = 0; EWRAM_DATA u32 gHitMarker = 0; EWRAM_DATA u8 gBideTarget[MAX_BATTLERS_COUNT] = {0}; -EWRAM_DATA u8 gUnusedFirstBattleVar2 = 0; // Never read EWRAM_DATA u32 gSideStatuses[NUM_BATTLE_SIDES] = {0}; EWRAM_DATA struct SideTimer gSideTimers[NUM_BATTLE_SIDES] = {0}; EWRAM_DATA u32 gStatuses3[MAX_BATTLERS_COUNT] = {0}; @@ -218,8 +216,6 @@ EWRAM_DATA bool8 gTransformedShininess[MAX_BATTLERS_COUNT] = {0}; EWRAM_DATA u8 gPlayerDpadHoldFrames = 0; EWRAM_DATA struct BattleSpriteData *gBattleSpritesDataPtr = NULL; EWRAM_DATA struct MonSpritesGfx *gMonSpritesGfxPtr = NULL; -EWRAM_DATA struct BattleHealthboxInfo *gBattleControllerOpponentHealthboxData = NULL; // Never read -EWRAM_DATA struct BattleHealthboxInfo *gBattleControllerOpponentFlankHealthboxData = NULL; // Never read EWRAM_DATA u16 gBattleMovePower = 0; EWRAM_DATA u16 gMoveToLearn = 0; EWRAM_DATA u32 gFieldStatuses = 0; diff --git a/src/battle_transition_frontier.c b/src/battle_transition_frontier.c index 417bd96d63..3e40129fa5 100644 --- a/src/battle_transition_frontier.c +++ b/src/battle_transition_frontier.c @@ -50,9 +50,6 @@ static const u32 sLogoCenter_Tilemap[] = INCBIN_U32("graphics/battle_transitions static const u32 sLogoCircles_Gfx[] = INCBIN_U32("graphics/battle_transitions/frontier_logo_circles.4bpp.lz"); static const u16 sLogo_Pal[] = INCBIN_U16("graphics/battle_transitions/frontier_logo_circles.gbapal"); -// Unused Empty data. -static const u8 sFiller[0x1C0] = {0}; - static const struct OamData sOamData_LogoCircles = { .y = 0, diff --git a/src/data/battle_anim.h b/src/data/battle_anim.h index 239e655918..77b61584ca 100644 --- a/src/data/battle_anim.h +++ b/src/data/battle_anim.h @@ -12,7 +12,6 @@ const struct OamData gOamData_AffineOff_ObjNormal_8x8 = .paletteNum = 0, }; - const struct OamData gOamData_AffineOff_ObjNormal_16x16 = { .y = 0,