From 03cdcce8c428ed4f0ffa6f377a8c5eb9b3a2a085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
Date: Fri, 21 Oct 2022 13:35:26 +0100
Subject: [PATCH] merge namespace hbm

---
 asm/src/DisableIcon_80406310.s                |   4 -
 asm/src/DisableIcon_8055d208.s                |  10 --
 asm/src/DisableIcon_8055f7b8.s                |  44 -----
 asm/src/HomeButtonMenu_80456920.s             |  10 --
 asm/src/HomeButtonMenu_80556e30.s             |  32 ----
 asm/src/HomeButtonMenu_8055f7e0.s             |  68 --------
 asm/src/ResourceFileName_8019d834.s           |  39 -----
 asm/src/ResourceFileName_80456930.s           |  74 --------
 asm/src/ResourceFileName_80556e48.s           |  28 ---
 asm/src/ResourceFileName_8055f818.s           |  18 --
 .../DisableIcon.s}                            |  58 +++++++
 .../DisableIconResource.s}                    |   0
 .../HomeButtonMenu.s}                         | 110 ++++++++++++
 .../{Resource_8019d5d8.s => hbm/Resource.s}   |   0
 asm/src/hbm/ResourceFileName.s                | 159 ++++++++++++++++++
 obj_files.mk                                  |  20 +--
 16 files changed, 333 insertions(+), 341 deletions(-)
 delete mode 100644 asm/src/DisableIcon_80406310.s
 delete mode 100644 asm/src/DisableIcon_8055d208.s
 delete mode 100644 asm/src/DisableIcon_8055f7b8.s
 delete mode 100644 asm/src/HomeButtonMenu_80456920.s
 delete mode 100644 asm/src/HomeButtonMenu_80556e30.s
 delete mode 100644 asm/src/HomeButtonMenu_8055f7e0.s
 delete mode 100644 asm/src/ResourceFileName_8019d834.s
 delete mode 100644 asm/src/ResourceFileName_80456930.s
 delete mode 100644 asm/src/ResourceFileName_80556e48.s
 delete mode 100644 asm/src/ResourceFileName_8055f818.s
 rename asm/src/{DisableIcon_8019c158.s => hbm/DisableIcon.s} (90%)
 rename asm/src/{DisableIconResource_80455060.s => hbm/DisableIconResource.s} (100%)
 rename asm/src/{HomeButtonMenu_8019c390.s => hbm/HomeButtonMenu.s} (97%)
 rename asm/src/{Resource_8019d5d8.s => hbm/Resource.s} (100%)
 create mode 100644 asm/src/hbm/ResourceFileName.s

