diff options
author | surskitty <surskitty@gmail.com> | 2017-12-13 23:35:07 -0500 |
---|---|---|
committer | surskitty <surskitty@gmail.com> | 2017-12-13 23:35:07 -0500 |
commit | 8e54adc22f6793ce86612d30770b02c71a80a2db (patch) | |
tree | aa5be81a4a3b436c16449af144230f67ba2ca774 | |
parent | 1f0fbfb602e23ce3f1befcb6a3d3799592b3cfe7 (diff) |
Labels, including a comment explaining RandomPhoneRareWildMon.
-rw-r--r-- | engine/phone_callers.asm | 2 | ||||
-rw-r--r-- | engine/phone_gossip.asm | 56 | ||||
-rw-r--r-- | engine/phone_scripts.asm | 24 | ||||
-rwxr-xr-x | engine/wildmons.asm | 3 | ||||
-rw-r--r-- | text/phone/extra.asm | 22 | ||||
-rw-r--r-- | text/phone/extra2.asm | 22 |
6 files changed, 65 insertions, 64 deletions
diff --git a/engine/phone_callers.asm b/engine/phone_callers.asm index 1b4f19c8e..f14e45eca 100644 --- a/engine/phone_callers.asm +++ b/engine/phone_callers.asm @@ -842,7 +842,7 @@ UnknownScript_0xa0584: UnknownScript_0xa058e: farjump PhoneScript_HangupText_Male -UnknownScript_0xa0592: +Phone_CheckIfUnseenRare: scall PhoneScriptRareWildMon iffalse .HangUp farjump UnknownScript_0xa0017 diff --git a/engine/phone_gossip.asm b/engine/phone_gossip.asm index d06d096de..5b81fc284 100644 --- a/engine/phone_gossip.asm +++ b/engine/phone_gossip.asm @@ -13,57 +13,57 @@ JackTriviaScript: if_equal 10, .RainDance .Thunder: - farwritetext UnknownText_0x174261 + farwritetext JackThunderTriviaText buttonsound jump PhoneScript_HangupText_Male .Rollout: - farwritetext UnknownText_0x17429d + farwritetext JackRolloutTriviaText buttonsound jump PhoneScript_HangupText_Male .Solarbeam: - farwritetext UnknownText_0x1742ee + farwritetext JackSolarbeamTriviaText buttonsound jump PhoneScript_HangupText_Male .Stomp: - farwritetext UnknownText_0x174340 + farwritetext JackStompTriviaText buttonsound jump PhoneScript_HangupText_Male .Gust: - farwritetext UnknownText_0x174391 + farwritetext JackGustTriviaText buttonsound jump PhoneScript_HangupText_Male .Twister: - farwritetext UnknownText_0x1743e3 + farwritetext JackTwisterTriviaText buttonsound jump PhoneScript_HangupText_Male .Earthquake: - farwritetext UnknownText_0x174433 + farwritetext JackEarthquakeTriviaText buttonsound jump PhoneScript_HangupText_Male .Magnitude: - farwritetext UnknownText_0x174485 + farwritetext JackMagnitudeTriviaText buttonsound jump PhoneScript_HangupText_Male .Sandstorm: - farwritetext UnknownText_0x1744d6 + farwritetext JackSandstormTriviaText buttonsound jump PhoneScript_HangupText_Male .SunnyDay: - farwritetext UnknownText_0x174522 + farwritetext JackSunnyDayTriviaText buttonsound jump PhoneScript_HangupText_Male .RainDance: - farwritetext UnknownText_0x174571 + farwritetext JackRainDanceTriviaText buttonsound jump PhoneScript_HangupText_Male @@ -144,52 +144,52 @@ ChadOakGossip: if_equal 9, .Traveled .Blue: - farwritetext UnknownText_0x65481 + farwritetext ChadBlueGossipText buttonsound jump PhoneScript_HangupText_Male .Daisy: - farwritetext UnknownText_0x654ea + farwritetext ChadDaisyGossipText buttonsound jump PhoneScript_HangupText_Male .ProfElm: - farwritetext UnknownText_0x65555 + farwritetext ChadProfElmGossipText buttonsound jump PhoneScript_HangupText_Male .Dream: - farwritetext UnknownText_0x655c7 + farwritetext ChadDreamGossipText buttonsound jump PhoneScript_HangupText_Male .Kurt: - farwritetext UnknownText_0x65628 + farwritetext ChadKurtGossipText buttonsound jump PhoneScript_HangupText_Male .League: - farwritetext UnknownText_0x6569b + farwritetext ChadLeagueGossipText buttonsound jump PhoneScript_HangupText_Male .RadioShow: - farwritetext UnknownText_0x6574a + farwritetext ChadRadioShowGossipText buttonsound jump PhoneScript_HangupText_Male .Battling: - farwritetext UnknownText_0x65810 + farwritetext ChadBattlingGossipText buttonsound jump PhoneScript_HangupText_Male .DaisyTea: - farwritetext UnknownText_0x658c6 + farwritetext ChadDaisyTeaGossipText buttonsound jump PhoneScript_HangupText_Male .Traveled: - farwritetext UnknownText_0x65969 + farwritetext ChadTravelGossipText buttonsound jump PhoneScript_HangupText_Male @@ -281,7 +281,7 @@ IrwinRumorScript: iftrue IrwinFogBadge checkflag ENGINE_PLAINBADGE iftrue IrwinPlainBadge - farwritetext UnknownText_0x646a3 + farwritetext IrwinCalledRightAwayText buttonsound jump PhoneScript_HangupText_Male @@ -345,7 +345,7 @@ IrwinMarshBadge: buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa08f8: +JackPhoneTips: farwritetext UnknownText_0x1745c2 buttonsound jump PhoneScript_HangupText_Male @@ -511,25 +511,25 @@ UnknownScript_0xa0a00: UnknownScript_0xa0a08: checkmorn - iftrue UnknownScript_0xa0a1d + iftrue .Morning checknite - iftrue UnknownScript_0xa0a25 + iftrue .Night setevent EVENT_KENJI_ON_BREAK farwritetext UnknownText_0x66f11 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa0a1d: +.Morning: farwritetext UnknownText_0x66ed3 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa0a25: +.Night: farwritetext UnknownText_0x66f52 buttonsound jump PhoneScript_HangupText_Male -UnknownScript_0xa0a2d: +JackWantsBattle: farwritetext UnknownText_0x174638 end diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index 498f6ba4d..02cce84c5 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -301,27 +301,27 @@ ElmPhoneScript2: ; 0xbd081 JackPhoneScript1: trainertotext SCHOOLBOY, JACK1, $0 checkflag ENGINE_JACK - iftrue UnknownScript_0xbd0f3 + iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_JACK_MONDAY_MORNING - iftrue UnknownScript_0xbd0ef + iftrue .NotMonday checkcode VAR_WEEKDAY - if_not_equal MONDAY, UnknownScript_0xbd0ef + if_not_equal MONDAY, .NotMonday checkmorn - iftrue UnknownScript_0xbd12a + iftrue JackMondayMorning -UnknownScript_0xbd0ef: - farjump UnknownScript_0xa08f8 +.NotMonday: + farjump JackPhoneTips -UnknownScript_0xbd0f3: +.WantsBattle: landmarktotext NATIONAL_PARK, $2 - farjump UnknownScript_0xa0a2d + farjump JackWantsBattle JackPhoneScript2: trainertotext SCHOOLBOY, JACK1, $0 farscall PhoneScript_GreetPhone_Male farscall PhoneScript_Random2 - if_equal $0, UnknownScript_0xbd13b + if_equal $0, JackBattleTrivia checkflag ENGINE_JACK iftrue UnknownScript_0xbd11e checkflag ENGINE_JACK_MONDAY_MORNING @@ -334,7 +334,7 @@ UnknownScript_0xbd11e: if_equal $0, UnknownScript_0xbd137 farjump UnknownScript_0xa0000 -UnknownScript_0xbd12a: +JackMondayMorning: setflag ENGINE_JACK_MONDAY_MORNING UnknownScript_0xbd12d: @@ -345,7 +345,7 @@ UnknownScript_0xbd12d: UnknownScript_0xbd137: farjump UnknownScript_0xa0584 -UnknownScript_0xbd13b: +JackBattleTrivia: farjump JackTriviaScript ; Beverly @@ -1355,7 +1355,7 @@ UnknownScript_0xbd9ae: farjump PhoneScript_WantsToBattle_Female UnknownScript_0xbd9b8: - farjump UnknownScript_0xa0592 + farjump Phone_CheckIfUnseenRare UnknownScript_0xbd9bc: setflag ENGINE_DANA_HAS_THUNDERSTONE diff --git a/engine/wildmons.asm b/engine/wildmons.asm index 1f6bb4065..355655268 100755 --- a/engine/wildmons.asm +++ b/engine/wildmons.asm @@ -802,8 +802,9 @@ ValidateTempWildMonSpecies: ; 2a4a0 ret ; 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 -; Related to the phone? callba GetCallerLocation ld d, b ld e, c diff --git a/text/phone/extra.asm b/text/phone/extra.asm index 7b89b80aa..3d45b39d6 100644 --- a/text/phone/extra.asm +++ b/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!" @@ -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" diff --git a/text/phone/extra2.asm b/text/phone/extra2.asm index 01462ff20..b8e3cee7e 100644 --- a/text/phone/extra2.asm +++ b/text/phone/extra2.asm @@ -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," |