diff options
| -rw-r--r-- | engine/phone_callers.asm | 4 | ||||
| -rw-r--r-- | engine/phone_gossip.asm | 12 | ||||
| -rw-r--r-- | engine/phone_scripts.asm | 26 | ||||
| -rw-r--r-- | 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, <PLAY_G>!" line "Hurry, hurry!" @@ -1625,7 +1625,7 @@ WiltonHaventFoundAnythingText: ; 0x66ca7 done ; 0x66cf7 -UnknownText_0x66cf7: ; 0x66cf7 +WiltonNotBitingText: ; 0x66cf7 text "Sigh…" line "They're not biting" |