diff options
Diffstat (limited to 'data/maps/RustboroCity_DevonCorp_3F/scripts.inc')
| -rw-r--r-- | data/maps/RustboroCity_DevonCorp_3F/scripts.inc | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index e8d2f4d68..0a2cd2117 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -1,7 +1,7 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 8157711 - map_script 3, RustboroCity_DevonCorp_3F_MapScript1_157721 - map_script 4, RustboroCity_DevonCorp_3F_MapScript2_157739 - map_script 2, RustboroCity_DevonCorp_3F_MapScript2_157748 + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_3F_MapScript1_157721 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_DevonCorp_3F_MapScript2_157739 + map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_DevonCorp_3F_MapScript2_157748 .byte 0 RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721 @@ -19,7 +19,7 @@ RustboroCity_DevonCorp_3F_MapScript2_157739:: @ 8157739 .2byte 0 RustboroCity_DevonCorp_3F_EventScript_157743:: @ 8157743 - turnobject 255, 4 + turnobject OBJ_EVENT_ID_PLAYER, 4 end RustboroCity_DevonCorp_3F_MapScript2_157748:: @ 8157748 @@ -28,35 +28,35 @@ RustboroCity_DevonCorp_3F_MapScript2_157748:: @ 8157748 RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 lockall - msgbox RustboroCity_DevonCorp_3F_Text_18374C, 4 + msgbox RustboroCity_DevonCorp_3F_Text_18374C, MSGBOX_DEFAULT closemessage applymovement 2, RustboroCity_DevonCorp_3F_Movement_157815 waitmovement 0 delay 80 applymovement 2, RustboroCity_DevonCorp_3F_Movement_15781E waitmovement 0 - msgbox RustboroCity_DevonCorp_3F_Text_183903, 4 + msgbox RustboroCity_DevonCorp_3F_Text_183903, MSGBOX_DEFAULT closemessage playbgm MUS_TSURETEK, FALSE applymovement 2, RustboroCity_DevonCorp_3F_Movement_157803 - applymovement 255, RustboroCity_DevonCorp_3F_Movement_157827 + applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_157827 waitmovement 0 - msgbox RustboroCity_DevonCorp_3F_Text_18394A, 4 + msgbox RustboroCity_DevonCorp_3F_Text_18394A, MSGBOX_DEFAULT closemessage fadedefaultbgm applymovement 2, RustboroCity_DevonCorp_3F_Movement_157812 - applymovement 255, RustboroCity_DevonCorp_3F_Movement_157835 + applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_157835 waitmovement 0 - msgbox RustboroCity_DevonCorp_3F_Text_18320B, 4 - giveitem_std ITEM_LETTER - msgbox RustboroCity_DevonCorp_3F_Text_18337E, 4 + msgbox RustboroCity_DevonCorp_3F_Text_18320B, MSGBOX_DEFAULT + giveitem ITEM_LETTER + msgbox RustboroCity_DevonCorp_3F_Text_18337E, MSGBOX_DEFAULT playfanfare MUS_FANFA4 message RustboroCity_DevonCorp_3F_Text_183422 waitfanfare waitmessage setflag FLAG_SYS_POKENAV_GET setflag FLAG_RECEIVED_POKENAV - msgbox RustboroCity_DevonCorp_3F_Text_183439, 4 + msgbox RustboroCity_DevonCorp_3F_Text_183439, MSGBOX_DEFAULT setflag FLAG_HIDE_TUNNER_DIGGER_ROUTE116 clearflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL clearflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL @@ -73,7 +73,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 walk_up walk_up walk_in_place_fastest_left - end_movement + step_end RustboroCity_DevonCorp_3F_Movement_157803:: @ 8157803 walk_right @@ -90,12 +90,12 @@ RustboroCity_DevonCorp_3F_Movement_157803:: @ 8157803 walk_right walk_right walk_in_place_fastest_left - end_movement + step_end RustboroCity_DevonCorp_3F_Movement_157812:: @ 8157812 delay_16 walk_in_place_fastest_down - end_movement + step_end RustboroCity_DevonCorp_3F_Movement_157815:: @ 8157815 walk_right @@ -106,7 +106,7 @@ RustboroCity_DevonCorp_3F_Movement_157815:: @ 8157815 walk_right walk_right walk_right - end_movement + step_end RustboroCity_DevonCorp_3F_Movement_15781E:: @ 815781E walk_left @@ -117,7 +117,7 @@ RustboroCity_DevonCorp_3F_Movement_15781E:: @ 815781E walk_left walk_left walk_left - end_movement + step_end RustboroCity_DevonCorp_3F_Movement_157827:: @ 8157827 walk_right @@ -133,7 +133,7 @@ RustboroCity_DevonCorp_3F_Movement_157827:: @ 8157827 walk_right walk_right walk_right - end_movement + step_end RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835 delay_16 @@ -141,37 +141,37 @@ RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835 walk_down walk_down walk_in_place_fastest_right - end_movement + step_end RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B lock faceplayer goto_if_set FLAG_RECEIVED_EXP_SHARE, RustboroCity_DevonCorp_3F_EventScript_15789B goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_157864 - msgbox RustboroCity_DevonCorp_3F_Text_18351E, 4 + msgbox RustboroCity_DevonCorp_3F_Text_18351E, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 - msgbox RustboroCity_DevonCorp_3F_Text_18353E, 4 - giveitem_std ITEM_EXP_SHARE + msgbox RustboroCity_DevonCorp_3F_Text_18353E, MSGBOX_DEFAULT + giveitem ITEM_EXP_SHARE compare VAR_RESULT, 0 - goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_EXP_SHARE - msgbox RustboroCity_DevonCorp_3F_Text_1835B3, 4 + msgbox RustboroCity_DevonCorp_3F_Text_1835B3, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end RustboroCity_DevonCorp_3F_EventScript_15789B:: @ 815789B - msgbox RustboroCity_DevonCorp_3F_Text_18368D, 4 + msgbox RustboroCity_DevonCorp_3F_Text_18368D, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -180,15 +180,15 @@ RustboroCity_DevonCorp_3F_EventScript_1578B0:: @ 81578B0 lock faceplayer goto_if_set FLAG_RECEIVED_REPEAT_BALL, RustboroCity_DevonCorp_3F_EventScript_1578C5 - msgbox RustboroCity_DevonCorp_3F_Text_18395C, 4 + msgbox RustboroCity_DevonCorp_3F_Text_18395C, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_3F_EventScript_1578C5:: @ 81578C5 - msgbox RustboroCity_DevonCorp_3F_Text_1839A3, 4 + msgbox RustboroCity_DevonCorp_3F_Text_1839A3, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_3F_EventScript_1578CF:: @ 81578CF - msgbox RustboroCity_DevonCorp_3F_Text_183A04, 3 + msgbox RustboroCity_DevonCorp_3F_Text_183A04, MSGBOX_SIGN end |