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

8
engine/phone/scripts/parry.asm
View File

@@ -11,11 +11,11 @@ ParryPhoneCalleeScript:
iftrue ParryFridayDay
.WantsRematch:
farjump ParryBattleWithMe
farsjump ParryBattleWithMe
.WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_45
farjump ParryHaventYouGottenTo
farsjump ParryHaventYouGottenTo
ParryPhoneCallerScript:
gettrainername STRING_BUFFER_3, HIKER, PARRY1
@@ -29,7 +29,7 @@ ParryPhoneCallerScript:
ifequal 1, ParryWantsBattle
.GenericCall:
farjump Phone_GenericCall_Male
farsjump Phone_GenericCall_Male
ParryFridayDay:
setflag ENGINE_PARRY_FRIDAY_AFTERNOON
@@ -37,4 +37,4 @@ ParryFridayDay:
ParryWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_45
setflag ENGINE_PARRY
farjump PhoneScript_WantsToBattle_Male
farsjump PhoneScript_WantsToBattle_Male