summaryrefslogtreecommitdiff
path: root/maps/Route43.asm
diff options
context:
space:
mode:
authorentrpntr <entrpntr@gmail.com>2020-05-15 09:51:36 -0400
committerentrpntr <entrpntr@gmail.com>2020-05-15 09:57:37 -0400
commit05b591cd95f3fd62e84b33eb56d25f197b17a96c (patch)
tree57635b441bb8b2a208a359126c5dc9b8df7abfa6 /maps/Route43.asm
parent82c33aacb036428bf9861e7f97914c7bb675fa07 (diff)
Remove remaining legacy macros from current code.
Diffstat (limited to 'maps/Route43.asm')
-rw-r--r--maps/Route43.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/Route43.asm b/maps/Route43.asm
index bfce5669..c237679e 100644
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -62,7 +62,7 @@ TrainerPokemaniacBrent:
promptbutton
setevent EVENT_BRENT_ASKED_FOR_PHONE_NUMBER
scall .AskNumber1
- jump .AskForNumber
+ sjump .AskForNumber
.AskedAlready:
scall .AskNumber2
@@ -70,9 +70,9 @@ TrainerPokemaniacBrent:
askforphonenumber PHONE_POKEMANIAC_BRENT
ifequal PHONE_CONTACTS_FULL, .PhoneFull
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
- trainertotext POKEMANIAC, BRENT1, STRING_BUFFER_3
+ gettrainername STRING_BUFFER_3, POKEMANIAC, BRENT1
scall .RegisteredNumber
- jump .NumberAccepted
+ sjump .NumberAccepted
.WantsBattle:
scall .Rematch
@@ -167,7 +167,7 @@ TrainerPicnickerTiffany:
promptbutton
setevent EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER
scall .AskNumber1
- jump .AskForNumber
+ sjump .AskForNumber
.AskedAlready:
scall .AskNumber2
@@ -175,9 +175,9 @@ TrainerPicnickerTiffany:
askforphonenumber PHONE_PICNICKER_TIFFANY
ifequal PHONE_CONTACTS_FULL, .PhoneFull
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
- trainertotext PICNICKER, TIFFANY3, STRING_BUFFER_3
+ gettrainername STRING_BUFFER_3, PICNICKER, TIFFANY3
scall .RegisteredNumber
- jump .NumberAccepted
+ sjump .NumberAccepted
.WantsBattle:
scall .Rematch