summaryrefslogtreecommitdiff
path: root/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc')
-rw-r--r--data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc17
1 files changed, 8 insertions, 9 deletions
diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc
index a713b044f..d32ab0d4a 100644
--- a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc
+++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc
@@ -2,19 +2,19 @@ OneIsland_KindleRoad_EmberSpa_MapScripts:: @ 816535B
.byte 0
OneIsland_KindleRoad_EmberSpa_EventScript_16535C:: @ 816535C
- msgbox gUnknown_817D34A, 2
+ msgbox gUnknown_817D34A, MSGBOX_NPC
end
OneIsland_KindleRoad_EmberSpa_EventScript_165365:: @ 8165365
- msgbox gUnknown_817D3DE, 2
+ msgbox gUnknown_817D3DE, MSGBOX_NPC
end
OneIsland_KindleRoad_EmberSpa_EventScript_16536E:: @ 816536E
- msgbox gUnknown_817D4AA, 2
+ msgbox gUnknown_817D4AA, MSGBOX_NPC
end
OneIsland_KindleRoad_EmberSpa_EventScript_165377:: @ 8165377
- msgbox gUnknown_817D4E3, 2
+ msgbox gUnknown_817D4E3, MSGBOX_NPC
end
OneIsland_KindleRoad_EmberSpa_EventScript_165380:: @ 8165380
@@ -28,8 +28,7 @@ OneIsland_KindleRoad_EmberSpa_EventScript_165380:: @ 8165380
OneIsland_KindleRoad_EmberSpa_EventScript_165399:: @ 8165399
lock
faceplayer
- checkflag FLAG_GOT_HM06
- goto_if TRUE, EventScript_1653C5
+ goto_if_set FLAG_GOT_HM06, EventScript_1653C5
msgbox gUnknown_817D622
giveitem ITEM_HM06
setflag FLAG_GOT_HM06
@@ -44,10 +43,10 @@ EventScript_1653C5:: @ 81653C5
OneIsland_KindleRoad_EmberSpa_EventScript_1653CF:: @ 81653CF
lockall
- fadescreen 3
+ fadescreen FADE_TO_WHITE
special HealPlayerParty
- fadescreen 2
+ fadescreen FADE_FROM_WHITE
msgbox gUnknown_817D450
- setvar VAR_0x4001, 1
+ setvar VAR_TEMP_1, 1
releaseall
end