shithub: pokecrystal

Download patch

ref: 8fa7183d29cff3f30de399db8a50be4573a2185e
parent: 2b72d949b2bd9e75e1f6d5f964a1521b608ab7da
author: surskitty <surskitty@gmail.com>
date: Wed Dec 13 16:50:32 EST 2017

More phone script labelling.

--- a/engine/more_phone_scripts.asm
+++ b/engine/more_phone_scripts.asm
@@ -522,11 +522,11 @@
 	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 @@
 	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
--- a/engine/phone_scripts.asm
+++ b/engine/phone_scripts.asm
@@ -340,7 +340,7 @@
 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 @@
 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,23 +403,23 @@
 	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
 
@@ -426,19 +426,19 @@
 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,7 +450,7 @@
 	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
@@ -457,13 +457,13 @@
 	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,7 +508,7 @@
 UnknownScript_0xbd28a:
 	landmarktotext ROUTE_26, $2
 	setflag ENGINE_BETH
-	farjump UnknownScript_0xa037e
+	farjump PhoneScript_WantsToBattle_Female
 
 ; Jose
 
@@ -515,21 +515,21 @@
 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 @@
 	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_0xbd369:
 	landmarktotext ROUTE_27, $2
 	setflag ENGINE_REENA
-	farjump UnknownScript_0xa037e
+	farjump PhoneScript_WantsToBattle_Female
 
 ; Joey
 
@@ -656,7 +656,7 @@
 UnknownScript_0xbd3c7:
 	landmarktotext ROUTE_30, $2
 	setflag ENGINE_JOEY
-	farjump UnknownScript_0xa0376
+	farjump PhoneScript_WantsToBattle_Male
 
 ; Wade
 
@@ -738,7 +738,7 @@
 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_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 @@
 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_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 @@
 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 @@
 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 @@
 	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 @@
 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 @@
 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_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_0xbda23:
 	landmarktotext ROUTE_38, $2
 	setflag ENGINE_CHAD
-	farjump UnknownScript_0xa0376
+	farjump PhoneScript_WantsToBattle_Male
 
 UnknownScript_0xbda2d:
 	farjump UnknownScript_0xa0584
@@ -1517,7 +1517,7 @@
 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 @@
 	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_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_0xbdc17:
 	landmarktotext ROUTE_43, $2
 	setflag ENGINE_TIFFANY
-	farjump UnknownScript_0xa037e
+	farjump PhoneScript_WantsToBattle_Female
 
 UnknownScript_0xbdc21:
 	random $6
@@ -1709,7 +1709,7 @@
 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_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_0xbddda:
 	landmarktotext ROUTE_45, $2
 	setflag ENGINE_PARRY
-	farjump UnknownScript_0xa0376
+	farjump PhoneScript_WantsToBattle_Male
 
 ; Erin
 
@@ -1883,7 +1883,7 @@
 UnknownScript_0xbde35:
 	landmarktotext ROUTE_46, $2
 	setflag ENGINE_ERIN
-	farjump UnknownScript_0xa037e
+	farjump PhoneScript_WantsToBattle_Female
 
 PhoneScript_Random2:
 	random 2