diff options
Diffstat (limited to 'data/maps/MtPyre_Summit/scripts.inc')
| -rw-r--r-- | data/maps/MtPyre_Summit/scripts.inc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 6eaf6265f..a0da7e907 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -1,9 +1,9 @@ MtPyre_Summit_MapScripts:: @ 8231FF7 - map_script 3, MtPyre_Summit_MapScript1_231FFD + map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Summit_MapScript1_231FFD .byte 0 MtPyre_Summit_MapScript1_231FFD: @ 8231FFD - compare VAR_0x40B9, 2 + compare VAR_MT_PYRE_STATE, 2 call_if_eq MtPyre_Summit_EventScript_232009 end @@ -32,9 +32,9 @@ MtPyre_Summit_EventScript_232030:: @ 8232030 MtPyre_Summit_EventScript_23203C:: @ 823203C playbgm MUS_AQA_0, 0 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725AA + applymovement 2, Common_Movement_WalkInPlaceDown waitmovement 0 delay 50 compare VAR_0x8008, 0 @@ -56,7 +56,7 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C fadedefaultbgm fadescreen 0 delay 20 - setvar VAR_0x40B9, 1 + setvar VAR_MT_PYRE_STATE, 1 compare VAR_0x8008, 0 call_if_eq MtPyre_Summit_EventScript_2320F7 compare VAR_0x8008, 1 @@ -86,7 +86,7 @@ MtPyre_Summit_EventScript_2320EC:: @ 82320EC MtPyre_Summit_EventScript_2320F7:: @ 82320F7 applymovement 3, MtPyre_Summit_Movement_23212C waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -98,7 +98,7 @@ MtPyre_Summit_EventScript_23210C:: @ 823210C MtPyre_Summit_EventScript_232117:: @ 8232117 applymovement 3, MtPyre_Summit_Movement_232132 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 return @@ -165,7 +165,7 @@ MtPyre_Summit_EventScript_2321A2:: @ 82321A2 lock faceplayer goto_if_set FLAG_RETURNED_RED_OR_BLUE_ORB, MtPyre_Summit_EventScript_2321E2 - compare VAR_0x40B9, 3 + compare VAR_MT_PYRE_STATE, 3 call_if_ge MtPyre_Summit_EventScript_2321CB goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_2321D8 msgbox MtPyre_Summit_Text_232AD8, MSGBOX_DEFAULT @@ -207,7 +207,7 @@ MtPyre_Summit_EventScript_232204:: @ 8232204 end MtPyre_Summit_EventScript_232210:: @ 8232210 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 60 compare VAR_0x8008, 0 @@ -217,9 +217,9 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 compare VAR_0x8008, 2 call_if_eq MtPyre_Summit_EventScript_2322F6 playse SE_PIN - applymovement 8, MtPyre_Summit_Movement_272598 + applymovement 8, Common_Movement_ExclamationMark waitmovement 0 - applymovement 8, MtPyre_Summit_Movement_27259A + applymovement 8, Common_Movement_Delay48 waitmovement 0 delay 30 compare VAR_0x8008, 0 @@ -242,7 +242,7 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 waitmovement 0 removeobject 2 removeobject 8 - setvar VAR_0x40B9, 3 + setvar VAR_MT_PYRE_STATE, 3 releaseall end @@ -292,7 +292,7 @@ MtPyre_Summit_EventScript_23235A:: @ 823235A applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement 8, MtPyre_Summit_Movement_2323ED waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -300,7 +300,7 @@ MtPyre_Summit_EventScript_232376:: @ 8232376 applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement 8, MtPyre_Summit_Movement_2323F3 waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 return @@ -308,7 +308,7 @@ MtPyre_Summit_EventScript_232392:: @ 8232392 applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement 8, MtPyre_Summit_Movement_2323F8 waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_2725A8 + applymovement 2, Common_Movement_WalkInPlaceRight waitmovement 0 return |