Merge pull request #420 from surskitty/master

Partial Phone Script Labels

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

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

engine/wildmons.asm

@@ -802,8 +802,9 @@ ValidateTempWildMonSpecies: ; 2a4a0
 	ret
 ; 2a4ab
 
-RandomPhoneRareWildMon: ; 2a4ab
+; Finds a rare wild Pokemon in the route of the trainer calling, then checks if it's been Seen already.
-; Related to the phone?
+; The trainer will then tell you about the Pokemon if you haven't seen it.
+RandomUnseenWildMon: ; 2a4ab
 	callba GetCallerLocation
 	ld d, b
 	ld e, c

main.asm

@@ -762,7 +762,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"
@@ -771,8 +771,9 @@ INCLUDE "engine/slot_machine.asm"
 
 SECTION "Phone Engine", ROMX
 
-INCLUDE "engine/more_phone_scripts.asm"
+INCLUDE "engine/phone/phone_callers.asm"
-INCLUDE "engine/buena_phone_scripts.asm"
+INCLUDE "engine/phone/phone_gossip.asm"
+INCLUDE "engine/phone/buenas_password.asm"
 
 
 SECTION "Phone Text", ROMX
@@ -806,7 +807,8 @@ INCLUDE "gfx/mail.asm"
 SECTION "bank2F", ROMX
 
 INCLUDE "engine/std_scripts.asm"
-INCLUDE "engine/phone_scripts.asm"
+INCLUDE "engine/phone/phone_scripts.asm"
+INCLUDE "engine/phone/generic_calls.asm"
 INCLUDE "engine/trainer_scripts.asm"
 
 

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!"
 
@@ -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 "@"
@@ -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"
 
@@ -914,7 +914,7 @@ UnknownText_0x65a63: ; 0x65a63
 	done
 ; 0x65ab2
 
-UnknownText_0x65ab2: ; 0x65ab2
+DerekCheekPincherText: ; 0x65ab2
 	text "Listen to this."
 	line "My @"
 	text_from_ram StringBuffer4
@@ -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."
@@ -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"
 
@@ -1394,7 +1394,7 @@ UnknownText_0x66730: ; 0x66730
 	done
 ; 0x66796
 
-UnknownText_0x66796: ; 0x66796
+TiffanyItsAwfulText: ; 0x66796
 	text_from_ram StringBuffer4
 	text "!"
 
@@ -1471,7 +1471,7 @@ UnknownText_0x6691d: ; 0x6691d
 	done
 ; 0x66980
 
-UnknownText_0x66980: ; 0x66980
+VanceLiftoffText: ; 0x66980
 	text "My @"
 	text_from_ram StringBuffer4
 	text "'s"
@@ -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, <PLAY_G>!"
 	line "Hurry, hurry!"
 
@@ -1543,7 +1543,7 @@ UnknownText_0x66ad1: ; 0x66ad1
 	done
 ; 0x66afc
 
-UnknownText_0x66afc: ; 0x66afc
+WiltonGrownText: ; 0x66afc
 	text "My @"
 	text_from_ram StringBuffer4
 	text "'s"
@@ -1613,7 +1613,7 @@ UnknownText_0x66c6b: ; 0x66c6b
 	done
 ; 0x66ca7
 
-UnknownText_0x66ca7: ; 0x66ca7
+WiltonHaventFoundAnythingText: ; 0x66ca7
 	text "Nah, I haven't"
 	line "found anything"
 
@@ -1625,7 +1625,7 @@ UnknownText_0x66ca7: ; 0x66ca7
 	done
 ; 0x66cf7
 
-UnknownText_0x66cf7: ; 0x66cf7
+WiltonNotBitingText: ; 0x66cf7
 	text "Sigh…"
 	line "They're not biting"
 
@@ -1639,7 +1639,7 @@ UnknownText_0x66cf7: ; 0x66cf7
 	done
 ; 0x66d45
 
-UnknownText_0x66d45: ; 0x66d45
+WiltonWantThisText: ; 0x66d45
 	text "Don't you want"
 	line "this item?"
 
@@ -1707,7 +1707,7 @@ UnknownText_0x66ed3: ; 0x66ed3
 	done
 ; 0x66f11
 
