compiles but doesn't match :/

ianwal · ianwal · commit 9bd6bcef4200 · 2025-08-03T02:44:14.000Z
diff --git a/.gitignore b/.gitignore
@@ -36,3 +36,5 @@ conker/ctx.c
 
 tools/decomp-permuter
 tools/gfxdis
+venv/
+.venv/
diff --git a/conker/conker.us.yaml b/conker/conker.us.yaml
@@ -11,6 +11,8 @@ options:
     #include "functions.h"
     #include "variables.h"
   symbol_addrs_path: symbol_addrs.us.txt
+  symbol_name_format: $VRAM
+  symbol_name_format_no_rom: $VRAM
 segments:
   - name:  header
     type:  header
@@ -47,7 +49,7 @@ segments:
     - [0x50A0, c, init_50A0]
     - [0x5570, asm, libultra/io/motor]
   # - [0x57E0, asm] no file split here!
-    - [0x5AB0, c, init_5AB0]
+    - [0x5AB0, asm]
     # - [0x6240, c]
     # - [0x71D0, c]
     - [0x8120, asm, libultra/os/maptlbrdb]
diff --git a/conker/src/init_5AB0.c b/conker/src/init_5AB0.c
diff --git a/conker/symbol_addrs.us.txt b/conker/symbol_addrs.us.txt
@@ -119,10 +119,6 @@ __osSetTimerIntr                = 0x100240B4;
 __osInsertTimer                 = 0x10024128;
 __osViInit                      = 0x100242b0;
 __osGetActiveQueue              = 0x10024400; // allow_duplicated:True
-__osGetCurrFaultedThread        = 0x10024400; // allow_duplicated:True
-__osViGetCurrentContext         = 0x10024400; // allow_duplicated:True
-__osViGetNextContext            = 0x10024400; // allow_duplicated:True
-osPiGetDeviceType               = 0x10024400; // allow_duplicated:True
 __osViSwapContext               = 0x10024410;
 osGetCount                      = 0x10024770;
 __osDequeueThread               = 0x10024780;
diff --git a/conker/undefined_funcs.us.txt b/conker/undefined_funcs.us.txt
@@ -1,2 +1,3 @@
 __osDevMgrMain                  = 0x10002E50;
 __n_CSPHandleMetaMsg            = 0x10015044;
+func_160036F0 = 0x160036F0;
diff --git a/conker/undefined_syms.us.txt b/conker/undefined_syms.us.txt
@@ -48,7 +48,5 @@ D_8002BA44 = 0x8002BA44;
 D_8002C080 = 0x8002C080;
 D_8002C0A0 = 0x8002C0A0;
 D_8002C410 = 0x8002C410;
-D_8002C460 = 0x8002C460;
-D_8002C4CC = 0x8002C4CC;
 D_8002C520 = 0x8002C520;
 D_80095A30 = 0x80095A30;

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`__osDevMgrMain = 0x10002E50;`
`2`	`2`	`__n_CSPHandleMetaMsg = 0x10015044;`
	`3`	`+func_160036F0 = 0x160036F0;`