Review changes for #835

42 files changed, 100 insertions, 100 deletions

diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
index 310328a5c..84aeef182 100644
--- a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_MapScript1_267904
-	map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
 BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904
diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc
index 135733d5f..5a19a9d28 100644
--- a/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
-	map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
-	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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
 
 @ The below 3 are unused and leftover from RS
diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
index e8a1bf70a..6fc9abb99 100644
--- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523
 	map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
 DewfordTown_PokemonCenter_1F_OnTransition: @ 81FC52E
diff --git a/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc
index fee3a7726..df8539f0b 100644
--- a/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc
+++ b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 DewfordTown_PokemonCenter_2F_MapScripts:: @ 81FC615
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
-	map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
-	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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
 
 @ The below 3 are unused and leftover from RS
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
index da1118a59..2d1f1de37 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34
 	map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
 EverGrandeCity_PokemonCenter_1F_OnTransition: @ 8229A3F
diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc
index 6a77b3e8a..f52419d60 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 EverGrandeCity_PokemonCenter_2F_MapScripts:: @ 8229CE0
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
-	map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
-	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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
 
 @ The below 3 are unused and leftover from RS
diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
index b3c562b4e..4b695d9d9 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
@@ -1,6 +1,6 @@
 EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2
 	map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_1F_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
 EverGrandeCity_PokemonLeague_1F_OnTransition: @ 82295DD
diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc
index 13bf1ab65..b860f95b8 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc
@@ -1,8 +1,8 @@
 EverGrandeCity_PokemonLeague_2F_MapScripts:: @ 8229D07
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
-	map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
-	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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
 
 @ The below 3 are unused and leftover from RS
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
index 2f1a28234..db9122b6d 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD
 	map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
 FallarborTown_PokemonCenter_1F_OnTransition: @ 8200BD8
diff --git a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc
index 6cffeef72..e9912ee68 100644
--- a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc
+++ b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 FallarborTown_PokemonCenter_2F_MapScripts:: @ 8200EEB
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
-	map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
-	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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
 
 @ The below 3 are unused and leftover from RS
diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
index 64779a285..fa88bd752 100644
--- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 FortreeCity_PokemonCenter_1F_MapScripts:: @ 82173D8
 	map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
 FortreeCity_PokemonCenter_1F_OnTransition: @ 82173E3
diff --git a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc
index 96dfd6e55..183dbece0 100644
--- a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 FortreeCity_PokemonCenter_2F_MapScripts:: @ 821763E
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
-	map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
-	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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
 
 @ The below 3 are unused and leftover from RS
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
index dbd67b11d..3a27182d5 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 81FFAFA
 	map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_1F_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
 LavaridgeTown_PokemonCenter_1F_OnTransition: @ 81FFB05
diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc
index d202f8fc0..633f91e95 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 LavaridgeTown_PokemonCenter_2F_MapScripts:: @ 81FFC97
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
-	map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
-	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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
 
 @ The below 3 are unused and leftover from RS
diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
index aac909c42..09b18f4bd 100644
--- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2
 	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_1F_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
 LilycoveCity_PokemonCenter_1F_OnTransition: @ 821C5BD
diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc
index d71277872..965580da5 100644
--- a/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 LilycoveCity_PokemonCenter_2F_MapScripts:: @ 821C75D
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
-	map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
-	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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
 
 @ The below 3 are unused and leftover from RS
diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
index 629618827..dd302167b 100644
--- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B
 	map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_1F_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
 MauvilleCity_PokemonCenter_1F_OnTransition: @ 8210E66
diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc
index 49977d6b3..9626e4882 100644
--- a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 MauvilleCity_PokemonCenter_2F_MapScripts:: @ 8211008
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
-	map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
-	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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
 
 @ The below 3 are unused and leftover from RS
