Document Pokemon Mansion scripts

15 files changed, 306 insertions, 268 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index 6096e9c57..59922937a 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -5,6 +5,7 @@
 #include "constants/items.h"
 #include "constants/layouts.h"
 #include "constants/maps.h"
+#include "constants/metatile_labels.h"
 #include "constants/pokemon.h"
 #include "constants/moves.h"
 #include "constants/songs.h"
diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json
index 2a450374f..652ffd20b 100644
--- a/data/maps/PokemonMansion_1F/map.json
+++ b/data/maps/PokemonMansion_1F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "PokemonMansion_1F_EventScript_162226",
+      "script": "PokemonMansion_1F_EventScript_Ted",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "PokemonMansion_1F_EventScript_16223D",
+      "script": "PokemonMansion_1F_EventScript_Johnson",
       "flag": "0"
     }
   ],
@@ -158,7 +158,7 @@
       "x": 5,
       "y": 5,
       "elevation": 0,
-      "script": "PokemonMansion_1F_EventScript_162212"
+      "script": "PokemonMansion_1F_EventScript_Statue"
     },
     {
       "type": "hidden_item",
diff --git a/data/maps/PokemonMansion_1F/scripts.inc b/data/maps/PokemonMansion_1F/scripts.inc
index 6fd52bafc..cc071a6ac 100644
--- a/data/maps/PokemonMansion_1F/scripts.inc
+++ b/data/maps/PokemonMansion_1F/scripts.inc
@@ -4,29 +4,29 @@ PokemonMansion_1F_MapScripts:: @ 81621F9
 	.byte 0
 
 PokemonMansion_1F_OnLoad:: @ 8162204
-	call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7B7A
+	call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, PokemonMansion_EventScript_PressSwitch_1F
 	end
 
 PokemonMansion_1F_OnTransition:: @ 816220E
 	setworldmapflag FLAG_WORLD_MAP_POKEMON_MANSION_1F
 	end
 
-PokemonMansion_1F_EventScript_162212:: @ 8162212
+PokemonMansion_1F_EventScript_Statue:: @ 8162212
 	lockall
 	setvar VAR_0x8004, 0
-	call EventScript_1A7AE2
+	call PokemonMansion_EventScript_SecretSwitch
 	playse SE_KI_GASYAN
 	special DrawWholeMapView
 	waitse
 	releaseall
 	end
 
-PokemonMansion_1F_EventScript_162226:: @ 8162226
-	trainerbattle_single TRAINER_SCIENTIST_TED, Text_177364, Text_177391
-	msgbox gUnknown_8177397, MSGBOX_AUTOCLOSE
+PokemonMansion_1F_EventScript_Ted:: @ 8162226
+	trainerbattle_single TRAINER_SCIENTIST_TED, PokemonMansion_1F_Text_TedIntro, PokemonMansion_1F_Text_TedDefeat
+	msgbox PokemonMansion_1F_Text_TedPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-PokemonMansion_1F_EventScript_16223D:: @ 816223D
-	trainerbattle_single TRAINER_YOUNGSTER_JOHNSON, Text_1773C6, Text_1773FD
-	msgbox gUnknown_8177418, MSGBOX_AUTOCLOSE
+PokemonMansion_1F_EventScript_Johnson:: @ 816223D
+	trainerbattle_single TRAINER_YOUNGSTER_JOHNSON, PokemonMansion_1F_Text_JohnsonIntro, PokemonMansion_1F_Text_JohnsonDefeat
+	msgbox PokemonMansion_1F_Text_JohnsonPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/PokemonMansion_1F/text.inc b/data/maps/PokemonMansion_1F/text.inc
index 52eece07b..b13082554 100644
--- a/data/maps/PokemonMansion_1F/text.inc
+++ b/data/maps/PokemonMansion_1F/text.inc
@@ -1,23 +1,23 @@
-Text_177364:: @ 8177364
+PokemonMansion_1F_Text_TedIntro:: @ 8177364
     .string "Who are you?\n"
     .string "There shouldn't be anyone here.$"
 
-Text_177391:: @ 8177391
+PokemonMansion_1F_Text_TedDefeat:: @ 8177391
     .string "Ouch!$"
 
-gUnknown_8177397:: @ 8177397
+PokemonMansion_1F_Text_TedPostBattle:: @ 8177397
     .string "A key? I don't know what you're\n"
     .string "talking about.$"
 
-Text_1773C6:: @ 81773C6
+PokemonMansion_1F_Text_JohnsonIntro:: @ 81773C6
     .string "W-w-waah! You startled me!\n"
     .string "I thought you were a ghost.$"
 
-Text_1773FD:: @ 81773FD
+PokemonMansion_1F_Text_JohnsonDefeat:: @ 81773FD
     .string "Tch!\n"
     .string "I can't get any wins.$"
 
-gUnknown_8177418:: @ 8177418
+PokemonMansion_1F_Text_JohnsonPostBattle:: @ 8177418
     .string "I was exploring here by myself,\n"
     .string "but I feel spooked.\p"
     .string "I ought to go soon.$"
diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json
index 65704127b..bc8f10848 100644
--- a/data/maps/PokemonMansion_2F/map.json
+++ b/data/maps/PokemonMansion_2F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "PokemonMansion_2F_EventScript_16228A",
+      "script": "PokemonMansion_2F_EventScript_Arnie",
       "flag": "0"
     },
     {
@@ -110,21 +110,21 @@
       "x": 2,
       "y": 16,
       "elevation": 0,
-      "script": "PokemonMansion_2F_EventScript_162264"
+      "script": "PokemonMansion_2F_EventScript_Statue"
     },
     {
       "type": "bg_event_type_0",
       "x": 6,
       "y": 31,
       "elevation": 0,
-      "script": "PokemonMansion_2F_EventScript_162281"
+      "script": "PokemonMansion_2F_EventScript_DiaryJuly10th"
     },
     {
       "type": "bg_event_type_0",
       "x": 25,
       "y": 4,
       "elevation": 0,
-      "script": "PokemonMansion_2F_EventScript_162278"
+      "script": "PokemonMansion_2F_EventScript_DiaryJuly5th"
     }
   ]
 }
diff --git a/data/maps/PokemonMansion_2F/scripts.inc b/data/maps/PokemonMansion_2F/scripts.inc
index e19c2ed7f..a6dd709a7 100644
--- a/data/maps/PokemonMansion_2F/scripts.inc
+++ b/data/maps/PokemonMansion_2F/scripts.inc
@@ -3,28 +3,28 @@ PokemonMansion_2F_MapScripts:: @ 8162254
 	.byte 0
 
 PokemonMansion_2F_OnLoad:: @ 816225A
