Labels, including a comment explaining RandomPhoneRareWildMon.

This commit is contained in:
surskitty 2017-12-13 23:35:07 -05:00
parent 1f0fbfb602
commit 8e54adc22f
6 changed files with 65 additions and 64 deletions

View File

@ -842,7 +842,7 @@ UnknownScript_0xa0584:
UnknownScript_0xa058e: UnknownScript_0xa058e:
farjump PhoneScript_HangupText_Male farjump PhoneScript_HangupText_Male
UnknownScript_0xa0592: Phone_CheckIfUnseenRare:
scall PhoneScriptRareWildMon scall PhoneScriptRareWildMon
iffalse .HangUp iffalse .HangUp
farjump UnknownScript_0xa0017 farjump UnknownScript_0xa0017

View File

@ -13,57 +13,57 @@ JackTriviaScript:
if_equal 10, .RainDance if_equal 10, .RainDance
.Thunder: .Thunder:
farwritetext UnknownText_0x174261 farwritetext JackThunderTriviaText
buttonsound buttonsound
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
.Rollout: .Rollout:
farwritetext UnknownText_0x17429d farwritetext JackRolloutTriviaText
buttonsound buttonsound
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
.Solarbeam: .Solarbeam:
farwritetext UnknownText_0x1742ee farwritetext JackSolarbeamTriviaText
buttonsound buttonsound
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
.Stomp: .Stomp:
farwritetext UnknownText_0x174340 farwritetext JackStompTriviaText
buttonsound buttonsound
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
.Gust: .Gust:
farwritetext UnknownText_0x174391 farwritetext JackGustTriviaText
buttonsound buttonsound
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
.Twister: .Twister:
farwritetext UnknownText_0x1743e3 farwritetext JackTwisterTriviaText
buttonsound buttonsound
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
.Earthquake: .Earthquake:
farwritetext UnknownText_0x174433 farwritetext JackEarthquakeTriviaText
buttonsound buttonsound
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
.Magnitude: .Magnitude:
farwritetext UnknownText_0x174485 farwritetext JackMagnitudeTriviaText
buttonsound buttonsound
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
.Sandstorm: .Sandstorm:
farwritetext UnknownText_0x1744d6 farwritetext JackSandstormTriviaText
buttonsound buttonsound
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
.SunnyDay: .SunnyDay:
farwritetext UnknownText_0x174522 farwritetext JackSunnyDayTriviaText
buttonsound buttonsound
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
.RainDance: .RainDance:
farwritetext UnknownText_0x174571 farwritetext JackRainDanceTriviaText
buttonsound buttonsound
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
@ -144,52 +144,52 @@ ChadOakGossip:
if_equal 9, .Traveled if_equal 9, .Traveled
.Blue: .Blue:
farwritetext UnknownText_0x65481 farwritetext ChadBlueGossipText
buttonsound buttonsound
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
.Daisy: .Daisy:
farwritetext UnknownText_0x654ea farwritetext ChadDaisyGossipText
buttonsound buttonsound
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
.ProfElm: .ProfElm:
farwritetext UnknownText_0x65555 farwritetext ChadProfElmGossipText
buttonsound buttonsound
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
.Dream: .Dream:
farwritetext UnknownText_0x655c7 farwritetext ChadDreamGossipText
buttonsound buttonsound
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
.Kurt: .Kurt:
farwritetext UnknownText_0x65628 farwritetext ChadKurtGossipText
buttonsound buttonsound
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
.League: .League:
farwritetext UnknownText_0x6569b farwritetext ChadLeagueGossipText
buttonsound buttonsound
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
.RadioShow: .RadioShow:
farwritetext UnknownText_0x6574a farwritetext ChadRadioShowGossipText
buttonsound buttonsound
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
.Battling: .Battling:
farwritetext UnknownText_0x65810 farwritetext ChadBattlingGossipText
buttonsound buttonsound
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
.DaisyTea: .DaisyTea:
farwritetext UnknownText_0x658c6 farwritetext ChadDaisyTeaGossipText
buttonsound buttonsound
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
.Traveled: .Traveled:
farwritetext UnknownText_0x65969 farwritetext ChadTravelGossipText
buttonsound buttonsound
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
@ -281,7 +281,7 @@ IrwinRumorScript:
iftrue IrwinFogBadge iftrue IrwinFogBadge
checkflag ENGINE_PLAINBADGE checkflag ENGINE_PLAINBADGE
iftrue IrwinPlainBadge iftrue IrwinPlainBadge
farwritetext UnknownText_0x646a3 farwritetext IrwinCalledRightAwayText
buttonsound buttonsound
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
@ -345,7 +345,7 @@ IrwinMarshBadge:
buttonsound buttonsound
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
UnknownScript_0xa08f8: JackPhoneTips:
farwritetext UnknownText_0x1745c2 farwritetext UnknownText_0x1745c2
buttonsound buttonsound
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
@ -511,25 +511,25 @@ UnknownScript_0xa0a00:
UnknownScript_0xa0a08: UnknownScript_0xa0a08:
checkmorn checkmorn
iftrue UnknownScript_0xa0a1d iftrue .Morning
checknite checknite
iftrue UnknownScript_0xa0a25 iftrue .Night
setevent EVENT_KENJI_ON_BREAK setevent EVENT_KENJI_ON_BREAK
farwritetext UnknownText_0x66f11 farwritetext UnknownText_0x66f11
buttonsound buttonsound
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
UnknownScript_0xa0a1d: .Morning:
farwritetext UnknownText_0x66ed3 farwritetext UnknownText_0x66ed3
buttonsound buttonsound
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
UnknownScript_0xa0a25: .Night:
farwritetext UnknownText_0x66f52 farwritetext UnknownText_0x66f52
buttonsound buttonsound
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
UnknownScript_0xa0a2d: JackWantsBattle:
farwritetext UnknownText_0x174638 farwritetext UnknownText_0x174638
end end

