summaryrefslogtreecommitdiff
path: root/engine/phone/scripts/derek.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/phone/scripts/derek.asm')
-rw-r--r--engine/phone/scripts/derek.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/phone/scripts/derek.asm b/engine/phone/scripts/derek.asm
index 95ff8bb76..4f3f5d94e 100644
--- a/engine/phone/scripts/derek.asm
+++ b/engine/phone/scripts/derek.asm
@@ -1,5 +1,5 @@
DerekPhoneCalleeScript:
- trainertotext POKEFANM, DEREK1, MEM_BUFFER_0
+ gettrainername STRING_BUFFER_3, POKEFANM, DEREK1
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_DEREK_HAS_NUGGET
iftrue .Nugget
@@ -7,7 +7,7 @@ DerekPhoneCalleeScript:
ifequal 0, .NoContest
checkflag ENGINE_DAILY_BUG_CONTEST
iftrue .NoContest
- checkcode VAR_WEEKDAY
+ readvar VAR_WEEKDAY
ifequal TUESDAY, .ContestToday
ifequal THURSDAY, .ContestToday
ifequal SATURDAY, .ContestToday
@@ -19,17 +19,17 @@ DerekPhoneCalleeScript:
farjump PhoneScript_BugCatchingContest
.Nugget:
- landmarktotext ROUTE_39, MEM_BUFFER_2
+ getlandmarkname STRING_BUFFER_5, ROUTE_39
farjump UnknownScript_0xa0ad5
DerekPhoneCallerScript:
- trainertotext POKEFANM, DEREK1, MEM_BUFFER_0
+ gettrainername STRING_BUFFER_3, POKEFANM, DEREK1
farscall PhoneScript_GreetPhone_Male
farscall PhoneScript_Random2
ifequal 0, .NoContest
checkflag ENGINE_DAILY_BUG_CONTEST
iftrue .NoContest
- checkcode VAR_WEEKDAY
+ readvar VAR_WEEKDAY
ifequal TUESDAY, .ContestToday
ifequal THURSDAY, .ContestToday
ifequal SATURDAY, .ContestToday
@@ -44,5 +44,5 @@ DerekPhoneCallerScript:
.Nugget:
setflag ENGINE_DEREK_HAS_NUGGET
- landmarktotext ROUTE_39, MEM_BUFFER_2
+ getlandmarkname STRING_BUFFER_5, ROUTE_39
farjump PhoneScript_FoundItem_Male