summaryrefslogtreecommitdiff
path: root/data/scripts/maps/FortreeCity.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/maps/FortreeCity.inc')
-rw-r--r--data/scripts/maps/FortreeCity.inc24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc
index 7f9d5ae12..6ea89dcb7 100644
--- a/data/scripts/maps/FortreeCity.inc
+++ b/data/scripts/maps/FortreeCity.inc
@@ -19,7 +19,7 @@ FortreeCity_EventScript_14C95E:: @ 814C95E
lock
faceplayer
checkflag 295
- jumpeq FortreeCity_EventScript_14C973
+ goto_if_eq FortreeCity_EventScript_14C973
msgbox FortreeCity_Text_1675C2, 4
release
end
@@ -58,7 +58,7 @@ FortreeCity_EventScript_14C9B3:: @ 814C9B3
faceplayer
checkitem ITEM_DEVON_SCOPE, 1
compare RESULT, 1
- jumpeq FortreeCity_EventScript_14C9CF
+ goto_if_eq FortreeCity_EventScript_14C9CF
msgbox FortreeCity_Text_167868, 4
release
end
@@ -66,22 +66,22 @@ FortreeCity_EventScript_14C9B3:: @ 814C9B3
FortreeCity_EventScript_14C9CF:: @ 814C9CF
msgbox FortreeCity_Text_16788B, 5
compare RESULT, 1
- jumpeq FortreeCity_EventScript_14C9E4
+ goto_if_eq FortreeCity_EventScript_14C9E4
release
end
FortreeCity_EventScript_14C9E4:: @ 814C9E4
msgbox FortreeCity_Text_1678CB, 4
- closebutton
- move LAST_TALKED, FortreeCity_Movement_1A0662
- waitmove 0
- checksound
- pokecry SPECIES_KECLEON, 2
- pause 40
+ closemessage
+ applymovement LAST_TALKED, FortreeCity_Movement_1A0662
+ waitmovement 0
+ waitse
+ playpokecry SPECIES_KECLEON, 2
+ delay 40
waitpokecry
- move LAST_TALKED, FortreeCity_Movement_14CA13
- waitmove 0
- disappear LAST_TALKED
+ applymovement LAST_TALKED, FortreeCity_Movement_14CA13
+ waitmovement 0
+ removeobject LAST_TALKED
setflag 295
release
end