summaryrefslogtreecommitdiff
path: root/data/maps/SSAnne_CaptainsOffice/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/SSAnne_CaptainsOffice/scripts.inc')
-rw-r--r--data/maps/SSAnne_CaptainsOffice/scripts.inc16
1 files changed, 7 insertions, 9 deletions
diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc
index 114ba084a..7171cae6d 100644
--- a/data/maps/SSAnne_CaptainsOffice/scripts.inc
+++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc
@@ -3,8 +3,7 @@ SSAnne_CaptainsOffice_MapScripts:: @ 8160B39
SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A
lock
- checkflag FLAG_GOT_HM01
- goto_if TRUE, EventScript_160BB5
+ goto_if_set FLAG_GOT_HM01, EventScript_160BB5
msgbox gUnknown_8173646
textcolor 3
message Text_173676
@@ -13,11 +12,10 @@ SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A
waitfanfare
call EventScript_1A6675
delay 50
- applymovement 1, Movement_1A75E1
+ applymovement 1, Movement_FacePlayer
waitmovement 0
msgbox gUnknown_81736A6
- additem ITEM_HM01, 1
- giveitemfanfaremsg gUnknown_81737AF, ITEM_HM01, 1, MUS_FAN5
+ giveitem_msg gUnknown_81737AF, ITEM_HM01, 1, MUS_FAN5
msgbox gUnknown_81737D2
setflag FLAG_GOT_HM01
setvar VAR_MAP_SCENE_VERMILION_CITY, 1
@@ -27,22 +25,22 @@ SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A
EventScript_160BA0:: @ 8160BA0
msgbox gUnknown_81738C3
closemessage
- applymovement 1, Movement_1A75E5
+ applymovement 1, Movement_FaceOriginalDirection
waitmovement 0
release
end
EventScript_160BB5:: @ 8160BB5
- applymovement 1, Movement_1A75E1
+ applymovement 1, Movement_FacePlayer
waitmovement 0
msgbox gUnknown_8173831
release
end
SSAnne_CaptainsOffice_EventScript_160BC9:: @ 8160BC9
- msgbox gUnknown_81738E6, 3
+ msgbox gUnknown_81738E6, MSGBOX_SIGN
end
SSAnne_CaptainsOffice_EventScript_160BD2:: @ 8160BD2
- msgbox gUnknown_8173903, 3
+ msgbox gUnknown_8173903, MSGBOX_SIGN
end