Move strings.s to src
This commit is contained in:
GriffinR
+1
-1
@@ -1027,7 +1027,7 @@ static void CreateNormalContextMenu(u8 taskId)
|
||||
Menu_InitCursor(windowId, 2, 0, 2, GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT) + 2, sContextMenuNumOptions, 0);
|
||||
windowId2 = GetOrCreateVariableWindow(6);
|
||||
CopySelectedListMenuItemName(data[1], gStringVar1);
|
||||
StringExpandPlaceholders(gStringVar4, gOtherText_StrVar1);
|
||||
StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected);
|
||||
BerryPouchPrint(windowId2, 2, gStringVar4, 0, 2, 1, 2, 0, 1);
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,125 @@
|
||||
const u8 gText_QuestLog_PreviouslyOnYourQuest[] = _("Previously on your quest…");
|
||||
const u8 gText_QuestLog_SwitchMon1WithMon2[] = _("{PLAYER} switched the POKéMON\n{STR_VAR_1} with {STR_VAR_2}.");
|
||||
const u8 gText_QuestLog_SwappedHeldItemsOnMon[] = _("Took the item {STR_VAR_2} from\n{STR_VAR_1} and gave it the item\n{STR_VAR_3} to hold.");
|
||||
const u8 gText_QuestLog_TookHeldItemFromMon[] = _("Took the item {STR_VAR_2} from\n{STR_VAR_1}.");
|
||||
const u8 gText_QuestLog_UsedItemOnMonAtThisLocation[] = _("Used the item {STR_VAR_1} on {STR_VAR_2}\nat this location.");
|
||||
const u8 gText_QuestLog_UsedTheItem[] = _("{PLAYER} used the\n{STR_VAR_1}.");
|
||||
const u8 gText_QuestLog_UsedTheKeyItem[] = _("Used the item {STR_VAR_1}, which was\nin the KEY ITEMS POCKET.");
|
||||
const u8 gText_QuestLog_MonLearnedMoveFromTM[] = _("{STR_VAR_1} learned the move\n{STR_VAR_2} from a TM.");
|
||||
const u8 gText_QuestLog_MonReplacedMoveWithTM[] = _("{STR_VAR_1} learned the move\n{STR_VAR_2} from a TM and forgot\nthe move {STR_VAR_3}.");
|
||||
const u8 gText_QuestLog_MonsWereFullyRestoredAtCenter[] = _("POKéMON were fully restored\nat a POKéMON CENTER.");
|
||||
const u8 gText_QuestLog_PlayerBattledChampionRival[] = _("{DYNAMIC 0x00} had a marvelous battle\nwith the CHAMPION, {DYNAMIC 0x01}.");
|
||||
const u8 gText_QuestLog_PlayerSentOutMon1RivalSentOutMon2[] = _("In the end, {DYNAMIC 0x00} sent out {DYNAMIC 0x01}\nwhile {DYNAMIC 0x02} countered with\n{DYNAMIC 0x03}.");
|
||||
const u8 gText_QuestLog_WonTheMatchAsAResult[] = _("And, as a result of battling with every\nbit of power, {DYNAMIC 0x00} won\nthe match.");
|
||||
const u8 gText_QuestLog_StoredItemInPC[] = _("Removed the item {STR_VAR_1} from\nthe BAG's ITEMS POCKET and stored it\non the PC.");
|
||||
const u8 gText_QuestLog_WithdrewItemFromPC[] = _("{PLAYER} withdrew the item {STR_VAR_1}\nfrom the PC.");
|
||||
const u8 gText_QuestLog_TradedMon1ForPersonsMon2[] = _("Traded {STR_VAR_3} in exchange for\n{STR_VAR_1}'s {STR_VAR_2}.");
|
||||
const u8 gText_QuestLog_SingleBattleWithPersonResultedInOutcome[] = _("Took on {DYNAMIC 0x00} in a SINGLE BATTLE.\nIt was a hotly contested match that\nresulted in a {DYNAMIC 0x01}.");
|
||||
const u8 gText_QuestLog_DoubleBattleWithPersonResultedInOutcome[] = _("Took on {DYNAMIC 0x00} in a DOUBLE BATTLE.\nIt was an extended match that resulted\nin a {DYNAMIC 0x01}.");
|
||||
const u8 gText_QuestLog_MultiBattleWithPeopleResultedInOutcome[] = _("{DYNAMIC 0x00} and {DYNAMIC 0x01} took on\n{DYNAMIC 0x02} and {DYNAMIC 0x03} in a\nMULTI BATTLE and got a {DYNAMIC 0x04}.");
|
||||
const u8 gText_QuestLog_Win[] = _("win");
|
||||
const u8 gText_QuestLog_Loss[] = _("loss");
|
||||
const u8 gText_QuestLog_MingledInUnionRoom[] = _("Mingled with other TRAINERS in\nthe UNION ROOM.");
|
||||
const u8 gText_QuestLog_DepartedPlaceInTownForNextDestination[] = _("Departed {STR_VAR_2}\nin {STR_VAR_1} for the next\ndestination.");
|
||||
const u8 gText_QuestLog_SwitchedMonsBetweenBoxes[] = _("After consideration, switched\n{DYNAMIC 0x01} in {DYNAMIC 0x00} with\n{DYNAMIC 0x03} in {DYNAMIC 0x02}.");
|
||||
const u8 gText_QuestLog_MovedMonToNewBox[] = _("After deep thought, switched\n{DYNAMIC 0x01} in BOX “{DYNAMIC 0x00}” to\nthe BOX “{DYNAMIC 0x02}.”");
|
||||
const u8 gText_QuestLog_SwitchedMonsWithinBox[] = _("Switched around {DYNAMIC 0x01} and\n{DYNAMIC 0x02} in {DYNAMIC 0x00}.");
|
||||
const u8 gText_QuestLog_MovedMonWithinBox[] = _("Moved {DYNAMIC 0x01} in {DYNAMIC 0x00}.");
|
||||
const u8 gText_QuestLog_SwitchedPartyMonForPCMon[] = _("Switched {DYNAMIC 0x01} in {DYNAMIC 0x00}\nwith {DYNAMIC 0x02} in the party.");
|
||||
const u8 gText_QuestLog_WithdrewMonFromPC[] = _("Added {DYNAMIC 0x01} in {DYNAMIC 0x00}\nto the party.");
|
||||
const u8 gText_QuestLog_DepositedMonInPC[] = _("Moved {DYNAMIC 0x00} from the party\nto {DYNAMIC 0x01}.");
|
||||
const u8 gText_QuestLog_SwitchedMultipleMons[] = _("Moved a group of POKéMON in\n{DYNAMIC 0x00} to {DYNAMIC 0x01}.");
|
||||
const u8 gText_QuestLog_ADifferentSpot[] = _("a different spot");
|
||||
const u8 gText_QuestLog_GaveMonHeldItemFromPC[] = _("Removed the item {STR_VAR_1} from\n{PLAYER}'s PC and gave it to {STR_VAR_2}\nto hold.");
|
||||
const u8 gText_QuestLog_SwappedHeldItemFromPC[] = _("Removed the item {STR_VAR_1} from\na PC, gave it to {STR_VAR_2}, and put\nthe {STR_VAR_3} it held in the BAG.");
|
||||
const u8 gText_QuestLog_ChattedWithManyTrainers[] = _("Chatted with many TRAINERS.");
|
||||
const u8 gText_QuestLog_Handily[] = _("handily");
|
||||
const u8 gText_QuestLog_Tenaciously[] = _("tenaciously");
|
||||
const u8 gText_QuestLog_Somehow[] = _("somehow");
|
||||
const u8 gText_QuestLog_TradedMon1ForTrainersMon2[] = _("Met and traded with {STR_VAR_1}.\nObtained the TRAINER's {STR_VAR_2} in\nexchange for {STR_VAR_3}.");
|
||||
const u8 gText_QuestLog_BattledTrainerEndedInOutcome[] = _("Met and battled {STR_VAR_1}.\nThe match ended in a {STR_VAR_2}.");
|
||||
const u8 gText_QuestLog_BoughtItem[] = _("Went to the POKéMON MART in\n{DYNAMIC 0x00} and bought one \n{DYNAMIC 0x01}.");
|
||||
const u8 gText_QuestLog_BoughtItemsIncludingItem[] = _("Went to the POKéMON MART in\n{DYNAMIC 0x00} and spent ¥{DYNAMIC 0x02} for\nitems including {DYNAMIC 0x01}(s).");
|
||||
const u8 gText_QuestLog_SoldNumOfItem[] = _("{DYNAMIC 0x00} went to the POKéMON MART in\n{DYNAMIC 0x01} and sold {DYNAMIC 0x03} of\nthe item {DYNAMIC 0x02}.");
|
||||
const u8 gText_QuestLog_SoldItemsIncludingItem[] = _("Sold items including {DYNAMIC 0x01} at\nthe POKéMON MART in {DYNAMIC 0x00},\nworth ¥{DYNAMIC 0x02}.");
|
||||
const u8 gText_QuestLog_JustOne[] = _("just one");
|
||||
const u8 gText_QuestLog_Num[] = _("{DYNAMIC 0x04}");
|
||||
const u8 gText_QuestLog_UsedSoftboiled[] = _("{STR_VAR_1} shared its HP using the move\nSOFTBOILED.");
|
||||
const u8 gText_QuestLog_UsedMilkDrink[] = _("{STR_VAR_1} shared its HP using the move\nMILK DRINK.");
|
||||
const u8 gText_QuestLog_MonLearnedMoveFromHM[] = _("{STR_VAR_1} securely learned the move\n{STR_VAR_2} using an HM.");
|
||||
const u8 gText_QuestLog_MonReplacedMoveWithHM[] = _("{STR_VAR_1} securely learned the move\n{STR_VAR_2} using an HM and forgot\nthe move {STR_VAR_3}.");
|
||||
const u8 gText_QuestLog_DefeatedWildMon[] = _("{DYNAMIC 0x05} managed to defeat the POKéMON\n{DYNAMIC 0x01} in {DYNAMIC 0x00}.");
|
||||
const u8 gText_QuestLog_DefeatedWildMons[] = _("Defeated {DYNAMIC 0x02} wild POKéMON including\n{DYNAMIC 0x01} in {DYNAMIC 0x00}.");
|
||||
const u8 gText_QuestLog_CaughtWildMon[] = _("{DYNAMIC 0x05} managed to catch the POKéMON\n{DYNAMIC 0x03} in {DYNAMIC 0x00}.");
|
||||
const u8 gText_QuestLog_CaughtWildMons[] = _("Threw POKé BALLS in a frenzy, catching\n{DYNAMIC 0x04} POKéMON including {DYNAMIC 0x03} here\nin {DYNAMIC 0x00}.");
|
||||
const u8 gText_QuestLog_DefeatedWildMonAndCaughtWildMon[] = _("{DYNAMIC 0x05} defeated the POKéMON\n{DYNAMIC 0x01} and caught one {DYNAMIC 0x03}\nin {DYNAMIC 0x00}.");
|
||||
const u8 gText_QuestLog_DefeatedWildMonAndCaughtWildMons[] = _("Defeated the POKéMON {DYNAMIC 0x01}\nand caught {DYNAMIC 0x04} POKéMON including\n{DYNAMIC 0x03} in {DYNAMIC 0x00}.");
|
||||
const u8 gText_QuestLog_DefeatedWildMonsAndCaughtWildMon[] = _("{DYNAMIC 0x05} defeated {DYNAMIC 0x02} POKéMON including\n{DYNAMIC 0x01} and caught one {DYNAMIC 0x03}\nin {DYNAMIC 0x00}.");
|
||||
const u8 gText_QuestLog_DefeatedWildMonsAndCaughtWildMons[] = _("Defeated {DYNAMIC 0x02} POKéMON including\n{DYNAMIC 0x01} and caught {DYNAMIC 0x04} POKéMON\nincluding {DYNAMIC 0x03} in {DYNAMIC 0x00}.");
|
||||
const u8 gText_QuestLog_GaveMonHeldItem[] = _("Made {STR_VAR_1} hold the item\n{STR_VAR_2}.");
|
||||
const u8 gText_QuestLog_GaveMonHeldItem2[] = _("{PLAYER} made {STR_VAR_1} hold the item\n{STR_VAR_2}.");
|
||||
const u8 gText_QuestLog_UsedCut[] = _("{STR_VAR_1} used the Hidden Move\nCUT here.");
|
||||
const u8 gText_QuestLog_UsedFly[] = _("{STR_VAR_1} used the Hidden Move\nFLY and flew to {STR_VAR_2}.");
|
||||
const u8 gText_QuestLog_UsedSurf[] = _("{STR_VAR_1} used the Hidden Move\nSURF and rode the waves.");
|
||||
const u8 gText_QuestLog_UsedStrength[] = _("{STR_VAR_1} used the Hidden Move\nSTRENGTH here.");
|
||||
const u8 gText_QuestLog_UsedFlash[] = _("{STR_VAR_1} used the Hidden Move\nFLASH and illuminated a pitch-black\ncave.");
|
||||
const u8 gText_QuestLog_UsedRockSmash[] = _("{STR_VAR_1} used the Hidden Move\nROCK SMASH here.");
|
||||
const u8 gText_QuestLog_UsedWaterfall[] = _("{STR_VAR_1} used the Hidden Move\nWATERFALL to scale a raging torrent."); // Unused
|
||||
const u8 gText_QuestLog_UsedDive[] = _("{STR_VAR_1}は ふかい ところを めざし\nひでんわざ\nダイビングを つかった！");
|
||||
const u8 gText_QuestLog_UsedDigInLocation[] = _("{STR_VAR_1} used DIG to escape from\n{STR_VAR_2}.");
|
||||
const u8 gText_QuestLog_UsedSweetScent[] = _("{STR_VAR_1} used SWEET SCENT to attract\nwild POKéMON.");
|
||||
const u8 gText_QuestLog_UsedTeleportToLocation[] = _("{STR_VAR_1} used TELEPORT, transporting\nthe party to {STR_VAR_2}'s\n{STR_VAR_3}.");
|
||||
const u8 gText_QuestLog_LeftTownsLocationForNextDestination[] = _("{PLAYER} left {STR_VAR_1}'s\n{STR_VAR_2} for the next\ndestination.");
|
||||
const u8 gText_QuestLog_PlayedGamesAtGameCorner[] = _("Played a lot of games at the ROCKET\nGAME CORNER in {STR_VAR_1}.");
|
||||
const u8 gText_QuestLog_RestedAtHome[] = _("{PLAYER} rested comfortably at home.");
|
||||
const u8 gText_QuestLog_LeftOaksLab[] = _("{PLAYER} left PROF. OAK's POKéMON\nRESEARCH LAB.");
|
||||
const u8 gText_QuestLog_GymWasFullOfToughTrainers[] = _("The GYM in {STR_VAR_1} was full of\ntough TRAINERS…\nPreparations had to be made.");
|
||||
const u8 gText_QuestLog_DepartedGym[] = _("Departed the GYM in {STR_VAR_1}.");
|
||||
const u8 gText_QuestLog_HadGreatTimeInSafariZone[] = _("{PLAYER} had a great time with POKéMON\nin the SAFARI ZONE.");
|
||||
const u8 gText_QuestLog_ManagedToGetOutOfLocation[] = _("Managed to get out of {STR_VAR_2}\nafter wandering about.");
|
||||
const u8 gText_QuestLog_TookOnGymLeadersMonWithMonAndWon[] = _("Took on {DYNAMIC 0x00} GYM LEADER\n{DYNAMIC 0x01}'s {DYNAMIC 0x02} with {DYNAMIC 0x03}\nand won {DYNAMIC 0x04}!");
|
||||
const u8 gText_QuestLog_TookOnEliteFoursMonWithMonAndWon[] = _("Took on ELITE FOUR {DYNAMIC 0x00}'s\n{DYNAMIC 0x01} with {DYNAMIC 0x02} and\nwon {DYNAMIC 0x03}!");
|
||||
const u8 gText_QuestLog_TookOnTrainersMonWithMonAndWon[] = _("In {DYNAMIC 0x00}, took on\n{DYNAMIC 0x01}'s {DYNAMIC 0x02} with {DYNAMIC 0x03}\nand won {DYNAMIC 0x04}!");
|
||||
const u8 gText_QuestLog_Coolly[] = _("coolly");
|
||||
const u8 gText_QuestLog_Barely[] = _("barely");
|
||||
const u8 gText_QuestLog_UsedEscapeRope[] = _("{PLAYER} used an ESCAPE ROPE to get\nout from {STR_VAR_2}.");
|
||||
const u8 gText_QuestLog_Draw[] = _("draw");
|
||||
const u8 gText_QuestLog_DepartedTheLocationForNextDestination[] = _("Departed from the {STR_VAR_2}\nfor the next destination.");
|
||||
const u8 gText_QuestLog_DepartedFromLocationToNextDestination[] = _("{PLAYER} departed from\n{STR_VAR_2} and made way\nto the next destination.");
|
||||
const u8 gText_QuestLog_ObtainedItemInLocation[] = _("Here in {STR_VAR_1}, {PLAYER}\nobtained the item {STR_VAR_2}.");
|
||||
const u8 gText_QuestLog_ArrivedInLocation[] = _("Arrived in {STR_VAR_1}.");
|
||||
const u8 gText_QuestLog_SavedGameAtLocation[] = _("And {PLAYER} saved the game at this\nlocation: {STR_VAR_1}.");
|
||||
const u8 gText_QuestLog_Home[] = _("HOME");
|
||||
const u8 gText_QuestLog_OakResearchLab[] = _("OAK RESEARCH LAB");
|
||||
const u8 gText_QuestLog_Gym[] = _("GYM");
|
||||
const u8 gText_QuestLog_PokemonLeagueGate[] = _("POKéMON LEAGUE GATE");
|
||||
const u8 gText_QuestLog_ViridianForest[] = _("VIRIDIAN FOREST");
|
||||
const u8 gText_QuestLog_PewterMuseumOfScience[] = _("PEWTER MUSEUM OF SCIENCE");
|
||||
const u8 gText_QuestLog_MtMoon[] = _("MT. MOON");
|
||||
const u8 gText_QuestLog_BikeShop[] = _("BIKE SHOP");
|
||||
const u8 gText_QuestLog_BillsHouse[] = _("BILL'S HOUSE");
|
||||
const u8 gText_QuestLog_DayCare[] = _("DAY CARE");
|
||||
const u8 gText_QuestLog_UndergroundPath[] = _("UNDERGROUND PATH");
|
||||
const u8 gText_QuestLog_PokemonFanClub[] = _("POKéMON FAN CLUB");
|
||||
const u8 gText_QuestLog_SSAnne[] = _("S.S. ANNE");
|
||||
const u8 gText_QuestLog_DiglettsCave[] = _("DIGLETT'S CAVE");
|
||||
const u8 gText_QuestLog_RockTunnel[] = _("ROCK TUNNEL");
|
||||
const u8 gText_QuestLog_PowerPlant[] = _("POWER PLANT");
|
||||
const u8 gText_QuestLog_PokemonTower[] = _("POKéMON TOWER");
|
||||
const u8 gText_QuestLog_VolunteerHouse[] = _("VOLUNTEER HOUSE");
|
||||
const u8 gText_QuestLog_NameRatersHouse[] = _("NAME RATER'S HOUSE");
|
||||
const u8 gText_QuestLog_CeladonDeptStore[] = _("CELADON DEPT. STORE");
|
||||
const u8 gText_QuestLog_CeladonMansion[] = _("CELADON MANSION");
|
||||
const u8 gText_QuestLog_RocketGameCorner[] = _("ROCKET GAME CORNER");
|
||||
const u8 gText_QuestLog_Restaurant[] = _("RESTAURANT");
|
||||
const u8 gText_QuestLog_RocketHideout[] = _("ROCKET HIDEOUT");
|
||||
const u8 gText_QuestLog_SafariZone[] = _("SAFARI ZONE");
|
||||
const u8 gText_QuestLog_WardensHome[] = _("WARDEN'S HOME");
|
||||
const u8 gText_QuestLog_FightingDojo[] = _("FIGHTING DOJO");
|
||||
const u8 gText_QuestLog_SilphCo[] = _("SILPH CO.");
|
||||
const u8 gText_QuestLog_SeafoamIslands[] = _("SEAFOAM ISLANDS");
|
||||
const u8 gText_QuestLog_PokemonMansion[] = _("POKéMON MANSION");
|
||||
const u8 gText_QuestLog_PokemonResearchLab[] = _("POKéMON RESEARCH LAB");
|
||||
const u8 gText_QuestLog_VictoryRoad[] = _("VICTORY ROAD");
|
||||
const u8 gText_QuestLog_PokemonLeague[] = _("POKéMON LEAGUE");
|
||||
const u8 gText_QuestLog_CeruleanCave[] = _("CERULEAN CAVE");
|
||||
@@ -0,0 +1,198 @@
|
||||
const u8 gTeachyTvString_TeachBattle[] = _("Teach me how to battle.");
|
||||
const u8 gTeachyTvString_StatusProblems[] = _("What are status problems?");
|
||||
const u8 gTeachyTvString_TypeMatchups[] = _("What are type matchups?");
|
||||
const u8 gTeachyTvString_CatchPkmn[] = _("I want to catch POKéMON.");
|
||||
const u8 gTeachyTvString_AboutTMs[] = _("Teach me about TMs.");
|
||||
const u8 gTeachyTvString_RegisterItem[] = _("How do I register an item?");
|
||||
const u8 gTeachyTvString_Cancel[] = _("CANCEL");
|
||||
const u8 gTeachyTvText_PokedudeSaysHello[] = _(
|
||||
"Hey, all you TRAINERS out there!\n"
|
||||
"HELLO, TRAINERS!\p"
|
||||
"……… ……… ………\p"
|
||||
"Come on, let me hear you!\n"
|
||||
"HELLO, TRAINERS!\l"
|
||||
"It's me, the POKé DUDE!\p");
|
||||
const u8 gTeachyTvText_BattleScript1[] = _(
|
||||
"Today, the POKé DUDE's here to\n"
|
||||
"tell you about how you can battle\l"
|
||||
"POKéMON!\p"
|
||||
"Say you're out for a stroll when,\n"
|
||||
"suddenly, a wild POKéMON appears!\p"
|
||||
"It's up to you to smartly use your\n"
|
||||
"POKéMON and their moves to reduce\l"
|
||||
"the opponent's HP to nothing, and\l"
|
||||
"claim victory!\p"
|
||||
"I'll show you how to do that in\n"
|
||||
"person and for sure!\p"
|
||||
"All righty, here goes!\p"
|
||||
"Keep your eyes glued to the super\n"
|
||||
"POKé DUDE SHOW!");
|
||||
const u8 gTeachyTvText_BattleScript2[] = _(
|
||||
"Well, did you get that?\p"
|
||||
"Even if your own POKéMON's HP\n"
|
||||
"falls to zero, and it becomes\l"
|
||||
"unable to battle, not to worry!\p"
|
||||
"Just take it to any POKéMON\n"
|
||||
"CENTER and heal it!\p"
|
||||
"All righty, be seeing you!\p"
|
||||
"Remember, TRAINERS, a good deed\n"
|
||||
"a day brings happiness to stay!");
|
||||
const u8 gTeachyTvText_StatusScript1[] = _(
|
||||
"Today, the POKé DUDE's here to\n"
|
||||
"tell you about status problems!\p"
|
||||
"Status problems include poisoning,\n"
|
||||
"paralysis, sleep, burn…\p"
|
||||
"There are a couple others, but\n"
|
||||
"they really are trouble.\p"
|
||||
"Get any one, and your POKéMON\n"
|
||||
"may become useless in battle.\p"
|
||||
"You know, it hurts the POKé DUDE\n"
|
||||
"to see a POKéMON suffer…\p"
|
||||
"So, what should you do if your\n"
|
||||
"POKéMON gets a status problem?\p"
|
||||
"Well, you've got me to show you!\p"
|
||||
"All righty, here goes!\p"
|
||||
"Keep your eyes glued to the super\n"
|
||||
"POKé DUDE SHOW!");
|
||||
const u8 gTeachyTvText_StatusScript2[] = _(
|
||||
"Poisoning or paralysis don't go\n"
|
||||
"away after a battle.\p"
|
||||
"If a POKéMON is poisoned, it loses\n"
|
||||
"HP even while you're walking.\p"
|
||||
"You should heal POKéMON of these\n"
|
||||
"kinds of problems right away.\p"
|
||||
"Use an item, or try to get to a\n"
|
||||
"POKéMON CENTER for healing.\p"
|
||||
"That wasn't hard, was it?\n"
|
||||
"All righty, be seeing you!\p"
|
||||
"Remember, TRAINERS, a good deed\n"
|
||||
"a day brings happiness to stay!");
|
||||
const u8 gTeachyTvText_MatchupsScript1[] = _(
|
||||
"Does everyone know about type\n"
|
||||
"matchups?\p"
|
||||
"POKéMON and their moves all\n"
|
||||
"belong to certain types.\p"
|
||||
"For example, there are such types\n"
|
||||
"as GRASS and WATER.\p"
|
||||
"You need to consider the type of\n"
|
||||
"the move used to attack…\p"
|
||||
"And, the type of the POKéMON that\n"
|
||||
"is hit by that attack.\p"
|
||||
"Depending on how those two types\n"
|
||||
"match up, the damage can change.\p"
|
||||
"You see, it depends on whether\n"
|
||||
"the type matchup is good or bad.\p"
|
||||
"If you don't know how matchups\n"
|
||||
"work, battles will be tough.\p"
|
||||
"So, let me demonstrate exactly\n"
|
||||
"what I mean.\p"
|
||||
"All righty, here goes!\p"
|
||||
"Keep your eyes glued to the super\n"
|
||||
"POKé DUDE SHOW!");
|
||||
const u8 gTeachyTvText_MatchupsScript2[] = _(
|
||||
"Is it possible to launch an attack\n"
|
||||
"that will inflict heavy damage?\p"
|
||||
"Does the opposing POKéMON pose\n"
|
||||
"a threat to your POKéMON?\p"
|
||||
"Is there any chance that it may\n"
|
||||
"have disastrously tough moves?\p"
|
||||
"Watch the type matchups to gain\n"
|
||||
"the upper hand!\p"
|
||||
"All righty, be seeing you!\p"
|
||||
"Oh, for the COOL-type POKé DUDE,\n"
|
||||
"AWESOME-type kids like you match\l"
|
||||
"up perfectly!\p"
|
||||
"Remember, a good deed a day\n"
|
||||
"brings happiness to stay!");
|
||||
const u8 gTeachyTvText_CatchingScript1[] = _(
|
||||
"Today, the POKé DUDE's going to\n"
|
||||
"show you how to catch POKéMON!\p"
|
||||
"Just imagine… A groovy POKéMON\n"
|
||||
"suddenly appearing in the wild!\p"
|
||||
"Oh, you want it!\n"
|
||||
"You just can't help it!\p"
|
||||
"Oh, you have to catch it!\n"
|
||||
"You gotta have it!\p"
|
||||
"Let me show you how you can make\n"
|
||||
"it happen!\p"
|
||||
"All righty, here goes!\p"
|
||||
"Keep your eyes glued to the super\n"
|
||||
"POKé DUDE SHOW!");
|
||||
const u8 gTeachyTvText_CatchingScript2[] = _(
|
||||
"If your first POKé BALL fails to\n"
|
||||
"catch the POKéMON, don't give up!\p"
|
||||
"Keep throwing POKé BALLS…\n"
|
||||
"It's bound to work sometime!\p"
|
||||
"All righty, be seeing you!\p"
|
||||
"Remember, TRAINERS, a good deed\n"
|
||||
"a day brings happiness to stay!");
|
||||
const u8 gTeachyTvText_TMsScript1[] = _(
|
||||
"Hey, everyone!\n"
|
||||
"Do you all have TMs?\p"
|
||||
"A TM, Technical Machine, is an\n"
|
||||
"amazingly great item!\p"
|
||||
"It teaches POKéMON a move that\n"
|
||||
"it may not learn when leveling up!\p"
|
||||
"Isn't that just great? What a\n"
|
||||
"convenient world we live in!\p"
|
||||
"Open the TM CASE and check out\n"
|
||||
"the TMs you have.\p"
|
||||
"You can check them out in detail,\n"
|
||||
"too.");
|
||||
const u8 gPokedudeText_TMTypes[] = _(
|
||||
"POKé DUDE: NORMAL, WATER, GRASS…\n"
|
||||
"TMs also come in types.\p"
|
||||
"Check the type and teach it to\n"
|
||||
"a POKéMON that matches up well.\p"
|
||||
"For example, WATER PULSE is\n"
|
||||
"suitable for WATER-type POKéMON.\p"
|
||||
"BULLET SEED is a move that most\n"
|
||||
"GRASS-type POKéMON can learn.\p"
|
||||
"There's one other thing!");
|
||||
const u8 gPokedudeText_ReadTMDescription[] = _(
|
||||
"Don't just look at the type, read\n"
|
||||
"the description, too.\p"
|
||||
"It will contain hints about what\n"
|
||||
"POKéMON might learn the move.\p"
|
||||
"For example, take a move like\n"
|
||||
"FOCUS PUNCH.\p"
|
||||
"It doesn't sound like anything a\n"
|
||||
"bird or fish POKéMON can learn.\p"
|
||||
"So, try using it on POKéMON with\n"
|
||||
"arms that can throw punches!");
|
||||
const u8 gTeachyTvText_TMsScript2[] = _(
|
||||
"Wow, I talked a lot today!\n"
|
||||
"All righty, be seeing you!\p"
|
||||
"Remember, TRAINERS, a good deed\n"
|
||||
"a day brings happiness to stay!");
|
||||
const u8 gTeachyTvText_RegisterScript1[] = _(
|
||||
"A TRAINER's BAG has a bunch of\n"
|
||||
"nifty, convenient features!\p"
|
||||
"Take stuff in the KEY ITEMS\n"
|
||||
"POCKET, for instance.\p"
|
||||
"You can use a key item without\n"
|
||||
"opening the BAG every time.\p"
|
||||
"For example, let's pretend I have\n"
|
||||
"a TEACHY TV in my BAG.\p"
|
||||
"I can register it for instant use,\n"
|
||||
"and I'll show you how!\p"
|
||||
"All righty, here goes!\p"
|
||||
"Keep your eyes glued to the sorta\n"
|
||||
"super POKé DUDE SHOW!");
|
||||
const u8 gTeachyTvText_RegisterScript2[] = _(
|
||||
"And now, your TEACHY TV is\n"
|
||||
"registered.\p"
|
||||
"How do you use it?\n"
|
||||
"Well, here's how it works.\p"
|
||||
"Once an item in the KEY ITEMS\n"
|
||||
"POKCET is registered, you can use\l"
|
||||
"it by pressing SELECT.\p"
|
||||
"So, you've given yourself\n"
|
||||
"one-touch access to TEACHY TV.\p"
|
||||
"All it takes for you to see me is\n"
|
||||
"pressing one button!\p"
|
||||
"That kind of attention is a little\n"
|
||||
"embarrassing!\p"
|
||||
"All righty, be seeing you!\p"
|
||||
"Remember, TRAINERS, a good deed\n"
|
||||
"a day brings happiness to stay!");
|
||||
+1
-1
@@ -1434,7 +1434,7 @@ static void OpenContextMenu(u8 taskId)
|
||||
Menu_InitCursor(r6, 2, 0, 2, GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT) + 2, sContextMenuNumItems, 0);
|
||||
r4 = ShowBagWindow(6, 0);
|
||||
CopyItemName(gSpecialVar_ItemId, gStringVar1);
|
||||
StringExpandPlaceholders(gStringVar4, gOtherText_StrVar1);
|
||||
StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected);
|
||||
BagPrintTextOnWindow(r4, 2, gStringVar4, 0, 2, 1, 0, 0, 1);
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -848,7 +848,7 @@ static void Task_ItemPcSubmenuInit(u8 taskId)
|
||||
PrintTextArray(4, 2, 8, 2, GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT) + 2, 3, sItemPcSubmenuOptions);
|
||||
Menu_InitCursor(4, 2, 0, 2, GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT) + 2, 3, 0);
|
||||
CopyItemName(ItemPc_GetItemIdBySlotId(data[1]), gStringVar1);
|
||||
StringExpandPlaceholders(gStringVar4, gOtherText_StrVar1);
|
||||
StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected);
|
||||
ItemPc_AddTextPrinterParameterized(windowId, 2, gStringVar4, 0, 2, 1, 0, 0, 1);
|
||||
ScheduleBgCopyTilemapToVram(0);
|
||||
gTasks[taskId].func = Task_ItemPcSubmenuRun;
|
||||
|
||||
+144
-271
@@ -281,133 +281,6 @@ static bool8 sub_81153A8(u16, const u16 *);
|
||||
static bool8 sub_81153E4(u16, const u16 *);
|
||||
static void BufferLinkPartnersName(u8 *);
|
||||
|
||||
extern const u8 QuestLog_Text_PreviouslyOnYourQuest[];
|
||||
extern const u8 QuestLog_Text_SwitchMon1WithMon2[];
|
||||
extern const u8 QuestLog_Text_SwappedHeldItemsOnMon[];
|
||||
extern const u8 QuestLog_Text_TookHeldItemFromMon[];
|
||||
extern const u8 QuestLog_Text_UsedItemOnMonAtThisLocation[];
|
||||
extern const u8 QuestLog_Text_UsedTheItem[];
|
||||
extern const u8 QuestLog_Text_UsedTheKeyItem[];
|
||||
extern const u8 QuestLog_Text_MonLearnedMoveFromTM[];
|
||||
extern const u8 QuestLog_Text_MonReplacedMoveWithTM[];
|
||||
extern const u8 QuestLog_Text_MonsWereFullyRestoredAtCenter[];
|
||||
extern const u8 QuestLog_Text_PlayerBattledChampionRival[];
|
||||
extern const u8 QuestLog_Text_PlayerSentOutMon1RivalSentOutMon2[];
|
||||
extern const u8 QuestLog_Text_WonTheMatchAsAResult[];
|
||||
extern const u8 QuestLog_Text_StoredItemInPC[];
|
||||
extern const u8 QuestLog_Text_WithdrewItemFromPC[];
|
||||
extern const u8 QuestLog_Text_TradedMon1ForPersonsMon2[];
|
||||
extern const u8 QuestLog_Text_SingleBattleWithPersonResultedInOutcome[];
|
||||
extern const u8 QuestLog_Text_DoubleBattleWithPersonResultedInOutcome[];
|
||||
extern const u8 QuestLog_Text_MultiBattleWithPeopleResultedInOutcome[];
|
||||
extern const u8 QuestLog_Text_Win[];
|
||||
extern const u8 QuestLog_Text_Loss[];
|
||||
extern const u8 QuestLog_Text_MingledInUnionRoom[];
|
||||
extern const u8 QuestLog_Text_DepartedPlaceInTownForNextDestination[];
|
||||
extern const u8 QuestLog_Text_SwitchedMonsBetweenBoxes[];
|
||||
extern const u8 QuestLog_Text_MovedMonToNewBox[];
|
||||
extern const u8 QuestLog_Text_SwitchedMonsWithinBox[];
|
||||
extern const u8 QuestLog_Text_MovedMonWithinBox[];
|
||||
extern const u8 QuestLog_Text_SwitchedPartyMonForPCMon[];
|
||||
extern const u8 QuestLog_Text_WithdrewMonFromPC[];
|
||||
extern const u8 QuestLog_Text_DepositedMonInPC[];
|
||||
extern const u8 QuestLog_Text_SwitchedMultipleMons[];
|
||||
extern const u8 QuestLog_Text_ADifferentSpot[];
|
||||
extern const u8 QuestLog_Text_GaveMonHeldItemFromPC[];
|
||||
extern const u8 QuestLog_Text_SwappedHeldItemFromPC[];
|
||||
extern const u8 QuestLog_Text_ChattedWithManyTrainers[];
|
||||
extern const u8 QuestLog_Text_Handily[];
|
||||
extern const u8 QuestLog_Text_Tenaciously[];
|
||||
extern const u8 QuestLog_Text_Somehow[];
|
||||
extern const u8 QuestLog_Text_TradedMon1ForTrainersMon2[];
|
||||
extern const u8 QuestLog_Text_BattledTrainerEndedInOutcome[];
|
||||
extern const u8 QuestLog_Text_BoughtItem[];
|
||||
extern const u8 QuestLog_Text_BoughtItemsIncludingItem[];
|
||||
extern const u8 QuestLog_Text_SoldNumOfItem[];
|
||||
extern const u8 QuestLog_Text_SoldItemsIncludingItem[];
|
||||
extern const u8 QuestLog_Text_JustOne[];
|
||||
extern const u8 QuestLog_Text_Num[];
|
||||
extern const u8 QuestLog_Text_UsedSoftboiled[];
|
||||
extern const u8 QuestLog_Text_UsedMilkDrink[];
|
||||
extern const u8 QuestLog_Text_MonLearnedMoveFromHM[];
|
||||
extern const u8 QuestLog_Text_MonReplacedMoveWithHM[];
|
||||
extern const u8 QuestLog_Text_DefeatedWildMon[];
|
||||
extern const u8 QuestLog_Text_DefeatedWildMons[];
|
||||
extern const u8 QuestLog_Text_CaughtWildMon[];
|
||||
extern const u8 QuestLog_Text_CaughtWildMons[];
|
||||
extern const u8 QuestLog_Text_DefeatedWildMonAndCaughtWildMon[];
|
||||
extern const u8 QuestLog_Text_DefeatedWildMonAndCaughtWildMons[];
|
||||
extern const u8 QuestLog_Text_DefeatedWildMonsAndCaughtWildMon[];
|
||||
extern const u8 QuestLog_Text_DefeatedWildMonsAndCaughtWildMons[];
|
||||
extern const u8 QuestLog_Text_GaveMonHeldItem[];
|
||||
extern const u8 QuestLog_Text_GaveMonHeldItem2[];
|
||||
extern const u8 QuestLog_Text_UsedCut[];
|
||||
extern const u8 QuestLog_Text_UsedFly[];
|
||||
extern const u8 QuestLog_Text_UsedSurf[];
|
||||
extern const u8 QuestLog_Text_UsedStrength[];
|
||||
extern const u8 QuestLog_Text_UsedFlash[];
|
||||
extern const u8 QuestLog_Text_UsedRockSmash[];
|
||||
extern const u8 QuestLog_Text_UsedWaterfall[];
|
||||
extern const u8 QuestLog_Text_UsedDive[];
|
||||
extern const u8 QuestLog_Text_UsedDigInLocation[];
|
||||
extern const u8 QuestLog_Text_UsedSweetScent[];
|
||||
extern const u8 QuestLog_Text_UsedTeleportToLocation[];
|
||||
extern const u8 QuestLog_Text_LeftTownsLocationForNextDestination[];
|
||||
extern const u8 QuestLog_Text_PlayedGamesAtGameCorner[];
|
||||
extern const u8 QuestLog_Text_RestedAtHome[];
|
||||
extern const u8 QuestLog_Text_LeftOaksLab[];
|
||||
extern const u8 QuestLog_Text_GymWasFullOfToughTrainers[];
|
||||
extern const u8 QuestLog_Text_DepartedGym[];
|
||||
extern const u8 QuestLog_Text_HadGreatTimeInSafariZone[];
|
||||
extern const u8 QuestLog_Text_ManagedToGetOutOfLocation[];
|
||||
extern const u8 QuestLog_Text_TookOnGymLeadersMonWithMonAndWon[];
|
||||
extern const u8 QuestLog_Text_TookOnEliteFoursMonWithMonAndWon[];
|
||||
extern const u8 QuestLog_Text_TookOnTrainersMonWithMonAndWon[];
|
||||
extern const u8 QuestLog_Text_Coolly[];
|
||||
extern const u8 QuestLog_Text_Barely[];
|
||||
extern const u8 QuestLog_Text_UsedEscapeRope[];
|
||||
extern const u8 QuestLog_Text_Draw[];
|
||||
extern const u8 QuestLog_Text_DepartedTheLocationForNextDestination[];
|
||||
extern const u8 QuestLog_Text_DepartedFromLocationToNextDestination[];
|
||||
extern const u8 QuestLog_Text_ObtainedItemInLocation[];
|
||||
extern const u8 QuestLog_Text_ArrivedInLocation[];
|
||||
extern const u8 QuestLog_Text_SavedGameAtLocation[];
|
||||
extern const u8 QuestLog_Text_Home[];
|
||||
extern const u8 QuestLog_Text_OakResearchLab[];
|
||||
extern const u8 QuestLog_Text_Gym[];
|
||||
extern const u8 QuestLog_Text_PokemonLeagueGate[];
|
||||
extern const u8 QuestLog_Text_ViridianForest[];
|
||||
extern const u8 QuestLog_Text_PewterMuseumOfScience[];
|
||||
extern const u8 QuestLog_Text_MtMoon[];
|
||||
extern const u8 QuestLog_Text_BikeShop[];
|
||||
extern const u8 QuestLog_Text_BillsHouse[];
|
||||
extern const u8 QuestLog_Text_DayCare[];
|
||||
extern const u8 QuestLog_Text_UndergroundPath[];
|
||||
extern const u8 QuestLog_Text_PokemonFanClub[];
|
||||
extern const u8 QuestLog_Text_SSAnne[];
|
||||
extern const u8 QuestLog_Text_DiglettsCave[];
|
||||
extern const u8 QuestLog_Text_RockTunnel[];
|
||||
extern const u8 QuestLog_Text_PowerPlant[];
|
||||
extern const u8 QuestLog_Text_PokemonTower[];
|
||||
extern const u8 QuestLog_Text_VolunteerHouse[];
|
||||
extern const u8 QuestLog_Text_NameRatersHouse[];
|
||||
extern const u8 QuestLog_Text_CeladonDeptStore[];
|
||||
extern const u8 QuestLog_Text_CeladonMansion[];
|
||||
extern const u8 QuestLog_Text_RocketGameCorner[];
|
||||
extern const u8 QuestLog_Text_Restaurant[];
|
||||
extern const u8 QuestLog_Text_RocketHideout[];
|
||||
extern const u8 QuestLog_Text_SafariZone[];
|
||||
extern const u8 QuestLog_Text_WardensHome[];
|
||||
extern const u8 QuestLog_Text_FightingDojo[];
|
||||
extern const u8 QuestLog_Text_SilphCo[];
|
||||
extern const u8 QuestLog_Text_SeafoamIslands[];
|
||||
extern const u8 QuestLog_Text_PokemonMansion[];
|
||||
extern const u8 QuestLog_Text_PokemonResearchLab[];
|
||||
extern const u8 QuestLog_Text_VictoryRoad[];
|
||||
extern const u8 QuestLog_Text_PokemonLeague[];
|
||||
extern const u8 QuestLog_Text_CeruleanCave[];
|
||||
|
||||
|
||||
static const struct WindowTemplate gUnknown_845661C[3] = {
|
||||
{ 0, 0, 0, 30, 2, 15, 0x0e9 },
|
||||
{ 0, 0, 18, 30, 2, 15, 0x0ad },
|
||||
@@ -751,7 +624,7 @@ void DrawPreviouslyOnQuestHeader(u8 sceneNum)
|
||||
FillWindowPixelRect(gUnknown_203ADFE[i], 15, 0, 0, gUnknown_845661C[i].width * 8, gUnknown_845661C[i].height * 8);
|
||||
}
|
||||
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_PreviouslyOnYourQuest);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_PreviouslyOnYourQuest);
|
||||
|
||||
// Scene numbers count from 4 to 0, 0 being where the player saved
|
||||
if (sceneNum != 0)
|
||||
@@ -1370,7 +1243,7 @@ static void Task_QuestLogScene_SavedGame(u8 taskId)
|
||||
if (gUnknown_203AE94.unk_0_6 != 1)
|
||||
{
|
||||
GetMapNameGeneric(gStringVar1, gMapHeader.regionMapSectionId);
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_SavedGameAtLocation);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_SavedGameAtLocation);
|
||||
DrawQuestLogSceneDescription();
|
||||
}
|
||||
task->data[0] = 0;
|
||||
@@ -3170,7 +3043,7 @@ static const u16 *BufferQuestLogText_SwitchedPartyOrder(const u16 *eventData)
|
||||
const u16 *r4 = sub_8113E88(QL_EVENT_SWITCHED_PARTY_ORDER, eventData);
|
||||
QuestLog_GetSpeciesName(r4[0], gStringVar1, 0);
|
||||
QuestLog_GetSpeciesName(r4[1], gStringVar2, 0);
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_SwitchMon1WithMon2);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_SwitchMon1WithMon2);
|
||||
r4 += 2;
|
||||
return r4;
|
||||
}
|
||||
@@ -3204,21 +3077,21 @@ static const u16 *BufferQuestLogText_UsedItem(const u16 *eventData)
|
||||
if (r5[0] == ITEM_ESCAPE_ROPE)
|
||||
{
|
||||
GetMapNameGeneric(gStringVar2, (u8)r5[2]);
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_UsedEscapeRope);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_UsedEscapeRope);
|
||||
}
|
||||
else if (r5[1] != 0xFFFF)
|
||||
{
|
||||
QuestLog_GetSpeciesName(r5[1], gStringVar2, 0);
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_UsedItemOnMonAtThisLocation);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_UsedItemOnMonAtThisLocation);
|
||||
}
|
||||
else
|
||||
{
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_UsedTheItem);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_UsedTheItem);
|
||||
}
|
||||
break;
|
||||
case POCKET_KEY_ITEMS:
|
||||
StringCopy(gStringVar1, ItemId_GetName(r5[0]));
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_UsedTheKeyItem);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_UsedTheKeyItem);
|
||||
break;
|
||||
case POCKET_TM_CASE:
|
||||
QuestLog_GetSpeciesName(r5[1], gStringVar1, 0);
|
||||
@@ -3227,16 +3100,16 @@ static const u16 *BufferQuestLogText_UsedItem(const u16 *eventData)
|
||||
{
|
||||
StringCopy(gStringVar3, gMoveNames[r5[2]]);
|
||||
if (r5[0] > ITEM_TM50)
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_MonReplacedMoveWithHM);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_MonReplacedMoveWithHM);
|
||||
else
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_MonReplacedMoveWithTM);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_MonReplacedMoveWithTM);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (r5[0] > ITEM_TM50)
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_MonLearnedMoveFromHM);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_MonLearnedMoveFromHM);
|
||||
else
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_MonLearnedMoveFromTM);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_MonLearnedMoveFromTM);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -3264,7 +3137,7 @@ static const u16 *BufferQuestLogText_GaveHeldItemFromPartyMenu(const u16 *eventD
|
||||
const u16 *r4 = sub_8113E88(QL_EVENT_GAVE_HELD_ITEM, eventData);
|
||||
QuestLog_GetSpeciesName(r4[1], gStringVar1, 0);
|
||||
StringCopy(gStringVar2, ItemId_GetName(r4[0]));
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_GaveMonHeldItem);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_GaveMonHeldItem);
|
||||
r4 += 2;
|
||||
return r4;
|
||||
}
|
||||
@@ -3279,7 +3152,7 @@ static const u16 *BufferQuestLogText_GaveHeldItemFromBagMenu(const u16 *eventDat
|
||||
const u16 *r4 = sub_8113E88(QL_EVENT_GAVE_HELD_ITEM_BAG, eventData);
|
||||
QuestLog_GetSpeciesName(r4[1], gStringVar1, 0);
|
||||
StringCopy(gStringVar2, ItemId_GetName(r4[0]));
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_GaveMonHeldItem2);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_GaveMonHeldItem2);
|
||||
r4 += 2;
|
||||
return r4;
|
||||
}
|
||||
@@ -3295,7 +3168,7 @@ static const u16 *BufferQuestLogText_GaveHeldItemFromPC(const u16 *eventData)
|
||||
|
||||
QuestLog_GetSpeciesName(r4[1], gStringVar2, 0);
|
||||
StringCopy(gStringVar1, ItemId_GetName(r4[0]));
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_GaveMonHeldItemFromPC);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_GaveMonHeldItemFromPC);
|
||||
r4 += 2;
|
||||
return r4;
|
||||
}
|
||||
@@ -3311,7 +3184,7 @@ static const u16 *BufferQuestLogText_TookHeldItem(const u16 *eventData)
|
||||
|
||||
QuestLog_GetSpeciesName(r4[1], gStringVar1, 0);
|
||||
StringCopy(gStringVar2, ItemId_GetName(r4[0]));
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_TookHeldItemFromMon);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_TookHeldItemFromMon);
|
||||
r4 += 2;
|
||||
return r4;
|
||||
}
|
||||
@@ -3339,7 +3212,7 @@ static const u16 *BufferQuestLogText_SwappedHeldItem(const u16 *eventData)
|
||||
QuestLog_GetSpeciesName(r4[2], gStringVar1, 0);
|
||||
StringCopy(gStringVar2, ItemId_GetName(r4[0])); // Item taken
|
||||
StringCopy(gStringVar3, ItemId_GetName(r4[1])); // Item given
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_SwappedHeldItemsOnMon);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_SwappedHeldItemsOnMon);
|
||||
r4 += 3;
|
||||
return r4;
|
||||
}
|
||||
@@ -3355,7 +3228,7 @@ static const u16 *BufferQuestLogText_SwappedHeldItemFromPC(const u16 *eventData)
|
||||
QuestLog_GetSpeciesName(r4[2], gStringVar2, 0);
|
||||
StringCopy(gStringVar3, ItemId_GetName(r4[0]));
|
||||
StringCopy(gStringVar1, ItemId_GetName(r4[1]));
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_SwappedHeldItemFromPC);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_SwappedHeldItemFromPC);
|
||||
r4 += 3;
|
||||
return r4;
|
||||
}
|
||||
@@ -3376,7 +3249,7 @@ static u16 *BufferQuestLogData_UsedPkmnCenter(u16 *a0, const u16 *eventData)
|
||||
|
||||
static const u16 *BufferQuestLogText_UsedPkmnCenter(const u16 *a0)
|
||||
{
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_MonsWereFullyRestoredAtCenter);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_MonsWereFullyRestoredAtCenter);
|
||||
a0 += 2;
|
||||
return a0;
|
||||
}
|
||||
@@ -3405,27 +3278,27 @@ static const u16 *BufferQuestLogText_LinkTraded(const u16 *a0)
|
||||
BufferLinkPartnersName(gStringVar1);
|
||||
QuestLog_GetSpeciesName(a0[3], gStringVar2, 0); // Mon received
|
||||
QuestLog_GetSpeciesName(a0[2], gStringVar3, 0); // Mon sent
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_TradedMon1ForPersonsMon2);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_TradedMon1ForPersonsMon2);
|
||||
r6 += 4;
|
||||
return r6;
|
||||
}
|
||||
|
||||
static const u8 *const sDefeatedOpponentFlavorTexts[] = {
|
||||
QuestLog_Text_Handily,
|
||||
QuestLog_Text_Tenaciously,
|
||||
QuestLog_Text_Somehow
|
||||
gText_QuestLog_Handily,
|
||||
gText_QuestLog_Tenaciously,
|
||||
gText_QuestLog_Somehow
|
||||
};
|
||||
|
||||
static const u8 *const sDefeatedChampionFlavorTexts[] = {
|
||||
QuestLog_Text_Coolly,
|
||||
QuestLog_Text_Somehow,
|
||||
QuestLog_Text_Barely
|
||||
gText_QuestLog_Coolly,
|
||||
gText_QuestLog_Somehow,
|
||||
gText_QuestLog_Barely
|
||||
};
|
||||
|
||||
static const u8 *const sBattleOutcomeTexts[] = {
|
||||
QuestLog_Text_Win,
|
||||
QuestLog_Text_Loss,
|
||||
QuestLog_Text_Draw
|
||||
gText_QuestLog_Win,
|
||||
gText_QuestLog_Loss,
|
||||
gText_QuestLog_Draw
|
||||
};
|
||||
|
||||
static u16 *BufferQuestLogData_LinkBattledSingle(u16 *a0, const u16 *eventData)
|
||||
@@ -3447,7 +3320,7 @@ static const u16 *BufferQuestLogText_LinkBattledSingle(const u16 *a0)
|
||||
BufferLinkPartnersName(gStringVar1);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, sBattleOutcomeTexts[((const u8 *)a0)[4]]);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_SingleBattleWithPersonResultedInOutcome);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_SingleBattleWithPersonResultedInOutcome);
|
||||
a0 += 6;
|
||||
return a0;
|
||||
}
|
||||
@@ -3471,7 +3344,7 @@ static const u16 *BufferQuestLogText_LinkBattledDouble(const u16 *a0)
|
||||
BufferLinkPartnersName(gStringVar1);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, sBattleOutcomeTexts[((const u8 *)a0)[4]]);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_DoubleBattleWithPersonResultedInOutcome);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_DoubleBattleWithPersonResultedInOutcome);
|
||||
a0 += 6;
|
||||
return a0;
|
||||
}
|
||||
@@ -3506,7 +3379,7 @@ static const u16 *BufferQuestLogText_LinkBattledMulti(const u16 *a0)
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, gStringVar2); // opponent 1
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(3, gStringVar3); // opponent 2
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(4, sBattleOutcomeTexts[((const u8 *)a0)[4]]);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_MultiBattleWithPeopleResultedInOutcome);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_MultiBattleWithPeopleResultedInOutcome);
|
||||
a0 += 13;
|
||||
return a0;
|
||||
}
|
||||
@@ -3520,7 +3393,7 @@ static u16 *BufferQuestLogData_UsedUnionRoom(u16 *a0, const u16 *eventData)
|
||||
|
||||
static const u16 *BufferQuestLogText_UsedUnionRoom(const u16 *a0)
|
||||
{
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_MingledInUnionRoom);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_MingledInUnionRoom);
|
||||
a0 += 2;
|
||||
return a0;
|
||||
}
|
||||
@@ -3534,7 +3407,7 @@ static u16 *BufferQuestLogData_UsedUnionRoomChat(u16 *a0, const u16 *eventData)
|
||||
|
||||
static const u16 *BufferQuestLogText_UsedUnionRoomChat(const u16 *a0)
|
||||
{
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_ChattedWithManyTrainers);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_ChattedWithManyTrainers);
|
||||
a0 += 2;
|
||||
return a0;
|
||||
}
|
||||
@@ -3559,7 +3432,7 @@ static const u16 *BufferQuestLogText_LinkTradedUnionRoom(const u16 *a0)
|
||||
BufferLinkPartnersName(gStringVar1);
|
||||
QuestLog_GetSpeciesName(a0[3], gStringVar2, 0);
|
||||
QuestLog_GetSpeciesName(a0[2], gStringVar3, 0);
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_TradedMon1ForTrainersMon2);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_TradedMon1ForTrainersMon2);
|
||||
r6 += 8;
|
||||
return (const u16 *)r6;
|
||||
}
|
||||
@@ -3580,7 +3453,7 @@ static const u16 *BufferQuestLogText_LinkBattledUnionRoom(const u16 *a0)
|
||||
memcpy(gStringVar1, (const u8 *)a0 + 5, PLAYER_NAME_LENGTH);
|
||||
BufferLinkPartnersName(gStringVar1);
|
||||
StringCopy(gStringVar2, sBattleOutcomeTexts[*(const u8 *)&a0[2]]);
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_BattledTrainerEndedInOutcome);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_BattledTrainerEndedInOutcome);
|
||||
a0 += 6;
|
||||
return a0;
|
||||
}
|
||||
@@ -3607,7 +3480,7 @@ static const u16 *BufferQuestLogText_SwitchedMonsBetweenBoxes(const u16 *eventDa
|
||||
QuestLog_GetSpeciesName(eventData[0], NULL, 1);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, GetBoxNamePtr(boxIdxs[1]));
|
||||
QuestLog_GetSpeciesName(eventData[1], NULL, 3);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_SwitchedMonsBetweenBoxes);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_SwitchedMonsBetweenBoxes);
|
||||
return eventData + 3;
|
||||
}
|
||||
|
||||
@@ -3631,7 +3504,7 @@ static const u16 *BufferQuestLogText_SwitchedMonsWithinBox(const u16 *eventData)
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, GetBoxNamePtr(boxIdxs[0]));
|
||||
QuestLog_GetSpeciesName(eventData[0], NULL, 1);
|
||||
QuestLog_GetSpeciesName(eventData[1], NULL, 2);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_SwitchedMonsWithinBox);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_SwitchedMonsWithinBox);
|
||||
return eventData + 3;
|
||||
}
|
||||
|
||||
@@ -3667,7 +3540,7 @@ static const u16 *BufferQuestLogText_SwitchedPartyMonForPCMon(const u16 *eventDa
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, GetBoxNamePtr(boxIdxs[0]));
|
||||
QuestLog_GetSpeciesName(eventData[0], NULL, 1);
|
||||
QuestLog_GetSpeciesName(eventData[1], NULL, 2);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_SwitchedPartyMonForPCMon);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_SwitchedPartyMonForPCMon);
|
||||
return eventData + 3;
|
||||
}
|
||||
|
||||
@@ -3694,7 +3567,7 @@ static const u16 *BufferQuestLogText_MovedMonBetweenBoxes(const u16 *eventData)
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, GetBoxNamePtr(boxIdxs[0]));
|
||||
QuestLog_GetSpeciesName(eventData[0], NULL, 1);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, GetBoxNamePtr(boxIdxs[1]));
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_MovedMonToNewBox);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_MovedMonToNewBox);
|
||||
return (const u16 *)boxIdxs + 1;
|
||||
}
|
||||
|
||||
@@ -3717,7 +3590,7 @@ static const u16 *BufferQuestLogText_MovedMonWithinBox(const u16 *eventData)
|
||||
DynamicPlaceholderTextUtil_Reset();
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, GetBoxNamePtr(boxIdxs[0]));
|
||||
QuestLog_GetSpeciesName(eventData[0], NULL, 1);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_MovedMonWithinBox);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_MovedMonWithinBox);
|
||||
return (const u16 *)boxIdxs + 1;
|
||||
}
|
||||
|
||||
@@ -3740,7 +3613,7 @@ static const u16 *BufferQuestLogText_WithdrewMonFromPC(const u16 *eventData)
|
||||
DynamicPlaceholderTextUtil_Reset();
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, GetBoxNamePtr(boxIdxs[0]));
|
||||
QuestLog_GetSpeciesName(eventData[0], NULL, 1);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_WithdrewMonFromPC);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_WithdrewMonFromPC);
|
||||
return (const u16 *)boxIdxs + 1;
|
||||
}
|
||||
|
||||
@@ -3763,7 +3636,7 @@ static const u16 *BufferQuestLogText_DepositedMonInPC(const u16 *eventData)
|
||||
DynamicPlaceholderTextUtil_Reset();
|
||||
QuestLog_GetSpeciesName(eventData[0], NULL, 0);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, GetBoxNamePtr(boxIdxs[0]));
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_DepositedMonInPC);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_DepositedMonInPC);
|
||||
return (const u16 *)boxIdxs + 1;
|
||||
}
|
||||
|
||||
@@ -3784,10 +3657,10 @@ static const u16 *BufferQuestLogText_SwitchedMultipleMons(const u16 *eventData)
|
||||
DynamicPlaceholderTextUtil_Reset();
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, GetBoxNamePtr(*((const u8 *)r4 + 0)));
|
||||
if (*((const u8 *)r4 + 0) == *((const u8 *)r4 + 1))
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, QuestLog_Text_ADifferentSpot);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gText_QuestLog_ADifferentSpot);
|
||||
else
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, GetBoxNamePtr(*((const u8 *)r4 + 1)));
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_SwitchedMultipleMons);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_SwitchedMultipleMons);
|
||||
return r4 + 1;
|
||||
}
|
||||
|
||||
@@ -3804,7 +3677,7 @@ static const u16 *BufferQuestLogText_DepositedItemInPC(const u16 *eventData)
|
||||
{
|
||||
const u16 *r4 = sub_8113E88(QL_EVENT_DEPOSITED_ITEM_PC, eventData);
|
||||
CopyItemName(r4[0], gStringVar1);
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_StoredItemInPC);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_StoredItemInPC);
|
||||
return r4 + 1;
|
||||
}
|
||||
|
||||
@@ -3821,7 +3694,7 @@ static const u16 *BufferQuestLogText_WithdrewItemFromPC(const u16 *eventData)
|
||||
{
|
||||
const u16 *r4 = sub_8113E88(QL_EVENT_WITHDREW_ITEM_PC, eventData);
|
||||
CopyItemName(r4[0], gStringVar1);
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_WithdrewItemFromPC);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_WithdrewItemFromPC);
|
||||
return r4 + 1;
|
||||
}
|
||||
|
||||
@@ -3856,7 +3729,7 @@ static const u16 *BufferQuestLogText_DefeatedGymLeader(const u16 *eventData)
|
||||
QuestLog_GetSpeciesName(eventData[0], 0, 2);
|
||||
QuestLog_GetSpeciesName(eventData[1], 0, 3);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(4, sDefeatedOpponentFlavorTexts[r6[1]]);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_TookOnGymLeadersMonWithMonAndWon);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_TookOnGymLeadersMonWithMonAndWon);
|
||||
return eventData + 4;
|
||||
}
|
||||
|
||||
@@ -3903,30 +3776,30 @@ static const u16 *BufferQuestLogText_DefeatedWildMon(const u16 *a0)
|
||||
if (data[0] == 0)
|
||||
{
|
||||
if (data[1] == 1)
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_CaughtWildMon);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_CaughtWildMon);
|
||||
else
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_CaughtWildMons);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_CaughtWildMons);
|
||||
}
|
||||
else if (data[1] == 0)
|
||||
{
|
||||
if (data[0] == 1)
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_DefeatedWildMon);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_DefeatedWildMon);
|
||||
else
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_DefeatedWildMons);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_DefeatedWildMons);
|
||||
}
|
||||
else if (data[0] == 1)
|
||||
{
|
||||
if (data[1] == 1)
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_DefeatedWildMonAndCaughtWildMon);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_DefeatedWildMonAndCaughtWildMon);
|
||||
else
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_DefeatedWildMonAndCaughtWildMons);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_DefeatedWildMonAndCaughtWildMons);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (data[1] == 1)
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_DefeatedWildMonsAndCaughtWildMon);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_DefeatedWildMonsAndCaughtWildMon);
|
||||
else
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_DefeatedWildMonsAndCaughtWildMons);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_DefeatedWildMonsAndCaughtWildMons);
|
||||
}
|
||||
return (const u16 *)(data + 4);
|
||||
}
|
||||
@@ -3964,7 +3837,7 @@ static const u16 *BufferQuestLogText_DefeatedEliteFourMember(const u16 *eventDat
|
||||
QuestLog_GetSpeciesName(eventData[0], NULL, 1);
|
||||
QuestLog_GetSpeciesName(eventData[1], NULL, 2);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(3, sDefeatedOpponentFlavorTexts[r5[1]]);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_TookOnEliteFoursMonWithMonAndWon);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_TookOnEliteFoursMonWithMonAndWon);
|
||||
return eventData + 4;
|
||||
}
|
||||
|
||||
@@ -3995,18 +3868,18 @@ static const u16 *BufferQuestLogText_DefeatedChampion(const u16 *a0)
|
||||
case 0:
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gSaveBlock2Ptr->playerName);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gSaveBlock1Ptr->rivalName);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_PlayerBattledChampionRival);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_PlayerBattledChampionRival);
|
||||
break;
|
||||
case 1:
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gSaveBlock1Ptr->rivalName);
|
||||
QuestLog_GetSpeciesName(a0[2], NULL, 1);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, gSaveBlock2Ptr->playerName);
|
||||
QuestLog_GetSpeciesName(a0[3], NULL, 3);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_PlayerSentOutMon1RivalSentOutMon2);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_PlayerSentOutMon1RivalSentOutMon2);
|
||||
break;
|
||||
case 2:
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, sDefeatedChampionFlavorTexts[r5[0]]);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_WonTheMatchAsAResult);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_WonTheMatchAsAResult);
|
||||
break;
|
||||
}
|
||||
return (const u16 *)(r5 + 2);
|
||||
@@ -4036,77 +3909,77 @@ static const u16 *BufferQuestLogText_DefeatedTrainer(const u16 *eventData)
|
||||
QuestLog_GetSpeciesName(r5[0], NULL, 2);
|
||||
QuestLog_GetSpeciesName(r5[1], NULL, 3);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(4, sDefeatedOpponentFlavorTexts[r6[1]]);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_TookOnTrainersMonWithMonAndWon);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_TookOnTrainersMonWithMonAndWon);
|
||||
return (const u16 *)(r6 + 2);
|
||||
}
|
||||
|
||||
static const u8 *const sLocationNameTexts[] =
|
||||
{
|
||||
[QL_LOCATION_HOME] = QuestLog_Text_Home,
|
||||
[QL_LOCATION_OAKS_LAB] = QuestLog_Text_OakResearchLab,
|
||||
[QL_LOCATION_VIRIDIAN_GYM] = QuestLog_Text_Gym,
|
||||
[QL_LOCATION_LEAGUE_GATE_1] = QuestLog_Text_PokemonLeagueGate,
|
||||
[QL_LOCATION_LEAGUE_GATE_2] = QuestLog_Text_PokemonLeagueGate,
|
||||
[QL_LOCATION_VIRIDIAN_FOREST_1] = QuestLog_Text_ViridianForest,
|
||||
[QL_LOCATION_VIRIDIAN_FOREST_2] = QuestLog_Text_ViridianForest,
|
||||
[QL_LOCATION_PEWTER_MUSEUM] = QuestLog_Text_PewterMuseumOfScience,
|
||||
[QL_LOCATION_PEWTER_GYM] = QuestLog_Text_Gym,
|
||||
[QL_LOCATION_MT_MOON_1] = QuestLog_Text_MtMoon,
|
||||
[QL_LOCATION_MT_MOON_2] = QuestLog_Text_MtMoon,
|
||||
[QL_LOCATION_CERULEAN_GYM] = QuestLog_Text_Gym,
|
||||
[QL_LOCATION_BIKE_SHOP] = QuestLog_Text_BikeShop,
|
||||
[QL_LOCATION_BILLS_HOUSE] = QuestLog_Text_BillsHouse,
|
||||
[QL_LOCATION_DAY_CARE] = QuestLog_Text_DayCare,
|
||||
[QL_LOCATION_UNDERGROUND_PATH_1] = QuestLog_Text_UndergroundPath,
|
||||
[QL_LOCATION_UNDERGROUND_PATH_2] = QuestLog_Text_UndergroundPath,
|
||||
[QL_LOCATION_PKMN_FAN_CLUB] = QuestLog_Text_PokemonFanClub,
|
||||
[QL_LOCATION_VERMILION_GYM] = QuestLog_Text_Gym,
|
||||
[QL_LOCATION_SS_ANNE] = QuestLog_Text_SSAnne,
|
||||
[QL_LOCATION_DIGLETTS_CAVE_1] = QuestLog_Text_DiglettsCave,
|
||||
[QL_LOCATION_DIGLETTS_CAVE_2] = QuestLog_Text_DiglettsCave,
|
||||
[QL_LOCATION_ROCK_TUNNEL_1] = QuestLog_Text_RockTunnel,
|
||||
[QL_LOCATION_ROCK_TUNNEL_2] = QuestLog_Text_RockTunnel,
|
||||
[QL_LOCATION_POWER_PLANT] = QuestLog_Text_PowerPlant,
|
||||
[QL_LOCATION_PKMN_TOWER] = QuestLog_Text_PokemonTower,
|
||||
[QL_LOCATION_VOLUNTEER_HOUSE] = QuestLog_Text_VolunteerHouse,
|
||||
[QL_LOCATION_NAME_RATERS_HOUSE] = QuestLog_Text_NameRatersHouse,
|
||||
[QL_LOCATION_UNDERGROUND_PATH_3] = QuestLog_Text_UndergroundPath,
|
||||
[QL_LOCATION_UNDERGROUND_PATH_4] = QuestLog_Text_UndergroundPath,
|
||||
[QL_LOCATION_CELADON_DEPT_STORE] = QuestLog_Text_CeladonDeptStore,
|
||||
[QL_LOCATION_CELADON_MANSION] = QuestLog_Text_CeladonMansion,
|
||||
[QL_LOCATION_GAME_CORNER] = QuestLog_Text_RocketGameCorner,
|
||||
[QL_LOCATION_CELADON_GYM] = QuestLog_Text_Gym,
|
||||
[QL_LOCATION_CELADON_RESTAURANT] = QuestLog_Text_Restaurant,
|
||||
[QL_LOCATION_ROCKET_HIDEOUT] = QuestLog_Text_RocketHideout,
|
||||
[QL_LOCATION_SAFARI_ZONE] = QuestLog_Text_SafariZone,
|
||||
[QL_LOCATION_FUCHSIA_GYM] = QuestLog_Text_Gym,
|
||||
[QL_LOCATION_WARDENS_HOME] = QuestLog_Text_WardensHome,
|
||||
[QL_LOCATION_FIGHTING_DOJO] = QuestLog_Text_FightingDojo,
|
||||
[QL_LOCATION_SAFFRON_GYM] = QuestLog_Text_Gym,
|
||||
[QL_LOCATION_SILPH_CO] = QuestLog_Text_SilphCo,
|
||||
[QL_LOCATION_SEAFOAM_ISLANDS_1] = QuestLog_Text_SeafoamIslands,
|
||||
[QL_LOCATION_SEAFOAM_ISLANDS_2] = QuestLog_Text_SeafoamIslands,
|
||||
[QL_LOCATION_PKMN_MANSION] = QuestLog_Text_PokemonMansion,
|
||||
[QL_LOCATION_CINNABAR_GYM] = QuestLog_Text_Gym,
|
||||
[QL_LOCATION_CINNABAR_LAB] = QuestLog_Text_PokemonResearchLab,
|
||||
[QL_LOCATION_VICTORY_ROAD_1] = QuestLog_Text_VictoryRoad,
|
||||
[QL_LOCATION_VICTORY_ROAD_2] = QuestLog_Text_VictoryRoad,
|
||||
[QL_LOCATION_PKMN_LEAGUE] = QuestLog_Text_PokemonLeague,
|
||||
[QL_LOCATION_CERULEAN_CAVE] = QuestLog_Text_CeruleanCave
|
||||
[QL_LOCATION_HOME] = gText_QuestLog_Home,
|
||||
[QL_LOCATION_OAKS_LAB] = gText_QuestLog_OakResearchLab,
|
||||
[QL_LOCATION_VIRIDIAN_GYM] = gText_QuestLog_Gym,
|
||||
[QL_LOCATION_LEAGUE_GATE_1] = gText_QuestLog_PokemonLeagueGate,
|
||||
[QL_LOCATION_LEAGUE_GATE_2] = gText_QuestLog_PokemonLeagueGate,
|
||||
[QL_LOCATION_VIRIDIAN_FOREST_1] = gText_QuestLog_ViridianForest,
|
||||
[QL_LOCATION_VIRIDIAN_FOREST_2] = gText_QuestLog_ViridianForest,
|
||||
[QL_LOCATION_PEWTER_MUSEUM] = gText_QuestLog_PewterMuseumOfScience,
|
||||
[QL_LOCATION_PEWTER_GYM] = gText_QuestLog_Gym,
|
||||
[QL_LOCATION_MT_MOON_1] = gText_QuestLog_MtMoon,
|
||||
[QL_LOCATION_MT_MOON_2] = gText_QuestLog_MtMoon,
|
||||
[QL_LOCATION_CERULEAN_GYM] = gText_QuestLog_Gym,
|
||||
[QL_LOCATION_BIKE_SHOP] = gText_QuestLog_BikeShop,
|
||||
[QL_LOCATION_BILLS_HOUSE] = gText_QuestLog_BillsHouse,
|
||||
[QL_LOCATION_DAY_CARE] = gText_QuestLog_DayCare,
|
||||
[QL_LOCATION_UNDERGROUND_PATH_1] = gText_QuestLog_UndergroundPath,
|
||||
[QL_LOCATION_UNDERGROUND_PATH_2] = gText_QuestLog_UndergroundPath,
|
||||
[QL_LOCATION_PKMN_FAN_CLUB] = gText_QuestLog_PokemonFanClub,
|
||||
[QL_LOCATION_VERMILION_GYM] = gText_QuestLog_Gym,
|
||||
[QL_LOCATION_SS_ANNE] = gText_QuestLog_SSAnne,
|
||||
[QL_LOCATION_DIGLETTS_CAVE_1] = gText_QuestLog_DiglettsCave,
|
||||
[QL_LOCATION_DIGLETTS_CAVE_2] = gText_QuestLog_DiglettsCave,
|
||||
[QL_LOCATION_ROCK_TUNNEL_1] = gText_QuestLog_RockTunnel,
|
||||
[QL_LOCATION_ROCK_TUNNEL_2] = gText_QuestLog_RockTunnel,
|
||||
[QL_LOCATION_POWER_PLANT] = gText_QuestLog_PowerPlant,
|
||||
[QL_LOCATION_PKMN_TOWER] = gText_QuestLog_PokemonTower,
|
||||
[QL_LOCATION_VOLUNTEER_HOUSE] = gText_QuestLog_VolunteerHouse,
|
||||
[QL_LOCATION_NAME_RATERS_HOUSE] = gText_QuestLog_NameRatersHouse,
|
||||
[QL_LOCATION_UNDERGROUND_PATH_3] = gText_QuestLog_UndergroundPath,
|
||||
[QL_LOCATION_UNDERGROUND_PATH_4] = gText_QuestLog_UndergroundPath,
|
||||
[QL_LOCATION_CELADON_DEPT_STORE] = gText_QuestLog_CeladonDeptStore,
|
||||
[QL_LOCATION_CELADON_MANSION] = gText_QuestLog_CeladonMansion,
|
||||
[QL_LOCATION_GAME_CORNER] = gText_QuestLog_RocketGameCorner,
|
||||
[QL_LOCATION_CELADON_GYM] = gText_QuestLog_Gym,
|
||||
[QL_LOCATION_CELADON_RESTAURANT] = gText_QuestLog_Restaurant,
|
||||
[QL_LOCATION_ROCKET_HIDEOUT] = gText_QuestLog_RocketHideout,
|
||||
[QL_LOCATION_SAFARI_ZONE] = gText_QuestLog_SafariZone,
|
||||
[QL_LOCATION_FUCHSIA_GYM] = gText_QuestLog_Gym,
|
||||
[QL_LOCATION_WARDENS_HOME] = gText_QuestLog_WardensHome,
|
||||
[QL_LOCATION_FIGHTING_DOJO] = gText_QuestLog_FightingDojo,
|
||||
[QL_LOCATION_SAFFRON_GYM] = gText_QuestLog_Gym,
|
||||
[QL_LOCATION_SILPH_CO] = gText_QuestLog_SilphCo,
|
||||
[QL_LOCATION_SEAFOAM_ISLANDS_1] = gText_QuestLog_SeafoamIslands,
|
||||
[QL_LOCATION_SEAFOAM_ISLANDS_2] = gText_QuestLog_SeafoamIslands,
|
||||
[QL_LOCATION_PKMN_MANSION] = gText_QuestLog_PokemonMansion,
|
||||
[QL_LOCATION_CINNABAR_GYM] = gText_QuestLog_Gym,
|
||||
[QL_LOCATION_CINNABAR_LAB] = gText_QuestLog_PokemonResearchLab,
|
||||
[QL_LOCATION_VICTORY_ROAD_1] = gText_QuestLog_VictoryRoad,
|
||||
[QL_LOCATION_VICTORY_ROAD_2] = gText_QuestLog_VictoryRoad,
|
||||
[QL_LOCATION_PKMN_LEAGUE] = gText_QuestLog_PokemonLeague,
|
||||
[QL_LOCATION_CERULEAN_CAVE] = gText_QuestLog_CeruleanCave
|
||||
};
|
||||
|
||||
static const u8 *const sDepartedLocationTexts[] =
|
||||
{
|
||||
[QL_DEPARTED_TOWN_BUILDING] = QuestLog_Text_DepartedPlaceInTownForNextDestination,
|
||||
[QL_DEPARTED_MUSEUM] = QuestLog_Text_LeftTownsLocationForNextDestination,
|
||||
[QL_DEPARTED_GAME_CORNER] = QuestLog_Text_PlayedGamesAtGameCorner,
|
||||
[QL_DEPARTED_HOME] = QuestLog_Text_RestedAtHome,
|
||||
[QL_DEPARTED_OAKS_LAB] = QuestLog_Text_LeftOaksLab,
|
||||
[QL_DEPARTED_GYM] = QuestLog_Text_GymWasFullOfToughTrainers,
|
||||
[QL_DEPARTED_SAFARI_ZONE] = QuestLog_Text_HadGreatTimeInSafariZone,
|
||||
[QL_DEPARTED_CAVE] = QuestLog_Text_ManagedToGetOutOfLocation,
|
||||
[QL_DEPARTED_MISC_BUILDING_1] = QuestLog_Text_DepartedTheLocationForNextDestination,
|
||||
[QL_DEPARTED_MISC_BUILDING_2] = QuestLog_Text_DepartedFromLocationToNextDestination
|
||||
[QL_DEPARTED_TOWN_BUILDING] = gText_QuestLog_DepartedPlaceInTownForNextDestination,
|
||||
[QL_DEPARTED_MUSEUM] = gText_QuestLog_LeftTownsLocationForNextDestination,
|
||||
[QL_DEPARTED_GAME_CORNER] = gText_QuestLog_PlayedGamesAtGameCorner,
|
||||
[QL_DEPARTED_HOME] = gText_QuestLog_RestedAtHome,
|
||||
[QL_DEPARTED_OAKS_LAB] = gText_QuestLog_LeftOaksLab,
|
||||
[QL_DEPARTED_GYM] = gText_QuestLog_GymWasFullOfToughTrainers,
|
||||
[QL_DEPARTED_SAFARI_ZONE] = gText_QuestLog_HadGreatTimeInSafariZone,
|
||||
[QL_DEPARTED_CAVE] = gText_QuestLog_ManagedToGetOutOfLocation,
|
||||
[QL_DEPARTED_MISC_BUILDING_1] = gText_QuestLog_DepartedTheLocationForNextDestination,
|
||||
[QL_DEPARTED_MISC_BUILDING_2] = gText_QuestLog_DepartedFromLocationToNextDestination
|
||||
};
|
||||
|
||||
static const u8 sLocationToDepartedTextId[] =
|
||||
@@ -4177,18 +4050,18 @@ static const u8 gUnknown_8456C17[] = {
|
||||
|
||||
static const u8 *const sUsedFieldMoveTexts[] =
|
||||
{
|
||||
[FIELD_MOVE_FLASH] = QuestLog_Text_UsedFlash,
|
||||
[FIELD_MOVE_CUT] = QuestLog_Text_UsedCut,
|
||||
[FIELD_MOVE_FLY] = QuestLog_Text_UsedFly,
|
||||
[FIELD_MOVE_STRENGTH] = QuestLog_Text_UsedStrength,
|
||||
[FIELD_MOVE_SURF] = QuestLog_Text_UsedSurf,
|
||||
[FIELD_MOVE_ROCK_SMASH] = QuestLog_Text_UsedRockSmash,
|
||||
[FIELD_MOVE_WATERFALL] = QuestLog_Text_UsedWaterfall,
|
||||
[FIELD_MOVE_TELEPORT] = QuestLog_Text_UsedTeleportToLocation,
|
||||
[FIELD_MOVE_DIG] = QuestLog_Text_UsedDigInLocation,
|
||||
[FIELD_MOVE_MILK_DRINK] = QuestLog_Text_UsedMilkDrink,
|
||||
[FIELD_MOVE_SOFT_BOILED] = QuestLog_Text_UsedSoftboiled,
|
||||
[FIELD_MOVE_SWEET_SCENT] = QuestLog_Text_UsedSweetScent
|
||||
[FIELD_MOVE_FLASH] = gText_QuestLog_UsedFlash,
|
||||
[FIELD_MOVE_CUT] = gText_QuestLog_UsedCut,
|
||||
[FIELD_MOVE_FLY] = gText_QuestLog_UsedFly,
|
||||
[FIELD_MOVE_STRENGTH] = gText_QuestLog_UsedStrength,
|
||||
[FIELD_MOVE_SURF] = gText_QuestLog_UsedSurf,
|
||||
[FIELD_MOVE_ROCK_SMASH] = gText_QuestLog_UsedRockSmash,
|
||||
[FIELD_MOVE_WATERFALL] = gText_QuestLog_UsedWaterfall,
|
||||
[FIELD_MOVE_TELEPORT] = gText_QuestLog_UsedTeleportToLocation,
|
||||
[FIELD_MOVE_DIG] = gText_QuestLog_UsedDigInLocation,
|
||||
[FIELD_MOVE_MILK_DRINK] = gText_QuestLog_UsedMilkDrink,
|
||||
[FIELD_MOVE_SOFT_BOILED] = gText_QuestLog_UsedSoftboiled,
|
||||
[FIELD_MOVE_SWEET_SCENT] = gText_QuestLog_UsedSweetScent
|
||||
};
|
||||
|
||||
static u16 *BufferQuestLogData_DepartedLocation(u16 *a0, const u16 *eventData)
|
||||
@@ -4217,9 +4090,9 @@ static const u16 *BufferQuestLogText_DepartedLocation(const u16 *eventData)
|
||||
if (r5_2[0] != gUnknown_8456C17[r4])
|
||||
continue;
|
||||
if (FlagGet(FLAG_BADGE01_GET + r4) == TRUE)
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_DepartedGym);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_DepartedGym);
|
||||
else
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_GymWasFullOfToughTrainers);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_GymWasFullOfToughTrainers);
|
||||
break;
|
||||
}
|
||||
if (r4 == 8)
|
||||
@@ -4290,7 +4163,7 @@ static const u16 *BufferQuestLogText_UsedFieldMove(const u16 *eventData)
|
||||
if (r5[0] == FIELD_MOVE_TELEPORT)
|
||||
{
|
||||
if (r5[1] == 0x58)
|
||||
StringCopy(gStringVar3, QuestLog_Text_Home);
|
||||
StringCopy(gStringVar3, gText_QuestLog_Home);
|
||||
else
|
||||
StringCopy(gStringVar3, gText_PokemonCenter);
|
||||
}
|
||||
@@ -4323,12 +4196,12 @@ static const u16 *BufferQuestLogText_BoughtItem(const u16 *eventData)
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, ItemId_GetName(r4[0]));
|
||||
if (r4[1] < 2)
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_BoughtItem);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_BoughtItem);
|
||||
else
|
||||
{
|
||||
ConvertIntToDecimalStringN(gStringVar2, r6, STR_CONV_MODE_LEFT_ALIGN, 6);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, gStringVar2);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_BoughtItemsIncludingItem);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_BoughtItemsIncludingItem);
|
||||
}
|
||||
return (const u16 *)(r7 + 2);
|
||||
}
|
||||
@@ -4359,15 +4232,15 @@ static const u16 *BufferQuestLogText_SoldItem(const u16 *eventData)
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gStringVar1);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, ItemId_GetName(r5[0]));
|
||||
if (r5[1] == 1)
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(3, QuestLog_Text_JustOne);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(3, gText_QuestLog_JustOne);
|
||||
else
|
||||
{
|
||||
ConvertIntToDecimalStringN(gStringVar2, r5[1], STR_CONV_MODE_LEFT_ALIGN, 3);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(4, gStringVar2);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar3, QuestLog_Text_Num);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar3, gText_QuestLog_Num);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(3, gStringVar3);
|
||||
}
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_SoldNumOfItem);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_SoldNumOfItem);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -4375,7 +4248,7 @@ static const u16 *BufferQuestLogText_SoldItem(const u16 *eventData)
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, ItemId_GetName(r5[0]));
|
||||
ConvertIntToDecimalStringN(gStringVar2, r6, STR_CONV_MODE_LEFT_ALIGN, 6);
|
||||
DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, gStringVar2);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, QuestLog_Text_SoldItemsIncludingItem);
|
||||
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gText_QuestLog_SoldItemsIncludingItem);
|
||||
}
|
||||
return (const u16 *)(r7 + 2);
|
||||
}
|
||||
@@ -4396,7 +4269,7 @@ static const u16 *BufferQuestLogText_ObtainedItem(const u16 *eventData)
|
||||
const u8 *r5 = (const u8 *)r4 + 2;
|
||||
GetMapNameGeneric(gStringVar1, r5[0]);
|
||||
StringCopy(gStringVar2, ItemId_GetName(r4[0]));
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_ObtainedItemInLocation);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_ObtainedItemInLocation);
|
||||
return (const u16 *)(r5 + 2);
|
||||
}
|
||||
|
||||
@@ -4474,7 +4347,7 @@ static const u16 *BufferQuestLogText_ArrivedInLocation(const u16 *eventData)
|
||||
{
|
||||
const u16 *r4 = sub_8113E88(QL_EVENT_ARRIVED, eventData);
|
||||
GetMapNameGeneric(gStringVar1, (u8)r4[0]);
|
||||
StringExpandPlaceholders(gStringVar4, QuestLog_Text_ArrivedInLocation);
|
||||
StringExpandPlaceholders(gStringVar4, gText_QuestLog_ArrivedInLocation);
|
||||
return r4 + 1;
|
||||
}
|
||||
|
||||
|
||||
+1337
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -797,7 +797,7 @@ static void Task_SelectTMAction_FromFieldBag(u8 taskId)
|
||||
Menu_InitCursor(sTMCaseDynamicResources->contextMenuWindowId, 2, 0, 2, GetFontAttribute(2, 1) + 2, sTMCaseDynamicResources->numMenuActions, 0);
|
||||
strbuf = Alloc(256);
|
||||
GetTMNumberAndMoveString(strbuf, gSpecialVar_ItemId);
|
||||
StringAppend(strbuf, gText_IsSelected);
|
||||
StringAppend(strbuf, gText_Var1IsSelected + 2); // +2 skips over the stringvar
|
||||
AddTextPrinterParameterized_ColorByIndex(2, 2, strbuf, 0, 2, 1, 0, 0, 1);
|
||||
Free(strbuf);
|
||||
if (itemid_is_unique(gSpecialVar_ItemId))
|
||||
|
||||
Reference in New Issue
Block a user