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

18
engine/phone/scripts/wade.asm
View File

@@ -1,5 +1,5 @@
WadePhoneCalleeScript:
trainertotext BUG_CATCHER, WADE1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, BUG_CATCHER, WADE1
checkflag ENGINE_WADE
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
@@ -7,7 +7,7 @@ WadePhoneCalleeScript:
iftrue .NotTuesday
checkflag ENGINE_WADE_HAS_ITEM
iftrue .HasItem
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal TUESDAY, .NotTuesday
checktime NITE
iftrue WadeTuesdayNight
@@ -17,7 +17,7 @@ WadePhoneCalleeScript:
ifequal 0, .NoContest
checkflag ENGINE_DAILY_BUG_CONTEST
iftrue .NoContest
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifequal TUESDAY, .ContestToday
ifequal THURSDAY, .ContestToday
ifequal SATURDAY, .ContestToday
@@ -29,21 +29,21 @@ WadePhoneCalleeScript:
farjump PhoneScript_BugCatchingContest
.WantsBattle:
landmarktotext ROUTE_31, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_31
farjump UnknownScript_0xa0a50
.HasItem:
landmarktotext ROUTE_31, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_31
farjump UnknownScript_0xa0ab5
WadePhoneCallerScript:
trainertotext BUG_CATCHER, WADE1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, BUG_CATCHER, WADE1
farscall PhoneScript_GreetPhone_Male
farscall PhoneScript_Random2
ifequal 0, .NoContest
checkflag ENGINE_DAILY_BUG_CONTEST
iftrue .NoContest
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifequal TUESDAY, .ContestToday
ifequal THURSDAY, .ContestToday
ifequal SATURDAY, .ContestToday
@@ -74,7 +74,7 @@ WadeTuesdayNight:
setflag ENGINE_WADE_TUESDAY_NIGHT
WadeWantsBattle2:
landmarktotext ROUTE_31, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_31
setflag ENGINE_WADE
farjump PhoneScript_WantsToBattle_Male
@@ -83,7 +83,7 @@ WadeFoundRare:
WadeHasItem2:
setflag ENGINE_WADE_HAS_ITEM
landmarktotext ROUTE_31, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_31
clearevent EVENT_WADE_HAS_BERRY
clearevent EVENT_WADE_HAS_PSNCUREBERRY
clearevent EVENT_WADE_HAS_PRZCUREBERRY