diff options
| author | mid-kid <esteve.varela@gmail.com> | 2019-10-20 22:24:17 +0000 |
|---|---|---|
| committer | Rangi <35663410+Rangi42@users.noreply.github.com> | 2019-10-20 18:24:17 -0400 |
| commit | e3e0bcd653f8d671f6fd1390fa922e3b644f4a34 (patch) | |
| tree | 27c9b465e4d3e0de2649a5755a9f0b5021b05798 /engine/phone/scripts | |
| parent | 3fc2ba41f7bc7fcf1e51f821b4e07525e0e4a873 (diff) | |
#641 fixes and additions. (#646)
Name a lot of text labels according to our conventions
Diffstat (limited to 'engine/phone/scripts')
40 files changed, 745 insertions, 745 deletions
diff --git a/engine/phone/scripts/alan.asm b/engine/phone/scripts/alan.asm index ad020f0ba..0f42e8558 100644 --- a/engine/phone/scripts/alan.asm +++ b/engine/phone/scripts/alan.asm @@ -13,15 +13,15 @@ AlanPhoneCalleeScript: iftrue AlanWednesdayDay .NotWednesday: - farsjump UnknownScript_0xa0970 + farsjump AlanHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_36 - farsjump UnknownScript_0xa0a73 + farsjump AlanReminderScript .FireStone: getlandmarkname STRING_BUFFER_5, ROUTE_36 - farsjump UnknownScript_0xa0ac5 + farsjump AlanComePickUpScript AlanPhoneCallerScript: gettrainername STRING_BUFFER_3, SCHOOLBOY, ALAN1 diff --git a/engine/phone/scripts/anthony.asm b/engine/phone/scripts/anthony.asm index 4bd3278c3..55afd47f5 100644 --- a/engine/phone/scripts/anthony.asm +++ b/engine/phone/scripts/anthony.asm @@ -13,15 +13,15 @@ AnthonyPhoneCalleeScript: .NotFriday: checkflag ENGINE_DUNSPARCE_SWARM iftrue .AlreadySwarming - farsjump UnknownScript_0xa0950 + farsjump AnthonyHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_33 - farsjump UnknownScript_0xa0a5f + farsjump AnthonyReminderScript .AlreadySwarming: getlandmarkname STRING_BUFFER_5, ROUTE_33 - farsjump UnknownScript_0xa0afa + farsjump AnthonyHurryScript AnthonyPhoneCallerScript: gettrainername STRING_BUFFER_3, HIKER, ANTHONY2 @@ -55,7 +55,7 @@ AnthonyTriesDunsparceSwarm: getmonname STRING_BUFFER_4, DUNSPARCE swarm SWARM_DUNSPARCE, DARK_CAVE_VIOLET_ENTRANCE getlandmarkname STRING_BUFFER_5, DARK_CAVE - farsjump UnknownScript_0xa05de + farsjump AnthonySwarmScript .Generic: farsjump Phone_GenericCall_Male diff --git a/engine/phone/scripts/arnie.asm b/engine/phone/scripts/arnie.asm index fda846e18..a768d8b70 100644 --- a/engine/phone/scripts/arnie.asm +++ b/engine/phone/scripts/arnie.asm @@ -13,15 +13,15 @@ ArniePhoneCalleeScript: .NotTuesday: checkflag ENGINE_YANMA_SWARM iftrue .AlreadySwarming - farsjump UnknownScript_0xa0968 + farsjump ArnieHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_35 - farsjump UnknownScript_0xa0a6e + farsjump ArnieReminderScript .AlreadySwarming: getlandmarkname STRING_BUFFER_5, ROUTE_35 - farsjump UnknownScript_0xa0aff + farsjump ArnieHurryScript ArniePhoneCallerScript: gettrainername STRING_BUFFER_3, BUG_CATCHER, ARNIE1 @@ -55,7 +55,7 @@ ArnieYanmaSwarm: ; start swarm getmonname STRING_BUFFER_4, YANMA swarm SWARM_YANMA, ROUTE_35 getlandmarkname STRING_BUFFER_5, ROUTE_35 - farsjump UnknownScript_0xa05ce + farsjump ArnieSwarmScript ArnieFoundRare: farsjump Phone_CheckIfUnseenRare_Male diff --git a/engine/phone/scripts/beth.asm b/engine/phone/scripts/beth.asm index d4a15a8bd..c5854c747 100644 --- a/engine/phone/scripts/beth.asm +++ b/engine/phone/scripts/beth.asm @@ -11,7 +11,7 @@ BethPhoneCalleeScript: iftrue BethFridayAfternoon .NotFriday: - farsjump UnknownScript_0xa0918 + farsjump BethHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_26 diff --git a/engine/phone/scripts/beverly.asm b/engine/phone/scripts/beverly.asm index 35db64918..77daa5d4b 100644 --- a/engine/phone/scripts/beverly.asm +++ b/engine/phone/scripts/beverly.asm @@ -3,11 +3,11 @@ BeverlyPhoneCalleeScript: farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_BEVERLY_HAS_NUGGET iftrue .HasNugget - farsjump UnknownScript_0xa0900 + farsjump BeverlyHangUpScript .HasNugget: getlandmarkname STRING_BUFFER_5, NATIONAL_PARK - farsjump UnknownScript_0xa0aa5 + farsjump BeverlyComePickUpScript BeverlyPhoneCallerScript: gettrainername STRING_BUFFER_3, POKEFANF, BEVERLY1 diff --git a/engine/phone/scripts/bike_shop.asm b/engine/phone/scripts/bike_shop.asm index 8b32be888..2761774f2 100644 --- a/engine/phone/scripts/bike_shop.asm +++ b/engine/phone/scripts/bike_shop.asm @@ -1,5 +1,5 @@ BikeShopPhoneCallerScript: - farwritetext UnknownText_0x174000 + farwritetext BikeShopPhoneCallerText clearflag ENGINE_BIKE_SHOP_CALL_ENABLED specialphonecall SPECIALCALL_NONE end diff --git a/engine/phone/scripts/brent.asm b/engine/phone/scripts/brent.asm index 9fbdfde7d..7187befee 100644 --- a/engine/phone/scripts/brent.asm +++ b/engine/phone/scripts/brent.asm @@ -11,11 +11,11 @@ BrentPhoneCalleeScript: iftrue BrentMondayMorning .NotMonday: - farsjump UnknownScript_0xa0998 + farsjump BrentHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_43 - farsjump UnknownScript_0xa0a87 + farsjump BrentReminderScript BrentPhoneCallerScript: gettrainername STRING_BUFFER_3, POKEMANIAC, BRENT1 diff --git a/engine/phone/scripts/brent_gossip.asm b/engine/phone/scripts/brent_gossip.asm index 90054d0eb..3c92d420a 100644 --- a/engine/phone/scripts/brent_gossip.asm +++ b/engine/phone/scripts/brent_gossip.asm @@ -12,51 +12,51 @@ BrentBillTriviaScript: ifequal 9, .KimonoGirl .Father: - farwritetext UnknownText_0x662bc + farwritetext BrentFatherGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Grandpa: - farwritetext UnknownText_0x662fc + farwritetext BrentGrandpaGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Goldenrod: - farwritetext UnknownText_0x66335 + farwritetext BrentGoldenrodGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Route25: - farwritetext UnknownText_0x66366 + farwritetext BrentRoute25GossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Abra: - farwritetext UnknownText_0x663a1 + farwritetext BrentAbraGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Sister: - farwritetext UnknownText_0x663e6 + farwritetext BrentSisterGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Milk: - farwritetext UnknownText_0x66421 + farwritetext BrentMilkGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Battling: - farwritetext UnknownText_0x6645f + farwritetext BrentBattlingGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .FlowerShop: - farwritetext UnknownText_0x6649b + farwritetext BrentFlowerShopGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .KimonoGirl: - farwritetext UnknownText_0x664dd + farwritetext BrentKimonoGirlGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/buena.asm b/engine/phone/scripts/buena.asm index 86c2a3243..edfe5c0a7 100644 --- a/engine/phone/scripts/buena.asm +++ b/engine/phone/scripts/buena.asm @@ -2,70 +2,70 @@ BuenaPhoneCalleeScript: checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue BuenaPhoneScript_Rocket readvar VAR_HOUR - ifgreater 17, BuenaPhoneScript_AfterMidnight1 - scall BuenaPhoneScript_CheckTimeOfDay1 - sjump BuenaPhoneScript_Random1 + ifgreater 17, BuenaPhoneScript_AfterMidnightCallee + scall BuenaPhoneScript_CheckTimeOfDayCallee + sjump BuenaPhoneScript_RandomCallee BuenaPhoneCallerScript: checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue BuenaPhoneScript_Rocket - scall BuenaPhoneScript_CheckTimeOfDay2 - sjump BuenaPhoneScript_Random2 + scall BuenaPhoneScript_CheckTimeOfDayCaller + sjump BuenaPhoneScript_RandomCaller -BuenaPhoneScript_CheckTimeOfDay1: +BuenaPhoneScript_CheckTimeOfDayCallee: checktime MORN iftrue .morn checktime DAY iftrue .day - writetext UnknownText_0xa0d42 + writetext BuenaPhoneNiteAnswerText buttonsound end .morn - writetext UnknownText_0xa0c28 + writetext BuenaPhoneMorningAnswerText buttonsound end .day - writetext UnknownText_0xa0c72 + writetext BuenaPhoneDayAnswerText buttonsound end -BuenaPhoneScript_AfterMidnight1: - writetext UnknownText_0xa0caf +BuenaPhoneScript_AfterMidnightCallee: + writetext BuenaPhoneMidnightAnswerText end -BuenaPhoneScript_CheckTimeOfDay2: +BuenaPhoneScript_CheckTimeOfDayCaller: readvar VAR_HOUR - ifgreater 17, BuenaPhoneScript_AfterMidnight2 + ifgreater 17, BuenaPhoneScript_AfterMidnightCaller checktime MORN iftrue .morn checktime DAY iftrue .day - writetext UnknownText_0xa0e29 + writetext BuenaPhoneNiteText buttonsound end .morn - writetext UnknownText_0xa0d96 + writetext BuenaPhoneMorningText buttonsound end .day - writetext UnknownText_0xa0dcf + writetext BuenaPhoneDayText buttonsound end -BuenaPhoneScript_AfterMidnight2: - writetext UnknownText_0xa0e01 +BuenaPhoneScript_AfterMidnightCaller: + writetext BuenaPhoneMidnightText buttonsound end BuenaPhoneScript_Rocket: - writetext UnknownText_0xa0e5e + writetext BuenaPhoneRocketText end -BuenaPhoneScript_Random2: +BuenaPhoneScript_RandomCaller: checkevent EVENT_BEAT_ELITE_FOUR iftrue .PostE4 random 11 @@ -91,79 +91,79 @@ BuenaPhoneScript_Random2: ifequal 13, .thirteen .zero - writetext UnknownText_0xa0efb + writetext BuenaPhoneWentOutWithBenText sjump .finish .one - writetext UnknownText_0xa0fcf + writetext BuenaPhoneReceptionistText sjump .finish .two - writetext UnknownText_0xa109d + writetext BuenaPhoneLuckyNumberShowText sjump .finish .three - writetext UnknownText_0xa1143 + writetext BuenaPhoneStressedFromWorkText sjump .finish .four - writetext UnknownText_0xa1244 + writetext BuenaPhoneProfessorOakText sjump .finish .five - writetext UnknownText_0xa1318 + writetext BuenaPhoneGotAColdText sjump .finish .six - writetext UnknownText_0xa13d8 + writetext BuenaPhoneRadioCardQuestionsText sjump .finish .seven - writetext UnknownText_0xa1488 + writetext BuenaPhonePikachuFanClubText sjump .finish .eight - writetext UnknownText_0xa15de + writetext BuenaPhoneRadioTowerDirectorText sjump .finish .nine - writetext UnknownText_0xa1717 + writetext BuenaPhoneWhenDoYouRelaxText sjump .finish .ten - writetext UnknownText_0xa183d + writetext BuenaPhoneStarterPokemonText sjump .finish .eleven - writetext UnknownText_0xa19b1 + writetext BuenaPhoneCompanyVacationText sjump .finish .twelve - writetext UnknownText_0xa1ac0 + writetext BuenaPhoneBenAndFernText sjump .finish .thirteen - writetext UnknownText_0xa1bed + writetext BuenaPhoneGoingShoppingText .finish end -BuenaPhoneScript_Random1: +BuenaPhoneScript_RandomCallee: random 3 ifequal 0, .zero ifequal 1, .one ifequal 2, .two .zero - writetext UnknownText_0xa1c88 + writetext BuenaPhoneFavoriteSlotMachineAnswerText end .one - writetext UnknownText_0xa1d5f + writetext BuenaPhonePokegearAnswerText end .two - writetext UnknownText_0xa1e2f + writetext BuenaPhoneCoopedUpInRadioTowerAnswerText end INCLUDE "data/phone/text/buena.asm" diff --git a/engine/phone/scripts/chad.asm b/engine/phone/scripts/chad.asm index cd36bae37..8af8e6eee 100644 --- a/engine/phone/scripts/chad.asm +++ b/engine/phone/scripts/chad.asm @@ -11,11 +11,11 @@ ChadPhoneCalleeScript: iftrue ChadFridayMorning .NotFriday: - farsjump UnknownScript_0xa0980 + farsjump ChadHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_38 - farsjump UnknownScript_0xa0a7d + farsjump ChadReminderScript ChadPhoneCallerScript: gettrainername STRING_BUFFER_3, SCHOOLBOY, CHAD1 diff --git a/engine/phone/scripts/chad_gossip.asm b/engine/phone/scripts/chad_gossip.asm index e72fcd628..544c25b21 100644 --- a/engine/phone/scripts/chad_gossip.asm +++ b/engine/phone/scripts/chad_gossip.asm @@ -14,49 +14,49 @@ ChadOakGossipScript: .Blue: farwritetext ChadBlueGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Daisy: farwritetext ChadDaisyGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .ProfElm: farwritetext ChadProfElmGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Dream: - farwritetext ChadDreamGossipText + farwritetext ChadProfOaksDreamGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Kurt: farwritetext ChadKurtGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .League: farwritetext ChadLeagueGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .RadioShow: - farwritetext ChadRadioShowGossipText + farwritetext ChadPokemonTalkGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Battling: - farwritetext ChadBattlingGossipText + farwritetext ChadProfOakTrainerGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .DaisyTea: farwritetext ChadDaisyTeaGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Traveled: - farwritetext ChadTravelGossipText + farwritetext ChadProfOakTravelingGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/dana.asm b/engine/phone/scripts/dana.asm index ca2613ef4..c00607f41 100644 --- a/engine/phone/scripts/dana.asm +++ b/engine/phone/scripts/dana.asm @@ -13,15 +13,15 @@ DanaPhoneCalleeScript: iftrue DanaThursdayNight .NotThursday: - farsjump UnknownScript_0xa0978 + farsjump DanaHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_38 - farsjump UnknownScript_0xa0a78 + farsjump DanaReminderScript .HasThunderstone: getlandmarkname STRING_BUFFER_5, ROUTE_38 - farsjump UnknownScript_0xa0acd + farsjump DanaComePickUpScript DanaPhoneCallerScript: gettrainername STRING_BUFFER_3, LASS, DANA1 diff --git a/engine/phone/scripts/derek.asm b/engine/phone/scripts/derek.asm index 817f2e13e..9a69e7701 100644 --- a/engine/phone/scripts/derek.asm +++ b/engine/phone/scripts/derek.asm @@ -13,14 +13,14 @@ DerekPhoneCalleeScript: ifequal SATURDAY, .ContestToday .NoContest: - farsjump UnknownScript_0xa0988 + farsjump DerekHangUpScript .ContestToday: farsjump PhoneScript_BugCatchingContest .Nugget: getlandmarkname STRING_BUFFER_5, ROUTE_39 - farsjump UnknownScript_0xa0ad5 + farsjump DerekComePickUpScript DerekPhoneCallerScript: gettrainername STRING_BUFFER_3, POKEFANM, DEREK1 diff --git a/engine/phone/scripts/elm.asm b/engine/phone/scripts/elm.asm index d1b54905d..4760d8505 100644 --- a/engine/phone/scripts/elm.asm +++ b/engine/phone/scripts/elm.asm @@ -18,7 +18,7 @@ ElmPhoneCalleeScript: iftrue .stolen checkevent EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON iftrue .sawmrpokemon - farwritetext ElmPhoneStartText + farwritetext ElmPhoneHealYourMonText end .sawmrpokemon @@ -30,7 +30,7 @@ ElmPhoneCalleeScript: end .checkingegg - farwritetext ElmPhoneCheckingEggText + farwritetext ElmPhoneCheckingTheEggText end .assistant @@ -38,7 +38,7 @@ ElmPhoneCalleeScript: end .eggunhatched - farwritetext ElmPhoneEggUnhatchedText + farwritetext ElmPhoneHowIsTheEggText end .egghatched @@ -49,15 +49,15 @@ ElmPhoneCalleeScript: .discovery random 2 ifequal 0, .nextdiscovery - farwritetext ElmPhoneDiscovery1Text + farwritetext ElmPhoneDiscoveredHatchTimeText end .nextdiscovery - farwritetext ElmPhoneDiscovery2Text + farwritetext ElmPhoneInvestigatingEggMovesText end .pokerus - farwritetext ElmPhonePokerusText + farwritetext ElmPhoneDiscoveredPokerusText specialphonecall SPECIALCALL_NONE end @@ -68,7 +68,7 @@ ElmPhoneCallerScript: ifequal SPECIALCALL_WEIRDBROADCAST, .rocket ifequal SPECIALCALL_SSTICKET, .gift ifequal SPECIALCALL_MASTERBALL, .gift - farwritetext ElmPhonePokerusText + farwritetext ElmPhoneDiscoveredPokerusText specialphonecall SPECIALCALL_NONE end @@ -86,7 +86,7 @@ ElmPhoneCallerScript: end .rocket - farwritetext ElmPhoneRocketText + farwritetext ElmPhoneRadioTowerRocketTakeoverText specialphonecall SPECIALCALL_NONE end @@ -96,6 +96,6 @@ ElmPhoneCallerScript: end .unused - farwritetext ElmPhoneUnusedText + farwritetext ElmPhoneGotAholdOfSomethingNeatText specialphonecall SPECIALCALL_NONE end diff --git a/engine/phone/scripts/gaven.asm b/engine/phone/scripts/gaven.asm index 1c610e69d..32e20db91 100644 --- a/engine/phone/scripts/gaven.asm +++ b/engine/phone/scripts/gaven.asm @@ -8,14 +8,14 @@ GavenPhoneCalleeScript: readvar VAR_WEEKDAY ifnotequal THURSDAY, .NotThursday checktime MORN - iftrue GavenThursdayMorning + iftrue GavenThursdayMorningScript .NotThursday: - farsjump UnknownScript_0xa0910 + farsjump GavenHangUpNotThursdayScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_26 - farsjump UnknownScript_0xa0a37 + farsjump GavenReminderScript GavenPhoneCallerScript: gettrainername STRING_BUFFER_3, COOLTRAINERM, GAVEN3 @@ -32,7 +32,7 @@ GavenPhoneCallerScript: ifequal 0, GavenFoundRare farsjump Phone_GenericCall_Male -GavenThursdayMorning: +GavenThursdayMorningScript: setflag ENGINE_GAVEN_THURSDAY_MORNING GavenWantsRematch: diff --git a/engine/phone/scripts/generic_callee.asm b/engine/phone/scripts/generic_callee.asm index 6afce4abe..76d26f922 100644 --- a/engine/phone/scripts/generic_callee.asm +++ b/engine/phone/scripts/generic_callee.asm @@ -46,102 +46,102 @@ PhoneScript_AnswerPhone_Male: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x1b4dc5 + farwritetext JackAnswerPhoneText buttonsound end .Huey: - farwritetext UnknownText_0x1b5073 + farwritetext HueyAnswerPhoneText buttonsound end .Gaven: - farwritetext UnknownText_0x1b5270 + farwritetext GavenAnswerPhoneText buttonsound end .Jose: - farwritetext UnknownText_0x1b55ae + farwritetext JoseAnswerPhoneText buttonsound end .Joey: - farwritetext UnknownText_0x1b589a + farwritetext JoeyAnswerPhoneText buttonsound end .Wade: - farwritetext UnknownText_0x1b5a3b + farwritetext WadeAnswerPhoneText buttonsound end .Ralph: - farwritetext UnknownText_0x1b5c10 + farwritetext RalphAnswerPhoneText buttonsound end .Anthony: - farwritetext UnknownText_0x1b5f7a + farwritetext AnthonyAnswerPhoneText buttonsound end .Todd: - farwritetext UnknownText_0x1b60f5 + farwritetext ToddAnswerPhoneText buttonsound end .Irwin: - farwritetext UnknownText_0x1b638c + farwritetext IrwinAnswerPhoneText buttonsound end .Arnie: - farwritetext UnknownText_0x1b6454 + farwritetext ArnieAnswerPhoneText buttonsound end .Alan: - farwritetext UnknownText_0x1b659d + farwritetext AlanAnswerPhoneText buttonsound end .Chad: - farwritetext UnknownText_0x1b67e2 + farwritetext ChadAnswerPhoneText buttonsound end .Derek: - farwritetext UnknownText_0x1b69a8 + farwritetext DerekAnswerPhoneText buttonsound end .Tully: - farwritetext UnknownText_0x1b6b39 + farwritetext TullyAnswerPhoneText buttonsound end .Brent: - farwritetext UnknownText_0x1b6c96 + farwritetext BrentAnswerPhoneText buttonsound end .Vance: - farwritetext UnknownText_0x1b7019 + farwritetext VanceAnswerPhoneText buttonsound end .Wilton: - farwritetext UnknownText_0x1b71d5 + farwritetext WiltonAnswerPhoneText buttonsound end .Kenji: - farwritetext UnknownText_0x1b730b + farwritetext KenjiAnswerPhoneText buttonsound end .Parry: - farwritetext UnknownText_0x1b73c7 + farwritetext ParryAnswerPhoneText buttonsound end @@ -169,102 +169,102 @@ PhoneScript_AnswerPhone_Male_Day: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x1b4ded + farwritetext JackAnswerPhoneDayText buttonsound end .Huey: - farwritetext UnknownText_0x1b509b + farwritetext HueyAnswerPhoneDayText buttonsound end .Gaven: - farwritetext UnknownText_0x1b52a5 + farwritetext GavenAnswerPhoneDayText buttonsound end .Jose: - farwritetext UnknownText_0x1b55da + farwritetext JoseAnswerPhoneDayText buttonsound end .Joey: - farwritetext UnknownText_0x1b58c2 + farwritetext JoeyAnswerPhoneDayText buttonsound end .Wade: - farwritetext UnknownText_0x1b5a74 + farwritetext WadeAnswerPhoneDayText buttonsound end .Ralph: - farwritetext UnknownText_0x1b5c63 + farwritetext RalphAnswerPhoneDayText buttonsound end .Anthony: - farwritetext UnknownText_0x1b5f9e + farwritetext AnthonyAnswerPhoneDayText buttonsound end .Todd: - farwritetext UnknownText_0x1b611b + farwritetext ToddAnswerPhoneDayText buttonsound end .Irwin: - farwritetext UnknownText_0x1b63a8 + farwritetext IrwinAnswerPhoneDayText buttonsound end .Arnie: - farwritetext UnknownText_0x1b647e + farwritetext ArnieAnswerPhoneDayText buttonsound end .Alan: - farwritetext UnknownText_0x1b65c7 + farwritetext AlanAnswerPhoneDayText buttonsound end .Chad: - farwritetext UnknownText_0x1b680e + farwritetext ChadAnswerPhoneDayText buttonsound end .Derek: - farwritetext UnknownText_0x1b69d2 + farwritetext DerekAnswerPhoneDayText buttonsound end .Tully: - farwritetext UnknownText_0x1b6b65 + farwritetext TullyAnswerPhoneDayText buttonsound end .Brent: - farwritetext UnknownText_0x1b6cc6 + farwritetext BrentAnswerPhoneDayText buttonsound end .Vance: - farwritetext UnknownText_0x1b7057 + farwritetext VanceAnswerPhoneDayText buttonsound end .Wilton: - farwritetext UnknownText_0x1b71fc + farwritetext WiltonAnswerPhoneDayText buttonsound end .Kenji: - farwritetext UnknownText_0x1b7331 + farwritetext KenjiAnswerPhoneDayText buttonsound end .Parry: - farwritetext UnknownText_0x1b73ef + farwritetext ParryAnswerPhoneDayText buttonsound end @@ -292,102 +292,102 @@ PhoneScript_AnswerPhone_Male_Nite: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x1b4e16 + farwritetext JackAnswerPhoneNiteText buttonsound end .Huey: - farwritetext UnknownText_0x1b50c2 + farwritetext HueyAnswerPhoneNiteText buttonsound end .Gaven: - farwritetext UnknownText_0x1b52cc + farwritetext GavenAnswerPhoneNiteText buttonsound end .Jose: - farwritetext UnknownText_0x1b55fc + farwritetext JoseAnswerPhoneNiteText buttonsound end .Joey: - farwritetext UnknownText_0x1b58ea + farwritetext JoeyAnswerPhoneNiteText buttonsound end .Wade: - farwritetext UnknownText_0x1b5a9f + farwritetext WadeAnswerPhoneNiteText buttonsound end .Ralph: - farwritetext UnknownText_0x1b5cb6 + farwritetext RalphAnswerPhoneNiteText buttonsound end .Anthony: - farwritetext UnknownText_0x1b5fc9 + farwritetext AnthonyAnswerPhoneNiteText buttonsound end .Todd: - farwritetext UnknownText_0x1b6149 + farwritetext ToddAnswerPhoneNiteText buttonsound end .Irwin: - farwritetext UnknownText_0x1b63c4 + farwritetext IrwinAnswerPhoneNiteText buttonsound end .Arnie: - farwritetext UnknownText_0x1b64a8 + farwritetext ArnieAnswerPhoneNiteText buttonsound end .Alan: - farwritetext UnknownText_0x1b65e3 + farwritetext AlanAnswerPhoneNiteText buttonsound end .Chad: - farwritetext UnknownText_0x1b6836 + farwritetext ChadAnswerPhoneNiteText buttonsound end .Derek: - farwritetext UnknownText_0x1b69f8 + farwritetext DerekAnswerPhoneNiteText buttonsound end .Tully: - farwritetext UnknownText_0x1b6b92 + farwritetext TullyAnswerPhoneNiteText buttonsound end .Brent: - farwritetext UnknownText_0x1b6cf6 + farwritetext BrentAnswerPhoneNiteText buttonsound end .Vance: - farwritetext UnknownText_0x1b7092 + farwritetext VanceAnswerPhoneNiteText buttonsound end .Wilton: - farwritetext UnknownText_0x1b722a + farwritetext WiltonAnswerPhoneNiteText buttonsound end .Kenji: - farwritetext UnknownText_0x1b7357 + farwritetext KenjiAnswerPhoneNiteText buttonsound end .Parry: - farwritetext UnknownText_0x1b7417 + farwritetext ParryAnswerPhoneNiteText buttonsound end @@ -407,42 +407,42 @@ PhoneScript_AnswerPhone_Female: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x1b4f21 + farwritetext BeverlyAnswerPhoneText buttonsound end .Beth: - farwritetext UnknownText_0x1b53f7 + farwritetext BethAnswerPhoneText buttonsound end .Reena: - farwritetext UnknownText_0x1b5702 + farwritetext ReenaAnswerPhoneText buttonsound end .Liz: - farwritetext UnknownText_0x1b5d9f + farwritetext LizAnswerPhoneText buttonsound end .Gina: - farwritetext UnknownText_0x1b626a + farwritetext GinaAnswerPhoneText buttonsound end .Dana: - farwritetext UnknownText_0x1b66c8 + farwritetext DanaAnswerPhoneText buttonsound end .Tiffany: - farwritetext UnknownText_0x1b6e7c + farwritetext TiffanyAnswerPhoneText buttonsound end .Erin: - farwritetext UnknownText_0x1b751a + farwritetext ErinAnswerPhoneText buttonsound end @@ -458,42 +458,42 @@ PhoneScript_AnswerPhone_Female_Day: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x1b4f4d + farwritetext BeverlyAnswerPhoneDayText buttonsound end .Beth: - farwritetext UnknownText_0x1b5424 + farwritetext BethAnswerPhoneDayText buttonsound end .Reena: - farwritetext UnknownText_0x1b572e + farwritetext ReenaAnswerPhoneDayText buttonsound end .Liz: - farwritetext UnknownText_0x1b5dcc + farwritetext LizAnswerPhoneDayText buttonsound end .Gina: - farwritetext UnknownText_0x1b6296 + farwritetext GinaAnswerPhoneDayText buttonsound end .Dana: - farwritetext UnknownText_0x1b66ec + farwritetext DanaAnswerPhoneDayText buttonsound end .Tiffany: - farwritetext UnknownText_0x1b6ea6 + farwritetext TiffanyAnswerPhoneDayText buttonsound end .Erin: - farwritetext UnknownText_0x1b7548 + farwritetext ErinAnswerPhoneDayText buttonsound end @@ -509,42 +509,42 @@ PhoneScript_AnswerPhone_Female_Nite: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x1b4f75 + farwritetext BeverlyAnswerPhoneNiteText buttonsound end .Beth: - farwritetext UnknownText_0x1b5446 + farwritetext BethAnswerPhoneNiteText buttonsound end .Reena: - farwritetext UnknownText_0x1b575a + farwritetext ReenaAnswerPhoneNiteText buttonsound end .Liz: - farwritetext UnknownText_0x1b5df8 + farwritetext LizAnswerPhoneNiteText buttonsound end .Gina: - farwritetext UnknownText_0x1b62c5 + farwritetext GinaAnswerPhoneNiteText buttonsound end .Dana: - farwritetext UnknownText_0x1b6713 + farwritetext DanaAnswerPhoneNiteText buttonsound end .Tiffany: - farwritetext UnknownText_0x1b6ec9 + farwritetext TiffanyAnswerPhoneNiteText buttonsound end .Erin: - farwritetext UnknownText_0x1b756f + farwritetext ErinAnswerPhoneNiteText buttonsound end @@ -576,102 +576,102 @@ PhoneScript_GreetPhone_Male: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x1b4e3e + farwritetext JackGreetText buttonsound end .Huey: - farwritetext UnknownText_0x1b50e9 + farwritetext HueyGreetText buttonsound end .Gaven: - farwritetext UnknownText_0x1b5301 + farwritetext GavenGreetText buttonsound end .Jose: - farwritetext UnknownText_0x1b5628 + farwritetext JoseGreetText buttonsound end .Joey: - farwritetext UnknownText_0x1b5912 + farwritetext JoeyGreetText buttonsound end .Wade: - farwritetext UnknownText_0x1b5ad8 + farwritetext WadeGreetText buttonsound end .Ralph: - farwritetext UnknownText_0x1b5d09 + farwritetext RalphGreetText buttonsound end .Anthony: - farwritetext UnknownText_0x1b5ff6 + farwritetext AnthonyGreetText buttonsound end .Todd: - farwritetext UnknownText_0x1b616e + farwritetext ToddGreetText buttonsound end .Irwin: - farwritetext UnknownText_0x1b63e3 + farwritetext IrwinGreetText buttonsound end .Arnie: - farwritetext UnknownText_0x1b64d2 + farwritetext ArnieGreetText buttonsound end .Alan: - farwritetext UnknownText_0x1b660d + farwritetext AlanGreetText buttonsound end .Chad: - farwritetext UnknownText_0x1b6862 + farwritetext ChadGreetText buttonsound end .Derek: - farwritetext UnknownText_0x1b6a22 + farwritetext DerekGreetText buttonsound end .Tully: - farwritetext UnknownText_0x1b6bb9 + farwritetext TullyGreetText buttonsound end .Brent: - farwritetext UnknownText_0x1b6d26 + farwritetext BrentGreetText buttonsound end .Vance: - farwritetext UnknownText_0x1b70e7 + farwritetext VanceGreetText buttonsound end .Wilton: - farwritetext UnknownText_0x1b725c + farwritetext WiltonGreetText buttonsound end .Kenji: - farwritetext UnknownText_0x1b737f + farwritetext KenjiGreetText buttonsound end .Parry: - farwritetext UnknownText_0x1b743f + farwritetext ParryGreetText buttonsound end @@ -699,102 +699,102 @@ PhoneScript_GreetPhone_Male_Day: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x1b4e72 + farwritetext JackGreetDayText buttonsound end .Huey: - farwritetext UnknownText_0x1b511a + farwritetext HueyGreetDayText buttonsound end .Gaven: - farwritetext UnknownText_0x1b5335 + farwritetext GavenGreetDayText buttonsound end .Jose: - farwritetext UnknownText_0x1b564c + farwritetext JoseGreetDayText buttonsound end .Joey: - farwritetext UnknownText_0x1b5948 + farwritetext JoeyGreetDayText buttonsound end .Wade: - farwritetext UnknownText_0x1b5b0b + farwritetext WadeGreetDayText buttonsound end .Ralph: - farwritetext UnknownText_0x1b5d21 + farwritetext RalphGreetDayText buttonsound end .Anthony: - farwritetext UnknownText_0x1b6017 + farwritetext AnthonyGreetDayText buttonsound end .Todd: - farwritetext UnknownText_0x1b618f + farwritetext ToddGreetDayText buttonsound end .Irwin: - farwritetext UnknownText_0x1b6407 + farwritetext IrwinGreetDayText buttonsound end .Arnie: - farwritetext UnknownText_0x1b6506 + farwritetext ArnieGreetDayText buttonsound end .Alan: - farwritetext UnknownText_0x1b6624 + farwritetext AlanGreetDayText buttonsound end .Chad: - farwritetext UnknownText_0x1b6890 + farwritetext ChadGreetDayText buttonsound end .Derek: - farwritetext UnknownText_0x1b6a56 + farwritetext DerekGreetDayText buttonsound end .Tully: - farwritetext UnknownText_0x1b6bef + farwritetext TullyGreetDayText buttonsound end .Brent: - farwritetext UnknownText_0x1b6d57 + farwritetext BrentGreetDayText buttonsound end .Vance: - farwritetext UnknownText_0x1b7112 + farwritetext VanceGreetDayText buttonsound end .Wilton: - farwritetext UnknownText_0x1b7283 + farwritetext WiltonGreetDayText buttonsound end .Kenji: - farwritetext UnknownText_0x1b7397 + farwritetext KenjiGreetDayText buttonsound end .Parry: - farwritetext UnknownText_0x1b746f + farwritetext ParryGreetDayText buttonsound end @@ -822,102 +822,102 @@ PhoneScript_GreetPhone_Male_Nite: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x1b4e9e + farwritetext JackGreetNiteText buttonsound end .Huey: - farwritetext UnknownText_0x1b5154 + farwritetext HueyGreetNiteText buttonsound end .Gaven: - farwritetext UnknownText_0x1b535f + farwritetext GavenGreetNiteText buttonsound end .Jose: - farwritetext UnknownText_0x1b5670 + farwritetext JoseGreetNiteText buttonsound end .Joey: - farwritetext UnknownText_0x1b597c + farwritetext JoeyGreetNiteText buttonsound end .Wade: - farwritetext UnknownText_0x1b5b37 + farwritetext WadeGreetNiteText buttonsound end .Ralph: - farwritetext UnknownText_0x1b5d39 + farwritetext RalphGreetNiteText buttonsound end .Anthony: - farwritetext UnknownText_0x1b6041 + farwritetext AnthonyGreetNiteText buttonsound end .Todd: - farwritetext UnknownText_0x1b61bd + farwritetext ToddGreetNiteText buttonsound end .Irwin: - farwritetext UnknownText_0x1b642c + farwritetext IrwinGreetNiteText buttonsound end .Arnie: - farwritetext UnknownText_0x1b6539 + farwritetext ArnieGreetNiteText buttonsound end .Alan: - farwritetext UnknownText_0x1b663b + farwritetext AlanGreetNiteText buttonsound end .Chad: - farwritetext UnknownText_0x1b68ba + farwritetext ChadGreetNiteText buttonsound end .Derek: - farwritetext UnknownText_0x1b6a8b + farwritetext DerekGreetNiteText buttonsound end .Tully: - farwritetext UnknownText_0x1b6c23 + farwritetext TullyGreetNiteText buttonsound end .Brent: - farwritetext UnknownText_0x1b6d88 + farwritetext BrentGreetNiteText buttonsound end .Vance: - farwritetext UnknownText_0x1b7132 + farwritetext VanceGreetNiteText buttonsound end .Wilton: - farwritetext UnknownText_0x1b72a5 + farwritetext WiltonGreetNiteText buttonsound end .Kenji: - farwritetext UnknownText_0x1b73af + farwritetext KenjiGreetNiteText buttonsound end .Parry: - farwritetext UnknownText_0x1b749b + farwritetext ParryGreetNiteText buttonsound end @@ -937,42 +937,42 @@ PhoneScript_GreetPhone_Female: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x1b4fa1 + farwritetext BeverlyGreetText buttonsound end .Beth: - farwritetext UnknownText_0x1b5472 + farwritetext BethGreetText buttonsound end .Reena: - farwritetext UnknownText_0x1b5786 + farwritetext ReenaGreetText buttonsound end .Liz: - farwritetext UnknownText_0x1b5e25 + farwritetext LizGreetText buttonsound end .Gina: - farwritetext UnknownText_0x1b62f1 + farwritetext GinaGreetText buttonsound end .Dana: - farwritetext UnknownText_0x1b6738 + farwritetext DanaGreetText buttonsound end .Tiffany: - farwritetext UnknownText_0x1b6ef3 + farwritetext TiffanyGreetText buttonsound end .Erin: - farwritetext UnknownText_0x1b758f + farwritetext ErinGreetText buttonsound end @@ -988,42 +988,42 @@ PhoneScript_GreetPhone_Female_Day: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x1b4fda + farwritetext BeverlyGreetDayText buttonsound end .Beth: - farwritetext UnknownText_0x1b54a6 + farwritetext BethGreetDayText buttonsound end .Reena: - farwritetext UnknownText_0x1b57b7 + farwritetext ReenaGreetDayText buttonsound end .Liz: - farwritetext UnknownText_0x1b5e59 + farwritetext LizGreetDayText buttonsound end .Gina: - farwritetext UnknownText_0x1b630e + farwritetext GinaGreetDayText buttonsound end .Dana: - farwritetext UnknownText_0x1b6757 + farwritetext DanaGreetDayText buttonsound end .Tiffany: - farwritetext UnknownText_0x1b6f1c + farwritetext TiffanyGreetDayText buttonsound end .Erin: - farwritetext UnknownText_0x1b75ac + farwritetext ErinGreetDayText buttonsound end @@ -1039,42 +1039,42 @@ PhoneScript_GreetPhone_Female_Nite: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x1b5004 + farwritetext BeverlyGreetNiteText buttonsound end .Beth: - farwritetext UnknownText_0x1b54d4 + farwritetext BethGreetNiteText buttonsound end .Reena: - farwritetext UnknownText_0x1b57e8 + farwritetext ReenaGreetNiteText buttonsound end .Liz: - farwritetext UnknownText_0x1b5e8e + farwritetext LizGreetNiteText buttonsound end .Gina: - farwritetext UnknownText_0x1b6331 + farwritetext GinaGreetNiteText buttonsound end .Dana: - farwritetext UnknownText_0x1b6776 + farwritetext DanaGreetNiteText buttonsound end .Tiffany: - farwritetext UnknownText_0x1b6f37 + farwritetext TiffanyGreetNiteText buttonsound end .Erin: - farwritetext UnknownText_0x1b75c9 + farwritetext ErinGreetNiteText buttonsound end @@ -1099,92 +1099,92 @@ PhoneScript_Generic_Male: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x1b4ecd + farwritetext JackGenericText buttonsound end .Unknown: - farwritetext UnknownText_0x1b518b + farwritetext UnknownGenericText buttonsound end .Gaven: - farwritetext UnknownText_0x1b5393 + farwritetext GavenGenericText buttonsound end .Jose: - farwritetext UnknownText_0x1b5694 + farwritetext JoseGenericText buttonsound end .Joey: - farwritetext UnknownText_0x1b59b2 + farwritetext JoeyGenericText buttonsound end .Wade: - farwritetext UnknownText_0x1b5b68 + farwritetext WadeGenericText buttonsound end .Ralph: - farwritetext UnknownText_0x1b5d51 + farwritetext RalphGenericText buttonsound end .Anthony: - farwritetext UnknownText_0x1b606f + farwritetext AnthonyGenericText buttonsound end .Todd: - farwritetext UnknownText_0x1b61f2 + farwritetext ToddGenericText buttonsound end .Arnie: - farwritetext UnknownText_0x1b656c + farwritetext ArnieGenericText buttonsound end .Alan: - farwritetext UnknownText_0x1b6652 + farwritetext AlanGenericText buttonsound end .Chad: - farwritetext UnknownText_0x1b68e8 + farwritetext ChadGenericText buttonsound end .Derek: - farwritetext UnknownText_0x1b6ac2 + farwritetext DerekGenericText buttonsound end .Tully: - farwritetext UnknownText_0x1b6c56 + farwritetext TullyGenericText buttonsound end .Brent: - farwritetext UnknownText_0x1b6db9 + farwritetext BrentGenericText buttonsound end .Vance: - farwritetext UnknownText_0x1b7161 + farwritetext VanceGenericText buttonsound end .Wilton: - farwritetext UnknownText_0x1b72d0 + farwritetext WiltonGenericText buttonsound end .Parry: - farwritetext UnknownText_0x1b74c8 + farwritetext ParryGenericText buttonsound end @@ -1200,42 +1200,42 @@ PhoneScript_Generic_Female: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x1b502b + farwritetext BeverlyGenericText buttonsound end .Beth: - farwritetext UnknownText_0x1b5510 + farwritetext BethGenericText buttonsound end .Reena: - farwritetext UnknownText_0x1b5819 + farwritetext ReenaGenericText buttonsound end .Liz: - farwritetext UnknownText_0x1b5ebe + farwritetext LizGenericText buttonsound end .Gina: - farwritetext UnknownText_0x1b6352 + farwritetext GinaGenericText buttonsound end .Dana: - farwritetext UnknownText_0x1b6795 + farwritetext DanaGenericText buttonsound end .Tiffany: - farwritetext UnknownText_0x1b6f60 + farwritetext TiffanyGenericText buttonsound end .Erin: - farwritetext UnknownText_0x1b75e5 + farwritetext ErinGenericText buttonsound end @@ -1243,17 +1243,17 @@ PhoneScript_MonFlavorText: special RandomPhoneMon farscall PhoneScript_Random2 ifequal $0, .TooEnergetic - farwritetext UnknownText_0x1b518b + farwritetext UnknownGenericText buttonsound - farsjump PhoneScript_HangupText_Male + farsjump PhoneScript_HangUpText_Male .TooEnergetic: farsjump .unnecessary .unnecessary - farwritetext UnknownText_0x1b522b + farwritetext UnknownTougherThanEverText buttonsound - farsjump PhoneScript_HangupText_Male + farsjump PhoneScript_HangUpText_Male GrandmaString: db "Grandma@" GrandpaString: db "Grandpa@" diff --git a/engine/phone/scripts/generic_caller.asm b/engine/phone/scripts/generic_caller.asm index 636b7ab81..6c4e9fd7d 100644 --- a/engine/phone/scripts/generic_caller.asm +++ b/engine/phone/scripts/generic_caller.asm @@ -31,7 +31,7 @@ Phone_FoundAMon_Male: farscall PhoneScript_Random2 ifequal 0, .GotAway farscall Phone_WhoDefeatedMon_Male - farsjump PhoneScript_HangupText_Male + farsjump PhoneScript_HangUpText_Male .GotAway: farsjump Phone_GotAwayCall_Male @@ -41,18 +41,18 @@ Phone_FoundAMon_Female: farscall PhoneScript_Random2 ifequal 0, .GotAway farscall Phone_WhoDefeatedMon_Female - farsjump PhoneScript_HangupText_Female + farsjump PhoneScript_HangUpText_Female .GotAway: farsjump Phone_GotAwayCall_Female Phone_GotAwayCall_Male: farscall Phone_WhoLostAMon_Male - farsjump PhoneScript_HangupText_Male + farsjump PhoneScript_HangUpText_Male Phone_GotAwayCall_Female: farscall Phone_WhoLostAMon_Female - farsjump PhoneScript_HangupText_Female + farsjump PhoneScript_HangUpText_Female Phone_WhosBragging_Male: readvar VAR_CALLERID @@ -75,27 +75,27 @@ Phone_WhosBragging_Male: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext JackIntelligenceText + farwritetext JackIntelligenceKeepsRisingText buttonsound end .Gaven: - farwritetext GavenGreaterText + farwritetext GavenMonGreaterThanImaginedText buttonsound end .Jose: - farwritetext JoseAromaText + farwritetext JoseMonsStickHasADeliciousAromaText buttonsound end .Joey: - farwritetext JoeySharperText + farwritetext JoeyMonLookingSharperText buttonsound end .Wade: - farwritetext WadeAreYouGrowingText + farwritetext WadeAreYourMonGrowingText buttonsound end @@ -105,7 +105,7 @@ Phone_WhosBragging_Male: end .Anthony: - farwritetext AnthonyAteBerriesText + farwritetext AnthonyMonAteSomeBerriesText buttonsound end @@ -115,7 +115,7 @@ Phone_WhosBragging_Male: end .Arnie: - farwritetext ArnieLovesTheCuteText + farwritetext ArnieMonIsSoCuteText buttonsound end @@ -130,12 +130,12 @@ Phone_WhosBragging_Male: end .Derek: - farwritetext DerekCheekPincherText + farwritetext DerekCheekPinchingText buttonsound end .Tully: - farwritetext TullyGrownText + farwritetext TullyMonHasGrownText buttonsound end @@ -145,17 +145,17 @@ Phone_WhosBragging_Male: end .Vance: - farwritetext VanceLiftoffText + farwritetext VanceMonHasBecomeTougherText buttonsound end .Wilton: - farwritetext WiltonGrownText + farwritetext WiltonMonHasGrownText buttonsound end .Parry: - farwritetext ParryNoMatchText + farwritetext ParryNothingCanMatchText buttonsound end @@ -171,42 +171,42 @@ Phone_WhosBragging_Female: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x174688 + farwritetext BeverlyMadeMonEvenCuterText buttonsound end .Beth: - farwritetext UnknownText_0x174c7f + farwritetext BethExhilaratingRideText buttonsound end .Reena: - farwritetext UnknownText_0x1752f5 + farwritetext ReenaMonsIsAPerfectMatchText buttonsound end .Liz: - farwritetext UnknownText_0x175fda + farwritetext LizMonAlwaysWantsToNuzzleText buttonsound end .Gina: - farwritetext UnknownText_0x1771fd + farwritetext GinaGettingInSyncWithMonText buttonsound end .Dana: - farwritetext UnknownText_0x64f74 + farwritetext DanaTakingPhotosText buttonsound end .Tiffany: - farwritetext UnknownText_0x665ad + farwritetext TiffanyMonIsAdorableText buttonsound end .Erin: - farwritetext UnknownText_0x6717a + farwritetext ErinMonIsMuchStrongerText buttonsound end @@ -236,82 +236,82 @@ Phone_WhoDefeatedMon_Male: end .Gaven: - farwritetext UnknownText_0x174a80 + farwritetext GavenDefeatedMonText buttonsound end .Jose: - farwritetext UnknownText_0x174f90 + farwritetext JoseDefeatedMonText buttonsound end .Joey: - farwritetext UnknownText_0x175591 + farwritetext JoeyDefeatedMonText buttonsound end .Wade: - farwritetext UnknownText_0x175869 + farwritetext WadeDefeatedMonText buttonsound end .Ralph: - farwritetext UnknownText_0x175c24 + farwritetext RalphDefeatedMonText buttonsound end .Anthony: - farwritetext UnknownText_0x176aef + farwritetext AnthonyDefeatedMonText buttonsound end .Todd: - farwritetext UnknownText_0x176e9c + farwritetext ToddDefeatedMonText buttonsound end .Arnie: - farwritetext UnknownText_0x64a13 + farwritetext ArnieDefeatedMonText buttonsound end .Alan: - farwritetext UnknownText_0x64cf3 + farwritetext AlanDefeatedMonText buttonsound end .Chad: - farwritetext UnknownText_0x65318 + farwritetext ChadDefeatedMonText buttonsound end .Derek: - farwritetext UnknownText_0x65b29 + farwritetext DerekDefeatedMonText buttonsound end .Tully: - farwritetext UnknownText_0x65e42 + farwritetext TullyDefeatedMonText buttonsound end .Brent: - farwritetext UnknownText_0x6613c + farwritetext BrentDefeatedMonText buttonsound end .Vance: - farwritetext UnknownText_0x669b2 + farwritetext VanceDefeatedMonText buttonsound end .Wilton: - farwritetext UnknownText_0x66b3e + farwritetext WiltonDefeatedMonText buttonsound end .Parry: - farwritetext UnknownText_0x66fc0 + farwritetext ParryDefeatedMonText buttonsound end @@ -327,42 +327,42 @@ Phone_WhoDefeatedMon_Female: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x1746c3 + farwritetext BeverlyDefeatedMonText buttonsound end .Beth: - farwritetext UnknownText_0x174cf6 + farwritetext BethDefeatedMonText buttonsound end .Reena: - farwritetext UnknownText_0x17536b + farwritetext ReenaDefeatedMonText buttonsound end .Liz: - farwritetext UnknownText_0x17602d + farwritetext LizDefeatedMonText buttonsound end .Gina: - farwritetext UnknownText_0x177237 + farwritetext GinaDefeatedMonText buttonsound end .Dana: - farwritetext UnknownText_0x64fb2 + farwritetext DanaDefeatedMonText buttonsound end .Tiffany: - farwritetext UnknownText_0x66605 + farwritetext TiffanyDefeatedMonText buttonsound end .Erin: - farwritetext UnknownText_0x671a4 + farwritetext ErinDefeatedMonText buttonsound end @@ -387,87 +387,87 @@ Phone_WhoLostAMon_Male: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x174165 + farwritetext JackLostAMonText buttonsound end .Gaven: - farwritetext UnknownText_0x174b2d + farwritetext GavenLostAMonText buttonsound end .Jose: - farwritetext UnknownText_0x174ffd + farwritetext JoseLostAMonText buttonsound end .Joey: - farwritetext UnknownText_0x175611 + farwritetext JoeyLostAMonText buttonsound end .Wade: - farwritetext UnknownText_0x1758e4 + farwritetext WadeLostAMonText buttonsound end .Ralph: - farwritetext UnknownText_0x175c9f + farwritetext RalphLostAMonText buttonsound end .Anthony: - farwritetext UnknownText_0x176b45 + farwritetext AnthonyLostAMonText buttonsound end .Todd: - farwritetext UnknownText_0x176eee + farwritetext ToddLostAMonText buttonsound end .Arnie: - farwritetext UnknownText_0x64a71 + farwritetext ArnieLostAMonText buttonsound end .Alan: - farwritetext UnknownText_0x64d4f + farwritetext AlanLostAMonText buttonsound end .Chad: - farwritetext UnknownText_0x65399 + farwritetext ChadLostAMonText buttonsound end .Derek: - farwritetext UnknownText_0x65bc8 + farwritetext DerekLostAMonText buttonsound end .Tully: - farwritetext UnknownText_0x65eac + farwritetext TullyLostAMonText buttonsound end .Brent: - farwritetext UnknownText_0x6618c + farwritetext BrentLostAMonText buttonsound end .Vance: - farwritetext UnknownText_0x669ed + farwritetext VanceLostAMonText buttonsound end .Wilton: - farwritetext UnknownText_0x66b8f + farwritetext WiltonLostAMonText buttonsound end .Parry: - farwritetext UnknownText_0x67001 + farwritetext ParryLostAMonText buttonsound end @@ -483,52 +483,52 @@ Phone_WhoLostAMon_Female: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x174734 + farwritetext BeverlyLostAMonText buttonsound end .Beth: - farwritetext UnknownText_0x174d86 + farwritetext BethLostAMonText buttonsound end .Reena: - farwritetext UnknownText_0x1753c5 + farwritetext ReenaLostAMonText buttonsound end .Liz: - farwritetext UnknownText_0x176095 + farwritetext LizLostAMonText buttonsound end .Gina: - farwritetext UnknownText_0x177297 + farwritetext GinaLostAMonText buttonsound end .Dana: - farwritetext UnknownText_0x6501c + farwritetext DanaLostAMonText buttonsound end .Tiffany: - farwritetext UnknownText_0x66688 + farwritetext TiffanyLostAMonText buttonsound end .Erin: - farwritetext UnknownText_0x671eb + farwritetext ErinLostAMonText buttonsound end PhoneScript_WantsToBattle_Male: farscall PhoneScript_RematchText_Male - farsjump PhoneScript_HangupText_Male + farsjump PhoneScript_HangUpText_Male PhoneScript_WantsToBattle_Female: farscall PhoneScript_RematchText_Female - farsjump PhoneScript_HangupText_Female + farsjump PhoneScript_HangUpText_Female PhoneScript_RematchText_Male: readvar VAR_CALLERID @@ -551,87 +551,87 @@ PhoneScript_RematchText_Male: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x1741e1 + farwritetext JackBattleRematchText buttonsound end .Huey: - farwritetext UnknownText_0x1748ea + farwritetext HueyBattleRematchText buttonsound end .Gaven: - farwritetext UnknownText_0x174bc5 + farwritetext GavenBattleRematchText buttonsound end .Jose: - farwritetext UnknownText_0x17507d + farwritetext JoseBattleRematchText buttonsound end .Joey: - farwritetext UnknownText_0x175693 + farwritetext JoeyBattleRematchText buttonsound end .Wade: - farwritetext UnknownText_0x175976 + farwritetext WadeBattleRematchText buttonsound end .Ralph: - farwritetext UnknownText_0x175d40 + farwritetext RalphBattleRematchText buttonsound end .Anthony: - farwritetext UnknownText_0x176bee + farwritetext AnthonyBattleRematchText buttonsound end .Todd: - farwritetext UnknownText_0x176f60 + farwritetext ToddBattleRematchText buttonsound end .Arnie: - farwritetext UnknownText_0x64ada + farwritetext ArnieBattleRematchText buttonsound end .Alan: - farwritetext UnknownText_0x64da4 + farwritetext AlanBattleRematchText buttonsound end .Chad: - farwritetext UnknownText_0x65419 + farwritetext ChadBattleRematchText buttonsound end .Tully: - farwritetext UnknownText_0x65f17 + farwritetext TullyBattleRematchText buttonsound end .Brent: - farwritetext UnknownText_0x66214 + farwritetext BrentBattleRematchText buttonsound end .Vance: - farwritetext UnknownText_0x66a3a + farwritetext VanceBattleRematchText buttonsound end .Wilton: - farwritetext UnknownText_0x66bf3 + farwritetext WiltonBattleRematchText buttonsound end .Parry: - farwritetext UnknownText_0x67096 + farwritetext ParryBattleRematchText buttonsound end @@ -646,49 +646,49 @@ PhoneScript_RematchText_Female: ifequal PHONE_PICNICKER_ERIN, .Erin .Beth: - farwritetext UnknownText_0x174e4e + farwritetext BethBattleRematchText buttonsound end .Reena: - farwritetext UnknownText_0x17543a + farwritetext ReenaBattleRematchText buttonsound end .Liz: - farwritetext UnknownText_0x17610a + farwritetext LizBattleRematchText buttonsound end .Gina: - farwritetext UnknownText_0x1772e2 + farwritetext GinaBattleRematchText buttonsound end .Dana: - farwritetext UnknownText_0x65091 + farwritetext DanaBattleRematchText buttonsound end .Tiffany: - farwritetext UnknownText_0x66730 + farwritetext TiffanyBattleRematchText buttonsound end .Erin: - farwritetext UnknownText_0x6722e + farwritetext ErinBattleRematchText buttonsound end LizWrongNumberScript: - farwritetext LizHiTaniaText + farwritetext LizWrongNumberText end TiffanyItsAwful: farwritetext TiffanyItsAwfulText end -PhoneScript_HangupText_Male: +PhoneScript_HangUpText_Male: readvar VAR_CALLERID ifequal PHONE_SCHOOLBOY_JACK, .Jack ifequal PHONE_SAILOR_HUEY, .Huey @@ -712,86 +712,86 @@ PhoneScript_HangupText_Male: ifequal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x174251 + farwritetext JackHangUpText end .Huey: - farwritetext UnknownText_0x174962 + farwritetext HueyHangUpText end .Gaven: - farwritetext UnknownText_0x174c0e + farwritetext GavenHangUpText end .Jose: - farwritetext UnknownText_0x175106 + farwritetext JoseHangUpText end .Joey: - farwritetext UnknownText_0x17570a + farwritetext JoeyHangUpText end .Wade: - farwritetext UnknownText_0x1759e7 + farwritetext WadeHangUpText end .Ralph: - farwritetext UnknownText_0x175db7 + farwritetext RalphHangUpText end .Anthony: - farwritetext UnknownText_0x176c47 + farwritetext AnthonyHangUpText end .Todd: - farwritetext UnknownText_0x176fdb + farwritetext ToddHangUpText end .Irwin: - farwritetext UnknownText_0x64000 + farwritetext IrwinHangUpText end .Arnie: - farwritetext UnknownText_0x64b48 + farwritetext ArnieHangUpText end .Alan: - farwritetext UnknownText_0x64e1f + farwritetext AlanHangUpText end .Chad: - farwritetext UnknownText_0x65471 + farwritetext ChadHangUpText end .Derek: - farwritetext UnknownText_0x65c4e + farwritetext DerekHangUpText end .Tully: - farwritetext UnknownText_0x65f6e + farwritetext TullyHangUpText end .Brent: - farwritetext UnknownText_0x662a9 + farwritetext BrentHangUpText end .Vance: - farwritetext UnknownText_0x66a93 + farwritetext VanceHangUpText end .Wilton: - farwritetext UnknownText_0x66c58 + farwritetext WiltonHangUpText end .Kenji: - farwritetext UnknownText_0x66dab + farwritetext KenjiHangUpText end .Parry: - farwritetext UnknownText_0x670eb + farwritetext ParryHangUpText end -PhoneScript_HangupText_Female: +PhoneScript_HangUpText_Female: readvar VAR_CALLERID ifequal PHONE_POKEFAN_BEVERLY, .Beverly ifequal PHONE_COOLTRAINERF_BETH, .Beth @@ -803,35 +803,35 @@ PhoneScript_HangupText_Female: ifequal PHONE_PICNICKER_ERIN, .Erin .Beverly: - farwritetext UnknownText_0x1747ac + farwritetext BeverlyHangUpText end .Beth: - farwritetext UnknownText_0x174eb7 + farwritetext BethHangUpText end .Reena: - farwritetext UnknownText_0x175488 + farwritetext ReenaHangUpText end .Liz: - farwritetext UnknownText_0x17620a + farwritetext LizHangUpText end .Gina: - farwritetext UnknownText_0x177361 + farwritetext GinaHangUpText end .Dana: - farwritetext UnknownText_0x650e2 + farwritetext DanaHangUpText end .Tiffany: - farwritetext UnknownText_0x667f7 + farwritetext TiffanyHangUpText end .Erin: - farwritetext UnknownText_0x67281 + farwritetext ErinHangUpText end Phone_CheckIfUnseenRare_Male: @@ -840,7 +840,7 @@ Phone_CheckIfUnseenRare_Male: farsjump Phone_GenericCall_Male .HangUp: - farsjump PhoneScript_HangupText_Male + farsjump PhoneScript_HangUpText_Male Phone_CheckIfUnseenRare_Female: scall PhoneScriptRareWildMon @@ -848,7 +848,7 @@ Phone_CheckIfUnseenRare_Female: farsjump Phone_GenericCall_Female .HangUp: - farsjump PhoneScript_HangupText_Female + farsjump PhoneScript_HangUpText_Female PhoneScriptRareWildMon: special RandomUnseenWildMon @@ -862,37 +862,37 @@ PhoneScript_BugCatchingContest: .Wade: farwritetext WadeBugCatchingContestText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Derek: farwritetext DerekBugCatchingContestText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -IrwinRocketRumor: - farwritetext UnknownText_0x64032 +IrwinRocketRumorScript: + farwritetext IrwinRocketTakeoverRumorText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa05c6: - farwritetext UnknownText_0x177378 +GinaRocketRumorScript: + farwritetext GinaRocketTakeoverRumorText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female -UnknownScript_0xa05ce: - farwritetext UnknownText_0x64b5f +ArnieSwarmScript: + farwritetext ArnieSwarmText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa05d6: - farwritetext UnknownText_0x175dd9 +RalphItemScript: + farwritetext RalphItemText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa05de: - farwritetext UnknownText_0x176c61 +AnthonySwarmScript: + farwritetext AnthonySwarmText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male PhoneScript_FoundItem_Male: readvar VAR_CALLERID @@ -904,27 +904,27 @@ PhoneScript_FoundItem_Male: ifequal PHONE_FISHER_WILTON, .Wilton .Jose: - farwritetext JoseFoundSomethingText + farwritetext JoseFoundItemText end .Wade: - farwritetext WadeFoundBerryText + farwritetext WadeFoundItemText end .Alan: - farwritetext UnknownText_0x64e2f + farwritetext AlanFoundItemText end .Derek: - farwritetext UnknownText_0x65cf9 + farwritetext DerekFoundItemText end .Tully: - farwritetext UnknownText_0x65f88 + farwritetext TullyFoundItemText end .Wilton: - farwritetext UnknownText_0x66c6b + farwritetext WiltonFoundItemText end PhoneScript_FoundItem_Female: @@ -935,27 +935,27 @@ PhoneScript_FoundItem_Female: ifequal PHONE_PICNICKER_TIFFANY, .Tiffany .Beverly: - farwritetext BeverlyFoundNuggetText + farwritetext BeverlyFoundItemText end .Gina: - farwritetext UnknownText_0x1773e7 + farwritetext GinaFoundItemText end .Dana: - farwritetext UnknownText_0x650ec + farwritetext DanaFoundItemText end .Tiffany: - farwritetext UnknownText_0x66801 + farwritetext TiffanyFoundItemText end -UnknownScript_0xa0644: - farwritetext UnknownText_0x176feb +ToddItemScript: + farwritetext ToddDepartmentStoreBargainSaleText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male KenjiCallingPhoneScript: - farwritetext UnknownText_0x66dc5 + farwritetext KenjiRemainDedicatedText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/gina.asm b/engine/phone/scripts/gina.asm index d1953d3f7..3b9da6090 100644 --- a/engine/phone/scripts/gina.asm +++ b/engine/phone/scripts/gina.asm @@ -15,18 +15,18 @@ GinaPhoneCalleeScript: .NotSunday: checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue .Rockets - farsjump UnknownScript_0xa0960 + farsjump GinaHangUpScript .Rockets: - farsjump UnknownScript_0xa05c6 + farsjump GinaRocketRumorScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_34 - farsjump UnknownScript_0xa0a69 + farsjump GinaReminderScript .HasLeafStone: getlandmarkname STRING_BUFFER_5, ROUTE_34 - farsjump UnknownScript_0xa0abd + farsjump GinaComePickUpScript GinaPhoneCallerScript: gettrainername STRING_BUFFER_3, PICNICKER, GINA1 @@ -64,7 +64,7 @@ GinaWantsBattle: farsjump PhoneScript_WantsToBattle_Female GinaRockets: - farsjump UnknownScript_0xa05c6 + farsjump GinaRocketRumorScript GinaHasLeafStone: setflag ENGINE_GINA_HAS_LEAF_STONE diff --git a/engine/phone/scripts/hangups.asm b/engine/phone/scripts/hangups.asm index 55d2f8144..e524ca0fc 100644 --- a/engine/phone/scripts/hangups.asm +++ b/engine/phone/scripts/hangups.asm @@ -1,166 +1,166 @@ -JackPhoneTips: - farwritetext UnknownText_0x1745c2 +JackPhoneTipsScript: + farwritetext JackHeardSomeGreatTipsText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0900: - farwritetext UnknownText_0x17485b +BeverlyHangUpScript: + farwritetext BeverlyLetsChatAboutMonAgainText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female -UnknownScript_0xa0908: - farwritetext UnknownText_0x17496b +HueyHangUpScript: + farwritetext HueyWeHaveToBattleAgainSometimeText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0910: - farwritetext UnknownText_0x174c29 +GavenHangUpNotThursdayScript: + farwritetext GavenHangUpNotThursdayText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0918: - farwritetext UnknownText_0x174ec5 +BethHangUpScript: + farwritetext BethLetsBattleAgainSometimeText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female -UnknownScript_0xa0920: - farwritetext UnknownText_0x17519b +JoseHangUpScript: + farwritetext JoseHaventGottenItemYetText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0928: - farwritetext UnknownText_0x17549b +ReenaForwardScript: + farwritetext ReenaForwardText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female -UnknownScript_0xa0930: - farwritetext UnknownText_0x17571d +JoeyHangUpScript: + farwritetext JoeyDevisingStrategiesText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0938: - farwritetext UnknownText_0x175abe +WadeNoBerriesScript: + farwritetext WadeNoBerriesText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0940: - farwritetext UnknownText_0x175eaf +RalphNoItemScript: + farwritetext RalphNoItemText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0948: - farwritetext UnknownText_0x1768b0 +LizHangUpScript: + farwritetext LizFawningOverMonText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female -UnknownScript_0xa0950: - farwritetext UnknownText_0x176d32 +AnthonyHangUpScript: + farwritetext AnthonyWasntPayingAttentionText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0958: - farwritetext UnknownText_0x1770fb +ToddNoItemScript: + farwritetext ToddSavingUpForBargainSaleText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0960: - farwritetext UnknownText_0x177465 +GinaHangUpScript: + farwritetext GinaHaventFoundAnythingYetText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female -UnknownScript_0xa0968: - farwritetext UnknownText_0x64bc6 +ArnieHangUpScript: + farwritetext ArnieHaventSeenRareMonText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0970: - farwritetext UnknownText_0x64e90 +AlanHangUpScript: + farwritetext AlanHaventPickedUpAnythingText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0978: - farwritetext UnknownText_0x65161 +DanaHangUpScript: + farwritetext DanaCanYouWaitABitLongerText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female -UnknownScript_0xa0980: - farwritetext UnknownText_0x65a23 +ChadHangUpScript: + farwritetext ChadGoingToStudyHardText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0988: - farwritetext UnknownText_0x65d5c +DerekHangUpScript: + farwritetext DerekLetsGetTogetherText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0990: - farwritetext UnknownText_0x65ff2 +TullyNoItemScript: + farwritetext TullyNoItemText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0998: - farwritetext UnknownText_0x6651e +BrentHangUpScript: + farwritetext BrentSorryImTooBusyText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa09a0: - farwritetext UnknownText_0x66882 +TiffanyNoItemScript: + farwritetext TiffanyNoItemText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female -VanceLookingForward: +VanceLookingForwardScript: farwritetext VanceLookingForwardText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -WiltonHaventFoundAnything: +WiltonHaventFoundAnythingScript: farwritetext WiltonHaventFoundAnythingText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -ParryBattleWithMe: +ParryBattleWithMeScript: farwritetext ParryBattleWithMeText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male ErinWorkingHardScript: farwritetext ErinWorkingHardText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female -UnknownScript_0xa09c8: +IrwinRandomTextScript: random 3 - ifequal 0, UnknownScript_0xa09d6 - ifequal 1, UnknownScript_0xa09de - ifequal 2, UnknownScript_0xa09e6 + ifequal 0, IrwinEscapadeScript + ifequal 1, IrwinGoodMatchScript + ifequal 2, IrwinSoMuchToChatAboutScript -UnknownScript_0xa09d6: - farwritetext UnknownText_0x64846 +IrwinEscapadeScript: + farwritetext IrwinYourEscapadesRockText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa09de: - farwritetext UnknownText_0x64881 +IrwinGoodMatchScript: + farwritetext IrwinGoodMatchText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa09e6: - farwritetext UnknownText_0x648dc +IrwinSoMuchToChatAboutScript: + farwritetext IrwinSoMuchToChatAboutText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male KenjiAnswerPhoneScript: readvar VAR_KENJI_BREAK ifequal 2, .Training ifequal 1, .OnBreak - farwritetext UnknownText_0x66e17 + farwritetext KenjiCallMeBackAnotherTimeText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Training: - farwritetext UnknownText_0x66e67 + farwritetext KenjiIllHaveTimeToChatTomorrowText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .OnBreak: checktime MORN @@ -168,16 +168,16 @@ KenjiAnswerPhoneScript: checktime NITE iftrue .Night setevent EVENT_KENJI_ON_BREAK - farwritetext KenjiBreakText + farwritetext KenjiTakingABreakText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Morning: - farwritetext UnknownText_0x66ed3 + farwritetext KenjiHangUpMorningText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Night: - farwritetext UnknownText_0x66f52 + farwritetext KenjiHangUpNightText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/hangups_2.asm b/engine/phone/scripts/hangups_2.asm index 4518b2d99..c0fa7217a 100644 --- a/engine/phone/scripts/hangups_2.asm +++ b/engine/phone/scripts/hangups_2.asm @@ -1,49 +1,49 @@ -UnknownScript_0xa0aa5: - farwritetext UnknownText_0x174895 +BeverlyComePickUpScript: + farwritetext BeverlyComePickUpText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female -UnknownScript_0xa0aad: - farwritetext UnknownText_0x17529c +JoseComePickUpScript: + farwritetext JoseComePickUpText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0ab5: - farwritetext UnknownText_0x175b6d +WadeComeQuickScript: + farwritetext WadeComeQuickText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0abd: - farwritetext UnknownText_0x17750e +GinaComePickUpScript: + farwritetext GinaComePickUpText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female -UnknownScript_0xa0ac5: - farwritetext UnknownText_0x64f1a +AlanComePickUpScript: + farwritetext AlanComePickUpGiftText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0acd: - farwritetext UnknownText_0x6520f +DanaComePickUpScript: + farwritetext DanaComePickUpText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female -UnknownScript_0xa0ad5: - farwritetext UnknownText_0x65da6 +DerekComePickUpScript: + farwritetext DerekComePickUpText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0add: - farwritetext UnknownText_0x66087 +TullyHurryScript: + farwritetext TullyHurryText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male -UnknownScript_0xa0ae5: - farwritetext UnknownText_0x6691d +TiffanyHurryScript: + farwritetext TiffanyHurryText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female -WiltonWantThis: +WiltonWantThisScript: farwritetext WiltonWantThisText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/huey.asm b/engine/phone/scripts/huey.asm index b5bf21b5b..cac966682 100644 --- a/engine/phone/scripts/huey.asm +++ b/engine/phone/scripts/huey.asm @@ -12,7 +12,7 @@ HueyPhoneCalleeScript: .NotWednesday: special RandomPhoneMon - farsjump UnknownScript_0xa0908 + farsjump HueyHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, LIGHTHOUSE diff --git a/engine/phone/scripts/irwin.asm b/engine/phone/scripts/irwin.asm index c859aecf5..b7a7b1112 100644 --- a/engine/phone/scripts/irwin.asm +++ b/engine/phone/scripts/irwin.asm @@ -3,10 +3,10 @@ IrwinPhoneCalleeScript: farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue .Rockets - farsjump UnknownScript_0xa09c8 + farsjump IrwinRandomTextScript .Rockets: - farsjump IrwinRocketRumor + farsjump IrwinRocketRumorScript IrwinPhoneCallerScript: gettrainername STRING_BUFFER_3, JUGGLER, IRWIN1 @@ -16,4 +16,4 @@ IrwinPhoneCallerScript: farsjump IrwinRumorScript .Rockets: - farsjump IrwinRocketRumor + farsjump IrwinRocketRumorScript diff --git a/engine/phone/scripts/irwin_gossip.asm b/engine/phone/scripts/irwin_gossip.asm index 038f094d6..97816d6e8 100644 --- a/engine/phone/scripts/irwin_gossip.asm +++ b/engine/phone/scripts/irwin_gossip.asm @@ -25,64 +25,64 @@ IrwinRumorScript: iftrue .PlainBadge farwritetext IrwinCalledRightAwayText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .PlainBadge: - farwritetext UnknownText_0x64099 + farwritetext IrwinPlainBadgeGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .JasmineReturned: - farwritetext UnknownText_0x640e6 + farwritetext IrwinJasmineReturnedGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .RocketHideout: - farwritetext UnknownText_0x6416d + farwritetext IrwinRocketHideoutGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .RadioTower: - farwritetext UnknownText_0x641e8 + farwritetext IrwinRadioTowerGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .RisingBadge: - farwritetext UnknownText_0x64247 + farwritetext IrwinRisingBadgeGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .EliteFour: - farwritetext UnknownText_0x642bb + farwritetext IrwinEliteFourGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .VermilionCity: - farwritetext UnknownText_0x643d4 + farwritetext IrwinVermilionCityGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .TrainPass: - farwritetext UnknownText_0x64448 + farwritetext IrwinTrainPassGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Snorlax: - farwritetext UnknownText_0x6455b + farwritetext IrwinSnorlaxGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .MtSilver: - farwritetext UnknownText_0x645ff + farwritetext IrwinMtSilverGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .FogBadge: - farwritetext UnknownText_0x646df + farwritetext IrwinFogBadgeGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .MarshBadge: - farwritetext UnknownText_0x647d8 + farwritetext IrwinMarshBadgeGossipText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/jack.asm b/engine/phone/scripts/jack.asm index 27287f310..f2de3689c 100644 --- a/engine/phone/scripts/jack.asm +++ b/engine/phone/scripts/jack.asm @@ -11,7 +11,7 @@ JackPhoneCalleeScript: iftrue JackMondayMorning .NotMonday: - farsjump JackPhoneTips + farsjump JackPhoneTipsScript .WantsBattle: getlandmarkname STRING_BUFFER_5, NATIONAL_PARK diff --git a/engine/phone/scripts/jack_gossip.asm b/engine/phone/scripts/jack_gossip.asm index 72c0d71e1..ffb8cb59f 100644 --- a/engine/phone/scripts/jack_gossip.asm +++ b/engine/phone/scripts/jack_gossip.asm @@ -15,54 +15,54 @@ JackTriviaScript: .Thunder: farwritetext JackThunderTriviaText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Rollout: farwritetext JackRolloutTriviaText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Solarbeam: farwritetext JackSolarbeamTriviaText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Stomp: farwritetext JackStompTriviaText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Gust: farwritetext JackGustTriviaText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Twister: farwritetext JackTwisterTriviaText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Earthquake: farwritetext JackEarthquakeTriviaText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Magnitude: farwritetext JackMagnitudeTriviaText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .Sandstorm: farwritetext JackSandstormTriviaText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .SunnyDay: farwritetext JackSunnyDayTriviaText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male .RainDance: farwritetext JackRainDanceTriviaText buttonsound - sjump PhoneScript_HangupText_Male + sjump PhoneScript_HangUpText_Male diff --git a/engine/phone/scripts/joey.asm b/engine/phone/scripts/joey.asm index 7a7fae956..8b15b55cb 100644 --- a/engine/phone/scripts/joey.asm +++ b/engine/phone/scripts/joey.asm @@ -12,11 +12,11 @@ JoeyPhoneCalleeScript: .NotMonday: special RandomPhoneMon - farsjump UnknownScript_0xa0930 + farsjump JoeyHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_30 - farsjump UnknownScript_0xa0a4b + farsjump JoeyReminderScript JoeyPhoneCallerScript: gettrainername STRING_BUFFER_3, YOUNGSTER, JOEY1 diff --git a/engine/phone/scripts/jose.asm b/engine/phone/scripts/jose.asm index 4dcf0f4de..acf2e3bbc 100644 --- a/engine/phone/scripts/jose.asm +++ b/engine/phone/scripts/jose.asm @@ -13,15 +13,15 @@ JosePhoneCalleeScript: iftrue JoseSaturdayNight .NotSaturday: - farsjump UnknownScript_0xa0920 + farsjump JoseHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_27 - farsjump UnknownScript_0xa0a41 + farsjump JoseReminderScript .HasItem: getlandmarkname STRING_BUFFER_5, ROUTE_27 - farsjump UnknownScript_0xa0a41 + farsjump JoseReminderScript JosePhoneCallerScript: gettrainername STRING_BUFFER_3, BIRD_KEEPER, JOSE2 diff --git a/engine/phone/scripts/liz.asm b/engine/phone/scripts/liz.asm index 64719bb16..a2e5320cb 100644 --- a/engine/phone/scripts/liz.asm +++ b/engine/phone/scripts/liz.asm @@ -12,11 +12,11 @@ LizPhoneCalleeScript: .NotThursday: special RandomPhoneMon - farsjump UnknownScript_0xa0948 + farsjump LizHangUpScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_32 - farsjump UnknownScript_0xa0a5a + farsjump LizReminderScript LizPhoneCallerScript: gettrainername STRING_BUFFER_3, PICNICKER, LIZ1 @@ -99,4 +99,4 @@ LizGossip: sjump LizGossipScript LizGossipScript: - farsjump UnknownScript_0xa06da + farsjump LizGossipRandomScript diff --git a/engine/phone/scripts/liz_gossip.asm b/engine/phone/scripts/liz_gossip.asm index 738b61235..e57ea1162 100644 --- a/engine/phone/scripts/liz_gossip.asm +++ b/engine/phone/scripts/liz_gossip.asm @@ -1,4 +1,4 @@ -UnknownScript_0xa06da: +LizGossipRandomScript: random 10 ifequal 0, .RuinsOfAlph ifequal 1, .Falkner @@ -12,51 +12,51 @@ UnknownScript_0xa06da: ifequal 9, .Forgot .RuinsOfAlph: - farwritetext UnknownText_0x176223 + farwritetext LizRuinsOfAlphGossipText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female .Falkner: - farwritetext UnknownText_0x1762c3 + farwritetext LizFalknerGossipText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female .Earl: - farwritetext UnknownText_0x17638a + farwritetext LizEarlGossipText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female .SurfPikachu: - farwritetext UnknownText_0x176424 + farwritetext LizSurfPikachuGossipText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female .MooMooMilk: - farwritetext UnknownText_0x1764eb + farwritetext LizMooMooMilkGossipText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female .Salon: - farwritetext UnknownText_0x176599 + farwritetext LizSalonGossipText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female .Whitney: - farwritetext UnknownText_0x1766ac + farwritetext LizWhitneyGossipText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female .BugCatchingContest: - farwritetext UnknownText_0x17674f + farwritetext LizBugCatchingContestGossipText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female .BeautifulMon: - farwritetext UnknownText_0x176816 + farwritetext LizBeautifulMonGossipText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female .Forgot: - farwritetext UnknownText_0x17686d + farwritetext LizForgotGossipText buttonsound - sjump PhoneScript_HangupText_Female + sjump PhoneScript_HangUpText_Female diff --git a/engine/phone/scripts/parry.asm b/engine/phone/scripts/parry.asm index 48a1aa1af..e8628bcfd 100644 --- a/engine/phone/scripts/parry.asm +++ b/engine/phone/scripts/parry.asm @@ -11,11 +11,11 @@ ParryPhoneCalleeScript: iftrue ParryFridayDay .WantsRematch: - farsjump ParryBattleWithMe + farsjump ParryBattleWithMeScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_45 - farsjump ParryHaventYouGottenTo + farsjump ParryHaventYouGottenToScript ParryPhoneCallerScript: gettrainername STRING_BUFFER_3, HIKER, PARRY1 diff --git a/engine/phone/scripts/ralph.asm b/engine/phone/scripts/ralph.asm index c85e988db..245cce175 100644 --- a/engine/phone/scripts/ralph.asm +++ b/engine/phone/scripts/ralph.asm @@ -12,15 +12,15 @@ RalphPhoneCalleeScript: .CheckSwarm: checkflag ENGINE_FISH_SWARM iftrue .ReportSwarm - farsjump UnknownScript_0xa0940 + farsjump RalphNoItemScript .Rematch: getlandmarkname STRING_BUFFER_5, ROUTE_32 - farsjump UnknownScript_0xa0a55 + farsjump RalphReminderScript .ReportSwarm: getlandmarkname STRING_BUFFER_5, ROUTE_32 - farsjump UnknownScript_0xa0af5 + farsjump RalphHurryScript RalphPhoneCallerScript: gettrainername STRING_BUFFER_3, FISHER, RALPH1 @@ -53,7 +53,7 @@ Ralph_SetUpSwarm: getlandmarkname STRING_BUFFER_5, ROUTE_32 setval FISHSWARM_QWILFISH special ActivateFishingSwarm - farsjump UnknownScript_0xa05d6 + farsjump RalphItemScript .Generic: farsjump Phone_GenericCall_Male diff --git a/engine/phone/scripts/reena.asm b/engine/phone/scripts/reena.asm index 5b2a06afe..4800eb441 100644 --- a/engine/phone/scripts/reena.asm +++ b/engine/phone/scripts/reena.asm @@ -11,11 +11,11 @@ ReenaPhoneCalleeScript: iftrue ReenaSundayMorning .NotSunday: - farsjump UnknownScript_0xa0928 + farsjump ReenaForwardScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_27 - farsjump UnknownScript_0xa0a46 + farsjump ReenaHurryScript ReenaPhoneCallerScript: gettrainername STRING_BUFFER_3, COOLTRAINERF, REENA1 diff --git a/engine/phone/scripts/reminders.asm b/engine/phone/scripts/reminders.asm index d93418d36..b2676d3d4 100644 --- a/engine/phone/scripts/reminders.asm +++ b/engine/phone/scripts/reminders.asm @@ -1,92 +1,92 @@ JackWantsBattleScript: - farwritetext UnknownText_0x174638 + farwritetext JackReminderText end HueyWantsBattleScript: - farwritetext UnknownText_0x1749c7 + farwritetext HueyReminderText end -UnknownScript_0xa0a37: - farwritetext UnknownText_0x174c49 +GavenReminderScript: + farwritetext GavenReminderText end BethBattleReminderScript: - farwritetext BethForgetDealText + farwritetext BethReminderText end -UnknownScript_0xa0a41: - farwritetext UnknownText_0x17520a +JoseReminderScript: + farwritetext JoseReminderText end -UnknownScript_0xa0a46: - farwritetext UnknownText_0x1754e5 +ReenaHurryScript: + farwritetext ReenaHurryText end -UnknownScript_0xa0a4b: - farwritetext UnknownText_0x175786 +JoeyReminderScript: + farwritetext JoeyReminderText end -UnknownScript_0xa0a50: - farwritetext UnknownText_0x175b1e +WadeQuickBattleScript: + farwritetext WadeQuickBattleText end -UnknownScript_0xa0a55: - farwritetext UnknownText_0x175f11 +RalphReminderScript: + farwritetext RalphReminderText end -UnknownScript_0xa0a5a: - farwritetext UnknownText_0x1769da +LizReminderScript: + farwritetext LizReminderText end -UnknownScript_0xa0a5f: - farwritetext UnknownText_0x176d85 +AnthonyReminderScript: + farwritetext AnthonyReminderText end -UnknownScript_0xa0a64: - farwritetext UnknownText_0x177138 +ToddForwardScript: + farwritetext ToddLookingForwardToBattleText end -UnknownScript_0xa0a69: - farwritetext UnknownText_0x1774c1 +GinaReminderScript: + farwritetext GinaReminderText end -UnknownScript_0xa0a6e: - farwritetext UnknownText_0x64c13 +ArnieReminderScript: + farwritetext ArnieReminderText end -UnknownScript_0xa0a73: - farwritetext UnknownText_0x64ed4 +AlanReminderScript: + farwritetext AlanReminderText end -UnknownScript_0xa0a78: - farwritetext UnknownText_0x651bf +DanaReminderScript: + farwritetext DanaReminderText end -UnknownScript_0xa0a7d: - farwritetext UnknownText_0x65a63 +ChadReminderScript: + farwritetext ChadReminderText end -UnknownScript_0xa0a82: - farwritetext UnknownText_0x66043 +TullyForwardScript: + farwritetext TullyForwardText end -UnknownScript_0xa0a87: - farwritetext UnknownText_0x66579 +BrentReminderScript: + farwritetext BrentReminderText end -UnknownScript_0xa0a8c: - farwritetext UnknownText_0x668a3 +TiffanyAsleepScript: + farwritetext TiffanyAsleepText end -VanceHurryHurry: +VanceHurryHurryScript: farwritetext VanceHurryHurryText end -WiltonNotBiting: +WiltonNotBitingScript: farwritetext WiltonNotBitingText end -ParryHaventYouGottenTo: +ParryHaventYouGottenToScript: farwritetext ParryHaventYouGottenToText end diff --git a/engine/phone/scripts/reminders_2.asm b/engine/phone/scripts/reminders_2.asm index 9cbc5cfd7..54f54494c 100644 --- a/engine/phone/scripts/reminders_2.asm +++ b/engine/phone/scripts/reminders_2.asm @@ -1,15 +1,15 @@ -UnknownScript_0xa0af5: - farwritetext UnknownText_0x175f70 +RalphHurryScript: + farwritetext RalphHurryText end -UnknownScript_0xa0afa: - farwritetext UnknownText_0x176dd1 +AnthonyHurryScript: + farwritetext AnthonyHurryText end -UnknownScript_0xa0aff: - farwritetext UnknownText_0x64c5a +ArnieHurryScript: + farwritetext ArnieHurryText end -UnknownScript_0xa0b04: - farwritetext UnknownText_0x17717c +ToddHurryScript: + farwritetext ToddHaveYouGoneToDepartmentStoreText end diff --git a/engine/phone/scripts/tiffany.asm b/engine/phone/scripts/tiffany.asm index 6225f98c9..394361999 100644 --- a/engine/phone/scripts/tiffany.asm +++ b/engine/phone/scripts/tiffany.asm @@ -13,15 +13,15 @@ TiffanyPhoneCalleeScript: iftrue TiffanyTuesdayAfternoon .NotTuesday: - farsjump UnknownScript_0xa09a0 + farsjump TiffanyNoItemScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_43 - farsjump UnknownScript_0xa0a8c + farsjump TiffanyAsleepScript .HasItem: getlandmarkname STRING_BUFFER_5, ROUTE_43 - farsjump UnknownScript_0xa0ae5 + farsjump TiffanyHurryScript TiffanyPhoneCallerScript: gettrainername STRING_BUFFER_3, PICNICKER, TIFFANY3 diff --git a/engine/phone/scripts/todd.asm b/engine/phone/scripts/todd.asm index 1493aca34..5f73c97d6 100644 --- a/engine/phone/scripts/todd.asm +++ b/engine/phone/scripts/todd.asm @@ -13,14 +13,14 @@ ToddPhoneCalleeScript: .NotSaturday: checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON iftrue .SaleOn - farsjump UnknownScript_0xa0958 + farsjump ToddNoItemScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_34 - farsjump UnknownScript_0xa0a64 + farsjump ToddForwardScript .SaleOn: - farsjump UnknownScript_0xa0b04 + farsjump ToddHurryScript ToddPhoneCallerScript: gettrainername STRING_BUFFER_3, CAMPER, TODD1 @@ -56,4 +56,4 @@ ToddFoundRare: ToddDeptStoreSale: setflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON - farsjump UnknownScript_0xa0644 + farsjump ToddItemScript diff --git a/engine/phone/scripts/tully.asm b/engine/phone/scripts/tully.asm index 4b5f138ee..c02931831 100644 --- a/engine/phone/scripts/tully.asm +++ b/engine/phone/scripts/tully.asm @@ -13,15 +13,15 @@ TullyPhoneCalleeScript: iftrue TullySundayNight .NotSunday: - farsjump UnknownScript_0xa0990 + farsjump TullyNoItemScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_42 - farsjump UnknownScript_0xa0a82 + farsjump TullyForwardScript .WaterStone: getlandmarkname STRING_BUFFER_5, ROUTE_42 - farsjump UnknownScript_0xa0add + farsjump TullyHurryScript TullyPhoneCallerScript: gettrainername STRING_BUFFER_3, FISHER, TULLY1 diff --git a/engine/phone/scripts/vance.asm b/engine/phone/scripts/vance.asm index 0de527673..7f01f27d6 100644 --- a/engine/phone/scripts/vance.asm +++ b/engine/phone/scripts/vance.asm @@ -11,11 +11,11 @@ VancePhoneCalleeScript: iftrue VanceWednesdayNight .NotWednesday: - farsjump VanceLookingForward + farsjump VanceLookingForwardScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_44 - farsjump VanceHurryHurry + farsjump VanceHurryHurryScript VancePhoneCallerScript: gettrainername STRING_BUFFER_3, BIRD_KEEPER, VANCE1 diff --git a/engine/phone/scripts/wade.asm b/engine/phone/scripts/wade.asm index 44d82ec01..298468de1 100644 --- a/engine/phone/scripts/wade.asm +++ b/engine/phone/scripts/wade.asm @@ -23,18 +23,18 @@ WadePhoneCalleeScript: ifequal SATURDAY, .ContestToday .NoContest: - farsjump UnknownScript_0xa0938 + farsjump WadeNoBerriesScript .ContestToday: farsjump PhoneScript_BugCatchingContest .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_31 - farsjump UnknownScript_0xa0a50 + farsjump WadeQuickBattleScript .HasItem: getlandmarkname STRING_BUFFER_5, ROUTE_31 - farsjump UnknownScript_0xa0ab5 + farsjump WadeComeQuickScript WadePhoneCallerScript: gettrainername STRING_BUFFER_3, BUG_CATCHER, WADE1 diff --git a/engine/phone/scripts/wilton.asm b/engine/phone/scripts/wilton.asm index 4605589f5..b9e014ecb 100644 --- a/engine/phone/scripts/wilton.asm +++ b/engine/phone/scripts/wilton.asm @@ -13,15 +13,15 @@ WiltonPhoneCalleeScript: iftrue WiltonThursdayMorning .NotThursday: - farsjump WiltonHaventFoundAnything + farsjump WiltonHaventFoundAnythingScript .WantsBattle: getlandmarkname STRING_BUFFER_5, ROUTE_44 - farsjump WiltonNotBiting + farsjump WiltonNotBitingScript .HasItem: getlandmarkname STRING_BUFFER_5, ROUTE_44 - farsjump WiltonWantThis + farsjump WiltonWantThisScript WiltonPhoneCallerScript: gettrainername STRING_BUFFER_3, FISHER, WILTON1 |