diff options
Diffstat (limited to 'data/maps/MtPyre_Summit/scripts.inc')
| -rw-r--r-- | data/maps/MtPyre_Summit/scripts.inc | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 90e41c233..fc0776fb5 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -1,9 +1,9 @@ MtPyre_Summit_MapScripts:: @ 815D4B1 - map_script 3, MtPyre_Summit_MapScript1_15D4B7 + map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Summit_MapScript1_15D4B7 .byte 0 MtPyre_Summit_MapScript1_15D4B7:: @ 815D4B7 - call MtPyre_Summit_EventScript_1A0196 + call Common_EventScript_SetupEvilTeamGfxIds end MtPyre_Summit_EventScript_15D4BD:: @ 815D4BD @@ -25,9 +25,9 @@ MtPyre_Summit_EventScript_15D4D5:: @ 815D4D5 end MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 - applymovement 255, MtPyre_Summit_Movement_1A0841 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_1A0845 + applymovement 2, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 50 compare VAR_0x8008, 0 @@ -37,19 +37,19 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 compare VAR_0x8008, 2 call_if_eq MtPyre_Summit_EventScript_15D59F .ifdef SAPPHIRE - msgbox UnknownString_81B52B0, 4 + msgbox UnknownString_81B52B0, MSGBOX_DEFAULT .else - msgbox MtPyre_Summit_Text_1B5EEC, 4 + msgbox MtPyre_Summit_Text_1B5EEC, MSGBOX_DEFAULT .endif closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 2 removeobject 4 removeobject 5 removeobject 6 setflag FLAG_HIDE_LEADER_MT_PYRE_SUMMIT setflag FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT - fadescreen 0 + fadescreen FADE_FROM_BLACK delay 20 call MtPyre_Summit_EventScript_15D57A compare VAR_0x8008, 0 @@ -59,11 +59,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 compare VAR_0x8008, 2 call_if_eq MtPyre_Summit_EventScript_15D5CA .ifdef SAPPHIRE - msgbox UnknownString_81B53AB, 4 + msgbox UnknownString_81B53AB, MSGBOX_DEFAULT .else - msgbox MtPyre_Summit_Text_1B5FE6, 4 + msgbox MtPyre_Summit_Text_1B5FE6, MSGBOX_DEFAULT .endif - giveitem_std ITEM_RED_OR_BLUE_ORB + giveitem ITEM_RED_OR_BLUE_ORB setflag FLAG_RECEIVED_RED_OR_BLUE_ORB releaseall end @@ -93,7 +93,7 @@ MtPyre_Summit_EventScript_15D59F:: @ 815D59F MtPyre_Summit_EventScript_15D5AA:: @ 815D5AA applymovement 3, MtPyre_Summit_Movement_15D5DF waitmovement 0 - applymovement 255, MtPyre_Summit_Movement_1A0843 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -105,7 +105,7 @@ MtPyre_Summit_EventScript_15D5BF:: @ 815D5BF MtPyre_Summit_EventScript_15D5CA:: @ 815D5CA applymovement 3, MtPyre_Summit_Movement_15D5E5 waitmovement 0 - applymovement 255, MtPyre_Summit_Movement_1A083F + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -113,27 +113,27 @@ MtPyre_Summit_Movement_15D5DF:: @ 815D5DF walk_down walk_down walk_in_place_fastest_left - end_movement + step_end MtPyre_Summit_Movement_15D5E3:: @ 815D5E3 walk_down - end_movement + step_end MtPyre_Summit_Movement_15D5E5:: @ 815D5E5 walk_down walk_down walk_in_place_fastest_right - end_movement + step_end MtPyre_Summit_Movement_15D5E9:: @ 815D5E9 walk_left walk_in_place_fastest_down - end_movement + step_end MtPyre_Summit_Movement_15D5EC:: @ 815D5EC walk_right walk_in_place_fastest_down - end_movement + step_end MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF lock @@ -152,17 +152,17 @@ MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF MtPyre_Summit_EventScript_15D611:: @ 815D611 .ifdef SAPPHIRE - msgbox UnknownString_81B5992, 4 + msgbox UnknownString_81B5992, MSGBOX_DEFAULT .else - msgbox MtPyre_Summit_Text_1B65D6, 4 + msgbox MtPyre_Summit_Text_1B65D6, MSGBOX_DEFAULT .endif return MtPyre_Summit_EventScript_15D61A:: @ 815D61A .ifdef SAPPHIRE - msgbox UnknownString_81B5BD7, 4 + msgbox UnknownString_81B5BD7, MSGBOX_DEFAULT .else - msgbox MtPyre_Summit_Text_1B6823, 4 + msgbox MtPyre_Summit_Text_1B6823, MSGBOX_DEFAULT .endif return @@ -173,9 +173,9 @@ MtPyre_Summit_EventScript_15D623:: @ 815D623 goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, MtPyre_Summit_EventScript_15D64A goto_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_15D6BA .ifdef SAPPHIRE - msgbox UnknownString_81B54BE, 4 + msgbox UnknownString_81B54BE, MSGBOX_DEFAULT .else - msgbox MtPyre_Summit_Text_1B60F9, 4 + msgbox MtPyre_Summit_Text_1B60F9, MSGBOX_DEFAULT .endif release end @@ -194,18 +194,18 @@ MtPyre_Summit_EventScript_15D64A:: @ 815D64A MtPyre_Summit_EventScript_15D669:: @ 815D669 setvar VAR_0x8004, ITEM_RED_OR_BLUE_ORB - call MtPyre_Summit_EventScript_1A067F + call Common_EventScript_PlayerHandedOverTheItem closemessage - applymovement VAR_LAST_TALKED, MtPyre_Summit_Movement_1A0841 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 40 - applymovement VAR_LAST_TALKED, MtPyre_Summit_Movement_1A0839 + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 delay 10 .ifdef SAPPHIRE - msgbox UnknownString_81B5762, 4 + msgbox UnknownString_81B5762, MSGBOX_DEFAULT .else - msgbox MtPyre_Summit_Text_1B639C, 4 + msgbox MtPyre_Summit_Text_1B639C, MSGBOX_DEFAULT .endif setflag FLAG_RETURNED_RED_OR_BLUE_ORB release @@ -225,18 +225,18 @@ MtPyre_Summit_EventScript_15D69B:: @ 815D69B MtPyre_Summit_EventScript_15D6BA:: @ 815D6BA .ifdef SAPPHIRE - msgbox UnknownString_81B5540, 4 + msgbox UnknownString_81B5540, MSGBOX_DEFAULT .else - msgbox MtPyre_Summit_Text_1B617B, 4 + msgbox MtPyre_Summit_Text_1B617B, MSGBOX_DEFAULT .endif release end MtPyre_Summit_EventScript_15D6C4:: @ 815D6C4 .ifdef SAPPHIRE - msgbox UnknownString_81B57BE, 4 + msgbox UnknownString_81B57BE, MSGBOX_DEFAULT .else - msgbox MtPyre_Summit_Text_1B63F8, 4 + msgbox MtPyre_Summit_Text_1B63F8, MSGBOX_DEFAULT .endif release end @@ -260,9 +260,9 @@ MtPyre_Summit_EventScript_15D6E6:: @ 815D6E6 end MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 - applymovement 255, MtPyre_Summit_Movement_1A0841 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - applymovement 2, MtPyre_Summit_Movement_1A0845 + applymovement 2, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 50 compare VAR_0x8008, 0 @@ -272,9 +272,9 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 compare VAR_0x8008, 2 call_if_eq MtPyre_Summit_EventScript_15D774 .ifdef SAPPHIRE - msgbox UnknownString_81B5BFC, 4 + msgbox UnknownString_81B5BFC, MSGBOX_DEFAULT .else - msgbox MtPyre_Summit_Text_1B6848, 4 + msgbox MtPyre_Summit_Text_1B6848, MSGBOX_DEFAULT .endif closemessage compare VAR_0x8008, 0 @@ -321,15 +321,15 @@ MtPyre_Summit_EventScript_15D795:: @ 815D795 MtPyre_Summit_Movement_15D7A0:: @ 815D7A0 walk_left walk_in_place_fastest_down - end_movement + step_end MtPyre_Summit_Movement_15D7A3:: @ 815D7A3 - end_movement + step_end MtPyre_Summit_Movement_15D7A4:: @ 815D7A4 walk_right walk_in_place_fastest_down - end_movement + step_end MtPyre_Summit_Movement_15D7A7:: @ 815D7A7 walk_right @@ -340,7 +340,7 @@ MtPyre_Summit_Movement_15D7A7:: @ 815D7A7 walk_down walk_down walk_down - end_movement + step_end MtPyre_Summit_Movement_15D7B0:: @ 815D7B0 walk_right @@ -351,7 +351,7 @@ MtPyre_Summit_Movement_15D7B0:: @ 815D7B0 walk_down walk_down walk_down - end_movement + step_end MtPyre_Summit_Movement_15D7B9:: @ 815D7B9 walk_left @@ -362,4 +362,4 @@ MtPyre_Summit_Movement_15D7B9:: @ 815D7B9 walk_down walk_down walk_down - end_movement + step_end |