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.inc42
1 files changed, 21 insertions, 21 deletions
diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc
index ff31d8b97..70e91f09b 100644
--- a/data/scripts/magma_chimney.inc
+++ b/data/scripts/magma_chimney.inc
@@ -4,7 +4,7 @@ MtChimney_EventScript_1B2C95:: @ 81B2C95
call_if_unset FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_1B2CB9
call_if_set FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_1B2CC2
closemessage
- applymovement 1, MtChimney_Movement_1A083D
+ applymovement 1, Common_Movement_FaceOriginalDirection
waitmovement 0
setflag FLAG_EVIL_LEADER_PLEASE_STOP
release
@@ -12,69 +12,69 @@ MtChimney_EventScript_1B2C95:: @ 81B2C95
MtChimney_EventScript_1B2CB9:: @ 81B2CB9
.ifdef SAPPHIRE
- msgbox MtChimney_Text_1B350B, 4
+ msgbox MtChimney_Text_1B350B, MSGBOX_DEFAULT
.else
- msgbox MtChimney_Text_1B3EC1, 4
+ msgbox MtChimney_Text_1B3EC1, MSGBOX_DEFAULT
.endif
return
MtChimney_EventScript_1B2CC2:: @ 81B2CC2
.ifdef SAPPHIRE
- msgbox MtChimney_Text_1B3598, 4
+ msgbox MtChimney_Text_1B3598, MSGBOX_DEFAULT
.else
- msgbox MtChimney_Text_1B3F8C, 4
+ msgbox MtChimney_Text_1B3F8C, MSGBOX_DEFAULT
.endif
return
MtChimney_EventScript_1B2CCB:: @ 81B2CCB
lockall
.ifdef SAPPHIRE
- msgbox MtChimney_Text_1B2DEE, 4
+ msgbox MtChimney_Text_1B2DEE, MSGBOX_DEFAULT
.else
- msgbox MtChimney_Text_1B37BB, 4
+ msgbox MtChimney_Text_1B37BB, MSGBOX_DEFAULT
.endif
- applymovement 2, MtChimney_Movement_1A0839
+ applymovement 2, Common_Movement_FacePlayer
waitmovement 0
playse SE_PIN
- applymovement 2, MtChimney_Movement_1A0833
+ applymovement 2, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 2, MtChimney_Movement_1A0835
+ applymovement 2, Common_Movement_Delay48
waitmovement 0
.ifdef SAPPHIRE
- msgbox MtChimney_Text_1B2ED9, 4
+ msgbox MtChimney_Text_1B2ED9, MSGBOX_DEFAULT
.else
- msgbox MtChimney_Text_1B38B3, 4
+ msgbox MtChimney_Text_1B38B3, MSGBOX_DEFAULT
.endif
.ifdef SAPPHIRE
- trainerbattle 3, TRAINER_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3099
+ trainerbattle_no_intro TRAINER_MT_CHIMNEY_GRUNT_3, MtChimney_Text_1B3099
.else
- trainerbattle 3, TRAINER_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3A68
+ trainerbattle_no_intro TRAINER_MT_CHIMNEY_GRUNT_3, MtChimney_Text_1B3A68
.endif
.ifdef SAPPHIRE
- msgbox MtChimney_Text_1B30C2, 4
+ msgbox MtChimney_Text_1B30C2, MSGBOX_DEFAULT
.else
- msgbox MtChimney_Text_1B3A90, 4
+ msgbox MtChimney_Text_1B3A90, MSGBOX_DEFAULT
.endif
closemessage
delay 30
- fadescreen 1
+ fadescreen FADE_TO_BLACK
removeobject 2
removeobject 3
removeobject 22
setflag FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY
- fadescreen 0
+ fadescreen FADE_FROM_BLACK
setobjectxyperm 1, 10, 12
addobject 1
compare VAR_FACING, 4
call_if_eq MtChimney_EventScript_1B2D7D
compare VAR_FACING, 2
call_if_eq MtChimney_EventScript_1B2D88
- applymovement 255, MtChimney_Movement_1A083F
+ applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
.ifdef SAPPHIRE
- msgbox MtChimney_Text_1B3608, 4
+ msgbox MtChimney_Text_1B3608, MSGBOX_DEFAULT
.else
- msgbox MtChimney_Text_1B3FFE, 4
+ msgbox MtChimney_Text_1B3FFE, MSGBOX_DEFAULT
.endif
closemessage
compare VAR_FACING, 4