diff --git a/asm/src/DisableIcon_80406310.s b/asm/src/DisableIcon_80406310.s
deleted file mode 100644
index f5ac74b2..00000000
--- a/asm/src/DisableIcon_80406310.s
+++ /dev/null
@@ -1,4 +0,0 @@
-.include "macros.inc"
-
-.section .ctors, "wa"  # 0x80406260 - 0x80406540 ; 0x000002E0
-	.4byte "__sinit_@@1DisableIcon_cpp"
diff --git a/asm/src/DisableIcon_8055d208.s b/asm/src/DisableIcon_8055d208.s
deleted file mode 100644
index 089a4892..00000000
--- a/asm/src/DisableIcon_8055d208.s
+++ /dev/null
@@ -1,10 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global "DISABLE_ICON_POS_4x3__25@unnamed@DisableIcon_cpp@"
-"DISABLE_ICON_POS_4x3__25@unnamed@DisableIcon_cpp@":
-	.skip 0x8
-
-.global "DISABLE_ICON_POS_16x9__25@unnamed@DisableIcon_cpp@"
-"DISABLE_ICON_POS_16x9__25@unnamed@DisableIcon_cpp@":
-	.skip 0x8
diff --git a/asm/src/DisableIcon_8055f7b8.s b/asm/src/DisableIcon_8055f7b8.s
deleted file mode 100644
index 32625c22..00000000
--- a/asm/src/DisableIcon_8055f7b8.s
+++ /dev/null
@@ -1,44 +0,0 @@
-.include "macros.inc"
-
-.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
-.global "@50030"
-"@50030":
-
-	.4byte 0x41700000
-
-.global "@50031"
-"@50031":
-
-	.4byte 0x437F0000
-
-.global "@50032"
-"@50032":
-
-	.4byte 0x3F800000
-	.4byte 0
-
-.global "@50035"
-"@50035":
-
-	.4byte 0x43300000
-	.4byte 0
-
-.global "@50056"
-"@50056":
-
-	.4byte 0xC35C0000
-
-.global "@50057"
-"@50057":
-
-	.4byte 0x42D20000
-
-.global "@50058"
-"@50058":
-
-	.4byte 0xC39E0000
-
-.global "@50059"
-"@50059":
-
-	.4byte 0x430C0000
diff --git a/asm/src/HomeButtonMenu_80456920.s b/asm/src/HomeButtonMenu_80456920.s
deleted file mode 100644
index 2eabec82..00000000
--- a/asm/src/HomeButtonMenu_80456920.s
+++ /dev/null
@@ -1,10 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global "@52296_80456920"
-"@52296_80456920":
-
-	.4byte 0x486F6D65
-	.4byte 0x42746E57
-	.4byte 0x6F726B00
-	.4byte 0
diff --git a/asm/src/HomeButtonMenu_80556e30.s b/asm/src/HomeButtonMenu_80556e30.s
deleted file mode 100644
index 19ea39a4..00000000
--- a/asm/src/HomeButtonMenu_80556e30.s
+++ /dev/null
@@ -1,32 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global "@50553_80556E30"
-"@50553_80556E30":
-
-	.4byte 0x3F800000
-
-.global "@50554_80556E34"
-"@50554_80556E34":
-
-	.4byte 0x3F800000
-
-.global "@50559_80556E38"
-"@50559_80556E38":
-
-	.4byte 0x3F800000
-
-.global "@50561_80556E3C"
-"@50561_80556E3C":
-
-	.4byte 0x3F800000
-
-.global "@50606_80556E40"
-"@50606_80556E40":
-
-	.4byte 0x3F800000
-
-.global "@50607_80556E44"
-"@50607_80556E44":
-
-	.4byte 0x3F800000
diff --git a/asm/src/HomeButtonMenu_8055f7e0.s b/asm/src/HomeButtonMenu_8055f7e0.s
deleted file mode 100644
index e99f1c4d..00000000
--- a/asm/src/HomeButtonMenu_8055f7e0.s
+++ /dev/null
@@ -1,68 +0,0 @@
-.include "macros.inc"
-
-.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
-.global "@50642_8055F7E0"
-"@50642_8055F7E0":
-
-	.4byte 0x808080FF
-
-.global "@52357"
-"@52357":
-
-	.4byte 0x3FAF286C
-
-.global "@52358_8055F7E8"
-"@52358_8055F7E8":
-
-	.4byte 0x3F800000
-
-.global "@52383"
-"@52383":
-
-	.4byte 0
-
-.global "@52536"
-"@52536":
-
-	.4byte 0x44200000
-
-.global "@52537"
-"@52537":
-
-	.4byte 0x43E40000
-
-.global "@52538"
-"@52538":
-
-	.4byte 0x44180000
-
-.global "@52539"
-"@52539":
-
-	.4byte 0x44500000
-
-.global "@52540_8055F800"
-"@52540_8055F800":
-
-	.4byte 0x3F000000
-
-.global "@52541_8055F804"
-"@52541_8055F804":
-
-	.4byte 0x43FA0000
-
-.global "@52594_8055F808"
-"@52594_8055F808":
-
-	.4byte 0x3D100000
-
-.global "@52595_8055F80C"
-"@52595_8055F80C":
-
-	.4byte 0x3CCBA511
-
-.global "@52596_8055F810"
-"@52596_8055F810":
-
-	.4byte 0x41E38E39
-	.4byte 0
diff --git a/asm/src/ResourceFileName_8019d834.s b/asm/src/ResourceFileName_8019d834.s
deleted file mode 100644
index 02442a90..00000000
--- a/asm/src/ResourceFileName_8019d834.s
+++ /dev/null
@@ -1,39 +0,0 @@
-.include "macros.inc"
-
-.section .text, "ax"  # 0x80006A00 - 0x80406260 ; 0x003FF860
-.global GetLayoutFileName__Q23hbm16ResourceFileNameFUc
-GetLayoutFileName__Q23hbm16ResourceFileNameFUc:
-/* 8019D834 00199674  54 60 06 3E */	clrlwi r0, r3, 24
-/* 8019D838 00199678  2C 00 00 01 */	cmpwi r0, 0x1
-/* 8019D83C 0019967C  41 82 00 18 */	beq lbl_8019D854
-/* 8019D840 00199680  2C 00 00 03 */	cmpwi r0, 0x3
-/* 8019D844 00199684  41 82 00 18 */	beq lbl_8019D85C
-/* 8019D848 00199688  2C 00 00 04 */	cmpwi r0, 0x4
-/* 8019D84C 0019968C  41 82 00 18 */	beq lbl_8019D864
-/* 8019D850 00199690  48 00 00 1C */	b lbl_8019D86C
-.global lbl_8019D854
-lbl_8019D854:
-/* 8019D854 00199694  80 6D 8A 28 */	lwz r3, "LAYOUT_ENG_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@"@sda21(r13)
-/* 8019D858 00199698  4E 80 00 20 */	blr
-.global lbl_8019D85C
-lbl_8019D85C:
-/* 8019D85C 0019969C  80 6D 8A 2C */	lwz r3, "LAYOUT_FRA_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@"@sda21(r13)
-/* 8019D860 001996A0  4E 80 00 20 */	blr
-.global lbl_8019D864
-lbl_8019D864:
-/* 8019D864 001996A4  80 6D 8A 30 */	lwz r3, "LAYOUT_SPA_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@"@sda21(r13)
-/* 8019D868 001996A8  4E 80 00 20 */	blr
-.global lbl_8019D86C
-lbl_8019D86C:
-/* 8019D86C 001996AC  80 6D 8A 28 */	lwz r3, "LAYOUT_ENG_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@"@sda21(r13)
-/* 8019D870 001996B0  4E 80 00 20 */	blr
-.global GetMessageFileName__Q23hbm16ResourceFileNameFb
-GetMessageFileName__Q23hbm16ResourceFileNameFb:
-/* 8019D874 001996B4  2C 03 00 00 */	cmpwi r3, 0x0
-/* 8019D878 001996B8  41 82 00 0C */	beq lbl_8019D884
-/* 8019D87C 001996BC  80 6D 8A 38 */	lwz r3, "MESSAGE_WARNING_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@"@sda21(r13)
-/* 8019D880 001996C0  4E 80 00 20 */	blr
-.global lbl_8019D884
-lbl_8019D884:
-/* 8019D884 001996C4  80 6D 8A 34 */	lwz r3, "MESSAGE_NORMAL_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@"@sda21(r13)
-/* 8019D888 001996C8  4E 80 00 20 */	blr
diff --git a/asm/src/ResourceFileName_80456930.s b/asm/src/ResourceFileName_80456930.s
deleted file mode 100644
index 84c8cc59..00000000
--- a/asm/src/ResourceFileName_80456930.s
+++ /dev/null
@@ -1,74 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global "@48726_80456930"
-"@48726_80456930":
-
-	.4byte 0x68626D2F
-	.4byte 0x686F6D65
-	.4byte 0x42746E5F
-	.4byte 0x454E472E
-	.4byte 0x61726300
-
-.global "@48728_80456944"
-"@48728_80456944":
-
-	.4byte 0x68626D2F
-	.4byte 0x686F6D65
-	.4byte 0x42746E5F
-	.4byte 0x4652412E
-	.4byte 0x61726300
-
-.global "@48729_80456958"
-"@48729_80456958":
-
-	.4byte 0x68626D2F
-	.4byte 0x686F6D65
-	.4byte 0x42746E5F
-	.4byte 0x5350412E
-	.4byte 0x61726300
-
-.global "@48732_8045696C"
-"@48732_8045696C":
-
-	.4byte 0x68626D2F
-	.4byte 0x686F6D65
-	.4byte 0x5F6E6F73
-	.4byte 0x6176652E
-	.4byte 0x63737600
-
-.global "@48733_80456980"
-"@48733_80456980":
-
-	.4byte 0x68626D2F
-	.4byte 0x686F6D65
-	.4byte 0x2E637376
-	.4byte 0
-
-.global "@48734_80456990"
-"@48734_80456990":
-
-	.4byte 0x68626D2F
-	.4byte 0x636F6E66
-	.4byte 0x69672E74
-	.4byte 0x78740000
-
-.global "@48735_804569A0"
-"@48735_804569A0":
-
-	.4byte 0x68626D2F
-	.4byte 0x53706561
-	.4byte 0x6B657253
-	.4byte 0x652E6172
-	.4byte 0x63000000
-
-.global "@48736_804569B4"
-"@48736_804569B4":
-
-	.4byte 0x68626D2F
-	.4byte 0x486F6D65
-	.4byte 0x42757474
-	.4byte 0x6F6E5365
-	.4byte 0x2E617263
-	.4byte 0
-	.4byte 0
diff --git a/asm/src/ResourceFileName_80556e48.s b/asm/src/ResourceFileName_80556e48.s
deleted file mode 100644
index f1cc410b..00000000
--- a/asm/src/ResourceFileName_80556e48.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global "LAYOUT_ENG_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@"
-"LAYOUT_ENG_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@":
-
-	.4byte "@48726_80456930"
-
-.global "LAYOUT_FRA_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@"
-"LAYOUT_FRA_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@":
-
-	.4byte "@48728_80456944"
-
-.global "LAYOUT_SPA_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@"
-"LAYOUT_SPA_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@":
-
-	.4byte "@48729_80456958"
-
-.global "MESSAGE_NORMAL_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@"
-"MESSAGE_NORMAL_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@":
-
-	.4byte "@48732_8045696C"
-
-.global "MESSAGE_WARNING_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@"
-"MESSAGE_WARNING_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@":
-
-	.4byte "@48733_80456980"
-	.4byte 0
diff --git a/asm/src/ResourceFileName_8055f818.s b/asm/src/ResourceFileName_8055f818.s
deleted file mode 100644
index d7c1fd76..00000000
--- a/asm/src/ResourceFileName_8055f818.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.include "macros.inc"
-
-.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
-.global CONFIG_FILENAME__Q23hbm16ResourceFileName
-CONFIG_FILENAME__Q23hbm16ResourceFileName:
-
-	.4byte "@48734_80456990"
-
-.global SPEAKER_SE_FILENAME__Q23hbm16ResourceFileName
-SPEAKER_SE_FILENAME__Q23hbm16ResourceFileName:
-
-	.4byte "@48735_804569A0"
-
-.global SE_FILENAME__Q23hbm16ResourceFileName
-SE_FILENAME__Q23hbm16ResourceFileName:
-
-	.4byte "@48736_804569B4"
-	.4byte 0
diff --git a/asm/src/DisableIcon_8019c158.s b/asm/src/hbm/DisableIcon.s
similarity index 90%
rename from asm/src/DisableIcon_8019c158.s
rename to asm/src/hbm/DisableIcon.s
index 0983ff02..1ae21bb9 100644
--- a/asm/src/DisableIcon_8019c158.s
+++ b/asm/src/hbm/DisableIcon.s
@@ -168,3 +168,61 @@ forceEndAnim__Q23hbm11DisableIconFv:
 /* 8019C384 001981C4  7C 08 03 A6 */	mtlr r0
 /* 8019C388 001981C8  38 21 00 10 */	addi r1, r1, 0x10
 /* 8019C38C 001981CC  4E 80 00 20 */	blr
