From cb04557fab2b381af44e5f43f041aabd78226372 Mon Sep 17 00:00:00 2001 From: Viperio <146665252+Viperio19@users.noreply.github.com> Date: Tue, 19 May 2026 00:57:02 +0200 Subject: [PATCH] Document counterpart talk, day-care, and follower partners common scripts (#1164) --- asm/macros/scrcmd.inc | 8 +- generated/vars_flags.txt | 12 +- include/data/scripts/scrcmd.h | 2 +- include/unk_0203D1B8.h | 2 +- res/field/events/events_pokemon_day_care.json | 2 +- res/field/events/events_sandgem_town.json | 2 +- res/field/scripts/scripts_counterpart_talk.s | 349 +++++++++--------- res/field/scripts/scripts_day_care_common.s | 266 ++++++------- res/field/scripts/scripts_follower_partners.s | 92 ++--- res/field/scripts/scripts_pokemon_day_care.s | 2 +- res/field/scripts/scripts_sandgem_town.s | 54 +-- res/text/counterpart_talk.json | 60 +-- res/text/day_care_common.json | 84 ++--- res/text/follower_partners.json | 50 +-- res/text/menu_entries.json | 6 +- src/scrcmd.c | 32 +- src/unk_0203D1B8.c | 2 +- 17 files changed, 514 insertions(+), 511 deletions(-) diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index 27d3fdc557..43e902ab1d 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -3932,10 +3932,10 @@ .short \partySlot .endm - .macro ScrCmd_291 arg0, arg1 - .short SCRCMD_291 - .short \arg0 - .short \arg1 + .macro GetDayCarePartyMenuResult selectedSlot, showSummary + .short SCRCMD_GETDAYCAREPARTYMENURESULT + .short \selectedSlot + .short \showSummary .endm .macro CheckShouldShowGhost percentChance, destVar diff --git a/generated/vars_flags.txt b/generated/vars_flags.txt index bc163bbc4b..ed7df632fc 100644 --- a/generated/vars_flags.txt +++ b/generated/vars_flags.txt @@ -113,7 +113,7 @@ FLAG_UNK_0x006F FLAG_CHOSE_UNION_ROOM_APPEARANCE FLAG_UNK_0x0071 FLAG_UNK_0x0072 -FLAG_UNK_0x0073 +FLAG_DUMMY_0x0073 FLAG_OBTAINED_GARDENIA_TM86 FLAG_OBTAINED_ROARK_TM76 FLAG_RECEIVED_ETERNA_CITY_CONDOMINIUMS_4F_TM04 @@ -252,7 +252,7 @@ FLAG_JOINED_RIBBON_SYNDICATE FLAG_SKIP_POKEMON_MANSION_OFFICE_BOOK_SEEN_MANAPHY_CHECK FLAG_UNDERGROUND_MAN_COULDNT_GIVE_REWARD FLAG_TALKED_TO_GRAND_LAKE_ROUTE_213_LOBBY_LOOKER -FLAG_UNK_0x00FE +FLAG_STORED_POKEMON_AT_DAY_CARE FLAG_TALKED_TO_STATS_JUDGE FLAG_TALKED_TO_ROUTE_210_GRANDMA_WILMA FLAG_UNK_0x0101 @@ -324,9 +324,9 @@ FLAG_RECEIVED_PASTORIA_CITY_NORTHEAST_HOUSE_PINK_SCARF FLAG_RECEIVED_PASTORIA_CITY_NORTHEAST_HOUSE_GREEN_SCARF FLAG_RECEIVED_PASTORIA_CITY_NORTHEAST_HOUSE_YELLOW_SCARF FLAG_UNLOCKED_DIALGA_PALKIA_SPEAR_PILLAR -FLAG_UNK_0x0146 -FLAG_UNK_0x0147 -FLAG_UNK_0x0148 +FLAG_STARTED_COUNTERPART_POKE_RADAR_TUTORIAL +FLAG_DUMMY_0x0147 +FLAG_DUMMY_0x0148 FLAG_CAUGHT_OLD_CHATEAU_ROTOM FLAG_RECEIVED_HEARTHOME_CITY_GLOBE FLAG_RECEIVED_HEARTHOME_CITY_GYM_STATUE @@ -4302,7 +4302,7 @@ VAR_PASTORIA_CITY_TRY_CROAGUNK_SCENE_STATE VAR_RESORT_AREA_STATE VAR_UNK_0x40C9 VAR_FOLLOWER_RIVAL_TIMES_TALKED -VAR_UNK_0x40CB +VAR_FOLLOWER_UNUSED_TIMES_TALKED VAR_ONGOING_CONTEST VAR_ETERNA_FOREST_CHERYL_OLD_CHATEAU_CUTSCENE_STATE VAR_ELEVATOR_FLOORS_ABOVE diff --git a/include/data/scripts/scrcmd.h b/include/data/scripts/scrcmd.h index a5cc3dd13b..8d23037f8d 100644 --- a/include/data/scripts/scrcmd.h +++ b/include/data/scripts/scrcmd.h @@ -662,7 +662,7 @@ ScriptCommand(SCRCMD_28D, ScrCm ScriptCommand(SCRCMD_28E, ScrCmd_28E) ScriptCommand(SCRCMD_GETLEAGUEVICTORIES, ScrCmd_GetLeagueVictories) ScriptCommand(SCRCMD_OPENPARTYMENUFORDAYCARE, ScrCmd_OpenPartyMenuForDaycare) -ScriptCommand(SCRCMD_291, ScrCmd_291) +ScriptCommand(SCRCMD_GETDAYCAREPARTYMENURESULT, ScrCmd_GetDayCarePartyMenuResult) ScriptCommand(SCRCMD_CHECKSHOULDSHOWGHOST, ScrCmd_CheckShouldShowGhost) ScriptCommand(SCRCMD_GETUNDERGROUNDTALKCOUNTER, ScrCmd_GetUndergroundTalkCounter) ScriptCommand(SCRCMD_SHOWBATTLEPOINTS, ScrCmd_ShowBattlePoints) diff --git a/include/unk_0203D1B8.h b/include/unk_0203D1B8.h index 8e18a4d8a0..01759175f9 100644 --- a/include/unk_0203D1B8.h +++ b/include/unk_0203D1B8.h @@ -53,7 +53,7 @@ PartyMenu *FieldSystem_OpenPartyMenu_SelectForItemUsage(FieldSystem *fieldSystem int PartyMenu_GetSelectedSlot(PartyMenu *partyMenu); int PartyMenu_GetMenuSelectionResult(PartyMenu *partyMenu); int PokemonSummary_GetPartySlot(PokemonSummary *monSummary); -void *FieldSystem_GetContestMonSummary(int unused, FieldSystem *fieldSystem, int partySlot); +void *FieldSystem_GetPartyMenuMonSummary(int unused, FieldSystem *fieldSystem, int partySlot); PokemonSummary *sub_0203D670(FieldSystem *fieldSystem, enum HeapID heapID, int mode); void *FieldSystem_OpenSummaryScreenSelectMove(enum HeapID heapID, FieldSystem *fieldSystem, u8 partyIndex); int PokemonSummary_GetSelectedMoveSlot(void *summary); diff --git a/res/field/events/events_pokemon_day_care.json b/res/field/events/events_pokemon_day_care.json index ed9eaa3f3e..dd093cf0b3 100644 --- a/res/field/events/events_pokemon_day_care.json +++ b/res/field/events/events_pokemon_day_care.json @@ -11,7 +11,7 @@ ], "object_events": [ { - "id": "LOCALID_EXPERT_F", + "id": "LOCALID_DAY_CARE_LADY", "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "movement_type": "MOVEMENT_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/events/events_sandgem_town.json b/res/field/events/events_sandgem_town.json index 834206f729..9a84ab7905 100644 --- a/res/field/events/events_sandgem_town.json +++ b/res/field/events/events_sandgem_town.json @@ -62,7 +62,7 @@ "y": 1 }, { - "id": "LOCALID_COUNTERPART", + "id": "LOCALID_SANDGEM_COUNTERPART", "graphics_id": "OBJ_EVENT_GFX_VAR_0", "movement_type": "MOVEMENT_TYPE_LOOK_WEST", "trainer_type": "TRAINER_TYPE_NONE", diff --git a/res/field/scripts/scripts_counterpart_talk.s b/res/field/scripts/scripts_counterpart_talk.s index 20559abfa5..bff8992024 100644 --- a/res/field/scripts/scripts_counterpart_talk.s +++ b/res/field/scripts/scripts_counterpart_talk.s @@ -1,353 +1,354 @@ #include "macros/scrcmd.inc" #include "res/text/bank/counterpart_talk.h" +#include "res/field/events/events_sandgem_town.h" - ScriptEntry _0006 + ScriptEntry CounterpartTalk_Counterpart ScriptEntryEnd -_0006: +CounterpartTalk_Counterpart: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer GetPlayerGender VAR_0x8004 - GoToIfEq VAR_SANDGEM_TOWN_LAB_STATE, 3, _0027 - GoTo _006C + GoToIfEq VAR_SANDGEM_TOWN_LAB_STATE, 3, CounterpartTalk_CheckVisitedSunyshore + GoTo CounterpartTalk_CounterpartMessage End -_0027: - GoToIfUnset FLAG_FIRST_ARRIVAL_SUNYSHORE_CITY, _003A - GoTo _006C +CounterpartTalk_CheckVisitedSunyshore: + GoToIfUnset FLAG_FIRST_ARRIVAL_SUNYSHORE_CITY, CounterpartTalk_YouMetCreatorsOfSinnoh + GoTo CounterpartTalk_CounterpartMessage End -_003A: - CallIfEq VAR_0x8004, GENDER_MALE, _005C - CallIfEq VAR_0x8004, GENDER_FEMALE, _0064 +CounterpartTalk_YouMetCreatorsOfSinnoh: + CallIfEq VAR_0x8004, GENDER_MALE, CounterpartTalk_DawnYouMetCreatorsOfSinnoh + CallIfEq VAR_0x8004, GENDER_FEMALE, CounterpartTalk_LucasYouMetCreatorsOfSinnoh WaitButton CloseMessage ReleaseAll End -_005C: +CounterpartTalk_DawnYouMetCreatorsOfSinnoh: BufferPlayerName 0 - Message 28 + Message CounterpartTalk_Text_DawnYouMetCreatorsOfSinnoh Return -_0064: +CounterpartTalk_LucasYouMetCreatorsOfSinnoh: BufferPlayerName 0 - Message 29 + Message CounterpartTalk_Text_LucasYouMetCreatorsOfSinnoh Return -_006C: +CounterpartTalk_CounterpartMessage: CheckIsTodayPlayerBirthday VAR_RESULT - GoToIfEq VAR_RESULT, TRUE, _0133 + GoToIfEq VAR_RESULT, TRUE, CounterpartTalk_PlayerBirthday CheckLocalDexCompleted VAR_RESULT - GoToIfEq VAR_RESULT, 1, _00B2 - GoToIfUnset FLAG_UNLOCKED_DIALGA_PALKIA_SPEAR_PILLAR, _0332 - Call _04A4 - GoToIfEq VAR_RESULT, 0, _037C - GoTo _0357 + GoToIfEq VAR_RESULT, TRUE, CounterpartTalk_CompletedLocalDex + GoToIfUnset FLAG_UNLOCKED_DIALGA_PALKIA_SPEAR_PILLAR, CounterpartTalk_ElderHasSomethingToTell + Call CounterpartTalk_CheckDialgaOrPalkiaAtSpearPillar + GoToIfEq VAR_RESULT, FALSE, CounterpartTalk_CongratulationsChamp + GoTo CounterpartTalk_DialgaOrPalkiaAtSpearPillar -_00B2: +CounterpartTalk_CompletedLocalDex: GetNationalDexEnabled VAR_RESULT - GoToIfEq VAR_RESULT, 0, _030D - GoToIfUnset FLAG_TALKED_TO_COUNTERPART_SISTER_WITH_NATIONAL_DEX, _02E8 - GoToIfUnset FLAG_RECEIVED_HEARTHOME_CITY_NORTHWEST_HOUSE_EEVEE, _02C3 + GoToIfEq VAR_RESULT, FALSE, CounterpartTalk_SeenEverySinnohPokemon + GoToIfUnset FLAG_TALKED_TO_COUNTERPART_SISTER_WITH_NATIONAL_DEX, CounterpartTalk_HaveYouTalkedToMySister + GoToIfUnset FLAG_RECEIVED_HEARTHOME_CITY_NORTHWEST_HOUSE_EEVEE, CounterpartTalk_HaveYouMetBebe CheckNationalDexCompleted VAR_RESULT - GoToIfEq VAR_RESULT, 1, _0158 - GoTo _00F3 + GoToIfEq VAR_RESULT, TRUE, CounterpartTalk_CompletedNationalDex + GoTo CounterpartTalk_PlayerHasPokeRadar End -_00F3: - GoToIfUnset FLAG_UNK_0x0146, _01F4 +CounterpartTalk_PlayerHasPokeRadar: + GoToIfUnset FLAG_STARTED_COUNTERPART_POKE_RADAR_TUTORIAL, CounterpartTalk_StartPokeRadarTutorial GetRandom VAR_RESULT, 3 SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, 0, _01CB - GoToIfEq VAR_0x8008, 1, _01A2 - GoToIfEq VAR_0x8008, 2, _017D + GoToIfEq VAR_0x8008, 0, CounterpartTalk_HowsYourPokeRadar + GoToIfEq VAR_0x8008, 1, CounterpartTalk_SometimesPatchOfGrassSparkles + GoToIfEq VAR_0x8008, 2, CounterpartTalk_HelpingWithNationalPokedex End -_0133: +CounterpartTalk_PlayerBirthday: BufferPlayerName 0 - CallIfEq VAR_0x8004, 0, _03A9 - CallIfEq VAR_0x8004, 1, _03D6 - GoTo _03A1 + CallIfEq VAR_0x8004, GENDER_MALE, CounterpartTalk_DawnIsTodayYourBirthday + CallIfEq VAR_0x8004, GENDER_FEMALE, CounterpartTalk_LucasIsItYourBirthdayToday + GoTo CounterpartTalk_CounterpartEnd End -_0158: +CounterpartTalk_CompletedNationalDex: BufferPlayerName 0 - CallIfEq VAR_0x8004, 0, _0467 - CallIfEq VAR_0x8004, 1, _046C - GoTo _03A1 + CallIfEq VAR_0x8004, GENDER_MALE, CounterpartTalk_DawnCompletedNationalDex + CallIfEq VAR_0x8004, GENDER_FEMALE, CounterpartTalk_LucasCompletedNationalDex + GoTo CounterpartTalk_CounterpartEnd End -_017D: +CounterpartTalk_HelpingWithNationalPokedex: BufferPlayerName 0 - CallIfEq VAR_0x8004, 0, _045D - CallIfEq VAR_0x8004, 1, _0462 - GoTo _03A1 + CallIfEq VAR_0x8004, GENDER_MALE, CounterpartTalk_DawnHelpingWithNationalPokedex + CallIfEq VAR_0x8004, GENDER_FEMALE, CounterpartTalk_LucasHelpingWithNationalPokedex + GoTo CounterpartTalk_CounterpartEnd End -_01A2: - SetFlag FLAG_UNK_0x0148 +CounterpartTalk_SometimesPatchOfGrassSparkles: + SetFlag FLAG_DUMMY_0x0148 BufferPlayerName 0 - CallIfEq VAR_0x8004, 0, _0453 - CallIfEq VAR_0x8004, 1, _0458 - GoTo _03A1 + CallIfEq VAR_0x8004, GENDER_MALE, CounterpartTalk_DawnSometimesPatchOfGrassSparkles + CallIfEq VAR_0x8004, GENDER_FEMALE, CounterpartTalk_LucasSometimesPatchOfGrassSparkles + GoTo CounterpartTalk_CounterpartEnd End -_01CB: - SetFlag FLAG_UNK_0x0147 +CounterpartTalk_HowsYourPokeRadar: + SetFlag FLAG_DUMMY_0x0147 BufferPlayerName 0 - CallIfEq VAR_0x8004, 0, _0449 - CallIfEq VAR_0x8004, 1, _044E - GoTo _03A1 + CallIfEq VAR_0x8004, GENDER_MALE, CounterpartTalk_DawnHowsYourPokeRadar + CallIfEq VAR_0x8004, GENDER_FEMALE, CounterpartTalk_LucasHowsYourPokeRadar + GoTo CounterpartTalk_CounterpartEnd End -_01F4: - SetFlag FLAG_UNK_0x0146 +CounterpartTalk_StartPokeRadarTutorial: + SetFlag FLAG_STARTED_COUNTERPART_POKE_RADAR_TUTORIAL BufferPlayerName 0 - CallIfEq VAR_0x8004, 0, _043F - CallIfEq VAR_0x8004, 1, _0444 + CallIfEq VAR_0x8004, GENDER_MALE, CounterpartTalk_DawnIllShowUsePokeRadar + CallIfEq VAR_0x8004, GENDER_FEMALE, CounterpartTalk_LucasIllTeachUsePokeRadar CloseMessage GetPlayerDir VAR_RESULT - GoToIfEq VAR_RESULT, 0, _0251 - GoToIfEq VAR_RESULT, 1, _026B - GoToIfEq VAR_RESULT, 2, _0285 - GoToIfEq VAR_RESULT, 3, _029F + GoToIfEq VAR_RESULT, DIR_NORTH, CounterpartTalk_CounterpartLeaveNorth + GoToIfEq VAR_RESULT, DIR_SOUTH, CounterpartTalk_CounterpartLeaveSouth + GoToIfEq VAR_RESULT, DIR_WEST, CounterpartTalk_CounterpartLeaveWest + GoToIfEq VAR_RESULT, DIR_EAST, CounterpartTalk_CounterpartLeaveEast End -_0251: - ApplyMovement 4, _0474 - ApplyMovement LOCALID_PLAYER, _0488 +CounterpartTalk_CounterpartLeaveNorth: + ApplyMovement LOCALID_SANDGEM_COUNTERPART, CounterpartTalk_Movement_CounterpartLeaveNorthSouthEast + ApplyMovement LOCALID_PLAYER, CounterpartTalk_Movement_PlayerWatchCounterpartLeaveNorthSouth WaitMovement - GoTo _02B1 + GoTo CounterpartTalk_RemoveCounterpart End -_026B: - ApplyMovement 4, _0474 - ApplyMovement LOCALID_PLAYER, _0488 +CounterpartTalk_CounterpartLeaveSouth: + ApplyMovement LOCALID_SANDGEM_COUNTERPART, CounterpartTalk_Movement_CounterpartLeaveNorthSouthEast + ApplyMovement LOCALID_PLAYER, CounterpartTalk_Movement_PlayerWatchCounterpartLeaveNorthSouth WaitMovement - GoTo _02B1 + GoTo CounterpartTalk_RemoveCounterpart End -_0285: - ApplyMovement 4, _047C - ApplyMovement LOCALID_PLAYER, _0494 +CounterpartTalk_CounterpartLeaveWest: + ApplyMovement LOCALID_SANDGEM_COUNTERPART, CounterpartTalk_Movement_CounterpartLeaveWest + ApplyMovement LOCALID_PLAYER, CounterpartTalk_Movement_PlayerWatchCounterpartLeaveWest WaitMovement - GoTo _02B1 + GoTo CounterpartTalk_RemoveCounterpart End -_029F: - ApplyMovement 4, _0474 +CounterpartTalk_CounterpartLeaveEast: + ApplyMovement LOCALID_SANDGEM_COUNTERPART, CounterpartTalk_Movement_CounterpartLeaveNorthSouthEast WaitMovement - GoTo _02B1 + GoTo CounterpartTalk_RemoveCounterpart End -_02B1: - RemoveObject 4 +CounterpartTalk_RemoveCounterpart: + RemoveObject LOCALID_SANDGEM_COUNTERPART ClearFlag FLAG_HIDE_ROUTE_202_COUNTERPART SetVar VAR_ROUTE_202_STATE, 2 ReleaseAll End -_02C3: +CounterpartTalk_HaveYouMetBebe: BufferPlayerName 0 - CallIfEq VAR_0x8004, 0, _0435 - CallIfEq VAR_0x8004, 1, _043A - GoTo _03A1 + CallIfEq VAR_0x8004, GENDER_MALE, CounterpartTalk_DawnAreYouAcquaintedWithBebe + CallIfEq VAR_0x8004, GENDER_FEMALE, CounterpartTalk_LucasHaveYouMetBebe + GoTo CounterpartTalk_CounterpartEnd End -_02E8: +CounterpartTalk_HaveYouTalkedToMySister: BufferPlayerName 0 - CallIfEq VAR_0x8004, 0, _042B - CallIfEq VAR_0x8004, 1, _0430 - GoTo _03A1 + CallIfEq VAR_0x8004, GENDER_MALE, CounterpartTalk_DawnHaveYouChattedWithMySister + CallIfEq VAR_0x8004, GENDER_FEMALE, CounterpartTalk_LucasHaveYouSeenMySister + GoTo CounterpartTalk_CounterpartEnd End -_030D: +CounterpartTalk_SeenEverySinnohPokemon: BufferPlayerName 0 - CallIfEq VAR_0x8004, 0, _0421 - CallIfEq VAR_0x8004, 1, _0426 - GoTo _03A1 + CallIfEq VAR_0x8004, GENDER_MALE, CounterpartTalk_DawnSeenEverySinnohPokemon + CallIfEq VAR_0x8004, GENDER_FEMALE, CounterpartTalk_LucasSeenEverySinnohPokemon + GoTo CounterpartTalk_CounterpartEnd End -_0332: +CounterpartTalk_ElderHasSomethingToTell: BufferPlayerName 0 - CallIfEq VAR_0x8004, 0, _0417 - CallIfEq VAR_0x8004, 1, _041C - GoTo _03A1 + CallIfEq VAR_0x8004, GENDER_MALE, CounterpartTalk_DawnElderHasSomethingToTell + CallIfEq VAR_0x8004, GENDER_FEMALE, CounterpartTalk_LucasElderHasSomethingToTell + GoTo CounterpartTalk_CounterpartEnd End -_0357: +CounterpartTalk_DialgaOrPalkiaAtSpearPillar: BufferPlayerName 0 - CallIfEq VAR_0x8004, 0, _040D - CallIfEq VAR_0x8004, 1, _0412 - GoTo _03A1 + CallIfEq VAR_0x8004, GENDER_MALE, CounterpartTalk_DawnDialgaOrPalkiaAtSpearPillar + CallIfEq VAR_0x8004, GENDER_FEMALE, CounterpartTalk_LucasDialgaOrPalkiaAtSpearPillar + GoTo CounterpartTalk_CounterpartEnd End -_037C: +CounterpartTalk_CongratulationsChamp: BufferPlayerName 0 - CallIfEq VAR_0x8004, 0, _0403 - CallIfEq VAR_0x8004, 1, _0408 - GoTo _03A1 + CallIfEq VAR_0x8004, GENDER_MALE, CounterpartTalk_DawnCongratulationsChamp + CallIfEq VAR_0x8004, GENDER_FEMALE, CounterpartTalk_LucasCongratulationsChamp + GoTo CounterpartTalk_CounterpartEnd End -_03A1: +CounterpartTalk_CounterpartEnd: WaitButton CloseMessage ReleaseAll End -_03A9: - Message 10 +CounterpartTalk_DawnIsTodayYourBirthday: + Message CounterpartTalk_Text_DawnIsTodayYourBirthday ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _03CC - GoToIfEq VAR_RESULT, MENU_NO, _03D1 + GoToIfEq VAR_RESULT, MENU_YES, CounterpartTalk_DawnCongratulations + GoToIfEq VAR_RESULT, MENU_NO, CounterpartTalk_DawnWhatMadeMeThinkBirthday End -_03CC: - Message 11 +CounterpartTalk_DawnCongratulations: + Message CounterpartTalk_Text_DawnCongratulations Return -_03D1: - Message 12 +CounterpartTalk_DawnWhatMadeMeThinkBirthday: + Message CounterpartTalk_Text_DawnWhatMadeMeThinkBirthday Return -_03D6: - Message 24 +CounterpartTalk_LucasIsItYourBirthdayToday: + Message CounterpartTalk_Text_LucasIsItYourBirthdayToday ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _03F9 - GoToIfEq VAR_RESULT, MENU_NO, _03FE + GoToIfEq VAR_RESULT, MENU_YES, CounterpartTalk_LucasCongratulations + GoToIfEq VAR_RESULT, MENU_NO, CounterpartTalk_LucasWhatMadeMeThinkBirthday End -_03F9: - Message 25 +CounterpartTalk_LucasCongratulations: + Message CounterpartTalk_Text_LucasCongratulations Return -_03FE: - Message 26 +CounterpartTalk_LucasWhatMadeMeThinkBirthday: + Message CounterpartTalk_Text_LucasWhatMadeMeThinkBirthday Return -_0403: - Message 13 +CounterpartTalk_DawnCongratulationsChamp: + Message CounterpartTalk_Text_DawnCongratulationsChamp Return -_0408: - Message 27 +CounterpartTalk_LucasCongratulationsChamp: + Message CounterpartTalk_Text_LucasCongratulationsChamp Return -_040D: - Message 0 +CounterpartTalk_DawnDialgaOrPalkiaAtSpearPillar: + Message CounterpartTalk_Text_DawnDialgaOrPalkiaAtSpearPillar Return -_0412: - Message 14 +CounterpartTalk_LucasDialgaOrPalkiaAtSpearPillar: + Message CounterpartTalk_Text_LucasDialgaOrPalkiaAtSpearPillar Return -_0417: - Message 1 +CounterpartTalk_DawnElderHasSomethingToTell: + Message CounterpartTalk_Text_DawnElderHasSomethingToTell Return -_041C: - Message 15 +CounterpartTalk_LucasElderHasSomethingToTell: + Message CounterpartTalk_Text_LucasElderHasSomethingToTell Return -_0421: - Message 2 +CounterpartTalk_DawnSeenEverySinnohPokemon: + Message CounterpartTalk_Text_DawnSeenEverySinnohPokemon Return -_0426: - Message 16 +CounterpartTalk_LucasSeenEverySinnohPokemon: + Message CounterpartTalk_Text_LucasSeenEverySinnohPokemon Return -_042B: - Message 3 +CounterpartTalk_DawnHaveYouChattedWithMySister: + Message CounterpartTalk_Text_DawnHaveYouChattedWithMySister Return -_0430: - Message 17 +CounterpartTalk_LucasHaveYouSeenMySister: + Message CounterpartTalk_Text_LucasHaveYouSeenMySister Return -_0435: - Message 4 +CounterpartTalk_DawnAreYouAcquaintedWithBebe: + Message CounterpartTalk_Text_DawnAreYouAcquaintedWithBebe Return -_043A: - Message 18 +CounterpartTalk_LucasHaveYouMetBebe: + Message CounterpartTalk_Text_LucasHaveYouMetBebe Return -_043F: - Message 5 +CounterpartTalk_DawnIllShowUsePokeRadar: + Message CounterpartTalk_Text_DawnIllShowUsePokeRadar Return -_0444: - Message 19 +CounterpartTalk_LucasIllTeachUsePokeRadar: + Message CounterpartTalk_Text_LucasIllTeachUsePokeRadar Return -_0449: - Message 6 +CounterpartTalk_DawnHowsYourPokeRadar: + Message CounterpartTalk_Text_DawnHowsYourPokeRadar Return -_044E: - Message 20 +CounterpartTalk_LucasHowsYourPokeRadar: + Message CounterpartTalk_Text_LucasHowsYourPokeRadar Return -_0453: - Message 7 +CounterpartTalk_DawnSometimesPatchOfGrassSparkles: + Message CounterpartTalk_Text_DawnSometimesPatchOfGrassSparkles Return -_0458: - Message 21 +CounterpartTalk_LucasSometimesPatchOfGrassSparkles: + Message CounterpartTalk_Text_LucasSometimesPatchOfGrassSparkles Return -_045D: - Message 8 +CounterpartTalk_DawnHelpingWithNationalPokedex: + Message CounterpartTalk_Text_DawnHelpingWithNationalPokedex Return -_0462: - Message 22 +CounterpartTalk_LucasHelpingWithNationalPokedex: + Message CounterpartTalk_Text_LucasHelpingWithNationalPokedex Return -_0467: - Message 9 +CounterpartTalk_DawnCompletedNationalDex: + Message CounterpartTalk_Text_DawnCompletedNationalDex Return -_046C: - Message 23 +CounterpartTalk_LucasCompletedNationalDex: + Message CounterpartTalk_Text_LucasCompletedNationalDex Return .balign 4, 0 -_0474: +CounterpartTalk_Movement_CounterpartLeaveNorthSouthEast: WalkNormalEast 10 EndMovement .balign 4, 0 -_047C: +CounterpartTalk_Movement_CounterpartLeaveWest: WalkNormalNorth WalkNormalEast 10 EndMovement .balign 4, 0 -_0488: +CounterpartTalk_Movement_PlayerWatchCounterpartLeaveNorthSouth: Delay8 WalkOnSpotNormalEast EndMovement .balign 4, 0 -_0494: +CounterpartTalk_Movement_PlayerWatchCounterpartLeaveWest: Delay8 WalkOnSpotNormalNorth WalkOnSpotNormalEast EndMovement -_04A4: - GoToIfEq VAR_SPEAR_PILLAR_DIALGA_STATE, 1, _04C6 - GoToIfEq VAR_SPEAR_PILLAR_PALKIA_STATE, 1, _04C6 - SetVar VAR_RESULT, 1 +CounterpartTalk_CheckDialgaOrPalkiaAtSpearPillar: + GoToIfEq VAR_SPEAR_PILLAR_DIALGA_STATE, 1, CounterpartTalk_DialgaOrPalkiaNotAtSpearPillar + GoToIfEq VAR_SPEAR_PILLAR_PALKIA_STATE, 1, CounterpartTalk_DialgaOrPalkiaNotAtSpearPillar + SetVar VAR_RESULT, TRUE Return -_04C6: - SetVar VAR_RESULT, 0 +CounterpartTalk_DialgaOrPalkiaNotAtSpearPillar: + SetVar VAR_RESULT, FALSE Return .balign 4, 0 diff --git a/res/field/scripts/scripts_day_care_common.s b/res/field/scripts/scripts_day_care_common.s index 4a6571677e..9c6a68bdaa 100644 --- a/res/field/scripts/scripts_day_care_common.s +++ b/res/field/scripts/scripts_day_care_common.s @@ -1,168 +1,170 @@ #include "macros/scrcmd.inc" #include "res/text/bank/day_care_common.h" +#include "res/text/bank/menu_entries.h" +#include "res/field/events/events_pokemon_day_care.h" #include "constants/daycare.h" - ScriptEntry _000A - ScriptEntry _0124 + ScriptEntry DayCareCommon_Man + ScriptEntry DayCareCommon_Lady ScriptEntryEnd -_000A: +DayCareCommon_Man: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer BufferDaycareMonNicknames GetDaycareState VAR_RESULT - GoToIfEq VAR_RESULT, DAYCARE_EGG_WAITING, _004A - GoToIfEq VAR_RESULT, DAYCARE_ONE_MON, _00BE - GoToIfEq VAR_RESULT, DAYCARE_TWO_MONS, _00CB - Message 0 + GoToIfEq VAR_RESULT, DAYCARE_EGG_WAITING, DayCareCommon_ManEggWaiting + GoToIfEq VAR_RESULT, DAYCARE_ONE_MON, DayCareCommon_ManOneMon + GoToIfEq VAR_RESULT, DAYCARE_TWO_MONS, DayCareCommon_ManTwoMons + Message DayCareCommon_Text_ImTheDayCareMan WaitButton CloseMessage ReleaseAll End -_004A: - Message 1 +DayCareCommon_ManEggWaiting: + Message DayCareCommon_Text_PokemonHoldingEggYouWantIt ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _0083 - Message 10 + GoToIfEq VAR_RESULT, MENU_YES, DayCareCommon_TryGiveEgg + Message DayCareCommon_Text_YouDoWantThisYes ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _0083 - Message 3 + GoToIfEq VAR_RESULT, MENU_YES, DayCareCommon_TryGiveEgg + Message DayCareCommon_Text_IllHangOnToIt WaitButton CloseMessage - ClearFlag FLAG_UNK_0x0073 + ClearFlag FLAG_DUMMY_0x0073 ResetDaycarePersonalityAndStepCounter ReleaseAll End -_0083: +DayCareCommon_TryGiveEgg: GetPartyCount VAR_RESULT - GoToIfNe VAR_RESULT, 6, _009F - Message 4 + GoToIfNe VAR_RESULT, MAX_PARTY_SIZE, DayCareCommon_GiveEgg + Message DayCareCommon_Text_YouHaveNoRoom WaitButton CloseMessage ReleaseAll End -_009F: +DayCareCommon_GiveEgg: BufferPlayerName 0 - Message 5 + Message DayCareCommon_Text_PlayerReceivedEgg PlayFanfare SEQ_FANFA4 WaitFanfare WaitABPress - Message 6 + Message DayCareCommon_Text_TakeGoodCareOfIt WaitButton CloseMessage GiveEggFromDaycare - ClearFlag FLAG_UNK_0x0073 + ClearFlag FLAG_DUMMY_0x0073 ReleaseAll End -_00BE: +DayCareCommon_ManOneMon: BufferDaycareMonNicknames - Message 2 + Message DayCareCommon_Text_PokemonIsDoingJustFine WaitButton CloseMessage ReleaseAll End -_00CB: +DayCareCommon_ManTwoMons: BufferDaycareMonNicknames - Message 9 + Message DayCareCommon_Text_PokemonAreDoingJustFine GetDaycareCompatibilityLevel VAR_RESULT - CallIfEq VAR_RESULT, 0, _0110 - CallIfEq VAR_RESULT, 1, _0115 - CallIfEq VAR_RESULT, 2, _011A - CallIfEq VAR_RESULT, 3, _011F + CallIfEq VAR_RESULT, 0, DayCareCommon_MaxCompatibility + CallIfEq VAR_RESULT, 1, DayCareCommon_MedCompatibility + CallIfEq VAR_RESULT, 2, DayCareCommon_LowCompatibility + CallIfEq VAR_RESULT, 3, DayCareCommon_Incompatible WaitButton CloseMessage ReleaseAll End -_0110: - Message 11 +DayCareCommon_MaxCompatibility: + Message DayCareCommon_Text_TheTwoGetAlongVeryWell Return -_0115: - Message 12 +DayCareCommon_MedCompatibility: + Message DayCareCommon_Text_TheTwoGetAlong Return -_011A: - Message 13 +DayCareCommon_LowCompatibility: + Message DayCareCommon_Text_TheTwoDontLikeEachOther Return -_011F: - Message 14 +DayCareCommon_Incompatible: + Message DayCareCommon_Text_TheTwoPlayWithOtherPokemon Return -_0124: +DayCareCommon_Lady: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer ShowMoney 20, 2 GetDaycareState VAR_RESULT - GoToIfEq VAR_RESULT, DAYCARE_EGG_WAITING, _02E2 - GoToIfEq VAR_RESULT, DAYCARE_ONE_MON, _0309 - GoToIfEq VAR_RESULT, DAYCARE_TWO_MONS, _04A0 - Message 15 + GoToIfEq VAR_RESULT, DAYCARE_EGG_WAITING, DayCareCommon_LadyEggWaiting + GoToIfEq VAR_RESULT, DAYCARE_ONE_MON, DayCareCommon_LadyOneMon + GoToIfEq VAR_RESULT, DAYCARE_TWO_MONS, DayCareCommon_LadyTwoMons + Message DayCareCommon_Text_ImTheDayCareLadyRaisePokemon ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _017E - Message 20 + GoToIfEq VAR_RESULT, MENU_YES, DayCareCommon_TryRaisePokemon + Message DayCareCommon_Text_OhFineThen WaitButton CloseMessage HideMoney ReleaseAll End -_017E: +DayCareCommon_TryRaisePokemon: CountPartyNonEggs VAR_RESULT - GoToIfEq VAR_RESULT, 1, _02BB + GoToIfEq VAR_RESULT, 1, DayCareCommon_OnlyOnePokemonWithYou CountAliveMonsAndBoxMons VAR_RESULT - GoToIfEq VAR_RESULT, 2, _02D5 - Message 16 + GoToIfEq VAR_RESULT, 2, DayCareCommon_YoullBeLeftWithJustOne + Message DayCareCommon_Text_RaiseWhichPokemon CloseMessage HideMoney FadeScreenOut WaitFadeScreen SetVar VAR_RESULT, 0 -_01B9: +DayCareCommon_ChoosePokemon: OpenPartyMenuForDaycare VAR_RESULT - ScrCmd_291 VAR_0x8000, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _01DE + GetDayCarePartyMenuResult VAR_0x8000, VAR_RESULT + GoToIfEq VAR_RESULT, 0, DayCareCommon_TryRaiseSelectedSlot SetMonSummary VAR_0x8000 GetMonPartySlot VAR_RESULT - GoTo _01B9 + GoTo DayCareCommon_ChoosePokemon -_01DE: +DayCareCommon_TryRaiseSelectedSlot: ReturnToField ShowMoney 20, 2 FadeScreenIn WaitFadeScreen - GoToIfEq VAR_0x8000, 0xFF, _0292 + GoToIfEq VAR_0x8000, PARTY_SLOT_NONE, DayCareCommon_VeryGoodComeAgain TryRevertPokemonForm VAR_0x8000, VAR_RESULT - GoToIfEq VAR_RESULT, 0xFF, _04EF + GoToIfEq VAR_RESULT, 0xFF, DayCareCommon_GriseousOrbCouldNotBeRemoved GetPartyMonSpecies VAR_0x8000, VAR_RESULT - GoToIfEq VAR_RESULT, SPECIES_NONE, _0285 + GoToIfEq VAR_RESULT, SPECIES_NONE, DayCareCommon_CantRaiseEgg CountAliveMonsExcept VAR_RESULT, VAR_0x8000 - GoToIfEq VAR_RESULT, 0, _02C8 + GoToIfEq VAR_RESULT, 0, DayCareCommon_SelectedOnlyAlivePokemon BufferPartyMonNicknameReturnSpecies 0, VAR_0x8000, VAR_0x8001 StorePartyMonIntoDaycare VAR_0x8000 - SetFlag FLAG_UNK_0x00FE + SetFlag FLAG_STORED_POKEMON_AT_DAY_CARE GetDaycareState VAR_RESULT - GoToIfEq VAR_RESULT, DAYCARE_ONE_MON, _025F - GoTo _0270 + GoToIfEq VAR_RESULT, DAYCARE_ONE_MON, DayCareCommon_RaiseFirstPokemon + GoTo DayCareCommon_RaiseSecondPokemon -_025F: +DayCareCommon_RaiseFirstPokemon: PlayCry VAR_0x8001 - Message 17 + Message DayCareCommon_Text_WellRaiseYourPokemon_ArrowPrompt WaitCry - GoTo _029F + GoTo DayCareCommon_AskRaiseAnotherPokemon -_0270: +DayCareCommon_RaiseSecondPokemon: PlayCry VAR_0x8001 - Message 36 + Message DayCareCommon_Text_WellRaiseYourPokemon WaitButton CloseMessage WaitCry @@ -170,142 +172,142 @@ _0270: ReleaseAll End -_0285: - Message 35 +DayCareCommon_CantRaiseEgg: + Message DayCareCommon_Text_ThatIsMerelyAnEgg WaitButton CloseMessage HideMoney ReleaseAll End -_0292: - Message 23 +DayCareCommon_VeryGoodComeAgain: + Message DayCareCommon_Text_VeryGoodComeAgain WaitButton CloseMessage HideMoney ReleaseAll End -_029F: - Message 18 +DayCareCommon_AskRaiseAnotherPokemon: + Message DayCareCommon_Text_RaiseAnotherPokemon ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _017E - GoTo _0292 + GoToIfEq VAR_RESULT, MENU_YES, DayCareCommon_TryRaisePokemon + GoTo DayCareCommon_VeryGoodComeAgain End -_02BB: - Message 31 +DayCareCommon_OnlyOnePokemonWithYou: + Message DayCareCommon_Text_OnlyOnePokemonWithYou WaitButton CloseMessage HideMoney ReleaseAll End -_02C8: - Message 33 +DayCareCommon_SelectedOnlyAlivePokemon: + Message DayCareCommon_Text_WhatWillYouBattleWith WaitButton CloseMessage HideMoney ReleaseAll End -_02D5: - Message 34 +DayCareCommon_YoullBeLeftWithJustOne: + Message DayCareCommon_Text_YoullBeLeftWithJustOne WaitButton CloseMessage HideMoney ReleaseAll End -_02E2: - Message 19 +DayCareCommon_LadyEggWaiting: + Message DayCareCommon_Text_HusbandWasLookingForYou WaitButton CloseMessage HideMoney ReleaseAll End -_02EF: - Message 25 +DayCareCommon_PokemonHasGrownXLevels: + Message DayCareCommon_Text_PokemonHasGrownXLevels Return -_02F4: +DayCareCommon_TryPokemonHasGrownMessage: BufferDaycareGainedLevelsBySlot VAR_RESULT, VAR_0x8000 - CallIfNe VAR_RESULT, 0, _02EF + CallIfNe VAR_RESULT, 0, DayCareCommon_PokemonHasGrownXLevels Return -_0309: - Message 24 +DayCareCommon_LadyOneMon: + Message DayCareCommon_Text_AboutYourPokemon SetVar VAR_0x8000, 0 - Call _02F4 - Message 18 + Call DayCareCommon_TryPokemonHasGrownMessage + Message DayCareCommon_Text_RaiseAnotherPokemon ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _017E - Message 32 + GoToIfEq VAR_RESULT, MENU_YES, DayCareCommon_TryRaisePokemon + Message DayCareCommon_Text_DoYouWantPokemonBack ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _0346 - GoTo _0292 + GoToIfEq VAR_RESULT, MENU_YES, DayCareCommon_TryTakePokemonBack + GoTo DayCareCommon_VeryGoodComeAgain -_0346: +DayCareCommon_TryTakePokemonBack: GetPartyCount VAR_RESULT - GoToIfEq VAR_RESULT, 6, _045E + GoToIfEq VAR_RESULT, MAX_PARTY_SIZE, DayCareCommon_TeamIsFull GetDaycareState VAR_RESULT SetVar VAR_0x8001, 0 - GoToIfEq VAR_RESULT, DAYCARE_ONE_MON, _03BE + GoToIfEq VAR_RESULT, DAYCARE_ONE_MON, DayCareCommon_PokemonBackCostsX InitGlobalTextMenu 1, 1, 0, VAR_0x8001 BufferDaycareNicknameLevelGender 0, 1, 2, 0 - AddMenuEntryImm 134, 0 + AddMenuEntryImm MenuEntries_Text_DayCare_Pokemon1, 0 BufferDaycareNicknameLevelGender 0, 1, 2, 1 - AddMenuEntryImm 135, 1 - AddMenuEntryImm 136, 2 + AddMenuEntryImm MenuEntries_Text_DayCare_Pokemon2, 1 + AddMenuEntryImm MenuEntries_Text_DayCare_Cancel, 2 ShowMenu SetVar VAR_0x8008, VAR_0x8001 - GoToIfEq VAR_0x8008, 0, _03BE - GoToIfEq VAR_0x8008, 1, _03BE - GoTo _0292 + GoToIfEq VAR_0x8008, 0, DayCareCommon_PokemonBackCostsX + GoToIfEq VAR_0x8008, 1, DayCareCommon_PokemonBackCostsX + GoTo DayCareCommon_VeryGoodComeAgain -_03BE: +DayCareCommon_PokemonBackCostsX: BufferDaycarePriceBySlot VAR_0x8004, VAR_0x8001 - Message 28 + Message DayCareCommon_Text_PokemonBackCostsX ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _03DE - GoTo _0292 + GoToIfEq VAR_RESULT, MENU_YES, DayCareCommon_GetPokemonBackCheckMoney + GoTo DayCareCommon_VeryGoodComeAgain -_03DE: +DayCareCommon_GetPokemonBackCheckMoney: CheckMoney2 VAR_RESULT, VAR_0x8004 - GoToIfEq VAR_RESULT, 1, _03FE - Message 21 + GoToIfEq VAR_RESULT, TRUE, DayCareCommon_GetPokemonBack + Message DayCareCommon_Text_NotEnoughMoney WaitButton CloseMessage HideMoney ReleaseAll End -_03FE: - ApplyMovement 0, _046C +DayCareCommon_GetPokemonBack: + ApplyMovement LOCALID_DAY_CARE_LADY, DayCareCommon_Movement_LadyGetPokemon WaitMovement MoveMonToPartyFromDaycareSlot VAR_0x8002, VAR_0x8001 RemoveMoney2 VAR_0x8004 UpdateMoneyDisplay PlaySE SEQ_SE_DP_REGI WaitSE SEQ_SE_DP_REGI - Message 29 + Message DayCareCommon_Text_HeresYourPokemon PlayCry VAR_0x8002 BufferPlayerName 1 - Message 30 + Message DayCareCommon_Text_PlayerTookPokemonBack WaitCry GetDaycareState VAR_RESULT - GoToIfEq VAR_RESULT, DAYCARE_ONE_MON, _0444 - GoTo _0292 + GoToIfEq VAR_RESULT, DAYCARE_ONE_MON, DayCareCommon_AskTakeOtherBackToo + GoTo DayCareCommon_VeryGoodComeAgain -_0444: - Message 22 +DayCareCommon_AskTakeOtherBackToo: + Message DayCareCommon_Text_DoYouWantOtherBackToo ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _0346 - GoTo _0292 + GoToIfEq VAR_RESULT, MENU_YES, DayCareCommon_TryTakePokemonBack + GoTo DayCareCommon_VeryGoodComeAgain -_045E: - Message 26 +DayCareCommon_TeamIsFull: + Message DayCareCommon_Text_TeamIsFull WaitButton CloseMessage HideMoney @@ -313,7 +315,7 @@ _045E: End .balign 4, 0 -_046C: +DayCareCommon_Movement_LadyGetPokemon: Delay4 3 FaceWest Delay4 3 @@ -328,33 +330,33 @@ _046C: WalkNormalSouth 2 EndMovement -_04A0: - Message 24 +DayCareCommon_LadyTwoMons: + Message DayCareCommon_Text_AboutYourPokemon SetVar VAR_0x8000, 0 - Call _02F4 + Call DayCareCommon_TryPokemonHasGrownMessage SetVar VAR_0x8000, 1 - Call _02F4 - Message 32 + Call DayCareCommon_TryPokemonHasGrownMessage + Message DayCareCommon_Text_DoYouWantPokemonBack ShowYesNoMenu VAR_RESULT - GoToIfEq VAR_RESULT, MENU_YES, _0346 - Message 23 + GoToIfEq VAR_RESULT, MENU_YES, DayCareCommon_TryTakePokemonBack + Message DayCareCommon_Text_VeryGoodComeAgain WaitButton CloseMessage HideMoney ReleaseAll End -Unk501_Unused: +DayCareCommon_Unused: PlaySE SEQ_SE_CONFIRM LockAll - Message 37 + Message DayCareCommon_Text_Huh HatchEgg CloseMessage HideMoney ReleaseAll End -_04EF: +DayCareCommon_GriseousOrbCouldNotBeRemoved: HideMoney Common_GriseousOrbCouldNotBeRemoved End diff --git a/res/field/scripts/scripts_follower_partners.s b/res/field/scripts/scripts_follower_partners.s index cb99fbe30b..6441433340 100644 --- a/res/field/scripts/scripts_follower_partners.s +++ b/res/field/scripts/scripts_follower_partners.s @@ -3,7 +3,7 @@ ScriptEntry FollowerPartners_Rival - ScriptEntry _00F9 + ScriptEntry FollowerPartners_UnusedEntry9701 ScriptEntry FollowerPartners_Cheryl ScriptEntry FollowerPartners_Buck ScriptEntry FollowerPartners_Mira @@ -16,18 +16,18 @@ FollowerPartners_Rival: FacePlayer GoToIfGe VAR_FOLLOWER_RIVAL_STATE, 3, FollowerPartners_Rival_PostStarterMessage BufferPlayerName 1 - Message FollowerPartners_Text_Rival_HeyPlayerYouCanChooseFirst + Message FollowerPartners_Text_Rival_YouCanChooseFirst WaitButton CloseMessage ReleaseAll End FollowerPartners_Rival_PostStarterMessage: - GoToIfGe VAR_FOLLOWER_RIVAL_TIMES_TALKED, 5, FollowerPartners_Rival_HeyThatsEnoughTalkingAlready - GoToIfEq VAR_FOLLOWER_RIVAL_TIMES_TALKED, 4, FollowerPartners_Rival_HeyDoYouKnowAboutTheChampion - GoToIfEq VAR_FOLLOWER_RIVAL_TIMES_TALKED, 3, FollowerPartners_Rival_ThatLakeHasAMiragePokemonLivingInIt + GoToIfGe VAR_FOLLOWER_RIVAL_TIMES_TALKED, 5, FollowerPartners_Rival_EnoughTalkingAlready + GoToIfEq VAR_FOLLOWER_RIVAL_TIMES_TALKED, 4, FollowerPartners_Rival_DoYouKnowAboutChampion + GoToIfEq VAR_FOLLOWER_RIVAL_TIMES_TALKED, 3, FollowerPartners_Rival_LakeHasMiragePokemon GoToIfEq VAR_FOLLOWER_RIVAL_TIMES_TALKED, 2, FollowerPartners_Rival_DoYouBelieveIt - GoToIfEq VAR_FOLLOWER_RIVAL_TIMES_TALKED, 1, FollowerPartners_Rival_PokemonAllHaveDifferentMovesHuh + GoToIfEq VAR_FOLLOWER_RIVAL_TIMES_TALKED, 1, FollowerPartners_Rival_PokemonHaveDifferentMoves BufferRivalName 0 Message FollowerPartners_Text_Rival_ThatPokemonBattle WaitButton @@ -42,24 +42,24 @@ FollowerPartners_Rival_Unused: ReleaseAll End -FollowerPartners_Rival_HeyThatsEnoughTalkingAlready: +FollowerPartners_Rival_EnoughTalkingAlready: BufferRivalName 0 - Message FollowerPartners_Text_Rival_HeyThatsEnoughTalkingAlready + Message FollowerPartners_Text_Rival_EnoughTalkingAlready WaitButton CloseMessage ReleaseAll End -FollowerPartners_Rival_HeyDoYouKnowAboutTheChampion: +FollowerPartners_Rival_DoYouKnowAboutChampion: BufferRivalName 0 - Message FollowerPartners_Text_Rival_HeyDoYouKnowAboutTheChampion + Message FollowerPartners_Text_Rival_DoYouKnowAboutChampion WaitButton GoTo FollowerPartners_Rival_IncreaseTimesTalked End -FollowerPartners_Rival_ThatLakeHasAMiragePokemonLivingInIt: +FollowerPartners_Rival_LakeHasMiragePokemon: BufferRivalName 0 - Message FollowerPartners_Text_Rival_ThatLakeHasAMiragePokemonLivingInIt + Message FollowerPartners_Text_Rival_LakeHasMiragePokemon WaitButton GoTo FollowerPartners_Rival_IncreaseTimesTalked End @@ -72,9 +72,9 @@ FollowerPartners_Rival_DoYouBelieveIt: GoTo FollowerPartners_Rival_IncreaseTimesTalked End -FollowerPartners_Rival_PokemonAllHaveDifferentMovesHuh: +FollowerPartners_Rival_PokemonHaveDifferentMoves: BufferRivalName 0 - Message FollowerPartners_Text_Rival_PokemonAllHaveDifferentMovesHuh + Message FollowerPartners_Text_Rival_PokemonHaveDifferentMoves WaitButton GoTo FollowerPartners_Rival_IncreaseTimesTalked End @@ -85,32 +85,32 @@ FollowerPartners_Rival_IncreaseTimesTalked: ReleaseAll End -_00F9: +FollowerPartners_UnusedEntry9701: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfGe VAR_UNK_0x40CB, 2, _0126 - GoToIfEq VAR_UNK_0x40CB, 1, _0131 + GoToIfGe VAR_FOLLOWER_UNUSED_TIMES_TALKED, 2, FollowerPartners_UnusedFollowerTalkedGe2Times + GoToIfEq VAR_FOLLOWER_UNUSED_TIMES_TALKED, 1, FollowerPartners_UnusedFollowerTalked1Time BufferRivalName 0 - GoTo _013C + GoTo FollowerPartners_UnusedFollowerTalked0Times End -_0126: +FollowerPartners_UnusedFollowerTalkedGe2Times: BufferRivalName 0 WaitButton CloseMessage ReleaseAll End -_0131: +FollowerPartners_UnusedFollowerTalked1Time: BufferRivalName 0 - GoTo _013C + GoTo FollowerPartners_UnusedFollowerTalked0Times End -_013C: +FollowerPartners_UnusedFollowerTalked0Times: WaitButton CloseMessage - AddVar VAR_UNK_0x40CB, 1 + AddVar VAR_FOLLOWER_UNUSED_TIMES_TALKED, 1 ReleaseAll End @@ -118,21 +118,21 @@ FollowerPartners_Cheryl: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfGe VAR_FOLLOWER_CHERYL_TIMES_TALKED, 2, FollowerPartners_Cheryl_PlayerBattlingWithYouMakesMeFeelElated - GoToIfEq VAR_FOLLOWER_CHERYL_TIMES_TALKED, 1, FollowerPartners_Cheryl_MyPokemonIsAnExcellentHealer + GoToIfGe VAR_FOLLOWER_CHERYL_TIMES_TALKED, 2, FollowerPartners_Cheryl_BattlingWithYouMakesMeElated + GoToIfEq VAR_FOLLOWER_CHERYL_TIMES_TALKED, 1, FollowerPartners_Cheryl_MyPokemonIsExcellentHealer BufferPlayerName 0 - Message FollowerPartners_Text_Cheryl_ItsStartlingToSeeTwoWildPokemon + Message FollowerPartners_Text_Cheryl_StartlingToSeeTwoPokemon GoTo FollowerPartners_Cheryl_IncreaseTimesTalked End -FollowerPartners_Cheryl_MyPokemonIsAnExcellentHealer: - Message FollowerPartners_Text_Cheryl_MyPokemonIsAnExcellentHealer +FollowerPartners_Cheryl_MyPokemonIsExcellentHealer: + Message FollowerPartners_Text_Cheryl_MyPokemonIsExcellentHealer GoTo FollowerPartners_Cheryl_IncreaseTimesTalked End -FollowerPartners_Cheryl_PlayerBattlingWithYouMakesMeFeelElated: +FollowerPartners_Cheryl_BattlingWithYouMakesMeElated: BufferPlayerName 0 - Message FollowerPartners_Text_Cheryl_PlayerBattlingWithYouMakesMeFeelElated + Message FollowerPartners_Text_Cheryl_BattlingWithYouMakesMeElated WaitButton CloseMessage ReleaseAll @@ -149,26 +149,26 @@ FollowerPartners_Buck: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfGe VAR_FOLLOWER_BUCK_TIMES_TALKED, 3, FollowerPartners_Buck_ItMightBeCoolBeingAGymLeaderOrEliteFour - GoToIfEq VAR_FOLLOWER_BUCK_TIMES_TALKED, 2, FollowerPartners_Buck_MyBigBrothersOneOfTheEliteFour - GoToIfEq VAR_FOLLOWER_BUCK_TIMES_TALKED, 1, FollowerPartners_Buck_TheresNoLawThatSaysIHaveToBeTough + GoToIfGe VAR_FOLLOWER_BUCK_TIMES_TALKED, 3, FollowerPartners_Buck_ItMightBeCool + GoToIfEq VAR_FOLLOWER_BUCK_TIMES_TALKED, 2, FollowerPartners_Buck_MyBigBrothersEliteFour + GoToIfEq VAR_FOLLOWER_BUCK_TIMES_TALKED, 1, FollowerPartners_Buck_NoLawIHaveToBeTough BufferPlayerName 0 Message FollowerPartners_Text_Buck_ThisIsWhereIRaisedMyPokemon GoTo FollowerPartners_Buck_IncreaseTimesTalked End -FollowerPartners_Buck_TheresNoLawThatSaysIHaveToBeTough: - Message FollowerPartners_Text_Buck_TheresNoLawThatSaysIHaveToBeTough +FollowerPartners_Buck_NoLawIHaveToBeTough: + Message FollowerPartners_Text_Buck_NoLawIHaveToBeTough GoTo FollowerPartners_Buck_IncreaseTimesTalked End -FollowerPartners_Buck_MyBigBrothersOneOfTheEliteFour: - Message FollowerPartners_Text_Buck_MyBigBrothersOneOfTheEliteFour +FollowerPartners_Buck_MyBigBrothersEliteFour: + Message FollowerPartners_Text_Buck_MyBigBrothersEliteFour GoTo FollowerPartners_Buck_IncreaseTimesTalked End -FollowerPartners_Buck_ItMightBeCoolBeingAGymLeaderOrEliteFour: - Message FollowerPartners_Text_Buck_ItMightBeCoolBeingAGymLeaderOrEliteFour +FollowerPartners_Buck_ItMightBeCool: + Message FollowerPartners_Text_Buck_ItMightBeCool WaitButton CloseMessage ReleaseAll @@ -185,21 +185,21 @@ FollowerPartners_Mira: PlaySE SEQ_SE_CONFIRM LockAll FacePlayer - GoToIfGe VAR_FOLLOWER_MIRA_TIMES_TALKED, 2, FollowerPartners_Mira_PlayerDidYouGetToBeSoGood - GoToIfEq VAR_FOLLOWER_MIRA_TIMES_TALKED, 1, FollowerPartners_Mira_ThisCaveItsSoEasyToGetConfusedHere + GoToIfGe VAR_FOLLOWER_MIRA_TIMES_TALKED, 2, FollowerPartners_Mira_IWillTryLikeYou + GoToIfEq VAR_FOLLOWER_MIRA_TIMES_TALKED, 1, FollowerPartners_Mira_EasyToGetConfused BufferPlayerName 0 - Message FollowerPartners_Text_Mira_ILikeHelpfulPokemonMovesLikeGrowlAndMinimize + Message FollowerPartners_Text_Mira_ILikeHelpfulMoves GoTo FollowerPartners_Mira_IncreaseTimesTalked End -FollowerPartners_Mira_ThisCaveItsSoEasyToGetConfusedHere: - Message FollowerPartners_Text_Mira_ThisCaveItsSoEasyToGetConfusedHere +FollowerPartners_Mira_EasyToGetConfused: + Message FollowerPartners_Text_Mira_EasyToGetConfused GoTo FollowerPartners_Mira_IncreaseTimesTalked End -FollowerPartners_Mira_PlayerDidYouGetToBeSoGood: +FollowerPartners_Mira_IWillTryLikeYou: BufferPlayerName 0 - Message FollowerPartners_Text_Mira_PlayerDidYouGetToBeSoGood + Message FollowerPartners_Text_Mira_IWillTryLikeYou WaitButton CloseMessage ReleaseAll diff --git a/res/field/scripts/scripts_pokemon_day_care.s b/res/field/scripts/scripts_pokemon_day_care.s index 8f40000fee..34a1b0bf7b 100644 --- a/res/field/scripts/scripts_pokemon_day_care.s +++ b/res/field/scripts/scripts_pokemon_day_care.s @@ -8,7 +8,7 @@ ScriptEntryEnd PokemonDayCare_OnTransition: - CallIfSet FLAG_UNK_0x00FE, PokemonDayCare_ShowGymGuide + CallIfSet FLAG_STORED_POKEMON_AT_DAY_CARE, PokemonDayCare_ShowGymGuide End PokemonDayCare_ShowGymGuide: diff --git a/res/field/scripts/scripts_sandgem_town.s b/res/field/scripts/scripts_sandgem_town.s index 9dfe9fce7c..a559ab9692 100644 --- a/res/field/scripts/scripts_sandgem_town.s +++ b/res/field/scripts/scripts_sandgem_town.s @@ -25,9 +25,9 @@ SandgemTown_OnTransition: End SandgemTown_SetCounterpartPositionExitLab: - SetObjectEventPos LOCALID_COUNTERPART, 168, 845 - SetObjectEventDir LOCALID_COUNTERPART, DIR_NORTH - SetObjectEventMovementType LOCALID_COUNTERPART, MOVEMENT_TYPE_LOOK_NORTH + SetObjectEventPos LOCALID_SANDGEM_COUNTERPART, 168, 845 + SetObjectEventDir LOCALID_SANDGEM_COUNTERPART, DIR_NORTH + SetObjectEventMovementType LOCALID_SANDGEM_COUNTERPART, MOVEMENT_TYPE_LOOK_NORTH Return SandgemTown_SetCounterpartGraphicsDawn: @@ -40,7 +40,7 @@ SandgemTown_SetCounterpartGraphicsLucas: SandgemTown_TriggerCounterpartLeadToLab: LockAll - ApplyMovement LOCALID_COUNTERPART, SandgemTown_Movement_CounterpartNoticePlayer + ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartNoticePlayer WaitMovement GetPlayerMapPos VAR_0x8004, VAR_0x8005 GoToIfEq VAR_0x8005, 843, SandgemTown_CounterpartWalkToPlayerZ843 @@ -52,35 +52,35 @@ SandgemTown_TriggerCounterpartLeadToLab: End SandgemTown_CounterpartWalkToPlayerZ843: - ApplyMovement LOCALID_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPlayerZ843 + ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPlayerZ843 ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerFaceCounterpartZ843 WaitMovement GoTo SandgemTown_TheProfessorIsWaiting SandgemTown_CounterpartWalkToPlayerZ844: - ApplyMovement LOCALID_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPlayerZ844 + ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPlayerZ844 WaitMovement GoTo SandgemTown_TheProfessorIsWaiting SandgemTown_CounterpartWalkToPlayerZ845: - ApplyMovement LOCALID_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPlayerZ845 + ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPlayerZ845 WaitMovement GoTo SandgemTown_TheProfessorIsWaiting SandgemTown_CounterpartWalkToPlayerZ846: - ApplyMovement LOCALID_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPlayerZ846 + ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPlayerZ846 ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerFaceCounterpartZ846 WaitMovement GoTo SandgemTown_TheProfessorIsWaiting SandgemTown_CounterpartWalkToPlayerZ847: - ApplyMovement LOCALID_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPlayerZ847 + ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPlayerZ847 ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerFaceCounterpartZ847 WaitMovement GoTo SandgemTown_TheProfessorIsWaiting SandgemTown_CounterpartWalkToPlayerZ848: - ApplyMovement LOCALID_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPlayerZ848 + ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPlayerZ848 ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerFaceCounterpartZ848 WaitMovement GoTo SandgemTown_TheProfessorIsWaiting @@ -113,37 +113,37 @@ SandgemTown_WalkToPokemonResearchLab: End SandgemTown_WalkToPokemonResearchLabZ843: - ApplyMovement LOCALID_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPokemonResearchLabZ843 + ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPokemonResearchLabZ843 ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerWalkToPokemonResearchLabZ843 WaitMovement GoTo SandgemTown_ThisIsOurPokemonResearchLab SandgemTown_WalkToPokemonResearchLabZ844: - ApplyMovement LOCALID_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPokemonResearchLabZ844 + ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPokemonResearchLabZ844 ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerWalkToPokemonResearchLabZ844 WaitMovement GoTo SandgemTown_ThisIsOurPokemonResearchLab SandgemTown_WalkToPokemonResearchLabZ845: - ApplyMovement LOCALID_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPokemonResearchLabZ845 + ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPokemonResearchLabZ845 ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerWalkToPokemonResearchLabZ845 WaitMovement GoTo SandgemTown_ThisIsOurPokemonResearchLab SandgemTown_WalkToPokemonResearchLabZ846: - ApplyMovement LOCALID_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPokemonResearchLabZ846 + ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPokemonResearchLabZ846 ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerWalkToPokemonResearchLabZ846 WaitMovement GoTo SandgemTown_ThisIsOurPokemonResearchLab SandgemTown_WalkToPokemonResearchLabZ847: - ApplyMovement LOCALID_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPokemonResearchLabZ847 + ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPokemonResearchLabZ847 ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerWalkToPokemonResearchLabZ847 WaitMovement GoTo SandgemTown_ThisIsOurPokemonResearchLab SandgemTown_WalkToPokemonResearchLabZ848: - ApplyMovement LOCALID_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPokemonResearchLabZ848 + ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPokemonResearchLabZ848 ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerWalkToPokemonResearchLabZ848 WaitMovement GoTo SandgemTown_ThisIsOurPokemonResearchLab @@ -182,7 +182,7 @@ SandgemTown_RivalExitLab: Message SandgemTown_Text_OhItsYouPlayer CloseMessage ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerWatchRivalLeave - ApplyMovement LOCALID_COUNTERPART, SandgemTown_Movement_CounterpartWatchRivalLeave + ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWatchRivalLeave ApplyMovement LOCALID_RIVAL, SandgemTown_Movement_RivalLeave WaitMovement RemoveObject LOCALID_RIVAL @@ -205,13 +205,13 @@ SandgemTown_LucasLetsGoIn: SandgemTown_EnterPokemonResearchLab: CloseMessage - ApplyMovement LOCALID_COUNTERPART, SandgemTown_Movement_CounterpartEnterLab + ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartEnterLab ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerEnterLab WaitMovement PlayDoorCloseAnimation ANIMATION_TAG_DOOR_1 WaitForAnimation ANIMATION_TAG_DOOR_1 UnloadAnimation ANIMATION_TAG_DOOR_1 - RemoveObject LOCALID_COUNTERPART + RemoveObject LOCALID_SANDGEM_COUNTERPART SetVar VAR_SANDGEM_TOWN_STATE, 1 FadeScreenOut WaitFadeScreen @@ -446,7 +446,7 @@ SandgemTown_OnFrameExitLab: Message SandgemTown_Text_BigPlayer CloseMessage ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerNoticeProfRowan - ApplyMovement LOCALID_COUNTERPART, SandgemTown_Movement_CounterpartNoticeProfRowan + ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartNoticeProfRowan WaitMovement Message SandgemTown_Text_YouShouldTakeThisAsWell SetVar VAR_0x8004, ITEM_TM27 @@ -480,7 +480,7 @@ SandgemTown_LucasWellIllBeTheProfessorHadTMs: SandgemTown_CounterpartWillShowYouAround: ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerFaceCounterpartSouth - ApplyMovement LOCALID_COUNTERPART, SandgemTown_Movement_CounterpartWalkNorthToPlayer + ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWalkNorthToPlayer WaitMovement GetPlayerGender VAR_RESULT GoToIfEq VAR_RESULT, GENDER_MALE, SandgemTown_DawnIllActAsYourMentor @@ -502,7 +502,7 @@ SandgemTown_LucasIWantToShowYouAFewThings: SandgemTown_WalkToPokemonCenter: CloseMessage Common_SetFollowMeBGM - ApplyMovement LOCALID_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPokemonCenter + ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPokemonCenter ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerWalkToPokemonCenter WaitMovement GetPlayerGender VAR_RESULT @@ -524,7 +524,7 @@ SandgemTown_LucasThisIsThePokemonCenter: SandgemTown_WalkToPokeMart: CloseMessage - ApplyMovement LOCALID_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPokeMart + ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartWalkToPokeMart ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerWalkToPokeMart WaitMovement GetPlayerGender VAR_RESULT @@ -544,10 +544,10 @@ SandgemTown_LucasThisIsThePokeMart: SandgemTown_LetYourFamilyKnowYoureHelpingProfRowan: CloseMessage - ApplyMovement LOCALID_COUNTERPART, SandgemTown_CounterpartFacePlayerWest + ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_CounterpartFacePlayerWest ApplyMovement LOCALID_PLAYER, SandgemTown_PlayerFaceCounterpartEast WaitMovement - ApplyMovement LOCALID_COUNTERPART, SandgemTown_CounterpartExclamationMark + ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_CounterpartExclamationMark WaitMovement GetPlayerGender VAR_RESULT GoToIfEq VAR_RESULT, GENDER_MALE, SandgemTown_DawnLetYourFamilyKnowYoureHelpingProfRowan @@ -566,11 +566,11 @@ SandgemTown_LucasLetYourFamilyKnowYoureHelpingProfRowan: SandgemTown_CounterpartLeave: CloseMessage - ApplyMovement LOCALID_COUNTERPART, SandgemTown_Movement_CounterpartLeave + ApplyMovement LOCALID_SANDGEM_COUNTERPART, SandgemTown_Movement_CounterpartLeave ApplyMovement LOCALID_PLAYER, SandgemTown_Movement_PlayerWatchCounterpartLeave WaitMovement Common_FadeToDefaultMusic3 - RemoveObject LOCALID_COUNTERPART + RemoveObject LOCALID_SANDGEM_COUNTERPART SetVar VAR_SANDGEM_TOWN_STATE, 2 ReleaseAll End diff --git a/res/text/counterpart_talk.json b/res/text/counterpart_talk.json index 9dad29413d..7a7ae36334 100644 --- a/res/text/counterpart_talk.json +++ b/res/text/counterpart_talk.json @@ -2,7 +2,7 @@ "key": 18871, "messages": [ { - "id": "pl_msg_00000552_00000", + "id": "CounterpartTalk_Text_DawnDialgaOrPalkiaAtSpearPillar", "en_US": [ "Dawn: Hey, {STRVAR_1 3, 0, 0}?\n", "The professor told me something.\r", @@ -11,7 +11,7 @@ ] }, { - "id": "pl_msg_00000552_00001", + "id": "CounterpartTalk_Text_DawnElderHasSomethingToTell", "en_US": [ "Dawn: Hi, {STRVAR_1 3, 0, 0}!\r", "You’re friends with the elder of\n", @@ -21,7 +21,7 @@ ] }, { - "id": "pl_msg_00000552_00002", + "id": "CounterpartTalk_Text_DawnSeenEverySinnohPokemon", "en_US": [ "Dawn: Hi, {STRVAR_1 3, 0, 0}!\n", "May I see your Pokédex?\r", @@ -33,14 +33,14 @@ ] }, { - "id": "pl_msg_00000552_00003", + "id": "CounterpartTalk_Text_DawnHaveYouChattedWithMySister", "en_US": [ "Dawn: Hey, {STRVAR_1 3, 0, 0}, have you\n", "ever chatted with my kid sister?" ] }, { - "id": "pl_msg_00000552_00004", + "id": "CounterpartTalk_Text_DawnAreYouAcquaintedWithBebe", "en_US": [ "Dawn: Oh, {STRVAR_1 3, 0, 0}, are you\n", "acquainted with Bebe?\r", @@ -53,7 +53,7 @@ ] }, { - "id": "pl_msg_00000552_00005", + "id": "CounterpartTalk_Text_DawnIllShowUsePokeRadar", "en_US": [ "Dawn: Hey! {STRVAR_1 3, 0, 0}, you’ve got\n", "a Poké Radar?\r", @@ -63,7 +63,7 @@ ] }, { - "id": "pl_msg_00000552_00006", + "id": "CounterpartTalk_Text_DawnHowsYourPokeRadar", "en_US": [ "Dawn: Hi, {STRVAR_1 3, 0, 0}!\n", "How’s your Poké Radar?\r", @@ -76,7 +76,7 @@ ] }, { - "id": "pl_msg_00000552_00007", + "id": "CounterpartTalk_Text_DawnSometimesPatchOfGrassSparkles", "en_US": [ "Dawn: Sometimes a patch of grass\n", "sparkles when a Poké Radar is used.\r", @@ -86,7 +86,7 @@ ] }, { - "id": "pl_msg_00000552_00008", + "id": "CounterpartTalk_Text_DawnHelpingWithNationalPokedex", "en_US": [ "Dawn: So, {STRVAR_1 3, 0, 0}.\r", "I’m also helping the professor put\n", @@ -97,7 +97,7 @@ ] }, { - "id": "pl_msg_00000552_00009", + "id": "CounterpartTalk_Text_DawnCompletedNationalDex", "en_US": [ "Dawn: {STRVAR_1 3, 0, 0}!\r", "{STRVAR_1 3, 0, 0}, {STRVAR_1 3, 0, 0},\n", @@ -107,14 +107,14 @@ ] }, { - "id": "pl_msg_00000552_00010", + "id": "CounterpartTalk_Text_DawnIsTodayYourBirthday", "en_US": [ "Dawn: Is today maybe...\n", "Your birthday, {STRVAR_1 3, 0, 0}?" ] }, { - "id": "pl_msg_00000552_00011", + "id": "CounterpartTalk_Text_DawnCongratulations", "en_US": [ "Dawn: Giggle...\n", "Congratulations, {STRVAR_1 3, 0, 0}!\f", @@ -122,7 +122,7 @@ ] }, { - "id": "pl_msg_00000552_00012", + "id": "CounterpartTalk_Text_DawnWhatMadeMeThinkBirthday", "en_US": [ "Dawn: Oh, it isn’t?\r", "I wonder what made me think that\n", @@ -130,7 +130,7 @@ ] }, { - "id": "pl_msg_00000552_00013", + "id": "CounterpartTalk_Text_DawnCongratulationsChamp", "en_US": [ "Dawn: {STRVAR_1 3, 0, 0}!\n", "I heard from the professor!\r", @@ -138,7 +138,7 @@ ] }, { - "id": "pl_msg_00000552_00014", + "id": "CounterpartTalk_Text_LucasDialgaOrPalkiaAtSpearPillar", "en_US": [ "Lucas: Hey, {STRVAR_1 3, 0, 0}!\n", "The prof told me something cool.\r", @@ -147,7 +147,7 @@ ] }, { - "id": "pl_msg_00000552_00015", + "id": "CounterpartTalk_Text_LucasElderHasSomethingToTell", "en_US": [ "Lucas: Hi, {STRVAR_1 3, 0, 0}!\r", "You know the elder of Celestic Town,\n", @@ -157,7 +157,7 @@ ] }, { - "id": "pl_msg_00000552_00016", + "id": "CounterpartTalk_Text_LucasSeenEverySinnohPokemon", "en_US": [ "Lucas: Hey, {STRVAR_1 3, 0, 0}!\n", "Let me take a look at your Pokédex.\r", @@ -169,14 +169,14 @@ ] }, { - "id": "pl_msg_00000552_00017", + "id": "CounterpartTalk_Text_LucasHaveYouSeenMySister", "en_US": [ "Lucas: Hey, {STRVAR_1 3, 0, 0}, have you\n", "ever seen my kid sister?" ] }, { - "id": "pl_msg_00000552_00018", + "id": "CounterpartTalk_Text_LucasHaveYouMetBebe", "en_US": [ "Lucas: Hey, {STRVAR_1 3, 0, 0}, have you\n", "met Bebe?\r", @@ -188,7 +188,7 @@ ] }, { - "id": "pl_msg_00000552_00019", + "id": "CounterpartTalk_Text_LucasIllTeachUsePokeRadar", "en_US": [ "Lucas: Hey! {STRVAR_1 3, 0, 0}, you’ve got\n", "yourself a Poké Radar, too?\r", @@ -198,7 +198,7 @@ ] }, { - "id": "pl_msg_00000552_00020", + "id": "CounterpartTalk_Text_LucasHowsYourPokeRadar", "en_US": [ "Lucas: Hi, {STRVAR_1 3, 0, 0}!\n", "How’s your Poké Radar working out?\r", @@ -212,7 +212,7 @@ ] }, { - "id": "pl_msg_00000552_00021", + "id": "CounterpartTalk_Text_LucasSometimesPatchOfGrassSparkles", "en_US": [ "Lucas: Sometimes a patch of grass\n", "sparkles when a Poké Radar is used.\r", @@ -222,7 +222,7 @@ ] }, { - "id": "pl_msg_00000552_00022", + "id": "CounterpartTalk_Text_LucasHelpingWithNationalPokedex", "en_US": [ "Lucas: So, {STRVAR_1 3, 0, 0}.\r", "I’m also helping the professor out\n", @@ -233,7 +233,7 @@ ] }, { - "id": "pl_msg_00000552_00023", + "id": "CounterpartTalk_Text_LucasCompletedNationalDex", "en_US": [ "Lucas: {STRVAR_1 3, 0, 0}!\r", "Wow! I don’t know what to say!\n", @@ -243,14 +243,14 @@ ] }, { - "id": "pl_msg_00000552_00024", + "id": "CounterpartTalk_Text_LucasIsItYourBirthdayToday", "en_US": [ "Lucas: Hey, {STRVAR_1 3, 0, 0}?\n", "Is it maybe your birthday today?" ] }, { - "id": "pl_msg_00000552_00025", + "id": "CounterpartTalk_Text_LucasCongratulations", "en_US": [ "Lucas: I thought so!\n", "Congratulations, {STRVAR_1 3, 0, 0}!\f", @@ -258,7 +258,7 @@ ] }, { - "id": "pl_msg_00000552_00026", + "id": "CounterpartTalk_Text_LucasWhatMadeMeThinkBirthday", "en_US": [ "Lucas: Huh?\n", "It isn’t?\r", @@ -267,7 +267,7 @@ ] }, { - "id": "pl_msg_00000552_00027", + "id": "CounterpartTalk_Text_LucasCongratulationsChamp", "en_US": [ "Lucas: {STRVAR_1 3, 0, 0}!\n", "The professor told me the news!\r", @@ -275,7 +275,7 @@ ] }, { - "id": "pl_msg_00000552_00028", + "id": "CounterpartTalk_Text_DawnYouMetCreatorsOfSinnoh", "en_US": [ "Dawn: So, I was thinking...\n", "Those Pokémon you met, {STRVAR_1 3, 0, 0}...\r", @@ -284,7 +284,7 @@ ] }, { - "id": "pl_msg_00000552_00029", + "id": "CounterpartTalk_Text_LucasYouMetCreatorsOfSinnoh", "en_US": [ "Lucas: So, I was thinking...\n", "Those Pokémon you met, {STRVAR_1 3, 0, 0}...\r", diff --git a/res/text/day_care_common.json b/res/text/day_care_common.json index f73d03102a..6aaa7aafe0 100644 --- a/res/text/day_care_common.json +++ b/res/text/day_care_common.json @@ -2,7 +2,7 @@ "key": 39226, "messages": [ { - "id": "pl_msg_00000547_00000", + "id": "DayCareCommon_Text_ImTheDayCareMan", "en_US": [ "I’m the Day-Care Man.\r", "We look after the precious Pokémon\n", @@ -12,7 +12,7 @@ ] }, { - "id": "pl_msg_00000547_00001", + "id": "DayCareCommon_Text_PokemonHoldingEggYouWantIt", "en_US": [ "Ah, it’s you!\r", "We were raising your Pokémon,\n", @@ -24,39 +24,39 @@ ] }, { - "id": "pl_msg_00000547_00002", + "id": "DayCareCommon_Text_PokemonIsDoingJustFine", "en_US": [ "Ah, it’s you! Good to see you.\n", "Your {STRVAR_1 0, 0, 0}’s doing just fine." ] }, { - "id": "pl_msg_00000547_00003", + "id": "DayCareCommon_Text_IllHangOnToIt", "en_US": [ "Well then, I’ll hang on to it.\n", "Thanks!" ] }, { - "id": "pl_msg_00000547_00004", + "id": "DayCareCommon_Text_YouHaveNoRoom", "en_US": [ "You have no room for it right now...\n", "Come back when you’ve made room." ] }, { - "id": "pl_msg_00000547_00005", + "id": "DayCareCommon_Text_PlayerReceivedEgg", "en_US": [ "{STRVAR_1 3, 0, 0} received the Egg from\n", "the Day-Care Man." ] }, { - "id": "pl_msg_00000547_00006", + "id": "DayCareCommon_Text_TakeGoodCareOfIt", "en_US": "You take good care of it." }, { - "id": "pl_msg_00000547_00007", + "id": "DayCareCommon_Text_SawPokemonReceivingMail", "en_US": [ "By the way, I saw your {STRVAR_1 0, 0, 0}\n", "cavorting with {STRVAR_1 3, 1, 0}’s\f", @@ -66,14 +66,14 @@ ] }, { - "id": "pl_msg_00000547_00008", + "id": "DayCareCommon_Text_TalkToWifeToPickUpPokemon", "en_US": [ "If you want to pick up your Pokémon,\n", "have a word with my wife." ] }, { - "id": "pl_msg_00000547_00009", + "id": "DayCareCommon_Text_PokemonAreDoingJustFine", "en_US": [ "Ah, it’s you!\n", "Good to see you!\r", @@ -82,36 +82,36 @@ ] }, { - "id": "pl_msg_00000547_00010", + "id": "DayCareCommon_Text_YouDoWantThisYes", "en_US": [ "I really will keep it.\n", "You do want this, yes?" ] }, { - "id": "pl_msg_00000547_00011", + "id": "DayCareCommon_Text_TheTwoGetAlongVeryWell", "en_US": "The two seem to get along very well." }, { - "id": "pl_msg_00000547_00012", + "id": "DayCareCommon_Text_TheTwoGetAlong", "en_US": "The two seem to get along." }, { - "id": "pl_msg_00000547_00013", + "id": "DayCareCommon_Text_TheTwoDontLikeEachOther", "en_US": [ "The two don’t seem to like each\n", "other much." ] }, { - "id": "pl_msg_00000547_00014", + "id": "DayCareCommon_Text_TheTwoPlayWithOtherPokemon", "en_US": [ "The two prefer to play with other\n", "Pokémon more than with each other." ] }, { - "id": "pl_msg_00000547_00015", + "id": "DayCareCommon_Text_ImTheDayCareLadyRaisePokemon", "en_US": [ "I’m the Day-Care Lady.\n", "We can raise Pokémon for you.\r", @@ -120,14 +120,14 @@ ] }, { - "id": "pl_msg_00000547_00016", + "id": "DayCareCommon_Text_RaiseWhichPokemon", "en_US": [ "Which Pokémon should we raise for\n", "you?\r" ] }, { - "id": "pl_msg_00000547_00017", + "id": "DayCareCommon_Text_WellRaiseYourPokemon_ArrowPrompt", "en_US": [ "Fine, we’ll raise your {STRVAR_1 0, 0, 0}\n", "for a while.\r", @@ -135,92 +135,92 @@ ] }, { - "id": "pl_msg_00000547_00018", + "id": "DayCareCommon_Text_RaiseAnotherPokemon", "en_US": [ "We can raise two of your Pokémon.\n", "Would you like us to raise another?" ] }, { - "id": "pl_msg_00000547_00019", + "id": "DayCareCommon_Text_HusbandWasLookingForYou", "en_US": [ "Ah, there you are!\n", "My husband was looking for you." ] }, { - "id": "pl_msg_00000547_00020", + "id": "DayCareCommon_Text_OhFineThen", "en_US": [ "Oh, fine, then.\n", "Come again." ] }, { - "id": "pl_msg_00000547_00021", + "id": "DayCareCommon_Text_NotEnoughMoney", "en_US": "You don’t have enough money..." }, { - "id": "pl_msg_00000547_00022", + "id": "DayCareCommon_Text_DoYouWantOtherBackToo", "en_US": [ "Do you want to take back the other\n", "one, too?" ] }, { - "id": "pl_msg_00000547_00023", + "id": "DayCareCommon_Text_VeryGoodComeAgain", "en_US": [ "Very good.\n", "Come again." ] }, { - "id": "pl_msg_00000547_00024", + "id": "DayCareCommon_Text_AboutYourPokemon", "en_US": [ "Ah, it’s you! Good to see you.\n", "Now, about your Pokémon...\r" ] }, { - "id": "pl_msg_00000547_00025", + "id": "DayCareCommon_Text_PokemonHasGrownXLevels", "en_US": [ "By level, your {STRVAR_1 0, 0, 0} has\n", "grown by about {STRVAR_1 51, 1, 0}.\r" ] }, { - "id": "pl_msg_00000547_00026", + "id": "DayCareCommon_Text_TeamIsFull", "en_US": [ "Your Pokémon team is full.\n", "Make room, then come see me." ] }, { - "id": "pl_msg_00000547_00027", + "id": "DayCareCommon_Text_TakeBackWhichPokemon", "en_US": "Which Pokémon will you take back?" }, { - "id": "pl_msg_00000547_00028", + "id": "DayCareCommon_Text_PokemonBackCostsX", "en_US": [ "If you want your {STRVAR_1 0, 0, 0} back,\n", "it will cost ${STRVAR_1 53, 1, 0}." ] }, { - "id": "pl_msg_00000547_00029", + "id": "DayCareCommon_Text_HeresYourPokemon", "en_US": [ "Excellent!\n", "Here’s your Pokémon.\r" ] }, { - "id": "pl_msg_00000547_00030", + "id": "DayCareCommon_Text_PlayerTookPokemonBack", "en_US": [ "{STRVAR_1 3, 1, 0} took {STRVAR_1 0, 0, 0} back\n", "from the Day-Care Lady.\r" ] }, { - "id": "pl_msg_00000547_00031", + "id": "DayCareCommon_Text_OnlyOnePokemonWithYou", "en_US": [ "Oh? But you only have one\n", "Pokémon with you.\r", @@ -229,11 +229,11 @@ ] }, { - "id": "pl_msg_00000547_00032", + "id": "DayCareCommon_Text_DoYouWantPokemonBack", "en_US": "Do you want your Pokémon back?" }, { - "id": "pl_msg_00000547_00033", + "id": "DayCareCommon_Text_WhatWillYouBattleWith", "en_US": [ "If you leave me that Pokémon,\n", "what are you gonna battle with?\r", @@ -241,7 +241,7 @@ ] }, { - "id": "pl_msg_00000547_00034", + "id": "DayCareCommon_Text_YoullBeLeftWithJustOne", "en_US": [ "Huh? Now, now.\r", "If you leave that Pokémon with\n", @@ -251,14 +251,14 @@ ] }, { - "id": "pl_msg_00000547_00035", + "id": "DayCareCommon_Text_ThatIsMerelyAnEgg", "en_US": [ "Now, now.\n", "That is merely an Egg!" ] }, { - "id": "pl_msg_00000547_00036", + "id": "DayCareCommon_Text_WellRaiseYourPokemon", "en_US": [ "Fine, we’ll raise your {STRVAR_1 0, 0, 0}\n", "for a while.\r", @@ -266,23 +266,23 @@ ] }, { - "id": "pl_msg_00000547_00037", + "id": "DayCareCommon_Text_Huh", "en_US": "Huh?" }, { - "id": "pl_msg_00000547_00038", + "id": "DayCareCommon_Text_00038", "en_US": "Lv. {STRVAR_1 52, 1, 0}" }, { - "id": "pl_msg_00000547_00039", + "id": "DayCareCommon_Text_00039", "en_US": "{STRVAR_1 0, 0, 0}♂" }, { - "id": "pl_msg_00000547_00040", + "id": "DayCareCommon_Text_00040", "en_US": "{STRVAR_1 0, 0, 0}♀" }, { - "id": "pl_msg_00000547_00041", + "id": "DayCareCommon_Text_00041", "en_US": "{STRVAR_1 0, 0, 0}" } ] diff --git a/res/text/follower_partners.json b/res/text/follower_partners.json index b0c42da89a..80d7d3bf69 100644 --- a/res/text/follower_partners.json +++ b/res/text/follower_partners.json @@ -2,11 +2,11 @@ "key": 39221, "messages": [ { - "id": "FollowerPartners_Text_00000", + "id": "FollowerPartners_Text_Dummy0", "garbage": 35 }, { - "id": "FollowerPartners_Text_Rival_HeyPlayerYouCanChooseFirst", + "id": "FollowerPartners_Text_Rival_YouCanChooseFirst", "en_US": [ "Hey, {STRVAR_1 3, 1, 0}.\n", "You can choose first. Go ahead.\r", @@ -26,7 +26,7 @@ ] }, { - "id": "FollowerPartners_Text_Rival_PokemonAllHaveDifferentMovesHuh", + "id": "FollowerPartners_Text_Rival_PokemonHaveDifferentMoves", "en_US": [ "{STRVAR_1 3, 0, 0}: Pokémon all have\n", "different moves, huh?\r", @@ -51,7 +51,7 @@ ] }, { - "id": "FollowerPartners_Text_Rival_ThatLakeHasAMiragePokemonLivingInIt", + "id": "FollowerPartners_Text_Rival_LakeHasMiragePokemon", "en_US": [ "{STRVAR_1 3, 0, 0}: That lake has a mirage\n", "Pokémon living in it.\r", @@ -60,7 +60,7 @@ ] }, { - "id": "FollowerPartners_Text_Rival_HeyDoYouKnowAboutTheChampion", + "id": "FollowerPartners_Text_Rival_DoYouKnowAboutChampion", "en_US": [ "{STRVAR_1 3, 0, 0}: Hey, do you know about\n", "the Champion?\r", @@ -73,7 +73,7 @@ ] }, { - "id": "FollowerPartners_Text_Rival_HeyThatsEnoughTalkingAlready", + "id": "FollowerPartners_Text_Rival_EnoughTalkingAlready", "en_US": [ "{STRVAR_1 3, 0, 0}: Hey, that’s enough\n", "talking already.\r", @@ -89,26 +89,26 @@ ] }, { - "id": "FollowerPartners_Text_00009", + "id": "FollowerPartners_Text_Dummy9", "garbage": 58 }, { - "id": "FollowerPartners_Text_00010", + "id": "FollowerPartners_Text_Dummy10", "garbage": 56 }, { - "id": "FollowerPartners_Text_00011", + "id": "FollowerPartners_Text_Dummy11", "garbage": 48 }, { - "id": "FollowerPartners_Text_Cheryl_ItsStartlingToSeeTwoWildPokemon", + "id": "FollowerPartners_Text_Cheryl_StartlingToSeeTwoPokemon", "en_US": [ "Cheryl: It’s startling to see two wild\n", "Pokémon appearing at the same time." ] }, { - "id": "FollowerPartners_Text_Cheryl_MyPokemonIsAnExcellentHealer", + "id": "FollowerPartners_Text_Cheryl_MyPokemonIsExcellentHealer", "en_US": [ "Cheryl: My Pokémon is an excellent\n", "healer.\r", @@ -116,7 +116,7 @@ ] }, { - "id": "FollowerPartners_Text_Cheryl_PlayerBattlingWithYouMakesMeFeelElated", + "id": "FollowerPartners_Text_Cheryl_BattlingWithYouMakesMeElated", "en_US": [ "Cheryl: {STRVAR_1 3, 0, 0}, battling with\n", "you makes me feel elated.\r", @@ -150,7 +150,7 @@ ] }, { - "id": "FollowerPartners_Text_Mira_ILikeHelpfulPokemonMovesLikeGrowlAndMinimize", + "id": "FollowerPartners_Text_Mira_ILikeHelpfulMoves", "en_US": [ "Mira: I like helpful Pokémon moves\n", "like Growl and Minimize.\r", @@ -159,7 +159,7 @@ ] }, { - "id": "FollowerPartners_Text_Mira_ThisCaveItsSoEasyToGetConfusedHere", + "id": "FollowerPartners_Text_Mira_EasyToGetConfused", "en_US": [ "Mira: This cave...\n", "It’s so easy to get confused here.\f", @@ -167,7 +167,7 @@ ] }, { - "id": "FollowerPartners_Text_Mira_PlayerDidYouGetToBeSoGood", + "id": "FollowerPartners_Text_Mira_IWillTryLikeYou", "en_US": [ "Mira: {STRVAR_1 3, 0, 0}, did you get to be\n", "so good because you’re always with\f", @@ -199,7 +199,7 @@ ] }, { - "id": "FollowerPartners_Text_Riley_ThisUsedToBeAFairlyThrivingOreMine", + "id": "FollowerPartners_Text_Riley_UsedToBeThrivingOreMine", "en_US": [ "Riley: This used to be a fairly\n", "thriving ore mine once upon a time.\r", @@ -218,7 +218,7 @@ ] }, { - "id": "FollowerPartners_Text_Riley_ImagineWhatItWouldBeLike", + "id": "FollowerPartners_Text_Riley_ImagineSteelBattleSteel", "en_US": [ "Riley: Imagine what it would be like\n", "for a Steel-type Pokémon user to\f", @@ -239,7 +239,7 @@ ] }, { - "id": "FollowerPartners_Text_Riley_ThanksYouReallyHelpedMeOut", + "id": "FollowerPartners_Text_Riley_YouReallyHelpedMeOut", "en_US": [ "Riley: Thanks.\n", "You really helped me out.\r", @@ -249,7 +249,7 @@ ] }, { - "id": "FollowerPartners_Text_Riley_ThanksIWantYouToShowLucaAllSortsOfWorlds", + "id": "FollowerPartners_Text_Riley_ShowLucaAllSortsOfWorlds", "en_US": [ "Riley: Thanks!\r", "I want you to show Luca all sorts\n", @@ -257,7 +257,7 @@ ] }, { - "id": "FollowerPartners_Text_Riley_ThankYouButYouDontHaveRoom", + "id": "FollowerPartners_Text_Riley_YouDontHaveRoom", "en_US": [ "Riley: Thank you...\r", "But you don’t have room to take\n", @@ -267,14 +267,14 @@ ] }, { - "id": "FollowerPartners_Text_Riley_IHopeYoullAcceptItAsATokenOfOurFriendship", + "id": "FollowerPartners_Text_Riley_AcceptItAsToken", "en_US": [ "Riley: I hope you’ll accept it as\n", "a token of our friendship." ] }, { - "id": "FollowerPartners_Text_Riley_SpendingTimeWithYouWasVeryEnjoyable", + "id": "FollowerPartners_Text_Riley_SpendingTimeWasEnjoyable", "en_US": [ "Riley: Spending time with you was\n", "very enjoyable.\r", @@ -347,7 +347,7 @@ ] }, { - "id": "FollowerPartners_Text_Buck_TheresNoLawThatSaysIHaveToBeTough", + "id": "FollowerPartners_Text_Buck_NoLawIHaveToBeTough", "en_US": [ "Buck: There’s no law that says\n", "I have to be tough or anything,\f", @@ -358,7 +358,7 @@ ] }, { - "id": "FollowerPartners_Text_Buck_MyBigBrothersOneOfTheEliteFour", + "id": "FollowerPartners_Text_Buck_MyBigBrothersEliteFour", "en_US": [ "Buck: My big brother’s one of the\n", "Elite Four.\r", @@ -371,7 +371,7 @@ ] }, { - "id": "FollowerPartners_Text_Buck_ItMightBeCoolBeingAGymLeaderOrEliteFour", + "id": "FollowerPartners_Text_Buck_ItMightBeCool", "en_US": [ "Buck: It might be cool being a Gym\n", "Leader or one of the Elite Four...\r", diff --git a/res/text/menu_entries.json b/res/text/menu_entries.json index 311a2943ff..8c2f3abe82 100644 --- a/res/text/menu_entries.json +++ b/res/text/menu_entries.json @@ -562,15 +562,15 @@ "en_US": "UNDERSTOOD!" }, { - "id": "pl_msg_00000361_00134", + "id": "MenuEntries_Text_DayCare_Pokemon1", "en_US": "{STRVAR_1 0, 0, 0}{STRVAR_1 2, 2, 0}{CURSOR_X 90}Lv. {STRVAR_1 52, 1, 0}" }, { - "id": "pl_msg_00000361_00135", + "id": "MenuEntries_Text_DayCare_Pokemon2", "en_US": "{STRVAR_1 0, 0, 0}{STRVAR_1 2, 2, 0}{CURSOR_X 90}Lv. {STRVAR_1 52, 1, 0}" }, { - "id": "pl_msg_00000361_00136", + "id": "MenuEntries_Text_DayCare_Cancel", "en_US": "CANCEL" }, { diff --git a/src/scrcmd.c b/src/scrcmd.c index 13bd467916..2f9d385539 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -673,7 +673,7 @@ static BOOL sub_02041FF8(ScriptContext *ctx); static BOOL ScrCmd_GetLeagueVictories(ScriptContext *ctx); static BOOL ScrCmd_CheckShouldShowGhost(ScriptContext *ctx); static BOOL ScrCmd_OpenPartyMenuForDaycare(ScriptContext *ctx); -static BOOL ScrCmd_291(ScriptContext *ctx); +static BOOL ScrCmd_GetDayCarePartyMenuResult(ScriptContext *ctx); static BOOL ScrCmd_29E(ScriptContext *ctx); static BOOL ScrCmd_GetUndergroundTalkCounter(ScriptContext *ctx); static BOOL ScrCmd_29F(ScriptContext *ctx); @@ -2769,7 +2769,7 @@ static BOOL ScrCmd_SetMonSummary(ScriptContext *ctx) void **monSummary = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PARTY_MANAGEMENT_DATA); u16 partySlot = ScriptContext_GetVar(ctx); - *monSummary = FieldSystem_GetContestMonSummary(32, ctx->fieldSystem, partySlot); + *monSummary = FieldSystem_GetPartyMenuMonSummary(32, ctx->fieldSystem, partySlot); ScriptContext_Pause(ctx, ScriptContext_WaitForApplicationExit); return TRUE; @@ -6297,30 +6297,30 @@ static BOOL ScrCmd_OpenPartyMenuForDaycare(ScriptContext *ctx) return TRUE; } -static BOOL ScrCmd_291(ScriptContext *ctx) +static BOOL ScrCmd_GetDayCarePartyMenuResult(ScriptContext *ctx) { - u16 *v1 = ScriptContext_GetVarPointer(ctx); - u16 *v2 = ScriptContext_GetVarPointer(ctx); - void **v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PARTY_MANAGEMENT_DATA); + u16 *selectedSlot = ScriptContext_GetVarPointer(ctx); + u16 *showSummary = ScriptContext_GetVarPointer(ctx); + void **partyMenu = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PARTY_MANAGEMENT_DATA); - GF_ASSERT(*v0 != 0); + GF_ASSERT(*partyMenu != 0); - *v1 = PartyMenu_GetSelectedSlot(*v0); + *selectedSlot = PartyMenu_GetSelectedSlot(*partyMenu); - if (*v1 == MAX_PARTY_SIZE + 1) { - *v1 = PARTY_SLOT_NONE; + if (*selectedSlot == MAX_PARTY_SIZE + 1) { + *selectedSlot = PARTY_SLOT_NONE; } - *v2 = PartyMenu_GetMenuSelectionResult(*v0); + *showSummary = PartyMenu_GetMenuSelectionResult(*partyMenu); - if (*v2 == 1) { - *v2 = 1; + if (*showSummary == PARTY_MENU_EXIT_CODE_SUMMARY) { + *showSummary = TRUE; } else { - *v2 = 0; + *showSummary = FALSE; } - Heap_Free(*v0); - *v0 = NULL; + Heap_Free(*partyMenu); + *partyMenu = NULL; return FALSE; } diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c index 5f679b77a6..5eda051cee 100644 --- a/src/unk_0203D1B8.c +++ b/src/unk_0203D1B8.c @@ -510,7 +510,7 @@ PartyMenu *FieldSystem_OpenPartyMenu_SelectForContest(int unused, FieldSystem *f return partyMenu; } -void *FieldSystem_GetContestMonSummary(int unused, FieldSystem *fieldSystem, int partySlot) +void *FieldSystem_GetPartyMenuMonSummary(int unused, FieldSystem *fieldSystem, int partySlot) { PokemonSummary *monSummary = Heap_Alloc(HEAP_ID_FIELD2, sizeof(PokemonSummary));