pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues 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
maps/Route31.asm
View File

@@ -41,7 +41,7 @@ TrainerBugCatcherWade1:
waitbutton
setevent EVENT_WADE_ASKED_FOR_PHONE_NUMBER
scall .AskPhoneNumberSTD
jump .Continue
sjump .Continue
.AskAgain:
scall .AskAgainSTD
@@ -51,7 +51,7 @@ TrainerBugCatcherWade1:
ifequal PHONE_CONTACT_REFUSED, .DeclinedNumberSTD
gettrainername STRING_BUFFER_3, BUG_CATCHER, WADE1
scall .RegisterNumberSTD
jump .AcceptedNumberSTD
sjump .AcceptedNumberSTD
.WadeRematch:
scall .RematchSTD
@@ -126,23 +126,23 @@ TrainerBugCatcherWade1:
.Berry:
verbosegiveitem BERRY
iffalse .PackFull
jump .Done
sjump .Done
.Psncureberry:
verbosegiveitem PSNCUREBERRY
iffalse .PackFull
jump .Done
sjump .Done
.Przcureberry:
verbosegiveitem PRZCUREBERRY
iffalse .PackFull
jump .Done
sjump .Done
.BitterBerry:
verbosegiveitem BITTER_BERRY
iffalse .PackFull
.Done:
clearflag ENGINE_WADE_HAS_ITEM
jump .AcceptedNumberSTD
sjump .AcceptedNumberSTD
.PackFull:
jump .PackFullSTD
sjump .PackFullSTD
.AskPhoneNumberSTD:
jumpstd asknumber1m