Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename more script commands for consistency and predictability

Browse Source 
Fixes #540
This commit is contained in:
Rangi
2019-03-10 15:31:59 -04:00
parent 6393ecb7e5
commit e002b536af
157 changed files with 1494 additions and 1004 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
engine/phone/scripts/jack.asm
View File

@@ -1,11 +1,11 @@
JackPhoneCalleeScript:
trainertotext SCHOOLBOY, JACK1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, SCHOOLBOY, JACK1
checkflag ENGINE_JACK
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_JACK_MONDAY_MORNING
iftrue .NotMonday
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal MONDAY, .NotMonday
checktime MORN
iftrue JackMondayMorning
@@ -14,11 +14,11 @@ JackPhoneCalleeScript:
farjump JackPhoneTips
.WantsBattle:
landmarktotext NATIONAL_PARK, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, NATIONAL_PARK
farjump JackWantsBattleScript
JackPhoneCallerScript:
trainertotext SCHOOLBOY, JACK1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, SCHOOLBOY, JACK1
farscall PhoneScript_GreetPhone_Male
farscall PhoneScript_Random2
ifequal 0, JackBattleTrivia
@@ -38,7 +38,7 @@ JackMondayMorning:
setflag ENGINE_JACK_MONDAY_MORNING
JackWantsToBattle:
landmarktotext NATIONAL_PARK, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, NATIONAL_PARK
setflag ENGINE_JACK
farjump PhoneScript_WantsToBattle_Male