summaryrefslogtreecommitdiff
path: root/data/scripts/maps/Route111_WinstrateFamilysHouse.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/maps/Route111_WinstrateFamilysHouse.inc')
-rw-r--r--data/scripts/maps/Route111_WinstrateFamilysHouse.inc24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc
index 3eb514ad2..d9a94ce75 100644
--- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc
+++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc
@@ -6,7 +6,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF25:: @ 815BF25
faceplayer
setvar 0x8008, 2
msgbox Route111_WinstrateFamilysHouse_Text_191FCE, 4
- jump Route111_WinstrateFamilysHouse_EventScript_15BFC4
+ goto Route111_WinstrateFamilysHouse_EventScript_15BFC4
end
Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A
@@ -14,18 +14,18 @@ Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A
faceplayer
setvar 0x8008, 3
checkflag 277
- jumpeq Route111_WinstrateFamilysHouse_EventScript_15BF72
+ goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BF72
msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4
giveitem ITEM_MACHO_BRACE
compare RESULT, 0
- jumpeq Route111_WinstrateFamilysHouse_EventScript_1A029B
+ goto_if_eq Route111_WinstrateFamilysHouse_EventScript_1A029B
setflag 277
- jump Route111_WinstrateFamilysHouse_EventScript_15BFC4
+ goto Route111_WinstrateFamilysHouse_EventScript_15BFC4
end
Route111_WinstrateFamilysHouse_EventScript_15BF72:: @ 815BF72
msgbox Route111_WinstrateFamilysHouse_Text_19214D, 4
- jump Route111_WinstrateFamilysHouse_EventScript_15BFC4
+ goto Route111_WinstrateFamilysHouse_EventScript_15BFC4
end
Route111_WinstrateFamilysHouse_EventScript_15BF80:: @ 815BF80
@@ -33,7 +33,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF80:: @ 815BF80
faceplayer
setvar 0x8008, 1
msgbox Route111_WinstrateFamilysHouse_Text_192190, 4
- jump Route111_WinstrateFamilysHouse_EventScript_15BFC4
+ goto Route111_WinstrateFamilysHouse_EventScript_15BFC4
end
Route111_WinstrateFamilysHouse_EventScript_15BF95:: @ 815BF95
@@ -41,20 +41,20 @@ Route111_WinstrateFamilysHouse_EventScript_15BF95:: @ 815BF95
faceplayer
setvar 0x8008, 4
checkflag 4
- jumpeq Route111_WinstrateFamilysHouse_EventScript_15BFB6
+ goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BFB6
msgbox Route111_WinstrateFamilysHouse_Text_192219, 4
setflag 4
- jump Route111_WinstrateFamilysHouse_EventScript_15BFC4
+ goto Route111_WinstrateFamilysHouse_EventScript_15BFC4
end
Route111_WinstrateFamilysHouse_EventScript_15BFB6:: @ 815BFB6
msgbox Route111_WinstrateFamilysHouse_Text_192334, 4
- jump Route111_WinstrateFamilysHouse_EventScript_15BFC4
+ goto Route111_WinstrateFamilysHouse_EventScript_15BFC4
end
Route111_WinstrateFamilysHouse_EventScript_15BFC4:: @ 815BFC4
- closebutton
- move 0x8008, Route111_WinstrateFamilysHouse_Movement_1A083D
- waitmove 0
+ closemessage
+ applymovement 0x8008, Route111_WinstrateFamilysHouse_Movement_1A083D
+ waitmovement 0
release
end