Cleanup link contest map events

24 files changed, 17 insertions, 29 deletions

diff --git a/data/map_events.s b/data/map_events.s
index 1d4813b73..6b2062076 100644
--- a/data/map_events.s
+++ b/data/map_events.s
@@ -387,17 +387,17 @@
 	.include "data/maps/RecordCorner/events.inc"
 	.include "data/maps/DoubleBattleColosseum/events.inc"
 	.include "data/maps/LinkContestRoom1/events.inc"
-	.include "data/maps/LinkContestRoom2/events.inc"
-	.include "data/maps/LinkContestRoom3/events.inc"
-	.include "data/maps/LinkContestRoom4/events.inc"
-	.include "data/maps/LinkContestRoom5/events.inc"
-	.include "data/maps/LinkContestRoom6/events.inc"
 	.include "data/maps/UnknownMap_25_29/events.inc"
 	.include "data/maps/UnknownMap_25_30/events.inc"
 	.include "data/maps/UnknownMap_25_31/events.inc"
 	.include "data/maps/UnknownMap_25_32/events.inc"
 	.include "data/maps/UnknownMap_25_33/events.inc"
 	.include "data/maps/UnknownMap_25_34/events.inc"
+	.include "data/maps/LinkContestRoom2/events.inc"
+	.include "data/maps/LinkContestRoom3/events.inc"
+	.include "data/maps/LinkContestRoom4/events.inc"
+	.include "data/maps/LinkContestRoom5/events.inc"
+	.include "data/maps/LinkContestRoom6/events.inc"
 	.include "data/maps/InsideOfTruck/events.inc"
 	.include "data/maps/SSTidalCorridor/events.inc"
 	.include "data/maps/SSTidalLowerDeck/events.inc"
diff --git a/data/maps/LinkContestRoom1/events.inc b/data/maps/LinkContestRoom1/events.inc
index 5c1a3b9f4..7b6b875c2 100644
--- a/data/maps/LinkContestRoom1/events.inc
+++ b/data/maps/LinkContestRoom1/events.inc
@@ -16,3 +16,4 @@ LinkContestRoom1_EventObjects: @ 8539EFC
 	object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0
 
 LinkContestRoom1_MapEvents:: @ 853A064
+	map_events LinkContestRoom1_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/LinkContestRoom2/events.inc b/data/maps/LinkContestRoom2/events.inc
index 89cb251d5..e69de29bb 100644
--- a/data/maps/LinkContestRoom2/events.inc
+++ b/data/maps/LinkContestRoom2/events.inc
@@ -1 +0,0 @@
-LinkContestRoom2_MapEvents:: @ 853A064
diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc
index f9274e58b..406b8e5c3 100644
--- a/data/maps/LinkContestRoom2/header.inc
+++ b/data/maps/LinkContestRoom2/header.inc
@@ -1,6 +1,6 @@
 LinkContestRoom2: @ 8484E64
 	.4byte LinkContestRoom2_Layout
-	.4byte LinkContestRoom2_MapEvents
+	.4byte LinkContestRoom1_MapEvents
 	.4byte LinkContestRoom2_MapScripts
 	.4byte 0x0
 	.2byte MUS_CONTEST0
diff --git a/data/maps/LinkContestRoom3/events.inc b/data/maps/LinkContestRoom3/events.inc
index 1e1b194c6..e69de29bb 100644
--- a/data/maps/LinkContestRoom3/events.inc
+++ b/data/maps/LinkContestRoom3/events.inc
@@ -1 +0,0 @@
-LinkContestRoom3_MapEvents:: @ 853A064
diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc
index 1b445db4b..1f5de7cf0 100644
--- a/data/maps/LinkContestRoom3/header.inc
+++ b/data/maps/LinkContestRoom3/header.inc
@@ -1,6 +1,6 @@
 LinkContestRoom3: @ 8484E80
 	.4byte LinkContestRoom3_Layout
-	.4byte LinkContestRoom3_MapEvents
+	.4byte LinkContestRoom1_MapEvents
 	.4byte LinkContestRoom3_MapScripts
 	.4byte 0x0
 	.2byte MUS_CONTEST0
