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

Rename some call/jump script commands to avoid confusion with jr/jp asm instructions

Browse Source 
Fixes #580
This commit is contained in:
Rangi
2019-03-10 16:39:31 -04:00
parent e002b536af
commit f5c9958aea
164 changed files with 840 additions and 832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,18 +23,18 @@ WadePhoneCalleeScript:
ifequal SATURDAY, .ContestToday
.NoContest:
farjump UnknownScript_0xa0938
farsjump UnknownScript_0xa0938
.ContestToday:
farjump PhoneScript_BugCatchingContest
farsjump PhoneScript_BugCatchingContest
.WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_31
farjump UnknownScript_0xa0a50
farsjump UnknownScript_0xa0a50
.HasItem:
getlandmarkname STRING_BUFFER_5, ROUTE_31
farjump UnknownScript_0xa0ab5
farsjump UnknownScript_0xa0ab5
WadePhoneCallerScript:
gettrainername STRING_BUFFER_3, BUG_CATCHER, WADE1
@@ -65,10 +65,10 @@ WadePhoneCallerScript:
.next:
farscall PhoneScript_Random3
ifequal 0, WadeFoundRare
farjump Phone_GenericCall_Male
farsjump Phone_GenericCall_Male
.ContestToday:
farjump PhoneScript_BugCatchingContest
farsjump PhoneScript_BugCatchingContest
WadeTuesdayNight:
setflag ENGINE_WADE_TUESDAY_NIGHT
@@ -76,10 +76,10 @@ WadeTuesdayNight:
WadeWantsBattle2:
getlandmarkname STRING_BUFFER_5, ROUTE_31
setflag ENGINE_WADE
farjump PhoneScript_WantsToBattle_Male
farsjump PhoneScript_WantsToBattle_Male
WadeFoundRare:
farjump Phone_CheckIfUnseenRare_Male
farsjump Phone_CheckIfUnseenRare_Male
WadeHasItem2:
setflag ENGINE_WADE_HAS_ITEM
@@ -96,18 +96,18 @@ WadeHasItem2:
.Berry:
setevent EVENT_WADE_HAS_BERRY
jump .FoundBerry
sjump .FoundBerry
.PsnCureBerry:
setevent EVENT_WADE_HAS_PSNCUREBERRY
jump .FoundBerry
sjump .FoundBerry
.PrzCureBerry:
setevent EVENT_WADE_HAS_PRZCUREBERRY
jump .FoundBerry
sjump .FoundBerry
.Bitterberry:
setevent EVENT_WADE_HAS_BITTER_BERRY
.FoundBerry:
farjump PhoneScript_FoundItem_Male
farsjump PhoneScript_FoundItem_Male