Merge branch 'master' into tokeidai

tools/disasm/disasm.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
 import argparse, ast, math, os, re, struct
+import bisect
 from mips_isa import *
 from multiprocessing import Pool
 
@@ -88,11 +89,11 @@ multiply_referenced_rodata = set() # rodata with more than 1 reference outside o
 files = set()          # vram start of file
 
 vrom_variables = list() # (name,addr)
+vrom_addrs = set()     # set of addrs from vrom_variables, for faster lookup
 
 functions_ast = None
 variables_ast = None
-
-vars_cache = {} # (address: variable + addend)
+variable_addrs = None
 
 def proper_name(symbol, in_data=False, is_symbol=True):
     # hacks
@@ -116,7 +117,7 @@ def proper_name(symbol, in_data=False, is_symbol=True):
         return functions_ast[symbol][0]
     elif symbol in variables_ast.keys():
         return variables_ast[symbol][0]
-    elif symbol in [addr for _,addr in vrom_variables]:
+    elif symbol in vrom_addrs:
         # prefer "start" vrom symbols
         if symbol in [addr for name,addr in vrom_variables if "SegmentRomStart" in name]:
             return [name for name,addr in vrom_variables if "SegmentRomStart" in name and addr == symbol][0]
@@ -124,8 +125,15 @@ def proper_name(symbol, in_data=False, is_symbol=True):
             return [name for name,addr in vrom_variables if addr == symbol][0]
 
     # addends
-    if is_symbol and symbol in vars_cache.keys():
-        return vars_cache[symbol]
+    if is_symbol:
+        symbol_index = bisect.bisect(variable_addrs, symbol)
+        if symbol_index:
+            vram_addr = variable_addrs[symbol_index-1]
+            symbol_name, _, _, symbol_size = variables_ast[vram_addr]
+
+            if vram_addr < symbol < vram_addr + symbol_size:
+                return f"{symbol_name} + 0x{symbol-vram_addr:X}"
+
 
     # generated names
     if symbol in functions and not in_data:
@@ -142,7 +150,7 @@ def proper_name(symbol, in_data=False, is_symbol=True):
 
 def lookup_name(symbol, word):
     # hacks for vrom variables in data
-    if word in [addr for _,addr in vrom_variables]:
+    if word in vrom_addrs:
         if word == 0: # no makerom segment start
             return "0x00000000"
         if symbol in [0x801AE4A0, # effect table
@@ -1112,13 +1120,8 @@ with open("tools/disasm/functions.txt", "r") as infile:
 with open("tools/disasm/variables.txt", "r") as infile:
     variables_ast = ast.literal_eval(infile.read())
 
-# Precompute variable addends for all variables, this uses a lot of memory but the lookups later are fast
+# Find floats, doubles, and strings
 for var in sorted(variables_ast.keys()):
-    for i in range(var, var + variables_ast[var][3], 1):
-        addend = i - var
-        assert addend >= 0
-        vars_cache.update({i : f"{variables_ast[var][0]}" + (f" + 0x{addend:X}" if addend > 0 else "")})
-    # also add to floats, doubles & strings
     var_type = variables_ast[var][1]
 
     if var_type == "f64":
@@ -1164,6 +1167,9 @@ for segment in files_spec:
     if segment[3][-1][1] not in variables_ast:
         variables_ast.update({segment[3][-1][1] : (f"_{segment[0]}SegmentEnd","u8","[]",0x1)})
 
+# Construct variable_addrs, now that variable_addrs is fully constructed
+variable_addrs = sorted(variables_ast.keys())
+
 pool = Pool(jobs)
 # Find symbols for each segment
 for segment in files_spec:
@@ -1219,6 +1225,9 @@ for segment in files_spec:
                 i += 1
                 dmadata_entry = dmadata[i*0x10:(i+1)*0x10]
 
+# Construct vrom_addrs, now that vrom_variables is fully constructed
+vrom_addrs = {addr for _, addr in vrom_variables}
+
 def disassemble_makerom(segment):
     os.makedirs(f"{ASM_OUT}/makerom/", exist_ok=True)
     rom_header = segment[3][0][4]

tools/disasm/files.txt

@@ -366,7 +366,6 @@
             0x800BFB80 : "z_bgcheck",
             0x800CAAD0 : "z_bg_collect",
             0x800CAE10 : "z_bg_item",
-            0x800CB000 : "code_800CB000",
             0x800CB210 : "z_camera",
             0x800E03A0 : "z_collision_btltbls",
             0x800E0400 : "[PADDING]",
@@ -485,6 +484,7 @@
             0x8018EB60 : "audio_load",
             0x80192BE0 : "code_80192BE0",
             0x80194710 : "code_80194710",
+            0x80194790 : "code_80194790",
             0x80194930 : "audio_playback",
             0x80196A00 : "audio_effects",
             0x801974D0 : "audio_seqplayer",
@@ -492,16 +492,18 @@
             0x8019AEB0 : "[PADDING]",
             0x8019AEC0 : "code_8019AEC0",
             0x8019AF00 : "code_8019AF00",
+            0x801A4EB0 : "code_801A4EB0",
             0x801A51F0 : "code_801A51F0",
             0x801A5BC0 : "[PADDING]",
             0x801A5BD0 : "code_801A5BD0",
             0x801A7B10 : "code_801A7B10",
-            0x801AA020 : "code_801AA020",
+            0x801A9B10 : "jpegutils",
+            0x801AA020 : "jpegdecoder",
             0x801AA610 : "z_game_over",
             0x801AAAA0 : "z_construct",
 
             # .data section
-            0x801AAAB0 : "z_en_a_keep",
+            0x801AAAB0 : "rsp",
             0x801ADE60 : "",
             0x801ADEC0 : "z_en_item00",
             0x801AE240 : "z_eff_blure",
@@ -528,6 +530,7 @@
             0x801BD910 : "",
             0x801BDA70 : "z_horse",
             0x801BDAC0 : "z_jpeg",
+            0x801BDB00 : "z_kaleido_setup",
             0x801BDB30 : "z_kanfont",
             0x801BDB90 : "z_kankyo",
             0x801BE960 : "z_lib",
@@ -574,11 +577,20 @@
             0x801D15D0 : "sys_math_atan",
             0x801D1DE0 : "sys_matrix",
             0x801D1E70 : "",
-            0x801D2E80 : "", # audio_heap?
-            0x801D3D90 : "",
-            0x801D55B0 : "",
+            0x801D2E80 : "audio_data",
+            0x801D5FB0 : "audio_synthesis",
+            0x801D5FE0 : "audio_load",
+            0x801D5FF0 : "code_80192BE0",
+            0x801D6010 : "code_80194790",
+            0x801D6190 : "audio_effects",
+            0x801D61A0 : "audio_seqplayer",
+            0x801D6200 : "audio_dramStack",
+            0x801D6600 : "code_8019AF00",
+            0x801D8BE0 : "code_801A4EB0",
             0x801D8E50 : "code_801A51F0",
-            0x801D9090 : "",
+            0x801D9090 : "audio_sound_params",
+            0x801DB470 : "code_801A5BD0",
+            0x801DB4C0 : "code_801A7B10",
 
             # .rodata section
             0x801DBDF0 : "z_en_item00",
@@ -592,7 +604,7 @@
             0x801DC9D0 : "z_actor",
             0x801DCBB0 : "z_actor_dlftbls",
             0x801DCC00 : "z_bgcheck",
-            0x801DCDB0 : "code_800CB000",
+			0x801DCDB0 : "z_bg_item",
             0x801DCDC0 : "z_camera",
             0x801DD5C0 : "z_collision_check",
             0x801DD600 : "z_debug_mode",
@@ -659,9 +671,9 @@
             0x801E0EC0 : "code_801A51F0",
             0x801E1050 : "code_801A5BD0",
             0x801E1070 : "code_801A7B10",
-            0x801E1100 : "code_801AA020",
+            0x801E1100 : "audio_init_params",
             0x801E1110 : "z_game_over",
-            0x801E1180 : "",
+            0x801E1180 : "rsp",
 
             # .bss section
             0x801E3FA0 : "code_801E3FA0",
@@ -715,9 +727,9 @@
             0x801FD140 : "audio_load",
             0x801FD1F0 : "code_8019AF00",
             0x801FD5A0 : "code_801A51F0",
-            0x801FE7C0 : "code_801A5BD0",
+            0x801FD710 : "code_801A5BD0",
             0x801FFD00 : "code_801A7B10",
-            0x80208E90 : "code_801AA020",
+            0x80208E90 : "jpegdecoder",
             0x80208EA0 : "gfxbuffers",
             0x8024A4C0 : "buffers",
         },

tools/disasm/functions.txt

@@ -899,162 +899,162 @@
     0x800BFA78:("ActorOverlayTable_FaultAddrConv",),
     0x800BFAE8:("ActorOverlayTable_Init",),
     0x800BFB40:("ActorOverlayTable_Cleanup",),
-    0x800BFB80:("BgCheck_PolygonLinkedListNodeInit",),
-    0x800BFB9C:("BgCheck_PolygonLinkedListResetHead",),
-    0x800BFBAC:("BgCheck_ScenePolygonListsNodeInsert",),
-    0x800BFC04:("BgCheck_PolygonLinkedListNodeInsert",),
-    0x800BFC5C:("BgCheck_PolygonLinkedListInit",),
-    0x800BFC70:("BgCheck_PolygonLinkedListAlloc",),
-    0x800BFCC0:("BgCheck_PolygonLinkedListReset",),
-    0x800BFCCC:("BgCheck_AllocPolygonLinkedListNode",),
-    0x800BFCFC:("BgCheck_CreateVec3fFromVertex",),
-    0x800BFD40:("BgCheck_CreateVertexFromVec3f",),
+    0x800BFB80:("SSNode_SetValue",),
+    0x800BFB9C:("SSList_SetNull",),
+    0x800BFBAC:("SSNodeList_SetSSListHead",),
+    0x800BFC04:("DynaSSNodeList_SetSSListHead",),
+    0x800BFC5C:("DynaSSNodeList_Init",),
+    0x800BFC70:("DynaSSNodeList_Alloc",),
+    0x800BFCC0:("DynaSSNodeList_ResetCount",),
+    0x800BFCCC:("DynaSSNodeList_GetNextNodeIdx",),
+    0x800BFCFC:("BgCheck_Vec3sToVec3f",),
+    0x800BFD40:("BgCheck_Vec3fToVec3s",),
     0x800BFD84:("func_800BFD84",),
     0x800BFDEC:("func_800BFDEC",),
-    0x800BFFC4:("BgCheck_PolygonGetMinY",),
-    0x800C003C:("BgCheck_PolygonGetNormal",),
+    0x800BFFC4:("CollisionPoly_GetMinY",),
+    0x800C003C:("CollisionPoly_GetNormalF",),
     0x800C0094:("func_800C0094",),
