diff options
Diffstat (limited to 'data/maps/RusturfTunnel/scripts.inc')
| -rw-r--r-- | data/maps/RusturfTunnel/scripts.inc | 66 |
1 files changed, 36 insertions, 30 deletions
diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 853b94fc7..a342135bf 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -1,3 +1,9 @@ +.equ LOCALID_WANDAS_BF, 1 +.set LOCALID_BRINEY, 5 +.set LOCALID_GRUNT, 6 +.set LOCALID_PEEKO, 7 +.equ LOCALID_WANDA, 10 + RusturfTunnel_MapScripts:: @ 822CE27 map_script MAP_SCRIPT_ON_TRANSITION, RusturfTunnel_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, RusturfTunnel_OnFrame @@ -14,8 +20,8 @@ RusturfTunnel_OnTransition: @ 822CE44 end RusturfTunnel_EventScript_SetAquaGruntAndPeekoPos:: @ 822CE50 - setobjectxyperm 7, 13, 4 - setobjectxyperm 6, 13, 5 + setobjectxyperm LOCALID_PEEKO, 13, 4 + setobjectxyperm LOCALID_GRUNT, 13, 5 return RusturfTunnel_EventScript_Wanda:: @ 822CE5F @@ -86,35 +92,35 @@ RusturfTunnel_EventScript_ClearTunnelScene:: @ 822CEAE RusturfTunnel_EventScript_BoyfriendApproachWanda1:: @ 822CF5D applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend1 - applymovement 1, RusturfTunnel_Movement_BoyfriendApproachWanda1 + applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_BoyfriendApproachWanda1 waitmovement 0 return RusturfTunnel_EventScript_BoyfriendApproachWanda2:: @ 822CF6F applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend - applymovement 1, RusturfTunnel_Movement_BoyfriendApproachWanda + applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_BoyfriendApproachWanda waitmovement 0 - applymovement 10, Common_Movement_WalkInPlaceFastestDown + applymovement LOCALID_WANDA, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return RusturfTunnel_EventScript_BoyfriendApproachWanda3:: @ 822CF8B applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend - applymovement 1, RusturfTunnel_Movement_BoyfriendApproachWanda + applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_BoyfriendApproachWanda waitmovement 0 - applymovement 10, Common_Movement_WalkInPlaceFastestDown + applymovement LOCALID_WANDA, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return RusturfTunnel_EventScript_FaceWandasBoyfriend1:: @ 822CFA7 - applymovement 1, Common_Movement_WalkInPlaceFastestUp + applymovement LOCALID_WANDAS_BF, Common_Movement_WalkInPlaceFastestUp waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return RusturfTunnel_EventScript_FaceWandasBoyfriend2:: @ 822CFBC - applymovement 1, RusturfTunnel_Movement_BoyfriendFaceRight + applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_BoyfriendFaceRight waitmovement 0 return @@ -123,28 +129,28 @@ RusturfTunnel_EventScript_FaceWandasBoyfriend3:: @ 822CFC7 RusturfTunnel_EventScript_WandasBoyfriendApproachPlayer:: @ 822CFC8 closemessage - applymovement 1, RusturfTunnel_Movement_WandasBoyfriendApproachPlayer + applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_WandasBoyfriendApproachPlayer waitmovement 0 return RusturfTunnel_EventScript_WandaAndBoyfriendExit1:: @ 822CFD4 - applymovement 10, RusturfTunnel_Movement_WandaExit1 - applymovement 1, RusturfTunnel_Movement_WandasBoyfriendExit1 + applymovement LOCALID_WANDA, RusturfTunnel_Movement_WandaExit1 + applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_WandasBoyfriendExit1 waitmovement 0 return RusturfTunnel_EventScript_WandaAndBoyfriendExit:: @ 822CFE6 applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchWandaExit - applymovement 10, RusturfTunnel_Movement_WandaExit - applymovement 1, RusturfTunnel_Movement_WandasBoyfriendExit + applymovement LOCALID_WANDA, RusturfTunnel_Movement_WandaExit + applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_WandasBoyfriendExit waitmovement 0 return RusturfTunnel_EventScript_WandasBoyfriendNotice:: @ 822CFFF playse SE_PIN - applymovement 1, Common_Movement_ExclamationMark + applymovement LOCALID_WANDAS_BF, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, Common_Movement_Delay48 + applymovement LOCALID_WANDAS_BF, Common_Movement_Delay48 waitmovement 0 return @@ -282,11 +288,11 @@ RusturfTunnel_EventScript_AquaGruntBackUp:: @ 822D083 lockall msgbox RusturfTunnel_Text_ComeAndGetSome, MSGBOX_DEFAULT closemessage - applymovement 6, RusturfTunnel_Movement_GruntAndPeekoBackUp - applymovement 7, RusturfTunnel_Movement_GruntAndPeekoBackUp + applymovement LOCALID_GRUNT, RusturfTunnel_Movement_GruntAndPeekoBackUp + applymovement LOCALID_PEEKO, RusturfTunnel_Movement_GruntAndPeekoBackUp waitmovement 0 - copyobjectxytoperm 6 - copyobjectxytoperm 7 + copyobjectxytoperm LOCALID_GRUNT + copyobjectxytoperm LOCALID_PEEKO setvar VAR_RUSTURF_TUNNEL_STATE, 3 releaseall end @@ -317,18 +323,18 @@ RusturfTunnel_EventScript_Grunt:: @ 822D0C2 giveitem ITEM_DEVON_GOODS closemessage applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PushPlayerAsideForGrunt - applymovement 6, RusturfTunnel_Movement_GruntEscape + applymovement LOCALID_GRUNT, RusturfTunnel_Movement_GruntEscape waitmovement 0 - removeobject 6 + removeobject LOCALID_GRUNT delay 50 - addobject 5 - applymovement 5, RusturfTunnel_Movement_BrineyApproachPeeko1 + addobject LOCALID_BRINEY + applymovement LOCALID_BRINEY, RusturfTunnel_Movement_BrineyApproachPeeko1 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerMoveAsideForBriney - applymovement 5, RusturfTunnel_Movement_BrineyApproachPeeko2 + applymovement LOCALID_BRINEY, RusturfTunnel_Movement_BrineyApproachPeeko2 waitmovement 0 msgbox RusturfTunnel_Text_PeekoGladToSeeYouSafe, MSGBOX_DEFAULT - applymovement 5, Common_Movement_FacePlayer + applymovement LOCALID_BRINEY, Common_Movement_FacePlayer waitmovement 0 message RusturfTunnel_Text_ThankYouLetsGoHomePeeko waitmessage @@ -338,11 +344,11 @@ RusturfTunnel_EventScript_Grunt:: @ 822D0C2 waitmoncry closemessage applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBrineyExit - applymovement 5, RusturfTunnel_Movement_BrineyExit - applymovement 7, RusturfTunnel_Movement_PeekoExit + applymovement LOCALID_BRINEY, RusturfTunnel_Movement_BrineyExit + applymovement LOCALID_PEEKO, RusturfTunnel_Movement_PeekoExit waitmovement 0 - removeobject 5 - removeobject 7 + removeobject LOCALID_BRINEY + removeobject LOCALID_PEEKO clearflag FLAG_DEVON_GOODS_STOLEN setflag FLAG_RECOVERED_DEVON_GOODS setvar VAR_RUSTBORO_CITY_STATE, 4 |