diff --git a/data/phone/phone_contacts.asm b/data/phone/phone_contacts.asm index a7a774507..0c67e5109 100644 --- a/data/phone/phone_contacts.asm +++ b/data/phone/phone_contacts.asm @@ -1,5 +1,5 @@ phone: MACRO -; trainer class, trainer id, map, time 1, script 1, time 2, script 2 +; trainer class, trainer id, map, callee time, callee script, caller time, caller script db \1, \2 map_id \3 db \4 @@ -10,41 +10,41 @@ ENDM PhoneContacts: ; entries correspond to PHONE_* constants - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONECONTACT_MOM, PLAYERS_HOUSE_1F, ANYTIME, MomPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONECONTACT_BIKESHOP, OAKS_LAB, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONECONTACT_BILL, N_A, ANYTIME, BillPhoneScript1, 0, BillPhoneScript2 - phone TRAINER_NONE, PHONECONTACT_ELM, ELMS_LAB, ANYTIME, ElmPhoneScript1, 0, ElmPhoneScript2 - phone SCHOOLBOY, JACK1, NATIONAL_PARK, ANYTIME, JackPhoneScript1, ANYTIME, JackPhoneScript2 - phone POKEFANF, BEVERLY1, NATIONAL_PARK, ANYTIME, BeverlyPhoneScript1, ANYTIME, BeverlyPhoneScript2 - phone SAILOR, HUEY1, OLIVINE_LIGHTHOUSE_2F, ANYTIME, HueyPhoneScript1, ANYTIME, HueyPhoneScript2 - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone COOLTRAINERM, GAVEN3, ROUTE_26, ANYTIME, GavenPhoneScript1, ANYTIME, GavenPhoneScript2 - phone COOLTRAINERF, BETH1, ROUTE_26, ANYTIME, BethPhoneScript1, ANYTIME, BethPhoneScript2 - phone BIRD_KEEPER, JOSE2, ROUTE_27, ANYTIME, JosePhoneScript1, ANYTIME, JosePhoneScript2 - phone COOLTRAINERF, REENA1, ROUTE_27, ANYTIME, ReenaPhoneScript1, ANYTIME, ReenaPhoneScript2 - phone YOUNGSTER, JOEY1, ROUTE_30, ANYTIME, JoeyPhoneScript1, ANYTIME, JoeyPhoneScript2 - phone BUG_CATCHER, WADE1, ROUTE_31, ANYTIME, WadePhoneScript1, ANYTIME, WadePhoneScript2 - phone FISHER, RALPH1, ROUTE_32, ANYTIME, RalphPhoneScript1, ANYTIME, RalphPhoneScript2 - phone PICNICKER, LIZ1, ROUTE_32, ANYTIME, LizPhoneScript1, ANYTIME, LizPhoneScript2 - phone HIKER, ANTHONY2, ROUTE_33, ANYTIME, AnthonyPhoneScript1, ANYTIME, AnthonyPhoneScript2 - phone CAMPER, TODD1, ROUTE_34, ANYTIME, ToddPhoneScript1, ANYTIME, ToddPhoneScript2 - phone PICNICKER, GINA1, ROUTE_34, ANYTIME, GinaPhoneScript1, ANYTIME, GinaPhoneScript2 - phone JUGGLER, IRWIN1, ROUTE_35, ANYTIME, IrwinPhoneScript1, ANYTIME, IrwinPhoneScript2 - phone BUG_CATCHER, ARNIE1, ROUTE_35, ANYTIME, ArniePhoneScript1, ANYTIME, ArniePhoneScript2 - phone SCHOOLBOY, ALAN1, ROUTE_36, ANYTIME, AlanPhoneScript1, ANYTIME, AlanPhoneScript2 - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone LASS, DANA1, ROUTE_38, ANYTIME, DanaPhoneScript1, ANYTIME, DanaPhoneScript2 - phone SCHOOLBOY, CHAD1, ROUTE_38, ANYTIME, ChadPhoneScript1, ANYTIME, ChadPhoneScript2 - phone POKEFANM, DEREK1, ROUTE_39, ANYTIME, DerekPhoneScript1, ANYTIME, DerekPhoneScript2 - phone FISHER, TULLY1, ROUTE_42, ANYTIME, TullyPhoneScript1, ANYTIME, TullyPhoneScript2 - phone POKEMANIAC, BRENT1, ROUTE_43, ANYTIME, BrentPhoneScript1, ANYTIME, BrentPhoneScript2 - phone PICNICKER, TIFFANY3, ROUTE_43, ANYTIME, TiffanyPhoneScript1, ANYTIME, TiffanyPhoneScript2 - phone BIRD_KEEPER, VANCE1, ROUTE_44, ANYTIME, VancePhoneScript1, ANYTIME, VancePhoneScript2 - phone FISHER, WILTON1, ROUTE_44, ANYTIME, WiltonPhoneScript1, ANYTIME, WiltonPhoneScript2 - phone BLACKBELT_T, KENJI3, ROUTE_45, ANYTIME, KenjiPhoneScript1, ANYTIME, KenjiPhoneScript2 - phone HIKER, PARRY1, ROUTE_45, ANYTIME, ParryPhoneScript1, ANYTIME, ParryPhoneScript2 - phone PICNICKER, ERIN1, ROUTE_46, ANYTIME, ErinPhoneScript1, ANYTIME, ErinPhoneScript2 - phone TRAINER_NONE, PHONECONTACT_BUENA, GOLDENROD_DEPT_STORE_ROOF, ANYTIME, BuenaPhoneScript1, ANYTIME, BuenaPhoneScript2 + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONECONTACT_MOM, PLAYERS_HOUSE_1F, ANYTIME, MomPhoneCalleeScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONECONTACT_BIKESHOP, OAKS_LAB, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONECONTACT_BILL, N_A, ANYTIME, BillPhoneCalleeScript, 0, BillPhoneCallerScript + phone TRAINER_NONE, PHONECONTACT_ELM, ELMS_LAB, ANYTIME, ElmPhoneCalleeScript, 0, ElmPhoneCallerScript + phone SCHOOLBOY, JACK1, NATIONAL_PARK, ANYTIME, JackPhoneCalleeScript, ANYTIME, JackPhoneCallerScript + phone POKEFANF, BEVERLY1, NATIONAL_PARK, ANYTIME, BeverlyPhoneCalleeScript, ANYTIME, BeverlyPhoneCallerScript + phone SAILOR, HUEY1, OLIVINE_LIGHTHOUSE_2F, ANYTIME, HueyPhoneCalleeScript, ANYTIME, HueyPhoneCallerScript + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone COOLTRAINERM, GAVEN3, ROUTE_26, ANYTIME, GavenPhoneCalleeScript, ANYTIME, GavenPhoneCallerScript + phone COOLTRAINERF, BETH1, ROUTE_26, ANYTIME, BethPhoneCalleeScript, ANYTIME, BethPhoneCallerScript + phone BIRD_KEEPER, JOSE2, ROUTE_27, ANYTIME, JosePhoneCalleeScript, ANYTIME, JosePhoneCallerScript + phone COOLTRAINERF, REENA1, ROUTE_27, ANYTIME, ReenaPhoneCalleeScript, ANYTIME, ReenaPhoneCallerScript + phone YOUNGSTER, JOEY1, ROUTE_30, ANYTIME, JoeyPhoneCalleeScript, ANYTIME, JoeyPhoneCallerScript + phone BUG_CATCHER, WADE1, ROUTE_31, ANYTIME, WadePhoneCalleeScript, ANYTIME, WadePhoneCallerScript + phone FISHER, RALPH1, ROUTE_32, ANYTIME, RalphPhoneCalleeScript, ANYTIME, RalphPhoneCallerScript + phone PICNICKER, LIZ1, ROUTE_32, ANYTIME, LizPhoneCalleeScript, ANYTIME, LizPhoneCallerScript + phone HIKER, ANTHONY2, ROUTE_33, ANYTIME, AnthonyPhoneCalleeScript, ANYTIME, AnthonyPhoneCallerScript + phone CAMPER, TODD1, ROUTE_34, ANYTIME, ToddPhoneCalleeScript, ANYTIME, ToddPhoneCallerScript + phone PICNICKER, GINA1, ROUTE_34, ANYTIME, GinaPhoneCalleeScript, ANYTIME, GinaPhoneCallerScript + phone JUGGLER, IRWIN1, ROUTE_35, ANYTIME, IrwinPhoneCalleeScript, ANYTIME, IrwinPhoneCallerScript + phone BUG_CATCHER, ARNIE1, ROUTE_35, ANYTIME, ArniePhoneCalleeScript, ANYTIME, ArniePhoneCallerScript + phone SCHOOLBOY, ALAN1, ROUTE_36, ANYTIME, AlanPhoneCalleeScript, ANYTIME, AlanPhoneCallerScript + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone LASS, DANA1, ROUTE_38, ANYTIME, DanaPhoneCalleeScript, ANYTIME, DanaPhoneCallerScript + phone SCHOOLBOY, CHAD1, ROUTE_38, ANYTIME, ChadPhoneCalleeScript, ANYTIME, ChadPhoneCallerScript + phone POKEFANM, DEREK1, ROUTE_39, ANYTIME, DerekPhoneCalleeScript, ANYTIME, DerekPhoneCallerScript + phone FISHER, TULLY1, ROUTE_42, ANYTIME, TullyPhoneCalleeScript, ANYTIME, TullyPhoneCallerScript + phone POKEMANIAC, BRENT1, ROUTE_43, ANYTIME, BrentPhoneCalleeScript, ANYTIME, BrentPhoneCallerScript + phone PICNICKER, TIFFANY3, ROUTE_43, ANYTIME, TiffanyPhoneCalleeScript, ANYTIME, TiffanyPhoneCallerScript + phone BIRD_KEEPER, VANCE1, ROUTE_44, ANYTIME, VancePhoneCalleeScript, ANYTIME, VancePhoneCallerScript + phone FISHER, WILTON1, ROUTE_44, ANYTIME, WiltonPhoneCalleeScript, ANYTIME, WiltonPhoneCallerScript + phone BLACKBELT_T, KENJI3, ROUTE_45, ANYTIME, KenjiPhoneCalleeScript, ANYTIME, KenjiPhoneCallerScript + phone HIKER, PARRY1, ROUTE_45, ANYTIME, ParryPhoneCalleeScript, ANYTIME, ParryPhoneCallerScript + phone PICNICKER, ERIN1, ROUTE_46, ANYTIME, ErinPhoneCalleeScript, ANYTIME, ErinPhoneCallerScript + phone TRAINER_NONE, PHONECONTACT_BUENA, GOLDENROD_DEPT_STORE_ROOF, ANYTIME, BuenaPhoneCalleeScript, ANYTIME, BuenaPhoneCallerScript diff --git a/data/phone/special_calls.asm b/data/phone/special_calls.asm index 224ca2258..826a5d283 100644 --- a/data/phone/special_calls.asm +++ b/data/phone/special_calls.asm @@ -7,11 +7,11 @@ ENDM SpecialPhoneCallList: ; entries correspond to SPECIALCALL_* constants - specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 - specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 - specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 - specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 - specialcall SpecialCallWhereverYouAre, PHONECONTACT_ELM, ElmPhoneScript2 - specialcall SpecialCallWhereverYouAre, PHONECONTACT_BIKESHOP, BikeShopPhoneScript + specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneCallerScript + specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneCallerScript + specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneCallerScript + specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneCallerScript + specialcall SpecialCallWhereverYouAre, PHONECONTACT_ELM, ElmPhoneCallerScript + specialcall SpecialCallWhereverYouAre, PHONECONTACT_BIKESHOP, BikeShopPhoneCallerScript specialcall SpecialCallWhereverYouAre, PHONECONTACT_MOM, MomPhoneLectureScript - specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 + specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneCallerScript diff --git a/engine/phone/scripts/alan.asm b/engine/phone/scripts/alan.asm index d2cdccd9f..e5f7680f7 100644 --- a/engine/phone/scripts/alan.asm +++ b/engine/phone/scripts/alan.asm @@ -1,4 +1,4 @@ -AlanPhoneScript1: +AlanPhoneCalleeScript: trainertotext SCHOOLBOY, ALAN1, MEM_BUFFER_0 checkflag ENGINE_ALAN iftrue .WantsBattle @@ -23,7 +23,7 @@ AlanPhoneScript1: landmarktotext ROUTE_36, MEM_BUFFER_2 farjump UnknownScript_0xa0ac5 -AlanPhoneScript2: +AlanPhoneCallerScript: trainertotext SCHOOLBOY, ALAN1, MEM_BUFFER_0 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_ALAN diff --git a/engine/phone/scripts/anthony.asm b/engine/phone/scripts/anthony.asm index 59064c80f..3dc298f8f 100644 --- a/engine/phone/scripts/anthony.asm +++ b/engine/phone/scripts/anthony.asm @@ -1,4 +1,4 @@ -AnthonyPhoneScript1: +AnthonyPhoneCalleeScript: trainertotext HIKER, ANTHONY2, MEM_BUFFER_0 checkflag ENGINE_ANTHONY iftrue .WantsBattle @@ -23,7 +23,7 @@ AnthonyPhoneScript1: landmarktotext ROUTE_33, MEM_BUFFER_2 farjump UnknownScript_0xa0afa -AnthonyPhoneScript2: +AnthonyPhoneCallerScript: trainertotext HIKER, ANTHONY2, MEM_BUFFER_0 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_FLYPOINT_GOLDENROD diff --git a/engine/phone/scripts/arnie.asm b/engine/phone/scripts/arnie.asm index bac4baec4..908e7ff6d 100644 --- a/engine/phone/scripts/arnie.asm +++ b/engine/phone/scripts/arnie.asm @@ -1,4 +1,4 @@ -ArniePhoneScript1: +ArniePhoneCalleeScript: trainertotext BUG_CATCHER, ARNIE1, MEM_BUFFER_0 checkflag ENGINE_ARNIE iftrue .WantsBattle @@ -23,7 +23,7 @@ ArniePhoneScript1: landmarktotext ROUTE_35, MEM_BUFFER_2 farjump UnknownScript_0xa0aff -ArniePhoneScript2: +ArniePhoneCallerScript: trainertotext BUG_CATCHER, ARNIE1, MEM_BUFFER_0 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_ARNIE diff --git a/engine/phone/scripts/beth.asm b/engine/phone/scripts/beth.asm index 26b998ac8..4aae343a7 100644 --- a/engine/phone/scripts/beth.asm +++ b/engine/phone/scripts/beth.asm @@ -1,4 +1,4 @@ -BethPhoneScript1: +BethPhoneCalleeScript: trainertotext COOLTRAINERF, BETH1, MEM_BUFFER_0 checkflag ENGINE_BETH iftrue .WantsBattle @@ -17,7 +17,7 @@ BethPhoneScript1: landmarktotext ROUTE_26, MEM_BUFFER_2 farjump BethBattleReminderScript -BethPhoneScript2: +BethPhoneCallerScript: trainertotext COOLTRAINERF, BETH1, MEM_BUFFER_0 farscall PhoneScript_GreetPhone_Female checkflag ENGINE_BETH diff --git a/engine/phone/scripts/beverly.asm b/engine/phone/scripts/beverly.asm index 46d9eea98..abc86cb9d 100644 --- a/engine/phone/scripts/beverly.asm +++ b/engine/phone/scripts/beverly.asm @@ -1,4 +1,4 @@ -BeverlyPhoneScript1: +BeverlyPhoneCalleeScript: trainertotext POKEFANF, BEVERLY1, MEM_BUFFER_0 farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_BEVERLY_HAS_NUGGET @@ -9,7 +9,7 @@ BeverlyPhoneScript1: landmarktotext NATIONAL_PARK, MEM_BUFFER_2 farjump UnknownScript_0xa0aa5 -BeverlyPhoneScript2: +BeverlyPhoneCallerScript: trainertotext POKEFANF, BEVERLY1, MEM_BUFFER_0 farscall PhoneScript_GreetPhone_Female checkflag ENGINE_BEVERLY_HAS_NUGGET diff --git a/engine/phone/scripts/bike_shop.asm b/engine/phone/scripts/bike_shop.asm index e571d1f9d..8b32be888 100644 --- a/engine/phone/scripts/bike_shop.asm +++ b/engine/phone/scripts/bike_shop.asm @@ -1,4 +1,4 @@ -BikeShopPhoneScript: +BikeShopPhoneCallerScript: farwritetext UnknownText_0x174000 clearflag ENGINE_BIKE_SHOP_CALL_ENABLED specialphonecall SPECIALCALL_NONE diff --git a/engine/phone/scripts/bill.asm b/engine/phone/scripts/bill.asm index 62c6fe5da..733224f22 100644 --- a/engine/phone/scripts/bill.asm +++ b/engine/phone/scripts/bill.asm @@ -1,4 +1,4 @@ -BillPhoneScript1: +BillPhoneCalleeScript: checktime DAY iftrue .daygreet checktime NITE @@ -35,7 +35,7 @@ BillPhoneScript1: farwritetext BillPhoneFullText end -BillPhoneScript2: +BillPhoneCallerScript: farwritetext BillPhoneNewlyFullText waitbutton end diff --git a/engine/phone/scripts/brent.asm b/engine/phone/scripts/brent.asm index 758bb585f..ef18f06b9 100644 --- a/engine/phone/scripts/brent.asm +++ b/engine/phone/scripts/brent.asm @@ -1,4 +1,4 @@ -BrentPhoneScript1: +BrentPhoneCalleeScript: trainertotext POKEMANIAC, BRENT1, MEM_BUFFER_0 checkflag ENGINE_BRENT iftrue .WantsBattle @@ -17,7 +17,7 @@ BrentPhoneScript1: landmarktotext ROUTE_43, MEM_BUFFER_2 farjump UnknownScript_0xa0a87 -BrentPhoneScript2: +BrentPhoneCallerScript: trainertotext POKEMANIAC, BRENT1, MEM_BUFFER_0 farscall PhoneScript_GreetPhone_Male farscall PhoneScript_Random2 diff --git a/engine/phone/scripts/buena.asm b/engine/phone/scripts/buena.asm index 68c5c01b9..3e08fcd40 100644 --- a/engine/phone/scripts/buena.asm +++ b/engine/phone/scripts/buena.asm @@ -1,4 +1,4 @@ -BuenaPhoneScript1: +BuenaPhoneCalleeScript: checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue BuenaPhoneScript_Rocket checkcode VAR_HOUR @@ -6,7 +6,7 @@ BuenaPhoneScript1: scall BuenaPhoneScript_CheckTimeOfDay1 jump BuenaPhoneScript_Random1 -BuenaPhoneScript2: +BuenaPhoneCallerScript: checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue BuenaPhoneScript_Rocket scall BuenaPhoneScript_CheckTimeOfDay2 diff --git a/engine/phone/scripts/chad.asm b/engine/phone/scripts/chad.asm index f90d5c143..e89563a09 100644 --- a/engine/phone/scripts/chad.asm +++ b/engine/phone/scripts/chad.asm @@ -1,4 +1,4 @@ -ChadPhoneScript1: +ChadPhoneCalleeScript: trainertotext SCHOOLBOY, CHAD1, MEM_BUFFER_0 checkflag ENGINE_CHAD iftrue .WantsBattle @@ -17,7 +17,7 @@ ChadPhoneScript1: landmarktotext ROUTE_38, MEM_BUFFER_2 farjump UnknownScript_0xa0a7d -ChadPhoneScript2: +ChadPhoneCallerScript: trainertotext SCHOOLBOY, CHAD1, MEM_BUFFER_0 farscall PhoneScript_GreetPhone_Male farscall PhoneScript_Random2 diff --git a/engine/phone/scripts/dana.asm b/engine/phone/scripts/dana.asm index 825eab61d..b072820a6 100644 --- a/engine/phone/scripts/dana.asm +++ b/engine/phone/scripts/dana.asm @@ -1,4 +1,4 @@ -DanaPhoneScript1: +DanaPhoneCalleeScript: trainertotext LASS, DANA1, MEM_BUFFER_0 checkflag ENGINE_DANA iftrue .WantsBattle @@ -23,7 +23,7 @@ DanaPhoneScript1: landmarktotext ROUTE_38, MEM_BUFFER_2 farjump UnknownScript_0xa0acd -DanaPhoneScript2: +DanaPhoneCallerScript: trainertotext LASS, DANA1, MEM_BUFFER_0 farscall PhoneScript_GreetPhone_Female checkflag ENGINE_DANA diff --git a/engine/phone/scripts/derek.asm b/engine/phone/scripts/derek.asm index 637342093..95ff8bb76 100644 --- a/engine/phone/scripts/derek.asm +++ b/engine/phone/scripts/derek.asm @@ -1,4 +1,4 @@ -DerekPhoneScript1: +DerekPhoneCalleeScript: trainertotext POKEFANM, DEREK1, MEM_BUFFER_0 farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_DEREK_HAS_NUGGET @@ -22,7 +22,7 @@ DerekPhoneScript1: landmarktotext ROUTE_39, MEM_BUFFER_2 farjump UnknownScript_0xa0ad5 -DerekPhoneScript2: +DerekPhoneCallerScript: trainertotext POKEFANM, DEREK1, MEM_BUFFER_0 farscall PhoneScript_GreetPhone_Male farscall PhoneScript_Random2 diff --git a/engine/phone/scripts/elm.asm b/engine/phone/scripts/elm.asm index 6a954b3f7..2890a14b9 100644 --- a/engine/phone/scripts/elm.asm +++ b/engine/phone/scripts/elm.asm @@ -1,4 +1,4 @@ -ElmPhoneScript1: +ElmPhoneCalleeScript: checkcode VAR_SPECIALPHONECALL ifequal SPECIALCALL_POKERUS, .pokerus checkevent EVENT_SHOWED_TOGEPI_TO_ELM @@ -61,7 +61,7 @@ ElmPhoneScript1: specialphonecall SPECIALCALL_NONE end -ElmPhoneScript2: +ElmPhoneCallerScript: checkcode VAR_SPECIALPHONECALL ifequal SPECIALCALL_ROBBED, .disaster ifequal SPECIALCALL_ASSISTANT, .assistant diff --git a/engine/phone/scripts/erin.asm b/engine/phone/scripts/erin.asm index e486aa724..1bf6f2154 100644 --- a/engine/phone/scripts/erin.asm +++ b/engine/phone/scripts/erin.asm @@ -1,4 +1,4 @@ -ErinPhoneScript1: +ErinPhoneCalleeScript: trainertotext PICNICKER, ERIN1, MEM_BUFFER_0 checkflag ENGINE_ERIN iftrue .WantsBattle @@ -17,7 +17,7 @@ ErinPhoneScript1: landmarktotext ROUTE_46, MEM_BUFFER_2 farjump ErinComeBattleScript -ErinPhoneScript2: +ErinPhoneCallerScript: trainertotext PICNICKER, ERIN1, MEM_BUFFER_0 farscall PhoneScript_GreetPhone_Female checkflag ENGINE_ERIN diff --git a/engine/phone/scripts/gaven.asm b/engine/phone/scripts/gaven.asm index ff4c6c66c..bf4804e4e 100644 --- a/engine/phone/scripts/gaven.asm +++ b/engine/phone/scripts/gaven.asm @@ -1,4 +1,4 @@ -GavenPhoneScript1: +GavenPhoneCalleeScript: trainertotext COOLTRAINERM, GAVEN3, MEM_BUFFER_0 checkflag ENGINE_GAVEN iftrue .WantsBattle @@ -17,7 +17,7 @@ GavenPhoneScript1: landmarktotext ROUTE_26, MEM_BUFFER_2 farjump UnknownScript_0xa0a37 -GavenPhoneScript2: +GavenPhoneCallerScript: trainertotext COOLTRAINERM, GAVEN3, MEM_BUFFER_0 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_GAVEN diff --git a/engine/phone/scripts/gina.asm b/engine/phone/scripts/gina.asm index ff8471070..79514a46e 100644 --- a/engine/phone/scripts/gina.asm +++ b/engine/phone/scripts/gina.asm @@ -1,4 +1,4 @@ -GinaPhoneScript1: +GinaPhoneCalleeScript: trainertotext PICNICKER, GINA1, MEM_BUFFER_0 checkflag ENGINE_GINA iftrue .WantsBattle @@ -28,7 +28,7 @@ GinaPhoneScript1: landmarktotext ROUTE_34, MEM_BUFFER_2 farjump UnknownScript_0xa0abd -GinaPhoneScript2: +GinaPhoneCallerScript: trainertotext PICNICKER, GINA1, MEM_BUFFER_0 farscall PhoneScript_GreetPhone_Female checkflag ENGINE_ROCKETS_IN_RADIO_TOWER diff --git a/engine/phone/scripts/huey.asm b/engine/phone/scripts/huey.asm index da79d1c6c..e0398a62a 100644 --- a/engine/phone/scripts/huey.asm +++ b/engine/phone/scripts/huey.asm @@ -1,4 +1,4 @@ -HueyPhoneScript1: +HueyPhoneCalleeScript: trainertotext SAILOR, HUEY1, MEM_BUFFER_0 checkflag ENGINE_HUEY iftrue .WantsBattle @@ -18,7 +18,7 @@ HueyPhoneScript1: landmarktotext LIGHTHOUSE, MEM_BUFFER_2 farjump HueyWantsBattleScript -HueyPhoneScript2: +HueyPhoneCallerScript: trainertotext SAILOR, HUEY1, MEM_BUFFER_0 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_HUEY diff --git a/engine/phone/scripts/irwin.asm b/engine/phone/scripts/irwin.asm index 8b8afbd1e..11e7198f0 100644 --- a/engine/phone/scripts/irwin.asm +++ b/engine/phone/scripts/irwin.asm @@ -1,4 +1,4 @@ -IrwinPhoneScript1: +IrwinPhoneCalleeScript: trainertotext JUGGLER, IRWIN1, MEM_BUFFER_0 farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_ROCKETS_IN_RADIO_TOWER @@ -8,7 +8,7 @@ IrwinPhoneScript1: .Rockets: farjump IrwinRocketRumor -IrwinPhoneScript2: +IrwinPhoneCallerScript: trainertotext JUGGLER, IRWIN1, MEM_BUFFER_0 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_ROCKETS_IN_RADIO_TOWER diff --git a/engine/phone/scripts/jack.asm b/engine/phone/scripts/jack.asm index 7e2cfad25..a02c3c36a 100644 --- a/engine/phone/scripts/jack.asm +++ b/engine/phone/scripts/jack.asm @@ -1,4 +1,4 @@ -JackPhoneScript1: +JackPhoneCalleeScript: trainertotext SCHOOLBOY, JACK1, MEM_BUFFER_0 checkflag ENGINE_JACK iftrue .WantsBattle @@ -17,7 +17,7 @@ JackPhoneScript1: landmarktotext NATIONAL_PARK, MEM_BUFFER_2 farjump JackWantsBattleScript -JackPhoneScript2: +JackPhoneCallerScript: trainertotext SCHOOLBOY, JACK1, MEM_BUFFER_0 farscall PhoneScript_GreetPhone_Male farscall PhoneScript_Random2 diff --git a/engine/phone/scripts/joey.asm b/engine/phone/scripts/joey.asm index 0fc19f61f..0d2c6267a 100644 --- a/engine/phone/scripts/joey.asm +++ b/engine/phone/scripts/joey.asm @@ -1,4 +1,4 @@ -JoeyPhoneScript1: +JoeyPhoneCalleeScript: trainertotext YOUNGSTER, JOEY1, MEM_BUFFER_0 checkflag ENGINE_JOEY iftrue .WantsBattle @@ -18,7 +18,7 @@ JoeyPhoneScript1: landmarktotext ROUTE_30, MEM_BUFFER_2 farjump UnknownScript_0xa0a4b -JoeyPhoneScript2: +JoeyPhoneCallerScript: trainertotext YOUNGSTER, JOEY1, MEM_BUFFER_0 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_JOEY diff --git a/engine/phone/scripts/jose.asm b/engine/phone/scripts/jose.asm index d9a86723d..38bd0a99f 100644 --- a/engine/phone/scripts/jose.asm +++ b/engine/phone/scripts/jose.asm @@ -1,4 +1,4 @@ -JosePhoneScript1: +JosePhoneCalleeScript: trainertotext BIRD_KEEPER, JOSE2, MEM_BUFFER_0 checkflag ENGINE_JOSE iftrue .WantsBattle @@ -23,7 +23,7 @@ JosePhoneScript1: landmarktotext ROUTE_27, MEM_BUFFER_2 farjump UnknownScript_0xa0a41 -JosePhoneScript2: +JosePhoneCallerScript: trainertotext BIRD_KEEPER, JOSE2, MEM_BUFFER_0 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_JOSE diff --git a/engine/phone/scripts/kenji.asm b/engine/phone/scripts/kenji.asm index 4d03c9097..3888afbfd 100644 --- a/engine/phone/scripts/kenji.asm +++ b/engine/phone/scripts/kenji.asm @@ -1,9 +1,9 @@ -KenjiPhoneScript1: +KenjiPhoneCalleeScript: trainertotext BLACKBELT_T, KENJI3, MEM_BUFFER_0 farscall PhoneScript_AnswerPhone_Male farjump KenjiAnswerPhoneScript -KenjiPhoneScript2: +KenjiPhoneCallerScript: trainertotext BLACKBELT_T, KENJI3, MEM_BUFFER_0 farscall PhoneScript_GreetPhone_Male farjump KenjiCallingPhoneScript diff --git a/engine/phone/scripts/liz.asm b/engine/phone/scripts/liz.asm index 812d7dd40..31df3d4e9 100644 --- a/engine/phone/scripts/liz.asm +++ b/engine/phone/scripts/liz.asm @@ -1,4 +1,4 @@ -LizPhoneScript1: +LizPhoneCalleeScript: trainertotext PICNICKER, LIZ1, MEM_BUFFER_0 checkflag ENGINE_LIZ iftrue .WantsBattle @@ -18,7 +18,7 @@ LizPhoneScript1: landmarktotext ROUTE_32, MEM_BUFFER_2 farjump UnknownScript_0xa0a5a -LizPhoneScript2: +LizPhoneCallerScript: trainertotext PICNICKER, LIZ1, MEM_BUFFER_0 farscall PhoneScript_Random4 ifequal 0, LizWrongNumber diff --git a/engine/phone/scripts/mom.asm b/engine/phone/scripts/mom.asm index b4c949f09..9b8e1fcf3 100644 --- a/engine/phone/scripts/mom.asm +++ b/engine/phone/scripts/mom.asm @@ -1,4 +1,4 @@ -MomPhoneScript: +MomPhoneCalleeScript: checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST iftrue .bcec5 checkevent EVENT_DUDE_TALKED_TO_YOU diff --git a/engine/phone/scripts/parry.asm b/engine/phone/scripts/parry.asm index 0a91e2349..0ab95ad9f 100644 --- a/engine/phone/scripts/parry.asm +++ b/engine/phone/scripts/parry.asm @@ -1,4 +1,4 @@ -ParryPhoneScript1: +ParryPhoneCalleeScript: trainertotext HIKER, PARRY1, MEM_BUFFER_0 checkflag ENGINE_PARRY iftrue .WantsBattle @@ -17,7 +17,7 @@ ParryPhoneScript1: landmarktotext ROUTE_45, MEM_BUFFER_2 farjump ParryHaventYouGottenTo -ParryPhoneScript2: +ParryPhoneCallerScript: trainertotext HIKER, PARRY1, MEM_BUFFER_0 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_PARRY diff --git a/engine/phone/scripts/ralph.asm b/engine/phone/scripts/ralph.asm index 2fe9449f3..0baf77b33 100644 --- a/engine/phone/scripts/ralph.asm +++ b/engine/phone/scripts/ralph.asm @@ -1,4 +1,4 @@ -RalphPhoneScript1: +RalphPhoneCalleeScript: trainertotext FISHER, RALPH1, MEM_BUFFER_0 checkflag ENGINE_RALPH iftrue .Rematch @@ -22,7 +22,7 @@ RalphPhoneScript1: landmarktotext ROUTE_32, MEM_BUFFER_2 farjump UnknownScript_0xa0af5 -RalphPhoneScript2: +RalphPhoneCallerScript: trainertotext FISHER, RALPH1, MEM_BUFFER_0 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_FLYPOINT_GOLDENROD diff --git a/engine/phone/scripts/reena.asm b/engine/phone/scripts/reena.asm index dd7818f7d..a90f8e669 100644 --- a/engine/phone/scripts/reena.asm +++ b/engine/phone/scripts/reena.asm @@ -1,4 +1,4 @@ -ReenaPhoneScript1: +ReenaPhoneCalleeScript: trainertotext COOLTRAINERF, REENA1, MEM_BUFFER_0 checkflag ENGINE_REENA iftrue .WantsBattle @@ -17,7 +17,7 @@ ReenaPhoneScript1: landmarktotext ROUTE_27, MEM_BUFFER_2 farjump UnknownScript_0xa0a46 -ReenaPhoneScript2: +ReenaPhoneCallerScript: trainertotext COOLTRAINERF, REENA1, MEM_BUFFER_0 farscall PhoneScript_GreetPhone_Female checkflag ENGINE_REENA diff --git a/engine/phone/scripts/tiffany.asm b/engine/phone/scripts/tiffany.asm index 8f7f5dd0e..967f97135 100644 --- a/engine/phone/scripts/tiffany.asm +++ b/engine/phone/scripts/tiffany.asm @@ -1,4 +1,4 @@ -TiffanyPhoneScript1: +TiffanyPhoneCalleeScript: trainertotext PICNICKER, TIFFANY3, MEM_BUFFER_0 checkflag ENGINE_TIFFANY iftrue .WantsBattle @@ -23,7 +23,7 @@ TiffanyPhoneScript1: landmarktotext ROUTE_43, MEM_BUFFER_2 farjump UnknownScript_0xa0ae5 -TiffanyPhoneScript2: +TiffanyPhoneCallerScript: trainertotext PICNICKER, TIFFANY3, MEM_BUFFER_0 farscall PhoneScript_Random4 ifequal 0, TiffanysFamilyMembers diff --git a/engine/phone/scripts/todd.asm b/engine/phone/scripts/todd.asm index e3a024f00..3aafb740a 100644 --- a/engine/phone/scripts/todd.asm +++ b/engine/phone/scripts/todd.asm @@ -1,4 +1,4 @@ -ToddPhoneScript1: +ToddPhoneCalleeScript: trainertotext CAMPER, TODD1, MEM_BUFFER_0 checkflag ENGINE_TODD iftrue .WantsBattle @@ -22,7 +22,7 @@ ToddPhoneScript1: .SaleOn: farjump UnknownScript_0xa0b04 -ToddPhoneScript2: +ToddPhoneCallerScript: trainertotext CAMPER, TODD1, MEM_BUFFER_0 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_TODD diff --git a/engine/phone/scripts/tully.asm b/engine/phone/scripts/tully.asm index 981ae2481..b6bf84ba7 100644 --- a/engine/phone/scripts/tully.asm +++ b/engine/phone/scripts/tully.asm @@ -1,4 +1,4 @@ -TullyPhoneScript1: +TullyPhoneCalleeScript: trainertotext FISHER, TULLY1, MEM_BUFFER_0 checkflag ENGINE_TULLY iftrue .WantsBattle @@ -23,7 +23,7 @@ TullyPhoneScript1: landmarktotext ROUTE_42, MEM_BUFFER_2 farjump UnknownScript_0xa0add -TullyPhoneScript2: +TullyPhoneCallerScript: trainertotext FISHER, TULLY1, MEM_BUFFER_0 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_TULLY diff --git a/engine/phone/scripts/vance.asm b/engine/phone/scripts/vance.asm index 81afedfaf..8410289cb 100644 --- a/engine/phone/scripts/vance.asm +++ b/engine/phone/scripts/vance.asm @@ -1,4 +1,4 @@ -VancePhoneScript1: +VancePhoneCalleeScript: trainertotext BIRD_KEEPER, VANCE1, MEM_BUFFER_0 checkflag ENGINE_VANCE iftrue .WantsBattle @@ -17,7 +17,7 @@ VancePhoneScript1: landmarktotext ROUTE_44, MEM_BUFFER_2 farjump VanceHurryHurry -VancePhoneScript2: +VancePhoneCallerScript: trainertotext BIRD_KEEPER, VANCE1, MEM_BUFFER_0 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_VANCE diff --git a/engine/phone/scripts/wade.asm b/engine/phone/scripts/wade.asm index 5b317f5f9..31931f06a 100644 --- a/engine/phone/scripts/wade.asm +++ b/engine/phone/scripts/wade.asm @@ -1,4 +1,4 @@ -WadePhoneScript1: +WadePhoneCalleeScript: trainertotext BUG_CATCHER, WADE1, MEM_BUFFER_0 checkflag ENGINE_WADE iftrue .WantsBattle @@ -36,7 +36,7 @@ WadePhoneScript1: landmarktotext ROUTE_31, MEM_BUFFER_2 farjump UnknownScript_0xa0ab5 -WadePhoneScript2: +WadePhoneCallerScript: trainertotext BUG_CATCHER, WADE1, MEM_BUFFER_0 farscall PhoneScript_GreetPhone_Male farscall PhoneScript_Random2 diff --git a/engine/phone/scripts/wilton.asm b/engine/phone/scripts/wilton.asm index 732e49b96..9d2f0e906 100644 --- a/engine/phone/scripts/wilton.asm +++ b/engine/phone/scripts/wilton.asm @@ -1,4 +1,4 @@ -WiltonPhoneScript1: +WiltonPhoneCalleeScript: trainertotext FISHER, WILTON1, MEM_BUFFER_0 checkflag ENGINE_WILTON iftrue .WantsBattle @@ -23,7 +23,7 @@ WiltonPhoneScript1: landmarktotext ROUTE_44, MEM_BUFFER_2 farjump WiltonWantThis -WiltonPhoneScript2: +WiltonPhoneCallerScript: trainertotext FISHER, WILTON1, MEM_BUFFER_0 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_WILTON