-    0x800C01B8:("func_800C01B8",),
-    0x800C0220:("BgCheck_CreateTriNormFromPolygon",),
-    0x800C02C0:("func_800C02C0",),
-    0x800C0340:("func_800C0340",),
-    0x800C0474:("func_800C0474",),
-    0x800C0668:("func_800C0668",),
-    0x800C06A8:("func_800C06A8",),
-    0x800C074C:("func_800C074C",),
-    0x800C07F0:("func_800C07F0",),
-    0x800C0AF0:("BgCheck_PolygonCollidesWithSphere",),
-    0x800C0BC0:("BgCheck_ScenePolygonListsInsertSorted",),
-    0x800C0DE0:("BgCheck_ScenePolygonListsInsert",),
-    0x800C0E74:("func_800C0E74",),
-    0x800C10FC:("func_800C10FC",),
-    0x800C1238:("func_800C1238",),
-    0x800C12A4:("func_800C12A4",),
-    0x800C1B68:("func_800C1B68",),
-    0x800C1D7C:("func_800C1D7C",),
-    0x800C2008:("func_800C2008",),
-    0x800C20F4:("func_800C20F4",),
-    0x800C2310:("func_800C2310",),
-    0x800C2460:("func_800C2460",),
-    0x800C2514:("func_800C2514",),
-    0x800C25E0:("func_800C25E0",),
-    0x800C26C0:("BgCheck_GetPolyMinSubdivisions",),
-    0x800C2864:("BgCheck_GetPolyMaxSubdivisions",),
-    0x800C2A30:("BgCheck_GetPolyMinMaxSubdivisions",),
-    0x800C2BE0:("func_800C2BE0",),
-    0x800C3334:("BgCheck_SplitScenePolygonsIntoSubdivisions",),
-    0x800C3734:("BgCheck_GetIsDefaultSpecialScene",),
-    0x800C3778:("BgCheck_GetSpecialSceneMaxMemory",),
-    0x800C37BC:("BgCheck_CalcSubdivisionSize",),
+    0x800C01B8:("CollisionPoly_GetPointDistanceFromPlane",),
+    0x800C0220:("CollisionPoly_GetVertices",),
+    0x800C02C0:("CollisionPoly_GetVerticesByBgId",),
+    0x800C0340:("CollisionPoly_CheckYIntersectApprox1",),
+    0x800C0474:("CollisionPoly_CheckYIntersect",),
+    0x800C0668:("CollisionPoly_CheckYIntersectApprox2",),
+    0x800C06A8:("CollisionPoly_CheckXIntersectApprox",),
+    0x800C074C:("CollisionPoly_CheckZIntersectApprox",),
+    0x800C07F0:("CollisionPoly_LineVsPoly",),
+    0x800C0AF0:("CollisionPoly_SphVsPoly",),
+    0x800C0BC0:("StaticLookup_AddPolyToSSList",),
+    0x800C0DE0:("StaticLookup_AddPoly",),
+    0x800C0E74:("BgCheck_RaycastFloorStaticList",),
+    0x800C10FC:("BgCheck_RaycastFloorStatic",),
+    0x800C1238:("BgCheck_ComputeWallDisplacement",),
+    0x800C12A4:("BgCheck_SphVsStaticWall",),
+    0x800C1B68:("BgCheck_CheckStaticCeiling",),
+    0x800C1D7C:("BgCheck_CheckLineAgainstSSList",),
+    0x800C2008:("BgCheck_CheckLineInSubdivision",),
+    0x800C20F4:("BgCheck_SphVsFirstStaticPolyList",),
+    0x800C2310:("BgCheck_SphVsFirstStaticPoly",),
+    0x800C2460:("BgCheck_GetNearestStaticLookup",),
+    0x800C2514:("BgCheck_GetStaticLookup",),
+    0x800C25E0:("BgCheck_GetStaticLookupIndicesFromPos",),
+    0x800C26C0:("BgCheck_GetSubdivisionMinBounds",),
+    0x800C2864:("BgCheck_GetSubdivisionMaxBounds",),
+    0x800C2A30:("BgCheck_GetPolySubdivisionBounds",),
+    0x800C2BE0:("BgCheck_PolyIntersectsSubdivision",),
+    0x800C3334:("BgCheck_InitStaticLookup",),
+    0x800C3734:("BgCheck_IsSmallMemScene",),
+    0x800C3778:("BgCheck_TryGetCustomMemsize",),
+    0x800C37BC:("BgCheck_SetSubdivisionDimension",),
     0x800C3844:("BgCheck_GetSpecialSceneMaxObjects",),
-    0x800C389C:("BgCheck_Init",),
-    0x800C3C00:("func_800C3C00",),
-    0x800C3C14:("func_800C3C14",),
-    0x800C3C2C:("BgCheck_GetActorMeshHeader",),
-    0x800C3C94:("func_800C3C94",),
-    0x800C3D50:("func_800C3D50",),
-    0x800C3F40:("func_800C3F40",),
-    0x800C3FA0:("func_800C3FA0",),
-    0x800C4000:("func_800C4000",),
-    0x800C4058:("func_800C4058",),
-    0x800C40B4:("func_800C40B4",),
-    0x800C411C:("func_800C411C",),
-    0x800C4188:("func_800C4188",),
-    0x800C41E4:("func_800C41E4",),
-    0x800C4240:("func_800C4240",),
-    0x800C42A8:("func_800C42A8",),
-    0x800C4314:("func_800C4314",),
-    0x800C43CC:("func_800C43CC",),
-    0x800C4488:("func_800C4488",),
-    0x800C44F0:("func_800C44F0",),
-    0x800C455C:("func_800C455C",),
-    0x800C45C4:("func_800C45C4",),
-    0x800C4C74:("func_800C4C74",),
-    0x800C4CD8:("func_800C4CD8",),
-    0x800C4D3C:("func_800C4D3C",),
-    0x800C4DA4:("func_800C4DA4",),
-    0x800C4E10:("func_800C4E10",),
-    0x800C4F38:("func_800C4F38",),
-    0x800C4F84:("func_800C4F84",),
-    0x800C4FD4:("func_800C4FD4",),
-    0x800C5464:("func_800C5464",),
-    0x800C54AC:("func_800C54AC",),
-    0x800C5538:("func_800C5538",),
-    0x800C55C4:("func_800C55C4",),
-    0x800C5650:("func_800C5650",),
-    0x800C56E0:("func_800C56E0",),
-    0x800C576C:("func_800C576C",),
-    0x800C57F8:("func_800C57F8",),
-    0x800C583C:("func_800C583C",),
-    0x800C58C8:("func_800C58C8",),
-    0x800C5954:("func_800C5954",),
-    0x800C5A20:("func_800C5A20",),
-    0x800C5A64:("func_800C5A64",),
-    0x800C5AAC:("BgCheck_ScenePolygonListsInit",),
-    0x800C5AC4:("BgCheck_ScenePolygonListsAlloc",),
-    0x800C5B80:("func_800C5B80",),
-    0x800C5BBC:("BgCheck_ScenePolygonListsReserveNode",),
-    0x800C5BD0:("BgCheck_ActorMeshParamsInit",),
-    0x800C5C0C:("BgCheck_SetActorMeshParams",),
-    0x800C5C5C:("BgCheck_AreActorMeshParamsEqual",),
-    0x800C5D30:("BgCheck_ActorMeshPolyListsHeadsInit",),
-    0x800C5D70:("BgCheck_ActorMeshPolyListsInit",),
-    0x800C5D90:("BgCheck_ActorMeshVerticesIndexInit",),
-    0x800C5D9C:("BgCheck_ActorMeshWaterboxesIndexInit",),
-    0x800C5DA8:("BgCheck_ActorMeshInit",),
-    0x800C5E10:("BgCheck_ActorMeshInitFromActor",),
-    0x800C5EC8:("BgCheck_HasActorMeshChanged",),
-    0x800C5EF0:("BgCheck_PolygonsInit",),
-    0x800C5EFC:("BgCheck_PolygonsAlloc",),
-    0x800C5F38:("BgCheck_VerticesInit",),
-    0x800C5F44:("BgCheck_VerticesListAlloc",),
-    0x800C5F8C:("BgCheck_WaterboxListInit",),
-    0x800C5F9C:("BgCheck_WaterboxListAlloc",),
-    0x800C5FD8:("BgCheck_ActorMeshUpdateParams",),
-    0x800C6024:("BgCheck_IsActorMeshIndexValid",),
-    0x800C6044:("BgCheck_DynaInit",),
-    0x800C6098:("BgCheck_DynaAlloc",),
-    0x800C6188:("BgCheck_AddActorMesh",),
-    0x800C6248:("BgCheck_GetActorOfMesh",),
+    0x800C389C:("BgCheck_Allocate",),
+    0x800C3C00:("BgCheck_SetContextFlags",),
+    0x800C3C14:("BgCheck_UnsetContextFlags",),
+    0x800C3C2C:("BgCheck_GetCollisionHeader",),
+    0x800C3C94:("BgCheck_PosInStaticBoundingBox",),
+    0x800C3D50:("BgCheck_RaycastFloorImpl",),
+    0x800C3F40:("BgCheck_CameraRaycastFloor1",),
+    0x800C3FA0:("BgCheck_EntityRaycastFloor1",),
+    0x800C4000:("BgCheck_EntityRaycastFloor2",),
+    0x800C4058:("BgCheck_EntityRaycastFloor2_1",),
+    0x800C40B4:("BgCheck_EntityRaycastFloor3",),
+    0x800C411C:("BgCheck_EntityRaycastFloor5",),
+    0x800C4188:("BgCheck_EntityRaycastFloor5_2",),
+    0x800C41E4:("BgCheck_EntityRaycastFloor5_3",),
+    0x800C4240:("BgCheck_EntityRaycastFloor6",),
+    0x800C42A8:("BgCheck_EntityRaycastFloor7",),
+    0x800C4314:("BgCheck_AnyRaycastFloor1",),
+    0x800C43CC:("BgCheck_AnyRaycastFloor2",),
+    0x800C4488:("BgCheck_CameraRaycastFloor2",),
+    0x800C44F0:("BgCheck_EntityRaycastFloor8",),
+    0x800C455C:("BgCheck_EntityRaycastFloor9",),
+    0x800C45C4:("BgCheck_CheckWallImpl",),
+    0x800C4C74:("BgCheck_EntitySphVsWall1",),
+    0x800C4CD8:("BgCheck_EntitySphVsWall2",),
+    0x800C4D3C:("BgCheck_EntitySphVsWall3",),
+    0x800C4DA4:("BgCheck_EntitySphVsWall4",),
+    0x800C4E10:("BgCheck_CheckCeilingImpl",),
+    0x800C4F38:("BgCheck_AnyCheckCeiling",),
+    0x800C4F84:("BgCheck_EntityCheckCeiling",),
+    0x800C4FD4:("BgCheck_CheckLineImpl",),
+    0x800C5464:("BgCheck_GetBccFlags",),
+    0x800C54AC:("BgCheck_CameraLineTest1",),
+    0x800C5538:("BgCheck_CameraLineTest2",),
+    0x800C55C4:("BgCheck_EntityLineTest1",),
+    0x800C5650:("BgCheck_EntityLineTest2",),
+    0x800C56E0:("BgCheck_EntityLineTest3",),
+    0x800C576C:("BgCheck_ProjectileLineTest",),
+    0x800C57F8:("BgCheck_AnyLineTest1",),
+    0x800C583C:("BgCheck_AnyLineTest2",),
+    0x800C58C8:("BgCheck_AnyLineTest3",),
+    0x800C5954:("BgCheck_SphVsFirstPolyImpl",),
+    0x800C5A20:("BgCheck_SphVsFirstPoly",),
+    0x800C5A64:("BgCheck_SphVsFirstWall",),
+    0x800C5AAC:("SSNodeList_Init",),
+    0x800C5AC4:("SSNodeList_Alloc",),
+    0x800C5B80:("SSNodeList_GetNextNode",),
+    0x800C5BBC:("SSNodeList_GetNextNodeIdx",),
+    0x800C5BD0:("ScaleRotPos_Init",),
+    0x800C5C0C:("ScaleRotPos_SetValue",),
+    0x800C5C5C:("ScaleRotPos_Equals",),
+    0x800C5D30:("DynaLookup_ResetLists",),
+    0x800C5D70:("DynaLookup_Reset",),
+    0x800C5D90:("DynaLookup_ResetVtxStartIndex",),
+    0x800C5D9C:("DynaLookup_ResetWaterBoxStartIndex",),
+    0x800C5DA8:("BgActor_Init",),
+    0x800C5E10:("BgActor_SetActor",),
+    0x800C5EC8:("BgActor_IsTransformUnchanged",),
+    0x800C5EF0:("DynaPoly_NullPolyList",),
+    0x800C5EFC:("DynaPoly_AllocPolyList",),
+    0x800C5F38:("DynaPoly_NullVtxList",),
+    0x800C5F44:("DynaPoly_AllocVtxList",),
+    0x800C5F8C:("DynaPoly_InitWaterBoxList",),
+    0x800C5F9C:("DynaPoly_AllocWaterBoxList",),
+    0x800C5FD8:("DynaPoly_SetBgActorPrevTransform",),
+    0x800C6024:("DynaPoly_IsBgIdBgActor",),
+    0x800C6044:("DynaPoly_Init",),
+    0x800C6098:("DynaPoly_Alloc",),
+    0x800C6188:("DynaPoly_SetBgActor",),
+    0x800C6248:("DynaPoly_GetActor",),
     0x800C62BC:("func_800C62BC",),
     0x800C6314:("func_800C6314",),
     0x800C636C:("func_800C636C",),
     0x800C63C4:("func_800C63C4",),
     0x800C641C:("func_800C641C",),
     0x800C6474:("func_800C6474",),
