diff options
Diffstat (limited to 'data/maps/SlateportCity_Harbor/scripts.inc')
| -rw-r--r-- | data/maps/SlateportCity_Harbor/scripts.inc | 94 |
1 files changed, 47 insertions, 47 deletions
diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 76f9379b1..9c815ffb3 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -1,5 +1,5 @@ SlateportCity_Harbor_MapScripts:: @ 8155F5D - map_script 3, SlateportCity_Harbor_MapScript1_155F63 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_Harbor_MapScript1_155F63 .byte 0 SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 @@ -42,17 +42,17 @@ SlateportCity_Harbor_EventScript_155FB3:: @ 8155FB3 SlateportCity_Harbor_EventScript_155FBF:: @ 8155FBF lockall setvar VAR_0x8008, 3 - applymovement 255, SlateportCity_Harbor_Movement_1560C2 + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Harbor_Movement_1560C2 waitmovement 0 goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 - applymovement 7, SlateportCity_Harbor_Movement_1A0845 + applymovement 7, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement 255, SlateportCity_Harbor_Movement_1A0841 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox SlateportCity_Harbor_Text_17FD7D, 4 + msgbox SlateportCity_Harbor_Text_17FD7D, MSGBOX_DEFAULT closemessage applymovement 6, SlateportCity_Harbor_Movement_15609B applymovement 7, SlateportCity_Harbor_Movement_15609B @@ -70,7 +70,7 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 call_if_eq SlateportCity_Harbor_EventScript_156086 compare VAR_0x8008, 3 call_if_eq SlateportCity_Harbor_EventScript_156086 - msgbox SlateportCity_Harbor_Text_17FE60, 4 + msgbox SlateportCity_Harbor_Text_17FE60, MSGBOX_DEFAULT closemessage setflag FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT setflag FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT @@ -82,21 +82,21 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 SlateportCity_Harbor_EventScript_15605C:: @ 815605C applymovement 4, SlateportCity_Harbor_Movement_1560B3 waitmovement 0 - applymovement 255, SlateportCity_Harbor_Movement_1A0845 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return SlateportCity_Harbor_EventScript_156071:: @ 8156071 applymovement 4, SlateportCity_Harbor_Movement_1560B9 waitmovement 0 - applymovement 255, SlateportCity_Harbor_Movement_1A0843 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return SlateportCity_Harbor_EventScript_156086:: @ 8156086 applymovement 4, SlateportCity_Harbor_Movement_1560BE waitmovement 0 - applymovement 255, SlateportCity_Harbor_Movement_1A0843 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -105,14 +105,14 @@ SlateportCity_Harbor_Movement_15609B:: @ 815609B delay_16 jump_up set_invisible - end_movement + step_end @ 81560A0 delay_16 delay_16 jump_up set_invisible - end_movement + step_end SlateportCity_Harbor_Movement_1560A5:: @ 81560A5 delay_16 @@ -128,7 +128,7 @@ SlateportCity_Harbor_Movement_1560A5:: @ 81560A5 walk_fast_right walk_fast_right walk_fast_right - end_movement + step_end SlateportCity_Harbor_Movement_1560B3:: @ 81560B3 walk_left @@ -136,35 +136,35 @@ SlateportCity_Harbor_Movement_1560B3:: @ 81560B3 walk_left walk_left walk_up - end_movement + step_end SlateportCity_Harbor_Movement_1560B9:: @ 81560B9 walk_left walk_left walk_up walk_left - end_movement + step_end SlateportCity_Harbor_Movement_1560BE:: @ 81560BE walk_left walk_left walk_left - end_movement + step_end SlateportCity_Harbor_Movement_1560C2:: @ 81560C2 walk_up - end_movement + step_end SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4 lock faceplayer goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_1560D9 - msgbox SlateportCity_Harbor_Text_17FA0A, 4 + msgbox SlateportCity_Harbor_Text_17FA0A, MSGBOX_DEFAULT release end SlateportCity_Harbor_EventScript_1560D9:: @ 81560D9 - msgbox SlateportCity_Harbor_Text_17FA73, 4 + msgbox SlateportCity_Harbor_Text_17FA73, MSGBOX_DEFAULT checkitem ITEM_SS_TICKET, 1 compare VAR_RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_156135 @@ -183,7 +183,7 @@ SlateportCity_Harbor_EventScript_1560FD:: @ 81560FD end SlateportCity_Harbor_EventScript_156135:: @ 8156135 - msgbox SlateportCity_Harbor_Text_17FAAD, 4 + msgbox SlateportCity_Harbor_Text_17FAAD, MSGBOX_DEFAULT release end @@ -215,9 +215,9 @@ SlateportCity_Harbor_EventScript_15618A:: @ 815618A end SlateportCity_Harbor_EventScript_156196:: @ 8156196 - msgbox SlateportCity_Harbor_Text_17FBB6, 4 + msgbox SlateportCity_Harbor_Text_17FBB6, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_1A0841 + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR @@ -226,41 +226,41 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 compare VAR_FACING, 4 call_if_eq SlateportCity_Harbor_EventScript_1561E4 delay 30 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY setvar VAR_0x8004, 5 - call SlateportCity_Harbor_EventScript_1A040E + call Common_EventScript_FerryDepart return SlateportCity_Harbor_EventScript_1561DA:: @ 81561DA - msgbox SlateportCity_Harbor_Text_17FB5F, 4 + msgbox SlateportCity_Harbor_Text_17FB5F, MSGBOX_DEFAULT release end SlateportCity_Harbor_EventScript_1561E4:: @ 81561E4 - applymovement 255, SlateportCity_Harbor_Movement_1561FA + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Harbor_Movement_1561FA waitmovement 0 return SlateportCity_Harbor_EventScript_1561EF:: @ 81561EF - applymovement 255, SlateportCity_Harbor_Movement_1561FD + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Harbor_Movement_1561FD waitmovement 0 return SlateportCity_Harbor_Movement_1561FA:: @ 81561FA walk_right walk_in_place_fastest_up - end_movement + step_end SlateportCity_Harbor_Movement_1561FD:: @ 81561FD walk_up - end_movement + step_end SlateportCity_Harbor_EventScript_1561FF:: @ 81561FF - msgbox SlateportCity_Harbor_Text_17FC07, 2 + msgbox SlateportCity_Harbor_Text_17FC07, MSGBOX_NPC end SlateportCity_Harbor_EventScript_156208:: @ 8156208 - msgbox SlateportCity_Harbor_Text_17FC7C, 2 + msgbox SlateportCity_Harbor_Text_17FC7C, MSGBOX_NPC end SlateportCity_Harbor_EventScript_156211:: @ 8156211 @@ -271,26 +271,26 @@ SlateportCity_Harbor_EventScript_156211:: @ 8156211 goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, SlateportCity_Harbor_EventScript_156258 compare VAR_SLATEPORT_HARBOR_STATE, 2 goto_if_eq SlateportCity_Harbor_EventScript_15624E - msgbox SlateportCity_Harbor_Text_17FD1C, 4 + msgbox SlateportCity_Harbor_Text_17FD1C, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_1A083D + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end SlateportCity_Harbor_EventScript_15624E:: @ 815624E - msgbox SlateportCity_Harbor_Text_17FE60, 4 + msgbox SlateportCity_Harbor_Text_17FE60, MSGBOX_DEFAULT release end SlateportCity_Harbor_EventScript_156258:: @ 8156258 setflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE - msgbox SlateportCity_Harbor_Text_17FF35, 4 + msgbox SlateportCity_Harbor_Text_17FF35, MSGBOX_DEFAULT release end SlateportCity_Harbor_EventScript_156265:: @ 8156265 - msgbox SlateportCity_Harbor_Text_1800A0, 4 + msgbox SlateportCity_Harbor_Text_1800A0, MSGBOX_DEFAULT release end @@ -301,12 +301,12 @@ SlateportCity_Harbor_EventScript_15626F:: @ 815626F compare VAR_RESULT, 1 goto_if_eq SlateportCity_Harbor_EventScript_1562A7 goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_15629D - msgbox SlateportCity_Harbor_Text_18017B, 4 + msgbox SlateportCity_Harbor_Text_18017B, MSGBOX_DEFAULT release end SlateportCity_Harbor_EventScript_15629D:: @ 815629D - msgbox SlateportCity_Harbor_Text_1801EA, 4 + msgbox SlateportCity_Harbor_Text_1801EA, MSGBOX_DEFAULT release end @@ -329,11 +329,11 @@ SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA msgbox SlateportCity_Harbor_Text_1803DD, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq SlateportCity_Harbor_EventScript_156374 - giveitem_std ITEM_DEEP_SEA_TOOTH + giveitem ITEM_DEEP_SEA_TOOTH compare VAR_RESULT, 0 - goto_if_eq SlateportCity_Harbor_EventScript_1A029B - takeitem ITEM_SCANNER, 1 - msgbox SlateportCity_Harbor_Text_18046B, 4 + goto_if_eq Common_EventScript_ShowBagIsFull + removeitem ITEM_SCANNER + msgbox SlateportCity_Harbor_Text_18046B, MSGBOX_DEFAULT setflag FLAG_EXCHANGED_SCANNER goto SlateportCity_Harbor_EventScript_156380 end @@ -342,17 +342,17 @@ SlateportCity_Harbor_EventScript_15632A:: @ 815632A msgbox SlateportCity_Harbor_Text_180412, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq SlateportCity_Harbor_EventScript_156374 - giveitem_std ITEM_DEEP_SEA_SCALE + giveitem ITEM_DEEP_SEA_SCALE compare VAR_RESULT, 0 - goto_if_eq SlateportCity_Harbor_EventScript_1A029B - takeitem ITEM_SCANNER, 1 - msgbox SlateportCity_Harbor_Text_18046B, 4 + goto_if_eq Common_EventScript_ShowBagIsFull + removeitem ITEM_SCANNER + msgbox SlateportCity_Harbor_Text_18046B, MSGBOX_DEFAULT setflag FLAG_EXCHANGED_SCANNER goto SlateportCity_Harbor_EventScript_156380 end SlateportCity_Harbor_EventScript_15636A:: @ 815636A - msgbox SlateportCity_Harbor_Text_180360, 4 + msgbox SlateportCity_Harbor_Text_180360, MSGBOX_DEFAULT release end @@ -364,6 +364,6 @@ SlateportCity_Harbor_EventScript_156374:: @ 8156374 SlateportCity_Harbor_EventScript_156380:: @ 8156380 setvar VAR_TEMP_1, 1 - msgbox SlateportCity_Harbor_Text_180491, 4 + msgbox SlateportCity_Harbor_Text_180491, MSGBOX_DEFAULT release end |