#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
This commit is contained in:
mid-kid
2019-10-20 22:24:17 +00:00
committed by Rangi
parent 3fc2ba41f7
commit e3e0bcd653
203 changed files with 4077 additions and 4598 deletions

View File

@@ -18,7 +18,7 @@ ElmPhoneCalleeScript:
iftrue .stolen
checkevent EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON
iftrue .sawmrpokemon
farwritetext ElmPhoneStartText
farwritetext ElmPhoneHealYourMonText
end
.sawmrpokemon
@@ -30,7 +30,7 @@ ElmPhoneCalleeScript:
end
.checkingegg
farwritetext ElmPhoneCheckingEggText
farwritetext ElmPhoneCheckingTheEggText
end
.assistant
@@ -38,7 +38,7 @@ ElmPhoneCalleeScript:
end
.eggunhatched
farwritetext ElmPhoneEggUnhatchedText
farwritetext ElmPhoneHowIsTheEggText
end
.egghatched
@@ -49,15 +49,15 @@ ElmPhoneCalleeScript:
.discovery
random 2
ifequal 0, .nextdiscovery
farwritetext ElmPhoneDiscovery1Text
farwritetext ElmPhoneDiscoveredHatchTimeText
end
.nextdiscovery
farwritetext ElmPhoneDiscovery2Text
farwritetext ElmPhoneInvestigatingEggMovesText
end
.pokerus
farwritetext ElmPhonePokerusText
farwritetext ElmPhoneDiscoveredPokerusText
specialphonecall SPECIALCALL_NONE
end
@@ -68,7 +68,7 @@ ElmPhoneCallerScript:
ifequal SPECIALCALL_WEIRDBROADCAST, .rocket
ifequal SPECIALCALL_SSTICKET, .gift
ifequal SPECIALCALL_MASTERBALL, .gift
farwritetext ElmPhonePokerusText
farwritetext ElmPhoneDiscoveredPokerusText
specialphonecall SPECIALCALL_NONE
end
@@ -86,7 +86,7 @@ ElmPhoneCallerScript:
end
.rocket
farwritetext ElmPhoneRocketText
farwritetext ElmPhoneRadioTowerRocketTakeoverText
specialphonecall SPECIALCALL_NONE
end
@@ -96,6 +96,6 @@ ElmPhoneCallerScript:
end
.unused
farwritetext ElmPhoneUnusedText
farwritetext ElmPhoneGotAholdOfSomethingNeatText
specialphonecall SPECIALCALL_NONE
end