Merge branch 'master' into doc-scriptclean

113 files changed, 3826 insertions, 3905 deletions

diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index 20b5f3e60..af4ada031 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -891,7 +891,7 @@
 	.endm
 
 	@ Draws an image of the winner of the contest. In FireRed, this command is a nop. (The argument is discarded.)
-	.macro drawcontestwinner a:req
+	.macro showcontestwinner a:req
 	.byte 0x77
 	.byte \a
 	.endm
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 9dfc8c891..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"
@@ -1103,7 +1093,7 @@ Common_EventScript_LegendaryFlewAway:: @ 8273776
 	.include "data/scripts/day_care.inc"
 	.include "data/scripts/flash.inc"
 	.include "data/scripts/players_house.inc"
-	.include "data/scripts/pokeblocks.inc"
+	.include "data/scripts/berry_blender.inc"
 	.include "data/text/mauville_man.inc"
 	.include "data/text/trainers.inc"
 	.include "data/scripts/repel.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 1b8585b58..2936218d8 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/map.json b/data/maps/LilycoveCity/map.json
index 26f0ad36d..4f7c3ab0f 100644
--- a/data/maps/LilycoveCity/map.json
+++ b/data/maps/LilycoveCity/map.json
@@ -35,7 +35,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2C53",
+      "script": "LilycoveCity_EventScript_Sailor2",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2C2B",
+      "script": "LilycoveCity_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -61,7 +61,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2C22",
+      "script": "LilycoveCity_EventScript_Man3",
       "flag": "0"
     },
     {
@@ -74,7 +74,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2C4A",
+      "script": "LilycoveCity_EventScript_RichBoy",
       "flag": "0"
     },
     {
@@ -87,7 +87,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2C91",
+      "script": "LilycoveCity_EventScript_Man2",
       "flag": "0"
     },
     {
@@ -100,7 +100,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2C72",
+      "script": "LilycoveCity_EventScript_Woman2",
       "flag": "0"
     },
     {
@@ -113,7 +113,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2C9A",
+      "script": "LilycoveCity_EventScript_ExpertM1",
       "flag": "0"
     },
     {
@@ -126,7 +126,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2CA3",
+      "script": "LilycoveCity_EventScript_ExpertF",
       "flag": "0"
     },
     {
@@ -139,7 +139,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2CAC",
+      "script": "LilycoveCity_EventScript_ExpertM2",
       "flag": "0"
     },
     {
@@ -152,7 +152,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2D7D",
+      "script": "LilycoveCity_EventScript_WailmerTrainerGrunt",
       "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS"
     },
     {
@@ -178,7 +178,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2DD5",
+      "script": "LilycoveCity_EventScript_AquaGrunt4",
       "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS"
     },
     {
@@ -191,7 +191,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2DBA",
+      "script": "LilycoveCity_EventScript_AquaGrunt1",
       "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS"
     },
     {
@@ -204,7 +204,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2DC3",
+      "script": "LilycoveCity_EventScript_AquaGrunt2",
       "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS"
     },
     {
@@ -217,7 +217,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2DCC",
+      "script": "LilycoveCity_EventScript_AquaGrunt3",
       "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS"
     },
     {
@@ -230,7 +230,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2BD8",
+      "script": "LilycoveCity_EventScript_BerryGentleman",
       "flag": "0"
     },
     {
@@ -243,7 +243,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2DDE",
+      "script": "LilycoveCity_EventScript_Rival",
       "flag": "FLAG_HIDE_LILYCOVE_CITY_RIVAL"
     },
     {
@@ -256,7 +256,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E302D",
+      "script": "LilycoveCity_EventScript_SchoolKidM",
       "flag": "0"
     },
     {
@@ -269,7 +269,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2CEE",
+      "script": "LilycoveCity_EventScript_Woman1",
       "flag": "0"
     },
     {
@@ -282,7 +282,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2CDD",
+      "script": "LilycoveCity_EventScript_Man1",
       "flag": "0"
     },
     {
@@ -295,7 +295,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2CCB",
+      "script": "LilycoveCity_EventScript_Sailor1",
       "flag": "0"
     },
     {
@@ -308,7 +308,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_EventScript_1E2CD4",
+      "script": "LilycoveCity_EventScript_FatMan",
       "flag": "0"
     }
   ],
