diff options
author | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-03-10 16:39:31 -0400 |
---|---|---|
committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-03-10 16:39:31 -0400 |
commit | f5c9958aeaefde7f189402911f8ee1c54e6a2439 (patch) | |
tree | 2023784b811d49267fa9b1ac1f4e9d82c93c3d3d /maps/Route43.asm | |
parent | e002b536af8423f420e13e93d6c0e59f94ee5044 (diff) |
Rename some call/jump script commands to avoid confusion with jr/jp asm instructions
Fixes #580
Diffstat (limited to 'maps/Route43.asm')
-rw-r--r-- | maps/Route43.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/Route43.asm b/maps/Route43.asm index bffbcffde..c1593aaa8 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -63,7 +63,7 @@ TrainerPokemaniacBrent: buttonsound setevent EVENT_BRENT_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 - jump .AskForNumber + sjump .AskForNumber .AskedAlready: scall .AskNumber2 @@ -73,7 +73,7 @@ TrainerPokemaniacBrent: ifequal PHONE_CONTACT_REFUSED, .NumberDeclined gettrainername STRING_BUFFER_3, POKEMANIAC, BRENT1 scall .RegisteredNumber - jump .NumberAccepted + sjump .NumberAccepted .WantsBattle: scall .Rematch @@ -194,7 +194,7 @@ TrainerPicnickerTiffany: buttonsound setevent EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 - jump .AskForNumber + sjump .AskForNumber .AskedAlready: scall .AskNumber2 @@ -204,7 +204,7 @@ TrainerPicnickerTiffany: ifequal PHONE_CONTACT_REFUSED, .NumberDeclined gettrainername STRING_BUFFER_3, PICNICKER, TIFFANY3 scall .RegisteredNumber - jump .NumberAccepted + sjump .NumberAccepted .WantsBattle: scall .Rematch @@ -260,10 +260,10 @@ TrainerPicnickerTiffany: iffalse .NoRoom clearflag ENGINE_TIFFANY_HAS_PINK_BOW setevent EVENT_TIFFANY_GAVE_PINK_BOW - jump .NumberAccepted + sjump .NumberAccepted .NoRoom: - jump .PackFull + sjump .PackFull .NoClefairy: writetext PicnickerTiffanyClefairyText |