diff --git a/asm/nonmatchings/code_1b40_len_20b0/load_engine_data.s b/asm/nonmatchings/code_1b40_len_20b0/load_engine_data.s
index d120ccb1a2..67f8cd42ab 100644
--- a/asm/nonmatchings/code_1b40_len_20b0/load_engine_data.s
+++ b/asm/nonmatchings/code_1b40_len_20b0/load_engine_data.s
@@ -24,24 +24,24 @@ glabel load_engine_data
 /* 2228 80026E28 248479B0 */  addiu     $a0, $a0, 0x79b0
 /* 222C 80026E2C 3C050010 */  lui       $a1, 0x10
 /* 2230 80026E30 24A5EE30 */  addiu     $a1, $a1, -0x11d0
-/* 2234 80026E34 3C06802C */  lui       $a2, %hi(D_802C3000)
-/* 2238 80026E38 24C63000 */  addiu     $a2, $a2, %lo(D_802C3000)
+/* 2234 80026E34 3C06802C */  lui       $a2, %hi(sort_scripts)
+/* 2238 80026E38 24C63000 */  addiu     $a2, $a2, %lo(sort_scripts)
 /* 223C 80026E3C 0C00A5CF */  jal       dma_copy
 /* 2240 80026E40 00000000 */   nop      
 /* 2244 80026E44 3C040010 */  lui       $a0, 0x10
 /* 2248 80026E48 24842610 */  addiu     $a0, $a0, 0x2610
 /* 224C 80026E4C 3C050011 */  lui       $a1, 0x11
 /* 2250 80026E50 24A5CC10 */  addiu     $a1, $a1, -0x33f0
-/* 2254 80026E54 3C06802E */  lui       $a2, %hi(D_802E0D90)
-/* 2258 80026E58 24C60D90 */  addiu     $a2, $a2, %lo(D_802E0D90)
+/* 2254 80026E54 3C06802E */  lui       $a2, %hi(create_shadow_callback)
+/* 2258 80026E58 24C60D90 */  addiu     $a2, $a2, %lo(create_shadow_callback)
 /* 225C 80026E5C 0C00A5CF */  jal       dma_copy
 /* 2260 80026E60 00000000 */   nop      
 /* 2264 80026E64 3C04000A */  lui       $a0, 0xa
 /* 2268 80026E68 24845DD0 */  addiu     $a0, $a0, 0x5dd0
 /* 226C 80026E6C 3C05000E */  lui       $a1, 0xe
 /* 2270 80026E70 24A579B0 */  addiu     $a1, $a1, 0x79b0
-/* 2274 80026E74 3C068011 */  lui       $a2, %hi(D_8010F6D0)
-/* 2278 80026E78 24C6F6D0 */  addiu     $a2, $a2, %lo(D_8010F6D0)
+/* 2274 80026E74 3C068011 */  lui       $a2, %hi(update_entities)
+/* 2278 80026E78 24C6F6D0 */  addiu     $a2, $a2, %lo(update_entities)
 /* 227C 80026E7C 0C00A5CF */  jal       dma_copy
 /* 2280 80026E80 00000000 */   nop      
 /* 2284 80026E84 3C040011 */  lui       $a0, 0x11
diff --git a/src/audio.h b/src/audio.h
index 6c44f5e187..8ca7d246df 100644
--- a/src/audio.h
+++ b/src/audio.h
@@ -289,7 +289,7 @@ void func_800533A8(UnkAl2*);
 void func_80053654(UnkAl19E0*);
 void func_80053A18(UnkStructFor80053A18* arg0);
 void func_80053A28(s32);
-void func_80053A98(s16 arg0, s32 arg1, s32 arg2);
+void func_80053A98(u8 arg0, u16 arg1, s32 arg2);
 void func_80053BA8(UnkAl1*);
 void func_80054CE0(s32, s32);
 void func_8005610C(void);