@@ -420,7 +420,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_EventScript_1E2D1A"
+      "script": "LilycoveCity_EventScript_MuseumSign"
     },
     {
       "type": "sign",
@@ -436,7 +436,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_EventScript_1E2D6B"
+      "script": "LilycoveCity_EventScript_DepartmentStoreSign"
     },
     {
       "type": "sign",
@@ -452,7 +452,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_EventScript_1E2CFF"
+      "script": "LilycoveCity_EventScript_CitySign"
     },
     {
       "type": "sign",
@@ -460,7 +460,7 @@
       "y": 24,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_EventScript_1E2D08"
+      "script": "LilycoveCity_EventScript_ContestHallSign"
     },
     {
       "type": "sign",
@@ -468,7 +468,7 @@
       "y": 24,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_EventScript_1E2D11"
+      "script": "LilycoveCity_EventScript_MotelSign"
     },
     {
       "type": "sign",
@@ -476,7 +476,7 @@
       "y": 30,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_EventScript_1E2D44"
+      "script": "LilycoveCity_EventScript_HarborSign"
     },
     {
       "type": "sign",
@@ -484,7 +484,7 @@
       "y": 14,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_EventScript_1E2D62"
+      "script": "LilycoveCity_EventScript_TrainerFanClubSign"
     },
     {
       "type": "sign",
@@ -492,7 +492,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_EventScript_1E2D74"
+      "script": "LilycoveCity_EventScript_MoveDeletersHouseSign"
     },
     {
       "type": "hidden_item",
diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc
index b0d52d9f7..66746ad37 100644
--- a/data/maps/LilycoveCity/scripts.inc
+++ b/data/maps/LilycoveCity/scripts.inc
@@ -1,21 +1,21 @@
 LilycoveCity_MapScripts:: @ 81E2B3C
 	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_MapScript1_1E2B61
+	map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_OnLoad
 	.byte 0
 
 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
 	end
 
-LilycoveCity_MapScript1_1E2B61: @ 81E2B61
-	call_if_unset FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_1E2B6B
+LilycoveCity_OnLoad: @ 81E2B61
+	call_if_unset FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_SetWailmerMetatiles
 	end
 
-LilycoveCity_EventScript_1E2B6B:: @ 81E2B6B
+LilycoveCity_EventScript_SetWailmerMetatiles:: @ 81E2B6B
 	setmetatile 76, 12, METATILE_Lilycove_Wailmer0, 1
 	setmetatile 77, 12, METATILE_Lilycove_Wailmer1, 1
 	setmetatile 76, 13, METATILE_Lilycove_Wailmer2, 1
@@ -30,362 +30,362 @@ LilycoveCity_EventScript_1E2B6B:: @ 81E2B6B
 	setmetatile 78, 17, METATILE_Lilycove_Wailmer3, 1
 	return
 
-LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8
+LilycoveCity_EventScript_BerryGentleman:: @ 81E2BD8
 	lock
 	faceplayer
 	dotimebasedevents
-	goto_if_set FLAG_DAILY_LILYCOVE_RECEIVED_BERRY, LilycoveCity_EventScript_1E2C18
-	msgbox LilycoveCity_Text_2A7244, MSGBOX_DEFAULT
+	goto_if_set FLAG_DAILY_LILYCOVE_RECEIVED_BERRY, LilycoveCity_EventScript_ReceivedBerry
+	msgbox LilycoveCity_Text_BerrySuitsYou, MSGBOX_DEFAULT
 	random 10
 	addvar VAR_RESULT, FIRST_BERRY_INDEX
 	giveitem_std VAR_RESULT
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_LILYCOVE_RECEIVED_BERRY
-	msgbox LilycoveCity_Text_2A72E3, MSGBOX_DEFAULT
+	msgbox LilycoveCity_Text_BecauseYoureTrainer, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_EventScript_1E2C18:: @ 81E2C18
-	msgbox LilycoveCity_Text_2A7321, MSGBOX_DEFAULT
+LilycoveCity_EventScript_ReceivedBerry:: @ 81E2C18
+	msgbox LilycoveCity_Text_PokeblocksSuitPokemon, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_EventScript_1E2C22:: @ 81E2C22
-	msgbox LilycoveCity_Text_1E3D9E, MSGBOX_NPC
+LilycoveCity_EventScript_Man3:: @ 81E2C22
+	msgbox LilycoveCity_Text_ContestHallInTown, MSGBOX_NPC
 	end
 
-LilycoveCity_EventScript_1E2C2B:: @ 81E2C2B
+LilycoveCity_EventScript_Girl:: @ 81E2C2B
 	lock
 	faceplayer
-	goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_1E2C40
-	msgbox LilycoveCity_Text_1E3E3C, MSGBOX_DEFAULT
+	goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_GirlAquaGone
+	msgbox LilycoveCity_Text_StrangeCaveInCove, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_EventScript_1E2C40:: @ 81E2C40
-	msgbox LilycoveCity_Text_1E3E7D, MSGBOX_DEFAULT
+LilycoveCity_EventScript_GirlAquaGone:: @ 81E2C40
+	msgbox LilycoveCity_Text_GoingToMoveDeleterForHMs, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_EventScript_1E2C4A:: @ 81E2C4A
-	msgbox LilycoveCity_Text_1E3F05, MSGBOX_NPC
+LilycoveCity_EventScript_RichBoy:: @ 81E2C4A
+	msgbox LilycoveCity_Text_ImFromKanto, MSGBOX_NPC
 	end
 
-LilycoveCity_EventScript_1E2C53:: @ 81E2C53
+LilycoveCity_EventScript_Sailor2:: @ 81E2C53
 	lock
 	faceplayer
-	goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_1E2C68
-	msgbox LilycoveCity_Text_1E3FAB, MSGBOX_DEFAULT
+	goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_Sailor2AquaGone
+	msgbox LilycoveCity_Text_TeamAquaBeenTrainingWailmer, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_EventScript_1E2C68:: @ 81E2C68
-	msgbox LilycoveCity_Text_1E4020, MSGBOX_DEFAULT
+LilycoveCity_EventScript_Sailor2AquaGone:: @ 81E2C68
+	msgbox LilycoveCity_Text_SomeonePuntedTeamAquaOut, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_EventScript_1E2C72:: @ 81E2C72
+LilycoveCity_EventScript_Woman2:: @ 81E2C72
 	lock
 	faceplayer
-	goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_1E2C87
-	msgbox LilycoveCity_Text_1E40AD, MSGBOX_DEFAULT
+	goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_Woman2AquaGone
+	msgbox LilycoveCity_Text_SomeoneStoleMyPokemon, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_EventScript_1E2C87:: @ 81E2C87
-	msgbox LilycoveCity_Text_1E4145, MSGBOX_DEFAULT
+LilycoveCity_EventScript_Woman2AquaGone:: @ 81E2C87
+	msgbox LilycoveCity_Text_MissingPokemonCameBack, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_EventScript_1E2C91:: @ 81E2C91
-	msgbox LilycoveCity_Text_1E417B, MSGBOX_NPC
+LilycoveCity_EventScript_Man2:: @ 81E2C91
+	msgbox LilycoveCity_Text_ImArtDealer, MSGBOX_NPC
 	end
 
-LilycoveCity_EventScript_1E2C9A:: @ 81E2C9A
-	msgbox LilycoveCity_Text_1E420B, MSGBOX_SIGN
+LilycoveCity_EventScript_ExpertM1:: @ 81E2C9A
+	msgbox LilycoveCity_Text_SeaRemainsForeverYoung, MSGBOX_SIGN
 	end
 
-LilycoveCity_EventScript_1E2CA3:: @ 81E2CA3
-	msgbox LilycoveCity_Text_1E4283, MSGBOX_SIGN
+LilycoveCity_EventScript_ExpertF:: @ 81E2CA3
+	msgbox LilycoveCity_Text_SixtyYearsAgoHusbandProposed, MSGBOX_SIGN
 	end
 
-LilycoveCity_EventScript_1E2CAC:: @ 81E2CAC
+LilycoveCity_EventScript_ExpertM2:: @ 81E2CAC
 	lock
 	faceplayer
-	goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_1E2CC1
-	msgbox LilycoveCity_Text_1E42FC, MSGBOX_DEFAULT
+	goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_ExpertM2AquaGone
+	msgbox LilycoveCity_Text_TeamAquaRenovatedCavern, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_EventScript_1E2CC1:: @ 81E2CC1
-	msgbox LilycoveCity_Text_1E43FF, MSGBOX_DEFAULT
+LilycoveCity_EventScript_ExpertM2AquaGone:: @ 81E2CC1
+	msgbox LilycoveCity_Text_TeamAquaLotGoneForGood, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_EventScript_1E2CCB:: @ 81E2CCB
-	msgbox LilycoveCity_Text_1E48A5, MSGBOX_NPC
+LilycoveCity_EventScript_Sailor1:: @ 81E2CCB
+	msgbox LilycoveCity_Text_HeardTowerCalledSkyPillar, MSGBOX_NPC
 	end
 
-LilycoveCity_EventScript_1E2CD4:: @ 81E2CD4
-	msgbox LilycoveCity_Text_1E4902, MSGBOX_NPC
+LilycoveCity_EventScript_FatMan:: @ 81E2CD4
+	msgbox LilycoveCity_Text_SawTallTowerOnRoute131, MSGBOX_NPC
 	end
 
-LilycoveCity_EventScript_1E2CDD:: @ 81E2CDD
+LilycoveCity_EventScript_Man1:: @ 81E2CDD
 	lockall
-	msgbox LilycoveCity_Text_1E494D, MSGBOX_NPC
+	msgbox LilycoveCity_Text_JustArrivedAndSawRarePokemon, MSGBOX_NPC
 	applymovement 20, Common_Movement_FaceOriginalDirection
 	end
 
-LilycoveCity_EventScript_1E2CEE:: @ 81E2CEE
+LilycoveCity_EventScript_Woman1:: @ 81E2CEE
 	lockall
-	msgbox LilycoveCity_Text_1E49F4, MSGBOX_NPC
+	msgbox LilycoveCity_Text_HoneymoonVowToSeeRarePokemon, MSGBOX_NPC
 	applymovement 19, Common_Movement_FaceOriginalDirection
 	end
 
-LilycoveCity_EventScript_1E2CFF:: @ 81E2CFF
-	msgbox LilycoveCity_Text_1E448B, MSGBOX_SIGN
+LilycoveCity_EventScript_CitySign:: @ 81E2CFF
+	msgbox LilycoveCity_Text_CitySign, MSGBOX_SIGN
 	end
 
-LilycoveCity_EventScript_1E2D08:: @ 81E2D08
-	msgbox LilycoveCity_Text_1E44C3, MSGBOX_SIGN
+LilycoveCity_EventScript_ContestHallSign:: @ 81E2D08
+	msgbox LilycoveCity_Text_ContestHallSign, MSGBOX_SIGN
 	end
 
-LilycoveCity_EventScript_1E2D11:: @ 81E2D11
-	msgbox LilycoveCity_Text_1E44FC, MSGBOX_SIGN
+LilycoveCity_EventScript_MotelSign:: @ 81E2D11
+	msgbox LilycoveCity_Text_MotelSign, MSGBOX_SIGN
 	end
 
-LilycoveCity_EventScript_1E2D1A:: @ 81E2D1A
+LilycoveCity_EventScript_MuseumSign:: @ 81E2D1A
 	lockall
 	specialvar VAR_0x8004, CountPlayerContestPaintings
 	switch VAR_0x8004
-	case 0, LilycoveCity_EventScript_1E2D3A
-	msgbox LilycoveCity_Text_1E4571, MSGBOX_DEFAULT
+	case 0, LilycoveCity_EventScript_MuseumSignNoPaintings
+	msgbox LilycoveCity_Text_MuseumSignPlayersExhibit, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_EventScript_1E2D3A:: @ 81E2D3A
-	msgbox LilycoveCity_Text_1E4534, MSGBOX_DEFAULT
+LilycoveCity_EventScript_MuseumSignNoPaintings:: @ 81E2D3A
+	msgbox LilycoveCity_Text_MuseumSign, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_EventScript_1E2D44:: @ 81E2D44
+LilycoveCity_EventScript_HarborSign:: @ 81E2D44
 	lockall
-	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_1E2D58
-	msgbox LilycoveCity_Text_1E45A7, MSGBOX_DEFAULT
+	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_HarborSignFerryReady
+	msgbox LilycoveCity_Text_HarborSignUnderConstruction, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_EventScript_1E2D58:: @ 81E2D58
-	msgbox LilycoveCity_Text_1E4624, MSGBOX_DEFAULT
+LilycoveCity_EventScript_HarborSignFerryReady:: @ 81E2D58
+	msgbox LilycoveCity_Text_HarborSign, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_EventScript_1E2D62:: @ 81E2D62
-	msgbox LilycoveCity_Text_1E466E, MSGBOX_SIGN
+LilycoveCity_EventScript_TrainerFanClubSign:: @ 81E2D62
+	msgbox LilycoveCity_Text_TrainerFanClubSign, MSGBOX_SIGN
 	end
 
-LilycoveCity_EventScript_1E2D6B:: @ 81E2D6B
-	msgbox LilycoveCity_Text_1E46BE, MSGBOX_SIGN
+LilycoveCity_EventScript_DepartmentStoreSign:: @ 81E2D6B
+	msgbox LilycoveCity_Text_DepartmentStoreSign, MSGBOX_SIGN
 	end
 
-LilycoveCity_EventScript_1E2D74:: @ 81E2D74
-	msgbox LilycoveCity_Text_1E473D, MSGBOX_SIGN
+LilycoveCity_EventScript_MoveDeletersHouseSign:: @ 81E2D74
+	msgbox LilycoveCity_Text_MoveDeletersHouseSign, MSGBOX_SIGN
 	end
 
-LilycoveCity_EventScript_1E2D7D:: @ 81E2D7D
+LilycoveCity_EventScript_WailmerTrainerGrunt:: @ 81E2D7D
 	lockall
-	goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_1E2DB0
-	msgbox LilycoveCity_Text_1E3D1F, MSGBOX_DEFAULT
+	goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_MetWailmerTrainer
+	msgbox LilycoveCity_Text_WailmerLeapOutOfWater, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox LilycoveCity_Text_1E3D4A, MSGBOX_DEFAULT
+	msgbox LilycoveCity_Text_GetLostMessingUpTraining, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	setflag FLAG_MET_WAILMER_TRAINER
 	releaseall
 	end
 
-LilycoveCity_EventScript_1E2DB0:: @ 81E2DB0
-	msgbox LilycoveCity_Text_1E3D1F, MSGBOX_DEFAULT
+LilycoveCity_EventScript_MetWailmerTrainer:: @ 81E2DB0
+	msgbox LilycoveCity_Text_WailmerLeapOutOfWater, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_EventScript_1E2DBA:: @ 81E2DBA
-	msgbox LilycoveCity_Text_1E3B2C, MSGBOX_NPC
+LilycoveCity_EventScript_AquaGrunt1:: @ 81E2DBA
+	msgbox LilycoveCity_Text_MovedLootIntoHideoutToday, MSGBOX_NPC
 	end
 
-LilycoveCity_EventScript_1E2DC3:: @ 81E2DC3
-	msgbox LilycoveCity_Text_1E3B95, MSGBOX_NPC
+LilycoveCity_EventScript_AquaGrunt2:: @ 81E2DC3
+	msgbox LilycoveCity_Text_ChanceToDoBigThings, MSGBOX_NPC
 	end
 
-LilycoveCity_EventScript_1E2DCC:: @ 81E2DCC
-	msgbox LilycoveCity_Text_1E3C46, MSGBOX_NPC
+LilycoveCity_EventScript_AquaGrunt3:: @ 81E2DCC
+	msgbox LilycoveCity_Text_DontGoNearCaveInCove, MSGBOX_NPC
 	end
 
-LilycoveCity_EventScript_1E2DD5:: @ 81E2DD5
-	msgbox LilycoveCity_Text_1E3CBE, MSGBOX_NPC
+LilycoveCity_EventScript_AquaGrunt4:: @ 81E2DD5
+	msgbox LilycoveCity_Text_IfWorldBecomesOurs, MSGBOX_NPC
 	end
 
-LilycoveCity_EventScript_1E2DDE:: @ 81E2DDE
+LilycoveCity_EventScript_Rival:: @ 81E2DDE
 	lock
 	faceplayer
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq LilycoveCity_EventScript_1E2DF8
+	goto_if_eq LilycoveCity_EventScript_May
 	compare VAR_RESULT, FEMALE
-	goto_if_eq LilycoveCity_EventScript_1E2E6B
+	goto_if_eq LilycoveCity_EventScript_Brendan
 	end
 
-LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8
+LilycoveCity_EventScript_May:: @ 81E2DF8
 	playbgm MUS_GIRL_SUP, 1
-	call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2E48
-	call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2E51
+	call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_MayAskToBattleAgain
+	call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_MayAskToBattle
 	compare VAR_RESULT, NO
-	goto_if_eq LilycoveCity_EventScript_1E2E5A
-	msgbox LilycoveCity_Text_1E3234, MSGBOX_DEFAULT
+	goto_if_eq LilycoveCity_EventScript_DeclineMayBattle
+	msgbox LilycoveCity_Text_MayWontBeBeaten, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
-	case 0, LilycoveCity_EventScript_1E2EDE
-	case 1, LilycoveCity_EventScript_1E2EEE
-	case 2, LilycoveCity_EventScript_1E2EFE
+	case 0, LilycoveCity_EventScript_BattleMayTreecko
+	case 1, LilycoveCity_EventScript_BattleMayTorchic
+	case 2, LilycoveCity_EventScript_BattleMayMudkip
 	end
 
-LilycoveCity_EventScript_1E2E48:: @ 81E2E48
-	msgbox LilycoveCity_Text_1E31F5, MSGBOX_YESNO
+LilycoveCity_EventScript_MayAskToBattleAgain:: @ 81E2E48
+	msgbox LilycoveCity_Text_MayBattleMe, MSGBOX_YESNO
 	return
 
-LilycoveCity_EventScript_1E2E51:: @ 81E2E51
-	msgbox LilycoveCity_Text_1E3061, MSGBOX_YESNO
+LilycoveCity_EventScript_MayAskToBattle:: @ 81E2E51
+	msgbox LilycoveCity_Text_MayShoppingLetsBattle, MSGBOX_YESNO
 	return
 
-LilycoveCity_EventScript_1E2E5A:: @ 81E2E5A
+LilycoveCity_EventScript_DeclineMayBattle:: @ 81E2E5A
 	setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
-	msgbox LilycoveCity_Text_1E318D, MSGBOX_DEFAULT
+	msgbox LilycoveCity_Text_MayNotRaisingPokemon, MSGBOX_DEFAULT
 	savebgm MUS_DUMMY
 	fadedefaultbgm
 	release
 	end
 
-LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B
+LilycoveCity_EventScript_Brendan:: @ 81E2E6B
 	playbgm MUS_BOY_SUP, 1
-	call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2EBB
-	call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2EC4
+	call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_BrendanAskToBattleAgain
+	call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_BrendanAskToBattle
 	compare VAR_RESULT, NO
-	goto_if_eq LilycoveCity_EventScript_1E2ECD
-	msgbox LilycoveCity_Text_1E373C, MSGBOX_DEFAULT
+	goto_if_eq LilycoveCity_EventScript_DeclineBrendanBattle
+	msgbox LilycoveCity_Text_BrendanWontBeBeaten, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
-	case 0, LilycoveCity_EventScript_1E2F0E
-	case 1, LilycoveCity_EventScript_1E2F1E
-	case 2, LilycoveCity_EventScript_1E2F2E
+	case 0, LilycoveCity_EventScript_BattleBrendanTreecko
+	case 1, LilycoveCity_EventScript_BattleBrendanTorchic
+	case 2, LilycoveCity_EventScript_BattleBrendanMudkip
 	end
 
-LilycoveCity_EventScript_1E2EBB:: @ 81E2EBB
-	msgbox LilycoveCity_Text_1E36FA, MSGBOX_YESNO
+LilycoveCity_EventScript_BrendanAskToBattleAgain:: @ 81E2EBB
+	msgbox LilycoveCity_Text_BrendanBattleMe, MSGBOX_YESNO
 	return
 
-LilycoveCity_EventScript_1E2EC4:: @ 81E2EC4
-	msgbox LilycoveCity_Text_1E3608, MSGBOX_YESNO
+LilycoveCity_EventScript_BrendanAskToBattle:: @ 81E2EC4
+	msgbox LilycoveCity_Text_BrendanShoppingLetsBattle, MSGBOX_YESNO
 	return
 
-LilycoveCity_EventScript_1E2ECD:: @ 81E2ECD
+LilycoveCity_EventScript_DeclineBrendanBattle:: @ 81E2ECD
 	setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
-	msgbox LilycoveCity_Text_1E36BF, MSGBOX_DEFAULT
+	msgbox LilycoveCity_Text_BrendanNoConfidence, MSGBOX_DEFAULT
 	savebgm MUS_DUMMY
 	fadedefaultbgm
 	release
 	end
 
-LilycoveCity_EventScript_1E2EDE:: @ 81E2EDE
-	trainerbattle_no_intro TRAINER_MAY_12, LilycoveCity_Text_1E3275
-	goto LilycoveCity_EventScript_1E2F3E
+LilycoveCity_EventScript_BattleMayTreecko:: @ 81E2EDE
+	trainerbattle_no_intro TRAINER_MAY_12, LilycoveCity_Text_MayDefeat
+	goto LilycoveCity_EventScript_DefeatedMay
 	end
 
-LilycoveCity_EventScript_1E2EEE:: @ 81E2EEE
-	trainerbattle_no_intro TRAINER_MAY_13, LilycoveCity_Text_1E3275
-	goto LilycoveCity_EventScript_1E2F3E
+LilycoveCity_EventScript_BattleMayTorchic:: @ 81E2EEE
+	trainerbattle_no_intro TRAINER_MAY_13, LilycoveCity_Text_MayDefeat
+	goto LilycoveCity_EventScript_DefeatedMay
 	end
 
-LilycoveCity_EventScript_1E2EFE:: @ 81E2EFE
-	trainerbattle_no_intro TRAINER_MAY_11, LilycoveCity_Text_1E3275
-	goto LilycoveCity_EventScript_1E2F3E
+LilycoveCity_EventScript_BattleMayMudkip:: @ 81E2EFE
+	trainerbattle_no_intro TRAINER_MAY_11, LilycoveCity_Text_MayDefeat
+	goto LilycoveCity_EventScript_DefeatedMay
 	end
 
-LilycoveCity_EventScript_1E2F0E:: @ 81E2F0E
-	trainerbattle_no_intro TRAINER_BRENDAN_14, LilycoveCity_Text_1E3777
-	goto LilycoveCity_EventScript_1E2FAA
+LilycoveCity_EventScript_BattleBrendanTreecko:: @ 81E2F0E
+	trainerbattle_no_intro TRAINER_BRENDAN_14, LilycoveCity_Text_BrendanDefeat
+	goto LilycoveCity_EventScript_DefeatedBrendan
 	end
 
-LilycoveCity_EventScript_1E2F1E:: @ 81E2F1E
-	trainerbattle_no_intro TRAINER_BRENDAN_15, LilycoveCity_Text_1E3777
-	goto LilycoveCity_EventScript_1E2FAA
+LilycoveCity_EventScript_BattleBrendanTorchic:: @ 81E2F1E
+	trainerbattle_no_intro TRAINER_BRENDAN_15, LilycoveCity_Text_BrendanDefeat
+	goto LilycoveCity_EventScript_DefeatedBrendan
 	end
 
-LilycoveCity_EventScript_1E2F2E:: @ 81E2F2E
-	trainerbattle_no_intro TRAINER_BRENDAN_13, LilycoveCity_Text_1E3777
-	goto LilycoveCity_EventScript_1E2FAA
+LilycoveCity_EventScript_BattleBrendanMudkip:: @ 81E2F2E
+	trainerbattle_no_intro TRAINER_BRENDAN_13, LilycoveCity_Text_BrendanDefeat
+	goto LilycoveCity_EventScript_DefeatedBrendan
 	end
 
-LilycoveCity_EventScript_1E2F3E:: @ 81E2F3E
-	msgbox LilycoveCity_Text_1E32FB, MSGBOX_DEFAULT
-	setvar VAR_RESULT, 0
-	call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_1E2F76
-	compare VAR_RESULT, 0
-	call_if_eq LilycoveCity_EventScript_1E2F86
-	compare VAR_RESULT, 1
-	call_if_eq LilycoveCity_EventScript_1E2F8F
+LilycoveCity_EventScript_DefeatedMay:: @ 81E2F3E
+	msgbox LilycoveCity_Text_MayGoingBackToLittleroot, MSGBOX_DEFAULT
+	setvar VAR_RESULT, FALSE
+	call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_CheckFinalBadge
+	compare VAR_RESULT, FALSE
+	call_if_eq LilycoveCity_EventScript_MayCollectBadges
+	compare VAR_RESULT, TRUE
+	call_if_eq LilycoveCity_EventScript_MayPokemonLeague
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL
-	goto LilycoveCity_EventScript_1E3006
+	goto LilycoveCity_EventScript_RivalFlyAway
 	end
 
-LilycoveCity_EventScript_1E2F76:: @ 81E2F76
-	goto_if_set FLAG_BADGE08_GET, LilycoveCity_EventScript_1E2F80
+LilycoveCity_EventScript_CheckFinalBadge:: @ 81E2F76
+	goto_if_set FLAG_BADGE08_GET, LilycoveCity_EventScript_HasFinalBadge
 	return
 
-LilycoveCity_EventScript_1E2F80:: @ 81E2F80
-	setvar VAR_RESULT, 1
+LilycoveCity_EventScript_HasFinalBadge:: @ 81E2F80
+	setvar VAR_RESULT, TRUE
 	return
 
-LilycoveCity_EventScript_1E2F86:: @ 81E2F86
-	msgbox LilycoveCity_Text_1E3398, MSGBOX_DEFAULT
+LilycoveCity_EventScript_MayCollectBadges:: @ 81E2F86
+	msgbox LilycoveCity_Text_MayYouGoingToCollectBadges, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_EventScript_1E2F8F:: @ 81E2F8F
-	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_1E2FA1
-	msgbox LilycoveCity_Text_1E346D, MSGBOX_DEFAULT
+LilycoveCity_EventScript_MayPokemonLeague:: @ 81E2F8F
+	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_MayBattleFrontier
+	msgbox LilycoveCity_Text_MayYouGoingToPokemonLeague, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_EventScript_1E2FA1:: @ 81E2FA1
-	msgbox LilycoveCity_Text_1E353A, MSGBOX_DEFAULT
+LilycoveCity_EventScript_MayBattleFrontier:: @ 81E2FA1
+	msgbox LilycoveCity_Text_MayYouGoingToBattleFrontier, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_EventScript_1E2FAA:: @ 81E2FAA
-	msgbox LilycoveCity_Text_1E37D7, MSGBOX_DEFAULT
-	setvar VAR_RESULT, 0
-	call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_1E2F76
-	compare VAR_RESULT, 0
-	call_if_eq LilycoveCity_EventScript_1E2FE2
-	compare VAR_RESULT, 1
-	call_if_eq LilycoveCity_EventScript_1E2FEB
+LilycoveCity_EventScript_DefeatedBrendan:: @ 81E2FAA
+	msgbox LilycoveCity_Text_BrendanGoingBackToLittleroot, MSGBOX_DEFAULT
+	setvar VAR_RESULT, FALSE
+	call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_CheckFinalBadge
+	compare VAR_RESULT, FALSE
+	call_if_eq LilycoveCity_EventScript_BrendanCollectBadges
+	compare VAR_RESULT, TRUE
+	call_if_eq LilycoveCity_EventScript_BrendanPokemonLeague
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL
-	goto LilycoveCity_EventScript_1E3006
+	goto LilycoveCity_EventScript_RivalFlyAway
 	end
 
-LilycoveCity_EventScript_1E2FE2:: @ 81E2FE2
-	msgbox LilycoveCity_Text_1E3876, MSGBOX_DEFAULT
+LilycoveCity_EventScript_BrendanCollectBadges:: @ 81E2FE2
+	msgbox LilycoveCity_Text_BrendanYouGoingToCollectBadges, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_EventScript_1E2FEB:: @ 81E2FEB
-	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_1E2FFD
-	msgbox LilycoveCity_Text_1E390C, MSGBOX_DEFAULT
+LilycoveCity_EventScript_BrendanPokemonLeague:: @ 81E2FEB
+	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_BrendanBattleFrontier
+	msgbox LilycoveCity_Text_BrendanYouGoingToPokemonLeague, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_EventScript_1E2FFD:: @ 81E2FFD
-	msgbox LilycoveCity_Text_1E39E3, MSGBOX_DEFAULT
+LilycoveCity_EventScript_BrendanBattleFrontier:: @ 81E2FFD
+	msgbox LilycoveCity_Text_BrendanYouGoingToBattleFrontier, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_EventScript_1E3006:: @ 81E3006
+LilycoveCity_EventScript_RivalFlyAway:: @ 81E3006
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
@@ -401,26 +401,26 @@ LilycoveCity_EventScript_1E3006:: @ 81E3006
 	release
 	end
 
-LilycoveCity_EventScript_1E302D:: @ 81E302D
+LilycoveCity_EventScript_SchoolKidM:: @ 81E302D
 	lock
 	faceplayer
-	msgbox LilycoveCity_Text_1E4774, MSGBOX_YESNO
+	msgbox LilycoveCity_Text_DoYouKnowAboutBerryBlender, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	call_if_eq LilycoveCity_EventScript_1E304F
+	call_if_eq LilycoveCity_EventScript_KnowAboutBerryBlender
 	compare VAR_RESULT, NO
-	call_if_eq LilycoveCity_EventScript_1E3058
+	call_if_eq LilycoveCity_EventScript_DontKnowAboutBerryBlender
 	release
 	end
 
-LilycoveCity_EventScript_1E304F:: @ 81E304F
-	msgbox LilycoveCity_Text_1E47A1, MSGBOX_DEFAULT
+LilycoveCity_EventScript_KnowAboutBerryBlender:: @ 81E304F
+	msgbox LilycoveCity_Text_FasterSpinBetterPokeblocks, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_EventScript_1E3058:: @ 81E3058
-	msgbox LilycoveCity_Text_1E4824, MSGBOX_DEFAULT
+LilycoveCity_EventScript_DontKnowAboutBerryBlender:: @ 81E3058
+	msgbox LilycoveCity_Text_ExplainBerryBlender, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_Text_1E3061: @ 81E3061
+LilycoveCity_Text_MayShoppingLetsBattle: @ 81E3061
 	.string "MAY: Oh, hey?\n"
 	.string "{PLAYER}{KUN}, are you shopping, too?\p"
 	.string "I bought a whole bunch of DOLLS and\n"
@@ -433,35 +433,35 @@ LilycoveCity_Text_1E3061: @ 81E3061
 	.string "I'll battle with you, so you can show\n"
 	.string "me your POKéMON, {PLAYER}{KUN}.$"
 
-LilycoveCity_Text_1E318D: @ 81E318D
+LilycoveCity_Text_MayNotRaisingPokemon: @ 81E318D
 	.string "MAY: Oh, why? {PLAYER}{KUN}, haven't you\n"
 	.string "been raising your POKéMON?\p"
 	.string "That's not a very good showing as a\n"
 	.string "TRAINER…$"
 
-LilycoveCity_Text_1E31F5: @ 81E31F5
+LilycoveCity_Text_MayBattleMe: @ 81E31F5
 	.string "MAY: Come on, battle with me, so I can\n"
 	.string "check out your POKéMON!$"
 
-LilycoveCity_Text_1E3234: @ 81E3234
+LilycoveCity_Text_MayWontBeBeaten: @ 81E3234
 	.string "MAY: The POKéMON I raised won't be\n"
 	.string "beaten by your POKéMON, {PLAYER}{KUN}!$"
 
-LilycoveCity_Text_1E3275: @ 81E3275
+LilycoveCity_Text_MayDefeat: @ 81E3275
 	.string "… … … … … … … …\p"
 	.string "I remember the battle I had with you,\n"
 	.string "{PLAYER}{KUN}, on ROUTE 103.\p"
 	.string "That battle helped you become this\n"
 	.string "strong, {PLAYER}{KUN}, didn't it?$"
 
-LilycoveCity_Text_1E32FB: @ 81E32FB
+LilycoveCity_Text_MayGoingBackToLittleroot: @ 81E32FB
 	.string "MAY: I'm thinking of going back to\n"
 	.string "LITTLEROOT soon.\p"
 	.string "I've caught a decent group of POKéMON,\n"
 	.string "and my POKéDEX is coming along, so\l"
 	.string "I'm going home to show my dad.$"
 
-LilycoveCity_Text_1E3398: @ 81E3398
+LilycoveCity_Text_MayYouGoingToCollectBadges: @ 81E3398
 	.string "{PLAYER}{KUN}, what are you going to do?\p"
 	.string "Collect all the GYM BADGES and take\n"
 	.string "the POKéMON LEAGUE challenge?\p"
@@ -470,7 +470,7 @@ LilycoveCity_Text_1E3398: @ 81E3398
 	.string "POKéDEX. I'll complete it before you!\p"
 	.string "See you!$"
 
-LilycoveCity_Text_1E346D: @ 81E346D
+LilycoveCity_Text_MayYouGoingToPokemonLeague: @ 81E346D
 	.string "{PLAYER}{KUN}, what are you going to do?\p"
 	.string "Are you taking the POKéMON LEAGUE\n"
 	.string "challenge?\p"
@@ -480,7 +480,7 @@ LilycoveCity_Text_1E346D: @ 81E346D
 	.string "but I'll finish my POKéDEX before you!\p"
 	.string "See you!$"
 
-LilycoveCity_Text_1E353A: @ 81E353A
+LilycoveCity_Text_MayYouGoingToBattleFrontier: @ 81E353A
 	.string "{PLAYER}{KUN}, what are you going to do?\p"
 	.string "Are you taking the BATTLE FRONTIER\n"
 	.string "challenge?\p"
@@ -490,7 +490,7 @@ LilycoveCity_Text_1E353A: @ 81E353A
 	.string "but I'll finish my POKéDEX before you!\p"
 	.string "See you!$"
 
-LilycoveCity_Text_1E3608: @ 81E3608
+LilycoveCity_Text_BrendanShoppingLetsBattle: @ 81E3608
 	.string "BRENDAN: Oh, hey, it's {PLAYER}.\p"
 	.string "I'm running an errand for my dad.\n"
 	.string "No, I'm not buying any DOLLS.\p"
@@ -498,39 +498,39 @@ LilycoveCity_Text_1E3608: @ 81E3608
 	.string "Want to have a battle to see who's been\n"
 	.string "raising POKéMON better?$"
 
-LilycoveCity_Text_1E36BF: @ 81E36BF
+LilycoveCity_Text_BrendanNoConfidence: @ 81E36BF
 	.string "BRENDAN: Oh, what's the matter?\n"
 	.string "Don't have the confidence?$"
 
-LilycoveCity_Text_1E36FA: @ 81E36FA
+LilycoveCity_Text_BrendanBattleMe: @ 81E36FA
 	.string "BRENDAN: Want to battle to see who's\n"
 	.string "been raising POKéMON better?$"
 
-LilycoveCity_Text_1E373C: @ 81E373C
+LilycoveCity_Text_BrendanWontBeBeaten: @ 81E373C
 	.string "BRENDAN: Aww, but you know I'm not\n"
 	.string "going to lose to no {PLAYER}.$"
 
-LilycoveCity_Text_1E3777: @ 81E3777
+LilycoveCity_Text_BrendanDefeat: @ 81E3777
 	.string "Humph…\n"
 	.string "You've done a lot of raising.\p"
 	.string "That stings a bit--I had a head start\n"
 	.string "on you as a TRAINER…$"
 
-LilycoveCity_Text_1E37D7: @ 81E37D7
+LilycoveCity_Text_BrendanGoingBackToLittleroot: @ 81E37D7
 	.string "BRENDAN: I…\n"
 	.string "I plan on going home to LITTLEROOT.\p"
 	.string "You know I'm helping out my dad on his\n"
 	.string "POKéDEX. It's coming together pretty\l"
 	.string "decently, so I should go show him.$"
 
-LilycoveCity_Text_1E3876: @ 81E3876
+LilycoveCity_Text_BrendanYouGoingToCollectBadges: @ 81E3876
 	.string "{PLAYER}, what are you going to do?\p"
 	.string "Collect all the GYM BADGES and take\n"
 	.string "the POKéMON LEAGUE challenge?\p"
 	.string "Maybe I'll do that, too…\p"
 	.string "Well, anyway, hang in there!$"
 
-LilycoveCity_Text_1E390C: @ 81E390C
+LilycoveCity_Text_BrendanYouGoingToPokemonLeague: @ 81E390C
 	.string "{PLAYER}, what are you going to do?\p"
 	.string "Since you're that strong, are you\n"
 	.string "taking the POKéMON LEAGUE challenge?\p"
@@ -539,7 +539,7 @@ LilycoveCity_Text_1E390C: @ 81E390C
 	.string "you, {PLAYER}.\p"
 	.string "Well, anyway, hang in there!$"
 
-LilycoveCity_Text_1E39E3: @ 81E39E3
+LilycoveCity_Text_BrendanYouGoingToBattleFrontier: @ 81E39E3
 	.string "{PLAYER}, what are you going to do?\p"
 	.string "Are you taking the BATTLE FRONTIER\n"
 	.string "challenge?\p"
@@ -553,14 +553,14 @@ LilycoveCity_Text_1E39E3: @ 81E39E3
 	.string "FRONTIER.\p"
 	.string "Well, anyway, hang in there!$"
 
-LilycoveCity_Text_1E3B2C: @ 81E3B2C
+LilycoveCity_Text_MovedLootIntoHideoutToday: @ 81E3B2C
 	.string "Fufufu…\p"
 	.string "We moved more loot into our secret\n"
 	.string "HIDEOUT today…\p"
 	.string "Wh-who are you?!\n"
 	.string "I was just talking to myself!$"
 
-LilycoveCity_Text_1E3B95: @ 81E3B95
+LilycoveCity_Text_ChanceToDoBigThings: @ 81E3B95
 	.string "I'm just a GRUNT, so I don't know what\n"
 	.string "the BOSS is thinking…\p"
 	.string "But being on TEAM AQUA, I know I'll get\n"
@@ -568,44 +568,44 @@ LilycoveCity_Text_1E3B95: @ 81E3B95
 	.string "Wh-who are you?!\n"
 	.string "I was just talking to myself!$"
 
-LilycoveCity_Text_1E3C46: @ 81E3C46
+LilycoveCity_Text_DontGoNearCaveInCove: @ 81E3C46
 	.string "Hey, you!\p"
 	.string "Don't go near the cave in the cove!\p"
 	.string "Why? You don't need a reason why!\n"
 	.string "I'm an adult, so you just listen to me!$"
 
-LilycoveCity_Text_1E3CBE: @ 81E3CBE
+LilycoveCity_Text_IfWorldBecomesOurs: @ 81E3CBE
 	.string "If this whole wide world becomes ours,\n"
 	.string "TEAM AQUA's, it will be a happier\l"
 	.string "place for POKéMON, too.$"
 
-LilycoveCity_Text_1E3D1F: @ 81E3D1F
+LilycoveCity_Text_WailmerLeapOutOfWater: @ 81E3D1F
 	.string "There! WAILMER!\n"
 	.string "Leap out of the water now!$"
 
-LilycoveCity_Text_1E3D4A: @ 81E3D4A
+LilycoveCity_Text_GetLostMessingUpTraining: @ 81E3D4A
 	.string "Hunh? What do you want?\p"
 	.string "You're messing up our training,\n"
 	.string "so can you, like, get lost?$"
 
-LilycoveCity_Text_1E3D9E: @ 81E3D9E
+LilycoveCity_Text_ContestHallInTown: @ 81E3D9E
 	.string "There's a POKéMON CONTEST HALL\n"
 	.string "right in this here town. \p"
 	.string "That means well-raised POKéMON will\n"
 	.string "come from all over the country.\p"
 	.string "My heart swells with excitement!$"
 
-LilycoveCity_Text_1E3E3C: @ 81E3E3C
+LilycoveCity_Text_StrangeCaveInCove: @ 81E3E3C
 	.string "Have you seen that strange cave in\n"
 	.string "the cove at the edge of town?$"
 
-LilycoveCity_Text_1E3E7D: @ 81E3E7D
+LilycoveCity_Text_GoingToMoveDeleterForHMs: @ 81E3E7D
 	.string "I'm going to teach my POKéMON some new\n"
 	.string "moves for entering a CONTEST.\p"
 	.string "So, I'm going to see the MOVE DELETER\n"
 	.string "and make it forget HM moves.$"
 
-LilycoveCity_Text_1E3F05: @ 81E3F05
+LilycoveCity_Text_ImFromKanto: @ 81E3F05
 	.string "I came from KANTO.\p"
 	.string "The HOENN region is beautiful with\n"
 	.string "all its water and verdant nature.\p"
@@ -613,50 +613,50 @@ LilycoveCity_Text_1E3F05: @ 81E3F05
 	.string "Could there be rare POKéMON that live\n"
 	.string "only in this area?$"
 
-LilycoveCity_Text_1E3FAB: @ 81E3FAB
+LilycoveCity_Text_TeamAquaBeenTrainingWailmer: @ 81E3FAB
 	.string "TEAM AQUA's been training their\n"
 	.string "WAILMER in the cove.\p"
 	.string "We SAILORS can't get our boats out\n"
 	.string "to sea with them in the way!$"
 
-LilycoveCity_Text_1E4020: @ 81E4020
+LilycoveCity_Text_SomeonePuntedTeamAquaOut: @ 81E4020
 	.string "Ahoy, did you know?\p"
 	.string "Someone punted TEAM AQUA out of\n"
 	.string "the way for us!\p"
 	.string "That got the WAILMER out of the cove,\n"
 	.string "so we can get our boats out again.$"
 
-LilycoveCity_Text_1E40AD: @ 81E40AD
+LilycoveCity_Text_SomeoneStoleMyPokemon: @ 81E40AD
 	.string "I was taking a relaxing snooze at the\n"
 	.string "seaside inn to the sound of waves…\p"
 	.string "When someone stole my POKéMON!\p"
 	.string "Who's the abductor?\n"
 	.string "TEAM AQUA? Is it TEAM AQUA?$"
 
-LilycoveCity_Text_1E4145: @ 81E4145
+LilycoveCity_Text_MissingPokemonCameBack: @ 81E4145
 	.string "My missing POKéMON…\n"
 	.string "It came back without me noticing!$"
 
-LilycoveCity_Text_1E417B: @ 81E417B
+LilycoveCity_Text_ImArtDealer: @ 81E417B
 	.string "I'm an ART DEALER.\p"
 	.string "I am a buyer and seller of fine art,\n"
 	.string "especially paintings.\p"
 	.string "I've heard that the MUSEUM here has\n"
 	.string "magnificent works on exhibit…$"
 
-LilycoveCity_Text_1E420B: @ 81E420B
+LilycoveCity_Text_SeaRemainsForeverYoung: @ 81E420B
 	.string "Even as we grow old and wrinkled,\n"
 	.string "the sea remains forever young with\l"
 	.string "the vivid brilliance of life…\p"
 	.string "Fwohoho fwohohohoho…$"
 
-LilycoveCity_Text_1E4283: @ 81E4283
+LilycoveCity_Text_SixtyYearsAgoHusbandProposed: @ 81E4283
 	.string "It was sixty years ago that my husband\n"
 	.string "proposed to me here.\l"
 	.string "The sea remains as beautiful as ever.\p"
 	.string "Mufufufu mufufufufufu…$"
 
-LilycoveCity_Text_1E42FC: @ 81E42FC
+LilycoveCity_Text_TeamAquaRenovatedCavern: @ 81E42FC
 	.string "Hm, you know of the peculiar cavern\n"
 	.string "in this cove?\p"
 	.string "That had been a natural formation,\n"
@@ -667,92 +667,92 @@ LilycoveCity_Text_1E42FC: @ 81E42FC
 	.string "But what they do and what they say\n"
 	.string "don't match at all!$"
 
-LilycoveCity_Text_1E43FF: @ 81E43FF
+LilycoveCity_Text_TeamAquaLotGoneForGood: @ 81E43FF
 	.string "That cave in the cove…\p"
 	.string "I didn't notice it right away,\n"
 	.string "but it's completely empty now.\p"
 	.string "That TEAM AQUA lot, they must\n"
 	.string "have gone away for good.$"
 
-LilycoveCity_Text_1E448B: @ 81E448B
+LilycoveCity_Text_CitySign: @ 81E448B
 	.string "LILYCOVE CITY\p"
 	.string "“Where the land ends and the\n"
 	.string "sea begins.”$"
 
-LilycoveCity_Text_1E44C3: @ 81E44C3
+LilycoveCity_Text_ContestHallSign: @ 81E44C3
 	.string "POKéMON CONTEST HALL\n"
 	.string "“The gathering place for TRAINERS!”$"
 
-LilycoveCity_Text_1E44FC: @ 81E44FC
+LilycoveCity_Text_MotelSign: @ 81E44FC
 	.string "COVE LILY MOTEL\p"
 	.string "“Remember us as COVE LILY of\n"
 	.string "LILYCOVE.”$"
 
-LilycoveCity_Text_1E4534: @ 81E4534
+LilycoveCity_Text_MuseumSign: @ 81E4534
 	.string "LILYCOVE MUSEUM\p"
 	.string "“POKéMON Masterpiece Collection\n"
 	.string "on exhibit!”$"
 
-LilycoveCity_Text_1E4571: @ 81E4571
+LilycoveCity_Text_MuseumSignPlayersExhibit: @ 81E4571
 	.string "LILYCOVE MUSEUM\p"
 	.string "“{PLAYER}'s POKéMON Collection\n"
 	.string "on exhibit!”$"
 
-LilycoveCity_Text_1E45A7: @ 81E45A7
+LilycoveCity_Text_HarborSignUnderConstruction: @ 81E45A7
 	.string "LILYCOVE CITY HARBOR\p"
 	.string "“The ferry S.S. TIDAL is under\n"
 	.string "construction in SLATEPORT CITY.\p"
 	.string "“Service is scheduled to begin\n"
 	.string "shortly.”$"
 
-LilycoveCity_Text_1E4624: @ 81E4624
+LilycoveCity_Text_HarborSign: @ 81E4624
 	.string "LILYCOVE CITY HARBOR\p"
 	.string "“Enjoy a delightful cruise on\n"
 	.string "the ferry S.S. TIDAL.”$"
 
-LilycoveCity_Text_1E466E: @ 81E466E
+LilycoveCity_Text_TrainerFanClubSign: @ 81E466E
 	.string "POKéMON TRAINER FAN CLUB\p"
 	.string "The names of TRAINERS are scribbled\n"
 	.string "all over the sign…$"
 
-LilycoveCity_Text_1E46BE: @ 81E46BE
+LilycoveCity_Text_DepartmentStoreSign: @ 81E46BE
 	.string "LILYCOVE DEPARTMENT STORE\p"
 	.string "“Overflowing with great merchandise\n"
 	.string "and excitement!\p"
 	.string "“A great place to find that something\n"
 	.string "you need!”$"
 
-LilycoveCity_Text_1E473D: @ 81E473D
+LilycoveCity_Text_MoveDeletersHouseSign: @ 81E473D
 	.string "MOVE DELETER'S HOUSE\p"
 	.string "“Unwanted POKéMON moves deleted.”$"
 
-LilycoveCity_Text_1E4774: @ 81E4774
+LilycoveCity_Text_DoYouKnowAboutBerryBlender: @ 81E4774
 	.string "Do you know about the machine\n"
 	.string "BERRY BLENDER?$"
 
-LilycoveCity_Text_1E47A1: @ 81E47A1
+LilycoveCity_Text_FasterSpinBetterPokeblocks: @ 81E47A1
 	.string "People have to work together to get it\n"
 	.string "to spin faster.\p"
 	.string "The faster you can make it spin, the\n"
 	.string "better {POKEBLOCK}S you can get, I've heard.$"
 
-LilycoveCity_Text_1E4824: @ 81E4824
+LilycoveCity_Text_ExplainBerryBlender: @ 81E4824
 	.string "It's used for making a kind of candy\n"
 	.string "called a {POKEBLOCK}.\p"
 	.string "If you give a good {POKEBLOCK} to a POKéMON,\n"
 	.string "its condition will improve by a lot.$"
 
-LilycoveCity_Text_1E48A5: @ 81E48A5
+LilycoveCity_Text_HeardTowerCalledSkyPillar: @ 81E48A5
 	.string "I heard there's a tower somewhere out\n"
 	.string "on the sea routes.\p"
 	.string "It's called the SKY PILLAR, I hear.$"
 
-LilycoveCity_Text_1E4902: @ 81E4902
+LilycoveCity_Text_SawTallTowerOnRoute131: @ 81E4902
 	.string "I saw this tall tower somewhere\n"
 	.string "around ROUTE 131.\p"
 	.string "Could that possibly be…?$"
 
-LilycoveCity_Text_1E494D: @ 81E494D
+LilycoveCity_Text_JustArrivedAndSawRarePokemon: @ 81E494D
 	.string "We just arrived here on our\n"
 	.string "honeymoon vacation.\p"
 	.string "We happened to see a DRAGON-type\n"
@@ -760,7 +760,7 @@ LilycoveCity_Text_1E494D: @ 81E494D
 	.string "Do cool POKéMON like that live in\n"
 	.string "the HOENN region?$"
 
-LilycoveCity_Text_1E49F4: @ 81E49F4
+LilycoveCity_Text_HoneymoonVowToSeeRarePokemon: @ 81E49F4
 	.string "On our honeymoon, we vowed to see as\n"
 	.string "many rare POKéMON as we can.\p"
 	.string "So we were delighted to see a rare\n"
diff --git a/data/maps/LilycoveCity_ContestHall/map.json b/data/maps/LilycoveCity_ContestHall/map.json
index 3522c7963..456c7eec8 100644
--- a/data/maps/LilycoveCity_ContestHall/map.json
+++ b/data/maps/LilycoveCity_ContestHall/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 4,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B485",
+      "script": "LilycoveCity_ContestHall_EventScript_Boy1",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 3,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B48E",
+      "script": "LilycoveCity_ContestHall_EventScript_Boy2",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B497",
+      "script": "LilycoveCity_ContestHall_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B4A9",
+      "script": "LilycoveCity_ContestHall_EventScript_SmartContestMC",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B4C0",
+      "script": "LilycoveCity_ContestHall_EventScript_SmartContestJudge",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B4D7",
+      "script": "LilycoveCity_ContestHall_EventScript_SmartContestant1",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B4EE",
+      "script": "LilycoveCity_ContestHall_EventScript_SmartContestant2",
       "flag": "0"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B505",
+      "script": "LilycoveCity_ContestHall_EventScript_SmartContestant3",
       "flag": "0"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B51C",
+      "script": "LilycoveCity_ContestHall_EventScript_SmartContestant4",
       "flag": "0"
     },
     {
@@ -141,7 +141,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B533",
+      "script": "LilycoveCity_ContestHall_EventScript_SmartContestAudience1",
       "flag": "0"
     },
     {
@@ -154,7 +154,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B56A",
+      "script": "LilycoveCity_ContestHall_EventScript_SmartContestAudience4",
       "flag": "0"
     },
     {
@@ -167,7 +167,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B53C",
+      "script": "LilycoveCity_ContestHall_EventScript_SmartContestAudience2",
       "flag": "0"
     },
     {
@@ -180,7 +180,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B581",
+      "script": "LilycoveCity_ContestHall_EventScript_BeautyContestMC",
       "flag": "0"
     },
     {
@@ -193,7 +193,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B598",
+      "script": "LilycoveCity_ContestHall_EventScript_BeautyContestJudge",
       "flag": "0"
     },
     {
@@ -206,7 +206,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B5AF",
+      "script": "LilycoveCity_ContestHall_EventScript_BeautyContestant1",
       "flag": "0"
     },
     {
@@ -219,7 +219,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B5C6",
+      "script": "LilycoveCity_ContestHall_EventScript_BeautyContestant2",
       "flag": "0"
     },
     {
@@ -232,7 +232,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B5DD",
+      "script": "LilycoveCity_ContestHall_EventScript_BeautyContestant3",
       "flag": "0"
     },
     {
@@ -245,7 +245,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B5F4",
+      "script": "LilycoveCity_ContestHall_EventScript_BeautyContestant4",
       "flag": "0"
     },
     {
@@ -258,7 +258,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B60B",
+      "script": "LilycoveCity_ContestHall_EventScript_BeautyContestAudience1",
       "flag": "0"
     },
     {
@@ -271,7 +271,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B639",
+      "script": "LilycoveCity_ContestHall_EventScript_BeautyContestAudience3",
       "flag": "0"
     },
     {
@@ -284,7 +284,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B622",
+      "script": "LilycoveCity_ContestHall_EventScript_BeautyContestAudience2",
       "flag": "0"
     },
     {
@@ -297,7 +297,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B553",
+      "script": "LilycoveCity_ContestHall_EventScript_SmartContestAudience3",
       "flag": "0"
     },
     {
@@ -310,7 +310,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B650",
+      "script": "LilycoveCity_ContestHall_EventScript_CuteContestMC",
       "flag": "0"
     },
     {
@@ -323,7 +323,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B667",
+      "script": "LilycoveCity_ContestHall_EventScript_CuteContestJudge",
       "flag": "0"
     },
     {
@@ -336,7 +336,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B67E",
+      "script": "LilycoveCity_ContestHall_EventScript_CuteContestant1",
       "flag": "0"
     },
     {
@@ -349,7 +349,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B695",
+      "script": "LilycoveCity_ContestHall_EventScript_CuteContestant2",
       "flag": "0"
     },
     {
@@ -362,7 +362,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B6AC",
+      "script": "LilycoveCity_ContestHall_EventScript_CuteContestant3",
       "flag": "0"
     },
     {
@@ -375,7 +375,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B6C3",
+      "script": "LilycoveCity_ContestHall_EventScript_CuteContestant4",
       "flag": "0"
     },
     {
@@ -388,7 +388,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B6DA",
+      "script": "LilycoveCity_ContestHall_EventScript_CuteContestAudience1",
       "flag": "0"
     },
     {
@@ -401,7 +401,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B71C",
+      "script": "LilycoveCity_ContestHall_EventScript_CuteContestAudience3",
       "flag": "0"
     },
     {
@@ -414,7 +414,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B705",
+      "script": "LilycoveCity_ContestHall_EventScript_CuteContestAudience2",
       "flag": "0"
     },
     {
@@ -427,7 +427,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestHall_EventScript_21B4A0",
+      "script": "LilycoveCity_ContestHall_EventScript_Sailor",
       "flag": "0"
     }
   ],
@@ -469,7 +469,7 @@
       "y": 16,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestHall_EventScript_21B733"
