diff --git a/linker_scripts/us/symbol_addrs.txt b/linker_scripts/us/symbol_addrs.txt
index 887258b1..7c0bc77d 100644
--- a/linker_scripts/us/symbol_addrs.txt
+++ b/linker_scripts/us/symbol_addrs.txt
@@ -31,4 +31,122 @@ osCreateThread = 0x800221A0;
 osStartThread = 0x800222F0;
 osCreateViManager = 0x80022440;
 osSetThreadPri = 0x80022A80; 
-osGetTime = 0x80023000;
\ No newline at end of file
+osGetTime = 0x80023000;
+__sinf = 0x80023090;
+sinf = 0x80023090;
+__cosf = 0x80023250;
+cosf = 0x80023250;
+sqrtf = 0x800233C0;
+osSetTimer = 0x800233D0;
+osEepromRead = 0x800234B0;
+osEepromWrite = 0x800237B0;
+__osEepStatus = 0x80023A6C;
+__ull_rshift = 0x80023C90;
+__ull_rem = 0x80023CBC;
+__ull_div = 0x80023CF8;
+__ll_lshift = 0x80023D34;
+__ll_rem = 0x80023D60;
+__ll_div = 0x80023D9C;
+__ll_mul = 0x80023DF8;
+__ull_divremi = 0x80023E28;
+__ll_mod = 0x80023E88;
+__ll_rshift = 0x80023F24;
+osEepromProbe = 0x80023F50;
+memcpy = 0x80023FC0;
+strlen = 0x80023FEC;
+strchr = 0x80024014;
+osSetTime = 0x80024D20;
+osAiSetFrequency = 0x80024D60;
+osEPiStartDma = 0x80024FB0;
+osAiGetLength = 0x80025090;
+osAiSetNextBuffer = 0x800250A0;
+osGetCount = 0x80025150;
+__osSiRawStartDma = 0x80025160;
+__osSiCreateAccessQueue = 0x80025210;
+__osSiGetAccess = 0x80025260;
+__osSiRelAccess = 0x800252A4;
+__osDisableInt = 0x800252D0;
+__osRestoreInt = 0x800252F0;
+__osDequeueThread = 0x80025310;
+__osEnqueueAndYield = 0x80025DF0;
+__osEnqueueThread = 0x80025EF0;
+__osPopThread = 0x80025F38;
+__osDispatchThread = 0x80025F48;
+__osCleanupThread = 0x800260C4;
+osPfsIsPlug = 0x800260D0;
+__osPfsRequestData = 0x80026270;
+__osPfsGetInitData = 0x8002636C;
+__osContAddressCrc = 0x80026440;
+__osContDataCrc = 0x800264F0;
+guMtxF2L = 0x80026CD0;
+guMtxIdentF = 0x80026DD0;
+guMtxIdent = 0x80026E58;
+guMtxL2F = 0x80026E88;
+osJamMesg = 0x80026F40;
+osPiGetCmdQueue = 0x80027090;
+__osViInit = 0x800270C0;
+__osSpGetStatus = 0x80027200;
+__osSpSetStatus = 0x80027210;
+bcopy = 0x80027220;
+osVirtualToPhysical = 0x80027530;
+osWritebackDCache = 0x800275B0;
+__osSpSetPc = 0x80027630;
+__osSpRawStartDma = 0x80027670;
+__osSpDeviceBusy = 0x80027700;
+__osTimerServicesInit = 0x80027730;
+__osTimerInterrupt = 0x800277BC;
+__osSetTimerIntr = 0x80027A00;
+__osInsertTimer = 0x80027A74;
+osGetThreadPri = 0x80027C00;
+__osViGetCurrentContext = 0x80027C20;
+__osViSwapContext = 0x80027C30;
+osPiRawStartDma = 0x80028150;
+__osSetSR = 0x80028BB0;
+__osGetSR = 0x80028BC0;
+__osSetFpcCsr = 0x80028BD0;
+osMapTLBRdb = 0x80028C80;
+osPiRawReadIo = 0x80028CE0;
+bzero = 0x80028D40;
+_Litob = 0x80028DE0;
+_Ldtob = 0x800295F0;
+__osAiDeviceBusy = 0x80029B40;
+__osSiDeviceBusy = 0x80029B70;
+osSetIntMask = 0x8002AA90;
+osDestroyThread = 0x8002AB30;
+__osProbeTLB = 0x8002AD40;
+__osSetCompare = 0x8002AE00;
+__osResetGlobalIntMask = 0x8002AE10;
+osEPiRawWriteIo = 0x8002AE70;
+osEPiRawReadIo = 0x8002AEC0;
+__osSetGlobalIntMask = 0x8002AF10;
+osYieldThread = 0x8002AF60;
+lldiv = 0x8002AFB0;
+ldiv = 0x8002B0B0;
+__osGetCause = 0x8002B140;
+osStopThread = 0x8002E280;
+__osContinitialized = 0x800C7CC0;
+__osViDevMgr = 0x800C7DC0;
+__osPiDevMgr = 0x800C7DE0;
+osClockRate = 0x800C7E10;
+osViClock = 0x800C7E18;
+__OSGlobalIntMask = 0x800C7E20;
+__osThreadTail = 0x800C7EA0;
+__osRunQueue = 0x800C7EA8;
+__osActiveQueue = 0x800C7EAC;
+__osRunningThread = 0x800C7EB0;
+__osViCurr = 0x800C7F40;
+__osViNext = 0x800C7F44;
+__osTimerList = 0x800C7F50;
+__libm_qnan_f = 0x800E9570;
+__osRcpImTable = 0x800E95E0;
+__osContPifRam = 0x80156620;
+__osContLastCmd = 0x80156660;
+__osMaxControllers = 0x80156661;
+__osEepromTimerQ = 0x80156688;
+__osEepromTimerMsg = 0x801566A0;
+__osEventStateTab = 0x801568F0;
+__osEepPifRam = 0x801793E0;
+__osPfsPifRam = 0x801794C0;
+__osCurrentTime = 0x80179520;
+__osBaseCounter = 0x80179528;
+__osViIntrCount = 0x8017952C;
\ No newline at end of file
diff --git a/src/libultra/conteepprobe.c b/src/libultra/conteepprobe.c
index e22592ba..3f7f99bf 100644
--- a/src/libultra/conteepprobe.c
+++ b/src/libultra/conteepprobe.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/conteepprobe/func_80023F50.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/conteepprobe/osEepromProbe.s")
diff --git a/src/libultra/conteepread.c b/src/libultra/conteepread.c
index 9af9acf2..d05ba8d5 100644
--- a/src/libultra/conteepread.c
+++ b/src/libultra/conteepread.c
@@ -1,5 +1,5 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/conteepread/func_800234B0.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/conteepread/osEepromRead.s")
 
 #pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/conteepread/func_800236A0.s")
