resolve jump table

2 files changed, 31 insertions, 5 deletions

diff --git a/asm/data.s b/asm/data.s
index fe70e87..cb7ae87 100644
--- a/asm/data.s
+++ b/asm/data.s
@@ -74,12 +74,16 @@ lbl_80405E50:
 
 	.balign 4, 0
 	.global lbl_80405E64
-lbl_80405E64:
-	.incbin "baserom.dol", 0x401F64, 0x1C
-.global lbl_80405E80
+lbl_80405E64: # jump table
+	.4byte lbl_80009E6C, lbl_80009E7C, lbl_80009E8C, lbl_80009E9C
+	.4byte lbl_80009EAC, lbl_80009EBC, lbl_80009ECC
+
+	.global lbl_80405E80
 lbl_80405E80:
-	.incbin "baserom.dol", 0x401F80, 0x18
-.global lbl_80405E98
+	.asciz "/HomeButtonSe.brsar"
+
+	.balign 8, 0
+	.global lbl_80405E98
 lbl_80405E98:
 	.incbin "baserom.dol", 0x401F98, 0xC
 .global lbl_80405EA4
diff --git a/asm/text.s b/asm/text.s
index 14d7f1a..c8de846 100644
--- a/asm/text.s
+++ b/asm/text.s
@@ -3810,34 +3810,56 @@ func_80009E04:
 /* 80009E60 00005AC0  7C 63 00 2E */	lwzx r3, r3, r0
 /* 80009E64 00005AC4  7C 69 03 A6 */	mtctr r3
 /* 80009E68 00005AC8  4E 80 04 20 */	bctr 
+
+.global lbl_80009E6C
+lbl_80009E6C:
 /* 80009E6C 00005ACC  38 61 00 08 */	addi r3, r1, 8
 /* 80009E70 00005AD0  38 9E 00 00 */	addi r4, r30, 0
 /* 80009E74 00005AD4  48 1C 45 61 */	bl func_801CE3D4
 /* 80009E78 00005AD8  48 00 00 78 */	b lbl_80009EF0
+
+.global lbl_80009E7C
+lbl_80009E7C:
 /* 80009E7C 00005ADC  38 61 00 08 */	addi r3, r1, 8
 /* 80009E80 00005AE0  38 9E 00 10 */	addi r4, r30, 0x10
 /* 80009E84 00005AE4  48 1C 45 51 */	bl func_801CE3D4
 /* 80009E88 00005AE8  48 00 00 68 */	b lbl_80009EF0
+
+.global lbl_80009E8C
+lbl_80009E8C:
 /* 80009E8C 00005AEC  38 61 00 08 */	addi r3, r1, 8
 /* 80009E90 00005AF0  38 9E 00 24 */	addi r4, r30, 0x24
 /* 80009E94 00005AF4  48 1C 45 41 */	bl func_801CE3D4
 /* 80009E98 00005AF8  48 00 00 58 */	b lbl_80009EF0
+
+.global lbl_80009E9C
+lbl_80009E9C:
 /* 80009E9C 00005AFC  38 61 00 08 */	addi r3, r1, 8
 /* 80009EA0 00005B00  38 9E 00 38 */	addi r4, r30, 0x38
 /* 80009EA4 00005B04  48 1C 45 31 */	bl func_801CE3D4
 /* 80009EA8 00005B08  48 00 00 48 */	b lbl_80009EF0
+
+.global lbl_80009EAC
+lbl_80009EAC:
 /* 80009EAC 00005B0C  38 61 00 08 */	addi r3, r1, 8
 /* 80009EB0 00005B10  38 9E 00 4C */	addi r4, r30, 0x4c
 /* 80009EB4 00005B14  48 1C 45 21 */	bl func_801CE3D4
 /* 80009EB8 00005B18  48 00 00 38 */	b lbl_80009EF0
+
+.global lbl_80009EBC
+lbl_80009EBC:
 /* 80009EBC 00005B1C  38 61 00 08 */	addi r3, r1, 8
 /* 80009EC0 00005B20  38 9E 00 60 */	addi r4, r30, 0x60
 /* 80009EC4 00005B24  48 1C 45 11 */	bl func_801CE3D4
 /* 80009EC8 00005B28  48 00 00 28 */	b lbl_80009EF0
+
+.global lbl_80009ECC
+lbl_80009ECC:
 /* 80009ECC 00005B2C  38 61 00 08 */	addi r3, r1, 8
 /* 80009ED0 00005B30  38 9E 00 74 */	addi r4, r30, 0x74
 /* 80009ED4 00005B34  48 1C 45 01 */	bl func_801CE3D4
 /* 80009ED8 00005B38  48 00 00 18 */	b lbl_80009EF0
+
 lbl_80009EDC:
 /* 80009EDC 00005B3C  38 00 00 00 */	li r0, 0
 /* 80009EE0 00005B40  38 61 00 08 */	addi r3, r1, 8