-	call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7D3E
+	call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, PokemonMansion_EventScript_PressSwitch_2F
 	end
 
-PokemonMansion_2F_EventScript_162264:: @ 8162264
+PokemonMansion_2F_EventScript_Statue:: @ 8162264
 	lockall
 	setvar VAR_0x8004, 1
-	call EventScript_1A7AE2
+	call PokemonMansion_EventScript_SecretSwitch
 	playse SE_KI_GASYAN
 	special DrawWholeMapView
 	waitse
 	releaseall
 	end
 
-PokemonMansion_2F_EventScript_162278:: @ 8162278
-	msgbox gUnknown_817751F, MSGBOX_SIGN
+PokemonMansion_2F_EventScript_DiaryJuly5th:: @ 8162278
+	msgbox PokemonMansion_1F_Text_NewMonDiscoveredInGuyanaJungle, MSGBOX_SIGN
 	end
 
-PokemonMansion_2F_EventScript_162281:: @ 8162281
-	msgbox gUnknown_8177574, MSGBOX_SIGN
+PokemonMansion_2F_EventScript_DiaryJuly10th:: @ 8162281
+	msgbox PokemonMansion_1F_Text_ChristenedDiscoveredMonMew, MSGBOX_SIGN
 	end
 
-PokemonMansion_2F_EventScript_16228A:: @ 816228A
-	trainerbattle_single TRAINER_BURGLAR_ARNIE, Text_177498, Text_1774CB
-	msgbox gUnknown_81774E3, MSGBOX_AUTOCLOSE
+PokemonMansion_2F_EventScript_Arnie:: @ 816228A
+	trainerbattle_single TRAINER_BURGLAR_ARNIE, PokemonMansion_1F_Text_ArnieIntro, PokemonMansion_1F_Text_ArnieDefeat
+	msgbox PokemonMansion_1F_Text_ArniePostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/PokemonMansion_2F/text.inc b/data/maps/PokemonMansion_2F/text.inc
index 4428137de..08b75e036 100644
--- a/data/maps/PokemonMansion_2F/text.inc
+++ b/data/maps/PokemonMansion_2F/text.inc
@@ -1,32 +1,32 @@
-Text_177460:: @ 8177460
+PokemonMansion_Text_PressSecretSwitch:: @ 8177460
     .string "A secret switch!\p"
     .string "Press it?$"
 
-Text_17747B:: @ 817747B
+PokemonMansion_Text_WhoWouldnt:: @ 817747B
     .string "Who wouldn't?$"
 
-Text_177489:: @ 8177489
+PokemonMansion_Text_NotQuiteYet:: @ 8177489
     .string "Not quite yet!$"
 
-Text_177498:: @ 8177498
+PokemonMansion_1F_Text_ArnieIntro:: @ 8177498
     .string "I can't get out!\n"
     .string "This old place is one big puzzle.$"
 
-Text_1774CB:: @ 81774CB
+PokemonMansion_1F_Text_ArnieDefeat:: @ 81774CB
     .string "Oh, no!\n"
     .string "My bag of loot!$"
 
-gUnknown_81774E3:: @ 81774E3
+PokemonMansion_1F_Text_ArniePostBattle:: @ 81774E3
     .string "The switches here open and close\n"
     .string "alternating sets of doors.$"
 
-gUnknown_817751F:: @ 817751F
+PokemonMansion_1F_Text_NewMonDiscoveredInGuyanaJungle:: @ 817751F
     .string "Diary: July 5\n"
     .string "Guyana, South America\p"
     .string "A new POKéMON was discovered deep\n"
     .string "in the jungle.$"
 
-gUnknown_8177574:: @ 8177574
+PokemonMansion_1F_Text_ChristenedDiscoveredMonMew:: @ 8177574
     .string "Diary: July 10\n"
     .string "We christened the newly discovered\l"
     .string "POKéMON, MEW.$"
diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json
index ddd72f291..1e4af29e2 100644
--- a/data/maps/PokemonMansion_3F/map.json
+++ b/data/maps/PokemonMansion_3F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "PokemonMansion_3F_EventScript_1622CE",
+      "script": "PokemonMansion_3F_EventScript_Simon",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "PokemonMansion_3F_EventScript_1622E5",
+      "script": "PokemonMansion_3F_EventScript_Braydon",
       "flag": "0"
     },
     {
@@ -131,14 +131,14 @@
       "x": 8,
       "y": 16,
       "elevation": 0,
-      "script": "PokemonMansion_3F_EventScript_1622C5"
+      "script": "PokemonMansion_3F_EventScript_DiaryFeb6th"
     },
     {
       "type": "bg_event_type_1",
       "x": 12,
       "y": 5,
       "elevation": 0,
-      "script": "PokemonMansion_3F_EventScript_1622B1"
+      "script": "PokemonMansion_3F_EventScript_Statue"
     },
     {
       "type": "hidden_item",
diff --git a/data/maps/PokemonMansion_3F/scripts.inc b/data/maps/PokemonMansion_3F/scripts.inc
index fe6eefcb0..dd7667161 100644
--- a/data/maps/PokemonMansion_3F/scripts.inc
+++ b/data/maps/PokemonMansion_3F/scripts.inc
@@ -3,29 +3,29 @@ PokemonMansion_3F_MapScripts:: @ 81622A1
 	.byte 0
 
 PokemonMansion_3F_OnLoad:: @ 81622A7
-	call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7E72
+	call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, PokemonMansion_EventScript_PressSwitch_3F
 	end
 
-PokemonMansion_3F_EventScript_1622B1:: @ 81622B1
+PokemonMansion_3F_EventScript_Statue:: @ 81622B1
 	lockall
 	setvar VAR_0x8004, 2
-	call EventScript_1A7AE2
+	call PokemonMansion_EventScript_SecretSwitch
 	playse SE_KI_GASYAN
 	special DrawWholeMapView
 	waitse
 	releaseall
 	end
 
-PokemonMansion_3F_EventScript_1622C5:: @ 81622C5
-	msgbox gUnknown_8177685, MSGBOX_SIGN
+PokemonMansion_3F_EventScript_DiaryFeb6th:: @ 81622C5
+	msgbox PokemonMansion_1F_Text_MewGaveBirthToMewtwo, MSGBOX_SIGN
 	end
 
-PokemonMansion_3F_EventScript_1622CE:: @ 81622CE
-	trainerbattle_single TRAINER_BURGLAR_SIMON, Text_1775E7, Text_177602
-	msgbox gUnknown_8177608, MSGBOX_AUTOCLOSE
+PokemonMansion_3F_EventScript_Simon:: @ 81622CE
+	trainerbattle_single TRAINER_BURGLAR_SIMON, PokemonMansion_1F_Text_SimonIntro, PokemonMansion_1F_Text_SimonDefeat
+	msgbox PokemonMansion_1F_Text_SimonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-PokemonMansion_3F_EventScript_1622E5:: @ 81622E5
-	trainerbattle_single TRAINER_SCIENTIST_BRAYDON, Text_177628, Text_177643
-	msgbox gUnknown_8177657, MSGBOX_AUTOCLOSE
+PokemonMansion_3F_EventScript_Braydon:: @ 81622E5
+	trainerbattle_single TRAINER_SCIENTIST_BRAYDON, PokemonMansion_1F_Text_BraydonIntro, PokemonMansion_1F_Text_BraydonDefeat
+	msgbox PokemonMansion_1F_Text_BraydonPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/PokemonMansion_3F/text.inc b/data/maps/PokemonMansion_3F/text.inc
index 1c027784c..07978a3f5 100644
--- a/data/maps/PokemonMansion_3F/text.inc
+++ b/data/maps/PokemonMansion_3F/text.inc
@@ -1,34 +1,34 @@
-Text_1775B4:: @ 81775B4
+PokemonMansion_Text_PressSecretSwitchJP:: @ 81775B4
     .string "ひみつの　スイッチが　ある！\p"
     .string "おして　みますか？$"
 
-Text_1775CD:: @ 81775CD
+PokemonMansion_Text_LetsTryIt:: @ 81775CD
     .string "おしてみよう！　‥ポチッとな$"
 
-Text_1775DC:: @ 81775DC
+PokemonMansion_1F_Text_1775DC:: @ 81775DC
     .string "ÈÒçè ÀÊúòŒ$"
 
-Text_1775E7:: @ 81775E7
+PokemonMansion_1F_Text_SimonIntro:: @ 81775E7
     .string "This place is, like, huge!$"
 
-Text_177602:: @ 8177602
+PokemonMansion_1F_Text_SimonDefeat:: @ 8177602
     .string "Ayah!$"
 
-gUnknown_8177608:: @ 8177608
+PokemonMansion_1F_Text_SimonPostBattle:: @ 8177608
     .string "I wonder where my partner went.$"
 
-Text_177628:: @ 8177628
+PokemonMansion_1F_Text_BraydonIntro:: @ 8177628
     .string "My mentor once lived here.$"
 
-Text_177643:: @ 8177643
+PokemonMansion_1F_Text_BraydonDefeat:: @ 8177643
     .string "Whew!\n"
     .string "Overwhelming!$"
 
-gUnknown_8177657:: @ 8177657
+PokemonMansion_1F_Text_BraydonPostBattle:: @ 8177657
     .string "So, you're stuck?\n"
     .string "Try jumping off over there!$"
 
-gUnknown_8177685:: @ 8177685
+PokemonMansion_1F_Text_MewGaveBirthToMewtwo:: @ 8177685
     .string "Diary: Feb. 6\n"
     .string "MEW gave birth.\p"
     .string "We named the newborn MEWTWO.$"
diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json
index 049d0f739..458740163 100644
--- a/data/maps/PokemonMansion_B1F/map.json
+++ b/data/maps/PokemonMansion_B1F/map.json
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "PokemonMansion_B1F_EventScript_162329",
+      "script": "PokemonMansion_B1F_EventScript_Lewis",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 6,
-      "script": "PokemonMansion_B1F_EventScript_162340",
+      "script": "PokemonMansion_B1F_EventScript_Ivan",
       "flag": "0"
     },
     {
@@ -108,21 +108,21 @@
       "x": 21,
       "y": 27,
       "elevation": 0,
-      "script": "PokemonMansion_B1F_EventScript_162320"
+      "script": "PokemonMansion_B1F_EventScript_DiarySep1st"
     },
     {
       "type": "bg_event_type_1",
       "x": 24,
       "y": 29,
       "elevation": 0,
-      "script": "PokemonMansion_B1F_EventScript_16230C"
+      "script": "PokemonMansion_B1F_EventScript_Statue"
     },
     {
       "type": "bg_event_type_1",
       "x": 27,
       "y": 5,
       "elevation": 0,
-      "script": "PokemonMansion_B1F_EventScript_16230C"
+      "script": "PokemonMansion_B1F_EventScript_Statue"
     },
     {
       "type": "hidden_item",
diff --git a/data/maps/PokemonMansion_B1F/scripts.inc b/data/maps/PokemonMansion_B1F/scripts.inc
index d1641f28a..5f749fc24 100644
--- a/data/maps/PokemonMansion_B1F/scripts.inc
+++ b/data/maps/PokemonMansion_B1F/scripts.inc
@@ -3,29 +3,29 @@ PokemonMansion_B1F_MapScripts:: @ 81622FC
 	.byte 0
 
 PokemonMansion_B1F_OnLoad:: @ 8162302
-	call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7F4C
+	call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, PokemonMansion_EventScript_PressSwitch_B1F
 	end
 
-PokemonMansion_B1F_EventScript_16230C:: @ 816230C
+PokemonMansion_B1F_EventScript_Statue:: @ 816230C
 	lockall
 	setvar VAR_0x8004, 3
-	call EventScript_1A7AE2
+	call PokemonMansion_EventScript_SecretSwitch
 	playse SE_KI_GASYAN
 	special DrawWholeMapView
 	waitse
 	releaseall
 	end
 
-PokemonMansion_B1F_EventScript_162320:: @ 8162320
-	msgbox gUnknown_8177798, MSGBOX_SIGN
+PokemonMansion_B1F_EventScript_DiarySep1st:: @ 8162320
+	msgbox PokemonMansion_B1F_Text_MewtwoIsFarTooPowerful, MSGBOX_SIGN
 	end
 
-PokemonMansion_B1F_EventScript_162329:: @ 8162329
-	trainerbattle_single TRAINER_BURGLAR_LEWIS, Text_1776C0, Text_1776D7
-	msgbox gUnknown_81776DE, MSGBOX_AUTOCLOSE
+PokemonMansion_B1F_EventScript_Lewis:: @ 8162329
+	trainerbattle_single TRAINER_BURGLAR_LEWIS, PokemonMansion_B1F_Text_LewisIntro, PokemonMansion_B1F_Text_LewisDefeat
+	msgbox PokemonMansion_B1F_Text_LewisPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-PokemonMansion_B1F_EventScript_162340:: @ 8162340
-	trainerbattle_single TRAINER_SCIENTIST_IVAN, Text_177720, Text_177757
-	msgbox gUnknown_817776A, MSGBOX_AUTOCLOSE
+PokemonMansion_B1F_EventScript_Ivan:: @ 8162340
+	trainerbattle_single TRAINER_SCIENTIST_IVAN, PokemonMansion_B1F_Text_IvanIntro, PokemonMansion_B1F_Text_IvanDefeat
+	msgbox PokemonMansion_B1F_Text_IvanPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/PokemonMansion_B1F/text.inc b/data/maps/PokemonMansion_B1F/text.inc
index b04ee2397..6e9646f14 100644
--- a/data/maps/PokemonMansion_B1F/text.inc
+++ b/data/maps/PokemonMansion_B1F/text.inc
@@ -1,26 +1,26 @@
-Text_1776C0:: @ 81776C0
+PokemonMansion_B1F_Text_LewisIntro:: @ 81776C0
     .string "Uh-oh…\n"
     .string "Where am I now?$"
 
-Text_1776D7:: @ 81776D7
+PokemonMansion_B1F_Text_LewisDefeat:: @ 81776D7
     .string "Awooh!$"
 
-gUnknown_81776DE:: @ 81776DE
+PokemonMansion_B1F_Text_LewisPostBattle:: @ 81776DE
     .string "You can find stuff lying around.\n"
     .string "The residents must've left them.$"
 
-Text_177720:: @ 8177720
+PokemonMansion_B1F_Text_IvanIntro:: @ 8177720
     .string "This place is ideal for a lab.\n"
     .string "Look at all this space.$"
 
-Text_177757:: @ 8177757
+PokemonMansion_B1F_Text_IvanDefeat:: @ 8177757
     .string "What was that for?$"
 
-gUnknown_817776A:: @ 817776A
+PokemonMansion_B1F_Text_IvanPostBattle:: @ 817776A
     .string "I like it here.\n"
     .string "It's conducive to my studies.$"
 
-gUnknown_8177798:: @ 8177798
+PokemonMansion_B1F_Text_MewtwoIsFarTooPowerful:: @ 8177798
     .string "Diary: Sept. 1\n"
     .string "MEWTWO is far too powerful.\p"
     .string "We have failed to curb its vicious\n"
diff --git a/data/scripts/pokemon_mansion.inc b/data/scripts/pokemon_mansion.inc
index cb0931600..9f6fb522a 100644
--- a/data/scripts/pokemon_mansion.inc
+++ b/data/scripts/pokemon_mansion.inc
@@ -1,207 +1,207 @@
-EventScript_1A7AE2:: @ 81A7AE2
-	msgbox Text_177460, MSGBOX_YESNO
+PokemonMansion_EventScript_SecretSwitch:: @ 81A7AE2
+	msgbox PokemonMansion_Text_PressSecretSwitch, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_1A7B70
-	msgbox Text_17747B
-	goto_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7B3B
+	goto_if_eq PokemonMansion_EventScript_DontPressSwitch
+	msgbox PokemonMansion_Text_WhoWouldnt
+	goto_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, PokemonMansion_EventScript_ResetSwitch
 	setflag FLAG_POKEMON_MANSION_SWITCH_STATE
 	switch VAR_0x8004
-	case 0, EventScript_1A7B7A
-	case 1, EventScript_1A7D3E
-	case 2, EventScript_1A7E72
-	case 3, EventScript_1A7F4C
+	case 0, PokemonMansion_EventScript_PressSwitch_1F
+	case 1, PokemonMansion_EventScript_PressSwitch_2F
+	case 2, PokemonMansion_EventScript_PressSwitch_3F
+	case 3, PokemonMansion_EventScript_PressSwitch_B1F
 	end
 
-EventScript_1A7B3B:: @ 81A7B3B
+PokemonMansion_EventScript_ResetSwitch:: @ 81A7B3B
 	clearflag FLAG_POKEMON_MANSION_SWITCH_STATE
 	switch VAR_0x8004
-	case 0, EventScript_1A7C5C
-	case 1, EventScript_1A7DD8
-	case 2, EventScript_1A7EDF
-	case 3, EventScript_1A8025
+	case 0, PokemonMansion_EventScript_ResetSwitch_1F
+	case 1, PokemonMansion_EventScript_ResetSwitch_2F
+	case 2, PokemonMansion_EventScript_ResetSwitch_3F
+	case 3, PokemonMansion_EventScript_ResetSwitch_B1F
 	end
 
-EventScript_1A7B70:: @ 81A7B70
-	msgbox Text_177489
+PokemonMansion_EventScript_DontPressSwitch:: @ 81A7B70
+	msgbox PokemonMansion_Text_NotQuiteYet
 	releaseall
 	end
 
-EventScript_1A7B7A:: @ 81A7B7A
-	setmetatile 22, 10, 645, 0
-	setmetatile 23, 10, 644, 0
-	setmetatile 24, 10, 644, 0
-	setmetatile 22, 11, 645, 0
-	setmetatile 23, 11, 644, 0
-	setmetatile 24, 11, 644, 0
-	setmetatile 27, 25, 645, 0
-	setmetatile 28, 25, 644, 0
-	setmetatile 29, 25, 644, 0
-	setmetatile 27, 26, 645, 0
-	setmetatile 28, 26, 644, 0
-	setmetatile 29, 26, 644, 0
-	setmetatile 32, 25, 645, 0
-	setmetatile 33, 25, 644, 0
-	setmetatile 34, 25, 644, 0
-	setmetatile 32, 26, 645, 0
-	setmetatile 33, 26, 644, 0
-	setmetatile 34, 26, 644, 0
-	setmetatile 31, 18, 760, 1
-	setmetatile 32, 18, 761, 1
-	setmetatile 33, 18, 762, 1
-	setmetatile 31, 19, 768, 1
-	setmetatile 32, 19, 769, 1
-	setmetatile 33, 19, 770, 1
-	setmetatile 5, 4, 845, 0
+PokemonMansion_EventScript_PressSwitch_1F:: @ 81A7B7A
+	setmetatile 22, 10, METATILE_PokemonMansion_Floor_ShadeFull, 0
+	setmetatile 23, 10, METATILE_PokemonMansion_Floor, 0
+	setmetatile 24, 10, METATILE_PokemonMansion_Floor, 0
+	setmetatile 22, 11, METATILE_PokemonMansion_Floor_ShadeFull, 0
+	setmetatile 23, 11, METATILE_PokemonMansion_Floor, 0
+	setmetatile 24, 11, METATILE_PokemonMansion_Floor, 0
+	setmetatile 27, 25, METATILE_PokemonMansion_Floor_ShadeFull, 0
+	setmetatile 28, 25, METATILE_PokemonMansion_Floor, 0
+	setmetatile 29, 25, METATILE_PokemonMansion_Floor, 0
+	setmetatile 27, 26, METATILE_PokemonMansion_Floor_ShadeFull, 0
+	setmetatile 28, 26, METATILE_PokemonMansion_Floor, 0
+	setmetatile 29, 26, METATILE_PokemonMansion_Floor, 0
+	setmetatile 32, 25, METATILE_PokemonMansion_Floor_ShadeFull, 0
+	setmetatile 33, 25, METATILE_PokemonMansion_Floor, 0
+	setmetatile 34, 25, METATILE_PokemonMansion_Floor, 0
+	setmetatile 32, 26, METATILE_PokemonMansion_Floor_ShadeFull, 0
+	setmetatile 33, 26, METATILE_PokemonMansion_Floor, 0
+	setmetatile 34, 26, METATILE_PokemonMansion_Floor, 0
+	setmetatile 31, 18, METATILE_PokemonMansion_Barrier_Horizontal_TopLeft, 1
+	setmetatile 32, 18, METATILE_PokemonMansion_Barrier_Horizontal_TopMid, 1
+	setmetatile 33, 18, METATILE_PokemonMansion_Barrier_Horizontal_TopRight, 1
+	setmetatile 31, 19, METATILE_PokemonMansion_Barrier_Horizontal_BottomLeft, 1
+	setmetatile 32, 19, METATILE_PokemonMansion_Barrier_Horizontal_BottomMid, 1
+	setmetatile 33, 19, METATILE_PokemonMansion_Barrier_Horizontal_BottomRight, 1
+	setmetatile  5,  4, METATILE_PokemonMansion_Statue_RedEyes, 0
 	return
 
-EventScript_1A7C5C:: @ 81A7C5C
-	setmetatile 22, 10, 760, 1
-	setmetatile 23, 10, 761, 1
-	setmetatile 24, 10, 762, 1
-	setmetatile 22, 11, 768, 1
-	setmetatile 23, 11, 769, 1
-	setmetatile 24, 11, 770, 1
-	setmetatile 27, 25, 760, 1
-	setmetatile 28, 25, 761, 1
-	setmetatile 29, 25, 762, 1
-	setmetatile 27, 26, 768, 1
-	setmetatile 28, 26, 769, 1
-	setmetatile 29, 26, 770, 1
-	setmetatile 32, 25, 760, 1
-	setmetatile 33, 25, 761, 1
-	setmetatile 34, 25, 762, 1
-	setmetatile 32, 26, 768, 1
-	setmetatile 33, 26, 769, 1
-	setmetatile 34, 26, 770, 1
-	setmetatile 31, 18, 645, 0
-	setmetatile 32, 18, 644, 0
-	setmetatile 33, 18, 644, 0
-	setmetatile 31, 19, 645, 0
-	setmetatile 32, 19, 644, 0
-	setmetatile 33, 19, 644, 0
-	setmetatile 5, 4, 788, 0
+PokemonMansion_EventScript_ResetSwitch_1F:: @ 81A7C5C
+	setmetatile 22, 10, METATILE_PokemonMansion_Barrier_Horizontal_TopLeft, 1
+	setmetatile 23, 10, METATILE_PokemonMansion_Barrier_Horizontal_TopMid, 1
+	setmetatile 24, 10, METATILE_PokemonMansion_Barrier_Horizontal_TopRight, 1
+	setmetatile 22, 11, METATILE_PokemonMansion_Barrier_Horizontal_BottomLeft, 1
+	setmetatile 23, 11, METATILE_PokemonMansion_Barrier_Horizontal_BottomMid, 1
+	setmetatile 24, 11, METATILE_PokemonMansion_Barrier_Horizontal_BottomRight, 1
+	setmetatile 27, 25, METATILE_PokemonMansion_Barrier_Horizontal_TopLeft, 1
+	setmetatile 28, 25, METATILE_PokemonMansion_Barrier_Horizontal_TopMid, 1
+	setmetatile 29, 25, METATILE_PokemonMansion_Barrier_Horizontal_TopRight, 1
+	setmetatile 27, 26, METATILE_PokemonMansion_Barrier_Horizontal_BottomLeft, 1
+	setmetatile 28, 26, METATILE_PokemonMansion_Barrier_Horizontal_BottomMid, 1
+	setmetatile 29, 26, METATILE_PokemonMansion_Barrier_Horizontal_BottomRight, 1
+	setmetatile 32, 25, METATILE_PokemonMansion_Barrier_Horizontal_TopLeft, 1
+	setmetatile 33, 25, METATILE_PokemonMansion_Barrier_Horizontal_TopMid, 1
+	setmetatile 34, 25, METATILE_PokemonMansion_Barrier_Horizontal_TopRight, 1
+	setmetatile 32, 26, METATILE_PokemonMansion_Barrier_Horizontal_BottomLeft, 1
+	setmetatile 33, 26, METATILE_PokemonMansion_Barrier_Horizontal_BottomMid, 1
+	setmetatile 34, 26, METATILE_PokemonMansion_Barrier_Horizontal_BottomRight, 1
+	setmetatile 31, 18, METATILE_PokemonMansion_Floor_ShadeFull, 0
+	setmetatile 32, 18, METATILE_PokemonMansion_Floor, 0
+	setmetatile 33, 18, METATILE_PokemonMansion_Floor, 0
+	setmetatile 31, 19, METATILE_PokemonMansion_Floor_ShadeFull, 0
+	setmetatile 32, 19, METATILE_PokemonMansion_Floor, 0
+	setmetatile 33, 19, METATILE_PokemonMansion_Floor, 0
+	setmetatile  5,  4, METATILE_PokemonMansion_Statue_BlackEyes, 0
 	return
 
-EventScript_1A7D3E:: @ 81A7D3E
-	setmetatile 24, 14, 645, 0
-	setmetatile 25, 14, 644, 0
-	setmetatile 26, 14, 644, 0
-	setmetatile 24, 15, 645, 0
-	setmetatile 25, 15, 644, 0
-	setmetatile 26, 15, 644, 0
-	setmetatile 10, 28, 677, 1
-	setmetatile 10, 29, 685, 1
-	setmetatile 10, 30, 645, 0
-	setmetatile 10, 31, 644, 0
-	setmetatile 10, 32, 693, 0
-	setmetatile 12, 4, 848, 1
-	setmetatile 12, 5, 856, 1
-	setmetatile 12, 6, 864, 1
-	setmetatile 12, 7, 872, 1
-	setmetatile 12, 8, 880, 1
-	setmetatile 2, 15, 845, 0
+PokemonMansion_EventScript_PressSwitch_2F:: @ 81A7D3E
+	setmetatile 24, 14, METATILE_PokemonMansion_Floor_ShadeFull, 0
+	setmetatile 25, 14, METATILE_PokemonMansion_Floor, 0
+	setmetatile 26, 14, METATILE_PokemonMansion_Floor, 0
+	setmetatile 24, 15, METATILE_PokemonMansion_Floor_ShadeFull, 0
+	setmetatile 25, 15, METATILE_PokemonMansion_Floor, 0
+	setmetatile 26, 15, METATILE_PokemonMansion_Floor, 0
+	setmetatile 10, 28, METATILE_PokemonMansion_Wall_EndPost_Mid, 1
+	setmetatile 10, 29, METATILE_PokemonMansion_Wall_EndPost_Bottom, 1
+	setmetatile 10, 30, METATILE_PokemonMansion_Floor_ShadeFull, 0
+	setmetatile 10, 31, METATILE_PokemonMansion_Floor, 0
+	setmetatile 10, 32, METATILE_PokemonMansion_Wall_EndCap, 0
+	setmetatile 12,  4, METATILE_PokemonMansion_Barrier_Vertical_TopWall, 1
+	setmetatile 12,  5, METATILE_PokemonMansion_Barrier_Vertical_TopBase, 1
+	setmetatile 12,  6, METATILE_PokemonMansion_Barrier_Vertical_MidShadow, 1
+	setmetatile 12,  7, METATILE_PokemonMansion_Barrier_Vertical_Mid, 1
+	setmetatile 12,  8, METATILE_PokemonMansion_Barrier_Vertical_Bottom, 1
+	setmetatile  2, 15, METATILE_PokemonMansion_Statue_RedEyes, 0
 	return
 
-EventScript_1A7DD8:: @ 81A7DD8
-	setmetatile 24, 14, 760, 1
-	setmetatile 25, 14, 761, 1
-	setmetatile 26, 14, 762, 1
-	setmetatile 24, 15, 768, 1
-	setmetatile 25, 15, 769, 1
-	setmetatile 26, 15, 770, 1
-	setmetatile 10, 28, 848, 1
-	setmetatile 10, 29, 856, 1
-	setmetatile 10, 30, 864, 1
-	setmetatile 10, 31, 872, 1
-	setmetatile 10, 32, 880, 1
-	setmetatile 12, 4, 677, 1
-	setmetatile 12, 5, 685, 1
-	setmetatile 12, 6, 645, 0
-	setmetatile 12, 7, 644, 0
-	setmetatile 12, 8, 693, 0
-	setmetatile 2, 15, 788, 0
+PokemonMansion_EventScript_ResetSwitch_2F:: @ 81A7DD8
+	setmetatile 24, 14, METATILE_PokemonMansion_Barrier_Horizontal_TopLeft, 1
+	setmetatile 25, 14, METATILE_PokemonMansion_Barrier_Horizontal_TopMid, 1
+	setmetatile 26, 14, METATILE_PokemonMansion_Barrier_Horizontal_TopRight, 1
+	setmetatile 24, 15, METATILE_PokemonMansion_Barrier_Horizontal_BottomLeft, 1
+	setmetatile 25, 15, METATILE_PokemonMansion_Barrier_Horizontal_BottomMid, 1
+	setmetatile 26, 15, METATILE_PokemonMansion_Barrier_Horizontal_BottomRight, 1
+	setmetatile 10, 28, METATILE_PokemonMansion_Barrier_Vertical_TopWall, 1
+	setmetatile 10, 29, METATILE_PokemonMansion_Barrier_Vertical_TopBase, 1
+	setmetatile 10, 30, METATILE_PokemonMansion_Barrier_Vertical_MidShadow, 1
+	setmetatile 10, 31, METATILE_PokemonMansion_Barrier_Vertical_Mid, 1
+	setmetatile 10, 32, METATILE_PokemonMansion_Barrier_Vertical_Bottom, 1
+	setmetatile 12,  4, METATILE_PokemonMansion_Wall_EndPost_Mid, 1
+	setmetatile 12,  5, METATILE_PokemonMansion_Wall_EndPost_Bottom, 1
+	setmetatile 12,  6, METATILE_PokemonMansion_Floor_ShadeFull, 0
+	setmetatile 12,  7, METATILE_PokemonMansion_Floor, 0
+	setmetatile 12,  8, METATILE_PokemonMansion_Wall_EndCap, 0
+	setmetatile  2, 15, METATILE_PokemonMansion_Statue_BlackEyes, 0
 	return
 
-EventScript_1A7E72:: @ 81A7E72
-	setmetatile 17, 11, 645, 0
-	setmetatile 18, 11, 644, 0
-	setmetatile 19, 11, 644, 0
-	setmetatile 17, 12, 645, 0
-	setmetatile 18, 12, 644, 0
-	setmetatile 19, 12, 644, 0
-	setmetatile 21, 4, 848, 1
-	setmetatile 21, 5, 856, 1
-	setmetatile 21, 6, 864, 1
-	setmetatile 21, 7, 872, 1
-	setmetatile 21, 8, 880, 1
-	setmetatile 12, 4, 845, 0
+PokemonMansion_EventScript_PressSwitch_3F:: @ 81A7E72
+	setmetatile 17, 11, METATILE_PokemonMansion_Floor_ShadeFull, 0
+	setmetatile 18, 11, METATILE_PokemonMansion_Floor, 0
+	setmetatile 19, 11, METATILE_PokemonMansion_Floor, 0
+	setmetatile 17, 12, METATILE_PokemonMansion_Floor_ShadeFull, 0
+	setmetatile 18, 12, METATILE_PokemonMansion_Floor, 0
+	setmetatile 19, 12, METATILE_PokemonMansion_Floor, 0
+	setmetatile 21,  4, METATILE_PokemonMansion_Barrier_Vertical_TopWall, 1
+	setmetatile 21,  5, METATILE_PokemonMansion_Barrier_Vertical_TopBase, 1
+	setmetatile 21,  6, METATILE_PokemonMansion_Barrier_Vertical_MidShadow, 1
+	setmetatile 21,  7, METATILE_PokemonMansion_Barrier_Vertical_Mid, 1
+	setmetatile 21,  8, METATILE_PokemonMansion_Barrier_Vertical_Bottom, 1
+	setmetatile 12,  4, METATILE_PokemonMansion_Statue_RedEyes, 0
 	return
 
-EventScript_1A7EDF:: @ 81A7EDF
-	setmetatile 17, 11, 760, 1
-	setmetatile 18, 11, 761, 1
-	setmetatile 19, 11, 762, 1
-	setmetatile 17, 12, 768, 1
-	setmetatile 18, 12, 769, 1
-	setmetatile 19, 12, 770, 1
-	setmetatile 21, 4, 677, 1
-	setmetatile 21, 5, 685, 1
-	setmetatile 21, 6, 645, 0
-	setmetatile 21, 7, 644, 0
-	setmetatile 21, 8, 693, 0
-	setmetatile 12, 4, 788, 0
+PokemonMansion_EventScript_ResetSwitch_3F:: @ 81A7EDF
+	setmetatile 17, 11, METATILE_PokemonMansion_Barrier_Horizontal_TopLeft, 1
+	setmetatile 18, 11, METATILE_PokemonMansion_Barrier_Horizontal_TopMid, 1
+	setmetatile 19, 11, METATILE_PokemonMansion_Barrier_Horizontal_TopRight, 1
+	setmetatile 17, 12, METATILE_PokemonMansion_Barrier_Horizontal_BottomLeft, 1
+	setmetatile 18, 12, METATILE_PokemonMansion_Barrier_Horizontal_BottomMid, 1
+	setmetatile 19, 12, METATILE_PokemonMansion_Barrier_Horizontal_BottomRight, 1
+	setmetatile 21,  4, METATILE_PokemonMansion_Wall_EndPost_Mid, 1
+	setmetatile 21,  5, METATILE_PokemonMansion_Wall_EndPost_Bottom, 1
+	setmetatile 21,  6, METATILE_PokemonMansion_Floor_ShadeFull, 0
+	setmetatile 21,  7, METATILE_PokemonMansion_Floor, 0
+	setmetatile 21,  8, METATILE_PokemonMansion_Wall_EndCap, 0
+	setmetatile 12,  4, METATILE_PokemonMansion_Statue_BlackEyes, 0
 	return
 
-EventScript_1A7F4C:: @ 81A7F4C
-	setmetatile 33, 20, 760, 1
-	setmetatile 34, 20, 761, 1
-	setmetatile 35, 20, 762, 1
-	setmetatile 33, 21, 852, 1
-	setmetatile 34, 21, 853, 1
-	setmetatile 35, 21, 854, 1
-	setmetatile 16, 26, 848, 1
-	setmetatile 16, 27, 856, 1
-	setmetatile 16, 28, 866, 1
-	setmetatile 16, 29, 874, 1
-	setmetatile 16, 30, 882, 1
-	setmetatile 12, 8, 677, 1
-	setmetatile 12, 9, 685, 1
-	setmetatile 12, 10, 647, 0
-	setmetatile 12, 11, 646, 0
-	setmetatile 12, 12, 688, 0
-	setmetatile 20, 22, 647, 0
-	setmetatile 21, 22, 646, 0
-	setmetatile 22, 22, 646, 0
-	setmetatile 20, 23, 647, 0
-	setmetatile 21, 23, 646, 0
-	setmetatile 22, 23, 646, 0
-	setmetatile 24, 28, 847, 0
-	setmetatile 27, 4, 847, 0
+PokemonMansion_EventScript_PressSwitch_B1F:: @ 81A7F4C
+	setmetatile 33, 20, METATILE_PokemonMansion_Barrier_Horizontal_TopLeft, 1
+	setmetatile 34, 20, METATILE_PokemonMansion_Barrier_Horizontal_TopMid, 1
+	setmetatile 35, 20, METATILE_PokemonMansion_Barrier_Horizontal_TopRight, 1
+	setmetatile 33, 21, METATILE_PokemonMansion_Barrier_Horizontal_BottomLeft_Basement, 1
+	setmetatile 34, 21, METATILE_PokemonMansion_Barrier_Horizontal_BottomMid_Basement, 1
+	setmetatile 35, 21, METATILE_PokemonMansion_Barrier_Horizontal_BottomRight_Basement, 1
+	setmetatile 16, 26, METATILE_PokemonMansion_Barrier_Vertical_TopWall, 1
+	setmetatile 16, 27, METATILE_PokemonMansion_Barrier_Vertical_TopBase, 1
+	setmetatile 16, 28, METATILE_PokemonMansion_Barrier_Vertical_MidShadow_Basement, 1
+	setmetatile 16, 29, METATILE_PokemonMansion_Barrier_Vertical_Mid_Basement, 1
+	setmetatile 16, 30, METATILE_PokemonMansion_Barrier_Vertical_Bottom_Basement, 1
+	setmetatile 12,  8, METATILE_PokemonMansion_Wall_EndPost_Mid, 1
+	setmetatile 12,  9, METATILE_PokemonMansion_Wall_EndPost_Bottom, 1
+	setmetatile 12, 10, METATILE_PokemonMansion_BasementFloor_ShadeFull, 0
+	setmetatile 12, 11, METATILE_PokemonMansion_BasementFloor, 0
+	setmetatile 12, 12, METATILE_PokemonMansion_Wall_EndCap_Basement, 0
+	setmetatile 20, 22, METATILE_PokemonMansion_BasementFloor_ShadeFull, 0
+	setmetatile 21, 22, METATILE_PokemonMansion_BasementFloor, 0
+	setmetatile 22, 22, METATILE_PokemonMansion_BasementFloor, 0
+	setmetatile 20, 23, METATILE_PokemonMansion_BasementFloor_ShadeFull, 0
+	setmetatile 21, 23, METATILE_PokemonMansion_BasementFloor, 0
+	setmetatile 22, 23, METATILE_PokemonMansion_BasementFloor, 0
+	setmetatile 24, 28, METATILE_PokemonMansion_Statue_RedEyes_Basement, 0
+	setmetatile 27,  4, METATILE_PokemonMansion_Statue_RedEyes_Basement, 0
 	return
 
-EventScript_1A8025:: @ 81A8025
-	setmetatile 33, 20, 647, 0
-	setmetatile 34, 20, 646, 0
-	setmetatile 35, 20, 646, 0
-	setmetatile 33, 21, 647, 0
-	setmetatile 34, 21, 646, 0
-	setmetatile 35, 21, 646, 0
-	setmetatile 16, 26, 677, 1
-	setmetatile 16, 27, 685, 1
-	setmetatile 16, 28, 647, 0
-	setmetatile 16, 29, 646, 0
-	setmetatile 16, 30, 688, 0
-	setmetatile 12, 8, 848, 1
-	setmetatile 12, 9, 856, 1
-	setmetatile 12, 10, 866, 1
-	setmetatile 12, 11, 874, 1
-	setmetatile 12, 12, 882, 1
-	setmetatile 20, 22, 760, 1
-	setmetatile 21, 22, 761, 1
-	setmetatile 22, 22, 762, 1
-	setmetatile 20, 23, 852, 1
-	setmetatile 21, 23, 853, 1
-	setmetatile 22, 23, 854, 1
-	setmetatile 24, 28, 790, 0
-	setmetatile 27, 4, 790, 0
+PokemonMansion_EventScript_ResetSwitch_B1F:: @ 81A8025
+	setmetatile 33, 20, METATILE_PokemonMansion_BasementFloor_ShadeFull, 0
+	setmetatile 34, 20, METATILE_PokemonMansion_BasementFloor, 0
+	setmetatile 35, 20, METATILE_PokemonMansion_BasementFloor, 0
+	setmetatile 33, 21, METATILE_PokemonMansion_BasementFloor_ShadeFull, 0
+	setmetatile 34, 21, METATILE_PokemonMansion_BasementFloor, 0
+	setmetatile 35, 21, METATILE_PokemonMansion_BasementFloor, 0
+	setmetatile 16, 26, METATILE_PokemonMansion_Wall_EndPost_Mid, 1
+	setmetatile 16, 27, METATILE_PokemonMansion_Wall_EndPost_Bottom, 1
+	setmetatile 16, 28, METATILE_PokemonMansion_BasementFloor_ShadeFull, 0
+	setmetatile 16, 29, METATILE_PokemonMansion_BasementFloor, 0
+	setmetatile 16, 30, METATILE_PokemonMansion_Wall_EndCap_Basement, 0
+	setmetatile 12,  8, METATILE_PokemonMansion_Barrier_Vertical_TopWall, 1
+	setmetatile 12,  9, METATILE_PokemonMansion_Barrier_Vertical_TopBase, 1
+	setmetatile 12, 10, METATILE_PokemonMansion_Barrier_Vertical_MidShadow_Basement, 1
+	setmetatile 12, 11, METATILE_PokemonMansion_Barrier_Vertical_Mid_Basement, 1
+	setmetatile 12, 12, METATILE_PokemonMansion_Barrier_Vertical_Bottom_Basement, 1
+	setmetatile 20, 22, METATILE_PokemonMansion_Barrier_Horizontal_TopLeft, 1
+	setmetatile 21, 22, METATILE_PokemonMansion_Barrier_Horizontal_TopMid, 1
+	setmetatile 22, 22, METATILE_PokemonMansion_Barrier_Horizontal_TopRight, 1
+	setmetatile 20, 23, METATILE_PokemonMansion_Barrier_Horizontal_BottomLeft_Basement, 1
+	setmetatile 21, 23, METATILE_PokemonMansion_Barrier_Horizontal_BottomMid_Basement, 1
+	setmetatile 22, 23, METATILE_PokemonMansion_Barrier_Horizontal_BottomRight_Basement, 1
+	setmetatile 24, 28, METATILE_PokemonMansion_Statue_BlackEyes_Basement, 0
+	setmetatile 27,  4, METATILE_PokemonMansion_Statue_BlackEyes_Basement, 0
 	return
diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h
new file mode 100644
index 000000000..c664290d5
--- /dev/null
+++ b/include/constants/metatile_labels.h
@@ -0,0 +1,37 @@
+#ifndef GUARD_METATILE_LABELS_H
+#define GUARD_METATILE_LABELS_H
+
+// Pokemon Mansion
+#define METATILE_PokemonMansion_Floor                                    0x284
+#define METATILE_PokemonMansion_Floor_ShadeFull                          0x285
+#define METATILE_PokemonMansion_BasementFloor                            0x286
+#define METATILE_PokemonMansion_BasementFloor_ShadeFull                  0x287
+#define METATILE_PokemonMansion_Wall_EndPost_Mid                         0x2A5
+#define METATILE_PokemonMansion_Wall_EndPost_Bottom                      0x2AD
+#define METATILE_PokemonMansion_Wall_EndCap_Basement                     0x2B0
+#define METATILE_PokemonMansion_Wall_EndCap                              0x2B5
+#define METATILE_PokemonMansion_Barrier_Horizontal_TopLeft               0x2F8
+#define METATILE_PokemonMansion_Barrier_Horizontal_TopMid                0x2F9
+#define METATILE_PokemonMansion_Barrier_Horizontal_TopRight              0x2FA
+#define METATILE_PokemonMansion_Barrier_Horizontal_BottomLeft            0x300
+#define METATILE_PokemonMansion_Barrier_Horizontal_BottomMid             0x301
+#define METATILE_PokemonMansion_Barrier_Horizontal_BottomRight           0x302
+#define METATILE_PokemonMansion_Barrier_Horizontal_BottomLeft_Basement   0x354
+#define METATILE_PokemonMansion_Barrier_Horizontal_BottomMid_Basement    0x355
+#define METATILE_PokemonMansion_Barrier_Horizontal_BottomRight_Basement  0x356
+#define METATILE_PokemonMansion_Barrier_Vertical_TopWall                 0x350
+#define METATILE_PokemonMansion_Barrier_Vertical_TopBase                 0x358
+#define METATILE_PokemonMansion_Barrier_Vertical_MidShadow               0x360
+#define METATILE_PokemonMansion_Barrier_Vertical_Mid                     0x368
+#define METATILE_PokemonMansion_Barrier_Vertical_Bottom                  0x370
+#define METATILE_PokemonMansion_Barrier_Vertical_MidShadow_Basement      0x362    
+#define METATILE_PokemonMansion_Barrier_Vertical_Mid_Basement            0x36A    
+#define METATILE_PokemonMansion_Barrier_Vertical_Bottom_Basement         0x372    
+#define METATILE_PokemonMansion_Statue_BlackEyes                         0x314
+#define METATILE_PokemonMansion_Statue_BlackEyes_Shade                   0x315
+#define METATILE_PokemonMansion_Statue_BlackEyes_Basement                0x316
+#define METATILE_PokemonMansion_Statue_RedEyes                           0x34D
+#define METATILE_PokemonMansion_Statue_RedEyes_Shade                     0x34E
+#define METATILE_PokemonMansion_Statue_RedEyes_Basement                  0x34F
+
+#endif // GUARD_METATILE_LABELS_H