ref: 2b72d949b2bd9e75e1f6d5f964a1521b608ab7da
parent: cb1c6967ed57b38d4cf85fb7fa8bb08ce00cde75
author: surskitty <surskitty@gmail.com>
date: Wed Dec 13 16:12:42 EST 2017
Another batch of labels. Jack's move trivia, mostly.
--- a/engine/more_phone_scripts.asm
+++ b/engine/more_phone_scripts.asm
@@ -894,7 +894,7 @@
buttonsound
jump PhoneScript_HangupText_Male
-UnknownScript_0xa05e6:
+PhoneScript_FoundItem_Male:
checkcode VAR_CALLERID
if_equal PHONE_BIRDKEEPER_JOSE, .Jose
if_equal PHONE_BUG_CATCHER_WADE, .Wade
@@ -904,11 +904,11 @@
if_equal PHONE_FISHER_WILTON, .Wilton
.Jose:
- farwritetext UnknownText_0x175116
+ farwritetext JoseFoundSomethingText
end
.Wade:
- farwritetext UnknownText_0x175a60
+ farwritetext WadeFoundBerryText
end
.Alan:
@@ -927,7 +927,7 @@
farwritetext UnknownText_0x66c6b
end
-UnknownScript_0xa061e:
+PhoneScript_FoundItem_Female:
checkcode VAR_CALLERID
if_equal PHONE_POKEFAN_BEVERLY, .Beverly
if_equal PHONE_PICNICKER_GINA, .Gina
@@ -935,7 +935,7 @@
if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
.Beverly:
- farwritetext UnknownText_0x1747cc
+ farwritetext BeverlyFoundNuggetText
end
.Gina:
@@ -960,71 +960,71 @@
buttonsound
jump PhoneScript_HangupText_Male
-UnknownScript_0xa0654:
+JackTriviaScript:
random 11
- if_equal 0, UnknownScript_0xa0682
- if_equal 1, UnknownScript_0xa068a
- if_equal 2, UnknownScript_0xa0692
- if_equal 3, UnknownScript_0xa069a
- if_equal 4, UnknownScript_0xa06a2
- if_equal 5, UnknownScript_0xa06aa
- if_equal 6, UnknownScript_0xa06b2
- if_equal 7, UnknownScript_0xa06ba
- if_equal 8, UnknownScript_0xa06c2
- if_equal 9, UnknownScript_0xa06ca
- if_equal 10, UnknownScript_0xa06d2
+ if_equal 0, .Thunder
+ if_equal 1, .Rollout
+ if_equal 2, .Solarbeam
+ if_equal 3, .Stomp
+ if_equal 4, .Gust
+ if_equal 5, .Twister
+ if_equal 6, .Earthquake
+ if_equal 7, .Magnitude
+ if_equal 8, .Sandstorm
+ if_equal 9, .SunnyDay
+ if_equal 10, .RainDance
-UnknownScript_0xa0682:
+.Thunder:
farwritetext UnknownText_0x174261
buttonsound
jump PhoneScript_HangupText_Male
-UnknownScript_0xa068a:
+.Rollout:
farwritetext UnknownText_0x17429d
buttonsound
jump PhoneScript_HangupText_Male
-UnknownScript_0xa0692:
+.Solarbeam:
farwritetext UnknownText_0x1742ee
buttonsound
jump PhoneScript_HangupText_Male
-UnknownScript_0xa069a:
+.Stomp:
farwritetext UnknownText_0x174340
buttonsound
jump PhoneScript_HangupText_Male
-UnknownScript_0xa06a2:
+.Gust:
farwritetext UnknownText_0x174391
buttonsound
jump PhoneScript_HangupText_Male
-UnknownScript_0xa06aa:
+.Twister:
farwritetext UnknownText_0x1743e3
buttonsound
jump PhoneScript_HangupText_Male
-UnknownScript_0xa06b2:
+.Earthquake:
farwritetext UnknownText_0x174433
buttonsound
jump PhoneScript_HangupText_Male
-UnknownScript_0xa06ba:
+.Magnitude:
farwritetext UnknownText_0x174485
buttonsound
jump PhoneScript_HangupText_Male
-UnknownScript_0xa06c2:
+.Sandstorm:
farwritetext UnknownText_0x1744d6
buttonsound
jump PhoneScript_HangupText_Male
-UnknownScript_0xa06ca:
+.SunnyDay:
farwritetext UnknownText_0x174522
buttonsound
jump PhoneScript_HangupText_Male
-UnknownScript_0xa06d2:
+.RainDance:
farwritetext UnknownText_0x174571
buttonsound
jump PhoneScript_HangupText_Male
--- a/engine/phone_scripts.asm
+++ b/engine/phone_scripts.asm
@@ -346,7 +346,7 @@
farjump UnknownScript_0xa0584
UnknownScript_0xbd13b:
- farjump UnknownScript_0xa0654
+ farjump JackTriviaScript
; Beverly
@@ -375,7 +375,7 @@
UnknownScript_0xbd172:
setflag ENGINE_BEVERLY_HAS_NUGGET
landmarktotext NATIONAL_PARK, $2
- farjump UnknownScript_0xa061e
+ farjump PhoneScript_FoundItem_Female
; Huey
@@ -570,7 +570,7 @@
UnknownScript_0xbd312:
setflag ENGINE_JOSE_HAS_STAR_PIECE
landmarktotext ROUTE_27, $2
- farjump UnknownScript_0xa05e6
+ farjump PhoneScript_FoundItem_Male
; Reena
@@ -772,7 +772,7 @@
setevent EVENT_WADE_HAS_BITTER_BERRY
UnknownScript_0xbd4ce:
- farjump UnknownScript_0xa05e6
+ farjump PhoneScript_FoundItem_Male
; Ralph
@@ -1140,7 +1140,7 @@
UnknownScript_0xbd7dd:
setflag ENGINE_GINA_HAS_LEAF_STONE
landmarktotext ROUTE_34, $2
- farjump UnknownScript_0xa061e
+ farjump PhoneScript_FoundItem_Female
; Irwin
@@ -1292,7 +1292,7 @@
UnknownScript_0xbd926:
setflag ENGINE_ALAN_HAS_FIRE_STONE
landmarktotext ROUTE_36, $2
- farjump UnknownScript_0xa05e6
+ farjump PhoneScript_FoundItem_Male
; Dana
@@ -1360,7 +1360,7 @@
UnknownScript_0xbd9bc:
setflag ENGINE_DANA_HAS_THUNDERSTONE
landmarktotext ROUTE_38, $2
- farjump UnknownScript_0xa061e
+ farjump PhoneScript_FoundItem_Female
; Chad
@@ -1461,7 +1461,7 @@
.Nugget:
setflag ENGINE_DEREK_HAS_NUGGET
landmarktotext ROUTE_39, $2
- farjump UnknownScript_0xa05e6
+ farjump PhoneScript_FoundItem_Male
TullyPhoneScript1:
trainertotext FISHER, TULLY1, $0
@@ -1522,7 +1522,7 @@
TullyFoundWaterStone:
setflag ENGINE_TULLY_HAS_WATER_STONE
landmarktotext ROUTE_42, $2
- farjump UnknownScript_0xa05e6
+ farjump PhoneScript_FoundItem_Male
BrentPhoneScript1:
trainertotext POKEMANIAC, BRENT1, $0
@@ -1666,7 +1666,7 @@
UnknownScript_0xbdc69:
setflag ENGINE_TIFFANY_HAS_PINK_BOW
landmarktotext ROUTE_43, $2
- farjump UnknownScript_0xa061e
+ farjump PhoneScript_FoundItem_Female
; Vance
@@ -1785,7 +1785,7 @@
setevent EVENT_WILTON_HAS_POKE_BALL
UnknownScript_0xbdd6d:
- farjump UnknownScript_0xa05e6
+ farjump PhoneScript_FoundItem_Male
; Kenji
--- a/text/phone/extra2.asm
+++ b/text/phone/extra2.asm
@@ -278,7 +278,7 @@
done
; 0x1747cc
-UnknownText_0x1747cc: ; 0x1747cc
+BeverlyFoundNuggetText: ; 0x1747cc
text "My husband got"
line "some NUGGETS."
@@ -639,7 +639,7 @@
done
; 0x175116
-UnknownText_0x175116: ; 0x175116
+JoseFoundSomethingText: ; 0x175116
text "My FARFETCH'D had"
line "something pretty"
cont "in its beak."
@@ -996,7 +996,7 @@
done
; 0x175a60
-UnknownText_0x175a60: ; 0x175a60
+WadeFoundBerryText: ; 0x175a60
text "I found all kinds"
line "of BERRIES. If you"