diff options
Diffstat (limited to 'data/maps/RusturfTunnel/scripts.inc')
| -rw-r--r-- | data/maps/RusturfTunnel/scripts.inc | 112 |
1 files changed, 56 insertions, 56 deletions
diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 0e3c71b22..9cb8bb595 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -1,6 +1,6 @@ RusturfTunnel_MapScripts:: @ 815C745 - map_script 3, RusturfTunnel_MapScript1_15C762 - map_script 2, RusturfTunnel_MapScript2_15C750 + map_script MAP_SCRIPT_ON_TRANSITION, RusturfTunnel_MapScript1_15C762 + map_script MAP_SCRIPT_ON_FRAME_TABLE, RusturfTunnel_MapScript2_15C750 .byte 0 RusturfTunnel_MapScript2_15C750:: @ 815C750 @@ -9,7 +9,7 @@ RusturfTunnel_MapScript2_15C750:: @ 815C750 .2byte 0 RusturfTunnel_MapScript1_15C762:: @ 815C762 - call RusturfTunnel_EventScript_1A0196 + call Common_EventScript_SetupEvilTeamGfxIds compare VAR_RUSTURF_TUNNEL_STATE, 2 call_if_eq RusturfTunnel_EventScript_15C773 end @@ -22,9 +22,9 @@ RusturfTunnel_EventScript_15C773:: @ 815C773 RusturfTunnel_EventScript_15C782:: @ 815C782 lock faceplayer - msgbox RusturfTunnel_Text_194766, 4 + msgbox RusturfTunnel_Text_194766, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -34,17 +34,17 @@ RusturfTunnel_EventScript_15C799:: @ 815C799 faceplayer goto_if_set FLAG_TEMP_1, RusturfTunnel_EventScript_15C7BC setflag FLAG_TEMP_1 - msgbox RusturfTunnel_Text_1944C5, 4 + msgbox RusturfTunnel_Text_1944C5, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end RusturfTunnel_EventScript_15C7BC:: @ 815C7BC - msgbox RusturfTunnel_Text_1945B2, 4 + msgbox RusturfTunnel_Text_1945B2, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -58,14 +58,14 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 compare VAR_TEMP_1, 3 call_if_eq RusturfTunnel_EventScript_15C8EA call RusturfTunnel_EventScript_15C92D - msgbox RusturfTunnel_Text_19461D, 4 + msgbox RusturfTunnel_Text_19461D, MSGBOX_DEFAULT compare VAR_TEMP_1, 2 call_if_eq RusturfTunnel_EventScript_15C8EB compare VAR_TEMP_1, 3 call_if_eq RusturfTunnel_EventScript_15C8EB - giveitem_std ITEM_HM04_STRENGTH + giveitem ITEM_HM04_STRENGTH setflag FLAG_RECEIVED_HM04 - msgbox RusturfTunnel_Text_194693, 4 + msgbox RusturfTunnel_Text_194693, MSGBOX_DEFAULT closemessage compare VAR_TEMP_1, 1 call_if_eq RusturfTunnel_EventScript_15C880 @@ -73,7 +73,7 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 call_if_eq RusturfTunnel_EventScript_15C892 compare VAR_TEMP_1, 3 call_if_eq RusturfTunnel_EventScript_15C8AE - msgbox RusturfTunnel_Text_194706, 4 + msgbox RusturfTunnel_Text_194706, MSGBOX_DEFAULT closemessage compare VAR_TEMP_1, 1 call_if_eq RusturfTunnel_EventScript_15C8F7 @@ -81,36 +81,36 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 call_if_eq RusturfTunnel_EventScript_15C909 compare VAR_TEMP_1, 3 call_if_eq RusturfTunnel_EventScript_15C91B - call RusturfTunnel_EventScript_1A0442 + call RusturfTunnel_EventScript_SetRusturfTunnelOpen releaseall end RusturfTunnel_EventScript_15C880:: @ 815C880 - applymovement 255, RusturfTunnel_Movement_15C96A + applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_15C96A applymovement 1, RusturfTunnel_Movement_15C98F waitmovement 0 return RusturfTunnel_EventScript_15C892:: @ 815C892 - applymovement 255, RusturfTunnel_Movement_15C96D + applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_15C96D applymovement 1, RusturfTunnel_Movement_15C994 waitmovement 0 - applymovement 10, RusturfTunnel_Movement_1A0845 + applymovement 10, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return RusturfTunnel_EventScript_15C8AE:: @ 815C8AE - applymovement 255, RusturfTunnel_Movement_15C96D + applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_15C96D applymovement 1, RusturfTunnel_Movement_15C994 waitmovement 0 - applymovement 10, RusturfTunnel_Movement_1A0845 + applymovement 10, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return RusturfTunnel_EventScript_15C8CA:: @ 815C8CA - applymovement 1, RusturfTunnel_Movement_1A0841 + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - applymovement 255, RusturfTunnel_Movement_1A0845 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -148,9 +148,9 @@ RusturfTunnel_EventScript_15C91B:: @ 815C91B RusturfTunnel_EventScript_15C92D:: @ 815C92D playse SE_PIN - applymovement 1, RusturfTunnel_Movement_1A0833 + applymovement 1, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, RusturfTunnel_Movement_1A0835 + applymovement 1, Common_Movement_Delay48 waitmovement 0 return @@ -166,7 +166,7 @@ RusturfTunnel_Movement_15C945:: @ 815C945 walk_down walk_down walk_down - end_movement + step_end RusturfTunnel_Movement_15C951:: @ 815C951 walk_right @@ -180,41 +180,41 @@ RusturfTunnel_Movement_15C951:: @ 815C951 walk_down walk_down walk_down - end_movement + step_end @ 815C95D walk_left walk_in_place_fastest_right - end_movement + step_end @ 815C960 walk_down walk_in_place_fastest_up delay_8 walk_in_place_fastest_right - end_movement + step_end @ 815C965 walk_up walk_in_place_fastest_down delay_8 walk_in_place_fastest_right - end_movement + step_end RusturfTunnel_Movement_15C96A:: @ 815C96A walk_left walk_in_place_fastest_right - end_movement + step_end RusturfTunnel_Movement_15C96D:: @ 815C96D walk_right walk_in_place_fastest_left - end_movement + step_end RusturfTunnel_Movement_15C970:: @ 815C970 walk_up walk_in_place_fastest_right - end_movement + step_end RusturfTunnel_Movement_15C973:: @ 815C973 walk_right @@ -229,7 +229,7 @@ RusturfTunnel_Movement_15C973:: @ 815C973 walk_down walk_down walk_down - end_movement + step_end RusturfTunnel_Movement_15C980:: @ 815C980 walk_up @@ -244,25 +244,25 @@ RusturfTunnel_Movement_15C980:: @ 815C980 walk_down walk_down walk_down - end_movement + step_end RusturfTunnel_Movement_15C98D:: @ 815C98D walk_right - end_movement + step_end RusturfTunnel_Movement_15C98F:: @ 815C98F walk_in_place_fast_up walk_in_place_fast_up walk_fast_up walk_fast_right - end_movement + step_end RusturfTunnel_Movement_15C994:: @ 815C994 walk_in_place_fast_right walk_in_place_fast_right walk_fast_right walk_in_place_fastest_up - end_movement + step_end RusturfTunnel_EventScript_15C999:: @ 815C999 setvar VAR_TEMP_1, 1 @@ -278,7 +278,7 @@ RusturfTunnel_EventScript_15C9A5:: @ 815C9A5 RusturfTunnel_EventScript_15C9AB:: @ 815C9AB lockall - msgbox RusturfTunnel_Text_194159, 4 + msgbox RusturfTunnel_Text_194159, MSGBOX_DEFAULT closemessage applymovement 6, RusturfTunnel_Movement_15C9D3 applymovement 7, RusturfTunnel_Movement_15C9D3 @@ -293,14 +293,14 @@ RusturfTunnel_Movement_15C9D3:: @ 815C9D3 lock_facing_direction walk_right unlock_facing_direction - end_movement + step_end RusturfTunnel_EventScript_15C9D7:: @ 815C9D7 lock faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox RusturfTunnel_Text_194188, 4 + msgbox RusturfTunnel_Text_194188, MSGBOX_DEFAULT waitmoncry release end @@ -309,12 +309,12 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA lock faceplayer playbgm MUS_EVIL_TEAM, FALSE - msgbox RusturfTunnel_Text_19419B, 4 - trainerbattle 3, TRAINER_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243 - msgbox RusturfTunnel_Text_194274, 4 - giveitem_std ITEM_DEVON_GOODS + msgbox RusturfTunnel_Text_19419B, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_RUSTURF_TUNNEL_GRUNT, RusturfTunnel_Text_194243 + msgbox RusturfTunnel_Text_194274, MSGBOX_DEFAULT + giveitem ITEM_DEVON_GOODS closemessage - applymovement 255, RusturfTunnel_Movement_15CA99 + applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_15CA99 applymovement 6, RusturfTunnel_Movement_15CAA2 waitmovement 0 removeobject 6 @@ -322,11 +322,11 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA addobject 5 applymovement 5, RusturfTunnel_Movement_15CAAC waitmovement 0 - applymovement 255, RusturfTunnel_Movement_15CA9F + applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_15CA9F applymovement 5, RusturfTunnel_Movement_15CAC0 waitmovement 0 - msgbox RusturfTunnel_Text_19432A, 4 - applymovement 5, RusturfTunnel_Movement_1A0839 + msgbox RusturfTunnel_Text_19432A, MSGBOX_DEFAULT + applymovement 5, Common_Movement_FacePlayer waitmovement 0 message RusturfTunnel_Text_19434F waitmessage @@ -354,12 +354,12 @@ RusturfTunnel_Movement_15CA99:: @ 815CA99 walk_up unlock_facing_direction walk_in_place_fastest_left - end_movement + step_end RusturfTunnel_Movement_15CA9F:: @ 815CA9F walk_down walk_in_place_fastest_up - end_movement + step_end RusturfTunnel_Movement_15CAA2:: @ 815CAA2 walk_fast_left @@ -371,7 +371,7 @@ RusturfTunnel_Movement_15CAA2:: @ 815CAA2 walk_fast_left walk_fast_left walk_fast_left - end_movement + step_end RusturfTunnel_Movement_15CAAC:: @ 815CAAC walk_right @@ -381,7 +381,7 @@ RusturfTunnel_Movement_15CAAC:: @ 815CAAC walk_right walk_right walk_right - end_movement + step_end RusturfTunnel_Movement_15CAB4:: @ 815CAB4 walk_left @@ -395,12 +395,12 @@ RusturfTunnel_Movement_15CAB4:: @ 815CAB4 walk_left walk_left walk_left - end_movement + step_end RusturfTunnel_Movement_15CAC0:: @ 815CAC0 delay_16 walk_right - end_movement + step_end RusturfTunnel_Movement_15CAC3:: @ 815CAC3 walk_left @@ -412,9 +412,9 @@ RusturfTunnel_Movement_15CAC3:: @ 815CAC3 walk_left walk_left walk_left - end_movement + step_end RusturfTunnel_EventScript_15CACD:: @ 815CACD - trainerbattle 0, TRAINER_MIKE_2, 0, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2 - msgbox RusturfTunnel_Text_1948C4, 6 + trainerbattle_single TRAINER_MIKE_2, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2 + msgbox RusturfTunnel_Text_1948C4, MSGBOX_AUTOCLOSE end |