-    0x800C64CC:("BgCheck_RemoveActorMesh",),
+    0x800C64CC:("DynaPoly_DeleteBgActor",),
     0x800C6554:("func_800C6554",),
     0x800C656C:("BgCheck_CalcWaterboxDimensions",),
-    0x800C6838:("BgCheck_AddActorMeshToLists",),
+    0x800C6838:("DynaPoly_ExpandSRT",),
     0x800C734C:("BgCheck_ResetFlagsIfLoadedActor",),
-    0x800C73E4:("BgCheck_Update",),
+    0x800C73E4:("DynaPoly_Setup",),
     0x800C756C:("func_800C756C",),
-    0x800C765C:("BgCheck_UpdateAllActorMeshes",),
-    0x800C76EC:("func_800C76EC",),
-    0x800C7974:("func_800C7974",),
-    0x800C7E40:("func_800C7E40",),
-    0x800C8580:("func_800C8580",),
-    0x800C87D0:("func_800C87D0",),
-    0x800C8A60:("func_800C8A60",),
-    0x800C8BD0:("func_800C8BD0",),
-    0x800C8DC0:("func_800C8DC0",),
-    0x800C8EEC:("func_800C8EEC",),
-    0x800C90AC:("func_800C90AC",),
-    0x800C921C:("func_800C921C",),
-    0x800C9380:("func_800C9380",),
-    0x800C94E0:("BgCheck_RelocateMeshHeaderPointers",),
-    0x800C9564:("BgCheck_RelocateMeshHeader",),
-    0x800C9598:("BgCheck_RelocateAllMeshHeaders",),
-    0x800C9640:("func_800C9640",),
-    0x800C9694:("BgCheck_GetPolygonAttributes",),
-    0x800C9704:("func_800C9704",),
+    0x800C765C:("DynaPoly_UpdateBgActorTransforms",),
+    0x800C76EC:("BgCheck_RaycastFloorDynaList",),
+    0x800C7974:("BgCheck_RaycastFloorDyna",),
+    0x800C7E40:("BgCheck_SphVsDynaWallInBgActor",),
+    0x800C8580:("BgCheck_SphVsDynaWall",),
+    0x800C87D0:("BgCheck_CheckDynaCeilingList",),
+    0x800C8A60:("BgCheck_CheckDynaCeiling",),
+    0x800C8BD0:("BgCheck_CheckLineAgainstBgActorSSList",),
+    0x800C8DC0:("BgCheck_CheckLineAgainstBgActor",),
+    0x800C8EEC:("BgCheck_CheckLineAgainstDyna",),
+    0x800C90AC:("BgCheck_SphVsFirstDynaPolyList",),
+    0x800C921C:("BgCheck_SphVsFirstDynaPolyInBgActor",),
+    0x800C9380:("BgCheck_SphVsFirstDynaPoly",),
+    0x800C94E0:("CollisionHeader_SegmentedToVirtual",),
+    0x800C9564:("CollisionHeader_GetVirtual",),
+    0x800C9598:("BgCheck_InitCollisionHeaders",),
+    0x800C9640:("BgCheck_ResetPolyCheckTbl",),
+    0x800C9694:("SurfaceType_GetData",),
+    0x800C9704:("SurfaceType_GetCamDataIndex",),
     0x800C9728:("func_800C9728",),
-    0x800C9770:("func_800C9770",),
+    0x800C9770:("SurfaceType_GetCameraSetting",),
     0x800C97F8:("func_800C97F8",),
     0x800C9844:("func_800C9844",),
     0x800C98CC:("func_800C98CC",),
-    0x800C9924:("func_800C9924",),
-    0x800C99AC:("func_800C99AC",),
+    0x800C9924:("SurfaceType_GetCamPosData",),
+    0x800C99AC:("SurfaceType_GetSceneExitIndex",),
     0x800C99D4:("func_800C99D4",),
     0x800C99FC:("func_800C99FC",),
     0x800C9A24:("func_800C9A24",),
@@ -1065,30 +1065,30 @@
     0x800C9B18:("func_800C9B18",),
     0x800C9B40:("func_800C9B40",),
     0x800C9B68:("func_800C9B68",),
-    0x800C9B90:("func_800C9B90",),
+    0x800C9B90:("SurfaceType_IsHorseBlocked",),
     0x800C9BB8:("func_800C9BB8",),
-    0x800C9BDC:("func_800C9BDC",),
+    0x800C9BDC:("SurfaceType_GetSfx",),
     0x800C9C24:("func_800C9C24",),
-    0x800C9C74:("func_800C9C74",),
-    0x800C9C9C:("func_800C9C9C",),
-    0x800C9CC4:("func_800C9CC4",),
-    0x800C9CEC:("func_800C9CEC",),
-    0x800C9D14:("func_800C9D14",),
-    0x800C9D50:("func_800C9D50",),
-    0x800C9D8C:("func_800C9D8C",),
+    0x800C9C74:("SurfaceType_GetSlope",),
+    0x800C9C9C:("SurfaceType_GetLightSettingIndex",),
+    0x800C9CC4:("SurfaceType_GetEcho",),
+    0x800C9CEC:("SurfaceType_IsHookshotSurface",),
+    0x800C9D14:("SurfaceType_IsIgnoredByEntities",),
+    0x800C9D50:("SurfaceType_IsIgnoredByProjectiles",),
+    0x800C9D8C:("SurfaceType_IsConveyor",),
     0x800C9DDC:("func_800C9DDC",),
-    0x800C9E18:("func_800C9E18",),
-    0x800C9E40:("func_800C9E40",),
-    0x800C9E88:("func_800C9E88",),
-    0x800C9EBC:("func_800C9EBC",),
-    0x800CA1AC:("func_800CA1AC",),
-    0x800CA1E8:("func_800CA1E8",),
-    0x800CA22C:("func_800CA22C",),
+    0x800C9E18:("SurfaceType_GetConveyorSpeed",),
+    0x800C9E40:("SurfaceType_GetConveyorDirection",),
+    0x800C9E88:("SurfaceType_IsWallDamage",),
+    0x800C9EBC:("WaterBox_GetSurfaceImpl",),
+    0x800CA1AC:("WaterBox_GetSurface1",),
+    0x800CA1E8:("WaterBox_GetSurface1_2",),
+    0x800CA22C:("WaterBox_GetSurface2",),
     0x800CA568:("func_800CA568",),
-    0x800CA634:("func_800CA634",),
-    0x800CA648:("func_800CA648",),
+    0x800CA634:("WaterBox_GetCamDataIndex",),
+    0x800CA648:("WaterBox_GetCameraSetting",),
     0x800CA6B8:("func_800CA6B8",),
-    0x800CA6D8:("func_800CA6D8",),
+    0x800CA6D8:("WaterBox_GetLightSettingIndex",),
     0x800CA6F0:("func_800CA6F0",),
     0x800CA9D0:("func_800CA9D0",),
     0x800CAA14:("func_800CAA14",),
@@ -1096,22 +1096,22 @@
     0x800CAC0C:("BgCheck2_UpdateActorYRotation",),
     0x800CACA0:("BgCheck2_AttachToMesh",),
     0x800CAD2C:("BgCheck2_UpdateActorAttachedToMesh",),
-    0x800CAE10:("BcCheck3_BgActorInit",),
-    0x800CAE34:("BgCheck3_LoadMesh",),
-    0x800CAE7C:("BgCheck3_ResetFlags",),
-    0x800CAE88:("func_800CAE88",),
-    0x800CAE9C:("func_800CAE9C",),
-    0x800CAEB0:("func_800CAEB0",),
-    0x800CAEE0:("func_800CAEE0",),
-    0x800CAEF4:("func_800CAEF4",),
-    0x800CAF24:("func_800CAF24",),
-    0x800CAF38:("func_800CAF38",),
-    0x800CAF4C:("func_800CAF4C",),
-    0x800CAF70:("func_800CAF70",),
-    0x800CAF94:("func_800CAF94",),
-    0x800CAFB8:("func_800CAFB8",),
-    0x800CAFDC:("func_800CAFDC",),
-    0x800CB000:("func_800CB000",),
+    0x800CAE10:("DynaPolyActor_Init",),
+    0x800CAE34:("DynaPolyActor_LoadMesh",),
+    0x800CAE7C:("DynaPolyActor_ResetState",),
+    0x800CAE88:("DynaPolyActor_SetRidingFallingState",),
+    0x800CAE9C:("DynaPolyActor_SetRidingMovingState",),
+    0x800CAEB0:("DynaPolyActor_SetRidingMovingStateByIndex",),
+    0x800CAEE0:("DynaPolyActor_SetRidingRotatingState",),
+    0x800CAEF4:("DynaPolyActor_SetRidingRotatingStateByIndex",),
+    0x800CAF24:("DynaPolyActor_SetSwitchPressedState",),
+    0x800CAF38:("DynaPolyActor_SetHeavySwitchPressedState",),
+    0x800CAF4C:("DynaPolyActor_IsInRidingFallingState",),
+    0x800CAF70:("DynaPolyActor_IsInRidingMovingState",),
+    0x800CAF94:("DynaPolyActor_IsInRidingRotatingState",),
+    0x800CAFB8:("DynaPolyActor_IsInSwitchPressedState",),
+    0x800CAFDC:("DynaPolyActor_IsInHeavySwitchPressedState",),
+    0x800CB000:("DynaPolyActor_ValidateMove",),
     0x800CB210:("Camera_fabsf",),
     0x800CB240:("Camera_LengthVec3f",),
     0x800CB270:("func_800CB270",),
@@ -1615,7 +1615,7 @@
     0x800F048C:("func_800F048C",),
     0x800F0568:("Audio_PlaySoundAtPosition",),
     0x800F0590:("func_800F0590",),
-    0x800F05C0:("func_800F05C0",),
+    0x800F05C0:("ElfMessage_GetFirstCycleHint",),
     0x800F07C0:("func_800F07C0",),
     0x800F0888:("func_800F0888",),
     0x800F0944:("func_800F0944",),
@@ -1693,11 +1693,11 @@
     0x800F40A0:("func_800F40A0",),
     0x800F415C:("func_800F415C",),
     0x800F41E4:("func_800F41E4",),
