Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-04-26 02:14:22 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Cleans up unused String IDs and EWRAM variables (#9363)

Browse Source
This commit is contained in:
Bassoonian 2026-02-27 13:21:31 +01:00 committed by GitHub
parent 3c805a030b
commit 080274645c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 2 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/constants/battle_string_ids.h
View File

@ -104,12 +104,10 @@ enum StringID
STRINGID_PKMNSAPPEDBYLEECHSEED,
STRINGID_PKMNFASTASLEEP,
STRINGID_PKMNWOKEUP,
STRINGID_PKMNUPROARKEPTAWAKE,
STRINGID_PKMNWOKEUPINUPROAR,
STRINGID_PKMNCAUSEDUPROAR,
STRINGID_PKMNMAKINGUPROAR,
STRINGID_PKMNCALMEDDOWN,
STRINGID_PKMNCANTSLEEPINUPROAR,
STRINGID_PKMNSTOCKPILED,
STRINGID_PKMNCANTSLEEPINUPROAR2,
STRINGID_UPROARKEPTPKMNAWAKE,
@ -201,9 +199,7 @@ enum StringID
STRINGID_PKMNHURTSWITH,
STRINGID_PKMNTRACED,
STRINGID_STATSHARPLY,
STRINGID_STATROSE,
STRINGID_STATHARSHLY,
STRINGID_STATFELL,
STRINGID_ATTACKERSSTATROSE,
STRINGID_DEFENDERSSTATROSE,
STRINGID_ATTACKERSSTATFELL,
@ -250,7 +246,6 @@ enum StringID
STRINGID_TRAINERBLOCKEDBALL,
STRINGID_DONTBEATHIEF,
STRINGID_ITDODGEDBALL,
STRINGID_YOUMISSEDPKMN,
STRINGID_PKMNBROKEFREE,
STRINGID_ITAPPEAREDCAUGHT,
STRINGID_AARGHALMOSTHADIT,
@ -258,7 +253,6 @@ enum StringID
STRINGID_GOTCHAPKMNCAUGHTPLAYER,
STRINGID_GOTCHAPKMNCAUGHTWALLY,
STRINGID_GIVENICKNAMECAPTURED,
STRINGID_PKMNSENTTOPC,
STRINGID_PKMNDATAADDEDTODEX,
STRINGID_ITISRAINING,
STRINGID_SANDSTORMISRAGING,
@ -364,13 +358,8 @@ enum StringID
STRINGID_ENDUREDSTURDY,
STRINGID_POWERHERB,
STRINGID_HURTBYITEM,
STRINGID_PSNBYITEM,
STRINGID_BRNBYITEM,
STRINGID_DEFABILITYIN,
STRINGID_GRAVITYINTENSIFIED,
STRINGID_TARGETIDENTIFIED,
STRINGID_TARGETWOKEUP,
STRINGID_PKMNSTOLEANDATEITEM,
STRINGID_TAILWINDBLEW,
STRINGID_PKMNWENTBACK,
STRINGID_PKMNCANTUSEITEMSANYMORE,
@ -379,8 +368,6 @@ enum StringID
STRINGID_PKMNSWITCHEDATKANDDEF,
STRINGID_PKMNSABILITYSUPPRESSED,
STRINGID_SHIELDEDFROMCRITICALHITS,
STRINGID_SWITCHEDATKANDSPATK,
STRINGID_SWITCHEDDEFANDSPDEF,
STRINGID_PKMNACQUIREDABILITY,
STRINGID_POISONSPIKESSCATTERED,
STRINGID_PKMNSWITCHEDSTATCHANGES,
@ -388,7 +375,6 @@ enum StringID
STRINGID_PKMNLEVITATEDONELECTROMAGNETISM,
STRINGID_PKMNTWISTEDDIMENSIONS,
STRINGID_POINTEDSTONESFLOAT,
STRINGID_CLOAKEDINMYSTICALMOONLIGHT,
STRINGID_TRAPPEDBYSWIRLINGMAGMA,
STRINGID_VANISHEDINSTANTLY,
STRINGID_PROTECTEDTEAM,
@ -400,16 +386,10 @@ enum StringID
STRINGID_HELDITEMSLOSEEFFECTS,
STRINGID_FELLSTRAIGHTDOWN,
STRINGID_TARGETCHANGEDTYPE,
STRINGID_PKMNACQUIREDSIMPLE,
STRINGID_KINDOFFER,
STRINGID_RESETSTARGETSSTATLEVELS,
STRINGID_ALLYSWITCHPOSITION,
STRINGID_RESTORETARGETSHEALTH,
STRINGID_TOOKPJMNINTOTHESKY,
STRINGID_FREEDFROMSKYDROP,
STRINGID_POSTPONETARGETMOVE,
STRINGID_REFLECTTARGETSTYPE,
STRINGID_TRANSFERHELDITEM,
STRINGID_EMBARGOENDS,
STRINGID_ELECTROMAGNETISM,
STRINGID_BUFFERENDS,
@ -446,7 +426,6 @@ enum StringID
STRINGID_FRISKACTIVATES,
STRINGID_UNNERVEENTERS,
STRINGID_HARVESTBERRY,
STRINGID_MAGICBOUNCEACTIVATES,
STRINGID_PROTEANTYPECHANGE,
STRINGID_SYMBIOSISITEMPASS,
STRINGID_STEALTHROCKDMG,
@ -501,7 +480,6 @@ enum StringID
STRINGID_PSYCHICTERRAINPREVENTS,
STRINGID_SAFETYGOGGLESPROTECTED,
STRINGID_FLOWERVEILPROTECTED,
STRINGID_SWEETVEILPROTECTED,
STRINGID_AROMAVEILPROTECTED,
STRINGID_CELEBRATEMESSAGE,
STRINGID_USEDINSTRUCTEDMOVE,

22
src/battle_message.c
View File

@ -281,12 +281,10 @@ const u8 *const gBattleStringsTable[STRINGID_COUNT] =
[STRINGID_PKMNSAPPEDBYLEECHSEED] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX}'s health is sapped by Leech Seed!"),
[STRINGID_PKMNFASTASLEEP] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} is fast asleep."),
[STRINGID_PKMNWOKEUP] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} woke up!"),
[STRINGID_PKMNUPROARKEPTAWAKE] = COMPOUND_STRING("But the uproar kept {B_SCR_NAME_WITH_PREFIX2} awake!"),
[STRINGID_PKMNWOKEUPINUPROAR] = COMPOUND_STRING("The uproar woke {B_EFF_NAME_WITH_PREFIX2}!"),
[STRINGID_PKMNCAUSEDUPROAR] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} caused an uproar!"),
[STRINGID_PKMNMAKINGUPROAR] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} is making an uproar!"),
[STRINGID_PKMNCALMEDDOWN] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} calmed down."),
[STRINGID_PKMNCANTSLEEPINUPROAR] = COMPOUND_STRING("But {B_DEF_NAME_WITH_PREFIX2} can't sleep in an uproar!"),
[STRINGID_PKMNSTOCKPILED] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} stockpiled {B_BUFF1}!"),
[STRINGID_PKMNCANTSLEEPINUPROAR2] = COMPOUND_STRING("But {B_DEF_NAME_WITH_PREFIX2} can't sleep in an uproar!"),
[STRINGID_UPROARKEPTPKMNAWAKE] = COMPOUND_STRING("But the uproar kept {B_DEF_NAME_WITH_PREFIX2} awake!"),
@ -378,9 +376,7 @@ const u8 *const gBattleStringsTable[STRINGID_COUNT] =
[STRINGID_PKMNHURTSWITH] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} was hurt by {B_DEF_NAME_WITH_PREFIX2}'s {B_BUFF1}!"),
[STRINGID_PKMNTRACED] = COMPOUND_STRING("It traced {B_BUFF1}'s {B_BUFF2}!"),
[STRINGID_STATSHARPLY] = gText_StatSharply,
[STRINGID_STATROSE] = gText_StatRose,
[STRINGID_STATHARSHLY] = COMPOUND_STRING("harshly "),
[STRINGID_STATFELL] = gText_StatFell,
[STRINGID_ATTACKERSSTATROSE] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX}'s {B_BUFF1} {B_BUFF2}rose!"),
[STRINGID_DEFENDERSSTATROSE] = gText_DefendersStatRose,
[STRINGID_SCRIPTINGSTATROSE] = COMPOUND_STRING("{B_SCR_NAME_WITH_PREFIX}'s {B_BUFF1} {B_BUFF2}rose!"),
@ -427,7 +423,6 @@ const u8 *const gBattleStringsTable[STRINGID_COUNT] =
[STRINGID_TRAINERBLOCKEDBALL] = COMPOUND_STRING("The Trainer blocked your Poké Ball!"),
[STRINGID_DONTBEATHIEF] = COMPOUND_STRING("Don't be a thief!"),
[STRINGID_ITDODGEDBALL] = COMPOUND_STRING("It dodged your thrown Poké Ball! This Pokémon can't be caught!"),
[STRINGID_YOUMISSEDPKMN] = COMPOUND_STRING("You missed the Pokémon!"),
[STRINGID_PKMNBROKEFREE] = COMPOUND_STRING("Oh no! The Pokémon broke free!"),
[STRINGID_ITAPPEAREDCAUGHT] = COMPOUND_STRING("Aww! It appeared to be caught!"),
[STRINGID_AARGHALMOSTHADIT] = COMPOUND_STRING("Aargh! Almost had it!"),
@ -435,7 +430,6 @@ const u8 *const gBattleStringsTable[STRINGID_COUNT] =
[STRINGID_GOTCHAPKMNCAUGHTPLAYER] = COMPOUND_STRING("Gotcha! {B_DEF_NAME} was caught!{WAIT_SE}{PLAY_BGM MUS_CAUGHT}\p"),
[STRINGID_GOTCHAPKMNCAUGHTWALLY] = COMPOUND_STRING("Gotcha! {B_DEF_NAME} was caught!{WAIT_SE}{PLAY_BGM MUS_CAUGHT}{PAUSE 127}"),
[STRINGID_GIVENICKNAMECAPTURED] = COMPOUND_STRING("Would you like to give {B_DEF_NAME} a nickname?"),
[STRINGID_PKMNSENTTOPC] = COMPOUND_STRING("{B_DEF_NAME} has been sent to {B_PC_CREATOR_NAME} PC!"), //Still used lanette's pc since terminology is different
[STRINGID_PKMNDATAADDEDTODEX] = COMPOUND_STRING("{B_DEF_NAME}'s data has been added to the Pokédex!\p"),
[STRINGID_ITISRAINING] = COMPOUND_STRING("It's raining!"),
[STRINGID_SANDSTORMISRAGING] = COMPOUND_STRING("The sandstorm is raging!"),
@ -541,13 +535,8 @@ const u8 *const gBattleStringsTable[STRINGID_COUNT] =
[STRINGID_ENDUREDSTURDY] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} endured the hit using {B_DEF_ABILITY}!"),
[STRINGID_POWERHERB] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} became fully charged due to its {B_LAST_ITEM}!"),
[STRINGID_HURTBYITEM] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} was hurt by the {B_LAST_ITEM}!"),
[STRINGID_PSNBYITEM] = COMPOUND_STRING("{B_EFF_NAME_WITH_PREFIX} was badly poisoned by the {B_LAST_ITEM}!"),
[STRINGID_BRNBYITEM] = COMPOUND_STRING("{B_EFF_NAME_WITH_PREFIX} was burned by the {B_LAST_ITEM}!"),
[STRINGID_DEFABILITYIN] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY} activates!"),
[STRINGID_GRAVITYINTENSIFIED] = COMPOUND_STRING("Gravity intensified!"),
[STRINGID_TARGETIDENTIFIED] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} was identified!"),
[STRINGID_TARGETWOKEUP] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} woke up!"),
[STRINGID_PKMNSTOLEANDATEITEM] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} stole and ate its target's {B_LAST_ITEM}!"),
[STRINGID_TAILWINDBLEW] = COMPOUND_STRING("The Tailwind blew from behind {B_ATK_TEAM2} team!"),
[STRINGID_PKMNWENTBACK] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} went back to {B_ATK_TRAINER_NAME}!"),
[STRINGID_PKMNCANTUSEITEMSANYMORE] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} can't use items anymore!"),
@ -556,8 +545,6 @@ const u8 *const gBattleStringsTable[STRINGID_COUNT] =
[STRINGID_PKMNSWITCHEDATKANDDEF] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} switched its Attack and Defense!"),
[STRINGID_PKMNSABILITYSUPPRESSED] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX}'s Ability was suppressed!"),
[STRINGID_SHIELDEDFROMCRITICALHITS] = COMPOUND_STRING("Lucky Chant shielded {B_ATK_TEAM2} team from critical hits!"),
[STRINGID_SWITCHEDATKANDSPATK] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} switched all changes to its Attack and Sp. Atk\pwith its target!"),
[STRINGID_SWITCHEDDEFANDSPDEF] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} switched all changes to its Defense and Sp. Def\pwith its target!"),
[STRINGID_PKMNACQUIREDABILITY] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} acquired {B_DEF_ABILITY}!"),
[STRINGID_POISONSPIKESSCATTERED] = COMPOUND_STRING("Poison spikes were scattered on the ground all around {B_DEF_TEAM2} team!"),
[STRINGID_PKMNSWITCHEDSTATCHANGES] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} switched stat changes with its target!"),
@ -565,7 +552,6 @@ const u8 *const gBattleStringsTable[STRINGID_COUNT] =
[STRINGID_PKMNLEVITATEDONELECTROMAGNETISM] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} levitated with electromagnetism!"),
[STRINGID_PKMNTWISTEDDIMENSIONS] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} twisted the dimensions!"),
[STRINGID_POINTEDSTONESFLOAT] = COMPOUND_STRING("Pointed stones float in the air around {B_DEF_TEAM2} team!"),
[STRINGID_CLOAKEDINMYSTICALMOONLIGHT] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} became cloaked in mystical moonlight!"),
[STRINGID_TRAPPEDBYSWIRLINGMAGMA] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} became trapped by swirling magma!"),
[STRINGID_VANISHEDINSTANTLY] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} vanished instantly!"),
[STRINGID_PROTECTEDTEAM] = COMPOUND_STRING("{B_CURRENT_MOVE} protected {B_ATK_TEAM2} team!"),
@ -577,16 +563,10 @@ const u8 *const gBattleStringsTable[STRINGID_COUNT] =
[STRINGID_HELDITEMSLOSEEFFECTS] = COMPOUND_STRING("It created a bizarre area in which Pokémon's held items lose their effects!"),
[STRINGID_FELLSTRAIGHTDOWN] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} fell straight down!"),
[STRINGID_TARGETCHANGEDTYPE] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} transformed into the {B_BUFF1} type!"),
[STRINGID_PKMNACQUIREDSIMPLE] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} acquired Simple!"), //shouldn't directly use the name
[STRINGID_KINDOFFER] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} took the kind offer!"),
[STRINGID_RESETSTARGETSSTATLEVELS] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX}'s stat changes were removed!"),
[STRINGID_ALLYSWITCHPOSITION] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} and {B_SCR_NAME_WITH_PREFIX2} switched places!"),
[STRINGID_RESTORETARGETSHEALTH] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX}'s HP was restored!"),
[STRINGID_TOOKPJMNINTOTHESKY] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} took {B_DEF_NAME_WITH_PREFIX2} into the sky!"),
[STRINGID_FREEDFROMSKYDROP] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} was freed from the Sky Drop!"),
[STRINGID_POSTPONETARGETMOVE] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX}'s move was postponed!"),
[STRINGID_REFLECTTARGETSTYPE] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} became the same type as {B_DEF_NAME_WITH_PREFIX2}!"),
[STRINGID_TRANSFERHELDITEM] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} received {B_LAST_ITEM} from {B_ATK_NAME_WITH_PREFIX2}"),
[STRINGID_EMBARGOENDS] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} can use items again!"),
[STRINGID_ELECTROMAGNETISM] = COMPOUND_STRING("electromagnetism"),
[STRINGID_BUFFERENDS] = COMPOUND_STRING("{B_SCR_NAME_WITH_PREFIX}'s {B_BUFF1} wore off!"),
@ -623,7 +603,6 @@ const u8 *const gBattleStringsTable[STRINGID_COUNT] =
[STRINGID_FRISKACTIVATES] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} frisked {B_DEF_NAME_WITH_PREFIX2} and found its {B_LAST_ITEM}!"),
[STRINGID_UNNERVEENTERS] = COMPOUND_STRING("{B_EFF_TEAM1} team is too nervous to eat Berries!"),
[STRINGID_HARVESTBERRY] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} harvested its {B_LAST_ITEM}!"),
[STRINGID_MAGICBOUNCEACTIVATES] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} bounced the {B_ATK_NAME_WITH_PREFIX2} back!"),
[STRINGID_PROTEANTYPECHANGE] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX}'s {B_ATK_ABILITY} transformed it into the {B_BUFF1} type!"),
[STRINGID_SYMBIOSISITEMPASS] = COMPOUND_STRING("{B_SCR_NAME_WITH_PREFIX} passed its {B_LAST_ITEM} to {B_EFF_NAME_WITH_PREFIX2} through {B_LAST_ABILITY}!"),
[STRINGID_STEALTHROCKDMG] = COMPOUND_STRING("Pointed stones dug into {B_SCR_NAME_WITH_PREFIX2}!"),
@ -678,7 +657,6 @@ const u8 *const gBattleStringsTable[STRINGID_COUNT] =
[STRINGID_PSYCHICTERRAINPREVENTS] = COMPOUND_STRING("{B_SCR_NAME_WITH_PREFIX} is protected by the Psychic Terrain!"),
[STRINGID_SAFETYGOGGLESPROTECTED] = COMPOUND_STRING("{B_SCR_NAME_WITH_PREFIX} is not affected thanks to its {B_LAST_ITEM}!"),
[STRINGID_FLOWERVEILPROTECTED] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} surrounded itself with a veil of petals!"),
[STRINGID_SWEETVEILPROTECTED] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} can't fall asleep due to a veil of sweetness!"),
[STRINGID_AROMAVEILPROTECTED] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} is protected by an aromatic veil!"),
[STRINGID_CELEBRATEMESSAGE] = COMPOUND_STRING("Congratulations, {B_PLAYER_NAME}!"),
[STRINGID_USEDINSTRUCTEDMOVE] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} followed {B_ATK_NAME_WITH_PREFIX2}'s instructions!"),