View File

@ -301,27 +301,27 @@ ElmPhoneScript2: ; 0xbd081
JackPhoneScript1: JackPhoneScript1:
trainertotext SCHOOLBOY, JACK1, $0 trainertotext SCHOOLBOY, JACK1, $0
checkflag ENGINE_JACK checkflag ENGINE_JACK
iftrue UnknownScript_0xbd0f3 iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_JACK_MONDAY_MORNING checkflag ENGINE_JACK_MONDAY_MORNING
iftrue UnknownScript_0xbd0ef iftrue .NotMonday
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
if_not_equal MONDAY, UnknownScript_0xbd0ef if_not_equal MONDAY, .NotMonday
checkmorn checkmorn
iftrue UnknownScript_0xbd12a iftrue JackMondayMorning
UnknownScript_0xbd0ef: .NotMonday:
farjump UnknownScript_0xa08f8 farjump JackPhoneTips
UnknownScript_0xbd0f3: .WantsBattle:
landmarktotext NATIONAL_PARK, $2 landmarktotext NATIONAL_PARK, $2
farjump UnknownScript_0xa0a2d farjump JackWantsBattle
JackPhoneScript2: JackPhoneScript2:
trainertotext SCHOOLBOY, JACK1, $0 trainertotext SCHOOLBOY, JACK1, $0
farscall PhoneScript_GreetPhone_Male farscall PhoneScript_GreetPhone_Male
farscall PhoneScript_Random2 farscall PhoneScript_Random2
if_equal $0, UnknownScript_0xbd13b if_equal $0, JackBattleTrivia
checkflag ENGINE_JACK checkflag ENGINE_JACK
iftrue UnknownScript_0xbd11e iftrue UnknownScript_0xbd11e
checkflag ENGINE_JACK_MONDAY_MORNING checkflag ENGINE_JACK_MONDAY_MORNING
@ -334,7 +334,7 @@ UnknownScript_0xbd11e:
if_equal $0, UnknownScript_0xbd137 if_equal $0, UnknownScript_0xbd137
farjump UnknownScript_0xa0000 farjump UnknownScript_0xa0000
UnknownScript_0xbd12a: JackMondayMorning:
setflag ENGINE_JACK_MONDAY_MORNING setflag ENGINE_JACK_MONDAY_MORNING
UnknownScript_0xbd12d: UnknownScript_0xbd12d:
@ -345,7 +345,7 @@ UnknownScript_0xbd12d:
UnknownScript_0xbd137: UnknownScript_0xbd137:
farjump UnknownScript_0xa0584 farjump UnknownScript_0xa0584
UnknownScript_0xbd13b: JackBattleTrivia:
farjump JackTriviaScript farjump JackTriviaScript
; Beverly ; Beverly
@ -1355,7 +1355,7 @@ UnknownScript_0xbd9ae:
farjump PhoneScript_WantsToBattle_Female farjump PhoneScript_WantsToBattle_Female
UnknownScript_0xbd9b8: UnknownScript_0xbd9b8:
farjump UnknownScript_0xa0592 farjump Phone_CheckIfUnseenRare
UnknownScript_0xbd9bc: UnknownScript_0xbd9bc:
setflag ENGINE_DANA_HAS_THUNDERSTONE setflag ENGINE_DANA_HAS_THUNDERSTONE

