diff options
Diffstat (limited to 'engine')
| -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 |
4 files changed, 43 insertions, 42 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 |