diff options
Diffstat (limited to 'data/maps/BattleTower_Outside/scripts.inc')
| -rw-r--r-- | data/maps/BattleTower_Outside/scripts.inc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/BattleTower_Outside/scripts.inc b/data/maps/BattleTower_Outside/scripts.inc index 680738272..0290737ce 100644 --- a/data/maps/BattleTower_Outside/scripts.inc +++ b/data/maps/BattleTower_Outside/scripts.inc @@ -1,5 +1,5 @@ BattleTower_Outside_MapScripts:: @ 8160156 - map_script 3, BattleTower_Outside_MapScript1_16015C + map_script MAP_SCRIPT_ON_TRANSITION, BattleTower_Outside_MapScript1_16015C .byte 0 BattleTower_Outside_MapScript1_16015C:: @ 816015C @@ -11,7 +11,7 @@ BattleTower_Outside_MapScript1_16015C:: @ 816015C BattleTower_Outside_EventScript_160168:: @ 8160168 lock faceplayer - msgbox BattleTower_Outside_Text_199D06, 4 + msgbox BattleTower_Outside_Text_199D06, MSGBOX_DEFAULT checkitem ITEM_SS_TICKET, 1 compare VAR_RESULT, 0 goto_if_eq BattleTower_Outside_EventScript_1601C6 @@ -30,7 +30,7 @@ BattleTower_Outside_EventScript_16018E:: @ 816018E end BattleTower_Outside_EventScript_1601C6:: @ 81601C6 - msgbox BattleTower_Outside_Text_199D40, 4 + msgbox BattleTower_Outside_Text_199D40, MSGBOX_DEFAULT release end @@ -38,7 +38,7 @@ BattleTower_Outside_EventScript_1601D0:: @ 81601D0 msgbox BattleTower_Outside_Text_199DF2, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq BattleTower_Outside_EventScript_160226 - msgbox BattleTower_Outside_Text_199E4B, 4 + msgbox BattleTower_Outside_Text_199E4B, MSGBOX_DEFAULT call BattleTower_Outside_EventScript_160232 warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate @@ -49,7 +49,7 @@ BattleTower_Outside_EventScript_1601FB:: @ 81601FB msgbox BattleTower_Outside_Text_199E0E, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq BattleTower_Outside_EventScript_160226 - msgbox BattleTower_Outside_Text_199E4B, 4 + msgbox BattleTower_Outside_Text_199E4B, MSGBOX_DEFAULT call BattleTower_Outside_EventScript_160232 warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate @@ -64,31 +64,31 @@ BattleTower_Outside_EventScript_160226:: @ 8160226 BattleTower_Outside_EventScript_160232:: @ 8160232 closemessage - applymovement VAR_LAST_TALKED, BattleTower_Outside_Movement_1A0845 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 hideobjectat 5, MAP_BATTLE_TOWER_OUTSIDE setvar VAR_0x8004, 4 - call BattleTower_Outside_EventScript_1A047C + call Common_EventScript_FerryDepartIsland return BattleTower_Outside_EventScript_160250:: @ 8160250 - msgbox BattleTower_Outside_Text_199E29, 4 + msgbox BattleTower_Outside_Text_199E29, MSGBOX_DEFAULT release end BattleTower_Outside_EventScript_16025A:: @ 816025A - msgbox BattleTower_Outside_Text_199C6F, 3 + msgbox BattleTower_Outside_Text_199C6F, MSGBOX_SIGN end BattleTower_Outside_EventScript_160263:: @ 8160263 - msgbox BattleTower_Outside_Text_199CA4, 2 + msgbox BattleTower_Outside_Text_199CA4, MSGBOX_NPC end BattleTower_Outside_EventScript_16026C:: @ 816026C - msgbox BattleTower_Outside_Text_199E9C, 2 + msgbox BattleTower_Outside_Text_199E9C, MSGBOX_NPC end BattleTower_Outside_EventScript_160275:: @ 8160275 - msgbox BattleTower_Outside_Text_199ED4, 2 + msgbox BattleTower_Outside_Text_199ED4, MSGBOX_NPC end |