diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-05-06 15:09:46 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-05-06 15:09:46 -0400 |
| commit | d53c3741ab0582d757cd5735a82dc8f5b603a52a (patch) | |
| tree | e42c130902c0590740f56a43424480f5a1526e3e /data/maps | |
| parent | b230178cdb0f4261cb9a608ec94183c5873f59fa (diff) | |
Sync common ferry scripts
Diffstat (limited to 'data/maps')
| -rw-r--r-- | data/maps/BattleTower_Outside/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/LilycoveCity_Harbor/scripts.inc | 4 | ||||
| -rw-r--r-- | data/maps/PetalburgCity_Gym/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/RusturfTunnel/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/SlateportCity_Harbor/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/SouthernIsland_Exterior/scripts.inc | 6 |
6 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/BattleTower_Outside/scripts.inc b/data/maps/BattleTower_Outside/scripts.inc index cb21e1d25..0290737ce 100644 --- a/data/maps/BattleTower_Outside/scripts.inc +++ b/data/maps/BattleTower_Outside/scripts.inc @@ -69,7 +69,7 @@ BattleTower_Outside_EventScript_160232:: @ 8160232 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 diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 7c1b34e61..2fb9bea30 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -86,7 +86,7 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A delay 30 hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY setvar VAR_0x8004, 2 - call LilycoveCity_Harbor_EventScript_1A040E + call Common_EventScript_FerryDepart return LilycoveCity_Harbor_EventScript_1599CE:: @ 81599CE @@ -133,7 +133,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY special ScrSpecial_HealPlayerParty setvar VAR_0x8004, 2 - call LilycoveCity_Harbor_EventScript_1A040E + call Common_EventScript_FerryDepart warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 waitstate release diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 90c24740d..07e1394a7 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -390,7 +390,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 setflag FLAG_DEFEATED_PETALBURG_GYM setvar VAR_PETALBURG_GYM_STATE, 7 setflag FLAG_BADGE05_GET - call PetalburgCity_Gym_EventScript_1A0424 + call EventScript_HideMrBriney setflag FLAG_HIDE_WATTSON_MAUVILLE_GYM clearflag FLAG_HIDE_WATTSON_MAUVILLE setvar VAR_0x8008, 5 diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index a48b1a1c1..9cb8bb595 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -81,7 +81,7 @@ 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 diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index a47ef248c..9c815ffb3 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -228,7 +228,7 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 delay 30 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 diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index 3f0454bbb..0e266bcce 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -19,7 +19,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 delay 30 hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR setvar VAR_0x8004, 2 - call SouthernIsland_Exterior_EventScript_1A047C + call Common_EventScript_FerryDepartIsland warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release @@ -30,12 +30,12 @@ SouthernIsland_Exterior_EventScript_160B25:: @ 8160B25 release end -BattleTower_Outside_EventScript_160B2F:: @ 8160B2F +Ferry_EventScript_DepartIslandSouth:: @ 8160B2F applymovement OBJ_EVENT_ID_PLAYER, BattleTower_Outside_Movement_160B45 waitmovement 0 return -BattleTower_Outside_EventScript_160B3A:: @ 8160B3A +Ferry_EventScript_DepartIslandWest:: @ 8160B3A applymovement OBJ_EVENT_ID_PLAYER, BattleTower_Outside_Movement_160B47 waitmovement 0 return |