-    0x800F42A0:("func_800F42A0",),
-    0x800F43BC:("func_800F43BC",),
-    0x800F44F4:("func_800F44F4",),
-    0x800F4540:("func_800F4540",),
-    0x800F470C:("func_800F470C",),
+    0x800F42A0:("Jpeg_ScheduleDecoderTask",),
+    0x800F43BC:("Jpeg_CopyToZbuffer",),
+    0x800F44F4:("Jpeg_GetUnalignedU16",),
+    0x800F4540:("Jpeg_ParseMarkers",),
+    0x800F470C:("Jpeg_Decode",),
     0x800F4A10:("func_800F4A10",),
     0x800F4C0C:("func_800F4C0C",),
     0x800F4E20:("func_800F4E20",),
@@ -2064,7 +2064,7 @@
     0x8010C0C0:("Nmi_Init",),
     0x8010C164:("Nmi_SetPrenmiStart",),
     0x8010C19C:("Nmi_GetPrenmiHasStarted",),
-    0x8010C1B0:("func_8010C1B0",),
+    0x8010C1B0:("MsgEvent_SendNullTask",),
     0x8010C230:("OLib_Vec3fDist",),
     0x8010C274:("OLib_Vec3fDistOutDiff",),
     0x8010C2D0:("OLib_Vec3fDistXZ",),
@@ -3256,7 +3256,7 @@
     0x80179594:("Rand_ZeroFloat",),
     0x801795C0:("randPlusMinusPoint5Scaled",),
     0x801795F0:("Math3D_Normalize",),
-    0x80179678:("func_80179678",),
+    0x80179678:("Math3D_PlaneVsLineSegClosestPoint",),
     0x80179798:("func_80179798",),
     0x80179A44:("func_80179A44",),
     0x80179B34:("func_80179B34",),
@@ -3278,46 +3278,46 @@
     0x8017A678:("Math3D_XZDistance",),
     0x8017A6A8:("Math3D_LengthSquared",),
     0x8017A6D4:("Math3D_Vec3fMagnitude",),
-    0x8017A6F8:("Math3D_DistanceSquared",),
+    0x8017A6F8:("Math3D_Vec3fDistSq",),
     0x8017A720:("Math3D_Distance",),
     0x8017A740:("Math3D_DistanceS",),
     0x8017A7B8:("func_8017A7B8",),
     0x8017A7F8:("func_8017A7F8",),
     0x8017A838:("func_8017A838",),
     0x8017A878:("Math3D_CrossProduct",),
-    0x8017A8EC:("Math3D_NormalVector",),
-    0x8017A954:("func_8017A954",),
-    0x8017AA0C:("func_8017AA0C",),
-    0x8017ABBC:("func_8017ABBC",),
-    0x8017AD38:("func_8017AD38",),
+    0x8017A8EC:("Math3D_SurfaceNorm",),
+    0x8017A954:("Math3D_PointRelativeToCubeFaces",),
+    0x8017AA0C:("Math3D_PointRelativeToCubeEdges",),
+    0x8017ABBC:("Math3D_PointRelativeToCubeVertices",),
+    0x8017AD38:("Math3D_LineVsCube",),
     0x8017B68C:("func_8017B68C",),
     0x8017B7F8:("func_8017B7F8",),
     0x8017B884:("Math3D_UnitNormalVector",),
     0x8017B998:("Math3D_SignedDistanceFromPlane",),
     0x8017B9D8:("func_8017B9D8",),
-    0x8017BA14:("Math3D_NormalizedDistanceFromPlane",),
-    0x8017BA4C:("Math3D_NormalizedSignedDistanceFromPlane",),
-    0x8017BAD0:("func_8017BAD0",),
+    0x8017BA14:("Math3D_UDistPlaneToPos",),
+    0x8017BA4C:("Math3D_DistPlaneToPos",),
+    0x8017BAD0:("Math3D_TriChkPointParaYDist",),
     0x8017BD98:("func_8017BD98",),
     0x8017BDE0:("func_8017BDE0",),
-    0x8017BE30:("func_8017BE30",),
-    0x8017BEE0:("func_8017BEE0",),
+    0x8017BE30:("Math3D_TriChkPointParaYIntersectDist",),
+    0x8017BEE0:("Math3D_TriChkPointParaYIntersectInsideTri",),
     0x8017BF8C:("func_8017BF8C",),
-    0x8017C008:("func_8017C008",),
+    0x8017C008:("Math3D_TriChkLineSegParaYIntersect",),
     0x8017C17C:("func_8017C17C",),
     0x8017C1F0:("func_8017C1F0",),
-    0x8017C494:("func_8017C494",),
-    0x8017C540:("func_8017C540",),
+    0x8017C494:("Math3D_TriChkPointParaYIntersectInsideTri2",),
+    0x8017C540:("Math3D_TriChkPointParaXDist",),
     0x8017C808:("func_8017C808",),
-    0x8017C850:("func_8017C850",),
+    0x8017C850:("Math3D_TriChkPointParaXIntersect",),
     0x8017C904:("func_8017C904",),
-    0x8017C980:("func_8017C980",),
+    0x8017C980:("Math3D_TriChkLineSegParaXIntersect",),
     0x8017CB08:("func_8017CB08",),
-    0x8017CB7C:("func_8017CB7C",),
+    0x8017CB7C:("Math3D_TriChkLineSegParaZDist",),
     0x8017CEA8:("func_8017CEA8",),
-    0x8017CEF0:("func_8017CEF0",),
+    0x8017CEF0:("Math3D_TriChkPointParaZIntersect",),
     0x8017CFA4:("func_8017CFA4",),
-    0x8017D020:("func_8017D020",),
+    0x8017D020:("Math3D_TriChkLineSegParaZIntersect",),
     0x8017D1AC:("func_8017D1AC",),
     0x8017D220:("func_8017D220",),
     0x8017D2FC:("func_8017D2FC",),
@@ -3329,14 +3329,14 @@
     0x8017D814:("func_8017D814",),
     0x8017D91C:("func_8017D91C",),
     0x8017DA24:("func_8017DA24",),
-    0x8017DB2C:("Math3D_ColSphereLineSeg",),
+    0x8017DB2C:("Math3D_LineVsSph",),
     0x8017DD34:("func_8017DD34",),
     0x8017DE74:("Math3D_ColSphereTri",),
     0x8017E294:("func_8017E294",),
     0x8017E350:("func_8017E350",),
     0x8017ED20:("Math3D_ColCylinderTri",),
     0x8017F1A0:("func_8017F1A0",),
-    0x8017F1C0:("Math3D_ColSphereSphere",),
+    0x8017F1C0:("Math3D_SphVsSph",),
     0x8017F1E0:("Math3D_ColSphereSphereIntersect",),
     0x8017F200:("Math3D_ColSphereSphereIntersectAndDistance",),
     0x8017F2CC:("Math3D_ColSphereCylinderDistance",),
@@ -3344,9 +3344,9 @@
     0x8017F45C:("Math3D_ColCylinderCylinderAmount",),
     0x8017F47C:("Math3D_ColCylinderCylinderAmountAndDistance",),
     0x8017F64C:("Math3d_ColTriTri",),
-    0x8017F9C0:("func_8017F9C0",),
-    0x8017FA34:("func_8017FA34",),
-    0x8017FAA8:("func_8017FAA8",),
+    0x8017F9C0:("Math3D_XZInSphere",),
+    0x8017FA34:("Math3D_XYInSphere",),
+    0x8017FAA8:("Math3D_YZInSphere",),
     0x8017FB1C:("func_8017FB1C",),
     0x8017FD44:("func_8017FD44",),
     0x8017FEB0:("Math_GetAtan2Tbl",),
@@ -3951,7 +3951,7 @@
     0x801A2C44:("func_801A2C44",),
     0x801A2C88:("func_801A2C88",),
     0x801A2D54:("func_801A2D54",),
-    0x801A2DE0:("func_801A2DE0",),
+    0x801A2DE0:("Audio_IsSequencePlaying",),
     0x801A2E54:("func_801A2E54",),
     0x801A2ED8:("func_801A2ED8",),
     0x801A2F88:("func_801A2F88",),
@@ -4067,18 +4067,18 @@
     0x801A982C:("func_801A982C",),
     0x801A99B8:("func_801A99B8",),
     0x801A9A74:("func_801A9A74",),
-    0x801A9B10:("func_801A9B10",),
-    0x801A9B78:("func_801A9B78",),
-    0x801A9BFC:("func_801A9BFC",),
-    0x801A9C68:("func_801A9C68",),
-    0x801A9D10:("func_801A9D10",),
-    0x801A9DCC:("func_801A9DCC",),
-    0x801A9EA4:("func_801A9EA4",),
-    0x801A9F4C:("func_801A9F4C",),
-    0x801AA020:("func_801AA020",),
-    0x801AA248:("func_801AA248",),
-    0x801AA3E4:("func_801AA3E4",),
-    0x801AA520:("func_801AA520",),
+    0x801A9B10:("JpegUtils_ProcessQuantizationTable",),
+    0x801A9B78:("JpegUtils_ParseHuffmanCodesLengths",),
+    0x801A9BFC:("JpegUtils_GetHuffmanCodes",),
+    0x801A9C68:("JpegUtils_SetHuffmanTable",),
+    0x801A9D10:("JpegUtils_ProcessHuffmanTableImpl",),
+    0x801A9DCC:("JpegUtils_ProcessHuffmanTable",),
+    0x801A9EA4:("JpegUtils_SetHuffmanTableOld",),
+    0x801A9F4C:("JpegUtils_ProcessHuffmanTableImplOld",),
+    0x801AA020:("JpegDecoder_Decode",),
+    0x801AA248:("JpegDecoder_ProcessMcu",),
+    0x801AA3E4:("JpegDecoder_ParseNextSymbol",),
+    0x801AA520:("JpegDecoder_ReadBits",),
     0x801AA610:("GameOver_Init",),
     0x801AA624:("GameOver_FadeLights",),
     0x801AA68C:("GameOver_Update",),
@@ -6401,21 +6401,21 @@
     0x808D7928:("func_808D7928",),
     0x808D7954:("ObjMure_Init",),
     0x808D7A04:("ObjMure_Destroy",),
-    0x808D7A14:("func_808D7A14",),
-    0x808D7A40:("func_808D7A40",),
-    0x808D7A68:("func_808D7A68",),
-    0x808D7C64:("func_808D7C64",),
-    0x808D7DC4:("func_808D7DC4",),
-    0x808D7E14:("func_808D7E14",),
-    0x808D7F0C:("func_808D7F0C",),
-    0x808D7F2C:("func_808D7F2C",),
-    0x808D7FFC:("func_808D7FFC",),
-    0x808D8014:("func_808D8014",),
-    0x808D8074:("func_808D8074",),
-    0x808D814C:("func_808D814C",),
-    0x808D82CC:("func_808D82CC",),
-    0x808D84F4:("func_808D84F4",),
-    0x808D8678:("func_808D8678",),
+    0x808D7A14:("ObjMure_GetMaxChildSpawns",),
+    0x808D7A40:("ObjMure_GetSpawnPos",),
+    0x808D7A68:("ObjMure_SpawnActors0",),
+    0x808D7C64:("ObjMure_SpawnActors1",),
+    0x808D7DC4:("ObjMure_SpawnActors",),
+    0x808D7E14:("ObjMure_KillActorsImpl",),
+    0x808D7F0C:("ObjMure_KillActors",),
+    0x808D7F2C:("ObjMure_CheckChildren",),
+    0x808D7FFC:("ObjMure_InitialAction",),
+    0x808D8014:("ObjMure_CulledState",),
+    0x808D8074:("ObjMure_SetFollowTargets",),
+    0x808D814C:("ObjMure_SetChildToFollowPlayer",),
+    0x808D82CC:("ObjMure_GroupBehavior0",),
+    0x808D84F4:("ObjMure_GroupBehavior1",),
+    0x808D8678:("ObjMure_ActiveState",),
     0x808D8720:("ObjMure_Update",),
     0x808D8940:("func_808D8940",),
     0x808D8B58:("func_808D8B58",),