+      "script": "LilycoveCity_ContestHall_EventScript_BeautyStageSign"
     },
     {
       "type": "sign",
@@ -477,7 +477,7 @@
       "y": 28,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestHall_EventScript_21B73C"
+      "script": "LilycoveCity_ContestHall_EventScript_CuteStageSign"
     },
     {
       "type": "sign",
@@ -485,7 +485,7 @@
       "y": 28,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestHall_EventScript_21B745"
+      "script": "LilycoveCity_ContestHall_EventScript_SmartStageSign"
     },
     {
       "type": "sign",
@@ -493,7 +493,7 @@
       "y": 28,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestHall_EventScript_21B745"
+      "script": "LilycoveCity_ContestHall_EventScript_SmartStageSign"
     },
     {
       "type": "sign",
@@ -501,7 +501,7 @@
       "y": 16,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestHall_EventScript_21B733"
+      "script": "LilycoveCity_ContestHall_EventScript_BeautyStageSign"
     },
     {
       "type": "sign",
@@ -509,7 +509,7 @@
       "y": 28,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestHall_EventScript_21B73C"
+      "script": "LilycoveCity_ContestHall_EventScript_CuteStageSign"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_ContestHall/scripts.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc
index 5823b6da4..fb98c72f6 100644
--- a/data/maps/LilycoveCity_ContestHall/scripts.inc
+++ b/data/maps/LilycoveCity_ContestHall/scripts.inc
@@ -1,319 +1,319 @@
 LilycoveCity_ContestHall_MapScripts:: @ 821B484
 	.byte 0
 
-LilycoveCity_ContestHall_EventScript_21B485:: @ 821B485
-	msgbox LilycoveCity_ContestHall_Text_21B74E, MSGBOX_NPC
+LilycoveCity_ContestHall_EventScript_Boy1:: @ 821B485
+	msgbox LilycoveCity_ContestHall_Text_TodayWonSmartnessContest, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestHall_EventScript_21B48E:: @ 821B48E
-	msgbox LilycoveCity_ContestHall_Text_21B7D7, MSGBOX_NPC
+LilycoveCity_ContestHall_EventScript_Boy2:: @ 821B48E
+	msgbox LilycoveCity_ContestHall_Text_EnteredBunchOfContests, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestHall_EventScript_21B497:: @ 821B497
-	msgbox LilycoveCity_ContestHall_Text_21B899, MSGBOX_NPC
+LilycoveCity_ContestHall_EventScript_Girl:: @ 821B497
+	msgbox LilycoveCity_ContestHall_Text_ManWhoWonEarlierHadPokeblocks, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestHall_EventScript_21B4A0:: @ 821B4A0
-	msgbox LilycoveCity_ContestHall_Text_21B911, MSGBOX_NPC
+LilycoveCity_ContestHall_EventScript_Sailor:: @ 821B4A0
+	msgbox LilycoveCity_ContestHall_Text_IsntThisPlaceHumongous, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestHall_EventScript_21B4A9:: @ 821B4A9
+LilycoveCity_ContestHall_EventScript_SmartContestMC:: @ 821B4A9
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21B977, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_GiveItBestSmartAppeal, MSGBOX_DEFAULT
 	closemessage
 	applymovement 4, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B4C0:: @ 821B4C0
+LilycoveCity_ContestHall_EventScript_SmartContestJudge:: @ 821B4C0
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21B9DC, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_AreYouEnjoyingThisContest, MSGBOX_DEFAULT
 	closemessage
 	applymovement 5, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B4D7:: @ 821B4D7
+LilycoveCity_ContestHall_EventScript_SmartContestant1:: @ 821B4D7
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21BA44, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_EnteredWrongContest, MSGBOX_DEFAULT
 	closemessage
 	applymovement 6, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B4EE:: @ 821B4EE
+LilycoveCity_ContestHall_EventScript_SmartContestant2:: @ 821B4EE
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21BAD5, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_RaisedMonToBeSmart, MSGBOX_DEFAULT
 	closemessage
 	applymovement 7, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B505:: @ 821B505
+LilycoveCity_ContestHall_EventScript_SmartContestant3:: @ 821B505
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21BB84, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_IfMonPullsSmartMoveNext, MSGBOX_DEFAULT
 	closemessage
 	applymovement 8, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B51C:: @ 821B51C
+LilycoveCity_ContestHall_EventScript_SmartContestant4:: @ 821B51C
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21BBDD, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_DontAppreciateCuteLeechLife, MSGBOX_DEFAULT
 	closemessage
 	applymovement 9, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B533:: @ 821B533
-	msgbox LilycoveCity_ContestHall_Text_21BC65, MSGBOX_SIGN
+LilycoveCity_ContestHall_EventScript_SmartContestAudience1:: @ 821B533
+	msgbox LilycoveCity_ContestHall_Text_YoureBeautifulGrandpa, MSGBOX_SIGN
 	end
 
-LilycoveCity_ContestHall_EventScript_21B53C:: @ 821B53C
+LilycoveCity_ContestHall_EventScript_SmartContestAudience2:: @ 821B53C
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21BC89, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_AllSeemToUseDifferentMoves, MSGBOX_DEFAULT
 	closemessage
 	applymovement 12, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B553:: @ 821B553
+LilycoveCity_ContestHall_EventScript_SmartContestAudience3:: @ 821B553
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21BD30, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_PokemonSmarterThanTrainers, MSGBOX_DEFAULT
 	closemessage
 	applymovement 22, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B56A:: @ 821B56A
+LilycoveCity_ContestHall_EventScript_SmartContestAudience4:: @ 821B56A
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21BD70, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_StillLoveSmartnessContests, MSGBOX_DEFAULT
 	closemessage
 	applymovement 11, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B581:: @ 821B581
+LilycoveCity_ContestHall_EventScript_BeautyContestMC:: @ 821B581
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21BDDD, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_AreYouEnteringBeautyContest, MSGBOX_DEFAULT
 	closemessage
 	applymovement 13, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B598:: @ 821B598
+LilycoveCity_ContestHall_EventScript_BeautyContestJudge:: @ 821B598
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21BE16, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_EveryPokemonPristineBeauty, MSGBOX_DEFAULT
 	closemessage
 	applymovement 14, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B5AF:: @ 821B5AF
+LilycoveCity_ContestHall_EventScript_BeautyContestant1:: @ 821B5AF
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21BE77, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_EyesWillBeGluedToMyBeauty, MSGBOX_DEFAULT
 	closemessage
 	applymovement 15, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B5C6:: @ 821B5C6
+LilycoveCity_ContestHall_EventScript_BeautyContestant2:: @ 821B5C6
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21BEDE, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_OverdidGrooming, MSGBOX_DEFAULT
 	closemessage
 	applymovement 16, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B5DD:: @ 821B5DD
+LilycoveCity_ContestHall_EventScript_BeautyContestant3:: @ 821B5DD
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21BF6E, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_JudgeWontSeeAuroraBeam, MSGBOX_DEFAULT
 	closemessage
 	applymovement 17, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B5F4:: @ 821B5F4
+LilycoveCity_ContestHall_EventScript_BeautyContestant4:: @ 821B5F4
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21BFE3, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_PokemonLooksLikeYoungerMe, MSGBOX_DEFAULT
 	closemessage
 	applymovement 18, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B60B:: @ 821B60B
+LilycoveCity_ContestHall_EventScript_BeautyContestAudience1:: @ 821B60B
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21C07F, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_WinBeautyContestMakesMeHappy, MSGBOX_DEFAULT
 	closemessage
 	applymovement 19, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B622:: @ 821B622
+LilycoveCity_ContestHall_EventScript_BeautyContestAudience2:: @ 821B622
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21C0D8, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_GanderAtAllThosePrettyPokemon, MSGBOX_DEFAULT
 	closemessage
 	applymovement 21, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B639:: @ 821B639
+LilycoveCity_ContestHall_EventScript_BeautyContestAudience3:: @ 821B639
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21C137, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_CantWinOnBeautyAlone, MSGBOX_DEFAULT
 	closemessage
 	applymovement 20, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B650:: @ 821B650
+LilycoveCity_ContestHall_EventScript_CuteContestMC:: @ 821B650
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21C1A4, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_InTheMiddleOfContest, MSGBOX_DEFAULT
 	closemessage
 	applymovement 23, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B667:: @ 821B667
+LilycoveCity_ContestHall_EventScript_CuteContestJudge:: @ 821B667
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21C215, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_SuchCharmingCuteAppeals, MSGBOX_DEFAULT
 	closemessage
 	applymovement 24, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B67E:: @ 821B67E
+LilycoveCity_ContestHall_EventScript_CuteContestant1:: @ 821B67E
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21C27F, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_MyAzurillWasDistracted, MSGBOX_DEFAULT
 	closemessage
 	applymovement 25, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B695:: @ 821B695
+LilycoveCity_ContestHall_EventScript_CuteContestant2:: @ 821B695
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21C2BB, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_NeverWonBattleButContest, MSGBOX_DEFAULT
 	closemessage
 	applymovement 26, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B6AC:: @ 821B6AC
+LilycoveCity_ContestHall_EventScript_CuteContestant3:: @ 821B6AC
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21C307, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_PetalDanceIsMarvel, MSGBOX_DEFAULT
 	closemessage
 	applymovement 27, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B6C3:: @ 821B6C3
+LilycoveCity_ContestHall_EventScript_CuteContestant4:: @ 821B6C3
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21C365, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_MyMonAppealSoMuchCuter, MSGBOX_DEFAULT
 	closemessage
 	applymovement 28, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B6DA:: @ 821B6DA
+LilycoveCity_ContestHall_EventScript_CuteContestAudience1:: @ 821B6DA
 	lockall
 	applymovement 29, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox LilycoveCity_ContestHall_Text_21C3F4, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_MyChildIsInContest, MSGBOX_DEFAULT
 	closemessage
 	applymovement 29, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	delay 25
-	msgbox LilycoveCity_ContestHall_Text_21C411, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_ComeOnDear, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_ContestHall_EventScript_21B705:: @ 821B705
+LilycoveCity_ContestHall_EventScript_CuteContestAudience2:: @ 821B705
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21C4B1, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_WantCuteMonOfMyOwn, MSGBOX_DEFAULT
 	closemessage
 	applymovement 31, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B71C:: @ 821B71C
+LilycoveCity_ContestHall_EventScript_CuteContestAudience3:: @ 821B71C
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestHall_Text_21C445, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestHall_Text_ThatGirlThereIsCutest, MSGBOX_DEFAULT
 	closemessage
 	applymovement 30, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_21B733:: @ 821B733
-	msgbox LilycoveCity_ContestHall_Text_21C512, MSGBOX_SIGN
+LilycoveCity_ContestHall_EventScript_BeautyStageSign:: @ 821B733
+	msgbox LilycoveCity_ContestHall_Text_BeautyContestStage, MSGBOX_SIGN
 	end
 
-LilycoveCity_ContestHall_EventScript_21B73C:: @ 821B73C
-	msgbox LilycoveCity_ContestHall_Text_21C548, MSGBOX_SIGN
+LilycoveCity_ContestHall_EventScript_CuteStageSign:: @ 821B73C
+	msgbox LilycoveCity_ContestHall_Text_CuteContestStage, MSGBOX_SIGN
 	end
 
-LilycoveCity_ContestHall_EventScript_21B745:: @ 821B745
-	msgbox LilycoveCity_ContestHall_Text_21C57B, MSGBOX_SIGN
+LilycoveCity_ContestHall_EventScript_SmartStageSign:: @ 821B745
+	msgbox LilycoveCity_ContestHall_Text_SmartContestStage, MSGBOX_SIGN
 	end
 
-LilycoveCity_ContestHall_Text_21B74E: @ 821B74E
+LilycoveCity_ContestHall_Text_TodayWonSmartnessContest: @ 821B74E
 	.string "This POKéMON won the BEAUTY CONTEST\n"
 	.string "here before.\p"
 	.string "Well, guess what? Today, I made it\n"
 	.string "win a SMARTNESS CONTEST!\p"
 	.string "My abilities scare even me…$"
 
-LilycoveCity_ContestHall_Text_21B7D7: @ 821B7D7
+LilycoveCity_ContestHall_Text_EnteredBunchOfContests: @ 821B7D7
 	.string "I've entered a bunch of CONTESTS,\n"
 	.string "so I'm seeing how things work.\p"
 	.string "If you're in a COOLNESS CONTEST,\n"
@@ -321,29 +321,29 @@ LilycoveCity_ContestHall_Text_21B7D7: @ 821B7D7
 	.string "But smart moves and cute moves\n"
 	.string "don't go over well, for instance.$"
 
-LilycoveCity_ContestHall_Text_21B899: @ 821B899
+LilycoveCity_ContestHall_Text_ManWhoWonEarlierHadPokeblocks: @ 821B899
 	.string "That young man who won earlier had\n"
 	.string "a whole bunch of different {POKEBLOCK}S.\p"
 	.string "Can you win if you had that many\n"
 	.string "of those things?$"
 
-LilycoveCity_ContestHall_Text_21B911: @ 821B911
+LilycoveCity_ContestHall_Text_IsntThisPlaceHumongous: @ 821B911
 	.string "Whoa, isn't this place humongous!\p"
 	.string "The tension in the air… It's not\n"
 	.string "like a CONTEST hall in the sticks.$"
 
-LilycoveCity_ContestHall_Text_21B977: @ 821B977
+LilycoveCity_ContestHall_Text_GiveItBestSmartAppeal: @ 821B977
 	.string "MC: Okay, SMART POKéMON and their\n"
 	.string "TRAINERS, are you ready?!\p"
 	.string "Give it your best showing!\n"
 	.string "Let's appeal!$"
 
-LilycoveCity_ContestHall_Text_21B9DC: @ 821B9DC
+LilycoveCity_ContestHall_Text_AreYouEnjoyingThisContest: @ 821B9DC
 	.string "JUDGE: Are you enjoying this CONTEST?\p"
 	.string "Come back with three friends, and\n"
 	.string "all of you may enter a CONTEST!$"
 
-LilycoveCity_ContestHall_Text_21BA44: @ 821BA44
+LilycoveCity_ContestHall_Text_EnteredWrongContest: @ 821BA44
 	.string "Ayayayay…\n"
 	.string "I entered the wrong CONTEST.\p"
 	.string "I entered this tough POKéMON in\n"
@@ -351,7 +351,7 @@ LilycoveCity_ContestHall_Text_21BA44: @ 821BA44
 	.string "Come on, wow them with a smart-looking\n"
 	.string "ROCK SMASH.$"
 
-LilycoveCity_ContestHall_Text_21BAD5: @ 821BAD5
+LilycoveCity_ContestHall_Text_RaisedMonToBeSmart: @ 821BAD5
 	.string "I've spent many a year, and all my\n"
 	.string "wisdom besides, raising this POKéMON\l"
 	.string "to be smart.\p"
@@ -359,54 +359,54 @@ LilycoveCity_ContestHall_Text_21BAD5: @ 821BAD5
 	.string "young pup's POKéMON.\p"
 	.string "My dear wife, are you seeing this?$"
 
-LilycoveCity_ContestHall_Text_21BB84: @ 821BB84
+LilycoveCity_ContestHall_Text_IfMonPullsSmartMoveNext: @ 821BB84
 	.string "There it is!\p"
 	.string "If my POKéMON pulls a smart move next,\n"
 	.string "the audience's excitement will peak!$"
 
-LilycoveCity_ContestHall_Text_21BBDD: @ 821BBDD
+LilycoveCity_ContestHall_Text_DontAppreciateCuteLeechLife: @ 821BBDD
 	.string "Oh, dear, no!\p"
 	.string "My darling ZUBAT's LEECH LIFE is so\n"
 	.string "cute I kept using it over and over!\p"
 	.string "But these mean people don't appreciate\n"
 	.string "it at all!$"
 
-LilycoveCity_ContestHall_Text_21BC65: @ 821BC65
+LilycoveCity_ContestHall_Text_YoureBeautifulGrandpa: @ 821BC65
 	.string "Kiyaaah! You're beautiful, Grandpa!$"
 
-LilycoveCity_ContestHall_Text_21BC89: @ 821BC89
+LilycoveCity_ContestHall_Text_AllSeemToUseDifferentMoves: @ 821BC89
 	.string "Even when TRAINERS enter the same\n"
 	.string "kind of POKéMON, they all seem to use\l"
 	.string "different moves for appeals.\p"
 	.string "It's just like the way people have\n"
 	.string "different styles for battling.$"
 
-LilycoveCity_ContestHall_Text_21BD30: @ 821BD30
+LilycoveCity_ContestHall_Text_PokemonSmarterThanTrainers: @ 821BD30
 	.string "I think the POKéMON look smarter\n"
 	.string "than their TRAINERS. By a lot.$"
 
-LilycoveCity_ContestHall_Text_21BD70: @ 821BD70
+LilycoveCity_ContestHall_Text_StillLoveSmartnessContests: @ 821BD70
 	.string "When all's said and done, I still love\n"
 	.string "SMARTNESS CONTESTS.\p"
 	.string "That intellectual green color…\n"
 	.string "It's so… So… Cool.$"
 
-LilycoveCity_ContestHall_Text_21BDDD: @ 821BDDD
+LilycoveCity_ContestHall_Text_AreYouEnteringBeautyContest: @ 821BDDD
 	.string "MC: Are you entering the BEAUTY\n"
 	.string "CONTEST, too? Good luck!$"
 
-LilycoveCity_ContestHall_Text_21BE16: @ 821BE16
+LilycoveCity_ContestHall_Text_EveryPokemonPristineBeauty: @ 821BE16
 	.string "JUDGE: Ah, every POKéMON here is\n"
 	.string "a model of pristine beauty!\p"
 	.string "Why, I almost forgot to score them!$"
 
-LilycoveCity_ContestHall_Text_21BE77: @ 821BE77
+LilycoveCity_ContestHall_Text_EyesWillBeGluedToMyBeauty: @ 821BE77
 	.string "A POKéMON this beautiful…\n"
 	.string "There isn't another one like it.\p"
 	.string "Everyone's eyes will be glued to\n"
 	.string "my beauty.$"
 
-LilycoveCity_ContestHall_Text_21BEDE: @ 821BEDE
+LilycoveCity_ContestHall_Text_OverdidGrooming: @ 821BEDE
 	.string "Waaaah!\p"
 	.string "I brushed and groomed my POKéMON\n"
 	.string "carefully for this CONTEST…\p"
@@ -414,96 +414,96 @@ LilycoveCity_ContestHall_Text_21BEDE: @ 821BEDE
 	.string "My POKéMON's coat turned all scraggly…\p"
 	.string "What should I do?$"
 
-LilycoveCity_ContestHall_Text_21BF6E: @ 821BF6E
+LilycoveCity_ContestHall_Text_JudgeWontSeeAuroraBeam: @ 821BF6E
 	.string "This AURORA BEAM is so dazzling,\n"
 	.string "the JUDGE won't be able to see it.\p"
 	.string "Uh, wait a second…\n"
 	.string "That'll be meaningless, then!$"
 
-LilycoveCity_ContestHall_Text_21BFE3: @ 821BFE3
+LilycoveCity_ContestHall_Text_PokemonLooksLikeYoungerMe: @ 821BFE3
 	.string "This pretty POKéMON looks just like\n"
 	.string "me when I was younger.\p"
 	.string "Right when I said that, my husband\n"
 	.string "spewed the coffee he was drinking.\p"
 	.string "Did I say something funny?$"
 
-LilycoveCity_ContestHall_Text_21C07F: @ 821C07F
+LilycoveCity_ContestHall_Text_WinBeautyContestMakesMeHappy: @ 821C07F
 	.string "You know, if I win at a BEAUTY\n"
 	.string "CONTEST, sure it makes me\l"
 	.string "happy. More than usual, anyway.$"
 
-LilycoveCity_ContestHall_Text_21C0D8: @ 821C0D8
+LilycoveCity_ContestHall_Text_GanderAtAllThosePrettyPokemon: @ 821C0D8
 	.string "Wahahahah!\p"
 	.string "Will you take a gander at all those\n"
 	.string "pretty POKéMON!\l"
 	.string "I just love this sort of glitz!$"
 
-LilycoveCity_ContestHall_Text_21C137: @ 821C137
+LilycoveCity_ContestHall_Text_CantWinOnBeautyAlone: @ 821C137
 	.string "You can't always win on just beauty\n"
 	.string "alone.\p"
 	.string "You have to groom your POKéMON so\n"
 	.string "it's nice and glossy like mine.$"
 
-LilycoveCity_ContestHall_Text_21C1A4: @ 821C1A4
+LilycoveCity_ContestHall_Text_InTheMiddleOfContest: @ 821C1A4
 	.string "MC: Uh-oh! Hello!\n"
 	.string "We're in the middle of a CONTEST!\p"
 	.string "Please enter at our registration\n"
 	.string "counter and come out, okay?$"
 
-LilycoveCity_ContestHall_Text_21C215: @ 821C215
+LilycoveCity_ContestHall_Text_SuchCharmingCuteAppeals: @ 821C215
 	.string "JUDGE: Oh, such charming and cute\n"
 	.string "appeals!\p"
 	.string "Oh, my goodness! What a perfectly\n"
 	.string "adorable WATER SPORT appeal!$"
 
-LilycoveCity_ContestHall_Text_21C27F: @ 821C27F
+LilycoveCity_ContestHall_Text_MyAzurillWasDistracted: @ 821C27F
 	.string "Oh, no… My sweet AZURILL was\n"
 	.string "distracted by another POKéMON.$"
 
-LilycoveCity_ContestHall_Text_21C2BB: @ 821C2BB
+LilycoveCity_ContestHall_Text_NeverWonBattleButContest: @ 821C2BB
 	.string "My POKéMON has never won in a battle,\n"
 	.string "but put it in a CONTEST and look out!$"
 
-LilycoveCity_ContestHall_Text_21C307: @ 821C307
+LilycoveCity_ContestHall_Text_PetalDanceIsMarvel: @ 821C307
 	.string "My POKéMON's PETAL DANCE is a marvel\n"
 	.string "of elegance.\p"
 	.string "I won't let anyone disturb its\n"
 	.string "performance.$"
 
-LilycoveCity_ContestHall_Text_21C365: @ 821C365
+LilycoveCity_ContestHall_Text_MyMonAppealSoMuchCuter: @ 821C365
 	.string "Everyone's POKéMON are very cute.\p"
 	.string "However, if my POKéMON were to make\n"
 	.string "a cute appeal…\p"
 	.string "I'm sure that it would be so much \n"
 	.string "cuter than the others.$"
 
-LilycoveCity_ContestHall_Text_21C3F4: @ 821C3F4
+LilycoveCity_ContestHall_Text_MyChildIsInContest: @ 821C3F4
 	.string "My child is in this CONTEST.$"
 
-LilycoveCity_ContestHall_Text_21C411: @ 821C411
+LilycoveCity_ContestHall_Text_ComeOnDear: @ 821C411
 	.string "Come on, dear. Go for it!\n"
 	.string "Your POKéMON is the best!$"
 
-LilycoveCity_ContestHall_Text_21C445: @ 821C445
+LilycoveCity_ContestHall_Text_ThatGirlThereIsCutest: @ 821C445
 	.string "I think that girl over there is\n"
 	.string "the cutest of the lot.\p"
 	.string "What's that? They're judging\n"
 	.string "POKéMON by their looks?$"
 
-LilycoveCity_ContestHall_Text_21C4B1: @ 821C4B1
+LilycoveCity_ContestHall_Text_WantCuteMonOfMyOwn: @ 821C4B1
 	.string "Ohh, seeing all these cute POKéMON,\n"
 	.string "they make we want to get my own!\p"
 	.string "I'm going to go catch some!$"
 
-LilycoveCity_ContestHall_Text_21C512: @ 821C512
+LilycoveCity_ContestHall_Text_BeautyContestStage: @ 821C512
 	.string "BEAUTY CONTEST STAGE\n"
 	.string "BE ALLURED BY BEAUTIFUL POKéMON!$"
 
-LilycoveCity_ContestHall_Text_21C548: @ 821C548
+LilycoveCity_ContestHall_Text_CuteContestStage: @ 821C548
 	.string "CUTENESS CONTEST STAGE\n"
 	.string "BE CHARMED BY CUTE POKéMON!$"
 
-LilycoveCity_ContestHall_Text_21C57B: @ 821C57B
+LilycoveCity_ContestHall_Text_SmartContestStage: @ 821C57B
 	.string "SMARTNESS CONTEST STAGE\n"
 	.string "BE IMPRESSED BY SMART POKéMON!$"
 
diff --git a/data/maps/LilycoveCity_ContestLobby/map.json b/data/maps/LilycoveCity_ContestLobby/map.json
index 39605fdba..744ed4174 100644
--- a/data/maps/LilycoveCity_ContestLobby/map.json
+++ b/data/maps/LilycoveCity_ContestLobby/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A554",
+      "script": "LilycoveCity_ContestLobby_EventScript_ContestReceptionist",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A806",
+      "script": "LilycoveCity_ContestLobby_EventScript_LinkContestReceptionist",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_293FA2",
+      "script": "BerryBlender_EventScript_Blender2Man",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A708",
+      "script": "LilycoveCity_ContestLobby_EventScript_BlackBelt",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A711",
+      "script": "LilycoveCity_ContestLobby_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A71A",
+      "script": "LilycoveCity_ContestLobby_EventScript_Artist",
       "flag": "0"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A768",
+      "script": "LilycoveCity_ContestLobby_EventScript_Blender3Boy",
       "flag": "0"
     },
     {
@@ -141,7 +141,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_293FB4",
+      "script": "BerryBlender_EventScript_Blender2Twin",
       "flag": "0"
     },
     {
@@ -167,7 +167,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A72C",
+      "script": "LilycoveCity_ContestLobby_EventScript_Fisherman",
       "flag": "0"
     },
     {
@@ -180,7 +180,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A723",
+      "script": "LilycoveCity_ContestLobby_EventScript_FatMan",
       "flag": "0"
     },
     {
@@ -193,7 +193,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A735",
+      "script": "LilycoveCity_ContestLobby_EventScript_NinjaBoy",
       "flag": "0"
     },
     {
@@ -206,7 +206,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_293FAB",
+      "script": "BerryBlender_EventScript_Blender3PokefanF",
       "flag": "0"
     },
     {
@@ -219,8 +219,8 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_293FBD",
-      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT"
+      "script": "BerryBlender_EventScript_Blender1ExpertM",
+      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_REPLACEMENT"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_GIRL_1",
@@ -232,7 +232,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A771",
+      "script": "LilycoveCity_ContestLobby_EventScript_Blender3Girl",
       "flag": "0"
     },
     {
@@ -245,8 +245,8 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A7B3",
-      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+      "script": "LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker2",
+      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_CAMPER",
@@ -258,8 +258,8 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A7BE",
-      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+      "script": "LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker3",
+      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
@@ -271,8 +271,8 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A7C9",
-      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+      "script": "LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker4",
+      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_2",
@@ -284,8 +284,8 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A7D9",
-      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+      "script": "LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker5",
+      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_WOMAN_1",
@@ -297,8 +297,8 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A7E9",
-      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+      "script": "LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker6",
+      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
@@ -310,8 +310,8 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A7A8",
-      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+      "script": "LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker1",
+      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
@@ -323,8 +323,8 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A798",
-      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+      "script": "LilycoveCity_ContestLobby_EventScript_BlendMaster",
+      "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
@@ -336,7 +336,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_ContestLobby_EventScript_21ACF1",
+      "script": "LilycoveCity_ContestLobby_EventScript_LittleGirl",
       "flag": "0"
     }
   ],
