From e1413e022d425af1915c8a8c3c29b689ec66ef60 Mon Sep 17 00:00:00 2001 From: surskitty Date: Thu, 14 Dec 2017 14:13:10 -0500 Subject: [PATCH] phone_callers.asm is now fully readable, if not fully labelled. --- engine/phone_callers.asm | 72 ++++++++++++++++++++-------------------- engine/phone_scripts.asm | 16 ++++----- text/phone/extra2.asm | 2 +- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/engine/phone_callers.asm b/engine/phone_callers.asm index 58058a418..cd5799d9b 100644 --- a/engine/phone_callers.asm +++ b/engine/phone_callers.asm @@ -3,58 +3,58 @@ UnknownScript_0xa0000: farscall PhoneScript_Random2 if_equal 0, .Bragging farscall PhoneScript_Generic_Male - farjump UnknownScript_0xa003e + farjump Phone_FoundAMon_Male .Bragging: - farjump PhoneScript_BraggingCall + farjump Phone_BraggingCall_Male UnknownScript_0xa0017: special RandomPhoneMon farscall PhoneScript_Random2 - if_equal 0, UnknownScript_0xa002a + if_equal 0, .Bragging farscall PhoneScript_Generic_Female - farjump UnknownScript_0xa0055 + farjump Phone_FoundAMon_Female -UnknownScript_0xa002a: - farjump UnknownScript_0xa0036 +.Bragging: + farjump Phone_BraggingCall_Female -PhoneScript_BraggingCall: - farscall Phone_WhosBragging - farjump UnknownScript_0xa003e +Phone_BraggingCall_Male: + farscall Phone_WhosBragging_Male + farjump Phone_FoundAMon_Male -UnknownScript_0xa0036: - farscall UnknownScript_0xa0128 - farjump UnknownScript_0xa0055 +Phone_BraggingCall_Female: + farscall Phone_WhosBragging_Female + farjump Phone_FoundAMon_Female -UnknownScript_0xa003e: +Phone_FoundAMon_Male: special RandomPhoneWildMon farscall PhoneScript_Random2 - if_equal 0, UnknownScript_0xa0051 - farscall UnknownScript_0xa017a + if_equal 0, .GotAway + farscall Phone_WhoDefeatedMon_Male farjump PhoneScript_HangupText_Male -UnknownScript_0xa0051: - farjump UnknownScript_0xa006c +.GotAway: + farjump Phone_GotAwayCall_Male -UnknownScript_0xa0055: +Phone_FoundAMon_Female: special RandomPhoneWildMon farscall PhoneScript_Random2 - if_equal 0, UnknownScript_0xa0068 - farscall UnknownScript_0xa0226 + if_equal 0, .GotAway + farscall Phone_WhoDefeatedMon_Female farjump PhoneScript_HangupText_Female -UnknownScript_0xa0068: - farjump UnknownScript_0xa0074 +.GotAway: + farjump Phone_GotAwayCall_Female -UnknownScript_0xa006c: - farscall UnknownScript_0xa0278 +Phone_GotAwayCall_Male: + farscall Phone_WhoLostAMon_Male farjump PhoneScript_HangupText_Male -UnknownScript_0xa0074: - farscall UnknownScript_0xa0324 +Phone_GotAwayCall_Female: + farscall Phone_WhoLostAMon_Female farjump PhoneScript_HangupText_Female -Phone_WhosBragging: +Phone_WhosBragging_Male: checkcode VAR_CALLERID if_equal PHONE_SCHOOLBOY_JACK, .Jack if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven @@ -159,7 +159,7 @@ Phone_WhosBragging: buttonsound end -UnknownScript_0xa0128: +Phone_WhosBragging_Female: checkcode VAR_CALLERID if_equal PHONE_POKEFAN_BEVERLY, .Beverly if_equal PHONE_COOLTRAINERF_BETH, .Beth @@ -210,7 +210,7 @@ UnknownScript_0xa0128: buttonsound end -UnknownScript_0xa017a: +Phone_WhoDefeatedMon_Male: checkcode VAR_CALLERID if_equal PHONE_SCHOOLBOY_JACK, .Jack if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven @@ -231,7 +231,7 @@ UnknownScript_0xa017a: if_equal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x174106 + farwritetext JackDefeatedMonText buttonsound end @@ -315,7 +315,7 @@ UnknownScript_0xa017a: buttonsound end -UnknownScript_0xa0226: +Phone_WhoDefeatedMon_Female: checkcode VAR_CALLERID if_equal PHONE_POKEFAN_BEVERLY, .Beverly if_equal PHONE_COOLTRAINERF_BETH, .Beth @@ -366,7 +366,7 @@ UnknownScript_0xa0226: buttonsound end -UnknownScript_0xa0278: +Phone_WhoLostAMon_Male: checkcode VAR_CALLERID if_equal PHONE_SCHOOLBOY_JACK, .Jack if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven @@ -471,7 +471,7 @@ UnknownScript_0xa0278: buttonsound end -UnknownScript_0xa0324: +Phone_WhoLostAMon_Female: checkcode VAR_CALLERID if_equal PHONE_POKEFAN_BEVERLY, .Beverly if_equal PHONE_COOLTRAINERF_BETH, .Beth @@ -834,15 +834,15 @@ PhoneScript_HangupText_Female: farwritetext UnknownText_0x67281 end -UnknownScript_0xa0584: +Phone_CheckIfUnseenRare_Male: scall PhoneScriptRareWildMon - iffalse UnknownScript_0xa058e + iffalse .HangUp farjump UnknownScript_0xa0000 UnknownScript_0xa058e: farjump PhoneScript_HangupText_Male -Phone_CheckIfUnseenRare: +Phone_CheckIfUnseenRare_Female: scall PhoneScriptRareWildMon iffalse .HangUp farjump UnknownScript_0xa0017 diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index 02cce84c5..6ce9f1cf1 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -343,7 +343,7 @@ UnknownScript_0xbd12d: farjump PhoneScript_WantsToBattle_Male UnknownScript_0xbd137: - farjump UnknownScript_0xa0584 + farjump Phone_CheckIfUnseenRare_Male JackBattleTrivia: farjump JackTriviaScript @@ -466,7 +466,7 @@ GavenWantsRematch: farjump PhoneScript_WantsToBattle_Male UnknownScript_0xbd239: - farjump UnknownScript_0xa0584 + farjump Phone_CheckIfUnseenRare_Male ; Beth @@ -565,7 +565,7 @@ UnknownScript_0xbd304: farjump PhoneScript_WantsToBattle_Male UnknownScript_0xbd30e: - farjump UnknownScript_0xa0584 + farjump Phone_CheckIfUnseenRare_Male UnknownScript_0xbd312: setflag ENGINE_JOSE_HAS_STAR_PIECE @@ -741,7 +741,7 @@ UnknownScript_0xbd487: farjump PhoneScript_WantsToBattle_Male UnknownScript_0xbd491: - farjump UnknownScript_0xa0584 + farjump Phone_CheckIfUnseenRare_Male UnknownScript_0xbd495: setflag ENGINE_WADE_HAS_ITEM @@ -1061,7 +1061,7 @@ UnknownScript_0xbd72e: farjump PhoneScript_WantsToBattle_Male UnknownScript_0xbd738: - farjump UnknownScript_0xa0584 + farjump Phone_CheckIfUnseenRare_Male UnknownScript_0xbd73c: setflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON @@ -1226,7 +1226,7 @@ ArnieYanmaSwarm: ; start swarm farjump UnknownScript_0xa05ce UnknownScript_0xbd89e: - farjump UnknownScript_0xa0584 + farjump Phone_CheckIfUnseenRare_Male ArnieYanmaAlreadySwarming: farjump UnknownScript_0xa0000 @@ -1355,7 +1355,7 @@ UnknownScript_0xbd9ae: farjump PhoneScript_WantsToBattle_Female UnknownScript_0xbd9b8: - farjump Phone_CheckIfUnseenRare + farjump Phone_CheckIfUnseenRare_Female UnknownScript_0xbd9bc: setflag ENGINE_DANA_HAS_THUNDERSTONE @@ -1409,7 +1409,7 @@ UnknownScript_0xbda23: farjump PhoneScript_WantsToBattle_Male UnknownScript_0xbda2d: - farjump UnknownScript_0xa0584 + farjump Phone_CheckIfUnseenRare_Male UnknownScript_0xbda31: farjump ChadOakGossip diff --git a/text/phone/extra2.asm b/text/phone/extra2.asm index b8e3cee7e..fb4adf055 100644 --- a/text/phone/extra2.asm +++ b/text/phone/extra2.asm @@ -31,7 +31,7 @@ JackIntelligenceText: ; 0x1740c0 done ; 0x174106 -UnknownText_0x174106: ; 0x174106 +JackDefeatedMonText: ; 0x174106 text "The other day, I" line "easily defeated a" cont "@"