symbols hygiene

zeldaret · Sep 28, 2024 · 1d40b46 · 1d40b46
1 parent 968f364
commit 1d40b46
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt
@@ -2738,9 +2738,9 @@ fn_80061A30 = .text:0x80061A30; // type:function size:0x58
 fn_80061A90 = .text:0x80061A90; // type:function size:0x4
 fn_80061AA0 = .text:0x80061AA0; // type:function size:0x4
 dPlayerModel__sinit = .text:0x80061AB0; // type:function size:0x5C
-fn_80061B10 = .text:0x80061B10; // type:function size:0x88
-fn_80061BA0 = .text:0x80061BA0; // type:function size:0x34
-fn_80061BE0 = .text:0x80061BE0; // type:function size:0x10
+computeChecksumInner__FPvUl = .text:0x80061B10; // type:function size:0x88
+computeChecksum__FPvUl = .text:0x80061BA0; // type:function size:0x34
+setPrefix__FP18ArcCallbackHandlerPCcUl = .text:0x80061BE0; // type:function size:0x10
 __ct__14dRawArcEntry_cFv = .text:0x80061BF0; // type:function size:0x28
 __dt__14dRawArcEntry_cFv = .text:0x80061C20; // type:function size:0x80
 searchCallback__14dRawArcEntry_cFPvPvPC11ARCDirEntryPCcb = .text:0x80061CA0; // type:function size:0xA0
@@ -30773,8 +30773,8 @@ lbl_8050DEB4 = .data:0x8050DEB4; // type:object size:0x10
 lbl_8050DEC4 = .data:0x8050DEC4; // type:object size:0x10
 RootHeapsManager__EGG__T_System<>__Configuration__vtable = .data:0x8050DED4; // type:object size:0x3C
 lbl_8050DF10 = .data:0x8050DF10; // type:object size:0x18
-lbl_8050DF28 = .data:0x8050DF28; // type:object size:0x14
-lbl_8050DF3C = .data:0x8050DF3C; // type:object size:0x14
+lbl_8050DF28 = .data:0x8050DF28; // type:object size:0x11 data:string
+lbl_8050DF3C = .data:0x8050DF3C; // type:object size:0x11 data:string
 __vt__18ArcCallbackHandler = .data:0x8050DF50; // type:object size:0x10
 lbl_8050DF60 = .data:0x8050DF60; // type:object size:0x10
 lbl_8050DF70 = .data:0x8050DF70; // type:object size:0x14
@@ -37661,8 +37661,8 @@ lbl_80571CF8 = .sdata:0x80571CF8; // type:object size:0x8 data:string
 lbl_80571D00 = .sdata:0x80571D00; // type:object size:0x8 data:string
 RootActorID = .sdata:0x80571D08; // type:object size:0x2 data:2byte
 gameStateIsActive = .sdata:0x80571D0A; // type:object size:0x6 data:byte
-lbl_80571D10 = .sdata:0x80571D10; // type:object size:0x8
-lbl_80571D18 = .sdata:0x80571D18; // type:object size:0x8
+lbl_80571D10 = .sdata:0x80571D10; // type:object size:0x7 data:string
+lbl_80571D18 = .sdata:0x80571D18; // type:object size:0x3 data:string
 lbl_80571D20 = .sdata:0x80571D20; // type:object size:0x8
 lbl_80571D28 = .sdata:0x80571D28; // type:object size:0x8 data:string
 lbl_80571D30 = .sdata:0x80571D30; // type:object size:0x7 data:string

diff --git a/src/d/d_rawarchive.cpp b/src/d/d_rawarchive.cpp
@@ -2,7 +2,7 @@
 #include <rvl/VI.h>
 
 
-extern "C" int fn_80061B10(void *d, u32 len) {
+int computeChecksumInner(void *d, u32 len) {
     u32 *data = (u32 *)d;
     u32 result = 0;
     // Compiler will unroll this loop
@@ -12,15 +12,14 @@ extern "C" int fn_80061B10(void *d, u32 len) {
     return result;
 }
 
-extern "C" int fn_80061BA0(void *data, u32 len) {
-    int result = fn_80061B10(data, len);
+int computeChecksum(void *data, u32 len) {
+    int result = computeChecksumInner(data, len);
     return result != 0 ? result : -1;
 }
 
-extern "C" void fn_80061BE0(ArcCallbackHandler *mgr, const char *name, size_t len) {
-    // All spaces
+void setPrefix(ArcCallbackHandler *mgr, const char *name, size_t len) {
     mgr->mPrefix = '    ';
-    // Copy the actual name 
+    // Copy the actual name
     memcpy(&mgr->mPrefix, name, len);
 }
 
@@ -48,7 +47,7 @@ void dRawArcEntry_c::searchCallback(void *arg, void *data, const ARCDirEntry *en
     ArcCallbackHandler *mgr = (ArcCallbackHandler *)arg;
     if (entry->isDir) {
         int len = strlen(entry->name);
-        fn_80061BE0(mgr, entry->name, len <= 4 ? len : 4);
+        setPrefix(mgr, entry->name, len <= 4 ? len : 4);
     } else {
         // dolphin: arg vtable at 8050df50
         // any others?
@@ -191,7 +190,7 @@ int dRawArcEntry_c::ensureLoadedMaybe(void *callbackArg) {
         int result = onMount(callbackArg);
         mHeap::restoreCurrentHeap();
         mHeap::adjustFrmHeap(mpFrmHeap);
-        mChecksum = fn_80061BA0(mpData, mAmountRead);
+        mChecksum = computeChecksum(mpData, mAmountRead);
         if (result == -1) {
             return result;
         }