2 files changed, 17 insertions, 16 deletions
diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json
index e815a98be..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"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route10_PokemonCenter_2F_EventScript_1BB1D2",
+      "script": "CableClub_EventScript_MysteryGiftMan",
       "flag": "FLAG_HIDE_MG_DELIVERYMEN"
     }
   ],
@@ -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 54b5d0036..2760e125c 100644
--- a/data/maps/Route10_PokemonCenter_2F/scripts.inc
+++ b/data/maps/Route10_PokemonCenter_2F/scripts.inc
@@ -1,18 +1,19 @@
 Route10_PokemonCenter_2F_MapScripts:: @ 816FCFA
-	map_script 2, Route10_PokemonCenter_2F_MapScript1_1BB2A3
-	map_script 4, Route10_PokemonCenter_2F_MapScript2_1BB1ED
-	map_script 1, Route10_PokemonCenter_2F_MapScript3_1BB237
-	map_script 3, Route10_PokemonCenter_2F_MapScript4_1BB1B4
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
+	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
+	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