Merge remote-tracking branch 'upstream/master' into document-trade

2 files changed, 19 insertions, 18 deletions

diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/map.json b/data/maps/MossdeepCity_PokemonCenter_2F/map.json
index 88bf3caf2..aa8691ac8 100644
--- a/data/maps/MossdeepCity_PokemonCenter_2F/map.json
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_PokemonCenter_2F_EventScript_27375B",
+      "script": "Common_EventScript_UnionRoomAttendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_PokemonCenter_2F_EventScript_273761",
+      "script": "Common_EventScript_WirelessClubAttendant",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_PokemonCenter_2F_EventScript_273767",
+      "script": "Common_EventScript_DirectCornerAttendant",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_PokemonCenter_2F_EventScript_276B03",
+      "script": "CableClub_EventScript_MysteryGiftMan",
       "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_PokemonCenter_2F_EventScript_22235B",
+      "script": "MossdeepCity_PokemonCenter_2F_EventScript_Woman5",
       "flag": "0"
     }
   ],
diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc
index 1c9c89fef..1d88c9ca2 100644
--- a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc
@@ -1,27 +1,28 @@
 MossdeepCity_PokemonCenter_2F_MapScripts:: @ 8222334
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_276C3B
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_276B6C
-	map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_PokemonCenter_2F_MapScript1_276BBE
-	map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
+	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
 
-MossdeepCity_PokemonCenter_2F_EventScript_222349:: @ 8222349
-	call OldaleTown_PokemonCenter_2F_EventScript_276EB7
+@ The below 3 are unused and leftover from RS
+MossdeepCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8222349
+	call CableClub_EventScript_Colosseum
 	end
 
-MossdeepCity_PokemonCenter_2F_EventScript_22234F:: @ 822234F
-	call OldaleTown_PokemonCenter_2F_EventScript_2770B2
+MossdeepCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 822234F
+	call CableClub_EventScript_TradeCenter
 	end
 
-MossdeepCity_PokemonCenter_2F_EventScript_222355:: @ 8222355
-	call OldaleTown_PokemonCenter_2F_EventScript_2771DB
+MossdeepCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8222355
+	call CableClub_EventScript_RecordCorner
 	end
 
-MossdeepCity_PokemonCenter_2F_EventScript_22235B:: @ 822235B
-	msgbox MossdeepCity_PokemonCenter_2F_Text_222364, MSGBOX_NPC
+MossdeepCity_PokemonCenter_2F_EventScript_Woman5:: @ 822235B
+	msgbox MossdeepCity_PokemonCenter_2F_Text_Woman5, MSGBOX_NPC
 	end
 
-MossdeepCity_PokemonCenter_2F_Text_222364: @ 8222364
+MossdeepCity_PokemonCenter_2F_Text_Woman5: @ 8222364
 	.string "If I win a whole lot of link battles\n"
 	.string "and show everyone how good I am,\l"
 	.string "I might get a fan following!$"