summaryrefslogtreecommitdiff
path: root/maps/Route38.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/Route38.asm
parent82c33aacb036428bf9861e7f97914c7bb675fa07 (diff)
Remove remaining legacy macros from current code.
Diffstat (limited to 'maps/Route38.asm')
-rw-r--r--maps/Route38.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/Route38.asm b/maps/Route38.asm
index fec0f4e6..4675464d 100644
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -50,7 +50,7 @@ TrainerLassDana1:
promptbutton
setevent EVENT_DANA_ASKED_FOR_PHONE_NUMBER
scall .AskNumber1F
- jump .AskForPhoneNumber
+ sjump .AskForPhoneNumber
.SecondTimeAsking:
scall .AskNumber2F
@@ -58,9 +58,9 @@ TrainerLassDana1:
askforphonenumber PHONE_LASS_DANA
ifequal PHONE_CONTACTS_FULL, .PhoneFull
ifequal PHONE_CONTACT_REFUSED, .DeclinedPhoneNumber
- trainertotext LASS, DANA1, STRING_BUFFER_3
+ gettrainername STRING_BUFFER_3, LASS, DANA1
scall .RegisteredPhoneNumber
- jump .NumberAccepted
+ sjump .NumberAccepted
.DanaRematch:
scall .Rematch
@@ -133,7 +133,7 @@ TrainerSchoolboyChad1:
promptbutton
setevent EVENT_CHAD_ASKED_FOR_PHONE_NUMBER
scall .AskPhoneNumber1
- jump .AskToRegisterNumber
+ sjump .AskToRegisterNumber
.SecondTimeAsking:
scall .AskPhoneNumber2
@@ -141,9 +141,9 @@ TrainerSchoolboyChad1:
askforphonenumber PHONE_SCHOOLBOY_CHAD
ifequal PHONE_CONTACTS_FULL, .PhoneFull
ifequal PHONE_CONTACT_REFUSED, .SaidNo
- trainertotext SCHOOLBOY, CHAD1, STRING_BUFFER_3
+ gettrainername STRING_BUFFER_3, SCHOOLBOY, CHAD1
scall .RegisteredChad
- jump .HaveChadsNumber
+ sjump .HaveChadsNumber
.ChadRematch:
scall .Rematch