resolve a little more data

4 files changed, 38 insertions, 8 deletions

diff --git a/asm/ctors.s b/asm/ctors.s
index fa1cf47..22c0254 100644
--- a/asm/ctors.s
+++ b/asm/ctors.s
@@ -5,4 +5,5 @@
 .global lbl_803E1E60
 lbl_803E1E60:
 	.4byte func_801C77C0, func_8000746C, func_80007920, func_800097B8
-	.incbin "baserom.dol", 0x3DDF70, 0x430
+	.4byte func_8000A7A4, func_8000AAA4, func_8000AD5C, func_80024900
+	.incbin "baserom.dol", 0x3DDF80, 0x420
diff --git a/asm/data.s b/asm/data.s
index cb7ae87..223b22f 100644
--- a/asm/data.s
+++ b/asm/data.s
@@ -85,14 +85,20 @@ lbl_80405E80:
 	.balign 8, 0
 	.global lbl_80405E98
 lbl_80405E98:
-	.incbin "baserom.dol", 0x401F98, 0xC
-.global lbl_80405EA4
+	.asciz "preprocess"
+
+	.balign 4, 0
+	.global lbl_80405EA4
 lbl_80405EA4:
-	.incbin "baserom.dol", 0x401FA4, 0xC
-.global lbl_80405EB0
+	.asciz "postprocess"
+
+	.balign 4, 0
+	.global lbl_80405EB0
 lbl_80405EB0:
-	.incbin "baserom.dol", 0x401FB0, 0x70
-.global lbl_80405F20
+	.4byte lbl_8063D2E8, 0x00000000, func_8000A7D0, func_8000A810
+	.incbin "baserom.dol", 0x401FC0, 0x60
+
+	.global lbl_80405F20
 lbl_80405F20:
 	.incbin "baserom.dol", 0x402020, 0x18
 .global lbl_80405F38
diff --git a/asm/sdata.s b/asm/sdata.s
index e0a411a..cf1e000 100644
--- a/asm/sdata.s
+++ b/asm/sdata.s
@@ -23,7 +23,12 @@ lbl_8063D2DC:
 	.incbin "baserom.dol", 0x47101C, 0x4
 .global lbl_8063D2E0
 lbl_8063D2E0:
-	.incbin "baserom.dol", 0x471020, 0x38
+	.incbin "baserom.dol", 0x471020, 0x8
+
+	.global lbl_8063D2E8
+lbl_8063D2E8:
+	.incbin "baserom.dol", 0x471028, 0x30
+
 .global lbl_8063D318
 lbl_8063D318:
 	.incbin "baserom.dol", 0x471058, 0x4
diff --git a/asm/text_1.s b/asm/text_1.s
index 9f47d6d..9c88302 100644
--- a/asm/text_1.s
+++ b/asm/text_1.s
@@ -4494,6 +4494,9 @@ lbl_8000A790:
 /* 8000A798 000063F8  4D 82 00 20 */	beqlr
 /* 8000A79C 000063FC  4B FF FD B0 */	b lbl_8000A54C
 /* 8000A7A0 00006400  4E 80 00 20 */	blr
+
+.global func_8000A7A4
+func_8000A7A4:
 /* 8000A7A4 00006404  38 A0 00 01 */	li r5, 1
 /* 8000A7A8 00006408  38 6D 96 68 */	addi r3, r13, lbl_8063E928-_SDA_BASE_
 /* 8000A7AC 0000640C  38 80 00 04 */	li r4, 4
@@ -4508,6 +4511,9 @@ func_8000A7C4:
 /* 8000A7C4 00006424  7C 64 1B 78 */	mr r4, r3
 /* 8000A7C8 00006428  80 6D 96 2C */	lwz r3, lbl_8063E8EC-_SDA_BASE_(r13)
 /* 8000A7CC 0000642C  48 1D 05 7C */	b func_801DAD48
+
+.global func_8000A7D0
+func_8000A7D0:
 /* 8000A7D0 00006430  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 8000A7D4 00006434  7C 08 02 A6 */	mflr r0
 /* 8000A7D8 00006438  2C 03 00 00 */	cmpwi r3, 0
@@ -4525,6 +4531,9 @@ lbl_8000A7F8:
 /* 8000A804 00006464  7C 08 03 A6 */	mtlr r0
 /* 8000A808 00006468  38 21 00 10 */	addi r1, r1, 0x10
 /* 8000A80C 0000646C  4E 80 00 20 */	blr
+
+.global func_8000A810
+func_8000A810:
 /* 8000A810 00006470  4E 80 00 20 */	blr
 /* 8000A814 00006474  94 21 FF E0 */	stwu r1, -0x20(r1)
 /* 8000A818 00006478  7C 08 02 A6 */	mflr r0
@@ -4707,6 +4716,9 @@ lbl_8000AA6C:
 /* 8000AA98 000066F8  3C 60 80 40 */	lis r3, lbl_80405F20@ha
 /* 8000AA9C 000066FC  38 63 5F 20 */	addi r3, r3, lbl_80405F20@l
 /* 8000AAA0 00006700  4E 80 00 20 */	blr
+
+.global func_8000AAA4
+func_8000AAA4:
 /* 8000AAA4 00006704  38 A0 00 01 */	li r5, 1
 /* 8000AAA8 00006708  38 6D 96 78 */	addi r3, r13, lbl_8063E938-_SDA_BASE_
 /* 8000AAAC 0000670C  38 80 00 04 */	li r4, 4
@@ -4911,6 +4923,9 @@ lbl_8000AD50:
 /* 8000AD50 000069B0  80 6D A3 40 */	lwz r3, lbl_8063F600-_SDA_BASE_(r13)
 /* 8000AD54 000069B4  38 80 00 00 */	li r4, 0
 /* 8000AD58 000069B8  48 21 98 2C */	b func_80224584
+
+.global func_8000AD5C
+func_8000AD5C:
 /* 8000AD5C 000069BC  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 8000AD60 000069C0  7C 08 02 A6 */	mflr r0
 /* 8000AD64 000069C4  3C A0 80 01 */	lis r5, lbl_8000AD18@ha
@@ -34175,6 +34190,9 @@ lbl_800248F0:
 /* 800248F4 00020554  7C 08 03 A6 */	mtlr r0
 /* 800248F8 00020558  38 21 00 10 */	addi r1, r1, 0x10
 /* 800248FC 0002055C  4E 80 00 20 */	blr
+
+.global func_80024900
+func_80024900:
 /* 80024900 00020560  38 6D 96 A8 */	addi r3, r13, lbl_8063E968-_SDA_BASE_
 /* 80024904 00020564  38 80 00 01 */	li r4, 1
 /* 80024908 00020568  38 A0 00 04 */	li r5, 4