+.include "macros.inc"
+
+.section .ctors, "wa"  # 0x80406260 - 0x80406540 ; 0x000002E0
+	.4byte "__sinit_@@1DisableIcon_cpp"
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global "DISABLE_ICON_POS_4x3__25@unnamed@DisableIcon_cpp@"
+"DISABLE_ICON_POS_4x3__25@unnamed@DisableIcon_cpp@":
+	.skip 0x8
+
+.global "DISABLE_ICON_POS_16x9__25@unnamed@DisableIcon_cpp@"
+"DISABLE_ICON_POS_16x9__25@unnamed@DisableIcon_cpp@":
+	.skip 0x8
+.include "macros.inc"
+
+.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
+.global "@50030"
+"@50030":
+
+	.4byte 0x41700000
+
+.global "@50031"
+"@50031":
+
+	.4byte 0x437F0000
+
+.global "@50032"
+"@50032":
+
+	.4byte 0x3F800000
+	.4byte 0
+
+.global "@50035"
+"@50035":
+
+	.4byte 0x43300000
+	.4byte 0
+
+.global "@50056"
+"@50056":
+
+	.4byte 0xC35C0000
+
+.global "@50057"
+"@50057":
+
+	.4byte 0x42D20000
+
+.global "@50058"
+"@50058":
+
+	.4byte 0xC39E0000
+
+.global "@50059"
+"@50059":
+
+	.4byte 0x430C0000
diff --git a/asm/src/DisableIconResource_80455060.s b/asm/src/hbm/DisableIconResource.s
similarity index 100%
rename from asm/src/DisableIconResource_80455060.s
rename to asm/src/hbm/DisableIconResource.s
diff --git a/asm/src/HomeButtonMenu_8019c390.s b/asm/src/hbm/HomeButtonMenu.s
similarity index 97%
rename from asm/src/HomeButtonMenu_8019c390.s
rename to asm/src/hbm/HomeButtonMenu.s
index 96902217..f3762136 100644
--- a/asm/src/HomeButtonMenu_8019c390.s
+++ b/asm/src/hbm/HomeButtonMenu.s
@@ -1341,3 +1341,113 @@ lbl_8019D5C0:
 /* 8019D5CC 0019940C  7C 08 03 A6 */	mtlr r0
 /* 8019D5D0 00199410  38 21 00 30 */	addi r1, r1, 0x30
 /* 8019D5D4 00199414  4E 80 00 20 */	blr
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global "@52296_80456920"
+"@52296_80456920":
+
+	.4byte 0x486F6D65
+	.4byte 0x42746E57
+	.4byte 0x6F726B00
+	.4byte 0
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global "@50553_80556E30"
+"@50553_80556E30":
+
+	.4byte 0x3F800000
+
+.global "@50554_80556E34"
+"@50554_80556E34":
+
+	.4byte 0x3F800000
+
+.global "@50559_80556E38"
+"@50559_80556E38":
+
+	.4byte 0x3F800000
+
+.global "@50561_80556E3C"
+"@50561_80556E3C":
+
+	.4byte 0x3F800000
+
+.global "@50606_80556E40"
+"@50606_80556E40":
+
+	.4byte 0x3F800000
+
+.global "@50607_80556E44"
+"@50607_80556E44":
+
+	.4byte 0x3F800000
+.include "macros.inc"
+
+.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
+.global "@50642_8055F7E0"
+"@50642_8055F7E0":
+
+	.4byte 0x808080FF
+
+.global "@52357"
+"@52357":
+
+	.4byte 0x3FAF286C
+
+.global "@52358_8055F7E8"
+"@52358_8055F7E8":
+
+	.4byte 0x3F800000
+
+.global "@52383"
+"@52383":
+
+	.4byte 0
+
+.global "@52536"
+"@52536":
+
+	.4byte 0x44200000
+
+.global "@52537"
+"@52537":
+
+	.4byte 0x43E40000
+
+.global "@52538"
+"@52538":
+
+	.4byte 0x44180000
+
+.global "@52539"
+"@52539":
+
+	.4byte 0x44500000
+
+.global "@52540_8055F800"
+"@52540_8055F800":
+
+	.4byte 0x3F000000
+
+.global "@52541_8055F804"
+"@52541_8055F804":
+
+	.4byte 0x43FA0000
+
+.global "@52594_8055F808"
+"@52594_8055F808":
+
+	.4byte 0x3D100000
+
+.global "@52595_8055F80C"
+"@52595_8055F80C":
+
+	.4byte 0x3CCBA511
+
+.global "@52596_8055F810"
+"@52596_8055F810":
+
+	.4byte 0x41E38E39
+	.4byte 0
diff --git a/asm/src/Resource_8019d5d8.s b/asm/src/hbm/Resource.s
similarity index 100%
rename from asm/src/Resource_8019d5d8.s
rename to asm/src/hbm/Resource.s
diff --git a/asm/src/hbm/ResourceFileName.s b/asm/src/hbm/ResourceFileName.s
new file mode 100644
index 00000000..327e60ce
--- /dev/null
+++ b/asm/src/hbm/ResourceFileName.s
@@ -0,0 +1,159 @@
+.include "macros.inc"
+
+.section .text, "ax"  # 0x80006A00 - 0x80406260 ; 0x003FF860
+.global GetLayoutFileName__Q23hbm16ResourceFileNameFUc
+GetLayoutFileName__Q23hbm16ResourceFileNameFUc:
+/* 8019D834 00199674  54 60 06 3E */	clrlwi r0, r3, 24
+/* 8019D838 00199678  2C 00 00 01 */	cmpwi r0, 0x1
+/* 8019D83C 0019967C  41 82 00 18 */	beq lbl_8019D854
+/* 8019D840 00199680  2C 00 00 03 */	cmpwi r0, 0x3
+/* 8019D844 00199684  41 82 00 18 */	beq lbl_8019D85C
+/* 8019D848 00199688  2C 00 00 04 */	cmpwi r0, 0x4
+/* 8019D84C 0019968C  41 82 00 18 */	beq lbl_8019D864
+/* 8019D850 00199690  48 00 00 1C */	b lbl_8019D86C
+.global lbl_8019D854
+lbl_8019D854:
+/* 8019D854 00199694  80 6D 8A 28 */	lwz r3, "LAYOUT_ENG_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@"@sda21(r13)
+/* 8019D858 00199698  4E 80 00 20 */	blr
+.global lbl_8019D85C
+lbl_8019D85C:
+/* 8019D85C 0019969C  80 6D 8A 2C */	lwz r3, "LAYOUT_FRA_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@"@sda21(r13)
+/* 8019D860 001996A0  4E 80 00 20 */	blr
+.global lbl_8019D864
+lbl_8019D864:
+/* 8019D864 001996A4  80 6D 8A 30 */	lwz r3, "LAYOUT_SPA_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@"@sda21(r13)
+/* 8019D868 001996A8  4E 80 00 20 */	blr
+.global lbl_8019D86C
+lbl_8019D86C:
+/* 8019D86C 001996AC  80 6D 8A 28 */	lwz r3, "LAYOUT_ENG_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@"@sda21(r13)
+/* 8019D870 001996B0  4E 80 00 20 */	blr
+.global GetMessageFileName__Q23hbm16ResourceFileNameFb
+GetMessageFileName__Q23hbm16ResourceFileNameFb:
+/* 8019D874 001996B4  2C 03 00 00 */	cmpwi r3, 0x0
+/* 8019D878 001996B8  41 82 00 0C */	beq lbl_8019D884
+/* 8019D87C 001996BC  80 6D 8A 38 */	lwz r3, "MESSAGE_WARNING_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@"@sda21(r13)
+/* 8019D880 001996C0  4E 80 00 20 */	blr
+.global lbl_8019D884
+lbl_8019D884:
+/* 8019D884 001996C4  80 6D 8A 34 */	lwz r3, "MESSAGE_NORMAL_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@"@sda21(r13)
+/* 8019D888 001996C8  4E 80 00 20 */	blr
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global "@48726_80456930"
+"@48726_80456930":
+
+	.4byte 0x68626D2F
+	.4byte 0x686F6D65
+	.4byte 0x42746E5F
+	.4byte 0x454E472E
+	.4byte 0x61726300
+
+.global "@48728_80456944"
+"@48728_80456944":
+
+	.4byte 0x68626D2F
+	.4byte 0x686F6D65
+	.4byte 0x42746E5F
+	.4byte 0x4652412E
+	.4byte 0x61726300
+
+.global "@48729_80456958"
+"@48729_80456958":
+
+	.4byte 0x68626D2F
+	.4byte 0x686F6D65
+	.4byte 0x42746E5F
+	.4byte 0x5350412E
+	.4byte 0x61726300
+
+.global "@48732_8045696C"
+"@48732_8045696C":
+
+	.4byte 0x68626D2F
+	.4byte 0x686F6D65
+	.4byte 0x5F6E6F73
+	.4byte 0x6176652E
+	.4byte 0x63737600
+
+.global "@48733_80456980"
+"@48733_80456980":
+
+	.4byte 0x68626D2F
+	.4byte 0x686F6D65
+	.4byte 0x2E637376
+	.4byte 0
+
+.global "@48734_80456990"
+"@48734_80456990":
+
+	.4byte 0x68626D2F
+	.4byte 0x636F6E66
+	.4byte 0x69672E74
+	.4byte 0x78740000
+
+.global "@48735_804569A0"
+"@48735_804569A0":
+
+	.4byte 0x68626D2F
+	.4byte 0x53706561
+	.4byte 0x6B657253
+	.4byte 0x652E6172
+	.4byte 0x63000000
+
+.global "@48736_804569B4"
+"@48736_804569B4":
+
+	.4byte 0x68626D2F
+	.4byte 0x486F6D65
+	.4byte 0x42757474
+	.4byte 0x6F6E5365
+	.4byte 0x2E617263
+	.4byte 0
+	.4byte 0
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global "LAYOUT_ENG_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@"
+"LAYOUT_ENG_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@":
+
+	.4byte "@48726_80456930"
+
+.global "LAYOUT_FRA_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@"
+"LAYOUT_FRA_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@":
+
+	.4byte "@48728_80456944"
+
+.global "LAYOUT_SPA_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@"
+"LAYOUT_SPA_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@":
+
+	.4byte "@48729_80456958"
+
+.global "MESSAGE_NORMAL_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@"
+"MESSAGE_NORMAL_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@":
+
+	.4byte "@48732_8045696C"
+
+.global "MESSAGE_WARNING_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@"
+"MESSAGE_WARNING_FILENAME__Q23hbm30@unnamed@ResourceFileName_cpp@":
+
+	.4byte "@48733_80456980"
+	.4byte 0
+.include "macros.inc"
+
+.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
+.global CONFIG_FILENAME__Q23hbm16ResourceFileName
+CONFIG_FILENAME__Q23hbm16ResourceFileName:
+
+	.4byte "@48734_80456990"
+
+.global SPEAKER_SE_FILENAME__Q23hbm16ResourceFileName
+SPEAKER_SE_FILENAME__Q23hbm16ResourceFileName:
+
+	.4byte "@48735_804569A0"
+
+.global SE_FILENAME__Q23hbm16ResourceFileName
+SE_FILENAME__Q23hbm16ResourceFileName:
+
+	.4byte "@48736_804569B4"
+	.4byte 0
diff --git a/obj_files.mk b/obj_files.mk
index 271790cb..c65c5f3e 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -804,12 +804,14 @@ $(BUILD_DIR)/asm/src/gobj/Script.o \
 $(BUILD_DIR)/asm/src/gobj/Target.o \
 $(BUILD_DIR)/asm/src/gobj/TargetDesc.o \
 \
