From e544a7944ca2f04c0f8f7962fc2b645088ff84a0 Mon Sep 17 00:00:00 2001 From: Meister-anon Date: Thu, 19 Mar 2026 17:16:52 -0400 Subject: [PATCH 1/3] identified deprecated values --- data/battle_scripts_1.s | 9 +-------- include/battle_scripts.h | 1 - include/battle_util.h | 1 - src/battle_message.c | 1 - 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 828b6d6860..c6d7ae35ae 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -6141,7 +6141,7 @@ BattleScript_HealerActivates:: BattleScript_ShedSkinActivates:: call BattleScript_AbilityPopUp - printstring STRINGID_PKMNSXCUREDYPROBLEM + printstring STRINGID_PKMNSXCUREDITSYPROBLEM waitmessage B_WAIT_TIME_LONG updatestatusicon BS_ATTACKER end2 @@ -6544,13 +6544,6 @@ BattleScript_ItemNoStatLoss:: waitmessage B_WAIT_TIME_LONG return -BattleScript_ObliviousPreventsAttraction:: - pause B_WAIT_TIME_SHORT - call BattleScript_AbilityPopUp - printstring STRINGID_PKMNPREVENTSROMANCEWITH - waitmessage B_WAIT_TIME_LONG - goto BattleScript_MoveEnd - BattleScript_FlinchPrevention:: pause B_WAIT_TIME_SHORT call BattleScript_AbilityPopUp diff --git a/include/battle_scripts.h b/include/battle_scripts.h index f04c1a2dca..875e22be50 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -179,7 +179,6 @@ extern const u8 BattleScript_MonMadeMoveUseless[]; extern const u8 BattleScript_FlashFireBoost[]; extern const u8 BattleScript_AbilityNoStatLoss[]; extern const u8 BattleScript_ItemNoStatLoss[]; -extern const u8 BattleScript_ObliviousPreventsAttraction[]; extern const u8 BattleScript_FlinchPrevention[]; extern const u8 BattleScript_OwnTempoPrevents[]; extern const u8 BattleScript_SoundproofProtected[]; diff --git a/include/battle_util.h b/include/battle_util.h index 759b07599f..67ab419512 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -168,7 +168,6 @@ enum SubCheck }; void HandleAction_ThrowBall(void); -uq4_12_t CalcTypeEffectivenessMultiplierHelper(enum Move move, enum Type moveType, enum BattlerId battlerAtk, enum BattlerId battlerDef, enum Ability abilityAtk, enum Ability abilityDef, bool32 recordAbilities); u32 GetCurrentBattleWeather(void); bool32 EndOrContinueWeather(void); enum DamageCategory GetReflectDamageMoveDamageCategory(enum BattlerId battler, enum Move move); diff --git a/src/battle_message.c b/src/battle_message.c index 912829e01c..86a01224c9 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -469,7 +469,6 @@ const u8 *const gBattleStringsTable[STRINGID_COUNT] = [STRINGID_PKMNSXPREVENTSYLOSS] = COMPOUND_STRING("{B_SCR_NAME_WITH_PREFIX}'s {B_SCR_ABILITY} prevents {B_BUFF1} loss!"), //not in gen 5+, ability popup [STRINGID_PKMNSXINFATUATEDY] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY} infatuated {B_ATK_NAME_WITH_PREFIX2}!"), //not in gen 5+, ability popup [STRINGID_PKMNSXMADEYINEFFECTIVE] = COMPOUND_STRING("{B_SCR_NAME_WITH_PREFIX}'s {B_SCR_ABILITY} made {B_CURRENT_MOVE} ineffective!"), //not in gen 5+, ability popup - [STRINGID_PKMNSXCUREDYPROBLEM] = COMPOUND_STRING("{B_SCR_NAME_WITH_PREFIX}'s {B_SCR_ABILITY} cured its {B_BUFF1} problem!"), //not in gen 5+, ability popup [STRINGID_ITSUCKEDLIQUIDOOZE] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} sucked up the liquid ooze!"), [STRINGID_PKMNTRANSFORMED] = COMPOUND_STRING("{B_SCR_NAME_WITH_PREFIX} transformed!"), [STRINGID_ELECTRICITYWEAKENED] = COMPOUND_STRING("Electricity's power was weakened!"), From 7aa3c1276ae40ed168ef77c3dee67caacdf4a763 Mon Sep 17 00:00:00 2001 From: Meister-anon Date: Fri, 20 Mar 2026 20:01:54 -0400 Subject: [PATCH 2/3] remove missed string constant --- include/constants/battle_string_ids.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/constants/battle_string_ids.h b/include/constants/battle_string_ids.h index ece2612ebb..c1aea1f085 100644 --- a/include/constants/battle_string_ids.h +++ b/include/constants/battle_string_ids.h @@ -292,7 +292,6 @@ enum StringID STRINGID_PKMNSXPREVENTSYLOSS, STRINGID_PKMNSXINFATUATEDY, STRINGID_PKMNSXMADEYINEFFECTIVE, - STRINGID_PKMNSXCUREDYPROBLEM, STRINGID_ITSUCKEDLIQUIDOOZE, STRINGID_PKMNTRANSFORMED, STRINGID_ELECTRICITYWEAKENED, From 2e59cd088f00cdda196a323de24c84803d68d627 Mon Sep 17 00:00:00 2001 From: Meister-anon Date: Sat, 21 Mar 2026 13:58:28 -0400 Subject: [PATCH 3/3] missed string used in test system --- test/text.c | 1 - 1 file changed, 1 deletion(-) diff --git a/test/text.c b/test/text.c index 3695d54d02..62b5cf94cc 100644 --- a/test/text.c +++ b/test/text.c @@ -791,7 +791,6 @@ TEST("Battle strings fit on the battle message window") break; // Buffer Status name to B_BUFF2 case STRINGID_PKMNSITEMCUREDPROBLEM: - case STRINGID_PKMNSXCUREDYPROBLEM: case STRINGID_PKMNSXCUREDITSYPROBLEM: StringCopy(gBattleTextBuff1, gText_Confusion); break;