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

14
engine/phone/scripts/tully.asm
View File

@@ -1,5 +1,5 @@
TullyPhoneCalleeScript:
trainertotext FISHER, TULLY1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, FISHER, TULLY1
checkflag ENGINE_TULLY
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
@@ -7,7 +7,7 @@ TullyPhoneCalleeScript:
iftrue .NotSunday
checkflag ENGINE_TULLY_HAS_WATER_STONE
iftrue .WaterStone
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal SUNDAY, .NotSunday
checktime NITE
iftrue TullySundayNight
@@ -16,15 +16,15 @@ TullyPhoneCalleeScript:
farjump UnknownScript_0xa0990
.WantsBattle:
landmarktotext ROUTE_42, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_42
farjump UnknownScript_0xa0a82
.WaterStone:
landmarktotext ROUTE_42, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_42
farjump UnknownScript_0xa0add
TullyPhoneCallerScript:
trainertotext FISHER, TULLY1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, FISHER, TULLY1
farscall PhoneScript_GreetPhone_Male
checkflag ENGINE_TULLY
iftrue .Generic
@@ -50,11 +50,11 @@ TullySundayNight:
setflag ENGINE_TULLY_SUNDAY_NIGHT
TullyWantsBattle:
landmarktotext ROUTE_42, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_42
setflag ENGINE_TULLY
farjump PhoneScript_WantsToBattle_Male
TullyFoundWaterStone:
setflag ENGINE_TULLY_HAS_WATER_STONE
landmarktotext ROUTE_42, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_42
farjump PhoneScript_FoundItem_Male