+$(BUILD_DIR)/asm/src/hbm/DisableIcon.o \
+$(BUILD_DIR)/asm/src/hbm/DisableIconResource.o \
+$(BUILD_DIR)/asm/src/hbm/HomeButtonMenu.o \
+$(BUILD_DIR)/asm/src/hbm/Resource.o \
+$(BUILD_DIR)/asm/src/hbm/ResourceFileName.o \
+\
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
-$(BUILD_DIR)/asm/src/DisableIcon_8019c158.o \
-$(BUILD_DIR)/asm/src/HomeButtonMenu_8019c390.o \
-$(BUILD_DIR)/asm/src/Resource_8019d5d8.o \
-$(BUILD_DIR)/asm/src/ResourceFileName_8019d834.o \
 $(BUILD_DIR)/asm/src/Color_8019d88c.o \
 $(BUILD_DIR)/asm/src/FixedString_8019d994.o \
 $(BUILD_DIR)/asm/src/Locale_8019da54.o \
@@ -2939,7 +2941,6 @@ $(BUILD_DIR)/asm/src/Thread_80405f14.o \
 $(BUILD_DIR)/asm/src/UIntAABBox_8040603c.o 
 # .ctors
 O_FILES += \
-$(BUILD_DIR)/asm/src/DisableIcon_80406310.o \
 $(BUILD_DIR)/asm/src/Color_80406314.o \
 $(BUILD_DIR)/asm/src/Direction3_80406318.o \
 $(BUILD_DIR)/asm/src/Point2_8040631c.o \
