Clean duplicate labels of map attributes

27 files changed, 37 insertions, 37 deletions

diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc
index 2761536b6..da9739789 100644
--- a/data/maps/FallarborTown_House1/header.inc
+++ b/data/maps/FallarborTown_House1/header.inc
@@ -1,5 +1,5 @@
 FallarborTown_House1:: @ 8305D40
-	.4byte House1_MapAttributes
+	.4byte House11_MapAttributes
 	.4byte FallarborTown_House1_MapEvents
 	.4byte FallarborTown_House1_MapScripts
 	.4byte 0x0
diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc
index 0366c201a..ff1949cf9 100644
--- a/data/maps/FallarborTown_House2/header.inc
+++ b/data/maps/FallarborTown_House2/header.inc
@@ -1,5 +1,5 @@
 FallarborTown_House2:: @ 8305D5C
-	.4byte House2_MapAttributes
+	.4byte House12_MapAttributes
 	.4byte FallarborTown_House2_MapEvents
 	.4byte FallarborTown_House2_MapScripts
 	.4byte 0x0
diff --git a/data/maps/House1/border.bin b/data/maps/House11/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/House1/border.bin
+++ b/data/maps/House11/border.bin
diff --git a/data/maps/House1/map.bin b/data/maps/House11/map.bin
index ea185484d..ea185484d 100644
--- a/data/maps/House1/map.bin
+++ b/data/maps/House11/map.bin
diff --git a/data/maps/House2/border.bin b/data/maps/House12/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/House2/border.bin
+++ b/data/maps/House12/border.bin
diff --git a/data/maps/House2/map.bin b/data/maps/House12/map.bin
index 0e9f07964..0e9f07964 100644
--- a/data/maps/House2/map.bin
+++ b/data/maps/House12/map.bin
diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc
index 5cfc8540b..f4246c98f 100644
--- a/data/maps/LilycoveCity_House1/header.inc
+++ b/data/maps/LilycoveCity_House1/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity_House1:: @ 830668C
-	.4byte House1_MapAttributes
+	.4byte House11_MapAttributes
 	.4byte LilycoveCity_House1_MapEvents
 	.4byte LilycoveCity_House1_MapScripts
 	.4byte 0x0
diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc
index 599e904d5..f1c7f73b7 100644
--- a/data/maps/LilycoveCity_House3/header.inc
+++ b/data/maps/LilycoveCity_House3/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity_House3:: @ 83066C4
-	.4byte House2_MapAttributes
+	.4byte House12_MapAttributes
 	.4byte LilycoveCity_House3_MapEvents
 	.4byte LilycoveCity_House3_MapScripts
 	.4byte 0x0
diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc
index d9cd2c7f0..47d5c21e7 100644
--- a/data/maps/LilycoveCity_House4/header.inc
+++ b/data/maps/LilycoveCity_House4/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity_House4:: @ 83066E0
-	.4byte House1_MapAttributes
+	.4byte House11_MapAttributes
 	.4byte LilycoveCity_House4_MapEvents
 	.4byte LilycoveCity_House4_MapScripts
 	.4byte 0x0
diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
index bcfc3435f..5f6798646 100644
--- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
@@ -1,5 +1,5 @@
 LilycoveCity_MoveDeletersHouse:: @ 8306670
-	.4byte House2_MapAttributes
+	.4byte House12_MapAttributes
 	.4byte LilycoveCity_MoveDeletersHouse_MapEvents
 	.4byte LilycoveCity_MoveDeletersHouse_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc
index 30c59da1e..e9acd83bd 100644
--- a/data/maps/MauvilleCity_House1/header.inc
+++ b/data/maps/MauvilleCity_House1/header.inc
@@ -1,5 +1,5 @@
 MauvilleCity_House1:: @ 8306184
-	.4byte House2_MapAttributes
+	.4byte House12_MapAttributes
 	.4byte MauvilleCity_House1_MapEvents
 	.4byte MauvilleCity_House1_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc
index 9bd7d9c11..37a434405 100644
--- a/data/maps/MauvilleCity_House2/header.inc
+++ b/data/maps/MauvilleCity_House2/header.inc
@@ -1,5 +1,5 @@
 MauvilleCity_House2:: @ 83061BC
-	.4byte House1_MapAttributes
+	.4byte House11_MapAttributes
 	.4byte MauvilleCity_House2_MapEvents
 	.4byte MauvilleCity_House2_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc
index 70f681e7a..5fd23c8ec 100644
--- a/data/maps/MossdeepCity_House1/header.inc
+++ b/data/maps/MossdeepCity_House1/header.inc
@@ -1,5 +1,5 @@
 MossdeepCity_House1:: @ 83067DC
