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

12
maps/NationalPark.asm
View File

@@ -86,7 +86,7 @@ TrainerSchoolboyJack1:
buttonsound
setevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER
scall .AskNumber1
jump .RequestNumber
sjump .RequestNumber
.AskAgain:
scall .AskNumber2
@@ -96,7 +96,7 @@ TrainerSchoolboyJack1:
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
gettrainername STRING_BUFFER_3, SCHOOLBOY, JACK1
scall .RegisteredNumber
jump .NumberAccepted
sjump .NumberAccepted
.Rematch:
scall .RematchStd
@@ -216,7 +216,7 @@ TrainerPokefanfBeverly1:
buttonsound
setevent EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER
scall .AskNumber1
jump .RequestNumber
sjump .RequestNumber
.AskAgain:
scall .AskNumber2
@@ -226,17 +226,17 @@ TrainerPokefanfBeverly1:
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
gettrainername STRING_BUFFER_3, POKEFANF, BEVERLY1
scall .RegisteredNumber
jump .NumberAccepted
sjump .NumberAccepted
.GiveNugget:
scall .Gift
verbosegiveitem NUGGET
iffalse .NoRoom
clearflag ENGINE_BEVERLY_HAS_NUGGET
jump .NumberAccepted
sjump .NumberAccepted
.NoRoom:
jump .PackFull
sjump .PackFull
.NoMarill:
writetext UnknownText_0x5c68a