@@ -378,7 +378,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "EventScript_PblockLink"
+      "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_293E1E"
+      "script": "BerryBlender_EventScript_BerryBlender3"
     },
     {
       "type": "sign",
@@ -394,7 +394,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A753"
+      "script": "LilycoveCity_ContestLobby_EventScript_ContestWinner4"
     },
     {
       "type": "sign",
@@ -402,7 +402,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A75A"
+      "script": "LilycoveCity_ContestLobby_EventScript_ContestWinner5"
     },
     {
       "type": "sign",
@@ -410,7 +410,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A761"
+      "script": "LilycoveCity_ContestLobby_EventScript_ContestWinner6"
     },
     {
       "type": "sign",
@@ -418,7 +418,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A77A"
+      "script": "LilycoveCity_ContestLobby_EventScript_BerryBlenderSpeedRecords"
     },
     {
       "type": "sign",
@@ -426,7 +426,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A73E"
+      "script": "LilycoveCity_ContestLobby_EventScript_ContestWinner1"
     },
     {
       "type": "sign",
@@ -434,7 +434,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A745"
+      "script": "LilycoveCity_ContestLobby_EventScript_ContestWinner2"
     },
     {
       "type": "sign",
@@ -442,7 +442,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A74C"
+      "script": "LilycoveCity_ContestLobby_EventScript_ContestWinner3"
     },
     {
       "type": "sign",
@@ -450,7 +450,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "EventScript_Pblock1_Ask"
+      "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_293D4D"
+      "script": "BerryBlender_EventScript_BerryBlender2"
     },
     {
       "type": "sign",
@@ -466,7 +466,7 @@
       "y": 3,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_ContestLobby_EventScript_21A784"
+      "script": "LilycoveCity_ContestLobby_EventScript_LinkContestResults"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc
index 54364eaf3..ecd8e2b95 100644
--- a/data/maps/LilycoveCity_ContestLobby/scripts.inc
+++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc
@@ -1,164 +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
-	clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT
-	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
+	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
-	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT
-	clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
+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
-	drawcontestwinner 0
+	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
@@ -168,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
@@ -179,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
@@ -200,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
-	drawcontestwinner 0
-	msgbox LilycoveCity_ContestLobby_Text_21AE78, MSGBOX_YESNO
+	showcontestwinner 0
+	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
@@ -283,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
@@ -294,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
@@ -315,122 +317,124 @@ LilycoveCity_ContestLobby_Movement_21A54B: @ 821A54B
 	walk_in_place_fastest_left
 	step_end
 
-LilycoveCity_ContestLobby_EventScript_21A554:: @ 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
+@ EventScript_SpeakToContestReceptionist either ends or returns after a contest entry is submitted
+LilycoveCity_ContestLobby_EventScript_ContestReceptionist:: @ 821A554
+	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, 0x1
+	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
@@ -442,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
@@ -470,85 +474,85 @@ 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_21A708:: @ 821A708
-	msgbox LilycoveCity_ContestLobby_Text_21B1B1, MSGBOX_NPC
+LilycoveCity_ContestLobby_EventScript_BlackBelt:: @ 821A708
+	msgbox LilycoveCity_ContestLobby_Text_MasterRankHereICome, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A711:: @ 821A711
-	msgbox LilycoveCity_ContestLobby_Text_21B24D, MSGBOX_NPC
+LilycoveCity_ContestLobby_EventScript_Girl:: @ 821A711
+	msgbox LilycoveCity_ContestLobby_Text_WholeVarietyOfPokemonHere, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A71A:: @ 821A71A
-	msgbox LilycoveCity_ContestLobby_Text_21B2BA, MSGBOX_NPC
+LilycoveCity_ContestLobby_EventScript_Artist:: @ 821A71A
+	msgbox LilycoveCity_ContestLobby_Text_ContestFeastForEyes, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A723:: @ 821A723
-	msgbox LilycoveCity_ContestLobby_Text_21B334, MSGBOX_NPC
+LilycoveCity_ContestLobby_EventScript_FatMan:: @ 821A723
+	msgbox LilycoveCity_ContestLobby_Text_ToughContestIsExtreme, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A72C:: @ 821A72C
-	msgbox LilycoveCity_ContestLobby_Text_21B392, MSGBOX_NPC
+LilycoveCity_ContestLobby_EventScript_Fisherman:: @ 821A72C
+	msgbox LilycoveCity_ContestLobby_Text_LavishedCareOnMon, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A735:: @ 821A735
-	msgbox LilycoveCity_ContestLobby_Text_21B3FC, MSGBOX_NPC
+LilycoveCity_ContestLobby_EventScript_NinjaBoy:: @ 821A735
+	msgbox LilycoveCity_ContestLobby_Text_MadePokeblocksWithFamily, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A73E:: @ 821A73E
+LilycoveCity_ContestLobby_EventScript_ContestWinner1:: @ 821A73E
 	lockall
 	fadescreen 1
-	drawcontestwinner 1
+	showcontestwinner 1
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A745:: @ 821A745
+LilycoveCity_ContestLobby_EventScript_ContestWinner2:: @ 821A745
 	lockall
 	fadescreen 1
-	drawcontestwinner 2
+	showcontestwinner 2
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A74C:: @ 821A74C
+LilycoveCity_ContestLobby_EventScript_ContestWinner3:: @ 821A74C
 	lockall
 	fadescreen 1
-	drawcontestwinner 3
+	showcontestwinner 3
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A753:: @ 821A753
+LilycoveCity_ContestLobby_EventScript_ContestWinner4:: @ 821A753
 	lockall
 	fadescreen 1
-	drawcontestwinner 4
+	showcontestwinner 4
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A75A:: @ 821A75A
+LilycoveCity_ContestLobby_EventScript_ContestWinner5:: @ 821A75A
 	lockall
 	fadescreen 1
-	drawcontestwinner 5
+	showcontestwinner 5
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A761:: @ 821A761
+LilycoveCity_ContestLobby_EventScript_ContestWinner6:: @ 821A761
 	lockall
 	fadescreen 1
-	drawcontestwinner 6
+	showcontestwinner 6
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A768:: @ 821A768
-	msgbox LilycoveCity_ContestLobby_Text_2931AA, MSGBOX_NPC
+LilycoveCity_ContestLobby_EventScript_Blender3Boy:: @ 821A768
+	msgbox BerryBlender_Text_LetsGetBlendingAlready, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A771:: @ 821A771
-	msgbox LilycoveCity_ContestLobby_Text_2931C6, MSGBOX_NPC
+LilycoveCity_ContestLobby_EventScript_Blender3Girl:: @ 821A771
+	msgbox BerryBlender_Text_WhatKindOfPokeblockWillIGet, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A77A:: @ 821A77A
+LilycoveCity_ContestLobby_EventScript_BerryBlenderSpeedRecords:: @ 821A77A
 	lockall
 	special ShowBerryBlenderRecordWindow
 	waitbuttonpress
@@ -556,7 +560,7 @@ LilycoveCity_ContestLobby_EventScript_21A77A:: @ 821A77A
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A784:: @ 821A784
+LilycoveCity_ContestLobby_EventScript_LinkContestResults:: @ 821A784
 	lockall
 	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
 	setvar VAR_0x8005, 7
@@ -566,397 +570,397 @@ LilycoveCity_ContestLobby_EventScript_21A784:: @ 821A784
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A798:: @ 821A798
+LilycoveCity_ContestLobby_EventScript_BlendMaster:: @ 821A798
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestLobby_Text_2C427C, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A7F9
+	msgbox BerryBlender_Text_BlendWithTheBlendMaster, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A7A8:: @ 821A7A8
+LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker1:: @ 821A7A8
 	lock
-	msgbox LilycoveCity_ContestLobby_Text_2C464B, MSGBOX_DEFAULT
+	msgbox BerryBlender_Text_WhoaAwesome, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A7B3:: @ 821A7B3
+LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker2:: @ 821A7B3
 	lock
-	msgbox LilycoveCity_ContestLobby_Text_2C465A, MSGBOX_DEFAULT
+	msgbox BerryBlender_Text_WickedlyFast, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A7BE:: @ 821A7BE
+LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker3:: @ 821A7BE
 	lock
-	msgbox LilycoveCity_ContestLobby_Text_2C4669, MSGBOX_DEFAULT
+	msgbox BerryBlender_Text_WhatAnExpert, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A7C9:: @ 821A7C9
+LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker4:: @ 821A7C9
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestLobby_Text_2C4679, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A7F9
+	msgbox BerryBlender_Text_MadeAmazingPokeblocksWithMaster, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A7D9:: @ 821A7D9
+LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker5:: @ 821A7D9
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestLobby_Text_2C46B1, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A7F9
+	msgbox BerryBlender_Text_QualitiesOfBlendMaster, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A7E9:: @ 821A7E9
+LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker6:: @ 821A7E9
 	lock
 	faceplayer
-	msgbox LilycoveCity_ContestLobby_Text_2C4763, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_21A7F9
+	msgbox BerryBlender_Text_MasterWorksOnSkillsInMountains, MSGBOX_DEFAULT
+	goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A7F9:: @ 821A7F9
+LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection:: @ 821A7F9
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_21A806:: @ 821A806
-	special sub_80F9154
+LilycoveCity_ContestLobby_EventScript_LinkContestReceptionist:: @ 821A806
+	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
@@ -969,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
@@ -997,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_21ACF1:: @ 821ACF1
+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"
@@ -1033,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"
@@ -1042,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"
@@ -1051,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"
@@ -1086,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_CoveLilyMotel_1F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json
index 8f251039c..c447bb41d 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_218189",
+      "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_MotelOwner",
       "flag": "0"
     }
   ],
@@ -59,7 +59,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_218211"
+      "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_BlockingTV"
     }
   ],
   "bg_events": []
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc
index d4e630e4a..3f97cc597 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc
@@ -1,43 +1,43 @@
 LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 8218188
 	.byte 0
 
-LilycoveCity_CoveLilyMotel_1F_EventScript_218189:: @ 8218189
+LilycoveCity_CoveLilyMotel_1F_EventScript_MotelOwner:: @ 8218189
 	lockall
-	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA
-	goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_218264, MSGBOX_DEFAULT
+	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_GameClear
+	goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_AquaHideoutBusted
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_GuestsDoubledByMascot, MSGBOX_DEFAULT
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_21831E, MSGBOX_DEFAULT
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_NoGuestsWithTeamAqua, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3:: @ 82181C3
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_2183C3, MSGBOX_DEFAULT
+LilycoveCity_CoveLilyMotel_1F_EventScript_AquaHideoutBusted:: @ 82181C3
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_MonFoundLostItem, MSGBOX_DEFAULT
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_218470, MSGBOX_DEFAULT
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_HeardAquaHideoutBusted, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA:: @ 82181EA
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_218544, MSGBOX_DEFAULT
+LilycoveCity_CoveLilyMotel_1F_EventScript_GameClear:: @ 82181EA
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_HouseSittingMonCaughtBurglar, MSGBOX_DEFAULT
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_2185F4, MSGBOX_DEFAULT
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_BetterGetWorkingOnGuestsDinner, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211
+LilycoveCity_CoveLilyMotel_1F_EventScript_BlockingTV:: @ 8218211
 	lockall
 	playse SE_PIN
 	applymovement 1, Common_Movement_ExclamationMark
@@ -46,34 +46,34 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_21839B, MSGBOX_DEFAULT
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_CantSeeTheTV, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_218259
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_21825E
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_PlayerPushFromTV
+	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_OwnerPushPlayer
 	waitmovement 0
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_218260
+	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_OwnerReturn
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_CoveLilyMotel_1F_Movement_218259: @ 8218259
+LilycoveCity_CoveLilyMotel_1F_Movement_PlayerPushFromTV: @ 8218259
 	face_right
 	lock_facing_direction
 	walk_left
 	unlock_facing_direction
 	step_end
 
-LilycoveCity_CoveLilyMotel_1F_Movement_21825E: @ 821825E
+LilycoveCity_CoveLilyMotel_1F_Movement_OwnerPushPlayer: @ 821825E
 	walk_up
 	step_end
 
-LilycoveCity_CoveLilyMotel_1F_Movement_218260: @ 8218260
+LilycoveCity_CoveLilyMotel_1F_Movement_OwnerReturn: @ 8218260
 	face_down
 	walk_down
 	face_up
 	step_end
 
-LilycoveCity_CoveLilyMotel_1F_Text_218264: @ 8218264
+LilycoveCity_CoveLilyMotel_1F_Text_GuestsDoubledByMascot: @ 8218264
 	.string "Hm, so they doubled the guests by\n"
 	.string "using POKéMON as attractions?\p"
 	.string "Hm, well, maybe I should make a cute\n"
@@ -81,17 +81,17 @@ LilycoveCity_CoveLilyMotel_1F_Text_218264: @ 8218264
 	.string "I wonder if that will attract more\n"
 	.string "guests to stay with us?$"
 
-LilycoveCity_CoveLilyMotel_1F_Text_21831E: @ 821831E
+LilycoveCity_CoveLilyMotel_1F_Text_NoGuestsWithTeamAqua: @ 821831E
 	.string "Oh, sorry, sorry!\n"
 	.string "I was too involved in watching TV!\p"
 	.string "Since that TEAM AQUA came to town,\n"
 	.string "the tourists have been staying away.$"
 
-LilycoveCity_CoveLilyMotel_1F_Text_21839B: @ 821839B
+LilycoveCity_CoveLilyMotel_1F_Text_CantSeeTheTV: @ 821839B
 	.string "Hey, down in front!\n"
 	.string "I can't see the TV!$"
 
-LilycoveCity_CoveLilyMotel_1F_Text_2183C3: @ 82183C3
+LilycoveCity_CoveLilyMotel_1F_Text_MonFoundLostItem: @ 82183C3
 	.string "Amazing! You're telling me a POKéMON\n"
 	.string "found someone's lost item?\p"
 	.string "That's something. If we had some smart\n"
@@ -99,7 +99,7 @@ LilycoveCity_CoveLilyMotel_1F_Text_2183C3: @ 82183C3
 	.string "We could recover anything that our\n"
 	.string "guests mislaid…$"
 
-LilycoveCity_CoveLilyMotel_1F_Text_218470: @ 8218470
+LilycoveCity_CoveLilyMotel_1F_Text_HeardAquaHideoutBusted: @ 8218470
 	.string "Oh, sorry, sorry!\n"
 	.string "I was too involved in watching TV!\p"
 	.string "I heard that someone busted\n"
@@ -109,7 +109,7 @@ LilycoveCity_CoveLilyMotel_1F_Text_218470: @ 8218470
 	.string "It was a company called… Uh…\n"
 	.string "GAME something…$"
 
-LilycoveCity_CoveLilyMotel_1F_Text_218544: @ 8218544
+LilycoveCity_CoveLilyMotel_1F_Text_HouseSittingMonCaughtBurglar: @ 8218544
 	.string "Amazing! A house-sitting POKéMON\n"
 	.string "caught a burglar?\p"
 	.string "That's something. If we had a tough\n"
@@ -117,7 +117,7 @@ LilycoveCity_CoveLilyMotel_1F_Text_218544: @ 8218544
 	.string "We would be able to provide our guests\n"
 	.string "with greater safety.$"
 
-LilycoveCity_CoveLilyMotel_1F_Text_2185F4: @ 82185F4
+LilycoveCity_CoveLilyMotel_1F_Text_BetterGetWorkingOnGuestsDinner: @ 82185F4
 	.string "Oh, sorry, sorry!\n"
 	.string "I was too involved in watching TV.\p"
 	.string "Oh, yes. A big group of guests arrived\n"
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json
index 0bd551815..17c93e5a1 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3",
+      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_GameDesigner",
       "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218729",
+      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_GraphicArtist",
       "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218732",
+      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_FatMan",
       "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218720",
+      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_Programmer",
       "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218744",
+      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_GameBoyKid",
       "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_21873B",
+      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_Woman",
       "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_21874D",
+      "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_Scott",
       "flag": "FLAG_HIDE_LILCOVE_MOTEL_SCOTT"
     }
   ],
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
index fd6aa34bd..7878e791a 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
@@ -1,30 +1,30 @@
 LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 82186D2
 	.byte 0
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3:: @ 82186D3
+LilycoveCity_CoveLilyMotel_2F_EventScript_GameDesigner:: @ 82186D3
 	lock
 	faceplayer
-	call_if_unset FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9
-	call_if_set FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_21870F
+	call_if_unset FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_ShowMeCompletedDex
+	call_if_set FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_ShowDiploma
 	specialvar VAR_RESULT, HasAllHoennMons
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_218702
+	compare VAR_RESULT, TRUE
+	goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_AllHoennMonsFanfare
 	release
 	end
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9:: @ 82186F9
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_218774, MSGBOX_DEFAULT
+LilycoveCity_CoveLilyMotel_2F_EventScript_ShowMeCompletedDex:: @ 82186F9
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_ShowMeCompletedDex, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_218702:: @ 8218702
+LilycoveCity_CoveLilyMotel_2F_EventScript_AllHoennMonsFanfare:: @ 8218702
 	setflag FLAG_TEMP_2
 	playfanfare MUS_FANFA4
 	waitfanfare
-	goto LilycoveCity_CoveLilyMotel_2F_EventScript_21870F
+	goto LilycoveCity_CoveLilyMotel_2F_EventScript_ShowDiploma
 	end
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_21870F:: @ 821870F
-	message LilycoveCity_CoveLilyMotel_2F_Text_21881C
+LilycoveCity_CoveLilyMotel_2F_EventScript_ShowDiploma:: @ 821870F
+	message LilycoveCity_CoveLilyMotel_2F_Text_FilledPokedexGiveYouThis
 	waitmessage
 	call Common_EventScript_PlayGymBadgeFanfare
 	special Special_ShowDiploma
@@ -32,42 +32,42 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_21870F:: @ 821870F
 	release
 	end
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_218720:: @ 8218720
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_2188D6, MSGBOX_NPC
+LilycoveCity_CoveLilyMotel_2F_EventScript_Programmer:: @ 8218720
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_ImTheProgrammer, MSGBOX_NPC
 	end
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_218729:: @ 8218729
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_21892B, MSGBOX_NPC
+LilycoveCity_CoveLilyMotel_2F_EventScript_GraphicArtist:: @ 8218729
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_ImTheGraphicArtist, MSGBOX_NPC
 	end
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_218732:: @ 8218732
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_21896C, MSGBOX_NPC
+LilycoveCity_CoveLilyMotel_2F_EventScript_FatMan:: @ 8218732
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_GirlsAreCute, MSGBOX_NPC
 	end
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_21873B:: @ 821873B
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_218A21, MSGBOX_NPC
+LilycoveCity_CoveLilyMotel_2F_EventScript_Woman:: @ 821873B
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_SeaBreezeTicklesHeart, MSGBOX_NPC
 	end
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_218744:: @ 8218744
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_218A5B, MSGBOX_NPC
+LilycoveCity_CoveLilyMotel_2F_EventScript_GameBoyKid:: @ 8218744
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_NeverLeaveWithoutGameBoy, MSGBOX_NPC
 	end
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_21874D:: @ 821874D
+LilycoveCity_CoveLilyMotel_2F_EventScript_Scott:: @ 821874D
 	lock
 	faceplayer
-	goto_if_set FLAG_MET_SCOTT_IN_LILYCOVE, LilycoveCity_CoveLilyMotel_2F_EventScript_21876A
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_218ACF, MSGBOX_DEFAULT
+	goto_if_set FLAG_MET_SCOTT_IN_LILYCOVE, LilycoveCity_CoveLilyMotel_2F_EventScript_MetScott
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_SnoozingPreferBattles, MSGBOX_DEFAULT
 	addvar VAR_SCOTT_STATE, 1
 	setflag FLAG_MET_SCOTT_IN_LILYCOVE
 	release
 	end
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_21876A:: @ 821876A
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_218C33, MSGBOX_DEFAULT
+LilycoveCity_CoveLilyMotel_2F_EventScript_MetScott:: @ 821876A
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_ContestsDoTakeStrategy, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_CoveLilyMotel_2F_Text_218774: @ 8218774
+LilycoveCity_CoveLilyMotel_2F_Text_ShowMeCompletedDex: @ 8218774
 	.string "I'm the GAME DESIGNER.\p"
 	.string "Oh, is that right?\n"
 	.string "You're working on a POKéDEX?\p"
@@ -76,7 +76,7 @@ LilycoveCity_CoveLilyMotel_2F_Text_218774: @ 8218774
 	.string "If you do complete it, please come\n"
 	.string "show me.$"
 
-LilycoveCity_CoveLilyMotel_2F_Text_21881C: @ 821881C
+LilycoveCity_CoveLilyMotel_2F_Text_FilledPokedexGiveYouThis: @ 821881C
 	.string "Wow! That's awesome!\n"
 	.string "Yep, it's totally awesome!\p"
 	.string "This POKéDEX is completely filled!\n"
@@ -85,17 +85,17 @@ LilycoveCity_CoveLilyMotel_2F_Text_21881C: @ 821881C
 	.string "Let me give you something in\n"
 	.string "recognition of your feat!$"
 
-LilycoveCity_CoveLilyMotel_2F_Text_2188D6: @ 82188D6
+LilycoveCity_CoveLilyMotel_2F_Text_ImTheProgrammer: @ 82188D6
 	.string "Me? You're talking to me?\n"
 	.string "I'm the PROGRAMMER.\p"
 	.string "I wonder what the SLOTS are\n"
 	.string "like here.$"
 
-LilycoveCity_CoveLilyMotel_2F_Text_21892B: @ 821892B
+LilycoveCity_CoveLilyMotel_2F_Text_ImTheGraphicArtist: @ 821892B
 	.string "I'm the GRAPHIC ARTIST! Aren't the\n"
 	.string "POKéMON of HOENN interesting?$"
 
-LilycoveCity_CoveLilyMotel_2F_Text_21896C: @ 821896C
+LilycoveCity_CoveLilyMotel_2F_Text_GirlsAreCute: @ 821896C
 	.string "The girl TUBERS, they're cute, hey?\n"
 	.string "To battle against a cute TUBER…\p"
 	.string "Whoop, it's so awesome!\p"
@@ -103,17 +103,17 @@ LilycoveCity_CoveLilyMotel_2F_Text_21896C: @ 821896C
 	.string "A 2-on-2 battle with TWINS…\p"
 	.string "Whoop, it's unbearably fun!$"
 
-LilycoveCity_CoveLilyMotel_2F_Text_218A21: @ 8218A21
+LilycoveCity_CoveLilyMotel_2F_Text_SeaBreezeTicklesHeart: @ 8218A21
 	.string "The sea breeze tickles my heart.\n"
 	.string "It feels wonderful here!$"
 
-LilycoveCity_CoveLilyMotel_2F_Text_218A5B: @ 8218A5B
+LilycoveCity_CoveLilyMotel_2F_Text_NeverLeaveWithoutGameBoy: @ 8218A5B
 	.string "You never know when and where\n"
 	.string "people will challenge you.\p"
 	.string "That's why I never leave home without\n"
 	.string "my GAME BOY ADVANCE.$"
 
-LilycoveCity_CoveLilyMotel_2F_Text_218ACF: @ 8218ACF
+LilycoveCity_CoveLilyMotel_2F_Text_SnoozingPreferBattles: @ 8218ACF
 	.string "SCOTT: … … … … …\n"
 	.string "… … … … … Zzz…\p"
 	.string "… … … … … Huh?!\n"
@@ -129,7 +129,7 @@ LilycoveCity_CoveLilyMotel_2F_Text_218ACF: @ 8218ACF
 	.string "like the GYMS, CONTESTS, BATTLE TENT,\l"
 	.string "the whole works!$"
 
-LilycoveCity_CoveLilyMotel_2F_Text_218C33: @ 8218C33
+LilycoveCity_CoveLilyMotel_2F_Text_ContestsDoTakeStrategy: @ 8218C33
 	.string "SCOTT: I think it does take strategy\n"
 	.string "to win a CONTEST.\p"
 	.string "Devising CONTEST strategies is one way\n"
diff --git a/data/maps/LilycoveCity_House1/map.json b/data/maps/LilycoveCity_House1/map.json
index 54fa58333..4f3fbcc28 100644
--- a/data/maps/LilycoveCity_House1/map.json
+++ b/data/maps/LilycoveCity_House1/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_House1_EventScript_21ECCE",
+      "script": "LilycoveCity_House1_EventScript_ExpertM",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_House1_EventScript_21ECD7",
+      "script": "LilycoveCity_House1_EventScript_Kecleon",
       "flag": "0"
     }
   ],
diff --git a/data/maps/LilycoveCity_House1/scripts.inc b/data/maps/LilycoveCity_House1/scripts.inc
index ce09fa3dc..207b27a11 100644
--- a/data/maps/LilycoveCity_House1/scripts.inc
+++ b/data/maps/LilycoveCity_House1/scripts.inc
@@ -1,26 +1,26 @@
 LilycoveCity_House1_MapScripts:: @ 821ECCD
 	.byte 0
 
-LilycoveCity_House1_EventScript_21ECCE:: @ 821ECCE
-	msgbox LilycoveCity_House1_Text_21ECEA, MSGBOX_NPC
+LilycoveCity_House1_EventScript_ExpertM:: @ 821ECCE
+	msgbox LilycoveCity_House1_Text_PokemonPartnersNotTools, MSGBOX_NPC
 	end
 
-LilycoveCity_House1_EventScript_21ECD7:: @ 821ECD7
+LilycoveCity_House1_EventScript_Kecleon:: @ 821ECD7
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_KECLEON, 0
-	msgbox LilycoveCity_House1_Text_21ED63, MSGBOX_DEFAULT
+	msgbox LilycoveCity_House1_Text_Kecleon, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-LilycoveCity_House1_Text_21ECEA: @ 821ECEA
+LilycoveCity_House1_Text_PokemonPartnersNotTools: @ 821ECEA
 	.string "POKéMON are partners to people.\n"
 	.string "They aren't our tools.\p"
 	.string "Unfortunately, there are some people\n"
 	.string "who fail to understand that…$"
 
-LilycoveCity_House1_Text_21ED63: @ 821ED63
+LilycoveCity_House1_Text_Kecleon: @ 821ED63
 	.string "KECLEON: Ruroro?$"
 
diff --git a/data/maps/LilycoveCity_House2/map.json b/data/maps/LilycoveCity_House2/map.json
index b3e4127a6..c92a50499 100644
--- a/data/maps/LilycoveCity_House2/map.json
+++ b/data/maps/LilycoveCity_House2/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_House2_EventScript_21ED75",
+      "script": "LilycoveCity_House2_EventScript_FatMan",
       "flag": "0"
     }
   ],
diff --git a/data/maps/LilycoveCity_House2/scripts.inc b/data/maps/LilycoveCity_House2/scripts.inc
index 0a0792bfd..517ba0434 100644
--- a/data/maps/LilycoveCity_House2/scripts.inc
+++ b/data/maps/LilycoveCity_House2/scripts.inc
@@ -1,30 +1,30 @@
 LilycoveCity_House2_MapScripts:: @ 821ED74
 	.byte 0
 
-LilycoveCity_House2_EventScript_21ED75:: @ 821ED75
+LilycoveCity_House2_EventScript_FatMan:: @ 821ED75
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_TM44, LilycoveCity_House2_EventScript_21EDAC
-	msgbox LilycoveCity_House2_Text_21EDB6, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_TM44, LilycoveCity_House2_EventScript_ReceivedRest
+	msgbox LilycoveCity_House2_Text_NotAwakeYetHaveThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM44
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM44
-	msgbox LilycoveCity_House2_Text_21EDF9, MSGBOX_DEFAULT
+	msgbox LilycoveCity_House2_Text_SleepIsEssential, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_House2_EventScript_21EDAC:: @ 821EDAC
-	msgbox LilycoveCity_House2_Text_21EDF9, MSGBOX_DEFAULT
+LilycoveCity_House2_EventScript_ReceivedRest:: @ 821EDAC
+	msgbox LilycoveCity_House2_Text_SleepIsEssential, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_House2_Text_21EDB6: @ 821EDB6
+LilycoveCity_House2_Text_NotAwakeYetHaveThis: @ 821EDB6
 	.string "Huh? What? What's that?\p"
 	.string "I'm not near awake yet…\n"
 	.string "You can have this…$"
 
-LilycoveCity_House2_Text_21EDF9: @ 821EDF9
+LilycoveCity_House2_Text_SleepIsEssential: @ 821EDF9
 	.string "Yawn…\p"
 	.string "Sleep is essential for good health…\n"
 	.string "Sleep and regain health…$"
diff --git a/data/maps/LilycoveCity_House3/map.json b/data/maps/LilycoveCity_House3/map.json
index 537fc46b3..e8010956d 100644
--- a/data/maps/LilycoveCity_House3/map.json
+++ b/data/maps/LilycoveCity_House3/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_House3_EventScript_21EF3D",
+      "script": "LilycoveCity_House3_EventScript_GameBoyKid4",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_House3_EventScript_21EE4B",
+      "script": "LilycoveCity_House3_EventScript_PokefanF",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_House3_EventScript_21EED5",
+      "script": "LilycoveCity_House3_EventScript_GameBoyKid2",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_House3_EventScript_21EF09",
+      "script": "LilycoveCity_House3_EventScript_GameBoyKid3",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_House3_EventScript_21EEA1",
+      "script": "LilycoveCity_House3_EventScript_GameBoyKid1",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_House3_EventScript_21EE8A",
+      "script": "LilycoveCity_House3_EventScript_Man",
       "flag": "0"
     }
   ],
diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc
index 1f4cef433..8d4a1059e 100644
--- a/data/maps/LilycoveCity_House3/scripts.inc
+++ b/data/maps/LilycoveCity_House3/scripts.inc
@@ -7,98 +7,98 @@ LilycoveCity_House3_OnTransition: @ 821EE42
 	copyvar VAR_TEMP_1, VAR_RESULT
 	end
 
-LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B
+LilycoveCity_House3_EventScript_PokefanF:: @ 821EE4B
 	lock
 	faceplayer
-	msgbox LilycoveCity_House3_Text_21EF99, MSGBOX_YESNO
+	msgbox LilycoveCity_House3_Text_LearnFromMasterOfPokeblocks, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq LilycoveCity_House3_EventScript_21EE75
-	msgbox LilycoveCity_House3_Text_21F0F8, MSGBOX_DEFAULT
+	goto_if_eq LilycoveCity_House3_EventScript_DeclinePokeblockLearn
+	msgbox LilycoveCity_House3_Text_ExplainPokeblocks, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_House3_EventScript_21EE75:: @ 821EE75
-	msgbox LilycoveCity_House3_Text_21F0A9, MSGBOX_DEFAULT
+LilycoveCity_House3_EventScript_DeclinePokeblockLearn:: @ 821EE75
+	msgbox LilycoveCity_House3_Text_OhAreYouSure, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_House3_EventScript_21EE8A:: @ 821EE8A
+LilycoveCity_House3_EventScript_Man:: @ 821EE8A
 	lock
 	faceplayer
-	msgbox LilycoveCity_House3_Text_21F430, MSGBOX_DEFAULT
+	msgbox LilycoveCity_House3_Text_HappyToHaveQuadruplets, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_House3_EventScript_21EEA1:: @ 821EEA1
+LilycoveCity_House3_EventScript_GameBoyKid1:: @ 821EEA1
 	lock
 	faceplayer
 	switch VAR_TEMP_1
-	case 0, LilycoveCity_House3_EventScript_21EF71
-	case 1, LilycoveCity_House3_EventScript_21EF7B
-	case 2, LilycoveCity_House3_EventScript_21EF85
-	case 3, LilycoveCity_House3_EventScript_21EF8F
+	case 0, LilycoveCity_House3_EventScript_WereDoingMultiBattle
+	case 1, LilycoveCity_House3_EventScript_WereMixingRecords
+	case 2, LilycoveCity_House3_EventScript_WereBlendingBerries
+	case 3, LilycoveCity_House3_EventScript_WereDoingContest
 	end
 