-UnknownText_0x66f11: ; 0x66f11
+KenjiBreakText: ; 0x66f11
 	text "I'm taking a break"
 	line "on ROUTE 45!"
 
@@ -1727,7 +1727,7 @@ UnknownText_0x66f52: ; 0x66f52
 	done
 ; 0x66f9f
 
-UnknownText_0x66f9f: ; 0x66f9f
+ParryNoMatchText: ; 0x66f9f
 	text "Nothing can match"
 	line "my @"
 	text_from_ram StringBuffer4
@@ -1786,13 +1786,13 @@ UnknownText_0x670eb: ; 0x670eb
 	done
 ; 0x67106
 
-UnknownText_0x67106: ; 0x67106
+ParryBattleWithMeText: ; 0x67106
 	text "You'll battle with"
 	line "me again, right?"
 	done
 ; 0x6712a
 
-UnknownText_0x6712a: ; 0x6712a
+ParryHaventYouGottenToText: ; 0x6712a
 	text "Haven't you gotten"
 	line "to @"
 	text_from_ram StringBuffer5
@@ -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, <PLAY_G>!"
 	line "Come battle ERIN!"
 

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"
@@ -31,7 +31,7 @@ UnknownText_0x1740c0: ; 0x1740c0
 	done
 ; 0x174106
 
-UnknownText_0x174106: ; 0x174106
+JackDefeatedMonText: ; 0x174106
 	text "The other day, I"
 	line "easily defeated a"
 	cont "@"
@@ -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,"
@@ -278,7 +278,7 @@ UnknownText_0x1747ac: ; 0x1747ac
 	done
 ; 0x1747cc
 
-UnknownText_0x1747cc: ; 0x1747cc
+BeverlyFoundNuggetText: ; 0x1747cc
 	text "My husband got"
 	line "some NUGGETS."
 
@@ -369,7 +369,7 @@ UnknownText_0x1749c7: ; 0x1749c7
 	done
 ; 0x174a24
 
-UnknownText_0x174a24: ; 0x174a24
+GavenGreaterText: ; 0x174a24
 	text "My @"
 	text_from_ram StringBuffer4
 	text ""
@@ -552,7 +552,7 @@ UnknownText_0x174ec5: ; 0x174ec5
 	done
 ; 0x174ee2
 
-UnknownText_0x174ee2: ; 0x174ee2
+BethForgetDealText: ; 0x174ee2
 	text "Um… <PLAY_G>?"
 	line "What's wrong?"
 
@@ -568,7 +568,7 @@ UnknownText_0x174ee2: ; 0x174ee2
 	done
 ; 0x174f2f
 
-UnknownText_0x174f2f: ; 0x174f2f
+JoseAromaText: ; 0x174f2f
 	text "Hey listen, my"
 	line "@"
 	text_from_ram StringBuffer4
@@ -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."
@@ -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?"
 
@@ -981,7 +981,7 @@ UnknownText_0x1759e7: ; 0x1759e7
 	done
 ; 0x1759f7
 
-UnknownText_0x1759f7: ; 0x1759f7
+WadeBugCatchingContestText: ; 0x1759f7
 	text "The Bug-Catching"
 	line "Contest is at the"
 
@@ -996,7 +996,7 @@ UnknownText_0x1759f7: ; 0x1759f7
 	done
 ; 0x175a60
 
-UnknownText_0x175a60: ; 0x175a60
+WadeFoundBerryText: ; 0x175a60
 	text "I found all kinds"
 	line "of BERRIES. If you"
 
@@ -1050,7 +1050,7 @@ UnknownText_0x175b6d: ; 0x175b6d
 	done
 ; 0x175bc4
 
-UnknownText_0x175bc4: ; 0x175bc4
+RalphNeglectingKidsText: ; 0x175bc4
 	text "I've been spending"
 	line "more time with my"
 
@@ -1260,7 +1260,7 @@ UnknownText_0x17610a: ; 0x17610a
 	done
 ; 0x1761a7
 
-UnknownText_0x1761a7: ; 0x1761a7
+LizHiTaniaText: ; 0x1761a7
 	text "Hi, TANIA. How are"
 	line "you? This is LIZ."
 
@@ -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"

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, <PLAYER>,"
 	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