From 2f2d7c281f19def1f38576be337ba5dfbd62b846 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Fri, 2 Feb 2024 10:55:39 +0100 Subject: [PATCH] Clean up contest strings (#3876) * Move contest move descriptions out of inc file * Clean up unused contest strings * More contest cleanup * sRoundResultTexts cleanup --------- Co-authored-by: DizzyEggg --- data/text/contest_strings.inc | 458 --------------------------------- src/contest.c | 91 +++++++ src/data/contest_text_tables.h | 288 --------------------- 3 files changed, 91 insertions(+), 746 deletions(-) diff --git a/data/text/contest_strings.inc b/data/text/contest_strings.inc index 948c19922d..4b144a21bc 100644 --- a/data/text/contest_strings.inc +++ b/data/text/contest_strings.inc @@ -1,254 +1,3 @@ -@ Contest move effect descriptions - -gText_HighlyAppealingMove:: - .string "A highly appealing move.$" - -gText_UserMoreEasilyStartled:: - .string "After this move, the user is\n" - .string "more easily startled.$" - -gText_GreatAppealButNoMoreToEnd:: - .string "Makes a great appeal, but\n" - .string "allows no more to the end.$" - -gText_UsedRepeatedlyWithoutBoringJudge:: - .string "Can be repeatedly used\n" - .string "without boring the JUDGE.$" - -gText_AvoidStartledByOthersOnce:: - .string "Can avoid being startled\n" - .string "by others once.$" - -gText_AvoidStartledByOthers:: - .string "Can avoid being startled\n" - .string "by others.$" - -gText_AvoidStartledByOthersLittle:: - .string "Can avoid being startled\n" - .string "by others a little.$" - -gText_UserLessLikelyStartled:: - .string "After this move, the user is\n" - .string "less likely to be startled.$" - -gText_SlightlyStartleFrontMon:: - .string "Slightly startles the\n" - .string "POKéMON in front.$" - -gText_SlightlyStartleAppealed:: - .string "Slightly startles those\n" - .string "that have made appeals.$" - -gText_StartleAppealedBeforeUser:: - .string "Startles the POKéMON that\n" - .string "appealed before the user.$" - -gText_StartleAllAppealed:: - .string "Startles all POKéMON that\n" - .string "have done their appeals.$" - -gText_BadlyStartleFrontMon:: - .string "Badly startles the\n" - .string "POKéMON in front.$" - -gText_BadlyStartleAppealed:: - .string "Badly startles those that\n" - .string "have made appeals.$" - -gText_StartleAppealedBeforeUser2:: - .string "Startles the POKéMON that\n" - .string "appealed before the user.$" - -gText_StartleAllAppealed2:: - .string "Startles all POKéMON that\n" - .string "have done their appeals.$" - -gText_ShiftJudgesAttentionFromOthers:: - .string "Shifts the JUDGE's\n" - .string "attention from others.$" - -gText_StartleMonHasJudgesAttention:: - .string "Startles the POKéMON that\n" - .string "has the JUDGE's attention.$" - -gText_JamOthersMissesTurn:: - .string "Jams the others, and misses\n" - .string "one turn of appeals.$" - -gText_StartleMonsMadeSameTypeAppeal:: - .string "Startles POKéMON that\n" - .string "made a same-type appeal.$" - -gText_BadlyStartleCoolAppeals:: - .string "Badly startles POKéMON\n" - .string "that made COOL appeals.$" - -gText_BadlyStartleBeautyAppeals:: - .string "Badly startles POKéMON\n" - .string "that made BEAUTY appeals.$" - -gText_BadlyStartleCuteAppeals:: - .string "Badly startles POKéMON\n" - .string "that made CUTE appeals.$" - -gText_BadlyStartleSmartAppeals:: - .string "Badly startles POKéMON\n" - .string "that made SMART appeals.$" - -gText_BadlyStartleToughAppeals:: - .string "Badly startles POKéMON\n" - .string "that made TOUGH appeals.$" - -gText_MakeMonAfterUserNervous:: - .string "Makes one POKéMON after\n" - .string "the user nervous.$" - -gText_MakeAllMonsAfterUserNervous:: - .string "Makes all POKéMON after\n" - .string "the user nervous.$" - -gText_WorsenConditionOfThoseMadeAppeals:: - .string "Worsens the condition of\n" - .string "those that made appeals.$" - -gText_BadlyStartleMonsGoodCondition:: - .string "Badly startles POKéMON in\n" - .string "good condition.$" - -gText_AppealGreatIfPerformedFirst:: - .string "The appeal works great if\n" - .string "performed first.$" - -gText_AppealGreatIfPerformedLast:: - .string "The appeal works great if\n" - .string "performed last.$" - -gText_AppealAsGoodAsThoseBeforeIt:: - .string "Makes the appeal as good\n" - .string "as those before it.$" - -gText_AppealAsGoodAsOneBeforeIt:: - .string "Makes the appeal as good\n" - .string "as the one before it.$" - -gText_AppealBetterLaterItsPerformed:: - .string "The appeal works better\n" - .string "the later it is performed.$" - -gText_AppealVariesDependingOnTiming:: - .string "The appeal's quality varies\n" - .string "depending on its timing.$" - -gText_WorksWellIfSameTypeAsBefore:: - .string "Works well if it's the same\n" - .string "type as the one before.$" - -gText_WorksWellIfDifferentTypeAsBefore:: - .string "Works well if different in\n" - .string "type than the one before.$" - -gText_AffectedByAppealInFront:: - .string "Affected by how well the\n" - .string "appeal in front goes.$" - -gText_UpsConditionHelpsPreventNervousness:: - .string "Ups the user's condition.\n" - .string "Helps prevent nervousness.$" - -gText_AppealWorksWellIfConditionGood:: - .string "The appeal works well if the\n" - .string "user's condition is good.$" - -gText_NextAppealMadeEarlier:: - .string "The next appeal can be\n" - .string "made earlier next turn.$" - -gText_NextAppealMadeLater:: - .string "The next appeal can be\n" - .string "made later next turn.$" - -gText_TurnOrderMoreEasilyScrambled:: - .string "Makes the next turn's order\n" - .string "more easily scrambled.$" - -gText_ScrambleOrderOfNextAppeals:: - .string "Scrambles the order of\n" - .string "appeals on the next turn.$" - -gText_AppealExcitesAudienceInAnyContest:: - .string "An appeal that excites the\n" - .string "audience in any CONTEST.$" - -gText_BadlyStartlesMonsGoodAppeals:: - .string "Badly startles all POKéMON\n" - .string "that made good appeals.$" - -gText_AppealBestMoreCrowdExcited:: - .string "The appeal works best the\n" - .string "more the crowd is excited.$" - -gText_TemporarilyStopCrowdExcited:: - .string "Temporarily stops the\n" - .string "crowd from growing excited.$" - -@ Unused move names - -gText_RainDance:: - .string "RAIN DANCE$" - -gText_Rage:: - .string "RAGE$" - -gText_FocusEnergy:: - .string "FOCUS ENERGY$" - -gText_Hypnosis:: - .string "HYPNOSIS$" - -gText_Softboiled:: - .string "SOFTBOILED$" - -gText_HornAttack:: - .string "HORN ATTACK$" - -gText_SwordsDance:: - .string "SWORDS DANCE$" - -gText_Conversion:: - .string "CONVERSION$" - -gText_SunnyDay:: - .string "SUNNY DAY$" - -gText_Rest2:: - .string "REST$" - -gText_Vicegrip:: - .string "VICEGRIP$" - -gText_DefenseCurl:: - .string "DEFENSE CURL$" - -gText_LockOn:: - .string "LOCK-ON$" - -@ Contest type names - -gContestMoveTypeCoolText:: - .string "COOL$" - -gContestMoveTypeBeautyText:: - .string "BEAUTY$" - -gContestMoveTypeCuteText:: - .string "CUTE$" - -gContestMoveTypeSmartText:: - .string "SMART$" - -gContestMoveTypeToughText:: - .string "TOUGH$" - gText_AppealNumWhichMoveWillBePlayed:: .string "Appeal no. {STR_VAR_1}!\n" .string "Which move will be played?$" @@ -269,176 +18,6 @@ gText_AllOutOfAppealTime:: .string "We're all out of\n" .string "Appeal Time!{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" -@ Unused appeal result texts - -gText_ButAppealWasJammed:: - .string "But the appeal was\n" - .string "jammed.$" - -gText_FollowedAnotherMonsLead:: - .string "It followed another\n" - .string "POKéMON's lead.$" - -gText_ButItMessedUp:: - .string "But it messed up.$" - -gText_WentBetterThanUsual:: - .string "It went better than\n" - .string "usual.$" - -gText_JudgeLookedAwayForSomeReason:: - .string "The JUDGE looked away\n" - .string "for some reason.$" - -gText_WorkedHardToBuildOnPastMistakes:: - .string "It worked hard to build on\n" - .string "past mistakes.$" - -gText_CantMakeAnyMoreMoves:: - .string "It can't make any more\n" - .string "moves.$" - -gText_WorkedFrighteninglyWell:: - .string "It worked frighteningly\n" - .string "well.$" - -gText_WorkedHardAsStandoutMon:: - .string "It worked as hard as the\n" - .string "standout POKéMON.$" - -gText_JudgedLookedOnExpectantly:: - .string "The JUDGE looked on\n" - .string "expectantly.$" - -gText_WorkedRatherWell:: - .string "It worked rather well.$" - -gText_WorkedLittleBetterThanUsual:: - .string "It worked a little better\n" - .string "than usual.$" - -@ Round result texts - -gText_MonFailedToStandOutAtAll:: - .string "{STR_VAR_1} failed to\n" - .string "stand out at all…{PAUSE_UNTIL_PRESS}$" - -gText_MonDidntStandOutVeryMuch:: - .string "{STR_VAR_1} didn't stand\n" - .string "out very much…{PAUSE_UNTIL_PRESS}$" - -gText_MonCaughtALittleAttention:: - .string "{STR_VAR_1} caught a\n" - .string "little attention.{PAUSE_UNTIL_PRESS}$" - -gText_MonAttractedALotOfAttention:: - .string "{STR_VAR_1} attracted a\n" - .string "lot of attention.{PAUSE_UNTIL_PRESS}$" - -gText_MonCommandedTotalAttention:: - .string "{STR_VAR_1} commanded\n" - .string "total attention.{PAUSE_UNTIL_PRESS}$" - -gText_MonHasntMadeItsAppeal:: - .string "{STR_VAR_1} hasn't made\n" - .string "its appeal.{PAUSE_UNTIL_PRESS}$" - -@ Unused -gText_AnticipationSwelledForMonsAppealNext2:: - .string "Anticipation swelled for\n" - .string "{STR_VAR_1}'s appeal next.$" - -gText_EmptyContestString:: - .string "$" - -gText_JudgesViewsOnMonHeldFirm:: - .string "The JUDGE 's views on\n" - .string "{STR_VAR_1} held firm.$" - -gText_MonsXChangedPerceptions:: - .string "{STR_VAR_1}'s {STR_VAR_3}\n" - .string "changed perceptions.$" - -gText_MonsAppealEffectWoreOff:: - .string "{STR_VAR_1}'s appeal\n" - .string "effect wore off.$" - -gText_SpecialAppealsEffectWoreOff:: - .string "The special appeal's\n" - .string "effect wore off.$" - -gText_EveryonesAppealsMadeToLookSame:: - .string "Everyone's appeals were\n" - .string "made to look the same.$" - -gText_CheapenedMonsAppeal:: - .string "It cheapened\n" - .string "{STR_VAR_2}'s appeal.$" - -gText_CheapenedAppealOfThoseAhead:: - .string "It cheapened the appeal\n" - .string "of those ahead.$" - -gText_StoleAttentionAwayFromMon:: - .string "It stole attention away\n" - .string "from {STR_VAR_2}.$" - -gText_CheapenedMonsAppeal2:: - .string "It cheapened\n" - .string "{STR_VAR_2}'s appeal.$" - -gText_SeverelyCheapenedOtherAppeals:: - .string "It severely cheapened\n" - .string "other appeals.$" - -gText_AnticipationSwelledForMonsAppealNext:: - .string "Anticipation swelled for\n" - .string "{STR_VAR_1}'s appeal next.$" - -gText_CheapenedAppealOfThoseAhead2:: - .string "It cheapened the appeal\n" - .string "of those ahead.$" - -gText_CheapenedJudgesFavoriteAppeal:: - .string "It cheapened the JUDGE's\n" - .string "favorite appeal.$" - -gText_AppealsOfOthersCheapenedByHalf:: - .string "The appeals of others\n" - .string "were cheapened by half.$" - -gText_StoodOutToMakeUpForBeingJammed:: - .string "It stood out to make up\n" - .string "for being jammed.$" - -gText_CantParticipateInAppealsAnyMore:: - .string "It can't participate in\n" - .string "appeals any more.$" - -gText_TouchedJudgeForFantasticAppeal:: - .string "It touched the JUDGE for\n" - .string "a fantastic appeal.$" - -gText_AnticipationRoseForUpcomingAppeals:: - .string "Anticipation rose for\n" - .string "upcoming appeals.$" - -gText_StoodOutAsMuchAsSpecialAppeals:: - .string "It stood out as much as\n" - .string "special appeals.$" - -gText_StoodOutAsMuchAsMon:: - .string "It stood out as much as\n" - .string "{STR_VAR_1}.$" - -gText_JammedAppealsMadeEvenLessNoticeable:: - .string "Jammed appeals were made\n" - .string "even less noticeable.$" - -gText_EveryonesAppealsMadeSame:: - .string "Everyone's appeals were\n" - .string "made the same.$" - @ Appeal result texts gText_BecameMoreConsciousOfOtherMons:: @@ -733,40 +312,3 @@ gText_Contest_Hesitancy:: gText_Contest_Fear:: .string "fear$" - -gText_Contest_Coolness:: - .string "coolness$" - -gText_Contest_Beauty:: - .string "beauty$" - -gText_Contest_Cuteness:: - .string "cuteness$" - -gText_Contest_Smartness:: - .string "smartness$" - -gText_Contest_Toughness:: - .string "toughness$" - -@ Unused -gText_Tension:: - .string "TENSION$" - -gText_CoolMove:: - .string "COOL Move$" - -gText_BeautyMove:: - .string "BEAUTY Move$" - -gText_CuteMove:: - .string "CUTE Move$" - -gText_SmartMove:: - .string "SMART Move$" - -gText_ToughMove:: - .string "TOUGH Move$" - -gText_3QuestionMarks:: - .string "???$" diff --git a/src/contest.c b/src/contest.c index 61f69e1856..ba63b8073a 100644 --- a/src/contest.c +++ b/src/contest.c @@ -688,6 +688,97 @@ static const u16 sText_Pal[] = INCBIN_U16("graphics/contest/text.gbapal"); #include "data/contest_text_tables.h" +const u8 *const gContestEffectDescriptionPointers[] = +{ + [CONTEST_EFFECT_HIGHLY_APPEALING] = COMPOUND_STRING("A highly appealing move."), + [CONTEST_EFFECT_USER_MORE_EASILY_STARTLED] = COMPOUND_STRING("After this move, the user is\nmore easily startled."), + [CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES] = COMPOUND_STRING("Makes a great appeal, but\nallows no more to the end."), + [CONTEST_EFFECT_REPETITION_NOT_BORING] = COMPOUND_STRING("Can be repeatedly used\nwithout boring the JUDGE."), + [CONTEST_EFFECT_AVOID_STARTLE_ONCE] = COMPOUND_STRING("Can avoid being startled\nby others once."), + [CONTEST_EFFECT_AVOID_STARTLE] = COMPOUND_STRING("Can avoid being startled\nby others."), + [CONTEST_EFFECT_AVOID_STARTLE_SLIGHTLY] = COMPOUND_STRING("Can avoid being startled\nby others a little."), + [CONTEST_EFFECT_USER_LESS_EASILY_STARTLED] = COMPOUND_STRING("After this move, the user is\nless likely to be startled."), + [CONTEST_EFFECT_STARTLE_FRONT_MON] = COMPOUND_STRING("Slightly startles the\nPOKéMON in front."), + [CONTEST_EFFECT_SLIGHTLY_STARTLE_PREV_MONS] = COMPOUND_STRING("Slightly startles those\nthat have made appeals."), + [CONTEST_EFFECT_STARTLE_PREV_MON] = COMPOUND_STRING("Startles the POKéMON that\nappealed before the user."), + [CONTEST_EFFECT_STARTLE_PREV_MONS] = COMPOUND_STRING("Startles all POKéMON that\nhave done their appeals."), + [CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON] = COMPOUND_STRING("Badly startles the\nPOKéMON in front."), + [CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS] = COMPOUND_STRING("Badly startles those that\nhave made appeals."), + [CONTEST_EFFECT_STARTLE_PREV_MON_2] = COMPOUND_STRING("Startles the POKéMON that\nappealed before the user."), + [CONTEST_EFFECT_STARTLE_PREV_MONS_2] = COMPOUND_STRING("Startles all POKéMON that\nhave done their appeals."), + [CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION] = COMPOUND_STRING("Shifts the JUDGE's\nattention from others."), + [CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION] = COMPOUND_STRING("Startles the POKéMON that\nhas the JUDGE's attention."), + [CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN] = COMPOUND_STRING("Jams the others, and misses\none turn of appeals."), + [CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL] = COMPOUND_STRING("Startles POKéMON that\nmade a same-type appeal."), + [CONTEST_EFFECT_STARTLE_MONS_COOL_APPEAL] = COMPOUND_STRING("Badly startles POKéMON\nthat made COOL appeals."), + [CONTEST_EFFECT_STARTLE_MONS_BEAUTY_APPEAL] = COMPOUND_STRING("Badly startles POKéMON\nthat made BEAUTY appeals."), + [CONTEST_EFFECT_STARTLE_MONS_CUTE_APPEAL] = COMPOUND_STRING("Badly startles POKéMON\nthat made CUTE appeals."), + [CONTEST_EFFECT_STARTLE_MONS_SMART_APPEAL] = COMPOUND_STRING("Badly startles POKéMON\nthat made SMART appeals."), + [CONTEST_EFFECT_STARTLE_MONS_TOUGH_APPEAL] = COMPOUND_STRING("Badly startles POKéMON\nthat made TOUGH appeals."), + [CONTEST_EFFECT_MAKE_FOLLOWING_MON_NERVOUS] = COMPOUND_STRING("Makes one POKéMON after\nthe user nervous."), + [CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS] = COMPOUND_STRING("Makes all POKéMON after\nthe user nervous."), + [CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS] = COMPOUND_STRING("Worsens the condition of\nthose that made appeals."), + [CONTEST_EFFECT_BADLY_STARTLES_MONS_IN_GOOD_CONDITION] = COMPOUND_STRING("Badly startles POKéMON in\ngood condition."), + [CONTEST_EFFECT_BETTER_IF_FIRST] = COMPOUND_STRING("The appeal works great if\nperformed first."), + [CONTEST_EFFECT_BETTER_IF_LAST] = COMPOUND_STRING("The appeal works great if\nperformed last."), + [CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES] = COMPOUND_STRING("Makes the appeal as good\nas those before it."), + [CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE] = COMPOUND_STRING("Makes the appeal as good\nas the one before it."), + [CONTEST_EFFECT_BETTER_WHEN_LATER] = COMPOUND_STRING("The appeal works better\nthe later it is performed."), + [CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING] = COMPOUND_STRING("The appeal's quality varies\ndepending on its timing."), + [CONTEST_EFFECT_BETTER_IF_SAME_TYPE] = COMPOUND_STRING("Works well if it's the same\ntype as the one before."), + [CONTEST_EFFECT_BETTER_IF_DIFF_TYPE] = COMPOUND_STRING("Works well if different in\ntype than the one before."), + [CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL] = COMPOUND_STRING("Affected by how well the\nappeal in front goes."), + [CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS] = COMPOUND_STRING("Ups the user's condition.\nHelps prevent nervousness."), + [CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION] = COMPOUND_STRING("The appeal works well if the\nuser's condition is good."), + [CONTEST_EFFECT_NEXT_APPEAL_EARLIER] = COMPOUND_STRING("The next appeal can be\nmade earlier next turn."), + [CONTEST_EFFECT_NEXT_APPEAL_LATER] = COMPOUND_STRING("The next appeal can be\nmade later next turn."), + [CONTEST_EFFECT_MAKE_SCRAMBLING_TURN_ORDER_EASIER] = COMPOUND_STRING("Makes the next turn's order\nmore easily scrambled."), + [CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER] = COMPOUND_STRING("Scrambles the order of\nappeals on the next turn."), + [CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST] = COMPOUND_STRING("An appeal that excites the\naudience in any CONTEST."), + [CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS] = COMPOUND_STRING("Badly startles all POKéMON\nthat made good appeals."), + [CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED] = COMPOUND_STRING("The appeal works best the\nmore the crowd is excited."), + [CONTEST_EFFECT_DONT_EXCITE_AUDIENCE] = COMPOUND_STRING("Temporarily stops the\ncrowd from growing excited."), +}; + +const u8 *const gContestMoveTypeTextPointers[] = +{ + [CONTEST_CATEGORY_COOL] = COMPOUND_STRING("COOL"), + [CONTEST_CATEGORY_BEAUTY] = COMPOUND_STRING("BEAUTY"), + [CONTEST_CATEGORY_CUTE] = COMPOUND_STRING("CUTE"), + [CONTEST_CATEGORY_SMART] = COMPOUND_STRING("SMART"), + [CONTEST_CATEGORY_TOUGH] = COMPOUND_STRING("TOUGH"), +}; + +static const u8 *const sContestConditions[] = +{ + [CONTEST_CATEGORY_COOL] = COMPOUND_STRING("coolness"), + [CONTEST_CATEGORY_BEAUTY] = COMPOUND_STRING("beauty"), + [CONTEST_CATEGORY_CUTE] = COMPOUND_STRING("cuteness"), + [CONTEST_CATEGORY_SMART] = COMPOUND_STRING("smartness"), + [CONTEST_CATEGORY_TOUGH] = COMPOUND_STRING("toughness"), +}; + +static const u8 *const sInvalidContestMoveNames[] = +{ + [CONTEST_CATEGORY_COOL] = COMPOUND_STRING("COOL Move"), + [CONTEST_CATEGORY_BEAUTY] = COMPOUND_STRING("BEAUTY Move"), + [CONTEST_CATEGORY_CUTE] = COMPOUND_STRING("CUTE Move"), + [CONTEST_CATEGORY_SMART] = COMPOUND_STRING("SMART Move"), + [CONTEST_CATEGORY_TOUGH] = COMPOUND_STRING("TOUGH Move"), + [CONTEST_CATEGORIES_COUNT] = COMPOUND_STRING("???"), +}; + +// Takes the .attentionLevel of a contestant as an index. +static const u8 *const sRoundResultTexts[] = +{ + COMPOUND_STRING("{STR_VAR_1} failed to\nstand out at all…{PAUSE_UNTIL_PRESS}"), + COMPOUND_STRING("{STR_VAR_1} didn't stand\nout very much…{PAUSE_UNTIL_PRESS}"), + COMPOUND_STRING("{STR_VAR_1} caught a\nlittle attention.{PAUSE_UNTIL_PRESS}"), + COMPOUND_STRING("{STR_VAR_1} attracted a\nlot of attention.{PAUSE_UNTIL_PRESS}"), + COMPOUND_STRING("{STR_VAR_1} commanded\ntotal attention.{PAUSE_UNTIL_PRESS}"), + COMPOUND_STRING("{STR_VAR_1} hasn't made\nits appeal.{PAUSE_UNTIL_PRESS}"), +}; + static const struct BgTemplate sContestBgTemplates[] = { { diff --git a/src/data/contest_text_tables.h b/src/data/contest_text_tables.h index 64ad704a59..3560b2af04 100644 --- a/src/data/contest_text_tables.h +++ b/src/data/contest_text_tables.h @@ -1,123 +1,5 @@ - #include "global.h" -// gContestEffectDescriptionPointers -extern const u8 gText_HighlyAppealingMove[]; -extern const u8 gText_UserMoreEasilyStartled[]; -extern const u8 gText_GreatAppealButNoMoreToEnd[]; -extern const u8 gText_UsedRepeatedlyWithoutBoringJudge[]; -extern const u8 gText_AvoidStartledByOthersOnce[]; -extern const u8 gText_AvoidStartledByOthers[]; -extern const u8 gText_AvoidStartledByOthersLittle[]; -extern const u8 gText_UserLessLikelyStartled[]; -extern const u8 gText_SlightlyStartleFrontMon[]; -extern const u8 gText_SlightlyStartleAppealed[]; -extern const u8 gText_StartleAppealedBeforeUser[]; -extern const u8 gText_StartleAllAppealed[]; -extern const u8 gText_BadlyStartleFrontMon[]; -extern const u8 gText_BadlyStartleAppealed[]; -extern const u8 gText_StartleAppealedBeforeUser2[]; -extern const u8 gText_StartleAllAppealed2[]; -extern const u8 gText_ShiftJudgesAttentionFromOthers[]; -extern const u8 gText_StartleMonHasJudgesAttention[]; -extern const u8 gText_JamOthersMissesTurn[]; -extern const u8 gText_StartleMonsMadeSameTypeAppeal[]; -extern const u8 gText_BadlyStartleCoolAppeals[]; -extern const u8 gText_BadlyStartleBeautyAppeals[]; -extern const u8 gText_BadlyStartleCuteAppeals[]; -extern const u8 gText_BadlyStartleSmartAppeals[]; -extern const u8 gText_BadlyStartleToughAppeals[]; -extern const u8 gText_MakeMonAfterUserNervous[]; -extern const u8 gText_MakeAllMonsAfterUserNervous[]; -extern const u8 gText_WorsenConditionOfThoseMadeAppeals[]; -extern const u8 gText_BadlyStartleMonsGoodCondition[]; -extern const u8 gText_AppealGreatIfPerformedFirst[]; -extern const u8 gText_AppealGreatIfPerformedLast[]; -extern const u8 gText_AppealAsGoodAsThoseBeforeIt[]; -extern const u8 gText_AppealAsGoodAsOneBeforeIt[]; -extern const u8 gText_AppealBetterLaterItsPerformed[]; -extern const u8 gText_AppealVariesDependingOnTiming[]; -extern const u8 gText_WorksWellIfSameTypeAsBefore[]; -extern const u8 gText_WorksWellIfDifferentTypeAsBefore[]; -extern const u8 gText_AffectedByAppealInFront[]; -extern const u8 gText_UpsConditionHelpsPreventNervousness[]; -extern const u8 gText_AppealWorksWellIfConditionGood[]; -extern const u8 gText_NextAppealMadeEarlier[]; -extern const u8 gText_NextAppealMadeLater[]; -extern const u8 gText_TurnOrderMoreEasilyScrambled[]; -extern const u8 gText_ScrambleOrderOfNextAppeals[]; -extern const u8 gText_AppealExcitesAudienceInAnyContest[]; -extern const u8 gText_BadlyStartlesMonsGoodAppeals[]; -extern const u8 gText_AppealBestMoreCrowdExcited[]; -extern const u8 gText_TemporarilyStopCrowdExcited[]; - -// sUnusedComboMoveNameTexts -extern const u8 gText_RainDance[]; -extern const u8 gText_Rage[]; -extern const u8 gText_FocusEnergy[]; -extern const u8 gText_Hypnosis[]; -extern const u8 gText_Softboiled[]; -extern const u8 gText_HornAttack[]; -extern const u8 gText_SwordsDance[]; -extern const u8 gText_Conversion[]; -extern const u8 gText_SunnyDay[]; -extern const u8 gText_Rest2[]; -extern const u8 gText_Vicegrip[]; -extern const u8 gText_DefenseCurl[]; -extern const u8 gText_LockOn[]; - -// gContestMoveTypeTextPointers -extern const u8 gContestMoveTypeCoolText[]; -extern const u8 gContestMoveTypeBeautyText[]; -extern const u8 gContestMoveTypeCuteText[]; -extern const u8 gContestMoveTypeSmartText[]; -extern const u8 gContestMoveTypeToughText[]; - -// sUnusedAppealResultTexts -extern const u8 gText_ButAppealWasJammed[]; -extern const u8 gText_FollowedAnotherMonsLead[]; -extern const u8 gText_ButItMessedUp[]; -extern const u8 gText_WentBetterThanUsual[]; -extern const u8 gText_JudgeLookedAwayForSomeReason[]; -extern const u8 gText_WorkedHardToBuildOnPastMistakes[]; -extern const u8 gText_CantMakeAnyMoreMoves[]; -extern const u8 gText_WorkedFrighteninglyWell[]; -extern const u8 gText_WorkedHardAsStandoutMon[]; -extern const u8 gText_JudgedLookedOnExpectantly[]; -extern const u8 gText_WorkedRatherWell[]; -extern const u8 gText_WorkedLittleBetterThanUsual[]; - -// sRoundResultTexts -extern const u8 gText_MonFailedToStandOutAtAll[]; -extern const u8 gText_MonDidntStandOutVeryMuch[]; -extern const u8 gText_MonCaughtALittleAttention[]; -extern const u8 gText_MonAttractedALotOfAttention[]; -extern const u8 gText_MonCommandedTotalAttention[]; -extern const u8 gText_MonHasntMadeItsAppeal[]; -extern const u8 gText_JudgesViewsOnMonHeldFirm[]; -extern const u8 gText_MonsXChangedPerceptions[]; -extern const u8 gText_EmptyContestString[]; -extern const u8 gText_MonsAppealEffectWoreOff[]; -extern const u8 gText_SpecialAppealsEffectWoreOff[]; -extern const u8 gText_EveryonesAppealsMadeToLookSame[]; -extern const u8 gText_CheapenedMonsAppeal[]; -extern const u8 gText_CheapenedMonsAppeal2[]; -extern const u8 gText_CheapenedAppealOfThoseAhead[]; -extern const u8 gText_CheapenedAppealOfThoseAhead2[]; -extern const u8 gText_StoleAttentionAwayFromMon[]; -extern const u8 gText_SeverelyCheapenedOtherAppeals[]; -extern const u8 gText_AnticipationSwelledForMonsAppealNext[]; -extern const u8 gText_CheapenedJudgesFavoriteAppeal[]; -extern const u8 gText_AppealsOfOthersCheapenedByHalf[]; -extern const u8 gText_StoodOutToMakeUpForBeingJammed[]; -extern const u8 gText_CantParticipateInAppealsAnyMore[]; -extern const u8 gText_TouchedJudgeForFantasticAppeal[]; -extern const u8 gText_AnticipationRoseForUpcomingAppeals[]; -extern const u8 gText_StoodOutAsMuchAsSpecialAppeals[]; -extern const u8 gText_StoodOutAsMuchAsMon[]; -extern const u8 gText_JammedAppealsMadeEvenLessNoticeable[]; -extern const u8 gText_EveryonesAppealsMadeSame[]; - // sAppealResultTexts extern const u8 gText_BecameMoreConsciousOfOtherMons[]; extern const u8 gText_MonCantMakeAnAppealAfterThis[]; @@ -182,21 +64,6 @@ extern const u8 gText_BadConditionResultedInWeakAppeal[]; extern const u8 gText_MonWasUnaffected[]; extern const u8 gText_AttractedCrowdsAttention[]; -// sContestConditions -extern const u8 gText_Contest_Coolness[]; -extern const u8 gText_Contest_Beauty[]; -extern const u8 gText_Contest_Cuteness[]; -extern const u8 gText_Contest_Smartness[]; -extern const u8 gText_Contest_Toughness[]; - -// sInvalidContestMoveNames -extern const u8 gText_CoolMove[]; -extern const u8 gText_BeautyMove[]; -extern const u8 gText_CuteMove[]; -extern const u8 gText_SmartMove[]; -extern const u8 gText_ToughMove[]; -extern const u8 gText_3QuestionMarks[]; - // Misc, used directly extern const u8 gText_MonAppealedWithMove[]; extern const u8 gText_MonCantAppealNextTurn[]; @@ -217,142 +84,6 @@ extern const u8 gText_Contest_Fear[]; extern const u8 gText_AppealNumWhichMoveWillBePlayed[]; extern const u8 gText_AppealNumButItCantParticipate[]; -const u8 *const gContestEffectDescriptionPointers[] = -{ - [CONTEST_EFFECT_HIGHLY_APPEALING] = gText_HighlyAppealingMove, - [CONTEST_EFFECT_USER_MORE_EASILY_STARTLED] = gText_UserMoreEasilyStartled, - [CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES] = gText_GreatAppealButNoMoreToEnd, - [CONTEST_EFFECT_REPETITION_NOT_BORING] = gText_UsedRepeatedlyWithoutBoringJudge, - [CONTEST_EFFECT_AVOID_STARTLE_ONCE] = gText_AvoidStartledByOthersOnce, - [CONTEST_EFFECT_AVOID_STARTLE] = gText_AvoidStartledByOthers, - [CONTEST_EFFECT_AVOID_STARTLE_SLIGHTLY] = gText_AvoidStartledByOthersLittle, - [CONTEST_EFFECT_USER_LESS_EASILY_STARTLED] = gText_UserLessLikelyStartled, - [CONTEST_EFFECT_STARTLE_FRONT_MON] = gText_SlightlyStartleFrontMon, - [CONTEST_EFFECT_SLIGHTLY_STARTLE_PREV_MONS] = gText_SlightlyStartleAppealed, - [CONTEST_EFFECT_STARTLE_PREV_MON] = gText_StartleAppealedBeforeUser, - [CONTEST_EFFECT_STARTLE_PREV_MONS] = gText_StartleAllAppealed, - [CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON] = gText_BadlyStartleFrontMon, - [CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS] = gText_BadlyStartleAppealed, - [CONTEST_EFFECT_STARTLE_PREV_MON_2] = gText_StartleAppealedBeforeUser2, - [CONTEST_EFFECT_STARTLE_PREV_MONS_2] = gText_StartleAllAppealed2, - [CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION] = gText_ShiftJudgesAttentionFromOthers, - [CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION] = gText_StartleMonHasJudgesAttention, - [CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN] = gText_JamOthersMissesTurn, - [CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL] = gText_StartleMonsMadeSameTypeAppeal, - [CONTEST_EFFECT_STARTLE_MONS_COOL_APPEAL] = gText_BadlyStartleCoolAppeals, - [CONTEST_EFFECT_STARTLE_MONS_BEAUTY_APPEAL] = gText_BadlyStartleBeautyAppeals, - [CONTEST_EFFECT_STARTLE_MONS_CUTE_APPEAL] = gText_BadlyStartleCuteAppeals, - [CONTEST_EFFECT_STARTLE_MONS_SMART_APPEAL] = gText_BadlyStartleSmartAppeals, - [CONTEST_EFFECT_STARTLE_MONS_TOUGH_APPEAL] = gText_BadlyStartleToughAppeals, - [CONTEST_EFFECT_MAKE_FOLLOWING_MON_NERVOUS] = gText_MakeMonAfterUserNervous, - [CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS] = gText_MakeAllMonsAfterUserNervous, - [CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS] = gText_WorsenConditionOfThoseMadeAppeals, - [CONTEST_EFFECT_BADLY_STARTLES_MONS_IN_GOOD_CONDITION] = gText_BadlyStartleMonsGoodCondition, - [CONTEST_EFFECT_BETTER_IF_FIRST] = gText_AppealGreatIfPerformedFirst, - [CONTEST_EFFECT_BETTER_IF_LAST] = gText_AppealGreatIfPerformedLast, - [CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES] = gText_AppealAsGoodAsThoseBeforeIt, - [CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE] = gText_AppealAsGoodAsOneBeforeIt, - [CONTEST_EFFECT_BETTER_WHEN_LATER] = gText_AppealBetterLaterItsPerformed, - [CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING] = gText_AppealVariesDependingOnTiming, - [CONTEST_EFFECT_BETTER_IF_SAME_TYPE] = gText_WorksWellIfSameTypeAsBefore, - [CONTEST_EFFECT_BETTER_IF_DIFF_TYPE] = gText_WorksWellIfDifferentTypeAsBefore, - [CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL] = gText_AffectedByAppealInFront, - [CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS] = gText_UpsConditionHelpsPreventNervousness, - [CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION] = gText_AppealWorksWellIfConditionGood, - [CONTEST_EFFECT_NEXT_APPEAL_EARLIER] = gText_NextAppealMadeEarlier, - [CONTEST_EFFECT_NEXT_APPEAL_LATER] = gText_NextAppealMadeLater, - [CONTEST_EFFECT_MAKE_SCRAMBLING_TURN_ORDER_EASIER] = gText_TurnOrderMoreEasilyScrambled, - [CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER] = gText_ScrambleOrderOfNextAppeals, - [CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST] = gText_AppealExcitesAudienceInAnyContest, - [CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS] = gText_BadlyStartlesMonsGoodAppeals, - [CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED] = gText_AppealBestMoreCrowdExcited, - [CONTEST_EFFECT_DONT_EXCITE_AUDIENCE] = gText_TemporarilyStopCrowdExcited -}; - -// Unreferenced array of pointers to move names. -// All of the moves except Conversion are combo starters, so this may have -// been an early list of combo starters. -static const u8 *const sUnusedComboMoveNameTexts[] = -{ - gText_RainDance, - gText_RainDance, - gText_Rage, - gText_FocusEnergy, - gText_Hypnosis, - gText_Softboiled, - gText_HornAttack, - gText_SwordsDance, - gText_Conversion, - gText_SunnyDay, - gText_Rest2, - gText_Vicegrip, - gText_DefenseCurl, - gText_LockOn -}; - -const u8 *const gContestMoveTypeTextPointers[] = -{ - [CONTEST_CATEGORY_COOL] = gContestMoveTypeCoolText, - [CONTEST_CATEGORY_BEAUTY] = gContestMoveTypeBeautyText, - [CONTEST_CATEGORY_CUTE] = gContestMoveTypeCuteText, - [CONTEST_CATEGORY_SMART] = gContestMoveTypeSmartText, - [CONTEST_CATEGORY_TOUGH] = gContestMoveTypeToughText -}; - -static const u8 *const sUnusedAppealResultTexts[] = -{ - gText_ButAppealWasJammed, - gText_FollowedAnotherMonsLead, - gText_ButItMessedUp, - gText_WentBetterThanUsual, - gText_WentBetterThanUsual, - gText_JudgeLookedAwayForSomeReason, - gText_WorkedHardToBuildOnPastMistakes, - gText_CantMakeAnyMoreMoves, - gText_WorkedFrighteninglyWell, - gText_WorkedHardAsStandoutMon, - gText_JudgedLookedOnExpectantly, - gText_WorkedRatherWell, - gText_WorkedLittleBetterThanUsual -}; - -// Takes the .attentionLevel of a contestant as an index. Only 0-5 are used -static const u8 *const sRoundResultTexts[] = -{ - gText_MonFailedToStandOutAtAll, - gText_MonDidntStandOutVeryMuch, - gText_MonCaughtALittleAttention, - gText_MonAttractedALotOfAttention, - gText_MonCommandedTotalAttention, - gText_MonHasntMadeItsAppeal, - gText_JudgesViewsOnMonHeldFirm, // here below unused - gText_MonsXChangedPerceptions, - gText_EmptyContestString, - gText_MonsAppealEffectWoreOff, - gText_SpecialAppealsEffectWoreOff, - gText_EveryonesAppealsMadeToLookSame, - gText_CheapenedMonsAppeal, - gText_CheapenedAppealOfThoseAhead, - gText_StoleAttentionAwayFromMon, - gText_CheapenedMonsAppeal2, - gText_SeverelyCheapenedOtherAppeals, - gText_AnticipationSwelledForMonsAppealNext, - gText_CheapenedAppealOfThoseAhead2, - gText_CheapenedJudgesFavoriteAppeal, - gText_AppealsOfOthersCheapenedByHalf, - gText_StoodOutToMakeUpForBeingJammed, - gText_CantParticipateInAppealsAnyMore, - gText_TouchedJudgeForFantasticAppeal, - gText_AnticipationRoseForUpcomingAppeals, - gText_StoodOutAsMuchAsSpecialAppeals, - gText_StoodOutAsMuchAsMon, - gText_EmptyContestString, - gText_EmptyContestString, - gText_EmptyContestString, - gText_JammedAppealsMadeEvenLessNoticeable, - gText_EveryonesAppealsMadeSame -}; - static const u8 *const sAppealResultTexts[] = { [CONTEST_STRING_MORE_CONSCIOUS] = gText_BecameMoreConsciousOfOtherMons, @@ -418,22 +149,3 @@ static const u8 *const sAppealResultTexts[] = [CONTEST_STRING_UNAFFECTED] = gText_MonWasUnaffected, [CONTEST_STRING_ATTRACTED_ATTENTION] = gText_AttractedCrowdsAttention }; - -static const u8 *const sContestConditions[] = -{ - [CONTEST_CATEGORY_COOL] = gText_Contest_Coolness, - [CONTEST_CATEGORY_BEAUTY] = gText_Contest_Beauty, - [CONTEST_CATEGORY_CUTE] = gText_Contest_Cuteness, - [CONTEST_CATEGORY_SMART] = gText_Contest_Smartness, - [CONTEST_CATEGORY_TOUGH] = gText_Contest_Toughness -}; - -static const u8 *const sInvalidContestMoveNames[] = -{ - [CONTEST_CATEGORY_COOL] = gText_CoolMove, - [CONTEST_CATEGORY_BEAUTY] = gText_BeautyMove, - [CONTEST_CATEGORY_CUTE] = gText_CuteMove, - [CONTEST_CATEGORY_SMART] = gText_SmartMove, - [CONTEST_CATEGORY_TOUGH] = gText_ToughMove, - [CONTEST_CATEGORIES_COUNT] = gText_3QuestionMarks -};