summaryrefslogtreecommitdiff
path: root/data/scripts/maps/FortreeCity_House4.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/maps/FortreeCity_House4.inc')
-rw-r--r--data/scripts/maps/FortreeCity_House4.inc30
1 files changed, 15 insertions, 15 deletions
diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc
index 33d0ed1ae..fdd30022f 100644
--- a/data/scripts/maps/FortreeCity_House4.inc
+++ b/data/scripts/maps/FortreeCity_House4.inc
@@ -8,42 +8,42 @@ FortreeCity_House4_EventScript_15817F:: @ 815817F
FortreeCity_House4_EventScript_158188:: @ 8158188
lockall
checkflag 223
- jumpeq FortreeCity_House4_EventScript_158204
+ goto_if_eq FortreeCity_House4_EventScript_158204
checkflag 224
- jumpeq FortreeCity_House4_EventScript_1581D6
+ goto_if_eq FortreeCity_House4_EventScript_1581D6
checkflag 222
- jumpeq FortreeCity_House4_EventScript_1581C2
+ goto_if_eq FortreeCity_House4_EventScript_1581C2
msgbox FortreeCity_House4_Text_186835, 4
- closebutton
+ closemessage
setflag 222
clearflag 934
- move 3, FortreeCity_House4_Movement_158218
- waitmove 0
- disappear 3
+ applymovement 3, FortreeCity_House4_Movement_158218
+ waitmovement 0
+ removeobject 3
releaseall
end
FortreeCity_House4_EventScript_1581C2:: @ 81581C2
- move LAST_TALKED, FortreeCity_House4_Movement_1A0839
- waitmove 0
+ applymovement LAST_TALKED, FortreeCity_House4_Movement_1A0839
+ waitmovement 0
msgbox FortreeCity_House4_Text_18684E, 4
releaseall
end
FortreeCity_House4_EventScript_1581D6:: @ 81581D6
- move LAST_TALKED, FortreeCity_House4_Movement_1A0839
- waitmove 0
+ applymovement LAST_TALKED, FortreeCity_House4_Movement_1A0839
+ waitmovement 0
msgbox FortreeCity_House4_Text_186881, 4
giveitem ITEM_MENTAL_HERB
compare RESULT, 0
- jumpeq FortreeCity_House4_EventScript_1A029B
+ goto_if_eq FortreeCity_House4_EventScript_1A029B
setflag 223
releaseall
end
FortreeCity_House4_EventScript_158204:: @ 8158204
- move LAST_TALKED, FortreeCity_House4_Movement_1A0839
- waitmove 0
+ applymovement LAST_TALKED, FortreeCity_House4_Movement_1A0839
+ waitmovement 0
msgbox FortreeCity_House4_Text_186924, 4
releaseall
end
@@ -59,7 +59,7 @@ FortreeCity_House4_Movement_158218:: @ 8158218
FortreeCity_House4_EventScript_15821E:: @ 815821E
lock
faceplayer
- checksound
+ waitse
pokecry SPECIES_WINGULL, 0
msgbox FortreeCity_House4_Text_18695C, 4
waitpokecry