7
src/field_specials.c
View File

@ -95,7 +95,6 @@ static EWRAM_DATA u32 sBikeCyclingTimer = 0;
static EWRAM_DATA u8 sSlidingDoorNextFrameCounter = 0;
static EWRAM_DATA u8 sSlidingDoorFrame = 0;
static EWRAM_DATA u8 sTutorMoveAndElevatorWindowId = 0;
static EWRAM_DATA u16 sLilycoveDeptStore_NeverRead = 0;
static EWRAM_DATA u16 sLilycoveDeptStore_DefaultFloorChoice = 0;
static EWRAM_DATA struct ListMenuItem *sScrollableMultichoice_ListMenuItem = NULL;
@ -1881,7 +1880,6 @@ void SetDeptStoreFloor(void)
u16 GetDeptStoreDefaultFloorChoice(void)
{
sLilycoveDeptStore_NeverRead = 0;
sLilycoveDeptStore_DefaultFloorChoice = 0;
if (gSaveBlock1Ptr->dynamicWarp.mapGroup == MAP_GROUP(MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F))
@ -1889,23 +1887,18 @@ u16 GetDeptStoreDefaultFloorChoice(void)
switch (gSaveBlock1Ptr->dynamicWarp.mapNum)
{
case MAP_NUM(MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F):
sLilycoveDeptStore_NeverRead = 0;
sLilycoveDeptStore_DefaultFloorChoice = 0;
break;
case MAP_NUM(MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F):
sLilycoveDeptStore_NeverRead = 0;
sLilycoveDeptStore_DefaultFloorChoice = 1;
break;
case MAP_NUM(MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F):
sLilycoveDeptStore_NeverRead = 0;
sLilycoveDeptStore_DefaultFloorChoice = 2;
break;
case MAP_NUM(MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F):
sLilycoveDeptStore_NeverRead = 0;
sLilycoveDeptStore_DefaultFloorChoice = 3;
break;
case MAP_NUM(MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F):
sLilycoveDeptStore_NeverRead = 0;
sLilycoveDeptStore_DefaultFloorChoice = 4;
break;
}

8
src/intro_frlg.c
View File

@ -157,17 +157,13 @@ struct IntroSequenceData
}; // size: 0x28BC
static EWRAM_DATA struct GcmbStruct sGcmb = {0};
static EWRAM_DATA u16 sUnusedScene3Var0 = 0; // Set but never read
static EWRAM_DATA u16 sUnusedScene3Var1 = 0; // Set but never read
static EWRAM_DATA u16 sNidorinoJumpMult = 0;
static EWRAM_DATA u16 sNidorinoAnimDelayTime = 0;
static EWRAM_DATA u16 sNidorinoJumpDiv = 0;
static EWRAM_DATA u16 sNidorinoRecoilReturnTime = 0;
static EWRAM_DATA u16 sNidorinoUnusedVar = 0; // Set but never read
static EWRAM_DATA u16 sStarSpeedX = 0;
static EWRAM_DATA u16 sStarSpeedY = 0;
static EWRAM_DATA u16 sStarSparklesXmodMask = 0;
static EWRAM_DATA u16 sStarSparklesUnusedVar = 0; // Set but never read
static EWRAM_DATA u16 sStarSparklesSpawnRate = 0;
static EWRAM_DATA u16 sStarSparklesFlickerStartTime = 0;
static EWRAM_DATA u16 sStarSparklesDestroySpriteTime = 0;
@ -1570,8 +1566,6 @@ static void IntroCB_Scene3_Entrance(struct IntroSequenceData * this)
{
DecompressAndCopyTileDataToVram(BG_SCENE3_GENGAR, sScene3_GengarAnim_Gfx, 0, 0, 0);
DecompressAndCopyTileDataToVram(BG_SCENE3_GENGAR, sScene3_GengarAnim_Map, 0, 0, 1);
sUnusedScene3Var0 = 4;
sUnusedScene3Var1 = 52;
ChangeBgX(BG_SCENE3_GENGAR, 0x00001800, BG_COORD_SET);
ChangeBgY(BG_SCENE3_GENGAR, 0x0001F000, BG_COORD_SET);
this->state++;
@ -1946,7 +1940,6 @@ static void GFScene_LoadGfxCreateStar(void)
sStarSpeedX = 96;
sStarSpeedY = 16;
sStarSparklesXmodMask = 0x07;
sStarSparklesUnusedVar = 5;
sStarSparklesSpawnRate = 8;
sStarSparklesFlickerStartTime = 90;
sStarSparklesDestroySpriteTime = 120;
@ -2738,7 +2731,6 @@ static void Scene3_StartNidorinoAttack(struct IntroSequenceData * ptr)
ptr->scene3NidorinoSprite->data[5] = 0; // Unused
ptr->scene3NidorinoSprite->x += ptr->scene3NidorinoSprite->x2;
ptr->scene3NidorinoSprite->x2 = 0;
sNidorinoUnusedVar = 36;
sNidorinoAnimDelayTime = 40;
sNidorinoJumpMult = 3;
sNidorinoJumpDiv = 4;

7
src/link.c
View File

@ -95,7 +95,6 @@ COMMON_DATA u8 gLastRecvQueueCount = 0;
COMMON_DATA u16 gLinkSavedIme = 0;
static EWRAM_DATA u8 sLinkTestDebugValuesEnabled = 0;
static EWRAM_DATA u8 sDummyFlag = FALSE;
EWRAM_DATA u32 gBerryBlenderKeySendAttempts = 0;
EWRAM_DATA u16 gBlockRecvBuffer[MAX_RFU_PLAYERS][BLOCK_BUFFER_SIZE / 2] = {};
EWRAM_DATA u8 gBlockSendBuffer[BLOCK_BUFFER_SIZE] = {};
@ -112,7 +111,6 @@ static EWRAM_DATA struct {
bool8 disconnected;
} sLinkErrorBuffer = {};
static EWRAM_DATA u16 sReadyCloseLinkAttempts = 0; // never read
static EWRAM_DATA void *sLinkErrorBgTilemapBuffer = NULL;
static void InitLocalLinkPlayer(void);
static void VBlankCB_LinkError(void);
@ -420,10 +418,7 @@ static void TestBlockTransfer(u8 nothing, u8 is, u8 used)
gLinkTestBlockChecksums[i] = LinkTestCalcBlockChecksum(gBlockRecvBuffer[i], sBlockRecv[i].size);
ResetBlockReceivedFlag(i);
if (gLinkTestBlockChecksums[i] != 0x0342)
{
sLinkTestDebugValuesEnabled = FALSE;
sDummyFlag = FALSE;
}
}
}
}
@ -1566,7 +1561,7 @@ void CB2_LinkError(void)
SetVBlankCallback(VBlankCB_LinkError);
ResetBgsAndClearDma3BusyFlags(0);
InitBgsFromTemplates(0, sLinkErrorBgTemplates, ARRAY_COUNT(sLinkErrorBgTemplates));
sLinkErrorBgTilemapBuffer = tilemapBuffer = Alloc(BG_SCREEN_SIZE);
tilemapBuffer = Alloc(BG_SCREEN_SIZE);
SetBgTilemapBuffer(1, tilemapBuffer);
if (InitWindows(sLinkErrorWindowTemplates))
{

8
src/mauville_old_man.c
View File

@ -33,7 +33,6 @@ static u8 sSelectedStory;
COMMON_DATA struct BardSong gBardSong = {0};
static EWRAM_DATA u16 sUnusedPitchTableIndex = 0;
static EWRAM_DATA struct MauvilleManStoryteller *sStorytellerPtr = NULL;
static EWRAM_DATA u8 sStorytellerWindowId = 0;
@ -621,7 +620,6 @@ static void Task_BardSong(u8 taskId)
break;
case BARD_STATE_GET_WORD:
{
struct MauvilleManBard *bard = &gSaveBlock1Ptr->oldMan.bard;
u8 *str = &gStringVar4[task->tCharIndex];
u16 wordLen = 0;
@ -635,12 +633,6 @@ static void Task_BardSong(u8 taskId)
wordLen++;
}
// sUnusedPitchTableIndex is never read. For debugging perhaps, or one of the other languages.
if (!task->tUseNewSongLyrics)
sUnusedPitchTableIndex = WORD_TO_PITCH_TABLE_INDEX(bard->songLyrics[task->tLyricsIndex]);
else
sUnusedPitchTableIndex = WORD_TO_PITCH_TABLE_INDEX(bard->newSongLyrics[task->tLyricsIndex]);
gBardSong.length /= wordLen;
if (gBardSong.length <= 0)
gBardSong.length = 1;

4
src/pokenav_list.c
View File

@ -100,8 +100,6 @@ static const u8 gText_PokenavMatchCall_Strategy[] = _("STRATEGY");
static const u8 gText_PokenavMatchCall_TrainerPokemon[] = _("TRAINER'S POKéMON");
static const u8 gText_PokenavMatchCall_SelfIntroduction[] = _("SELF-INTRODUCTION");
static EWRAM_DATA u32 sMoveWindowDownIndex = 0; // Read, but pointlessly
bool32 CreatePokenavList(const struct BgTemplate *bgTemplate, struct PokenavListTemplate *listTemplate, s32 tileOffset)
{
struct PokenavList *list = AllocSubstruct(POKENAV_SUBSTRUCT_LIST, sizeof(struct PokenavList));
@ -282,7 +280,7 @@ static void MoveListWindow(s32 delta, bool32 printItems)
}
else if (printItems)
{
s32 index = sMoveWindowDownIndex = windowState->windowTopIndex + windowState->entriesOnscreen;
s32 index = windowState->windowTopIndex + windowState->entriesOnscreen;
if (index + delta >= windowState->listLength)
delta = windowState->listLength - index;