diff --git a/src/libultra/conteepwrite.c b/src/libultra/conteepwrite.c
index 496080fe..f8b0e57b 100644
--- a/src/libultra/conteepwrite.c
+++ b/src/libultra/conteepwrite.c
@@ -1,7 +1,7 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/conteepwrite/func_800237B0.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/conteepwrite/osEepromWrite.s")
 
 #pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/conteepwrite/func_80023960.s")
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/conteepwrite/func_80023A6C.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/conteepwrite/__osEepStatus.s")
diff --git a/src/libultra/io/ai.c b/src/libultra/io/ai.c
index a6fdfea1..63bd2dc7 100644
--- a/src/libultra/io/ai.c
+++ b/src/libultra/io/ai.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/ai/func_80029B40.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/ai/__osAiDeviceBusy.s")
diff --git a/src/libultra/io/aigetlen.c b/src/libultra/io/aigetlen.c
index 3adcc77e..34dfcf73 100644
--- a/src/libultra/io/aigetlen.c
+++ b/src/libultra/io/aigetlen.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/aigetlen/func_80025090.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/aigetlen/osAiGetLength.s")
diff --git a/src/libultra/io/aisetfreq.c b/src/libultra/io/aisetfreq.c
index 6573b4eb..8bff39d2 100644
--- a/src/libultra/io/aisetfreq.c
+++ b/src/libultra/io/aisetfreq.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/aisetfreq/func_80024D60.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/aisetfreq/osAiSetFrequency.s")
diff --git a/src/libultra/io/crc.c b/src/libultra/io/crc.c
index 868f8ad7..92c7c1df 100644
--- a/src/libultra/io/crc.c
+++ b/src/libultra/io/crc.c
@@ -1,5 +1,5 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/crc/func_80026440.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/crc/__osContAddressCrc.s")
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/crc/func_800264F0.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/crc/__osContDataCrc.s")
diff --git a/src/libultra/io/epidma.c b/src/libultra/io/epidma.c
index e70d39f7..1058167e 100644
--- a/src/libultra/io/epidma.c
+++ b/src/libultra/io/epidma.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/epidma/func_80024FB0.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/epidma/osEPiStartDma.s")
diff --git a/src/libultra/io/epirawread.c b/src/libultra/io/epirawread.c
index da1aadf6..610fdeb3 100644
--- a/src/libultra/io/epirawread.c
+++ b/src/libultra/io/epirawread.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/epirawread/func_8002AEC0.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/epirawread/osEPiRawReadIo.s")
diff --git a/src/libultra/io/epirawwrite.c b/src/libultra/io/epirawwrite.c
index 28f17f9f..e99d01ff 100644
--- a/src/libultra/io/epirawwrite.c
+++ b/src/libultra/io/epirawwrite.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/epirawwrite/func_8002AE70.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/epirawwrite/osEPiRawWriteIo.s")
diff --git a/src/libultra/io/pfsisplug.c b/src/libultra/io/pfsisplug.c
index 5a53ea59..4aa4382e 100644
--- a/src/libultra/io/pfsisplug.c
+++ b/src/libultra/io/pfsisplug.c
@@ -1,7 +1,7 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/pfsisplug/func_800260D0.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/pfsisplug/osPfsIsPlug.s")
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/pfsisplug/func_80026270.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/pfsisplug/__osPfsRequestData.s")
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/pfsisplug/func_8002636C.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/pfsisplug/__osPfsGetInitData.s")
diff --git a/src/libultra/io/pigetcmdq.c b/src/libultra/io/pigetcmdq.c
index 77bcb29d..6992ece9 100644
--- a/src/libultra/io/pigetcmdq.c
+++ b/src/libultra/io/pigetcmdq.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/pigetcmdq/func_80027090.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/pigetcmdq/osPiGetCmdQueue.s")
diff --git a/src/libultra/io/pirawdma.c b/src/libultra/io/pirawdma.c
index 80505ec0..9b3d8c5c 100644
--- a/src/libultra/io/pirawdma.c
+++ b/src/libultra/io/pirawdma.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/pirawdma/func_80028150.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/pirawdma/osPiRawStartDma.s")
diff --git a/src/libultra/io/pirawread.c b/src/libultra/io/pirawread.c
index fa80fb64..f024f725 100644
--- a/src/libultra/io/pirawread.c
+++ b/src/libultra/io/pirawread.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/pirawread/func_80028CE0.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/pirawread/osPiRawReadIo.s")
diff --git a/src/libultra/io/si.c b/src/libultra/io/si.c
index 8e41d5d1..4de8eb31 100644
--- a/src/libultra/io/si.c
+++ b/src/libultra/io/si.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/si/func_80029B70.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/si/__osSiDeviceBusy.s")
diff --git a/src/libultra/io/sirawdma.c b/src/libultra/io/sirawdma.c
index ab4a01dc..40ad403a 100644
--- a/src/libultra/io/sirawdma.c
+++ b/src/libultra/io/sirawdma.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/sirawdma/func_80025160.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/sirawdma/__osSiRawStartDma.s")
diff --git a/src/libultra/io/sp.c b/src/libultra/io/sp.c
index b12926ab..fb6102a0 100644
--- a/src/libultra/io/sp.c
+++ b/src/libultra/io/sp.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/sp/func_80027700.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/sp/__osSpDeviceBusy.s")
diff --git a/src/libultra/io/spgetstat.c b/src/libultra/io/spgetstat.c
index c971198f..12d3d4a1 100644
--- a/src/libultra/io/spgetstat.c
+++ b/src/libultra/io/spgetstat.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/spgetstat/func_80027200.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/spgetstat/__osSpGetStatus.s")
diff --git a/src/libultra/io/sprawdma.c b/src/libultra/io/sprawdma.c
index 1cb7f3fc..ab30cddc 100644
--- a/src/libultra/io/sprawdma.c
+++ b/src/libultra/io/sprawdma.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/sprawdma/func_80027670.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/sprawdma/__osSpRawStartDma.s")
diff --git a/src/libultra/io/spsetpc.c b/src/libultra/io/spsetpc.c
index 3f0f0b2f..5a1ab22a 100644
--- a/src/libultra/io/spsetpc.c
+++ b/src/libultra/io/spsetpc.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/spsetpc/func_80027630.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/spsetpc/__osSpSetPc.s")
diff --git a/src/libultra/io/spsetstat.c b/src/libultra/io/spsetstat.c
index 613f9ae8..a50f8d73 100644
--- a/src/libultra/io/spsetstat.c
+++ b/src/libultra/io/spsetstat.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/spsetstat/func_80027210.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/spsetstat/__osSpSetStatus.s")
diff --git a/src/libultra/io/vi.c b/src/libultra/io/vi.c
index 4544e9ed..34d4e1e5 100644
--- a/src/libultra/io/vi.c
+++ b/src/libultra/io/vi.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/vi/func_800270C0.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/vi/__osViInit.s")
diff --git a/src/libultra/io/viswapcontext.c b/src/libultra/io/viswapcontext.c
index 51479bdf..84194fa6 100644
--- a/src/libultra/io/viswapcontext.c
+++ b/src/libultra/io/viswapcontext.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/viswapcontext/func_80027C30.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/viswapcontext/__osViSwapContext.s")
diff --git a/src/libultra/libc/ldiv.c b/src/libultra/libc/ldiv.c
index c27e0739..a9f3099e 100644
--- a/src/libultra/libc/ldiv.c
+++ b/src/libultra/libc/ldiv.c
@@ -1,5 +1,5 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ldiv/func_8002AFB0.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ldiv/lldiv.s")
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ldiv/func_8002B0B0.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ldiv/ldiv.s")
diff --git a/src/libultra/libc/ll.c b/src/libultra/libc/ll.c
index e1fd6230..9ee154af 100644
--- a/src/libultra/libc/ll.c
+++ b/src/libultra/libc/ll.c
@@ -1,21 +1,21 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/func_80023C90.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/__ull_rshift.s")
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/func_80023CBC.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/__ull_rem.s")
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/func_80023CF8.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/__ull_div.s")
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/func_80023D34.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/__ll_lshift.s")
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/func_80023D60.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/__ll_rem.s")
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/func_80023D9C.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/__ll_div.s")
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/func_80023DF8.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/__ll_mul.s")
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/func_80023E28.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/__ull_divremi.s")
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/func_80023E88.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/__ll_mod.s")
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/func_80023F24.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/__ll_rshift.s")
diff --git a/src/libultra/libc/string.c b/src/libultra/libc/string.c
index 81223887..5561b1b9 100644
--- a/src/libultra/libc/string.c
+++ b/src/libultra/libc/string.c
@@ -1,7 +1,7 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/string/func_80023FC0.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/string/memcpy.s")
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/string/func_80023FEC.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/string/strlen.s")
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/string/func_80024014.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/string/strchr.s")
diff --git a/src/libultra/mtxutil.c b/src/libultra/mtxutil.c
index 9fc64c67..bd8eaf12 100644
--- a/src/libultra/mtxutil.c
+++ b/src/libultra/mtxutil.c
@@ -1,9 +1,9 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/mtxutil/func_80026CD0.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/mtxutil/guMtxF2L.s")
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/mtxutil/func_80026DD0.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/mtxutil/guMtxIdentF.s")
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/mtxutil/func_80026E58.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/mtxutil/guMtxIdent.s")
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/mtxutil/func_80026E88.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/mtxutil/guMtxL2F.s")
diff --git a/src/libultra/os/destroythread.c b/src/libultra/os/destroythread.c
index cc0fd401..9fa2e0ee 100644
--- a/src/libultra/os/destroythread.c
+++ b/src/libultra/os/destroythread.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/destroythread/func_8002AB30.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/destroythread/osDestroyThread.s")
diff --git a/src/libultra/os/getthreadpri.c b/src/libultra/os/getthreadpri.c
index 78973dc7..edf58fc5 100644
--- a/src/libultra/os/getthreadpri.c
+++ b/src/libultra/os/getthreadpri.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/getthreadpri/func_80027C00.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/getthreadpri/osGetThreadPri.s")
diff --git a/src/libultra/os/jammesg.c b/src/libultra/os/jammesg.c
index c5b1913b..644ea8de 100644
--- a/src/libultra/os/jammesg.c
+++ b/src/libultra/os/jammesg.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/jammesg/func_80026F40.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/jammesg/osJamMesg.s")
diff --git a/src/libultra/os/resetglobalintmask.c b/src/libultra/os/resetglobalintmask.c
index 8e16f25e..07ca8cdb 100644
--- a/src/libultra/os/resetglobalintmask.c
+++ b/src/libultra/os/resetglobalintmask.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/resetglobalintmask/func_8002AE10.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/resetglobalintmask/__osResetGlobalIntMask.s")
diff --git a/src/libultra/os/setglobalintmask.c b/src/libultra/os/setglobalintmask.c
index 6f77a5ad..a12c3eed 100644
--- a/src/libultra/os/setglobalintmask.c
+++ b/src/libultra/os/setglobalintmask.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/setglobalintmask/func_8002AF10.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/setglobalintmask/__osSetGlobalIntMask.s")
diff --git a/src/libultra/os/settime.c b/src/libultra/os/settime.c
index b78ea7ed..87af930f 100644
--- a/src/libultra/os/settime.c
+++ b/src/libultra/os/settime.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/settime/func_80024D20.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/settime/osSetTime.s")
diff --git a/src/libultra/os/settimer.c b/src/libultra/os/settimer.c
index 2efdc575..be282868 100644
--- a/src/libultra/os/settimer.c
+++ b/src/libultra/os/settimer.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/settimer/func_800233D0.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/settimer/osSetTimer.s")
diff --git a/src/libultra/os/virtualtophysical.c b/src/libultra/os/virtualtophysical.c
index 16158b43..bac6bd65 100644
--- a/src/libultra/os/virtualtophysical.c
+++ b/src/libultra/os/virtualtophysical.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/virtualtophysical/func_80027530.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/virtualtophysical/osVirtualToPhysical.s")
diff --git a/src/libultra/os/yieldthread.c b/src/libultra/os/yieldthread.c
index dc28fa83..eebebd84 100644
--- a/src/libultra/os/yieldthread.c
+++ b/src/libultra/os/yieldthread.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/yieldthread/func_8002AF60.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/yieldthread/osYieldThread.s")
diff --git a/src/libultra/rmon/xlitob.c b/src/libultra/rmon/xlitob.c
index 51b6fee0..808fb217 100644
--- a/src/libultra/rmon/xlitob.c
+++ b/src/libultra/rmon/xlitob.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/rmon/xlitob/func_80028DE0.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/rmon/xlitob/_Litob.s")
diff --git a/src/main/7D30.c b/src/main/7D30.c
index 640e9fe6..3ffdb110 100644
--- a/src/main/7D30.c
+++ b/src/main/7D30.c
@@ -1,16 +1,16 @@
 #include "common.h"
 
