Restore lib func_us_801BDAE4 Decomp (#2123)

I accidentally removed `func_us_801BDAE4` when splitting in 06756bc. When restoring the alignment no longer matched so an additional split was required. I've tried to align the split with related functions (by caller).
Xeeynamo · Jan 25, 2025 · 4a91e90 · 4a91e90
1 parent 748cb22
commit 4a91e90
Show file tree

Hide file tree

Showing 3 changed files with 606 additions and 16 deletions.
diff --git a/config/splat.us.stlib.yaml b/config/splat.us.stlib.yaml
@@ -51,6 +51,7 @@ segments:
       - [0x2CE78, .rodata, e_shop]
       - [0x2CF14, .rodata, unk_33EC8]
       - [0x2D848, .rodata, unk_3BEB0]
+      - [0x2D868, .rodata, unk_3C57C]
       - [0x2D980, .rodata, e_chair]
       - [0x2D9C4, .rodata, e_red_door]
       - [0x2D9DC, .rodata, e_collect]
@@ -65,6 +66,7 @@ segments:
       - [0x3245C, c, e_shop]
       - [0x33EC8, c, unk_33EC8]
       - [0x3BEB0, c, unk_3BEB0]
+      - [0x3C57C, c, unk_3C57C]
       - [0x3EDD8, c, e_chair]
       - [0x3EFEC, c, unk_3EFEC]
       - [0x3F130, c, st_update]

diff --git a/src/st/lib/unk_3BEB0.c b/src/st/lib/unk_3BEB0.c
@@ -4,19 +4,3 @@
 INCLUDE_ASM("st/lib/nonmatchings/unk_3BEB0", func_us_801BBEB0);
 
 INCLUDE_ASM("st/lib/nonmatchings/unk_3BEB0", func_us_801BC28C);
-
-INCLUDE_ASM("st/lib/nonmatchings/unk_3BEB0", func_us_801BC57C);
-
-INCLUDE_ASM("st/lib/nonmatchings/unk_3BEB0", func_us_801BC814);
-
-INCLUDE_ASM("st/lib/nonmatchings/unk_3BEB0", func_us_801BCC10);
-
-INCLUDE_ASM("st/lib/nonmatchings/unk_3BEB0", func_us_801BCFD4);
-
-INCLUDE_ASM("st/lib/nonmatchings/unk_3BEB0", func_us_801BD268);
-
-INCLUDE_ASM("st/lib/nonmatchings/unk_3BEB0", func_us_801BDA34);
-
-INCLUDE_ASM("st/lib/nonmatchings/unk_3BEB0", func_us_801BDAE4);
-
-INCLUDE_ASM("st/lib/nonmatchings/unk_3BEB0", func_us_801BED48);