-LilycoveCity_House3_EventScript_21EED5:: @ 821EED5
+LilycoveCity_House3_EventScript_GameBoyKid2:: @ 821EED5
 	lock
 	faceplayer
 	switch VAR_TEMP_1
-	case 0, LilycoveCity_House3_EventScript_21EF71
-	case 1, LilycoveCity_House3_EventScript_21EF7B
-	case 2, LilycoveCity_House3_EventScript_21EF85
-	case 3, LilycoveCity_House3_EventScript_21EF8F
+	case 0, LilycoveCity_House3_EventScript_WereDoingMultiBattle
+	case 1, LilycoveCity_House3_EventScript_WereMixingRecords
+	case 2, LilycoveCity_House3_EventScript_WereBlendingBerries
+	case 3, LilycoveCity_House3_EventScript_WereDoingContest
 	end
 
-LilycoveCity_House3_EventScript_21EF09:: @ 821EF09
+LilycoveCity_House3_EventScript_GameBoyKid3:: @ 821EF09
 	lock
 	faceplayer
 	switch VAR_TEMP_1
-	case 0, LilycoveCity_House3_EventScript_21EF71
-	case 1, LilycoveCity_House3_EventScript_21EF7B
-	case 2, LilycoveCity_House3_EventScript_21EF85
-	case 3, LilycoveCity_House3_EventScript_21EF8F
+	case 0, LilycoveCity_House3_EventScript_WereDoingMultiBattle
+	case 1, LilycoveCity_House3_EventScript_WereMixingRecords
+	case 2, LilycoveCity_House3_EventScript_WereBlendingBerries
+	case 3, LilycoveCity_House3_EventScript_WereDoingContest
 	end
 
-LilycoveCity_House3_EventScript_21EF3D:: @ 821EF3D
+LilycoveCity_House3_EventScript_GameBoyKid4:: @ 821EF3D
 	lock
 	faceplayer
 	switch VAR_TEMP_1
-	case 0, LilycoveCity_House3_EventScript_21EF71
-	case 1, LilycoveCity_House3_EventScript_21EF7B
-	case 2, LilycoveCity_House3_EventScript_21EF85
-	case 3, LilycoveCity_House3_EventScript_21EF8F
+	case 0, LilycoveCity_House3_EventScript_WereDoingMultiBattle
+	case 1, LilycoveCity_House3_EventScript_WereMixingRecords
+	case 2, LilycoveCity_House3_EventScript_WereBlendingBerries
+	case 3, LilycoveCity_House3_EventScript_WereDoingContest
 	end
 
-LilycoveCity_House3_EventScript_21EF71:: @ 821EF71
-	msgbox LilycoveCity_House3_Text_21F4A7, MSGBOX_DEFAULT
+LilycoveCity_House3_EventScript_WereDoingMultiBattle:: @ 821EF71
+	msgbox LilycoveCity_House3_Text_GoingToWinMultiBattles, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_House3_EventScript_21EF7B:: @ 821EF7B
-	msgbox LilycoveCity_House3_Text_21F4E0, MSGBOX_DEFAULT
+LilycoveCity_House3_EventScript_WereMixingRecords:: @ 821EF7B
+	msgbox LilycoveCity_House3_Text_LikeMixingAtRecordCorner, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_House3_EventScript_21EF85:: @ 821EF85
-	msgbox LilycoveCity_House3_Text_21F523, MSGBOX_DEFAULT
+LilycoveCity_House3_EventScript_WereBlendingBerries:: @ 821EF85
+	msgbox LilycoveCity_House3_Text_MakePokeblocksWithBerryBlender, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_House3_EventScript_21EF8F:: @ 821EF8F
-	msgbox LilycoveCity_House3_Text_21F55A, MSGBOX_DEFAULT
+LilycoveCity_House3_EventScript_WereDoingContest:: @ 821EF8F
+	msgbox LilycoveCity_House3_Text_GoingToEnterContest, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_House3_Text_21EF99: @ 821EF99
+LilycoveCity_House3_Text_LearnFromMasterOfPokeblocks: @ 821EF99
 	.string "Oh, my, my! Are you traveling alone?\n"
 	.string "But you're so young! Good for you!\p"
 	.string "I'm sure my kids could learn a thing\n"
@@ -109,12 +109,12 @@ LilycoveCity_House3_Text_21EF99: @ 821EF99
 	.string "Would you like to learn from me,\n"
 	.string "a master of {POKEBLOCK}S?$"
 
-LilycoveCity_House3_Text_21F0A9: @ 821F0A9
+LilycoveCity_House3_Text_OhAreYouSure: @ 821F0A9
 	.string "Oh? Are you sure?\p"
 	.string "You shouldn't always try to do\n"
 	.string "everything by yourself, dear!$"
 
-LilycoveCity_House3_Text_21F0F8: @ 821F0F8
+LilycoveCity_House3_Text_ExplainPokeblocks: @ 821F0F8
 	.string "Oh, good! You're a smart soul!\n"
 	.string "This is a bit long, so listen up!\p"
 	.string "Are you ready?\p"
@@ -143,26 +143,26 @@ LilycoveCity_House3_Text_21F0F8: @ 821F0F8
 	.string "the world would be a happier place.\p"
 	.string "Don't give up, dear!$"
 
-LilycoveCity_House3_Text_21F430: @ 821F430
+LilycoveCity_House3_Text_HappyToHaveQuadruplets: @ 821F430
 	.string "When my wife gave birth to quadruplets,\n"
 	.string "you bet I was shocked.\p"
 	.string "But, now, seeing them play together,\n"
 	.string "it makes me happy.$"
 
-LilycoveCity_House3_Text_21F4A7: @ 821F4A7
+LilycoveCity_House3_Text_GoingToWinMultiBattles: @ 821F4A7
 	.string "We're having MULTI BATTLES, but I know\n"
 	.string "I'm going to win.$"
 
-LilycoveCity_House3_Text_21F4E0: @ 821F4E0
+LilycoveCity_House3_Text_LikeMixingAtRecordCorner: @ 821F4E0
 	.string "We like mixing stuff at\n"
 	.string "the RECORD CORNER.\p"
 	.string "But what gets mixed up?$"
 
-LilycoveCity_House3_Text_21F523: @ 821F523
+LilycoveCity_House3_Text_MakePokeblocksWithBerryBlender: @ 821F523
 	.string "We're going to make super {POKEBLOCK}S\n"
 	.string "with a BERRY BLENDER!$"
 
-LilycoveCity_House3_Text_21F55A: @ 821F55A
+LilycoveCity_House3_Text_GoingToEnterContest: @ 821F55A
 	.string "I want to brag about how tough my\n"
 	.string "POKéMON is, so we're going to enter\l"
 	.string "a CONTEST together.$"
diff --git a/data/maps/LilycoveCity_House4/map.json b/data/maps/LilycoveCity_House4/map.json
index f442d00ba..95fc79d35 100644
--- a/data/maps/LilycoveCity_House4/map.json
+++ b/data/maps/LilycoveCity_House4/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_House4_EventScript_21F5B5",
+      "script": "LilycoveCity_House4_EventScript_Man1",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_House4_EventScript_21F5BE",
+      "script": "LilycoveCity_House4_EventScript_Man2",
       "flag": "0"
     }
   ],
diff --git a/data/maps/LilycoveCity_House4/scripts.inc b/data/maps/LilycoveCity_House4/scripts.inc
index 2306ff6df..685a91b7d 100644
--- a/data/maps/LilycoveCity_House4/scripts.inc
+++ b/data/maps/LilycoveCity_House4/scripts.inc
@@ -1,20 +1,20 @@
 LilycoveCity_House4_MapScripts:: @ 821F5B4
 	.byte 0
 
-LilycoveCity_House4_EventScript_21F5B5:: @ 821F5B5
-	msgbox LilycoveCity_House4_Text_21F5C7, MSGBOX_NPC
+LilycoveCity_House4_EventScript_Man1:: @ 821F5B5
+	msgbox LilycoveCity_House4_Text_MysteriesAtBottomOfSea, MSGBOX_NPC
 	end
 
-LilycoveCity_House4_EventScript_21F5BE:: @ 821F5BE
-	msgbox LilycoveCity_House4_Text_21F62B, MSGBOX_NPC
+LilycoveCity_House4_EventScript_Man2:: @ 821F5BE
+	msgbox LilycoveCity_House4_Text_UnderwaterTrenchMossdeepSootopolis, MSGBOX_NPC
 	end
 
-LilycoveCity_House4_Text_21F5C7: @ 821F5C7
+LilycoveCity_House4_Text_MysteriesAtBottomOfSea: @ 821F5C7
 	.string "This planet's biggest mysteries are\n"
 	.string "at the bottom of the sea.\p"
 	.string "Somebody said that, but I don't know…$"
 
-LilycoveCity_House4_Text_21F62B: @ 821F62B
+LilycoveCity_House4_Text_UnderwaterTrenchMossdeepSootopolis: @ 821F62B
 	.string "There's a deep underwater trench\n"
 	.string "between MOSSDEEP and SOOTOPOLIS.\p"
 	.string "That's what someone told me, anyway.$"
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json
index 11272059e..83028fbeb 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_Greeter",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_Curator",
       "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_SchoolKidM",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_Artist1",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E07",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_NinjaBoy",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E10",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_Woman1",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E19",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_Woman2",
       "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_Artist2",
       "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E42",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_FatMan",
       "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS"
     },
     {
@@ -141,7 +141,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E22",
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_PsychicM",
       "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3"
     }
   ],
@@ -176,7 +176,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_FantasyPainting"
     },
     {
       "type": "sign",
@@ -184,7 +184,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_FantasyPainting"
     },
     {
       "type": "sign",
@@ -192,7 +192,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_BerryPainting"
     },
     {
       "type": "sign",
@@ -200,7 +200,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_BerryPainting"
     },
     {
       "type": "sign",
@@ -208,7 +208,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_OldPainting"
     },
     {
       "type": "sign",
@@ -216,7 +216,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_WomanPainting"
     },
     {
       "type": "sign",
@@ -224,7 +224,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_WomanPainting"
     },
     {
       "type": "sign",
@@ -232,7 +232,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA"
+      "script": "LilycoveCity_LilycoveMuseum_EventScript_BirdSculpture"
     },
     {
       "type": "sign",
@@ -240,7 +240,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_OldPainting"
     },
     {
       "type": "sign",
@@ -248,7 +248,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_GrassPokemonPainting"
     },
     {
       "type": "sign",
@@ -256,7 +256,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_StoneTablet"
     },
     {
       "type": "sign",
@@ -264,7 +264,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_LegendaryPokemonPainting"
     },
     {
       "type": "sign",
@@ -272,7 +272,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_LegendaryPokemonPainting"
     },
     {
       "type": "sign",
@@ -280,7 +280,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_StoneTablet"
     },
     {
       "type": "sign",
@@ -288,7 +288,7 @@
       "y": 11,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_PokeBallSculpture"
     },
     {
       "type": "sign",
@@ -296,7 +296,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC"
+      "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_StoneTablet"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc
index 8075215aa..a9c6f1266 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc
@@ -1,175 +1,174 @@
 LilycoveCity_LilycoveMuseum_1F_MapScripts:: @ 8218CB8
 	.byte 0
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9:: @ 8218CB9
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_218E4B, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_1F_EventScript_Greeter:: @ 8218CB9
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_WelcomeToLilycoveMuseum, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2:: @ 8218CC2
+LilycoveCity_LilycoveMuseum_1F_EventScript_Curator:: @ 8218CC2
 	lockall
 	applymovement 2, Common_Movement_FacePlayer
-	message LilycoveCity_LilycoveMuseum_1F_Text_218EBC
+	message LilycoveCity_LilycoveMuseum_1F_Text_ImCuratorHaveYouViewedOurPaintings
 	waitmessage
 	multichoice 20, 8, MULTI_VIEWED_PAINTINGS, 1
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5
+	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_SawPaintings
 	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC
+	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_NotYet
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC:: @ 8218CEC
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F5C, MSGBOX_NPC
+LilycoveCity_LilycoveMuseum_1F_EventScript_NotYet:: @ 8218CEC
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_NotDisturbYouTakeYourTime, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5:: @ 8218CF5
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F98, MSGBOX_YESNO
+LilycoveCity_LilycoveMuseum_1F_EventScript_SawPaintings:: @ 8218CF5
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_HaveYouAnInterestInPaintings, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D14
+	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_NotInterested
 	compare VAR_RESULT, YES
-	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E
+	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_InterestedInPaintings
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218D14:: @ 8218D14
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_218FF8, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_1F_EventScript_NotInterested:: @ 8218D14
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_HonoredYoudVisitInSpiteOfThat, MSGBOX_SIGN
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E:: @ 8218D1E
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_219035, MSGBOX_SIGN
-	applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_218D99
+LilycoveCity_LilycoveMuseum_1F_EventScript_InterestedInPaintings:: @ 8218D1E
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_ExcellentCanYouComeWithMe, MSGBOX_SIGN
+	applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_CuratorEnterStairs
 	waitmovement 0
 	removeobject 2
 	switch VAR_FACING
-	case DIR_NORTH, LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A
-	case DIR_WEST, LilycoveCity_LilycoveMuseum_1F_EventScript_218D6F
-	case DIR_EAST, LilycoveCity_LilycoveMuseum_1F_EventScript_218D84
+	case DIR_NORTH, LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorNorth
+	case DIR_WEST, LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorWest
+	case DIR_EAST, LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorEast
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A:: @ 8218D5A
+LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorNorth:: @ 8218D5A
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_218DA1
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorNorth
 	waitmovement 0
 	warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8
 	waitstate
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218D6F:: @ 8218D6F
+LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorWest:: @ 8218D6F
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_218D9B
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorWest
 	waitmovement 0
 	warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8
 	waitstate
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218D84:: @ 8218D84
+LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorEast:: @ 8218D84
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_218D9E
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorEast
 	waitmovement 0
 	warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8
 	waitstate
 	end
 
-LilycoveCity_LilycoveMuseum_1F_Movement_218D99: @ 8218D99
+LilycoveCity_LilycoveMuseum_1F_Movement_CuratorEnterStairs: @ 8218D99
 	walk_up
 	step_end
 
-LilycoveCity_LilycoveMuseum_1F_Movement_218D9B: @ 8218D9B
+LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorWest: @ 8218D9B
 	walk_left
 	walk_up
 	step_end
 
-LilycoveCity_LilycoveMuseum_1F_Movement_218D9E: @ 8218D9E
+LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorEast: @ 8218D9E
 	walk_right
 	walk_up
 	step_end
 
-LilycoveCity_LilycoveMuseum_1F_Movement_218DA1: @ 8218DA1
+LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorNorth: @ 8218DA1
 	walk_up
 	walk_up
 	step_end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4:: @ 8218DA4
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_219080, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_1F_EventScript_OldPainting:: @ 8218DA4
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_VeryOldPainting, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD:: @ 8218DAD
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2190BF, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_1F_EventScript_FantasyPainting:: @ 8218DAD
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_OddLandscapeFantasticScenery, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6:: @ 8218DB6
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2190F9, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_1F_EventScript_WomanPainting:: @ 8218DB6
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfBeautifulWoman, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF:: @ 8218DBF
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_219142, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_1F_EventScript_LegendaryPokemonPainting:: @ 8218DBF
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfLegendaryPokemon, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8:: @ 8218DC8
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2191A2, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_1F_EventScript_GrassPokemonPainting:: @ 8218DC8
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfGrassPokemon, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1:: @ 8218DD1
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_21920D, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_1F_EventScript_BerryPainting:: @ 8218DD1
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfBerries, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA:: @ 8218DDA
-LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA:: @ 8218DDA
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_219260, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_EventScript_BirdSculpture:: @ 8218DDA
+	msgbox LilycoveCity_LilycoveMuseum_Text_BirdPokemonSculptureReplica, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3:: @ 8218DE3
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2192AA, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_1F_EventScript_PokeBallSculpture:: @ 8218DE3
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_BigPokeBallCarvedFromStone, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC:: @ 8218DEC
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_219311, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_1F_EventScript_StoneTablet:: @ 8218DEC
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_StoneTabletWithAncientText, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5:: @ 8218DF5
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2193B4, MSGBOX_NPC
+LilycoveCity_LilycoveMuseum_1F_EventScript_SchoolKidM:: @ 8218DF5
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_MustntForgetLoveForFineArts, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE:: @ 8218DFE
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_21941A, MSGBOX_NPC
+LilycoveCity_LilycoveMuseum_1F_EventScript_Artist1:: @ 8218DFE
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_ThisMuseumIsInspiration, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218E07:: @ 8218E07
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2194BA, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_1F_EventScript_NinjaBoy:: @ 8218E07
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_ThisLadyIsPretty, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218E10:: @ 8218E10
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2194E1, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_1F_EventScript_Woman1:: @ 8218E10
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_ThisPokemonIsAdorable, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218E19:: @ 8218E19
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_219515, MSGBOX_NPC
+LilycoveCity_LilycoveMuseum_1F_EventScript_Woman2:: @ 8218E19
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_HeardMuseumGotNewPaintings, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218E22:: @ 8218E22
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_21959B, MSGBOX_NPC
+LilycoveCity_LilycoveMuseum_1F_EventScript_PsychicM:: @ 8218E22
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_CuratorHasBeenCheerful, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B:: @ 8218E2B
+LilycoveCity_LilycoveMuseum_1F_EventScript_Artist2:: @ 8218E2B
 	lock
 	faceplayer
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_2195FF, MSGBOX_DEFAULT
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_AimToSeeGreatPaintings, MSGBOX_DEFAULT
 	closemessage
 	applymovement 8, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_218E42:: @ 8218E42
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_21967A, MSGBOX_NPC
+LilycoveCity_LilycoveMuseum_1F_EventScript_FatMan:: @ 8218E42
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_MuseumTouristDestination, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_1F_Text_218E4B: @ 8218E4B
+LilycoveCity_LilycoveMuseum_1F_Text_WelcomeToLilycoveMuseum: @ 8218E4B
 	.string "Welcome to LILYCOVE MUSEUM.\p"
 	.string "Please take the time to enjoy our\n"
 	.string "collection of fantastic artwork\l"
 	.string "featuring POKéMON.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_218EBC: @ 8218EBC
+LilycoveCity_LilycoveMuseum_1F_Text_ImCuratorHaveYouViewedOurPaintings: @ 8218EBC
 	.string "I'm the CURATOR of this MUSEUM of\n"
 	.string "fine arts.\p"
 	.string "It's heartening to see someone so\n"
@@ -177,116 +176,116 @@ LilycoveCity_LilycoveMuseum_1F_Text_218EBC: @ 8218EBC
 	.string "Have you viewed our collection of\n"
 	.string "paintings already?$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_218F5C: @ 8218F5C
+LilycoveCity_LilycoveMuseum_1F_Text_NotDisturbYouTakeYourTime: @ 8218F5C
 	.string "Ah, then let me not disturb you.\n"
 	.string "Please, do take your time.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_218F98: @ 8218F98
+LilycoveCity_LilycoveMuseum_1F_Text_HaveYouAnInterestInPaintings: @ 8218F98
 	.string "Oh? I do believe that you seem to\n"
 	.string "be a POKéMON TRAINER.\p"
 	.string "Have you an interest in paintings,\n"
 	.string "too?$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_218FF8: @ 8218FF8
+LilycoveCity_LilycoveMuseum_1F_Text_HonoredYoudVisitInSpiteOfThat: @ 8218FF8
 	.string "I see…\p"
 	.string "I'm honored that you would visit\n"
 	.string "us in spite of that.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_219035: @ 8219035
+LilycoveCity_LilycoveMuseum_1F_Text_ExcellentCanYouComeWithMe: @ 8219035
 	.string "Ah, excellent!\n"
 	.string "You do like paintings!\p"
 	.string "Then, may I ask you to come with me?$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_219080: @ 8219080
+LilycoveCity_LilycoveMuseum_1F_Text_VeryOldPainting: @ 8219080
 	.string "It's a very old painting.\n"
 	.string "The paint is peeling here and there.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_2190BF: @ 82190BF
+LilycoveCity_LilycoveMuseum_1F_Text_OddLandscapeFantasticScenery: @ 82190BF
 	.string "It's an odd landscape with bizarre\n"
 	.string "and fantastic scenery.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_2190F9: @ 82190F9
+LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfBeautifulWoman: @ 82190F9
 	.string "It's a painting of a beautiful, smiling\n"
 	.string "woman with a POKéMON on her lap.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_219142: @ 8219142
+LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfLegendaryPokemon: @ 8219142
 	.string "It's a painting of a legendary POKéMON\n"
 	.string "from long ago.\p"
 	.string "The artist painted this from\n"
 	.string "imagination.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_2191A2: @ 82191A2
+LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfGrassPokemon: @ 82191A2
 	.string "It's a painting of GRASS POKéMON\n"
 	.string "swaying in a breeze.\p"
 	.string "They appear to be enjoying the wind's\n"
 	.string "gentle caress.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_21920D: @ 821920D
+LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfBerries: @ 821920D
 	.string "It's a delicious-looking painting\n"
 	.string "of BERRIES.\p"
 	.string "This painting could make you hungry!$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_219260: @ 8219260
+LilycoveCity_LilycoveMuseum_Text_BirdPokemonSculptureReplica: @ 8219260
 	.string "It's a replica of a famous sculpture.\p"
 	.string "It depicts an ancient BIRD POKéMON.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_2192AA: @ 82192AA
+LilycoveCity_LilycoveMuseum_1F_Text_BigPokeBallCarvedFromStone: @ 82192AA
 	.string "It's a big POKé BALL carved from\n"
 	.string "a black stone.\p"
 	.string "It was apparently used in festivals\n"
 	.string "in the olden days.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_219311: @ 8219311
+LilycoveCity_LilycoveMuseum_1F_Text_StoneTabletWithAncientText: @ 8219311
 	.string "It's a huge stone tablet inscribed\n"
 	.string "with POKéMON and dense text in the\l"
 	.string "small characters of an ancient,\l"
 	.string "unreadable language.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_21938C: @ 821938C
+LilycoveCity_LilycoveMuseum_1F_Text_WorksOfMagnificence: @ 821938C
 	.string "Hmmm…\n"
 	.string "What works of great magnificence…$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_2193B4: @ 82193B4
+LilycoveCity_LilycoveMuseum_1F_Text_MustntForgetLoveForFineArts: @ 82193B4
 	.string "Battling with POKéMON is fun,\n"
 	.string "I'll grant you that.\p"
 	.string "But one mustn't forget our love for\n"
 	.string "the fine arts.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_21941A: @ 821941A
+LilycoveCity_LilycoveMuseum_1F_Text_ThisMuseumIsInspiration: @ 821941A
 	.string "This ART MUSEUM… Well, you could\n"
 	.string "see many fantastic paintings.\p"
 	.string "And the CURATOR is a wonderful person.\p"
 	.string "Among artists like myself, this MUSEUM\n"
 	.string "is an inspiration.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_2194BA: @ 82194BA
+LilycoveCity_LilycoveMuseum_1F_Text_ThisLadyIsPretty: @ 82194BA
 	.string "This lady is pretty!\n"
 	.string "She's like Mommy!$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_2194E1: @ 82194E1
+LilycoveCity_LilycoveMuseum_1F_Text_ThisPokemonIsAdorable: @ 82194E1
 	.string "This POKéMON is adorable!\n"
 	.string "Just like our little boy!$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_219515: @ 8219515
+LilycoveCity_LilycoveMuseum_1F_Text_HeardMuseumGotNewPaintings: @ 8219515
 	.string "I'd heard that this ART MUSEUM got\n"
 	.string "in some new paintings.\p"
 	.string "So, naturally I hurried over.\p"
 	.string "Are the new paintings up on\n"
 	.string "the second floor?$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_21959B: @ 821959B
+LilycoveCity_LilycoveMuseum_1F_Text_CuratorHasBeenCheerful: @ 821959B
 	.string "Lately, the CURATOR has been\n"
 	.string "unusually cheerful.\p"
 	.string "I bet something good happened for him.\n"
 	.string "Definitely.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_2195FF: @ 82195FF
+LilycoveCity_LilycoveMuseum_1F_Text_AimToSeeGreatPaintings: @ 82195FF
 	.string "I aim to see many great paintings\n"
 	.string "here and learn from them.\p"
 	.string "I have this dream of one day having\n"
 	.string "my artwork exhibited here.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_21967A: @ 821967A
+LilycoveCity_LilycoveMuseum_1F_Text_MuseumTouristDestination: @ 821967A
 	.string "The ART MUSEUM has become a favorite\n"
 	.string "tourist destination.\p"
 	.string "It's great for LILYCOVE…\n"
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json
index 18a2829e4..54d6fbc63 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219866",
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_Curator",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21998A",
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_Girl",
       "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219993",
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_ExpertM",
       "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21999C",
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_RichBoy",
       "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS"
     }
   ],
