Decompile lib func_us_801B6324 (#2185)

PSX: https://decomp.me/scratch/7bGW0 PSP: https://decomp.me/scratch/d5C0A
Xeeynamo · Feb 7, 2025 · b27bf3b · b27bf3b
1 parent 88046ef
commit b27bf3b
Show file tree

Hide file tree

Showing 5 changed files with 329 additions and 17 deletions.
diff --git a/config/splat.us.stlib.yaml b/config/splat.us.stlib.yaml
@@ -57,7 +57,7 @@ segments:
       - [0x2B938, .rodata, first_c_file]
       - [0x2CE78, .rodata, e_shop]
       - [0x2CF14, .rodata, unk_33EC8]
-      - [0x2D2A0, .rodata, unk_36F30]
+      - [0x2D278, .rodata, unk_36F30]
       - [0x2D848, .rodata, unk_3BEB0]
       - [0x2D868, .rodata, unk_3C57C]
       - [0x2D980, .rodata, e_chair]
@@ -76,7 +76,7 @@ segments:
       - [0x2DED0, c, first_c_file]
       - [0x3245C, c, e_shop]
       - [0x33EC8, c, unk_33EC8]
-      - [0x36F30, c, unk_36F30]
+      - [0x36324, c, unk_36F30]
       - [0x3BEB0, c, unk_3BEB0]
       - [0x3C57C, c, unk_3C57C]
       - [0x3EDD8, c, e_chair]

diff --git a/src/st/lib/e_shop.c b/src/st/lib/e_shop.c
@@ -93,12 +93,6 @@ static InventoryItem D_us_8018134C[] = {
     // clang-format on
 };
 
-typedef struct {
-    /* 0x0 */ u16 category;
-    /* 0x2 */ u16 itemId;
-    /* 0x4 */ u32 price;
-} AvailableInventoryItem;
-
 /// relic index
 u16 D_us_801814D4[] = {16, 0};
 
@@ -148,7 +142,6 @@ extern u32 D_us_801D415C[];
 extern s32 D_us_801D425C[];
 extern AvailableInventoryItem D_us_801D4364[];
 extern s32 g_CutsceneFlags;
-extern u16 g_EInitCommon[];
 extern s32 D_psp_08B42050;
 extern s32 D_psp_08B42054;
 

diff --git a/src/st/lib/lib.h b/src/st/lib/lib.h
@@ -56,6 +56,12 @@ extern void EntityExplosionVariants(Entity* entity);
 extern void EntityGreyPuff(Entity* entity);
 extern Primitive* FindFirstUnkPrim2(Primitive* prim, u8 index);
 
+typedef struct {
+    /* 0x0 */ u16 category;
+    /* 0x2 */ u16 itemId;
+    /* 0x4 */ u32 price;
+} AvailableInventoryItem;
+
 extern EInit g_EInitObtainable;
 extern EInit g_EInitParticle;
 extern EInit g_EInitCommon;

diff --git a/src/st/lib/unk_33EC8.c b/src/st/lib/unk_33EC8.c
@@ -120,7 +120,3 @@ INCLUDE_RODATA("st/lib/nonmatchings/unk_33EC8", D_us_801AD254);
 INCLUDE_RODATA("st/lib/nonmatchings/unk_33EC8", D_us_801AD264);
 
 INCLUDE_RODATA("st/lib/nonmatchings/unk_33EC8", D_us_801AD26C);
-
-INCLUDE_ASM("st/lib/nonmatchings/unk_33EC8", func_us_801B6324);
-
-INCLUDE_ASM("st/lib/nonmatchings/unk_33EC8", func_us_801B6E20);