diff --git a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc
index 4839d6a18..79f1a54e2 100644
--- a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc
+++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc
@@ -1,7 +1,7 @@
 MossdeepCity_GameCorner_1F_MapScripts:: @ 8224B27
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B41
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B37
-	map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
+	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
 	.byte 0
 
 MossdeepCity_GameCorner_1F_MapScript2_224B37: @ 8224B37
diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
index a02816883..02e8b33b4 100644
--- a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 MossdeepCity_PokemonCenter_1F_MapScripts:: @ 822223F
 	map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_1F_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
 MossdeepCity_PokemonCenter_1F_OnTransition: @ 822224A
diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc
index 82a099a80..1d88c9ca2 100644
--- a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 MossdeepCity_PokemonCenter_2F_MapScripts:: @ 8222334
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
-	map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
-	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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
 
 @ The below 3 are unused and leftover from RS
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
index ed25733d7..9df202d09 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 OldaleTown_PokemonCenter_1F_MapScripts:: @ 81FC006
 	map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_1F_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
 OldaleTown_PokemonCenter_1F_OnTransition: @ 81FC011
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc
index e0f83308f..125805f50 100644
--- a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc
+++ b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 OldaleTown_PokemonCenter_2F_MapScripts:: @ 81FC218
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
-	map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
-	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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
 
 @ The below 3 are unused and leftover from RS
diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
index 5066858bf..e51f6e89f 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 82034A7
 	map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_1F_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
 PacifidlogTown_PokemonCenter_1F_OnTransition: @ 82034B2
diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc
index f1189f787..576c1679c 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 PacifidlogTown_PokemonCenter_2F_MapScripts:: @ 8203635
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
-	map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
-	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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
 
 @ The below 3 are unused and leftover from RS
diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
index 0cda6f614..a5b069d94 100644
--- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 PetalburgCity_PokemonCenter_1F_MapScripts:: @ 82079E8
 	map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_1F_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
 PetalburgCity_PokemonCenter_1F_OnTransition: @ 82079F3
diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc
index 89deb5dc3..8485ae2c6 100644
--- a/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 PetalburgCity_PokemonCenter_2F_MapScripts:: @ 8207D41
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
-	map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
-	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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
 
 @ The below 3 are unused and leftover from RS
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
index 4ae6e9bd2..46555ba28 100644
--- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 RustboroCity_PokemonCenter_1F_MapScripts:: @ 8214D62
 	map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_1F_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
 RustboroCity_PokemonCenter_1F_OnTransition: @ 8214D6D
diff --git a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc
index 406c2619a..ba7b5b285 100644
--- a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 RustboroCity_PokemonCenter_2F_MapScripts:: @ 8214EDE
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
-	map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
-	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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
 
 @ The below 3 are unused and leftover from RS
diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
index 8ad506d5b..f148e5d3f 100644
--- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 SlateportCity_PokemonCenter_1F_MapScripts:: @ 820DABF
 	map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_1F_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
 SlateportCity_PokemonCenter_1F_OnTransition: @ 820DACA
diff --git a/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc
index bd996ec76..6406df27d 100644
--- a/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 SlateportCity_PokemonCenter_2F_MapScripts:: @ 820DC21
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
-	map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
-	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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
 
 @ The below 3 are unused and leftover from RS
diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
index ff0b8e07c..d2b546831 100644
--- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 SootopolisCity_PokemonCenter_1F_MapScripts:: @ 82264F1
 	map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_1F_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
 SootopolisCity_PokemonCenter_1F_OnTransition: @ 82264FC
diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc
index 0d20671dd..57d21cbb5 100644
--- a/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 SootopolisCity_PokemonCenter_2F_MapScripts:: @ 822676D
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
-	map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
-	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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
 
 @ The below 3 are unused and leftover from RS
diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
index 123e66408..32cecf152 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
@@ -1,6 +1,6 @@
 VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8202726
 	map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_1F_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, CableClub_MapScript1_InitUnionRoom
+	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
 VerdanturfTown_PokemonCenter_1F_OnTransition: @ 8202731
diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc
index bafbff336..7802f5b03 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc
@@ -1,8 +1,8 @@
 VerdanturfTown_PokemonCenter_2F_MapScripts:: @ 8202897
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_MapScript2_OnFrame
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_MapScript2_OnWarp
-	map_script MAP_SCRIPT_ON_LOAD, CableClub_MapScript1_OnLoad
-	map_script MAP_SCRIPT_ON_TRANSITION, CableClub_MapScript_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
 
 @ The below 3 are unused and leftover from RS
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 812da1c78..432e266ea 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -1,4 +1,4 @@
-CableClub_MapScript_OnTransition: @ 8276ACF
+CableClub_OnTransition: @ 8276ACF
 	call CableClub_EventScript_HideOrShowMysteryGiftMan
 	end
 
@@ -54,7 +54,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276B62:: @ 8276B62
 	release
 	end
 
-CableClub_MapScript2_OnWarp: @ 8276B6C
+CableClub_OnWarp: @ 8276B6C
 	map_script_2 VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE, CableClub_EventScript_CheckTurnAttendant
 	map_script_2 VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE, CableClub_EventScript_CheckTurnAttendant
 	map_script_2 VAR_CABLE_CLUB_STATE, USING_MULTI_BATTLE, CableClub_EventScript_CheckTurnAttendant
@@ -72,7 +72,7 @@ CableClub_EventScript_CheckTurnAttendant:: @ 8276BAE
 CableClub_EventScript_DontTurnAttendant:: @ 8276BBD
 	end
 
-CableClub_MapScript1_OnLoad: @ 8276BBE
+CableClub_OnLoad: @ 8276BBE
 	compare VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE
 	goto_if_eq CableClub_EventScript_OnLoadFromColosseum
 	compare VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE
@@ -115,7 +115,7 @@ CableClub_EventScript_OnLoadFromGameCorner:: @ 8276C35
 	call EventScript_OpenMossdeepGameCornerBarrier
 	end
 
-CableClub_MapScript2_OnFrame: @ 8276C3B
+CableClub_OnFrame: @ 8276C3B
 	map_script_2 VAR_CABLE_CLUB_TUTORIAL_STATE, 1, CableClub_EventScript_Tutorial
 	map_script_2 VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE, CableClub_EventScript_ExitLinkRoom
 	map_script_2 VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE, CableClub_EventScript_ExitLinkRoom
@@ -1350,7 +1350,7 @@ EventScript_CloseMossdeepGameCornerBarrier:: @ 8277C1D
 	setmetatile 5, 3, METATILE_MossdeepGameCorner_CounterClosed_Bottom, 1
 	return
 
-CableClub_MapScript1_InitUnionRoom: @ 8277C30
+CableClub_OnResume: @ 8277C30
 	special InitUnionRoom
 	end
 
@@ -1403,7 +1403,7 @@ MossdeepCity_GameCorner_1F_EventScript_OldMan2:: @ 8277C91
 
 MossdeepCity_GameCorner_1F_EventScript_PlayPokemonJump:: @ 8277CE9
 	setvar VAR_0x8005, 0
-	special DoesPartyHavePokemonJumpSpecies
+	special IsPokemonJumpSpeciesInParty
 	compare VAR_RESULT, FALSE
 	goto_if_eq MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon
 	msgbox MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon, MSGBOX_DEFAULT
@@ -1422,7 +1422,7 @@ MossdeepCity_GameCorner_1F_EventScript_PlayPokemonJump:: @ 8277CE9
 
 MossdeepCity_GameCorner_1F_EventScript_PlayDodrioBerryPicking:: @ 8277D35
 	setvar VAR_0x8005, 1
-	special DoesPartyHaveDodrio
+	special IsDodrioInParty
 	compare VAR_RESULT, FALSE
 	goto_if_eq MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon
 	msgbox MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon, MSGBOX_DEFAULT