@@ -84,7 +84,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21992B"
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_CutePainting"
     },
     {
       "type": "sign",
@@ -92,7 +92,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21992B"
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_CutePainting"
     },
     {
       "type": "sign",
@@ -100,7 +100,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21993E"
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_ToughPainting"
     },
     {
       "type": "sign",
@@ -108,7 +108,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21993E"
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_ToughPainting"
     },
     {
       "type": "sign",
@@ -116,7 +116,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219951"
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_CoolPainting"
     },
     {
       "type": "sign",
@@ -124,7 +124,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219951"
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_CoolPainting"
     },
     {
       "type": "sign",
@@ -132,7 +132,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219964"
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_BeautyPainting"
     },
     {
       "type": "sign",
@@ -140,7 +140,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219964"
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_BeautyPainting"
     },
     {
       "type": "sign",
@@ -148,7 +148,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219977"
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_SmartPainting"
     },
     {
       "type": "sign",
@@ -156,7 +156,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219977"
+      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_SmartPainting"
     },
     {
       "type": "sign",
@@ -164,7 +164,7 @@
       "y": 2,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA"
+      "script": "LilycoveCity_LilycoveMuseum_EventScript_BirdSculpture"
     },
     {
       "type": "sign",
@@ -172,7 +172,7 @@
       "y": 2,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA"
+      "script": "LilycoveCity_LilycoveMuseum_EventScript_BirdSculpture"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
index 190c2b677..4279d3064 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
@@ -1,224 +1,224 @@
 LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 821973A
-	map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_LilycoveMuseum_2F_MapScript1_219745
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE
+	map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_LilycoveMuseum_2F_OnLoad
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_LilycoveMuseum_2F_OnFrame
 	.byte 0
 
-LilycoveCity_LilycoveMuseum_2F_MapScript1_219745: @ 8219745
-	goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_21978B
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219754
+LilycoveCity_LilycoveMuseum_2F_OnLoad: @ 8219745
+	goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_SetCoolPainting
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckBeautyPainting
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_219754:: @ 8219754
-	goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2197A3
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219763
+LilycoveCity_LilycoveMuseum_2F_EventScript_CheckBeautyPainting:: @ 8219754
+	goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_SetBeautyPainting
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckCutePainting
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_219763:: @ 8219763
-	goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2197BB
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219772
+LilycoveCity_LilycoveMuseum_2F_EventScript_CheckCutePainting:: @ 8219763
+	goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_SetCutePainting
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckSmartPainting
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_219772:: @ 8219772
-	goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2197D3
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219781
+LilycoveCity_LilycoveMuseum_2F_EventScript_CheckSmartPainting:: @ 8219772
+	goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_SetSmartPainting
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckToughPainting
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_219781:: @ 8219781
-	goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB
+LilycoveCity_LilycoveMuseum_2F_EventScript_CheckToughPainting:: @ 8219781
+	goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_SetToughPainting
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_21978B:: @ 821978B
+LilycoveCity_LilycoveMuseum_2F_EventScript_SetCoolPainting:: @ 821978B
 	setmetatile 10, 6, METATILE_LilycoveMuseum_Painting2_Left, 1
 	setmetatile 11, 6, METATILE_LilycoveMuseum_Painting2_Right, 1
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219754
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckBeautyPainting
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_2197A3:: @ 82197A3
+LilycoveCity_LilycoveMuseum_2F_EventScript_SetBeautyPainting:: @ 82197A3
 	setmetatile 18, 6, METATILE_LilycoveMuseum_Painting1_Left, 1
 	setmetatile 19, 6, METATILE_LilycoveMuseum_Painting1_Right, 1
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219763
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckCutePainting
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_2197BB:: @ 82197BB
+LilycoveCity_LilycoveMuseum_2F_EventScript_SetCutePainting:: @ 82197BB
 	setmetatile 14, 10, METATILE_LilycoveMuseum_Painting3_Left, 1
 	setmetatile 15, 10, METATILE_LilycoveMuseum_Painting3_Right, 1
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219772
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckSmartPainting
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_2197D3:: @ 82197D3
+LilycoveCity_LilycoveMuseum_2F_EventScript_SetSmartPainting:: @ 82197D3
 	setmetatile 6, 10, METATILE_LilycoveMuseum_Painting0_Left, 1
 	setmetatile 7, 10, METATILE_LilycoveMuseum_Painting0_Right, 1
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219781
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckToughPainting
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB:: @ 82197EB
+LilycoveCity_LilycoveMuseum_2F_EventScript_SetToughPainting:: @ 82197EB
 	setmetatile 2, 6, METATILE_LilycoveMuseum_Painting4_Left, 1
 	setmetatile 3, 6, METATILE_LilycoveMuseum_Painting4_Right, 1
 	end
 
-LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE: @ 82197FE
-	map_script_2 VAR_LILYCOVE_MUSEUM_2F_STATE, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219808
+LilycoveCity_LilycoveMuseum_2F_OnFrame: @ 82197FE
+	map_script_2 VAR_LILYCOVE_MUSEUM_2F_STATE, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowExhibitHall
 	.2byte 0
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808
+LilycoveCity_LilycoveMuseum_2F_EventScript_ShowExhibitHall:: @ 8219808
 	lockall
 	applymovement 1, Common_Movement_FacePlayer
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219861
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft
 	waitmovement 0
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_2199EB, MSGBOX_SIGN
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ThisIsExhibitHall, MSGBOX_SIGN
+	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219863
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall
 	waitmovement 0
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219A0D, MSGBOX_SIGN
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ExplainExhibitHall, MSGBOX_SIGN
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219861
+	applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft
 	waitmovement 0
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219BC4, MSGBOX_SIGN
-	copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_PleaseObtainPaintingsForExhibit, MSGBOX_SIGN
+	copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_2F_Movement_219861: @ 8219861
+LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft: @ 8219861
 	walk_in_place_fastest_left
 	step_end
 
-LilycoveCity_LilycoveMuseum_2F_Movement_219863: @ 8219863
+LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall: @ 8219863
 	face_up
 	delay_16
 	step_end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_219866:: @ 8219866
+LilycoveCity_LilycoveMuseum_2F_EventScript_Curator:: @ 8219866
 	lockall
-	goto_if_set FLAG_RECEIVED_GLASS_ORNAMENT, LilycoveCity_LilycoveMuseum_2F_EventScript_219921
+	goto_if_set FLAG_RECEIVED_GLASS_ORNAMENT, LilycoveCity_LilycoveMuseum_2F_EventScript_ReceivedGlassOrnament
 	specialvar VAR_0x8004, CountPlayerContestPaintings
 	switch VAR_0x8004
-	case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA
-	case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA
-	case 3, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA
-	case 4, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA
-	case 5, LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219CF3, MSGBOX_NPC
+	case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting
+	case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting
+	case 3, LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting
+	case 4, LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting
+	case 5, LilycoveCity_LilycoveMuseum_2F_EventScript_ThankPlayer
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_WishToFillExhibit, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA:: @ 82198BA
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219D42, MSGBOX_NPC
+LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting:: @ 82198BA
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ThanksAddedNewPainting, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3:: @ 82198C3
+LilycoveCity_LilycoveMuseum_2F_EventScript_ThankPlayer:: @ 82198C3
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DD4, MSGBOX_DEFAULT
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DE6, MSGBOX_DEFAULT
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsYouPlayer, MSGBOX_DEFAULT
+	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_PaintingsAttractedMoreGuests, MSGBOX_DEFAULT
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_GiveGlassOrnament
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA
+LilycoveCity_LilycoveMuseum_2F_EventScript_GiveGlassOrnament:: @ 82198EA
 	applymovement 1, Common_Movement_FacePlayer
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EC5, MSGBOX_DEFAULT
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_TokenOfGratitude, MSGBOX_DEFAULT
 	givedecoration_std DECOR_GLASS_ORNAMENT
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_219911
+	compare VAR_RESULT, FALSE
+	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_NoRoomForGlassOrnament
 	setflag FLAG_RECEIVED_GLASS_ORNAMENT
 	closemessage
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_219911:: @ 8219911
+LilycoveCity_LilycoveMuseum_2F_EventScript_NoRoomForGlassOrnament:: @ 8219911
 	call Common_EventScript_NoRoomForDecor
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EED, MSGBOX_DEFAULT
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_KeepThisForYou, MSGBOX_DEFAULT
 	closemessage
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_219921:: @ 8219921
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219F1B, MSGBOX_NPC
+LilycoveCity_LilycoveMuseum_2F_EventScript_ReceivedGlassOrnament:: @ 8219921
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_HonorToHaveYouVisit, MSGBOX_NPC
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_21992B:: @ 821992B
+LilycoveCity_LilycoveMuseum_2F_EventScript_CutePainting:: @ 821992B
 	lockall
-	goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FA0, MSGBOX_SIGN
+	goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCutePainting
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPinkPictureFrame, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_21993E:: @ 821993E
+LilycoveCity_LilycoveMuseum_2F_EventScript_ToughPainting:: @ 821993E
 	lockall
-	goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FD3, MSGBOX_SIGN
+	goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowToughPainting
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsYellowPictureFrame, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_219951:: @ 8219951
+LilycoveCity_LilycoveMuseum_2F_EventScript_CoolPainting:: @ 8219951
 	lockall
-	goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A03B, MSGBOX_SIGN
+	goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCoolPainting
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsRedPictureFrame, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_219964:: @ 8219964
+LilycoveCity_LilycoveMuseum_2F_EventScript_BeautyPainting:: @ 8219964
 	lockall
-	goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A008, MSGBOX_SIGN
+	goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowBeautyPainting
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsBluePictureFrame, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_219977:: @ 8219977
+LilycoveCity_LilycoveMuseum_2F_EventScript_SmartPainting:: @ 8219977
 	lockall
-	goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A06D, MSGBOX_SIGN
+	goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowSmartPainting
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsGreenPictureFrame, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_21998A:: @ 821998A
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0BD, MSGBOX_NPC
+LilycoveCity_LilycoveMuseum_2F_EventScript_Girl:: @ 821998A
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_NewPaintingsSurprisedMe, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_219993:: @ 8219993
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A132, MSGBOX_NPC
+LilycoveCity_LilycoveMuseum_2F_EventScript_ExpertM:: @ 8219993
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_NewPaintingsRatherAmusing, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_21999C:: @ 821999C
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A1A8, MSGBOX_NPC
+LilycoveCity_LilycoveMuseum_2F_EventScript_RichBoy:: @ 821999C
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ThesePaintingsOfYourPokemon, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5:: @ 82199A5
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCoolPainting:: @ 82199A5
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
 	fadescreen 1
-	drawcontestwinner 9
+	showcontestwinner 9
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3:: @ 82199B3
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_2F_EventScript_ShowBeautyPainting:: @ 82199B3
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
 	fadescreen 1
-	drawcontestwinner 10
+	showcontestwinner 10
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1:: @ 82199C1
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCutePainting:: @ 82199C1
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
 	fadescreen 1
-	drawcontestwinner 11
+	showcontestwinner 11
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF:: @ 82199CF
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_2F_EventScript_ShowSmartPainting:: @ 82199CF
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
 	fadescreen 1
-	drawcontestwinner 12
+	showcontestwinner 12
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD:: @ 82199DD
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN
+LilycoveCity_LilycoveMuseum_2F_EventScript_ShowToughPainting:: @ 82199DD
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
 	fadescreen 1
-	drawcontestwinner 13
+	showcontestwinner 13
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_2F_Text_2199EB: @ 82199EB
+LilycoveCity_LilycoveMuseum_2F_Text_ThisIsExhibitHall: @ 82199EB
 	.string "This is our special exhibit hall.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_219A0D: @ 8219A0D
+LilycoveCity_LilycoveMuseum_2F_Text_ExplainExhibitHall: @ 8219A0D
 	.string "As you can plainly see, there is not\n"
 	.string "a single painting on exhibit.\p"
 	.string "Here, I don't wish to exhibit works of\n"
@@ -234,7 +234,7 @@ LilycoveCity_LilycoveMuseum_2F_Text_219A0D: @ 8219A0D
 	.string "POKéMON seemingly ready to spring\l"
 	.string "forth into glorious life!$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_219BC4: @ 8219BC4
+LilycoveCity_LilycoveMuseum_2F_Text_PleaseObtainPaintingsForExhibit: @ 8219BC4
 	.string "I beg your pardon. I didn't intend\n"
 	.string "to monopolize the conversation.\p"
 	.string "Now, as you are young, and yet\n"
@@ -246,23 +246,23 @@ LilycoveCity_LilycoveMuseum_2F_Text_219BC4: @ 8219BC4
 	.string "the artist's permission to exhibit\l"
 	.string "it here?$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_219CF3: @ 8219CF3
+LilycoveCity_LilycoveMuseum_2F_Text_WishToFillExhibit: @ 8219CF3
 	.string "I wish to fill this exhibit hall with\n"
 	.string "modern and vibrant paintings of\l"
 	.string "POKéMON.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_219D42: @ 8219D42
+LilycoveCity_LilycoveMuseum_2F_Text_ThanksAddedNewPainting: @ 8219D42
 	.string "Thanks to you, we've added a new\n"
 	.string "painting to our collection!\p"
 	.string "I've heard it depicts your POKéMON.\n"
 	.string "Truly magnificent!\p"
 	.string "Thank you so very, very much!$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_219DD4: @ 8219DD4
+LilycoveCity_LilycoveMuseum_2F_Text_ItsYouPlayer: @ 8219DD4
 	.string "Ah! It's you!\n"
 	.string "{PLAYER}!$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_219DE6: @ 8219DE6
+LilycoveCity_LilycoveMuseum_2F_Text_PaintingsAttractedMoreGuests: @ 8219DE6
 	.string "Isn't this marvelous?\n"
 	.string "This collection of paintings!\p"
 	.string "Each one of them flawless!\n"
@@ -272,56 +272,56 @@ LilycoveCity_LilycoveMuseum_2F_Text_219DE6: @ 8219DE6
 	.string "Sincerely, I thank you, {PLAYER}.\n"
 	.string "This is my dream come true!$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_219EC5: @ 8219EC5
+LilycoveCity_LilycoveMuseum_2F_Text_TokenOfGratitude: @ 8219EC5
 	.string "This is merely a token of my gratitude.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_219EED: @ 8219EED
+LilycoveCity_LilycoveMuseum_2F_Text_KeepThisForYou: @ 8219EED
 	.string "I will keep this for you until we\n"
 	.string "meet again.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_219F1B: @ 8219F1B
+LilycoveCity_LilycoveMuseum_2F_Text_HonorToHaveYouVisit: @ 8219F1B
 	.string "Ah, so good to see you, {PLAYER}!\p"
 	.string "It's an honor to have you visit us\n"
 	.string "on your busy journeys.\p"
 	.string "Please, relax and do enjoy your\n"
 	.string "visit with us.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_219FA0: @ 8219FA0
+LilycoveCity_LilycoveMuseum_2F_Text_ItsPinkPictureFrame: @ 8219FA0
 	.string "It's a picture frame with pink-colored\n"
 	.string "adornments.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_219FD3: @ 8219FD3
+LilycoveCity_LilycoveMuseum_2F_Text_ItsYellowPictureFrame: @ 8219FD3
 	.string "It's a picture frame with\n"
 	.string "yellow-colored adornments.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_21A008: @ 821A008
+LilycoveCity_LilycoveMuseum_2F_Text_ItsBluePictureFrame: @ 821A008
 	.string "It's a picture frame with\n"
 	.string "blue-colored adornments.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_21A03B: @ 821A03B
+LilycoveCity_LilycoveMuseum_2F_Text_ItsRedPictureFrame: @ 821A03B
 	.string "It's a picture frame with\n"
 	.string "red-colored adornments.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_21A06D: @ 821A06D
+LilycoveCity_LilycoveMuseum_2F_Text_ItsGreenPictureFrame: @ 821A06D
 	.string "It's a picture frame with\n"
 	.string "green-colored adornments.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_21A0A1: @ 821A0A1
+LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon: @ 821A0A1
 	.string "It's a painting of POKéMON.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_21A0BD: @ 821A0BD
+LilycoveCity_LilycoveMuseum_2F_Text_NewPaintingsSurprisedMe: @ 821A0BD
 	.string "I've been away awhile, so the new\n"
 	.string "paintings up here surprised me.\p"
 	.string "I wish someone would paint my POKéMON\n"
 	.string "this pretty.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_21A132: @ 821A132
+LilycoveCity_LilycoveMuseum_2F_Text_NewPaintingsRatherAmusing: @ 821A132
 	.string "Well… So this is where they show\n"
 	.string "the topical POKéMON paintings.\p"
 	.string "I see, these new paintings are indeed\n"
 	.string "rather amusing.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_21A1A8: @ 821A1A8
+LilycoveCity_LilycoveMuseum_2F_Text_ThesePaintingsOfYourPokemon: @ 821A1A8
 	.string "Wow, is that right?\n"
 	.string "These paintings are of your POKéMON.\p"
 	.string "Isn't that just the ultimate joy for\n"
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
index 74333595a..3645d5cab 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
 
@@ -609,11 +609,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_AlreadyInterviewed:: @ 821CEED
 LilycoveCity_PokemonTrainerFanClub_EventScript_AlreadyInterviewed2:: @ 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"
@@ -834,11 +834,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
new file mode 100644
index 000000000..1d0862a65
--- /dev/null
+++ b/data/scripts/berry_blender.inc
@@ -0,0 +1,747 @@
+BerryBlender_Text_WantToMakePokeblocks: @ 8292DEE
+	.string "Oh? Did you want to make some {POKEBLOCK}S\n"
+	.string "with this old-timer?$"
+
+BerryBlender_Text_Excellent: @ 8292E28
+	.string "Excellent!$"
+
+BerryBlender_Text_MadeOldTimerSad: @ 8292E33
+	.string "Oh…\n"
+	.string "You've made this old-timer sad…$"
+
+BerryBlender_Text_KnowHowToMakePokeblocks: @ 8292E57
+	.string "Do you know how to make a {POKEBLOCK}?$"
+
+BerryBlender_Text_LetsBerryBlender: @ 8292E78
+	.string "Let's get started, then!\p"
+	.string "Let's BERRY BLENDER!$"
+
+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"
+	.string "your marker, just press the A Button.\p"
+	.string "That's all you have to do.\n"
+	.string "You'll see how easy it is when you try.$"
+
+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.$"
+
+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.$"
+
+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.$"
+
+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.$"
+
+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.$"
+
+BerryBlender_Text_LetsGetBlendingAlready: @ 82931AA
+	.string "Let's get blending already!$"
+
+BerryBlender_Text_WhatKindOfPokeblockWillIGet: @ 82931C6
+	.string "I wonder what kind of {POKEBLOCK} I'll get?\n"
+	.string "This is so exciting!$"
+
+BerryBlender_Text_WantToBlendPokeblocksWithUs: @ 8293201
+	.string "Hi, there! Did you want to blend some\n"
+	.string "{POKEBLOCK}S with us?$"
+
+BerryBlender_Text_Okay: @ 8293237
+	.string "Okay!$"
+
+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!$"
+
+BerryBlender_Text_KnowHowToMakePokeblocks2: @ 829328C
+	.string "Of course, you do know how to\n"
+	.string "blend {POKEBLOCK}S, don't you?$"
+
+BerryBlender_Text_LetsBerryBlender2: @ 82932C3
+	.string "Let's get started, then!\p"
+	.string "Let's BERRY BLENDER!$"
+
+BerryBlender_Text_ExplainBerryBlending2: @ 82932F1
+	.string "Okay!\n"
+	.string "Let me explain it to you!\p"
+	.string "When the spinning BLENDER's arrow\n"
+	.string "reaches your marker, just press\l"
+	.string "the A Button.\p"
+	.string "That's all it takes.\n"
+	.string "Pretty easy, don't you think?$"
+
+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"
+	.string "BERRIES…\p"
+	.string "We'll always be around whenever you\n"
+	.string "get hold of some BERRIES to blend.$"
+
+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.$"
+
+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
+BerryBlender_Text_MakePokeblocksWithOurGroup: @ 829350B
+	.string "Oh, hello! Did you want to make some\n"
+	.string "{POKEBLOCK}S with our little group?$"
+
+BerryBlender_Text_OhDear: @ 829354E
+	.string "Oh, dear!$"
+
+BerryBlender_Text_LeftUsInShock: @ 8293558
+	.string "Oh, dear me…\p"
+	.string "You've left us in shock!$"
+
+BerryBlender_Text_KnowHowToMakePokeblocks3: @ 829357E
+	.string "Naturally, you know how to make\n"
+	.string "{POKEBLOCK}S, don't you?$"
+
+BerryBlender_Text_LetsBerryBlender3: @ 82935B1
+	.string "Okay, dear!\n"
+	.string "Let's get started!\p"
+	.string "Let's BERRY BLENDER!$"
+
+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"
+	.string "your marker, press the A Button.\p"
+	.string "That's all it takes.\n"
+	.string "Isn't it simple?$"
+
+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"
+	.string "you can't make any {POKEBLOCK}S.\p"
+	.string "We'll always be making {POKEBLOCK}S here,\n"
+	.string "so let's make some together when\l"
+	.string "you get a BERRY or two.$"
+
+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.$"
+
+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.$"
+
+BerryBlender_Text_SetNewBlenderRecord: @ 82937F9
+	.string "Okay! Today's going to be the day that\n"
+	.string "I set a new BLENDER speed record!$"
+
+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?$"
+
+BerryBlender_Text_MakeDeliciousPokeblocks: @ 829388F
+	.string "I'm going to make delicious {POKEBLOCK}S\n"
+	.string "and make my POKéMON cuter.$"
+
+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?$"
+
+BerryBlender_Text_SearchingForFriends: @ 8293955
+	.string "Searching for your friends…\n"
+	.string "… … B Button: Cancel$"
+
+BerryBlender_Text_Player1Arrived: @ 8293986
+	.string "{STR_VAR_1} arrived.$"
+
+BerryBlender_Text_Player1And2Arrived: @ 8293992
+	.string "{STR_VAR_1} and {STR_VAR_2} arrived.$"
+
+BerryBlender_Text_AllPlayersArrived: @ 82939A5
+	.string "{STR_VAR_1}, {STR_VAR_2}, and\n"
+	.string "{STR_VAR_3} arrived.$"
+
+BerryBlender_Text_NoBerriesLink: @ 82939BD
+	.string "You have no BERRIES.\n"
+	.string "The BERRY BLENDER can't be used.$"
+
+BerryBlender_Text_PokeblockCaseIsFullLink: @ 82939F3
+	.string "Your {POKEBLOCK} CASE is full.\n"
+	.string "The BERRY BLENDER can't be used.$"
+
+BerryBlender_Text_DontHavePokeblockCaseLink: @ 8293A2D
+	.string "You don't have a {POKEBLOCK} CASE.\n"
+	.string "The BERRY BLENDER can't be used.$"
+
+BerryBlender_Text_LoveMakingPokeblocks: @ 8293A6B
+	.string "I love making {POKEBLOCK}S.\p"
+	.string "I always have some BERRIES with me.$"
+
+BerryBlender_Text_MakePokeblocksUsingBerryBlender: @ 8293AA5
+	.string "If you'd like, we could make some\n"
+	.string "{POKEBLOCK}S together using the\l"
+	.string "BERRY BLENDER.$"
+
+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.$"
+
+BerryBlender_Text_UseItToMakePokeblocksTogether: @ 8293B76
+	.string "We'll use it to make {POKEBLOCK}S together\n"
+	.string "using the BERRY BLENDER.$"
+
+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"
+	.string "give you one…\p"
+	.string "But, I don't have any to spare today.\n"
+	.string "Sorry about that.$"
+
+BerryBlender_EventScript_BerryBlender1:: @ 8293C3E
+	lockall
+	goto_if_unset FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER, BerryBlender_EventScript_BlendMasterPresent
+	setvar VAR_0x8009, 1
+	applymovement 16, BerryBlender_Movement_BlendLeaderWalkInPlace
+	waitmovement 0
+	msgbox BerryBlender_Text_WantToMakePokeblocks, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq BerryBlender_EventScript_TryUseBerryBlender1
+	goto BerryBlender_EventScript_DeclineBlender1
+	end
+
+BerryBlender_EventScript_DeclineBlender1: @ 8293C70
+	msgbox BerryBlender_Text_MadeOldTimerSad, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_Blender1NoBerries: @ 8293C7A
+	msgbox BerryBlender_Text_DontHaveAnyBerries, MSGBOX_DEFAULT
+	dotimebasedevents
+	goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, BerryBlender_EventScript_Blender1NoSpareBerries
+	goto BerryBlender_EventScript_Blender1GiveSpareBerry
+	end
+
+BerryBlender_EventScript_Blender1NoSpareBerries: @ 8293C92
+	msgbox BerryBlender_Text_DontHaveAnyBerriesToSpare, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_Blender1GiveSpareBerry: @ 8293C9C
+	msgbox BerryBlender_Text_CanHaveOneOfMyBerries, MSGBOX_DEFAULT
+	giveitem_std ITEM_PECHA_BERRY
+	setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY
+	goto BerryBlender_EventScript_UseBerryBlender1
+	end
+
+BerryBlender_EventScript_UseBerryBlender1: @ 8293CB9
+	msgbox BerryBlender_Text_KnowHowToMakePokeblocks, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq BerryBlender_EventScript_StartBlender1
+	goto BerryBlender_EventScript_ExplainBlending1
+	end
+
+BerryBlender_EventScript_StartBlender1: @ 8293CD2
+	msgbox BerryBlender_Text_LetsBerryBlender, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_DoBerryBlending
+	end
+
+BerryBlender_EventScript_ExplainBlending1: @ 8293CE0
+	msgbox BerryBlender_Text_ExplainBerryBlending, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_StartBlender1
+	end
+
+BerryBlender_EventScript_TryUseBerryBlender1: @ 8293CEE
+	checkitem ITEM_POKEBLOCK_CASE, 1
+	compare VAR_RESULT, FALSE
+	goto_if_eq BerryBlender_EventScript_Blender1NoCase
+	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
+	compare VAR_RESULT, 65535
+	goto_if_eq BerryBlender_EventScript_Blender1CaseFull
+	specialvar VAR_RESULT, PlayerHasBerries
+	compare VAR_RESULT, FALSE
+	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
+BerryBlender_EventScript_DoBerryBlending: @ 8293D2C
+	copyvar VAR_0x8004, VAR_0x8009
+	fadescreen 1
+	special DoBerryBlending
+	waitstate
+	releaseall
+	end
+
+BerryBlender_EventScript_Blender1CaseFull: @ 8293D39
+	msgbox BerryBlender_Text_PokeblockCaseIsFull, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_Blender1NoCase: @ 8293D43
+	msgbox BerryBlender_Text_DontHavePokeblockCase, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_BerryBlender2:: @ 8293D4D
+	lockall
+	setvar VAR_0x8009, 2
+	applymovement 10, Common_Movement_FaceOriginalDirection
+	applymovement 3, BerryBlender_Movement_BlendLeaderWalkInPlace
+	waitmovement 0
+	msgbox BerryBlender_Text_WantToBlendPokeblocksWithUs, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq BerryBlender_EventScript_TryUseBerryBlender2
+	goto BerryBlender_EventScript_DeclineBlender2
+	end
+
+BerryBlender_EventScript_DeclineBlender2: @ 8293D7D
+	msgbox BerryBlender_Text_ThatsTooBad, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_Blender2NoBerries: @ 8293D87
+	msgbox BerryBlender_Text_DontHaveAnyBerries2, MSGBOX_DEFAULT
+	release
+	end
+
+BerryBlender_EventScript_UseBerryBlender2: @ 8293D91
+	msgbox BerryBlender_Text_KnowHowToMakePokeblocks2, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq BerryBlender_EventScript_StartBlender2
+	goto BerryBlender_EventScript_ExplainBlending2
+	end
+
+BerryBlender_EventScript_StartBlender2: @ 8293DAA
+	msgbox BerryBlender_Text_LetsBerryBlender2, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_DoBerryBlending
+	end
+
+BerryBlender_EventScript_ExplainBlending2: @ 8293DB8
+	msgbox BerryBlender_Text_ExplainBerryBlending2, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_StartBlender2
+	end
+
+BerryBlender_EventScript_TryUseBerryBlender2: @ 8293DC6
+	specialvar VAR_RESULT, PlayerHasBerries
+	compare VAR_RESULT, FALSE
+	goto_if_eq BerryBlender_EventScript_Blender2NoBerries
+	checkitem ITEM_POKEBLOCK_CASE, 1
+	compare VAR_RESULT, FALSE
+	goto_if_eq BerryBlender_EventScript_Blender2NoCase
+	msgbox BerryBlender_Text_Okay, MSGBOX_DEFAULT
+	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
+	compare VAR_RESULT, 65535
+	goto_if_ne BerryBlender_EventScript_UseBerryBlender2
+	compare VAR_RESULT, 65535
+	goto_if_eq BerryBlender_EventScript_Blender2CaseFull
+	end
+
+BerryBlender_EventScript_Blender2CaseFull: @ 8293E0A
+	msgbox BerryBlender_Text_PokeblockCaseIsFull2, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_Blender2NoCase: @ 8293E14
+	msgbox BerryBlender_Text_DontHavePokeblockCase2, MSGBOX_DEFAULT
+	releaseall
+	end
+
+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, BerryBlender_Movement_BlendLeaderWalkInPlace
+	waitmovement 0
+	msgbox BerryBlender_Text_LookGoodAtBlendingJoinUs, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq BerryBlender_EventScript_TryUseBlender3
+	goto BerryBlender_EventScript_DeclineBlender3
+	end
+
+BerryBlender_EventScript_DeclineBlender3: @ 8293E5A
+	msgbox BerryBlender_Text_LeftUsInShock, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_Blender3NoBerries: @ 8293E64
+	msgbox BerryBlender_Text_DontHaveAnyBerries3, MSGBOX_DEFAULT
+	release
+	end
+
+BerryBlender_EventScript_UseBerryBlender3: @ 8293E6E
+	msgbox BerryBlender_Text_KnowHowToMakePokeblocks3, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq BerryBlender_EventScript_StartBlender3
+	goto BerryBlender_EventScript_ExplainBlending3
+	end
+
+BerryBlender_EventScript_StartBlender3: @ 8293E87
+	msgbox BerryBlender_Text_LetsBerryBlender3, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_DoBerryBlending
+	end
+
+BerryBlender_EventScript_ExplainBlending3: @ 8293E95
+	msgbox BerryBlender_Text_ExplainBerryBlending3, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_StartBlender3
+	end
+
+BerryBlender_EventScript_TryUseBlender3: @ 8293EA3
+	specialvar VAR_RESULT, PlayerHasBerries
+	compare VAR_RESULT, FALSE
+	goto_if_eq BerryBlender_EventScript_Blender3NoBerries
+	checkitem ITEM_POKEBLOCK_CASE, 1
+	compare VAR_RESULT, FALSE
+	goto_if_eq BerryBlender_EventScript_Blender3NoCase
+	msgbox BerryBlender_Text_OhDear, MSGBOX_DEFAULT
+	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
+	compare VAR_RESULT, 65535
+	goto_if_ne BerryBlender_EventScript_UseBerryBlender3
+	compare VAR_RESULT, 65535
+	goto_if_eq BerryBlender_EventScript_Blender3CaseFull
+	end
+
+BerryBlender_EventScript_Blender3CaseFull: @ 8293EE7
+	msgbox BerryBlender_Text_PokeblockCaseIsFull3, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_Blender3NoCase: @ 8293EF1
+	msgbox BerryBlender_Text_DontHavePokeblockCase3, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_BlendMasterPresent: @ 8293EFB
+	lockall
+	setvar VAR_0x8009, 1
+	msgbox BerryBlender_Text_SeeMyMasteryInAction, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq BerryBlender_EventScript_TryBlendWithBlendMaster
+	msgbox BerryBlender_Text_TooBusyNowIsee, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_BlendMasterNoBerries: @ 8293F1E
+	msgbox BerryBlender_Text_BlendMasterNoBerries, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_TryBlendWithBlendMaster: @ 8293F28
+	checkitem ITEM_POKEBLOCK_CASE, 1
+	compare VAR_RESULT, FALSE
+	goto_if_eq BerryBlender_EventScript_BlendMasterNoCase
+	specialvar VAR_RESULT, PlayerHasBerries
+	compare VAR_RESULT, FALSE
+	goto_if_eq BerryBlender_EventScript_BlendMasterNoBerries
+	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
+	compare VAR_RESULT, 65535
+	goto_if_ne BerryBlender_EventScript_BlendWithBlendMaster
+	compare VAR_RESULT, 65535
+	goto_if_eq BerryBlender_EventScript_BlendMasterCaseFull
+	end
+
+BerryBlender_EventScript_BlendWithBlendMaster: @ 8293F64
+	msgbox BerryBlender_Text_BlendMasterKnowHowToMakePokeblocks, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	call_if_eq BerryBlender_EventScript_BlendMasterExplainBlending
+	msgbox BerryBlender_Text_BlendMasterLetsBerryBlender, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_DoBerryBlending
+	end
+
+BerryBlender_EventScript_BlendMasterExplainBlending: @ 8293F85
+	msgbox BerryBlender_Text_BlendMasterExplainBerryBlending, MSGBOX_DEFAULT
+	return
+
+BerryBlender_EventScript_BlendMasterNoCase: @ 8293F8E
+	msgbox BerryBlender_Text_BlendMasterNoPokeblockCase, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_BlendMasterCaseFull: @ 8293F98
+	msgbox BerryBlender_Text_BlendMasterPokeblockCaseFull, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_Blender2Man:: @ 8293FA2
+	msgbox BerryBlender_Text_SetNewBlenderRecord, MSGBOX_NPC
+	end
+
+BerryBlender_EventScript_Blender3PokefanF:: @ 8293FAB
+	msgbox BerryBlender_Text_LookGoodAtBlendingJoinUs, MSGBOX_NPC
+	end
+
+BerryBlender_EventScript_Blender2Twin:: @ 8293FB4
+	msgbox BerryBlender_Text_MakeDeliciousPokeblocks, MSGBOX_NPC
+	end
+
+BerryBlender_EventScript_Blender1ExpertM:: @ 8293FBD
+	setvar VAR_0x8008, 15
+	goto BerryBlender_EventScript_ExpertMCheckGiveBerry
+	end
+
+BerryBlender_EventScript_ExpertMCheckGiveBerry: @ 8293FC8
+	lock
+	faceplayer
+	msgbox BerryBlender_Text_LoveMakingPokeblocks, MSGBOX_DEFAULT
+	specialvar VAR_RESULT, PlayerHasBerries
+	compare VAR_RESULT, TRUE
+	goto_if_eq BerryBlender_EventScript_ExpertMPlayerHasBerries
+	compare VAR_RESULT, FALSE
+	goto_if_eq BerryBlender_EventScript_ExpertMNoBerries
+	end
+
+BerryBlender_EventScript_ExpertMPlayerHasBerries: @ 8293FEE
+	msgbox BerryBlender_Text_MakePokeblocksUsingBerryBlender, MSGBOX_DEFAULT
+	release
+	end
+
+BerryBlender_EventScript_ExpertMNoBerries: @ 8293FF8
+	checkitem ITEM_POKEBLOCK_CASE, 1
+	compare VAR_RESULT, FALSE
+	goto_if_eq BerryBlender_EventScript_ExpertMNoSpareBerries
+	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
+	compare VAR_RESULT, 65535
+	goto_if_eq BerryBlender_EventScript_ExpertMNoSpareBerries
+	dotimebasedevents
+	goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, BerryBlender_EventScript_ExpertMNoSpareBerries
+	goto BerryBlender_EventScript_ExpertMGiveBerry
+	end
+
+BerryBlender_EventScript_ExpertMNoSpareBerries: @ 8294028
+	msgbox BerryBlender_Text_DontHaveAnyBerriesNoneToSpare, MSGBOX_DEFAULT
+	release
+	end
+
+BerryBlender_EventScript_ExpertMGiveBerry: @ 8294032
+	msgbox BerryBlender_Text_DontHaveAnyBerriesHaveOne, MSGBOX_DEFAULT
+	giveitem_std ITEM_PECHA_BERRY
+	setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY
+	msgbox BerryBlender_Text_UseItToMakePokeblocksTogether, MSGBOX_DEFAULT
+	release
+	end
+
+BerryBlender_Movement_BlendLeaderWalkInPlace: @ 8294053
+	walk_in_place_fastest_right
+	step_end
+
+BerryBlender_EventScript_BerryBlenderLink:: @ 8294055
+	lockall
+	specialvar VAR_RESULT, PlayerHasBerries
+	compare VAR_RESULT, FALSE
+	goto_if_eq BerryBlender_EventScript_LinkBlenderNoBerries
+	checkitem ITEM_POKEBLOCK_CASE, 1
+	compare VAR_RESULT, FALSE
+	goto_if_eq BerryBlender_EventScript_LinkBlenderNoCase
+	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
+	compare VAR_RESULT, 65535
+	goto_if_ne BerryBlender_EventScript_LinkBlenderSaveGame
+	compare VAR_RESULT, 65535
+	goto_if_eq BerryBlender_EventScript_LinkBlenderCaseFull
+	end
+
+BerryBlender_EventScript_LinkBlenderSaveGame: @ 8294092
+	msgbox BerryBlender_Text_SaveGameBeforeBerryBlenderLink, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq BerryBlender_EventScript_TryDoLinkBlender
+	compare VAR_RESULT, NO
+	goto_if_eq BerryBlender_EventScript_CancelLinkBlender
+	end
+
+BerryBlender_EventScript_LinkBlenderNoBerries: @ 82940B1
+	msgbox BerryBlender_Text_NoBerriesLink, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_TryDoLinkBlender: @ 82940BB
+	call Common_EventScript_SaveGame
+	compare VAR_RESULT, FALSE
+	goto_if_eq BerryBlender_EventScript_CancelLinkBlender
+	specialvar VAR_RESULT, IsWirelessAdapterConnected
+	compare VAR_RESULT, TRUE
+	goto_if_eq BerryBlender_EventScript_StartDecideLinkLeader
+	message BerryBlender_Text_SearchingForFriends
+	waitmessage
+	special TryBerryBlenderLinkup
+	waitstate
+	compare VAR_RESULT, 1
+	goto_if_eq BerryBlender_EventScript_SpawnLinkPartners
+	compare VAR_RESULT, 2
+	goto_if_eq BerryBlender_EventScript_CloseLinkNotReady
+	compare VAR_RESULT, 3
+	goto_if_eq BerryBlender_EventScript_CloseLinkDifferentSelections
+	compare VAR_RESULT, 5
+	goto_if_eq BerryBlender_EventScript_CloseLink
+	compare VAR_RESULT, 6
+	goto_if_eq BerryBlender_EventScript_LinkError
+	end
+
+BerryBlender_EventScript_TwoPlayerLink: @ 829411D
+	msgbox BerryBlender_Text_Player1Arrived, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_DoLinkBerryBlending
+	end
+
+BerryBlender_EventScript_ThreePlayerLink: @ 829412B
+	msgbox BerryBlender_Text_Player1And2Arrived, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_DoLinkBerryBlending
+	end
+
+BerryBlender_EventScript_FourPlayerLink: @ 8294139
+	msgbox BerryBlender_Text_AllPlayersArrived, MSGBOX_DEFAULT
+	goto BerryBlender_EventScript_DoLinkBerryBlending
+	end
+
+BerryBlender_EventScript_DoLinkBerryBlending: @ 8294147
+	setvar VAR_0x8004, 0
+	fadescreen 1
+	removeobject 240
+	removeobject 239
+	removeobject 238
+	removeobject 237
+	special DoBerryBlending
+	waitstate
+	releaseall
+	end
+
+BerryBlender_EventScript_CancelLinkBlender: @ 8294160
+	releaseall
+	end
+
+BerryBlender_EventScript_LinkBlenderCaseFull: @ 8294162
+	msgbox BerryBlender_Text_PokeblockCaseIsFullLink, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_LinkBlenderNoCase: @ 829416C
+	msgbox BerryBlender_Text_DontHavePokeblockCaseLink, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_CloseLinkNotReady: @ 8294176
+	special CloseLink
+	msgbox Text_SomeoneIsNotReadyToLink, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_CloseLinkDifferentSelections: @ 8294183
+	special CloseLink
+	msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_CloseLink: @ 8294190
+	special CloseLink
+	msgbox gText_PokeblockLinkCanceled, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_LinkError: @ 829419D
+	special CloseLink
+	msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT
+	releaseall
+	end
+
+BerryBlender_EventScript_SpawnLinkPartners: @ 82941AA
+	fadescreen 1
+	specialvar VAR_RESULT, GetLinkPartnerNames
+	copyvar VAR_0x8008, VAR_RESULT
+	copyvar VAR_0x8004, VAR_0x8008
+	special SpawnLinkPartnerEventObject
+	goto BerryBlender_EventScript_LinkPlayersArrived
+	end
+
+BerryBlender_EventScript_LinkPlayersArrived: @ 82941C4
+	fadescreen 0
+	switch VAR_0x8008
+	case 2, BerryBlender_EventScript_TwoPlayerLink
+	case 3, BerryBlender_EventScript_ThreePlayerLink
+	case 4, BerryBlender_EventScript_FourPlayerLink
+	end
+
+BerryBlender_EventScript_StartDecideLinkLeader: @ 82941ED
+	setvar VAR_0x8004, LINK_GROUP_BERRY_BLENDER
+	goto BerryBlender_EventScript_DecideLinkLeader
+	end
+
+BerryBlender_EventScript_DecideLinkLeader: @ 82941F8
+	message LilycoveCity_ContestLobby_Text_PleaseDecideLinkLeader
+	waitmessage
+	multichoice 16, 6, MULTI_LINK_LEADER, 0
+	switch VAR_RESULT
+	case 0, BerryBlender_EventScript_TryJoinGroup
+	case 1, BerryBlender_EventScript_TryLeadGroup
+	case 2, BerryBlender_EventScript_CloseLink
+	case MULTI_B_PRESSED, BerryBlender_EventScript_CloseLink
+	end
+
+BerryBlender_EventScript_TryLeadGroup: @ 8294235
+	call BerryBlender_EventScript_TryBecomeLinkLeader
+	compare VAR_RESULT, 1
+	goto_if_eq BerryBlender_EventScript_LinkLeaderDecided
+	compare VAR_RESULT, 5
+	goto_if_eq BerryBlender_EventScript_DecideLinkLeader
+	compare VAR_RESULT, 8
+	goto_if_eq BerryBlender_EventScript_TryLeadGroup
+	release
+	end
+
+BerryBlender_EventScript_TryJoinGroup: @ 829425D
+	call BerryBlender_EventScript_TryJoinLinkGroup
+	compare VAR_RESULT, 1
+	goto_if_eq BerryBlender_EventScript_LinkLeaderDecided
+	compare VAR_RESULT, 5
+	goto_if_eq BerryBlender_EventScript_DecideLinkLeader
+	compare VAR_RESULT, 8
+	goto_if_eq BerryBlender_EventScript_TryJoinGroup
+	release
+	end
+
+BerryBlender_EventScript_TryBecomeLinkLeader: @ 8294285
+	special TryBecomeLinkLeader
+	waitstate
+	return
+
+BerryBlender_EventScript_TryJoinLinkGroup: @ 829428A
+	special TryJoinLinkGroup
+	waitstate
+	return
+
+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 857c1e205..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_27AEA8, 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_27AEA8: @ 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 4c97d7e03..f968577f3 100644
--- a/data/scripts/interview.inc
+++ b/data/scripts/interview.inc
@@ -236,27 +236,27 @@ LilycoveCity_ContestLobby_EventScript_AlreadyInterviewed:: @ 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, TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE
 	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
+	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_28CB91:: @ 828CB91
+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_Reporter:: @ 828CB96
diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc
index b1ecae203..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
@@ -234,7 +234,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
 	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
 	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA
 	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN
-	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
+	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER
 	setflag FLAG_HIDE_DEOXYS
 	setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION
 	setflag FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
deleted file mode 100644
index c223bc1c7..000000000
--- a/data/scripts/pokeblocks.inc
+++ /dev/null
@@ -1,759 +0,0 @@
-@ The scripts there concern pokeblock events in LilyCove City's Contest Lobby 
-
-@ 'PblockX' number of offline opponents
-@ 'Ask' talking with a blender machine
-@ 'Yes' agreeing to blend
-@ 'No' refusing to blend
-@ 'KnowHow' asking if the player knows the blending process
-@ 'Explain' explaining the blender process
-@ 'Start' start blending
-@ 'TalkX' talking with a person next to a blender machine
-@ 'NoBerries' can't blend cause they have no berries
-@ 'FullPokeblock' can't blend cause full pokeblock case
-@ 'NoPokeblock' can't blend cause they have no pokeblock case
-
-Text_Pblock1_Ask: @ 8292DEE
-	.string "Oh? Did you want to make some {POKEBLOCK}S\n"
-	.string "with this old-timer?$"
-
-Text_Pblock1_Yes: @ 8292E28
-	.string "Excellent!$"
-
-Text_Pblock1_No: @ 8292E33
-	.string "Oh…\n"
-	.string "You've made this old-timer sad…$"
-
-Text_Pblock1_KnowHow: @ 8292E57
-	.string "Do you know how to make a {POKEBLOCK}?$"
-
-Text_Pblock1_Start: @ 8292E78
-	.string "Let's get started, then!\p"
-	.string "Let's BERRY BLENDER!$"
-
-Text_Pblock1_Explain: @ 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"
-	.string "your marker, just press the A Button.\p"
-	.string "That's all you have to do.\n"
-	.string "You'll see how easy it is when you try.$"
-
-Text_Pblock1_NoBerries: @ 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_292FD1: @ 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_29307D: @ 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.$"
-
-Text_Pblock1_FullPokeblock: @ 8293101
-	.string "But your {POKEBLOCK} CASE is full.\p"
-	.string "You should use some {POKEBLOCK}S before\n"
-	.string "you come see me again.$"
-
-Text_Pblock1_NoPokeblock: @ 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_2931AA: @ 82931AA
-	.string "Let's get blending already!$"
-
-LilycoveCity_ContestLobby_Text_2931C6: @ 82931C6
-	.string "I wonder what kind of {POKEBLOCK} I'll get?\n"
-	.string "This is so exciting!$"
-
-LilycoveCity_ContestLobby_Text_293201: @ 8293201
-	.string "Hi, there! Did you want to blend some\n"
-	.string "{POKEBLOCK}S with us?$"
-
-LilycoveCity_ContestLobby_Text_293237: @ 8293237
-	.string "Okay!$"
-
-LilycoveCity_ContestLobby_Text_29323D: @ 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_29328C: @ 829328C
-	.string "Of course, you do know how to\n"
-	.string "blend {POKEBLOCK}S, don't you?$"
-
-LilycoveCity_ContestLobby_Text_2932C3: @ 82932C3
-	.string "Let's get started, then!\p"
-	.string "Let's BERRY BLENDER!$"
-
-LilycoveCity_ContestLobby_Text_2932F1: @ 82932F1
-	.string "Okay!\n"
-	.string "Let me explain it to you!\p"
-	.string "When the spinning BLENDER's arrow\n"
-	.string "reaches your marker, just press\l"
-	.string "the A Button.\p"
-	.string "That's all it takes.\n"
-	.string "Pretty easy, don't you think?$"
-
-LilycoveCity_ContestLobby_Text_293394: @ 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"
-	.string "BERRIES…\p"
-	.string "We'll always be around whenever you\n"
-	.string "get hold of some BERRIES to blend.$"
-
-LilycoveCity_ContestLobby_Text_29343E: @ 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_2934A2: @ 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.$"
-
-LilycoveCity_ContestLobby_Text_29350B: @ 829350B
-	.string "Oh, hello! Did you want to make some\n"
-	.string "{POKEBLOCK}S with our little group?$"
-
-LilycoveCity_ContestLobby_Text_29354E: @ 829354E
-	.string "Oh, dear!$"
-
-LilycoveCity_ContestLobby_Text_293558: @ 8293558
-	.string "Oh, dear me…\p"
-	.string "You've left us in shock!$"
-
-LilycoveCity_ContestLobby_Text_29357E: @ 829357E
-	.string "Naturally, you know how to make\n"
-	.string "{POKEBLOCK}S, don't you?$"
-
-LilycoveCity_ContestLobby_Text_2935B1: @ 82935B1
-	.string "Okay, dear!\n"
-	.string "Let's get started!\p"
-	.string "Let's BERRY BLENDER!$"
-
-LilycoveCity_ContestLobby_Text_2935E5: @ 82935E5
-	.string "Oh, dear!\p"
-	.string "Then, I'll explain it to you nicely.\p"
-	.string "When the BLENDER's arrow spins to\n"
-	.string "your marker, press the A Button.\p"
-	.string "That's all it takes.\n"
-	.string "Isn't it simple?$"
-
-LilycoveCity_ContestLobby_Text_29367D: @ 829367D
-	.string "You don't have any BERRIES,\n"
-	.string "do you?\p"
-	.string "If you don't have any BERRIES,\n"
-	.string "you can't make any {POKEBLOCK}S.\p"
-	.string "We'll always be making {POKEBLOCK}S here,\n"
-	.string "so let's make some together when\l"
-	.string "you get a BERRY or two.$"
-
-LilycoveCity_ContestLobby_Text_293738: @ 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_293792: @ 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_2937F9: @ 82937F9
-	.string "Okay! Today's going to be the day that\n"
-	.string "I set a new BLENDER speed record!$"
-
-LilycoveCity_ContestLobby_Text_293842: @ 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_29388F: @ 829388F
-	.string "I'm going to make delicious {POKEBLOCK}S\n"
-	.string "and make my POKéMON cuter.$"
-
-Text_PblockLink_Ask: @ 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?$"
-
-Text_PblockLink_Searching: @ 8293955
-	.string "Searching for your friends…\n"
-	.string "… … B Button: Cancel$"
-
-Text_PblockLink_1Arrived: @ 8293986
-	.string "{STR_VAR_1} arrived.$"
-
-Text_PblockLink_2Arrived: @ 8293992
-	.string "{STR_VAR_1} and {STR_VAR_2} arrived.$"
-
-Text_PblockLink_3Arrived: @ 82939A5
-	.string "{STR_VAR_1}, {STR_VAR_2}, and\n"
-	.string "{STR_VAR_3} arrived.$"
-
-Text_PblockLink_NoBerries: @ 82939BD
-	.string "You have no BERRIES.\n"
-	.string "The BERRY BLENDER can't be used.$"
-
-Text_PblockLink_FullPokeblock: @ 82939F3
-	.string "Your {POKEBLOCK} CASE is full.\n"
-	.string "The BERRY BLENDER can't be used.$"
-
-Text_PblockLink_NoPokeblock: @ 8293A2D
-	.string "You don't have a {POKEBLOCK} CASE.\n"
-	.string "The BERRY BLENDER can't be used.$"
-
-Text_Pblock1_Talk_0: @ 8293A6B
-	.string "I love making {POKEBLOCK}S.\p"
-	.string "I always have some BERRIES with me.$"
-
-Text_Pblock1_Talk_1: @ 8293AA5
-	.string "If you'd like, we could make some\n"
-	.string "{POKEBLOCK}S together using the\l"
-	.string "BERRY BLENDER.$"
-
-LilycoveCity_ContestLobby_Text_293AF0: @ 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_293B76: @ 8293B76
-	.string "We'll use it to make {POKEBLOCK}S together\n"
-	.string "using the BERRY BLENDER.$"
-
-LilycoveCity_ContestLobby_Text_293BB4: @ 8293BB4
-	.string "Oh?\n"
-	.string "You don't have any BERRIES?\p"
-	.string "If I had some left over, I'd gladly\n"
-	.string "give you one…\p"
-	.string "But, I don't have any to spare today.\n"
-	.string "Sorry about that.$"
-
-EventScript_Pblock1_Ask:: @ 8293C3E
-	lockall
-	goto_if_unset FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS, LilycoveCity_ContestLobby_EventScript_293EFB
-	setvar VAR_0x8009, 1
-	applymovement 16, LilycoveCity_ContestLobby_Movement_294053
-	waitmovement 0
-	msgbox Text_Pblock1_Ask, MSGBOX_YESNO
-	compare VAR_RESULT, YES
-	goto_if_eq EventScript_Pblock1_Yes
-	goto EventScript_Pblock1_No
-	end
-
-EventScript_Pblock1_No: @ 8293C70
-	msgbox Text_Pblock1_No, MSGBOX_DEFAULT
-	releaseall
-	end
-
-EventScript_Pblock1_NoBerries: @ 8293C7A
-	msgbox Text_Pblock1_NoBerries, MSGBOX_DEFAULT
-	dotimebasedevents
-	goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, LilycoveCity_ContestLobby_EventScript_293C92
-	goto LilycoveCity_ContestLobby_EventScript_293C9C
-	end
-
-LilycoveCity_ContestLobby_EventScript_293C92: @ 8293C92
-	msgbox LilycoveCity_ContestLobby_Text_29307D, MSGBOX_DEFAULT
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_293C9C: @ 8293C9C
-	msgbox LilycoveCity_ContestLobby_Text_292FD1, MSGBOX_DEFAULT
-	giveitem_std ITEM_PECHA_BERRY
-	setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY
-	goto EventScript_Pblock1_KnowHow
-	end
-
-EventScript_Pblock1_KnowHow: @ 8293CB9
-	msgbox Text_Pblock1_KnowHow, MSGBOX_YESNO
-	compare VAR_RESULT, YES
-	goto_if_eq EventScript_Pblock1_Start
-	goto EventScript_Pblock1_Explain
-	end
-
-EventScript_Pblock1_Start: @ 8293CD2
-	msgbox Text_Pblock1_Start, MSGBOX_DEFAULT
-	goto EventScript_StartBlending
-	end
-
-EventScript_Pblock1_Explain: @ 8293CE0
-	msgbox Text_Pblock1_Explain, MSGBOX_DEFAULT
-	goto EventScript_Pblock1_Start
-	end
-
-EventScript_Pblock1_Yes: @ 8293CEE
-	checkitem ITEM_POKEBLOCK_CASE, 1
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_Pblock1_NoPokeblock
-	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
-	compare VAR_RESULT, 65535
-	goto_if_eq EventScript_Pblock1_FullPokeblock
-	specialvar VAR_RESULT, PlayerHasBerries
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_Pblock1_NoBerries
-	msgbox Text_Pblock1_Yes, MSGBOX_DEFAULT
-	goto EventScript_Pblock1_KnowHow
-	end
-
-EventScript_StartBlending: @ 8293D2C
-	copyvar VAR_0x8004, VAR_0x8009
-	fadescreen 1
-	special DoBerryBlending
-	waitstate
-	releaseall
-	end
-
-EventScript_Pblock1_FullPokeblock: @ 8293D39
-	msgbox Text_Pblock1_FullPokeblock, MSGBOX_DEFAULT
-	releaseall
-	end
-
-EventScript_Pblock1_NoPokeblock: @ 8293D43
-	msgbox Text_Pblock1_NoPokeblock, MSGBOX_DEFAULT
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_293D4D:: @ 8293D4D
-	lockall
-	setvar VAR_0x8009, 2
-	applymovement 10, Common_Movement_FaceOriginalDirection
-	applymovement 3, LilycoveCity_ContestLobby_Movement_294053
-	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_293201, MSGBOX_YESNO
-	compare VAR_RESULT, YES
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293DC6
-	goto LilycoveCity_ContestLobby_EventScript_293D7D
-	end
-
-LilycoveCity_ContestLobby_EventScript_293D7D: @ 8293D7D
-	msgbox LilycoveCity_ContestLobby_Text_29323D, MSGBOX_DEFAULT
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_293D87: @ 8293D87
-	msgbox LilycoveCity_ContestLobby_Text_293394, MSGBOX_DEFAULT
-	release
-	end
-
-LilycoveCity_ContestLobby_EventScript_293D91: @ 8293D91
-	msgbox LilycoveCity_ContestLobby_Text_29328C, MSGBOX_YESNO
-	compare VAR_RESULT, YES
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293DAA
-	goto LilycoveCity_ContestLobby_EventScript_293DB8
-	end
-
-LilycoveCity_ContestLobby_EventScript_293DAA: @ 8293DAA
-	msgbox LilycoveCity_ContestLobby_Text_2932C3, MSGBOX_DEFAULT
-	goto EventScript_StartBlending
-	end
-
-LilycoveCity_ContestLobby_EventScript_293DB8: @ 8293DB8
-	msgbox LilycoveCity_ContestLobby_Text_2932F1, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_293DAA
-	end
-
-LilycoveCity_ContestLobby_EventScript_293DC6: @ 8293DC6
-	specialvar VAR_RESULT, PlayerHasBerries
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293D87
-	checkitem ITEM_POKEBLOCK_CASE, 1
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293E14
-	msgbox LilycoveCity_ContestLobby_Text_293237, MSGBOX_DEFAULT
-	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
-	compare VAR_RESULT, 65535
-	goto_if_ne LilycoveCity_ContestLobby_EventScript_293D91
-	compare VAR_RESULT, 65535
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293E0A
-	end
-
-LilycoveCity_ContestLobby_EventScript_293E0A: @ 8293E0A
-	msgbox LilycoveCity_ContestLobby_Text_29343E, MSGBOX_DEFAULT
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_293E14: @ 8293E14
-	msgbox LilycoveCity_ContestLobby_Text_2934A2, MSGBOX_DEFAULT
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_293E1E:: @ 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_294053
-	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_293842, MSGBOX_YESNO
-	compare VAR_RESULT, YES
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293EA3
-	goto LilycoveCity_ContestLobby_EventScript_293E5A
-	end
-
-LilycoveCity_ContestLobby_EventScript_293E5A: @ 8293E5A
-	msgbox LilycoveCity_ContestLobby_Text_293558, MSGBOX_DEFAULT
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_293E64: @ 8293E64
-	msgbox LilycoveCity_ContestLobby_Text_29367D, MSGBOX_DEFAULT
-	release
-	end
-
-LilycoveCity_ContestLobby_EventScript_293E6E: @ 8293E6E
-	msgbox LilycoveCity_ContestLobby_Text_29357E, MSGBOX_YESNO
-	compare VAR_RESULT, YES
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293E87
-	goto LilycoveCity_ContestLobby_EventScript_293E95
-	end
-
-LilycoveCity_ContestLobby_EventScript_293E87: @ 8293E87
-	msgbox LilycoveCity_ContestLobby_Text_2935B1, MSGBOX_DEFAULT
-	goto EventScript_StartBlending
-	end
-
-LilycoveCity_ContestLobby_EventScript_293E95: @ 8293E95
-	msgbox LilycoveCity_ContestLobby_Text_2935E5, MSGBOX_DEFAULT
-	goto LilycoveCity_ContestLobby_EventScript_293E87
-	end
-
-LilycoveCity_ContestLobby_EventScript_293EA3: @ 8293EA3
-	specialvar VAR_RESULT, PlayerHasBerries
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293E64
-	checkitem ITEM_POKEBLOCK_CASE, 1
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293EF1
-	msgbox LilycoveCity_ContestLobby_Text_29354E, MSGBOX_DEFAULT
-	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
-	compare VAR_RESULT, 65535
-	goto_if_ne LilycoveCity_ContestLobby_EventScript_293E6E
-	compare VAR_RESULT, 65535
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293EE7
-	end
-
-LilycoveCity_ContestLobby_EventScript_293EE7: @ 8293EE7
-	msgbox LilycoveCity_ContestLobby_Text_293738, MSGBOX_DEFAULT
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_293EF1: @ 8293EF1
-	msgbox LilycoveCity_ContestLobby_Text_293792, MSGBOX_DEFAULT
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_293EFB: @ 8293EFB
-	lockall
-	setvar VAR_0x8009, 1
-	msgbox LilycoveCity_ContestLobby_Text_2C42F4, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293F28
-	msgbox LilycoveCity_ContestLobby_Text_2C4332, MSGBOX_DEFAULT
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_293F1E: @ 8293F1E
-	msgbox LilycoveCity_ContestLobby_Text_2C439D, MSGBOX_DEFAULT
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_293F28: @ 8293F28
-	checkitem ITEM_POKEBLOCK_CASE, 1
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293F8E
-	specialvar VAR_RESULT, PlayerHasBerries
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293F1E
-	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
-	compare VAR_RESULT, 65535
-	goto_if_ne LilycoveCity_ContestLobby_EventScript_293F64
-	compare VAR_RESULT, 65535
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293F98
-	end
-
-LilycoveCity_ContestLobby_EventScript_293F64: @ 8293F64
-	msgbox LilycoveCity_ContestLobby_Text_2C43FA, MSGBOX_YESNO
-	compare VAR_RESULT, 0
-	call_if_eq LilycoveCity_ContestLobby_EventScript_293F85
-	msgbox LilycoveCity_ContestLobby_Text_2C451B, MSGBOX_DEFAULT
-	goto EventScript_StartBlending
-	end
-
-LilycoveCity_ContestLobby_EventScript_293F85: @ 8293F85
-	msgbox LilycoveCity_ContestLobby_Text_2C444C, MSGBOX_DEFAULT
-	return
-
-LilycoveCity_ContestLobby_EventScript_293F8E: @ 8293F8E
-	msgbox LilycoveCity_ContestLobby_Text_2C4573, MSGBOX_DEFAULT
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_293F98: @ 8293F98
-	msgbox LilycoveCity_ContestLobby_Text_2C45E8, MSGBOX_DEFAULT
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_293FA2:: @ 8293FA2
-	msgbox LilycoveCity_ContestLobby_Text_2937F9, MSGBOX_NPC
-	end
-
-LilycoveCity_ContestLobby_EventScript_293FAB:: @ 8293FAB
-	msgbox LilycoveCity_ContestLobby_Text_293842, MSGBOX_NPC
-	end
-
-LilycoveCity_ContestLobby_EventScript_293FB4:: @ 8293FB4
-	msgbox LilycoveCity_ContestLobby_Text_29388F, MSGBOX_NPC
-	end
-
-LilycoveCity_ContestLobby_EventScript_293FBD:: @ 8293FBD
-	setvar VAR_0x8008, 15
-	goto LilycoveCity_ContestLobby_EventScript_293FC8
-	end
-
-LilycoveCity_ContestLobby_EventScript_293FC8: @ 8293FC8
-	lock
-	faceplayer
-	msgbox Text_Pblock1_Talk_0, MSGBOX_DEFAULT
-	specialvar VAR_RESULT, PlayerHasBerries
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293FEE
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_293FF8
-	end
-
-LilycoveCity_ContestLobby_EventScript_293FEE: @ 8293FEE
-	msgbox Text_Pblock1_Talk_1, MSGBOX_DEFAULT
-	release
-	end
-
-LilycoveCity_ContestLobby_EventScript_293FF8: @ 8293FF8
-	checkitem ITEM_POKEBLOCK_CASE, 1
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_294028
-	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
-	compare VAR_RESULT, 65535
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_294028
-	dotimebasedevents
-	goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, LilycoveCity_ContestLobby_EventScript_294028
-	goto LilycoveCity_ContestLobby_EventScript_294032
-	end
-
-LilycoveCity_ContestLobby_EventScript_294028: @ 8294028
-	msgbox LilycoveCity_ContestLobby_Text_293BB4, MSGBOX_DEFAULT
-	release
-	end
-
-LilycoveCity_ContestLobby_EventScript_294032: @ 8294032
-	msgbox LilycoveCity_ContestLobby_Text_293AF0, MSGBOX_DEFAULT
-	giveitem_std ITEM_PECHA_BERRY
-	setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY
-	msgbox LilycoveCity_ContestLobby_Text_293B76, MSGBOX_DEFAULT
-	release
-	end
-
-LilycoveCity_ContestLobby_Movement_294053: @ 8294053
-	walk_in_place_fastest_right
-	step_end
-
-EventScript_PblockLink:: @ 8294055
-	lockall
-	specialvar VAR_RESULT, PlayerHasBerries
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_PblocLink_NoBerries
-	checkitem ITEM_POKEBLOCK_CASE, 1
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_PblocLink_NoPokeblock
-	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
-	compare VAR_RESULT, 65535
-	goto_if_ne EventScript_PblocLink_Ask
-	compare VAR_RESULT, 65535
-	goto_if_eq EventScript_PblocLink_FullPokeblock
-	end
-
-EventScript_PblocLink_Ask: @ 8294092
-	msgbox Text_PblockLink_Ask, MSGBOX_YESNO
-	compare VAR_RESULT, 1
-	goto_if_eq EventScript_PblocLink_TryConnect
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_PblocLink_End
-	end
-
-EventScript_PblocLink_NoBerries: @ 82940B1
-	msgbox Text_PblockLink_NoBerries, MSGBOX_DEFAULT
-	releaseall
-	end
-
-EventScript_PblocLink_TryConnect: @ 82940BB
-	call Common_EventScript_SaveGame
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_PblocLink_End
-	specialvar VAR_RESULT, IsWirelessAdapterConnected
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_2941ED
-	message Text_PblockLink_Searching
-	waitmessage
-	special sub_80B2FD8
-	waitstate
-	compare VAR_RESULT, 1
-	goto_if_eq EventScript_PblocLink_SpawnPartners
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_PblocLink_SomeoneNotReady
-	compare VAR_RESULT, 3
-	goto_if_eq EventScript_PblocLink_DifferentSelections
-	compare VAR_RESULT, 5
-	goto_if_eq EventScript_PblocLink_CloseLink
-	compare VAR_RESULT, 6
-	goto_if_eq EventScript_PblocLink_LinkError
-	end
-
-EventScript_PblocLink_1Arrived: @ 829411D
-	msgbox Text_PblockLink_1Arrived, MSGBOX_DEFAULT
-	goto EventScript_PblocLink_StartLinkBlending
-	end
-
-EventScript_PblocLink_2Arrived: @ 829412B
-	msgbox Text_PblockLink_2Arrived, MSGBOX_DEFAULT
-	goto EventScript_PblocLink_StartLinkBlending
-	end
-
-EventScript_PblocLink_3Arrived: @ 8294139
-	msgbox Text_PblockLink_3Arrived, MSGBOX_DEFAULT
-	goto EventScript_PblocLink_StartLinkBlending
-	end
-
-EventScript_PblocLink_StartLinkBlending: @ 8294147
-	setvar VAR_0x8004, 0
-	fadescreen 1
-	removeobject 240
-	removeobject 239
-	removeobject 238
-	removeobject 237
-	special DoBerryBlending
-	waitstate
-	releaseall
-	end
-
-EventScript_PblocLink_End: @ 8294160
-	releaseall
-	end
-
-EventScript_PblocLink_FullPokeblock: @ 8294162
-	msgbox Text_PblockLink_FullPokeblock, MSGBOX_DEFAULT
-	releaseall
-	end
-
-EventScript_PblocLink_NoPokeblock: @ 829416C
-	msgbox Text_PblockLink_NoPokeblock, MSGBOX_DEFAULT
-	releaseall
-	end
-
-EventScript_PblocLink_SomeoneNotReady: @ 8294176
-	special CloseLink
-	msgbox Text_SomeoneIsNotReadyToLink, MSGBOX_DEFAULT
-	releaseall
-	end
-
-EventScript_PblocLink_DifferentSelections: @ 8294183
-	special CloseLink
-	msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT
-	releaseall
-	end
-
-EventScript_PblocLink_CloseLink: @ 8294190
-	special CloseLink
-	msgbox gText_PokeblockLinkCanceled, MSGBOX_DEFAULT
-	releaseall
-	end
-
-EventScript_PblocLink_LinkError: @ 829419D
-	special CloseLink
-	msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT
-	releaseall
-	end
-
-EventScript_PblocLink_SpawnPartners: @ 82941AA
-	fadescreen 1
-	specialvar VAR_RESULT, GetLinkPartnerNames
-	copyvar VAR_0x8008, VAR_RESULT
-	copyvar VAR_0x8004, VAR_0x8008
-	special SpawnLinkPartnerEventObject
-	goto EventScript_PblocLink_Arrived
-	end
-
-EventScript_PblocLink_Arrived: @ 82941C4
-	fadescreen 0
-	switch VAR_0x8008
-	case 2, EventScript_PblocLink_1Arrived
-	case 3, EventScript_PblocLink_2Arrived
-	case 4, EventScript_PblocLink_3Arrived
-	end
-
-LilycoveCity_ContestLobby_EventScript_2941ED: @ 82941ED
-	setvar VAR_0x8004, 13
-	goto EventScript_PblocLink_DecideLeader
-	end
-
-EventScript_PblocLink_DecideLeader: @ 82941F8
-	message Text_DecideLinkLeader
-	waitmessage
-	multichoice 16, 6, MULTI_LINK_LEADER, 0
-	switch VAR_RESULT
-	case 0, EventScript_PblocLink_TryJoinGroup
-	case 1, EventScript_PblocLink_TryBecomeLeader
-	case 2, EventScript_PblocLink_CloseLink
-	case MULTI_B_PRESSED, EventScript_PblocLink_CloseLink
-	end
-
-EventScript_PblocLink_TryBecomeLeader: @ 8294235
-	call EventScript_PblocLink_BecomeLeader
-	compare VAR_RESULT, 1
-	goto_if_eq EventScript_PblocLink_SpawnPartners_
-	compare VAR_RESULT, 5
-	goto_if_eq EventScript_PblocLink_DecideLeader
-	compare VAR_RESULT, 8
-	goto_if_eq EventScript_PblocLink_TryBecomeLeader
-	release
-	end
-
-EventScript_PblocLink_TryJoinGroup: @ 829425D
-	call EventScript_PblocLink_JoinGroup
-	compare VAR_RESULT, 1
-	goto_if_eq EventScript_PblocLink_SpawnPartners_
-	compare VAR_RESULT, 5
-	goto_if_eq EventScript_PblocLink_DecideLeader
-	compare VAR_RESULT, 8
-	goto_if_eq EventScript_PblocLink_TryJoinGroup
-	release
-	end
-
-EventScript_PblocLink_BecomeLeader: @ 8294285
-	special TryBecomeLinkLeader
-	waitstate
-	return
-
-EventScript_PblocLink_JoinGroup: @ 829428A
-	special TryJoinLinkGroup
-	waitstate
-	return
-
-EventScript_PblocLink_SpawnPartners_: @ 829428F
-	goto EventScript_PblocLink_SpawnPartners
-	end
diff --git a/data/specials.inc b/data/specials.inc
index ac60979db..557a2f317 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -45,7 +45,7 @@ gSpecials:: @ 81DBA64
 	def_special PlayerEnteredTradeSeat
 	def_special nullsub_37
 	def_special sub_80B3254
-	def_special sub_80B2FD8
+	def_special TryBerryBlenderLinkup
 	def_special GetLinkPartnerNames
 	def_special SpawnLinkPartnerEventObject
 	def_special SavePlayerParty
@@ -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/berries.inc b/data/text/berries.inc
index 349919db0..17443ea3c 100644
--- a/data/text/berries.inc
+++ b/data/text/berries.inc
@@ -72,18 +72,18 @@ Route120_Text_2A7217: @ 82A7217
 	.string "I'll get more BERRIES from\n"
 	.string "the BERRY MASTER.$"
 
-LilycoveCity_Text_2A7244: @ 82A7244
+LilycoveCity_Text_BerrySuitsYou: @ 82A7244
 	.string "When it gets right down to it…\p"
 	.string "The same way suits suit me perfectly,\n"
 	.string "a crisp breeze suits the sea.\p"
 	.string "And you, a BERRY suits you to a “T”…\p"
 	.string "Why should that be so?$"
 
-LilycoveCity_Text_2A72E3: @ 82A72E3
+LilycoveCity_Text_BecauseYoureTrainer: @ 82A72E3
 	.string "When it gets right down to it…\p"
 	.string "It's because you're a TRAINER!$"
 
-LilycoveCity_Text_2A7321: @ 82A7321
+LilycoveCity_Text_PokeblocksSuitPokemon: @ 82A7321
 	.string "When it gets right down to it…\p"
 	.string "The way dignified simplicity suits me,\n"
 	.string "{POKEBLOCK}S perfectly suit POKéMON.$"
diff --git a/data/text/contest_hall.inc b/data/text/blend_master.inc
index 21753d35c..31315bbd5 100644
--- a/data/text/contest_hall.inc
+++ b/data/text/blend_master.inc
@@ -1,34 +1,34 @@
-LilycoveCity_ContestLobby_Text_2C427C: @ 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_2C42F4: @ 82C42F4
+BerryBlender_Text_SeeMyMasteryInAction: @ 82C42F4
 	.string "BLEND MASTER: Hmmm! So, you wish to\n"
 	.string "see my mastery in action?$"
 
-LilycoveCity_ContestLobby_Text_2C4332: @ 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_2C439D: @ 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_2C43FA: @ 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_2C444C: @ 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_2C444C: @ 82C444C
 	.string "When you see how precisely I press\n"
 	.string "the A Button, you will understand.$"
 
-LilycoveCity_ContestLobby_Text_2C451B: @ 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_2C4573: @ 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_2C45E8: @ 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/field_specials.h b/include/constants/field_specials.h
index 5ec38d1d4..cbc5e96a3 100644
--- a/include/constants/field_specials.h
+++ b/include/constants/field_specials.h
@@ -49,4 +49,7 @@
 #define DEPT_STORE_FLOORNUM_11F      14
 #define DEPT_STORE_FLOORNUM_ROOFTOP  15
 
+// Pokemon Trainer Fan Club
+#define NUM_TRAINER_CLUB_MEMBERS  8
+
 #endif // GUARD_CONSTANTS_FIELD_SPECIALS_H
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 54778435e..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
@@ -872,7 +872,7 @@
 #define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE                      0x33D
 #define FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE                       0x33E
 #define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS               0x33F
-#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS      0x340
+#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER                0x340
 #define FLAG_HIDE_GRANITE_CAVE_STEVEN                               0x341
 #define FLAG_HIDE_ROUTE_128_STEVEN                                  0x342
 #define FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY                       0x343
@@ -913,7 +913,7 @@
 #define FLAG_HIDE_LANETTES_HOUSE_LANETTE                            0x366
 #define FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE                  0x367
 #define FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN                          0x368
-#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT            0x369
+#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_REPLACEMENT    0x369
 #define FLAG_HIDE_DESERT_UNDERPASS_FOSSIL                           0x36A
 #define FLAG_HIDE_ROUTE_111_PLAYER_DESCENT                          0x36B
 #define FLAG_HIDE_ROUTE_111_DESERT_FOSSIL                           0x36C
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/image_processing_effects.h b/include/image_processing_effects.h
index f6097d79f..7f726707c 100755
--- a/include/image_processing_effects.h
+++ b/include/image_processing_effects.h
@@ -33,7 +33,7 @@ struct ImageProcessingContext
     void *canvasPixels;
     u16 *canvasPalette;
     u8 fillerC[0x4];
-    u32 dest;
+    void *dest;
     u16 quantizeEffect;
     u16 var_16;
     u8 paletteStart;
diff --git a/include/item_menu.h b/include/item_menu.h
index b1275549d..a21a6da4f 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -82,7 +82,7 @@ void CB2_GoToSellMenu(void);
 void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)());
 void DoWallyTutorialBagMenu(void);
 void ResetBagScrollPositions(void);