-	.4byte House2_MapAttributes
+	.4byte House12_MapAttributes
 	.4byte MossdeepCity_House1_MapEvents
 	.4byte MossdeepCity_House1_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc
index 62bd6bdec..99140eaa7 100644
--- a/data/maps/MossdeepCity_House2/header.inc
+++ b/data/maps/MossdeepCity_House2/header.inc
@@ -1,5 +1,5 @@
 MossdeepCity_House2:: @ 83067F8
-	.4byte House1_MapAttributes
+	.4byte House11_MapAttributes
 	.4byte MossdeepCity_House2_MapEvents
 	.4byte MossdeepCity_House2_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc
index 54c6641b6..382f165a4 100644
--- a/data/maps/MossdeepCity_House3/header.inc
+++ b/data/maps/MossdeepCity_House3/header.inc
@@ -1,5 +1,5 @@
 MossdeepCity_House3:: @ 8306868
-	.4byte House2_MapAttributes
+	.4byte House12_MapAttributes
 	.4byte MossdeepCity_House3_MapEvents
 	.4byte MossdeepCity_House3_MapScripts
 	.4byte 0x0
diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc
index 550ff5a75..530a0e763 100644
--- a/data/maps/OldaleTown_House1/header.inc
+++ b/data/maps/OldaleTown_House1/header.inc
@@ -1,5 +1,5 @@
 OldaleTown_House1:: @ 8305ABC
-	.4byte House1_MapAttributes
+	.4byte House11_MapAttributes
 	.4byte OldaleTown_House1_MapEvents
 	.4byte OldaleTown_House1_MapScripts
 	.4byte 0x0
diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc
index eb1660cf9..2214fbfaf 100644
--- a/data/maps/OldaleTown_House2/header.inc
+++ b/data/maps/OldaleTown_House2/header.inc
@@ -1,5 +1,5 @@
 OldaleTown_House2:: @ 8305AD8
-	.4byte House2_MapAttributes
+	.4byte House12_MapAttributes
 	.4byte OldaleTown_House2_MapEvents
 	.4byte OldaleTown_House2_MapScripts
 	.4byte 0x0
diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc
index e1f5c1f63..4fe3dfdbc 100644
--- a/data/maps/PetalburgCity_House1/header.inc
+++ b/data/maps/PetalburgCity_House1/header.inc
@@ -1,5 +1,5 @@
 PetalburgCity_House1:: @ 8305F54
-	.4byte House1_MapAttributes
+	.4byte House11_MapAttributes
 	.4byte PetalburgCity_House1_MapEvents
 	.4byte PetalburgCity_House1_MapScripts
 	.4byte 0x0
diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc
index e16ac5a7f..47fb229ba 100644
--- a/data/maps/PetalburgCity_WallysHouse/header.inc
+++ b/data/maps/PetalburgCity_WallysHouse/header.inc
@@ -1,5 +1,5 @@
 PetalburgCity_WallysHouse:: @ 8305F1C
-	.4byte House2_MapAttributes
+	.4byte House12_MapAttributes
 	.4byte PetalburgCity_WallysHouse_MapEvents
 	.4byte PetalburgCity_WallysHouse_MapScripts
 	.4byte 0x0
diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc
index d7333f070..32fbca9a0 100644
--- a/data/maps/Route111_WinstrateFamilysHouse/header.inc
+++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc
@@ -1,5 +1,5 @@
 Route111_WinstrateFamilysHouse:: @ 8306C58
-	.4byte House2_MapAttributes
+	.4byte House12_MapAttributes
 	.4byte Route111_WinstrateFamilysHouse_MapEvents
 	.4byte Route111_WinstrateFamilysHouse_MapScripts
 	.4byte 0x0
diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc
index d64c4b804..2a14f5292 100644
--- a/data/maps/Route119_House/header.inc
+++ b/data/maps/Route119_House/header.inc
@@ -1,5 +1,5 @@
 Route119_House:: @ 8307F28
-	.4byte House1_MapAttributes
+	.4byte House11_MapAttributes
 	.4byte Route119_House_MapEvents
 	.4byte Route119_House_MapScripts
 	.4byte 0x0
diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc
index 0eb77ca2e..11501e733 100644
--- a/data/maps/Route123_BerryMastersHouse/header.inc
+++ b/data/maps/Route123_BerryMastersHouse/header.inc
@@ -1,5 +1,5 @@
 Route123_BerryMastersHouse:: @ 8307ED4
