diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-10 16:55:58 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-11 00:47:47 -0500 |
| commit | 0bb7f18b8e609f76a9021420470737bbd16cc2bd (patch) | |
| tree | a7c9d6efbc2588c3b73b59d55012386958373ae5 /data/maps/FourIsland_PokemonCenter_2F | |
| parent | a5375776714b126dbe478a4f535392373f3ba9f0 (diff) | |
Sync Cable Club scripts
Diffstat (limited to 'data/maps/FourIsland_PokemonCenter_2F')
| -rw-r--r-- | data/maps/FourIsland_PokemonCenter_2F/map.json | 10 | ||||
| -rw-r--r-- | data/maps/FourIsland_PokemonCenter_2F/scripts.inc | 13 |
2 files changed, 12 insertions, 11 deletions
diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json index 53d8c630e..af9538b03 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/map.json +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_PokemonCenter_2F_EventScript_1A8CF6", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_PokemonCenter_2F_EventScript_1A8CFC", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_PokemonCenter_2F_EventScript_1A8D02", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -78,14 +78,14 @@ "x": 5, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_04", + "dest_map": "MAP_UNION_ROOM", "dest_warp_id": 0 }, { "x": 9, "y": 1, "elevation": 0, - "dest_map": "MAP_UNKNOWN_MAP_00_01", + "dest_map": "MAP_TRADE_CENTER", "dest_warp_id": 0 } ], diff --git a/data/maps/FourIsland_PokemonCenter_2F/scripts.inc b/data/maps/FourIsland_PokemonCenter_2F/scripts.inc index c3742867c..a8cc194aa 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/FourIsland_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ FourIsland_PokemonCenter_2F_MapScripts:: @ 8171C1D map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -FourIsland_PokemonCenter_2F_EventScript_171C32:: @ 8171C32 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +FourIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8171C32 + call CableClub_EventScript_Colosseum end -EventScript_171C38:: @ 8171C38 - call EventScript_1BB6AB +FourIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8171C38 + call CableClub_EventScript_TradeCenter end -EventScript_171C3E:: @ 8171C3E - call EventScript_1BB7DE +FourIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171C3E + call CableClub_EventScript_RecordCorner end |