View File

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

View File

@ -205,7 +205,7 @@ UnknownText_0x645ff: ; 0x645ff
done done
; 0x646a3 ; 0x646a3
UnknownText_0x646a3: ; 0x646a3 IrwinCalledRightAwayText: ; 0x646a3
text "Hehe, I called" text "Hehe, I called"
line "right away!" line "right away!"
@ -727,7 +727,7 @@ UnknownText_0x65471: ; 0x65471
done done
; 0x65481 ; 0x65481
UnknownText_0x65481: ; 0x65481 ChadBlueGossipText: ; 0x65481
text "Do you know BLUE?" text "Do you know BLUE?"
para "He's PROF.OAK's" para "He's PROF.OAK's"
@ -741,7 +741,7 @@ UnknownText_0x65481: ; 0x65481
done done
; 0x654ea ; 0x654ea
UnknownText_0x654ea: ; 0x654ea ChadDaisyGossipText: ; 0x654ea
text "PROF.OAK has a" text "PROF.OAK has a"
line "granddaughter" line "granddaughter"
cont "named DAISY." cont "named DAISY."
@ -754,7 +754,7 @@ UnknownText_0x654ea: ; 0x654ea
done done
; 0x65555 ; 0x65555
UnknownText_0x65555: ; 0x65555 ChadProfElmGossipText: ; 0x65555
text "Everyone's talking" text "Everyone's talking"
line "about PROF.ELM." line "about PROF.ELM."
@ -767,7 +767,7 @@ UnknownText_0x65555: ; 0x65555
done done
; 0x655c7 ; 0x655c7
UnknownText_0x655c7: ; 0x655c7 ChadDreamGossipText: ; 0x655c7
text "PROF.OAK's dream" text "PROF.OAK's dream"
line "is to compile a" line "is to compile a"
@ -780,7 +780,7 @@ UnknownText_0x655c7: ; 0x655c7
done done
; 0x65628 ; 0x65628
UnknownText_0x65628: ; 0x65628 ChadKurtGossipText: ; 0x65628
text "Do you know KURT," text "Do you know KURT,"
line "the BALL creator?" line "the BALL creator?"
@ -793,7 +793,7 @@ UnknownText_0x65628: ; 0x65628
done done
; 0x6569b ; 0x6569b
UnknownText_0x6569b: ; 0x6569b ChadLeagueGossipText: ; 0x6569b
text "#MON LEAGUE is" text "#MON LEAGUE is"
line "the great gather-" line "the great gather-"
cont "ing place for all" cont "ing place for all"
@ -812,7 +812,7 @@ UnknownText_0x6569b: ; 0x6569b
done done
; 0x6574a ; 0x6574a
UnknownText_0x6574a: ; 0x6574a ChadRadioShowGossipText: ; 0x6574a
text "PROF.OAK'S #MON" text "PROF.OAK'S #MON"
line "TALK is a popular" line "TALK is a popular"
cont "radio show, right?" cont "radio show, right?"
@ -832,7 +832,7 @@ UnknownText_0x6574a: ; 0x6574a
done done
; 0x65810 ; 0x65810
UnknownText_0x65810: ; 0x65810 ChadBattlingGossipText: ; 0x65810
text "PROF.OAK used to" text "PROF.OAK used to"
line "be a trainer a" line "be a trainer a"
cont "long time ago." cont "long time ago."
@ -851,7 +851,7 @@ UnknownText_0x65810: ; 0x65810
done done
; 0x658c6 ; 0x658c6
UnknownText_0x658c6: ; 0x658c6 ChadDaisyTeaGossipText: ; 0x658c6
text "PROF.OAK has a" text "PROF.OAK has a"
line "granddaughter" line "granddaughter"
cont "named DAISY." cont "named DAISY."
@ -870,7 +870,7 @@ UnknownText_0x658c6: ; 0x658c6
done done
; 0x65969 ; 0x65969
UnknownText_0x65969: ; 0x65969 ChadTravelGossipText: ; 0x65969
text "Did you know?" text "Did you know?"
line "PROF.OAK traveled" line "PROF.OAK traveled"

