From e002b536af8423f420e13e93d6c0e59f94ee5044 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 10 Mar 2019 15:31:59 -0400 Subject: Rename more script commands for consistency and predictability Fixes #540 --- engine/phone/scripts/joey.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'engine/phone/scripts/joey.asm') diff --git a/engine/phone/scripts/joey.asm b/engine/phone/scripts/joey.asm index 0d2c6267a..f5abce673 100644 --- a/engine/phone/scripts/joey.asm +++ b/engine/phone/scripts/joey.asm @@ -1,11 +1,11 @@ JoeyPhoneCalleeScript: - trainertotext YOUNGSTER, JOEY1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, YOUNGSTER, JOEY1 checkflag ENGINE_JOEY iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_JOEY_MONDAY_AFTERNOON iftrue .NotMonday - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal MONDAY, .NotMonday checktime DAY iftrue JoeyMondayAfternoon @@ -15,11 +15,11 @@ JoeyPhoneCalleeScript: farjump UnknownScript_0xa0930 .WantsBattle: - landmarktotext ROUTE_30, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_30 farjump UnknownScript_0xa0a4b JoeyPhoneCallerScript: - trainertotext YOUNGSTER, JOEY1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, YOUNGSTER, JOEY1 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_JOEY iftrue .Generic @@ -36,6 +36,6 @@ JoeyMondayAfternoon: setflag ENGINE_JOEY_MONDAY_AFTERNOON JoeyWantsBattle: - landmarktotext ROUTE_30, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_30 setflag ENGINE_JOEY farjump PhoneScript_WantsToBattle_Male -- cgit v1.2.3