-void sub_81AABF0(void (*callback)(void));
+void ChooseBerrySetCallback(void (*callback)(void));
 void CB2_ChooseBerry(void);
 void unknown_ItemMenu_Confirm(u8 taskId);
 void BagMenu_YesNo(u8, u8, const struct YesNoFuncTable*);
diff --git a/include/link.h b/include/link.h
index 499405fc1..4d6771a03 100644
--- a/include/link.h
+++ b/include/link.h
@@ -87,13 +87,13 @@
 #define LINKTYPE_0x2288              0x2288  // battle?
 #define LINKTYPE_0x3311              0x3311
 #define LINKTYPE_0x3322              0x3322
-#define LINKTYPE_0x4411              0x4411
+#define LINKTYPE_BERRY_BLENDER_SETUP 0x4411
 #define LINKTYPE_BERRY_BLENDER       0x4422
 #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
 {
@@ -290,7 +290,7 @@ void sub_800AF18(u32 status, u8 lastSendQueueCount, u8 lastRecvQueueCount, u8 un
 void sub_800B348(void);
 void sub_800B3A4(u32 who);
 bool32 sub_800A07C(void);
-void sub_800AB98(void);
+void ResetLinkPlayerCount(void);
 void sub_800AA04(u8 a0);
 void sub_800B4C0(void);
 bool32 sub_800B504(void);
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/berry_blender.c b/src/berry_blender.c
index b4874c3b1..72f3056d3 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -1030,7 +1030,7 @@ static void sub_807FAC8(void)
             UnsetBgTilemapBuffer(2);
             UnsetBgTilemapBuffer(1);
             SetVBlankCallback(NULL);
-            sub_81AABF0(sub_807FFA4);
+            ChooseBerrySetCallback(sub_807FFA4);
 
             sBerryBlenderData->mainState = 0;
         }
@@ -1109,7 +1109,7 @@ static void Blender_SetPlayerNamesLocal(u8 opponentsNum)
         sBerryBlenderData->playersNo = 2;
         StringCopy(gLinkPlayers[0].name, gSaveBlock2Ptr->playerName);
 
-        if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS))
+        if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER))
             StringCopy(gLinkPlayers[1].name, sBlenderOpponentsNames[BLENDER_MASTER]);
         else
             StringCopy(gLinkPlayers[1].name, sBlenderOpponentsNames[BLENDER_MISTER]);