View File

@ -83,7 +83,7 @@ UnknownText_0x174251: ; 0x174251
done done
; 0x174261 ; 0x174261
UnknownText_0x174261: ; 0x174261 JackThunderTriviaText: ; 0x174261
text "Did you know?" text "Did you know?"
para "When it's raining," para "When it's raining,"
@ -92,7 +92,7 @@ UnknownText_0x174261: ; 0x174261
done done
; 0x17429d ; 0x17429d
UnknownText_0x17429d: ; 0x17429d JackRolloutTriviaText: ; 0x17429d
text "Did you know…?" text "Did you know…?"
para "If you use DEFENSE" para "If you use DEFENSE"
@ -103,7 +103,7 @@ UnknownText_0x17429d: ; 0x17429d
done done
; 0x1742ee ; 0x1742ee
UnknownText_0x1742ee: ; 0x1742ee JackSolarbeamTriviaText: ; 0x1742ee
text "Did you know…?" text "Did you know…?"
para "If the sunlight is" para "If the sunlight is"
@ -114,7 +114,7 @@ UnknownText_0x1742ee: ; 0x1742ee
done done
; 0x174340 ; 0x174340
UnknownText_0x174340: ; 0x174340 JackStompTriviaText: ; 0x174340
text "Did you know…?" text "Did you know…?"
para "If the opponent" para "If the opponent"
@ -125,7 +125,7 @@ UnknownText_0x174340: ; 0x174340
done done
; 0x174391 ; 0x174391
UnknownText_0x174391: ; 0x174391 JackGustTriviaText: ; 0x174391
text "Did you know…?" text "Did you know…?"
para "If your opponent" para "If your opponent"
@ -136,7 +136,7 @@ UnknownText_0x174391: ; 0x174391
done done
; 0x1743e3 ; 0x1743e3
UnknownText_0x1743e3: ; 0x1743e3 JackTwisterTriviaText: ; 0x1743e3
text "Did you know…?" text "Did you know…?"
para "If your opponent" para "If your opponent"
@ -147,7 +147,7 @@ UnknownText_0x1743e3: ; 0x1743e3
done done
; 0x174433 ; 0x174433
UnknownText_0x174433: ; 0x174433 JackEarthquakeTriviaText: ; 0x174433
text "Did you know…?" text "Did you know…?"
para "If your opponent" para "If your opponent"
@ -158,7 +158,7 @@ UnknownText_0x174433: ; 0x174433
done done
; 0x174485 ; 0x174485
UnknownText_0x174485: ; 0x174485 JackMagnitudeTriviaText: ; 0x174485
text "Did you know…?" text "Did you know…?"
para "If your opponent" para "If your opponent"
@ -169,7 +169,7 @@ UnknownText_0x174485: ; 0x174485
done done
; 0x1744d6 ; 0x1744d6
UnknownText_0x1744d6: ; 0x1744d6 JackSandstormTriviaText: ; 0x1744d6
text "Did you know…?" text "Did you know…?"
para "The rock, ground" para "The rock, ground"
@ -180,7 +180,7 @@ UnknownText_0x1744d6: ; 0x1744d6
done done
; 0x174522 ; 0x174522
UnknownText_0x174522: ; 0x174522 JackSunnyDayTriviaText: ; 0x174522
text "Did you know…?" text "Did you know…?"
para "If the sunlight is" para "If the sunlight is"
@ -191,7 +191,7 @@ UnknownText_0x174522: ; 0x174522
done done
; 0x174571 ; 0x174571
UnknownText_0x174571: ; 0x174571 JackRainDanceTriviaText: ; 0x174571
text "Did you know…?" text "Did you know…?"
para "When it's raining," para "When it's raining,"