@@ -7888,9 +7888,9 @@
     0x80965650:("EnStream_SetupAction",),
     0x8096565C:("EnStream_Init",),
     0x809656C4:("EnStream_Destroy",),
-    0x809656D4:("func_809656D4",),
-    0x809657F4:("func_809657F4",),
-    0x8096597C:("func_8096597C",),
+    0x809656D4:("EnStream_PlayerIsInRange",),
+    0x809657F4:("EnStream_SuckPlayer",),
+    0x8096597C:("EnStream_WaitForPlayer",),
     0x809659D0:("EnStream_Update",),
     0x80965A04:("EnStream_Draw",),
     0x80965BB0:("EnMm_SetupAction",),
@@ -8016,37 +8016,37 @@
     0x8096F4DC:("BgF40Swlift_Draw",),
     0x8096F5E0:("EnKakasi_Destroy",),
     0x8096F60C:("EnKakasi_Init",),
-    0x8096F800:("func_8096F800",),
-    0x8096F88C:("func_8096F88C",),
+    0x8096F800:("EnKakasi_SetAnimation",),
+    0x8096F88C:("EnKakasi_8096F88C",),
     0x8096F8D8:("func_8096F8D8",),
     0x8096FA18:("func_8096FA18",),
     0x8096FAAC:("func_8096FAAC",),
     0x8096FBB8:("func_8096FBB8",),
-    0x8096FC8C:("func_8096FC8C",),
-    0x8096FCC4:("func_8096FCC4",),
-    0x8096FDE8:("func_8096FDE8",),
-    0x8096FE00:("func_8096FE00",),
-    0x80970008:("func_80970008",),
-    0x8097006C:("func_8097006C",),
+    0x8096FC8C:("EnKakasi_InitTimeSkipDialogue",),
+    0x8096FCC4:("EnKakasi_TimeSkipDialogue",),
+    0x8096FDE8:("EnKakasi_SetupIdleStanding",),
+    0x8096FE00:("EnKakasi_IdleStanding",),
+    0x80970008:("EnKakasi_SetupDialogue",),
+    0x8097006C:("EnKakasi_RegularDialogue",),
     0x809705E4:("func_809705E4",),
     0x80970658:("func_80970658",),
     0x80970740:("func_80970740",),
     0x80970978:("func_80970978",),
-    0x80970A10:("func_80970A10",),
-    0x80970A9C:("func_80970A9C",),
-    0x80970F20:("func_80970F20",),
-    0x80970FF8:("func_80970FF8",),
-    0x80971064:("func_80971064",),
-    0x80971430:("func_80971430",),
+    0x80970A10:("EnKakasi_SetupPostSongLearnDialogue",),
+    0x80970A9C:("EnKakasi_PostSongLearnDialogue",),
+    0x80970F20:("EnKakasi_DancingRemark",),
+    0x80970FF8:("EnKakasi_SetupDanceNightAway",),
+    0x80971064:("EnKakasi_DancingNightAway",),
+    0x80971430:("EnKakasi_DoNothing",),
     0x80971440:("func_80971440",),
     0x809714BC:("func_809714BC",),
     0x80971794:("func_80971794",),
     0x809717D0:("func_809717D0",),
-    0x8097185C:("func_8097185C",),
-    0x8097193C:("func_8097193C",),
-    0x80971A38:("func_80971A38",),
-    0x80971A64:("func_80971A64",),
-    0x80971AD4:("func_80971AD4",),
+    0x8097185C:("EnKakasi_SetupRiseOutOfGround",),
+    0x8097193C:("EnKakasi_RisingOutOfGround",),
+    0x80971A38:("EnKakasi_SetupIdleRisen",),
+    0x80971A64:("EnKakasi_IdleRisen",),
+    0x80971AD4:("EnKakasi_RisenDialogue",),
     0x80971B48:("EnKakasi_Update",),
     0x80971CE0:("func_80971CE0",),
     0x80971D20:("EnKakasi_Draw",),
@@ -11502,9 +11502,9 @@
     0x80AA2720:("func_80AA2720",),
     0x80AA27EC:("func_80AA27EC",),
     0x80AA2884:("DmStk_Update",),
-    0x80AA2B14:("func_80AA2B14",),
-    0x80AA2BC0:("func_80AA2BC0",),
-    0x80AA33A4:("func_80AA33A4",),
+    0x80AA2B14:("DmStk_OverrideLimbDraw",),
+    0x80AA2BC0:("DmStk_PostLimbDraw2",),
+    0x80AA33A4:("DmStk_PostLimbDraw",),
     0x80AA33CC:("DmStk_Draw",),
     0x80AA5580:("func_80AA5580",),
     0x80AA561C:("func_80AA561C",),
@@ -16068,7 +16068,7 @@
     0x80BE1E9C:("EnNimotsu_Draw",),
     0x80BE2030:("EnHitTag_Init",),
     0x80BE20BC:("EnHitTag_Destroy",),
-    0x80BE20E8:("func_80BE20E8",),
+    0x80BE20E8:("EnHitTag_WaitForHit",),
     0x80BE21A0:("EnHitTag_Update",),
     0x80BE2260:("func_80BE2260",),
     0x80BE2330:("func_80BE2330",),

tools/disasm/variables.txt

@@ -78,7 +78,7 @@
     0x80098060:("D_80098060","__OSViContext","[2]",0x60),
     0x800980C0:("__osViCurr","__OSViContext*","",0x4),
     0x800980C4:("__osViNext","__OSViContext*","",0x4),
-    0x800980D0:("D_800980D0","UNK_TYPE4","",0x4),
+    0x800980D0:("sCartRomNeedsInit","UNK_TYPE4","",0x4),
     0x800980E0:("osViModeFpalLan1","OSViMode","",0x50),
     0x80098130:("ldigs","u8","[]",0x14),
     0x80098144:("udigs","u8","[]",0x14),
@@ -367,7 +367,7 @@
     0x80186028:("D_80186028","s16","[1316]",0xa48),
     0x801AAAB0:("D_801AAAB0","UNK_TYPE1","",0x1),
     0x801ABAB0:("D_801ABAB0","UNK_TYPE1","",0x1),
-    0x801AD370:("D_801AD370","UNK_TYPE1","",0x1),
+    0x801AD370:("gJpegUCode","UNK_TYPE1","",0x1),
     0x801ADE60:("En_A_Obj_InitVars","ActorInit","",0x20),
     0x801ADE80:("enAObjCylinderInit","ColliderCylinderInit","",0x2c),
     0x801ADEAC:("enAObjInitVar","ActorInitVar","",0x4),
@@ -453,14 +453,8 @@
     0x801AEFC0:("D_801AEFC0","UNK_TYPE1","",0x1),
     0x801AEFD0:("gActorOverlayTable","ActorOverlay","[ACTOR_ID_MAX]",0x5640),
     0x801B4610:("gMaxActorId","s32","",0x4),
-    0x801B4620:("D_801B4620","u32","[32]",0x80),
-    0x801B46A0:("D_801B46A0","u16","[16]",0x20),
-    0x801B46C0:("D_801B46C0","u8","[16]",0x10),
-    0x801B46D0:("bgSpecialSceneParamsDefault","s16","[1]",0x2),
-    0x801B46D2:("D_801B46D2","UNK_TYPE1","",0x1),
-    0x801B46D4:("bgSpecialSceneMaxMemory","BgSpecialSceneMaxMemory","[1]",0x8),
-    0x801B46DC:("bgSpecialSceneMeshSubdivisions","BgSpecialSceneMeshSubdivision","[3]",0x24),
-    0x801B4700:("bgSpecialSceneMaxObjects","BgSpecialSceneMaxObjects","[1]",0x8),
+    0x801B46DC:("sSceneSubdivisionList","BgCheckSceneSubdivisionEntry","[3]",0x24),
+    0x801B4700:("sCustomDynapolyMem","BgSpecialSceneMaxObjects","[1]",0x8),
     0x801B4708:("D_801B4708","UNK_TYPE1","",0x1),
     0x801B4710:("D_801B4710","UNK_TYPE1","",0x1),
     0x801B4738:("D_801B4738","UNK_TYPE1","",0x1),
@@ -2274,11 +2268,9 @@
     0x801D4D90:("D_801D4D90","UNK_PTR","",0x4),
     0x801D4D98:("D_801D4D98","UNK_PTR","",0x4),
     0x801D4DB0:("D_801D4DB0","UNK_PTR","",0x4),
-    0x801D4DB4:("D_801D4DB4","UNK_TYPE1","",0x1),
-    0x801D4FB4:("D_801D4FB4","UNK_TYPE1","",0x1),
-    0x801D51B4:("D_801D51B4","UNK_TYPE4","",0x4),
-    0x801D53B4:("D_801D53B4","UNK_TYPE4","",0x4),
-    0x801D55B4:("D_801D55B4","UNK_TYPE1","",0x1),
+    0x801D4DB4:("D_801D4DB4","f32","[256]",0x400),
+    0x801D51B4:("D_801D51B4","f32","[256]",0x400),
+    0x801D55B4:("D_801D55B4","f32","[128]",0x200),
     0x801D57B4:("D_801D57B4","UNK_TYPE1","",0x1),
     0x801D57C4:("D_801D57C4","UNK_TYPE1","",0x1),
     0x801D57D4:("D_801D57D4","UNK_TYPE1","",0x1),
@@ -2287,12 +2279,11 @@
     0x801D5824:("D_801D5824","UNK_TYPE2","",0x2),
     0x801D58A2:("D_801D58A2","UNK_TYPE2","",0x2),
     0x801D58AA:("D_801D58AA","UNK_TYPE1","",0x1),
-    0x801D5928:("D_801D5928","UNK_TYPE1","",0x1),
-    0x801D5B24:("D_801D5B24","UNK_TYPE1","",0x1),
-    0x801D5B28:("D_801D5B28","UNK_TYPE1","",0x1),
-    0x801D5D24:("D_801D5D24","UNK_TYPE1","",0x1),
-    0x801D5D28:("D_801D5D28","UNK_TYPE1","",0x1),
-    0x801D5F24:("D_801D5F24","UNK_TYPE1","",0x1),
+    0x801D5928:("D_801D5928","f32","[128]",0x200),
+    0x801D5B28:("D_801D5B28","f32","[128]",0x200),
+    0x801D5D28:("D_801D5D28","f32","[128]",0x200),
+    0x801D5F28:("D_801D5F28","s16","[64]",0x80),
+    0x801D5FB0:("D_801D5FB0","UNK_TYPE4","",0x4),
     0x801D5FB4:("D_801D5FB4","UNK_TYPE4","",0x4),
     0x801D5FB8:("D_801D5FB8","UNK_TYPE4","",0x4),
     0x801D5FBC:("D_801D5FBC","UNK_TYPE4","",0x4),
@@ -2311,11 +2302,11 @@
     0x801D6014:("D_801D6014","UNK_TYPE1","",0x1),
     0x801D6028:("D_801D6028","UNK_TYPE1","",0x1),
     0x801D6098:("D_801D6098","UNK_TYPE1","",0x1),
-    0x801D6100:("D_801D6100","UNK_TYPE1","",0x1),
     0x801D6188:("D_801D6188","UNK_PTR","",0x4),
     0x801D618C:("D_801D618C","UNK_PTR","",0x4),
     0x801D6190:("D_801D6190","f32","",0x4),
     0x801D6194:("D_801D6194","UNK_TYPE4","",0x4),
+    0x801D61A0:("D_801D61A0","u8","[96]",0x60),
     0x801D6200:("D_801D6200","UNK_TYPE1","",0x1),
     0x801D6600:("D_801D6600","UNK_TYPE1","",0x1),
     0x801D6608:("D_801D6608","UNK_TYPE1","",0x1),