-extern s64 D_800C7E10;
+extern s64 osClockRate;
 extern s32 D_800E2128;
 
-extern s32 func_800234B0(s32*, u8, s32, s32);
-extern s32 func_800237B0(s32*, u8, s32);
-extern s64 func_80023CF8(s64, s64);
-extern s64 func_80023DF8(s64, s64);
+extern s32 osEepromRead(s32*, u8, s32, s32);
+extern s32 osEepromWrite(s32*, u8, s32);
+extern s64 __ull_div(s64, s64);
+extern s64 __ll_mul(s64, s64);
 extern void func_800070C8(s64);
 
 s32 func_80007130(s32 arg0, s32 arg1) {
-    if (func_800234B0(&D_800E2128, arg0, arg1, arg0) != 0) {
+    if (osEepromRead(&D_800E2128, arg0, arg1, arg0) != 0) {
         return -1;
     } else {
         return 0;
@@ -22,12 +22,12 @@ s32 func_8000716C(s32 arg0, s32 arg1) {
     s64 temp_ret_2;
     s64 temp_ret_3;
 
-    if (func_800237B0(&D_800E2128, arg0, arg1) != 0) {
+    if (osEepromWrite(&D_800E2128, arg0, arg1) != 0) {
         return -1;
     }
-    temp_ret = func_80023CF8(D_800C7E10, 0x3D09);
-    temp_ret_2 = func_80023DF8(0x3A98, temp_ret);
-    temp_ret_3 = func_80023CF8(temp_ret_2, 0x40);
+    temp_ret = __ull_div(osClockRate, 0x3D09);
+    temp_ret_2 = __ll_mul(0x3A98, temp_ret);
+    temp_ret_3 = __ull_div(temp_ret_2, 0x40);
     func_800070C8(temp_ret_3);
 
     return 0;