@@ -3137,9 +3138,6 @@ $(BUILD_DIR)/asm/src/SoundManager_80420f28.o \
 $(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o
 # .data
 O_FILES += \
-$(BUILD_DIR)/asm/src/DisableIconResource_80455060.o \
-$(BUILD_DIR)/asm/src/HomeButtonMenu_80456920.o \
-$(BUILD_DIR)/asm/src/ResourceFileName_80456930.o \
 $(BUILD_DIR)/asm/src/Locale_804569d0.o \
 $(BUILD_DIR)/asm/src/AddOnCast_804569e0.o \
 $(BUILD_DIR)/asm/src/AddOnMathDirection3_80456a60.o \
@@ -4733,8 +4731,6 @@ $(BUILD_DIR)/asm/src/ModelDesc_80554a50.o \
 $(BUILD_DIR)/asm/src/Table_80556398.o
 # .sdata
 O_FILES += \
-$(BUILD_DIR)/asm/src/HomeButtonMenu_80556e30.o \
-$(BUILD_DIR)/asm/src/ResourceFileName_80556e48.o \
 $(BUILD_DIR)/asm/src/Locale_80556e60.o \
 $(BUILD_DIR)/asm/src/AddOnMathDirection3_80556e88.o \
 $(BUILD_DIR)/asm/src/RumbleResource_80556ea0.o \
@@ -5075,7 +5071,6 @@ $(BUILD_DIR)/asm/src/FullScreenModel_8055c6b8.o \
 $(BUILD_DIR)/asm/src/Wipe_8055c6c0.o
 # .sbss
 O_FILES += \
-$(BUILD_DIR)/asm/src/DisableIcon_8055d208.o \
 $(BUILD_DIR)/asm/src/Color_8055d218.o \
 $(BUILD_DIR)/asm/src/Point2_8055d240.o \
 $(BUILD_DIR)/asm/src/Vector2_8055d248.o \
@@ -5192,9 +5187,6 @@ $(BUILD_DIR)/asm/src/SoundSystem_8055df60.o \
 $(BUILD_DIR)/asm/src/Alarm_8055df68.o
 # .sdata2
 O_FILES += \
-$(BUILD_DIR)/asm/src/DisableIcon_8055f7b8.o \
-$(BUILD_DIR)/asm/src/HomeButtonMenu_8055f7e0.o \
-$(BUILD_DIR)/asm/src/ResourceFileName_8055f818.o \
 $(BUILD_DIR)/asm/src/Direction3_8055f828.o \
 $(BUILD_DIR)/asm/src/Matrix34_8055f838.o \
 $(BUILD_DIR)/asm/src/Point2_8055f848.o \