@@ -2442,14 +2433,14 @@
     0x801D8E48:("D_801D8E48","UNK_TYPE1","",0x1),
     0x801D8E50:("D_801D8E50","UNK_TYPE1","",0x1),
     0x801D8F70:("D_801D8F70","UNK_TYPE1","",0x1),
-    0x801D9090:("D_801D9090","UNK_TYPE1","",0x1),
-    0x801D9C10:("D_801D9C10","UNK_TYPE1","",0x1),
-    0x801DA350:("D_801DA350","UNK_TYPE1","",0x1),
-    0x801DA510:("D_801DA510","UNK_TYPE1","",0x1),
-    0x801DAC50:("D_801DAC50","UNK_TYPE1","",0x1),
-    0x801DADD0:("D_801DADD0","UNK_TYPE1","",0x1),
-    0x801DAE10:("D_801DAE10","UNK_TYPE1","",0x1),
-    0x801DB450:("D_801DB450","UNK_PTR","",0x4),
+    0x801D9090:("sEnemyBankParams","UNK_TYPE1","",0x1),
+    0x801D9C10:("sPlayerBankParams","UNK_TYPE1","",0x1),
+    0x801DA350:("sItemBankParams","UNK_TYPE1","",0x1),
+    0x801DA510:("sEnvBankParams","UNK_TYPE1","",0x1),
+    0x801DAC50:("sSystemBankParams","UNK_TYPE1","",0x1),
+    0x801DADD0:("sOcarinaBankParams","UNK_TYPE1","",0x1),
+    0x801DAE10:("sVoiceBankParams","UNK_TYPE1","",0x1),
+    0x801DB450:("gSfxParams","UNK_PTR","",0x4),
     0x801DB470:("D_801DB470","UNK_TYPE1","",0x1),
     0x801DB474:("D_801DB474","UNK_TYPE1","",0x1),
     0x801DB478:("D_801DB478","UNK_PTR","[7]",0x1c),
@@ -2481,7 +2472,7 @@
     0x801DB8B8:("D_801DB8B8","UNK_TYPE1","",0x1),
     0x801DB900:("D_801DB900","UNK_TYPE1","",0x1),
     0x801DB930:("D_801DB930","UNK_PTR","",0x4),
-    0x801DB958:("D_801DB958","s8018CFAC","[21]",0x498),
+    0x801DB958:("D_801DB958","AudioSpec","[21]",0x498),
     0x801DBDF0:("D_801DBDF0","f32","",0x4),
     0x801DBDF4:("jtbl_801DBDF4","UNK_PTR","",0x4),
     0x801DBE68:("D_801DBE68","f32","",0x4),
@@ -3897,15 +3888,9 @@
     0x801E2160:("D_801E2160","UNK_TYPE1","",0x1),
     0x801E3790:("D_801E3790","UNK_TYPE1","",0x1),
     0x801E3BB0:("D_801E3BB0","UNK_TYPE1","",0x1),
-    0x801E3F40:("D_801E3F40","UNK_TYPE1","",0x1),
+    0x801E3F40:("gJpegUCodeData","UNK_TYPE1","",0x1),
     0x801E3FA0:("D_801E3FA0","UNK_TYPE1","",0x1),
-    0x801E3FB0:("sEffTable","EffTables","",0x98e0),
-    0x801E4514:("D_801E4514","UNK_TYPE1","",0x1),
-    0x801E4E08:("D_801E4E08","UNK_TYPE1","",0x1),
-    0x801E531C:("D_801E531C","UNK_TYPE1","",0x1),
-    0x801E69E0:("D_801E69E0","UNK_TYPE1","",0x1),
-    0x801E9AA0:("D_801E9AA0","UNK_TYPE1","",0x1),
-    0x801ED4C0:("D_801ED4C0","UNK_TYPE1","",0x1),
+    0x801E3FB0:("sEffTable","EffTables","",0x98E0),
     0x801ED890:("D_801ED890","UNK_TYPE1","",0x1),
     0x801ED894:("D_801ED894","UNK_TYPE1","",0x1),
     0x801ED8A0:("D_801ED8A0","UNK_TYPE1","",0x1),
@@ -3927,34 +3912,17 @@
     0x801ED940:("D_801ED940","FaultAddrConvClient","",0xc),
     0x801ED950:("D_801ED950","char","[80]",0x50),
     0x801ED9A0:("D_801ED9A0","char","[80]",0x50),
-    0x801ED9F0:("D_801ED9F0","Vec3f","",0xc),
-    0x801ED9FC:("D_801ED9FC","Vec3f","",0xc),
-    0x801EDA08:("D_801EDA08","Vec3f","",0xc),
-    0x801EDA18:("D_801EDA18","Vec3f","",0xc),
-    0x801EDA24:("D_801EDA24","Vec3f","",0xc),
-    0x801EDA30:("D_801EDA30","Vec3f","",0xc),
+    0x801ED9F0:("D_801ED9F0","Vec3f","[3]",0x24),
+    0x801EDA18:("D_801EDA18","Vec3f","[3]",0x24),
     0x801EDA40:("D_801EDA40","MtxF","",0x40),
-    0x801EDA80:("D_801EDA80","Vec3f","",0xc),
-    0x801EDA8C:("D_801EDA8C","Vec3f","",0xc),
-    0x801EDA98:("D_801EDA98","Vec3f","",0xc),
+    0x801EDA80:("D_801EDA80","Vec3f","[3]",0x24),
     0x801EDAA8:("D_801EDAA8","char","[80]",0x50),
     0x801EDAF8:("D_801EDAF8","char","[80]",0x50),
-    0x801EDB48:("D_801EDB48","Vec3f","",0xc),
-    0x801EDB54:("D_801EDB54","Vec3f","",0xc),
-    0x801EDB60:("D_801EDB60","Vec3f","",0xc),
-    0x801EDB70:("D_801EDB70","Vec3f","",0xc),
-    0x801EDB7C:("D_801EDB7C","Vec3f","",0xc),
-    0x801EDB88:("D_801EDB88","Vec3f","",0xc),
-    0x801EDB98:("D_801EDB98","f32","",0x4),
-    0x801EDB9C:("D_801EDB9C","f32","",0x4),
-    0x801EDBA0:("D_801EDBA0","f32","",0x4),
-    0x801EDBA4:("D_801EDBA4","UNK_TYPE1","",0x1),
+    0x801EDB48:("D_801EDB48","Vec3f","[3]",0x24),
+    0x801EDB70:("D_801EDB70","Vec3f","[3]",0x24),
+    0x801EDB98:("D_801EDB98","Plane","",0x10),
     0x801EDBA8:("D_801EDBA8","Sphere16","",0x8),
     0x801EDBB0:("D_801EDBB0","TriNorm","",0x34),
-    0x801EDBD4:("D_801EDBD4","UNK_TYPE1","",0x1),
-    0x801EDBD8:("D_801EDBD8","UNK_TYPE1","",0x1),
-    0x801EDBDC:("D_801EDBDC","UNK_TYPE1","",0x1),
-    0x801EDBE0:("D_801EDBE0","UNK_TYPE1","",0x1),
     0x801EDBF0:("D_801EDBF0","s16","",0x2),
     0x801EDBF4:("D_801EDBF4","UNK_TYPE1","",0x1),
     0x801EDBF8:("D_801EDBF8","UNK_TYPE1","",0x1),
@@ -4434,7 +4402,7 @@
     0x801FE4C0:("D_801FE4C0","UNK_TYPE1","",0x1),
     0x801FE640:("D_801FE640","UNK_TYPE1","",0x1),
     0x801FE6D0:("D_801FE6D0","UNK_TYPE1","",0x1),
-    0x801FE7C0:("D_801FE7C0","s801FE7C0","[1]",0x14),
+    0x801FE7C0:("D_801FE7C0","SoundRequest","[1]",0x14),
     0x801FFBC0:("D_801FFBC0","UNK_TYPE1","",0x1),
     0x801FFBC8:("D_801FFBC8","UNK_TYPE1","",0x1),
     0x801FFBD0:("D_801FFBD0","UNK_TYPE1","",0x1),
@@ -4588,11 +4556,11 @@
     0x80208E6C:("D_80208E6C","UNK_TYPE4","",0x4),
     0x80208E70:("D_80208E70","UNK_TYPE4","",0x4),
     0x80208E74:("D_80208E74","UNK_TYPE4","",0x4),
-    0x80208E90:("D_80208E90","UNK_TYPE1","",0x1),
-    0x80208E94:("D_80208E94","UNK_TYPE1","",0x1),
-    0x80208E98:("D_80208E98","UNK_TYPE1","",0x1),
-    0x80208E99:("D_80208E99","UNK_TYPE1","",0x1),
-    0x80208E9C:("D_80208E9C","UNK_TYPE1","",0x1),
+    0x80208E90:("sJpegBitStreamPtr","UNK_TYPE1","",0x1),
+    0x80208E94:("sJpegBitStreamByteIdx","UNK_TYPE1","",0x1),
+    0x80208E98:("sJpegBitStreamBitIdx","UNK_TYPE1","",0x1),
+    0x80208E99:("sJpegBitStreamDontSkip","UNK_TYPE1","",0x1),
+    0x80208E9C:("sJpegBitStreamCurWord","UNK_TYPE1","",0x1),
     0x80208EA0:("gGfxSPTaskYieldBuffer","u8","[OS_YIELD_DATA_SIZE]",0xC00),
     0x80209AA0:("gGfxSPTaskStack","u8","[0x400]",0x400),
     0x80209EA0:("gGfxPools","GfxPool","[2]",0x40620),
@@ -7156,7 +7124,6 @@
     0x808D784C:("D_808D784C","f32","",0x4),
     0x808D7850:("D_808D7850","f32","",0x4),
     0x808D8760:("Obj_Mure_InitVars","UNK_TYPE1","",0x1),
-    0x808D8780:("D_808D8780","UNK_TYPE1","",0x1),
     0x808DB9C0:("En_Sw_InitVars","UNK_TYPE1","",0x1),
     0x808DB9E0:("D_808DB9E0","UNK_TYPE1","",0x1),
     0x808DBA0C:("D_808DBA0C","UNK_PTR","",0x4),
@@ -7920,11 +7887,6 @@
     0x8090DC1C:("D_8090DC1C","f32","",0x4),
     0x8090DC20:("D_8090DC20","f32","",0x4),
     0x8090DC24:("D_8090DC24","f32","",0x4),
-    0x8090DC30:("enFishingOverlayInfo","OverlayRelocationSection","",0x14),
-    0x8090DC44:("enFishingOverlayRelocations","u32","[2393]",0x2564),
-    0x809101AC:("enFishingOverlayInfoOffset","u32","",0x4),
-    0x80910000:("D_80910000","UNK_TYPE1","",0x1),
-    0x80910001:("D_80910001","UNK_TYPE1","",0x1),
     0x809101B0:("D_809101B0","f32","",0x4),
     0x809101B4:("D_809101B4","f32","",0x4),
     0x809101B8:("D_809101B8","UNK_TYPE1","",0x1),
@@ -10997,9 +10959,6 @@
     0x80A0C55C:("D_80A0C55C","f32","",0x4),
     0x80A0C560:("D_80A0C560","f32","",0x4),
     0x80A0C7C0:("En_Boj_05_InitVars","UNK_TYPE1","",0x1),