diff --git a/data/specials.inc b/data/specials.inc
index 4b5055dcd..69a075817 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -436,9 +436,9 @@ gSpecials:: @ 81DBA64
 	def_special IsBadEggInParty
 	def_special ValidateReceivedWonderCard
 	def_special HasAtLeastOneBerry
-	def_special DoesPartyHavePokemonJumpSpecies
+	def_special IsPokemonJumpSpeciesInParty
 	def_special ShowPokemonJumpRecords
-	def_special DoesPartyHaveDodrio
+	def_special IsDodrioInParty
 	def_special ShowDodrioBerryPickingRecords
 	def_special OffsetCameraForBattle
 	def_special GetDeptStoreDefaultFloorChoice
diff --git a/include/constants/vars.h b/include/constants/vars.h
index 3fde9cc11..3030581c6 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -77,7 +77,7 @@
 #define VAR_REGICE_STEPS_2                   0x403C
 #define VAR_REGICE_STEPS_3                   0x403D
 #define VAR_ALTERING_CAVE_WILD_SET           0x403E
-#define VAR_DISTRIBUTE_EON_TICKET            0x403F // This var is read and written, but is always zero. Presumably meant to be set externally by Mystery Gift distribution 
+#define VAR_DISTRIBUTE_EON_TICKET            0x403F // This var is read and written, but is always zero. The only way to obtain the Eon Ticket in Emerald is via Record Mixing
 #define VAR_DAYS                             0x4040
 #define VAR_FANCLUB_UNKNOWN_1                0x4041
 #define VAR_FANCLUB_UNKNOWN_2                0x4042
diff --git a/include/dodrio_berry_picking.h b/include/dodrio_berry_picking.h
index ac802a2b5..9995decc2 100644
--- a/include/dodrio_berry_picking.h
+++ b/include/dodrio_berry_picking.h
@@ -2,7 +2,7 @@
 #define GUARD_DODRIO_BERRY_PICKING_H
 
 void sub_802493C(u16 a0, void (*callback)(void));
-void DoesPartyHaveDodrio(void);
+void IsDodrioInParty(void);
 void ShowDodrioBerryPickingRecords(void);
 
 #endif // GUARD_DODRIO_BERRY_PICKING_H
diff --git a/include/pokemon_jump.h b/include/pokemon_jump.h
index 4586ad6a6..dde59aac5 100644
--- a/include/pokemon_jump.h
+++ b/include/pokemon_jump.h
@@ -5,7 +5,7 @@
 
 void sub_802A9A8(u16 monId, MainCallback callback);
 bool32 IsSpeciesAllowedInPokemonJump(u16 species);
-void DoesPartyHavePokemonJumpSpecies(void);
+void IsPokemonJumpSpeciesInParty(void);
 void ResetPokeJumpResults(void);
 void ShowPokemonJumpRecords(void);
 void sub_802EB24(s16 tileTag, s16 palTag, s16 x, s16 y, u8 subpriority);
diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c
index 503a912c0..2e0cfbc7e 100644
--- a/src/dodrio_berry_picking.c
+++ b/src/dodrio_berry_picking.c
@@ -2580,7 +2580,7 @@ static u8 sub_8027A48(u8 id)
     return gUnknown_02022C98->unk34[id];
 }
 
-void DoesPartyHaveDodrio(void)
+void IsDodrioInParty(void)
 {
     int i;
     for (i = 0; i < PARTY_SIZE; i++)
diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c
index 9b733fa4c..76363af37 100755
--- a/src/pokemon_jump.c
+++ b/src/pokemon_jump.c
@@ -2209,7 +2209,7 @@ bool32 IsSpeciesAllowedInPokemonJump(u16 species)
     return GetPokemonJumpSpeciesIdx(species) > -1;
 }
 
-void DoesPartyHavePokemonJumpSpecies(void)
+void IsPokemonJumpSpeciesInParty(void)
 {
     int i;