summaryrefslogtreecommitdiff
path: root/engine/phone/scripts/parry.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/phone/scripts/parry.asm')
-rw-r--r--engine/phone/scripts/parry.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/phone/scripts/parry.asm b/engine/phone/scripts/parry.asm
index 0ab95ad9f..55733b9b2 100644
--- a/engine/phone/scripts/parry.asm
+++ b/engine/phone/scripts/parry.asm
@@ -1,11 +1,11 @@
ParryPhoneCalleeScript:
- trainertotext HIKER, PARRY1, MEM_BUFFER_0
+ gettrainername STRING_BUFFER_3, HIKER, PARRY1
checkflag ENGINE_PARRY
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_PARRY_FRIDAY_AFTERNOON
iftrue .WantsRematch
- checkcode VAR_WEEKDAY
+ readvar VAR_WEEKDAY
ifnotequal FRIDAY, .WantsRematch
checktime DAY
iftrue ParryFridayDay
@@ -14,11 +14,11 @@ ParryPhoneCalleeScript:
farjump ParryBattleWithMe
.WantsBattle:
- landmarktotext ROUTE_45, MEM_BUFFER_2
+ getlandmarkname STRING_BUFFER_5, ROUTE_45
farjump ParryHaventYouGottenTo
ParryPhoneCallerScript:
- trainertotext HIKER, PARRY1, MEM_BUFFER_0
+ gettrainername STRING_BUFFER_3, HIKER, PARRY1
farscall PhoneScript_GreetPhone_Male
checkflag ENGINE_PARRY
iftrue .GenericCall
@@ -35,6 +35,6 @@ ParryFridayDay:
setflag ENGINE_PARRY_FRIDAY_AFTERNOON
ParryWantsBattle:
- landmarktotext ROUTE_45, MEM_BUFFER_2
+ getlandmarkname STRING_BUFFER_5, ROUTE_45
setflag ENGINE_PARRY
farjump PhoneScript_WantsToBattle_Male