summaryrefslogtreecommitdiff
path: root/data/maps/FortreeCity_House4/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/FortreeCity_House4/scripts.inc')
-rw-r--r--data/maps/FortreeCity_House4/scripts.inc24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc
index 36e339fa8..3e3d0948e 100644
--- a/data/maps/FortreeCity_House4/scripts.inc
+++ b/data/maps/FortreeCity_House4/scripts.inc
@@ -2,7 +2,7 @@ FortreeCity_House4_MapScripts:: @ 815817E
.byte 0
FortreeCity_House4_EventScript_15817F:: @ 815817F
- msgbox FortreeCity_House4_Text_1867AF, 2
+ msgbox FortreeCity_House4_Text_1867AF, MSGBOX_NPC
end
FortreeCity_House4_EventScript_158188:: @ 8158188
@@ -10,7 +10,7 @@ FortreeCity_House4_EventScript_158188:: @ 8158188
goto_if_set FLAG_RECEIVED_MENTAL_HERB, FortreeCity_House4_EventScript_158204
goto_if_set FLAG_WINGULL_DELIVERED_MAIL, FortreeCity_House4_EventScript_1581D6
goto_if_set FLAG_WINGULL_SENT_ON_ERRAND, FortreeCity_House4_EventScript_1581C2
- msgbox FortreeCity_House4_Text_186835, 4
+ msgbox FortreeCity_House4_Text_186835, MSGBOX_DEFAULT
closemessage
setflag FLAG_WINGULL_SENT_ON_ERRAND
clearflag FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE
@@ -21,27 +21,27 @@ FortreeCity_House4_EventScript_158188:: @ 8158188
end
FortreeCity_House4_EventScript_1581C2:: @ 81581C2
- applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_1A0839
+ applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
waitmovement 0
- msgbox FortreeCity_House4_Text_18684E, 4
+ msgbox FortreeCity_House4_Text_18684E, MSGBOX_DEFAULT
releaseall
end
FortreeCity_House4_EventScript_1581D6:: @ 81581D6
- applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_1A0839
+ applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
waitmovement 0
- msgbox FortreeCity_House4_Text_186881, 4
- giveitem_std ITEM_MENTAL_HERB
+ msgbox FortreeCity_House4_Text_186881, MSGBOX_DEFAULT
+ giveitem ITEM_MENTAL_HERB
compare VAR_RESULT, 0
- goto_if_eq FortreeCity_House4_EventScript_1A029B
+ goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_MENTAL_HERB
releaseall
end
FortreeCity_House4_EventScript_158204:: @ 8158204
- applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_1A0839
+ applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
waitmovement 0
- msgbox FortreeCity_House4_Text_186924, 4
+ msgbox FortreeCity_House4_Text_186924, MSGBOX_DEFAULT
releaseall
end
@@ -51,14 +51,14 @@ FortreeCity_House4_Movement_158218:: @ 8158218
walk_fast_right
walk_in_place_fastest_down
delay_8
- end_movement
+ step_end
FortreeCity_House4_EventScript_15821E:: @ 815821E
lock
faceplayer
waitse
playmoncry SPECIES_WINGULL, 0
- msgbox FortreeCity_House4_Text_18695C, 4
+ msgbox FortreeCity_House4_Text_18695C, MSGBOX_DEFAULT
waitmoncry
release
end