From 0bb7f18b8e609f76a9021420470737bbd16cc2bd Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 10 Jan 2020 16:55:58 -0500 Subject: Sync Cable Club scripts --- data/maps/BattleColosseum2P/map.json | 67 ++++++++++ data/maps/BattleColosseum2P/scripts.inc | 2 + data/maps/BattleColosseum4P/map.json | 85 ++++++++++++ data/maps/BattleColosseum4P/scripts.inc | 2 + data/maps/CeladonCity_PokemonCenter_1F/scripts.inc | 2 +- data/maps/CeladonCity_PokemonCenter_2F/map.json | 10 +- data/maps/CeladonCity_PokemonCenter_2F/scripts.inc | 13 +- .../maps/CeruleanCity_PokemonCenter_1F/scripts.inc | 2 +- data/maps/CeruleanCity_PokemonCenter_2F/map.json | 10 +- .../maps/CeruleanCity_PokemonCenter_2F/scripts.inc | 13 +- .../CinnabarIsland_PokemonCenter_1F/scripts.inc | 2 +- data/maps/CinnabarIsland_PokemonCenter_2F/map.json | 10 +- .../CinnabarIsland_PokemonCenter_2F/scripts.inc | 13 +- data/maps/FiveIsland_PokemonCenter_1F/scripts.inc | 2 +- data/maps/FiveIsland_PokemonCenter_2F/map.json | 10 +- data/maps/FiveIsland_PokemonCenter_2F/scripts.inc | 13 +- data/maps/FourIsland_PokemonCenter_1F/scripts.inc | 2 +- data/maps/FourIsland_PokemonCenter_2F/map.json | 10 +- data/maps/FourIsland_PokemonCenter_2F/scripts.inc | 13 +- data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc | 2 +- data/maps/FuchsiaCity_PokemonCenter_2F/map.json | 10 +- data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc | 13 +- .../IndigoPlateau_PokemonCenter_1F/scripts.inc | 2 +- data/maps/IndigoPlateau_PokemonCenter_2F/map.json | 10 +- .../IndigoPlateau_PokemonCenter_2F/scripts.inc | 13 +- .../maps/LavenderTown_PokemonCenter_1F/scripts.inc | 2 +- data/maps/LavenderTown_PokemonCenter_2F/map.json | 10 +- .../maps/LavenderTown_PokemonCenter_2F/scripts.inc | 13 +- .../maps/OneIsland_KindleRoad_EmberSpa/scripts.inc | 2 +- data/maps/OneIsland_PokemonCenter_1F/scripts.inc | 2 +- data/maps/OneIsland_PokemonCenter_2F/map.json | 10 +- data/maps/OneIsland_PokemonCenter_2F/scripts.inc | 13 +- data/maps/PalletTown_ProfessorOaksLab/scripts.inc | 2 +- data/maps/PewterCity_PokemonCenter_1F/scripts.inc | 2 +- data/maps/PewterCity_PokemonCenter_2F/map.json | 10 +- data/maps/PewterCity_PokemonCenter_2F/scripts.inc | 13 +- data/maps/PokemonTower_5F/scripts.inc | 2 +- data/maps/RecordCenter/map.json | 99 ++++++++++++++ data/maps/RecordCenter/scripts.inc | 2 + data/maps/Route10_PokemonCenter_1F/scripts.inc | 2 +- data/maps/Route10_PokemonCenter_2F/map.json | 10 +- data/maps/Route10_PokemonCenter_2F/scripts.inc | 13 +- data/maps/Route4_PokemonCenter_1F/scripts.inc | 2 +- data/maps/Route4_PokemonCenter_2F/map.json | 10 +- data/maps/Route4_PokemonCenter_2F/scripts.inc | 13 +- data/maps/SaffronCity_PokemonCenter_1F/scripts.inc | 2 +- data/maps/SaffronCity_PokemonCenter_2F/map.json | 10 +- data/maps/SaffronCity_PokemonCenter_2F/scripts.inc | 13 +- data/maps/SevenIsland_House_Room1/scripts.inc | 2 +- data/maps/SevenIsland_House_Room2/scripts.inc | 2 +- data/maps/SevenIsland_PokemonCenter_1F/scripts.inc | 2 +- data/maps/SevenIsland_PokemonCenter_2F/map.json | 10 +- data/maps/SevenIsland_PokemonCenter_2F/scripts.inc | 13 +- .../SevenIsland_TrainerTower_Lobby/scripts.inc | 2 +- data/maps/SixIsland_PokemonCenter_1F/scripts.inc | 2 +- data/maps/SixIsland_PokemonCenter_2F/map.json | 10 +- data/maps/SixIsland_PokemonCenter_2F/scripts.inc | 13 +- data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc | 2 +- data/maps/ThreeIsland_PokemonCenter_2F/map.json | 10 +- data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc | 13 +- data/maps/TradeCenter/map.json | 67 ++++++++++ data/maps/TradeCenter/scripts.inc | 2 + data/maps/TwoIsland_JoyfulGameCorner/map.json | 4 +- data/maps/TwoIsland_JoyfulGameCorner/scripts.inc | 4 +- data/maps/TwoIsland_PokemonCenter_1F/scripts.inc | 2 +- data/maps/TwoIsland_PokemonCenter_2F/map.json | 10 +- data/maps/TwoIsland_PokemonCenter_2F/scripts.inc | 13 +- data/maps/UnionRoom/map.json | 145 +++++++++++++++++++++ data/maps/UnionRoom/scripts.inc | 106 +++++++++++++++ data/maps/UnknownMap_00_00/map.json | 67 ---------- data/maps/UnknownMap_00_00/scripts.inc | 2 - data/maps/UnknownMap_00_01/map.json | 67 ---------- data/maps/UnknownMap_00_01/scripts.inc | 2 - data/maps/UnknownMap_00_02/map.json | 99 -------------- data/maps/UnknownMap_00_02/scripts.inc | 2 - data/maps/UnknownMap_00_03/map.json | 85 ------------ data/maps/UnknownMap_00_03/scripts.inc | 2 - data/maps/UnknownMap_00_04/map.json | 145 --------------------- data/maps/UnknownMap_00_04/scripts.inc | 106 --------------- .../VermilionCity_PokemonCenter_1F/scripts.inc | 2 +- data/maps/VermilionCity_PokemonCenter_2F/map.json | 10 +- .../VermilionCity_PokemonCenter_2F/scripts.inc | 13 +- .../maps/ViridianCity_PokemonCenter_1F/scripts.inc | 2 +- data/maps/ViridianCity_PokemonCenter_2F/map.json | 10 +- .../maps/ViridianCity_PokemonCenter_2F/scripts.inc | 13 +- data/maps/map_groups.json | 10 +- 86 files changed, 839 insertions(+), 820 deletions(-) create mode 100644 data/maps/BattleColosseum2P/map.json create mode 100644 data/maps/BattleColosseum2P/scripts.inc create mode 100644 data/maps/BattleColosseum4P/map.json create mode 100644 data/maps/BattleColosseum4P/scripts.inc create mode 100644 data/maps/RecordCenter/map.json create mode 100644 data/maps/RecordCenter/scripts.inc create mode 100644 data/maps/TradeCenter/map.json create mode 100644 data/maps/TradeCenter/scripts.inc create mode 100644 data/maps/UnionRoom/map.json create mode 100644 data/maps/UnionRoom/scripts.inc delete mode 100644 data/maps/UnknownMap_00_00/map.json delete mode 100644 data/maps/UnknownMap_00_00/scripts.inc delete mode 100644 data/maps/UnknownMap_00_01/map.json delete mode 100644 data/maps/UnknownMap_00_01/scripts.inc delete mode 100644 data/maps/UnknownMap_00_02/map.json delete mode 100644 data/maps/UnknownMap_00_02/scripts.inc delete mode 100644 data/maps/UnknownMap_00_03/map.json delete mode 100644 data/maps/UnknownMap_00_03/scripts.inc delete mode 100644 data/maps/UnknownMap_00_04/map.json delete mode 100644 data/maps/UnknownMap_00_04/scripts.inc (limited to 'data/maps') diff --git a/data/maps/BattleColosseum2P/map.json b/data/maps/BattleColosseum2P/map.json new file mode 100644 index 000000000..aebc124e1 --- /dev/null +++ b/data/maps/BattleColosseum2P/map.json @@ -0,0 +1,67 @@ +{ + "id": "MAP_BATTLE_COLOSSEUM_2P", + "name": "BattleColosseum2P", + "layout": "LAYOUT_BATTLE_COLOSSEUM_2P", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_SPECIAL_AREA", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_8", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleColosseum2P_EventScript_Attendant", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 3, + "y": 5, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "BattleColosseum2P_EventScript_PlayerSpot0" + }, + { + "type": "trigger", + "x": 10, + "y": 5, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "BattleColosseum2P_EventScript_PlayerSpot1" + } + ], + "bg_events": [] +} diff --git a/data/maps/BattleColosseum2P/scripts.inc b/data/maps/BattleColosseum2P/scripts.inc new file mode 100644 index 000000000..59a5b3754 --- /dev/null +++ b/data/maps/BattleColosseum2P/scripts.inc @@ -0,0 +1,2 @@ +BattleColosseum2P_MapScripts:: @ 8160478 + .byte 0 diff --git a/data/maps/BattleColosseum4P/map.json b/data/maps/BattleColosseum4P/map.json new file mode 100644 index 000000000..d385ca315 --- /dev/null +++ b/data/maps/BattleColosseum4P/map.json @@ -0,0 +1,85 @@ +{ + "id": "MAP_BATTLE_COLOSSEUM_4P", + "name": "BattleColosseum4P", + "layout": "LAYOUT_BATTLE_COLOSSEUM_4P", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_SPECIAL_AREA", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_8", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 3, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "BattleColosseum4P_EventScript_PlayerSpot0" + }, + { + "type": "trigger", + "x": 3, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "BattleColosseum4P_EventScript_PlayerSpot2" + }, + { + "type": "trigger", + "x": 10, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "BattleColosseum4P_EventScript_PlayerSpot1" + }, + { + "type": "trigger", + "x": 10, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "BattleColosseum4P_EventScript_PlayerSpot3" + } + ], + "bg_events": [] +} diff --git a/data/maps/BattleColosseum4P/scripts.inc b/data/maps/BattleColosseum4P/scripts.inc new file mode 100644 index 000000000..918c093d0 --- /dev/null +++ b/data/maps/BattleColosseum4P/scripts.inc @@ -0,0 +1,2 @@ +BattleColosseum4P_MapScripts:: @ 816047B + .byte 0 diff --git a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc index 943d1e396..322968550 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ CeladonCity_PokemonCenter_1F_MapScripts:: @ 816C5EC map_script MAP_SCRIPT_ON_TRANSITION, CeladonCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, CeladonCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 CeladonCity_PokemonCenter_1F_OnTransition:: @ 816C5F7 diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json index 931b2c4e5..efb05b214 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_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": "CeladonCity_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": "CeladonCity_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/CeladonCity_PokemonCenter_2F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc index b4fefdc98..19975f531 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ CeladonCity_PokemonCenter_2F_MapScripts:: @ 816C61F map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -CeladonCity_PokemonCenter_2F_EventScript_16C634:: @ 816C634 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +CeladonCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816C634 + call CableClub_EventScript_Colosseum end -EventScript_16C63A:: @ 816C63A - call EventScript_1BB6AB +CeladonCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816C63A + call CableClub_EventScript_TradeCenter end -EventScript_16C640:: @ 816C640 - call EventScript_1BB7DE +CeladonCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816C640 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc index f7b309f3e..a59e9710d 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ CeruleanCity_PokemonCenter_1F_MapScripts:: @ 816AA2D map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, CeruleanCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 CeruleanCity_PokemonCenter_1F_OnTransition:: @ 816AA38 diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json index 70a15e76e..837ab4956 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCity_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": "CeruleanCity_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": "CeruleanCity_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/CeruleanCity_PokemonCenter_2F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc index 7c8a7f024..f6f83f0da 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ CeruleanCity_PokemonCenter_2F_MapScripts:: @ 816AA79 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -CeruleanCity_PokemonCenter_2F_EventScript_16AA8E:: @ 816AA8E - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +CeruleanCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816AA8E + call CableClub_EventScript_Colosseum end -EventScript_16AA94:: @ 816AA94 - call EventScript_1BB6AB +CeruleanCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816AA94 + call CableClub_EventScript_TradeCenter end -EventScript_16AA9A:: @ 816AA9A - call EventScript_1BB7DE +CeruleanCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816AA9A + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index c3137faec..626263f76 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ CinnabarIsland_PokemonCenter_1F_MapScripts:: @ 816E8D7 map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, CinnabarIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 CinnabarIsland_PokemonCenter_1F_OnTransition:: @ 816E8E2 diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json index 9eafc6d0a..bd8c9d41e 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CinnabarIsland_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": "CinnabarIsland_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": "CinnabarIsland_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/CinnabarIsland_PokemonCenter_2F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc index 2f0476988..9cec10be2 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ CinnabarIsland_PokemonCenter_2F_MapScripts:: @ 816E9E8 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -CinnabarIsland_PokemonCenter_2F_EventScript_16E9FD:: @ 816E9FD - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +CinnabarIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 816E9FD + call CableClub_EventScript_Colosseum end -EventScript_16EA03:: @ 816EA03 - call EventScript_1BB6AB +CinnabarIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 816EA03 + call CableClub_EventScript_TradeCenter end -EventScript_16EA09:: @ 816EA09 - call EventScript_1BB7DE +CinnabarIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 816EA09 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc index 01da41d52..21148cede 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ FiveIsland_PokemonCenter_1F_MapScripts:: @ 8171CF1 map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, FiveIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 FiveIsland_PokemonCenter_1F_OnTransition:: @ 8171CFC diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json index 11fb855fb..d28b198ce 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_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": "FiveIsland_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": "FiveIsland_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/FiveIsland_PokemonCenter_2F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc index d518317ed..67f84b9bc 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ FiveIsland_PokemonCenter_2F_MapScripts:: @ 8171D1B map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -FiveIsland_PokemonCenter_2F_EventScript_171D30:: @ 8171D30 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +FiveIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8171D30 + call CableClub_EventScript_Colosseum end -EventScript_171D36:: @ 8171D36 - call EventScript_1BB6AB +FiveIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8171D36 + call CableClub_EventScript_TradeCenter end -EventScript_171D3C:: @ 8171D3C - call EventScript_1BB7DE +FiveIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171D3C + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc index 3d99baddb..4ee8e33c1 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ FourIsland_PokemonCenter_1F_MapScripts:: @ 8171BEA map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, FourIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 FourIsland_PokemonCenter_1F_OnTransition:: @ 8171BF5 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 diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc index 864a2cb86..428305d1c 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ FuchsiaCity_PokemonCenter_1F_MapScripts:: @ 816D6F1 map_script MAP_SCRIPT_ON_TRANSITION, FuchsiaCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, FuchsiaCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 FuchsiaCity_PokemonCenter_1F_OnTransition:: @ 816D6FC diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json index 025f090c7..6ce142aac 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FuchsiaCity_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": "FuchsiaCity_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": "FuchsiaCity_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/FuchsiaCity_PokemonCenter_2F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc index 993a88457..2be67866e 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ FuchsiaCity_PokemonCenter_2F_MapScripts:: @ 816D724 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -FuchsiaCity_PokemonCenter_2F_EventScript_16D739:: @ 816D739 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +FuchsiaCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816D739 + call CableClub_EventScript_Colosseum end -EventScript_16D73F:: @ 816D73F - call EventScript_1BB6AB +FuchsiaCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816D73F + call CableClub_EventScript_TradeCenter end -EventScript_16D745:: @ 816D745 - call EventScript_1BB7DE +FuchsiaCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816D745 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index 13491fce9..d1496398b 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ IndigoPlateau_PokemonCenter_1F_MapScripts:: @ 816EA5A map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, IndigoPlateau_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 IndigoPlateau_PokemonCenter_1F_OnTransition:: @ 816EA65 diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json index ac00b284b..7298dc99f 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "IndigoPlateau_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": "IndigoPlateau_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": "IndigoPlateau_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/IndigoPlateau_PokemonCenter_2F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc index a6fc31686..b2b3bd00d 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ IndigoPlateau_PokemonCenter_2F_MapScripts:: @ 816EB0F map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -IndigoPlateau_PokemonCenter_2F_EventScript_16EB24:: @ 816EB24 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +IndigoPlateau_PokemonCenter_2F_EventScript_Colosseum:: @ 816EB24 + call CableClub_EventScript_Colosseum end -EventScript_16EB2A:: @ 816EB2A - call EventScript_1BB6AB +IndigoPlateau_PokemonCenter_2F_EventScript_TradeCenter:: @ 816EB2A + call CableClub_EventScript_TradeCenter end -EventScript_16EB30:: @ 816EB30 - call EventScript_1BB7DE +IndigoPlateau_PokemonCenter_2F_EventScript_RecordCorner:: @ 816EB30 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc index 7718ecbfd..2109df4d0 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ LavenderTown_PokemonCenter_1F_MapScripts:: @ 816B0EF map_script MAP_SCRIPT_ON_TRANSITION, LavenderTown_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, LavenderTown_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 LavenderTown_PokemonCenter_1F_OnTransition:: @ 816B0FA diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json index cc72593c7..beefaa49a 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "LavenderTown_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": "LavenderTown_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": "LavenderTown_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/LavenderTown_PokemonCenter_2F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc index 45f05a491..2ef3c6643 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ LavenderTown_PokemonCenter_2F_MapScripts:: @ 816B122 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -LavenderTown_PokemonCenter_2F_EventScript_16B137:: @ 816B137 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +LavenderTown_PokemonCenter_2F_EventScript_Colosseum:: @ 816B137 + call CableClub_EventScript_Colosseum end -EventScript_16B13D:: @ 816B13D - call EventScript_1BB6AB +LavenderTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 816B13D + call CableClub_EventScript_TradeCenter end -EventScript_16B143:: @ 816B143 - call EventScript_1BB7DE +LavenderTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 816B143 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc index 9f59c9c5c..d32ab0d4a 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc @@ -44,7 +44,7 @@ EventScript_1653C5:: @ 81653C5 OneIsland_KindleRoad_EmberSpa_EventScript_1653CF:: @ 81653CF lockall fadescreen FADE_TO_WHITE - special sp000_heal_pokemon + special HealPlayerParty fadescreen FADE_FROM_WHITE msgbox gUnknown_817D450 setvar VAR_TEMP_1, 1 diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 6c7c3e762..4f1a059ad 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8 map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, OneIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume map_script MAP_SCRIPT_ON_LOAD, OneIsland_PokemonCenter_1F_OnLoad map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_PokemonCenter_1F_OnFrame .byte 0 diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json index 8a847a81c..a74cbc00a 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/map.json +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_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": "OneIsland_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": "OneIsland_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/OneIsland_PokemonCenter_2F/scripts.inc b/data/maps/OneIsland_PokemonCenter_2F/scripts.inc index 0d553f8e4..8adbf8907 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ OneIsland_PokemonCenter_2F_MapScripts:: @ 8171334 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -OneIsland_PokemonCenter_2F_EventScript_171349:: @ 8171349 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +OneIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8171349 + call CableClub_EventScript_Colosseum end -EventScript_17134F:: @ 817134F - call EventScript_1BB6AB +OneIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 817134F + call CableClub_EventScript_TradeCenter end -EventScript_171355:: @ 8171355 - call EventScript_1BB7DE +OneIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171355 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 261b16c1c..0b5008f79 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -487,7 +487,7 @@ Movement_1694BE:: @ 81694BE step_end EventScript_1694C2:: @ 81694C2 - special sp000_heal_pokemon + special HealPlayerParty msgbox gUnknown_818DE38 closemessage playbgm MUS_RIVAL2, 0 diff --git a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc index ababfb549..6cf1f5137 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ PewterCity_PokemonCenter_1F_MapScripts:: @ 816A760 map_script MAP_SCRIPT_ON_TRANSITION, PewterCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, PewterCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 PewterCity_PokemonCenter_1F_OnTransition:: @ 816A76B diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json index d07a3ba3f..b5017653f 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/map.json +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_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": "PewterCity_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": "PewterCity_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/PewterCity_PokemonCenter_2F/scripts.inc b/data/maps/PewterCity_PokemonCenter_2F/scripts.inc index 9d3148d6c..1bcf9728b 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ PewterCity_PokemonCenter_2F_MapScripts:: @ 816A7B5 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -PewterCity_PokemonCenter_2F_EventScript_16A7CA:: @ 816A7CA - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +PewterCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816A7CA + call CableClub_EventScript_Colosseum end -EventScript_16A7D0:: @ 816A7D0 - call EventScript_1BB6AB +PewterCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816A7D0 + call CableClub_EventScript_TradeCenter end -EventScript_16A7D6:: @ 816A7D6 - call EventScript_1BB7DE +PewterCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816A7D6 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/PokemonTower_5F/scripts.inc b/data/maps/PokemonTower_5F/scripts.inc index 7c45a6947..4f9145909 100644 --- a/data/maps/PokemonTower_5F/scripts.inc +++ b/data/maps/PokemonTower_5F/scripts.inc @@ -8,7 +8,7 @@ PokemonTower_5F_EventScript_163433:: @ 8163433 PokemonTower_5F_EventScript_16343C:: @ 816343C lockall fadescreen FADE_TO_WHITE - special sp000_heal_pokemon + special HealPlayerParty fadescreen FADE_FROM_WHITE msgbox gUnknown_817A1FA setvar VAR_TEMP_1, 1 diff --git a/data/maps/RecordCenter/map.json b/data/maps/RecordCenter/map.json new file mode 100644 index 000000000..9dda49e24 --- /dev/null +++ b/data/maps/RecordCenter/map.json @@ -0,0 +1,99 @@ +{ + "id": "MAP_RECORD_CENTER", + "name": "RecordCenter", + "layout": "LAYOUT_RECORD_CENTER", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_SPECIAL_AREA", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", + "x": 10, + "y": 5, + "elevation": 0, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RecordCenter_EventScript_Attendant", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 9, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 11, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 10, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 6, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "RecordCenter_EventScript_Spot" + }, + { + "type": "trigger", + "x": 6, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "RecordCenter_EventScript_Spot" + }, + { + "type": "trigger", + "x": 13, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "RecordCenter_EventScript_Spot" + }, + { + "type": "trigger", + "x": 13, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "RecordCenter_EventScript_Spot" + } + ], + "bg_events": [] +} diff --git a/data/maps/RecordCenter/scripts.inc b/data/maps/RecordCenter/scripts.inc new file mode 100644 index 000000000..873fc2826 --- /dev/null +++ b/data/maps/RecordCenter/scripts.inc @@ -0,0 +1,2 @@ +RecordCenter_MapScripts:: @ 816047A + .byte 0 diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 7d165279d..f81563b0c 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ Route10_PokemonCenter_1F_MapScripts:: @ 816FC2F map_script MAP_SCRIPT_ON_TRANSITION, Route10_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, Route10_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 Route10_PokemonCenter_1F_OnTransition:: @ 816FC3A diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json index 548ff6007..31472bf81 100644 --- a/data/maps/Route10_PokemonCenter_2F/map.json +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_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": "Route10_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": "Route10_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/Route10_PokemonCenter_2F/scripts.inc b/data/maps/Route10_PokemonCenter_2F/scripts.inc index e0262a627..2760e125c 100644 --- a/data/maps/Route10_PokemonCenter_2F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ Route10_PokemonCenter_2F_MapScripts:: @ 816FCFA map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -Route10_PokemonCenter_2F_EventScript_16FD0F:: @ 816FD0F - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +Route10_PokemonCenter_2F_EventScript_Colosseum:: @ 816FD0F + call CableClub_EventScript_Colosseum end -EventScript_16FD15:: @ 816FD15 - call EventScript_1BB6AB +Route10_PokemonCenter_2F_EventScript_TradeCenter:: @ 816FD15 + call CableClub_EventScript_TradeCenter end -EventScript_16FD1B:: @ 816FD1B - call EventScript_1BB7DE +Route10_PokemonCenter_2F_EventScript_RecordCorner:: @ 816FD1B + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index fcb681783..bd2864629 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ Route4_PokemonCenter_1F_MapScripts:: @ 816F739 map_script MAP_SCRIPT_ON_TRANSITION, Route4_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, Route4_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 Route4_PokemonCenter_1F_OnTransition:: @ 816F744 diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index 2f53bfcef..f602e0e25 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_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": "Route4_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": "Route4_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/Route4_PokemonCenter_2F/scripts.inc b/data/maps/Route4_PokemonCenter_2F/scripts.inc index e70f53403..32b1905a4 100644 --- a/data/maps/Route4_PokemonCenter_2F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ Route4_PokemonCenter_2F_MapScripts:: @ 816F8D8 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -Route4_PokemonCenter_2F_EventScript_16F8ED:: @ 816F8ED - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +Route4_PokemonCenter_2F_EventScript_Colosseum:: @ 816F8ED + call CableClub_EventScript_Colosseum end -EventScript_16F8F3:: @ 816F8F3 - call EventScript_1BB6AB +Route4_PokemonCenter_2F_EventScript_TradeCenter:: @ 816F8F3 + call CableClub_EventScript_TradeCenter end -EventScript_16F8F9:: @ 816F8F9 - call EventScript_1BB7DE +Route4_PokemonCenter_2F_EventScript_RecordCorner:: @ 816F8F9 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc index fe28e6c75..8639de5af 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ SaffronCity_PokemonCenter_1F_MapScripts:: @ 816EFEC map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, SaffronCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 SaffronCity_PokemonCenter_1F_OnTransition:: @ 816EFF7 diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json index 457ef551e..b6ae61450 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SaffronCity_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": "SaffronCity_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": "SaffronCity_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/SaffronCity_PokemonCenter_2F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc index 12b688a7d..5a62223a3 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ SaffronCity_PokemonCenter_2F_MapScripts:: @ 816F037 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -SaffronCity_PokemonCenter_2F_EventScript_16F04C:: @ 816F04C - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +SaffronCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816F04C + call CableClub_EventScript_Colosseum end -EventScript_16F052:: @ 816F052 - call EventScript_1BB6AB +SaffronCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816F052 + call CableClub_EventScript_TradeCenter end -EventScript_16F058:: @ 816F058 - call EventScript_1BB7DE +SaffronCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816F058 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 70a27185a..60183ed13 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -128,7 +128,7 @@ EventScript_170A11:: @ 8170A11 EventScript_170A1E:: @ 8170A1E msgbox gUnknown_81A06AB fadescreen FADE_TO_BLACK - special sub_80A0334 + special ChooseHalfPartyForBattle waitstate return diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index c109d3eeb..8d0ef3475 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -29,7 +29,7 @@ EventScript_170A97:: @ 8170A97 compare VAR_RESULT, 2 call_if_eq EventScript_170B17 closemessage - special sp000_heal_pokemon + special HealPlayerParty applymovement OBJ_EVENT_ID_PLAYER, Movement_170B28 waitmovement 0 special LoadPlayerParty diff --git a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc index 3992ac871..459806f32 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ SevenIsland_PokemonCenter_1F_MapScripts:: @ 8170B89 map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, SevenIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 SevenIsland_PokemonCenter_1F_OnTransition:: @ 8170B94 diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json index dd727d017..c44ce8385 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_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": "SevenIsland_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": "SevenIsland_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/SevenIsland_PokemonCenter_2F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc index 654725ffb..7aa713902 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ SevenIsland_PokemonCenter_2F_MapScripts:: @ 8170BBC map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -SevenIsland_PokemonCenter_2F_EventScript_170BD1:: @ 8170BD1 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +SevenIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8170BD1 + call CableClub_EventScript_Colosseum end -EventScript_170BD7:: @ 8170BD7 - call EventScript_1BB6AB +SevenIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8170BD7 + call CableClub_EventScript_TradeCenter end -EventScript_170BDD:: @ 8170BDD - call EventScript_1BB7DE +SevenIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8170BDD + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index fb6204f22..713400e2a 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -196,7 +196,7 @@ EventScript_164A53:: @ 8164A53 EventScript_164AA0:: @ 8164AA0 copyvar VAR_0x8005, VAR_RESULT setvar VAR_MAP_SCENE_TRAINER_TOWER, 1 - special sp000_heal_pokemon + special HealPlayerParty msgbox gUnknown_817C8BF setvar VAR_0x8004, 6 special sub_815D9E8 diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index 3316ec0b5..6bde430ab 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, SixIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume map_script MAP_SCRIPT_ON_FRAME_TABLE, SixIsland_PokemonCenter_1F_OnFrame .byte 0 diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json index 1cb356b1f..9966343f0 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/map.json +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_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": "SixIsland_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": "SixIsland_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/SixIsland_PokemonCenter_2F/scripts.inc b/data/maps/SixIsland_PokemonCenter_2F/scripts.inc index a86377b29..05555c8d1 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ SixIsland_PokemonCenter_2F_MapScripts:: @ 8171E20 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -SixIsland_PokemonCenter_2F_EventScript_171E35:: @ 8171E35 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +SixIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8171E35 + call CableClub_EventScript_Colosseum end -EventScript_171E3B:: @ 8171E3B - call EventScript_1BB6AB +SixIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8171E3B + call CableClub_EventScript_TradeCenter end -EventScript_171E41:: @ 8171E41 - call EventScript_1BB7DE +SixIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171E41 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc index e3cb1e23b..15d568a6f 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ ThreeIsland_PokemonCenter_1F_MapScripts:: @ 8171832 map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, ThreeIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 ThreeIsland_PokemonCenter_1F_OnTransition:: @ 817183D diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json index 5fc3dfcca..7ee8e0316 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_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": "ThreeIsland_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": "ThreeIsland_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/ThreeIsland_PokemonCenter_2F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc index 7589c7946..83b97c22d 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ ThreeIsland_PokemonCenter_2F_MapScripts:: @ 8171865 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -ThreeIsland_PokemonCenter_2F_EventScript_17187A:: @ 817187A - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +ThreeIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 817187A + call CableClub_EventScript_Colosseum end -EventScript_171880:: @ 8171880 - call EventScript_1BB6AB +ThreeIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8171880 + call CableClub_EventScript_TradeCenter end -EventScript_171886:: @ 8171886 - call EventScript_1BB7DE +ThreeIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171886 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json new file mode 100644 index 000000000..71310c57f --- /dev/null +++ b/data/maps/TradeCenter/map.json @@ -0,0 +1,67 @@ +{ + "id": "MAP_TRADE_CENTER", + "name": "TradeCenter", + "layout": "LAYOUT_TRADE_CENTER", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_SPECIAL_AREA", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "9", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TradeCenter_EventScript_Attendant", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 4, + "y": 5, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "TradeCenter_EventScript_Chair0" + }, + { + "type": "trigger", + "x": 7, + "y": 5, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "TradeCenter_EventScript_Chair1" + } + ], + "bg_events": [] +} diff --git a/data/maps/TradeCenter/scripts.inc b/data/maps/TradeCenter/scripts.inc new file mode 100644 index 000000000..fa3ed8869 --- /dev/null +++ b/data/maps/TradeCenter/scripts.inc @@ -0,0 +1,2 @@ +TradeCenter_MapScripts:: @ 8160479 + .byte 0 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index 4caef4f41..bb927734e 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -82,14 +82,14 @@ "x": 1, "y": 1, "elevation": 0, - "script": "TwoIsland_JoyfulGameCorner_EventScript_1BC2E7" + "script": "TwoIsland_JoyfulGameCorner_EventScript_ShowPokemonJumpRecords" }, { "type": "bg_event_type_0", "x": 0, "y": 1, "elevation": 0, - "script": "TwoIsland_JoyfulGameCorner_EventScript_1BC2FC" + "script": "TwoIsland_JoyfulGameCorner_EventScript_ShowDodrioBerryPickingRecords" } ] } diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index ce2f7c9ba..0bbb24423 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -125,7 +125,7 @@ TwoIsland_JoyfulGameCorner_EventScript_171535:: @ 8171535 lock faceplayer compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 - goto_if_eq EventScript_1BC060 + goto_if_eq JoyfulGameCorner_EventScript_InfoMan2 goto_if_set FLAG_RESCUED_LOSTELLE, EventScript_171555 msgbox gUnknown_81A285C release @@ -140,7 +140,7 @@ TwoIsland_JoyfulGameCorner_EventScript_17155F:: @ 817155F lock faceplayer compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 - goto_if_eq EventScript_1BC0CE + goto_if_eq JoyfulGameCorner_EventScript_MinigameAttendant goto_if_set FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER, EventScript_1715F5 compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 goto_if_eq EventScript_17158A diff --git a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc index c5da2e223..6661a61eb 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ TwoIsland_PokemonCenter_1F_MapScripts:: @ 81717B4 map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, TwoIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 TwoIsland_PokemonCenter_1F_OnTransition:: @ 81717BF diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json index aa762183c..ba3815e00 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_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": "TwoIsland_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": "TwoIsland_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/TwoIsland_PokemonCenter_2F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc index 99da551b4..f8e803ccb 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ TwoIsland_PokemonCenter_2F_MapScripts:: @ 81717DE map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -TwoIsland_PokemonCenter_2F_EventScript_1717F3:: @ 81717F3 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +TwoIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 81717F3 + call CableClub_EventScript_Colosseum end -EventScript_1717F9:: @ 81717F9 - call EventScript_1BB6AB +TwoIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 81717F9 + call CableClub_EventScript_TradeCenter end -EventScript_1717FF:: @ 81717FF - call EventScript_1BB7DE +TwoIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 81717FF + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json new file mode 100644 index 000000000..05afe6e01 --- /dev/null +++ b/data/maps/UnionRoom/map.json @@ -0,0 +1,145 @@ +{ + "id": "MAP_UNION_ROOM", + "name": "UnionRoom", + "layout": "LAYOUT_UNION_ROOM", + "music": "MUS_UNION", + "region_map_section": "MAPSEC_SPECIAL_AREA", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_8", + "unknown_18": 0, + "unknown_19": 0, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_8", + "connections": null, + "object_events": [ + { + "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "8", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_16050C", + "flag": "0" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", + "x": 1, + "y": 8, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_1604DA", + "flag": "FLAG_HIDE_UNION_ROOM_4" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_7", + "x": 7, + "y": 8, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_160502", + "flag": "FLAG_HIDE_UNION_ROOM_8" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_6", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_1604F8", + "flag": "FLAG_HIDE_UNION_ROOM_7" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_5", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_1604EE", + "flag": "FLAG_HIDE_UNION_ROOM_6" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_4", + "x": 13, + "y": 4, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_1604E4", + "flag": "FLAG_HIDE_UNION_ROOM_5" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_1604D0", + "flag": "FLAG_HIDE_UNION_ROOM_3" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", + "x": 13, + "y": 8, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_1604C6", + "flag": "FLAG_HIDE_UNION_ROOM_2" + }, + { + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "2", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_1604BC", + "flag": "FLAG_HIDE_UNION_ROOM_1" + } + ], + "warp_events": [ + { + "x": 7, + "y": 11, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [], + "bg_events": [] +} diff --git a/data/maps/UnionRoom/scripts.inc b/data/maps/UnionRoom/scripts.inc new file mode 100644 index 000000000..c948682ce --- /dev/null +++ b/data/maps/UnionRoom/scripts.inc @@ -0,0 +1,106 @@ +UnionRoom_MapScripts:: @ 816047C + map_script MAP_SCRIPT_ON_RESUME, UnionRoom_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, UnionRoom_OnTransition + .byte 0 + +UnionRoom_OnResume:: @ 8160487 + setflag FLAG_HIDE_UNION_ROOM_1 + setflag FLAG_HIDE_UNION_ROOM_2 + setflag FLAG_HIDE_UNION_ROOM_3 + setflag FLAG_HIDE_UNION_ROOM_4 + setflag FLAG_HIDE_UNION_ROOM_5 + setflag FLAG_HIDE_UNION_ROOM_6 + setflag FLAG_HIDE_UNION_ROOM_7 + setflag FLAG_HIDE_UNION_ROOM_8 + removeobject 9 + removeobject 8 + removeobject 7 + removeobject 2 + removeobject 6 + removeobject 5 + removeobject 4 + removeobject 3 + special UnionRoomSpecial + end + +UnionRoom_OnTransition:: @ 81604BB + end + +UnionRoom_EventScript_1604BC:: @ 81604BC + lock + faceplayer + setvar VAR_RESULT, 1 + waitstate + release + end + +UnionRoom_EventScript_1604C6:: @ 81604C6 + lock + faceplayer + setvar VAR_RESULT, 2 + waitstate + release + end + +UnionRoom_EventScript_1604D0:: @ 81604D0 + lock + faceplayer + setvar VAR_RESULT, 3 + waitstate + release + end + +UnionRoom_EventScript_1604DA:: @ 81604DA + lock + faceplayer + setvar VAR_RESULT, 4 + waitstate + release + end + +UnionRoom_EventScript_1604E4:: @ 81604E4 + lock + faceplayer + setvar VAR_RESULT, 5 + waitstate + release + end + +UnionRoom_EventScript_1604EE:: @ 81604EE + lock + faceplayer + setvar VAR_RESULT, 6 + waitstate + release + end + +UnionRoom_EventScript_1604F8:: @ 81604F8 + lock + faceplayer + setvar VAR_RESULT, 7 + waitstate + release + end + +UnionRoom_EventScript_160502:: @ 8160502 + lock + faceplayer + setvar VAR_RESULT, 8 + waitstate + release + end + +UnionRoom_EventScript_16050C:: @ 816050C + lock + faceplayer + setvar VAR_RESULT, 9 + waitstate + release + end + +UnionRoom_EventScript_160516:: @ 8160516 + lockall + setvar VAR_RESULT, 10 + waitstate + releaseall + end diff --git a/data/maps/UnknownMap_00_00/map.json b/data/maps/UnknownMap_00_00/map.json deleted file mode 100644 index 43e5f14ad..000000000 --- a/data/maps/UnknownMap_00_00/map.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "id": "MAP_UNKNOWN_MAP_00_00", - "name": "UnknownMap_00_00", - "layout": "LAYOUT_UNKNOWN_MAP_00_00", - "music": "MUS_POKECEN", - "region_map_section": "MAPSEC_SPECIAL_AREA", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_8", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", - "x": 9, - "y": 3, - "elevation": 3, - "movement_type": "9", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_00_EventScript_1BB9AF", - "flag": "0" - } - ], - "warp_events": [ - { - "x": 6, - "y": 8, - "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 - }, - { - "x": 7, - "y": 8, - "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 3, - "y": 5, - "elevation": 3, - "var": "VAR_TEMP_0", - "var_value": 0, - "script": "UnknownMap_00_00_EventScript_1BB8C3" - }, - { - "type": "trigger", - "x": 10, - "y": 5, - "elevation": 3, - "var": "VAR_TEMP_0", - "var_value": 0, - "script": "UnknownMap_00_00_EventScript_1BB8CF" - } - ], - "bg_events": [] -} diff --git a/data/maps/UnknownMap_00_00/scripts.inc b/data/maps/UnknownMap_00_00/scripts.inc deleted file mode 100644 index bd155a889..000000000 --- a/data/maps/UnknownMap_00_00/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_00_00_MapScripts:: @ 8160478 - .byte 0 diff --git a/data/maps/UnknownMap_00_01/map.json b/data/maps/UnknownMap_00_01/map.json deleted file mode 100644 index 3cf67c7b1..000000000 --- a/data/maps/UnknownMap_00_01/map.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "id": "MAP_UNKNOWN_MAP_00_01", - "name": "UnknownMap_00_01", - "layout": "LAYOUT_UNKNOWN_MAP_00_01", - "music": "MUS_POKECEN", - "region_map_section": "MAPSEC_SPECIAL_AREA", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", - "x": 9, - "y": 6, - "elevation": 3, - "movement_type": "9", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_01_EventScript_1BB9C1", - "flag": "0" - } - ], - "warp_events": [ - { - "x": 5, - "y": 8, - "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 - }, - { - "x": 6, - "y": 8, - "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 4, - "y": 5, - "elevation": 3, - "var": "VAR_TEMP_0", - "var_value": 0, - "script": "UnknownMap_00_01_EventScript_1BB950" - }, - { - "type": "trigger", - "x": 7, - "y": 5, - "elevation": 3, - "var": "VAR_TEMP_0", - "var_value": 0, - "script": "UnknownMap_00_01_EventScript_1BB95C" - } - ], - "bg_events": [] -} diff --git a/data/maps/UnknownMap_00_01/scripts.inc b/data/maps/UnknownMap_00_01/scripts.inc deleted file mode 100644 index 0c05ea80d..000000000 --- a/data/maps/UnknownMap_00_01/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_00_01_MapScripts:: @ 8160479 - .byte 0 diff --git a/data/maps/UnknownMap_00_02/map.json b/data/maps/UnknownMap_00_02/map.json deleted file mode 100644 index 8dc5e473f..000000000 --- a/data/maps/UnknownMap_00_02/map.json +++ /dev/null @@ -1,99 +0,0 @@ -{ - "id": "MAP_UNKNOWN_MAP_00_02", - "name": "UnknownMap_00_02", - "layout": "LAYOUT_UNKNOWN_MAP_00_02", - "music": "MUS_POKECEN", - "region_map_section": "MAPSEC_SPECIAL_AREA", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", - "x": 10, - "y": 5, - "elevation": 0, - "movement_type": "8", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_02_EventScript_1BB9D3", - "flag": "0" - } - ], - "warp_events": [ - { - "x": 8, - "y": 9, - "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 - }, - { - "x": 9, - "y": 9, - "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 - }, - { - "x": 11, - "y": 9, - "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 - }, - { - "x": 10, - "y": 9, - "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 6, - "y": 4, - "elevation": 3, - "var": "VAR_TEMP_0", - "var_value": 0, - "script": "UnknownMap_00_02_EventScript_1BB980" - }, - { - "type": "trigger", - "x": 6, - "y": 6, - "elevation": 3, - "var": "VAR_TEMP_0", - "var_value": 0, - "script": "UnknownMap_00_02_EventScript_1BB980" - }, - { - "type": "trigger", - "x": 13, - "y": 4, - "elevation": 3, - "var": "VAR_TEMP_0", - "var_value": 0, - "script": "UnknownMap_00_02_EventScript_1BB980" - }, - { - "type": "trigger", - "x": 13, - "y": 6, - "elevation": 3, - "var": "VAR_TEMP_0", - "var_value": 0, - "script": "UnknownMap_00_02_EventScript_1BB980" - } - ], - "bg_events": [] -} diff --git a/data/maps/UnknownMap_00_02/scripts.inc b/data/maps/UnknownMap_00_02/scripts.inc deleted file mode 100644 index d12ac4304..000000000 --- a/data/maps/UnknownMap_00_02/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_00_02_MapScripts:: @ 816047A - .byte 0 diff --git a/data/maps/UnknownMap_00_03/map.json b/data/maps/UnknownMap_00_03/map.json deleted file mode 100644 index 52295b5ea..000000000 --- a/data/maps/UnknownMap_00_03/map.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "id": "MAP_UNKNOWN_MAP_00_03", - "name": "UnknownMap_00_03", - "layout": "LAYOUT_UNKNOWN_MAP_00_03", - "music": "MUS_POKECEN", - "region_map_section": "MAPSEC_SPECIAL_AREA", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_8", - "connections": null, - "object_events": [], - "warp_events": [ - { - "x": 5, - "y": 8, - "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 - }, - { - "x": 6, - "y": 8, - "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 - }, - { - "x": 7, - "y": 8, - "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 - }, - { - "x": 8, - "y": 8, - "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 3, - "y": 4, - "elevation": 3, - "var": "VAR_TEMP_0", - "var_value": 0, - "script": "UnknownMap_00_03_EventScript_1BB8DB" - }, - { - "type": "trigger", - "x": 3, - "y": 6, - "elevation": 3, - "var": "VAR_TEMP_0", - "var_value": 0, - "script": "UnknownMap_00_03_EventScript_1BB915" - }, - { - "type": "trigger", - "x": 10, - "y": 4, - "elevation": 3, - "var": "VAR_TEMP_0", - "var_value": 0, - "script": "UnknownMap_00_03_EventScript_1BB8F8" - }, - { - "type": "trigger", - "x": 10, - "y": 6, - "elevation": 3, - "var": "VAR_TEMP_0", - "var_value": 0, - "script": "UnknownMap_00_03_EventScript_1BB932" - } - ], - "bg_events": [] -} diff --git a/data/maps/UnknownMap_00_03/scripts.inc b/data/maps/UnknownMap_00_03/scripts.inc deleted file mode 100644 index 60c25bf54..000000000 --- a/data/maps/UnknownMap_00_03/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_00_03_MapScripts:: @ 816047B - .byte 0 diff --git a/data/maps/UnknownMap_00_04/map.json b/data/maps/UnknownMap_00_04/map.json deleted file mode 100644 index b18296b2c..000000000 --- a/data/maps/UnknownMap_00_04/map.json +++ /dev/null @@ -1,145 +0,0 @@ -{ - "id": "MAP_UNKNOWN_MAP_00_04", - "name": "UnknownMap_00_04", - "layout": "LAYOUT_UNKNOWN_MAP_00_04", - "music": "MUS_UNION", - "region_map_section": "MAPSEC_SPECIAL_AREA", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", - "unknown_18": 0, - "unknown_19": 0, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_8", - "connections": null, - "object_events": [ - { - "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", - "x": 3, - "y": 2, - "elevation": 3, - "movement_type": "8", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_16050C", - "flag": "0" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_3", - "x": 1, - "y": 8, - "elevation": 3, - "movement_type": "2", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604DA", - "flag": "FLAG_HIDE_UNION_ROOM_4" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_7", - "x": 7, - "y": 8, - "elevation": 3, - "movement_type": "2", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_160502", - "flag": "FLAG_HIDE_UNION_ROOM_8" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_6", - "x": 1, - "y": 4, - "elevation": 3, - "movement_type": "2", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604F8", - "flag": "FLAG_HIDE_UNION_ROOM_7" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_5", - "x": 7, - "y": 4, - "elevation": 3, - "movement_type": "2", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604EE", - "flag": "FLAG_HIDE_UNION_ROOM_6" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_4", - "x": 13, - "y": 4, - "elevation": 3, - "movement_type": "2", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604E4", - "flag": "FLAG_HIDE_UNION_ROOM_5" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_2", - "x": 10, - "y": 6, - "elevation": 3, - "movement_type": "2", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604D0", - "flag": "FLAG_HIDE_UNION_ROOM_3" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_1", - "x": 13, - "y": 8, - "elevation": 3, - "movement_type": "2", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604C6", - "flag": "FLAG_HIDE_UNION_ROOM_2" - }, - { - "graphics_id": "OBJECT_EVENT_GFX_VAR_0", - "x": 4, - "y": 6, - "elevation": 3, - "movement_type": "2", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, - "script": "UnknownMap_00_04_EventScript_1604BC", - "flag": "FLAG_HIDE_UNION_ROOM_1" - } - ], - "warp_events": [ - { - "x": 7, - "y": 11, - "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 - } - ], - "coord_events": [], - "bg_events": [] -} diff --git a/data/maps/UnknownMap_00_04/scripts.inc b/data/maps/UnknownMap_00_04/scripts.inc deleted file mode 100644 index 2cda124c4..000000000 --- a/data/maps/UnknownMap_00_04/scripts.inc +++ /dev/null @@ -1,106 +0,0 @@ -UnknownMap_00_04_MapScripts:: @ 816047C - map_script MAP_SCRIPT_ON_RESUME, UnknownMap_00_04_OnResume - map_script MAP_SCRIPT_ON_TRANSITION, UnknownMap_00_04_OnTransition - .byte 0 - -UnknownMap_00_04_OnResume:: @ 8160487 - setflag FLAG_HIDE_UNION_ROOM_1 - setflag FLAG_HIDE_UNION_ROOM_2 - setflag FLAG_HIDE_UNION_ROOM_3 - setflag FLAG_HIDE_UNION_ROOM_4 - setflag FLAG_HIDE_UNION_ROOM_5 - setflag FLAG_HIDE_UNION_ROOM_6 - setflag FLAG_HIDE_UNION_ROOM_7 - setflag FLAG_HIDE_UNION_ROOM_8 - removeobject 9 - removeobject 8 - removeobject 7 - removeobject 2 - removeobject 6 - removeobject 5 - removeobject 4 - removeobject 3 - special UnionRoomSpecial - end - -UnknownMap_00_04_OnTransition:: @ 81604BB - end - -UnknownMap_00_04_EventScript_1604BC:: @ 81604BC - lock - faceplayer - setvar VAR_RESULT, 1 - waitstate - release - end - -UnknownMap_00_04_EventScript_1604C6:: @ 81604C6 - lock - faceplayer - setvar VAR_RESULT, 2 - waitstate - release - end - -UnknownMap_00_04_EventScript_1604D0:: @ 81604D0 - lock - faceplayer - setvar VAR_RESULT, 3 - waitstate - release - end - -UnknownMap_00_04_EventScript_1604DA:: @ 81604DA - lock - faceplayer - setvar VAR_RESULT, 4 - waitstate - release - end - -UnknownMap_00_04_EventScript_1604E4:: @ 81604E4 - lock - faceplayer - setvar VAR_RESULT, 5 - waitstate - release - end - -UnknownMap_00_04_EventScript_1604EE:: @ 81604EE - lock - faceplayer - setvar VAR_RESULT, 6 - waitstate - release - end - -UnknownMap_00_04_EventScript_1604F8:: @ 81604F8 - lock - faceplayer - setvar VAR_RESULT, 7 - waitstate - release - end - -UnknownMap_00_04_EventScript_160502:: @ 8160502 - lock - faceplayer - setvar VAR_RESULT, 8 - waitstate - release - end - -UnknownMap_00_04_EventScript_16050C:: @ 816050C - lock - faceplayer - setvar VAR_RESULT, 9 - waitstate - release - end - -UnknownMap_00_04_EventScript_160516:: @ 8160516 - lockall - setvar VAR_RESULT, 10 - waitstate - releaseall - end diff --git a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc index 40ead09e0..ad7e02455 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ VermilionCity_PokemonCenter_1F_MapScripts:: @ 816B424 map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, VermilionCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 VermilionCity_PokemonCenter_1F_OnTransition:: @ 816B42F diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json index 30504e96c..4a9190f0f 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_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": "VermilionCity_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": "VermilionCity_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/VermilionCity_PokemonCenter_2F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc index 45278dc0f..66539b9b6 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ VermilionCity_PokemonCenter_2F_MapScripts:: @ 816B457 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -VermilionCity_PokemonCenter_2F_EventScript_16B46C:: @ 816B46C - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +VermilionCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816B46C + call CableClub_EventScript_Colosseum end -EventScript_16B472:: @ 816B472 - call EventScript_1BB6AB +VermilionCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816B472 + call CableClub_EventScript_TradeCenter end -EventScript_16B478:: @ 816B478 - call EventScript_1BB7DE +VermilionCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816B478 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc index 4a09cff1e..43e74ef4c 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ ViridianCity_PokemonCenter_1F_MapScripts:: @ 816A2C0 map_script MAP_SCRIPT_ON_TRANSITION, ViridianCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, ViridianCity_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 ViridianCity_PokemonCenter_1F_OnTransition:: @ 816A2CB diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json index 0c3a4361a..c46d275cf 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_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": "ViridianCity_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": "ViridianCity_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/ViridianCity_PokemonCenter_2F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc index 165ce15fc..58ada3f9f 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc @@ -5,14 +5,15 @@ ViridianCity_PokemonCenter_2F_MapScripts:: @ 816A2F3 map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -ViridianCity_PokemonCenter_2F_EventScript_16A308:: @ 816A308 - call EventScript_1BB4A3 +@ The below 3 are unused and leftover from RS +ViridianCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816A308 + call CableClub_EventScript_Colosseum end -EventScript_16A30E:: @ 816A30E - call EventScript_1BB6AB +ViridianCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816A30E + call CableClub_EventScript_TradeCenter end -EventScript_16A314:: @ 816A314 - call EventScript_1BB7DE +ViridianCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816A314 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 8619c19ad..0ff365eae 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -45,11 +45,11 @@ "gMapGroup42" ], "gMapGroup0": [ - "UnknownMap_00_00", - "UnknownMap_00_01", - "UnknownMap_00_02", - "UnknownMap_00_03", - "UnknownMap_00_04" + "BattleColosseum2P", + "TradeCenter", + "RecordCenter", + "BattleColosseum4P", + "UnionRoom" ], "gMapGroup1": [ "ViridianForest", -- cgit v1.2.3