From e3ee39f3344107f666099448401d28b04c983cd6 Mon Sep 17 00:00:00 2001 From: surskitty Date: Wed, 13 Dec 2017 19:54:28 -0500 Subject: [PATCH 01/17] Labelling the bragging phone calls. --- engine/more_phone_scripts.asm | 46 +++++++++++++++++------------------ text/phone/extra.asm | 18 +++++++------- text/phone/extra2.asm | 16 ++++++------ 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/engine/more_phone_scripts.asm b/engine/more_phone_scripts.asm index d44f5b475..78ef910f9 100644 --- a/engine/more_phone_scripts.asm +++ b/engine/more_phone_scripts.asm @@ -1,12 +1,12 @@ UnknownScript_0xa0000: special RandomPhoneMon farscall PhoneScript_Random2 - if_equal 0, UnknownScript_0xa0013 + if_equal 0, .Bragging farscall PhoneScript_Generic_Male farjump UnknownScript_0xa003e -UnknownScript_0xa0013: - farjump UnknownScript_0xa002e +.Bragging: + farjump PhoneScript_BraggingCall UnknownScript_0xa0017: special RandomPhoneMon @@ -18,8 +18,8 @@ UnknownScript_0xa0017: UnknownScript_0xa002a: farjump UnknownScript_0xa0036 -UnknownScript_0xa002e: - farscall UnknownScript_0xa007c +PhoneScript_BraggingCall: + farscall Phone_WhosBragging farjump UnknownScript_0xa003e UnknownScript_0xa0036: @@ -54,7 +54,7 @@ UnknownScript_0xa0074: farscall UnknownScript_0xa0324 farjump PhoneScript_HangupText_Female -UnknownScript_0xa007c: +Phone_WhosBragging: checkcode VAR_CALLERID if_equal PHONE_SCHOOLBOY_JACK, .Jack if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven @@ -75,87 +75,87 @@ UnknownScript_0xa007c: if_equal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x1740c0 + farwritetext JackIntelligenceText buttonsound end .Gaven: - farwritetext UnknownText_0x174a24 + farwritetext GavenGreaterText buttonsound end .Jose: - farwritetext UnknownText_0x174f2f + farwritetext JoseAromaText buttonsound end .Joey: - farwritetext UnknownText_0x175530 + farwritetext JoeySharperText buttonsound end .Wade: - farwritetext UnknownText_0x1757d4 + farwritetext WadeAreYouGrowingText buttonsound end .Ralph: - farwritetext UnknownText_0x175bc4 + farwritetext RalphNeglectingKidsText buttonsound end .Anthony: - farwritetext UnknownText_0x176a2f + farwritetext AnthonyAteBerriesText buttonsound end .Todd: - farwritetext UnknownText_0x176e5d + farwritetext ToddLooksCuteLikeMeText buttonsound end .Arnie: - farwritetext UnknownText_0x649dc + farwritetext ArnieLovesTheCuteText buttonsound end .Alan: - farwritetext UnknownText_0x64cbd + farwritetext AlanGettingStrongerText buttonsound end .Chad: - farwritetext UnknownText_0x65271 + farwritetext ChadObservingWildText buttonsound end .Derek: - farwritetext UnknownText_0x65ab2 + farwritetext DerekCheekPincherText buttonsound end .Tully: - farwritetext UnknownText_0x65de4 + farwritetext TullyGrownText buttonsound end .Brent: - farwritetext UnknownText_0x660be + farwritetext BrentRareTradeText buttonsound end .Vance: - farwritetext UnknownText_0x66980 + farwritetext VanceLiftoffText buttonsound end .Wilton: - farwritetext UnknownText_0x66afc + farwritetext WiltonGrownText buttonsound end .Parry: - farwritetext UnknownText_0x66f9f + farwritetext ParryNoMatchText buttonsound end diff --git a/text/phone/extra.asm b/text/phone/extra.asm index 7953bee78..f42272eec 100644 --- a/text/phone/extra.asm +++ b/text/phone/extra.asm @@ -307,7 +307,7 @@ UnknownText_0x648dc: ; 0x648dc done ; 0x649dc -UnknownText_0x649dc: ; 0x649dc +ArnieLovesTheCuteText: ; 0x649dc text "I'm always with my" line "@" text_from_ram StringBuffer4 @@ -423,7 +423,7 @@ UnknownText_0x64c5a: ; 0x64c5a done ; 0x64cbd -UnknownText_0x64cbd: ; 0x64cbd +AlanGettingStrongerText: ; 0x64cbd text "My @" text_from_ram StringBuffer4 text "'s" @@ -651,7 +651,7 @@ UnknownText_0x6520f: ; 0x6520f done ; 0x65271 -UnknownText_0x65271: ; 0x65271 +ChadObservingWildText: ; 0x65271 text "I recently began" line "observing wild" cont "@" @@ -914,7 +914,7 @@ UnknownText_0x65a63: ; 0x65a63 done ; 0x65ab2 -UnknownText_0x65ab2: ; 0x65ab2 +DerekCheekPincherText: ; 0x65ab2 text "Listen to this." line "My @" text_from_ram StringBuffer4 @@ -1028,7 +1028,7 @@ UnknownText_0x65da6: ; 0x65da6 done ; 0x65de4 -UnknownText_0x65de4: ; 0x65de4 +TullyGrownText: ; 0x65de4 text "My @" text_from_ram StringBuffer4 text " has" @@ -1142,7 +1142,7 @@ UnknownText_0x66087: ; 0x66087 done ; 0x660be -UnknownText_0x660be: ; 0x660be +BrentRareTradeText: ; 0x660be text "Oh yeah, I got an" line "extremely rare" @@ -1471,7 +1471,7 @@ UnknownText_0x6691d: ; 0x6691d done ; 0x66980 -UnknownText_0x66980: ; 0x66980 +VanceLiftoffText: ; 0x66980 text "My @" text_from_ram StringBuffer4 text "'s" @@ -1543,7 +1543,7 @@ UnknownText_0x66ad1: ; 0x66ad1 done ; 0x66afc -UnknownText_0x66afc: ; 0x66afc +WiltonGrownText: ; 0x66afc text "My @" text_from_ram StringBuffer4 text "'s" @@ -1727,7 +1727,7 @@ UnknownText_0x66f52: ; 0x66f52 done ; 0x66f9f -UnknownText_0x66f9f: ; 0x66f9f +ParryNoMatchText: ; 0x66f9f text "Nothing can match" line "my @" text_from_ram StringBuffer4 diff --git a/text/phone/extra2.asm b/text/phone/extra2.asm index 443338465..69fd554ae 100644 --- a/text/phone/extra2.asm +++ b/text/phone/extra2.asm @@ -19,7 +19,7 @@ UnknownText_0x174000: ; 0x174000 done ; 0x1740c0 -UnknownText_0x1740c0: ; 0x1740c0 +JackIntelligenceText: ; 0x1740c0 text "My @" text_from_ram StringBuffer4 text "'s" @@ -369,7 +369,7 @@ UnknownText_0x1749c7: ; 0x1749c7 done ; 0x174a24 -UnknownText_0x174a24: ; 0x174a24 +GavenGreaterText: ; 0x174a24 text "My @" text_from_ram StringBuffer4 text "" @@ -568,7 +568,7 @@ UnknownText_0x174ee2: ; 0x174ee2 done ; 0x174f2f -UnknownText_0x174f2f: ; 0x174f2f +JoseAromaText: ; 0x174f2f text "Hey listen, my" line "@" text_from_ram StringBuffer4 @@ -804,7 +804,7 @@ UnknownText_0x1754e5: ; 0x1754e5 done ; 0x175530 -UnknownText_0x175530: ; 0x175530 +JoeySharperText: ; 0x175530 text "My @" text_from_ram StringBuffer4 text "'s" @@ -903,7 +903,7 @@ UnknownText_0x175786: ; 0x175786 done ; 0x1757d4 -UnknownText_0x1757d4: ; 0x1757d4 +WadeAreYouGrowingText: ; 0x1757d4 text "Are your #MON" line "growing?" @@ -1050,7 +1050,7 @@ UnknownText_0x175b6d: ; 0x175b6d done ; 0x175bc4 -UnknownText_0x175bc4: ; 0x175bc4 +RalphNeglectingKidsText: ; 0x175bc4 text "I've been spending" line "more time with my" @@ -1520,7 +1520,7 @@ UnknownText_0x1769da: ; 0x1769da done ; 0x176a2f -UnknownText_0x176a2f: ; 0x176a2f +AnthonyAteBerriesText: ; 0x176a2f text "The other day, I" line "was watching my" @@ -1669,7 +1669,7 @@ UnknownText_0x176dd1: ; 0x176dd1 done ; 0x176e5d -UnknownText_0x176e5d: ; 0x176e5d +ToddLooksCuteLikeMeText: ; 0x176e5d text "My @" text_from_ram StringBuffer4 text " is" From cb1c6967ed57b38d4cf85fb7fa8bb08ce00cde75 Mon Sep 17 00:00:00 2001 From: surskitty Date: Wed, 13 Dec 2017 20:49:10 -0500 Subject: [PATCH 02/17] Some more phone labels. --- engine/more_phone_scripts.asm | 20 ++-- engine/phone_scripts.asm | 180 +++++++++++++++++----------------- text/phone/extra.asm | 2 +- text/phone/extra2.asm | 4 +- 4 files changed, 103 insertions(+), 103 deletions(-) diff --git a/engine/more_phone_scripts.asm b/engine/more_phone_scripts.asm index 78ef910f9..1e79feec7 100644 --- a/engine/more_phone_scripts.asm +++ b/engine/more_phone_scripts.asm @@ -680,8 +680,8 @@ PhoneScript_RematchText_Female: buttonsound end -UnknownScript_0xa047a: - farwritetext UnknownText_0x1761a7 +LizWrongNumber: + farwritetext LizHiTaniaText end UnknownScript_0xa047f: @@ -835,7 +835,7 @@ PhoneScript_HangupText_Female: end UnknownScript_0xa0584: - scall UnknownScript_0xa05a0 + scall PhoneScriptRareWildMon iffalse UnknownScript_0xa058e farjump UnknownScript_0xa0000 @@ -843,29 +843,29 @@ UnknownScript_0xa058e: farjump PhoneScript_HangupText_Male UnknownScript_0xa0592: - scall UnknownScript_0xa05a0 - iffalse UnknownScript_0xa059c + scall PhoneScriptRareWildMon + iffalse .HangUp farjump UnknownScript_0xa0017 -UnknownScript_0xa059c: +.HangUp: farjump PhoneScript_HangupText_Female -UnknownScript_0xa05a0: +PhoneScriptRareWildMon: special RandomPhoneRareWildMon end -UnknownScript_0xa05a4: +PhoneScript_BugCatchingContest: checkcode VAR_CALLERID if_equal PHONE_BUG_CATCHER_WADE, .Wade if_equal PHONE_POKEFANM_DEREK, .Derek .Wade: - farwritetext UnknownText_0x1759f7 + farwritetext WadeBugCatchingContestText buttonsound jump PhoneScript_HangupText_Male .Derek: - farwritetext UnknownText_0x65c66 + farwritetext DerekBugCatchingContestText buttonsound jump PhoneScript_HangupText_Male diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index 8beee58c6..3d3bc942c 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -688,7 +688,7 @@ UnknownScript_0xbd412: farjump UnknownScript_0xa0938 UnknownScript_0xbd416: - farjump UnknownScript_0xa05a4 + farjump PhoneScript_BugCatchingContest UnknownScript_0xbd41a: landmarktotext ROUTE_31, $2 @@ -702,15 +702,15 @@ WadePhoneScript2: trainertotext BUG_CATCHER, WADE1, $0 farscall PhoneScript_GreetPhone_Male farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbd44c + if_equal $0, .NoContest checkflag ENGINE_DAILY_BUG_CONTEST - iftrue UnknownScript_0xbd44c + iftrue .NoContest checkcode VAR_WEEKDAY - if_equal TUESDAY, UnknownScript_0xbd480 - if_equal THURSDAY, UnknownScript_0xbd480 - if_equal SATURDAY, UnknownScript_0xbd480 + if_equal TUESDAY, Wade_ContestToday + if_equal THURSDAY, Wade_ContestToday + if_equal SATURDAY, Wade_ContestToday -UnknownScript_0xbd44c: +.NoContest: checkflag ENGINE_WADE iftrue UnknownScript_0xbd474 checkflag ENGINE_WADE_TUESDAY_NIGHT @@ -729,8 +729,8 @@ UnknownScript_0xbd474: if_equal $0, UnknownScript_0xbd491 farjump UnknownScript_0xa0000 -UnknownScript_0xbd480: - farjump UnknownScript_0xa05a4 +Wade_ContestToday: + farjump PhoneScript_BugCatchingContest UnknownScript_0xbd484: setflag ENGINE_WADE_TUESDAY_NIGHT @@ -844,13 +844,13 @@ LizPhoneScript1: iftrue UnknownScript_0xbd586 farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_LIZ_THURSDAY_AFTERNOON - iftrue UnknownScript_0xbd57f + iftrue .NotThursday checkcode VAR_WEEKDAY - if_not_equal THURSDAY, UnknownScript_0xbd57f + if_not_equal THURSDAY, .NotThursday checkday - iftrue UnknownScript_0xbd5c3 + iftrue LizThursdayAfternoon -UnknownScript_0xbd57f: +.NotThursday: special RandomPhoneMon farjump UnknownScript_0xa0948 @@ -879,7 +879,7 @@ UnknownScript_0xbd5a9: UnknownScript_0xbd5bf: farjump UnknownScript_0xa0017 -UnknownScript_0xbd5c3: +LizThursdayAfternoon: setflag ENGINE_LIZ_THURSDAY_AFTERNOON UnknownScript_0xbd5c6: @@ -888,7 +888,7 @@ UnknownScript_0xbd5c6: farjump UnknownScript_0xa037e UnknownScript_0xbd5d0: - farjump UnknownScript_0xa047a + farjump LizWrongNumber UnknownScript_0xbd5d4: random $9 @@ -949,13 +949,13 @@ AnthonyPhoneScript1: iftrue UnknownScript_0xbd65d farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_ANTHONY_FRIDAY_NIGHT - iftrue UnknownScript_0xbd653 + iftrue .NotFriday checkcode VAR_WEEKDAY - if_not_equal FRIDAY, UnknownScript_0xbd653 + if_not_equal FRIDAY, .NotFriday checknite iftrue UnknownScript_0xbd699 -UnknownScript_0xbd653: +.NotFriday: checkflag ENGINE_DUNSPARCE_SWARM iftrue UnknownScript_0xbd664 farjump UnknownScript_0xa0950 @@ -1013,13 +1013,13 @@ ToddPhoneScript1: iftrue UnknownScript_0xbd6ea farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_TODD_SATURDAY_MORNING - iftrue UnknownScript_0xbd6e0 + iftrue .NotSaturday checkcode VAR_WEEKDAY - if_not_equal SATURDAY, UnknownScript_0xbd6e0 + if_not_equal SATURDAY, .NotSaturday checkmorn - iftrue UnknownScript_0xbd72b + iftrue ToddSaturdayMorning -UnknownScript_0xbd6e0: +.NotSaturday: checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON iftrue UnknownScript_0xbd6f1 farjump UnknownScript_0xa0958 @@ -1039,7 +1039,7 @@ ToddPhoneScript2: checkflag ENGINE_TODD_SATURDAY_MORNING iftrue UnknownScript_0xbd717 checkflag ENGINE_FLYPOINT_GOLDENROD - iffalse UnknownScript_0xbd71f + iffalse ToddNoGoldenrod farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbd72e @@ -1047,12 +1047,12 @@ UnknownScript_0xbd717: farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbd73c -UnknownScript_0xbd71f: +ToddNoGoldenrod: farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbd738 farjump UnknownScript_0xa0000 -UnknownScript_0xbd72b: +ToddSaturdayMorning: setflag ENGINE_TODD_SATURDAY_MORNING UnknownScript_0xbd72e: @@ -1075,20 +1075,20 @@ GinaPhoneScript1: iftrue UnknownScript_0xbd776 farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_GINA_SUNDAY_AFTERNOON - iftrue UnknownScript_0xbd768 + iftrue .NotSunday checkflag ENGINE_GINA_HAS_LEAF_STONE iftrue UnknownScript_0xbd77d checkcode VAR_WEEKDAY - if_not_equal SUNDAY, UnknownScript_0xbd768 + if_not_equal SUNDAY, .NotSunday checkday - iftrue UnknownScript_0xbd7cc + iftrue GinaSundayDay -UnknownScript_0xbd768: +.NotSunday: checkflag ENGINE_ROCKETS_IN_RADIO_TOWER - iftrue UnknownScript_0xbd772 + iftrue .Rockets farjump UnknownScript_0xa0960 -UnknownScript_0xbd772: +.Rockets: farjump UnknownScript_0xa05c6 UnknownScript_0xbd776: @@ -1126,7 +1126,7 @@ UnknownScript_0xbd7b2: UnknownScript_0xbd7c8: farjump UnknownScript_0xa0017 -UnknownScript_0xbd7cc: +GinaSundayDay: setflag ENGINE_GINA_SUNDAY_AFTERNOON UnknownScript_0xbd7cf: @@ -1148,20 +1148,20 @@ IrwinPhoneScript1: trainertotext JUGGLER, IRWIN1, $0 farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_ROCKETS_IN_RADIO_TOWER - iftrue UnknownScript_0xbd7f9 + iftrue .Rockets farjump UnknownScript_0xa09c8 -UnknownScript_0xbd7f9: +.Rockets: farjump UnknownScript_0xa05be IrwinPhoneScript2: trainertotext JUGGLER, IRWIN1, $0 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_ROCKETS_IN_RADIO_TOWER - iftrue UnknownScript_0xbd80f + iftrue .Rockets farjump UnknownScript_0xa0848 -UnknownScript_0xbd80f: +.Rockets: farjump UnknownScript_0xa05be ; Arnie @@ -1172,13 +1172,13 @@ ArniePhoneScript1: iftrue UnknownScript_0xbd83c farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_ARNIE_TUESDAY_MORNING - iftrue UnknownScript_0xbd832 + iftrue .NotTuesday checkcode VAR_WEEKDAY - if_not_equal TUESDAY, UnknownScript_0xbd832 + if_not_equal TUESDAY, .NotTuesday checkmorn - iftrue UnknownScript_0xbd87a + iftrue ArnieTuesdayMorning -UnknownScript_0xbd832: +.NotTuesday: checkflag ENGINE_YANMA_SWARM iftrue UnknownScript_0xbd843 farjump UnknownScript_0xa0968 @@ -1203,12 +1203,12 @@ ArniePhoneScript2: UnknownScript_0xbd866: farscall PhoneScript_Random5 - if_equal $0, UnknownScript_0xbd887 + if_equal $0, ArnieYanmaSwarm farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbd89e farjump UnknownScript_0xa0000 -UnknownScript_0xbd87a: +ArnieTuesdayMorning: setflag ENGINE_ARNIE_TUESDAY_MORNING UnknownScript_0xbd87d: @@ -1216,9 +1216,9 @@ UnknownScript_0xbd87d: setflag ENGINE_ARNIE farjump UnknownScript_0xa0376 -UnknownScript_0xbd887: ; start swarm +ArnieYanmaSwarm: ; start swarm checkflag ENGINE_YANMA_SWARM - iftrue UnknownScript_0xbd8a2 + iftrue ArnieYanmaAlreadySwarming setflag ENGINE_YANMA_SWARM pokenamemem YANMA, $1 swarm SWARM_YANMA, ROUTE_35 @@ -1228,7 +1228,7 @@ UnknownScript_0xbd887: ; start swarm UnknownScript_0xbd89e: farjump UnknownScript_0xa0584 -UnknownScript_0xbd8a2: +ArnieYanmaAlreadySwarming: farjump UnknownScript_0xa0000 ; Alan @@ -1239,22 +1239,22 @@ AlanPhoneScript1: iftrue UnknownScript_0xbd8cf farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_ALAN_WEDNESDAY_AFTERNOON - iftrue UnknownScript_0xbd8cb + iftrue .NotWednesday checkflag ENGINE_ALAN_HAS_FIRE_STONE - iftrue UnknownScript_0xbd8d6 + iftrue AlanHasFireStone checkcode VAR_WEEKDAY - if_not_equal WEDNESDAY, UnknownScript_0xbd8cb + if_not_equal WEDNESDAY, .NotWednesday checkday - iftrue UnknownScript_0xbd919 + iftrue AlanWednesdayDay -UnknownScript_0xbd8cb: +.NotWednesday: farjump UnknownScript_0xa0970 UnknownScript_0xbd8cf: landmarktotext ROUTE_36, $2 farjump UnknownScript_0xa0a73 -UnknownScript_0xbd8d6: +AlanHasFireStone: landmarktotext ROUTE_36, $2 farjump UnknownScript_0xa0ac5 @@ -1281,7 +1281,7 @@ UnknownScript_0xbd90d: UnknownScript_0xbd915: farjump UnknownScript_0xa0000 -UnknownScript_0xbd919: +AlanWednesdayDay: setflag ENGINE_ALAN_WEDNESDAY_AFTERNOON UnknownScript_0xbd91c: @@ -1302,15 +1302,15 @@ DanaPhoneScript1: iftrue UnknownScript_0xbd959 farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_DANA_THURSDAY_NIGHT - iftrue UnknownScript_0xbd955 + iftrue .NotThursday checkflag ENGINE_DANA_HAS_THUNDERSTONE iftrue UnknownScript_0xbd960 checkcode VAR_WEEKDAY - if_not_equal THURSDAY, UnknownScript_0xbd955 + if_not_equal THURSDAY, .NotThursday checknite iftrue UnknownScript_0xbd9ab -UnknownScript_0xbd955: +.NotThursday: farjump UnknownScript_0xa0978 UnknownScript_0xbd959: @@ -1370,13 +1370,13 @@ ChadPhoneScript1: iftrue UnknownScript_0xbd9e9 farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_CHAD_FRIDAY_MORNING - iftrue UnknownScript_0xbd9e5 + iftrue .NotFriday checkcode VAR_WEEKDAY - if_not_equal FRIDAY, UnknownScript_0xbd9e5 + if_not_equal FRIDAY, .NotFriday checkmorn iftrue UnknownScript_0xbda20 -UnknownScript_0xbd9e5: +.NotFriday: farjump UnknownScript_0xa0980 UnknownScript_0xbd9e9: @@ -1418,23 +1418,23 @@ DerekPhoneScript1: trainertotext POKEFANM, DEREK1, $0 farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_DEREK_HAS_NUGGET - iftrue UnknownScript_0xbda67 + iftrue .Nugget farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbda5f + if_equal $0, .NoContest checkflag ENGINE_DAILY_BUG_CONTEST - iftrue UnknownScript_0xbda5f + iftrue .NoContest checkcode VAR_WEEKDAY - if_equal TUESDAY, UnknownScript_0xbda63 - if_equal THURSDAY, UnknownScript_0xbda63 - if_equal SATURDAY, UnknownScript_0xbda63 + if_equal TUESDAY, .ContestToday + if_equal THURSDAY, .ContestToday + if_equal SATURDAY, .ContestToday -UnknownScript_0xbda5f: +.NoContest: farjump UnknownScript_0xa0988 -UnknownScript_0xbda63: - farjump UnknownScript_0xa05a4 +.ContestToday: + farjump PhoneScript_BugCatchingContest -UnknownScript_0xbda67: +.Nugget: landmarktotext ROUTE_39, $2 farjump UnknownScript_0xa0ad5 @@ -1442,23 +1442,23 @@ DerekPhoneScript2: trainertotext POKEFANM, DEREK1, $0 farscall PhoneScript_GreetPhone_Male farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbda92 + if_equal $0, .NoContest checkflag ENGINE_DAILY_BUG_CONTEST - iftrue UnknownScript_0xbda92 + iftrue .NoContest checkcode VAR_WEEKDAY - if_equal TUESDAY, UnknownScript_0xbda9e - if_equal THURSDAY, UnknownScript_0xbda9e - if_equal SATURDAY, UnknownScript_0xbda9e + if_equal TUESDAY, .BugCatchingContest + if_equal THURSDAY, .BugCatchingContest + if_equal SATURDAY, .BugCatchingContest -UnknownScript_0xbda92: +.NoContest: farscall PhoneScript_Random4 - if_equal $0, UnknownScript_0xbdaa2 + if_equal $0, .Nugget farjump UnknownScript_0xa0000 -UnknownScript_0xbda9e: - farjump UnknownScript_0xa05a4 +.BugCatchingContest: + farjump PhoneScript_BugCatchingContest -UnknownScript_0xbdaa2: +.Nugget: setflag ENGINE_DEREK_HAS_NUGGET landmarktotext ROUTE_39, $2 farjump UnknownScript_0xa05e6 @@ -1469,22 +1469,22 @@ TullyPhoneScript1: iftrue UnknownScript_0xbdad5 farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_TULLY_SUNDAY_NIGHT - iftrue UnknownScript_0xbdad1 + iftrue .NotSunday checkflag ENGINE_TULLY_HAS_WATER_STONE - iftrue UnknownScript_0xbdadc + iftrue TullyHasWaterStone checkcode VAR_WEEKDAY - if_not_equal SUNDAY, UnknownScript_0xbdad1 + if_not_equal SUNDAY, .NotSunday checknite - iftrue UnknownScript_0xbdb1f + iftrue TullySundayNight -UnknownScript_0xbdad1: +.NotSunday: farjump UnknownScript_0xa0990 UnknownScript_0xbdad5: landmarktotext ROUTE_42, $2 farjump UnknownScript_0xa0a82 -UnknownScript_0xbdadc: +TullyHasWaterStone: landmarktotext ROUTE_42, $2 farjump UnknownScript_0xa0add @@ -1500,18 +1500,18 @@ TullyPhoneScript2: farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbdb22 checkevent EVENT_TULLY_GAVE_WATER_STONE - iftrue UnknownScript_0xbdb13 + iftrue .WaterStone farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbdb2c + if_equal $0, TullyFoundWaterStone -UnknownScript_0xbdb13: +.WaterStone: farscall PhoneScript_Random11 - if_equal $0, UnknownScript_0xbdb2c + if_equal $0, TullyFoundWaterStone UnknownScript_0xbdb1b: farjump UnknownScript_0xa0000 -UnknownScript_0xbdb1f: +TullySundayNight: setflag ENGINE_TULLY_SUNDAY_NIGHT UnknownScript_0xbdb22: @@ -1519,7 +1519,7 @@ UnknownScript_0xbdb22: setflag ENGINE_TULLY farjump UnknownScript_0xa0376 -UnknownScript_0xbdb2c: +TullyFoundWaterStone: setflag ENGINE_TULLY_HAS_WATER_STONE landmarktotext ROUTE_42, $2 farjump UnknownScript_0xa05e6 diff --git a/text/phone/extra.asm b/text/phone/extra.asm index f42272eec..7b89b80aa 100644 --- a/text/phone/extra.asm +++ b/text/phone/extra.asm @@ -976,7 +976,7 @@ UnknownText_0x65c4e: ; 0x65c4e done ; 0x65c66 -UnknownText_0x65c66: ; 0x65c66 +DerekBugCatchingContestText: ; 0x65c66 text "Did you remember?" line "The Bug-Catching" cont "Contest is today." diff --git a/text/phone/extra2.asm b/text/phone/extra2.asm index 69fd554ae..1f2383c59 100644 --- a/text/phone/extra2.asm +++ b/text/phone/extra2.asm @@ -981,7 +981,7 @@ UnknownText_0x1759e7: ; 0x1759e7 done ; 0x1759f7 -UnknownText_0x1759f7: ; 0x1759f7 +WadeBugCatchingContestText: ; 0x1759f7 text "The Bug-Catching" line "Contest is at the" @@ -1260,7 +1260,7 @@ UnknownText_0x17610a: ; 0x17610a done ; 0x1761a7 -UnknownText_0x1761a7: ; 0x1761a7 +LizHiTaniaText: ; 0x1761a7 text "Hi, TANIA. How are" line "you? This is LIZ." From 2b72d949b2bd9e75e1f6d5f964a1521b608ab7da Mon Sep 17 00:00:00 2001 From: surskitty Date: Wed, 13 Dec 2017 21:12:42 -0500 Subject: [PATCH 03/17] Another batch of labels. Jack's move trivia, mostly. --- engine/more_phone_scripts.asm | 56 +++++++++++++++++------------------ engine/phone_scripts.asm | 22 +++++++------- text/phone/extra2.asm | 6 ++-- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/engine/more_phone_scripts.asm b/engine/more_phone_scripts.asm index 1e79feec7..9aa7d78e4 100644 --- a/engine/more_phone_scripts.asm +++ b/engine/more_phone_scripts.asm @@ -894,7 +894,7 @@ UnknownScript_0xa05de: buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa05e6: +PhoneScript_FoundItem_Male: checkcode VAR_CALLERID if_equal PHONE_BIRDKEEPER_JOSE, .Jose if_equal PHONE_BUG_CATCHER_WADE, .Wade @@ -904,11 +904,11 @@ UnknownScript_0xa05e6: if_equal PHONE_FISHER_WILTON, .Wilton .Jose: - farwritetext UnknownText_0x175116 + farwritetext JoseFoundSomethingText end .Wade: - farwritetext UnknownText_0x175a60 + farwritetext WadeFoundBerryText end .Alan: @@ -927,7 +927,7 @@ UnknownScript_0xa05e6: farwritetext UnknownText_0x66c6b end -UnknownScript_0xa061e: +PhoneScript_FoundItem_Female: checkcode VAR_CALLERID if_equal PHONE_POKEFAN_BEVERLY, .Beverly if_equal PHONE_PICNICKER_GINA, .Gina @@ -935,7 +935,7 @@ UnknownScript_0xa061e: if_equal PHONE_PICNICKER_TIFFANY, .Tiffany .Beverly: - farwritetext UnknownText_0x1747cc + farwritetext BeverlyFoundNuggetText end .Gina: @@ -960,71 +960,71 @@ UnknownScript_0xa064c: buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa0654: +JackTriviaScript: random 11 - if_equal 0, UnknownScript_0xa0682 - if_equal 1, UnknownScript_0xa068a - if_equal 2, UnknownScript_0xa0692 - if_equal 3, UnknownScript_0xa069a - if_equal 4, UnknownScript_0xa06a2 - if_equal 5, UnknownScript_0xa06aa - if_equal 6, UnknownScript_0xa06b2 - if_equal 7, UnknownScript_0xa06ba - if_equal 8, UnknownScript_0xa06c2 - if_equal 9, UnknownScript_0xa06ca - if_equal 10, UnknownScript_0xa06d2 + if_equal 0, .Thunder + if_equal 1, .Rollout + if_equal 2, .Solarbeam + if_equal 3, .Stomp + if_equal 4, .Gust + if_equal 5, .Twister + if_equal 6, .Earthquake + if_equal 7, .Magnitude + if_equal 8, .Sandstorm + if_equal 9, .SunnyDay + if_equal 10, .RainDance -UnknownScript_0xa0682: +.Thunder: farwritetext UnknownText_0x174261 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa068a: +.Rollout: farwritetext UnknownText_0x17429d buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa0692: +.Solarbeam: farwritetext UnknownText_0x1742ee buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa069a: +.Stomp: farwritetext UnknownText_0x174340 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa06a2: +.Gust: farwritetext UnknownText_0x174391 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa06aa: +.Twister: farwritetext UnknownText_0x1743e3 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa06b2: +.Earthquake: farwritetext UnknownText_0x174433 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa06ba: +.Magnitude: farwritetext UnknownText_0x174485 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa06c2: +.Sandstorm: farwritetext UnknownText_0x1744d6 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa06ca: +.SunnyDay: farwritetext UnknownText_0x174522 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa06d2: +.RainDance: farwritetext UnknownText_0x174571 buttonsound jump PhoneScript_HangupText_Male diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index 3d3bc942c..83ed27d41 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -346,7 +346,7 @@ UnknownScript_0xbd137: farjump UnknownScript_0xa0584 UnknownScript_0xbd13b: - farjump UnknownScript_0xa0654 + farjump JackTriviaScript ; Beverly @@ -375,7 +375,7 @@ UnknownScript_0xbd16e: UnknownScript_0xbd172: setflag ENGINE_BEVERLY_HAS_NUGGET landmarktotext NATIONAL_PARK, $2 - farjump UnknownScript_0xa061e + farjump PhoneScript_FoundItem_Female ; Huey @@ -570,7 +570,7 @@ UnknownScript_0xbd30e: UnknownScript_0xbd312: setflag ENGINE_JOSE_HAS_STAR_PIECE landmarktotext ROUTE_27, $2 - farjump UnknownScript_0xa05e6 + farjump PhoneScript_FoundItem_Male ; Reena @@ -772,7 +772,7 @@ UnknownScript_0xbd4cb: setevent EVENT_WADE_HAS_BITTER_BERRY UnknownScript_0xbd4ce: - farjump UnknownScript_0xa05e6 + farjump PhoneScript_FoundItem_Male ; Ralph @@ -1140,7 +1140,7 @@ UnknownScript_0xbd7d9: UnknownScript_0xbd7dd: setflag ENGINE_GINA_HAS_LEAF_STONE landmarktotext ROUTE_34, $2 - farjump UnknownScript_0xa061e + farjump PhoneScript_FoundItem_Female ; Irwin @@ -1292,7 +1292,7 @@ UnknownScript_0xbd91c: UnknownScript_0xbd926: setflag ENGINE_ALAN_HAS_FIRE_STONE landmarktotext ROUTE_36, $2 - farjump UnknownScript_0xa05e6 + farjump PhoneScript_FoundItem_Male ; Dana @@ -1360,7 +1360,7 @@ UnknownScript_0xbd9b8: UnknownScript_0xbd9bc: setflag ENGINE_DANA_HAS_THUNDERSTONE landmarktotext ROUTE_38, $2 - farjump UnknownScript_0xa061e + farjump PhoneScript_FoundItem_Female ; Chad @@ -1461,7 +1461,7 @@ DerekPhoneScript2: .Nugget: setflag ENGINE_DEREK_HAS_NUGGET landmarktotext ROUTE_39, $2 - farjump UnknownScript_0xa05e6 + farjump PhoneScript_FoundItem_Male TullyPhoneScript1: trainertotext FISHER, TULLY1, $0 @@ -1522,7 +1522,7 @@ UnknownScript_0xbdb22: TullyFoundWaterStone: setflag ENGINE_TULLY_HAS_WATER_STONE landmarktotext ROUTE_42, $2 - farjump UnknownScript_0xa05e6 + farjump PhoneScript_FoundItem_Male BrentPhoneScript1: trainertotext POKEMANIAC, BRENT1, $0 @@ -1666,7 +1666,7 @@ UnknownScript_0xbdc65: UnknownScript_0xbdc69: setflag ENGINE_TIFFANY_HAS_PINK_BOW landmarktotext ROUTE_43, $2 - farjump UnknownScript_0xa061e + farjump PhoneScript_FoundItem_Female ; Vance @@ -1785,7 +1785,7 @@ UnknownScript_0xbdd6a: setevent EVENT_WILTON_HAS_POKE_BALL UnknownScript_0xbdd6d: - farjump UnknownScript_0xa05e6 + farjump PhoneScript_FoundItem_Male ; Kenji diff --git a/text/phone/extra2.asm b/text/phone/extra2.asm index 1f2383c59..01462ff20 100644 --- a/text/phone/extra2.asm +++ b/text/phone/extra2.asm @@ -278,7 +278,7 @@ UnknownText_0x1747ac: ; 0x1747ac done ; 0x1747cc -UnknownText_0x1747cc: ; 0x1747cc +BeverlyFoundNuggetText: ; 0x1747cc text "My husband got" line "some NUGGETS." @@ -639,7 +639,7 @@ UnknownText_0x175106: ; 0x175106 done ; 0x175116 -UnknownText_0x175116: ; 0x175116 +JoseFoundSomethingText: ; 0x175116 text "My FARFETCH'D had" line "something pretty" cont "in its beak." @@ -996,7 +996,7 @@ WadeBugCatchingContestText: ; 0x1759f7 done ; 0x175a60 -UnknownText_0x175a60: ; 0x175a60 +WadeFoundBerryText: ; 0x175a60 text "I found all kinds" line "of BERRIES. If you" From 8fa7183d29cff3f30de399db8a50be4573a2185e Mon Sep 17 00:00:00 2001 From: surskitty Date: Wed, 13 Dec 2017 21:50:32 -0500 Subject: [PATCH 04/17] More phone script labelling. --- engine/more_phone_scripts.asm | 96 ++++++++++++++-------------- engine/phone_scripts.asm | 114 +++++++++++++++++----------------- 2 files changed, 105 insertions(+), 105 deletions(-) diff --git a/engine/more_phone_scripts.asm b/engine/more_phone_scripts.asm index 9aa7d78e4..16cbc1ec7 100644 --- a/engine/more_phone_scripts.asm +++ b/engine/more_phone_scripts.asm @@ -522,11 +522,11 @@ UnknownScript_0xa0324: buttonsound end -UnknownScript_0xa0376: +PhoneScript_WantsToBattle_Male: farscall PhoneScript_RematchText_Male farjump PhoneScript_HangupText_Male -UnknownScript_0xa037e: +PhoneScript_WantsToBattle_Female: farscall PhoneScript_RematchText_Female farjump PhoneScript_HangupText_Female @@ -1155,154 +1155,154 @@ UnknownScript_0xa07c6: buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa07ce: +BrentBillTriviaScript: random 10 - if_equal 0, UnknownScript_0xa07f8 - if_equal 1, UnknownScript_0xa0800 - if_equal 2, UnknownScript_0xa0808 - if_equal 3, UnknownScript_0xa0810 - if_equal 4, UnknownScript_0xa0818 - if_equal 5, UnknownScript_0xa0820 - if_equal 6, UnknownScript_0xa0828 - if_equal 7, UnknownScript_0xa0830 - if_equal 8, UnknownScript_0xa0838 - if_equal 9, UnknownScript_0xa0840 + if_equal 0, .Father + if_equal 1, .Grandpa + if_equal 2, .Goldenrod + if_equal 3, .Route25 + if_equal 4, .Abra + if_equal 5, .Sister + if_equal 6, .Milk + if_equal 7, .Battling + if_equal 8, .FlowerShop + if_equal 9, .KimonoGirl -UnknownScript_0xa07f8: +.Father: farwritetext UnknownText_0x662bc buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa0800: +.Grandpa: farwritetext UnknownText_0x662fc buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa0808: +.Goldenrod: farwritetext UnknownText_0x66335 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa0810: +.Route25: farwritetext UnknownText_0x66366 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa0818: +.Abra: farwritetext UnknownText_0x663a1 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa0820: +.Sister: farwritetext UnknownText_0x663e6 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa0828: +.Milk: farwritetext UnknownText_0x66421 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa0830: +.Battling: farwritetext UnknownText_0x6645f buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa0838: +.FlowerShop: farwritetext UnknownText_0x6649b buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa0840: +.KimonoGirl: farwritetext UnknownText_0x664dd buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa0848: +IrwinRumorScript: checkevent EVENT_OPENED_MT_SILVER - iftrue UnknownScript_0xa08e0 + iftrue IrwinMtSilver checkevent EVENT_FOUGHT_SNORLAX - iftrue UnknownScript_0xa08d8 + iftrue IrwinSnorlax checkevent EVENT_GOT_PASS_FROM_COPYCAT - iftrue UnknownScript_0xa08d0 + iftrue IrwinTrainPass checkflag ENGINE_MARSHBADGE - iftrue UnknownScript_0xa08f0 + iftrue IrwinMarshBadge checkflag ENGINE_FLYPOINT_VERMILION - iftrue UnknownScript_0xa08c8 + iftrue IrwinVermilionCity checkevent EVENT_BEAT_ELITE_FOUR - iftrue UnknownScript_0xa08c0 + iftrue IrwinEliteFour checkflag ENGINE_RISINGBADGE - iftrue UnknownScript_0xa08b8 + iftrue IrwinRisingBadge checkevent EVENT_CLEARED_RADIO_TOWER - iftrue UnknownScript_0xa08b0 + iftrue IrwinRadioTower checkevent EVENT_CLEARED_ROCKET_HIDEOUT - iftrue UnknownScript_0xa08a8 + iftrue IrwinRocketHideout checkevent EVENT_JASMINE_RETURNED_TO_GYM - iftrue UnknownScript_0xa08a0 + iftrue IrwinJasmineReturned checkflag ENGINE_FOGBADGE - iftrue UnknownScript_0xa08e8 + iftrue IrwinFogBadge checkflag ENGINE_PLAINBADGE - iftrue UnknownScript_0xa0898 + iftrue IrwinPlainBadge farwritetext UnknownText_0x646a3 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa0898: +IrwinPlainBadge: farwritetext UnknownText_0x64099 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa08a0: +IrwinJasmineReturned: farwritetext UnknownText_0x640e6 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa08a8: +IrwinRocketHideout: farwritetext UnknownText_0x6416d buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa08b0: +IrwinRadioTower: farwritetext UnknownText_0x641e8 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa08b8: +IrwinRisingBadge: farwritetext UnknownText_0x64247 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa08c0: +IrwinEliteFour: farwritetext UnknownText_0x642bb buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa08c8: +IrwinVermilionCity: farwritetext UnknownText_0x643d4 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa08d0: +IrwinTrainPass: farwritetext UnknownText_0x64448 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa08d8: +IrwinSnorlax: farwritetext UnknownText_0x6455b buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa08e0: +IrwinMtSilver: farwritetext UnknownText_0x645ff buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa08e8: +IrwinFogBadge: farwritetext UnknownText_0x646df buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa08f0: +IrwinMarshBadge: farwritetext UnknownText_0x647d8 buttonsound jump PhoneScript_HangupText_Male diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index 83ed27d41..91d8686a8 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -340,7 +340,7 @@ UnknownScript_0xbd12a: UnknownScript_0xbd12d: landmarktotext NATIONAL_PARK, $2 setflag ENGINE_JACK - farjump UnknownScript_0xa0376 + farjump PhoneScript_WantsToBattle_Male UnknownScript_0xbd137: farjump UnknownScript_0xa0584 @@ -382,20 +382,20 @@ UnknownScript_0xbd172: HueyPhoneScript1: trainertotext SAILOR, HUEY1, $0 checkflag ENGINE_HUEY - iftrue UnknownScript_0xbd1a2 + iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_HUEY_WEDNESDAY_NIGHT - iftrue UnknownScript_0xbd19b + iftrue .NotWednesday checkcode VAR_WEEKDAY - if_not_equal WEDNESDAY, UnknownScript_0xbd19b + if_not_equal WEDNESDAY, .NotWednesday checknite - iftrue UnknownScript_0xbd1cd + iftrue HueyWednesdayNight -UnknownScript_0xbd19b: +.NotWednesday: special RandomPhoneMon farjump UnknownScript_0xa0908 -UnknownScript_0xbd1a2: +.WantsBattle: landmarktotext LIGHTHOUSE, $2 farjump UnknownScript_0xa0a32 @@ -403,42 +403,42 @@ HueyPhoneScript2: trainertotext SAILOR, HUEY1, $0 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_HUEY - iftrue UnknownScript_0xbd1c9 + iftrue .Flavor checkflag ENGINE_HUEY_WEDNESDAY_NIGHT - iftrue UnknownScript_0xbd1c9 + iftrue .Flavor farscall PhoneScript_Random3 - if_equal $0, UnknownScript_0xbd1d0 - if_equal $1, UnknownScript_0xbd1d0 + if_equal $0, HueyWantsBattle + if_equal $1, HueyWantsBattle -UnknownScript_0xbd1c9: +.Flavor: farjump PhoneScript_MonFlavorText -UnknownScript_0xbd1cd: +HueyWednesdayNight: setflag ENGINE_HUEY_WEDNESDAY_NIGHT -UnknownScript_0xbd1d0: +HueyWantsBattle: landmarktotext LIGHTHOUSE, $2 setflag ENGINE_HUEY - farjump UnknownScript_0xa0376 + farjump PhoneScript_WantsToBattle_Male ; Gaven GavenPhoneScript1: trainertotext COOLTRAINERM, GAVEN3, $0 checkflag ENGINE_GAVEN - iftrue UnknownScript_0xbd1fd + iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_GAVEN_THURSDAY_MORNING - iftrue UnknownScript_0xbd1f9 + iftrue .NotThursday checkcode VAR_WEEKDAY - if_not_equal THURSDAY, UnknownScript_0xbd1f9 + if_not_equal THURSDAY, .NotThursday checkmorn - iftrue UnknownScript_0xbd22c + iftrue GavenThursdayMorning -UnknownScript_0xbd1f9: +.NotThursday: farjump UnknownScript_0xa0910 -UnknownScript_0xbd1fd: +.WantsBattle: landmarktotext ROUTE_26, $2 farjump UnknownScript_0xa0a37 @@ -450,20 +450,20 @@ GavenPhoneScript2: checkflag ENGINE_GAVEN_THURSDAY_MORNING iftrue UnknownScript_0xbd220 farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbd22f + if_equal $0, GavenWantsRematch UnknownScript_0xbd220: farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbd239 farjump UnknownScript_0xa0000 -UnknownScript_0xbd22c: +GavenThursdayMorning: setflag ENGINE_GAVEN_THURSDAY_MORNING -UnknownScript_0xbd22f: +GavenWantsRematch: landmarktotext ROUTE_26, $2 setflag ENGINE_GAVEN - farjump UnknownScript_0xa0376 + farjump PhoneScript_WantsToBattle_Male UnknownScript_0xbd239: farjump UnknownScript_0xa0584 @@ -508,28 +508,28 @@ UnknownScript_0xbd287: UnknownScript_0xbd28a: landmarktotext ROUTE_26, $2 setflag ENGINE_BETH - farjump UnknownScript_0xa037e + farjump PhoneScript_WantsToBattle_Female ; Jose JosePhoneScript1: trainertotext BIRD_KEEPER, JOSE2, $0 checkflag ENGINE_JOSE - iftrue UnknownScript_0xbd2bd + iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_JOSE_SATURDAY_NIGHT - iftrue UnknownScript_0xbd2b9 + iftrue .NotSaturday checkflag ENGINE_JOSE_HAS_STAR_PIECE iftrue UnknownScript_0xbd2c4 checkcode VAR_WEEKDAY - if_not_equal SATURDAY, UnknownScript_0xbd2b9 + if_not_equal SATURDAY, .NotSaturday checknite - iftrue UnknownScript_0xbd301 + iftrue JoseSaturdayNight -UnknownScript_0xbd2b9: +.NotSaturday: farjump UnknownScript_0xa0920 -UnknownScript_0xbd2bd: +.WantsBattle: landmarktotext ROUTE_27, $2 farjump UnknownScript_0xa0a41 @@ -556,13 +556,13 @@ UnknownScript_0xbd2f5: if_equal $0, UnknownScript_0xbd30e farjump UnknownScript_0xa0000 -UnknownScript_0xbd301: +JoseSaturdayNight: setflag ENGINE_JOSE_SATURDAY_NIGHT UnknownScript_0xbd304: landmarktotext ROUTE_27, $2 setflag ENGINE_JOSE - farjump UnknownScript_0xa0376 + farjump PhoneScript_WantsToBattle_Male UnknownScript_0xbd30e: farjump UnknownScript_0xa0584 @@ -612,7 +612,7 @@ UnknownScript_0xbd366: UnknownScript_0xbd369: landmarktotext ROUTE_27, $2 setflag ENGINE_REENA - farjump UnknownScript_0xa037e + farjump PhoneScript_WantsToBattle_Female ; Joey @@ -656,7 +656,7 @@ UnknownScript_0xbd3c4: UnknownScript_0xbd3c7: landmarktotext ROUTE_30, $2 setflag ENGINE_JOEY - farjump UnknownScript_0xa0376 + farjump PhoneScript_WantsToBattle_Male ; Wade @@ -738,7 +738,7 @@ UnknownScript_0xbd484: UnknownScript_0xbd487: landmarktotext ROUTE_31, $2 setflag ENGINE_WADE - farjump UnknownScript_0xa0376 + farjump PhoneScript_WantsToBattle_Male UnknownScript_0xbd491: farjump UnknownScript_0xa0584 @@ -821,7 +821,7 @@ Ralph_WednesdayMorning: Ralph_FightMe: landmarktotext ROUTE_32, $2 setflag ENGINE_RALPH - farjump UnknownScript_0xa0376 + farjump PhoneScript_WantsToBattle_Male Ralph_SetUpSwarm: checkflag ENGINE_SPECIAL_WILDDATA @@ -885,7 +885,7 @@ LizThursdayAfternoon: UnknownScript_0xbd5c6: landmarktotext ROUTE_32, $2 setflag ENGINE_LIZ - farjump UnknownScript_0xa037e + farjump PhoneScript_WantsToBattle_Female UnknownScript_0xbd5d0: farjump LizWrongNumber @@ -991,7 +991,7 @@ UnknownScript_0xbd699: UnknownScript_0xbd69c: landmarktotext ROUTE_33, $2 setflag ENGINE_ANTHONY - farjump UnknownScript_0xa0376 + farjump PhoneScript_WantsToBattle_Male UnknownScript_0xbd6a6: checkflag ENGINE_DUNSPARCE_SWARM @@ -1058,7 +1058,7 @@ ToddSaturdayMorning: UnknownScript_0xbd72e: landmarktotext ROUTE_34, $2 setflag ENGINE_TODD - farjump UnknownScript_0xa0376 + farjump PhoneScript_WantsToBattle_Male UnknownScript_0xbd738: farjump UnknownScript_0xa0584 @@ -1132,7 +1132,7 @@ GinaSundayDay: UnknownScript_0xbd7cf: landmarktotext ROUTE_34, $2 setflag ENGINE_GINA - farjump UnknownScript_0xa037e + farjump PhoneScript_WantsToBattle_Female UnknownScript_0xbd7d9: farjump UnknownScript_0xa05c6 @@ -1159,7 +1159,7 @@ IrwinPhoneScript2: farscall PhoneScript_GreetPhone_Male checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue .Rockets - farjump UnknownScript_0xa0848 + farjump IrwinRumorScript .Rockets: farjump UnknownScript_0xa05be @@ -1214,7 +1214,7 @@ ArnieTuesdayMorning: UnknownScript_0xbd87d: landmarktotext ROUTE_35, $2 setflag ENGINE_ARNIE - farjump UnknownScript_0xa0376 + farjump PhoneScript_WantsToBattle_Male ArnieYanmaSwarm: ; start swarm checkflag ENGINE_YANMA_SWARM @@ -1287,7 +1287,7 @@ AlanWednesdayDay: UnknownScript_0xbd91c: landmarktotext ROUTE_36, $2 setflag ENGINE_ALAN - farjump UnknownScript_0xa0376 + farjump PhoneScript_WantsToBattle_Male UnknownScript_0xbd926: setflag ENGINE_ALAN_HAS_FIRE_STONE @@ -1352,7 +1352,7 @@ UnknownScript_0xbd9ab: UnknownScript_0xbd9ae: landmarktotext ROUTE_38, $2 setflag ENGINE_DANA - farjump UnknownScript_0xa037e + farjump PhoneScript_WantsToBattle_Female UnknownScript_0xbd9b8: farjump UnknownScript_0xa0592 @@ -1406,7 +1406,7 @@ UnknownScript_0xbda20: UnknownScript_0xbda23: landmarktotext ROUTE_38, $2 setflag ENGINE_CHAD - farjump UnknownScript_0xa0376 + farjump PhoneScript_WantsToBattle_Male UnknownScript_0xbda2d: farjump UnknownScript_0xa0584 @@ -1517,7 +1517,7 @@ TullySundayNight: UnknownScript_0xbdb22: landmarktotext ROUTE_42, $2 setflag ENGINE_TULLY - farjump UnknownScript_0xa0376 + farjump PhoneScript_WantsToBattle_Male TullyFoundWaterStone: setflag ENGINE_TULLY_HAS_WATER_STONE @@ -1547,7 +1547,7 @@ BrentPhoneScript2: trainertotext POKEMANIAC, BRENT1, $0 farscall PhoneScript_GreetPhone_Male farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbdb95 + if_equal $0, BrentBillTrivia checkflag ENGINE_BRENT iftrue UnknownScript_0xbdb84 checkflag ENGINE_BRENT_MONDAY_MORNING @@ -1564,10 +1564,10 @@ UnknownScript_0xbdb88: UnknownScript_0xbdb8b: landmarktotext ROUTE_43, $2 setflag ENGINE_BRENT - farjump UnknownScript_0xa0376 + farjump PhoneScript_WantsToBattle_Male -UnknownScript_0xbdb95: - farjump UnknownScript_0xa07ce +BrentBillTrivia: + farjump BrentBillTriviaScript TiffanyPhoneScript1: trainertotext PICNICKER, TIFFANY3, $0 @@ -1625,7 +1625,7 @@ UnknownScript_0xbdc14: UnknownScript_0xbdc17: landmarktotext ROUTE_43, $2 setflag ENGINE_TIFFANY - farjump UnknownScript_0xa037e + farjump PhoneScript_WantsToBattle_Female UnknownScript_0xbdc21: random $6 @@ -1709,7 +1709,7 @@ UnknownScript_0xbdcc1: UnknownScript_0xbdcc4: landmarktotext ROUTE_44, $2 setflag ENGINE_VANCE - farjump UnknownScript_0xa0376 + farjump PhoneScript_WantsToBattle_Male WiltonPhoneScript1: trainertotext FISHER, WILTON1, $0 @@ -1759,7 +1759,7 @@ UnknownScript_0xbdd33: UnknownScript_0xbdd36: landmarktotext ROUTE_44, $2 setflag ENGINE_WILTON - farjump UnknownScript_0xa0376 + farjump PhoneScript_WantsToBattle_Male UnknownScript_0xbdd40: setflag ENGINE_WILTON_HAS_ITEM @@ -1840,7 +1840,7 @@ UnknownScript_0xbddd7: UnknownScript_0xbddda: landmarktotext ROUTE_45, $2 setflag ENGINE_PARRY - farjump UnknownScript_0xa0376 + farjump PhoneScript_WantsToBattle_Male ; Erin @@ -1883,7 +1883,7 @@ UnknownScript_0xbde32: UnknownScript_0xbde35: landmarktotext ROUTE_46, $2 setflag ENGINE_ERIN - farjump UnknownScript_0xa037e + farjump PhoneScript_WantsToBattle_Female PhoneScript_Random2: random 2 From 771c4a7e05d96199052de7718e12030c238b58c9 Mon Sep 17 00:00:00 2001 From: surskitty Date: Wed, 13 Dec 2017 22:30:37 -0500 Subject: [PATCH 05/17] Splitting phone scripts up. --- ...re_phone_scripts.asm => phone_callers.asm} | 699 --------- engine/phone_gossip.asm | 698 +++++++++ engine/phone_scripts.asm | 1267 ----------------- engine/phone_scripts_generic.asm | 1266 ++++++++++++++++ main.asm | 4 +- 5 files changed, 1967 insertions(+), 1967 deletions(-) rename engine/{more_phone_scripts.asm => phone_callers.asm} (54%) create mode 100644 engine/phone_gossip.asm create mode 100644 engine/phone_scripts_generic.asm diff --git a/engine/more_phone_scripts.asm b/engine/phone_callers.asm similarity index 54% rename from engine/more_phone_scripts.asm rename to engine/phone_callers.asm index 16cbc1ec7..1b4f19c8e 100644 --- a/engine/more_phone_scripts.asm +++ b/engine/phone_callers.asm @@ -959,702 +959,3 @@ UnknownScript_0xa064c: farwritetext UnknownText_0x66dc5 buttonsound jump PhoneScript_HangupText_Male - -JackTriviaScript: - random 11 - if_equal 0, .Thunder - if_equal 1, .Rollout - if_equal 2, .Solarbeam - if_equal 3, .Stomp - if_equal 4, .Gust - if_equal 5, .Twister - if_equal 6, .Earthquake - if_equal 7, .Magnitude - if_equal 8, .Sandstorm - if_equal 9, .SunnyDay - if_equal 10, .RainDance - -.Thunder: - farwritetext UnknownText_0x174261 - buttonsound - jump PhoneScript_HangupText_Male - -.Rollout: - farwritetext UnknownText_0x17429d - buttonsound - jump PhoneScript_HangupText_Male - -.Solarbeam: - farwritetext UnknownText_0x1742ee - buttonsound - jump PhoneScript_HangupText_Male - -.Stomp: - farwritetext UnknownText_0x174340 - buttonsound - jump PhoneScript_HangupText_Male - -.Gust: - farwritetext UnknownText_0x174391 - buttonsound - jump PhoneScript_HangupText_Male - -.Twister: - farwritetext UnknownText_0x1743e3 - buttonsound - jump PhoneScript_HangupText_Male - -.Earthquake: - farwritetext UnknownText_0x174433 - buttonsound - jump PhoneScript_HangupText_Male - -.Magnitude: - farwritetext UnknownText_0x174485 - buttonsound - jump PhoneScript_HangupText_Male - -.Sandstorm: - farwritetext UnknownText_0x1744d6 - buttonsound - jump PhoneScript_HangupText_Male - -.SunnyDay: - farwritetext UnknownText_0x174522 - buttonsound - jump PhoneScript_HangupText_Male - -.RainDance: - farwritetext UnknownText_0x174571 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa06da: - random 10 - if_equal 0, UnknownScript_0xa0704 - if_equal 1, UnknownScript_0xa070c - if_equal 2, UnknownScript_0xa0714 - if_equal 3, UnknownScript_0xa071c - if_equal 4, UnknownScript_0xa0724 - if_equal 5, UnknownScript_0xa072c - if_equal 6, UnknownScript_0xa0734 - if_equal 7, UnknownScript_0xa073c - if_equal 8, UnknownScript_0xa0744 - if_equal 9, UnknownScript_0xa074c - -UnknownScript_0xa0704: - farwritetext UnknownText_0x176223 - buttonsound - jump PhoneScript_HangupText_Female - -UnknownScript_0xa070c: - farwritetext UnknownText_0x1762c3 - buttonsound - jump PhoneScript_HangupText_Female - -UnknownScript_0xa0714: - farwritetext UnknownText_0x17638a - buttonsound - jump PhoneScript_HangupText_Female - -UnknownScript_0xa071c: - farwritetext UnknownText_0x176424 - buttonsound - jump PhoneScript_HangupText_Female - -UnknownScript_0xa0724: - farwritetext UnknownText_0x1764eb - buttonsound - jump PhoneScript_HangupText_Female - -UnknownScript_0xa072c: - farwritetext UnknownText_0x176599 - buttonsound - jump PhoneScript_HangupText_Female - -UnknownScript_0xa0734: - farwritetext UnknownText_0x1766ac - buttonsound - jump PhoneScript_HangupText_Female - -UnknownScript_0xa073c: - farwritetext UnknownText_0x17674f - buttonsound - jump PhoneScript_HangupText_Female - -UnknownScript_0xa0744: - farwritetext UnknownText_0x176816 - buttonsound - jump PhoneScript_HangupText_Female - -UnknownScript_0xa074c: - farwritetext UnknownText_0x17686d - buttonsound - jump PhoneScript_HangupText_Female - -UnknownScript_0xa0754: - random 10 - if_equal 0, UnknownScript_0xa077e - if_equal 1, UnknownScript_0xa0786 - if_equal 2, UnknownScript_0xa078e - if_equal 3, UnknownScript_0xa0796 - if_equal 4, UnknownScript_0xa079e - if_equal 5, UnknownScript_0xa07a6 - if_equal 6, UnknownScript_0xa07ae - if_equal 7, UnknownScript_0xa07b6 - if_equal 8, UnknownScript_0xa07be - if_equal 9, UnknownScript_0xa07c6 - -UnknownScript_0xa077e: - farwritetext UnknownText_0x65481 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa0786: - farwritetext UnknownText_0x654ea - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa078e: - farwritetext UnknownText_0x65555 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa0796: - farwritetext UnknownText_0x655c7 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa079e: - farwritetext UnknownText_0x65628 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa07a6: - farwritetext UnknownText_0x6569b - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa07ae: - farwritetext UnknownText_0x6574a - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa07b6: - farwritetext UnknownText_0x65810 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa07be: - farwritetext UnknownText_0x658c6 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa07c6: - farwritetext UnknownText_0x65969 - buttonsound - jump PhoneScript_HangupText_Male - -BrentBillTriviaScript: - random 10 - if_equal 0, .Father - if_equal 1, .Grandpa - if_equal 2, .Goldenrod - if_equal 3, .Route25 - if_equal 4, .Abra - if_equal 5, .Sister - if_equal 6, .Milk - if_equal 7, .Battling - if_equal 8, .FlowerShop - if_equal 9, .KimonoGirl - -.Father: - farwritetext UnknownText_0x662bc - buttonsound - jump PhoneScript_HangupText_Male - -.Grandpa: - farwritetext UnknownText_0x662fc - buttonsound - jump PhoneScript_HangupText_Male - -.Goldenrod: - farwritetext UnknownText_0x66335 - buttonsound - jump PhoneScript_HangupText_Male - -.Route25: - farwritetext UnknownText_0x66366 - buttonsound - jump PhoneScript_HangupText_Male - -.Abra: - farwritetext UnknownText_0x663a1 - buttonsound - jump PhoneScript_HangupText_Male - -.Sister: - farwritetext UnknownText_0x663e6 - buttonsound - jump PhoneScript_HangupText_Male - -.Milk: - farwritetext UnknownText_0x66421 - buttonsound - jump PhoneScript_HangupText_Male - -.Battling: - farwritetext UnknownText_0x6645f - buttonsound - jump PhoneScript_HangupText_Male - -.FlowerShop: - farwritetext UnknownText_0x6649b - buttonsound - jump PhoneScript_HangupText_Male - -.KimonoGirl: - farwritetext UnknownText_0x664dd - buttonsound - jump PhoneScript_HangupText_Male - -IrwinRumorScript: - checkevent EVENT_OPENED_MT_SILVER - iftrue IrwinMtSilver - checkevent EVENT_FOUGHT_SNORLAX - iftrue IrwinSnorlax - checkevent EVENT_GOT_PASS_FROM_COPYCAT - iftrue IrwinTrainPass - checkflag ENGINE_MARSHBADGE - iftrue IrwinMarshBadge - checkflag ENGINE_FLYPOINT_VERMILION - iftrue IrwinVermilionCity - checkevent EVENT_BEAT_ELITE_FOUR - iftrue IrwinEliteFour - checkflag ENGINE_RISINGBADGE - iftrue IrwinRisingBadge - checkevent EVENT_CLEARED_RADIO_TOWER - iftrue IrwinRadioTower - checkevent EVENT_CLEARED_ROCKET_HIDEOUT - iftrue IrwinRocketHideout - checkevent EVENT_JASMINE_RETURNED_TO_GYM - iftrue IrwinJasmineReturned - checkflag ENGINE_FOGBADGE - iftrue IrwinFogBadge - checkflag ENGINE_PLAINBADGE - iftrue IrwinPlainBadge - farwritetext UnknownText_0x646a3 - buttonsound - jump PhoneScript_HangupText_Male - -IrwinPlainBadge: - farwritetext UnknownText_0x64099 - buttonsound - jump PhoneScript_HangupText_Male - -IrwinJasmineReturned: - farwritetext UnknownText_0x640e6 - buttonsound - jump PhoneScript_HangupText_Male - -IrwinRocketHideout: - farwritetext UnknownText_0x6416d - buttonsound - jump PhoneScript_HangupText_Male - -IrwinRadioTower: - farwritetext UnknownText_0x641e8 - buttonsound - jump PhoneScript_HangupText_Male - -IrwinRisingBadge: - farwritetext UnknownText_0x64247 - buttonsound - jump PhoneScript_HangupText_Male - -IrwinEliteFour: - farwritetext UnknownText_0x642bb - buttonsound - jump PhoneScript_HangupText_Male - -IrwinVermilionCity: - farwritetext UnknownText_0x643d4 - buttonsound - jump PhoneScript_HangupText_Male - -IrwinTrainPass: - farwritetext UnknownText_0x64448 - buttonsound - jump PhoneScript_HangupText_Male - -IrwinSnorlax: - farwritetext UnknownText_0x6455b - buttonsound - jump PhoneScript_HangupText_Male - -IrwinMtSilver: - farwritetext UnknownText_0x645ff - buttonsound - jump PhoneScript_HangupText_Male - -IrwinFogBadge: - farwritetext UnknownText_0x646df - buttonsound - jump PhoneScript_HangupText_Male - -IrwinMarshBadge: - farwritetext UnknownText_0x647d8 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa08f8: - farwritetext UnknownText_0x1745c2 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa0900: - farwritetext UnknownText_0x17485b - buttonsound - jump PhoneScript_HangupText_Female - -UnknownScript_0xa0908: - farwritetext UnknownText_0x17496b - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa0910: - farwritetext UnknownText_0x174c29 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa0918: - farwritetext UnknownText_0x174ec5 - buttonsound - jump PhoneScript_HangupText_Female - -UnknownScript_0xa0920: - farwritetext UnknownText_0x17519b - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa0928: - farwritetext UnknownText_0x17549b - buttonsound - jump PhoneScript_HangupText_Female - -UnknownScript_0xa0930: - farwritetext UnknownText_0x17571d - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa0938: - farwritetext UnknownText_0x175abe - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa0940: - farwritetext UnknownText_0x175eaf - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa0948: - farwritetext UnknownText_0x1768b0 - buttonsound - jump PhoneScript_HangupText_Female - -UnknownScript_0xa0950: - farwritetext UnknownText_0x176d32 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa0958: - farwritetext UnknownText_0x1770fb - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa0960: - farwritetext UnknownText_0x177465 - buttonsound - jump PhoneScript_HangupText_Female - -UnknownScript_0xa0968: - farwritetext UnknownText_0x64bc6 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa0970: - farwritetext UnknownText_0x64e90 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa0978: - farwritetext UnknownText_0x65161 - buttonsound - jump PhoneScript_HangupText_Female - -UnknownScript_0xa0980: - farwritetext UnknownText_0x65a23 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa0988: - farwritetext UnknownText_0x65d5c - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa0990: - farwritetext UnknownText_0x65ff2 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa0998: - farwritetext UnknownText_0x6651e - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa09a0: - farwritetext UnknownText_0x66882 - buttonsound - jump PhoneScript_HangupText_Female - -UnknownScript_0xa09a8: - farwritetext UnknownText_0x66aa5 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa09b0: - farwritetext UnknownText_0x66ca7 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa09b8: - farwritetext UnknownText_0x67106 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa09c0: - farwritetext UnknownText_0x67294 - buttonsound - jump PhoneScript_HangupText_Female - -UnknownScript_0xa09c8: - random 3 - if_equal 0, UnknownScript_0xa09d6 - if_equal 1, UnknownScript_0xa09de - if_equal 2, UnknownScript_0xa09e6 - -UnknownScript_0xa09d6: - farwritetext UnknownText_0x64846 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa09de: - farwritetext UnknownText_0x64881 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa09e6: - farwritetext UnknownText_0x648dc - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa09ee: - checkcode VAR_KENJI_BREAK - if_equal 2, UnknownScript_0xa0a00 - if_equal 1, UnknownScript_0xa0a08 - farwritetext UnknownText_0x66e17 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa0a00: - farwritetext UnknownText_0x66e67 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa0a08: - checkmorn - iftrue UnknownScript_0xa0a1d - checknite - iftrue UnknownScript_0xa0a25 - setevent EVENT_KENJI_ON_BREAK - farwritetext UnknownText_0x66f11 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa0a1d: - farwritetext UnknownText_0x66ed3 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa0a25: - farwritetext UnknownText_0x66f52 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa0a2d: - farwritetext UnknownText_0x174638 - end - -UnknownScript_0xa0a32: - farwritetext UnknownText_0x1749c7 - end - -UnknownScript_0xa0a37: - farwritetext UnknownText_0x174c49 - end - -UnknownScript_0xa0a3c: - farwritetext UnknownText_0x174ee2 - end - -UnknownScript_0xa0a41: - farwritetext UnknownText_0x17520a - end - -UnknownScript_0xa0a46: - farwritetext UnknownText_0x1754e5 - end - -UnknownScript_0xa0a4b: - farwritetext UnknownText_0x175786 - end - -UnknownScript_0xa0a50: - farwritetext UnknownText_0x175b1e - end - -UnknownScript_0xa0a55: - farwritetext UnknownText_0x175f11 - end - -UnknownScript_0xa0a5a: - farwritetext UnknownText_0x1769da - end - -UnknownScript_0xa0a5f: - farwritetext UnknownText_0x176d85 - end - -UnknownScript_0xa0a64: - farwritetext UnknownText_0x177138 - end - -UnknownScript_0xa0a69: - farwritetext UnknownText_0x1774c1 - end - -UnknownScript_0xa0a6e: - farwritetext UnknownText_0x64c13 - end - -UnknownScript_0xa0a73: - farwritetext UnknownText_0x64ed4 - end - -UnknownScript_0xa0a78: - farwritetext UnknownText_0x651bf - end - -UnknownScript_0xa0a7d: - farwritetext UnknownText_0x65a63 - end - -UnknownScript_0xa0a82: - farwritetext UnknownText_0x66043 - end - -UnknownScript_0xa0a87: - farwritetext UnknownText_0x66579 - end - -UnknownScript_0xa0a8c: - farwritetext UnknownText_0x668a3 - end - -UnknownScript_0xa0a91: - farwritetext UnknownText_0x66ad1 - end - -UnknownScript_0xa0a96: - farwritetext UnknownText_0x66cf7 - end - -UnknownScript_0xa0a9b: - farwritetext UnknownText_0x6712a - end - -UnknownScript_0xa0aa0: - farwritetext UnknownText_0x672d5 - end - -UnknownScript_0xa0aa5: - farwritetext UnknownText_0x174895 - buttonsound - jump PhoneScript_HangupText_Female - -UnknownScript_0xa0aad: - farwritetext UnknownText_0x17529c - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa0ab5: - farwritetext UnknownText_0x175b6d - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa0abd: - farwritetext UnknownText_0x17750e - buttonsound - jump PhoneScript_HangupText_Female - -UnknownScript_0xa0ac5: - farwritetext UnknownText_0x64f1a - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa0acd: - farwritetext UnknownText_0x6520f - buttonsound - jump PhoneScript_HangupText_Female - -UnknownScript_0xa0ad5: - farwritetext UnknownText_0x65da6 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa0add: - farwritetext UnknownText_0x66087 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa0ae5: - farwritetext UnknownText_0x6691d - buttonsound - jump PhoneScript_HangupText_Female - -UnknownScript_0xa0aed: - farwritetext UnknownText_0x66d45 - buttonsound - jump PhoneScript_HangupText_Male - -UnknownScript_0xa0af5: - farwritetext UnknownText_0x175f70 - end - -UnknownScript_0xa0afa: - farwritetext UnknownText_0x176dd1 - end - -UnknownScript_0xa0aff: - farwritetext UnknownText_0x64c5a - end - -UnknownScript_0xa0b04: - farwritetext UnknownText_0x17717c - end - -BikeShopPhoneScript: - farwritetext UnknownText_0x174000 - clearflag ENGINE_BIKE_SHOP_CALL_ENABLED - specialphonecall SPECIALCALL_NONE - end diff --git a/engine/phone_gossip.asm b/engine/phone_gossip.asm new file mode 100644 index 000000000..ae545c41e --- /dev/null +++ b/engine/phone_gossip.asm @@ -0,0 +1,698 @@ +JackTriviaScript: + random 11 + if_equal 0, .Thunder + if_equal 1, .Rollout + if_equal 2, .Solarbeam + if_equal 3, .Stomp + if_equal 4, .Gust + if_equal 5, .Twister + if_equal 6, .Earthquake + if_equal 7, .Magnitude + if_equal 8, .Sandstorm + if_equal 9, .SunnyDay + if_equal 10, .RainDance + +.Thunder: + farwritetext UnknownText_0x174261 + buttonsound + jump PhoneScript_HangupText_Male + +.Rollout: + farwritetext UnknownText_0x17429d + buttonsound + jump PhoneScript_HangupText_Male + +.Solarbeam: + farwritetext UnknownText_0x1742ee + buttonsound + jump PhoneScript_HangupText_Male + +.Stomp: + farwritetext UnknownText_0x174340 + buttonsound + jump PhoneScript_HangupText_Male + +.Gust: + farwritetext UnknownText_0x174391 + buttonsound + jump PhoneScript_HangupText_Male + +.Twister: + farwritetext UnknownText_0x1743e3 + buttonsound + jump PhoneScript_HangupText_Male + +.Earthquake: + farwritetext UnknownText_0x174433 + buttonsound + jump PhoneScript_HangupText_Male + +.Magnitude: + farwritetext UnknownText_0x174485 + buttonsound + jump PhoneScript_HangupText_Male + +.Sandstorm: + farwritetext UnknownText_0x1744d6 + buttonsound + jump PhoneScript_HangupText_Male + +.SunnyDay: + farwritetext UnknownText_0x174522 + buttonsound + jump PhoneScript_HangupText_Male + +.RainDance: + farwritetext UnknownText_0x174571 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa06da: + random 10 + if_equal 0, UnknownScript_0xa0704 + if_equal 1, UnknownScript_0xa070c + if_equal 2, UnknownScript_0xa0714 + if_equal 3, UnknownScript_0xa071c + if_equal 4, UnknownScript_0xa0724 + if_equal 5, UnknownScript_0xa072c + if_equal 6, UnknownScript_0xa0734 + if_equal 7, UnknownScript_0xa073c + if_equal 8, UnknownScript_0xa0744 + if_equal 9, UnknownScript_0xa074c + +UnknownScript_0xa0704: + farwritetext UnknownText_0x176223 + buttonsound + jump PhoneScript_HangupText_Female + +UnknownScript_0xa070c: + farwritetext UnknownText_0x1762c3 + buttonsound + jump PhoneScript_HangupText_Female + +UnknownScript_0xa0714: + farwritetext UnknownText_0x17638a + buttonsound + jump PhoneScript_HangupText_Female + +UnknownScript_0xa071c: + farwritetext UnknownText_0x176424 + buttonsound + jump PhoneScript_HangupText_Female + +UnknownScript_0xa0724: + farwritetext UnknownText_0x1764eb + buttonsound + jump PhoneScript_HangupText_Female + +UnknownScript_0xa072c: + farwritetext UnknownText_0x176599 + buttonsound + jump PhoneScript_HangupText_Female + +UnknownScript_0xa0734: + farwritetext UnknownText_0x1766ac + buttonsound + jump PhoneScript_HangupText_Female + +UnknownScript_0xa073c: + farwritetext UnknownText_0x17674f + buttonsound + jump PhoneScript_HangupText_Female + +UnknownScript_0xa0744: + farwritetext UnknownText_0x176816 + buttonsound + jump PhoneScript_HangupText_Female + +UnknownScript_0xa074c: + farwritetext UnknownText_0x17686d + buttonsound + jump PhoneScript_HangupText_Female + +UnknownScript_0xa0754: + random 10 + if_equal 0, UnknownScript_0xa077e + if_equal 1, UnknownScript_0xa0786 + if_equal 2, UnknownScript_0xa078e + if_equal 3, UnknownScript_0xa0796 + if_equal 4, UnknownScript_0xa079e + if_equal 5, UnknownScript_0xa07a6 + if_equal 6, UnknownScript_0xa07ae + if_equal 7, UnknownScript_0xa07b6 + if_equal 8, UnknownScript_0xa07be + if_equal 9, UnknownScript_0xa07c6 + +UnknownScript_0xa077e: + farwritetext UnknownText_0x65481 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa0786: + farwritetext UnknownText_0x654ea + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa078e: + farwritetext UnknownText_0x65555 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa0796: + farwritetext UnknownText_0x655c7 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa079e: + farwritetext UnknownText_0x65628 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa07a6: + farwritetext UnknownText_0x6569b + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa07ae: + farwritetext UnknownText_0x6574a + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa07b6: + farwritetext UnknownText_0x65810 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa07be: + farwritetext UnknownText_0x658c6 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa07c6: + farwritetext UnknownText_0x65969 + buttonsound + jump PhoneScript_HangupText_Male + +BrentBillTriviaScript: + random 10 + if_equal 0, .Father + if_equal 1, .Grandpa + if_equal 2, .Goldenrod + if_equal 3, .Route25 + if_equal 4, .Abra + if_equal 5, .Sister + if_equal 6, .Milk + if_equal 7, .Battling + if_equal 8, .FlowerShop + if_equal 9, .KimonoGirl + +.Father: + farwritetext UnknownText_0x662bc + buttonsound + jump PhoneScript_HangupText_Male + +.Grandpa: + farwritetext UnknownText_0x662fc + buttonsound + jump PhoneScript_HangupText_Male + +.Goldenrod: + farwritetext UnknownText_0x66335 + buttonsound + jump PhoneScript_HangupText_Male + +.Route25: + farwritetext UnknownText_0x66366 + buttonsound + jump PhoneScript_HangupText_Male + +.Abra: + farwritetext UnknownText_0x663a1 + buttonsound + jump PhoneScript_HangupText_Male + +.Sister: + farwritetext UnknownText_0x663e6 + buttonsound + jump PhoneScript_HangupText_Male + +.Milk: + farwritetext UnknownText_0x66421 + buttonsound + jump PhoneScript_HangupText_Male + +.Battling: + farwritetext UnknownText_0x6645f + buttonsound + jump PhoneScript_HangupText_Male + +.FlowerShop: + farwritetext UnknownText_0x6649b + buttonsound + jump PhoneScript_HangupText_Male + +.KimonoGirl: + farwritetext UnknownText_0x664dd + buttonsound + jump PhoneScript_HangupText_Male + +IrwinRumorScript: + checkevent EVENT_OPENED_MT_SILVER + iftrue IrwinMtSilver + checkevent EVENT_FOUGHT_SNORLAX + iftrue IrwinSnorlax + checkevent EVENT_GOT_PASS_FROM_COPYCAT + iftrue IrwinTrainPass + checkflag ENGINE_MARSHBADGE + iftrue IrwinMarshBadge + checkflag ENGINE_FLYPOINT_VERMILION + iftrue IrwinVermilionCity + checkevent EVENT_BEAT_ELITE_FOUR + iftrue IrwinEliteFour + checkflag ENGINE_RISINGBADGE + iftrue IrwinRisingBadge + checkevent EVENT_CLEARED_RADIO_TOWER + iftrue IrwinRadioTower + checkevent EVENT_CLEARED_ROCKET_HIDEOUT + iftrue IrwinRocketHideout + checkevent EVENT_JASMINE_RETURNED_TO_GYM + iftrue IrwinJasmineReturned + checkflag ENGINE_FOGBADGE + iftrue IrwinFogBadge + checkflag ENGINE_PLAINBADGE + iftrue IrwinPlainBadge + farwritetext UnknownText_0x646a3 + buttonsound + jump PhoneScript_HangupText_Male + +IrwinPlainBadge: + farwritetext UnknownText_0x64099 + buttonsound + jump PhoneScript_HangupText_Male + +IrwinJasmineReturned: + farwritetext UnknownText_0x640e6 + buttonsound + jump PhoneScript_HangupText_Male + +IrwinRocketHideout: + farwritetext UnknownText_0x6416d + buttonsound + jump PhoneScript_HangupText_Male + +IrwinRadioTower: + farwritetext UnknownText_0x641e8 + buttonsound + jump PhoneScript_HangupText_Male + +IrwinRisingBadge: + farwritetext UnknownText_0x64247 + buttonsound + jump PhoneScript_HangupText_Male + +IrwinEliteFour: + farwritetext UnknownText_0x642bb + buttonsound + jump PhoneScript_HangupText_Male + +IrwinVermilionCity: + farwritetext UnknownText_0x643d4 + buttonsound + jump PhoneScript_HangupText_Male + +IrwinTrainPass: + farwritetext UnknownText_0x64448 + buttonsound + jump PhoneScript_HangupText_Male + +IrwinSnorlax: + farwritetext UnknownText_0x6455b + buttonsound + jump PhoneScript_HangupText_Male + +IrwinMtSilver: + farwritetext UnknownText_0x645ff + buttonsound + jump PhoneScript_HangupText_Male + +IrwinFogBadge: + farwritetext UnknownText_0x646df + buttonsound + jump PhoneScript_HangupText_Male + +IrwinMarshBadge: + farwritetext UnknownText_0x647d8 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa08f8: + farwritetext UnknownText_0x1745c2 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa0900: + farwritetext UnknownText_0x17485b + buttonsound + jump PhoneScript_HangupText_Female + +UnknownScript_0xa0908: + farwritetext UnknownText_0x17496b + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa0910: + farwritetext UnknownText_0x174c29 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa0918: + farwritetext UnknownText_0x174ec5 + buttonsound + jump PhoneScript_HangupText_Female + +UnknownScript_0xa0920: + farwritetext UnknownText_0x17519b + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa0928: + farwritetext UnknownText_0x17549b + buttonsound + jump PhoneScript_HangupText_Female + +UnknownScript_0xa0930: + farwritetext UnknownText_0x17571d + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa0938: + farwritetext UnknownText_0x175abe + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa0940: + farwritetext UnknownText_0x175eaf + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa0948: + farwritetext UnknownText_0x1768b0 + buttonsound + jump PhoneScript_HangupText_Female + +UnknownScript_0xa0950: + farwritetext UnknownText_0x176d32 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa0958: + farwritetext UnknownText_0x1770fb + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa0960: + farwritetext UnknownText_0x177465 + buttonsound + jump PhoneScript_HangupText_Female + +UnknownScript_0xa0968: + farwritetext UnknownText_0x64bc6 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa0970: + farwritetext UnknownText_0x64e90 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa0978: + farwritetext UnknownText_0x65161 + buttonsound + jump PhoneScript_HangupText_Female + +UnknownScript_0xa0980: + farwritetext UnknownText_0x65a23 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa0988: + farwritetext UnknownText_0x65d5c + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa0990: + farwritetext UnknownText_0x65ff2 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa0998: + farwritetext UnknownText_0x6651e + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa09a0: + farwritetext UnknownText_0x66882 + buttonsound + jump PhoneScript_HangupText_Female + +UnknownScript_0xa09a8: + farwritetext UnknownText_0x66aa5 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa09b0: + farwritetext UnknownText_0x66ca7 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa09b8: + farwritetext UnknownText_0x67106 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa09c0: + farwritetext UnknownText_0x67294 + buttonsound + jump PhoneScript_HangupText_Female + +UnknownScript_0xa09c8: + random 3 + if_equal 0, UnknownScript_0xa09d6 + if_equal 1, UnknownScript_0xa09de + if_equal 2, UnknownScript_0xa09e6 + +UnknownScript_0xa09d6: + farwritetext UnknownText_0x64846 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa09de: + farwritetext UnknownText_0x64881 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa09e6: + farwritetext UnknownText_0x648dc + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa09ee: + checkcode VAR_KENJI_BREAK + if_equal 2, UnknownScript_0xa0a00 + if_equal 1, UnknownScript_0xa0a08 + farwritetext UnknownText_0x66e17 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa0a00: + farwritetext UnknownText_0x66e67 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa0a08: + checkmorn + iftrue UnknownScript_0xa0a1d + checknite + iftrue UnknownScript_0xa0a25 + setevent EVENT_KENJI_ON_BREAK + farwritetext UnknownText_0x66f11 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa0a1d: + farwritetext UnknownText_0x66ed3 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa0a25: + farwritetext UnknownText_0x66f52 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa0a2d: + farwritetext UnknownText_0x174638 + end + +UnknownScript_0xa0a32: + farwritetext UnknownText_0x1749c7 + end + +UnknownScript_0xa0a37: + farwritetext UnknownText_0x174c49 + end + +UnknownScript_0xa0a3c: + farwritetext UnknownText_0x174ee2 + end + +UnknownScript_0xa0a41: + farwritetext UnknownText_0x17520a + end + +UnknownScript_0xa0a46: + farwritetext UnknownText_0x1754e5 + end + +UnknownScript_0xa0a4b: + farwritetext UnknownText_0x175786 + end + +UnknownScript_0xa0a50: + farwritetext UnknownText_0x175b1e + end + +UnknownScript_0xa0a55: + farwritetext UnknownText_0x175f11 + end + +UnknownScript_0xa0a5a: + farwritetext UnknownText_0x1769da + end + +UnknownScript_0xa0a5f: + farwritetext UnknownText_0x176d85 + end + +UnknownScript_0xa0a64: + farwritetext UnknownText_0x177138 + end + +UnknownScript_0xa0a69: + farwritetext UnknownText_0x1774c1 + end + +UnknownScript_0xa0a6e: + farwritetext UnknownText_0x64c13 + end + +UnknownScript_0xa0a73: + farwritetext UnknownText_0x64ed4 + end + +UnknownScript_0xa0a78: + farwritetext UnknownText_0x651bf + end + +UnknownScript_0xa0a7d: + farwritetext UnknownText_0x65a63 + end + +UnknownScript_0xa0a82: + farwritetext UnknownText_0x66043 + end + +UnknownScript_0xa0a87: + farwritetext UnknownText_0x66579 + end + +UnknownScript_0xa0a8c: + farwritetext UnknownText_0x668a3 + end + +UnknownScript_0xa0a91: + farwritetext UnknownText_0x66ad1 + end + +UnknownScript_0xa0a96: + farwritetext UnknownText_0x66cf7 + end + +UnknownScript_0xa0a9b: + farwritetext UnknownText_0x6712a + end + +UnknownScript_0xa0aa0: + farwritetext UnknownText_0x672d5 + end + +UnknownScript_0xa0aa5: + farwritetext UnknownText_0x174895 + buttonsound + jump PhoneScript_HangupText_Female + +UnknownScript_0xa0aad: + farwritetext UnknownText_0x17529c + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa0ab5: + farwritetext UnknownText_0x175b6d + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa0abd: + farwritetext UnknownText_0x17750e + buttonsound + jump PhoneScript_HangupText_Female + +UnknownScript_0xa0ac5: + farwritetext UnknownText_0x64f1a + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa0acd: + farwritetext UnknownText_0x6520f + buttonsound + jump PhoneScript_HangupText_Female + +UnknownScript_0xa0ad5: + farwritetext UnknownText_0x65da6 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa0add: + farwritetext UnknownText_0x66087 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa0ae5: + farwritetext UnknownText_0x6691d + buttonsound + jump PhoneScript_HangupText_Female + +UnknownScript_0xa0aed: + farwritetext UnknownText_0x66d45 + buttonsound + jump PhoneScript_HangupText_Male + +UnknownScript_0xa0af5: + farwritetext UnknownText_0x175f70 + end + +UnknownScript_0xa0afa: + farwritetext UnknownText_0x176dd1 + end + +UnknownScript_0xa0aff: + farwritetext UnknownText_0x64c5a + end + +UnknownScript_0xa0b04: + farwritetext UnknownText_0x17717c + end + +BikeShopPhoneScript: + farwritetext UnknownText_0x174000 + clearflag ENGINE_BIKE_SHOP_CALL_ENABLED + specialphonecall SPECIALCALL_NONE + end diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index 91d8686a8..f0e8489d6 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -1884,1270 +1884,3 @@ UnknownScript_0xbde35: landmarktotext ROUTE_46, $2 setflag ENGINE_ERIN farjump PhoneScript_WantsToBattle_Female - -PhoneScript_Random2: - random 2 - end - -PhoneScript_Random3: - random 3 - end - -PhoneScript_Random4: - random 4 - end - -PhoneScript_Random5: - random 5 - end - -PhoneScript_Random11: - random 11 - end - -PhoneScript_AnswerPhone_Male: - checkday - iftrue PhoneScript_AnswerPhone_Male_Day - checknite - iftrue PhoneScript_AnswerPhone_Male_Nite - checkcode VAR_CALLERID - if_equal PHONE_SCHOOLBOY_JACK, .Jack - if_equal PHONE_SAILOR_HUEY, .Huey - if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven - if_equal PHONE_BIRDKEEPER_JOSE, .Jose - if_equal PHONE_YOUNGSTER_JOEY, .Joey - if_equal PHONE_BUG_CATCHER_WADE, .Wade - if_equal PHONE_FISHER_RALPH, .Ralph - if_equal PHONE_HIKER_ANTHONY, .Anthony - if_equal PHONE_CAMPER_TODD, .Todd - if_equal PHONE_JUGGLER_IRWIN, .Irwin - if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie - if_equal PHONE_SCHOOLBOY_ALAN, .Alan - if_equal PHONE_SCHOOLBOY_CHAD, .Chad - if_equal PHONE_POKEFANM_DEREK, .Derek - if_equal PHONE_FISHER_TULLY, .Tully - if_equal PHONE_POKEMANIAC_BRENT, .Brent - if_equal PHONE_BIRDKEEPER_VANCE, .Vance - if_equal PHONE_FISHER_WILTON, .Wilton - if_equal PHONE_BLACKBELT_KENJI, .Kenji - if_equal PHONE_HIKER_PARRY, .Parry - -.Jack: - farwritetext UnknownText_0x1b4dc5 - buttonsound - end - -.Huey: - farwritetext UnknownText_0x1b5073 - buttonsound - end - -.Gaven: - farwritetext UnknownText_0x1b5270 - buttonsound - end - -.Jose: - farwritetext UnknownText_0x1b55ae - buttonsound - end - -.Joey: - farwritetext UnknownText_0x1b589a - buttonsound - end - -.Wade: - farwritetext UnknownText_0x1b5a3b - buttonsound - end - -.Ralph: - farwritetext UnknownText_0x1b5c10 - buttonsound - end - -.Anthony: - farwritetext UnknownText_0x1b5f7a - buttonsound - end - -.Todd: - farwritetext UnknownText_0x1b60f5 - buttonsound - end - -.Irwin: - farwritetext UnknownText_0x1b638c - buttonsound - end - -.Arnie: - farwritetext UnknownText_0x1b6454 - buttonsound - end - -.Alan: - farwritetext UnknownText_0x1b659d - buttonsound - end - -.Chad: - farwritetext UnknownText_0x1b67e2 - buttonsound - end - -.Derek: - farwritetext UnknownText_0x1b69a8 - buttonsound - end - -.Tully: - farwritetext UnknownText_0x1b6b39 - buttonsound - end - -.Brent: - farwritetext UnknownText_0x1b6c96 - buttonsound - end - -.Vance: - farwritetext UnknownText_0x1b7019 - buttonsound - end - -.Wilton: - farwritetext UnknownText_0x1b71d5 - buttonsound - end - -.Kenji: - farwritetext UnknownText_0x1b730b - buttonsound - end - -.Parry: - farwritetext UnknownText_0x1b73c7 - buttonsound - end - -PhoneScript_AnswerPhone_Male_Day: - checkcode VAR_CALLERID - if_equal PHONE_SCHOOLBOY_JACK, .Jack - if_equal PHONE_SAILOR_HUEY, .Huey - if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven - if_equal PHONE_BIRDKEEPER_JOSE, .Jose - if_equal PHONE_YOUNGSTER_JOEY, .Joey - if_equal PHONE_BUG_CATCHER_WADE, .Wade - if_equal PHONE_FISHER_RALPH, .Ralph - if_equal PHONE_HIKER_ANTHONY, .Anthony - if_equal PHONE_CAMPER_TODD, .Todd - if_equal PHONE_JUGGLER_IRWIN, .Irwin - if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie - if_equal PHONE_SCHOOLBOY_ALAN, .Alan - if_equal PHONE_SCHOOLBOY_CHAD, .Chad - if_equal PHONE_POKEFANM_DEREK, .Derek - if_equal PHONE_FISHER_TULLY, .Tully - if_equal PHONE_POKEMANIAC_BRENT, .Brent - if_equal PHONE_BIRDKEEPER_VANCE, .Vance - if_equal PHONE_FISHER_WILTON, .Wilton - if_equal PHONE_BLACKBELT_KENJI, .Kenji - if_equal PHONE_HIKER_PARRY, .Parry - -.Jack: - farwritetext UnknownText_0x1b4ded - buttonsound - end - -.Huey: - farwritetext UnknownText_0x1b509b - buttonsound - end - -.Gaven: - farwritetext UnknownText_0x1b52a5 - buttonsound - end - -.Jose: - farwritetext UnknownText_0x1b55da - buttonsound - end - -.Joey: - farwritetext UnknownText_0x1b58c2 - buttonsound - end - -.Wade: - farwritetext UnknownText_0x1b5a74 - buttonsound - end - -.Ralph: - farwritetext UnknownText_0x1b5c63 - buttonsound - end - -.Anthony: - farwritetext UnknownText_0x1b5f9e - buttonsound - end - -.Todd: - farwritetext UnknownText_0x1b611b - buttonsound - end - -.Irwin: - farwritetext UnknownText_0x1b63a8 - buttonsound - end - -.Arnie: - farwritetext UnknownText_0x1b647e - buttonsound - end - -.Alan: - farwritetext UnknownText_0x1b65c7 - buttonsound - end - -.Chad: - farwritetext UnknownText_0x1b680e - buttonsound - end - -.Derek: - farwritetext UnknownText_0x1b69d2 - buttonsound - end - -.Tully: - farwritetext UnknownText_0x1b6b65 - buttonsound - end - -.Brent: - farwritetext UnknownText_0x1b6cc6 - buttonsound - end - -.Vance: - farwritetext UnknownText_0x1b7057 - buttonsound - end - -.Wilton: - farwritetext UnknownText_0x1b71fc - buttonsound - end - -.Kenji: - farwritetext UnknownText_0x1b7331 - buttonsound - end - -.Parry: - farwritetext UnknownText_0x1b73ef - buttonsound - end - -PhoneScript_AnswerPhone_Male_Nite: - checkcode VAR_CALLERID - if_equal PHONE_SCHOOLBOY_JACK, .Jack - if_equal PHONE_SAILOR_HUEY, .Huey - if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven - if_equal PHONE_BIRDKEEPER_JOSE, .Jose - if_equal PHONE_YOUNGSTER_JOEY, .Joey - if_equal PHONE_BUG_CATCHER_WADE, .Wade - if_equal PHONE_FISHER_RALPH, .Ralph - if_equal PHONE_HIKER_ANTHONY, .Anthony - if_equal PHONE_CAMPER_TODD, .Todd - if_equal PHONE_JUGGLER_IRWIN, .Irwin - if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie - if_equal PHONE_SCHOOLBOY_ALAN, .Alan - if_equal PHONE_SCHOOLBOY_CHAD, .Chad - if_equal PHONE_POKEFANM_DEREK, .Derek - if_equal PHONE_FISHER_TULLY, .Tully - if_equal PHONE_POKEMANIAC_BRENT, .Brent - if_equal PHONE_BIRDKEEPER_VANCE, .Vance - if_equal PHONE_FISHER_WILTON, .Wilton - if_equal PHONE_BLACKBELT_KENJI, .Kenji - if_equal PHONE_HIKER_PARRY, .Parry - -.Jack: - farwritetext UnknownText_0x1b4e16 - buttonsound - end - -.Huey: - farwritetext UnknownText_0x1b50c2 - buttonsound - end - -.Gaven: - farwritetext UnknownText_0x1b52cc - buttonsound - end - -.Jose: - farwritetext UnknownText_0x1b55fc - buttonsound - end - -.Joey: - farwritetext UnknownText_0x1b58ea - buttonsound - end - -.Wade: - farwritetext UnknownText_0x1b5a9f - buttonsound - end - -.Ralph: - farwritetext UnknownText_0x1b5cb6 - buttonsound - end - -.Anthony: - farwritetext UnknownText_0x1b5fc9 - buttonsound - end - -.Todd: - farwritetext UnknownText_0x1b6149 - buttonsound - end - -.Irwin: - farwritetext UnknownText_0x1b63c4 - buttonsound - end - -.Arnie: - farwritetext UnknownText_0x1b64a8 - buttonsound - end - -.Alan: - farwritetext UnknownText_0x1b65e3 - buttonsound - end - -.Chad: - farwritetext UnknownText_0x1b6836 - buttonsound - end - -.Derek: - farwritetext UnknownText_0x1b69f8 - buttonsound - end - -.Tully: - farwritetext UnknownText_0x1b6b92 - buttonsound - end - -.Brent: - farwritetext UnknownText_0x1b6cf6 - buttonsound - end - -.Vance: - farwritetext UnknownText_0x1b7092 - buttonsound - end - -.Wilton: - farwritetext UnknownText_0x1b722a - buttonsound - end - -.Kenji: - farwritetext UnknownText_0x1b7357 - buttonsound - end - -.Parry: - farwritetext UnknownText_0x1b7417 - buttonsound - end - -PhoneScript_AnswerPhone_Female: - checkday - iftrue PhoneScript_AnswerPhone_Female_Day - checknite - iftrue PhoneScript_AnswerPhone_Female_Nite - checkcode VAR_CALLERID - if_equal PHONE_POKEFAN_BEVERLY, .Beverly - if_equal PHONE_COOLTRAINERF_BETH, .Beth - if_equal PHONE_COOLTRAINERF_REENA, .Reena - if_equal PHONE_PICNICKER_LIZ, .Liz - if_equal PHONE_PICNICKER_GINA, .Gina - if_equal PHONE_LASS_DANA, .Dana - if_equal PHONE_PICNICKER_TIFFANY, .Tiffany - if_equal PHONE_PICNICKER_ERIN, .Erin - -.Beverly: - farwritetext UnknownText_0x1b4f21 - buttonsound - end - -.Beth: - farwritetext UnknownText_0x1b53f7 - buttonsound - end - -.Reena: - farwritetext UnknownText_0x1b5702 - buttonsound - end - -.Liz: - farwritetext UnknownText_0x1b5d9f - buttonsound - end - -.Gina: - farwritetext UnknownText_0x1b626a - buttonsound - end - -.Dana: - farwritetext UnknownText_0x1b66c8 - buttonsound - end - -.Tiffany: - farwritetext UnknownText_0x1b6e7c - buttonsound - end - -.Erin: - farwritetext UnknownText_0x1b751a - buttonsound - end - -PhoneScript_AnswerPhone_Female_Day: - checkcode VAR_CALLERID - if_equal PHONE_POKEFAN_BEVERLY, .Beverly - if_equal PHONE_COOLTRAINERF_BETH, .Beth - if_equal PHONE_COOLTRAINERF_REENA, .Reena - if_equal PHONE_PICNICKER_LIZ, .Liz - if_equal PHONE_PICNICKER_GINA, .Gina - if_equal PHONE_LASS_DANA, .Dana - if_equal PHONE_PICNICKER_TIFFANY, .Tiffany - if_equal PHONE_PICNICKER_ERIN, .Erin - -.Beverly: - farwritetext UnknownText_0x1b4f4d - buttonsound - end - -.Beth: - farwritetext UnknownText_0x1b5424 - buttonsound - end - -.Reena: - farwritetext UnknownText_0x1b572e - buttonsound - end - -.Liz: - farwritetext UnknownText_0x1b5dcc - buttonsound - end - -.Gina: - farwritetext UnknownText_0x1b6296 - buttonsound - end - -.Dana: - farwritetext UnknownText_0x1b66ec - buttonsound - end - -.Tiffany: - farwritetext UnknownText_0x1b6ea6 - buttonsound - end - -.Erin: - farwritetext UnknownText_0x1b7548 - buttonsound - end - -PhoneScript_AnswerPhone_Female_Nite: - checkcode VAR_CALLERID - if_equal PHONE_POKEFAN_BEVERLY, .Beverly - if_equal PHONE_COOLTRAINERF_BETH, .Beth - if_equal PHONE_COOLTRAINERF_REENA, .Reena - if_equal PHONE_PICNICKER_LIZ, .Liz - if_equal PHONE_PICNICKER_GINA, .Gina - if_equal PHONE_LASS_DANA, .Dana - if_equal PHONE_PICNICKER_TIFFANY, .Tiffany - if_equal PHONE_PICNICKER_ERIN, .Erin - -.Beverly: - farwritetext UnknownText_0x1b4f75 - buttonsound - end - -.Beth: - farwritetext UnknownText_0x1b5446 - buttonsound - end - -.Reena: - farwritetext UnknownText_0x1b575a - buttonsound - end - -.Liz: - farwritetext UnknownText_0x1b5df8 - buttonsound - end - -.Gina: - farwritetext UnknownText_0x1b62c5 - buttonsound - end - -.Dana: - farwritetext UnknownText_0x1b6713 - buttonsound - end - -.Tiffany: - farwritetext UnknownText_0x1b6ec9 - buttonsound - end - -.Erin: - farwritetext UnknownText_0x1b756f - buttonsound - end - -PhoneScript_GreetPhone_Male: - checkday - iftrue PhoneScript_GreetPhone_Male_Day - checknite - iftrue PhoneScript_GreetPhone_Male_Nite - checkcode VAR_CALLERID - if_equal PHONE_SCHOOLBOY_JACK, .Jack - if_equal PHONE_SAILOR_HUEY, .Huey - if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven - if_equal PHONE_BIRDKEEPER_JOSE, .Jose - if_equal PHONE_YOUNGSTER_JOEY, .Joey - if_equal PHONE_BUG_CATCHER_WADE, .Wade - if_equal PHONE_FISHER_RALPH, .Ralph - if_equal PHONE_HIKER_ANTHONY, .Anthony - if_equal PHONE_CAMPER_TODD, .Todd - if_equal PHONE_JUGGLER_IRWIN, .Irwin - if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie - if_equal PHONE_SCHOOLBOY_ALAN, .Alan - if_equal PHONE_SCHOOLBOY_CHAD, .Chad - if_equal PHONE_POKEFANM_DEREK, .Derek - if_equal PHONE_FISHER_TULLY, .Tully - if_equal PHONE_POKEMANIAC_BRENT, .Brent - if_equal PHONE_BIRDKEEPER_VANCE, .Vance - if_equal PHONE_FISHER_WILTON, .Wilton - if_equal PHONE_BLACKBELT_KENJI, .Kenji - if_equal PHONE_HIKER_PARRY, .Parry - -.Jack: - farwritetext UnknownText_0x1b4e3e - buttonsound - end - -.Huey: - farwritetext UnknownText_0x1b50e9 - buttonsound - end - -.Gaven: - farwritetext UnknownText_0x1b5301 - buttonsound - end - -.Jose: - farwritetext UnknownText_0x1b5628 - buttonsound - end - -.Joey: - farwritetext UnknownText_0x1b5912 - buttonsound - end - -.Wade: - farwritetext UnknownText_0x1b5ad8 - buttonsound - end - -.Ralph: - farwritetext UnknownText_0x1b5d09 - buttonsound - end - -.Anthony: - farwritetext UnknownText_0x1b5ff6 - buttonsound - end - -.Todd: - farwritetext UnknownText_0x1b616e - buttonsound - end - -.Irwin: - farwritetext UnknownText_0x1b63e3 - buttonsound - end - -.Arnie: - farwritetext UnknownText_0x1b64d2 - buttonsound - end - -.Alan: - farwritetext UnknownText_0x1b660d - buttonsound - end - -.Chad: - farwritetext UnknownText_0x1b6862 - buttonsound - end - -.Derek: - farwritetext UnknownText_0x1b6a22 - buttonsound - end - -.Tully: - farwritetext UnknownText_0x1b6bb9 - buttonsound - end - -.Brent: - farwritetext UnknownText_0x1b6d26 - buttonsound - end - -.Vance: - farwritetext UnknownText_0x1b70e7 - buttonsound - end - -.Wilton: - farwritetext UnknownText_0x1b725c - buttonsound - end - -.Kenji: - farwritetext UnknownText_0x1b737f - buttonsound - end - -.Parry: - farwritetext UnknownText_0x1b743f - buttonsound - end - -PhoneScript_GreetPhone_Male_Day: - checkcode VAR_CALLERID - if_equal PHONE_SCHOOLBOY_JACK, .Jack - if_equal PHONE_SAILOR_HUEY, .Huey - if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven - if_equal PHONE_BIRDKEEPER_JOSE, .Jose - if_equal PHONE_YOUNGSTER_JOEY, .Joey - if_equal PHONE_BUG_CATCHER_WADE, .Wade - if_equal PHONE_FISHER_RALPH, .Ralph - if_equal PHONE_HIKER_ANTHONY, .Anthony - if_equal PHONE_CAMPER_TODD, .Todd - if_equal PHONE_JUGGLER_IRWIN, .Irwin - if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie - if_equal PHONE_SCHOOLBOY_ALAN, .Alan - if_equal PHONE_SCHOOLBOY_CHAD, .Chad - if_equal PHONE_POKEFANM_DEREK, .Derek - if_equal PHONE_FISHER_TULLY, .Tully - if_equal PHONE_POKEMANIAC_BRENT, .Brent - if_equal PHONE_BIRDKEEPER_VANCE, .Vance - if_equal PHONE_FISHER_WILTON, .Wilton - if_equal PHONE_BLACKBELT_KENJI, .Kenji - if_equal PHONE_HIKER_PARRY, .Parry - -.Jack: - farwritetext UnknownText_0x1b4e72 - buttonsound - end - -.Huey: - farwritetext UnknownText_0x1b511a - buttonsound - end - -.Gaven: - farwritetext UnknownText_0x1b5335 - buttonsound - end - -.Jose: - farwritetext UnknownText_0x1b564c - buttonsound - end - -.Joey: - farwritetext UnknownText_0x1b5948 - buttonsound - end - -.Wade: - farwritetext UnknownText_0x1b5b0b - buttonsound - end - -.Ralph: - farwritetext UnknownText_0x1b5d21 - buttonsound - end - -.Anthony: - farwritetext UnknownText_0x1b6017 - buttonsound - end - -.Todd: - farwritetext UnknownText_0x1b618f - buttonsound - end - -.Irwin: - farwritetext UnknownText_0x1b6407 - buttonsound - end - -.Arnie: - farwritetext UnknownText_0x1b6506 - buttonsound - end - -.Alan: - farwritetext UnknownText_0x1b6624 - buttonsound - end - -.Chad: - farwritetext UnknownText_0x1b6890 - buttonsound - end - -.Derek: - farwritetext UnknownText_0x1b6a56 - buttonsound - end - -.Tully: - farwritetext UnknownText_0x1b6bef - buttonsound - end - -.Brent: - farwritetext UnknownText_0x1b6d57 - buttonsound - end - -.Vance: - farwritetext UnknownText_0x1b7112 - buttonsound - end - -.Wilton: - farwritetext UnknownText_0x1b7283 - buttonsound - end - -.Kenji: - farwritetext UnknownText_0x1b7397 - buttonsound - end - -.Parry: - farwritetext UnknownText_0x1b746f - buttonsound - end - -PhoneScript_GreetPhone_Male_Nite: - checkcode VAR_CALLERID - if_equal PHONE_SCHOOLBOY_JACK, .Jack - if_equal PHONE_SAILOR_HUEY, .Huey - if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven - if_equal PHONE_BIRDKEEPER_JOSE, .Jose - if_equal PHONE_YOUNGSTER_JOEY, .Joey - if_equal PHONE_BUG_CATCHER_WADE, .Wade - if_equal PHONE_FISHER_RALPH, .Ralph - if_equal PHONE_HIKER_ANTHONY, .Anthony - if_equal PHONE_CAMPER_TODD, .Todd - if_equal PHONE_JUGGLER_IRWIN, .Irwin - if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie - if_equal PHONE_SCHOOLBOY_ALAN, .Alan - if_equal PHONE_SCHOOLBOY_CHAD, .Chad - if_equal PHONE_POKEFANM_DEREK, .Derek - if_equal PHONE_FISHER_TULLY, .Tully - if_equal PHONE_POKEMANIAC_BRENT, .Brent - if_equal PHONE_BIRDKEEPER_VANCE, .Vance - if_equal PHONE_FISHER_WILTON, .Wilton - if_equal PHONE_BLACKBELT_KENJI, .Kenji - if_equal PHONE_HIKER_PARRY, .Parry - -.Jack: - farwritetext UnknownText_0x1b4e9e - buttonsound - end - -.Huey: - farwritetext UnknownText_0x1b5154 - buttonsound - end - -.Gaven: - farwritetext UnknownText_0x1b535f - buttonsound - end - -.Jose: - farwritetext UnknownText_0x1b5670 - buttonsound - end - -.Joey: - farwritetext UnknownText_0x1b597c - buttonsound - end - -.Wade: - farwritetext UnknownText_0x1b5b37 - buttonsound - end - -.Ralph: - farwritetext UnknownText_0x1b5d39 - buttonsound - end - -.Anthony: - farwritetext UnknownText_0x1b6041 - buttonsound - end - -.Todd: - farwritetext UnknownText_0x1b61bd - buttonsound - end - -.Irwin: - farwritetext UnknownText_0x1b642c - buttonsound - end - -.Arnie: - farwritetext UnknownText_0x1b6539 - buttonsound - end - -.Alan: - farwritetext UnknownText_0x1b663b - buttonsound - end - -.Chad: - farwritetext UnknownText_0x1b68ba - buttonsound - end - -.Derek: - farwritetext UnknownText_0x1b6a8b - buttonsound - end - -.Tully: - farwritetext UnknownText_0x1b6c23 - buttonsound - end - -.Brent: - farwritetext UnknownText_0x1b6d88 - buttonsound - end - -.Vance: - farwritetext UnknownText_0x1b7132 - buttonsound - end - -.Wilton: - farwritetext UnknownText_0x1b72a5 - buttonsound - end - -.Kenji: - farwritetext UnknownText_0x1b73af - buttonsound - end - -.Parry: - farwritetext UnknownText_0x1b749b - buttonsound - end - -PhoneScript_GreetPhone_Female: - checkday - iftrue PhoneScript_GreetPhone_Female_Day - checknite - iftrue PhoneScript_GreetPhone_Female_Nite - checkcode VAR_CALLERID - if_equal PHONE_POKEFAN_BEVERLY, .Beverly - if_equal PHONE_COOLTRAINERF_BETH, .Beth - if_equal PHONE_COOLTRAINERF_REENA, .Reena - if_equal PHONE_PICNICKER_LIZ, .Liz - if_equal PHONE_PICNICKER_GINA, .Gina - if_equal PHONE_LASS_DANA, .Dana - if_equal PHONE_PICNICKER_TIFFANY, .Tiffany - if_equal PHONE_PICNICKER_ERIN, .Erin - -.Beverly: - farwritetext UnknownText_0x1b4fa1 - buttonsound - end - -.Beth: - farwritetext UnknownText_0x1b5472 - buttonsound - end - -.Reena: - farwritetext UnknownText_0x1b5786 - buttonsound - end - -.Liz: - farwritetext UnknownText_0x1b5e25 - buttonsound - end - -.Gina: - farwritetext UnknownText_0x1b62f1 - buttonsound - end - -.Dana: - farwritetext UnknownText_0x1b6738 - buttonsound - end - -.Tiffany: - farwritetext UnknownText_0x1b6ef3 - buttonsound - end - -.Erin: - farwritetext UnknownText_0x1b758f - buttonsound - end - -PhoneScript_GreetPhone_Female_Day: - checkcode VAR_CALLERID - if_equal PHONE_POKEFAN_BEVERLY, .Beverly - if_equal PHONE_COOLTRAINERF_BETH, .Beth - if_equal PHONE_COOLTRAINERF_REENA, .Reena - if_equal PHONE_PICNICKER_LIZ, .Liz - if_equal PHONE_PICNICKER_GINA, .Gina - if_equal PHONE_LASS_DANA, .Dana - if_equal PHONE_PICNICKER_TIFFANY, .Tiffany - if_equal PHONE_PICNICKER_ERIN, .Erin - -.Beverly: - farwritetext UnknownText_0x1b4fda - buttonsound - end - -.Beth: - farwritetext UnknownText_0x1b54a6 - buttonsound - end - -.Reena: - farwritetext UnknownText_0x1b57b7 - buttonsound - end - -.Liz: - farwritetext UnknownText_0x1b5e59 - buttonsound - end - -.Gina: - farwritetext UnknownText_0x1b630e - buttonsound - end - -.Dana: - farwritetext UnknownText_0x1b6757 - buttonsound - end - -.Tiffany: - farwritetext UnknownText_0x1b6f1c - buttonsound - end - -.Erin: - farwritetext UnknownText_0x1b75ac - buttonsound - end - -PhoneScript_GreetPhone_Female_Nite: - checkcode VAR_CALLERID - if_equal PHONE_POKEFAN_BEVERLY, .Beverly - if_equal PHONE_COOLTRAINERF_BETH, .Beth - if_equal PHONE_COOLTRAINERF_REENA, .Reena - if_equal PHONE_PICNICKER_LIZ, .Liz - if_equal PHONE_PICNICKER_GINA, .Gina - if_equal PHONE_LASS_DANA, .Dana - if_equal PHONE_PICNICKER_TIFFANY, .Tiffany - if_equal PHONE_PICNICKER_ERIN, .Erin - -.Beverly: - farwritetext UnknownText_0x1b5004 - buttonsound - end - -.Beth: - farwritetext UnknownText_0x1b54d4 - buttonsound - end - -.Reena: - farwritetext UnknownText_0x1b57e8 - buttonsound - end - -.Liz: - farwritetext UnknownText_0x1b5e8e - buttonsound - end - -.Gina: - farwritetext UnknownText_0x1b6331 - buttonsound - end - -.Dana: - farwritetext UnknownText_0x1b6776 - buttonsound - end - -.Tiffany: - farwritetext UnknownText_0x1b6f37 - buttonsound - end - -.Erin: - farwritetext UnknownText_0x1b75c9 - buttonsound - end - -PhoneScript_Generic_Male: - checkcode VAR_CALLERID - if_equal PHONE_SCHOOLBOY_JACK, .Jack - if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven - if_equal PHONE_BIRDKEEPER_JOSE, .Jose - if_equal PHONE_YOUNGSTER_JOEY, .Joey - if_equal PHONE_BUG_CATCHER_WADE, .Wade - if_equal PHONE_FISHER_RALPH, .Ralph - if_equal PHONE_HIKER_ANTHONY, .Anthony - if_equal PHONE_CAMPER_TODD, .Todd - if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie - if_equal PHONE_SCHOOLBOY_ALAN, .Alan - if_equal PHONE_SCHOOLBOY_CHAD, .Chad - if_equal PHONE_POKEFANM_DEREK, .Derek - if_equal PHONE_FISHER_TULLY, .Tully - if_equal PHONE_POKEMANIAC_BRENT, .Brent - if_equal PHONE_BIRDKEEPER_VANCE, .Vance - if_equal PHONE_FISHER_WILTON, .Wilton - if_equal PHONE_HIKER_PARRY, .Parry - -.Jack: - farwritetext UnknownText_0x1b4ecd - buttonsound - end - -.Unknown: - farwritetext UnknownText_0x1b518b - buttonsound - end - -.Gaven: - farwritetext UnknownText_0x1b5393 - buttonsound - end - -.Jose: - farwritetext UnknownText_0x1b5694 - buttonsound - end - -.Joey: - farwritetext UnknownText_0x1b59b2 - buttonsound - end - -.Wade: - farwritetext UnknownText_0x1b5b68 - buttonsound - end - -.Ralph: - farwritetext UnknownText_0x1b5d51 - buttonsound - end - -.Anthony: - farwritetext UnknownText_0x1b606f - buttonsound - end - -.Todd: - farwritetext UnknownText_0x1b61f2 - buttonsound - end - -.Arnie: - farwritetext UnknownText_0x1b656c - buttonsound - end - -.Alan: - farwritetext UnknownText_0x1b6652 - buttonsound - end - -.Chad: - farwritetext UnknownText_0x1b68e8 - buttonsound - end - -.Derek: - farwritetext UnknownText_0x1b6ac2 - buttonsound - end - -.Tully: - farwritetext UnknownText_0x1b6c56 - buttonsound - end - -.Brent: - farwritetext UnknownText_0x1b6db9 - buttonsound - end - -.Vance: - farwritetext UnknownText_0x1b7161 - buttonsound - end - -.Wilton: - farwritetext UnknownText_0x1b72d0 - buttonsound - end - -.Parry: - farwritetext UnknownText_0x1b74c8 - buttonsound - end - -PhoneScript_Generic_Female: - checkcode VAR_CALLERID - if_equal PHONE_POKEFAN_BEVERLY, .Beverly - if_equal PHONE_COOLTRAINERF_BETH, .Beth - if_equal PHONE_COOLTRAINERF_REENA, .Reena - if_equal PHONE_PICNICKER_LIZ, .Liz - if_equal PHONE_PICNICKER_GINA, .Gina - if_equal PHONE_LASS_DANA, .Dana - if_equal PHONE_PICNICKER_TIFFANY, .Tiffany - if_equal PHONE_PICNICKER_ERIN, .Erin - -.Beverly: - farwritetext UnknownText_0x1b502b - buttonsound - end - -.Beth: - farwritetext UnknownText_0x1b5510 - buttonsound - end - -.Reena: - farwritetext UnknownText_0x1b5819 - buttonsound - end - -.Liz: - farwritetext UnknownText_0x1b5ebe - buttonsound - end - -.Gina: - farwritetext UnknownText_0x1b6352 - buttonsound - end - -.Dana: - farwritetext UnknownText_0x1b6795 - buttonsound - end - -.Tiffany: - farwritetext UnknownText_0x1b6f60 - buttonsound - end - -.Erin: - farwritetext UnknownText_0x1b75e5 - buttonsound - end - -PhoneScript_MonFlavorText: - special RandomPhoneMon - farscall PhoneScript_Random2 - if_equal $0, .TooEnergetic - farwritetext UnknownText_0x1b518b - buttonsound - farjump PhoneScript_HangupText_Male - -.TooEnergetic: - farjump .unnecessary - -.unnecessary - farwritetext UnknownText_0x1b522b - buttonsound - farjump PhoneScript_HangupText_Male -; be643 - - -String_be643: db "Grandma@" -String_be64b: db "Grandpa@" -String_be653: db "Mom@" -String_be657: db "Dad@" -String_be65b: db "Sister@" -String_be662: db "Brother@" - diff --git a/engine/phone_scripts_generic.asm b/engine/phone_scripts_generic.asm new file mode 100644 index 000000000..b4ef2ba9e --- /dev/null +++ b/engine/phone_scripts_generic.asm @@ -0,0 +1,1266 @@ +PhoneScript_Random2: + random 2 + end + +PhoneScript_Random3: + random 3 + end + +PhoneScript_Random4: + random 4 + end + +PhoneScript_Random5: + random 5 + end + +PhoneScript_Random11: + random 11 + end + +PhoneScript_AnswerPhone_Male: + checkday + iftrue PhoneScript_AnswerPhone_Male_Day + checknite + iftrue PhoneScript_AnswerPhone_Male_Nite + checkcode VAR_CALLERID + if_equal PHONE_SCHOOLBOY_JACK, .Jack + if_equal PHONE_SAILOR_HUEY, .Huey + if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven + if_equal PHONE_BIRDKEEPER_JOSE, .Jose + if_equal PHONE_YOUNGSTER_JOEY, .Joey + if_equal PHONE_BUG_CATCHER_WADE, .Wade + if_equal PHONE_FISHER_RALPH, .Ralph + if_equal PHONE_HIKER_ANTHONY, .Anthony + if_equal PHONE_CAMPER_TODD, .Todd + if_equal PHONE_JUGGLER_IRWIN, .Irwin + if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie + if_equal PHONE_SCHOOLBOY_ALAN, .Alan + if_equal PHONE_SCHOOLBOY_CHAD, .Chad + if_equal PHONE_POKEFANM_DEREK, .Derek + if_equal PHONE_FISHER_TULLY, .Tully + if_equal PHONE_POKEMANIAC_BRENT, .Brent + if_equal PHONE_BIRDKEEPER_VANCE, .Vance + if_equal PHONE_FISHER_WILTON, .Wilton + if_equal PHONE_BLACKBELT_KENJI, .Kenji + if_equal PHONE_HIKER_PARRY, .Parry + +.Jack: + farwritetext UnknownText_0x1b4dc5 + buttonsound + end + +.Huey: + farwritetext UnknownText_0x1b5073 + buttonsound + end + +.Gaven: + farwritetext UnknownText_0x1b5270 + buttonsound + end + +.Jose: + farwritetext UnknownText_0x1b55ae + buttonsound + end + +.Joey: + farwritetext UnknownText_0x1b589a + buttonsound + end + +.Wade: + farwritetext UnknownText_0x1b5a3b + buttonsound + end + +.Ralph: + farwritetext UnknownText_0x1b5c10 + buttonsound + end + +.Anthony: + farwritetext UnknownText_0x1b5f7a + buttonsound + end + +.Todd: + farwritetext UnknownText_0x1b60f5 + buttonsound + end + +.Irwin: + farwritetext UnknownText_0x1b638c + buttonsound + end + +.Arnie: + farwritetext UnknownText_0x1b6454 + buttonsound + end + +.Alan: + farwritetext UnknownText_0x1b659d + buttonsound + end + +.Chad: + farwritetext UnknownText_0x1b67e2 + buttonsound + end + +.Derek: + farwritetext UnknownText_0x1b69a8 + buttonsound + end + +.Tully: + farwritetext UnknownText_0x1b6b39 + buttonsound + end + +.Brent: + farwritetext UnknownText_0x1b6c96 + buttonsound + end + +.Vance: + farwritetext UnknownText_0x1b7019 + buttonsound + end + +.Wilton: + farwritetext UnknownText_0x1b71d5 + buttonsound + end + +.Kenji: + farwritetext UnknownText_0x1b730b + buttonsound + end + +.Parry: + farwritetext UnknownText_0x1b73c7 + buttonsound + end + +PhoneScript_AnswerPhone_Male_Day: + checkcode VAR_CALLERID + if_equal PHONE_SCHOOLBOY_JACK, .Jack + if_equal PHONE_SAILOR_HUEY, .Huey + if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven + if_equal PHONE_BIRDKEEPER_JOSE, .Jose + if_equal PHONE_YOUNGSTER_JOEY, .Joey + if_equal PHONE_BUG_CATCHER_WADE, .Wade + if_equal PHONE_FISHER_RALPH, .Ralph + if_equal PHONE_HIKER_ANTHONY, .Anthony + if_equal PHONE_CAMPER_TODD, .Todd + if_equal PHONE_JUGGLER_IRWIN, .Irwin + if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie + if_equal PHONE_SCHOOLBOY_ALAN, .Alan + if_equal PHONE_SCHOOLBOY_CHAD, .Chad + if_equal PHONE_POKEFANM_DEREK, .Derek + if_equal PHONE_FISHER_TULLY, .Tully + if_equal PHONE_POKEMANIAC_BRENT, .Brent + if_equal PHONE_BIRDKEEPER_VANCE, .Vance + if_equal PHONE_FISHER_WILTON, .Wilton + if_equal PHONE_BLACKBELT_KENJI, .Kenji + if_equal PHONE_HIKER_PARRY, .Parry + +.Jack: + farwritetext UnknownText_0x1b4ded + buttonsound + end + +.Huey: + farwritetext UnknownText_0x1b509b + buttonsound + end + +.Gaven: + farwritetext UnknownText_0x1b52a5 + buttonsound + end + +.Jose: + farwritetext UnknownText_0x1b55da + buttonsound + end + +.Joey: + farwritetext UnknownText_0x1b58c2 + buttonsound + end + +.Wade: + farwritetext UnknownText_0x1b5a74 + buttonsound + end + +.Ralph: + farwritetext UnknownText_0x1b5c63 + buttonsound + end + +.Anthony: + farwritetext UnknownText_0x1b5f9e + buttonsound + end + +.Todd: + farwritetext UnknownText_0x1b611b + buttonsound + end + +.Irwin: + farwritetext UnknownText_0x1b63a8 + buttonsound + end + +.Arnie: + farwritetext UnknownText_0x1b647e + buttonsound + end + +.Alan: + farwritetext UnknownText_0x1b65c7 + buttonsound + end + +.Chad: + farwritetext UnknownText_0x1b680e + buttonsound + end + +.Derek: + farwritetext UnknownText_0x1b69d2 + buttonsound + end + +.Tully: + farwritetext UnknownText_0x1b6b65 + buttonsound + end + +.Brent: + farwritetext UnknownText_0x1b6cc6 + buttonsound + end + +.Vance: + farwritetext UnknownText_0x1b7057 + buttonsound + end + +.Wilton: + farwritetext UnknownText_0x1b71fc + buttonsound + end + +.Kenji: + farwritetext UnknownText_0x1b7331 + buttonsound + end + +.Parry: + farwritetext UnknownText_0x1b73ef + buttonsound + end + +PhoneScript_AnswerPhone_Male_Nite: + checkcode VAR_CALLERID + if_equal PHONE_SCHOOLBOY_JACK, .Jack + if_equal PHONE_SAILOR_HUEY, .Huey + if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven + if_equal PHONE_BIRDKEEPER_JOSE, .Jose + if_equal PHONE_YOUNGSTER_JOEY, .Joey + if_equal PHONE_BUG_CATCHER_WADE, .Wade + if_equal PHONE_FISHER_RALPH, .Ralph + if_equal PHONE_HIKER_ANTHONY, .Anthony + if_equal PHONE_CAMPER_TODD, .Todd + if_equal PHONE_JUGGLER_IRWIN, .Irwin + if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie + if_equal PHONE_SCHOOLBOY_ALAN, .Alan + if_equal PHONE_SCHOOLBOY_CHAD, .Chad + if_equal PHONE_POKEFANM_DEREK, .Derek + if_equal PHONE_FISHER_TULLY, .Tully + if_equal PHONE_POKEMANIAC_BRENT, .Brent + if_equal PHONE_BIRDKEEPER_VANCE, .Vance + if_equal PHONE_FISHER_WILTON, .Wilton + if_equal PHONE_BLACKBELT_KENJI, .Kenji + if_equal PHONE_HIKER_PARRY, .Parry + +.Jack: + farwritetext UnknownText_0x1b4e16 + buttonsound + end + +.Huey: + farwritetext UnknownText_0x1b50c2 + buttonsound + end + +.Gaven: + farwritetext UnknownText_0x1b52cc + buttonsound + end + +.Jose: + farwritetext UnknownText_0x1b55fc + buttonsound + end + +.Joey: + farwritetext UnknownText_0x1b58ea + buttonsound + end + +.Wade: + farwritetext UnknownText_0x1b5a9f + buttonsound + end + +.Ralph: + farwritetext UnknownText_0x1b5cb6 + buttonsound + end + +.Anthony: + farwritetext UnknownText_0x1b5fc9 + buttonsound + end + +.Todd: + farwritetext UnknownText_0x1b6149 + buttonsound + end + +.Irwin: + farwritetext UnknownText_0x1b63c4 + buttonsound + end + +.Arnie: + farwritetext UnknownText_0x1b64a8 + buttonsound + end + +.Alan: + farwritetext UnknownText_0x1b65e3 + buttonsound + end + +.Chad: + farwritetext UnknownText_0x1b6836 + buttonsound + end + +.Derek: + farwritetext UnknownText_0x1b69f8 + buttonsound + end + +.Tully: + farwritetext UnknownText_0x1b6b92 + buttonsound + end + +.Brent: + farwritetext UnknownText_0x1b6cf6 + buttonsound + end + +.Vance: + farwritetext UnknownText_0x1b7092 + buttonsound + end + +.Wilton: + farwritetext UnknownText_0x1b722a + buttonsound + end + +.Kenji: + farwritetext UnknownText_0x1b7357 + buttonsound + end + +.Parry: + farwritetext UnknownText_0x1b7417 + buttonsound + end + +PhoneScript_AnswerPhone_Female: + checkday + iftrue PhoneScript_AnswerPhone_Female_Day + checknite + iftrue PhoneScript_AnswerPhone_Female_Nite + checkcode VAR_CALLERID + if_equal PHONE_POKEFAN_BEVERLY, .Beverly + if_equal PHONE_COOLTRAINERF_BETH, .Beth + if_equal PHONE_COOLTRAINERF_REENA, .Reena + if_equal PHONE_PICNICKER_LIZ, .Liz + if_equal PHONE_PICNICKER_GINA, .Gina + if_equal PHONE_LASS_DANA, .Dana + if_equal PHONE_PICNICKER_TIFFANY, .Tiffany + if_equal PHONE_PICNICKER_ERIN, .Erin + +.Beverly: + farwritetext UnknownText_0x1b4f21 + buttonsound + end + +.Beth: + farwritetext UnknownText_0x1b53f7 + buttonsound + end + +.Reena: + farwritetext UnknownText_0x1b5702 + buttonsound + end + +.Liz: + farwritetext UnknownText_0x1b5d9f + buttonsound + end + +.Gina: + farwritetext UnknownText_0x1b626a + buttonsound + end + +.Dana: + farwritetext UnknownText_0x1b66c8 + buttonsound + end + +.Tiffany: + farwritetext UnknownText_0x1b6e7c + buttonsound + end + +.Erin: + farwritetext UnknownText_0x1b751a + buttonsound + end + +PhoneScript_AnswerPhone_Female_Day: + checkcode VAR_CALLERID + if_equal PHONE_POKEFAN_BEVERLY, .Beverly + if_equal PHONE_COOLTRAINERF_BETH, .Beth + if_equal PHONE_COOLTRAINERF_REENA, .Reena + if_equal PHONE_PICNICKER_LIZ, .Liz + if_equal PHONE_PICNICKER_GINA, .Gina + if_equal PHONE_LASS_DANA, .Dana + if_equal PHONE_PICNICKER_TIFFANY, .Tiffany + if_equal PHONE_PICNICKER_ERIN, .Erin + +.Beverly: + farwritetext UnknownText_0x1b4f4d + buttonsound + end + +.Beth: + farwritetext UnknownText_0x1b5424 + buttonsound + end + +.Reena: + farwritetext UnknownText_0x1b572e + buttonsound + end + +.Liz: + farwritetext UnknownText_0x1b5dcc + buttonsound + end + +.Gina: + farwritetext UnknownText_0x1b6296 + buttonsound + end + +.Dana: + farwritetext UnknownText_0x1b66ec + buttonsound + end + +.Tiffany: + farwritetext UnknownText_0x1b6ea6 + buttonsound + end + +.Erin: + farwritetext UnknownText_0x1b7548 + buttonsound + end + +PhoneScript_AnswerPhone_Female_Nite: + checkcode VAR_CALLERID + if_equal PHONE_POKEFAN_BEVERLY, .Beverly + if_equal PHONE_COOLTRAINERF_BETH, .Beth + if_equal PHONE_COOLTRAINERF_REENA, .Reena + if_equal PHONE_PICNICKER_LIZ, .Liz + if_equal PHONE_PICNICKER_GINA, .Gina + if_equal PHONE_LASS_DANA, .Dana + if_equal PHONE_PICNICKER_TIFFANY, .Tiffany + if_equal PHONE_PICNICKER_ERIN, .Erin + +.Beverly: + farwritetext UnknownText_0x1b4f75 + buttonsound + end + +.Beth: + farwritetext UnknownText_0x1b5446 + buttonsound + end + +.Reena: + farwritetext UnknownText_0x1b575a + buttonsound + end + +.Liz: + farwritetext UnknownText_0x1b5df8 + buttonsound + end + +.Gina: + farwritetext UnknownText_0x1b62c5 + buttonsound + end + +.Dana: + farwritetext UnknownText_0x1b6713 + buttonsound + end + +.Tiffany: + farwritetext UnknownText_0x1b6ec9 + buttonsound + end + +.Erin: + farwritetext UnknownText_0x1b756f + buttonsound + end + +PhoneScript_GreetPhone_Male: + checkday + iftrue PhoneScript_GreetPhone_Male_Day + checknite + iftrue PhoneScript_GreetPhone_Male_Nite + checkcode VAR_CALLERID + if_equal PHONE_SCHOOLBOY_JACK, .Jack + if_equal PHONE_SAILOR_HUEY, .Huey + if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven + if_equal PHONE_BIRDKEEPER_JOSE, .Jose + if_equal PHONE_YOUNGSTER_JOEY, .Joey + if_equal PHONE_BUG_CATCHER_WADE, .Wade + if_equal PHONE_FISHER_RALPH, .Ralph + if_equal PHONE_HIKER_ANTHONY, .Anthony + if_equal PHONE_CAMPER_TODD, .Todd + if_equal PHONE_JUGGLER_IRWIN, .Irwin + if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie + if_equal PHONE_SCHOOLBOY_ALAN, .Alan + if_equal PHONE_SCHOOLBOY_CHAD, .Chad + if_equal PHONE_POKEFANM_DEREK, .Derek + if_equal PHONE_FISHER_TULLY, .Tully + if_equal PHONE_POKEMANIAC_BRENT, .Brent + if_equal PHONE_BIRDKEEPER_VANCE, .Vance + if_equal PHONE_FISHER_WILTON, .Wilton + if_equal PHONE_BLACKBELT_KENJI, .Kenji + if_equal PHONE_HIKER_PARRY, .Parry + +.Jack: + farwritetext UnknownText_0x1b4e3e + buttonsound + end + +.Huey: + farwritetext UnknownText_0x1b50e9 + buttonsound + end + +.Gaven: + farwritetext UnknownText_0x1b5301 + buttonsound + end + +.Jose: + farwritetext UnknownText_0x1b5628 + buttonsound + end + +.Joey: + farwritetext UnknownText_0x1b5912 + buttonsound + end + +.Wade: + farwritetext UnknownText_0x1b5ad8 + buttonsound + end + +.Ralph: + farwritetext UnknownText_0x1b5d09 + buttonsound + end + +.Anthony: + farwritetext UnknownText_0x1b5ff6 + buttonsound + end + +.Todd: + farwritetext UnknownText_0x1b616e + buttonsound + end + +.Irwin: + farwritetext UnknownText_0x1b63e3 + buttonsound + end + +.Arnie: + farwritetext UnknownText_0x1b64d2 + buttonsound + end + +.Alan: + farwritetext UnknownText_0x1b660d + buttonsound + end + +.Chad: + farwritetext UnknownText_0x1b6862 + buttonsound + end + +.Derek: + farwritetext UnknownText_0x1b6a22 + buttonsound + end + +.Tully: + farwritetext UnknownText_0x1b6bb9 + buttonsound + end + +.Brent: + farwritetext UnknownText_0x1b6d26 + buttonsound + end + +.Vance: + farwritetext UnknownText_0x1b70e7 + buttonsound + end + +.Wilton: + farwritetext UnknownText_0x1b725c + buttonsound + end + +.Kenji: + farwritetext UnknownText_0x1b737f + buttonsound + end + +.Parry: + farwritetext UnknownText_0x1b743f + buttonsound + end + +PhoneScript_GreetPhone_Male_Day: + checkcode VAR_CALLERID + if_equal PHONE_SCHOOLBOY_JACK, .Jack + if_equal PHONE_SAILOR_HUEY, .Huey + if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven + if_equal PHONE_BIRDKEEPER_JOSE, .Jose + if_equal PHONE_YOUNGSTER_JOEY, .Joey + if_equal PHONE_BUG_CATCHER_WADE, .Wade + if_equal PHONE_FISHER_RALPH, .Ralph + if_equal PHONE_HIKER_ANTHONY, .Anthony + if_equal PHONE_CAMPER_TODD, .Todd + if_equal PHONE_JUGGLER_IRWIN, .Irwin + if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie + if_equal PHONE_SCHOOLBOY_ALAN, .Alan + if_equal PHONE_SCHOOLBOY_CHAD, .Chad + if_equal PHONE_POKEFANM_DEREK, .Derek + if_equal PHONE_FISHER_TULLY, .Tully + if_equal PHONE_POKEMANIAC_BRENT, .Brent + if_equal PHONE_BIRDKEEPER_VANCE, .Vance + if_equal PHONE_FISHER_WILTON, .Wilton + if_equal PHONE_BLACKBELT_KENJI, .Kenji + if_equal PHONE_HIKER_PARRY, .Parry + +.Jack: + farwritetext UnknownText_0x1b4e72 + buttonsound + end + +.Huey: + farwritetext UnknownText_0x1b511a + buttonsound + end + +.Gaven: + farwritetext UnknownText_0x1b5335 + buttonsound + end + +.Jose: + farwritetext UnknownText_0x1b564c + buttonsound + end + +.Joey: + farwritetext UnknownText_0x1b5948 + buttonsound + end + +.Wade: + farwritetext UnknownText_0x1b5b0b + buttonsound + end + +.Ralph: + farwritetext UnknownText_0x1b5d21 + buttonsound + end + +.Anthony: + farwritetext UnknownText_0x1b6017 + buttonsound + end + +.Todd: + farwritetext UnknownText_0x1b618f + buttonsound + end + +.Irwin: + farwritetext UnknownText_0x1b6407 + buttonsound + end + +.Arnie: + farwritetext UnknownText_0x1b6506 + buttonsound + end + +.Alan: + farwritetext UnknownText_0x1b6624 + buttonsound + end + +.Chad: + farwritetext UnknownText_0x1b6890 + buttonsound + end + +.Derek: + farwritetext UnknownText_0x1b6a56 + buttonsound + end + +.Tully: + farwritetext UnknownText_0x1b6bef + buttonsound + end + +.Brent: + farwritetext UnknownText_0x1b6d57 + buttonsound + end + +.Vance: + farwritetext UnknownText_0x1b7112 + buttonsound + end + +.Wilton: + farwritetext UnknownText_0x1b7283 + buttonsound + end + +.Kenji: + farwritetext UnknownText_0x1b7397 + buttonsound + end + +.Parry: + farwritetext UnknownText_0x1b746f + buttonsound + end + +PhoneScript_GreetPhone_Male_Nite: + checkcode VAR_CALLERID + if_equal PHONE_SCHOOLBOY_JACK, .Jack + if_equal PHONE_SAILOR_HUEY, .Huey + if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven + if_equal PHONE_BIRDKEEPER_JOSE, .Jose + if_equal PHONE_YOUNGSTER_JOEY, .Joey + if_equal PHONE_BUG_CATCHER_WADE, .Wade + if_equal PHONE_FISHER_RALPH, .Ralph + if_equal PHONE_HIKER_ANTHONY, .Anthony + if_equal PHONE_CAMPER_TODD, .Todd + if_equal PHONE_JUGGLER_IRWIN, .Irwin + if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie + if_equal PHONE_SCHOOLBOY_ALAN, .Alan + if_equal PHONE_SCHOOLBOY_CHAD, .Chad + if_equal PHONE_POKEFANM_DEREK, .Derek + if_equal PHONE_FISHER_TULLY, .Tully + if_equal PHONE_POKEMANIAC_BRENT, .Brent + if_equal PHONE_BIRDKEEPER_VANCE, .Vance + if_equal PHONE_FISHER_WILTON, .Wilton + if_equal PHONE_BLACKBELT_KENJI, .Kenji + if_equal PHONE_HIKER_PARRY, .Parry + +.Jack: + farwritetext UnknownText_0x1b4e9e + buttonsound + end + +.Huey: + farwritetext UnknownText_0x1b5154 + buttonsound + end + +.Gaven: + farwritetext UnknownText_0x1b535f + buttonsound + end + +.Jose: + farwritetext UnknownText_0x1b5670 + buttonsound + end + +.Joey: + farwritetext UnknownText_0x1b597c + buttonsound + end + +.Wade: + farwritetext UnknownText_0x1b5b37 + buttonsound + end + +.Ralph: + farwritetext UnknownText_0x1b5d39 + buttonsound + end + +.Anthony: + farwritetext UnknownText_0x1b6041 + buttonsound + end + +.Todd: + farwritetext UnknownText_0x1b61bd + buttonsound + end + +.Irwin: + farwritetext UnknownText_0x1b642c + buttonsound + end + +.Arnie: + farwritetext UnknownText_0x1b6539 + buttonsound + end + +.Alan: + farwritetext UnknownText_0x1b663b + buttonsound + end + +.Chad: + farwritetext UnknownText_0x1b68ba + buttonsound + end + +.Derek: + farwritetext UnknownText_0x1b6a8b + buttonsound + end + +.Tully: + farwritetext UnknownText_0x1b6c23 + buttonsound + end + +.Brent: + farwritetext UnknownText_0x1b6d88 + buttonsound + end + +.Vance: + farwritetext UnknownText_0x1b7132 + buttonsound + end + +.Wilton: + farwritetext UnknownText_0x1b72a5 + buttonsound + end + +.Kenji: + farwritetext UnknownText_0x1b73af + buttonsound + end + +.Parry: + farwritetext UnknownText_0x1b749b + buttonsound + end + +PhoneScript_GreetPhone_Female: + checkday + iftrue PhoneScript_GreetPhone_Female_Day + checknite + iftrue PhoneScript_GreetPhone_Female_Nite + checkcode VAR_CALLERID + if_equal PHONE_POKEFAN_BEVERLY, .Beverly + if_equal PHONE_COOLTRAINERF_BETH, .Beth + if_equal PHONE_COOLTRAINERF_REENA, .Reena + if_equal PHONE_PICNICKER_LIZ, .Liz + if_equal PHONE_PICNICKER_GINA, .Gina + if_equal PHONE_LASS_DANA, .Dana + if_equal PHONE_PICNICKER_TIFFANY, .Tiffany + if_equal PHONE_PICNICKER_ERIN, .Erin + +.Beverly: + farwritetext UnknownText_0x1b4fa1 + buttonsound + end + +.Beth: + farwritetext UnknownText_0x1b5472 + buttonsound + end + +.Reena: + farwritetext UnknownText_0x1b5786 + buttonsound + end + +.Liz: + farwritetext UnknownText_0x1b5e25 + buttonsound + end + +.Gina: + farwritetext UnknownText_0x1b62f1 + buttonsound + end + +.Dana: + farwritetext UnknownText_0x1b6738 + buttonsound + end + +.Tiffany: + farwritetext UnknownText_0x1b6ef3 + buttonsound + end + +.Erin: + farwritetext UnknownText_0x1b758f + buttonsound + end + +PhoneScript_GreetPhone_Female_Day: + checkcode VAR_CALLERID + if_equal PHONE_POKEFAN_BEVERLY, .Beverly + if_equal PHONE_COOLTRAINERF_BETH, .Beth + if_equal PHONE_COOLTRAINERF_REENA, .Reena + if_equal PHONE_PICNICKER_LIZ, .Liz + if_equal PHONE_PICNICKER_GINA, .Gina + if_equal PHONE_LASS_DANA, .Dana + if_equal PHONE_PICNICKER_TIFFANY, .Tiffany + if_equal PHONE_PICNICKER_ERIN, .Erin + +.Beverly: + farwritetext UnknownText_0x1b4fda + buttonsound + end + +.Beth: + farwritetext UnknownText_0x1b54a6 + buttonsound + end + +.Reena: + farwritetext UnknownText_0x1b57b7 + buttonsound + end + +.Liz: + farwritetext UnknownText_0x1b5e59 + buttonsound + end + +.Gina: + farwritetext UnknownText_0x1b630e + buttonsound + end + +.Dana: + farwritetext UnknownText_0x1b6757 + buttonsound + end + +.Tiffany: + farwritetext UnknownText_0x1b6f1c + buttonsound + end + +.Erin: + farwritetext UnknownText_0x1b75ac + buttonsound + end + +PhoneScript_GreetPhone_Female_Nite: + checkcode VAR_CALLERID + if_equal PHONE_POKEFAN_BEVERLY, .Beverly + if_equal PHONE_COOLTRAINERF_BETH, .Beth + if_equal PHONE_COOLTRAINERF_REENA, .Reena + if_equal PHONE_PICNICKER_LIZ, .Liz + if_equal PHONE_PICNICKER_GINA, .Gina + if_equal PHONE_LASS_DANA, .Dana + if_equal PHONE_PICNICKER_TIFFANY, .Tiffany + if_equal PHONE_PICNICKER_ERIN, .Erin + +.Beverly: + farwritetext UnknownText_0x1b5004 + buttonsound + end + +.Beth: + farwritetext UnknownText_0x1b54d4 + buttonsound + end + +.Reena: + farwritetext UnknownText_0x1b57e8 + buttonsound + end + +.Liz: + farwritetext UnknownText_0x1b5e8e + buttonsound + end + +.Gina: + farwritetext UnknownText_0x1b6331 + buttonsound + end + +.Dana: + farwritetext UnknownText_0x1b6776 + buttonsound + end + +.Tiffany: + farwritetext UnknownText_0x1b6f37 + buttonsound + end + +.Erin: + farwritetext UnknownText_0x1b75c9 + buttonsound + end + +PhoneScript_Generic_Male: + checkcode VAR_CALLERID + if_equal PHONE_SCHOOLBOY_JACK, .Jack + if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven + if_equal PHONE_BIRDKEEPER_JOSE, .Jose + if_equal PHONE_YOUNGSTER_JOEY, .Joey + if_equal PHONE_BUG_CATCHER_WADE, .Wade + if_equal PHONE_FISHER_RALPH, .Ralph + if_equal PHONE_HIKER_ANTHONY, .Anthony + if_equal PHONE_CAMPER_TODD, .Todd + if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie + if_equal PHONE_SCHOOLBOY_ALAN, .Alan + if_equal PHONE_SCHOOLBOY_CHAD, .Chad + if_equal PHONE_POKEFANM_DEREK, .Derek + if_equal PHONE_FISHER_TULLY, .Tully + if_equal PHONE_POKEMANIAC_BRENT, .Brent + if_equal PHONE_BIRDKEEPER_VANCE, .Vance + if_equal PHONE_FISHER_WILTON, .Wilton + if_equal PHONE_HIKER_PARRY, .Parry + +.Jack: + farwritetext UnknownText_0x1b4ecd + buttonsound + end + +.Unknown: + farwritetext UnknownText_0x1b518b + buttonsound + end + +.Gaven: + farwritetext UnknownText_0x1b5393 + buttonsound + end + +.Jose: + farwritetext UnknownText_0x1b5694 + buttonsound + end + +.Joey: + farwritetext UnknownText_0x1b59b2 + buttonsound + end + +.Wade: + farwritetext UnknownText_0x1b5b68 + buttonsound + end + +.Ralph: + farwritetext UnknownText_0x1b5d51 + buttonsound + end + +.Anthony: + farwritetext UnknownText_0x1b606f + buttonsound + end + +.Todd: + farwritetext UnknownText_0x1b61f2 + buttonsound + end + +.Arnie: + farwritetext UnknownText_0x1b656c + buttonsound + end + +.Alan: + farwritetext UnknownText_0x1b6652 + buttonsound + end + +.Chad: + farwritetext UnknownText_0x1b68e8 + buttonsound + end + +.Derek: + farwritetext UnknownText_0x1b6ac2 + buttonsound + end + +.Tully: + farwritetext UnknownText_0x1b6c56 + buttonsound + end + +.Brent: + farwritetext UnknownText_0x1b6db9 + buttonsound + end + +.Vance: + farwritetext UnknownText_0x1b7161 + buttonsound + end + +.Wilton: + farwritetext UnknownText_0x1b72d0 + buttonsound + end + +.Parry: + farwritetext UnknownText_0x1b74c8 + buttonsound + end + +PhoneScript_Generic_Female: + checkcode VAR_CALLERID + if_equal PHONE_POKEFAN_BEVERLY, .Beverly + if_equal PHONE_COOLTRAINERF_BETH, .Beth + if_equal PHONE_COOLTRAINERF_REENA, .Reena + if_equal PHONE_PICNICKER_LIZ, .Liz + if_equal PHONE_PICNICKER_GINA, .Gina + if_equal PHONE_LASS_DANA, .Dana + if_equal PHONE_PICNICKER_TIFFANY, .Tiffany + if_equal PHONE_PICNICKER_ERIN, .Erin + +.Beverly: + farwritetext UnknownText_0x1b502b + buttonsound + end + +.Beth: + farwritetext UnknownText_0x1b5510 + buttonsound + end + +.Reena: + farwritetext UnknownText_0x1b5819 + buttonsound + end + +.Liz: + farwritetext UnknownText_0x1b5ebe + buttonsound + end + +.Gina: + farwritetext UnknownText_0x1b6352 + buttonsound + end + +.Dana: + farwritetext UnknownText_0x1b6795 + buttonsound + end + +.Tiffany: + farwritetext UnknownText_0x1b6f60 + buttonsound + end + +.Erin: + farwritetext UnknownText_0x1b75e5 + buttonsound + end + +PhoneScript_MonFlavorText: + special RandomPhoneMon + farscall PhoneScript_Random2 + if_equal $0, .TooEnergetic + farwritetext UnknownText_0x1b518b + buttonsound + farjump PhoneScript_HangupText_Male + +.TooEnergetic: + farjump .unnecessary + +.unnecessary + farwritetext UnknownText_0x1b522b + buttonsound + farjump PhoneScript_HangupText_Male +; be643 + + +String_be643: db "Grandma@" +String_be64b: db "Grandpa@" +String_be653: db "Mom@" +String_be657: db "Dad@" +String_be65b: db "Sister@" +String_be662: db "Brother@" + diff --git a/main.asm b/main.asm index 6da4dabc2..f32809569 100644 --- a/main.asm +++ b/main.asm @@ -4647,7 +4647,8 @@ INCLUDE "engine/slot_machine.asm" SECTION "Phone Engine", ROMX -INCLUDE "engine/more_phone_scripts.asm" +INCLUDE "engine/phone_callers.asm" +INCLUDE "engine/phone_gossip.asm" INCLUDE "engine/buena_phone_scripts.asm" @@ -4683,6 +4684,7 @@ SECTION "bank2F", ROMX INCLUDE "engine/std_scripts.asm" INCLUDE "engine/phone_scripts.asm" +INCLUDE "engine/phone_scripts_generic.asm" TalkToTrainerScript:: ; 0xbe66a faceplayer From a5c046119239412f5704ee670926ad6c5875ec66 Mon Sep 17 00:00:00 2001 From: surskitty Date: Wed, 13 Dec 2017 22:40:11 -0500 Subject: [PATCH 06/17] Labels labels labels --- engine/phone_scripts.asm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index f0e8489d6..7d020748c 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -1768,23 +1768,23 @@ UnknownScript_0xbdd40: clearevent EVENT_WILTON_HAS_GREAT_BALL clearevent EVENT_WILTON_HAS_POKE_BALL random $5 - if_equal $0, UnknownScript_0xbdd5e + if_equal $0, .UltraBall random $3 - if_equal $0, UnknownScript_0xbdd64 - jump UnknownScript_0xbdd6a + if_equal $0, .GreatBall + jump .PokeBall -UnknownScript_0xbdd5e: +.UltraBall: setevent EVENT_WILTON_HAS_ULTRA_BALL - jump UnknownScript_0xbdd6d + jump .FoundItem -UnknownScript_0xbdd64: +.GreatBall: setevent EVENT_WILTON_HAS_GREAT_BALL - jump UnknownScript_0xbdd6d + jump .FoundItem -UnknownScript_0xbdd6a: +.PokeBall: setevent EVENT_WILTON_HAS_POKE_BALL -UnknownScript_0xbdd6d: +.FoundItem: farjump PhoneScript_FoundItem_Male ; Kenji @@ -1847,19 +1847,19 @@ UnknownScript_0xbddda: ErinPhoneScript1: trainertotext PICNICKER, ERIN1, $0 checkflag ENGINE_ERIN - iftrue UnknownScript_0xbde07 + iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_ERIN_SATURDAY_NIGHT - iftrue UnknownScript_0xbde03 + iftrue .NotSaturday checkcode VAR_WEEKDAY - if_not_equal SATURDAY, UnknownScript_0xbde03 + if_not_equal SATURDAY, .NotSaturday checknite - iftrue UnknownScript_0xbde32 + iftrue ErinSaturdayNight -UnknownScript_0xbde03: +.NotSaturday: farjump UnknownScript_0xa09c0 -UnknownScript_0xbde07: +.WantsBattle: landmarktotext ROUTE_46, $2 farjump UnknownScript_0xa0aa0 @@ -1877,7 +1877,7 @@ ErinPhoneScript2: UnknownScript_0xbde2e: farjump UnknownScript_0xa0017 -UnknownScript_0xbde32: +ErinSaturdayNight: setflag ENGINE_ERIN_SATURDAY_NIGHT UnknownScript_0xbde35: From d69d81f3a0b0c79201e50cc64a889263251125ae Mon Sep 17 00:00:00 2001 From: surskitty Date: Wed, 13 Dec 2017 22:41:15 -0500 Subject: [PATCH 07/17] Fix the spelling of Thursday --- constants/engine_flags.asm | 2 +- engine/phone_scripts.asm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index 19f0891a0..3c088596d 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -179,7 +179,7 @@ const ENGINE_BRENT_MONDAY_MORNING const ENGINE_TIFFANY_TUESDAY_AFTERNOON const ENGINE_VANCE_WEDNESDAY_NIGHT - const ENGINE_WILTON_THRUSDAY_MORNING + const ENGINE_WILTON_THURSDAY_MORNING const ENGINE_PARRY_FRIDAY_AFTERNOON const ENGINE_ERIN_SATURDAY_NIGHT ; wPlayerSpriteSetupFlags diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index 7d020748c..28822d4da 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -1716,7 +1716,7 @@ WiltonPhoneScript1: checkflag ENGINE_WILTON iftrue UnknownScript_0xbdcf7 farscall PhoneScript_AnswerPhone_Male - checkflag ENGINE_WILTON_THRUSDAY_MORNING + checkflag ENGINE_WILTON_THURSDAY_MORNING iftrue UnknownScript_0xbdcf3 checkflag ENGINE_WILTON_HAS_ITEM iftrue UnknownScript_0xbdcfe @@ -1741,7 +1741,7 @@ WiltonPhoneScript2: farscall PhoneScript_GreetPhone_Male checkflag ENGINE_WILTON iftrue UnknownScript_0xbdd2f - checkflag ENGINE_WILTON_THRUSDAY_MORNING + checkflag ENGINE_WILTON_THURSDAY_MORNING iftrue UnknownScript_0xbdd2f checkflag ENGINE_WILTON_HAS_ITEM iftrue UnknownScript_0xbdd2f @@ -1754,7 +1754,7 @@ UnknownScript_0xbdd2f: farjump UnknownScript_0xa0000 UnknownScript_0xbdd33: - setflag ENGINE_WILTON_THRUSDAY_MORNING + setflag ENGINE_WILTON_THURSDAY_MORNING UnknownScript_0xbdd36: landmarktotext ROUTE_44, $2 From 1f0fbfb602e23ce3f1befcb6a3d3799592b3cfe7 Mon Sep 17 00:00:00 2001 From: surskitty Date: Wed, 13 Dec 2017 22:54:29 -0500 Subject: [PATCH 08/17] Label label label. --- engine/phone_gossip.asm | 82 ++++++++++++++++++++-------------------- engine/phone_scripts.asm | 2 +- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/engine/phone_gossip.asm b/engine/phone_gossip.asm index ae545c41e..d06d096de 100644 --- a/engine/phone_gossip.asm +++ b/engine/phone_gossip.asm @@ -69,126 +69,126 @@ JackTriviaScript: UnknownScript_0xa06da: random 10 - if_equal 0, UnknownScript_0xa0704 - if_equal 1, UnknownScript_0xa070c - if_equal 2, UnknownScript_0xa0714 - if_equal 3, UnknownScript_0xa071c - if_equal 4, UnknownScript_0xa0724 - if_equal 5, UnknownScript_0xa072c - if_equal 6, UnknownScript_0xa0734 - if_equal 7, UnknownScript_0xa073c - if_equal 8, UnknownScript_0xa0744 - if_equal 9, UnknownScript_0xa074c + if_equal 0, .RuinsOfAlph + if_equal 1, .Falkner + if_equal 2, .Earl + if_equal 3, .SurfPikachu + if_equal 4, .MooMooMilk + if_equal 5, .Salon + if_equal 6, .Whitney + if_equal 7, .BugCatchingContest + if_equal 8, .BeautifulMon + if_equal 9, .Forgot -UnknownScript_0xa0704: +.RuinsOfAlph: farwritetext UnknownText_0x176223 buttonsound jump PhoneScript_HangupText_Female -UnknownScript_0xa070c: +.Falkner: farwritetext UnknownText_0x1762c3 buttonsound jump PhoneScript_HangupText_Female -UnknownScript_0xa0714: +.Earl: farwritetext UnknownText_0x17638a buttonsound jump PhoneScript_HangupText_Female -UnknownScript_0xa071c: +.SurfPikachu: farwritetext UnknownText_0x176424 buttonsound jump PhoneScript_HangupText_Female -UnknownScript_0xa0724: +.MooMooMilk: farwritetext UnknownText_0x1764eb buttonsound jump PhoneScript_HangupText_Female -UnknownScript_0xa072c: +.Salon: farwritetext UnknownText_0x176599 buttonsound jump PhoneScript_HangupText_Female -UnknownScript_0xa0734: +.Whitney: farwritetext UnknownText_0x1766ac buttonsound jump PhoneScript_HangupText_Female -UnknownScript_0xa073c: +.BugCatchingContest: farwritetext UnknownText_0x17674f buttonsound jump PhoneScript_HangupText_Female -UnknownScript_0xa0744: +.BeautifulMon: farwritetext UnknownText_0x176816 buttonsound jump PhoneScript_HangupText_Female -UnknownScript_0xa074c: +.Forgot: farwritetext UnknownText_0x17686d buttonsound jump PhoneScript_HangupText_Female -UnknownScript_0xa0754: +ChadOakGossip: random 10 - if_equal 0, UnknownScript_0xa077e - if_equal 1, UnknownScript_0xa0786 - if_equal 2, UnknownScript_0xa078e - if_equal 3, UnknownScript_0xa0796 - if_equal 4, UnknownScript_0xa079e - if_equal 5, UnknownScript_0xa07a6 - if_equal 6, UnknownScript_0xa07ae - if_equal 7, UnknownScript_0xa07b6 - if_equal 8, UnknownScript_0xa07be - if_equal 9, UnknownScript_0xa07c6 + if_equal 0, .Blue + if_equal 1, .Daisy + if_equal 2, .ProfElm + if_equal 3, .Dream + if_equal 4, .Kurt + if_equal 5, .League + if_equal 6, .RadioShow + if_equal 7, .Battling + if_equal 8, .DaisyTea + if_equal 9, .Traveled -UnknownScript_0xa077e: +.Blue: farwritetext UnknownText_0x65481 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa0786: +.Daisy: farwritetext UnknownText_0x654ea buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa078e: +.ProfElm: farwritetext UnknownText_0x65555 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa0796: +.Dream: farwritetext UnknownText_0x655c7 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa079e: +.Kurt: farwritetext UnknownText_0x65628 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa07a6: +.League: farwritetext UnknownText_0x6569b buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa07ae: +.RadioShow: farwritetext UnknownText_0x6574a buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa07b6: +.Battling: farwritetext UnknownText_0x65810 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa07be: +.DaisyTea: farwritetext UnknownText_0x658c6 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa07c6: +.Traveled: farwritetext UnknownText_0x65969 buttonsound jump PhoneScript_HangupText_Male diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index 28822d4da..498f6ba4d 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -1412,7 +1412,7 @@ UnknownScript_0xbda2d: farjump UnknownScript_0xa0584 UnknownScript_0xbda31: - farjump UnknownScript_0xa0754 + farjump ChadOakGossip DerekPhoneScript1: trainertotext POKEFANM, DEREK1, $0 From 8e54adc22f6793ce86612d30770b02c71a80a2db Mon Sep 17 00:00:00 2001 From: surskitty Date: Wed, 13 Dec 2017 23:35:07 -0500 Subject: [PATCH 09/17] Labels, including a comment explaining RandomPhoneRareWildMon. --- engine/phone_callers.asm | 2 +- engine/phone_gossip.asm | 56 ++++++++++++++++++++-------------------- engine/phone_scripts.asm | 24 ++++++++--------- engine/wildmons.asm | 3 ++- text/phone/extra.asm | 22 ++++++++-------- text/phone/extra2.asm | 22 ++++++++-------- 6 files changed, 65 insertions(+), 64 deletions(-) diff --git a/engine/phone_callers.asm b/engine/phone_callers.asm index 1b4f19c8e..f14e45eca 100644 --- a/engine/phone_callers.asm +++ b/engine/phone_callers.asm @@ -842,7 +842,7 @@ UnknownScript_0xa0584: UnknownScript_0xa058e: farjump PhoneScript_HangupText_Male -UnknownScript_0xa0592: +Phone_CheckIfUnseenRare: scall PhoneScriptRareWildMon iffalse .HangUp farjump UnknownScript_0xa0017 diff --git a/engine/phone_gossip.asm b/engine/phone_gossip.asm index d06d096de..5b81fc284 100644 --- a/engine/phone_gossip.asm +++ b/engine/phone_gossip.asm @@ -13,57 +13,57 @@ JackTriviaScript: if_equal 10, .RainDance .Thunder: - farwritetext UnknownText_0x174261 + farwritetext JackThunderTriviaText buttonsound jump PhoneScript_HangupText_Male .Rollout: - farwritetext UnknownText_0x17429d + farwritetext JackRolloutTriviaText buttonsound jump PhoneScript_HangupText_Male .Solarbeam: - farwritetext UnknownText_0x1742ee + farwritetext JackSolarbeamTriviaText buttonsound jump PhoneScript_HangupText_Male .Stomp: - farwritetext UnknownText_0x174340 + farwritetext JackStompTriviaText buttonsound jump PhoneScript_HangupText_Male .Gust: - farwritetext UnknownText_0x174391 + farwritetext JackGustTriviaText buttonsound jump PhoneScript_HangupText_Male .Twister: - farwritetext UnknownText_0x1743e3 + farwritetext JackTwisterTriviaText buttonsound jump PhoneScript_HangupText_Male .Earthquake: - farwritetext UnknownText_0x174433 + farwritetext JackEarthquakeTriviaText buttonsound jump PhoneScript_HangupText_Male .Magnitude: - farwritetext UnknownText_0x174485 + farwritetext JackMagnitudeTriviaText buttonsound jump PhoneScript_HangupText_Male .Sandstorm: - farwritetext UnknownText_0x1744d6 + farwritetext JackSandstormTriviaText buttonsound jump PhoneScript_HangupText_Male .SunnyDay: - farwritetext UnknownText_0x174522 + farwritetext JackSunnyDayTriviaText buttonsound jump PhoneScript_HangupText_Male .RainDance: - farwritetext UnknownText_0x174571 + farwritetext JackRainDanceTriviaText buttonsound jump PhoneScript_HangupText_Male @@ -144,52 +144,52 @@ ChadOakGossip: if_equal 9, .Traveled .Blue: - farwritetext UnknownText_0x65481 + farwritetext ChadBlueGossipText buttonsound jump PhoneScript_HangupText_Male .Daisy: - farwritetext UnknownText_0x654ea + farwritetext ChadDaisyGossipText buttonsound jump PhoneScript_HangupText_Male .ProfElm: - farwritetext UnknownText_0x65555 + farwritetext ChadProfElmGossipText buttonsound jump PhoneScript_HangupText_Male .Dream: - farwritetext UnknownText_0x655c7 + farwritetext ChadDreamGossipText buttonsound jump PhoneScript_HangupText_Male .Kurt: - farwritetext UnknownText_0x65628 + farwritetext ChadKurtGossipText buttonsound jump PhoneScript_HangupText_Male .League: - farwritetext UnknownText_0x6569b + farwritetext ChadLeagueGossipText buttonsound jump PhoneScript_HangupText_Male .RadioShow: - farwritetext UnknownText_0x6574a + farwritetext ChadRadioShowGossipText buttonsound jump PhoneScript_HangupText_Male .Battling: - farwritetext UnknownText_0x65810 + farwritetext ChadBattlingGossipText buttonsound jump PhoneScript_HangupText_Male .DaisyTea: - farwritetext UnknownText_0x658c6 + farwritetext ChadDaisyTeaGossipText buttonsound jump PhoneScript_HangupText_Male .Traveled: - farwritetext UnknownText_0x65969 + farwritetext ChadTravelGossipText buttonsound jump PhoneScript_HangupText_Male @@ -281,7 +281,7 @@ IrwinRumorScript: iftrue IrwinFogBadge checkflag ENGINE_PLAINBADGE iftrue IrwinPlainBadge - farwritetext UnknownText_0x646a3 + farwritetext IrwinCalledRightAwayText buttonsound jump PhoneScript_HangupText_Male @@ -345,7 +345,7 @@ IrwinMarshBadge: buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa08f8: +JackPhoneTips: farwritetext UnknownText_0x1745c2 buttonsound jump PhoneScript_HangupText_Male @@ -511,25 +511,25 @@ UnknownScript_0xa0a00: UnknownScript_0xa0a08: checkmorn - iftrue UnknownScript_0xa0a1d + iftrue .Morning checknite - iftrue UnknownScript_0xa0a25 + iftrue .Night setevent EVENT_KENJI_ON_BREAK farwritetext UnknownText_0x66f11 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa0a1d: +.Morning: farwritetext UnknownText_0x66ed3 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa0a25: +.Night: farwritetext UnknownText_0x66f52 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa0a2d: +JackWantsBattle: farwritetext UnknownText_0x174638 end diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index 498f6ba4d..02cce84c5 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -301,27 +301,27 @@ ElmPhoneScript2: ; 0xbd081 JackPhoneScript1: trainertotext SCHOOLBOY, JACK1, $0 checkflag ENGINE_JACK - iftrue UnknownScript_0xbd0f3 + iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_JACK_MONDAY_MORNING - iftrue UnknownScript_0xbd0ef + iftrue .NotMonday checkcode VAR_WEEKDAY - if_not_equal MONDAY, UnknownScript_0xbd0ef + if_not_equal MONDAY, .NotMonday checkmorn - iftrue UnknownScript_0xbd12a + iftrue JackMondayMorning -UnknownScript_0xbd0ef: - farjump UnknownScript_0xa08f8 +.NotMonday: + farjump JackPhoneTips -UnknownScript_0xbd0f3: +.WantsBattle: landmarktotext NATIONAL_PARK, $2 - farjump UnknownScript_0xa0a2d + farjump JackWantsBattle JackPhoneScript2: trainertotext SCHOOLBOY, JACK1, $0 farscall PhoneScript_GreetPhone_Male farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbd13b + if_equal $0, JackBattleTrivia checkflag ENGINE_JACK iftrue UnknownScript_0xbd11e checkflag ENGINE_JACK_MONDAY_MORNING @@ -334,7 +334,7 @@ UnknownScript_0xbd11e: if_equal $0, UnknownScript_0xbd137 farjump UnknownScript_0xa0000 -UnknownScript_0xbd12a: +JackMondayMorning: setflag ENGINE_JACK_MONDAY_MORNING UnknownScript_0xbd12d: @@ -345,7 +345,7 @@ UnknownScript_0xbd12d: UnknownScript_0xbd137: farjump UnknownScript_0xa0584 -UnknownScript_0xbd13b: +JackBattleTrivia: farjump JackTriviaScript ; Beverly @@ -1355,7 +1355,7 @@ UnknownScript_0xbd9ae: farjump PhoneScript_WantsToBattle_Female UnknownScript_0xbd9b8: - farjump UnknownScript_0xa0592 + farjump Phone_CheckIfUnseenRare UnknownScript_0xbd9bc: setflag ENGINE_DANA_HAS_THUNDERSTONE diff --git a/engine/wildmons.asm b/engine/wildmons.asm index 1f6bb4065..355655268 100755 --- a/engine/wildmons.asm +++ b/engine/wildmons.asm @@ -802,8 +802,9 @@ ValidateTempWildMonSpecies: ; 2a4a0 ret ; 2a4ab +; Finds a rare wild Pokemon in the route of the trainer calling, then checks if it's been Seen already. +; The trainer will then tell you about the Pokemon if you haven't seen it. RandomPhoneRareWildMon: ; 2a4ab -; Related to the phone? callba GetCallerLocation ld d, b ld e, c diff --git a/text/phone/extra.asm b/text/phone/extra.asm index 7b89b80aa..3d45b39d6 100644 --- a/text/phone/extra.asm +++ b/text/phone/extra.asm @@ -205,7 +205,7 @@ UnknownText_0x645ff: ; 0x645ff done ; 0x646a3 -UnknownText_0x646a3: ; 0x646a3 +IrwinCalledRightAwayText: ; 0x646a3 text "Hehe, I called" line "right away!" @@ -727,7 +727,7 @@ UnknownText_0x65471: ; 0x65471 done ; 0x65481 -UnknownText_0x65481: ; 0x65481 +ChadBlueGossipText: ; 0x65481 text "Do you know BLUE?" para "He's PROF.OAK's" @@ -741,7 +741,7 @@ UnknownText_0x65481: ; 0x65481 done ; 0x654ea -UnknownText_0x654ea: ; 0x654ea +ChadDaisyGossipText: ; 0x654ea text "PROF.OAK has a" line "granddaughter" cont "named DAISY." @@ -754,7 +754,7 @@ UnknownText_0x654ea: ; 0x654ea done ; 0x65555 -UnknownText_0x65555: ; 0x65555 +ChadProfElmGossipText: ; 0x65555 text "Everyone's talking" line "about PROF.ELM." @@ -767,7 +767,7 @@ UnknownText_0x65555: ; 0x65555 done ; 0x655c7 -UnknownText_0x655c7: ; 0x655c7 +ChadDreamGossipText: ; 0x655c7 text "PROF.OAK's dream" line "is to compile a" @@ -780,7 +780,7 @@ UnknownText_0x655c7: ; 0x655c7 done ; 0x65628 -UnknownText_0x65628: ; 0x65628 +ChadKurtGossipText: ; 0x65628 text "Do you know KURT," line "the BALL creator?" @@ -793,7 +793,7 @@ UnknownText_0x65628: ; 0x65628 done ; 0x6569b -UnknownText_0x6569b: ; 0x6569b +ChadLeagueGossipText: ; 0x6569b text "#MON LEAGUE is" line "the great gather-" cont "ing place for all" @@ -812,7 +812,7 @@ UnknownText_0x6569b: ; 0x6569b done ; 0x6574a -UnknownText_0x6574a: ; 0x6574a +ChadRadioShowGossipText: ; 0x6574a text "PROF.OAK'S #MON" line "TALK is a popular" cont "radio show, right?" @@ -832,7 +832,7 @@ UnknownText_0x6574a: ; 0x6574a done ; 0x65810 -UnknownText_0x65810: ; 0x65810 +ChadBattlingGossipText: ; 0x65810 text "PROF.OAK used to" line "be a trainer a" cont "long time ago." @@ -851,7 +851,7 @@ UnknownText_0x65810: ; 0x65810 done ; 0x658c6 -UnknownText_0x658c6: ; 0x658c6 +ChadDaisyTeaGossipText: ; 0x658c6 text "PROF.OAK has a" line "granddaughter" cont "named DAISY." @@ -870,7 +870,7 @@ UnknownText_0x658c6: ; 0x658c6 done ; 0x65969 -UnknownText_0x65969: ; 0x65969 +ChadTravelGossipText: ; 0x65969 text "Did you know?" line "PROF.OAK traveled" diff --git a/text/phone/extra2.asm b/text/phone/extra2.asm index 01462ff20..b8e3cee7e 100644 --- a/text/phone/extra2.asm +++ b/text/phone/extra2.asm @@ -83,7 +83,7 @@ UnknownText_0x174251: ; 0x174251 done ; 0x174261 -UnknownText_0x174261: ; 0x174261 +JackThunderTriviaText: ; 0x174261 text "Did you know?" para "When it's raining," @@ -92,7 +92,7 @@ UnknownText_0x174261: ; 0x174261 done ; 0x17429d -UnknownText_0x17429d: ; 0x17429d +JackRolloutTriviaText: ; 0x17429d text "Did you know…?" para "If you use DEFENSE" @@ -103,7 +103,7 @@ UnknownText_0x17429d: ; 0x17429d done ; 0x1742ee -UnknownText_0x1742ee: ; 0x1742ee +JackSolarbeamTriviaText: ; 0x1742ee text "Did you know…?" para "If the sunlight is" @@ -114,7 +114,7 @@ UnknownText_0x1742ee: ; 0x1742ee done ; 0x174340 -UnknownText_0x174340: ; 0x174340 +JackStompTriviaText: ; 0x174340 text "Did you know…?" para "If the opponent" @@ -125,7 +125,7 @@ UnknownText_0x174340: ; 0x174340 done ; 0x174391 -UnknownText_0x174391: ; 0x174391 +JackGustTriviaText: ; 0x174391 text "Did you know…?" para "If your opponent" @@ -136,7 +136,7 @@ UnknownText_0x174391: ; 0x174391 done ; 0x1743e3 -UnknownText_0x1743e3: ; 0x1743e3 +JackTwisterTriviaText: ; 0x1743e3 text "Did you know…?" para "If your opponent" @@ -147,7 +147,7 @@ UnknownText_0x1743e3: ; 0x1743e3 done ; 0x174433 -UnknownText_0x174433: ; 0x174433 +JackEarthquakeTriviaText: ; 0x174433 text "Did you know…?" para "If your opponent" @@ -158,7 +158,7 @@ UnknownText_0x174433: ; 0x174433 done ; 0x174485 -UnknownText_0x174485: ; 0x174485 +JackMagnitudeTriviaText: ; 0x174485 text "Did you know…?" para "If your opponent" @@ -169,7 +169,7 @@ UnknownText_0x174485: ; 0x174485 done ; 0x1744d6 -UnknownText_0x1744d6: ; 0x1744d6 +JackSandstormTriviaText: ; 0x1744d6 text "Did you know…?" para "The rock, ground" @@ -180,7 +180,7 @@ UnknownText_0x1744d6: ; 0x1744d6 done ; 0x174522 -UnknownText_0x174522: ; 0x174522 +JackSunnyDayTriviaText: ; 0x174522 text "Did you know…?" para "If the sunlight is" @@ -191,7 +191,7 @@ UnknownText_0x174522: ; 0x174522 done ; 0x174571 -UnknownText_0x174571: ; 0x174571 +JackRainDanceTriviaText: ; 0x174571 text "Did you know…?" para "When it's raining," From 1116180e3c072b78d0bfb45d2df3d092f0e7ea0d Mon Sep 17 00:00:00 2001 From: surskitty Date: Wed, 13 Dec 2017 23:39:47 -0500 Subject: [PATCH 10/17] Renaming RandomPhoneRareWildMon to RandomRareWildMon. --- engine/phone_callers.asm | 2 +- engine/specials.asm | 2 +- engine/wildmons.asm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/phone_callers.asm b/engine/phone_callers.asm index f14e45eca..58058a418 100644 --- a/engine/phone_callers.asm +++ b/engine/phone_callers.asm @@ -851,7 +851,7 @@ Phone_CheckIfUnseenRare: farjump PhoneScript_HangupText_Female PhoneScriptRareWildMon: - special RandomPhoneRareWildMon + special RandomUnseenWildMon end PhoneScript_BugCatchingContest: diff --git a/engine/specials.asm b/engine/specials.asm index e88112286..e4f4533c6 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -111,7 +111,7 @@ SpecialsPointers:: ; c029 add_special Special_DisplayLinkRecord add_special GetFirstPokemonHappiness add_special CheckFirstMonIsEgg - add_special RandomPhoneRareWildMon + add_special RandomUnseenWildMon add_special RandomPhoneWildMon add_special RandomPhoneMon add_special MapCallbackSprites_LoadUsedSpritesGFX diff --git a/engine/wildmons.asm b/engine/wildmons.asm index 355655268..1b6a88f6f 100755 --- a/engine/wildmons.asm +++ b/engine/wildmons.asm @@ -804,7 +804,7 @@ ValidateTempWildMonSpecies: ; 2a4a0 ; Finds a rare wild Pokemon in the route of the trainer calling, then checks if it's been Seen already. ; The trainer will then tell you about the Pokemon if you haven't seen it. -RandomPhoneRareWildMon: ; 2a4ab +RandomUnseenWildMon: ; 2a4ab callba GetCallerLocation ld d, b ld e, c From e1413e022d425af1915c8a8c3c29b689ec66ef60 Mon Sep 17 00:00:00 2001 From: surskitty Date: Thu, 14 Dec 2017 14:13:10 -0500 Subject: [PATCH 11/17] phone_callers.asm is now fully readable, if not fully labelled. --- engine/phone_callers.asm | 72 ++++++++++++++++++++-------------------- engine/phone_scripts.asm | 16 ++++----- text/phone/extra2.asm | 2 +- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/engine/phone_callers.asm b/engine/phone_callers.asm index 58058a418..cd5799d9b 100644 --- a/engine/phone_callers.asm +++ b/engine/phone_callers.asm @@ -3,58 +3,58 @@ UnknownScript_0xa0000: farscall PhoneScript_Random2 if_equal 0, .Bragging farscall PhoneScript_Generic_Male - farjump UnknownScript_0xa003e + farjump Phone_FoundAMon_Male .Bragging: - farjump PhoneScript_BraggingCall + farjump Phone_BraggingCall_Male UnknownScript_0xa0017: special RandomPhoneMon farscall PhoneScript_Random2 - if_equal 0, UnknownScript_0xa002a + if_equal 0, .Bragging farscall PhoneScript_Generic_Female - farjump UnknownScript_0xa0055 + farjump Phone_FoundAMon_Female -UnknownScript_0xa002a: - farjump UnknownScript_0xa0036 +.Bragging: + farjump Phone_BraggingCall_Female -PhoneScript_BraggingCall: - farscall Phone_WhosBragging - farjump UnknownScript_0xa003e +Phone_BraggingCall_Male: + farscall Phone_WhosBragging_Male + farjump Phone_FoundAMon_Male -UnknownScript_0xa0036: - farscall UnknownScript_0xa0128 - farjump UnknownScript_0xa0055 +Phone_BraggingCall_Female: + farscall Phone_WhosBragging_Female + farjump Phone_FoundAMon_Female -UnknownScript_0xa003e: +Phone_FoundAMon_Male: special RandomPhoneWildMon farscall PhoneScript_Random2 - if_equal 0, UnknownScript_0xa0051 - farscall UnknownScript_0xa017a + if_equal 0, .GotAway + farscall Phone_WhoDefeatedMon_Male farjump PhoneScript_HangupText_Male -UnknownScript_0xa0051: - farjump UnknownScript_0xa006c +.GotAway: + farjump Phone_GotAwayCall_Male -UnknownScript_0xa0055: +Phone_FoundAMon_Female: special RandomPhoneWildMon farscall PhoneScript_Random2 - if_equal 0, UnknownScript_0xa0068 - farscall UnknownScript_0xa0226 + if_equal 0, .GotAway + farscall Phone_WhoDefeatedMon_Female farjump PhoneScript_HangupText_Female -UnknownScript_0xa0068: - farjump UnknownScript_0xa0074 +.GotAway: + farjump Phone_GotAwayCall_Female -UnknownScript_0xa006c: - farscall UnknownScript_0xa0278 +Phone_GotAwayCall_Male: + farscall Phone_WhoLostAMon_Male farjump PhoneScript_HangupText_Male -UnknownScript_0xa0074: - farscall UnknownScript_0xa0324 +Phone_GotAwayCall_Female: + farscall Phone_WhoLostAMon_Female farjump PhoneScript_HangupText_Female -Phone_WhosBragging: +Phone_WhosBragging_Male: checkcode VAR_CALLERID if_equal PHONE_SCHOOLBOY_JACK, .Jack if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven @@ -159,7 +159,7 @@ Phone_WhosBragging: buttonsound end -UnknownScript_0xa0128: +Phone_WhosBragging_Female: checkcode VAR_CALLERID if_equal PHONE_POKEFAN_BEVERLY, .Beverly if_equal PHONE_COOLTRAINERF_BETH, .Beth @@ -210,7 +210,7 @@ UnknownScript_0xa0128: buttonsound end -UnknownScript_0xa017a: +Phone_WhoDefeatedMon_Male: checkcode VAR_CALLERID if_equal PHONE_SCHOOLBOY_JACK, .Jack if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven @@ -231,7 +231,7 @@ UnknownScript_0xa017a: if_equal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x174106 + farwritetext JackDefeatedMonText buttonsound end @@ -315,7 +315,7 @@ UnknownScript_0xa017a: buttonsound end -UnknownScript_0xa0226: +Phone_WhoDefeatedMon_Female: checkcode VAR_CALLERID if_equal PHONE_POKEFAN_BEVERLY, .Beverly if_equal PHONE_COOLTRAINERF_BETH, .Beth @@ -366,7 +366,7 @@ UnknownScript_0xa0226: buttonsound end -UnknownScript_0xa0278: +Phone_WhoLostAMon_Male: checkcode VAR_CALLERID if_equal PHONE_SCHOOLBOY_JACK, .Jack if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven @@ -471,7 +471,7 @@ UnknownScript_0xa0278: buttonsound end -UnknownScript_0xa0324: +Phone_WhoLostAMon_Female: checkcode VAR_CALLERID if_equal PHONE_POKEFAN_BEVERLY, .Beverly if_equal PHONE_COOLTRAINERF_BETH, .Beth @@ -834,15 +834,15 @@ PhoneScript_HangupText_Female: farwritetext UnknownText_0x67281 end -UnknownScript_0xa0584: +Phone_CheckIfUnseenRare_Male: scall PhoneScriptRareWildMon - iffalse UnknownScript_0xa058e + iffalse .HangUp farjump UnknownScript_0xa0000 UnknownScript_0xa058e: farjump PhoneScript_HangupText_Male -Phone_CheckIfUnseenRare: +Phone_CheckIfUnseenRare_Female: scall PhoneScriptRareWildMon iffalse .HangUp farjump UnknownScript_0xa0017 diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index 02cce84c5..6ce9f1cf1 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -343,7 +343,7 @@ UnknownScript_0xbd12d: farjump PhoneScript_WantsToBattle_Male UnknownScript_0xbd137: - farjump UnknownScript_0xa0584 + farjump Phone_CheckIfUnseenRare_Male JackBattleTrivia: farjump JackTriviaScript @@ -466,7 +466,7 @@ GavenWantsRematch: farjump PhoneScript_WantsToBattle_Male UnknownScript_0xbd239: - farjump UnknownScript_0xa0584 + farjump Phone_CheckIfUnseenRare_Male ; Beth @@ -565,7 +565,7 @@ UnknownScript_0xbd304: farjump PhoneScript_WantsToBattle_Male UnknownScript_0xbd30e: - farjump UnknownScript_0xa0584 + farjump Phone_CheckIfUnseenRare_Male UnknownScript_0xbd312: setflag ENGINE_JOSE_HAS_STAR_PIECE @@ -741,7 +741,7 @@ UnknownScript_0xbd487: farjump PhoneScript_WantsToBattle_Male UnknownScript_0xbd491: - farjump UnknownScript_0xa0584 + farjump Phone_CheckIfUnseenRare_Male UnknownScript_0xbd495: setflag ENGINE_WADE_HAS_ITEM @@ -1061,7 +1061,7 @@ UnknownScript_0xbd72e: farjump PhoneScript_WantsToBattle_Male UnknownScript_0xbd738: - farjump UnknownScript_0xa0584 + farjump Phone_CheckIfUnseenRare_Male UnknownScript_0xbd73c: setflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON @@ -1226,7 +1226,7 @@ ArnieYanmaSwarm: ; start swarm farjump UnknownScript_0xa05ce UnknownScript_0xbd89e: - farjump UnknownScript_0xa0584 + farjump Phone_CheckIfUnseenRare_Male ArnieYanmaAlreadySwarming: farjump UnknownScript_0xa0000 @@ -1355,7 +1355,7 @@ UnknownScript_0xbd9ae: farjump PhoneScript_WantsToBattle_Female UnknownScript_0xbd9b8: - farjump Phone_CheckIfUnseenRare + farjump Phone_CheckIfUnseenRare_Female UnknownScript_0xbd9bc: setflag ENGINE_DANA_HAS_THUNDERSTONE @@ -1409,7 +1409,7 @@ UnknownScript_0xbda23: farjump PhoneScript_WantsToBattle_Male UnknownScript_0xbda2d: - farjump UnknownScript_0xa0584 + farjump Phone_CheckIfUnseenRare_Male UnknownScript_0xbda31: farjump ChadOakGossip diff --git a/text/phone/extra2.asm b/text/phone/extra2.asm index b8e3cee7e..fb4adf055 100644 --- a/text/phone/extra2.asm +++ b/text/phone/extra2.asm @@ -31,7 +31,7 @@ JackIntelligenceText: ; 0x1740c0 done ; 0x174106 -UnknownText_0x174106: ; 0x174106 +JackDefeatedMonText: ; 0x174106 text "The other day, I" line "easily defeated a" cont "@" From 62dd7a8bae55741c76ac20aa1a3c6db0341589f8 Mon Sep 17 00:00:00 2001 From: surskitty Date: Thu, 14 Dec 2017 14:48:39 -0500 Subject: [PATCH 12/17] phone_scripts is most of the way there, too. --- engine/phone_callers.asm | 12 +-- engine/phone_gossip.asm | 28 +++--- engine/phone_scripts.asm | 190 +++++++++++++++++++-------------------- text/phone/extra.asm | 8 +- 4 files changed, 119 insertions(+), 119 deletions(-) diff --git a/engine/phone_callers.asm b/engine/phone_callers.asm index cd5799d9b..561d9bb78 100644 --- a/engine/phone_callers.asm +++ b/engine/phone_callers.asm @@ -1,4 +1,4 @@ -UnknownScript_0xa0000: +Phone_GenericCall_Male: special RandomPhoneMon farscall PhoneScript_Random2 if_equal 0, .Bragging @@ -8,7 +8,7 @@ UnknownScript_0xa0000: .Bragging: farjump Phone_BraggingCall_Male -UnknownScript_0xa0017: +Phone_GenericCall_Female: special RandomPhoneMon farscall PhoneScript_Random2 if_equal 0, .Bragging @@ -837,15 +837,15 @@ PhoneScript_HangupText_Female: Phone_CheckIfUnseenRare_Male: scall PhoneScriptRareWildMon iffalse .HangUp - farjump UnknownScript_0xa0000 + farjump Phone_GenericCall_Male -UnknownScript_0xa058e: +.HangUp: farjump PhoneScript_HangupText_Male Phone_CheckIfUnseenRare_Female: scall PhoneScriptRareWildMon iffalse .HangUp - farjump UnknownScript_0xa0017 + farjump Phone_GenericCall_Female .HangUp: farjump PhoneScript_HangupText_Female @@ -955,7 +955,7 @@ UnknownScript_0xa0644: buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa064c: +KenjiCallingPhoneScript: farwritetext UnknownText_0x66dc5 buttonsound jump PhoneScript_HangupText_Male diff --git a/engine/phone_gossip.asm b/engine/phone_gossip.asm index 5b81fc284..2bca4475c 100644 --- a/engine/phone_gossip.asm +++ b/engine/phone_gossip.asm @@ -465,13 +465,13 @@ UnknownScript_0xa09b0: buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa09b8: - farwritetext UnknownText_0x67106 +ParryBattleWithMe: + farwritetext ParryBattleWithMeText buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa09c0: - farwritetext UnknownText_0x67294 +ErinWorkingHardScript: + farwritetext ErinWorkingHardText buttonsound jump PhoneScript_HangupText_Female @@ -496,26 +496,26 @@ UnknownScript_0xa09e6: buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa09ee: +KenjiAnswerPhoneScript: checkcode VAR_KENJI_BREAK - if_equal 2, UnknownScript_0xa0a00 - if_equal 1, UnknownScript_0xa0a08 + if_equal 2, .Training + if_equal 1, .OnBreak farwritetext UnknownText_0x66e17 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa0a00: +.Training: farwritetext UnknownText_0x66e67 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa0a08: +.OnBreak: checkmorn iftrue .Morning checknite iftrue .Night setevent EVENT_KENJI_ON_BREAK - farwritetext UnknownText_0x66f11 + farwritetext KenjiBreakText buttonsound jump PhoneScript_HangupText_Male @@ -529,11 +529,11 @@ UnknownScript_0xa0a08: buttonsound jump PhoneScript_HangupText_Male -JackWantsBattle: +JackWantsBattleScript: farwritetext UnknownText_0x174638 end -UnknownScript_0xa0a32: +HueyWantsBattleScript: farwritetext UnknownText_0x1749c7 end @@ -621,8 +621,8 @@ UnknownScript_0xa0a9b: farwritetext UnknownText_0x6712a end -UnknownScript_0xa0aa0: - farwritetext UnknownText_0x672d5 +ErinComeBattleScript: + farwritetext ErinComeBattleText end UnknownScript_0xa0aa5: diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index 6ce9f1cf1..ea265aa92 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -315,7 +315,7 @@ JackPhoneScript1: .WantsBattle: landmarktotext NATIONAL_PARK, $2 - farjump JackWantsBattle + farjump JackWantsBattleScript JackPhoneScript2: trainertotext SCHOOLBOY, JACK1, $0 @@ -323,26 +323,26 @@ JackPhoneScript2: farscall PhoneScript_Random2 if_equal $0, JackBattleTrivia checkflag ENGINE_JACK - iftrue UnknownScript_0xbd11e + iftrue .WaitingForBattle checkflag ENGINE_JACK_MONDAY_MORNING - iftrue UnknownScript_0xbd11e + iftrue .WaitingForBattle farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbd12d + if_equal $0, JackWantsToBattle -UnknownScript_0xbd11e: +.WaitingForBattle: farscall PhoneScript_Random3 - if_equal $0, UnknownScript_0xbd137 - farjump UnknownScript_0xa0000 + if_equal $0, JackFindsRare + farjump Phone_GenericCall_Male JackMondayMorning: setflag ENGINE_JACK_MONDAY_MORNING -UnknownScript_0xbd12d: +JackWantsToBattle: landmarktotext NATIONAL_PARK, $2 setflag ENGINE_JACK farjump PhoneScript_WantsToBattle_Male -UnknownScript_0xbd137: +JackFindsRare: farjump Phone_CheckIfUnseenRare_Male JackBattleTrivia: @@ -354,10 +354,10 @@ BeverlyPhoneScript1: trainertotext POKEFANF, BEVERLY1, $0 farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_BEVERLY_HAS_NUGGET - iftrue UnknownScript_0xbd151 + iftrue .HasNugget farjump UnknownScript_0xa0900 -UnknownScript_0xbd151: +.HasNugget: landmarktotext NATIONAL_PARK, $2 farjump UnknownScript_0xa0aa5 @@ -365,14 +365,14 @@ BeverlyPhoneScript2: trainertotext POKEFANF, BEVERLY1, $0 farscall PhoneScript_GreetPhone_Female checkflag ENGINE_BEVERLY_HAS_NUGGET - iftrue UnknownScript_0xbd16e + iftrue .HasNugget farscall PhoneScript_Random4 - if_equal $0, UnknownScript_0xbd172 + if_equal $0, .FoundNugget -UnknownScript_0xbd16e: - farjump UnknownScript_0xa0017 +.HasNugget: + farjump Phone_GenericCall_Female -UnknownScript_0xbd172: +.FoundNugget: setflag ENGINE_BEVERLY_HAS_NUGGET landmarktotext NATIONAL_PARK, $2 farjump PhoneScript_FoundItem_Female @@ -397,7 +397,7 @@ HueyPhoneScript1: .WantsBattle: landmarktotext LIGHTHOUSE, $2 - farjump UnknownScript_0xa0a32 + farjump HueyWantsBattleScript HueyPhoneScript2: trainertotext SAILOR, HUEY1, $0 @@ -446,16 +446,16 @@ GavenPhoneScript2: trainertotext COOLTRAINERM, GAVEN3, $0 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_GAVEN - iftrue UnknownScript_0xbd220 + iftrue .WaitingForBattle checkflag ENGINE_GAVEN_THURSDAY_MORNING - iftrue UnknownScript_0xbd220 + iftrue .WaitingForBattle farscall PhoneScript_Random2 if_equal $0, GavenWantsRematch -UnknownScript_0xbd220: +.WaitingForBattle: farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbd239 - farjump UnknownScript_0xa0000 + farjump Phone_GenericCall_Male GavenThursdayMorning: setflag ENGINE_GAVEN_THURSDAY_MORNING @@ -500,7 +500,7 @@ BethPhoneScript2: if_equal $0, UnknownScript_0xbd28a UnknownScript_0xbd283: - farjump UnknownScript_0xa0017 + farjump Phone_GenericCall_Female UnknownScript_0xbd287: setflag ENGINE_BETH_FRIDAY_AFTERNOON @@ -554,7 +554,7 @@ JosePhoneScript2: UnknownScript_0xbd2f5: farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbd30e - farjump UnknownScript_0xa0000 + farjump Phone_GenericCall_Male JoseSaturdayNight: setflag ENGINE_JOSE_SATURDAY_NIGHT @@ -604,7 +604,7 @@ ReenaPhoneScript2: if_equal $0, UnknownScript_0xbd369 UnknownScript_0xbd362: - farjump UnknownScript_0xa0017 + farjump Phone_GenericCall_Female UnknownScript_0xbd366: setflag ENGINE_REENA_SUNDAY_MORNING @@ -648,7 +648,7 @@ JoeyPhoneScript2: if_equal $1, UnknownScript_0xbd3c7 UnknownScript_0xbd3c0: - farjump UnknownScript_0xa0000 + farjump Phone_GenericCall_Male UnknownScript_0xbd3c4: setflag ENGINE_JOEY_MONDAY_AFTERNOON @@ -727,7 +727,7 @@ WadePhoneScript2: UnknownScript_0xbd474: farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbd491 - farjump UnknownScript_0xa0000 + farjump Phone_GenericCall_Male Wade_ContestToday: farjump PhoneScript_BugCatchingContest @@ -814,7 +814,7 @@ RalphPhoneScript2: Ralph_CheckSwarm2: farscall PhoneScript_Random5 if_equal $0, Ralph_SetUpSwarm - farjump UnknownScript_0xa0000 + farjump Phone_GenericCall_Male Ralph_WednesdayMorning: setflag ENGINE_RALPH_WEDNESDAY_MORNING @@ -834,7 +834,7 @@ Ralph_SetUpSwarm: farjump UnknownScript_0xa05d6 UnknownScript_0xbd55c: - farjump UnknownScript_0xa0000 + farjump Phone_GenericCall_Male ; Liz @@ -877,7 +877,7 @@ UnknownScript_0xbd5a9: if_equal $0, UnknownScript_0xbd5c6 UnknownScript_0xbd5bf: - farjump UnknownScript_0xa0017 + farjump Phone_GenericCall_Female LizThursdayAfternoon: setflag ENGINE_LIZ_THURSDAY_AFTERNOON @@ -983,7 +983,7 @@ AnthonyPhoneScript2: UnknownScript_0xbd68d: farscall PhoneScript_Random5 if_equal $0, UnknownScript_0xbd6a6 - farjump UnknownScript_0xa0000 + farjump Phone_GenericCall_Male UnknownScript_0xbd699: setflag ENGINE_ANTHONY_FRIDAY_NIGHT @@ -1003,7 +1003,7 @@ UnknownScript_0xbd6a6: farjump UnknownScript_0xa05de UnknownScript_0xbd6bd: - farjump UnknownScript_0xa0000 + farjump Phone_GenericCall_Male ; Todd @@ -1050,7 +1050,7 @@ UnknownScript_0xbd717: ToddNoGoldenrod: farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbd738 - farjump UnknownScript_0xa0000 + farjump Phone_GenericCall_Male ToddSaturdayMorning: setflag ENGINE_TODD_SATURDAY_MORNING @@ -1124,7 +1124,7 @@ UnknownScript_0xbd7b2: if_equal $0, UnknownScript_0xbd7cf UnknownScript_0xbd7c8: - farjump UnknownScript_0xa0017 + farjump Phone_GenericCall_Female GinaSundayDay: setflag ENGINE_GINA_SUNDAY_AFTERNOON @@ -1206,7 +1206,7 @@ UnknownScript_0xbd866: if_equal $0, ArnieYanmaSwarm farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbd89e - farjump UnknownScript_0xa0000 + farjump Phone_GenericCall_Male ArnieTuesdayMorning: setflag ENGINE_ARNIE_TUESDAY_MORNING @@ -1229,7 +1229,7 @@ UnknownScript_0xbd89e: farjump Phone_CheckIfUnseenRare_Male ArnieYanmaAlreadySwarming: - farjump UnknownScript_0xa0000 + farjump Phone_GenericCall_Male ; Alan @@ -1279,7 +1279,7 @@ UnknownScript_0xbd90d: if_equal $0, UnknownScript_0xbd926 UnknownScript_0xbd915: - farjump UnknownScript_0xa0000 + farjump Phone_GenericCall_Male AlanWednesdayDay: setflag ENGINE_ALAN_WEDNESDAY_AFTERNOON @@ -1344,7 +1344,7 @@ UnknownScript_0xbd997: UnknownScript_0xbd99f: farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbd9b8 - farjump UnknownScript_0xa0017 + farjump Phone_GenericCall_Female UnknownScript_0xbd9ab: setflag ENGINE_DANA_THURSDAY_NIGHT @@ -1398,7 +1398,7 @@ ChadPhoneScript2: UnknownScript_0xbda14: farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbda2d - farjump UnknownScript_0xa0000 + farjump Phone_GenericCall_Male UnknownScript_0xbda20: setflag ENGINE_CHAD_FRIDAY_MORNING @@ -1453,7 +1453,7 @@ DerekPhoneScript2: .NoContest: farscall PhoneScript_Random4 if_equal $0, .Nugget - farjump UnknownScript_0xa0000 + farjump Phone_GenericCall_Male .BugCatchingContest: farjump PhoneScript_BugCatchingContest @@ -1509,7 +1509,7 @@ TullyPhoneScript2: if_equal $0, TullyFoundWaterStone UnknownScript_0xbdb1b: - farjump UnknownScript_0xa0000 + farjump Phone_GenericCall_Male TullySundayNight: setflag ENGINE_TULLY_SUNDAY_NIGHT @@ -1556,7 +1556,7 @@ BrentPhoneScript2: if_equal $0, UnknownScript_0xbdb8b UnknownScript_0xbdb84: - farjump UnknownScript_0xa0000 + farjump Phone_GenericCall_Male UnknownScript_0xbdb88: setflag ENGINE_BRENT_MONDAY_MORNING @@ -1617,7 +1617,7 @@ UnknownScript_0xbdc08: if_equal $0, UnknownScript_0xbdc69 UnknownScript_0xbdc10: - farjump UnknownScript_0xa0017 + farjump Phone_GenericCall_Female UnknownScript_0xbdc14: setflag ENGINE_TIFFANY_TUESDAY_AFTERNOON @@ -1680,7 +1680,7 @@ VancePhoneScript1: checkcode VAR_WEEKDAY if_not_equal WEDNESDAY, UnknownScript_0xbdc92 checknite - iftrue UnknownScript_0xbdcc1 + iftrue VanceWednesdayNight UnknownScript_0xbdc92: farjump UnknownScript_0xa09a8 @@ -1693,20 +1693,20 @@ VancePhoneScript2: trainertotext BIRD_KEEPER, VANCE1, $0 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_VANCE - iftrue UnknownScript_0xbdcbd + iftrue .WantsBattle checkflag ENGINE_VANCE_WEDNESDAY_NIGHT - iftrue UnknownScript_0xbdcbd + iftrue .WantsBattle farscall PhoneScript_Random3 - if_equal $0, UnknownScript_0xbdcc4 - if_equal $1, UnknownScript_0xbdcc4 + if_equal $0, VanceWantsRematch + if_equal $1, VanceWantsRematch -UnknownScript_0xbdcbd: - farjump UnknownScript_0xa0000 +.WantsBattle: + farjump Phone_GenericCall_Male -UnknownScript_0xbdcc1: +VanceWednesdayNight: setflag ENGINE_VANCE_WEDNESDAY_NIGHT -UnknownScript_0xbdcc4: +VanceWantsRematch: landmarktotext ROUTE_44, $2 setflag ENGINE_VANCE farjump PhoneScript_WantsToBattle_Male @@ -1714,25 +1714,25 @@ UnknownScript_0xbdcc4: WiltonPhoneScript1: trainertotext FISHER, WILTON1, $0 checkflag ENGINE_WILTON - iftrue UnknownScript_0xbdcf7 + iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_WILTON_THURSDAY_MORNING - iftrue UnknownScript_0xbdcf3 + iftrue .NotThursday checkflag ENGINE_WILTON_HAS_ITEM - iftrue UnknownScript_0xbdcfe + iftrue .HasItem checkcode VAR_WEEKDAY - if_not_equal THURSDAY, UnknownScript_0xbdcf3 + if_not_equal THURSDAY, .NotThursday checkmorn - iftrue UnknownScript_0xbdd33 + iftrue WiltonThursdayMorning -UnknownScript_0xbdcf3: +.NotThursday: farjump UnknownScript_0xa09b0 -UnknownScript_0xbdcf7: +.WantsBattle: landmarktotext ROUTE_44, $2 farjump UnknownScript_0xa0a96 -UnknownScript_0xbdcfe: +.HasItem: landmarktotext ROUTE_44, $2 farjump UnknownScript_0xa0aed @@ -1740,28 +1740,28 @@ WiltonPhoneScript2: trainertotext FISHER, WILTON1, $0 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_WILTON - iftrue UnknownScript_0xbdd2f + iftrue .GenericCall checkflag ENGINE_WILTON_THURSDAY_MORNING - iftrue UnknownScript_0xbdd2f + iftrue .GenericCall checkflag ENGINE_WILTON_HAS_ITEM - iftrue UnknownScript_0xbdd2f + iftrue .GenericCall farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbdd36 + if_equal $0, WiltonWantsBattle farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbdd40 + if_equal $0, WiltonHasItem -UnknownScript_0xbdd2f: - farjump UnknownScript_0xa0000 +.GenericCall: + farjump Phone_GenericCall_Male -UnknownScript_0xbdd33: +WiltonThursdayMorning: setflag ENGINE_WILTON_THURSDAY_MORNING -UnknownScript_0xbdd36: +WiltonWantsBattle: landmarktotext ROUTE_44, $2 setflag ENGINE_WILTON farjump PhoneScript_WantsToBattle_Male -UnknownScript_0xbdd40: +WiltonHasItem: setflag ENGINE_WILTON_HAS_ITEM landmarktotext ROUTE_44, $2 clearevent EVENT_WILTON_HAS_ULTRA_BALL @@ -1792,31 +1792,31 @@ UnknownScript_0xbdd40: KenjiPhoneScript1: trainertotext BLACKBELT_T, KENJI3, $0 farscall PhoneScript_AnswerPhone_Male - farjump UnknownScript_0xa09ee + farjump KenjiAnswerPhoneScript KenjiPhoneScript2: trainertotext BLACKBELT_T, KENJI3, $0 farscall PhoneScript_GreetPhone_Male - farjump UnknownScript_0xa064c + farjump KenjiCallingPhoneScript ; Parry ParryPhoneScript1: trainertotext HIKER, PARRY1, $0 checkflag ENGINE_PARRY - iftrue UnknownScript_0xbddac + iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_PARRY_FRIDAY_AFTERNOON - iftrue UnknownScript_0xbdda8 + iftrue .WantsRematch checkcode VAR_WEEKDAY - if_not_equal FRIDAY, UnknownScript_0xbdda8 + if_not_equal FRIDAY, .WantsRematch checkday - iftrue UnknownScript_0xbddd7 + iftrue ParryFridayDay -UnknownScript_0xbdda8: - farjump UnknownScript_0xa09b8 +.WantsRematch: + farjump ParryBattleWithMe -UnknownScript_0xbddac: +.WantsBattle: landmarktotext ROUTE_45, $2 farjump UnknownScript_0xa0a9b @@ -1824,20 +1824,20 @@ ParryPhoneScript2: trainertotext HIKER, PARRY1, $0 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_PARRY - iftrue UnknownScript_0xbddd3 + iftrue .GenericCall checkflag ENGINE_PARRY_FRIDAY_AFTERNOON - iftrue UnknownScript_0xbddd3 + iftrue .GenericCall farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbddda - if_equal $1, UnknownScript_0xbddda + if_equal $0, ParryWantsBattle + if_equal $1, ParryWantsBattle -UnknownScript_0xbddd3: - farjump UnknownScript_0xa0000 +.GenericCall: + farjump Phone_GenericCall_Male -UnknownScript_0xbddd7: +ParryFridayDay: setflag ENGINE_PARRY_FRIDAY_AFTERNOON -UnknownScript_0xbddda: +ParryWantsBattle: landmarktotext ROUTE_45, $2 setflag ENGINE_PARRY farjump PhoneScript_WantsToBattle_Male @@ -1857,30 +1857,30 @@ ErinPhoneScript1: iftrue ErinSaturdayNight .NotSaturday: - farjump UnknownScript_0xa09c0 + farjump ErinWorkingHardScript .WantsBattle: landmarktotext ROUTE_46, $2 - farjump UnknownScript_0xa0aa0 + farjump ErinComeBattleScript ErinPhoneScript2: trainertotext PICNICKER, ERIN1, $0 farscall PhoneScript_GreetPhone_Female checkflag ENGINE_ERIN - iftrue UnknownScript_0xbde2e + iftrue .GenericCall checkflag ENGINE_ERIN_SATURDAY_NIGHT - iftrue UnknownScript_0xbde2e + iftrue .GenericCall farscall PhoneScript_Random3 - if_equal $0, UnknownScript_0xbde35 - if_equal $1, UnknownScript_0xbde35 + if_equal $0, ErinWantsBattle + if_equal $1, ErinWantsBattle -UnknownScript_0xbde2e: - farjump UnknownScript_0xa0017 +.GenericCall: + farjump Phone_GenericCall_Female ErinSaturdayNight: setflag ENGINE_ERIN_SATURDAY_NIGHT -UnknownScript_0xbde35: +ErinWantsBattle: landmarktotext ROUTE_46, $2 setflag ENGINE_ERIN farjump PhoneScript_WantsToBattle_Female diff --git a/text/phone/extra.asm b/text/phone/extra.asm index 3d45b39d6..6115fbbae 100644 --- a/text/phone/extra.asm +++ b/text/phone/extra.asm @@ -1707,7 +1707,7 @@ UnknownText_0x66ed3: ; 0x66ed3 done ; 0x66f11 -UnknownText_0x66f11: ; 0x66f11 +KenjiBreakText: ; 0x66f11 text "I'm taking a break" line "on ROUTE 45!" @@ -1786,7 +1786,7 @@ UnknownText_0x670eb: ; 0x670eb done ; 0x67106 -UnknownText_0x67106: ; 0x67106 +ParryBattleWithMeText: ; 0x67106 text "You'll battle with" line "me again, right?" done @@ -1858,7 +1858,7 @@ UnknownText_0x67281: ; 0x67281 done ; 0x67294 -UnknownText_0x67294: ; 0x67294 +ErinWorkingHardText: ; 0x67294 text "I'm working hard" line "to raise my" cont "#MON!" @@ -1868,7 +1868,7 @@ UnknownText_0x67294: ; 0x67294 done ; 0x672d5 -UnknownText_0x672d5: ; 0x672d5 +ErinComeBattleText: ; 0x672d5 text "Oh, !" line "Come battle ERIN!" From f905a2353e27a7e15402ba9bd6705c4fa3943705 Mon Sep 17 00:00:00 2001 From: surskitty Date: Thu, 14 Dec 2017 15:25:46 -0500 Subject: [PATCH 13/17] One day we'll be through with this. Labels. --- engine/phone_scripts.asm | 266 +++++++++++++++---------------- engine/phone_scripts_generic.asm | 12 +- 2 files changed, 139 insertions(+), 139 deletions(-) diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index ea265aa92..7da196474 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -454,7 +454,7 @@ GavenPhoneScript2: .WaitingForBattle: farscall PhoneScript_Random3 - if_equal $0, UnknownScript_0xbd239 + if_equal $0, GavenFoundRare farjump Phone_GenericCall_Male GavenThursdayMorning: @@ -465,7 +465,7 @@ GavenWantsRematch: setflag ENGINE_GAVEN farjump PhoneScript_WantsToBattle_Male -UnknownScript_0xbd239: +GavenFoundRare: farjump Phone_CheckIfUnseenRare_Male ; Beth @@ -473,19 +473,19 @@ UnknownScript_0xbd239: BethPhoneScript1: trainertotext COOLTRAINERF, BETH1, $0 checkflag ENGINE_BETH - iftrue UnknownScript_0xbd260 + iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_BETH_FRIDAY_AFTERNOON - iftrue UnknownScript_0xbd25c + iftrue .NotFriday checkcode VAR_WEEKDAY - if_not_equal FRIDAY, UnknownScript_0xbd25c + if_not_equal FRIDAY, .NotFriday checkday - iftrue UnknownScript_0xbd287 + iftrue BethFridayAfternoon -UnknownScript_0xbd25c: +.NotFriday: farjump UnknownScript_0xa0918 -UnknownScript_0xbd260: +.WantsBattle: landmarktotext ROUTE_26, $2 farjump UnknownScript_0xa0a3c @@ -493,16 +493,16 @@ BethPhoneScript2: trainertotext COOLTRAINERF, BETH1, $0 farscall PhoneScript_GreetPhone_Female checkflag ENGINE_BETH - iftrue UnknownScript_0xbd283 + iftrue .Generic checkflag ENGINE_BETH_FRIDAY_AFTERNOON - iftrue UnknownScript_0xbd283 + iftrue .Generic farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbd28a -UnknownScript_0xbd283: +.Generic: farjump Phone_GenericCall_Female -UnknownScript_0xbd287: +BethFridayAfternoon: setflag ENGINE_BETH_FRIDAY_AFTERNOON UnknownScript_0xbd28a: @@ -541,17 +541,17 @@ JosePhoneScript2: trainertotext BIRD_KEEPER, JOSE2, $0 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_JOSE - iftrue UnknownScript_0xbd2f5 + iftrue .Generic checkflag ENGINE_JOSE_SATURDAY_NIGHT - iftrue UnknownScript_0xbd2f5 + iftrue .Generic checkflag ENGINE_JOSE_HAS_STAR_PIECE - iftrue UnknownScript_0xbd2f5 + iftrue .Generic farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbd304 farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbd312 -UnknownScript_0xbd2f5: +.Generic: farscall PhoneScript_Random3 if_equal $0, UnknownScript_0xbd30e farjump Phone_GenericCall_Male @@ -577,19 +577,19 @@ UnknownScript_0xbd312: ReenaPhoneScript1: trainertotext COOLTRAINERF, REENA1, $0 checkflag ENGINE_REENA - iftrue UnknownScript_0xbd33f + iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_REENA_SUNDAY_MORNING - iftrue UnknownScript_0xbd33b + iftrue .NotSunday checkcode VAR_WEEKDAY - if_not_equal SUNDAY, UnknownScript_0xbd33b + if_not_equal SUNDAY, .NotSunday checkmorn - iftrue UnknownScript_0xbd366 + iftrue ReenaSundayMorning -UnknownScript_0xbd33b: +.NotSunday: farjump UnknownScript_0xa0928 -UnknownScript_0xbd33f: +.WantsBattle: landmarktotext ROUTE_27, $2 farjump UnknownScript_0xa0a46 @@ -597,19 +597,19 @@ ReenaPhoneScript2: trainertotext COOLTRAINERF, REENA1, $0 farscall PhoneScript_GreetPhone_Female checkflag ENGINE_REENA - iftrue UnknownScript_0xbd362 + iftrue .Generic checkflag ENGINE_REENA_SUNDAY_MORNING - iftrue UnknownScript_0xbd362 + iftrue .Generic farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbd369 + if_equal $0, ReenaWantsBattle -UnknownScript_0xbd362: +.Generic: farjump Phone_GenericCall_Female -UnknownScript_0xbd366: +ReenaSundayMorning: setflag ENGINE_REENA_SUNDAY_MORNING -UnknownScript_0xbd369: +ReenaWantsBattle: landmarktotext ROUTE_27, $2 setflag ENGINE_REENA farjump PhoneScript_WantsToBattle_Female @@ -619,20 +619,20 @@ UnknownScript_0xbd369: JoeyPhoneScript1: trainertotext YOUNGSTER, JOEY1, $0 checkflag ENGINE_JOEY - iftrue UnknownScript_0xbd399 + iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_JOEY_MONDAY_AFTERNOON - iftrue UnknownScript_0xbd392 + iftrue .NotMonday checkcode VAR_WEEKDAY - if_not_equal MONDAY, UnknownScript_0xbd392 + if_not_equal MONDAY, .NotMonday checkday - iftrue UnknownScript_0xbd3c4 + iftrue JoeyMondayAfternoon -UnknownScript_0xbd392: +.NotMonday: special RandomPhoneMon farjump UnknownScript_0xa0930 -UnknownScript_0xbd399: +.WantsBattle: landmarktotext ROUTE_30, $2 farjump UnknownScript_0xa0a4b @@ -640,20 +640,20 @@ JoeyPhoneScript2: trainertotext YOUNGSTER, JOEY1, $0 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_JOEY - iftrue UnknownScript_0xbd3c0 + iftrue .Generic checkflag ENGINE_JOEY_MONDAY_AFTERNOON - iftrue UnknownScript_0xbd3c0 + iftrue .Generic farscall PhoneScript_Random3 - if_equal $0, UnknownScript_0xbd3c7 - if_equal $1, UnknownScript_0xbd3c7 + if_equal $0, JoeyWantsBattle + if_equal $1, JoeyWantsBattle -UnknownScript_0xbd3c0: +.Generic: farjump Phone_GenericCall_Male -UnknownScript_0xbd3c4: +JoeyMondayAfternoon: setflag ENGINE_JOEY_MONDAY_AFTERNOON -UnknownScript_0xbd3c7: +JoeyWantsBattle: landmarktotext ROUTE_30, $2 setflag ENGINE_JOEY farjump PhoneScript_WantsToBattle_Male @@ -663,38 +663,38 @@ UnknownScript_0xbd3c7: WadePhoneScript1: trainertotext BUG_CATCHER, WADE1, $0 checkflag ENGINE_WADE - iftrue UnknownScript_0xbd41a + iftrue WadeWantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_WADE_TUESDAY_NIGHT - iftrue UnknownScript_0xbd3f6 + iftrue .NotTuesday checkflag ENGINE_WADE_HAS_ITEM - iftrue UnknownScript_0xbd421 + iftrue WadeHasItem checkcode VAR_WEEKDAY - if_not_equal TUESDAY, UnknownScript_0xbd3f6 + if_not_equal TUESDAY, .NotTuesday checknite - iftrue UnknownScript_0xbd484 + iftrue WadeTuesdayNight -UnknownScript_0xbd3f6: +.NotTuesday: farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbd412 + if_equal $0, .NoContest checkflag ENGINE_DAILY_BUG_CONTEST - iftrue UnknownScript_0xbd412 + iftrue .NoContest checkcode VAR_WEEKDAY - if_equal TUESDAY, UnknownScript_0xbd416 - if_equal THURSDAY, UnknownScript_0xbd416 - if_equal SATURDAY, UnknownScript_0xbd416 + if_equal TUESDAY, WadeContestToday + if_equal THURSDAY, WadeContestToday + if_equal SATURDAY, WadeContestToday -UnknownScript_0xbd412: +.NoContest: farjump UnknownScript_0xa0938 -UnknownScript_0xbd416: +WadeContestToday: farjump PhoneScript_BugCatchingContest -UnknownScript_0xbd41a: +WadeWantsBattle: landmarktotext ROUTE_31, $2 farjump UnknownScript_0xa0a50 -UnknownScript_0xbd421: +WadeHasItem: landmarktotext ROUTE_31, $2 farjump UnknownScript_0xa0ab5 @@ -732,7 +732,7 @@ UnknownScript_0xbd474: Wade_ContestToday: farjump PhoneScript_BugCatchingContest -UnknownScript_0xbd484: +WadeTuesdayNight: setflag ENGINE_WADE_TUESDAY_NIGHT UnknownScript_0xbd487: @@ -1446,16 +1446,16 @@ DerekPhoneScript2: checkflag ENGINE_DAILY_BUG_CONTEST iftrue .NoContest checkcode VAR_WEEKDAY - if_equal TUESDAY, .BugCatchingContest - if_equal THURSDAY, .BugCatchingContest - if_equal SATURDAY, .BugCatchingContest + if_equal TUESDAY, .ContestToday + if_equal THURSDAY, .ContestToday + if_equal SATURDAY, .ContestToday .NoContest: farscall PhoneScript_Random4 if_equal $0, .Nugget farjump Phone_GenericCall_Male -.BugCatchingContest: +.ContestToday: farjump PhoneScript_BugCatchingContest .Nugget: @@ -1466,7 +1466,7 @@ DerekPhoneScript2: TullyPhoneScript1: trainertotext FISHER, TULLY1, $0 checkflag ENGINE_TULLY - iftrue UnknownScript_0xbdad5 + iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_TULLY_SUNDAY_NIGHT iftrue .NotSunday @@ -1480,7 +1480,7 @@ TullyPhoneScript1: .NotSunday: farjump UnknownScript_0xa0990 -UnknownScript_0xbdad5: +.WantsBattle: landmarktotext ROUTE_42, $2 farjump UnknownScript_0xa0a82 @@ -1492,13 +1492,13 @@ TullyPhoneScript2: trainertotext FISHER, TULLY1, $0 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_TULLY - iftrue UnknownScript_0xbdb1b + iftrue .Generic checkflag ENGINE_TULLY_SUNDAY_NIGHT - iftrue UnknownScript_0xbdb1b + iftrue .Generic checkflag ENGINE_TULLY_HAS_WATER_STONE - iftrue UnknownScript_0xbdb1b + iftrue .Generic farscall PhoneScript_Random3 - if_equal $0, UnknownScript_0xbdb22 + if_equal $0, TullyWantsBattle checkevent EVENT_TULLY_GAVE_WATER_STONE iftrue .WaterStone farscall PhoneScript_Random2 @@ -1508,13 +1508,13 @@ TullyPhoneScript2: farscall PhoneScript_Random11 if_equal $0, TullyFoundWaterStone -UnknownScript_0xbdb1b: +.Generic: farjump Phone_GenericCall_Male TullySundayNight: setflag ENGINE_TULLY_SUNDAY_NIGHT -UnknownScript_0xbdb22: +TullyWantsBattle: landmarktotext ROUTE_42, $2 setflag ENGINE_TULLY farjump PhoneScript_WantsToBattle_Male @@ -1527,19 +1527,19 @@ TullyFoundWaterStone: BrentPhoneScript1: trainertotext POKEMANIAC, BRENT1, $0 checkflag ENGINE_BRENT - iftrue UnknownScript_0xbdb59 + iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_BRENT_MONDAY_MORNING - iftrue UnknownScript_0xbdb55 + iftrue .NotMonday checkcode VAR_WEEKDAY - if_not_equal MONDAY, UnknownScript_0xbdb55 + if_not_equal MONDAY, .NotMonday checkmorn - iftrue UnknownScript_0xbdb88 + iftrue BrentMondayMorning -UnknownScript_0xbdb55: +.NotMonday: farjump UnknownScript_0xa0998 -UnknownScript_0xbdb59: +.WantsBattle: landmarktotext ROUTE_43, $2 farjump UnknownScript_0xa0a87 @@ -1549,19 +1549,19 @@ BrentPhoneScript2: farscall PhoneScript_Random2 if_equal $0, BrentBillTrivia checkflag ENGINE_BRENT - iftrue UnknownScript_0xbdb84 + iftrue .Generic checkflag ENGINE_BRENT_MONDAY_MORNING - iftrue UnknownScript_0xbdb84 + iftrue .Generic farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbdb8b + if_equal $0, BrentWantsBattle -UnknownScript_0xbdb84: +.Generic: farjump Phone_GenericCall_Male -UnknownScript_0xbdb88: +BrentMondayMorning: setflag ENGINE_BRENT_MONDAY_MORNING -UnknownScript_0xbdb8b: +BrentWantsBattle: landmarktotext ROUTE_43, $2 setflag ENGINE_BRENT farjump PhoneScript_WantsToBattle_Male @@ -1572,98 +1572,98 @@ BrentBillTrivia: TiffanyPhoneScript1: trainertotext PICNICKER, TIFFANY3, $0 checkflag ENGINE_TIFFANY - iftrue UnknownScript_0xbdbc2 + iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_TIFFANY_TUESDAY_AFTERNOON - iftrue UnknownScript_0xbdbbe + iftrue .NotTuesday checkflag ENGINE_TIFFANY_HAS_PINK_BOW - iftrue UnknownScript_0xbdbc9 + iftrue .HasItem checkcode VAR_WEEKDAY - if_not_equal TUESDAY, UnknownScript_0xbdbbe + if_not_equal TUESDAY, .NotTuesday checkday - iftrue UnknownScript_0xbdc14 + iftrue TiffanyTuesdayAfternoon -UnknownScript_0xbdbbe: +.NotTuesday: farjump UnknownScript_0xa09a0 -UnknownScript_0xbdbc2: +.WantsBattle: landmarktotext ROUTE_43, $2 farjump UnknownScript_0xa0a8c -UnknownScript_0xbdbc9: +.HasItem: landmarktotext ROUTE_43, $2 farjump UnknownScript_0xa0ae5 TiffanyPhoneScript2: trainertotext PICNICKER, TIFFANY3, $0 farscall PhoneScript_Random4 - if_equal $0, UnknownScript_0xbdc21 + if_equal $0, TiffanyTalksAboutFamily farscall PhoneScript_GreetPhone_Female checkflag ENGINE_TIFFANY - iftrue UnknownScript_0xbdc10 + iftrue TiffanyGenericCall checkflag ENGINE_TIFFANY_TUESDAY_AFTERNOON - iftrue UnknownScript_0xbdc10 + iftrue TiffanyGenericCall checkflag ENGINE_TIFFANY_HAS_PINK_BOW - iftrue UnknownScript_0xbdc10 + iftrue TiffanyGenericCall farscall PhoneScript_Random3 - if_equal $0, UnknownScript_0xbdc17 + if_equal $0, TiffanyWantsBattle checkevent EVENT_TIFFANY_GAVE_PINK_BOW - iftrue UnknownScript_0xbdc08 + iftrue .PinkBow farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbdc69 + if_equal $0, TiffanyHasPinkBow -UnknownScript_0xbdc08: +.PinkBow: farscall PhoneScript_Random11 - if_equal $0, UnknownScript_0xbdc69 + if_equal $0, TiffanyHasPinkBow -UnknownScript_0xbdc10: +TiffanyGenericCall: farjump Phone_GenericCall_Female -UnknownScript_0xbdc14: +TiffanyTuesdayAfternoon: setflag ENGINE_TIFFANY_TUESDAY_AFTERNOON -UnknownScript_0xbdc17: +TiffanyWantsBattle: landmarktotext ROUTE_43, $2 setflag ENGINE_TIFFANY farjump PhoneScript_WantsToBattle_Female -UnknownScript_0xbdc21: +TiffanyTalksAboutFamily: random $6 - if_equal $0, UnknownScript_0xbdc3b - if_equal $1, UnknownScript_0xbdc42 - if_equal $2, UnknownScript_0xbdc49 - if_equal $3, UnknownScript_0xbdc50 - if_equal $4, UnknownScript_0xbdc57 - if_equal $5, UnknownScript_0xbdc5e + if_equal $0, .Grandma + if_equal $1, .Grandpa + if_equal $2, .Mom + if_equal $3, .Dad + if_equal $4, .Sister + if_equal $5, .Brother -UnknownScript_0xbdc3b: - stringtotext String_be643, $1 - jump UnknownScript_0xbdc65 +.Grandma: + stringtotext GrandmaString, $1 + jump TiffanyFamily -UnknownScript_0xbdc42: - stringtotext String_be64b, $1 - jump UnknownScript_0xbdc65 +.Grandpa: + stringtotext GrandpaString, $1 + jump TiffanyFamily -UnknownScript_0xbdc49: - stringtotext String_be653, $1 - jump UnknownScript_0xbdc65 +.Mom: + stringtotext MomString, $1 + jump TiffanyFamily -UnknownScript_0xbdc50: - stringtotext String_be657, $1 - jump UnknownScript_0xbdc65 +.Dad: + stringtotext DadString, $1 + jump TiffanyFamily -UnknownScript_0xbdc57: - stringtotext String_be65b, $1 - jump UnknownScript_0xbdc65 +.Sister: + stringtotext SisterString, $1 + jump TiffanyFamily -UnknownScript_0xbdc5e: - stringtotext String_be662, $1 - jump UnknownScript_0xbdc65 +.Brother: + stringtotext BrotherString, $1 + jump TiffanyFamily -UnknownScript_0xbdc65: +TiffanyFamily: farjump UnknownScript_0xa047f -UnknownScript_0xbdc69: +TiffanyHasPinkBow: setflag ENGINE_TIFFANY_HAS_PINK_BOW landmarktotext ROUTE_43, $2 farjump PhoneScript_FoundItem_Female @@ -1673,19 +1673,19 @@ UnknownScript_0xbdc69: VancePhoneScript1: trainertotext BIRD_KEEPER, VANCE1, $0 checkflag ENGINE_VANCE - iftrue UnknownScript_0xbdc96 + iftrue VanceWantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_VANCE_WEDNESDAY_NIGHT - iftrue UnknownScript_0xbdc92 + iftrue .NotWednesday checkcode VAR_WEEKDAY - if_not_equal WEDNESDAY, UnknownScript_0xbdc92 + if_not_equal WEDNESDAY, .NotWednesday checknite iftrue VanceWednesdayNight -UnknownScript_0xbdc92: +.NotWednesday: farjump UnknownScript_0xa09a8 -UnknownScript_0xbdc96: +VanceWantsBattle: landmarktotext ROUTE_44, $2 farjump UnknownScript_0xa0a91 diff --git a/engine/phone_scripts_generic.asm b/engine/phone_scripts_generic.asm index b4ef2ba9e..e1b53a950 100644 --- a/engine/phone_scripts_generic.asm +++ b/engine/phone_scripts_generic.asm @@ -1257,10 +1257,10 @@ PhoneScript_MonFlavorText: ; be643 -String_be643: db "Grandma@" -String_be64b: db "Grandpa@" -String_be653: db "Mom@" -String_be657: db "Dad@" -String_be65b: db "Sister@" -String_be662: db "Brother@" +GrandmaString: db "Grandma@" +GrandpaString: db "Grandpa@" +MomString: db "Mom@" +DadString: db "Dad@" +SisterString: db "Sister@" +BrotherString: db "Brother@" From 955a0c9dd387e6b685af2d2b8433a104ad005b7b Mon Sep 17 00:00:00 2001 From: surskitty Date: Thu, 14 Dec 2017 15:39:46 -0500 Subject: [PATCH 14/17] Another batch. --- engine/phone_scripts.asm | 86 ++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index 7da196474..592231258 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -24,12 +24,12 @@ MomPhoneScript: ; 0xbceaa checkcode VAR_ROOFPALETTE if_equal $1, MomPhonePalette1 if_equal $2, MomPhonePalette2 - jump UnknownScript_0xbcf2f + jump MomPhoneOther MomPhoneLandmark: ; 0xbcedf farwritetext MomPhoneLandmarkText buttonsound - jump UnknownScript_0xbcf37 + jump MomSavingMoney MomPhonePalette1: ; 0xbcee7 checkcode VAR_MAPGROUP @@ -40,17 +40,17 @@ MomPhonePalette1: ; 0xbcee7 if_equal GROUP_GOLDENROD_CITY, .goldenrod farwritetext MomPhoneGenericAreaText buttonsound - jump UnknownScript_0xbcf37 + jump MomSavingMoney .newbark ; 0xbcf05 farwritetext MomPhoneNewBarkText buttonsound - jump UnknownScript_0xbcf37 + jump MomSavingMoney .cherrygrove ; 0xbcf0d farwritetext MomPhoneCherrygroveText buttonsound - jump UnknownScript_0xbcf37 + jump MomSavingMoney .violet ; 0xbcf15 landmarktotext SPROUT_TOWER, 1 @@ -65,33 +65,33 @@ MomPhonePalette1: ; 0xbcee7 MomPhonePalette2: ; 0xbcf27 farwritetext MomOtherAreaText buttonsound - jump UnknownScript_0xbcf37 + jump MomSavingMoney -UnknownScript_0xbcf2f: ; 0xbcf2f +MomPhoneOther: ; 0xbcf2f farwritetext MomDeterminedText buttonsound - jump UnknownScript_0xbcf37 + jump MomSavingMoney -UnknownScript_0xbcf37: ; 0xbcf37 +MomSavingMoney: ; 0xbcf37 checkflag ENGINE_MOM_SAVING_MONEY - iffalse CheckIfMomHasMoney + iffalse MomIsNotSaving checkmoney $1, 0 - if_equal $0, UnknownScript_0xbcf55 - jump UnknownScript_0xbcf63 + if_equal $0, MomSavingHasMoney + jump MomSavingButBroke -CheckIfMomHasMoney: ; 0xbcf49 +MomIsNotSaving: ; 0xbcf49 checkmoney $1, 0 if_equal $0, MomHasMoney jump MomHasNoMoney -UnknownScript_0xbcf55: ; 0xbcf55 +MomSavingHasMoney: ; 0xbcf55 readmoney $1, $0 farwritetext MomCheckBalanceText yesorno iftrue MomPhoneSaveMoneyScript jump MomPhoneWontSaveMoneyScript -UnknownScript_0xbcf63: ; 0xbcf63 +MomSavingButBroke: ; 0xbcf63 farwritetext UnknownText_0x1b41ea yesorno iftrue MomPhoneSaveMoneyScript @@ -497,7 +497,7 @@ BethPhoneScript2: checkflag ENGINE_BETH_FRIDAY_AFTERNOON iftrue .Generic farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbd28a + if_equal $0, BethWantsBattle .Generic: farjump Phone_GenericCall_Female @@ -505,7 +505,7 @@ BethPhoneScript2: BethFridayAfternoon: setflag ENGINE_BETH_FRIDAY_AFTERNOON -UnknownScript_0xbd28a: +BethWantsBattle: landmarktotext ROUTE_26, $2 setflag ENGINE_BETH farjump PhoneScript_WantsToBattle_Female @@ -520,7 +520,7 @@ JosePhoneScript1: checkflag ENGINE_JOSE_SATURDAY_NIGHT iftrue .NotSaturday checkflag ENGINE_JOSE_HAS_STAR_PIECE - iftrue UnknownScript_0xbd2c4 + iftrue .HasItem checkcode VAR_WEEKDAY if_not_equal SATURDAY, .NotSaturday checknite @@ -533,7 +533,7 @@ JosePhoneScript1: landmarktotext ROUTE_27, $2 farjump UnknownScript_0xa0a41 -UnknownScript_0xbd2c4: +.HasItem: landmarktotext ROUTE_27, $2 farjump UnknownScript_0xa0a41 @@ -547,27 +547,27 @@ JosePhoneScript2: checkflag ENGINE_JOSE_HAS_STAR_PIECE iftrue .Generic farscall PhoneScript_Random3 - if_equal $0, UnknownScript_0xbd304 + if_equal $0, JoseWantsBattle farscall PhoneScript_Random3 - if_equal $0, UnknownScript_0xbd312 + if_equal $0, JoseHasStarPiece .Generic: farscall PhoneScript_Random3 - if_equal $0, UnknownScript_0xbd30e + if_equal $0, JoseFoundRare farjump Phone_GenericCall_Male JoseSaturdayNight: setflag ENGINE_JOSE_SATURDAY_NIGHT -UnknownScript_0xbd304: +JoseWantsBattle: landmarktotext ROUTE_27, $2 setflag ENGINE_JOSE farjump PhoneScript_WantsToBattle_Male -UnknownScript_0xbd30e: +JoseFoundRare: farjump Phone_CheckIfUnseenRare_Male -UnknownScript_0xbd312: +JoseHasStarPiece: setflag ENGINE_JOSE_HAS_STAR_PIECE landmarktotext ROUTE_27, $2 farjump PhoneScript_FoundItem_Male @@ -751,27 +751,27 @@ UnknownScript_0xbd495: clearevent EVENT_WADE_HAS_PRZCUREBERRY clearevent EVENT_WADE_HAS_BITTER_BERRY random $4 - if_equal $0, UnknownScript_0xbd4b9 - if_equal $1, UnknownScript_0xbd4bf - if_equal $2, UnknownScript_0xbd4c5 - if_equal $3, UnknownScript_0xbd4cb + if_equal $0, .Berry + if_equal $1, .PsnCureBerry + if_equal $2, .PrzCureBerry + if_equal $3, .Bitterberry -UnknownScript_0xbd4b9: +.Berry: setevent EVENT_WADE_HAS_BERRY - jump UnknownScript_0xbd4ce + jump .FoundBerry -UnknownScript_0xbd4bf: +.PsnCureBerry: setevent EVENT_WADE_HAS_PSNCUREBERRY - jump UnknownScript_0xbd4ce + jump .FoundBerry -UnknownScript_0xbd4c5: +.PrzCureBerry: setevent EVENT_WADE_HAS_PRZCUREBERRY - jump UnknownScript_0xbd4ce + jump .FoundBerry -UnknownScript_0xbd4cb: +.Bitterberry: setevent EVENT_WADE_HAS_BITTER_BERRY -UnknownScript_0xbd4ce: +.FoundBerry: farjump PhoneScript_FoundItem_Male ; Ralph @@ -825,7 +825,7 @@ Ralph_FightMe: Ralph_SetUpSwarm: checkflag ENGINE_SPECIAL_WILDDATA - iftrue UnknownScript_0xbd55c + iftrue .Generic setflag ENGINE_SPECIAL_WILDDATA pokenamemem QWILFISH, $1 landmarktotext ROUTE_32, $2 @@ -833,7 +833,7 @@ Ralph_SetUpSwarm: special Special_ActivateFishingSwarm farjump UnknownScript_0xa05d6 -UnknownScript_0xbd55c: +.Generic: farjump Phone_GenericCall_Male ; Liz @@ -841,7 +841,7 @@ UnknownScript_0xbd55c: LizPhoneScript1: trainertotext PICNICKER, LIZ1, $0 checkflag ENGINE_LIZ - iftrue UnknownScript_0xbd586 + iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_LIZ_THURSDAY_AFTERNOON iftrue .NotThursday @@ -854,7 +854,7 @@ LizPhoneScript1: special RandomPhoneMon farjump UnknownScript_0xa0948 -UnknownScript_0xbd586: +.WantsBattle: landmarktotext ROUTE_32, $2 farjump UnknownScript_0xa0a5a @@ -872,11 +872,11 @@ UnknownScript_0xbd5a9: farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbd5d4 checkflag ENGINE_FLYPOINT_GOLDENROD - iffalse UnknownScript_0xbd5bf + iffalse .Generic farscall PhoneScript_Random2 if_equal $0, UnknownScript_0xbd5c6 -UnknownScript_0xbd5bf: +.Generic: farjump Phone_GenericCall_Female LizThursdayAfternoon: From 75c56e86c4ead8d38d4604bc20c2b35c57502560 Mon Sep 17 00:00:00 2001 From: surskitty Date: Thu, 14 Dec 2017 21:02:34 -0500 Subject: [PATCH 15/17] The labelling never ends, but phone_scripts.asm does. --- engine/phone_callers.asm | 4 +- engine/phone_gossip.asm | 18 +-- engine/phone_scripts.asm | 330 +++++++++++++++++++-------------------- text/phone/extra.asm | 6 +- text/phone/extra2.asm | 2 +- text/phone/mom.asm | 8 +- 6 files changed, 184 insertions(+), 184 deletions(-) diff --git a/engine/phone_callers.asm b/engine/phone_callers.asm index 561d9bb78..9d2ff867f 100644 --- a/engine/phone_callers.asm +++ b/engine/phone_callers.asm @@ -680,7 +680,7 @@ PhoneScript_RematchText_Female: buttonsound end -LizWrongNumber: +LizWrongNumberScript: farwritetext LizHiTaniaText end @@ -869,7 +869,7 @@ PhoneScript_BugCatchingContest: buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa05be: +IrwinRocketRumor: farwritetext UnknownText_0x64032 buttonsound jump PhoneScript_HangupText_Male diff --git a/engine/phone_gossip.asm b/engine/phone_gossip.asm index 2bca4475c..3b269fa31 100644 --- a/engine/phone_gossip.asm +++ b/engine/phone_gossip.asm @@ -130,7 +130,7 @@ UnknownScript_0xa06da: buttonsound jump PhoneScript_HangupText_Female -ChadOakGossip: +ChadOakGossipScript: random 10 if_equal 0, .Blue if_equal 1, .Daisy @@ -460,8 +460,8 @@ UnknownScript_0xa09a8: buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa09b0: - farwritetext UnknownText_0x66ca7 +WiltonHaventFoundAnything: + farwritetext WiltonHaventFoundAnythingText buttonsound jump PhoneScript_HangupText_Male @@ -541,8 +541,8 @@ UnknownScript_0xa0a37: farwritetext UnknownText_0x174c49 end -UnknownScript_0xa0a3c: - farwritetext UnknownText_0x174ee2 +BethBattleReminderScript: + farwritetext BethForgetDealText end UnknownScript_0xa0a41: @@ -617,8 +617,8 @@ UnknownScript_0xa0a96: farwritetext UnknownText_0x66cf7 end -UnknownScript_0xa0a9b: - farwritetext UnknownText_0x6712a +ParryHaventYouGottenTo: + farwritetext ParryHaventYouGottenToText end ErinComeBattleScript: @@ -670,8 +670,8 @@ UnknownScript_0xa0ae5: buttonsound jump PhoneScript_HangupText_Female -UnknownScript_0xa0aed: - farwritetext UnknownText_0x66d45 +WiltonWantThis: + farwritetext WiltonWantThisText buttonsound jump PhoneScript_HangupText_Male diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index 592231258..7e8b94a91 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -92,27 +92,27 @@ MomSavingHasMoney: ; 0xbcf55 jump MomPhoneWontSaveMoneyScript MomSavingButBroke: ; 0xbcf63 - farwritetext UnknownText_0x1b41ea + farwritetext MomImportantToSaveText yesorno iftrue MomPhoneSaveMoneyScript jump MomPhoneWontSaveMoneyScript MomHasNoMoney: ; 0xbcf6e - farwritetext UnknownText_0x1b420d + farwritetext MomYoureNotSavingText yesorno iftrue MomPhoneSaveMoneyScript jump MomPhoneWontSaveMoneyScript MomHasMoney: ; 0xbcf79 readmoney $1, $0 - farwritetext UnknownText_0x1b4249 + farwritetext MomYouveSavedText yesorno iftrue MomPhoneSaveMoneyScript jump MomPhoneWontSaveMoneyScript MomPhoneSaveMoneyScript: ; 0xbcf87 setflag ENGINE_MOM_SAVING_MONEY - farwritetext UnknownText_0x1b4289 + farwritetext MomOKIllSaveText buttonsound jump MomPhoneHangUpScript @@ -487,7 +487,7 @@ BethPhoneScript1: .WantsBattle: landmarktotext ROUTE_26, $2 - farjump UnknownScript_0xa0a3c + farjump BethBattleReminderScript BethPhoneScript2: trainertotext COOLTRAINERF, BETH1, $0 @@ -712,21 +712,21 @@ WadePhoneScript2: .NoContest: checkflag ENGINE_WADE - iftrue UnknownScript_0xbd474 + iftrue .next checkflag ENGINE_WADE_TUESDAY_NIGHT - iftrue UnknownScript_0xbd474 + iftrue .next checkflag ENGINE_WADE_HAS_ITEM - iftrue UnknownScript_0xbd474 + iftrue .next farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbd495 + if_equal $0, WadeHasItem2 checkflag ENGINE_FLYPOINT_GOLDENROD - iffalse UnknownScript_0xbd474 + iffalse .next farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbd487 + if_equal $0, WadeWantsBattle2 -UnknownScript_0xbd474: +.next: farscall PhoneScript_Random3 - if_equal $0, UnknownScript_0xbd491 + if_equal $0, WadeFoundRare farjump Phone_GenericCall_Male Wade_ContestToday: @@ -735,15 +735,15 @@ Wade_ContestToday: WadeTuesdayNight: setflag ENGINE_WADE_TUESDAY_NIGHT -UnknownScript_0xbd487: +WadeWantsBattle2: landmarktotext ROUTE_31, $2 setflag ENGINE_WADE farjump PhoneScript_WantsToBattle_Male -UnknownScript_0xbd491: +WadeFoundRare: farjump Phone_CheckIfUnseenRare_Male -UnknownScript_0xbd495: +WadeHasItem2: setflag ENGINE_WADE_HAS_ITEM landmarktotext ROUTE_31, $2 clearevent EVENT_WADE_HAS_BERRY @@ -861,20 +861,20 @@ LizPhoneScript1: LizPhoneScript2: trainertotext PICNICKER, LIZ1, $0 farscall PhoneScript_Random4 - if_equal $0, UnknownScript_0xbd5d0 + if_equal $0, LizWrongNumber farscall PhoneScript_GreetPhone_Female checkflag ENGINE_LIZ - iftrue UnknownScript_0xbd5a9 + iftrue .next checkflag ENGINE_LIZ_THURSDAY_AFTERNOON - iftrue UnknownScript_0xbd5a9 + iftrue .next -UnknownScript_0xbd5a9: +.next: farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbd5d4 + if_equal $0, LizGossip checkflag ENGINE_FLYPOINT_GOLDENROD iffalse .Generic farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbd5c6 + if_equal $0, LizWantsBattle .Generic: farjump Phone_GenericCall_Female @@ -882,63 +882,63 @@ UnknownScript_0xbd5a9: LizThursdayAfternoon: setflag ENGINE_LIZ_THURSDAY_AFTERNOON -UnknownScript_0xbd5c6: +LizWantsBattle: landmarktotext ROUTE_32, $2 setflag ENGINE_LIZ farjump PhoneScript_WantsToBattle_Female -UnknownScript_0xbd5d0: - farjump LizWrongNumber +LizWrongNumber: + farjump LizWrongNumberScript -UnknownScript_0xbd5d4: +LizGossip: random $9 - if_equal $0, UnknownScript_0xbd5fa - if_equal $1, UnknownScript_0xbd600 - if_equal $2, UnknownScript_0xbd606 - if_equal $3, UnknownScript_0xbd60c - if_equal $4, UnknownScript_0xbd612 - if_equal $5, UnknownScript_0xbd618 - if_equal $6, UnknownScript_0xbd61e - if_equal $7, UnknownScript_0xbd624 - if_equal $8, UnknownScript_0xbd62a + if_equal $0, .CoolTrainerM + if_equal $1, .Beauty + if_equal $2, .Grunt + if_equal $3, .Teacher + if_equal $4, .SwimmerF + if_equal $5, .KimonoGirl + if_equal $6, .Skier + if_equal $7, .Medium + if_equal $8, .PokefanM -UnknownScript_0xbd5fa: +.CoolTrainerM: trainerclassname COOLTRAINERM, $1 - jump UnknownScript_0xbd630 + jump LizGossipScript -UnknownScript_0xbd600: +.Beauty: trainerclassname BEAUTY, $1 - jump UnknownScript_0xbd630 + jump LizGossipScript -UnknownScript_0xbd606: +.Grunt: trainerclassname GRUNTM, $1 - jump UnknownScript_0xbd630 + jump LizGossipScript -UnknownScript_0xbd60c: +.Teacher: trainerclassname TEACHER, $1 - jump UnknownScript_0xbd630 + jump LizGossipScript -UnknownScript_0xbd612: +.SwimmerF: trainerclassname SWIMMERF, $1 - jump UnknownScript_0xbd630 + jump LizGossipScript -UnknownScript_0xbd618: +.KimonoGirl: trainerclassname KIMONO_GIRL, $1 - jump UnknownScript_0xbd630 + jump LizGossipScript -UnknownScript_0xbd61e: +.Skier: trainerclassname SKIER, $1 - jump UnknownScript_0xbd630 + jump LizGossipScript -UnknownScript_0xbd624: +.Medium: trainerclassname MEDIUM, $1 - jump UnknownScript_0xbd630 + jump LizGossipScript -UnknownScript_0xbd62a: +.PokefanM: trainerclassname POKEFANM, $1 - jump UnknownScript_0xbd630 + jump LizGossipScript -UnknownScript_0xbd630: +LizGossipScript: farjump UnknownScript_0xa06da ; Anthony @@ -946,25 +946,25 @@ UnknownScript_0xbd630: AnthonyPhoneScript1: trainertotext HIKER, ANTHONY2, $0 checkflag ENGINE_ANTHONY - iftrue UnknownScript_0xbd65d + iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_ANTHONY_FRIDAY_NIGHT iftrue .NotFriday checkcode VAR_WEEKDAY if_not_equal FRIDAY, .NotFriday checknite - iftrue UnknownScript_0xbd699 + iftrue AnthonyFridayNight .NotFriday: checkflag ENGINE_DUNSPARCE_SWARM - iftrue UnknownScript_0xbd664 + iftrue .AlreadySwarming farjump UnknownScript_0xa0950 -UnknownScript_0xbd65d: +.WantsBattle: landmarktotext ROUTE_33, $2 farjump UnknownScript_0xa0a5f -UnknownScript_0xbd664: +.AlreadySwarming: landmarktotext ROUTE_33, $2 farjump UnknownScript_0xa0afa @@ -972,37 +972,37 @@ AnthonyPhoneScript2: trainertotext HIKER, ANTHONY2, $0 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_FLYPOINT_GOLDENROD - iffalse UnknownScript_0xbd68d + iffalse .TriesSwarm checkflag ENGINE_ANTHONY - iftrue UnknownScript_0xbd68d + iftrue .TriesSwarm checkflag ENGINE_ANTHONY_FRIDAY_NIGHT - iftrue UnknownScript_0xbd68d + iftrue .TriesSwarm farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbd69c + if_equal $0, AnthonyWantsBattle -UnknownScript_0xbd68d: +.TriesSwarm: farscall PhoneScript_Random5 - if_equal $0, UnknownScript_0xbd6a6 + if_equal $0, AnthonyTriesDunsparceSwarm farjump Phone_GenericCall_Male -UnknownScript_0xbd699: +AnthonyFridayNight: setflag ENGINE_ANTHONY_FRIDAY_NIGHT -UnknownScript_0xbd69c: +AnthonyWantsBattle: landmarktotext ROUTE_33, $2 setflag ENGINE_ANTHONY farjump PhoneScript_WantsToBattle_Male -UnknownScript_0xbd6a6: +AnthonyTriesDunsparceSwarm: checkflag ENGINE_DUNSPARCE_SWARM - iftrue UnknownScript_0xbd6bd + iftrue .Generic setflag ENGINE_DUNSPARCE_SWARM pokenamemem DUNSPARCE, $1 swarm SWARM_DUNSPARCE, DARK_CAVE_VIOLET_ENTRANCE landmarktotext DARK_CAVE, $2 farjump UnknownScript_0xa05de -UnknownScript_0xbd6bd: +.Generic: farjump Phone_GenericCall_Male ; Todd @@ -1010,7 +1010,7 @@ UnknownScript_0xbd6bd: ToddPhoneScript1: trainertotext CAMPER, TODD1, $0 checkflag ENGINE_TODD - iftrue UnknownScript_0xbd6ea + iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_TODD_SATURDAY_MORNING iftrue .NotSaturday @@ -1021,49 +1021,49 @@ ToddPhoneScript1: .NotSaturday: checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON - iftrue UnknownScript_0xbd6f1 + iftrue .SaleOn farjump UnknownScript_0xa0958 -UnknownScript_0xbd6ea: +.WantsBattle: landmarktotext ROUTE_34, $2 farjump UnknownScript_0xa0a64 -UnknownScript_0xbd6f1: +.SaleOn: farjump UnknownScript_0xa0b04 ToddPhoneScript2: trainertotext CAMPER, TODD1, $0 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_TODD - iftrue UnknownScript_0xbd717 + iftrue .TryForSale checkflag ENGINE_TODD_SATURDAY_MORNING - iftrue UnknownScript_0xbd717 + iftrue .TryForSale checkflag ENGINE_FLYPOINT_GOLDENROD iffalse ToddNoGoldenrod farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbd72e + if_equal $0, ToddWantsBattle -UnknownScript_0xbd717: +.TryForSale: farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbd73c + if_equal $0, ToddDeptStoreSale ToddNoGoldenrod: farscall PhoneScript_Random3 - if_equal $0, UnknownScript_0xbd738 + if_equal $0, ToddFoundRare farjump Phone_GenericCall_Male ToddSaturdayMorning: setflag ENGINE_TODD_SATURDAY_MORNING -UnknownScript_0xbd72e: +ToddWantsBattle: landmarktotext ROUTE_34, $2 setflag ENGINE_TODD farjump PhoneScript_WantsToBattle_Male -UnknownScript_0xbd738: +ToddFoundRare: farjump Phone_CheckIfUnseenRare_Male -UnknownScript_0xbd73c: +ToddDeptStoreSale: setflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON farjump UnknownScript_0xa0644 @@ -1072,12 +1072,12 @@ UnknownScript_0xbd73c: GinaPhoneScript1: trainertotext PICNICKER, GINA1, $0 checkflag ENGINE_GINA - iftrue UnknownScript_0xbd776 + iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_GINA_SUNDAY_AFTERNOON iftrue .NotSunday checkflag ENGINE_GINA_HAS_LEAF_STONE - iftrue UnknownScript_0xbd77d + iftrue .HasLeafStone checkcode VAR_WEEKDAY if_not_equal SUNDAY, .NotSunday checkday @@ -1091,11 +1091,11 @@ GinaPhoneScript1: .Rockets: farjump UnknownScript_0xa05c6 -UnknownScript_0xbd776: +.WantsBattle: landmarktotext ROUTE_34, $2 farjump UnknownScript_0xa0a69 -UnknownScript_0xbd77d: +.HasLeafStone: landmarktotext ROUTE_34, $2 farjump UnknownScript_0xa0abd @@ -1103,41 +1103,41 @@ GinaPhoneScript2: trainertotext PICNICKER, GINA1, $0 farscall PhoneScript_GreetPhone_Female checkflag ENGINE_ROCKETS_IN_RADIO_TOWER - iftrue UnknownScript_0xbd7d9 + iftrue GinaRockets checkflag ENGINE_GINA - iftrue UnknownScript_0xbd7c8 + iftrue .Generic checkflag ENGINE_GINA_SUNDAY_AFTERNOON - iftrue UnknownScript_0xbd7c8 + iftrue .Generic checkflag ENGINE_GINA_HAS_LEAF_STONE - iftrue UnknownScript_0xbd7c8 + iftrue .Generic checkevent EVENT_GINA_GAVE_LEAF_STONE - iftrue UnknownScript_0xbd7b2 + iftrue .GaveLeafStone farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbd7dd + if_equal $0, GinaHasLeafStone -UnknownScript_0xbd7b2: +.GaveLeafStone: farscall PhoneScript_Random11 - if_equal $0, UnknownScript_0xbd7dd + if_equal $0, GinaHasLeafStone checkflag ENGINE_FLYPOINT_GOLDENROD - iffalse UnknownScript_0xbd7c8 + iffalse .Generic farscall PhoneScript_Random3 - if_equal $0, UnknownScript_0xbd7cf + if_equal $0, GinaWantsBattle -UnknownScript_0xbd7c8: +.Generic: farjump Phone_GenericCall_Female GinaSundayDay: setflag ENGINE_GINA_SUNDAY_AFTERNOON -UnknownScript_0xbd7cf: +GinaWantsBattle: landmarktotext ROUTE_34, $2 setflag ENGINE_GINA farjump PhoneScript_WantsToBattle_Female -UnknownScript_0xbd7d9: +GinaRockets: farjump UnknownScript_0xa05c6 -UnknownScript_0xbd7dd: +GinaHasLeafStone: setflag ENGINE_GINA_HAS_LEAF_STONE landmarktotext ROUTE_34, $2 farjump PhoneScript_FoundItem_Female @@ -1152,7 +1152,7 @@ IrwinPhoneScript1: farjump UnknownScript_0xa09c8 .Rockets: - farjump UnknownScript_0xa05be + farjump IrwinRocketRumor IrwinPhoneScript2: trainertotext JUGGLER, IRWIN1, $0 @@ -1162,14 +1162,14 @@ IrwinPhoneScript2: farjump IrwinRumorScript .Rockets: - farjump UnknownScript_0xa05be + farjump IrwinRocketRumor ; Arnie ArniePhoneScript1: trainertotext BUG_CATCHER, ARNIE1, $0 checkflag ENGINE_ARNIE - iftrue UnknownScript_0xbd83c + iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_ARNIE_TUESDAY_MORNING iftrue .NotTuesday @@ -1180,14 +1180,14 @@ ArniePhoneScript1: .NotTuesday: checkflag ENGINE_YANMA_SWARM - iftrue UnknownScript_0xbd843 + iftrue .AlreadySwarming farjump UnknownScript_0xa0968 -UnknownScript_0xbd83c: +.WantsBattle: landmarktotext ROUTE_35, $2 farjump UnknownScript_0xa0a6e -UnknownScript_0xbd843: +.AlreadySwarming: landmarktotext ROUTE_35, $2 farjump UnknownScript_0xa0aff @@ -1195,23 +1195,23 @@ ArniePhoneScript2: trainertotext BUG_CATCHER, ARNIE1, $0 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_ARNIE - iftrue UnknownScript_0xbd866 + iftrue .Swarm checkflag ENGINE_ARNIE_TUESDAY_MORNING - iftrue UnknownScript_0xbd866 + iftrue .Swarm farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbd87d + if_equal $0, ArnieWantsBattle -UnknownScript_0xbd866: +.Swarm: farscall PhoneScript_Random5 if_equal $0, ArnieYanmaSwarm farscall PhoneScript_Random3 - if_equal $0, UnknownScript_0xbd89e + if_equal $0, ArnieFoundRare farjump Phone_GenericCall_Male ArnieTuesdayMorning: setflag ENGINE_ARNIE_TUESDAY_MORNING -UnknownScript_0xbd87d: +ArnieWantsBattle: landmarktotext ROUTE_35, $2 setflag ENGINE_ARNIE farjump PhoneScript_WantsToBattle_Male @@ -1225,7 +1225,7 @@ ArnieYanmaSwarm: ; start swarm landmarktotext ROUTE_35, $2 farjump UnknownScript_0xa05ce -UnknownScript_0xbd89e: +ArnieFoundRare: farjump Phone_CheckIfUnseenRare_Male ArnieYanmaAlreadySwarming: @@ -1236,12 +1236,12 @@ ArnieYanmaAlreadySwarming: AlanPhoneScript1: trainertotext SCHOOLBOY, ALAN1, $0 checkflag ENGINE_ALAN - iftrue UnknownScript_0xbd8cf + iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_ALAN_WEDNESDAY_AFTERNOON iftrue .NotWednesday checkflag ENGINE_ALAN_HAS_FIRE_STONE - iftrue AlanHasFireStone + iftrue .FireStone checkcode VAR_WEEKDAY if_not_equal WEDNESDAY, .NotWednesday checkday @@ -1250,11 +1250,11 @@ AlanPhoneScript1: .NotWednesday: farjump UnknownScript_0xa0970 -UnknownScript_0xbd8cf: +.WantsBattle: landmarktotext ROUTE_36, $2 farjump UnknownScript_0xa0a73 -AlanHasFireStone: +.FireStone: landmarktotext ROUTE_36, $2 farjump UnknownScript_0xa0ac5 @@ -1262,34 +1262,34 @@ AlanPhoneScript2: trainertotext SCHOOLBOY, ALAN1, $0 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_ALAN - iftrue UnknownScript_0xbd915 + iftrue AlanGenericCall checkflag ENGINE_ALAN_WEDNESDAY_AFTERNOON - iftrue UnknownScript_0xbd915 + iftrue AlanGenericCall checkflag ENGINE_ALAN_HAS_FIRE_STONE - iftrue UnknownScript_0xbd915 + iftrue AlanGenericCall farscall PhoneScript_Random3 - if_equal $0, UnknownScript_0xbd91c + if_equal $0, AlanWantsBattle checkevent EVENT_ALAN_GAVE_FIRE_STONE - iftrue UnknownScript_0xbd90d + iftrue .FireStone farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbd926 + if_equal $0, AlanHasFireStone -UnknownScript_0xbd90d: +.FireStone: farscall PhoneScript_Random11 - if_equal $0, UnknownScript_0xbd926 + if_equal $0, AlanHasFireStone -UnknownScript_0xbd915: +AlanGenericCall: farjump Phone_GenericCall_Male AlanWednesdayDay: setflag ENGINE_ALAN_WEDNESDAY_AFTERNOON -UnknownScript_0xbd91c: +AlanWantsBattle: landmarktotext ROUTE_36, $2 setflag ENGINE_ALAN farjump PhoneScript_WantsToBattle_Male -UnknownScript_0xbd926: +AlanHasFireStone: setflag ENGINE_ALAN_HAS_FIRE_STONE landmarktotext ROUTE_36, $2 farjump PhoneScript_FoundItem_Male @@ -1299,25 +1299,25 @@ UnknownScript_0xbd926: DanaPhoneScript1: trainertotext LASS, DANA1, $0 checkflag ENGINE_DANA - iftrue UnknownScript_0xbd959 + iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_DANA_THURSDAY_NIGHT iftrue .NotThursday checkflag ENGINE_DANA_HAS_THUNDERSTONE - iftrue UnknownScript_0xbd960 + iftrue .HasThunderstone checkcode VAR_WEEKDAY if_not_equal THURSDAY, .NotThursday checknite - iftrue UnknownScript_0xbd9ab + iftrue DanaThursdayNight .NotThursday: farjump UnknownScript_0xa0978 -UnknownScript_0xbd959: +.WantsBattle: landmarktotext ROUTE_38, $2 farjump UnknownScript_0xa0a78 -UnknownScript_0xbd960: +.HasThunderstone: landmarktotext ROUTE_38, $2 farjump UnknownScript_0xa0acd @@ -1325,39 +1325,39 @@ DanaPhoneScript2: trainertotext LASS, DANA1, $0 farscall PhoneScript_GreetPhone_Female checkflag ENGINE_DANA - iftrue UnknownScript_0xbd99f + iftrue .Generic checkflag ENGINE_DANA_THURSDAY_NIGHT - iftrue UnknownScript_0xbd99f + iftrue .Generic checkflag ENGINE_DANA_HAS_THUNDERSTONE - iftrue UnknownScript_0xbd99f + iftrue .Generic farscall PhoneScript_Random3 - if_equal $0, UnknownScript_0xbd9ae + if_equal $0, DanaWantsBattle checkevent EVENT_DANA_GAVE_THUNDERSTONE - iftrue UnknownScript_0xbd997 + iftrue .Thunderstone farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbd9bc + if_equal $0, DanaHasThunderstone -UnknownScript_0xbd997: +.Thunderstone: farscall PhoneScript_Random11 - if_equal $0, UnknownScript_0xbd9bc + if_equal $0, DanaHasThunderstone -UnknownScript_0xbd99f: +.Generic: farscall PhoneScript_Random3 - if_equal $0, UnknownScript_0xbd9b8 + if_equal $0, DanaFoundRare farjump Phone_GenericCall_Female -UnknownScript_0xbd9ab: +DanaThursdayNight: setflag ENGINE_DANA_THURSDAY_NIGHT -UnknownScript_0xbd9ae: +DanaWantsBattle: landmarktotext ROUTE_38, $2 setflag ENGINE_DANA farjump PhoneScript_WantsToBattle_Female -UnknownScript_0xbd9b8: +DanaFoundRare: farjump Phone_CheckIfUnseenRare_Female -UnknownScript_0xbd9bc: +DanaHasThunderstone: setflag ENGINE_DANA_HAS_THUNDERSTONE landmarktotext ROUTE_38, $2 farjump PhoneScript_FoundItem_Female @@ -1367,19 +1367,19 @@ UnknownScript_0xbd9bc: ChadPhoneScript1: trainertotext SCHOOLBOY, CHAD1, $0 checkflag ENGINE_CHAD - iftrue UnknownScript_0xbd9e9 + iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_CHAD_FRIDAY_MORNING iftrue .NotFriday checkcode VAR_WEEKDAY if_not_equal FRIDAY, .NotFriday checkmorn - iftrue UnknownScript_0xbda20 + iftrue ChadFridayMorning .NotFriday: farjump UnknownScript_0xa0980 -UnknownScript_0xbd9e9: +.WantsBattle: landmarktotext ROUTE_38, $2 farjump UnknownScript_0xa0a7d @@ -1387,32 +1387,32 @@ ChadPhoneScript2: trainertotext SCHOOLBOY, CHAD1, $0 farscall PhoneScript_GreetPhone_Male farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbda31 + if_equal $0, ChadOakGossip checkflag ENGINE_CHAD - iftrue UnknownScript_0xbda14 + iftrue .Generic checkflag ENGINE_CHAD_FRIDAY_MORNING - iftrue UnknownScript_0xbda14 + iftrue .Generic farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbda23 + if_equal $0, ChadWantsBattle -UnknownScript_0xbda14: +.Generic: farscall PhoneScript_Random3 - if_equal $0, UnknownScript_0xbda2d + if_equal $0, ChadFoundRare farjump Phone_GenericCall_Male -UnknownScript_0xbda20: +ChadFridayMorning: setflag ENGINE_CHAD_FRIDAY_MORNING -UnknownScript_0xbda23: +ChadWantsBattle: landmarktotext ROUTE_38, $2 setflag ENGINE_CHAD farjump PhoneScript_WantsToBattle_Male -UnknownScript_0xbda2d: +ChadFoundRare: farjump Phone_CheckIfUnseenRare_Male -UnknownScript_0xbda31: - farjump ChadOakGossip +ChadOakGossip: + farjump ChadOakGossipScript DerekPhoneScript1: trainertotext POKEFANM, DEREK1, $0 @@ -1726,7 +1726,7 @@ WiltonPhoneScript1: iftrue WiltonThursdayMorning .NotThursday: - farjump UnknownScript_0xa09b0 + farjump WiltonHaventFoundAnything .WantsBattle: landmarktotext ROUTE_44, $2 @@ -1734,7 +1734,7 @@ WiltonPhoneScript1: .HasItem: landmarktotext ROUTE_44, $2 - farjump UnknownScript_0xa0aed + farjump WiltonWantThis WiltonPhoneScript2: trainertotext FISHER, WILTON1, $0 @@ -1818,7 +1818,7 @@ ParryPhoneScript1: .WantsBattle: landmarktotext ROUTE_45, $2 - farjump UnknownScript_0xa0a9b + farjump ParryHaventYouGottenTo ParryPhoneScript2: trainertotext HIKER, PARRY1, $0 diff --git a/text/phone/extra.asm b/text/phone/extra.asm index 6115fbbae..d9bdfab70 100644 --- a/text/phone/extra.asm +++ b/text/phone/extra.asm @@ -1613,7 +1613,7 @@ UnknownText_0x66c6b: ; 0x66c6b done ; 0x66ca7 -UnknownText_0x66ca7: ; 0x66ca7 +WiltonHaventFoundAnythingText: ; 0x66ca7 text "Nah, I haven't" line "found anything" @@ -1639,7 +1639,7 @@ UnknownText_0x66cf7: ; 0x66cf7 done ; 0x66d45 -UnknownText_0x66d45: ; 0x66d45 +WiltonWantThisText: ; 0x66d45 text "Don't you want" line "this item?" @@ -1792,7 +1792,7 @@ ParryBattleWithMeText: ; 0x67106 done ; 0x6712a -UnknownText_0x6712a: ; 0x6712a +ParryHaventYouGottenToText: ; 0x6712a text "Haven't you gotten" line "to @" text_from_ram StringBuffer5 diff --git a/text/phone/extra2.asm b/text/phone/extra2.asm index fb4adf055..cef21f23b 100644 --- a/text/phone/extra2.asm +++ b/text/phone/extra2.asm @@ -552,7 +552,7 @@ UnknownText_0x174ec5: ; 0x174ec5 done ; 0x174ee2 -UnknownText_0x174ee2: ; 0x174ee2 +BethForgetDealText: ; 0x174ee2 text "Um… ?" line "What's wrong?" diff --git a/text/phone/mom.asm b/text/phone/mom.asm index 961297fb5..249b5c01d 100644 --- a/text/phone/mom.asm +++ b/text/phone/mom.asm @@ -81,12 +81,12 @@ MomCheckBalanceText: ; 0x1b41a7 line "keep on saving?" done -UnknownText_0x1b41ea: ; 0x1b41ea +MomImportantToSaveText: ; 0x1b41ea text "It's important to" line "save your money." done -UnknownText_0x1b420d: ; 0x1b420d +MomYoureNotSavingText: ; 0x1b420d text "Oh, ," line "you're not saving" @@ -94,7 +94,7 @@ UnknownText_0x1b420d: ; 0x1b420d line "you like to save?" done -UnknownText_0x1b4249: ; 0x1b4249 +MomYouveSavedText: ; 0x1b4249 text "By the way, you've" line "saved up ¥@" text_from_ram StringBuffer3 @@ -104,7 +104,7 @@ UnknownText_0x1b4249: ; 0x1b4249 line "saving again?" done -UnknownText_0x1b4289: ; 0x1b4289 +MomOKIllSaveText: ; 0x1b4289 text "OK. I'll save your" line "money." done From cb5aa29228871f27752860a3d036bec013e7db6e Mon Sep 17 00:00:00 2001 From: surskitty Date: Fri, 15 Dec 2017 18:16:27 -0500 Subject: [PATCH 16/17] Labelling the remaining stuff one sed at a time. --- engine/phone_callers.asm | 4 ++-- engine/phone_gossip.asm | 12 ++++++------ engine/phone_scripts.asm | 26 +++++++++++++------------- text/phone/extra.asm | 8 ++++---- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/engine/phone_callers.asm b/engine/phone_callers.asm index 9d2ff867f..c90448d33 100644 --- a/engine/phone_callers.asm +++ b/engine/phone_callers.asm @@ -684,8 +684,8 @@ LizWrongNumberScript: farwritetext LizHiTaniaText end -UnknownScript_0xa047f: - farwritetext UnknownText_0x66796 +TiffanyItsAwful: + farwritetext TiffanyItsAwfulText end PhoneScript_HangupText_Male: diff --git a/engine/phone_gossip.asm b/engine/phone_gossip.asm index 3b269fa31..8f45c8807 100644 --- a/engine/phone_gossip.asm +++ b/engine/phone_gossip.asm @@ -455,8 +455,8 @@ UnknownScript_0xa09a0: buttonsound jump PhoneScript_HangupText_Female -UnknownScript_0xa09a8: - farwritetext UnknownText_0x66aa5 +VanceLookingForward: + farwritetext VanceLookingForwardText buttonsound jump PhoneScript_HangupText_Male @@ -609,12 +609,12 @@ UnknownScript_0xa0a8c: farwritetext UnknownText_0x668a3 end -UnknownScript_0xa0a91: - farwritetext UnknownText_0x66ad1 +VanceHurryHurry: + farwritetext VanceHurryHurryText end -UnknownScript_0xa0a96: - farwritetext UnknownText_0x66cf7 +WiltonNotBiting: + farwritetext WiltonNotBitingText end ParryHaventYouGottenTo: diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index 7e8b94a91..62eb4ac87 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -1597,7 +1597,7 @@ TiffanyPhoneScript1: TiffanyPhoneScript2: trainertotext PICNICKER, TIFFANY3, $0 farscall PhoneScript_Random4 - if_equal $0, TiffanyTalksAboutFamily + if_equal $0, TiffanysFamilyMembers farscall PhoneScript_GreetPhone_Female checkflag ENGINE_TIFFANY iftrue TiffanyGenericCall @@ -1627,7 +1627,7 @@ TiffanyWantsBattle: setflag ENGINE_TIFFANY farjump PhoneScript_WantsToBattle_Female -TiffanyTalksAboutFamily: +TiffanysFamilyMembers: random $6 if_equal $0, .Grandma if_equal $1, .Grandpa @@ -1638,30 +1638,30 @@ TiffanyTalksAboutFamily: .Grandma: stringtotext GrandmaString, $1 - jump TiffanyFamily + jump TiffanysPoorClefairy .Grandpa: stringtotext GrandpaString, $1 - jump TiffanyFamily + jump TiffanysPoorClefairy .Mom: stringtotext MomString, $1 - jump TiffanyFamily + jump TiffanysPoorClefairy .Dad: stringtotext DadString, $1 - jump TiffanyFamily + jump TiffanysPoorClefairy .Sister: stringtotext SisterString, $1 - jump TiffanyFamily + jump TiffanysPoorClefairy .Brother: stringtotext BrotherString, $1 - jump TiffanyFamily + jump TiffanysPoorClefairy -TiffanyFamily: - farjump UnknownScript_0xa047f +TiffanysPoorClefairy: + farjump TiffanyItsAwful TiffanyHasPinkBow: setflag ENGINE_TIFFANY_HAS_PINK_BOW @@ -1683,11 +1683,11 @@ VancePhoneScript1: iftrue VanceWednesdayNight .NotWednesday: - farjump UnknownScript_0xa09a8 + farjump VanceLookingForward VanceWantsBattle: landmarktotext ROUTE_44, $2 - farjump UnknownScript_0xa0a91 + farjump VanceHurryHurry VancePhoneScript2: trainertotext BIRD_KEEPER, VANCE1, $0 @@ -1730,7 +1730,7 @@ WiltonPhoneScript1: .WantsBattle: landmarktotext ROUTE_44, $2 - farjump UnknownScript_0xa0a96 + farjump WiltonNotBiting .HasItem: landmarktotext ROUTE_44, $2 diff --git a/text/phone/extra.asm b/text/phone/extra.asm index d9bdfab70..92ac0f508 100644 --- a/text/phone/extra.asm +++ b/text/phone/extra.asm @@ -1394,7 +1394,7 @@ UnknownText_0x66730: ; 0x66730 done ; 0x66796 -UnknownText_0x66796: ; 0x66796 +TiffanyItsAwfulText: ; 0x66796 text_from_ram StringBuffer4 text "!" @@ -1525,14 +1525,14 @@ UnknownText_0x66a93: ; 0x66a93 done ; 0x66aa5 -UnknownText_0x66aa5: ; 0x66aa5 +VanceLookingForwardText: ; 0x66aa5 text "I'll be looking" line "forward to our" cont "next battle!" done ; 0x66ad1 -UnknownText_0x66ad1: ; 0x66ad1 +VanceHurryHurryText: ; 0x66ad1 text "Oh, !" line "Hurry, hurry!" @@ -1625,7 +1625,7 @@ WiltonHaventFoundAnythingText: ; 0x66ca7 done ; 0x66cf7 -UnknownText_0x66cf7: ; 0x66cf7 +WiltonNotBitingText: ; 0x66cf7 text "Sigh…" line "They're not biting" From c883ab4d34ecb4890010e808d6b6d533f5d8ad56 Mon Sep 17 00:00:00 2001 From: surskitty Date: Fri, 15 Dec 2017 23:06:53 -0500 Subject: [PATCH 17/17] Reorganising phone stuff. --- .../buenas_password.asm} | 0 .../generic_calls.asm} | 0 engine/{ => phone}/phone.asm | 0 engine/{ => phone}/phone_callers.asm | 0 engine/{ => phone}/phone_gossip.asm | 0 engine/{ => phone}/phone_scripts.asm | 0 main.asm | 12 ++++++------ 7 files changed, 6 insertions(+), 6 deletions(-) rename engine/{buena_phone_scripts.asm => phone/buenas_password.asm} (100%) rename engine/{phone_scripts_generic.asm => phone/generic_calls.asm} (100%) rename engine/{ => phone}/phone.asm (100%) rename engine/{ => phone}/phone_callers.asm (100%) rename engine/{ => phone}/phone_gossip.asm (100%) rename engine/{ => phone}/phone_scripts.asm (100%) diff --git a/engine/buena_phone_scripts.asm b/engine/phone/buenas_password.asm similarity index 100% rename from engine/buena_phone_scripts.asm rename to engine/phone/buenas_password.asm diff --git a/engine/phone_scripts_generic.asm b/engine/phone/generic_calls.asm similarity index 100% rename from engine/phone_scripts_generic.asm rename to engine/phone/generic_calls.asm diff --git a/engine/phone.asm b/engine/phone/phone.asm similarity index 100% rename from engine/phone.asm rename to engine/phone/phone.asm diff --git a/engine/phone_callers.asm b/engine/phone/phone_callers.asm similarity index 100% rename from engine/phone_callers.asm rename to engine/phone/phone_callers.asm diff --git a/engine/phone_gossip.asm b/engine/phone/phone_gossip.asm similarity index 100% rename from engine/phone_gossip.asm rename to engine/phone/phone_gossip.asm diff --git a/engine/phone_scripts.asm b/engine/phone/phone_scripts.asm similarity index 100% rename from engine/phone_scripts.asm rename to engine/phone/phone_scripts.asm diff --git a/main.asm b/main.asm index f32809569..cbfe27d2b 100644 --- a/main.asm +++ b/main.asm @@ -4638,7 +4638,7 @@ INCLUDE "engine/mon_icons.asm" SECTION "bank24", ROMX -INCLUDE "engine/phone.asm" +INCLUDE "engine/phone/phone.asm" INCLUDE "engine/timeset.asm" INCLUDE "engine/pokegear.asm" INCLUDE "engine/fish.asm" @@ -4647,9 +4647,9 @@ INCLUDE "engine/slot_machine.asm" SECTION "Phone Engine", ROMX -INCLUDE "engine/phone_callers.asm" -INCLUDE "engine/phone_gossip.asm" -INCLUDE "engine/buena_phone_scripts.asm" +INCLUDE "engine/phone/phone_callers.asm" +INCLUDE "engine/phone/phone_gossip.asm" +INCLUDE "engine/phone/buenas_password.asm" SECTION "Phone Text", ROMX @@ -4683,8 +4683,8 @@ INCLUDE "gfx/mail.asm" SECTION "bank2F", ROMX INCLUDE "engine/std_scripts.asm" -INCLUDE "engine/phone_scripts.asm" -INCLUDE "engine/phone_scripts_generic.asm" +INCLUDE "engine/phone/phone_scripts.asm" +INCLUDE "engine/phone/generic_calls.asm" TalkToTrainerScript:: ; 0xbe66a faceplayer