diff --git a/src/code_2e230_len_2190.c b/src/code_2e230_len_2190.c
index 4c109d792e..4ab91734bb 100644
--- a/src/code_2e230_len_2190.c
+++ b/src/code_2e230_len_2190.c
@@ -21,8 +21,6 @@ void func_80052E5C(s32 arg0) {
     UnkAl6CC** temp2_1;
     UnkAlA9C** temp3;
     UnkAl48* temp5;
-    u8* temp7;
-    s32** temp8;
 
     alHeap = D_80078E54->unk_18;
     *temp_s4 = alHeapAlloc(alHeap, 1, 0x19E0);
@@ -95,31 +93,31 @@ void func_80052E5C(s32 arg0) {
     temp2_1 = &D_8009A640;
     temp3 = &D_8009A5FC;
     temp1_1 = &D_8009A664;
-    func_8004E158((*temp1_1), 1, 0, temp4);
+
+    func_8004E158(*temp1_1, 1, 0, temp4);
     temp6[0] = 0;
     temp6[1] = 3;
     temp6[2] = 0xff;
     temp6[3] = 0xff;
-    temp7 = &temp6[0];
-    func_8004E344((*temp1_1), temp7);
-    func_8004E158((*temp3), 2, 2, temp4);
+    func_8004E344(*temp1_1, &temp6);
+    func_8004E158(*temp3, 2, 2, temp4);
     temp6[0] = 2;
     temp6[1] = 0xff;
     temp6[2] = 0xff;
     temp6[3] = 0xff;
-    func_8004E344((*temp3), temp7);
-    func_8004B440((*temp2_1), 4, 1, temp4, 0x10);
+    func_8004E344(*temp3, &temp6);
+    func_8004B440(*temp2_1, 4, 1, temp4, 0x10);
     func_80050B90(D_8009A628, 6, 1, temp4);
     func_80052614(temp4);
     al_LoadBKHeaders(temp4, alHeap);
-    if (al_CopyFileTableEntry(temp4->unk_3C->unk_0, 0x20, &subroutine_arg7) == 0) {
+    if (al_CopyFileTableEntry(temp4->unk_3C->unk_0, 0x20, subroutine_arg7) == 0) {
         al_DmaCopy(subroutine_arg7[0], temp4->unk_A0, subroutine_arg7[1] & 0xFFFFFF);
     }
     func_8004B62C((*temp2_1));
     if (al_CopyFileTableEntry(temp4->unk_3C->unk_2, 0x40, subroutine_arg7) == 0) {
         al_LoadPER(temp4, subroutine_arg7[0]);
     }
-    if (al_CopyFileTableEntry(temp4->unk_3C->unk_4, 0x40, &subroutine_arg7) == 0) {
+    if (al_CopyFileTableEntry(temp4->unk_3C->unk_4, 0x40, subroutine_arg7) == 0) {
         al_LoadPRG(temp4, subroutine_arg7[0]);
     }
 
@@ -380,8 +378,8 @@ void func_80053A18(UnkStructFor80053A18* arg0) {
 
 INCLUDE_ASM(void, "code_2e230_len_2190", func_80053A28, s32 arg0);
 
-void func_80053A98(s16 arg0, s32 arg1, s32 arg2) {
-    func_80056D78(arg0, (u32) ((u16)arg1 * arg2) >> 15);
+void func_80053A98(u8 arg0, u16 arg1, s32 arg2) {
+    func_80056D78(arg0, (u32) (arg1 * arg2) >> 15);
 }
 
 void func_80053AC8(UnkAl1* arg0) {
@@ -439,7 +437,7 @@ INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053E58);
 
 UnkAlA9C* func_80053F64(s32 arg0) {
     if (arg0 == 0) {
-        return D_8009A5C0->unk_6C[0].unk_0; // 0x6C
+        return D_8009A5C0->unk_6C[0].unk_0;
     }
     return NULL;
 }
diff --git a/src/code_303c0_len_3e10.c b/src/code_303c0_len_3e10.c
index 1cc72aac02..d12bee1c09 100644
--- a/src/code_303c0_len_3e10.c
+++ b/src/code_303c0_len_3e10.c
@@ -82,7 +82,6 @@ s32 func_8005553C(s32 arg0, s32 arg1) {
     return ret;
 }
 
-
 s32 func_80055590(s32 arg0, s32 arg1) {
     s32 ret = func_80050C30(arg0);
 
diff --git a/tools/n64splat b/tools/n64splat
index a515a468e1..33c1f8eb4a 160000
--- a/tools/n64splat
+++ b/tools/n64splat
@@ -1 +1 @@
-Subproject commit a515a468e1bf9abec6472293d75ee8a1d6615efc
+Subproject commit 33c1f8eb4ac4da83262eadb62fe9104470242ddd