From e3ee39f3344107f666099448401d28b04c983cd6 Mon Sep 17 00:00:00 2001 From: surskitty Date: Wed, 13 Dec 2017 19:54:28 -0500 Subject: [PATCH] Labelling the bragging phone calls. --- engine/more_phone_scripts.asm | 46 +++++++++++++++++------------------ text/phone/extra.asm | 18 +++++++------- text/phone/extra2.asm | 16 ++++++------ 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/engine/more_phone_scripts.asm b/engine/more_phone_scripts.asm index d44f5b475..78ef910f9 100644 --- a/engine/more_phone_scripts.asm +++ b/engine/more_phone_scripts.asm @@ -1,12 +1,12 @@ UnknownScript_0xa0000: special RandomPhoneMon farscall PhoneScript_Random2 - if_equal 0, UnknownScript_0xa0013 + if_equal 0, .Bragging farscall PhoneScript_Generic_Male farjump UnknownScript_0xa003e -UnknownScript_0xa0013: - farjump UnknownScript_0xa002e +.Bragging: + farjump PhoneScript_BraggingCall UnknownScript_0xa0017: special RandomPhoneMon @@ -18,8 +18,8 @@ UnknownScript_0xa0017: UnknownScript_0xa002a: farjump UnknownScript_0xa0036 -UnknownScript_0xa002e: - farscall UnknownScript_0xa007c +PhoneScript_BraggingCall: + farscall Phone_WhosBragging farjump UnknownScript_0xa003e UnknownScript_0xa0036: @@ -54,7 +54,7 @@ UnknownScript_0xa0074: farscall UnknownScript_0xa0324 farjump PhoneScript_HangupText_Female -UnknownScript_0xa007c: +Phone_WhosBragging: checkcode VAR_CALLERID if_equal PHONE_SCHOOLBOY_JACK, .Jack if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven @@ -75,87 +75,87 @@ UnknownScript_0xa007c: if_equal PHONE_HIKER_PARRY, .Parry .Jack: - farwritetext UnknownText_0x1740c0 + farwritetext JackIntelligenceText buttonsound end .Gaven: - farwritetext UnknownText_0x174a24 + farwritetext GavenGreaterText buttonsound end .Jose: - farwritetext UnknownText_0x174f2f + farwritetext JoseAromaText buttonsound end .Joey: - farwritetext UnknownText_0x175530 + farwritetext JoeySharperText buttonsound end .Wade: - farwritetext UnknownText_0x1757d4 + farwritetext WadeAreYouGrowingText buttonsound end .Ralph: - farwritetext UnknownText_0x175bc4 + farwritetext RalphNeglectingKidsText buttonsound end .Anthony: - farwritetext UnknownText_0x176a2f + farwritetext AnthonyAteBerriesText buttonsound end .Todd: - farwritetext UnknownText_0x176e5d + farwritetext ToddLooksCuteLikeMeText buttonsound end .Arnie: - farwritetext UnknownText_0x649dc + farwritetext ArnieLovesTheCuteText buttonsound end .Alan: - farwritetext UnknownText_0x64cbd + farwritetext AlanGettingStrongerText buttonsound end .Chad: - farwritetext UnknownText_0x65271 + farwritetext ChadObservingWildText buttonsound end .Derek: - farwritetext UnknownText_0x65ab2 + farwritetext DerekCheekPincherText buttonsound end .Tully: - farwritetext UnknownText_0x65de4 + farwritetext TullyGrownText buttonsound end .Brent: - farwritetext UnknownText_0x660be + farwritetext BrentRareTradeText buttonsound end .Vance: - farwritetext UnknownText_0x66980 + farwritetext VanceLiftoffText buttonsound end .Wilton: - farwritetext UnknownText_0x66afc + farwritetext WiltonGrownText buttonsound end .Parry: - farwritetext UnknownText_0x66f9f + farwritetext ParryNoMatchText buttonsound end diff --git a/text/phone/extra.asm b/text/phone/extra.asm index 7953bee78..f42272eec 100644 --- a/text/phone/extra.asm +++ b/text/phone/extra.asm @@ -307,7 +307,7 @@ UnknownText_0x648dc: ; 0x648dc done ; 0x649dc -UnknownText_0x649dc: ; 0x649dc +ArnieLovesTheCuteText: ; 0x649dc text "I'm always with my" line "@" text_from_ram StringBuffer4 @@ -423,7 +423,7 @@ UnknownText_0x64c5a: ; 0x64c5a done ; 0x64cbd -UnknownText_0x64cbd: ; 0x64cbd +AlanGettingStrongerText: ; 0x64cbd text "My @" text_from_ram StringBuffer4 text "'s" @@ -651,7 +651,7 @@ UnknownText_0x6520f: ; 0x6520f done ; 0x65271 -UnknownText_0x65271: ; 0x65271 +ChadObservingWildText: ; 0x65271 text "I recently began" line "observing wild" cont "@" @@ -914,7 +914,7 @@ UnknownText_0x65a63: ; 0x65a63 done ; 0x65ab2 -UnknownText_0x65ab2: ; 0x65ab2 +DerekCheekPincherText: ; 0x65ab2 text "Listen to this." line "My @" text_from_ram StringBuffer4 @@ -1028,7 +1028,7 @@ UnknownText_0x65da6: ; 0x65da6 done ; 0x65de4 -UnknownText_0x65de4: ; 0x65de4 +TullyGrownText: ; 0x65de4 text "My @" text_from_ram StringBuffer4 text " has" @@ -1142,7 +1142,7 @@ UnknownText_0x66087: ; 0x66087 done ; 0x660be -UnknownText_0x660be: ; 0x660be +BrentRareTradeText: ; 0x660be text "Oh yeah, I got an" line "extremely rare" @@ -1471,7 +1471,7 @@ UnknownText_0x6691d: ; 0x6691d done ; 0x66980 -UnknownText_0x66980: ; 0x66980 +VanceLiftoffText: ; 0x66980 text "My @" text_from_ram StringBuffer4 text "'s" @@ -1543,7 +1543,7 @@ UnknownText_0x66ad1: ; 0x66ad1 done ; 0x66afc -UnknownText_0x66afc: ; 0x66afc +WiltonGrownText: ; 0x66afc text "My @" text_from_ram StringBuffer4 text "'s" @@ -1727,7 +1727,7 @@ UnknownText_0x66f52: ; 0x66f52 done ; 0x66f9f -UnknownText_0x66f9f: ; 0x66f9f +ParryNoMatchText: ; 0x66f9f text "Nothing can match" line "my @" text_from_ram StringBuffer4 diff --git a/text/phone/extra2.asm b/text/phone/extra2.asm index 443338465..69fd554ae 100644 --- a/text/phone/extra2.asm +++ b/text/phone/extra2.asm @@ -19,7 +19,7 @@ UnknownText_0x174000: ; 0x174000 done ; 0x1740c0 -UnknownText_0x1740c0: ; 0x1740c0 +JackIntelligenceText: ; 0x1740c0 text "My @" text_from_ram StringBuffer4 text "'s" @@ -369,7 +369,7 @@ UnknownText_0x1749c7: ; 0x1749c7 done ; 0x174a24 -UnknownText_0x174a24: ; 0x174a24 +GavenGreaterText: ; 0x174a24 text "My @" text_from_ram StringBuffer4 text "" @@ -568,7 +568,7 @@ UnknownText_0x174ee2: ; 0x174ee2 done ; 0x174f2f -UnknownText_0x174f2f: ; 0x174f2f +JoseAromaText: ; 0x174f2f text "Hey listen, my" line "@" text_from_ram StringBuffer4 @@ -804,7 +804,7 @@ UnknownText_0x1754e5: ; 0x1754e5 done ; 0x175530 -UnknownText_0x175530: ; 0x175530 +JoeySharperText: ; 0x175530 text "My @" text_from_ram StringBuffer4 text "'s" @@ -903,7 +903,7 @@ UnknownText_0x175786: ; 0x175786 done ; 0x1757d4 -UnknownText_0x1757d4: ; 0x1757d4 +WadeAreYouGrowingText: ; 0x1757d4 text "Are your #MON" line "growing?" @@ -1050,7 +1050,7 @@ UnknownText_0x175b6d: ; 0x175b6d done ; 0x175bc4 -UnknownText_0x175bc4: ; 0x175bc4 +RalphNeglectingKidsText: ; 0x175bc4 text "I've been spending" line "more time with my" @@ -1520,7 +1520,7 @@ UnknownText_0x1769da: ; 0x1769da done ; 0x176a2f -UnknownText_0x176a2f: ; 0x176a2f +AnthonyAteBerriesText: ; 0x176a2f text "The other day, I" line "was watching my" @@ -1669,7 +1669,7 @@ UnknownText_0x176dd1: ; 0x176dd1 done ; 0x176e5d -UnknownText_0x176e5d: ; 0x176e5d +ToddLooksCuteLikeMeText: ; 0x176e5d text "My @" text_from_ram StringBuffer4 text " is"