-    0x80A0C7E0:("enBoj05OverlayInfo","OverlayRelocationSection","",0x14),
-    0x80A0C7F4:("enBoj05OverlayRelocations","u32","[4]",0x10),
-    0x80A0C80C:("enBoj05OverlayInfoOffset","u32","",0x4),
     0x80A10860:("sAnimationsBombShopkeeper","UNK_PTR","",0x4),
     0x80A10890:("En_Sob1_InitVars","UNK_TYPE1","",0x1),
     0x80A108B0:("sObjectIds","UNK_TYPE2","",0x2),
@@ -12659,9 +12618,6 @@
     0x80A8B440:("jtbl_D_80A8B440","UNK_PTR","",0x4),
     0x80A8B478:("jtbl_D_80A8B478","UNK_PTR","",0x4),
     0x80A8B48C:("jtbl_D_80A8B48C","UNK_PTR","",0x4),
-    0x80A8B4A0:("enTruOverlayInfo","OverlayRelocationSection","",0x14),
-    0x80A8B4B4:("enTruOverlayRelocations","u32","[174]",0x2b8),
-    0x80A8B76C:("enTruOverlayInfoOffset","u32","",0x4),
     0x80A8FE10:("sAnimations","UNK_TYPE1","",0x1),
     0x80A8FEB0:("En_Trt_InitVars","UNK_TYPE1","",0x1),
     0x80A8FED0:("sActorScale","UNK_TYPE4","",0x4),
@@ -13143,9 +13099,6 @@
     0x80AC027C:("jtbl_80AC027C","UNK_PTR","",0x4),
     0x80AC0300:("jtbl_80AC0300","UNK_PTR","",0x4),
     0x80AC03E4:("jtbl_80AC03E4","UNK_PTR","",0x4),
-    0x80AC0400:("enMa4OverlayInfo","OverlayRelocationSection","",0x14),
-    0x80AC0414:("enMa4OverlayRelocations","u32","[262]",0x418),
-    0x80AC082C:("enMa4OverlayInfoOffset","u32","",0x4),
     0x80AC1090:("En_Twig_InitVars","UNK_TYPE1","",0x1),
     0x80AC10B0:("D_80AC10B0","UNK_TYPE1","",0x1),
     0x80AC10BC:("D_80AC10BC","UNK_TYPE2","",0x2),

tools/m2ctx.py

@@ -7,6 +7,46 @@ script_dir = os.path.dirname(os.path.realpath(__file__))
 root_dir = script_dir + "/../"
 src_dir = root_dir + "src/"
 
+# Read through the processes context and replace whatever
+def custom_replacements(output):
+    output = output.splitlines()
+
+    i = 0
+    while i < len(output):
+        line = output[i]
+
+        ############### actorLists[2].first -> Player* ###############
+        if "typedef struct ActorListEntry " in line:
+            actorListText = ""
+            i += 1
+            while not output[i].startswith("}"):
+                actorListText += output[i]
+                i += 1
+            actorCats = [
+                "actorSwitch",
+                "bg",
+                "player",
+                "explosive",
+                "npc",
+                "enemy",
+                "prop",
+                "itemAction",
+                "misc",
+                "boss",
+                "door",
+                "chest",
+            ]
+            actorList = []
+            for x in range(12):
+                actorList.append(actorListText.replace("first;", f"{actorCats[x]};") + "\n")
+                if x == 2:
+                    actorList[x] = actorList[x].replace("Actor*", "Player*")
+        elif "ActorListEntry actorList[12];" in line:
+            output[i] = "struct {\n" + "".join(actorList) + "};"
+        ########################################################
+
+        i += 1
+    return "\n".join(output)
 
 def get_c_dir(dirname):
     for root, dirs, files in os.walk(src_dir):
@@ -42,6 +82,8 @@ def main():
                                      description="Creates a ctx.c file for mips2c. "
                                      "Output will be saved as oot/ctx.c")
     parser.add_argument('filepath', help="path of c file to be processed")
+    parser.add_argument("--custom", "-c", dest="custom", action="store_true", default=False, 
+                            help="Apply custom replacements to the output to help aid m2c output")
     args = parser.parse_args()
 
     if args.filepath:
@@ -59,6 +101,9 @@ def main():
 
     output = import_c_file(c_file_path)
 
+    if args.custom:
+        output = custom_replacements(output)
+
     with open(os.path.join(root_dir, "ctx.c"), "w", encoding="UTF-8") as f:
         f.write(output)
 

tools/sizes/code_functions.csv

@@ -610,22 +610,22 @@ asm/non_matchings/code/z_bg_collect/BgCheck2_UpdateActorPosition.s,BgCheck2_Upda
 asm/non_matchings/code/z_bg_collect/BgCheck2_UpdateActorYRotation.s,BgCheck2_UpdateActorYRotation,0x800CAC0C,0x25
 asm/non_matchings/code/z_bg_collect/BgCheck2_AttachToMesh.s,BgCheck2_AttachToMesh,0x800CACA0,0x23
 asm/non_matchings/code/z_bg_collect/BgCheck2_UpdateActorAttachedToMesh.s,BgCheck2_UpdateActorAttachedToMesh,0x800CAD2C,0x39
-asm/non_matchings/code/z_bg_item/BcCheck3_BgActorInit.s,BcCheck3_BgActorInit,0x800CAE10,0x9
-asm/non_matchings/code/z_bg_item/BgCheck3_LoadMesh.s,BgCheck3_LoadMesh,0x800CAE34,0x12
-asm/non_matchings/code/z_bg_item/BgCheck3_ResetFlags.s,BgCheck3_ResetFlags,0x800CAE7C,0x3
-asm/non_matchings/code/z_bg_item/func_800CAE88.s,func_800CAE88,0x800CAE88,0x5
-asm/non_matchings/code/z_bg_item/func_800CAE9C.s,func_800CAE9C,0x800CAE9C,0x5
-asm/non_matchings/code/z_bg_item/func_800CAEB0.s,func_800CAEB0,0x800CAEB0,0xC
-asm/non_matchings/code/z_bg_item/func_800CAEE0.s,func_800CAEE0,0x800CAEE0,0x5
-asm/non_matchings/code/z_bg_item/func_800CAEF4.s,func_800CAEF4,0x800CAEF4,0xC
-asm/non_matchings/code/z_bg_item/func_800CAF24.s,func_800CAF24,0x800CAF24,0x5
-asm/non_matchings/code/z_bg_item/func_800CAF38.s,func_800CAF38,0x800CAF38,0x5
-asm/non_matchings/code/z_bg_item/func_800CAF4C.s,func_800CAF4C,0x800CAF4C,0x9
-asm/non_matchings/code/z_bg_item/func_800CAF70.s,func_800CAF70,0x800CAF70,0x9
-asm/non_matchings/code/z_bg_item/func_800CAF94.s,func_800CAF94,0x800CAF94,0x9
-asm/non_matchings/code/z_bg_item/func_800CAFB8.s,func_800CAFB8,0x800CAFB8,0x9
-asm/non_matchings/code/z_bg_item/func_800CAFDC.s,func_800CAFDC,0x800CAFDC,0x9
-asm/non_matchings/code/code_800CB000/func_800CB000.s,func_800CB000,0x800CB000,0x84
+asm/non_matchings/code/z_bg_item/DynaPoly_Init.s,DynaPoly_Init,0x800CAE10,0x9
+asm/non_matchings/code/z_bg_item/DynaPoly_LoadMesh.s,DynaPoly_LoadMesh,0x800CAE34,0x12
+asm/non_matchings/code/z_bg_item/DynaPoly_ResetState.s,DynaPoly_ResetState,0x800CAE7C,0x3
+asm/non_matchings/code/z_bg_item/DynaPoly_SetRidingFallingState.s,DynaPoly_SetRidingFallingState,0x800CAE88,0x5
+asm/non_matchings/code/z_bg_item/DynaPoly_SetRidingMovingState.s,DynaPoly_SetRidingMovingState,0x800CAE9C,0x5
+asm/non_matchings/code/z_bg_item/DynaPoly_SetRidingMovingStateByIndex.s,DynaPoly_SetRidingMovingStateByIndex,0x800CAEB0,0xC
+asm/non_matchings/code/z_bg_item/DynaPoly_SetRidingRotatingState.s,DynaPoly_SetRidingRotatingState,0x800CAEE0,0x5
+asm/non_matchings/code/z_bg_item/DynaPoly_SetRidingRotatingStateByIndex.s,DynaPoly_SetRidingRotatingStateByIndex,0x800CAEF4,0xC
+asm/non_matchings/code/z_bg_item/DynaPoly_SetSwitchPressedState.s,DynaPoly_SetSwitchPressedState,0x800CAF24,0x5
+asm/non_matchings/code/z_bg_item/DynaPoly_SetHeavySwitchPressedState.s,DynaPoly_SetHeavySwitchPressedState,0x800CAF38,0x5
+asm/non_matchings/code/z_bg_item/DynaPoly_IsInRidingFallingState.s,DynaPoly_IsInRidingFallingState,0x800CAF4C,0x9
+asm/non_matchings/code/z_bg_item/DynaPoly_IsInRidingMovingState.s,DynaPoly_IsInRidingMovingState,0x800CAF70,0x9
+asm/non_matchings/code/z_bg_item/DynaPoly_IsInRidingRotatingState.s,DynaPoly_IsInRidingRotatingState,0x800CAF94,0x9
+asm/non_matchings/code/z_bg_item/DynaPoly_IsInSwitchPressedState.s,DynaPoly_IsInSwitchPressedState,0x800CAFB8,0x9
+asm/non_matchings/code/z_bg_item/DynaPoly_IsInHeavySwitchPressedState.s,DynaPoly_IsInHeavySwitchPressedState,0x800CAFDC,0x9
+asm/non_matchings/code/z_bg_item/DynaPoly_ValidateMove.s,DynaPoly_ValidateMove,0x800CB000,0x84
 asm/non_matchings/code/z_camera/Camera_fabsf.s,Camera_fabsf,0x800CB210,0xC
 asm/non_matchings/code/z_camera/Camera_LengthVec3f.s,Camera_LengthVec3f,0x800CB240,0xC
 asm/non_matchings/code/z_camera/func_800CB270.s,func_800CB270,0x800CB270,0x30
@@ -1207,11 +1207,11 @@ asm/non_matchings/code/z_horse/func_800F3ED4.s,func_800F3ED4,0x800F3ED4,0x73
 asm/non_matchings/code/z_horse/func_800F40A0.s,func_800F40A0,0x800F40A0,0x2F
 asm/non_matchings/code/z_horse/func_800F415C.s,func_800F415C,0x800F415C,0x22
 asm/non_matchings/code/z_horse/func_800F41E4.s,func_800F41E4,0x800F41E4,0x2F
-asm/non_matchings/code/z_jpeg/func_800F42A0.s,func_800F42A0,0x800F42A0,0x47
-asm/non_matchings/code/z_jpeg/func_800F43BC.s,func_800F43BC,0x800F43BC,0x4E
-asm/non_matchings/code/z_jpeg/func_800F44F4.s,func_800F44F4,0x800F44F4,0x13
-asm/non_matchings/code/z_jpeg/func_800F4540.s,func_800F4540,0x800F4540,0x73
-asm/non_matchings/code/z_jpeg/func_800F470C.s,func_800F470C,0x800F470C,0xC1
+asm/non_matchings/code/z_jpeg/Jpeg_ScheduleDecoderTask.s,Jpeg_ScheduleDecoderTask,0x800F42A0,0x47
+asm/non_matchings/code/z_jpeg/Jpeg_CopyToZbuffer.s,Jpeg_CopyToZbuffer,0x800F43BC,0x4E
+asm/non_matchings/code/z_jpeg/Jpeg_GetUnalignedU16.s,Jpeg_GetUnalignedU16,0x800F44F4,0x13
+asm/non_matchings/code/z_jpeg/Jpeg_ParseMarkers.s,Jpeg_ParseMarkers,0x800F4540,0x73
+asm/non_matchings/code/z_jpeg/Jpeg_Decode.s,Jpeg_Decode,0x800F470C,0xC1
 asm/non_matchings/code/z_kaleido_setup/func_800F4A10.s,func_800F4A10,0x800F4A10,0x7F
 asm/non_matchings/code/z_kaleido_setup/func_800F4C0C.s,func_800F4C0C,0x800F4C0C,0x85
 asm/non_matchings/code/z_kaleido_setup/func_800F4E20.s,func_800F4E20,0x800F4E20,0x42
