diff --git a/gflib/string_util.c b/gflib/string_util.c index 446fea482..ff1581fc1 100644 --- a/gflib/string_util.c +++ b/gflib/string_util.c @@ -4,11 +4,11 @@ #include "strings.h" #include "union_room_chat.h" -EWRAM_DATA u8 gStringVar1[32] = {}; -EWRAM_DATA u8 gStringVar2[20] = {}; -EWRAM_DATA u8 gStringVar3[20] = {}; +EWRAM_DATA u8 gStringVar1[256] = {}; +EWRAM_DATA u8 gStringVar2[256] = {}; +EWRAM_DATA u8 gStringVar3[256] = {}; EWRAM_DATA u8 gStringVar4[1000] = {}; -EWRAM_DATA u8 gUnknownStringVar[16] = {0}; +EWRAM_DATA static u8 gUnknownStringVar[16] = {0}; static const u8 sDigits[] = __("0123456789ABCDEF"); diff --git a/include/battle_main.h b/include/battle_main.h index 7ed3876b8..cb03605c9 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -43,7 +43,6 @@ struct MultiPartnerMenuPokemon #define BOUNCE_MON 0x0 #define BOUNCE_HEALTHBOX 0x1 -extern const struct SpriteTemplate gUnknownDebugSprite; extern const struct OamData gOamData_BattlerOpponent; extern const struct OamData gOamData_BattlerPlayer; extern const u8 gStatusConditionString_PoisonJpn[8]; diff --git a/include/battle_message.h b/include/battle_message.h index dd4207ed6..6409a99ee 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -234,7 +234,7 @@ extern struct BattleMsgData *gBattleMsgDataPtr; #define TEXT_BUFF_ARRAY_COUNT 16 -extern u8 gDisplayedStringBattle[490]; +extern u8 gDisplayedStringBattle[478]; extern u8 gBattleTextBuff1[TEXT_BUFF_ARRAY_COUNT]; extern u8 gBattleTextBuff2[TEXT_BUFF_ARRAY_COUNT]; extern u8 gBattleTextBuff3[TEXT_BUFF_ARRAY_COUNT + 13]; diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index b1cec2cc2..80984e80a 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -12,12 +12,6 @@ #include "constants/abilities.h" #include "constants/songs.h" -struct { - s16 startX; - s16 startY; - s16 targetX; - s16 targetY; -} static EWRAM_DATA sFrenzyPlantRootData = {0}; // Debug? Written to but never read. static void AnimMovePowderParticle(struct Sprite *); static void AnimMovePowderParticle_Step(struct Sprite *); @@ -2991,10 +2985,6 @@ static void AnimFrenzyPlantRoot(struct Sprite *sprite) StartSpriteAnim(sprite, gBattleAnimArgs[4]); sprite->data[2] = gBattleAnimArgs[5]; sprite->callback = AnimRootFlickerOut; - sFrenzyPlantRootData.startX = sprite->x; - sFrenzyPlantRootData.startY = sprite->y; - sFrenzyPlantRootData.targetX = targetX; - sFrenzyPlantRootData.targetY = targetY; } static void AnimRootFlickerOut(struct Sprite* sprite) diff --git a/src/battle_bg.c b/src/battle_bg.c index 04d78021f..5adc23217 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -26,11 +26,8 @@ struct BattleBackground const void *palette; }; -static void CB2_unused(void); static u8 GetBattleTerrainOverride(void); -static const u8 sUnused[] = {1, 2}; - static const struct OamData sVsLetter_V_OamData = { .y = 0, .affineMode = ST_OAM_AFFINE_DOUBLE, @@ -614,23 +611,6 @@ static const struct { {MAP_BATTLE_SCENE_LINK, BATTLE_TERRAIN_LINK} }; -// Unused -void CreateUnknownDebugSprite(void) -{ - u8 spriteId; - - ResetSpriteData(); - spriteId = CreateSprite(&gUnknownDebugSprite, 0, 0, 0); - gSprites[spriteId].invisible = TRUE; - SetMainCallback2(CB2_unused); -} - -static void CB2_unused(void) -{ - AnimateSprites(); - BuildOamBuffer(); -} - static u8 GetBattleTerrainByMapScene(u8 mapBattleScene) { int i; diff --git a/src/battle_main.c b/src/battle_main.c index 290211c18..01187d1dc 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -48,7 +48,6 @@ #include "constants/songs.h" #include "constants/trainers.h" -static void SpriteCB_UnusedDebugSprite(struct Sprite *sprite); static void HandleEndTurn_ContinueBattle(void); static void HandleEndTurn_BattleWon(void); static void HandleEndTurn_BattleLost(void); @@ -63,7 +62,6 @@ static void CB2_HandleStartBattle(void); static void TryCorrectShedinjaLanguage(struct Pokemon *mon); static void BattleMainCB1(void); static void CB2_QuitPokedudeBattle(void); -static void SpriteCB_UnusedDebugSprite_Step(struct Sprite *sprite); static void CB2_EndLinkBattle(void); static void EndLinkBattleInSteps(void); static void SpriteCB_MoveWildMonToRight(struct Sprite *sprite); @@ -103,7 +101,7 @@ EWRAM_DATA u16 gBattle_WIN0H = 0; EWRAM_DATA u16 gBattle_WIN0V = 0; EWRAM_DATA u16 gBattle_WIN1H = 0; EWRAM_DATA u16 gBattle_WIN1V = 0; -EWRAM_DATA u8 gDisplayedStringBattle[490] = {0}; // Increased in size to fit Brock's defeat text, which is 477 characters long (PewterCity_Gym_Text_BrockDefeat) +EWRAM_DATA u8 gDisplayedStringBattle[478] = {0}; // Increased in size to fit Brock's defeat text, which is 477 characters long (PewterCity_Gym_Text_BrockDefeat) EWRAM_DATA u8 gBattleTextBuff1[TEXT_BUFF_ARRAY_COUNT] = {0}; 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 @@ -112,7 +110,6 @@ EWRAM_DATA u8 gBattleTerrain = 0; EWRAM_DATA struct MultiPartnerMenuPokemon gMultiPartnerParty[MULTI_PARTY_SIZE] = {0}; EWRAM_DATA u8 *gBattleAnimBgTileBuffer = NULL; EWRAM_DATA u8 *gBattleAnimBgTilemapBuffer = NULL; -static EWRAM_DATA u16 *sUnknownDebugSpriteDataBuffer = NULL; EWRAM_DATA u32 gBattleControllerExecFlags = 0; EWRAM_DATA u8 gBattlersCount = 0; EWRAM_DATA u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT] = {0}; @@ -142,7 +139,6 @@ EWRAM_DATA u8 gAbsentBattlerFlags = 0; EWRAM_DATA u8 gCritMultiplier = 0; EWRAM_DATA u8 gMultiHitCounter = 0; EWRAM_DATA const u8 *gBattlescriptCurrInstr = NULL; -EWRAM_DATA u32 gUnusedBattleMainVar = 0; EWRAM_DATA u8 gChosenActionByBattler[MAX_BATTLERS_COUNT] = {0}; EWRAM_DATA const u8 *gSelectionBattleScripts[MAX_BATTLERS_COUNT] = {NULL}; EWRAM_DATA u16 gLastPrintedMoves[MAX_BATTLERS_COUNT] = {0}; @@ -220,17 +216,6 @@ static const struct ScanlineEffectParams sIntroScanlineParams16Bit = ®_BG3HOFS, SCANLINE_EFFECT_DMACNT_16BIT, 1 }; -const struct SpriteTemplate gUnknownDebugSprite = -{ - .tileTag = 0, - .paletteTag = 0, - .oam = &gDummyOamData, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = SpriteCB_UnusedDebugSprite, -}; - static const u8 sText_ShedinjaJpnName[] = _("ヌケニン"); // Nukenin const struct OamData gOamData_BattlerOpponent = @@ -1727,58 +1712,6 @@ static void CB2_QuitPokedudeBattle(void) } } -static void SpriteCB_UnusedDebugSprite(struct Sprite *sprite) -{ - sprite->data[0] = 0; - sprite->callback = SpriteCB_UnusedDebugSprite_Step; -} - -static void SpriteCB_UnusedDebugSprite_Step(struct Sprite *sprite) -{ - switch (sprite->data[0]) - { - case 0: - sUnknownDebugSpriteDataBuffer = AllocZeroed(0x1000); - ++sprite->data[0]; - sprite->data[1] = 0; - sprite->data[2] = 0x281; - sprite->data[3] = 0; - sprite->data[4] = 1; - // fall through - case 1: - if (--sprite->data[4] == 0) - { - s32 i, r2, r0; - - sprite->data[4] = 2; - r2 = sprite->data[1] + sprite->data[3] * 32; - r0 = sprite->data[2] - sprite->data[3] * 32; - for (i = 0; i <= 29; i += 2) - { - *(&sUnknownDebugSpriteDataBuffer[r2] + i) = 0x3D; - *(&sUnknownDebugSpriteDataBuffer[r0] + i) = 0x3D; - } - if (++sprite->data[3] == 21) - { - ++sprite->data[0]; - sprite->data[1] = 32; - } - } - break; - case 2: - if (--sprite->data[1] == 20) - { - if (sUnknownDebugSpriteDataBuffer != NULL) - { - memset(sUnknownDebugSpriteDataBuffer, 0, 0x1000); - FREE_AND_SET_NULL(sUnknownDebugSpriteDataBuffer); - } - SetMainCallback2(CB2_InitBattle); - } - break; - } -} - static u32 Crc32B (const u8 *data, u32 size) { s32 i, j;