@@ -1432,7 +1432,7 @@ static void Blender_SetOpponentsBerryData(u16 playerBerryItemId, u8 playersNum,
     {
         opponentBerryId = sOpponentBerrySets[opponentSetId][i];
         var = playerBerryItemId - 163;
-        if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS) && gSpecialVar_0x8004 == 1)
+        if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER) && gSpecialVar_0x8004 == 1)
         {
             opponentSetId %= 5;
             opponentBerryId = sSpecialOpponentBerrySets[opponentSetId];
@@ -1632,7 +1632,7 @@ static void sub_80808D4(void)
 
         if (gSpecialVar_0x8004 == 1)
         {
-            if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS))
+            if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER))
                 sBerryBlenderData->field_120[0] = CreateTask(sub_8081224, 10);
             else
                 sBerryBlenderData->field_120[0] = CreateTask(sUnknown_083399EC[0], 10);
diff --git a/src/berry_crush.c b/src/berry_crush.c
index 8b4c7a545..74a71f089 100755
--- a/src/berry_crush.c
+++ b/src/berry_crush.c
@@ -249,7 +249,7 @@ static void sub_8020D8C(void)
 void sub_8020E1C(void)
 {
     DestroyTask(gUnknown_02022C90->unkA);
-    sub_81AABF0(sub_8020D8C);
+    ChooseBerrySetCallback(sub_8020D8C);
 }
 
 static void sub_8020E3C(void)
diff --git a/src/cable_club.c b/src/cable_club.c
index 1375789c3..ab61d65a9 100644
--- a/src/cable_club.c
+++ b/src/cable_club.c
@@ -203,7 +203,7 @@ static void sub_80B2634(u8 taskId)
     if (data[0] == 0)
     {
         OpenLinkTimed();
-        sub_800AB98();
+        ResetLinkPlayerCount();
         ResetLinkPlayers();
         data[5] = AddWindow(&gUnknown_08550594);
     }
@@ -678,23 +678,23 @@ static void sub_80B2EE4(u8 taskId)
     }
 }
 
-void sub_80B2FD8(void)
+void TryBerryBlenderLinkup(void)
 {
-    gLinkType = LINKTYPE_0x4411;
+    gLinkType = LINKTYPE_BERRY_BLENDER_SETUP;
     gBattleTypeFlags = 0;
     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/contest_painting.c b/src/contest_painting.c
index d5eb39565..7f33cac09 100644
--- a/src/contest_painting.c
+++ b/src/contest_painting.c
@@ -684,7 +684,7 @@ static void DoContestPaintingImageProcessing(u8 imageEffect)
 
     gImageProcessingContext.var_16 = 2;
     gImageProcessingContext.effect = imageEffect;
-    gImageProcessingContext.dest = OBJ_VRAM0;
+    gImageProcessingContext.dest = (void *)OBJ_VRAM0;
 
     ApplyImageProcessingEffects(&gImageProcessingContext);
     ApplyImageProcessingQuantization(&gImageProcessingContext);
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 109d57fd1..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);
     }
 }
 
@@ -4051,7 +4051,7 @@ void UpdateTrainerFanClubGameClear(void)
 
 u8 sub_813BADC(u8 a0)
 {
-    static const u8 gUnknown_085B3470[] = { 0x02, 0x01, 0x02, 0x01 };
+    static const u8 gUnknown_085B3470[] = { 2, 1, 2, 1 };
 
     if (VarGet(VAR_LILYCOVE_FAN_CLUB_STATE) == 2)
     {
@@ -4078,12 +4078,15 @@ u8 sub_813BADC(u8 a0)
 
 static u16 sub_813BB74(void)
 {
-    static const u8 gUnknown_085B3474[] = { 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f };
+    static const u8 gUnknown_085B3474[NUM_TRAINER_CLUB_MEMBERS] = 
+    { 
+        8, 9, 10, 11, 12, 13, 14, 15 
+    };
 
     u8 i;
     u8 retVal = 0;
 
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < ARRAY_COUNT(gUnknown_085B3474); i++)
     {
         if (!((gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> gUnknown_085B3474[i]) & 1))
         {
@@ -4101,7 +4104,10 @@ static u16 sub_813BB74(void)
 
 static u16 sub_813BC00(void)
 {
-    static const u8 gUnknown_085B347C[] = { 0x08, 0x0d, 0x0e, 0x0b, 0x0a, 0x0c, 0x0f, 0x09 };
+    static const u8 gUnknown_085B347C[NUM_TRAINER_CLUB_MEMBERS] = 
+    { 
+        8, 13, 14, 11, 10, 12, 15, 9 
+    };
 
     u8 i;
     u8 retVal = 0;
@@ -4111,7 +4117,7 @@ static u16 sub_813BC00(void)
         return 0;
     }
 
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < ARRAY_COUNT(gUnknown_085B347C); i++)
     {
         if (((gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> gUnknown_085B347C[i]) & 1) != 0)
         {
@@ -4137,7 +4143,7 @@ u16 GetNumMovedLilycoveFanClubMembers(void)
     u8 i;
     u8 retVal = 0;
 
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < NUM_TRAINER_CLUB_MEMBERS; i++)
     {
         if (((gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> (i + 8)) & 1) != 0)
         {
@@ -4160,7 +4166,7 @@ void UpdateMovedLilycoveFanClubMembers(void)
                 gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_2 - VARS_START] = gSaveBlock2Ptr->playTimeHours;
                 break;
             }
-            else if (i == 8)
+            else if (i == NUM_TRAINER_CLUB_MEMBERS)
             {
                 break;
             }
@@ -4266,14 +4272,10 @@ void sub_813BF10(void)
     if (VarGet(VAR_LILYCOVE_FAN_CLUB_STATE) == 2)
     {
         sub_813BA30();
-        if (gBattleOutcome == 1)
-        {
+        if (gBattleOutcome == B_OUTCOME_WON)
             sub_813BB74();
-        }
         else
-        {
             sub_813BC00();
-        }
     }
 }
 
diff --git a/src/image_processing_effects.c b/src/image_processing_effects.c
index c12305474..13794faf0 100644
--- a/src/image_processing_effects.c
+++ b/src/image_processing_effects.c
@@ -761,211 +761,53 @@ static u16 QuantizePixel_BlurHard(u16 *prevPixel, u16 *curPixel, u16 *nextPixel)
     return RGB2(red, green, blue);
 }
 
-/*
-void ConvertImageProcessingToGBA(struct ImageProcessingContext *arg0)
+void ConvertImageProcessingToGBA(struct ImageProcessingContext *context)
 {
     u16 i, j, k;
-    u8 r5 = arg0->canvasWidth >> 3;
-    u8 var_24 = arg0->canvasHeight >> 3;
-    u16 (*var_2C)[][32] = arg0->canvasPixels;
-    u32 var_28 = arg0->dest;
+    u16 *src, *dest, *src_, *dest_;
+    u16 width, height;
 
-    if (arg0->var_16 == 2)
+    width = context->canvasWidth >> 3;
+    height = context->canvasHeight >> 3;
+    src_ = context->canvasPixels;
+    dest_ = context->dest;
+
+    if (context->var_16 == 2)
     {
-        for (i = 0; i < var_24; i++)
+        for (i = 0; i < height; i++)
         {
-            for (j = 0; j < r5; j++)
+            for (j = 0; j < width; j++)
             {
                 for (k = 0; k < 8; k++)
                 {
-                    (*var_2C)[][];
+                    dest = dest_ + ((i * width + j) << 5) + (k << 2);
+                    src = src_ + ((((i << 3) + k) << 3) * width) + (j << 3);
+
+                    dest[0] = src[0] | (src[1] << 8);
+                    dest[1] = src[2] | (src[3] << 8);
+                    dest[2] = src[4] | (src[5] << 8);
+                    dest[3] = src[6] | (src[7] << 8);
                 }
             }
         }
     }
-}
-*/
+    else
+    {
+        for (i = 0; i < height; i++)
+        {
+            for (j = 0; j < width; j++)
+            {
+                for (k = 0; k < 8; k++)
+                {
+                    dest = dest_ + ((i * width + j) << 4) + (k << 1);
+                    src = src_ + ((((i << 3) + k) << 3) * width) + (j << 3);
 
-NAKED
-void ConvertImageProcessingToGBA(struct ImageProcessingContext *arg0)
-{
-    asm_unified("\n\
-    push {r4-r7,lr}\n\
-    mov r7, r10\n\
-    mov r6, r9\n\
-    mov r5, r8\n\
-    push {r5-r7}\n\
-    sub sp, 0xC\n\
-    ldrb r1, [r0, 0x1D]\n\
-    lsrs r5, r1, 3\n\
-    ldrb r1, [r0, 0x1E]\n\
-    lsrs r1, 3\n\
-    str r1, [sp, 0x8]\n\
-    ldr r1, [r0, 0x4]\n\
-    str r1, [sp]\n\
-    ldr r2, [r0, 0x10]\n\
-    str r2, [sp, 0x4]\n\
-    ldrh r0, [r0, 0x16]\n\
-    cmp r0, 0x2\n\
-    bne _08126108\n\
-    movs r1, 0\n\
-    ldr r0, [sp, 0x8]\n\
-    cmp r1, r0\n\
-    bcc _08126086\n\
-    b _08126194\n\
-_08126086:\n\
-    movs r0, 0\n\
-    adds r2, r1, 0x1\n\
-    mov r10, r2\n\
-    cmp r0, r5\n\
-    bcs _081260FA\n\
-    adds r2, r1, 0\n\
-    muls r2, r5\n\
-    mov r9, r2\n\
-    lsls r1, 3\n\
-    mov r8, r1\n\
-_0812609A:\n\
-    movs r4, 0\n\
-    lsls r6, r0, 4\n\
-    adds r7, r0, 0x1\n\
-    add r0, r9\n\
-    lsls r0, 6\n\
-    ldr r1, [sp, 0x4]\n\
-    adds r1, r0\n\
-    mov r12, r1\n\
-_081260AA:\n\
-    lsls r0, r4, 3\n\
-    mov r2, r12\n\
-    adds r3, r2, r0\n\
-    mov r1, r8\n\
-    adds r0, r1, r4\n\
-    lsls r0, 3\n\
-    muls r0, r5\n\
-    lsls r0, 1\n\
-    ldr r2, [sp]\n\
-    adds r0, r2, r0\n\
-    adds r2, r0, r6\n\
-    ldrh r0, [r2, 0x2]\n\
-    lsls r0, 8\n\
-    ldrh r1, [r2]\n\
-    orrs r0, r1\n\
-    strh r0, [r3]\n\
-    ldrh r0, [r2, 0x6]\n\
-    lsls r0, 8\n\
-    ldrh r1, [r2, 0x4]\n\
-    orrs r0, r1\n\
-    strh r0, [r3, 0x2]\n\
-    ldrh r0, [r2, 0xA]\n\
-    lsls r0, 8\n\
-    ldrh r1, [r2, 0x8]\n\
-    orrs r0, r1\n\
-    strh r0, [r3, 0x4]\n\
-    ldrh r0, [r2, 0xE]\n\
-    lsls r0, 8\n\
-    ldrh r1, [r2, 0xC]\n\
-    orrs r0, r1\n\
-    strh r0, [r3, 0x6]\n\
-    adds r0, r4, 0x1\n\
-    lsls r0, 16\n\
-    lsrs r4, r0, 16\n\
-    cmp r4, 0x7\n\
-    bls _081260AA\n\
-    lsls r0, r7, 16\n\
-    lsrs r0, 16\n\
-    cmp r0, r5\n\
-    bcc _0812609A\n\
-_081260FA:\n\
-    mov r1, r10\n\
-    lsls r0, r1, 16\n\
-    lsrs r1, r0, 16\n\
-    ldr r2, [sp, 0x8]\n\
-    cmp r1, r2\n\
-    bcc _08126086\n\
-    b _08126194\n\
-_08126108:\n\
-    movs r1, 0\n\
-    ldr r0, [sp, 0x8]\n\
-    cmp r1, r0\n\
-    bcs _08126194\n\
-_08126110:\n\
-    movs r0, 0\n\
-    adds r2, r1, 0x1\n\
-    mov r10, r2\n\
-    cmp r0, r5\n\
-    bcs _08126188\n\
-    adds r2, r1, 0\n\
-    muls r2, r5\n\
-    mov r9, r2\n\
-    lsls r1, 3\n\
-    mov r8, r1\n\
-_08126124:\n\
-    movs r4, 0\n\
-    lsls r6, r0, 4\n\
-    adds r7, r0, 0x1\n\
-    add r0, r9\n\
-    lsls r0, 5\n\
-    ldr r1, [sp, 0x4]\n\
-    adds r1, r0\n\
-    mov r12, r1\n\
-_08126134:\n\
-    lsls r0, r4, 2\n\
-    mov r2, r12\n\
-    adds r3, r2, r0\n\
-    mov r1, r8\n\
-    adds r0, r1, r4\n\
-    lsls r0, 3\n\
-    muls r0, r5\n\
-    lsls r0, 1\n\
-    ldr r2, [sp]\n\
-    adds r0, r2, r0\n\
-    adds r2, r0, r6\n\
-    ldrh r1, [r2, 0x2]\n\
-    lsls r1, 4\n\
-    ldrh r0, [r2]\n\
-    orrs r1, r0\n\
-    ldrh r0, [r2, 0x4]\n\
-    lsls r0, 8\n\
-    orrs r1, r0\n\
-    ldrh r0, [r2, 0x6]\n\
-    lsls r0, 12\n\
-    orrs r1, r0\n\
-    strh r1, [r3]\n\
-    ldrh r1, [r2, 0xA]\n\
-    lsls r1, 4\n\
-    ldrh r0, [r2, 0x8]\n\
-    orrs r1, r0\n\
-    ldrh r0, [r2, 0xC]\n\
-    lsls r0, 8\n\
-    orrs r1, r0\n\
-    ldrh r0, [r2, 0xE]\n\
-    lsls r0, 12\n\
-    orrs r1, r0\n\
-    strh r1, [r3, 0x2]\n\
-    adds r0, r4, 0x1\n\
-    lsls r0, 16\n\
-    lsrs r4, r0, 16\n\
-    cmp r4, 0x7\n\
-    bls _08126134\n\
-    lsls r0, r7, 16\n\
-    lsrs r0, 16\n\
-    cmp r0, r5\n\
-    bcc _08126124\n\
-_08126188:\n\
-    mov r1, r10\n\
-    lsls r0, r1, 16\n\
-    lsrs r1, r0, 16\n\
-    ldr r2, [sp, 0x8]\n\
-    cmp r1, r2\n\
-    bcc _08126110\n\
-_08126194:\n\
-    add sp, 0xC\n\
-    pop {r3-r5}\n\
-    mov r8, r3\n\
-    mov r9, r4\n\
-    mov r10, r5\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0");
+                    dest[0] = src[0] | (src[1] << 4) | (src[2] << 8) | (src[3] << 0xC);
+                    dest[1] = src[4] | (src[5] << 4) | (src[6] << 8) | (src[7] << 0xC);
+                }
+            }
+        }
+    }
 }
 
 void ApplyImageProcessingQuantization(struct ImageProcessingContext *context)
diff --git a/src/item_menu.c b/src/item_menu.c
index 2814aa5b9..40a0f0439 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -477,7 +477,7 @@ void CB2_ChooseBerry(void)
     GoToBagMenu(RETURN_LOCATION_FIELD_2, BERRIES_POCKET, CB2_ReturnToFieldContinueScript);
 }
 
-void sub_81AABF0(void (*callback)(void))
+void ChooseBerrySetCallback(void (*callback)(void))
 {
     GoToBagMenu(RETURN_LOCATION_FIELD_3, BERRIES_POCKET, callback);
 }
diff --git a/src/link.c b/src/link.c
index 3ca8236ed..b010558a5 100644
--- a/src/link.c
+++ b/src/link.c
@@ -1399,7 +1399,7 @@ void sub_800AB18(void)
     }
 }
 
-void sub_800AB98(void)
+void ResetLinkPlayerCount(void)
 {
     gSavedLinkPlayerCount = 0;
     gSavedMultiplayerId = 0;
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 dfd20e3fa..45a023f9f 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -2357,7 +2357,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);