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

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

@@ -13,15 +13,15 @@ DanaPhoneCalleeScript:
iftrue DanaThursdayNight
.NotThursday:
farjump UnknownScript_0xa0978
farsjump UnknownScript_0xa0978
.WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_38
farjump UnknownScript_0xa0a78
farsjump UnknownScript_0xa0a78
.HasThunderstone:
getlandmarkname STRING_BUFFER_5, ROUTE_38
farjump UnknownScript_0xa0acd
farsjump UnknownScript_0xa0acd
DanaPhoneCallerScript:
gettrainername STRING_BUFFER_3, LASS, DANA1
@@ -46,7 +46,7 @@ DanaPhoneCallerScript:
.Generic:
farscall PhoneScript_Random3
ifequal 0, DanaFoundRare
farjump Phone_GenericCall_Female
farsjump Phone_GenericCall_Female
DanaThursdayNight:
setflag ENGINE_DANA_THURSDAY_NIGHT
@@ -54,12 +54,12 @@ DanaThursdayNight:
DanaWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_38
setflag ENGINE_DANA
farjump PhoneScript_WantsToBattle_Female
farsjump PhoneScript_WantsToBattle_Female
DanaFoundRare:
farjump Phone_CheckIfUnseenRare_Female
farsjump Phone_CheckIfUnseenRare_Female
DanaHasThunderstone:
setflag ENGINE_DANA_HAS_THUNDERSTONE
getlandmarkname STRING_BUFFER_5, ROUTE_38
farjump PhoneScript_FoundItem_Female
farsjump PhoneScript_FoundItem_Female