Document Contest scripts

82 files changed, 2385 insertions, 2300 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index 33e95cd09..65f106a06 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -40,6 +40,7 @@
 #include "constants/trainer_hill.h"
 #include "constants/trainers.h"
 #include "constants/tv.h"
+#include "constants/union_room.h"
 #include "constants/vars.h"
 #include "constants/weather.h"
 	.include "asm/macros.inc"
@@ -442,18 +443,7 @@ gStdScripts_End:: @ 81DC2CC
 	.include "data/maps/TradeCenter/scripts.inc"
 	.include "data/maps/RecordCorner/scripts.inc"
 	.include "data/maps/BattleColosseum4P/scripts.inc"
-	.include "data/maps/LinkContestRoom1/scripts.inc"
-	.include "data/maps/UnknownLinkContestRoom_25_29/scripts.inc"
-	.include "data/maps/UnknownLinkContestRoom_25_30/scripts.inc"
-	.include "data/maps/UnknownLinkContestRoom_25_31/scripts.inc"
-	.include "data/maps/UnknownLinkContestRoom_25_32/scripts.inc"
-	.include "data/maps/UnknownLinkContestRoom_25_33/scripts.inc"
-	.include "data/maps/UnknownLinkContestRoom_25_34/scripts.inc"
-	.include "data/maps/LinkContestRoom2/scripts.inc"
-	.include "data/maps/LinkContestRoom3/scripts.inc"
-	.include "data/maps/LinkContestRoom4/scripts.inc"
-	.include "data/maps/LinkContestRoom5/scripts.inc"
-	.include "data/maps/LinkContestRoom6/scripts.inc"
+	.include "data/maps/ContestHall/scripts.inc"
 	.include "data/maps/InsideOfTruck/scripts.inc"
 	.include "data/maps/SSTidalCorridor/scripts.inc"
 	.include "data/maps/SSTidalLowerDeck/scripts.inc"
@@ -1122,7 +1112,7 @@ Common_EventScript_LegendaryFlewAway:: @ 8273776
 	.include "data/scripts/apprentice.inc"
 	.include "data/text/battle_dome.inc"
 	.include "data/scripts/battle_pike.inc"
-	.include "data/text/contest_hall.inc"
+	.include "data/text/blend_master.inc"
 	.include "data/text/battle_tent.inc"
 	.include "data/text/event_ticket_2.inc"
 	.include "data/text/move_tutors.inc"
diff --git a/data/layouts/LinkContestRoom1/border.bin b/data/layouts/ContestHall/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/LinkContestRoom1/border.bin
+++ b/data/layouts/ContestHall/border.bin
diff --git a/data/layouts/LinkContestRoom1/map.bin b/data/layouts/ContestHall/map.bin
index a8853f6ae..a8853f6ae 100644
--- a/data/layouts/LinkContestRoom1/map.bin
+++ b/data/layouts/ContestHall/map.bin
diff --git a/data/layouts/LinkContestRoom2/border.bin b/data/layouts/ContestHallBeauty/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/LinkContestRoom2/border.bin
+++ b/data/layouts/ContestHallBeauty/border.bin
diff --git a/data/layouts/LinkContestRoom2/map.bin b/data/layouts/ContestHallBeauty/map.bin
index 7cb63b40d..7cb63b40d 100644
--- a/data/layouts/LinkContestRoom2/map.bin
+++ b/data/layouts/ContestHallBeauty/map.bin
diff --git a/data/layouts/LinkContestRoom3/border.bin b/data/layouts/ContestHallCool/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/LinkContestRoom3/border.bin
+++ b/data/layouts/ContestHallCool/border.bin
diff --git a/data/layouts/LinkContestRoom4/map.bin b/data/layouts/ContestHallCool/map.bin
index 4e2166c19..4e2166c19 100644
--- a/data/layouts/LinkContestRoom4/map.bin
+++ b/data/layouts/ContestHallCool/map.bin
diff --git a/data/layouts/LinkContestRoom4/border.bin b/data/layouts/ContestHallCute/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/LinkContestRoom4/border.bin
+++ b/data/layouts/ContestHallCute/border.bin
diff --git a/data/layouts/LinkContestRoom6/map.bin b/data/layouts/ContestHallCute/map.bin
index 9fcec5a5e..9fcec5a5e 100644
--- a/data/layouts/LinkContestRoom6/map.bin
+++ b/data/layouts/ContestHallCute/map.bin
diff --git a/data/layouts/LinkContestRoom5/border.bin b/data/layouts/ContestHallSmart/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/LinkContestRoom5/border.bin
+++ b/data/layouts/ContestHallSmart/border.bin
diff --git a/data/layouts/LinkContestRoom5/map.bin b/data/layouts/ContestHallSmart/map.bin
index ad068fe7c..ad068fe7c 100644
--- a/data/layouts/LinkContestRoom5/map.bin
+++ b/data/layouts/ContestHallSmart/map.bin
diff --git a/data/layouts/LinkContestRoom6/border.bin b/data/layouts/ContestHallTough/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/LinkContestRoom6/border.bin
+++ b/data/layouts/ContestHallTough/border.bin
diff --git a/data/layouts/LinkContestRoom3/map.bin b/data/layouts/ContestHallTough/map.bin
index 59e9e9182..59e9e9182 100644
--- a/data/layouts/LinkContestRoom3/map.bin
+++ b/data/layouts/ContestHallTough/map.bin
diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json
index 5a696d5e0..6e6f92117 100644
--- a/data/layouts/layouts.json
+++ b/data/layouts/layouts.json
@@ -2242,14 +2242,14 @@
       "blockdata_filepath": "data/layouts/BattleColosseum4P/map.bin"
     },
     {
-      "id": "LAYOUT_LINK_CONTEST_ROOM1",
-      "name": "LinkContestRoom1_Layout",
+      "id": "LAYOUT_CONTEST_HALL",
+      "name": "ContestHall_Layout",
       "width": 15,
       "height": 11,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/LinkContestRoom1/border.bin",
-      "blockdata_filepath": "data/layouts/LinkContestRoom1/map.bin"
+      "border_filepath": "data/layouts/ContestHall/border.bin",
+      "blockdata_filepath": "data/layouts/ContestHall/map.bin"
     },
     {
       "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29",
@@ -2312,54 +2312,54 @@
       "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_34/map.bin"
     },
     {
-      "id": "LAYOUT_LINK_CONTEST_ROOM2",
-      "name": "LinkContestRoom2_Layout",
+      "id": "LAYOUT_CONTEST_HALL_BEAUTY",
+      "name": "ContestHallBeauty_Layout",
       "width": 15,
       "height": 11,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/LinkContestRoom2/border.bin",
-      "blockdata_filepath": "data/layouts/LinkContestRoom2/map.bin"
+      "border_filepath": "data/layouts/ContestHallBeauty/border.bin",
+      "blockdata_filepath": "data/layouts/ContestHallBeauty/map.bin"
     },
     {
-      "id": "LAYOUT_LINK_CONTEST_ROOM3",
-      "name": "LinkContestRoom3_Layout",
+      "id": "LAYOUT_CONTEST_HALL_TOUGH",
+      "name": "ContestHallTough_Layout",
       "width": 15,
       "height": 11,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/LinkContestRoom3/border.bin",
-      "blockdata_filepath": "data/layouts/LinkContestRoom3/map.bin"
+      "border_filepath": "data/layouts/ContestHallTough/border.bin",
+      "blockdata_filepath": "data/layouts/ContestHallTough/map.bin"
     },
     {
-      "id": "LAYOUT_LINK_CONTEST_ROOM4",
-      "name": "LinkContestRoom4_Layout",
+      "id": "LAYOUT_CONTEST_HALL_COOL",
+      "name": "ContestHallCool_Layout",
       "width": 15,
       "height": 11,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/LinkContestRoom4/border.bin",
-      "blockdata_filepath": "data/layouts/LinkContestRoom4/map.bin"
+      "border_filepath": "data/layouts/ContestHallCool/border.bin",
+      "blockdata_filepath": "data/layouts/ContestHallCool/map.bin"
     },
     {
-      "id": "LAYOUT_LINK_CONTEST_ROOM5",
-      "name": "LinkContestRoom5_Layout",
+      "id": "LAYOUT_CONTEST_HALL_SMART",
+      "name": "ContestHallSmart_Layout",
       "width": 15,
       "height": 11,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/LinkContestRoom5/border.bin",
-      "blockdata_filepath": "data/layouts/LinkContestRoom5/map.bin"
+      "border_filepath": "data/layouts/ContestHallSmart/border.bin",
+      "blockdata_filepath": "data/layouts/ContestHallSmart/map.bin"
     },
     {
-      "id": "LAYOUT_LINK_CONTEST_ROOM6",
-      "name": "LinkContestRoom6_Layout",
+      "id": "LAYOUT_CONTEST_HALL_CUTE",
+      "name": "ContestHallCute_Layout",
       "width": 15,
       "height": 11,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/LinkContestRoom6/border.bin",
-      "blockdata_filepath": "data/layouts/LinkContestRoom6/map.bin"
+      "border_filepath": "data/layouts/ContestHallCute/border.bin",
+      "blockdata_filepath": "data/layouts/ContestHallCute/map.bin"
     },
     {
       "id": "LAYOUT_INSIDE_OF_TRUCK",
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
index 9ab463d7c..3d278308c 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
@@ -1015,7 +1015,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3DA:: @ 823F3DA
 	end
 
 BattleFrontier_BattleTowerLobby_EventScript_23F3E8:: @ 823F3E8
-	setvar VAR_0x8004, 20
+	setvar VAR_0x8004, LINK_GROUP_BATTLE_TOWER
 	goto BattleFrontier_BattleTowerLobby_EventScript_23F3F3
 	end
 
diff --git a/data/maps/LinkContestRoom1/map.json b/data/maps/ContestHall/map.json
index 664a32b29..1402a9afa 100644
--- a/data/maps/LinkContestRoom1/map.json
+++ b/data/maps/ContestHall/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_LINK_CONTEST_ROOM1",
-  "name": "LinkContestRoom1",
-  "layout": "LAYOUT_LINK_CONTEST_ROOM1",
+  "id": "MAP_CONTEST_HALL",
+  "name": "ContestHall",
+  "layout": "LAYOUT_CONTEST_HALL",
   "music": "MUS_CONTEST0",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
@@ -181,7 +181,7 @@
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "0x0",
-      "flag": "FLAG_LINK_CONTEST_POKE_BALL"
+      "flag": "FLAG_HIDE_CONTEST_POKE_BALL"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_VAR_3",
diff --git a/data/maps/ContestHall/scripts.inc b/data/maps/ContestHall/scripts.inc
new file mode 100644
index 000000000..e1ef9b708
--- /dev/null
+++ b/data/maps/ContestHall/scripts.inc
@@ -0,0 +1,460 @@
+ContestHall_MapScripts:: @ 823B781
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, ContestHall_OnWarp
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, ContestHall_OnFrame
+	map_script MAP_SCRIPT_ON_TRANSITION, ContestHall_OnTransition
+	map_script MAP_SCRIPT_ON_RESUME, ContestHall_OnResume
+	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, ContestHall_OnReturn
+	.byte 0
+
+ContestHall_OnReturn: @ 823B79B
+	special LoadLinkContestPlayerPalettes
+	end
+
+ContestHall_OnTransition: @ 823B79F
+	call ContestHall_EventScript_ReadyContestMusic
+	setvar VAR_TEMP_0, 1
+	call ContestHall_EventScript_AddRandomAudienceMembers
+	end
+
+ContestHall_EventScript_ReadyContestMusic:: @ 823B7AF
+	call ContestHall_EventScript_TryWaitForLink
+	special ScriptGetMultiplayerId
+	compare VAR_RESULT, 0
+	call_if_eq ContestHall_EventScript_SaveContestMusicPlayer1
+	compare VAR_RESULT, 1
+	call_if_eq ContestHall_EventScript_SaveContestMusicPlayer2
+	compare VAR_RESULT, 2
+	call_if_eq ContestHall_EventScript_SaveContestMusicPlayer3
+	compare VAR_RESULT, 3
+	call_if_eq ContestHall_EventScript_SaveContestMusicPlayer4
+	compare VAR_RESULT, 4
+	call_if_eq ContestHall_EventScript_SaveContestMusic
+	return
+
+ContestHall_EventScript_SaveContestMusicPlayer1:: @ 823B7EF
+	savebgm MUS_TEST1
+	return
+
+ContestHall_EventScript_SaveContestMusicPlayer2:: @ 823B7F3
+	savebgm MUS_TEST2
+	return
+
+ContestHall_EventScript_SaveContestMusicPlayer3:: @ 823B7F7
+	savebgm MUS_TEST3
+	return
+
+ContestHall_EventScript_SaveContestMusicPlayer4:: @ 823B7FB
+	savebgm MUS_TEST4
+	return
+
+ContestHall_EventScript_SaveContestMusic:: @ 823B7FF
+	savebgm MUS_CONTEST0
+	return
+
+ContestHall_OnResume: @ 823B803
+	compare VAR_TEMP_9, 1
+	call_if_eq ContestHall_EventScript_ReShowAudience
+	end
+
+ContestHall_EventScript_ReShowAudience:: @ 823B80F
+	call ContestHall_EventScript_CreateAudience
+	return
+
+ContestHall_OnFrame: @ 823B815
+	map_script_2 VAR_CONTEST_HALL_STATE, 1, ContestHall_EventScript_Contest
+	.2byte 0
+
+ContestHall_OnWarp: @ 823B81F
+	map_script_2 VAR_CONTEST_HALL_STATE, 1, ContestHall_EventScript_SetContestObjects
+	.2byte 0
+
+ContestHall_EventScript_Contest:: @ 823B829
+	call ContestHall_EventScript_DoContest
+	call ContestHall_EventScript_SetExitWarp
+	end
+
+ContestHall_EventScript_SetContestObjects:: @ 823B834
+	special LoadLinkContestPlayerPalettes
+	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN
+	call ContestHall_EventScript_CreateAudience
+	end
+
+@ There are 8 audience member event objects, 7 of which are given random gfx below (the 8th is the Artist)
+@ The rest of the audience is created statically by ContestHall_EventScript_CreateAudience
+ContestHall_EventScript_AddRandomAudienceMembers:: @ 823B842
+	call ContestHall_EventScript_GetRandomAudienceGfxId
+	call ContestHall_EventScript_SetRandomAudienceGfx
+	compare VAR_TEMP_0, 8
+	goto_if_lt ContestHall_EventScript_AddRandomAudienceMembers
+	return
+
+ContestHall_EventScript_SetRandomAudienceGfx:: @ 823B858
+	switch VAR_TEMP_0
+	case 1, ContestHall_EventScript_SetRandomAudience1
+	case 2, ContestHall_EventScript_SetRandomAudience2
+	case 3, ContestHall_EventScript_SetRandomAudience3
+	case 4, ContestHall_EventScript_SetRandomAudience4
+	case 5, ContestHall_EventScript_SetRandomAudience5
+	case 6, ContestHall_EventScript_SetRandomAudience6
+	case 7, ContestHall_EventScript_SetRandomAudience7
+	end
+
+ContestHall_EventScript_SetRandomAudience1:: @ 823B8AB
+	copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+ContestHall_EventScript_SetRandomAudience2:: @ 823B8B6
+	copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+ContestHall_EventScript_SetRandomAudience3:: @ 823B8C1
+	copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+ContestHall_EventScript_SetRandomAudience4:: @ 823B8CC
+	copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+ContestHall_EventScript_SetRandomAudience5:: @ 823B8D7
+	copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+ContestHall_EventScript_SetRandomAudience6:: @ 823B8E2
+	copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+ContestHall_EventScript_SetRandomAudience7:: @ 823B8ED
+	copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+ContestHall_EventScript_GetRandomAudienceGfxId:: @ 823B8F8
+	setvar VAR_RESULT, 32
+	special ScriptRandom
+	addvar VAR_RESULT, 1
+	switch VAR_RESULT
+	case 1, ContestHall_EventScript_RandomAudienceNinjaBoy
+	case 2, ContestHall_EventScript_RandomAudienceTwin
+	case 3, ContestHall_EventScript_RandomAudienceBoy1
+	case 4, ContestHall_EventScript_RandomAudienceGirl1
+	case 5, ContestHall_EventScript_RandomAudienceGirl2
+	case 6, ContestHall_EventScript_RandomAudienceLittleBoy
+	case 7, ContestHall_EventScript_RandomAudienceGirl
+	case 8, ContestHall_EventScript_RandomAudienceBoy3
+	case 9, ContestHall_EventScript_RandomAudienceGirl3
+	case 10, ContestHall_EventScript_RandomAudienceRichBoy
+	case 11, ContestHall_EventScript_RandomAudienceFatMan
+	case 12, ContestHall_EventScript_RandomAudiencePokefanF
+	case 13, ContestHall_EventScript_RandomAudienceMan1
+	case 14, ContestHall_EventScript_RandomAudienceWoman2
+	case 15, ContestHall_EventScript_RandomAudienceExpertM
+	case 16, ContestHall_EventScript_RandomAudienceExpertF
+	case 17, ContestHall_EventScript_RandomAudiencePokefanM
+	case 18, ContestHall_EventScript_RandomAudienceWoman4
+	case 19, ContestHall_EventScript_RandomAudienceCook
+	case 20, ContestHall_EventScript_RandomAudienceLass
+	case 21, ContestHall_EventScript_RandomAudienceOldWoman
+	case 22, ContestHall_EventScript_RandomAudienceCamper
+	case 23, ContestHall_EventScript_RandomAudiencePicnicker
+	case 24, ContestHall_EventScript_RandomAudienceMan3
+	case 25, ContestHall_EventScript_RandomAudienceWoman5
+	case 26, ContestHall_EventScript_RandomAudienceYoungster
+	case 27, ContestHall_EventScript_RandomAudienceBugCatcher
+	case 28, ContestHall_EventScript_RandomAudiencePsychicM
+	case 29, ContestHall_EventScript_RandomAudienceSchoolKidM
+	case 30, ContestHall_EventScript_RandomAudienceBlackBelt
+	case 31, ContestHall_EventScript_RandomAudienceBeauty
+	case 32, ContestHall_EventScript_RandomAudienceScientist1
+	end
+
+ContestHall_EventScript_RandomAudienceNinjaBoy:: @ 823BA6B
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_NINJA_BOY
+	return
+
+ContestHall_EventScript_RandomAudienceTwin:: @ 823BA71
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_TWIN
+	return
+
+ContestHall_EventScript_RandomAudienceBoy1:: @ 823BA77
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_BOY_1
+	return
+
+ContestHall_EventScript_RandomAudienceGirl1:: @ 823BA7D
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_1
+	return
+
+ContestHall_EventScript_RandomAudienceGirl2:: @ 823BA83
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_2
+	return
+
+ContestHall_EventScript_RandomAudienceLittleBoy:: @ 823BA89
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_LITTLE_BOY
+	return
+
+ContestHall_EventScript_RandomAudienceGirl:: @ 823BA8F
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_LITTLE_GIRL
+	return
+
+ContestHall_EventScript_RandomAudienceBoy3:: @ 823BA95
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_BOY_3
+	return
+
+ContestHall_EventScript_RandomAudienceGirl3:: @ 823BA9B
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_3
+	return
+
+ContestHall_EventScript_RandomAudienceRichBoy:: @ 823BAA1
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_RICH_BOY
+	return
+
+ContestHall_EventScript_RandomAudienceFatMan:: @ 823BAA7
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_FAT_MAN
+	return
+
+ContestHall_EventScript_RandomAudiencePokefanF:: @ 823BAAD
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_POKEFAN_F
+	return
+
+ContestHall_EventScript_RandomAudienceMan1:: @ 823BAB3
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_MAN_1
+	return
+
+ContestHall_EventScript_RandomAudienceWoman2:: @ 823BAB9
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_2
+	return
+
+ContestHall_EventScript_RandomAudienceExpertM:: @ 823BABF
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_EXPERT_M
+	return
+
+ContestHall_EventScript_RandomAudienceExpertF:: @ 823BAC5
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_EXPERT_F
+	return
+
+ContestHall_EventScript_RandomAudiencePokefanM:: @ 823BACB
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_POKEFAN_M
+	return
+
+ContestHall_EventScript_RandomAudienceWoman4:: @ 823BAD1
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_4
+	return
+
+ContestHall_EventScript_RandomAudienceCook:: @ 823BAD7
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_COOK
+	return
+
+ContestHall_EventScript_RandomAudienceLass:: @ 823BADD
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_LASS
+	return
+
+ContestHall_EventScript_RandomAudienceOldWoman:: @ 823BAE3
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_OLD_WOMAN
+	return
+
+ContestHall_EventScript_RandomAudienceCamper:: @ 823BAE9
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_CAMPER
+	return
+
+ContestHall_EventScript_RandomAudiencePicnicker:: @ 823BAEF
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_PICNICKER
+	return
+
+ContestHall_EventScript_RandomAudienceMan3:: @ 823BAF5
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_MAN_3
+	return
+
+ContestHall_EventScript_RandomAudienceWoman5:: @ 823BAFB
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_5
+	return
+
+ContestHall_EventScript_RandomAudienceYoungster:: @ 823BB01
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_YOUNGSTER
+	return
+
+ContestHall_EventScript_RandomAudienceBugCatcher:: @ 823BB07
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_BUG_CATCHER
+	return
+
+ContestHall_EventScript_RandomAudiencePsychicM:: @ 823BB0D
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_PSYCHIC_M
+	return
+
+ContestHall_EventScript_RandomAudienceSchoolKidM:: @ 823BB13
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_SCHOOL_KID_M
+	return
+
+ContestHall_EventScript_RandomAudienceBlackBelt:: @ 823BB19
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_BLACK_BELT
+	return
+
+ContestHall_EventScript_RandomAudienceBeauty:: @ 823BB1F
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_BEAUTY
+	return
+
+ContestHall_EventScript_RandomAudienceScientist1:: @ 823BB25
+	setvar VAR_TEMP_1, EVENT_OBJ_GFX_SCIENTIST_1
+	return
+
+ContestHall_EventScript_CreateAudience:: @ 823BB2B
+	specialvar VAR_RESULT, IsWirelessContest
+	compare VAR_RESULT, TRUE
+	goto_if_eq ContestHall_EventScript_CreateWirelessContestAudience
+	switch VAR_CONTEST_TYPE
+	case CONTEST_TYPE_NPC_NORMAL, ContestHall_EventScript_CreateNormalContestAudience
+	case CONTEST_TYPE_NPC_SUPER, ContestHall_EventScript_CreateSuperContestAudience
+	case CONTEST_TYPE_NPC_HYPER, ContestHall_EventScript_CreateHyperContestAudience
+	case CONTEST_TYPE_NPC_MASTER, ContestHall_EventScript_CreateMasterContestAudience
+	case CONTEST_TYPE_LINK, ContestHall_EventScript_CreateMasterContestAudience
+	return
+
+ContestHall_EventScript_CreateNormalContestAudience:: @ 823BB78
+	createvobject EVENT_OBJ_GFX_NINJA_BOY, 20, 3, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
+	return
+
+ContestHall_EventScript_CreateSuperContestAudience:: @ 823BB8B
+	createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 3, 2, 8, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 13, 12, 8, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_LASS, 20, 3, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
+	return
+
+ContestHall_EventScript_CreateHyperContestAudience:: @ 823BBE6
+	createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_GENTLEMAN, 3, 2, 8, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 3, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_MAN_2, 20, 6, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_WOMAN_5, 20, 7, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 8, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_GENTLEMAN, 24, 11, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 3, 9, 3, DIR_NORTH
+	createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, DIR_NORTH
+	createvobject EVENT_OBJ_GFX_FAT_MAN, 27, 5, 9, 3, DIR_NORTH
+	createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, DIR_NORTH
+	createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, DIR_NORTH
+	createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH
+	return
+
+ContestHall_EventScript_CreateMasterContestAudience:: @ 823BC92
+	createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_SAILOR, 25, 3, 9, 3, DIR_NORTH
+	createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, DIR_NORTH
+	createvobject EVENT_OBJ_GFX_GENTLEMAN, 27, 5, 9, 3, DIR_NORTH
+	createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, DIR_NORTH
+	createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, DIR_NORTH
+	createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH
+	return
+
+ContestHall_EventScript_CreateWirelessContestAudience:: @ 823BD86
+	createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, DIR_EAST
+	createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, DIR_WEST
+	createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, DIR_SOUTH
+	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
+	return
+
+ContestHall_EventScript_SetExitWarp:: @ 823BE44
+	special ClearLinkContestFlags
+	switch VAR_CONTEST_TYPE
+	case CONTEST_TYPE_NPC_NORMAL, ContestHall_EventScript_SetExitWarpNormalContest
+	case CONTEST_TYPE_NPC_SUPER, ContestHall_EventScript_SetExitWarpSuperContest
+	case CONTEST_TYPE_NPC_HYPER, ContestHall_EventScript_SetExitWarpHyperContest
+	case CONTEST_TYPE_NPC_MASTER, ContestHall_EventScript_SetExitWarpMasterContest
+	case CONTEST_TYPE_LINK, ContestHall_EventScript_SetExitWarpLinkContest
+	return
+
+ContestHall_EventScript_SetExitWarpNormalContest:: @ 823BE84
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
+	waitstate
+	end
+
+ContestHall_EventScript_SetExitWarpSuperContest:: @ 823BE8E
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
+	waitstate
+	end
+
+ContestHall_EventScript_SetExitWarpHyperContest:: @ 823BE98
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
+	waitstate
+	end
+
+ContestHall_EventScript_SetExitWarpMasterContest:: @ 823BEA2
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
+	waitstate
+	end
+
+ContestHall_EventScript_SetExitWarpLinkContest:: @ 823BEAC
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4
+	waitstate
+	end
+
+LilycoveCity_ContestLobby_EventScript_SetPlayerGfx:: @ 823BEB6
+	checkplayergender
+	compare VAR_RESULT, MALE
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_SetPlayerGfxBrendan
+	compare VAR_RESULT, FEMALE
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_SetPlayerGfxMay
+	return
+
+LilycoveCity_ContestLobby_EventScript_SetPlayerGfxBrendan:: @ 823BECE
+	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
+	return
+
+LilycoveCity_ContestLobby_EventScript_SetPlayerGfxMay:: @ 823BED4
+	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
+	return
+
diff --git a/data/maps/LinkContestRoom5/map.json b/data/maps/ContestHallBeauty/map.json
index f312d4c2b..daad0f962 100644
--- a/data/maps/LinkContestRoom5/map.json
+++ b/data/maps/ContestHallBeauty/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_LINK_CONTEST_ROOM5",
-  "name": "LinkContestRoom5",
-  "layout": "LAYOUT_LINK_CONTEST_ROOM5",
+  "id": "MAP_CONTEST_HALL_BEAUTY",
+  "name": "ContestHallBeauty",
+  "layout": "LAYOUT_CONTEST_HALL_BEAUTY",
   "music": "MUS_CONTEST0",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
@@ -13,6 +13,6 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
+  "shared_events_map": "ContestHall",
+  "shared_scripts_map": "ContestHall"
 }
\ No newline at end of file
diff --git a/data/maps/LinkContestRoom2/map.json b/data/maps/ContestHallCool/map.json
index b02da178f..d1c2e985c 100644
--- a/data/maps/LinkContestRoom2/map.json
+++ b/data/maps/ContestHallCool/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_LINK_CONTEST_ROOM2",
-  "name": "LinkContestRoom2",
-  "layout": "LAYOUT_LINK_CONTEST_ROOM2",
+  "id": "MAP_CONTEST_HALL_COOL",
+  "name": "ContestHallCool",
+  "layout": "LAYOUT_CONTEST_HALL_COOL",
   "music": "MUS_CONTEST0",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
@@ -13,6 +13,6 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
+  "shared_events_map": "ContestHall",
+  "shared_scripts_map": "ContestHall"
 }
\ No newline at end of file
diff --git a/data/maps/LinkContestRoom3/map.json b/data/maps/ContestHallCute/map.json
index fb0bf29e0..d6b16dc4e 100644
--- a/data/maps/LinkContestRoom3/map.json
+++ b/data/maps/ContestHallCute/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_LINK_CONTEST_ROOM3",
-  "name": "LinkContestRoom3",
-  "layout": "LAYOUT_LINK_CONTEST_ROOM3",
+  "id": "MAP_CONTEST_HALL_CUTE",
+  "name": "ContestHallCute",
+  "layout": "LAYOUT_CONTEST_HALL_CUTE",
   "music": "MUS_CONTEST0",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
@@ -13,6 +13,6 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
+  "shared_events_map": "ContestHall",
+  "shared_scripts_map": "ContestHall"
 }
\ No newline at end of file
diff --git a/data/maps/LinkContestRoom4/map.json b/data/maps/ContestHallSmart/map.json
index 85d12ece4..12d3cccd8 100644
--- a/data/maps/LinkContestRoom4/map.json
+++ b/data/maps/ContestHallSmart/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_LINK_CONTEST_ROOM4",
-  "name": "LinkContestRoom4",
-  "layout": "LAYOUT_LINK_CONTEST_ROOM4",
+  "id": "MAP_CONTEST_HALL_SMART",
+  "name": "ContestHallSmart",
+  "layout": "LAYOUT_CONTEST_HALL_SMART",
   "music": "MUS_CONTEST0",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
@@ -13,6 +13,6 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
+  "shared_events_map": "ContestHall",
+  "shared_scripts_map": "ContestHall"
 }
\ No newline at end of file
diff --git a/data/maps/ContestHallTough/map.json b/data/maps/ContestHallTough/map.json
new file mode 100644
index 000000000..070211173
--- /dev/null
+++ b/data/maps/ContestHallTough/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_CONTEST_HALL_TOUGH",
+  "name": "ContestHallTough",
+  "layout": "LAYOUT_CONTEST_HALL_TOUGH",
+  "music": "MUS_CONTEST0",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "shared_events_map": "ContestHall",
+  "shared_scripts_map": "ContestHall"
+}
\ No newline at end of file
diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc
index f5e09a026..a94c81ae9 100644
--- a/data/maps/FallarborTown/scripts.inc
+++ b/data/maps/FallarborTown/scripts.inc
@@ -4,7 +4,7 @@ FallarborTown_MapScripts:: @ 81EB1FA
 
 FallarborTown_OnTransition: @ 81EB200
 	setflag FLAG_VISITED_FALLARBOR_TOWN
-	setvar VAR_LINK_CONTEST_ROOM_STATE, 0
+	setvar VAR_CONTEST_HALL_STATE, 0
 	clearflag FLAG_CONTEST_SKETCH_CREATED
 	end
 
diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc
index ada0490e3..66746ad37 100644
--- a/data/maps/LilycoveCity/scripts.inc
+++ b/data/maps/LilycoveCity/scripts.inc
@@ -5,7 +5,7 @@ LilycoveCity_MapScripts:: @ 81E2B3C
 
 LilycoveCity_OnTransition: @ 81E2B47
 	setflag FLAG_VISITED_LILYCOVE_CITY
-	setvar VAR_LINK_CONTEST_ROOM_STATE, 0
+	setvar VAR_CONTEST_HALL_STATE, 0
 	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
 	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
 	call Common_EventScript_SetupRivalGfxId
diff --git a/data/maps/LilycoveCity_ContestLobby/map.json b/data/maps/LilycoveCity_ContestLobby/map.json
index a76bba10d..744ed4174 100644
--- a/data/maps/LilycoveCity_ContestLobby/map.json
+++ b/data/maps/LilycoveCity_ContestLobby/map.json
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_Blender2Man",
+      "script": "BerryBlender_EventScript_Blender2Man",
       "flag": "0"
     },
     {
@@ -141,7 +141,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_Blender2Twin",
+      "script": "BerryBlender_EventScript_Blender2Twin",
       "flag": "0"
     },
     {
@@ -206,7 +206,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_Blender3PokefanF",
+      "script": "BerryBlender_EventScript_Blender3PokefanF",
       "flag": "0"
     },
     {
@@ -219,7 +219,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_Blender1ExpertM",
+      "script": "BerryBlender_EventScript_Blender1ExpertM",
       "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_REPLACEMENT"
     },
     {
@@ -378,7 +378,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestLobby_EventScript_BerryBlenderLink"
+      "script": "BerryBlender_EventScript_BerryBlenderLink"
     },
     {
       "type": "sign",
@@ -386,7 +386,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestLobby_EventScript_BerryBlender3"
+      "script": "BerryBlender_EventScript_BerryBlender3"
     },
     {
       "type": "sign",
@@ -450,7 +450,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestLobby_EventScript_BerryBlender1"
+      "script": "BerryBlender_EventScript_BerryBlender1"
     },
     {
       "type": "sign",
@@ -458,7 +458,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestLobby_EventScript_BerryBlender2"
+      "script": "BerryBlender_EventScript_BerryBlender2"
     },
     {
       "type": "sign",
diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc
index 4c44ced89..ecd8e2b95 100644
--- a/data/maps/LilycoveCity_ContestLobby/scripts.inc
+++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc
@@ -1,166 +1,166 @@
 LilycoveCity_ContestLobby_MapScripts:: @ 821A211
 	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_ContestLobby_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_ContestLobby_MapScript2_21A243
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_ContestLobby_OnFrame
 	.byte 0
 
 @ Some scripts for this room are split into data/scripts/contest_hall and data/scripts/berry_blender
 
 LilycoveCity_ContestLobby_OnTransition: @ 821A21C
-	call LilycoveCity_ContestLobby_EventScript_28CB2B
-	call LilycoveCity_ContestLobby_EventScript_21A227
+	call LilycoveCity_ContestLobby_EventScript_TryShowContestReporter
+	call LilycoveCity_ContestLobby_EventScript_TryShowBlendMaster
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A227:: @ 821A227
+LilycoveCity_ContestLobby_EventScript_TryShowBlendMaster:: @ 821A227
 	getpricereduction POKENEWS_BLENDMASTER
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A23C
+	compare VAR_RESULT, TRUE
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_ShowBlendMaster
 	clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_REPLACEMENT
 	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A23C:: @ 821A23C
+LilycoveCity_ContestLobby_EventScript_ShowBlendMaster:: @ 821A23C
 	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_REPLACEMENT
 	clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER
 	return
 
-LilycoveCity_ContestLobby_MapScript2_21A243: @ 821A243
-	map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1, LilycoveCity_ContestLobby_EventScript_21A255
-	map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2, LilycoveCity_ContestLobby_EventScript_21A427
+LilycoveCity_ContestLobby_OnFrame: @ 821A243
+	map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1, LilycoveCity_ContestLobby_EventScript_TryDoContestArtist
+	map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2, LilycoveCity_ContestLobby_EventScript_TryDoLinkContestArtist
 	.2byte 0
 
-LilycoveCity_ContestLobby_EventScript_21A255:: @ 821A255
-	goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_21A264
+LilycoveCity_ContestLobby_EventScript_TryDoContestArtist:: @ 821A255
+	goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_ContestArtist
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A264:: @ 821A264
+LilycoveCity_ContestLobby_EventScript_ContestArtist:: @ 821A264
 	lockall
 	addobject 4
-	applymovement 4, LilycoveCity_ContestLobby_Movement_21A407
+	applymovement 4, LilycoveCity_ContestLobby_Movement_ArtistApproachPlayer
 	waitmovement 4
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21A418
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerFaceArtist
 	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_21ADB9, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint, MSGBOX_DEFAULT
 	lockall
 	fadescreen 1
 	showcontestwinner 0
 	lockall
-	msgbox LilycoveCity_ContestLobby_Text_21AE78, MSGBOX_YESNO
+	msgbox LilycoveCity_ContestLobby_Text_ShouldITakePaintingToMuseum, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A2AA
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseum
 	compare VAR_RESULT, NO
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A2E4
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_ConfirmDontTakePainting
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA
-	msgbox LilycoveCity_ContestLobby_Text_21AF63, MSGBOX_DEFAULT
+LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseum:: @ 821A2AA
+	msgbox LilycoveCity_ContestLobby_Text_IllTakePaintingToMuseum, MSGBOX_DEFAULT
 	closemessage
-	special sub_80F88DC
+	special SaveMuseumContestPainting
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
 	specialvar VAR_RESULT, GiveMonArtistRibbon
-	compare VAR_RESULT, 1
-	call_if_eq LilycoveCity_ContestLobby_EventScript_21A314
-	applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F
+	compare VAR_RESULT, TRUE
+	call_if_eq LilycoveCity_ContestLobby_EventScript_ReceivedArtistRibbon
+	applymovement 4, LilycoveCity_ContestLobby_Movement_ArtistExit
 	waitmovement 0
 	removeobject 4
-	call LilycoveCity_ContestLobby_EventScript_21A360
-	call LilycoveCity_ContestLobby_EventScript_21A3B6
+	call LilycoveCity_ContestLobby_EventScript_UpdateMuseumPatrons
+	call LilycoveCity_ContestLobby_EventScript_SetPaintingFlag
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A2E4:: @ 821A2E4
-	msgbox LilycoveCity_ContestLobby_Text_21B0BC, MSGBOX_YESNO
+LilycoveCity_ContestLobby_EventScript_ConfirmDontTakePainting:: @ 821A2E4
+	msgbox LilycoveCity_ContestLobby_Text_TakeHomeButIdLikeToTakeToMuseum, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A2AA
-	msgbox LilycoveCity_ContestLobby_Text_21B132, MSGBOX_DEFAULT
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseum
+	msgbox LilycoveCity_ContestLobby_Text_FineThatsTheWayItIs, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F
+	applymovement 4, LilycoveCity_ContestLobby_Movement_ArtistExit
 	waitmovement 0
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
 	removeobject 4
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A314:: @ 821A314
+LilycoveCity_ContestLobby_EventScript_ReceivedArtistRibbon:: @ 821A314
 	incrementgamestat GAME_STAT_RECEIVED_RIBBONS
-	special sub_80F8390
-	applymovement 4, LilycoveCity_ContestLobby_Movement_21A41A
+	special BufferContestWinnerMonName
+	applymovement 4, LilycoveCity_ContestLobby_Movement_ArtistBeginToExit
 	waitmovement 0
 	playse SE_PIN
 	applymovement 4, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 4, LilycoveCity_ContestLobby_Movement_21A41E
+	applymovement 4, LilycoveCity_ContestLobby_Movement_ArtistReturnToPlayer
 	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_21B030, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_TakeMementoOfPainting, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA4
-	msgbox LilycoveCity_ContestLobby_Text_21B07E, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_ReceivedARibbon, MSGBOX_DEFAULT
 	waitfanfare
-	msgbox LilycoveCity_ContestLobby_Text_21B094, MSGBOX_DEFAULT
-	msgbox LilycoveCity_ContestLobby_Text_21B0AD, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_PutTheRibbonOnMon, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_OkaySeeYou, MSGBOX_DEFAULT
 	closemessage
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A360:: @ 821A360
+LilycoveCity_ContestLobby_EventScript_UpdateMuseumPatrons:: @ 821A360
 	specialvar VAR_0x8004, CountPlayerContestPaintings
 	switch VAR_0x8004
-	case 1, LilycoveCity_ContestLobby_EventScript_21A3A2
-	case 2, LilycoveCity_ContestLobby_EventScript_21A3A6
-	case 3, LilycoveCity_ContestLobby_EventScript_21A3AA
-	case 4, LilycoveCity_ContestLobby_EventScript_21A3AE
-	case 5, LilycoveCity_ContestLobby_EventScript_21A3B2
+	case 1, LilycoveCity_ContestLobby_EventScript_ShowPatron1
+	case 2, LilycoveCity_ContestLobby_EventScript_ShowPatron2
+	case 3, LilycoveCity_ContestLobby_EventScript_ShowPatron3
+	case 4, LilycoveCity_ContestLobby_EventScript_ShowPatron4
+	case 5, LilycoveCity_ContestLobby_EventScript_ShowTourists
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A3A2:: @ 821A3A2
+LilycoveCity_ContestLobby_EventScript_ShowPatron1:: @ 821A3A2
 	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A3A6:: @ 821A3A6
+LilycoveCity_ContestLobby_EventScript_ShowPatron2:: @ 821A3A6
 	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A3AA:: @ 821A3AA
+LilycoveCity_ContestLobby_EventScript_ShowPatron3:: @ 821A3AA
 	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A3AE:: @ 821A3AE
+LilycoveCity_ContestLobby_EventScript_ShowPatron4:: @ 821A3AE
 	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A3B2:: @ 821A3B2
+LilycoveCity_ContestLobby_EventScript_ShowTourists:: @ 821A3B2
 	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A3B6:: @ 821A3B6
+LilycoveCity_ContestLobby_EventScript_SetPaintingFlag:: @ 821A3B6
 	switch VAR_CONTEST_CATEGORY
-	case 0, LilycoveCity_ContestLobby_EventScript_21A3F3
-	case 1, LilycoveCity_ContestLobby_EventScript_21A3F7
-	case 2, LilycoveCity_ContestLobby_EventScript_21A3FB
-	case 3, LilycoveCity_ContestLobby_EventScript_21A3FF
-	case 4, LilycoveCity_ContestLobby_EventScript_21A403
+	case CONTEST_CATEGORY_COOL, LilycoveCity_ContestLobby_EventScript_MadeCoolPainting
+	case CONTEST_CATEGORY_BEAUTY, LilycoveCity_ContestLobby_EventScript_MadeBeautyPainting
+	case CONTEST_CATEGORY_CUTE, LilycoveCity_ContestLobby_EventScript_MadeCutePainting
+	case CONTEST_CATEGORY_SMART, LilycoveCity_ContestLobby_EventScript_MadeSmartPainting
+	case CONTEST_CATEGORY_TOUGH, LilycoveCity_ContestLobby_EventScript_MadeToughPainting
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A3F3:: @ 821A3F3
+LilycoveCity_ContestLobby_EventScript_MadeCoolPainting:: @ 821A3F3
 	setflag FLAG_COOL_PAINTING_MADE
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A3F7:: @ 821A3F7
+LilycoveCity_ContestLobby_EventScript_MadeBeautyPainting:: @ 821A3F7
 	setflag FLAG_BEAUTY_PAINTING_MADE
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A3FB:: @ 821A3FB
+LilycoveCity_ContestLobby_EventScript_MadeCutePainting:: @ 821A3FB
 	setflag FLAG_CUTE_PAINTING_MADE
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A3FF:: @ 821A3FF
+LilycoveCity_ContestLobby_EventScript_MadeSmartPainting:: @ 821A3FF
 	setflag FLAG_SMART_PAINTING_MADE
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A403:: @ 821A403
+LilycoveCity_ContestLobby_EventScript_MadeToughPainting:: @ 821A403
 	setflag FLAG_TOUGH_PAINTING_MADE
 	return
 
-LilycoveCity_ContestLobby_Movement_21A407: @ 821A407
+LilycoveCity_ContestLobby_Movement_ArtistApproachPlayer: @ 821A407
 	walk_down
 	walk_down
 	walk_down
@@ -170,7 +170,7 @@ LilycoveCity_ContestLobby_Movement_21A407: @ 821A407
 	walk_right
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21A40F: @ 821A40F
+LilycoveCity_ContestLobby_Movement_ArtistExit: @ 821A40F
 	walk_down
 	walk_down
 	walk_down
@@ -181,17 +181,17 @@ LilycoveCity_ContestLobby_Movement_21A40F: @ 821A40F
 	walk_down
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21A418: @ 821A418
+LilycoveCity_ContestLobby_Movement_PlayerFaceArtist: @ 821A418
 	walk_in_place_fastest_left
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21A41A: @ 821A41A
+LilycoveCity_ContestLobby_Movement_ArtistBeginToExit: @ 821A41A
 	walk_down
 	walk_down
 	walk_down
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21A41E: @ 821A41E
+LilycoveCity_ContestLobby_Movement_ArtistReturnToPlayer: @ 821A41E
 	delay_16
 	delay_16
 	delay_16
@@ -202,79 +202,79 @@ LilycoveCity_ContestLobby_Movement_21A41E: @ 821A41E
 	walk_in_place_fastest_right
 	step_end
 
-LilycoveCity_ContestLobby_EventScript_21A427:: @ 821A427
-	goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_21A436
+LilycoveCity_ContestLobby_EventScript_TryDoLinkContestArtist:: @ 821A427
+	goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_LinkContestArtist
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A436:: @ 821A436
+LilycoveCity_ContestLobby_EventScript_LinkContestArtist:: @ 821A436
 	lockall
 	addobject 11
-	applymovement 11, LilycoveCity_ContestLobby_Movement_21A533
+	applymovement 11, LilycoveCity_ContestLobby_Movement_LinkArtistApproachPlayer
 	waitmovement 11
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21A545
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerFaceLinkArtist
 	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_21ADB9, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint, MSGBOX_DEFAULT
 	lockall
 	fadescreen 1
 	showcontestwinner 0
-	msgbox LilycoveCity_ContestLobby_Text_21AE78, MSGBOX_YESNO
+	msgbox LilycoveCity_ContestLobby_Text_ShouldITakePaintingToMuseum, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A47A
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseumLink
 	compare VAR_RESULT, NO
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A4B4
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_ConfirmDontTakePaintingLink
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A
-	msgbox LilycoveCity_ContestLobby_Text_21AF63, MSGBOX_DEFAULT
+LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseumLink:: @ 821A47A
+	msgbox LilycoveCity_ContestLobby_Text_IllTakePaintingToMuseum, MSGBOX_DEFAULT
 	closemessage
-	special sub_80F88DC
+	special SaveMuseumContestPainting
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
 	specialvar VAR_RESULT, GiveMonArtistRibbon
-	compare VAR_RESULT, 1
-	call_if_eq LilycoveCity_ContestLobby_EventScript_21A4E4
-	applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C
+	compare VAR_RESULT, TRUE
+	call_if_eq LilycoveCity_ContestLobby_EventScript_ReceivedLinkArtistRibbon
+	applymovement 11, LilycoveCity_ContestLobby_Movement_LinkArtistExit
 	waitmovement 0
 	removeobject 11
-	call LilycoveCity_ContestLobby_EventScript_21A360
-	call LilycoveCity_ContestLobby_EventScript_21A3B6
+	call LilycoveCity_ContestLobby_EventScript_UpdateMuseumPatrons
+	call LilycoveCity_ContestLobby_EventScript_SetPaintingFlag
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A4B4:: @ 821A4B4
-	msgbox LilycoveCity_ContestLobby_Text_21B0BC, MSGBOX_YESNO
+LilycoveCity_ContestLobby_EventScript_ConfirmDontTakePaintingLink:: @ 821A4B4
+	msgbox LilycoveCity_ContestLobby_Text_TakeHomeButIdLikeToTakeToMuseum, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A47A
-	msgbox LilycoveCity_ContestLobby_Text_21B132, MSGBOX_DEFAULT
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseumLink
+	msgbox LilycoveCity_ContestLobby_Text_FineThatsTheWayItIs, MSGBOX_DEFAULT
 	closemessage
-	applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C
+	applymovement 11, LilycoveCity_ContestLobby_Movement_LinkArtistExit
 	waitmovement 0
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
 	removeobject 11
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A4E4:: @ 821A4E4
+LilycoveCity_ContestLobby_EventScript_ReceivedLinkArtistRibbon:: @ 821A4E4
 	incrementgamestat GAME_STAT_RECEIVED_RIBBONS
 	setflag FLAG_SYS_RIBBON_GET
-	special sub_80F8390
-	applymovement 11, LilycoveCity_ContestLobby_Movement_21A547
+	special BufferContestWinnerMonName
+	applymovement 11, LilycoveCity_ContestLobby_Movement_LinkArtistBeginExit
 	waitmovement 0
 	playse SE_PIN
 	applymovement 11, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 11, LilycoveCity_ContestLobby_Movement_21A54B
+	applymovement 11, LilycoveCity_ContestLobby_Movement_LinkArtistReturnToPlayer
 	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_21B030, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_TakeMementoOfPainting, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA4
-	msgbox LilycoveCity_ContestLobby_Text_21B07E, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_ReceivedARibbon, MSGBOX_DEFAULT
 	waitfanfare
-	msgbox LilycoveCity_ContestLobby_Text_21B094, MSGBOX_DEFAULT
-	msgbox LilycoveCity_ContestLobby_Text_21B0AD, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_PutTheRibbonOnMon, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_OkaySeeYou, MSGBOX_DEFAULT
 	closemessage
 	return
 
-LilycoveCity_ContestLobby_Movement_21A533: @ 821A533
+LilycoveCity_ContestLobby_Movement_LinkArtistApproachPlayer: @ 821A533
 	walk_down
 	walk_down
 	walk_down
@@ -285,7 +285,7 @@ LilycoveCity_ContestLobby_Movement_21A533: @ 821A533
 	walk_left
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21A53C: @ 821A53C
+LilycoveCity_ContestLobby_Movement_LinkArtistExit: @ 821A53C
 	walk_down
 	walk_down
 	walk_down
@@ -296,17 +296,17 @@ LilycoveCity_ContestLobby_Movement_21A53C: @ 821A53C
 	walk_down
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21A545: @ 821A545
+LilycoveCity_ContestLobby_Movement_PlayerFaceLinkArtist: @ 821A545
 	walk_in_place_fastest_right
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21A547: @ 821A547
+LilycoveCity_ContestLobby_Movement_LinkArtistBeginExit: @ 821A547
 	walk_down
 	walk_down
 	walk_down
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21A54B: @ 821A54B
+LilycoveCity_ContestLobby_Movement_LinkArtistReturnToPlayer: @ 821A54B
 	delay_16
 	delay_16
 	delay_16
@@ -317,122 +317,124 @@ LilycoveCity_ContestLobby_Movement_21A54B: @ 821A54B
 	walk_in_place_fastest_left
 	step_end
 
+@ EventScript_SpeakToContestReceptionist either ends or returns after a contest entry is submitted
 LilycoveCity_ContestLobby_EventScript_ContestReceptionist:: @ 821A554
-	special sub_80F9154
-	specialvar VAR_RESULT, sub_80F8D24
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A5CF
-	call LilycoveCity_ContestLobby_EventScript_279CC5
-	call LilycoveCity_ContestLobby_EventScript_21A670
+	special ClearLinkContestFlags
+	specialvar VAR_RESULT, IsContestDebugActive  @ Always FALSE
+	compare VAR_RESULT, TRUE
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_SetDebug
+	call LilycoveCity_ContestLobby_EventScript_SpeakToContestReceptionist
+	call LilycoveCity_ContestLobby_EventScript_LeadToContestHall
 	special SetContestTrainerGfxIds
-	call LilycoveCity_ContestLobby_EventScript_23BEB6
-	call LilycoveCity_ContestLobby_EventScript_21A585
-	call LilycoveCity_ContestLobby_EventScript_21A5EF
+	call LilycoveCity_ContestLobby_EventScript_SetPlayerGfx
+	call LilycoveCity_ContestLobby_EventScript_SetContestType
+	call LilycoveCity_ContestLobby_EventScript_WarpToContestHall
 	waitstate
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A585:: @ 821A585
+LilycoveCity_ContestLobby_EventScript_SetContestType:: @ 821A585
 	switch VAR_CONTEST_RANK
-	case 0, LilycoveCity_ContestLobby_EventScript_21A5B7
-	case 1, LilycoveCity_ContestLobby_EventScript_21A5BD
-	case 2, LilycoveCity_ContestLobby_EventScript_21A5C3
-	case 3, LilycoveCity_ContestLobby_EventScript_21A5C9
+	case CONTEST_RANK_NORMAL, LilycoveCity_ContestLobby_EventScript_SetNormalContestType
+	case CONTEST_RANK_SUPER, LilycoveCity_ContestLobby_EventScript_SetSuperContestType
+	case CONTEST_RANK_HYPER, LilycoveCity_ContestLobby_EventScript_SetHyperContestType
+	case CONTEST_RANK_MASTER, LilycoveCity_ContestLobby_EventScript_SetMasterContestType
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A5B7:: @ 821A5B7
-	setvar VAR_CONTEST_LOCATION, 1
+LilycoveCity_ContestLobby_EventScript_SetNormalContestType:: @ 821A5B7
+	setvar VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_NORMAL
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A5BD:: @ 821A5BD
-	setvar VAR_CONTEST_LOCATION, 2
+LilycoveCity_ContestLobby_EventScript_SetSuperContestType:: @ 821A5BD
+	setvar VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_SUPER
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A5C3:: @ 821A5C3
-	setvar VAR_CONTEST_LOCATION, 3
+LilycoveCity_ContestLobby_EventScript_SetHyperContestType:: @ 821A5C3
+	setvar VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_HYPER
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A5C9:: @ 821A5C9
-	setvar VAR_CONTEST_LOCATION, 4
+LilycoveCity_ContestLobby_EventScript_SetMasterContestType:: @ 821A5C9
+	setvar VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_MASTER
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A5CF:: @ 821A5CF
+@ Functionally unused
+LilycoveCity_ContestLobby_EventScript_SetDebug:: @ 821A5CF
 	setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
 	copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1
 	giveitem ITEM_CONTEST_PASS, 1
 	setvar VAR_0x800B, 8
-	setvar VAR_CONTEST_RANK, 3
+	setvar VAR_CONTEST_RANK, CONTEST_RANK_MASTER
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1
 	setflag FLAG_SYS_RIBBON_GET
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A5EF:: @ 821A5EF
-	setflag FLAG_ENTERED_LINK_CONTEST
+LilycoveCity_ContestLobby_EventScript_WarpToContestHall:: @ 821A5EF
+	setflag FLAG_ENTERED_CONTEST
 	switch VAR_CONTEST_CATEGORY
-	case 0, LilycoveCity_ContestLobby_EventScript_21A62F
-	case 1, LilycoveCity_ContestLobby_EventScript_21A63C
-	case 2, LilycoveCity_ContestLobby_EventScript_21A649
-	case 3, LilycoveCity_ContestLobby_EventScript_21A656
-	case 4, LilycoveCity_ContestLobby_EventScript_21A663
+	case CONTEST_CATEGORY_COOL, LilycoveCity_ContestLobby_EventScript_WarpToCoolContestHall
+	case CONTEST_CATEGORY_BEAUTY, LilycoveCity_ContestLobby_EventScript_WarpToBeautyContestHall
+	case CONTEST_CATEGORY_CUTE, LilycoveCity_ContestLobby_EventScript_WarpToCuteContestHall
+	case CONTEST_CATEGORY_SMART, LilycoveCity_ContestLobby_EventScript_WarpToSmartContestHall
+	case CONTEST_CATEGORY_TOUGH, LilycoveCity_ContestLobby_EventScript_WarpToToughContestHall
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A62F:: @ 821A62F
-	setwarp MAP_LINK_CONTEST_ROOM4, 255, 7, 5
-	special sub_80AFC60
+LilycoveCity_ContestLobby_EventScript_WarpToCoolContestHall:: @ 821A62F
+	setwarp MAP_CONTEST_HALL_COOL, 255, 7, 5
+	special DoContestHallWarp
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A63C:: @ 821A63C
-	setwarp MAP_LINK_CONTEST_ROOM2, 255, 7, 5
-	special sub_80AFC60
+LilycoveCity_ContestLobby_EventScript_WarpToBeautyContestHall:: @ 821A63C
+	setwarp MAP_CONTEST_HALL_BEAUTY, 255, 7, 5
+	special DoContestHallWarp
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A649:: @ 821A649
-	setwarp MAP_LINK_CONTEST_ROOM6, 255, 7, 5
-	special sub_80AFC60
+LilycoveCity_ContestLobby_EventScript_WarpToCuteContestHall:: @ 821A649
+	setwarp MAP_CONTEST_HALL_CUTE, 255, 7, 5
+	special DoContestHallWarp
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A656:: @ 821A656
-	setwarp MAP_LINK_CONTEST_ROOM5, 255, 7, 5
-	special sub_80AFC60
+LilycoveCity_ContestLobby_EventScript_WarpToSmartContestHall:: @ 821A656
+	setwarp MAP_CONTEST_HALL_SMART, 255, 7, 5
+	special DoContestHallWarp
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A663:: @ 821A663
-	setwarp MAP_LINK_CONTEST_ROOM3, 255, 7, 5
-	special sub_80AFC60
+LilycoveCity_ContestLobby_EventScript_WarpToToughContestHall:: @ 821A663
+	setwarp MAP_CONTEST_HALL_TOUGH, 255, 7, 5
+	special DoContestHallWarp
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_21A670:: @ 821A670
+LilycoveCity_ContestLobby_EventScript_LeadToContestHall:: @ 821A670
 	lockall
-	applymovement 1, LilycoveCity_ContestLobby_Movement_21A6F5
+	applymovement 1, LilycoveCity_ContestLobby_Movement_ReceptionistApproachCounter
 	waitmovement 0
 	playse SE_HASHI
 	setmetatile 12, 2, METATILE_Contest_WallShadow, 1
 	setmetatile 12, 3, METATILE_Contest_FloorShadow, 1
 	special DrawWholeMapView
-	applymovement 1, LilycoveCity_ContestLobby_Movement_21A6F9
+	applymovement 1, LilycoveCity_ContestLobby_Movement_ReceptionistExitCounter
 	waitmovement 0
 	playse SE_HASHI
 	setmetatile 12, 2, METATILE_Contest_CounterFlap_Top, 1
 	setmetatile 12, 3, METATILE_Contest_CounterFlap_Bottom, 1
 	special DrawWholeMapView
 	delay 20
-	applymovement 1, LilycoveCity_ContestLobby_Movement_21A706
+	applymovement 1, LilycoveCity_ContestLobby_Movement_ReceptionistFacePlayer
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21A6F2
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerApproachReceptionist
 	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_27B653, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_ComeThroughHere, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, LilycoveCity_ContestLobby_Movement_21A6FD
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21A6E8
+	applymovement 1, LilycoveCity_ContestLobby_Movement_ReceptionistWalkToContestHall
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerWalkToContestHall
 	waitmovement 0
 	releaseall
 	return
 
-LilycoveCity_ContestLobby_Movement_21A6E8: @ 821A6E8
+LilycoveCity_ContestLobby_Movement_PlayerWalkToContestHall: @ 821A6E8
 	walk_left
 	walk_left
 	walk_left
@@ -444,24 +446,24 @@ LilycoveCity_ContestLobby_Movement_21A6E8: @ 821A6E8
 	set_invisible
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21A6F2: @ 821A6F2
+LilycoveCity_ContestLobby_Movement_PlayerApproachReceptionist: @ 821A6F2
 	walk_in_place_fastest_left
 	walk_left
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21A6F5: @ 821A6F5
+LilycoveCity_ContestLobby_Movement_ReceptionistApproachCounter: @ 821A6F5
 	walk_left
 	walk_left
 	walk_in_place_fastest_down
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21A6F9: @ 821A6F9
+LilycoveCity_ContestLobby_Movement_ReceptionistExitCounter: @ 821A6F9
 	walk_down
 	walk_down
 	walk_in_place_fastest_up
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21A6FD: @ 821A6FD
+LilycoveCity_ContestLobby_Movement_ReceptionistWalkToContestHall: @ 821A6FD
 	walk_left
 	walk_left
 	walk_left
@@ -472,32 +474,32 @@ LilycoveCity_ContestLobby_Movement_21A6FD: @ 821A6FD
 	set_invisible
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21A706: @ 821A706
+LilycoveCity_ContestLobby_Movement_ReceptionistFacePlayer: @ 821A706
 	walk_in_place_fastest_right
 	step_end
 
 LilycoveCity_ContestLobby_EventScript_BlackBelt:: @ 821A708
-	msgbox LilycoveCity_ContestLobby_Text_21B1B1, MSGBOX_NPC
+	msgbox LilycoveCity_ContestLobby_Text_MasterRankHereICome, MSGBOX_NPC
 	end
 
 LilycoveCity_ContestLobby_EventScript_Girl:: @ 821A711
-	msgbox LilycoveCity_ContestLobby_Text_21B24D, MSGBOX_NPC
+	msgbox LilycoveCity_ContestLobby_Text_WholeVarietyOfPokemonHere, MSGBOX_NPC
 	end
 
 LilycoveCity_ContestLobby_EventScript_Artist:: @ 821A71A
-	msgbox LilycoveCity_ContestLobby_Text_21B2BA, MSGBOX_NPC
+	msgbox LilycoveCity_ContestLobby_Text_ContestFeastForEyes, MSGBOX_NPC
 	end
 
 LilycoveCity_ContestLobby_EventScript_FatMan:: @ 821A723
-	msgbox LilycoveCity_ContestLobby_Text_21B334, MSGBOX_NPC
+	msgbox LilycoveCity_ContestLobby_Text_ToughContestIsExtreme, MSGBOX_NPC
 	end
 
 LilycoveCity_ContestLobby_EventScript_Fisherman:: @ 821A72C
-	msgbox LilycoveCity_ContestLobby_Text_21B392, MSGBOX_NPC
+	msgbox LilycoveCity_ContestLobby_Text_LavishedCareOnMon, MSGBOX_NPC
 	end
 
 LilycoveCity_ContestLobby_EventScript_NinjaBoy:: @ 821A735
-	msgbox LilycoveCity_ContestLobby_Text_21B3FC, MSGBOX_NPC
+	msgbox LilycoveCity_ContestLobby_Text_MadePokeblocksWithFamily, MSGBOX_NPC
 	end
 
 LilycoveCity_ContestLobby_EventScript_ContestWinner1:: @ 821A73E
@@ -543,11 +545,11 @@ LilycoveCity_ContestLobby_EventScript_ContestWinner6:: @ 821A761
 	end
 
 LilycoveCity_ContestLobby_EventScript_Blender3Boy:: @ 821A768
-	msgbox LilycoveCity_ContestLobby_Text_LetsGetBlendingAlready, MSGBOX_NPC
+	msgbox BerryBlender_Text_LetsGetBlendingAlready, MSGBOX_NPC
 	end
 
 LilycoveCity_ContestLobby_EventScript_Blender3Girl:: @ 821A771
-	msgbox LilycoveCity_ContestLobby_Text_WhatKindOfPokeblockWillIGet, MSGBOX_NPC
+	msgbox BerryBlender_Text_WhatKindOfPokeblockWillIGet, MSGBOX_NPC
 	end
 
 LilycoveCity_ContestLobby_EventScript_BerryBlenderSpeedRecords:: @ 821A77A
@@ -571,46 +573,46 @@ LilycoveCity_ContestLobby_EventScript_LinkContestResults:: @ 821A784
 LilycoveCity_ContestLobby_EventScript_BlendMaster:: @ 821A798
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestLobby_Text_BlendWithTheBlendMaster, MSGBOX_DEFAULT
+	msgbox BerryBlender_Text_BlendWithTheBlendMaster, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection
 	end
 
 LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker1:: @ 821A7A8
 	lock
-	msgbox LilycoveCity_ContestLobby_Text_2C464B, MSGBOX_DEFAULT
+	msgbox BerryBlender_Text_WhoaAwesome, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker2:: @ 821A7B3
 	lock
-	msgbox LilycoveCity_ContestLobby_Text_2C465A, MSGBOX_DEFAULT
+	msgbox BerryBlender_Text_WickedlyFast, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker3:: @ 821A7BE
 	lock
-	msgbox LilycoveCity_ContestLobby_Text_2C4669, MSGBOX_DEFAULT
+	msgbox BerryBlender_Text_WhatAnExpert, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker4:: @ 821A7C9
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestLobby_Text_2C4679, MSGBOX_DEFAULT
+	msgbox BerryBlender_Text_MadeAmazingPokeblocksWithMaster, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection
 	end
 
 LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker5:: @ 821A7D9
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestLobby_Text_2C46B1, MSGBOX_DEFAULT
+	msgbox BerryBlender_Text_QualitiesOfBlendMaster, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection
 	end
 
 LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker6:: @ 821A7E9
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestLobby_Text_2C4763, MSGBOX_DEFAULT
+	msgbox BerryBlender_Text_MasterWorksOnSkillsInMountains, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection
 	end
 
@@ -622,343 +624,343 @@ LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection:: @ 821A7F9
 	end
 
 LilycoveCity_ContestLobby_EventScript_LinkContestReceptionist:: @ 821A806
-	special sub_80F9154
+	special ClearLinkContestFlags
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestLobby_Text_27C063, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A819
+	msgbox LilycoveCity_ContestLobby_Text_LinkContestReception, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_AskEnterLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A819:: @ 821A819
-	message LilycoveCity_ContestLobby_Text_27C0F6
+LilycoveCity_ContestLobby_EventScript_AskEnterLinkContest:: @ 821A819
+	message LilycoveCity_ContestLobby_Text_EnterContest3
 	waitmessage
 	multichoice 0, 0, MULTI_ENTERINFO, 0
 	switch VAR_RESULT
-	case 0, LilycoveCity_ContestLobby_EventScript_21A856
-	case 1, LilycoveCity_ContestLobby_EventScript_21A90D
-	case 2, LilycoveCity_ContestLobby_EventScript_21A97F
-	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_21A97F
+	case 0, LilycoveCity_ContestLobby_EventScript_TryEnterLinkContest
+	case 1, LilycoveCity_ContestLobby_EventScript_LinkContestInfo
+	case 2, LilycoveCity_ContestLobby_EventScript_CancelLinkContest
+	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856
-	msgbox LilycoveCity_ContestLobby_Text_27BD17, MSGBOX_YESNO
+LilycoveCity_ContestLobby_EventScript_TryEnterLinkContest:: @ 821A856
+	msgbox LilycoveCity_ContestLobby_Text_ProgressWillBeSaved, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	call Common_EventScript_SaveGame
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F
-	message LilycoveCity_ContestLobby_Text_27C8FD
+	compare VAR_RESULT, FALSE
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkContest
+	message LilycoveCity_ContestLobby_Text_WhichContestMode
 	waitmessage
 	specialvar VAR_TEMP_D, IsWirelessAdapterConnected
 	multichoice 0, 0, MULTI_LINK_CONTEST_MODE, 0
 	switch VAR_RESULT
-	case 0, LilycoveCity_ContestLobby_EventScript_21A8BB
-	case 1, LilycoveCity_ContestLobby_EventScript_21A8C6
-	case 2, LilycoveCity_ContestLobby_EventScript_21A97F
-	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_21A97F
+	case 0, LilycoveCity_ContestLobby_EventScript_EmeraldMode  @ Shortened to E-Mode
+	case 1, LilycoveCity_ContestLobby_EventScript_GlobalMode   @ Shortened to G-Mode
+	case 2, LilycoveCity_ContestLobby_EventScript_CancelLinkContest
+	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A8BB:: @ 821A8BB
+LilycoveCity_ContestLobby_EventScript_EmeraldMode:: @ 821A8BB
 	setvar VAR_TEMP_C, 0
-	goto LilycoveCity_ContestLobby_EventScript_21A8DC
+	goto LilycoveCity_ContestLobby_EventScript_ChooseLinkContestType
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A8C6:: @ 821A8C6
+LilycoveCity_ContestLobby_EventScript_GlobalMode:: @ 821A8C6
 	setvar VAR_TEMP_C, 1
 	compare VAR_TEMP_D, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21AAFC
-	goto LilycoveCity_ContestLobby_EventScript_21A8DC
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkNoWirelessGMode
+	goto LilycoveCity_ContestLobby_EventScript_ChooseLinkContestType
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A8DC:: @ 821A8DC
-	message LilycoveCity_ContestLobby_Text_27C119
+LilycoveCity_ContestLobby_EventScript_ChooseLinkContestType:: @ 821A8DC
+	message LilycoveCity_ContestLobby_Text_EnterWhichContest3
 	waitmessage
 	multichoice 0, 0, MULTI_CONTEST_TYPE, 0
 	switch VAR_RESULT
-	case 5, LilycoveCity_ContestLobby_EventScript_21A97F
-	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_21A97F
+	case CONTEST_CATEGORIES_COUNT, LilycoveCity_ContestLobby_EventScript_CancelLinkContest
+	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	copyvar VAR_CONTEST_CATEGORY, VAR_RESULT
-	goto LilycoveCity_ContestLobby_EventScript_21A98C
+	goto LilycoveCity_ContestLobby_EventScript_ChooseLinkContestMon
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A90D:: @ 821A90D
-	message LilycoveCity_ContestLobby_Text_27C0DA
+LilycoveCity_ContestLobby_EventScript_LinkContestInfo:: @ 821A90D
+	message LilycoveCity_ContestLobby_Text_WhichTopic2
 	waitmessage
 	multichoice 0, 0, MULTI_LINK_CONTEST_INFO, 0
 	switch VAR_RESULT
-	case 0, LilycoveCity_ContestLobby_EventScript_21A955
-	case 1, LilycoveCity_ContestLobby_EventScript_21A963
-	case 2, LilycoveCity_ContestLobby_EventScript_21A971
-	case 3, LilycoveCity_ContestLobby_EventScript_21A819
-	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_21A819
+	case 0, LilycoveCity_ContestLobby_EventScript_ExplainLinkContest
+	case 1, LilycoveCity_ContestLobby_EventScript_ExplainEMode
+	case 2, LilycoveCity_ContestLobby_EventScript_ExplainGMode
+	case 3, LilycoveCity_ContestLobby_EventScript_AskEnterLinkContest
+	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_AskEnterLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A955:: @ 821A955
-	msgbox LilycoveCity_ContestLobby_Text_27C340, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A90D
+LilycoveCity_ContestLobby_EventScript_ExplainLinkContest:: @ 821A955
+	msgbox LilycoveCity_ContestLobby_Text_ExplainLinkContest, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_LinkContestInfo
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A963:: @ 821A963
-	msgbox LilycoveCity_ContestLobby_Text_27C5B1, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A90D
+LilycoveCity_ContestLobby_EventScript_ExplainEMode:: @ 821A963
+	msgbox LilycoveCity_ContestLobby_Text_ExplainEMode, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_LinkContestInfo
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A971:: @ 821A971
-	msgbox LilycoveCity_ContestLobby_Text_27C742, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A90D
+LilycoveCity_ContestLobby_EventScript_ExplainGMode:: @ 821A971
+	msgbox LilycoveCity_ContestLobby_Text_ExplainGMode, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_LinkContestInfo
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A97F:: @ 821A97F
+LilycoveCity_ContestLobby_EventScript_CancelLinkContest:: @ 821A97F
 	special CloseLink
-	msgbox LilycoveCity_ContestLobby_Text_27BD4F, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_ParticipateAnotherTime, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A98C:: @ 821A98C
-	msgbox LilycoveCity_ContestLobby_Text_27C1C3, MSGBOX_DEFAULT
+LilycoveCity_ContestLobby_EventScript_ChooseLinkContestMon:: @ 821A98C
+	msgbox LilycoveCity_ContestLobby_Text_EnterWhichPokemon3, MSGBOX_DEFAULT
 	setvar VAR_CONTEST_RANK, 0
 	choosecontestmon
 	compare VAR_0x8004, 255
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F
-	special sub_80F7F30
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A9E0
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21AA0A
-	compare VAR_RESULT, 2
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21AA0A
-	compare VAR_RESULT, 3
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A9EE
-	compare VAR_RESULT, 4
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A9FC
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkContest
+	special TryEnterContestMon
+	compare VAR_RESULT, CANT_ENTER_CONTEST
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkCantEnterLowRank
+	compare VAR_RESULT, CAN_ENTER_CONTEST_EQUAL_RANK
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_EnterMonForLinkContest
+	compare VAR_RESULT, CAN_ENTER_CONTEST_HIGH_RANK
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_EnterMonForLinkContest
+	compare VAR_RESULT, CANT_ENTER_CONTEST_EGG
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkCantEnterEgg
+	compare VAR_RESULT, CANT_ENTER_CONTEST_FAINTED
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkCantEnterFainted
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A9E0:: @ 821A9E0
-	msgbox LilycoveCity_ContestLobby_Text_27B471, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A98C
+LilycoveCity_ContestLobby_EventScript_LinkCantEnterLowRank:: @ 821A9E0
+	msgbox LilycoveCity_ContestLobby_Text_MonNotQualifiedForRank, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_ChooseLinkContestMon
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A9EE:: @ 821A9EE
-	msgbox LilycoveCity_ContestLobby_Text_27C186, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A98C
+LilycoveCity_ContestLobby_EventScript_LinkCantEnterEgg:: @ 821A9EE
+	msgbox LilycoveCity_ContestLobby_Text_EggCannotTakePart2, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_ChooseLinkContestMon
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A9FC:: @ 821A9FC
-	msgbox LilycoveCity_ContestLobby_Text_27C140, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A98C
+LilycoveCity_ContestLobby_EventScript_LinkCantEnterFainted:: @ 821A9FC
+	msgbox LilycoveCity_ContestLobby_Text_MonInNoCondition2, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_ChooseLinkContestMon
 	end
 
-LilycoveCity_ContestLobby_EventScript_21AA0A:: @ 821AA0A
+LilycoveCity_ContestLobby_EventScript_EnterMonForLinkContest:: @ 821AA0A
 	copyvar VAR_0x8008, VAR_0x8004
-	goto LilycoveCity_ContestLobby_EventScript_21AA15
+	goto LilycoveCity_ContestLobby_EventScript_TrySetUpLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_21AA15:: @ 821AA15
+LilycoveCity_ContestLobby_EventScript_TrySetUpLinkContest:: @ 821AA15
 	compare VAR_TEMP_D, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21AB4B
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_SetLinkGroupType
 	compare VAR_TEMP_D, 2
-	goto_if_ge LilycoveCity_ContestLobby_EventScript_21A97F
-	message LilycoveCity_ContestLobby_Text_27BF85
+	goto_if_ge LilycoveCity_ContestLobby_EventScript_CancelLinkContest
+	message LilycoveCity_ContestLobby_Text_PleaseWaitBButtonCancel
 	waitmessage
 	copyvar VAR_0x8004, VAR_RESULT
 	compare VAR_TEMP_C, 0
-	call_if_eq LilycoveCity_ContestLobby_EventScript_21AABB
+	call_if_eq LilycoveCity_ContestLobby_EventScript_TryLinkEMode
 	compare VAR_TEMP_C, 1
-	call_if_eq LilycoveCity_ContestLobby_EventScript_21AAC0
+	call_if_eq LilycoveCity_ContestLobby_EventScript_TryLinkGMode
 	compare VAR_TEMP_C, 2
-	goto_if_ge LilycoveCity_ContestLobby_EventScript_21A97F
+	goto_if_ge LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	compare VAR_RESULT, 4
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21AAD3
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkDifferentChoices
 	compare VAR_RESULT, 3
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21AAD3
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkDifferentChoices
 	compare VAR_RESULT, 5
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	compare VAR_RESULT, 6
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21AAEF
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkError
 	compare VAR_RESULT, 10
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21AAE1
-	message3 LilycoveCity_ContestLobby_Text_27BEEC
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkModeDifference
+	message3 LilycoveCity_ContestLobby_Text_Transmitting
 	contestlinktransfer
 	switch VAR_0x8004
-	case 0, LilycoveCity_ContestLobby_EventScript_21AB17
-	case 1, LilycoveCity_ContestLobby_EventScript_21AAC5
-	case 2, LilycoveCity_ContestLobby_EventScript_21AB09
+	case 0, LilycoveCity_ContestLobby_EventScript_StartLinkContest
+	case 1, LilycoveCity_ContestLobby_EventScript_CancelLinkDifferentContest
+	case 2, LilycoveCity_ContestLobby_EventScript_CancelLinkTransmissionError
 	end
 
-LilycoveCity_ContestLobby_EventScript_21AABB:: @ 821AABB
-	special sub_80B3028
+LilycoveCity_ContestLobby_EventScript_TryLinkEMode:: @ 821AABB
+	special TryContestEModeLinkup
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_21AAC0:: @ 821AAC0
-	special sub_80B3000
+LilycoveCity_ContestLobby_EventScript_TryLinkGMode:: @ 821AAC0
+	special TryContestGModeLinkup
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_21AAC5:: @ 821AAC5
-	msgbox LilycoveCity_ContestLobby_Text_27BF0E, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A97F
+LilycoveCity_ContestLobby_EventScript_CancelLinkDifferentContest:: @ 821AAC5
+	msgbox LilycoveCity_ContestLobby_Text_PlayersChoseDifferentContest, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_21AAD3:: @ 821AAD3
-	msgbox LilycoveCity_ContestLobby_Text_27BF4B, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A97F
+LilycoveCity_ContestLobby_EventScript_CancelLinkDifferentChoices:: @ 821AAD3
+	msgbox LilycoveCity_ContestLobby_Text_PlayersMadeDifferentChoice, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_21AAE1:: @ 821AAE1
-	msgbox LilycoveCity_ContestLobby_Text_27C254, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A97F
+LilycoveCity_ContestLobby_EventScript_CancelLinkModeDifference:: @ 821AAE1
+	msgbox LilycoveCity_ContestLobby_Text_PlayerAt4PCounterUseGMode, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_21AAEF:: @ 821AAEF
+LilycoveCity_ContestLobby_EventScript_CancelLinkError:: @ 821AAEF
 	special CloseLink
 	msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_21AAFC:: @ 821AAFC
+LilycoveCity_ContestLobby_EventScript_CancelLinkNoWirelessGMode:: @ 821AAFC
 	special CloseLink
-	msgbox LilycoveCity_ContestLobby_Text_27C879, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_NoWirelessAdapterInGMode, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_21AB09:: @ 821AB09
-	msgbox LilycoveCity_ContestLobby_Text_27BEFA, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A97F
+LilycoveCity_ContestLobby_EventScript_CancelLinkTransmissionError:: @ 821AB09
+	msgbox LilycoveCity_ContestLobby_Text_TransmissionError, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_21AB17:: @ 821AB17
-	special sub_80F84B0
+LilycoveCity_ContestLobby_EventScript_StartLinkContest:: @ 821AB17
+	special GetContestPlayerId
 	addvar VAR_0x8004, 1
 	buffernumberstring 1, VAR_0x8004
-	messageautoscroll LilycoveCity_ContestLobby_Text_27BFF8
+	messageautoscroll LilycoveCity_ContestLobby_Text_YourMonIsEntryNumX
 	waitmessage
 	subvar VAR_0x8004, 1
-	call LilycoveCity_ContestLobby_EventScript_21AC49
-	setvar VAR_LINK_CONTEST_ROOM_STATE, 1
-	special sub_80F8AFC
-	setvar VAR_CONTEST_LOCATION, 5
-	setvar VAR_CONTEST_RANK, 3
-	call LilycoveCity_ContestLobby_EventScript_21A5EF
-	end
-
-LilycoveCity_ContestLobby_EventScript_21AB4B:: @ 821AB4B
-	compare VAR_CONTEST_CATEGORY, 0
-	call_if_eq LilycoveCity_ContestLobby_EventScript_21AB88
-	compare VAR_CONTEST_CATEGORY, 1
-	call_if_eq LilycoveCity_ContestLobby_EventScript_21AB8E
-	compare VAR_CONTEST_CATEGORY, 2
-	call_if_eq LilycoveCity_ContestLobby_EventScript_21AB94
-	compare VAR_CONTEST_CATEGORY, 3
-	call_if_eq LilycoveCity_ContestLobby_EventScript_21AB9A
-	compare VAR_CONTEST_CATEGORY, 4
-	call_if_eq LilycoveCity_ContestLobby_EventScript_21ABA0
-	goto LilycoveCity_ContestLobby_EventScript_21ABA6
-	end
-
-LilycoveCity_ContestLobby_EventScript_21AB88:: @ 821AB88
-	setvar VAR_0x8004, 15
+	call LilycoveCity_ContestLobby_EventScript_LeadToLinkContestHall
+	setvar VAR_CONTEST_HALL_STATE, 1
+	special SetLinkContestPlayerGfx
+	setvar VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
+	setvar VAR_CONTEST_RANK, CONTEST_RANK_MASTER
+	call LilycoveCity_ContestLobby_EventScript_WarpToContestHall
+	end
+
+LilycoveCity_ContestLobby_EventScript_SetLinkGroupType:: @ 821AB4B
+	compare VAR_CONTEST_CATEGORY, CONTEST_CATEGORY_COOL
+	call_if_eq LilycoveCity_ContestLobby_EventScript_SetLinkGroupCoolContest
+	compare VAR_CONTEST_CATEGORY, CONTEST_CATEGORY_BEAUTY
+	call_if_eq LilycoveCity_ContestLobby_EventScript_SetLinkGroupBeautyContest
+	compare VAR_CONTEST_CATEGORY, CONTEST_CATEGORY_CUTE
+	call_if_eq LilycoveCity_ContestLobby_EventScript_SetLinkGroupCuteContest
+	compare VAR_CONTEST_CATEGORY, CONTEST_CATEGORY_SMART
+	call_if_eq LilycoveCity_ContestLobby_EventScript_SetLinkGroupSmartContest
+	compare VAR_CONTEST_CATEGORY, CONTEST_CATEGORY_TOUGH
+	call_if_eq LilycoveCity_ContestLobby_EventScript_SetLinkGroupToughContest
+	goto LilycoveCity_ContestLobby_EventScript_DecideLinkLeader
+	end
+
+LilycoveCity_ContestLobby_EventScript_SetLinkGroupCoolContest:: @ 821AB88
+	setvar VAR_0x8004, LINK_GROUP_COOL_CONTEST
 	return
 
-LilycoveCity_ContestLobby_EventScript_21AB8E:: @ 821AB8E
-	setvar VAR_0x8004, 16
+LilycoveCity_ContestLobby_EventScript_SetLinkGroupBeautyContest:: @ 821AB8E
+	setvar VAR_0x8004, LINK_GROUP_BEAUTY_CONTEST
 	return
 
-LilycoveCity_ContestLobby_EventScript_21AB94:: @ 821AB94
-	setvar VAR_0x8004, 17
+LilycoveCity_ContestLobby_EventScript_SetLinkGroupCuteContest:: @ 821AB94
+	setvar VAR_0x8004, LINK_GROUP_CUTE_CONTEST
 	return
 
-LilycoveCity_ContestLobby_EventScript_21AB9A:: @ 821AB9A
-	setvar VAR_0x8004, 18
+LilycoveCity_ContestLobby_EventScript_SetLinkGroupSmartContest:: @ 821AB9A
+	setvar VAR_0x8004, LINK_GROUP_SMART_CONTEST
 	return
 
-LilycoveCity_ContestLobby_EventScript_21ABA0:: @ 821ABA0
-	setvar VAR_0x8004, 19
+LilycoveCity_ContestLobby_EventScript_SetLinkGroupToughContest:: @ 821ABA0
+	setvar VAR_0x8004, LINK_GROUP_TOUGH_CONTEST
 	return
 
-LilycoveCity_ContestLobby_EventScript_21ABA6:: @ 821ABA6
-	message Text_DecideLinkLeader
+LilycoveCity_ContestLobby_EventScript_DecideLinkLeader:: @ 821ABA6
+	message LilycoveCity_ContestLobby_Text_PleaseDecideLinkLeader
 	waitmessage
 	multichoice 16, 6, MULTI_LINK_LEADER, 0
 	switch VAR_RESULT
-	case 0, LilycoveCity_ContestLobby_EventScript_21AC0B
-	case 1, LilycoveCity_ContestLobby_EventScript_21ABE3
-	case 2, LilycoveCity_ContestLobby_EventScript_21A97F
-	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_21A97F
+	case 0, LilycoveCity_ContestLobby_EventScript_TryJoinGroup
+	case 1, LilycoveCity_ContestLobby_EventScript_TryLeadGroup
+	case 2, LilycoveCity_ContestLobby_EventScript_CancelLinkContest
+	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_21ABE3:: @ 821ABE3
-	call LilycoveCity_ContestLobby_EventScript_21AC33
+LilycoveCity_ContestLobby_EventScript_TryLeadGroup:: @ 821ABE3
+	call LilycoveCity_ContestLobby_EventScript_TryBecomeLinkLeader
 	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21AC3D
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkLeaderDecided
 	compare VAR_RESULT, 5
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21ABA6
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_DecideLinkLeader
 	compare VAR_RESULT, 8
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21ABE3
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_TryLeadGroup
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_21AC0B:: @ 821AC0B
-	call LilycoveCity_ContestLobby_EventScript_21AC38
+LilycoveCity_ContestLobby_EventScript_TryJoinGroup:: @ 821AC0B
+	call LilycoveCity_ContestLobby_EventScript_TryJoinLinkGroup
 	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21AC3D
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkLeaderDecided
 	compare VAR_RESULT, 5
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21ABA6
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_DecideLinkLeader
 	compare VAR_RESULT, 8
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_21AC0B
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_TryJoinGroup
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_21AC33:: @ 821AC33
+LilycoveCity_ContestLobby_EventScript_TryBecomeLinkLeader:: @ 821AC33
 	special TryBecomeLinkLeader
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_21AC38:: @ 821AC38
+LilycoveCity_ContestLobby_EventScript_TryJoinLinkGroup:: @ 821AC38
 	special TryJoinLinkGroup
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_21AC3D:: @ 821AC3D
-	message3 LilycoveCity_ContestLobby_Text_27BEEC
+LilycoveCity_ContestLobby_EventScript_LinkLeaderDecided:: @ 821AC3D
+	message3 LilycoveCity_ContestLobby_Text_Transmitting
 	contestlinktransfer
-	goto LilycoveCity_ContestLobby_EventScript_21AB17
+	goto LilycoveCity_ContestLobby_EventScript_StartLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_21AC49:: @ 821AC49
-	messageautoscroll LilycoveCity_ContestLobby_Text_27C043
+LilycoveCity_ContestLobby_EventScript_LeadToLinkContestHall:: @ 821AC49
+	messageautoscroll LilycoveCity_ContestLobby_Text_ContestBeginShortly
 	waitmessage
 	delay 20
 	closemessage
-	applymovement 2, LilycoveCity_ContestLobby_Movement_21ACDD
+	applymovement 2, LilycoveCity_ContestLobby_Movement_LinkReceptionistApproachCounter
 	waitmovement 0
 	playse SE_HASHI
 	setmetatile 17, 2, METATILE_Contest_WallShadow, 1
 	setmetatile 17, 3, METATILE_Contest_FloorShadow, 1
 	special DrawWholeMapView
-	applymovement 2, LilycoveCity_ContestLobby_Movement_21ACE1
+	applymovement 2, LilycoveCity_ContestLobby_Movement_LinkReceptionistExitCounter
 	waitmovement 0
 	playse SE_HASHI
 	setmetatile 17, 2, METATILE_Contest_CounterFlap_Top, 1
 	setmetatile 17, 3, METATILE_Contest_CounterFlap_Bottom, 1
 	special DrawWholeMapView
 	delay 20
-	applymovement 2, LilycoveCity_ContestLobby_Movement_21ACEF
+	applymovement 2, LilycoveCity_ContestLobby_Movement_LinkReceptionistFacePlayer
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21ACDB
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerApproachLinkReceptionist
 	waitmovement 0
-	messageautoscroll LilycoveCity_ContestLobby_Text_27B653
+	messageautoscroll LilycoveCity_ContestLobby_Text_ComeThroughHere
 	waitmessage
 	delay 20
 	closemessage
-	call LilycoveCity_ContestLobby_EventScript_27AD92
-	applymovement 2, LilycoveCity_ContestLobby_Movement_21ACE5
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21ACD0
+	call LilycoveCity_ContestLobby_EventScript_DelayIfContestWithRSPlayer
+	applymovement 2, LilycoveCity_ContestLobby_Movement_LinkReceptionistWalkToContestHall
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerWalkToLinkContestHall
 	waitmovement 0
 	release
 	return
 
-LilycoveCity_ContestLobby_Movement_21ACD0: @ 821ACD0
+LilycoveCity_ContestLobby_Movement_PlayerWalkToLinkContestHall: @ 821ACD0
 	walk_right
 	walk_right
 	walk_right
@@ -971,23 +973,23 @@ LilycoveCity_ContestLobby_Movement_21ACD0: @ 821ACD0
 	set_invisible
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21ACDB: @ 821ACDB
+LilycoveCity_ContestLobby_Movement_PlayerApproachLinkReceptionist: @ 821ACDB
 	walk_right
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21ACDD: @ 821ACDD
+LilycoveCity_ContestLobby_Movement_LinkReceptionistApproachCounter: @ 821ACDD
 	walk_right
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21ACE1: @ 821ACE1
+LilycoveCity_ContestLobby_Movement_LinkReceptionistExitCounter: @ 821ACE1
 	walk_down
 	walk_down
 	walk_in_place_fastest_up
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21ACE5: @ 821ACE5
+LilycoveCity_ContestLobby_Movement_LinkReceptionistWalkToContestHall: @ 821ACE5
 	walk_right
 	walk_right
 	walk_right
@@ -999,34 +1001,34 @@ LilycoveCity_ContestLobby_Movement_21ACE5: @ 821ACE5
 	set_invisible
 	step_end
 
-LilycoveCity_ContestLobby_Movement_21ACEF: @ 821ACEF
+LilycoveCity_ContestLobby_Movement_LinkReceptionistFacePlayer: @ 821ACEF
 	walk_in_place_fastest_left
 	step_end
 
 LilycoveCity_ContestLobby_EventScript_LittleGirl:: @ 821ACF1
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_21AD06
-	msgbox LilycoveCity_ContestLobby_Text_21AD10, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_LittleGirlHaveCase
+	msgbox LilycoveCity_ContestLobby_Text_LadyGaveMePokeblockCase, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_21AD06:: @ 821AD06
-	msgbox LilycoveCity_ContestLobby_Text_21AD55, MSGBOX_DEFAULT
+LilycoveCity_ContestLobby_EventScript_LittleGirlHaveCase:: @ 821AD06
+	msgbox LilycoveCity_ContestLobby_Text_MakePokeblocksDifferentBerries, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_Text_21AD10: @ 821AD10
+LilycoveCity_ContestLobby_Text_LadyGaveMePokeblockCase: @ 821AD10
 	.string "Yippee!\p"
 	.string "The lady at the reception counter\n"
 	.string "gave me a case for {POKEBLOCK}S!$"
 
-LilycoveCity_ContestLobby_Text_21AD55: @ 821AD55
+LilycoveCity_ContestLobby_Text_MakePokeblocksDifferentBerries: @ 821AD55
 	.string "Make {POKEBLOCK}S and put them in there.\p"
 	.string "When you make a {POKEBLOCK}, everyone\n"
 	.string "has to put in a different BERRY.$"
 
-LilycoveCity_ContestLobby_Text_21ADB9: @ 821ADB9
+LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint: @ 821ADB9
 	.string "Congratulations!\p"
 	.string "I did a painting of your POKéMON to\n"
 	.string "commemorate its victory…\p"
@@ -1035,7 +1037,7 @@ LilycoveCity_ContestLobby_Text_21ADB9: @ 821ADB9
 	.string "painting better than I usually do.\l"
 	.string "Look, see?$"
 
-LilycoveCity_ContestLobby_Text_21AE78: @ 821AE78
+LilycoveCity_ContestLobby_Text_ShouldITakePaintingToMuseum: @ 821AE78
 	.string "What do you think? I'm confident in\n"
 	.string "what I've done, but do you like it?\p"
 	.string "A work of this caliber, it wouldn't look\n"
@@ -1044,7 +1046,7 @@ LilycoveCity_ContestLobby_Text_21AE78: @ 821AE78
 	.string "for paintings?\p"
 	.string "Do you think I should take this there?$"
 
-LilycoveCity_ContestLobby_Text_21AF63: @ 821AF63
+LilycoveCity_ContestLobby_Text_IllTakePaintingToMuseum: @ 821AF63
 	.string "What, really? Then, sure, I will take\n"
 	.string "this painting there right now.\p"
 	.string "I'll give it a proper title, too.\p"
@@ -1053,34 +1055,34 @@ LilycoveCity_ContestLobby_Text_21AF63: @ 821AF63
 	.string "Please check if they did accept this.\n"
 	.string "Thank you!$"
 
-LilycoveCity_ContestLobby_Text_21B030: @ 821B030
+LilycoveCity_ContestLobby_Text_TakeMementoOfPainting: @ 821B030
 	.string "Oh, that's right!\p"
 	.string "As a memento of me painting your\n"
 	.string "POKéMON, please take this.$"
 
-LilycoveCity_ContestLobby_Text_21B07E: @ 821B07E
+LilycoveCity_ContestLobby_Text_ReceivedARibbon: @ 821B07E
 	.string "{PLAYER} received a RIBBON.$"
 
-LilycoveCity_ContestLobby_Text_21B094: @ 821B094
+LilycoveCity_ContestLobby_Text_PutTheRibbonOnMon: @ 821B094
 	.string "{PLAYER} put the RIBBON on\n"
 	.string "{STR_VAR_1}.$"
 
-LilycoveCity_ContestLobby_Text_21B0AD: @ 821B0AD
+LilycoveCity_ContestLobby_Text_OkaySeeYou: @ 821B0AD
 	.string "Okay, see you!$"
 
-LilycoveCity_ContestLobby_Text_21B0BC: @ 821B0BC
+LilycoveCity_ContestLobby_Text_TakeHomeButIdLikeToTakeToMuseum: @ 821B0BC
 	.string "Oh… Then, I guess I'll just take\n"
 	.string "this home with me…\p"
 	.string "But, you know, I would like to take\n"
 	.string "this to the art museum… Okay?$"
 
-LilycoveCity_ContestLobby_Text_21B132: @ 821B132
+LilycoveCity_ContestLobby_Text_FineThatsTheWayItIs: @ 821B132
 	.string "Oh, fine, that's the way it is.\n"
 	.string "I will hang this in my own house.\p"
 	.string "I'll just have to try harder next time.\n"
 	.string "Well, be seeing you.$"
 
-LilycoveCity_ContestLobby_Text_21B1B1: @ 821B1B1
+LilycoveCity_ContestLobby_Text_MasterRankHereICome: @ 821B1B1
 	.string "Hoo, boy… Master Rank CONTESTS,\n"
 	.string "here I come.\p"
 	.string "The world will know that my dearest\n"
@@ -1088,31 +1090,31 @@ LilycoveCity_ContestLobby_Text_21B1B1: @ 821B1B1
 	.string "existence. The time has come!\l"
 	.string "Uheheheh.$"
 
-LilycoveCity_ContestLobby_Text_21B24D: @ 821B24D
+LilycoveCity_ContestLobby_Text_WholeVarietyOfPokemonHere: @ 821B24D
 	.string "You can see a whole variety of\n"
 	.string "POKéMON here.\p"
 	.string "That's why I make this place a regular\n"
 	.string "part of my daily stroll.$"
 
-LilycoveCity_ContestLobby_Text_21B2BA: @ 821B2BA
+LilycoveCity_ContestLobby_Text_ContestFeastForEyes: @ 821B2BA
 	.string "Wow, coming out to a CONTEST is\n"
 	.string "a feast for these eyes!\p"
 	.string "Would you look at all the POKéMON\n"
 	.string "that just scream to be painted?$"
 
-LilycoveCity_ContestLobby_Text_21B334: @ 821B334
+LilycoveCity_ContestLobby_Text_ToughContestIsExtreme: @ 821B334
 	.string "The TOUGHNESS CONTEST is like\n"
 	.string "extreme, man!\p"
 	.string "Those muscular appeals…\n"
 	.string "Cascading sweat… I swoon!$"
 
-LilycoveCity_ContestLobby_Text_21B392: @ 821B392
+LilycoveCity_ContestLobby_Text_LavishedCareOnMon: @ 821B392
 	.string "Day in and day out, I lavished my care\n"
 	.string "on this POKéMON.\p"
 	.string "Its condition is peaking.\n"
 	.string "Today, victory is mine!$"
 
-LilycoveCity_ContestLobby_Text_21B3FC: @ 821B3FC
+LilycoveCity_ContestLobby_Text_MadePokeblocksWithFamily: @ 821B3FC
 	.string "I made {POKEBLOCK}S with Mom, Dad, and\n"
 	.string "Big Sister. They turned out great!\p"
 	.string "I bet you can make smoother, better\n"
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
index 6348829ba..09da9a00e 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
@@ -1,9 +1,9 @@
 LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 821C785
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonTrainerFanClub_OnFrame
 	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonTrainerFanClub_OnTransition
 	.byte 0
 
-LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790
+LilycoveCity_PokemonTrainerFanClub_OnFrame: @ 821C790
 	map_script_2 VAR_LILYCOVE_FAN_CLUB_STATE, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A
 	.2byte 0
 
@@ -11,13 +11,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A
 	lockall
 	applymovement 1, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF00, MSGBOX_DEFAULT
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_OhWowItsPlayer, MSGBOX_DEFAULT
 	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD
 	applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, MSGBOX_DEFAULT
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_HeardAboutYouImYourFan, MSGBOX_DEFAULT
 	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C804
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
@@ -118,7 +118,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1:: @ 821C8F1
 	return
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5:: @ 821C8F5
-	setvar VAR_0x8005, 8
+	setvar VAR_0x8005, NUM_TRAINER_CLUB_MEMBERS
 	setvar VAR_0x8004, 8
 	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
 	compare VAR_RESULT, 0
@@ -469,7 +469,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19
 	setvar VAR_0x8004, 15
 	special BufferStreakTrainerText
 	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D
 	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 7
@@ -481,13 +481,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19
 LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D:: @ 821CD4D
 	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE72, MSGBOX_DEFAULT
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_OnlyFan
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_YouImpressive, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67:: @ 821CD67
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE83, MSGBOX_DEFAULT
+LilycoveCity_PokemonTrainerFanClub_EventScript_OnlyFan:: @ 821CD67
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_OnlyIRecognizeYourTrueWorth, MSGBOX_DEFAULT
 	release
 	end
 
@@ -608,11 +608,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED:: @ 821CEED
 LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF:: @ 821CEFF
 	end
 
-LilycoveCity_PokemonTrainerFanClub_Text_21CF00: @ 821CF00
+LilycoveCity_PokemonTrainerFanClub_Text_OhWowItsPlayer: @ 821CF00
 	.string "Oh, wow!\n"
 	.string "It's {PLAYER}!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21CF12: @ 821CF12
+LilycoveCity_PokemonTrainerFanClub_Text_HeardAboutYouImYourFan: @ 821CF12
 	.string "I've heard the news!\n"
 	.string "You're really strong, aren't you?\p"
 	.string "We always argue about who is the\n"
@@ -833,11 +833,11 @@ LilycoveCity_PokemonTrainerFanClub_Text_21DDCE: @ 821DDCE
 	.string "{STR_VAR_1} is definitely stronger!\n"
 	.string "I'm positive!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21DE72: @ 821DE72
+LilycoveCity_PokemonTrainerFanClub_Text_YouImpressive: @ 821DE72
 	.string "You…\p"
 	.string "Impressive!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_21DE83: @ 821DE83
+LilycoveCity_PokemonTrainerFanClub_Text_OnlyIRecognizeYourTrueWorth: @ 821DE83
 	.string "Your true worth, it is fine if only\n"
 	.string "I recognized it.\p"
 	.string "The others I doubt will understand\n"
diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc
deleted file mode 100644
index 9fb83a7a9..000000000
--- a/data/maps/LinkContestRoom1/scripts.inc
+++ /dev/null
@@ -1,458 +0,0 @@
-LinkContestRoom1_MapScripts:: @ 823B781
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LinkContestRoom1_MapScript2_23B81F
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, LinkContestRoom1_MapScript2_23B815
-	map_script MAP_SCRIPT_ON_TRANSITION, LinkContestRoom1_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, LinkContestRoom1_MapScript1_23B803
-	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, LinkContestRoom1_MapScript1_23B79B
-	.byte 0
-
-LinkContestRoom1_MapScript1_23B79B: @ 823B79B
-	special sub_80F8B94
-	end
-
-LinkContestRoom1_OnTransition: @ 823B79F
-	call LinkContestRoom1_EventScript_23B7AF
-	setvar VAR_TEMP_0, 1
-	call LinkContestRoom1_EventScript_23B842
-	end
-
-LinkContestRoom1_EventScript_23B7AF:: @ 823B7AF
-	call LinkContestRoom1_EventScript_27A133
-	special ScriptGetMultiplayerId
-	compare VAR_RESULT, 0
-	call_if_eq LinkContestRoom1_EventScript_23B7EF
-	compare VAR_RESULT, 1
-	call_if_eq LinkContestRoom1_EventScript_23B7F3
-	compare VAR_RESULT, 2
-	call_if_eq LinkContestRoom1_EventScript_23B7F7
-	compare VAR_RESULT, 3
-	call_if_eq LinkContestRoom1_EventScript_23B7FB
-	compare VAR_RESULT, 4
-	call_if_eq LinkContestRoom1_EventScript_23B7FF
-	return
-
-LinkContestRoom1_EventScript_23B7EF:: @ 823B7EF
-	savebgm MUS_TEST1
-	return
-
-LinkContestRoom1_EventScript_23B7F3:: @ 823B7F3
-	savebgm MUS_TEST2
-	return
-
-LinkContestRoom1_EventScript_23B7F7:: @ 823B7F7
-	savebgm MUS_TEST3
-	return
-
-LinkContestRoom1_EventScript_23B7FB:: @ 823B7FB
-	savebgm MUS_TEST4
-	return
-
-LinkContestRoom1_EventScript_23B7FF:: @ 823B7FF
-	savebgm MUS_CONTEST0
-	return
-
-LinkContestRoom1_MapScript1_23B803: @ 823B803
-	compare VAR_TEMP_9, 1
-	call_if_eq LinkContestRoom1_EventScript_23B80F
-	end
-
-LinkContestRoom1_EventScript_23B80F:: @ 823B80F
-	call LinkContestRoom1_EventScript_23BB2B
-	return
-
-LinkContestRoom1_MapScript2_23B815: @ 823B815
-	map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_23B829
-	.2byte 0
-
-LinkContestRoom1_MapScript2_23B81F: @ 823B81F
-	map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_23B834
-	.2byte 0
-
-LinkContestRoom1_EventScript_23B829:: @ 823B829
-	call LinkContestRoom1_EventScript_279F97
-	call LinkContestRoom1_EventScript_23BE44
-	end
-
-LinkContestRoom1_EventScript_23B834:: @ 823B834
-	special sub_80F8B94
-	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN
-	call LinkContestRoom1_EventScript_23BB2B
-	end
-
-LinkContestRoom1_EventScript_23B842:: @ 823B842
-	call LinkContestRoom1_EventScript_23B8F8
-	call LinkContestRoom1_EventScript_23B858
-	compare VAR_TEMP_0, 8
-	goto_if_lt LinkContestRoom1_EventScript_23B842
-	return
-
-LinkContestRoom1_EventScript_23B858:: @ 823B858
-	switch VAR_TEMP_0
-	case 1, LinkContestRoom1_EventScript_23B8AB
-	case 2, LinkContestRoom1_EventScript_23B8B6
-	case 3, LinkContestRoom1_EventScript_23B8C1
-	case 4, LinkContestRoom1_EventScript_23B8CC
-	case 5, LinkContestRoom1_EventScript_23B8D7
-	case 6, LinkContestRoom1_EventScript_23B8E2
-	case 7, LinkContestRoom1_EventScript_23B8ED
-	end
-
-LinkContestRoom1_EventScript_23B8AB:: @ 823B8AB
-	copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8B6:: @ 823B8B6
-	copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8C1:: @ 823B8C1
-	copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8CC:: @ 823B8CC
-	copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8D7:: @ 823B8D7
-	copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8E2:: @ 823B8E2
-	copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8ED:: @ 823B8ED
-	copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_23B8F8:: @ 823B8F8
-	setvar VAR_RESULT, 32
-	special ScriptRandom
-	addvar VAR_RESULT, 1
-	switch VAR_RESULT
-	case 1, LinkContestRoom1_EventScript_23BA6B
-	case 2, LinkContestRoom1_EventScript_23BA71
-	case 3, LinkContestRoom1_EventScript_23BA77
-	case 4, LinkContestRoom1_EventScript_23BA7D
-	case 5, LinkContestRoom1_EventScript_23BA83
-	case 6, LinkContestRoom1_EventScript_23BA89
-	case 7, LinkContestRoom1_EventScript_23BA8F
-	case 8, LinkContestRoom1_EventScript_23BA95
-	case 9, LinkContestRoom1_EventScript_23BA9B
-	case 10, LinkContestRoom1_EventScript_23BAA1
-	case 11, LinkContestRoom1_EventScript_23BAA7
-	case 12, LinkContestRoom1_EventScript_23BAAD
-	case 13, LinkContestRoom1_EventScript_23BAB3
-	case 14, LinkContestRoom1_EventScript_23BAB9
-	case 15, LinkContestRoom1_EventScript_23BABF
-	case 16, LinkContestRoom1_EventScript_23BAC5
-	case 17, LinkContestRoom1_EventScript_23BACB
-	case 18, LinkContestRoom1_EventScript_23BAD1
-	case 19, LinkContestRoom1_EventScript_23BAD7
-	case 20, LinkContestRoom1_EventScript_23BADD
-	case 21, LinkContestRoom1_EventScript_23BAE3
-	case 22, LinkContestRoom1_EventScript_23BAE9
-	case 23, LinkContestRoom1_EventScript_23BAEF
-	case 24, LinkContestRoom1_EventScript_23BAF5
-	case 25, LinkContestRoom1_EventScript_23BAFB
-	case 26, LinkContestRoom1_EventScript_23BB01
-	case 27, LinkContestRoom1_EventScript_23BB07
-	case 28, LinkContestRoom1_EventScript_23BB0D
-	case 29, LinkContestRoom1_EventScript_23BB13
-	case 30, LinkContestRoom1_EventScript_23BB19
-	case 31, LinkContestRoom1_EventScript_23BB1F
-	case 32, LinkContestRoom1_EventScript_23BB25
-	end
-
-LinkContestRoom1_EventScript_23BA6B:: @ 823BA6B
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_NINJA_BOY
-	return
-
-LinkContestRoom1_EventScript_23BA71:: @ 823BA71
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_TWIN
-	return
-
-LinkContestRoom1_EventScript_23BA77:: @ 823BA77
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_BOY_1
-	return
-
-LinkContestRoom1_EventScript_23BA7D:: @ 823BA7D
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_1
-	return
-
-LinkContestRoom1_EventScript_23BA83:: @ 823BA83
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_2
-	return
-
-LinkContestRoom1_EventScript_23BA89:: @ 823BA89
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_LITTLE_BOY
-	return
-
-LinkContestRoom1_EventScript_23BA8F:: @ 823BA8F
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_LITTLE_GIRL
-	return
-
-LinkContestRoom1_EventScript_23BA95:: @ 823BA95
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_BOY_3
-	return
-
-LinkContestRoom1_EventScript_23BA9B:: @ 823BA9B
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_3
-	return
-
-LinkContestRoom1_EventScript_23BAA1:: @ 823BAA1
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_RICH_BOY
-	return
-
-LinkContestRoom1_EventScript_23BAA7:: @ 823BAA7
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_FAT_MAN
-	return
-
-LinkContestRoom1_EventScript_23BAAD:: @ 823BAAD
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_POKEFAN_F
-	return
-
-LinkContestRoom1_EventScript_23BAB3:: @ 823BAB3
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_MAN_1
-	return
-
-LinkContestRoom1_EventScript_23BAB9:: @ 823BAB9
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_2
-	return
-
-LinkContestRoom1_EventScript_23BABF:: @ 823BABF
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_EXPERT_M
-	return
-
-LinkContestRoom1_EventScript_23BAC5:: @ 823BAC5
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_EXPERT_F
-	return
-
-LinkContestRoom1_EventScript_23BACB:: @ 823BACB
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_POKEFAN_M
-	return
-
-LinkContestRoom1_EventScript_23BAD1:: @ 823BAD1
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_4
-	return
-
-LinkContestRoom1_EventScript_23BAD7:: @ 823BAD7
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_COOK
-	return
-
-LinkContestRoom1_EventScript_23BADD:: @ 823BADD
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_LASS
-	return
-
-LinkContestRoom1_EventScript_23BAE3:: @ 823BAE3
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_OLD_WOMAN
-	return
-
-LinkContestRoom1_EventScript_23BAE9:: @ 823BAE9
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_CAMPER
-	return
-
-LinkContestRoom1_EventScript_23BAEF:: @ 823BAEF
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_PICNICKER
-	return
-
-LinkContestRoom1_EventScript_23BAF5:: @ 823BAF5
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_MAN_3
-	return
-
-LinkContestRoom1_EventScript_23BAFB:: @ 823BAFB
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_5
-	return
-
-LinkContestRoom1_EventScript_23BB01:: @ 823BB01
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_YOUNGSTER
-	return
-
-LinkContestRoom1_EventScript_23BB07:: @ 823BB07
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_BUG_CATCHER
-	return
-
-LinkContestRoom1_EventScript_23BB0D:: @ 823BB0D
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_PSYCHIC_M
-	return
-
-LinkContestRoom1_EventScript_23BB13:: @ 823BB13
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_SCHOOL_KID_M
-	return
-
-LinkContestRoom1_EventScript_23BB19:: @ 823BB19
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_BLACK_BELT
-	return
-
-LinkContestRoom1_EventScript_23BB1F:: @ 823BB1F
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_BEAUTY
-	return
-
-LinkContestRoom1_EventScript_23BB25:: @ 823BB25
-	setvar VAR_TEMP_1, EVENT_OBJ_GFX_SCIENTIST_1
-	return
-
-LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B
-	specialvar VAR_RESULT, sub_80F9160
-	compare VAR_RESULT, 1
-	goto_if_eq LinkContestRoom1_EventScript_23BD86
-	switch VAR_CONTEST_LOCATION
-	case 1, LinkContestRoom1_EventScript_23BB78
-	case 2, LinkContestRoom1_EventScript_23BB8B
-	case 3, LinkContestRoom1_EventScript_23BBE6
-	case 4, LinkContestRoom1_EventScript_23BC92
-	case 5, LinkContestRoom1_EventScript_23BC92
-	return
-
-LinkContestRoom1_EventScript_23BB78:: @ 823BB78
-	createvobject EVENT_OBJ_GFX_NINJA_BOY, 20, 3, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
-	return
-
-LinkContestRoom1_EventScript_23BB8B:: @ 823BB8B
-	createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 3, 2, 8, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 13, 12, 8, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_LASS, 20, 3, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
-	return
-
-LinkContestRoom1_EventScript_23BBE6:: @ 823BBE6
-	createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_GENTLEMAN, 3, 2, 8, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 3, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_MAN_2, 20, 6, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_WOMAN_5, 20, 7, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 8, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_GENTLEMAN, 24, 11, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 3, 9, 3, DIR_NORTH
-	createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, DIR_NORTH
-	createvobject EVENT_OBJ_GFX_FAT_MAN, 27, 5, 9, 3, DIR_NORTH
-	createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, DIR_NORTH
-	createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, DIR_NORTH
-	createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH
-	return
-
-LinkContestRoom1_EventScript_23BC92:: @ 823BC92
-	createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_SAILOR, 25, 3, 9, 3, DIR_NORTH
-	createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, DIR_NORTH
-	createvobject EVENT_OBJ_GFX_GENTLEMAN, 27, 5, 9, 3, DIR_NORTH
-	createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, DIR_NORTH
-	createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, DIR_NORTH
-	createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH
-	return
-
-LinkContestRoom1_EventScript_23BD86:: @ 823BD86
-	createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, DIR_EAST
-	createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, DIR_WEST
-	createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, DIR_SOUTH
-	createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
-	return
-
-LinkContestRoom1_EventScript_23BE44:: @ 823BE44
-	special sub_80F9154
-	switch VAR_CONTEST_LOCATION
-	case 1, LinkContestRoom1_EventScript_23BE84
-	case 2, LinkContestRoom1_EventScript_23BE8E
-	case 3, LinkContestRoom1_EventScript_23BE98
-	case 4, LinkContestRoom1_EventScript_23BEA2
-	case 5, LinkContestRoom1_EventScript_23BEAC
-	return
-
-LinkContestRoom1_EventScript_23BE84:: @ 823BE84
-	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
-	waitstate
-	end
-
-LinkContestRoom1_EventScript_23BE8E:: @ 823BE8E
-	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
-	waitstate
-	end
-
-LinkContestRoom1_EventScript_23BE98:: @ 823BE98
-	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
-	waitstate
-	end
-
-LinkContestRoom1_EventScript_23BEA2:: @ 823BEA2
-	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
-	waitstate
-	end
-
-LinkContestRoom1_EventScript_23BEAC:: @ 823BEAC
-	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4
-	waitstate
-	end
-
-LilycoveCity_ContestLobby_EventScript_23BEB6:: @ 823BEB6
-	checkplayergender
-	compare VAR_RESULT, MALE
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_23BECE
-	compare VAR_RESULT, FEMALE
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_23BED4
-	return
-
-LilycoveCity_ContestLobby_EventScript_23BECE:: @ 823BECE
-	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
-	return
-
-LilycoveCity_ContestLobby_EventScript_23BED4:: @ 823BED4
-	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
-	return
-
diff --git a/data/maps/LinkContestRoom2/scripts.inc b/data/maps/LinkContestRoom2/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/LinkContestRoom2/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/LinkContestRoom3/scripts.inc b/data/maps/LinkContestRoom3/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/LinkContestRoom3/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/LinkContestRoom4/scripts.inc b/data/maps/LinkContestRoom4/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/LinkContestRoom4/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/LinkContestRoom5/scripts.inc b/data/maps/LinkContestRoom5/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/LinkContestRoom5/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/LinkContestRoom6/map.json b/data/maps/LinkContestRoom6/map.json
deleted file mode 100644
index 38bfcd979..000000000
--- a/data/maps/LinkContestRoom6/map.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "id": "MAP_LINK_CONTEST_ROOM6",
-  "name": "LinkContestRoom6",
-  "layout": "LAYOUT_LINK_CONTEST_ROOM6",
-  "music": "MUS_CONTEST0",
-  "region_map_section": "MAPSEC_DYNAMIC",
-  "requires_flash": false,
-  "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_INDOOR",
-  "allow_bike": false,
-  "allow_escape_rope": false,
-  "allow_running": false,
-  "show_map_name": false,
-  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
-}
\ No newline at end of file
diff --git a/data/maps/LinkContestRoom6/scripts.inc b/data/maps/LinkContestRoom6/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/LinkContestRoom6/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc
index 83dd8b420..9f951e83d 100644
--- a/data/maps/SlateportCity/scripts.inc
+++ b/data/maps/SlateportCity/scripts.inc
@@ -14,7 +14,7 @@ SlateportCity_OnTransition: @ 81DCC6C
 
 SlateportCity_EventScript_EnterSlateport:: @ 81DCC8D
 	setflag FLAG_VISITED_SLATEPORT_CITY
-	setvar VAR_LINK_CONTEST_ROOM_STATE, 0
+	setvar VAR_CONTEST_HALL_STATE, 0
 	setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER
 	return
 
diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc
index eff7edfa7..25de15889 100644
--- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc
+++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc
@@ -4,7 +4,7 @@ SlateportCity_PokemonFanClub_MapScripts:: @ 8209E95
 SlateportCity_PokemonFanClub_EventScript_Chairman:: @ 8209E96
 	lock
 	faceplayer
-	goto_if_unset FLAG_ENTERED_LINK_CONTEST, SlateportCity_PokemonFanClub_EventScript_ChairmanNotEnteredContest
+	goto_if_unset FLAG_ENTERED_CONTEST, SlateportCity_PokemonFanClub_EventScript_ChairmanNotEnteredContest
 	call_if_unset FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN, SlateportCity_PokemonFanClub_EventScript_MeetChairman
 	switch VAR_SLATEPORT_FAN_CLUB_STATE
 	case 0, SlateportCity_PokemonFanClub_EventScript_ChairmanFirstAssessment
diff --git a/data/maps/UnknownLinkContestRoom_25_29/map.json b/data/maps/UnknownLinkContestRoom_25_29/map.json
index 3e4387b6a..bcad9e1d7 100644
--- a/data/maps/UnknownLinkContestRoom_25_29/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_29/map.json
@@ -13,6 +13,6 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
+  "shared_events_map": "ContestHall",
+  "shared_scripts_map": "ContestHall"
 }
\ No newline at end of file
diff --git a/data/maps/UnknownLinkContestRoom_25_29/scripts.inc b/data/maps/UnknownLinkContestRoom_25_29/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/UnknownLinkContestRoom_25_29/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/UnknownLinkContestRoom_25_30/map.json b/data/maps/UnknownLinkContestRoom_25_30/map.json
index 42a719c17..4a6708006 100644
--- a/data/maps/UnknownLinkContestRoom_25_30/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_30/map.json
@@ -13,6 +13,6 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
+  "shared_events_map": "ContestHall",
+  "shared_scripts_map": "ContestHall"
 }
\ No newline at end of file
diff --git a/data/maps/UnknownLinkContestRoom_25_30/scripts.inc b/data/maps/UnknownLinkContestRoom_25_30/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/UnknownLinkContestRoom_25_30/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/UnknownLinkContestRoom_25_31/map.json b/data/maps/UnknownLinkContestRoom_25_31/map.json
index ad18b00af..da7f875b3 100644
--- a/data/maps/UnknownLinkContestRoom_25_31/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_31/map.json
@@ -13,6 +13,6 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
+  "shared_events_map": "ContestHall",
+  "shared_scripts_map": "ContestHall"
 }
\ No newline at end of file
diff --git a/data/maps/UnknownLinkContestRoom_25_31/scripts.inc b/data/maps/UnknownLinkContestRoom_25_31/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/UnknownLinkContestRoom_25_31/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/UnknownLinkContestRoom_25_32/map.json b/data/maps/UnknownLinkContestRoom_25_32/map.json
index 0e1528e59..8d5b033db 100644
--- a/data/maps/UnknownLinkContestRoom_25_32/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_32/map.json
@@ -13,6 +13,6 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
+  "shared_events_map": "ContestHall",
+  "shared_scripts_map": "ContestHall"
 }
\ No newline at end of file
diff --git a/data/maps/UnknownLinkContestRoom_25_32/scripts.inc b/data/maps/UnknownLinkContestRoom_25_32/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/UnknownLinkContestRoom_25_32/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/UnknownLinkContestRoom_25_33/map.json b/data/maps/UnknownLinkContestRoom_25_33/map.json
index 8765e9771..89c95c51b 100644
--- a/data/maps/UnknownLinkContestRoom_25_33/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_33/map.json
@@ -13,6 +13,6 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
+  "shared_events_map": "ContestHall",
+  "shared_scripts_map": "ContestHall"
 }
\ No newline at end of file
diff --git a/data/maps/UnknownLinkContestRoom_25_33/scripts.inc b/data/maps/UnknownLinkContestRoom_25_33/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/UnknownLinkContestRoom_25_33/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/UnknownLinkContestRoom_25_34/map.json b/data/maps/UnknownLinkContestRoom_25_34/map.json
index c7220897b..3e2878962 100644
--- a/data/maps/UnknownLinkContestRoom_25_34/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_34/map.json
@@ -13,6 +13,6 @@
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
-  "shared_events_map": "LinkContestRoom1",
-  "shared_scripts_map": "LinkContestRoom1"
+  "shared_events_map": "ContestHall",
+  "shared_scripts_map": "ContestHall"
 }
\ No newline at end of file
diff --git a/data/maps/UnknownLinkContestRoom_25_34/scripts.inc b/data/maps/UnknownLinkContestRoom_25_34/scripts.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/UnknownLinkContestRoom_25_34/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc
index a4eeb00d8..2f075346c 100644
--- a/data/maps/VerdanturfTown/scripts.inc
+++ b/data/maps/VerdanturfTown/scripts.inc
@@ -4,7 +4,7 @@ VerdanturfTown_MapScripts:: @ 81EB566
 
 VerdanturfTown_OnTransition: @ 81EB56C
 	setflag FLAG_VISITED_VERDANTURF_TOWN
-	setvar VAR_LINK_CONTEST_ROOM_STATE, 0
+	setvar VAR_CONTEST_HALL_STATE, 0
 	end
 
 VerdanturfTown_EventScript_Twin:: @ 81EB575
diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json
index 190e41fc8..cc4b5b137 100644
--- a/data/maps/map_groups.json
+++ b/data/maps/map_groups.json
@@ -460,18 +460,18 @@
     "TradeCenter",
     "RecordCorner",
     "BattleColosseum4P",
-    "LinkContestRoom1",
+    "ContestHall",
     "UnknownLinkContestRoom_25_29",
     "UnknownLinkContestRoom_25_30",
     "UnknownLinkContestRoom_25_31",
     "UnknownLinkContestRoom_25_32",
     "UnknownLinkContestRoom_25_33",
     "UnknownLinkContestRoom_25_34",
-    "LinkContestRoom2",
-    "LinkContestRoom3",
-    "LinkContestRoom4",
-    "LinkContestRoom5",
-    "LinkContestRoom6",
+    "ContestHallBeauty",
+    "ContestHallTough",
+    "ContestHallCool",
+    "ContestHallSmart",
+    "ContestHallCute",
     "InsideOfTruck",
     "SSTidalCorridor",
     "SSTidalLowerDeck",
diff --git a/data/scripts/berry_blender.inc b/data/scripts/berry_blender.inc
index 09b0eccac..1d0862a65 100644
--- a/data/scripts/berry_blender.inc
+++ b/data/scripts/berry_blender.inc
@@ -1,22 +1,22 @@
-LilycoveCity_ContestLobby_Text_WantToMakePokeblocks: @ 8292DEE
+BerryBlender_Text_WantToMakePokeblocks: @ 8292DEE
 	.string "Oh? Did you want to make some {POKEBLOCK}S\n"
 	.string "with this old-timer?$"
 
-LilycoveCity_ContestLobby_Text_Excellent: @ 8292E28
+BerryBlender_Text_Excellent: @ 8292E28
 	.string "Excellent!$"
 
-LilycoveCity_ContestLobby_Text_MadeOldTimerSad: @ 8292E33
+BerryBlender_Text_MadeOldTimerSad: @ 8292E33
 	.string "Oh…\n"
 	.string "You've made this old-timer sad…$"
 
-LilycoveCity_ContestLobby_Text_KnowHowToMakePokeblocks: @ 8292E57
+BerryBlender_Text_KnowHowToMakePokeblocks: @ 8292E57
 	.string "Do you know how to make a {POKEBLOCK}?$"
 
-LilycoveCity_ContestLobby_Text_LetsBerryBlender: @ 8292E78
+BerryBlender_Text_LetsBerryBlender: @ 8292E78
 	.string "Let's get started, then!\p"
 	.string "Let's BERRY BLENDER!$"
 
-LilycoveCity_ContestLobby_Text_ExplainBerryBlending: @ 8292EA6
+BerryBlender_Text_ExplainBerryBlending: @ 8292EA6
 	.string "Okay, a little explanation, then.\p"
 	.string "Oh, don't worry, it's quite simple.\p"
 	.string "When the BLENDER's arrow comes to\n"
@@ -24,63 +24,63 @@ LilycoveCity_ContestLobby_Text_ExplainBerryBlending: @ 8292EA6
 	.string "That's all you have to do.\n"
 	.string "You'll see how easy it is when you try.$"
 
-LilycoveCity_ContestLobby_Text_DontHaveAnyBerries: @ 8292F77
+BerryBlender_Text_DontHaveAnyBerries: @ 8292F77
 	.string "Oh?\n"
 	.string "You don't have any BERRIES?\p"
 	.string "If you don't have any BERRIES,\n"
 	.string "you can't make any {POKEBLOCK}S.$"
 
-LilycoveCity_ContestLobby_Text_CanHaveOneOfMyBerries: @ 8292FD1
+BerryBlender_Text_CanHaveOneOfMyBerries: @ 8292FD1
 	.string "Well, that won't do at all now, will it?\p"
 	.string "If you don't mind leftovers, you can\n"
 	.string "have one of my BERRIES.\p"
 	.string "That way, we could make some {POKEBLOCK}S\n"
 	.string "together using the BERRY BLENDER.$"
 
-LilycoveCity_ContestLobby_Text_DontHaveAnyBerriesToSpare: @ 829307D
+BerryBlender_Text_DontHaveAnyBerriesToSpare: @ 829307D
 	.string "If I had some BERRIES left over,\n"
 	.string "I'd gladly give you one…\p"
 	.string "But, I don't have any to spare today.\n"
 	.string "We'll have to do this another time.$"
 
-LilycoveCity_ContestLobby_Text_PokeblockCaseIsFull: @ 8293101
+BerryBlender_Text_PokeblockCaseIsFull: @ 8293101
 	.string "But your {POKEBLOCK} CASE is full.\p"
 	.string "You should use some {POKEBLOCK}S before\n"
 	.string "you come see me again.$"
 
-LilycoveCity_ContestLobby_Text_DontHavePokeblockCase: @ 8293157
+BerryBlender_Text_DontHavePokeblockCase: @ 8293157
 	.string "But you don't have a {POKEBLOCK} CASE.\p"
 	.string "You should get a {POKEBLOCK} CASE and then\n"
 	.string "come see me.$"
 
-LilycoveCity_ContestLobby_Text_LetsGetBlendingAlready: @ 82931AA
+BerryBlender_Text_LetsGetBlendingAlready: @ 82931AA
 	.string "Let's get blending already!$"
 
-LilycoveCity_ContestLobby_Text_WhatKindOfPokeblockWillIGet: @ 82931C6
+BerryBlender_Text_WhatKindOfPokeblockWillIGet: @ 82931C6
 	.string "I wonder what kind of {POKEBLOCK} I'll get?\n"
 	.string "This is so exciting!$"
 
-LilycoveCity_ContestLobby_Text_WantToBlendPokeblocksWithUs: @ 8293201
+BerryBlender_Text_WantToBlendPokeblocksWithUs: @ 8293201
 	.string "Hi, there! Did you want to blend some\n"
 	.string "{POKEBLOCK}S with us?$"
 
-LilycoveCity_ContestLobby_Text_Okay: @ 8293237
+BerryBlender_Text_Okay: @ 8293237
 	.string "Okay!$"
 
-LilycoveCity_ContestLobby_Text_ThatsTooBad: @ 829323D
+BerryBlender_Text_ThatsTooBad: @ 829323D
 	.string "That's too bad…\p"
 	.string "But we'll always be around whenever\n"
 	.string "you get the urge to blend!$"
 
-LilycoveCity_ContestLobby_Text_KnowHowToMakePokeblocks2: @ 829328C
+BerryBlender_Text_KnowHowToMakePokeblocks2: @ 829328C
 	.string "Of course, you do know how to\n"
 	.string "blend {POKEBLOCK}S, don't you?$"
 
-LilycoveCity_ContestLobby_Text_LetsBerryBlender2: @ 82932C3
+BerryBlender_Text_LetsBerryBlender2: @ 82932C3
 	.string "Let's get started, then!\p"
 	.string "Let's BERRY BLENDER!$"
 
-LilycoveCity_ContestLobby_Text_ExplainBerryBlending2: @ 82932F1
+BerryBlender_Text_ExplainBerryBlending2: @ 82932F1
 	.string "Okay!\n"
 	.string "Let me explain it to you!\p"
 	.string "When the spinning BLENDER's arrow\n"
@@ -89,7 +89,7 @@ LilycoveCity_ContestLobby_Text_ExplainBerryBlending2: @ 82932F1
 	.string "That's all it takes.\n"
 	.string "Pretty easy, don't you think?$"
 
-LilycoveCity_ContestLobby_Text_DontHaveAnyBerries2: @ 8293394
+BerryBlender_Text_DontHaveAnyBerries2: @ 8293394
 	.string "Oh, but wait a second here…\n"
 	.string "You don't have any BERRIES.\p"
 	.string "You can't make any {POKEBLOCK}S without\n"
@@ -97,40 +97,40 @@ LilycoveCity_ContestLobby_Text_DontHaveAnyBerries2: @ 8293394
 	.string "We'll always be around whenever you\n"
 	.string "get hold of some BERRIES to blend.$"
 
-LilycoveCity_ContestLobby_Text_PokeblockCaseIsFull2: @ 829343E
+BerryBlender_Text_PokeblockCaseIsFull2: @ 829343E
 	.string "Oh, but wait a second here…\n"
 	.string "Your {POKEBLOCK} CASE is full.\p"
 	.string "You should use some {POKEBLOCK}S and\n"
 	.string "then come back.$"
 
-LilycoveCity_ContestLobby_Text_DontHavePokeblockCase2: @ 82934A2
+BerryBlender_Text_DontHavePokeblockCase2: @ 82934A2
 	.string "Oh, but wait a second here…\n"
 	.string "You don't have a {POKEBLOCK} CASE.\p"
 	.string "You should get a {POKEBLOCK} CASE and\n"
 	.string "then come back.$"
 
 @ Unused
-LilycoveCity_ContestLobby_Text_MakePokeblocksWithOurGroup: @ 829350B
+BerryBlender_Text_MakePokeblocksWithOurGroup: @ 829350B
 	.string "Oh, hello! Did you want to make some\n"
 	.string "{POKEBLOCK}S with our little group?$"
 
-LilycoveCity_ContestLobby_Text_OhDear: @ 829354E
+BerryBlender_Text_OhDear: @ 829354E
 	.string "Oh, dear!$"
 
-LilycoveCity_ContestLobby_Text_LeftUsInShock: @ 8293558
+BerryBlender_Text_LeftUsInShock: @ 8293558
 	.string "Oh, dear me…\p"
 	.string "You've left us in shock!$"
 
-LilycoveCity_ContestLobby_Text_KnowHowToMakePokeblocks3: @ 829357E
+BerryBlender_Text_KnowHowToMakePokeblocks3: @ 829357E
 	.string "Naturally, you know how to make\n"
 	.string "{POKEBLOCK}S, don't you?$"
 
-LilycoveCity_ContestLobby_Text_LetsBerryBlender3: @ 82935B1
+BerryBlender_Text_LetsBerryBlender3: @ 82935B1
 	.string "Okay, dear!\n"
 	.string "Let's get started!\p"
 	.string "Let's BERRY BLENDER!$"
 
-LilycoveCity_ContestLobby_Text_ExplainBerryBlending3: @ 82935E5
+BerryBlender_Text_ExplainBerryBlending3: @ 82935E5
 	.string "Oh, dear!\p"
 	.string "Then, I'll explain it to you nicely.\p"
 	.string "When the BLENDER's arrow spins to\n"
@@ -138,7 +138,7 @@ LilycoveCity_ContestLobby_Text_ExplainBerryBlending3: @ 82935E5
 	.string "That's all it takes.\n"
 	.string "Isn't it simple?$"
 
-LilycoveCity_ContestLobby_Text_DontHaveAnyBerries3: @ 829367D
+BerryBlender_Text_DontHaveAnyBerries3: @ 829367D
 	.string "You don't have any BERRIES,\n"
 	.string "do you?\p"
 	.string "If you don't have any BERRIES,\n"
@@ -147,84 +147,84 @@ LilycoveCity_ContestLobby_Text_DontHaveAnyBerries3: @ 829367D
 	.string "so let's make some together when\l"
 	.string "you get a BERRY or two.$"
 
-LilycoveCity_ContestLobby_Text_PokeblockCaseIsFull3: @ 8293738
+BerryBlender_Text_PokeblockCaseIsFull3: @ 8293738
 	.string "Your {POKEBLOCK} CASE is full,\n"
 	.string "it looks like.\p"
 	.string "You should use some {POKEBLOCK}S up\n"
 	.string "and then come back.$"
 
-LilycoveCity_ContestLobby_Text_DontHavePokeblockCase3: @ 8293792
+BerryBlender_Text_DontHavePokeblockCase3: @ 8293792
 	.string "You haven't gotten a {POKEBLOCK} CASE\n"
 	.string "yet, it looks like.\p"
 	.string "You need to get a {POKEBLOCK} CASE before\n"
 	.string "you come back.$"
 
-LilycoveCity_ContestLobby_Text_SetNewBlenderRecord: @ 82937F9
+BerryBlender_Text_SetNewBlenderRecord: @ 82937F9
 	.string "Okay! Today's going to be the day that\n"
 	.string "I set a new BLENDER speed record!$"
 
-LilycoveCity_ContestLobby_Text_LookGoodAtBlendingJoinUs: @ 8293842
+BerryBlender_Text_LookGoodAtBlendingJoinUs: @ 8293842
 	.string "Oh, dear!\n"
 	.string "You look as if you're good at blending.\l"
 	.string "Would you like to join us?$"
 
-LilycoveCity_ContestLobby_Text_MakeDeliciousPokeblocks: @ 829388F
+BerryBlender_Text_MakeDeliciousPokeblocks: @ 829388F
 	.string "I'm going to make delicious {POKEBLOCK}S\n"
 	.string "and make my POKéMON cuter.$"
 
-LilycoveCity_ContestLobby_Text_SaveGameBeforeBerryBlenderLink: @ 82938CD
+BerryBlender_Text_SaveGameBeforeBerryBlenderLink: @ 82938CD
 	.string "{POKEBLOCK}S will be made with your friends \n"
 	.string "from BERRIES in the BERRY BLENDER.\p"
 	.string "Is it okay to save the game before\n"
 	.string "linking with your friends?$"
 
-LilycoveCity_ContestLobby_Text_SearchingForFriends: @ 8293955
+BerryBlender_Text_SearchingForFriends: @ 8293955
 	.string "Searching for your friends…\n"
 	.string "… … B Button: Cancel$"
 
-LilycoveCity_ContestLobby_Text_Player1Arrived: @ 8293986
+BerryBlender_Text_Player1Arrived: @ 8293986
 	.string "{STR_VAR_1} arrived.$"
 
-LilycoveCity_ContestLobby_Text_Player1And2Arrived: @ 8293992
+BerryBlender_Text_Player1And2Arrived: @ 8293992
 	.string "{STR_VAR_1} and {STR_VAR_2} arrived.$"
 
-LilycoveCity_ContestLobby_Text_AllPlayersArrived: @ 82939A5
+BerryBlender_Text_AllPlayersArrived: @ 82939A5
 	.string "{STR_VAR_1}, {STR_VAR_2}, and\n"
 	.string "{STR_VAR_3} arrived.$"
 
-LilycoveCity_ContestLobby_Text_NoBerriesLink: @ 82939BD
+BerryBlender_Text_NoBerriesLink: @ 82939BD
 	.string "You have no BERRIES.\n"
 	.string "The BERRY BLENDER can't be used.$"
 
-LilycoveCity_ContestLobby_Text_PokeblockCaseIsFullLink: @ 82939F3
+BerryBlender_Text_PokeblockCaseIsFullLink: @ 82939F3
 	.string "Your {POKEBLOCK} CASE is full.\n"
 	.string "The BERRY BLENDER can't be used.$"
 
-LilycoveCity_ContestLobby_Text_DontHavePokeblockCaseLink: @ 8293A2D
+BerryBlender_Text_DontHavePokeblockCaseLink: @ 8293A2D
 	.string "You don't have a {POKEBLOCK} CASE.\n"
 	.string "The BERRY BLENDER can't be used.$"
 
-LilycoveCity_ContestLobby_Text_LoveMakingPokeblocks: @ 8293A6B
+BerryBlender_Text_LoveMakingPokeblocks: @ 8293A6B
 	.string "I love making {POKEBLOCK}S.\p"
 	.string "I always have some BERRIES with me.$"
 
-LilycoveCity_ContestLobby_Text_MakePokeblocksUsingBerryBlender: @ 8293AA5
+BerryBlender_Text_MakePokeblocksUsingBerryBlender: @ 8293AA5
 	.string "If you'd like, we could make some\n"
 	.string "{POKEBLOCK}S together using the\l"
 	.string "BERRY BLENDER.$"
 
-LilycoveCity_ContestLobby_Text_DontHaveAnyBerriesHaveOne: @ 8293AF0
+BerryBlender_Text_DontHaveAnyBerriesHaveOne: @ 8293AF0
 	.string "Oh?\n"
 	.string "You don't have any BERRIES?\p"
 	.string "Well, that won't do at all now, will it?\p"
 	.string "If you don't mind leftovers, you can\n"
 	.string "have one of my BERRIES.$"
 
-LilycoveCity_ContestLobby_Text_UseItToMakePokeblocksTogether: @ 8293B76
+BerryBlender_Text_UseItToMakePokeblocksTogether: @ 8293B76
 	.string "We'll use it to make {POKEBLOCK}S together\n"
 	.string "using the BERRY BLENDER.$"
 
-LilycoveCity_ContestLobby_Text_DontHaveAnyBerriesNoneToSpare: @ 8293BB4
+BerryBlender_Text_DontHaveAnyBerriesNoneToSpare: @ 8293BB4
 	.string "Oh?\n"
 	.string "You don't have any BERRIES?\p"
 	.string "If I had some left over, I'd gladly\n"
@@ -232,75 +232,75 @@ LilycoveCity_ContestLobby_Text_DontHaveAnyBerriesNoneToSpare: @ 8293BB4
 	.string "But, I don't have any to spare today.\n"
 	.string "Sorry about that.$"
 
-LilycoveCity_ContestLobby_EventScript_BerryBlender1:: @ 8293C3E
+BerryBlender_EventScript_BerryBlender1:: @ 8293C3E
 	lockall
-	goto_if_unset FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER, LilycoveCity_ContestLobby_EventScript_BlendMasterPresent
+	goto_if_unset FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER, BerryBlender_EventScript_BlendMasterPresent
 	setvar VAR_0x8009, 1
-	applymovement 16, LilycoveCity_ContestLobby_Movement_BlendLeaderWalkInPlace
+	applymovement 16, BerryBlender_Movement_BlendLeaderWalkInPlace
 	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_WantToMakePokeblocks, MSGBOX_YESNO
+	msgbox BerryBlender_Text_WantToMakePokeblocks, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_TryUseBerryBlender1
-	goto LilycoveCity_ContestLobby_EventScript_DeclineBlender1
+	goto_if_eq BerryBlender_EventScript_TryUseBerryBlender1
+	goto BerryBlender_EventScript_DeclineBlender1
 	end
 
-LilycoveCity_ContestLobby_EventScript_DeclineBlender1: @ 8293C70
-	msgbox LilycoveCity_ContestLobby_Text_MadeOldTimerSad, MSGBOX_DEFAULT
+BerryBlender_EventScript_DeclineBlender1: @ 8293C70
+	msgbox BerryBlender_Text_MadeOldTimerSad, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_Blender1NoBerries: @ 8293C7A
-	msgbox LilycoveCity_ContestLobby_Text_DontHaveAnyBerries, MSGBOX_DEFAULT
+BerryBlender_EventScript_Blender1NoBerries: @ 8293C7A
+	msgbox BerryBlender_Text_DontHaveAnyBerries, MSGBOX_DEFAULT
 	dotimebasedevents
-	goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, LilycoveCity_ContestLobby_EventScript_Blender1NoSpareBerries
-	goto LilycoveCity_ContestLobby_EventScript_Blender1GiveSpareBerry
+	goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, BerryBlender_EventScript_Blender1NoSpareBerries
+	goto BerryBlender_EventScript_Blender1GiveSpareBerry
 	end
 
-LilycoveCity_ContestLobby_EventScript_Blender1NoSpareBerries: @ 8293C92
-	msgbox LilycoveCity_ContestLobby_Text_DontHaveAnyBerriesToSpare, MSGBOX_DEFAULT
+BerryBlender_EventScript_Blender1NoSpareBerries: @ 8293C92
+	msgbox BerryBlender_Text_DontHaveAnyBerriesToSpare, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_Blender1GiveSpareBerry: @ 8293C9C
-	msgbox LilycoveCity_ContestLobby_Text_CanHaveOneOfMyBerries, MSGBOX_DEFAULT
+BerryBlender_EventScript_Blender1GiveSpareBerry: @ 8293C9C
+	msgbox BerryBlender_Text_CanHaveOneOfMyBerries, MSGBOX_DEFAULT
 	giveitem_std ITEM_PECHA_BERRY
 	setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY
-	goto LilycoveCity_ContestLobby_EventScript_UseBerryBlender1
+	goto BerryBlender_EventScript_UseBerryBlender1
 	end
 
-LilycoveCity_ContestLobby_EventScript_UseBerryBlender1: @ 8293CB9
-	msgbox LilycoveCity_ContestLobby_Text_KnowHowToMakePokeblocks, MSGBOX_YESNO
+BerryBlender_EventScript_UseBerryBlender1: @ 8293CB9
+	msgbox BerryBlender_Text_KnowHowToMakePokeblocks, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_StartBlender1
-	goto LilycoveCity_ContestLobby_EventScript_ExplainBlending1
+	goto_if_eq BerryBlender_EventScript_StartBlender1
+	goto BerryBlender_EventScript_ExplainBlending1
 	end
 
-LilycoveCity_ContestLobby_EventScript_StartBlender1: @ 8293CD2
-	msgbox LilycoveCity_ContestLobby_Text_LetsBerryBlender, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_DoBerryBlending
+BerryBlender_EventScript_StartBlender1: @ 8293CD2
+	msgbox BerryBlender_Text_LetsBerryBlender, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_DoBerryBlending
 	end
 
-LilycoveCity_ContestLobby_EventScript_ExplainBlending1: @ 8293CE0
-	msgbox LilycoveCity_ContestLobby_Text_ExplainBerryBlending, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_StartBlender1
+BerryBlender_EventScript_ExplainBlending1: @ 8293CE0
+	msgbox BerryBlender_Text_ExplainBerryBlending, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_StartBlender1
 	end
 
-LilycoveCity_ContestLobby_EventScript_TryUseBerryBlender1: @ 8293CEE
+BerryBlender_EventScript_TryUseBerryBlender1: @ 8293CEE
 	checkitem ITEM_POKEBLOCK_CASE, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender1NoCase
+	goto_if_eq BerryBlender_EventScript_Blender1NoCase
 	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
 	compare VAR_RESULT, 65535
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender1CaseFull
+	goto_if_eq BerryBlender_EventScript_Blender1CaseFull
 	specialvar VAR_RESULT, PlayerHasBerries
 	compare VAR_RESULT, FALSE
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender1NoBerries
-	msgbox LilycoveCity_ContestLobby_Text_Excellent, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_UseBerryBlender1
+	goto_if_eq BerryBlender_EventScript_Blender1NoBerries
+	msgbox BerryBlender_Text_Excellent, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_UseBerryBlender1
 	end
 
 @ VAR_0x8009 here is the Blender number. 1 is top right, 2 is bottom right, 3 is bottom left
-LilycoveCity_ContestLobby_EventScript_DoBerryBlending: @ 8293D2C
+BerryBlender_EventScript_DoBerryBlending: @ 8293D2C
 	copyvar VAR_0x8004, VAR_0x8009
 	fadescreen 1
 	special DoBerryBlending
@@ -308,326 +308,326 @@ LilycoveCity_ContestLobby_EventScript_DoBerryBlending: @ 8293D2C
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_Blender1CaseFull: @ 8293D39
-	msgbox LilycoveCity_ContestLobby_Text_PokeblockCaseIsFull, MSGBOX_DEFAULT
+BerryBlender_EventScript_Blender1CaseFull: @ 8293D39
+	msgbox BerryBlender_Text_PokeblockCaseIsFull, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_Blender1NoCase: @ 8293D43
-	msgbox LilycoveCity_ContestLobby_Text_DontHavePokeblockCase, MSGBOX_DEFAULT
+BerryBlender_EventScript_Blender1NoCase: @ 8293D43
+	msgbox BerryBlender_Text_DontHavePokeblockCase, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_BerryBlender2:: @ 8293D4D
+BerryBlender_EventScript_BerryBlender2:: @ 8293D4D
 	lockall
 	setvar VAR_0x8009, 2
 	applymovement 10, Common_Movement_FaceOriginalDirection
-	applymovement 3, LilycoveCity_ContestLobby_Movement_BlendLeaderWalkInPlace
+	applymovement 3, BerryBlender_Movement_BlendLeaderWalkInPlace
 	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_WantToBlendPokeblocksWithUs, MSGBOX_YESNO
+	msgbox BerryBlender_Text_WantToBlendPokeblocksWithUs, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_TryUseBerryBlender2
-	goto LilycoveCity_ContestLobby_EventScript_DeclineBlender2
+	goto_if_eq BerryBlender_EventScript_TryUseBerryBlender2
+	goto BerryBlender_EventScript_DeclineBlender2
 	end
 
-LilycoveCity_ContestLobby_EventScript_DeclineBlender2: @ 8293D7D
-	msgbox LilycoveCity_ContestLobby_Text_ThatsTooBad, MSGBOX_DEFAULT
+BerryBlender_EventScript_DeclineBlender2: @ 8293D7D
+	msgbox BerryBlender_Text_ThatsTooBad, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_Blender2NoBerries: @ 8293D87
-	msgbox LilycoveCity_ContestLobby_Text_DontHaveAnyBerries2, MSGBOX_DEFAULT
+BerryBlender_EventScript_Blender2NoBerries: @ 8293D87
+	msgbox BerryBlender_Text_DontHaveAnyBerries2, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_UseBerryBlender2: @ 8293D91
-	msgbox LilycoveCity_ContestLobby_Text_KnowHowToMakePokeblocks2, MSGBOX_YESNO
+BerryBlender_EventScript_UseBerryBlender2: @ 8293D91
+	msgbox BerryBlender_Text_KnowHowToMakePokeblocks2, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_StartBlender2
-	goto LilycoveCity_ContestLobby_EventScript_ExplainBlending2
+	goto_if_eq BerryBlender_EventScript_StartBlender2
+	goto BerryBlender_EventScript_ExplainBlending2
 	end
 
-LilycoveCity_ContestLobby_EventScript_StartBlender2: @ 8293DAA
-	msgbox LilycoveCity_ContestLobby_Text_LetsBerryBlender2, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_DoBerryBlending
+BerryBlender_EventScript_StartBlender2: @ 8293DAA
+	msgbox BerryBlender_Text_LetsBerryBlender2, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_DoBerryBlending
 	end
 
-LilycoveCity_ContestLobby_EventScript_ExplainBlending2: @ 8293DB8
-	msgbox LilycoveCity_ContestLobby_Text_ExplainBerryBlending2, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_StartBlender2
+BerryBlender_EventScript_ExplainBlending2: @ 8293DB8
+	msgbox BerryBlender_Text_ExplainBerryBlending2, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_StartBlender2
 	end
 
-LilycoveCity_ContestLobby_EventScript_TryUseBerryBlender2: @ 8293DC6
+BerryBlender_EventScript_TryUseBerryBlender2: @ 8293DC6
 	specialvar VAR_RESULT, PlayerHasBerries
 	compare VAR_RESULT, FALSE
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender2NoBerries
+	goto_if_eq BerryBlender_EventScript_Blender2NoBerries
 	checkitem ITEM_POKEBLOCK_CASE, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender2NoCase
-	msgbox LilycoveCity_ContestLobby_Text_Okay, MSGBOX_DEFAULT
+	goto_if_eq BerryBlender_EventScript_Blender2NoCase
+	msgbox BerryBlender_Text_Okay, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
 	compare VAR_RESULT, 65535
-	goto_if_ne LilycoveCity_ContestLobby_EventScript_UseBerryBlender2
+	goto_if_ne BerryBlender_EventScript_UseBerryBlender2
 	compare VAR_RESULT, 65535
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender2CaseFull
+	goto_if_eq BerryBlender_EventScript_Blender2CaseFull
 	end
 
-LilycoveCity_ContestLobby_EventScript_Blender2CaseFull: @ 8293E0A
-	msgbox LilycoveCity_ContestLobby_Text_PokeblockCaseIsFull2, MSGBOX_DEFAULT
+BerryBlender_EventScript_Blender2CaseFull: @ 8293E0A
+	msgbox BerryBlender_Text_PokeblockCaseIsFull2, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_Blender2NoCase: @ 8293E14
-	msgbox LilycoveCity_ContestLobby_Text_DontHavePokeblockCase2, MSGBOX_DEFAULT
+BerryBlender_EventScript_Blender2NoCase: @ 8293E14
+	msgbox BerryBlender_Text_DontHavePokeblockCase2, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_BerryBlender3:: @ 8293E1E
+BerryBlender_EventScript_BerryBlender3:: @ 8293E1E
 	lockall
 	setvar VAR_0x8008, 15
 	setvar VAR_0x8009, 3
 	applymovement 9, Common_Movement_FaceOriginalDirection
 	applymovement 17, Common_Movement_FaceOriginalDirection
-	applymovement VAR_0x8008, LilycoveCity_ContestLobby_Movement_BlendLeaderWalkInPlace
+	applymovement VAR_0x8008, BerryBlender_Movement_BlendLeaderWalkInPlace
 	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_LookGoodAtBlendingJoinUs, MSGBOX_YESNO
+	msgbox BerryBlender_Text_LookGoodAtBlendingJoinUs, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_TryUseBlender3
-	goto LilycoveCity_ContestLobby_EventScript_DeclineBlender3
+	goto_if_eq BerryBlender_EventScript_TryUseBlender3
+	goto BerryBlender_EventScript_DeclineBlender3
 	end
 
-LilycoveCity_ContestLobby_EventScript_DeclineBlender3: @ 8293E5A
-	msgbox LilycoveCity_ContestLobby_Text_LeftUsInShock, MSGBOX_DEFAULT
+BerryBlender_EventScript_DeclineBlender3: @ 8293E5A
+	msgbox BerryBlender_Text_LeftUsInShock, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_Blender3NoBerries: @ 8293E64
-	msgbox LilycoveCity_ContestLobby_Text_DontHaveAnyBerries3, MSGBOX_DEFAULT
+BerryBlender_EventScript_Blender3NoBerries: @ 8293E64
+	msgbox BerryBlender_Text_DontHaveAnyBerries3, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_UseBerryBlender3: @ 8293E6E
-	msgbox LilycoveCity_ContestLobby_Text_KnowHowToMakePokeblocks3, MSGBOX_YESNO
+BerryBlender_EventScript_UseBerryBlender3: @ 8293E6E
+	msgbox BerryBlender_Text_KnowHowToMakePokeblocks3, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_StartBlender3
-	goto LilycoveCity_ContestLobby_EventScript_ExplainBlending3
+	goto_if_eq BerryBlender_EventScript_StartBlender3
+	goto BerryBlender_EventScript_ExplainBlending3
 	end
 
-LilycoveCity_ContestLobby_EventScript_StartBlender3: @ 8293E87
-	msgbox LilycoveCity_ContestLobby_Text_LetsBerryBlender3, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_DoBerryBlending
+BerryBlender_EventScript_StartBlender3: @ 8293E87
+	msgbox BerryBlender_Text_LetsBerryBlender3, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_DoBerryBlending
 	end
 
-LilycoveCity_ContestLobby_EventScript_ExplainBlending3: @ 8293E95
-	msgbox LilycoveCity_ContestLobby_Text_ExplainBerryBlending3, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_StartBlender3
+BerryBlender_EventScript_ExplainBlending3: @ 8293E95
+	msgbox BerryBlender_Text_ExplainBerryBlending3, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_StartBlender3
 	end
 
-LilycoveCity_ContestLobby_EventScript_TryUseBlender3: @ 8293EA3
+BerryBlender_EventScript_TryUseBlender3: @ 8293EA3
 	specialvar VAR_RESULT, PlayerHasBerries
 	compare VAR_RESULT, FALSE
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender3NoBerries
+	goto_if_eq BerryBlender_EventScript_Blender3NoBerries
 	checkitem ITEM_POKEBLOCK_CASE, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender3NoCase
-	msgbox LilycoveCity_ContestLobby_Text_OhDear, MSGBOX_DEFAULT
+	goto_if_eq BerryBlender_EventScript_Blender3NoCase
+	msgbox BerryBlender_Text_OhDear, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
 	compare VAR_RESULT, 65535
-	goto_if_ne LilycoveCity_ContestLobby_EventScript_UseBerryBlender3
+	goto_if_ne BerryBlender_EventScript_UseBerryBlender3
 	compare VAR_RESULT, 65535
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_Blender3CaseFull
+	goto_if_eq BerryBlender_EventScript_Blender3CaseFull
 	end
 
-LilycoveCity_ContestLobby_EventScript_Blender3CaseFull: @ 8293EE7
-	msgbox LilycoveCity_ContestLobby_Text_PokeblockCaseIsFull3, MSGBOX_DEFAULT
+BerryBlender_EventScript_Blender3CaseFull: @ 8293EE7
+	msgbox BerryBlender_Text_PokeblockCaseIsFull3, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_Blender3NoCase: @ 8293EF1
-	msgbox LilycoveCity_ContestLobby_Text_DontHavePokeblockCase3, MSGBOX_DEFAULT
+BerryBlender_EventScript_Blender3NoCase: @ 8293EF1
+	msgbox BerryBlender_Text_DontHavePokeblockCase3, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_BlendMasterPresent: @ 8293EFB
+BerryBlender_EventScript_BlendMasterPresent: @ 8293EFB
 	lockall
 	setvar VAR_0x8009, 1
-	msgbox LilycoveCity_ContestLobby_Text_SeeMyMasteryInAction, MSGBOX_YESNO
+	msgbox BerryBlender_Text_SeeMyMasteryInAction, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_TryBlendWithBlendMaster
-	msgbox LilycoveCity_ContestLobby_Text_TooBusyNowIsee, MSGBOX_DEFAULT
+	goto_if_eq BerryBlender_EventScript_TryBlendWithBlendMaster
+	msgbox BerryBlender_Text_TooBusyNowIsee, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_BlendMasterNoBerries: @ 8293F1E
-	msgbox LilycoveCity_ContestLobby_Text_BlendMasterNoBerries, MSGBOX_DEFAULT
+BerryBlender_EventScript_BlendMasterNoBerries: @ 8293F1E
+	msgbox BerryBlender_Text_BlendMasterNoBerries, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_TryBlendWithBlendMaster: @ 8293F28
+BerryBlender_EventScript_TryBlendWithBlendMaster: @ 8293F28
 	checkitem ITEM_POKEBLOCK_CASE, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_BlendMasterNoCase
+	goto_if_eq BerryBlender_EventScript_BlendMasterNoCase
 	specialvar VAR_RESULT, PlayerHasBerries
 	compare VAR_RESULT, FALSE
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_BlendMasterNoBerries
+	goto_if_eq BerryBlender_EventScript_BlendMasterNoBerries
 	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
 	compare VAR_RESULT, 65535
-	goto_if_ne LilycoveCity_ContestLobby_EventScript_BlendWithBlendMaster
+	goto_if_ne BerryBlender_EventScript_BlendWithBlendMaster
 	compare VAR_RESULT, 65535
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_BlendMasterCaseFull
+	goto_if_eq BerryBlender_EventScript_BlendMasterCaseFull
 	end
 
-LilycoveCity_ContestLobby_EventScript_BlendWithBlendMaster: @ 8293F64
-	msgbox LilycoveCity_ContestLobby_Text_BlendMasterKnowHowToMakePokeblocks, MSGBOX_YESNO
+BerryBlender_EventScript_BlendWithBlendMaster: @ 8293F64
+	msgbox BerryBlender_Text_BlendMasterKnowHowToMakePokeblocks, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	call_if_eq LilycoveCity_ContestLobby_EventScript_BlendMasterExplainBlending
-	msgbox LilycoveCity_ContestLobby_Text_BlendMasterLetsBerryBlender, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_DoBerryBlending
+	call_if_eq BerryBlender_EventScript_BlendMasterExplainBlending
+	msgbox BerryBlender_Text_BlendMasterLetsBerryBlender, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_DoBerryBlending
 	end
 
-LilycoveCity_ContestLobby_EventScript_BlendMasterExplainBlending: @ 8293F85
-	msgbox LilycoveCity_ContestLobby_Text_BlendMasterExplainBerryBlending, MSGBOX_DEFAULT
+BerryBlender_EventScript_BlendMasterExplainBlending: @ 8293F85
+	msgbox BerryBlender_Text_BlendMasterExplainBerryBlending, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_ContestLobby_EventScript_BlendMasterNoCase: @ 8293F8E
-	msgbox LilycoveCity_ContestLobby_Text_BlendMasterNoPokeblockCase, MSGBOX_DEFAULT
+BerryBlender_EventScript_BlendMasterNoCase: @ 8293F8E
+	msgbox BerryBlender_Text_BlendMasterNoPokeblockCase, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_BlendMasterCaseFull: @ 8293F98
-	msgbox LilycoveCity_ContestLobby_Text_BlendMasterPokeblockCaseFull, MSGBOX_DEFAULT
+BerryBlender_EventScript_BlendMasterCaseFull: @ 8293F98
+	msgbox BerryBlender_Text_BlendMasterPokeblockCaseFull, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_Blender2Man:: @ 8293FA2
-	msgbox LilycoveCity_ContestLobby_Text_SetNewBlenderRecord, MSGBOX_NPC
+BerryBlender_EventScript_Blender2Man:: @ 8293FA2
+	msgbox BerryBlender_Text_SetNewBlenderRecord, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestLobby_EventScript_Blender3PokefanF:: @ 8293FAB
-	msgbox LilycoveCity_ContestLobby_Text_LookGoodAtBlendingJoinUs, MSGBOX_NPC
+BerryBlender_EventScript_Blender3PokefanF:: @ 8293FAB
+	msgbox BerryBlender_Text_LookGoodAtBlendingJoinUs, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestLobby_EventScript_Blender2Twin:: @ 8293FB4
-	msgbox LilycoveCity_ContestLobby_Text_MakeDeliciousPokeblocks, MSGBOX_NPC
+BerryBlender_EventScript_Blender2Twin:: @ 8293FB4
+	msgbox BerryBlender_Text_MakeDeliciousPokeblocks, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestLobby_EventScript_Blender1ExpertM:: @ 8293FBD
+BerryBlender_EventScript_Blender1ExpertM:: @ 8293FBD
 	setvar VAR_0x8008, 15
-	goto LilycoveCity_ContestLobby_EventScript_ExpertMCheckGiveBerry
+	goto BerryBlender_EventScript_ExpertMCheckGiveBerry
 	end
 
-LilycoveCity_ContestLobby_EventScript_ExpertMCheckGiveBerry: @ 8293FC8
+BerryBlender_EventScript_ExpertMCheckGiveBerry: @ 8293FC8
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestLobby_Text_LoveMakingPokeblocks, MSGBOX_DEFAULT
+	msgbox BerryBlender_Text_LoveMakingPokeblocks, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, PlayerHasBerries
 	compare VAR_RESULT, TRUE
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_ExpertMPlayerHasBerries
+	goto_if_eq BerryBlender_EventScript_ExpertMPlayerHasBerries
 	compare VAR_RESULT, FALSE
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_ExpertMNoBerries
+	goto_if_eq BerryBlender_EventScript_ExpertMNoBerries
 	end
 
-LilycoveCity_ContestLobby_EventScript_ExpertMPlayerHasBerries: @ 8293FEE
-	msgbox LilycoveCity_ContestLobby_Text_MakePokeblocksUsingBerryBlender, MSGBOX_DEFAULT
+BerryBlender_EventScript_ExpertMPlayerHasBerries: @ 8293FEE
+	msgbox BerryBlender_Text_MakePokeblocksUsingBerryBlender, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_ExpertMNoBerries: @ 8293FF8
+BerryBlender_EventScript_ExpertMNoBerries: @ 8293FF8
 	checkitem ITEM_POKEBLOCK_CASE, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_ExpertMNoSpareBerries
+	goto_if_eq BerryBlender_EventScript_ExpertMNoSpareBerries
 	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
 	compare VAR_RESULT, 65535
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_ExpertMNoSpareBerries
+	goto_if_eq BerryBlender_EventScript_ExpertMNoSpareBerries
 	dotimebasedevents
-	goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, LilycoveCity_ContestLobby_EventScript_ExpertMNoSpareBerries
-	goto LilycoveCity_ContestLobby_EventScript_ExpertMGiveBerry
+	goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, BerryBlender_EventScript_ExpertMNoSpareBerries
+	goto BerryBlender_EventScript_ExpertMGiveBerry
 	end
 
-LilycoveCity_ContestLobby_EventScript_ExpertMNoSpareBerries: @ 8294028
-	msgbox LilycoveCity_ContestLobby_Text_DontHaveAnyBerriesNoneToSpare, MSGBOX_DEFAULT
+BerryBlender_EventScript_ExpertMNoSpareBerries: @ 8294028
+	msgbox BerryBlender_Text_DontHaveAnyBerriesNoneToSpare, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_ExpertMGiveBerry: @ 8294032
-	msgbox LilycoveCity_ContestLobby_Text_DontHaveAnyBerriesHaveOne, MSGBOX_DEFAULT
+BerryBlender_EventScript_ExpertMGiveBerry: @ 8294032
+	msgbox BerryBlender_Text_DontHaveAnyBerriesHaveOne, MSGBOX_DEFAULT
 	giveitem_std ITEM_PECHA_BERRY
 	setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY
-	msgbox LilycoveCity_ContestLobby_Text_UseItToMakePokeblocksTogether, MSGBOX_DEFAULT
+	msgbox BerryBlender_Text_UseItToMakePokeblocksTogether, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_Movement_BlendLeaderWalkInPlace: @ 8294053
+BerryBlender_Movement_BlendLeaderWalkInPlace: @ 8294053
 	walk_in_place_fastest_right
 	step_end
 
-LilycoveCity_ContestLobby_EventScript_BerryBlenderLink:: @ 8294055
+BerryBlender_EventScript_BerryBlenderLink:: @ 8294055
 	lockall
 	specialvar VAR_RESULT, PlayerHasBerries
 	compare VAR_RESULT, FALSE
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkBlenderNoBerries
+	goto_if_eq BerryBlender_EventScript_LinkBlenderNoBerries
 	checkitem ITEM_POKEBLOCK_CASE, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkBlenderNoCase
+	goto_if_eq BerryBlender_EventScript_LinkBlenderNoCase
 	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
 	compare VAR_RESULT, 65535
-	goto_if_ne LilycoveCity_ContestLobby_EventScript_LinkBlenderSaveGame
+	goto_if_ne BerryBlender_EventScript_LinkBlenderSaveGame
 	compare VAR_RESULT, 65535
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkBlenderCaseFull
+	goto_if_eq BerryBlender_EventScript_LinkBlenderCaseFull
 	end
 
-LilycoveCity_ContestLobby_EventScript_LinkBlenderSaveGame: @ 8294092
-	msgbox LilycoveCity_ContestLobby_Text_SaveGameBeforeBerryBlenderLink, MSGBOX_YESNO
+BerryBlender_EventScript_LinkBlenderSaveGame: @ 8294092
+	msgbox BerryBlender_Text_SaveGameBeforeBerryBlenderLink, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_TryDoLinkBlender
+	goto_if_eq BerryBlender_EventScript_TryDoLinkBlender
 	compare VAR_RESULT, NO
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkBlender
+	goto_if_eq BerryBlender_EventScript_CancelLinkBlender
 	end
 
-LilycoveCity_ContestLobby_EventScript_LinkBlenderNoBerries: @ 82940B1
-	msgbox LilycoveCity_ContestLobby_Text_NoBerriesLink, MSGBOX_DEFAULT
+BerryBlender_EventScript_LinkBlenderNoBerries: @ 82940B1
+	msgbox BerryBlender_Text_NoBerriesLink, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_TryDoLinkBlender: @ 82940BB
+BerryBlender_EventScript_TryDoLinkBlender: @ 82940BB
 	call Common_EventScript_SaveGame
 	compare VAR_RESULT, FALSE
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkBlender
+	goto_if_eq BerryBlender_EventScript_CancelLinkBlender
 	specialvar VAR_RESULT, IsWirelessAdapterConnected
 	compare VAR_RESULT, TRUE
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_StartDecideLinkLeader
-	message LilycoveCity_ContestLobby_Text_SearchingForFriends
+	goto_if_eq BerryBlender_EventScript_StartDecideLinkLeader
+	message BerryBlender_Text_SearchingForFriends
 	waitmessage
 	special TryBerryBlenderLinkup
 	waitstate
 	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_SpawnLinkPartners
+	goto_if_eq BerryBlender_EventScript_SpawnLinkPartners
 	compare VAR_RESULT, 2
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_CloseLinkNotReady
+	goto_if_eq BerryBlender_EventScript_CloseLinkNotReady
 	compare VAR_RESULT, 3
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_CloseLinkDifferentSelections
+	goto_if_eq BerryBlender_EventScript_CloseLinkDifferentSelections
 	compare VAR_RESULT, 5
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_CloseLink
+	goto_if_eq BerryBlender_EventScript_CloseLink
 	compare VAR_RESULT, 6
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkError
+	goto_if_eq BerryBlender_EventScript_LinkError
 	end
 
-LilycoveCity_ContestLobby_EventScript_TwoPlayerLink: @ 829411D
-	msgbox LilycoveCity_ContestLobby_Text_Player1Arrived, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_DoLinkBerryBlending
+BerryBlender_EventScript_TwoPlayerLink: @ 829411D
+	msgbox BerryBlender_Text_Player1Arrived, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_DoLinkBerryBlending
 	end
 
-LilycoveCity_ContestLobby_EventScript_ThreePlayerLink: @ 829412B
-	msgbox LilycoveCity_ContestLobby_Text_Player1And2Arrived, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_DoLinkBerryBlending
+BerryBlender_EventScript_ThreePlayerLink: @ 829412B
+	msgbox BerryBlender_Text_Player1And2Arrived, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_DoLinkBerryBlending
 	end
 
-LilycoveCity_ContestLobby_EventScript_FourPlayerLink: @ 8294139
-	msgbox LilycoveCity_ContestLobby_Text_AllPlayersArrived, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_DoLinkBerryBlending
+BerryBlender_EventScript_FourPlayerLink: @ 8294139
+	msgbox BerryBlender_Text_AllPlayersArrived, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_DoLinkBerryBlending
 	end
 
-LilycoveCity_ContestLobby_EventScript_DoLinkBerryBlending: @ 8294147
+BerryBlender_EventScript_DoLinkBerryBlending: @ 8294147
 	setvar VAR_0x8004, 0
 	fadescreen 1
 	removeobject 240
@@ -639,109 +639,109 @@ LilycoveCity_ContestLobby_EventScript_DoLinkBerryBlending: @ 8294147
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_CancelLinkBlender: @ 8294160
+BerryBlender_EventScript_CancelLinkBlender: @ 8294160
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_LinkBlenderCaseFull: @ 8294162
-	msgbox LilycoveCity_ContestLobby_Text_PokeblockCaseIsFullLink, MSGBOX_DEFAULT
+BerryBlender_EventScript_LinkBlenderCaseFull: @ 8294162
+	msgbox BerryBlender_Text_PokeblockCaseIsFullLink, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_LinkBlenderNoCase: @ 829416C
-	msgbox LilycoveCity_ContestLobby_Text_DontHavePokeblockCaseLink, MSGBOX_DEFAULT
+BerryBlender_EventScript_LinkBlenderNoCase: @ 829416C
+	msgbox BerryBlender_Text_DontHavePokeblockCaseLink, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_CloseLinkNotReady: @ 8294176
+BerryBlender_EventScript_CloseLinkNotReady: @ 8294176
 	special CloseLink
 	msgbox Text_SomeoneIsNotReadyToLink, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_CloseLinkDifferentSelections: @ 8294183
+BerryBlender_EventScript_CloseLinkDifferentSelections: @ 8294183
 	special CloseLink
 	msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_CloseLink: @ 8294190
+BerryBlender_EventScript_CloseLink: @ 8294190
 	special CloseLink
 	msgbox gText_PokeblockLinkCanceled, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_LinkError: @ 829419D
+BerryBlender_EventScript_LinkError: @ 829419D
 	special CloseLink
 	msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_SpawnLinkPartners: @ 82941AA
+BerryBlender_EventScript_SpawnLinkPartners: @ 82941AA
 	fadescreen 1
 	specialvar VAR_RESULT, GetLinkPartnerNames
 	copyvar VAR_0x8008, VAR_RESULT
 	copyvar VAR_0x8004, VAR_0x8008
 	special SpawnLinkPartnerEventObject
-	goto LilycoveCity_ContestLobby_EventScript_LinkPlayersArrived
+	goto BerryBlender_EventScript_LinkPlayersArrived
 	end
 
-LilycoveCity_ContestLobby_EventScript_LinkPlayersArrived: @ 82941C4
+BerryBlender_EventScript_LinkPlayersArrived: @ 82941C4
 	fadescreen 0
 	switch VAR_0x8008
-	case 2, LilycoveCity_ContestLobby_EventScript_TwoPlayerLink
-	case 3, LilycoveCity_ContestLobby_EventScript_ThreePlayerLink
-	case 4, LilycoveCity_ContestLobby_EventScript_FourPlayerLink
+	case 2, BerryBlender_EventScript_TwoPlayerLink
+	case 3, BerryBlender_EventScript_ThreePlayerLink
+	case 4, BerryBlender_EventScript_FourPlayerLink
 	end
 
-LilycoveCity_ContestLobby_EventScript_StartDecideLinkLeader: @ 82941ED
-	setvar VAR_0x8004, 13
-	goto LilycoveCity_ContestLobby_EventScript_DecideLinkLeader
+BerryBlender_EventScript_StartDecideLinkLeader: @ 82941ED
+	setvar VAR_0x8004, LINK_GROUP_BERRY_BLENDER
+	goto BerryBlender_EventScript_DecideLinkLeader
 	end
 
-LilycoveCity_ContestLobby_EventScript_DecideLinkLeader: @ 82941F8
-	message Text_DecideLinkLeader
+BerryBlender_EventScript_DecideLinkLeader: @ 82941F8
+	message LilycoveCity_ContestLobby_Text_PleaseDecideLinkLeader
 	waitmessage
 	multichoice 16, 6, MULTI_LINK_LEADER, 0
 	switch VAR_RESULT
-	case 0, LilycoveCity_ContestLobby_EventScript_TryJoinGroup
-	case 1, LilycoveCity_ContestLobby_EventScript_TryLeadGroup
-	case 2, LilycoveCity_ContestLobby_EventScript_CloseLink
-	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CloseLink
+	case 0, BerryBlender_EventScript_TryJoinGroup
+	case 1, BerryBlender_EventScript_TryLeadGroup
+	case 2, BerryBlender_EventScript_CloseLink
+	case MULTI_B_PRESSED, BerryBlender_EventScript_CloseLink
 	end
 
-LilycoveCity_ContestLobby_EventScript_TryLeadGroup: @ 8294235
-	call LilycoveCity_ContestLobby_EventScript_TryBecomeLinkLeader
+BerryBlender_EventScript_TryLeadGroup: @ 8294235
+	call BerryBlender_EventScript_TryBecomeLinkLeader
 	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkLeaderDecided
+	goto_if_eq BerryBlender_EventScript_LinkLeaderDecided
 	compare VAR_RESULT, 5
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_DecideLinkLeader
+	goto_if_eq BerryBlender_EventScript_DecideLinkLeader
 	compare VAR_RESULT, 8
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_TryLeadGroup
+	goto_if_eq BerryBlender_EventScript_TryLeadGroup
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_TryJoinGroup: @ 829425D
-	call LilycoveCity_ContestLobby_EventScript_TryJoinLinkGroup
+BerryBlender_EventScript_TryJoinGroup: @ 829425D
+	call BerryBlender_EventScript_TryJoinLinkGroup
 	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkLeaderDecided
+	goto_if_eq BerryBlender_EventScript_LinkLeaderDecided
 	compare VAR_RESULT, 5
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_DecideLinkLeader
+	goto_if_eq BerryBlender_EventScript_DecideLinkLeader
 	compare VAR_RESULT, 8
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_TryJoinGroup
+	goto_if_eq BerryBlender_EventScript_TryJoinGroup
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_TryBecomeLinkLeader: @ 8294285
+BerryBlender_EventScript_TryBecomeLinkLeader: @ 8294285
 	special TryBecomeLinkLeader
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_TryJoinLinkGroup: @ 829428A
+BerryBlender_EventScript_TryJoinLinkGroup: @ 829428A
 	special TryJoinLinkGroup
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_LinkLeaderDecided: @ 829428F
-	goto LilycoveCity_ContestLobby_EventScript_SpawnLinkPartners
+BerryBlender_EventScript_LinkLeaderDecided: @ 829428F
+	goto BerryBlender_EventScript_SpawnLinkPartners
 	end
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 9d3bccaf9..1b2e3f60f 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -1085,7 +1085,7 @@ CableClub_EventScript_WirelessTrade:: @ 827780D
 	call CableClub_EventScript_CheckPartyTradeRequirements
 	compare VAR_RESULT, 0
 	goto_if_eq CableClub_EventScript_AbortLink
-	setvar VAR_0x8004, 3
+	setvar VAR_0x8004, LINK_GROUP_TRADE
 	goto CableClub_EventScript_SaveAndChooseLinkLeader
 	end
 
@@ -1103,7 +1103,7 @@ CableClub_EventScript_WirelessBattleSelect:: @ 827783B
 	end
 
 CableClub_EventScript_WirelessSingleBattle:: @ 827788E
-	setvar VAR_0x8004, 0
+	setvar VAR_0x8004, LINK_GROUP_SINGLE_BATTLE
 	goto CableClub_EventScript_SaveAndChooseLinkLeader
 	end
 
@@ -1111,7 +1111,7 @@ CableClub_EventScript_WirelessDoubleBattle:: @ 8277899
 	special HasEnoughMonsForDoubleBattle
 	compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
 	goto_if_ne CableClub_EventScript_TwoMonsNeededForWirelessDoubleBattle
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, LINK_GROUP_DOUBLE_BATTLE
 	goto CableClub_EventScript_SaveAndChooseLinkLeader
 	end
 
@@ -1121,7 +1121,7 @@ CableClub_EventScript_TwoMonsNeededForWirelessDoubleBattle:: @ 82778B2
 	end
 
 CableClub_EventScript_WirelessMultiBattle:: @ 82778C0
-	setvar VAR_0x8004, 2
+	setvar VAR_0x8004, LINK_GROUP_MULTI_BATTLE
 	goto CableClub_EventScript_SaveAndChooseLinkLeader
 	end
 
@@ -1134,7 +1134,7 @@ CableClub_EventScript_WirelessRecordMix:: @ 82778D9
 	msgbox CableClub_Text_AccessRecordCorner, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq CableClub_EventScript_AbortLink
-	setvar VAR_0x8004, 12
+	setvar VAR_0x8004, LINK_GROUP_RECORD_CORNER
 	goto CableClub_EventScript_SaveAndChooseLinkLeader
 	end
 
@@ -1145,7 +1145,7 @@ CableClub_EventScript_WirelessBerryCrush:: @ 82778F7
 	special HasAtLeastOneBerry
 	compare VAR_RESULT, FALSE
 	goto_if_eq CableClub_EventScript_NeedBerryForBerryCrush
-	setvar VAR_0x8004, 5
+	setvar VAR_0x8004, LINK_GROUP_BERRY_CRUSH
 	goto CableClub_EventScript_SaveAndChooseLinkLeader
 	end
 
@@ -1159,12 +1159,12 @@ CableClub_EventScript_SaveAndChooseLinkLeader:: @ 8277931
 	compare VAR_RESULT, 0
 	goto_if_eq CableClub_EventScript_AbortLink
 	switch VAR_0x8004
-	case 3, CableClub_EventScript_ChooseLinkLeaderFrom2
-	case 0, CableClub_EventScript_ChooseLinkLeaderFrom2
-	case 1, CableClub_EventScript_ChooseLinkLeaderFrom2
-	case 2, CableClub_EventScript_ChooseLinkLeaderFrom4
-	case 5, CableClub_EventScript_ChooseLinkLeader
-	case 12, CableClub_EventScript_ChooseLinkLeader
+	case LINK_GROUP_TRADE, CableClub_EventScript_ChooseLinkLeaderFrom2
+	case LINK_GROUP_SINGLE_BATTLE, CableClub_EventScript_ChooseLinkLeaderFrom2
+	case LINK_GROUP_DOUBLE_BATTLE, CableClub_EventScript_ChooseLinkLeaderFrom2
+	case LINK_GROUP_MULTI_BATTLE, CableClub_EventScript_ChooseLinkLeaderFrom4
+	case LINK_GROUP_BERRY_CRUSH, CableClub_EventScript_ChooseLinkLeader
+	case LINK_GROUP_RECORD_CORNER, CableClub_EventScript_ChooseLinkLeader
 	end
 
 CableClub_EventScript_ChooseLinkLeaderFrom2:: @ 8277989
@@ -1416,7 +1416,7 @@ MossdeepCity_GameCorner_1F_EventScript_PlayPokemonJump:: @ 8277CE9
 	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq MossdeepCity_GameCorner_1F_EventScript_AbortMinigame
-	setvar VAR_0x8004, 4
+	setvar VAR_0x8004, LINK_GROUP_POKEMON_JUMP
 	goto MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader
 	end
 
@@ -1435,7 +1435,7 @@ MossdeepCity_GameCorner_1F_EventScript_PlayDodrioBerryPicking:: @ 8277D35
 	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq MossdeepCity_GameCorner_1F_EventScript_AbortMinigame
-	setvar VAR_0x8004, 6
+	setvar VAR_0x8004, LINK_GROUP_BERRY_PICKING
 	goto MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader
 	end
 
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index 58cd1ec5d..cabf923b6 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -1,498 +1,509 @@
-LilycoveCity_ContestLobby_EventScript_279CC5:: @ 8279CC5
+@ Either ends or returns to EventScript_ContestReceptionist after submitting a contest entry
+LilycoveCity_ContestLobby_EventScript_SpeakToContestReceptionist:: @ 8279CC5
 	lock
 	faceplayer
 	compare VAR_CONTEST_PRIZE_PICKUP, 0
-	goto_if_ne LilycoveCity_ContestLobby_EventScript_279D13
-	call_if_set FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_279CEA
-	call_if_unset FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_279CF3
-	goto LilycoveCity_ContestLobby_EventScript_279D5A
+	goto_if_ne LilycoveCity_ContestLobby_EventScript_PickUpPrize
+	call_if_set FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_ReceptionWelcome
+	call_if_unset FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_GivePokeblockCase
+	goto LilycoveCity_ContestLobby_EventScript_AskEnterContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_279CEA:: @ 8279CEA
-	msgbox LilycoveCity_ContestLobby_Text_ContestReceptionCounter, MSGBOX_DEFAULT
+LilycoveCity_ContestLobby_EventScript_ReceptionWelcome:: @ 8279CEA
+	msgbox LilycoveCity_ContestLobby_Text_ContestReception, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_ContestLobby_EventScript_279CF3:: @ 8279CF3
-	msgbox LilycoveCity_ContestLobby_Text_27ADA7, MSGBOX_DEFAULT
+LilycoveCity_ContestLobby_EventScript_GivePokeblockCase:: @ 8279CF3
+	msgbox LilycoveCity_ContestLobby_Text_ReceptionDontHavePokeblockCase, MSGBOX_DEFAULT
 	giveitem_std ITEM_POKEBLOCK_CASE
 	setflag FLAG_RECEIVED_POKEBLOCK_CASE
-	msgbox LilycoveCity_ContestLobby_Text_27AE47, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_NowThatWeveClearedThatUp, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_ContestLobby_EventScript_279D13:: @ 8279D13
-	msgbox LilycoveCity_ContestLobby_Text_27B67B, MSGBOX_DEFAULT
+LilycoveCity_ContestLobby_EventScript_PickUpPrize:: @ 8279D13
+	msgbox LilycoveCity_ContestLobby_Text_PokemonWonWeHavePrize, MSGBOX_DEFAULT
 	switch VAR_CONTEST_PRIZE_PICKUP
-	case 4, LilycoveCity_ContestLobby_EventScript_279D2C
+	case 4, LilycoveCity_ContestLobby_EventScript_GiveLuxuryBallAtCounter
 	end
 
-LilycoveCity_ContestLobby_EventScript_279D2C:: @ 8279D2C
+LilycoveCity_ContestLobby_EventScript_GiveLuxuryBallAtCounter:: @ 8279D2C
 	giveitem_std ITEM_LUXURY_BALL
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_279D4B
+	compare VAR_RESULT, FALSE
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_NoRoomForLuxuryBallAtCounter
 	setvar VAR_CONTEST_PRIZE_PICKUP, 0
 	closemessage
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_279D4B:: @ 8279D4B
+LilycoveCity_ContestLobby_EventScript_NoRoomForLuxuryBallAtCounter:: @ 8279D4B
 	call Common_EventScript_BagIsFull
-	msgbox LilycoveCity_ContestLobby_Text_27B6E7, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_ComeBackForPrizeLater, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_279D5A:: @ 8279D5A
-	message LilycoveCity_ContestLobby_Text_27AF28
+LilycoveCity_ContestLobby_EventScript_AskEnterContest:: @ 8279D5A
+	message LilycoveCity_ContestLobby_Text_EnterContest1
 	waitmessage
 	multichoice 0, 0, MULTI_ENTERINFO, 0
 	switch VAR_RESULT
-	case 0, LilycoveCity_ContestLobby_EventScript_279E62
-	case 1, LilycoveCity_ContestLobby_EventScript_279D97
-	case 2, LilycoveCity_ContestLobby_EventScript_279E09
-	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279E09
+	case 0, LilycoveCity_ContestLobby_EventScript_ChooseContestRank
+	case 1, LilycoveCity_ContestLobby_EventScript_ContestInfo
+	case 2, LilycoveCity_ContestLobby_EventScript_CancelEnterContest
+	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelEnterContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_279D97:: @ 8279D97
-	message LilycoveCity_ContestLobby_Text_27AF5E
+LilycoveCity_ContestLobby_EventScript_ContestInfo:: @ 8279D97
+	message LilycoveCity_ContestLobby_Text_WhichTopic1
 	waitmessage
 	multichoice 0, 0, MULTI_CONTEST_INFO, 0
 	switch VAR_RESULT
-	case 0, LilycoveCity_ContestLobby_EventScript_279DDF
-	case 1, LilycoveCity_ContestLobby_EventScript_279DED
-	case 2, LilycoveCity_ContestLobby_EventScript_279DFB
-	case 3, LilycoveCity_ContestLobby_EventScript_279D5A
-	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279D5A
+	case 0, LilycoveCity_ContestLobby_EventScript_ExplainContests
+	case 1, LilycoveCity_ContestLobby_EventScript_ExplainContestTypes
+	case 2, LilycoveCity_ContestLobby_EventScript_ExplainContestRanks
+	case 3, LilycoveCity_ContestLobby_EventScript_AskEnterContest
+	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_AskEnterContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_279DDF:: @ 8279DDF
-	msgbox LilycoveCity_ContestLobby_Text_27AF7A, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_279D97
+LilycoveCity_ContestLobby_EventScript_ExplainContests:: @ 8279DDF
+	msgbox LilycoveCity_ContestLobby_Text_ExplainContests, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_ContestInfo
 	end
 
-LilycoveCity_ContestLobby_EventScript_279DED:: @ 8279DED
-	msgbox LilycoveCity_ContestLobby_Text_27B17D, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_279D97
+LilycoveCity_ContestLobby_EventScript_ExplainContestTypes:: @ 8279DED
+	msgbox LilycoveCity_ContestLobby_Text_ExplainContestTypes, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_ContestInfo
 	end
 
-LilycoveCity_ContestLobby_EventScript_279DFB:: @ 8279DFB
-	msgbox LilycoveCity_ContestLobby_Text_27B221, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_279D97
+LilycoveCity_ContestLobby_EventScript_ExplainContestRanks:: @ 8279DFB
+	msgbox LilycoveCity_ContestLobby_Text_ExplainContestRanks, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_ContestInfo
 	end
 
-LilycoveCity_ContestLobby_EventScript_279E09:: @ 8279E09
-	msgbox LilycoveCity_ContestLobby_Text_27BD4F, MSGBOX_DEFAULT
+LilycoveCity_ContestLobby_EventScript_CancelEnterContest:: @ 8279E09
+	msgbox LilycoveCity_ContestLobby_Text_ParticipateAnotherTime, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_279E13:: @ 8279E13
-	msgbox LilycoveCity_ContestLobby_Text_27B44A, MSGBOX_DEFAULT
+LilycoveCity_ContestLobby_EventScript_ChooseContestMon:: @ 8279E13
+	msgbox LilycoveCity_ContestLobby_Text_EnterWhichPokemon1, MSGBOX_DEFAULT
 	choosecontestmon
 	compare VAR_0x8004, 255
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_279E09
-	special sub_80F7F30
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_279F12
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_279F87
-	compare VAR_RESULT, 2
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_279F45
-	compare VAR_RESULT, 3
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_279F69
-	compare VAR_RESULT, 4
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_279F78
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelEnterContest
+	special TryEnterContestMon
+	compare VAR_RESULT, CANT_ENTER_CONTEST
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_CantEnterLowRank
+	compare VAR_RESULT, CAN_ENTER_CONTEST_EQUAL_RANK
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_EnterMon
+	compare VAR_RESULT, CAN_ENTER_CONTEST_HIGH_RANK
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_ConfirmEntryAlreadyWon
+	compare VAR_RESULT, CANT_ENTER_CONTEST_EGG
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_CantEnterEgg
+	compare VAR_RESULT, CANT_ENTER_CONTEST_FAINTED
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_CantEnterFainted
 	end
 
-LilycoveCity_ContestLobby_EventScript_279E62:: @ 8279E62
-	message LilycoveCity_ContestLobby_Text_27B3FF
+LilycoveCity_ContestLobby_EventScript_ChooseContestRank:: @ 8279E62
+	message LilycoveCity_ContestLobby_Text_EnterWhichRank
 	waitmessage
 	multichoice 0, 0, MULTI_CONTEST_RANK, 0
 	switch VAR_RESULT
-	case 0, LilycoveCity_ContestLobby_EventScript_279EB5
-	case 1, LilycoveCity_ContestLobby_EventScript_279EC0
-	case 2, LilycoveCity_ContestLobby_EventScript_279ECB
-	case 3, LilycoveCity_ContestLobby_EventScript_279ED6
-	case 4, LilycoveCity_ContestLobby_EventScript_279E09
-	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279E09
+	case 0, LilycoveCity_ContestLobby_EventScript_EnterNormalRank
+	case 1, LilycoveCity_ContestLobby_EventScript_EnterSuperRank
+	case 2, LilycoveCity_ContestLobby_EventScript_EnterHyperRank
+	case 3, LilycoveCity_ContestLobby_EventScript_EnterMasterRank
+	case 4, LilycoveCity_ContestLobby_EventScript_CancelEnterContest
+	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelEnterContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_279EB5:: @ 8279EB5
-	setvar VAR_CONTEST_RANK, 0
-	goto LilycoveCity_ContestLobby_EventScript_279EE1
+LilycoveCity_ContestLobby_EventScript_EnterNormalRank:: @ 8279EB5
+	setvar VAR_CONTEST_RANK, CONTEST_RANK_NORMAL
+	goto LilycoveCity_ContestLobby_EventScript_ChooseContestType
 	end
 
-LilycoveCity_ContestLobby_EventScript_279EC0:: @ 8279EC0
-	setvar VAR_CONTEST_RANK, 1
-	goto LilycoveCity_ContestLobby_EventScript_279EE1
+LilycoveCity_ContestLobby_EventScript_EnterSuperRank:: @ 8279EC0
+	setvar VAR_CONTEST_RANK, CONTEST_RANK_SUPER
+	goto LilycoveCity_ContestLobby_EventScript_ChooseContestType
 	end
 
-LilycoveCity_ContestLobby_EventScript_279ECB:: @ 8279ECB
-	setvar VAR_CONTEST_RANK, 2
-	goto LilycoveCity_ContestLobby_EventScript_279EE1
+LilycoveCity_ContestLobby_EventScript_EnterHyperRank:: @ 8279ECB
+	setvar VAR_CONTEST_RANK, CONTEST_RANK_HYPER
+	goto LilycoveCity_ContestLobby_EventScript_ChooseContestType
 	end
 
-LilycoveCity_ContestLobby_EventScript_279ED6:: @ 8279ED6
-	setvar VAR_CONTEST_RANK, 3
-	goto LilycoveCity_ContestLobby_EventScript_279EE1
+LilycoveCity_ContestLobby_EventScript_EnterMasterRank:: @ 8279ED6
+	setvar VAR_CONTEST_RANK, CONTEST_RANK_MASTER
+	goto LilycoveCity_ContestLobby_EventScript_ChooseContestType
 	end
 
-LilycoveCity_ContestLobby_EventScript_279EE1:: @ 8279EE1
-	message LilycoveCity_ContestLobby_Text_27B423
+@ The multichoice selection IDs are equal to the CATEGORY values
+@ So rather than list the cases they just copy VAR_RESULT for a valid selection into VAR_CONTEST_CATEGORY
+LilycoveCity_ContestLobby_EventScript_ChooseContestType:: @ 8279EE1
+	message LilycoveCity_ContestLobby_Text_EnterWhichContest1
 	waitmessage
 	multichoice 0, 0, MULTI_CONTEST_TYPE, 0
 	switch VAR_RESULT
-	case 5, LilycoveCity_ContestLobby_EventScript_279E09
-	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_279E09
+	case 5, LilycoveCity_ContestLobby_EventScript_CancelEnterContest
+	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelEnterContest
 	copyvar VAR_CONTEST_CATEGORY, VAR_RESULT
-	goto LilycoveCity_ContestLobby_EventScript_279E13
+	goto LilycoveCity_ContestLobby_EventScript_ChooseContestMon
 	end
 
-LilycoveCity_ContestLobby_EventScript_279F12:: @ 8279F12
-	msgbox LilycoveCity_ContestLobby_Text_27B471, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_279E13
+LilycoveCity_ContestLobby_EventScript_CantEnterLowRank:: @ 8279F12
+	msgbox LilycoveCity_ContestLobby_Text_MonNotQualifiedForRank, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_ChooseContestMon
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_279F21:: @ 8279F21
-	msgbox LilycoveCity_ContestLobby_Text_27B5C4, MSGBOX_YESNO
+@ Unused
+LilycoveCity_ContestLobby_EventScript_ConfirmEntry:: @ 8279F21
+	msgbox LilycoveCity_ContestLobby_Text_ConfirmContestMon, MSGBOX_YESNO
 	switch VAR_RESULT
-	case NO, LilycoveCity_ContestLobby_EventScript_279E13
-	case YES, LilycoveCity_ContestLobby_EventScript_279F87
+	case NO, LilycoveCity_ContestLobby_EventScript_ChooseContestMon
+	case YES, LilycoveCity_ContestLobby_EventScript_EnterMon
 	end
 
-LilycoveCity_ContestLobby_EventScript_279F45:: @ 8279F45
-	msgbox LilycoveCity_ContestLobby_Text_27B547, MSGBOX_YESNO
+LilycoveCity_ContestLobby_EventScript_ConfirmEntryAlreadyWon:: @ 8279F45
+	msgbox LilycoveCity_ContestLobby_Text_AlreadyWonEnterAnyway, MSGBOX_YESNO
 	switch VAR_RESULT
-	case NO, LilycoveCity_ContestLobby_EventScript_279E13
-	case YES, LilycoveCity_ContestLobby_EventScript_279F87
+	case NO, LilycoveCity_ContestLobby_EventScript_ChooseContestMon
+	case YES, LilycoveCity_ContestLobby_EventScript_EnterMon
 	end
 
-LilycoveCity_ContestLobby_EventScript_279F69:: @ 8279F69
-	msgbox LilycoveCity_ContestLobby_Text_27B4C4, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_279E13
+LilycoveCity_ContestLobby_EventScript_CantEnterEgg:: @ 8279F69
+	msgbox LilycoveCity_ContestLobby_Text_EggCannotTakePart, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_ChooseContestMon
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_279F78:: @ 8279F78
-	msgbox LilycoveCity_ContestLobby_Text_27B501, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_279E13
+LilycoveCity_ContestLobby_EventScript_CantEnterFainted:: @ 8279F78
+	msgbox LilycoveCity_ContestLobby_Text_MonInNoConditionForContest, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_ChooseContestMon
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_279F87:: @ 8279F87
-	msgbox LilycoveCity_ContestLobby_Text_27B5E2, MSGBOX_DEFAULT
+@ The return here is back to LilycoveCity_ContestLobby_EventScript_ContestReceptionist
+LilycoveCity_ContestLobby_EventScript_EnterMon:: @ 8279F87
+	msgbox LilycoveCity_ContestLobby_Text_YourMonIsEntryNum4, MSGBOX_DEFAULT
 	closemessage
 	releaseall
-	setvar VAR_LINK_CONTEST_ROOM_STATE, 1
+	setvar VAR_CONTEST_HALL_STATE, 1
 	return
 
-LinkContestRoom1_EventScript_279F97:: @ 8279F97
-	special sub_80F90DC
+ContestHall_EventScript_DoContest:: @ 8279F97
+	special LinkContestTryShowWirelessIndicator
 	setvar VAR_0x8006, 0
 	lockall
-	applymovement 14, LinkContestRoom1_Movement_27AD43
+	applymovement 14, ContestHall_Movement_Player4FaceUp
 	waitmovement 0
-	applymovement 1, LinkContestRoom1_Movement_27AD09
+	applymovement 1, ContestHall_Movement_MCWalkDown
 	waitmovement 0
 	releaseall
-	call LinkContestRoom1_EventScript_27A133
-	call LinkContestRoom1_EventScript_279FF2
-	call LinkContestRoom1_EventScript_27A03C
-	call LinkContestRoom1_EventScript_27A097
-	call LinkContestRoom1_EventScript_27A0F5
-	call LinkContestRoom1_EventScript_27A801
-	call LinkContestRoom1_EventScript_27A8A5
-	call LinkContestRoom1_EventScript_27A987
-	call LinkContestRoom1_EventScript_27A9D4
-	call LinkContestRoom1_EventScript_27AA1B
-	call LinkContestRoom1_EventScript_27AB36
-	setvar VAR_LINK_CONTEST_ROOM_STATE, 2
-	return
-
-LinkContestRoom1_EventScript_279FF2:: @ 8279FF2
+	call ContestHall_EventScript_TryWaitForLink
+	call ContestHall_EventScript_GetContestRankStringId
+	call ContestHall_EventScript_GetContestCategory
+	call ContestHall_EventScript_ContestGettingStarted
+	call ContestHall_EventScript_ShowContestMons
+	call ContestHall_EventScript_DoContestAppeals
+	call ContestHall_EventScript_ContestResults
+	call ContestHall_EventScript_GetWinnerObjEventId
+	call ContestHall_EventScript_CongratulateWinner
+	call ContestHall_EventScript_AudienceLookAround
+	call ContestHall_EventScript_GiveWinnerPrize
+	setvar VAR_CONTEST_HALL_STATE, 2
+	return
+
+ContestHall_EventScript_GetContestRankStringId:: @ 8279FF2
 	switch VAR_CONTEST_RANK
-	case 0, LinkContestRoom1_EventScript_27A024
-	case 1, LinkContestRoom1_EventScript_27A02A
-	case 2, LinkContestRoom1_EventScript_27A030
-	case 3, LinkContestRoom1_EventScript_27A036
+	case CONTEST_RANK_NORMAL, ContestHall_EventScript_GetNormalStringId
+	case CONTEST_RANK_SUPER, ContestHall_EventScript_GetSuperStringId
+	case CONTEST_RANK_HYPER, ContestHall_EventScript_GetHyperStringId
+	case CONTEST_RANK_MASTER, ContestHall_EventScript_GetMasterStringId
 	return
 
-LinkContestRoom1_EventScript_27A024:: @ 827A024
+ContestHall_EventScript_GetNormalStringId:: @ 827A024
 	setvar VAR_0x8009, STDSTRING_NORMAL
 	return
 
-LinkContestRoom1_EventScript_27A02A:: @ 827A02A
+ContestHall_EventScript_GetSuperStringId:: @ 827A02A
 	setvar VAR_0x8009, STDSTRING_SUPER
 	return
 
-LinkContestRoom1_EventScript_27A030:: @ 827A030
+ContestHall_EventScript_GetHyperStringId:: @ 827A030
 	setvar VAR_0x8009, STDSTRING_HYPER
 	return
 
-LinkContestRoom1_EventScript_27A036:: @ 827A036
+ContestHall_EventScript_GetMasterStringId:: @ 827A036
 	setvar VAR_0x8009, STDSTRING_MASTER
 	return
 
-LinkContestRoom1_EventScript_27A03C:: @ 827A03C
+@ This whole switch is equivalent to copyvar VAR_0x8008, VAR_CONTEST_CATEGORY
+ContestHall_EventScript_GetContestCategory:: @ 827A03C
 	switch VAR_CONTEST_CATEGORY
-	case 0, LinkContestRoom1_EventScript_27A079
-	case 1, LinkContestRoom1_EventScript_27A07F
-	case 2, LinkContestRoom1_EventScript_27A085
-	case 3, LinkContestRoom1_EventScript_27A08B
-	case 4, LinkContestRoom1_EventScript_27A091
+	case CONTEST_CATEGORY_COOL, ContestHall_EventScript_GetCategoryCool
+	case CONTEST_CATEGORY_BEAUTY, ContestHall_EventScript_GetCategoryBeauty
+	case CONTEST_CATEGORY_CUTE, ContestHall_EventScript_GetCategoryCute
+	case CONTEST_CATEGORY_SMART, ContestHall_EventScript_GetCategorySmart
+	case CONTEST_CATEGORY_TOUGH, ContestHall_EventScript_GetCategoryTough
 	return
 
-LinkContestRoom1_EventScript_27A079:: @ 827A079
+ContestHall_EventScript_GetCategoryCool:: @ 827A079
 	setvar VAR_0x8008, CONTEST_CATEGORY_COOL
 	return
 
-LinkContestRoom1_EventScript_27A07F:: @ 827A07F
+ContestHall_EventScript_GetCategoryBeauty:: @ 827A07F
 	setvar VAR_0x8008, CONTEST_CATEGORY_BEAUTY
 	return
 
-LinkContestRoom1_EventScript_27A085:: @ 827A085
+ContestHall_EventScript_GetCategoryCute:: @ 827A085
 	setvar VAR_0x8008, CONTEST_CATEGORY_CUTE
 	return
 
-LinkContestRoom1_EventScript_27A08B:: @ 827A08B
+ContestHall_EventScript_GetCategorySmart:: @ 827A08B
 	setvar VAR_0x8008, CONTEST_CATEGORY_SMART
 	return
 
-LinkContestRoom1_EventScript_27A091:: @ 827A091
+ContestHall_EventScript_GetCategoryTough:: @ 827A091
 	setvar VAR_0x8008, CONTEST_CATEGORY_TOUGH
 	return
 
-LinkContestRoom1_EventScript_27A097:: @ 827A097
+ContestHall_EventScript_ContestGettingStarted:: @ 827A097
 	buffercontesttypestring 1, VAR_0x8008
 	bufferstdstring 2, VAR_0x8009
-	call LinkContestRoom1_EventScript_27A0B1
+	call ContestHall_EventScript_GettingStarted
 	lockall
-	applymovement 1, LinkContestRoom1_Movement_27AD0B
+	applymovement 1, ContestHall_Movement_MCBackUp
 	waitmovement 0
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27A0B1:: @ 827A0B1
-	compare VAR_CONTEST_LOCATION, 5
-	goto_if_eq LinkContestRoom1_EventScript_27A0C7
+ContestHall_EventScript_GettingStarted:: @ 827A0B1
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
+	goto_if_eq ContestHall_EventScript_GettingStartedLink
 	lockall
-	msgbox LinkContestRoom1_Text_27B711, MSGBOX_DEFAULT
+	msgbox ContestHall_Text_GettingStartedParticipantsAsFollows, MSGBOX_DEFAULT
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27A0C7:: @ 827A0C7
-	specialvar VAR_RESULT, sub_80F9160
-	compare VAR_RESULT, 1
-	goto_if_eq LinkContestRoom1_EventScript_27A0DE
-	messageautoscroll LinkContestRoom1_Text_27B78F
+ContestHall_EventScript_GettingStartedLink:: @ 827A0C7
+	specialvar VAR_RESULT, IsWirelessContest
+	compare VAR_RESULT, TRUE
+	goto_if_eq ContestHall_EventScript_GettingStartedWireless
+	messageautoscroll ContestHall_Text_GettingStartedParticipantsAsFollowsLink
 	waitmessage
 	return
 
-LinkContestRoom1_EventScript_27A0DE:: @ 827A0DE
-	messageautoscroll LinkContestRoom1_Text_27C929
+ContestHall_EventScript_GettingStartedWireless:: @ 827A0DE
+	messageautoscroll ContestHall_Text_GettingStartedWireless
 	waitmessage
-	call LinkContestRoom1_EventScript_27A133
-	messageautoscroll LinkContestRoom1_Text_27C972
+	call ContestHall_EventScript_TryWaitForLink
+	messageautoscroll ContestHall_Text_ParticipantsAsFollows
 	waitmessage
-	call LinkContestRoom1_EventScript_27A133
+	call ContestHall_EventScript_TryWaitForLink
 	return
 
-LinkContestRoom1_EventScript_27A0F5:: @ 827A0F5
-	call LinkContestRoom1_EventScript_27A149
-	call LinkContestRoom1_EventScript_27A1D2
-	call LinkContestRoom1_EventScript_27A34F
-	call LinkContestRoom1_EventScript_27A2D5
-	call LinkContestRoom1_EventScript_27A77A
-	call LinkContestRoom1_EventScript_27A133
-	call LinkContestRoom1_EventScript_27A133
+ContestHall_EventScript_ShowContestMons:: @ 827A0F5
+	call ContestHall_EventScript_ContestantWalkToCenter
+	call ContestHall_EventScript_ShowContestMonPic
+	call ContestHall_EventScript_AudienceHeartEmotes
+	call ContestHall_EventScript_AudienceReactToContestant
+	call ContestHall_EventScript_ContestantReturn
+	call ContestHall_EventScript_TryWaitForLink
+	call ContestHall_EventScript_TryWaitForLink
 	addvar VAR_0x8006, 1
-	compare VAR_0x8006, 4
-	goto_if_ne LinkContestRoom1_EventScript_27A0F5
-	call LinkContestRoom1_EventScript_27A230
+	compare VAR_0x8006, CONTESTANT_COUNT
+	goto_if_ne ContestHall_EventScript_ShowContestMons
+	call ContestHall_EventScript_AudienceVote
 	setvar VAR_TEMP_1, 6
 	return
 
-LinkContestRoom1_EventScript_27A133:: @ 827A133
-	specialvar VAR_RESULT, sub_80F9160
-	compare VAR_RESULT, 1
-	goto_if_eq LinkContestRoom1_EventScript_27A144
+ContestHall_EventScript_TryWaitForLink:: @ 827A133
+	specialvar VAR_RESULT, IsWirelessContest
+	compare VAR_RESULT, TRUE
+	goto_if_eq ContestHall_EventScript_WaitForLink
 	return
 
-LinkContestRoom1_EventScript_27A144:: @ 827A144
-	special sub_80F905C
+ContestHall_EventScript_WaitForLink:: @ 827A144
+	special LinkContestWaitForConnection
 	waitstate
 	return
 
-LinkContestRoom1_EventScript_27A149:: @ 827A149
+ContestHall_EventScript_ContestantWalkToCenter:: @ 827A149
 	compare VAR_0x8006, 0
-	goto_if_eq LinkContestRoom1_EventScript_27A176
+	goto_if_eq ContestHall_EventScript_Player1WalkToCenter
 	compare VAR_0x8006, 1
-	goto_if_eq LinkContestRoom1_EventScript_27A18D
+	goto_if_eq ContestHall_EventScript_Player2WalkToCenter
 	compare VAR_0x8006, 2
-	goto_if_eq LinkContestRoom1_EventScript_27A1A4
+	goto_if_eq ContestHall_EventScript_Player3WalkToCenter
 	compare VAR_0x8006, 3
-	goto_if_eq LinkContestRoom1_EventScript_27A1BB
+	goto_if_eq ContestHall_EventScript_Player4WalkToCenter
 	return
 
-LinkContestRoom1_EventScript_27A176:: @ 827A176
-	call LinkContestRoom1_EventScript_27A133
+ContestHall_EventScript_Player1WalkToCenter:: @ 827A176
+	call ContestHall_EventScript_TryWaitForLink
 	lockall
-	applymovement 3, LinkContestRoom1_Movement_27AD52
+	applymovement 3, ContestHall_Movement_Player1WalkToCenter
 	waitmovement 0
 	releaseall
 	setvar VAR_0x800B, 3
 	return
 
-LinkContestRoom1_EventScript_27A18D:: @ 827A18D
-	call LinkContestRoom1_EventScript_27A133
+ContestHall_EventScript_Player2WalkToCenter:: @ 827A18D
+	call ContestHall_EventScript_TryWaitForLink
 	lockall
-	applymovement 4, LinkContestRoom1_Movement_27AD5E
+	applymovement 4, ContestHall_Movement_Player2WalkToCenter
 	waitmovement 0
 	releaseall
 	setvar VAR_0x800B, 4
 	return
 
-LinkContestRoom1_EventScript_27A1A4:: @ 827A1A4
-	call LinkContestRoom1_EventScript_27A133
+ContestHall_EventScript_Player3WalkToCenter:: @ 827A1A4
+	call ContestHall_EventScript_TryWaitForLink
 	lockall
-	applymovement 5, LinkContestRoom1_Movement_27AD66
+	applymovement 5, ContestHall_Movement_Player3WalkToCenter
 	waitmovement 0
 	releaseall
 	setvar VAR_0x800B, 5
 	return
 
-LinkContestRoom1_EventScript_27A1BB:: @ 827A1BB
-	call LinkContestRoom1_EventScript_27A133
+ContestHall_EventScript_Player4WalkToCenter:: @ 827A1BB
+	call ContestHall_EventScript_TryWaitForLink
 	lockall
-	applymovement 14, LinkContestRoom1_Movement_27AD6E
+	applymovement 14, ContestHall_Movement_Player4WalkToCenter
 	waitmovement 0
 	releaseall
 	setvar VAR_0x800B, 14
 	return
 
-LinkContestRoom1_EventScript_27A1D2:: @ 827A1D2
-	special sub_80F8850
+ContestHall_EventScript_ShowContestMonPic:: @ 827A1D2
+	special BufferContestTrainerAndMonNames
 	addvar VAR_0x8006, 1
 	buffernumberstring 1, VAR_0x8006
 	lockall
-	applymovement VAR_0x800B, LinkContestRoom1_Movement_27AD20
+	applymovement VAR_0x800B, ContestHall_Movement_ContestantDelay32
 	waitmovement 0
 	releaseall
-	call LinkContestRoom1_EventScript_27A133
-	call LinkContestRoom1_EventScript_27AD80
-	addobject 13
+	call ContestHall_EventScript_TryWaitForLink
+	call ContestHall_EventScript_CheckIfContestWithRSPlayer
+	addobject 13  @ Place Poke Ball down
 	playse SE_DANSA
 	lockall
-	applymovement VAR_0x800B, LinkContestRoom1_Movement_27AD20
+	applymovement VAR_0x800B, ContestHall_Movement_ContestantDelay32
 	waitmovement 0
 	releaseall
-	addvar VAR_0x8006, 65535
+	addvar VAR_0x8006, -1
 	playse SE_BOWA2
 	special ShowContestEntryMonPic
-	call LinkContestRoom1_EventScript_27A217
+	call ContestHall_EventScript_EntryXTrainersMon
 	return
 
-LinkContestRoom1_EventScript_27A217:: @ 827A217
-	compare VAR_CONTEST_LOCATION, 5
-	goto_if_eq LinkContestRoom1_EventScript_27A229
-	message LinkContestRoom1_Text_27B815
+ContestHall_EventScript_EntryXTrainersMon:: @ 827A217
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
+	goto_if_eq ContestHall_EventScript_EntryXTrainersMonLink
+	message ContestHall_Text_EntryXTrainersMon
 	waitmessage
 	return
 
-LinkContestRoom1_EventScript_27A229:: @ 827A229
-	messageautoscroll LinkContestRoom1_Text_27B815
+ContestHall_EventScript_EntryXTrainersMonLink:: @ 827A229
+	messageautoscroll ContestHall_Text_EntryXTrainersMon
 	waitmessage
 	return
 
-LinkContestRoom1_EventScript_27A230:: @ 827A230
-	call LinkContestRoom1_EventScript_27A26C
-	call LinkContestRoom1_EventScript_27A2B9
+ContestHall_EventScript_AudienceVote:: @ 827A230
+	call ContestHall_EventScript_AudienceWillVote
+	call ContestHall_EventScript_VotingUnderWay
 	playse SE_W227B
 	waitmessage
-	call LinkContestRoom1_EventScript_27AA1B
-	applymovement 1, LinkContestRoom1_Movement_27AD23
+	call ContestHall_EventScript_AudienceLookAround
+	applymovement 1, ContestHall_Movement_MCFaceJudge2
 	waitmovement 0
-	applymovement 2, LinkContestRoom1_Movement_27AD25
+	applymovement 2, ContestHall_Movement_JudgeFaceMC
 	waitmovement 0
 	delay 20
-	applymovement 1, LinkContestRoom1_Movement_27AD13
-	applymovement 2, LinkContestRoom1_Movement_27AD13
+	applymovement 1, ContestHall_Movement_FaceContestants
+	applymovement 2, ContestHall_Movement_FaceContestants
 	waitmovement 0
 	return
 
-LinkContestRoom1_EventScript_27A26C:: @ 827A26C
-	compare VAR_CONTEST_LOCATION, 5
-	goto_if_eq LinkContestRoom1_EventScript_27A280
-	msgbox LinkContestRoom1_Text_27B830, MSGBOX_DEFAULT
+ContestHall_EventScript_AudienceWillVote:: @ 827A26C
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
+	goto_if_eq ContestHall_EventScript_AudienceWillVoteLink
+	msgbox ContestHall_Text_SeenContestantsAudienceWillVote, MSGBOX_DEFAULT
 	return
 
-LinkContestRoom1_EventScript_27A280:: @ 827A280
-	specialvar VAR_RESULT, sub_80F9160
-	compare VAR_RESULT, 1
-	goto_if_eq LinkContestRoom1_EventScript_27A297
-	messageautoscroll LinkContestRoom1_Text_27B830
+ContestHall_EventScript_AudienceWillVoteLink:: @ 827A280
+	specialvar VAR_RESULT, IsWirelessContest
+	compare VAR_RESULT, TRUE
+	goto_if_eq ContestHall_EventScript_AudienceWillVoteWireless
+	messageautoscroll ContestHall_Text_SeenContestantsAudienceWillVote
 	waitmessage
 	return
 
-LinkContestRoom1_EventScript_27A297:: @ 827A297
-	messageautoscroll LinkContestRoom1_Text_27C9AF
+ContestHall_EventScript_AudienceWillVoteWireless:: @ 827A297
+	messageautoscroll ContestHall_Text_WeveSeenContestants
 	waitmessage
-	call LinkContestRoom1_EventScript_27A133
-	messageautoscroll LinkContestRoom1_Text_27CA04
+	call ContestHall_EventScript_TryWaitForLink
+	messageautoscroll ContestHall_Text_AudienceWillVote
 	waitmessage
-	call LinkContestRoom1_EventScript_27A133
-	messageautoscroll LinkContestRoom1_Text_27CA42
+	call ContestHall_EventScript_TryWaitForLink
+	messageautoscroll ContestHall_Text_LetVotingBegin
 	waitmessage
-	call LinkContestRoom1_EventScript_27A133
+	call ContestHall_EventScript_TryWaitForLink
 	return
 
-LinkContestRoom1_EventScript_27A2B9:: @ 827A2B9
-	compare VAR_CONTEST_LOCATION, 5
-	goto_if_eq LinkContestRoom1_EventScript_27A2CA
-	message LinkContestRoom1_Text_27B8F2
+ContestHall_EventScript_VotingUnderWay:: @ 827A2B9
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
+	goto_if_eq ContestHall_EventScript_VotingUnderWayLink
+	message ContestHall_Text_VotingUnderWay
 	return
 
-LinkContestRoom1_EventScript_27A2CA:: @ 827A2CA
-	messageautoscroll LinkContestRoom1_Text_27B8F2
-	call LinkContestRoom1_EventScript_27A133
+ContestHall_EventScript_VotingUnderWayLink:: @ 827A2CA
+	messageautoscroll ContestHall_Text_VotingUnderWay
+	call ContestHall_EventScript_TryWaitForLink
 	return
 
-LinkContestRoom1_EventScript_27A2D5:: @ 827A2D5
-	call LinkContestRoom1_EventScript_27A133
-	applymovement 1, LinkContestRoom1_Movement_27AD33
+ContestHall_EventScript_AudienceReactToContestant:: @ 827A2D5
+	call ContestHall_EventScript_TryWaitForLink
+	applymovement 1, ContestHall_Movement_AudienceMemberLookLeft
 	waitmovement 0
 	playse SE_W227B
-	call LinkContestRoom1_EventScript_27AA6F
-	applymovement 9, LinkContestRoom1_Movement_27AD3B
-	applymovement 12, LinkContestRoom1_Movement_27AD3F
-	applymovement 7, LinkContestRoom1_Movement_27AD3B
+	call ContestHall_EventScript_VObjectAudienceLookAround
+	applymovement 9, ContestHall_Movement_AudienceMemberLookRight
+	applymovement 12, ContestHall_Movement_AudienceMemberLookDown
+	applymovement 7, ContestHall_Movement_AudienceMemberLookRight
 	waitmovement 0
-	applymovement 1, LinkContestRoom1_Movement_27AD3B
+	applymovement 1, ContestHall_Movement_AudienceMemberLookRight
 	waitmovement 0
-	applymovement 10, LinkContestRoom1_Movement_27AD33
-	applymovement 11, LinkContestRoom1_Movement_27AD3F
-	applymovement 6, LinkContestRoom1_Movement_27AD37
-	applymovement 8, LinkContestRoom1_Movement_27AD33
+	applymovement 10, ContestHall_Movement_AudienceMemberLookLeft
+	applymovement 11, ContestHall_Movement_AudienceMemberLookDown
+	applymovement 6, ContestHall_Movement_AudienceMemberLookUp
+	applymovement 8, ContestHall_Movement_AudienceMemberLookLeft
 	waitmovement 0
-	applymovement 1, LinkContestRoom1_Movement_27AD45
+	applymovement 1, ContestHall_Movement_MCLookAtJudge
 	waitmovement 0
-	applymovement 1, LinkContestRoom1_Movement_27AD4E
-	applymovement 2, LinkContestRoom1_Movement_27AD49
+	applymovement 1, ContestHall_Movement_MCWalkInPlaceDown
+	applymovement 2, ContestHall_Movement_JudgeLookAtMC
 	waitmovement 0
 	releaseall
-	call LinkContestRoom1_EventScript_27A133
-	return
-
-LinkContestRoom1_EventScript_27A34F:: @ 827A34F
-	special sub_80F82FC
-	compare VAR_CONTEST_LOCATION, 1
-	call_if_eq LinkContestRoom1_EventScript_27A454
-	compare VAR_CONTEST_LOCATION, 2
-	call_if_eq LinkContestRoom1_EventScript_27A4B2
-	compare VAR_CONTEST_LOCATION, 3
-	call_if_eq LinkContestRoom1_EventScript_27A510
-	compare VAR_CONTEST_LOCATION, 4
-	call_if_eq LinkContestRoom1_EventScript_27A56E
-	compare VAR_CONTEST_LOCATION, 5
-	call_if_eq LinkContestRoom1_EventScript_27A5CC
+	call ContestHall_EventScript_TryWaitForLink
+	return
+
+@ For below VAR_TEMP_0 is the number of heart emotes to try to display in the audience
+@ The number of hearts to try to display is based on the condition of the presented pokemon and the rank
+@ For each heart to display a random audience member is chosen, and a new one chosen if they already displayed a heart
+@ VAR_TEMP_1 through VAR_TEMP_8 represent each of the 8 audience members that are actual event objects
+@    and are set to 9 if they havent displayed a heart yet, and 1 if they have
+ContestHall_EventScript_AudienceHeartEmotes:: @ 827A34F
+	special GetContestMonCondition
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_NORMAL
+	call_if_eq ContestHall_EventScript_GetNumberOfHeartsNormal
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_SUPER
+	call_if_eq ContestHall_EventScript_GetNumberOfHeartsSuper
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_HYPER
+	call_if_eq ContestHall_EventScript_GetNumberOfHeartsHyper
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_MASTER
+	call_if_eq ContestHall_EventScript_GetNumberOfHeartsMaster
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
+	call_if_eq ContestHall_EventScript_GetNumberOfHeartsLink
 	setvar VAR_TEMP_1, 9
 	setvar VAR_TEMP_2, 9
 	setvar VAR_TEMP_3, 9
@@ -502,7 +513,7 @@ LinkContestRoom1_EventScript_27A34F:: @ 827A34F
 	setvar VAR_TEMP_7, 9
 	setvar VAR_TEMP_8, 9
 	compare VAR_TEMP_0, 0
-	call_if_gt LinkContestRoom1_EventScript_27A3E5
+	call_if_gt ContestHall_EventScript_DisplayHearts
 	setvar VAR_TEMP_1, 0
 	setvar VAR_TEMP_2, 0
 	setvar VAR_TEMP_3, 0
@@ -513,505 +524,505 @@ LinkContestRoom1_EventScript_27A34F:: @ 827A34F
 	setvar VAR_TEMP_8, 0
 	return
 
-LinkContestRoom1_EventScript_27A3E5:: @ 827A3E5
+ContestHall_EventScript_DisplayHearts:: @ 827A3E5
 	setvar VAR_RESULT, 8
 	special ScriptRandom
 	compare VAR_RESULT, 0
-	call_if_eq LinkContestRoom1_EventScript_27A65A
+	call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember1
 	compare VAR_RESULT, 1
-	call_if_eq LinkContestRoom1_EventScript_27A67E
+	call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember2
 	compare VAR_RESULT, 2
-	call_if_eq LinkContestRoom1_EventScript_27A6A2
+	call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember3
 	compare VAR_RESULT, 3
-	call_if_eq LinkContestRoom1_EventScript_27A6C6
+	call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember4
 	compare VAR_RESULT, 4
-	call_if_eq LinkContestRoom1_EventScript_27A6EA
+	call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember5
 	compare VAR_RESULT, 5
-	call_if_eq LinkContestRoom1_EventScript_27A70E
+	call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember6
 	compare VAR_RESULT, 6
-	call_if_eq LinkContestRoom1_EventScript_27A732
+	call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember7
 	compare VAR_RESULT, 7
-	call_if_eq LinkContestRoom1_EventScript_27A756
-	compare VAR_TEMP_0, 0
-	goto_if_gt LinkContestRoom1_EventScript_27A3E5
+	call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember8
+	compare VAR_TEMP_0, 0  @ Still more hearts to display
+	goto_if_gt ContestHall_EventScript_DisplayHearts
 	waitmovement 0
 	return
 
-LinkContestRoom1_EventScript_27A454:: @ 827A454
+ContestHall_EventScript_GetNumberOfHeartsNormal:: @ 827A454
 	compare VAR_0x8004, 80
-	goto_if_gt LinkContestRoom1_EventScript_27A654
+	goto_if_gt ContestHall_EventScript_Set8Hearts
 	compare VAR_0x8004, 70
-	goto_if_gt LinkContestRoom1_EventScript_27A64E
+	goto_if_gt ContestHall_EventScript_Set7Hearts
 	compare VAR_0x8004, 60
-	goto_if_gt LinkContestRoom1_EventScript_27A648
+	goto_if_gt ContestHall_EventScript_Set6Hearts
 	compare VAR_0x8004, 50
-	goto_if_gt LinkContestRoom1_EventScript_27A642
+	goto_if_gt ContestHall_EventScript_Set5Hearts
 	compare VAR_0x8004, 40
-	goto_if_gt LinkContestRoom1_EventScript_27A63C
+	goto_if_gt ContestHall_EventScript_Set4Hearts
 	compare VAR_0x8004, 30
-	goto_if_gt LinkContestRoom1_EventScript_27A636
+	goto_if_gt ContestHall_EventScript_Set3Hearts
 	compare VAR_0x8004, 20
-	goto_if_gt LinkContestRoom1_EventScript_27A630
+	goto_if_gt ContestHall_EventScript_Set2Hearts
 	compare VAR_0x8004, 10
-	goto_if_gt LinkContestRoom1_EventScript_27A62A
+	goto_if_gt ContestHall_EventScript_Set1Heart
 	setvar VAR_TEMP_0, 0
 	return
 
-LinkContestRoom1_EventScript_27A4B2:: @ 827A4B2
+ContestHall_EventScript_GetNumberOfHeartsSuper:: @ 827A4B2
 	compare VAR_0x8004, 230
-	goto_if_gt LinkContestRoom1_EventScript_27A654
+	goto_if_gt ContestHall_EventScript_Set8Hearts
 	compare VAR_0x8004, 210
-	goto_if_gt LinkContestRoom1_EventScript_27A64E
+	goto_if_gt ContestHall_EventScript_Set7Hearts
 	compare VAR_0x8004, 190
-	goto_if_gt LinkContestRoom1_EventScript_27A648
+	goto_if_gt ContestHall_EventScript_Set6Hearts
 	compare VAR_0x8004, 170
-	goto_if_gt LinkContestRoom1_EventScript_27A642
+	goto_if_gt ContestHall_EventScript_Set5Hearts
 	compare VAR_0x8004, 150
-	goto_if_gt LinkContestRoom1_EventScript_27A63C
+	goto_if_gt ContestHall_EventScript_Set4Hearts
 	compare VAR_0x8004, 130
-	goto_if_gt LinkContestRoom1_EventScript_27A636
+	goto_if_gt ContestHall_EventScript_Set3Hearts
 	compare VAR_0x8004, 110
-	goto_if_gt LinkContestRoom1_EventScript_27A630
+	goto_if_gt ContestHall_EventScript_Set2Hearts
 	compare VAR_0x8004, 90
-	goto_if_gt LinkContestRoom1_EventScript_27A62A
+	goto_if_gt ContestHall_EventScript_Set1Heart
 	setvar VAR_TEMP_0, 0
 	return
 
-LinkContestRoom1_EventScript_27A510:: @ 827A510
+ContestHall_EventScript_GetNumberOfHeartsHyper:: @ 827A510
 	compare VAR_0x8004, 380
-	goto_if_gt LinkContestRoom1_EventScript_27A654
+	goto_if_gt ContestHall_EventScript_Set8Hearts
 	compare VAR_0x8004, 350
-	goto_if_gt LinkContestRoom1_EventScript_27A64E
+	goto_if_gt ContestHall_EventScript_Set7Hearts
 	compare VAR_0x8004, 320
-	goto_if_gt LinkContestRoom1_EventScript_27A648
+	goto_if_gt ContestHall_EventScript_Set6Hearts
 	compare VAR_0x8004, 290
-	goto_if_gt LinkContestRoom1_EventScript_27A642
+	goto_if_gt ContestHall_EventScript_Set5Hearts
 	compare VAR_0x8004, 260
-	goto_if_gt LinkContestRoom1_EventScript_27A63C
+	goto_if_gt ContestHall_EventScript_Set4Hearts
 	compare VAR_0x8004, 230
-	goto_if_gt LinkContestRoom1_EventScript_27A636
+	goto_if_gt ContestHall_EventScript_Set3Hearts
 	compare VAR_0x8004, 200
-	goto_if_gt LinkContestRoom1_EventScript_27A630
+	goto_if_gt ContestHall_EventScript_Set2Hearts
 	compare VAR_0x8004, 170
-	goto_if_gt LinkContestRoom1_EventScript_27A62A
+	goto_if_gt ContestHall_EventScript_Set1Heart
 	setvar VAR_TEMP_0, 0
 	return
 
-LinkContestRoom1_EventScript_27A56E:: @ 827A56E
+ContestHall_EventScript_GetNumberOfHeartsMaster:: @ 827A56E
 	compare VAR_0x8004, 600
-	goto_if_gt LinkContestRoom1_EventScript_27A654
+	goto_if_gt ContestHall_EventScript_Set8Hearts
 	compare VAR_0x8004, 560
-	goto_if_gt LinkContestRoom1_EventScript_27A64E
+	goto_if_gt ContestHall_EventScript_Set7Hearts
 	compare VAR_0x8004, 520
-	goto_if_gt LinkContestRoom1_EventScript_27A648
+	goto_if_gt ContestHall_EventScript_Set6Hearts
 	compare VAR_0x8004, 480
-	goto_if_gt LinkContestRoom1_EventScript_27A642
+	goto_if_gt ContestHall_EventScript_Set5Hearts
 	compare VAR_0x8004, 440
-	goto_if_gt LinkContestRoom1_EventScript_27A63C
+	goto_if_gt ContestHall_EventScript_Set4Hearts
 	compare VAR_0x8004, 400
-	goto_if_gt LinkContestRoom1_EventScript_27A636
+	goto_if_gt ContestHall_EventScript_Set3Hearts
 	compare VAR_0x8004, 360
-	goto_if_gt LinkContestRoom1_EventScript_27A630
+	goto_if_gt ContestHall_EventScript_Set2Hearts
 	compare VAR_0x8004, 320
-	goto_if_gt LinkContestRoom1_EventScript_27A62A
+	goto_if_gt ContestHall_EventScript_Set1Heart
 	setvar VAR_TEMP_0, 0
 	return
 
-LinkContestRoom1_EventScript_27A5CC:: @ 827A5CC
+ContestHall_EventScript_GetNumberOfHeartsLink:: @ 827A5CC
 	compare VAR_0x8004, 600
-	goto_if_gt LinkContestRoom1_EventScript_27A654
+	goto_if_gt ContestHall_EventScript_Set8Hearts
 	compare VAR_0x8004, 550
-	goto_if_gt LinkContestRoom1_EventScript_27A64E
+	goto_if_gt ContestHall_EventScript_Set7Hearts
 	compare VAR_0x8004, 500
-	goto_if_gt LinkContestRoom1_EventScript_27A648
+	goto_if_gt ContestHall_EventScript_Set6Hearts
 	compare VAR_0x8004, 450
-	goto_if_gt LinkContestRoom1_EventScript_27A642
+	goto_if_gt ContestHall_EventScript_Set5Hearts
 	compare VAR_0x8004, 400
-	goto_if_gt LinkContestRoom1_EventScript_27A63C
+	goto_if_gt ContestHall_EventScript_Set4Hearts
 	compare VAR_0x8004, 300
-	goto_if_gt LinkContestRoom1_EventScript_27A636
+	goto_if_gt ContestHall_EventScript_Set3Hearts
 	compare VAR_0x8004, 200
-	goto_if_gt LinkContestRoom1_EventScript_27A630
+	goto_if_gt ContestHall_EventScript_Set2Hearts
 	compare VAR_0x8004, 100
-	goto_if_gt LinkContestRoom1_EventScript_27A62A
+	goto_if_gt ContestHall_EventScript_Set1Heart
 	setvar VAR_TEMP_0, 0
 	return
 
-LinkContestRoom1_EventScript_27A62A:: @ 827A62A
+ContestHall_EventScript_Set1Heart:: @ 827A62A
 	setvar VAR_TEMP_0, 1
 	return
 
-LinkContestRoom1_EventScript_27A630:: @ 827A630
+ContestHall_EventScript_Set2Hearts:: @ 827A630
 	setvar VAR_TEMP_0, 2
 	return
 
-LinkContestRoom1_EventScript_27A636:: @ 827A636
+ContestHall_EventScript_Set3Hearts:: @ 827A636
 	setvar VAR_TEMP_0, 3
 	return
 
-LinkContestRoom1_EventScript_27A63C:: @ 827A63C
+ContestHall_EventScript_Set4Hearts:: @ 827A63C
 	setvar VAR_TEMP_0, 4
 	return
 
-LinkContestRoom1_EventScript_27A642:: @ 827A642
+ContestHall_EventScript_Set5Hearts:: @ 827A642
 	setvar VAR_TEMP_0, 5
 	return
 
-LinkContestRoom1_EventScript_27A648:: @ 827A648
+ContestHall_EventScript_Set6Hearts:: @ 827A648
 	setvar VAR_TEMP_0, 6
 	return
 
-LinkContestRoom1_EventScript_27A64E:: @ 827A64E
+ContestHall_EventScript_Set7Hearts:: @ 827A64E
 	setvar VAR_TEMP_0, 7
 	return
 
-LinkContestRoom1_EventScript_27A654:: @ 827A654
+ContestHall_EventScript_Set8Hearts:: @ 827A654
 	setvar VAR_TEMP_0, 8
 	return
 
-LinkContestRoom1_EventScript_27A65A:: @ 827A65A
+ContestHall_EventScript_TryDisplayHeartAudienceMember1:: @ 827A65A
 	compare VAR_TEMP_1, 1
-	goto_if_eq LinkContestRoom1_EventScript_27A67D
-	applymovement 6, LinkContestRoom1_Movement_27AD11
+	goto_if_eq ContestHall_EventScript_AudienceMember1AlreadyEmoted
+	applymovement 6, ContestHall_Movement_Heart
 	playse SE_PIN
 	delay 14
 	setvar VAR_TEMP_1, 1
-	addvar VAR_TEMP_0, 65535
+	addvar VAR_TEMP_0, -1
 	return
 
-LinkContestRoom1_EventScript_27A67D:: @ 827A67D
+ContestHall_EventScript_AudienceMember1AlreadyEmoted:: @ 827A67D
 	return
 
-LinkContestRoom1_EventScript_27A67E:: @ 827A67E
+ContestHall_EventScript_TryDisplayHeartAudienceMember2:: @ 827A67E
 	compare VAR_TEMP_2, 1
-	goto_if_eq LinkContestRoom1_EventScript_27A6A1
-	applymovement 12, LinkContestRoom1_Movement_27AD11
+	goto_if_eq ContestHall_EventScript_AudienceMember2AlreadyEmoted
+	applymovement 12, ContestHall_Movement_Heart
 	playse SE_PIN
 	delay 14
 	setvar VAR_TEMP_2, 1
-	addvar VAR_TEMP_0, 65535
+	addvar VAR_TEMP_0, -1
 	return
 
-LinkContestRoom1_EventScript_27A6A1:: @ 827A6A1
+ContestHall_EventScript_AudienceMember2AlreadyEmoted:: @ 827A6A1
 	return
 
-LinkContestRoom1_EventScript_27A6A2:: @ 827A6A2
+ContestHall_EventScript_TryDisplayHeartAudienceMember3:: @ 827A6A2
 	compare VAR_TEMP_3, 1
-	goto_if_eq LinkContestRoom1_EventScript_27A6C5
-	applymovement 7, LinkContestRoom1_Movement_27AD11
+	goto_if_eq ContestHall_EventScript_AudienceMember3AlreadyEmoted
+	applymovement 7, ContestHall_Movement_Heart
 	playse SE_PIN
 	delay 14
 	setvar VAR_TEMP_3, 1
-	addvar VAR_TEMP_0, 65535
+	addvar VAR_TEMP_0, -1
 	return
 
-LinkContestRoom1_EventScript_27A6C5:: @ 827A6C5
+ContestHall_EventScript_AudienceMember3AlreadyEmoted:: @ 827A6C5
 	return
 
-LinkContestRoom1_EventScript_27A6C6:: @ 827A6C6
+ContestHall_EventScript_TryDisplayHeartAudienceMember4:: @ 827A6C6
 	compare VAR_TEMP_4, 1
-	goto_if_eq LinkContestRoom1_EventScript_27A6E9
-	applymovement 8, LinkContestRoom1_Movement_27AD11
+	goto_if_eq ContestHall_EventScript_Audience4MemberAlreadyEmoted
+	applymovement 8, ContestHall_Movement_Heart
 	playse SE_PIN
 	delay 14
 	setvar VAR_TEMP_4, 1
-	addvar VAR_TEMP_0, 65535
+	addvar VAR_TEMP_0, -1
 	return
 
-LinkContestRoom1_EventScript_27A6E9:: @ 827A6E9
+ContestHall_EventScript_Audience4MemberAlreadyEmoted:: @ 827A6E9
 	return
 
-LinkContestRoom1_EventScript_27A6EA:: @ 827A6EA
+ContestHall_EventScript_TryDisplayHeartAudienceMember5:: @ 827A6EA
 	compare VAR_TEMP_5, 1
-	goto_if_eq LinkContestRoom1_EventScript_27A70D
-	applymovement 9, LinkContestRoom1_Movement_27AD11
+	goto_if_eq ContestHall_EventScript_AudienceMember5AlreadyEmoted
+	applymovement 9, ContestHall_Movement_Heart
 	playse SE_PIN
 	delay 14
 	setvar VAR_TEMP_5, 1
-	addvar VAR_TEMP_0, 65535
+	addvar VAR_TEMP_0, -1
 	return
 
-LinkContestRoom1_EventScript_27A70D:: @ 827A70D
+ContestHall_EventScript_AudienceMember5AlreadyEmoted:: @ 827A70D
 	return
 
-LinkContestRoom1_EventScript_27A70E:: @ 827A70E
+ContestHall_EventScript_TryDisplayHeartAudienceMember6:: @ 827A70E
 	compare VAR_TEMP_6, 1
-	goto_if_eq LinkContestRoom1_EventScript_27A731
-	applymovement 10, LinkContestRoom1_Movement_27AD11
+	goto_if_eq ContestHall_EventScript_AudienceMember6AlreadyEmoted
+	applymovement 10, ContestHall_Movement_Heart
 	playse SE_PIN
 	delay 14
 	setvar VAR_TEMP_6, 1
-	addvar VAR_TEMP_0, 65535
+	addvar VAR_TEMP_0, -1
 	return
 
-LinkContestRoom1_EventScript_27A731:: @ 827A731
+ContestHall_EventScript_AudienceMember6AlreadyEmoted:: @ 827A731
 	return
 
-LinkContestRoom1_EventScript_27A732:: @ 827A732
+ContestHall_EventScript_TryDisplayHeartAudienceMember7:: @ 827A732
 	compare VAR_TEMP_7, 1
-	goto_if_eq LinkContestRoom1_EventScript_27A755
-	applymovement 11, LinkContestRoom1_Movement_27AD11
+	goto_if_eq ContestHall_EventScript_AudienceMember7AlreadyEmoted
+	applymovement 11, ContestHall_Movement_Heart
 	playse SE_PIN
 	delay 14
 	setvar VAR_TEMP_7, 1
-	addvar VAR_TEMP_0, 65535
+	addvar VAR_TEMP_0, -1
 	return
 
-LinkContestRoom1_EventScript_27A755:: @ 827A755
+ContestHall_EventScript_AudienceMember7AlreadyEmoted:: @ 827A755
 	return
 
-LinkContestRoom1_EventScript_27A756:: @ 827A756
+ContestHall_EventScript_TryDisplayHeartAudienceMember8:: @ 827A756
 	compare VAR_TEMP_8, 1
-	goto_if_eq LinkContestRoom1_EventScript_27A779
-	applymovement 15, LinkContestRoom1_Movement_27AD11
+	goto_if_eq ContestHall_EventScript_AudienceMember8AlreadyEmoted
+	applymovement 15, ContestHall_Movement_Heart
 	playse SE_PIN
 	delay 14
 	setvar VAR_TEMP_8, 1
-	addvar VAR_TEMP_0, 65535
+	addvar VAR_TEMP_0, -1
 	return
 
-LinkContestRoom1_EventScript_27A779:: @ 827A779
+ContestHall_EventScript_AudienceMember8AlreadyEmoted:: @ 827A779
 	return
 
-LinkContestRoom1_EventScript_27A77A:: @ 827A77A
+ContestHall_EventScript_ContestantReturn:: @ 827A77A
 	closemessage
 	release
-	removeobject 13
-	special sub_80F8EB8
-	call LinkContestRoom1_EventScript_27A133
+	removeobject 13  @ Poke Ball
+	special HideContestEntryMonPic
+	call ContestHall_EventScript_TryWaitForLink
 	switch VAR_0x8006
-	case 0, LinkContestRoom1_EventScript_27A7B9
-	case 1, LinkContestRoom1_EventScript_27A7CB
-	case 2, LinkContestRoom1_EventScript_27A7DD
-	case 3, LinkContestRoom1_EventScript_27A7EF
+	case 0, ContestHall_EventScript_Player1WalkBack
+	case 1, ContestHall_EventScript_Player2WalkBack
+	case 2, ContestHall_EventScript_Player3WalkBack
+	case 3, ContestHall_EventScript_Player4WalkBack
 	return
 
-LinkContestRoom1_EventScript_27A7B9:: @ 827A7B9
-	call LinkContestRoom1_EventScript_27A133
+ContestHall_EventScript_Player1WalkBack:: @ 827A7B9
+	call ContestHall_EventScript_TryWaitForLink
 	lockall
-	applymovement VAR_0x800B, LinkContestRoom1_Movement_27AD58
+	applymovement VAR_0x800B, ContestHall_Movement_Player1WalkBack
 	waitmovement 0
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27A7CB:: @ 827A7CB
-	call LinkContestRoom1_EventScript_27A133
+ContestHall_EventScript_Player2WalkBack:: @ 827A7CB
+	call ContestHall_EventScript_TryWaitForLink
 	lockall
-	applymovement VAR_0x800B, LinkContestRoom1_Movement_27AD62
+	applymovement VAR_0x800B, ContestHall_Movement_Player2WalkBack
 	waitmovement 0
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27A7DD:: @ 827A7DD
-	call LinkContestRoom1_EventScript_27A133
+ContestHall_EventScript_Player3WalkBack:: @ 827A7DD
+	call ContestHall_EventScript_TryWaitForLink
 	lockall
-	applymovement VAR_0x800B, LinkContestRoom1_Movement_27AD6A
+	applymovement VAR_0x800B, ContestHall_Movement_Player3WalkBack
 	waitmovement 0
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27A7EF:: @ 827A7EF
-	call LinkContestRoom1_EventScript_27A133
+ContestHall_EventScript_Player4WalkBack:: @ 827A7EF
+	call ContestHall_EventScript_TryWaitForLink
 	lockall
-	applymovement VAR_0x800B, LinkContestRoom1_Movement_27AD74
+	applymovement VAR_0x800B, ContestHall_Movement_Player4WalkBack
 	waitmovement 0
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27A801:: @ 827A801
+ContestHall_EventScript_DoContestAppeals:: @ 827A801
 	lockall
-	applymovement 1, LinkContestRoom1_Movement_27AD27
+	applymovement 1, ContestHall_Movement_FaceContestants2
 	waitmovement 0
-	call LinkContestRoom1_EventScript_27A133
-	call LinkContestRoom1_EventScript_27A853
+	call ContestHall_EventScript_TryWaitForLink
+	call ContestHall_EventScript_LetsAppeal
 	waitmessage
-	applymovement 1, LinkContestRoom1_Movement_27AD15
-	applymovement 2, LinkContestRoom1_Movement_27AD19
+	applymovement 1, ContestHall_Movement_WalkStageLeft
+	applymovement 2, ContestHall_Movement_WalkStageRight
 	waitmovement 0
 	releaseall
-	call LinkContestRoom1_EventScript_27A133
+	call ContestHall_EventScript_TryWaitForLink
 	setvar VAR_TEMP_9, 1
-	special sub_80F910C
+	special LinkContestTryHideWirelessIndicator
 	startcontest
-	special sub_80F90DC
+	special LinkContestTryShowWirelessIndicator
 	setvar VAR_TEMP_9, 0
 	lockall
-	applymovement 1, LinkContestRoom1_Movement_27AD19
-	applymovement 2, LinkContestRoom1_Movement_27AD15
+	applymovement 1, ContestHall_Movement_WalkStageRight
+	applymovement 2, ContestHall_Movement_WalkStageLeft
 	waitmovement 0
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27A853:: @ 827A853
-	compare VAR_CONTEST_LOCATION, 5
-	goto_if_eq LinkContestRoom1_EventScript_27A867
-	msgbox LinkContestRoom1_Text_27B904, MSGBOX_DEFAULT
+ContestHall_EventScript_LetsAppeal:: @ 827A853
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
+	goto_if_eq ContestHall_EventScript_LetsAppealLink
+	msgbox ContestHall_Text_VotingCompleteLetsAppeal, MSGBOX_DEFAULT
 	return
 
-LinkContestRoom1_EventScript_27A867:: @ 827A867
-	specialvar VAR_RESULT, sub_80F9160
-	compare VAR_RESULT, 1
-	goto_if_eq LinkContestRoom1_EventScript_27A87E
-	messageautoscroll LinkContestRoom1_Text_27B904
+ContestHall_EventScript_LetsAppealLink:: @ 827A867
+	specialvar VAR_RESULT, IsWirelessContest
+	compare VAR_RESULT, TRUE
+	goto_if_eq ContestHall_EventScript_LetsAppealWireless
+	messageautoscroll ContestHall_Text_VotingCompleteLetsAppeal
 	waitmessage
 	return
 
-LinkContestRoom1_EventScript_27A87E:: @ 827A87E
-	call LinkContestRoom1_EventScript_27A133
-	messageautoscroll LinkContestRoom1_Text_27CA71
+ContestHall_EventScript_LetsAppealWireless:: @ 827A87E
+	call ContestHall_EventScript_TryWaitForLink
+	messageautoscroll ContestHall_Text_VotingComplete
 	waitmessage
-	call LinkContestRoom1_EventScript_27A133
-	messageautoscroll LinkContestRoom1_Text_27CAD0
+	call ContestHall_EventScript_TryWaitForLink
+	messageautoscroll ContestHall_Text_SecondStageOfJudging
 	waitmessage
-	call LinkContestRoom1_EventScript_27A133
-	messageautoscroll LinkContestRoom1_Text_27CB55
+	call ContestHall_EventScript_TryWaitForLink
+	messageautoscroll ContestHall_Text_LetsAppeal
 	waitmessage
-	call LinkContestRoom1_EventScript_27A133
+	call ContestHall_EventScript_TryWaitForLink
 	return
 
-LinkContestRoom1_EventScript_27A8A5:: @ 827A8A5
-	call LinkContestRoom1_EventScript_27A133
-	call LinkContestRoom1_EventScript_27A8FB
-	call LinkContestRoom1_EventScript_27A133
-	call LinkContestRoom1_EventScript_27A91E
-	call LinkContestRoom1_EventScript_27A133
-	applymovement 1, LinkContestRoom1_Movement_27AD0F
+ContestHall_EventScript_ContestResults:: @ 827A8A5
+	call ContestHall_EventScript_TryWaitForLink
+	call ContestHall_EventScript_ThatsItForJudging
+	call ContestHall_EventScript_TryWaitForLink
+	call ContestHall_EventScript_ThankYouForAppeals
+	call ContestHall_EventScript_TryWaitForLink
+	applymovement 1, ContestHall_Movement_MCFaceJudge
 	waitmovement 0
-	call LinkContestRoom1_EventScript_27A941
-	call LinkContestRoom1_EventScript_27A133
-	call LinkContestRoom1_EventScript_27A964
-	call LinkContestRoom1_EventScript_27A133
-	applymovement 1, LinkContestRoom1_Movement_27AD13
+	call ContestHall_EventScript_JudgeLooksReady
+	call ContestHall_EventScript_TryWaitForLink
+	call ContestHall_EventScript_WeWillDeclareWinner
+	call ContestHall_EventScript_TryWaitForLink
+	applymovement 1, ContestHall_Movement_FaceContestants
 	waitmovement 0
 	closemessage
 	releaseall
-	special sub_80F910C
+	special LinkContestTryHideWirelessIndicator
 	setvar VAR_TEMP_9, 1
 	showcontestresults
 	setvar VAR_TEMP_9, 0
 	playbgm MUS_CON_FAN, 0
 	return
 
-LinkContestRoom1_EventScript_27A8FB:: @ 827A8FB
-	compare VAR_CONTEST_LOCATION, 5
-	goto_if_eq LinkContestRoom1_EventScript_27A90F
-	msgbox LinkContestRoom1_Text_27BA15, MSGBOX_DEFAULT
+ContestHall_EventScript_ThatsItForJudging:: @ 827A8FB
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
+	goto_if_eq ContestHall_EventScript_ThatsItForJudgingLink
+	msgbox ContestHall_Text_ThatsItForJudging, MSGBOX_DEFAULT
 	return
 
-LinkContestRoom1_EventScript_27A90F:: @ 827A90F
-	call LinkContestRoom1_EventScript_27A133
-	messageautoscroll LinkContestRoom1_Text_27BA15
+ContestHall_EventScript_ThatsItForJudgingLink:: @ 827A90F
+	call ContestHall_EventScript_TryWaitForLink
+	messageautoscroll ContestHall_Text_ThatsItForJudging
 	waitmessage
 	delay 30
 	return
 
-LinkContestRoom1_EventScript_27A91E:: @ 827A91E
-	compare VAR_CONTEST_LOCATION, 5
-	goto_if_eq LinkContestRoom1_EventScript_27A932
-	msgbox LinkContestRoom1_Text_27BA30, MSGBOX_DEFAULT
+ContestHall_EventScript_ThankYouForAppeals:: @ 827A91E
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
+	goto_if_eq ContestHall_EventScript_ThankYouForAppealsLink
+	msgbox ContestHall_Text_ThankYouForAppeals, MSGBOX_DEFAULT
 	return
 
-LinkContestRoom1_EventScript_27A932:: @ 827A932
-	call LinkContestRoom1_EventScript_27A133
-	messageautoscroll LinkContestRoom1_Text_27BA30
+ContestHall_EventScript_ThankYouForAppealsLink:: @ 827A932
+	call ContestHall_EventScript_TryWaitForLink
+	messageautoscroll ContestHall_Text_ThankYouForAppeals
 	waitmessage
 	delay 30
 	return
 
-LinkContestRoom1_EventScript_27A941:: @ 827A941
-	compare VAR_CONTEST_LOCATION, 5
-	goto_if_eq LinkContestRoom1_EventScript_27A955
-	msgbox LinkContestRoom1_Text_27BAAC, MSGBOX_DEFAULT
+ContestHall_EventScript_JudgeLooksReady:: @ 827A941
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
+	goto_if_eq ContestHall_EventScript_JudgeLooksReadyLink
+	msgbox ContestHall_Text_JudgeLooksReady, MSGBOX_DEFAULT
 	return
 
-LinkContestRoom1_EventScript_27A955:: @ 827A955
-	call LinkContestRoom1_EventScript_27A133
-	messageautoscroll LinkContestRoom1_Text_27BAAC
+ContestHall_EventScript_JudgeLooksReadyLink:: @ 827A955
+	call ContestHall_EventScript_TryWaitForLink
+	messageautoscroll ContestHall_Text_JudgeLooksReady
 	waitmessage
 	delay 30
 	return
 
-LinkContestRoom1_EventScript_27A964:: @ 827A964
-	compare VAR_CONTEST_LOCATION, 5
-	goto_if_eq LinkContestRoom1_EventScript_27A978
-	msgbox LinkContestRoom1_Text_27BB25, MSGBOX_DEFAULT
+ContestHall_EventScript_WeWillDeclareWinner:: @ 827A964
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
+	goto_if_eq ContestHall_EventScript_WeWillDeclareWinnerLink
+	msgbox ContestHall_Text_WeWillNowDeclareWinner, MSGBOX_DEFAULT
 	return
 
-LinkContestRoom1_EventScript_27A978:: @ 827A978
-	call LinkContestRoom1_EventScript_27A133
-	messageautoscroll LinkContestRoom1_Text_27BB25
+ContestHall_EventScript_WeWillDeclareWinnerLink:: @ 827A978
+	call ContestHall_EventScript_TryWaitForLink
+	messageautoscroll ContestHall_Text_WeWillNowDeclareWinner
 	waitmessage
 	delay 30
 	return
 
-LinkContestRoom1_EventScript_27A987:: @ 827A987
-	special sub_80F831C
+ContestHall_EventScript_GetWinnerObjEventId:: @ 827A987
+	special GetContestWinnerId
 	switch VAR_0x8005
-	case 0, LinkContestRoom1_EventScript_27A9BC
-	case 1, LinkContestRoom1_EventScript_27A9C2
-	case 2, LinkContestRoom1_EventScript_27A9C8
-	case 3, LinkContestRoom1_EventScript_27A9CE
+	case 0, ContestHall_EventScript_GetPlayer1ObjEventId
+	case 1, ContestHall_EventScript_GetPlayer2ObjEventId
+	case 2, ContestHall_EventScript_GetPlayer3ObjEventId
+	case 3, ContestHall_EventScript_GetPlayer4ObjEventId
 	return
 
-LinkContestRoom1_EventScript_27A9BC:: @ 827A9BC
+ContestHall_EventScript_GetPlayer1ObjEventId:: @ 827A9BC
 	setvar VAR_TEMP_3, 3
 	return
 
-LinkContestRoom1_EventScript_27A9C2:: @ 827A9C2
+ContestHall_EventScript_GetPlayer2ObjEventId:: @ 827A9C2
 	setvar VAR_TEMP_3, 4
 	return
 
-LinkContestRoom1_EventScript_27A9C8:: @ 827A9C8
+ContestHall_EventScript_GetPlayer3ObjEventId:: @ 827A9C8
 	setvar VAR_TEMP_3, 5
 	return
 
-LinkContestRoom1_EventScript_27A9CE:: @ 827A9CE
+ContestHall_EventScript_GetPlayer4ObjEventId:: @ 827A9CE
 	setvar VAR_TEMP_3, 14
 	return
 
-LinkContestRoom1_EventScript_27A9D4:: @ 827A9D4
-	special sub_80F834C
-	special sub_80F8390
+ContestHall_EventScript_CongratulateWinner:: @ 827A9D4
+	special BufferContestWinnerTrainerName
+	special BufferContestWinnerMonName
 	addvar VAR_0x8005, 1
 	buffernumberstring 1, VAR_0x8005
-	addvar VAR_0x8005, 65535
-	call LinkContestRoom1_EventScript_27AA00
-	applymovement VAR_TEMP_3, LinkContestRoom1_Movement_27AD1D
+	addvar VAR_0x8005, -1
+	call ContestHall_EventScript_CongratsWinner
+	applymovement VAR_TEMP_3, ContestHall_Movement_WinningPlayerWalkUp
 	waitmovement 0
 	playse SE_W227B
 	setvar VAR_TEMP_1, 0
 	return
 
-LinkContestRoom1_EventScript_27AA00:: @ 827AA00
-	compare VAR_CONTEST_LOCATION, 5
-	goto_if_eq LinkContestRoom1_EventScript_27AA14
-	msgbox LinkContestRoom1_Text_27BB4C, MSGBOX_DEFAULT
+ContestHall_EventScript_CongratsWinner:: @ 827AA00
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
+	goto_if_eq ContestHall_EventScript_CongratsWinnerLink
+	msgbox ContestHall_Text_CongratsTrainerXandMon, MSGBOX_DEFAULT
 	return
 
-LinkContestRoom1_EventScript_27AA14:: @ 827AA14
-	messageautoscroll LinkContestRoom1_Text_27BB4C
+ContestHall_EventScript_CongratsWinnerLink:: @ 827AA14
+	messageautoscroll ContestHall_Text_CongratsTrainerXandMon
 	waitmessage
 	return
 
-LinkContestRoom1_EventScript_27AA1B:: @ 827AA1B
+ContestHall_EventScript_AudienceLookAround:: @ 827AA1B
 	addvar VAR_TEMP_1, 1
 	lockall
-	compare VAR_CONTEST_LOCATION, 1
-	call_if_gt LinkContestRoom1_EventScript_27AA6F
-	applymovement 9, LinkContestRoom1_Movement_27AD3B
-	applymovement 12, LinkContestRoom1_Movement_27AD3F
-	applymovement 7, LinkContestRoom1_Movement_27AD3B
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_NORMAL
+	call_if_gt ContestHall_EventScript_VObjectAudienceLookAround
+	applymovement 9, ContestHall_Movement_AudienceMemberLookRight
+	applymovement 12, ContestHall_Movement_AudienceMemberLookDown
+	applymovement 7, ContestHall_Movement_AudienceMemberLookRight
 	delay 30
-	applymovement 10, LinkContestRoom1_Movement_27AD33
-	applymovement 11, LinkContestRoom1_Movement_27AD3F
-	applymovement 6, LinkContestRoom1_Movement_27AD37
-	applymovement 8, LinkContestRoom1_Movement_27AD33
+	applymovement 10, ContestHall_Movement_AudienceMemberLookLeft
+	applymovement 11, ContestHall_Movement_AudienceMemberLookDown
+	applymovement 6, ContestHall_Movement_AudienceMemberLookUp
+	applymovement 8, ContestHall_Movement_AudienceMemberLookLeft
 	compare VAR_TEMP_1, 4
-	goto_if_ne LinkContestRoom1_EventScript_27AA1B
+	goto_if_ne ContestHall_EventScript_AudienceLookAround
 	delay 30
 	return
 
-LinkContestRoom1_EventScript_27AA6F:: @ 827AA6F
+ContestHall_EventScript_VObjectAudienceLookAround:: @ 827AA6F
 	turnvobject 0, DIR_SOUTH
 	turnvobject 2, DIR_SOUTH
 	turnvobject 4, DIR_EAST
@@ -1080,233 +1091,236 @@ LinkContestRoom1_EventScript_27AA6F:: @ 827AA6F
 	delay 10
 	return
 
-LinkContestRoom1_EventScript_27AB36:: @ 827AB36
-	compare VAR_CONTEST_LOCATION, 5
-	goto_if_eq LinkContestRoom1_EventScript_27ABD8
-	call LinkContestRoom1_EventScript_27AB9E
-	goto_if_set FLAG_TEMP_2, LinkContestRoom1_EventScript_27AB82
+ContestHall_EventScript_GiveWinnerPrize:: @ 827AB36
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
+	goto_if_eq ContestHall_EventScript_EndLinkContest
+	call ContestHall_EventScript_CheckShouldSkipPrize
+	goto_if_set FLAG_TEMP_2, ContestHall_EventScript_SkipPrize
 	lockall
-	msgbox LinkContestRoom1_Text_27BBA8, MSGBOX_DEFAULT
+	msgbox ContestHall_Text_AcceptYourPrize, MSGBOX_DEFAULT
 	releaseall
-	call LinkContestRoom1_EventScript_27ABF8
-	call LinkContestRoom1_EventScript_27AC5E
+	call ContestHall_EventScript_WinnerApproachForPrize
+	call ContestHall_EventScript_GivePrizeIfWinner
 	playse SE_W227B
 	setvar VAR_TEMP_1, 0
-	call LinkContestRoom1_EventScript_27AA1B
+	call ContestHall_EventScript_AudienceLookAround
 	delay 30
-	special sub_80F88E8
-	compare VAR_0x8004, 1
-	goto_if_eq LinkContestRoom1_EventScript_27ABD2
+	special ShouldReadyContestArtist
+	compare VAR_0x8004, TRUE
+	goto_if_eq ContestHall_EventScript_SetReadyForContestArtist
 	return
 
-LinkContestRoom1_EventScript_27AB82:: @ 827AB82
+ContestHall_EventScript_SkipPrize:: @ 827AB82
 	lockall
-	msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT
+	msgbox ContestHall_Text_CongratsPleaseCompeteAgain, MSGBOX_DEFAULT
 	releaseall
 	delay 90
-	special sub_80F88E8
-	compare VAR_0x8004, 1
-	goto_if_eq LinkContestRoom1_EventScript_27ABD2
+	special ShouldReadyContestArtist
+	compare VAR_0x8004, TRUE
+	goto_if_eq ContestHall_EventScript_SetReadyForContestArtist
 	return
 
-LinkContestRoom1_EventScript_27AB9E:: @ 827AB9E
-	specialvar VAR_RESULT, sub_80F7F7C
-	compare VAR_RESULT, 1
-	goto_if_eq LinkContestRoom1_EventScript_27ABAF
+ContestHall_EventScript_CheckShouldSkipPrize:: @ 827AB9E
+	specialvar VAR_RESULT, HasMonWonThisContestBefore
+	compare VAR_RESULT, TRUE
+	goto_if_eq ContestHall_EventScript_CheckPlayerWon
 	return
 
-LinkContestRoom1_EventScript_27ABAF:: @ 827ABAF
-	special sub_80F831C
+ContestHall_EventScript_CheckPlayerWon:: @ 827ABAF
+	special GetContestWinnerId
 	compare VAR_0x8005, 3
-	goto_if_eq LinkContestRoom1_EventScript_27ABBE
+	goto_if_eq ContestHall_EventScript_CheckRankIsMaster
 	return
 
-LinkContestRoom1_EventScript_27ABBE:: @ 827ABBE
-	compare VAR_CONTEST_RANK, 3
-	goto_if_eq LinkContestRoom1_EventScript_27ABCD
+ContestHall_EventScript_CheckRankIsMaster:: @ 827ABBE
+	compare VAR_CONTEST_RANK, CONTEST_RANK_MASTER
+	goto_if_eq ContestHall_EventScript_DontSkipPrize
 	setflag FLAG_TEMP_2
 	return
 
-LinkContestRoom1_EventScript_27ABCD:: @ 827ABCD
+ContestHall_EventScript_DontSkipPrize:: @ 827ABCD
 	return
 
-LinkContestRoom1_EventScript_27ABCE:: @ 827ABCE
+@ This flag is never read
+ContestHall_EventScript_SetSketchFlag:: @ 827ABCE
 	setflag FLAG_CONTEST_SKETCH_CREATED
 	return
 
-LinkContestRoom1_EventScript_27ABD2:: @ 827ABD2
+ContestHall_EventScript_SetReadyForContestArtist:: @ 827ABD2
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1
 	return
 
-LinkContestRoom1_EventScript_27ABD8:: @ 827ABD8
+ContestHall_EventScript_EndLinkContest:: @ 827ABD8
 	delay 60
-	special sub_80F84B0
-	special sub_80F831C
-	special sub_80F88E8
-	compare VAR_0x8004, 1
-	goto_if_eq LinkContestRoom1_EventScript_27ABF1
+	special GetContestPlayerId
+	special GetContestWinnerId
+	special ShouldReadyContestArtist
+	compare VAR_0x8004, TRUE
+	goto_if_eq ContestHall_EventScript_SetReadyForLinkContestArtist
 	closemessage
 	return
 
-LinkContestRoom1_EventScript_27ABF1:: @ 827ABF1
+ContestHall_EventScript_SetReadyForLinkContestArtist:: @ 827ABF1
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2
 	return
 
-LinkContestRoom1_EventScript_27ABF7:: @ 827ABF7
+@ Unused
+ContestHall_EventScript_Ret:: @ 827ABF7
 	return
 
-LinkContestRoom1_EventScript_27ABF8:: @ 827ABF8
+ContestHall_EventScript_WinnerApproachForPrize:: @ 827ABF8
 	switch VAR_0x8005
-	case 0, LinkContestRoom1_EventScript_27AC2A
-	case 1, LinkContestRoom1_EventScript_27AC37
-	case 2, LinkContestRoom1_EventScript_27AC44
-	case 3, LinkContestRoom1_EventScript_27AC51
+	case 0, ContestHall_EventScript_Player1ApproachForPrize
+	case 1, ContestHall_EventScript_Player2ApproachForPrize
+	case 2, ContestHall_EventScript_Player3ApproachForPrize
+	case 3, ContestHall_EventScript_Player4ApproachForPrize
 	return
 
-LinkContestRoom1_EventScript_27AC2A:: @ 827AC2A
+ContestHall_EventScript_Player1ApproachForPrize:: @ 827AC2A
 	lockall
-	applymovement VAR_TEMP_3, LinkContestRoom1_Movement_27AD7A
+	applymovement VAR_TEMP_3, ContestHall_Movement_Player1ApproachForPrize
 	waitmovement 0
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27AC37:: @ 827AC37
+ContestHall_EventScript_Player2ApproachForPrize:: @ 827AC37
 	lockall
-	applymovement VAR_TEMP_3, LinkContestRoom1_Movement_27AD7E
+	applymovement VAR_TEMP_3, ContestHall_Movement_Player2ApproachForPrize
 	waitmovement 0
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27AC44:: @ 827AC44
+ContestHall_EventScript_Player3ApproachForPrize:: @ 827AC44
 	lockall
-	applymovement VAR_TEMP_3, LinkContestRoom1_Movement_27AD29
+	applymovement VAR_TEMP_3, ContestHall_Movement_Player3ApproachForPrize
 	waitmovement 0
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27AC51:: @ 827AC51
+ContestHall_EventScript_Player4ApproachForPrize:: @ 827AC51
 	lockall
-	applymovement VAR_TEMP_3, LinkContestRoom1_Movement_27AD2D
+	applymovement VAR_TEMP_3, ContestHall_Movement_Player4ApproachForPrize
 	waitmovement 0
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27AC5E:: @ 827AC5E
-	special sub_80F831C
+@ In NPC Contests, the player is always entry 4 (id number 3)
+ContestHall_EventScript_GivePrizeIfWinner:: @ 827AC5E
+	special GetContestWinnerId
 	compare VAR_0x8005, 3
-	goto_if_eq LinkContestRoom1_EventScript_27AC77
+	goto_if_eq ContestHall_EventScript_GiveContestPrizes
 	lockall
-	msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT
+	msgbox ContestHall_Text_CongratsPleaseCompeteAgain, MSGBOX_DEFAULT
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27AC77:: @ 827AC77
-	compare VAR_CONTEST_LOCATION, 2
-	call_if_eq LinkContestRoom1_EventScript_27ABCE
-	specialvar VAR_RESULT, sub_80F7F7C
-	compare VAR_RESULT, 0
-	goto_if_eq LinkContestRoom1_EventScript_27ACDF
-	compare VAR_CONTEST_RANK, 3
-	goto_if_eq LinkContestRoom1_EventScript_27ACBD
+ContestHall_EventScript_GiveContestPrizes:: @ 827AC77
+	compare VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_SUPER
+	call_if_eq ContestHall_EventScript_SetSketchFlag
+	specialvar VAR_RESULT, HasMonWonThisContestBefore
+	compare VAR_RESULT, FALSE
+	goto_if_eq ContestHall_EventScript_ReceiveContestRibbon
+	compare VAR_CONTEST_RANK, CONTEST_RANK_MASTER
+	goto_if_eq ContestHall_EventScript_GiveLuxuryBall
 	lockall
-	msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT
+	msgbox ContestHall_Text_CongratsPleaseCompeteAgain, MSGBOX_DEFAULT
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27ACA8:: @ 827ACA8
+ContestHall_EventScript_NoRoomForLuxuryBall:: @ 827ACA8
 	lockall
 	call Common_EventScript_BagIsFull
-	msgbox LinkContestRoom1_Text_27BC2F, MSGBOX_DEFAULT
+	msgbox ContestHall_Text_PickUpPrizeAtCounterLater, MSGBOX_DEFAULT
 	releaseall
 	setvar VAR_CONTEST_PRIZE_PICKUP, 4
 	return
 
-LinkContestRoom1_EventScript_27ACBD:: @ 827ACBD
+ContestHall_EventScript_GiveLuxuryBall:: @ 827ACBD
 	giveitem_std ITEM_LUXURY_BALL
-	compare VAR_RESULT, 0
-	goto_if_eq LinkContestRoom1_EventScript_27ACA8
+	compare VAR_RESULT, FALSE
+	goto_if_eq ContestHall_EventScript_NoRoomForLuxuryBall
 	lockall
-	msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT
+	msgbox ContestHall_Text_CongratsPleaseCompeteAgain, MSGBOX_DEFAULT
 	releaseall
 	return
 
-LinkContestRoom1_EventScript_27ACDF:: @ 827ACDF
-	special sub_80F7FFC
+ContestHall_EventScript_ReceiveContestRibbon:: @ 827ACDF
+	special GiveMonContestRibbon
 	incrementgamestat GAME_STAT_RECEIVED_RIBBONS
 	setflag FLAG_SYS_RIBBON_GET
 	lockall
-	msgbox LinkContestRoom1_Text_27BBD4, MSGBOX_DEFAULT
+	msgbox ContestHall_Text_ConferRibbonAsPrize, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA4
-	msgbox LinkContestRoom1_Text_27BC00, MSGBOX_DEFAULT
+	msgbox ContestHall_Text_ReceivedRibbon, MSGBOX_DEFAULT
 	waitfanfare
-	special sub_80F8390
-	msgbox LinkContestRoom1_Text_27BC16, MSGBOX_DEFAULT
+	special BufferContestWinnerMonName
+	msgbox ContestHall_Text_PutRibbonOnMon, MSGBOX_DEFAULT
 	releaseall
 	return
 
-LinkContestRoom1_Movement_27AD09: @ 827AD09
+ContestHall_Movement_MCWalkDown: @ 827AD09
 	walk_down
 	step_end
 
-LinkContestRoom1_Movement_27AD0B: @ 827AD0B
+ContestHall_Movement_MCBackUp: @ 827AD0B
 	lock_facing_direction
 	walk_up
 	unlock_facing_direction
 	step_end
 
-LinkContestRoom1_Movement_27AD0F: @ 827AD0F
+ContestHall_Movement_MCFaceJudge: @ 827AD0F
 	walk_in_place_fastest_right
 	step_end
 
-LinkContestRoom1_Movement_27AD11: @ 827AD11
+ContestHall_Movement_Heart: @ 827AD11
 	emote_heart
 	step_end
 
-LinkContestRoom1_Movement_27AD13: @ 827AD13
+ContestHall_Movement_FaceContestants: @ 827AD13
 	walk_in_place_fastest_down
 	step_end
 
-LinkContestRoom1_Movement_27AD15: @ 827AD15
+ContestHall_Movement_WalkStageLeft: @ 827AD15
 	walk_left
 	walk_left
 	walk_in_place_fastest_down
 	step_end
 
-LinkContestRoom1_Movement_27AD19: @ 827AD19
+ContestHall_Movement_WalkStageRight: @ 827AD19
 	walk_right
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-LinkContestRoom1_Movement_27AD1D: @ 827AD1D
+ContestHall_Movement_WinningPlayerWalkUp: @ 827AD1D
 	walk_up
 	walk_in_place_fastest_down
 	step_end
 
-LinkContestRoom1_Movement_27AD20: @ 827AD20
+ContestHall_Movement_ContestantDelay32: @ 827AD20
 	delay_16
 	delay_16
 	step_end
 
-LinkContestRoom1_Movement_27AD23: @ 827AD23
+ContestHall_Movement_MCFaceJudge2: @ 827AD23
 	walk_in_place_fastest_right
 	step_end
 
-LinkContestRoom1_Movement_27AD25: @ 827AD25
+ContestHall_Movement_JudgeFaceMC: @ 827AD25
 	walk_in_place_fastest_left
 	step_end
 
-LinkContestRoom1_Movement_27AD27: @ 827AD27
+ContestHall_Movement_FaceContestants2: @ 827AD27
 	walk_in_place_fastest_down
 	step_end
 
-LinkContestRoom1_Movement_27AD29: @ 827AD29
+ContestHall_Movement_Player3ApproachForPrize: @ 827AD29
 	walk_left
 	walk_left
 	walk_up
 	step_end
 
-LinkContestRoom1_Movement_27AD2D: @ 827AD2D
+ContestHall_Movement_Player4ApproachForPrize: @ 827AD2D
 	walk_left
 	walk_left
 	walk_left
@@ -1314,54 +1328,54 @@ LinkContestRoom1_Movement_27AD2D: @ 827AD2D
 	walk_up
 	step_end
 
-LinkContestRoom1_Movement_27AD33: @ 827AD33
+ContestHall_Movement_AudienceMemberLookLeft: @ 827AD33
 	face_left
 	delay_16
 	face_original_direction
 	step_end
 
-LinkContestRoom1_Movement_27AD37: @ 827AD37
+ContestHall_Movement_AudienceMemberLookUp: @ 827AD37
 	face_up
 	delay_16
 	face_original_direction
 	step_end
 
-LinkContestRoom1_Movement_27AD3B: @ 827AD3B
+ContestHall_Movement_AudienceMemberLookRight: @ 827AD3B
 	face_right
 	delay_16
 	face_original_direction
 	step_end
 
-LinkContestRoom1_Movement_27AD3F: @ 827AD3F
+ContestHall_Movement_AudienceMemberLookDown: @ 827AD3F
 	face_down
 	delay_16
 	face_original_direction
 	step_end
 
-LinkContestRoom1_Movement_27AD43: @ 827AD43
+ContestHall_Movement_Player4FaceUp: @ 827AD43
 	face_up
 	step_end
 
-LinkContestRoom1_Movement_27AD45: @ 827AD45
+ContestHall_Movement_MCLookAtJudge: @ 827AD45
 	face_up
 	delay_16
 	walk_in_place_fastest_right
 	step_end
 
-LinkContestRoom1_Movement_27AD49: @ 827AD49
+ContestHall_Movement_JudgeLookAtMC: @ 827AD49
 	walk_in_place_fastest_left
 	delay_16
 	delay_16
 	walk_in_place_fastest_down
 	step_end
 
-LinkContestRoom1_Movement_27AD4E: @ 827AD4E
+ContestHall_Movement_MCWalkInPlaceDown: @ 827AD4E
 	delay_16
 	delay_16
 	walk_in_place_fastest_down
 	step_end
 
-LinkContestRoom1_Movement_27AD52: @ 827AD52
+ContestHall_Movement_Player1WalkToCenter: @ 827AD52
 	walk_up
 	walk_right
 	walk_right
@@ -1369,7 +1383,7 @@ LinkContestRoom1_Movement_27AD52: @ 827AD52
 	walk_in_place_fastest_up
 	step_end
 
-LinkContestRoom1_Movement_27AD58: @ 827AD58
+ContestHall_Movement_Player1WalkBack: @ 827AD58
 	walk_fast_left
 	walk_fast_left
 	walk_fast_left
@@ -1377,31 +1391,31 @@ LinkContestRoom1_Movement_27AD58: @ 827AD58
 	walk_in_place_fastest_up
 	step_end
 
-LinkContestRoom1_Movement_27AD5E: @ 827AD5E
+ContestHall_Movement_Player2WalkToCenter: @ 827AD5E
 	walk_up
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-LinkContestRoom1_Movement_27AD62: @ 827AD62
+ContestHall_Movement_Player2WalkBack: @ 827AD62
 	walk_fast_left
 	walk_fast_down
 	walk_in_place_fastest_up
 	step_end
 
-LinkContestRoom1_Movement_27AD66: @ 827AD66
+ContestHall_Movement_Player3WalkToCenter: @ 827AD66
 	walk_up
 	walk_left
 	walk_in_place_fastest_up
 	step_end
 
-LinkContestRoom1_Movement_27AD6A: @ 827AD6A
+ContestHall_Movement_Player3WalkBack: @ 827AD6A
 	walk_fast_right
 	walk_fast_down
 	walk_in_place_fastest_up
 	step_end
 
-LinkContestRoom1_Movement_27AD6E: @ 827AD6E
+ContestHall_Movement_Player4WalkToCenter: @ 827AD6E
 	walk_up
 	walk_left
 	walk_left
@@ -1409,7 +1423,7 @@ LinkContestRoom1_Movement_27AD6E: @ 827AD6E
 	walk_in_place_fastest_up
 	step_end
 
-LinkContestRoom1_Movement_27AD74: @ 827AD74
+ContestHall_Movement_Player4WalkBack: @ 827AD74
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
@@ -1417,36 +1431,37 @@ LinkContestRoom1_Movement_27AD74: @ 827AD74
 	walk_in_place_fastest_up
 	step_end
 
-LinkContestRoom1_Movement_27AD7A: @ 827AD7A
+ContestHall_Movement_Player1ApproachForPrize: @ 827AD7A
 	walk_right
 	walk_right
 	walk_up
 	step_end
 
-LinkContestRoom1_Movement_27AD7E: @ 827AD7E
+ContestHall_Movement_Player2ApproachForPrize: @ 827AD7E
 	walk_up
 	step_end
 
-LinkContestRoom1_EventScript_27AD80:: @ 827AD80
-	specialvar VAR_RESULT, sub_80F9134
-	compare VAR_RESULT, 1
-	goto_if_eq LinkContestRoom1_EventScript_27AD91
+@ IsContestWithRSPlayer has no side effect, so this is nop
+ContestHall_EventScript_CheckIfContestWithRSPlayer:: @ 827AD80
+	specialvar VAR_RESULT, IsContestWithRSPlayer
+	compare VAR_RESULT, TRUE
+	goto_if_eq ContestHall_EventScript_RetRSPlayer
 	return
 
-LinkContestRoom1_EventScript_27AD91:: @ 827AD91
+ContestHall_EventScript_RetRSPlayer:: @ 827AD91
 	return
 
-LilycoveCity_ContestLobby_EventScript_27AD92:: @ 827AD92
-	specialvar VAR_RESULT, sub_80F9134
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_27ADA3
+LilycoveCity_ContestLobby_EventScript_DelayIfContestWithRSPlayer:: @ 827AD92
+	specialvar VAR_RESULT, IsContestWithRSPlayer
+	compare VAR_RESULT, TRUE
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_DelayForRSPlayer
 	return
 
-LilycoveCity_ContestLobby_EventScript_27ADA3:: @ 827ADA3
+LilycoveCity_ContestLobby_EventScript_DelayForRSPlayer:: @ 827ADA3
 	delay 9
 	return
 
-LilycoveCity_ContestLobby_Text_27ADA7: @ 827ADA7
+LilycoveCity_ContestLobby_Text_ReceptionDontHavePokeblockCase: @ 827ADA7
 	.string "Hello!\p"
 	.string "This is the reception counter for\n"
 	.string "POKéMON CONTESTS.\p"
@@ -1455,31 +1470,32 @@ LilycoveCity_ContestLobby_Text_27ADA7: @ 827ADA7
 	.string "In that case, we need to provide you\n"
 	.string "with this!$"
 
-LilycoveCity_ContestLobby_Text_27AE47: @ 827AE47
+LilycoveCity_ContestLobby_Text_NowThatWeveClearedThatUp: @ 827AE47
 	.string "Okay, now that we've cleared that\n"
 	.string "up…\p"
 	.string "Hello!\p"
 	.string "This is the reception counter for\n"
 	.string "POKéMON CONTESTS.$"
 
-LilycoveCity_ContestLobby_Text_ContestReceptionCounter: @ 827AEA8
+LilycoveCity_ContestLobby_Text_ContestReception: @ 827AEA8
 	.string "Hello!\p"
 	.string "This is the reception counter for\n"
 	.string "POKéMON CONTESTS.$"
 
-LilycoveCity_ContestLobby_Text_27AEE3: @ 827AEE3
+@ Unused
+LilycoveCity_ContestLobby_Text_CounterOnlyFor4PlayerContests: @ 827AEE3
 	.string "Hello!\p"
 	.string "This reception counter is only\n"
 	.string "for 4-player POKéMON CONTESTS.$"
 
-LilycoveCity_ContestLobby_Text_27AF28: @ 827AF28
+LilycoveCity_ContestLobby_Text_EnterContest1: @ 827AF28
 	.string "Would you like to enter your POKéMON\n"
 	.string "in our CONTESTS?$"
 
-LilycoveCity_ContestLobby_Text_27AF5E: @ 827AF5E
+LilycoveCity_ContestLobby_Text_WhichTopic1: @ 827AF5E
 	.string "Which topic would you like?$"
 
-LilycoveCity_ContestLobby_Text_27AF7A: @ 827AF7A
+LilycoveCity_ContestLobby_Text_ExplainContests: @ 827AF7A
 	.string "A POKéMON CONTEST involves four\n"
 	.string "TRAINERS entering one POKéMON each\l"
 	.string "in competitive judging.\p"
@@ -1498,14 +1514,14 @@ LilycoveCity_ContestLobby_Text_27AF7A: @ 827AF7A
 	.string "The POKéMON garnering the highest\n"
 	.string "score is declared the winner.$"
 
-LilycoveCity_ContestLobby_Text_27B17D: @ 827B17D
+LilycoveCity_ContestLobby_Text_ExplainContestTypes: @ 827B17D
 	.string "There are five kinds of CONTESTS.\p"
 	.string "COOL, BEAUTY, CUTE, SMART, and\n"
 	.string "TOUGH are the five categories.\p"
 	.string "Choose the CONTEST that is right for\n"
 	.string "the POKéMON you plan to enter.$"
 
-LilycoveCity_ContestLobby_Text_27B221: @ 827B221
+LilycoveCity_ContestLobby_Text_ExplainContestRanks: @ 827B221
 	.string "There are four ranks of POKéMON\n"
 	.string "CONTESTS.\p"
 	.string "NORMAL, SUPER, HYPER, and MASTER\n"
@@ -1523,77 +1539,77 @@ LilycoveCity_ContestLobby_Text_27B221: @ 827B221
 	.string "may compete in the MASTER Rank as\l"
 	.string "often as its TRAINER wants.$"
 
-LilycoveCity_ContestLobby_Text_27B3FF: @ 827B3FF
+LilycoveCity_ContestLobby_Text_EnterWhichRank: @ 827B3FF
 	.string "Which Rank would you like to enter?$"
 
-LilycoveCity_ContestLobby_Text_27B423: @ 827B423
+LilycoveCity_ContestLobby_Text_EnterWhichContest1: @ 827B423
 	.string "Which CONTEST would you like to enter?$"
 
-LilycoveCity_ContestLobby_Text_27B44A: @ 827B44A
+LilycoveCity_ContestLobby_Text_EnterWhichPokemon1: @ 827B44A
 	.string "Which POKéMON would you like to enter?$"
 
-LilycoveCity_ContestLobby_Text_27B471: @ 827B471
+LilycoveCity_ContestLobby_Text_MonNotQualifiedForRank: @ 827B471
 	.string "I'm terribly sorry, but your POKéMON\n"
 	.string "is not qualified to compete at this\l"
 	.string "Rank yet…$"
 
-LilycoveCity_ContestLobby_Text_27B4C4: @ 827B4C4
+LilycoveCity_ContestLobby_Text_EggCannotTakePart: @ 827B4C4
 	.string "I'm sorry, but an EGG cannot take part\n"
 	.string "in a POKéMON CONTEST.$"
 
-LilycoveCity_ContestLobby_Text_27B501: @ 827B501
+LilycoveCity_ContestLobby_Text_MonInNoConditionForContest: @ 827B501
 	.string "Your POKéMON appears to be in no\n"
 	.string "condition to take part in a CONTEST…$"
 
-LilycoveCity_ContestLobby_Text_27B547: @ 827B547
+LilycoveCity_ContestLobby_Text_AlreadyWonEnterAnyway: @ 827B547
 	.string "Oh, but that RIBBON…\p"
 	.string "Your POKéMON has won this CONTEST\n"
 	.string "before, hasn't it?\p"
 	.string "Would you like to enter it in this\n"
 	.string "CONTEST anyway?$"
 
-LilycoveCity_ContestLobby_Text_27B5C4: @ 827B5C4
+LilycoveCity_ContestLobby_Text_ConfirmContestMon: @ 827B5C4
 	.string "Is that your CONTEST POKéMON?$"
 
-LilycoveCity_ContestLobby_Text_27B5E2: @ 827B5E2
+LilycoveCity_ContestLobby_Text_YourMonIsEntryNum4: @ 827B5E2
 	.string "Okay, your POKéMON will be entered\n"
 	.string "in this CONTEST.\p"
 	.string "Your POKéMON is Entry No. 4.\n"
 	.string "The CONTEST will begin shortly.$"
 
-LilycoveCity_ContestLobby_Text_27B653: @ 827B653
+LilycoveCity_ContestLobby_Text_ComeThroughHere: @ 827B653
 	.string "Please come in through here.\n"
 	.string "Good luck!$"
 
-LilycoveCity_ContestLobby_Text_27B67B: @ 827B67B
+LilycoveCity_ContestLobby_Text_PokemonWonWeHavePrize: @ 827B67B
 	.string "Congratulations! Your POKéMON is the\n"
 	.string "CONTEST winner!\p"
 	.string "We have your prize right here.\n"
 	.string "Please, right this way!$"
 
-LilycoveCity_ContestLobby_Text_27B6E7: @ 827B6E7
+LilycoveCity_ContestLobby_Text_ComeBackForPrizeLater: @ 827B6E7
 	.string "Please come back for your prize\n"
 	.string "later on.$"
 
-LinkContestRoom1_Text_27B711: @ 827B711
+ContestHall_Text_GettingStartedParticipantsAsFollows: @ 827B711
 	.string "MC: Hello! We're just getting started\n"
 	.string "with a {STR_VAR_3} Rank POKéMON\l"
 	.string "{STR_VAR_2}!\p"
 	.string "The participating TRAINERS and their\n"
 	.string "POKéMON are as follows:$"
 
-LinkContestRoom1_Text_27B78F: @ 827B78F
+ContestHall_Text_GettingStartedParticipantsAsFollowsLink: @ 827B78F
 	.string "MC: Hello! We're just getting started\n"
 	.string "with a 4-player linked POKéMON\l"
 	.string "{STR_VAR_2}!\p"
 	.string "The participating TRAINERS and their\n"
 	.string "POKéMON are as follows:$"
 
-LinkContestRoom1_Text_27B815: @ 827B815
+ContestHall_Text_EntryXTrainersMon: @ 827B815
 	.string "MC: Entry No. {STR_VAR_2}!\n"
 	.string "{STR_VAR_1}'s {STR_VAR_3}!$"
 
-LinkContestRoom1_Text_27B830: @ 827B830
+ContestHall_Text_SeenContestantsAudienceWillVote: @ 827B830
 	.string "MC: We've just seen the four POKéMON\n"
 	.string "contestants.\p"
 	.string "Now it's time for primary judging!\p"
@@ -1602,10 +1618,10 @@ LinkContestRoom1_Text_27B830: @ 827B830
 	.string "Without any further ado, let the\n"
 	.string "voting begin!$"
 
-LinkContestRoom1_Text_27B8F2: @ 827B8F2
+ContestHall_Text_VotingUnderWay: @ 827B8F2
 	.string "Voting under way…$"
 
-LinkContestRoom1_Text_27B904: @ 827B904
+ContestHall_Text_VotingCompleteLetsAppeal: @ 827B904
 	.string "Voting is now complete!\p"
 	.string "While the votes are being tallied,\n"
 	.string "let's move on to secondary judging!\p"
@@ -1616,72 +1632,75 @@ LinkContestRoom1_Text_27B904: @ 827B904
 	.string "Let's see a little enthusiasm!\n"
 	.string "Let's appeal!$"
 
-LinkContestRoom1_Text_27BA15: @ 827BA15
+ContestHall_Text_ThatsItForJudging: @ 827BA15
 	.string "MC: That's it for judging!$"
 
-LinkContestRoom1_Text_27BA30: @ 827BA30
+ContestHall_Text_ThankYouForAppeals: @ 827BA30
 	.string "Thank you all for a most wonderful\n"
 	.string "display of quality appeals!\p"
 	.string "This concludes all judging!\n"
 	.string "Thank you for your fine efforts!$"
 
-LinkContestRoom1_Text_27BAAC: @ 827BAAC
+ContestHall_Text_JudgeLooksReady: @ 827BAAC
 	.string "Now, all that remains is the pulse-\n"
 	.string "pounding proclamation of the winner.\p"
 	.string "The JUDGE looks ready to make\n"
 	.string "the announcement!$"
 
-LinkContestRoom1_Text_27BB25: @ 827BB25
+ContestHall_Text_WeWillNowDeclareWinner: @ 827BB25
 	.string "JUDGE: We will now declare the winner!$"
 
-LinkContestRoom1_Text_27BB4C: @ 827BB4C
+ContestHall_Text_CongratsTrainerXandMon: @ 827BB4C
 	.string "MC: Entry No. {STR_VAR_2}!\p"
 	.string "{STR_VAR_3} and {STR_VAR_1},\n"
 	.string "congratulations!$"
 
-LinkContestRoom1_Text_27BB7A: @ 827BB7A
+ContestHall_Text_CongratsPleaseCompeteAgain: @ 827BB7A
 	.string "MC: Congratulations!\n"
 	.string "Please do compete again!$"
 
-LinkContestRoom1_Text_27BBA8: @ 827BBA8
+ContestHall_Text_AcceptYourPrize: @ 827BBA8
 	.string "MC: Here you are!\n"
 	.string "Please accept your prize!$"
 
-LinkContestRoom1_Text_27BBD4: @ 827BBD4
+ContestHall_Text_ConferRibbonAsPrize: @ 827BBD4
 	.string "We confer on you this RIBBON\n"
 	.string "as your prize!$"
 
-LinkContestRoom1_Text_27BC00: @ 827BC00
+ContestHall_Text_ReceivedRibbon: @ 827BC00
 	.string "{PLAYER} received a RIBBON.$"
 
-LinkContestRoom1_Text_27BC16: @ 827BC16
+ContestHall_Text_PutRibbonOnMon: @ 827BC16
 	.string "{PLAYER} put the RIBBON on\n"
 	.string "{STR_VAR_1}.$"
 
-LinkContestRoom1_Text_27BC2F: @ 827BC2F
+ContestHall_Text_PickUpPrizeAtCounterLater: @ 827BC2F
 	.string "Please pick up your prize at\n"
 	.string "the reception counter later.\l"
 	.string "Please do compete again!$"
 
-LinkContestRoom1_Text_27BC82: @ 827BC82
+@ Unused
+ContestHall_Text_OnlyRegister4Players: @ 827BC82
 	.string "I only register four players for\n"
 	.string "POKéMON CONTESTS.\p"
 	.string "If three other players link up, all\n"
 	.string "four may enter the same CONTEST.\p"
 	.string "Would you like to take part?$"
 
-LilycoveCity_ContestLobby_Text_27BD17: @ 827BD17
+LilycoveCity_ContestLobby_Text_ProgressWillBeSaved: @ 827BD17
 	.string "Before entering a CONTEST, your\n"
 	.string "progress will be saved.$"
 
-LilycoveCity_ContestLobby_Text_27BD4F: @ 827BD4F
+LilycoveCity_ContestLobby_Text_ParticipateAnotherTime: @ 827BD4F
 	.string "We hope you will participate another\n"
 	.string "time.$"
 
-LilycoveCity_ContestLobby_Text_27BD7A: @ 827BD7A
+@ Unused
+LilycoveCity_ContestLobby_Text_EnterContest2: @ 827BD7A
 	.string "Would you like to enter a CONTEST?$"
 
-LilycoveCity_ContestLobby_Text_27BD9D: @ 827BD9D
+@ Unused
+LilycoveCity_ContestLobby_Text_Explain4PlayerContest: @ 827BD9D
 	.string "When four players are ready, connect\n"
 	.string "over a Game Link cable, and register\l"
 	.string "with me, please.\p"
@@ -1692,79 +1711,83 @@ LilycoveCity_ContestLobby_Text_27BD9D: @ 827BD9D
 	.string "After that, the usual CONTEST rules\n"
 	.string "apply.$"
 
-LilycoveCity_ContestLobby_Text_27BE9E: @ 827BE9E
+@ Unused
+LilycoveCity_ContestLobby_Text_EnterWhichContest2: @ 827BE9E
 	.string "Which CONTEST would you like to enter?$"
 
-LilycoveCity_ContestLobby_Text_27BEC5: @ 827BEC5
+@ Unused
+LilycoveCity_ContestLobby_Text_EnterWhichPokemon2: @ 827BEC5
 	.string "Which POKéMON would you like to enter?$"
 
-LilycoveCity_ContestLobby_Text_27BEEC: @ 827BEEC
+LilycoveCity_ContestLobby_Text_Transmitting: @ 827BEEC
 	.string "Transmitting…$"
 
-LilycoveCity_ContestLobby_Text_27BEFA: @ 827BEFA
+LilycoveCity_ContestLobby_Text_TransmissionError: @ 827BEFA
 	.string "Transmission error…$"
 
-LilycoveCity_ContestLobby_Text_27BF0E: @ 827BF0E
+LilycoveCity_ContestLobby_Text_PlayersChoseDifferentContest: @ 827BF0E
 	.string "You may have chosen a different\n"
 	.string "CONTEST than another player.$"
 
-LilycoveCity_ContestLobby_Text_27BF4B: @ 827BF4B
+LilycoveCity_ContestLobby_Text_PlayersMadeDifferentChoice: @ 827BF4B
 	.string "You may have made a different\n"
 	.string "choice than another player.$"
 
-LilycoveCity_ContestLobby_Text_27BF85: @ 827BF85
+LilycoveCity_ContestLobby_Text_PleaseWaitBButtonCancel: @ 827BF85
 	.string "Please wait.\n"
 	.string "… … B Button: Cancel$"
 
-LilycoveCity_ContestLobby_Text_27BFA7: @ 827BFA7
+@ Unused
+LilycoveCity_ContestLobby_Text_ParticipateAnotherTime2: @ 827BFA7
 	.string "We hope you will participate another\n"
 	.string "time.$"
 
-LilycoveCity_ContestLobby_Text_27BFD2: @ 827BFD2
+@ Unused
+LilycoveCity_ContestLobby_Text_TransmissionErrorTryAgain: @ 827BFD2
 	.string "Transmission error.\n"
 	.string "Please try again.$"
 
-LilycoveCity_ContestLobby_Text_27BFF8: @ 827BFF8
+LilycoveCity_ContestLobby_Text_YourMonIsEntryNumX: @ 827BFF8
 	.string "Your POKéMON will be entered in\n"
 	.string "the CONTEST.\p"
 	.string "Your POKéMON is Entry No. {STR_VAR_2}.$"
 
-LilycoveCity_ContestLobby_Text_27C043: @ 827C043
+LilycoveCity_ContestLobby_Text_ContestBeginShortly: @ 827C043
 	.string "The CONTEST will begin shortly.$"
 
-LilycoveCity_ContestLobby_Text_27C063: @ 827C063
+LilycoveCity_ContestLobby_Text_LinkContestReception: @ 827C063
 	.string "Welcome! This is the POKéMON CONTEST\n"
 	.string "link reception counter.\p"
 	.string "You may enter CONTESTS together with\n"
 	.string "one or more friends.$"
 
-LilycoveCity_ContestLobby_Text_27C0DA: @ 827C0DA
+LilycoveCity_ContestLobby_Text_WhichTopic2: @ 827C0DA
 	.string "Which topic would you like?$"
 
-LilycoveCity_ContestLobby_Text_27C0F6: @ 827C0F6
+LilycoveCity_ContestLobby_Text_EnterContest3: @ 827C0F6
 	.string "Would you like to enter a CONTEST?$"
 
-LilycoveCity_ContestLobby_Text_27C119: @ 827C119
+LilycoveCity_ContestLobby_Text_EnterWhichContest3: @ 827C119
 	.string "Which CONTEST would you like to enter?$"
 
-LilycoveCity_ContestLobby_Text_27C140: @ 827C140
+LilycoveCity_ContestLobby_Text_MonInNoCondition2: @ 827C140
 	.string "Your POKéMON appears to be in no\n"
 	.string "condition to take part in a CONTEST…$"
 
-LilycoveCity_ContestLobby_Text_27C186: @ 827C186
+LilycoveCity_ContestLobby_Text_EggCannotTakePart2: @ 827C186
 	.string "I'm sorry, but an EGG cannot take part\n"
 	.string "in a POKéMON CONTEST.$"
 
-LilycoveCity_ContestLobby_Text_27C1C3: @ 827C1C3
+LilycoveCity_ContestLobby_Text_EnterWhichPokemon3: @ 827C1C3
 	.string "Which POKéMON would you like to enter?$"
 
-Text_DecideLinkLeader: @ 827C1EA
+LilycoveCity_ContestLobby_Text_PleaseDecideLinkLeader: @ 827C1EA
 	.string "Please decide which of you will\n"
 	.string "become the GROUP LEADER.\p"
 	.string "The other players must then choose\n"
 	.string "“JOIN GROUP.”$"
 
-LilycoveCity_ContestLobby_Text_27C254: @ 827C254
+LilycoveCity_ContestLobby_Text_PlayerAt4PCounterUseGMode: @ 827C254
 	.string "At least one player has entered using\n"
 	.string "the 4-player reception counter.\p"
 	.string "There must be four players connected\n"
@@ -1773,7 +1796,7 @@ LilycoveCity_ContestLobby_Text_27C254: @ 827C254
 	.string "select G-MODE (GLOBAL MODE),\l"
 	.string "then register to enter again, please.$"
 
-LilycoveCity_ContestLobby_Text_27C340: @ 827C340
+LilycoveCity_ContestLobby_Text_ExplainLinkContest: @ 827C340
 	.string "This is a CONTEST for two to four\n"
 	.string "players linked using a Wireless\l"
 	.string "Adapter or a GBA Game Link cable.\p"
@@ -1794,7 +1817,7 @@ LilycoveCity_ContestLobby_Text_27C340: @ 827C340
 	.string "After that, a CONTEST will start in\n"
 	.string "the usual manner.$"
 
-LilycoveCity_ContestLobby_Text_27C5B1: @ 827C5B1
+LilycoveCity_ContestLobby_Text_ExplainEMode: @ 827C5B1
 	.string "In E-MODE (EMERALD MODE),\n"
 	.string "a LINK CONTEST can be held with\l"
 	.string "two to four players. Each player must\l"
@@ -1808,7 +1831,7 @@ LilycoveCity_ContestLobby_Text_27C5B1: @ 827C5B1
 	.string "Please be aware that E-MODE is not\n"
 	.string "available in POKéMON Ruby or Sapphire.$"
 
-LilycoveCity_ContestLobby_Text_27C742: @ 827C742
+LilycoveCity_ContestLobby_Text_ExplainGMode: @ 827C742
 	.string "G-MODE (GLOBAL MODE) is specifically\n"
 	.string "for four players who are linked using\l"
 	.string "GBA Game Link cables.\p"
@@ -1819,50 +1842,50 @@ LilycoveCity_ContestLobby_Text_27C742: @ 827C742
 	.string "enter through the 4-player reception\l"
 	.string "counter (POKéMON Ruby or Sapphire).$"
 
-LilycoveCity_ContestLobby_Text_27C879: @ 827C879
+LilycoveCity_ContestLobby_Text_NoWirelessAdapterInGMode: @ 827C879
 	.string "I'm terribly sorry.\p"
 	.string "G-MODE does not function\n"
 	.string "with Wireless Adapters.\p"
 	.string "Please select E-MODE or try\n"
 	.string "again using a GBA Game Link cable.$"
 
-LilycoveCity_ContestLobby_Text_27C8FD: @ 827C8FD
+LilycoveCity_ContestLobby_Text_WhichContestMode: @ 827C8FD
 	.string "Which CONTEST MODE would you like\n"
 	.string "to enter?$"
 
-LinkContestRoom1_Text_27C929: @ 827C929
+ContestHall_Text_GettingStartedWireless: @ 827C929
 	.string "MC: Hello! We're just getting started\n"
 	.string "with a 4-player linked POKéMON\l"
 	.string "{STR_VAR_2}!$"
 
-LinkContestRoom1_Text_27C972: @ 827C972
+ContestHall_Text_ParticipantsAsFollows: @ 827C972
 	.string "The participating TRAINERS and their\n"
 	.string "POKéMON are as follows:$"
 
-LinkContestRoom1_Text_27C9AF: @ 827C9AF
+ContestHall_Text_WeveSeenContestants: @ 827C9AF
 	.string "MC: We've just seen the four POKéMON\n"
 	.string "contestants.\p"
 	.string "Now it's time for primary judging!$"
 
-LinkContestRoom1_Text_27CA04: @ 827CA04
+ContestHall_Text_AudienceWillVote: @ 827CA04
 	.string "The audience will vote on their\n"
 	.string "favorite POKéMON contestants.$"
 
-LinkContestRoom1_Text_27CA42: @ 827CA42
+ContestHall_Text_LetVotingBegin: @ 827CA42
 	.string "Without any further ado,\n"
 	.string "let the voting begin!$"
 
-LinkContestRoom1_Text_27CA71: @ 827CA71
+ContestHall_Text_VotingComplete: @ 827CA71
 	.string "Voting is now complete!\p"
 	.string "While the votes are being tallied,\n"
 	.string "let's move on to secondary judging!$"
 
-LinkContestRoom1_Text_27CAD0: @ 827CAD0
+ContestHall_Text_SecondStageOfJudging: @ 827CAD0
 	.string "The second stage of judging is\n"
 	.string "the much-anticipated appeal time!\p"
 	.string "May the contestants amaze us with\n"
 	.string "superb appeals of dazzling moves!$"
 
-LinkContestRoom1_Text_27CB55: @ 827CB55
+ContestHall_Text_LetsAppeal: @ 827CB55
 	.string "Let's see a little enthusiasm!\n"
 	.string "Let's appeal!$"
diff --git a/data/scripts/interview.inc b/data/scripts/interview.inc
index c635144f3..2ae93ce70 100644
--- a/data/scripts/interview.inc
+++ b/data/scripts/interview.inc
@@ -238,27 +238,27 @@ LilycoveCity_ContestLobby_EventScript_28CB21:: @ 828CB21
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_28CB2B:: @ 828CB2B
-	compare VAR_LINK_CONTEST_ROOM_STATE, 2
-	goto_if_ne LilycoveCity_ContestLobby_EventScript_28CB95
+LilycoveCity_ContestLobby_EventScript_TryShowContestReporter:: @ 828CB2B
+	compare VAR_CONTEST_HALL_STATE, 2
+	goto_if_ne LilycoveCity_ContestLobby_EventScript_DontShowContestReporter
 	setvar VAR_0x8005, 6
 	special InterviewBefore
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB95
-	switch VAR_CONTEST_LOCATION
-	case 0, LilycoveCity_ContestLobby_EventScript_28CB95
-	case 2, LilycoveCity_ContestLobby_EventScript_28CB91
-	case 1, LilycoveCity_ContestLobby_EventScript_28CB91
-	case 3, LilycoveCity_ContestLobby_EventScript_28CB91
-	case 4, LilycoveCity_ContestLobby_EventScript_28CB91
-	case 5, LilycoveCity_ContestLobby_EventScript_28CB95
-	end
-
-LilycoveCity_ContestLobby_EventScript_28CB91:: @ 828CB91
+	compare VAR_RESULT, TRUE
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_DontShowContestReporter
+	switch VAR_CONTEST_TYPE
+	case 0, LilycoveCity_ContestLobby_EventScript_DontShowContestReporter
+	case 2, LilycoveCity_ContestLobby_EventScript_ShowContestReporter
+	case 1, LilycoveCity_ContestLobby_EventScript_ShowContestReporter
+	case 3, LilycoveCity_ContestLobby_EventScript_ShowContestReporter
+	case 4, LilycoveCity_ContestLobby_EventScript_ShowContestReporter
+	case 5, LilycoveCity_ContestLobby_EventScript_DontShowContestReporter
+	end
+
+LilycoveCity_ContestLobby_EventScript_ShowContestReporter:: @ 828CB91
 	clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
 	return
 
-LilycoveCity_ContestLobby_EventScript_28CB95:: @ 828CB95
+LilycoveCity_ContestLobby_EventScript_DontShowContestReporter:: @ 828CB95
 	return
 
 BattleFrontier_BattleTowerLobby_EventScript_28CB96:: @ 828CB96
diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc
index 651a85cff..74fff4aea 100644
--- a/data/scripts/new_game.inc
+++ b/data/scripts/new_game.inc
@@ -82,7 +82,7 @@ EventScript_ResetAllBerries:: @ 827149D
 	return
 
 EventScript_ResetAllMapFlags:: @ 82715DE
-	setflag FLAG_LINK_CONTEST_POKE_BALL
+	setflag FLAG_HIDE_CONTEST_POKE_BALL
 	setflag FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE
 	setflag FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE
 	setflag FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE
diff --git a/data/specials.inc b/data/specials.inc
index e087a8421..25be90ced 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -87,23 +87,23 @@ gSpecials:: @ 81DBA64
 	def_special CheckForBigMovieOrEmergencyNewsOnTV
 	def_special GetMomOrDadStringForTVMessage
 	def_special ResetTVShowState
-	def_special sub_80F831C
-	def_special sub_80F84B0
+	def_special GetContestWinnerId
+	def_special GetContestPlayerId
 	def_special sub_80F8814
-	def_special sub_80F834C
-	def_special sub_80F8390
-	def_special sub_80F8850
-	def_special sub_80F82B4
+	def_special BufferContestWinnerTrainerName
+	def_special BufferContestWinnerMonName
+	def_special BufferContestTrainerAndMonNames
+	def_special GetContestMonConditionRanking
 	def_special SetContestTrainerGfxIds
-	def_special sub_80F7F30
+	def_special TryEnterContestMon
 	def_special sub_80F8970
-	def_special sub_80F8AFC
-	def_special sub_80F82FC
-	def_special sub_80F7F7C
-	def_special sub_80F7FFC
-	def_special sub_80F8D24
+	def_special SetLinkContestPlayerGfx
+	def_special GetContestMonCondition
+	def_special HasMonWonThisContestBefore
+	def_special GiveMonContestRibbon
+	def_special IsContestDebugActive
 	def_special GiveMonArtistRibbon
-	def_special sub_80B3000
+	def_special TryContestGModeLinkup
 	def_special SaveGame
 	def_special DoWateringBerryTreeAnim
 	def_special ShowEasyChatScreen
@@ -145,8 +145,8 @@ gSpecials:: @ 81DBA64
 	def_special CalculatePlayerPartyCount
 	def_special CountPartyNonEggMons
 	def_special CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
-	def_special sub_80F88E8
-	def_special sub_80F88DC
+	def_special ShouldReadyContestArtist
+	def_special SaveMuseumContestPainting
 	def_special sub_80F8864
 	def_special CountPlayerContestPaintings
 	def_special ShowContestWinner
@@ -310,7 +310,7 @@ gSpecials:: @ 81DBA64
 	def_special InitRoamer
 	def_special TryUpdateRusturfTunnelState
 	def_special IsGrassTypeInParty
-	def_special sub_80AFC60
+	def_special DoContestHallWarp
 	def_special PutZigzagoonInPlayerParty
 	def_special IsStarterInParty
 	def_special CopyCurSecretBaseOwnerName_StrVar1
@@ -331,7 +331,7 @@ gSpecials:: @ 81DBA64
 	def_special DoDiveWarp
 	def_special DoFallWarp
 	def_special ShowContestEntryMonPic
-	def_special sub_80F8EB8
+	def_special HideContestEntryMonPic
 	def_special SetEReaderTrainerGfxId
 	def_special BattleSetup_StartLatiBattle
 	def_special SetRoute119Weather
@@ -443,17 +443,17 @@ gSpecials:: @ 81DBA64
 	def_special OffsetCameraForBattle
 	def_special GetDeptStoreDefaultFloorChoice
 	def_special BufferVarsForIVRater
-	def_special sub_80F905C
+	def_special LinkContestWaitForConnection
 	def_special sub_800B518
-	def_special sub_80F90DC
-	def_special sub_80F910C
-	def_special sub_80F9160
+	def_special LinkContestTryShowWirelessIndicator
+	def_special LinkContestTryHideWirelessIndicator
+	def_special IsWirelessContest
 	def_special ShowRankingHallRecordsWindow
 	def_special ScrollRankingHallRecordsWindow
 	def_special ShowFrontierManiacMessage
-	def_special sub_80F9134
-	def_special sub_80F9154
-	def_special sub_80B3028
+	def_special IsContestWithRSPlayer
+	def_special ClearLinkContestFlags
+	def_special TryContestEModeLinkup
 	def_special ShowScrollableMultichoice
 	def_special sub_813A630
 	def_special BufferBattleTowerElevatorFloors
@@ -525,7 +525,7 @@ gSpecials:: @ 81DBA64
 	def_special TryGetWallpaperWithWaldaPhrase
 	def_special PlayerNotAtTrainerHillEntrance
 	def_special GetBattlePyramidHint
-	def_special sub_80F8B94
+	def_special LoadLinkContestPlayerPalettes
 	def_special ShowTrainerHillRecords
 	def_special PlayerFaceTrainerAfterBattle
 	def_special ResetHealLocationFromDewford
diff --git a/data/text/contest_hall.inc b/data/text/blend_master.inc
index 21cfce597..31315bbd5 100644
--- a/data/text/contest_hall.inc
+++ b/data/text/blend_master.inc
@@ -1,34 +1,34 @@
-LilycoveCity_ContestLobby_Text_BlendWithTheBlendMaster: @ 82C427C
+BerryBlender_Text_BlendWithTheBlendMaster: @ 82C427C
 	.string "BLEND MASTER: Indeed I am!\n"
 	.string "The BLEND MASTER am I!\p"
 	.string "Blend with me, and you shall witness\n"
 	.string "the mastery I bring to blending!$"
 
-LilycoveCity_ContestLobby_Text_SeeMyMasteryInAction: @ 82C42F4
+BerryBlender_Text_SeeMyMasteryInAction: @ 82C42F4
 	.string "BLEND MASTER: Hmmm! So, you wish to\n"
 	.string "see my mastery in action?$"
 
-LilycoveCity_ContestLobby_Text_TooBusyNowIsee: @ 82C4332
+BerryBlender_Text_TooBusyNowIsee: @ 82C4332
 	.string "Hmmm!\p"
 	.string "So, you are too busy now, I see!\p"
 	.string "But fear not!\n"
 	.string "I shall be here all day!\l"
 	.string "Hurry back from your errand!$"
 
-LilycoveCity_ContestLobby_Text_BlendMasterNoBerries: @ 82C439D
+BerryBlender_Text_BlendMasterNoBerries: @ 82C439D
 	.string "Hmmm!\p"
 	.string "You haven't got a single BERRY!\p"
 	.string "I shall be here all day!\n"
 	.string "Hurry back with some BERRIES!$"
 
-LilycoveCity_ContestLobby_Text_BlendMasterKnowHowToMakePokeblocks: @ 82C43FA
+BerryBlender_Text_BlendMasterKnowHowToMakePokeblocks: @ 82C43FA
 	.string "Of course!\n"
 	.string "Of course!\p"
 	.string "Incidentally…\n"
 	.string "You do know how to blend {POKEBLOCK}S\l"
 	.string "from BERRIES?$"
 
-LilycoveCity_ContestLobby_Text_BlendMasterExplainBerryBlending: @ 82C444C
+BerryBlender_Text_BlendMasterExplainBerryBlending: @ 82C444C
 	.string "Hmmm!\p"
 	.string "Ah, but it is a simple process!\p"
 	.string "When the BLENDER's arrow comes to\n"
@@ -37,40 +37,40 @@ LilycoveCity_ContestLobby_Text_BlendMasterExplainBerryBlending: @ 82C444C
 	.string "When you see how precisely I press\n"
 	.string "the A Button, you will understand.$"
 
-LilycoveCity_ContestLobby_Text_BlendMasterLetsBerryBlender: @ 82C451B
+BerryBlender_Text_BlendMasterLetsBerryBlender: @ 82C451B
 	.string "Fine!\p"
 	.string "Let's get started, then!\p"
 	.string "All together with the BLEND MASTER,\n"
 	.string "let's BERRY BLENDER!$"
 
-LilycoveCity_ContestLobby_Text_BlendMasterNoPokeblockCase: @ 82C4573
+BerryBlender_Text_BlendMasterNoPokeblockCase: @ 82C4573
 	.string "Hmmm!\p"
 	.string "You don't appear to have gotten\n"
 	.string "the {POKEBLOCK} CASE!\p"
 	.string "I shall be here all day!\n"
 	.string "Obtain the {POKEBLOCK} CASE and hurry back!$"
 
-LilycoveCity_ContestLobby_Text_BlendMasterPokeblockCaseFull: @ 82C45E8
+BerryBlender_Text_BlendMasterPokeblockCaseFull: @ 82C45E8
 	.string "Hmmm!\p"
 	.string "Your {POKEBLOCK} CASE appears to be full!\p"
 	.string "I shall be here all day!\n"
 	.string "Use some {POKEBLOCK}S and hurry back!$"
 
-LilycoveCity_ContestLobby_Text_2C464B: @ 82C464B
+BerryBlender_Text_WhoaAwesome: @ 82C464B
 	.string "Whoa!\n"
 	.string "Awesome!$"
 
-LilycoveCity_ContestLobby_Text_2C465A: @ 82C465A
+BerryBlender_Text_WickedlyFast: @ 82C465A
 	.string "Wickedly fast!$"
 
-LilycoveCity_ContestLobby_Text_2C4669: @ 82C4669
+BerryBlender_Text_WhatAnExpert: @ 82C4669
 	.string "What an expert!$"
 
-LilycoveCity_ContestLobby_Text_2C4679: @ 82C4679
+BerryBlender_Text_MadeAmazingPokeblocksWithMaster: @ 82C4679
 	.string "When I blended with the MASTER,\n"
 	.string "we made amazing {POKEBLOCK}S!$"
 
-LilycoveCity_ContestLobby_Text_2C46B1: @ 82C46B1
+BerryBlender_Text_QualitiesOfBlendMaster: @ 82C46B1
 	.string "Eyes that track the arrow with\n"
 	.string "machinelike intensity…\p"
 	.string "A hand that taps the A Button\n"
@@ -78,7 +78,7 @@ LilycoveCity_ContestLobby_Text_2C46B1: @ 82C46B1
 	.string "Possessing these qualities makes\n"
 	.string "the BLEND MASTER truly great.$"
 
-LilycoveCity_ContestLobby_Text_2C4763: @ 82C4763
+BerryBlender_Text_MasterWorksOnSkillsInMountains: @ 82C4763
 	.string "The BLEND MASTER's supposed to work\n"
 	.string "on his skills deep in the mountains.\p"
 	.string "Sometimes, he comes to LILYCOVE\n"
diff --git a/include/constants/contest.h b/include/constants/contest.h
index 0c866069e..186c56e2b 100644
--- a/include/constants/contest.h
+++ b/include/constants/contest.h
@@ -9,6 +9,19 @@
 #define LINK_CONTEST_FLAG_IS_WIRELESS   (1 << 1)
 #define LINK_CONTEST_FLAG_HAS_RS_PLAYER (1 << 2)
 
+#define CONTEST_RANK_NORMAL  0
+#define CONTEST_RANK_SUPER   1
+#define CONTEST_RANK_HYPER   2
+#define CONTEST_RANK_MASTER  3
+#define CONTEST_RANK_LINK    4
+
+// States for VAR_CONTEST_TYPE
+#define CONTEST_TYPE_NPC_NORMAL  (CONTEST_RANK_NORMAL + 1)
+#define CONTEST_TYPE_NPC_SUPER   (CONTEST_RANK_SUPER + 1)
+#define CONTEST_TYPE_NPC_HYPER   (CONTEST_RANK_HYPER + 1)
+#define CONTEST_TYPE_NPC_MASTER  (CONTEST_RANK_MASTER + 1)
+#define CONTEST_TYPE_LINK        (CONTEST_RANK_LINK + 1)
+
 #define CONTEST_CATEGORY_COOL     0
 #define CONTEST_CATEGORY_BEAUTY   1
 #define CONTEST_CATEGORY_CUTE     2
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 00aa328f7..8a507e976 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -95,7 +95,7 @@
 #define FLAG_UNUSED_0x054                    0x54  // Unused Flag
 #define FLAG_UNUSED_0x055                    0x55  // Unused Flag
 
-#define FLAG_LINK_CONTEST_POKE_BALL          0x56
+#define FLAG_HIDE_CONTEST_POKE_BALL          0x56  // Always set after new game, object it hides is added directly
 #define FLAG_MET_RIVAL_MOM                   0x57
 #define FLAG_BIRCH_AIDE_MET                  0x58
 #define FLAG_DECLINED_BIKE                   0x59
@@ -287,7 +287,7 @@
 #define FLAG_RECEIVED_REVIVED_FOSSIL_MON     0x10B
 #define FLAG_SECRET_BASE_REGISTRY_ENABLED    0x10C
 #define FLAG_RECEIVED_TM46                   0x10D
-#define FLAG_CONTEST_SKETCH_CREATED          0x10E
+#define FLAG_CONTEST_SKETCH_CREATED          0x10E  // Set but never read
 #define FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE   0x10F
 #define FLAG_RECEIVED_EXP_SHARE              0x110
 #define FLAG_POKERUS_EXPLAINED               0x111
@@ -361,7 +361,7 @@
 
 #define FLAG_MET_BATTLE_FRONTIER_BREEDER     0x153
 #define FLAG_MET_BATTLE_FRONTIER_MANIAC      0x154
-#define FLAG_ENTERED_LINK_CONTEST            0x155
+#define FLAG_ENTERED_CONTEST                 0x155
 #define FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN  0x156
 #define FLAG_MET_BATTLE_FRONTIER_BETTOR      0x157
 #define FLAG_ENABLE_MR_STONE_POKENAV         0x158
diff --git a/include/constants/layouts.h b/include/constants/layouts.h
index fd64196e0..5e134b119 100755
--- a/include/constants/layouts.h
+++ b/include/constants/layouts.h
@@ -225,18 +225,18 @@
 #define LAYOUT_TRADE_CENTER 222
 #define LAYOUT_RECORD_CORNER 223
 #define LAYOUT_BATTLE_COLOSSEUM_4P 224
-#define LAYOUT_LINK_CONTEST_ROOM1 225
+#define LAYOUT_CONTEST_HALL 225
 #define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29 226
 #define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30 227
 #define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31 228
 #define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32 229
 #define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33 230
 #define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34 231
-#define LAYOUT_LINK_CONTEST_ROOM2 232
-#define LAYOUT_LINK_CONTEST_ROOM3 233
-#define LAYOUT_LINK_CONTEST_ROOM4 234
-#define LAYOUT_LINK_CONTEST_ROOM5 235
-#define LAYOUT_LINK_CONTEST_ROOM6 236
+#define LAYOUT_CONTEST_HALL_BEAUTY 232
+#define LAYOUT_CONTEST_HALL_TOUGH 233
+#define LAYOUT_CONTEST_HALL_COOL 234
+#define LAYOUT_CONTEST_HALL_SMART 235
+#define LAYOUT_CONTEST_HALL_CUTE 236
 #define LAYOUT_INSIDE_OF_TRUCK 237
 #define LAYOUT_SAFARI_ZONE_NORTHWEST 238
 #define LAYOUT_SAFARI_ZONE_NORTH 239
diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h
index be8f2fec8..23a8f224f 100755
--- a/include/constants/map_groups.h
+++ b/include/constants/map_groups.h
@@ -426,18 +426,18 @@
 #define MAP_TRADE_CENTER                    (25 | (25 << 8))
 #define MAP_RECORD_CORNER                   (26 | (25 << 8))
 #define MAP_BATTLE_COLOSSEUM_4P             (27 | (25 << 8))
-#define MAP_LINK_CONTEST_ROOM1              (28 | (25 << 8))
+#define MAP_CONTEST_HALL                    (28 | (25 << 8))
 #define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_29 (29 | (25 << 8))
 #define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_30 (30 | (25 << 8))
 #define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_31 (31 | (25 << 8))
 #define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_32 (32 | (25 << 8))
 #define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_33 (33 | (25 << 8))
 #define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_34 (34 | (25 << 8))
-#define MAP_LINK_CONTEST_ROOM2              (35 | (25 << 8))
-#define MAP_LINK_CONTEST_ROOM3              (36 | (25 << 8))
-#define MAP_LINK_CONTEST_ROOM4              (37 | (25 << 8))
-#define MAP_LINK_CONTEST_ROOM5              (38 | (25 << 8))
-#define MAP_LINK_CONTEST_ROOM6              (39 | (25 << 8))
+#define MAP_CONTEST_HALL_BEAUTY             (35 | (25 << 8))
+#define MAP_CONTEST_HALL_TOUGH              (36 | (25 << 8))
+#define MAP_CONTEST_HALL_COOL               (37 | (25 << 8))
+#define MAP_CONTEST_HALL_SMART              (38 | (25 << 8))
+#define MAP_CONTEST_HALL_CUTE               (39 | (25 << 8))
 #define MAP_INSIDE_OF_TRUCK                 (40 | (25 << 8))
 #define MAP_SS_TIDAL_CORRIDOR               (41 | (25 << 8))
 #define MAP_SS_TIDAL_LOWER_DECK             (42 | (25 << 8))
diff --git a/include/constants/tv.h b/include/constants/tv.h
index c22bec9a3..fddf650e4 100644
--- a/include/constants/tv.h
+++ b/include/constants/tv.h
@@ -43,4 +43,7 @@
 //                                                  //
 #define TVSHOW_MASS_OUTBREAK                        41 
 
+// Number of ribbons to put Spot the Cuties on air
+#define NUM_CUTIES_RIBBONS  4
+
 #endif //GUARD_CONSTANTS_TV_H
diff --git a/include/constants/union_room.h b/include/constants/union_room.h
new file mode 100644
index 000000000..2314f85a0
--- /dev/null
+++ b/include/constants/union_room.h
@@ -0,0 +1,28 @@
+#ifndef GUARD_CONSTANTS_UNION_ROOM_H
+#define GUARD_CONSTANTS_UNION_ROOM_H
+
+#define LINK_GROUP_SINGLE_BATTLE        0
+#define LINK_GROUP_DOUBLE_BATTLE        1
+#define LINK_GROUP_MULTI_BATTLE         2
+#define LINK_GROUP_TRADE                3
+#define LINK_GROUP_POKEMON_JUMP         4
+#define LINK_GROUP_BERRY_CRUSH          5
+#define LINK_GROUP_BERRY_PICKING        6
+#define LINK_GROUP_WONDER_CARD          7
+#define LINK_GROUP_WONDER_NEWS          8
+#define LINK_GROUP_UNK_9                9
+#define LINK_GROUP_UNK_10               10
+#define LINK_GROUP_UNK_11               11
+#define LINK_GROUP_RECORD_CORNER        12
+#define LINK_GROUP_BERRY_BLENDER        13
+#define LINK_GROUP_UNK_14               14
+#define LINK_GROUP_COOL_CONTEST         15
+#define LINK_GROUP_BEAUTY_CONTEST       16
+#define LINK_GROUP_CUTE_CONTEST         17
+#define LINK_GROUP_SMART_CONTEST        18
+#define LINK_GROUP_TOUGH_CONTEST        19
+#define LINK_GROUP_BATTLE_TOWER         20
+#define LINK_GROUP_BATTLE_TOWER_OPEN    21
+#define NUM_LINK_GROUP_TYPES            22
+
+#endif //GUARD_CONSTANTS_UNION_ROOM_H
diff --git a/include/constants/vars.h b/include/constants/vars.h
index 099c9ac9f..0d217b192 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -148,9 +148,9 @@
 #define VAR_UNUSED_0x4083                    0x4083 // Unused Var
 #define VAR_BIRCH_LAB_STATE                  0x4084
 #define VAR_PETALBURG_GYM_STATE              0x4085 // 0-1: Wally tutorial, 2-6: 0-4 badges, 7: Defeated Norman, 8: Rematch Norman 
-#define VAR_LINK_CONTEST_ROOM_STATE          0x4086
+#define VAR_CONTEST_HALL_STATE               0x4086
 #define VAR_CABLE_CLUB_STATE                 0x4087
-#define VAR_CONTEST_LOCATION                 0x4088
+#define VAR_CONTEST_TYPE                     0x4088
 #define VAR_SECRET_BASE_INITIALIZED          0x4089
 #define VAR_CONTEST_PRIZE_PICKUP             0x408A
 #define VAR_UNUSED_0x408B                    0x408B // Unused Var
diff --git a/include/contest.h b/include/contest.h
index 49e130b08..00c3191eb 100644
--- a/include/contest.h
+++ b/include/contest.h
@@ -201,14 +201,6 @@ enum
 };
 
 enum {
-    CONTEST_RANK_NORMAL,
-    CONTEST_RANK_SUPER,
-    CONTEST_RANK_HYPER,
-    CONTEST_RANK_MASTER,
-    CONTEST_RANK_LINK
-};
-
-enum {
     CONTEST_FILTER_NONE,
     CONTEST_FILTER_NO_POSTGAME,
     CONTEST_FILTER_ONLY_POSTGAME
@@ -436,15 +428,15 @@ struct ContestResources
 #define eContestDebugMode (gHeap[0x1a000])
 #define eUnknownHeap1A004 (*(struct Shared1A004 *)(gHeap + 0x1a004))
 
-extern struct ContestPokemon gContestMons[4];
-extern s16 gContestMonConditions[4];
-extern s16 gUnknown_02039F08[4];
-extern s16 gUnknown_02039F10[4];
-extern s16 gUnknown_02039F18[4];
-extern u8 gContestFinalStandings[4];
+extern struct ContestPokemon gContestMons[CONTESTANT_COUNT];
+extern s16 gContestMonConditions[CONTESTANT_COUNT];
+extern s16 gUnknown_02039F08[CONTESTANT_COUNT];
+extern s16 gUnknown_02039F10[CONTESTANT_COUNT];
+extern s16 gUnknown_02039F18[CONTESTANT_COUNT];
+extern u8 gContestFinalStandings[CONTESTANT_COUNT];
 extern u8 gContestMonPartyIndex;
 extern u8 gContestPlayerMonIndex;
-extern u8 gContestantTurnOrder[4];
+extern u8 gContestantTurnOrder[CONTESTANT_COUNT];
 extern u8 gLinkContestFlags;
 extern u8 gUnknown_02039F2B;
 extern u16 gSpecialVar_ContestCategory;
diff --git a/include/contest_link_80F57C4.h b/include/contest_link_80F57C4.h
index b4ccf2803..add3ae62f 100644
--- a/include/contest_link_80F57C4.h
+++ b/include/contest_link_80F57C4.h
@@ -1,10 +1,10 @@
 #ifndef GUARD_CONTEST_LINK_80F57C4_H
 #define GUARD_CONTEST_LINK_80F57C4_H
 
-void sub_80F8264(void);
-void sub_80F8290(void);
-void sub_80F840C(void);
-void sub_80F8438(void);
+void BufferContestantTrainerName(void);
+void BufferContestantMonNickname(void);
+void StartContest(void);
+void BufferContestantMonSpecies(void);
 void sub_80F8484(void);
 void sub_80F84C4(u8);
 void sub_80FC998(u8 taskId);
diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h
index 42f077dc3..02a927d4b 100644
--- a/include/field_screen_effect.h
+++ b/include/field_screen_effect.h
@@ -32,7 +32,7 @@ void DoMossdeepGymWarp(void);
 void sub_80AF8B8(void);
 void sub_80AF948(void);
 void sub_80AF9F8(void);
-void sub_80AFC60(void);
+void DoContestHallWarp(void);
 void AnimateFlash(u8 flashLevel);
 void WriteBattlePyramidViewScanlineEffectBuffer(void);
 void sub_80B0244(void);
diff --git a/include/link.h b/include/link.h
index 32dfaf51e..4d6771a03 100644
--- a/include/link.h
+++ b/include/link.h
@@ -92,8 +92,8 @@
 #define LINKTYPE_0x5501              0x5501  // mystery event
 #define LINKTYPE_0x5502              0x5502  // unused?
 #define LINKTYPE_0x5503              0x5503  // eReader
-#define LINKTYPE_0x6601              0x6601
-#define LINKTYPE_0x6602              0x6602
+#define LINKTYPE_CONTEST_GMODE       0x6601
+#define LINKTYPE_CONTEST_EMODE       0x6602
 
 struct LinkStatus
 {
diff --git a/include/script_pokemon_util_80F87D8.h b/include/script_pokemon_util_80F87D8.h
index 7d8d99628..7c246b745 100644
--- a/include/script_pokemon_util_80F87D8.h
+++ b/include/script_pokemon_util_80F87D8.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_SCRIPT_POKEMON_UTIL_80F87D8_H
 #define GUARD_SCRIPT_POKEMON_UTIL_80F87D8_H
 
-u16 sub_80F903C(void);
+u16 GetContestRand(void);
 void ReducePlayerPartyToSelectedMons(void);
 void HealPlayerParty(void);
 u8 CountPlayerContestPaintings(void);
diff --git a/include/tv.h b/include/tv.h
index d0ca648be..8b37116de 100644
--- a/include/tv.h
+++ b/include/tv.h
@@ -20,7 +20,7 @@ void IncrementDailyPickedBerries(void);
 void IncrementDailyBattlePoints(u16 delta);
 void sub_80F01B8(void);
 void ReceiveTvShowsData(void *src, u32 size, u8 masterIdx);
-void sub_80EE4DC(struct Pokemon *pokemon, u8 ribbonMonDataIdx);
+void TryPutSpotTheCutiesOnAir(struct Pokemon *pokemon, u8 ribbonMonDataIdx);
 u32 GetPlayerIDAsU32(void);
 bool8 GetPriceReduction(u8 newsKind);
 void sub_80F14F8(TVShow *shows);
diff --git a/src/battle_tower.c b/src/battle_tower.c
index 7b9842c48..a6e816b7d 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -30,6 +30,7 @@
 #include "constants/moves.h"
 #include "constants/species.h"
 #include "constants/easy_chat.h"
+#include "constants/tv.h"
 
 extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_MaxieTrainer[];
 extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_TabithaTrainer[];
@@ -3026,9 +3027,9 @@ static void AwardBattleTowerRibbons(void)
                 ribbons[i] = prevBest;
             }
         }
-        if (ribbons[0].count > 4)
+        if (ribbons[0].count > NUM_CUTIES_RIBBONS)
         {
-            sub_80EE4DC(&gSaveBlock1Ptr->playerParty[ribbons[0].partyIndex], ribbonType);
+            TryPutSpotTheCutiesOnAir(&gSaveBlock1Ptr->playerParty[ribbons[0].partyIndex], ribbonType);
         }
     }
 }
diff --git a/src/cable_club.c b/src/cable_club.c
index 26239eb50..ab61d65a9 100644
--- a/src/cable_club.c
+++ b/src/cable_club.c
@@ -685,16 +685,16 @@ void TryBerryBlenderLinkup(void)
     sub_80B236C(2, 4);
 }
 
-void sub_80B3000(void)
+void TryContestGModeLinkup(void)
 {
-    gLinkType = LINKTYPE_0x6601;
+    gLinkType = LINKTYPE_CONTEST_GMODE;
     gBattleTypeFlags = 0;
     sub_80B236C(4, 4);
 }
 
-void sub_80B3028(void)
+void TryContestEModeLinkup(void)
 {
-    gLinkType = LINKTYPE_0x6602;
+    gLinkType = LINKTYPE_CONTEST_EMODE;
     gBattleTypeFlags = 0;
     sub_80B236C(2, 4);
 }
diff --git a/src/contest.c b/src/contest.c
index b202fe71e..8191f7a39 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -219,15 +219,15 @@ static void sub_80DF9E0(u8 *, s32);
 static void SwapMoveDescAndContestTilemaps(void);
 
 // EWRAM vars.
-EWRAM_DATA struct ContestPokemon gContestMons[4] = {0};
-EWRAM_DATA s16 gContestMonConditions[4] = {0};
-EWRAM_DATA s16 gUnknown_02039F08[4] = {0};
-EWRAM_DATA s16 gUnknown_02039F10[4] = {0};
-EWRAM_DATA s16 gUnknown_02039F18[4] = {0};
-EWRAM_DATA u8 gContestFinalStandings[4] = {0};
+EWRAM_DATA struct ContestPokemon gContestMons[CONTESTANT_COUNT] = {0};
+EWRAM_DATA s16 gContestMonConditions[CONTESTANT_COUNT] = {0};
+EWRAM_DATA s16 gUnknown_02039F08[CONTESTANT_COUNT] = {0};
+EWRAM_DATA s16 gUnknown_02039F10[CONTESTANT_COUNT] = {0};
+EWRAM_DATA s16 gUnknown_02039F18[CONTESTANT_COUNT] = {0};
+EWRAM_DATA u8 gContestFinalStandings[CONTESTANT_COUNT] = {0};
 EWRAM_DATA u8 gContestMonPartyIndex = 0;
 EWRAM_DATA u8 gContestPlayerMonIndex = 0;
-EWRAM_DATA u8 gContestantTurnOrder[4] = {0};
+EWRAM_DATA u8 gContestantTurnOrder[CONTESTANT_COUNT] = {0};
 EWRAM_DATA u8 gLinkContestFlags = 0;
 // Bit 0: Is a link contest
 // Bit 1: Link contest uses wireless adapter
@@ -1574,7 +1574,7 @@ static void sub_80D8A88(u8 taskId)
         {
             s32 i;
 
-            for (i = 0; i + gNumLinkContestPlayers < 4; i++)
+            for (i = 0; i + gNumLinkContestPlayers < CONTESTANT_COUNT; i++)
             {
                 eContestantStatus[gNumLinkContestPlayers + i].currMove = GetChosenMove(gNumLinkContestPlayers + i);
             }
@@ -1735,7 +1735,7 @@ static void sub_80D8B38(u8 taskId)
         {
             if (eContestantStatus[r6].effectStringId2 != CONTEST_STRING_NONE)
             {
-                for (i = 0; i < 4; i++)
+                for (i = 0; i < CONTESTANT_COUNT; i++)
                 {
                     if (i != r6 && eContestantStatus[i].effectStringId != CONTEST_STRING_NONE)
                         break;
@@ -1838,10 +1838,10 @@ static void sub_80D8B38(u8 taskId)
             s32 r2 = 0;
 
             r3 = 0;
-            for (i = gTasks[taskId].data[1]; i < 4; i++)
+            for (i = gTasks[taskId].data[1]; i < CONTESTANT_COUNT; i++)
             {
                 r3 = 0;
-                for (r2 = 0; r2 < 4; r2++)
+                for (r2 = 0; r2 < CONTESTANT_COUNT; r2++)
                 {
                     if (r2 != r6 && gContestantTurnOrder[r2] == i
                         && eContestantStatus[r2].effectStringId != CONTEST_STRING_NONE)
@@ -1906,7 +1906,7 @@ static void sub_80D8B38(u8 taskId)
         }
         return;
     case 30:
-        for (i = 0; i < 4; i++)
+        for (i = 0; i < CONTESTANT_COUNT; i++)
         {
             if (gContestantTurnOrder[i] == gTasks[taskId].data[1])
                 break;
@@ -2509,7 +2509,7 @@ static void sub_80DA5E8(u8 taskId)
 
     gBattle_BG0_Y = 0;
     gBattle_BG2_Y = 0;
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < CONTESTANT_COUNT; i++)
         gUnknown_02039F10[i] = eContestantStatus[i].pointTotal;
     sub_80DBD18();
     ContestClearGeneralTextWindow();
@@ -2786,9 +2786,9 @@ void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame)
             opponents[opponentsCount++] = i;
     }
     opponents[opponentsCount] = 0xFF;
-    for (i = 0; i < 4 - gNumLinkContestPlayers; i++)
+    for (i = 0; i < CONTESTANT_COUNT - gNumLinkContestPlayers; i++)
     {
-        u16 rnd = sub_80F903C() % opponentsCount;
+        u16 rnd = GetContestRand() % opponentsCount;
 
         gContestMons[gNumLinkContestPlayers + i] = gContestOpponents[opponents[rnd]];
         sub_80DF9D4(gContestMons[gNumLinkContestPlayers + i].trainerName);
@@ -2934,7 +2934,7 @@ void sub_80DB09C(u8 contestCategory)
 {
     s32 i;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < CONTESTANT_COUNT; i++)
         gContestMonConditions[i] = sub_80DAFE0(i, contestCategory);
 }
 
@@ -3101,7 +3101,7 @@ static void sub_80DB584(void)
 {
     s32 i;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < CONTESTANT_COUNT; i++)
         sub_80DB4E0(eContestantStatus[i].currMove, i);
 }
 
@@ -3212,7 +3212,7 @@ static void sub_80DB884(void)
 {
     s32 i;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < CONTESTANT_COUNT; i++)
         sub_80DB798(i);
 }
 
@@ -3862,7 +3862,7 @@ static void sub_80DC864(void)
 {
     s32 i;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < CONTESTANT_COUNT; i++)
         sub_80DC87C(i);
 }
 
@@ -4259,7 +4259,7 @@ static void sub_80DD080(u8 contestant)
     eContestResources8.jam2 = eContestResources8.jam;
 
     eContestResources8.contestant = contestant;
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < CONTESTANT_COUNT; i++)
     {
         eContestantStatus[i].jam = 0;
         eContestResources8.unnervedPokes[i] = 0;
@@ -4796,7 +4796,7 @@ static void sub_80DE008(bool8 a)
 {
     s32 i;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < CONTESTANT_COUNT; i++)
     {
         if (eContestantStatus[i].turnOrderMod != 0 && a)
         {
@@ -5302,7 +5302,7 @@ void ResetContestLinkResults(void)
             gSaveBlock2Ptr->contestLinkResults[i][j] = 0;
 }
 
-bool8 sub_80DEDA8(u8 a)
+bool8 sub_80DEDA8(u8 rank)
 {
     s32 i;
     u8 r7 = Random() % 3;
@@ -5312,7 +5312,7 @@ bool8 sub_80DEDA8(u8 a)
         if (gContestFinalStandings[i] == 0)
             break;
     }
-    if (a == 0xFF && i != gContestPlayerMonIndex)
+    if (rank == 0xFF && i != gContestPlayerMonIndex)
         return FALSE;
     switch (gSpecialVar_ContestCategory)
     {
@@ -5332,9 +5332,9 @@ bool8 sub_80DEDA8(u8 a)
         r7 += 12;
         break;
     }
-    if (a != 0xFE)
+    if (rank != 0xFE)
     {
-        u8 r4 = sub_80DEFA8(a, 1);
+        u8 r4 = sub_80DEFA8(rank, 1);
 
         gSaveBlock1Ptr->contestWinners[r4].personality = gContestMons[i].personality;
         gSaveBlock1Ptr->contestWinners[r4].species = gContestMons[i].species;
@@ -5342,11 +5342,11 @@ bool8 sub_80DEDA8(u8 a)
         StringCopy(gSaveBlock1Ptr->contestWinners[r4].monName, gContestMons[i].nickname);
         StringCopy(gSaveBlock1Ptr->contestWinners[r4].trainerName, gContestMons[i].trainerName);
         if(gLinkContestFlags & LINK_CONTEST_FLAG_IS_LINK)
-            gSaveBlock1Ptr->contestWinners[r4].contestRank = 4;
+            gSaveBlock1Ptr->contestWinners[r4].contestRank = CONTEST_RANK_LINK;
         else
             gSaveBlock1Ptr->contestWinners[r4].contestRank = gSpecialVar_ContestRank;
 
-        if (a != 0xFF)
+        if (rank != 0xFF)
             gSaveBlock1Ptr->contestWinners[r4].contestCategory = gSpecialVar_ContestCategory;
         else
             gSaveBlock1Ptr->contestWinners[r4].contestCategory = r7;
@@ -5363,23 +5363,23 @@ bool8 sub_80DEDA8(u8 a)
     return TRUE;
 }
 
-u8 sub_80DEFA8(u8 a, u8 b)
+u8 sub_80DEFA8(u8 rank, u8 b)
 {
     s32 i;
 
-    switch (a)
+    switch (rank)
     {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
+    case CONTEST_RANK_NORMAL:
+    case CONTEST_RANK_SUPER:
+    case CONTEST_RANK_HYPER:
+    case CONTEST_RANK_MASTER:
         if (b != 0)
         {
             for (i = 5; i >= 1; i--)
                 memcpy(&gSaveBlock1Ptr->contestWinners[i], &gSaveBlock1Ptr->contestWinners[i - 1], sizeof(struct ContestWinner));
         }
         return 0;
-    default:
+    default: // CONTEST_RANK_LINK
         switch (gSpecialVar_ContestCategory)
         {
         case CONTEST_CATEGORY_COOL:
@@ -5434,7 +5434,7 @@ static void sub_80DF080(u8 contestant)
         gContestResources->field_1c[contestant].unkC |= 8;
     }
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < CONTESTANT_COUNT; i++)
     {
         if (i != contestant && eContestantStatus[i].jam != 0)
         {
@@ -5481,7 +5481,7 @@ static void sub_80DF250(void)
     r1 = 0;
     var_38 = 0;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < CONTESTANT_COUNT; i++)
     {
         if (gContestFinalStandings[i] == 0)
             var_38 = i;
@@ -5508,7 +5508,7 @@ static void sub_80DF250(void)
 
         r12 = FALSE;
         r8 = FALSE;
-        for (j = 0; j < 4; j++)
+        for (j = 0; j < CONTESTANT_COUNT; j++)
         {
             if (gContestMonConditions[i] > gContestMonConditions[j])
                 r12 = TRUE;
diff --git a/src/contest_link_80F57C4.c b/src/contest_link_80F57C4.c
index 69332b27f..4e4b8afed 100644
--- a/src/contest_link_80F57C4.c
+++ b/src/contest_link_80F57C4.c
@@ -39,6 +39,7 @@
 #include "constants/game_stat.h"
 #include "constants/rgb.h"
 #include "constants/songs.h"
+#include "constants/tv.h"
 #include "constants/vars.h"
 #include "contest.h"
 
@@ -265,7 +266,7 @@ void sub_80F5AE0(void)
 {
     int i;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < CONTESTANT_COUNT; i++)
         sub_80F5A74(i);
 
     CopyBgTilemapBufferToVram(1);
@@ -360,12 +361,12 @@ static void sub_80F5CE4(u8 taskId)
             sub_80DEDA8(0xFE);
             gUnknown_02039F5C = 1;
             gUnknown_02039F5D = sub_80DEFA8(0xFE, 0);
-            var = VarGet(VAR_LINK_CONTEST_ROOM_STATE);
-            VarSet(VAR_LINK_CONTEST_ROOM_STATE, 0);
+            var = VarGet(VAR_CONTEST_HALL_STATE);
+            VarSet(VAR_CONTEST_HALL_STATE, 0);
             SetContinueGameWarpStatusToDynamicWarp();
             TrySavingData(SAVE_LINK);
             ClearContinueGameWarpStatus2();
-            VarSet(VAR_LINK_CONTEST_ROOM_STATE, var);
+            VarSet(VAR_CONTEST_HALL_STATE, var);
             gTasks[taskId].data[0]++;
             break;
         case 1:
@@ -576,7 +577,7 @@ static void sub_80F6204(u8 taskId)
         }
         break;
     case 2:
-        for (i = 0; i < 4; i++)
+        for (i = 0; i < CONTESTANT_COUNT; i++)
         {
             newTaskId = CreateTask(sub_80F73DC, 10);
             gTasks[newTaskId].data[0] = gContestFinalStandings[i];
@@ -592,7 +593,7 @@ static void sub_80F6204(u8 taskId)
                 gTasks[taskId].data[1] = 0;
                 CreateTask(sub_80F74BC, 10);
                 gTasks[taskId].data[0]++;
-                for (i = 0; i < 4 && gContestFinalStandings[i] != 0; i++)
+                for (i = 0; i < CONTESTANT_COUNT && gContestFinalStandings[i] != 0; i++)
                     ;
 
                 sub_80F77E0(i, 14);
@@ -603,7 +604,7 @@ static void sub_80F6204(u8 taskId)
         if (++gTasks[taskId].data[1] == 21)
         {
             gTasks[taskId].data[1] = 0;
-            for (i = 0; i < 4 && gContestFinalStandings[i] != 0; i++)
+            for (i = 0; i < CONTESTANT_COUNT && gContestFinalStandings[i] != 0; i++)
                 ;
 
             StringCopy(gStringVar1, gContestMons[i].trainerName);
@@ -636,7 +637,7 @@ static void sub_80F6404(u8 taskId)
     case 0:
         gBattle_WIN0H = 0x00F0;
         gBattle_WIN0V = 0x5050;
-        for (i = 0; i < 4 && gContestFinalStandings[i] != 0; i++)
+        for (i = 0; i < CONTESTANT_COUNT && gContestFinalStandings[i] != 0; i++)
             ;
 
         species = gContestMons[i].species;
@@ -732,7 +733,7 @@ static void sub_80F66B4(u8 taskId)
     {
         if (!(gLinkContestFlags & LINK_CONTEST_FLAG_IS_LINK))
         {
-            for (i = 0; i < 4; i++)
+            for (i = 0; i < CONTESTANT_COUNT; i++)
             {
                 nationalDexNum = SpeciesToNationalPokedexNum(gContestMons[i].species);
                 GetSetPokedexFlag(nationalDexNum, FLAG_SET_SEEN);
@@ -874,7 +875,7 @@ static void LoadAllContestMonIcons(u8 srcOffset, u8 useDmaNow)
 {
     int i;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < CONTESTANT_COUNT; i++)
         sub_80F69B8(gContestMons[i].species, i, srcOffset, useDmaNow, gContestMons[i].personality);
 }
 
@@ -882,7 +883,7 @@ static void sub_80F6A9C(void)
 {
     int i, species;
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < CONTESTANT_COUNT; i++)
     {
         species = gContestMons[i].species;
         LoadPalette(gMonIconPalettes[gMonIconPaletteIndices[GetIconSpecies(species, 0)]], i * 0x10 + 0xA0, 0x20);
@@ -1423,48 +1424,48 @@ static void sub_80F71C8(void)
         CopyToBgTilemapBufferRect(2, gUnknown_08DC6498, 5, 1, 5, 2);
         x = 10;
     }
-    else if (gSpecialVar_ContestRank == 0)
+    else if (gSpecialVar_ContestRank == CONTEST_RANK_NORMAL)
     {
         CopyToBgTilemapBufferRect(2, gUnknown_08DC63F8, 5, 1, 10, 2);
         x = 15;
     }
-    else if (gSpecialVar_ContestRank == 1)
+    else if (gSpecialVar_ContestRank == CONTEST_RANK_SUPER)
     {
         CopyToBgTilemapBufferRect(2, gUnknown_08DC6420, 5, 1, 10, 2);
         x = 15;
     }
-    else if (gSpecialVar_ContestRank == 2)
+    else if (gSpecialVar_ContestRank == CONTEST_RANK_HYPER)
     {
         CopyToBgTilemapBufferRect(2, gUnknown_08DC6448, 5, 1, 10, 2);
         x = 15;
     }
-    else
+    else // CONTEST_RANK_MASTER
     {
         CopyToBgTilemapBufferRect(2, gUnknown_08DC6470, 5, 1, 10, 2);
         x = 15;
     }
 
-    if (gSpecialVar_ContestCategory == 0)
+    if (gSpecialVar_ContestCategory == CONTEST_CATEGORY_COOL)
     {
         palette = 0;
         CopyToBgTilemapBufferRect(2, gUnknown_08DC64AC, x, y, 5, 2);
     }
-    else if (gSpecialVar_ContestCategory == 1)
+    else if (gSpecialVar_ContestCategory == CONTEST_CATEGORY_BEAUTY)
     {
         palette = 1;
         CopyToBgTilemapBufferRect(2, gUnknown_08DC64C0, x, y, 5, 2);
     }
-    else if (gSpecialVar_ContestCategory == 2)
+    else if (gSpecialVar_ContestCategory == CONTEST_CATEGORY_CUTE)
     {
         palette = 2;
         CopyToBgTilemapBufferRect(2, gUnknown_08DC64D4, x, y, 5, 2);
     }
-    else if (gSpecialVar_ContestCategory == 3)
+    else if (gSpecialVar_ContestCategory == CONTEST_CATEGORY_SMART)
     {
         palette = 3;
         CopyToBgTilemapBufferRect(2, gUnknown_08DC64E8, x, y, 5, 2);
     }
-    else
+    else // CONTEST_CATEGORY_TOUGH
     {
         palette = 4;
         CopyToBgTilemapBufferRect(2, gUnknown_08DC64FC, x, y, 5, 2);
@@ -1550,7 +1551,7 @@ static void sub_80F73DC(u8 taskId)
 static void sub_80F74BC(u8 taskId)
 {
     int i;
-    for (i = 0; i < 4 && gContestFinalStandings[i] != 0; i++)
+    for (i = 0; i < CONTESTANT_COUNT && gContestFinalStandings[i] != 0; i++)
         ;
 
     CopyToBgTilemapBufferRect_ChangePalette(2, i * 0xC0 + 0x100 + gUnknown_0203A034->unkC[2], 0, i * 3 + 4, 32, 3, 9);
@@ -1706,7 +1707,7 @@ static void sub_80F7880(void)
         }
     }
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < CONTESTANT_COUNT; i++)
     {
         r4 = (gContestMonConditions[i] * 1000) / abs(r2);
         if (r4 % 10 > 4)
@@ -1933,7 +1934,7 @@ static void sub_80F7ED0(int windowId, u8 *str, int arg2)
     PutWindowTilemap(windowId);
 }
 
-void sub_80F7F30(void)
+void TryEnterContestMon(void)
 {
     u8 eligibility = GetContestEntryEligibility(&gPlayerParty[gContestMonPartyIndex]);
 
@@ -1947,38 +1948,38 @@ void sub_80F7F30(void)
     gSpecialVar_Result = eligibility;
 }
 
-u16 sub_80F7F7C(void)
+u16 HasMonWonThisContestBefore(void)
 {
-    u16 result = 0;
+    u16 hasRankRibbon = FALSE;
     struct Pokemon *mon = &gPlayerParty[gContestMonPartyIndex];
     switch (gSpecialVar_ContestCategory)
     {
     case CONTEST_CATEGORY_COOL:
         if (GetMonData(mon, MON_DATA_COOL_RIBBON) > gSpecialVar_ContestRank)
-            result = 1;
+            hasRankRibbon = TRUE;
         break;
     case CONTEST_CATEGORY_BEAUTY:
         if (GetMonData(mon, MON_DATA_BEAUTY_RIBBON) > gSpecialVar_ContestRank)
-            result = 1;
+            hasRankRibbon = TRUE;
         break;
     case CONTEST_CATEGORY_CUTE:
         if (GetMonData(mon, MON_DATA_CUTE_RIBBON) > gSpecialVar_ContestRank)
-            result = 1;
+            hasRankRibbon = TRUE;
         break;
     case CONTEST_CATEGORY_SMART:
         if (GetMonData(mon, MON_DATA_SMART_RIBBON) > gSpecialVar_ContestRank)
-            result = 1;
+            hasRankRibbon = TRUE;
         break;
     case CONTEST_CATEGORY_TOUGH:
         if (GetMonData(mon, MON_DATA_TOUGH_RIBBON) > gSpecialVar_ContestRank)
-            result = 1;
+            hasRankRibbon = TRUE;
         break;
     }
 
-    return result;
+    return hasRankRibbon;
 }
 
-void sub_80F7FFC(void)
+void GiveMonContestRibbon(void)
 {
     u8 ribbonData;
 
@@ -1993,8 +1994,8 @@ void sub_80F7FFC(void)
         {
             ribbonData++;
             SetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_COOL_RIBBON, &ribbonData);
-            if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > 4)
-                sub_80EE4DC(&gPlayerParty[gContestMonPartyIndex], MON_DATA_COOL_RIBBON);
+            if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > NUM_CUTIES_RIBBONS)
+                TryPutSpotTheCutiesOnAir(&gPlayerParty[gContestMonPartyIndex], MON_DATA_COOL_RIBBON);
         }
         break;
     case CONTEST_CATEGORY_BEAUTY:
@@ -2003,8 +2004,8 @@ void sub_80F7FFC(void)
         {
             ribbonData++;
             SetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_BEAUTY_RIBBON, &ribbonData);
-            if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > 4)
-                sub_80EE4DC(&gPlayerParty[gContestMonPartyIndex], MON_DATA_BEAUTY_RIBBON);
+            if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > NUM_CUTIES_RIBBONS)
+                TryPutSpotTheCutiesOnAir(&gPlayerParty[gContestMonPartyIndex], MON_DATA_BEAUTY_RIBBON);
         }
         break;
     case CONTEST_CATEGORY_CUTE:
@@ -2013,8 +2014,8 @@ void sub_80F7FFC(void)
         {
             ribbonData++;
             SetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_CUTE_RIBBON, &ribbonData);
-            if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > 4)
-                sub_80EE4DC(&gPlayerParty[gContestMonPartyIndex], MON_DATA_CUTE_RIBBON);
+            if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > NUM_CUTIES_RIBBONS)
+                TryPutSpotTheCutiesOnAir(&gPlayerParty[gContestMonPartyIndex], MON_DATA_CUTE_RIBBON);
         }
         break;
     case CONTEST_CATEGORY_SMART:
@@ -2023,8 +2024,8 @@ void sub_80F7FFC(void)
         {
             ribbonData++;
             SetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_SMART_RIBBON, &ribbonData);
-            if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > 4)
-                sub_80EE4DC(&gPlayerParty[gContestMonPartyIndex], MON_DATA_SMART_RIBBON);
+            if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > NUM_CUTIES_RIBBONS)
+                TryPutSpotTheCutiesOnAir(&gPlayerParty[gContestMonPartyIndex], MON_DATA_SMART_RIBBON);
         }
         break;
     case CONTEST_CATEGORY_TOUGH:
@@ -2033,95 +2034,96 @@ void sub_80F7FFC(void)
         {
             ribbonData++;
             SetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_TOUGH_RIBBON, &ribbonData);
-            if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > 4)
-                sub_80EE4DC(&gPlayerParty[gContestMonPartyIndex], MON_DATA_TOUGH_RIBBON);
+            if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > NUM_CUTIES_RIBBONS)
+                TryPutSpotTheCutiesOnAir(&gPlayerParty[gContestMonPartyIndex], MON_DATA_TOUGH_RIBBON);
         }
         break;
     }
 }
 
-void sub_80F8264(void)
+void BufferContestantTrainerName(void)
 {
     StringCopy(gStringVar1, gContestMons[gSpecialVar_0x8006].trainerName);
     sub_81DB5AC(gStringVar1);
 }
 
-void sub_80F8290(void)
+void BufferContestantMonNickname(void)
 {
     StringCopy(gStringVar3, gContestMons[gSpecialVar_0x8006].nickname);
 }
 
-void sub_80F82B4(void)
+// Unused script special
+void GetContestMonConditionRanking(void)
 {
-    u8 i, count;
+    u8 i, rank;
 
-    for (i = 0, count = 0; i < 4; i++)
+    for (i = 0, rank = 0; i < CONTESTANT_COUNT; i++)
     {
         if (gContestMonConditions[gSpecialVar_0x8006] < gContestMonConditions[i])
-            count++;
+            rank++;
     }
 
-    gSpecialVar_0x8004 = count;
+    gSpecialVar_0x8004 = rank;
 }
 
-void sub_80F82FC(void)
+void GetContestMonCondition(void)
 {
     gSpecialVar_0x8004 = gContestMonConditions[gSpecialVar_0x8006];
 }
 
-void sub_80F831C(void)
+void GetContestWinnerId(void)
 {
     u8 i;
 
-    for (i = 0; i < 4 && gContestFinalStandings[i] != 0; i++)
+    for (i = 0; i < CONTESTANT_COUNT && gContestFinalStandings[i] != 0; i++)
         ;
 
     gSpecialVar_0x8005 = i;
 }
 
-void sub_80F834C(void)
+void BufferContestWinnerTrainerName(void)
 {
     u8 i;
 
-    for (i = 0; i < 4 && gContestFinalStandings[i] != 0; i++)
+    for (i = 0; i < CONTESTANT_COUNT && gContestFinalStandings[i] != 0; i++)
         ;
 
     StringCopy(gStringVar3, gContestMons[i].trainerName);
     sub_81DB5AC(gStringVar3);
 }
 
-void sub_80F8390(void)
+void BufferContestWinnerMonName(void)
 {
     u8 i;
 
-    for (i = 0; i < 4 && gContestFinalStandings[i] != 0; i++)
+    for (i = 0; i < CONTESTANT_COUNT && gContestFinalStandings[i] != 0; i++)
         ;
 
     StringCopy(gStringVar1, gContestMons[i].nickname);
 }
 
-void sub_80F83D0(void)
+void CB2_SetStartContestCallback(void)
 {
     SetMainCallback2(CB2_StartContest);
 }
 
-static void sub_80F83E0(u8 taskId)
+static void Task_StartContest(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
         DestroyTask(taskId);
-        SetMainCallback2(sub_80F83D0);
+        SetMainCallback2(CB2_SetStartContestCallback);
     }
 }
 
-void sub_80F840C(void)
+void StartContest(void)
 {
     ScriptContext2_Enable();
-    CreateTask(sub_80F83E0, 10);
+    CreateTask(Task_StartContest, 10);
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
 }
 
-void sub_80F8438(void)
+void BufferContestantMonSpecies(void)
 {
     gSpecialVar_0x8004 = gContestMons[gSpecialVar_0x8006].species;
 }
@@ -2142,7 +2144,7 @@ void sub_80F8484(void)
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
 }
 
-void sub_80F84B0(void)
+void GetContestPlayerId(void)
 {
     gSpecialVar_0x8004 = gContestPlayerMonIndex;
 }
@@ -2248,7 +2250,7 @@ void sub_80F8714(u8 taskId)
     }
     else
     {
-        for (i = 0; i < 4; i++)
+        for (i = 0; i < CONTESTANT_COUNT; i++)
             StringGetEnd10(gContestMons[i].nickname);
 
         DestroyTask(taskId);
diff --git a/src/data/union_room.h b/src/data/union_room.h
index abe91b010..de155aee8 100644
--- a/src/data/union_room.h
+++ b/src/data/union_room.h
@@ -440,7 +440,7 @@ ALIGNED(4) const u8 sText_CancelRegistrationOfMon[] = _("Cancel the registration
 ALIGNED(4) const u8 sText_CancelRegistrationOfEgg[] = _("Cancel the registration of your\nEGG?");
 ALIGNED(4) const u8 sText_RegistrationCanceled2[] = _("The registration has been canceled.\p");
 ALIGNED(4) const u8 sText_TradeTrainersWillBeListed[] = _("TRAINERS wishing to make a trade\nwill be listed."); // unused
-ALIGNED(4) const u8 sText_ChooseTrainerToTradeWith[] = _("Please choose the TRAINER with whom\nyou would like to trade POKéMON."); // unused
+ALIGNED(4) const u8 sText_ChooseTrainerToTradeWith2[] = _("Please choose the TRAINER with whom\nyou would like to trade POKéMON."); // unused
 ALIGNED(4) const u8 sText_AskTrainerToMakeTrade[] = _("Would you like to ask {STR_VAR_1} to\nmake a trade?");
 ALIGNED(4) const u8 sText_AwaitingResponseFromTrainer[] = _("Awaiting a response from\nthe other TRAINER…"); // unused
 ALIGNED(4) const u8 sText_NotRegisteredAMonForTrade[] = _("You have not registered a POKéMON\nfor trading.\p"); // unused
@@ -457,50 +457,51 @@ const u8 *const sUnionRoomTexts_CantTradeRightNow[] = {
 
 ALIGNED(4) const u8 sText_TradeOfferRejected[] = _("Your trade offer was rejected.\p");
 ALIGNED(4) const u8 sText_EggTrade[] = _("EGG TRADE");
-ALIGNED(4) const u8 gUnknown_082EF7DC[] = _("{DPAD_UPDOWN}CHOOSE  {A_BUTTON}JOIN  {B_BUTTON}CANCEL");
-ALIGNED(4) const u8 gUnknown_082EF7F8[] = _("Please choose a TRAINER.");
-ALIGNED(4) const u8 gUnknown_082EF814[] = _("Please choose a TRAINER for\na SINGLE BATTLE.");
-ALIGNED(4) const u8 gUnknown_082EF844[] = _("Please choose a TRAINER for\na DOUBLE BATTLE.");
-ALIGNED(4) const u8 gUnknown_082EF874[] = _("Please choose the LEADER\nfor a MULTI BATTLE.");
-ALIGNED(4) const u8 gUnknown_082EF8A4[] = _("Please choose the TRAINER to\ntrade with.");
-ALIGNED(4) const u8 gUnknown_082EF8D0[] = _("Please choose the TRAINER who is\nsharing WONDER CARDS.");
-ALIGNED(4) const u8 gUnknown_082EF908[] = _("Please choose the TRAINER who is\nsharing WONDER NEWS.");
-ALIGNED(4) const u8 gUnknown_082EF940[] = _("Jump with mini POKéMON!\nPlease choose the LEADER.");
-ALIGNED(4) const u8 gUnknown_082EF974[] = _("BERRY CRUSH!\nPlease choose the LEADER.");
-ALIGNED(4) const u8 gUnknown_082EF99C[] = _("DODRIO BERRY-PICKING!\nPlease choose the LEADER.");
-ALIGNED(4) const u8 gUnknown_082EF9CC[] = _("BERRY BLENDER!\nPlease choose the LEADER.");
-ALIGNED(4) const u8 gUnknown_082EF9F8[] = _("RECORD CORNER!\nPlease choose the LEADER.");
-ALIGNED(4) const u8 gUnknown_082EFA24[] = _("COOLNESS CONTEST!\nPlease choose the LEADER.");
-ALIGNED(4) const u8 gUnknown_082EFA50[] = _("BEAUTY CONTEST!\nPlease choose the LEADER.");
-ALIGNED(4) const u8 gUnknown_082EFA7C[] = _("CUTENESS CONTEST!\nPlease choose the LEADER.");
-ALIGNED(4) const u8 gUnknown_082EFAA8[] = _("SMARTNESS CONTEST!\nPlease choose the LEADER.");
-ALIGNED(4) const u8 gUnknown_082EFAD8[] = _("TOUGHNESS CONTEST!\nPlease choose the LEADER.");
-ALIGNED(4) const u8 gUnknown_082EFB08[] = _("BATTLE TOWER LEVEL 50!\nPlease choose the LEADER.");
-ALIGNED(4) const u8 gUnknown_082EFB3C[] = _("BATTLE TOWER OPEN LEVEL!\nPlease choose the LEADER.");
-
-const u8 *const gUnknown_082EFB70[] = {
-    gUnknown_082EF814,
-    gUnknown_082EF844,
-    gUnknown_082EF874,
-    gUnknown_082EF8A4,
-    gUnknown_082EF940,
-    gUnknown_082EF974,
-    gUnknown_082EF99C,
-    gUnknown_082EF8D0,
-    gUnknown_082EF908,
-    NULL,
-    NULL,
-    NULL,
-    gUnknown_082EF9F8,
-    gUnknown_082EF9CC,
-    NULL,
-    gUnknown_082EFA24,
-    gUnknown_082EFA50,
-    gUnknown_082EFA7C,
-    gUnknown_082EFAA8,
-    gUnknown_082EFAD8,
-    gUnknown_082EFB08,
-    gUnknown_082EFB3C
+ALIGNED(4) const u8 sText_ChooseJoinCancel[] = _("{DPAD_UPDOWN}CHOOSE  {A_BUTTON}JOIN  {B_BUTTON}CANCEL");
+ALIGNED(4) const u8 sText_ChooseTrainer[] = _("Please choose a TRAINER.");
+ALIGNED(4) const u8 sText_ChooseTrainerSingleBattle[] = _("Please choose a TRAINER for\na SINGLE BATTLE.");
+ALIGNED(4) const u8 sText_ChooseTrainerDoubleBattle[] = _("Please choose a TRAINER for\na DOUBLE BATTLE.");
+ALIGNED(4) const u8 sText_ChooseLeaderMultiBattle[] = _("Please choose the LEADER\nfor a MULTI BATTLE.");
+ALIGNED(4) const u8 sText_ChooseTrainerToTradeWith[] = _("Please choose the TRAINER to\ntrade with.");
+ALIGNED(4) const u8 sText_ChooseTrainerToShareWonderCards[] = _("Please choose the TRAINER who is\nsharing WONDER CARDS.");
+ALIGNED(4) const u8 sText_ChooseTrainerToShareWonderNews[] = _("Please choose the TRAINER who is\nsharing WONDER NEWS.");
+ALIGNED(4) const u8 sText_ChooseLeaderPokemonJump[] = _("Jump with mini POKéMON!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderBerryCrush[] = _("BERRY CRUSH!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderBerryPicking[] = _("DODRIO BERRY-PICKING!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderBerryBlender[] = _("BERRY BLENDER!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderRecordCorner[] = _("RECORD CORNER!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderCoolContest[] = _("COOLNESS CONTEST!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderBeautyContest[] = _("BEAUTY CONTEST!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderCuteContest[] = _("CUTENESS CONTEST!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderSmartContest[] = _("SMARTNESS CONTEST!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderToughContest[] = _("TOUGHNESS CONTEST!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderBattleTowerLv50[] = _("BATTLE TOWER LEVEL 50!\nPlease choose the LEADER.");
+ALIGNED(4) const u8 sText_ChooseLeaderBattleTowerOpenLv[] = _("BATTLE TOWER OPEN LEVEL!\nPlease choose the LEADER.");
+
+static const u8 *const sChooseTrainerTexts[NUM_LINK_GROUP_TYPES] = 
+{
+    [LINK_GROUP_SINGLE_BATTLE]     = sText_ChooseTrainerSingleBattle,
+    [LINK_GROUP_DOUBLE_BATTLE]     = sText_ChooseTrainerDoubleBattle,
+    [LINK_GROUP_MULTI_BATTLE]      = sText_ChooseLeaderMultiBattle,
+    [LINK_GROUP_TRADE]             = sText_ChooseTrainerToTradeWith,
+    [LINK_GROUP_POKEMON_JUMP]      = sText_ChooseLeaderPokemonJump,
+    [LINK_GROUP_BERRY_CRUSH]       = sText_ChooseLeaderBerryCrush,
+    [LINK_GROUP_BERRY_PICKING]     = sText_ChooseLeaderBerryPicking,
+    [LINK_GROUP_WONDER_CARD]       = sText_ChooseTrainerToShareWonderCards,
+    [LINK_GROUP_WONDER_NEWS]       = sText_ChooseTrainerToShareWonderNews,
+    [LINK_GROUP_UNK_9]             = NULL,
+    [LINK_GROUP_UNK_10]            = NULL,
+    [LINK_GROUP_UNK_11]            = NULL,
+    [LINK_GROUP_RECORD_CORNER]     = sText_ChooseLeaderRecordCorner,
+    [LINK_GROUP_BERRY_BLENDER]     = sText_ChooseLeaderBerryBlender,
+    [LINK_GROUP_UNK_14]            = NULL,
+    [LINK_GROUP_COOL_CONTEST]      = sText_ChooseLeaderCoolContest,
+    [LINK_GROUP_BEAUTY_CONTEST]    = sText_ChooseLeaderBeautyContest,
+    [LINK_GROUP_CUTE_CONTEST]      = sText_ChooseLeaderCuteContest,
+    [LINK_GROUP_SMART_CONTEST]     = sText_ChooseLeaderSmartContest,
+    [LINK_GROUP_TOUGH_CONTEST]     = sText_ChooseLeaderToughContest,
+    [LINK_GROUP_BATTLE_TOWER]      = sText_ChooseLeaderBattleTowerLv50,
+    [LINK_GROUP_BATTLE_TOWER_OPEN] = sText_ChooseLeaderBattleTowerOpenLv
 };
 
 ALIGNED(4) const u8 gUnknown_082EFBC8[] = _("Searching for a WIRELESS\nCOMMUNICATION SYSTEM. Wait...");
@@ -524,39 +525,39 @@ ALIGNED(4) const u8 gUnknown_082EFD7C[] = _("EXIT");
 ALIGNED(4) const u8 gUnknown_082EFD84[] = _("EXIT");
 ALIGNED(4) const u8 gUnknown_082EFD8C[] = _("INFO");
 ALIGNED(4) const u8 gUnknown_082EFD94[] = _("NAME{CLEAR_TO 0x3C}WANTED{CLEAR_TO 0x6E}OFFER{CLEAR_TO 0xC6}LV.");
-ALIGNED(4) const u8 gUnknown_082EFDB0[] = _("SINGLE BATTLE");
-ALIGNED(4) const u8 gUnknown_082EFDC0[] = _("DOUBLE BATTLE");
-ALIGNED(4) const u8 gUnknown_082EFDD0[] = _("MULTI BATTLE");
-ALIGNED(4) const u8 gUnknown_082EFDE0[] = _("POKéMON TRADES");
-ALIGNED(4) const u8 gUnknown_082EFDF0[] = _("CHAT");
-ALIGNED(4) const u8 gUnknown_082EFDF8[] = _("CARDS");
-ALIGNED(4) const u8 gUnknown_082EFE00[] = _("WONDER CARDS");
-ALIGNED(4) const u8 gUnknown_082EFE10[] = _("WONDER NEWS");
-ALIGNED(4) const u8 gUnknown_082EFE1C[] = _("POKéMON JUMP");
-ALIGNED(4) const u8 gUnknown_082EFE2C[] = _("BERRY CRUSH");
-ALIGNED(4) const u8 gUnknown_082EFE38[] = _("BERRY-PICKING");
-ALIGNED(4) const u8 gUnknown_082EFE48[] = _("SEARCH");
-ALIGNED(4) const u8 gUnknown_082EFE50[] = _("BERRY BLENDER");
-ALIGNED(4) const u8 gUnknown_082EFE60[] = _("RECORD CORNER");
-ALIGNED(4) const u8 gUnknown_082EFE70[] = _("COOL CONTEST");
-ALIGNED(4) const u8 gUnknown_082EFE80[] = _("BEAUTY CONTEST");
-ALIGNED(4) const u8 gUnknown_082EFE90[] = _("CUTE CONTEST");
-ALIGNED(4) const u8 gUnknown_082EFEA0[] = _("SMART CONTEST");
-ALIGNED(4) const u8 gUnknown_082EFEB0[] = _("TOUGH CONTEST");
-ALIGNED(4) const u8 gUnknown_082EFEC0[] = _("BATTLE TOWER LV. 50");
-ALIGNED(4) const u8 gUnknown_082EFED4[] = _("BATTLE TOWER OPEN LEVEL");
-ALIGNED(4) const u8 gUnknown_082EFEEC[] = _("It's a NORMAL CARD.");
-ALIGNED(4) const u8 gUnknown_082EFF00[] = _("It's a BRONZE CARD!");
-ALIGNED(4) const u8 gUnknown_082EFF14[] = _("It's a COPPER CARD!");
-ALIGNED(4) const u8 gUnknown_082EFF28[] = _("It's a SILVER CARD!");
-ALIGNED(4) const u8 gUnknown_082EFF3C[] = _("It's a GOLD CARD!");
-
-const u8 *const gUnknown_082EFF50[] = {
-    gUnknown_082EFEEC,
-    gUnknown_082EFF00,
-    gUnknown_082EFF14,
-    gUnknown_082EFF28,
-    gUnknown_082EFF3C
+ALIGNED(4) const u8 sText_SingleBattle[] = _("SINGLE BATTLE");
+ALIGNED(4) const u8 sText_DoubleBattle[] = _("DOUBLE BATTLE");
+ALIGNED(4) const u8 sText_MultiBattle[] = _("MULTI BATTLE");
+ALIGNED(4) const u8 sText_PokemonTrades[] = _("POKéMON TRADES");
+ALIGNED(4) const u8 sText_Chat[] = _("CHAT");
+ALIGNED(4) const u8 sText_Cards[] = _("CARDS");
+ALIGNED(4) const u8 sText_WonderCards[] = _("WONDER CARDS");
+ALIGNED(4) const u8 sText_WonderNews[] = _("WONDER NEWS");
+ALIGNED(4) const u8 sText_PokemonJump[] = _("POKéMON JUMP");
+ALIGNED(4) const u8 sText_BerryCrush[] = _("BERRY CRUSH");
+ALIGNED(4) const u8 sText_BerryPicking[] = _("BERRY-PICKING");
+ALIGNED(4) const u8 sText_Search[] = _("SEARCH");
+ALIGNED(4) const u8 sText_BerryBlender[] = _("BERRY BLENDER");
+ALIGNED(4) const u8 sText_RecordCorner[] = _("RECORD CORNER");
+ALIGNED(4) const u8 sText_CoolContest[] = _("COOL CONTEST");
+ALIGNED(4) const u8 sText_BeautyContest[] = _("BEAUTY CONTEST");
+ALIGNED(4) const u8 sText_CuteContest[] = _("CUTE CONTEST");
+ALIGNED(4) const u8 sText_SmartContest[] = _("SMART CONTEST");
+ALIGNED(4) const u8 sText_ToughContest[] = _("TOUGH CONTEST");
+ALIGNED(4) const u8 sText_BattleTowerLv50[] = _("BATTLE TOWER LV. 50");
+ALIGNED(4) const u8 sText_BattleTowerOpenLv[] = _("BATTLE TOWER OPEN LEVEL");
+ALIGNED(4) const u8 sText_ItsNormalCard[] = _("It's a NORMAL CARD.");
+ALIGNED(4) const u8 sText_ItsBronzeCard[] = _("It's a BRONZE CARD!");
+ALIGNED(4) const u8 sText_ItsCopperCard[] = _("It's a COPPER CARD!");
+ALIGNED(4) const u8 sText_ItsSilverCard[] = _("It's a SILVER CARD!");
+ALIGNED(4) const u8 sText_ItsGoldCard[] = _("It's a GOLD CARD!");
+
+static const u8 *const sCardColorTexts[] = {
+    sText_ItsNormalCard,
+    sText_ItsBronzeCard,
+    sText_ItsCopperCard,
+    sText_ItsSilverCard,
+    sText_ItsGoldCard
 };
 
 ALIGNED(4) const u8 gUnknown_082EFF64[] = _("This is {SPECIAL_F7 0x00} {SPECIAL_F7 0x01}'s\nTRAINER CARD…\l{SPECIAL_F7 0x02}\pPOKéDEX: {SPECIAL_F7 0x03}\nTIME:    {SPECIAL_F7 0x04}:{SPECIAL_F7 0x05}\p");
@@ -573,34 +574,34 @@ ALIGNED(4) const u8 gUnknown_082F0020[] = _("Finished checking {SPECIAL_F7 0x01}
 
 const u8 *const gUnknown_082F0048[] = {
     gText_EmptyString,
-    gUnknown_082EFDB0,
-    gUnknown_082EFDC0,
-    gUnknown_082EFDD0,
-    gUnknown_082EFDE0,
-    gUnknown_082EFDF0,
-    gUnknown_082EFE00,
-    gUnknown_082EFE10,
-    gUnknown_082EFDF8,
-    gUnknown_082EFE1C,
-    gUnknown_082EFE2C,
-    gUnknown_082EFE38,
-    gUnknown_082EFE48,
+    sText_SingleBattle,
+    sText_DoubleBattle,
+    sText_MultiBattle,
+    sText_PokemonTrades,
+    sText_Chat,
+    sText_WonderCards,
+    sText_WonderNews,
+    sText_Cards,
+    sText_PokemonJump,
+    sText_BerryCrush,
+    sText_BerryPicking,
+    sText_Search,
     gText_EmptyString,
-    gUnknown_082EFED4,
-    gUnknown_082EFE60,
-    gUnknown_082EFE50,
+    sText_BattleTowerOpenLv,
+    sText_RecordCorner,
+    sText_BerryBlender,
     gText_EmptyString,
     gText_EmptyString,
     gText_EmptyString,
     gText_EmptyString,
-    gUnknown_082EFE00,
-    gUnknown_082EFE10,
-    gUnknown_082EFE70,
-    gUnknown_082EFE80,
-    gUnknown_082EFE90,
-    gUnknown_082EFEA0,
-    gUnknown_082EFEB0,
-    gUnknown_082EFEC0
+    sText_WonderCards,
+    sText_WonderNews,
+    sText_CoolContest,
+    sText_BeautyContest,
+    sText_CuteContest,
+    sText_SmartContest,
+    sText_ToughContest,
+    sText_BattleTowerLv50
 };
 
 const struct WindowTemplate gUnknown_082F00BC = {
@@ -613,7 +614,7 @@ const struct WindowTemplate gUnknown_082F00BC = {
     .baseBlock = 0x0008
 };
 
-const u32 gUnknown_082F00C4[] = {
+const u32 gUnknown_082F00C4[NUM_LINK_GROUP_TYPES] = {
     0x0201,
     0x0202,
     0x0403,
@@ -1012,7 +1013,7 @@ ALIGNED(4) const u8 gUnknown_082F04CC[] = {0x1b, 0xff};
 ALIGNED(4) const u8 gUnknown_082F04D0[] = {0x1c, 0xff};
 ALIGNED(4) const u8 gUnknown_082F04D4[] = {0x0e, 0xff};
 
-const u8 *const gUnknown_082F04D8[] = {
+const u8 *const gUnknown_082F04D8[NUM_LINK_GROUP_TYPES] = {
     gUnknown_082F0474,
     gUnknown_082F0478,
     gUnknown_082F047C,
@@ -1037,8 +1038,29 @@ const u8 *const gUnknown_082F04D8[] = {
     gUnknown_082F04D4
 };
 
-const u8 gUnknown_082F0530[] = {
-    0x01, 0x02, 0x03, 0x04, 0x09, 0x0a, 0x0b, 0x15,
-    0x16, 0x00, 0x00, 0x00, 0x0f, 0x10, 0x00, 0x17,
-    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x0e, 0x00, 0x00
+// Link group type to ID for gUnknown_02022C2C
+const u8 gUnknown_082F0530[NUM_LINK_GROUP_TYPES + 2] = 
+{
+    0x01, 
+    0x02, 
+    0x03, 
+    0x04, 
+    0x09, 
+    0x0a, 
+    0x0b, 
+    0x15,
+    0x16, 
+    0x00, 
+    0x00, 
+    0x00, 
+    0x0f, 
+    0x10, 
+    0x00, 
+    0x17,
+    0x18, 
+    0x19, 
+    0x1a, 
+    0x1b, 
+    0x1c, 
+    0x0e
 };
diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index 1edb775ba..076859c28 100644
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -752,7 +752,7 @@ static void task0A_fade_n_map_maybe(u8 taskId)
     }
 }
 
-void sub_80AFC60(void)
+void DoContestHallWarp(void)
 {
     ScriptContext2_Enable();
     TryFadeOutOldMapMusic();
diff --git a/src/field_specials.c b/src/field_specials.c
index 3d92f621d..0d9f495a9 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -1410,9 +1410,9 @@ void GiveLeadMonEffortRibbon(void)
     ribbonSet = TRUE;
     leadMon = &gPlayerParty[GetLeadMonIndex()];
     SetMonData(leadMon, MON_DATA_EFFORT_RIBBON, &ribbonSet);
-    if (GetRibbonCount(leadMon) > 4)
+    if (GetRibbonCount(leadMon) > NUM_CUTIES_RIBBONS)
     {
-        sub_80EE4DC(leadMon, 0x47);
+        TryPutSpotTheCutiesOnAir(leadMon, 0x47);
     }
 }
 
diff --git a/src/post_battle_event_funcs.c b/src/post_battle_event_funcs.c
index 41ad37fbf..4fa5d1b21 100644
--- a/src/post_battle_event_funcs.c
+++ b/src/post_battle_event_funcs.c
@@ -9,6 +9,7 @@
 #include "tv.h"
 #include "constants/heal_locations.h"
 #include "constants/flags.h"
+#include "constants/tv.h"
 
 int GameClear(void)
 {
@@ -76,9 +77,9 @@ int GameClear(void)
             }
         }
 
-        if (ribbonCounts[0].count > 4)
+        if (ribbonCounts[0].count > NUM_CUTIES_RIBBONS)
         {
-            sub_80EE4DC(&gPlayerParty[ribbonCounts[0].partyIndex], MON_DATA_CHAMPION_RIBBON);
+            TryPutSpotTheCutiesOnAir(&gPlayerParty[ribbonCounts[0].partyIndex], MON_DATA_CHAMPION_RIBBON);
         }
     }
 
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 02bc026d9..a9be5c3ef 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -461,13 +461,13 @@ bool8 ScrCmd_compare_var_to_var(struct ScriptContext *ctx)
     return FALSE;
 }
 
+// Note: addvar doesn't support adding from a variable in vanilla. If you were to 
+// add a VarGet() to the above, make sure you change the `addvar VAR_*, -1`
+// in the contest scripts to `subvar VAR_*, 1`, else contests will break.
 bool8 ScrCmd_addvar(struct ScriptContext *ctx)
 {
     u16 *ptr = GetVarPointer(ScriptReadHalfword(ctx));
     *ptr += ScriptReadHalfword(ctx);
-    // Note: addvar doesn't support adding from a variable in vanilla. If you were to 
-    // add a VarGet() to the above, make sure you change the `addvar VAR_0x8006, 65535`
-    // in the contest scripts to `subvar VAR_0x8006, 1`, else contests will break.
     return FALSE;
 }
 
@@ -1945,7 +1945,7 @@ bool8 ScrCmd_choosecontestmon(struct ScriptContext *ctx)
 
 bool8 ScrCmd_startcontest(struct ScriptContext *ctx)
 {
-    sub_80F840C();
+    StartContest();
     ScriptContext1_Stop();
     return TRUE;
 }
diff --git a/src/script_pokemon_util_80F87D8.c b/src/script_pokemon_util_80F87D8.c
index 16c5d477a..8c66be30f 100755
--- a/src/script_pokemon_util_80F87D8.c
+++ b/src/script_pokemon_util_80F87D8.c
@@ -29,6 +29,7 @@
 #include "constants/event_objects.h"
 #include "constants/items.h"
 #include "constants/species.h"
+#include "constants/tv.h"
 #include "constants/vars.h"
 #include "constants/battle_frontier.h"
 
@@ -39,8 +40,8 @@ extern const u16 gEventObjectPalette34[];
 
 static const u8 gUnknown_0858D8EC[] = { 3, 4, 5, 14 };
 
-static void sub_80F8EE8(u8 taskId);
-static void sub_80F9088(u8 taskId);
+static void Task_ShowContestEntryMonPic(u8 taskId);
+static void Task_LinkContestWaitForConnection(u8 taskId);
 static void CB2_ReturnFromChooseHalfParty(void);
 static void sub_80F94B8(void);
 
@@ -74,11 +75,11 @@ void sub_80F8814(void)
     gSpecialVar_0x8004 = var1;
 }
 
-void sub_80F8850(void)
+void BufferContestTrainerAndMonNames(void)
 {
-    sub_80F8264();
-    sub_80F8290();
-    sub_80F8438();
+    BufferContestantTrainerName();
+    BufferContestantMonNickname();
+    BufferContestantMonSpecies();
 }
 
 void sub_80F8864(void)
@@ -110,22 +111,22 @@ void sub_80F8864(void)
         gSpecialVar_0x8004 = 1;
 }
 
-void sub_80F88DC(void)
+void SaveMuseumContestPainting(void)
 {
     sub_80DEDA8(0xFF);
 }
 
-void sub_80F88E8(void)
+void ShouldReadyContestArtist(void)
 {
     if (gContestFinalStandings[gContestPlayerMonIndex] == 0
-     && gSpecialVar_ContestRank == 3
+     && gSpecialVar_ContestRank == CONTEST_RANK_MASTER
      && gUnknown_02039F08[gContestPlayerMonIndex] >= 800)
     {
-        gSpecialVar_0x8004 = 1;
+        gSpecialVar_0x8004 = TRUE;
     }
     else
     {
-        gSpecialVar_0x8004 = 0;
+        gSpecialVar_0x8004 = FALSE;
     }
 }
 
@@ -219,11 +220,22 @@ static void ShowContestWinnerCleanup(void)
 
 void ShowContestWinner(void)
 {
+    /*
+    if(gUnknown_0203856C)
+    {
+        sub_80AAF30();
+        gBattleStruct->unk15DDF = 1;
+        gBattleStruct->unk15DDE = sub_80B2C4C(254, 0);
+        Contest_SaveWinner(3);
+        gUnknown_0203856C = 0;
+    }
+    */
+
     SetMainCallback2(CB2_ContestPainting);
     gMain.savedCallback = ShowContestWinnerCleanup;
 }
 
-void sub_80F8AFC(void)
+void SetLinkContestPlayerGfx(void)
 {
     int i;
 
@@ -248,7 +260,7 @@ void sub_80F8AFC(void)
     }
 }
 
-void sub_80F8B94(void)
+void LoadLinkContestPlayerPalettes(void)
 {
     int i;
     u8 eventObjectId;
@@ -287,13 +299,15 @@ u8 GiveMonArtistRibbon(void)
     u8 hasArtistRibbon;
 
     hasArtistRibbon = GetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_ARTIST_RIBBON);
-    if (!hasArtistRibbon && gContestFinalStandings[gContestPlayerMonIndex] == 0 && gSpecialVar_ContestRank == 3
-     && gUnknown_02039F08[gContestPlayerMonIndex] >= 800)
+    if (!hasArtistRibbon 
+        && gContestFinalStandings[gContestPlayerMonIndex] == 0 
+        && gSpecialVar_ContestRank == CONTEST_RANK_MASTER
+        && gUnknown_02039F08[gContestPlayerMonIndex] >= 800)
     {
         hasArtistRibbon = 1;
         SetMonData(&gPlayerParty[gContestMonPartyIndex], MON_DATA_ARTIST_RIBBON, &hasArtistRibbon);
-        if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > 4)
-            sub_80EE4DC(&gPlayerParty[gContestMonPartyIndex], MON_DATA_ARTIST_RIBBON);
+        if (GetRibbonCount(&gPlayerParty[gContestMonPartyIndex]) > NUM_CUTIES_RIBBONS)
+            TryPutSpotTheCutiesOnAir(&gPlayerParty[gContestMonPartyIndex], MON_DATA_ARTIST_RIBBON);
 
         return 1;
     }
@@ -303,9 +317,9 @@ u8 GiveMonArtistRibbon(void)
     }
 }
 
-u8 sub_80F8D24(void)
+bool8 IsContestDebugActive(void)
 {
-    return 0;
+    return FALSE; // gUnknown_0203856C in pokeruby
 }
 
 void ShowContestEntryMonPic(void)
@@ -317,7 +331,7 @@ void ShowContestEntryMonPic(void)
     u8 taskId;
     u8 left, top;
 
-    if (FindTaskIdByFunc(sub_80F8EE8) == 0xFF)
+    if (FindTaskIdByFunc(Task_ShowContestEntryMonPic) == 0xFF)
     {
         AllocateMonSpritesGfx();
         left = 10;
@@ -325,7 +339,7 @@ void ShowContestEntryMonPic(void)
         species = gContestMons[gSpecialVar_0x8006].species;
         personality = gContestMons[gSpecialVar_0x8006].personality;
         otId = gContestMons[gSpecialVar_0x8006].otId;
-        taskId = CreateTask(sub_80F8EE8, 0x50);
+        taskId = CreateTask(Task_ShowContestEntryMonPic, 0x50);
         gTasks[taskId].data[0] = 0;
         gTasks[taskId].data[1] = species;
         if (gSpecialVar_0x8006 == gContestPlayerMonIndex)
@@ -357,9 +371,9 @@ void ShowContestEntryMonPic(void)
     }
 }
 
-void sub_80F8EB8(void)
+void HideContestEntryMonPic(void)
 {
-    u8 taskId = FindTaskIdByFunc(sub_80F8EE8);
+    u8 taskId = FindTaskIdByFunc(Task_ShowContestEntryMonPic);
     if (taskId != 0xFF)
     {
         gTasks[taskId].data[0]++;
@@ -367,7 +381,7 @@ void sub_80F8EB8(void)
     }
 }
 
-static void sub_80F8EE8(u8 taskId)
+static void Task_ShowContestEntryMonPic(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
     struct Sprite *sprite;
@@ -403,10 +417,12 @@ static void sub_80F8EE8(u8 taskId)
 
 void ScriptGetMultiplayerId(void)
 {
-    if ((gLinkContestFlags & LINK_CONTEST_FLAG_IS_LINK) && gNumLinkContestPlayers == 4 && !(gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS))
+    if ((gLinkContestFlags & LINK_CONTEST_FLAG_IS_LINK) 
+        && gNumLinkContestPlayers == CONTESTANT_COUNT 
+        && !(gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS))
         gSpecialVar_Result = GetMultiplayerId();
     else
-        gSpecialVar_Result = 4;
+        gSpecialVar_Result = MAX_LINK_PLAYERS;
 }
 
 void ScriptRandom(void)
@@ -428,26 +444,26 @@ void ScriptRandom(void)
     *scriptPtr = random % *scriptPtr;
 }
 
-u16 sub_80F903C(void)
+u16 GetContestRand(void)
 {
     gContestRngValue = 1103515245 * gContestRngValue + 24691;
     return gContestRngValue >> 16;
 }
 
-u8 sub_80F905C(void)
+bool8 LinkContestWaitForConnection(void)
 {
     if (gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS)
     {
-        CreateTask(sub_80F9088, 5);
-        return 1;
+        CreateTask(Task_LinkContestWaitForConnection, 5);
+        return TRUE;
     }
     else
     {
-        return 0;
+        return FALSE;
     }
 }
 
-static void sub_80F9088(u8 taskId)
+static void Task_LinkContestWaitForConnection(u8 taskId)
 {
     switch (gTasks[taskId].data[0])
     {
@@ -471,7 +487,7 @@ static void sub_80F9088(u8 taskId)
     }
 }
 
-void sub_80F90DC(void)
+void LinkContestTryShowWirelessIndicator(void)
 {
     if (gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS)
     {
@@ -483,7 +499,7 @@ void sub_80F90DC(void)
     }
 }
 
-void sub_80F910C(void)
+void LinkContestTryHideWirelessIndicator(void)
 {
     if (gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS)
     {
@@ -492,25 +508,25 @@ void sub_80F910C(void)
     }
 }
 
-u8 sub_80F9134(void)
+bool8 IsContestWithRSPlayer(void)
 {
     if (gLinkContestFlags & LINK_CONTEST_FLAG_HAS_RS_PLAYER)
-        return 1;
+        return TRUE;
     else
-        return 0;
+        return FALSE;
 }
 
-void sub_80F9154(void)
+void ClearLinkContestFlags(void)
 {
     gLinkContestFlags = 0;
 }
 
-u8 sub_80F9160(void)
+bool8 IsWirelessContest(void)
 {
     if (gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS)
-        return 1;
+        return TRUE;
     else
-        return 0;
+        return FALSE;
 }
 
 void HealPlayerParty(void)
diff --git a/src/tv.c b/src/tv.c
index cb44fdb62..ba0548a86 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -2365,7 +2365,7 @@ void sub_80EE44C(u8 nMonsCaught, u8 nPkblkUsed)
     }
 }
 
-void sub_80EE4DC(struct Pokemon *pokemon, u8 ribbonMonDataIdx)
+void TryPutSpotTheCutiesOnAir(struct Pokemon *pokemon, u8 ribbonMonDataIdx)
 {
     TVShow *show;
 
diff --git a/src/union_room.c b/src/union_room.c
index 93b64a41e..d6b712558 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -52,6 +52,7 @@
 #include "constants/rgb.h"
 #include "constants/songs.h"
 #include "constants/species.h"
+#include "constants/union_room.h"
 
 EWRAM_DATA u8 sUnionRoomPlayerName[12] = {};
 EWRAM_DATA u8 gUnknown_02022C2C = 0;
@@ -236,7 +237,7 @@ void sub_8012780(u8 taskId)
     switch (data->state)
     {
     case 0:
-        if (gSpecialVar_0x8004 == 20 && gSaveBlock2Ptr->frontier.lvlMode == FRONTIER_LVL_OPEN)
+        if (gSpecialVar_0x8004 == LINK_GROUP_BATTLE_TOWER && gSaveBlock2Ptr->frontier.lvlMode == FRONTIER_LVL_OPEN)
             gSpecialVar_0x8004++;
         gUnknown_02022C2C = gUnknown_082F00C4[gSpecialVar_0x8004];
         gUnknown_02022C2D = gUnknown_082F00C4[gSpecialVar_0x8004] >> 8;
@@ -818,7 +819,7 @@ void sub_80134E8(u8 taskId)
     switch (data->state)
     {
     case 0:
-        if (gSpecialVar_0x8004 == 20 && gSaveBlock2Ptr->frontier.lvlMode == FRONTIER_LVL_OPEN)
+        if (gSpecialVar_0x8004 == LINK_GROUP_BATTLE_TOWER && gSaveBlock2Ptr->frontier.lvlMode == FRONTIER_LVL_OPEN)
             gSpecialVar_0x8004++;
         gUnknown_02022C2C = gUnknown_082F0530[gSpecialVar_0x8004];
         sub_8010F84(gUnknown_02022C2C, 0, 0);
@@ -830,7 +831,7 @@ void sub_80134E8(u8 taskId)
         data->state = 1;
         break;
     case 1:
-        if (PrintOnTextbox(&data->textState, gUnknown_082EFB70[gSpecialVar_0x8004]))
+        if (PrintOnTextbox(&data->textState, sChooseTrainerTexts[gSpecialVar_0x8004]))
             data->state = 2;
         break;
     case 2:
@@ -842,7 +843,7 @@ void sub_80134E8(u8 taskId)
         data->field_D = AddWindow(&gUnknown_082F017C);
 
         FillWindowPixelBuffer(data->field_C, PIXEL_FILL(2));
-        sub_80173E0(data->field_C, 0, gUnknown_082EF7DC, 8, 1, 4);
+        sub_80173E0(data->field_C, 0, sText_ChooseJoinCancel, 8, 1, 4);
         PutWindowTilemap(data->field_C);
         CopyWindowToVram(data->field_C, 2);
 
@@ -1898,7 +1899,7 @@ void sub_8014F48(u8 taskId)
         data->state = 1;
         break;
     case 1:
-        AddTextPrinterToWindow1(gUnknown_082EF7F8);
+        AddTextPrinterToWindow1(sText_ChooseTrainer);
         data->state = 2;
         break;
     case 2:
@@ -4282,7 +4283,7 @@ void sub_8018220(u8 *unused, struct UnkStruct_URoom *arg1, bool8 arg2)
 
     DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, trainerCard->playerName);
 
-    StringCopy(arg1->field_174, gUnknown_082EFF50[trainerCard->stars]);
+    StringCopy(arg1->field_174, sCardColorTexts[trainerCard->stars]);
     DynamicPlaceholderTextUtil_SetPlaceholderPtr(2, arg1->field_174);
 
     ConvertIntToDecimalStringN(arg1->field_C0[2], trainerCard->caughtMonsCount, STR_CONV_MODE_LEFT_ALIGN, 3);