diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-24 11:17:05 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-24 11:17:05 -0500 |
| commit | d719d318e8b2de51e818485423ac878d20dd295a (patch) | |
| tree | d351a653914ee5dab13947b21a16552719c2a8c9 /engine/phone | |
| parent | 132fe4692581891802c38420bdd4744d58bf78d5 (diff) | |
Remove Special_ prefix from special routines (close #478)
Diffstat (limited to 'engine/phone')
| -rw-r--r-- | engine/phone/generic_calls.asm | 2 | ||||
| -rw-r--r-- | engine/phone/phone_callers.asm | 10 | ||||
| -rw-r--r-- | engine/phone/phone_scripts.asm | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/engine/phone/generic_calls.asm b/engine/phone/generic_calls.asm index 937fc67c0..e1b53a950 100644 --- a/engine/phone/generic_calls.asm +++ b/engine/phone/generic_calls.asm @@ -1240,7 +1240,7 @@ PhoneScript_Generic_Female: end PhoneScript_MonFlavorText: - special Special_RandomPhoneMon + special RandomPhoneMon farscall PhoneScript_Random2 if_equal $0, .TooEnergetic farwritetext UnknownText_0x1b518b diff --git a/engine/phone/phone_callers.asm b/engine/phone/phone_callers.asm index cb333ae8d..c90448d33 100644 --- a/engine/phone/phone_callers.asm +++ b/engine/phone/phone_callers.asm @@ -1,5 +1,5 @@ Phone_GenericCall_Male: - special Special_RandomPhoneMon + special RandomPhoneMon farscall PhoneScript_Random2 if_equal 0, .Bragging farscall PhoneScript_Generic_Male @@ -9,7 +9,7 @@ Phone_GenericCall_Male: farjump Phone_BraggingCall_Male Phone_GenericCall_Female: - special Special_RandomPhoneMon + special RandomPhoneMon farscall PhoneScript_Random2 if_equal 0, .Bragging farscall PhoneScript_Generic_Female @@ -27,7 +27,7 @@ Phone_BraggingCall_Female: farjump Phone_FoundAMon_Female Phone_FoundAMon_Male: - special Special_RandomPhoneWildMon + special RandomPhoneWildMon farscall PhoneScript_Random2 if_equal 0, .GotAway farscall Phone_WhoDefeatedMon_Male @@ -37,7 +37,7 @@ Phone_FoundAMon_Male: farjump Phone_GotAwayCall_Male Phone_FoundAMon_Female: - special Special_RandomPhoneWildMon + special RandomPhoneWildMon farscall PhoneScript_Random2 if_equal 0, .GotAway farscall Phone_WhoDefeatedMon_Female @@ -851,7 +851,7 @@ Phone_CheckIfUnseenRare_Female: farjump PhoneScript_HangupText_Female PhoneScriptRareWildMon: - special Special_RandomUnseenWildMon + special RandomUnseenWildMon end PhoneScript_BugCatchingContest: diff --git a/engine/phone/phone_scripts.asm b/engine/phone/phone_scripts.asm index cc72cf189..3cbd60f51 100644 --- a/engine/phone/phone_scripts.asm +++ b/engine/phone/phone_scripts.asm @@ -392,7 +392,7 @@ HueyPhoneScript1: iftrue HueyWednesdayNight .NotWednesday: - special Special_RandomPhoneMon + special RandomPhoneMon farjump UnknownScript_0xa0908 .WantsBattle: @@ -629,7 +629,7 @@ JoeyPhoneScript1: iftrue JoeyMondayAfternoon .NotMonday: - special Special_RandomPhoneMon + special RandomPhoneMon farjump UnknownScript_0xa0930 .WantsBattle: @@ -830,7 +830,7 @@ Ralph_SetUpSwarm: pokenamemem QWILFISH, MEM_BUFFER_1 landmarktotext ROUTE_32, MEM_BUFFER_2 writebyte FISHSWARM_QWILFISH - special Special_ActivateFishingSwarm + special ActivateFishingSwarm farjump UnknownScript_0xa05d6 .Generic: @@ -851,7 +851,7 @@ LizPhoneScript1: iftrue LizThursdayAfternoon .NotThursday: - special Special_RandomPhoneMon + special RandomPhoneMon farjump UnknownScript_0xa0948 .WantsBattle: |