Remove unused messages
This commit is contained in:
Eduardo Quezada
parent
206d2503d8
commit
cf85abc270
@ -62,11 +62,8 @@ enum StringID
|
||||
STRINGID_PKMNISPARALYZED,
|
||||
STRINGID_PKMNISALREADYPARALYZED,
|
||||
STRINGID_PKMNHEALEDPARALYSIS,
|
||||
STRINGID_PKMNDREAMEATEN,
|
||||
STRINGID_STATSWONTINCREASE,
|
||||
STRINGID_STATSWONTDECREASE,
|
||||
STRINGID_TEAMSTOPPEDWORKING,
|
||||
STRINGID_FOESTOPPEDWORKING,
|
||||
STRINGID_PKMNISCONFUSED,
|
||||
STRINGID_PKMNHEALEDCONFUSION,
|
||||
STRINGID_PKMNWASCONFUSED,
|
||||
@ -74,7 +71,6 @@ enum StringID
|
||||
STRINGID_PKMNFELLINLOVE,
|
||||
STRINGID_PKMNINLOVE,
|
||||
STRINGID_PKMNIMMOBILIZEDBYLOVE,
|
||||
STRINGID_PKMNBLOWNAWAY,
|
||||
STRINGID_PKMNCHANGEDTYPE,
|
||||
STRINGID_PKMNFLINCHED,
|
||||
STRINGID_PKMNREGAINEDHEALTH,
|
||||
@ -180,7 +176,6 @@ enum StringID
|
||||
STRINGID_PKMNREADYTOHELP,
|
||||
STRINGID_PKMNSWITCHEDITEMS,
|
||||
STRINGID_PKMNCOPIEDFOE,
|
||||
STRINGID_PKMNMADEWISH,
|
||||
STRINGID_PKMNWISHCAMETRUE,
|
||||
STRINGID_PKMNPLANTEDROOTS,
|
||||
STRINGID_PKMNABSORBEDNUTRIENTS,
|
||||
@ -251,7 +246,6 @@ enum StringID
|
||||
STRINGID_HAILSTOPPED,
|
||||
STRINGID_FAILEDTOSPITUP,
|
||||
STRINGID_FAILEDTOSWALLOW,
|
||||
STRINGID_WINDBECAMEHEATWAVE,
|
||||
STRINGID_STATCHANGESGONE,
|
||||
STRINGID_COINSSCATTERED,
|
||||
STRINGID_TOOWEAKFORSUBSTITUTE,
|
||||
@ -327,7 +321,6 @@ enum StringID
|
||||
STRINGID_PLAYERDEFEATEDTRAINER1,
|
||||
STRINGID_SOOTHINGAROMA,
|
||||
STRINGID_ITEMSCANTBEUSEDNOW,
|
||||
STRINGID_FORXCOMMAYZ,
|
||||
STRINGID_USINGITEMSTATOFPKMNROSE,
|
||||
STRINGID_PKMNUSEDXTOGETPUMPED,
|
||||
STRINGID_PKMNSXMADEYUSELESS,
|
||||
@ -344,7 +337,6 @@ enum StringID
|
||||
STRINGID_PKMNFLEDUSINGITS,
|
||||
STRINGID_PKMNFLEDUSING,
|
||||
STRINGID_PKMNWASDRAGGEDOUT,
|
||||
STRINGID_PREVENTEDFROMWORKING,
|
||||
STRINGID_PKMNSITEMNORMALIZEDSTATUS,
|
||||
STRINGID_TRAINER1USEDITEM,
|
||||
STRINGID_BOXISFULL,
|
||||
@ -355,8 +347,6 @@ enum StringID
|
||||
STRINGID_STATSWONTDECREASE2,
|
||||
STRINGID_PKMNSXBLOCKSY2,
|
||||
STRINGID_PKMNSXWOREOFF,
|
||||
STRINGID_PKMNRAISEDDEFALITTLE,
|
||||
STRINGID_PKMNRAISEDSPDEFALITTLE,
|
||||
STRINGID_THEWALLSHATTERED,
|
||||
STRINGID_PKMNSXPREVENTSYSZ,
|
||||
STRINGID_PKMNSXCUREDITSYPROBLEM,
|
||||
|
||||
@ -221,11 +221,8 @@ const u8 *const gBattleStringsTable[STRINGID_COUNT] =
|
||||
[STRINGID_PKMNISPARALYZED] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} couldn't move because it's paralyzed!"),
|
||||
[STRINGID_PKMNISALREADYPARALYZED] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} is already paralyzed!"),
|
||||
[STRINGID_PKMNHEALEDPARALYSIS] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} was cured of paralysis!"),
|
||||
[STRINGID_PKMNDREAMEATEN] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX}'s dream was eaten!"), //not in gen 5+, expansion doesn't use anymore
|
||||
[STRINGID_STATSWONTINCREASE] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX}'s {B_BUFF1} won't go any higher!"),
|
||||
[STRINGID_STATSWONTDECREASE] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX}'s {B_BUFF1} won't go any lower!"),
|
||||
[STRINGID_TEAMSTOPPEDWORKING] = COMPOUND_STRING("Your team's {B_BUFF1} stopped working!"), //unused
|
||||
[STRINGID_FOESTOPPEDWORKING] = COMPOUND_STRING("The foe's {B_BUFF1} stopped working!"), //unused
|
||||
[STRINGID_PKMNISCONFUSED] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} is confused!"),
|
||||
[STRINGID_PKMNHEALEDCONFUSION] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} snapped out of its confusion!"),
|
||||
[STRINGID_PKMNWASCONFUSED] = COMPOUND_STRING("{B_EFF_NAME_WITH_PREFIX} became confused!"),
|
||||
@ -233,7 +230,6 @@ const u8 *const gBattleStringsTable[STRINGID_COUNT] =
|
||||
[STRINGID_PKMNFELLINLOVE] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} fell in love!"),
|
||||
[STRINGID_PKMNINLOVE] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} is in love with {B_SCR_NAME_WITH_PREFIX2}!"),
|
||||
[STRINGID_PKMNIMMOBILIZEDBYLOVE] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} is immobilized by love!"),
|
||||
[STRINGID_PKMNBLOWNAWAY] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} was blown away!"), //unused
|
||||
[STRINGID_PKMNCHANGEDTYPE] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} transformed into the {B_BUFF1} type!"),
|
||||
[STRINGID_PKMNFLINCHED] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} flinched and couldn't move!"),
|
||||
[STRINGID_PKMNREGAINEDHEALTH] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX}'s HP was restored."),
|
||||
@ -325,7 +321,7 @@ const u8 *const gBattleStringsTable[STRINGID_COUNT] =
|
||||
[STRINGID_PKMNFLEDFROMBATTLE] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} fled from battle!"),
|
||||
[STRINGID_PKMNFORESAWATTACK] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} foresaw an attack!"),
|
||||
[STRINGID_PKMNTOOKATTACK] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} took the {B_BUFF1} attack!"),
|
||||
[STRINGID_PKMNATTACK] = COMPOUND_STRING("{B_BUFF1}'s attack!"), //not in gen 5+, expansion doesn't use anymore
|
||||
[STRINGID_PKMNATTACK] = COMPOUND_STRING("{B_BUFF1}'s attack!"), //not in gen 5+
|
||||
[STRINGID_PKMNCENTERATTENTION] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} became the center of attention!"),
|
||||
[STRINGID_PKMNCHARGINGPOWER] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} began charging power!"),
|
||||
[STRINGID_NATUREPOWERTURNEDINTO] = COMPOUND_STRING("Nature Power turned into {B_CURRENT_MOVE}!"),
|
||||
@ -339,7 +335,6 @@ const u8 *const gBattleStringsTable[STRINGID_COUNT] =
|
||||
[STRINGID_PKMNREADYTOHELP] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} is ready to help {B_DEF_NAME_WITH_PREFIX2}!"),
|
||||
[STRINGID_PKMNSWITCHEDITEMS] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} switched items with its target!"),
|
||||
[STRINGID_PKMNCOPIEDFOE] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} copied {B_DEF_NAME_WITH_PREFIX2}'s Ability!"),
|
||||
[STRINGID_PKMNMADEWISH] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} made a wish!"), //unused
|
||||
[STRINGID_PKMNWISHCAMETRUE] = COMPOUND_STRING("{B_BUFF1}'s wish came true!"),
|
||||
[STRINGID_PKMNPLANTEDROOTS] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} planted its roots!"),
|
||||
[STRINGID_PKMNABSORBEDNUTRIENTS] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} absorbed nutrients with its roots!"),
|
||||
@ -410,7 +405,6 @@ const u8 *const gBattleStringsTable[STRINGID_COUNT] =
|
||||
[STRINGID_HAILSTOPPED] = COMPOUND_STRING("The hail stopped."),
|
||||
[STRINGID_FAILEDTOSPITUP] = COMPOUND_STRING("But it failed to spit up a thing!"), //not in gen 5+, uses "but it failed"
|
||||
[STRINGID_FAILEDTOSWALLOW] = COMPOUND_STRING("But it failed to swallow a thing!"), //not in gen 5+, uses "but it failed"
|
||||
[STRINGID_WINDBECAMEHEATWAVE] = COMPOUND_STRING("The wind turned into a Heat Wave!"), //unused
|
||||
[STRINGID_STATCHANGESGONE] = COMPOUND_STRING("All stat changes were eliminated!"),
|
||||
[STRINGID_COINSSCATTERED] = COMPOUND_STRING("Coins were scattered everywhere!"),
|
||||
[STRINGID_TOOWEAKFORSUBSTITUTE] = COMPOUND_STRING("But it does not have enough HP left to make a substitute!"),
|
||||
@ -486,7 +480,6 @@ const u8 *const gBattleStringsTable[STRINGID_COUNT] =
|
||||
[STRINGID_PLAYERDEFEATEDTRAINER1] = sText_PlayerDefeatedLinkTrainerTrainer1,
|
||||
[STRINGID_SOOTHINGAROMA] = COMPOUND_STRING("A soothing aroma wafted through the area!"),
|
||||
[STRINGID_ITEMSCANTBEUSEDNOW] = COMPOUND_STRING("Items can't be used now.{PAUSE 64}"), //not in gen 5+, i think
|
||||
[STRINGID_FORXCOMMAYZ] = COMPOUND_STRING("For {B_SCR_NAME_WITH_PREFIX2}, {B_LAST_ITEM} {B_BUFF1}"), //not in gen 5+, expansion doesn't use anymore
|
||||
[STRINGID_USINGITEMSTATOFPKMNROSE] = COMPOUND_STRING("Using {B_LAST_ITEM}, the {B_BUFF1} of {B_SCR_NAME_WITH_PREFIX2} {B_BUFF2}"), //todo: update this, will require code changes
|
||||
[STRINGID_PKMNUSEDXTOGETPUMPED] = COMPOUND_STRING("{B_SCR_NAME_WITH_PREFIX} used the {B_LAST_ITEM} to get pumped!"),
|
||||
[STRINGID_PKMNSXMADEYUSELESS] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY} made {B_CURRENT_MOVE} useless!"), //not in gen 5+, ability popup
|
||||
@ -503,7 +496,6 @@ const u8 *const gBattleStringsTable[STRINGID_COUNT] =
|
||||
[STRINGID_PKMNFLEDUSINGITS] = COMPOUND_STRING("{PLAY_SE SE_FLEE}{B_ATK_NAME_WITH_PREFIX} fled using its {B_LAST_ITEM}!\p"),
|
||||
[STRINGID_PKMNFLEDUSING] = COMPOUND_STRING("{PLAY_SE SE_FLEE}{B_ATK_NAME_WITH_PREFIX} fled using {B_ATK_ABILITY}!\p"), //not in gen 5+
|
||||
[STRINGID_PKMNWASDRAGGEDOUT] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} was dragged out!\p"),
|
||||
[STRINGID_PREVENTEDFROMWORKING] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY} prevented {B_SCR_NAME_WITH_PREFIX2}'s {B_BUFF1} from working!"), //unused
|
||||
[STRINGID_PKMNSITEMNORMALIZEDSTATUS] = COMPOUND_STRING("{B_SCR_NAME_WITH_PREFIX}'s {B_LAST_ITEM} normalized its status!"),
|
||||
[STRINGID_TRAINER1USEDITEM] = COMPOUND_STRING("{B_ATK_TRAINER_NAME_WITH_CLASS} used {B_LAST_ITEM}!"),
|
||||
[STRINGID_BOXISFULL] = COMPOUND_STRING("The Box is full! You can't catch any more!\p"),
|
||||
@ -514,8 +506,6 @@ const u8 *const gBattleStringsTable[STRINGID_COUNT] =
|
||||
[STRINGID_STATSWONTDECREASE2] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX}'s stats won't go any lower!"),
|
||||
[STRINGID_PKMNSXBLOCKSY2] = COMPOUND_STRING("{B_SCR_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY} blocks {B_CURRENT_MOVE}!"), //not in gen 5+, ability popup
|
||||
[STRINGID_PKMNSXWOREOFF] = COMPOUND_STRING("{B_ATK_TEAM1} team's {B_BUFF1} wore off!"),
|
||||
[STRINGID_PKMNRAISEDDEFALITTLE] = COMPOUND_STRING("{B_ATK_PREFIX1}'s {B_CURRENT_MOVE} raised DEFENSE a little!"), //expansion doesn't use anymore
|
||||
[STRINGID_PKMNRAISEDSPDEFALITTLE] = COMPOUND_STRING("{B_ATK_PREFIX1}'s {B_CURRENT_MOVE} raised SP. DEF a little!"), //expansion doesn't use anymore
|
||||
[STRINGID_THEWALLSHATTERED] = COMPOUND_STRING("The wall shattered!"), //not in gen5+, uses "your teams light screen wore off!" etc instead
|
||||
[STRINGID_PKMNSXPREVENTSYSZ] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX}'s {B_ATK_ABILITY} prevents {B_DEF_NAME_WITH_PREFIX2}'s {B_DEF_ABILITY} from working!"),
|
||||
[STRINGID_PKMNSXCUREDITSYPROBLEM] = COMPOUND_STRING("{B_SCR_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY} cured its {B_BUFF1} problem!"), //not in gen 5+, ability popup
|
||||
|
||||
@ -480,12 +480,10 @@ void BattleTv_SetDataBasedOnString(enum StringID stringId)
|
||||
}
|
||||
break;
|
||||
case STRINGID_PKMNRAISEDDEF:
|
||||
case STRINGID_PKMNRAISEDDEFALITTLE:
|
||||
tvPtr->side[atkSide].reflectMonId = gBattlerPartyIndexes[gBattlerAttacker] + 1;
|
||||
tvPtr->side[atkSide].reflectMoveSlot = moveSlot;
|
||||
break;
|
||||
case STRINGID_PKMNRAISEDSPDEF:
|
||||
case STRINGID_PKMNRAISEDSPDEFALITTLE:
|
||||
tvPtr->side[atkSide].lightScreenMonId = gBattlerPartyIndexes[gBattlerAttacker] + 1;
|
||||
tvPtr->side[atkSide].lightScreenMoveSlot = moveSlot;
|
||||
break;
|
||||
|
||||
@ -663,8 +663,6 @@ TEST("Battle strings fit on the battle message window")
|
||||
break;
|
||||
// Buffer Move name to B_BUFF1
|
||||
case STRINGID_PKMNLEARNEDMOVE2:
|
||||
case STRINGID_TEAMSTOPPEDWORKING: // Unused
|
||||
case STRINGID_FOESTOPPEDWORKING: // Unused
|
||||
case STRINGID_PKMNHURTBY:
|
||||
case STRINGID_PKMNFREEDFROM:
|
||||
case STRINGID_PKMNMOVEWASDISABLED:
|
||||
@ -758,7 +756,6 @@ TEST("Battle strings fit on the battle message window")
|
||||
case STRINGID_PKMNCURIOUSABOUTX:
|
||||
case STRINGID_PKMNENTHRALLEDBYX:
|
||||
case STRINGID_PKMNIGNOREDX:
|
||||
case STRINGID_PREVENTEDFROMWORKING:
|
||||
case STRINGID_PKMNOBTAINEDX:
|
||||
case STRINGID_ABOUTTOUSEPOLTERGEIST:
|
||||
PREPARE_ITEM_BUFFER(gBattleTextBuff1, longItemName);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user