ref: cb5aa29228871f27752860a3d036bec013e7db6e
parent: 75c56e86c4ead8d38d4604bc20c2b35c57502560
author: surskitty <surskitty@gmail.com>
date: Fri Dec 15 13:16:27 EST 2017
Labelling the remaining stuff one sed at a time.
--- a/engine/phone_callers.asm
+++ b/engine/phone_callers.asm
@@ -684,8 +684,8 @@
farwritetext LizHiTaniaText
end
-UnknownScript_0xa047f:
- farwritetext UnknownText_0x66796
+TiffanyItsAwful:
+ farwritetext TiffanyItsAwfulText
end
PhoneScript_HangupText_Male:
--- a/engine/phone_gossip.asm
+++ b/engine/phone_gossip.asm
@@ -455,8 +455,8 @@
buttonsound
jump PhoneScript_HangupText_Female
-UnknownScript_0xa09a8:
- farwritetext UnknownText_0x66aa5
+VanceLookingForward:
+ farwritetext VanceLookingForwardText
buttonsound
jump PhoneScript_HangupText_Male
@@ -609,12 +609,12 @@
farwritetext UnknownText_0x668a3
end
-UnknownScript_0xa0a91:
- farwritetext UnknownText_0x66ad1
+VanceHurryHurry:
+ farwritetext VanceHurryHurryText
end
-UnknownScript_0xa0a96:
- farwritetext UnknownText_0x66cf7
+WiltonNotBiting:
+ farwritetext WiltonNotBitingText
end
ParryHaventYouGottenTo:
--- a/engine/phone_scripts.asm
+++ b/engine/phone_scripts.asm
@@ -1597,7 +1597,7 @@
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 @@
setflag ENGINE_TIFFANY
farjump PhoneScript_WantsToBattle_Female
-TiffanyTalksAboutFamily:
+TiffanysFamilyMembers:
random $6
if_equal $0, .Grandma
if_equal $1, .Grandpa
@@ -1638,30 +1638,30 @@
.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 @@
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 @@
.WantsBattle:
landmarktotext ROUTE_44, $2
- farjump UnknownScript_0xa0a96
+ farjump WiltonNotBiting
.HasItem:
landmarktotext ROUTE_44, $2
--- a/text/phone/extra.asm
+++ b/text/phone/extra.asm
@@ -1394,7 +1394,7 @@
done
; 0x66796
-UnknownText_0x66796: ; 0x66796
+TiffanyItsAwfulText: ; 0x66796
text_from_ram StringBuffer4
text "!"
@@ -1525,7 +1525,7 @@
done
; 0x66aa5
-UnknownText_0x66aa5: ; 0x66aa5
+VanceLookingForwardText: ; 0x66aa5
text "I'll be looking"
line "forward to our"
cont "next battle!"
@@ -1532,7 +1532,7 @@
done
; 0x66ad1
-UnknownText_0x66ad1: ; 0x66ad1
+VanceHurryHurryText: ; 0x66ad1
text "Oh, <PLAY_G>!"
line "Hurry, hurry!"
@@ -1625,7 +1625,7 @@
done
; 0x66cf7
-UnknownText_0x66cf7: ; 0x66cf7
+WiltonNotBitingText: ; 0x66cf7
text "Sigh…"
line "They're not biting"