diff options
| author | entrpntr <entrpntr@gmail.com> | 2020-05-15 09:51:36 -0400 |
|---|---|---|
| committer | entrpntr <entrpntr@gmail.com> | 2020-05-15 09:57:37 -0400 |
| commit | 05b591cd95f3fd62e84b33eb56d25f197b17a96c (patch) | |
| tree | 57635b441bb8b2a208a359126c5dc9b8df7abfa6 /maps/Route36.asm | |
| parent | 82c33aacb036428bf9861e7f97914c7bb675fa07 (diff) | |
Remove remaining legacy macros from current code.
Diffstat (limited to 'maps/Route36.asm')
| -rw-r--r-- | maps/Route36.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/Route36.asm b/maps/Route36.asm index b3b8a8ef..7700c5ef 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -14,7 +14,7 @@ Route36_MapScripts: callback MAPCALLBACK_OBJECTS, .ArthurCallback .ArthurCallback: - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifequal THURSDAY, .ArthurAppears disappear ROUTE36_ARTHUR return @@ -128,7 +128,7 @@ TrainerSchoolboyAlan1: promptbutton setevent EVENT_ALAN_ASKED_FOR_PHONE_NUMBER scall .AskNumber1 - jump .ContinueAskForPhoneNumber + sjump .ContinueAskForPhoneNumber .AskAgainForPhoneNumber: scall .AskNumber2 @@ -136,9 +136,9 @@ TrainerSchoolboyAlan1: askforphonenumber PHONE_SCHOOLBOY_ALAN ifequal PHONE_CONTACTS_FULL, .PhoneFull ifequal PHONE_CONTACT_REFUSED, .NumberDeclined - trainertotext SCHOOLBOY, ALAN1, STRING_BUFFER_3 + gettrainername STRING_BUFFER_3, SCHOOLBOY, ALAN1 scall .RegisteredNumber - jump .NumberAccepted + sjump .NumberAccepted .ChooseRematch: scall .Rematch @@ -211,7 +211,7 @@ ArthurScript: opentext checkevent EVENT_GOT_HARD_STONE_FROM_ARTHUR iftrue .AlreadyGotStone - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal THURSDAY, ArthurNotThursdayScript checkevent EVENT_MET_ARTHUR_OF_THURSDAY iftrue .MetArthur |