diff --git a/data/maps/LinkContestRoom4/events.inc b/data/maps/LinkContestRoom4/events.inc
index 56e608f20..e69de29bb 100644
--- a/data/maps/LinkContestRoom4/events.inc
+++ b/data/maps/LinkContestRoom4/events.inc
@@ -1 +0,0 @@
-LinkContestRoom4_MapEvents:: @ 853A064
diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc
index 20720be06..84dc7829b 100644
--- a/data/maps/LinkContestRoom4/header.inc
+++ b/data/maps/LinkContestRoom4/header.inc
@@ -1,6 +1,6 @@
 LinkContestRoom4: @ 8484E9C
 	.4byte LinkContestRoom4_Layout
-	.4byte LinkContestRoom4_MapEvents
+	.4byte LinkContestRoom1_MapEvents
 	.4byte LinkContestRoom4_MapScripts
 	.4byte 0x0
 	.2byte MUS_CONTEST0
diff --git a/data/maps/LinkContestRoom5/events.inc b/data/maps/LinkContestRoom5/events.inc
index 90644518e..e69de29bb 100644
--- a/data/maps/LinkContestRoom5/events.inc
+++ b/data/maps/LinkContestRoom5/events.inc
@@ -1 +0,0 @@
-LinkContestRoom5_MapEvents:: @ 853A064
diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc
index f2e9c6c55..c6f64fdc7 100644
--- a/data/maps/LinkContestRoom5/header.inc
+++ b/data/maps/LinkContestRoom5/header.inc
@@ -1,6 +1,6 @@
 LinkContestRoom5: @ 8484EB8
 	.4byte LinkContestRoom5_Layout
-	.4byte LinkContestRoom5_MapEvents
+	.4byte LinkContestRoom1_MapEvents
 	.4byte LinkContestRoom5_MapScripts
 	.4byte 0x0
 	.2byte MUS_CONTEST0
diff --git a/data/maps/LinkContestRoom6/events.inc b/data/maps/LinkContestRoom6/events.inc
index 802987a1d..e69de29bb 100644
--- a/data/maps/LinkContestRoom6/events.inc
+++ b/data/maps/LinkContestRoom6/events.inc
@@ -1 +0,0 @@
-LinkContestRoom6_MapEvents:: @ 853A064
diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc
index 225a99e46..5e4c09fbe 100644
--- a/data/maps/LinkContestRoom6/header.inc
+++ b/data/maps/LinkContestRoom6/header.inc
@@ -1,6 +1,6 @@
 LinkContestRoom6: @ 8484ED4
 	.4byte LinkContestRoom6_Layout
-	.4byte LinkContestRoom6_MapEvents
+	.4byte LinkContestRoom1_MapEvents
 	.4byte LinkContestRoom6_MapScripts
 	.4byte 0x0
 	.2byte MUS_CONTEST0
diff --git a/data/maps/UnknownMap_25_29/events.inc b/data/maps/UnknownMap_25_29/events.inc
index 13ea1b8b9..e69de29bb 100644
--- a/data/maps/UnknownMap_25_29/events.inc
+++ b/data/maps/UnknownMap_25_29/events.inc
@@ -1 +0,0 @@
-UnknownMap_25_29_MapEvents:: @ 853A064
diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc
index a3777fd80..c056dd072 100644
--- a/data/maps/UnknownMap_25_29/header.inc
+++ b/data/maps/UnknownMap_25_29/header.inc
@@ -1,6 +1,6 @@
 UnknownMap_25_29: @ 8484DBC
 	.4byte UnknownMap_25_29_Layout
-	.4byte UnknownMap_25_29_MapEvents
+	.4byte LinkContestRoom1_MapEvents
 	.4byte UnknownMap_25_29_MapScripts
 	.4byte 0x0
 	.2byte MUS_NIBI
diff --git a/data/maps/UnknownMap_25_30/events.inc b/data/maps/UnknownMap_25_30/events.inc
index 0e221e240..e69de29bb 100644
--- a/data/maps/UnknownMap_25_30/events.inc
+++ b/data/maps/UnknownMap_25_30/events.inc
@@ -1 +0,0 @@
-UnknownMap_25_30_MapEvents:: @ 853A064
diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc
index a4184b85d..652fc466f 100644
--- a/data/maps/UnknownMap_25_30/header.inc
+++ b/data/maps/UnknownMap_25_30/header.inc
@@ -1,6 +1,6 @@
 UnknownMap_25_30: @ 8484DD8
 	.4byte UnknownMap_25_30_Layout