-	.4byte House2_MapAttributes
+	.4byte House12_MapAttributes
 	.4byte Route123_BerryMastersHouse_MapEvents
 	.4byte Route123_BerryMastersHouse_MapScripts
 	.4byte 0x0
diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc
index 00b9399a3..a5df54962 100644
--- a/data/maps/SlateportCity_House2/header.inc
+++ b/data/maps/SlateportCity_House2/header.inc
@@ -1,5 +1,5 @@
 SlateportCity_House2:: @ 83060DC
-	.4byte House2_MapAttributes
+	.4byte House12_MapAttributes
 	.4byte SlateportCity_House2_MapEvents
 	.4byte SlateportCity_House2_MapScripts
 	.4byte 0x0
diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
index f1aae5a19..7b0ab4ad0 100644
--- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
@@ -1,5 +1,5 @@
 VerdanturfTown_FriendshipRatersHouse:: @ 8305E20
-	.4byte House2_MapAttributes
+	.4byte House12_MapAttributes
 	.4byte VerdanturfTown_FriendshipRatersHouse_MapEvents
 	.4byte VerdanturfTown_FriendshipRatersHouse_MapScripts
 	.4byte 0x0
diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc
index e81adee1b..0e29f4ea6 100644
--- a/data/maps/VerdanturfTown_House/header.inc
+++ b/data/maps/VerdanturfTown_House/header.inc
@@ -1,5 +1,5 @@
 VerdanturfTown_House:: @ 8305E3C
-	.4byte House1_MapAttributes
+	.4byte House11_MapAttributes
 	.4byte VerdanturfTown_House_MapEvents
 	.4byte VerdanturfTown_House_MapScripts
 	.4byte 0x0
diff --git a/data/maps/_assets.inc b/data/maps/_assets.inc
index a9cc15869..af4092f99 100644
--- a/data/maps/_assets.inc
+++ b/data/maps/_assets.inc
@@ -868,33 +868,33 @@ LittlerootTown_ProfessorBirchsLab_MapAttributes:: @ 82CDEA8
 	.4byte gTileset_Building
 	.4byte gTileset_Lab
 
-House1_MapBorder:: @ 82CDEC0
-	.incbin "data/maps/House1/border.bin"
+House11_MapBorder:: @ 82CDEC0
+	.incbin "data/maps/House11/border.bin"
 
-House1_MapBlockdata:: @ 82CDEC8
-	.incbin "data/maps/House1/map.bin"
+House11_MapBlockdata:: @ 82CDEC8
+	.incbin "data/maps/House11/map.bin"
 
 	.align 2
-House1_MapAttributes:: @ 82CDF7C
+House11_MapAttributes:: @ 82CDF7C
 	.4byte 0xa
 	.4byte 0x9
-	.4byte House1_MapBorder
-	.4byte House1_MapBlockdata
+	.4byte House11_MapBorder
+	.4byte House11_MapBlockdata
 	.4byte gTileset_Building
 	.4byte gTileset_GenericBuilding
 
-House2_MapBorder:: @ 82CDF94
-	.incbin "data/maps/House2/border.bin"
+House12_MapBorder:: @ 82CDF94
+	.incbin "data/maps/House12/border.bin"
 
-House2_MapBlockdata:: @ 82CDF9C
-	.incbin "data/maps/House2/map.bin"
+House12_MapBlockdata:: @ 82CDF9C
+	.incbin "data/maps/House12/map.bin"
 
 	.align 2
-House2_MapAttributes:: @ 82CE04C
+House12_MapAttributes:: @ 82CE04C
 	.4byte 0xb
 	.4byte 0x8
-	.4byte House2_MapBorder
-	.4byte House2_MapBlockdata
+	.4byte House12_MapBorder
+	.4byte House12_MapBlockdata
 	.4byte gTileset_Building
 	.4byte gTileset_GenericBuilding
 
diff --git a/data/maps/attributes_table.inc b/data/maps/attributes_table.inc
index 41b0df228..241efb9a6 100644
--- a/data/maps/attributes_table.inc
+++ b/data/maps/attributes_table.inc
@@ -58,8 +58,8 @@ gMapAttributes:: @ 8304F18
 	.4byte LittlerootTown_MaysHouse_1F_MapAttributes
 	.4byte LittlerootTown_MaysHouse_2F_MapAttributes
 	.4byte LittlerootTown_ProfessorBirchsLab_MapAttributes
-	.4byte House1_MapAttributes
-	.4byte House2_MapAttributes
+	.4byte House11_MapAttributes
+	.4byte House12_MapAttributes
 	.4byte PokemonCenter_1F_MapAttributes
 	.4byte PokemonCenter_2F_MapAttributes
 	.4byte PokeMart_MapAttributes