diff options
Diffstat (limited to 'data/maps/MeteorFalls_1F_1R/scripts.inc')
| -rw-r--r-- | data/maps/MeteorFalls_1F_1R/scripts.inc | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index ee2c5b1dc..83d8bbf30 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -1,37 +1,37 @@ MeteorFalls_1F_1R_MapScripts:: @ 815C490 - map_script 3, MeteorFalls_1F_1R_MapScript1_15C496 + map_script MAP_SCRIPT_ON_TRANSITION, MeteorFalls_1F_1R_MapScript1_15C496 .byte 0 MeteorFalls_1F_1R_MapScript1_15C496:: @ 815C496 - call MeteorFalls_1F_1R_EventScript_1A0196 + call Common_EventScript_SetupEvilTeamGfxIds end MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C lockall - applymovement 255, MeteorFalls_1F_1R_Movement_1A0845 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 - applymovement 5, MeteorFalls_1F_1R_Movement_1A0845 + applymovement 5, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_193237, 4 + msgbox MeteorFalls_1F_1R_Text_193237, MSGBOX_DEFAULT closemessage - applymovement 5, MeteorFalls_1F_1R_Movement_1A0841 - applymovement 6, MeteorFalls_1F_1R_Movement_1A0841 + applymovement 5, Common_Movement_WalkInPlaceFastestUp + applymovement 6, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN - applymovement 5, MeteorFalls_1F_1R_Movement_1A0833 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, MeteorFalls_1F_1R_Movement_1A0835 + applymovement 5, Common_Movement_Delay48 waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_193268, 4 + msgbox MeteorFalls_1F_1R_Text_193268, MSGBOX_DEFAULT closemessage applymovement 5, MeteorFalls_1F_1R_Movement_15C5EE waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_1932C5, 4 + msgbox MeteorFalls_1F_1R_Text_1932C5, MSGBOX_DEFAULT closemessage - applymovement 255, MeteorFalls_1F_1R_Movement_1A083F - applymovement 5, MeteorFalls_1F_1R_Movement_1A083F - applymovement 6, MeteorFalls_1F_1R_Movement_1A083F + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement 5, Common_Movement_WalkInPlaceFastestLeft + applymovement 6, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 addobject 7 addobject 8 @@ -40,12 +40,12 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C applymovement 8, MeteorFalls_1F_1R_Movement_15C60F applymovement 9, MeteorFalls_1F_1R_Movement_15C617 waitmovement 0 - applymovement 5, MeteorFalls_1F_1R_Movement_1A083F - applymovement 6, MeteorFalls_1F_1R_Movement_1A083F + applymovement 5, Common_Movement_WalkInPlaceFastestLeft + applymovement 6, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_193320, 4 + msgbox MeteorFalls_1F_1R_Text_193320, MSGBOX_DEFAULT closemessage - applymovement 255, MeteorFalls_1F_1R_Movement_15C64F + applymovement OBJ_EVENT_ID_PLAYER, MeteorFalls_1F_1R_Movement_15C64F applymovement 5, MeteorFalls_1F_1R_Movement_15C5F1 applymovement 6, MeteorFalls_1F_1R_Movement_15C5FC waitmovement 0 @@ -54,21 +54,21 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C applymovement 7, MeteorFalls_1F_1R_Movement_15C628 waitmovement 0 .ifdef SAPPHIRE - msgbox MeteorFalls_1F_1R_Text_1933EC, 4 + msgbox MeteorFalls_1F_1R_Text_1933EC, MSGBOX_DEFAULT .else - msgbox MeteorFalls_1F_1R_Text_193584, 4 + msgbox MeteorFalls_1F_1R_Text_193584, MSGBOX_DEFAULT .endif closemessage applymovement 8, MeteorFalls_1F_1R_Movement_15C639 applymovement 9, MeteorFalls_1F_1R_Movement_15C64A waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_193720, 4 - applymovement 7, MeteorFalls_1F_1R_Movement_1A0845 + msgbox MeteorFalls_1F_1R_Text_193720, MSGBOX_DEFAULT + applymovement 7, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_193747, 4 - applymovement 7, MeteorFalls_1F_1R_Movement_1A083F + msgbox MeteorFalls_1F_1R_Text_193747, MSGBOX_DEFAULT + applymovement 7, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_1937AA, 4 + msgbox MeteorFalls_1F_1R_Text_1937AA, MSGBOX_DEFAULT closemessage applymovement 7, MeteorFalls_1F_1R_Movement_15C61F applymovement 8, MeteorFalls_1F_1R_Movement_15C62E @@ -85,7 +85,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C MeteorFalls_1F_1R_Movement_15C5EE:: @ 815C5EE walk_right walk_right - end_movement + step_end MeteorFalls_1F_1R_Movement_15C5F1:: @ 815C5F1 walk_fast_up @@ -98,7 +98,7 @@ MeteorFalls_1F_1R_Movement_15C5F1:: @ 815C5F1 walk_fast_right walk_fast_right walk_fast_right - end_movement + step_end MeteorFalls_1F_1R_Movement_15C5FC:: @ 815C5FC walk_fast_up @@ -112,7 +112,7 @@ MeteorFalls_1F_1R_Movement_15C5FC:: @ 815C5FC walk_fast_right walk_fast_right walk_fast_right - end_movement + step_end MeteorFalls_1F_1R_Movement_15C608:: @ 815C608 walk_right @@ -121,7 +121,7 @@ MeteorFalls_1F_1R_Movement_15C608:: @ 815C608 walk_right walk_right walk_right - end_movement + step_end MeteorFalls_1F_1R_Movement_15C60F:: @ 815C60F delay_16 @@ -131,7 +131,7 @@ MeteorFalls_1F_1R_Movement_15C60F:: @ 815C60F walk_right walk_right walk_right - end_movement + step_end MeteorFalls_1F_1R_Movement_15C617:: @ 815C617 delay_16 @@ -141,7 +141,7 @@ MeteorFalls_1F_1R_Movement_15C617:: @ 815C617 walk_right walk_right walk_right - end_movement + step_end MeteorFalls_1F_1R_Movement_15C61F:: @ 815C61F walk_right @@ -152,7 +152,7 @@ MeteorFalls_1F_1R_Movement_15C61F:: @ 815C61F walk_right walk_right walk_right - end_movement + step_end MeteorFalls_1F_1R_Movement_15C628:: @ 815C628 walk_right @@ -160,7 +160,7 @@ MeteorFalls_1F_1R_Movement_15C628:: @ 815C628 walk_up walk_up walk_in_place_fastest_left - end_movement + step_end MeteorFalls_1F_1R_Movement_15C62E:: @ 815C62E walk_up @@ -173,14 +173,14 @@ MeteorFalls_1F_1R_Movement_15C62E:: @ 815C62E walk_right walk_right walk_right - end_movement + step_end MeteorFalls_1F_1R_Movement_15C639:: @ 815C639 walk_right walk_right walk_right walk_in_place_fastest_up - end_movement + step_end MeteorFalls_1F_1R_Movement_15C63E:: @ 815C63E walk_up @@ -194,14 +194,14 @@ MeteorFalls_1F_1R_Movement_15C63E:: @ 815C63E walk_right walk_right walk_right - end_movement + step_end MeteorFalls_1F_1R_Movement_15C64A:: @ 815C64A walk_right walk_right walk_right walk_in_place_fastest_up - end_movement + step_end MeteorFalls_1F_1R_Movement_15C64F:: @ 815C64F walk_in_place_fastest_down @@ -210,18 +210,18 @@ MeteorFalls_1F_1R_Movement_15C64F:: @ 815C64F lock_facing_direction walk_left unlock_facing_direction - end_movement + step_end MeteorFalls_1F_1R_EventScript_15C656:: @ 815C656 lock faceplayer goto_if_set FLAG_MET_PROF_COSMO, MeteorFalls_1F_1R_EventScript_15C66E setflag FLAG_MET_PROF_COSMO - msgbox MeteorFalls_1F_1R_Text_1937EB, 4 + msgbox MeteorFalls_1F_1R_Text_1937EB, MSGBOX_DEFAULT release end MeteorFalls_1F_1R_EventScript_15C66E:: @ 815C66E - msgbox MeteorFalls_1F_1R_Text_19396A, 4 + msgbox MeteorFalls_1F_1R_Text_19396A, MSGBOX_DEFAULT release end |