-	.4byte UnknownMap_25_30_MapEvents
+	.4byte LinkContestRoom1_MapEvents
 	.4byte UnknownMap_25_30_MapScripts
 	.4byte 0x0
 	.2byte MUS_NIBI
diff --git a/data/maps/UnknownMap_25_31/events.inc b/data/maps/UnknownMap_25_31/events.inc
index 99e450de5..e69de29bb 100644
--- a/data/maps/UnknownMap_25_31/events.inc
+++ b/data/maps/UnknownMap_25_31/events.inc
@@ -1 +0,0 @@
-UnknownMap_25_31_MapEvents:: @ 853A064
diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc
index ec4838bd5..d90c49d68 100644
--- a/data/maps/UnknownMap_25_31/header.inc
+++ b/data/maps/UnknownMap_25_31/header.inc
@@ -1,6 +1,6 @@
 UnknownMap_25_31: @ 8484DF4
 	.4byte UnknownMap_25_31_Layout
-	.4byte UnknownMap_25_31_MapEvents
+	.4byte LinkContestRoom1_MapEvents
 	.4byte UnknownMap_25_31_MapScripts
 	.4byte 0x0
 	.2byte MUS_NIBI
diff --git a/data/maps/UnknownMap_25_32/events.inc b/data/maps/UnknownMap_25_32/events.inc
index c48eedb17..e69de29bb 100644
--- a/data/maps/UnknownMap_25_32/events.inc
+++ b/data/maps/UnknownMap_25_32/events.inc
@@ -1 +0,0 @@
-UnknownMap_25_32_MapEvents:: @ 853A064
diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc
index 39e982093..100aaca19 100644
--- a/data/maps/UnknownMap_25_32/header.inc
+++ b/data/maps/UnknownMap_25_32/header.inc
@@ -1,6 +1,6 @@
 UnknownMap_25_32: @ 8484E10
 	.4byte UnknownMap_25_32_Layout
-	.4byte UnknownMap_25_32_MapEvents
+	.4byte LinkContestRoom1_MapEvents
 	.4byte UnknownMap_25_32_MapScripts
 	.4byte 0x0
 	.2byte MUS_NIBI
diff --git a/data/maps/UnknownMap_25_33/events.inc b/data/maps/UnknownMap_25_33/events.inc
index 14f4571d2..e69de29bb 100644
--- a/data/maps/UnknownMap_25_33/events.inc
+++ b/data/maps/UnknownMap_25_33/events.inc
@@ -1 +0,0 @@
-UnknownMap_25_33_MapEvents:: @ 853A064
diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc
index 87f8b0c1e..31670d1ad 100644
--- a/data/maps/UnknownMap_25_33/header.inc
+++ b/data/maps/UnknownMap_25_33/header.inc
@@ -1,6 +1,6 @@
 UnknownMap_25_33: @ 8484E2C
 	.4byte UnknownMap_25_33_Layout
-	.4byte UnknownMap_25_33_MapEvents
+	.4byte LinkContestRoom1_MapEvents
 	.4byte UnknownMap_25_33_MapScripts
 	.4byte 0x0
 	.2byte MUS_NIBI
diff --git a/data/maps/UnknownMap_25_34/events.inc b/data/maps/UnknownMap_25_34/events.inc
index 975f08470..e69de29bb 100644
--- a/data/maps/UnknownMap_25_34/events.inc
+++ b/data/maps/UnknownMap_25_34/events.inc
@@ -1,3 +0,0 @@
-UnknownMap_25_34_MapEvents:: @ 853A064
-	map_events LinkContestRoom1_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc
index c053c5e19..6bad2af80 100644
--- a/data/maps/UnknownMap_25_34/header.inc
+++ b/data/maps/UnknownMap_25_34/header.inc
@@ -1,6 +1,6 @@
 UnknownMap_25_34: @ 8484E48
 	.4byte UnknownMap_25_34_Layout
-	.4byte UnknownMap_25_34_MapEvents
+	.4byte LinkContestRoom1_MapEvents
 	.4byte UnknownMap_25_34_MapScripts
 	.4byte 0x0
 	.2byte MUS_NIBI