3FB0

pret · Sep 8, 2024 · fff3ed3 · fff3ed3
1 parent f86966e
commit fff3ed3
Show file tree

Hide file tree

Showing 17 changed files with 714 additions and 93 deletions.
diff --git a/include/functions.h b/include/functions.h
@@ -14,7 +14,6 @@ void func_80004CC0(OSThread *, s32, s32);
 void func_80004CF4(void *); // types unknown
 void func_80004D20(void *); // types unknown
 void func_800052B4(void);
-void func_800053B4(void *, s32); // types unknown
 void func_80005328(void *); // types unknown
 
 // C030.s

diff --git a/include/variables.h b/include/variables.h
@@ -49,6 +49,7 @@ typedef enum {
 extern u8 gPool[];
 
 extern Gfx* gDisplayListHead;
+extern u64 _binary_assets_us_F3DEX2_bin_start[];
 
 extern u8 D_1000000[];
 extern u8 D_3000000[];

diff --git a/linker_scripts/us/symbol_addrs.txt b/linker_scripts/us/symbol_addrs.txt
@@ -253,3 +253,6 @@ D_87B000F4 = 0x87B000F4;
 D_86402848 = 0x86402848;
 gCurrentGameState = 0x80075668; // size:0x4
 D_800AE540 = 0x800AE540; // size:0x1200
+D_80068080 = 0x80068080;
+D_8007ED20 = 0x8007ED20;
+D_800A60C0 = 0x800A60C0;
diff --git a/src/1CF30.c b/src/1CF30.c
@@ -379,7 +379,7 @@ void func_8001E884(s32 arg0, s32 arg1, s32 arg2) {
 unk_D_800AC870* func_8001E94C(s32 arg0, s32 arg1) {
     D_800AC870 = main_pool_alloc_with_func(sizeof(*D_800AC870), arg1, 'PRNT', func_8001E7C0);
     bzero(D_800AC870, sizeof(*D_800AC870));
-    D_800AC870->unk_48 = func_800044F4(_3BA190_ROM_START, _3CB130_ROM_START, 1, 1);
+    D_800AC870->unk_48 = ASSET_LOAD2(func_800044F4, _3BA190, 1, 1);
     func_8001E9F0(arg0);
 
     return D_800AC870;