@@ -1578,7 +1578,7 @@ asm/non_matchings/code/z_msgevent/func_8010BF58.s,func_8010BF58,0x8010BF58,0x5A
 asm/non_matchings/code/z_nmi_buff/Nmi_Init.s,Nmi_Init,0x8010C0C0,0x29
 asm/non_matchings/code/z_nmi_buff/Nmi_SetPrenmiStart.s,Nmi_SetPrenmiStart,0x8010C164,0xE
 asm/non_matchings/code/z_nmi_buff/Nmi_GetPrenmiHasStarted.s,Nmi_GetPrenmiHasStarted,0x8010C19C,0x5
-asm/non_matchings/code/z_nmi_buff/func_8010C1B0.s,func_8010C1B0,0x8010C1B0,0x20
+asm/non_matchings/code/z_nmi_buff/MsgEvent_SendNullTask.s,MsgEvent_SendNullTask,0x8010C1B0,0x20
 asm/non_matchings/code/z_olib/OLib_Vec3fDist.s,OLib_Vec3fDist,0x8010C230,0x11
 asm/non_matchings/code/z_olib/OLib_Vec3fDistOutDiff.s,OLib_Vec3fDistOutDiff,0x8010C274,0x17
 asm/non_matchings/code/z_olib/OLib_Vec3fDistXZ.s,OLib_Vec3fDistXZ,0x8010C2D0,0xD
@@ -2907,10 +2907,10 @@ asm/non_matchings/code/sys_matrix/func_8018219C.s,func_8018219C,0x8018219C,0x4A
 asm/non_matchings/code/sys_matrix/func_801822C4.s,func_801822C4,0x801822C4,0x4A
 asm/non_matchings/code/sys_matrix/Matrix_InsertRotationAroundUnitVector_f.s,Matrix_InsertRotationAroundUnitVector_f,0x801823EC,0x118
 asm/non_matchings/code/sys_matrix/Matrix_InsertRotationAroundUnitVector_s.s,Matrix_InsertRotationAroundUnitVector_s,0x8018284C,0x111
-asm/non_matchings/code/sys_matrix/SysUcode_GetUCodeBoot.s,SysUcode_GetUCodeBoot,0x80182C90,0x4
-asm/non_matchings/code/sys_matrix/SysUcode_GetUCodeBootSize.s,SysUcode_GetUCodeBootSize,0x80182CA0,0x7
-asm/non_matchings/code/sys_matrix/SysUcode_GetUCode.s,SysUcode_GetUCode,0x80182CBC,0x4
-asm/non_matchings/code/sys_matrix/SysUcode_GetUCodeData.s,SysUcode_GetUCodeData,0x80182CCC,0x5
+asm/non_matchings/code/sys_ucode/SysUcode_GetUCodeBoot.s,SysUcode_GetUCodeBoot,0x80182C90,0x4
+asm/non_matchings/code/sys_ucode/SysUcode_GetUCodeBootSize.s,SysUcode_GetUCodeBootSize,0x80182CA0,0x7
+asm/non_matchings/code/sys_ucode/SysUcode_GetUCode.s,SysUcode_GetUCode,0x80182CBC,0x4
+asm/non_matchings/code/sys_ucode/SysUcode_GetUCodeData.s,SysUcode_GetUCodeData,0x80182CCC,0x5
 asm/non_matchings/code/sys_ucode/func_80182CE0.s,func_80182CE0,0x80182CE0,0xD0
 asm/non_matchings/code/sys_ucode/func_80183020.s,func_80183020,0x80183020,0xE
 asm/non_matchings/code/sys_ucode/func_80183058.s,func_80183058,0x80183058,0x6
@@ -3469,7 +3469,7 @@ asm/non_matchings/code/code_8019AF00/func_801A2C20.s,func_801A2C20,0x801A2C20,0x
 asm/non_matchings/code/code_8019AF00/func_801A2C44.s,func_801A2C44,0x801A2C44,0x11
 asm/non_matchings/code/code_8019AF00/func_801A2C88.s,func_801A2C88,0x801A2C88,0x33
 asm/non_matchings/code/code_8019AF00/func_801A2D54.s,func_801A2D54,0x801A2D54,0x23
-asm/non_matchings/code/code_8019AF00/func_801A2DE0.s,func_801A2DE0,0x801A2DE0,0x1D
+asm/non_matchings/code/code_8019AF00/Audio_IsSequencePlaying.s,Audio_IsSequencePlaying,0x801A2DE0,0x1D
 asm/non_matchings/code/code_8019AF00/func_801A2E54.s,func_801A2E54,0x801A2E54,0x21
 asm/non_matchings/code/code_8019AF00/func_801A2ED8.s,func_801A2ED8,0x801A2ED8,0x2C
 asm/non_matchings/code/code_8019AF00/func_801A2F88.s,func_801A2F88,0x801A2F88,0xF
@@ -3585,18 +3585,18 @@ asm/non_matchings/code/code_801A7B10/func_801A9768.s,func_801A9768,0x801A9768,0x
 asm/non_matchings/code/code_801A7B10/func_801A982C.s,func_801A982C,0x801A982C,0x63
 asm/non_matchings/code/code_801A7B10/func_801A99B8.s,func_801A99B8,0x801A99B8,0x2F
 asm/non_matchings/code/code_801A7B10/func_801A9A74.s,func_801A9A74,0x801A9A74,0x27
-asm/non_matchings/code/code_801A7B10/func_801A9B10.s,func_801A9B10,0x801A9B10,0x1A
-asm/non_matchings/code/code_801A7B10/func_801A9B78.s,func_801A9B78,0x801A9B78,0x21
-asm/non_matchings/code/code_801A7B10/func_801A9BFC.s,func_801A9BFC,0x801A9BFC,0x1B
-asm/non_matchings/code/code_801A7B10/func_801A9C68.s,func_801A9C68,0x801A9C68,0x2A
-asm/non_matchings/code/code_801A7B10/func_801A9D10.s,func_801A9D10,0x801A9D10,0x2F
-asm/non_matchings/code/code_801A7B10/func_801A9DCC.s,func_801A9DCC,0x801A9DCC,0x36
-asm/non_matchings/code/code_801A7B10/func_801A9EA4.s,func_801A9EA4,0x801A9EA4,0x2A
-asm/non_matchings/code/code_801A7B10/func_801A9F4C.s,func_801A9F4C,0x801A9F4C,0x35
-asm/non_matchings/code/code_801AA020/func_801AA020.s,func_801AA020,0x801AA020,0x8A
-asm/non_matchings/code/code_801AA020/func_801AA248.s,func_801AA248,0x801AA248,0x67
-asm/non_matchings/code/code_801AA020/func_801AA3E4.s,func_801AA3E4,0x801AA3E4,0x4F
-asm/non_matchings/code/code_801AA020/func_801AA520.s,func_801AA520,0x801AA520,0x3C
+asm/non_matchings/code/jpegutils/JpegUtils_ProcessQuantizationTable.s,JpegUtils_ProcessQuantizationTable,0x801A9B10,0x1A
+asm/non_matchings/code/jpegutils/JpegUtils_ParseHuffmanCodesLengths.s,JpegUtils_ParseHuffmanCodesLengths,0x801A9B78,0x21
+asm/non_matchings/code/jpegutils/JpegUtils_GetHuffmanCodes.s,JpegUtils_GetHuffmanCodes,0x801A9BFC,0x1B
+asm/non_matchings/code/jpegutils/JpegUtils_SetHuffmanTable.s,JpegUtils_SetHuffmanTable,0x801A9C68,0x2A
+asm/non_matchings/code/jpegutils/JpegUtils_ProcessHuffmanTableImpl.s,JpegUtils_ProcessHuffmanTableImpl,0x801A9D10,0x2F
+asm/non_matchings/code/jpegutils/JpegUtils_ProcessHuffmanTable.s,JpegUtils_ProcessHuffmanTable,0x801A9DCC,0x36
+asm/non_matchings/code/jpegutils/JpegUtils_SetHuffmanTableOld.s,JpegUtils_SetHuffmanTableOld,0x801A9EA4,0x2A
+asm/non_matchings/code/jpegutils/JpegUtils_ProcessHuffmanTableImplOld.s,JpegUtils_ProcessHuffmanTableImplOld,0x801A9F4C,0x35
+asm/non_matchings/code/jpegdecoder/JpegDecoder_Decode.s,JpegDecoder_Decode,0x801AA020,0x8A
+asm/non_matchings/code/jpegdecoder/JpegDecoder_ProcessMcu.s,JpegDecoder_ProcessMcu,0x801AA248,0x67
+asm/non_matchings/code/jpegdecoder/JpegDecoder_ParseNextSymbol.s,JpegDecoder_ParseNextSymbol,0x801AA3E4,0x4F
+asm/non_matchings/code/jpegdecoder/JpegDecoder_ReadBits.s,JpegDecoder_ReadBits,0x801AA520,0x3C
 asm/non_matchings/code/z_game_over/GameOver_Init.s,GameOver_Init,0x801AA610,0x5
 asm/non_matchings/code/z_game_over/GameOver_FadeLights.s,GameOver_FadeLights,0x801AA624,0x1A
 asm/non_matchings/code/z_game_over/GameOver_Update.s,GameOver_Update,0x801AA68C,0x105

tools/warnings_count/check_new_warnings.sh

@@ -32,18 +32,30 @@ Check for new warnings created.
 
 Optional arguments:
     -h    Display this message and exit.
+    -f    Run full build process
     -j N  use N jobs (does not support plain -j because you shouldn't use it anyway)
 "
 }
 
 jobs=1
+full=
+run="make clean
+    make uncompressed"
 
-while getopts "hj:" opt
+
+
+while getopts "hfj:" opt
 do
     case $opt in
     h)  show_help
         exit 0
         ;;
+    f)  full="true"
+        run="make distclean
+    make setup
+    make disasm
+    make all"
+        ;;
     j)  j_option_arg="$OPTARG"
         if [[ ! "${j_option_arg}" =~ ^[0-9]*$ ]]
         then
@@ -61,10 +73,7 @@ shift $(($OPTIND - 1))
 
 # Confirm run with -j jobs
 echo "This will run
-    make distclean
-    make setup
-    make disasm
-    make all
+    $run
 using $jobs threads. This may take some time."
 read -r -p "Is this okay? [Y/n]" response
 response=${response,,} # tolower
@@ -90,16 +99,20 @@ make_warnings () {
     && rm tools/warnings_count/warnings_temp.txt
 }
 
+if [[ $full ]]; then
+    make distclean
+    make_warnings setup setup
+    make_warnings disasm disasm
+    make_warnings all build
+else
+    make clean
+    make_warnings uncompressed build
+fi
 
-make distclean
-make_warnings setup setup
-make_warnings disasm disasm
-make_warnings all build
 
-echo "
-$(tput ${TPUTTERM} setaf 3)(lots of make output ${TPUTTERM} here...) 
-$RST"
-$COMPARE_WARNINGS setup
-$COMPARE_WARNINGS disasm
+if [[ $full ]]; then
+    $COMPARE_WARNINGS setup
+    $COMPARE_WARNINGS disasm
+fi
 $COMPARE_WARNINGS build