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/erin.asm
View File

@@ -11,11 +11,11 @@ ErinPhoneCalleeScript:
iftrue ErinSaturdayNight
.NotSaturday:
farjump ErinWorkingHardScript
farsjump ErinWorkingHardScript
.WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_46
farjump ErinComeBattleScript
farsjump ErinComeBattleScript
ErinPhoneCallerScript:
gettrainername STRING_BUFFER_3, PICNICKER, ERIN1
@@ -29,7 +29,7 @@ ErinPhoneCallerScript:
ifequal 1, ErinWantsBattle
.GenericCall:
farjump Phone_GenericCall_Female
farsjump Phone_GenericCall_Female
ErinSaturdayNight:
setflag ENGINE_ERIN_SATURDAY_NIGHT
@@ -37,4 +37,4 @@ ErinSaturdayNight:
ErinWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_46
setflag ENGINE_ERIN
farjump PhoneScript_WantsToBattle_Female
farsjump PhoneScript_WantsToBattle_Female