From 0571b88bd2f50bddff0963a01f318978d7f3946f Mon Sep 17 00:00:00 2001 From: cawtds <> Date: Thu, 13 Jun 2024 23:59:41 +0200 Subject: [PATCH] more cleanup --- src/battle_anim.c | 22 ++------- src/battle_anim_mons.c | 96 --------------------------------------- src/battle_anim_special.c | 11 ++--- src/battle_interface.c | 90 +----------------------------------- src/battle_setup.c | 25 ---------- 5 files changed, 10 insertions(+), 234 deletions(-) diff --git a/src/battle_anim.c b/src/battle_anim.c index 65e35749c..2e4f8e696 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -40,7 +40,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 static u16 sAnimMoveIndex = 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}; @@ -188,7 +188,7 @@ void ClearBattleAnimationVars(void) sMonAnimTaskIdArray[1] = TASK_NONE; gAnimMoveTurn = 0; sAnimBackgroundFadeState = 0; - sAnimMoveIndex = 0; + gAnimMoveIndex = 0; gBattleAnimAttacker = 0; gBattleAnimTarget = 0; gAnimCustomPanning = 0; @@ -234,9 +234,9 @@ void LaunchBattleAnimation(u32 animType, u16 animId) } if (!isMoveAnim) - sAnimMoveIndex = 0; + gAnimMoveIndex = 0; else - sAnimMoveIndex = animId; + gAnimMoveIndex = animId; for (i = 0; i < ANIM_ARGS_COUNT; i++) gBattleAnimArgs[i] = 0; @@ -670,7 +670,6 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2) { struct BattleAnimBgData animBg; u8 battlerSpriteId; - struct Sprite *sprite; if (!toBG_2) { @@ -935,7 +934,6 @@ static void Cmd_clearmonbg_static(void) static void Task_ClearMonBgStatic(u8 taskId) { - bool8 to_BG2; u8 position; u8 battlerId; @@ -1056,15 +1054,6 @@ bool8 IsContest(void) return FALSE; } -// Unused -static bool8 IsSpeciesNotUnown(u16 species) -{ - if (species == SPECIES_UNOWN) - return FALSE; - else - return TRUE; -} - #define tBackgroundId data[0] #define tState data[10] @@ -1083,13 +1072,12 @@ static void Cmd_fadetobg(void) static void Cmd_fadetobgfromset(void) { - u8 bg1, bg2, bg3; + u8 bg1, bg2; u8 taskId; sBattleAnimScriptPtr++; bg1 = sBattleAnimScriptPtr[0]; bg2 = sBattleAnimScriptPtr[1]; - bg3 = sBattleAnimScriptPtr[2]; sBattleAnimScriptPtr += 3; taskId = CreateTask(Task_FadeToBg, 5); diff --git a/src/battle_anim_mons.c b/src/battle_anim_mons.c index c39596d50..b69093992 100644 --- a/src/battle_anim_mons.c +++ b/src/battle_anim_mons.c @@ -27,7 +27,6 @@ static void AnimBattlerTrace(struct Sprite *sprite); static void AnimWeatherBallUp_Step(struct Sprite *sprite); static EWRAM_DATA union AffineAnimCmd *sAnimTaskAffineAnim = NULL; -static EWRAM_DATA u32 sUnused = 0; static const struct UCoords8 sBattlerCoords[][MAX_BATTLERS_COUNT] = { @@ -366,12 +365,6 @@ static void SetCallbackToStoredInData6(struct Sprite *sprite) #define sAmplitudeX sAmplitude #define sAmplitudeY data[4] -// TranslateSpriteInLissajousCurve -#define sCirclePosX sCirclePos -#define sCircleSpeedX sCircleSpeed -#define sCirclePosY data[4] -#define sCircleSpeedY data[5] - // x = a * sin(theta0 + dtheta * t) // y = a * cos(theta0 + dtheta * t) void TranslateSpriteInCircle(struct Sprite *sprite) @@ -415,37 +408,6 @@ void TranslateSpriteInGrowingCircle(struct Sprite *sprite) } } -// Unused -// Exact shape depends on arguments. Can move in a figure-8-like pattern, or circular, etc. -// x = alpl * sin(alpha0 + dalpha * t) -// y = ampl * cos(beta0 + dbeta * t) -static void TranslateSpriteInLissajousCurve(struct Sprite *sprite) -{ - if (sprite->sDuration) - { - sprite->x2 = Sin(sprite->sCirclePosX, sprite->sAmplitude); - sprite->y2 = Cos(sprite->sCirclePosY, sprite->sAmplitude); - sprite->sCirclePosX += sprite->sCircleSpeedX; - sprite->sCirclePosY += sprite->sCircleSpeedY; - - if (sprite->sCirclePosX >= 0x100) - sprite->sCirclePosX -= 0x100; - else if (sprite->sCirclePosX < 0) - sprite->sCirclePosX += 0x100; - - if (sprite->sCirclePosY >= 0x100) - sprite->sCirclePosY -= 0x100; - else if (sprite->sCirclePosY < 0) - sprite->sCirclePosY += 0x100; - - sprite->sDuration--; - } - else - { - SetCallbackToStoredInData6(sprite); - } -} - // x = a * sin(theta0 + dtheta * t) // y = b * cos(theta0 + dtheta * t) void TranslateSpriteInEllipse(struct Sprite *sprite) @@ -475,10 +437,6 @@ void TranslateSpriteInEllipse(struct Sprite *sprite) #undef sAmplitudeChange #undef sAmplitudeX #undef sAmplitudeY -#undef sCirclePosX -#undef sCircleSpeedX -#undef sCirclePosY -#undef sCircleSpeedY // Simply waits until the sprite's data[0] hits zero. // This is used to let sprite anims or affine anims to run for a designated @@ -503,13 +461,6 @@ void WaitAnimForDuration(struct Sprite *sprite) #define sSpeedX data[1] #define sSpeedY data[2] -static void AnimPosToTranslateLinear(struct Sprite *sprite) -{ - ConvertPosDataToTranslateLinearData(sprite); - sprite->callback = TranslateSpriteLinear; - sprite->callback(sprite); -} - void ConvertPosDataToTranslateLinearData(struct Sprite *sprite) { s16 old; @@ -572,16 +523,6 @@ static void TranslateSpriteLinearFixedPointIconFrame(struct Sprite *sprite) UpdateMonIconFrame(sprite); } -// Unused -static void TranslateSpriteToBattleTargetPos(struct Sprite *sprite) -{ - sprite->data[1] = sprite->x + sprite->x2; - sprite->data[3] = sprite->y + sprite->y2; - sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2); - sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET); - sprite->callback = AnimPosToTranslateLinear; -} - // Same as TranslateSpriteLinear but takes an id to specify which sprite to move void TranslateSpriteLinearById(struct Sprite *sprite) { @@ -640,29 +581,12 @@ void DestroySpriteAndMatrix(struct Sprite *sprite) DestroyAnimSprite(sprite); } -// Unused -static void SetupAndStartSpriteLinearTranslationToAttacker(struct Sprite *sprite) -{ - sprite->sStartX = sprite->x + sprite->x2; - sprite->sStartY = sprite->y + sprite->y2; - sprite->sTargetX = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2); - sprite->sTargetY = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET); - sprite->callback = AnimPosToTranslateLinear; -} - #undef sStepsX #undef sStartX #undef sTargetX #undef sStartY #undef sTargetY -// Unused -static void EndUnkPaletteAnim(struct Sprite *sprite) -{ - PaletteStruct_ResetById(sprite->data[5]); - DestroySpriteAndMatrix(sprite); -} - void RunStoredCallbackWhenAffineAnimEnds(struct Sprite *sprite) { if (sprite->affineAnimEnded) @@ -1357,12 +1281,6 @@ u8 GetSpritePalIdxByBattler(u8 battler) return battler; } -// Unused -static u8 GetSpritePalIdxByPosition(u8 position) -{ - return GetBattlerAtPosition(position); -} - void AnimSpriteOnMonPos(struct Sprite *sprite) { bool8 var; @@ -1835,19 +1753,6 @@ void AnimTask_GetFrustrationPowerLevel(u8 taskId) DestroyAnimVisualTask(taskId); } -// Unused -static void SetPriorityForVisibleBattlers(u8 priority) -{ - if (IsBattlerSpriteVisible(gBattleAnimTarget)) - gSprites[gBattlerSpriteIds[gBattleAnimTarget]].oam.priority = priority; - if (IsBattlerSpriteVisible(gBattleAnimAttacker)) - gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].oam.priority = priority; - if (IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimTarget))) - gSprites[gBattlerSpriteIds[BATTLE_PARTNER(gBattleAnimTarget)]].oam.priority = priority; - if (IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimAttacker))) - gSprites[gBattlerSpriteIds[BATTLE_PARTNER(gBattleAnimAttacker)]].oam.priority = priority; -} - void InitPrioritiesForVisibleBattlers(void) { s32 i; @@ -1938,7 +1843,6 @@ s16 GetBattlerSpriteCoordAttr(u8 battlerId, u8 attr) u16 letter; u16 unownSpecies; s32 ret; - const struct MonCoords *coords; u8 coordsSize, yOffset; struct BattleSpriteInfo *spriteInfo; diff --git a/src/battle_anim_special.c b/src/battle_anim_special.c index ea12e0e80..1ea912044 100644 --- a/src/battle_anim_special.c +++ b/src/battle_anim_special.c @@ -2102,7 +2102,7 @@ static void PremierBallOpenParticleAnimation_Step1(struct Sprite *sprite) static void DestroyBallOpenAnimationParticle(struct Sprite *sprite) { - int i, j; + int i; if (!gMain.inBattle) { @@ -2116,10 +2116,10 @@ static void DestroyBallOpenAnimationParticle(struct Sprite *sprite) gBattleSpritesDataPtr->animationData->numBallParticles--; if (gBattleSpritesDataPtr->animationData->numBallParticles == 0) { - for (j = 0; j < POKEBALL_COUNT; j++) + for (i = 0; i < POKEBALL_COUNT; i++) { - FreeSpriteTilesByTag(gBallParticleSpritesheets[j].tag); - FreeSpritePaletteByTag(gBallParticlePalettes[j].tag); + FreeSpriteTilesByTag(gBallParticleSpritesheets[i].tag); + FreeSpritePaletteByTag(gBallParticlePalettes[i].tag); } DestroySprite(sprite); @@ -2463,11 +2463,8 @@ static void SpriteCB_ShinySparkles_2(struct Sprite *sprite) void AnimTask_LoadBaitGfx(u8 taskId) { - u8 paletteIndex; - LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[ANIM_TAG_SAFARI_BAIT - ANIM_SPRITES_START]); LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[ANIM_TAG_SAFARI_BAIT - ANIM_SPRITES_START]); - paletteIndex = IndexOfSpritePaletteTag(ANIM_TAG_SAFARI_BAIT); DestroyAnimVisualTask(taskId); } diff --git a/src/battle_interface.c b/src/battle_interface.c index 783569ead..261bf4432 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -548,88 +548,6 @@ static const struct SpriteTemplate sSpriteTemplate_BurstTrigger = .callback = SpriteCb_BurstTrigger }; - - -static void Debug_DrawNumber(s16 number, u16 *dest, bool8 singleRow) -{ - s8 i, j; - u8 buff[4]; - - for (i = 0; i < 4; i++) - buff[i] = 0; - - for (i = 3; ; i--) - { - if (number > 0) - { - buff[i] = number % 10; - number /= 10; - } - else - { - while (i > -1) - { - buff[i] = 0xFF; - i--; - } - - if (buff[3] == 0xFF) - buff[3] = 0; - break; - } - } - - if (!singleRow) - { - for (i = 0, j = 0; i < 4; i++) - { - if (buff[j] == 0xFF) - { - dest[j + 0x00] &= 0xFC00; - dest[j + 0x00] |= 30; - dest[i + 0x20] &= 0xFC00; - dest[i + 0x20] |= 30; - } - else - { - dest[j + 0x00] &= 0xFC00; - dest[j + 0x00] |= 20 + buff[j]; - dest[i + 0x20] &= 0xFC00; - dest[i + 0x20] |= 20 + buff[i] + 1 * TILE_SIZE_4BPP; - } - j++; - } - } - else - { - for (i = 0; i < 4; i++) - { - if (buff[i] == 0xFF) - { - dest[i + 0x00] &= 0xFC00; - dest[i + 0x00] |= 30; - dest[i + 0x20] &= 0xFC00; - dest[i + 0x20] |= 30; - } - else - { - dest[i + 0x00] &= 0xFC00; - dest[i + 0x00] |= 20 + buff[i]; - dest[i + 0x20] &= 0xFC00; - dest[i + 0x20] |= 20 + buff[i] + 1 * TILE_SIZE_4BPP; - } - } - } -} - -// Unused -static void Debug_DrawNumberPair(s16 num1, s16 num2, u16 *dest) -{ - dest[4] = 30; - Debug_DrawNumber(num2, &dest[0], FALSE); - Debug_DrawNumber(num1, &dest[5], TRUE); -} - // Because the healthbox is too large to fit into one sprite, it is divided // into two sprites. The left sprite is used as the 'main' healthbox sprite, // while the right sprite is the 'other' healthbox sprite. @@ -1004,11 +922,7 @@ static const u8 sText_Slash[] = _("/"); static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, u32 maxOrCurrent, s16 currHp, s16 maxHp) { - u32 windowId, spriteTileNum; - u8 *windowTileData; - u8 battlerId; - u8 text[20] = __("{COLOR 01}{HIGHLIGHT 00}"); battlerId = gSprites[healthboxSpriteId].sBattlerId; @@ -1723,7 +1637,6 @@ static void Task_HidePartyStatusSummary_BattleStart_2(u8 taskId) u8 ballIconSpriteIds[PARTY_SIZE]; s32 i; - u8 battlerId = gTasks[taskId].tBattler; if (--gTasks[taskId].tBlendWeight == -1) { u8 summaryBarSpriteId = gTasks[taskId].tSummaryBarSpriteId; @@ -1749,7 +1662,6 @@ static void Task_HidePartyStatusSummary_DuringBattle(u8 taskId) { u8 ballIconSpriteIds[PARTY_SIZE]; s32 i; - u8 battlerId = gTasks[taskId].tBattler; if (--gTasks[taskId].tBlendWeight >= 0) SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].tBlendWeight, 16 - gTasks[taskId].tBlendWeight)); @@ -2259,7 +2171,7 @@ s32 MoveBattleBar(u8 battlerId, u8 healthboxSpriteId, u8 whichBar, u8 unused) gBattleSpritesDataPtr->battleBars[battlerId].receivedValue, &gBattleSpritesDataPtr->battleBars[battlerId].currValue, B_HEALTHBAR_NUM_TILES, - 1); + hpFraction); } else // exp bar { diff --git a/src/battle_setup.c b/src/battle_setup.c index ab67a2699..1ff640408 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -408,25 +408,6 @@ void StartRegiBattle(void) IncrementGameStat(GAME_STAT_WILD_BATTLES); } -// Unused -static void EndPokedudeBattle(void) -{ - LoadPlayerParty(); - CB2_EndWildBattle(); -} - -// Unused -static void StartPokedudeBattle(void) -{ - LockPlayerFieldControls(); - FreezeObjectEvents(); - StopPlayerAvatar(); - gMain.savedCallback = EndPokedudeBattle; - SavePlayerParty(); - InitPokedudePartyAndOpponent(); - CreateBattleStartTask(GetWildBattleTransition(), 0); -} - static void CB2_EndWildBattle(void) { CpuFill16(0, (void *)BG_PLTT, BG_PLTT_SIZE); @@ -849,12 +830,6 @@ void SetBattledTrainerFlag(void) FlagSet(GetTrainerAFlag()); } -// not used -static void SetBattledTrainerFlag2(void) -{ - FlagSet(GetTrainerAFlag()); -} - bool8 HasTrainerBeenFought(u16 trainerId) { return FlagGet(TRAINER_FLAGS_START + trainerId);