summaryrefslogtreecommitdiff
path: root/data/scripts/magma_chimney.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/magma_chimney.inc')
-rw-r--r--data/scripts/magma_chimney.inc70
1 files changed, 35 insertions, 35 deletions
diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc
index a2f4f67b7..f13b319f4 100644
--- a/data/scripts/magma_chimney.inc
+++ b/data/scripts/magma_chimney.inc
@@ -2,12 +2,12 @@ MtChimney_EventScript_1B2C95:: @ 81B2C95
lock
faceplayer
checkflag 219
- callif 0, MtChimney_EventScript_1B2CB9
+ call_if 0, MtChimney_EventScript_1B2CB9
checkflag 219
- callif 1, MtChimney_EventScript_1B2CC2
- closebutton
- move 1, MtChimney_Movement_1A083D
- waitmove 0
+ call_if 1, MtChimney_EventScript_1B2CC2
+ closemessage
+ applymovement 1, MtChimney_Movement_1A083D
+ waitmovement 0
setflag 219
release
end
@@ -35,13 +35,13 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB
.else
msgbox MtChimney_Text_1B37BB, 4
.endif
- move 2, MtChimney_Movement_1A0839
- waitmove 0
- playsfx 21
- move 2, MtChimney_Movement_1A0833
- waitmove 0
- move 2, MtChimney_Movement_1A0835
- waitmove 0
+ applymovement 2, MtChimney_Movement_1A0839
+ waitmovement 0
+ playse 21
+ applymovement 2, MtChimney_Movement_1A0833
+ waitmovement 0
+ applymovement 2, MtChimney_Movement_1A0835
+ waitmovement 0
.ifdef SAPPHIRE
msgbox MtChimney_Text_1B2ED9, 4
.else
@@ -57,33 +57,33 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB
.else
msgbox MtChimney_Text_1B3A90, 4
.endif
- closebutton
- pause 30
+ closemessage
+ delay 30
fadescreen 1
- disappear 2
- disappear 3
- disappear 22
+ removeobject 2
+ removeobject 3
+ removeobject 22
setflag 926
fadescreen 0
- movespriteperm 1, 10, 12
- reappear 1
+ setobjectxyperm 1, 10, 12
+ addobject 1
compare FACING, 4
- callif 1, MtChimney_EventScript_1B2D7D
+ call_if 1, MtChimney_EventScript_1B2D7D
compare FACING, 2
- callif 1, MtChimney_EventScript_1B2D88
- move 255, MtChimney_Movement_1A083F
- waitmove 0
+ call_if 1, MtChimney_EventScript_1B2D88
+ applymovement 255, MtChimney_Movement_1A083F
+ waitmovement 0
.ifdef SAPPHIRE
msgbox MtChimney_Text_1B3608, 4
.else
msgbox MtChimney_Text_1B3FFE, 4
.endif
- closebutton
+ closemessage
compare FACING, 4
- callif 1, MtChimney_EventScript_1B2D93
+ call_if 1, MtChimney_EventScript_1B2D93
compare FACING, 2
- callif 1, MtChimney_EventScript_1B2D9E
- disappear 1
+ call_if 1, MtChimney_EventScript_1B2D9E
+ removeobject 1
setflag 927
setflag 139
clearflag 928
@@ -92,21 +92,21 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB
end
MtChimney_EventScript_1B2D7D:: @ 81B2D7D
- move 1, MtChimney_Movement_15D025
- waitmove 0
+ applymovement 1, MtChimney_Movement_15D025
+ waitmovement 0
return
MtChimney_EventScript_1B2D88:: @ 81B2D88
- move 1, MtChimney_Movement_15D036
- waitmove 0
+ applymovement 1, MtChimney_Movement_15D036
+ waitmovement 0
return
MtChimney_EventScript_1B2D93:: @ 81B2D93
- move 1, MtChimney_Movement_15D02D
- waitmove 0
+ applymovement 1, MtChimney_Movement_15D02D
+ waitmovement 0
return
MtChimney_EventScript_1B2D9E:: @ 81B2D9E
- move 1, MtChimney_Movement_15D03E
- waitmove 0
+ applymovement 1, MtChimney_Movement_15D03E
+ waitmovement 0
return