diff --git a/lib/mm-decomp b/lib/mm-decomp
index 5607eec..45ae63c 160000
--- a/lib/mm-decomp
+++ b/lib/mm-decomp
@@ -1 +1 @@
-Subproject commit 5607eec18bae68e4cd38ef6d1fa69d7f1d84bfc8
+Subproject commit 45ae63ccc550ea29f475669a87f7f8ac681a6b29
diff --git a/patches/autosaving.c b/patches/autosaving.c
index b05e507..519f30e 100644
--- a/patches/autosaving.c
+++ b/patches/autosaving.c
@@ -1,5 +1,6 @@
 #include "patches.h"
 #include "play_patches.h"
+#include "z64cutscene.h"
 #include "z64save.h"
 #include "z64horse.h"
 #include "overlays/gamestates/ovl_file_choose/z_file_select.h"
@@ -462,7 +463,7 @@ typedef struct {
 } CutsceneManager; // size = 0x18
 
 extern CutsceneManager sCutsceneMgr;
-extern ActorCutscene* sSceneCutsceneList;
+extern CutsceneEntry* sSceneCutsceneList;
 extern s16 sSceneCutsceneCount;
 
 bool skip_entry_cutscene = false;
diff --git a/patches/billboard_tagging.c b/patches/billboard_tagging.c
index 303a5a1..91c8fb4 100644
--- a/patches/billboard_tagging.c
+++ b/patches/billboard_tagging.c
@@ -30,6 +30,9 @@
 //   Matrix_RotateAxisF in NEW
 //   Matrix_RotateAxisS in NEW
 
+extern MtxF* sCurrentMatrix;
+extern MtxF* sMatrixStack;
+
 #define MATRIX_STACK_SIZE 20
 
 MtxF* play_billboard_matrix;
diff --git a/patches/camera_patches.c b/patches/camera_patches.c
index 82d5e64..5b88dc8 100644
--- a/patches/camera_patches.c
+++ b/patches/camera_patches.c
@@ -2077,7 +2077,7 @@ void func_809EC568(Boss04* this, PlayState* play) {
                 Cutscene_StopManual(play, &play->csCtx);
                 Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_END);
                 Play_DisableMotionBlur();
-                SET_EVENTINF(EVENTINF_60);
+                SET_EVENTINF(EVENTINF_INTRO_CS_WATCHED_WART);
             }
             break;
     }
diff --git a/patches/dummy_headers/assets/text/message_data.h b/patches/dummy_headers/assets/text/message_data.h
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/patches/dummy_headers/assets/text/message_data.h
@@ -0,0 +1 @@
+
diff --git a/patches/dummy_headers/assets/text/staff_message_data.h b/patches/dummy_headers/assets/text/staff_message_data.h
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/patches/dummy_headers/assets/text/staff_message_data.h
@@ -0,0 +1 @@
+
diff --git a/patches/effect_patches.c b/patches/effect_patches.c
index ed064b3..3cadf6e 100644
--- a/patches/effect_patches.c
+++ b/patches/effect_patches.c
@@ -2,6 +2,7 @@
 #include "graphics.h"
 #include "sys_cfb.h"
 #include "z64view.h"
+#include "z64circle_tex.h"
 #include "transform_ids.h"
 
 extern TransitionOverlay gTransitionOverlayTable[];
@@ -85,7 +86,7 @@ void Play_DrawMotionBlur(PlayState* this) {
         OPEN_DISPS(gfxCtx);
 
         gfxHead = POLY_OPA_DISP;
-        gfx = Graph_GfxPlusOne(gfxHead);
+        gfx = Gfx_Open(gfxHead);
 
         gSPDisplayList(OVERLAY_DISP++, gfx);
 
@@ -122,7 +123,7 @@ void Play_DrawMotionBlur(PlayState* this) {
 
         gSPEndDisplayList(gfx++);
 
-        Graph_BranchDlist(gfxHead, gfx);
+        Gfx_Close(gfxHead, gfx);
 
         POLY_OPA_DISP = gfx;
 
@@ -144,7 +145,7 @@ void Actor_DrawLensOverlay(Gfx** gfxP, s32 lensMaskSize) {
 
 
 // @recomp Patched to use ortho tris for interpolation and to prevent the telescope and lens effects from getting stretched wide.
-void TransitionCircle_LoadAndSetTexture(Gfx** gfxp, TexturePtr texture, s32 fmt, s32 arg3, s32 masks, s32 maskt,
+void TransitionCircle_LoadAndSetTexture(Gfx** gfxp, void const* texture, s32 fmt, s32 arg3, s32 masks, s32 maskt,
                                         f32 arg6) {
     Gfx* gfx = *gfxp;
     s32 xh = gCfbWidth;
diff --git a/patches/fixes.c b/patches/fixes.c
index f46bb86..e01f8d6 100644
--- a/patches/fixes.c
+++ b/patches/fixes.c
@@ -95,7 +95,7 @@ s16 KaleidoScope_SetPageVertices(PlayState* play, Vtx* vtx, s16 vtxPage, s16 num
 
             vtx[k + 1].v.ob[0] = vtx[k + 3].v.ob[0] = vtx[k + 0].v.ob[0] + quadsWidth[i];
 
-            if (!IS_PAUSE_STATE_GAMEOVER) {
+            if (!IS_PAUSE_STATE_GAMEOVER(pauseCtx)) {
                 vtx[k + 0].v.ob[1] = vtx[k + 1].v.ob[1] = quadsY[i] + pauseCtx->offsetY;
             } else if (gameOverCtx->state == GAMEOVER_INACTIVE) {
                 vtx[k + 0].v.ob[1] = vtx[k + 1].v.ob[1] = quadsY[i] + pauseCtx->offsetY;
diff --git a/patches/input_latency.c b/patches/input_latency.c
index 2e04c52..dbbbdc3 100644
--- a/patches/input_latency.c
+++ b/patches/input_latency.c
@@ -5,10 +5,9 @@
 #include "audiomgr.h"
 #include "z64speed_meter.h"
 #include "z64vimode.h"
-#include "z64viscvg.h"
-#include "z64vismono.h"
-#include "z64viszbuf.h"
+#include "z64vis.h"
 #include "input.h"
+#include "scheduler.h"
 
 void recomp_set_current_frame_poll_id();
 void PadMgr_HandleRetrace(void);
@@ -169,7 +168,7 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx, GameState* gameState) {
 //         osSyncPrintf("GRAPH SP TIMEOUT\n");
 //         if (retryCount >= 0) {
 //             retryCount--;
-//             Sched_SendGfxCancelMsg(&gSchedContext);
+//             Sched_SendGfxCancelMsg(&gScheduler);
 //             goto retry;
 //         } else {
 //             // graph.c: No more! die!
@@ -185,20 +184,20 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx, GameState* gameState) {
 
     task->type = M_GFXTASK;
     task->flags = OS_SC_DRAM_DLIST;
-    task->ucodeBoot = SysUcode_GetUCodeBoot();
-    task->ucodeBootSize = SysUcode_GetUCodeBootSize();
+    task->ucode_boot = SysUcode_GetUCodeBoot();
+    task->ucode_boot_size = SysUcode_GetUCodeBootSize();
     task->ucode = SysUcode_GetUCode();
-    task->ucodeData = SysUcode_GetUCodeData();
-    task->ucodeSize = SP_UCODE_SIZE;
-    task->ucodeDataSize = SP_UCODE_DATA_SIZE;
-    task->dramStack = (u64*)gGfxSPTaskStack;
-    task->dramStackSize = sizeof(gGfxSPTaskStack);
-    task->outputBuff = gGfxSPTaskOutputBufferPtr;
-    task->outputBuffSize = gGfxSPTaskOutputBufferEnd;
-    task->dataPtr = (u64*)gGfxMasterDL;
-    task->dataSize = 0;
-    task->yieldDataPtr = (u64*)gGfxSPTaskYieldBuffer;
-    task->yieldDataSize = sizeof(gGfxSPTaskYieldBuffer);
+    task->ucode_data = SysUcode_GetUCodeData();
+    task->ucode_size = SP_UCODE_SIZE;
+    task->ucode_data_size = SP_UCODE_DATA_SIZE;
+    task->dram_stack = (u64*)gGfxSPTaskStack;
+    task->dram_stack_size = sizeof(gGfxSPTaskStack);
+    task->output_buff = gGfxSPTaskOutputBufferPtr;
+    task->output_buff_size = gGfxSPTaskOutputBufferEnd;
+    task->data_ptr = (u64*)gGfxMasterDL;
+    task->data_size = 0;
+    task->yield_data_ptr = (u64*)gGfxSPTaskYieldBuffer;
+    task->yield_data_size = sizeof(gGfxSPTaskYieldBuffer);
 
     scTask->next = NULL;
     scTask->flags = OS_SC_RCP_MASK | OS_SC_SWAPBUFFER | OS_SC_LAST_TASK;
@@ -217,13 +216,13 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx, GameState* gameState) {
     cfb = &sGraphCfbInfos[cfbIdx];
     cfbIdx = (cfbIdx + 1) % ARRAY_COUNT(sGraphCfbInfos);
 
-    cfb->fb1 = gfxCtx->curFrameBuffer;
+    cfb->framebuffer = gfxCtx->curFrameBuffer;
     cfb->swapBuffer = gfxCtx->curFrameBuffer;
 
     if (gfxCtx->updateViMode) {
         gfxCtx->updateViMode = false;
         cfb->viMode = gfxCtx->viMode;
-        cfb->features = gfxCtx->viConfigFeatures;
+        cfb->viFeatures = gfxCtx->viConfigFeatures;
         cfb->xScale = gfxCtx->xScale;
         cfb->yScale = gfxCtx->yScale;
     } else {
@@ -238,9 +237,9 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx, GameState* gameState) {
         osRecvMesg(&gfxCtx->queue, NULL, OS_MESG_NOBLOCK);
     }
 
-    gfxCtx->schedMsgQ = &gSchedContext.cmdQ;
-    osSendMesg(&gSchedContext.cmdQ, scTask, OS_MESG_BLOCK);
-    Sched_SendEntryMsg(&gSchedContext);
+    gfxCtx->schedMsgQ = &gScheduler.cmdQueue;
+    osSendMesg(&gScheduler.cmdQueue, scTask, OS_MESG_BLOCK);
+    Sched_SendNotifyMsg(&gScheduler);
     
     // @recomp Immediately wait on the task to complete to minimize latency for the next one.
     osRecvMesg(&gfxCtx->queue, &msg, OS_MESG_BLOCK);
@@ -248,7 +247,7 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx, GameState* gameState) {
     // @recomp Wait on the VI framebuffer to change if this task has a framebuffer swap.
     if (scTask->flags & OS_SC_SWAPBUFFER) {
         int viCounter = 0;
-        while (osViGetCurrentFramebuffer() != cfb->fb1) {
+        while (osViGetCurrentFramebuffer() != cfb->framebuffer) {
             osRecvMesg(&vi_queue, NULL, OS_MESG_BLOCK);
             viCounter++;
         }
@@ -267,7 +266,7 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx, GameState* gameState) {
 
 extern SpeedMeter sGameSpeedMeter;
 extern VisCvg sGameVisCvg;
-extern VisZbuf sGameVisZbuf;
+extern VisZBuf sGameVisZBuf;
 extern VisMono sGameVisMono;
 extern ViMode sGameViMode;
 
@@ -285,7 +284,7 @@ void GameState_Destroy(GameState* gameState) {
     Rumble_Destroy();
     SpeedMeter_Destroy(&sGameSpeedMeter);
     VisCvg_Destroy(&sGameVisCvg);
-    VisZbuf_Destroy(&sGameVisZbuf);
+    VisZBuf_Destroy(&sGameVisZBuf);
     VisMono_Destroy(&sGameVisMono);
     ViMode_Destroy(&sGameViMode);
     THA_Destroy(&gameState->tha);
diff --git a/patches/options.c b/patches/options.c
index 4273df6..f4f695c 100644
--- a/patches/options.c
+++ b/patches/options.c
@@ -128,15 +128,15 @@ void FileSelect_Init(GameState* thisx) {
 
     size = SEGMENT_ROM_SIZE(title_static);
     this->staticSegment = THA_AllocTailAlign16(&this->state.tha, size);
-    DmaMgr_SendRequest0(this->staticSegment, SEGMENT_ROM_START(title_static), size);
+    DmaMgr_RequestSync(this->staticSegment, SEGMENT_ROM_START(title_static), size);
 
     size = SEGMENT_ROM_SIZE(parameter_static);
     this->parameterSegment = THA_AllocTailAlign16(&this->state.tha, size);
-    DmaMgr_SendRequest0(this->parameterSegment, SEGMENT_ROM_START(parameter_static), size);
+    DmaMgr_RequestSync(this->parameterSegment, SEGMENT_ROM_START(parameter_static), size);
 
     size = gObjectTable[OBJECT_MAG].vromEnd - gObjectTable[OBJECT_MAG].vromStart;
     this->titleSegment = THA_AllocTailAlign16(&this->state.tha, size);
-    DmaMgr_SendRequest0(this->titleSegment, gObjectTable[OBJECT_MAG].vromStart, size);
+    DmaMgr_RequestSync(this->titleSegment, gObjectTable[OBJECT_MAG].vromStart, size);
 
     Audio_SetSpec(0xA);
     // Setting ioData to 1 and writing it to ioPort 7 will skip the harp intro
diff --git a/patches/quicksave_patches.c b/patches/quicksave_patches.c
index 227accf..a89f560 100644
--- a/patches/quicksave_patches.c
+++ b/patches/quicksave_patches.c
@@ -208,7 +208,7 @@ void DmaMgr_ThreadEntry(void* a0) {
     }
 }
 
-extern SchedContext gSchedContext;
+extern Scheduler gScheduler;
 
 void handle_quicksave_actions_main() {
     recomp_handle_quicksave_actions_main(&quicksave_enter_mq, &quicksave_exit_mq);
@@ -226,7 +226,7 @@ void wake_threads_for_quicksave_action() {
     // Wake up the DmaMgr thread
     osSendMesg(&sDmaMgrMsgQueue, (OSMesg)RECOMP_DMAMGR_QUICKSAVE_MESSAGE, OS_MESG_BLOCK);
     // Wake up the Sched thread
-    osSendMesg(&gSchedContext.interruptQ, (OSMesg)RECOMP_QUICKSAVE_ACTION, OS_MESG_BLOCK);
+    osSendMesg(&gScheduler.interruptQ, (OSMesg)RECOMP_QUICKSAVE_ACTION, OS_MESG_BLOCK);
 }
 
 #endif
diff --git a/patches/required_patches.c b/patches/required_patches.c
index e491a61..6320e95 100644
--- a/patches/required_patches.c
+++ b/patches/required_patches.c
@@ -22,7 +22,7 @@ void Main_Init(void) {
     // @recomp Load the code segment in the recomp runtime.
     recomp_load_overlays(SEGMENT_ROM_START(code), SEGMENT_START(code), SEGMENT_ROM_END(code) - SEGMENT_ROM_START(code));
 
-    DmaMgr_SendRequestImpl(&dmaReq, SEGMENT_START(code), SEGMENT_ROM_START(code),
+    DmaMgr_RequestAsync(&dmaReq, SEGMENT_START(code), SEGMENT_ROM_START(code),
                            SEGMENT_ROM_END(code) - SEGMENT_ROM_START(code), 0, &mq, NULL);
     Main_InitScreen();
     Main_InitMemory();
@@ -50,7 +50,7 @@ size_t Overlay_Load(uintptr_t vromStart, uintptr_t vromEnd, void* ramStart, void
     if (gOverlayLogSeverity >= 3) {}
 
     end = (uintptr_t)allocatedRamAddr + size;
-    DmaMgr_SendRequest0(allocatedRamAddr, vromStart, size);
+    DmaMgr_RequestSync(allocatedRamAddr, vromStart, size);
 
     ovlRelocs = (OverlayRelocationSection*)(end - ((s32*)end)[-1]);
 
diff --git a/patches/sky_transform_tagging.c b/patches/sky_transform_tagging.c
index 9503a62..04ebe02 100644
--- a/patches/sky_transform_tagging.c
+++ b/patches/sky_transform_tagging.c
@@ -10,7 +10,7 @@ void Skybox_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyboxId
 
     Gfx_SetupDL40_Opa(gfxCtx);
 
-    gSPSegment(POLY_OPA_DISP++, 0x0B, skyboxCtx->paletteStaticSegment);
+    gSPSegment(POLY_OPA_DISP++, 0x0B, skyboxCtx->palette);
     gSPTexture(POLY_OPA_DISP++, 0x8000, 0x8000, 0, G_TX_RENDERTILE, G_ON);
 
     sSkyboxDrawMatrix = GRAPH_ALLOC(gfxCtx, sizeof(Mtx));
@@ -40,7 +40,7 @@ void Skybox_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyboxId
     
     gDPSetColorDither(POLY_OPA_DISP++, G_CD_MAGICSQ);
     gDPSetTextureFilter(POLY_OPA_DISP++, G_TF_BILERP);
-    gDPLoadTLUT_pal256(POLY_OPA_DISP++, skyboxCtx->paletteStaticSegment);
+    gDPLoadTLUT_pal256(POLY_OPA_DISP++, skyboxCtx->palette);
     gDPSetTextureLUT(POLY_OPA_DISP++, G_TT_RGBA16);
     gDPSetTextureConvert(POLY_OPA_DISP++, G_TC_FILT);
     gDPSetCombineLERP(POLY_OPA_DISP++, TEXEL1, TEXEL0, PRIMITIVE_ALPHA, TEXEL0, TEXEL1, TEXEL0, PRIMITIVE, TEXEL0,
@@ -66,6 +66,8 @@ void Skybox_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyboxId
     CLOSE_DISPS(gfxCtx);
 }
 
+void MtxConv_F2L(Mtx* mtx, MtxF* mf);
+
 // @recomp Draw stars with billboarding to allow for interpolation instead of rects. 
 void Environment_DrawSkyboxStarBillboard(GraphicsContext* gfxCtx, MtxF* billboard_mtx, Gfx** gfxp, f32 x, f32 y, f32 z, s32 width, s32 height) {
     static Vtx star_verts[] = {
diff --git a/patches/specific_actor_transform_tagging.c b/patches/specific_actor_transform_tagging.c
index 3c4341a..fd9ab51 100644
--- a/patches/specific_actor_transform_tagging.c
+++ b/patches/specific_actor_transform_tagging.c
@@ -651,20 +651,20 @@ extern Gfx gGohtStalactiteModelDL[];
 
 // @recomp Tag Goht's rocks.
 void func_80B0C398(BossHakugin* this, PlayState* play) {
-    BossHakuginEffect* effect;
+    GohtRockEffect* effect;
     s32 i;
 
     OPEN_DISPS(play->state.gfxCtx);
 
     gSPDisplayList(POLY_OPA_DISP++, gGohtRockMaterialDL);
-    for (i = 0; i < ARRAY_COUNT(this->unk_9F8); i++) {
-        effect = &this->unk_9F8[i];
-        if ((effect->unk_18 >= 0) && (effect->unk_1A == 0)) {
-            Matrix_SetTranslateRotateYXZ(effect->unk_0.x, effect->unk_0.y, effect->unk_0.z, &effect->unk_1C);
-            Matrix_Scale(effect->unk_24, effect->unk_24, effect->unk_24, MTXMODE_APPLY);
+    for (i = 0; i < ARRAY_COUNT(this->rockEffects); i++) {
+        effect = &this->rockEffects[i];
+        if ((effect->timer >= 0) && (effect->type == GOHT_ROCK_EFFECT_TYPE_BOULDER)) {
+            Matrix_SetTranslateRotateYXZ(effect->pos.x, effect->pos.y, effect->pos.z, &effect->rot);
+            Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY);
 
             // @recomp Tag the transform.
-            gEXMatrixGroupDecomposedVerts(POLY_OPA_DISP++, GOHT_ROCKS_TRANSFORM_ID_START + i + 0 * ARRAY_COUNT(this->unk_9F8), G_EX_PUSH, G_MTX_MODELVIEW, G_EX_EDIT_NONE);
+            gEXMatrixGroupDecomposedVerts(POLY_OPA_DISP++, GOHT_ROCKS_TRANSFORM_ID_START + i + 0 * ARRAY_COUNT(this->rockEffects), G_EX_PUSH, G_MTX_MODELVIEW, G_EX_EDIT_NONE);
 
             gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_OPA_DISP++, gGohtRockModelDL);
@@ -675,14 +675,14 @@ void func_80B0C398(BossHakugin* this, PlayState* play) {
     }
 
     gSPDisplayList(POLY_OPA_DISP++, gGohtStalactiteMaterialDL);
-    for (i = 0; i < ARRAY_COUNT(this->unk_9F8); i++) {
-        effect = &this->unk_9F8[i];
-        if ((effect->unk_18 >= 0) && (effect->unk_1A == 1)) {
-            Matrix_SetTranslateRotateYXZ(effect->unk_0.x, effect->unk_0.y, effect->unk_0.z, &effect->unk_1C);
-            Matrix_Scale(effect->unk_24, effect->unk_24, effect->unk_24, MTXMODE_APPLY);
+    for (i = 0; i < ARRAY_COUNT(this->rockEffects); i++) {
+        effect = &this->rockEffects[i];
+        if ((effect->timer >= 0) && (effect->type == GOHT_ROCK_EFFECT_TYPE_STALACTITE)) {
+            Matrix_SetTranslateRotateYXZ(effect->pos.x, effect->pos.y, effect->pos.z, &effect->rot);
+            Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY);
 
             // @recomp Tag the transform.
-            gEXMatrixGroupDecomposedVerts(POLY_OPA_DISP++, GOHT_ROCKS_TRANSFORM_ID_START + i + 1 * ARRAY_COUNT(this->unk_9F8), G_EX_PUSH, G_MTX_MODELVIEW, G_EX_EDIT_NONE);
+            gEXMatrixGroupDecomposedVerts(POLY_OPA_DISP++, GOHT_ROCKS_TRANSFORM_ID_START + i + 1 * ARRAY_COUNT(this->rockEffects), G_EX_PUSH, G_MTX_MODELVIEW, G_EX_EDIT_NONE);
 
             gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_OPA_DISP++, gGohtStalactiteModelDL);
diff --git a/patches/ui_transform_tagging.c b/patches/ui_transform_tagging.c
index e8a457d..8d02158 100644
--- a/patches/ui_transform_tagging.c
+++ b/patches/ui_transform_tagging.c
@@ -83,7 +83,7 @@ void KaleidoScope_Draw(PlayState* play) {
         KaleidoScope_SetView(pauseCtx, pauseCtx->eye.x, pauseCtx->eye.y, pauseCtx->eye.z);
         Gfx_SetupDL42_Opa(play->state.gfxCtx);
 
-        if (!IS_PAUSE_STATE_OWL_WARP) {
+        if (!IS_PAUSE_STATE_OWL_WARP(pauseCtx)) {
             // Draw Default or Game Over Menus
             // @recomp Record the current pageIndex, then change it to a dummy value for the KaleidoScope_SetVertices.
             u16 saved_page_index = pauseCtx->pageIndex;
@@ -99,7 +99,7 @@ void KaleidoScope_Draw(PlayState* play) {
 
             KaleidoScope_SetView(pauseCtx, 0.0f, 0.0f, 64.0f);
 
-            if (!IS_PAUSE_STATE_GAMEOVER) {
+            if (!IS_PAUSE_STATE_GAMEOVER(pauseCtx)) {
                 KaleidoScope_DrawInfoPanel(play);
             }
 
@@ -622,7 +622,7 @@ void KaleidoScope_DrawPages(PlayState* play, GraphicsContext* gfxCtx) {
 
     OPEN_DISPS(gfxCtx);
 
-    if (!IS_PAUSE_STATE_GAMEOVER) {
+    if (!IS_PAUSE_STATE_GAMEOVER(pauseCtx)) {
         if (pauseCtx->state != PAUSE_STATE_SAVEPROMPT) {
 
             stepR =
diff --git a/us.rev1.syms.toml b/us.rev1.syms.toml
index 875cfae..5a9f463 100644
--- a/us.rev1.syms.toml
+++ b/us.rev1.syms.toml
@@ -36,13 +36,13 @@ functions = [
     { name = "guOrtho", vram = 0x800919F4, size = 0x64 },
     { name = "osSpTaskLoad", vram = 0x8008868C, size = 0x168 },
     { name = "ltruncf", vram = 0x80086CF8, size = 0x10 },
-    { name = "DmaMgr_SendRequestImpl", vram = 0x80080C04, size = 0x8C },
+    { name = "DmaMgr_RequestAsync", vram = 0x80080C04, size = 0x8C },
     { name = "Fault_DrawCornerRec", vram = 0x80082180, size = 0x54 },
     { name = "FaultDrawer_FillScreen", vram = 0x800844D8, size = 0x90 },
     { name = "IrqMgr_RemoveClient", vram = 0x800812DC, size = 0x8C },
     { name = "bzero", vram = 0x80089630, size = 0xA0 },
     { name = "nearbyintf", vram = 0x80086D18, size = 0xC },
-    { name = "func_80085150", vram = 0x80085150, size = 0x8 },
+    { name = "PadUtils_Destroy", vram = 0x80085150, size = 0x8 },
     { name = "Fault_HangupFaultClient", vram = 0x80083CF8, size = 0xFC },
     { name = "__osPiCreateAccessQueue", vram = 0x8008C190, size = 0x50 },
     { name = "__osVoiceSetADConverter", vram = 0x80090900, size = 0x1E4 },
@@ -71,7 +71,7 @@ functions = [
     { name = "Yaz0_NextDMA", vram = 0x80080ED0, size = 0x120 },
     { name = "__osCheckArena", vram = 0x800877C4, size = 0x68 },
     { name = "guPositionF", vram = 0x8008FEB0, size = 0x1A8 },
-    { name = "IrqMgr_SendMesgForClient", vram = 0x80081368, size = 0x50 },
+    { name = "IrqMgr_SendMesgToClients", vram = 0x80081368, size = 0x50 },
     { name = "Fault_ConvertAddress", vram = 0x80081D9C, size = 0x90 },
     { name = "CIC6105_Noop2", vram = 0x80081828, size = 0x8 },
     { name = "__d_to_ll", vram = 0x80095A60, size = 0x1C },
@@ -113,7 +113,7 @@ functions = [
     { name = "osSpTaskStartGo", vram = 0x800887F4, size = 0x40 },
     { name = "Fault_DisplayFrameBuffer", vram = 0x800834CC, size = 0xC0 },
     { name = "__osGetCompare", vram = 0x80091290, size = 0x10 },
-    { name = "IrqMgr_CheckStack", vram = 0x800814B4, size = 0x20 },
+    { name = "IrqMgr_CheckStacks", vram = 0x800814B4, size = 0x20 },
     { name = "Math_FTruncF", vram = 0x800867F4, size = 0x20 },
     { name = "osPfsChecker", vram = 0x800931F0, size = 0x538 },
     { name = "Math_FFloorF", vram = 0x80086794, size = 0x20 },
@@ -174,7 +174,7 @@ functions = [
     { name = "Fault_RemoveAddrConvClient", vram = 0x80081CA4, size = 0xF8 },
     { name = "osContGetQuery", vram = 0x8008D7AC, size = 0x24 },
     { name = "Fault_SleepImpl", vram = 0x80081980, size = 0x70 },
-    { name = "Fault_SetOptionsFromController3", vram = 0x80083670, size = 0x174 },
+    { name = "Fault_SetOptions", vram = 0x80083670, size = 0x174 },
     { name = "osSpTaskYielded", vram = 0x800902A0, size = 0x60 },
     { name = "osViSetSpecialFeatures", vram = 0x80092100, size = 0x15C },
     { name = "osViSetXScale", vram = 0x80095950, size = 0x10C },
@@ -257,7 +257,7 @@ functions = [
     { name = "osCreateMesgQueue", vram = 0x8008F240, size = 0x2C },
     { name = "PadUtils_CheckReleased", vram = 0x800851B4, size = 0x1C },
     { name = "send_mesg", vram = 0x8008905C, size = 0xB4 },
-    { name = "_MakeMotorData", vram = 0x80089838, size = 0x10C },
+    { name = "__osMakeMotorData", vram = 0x80089838, size = 0x10C },
     { name = "Main_InitFramebuffer", vram = 0x80080180, size = 0x1C },
     { name = "__ull_to_f", vram = 0x80095C38, size = 0x30 },
     { name = "__osPfsCheckRamArea", vram = 0x800930E8, size = 0x104 },
@@ -328,8 +328,8 @@ functions = [
     { name = "strchr", vram = 0x8008F1A0, size = 0x40 },
     { name = "__osPiRelAccess", vram = 0x8008C224, size = 0x2C },
     { name = "RcpUtils_Reset", vram = 0x80084968, size = 0x38 },
-    { name = "Fault_PrintFPCR", vram = 0x80082330, size = 0xA4 },
-    { name = "DmaMgr_SendRequest0", vram = 0x80080C90, size = 0x7C },
+    { name = "Fault_PrintFPCSR", vram = 0x80082330, size = 0xA4 },
+    { name = "DmaMgr_RequestSync", vram = 0x80080C90, size = 0x7C },
     { name = "Fault_FindFaultedThread", vram = 0x80082AB8, size = 0x88 },
     { name = "IrqMgr_ThreadEntry", vram = 0x80081684, size = 0xD0 },
     { name = "__osDisableInt", vram = 0x80091A60, size = 0x70 },
@@ -344,7 +344,7 @@ functions = [
     { name = "Rand_Next_Variable", vram = 0x80087090, size = 0x28 },
     { name = "floorf", vram = 0x80086C70, size = 0xC },
     { name = "ceil", vram = 0x80086CB4, size = 0xC },
-    { name = "IrqMgr_JamMesgForClient", vram = 0x800813B8, size = 0x64 },
+    { name = "IrqMgr_JamMesgToClients", vram = 0x800813B8, size = 0x64 },
     { name = "Main_InitMemory", vram = 0x800801EC, size = 0x64 },
     { name = "Fault_ProcessClients", vram = 0x8008358C, size = 0xE4 },
     { name = "__osSiRawReadIo", vram = 0x8008AEE0, size = 0x4C },
@@ -390,7 +390,7 @@ functions = [
     { name = "__osSiGetAccess", vram = 0x80089AF0, size = 0x44 },
     { name = "__osExceptionPreamble", vram = 0x80088B00, size = 0x10 },
     { name = "Fault_FillScreenBlack", vram = 0x800820D8, size = 0x54 },
-    { name = "DmaMgr_DmaHandler", vram = 0x800808D4, size = 0x20 },
+    { name = "DmaMgr_AudioDmaHandler", vram = 0x800808D4, size = 0x20 },
     { name = "osViGetCurrentFramebuffer", vram = 0x800964D0, size = 0x3C },
     { name = "__ll_mul", vram = 0x800889A8, size = 0x30 },
     { name = "osViSetMode", vram = 0x8008B650, size = 0x58 },
@@ -448,12 +448,12 @@ functions = [
     { name = "ArenaImpl_LockInit", vram = 0x80087160, size = 0x2C },
     { name = "__ll_mod", vram = 0x80088A38, size = 0x9C },
     { name = "PadUtils_GetCurX", vram = 0x800851E0, size = 0x8 },
-    { name = "DmaMgr_ProcessMsg", vram = 0x80080A08, size = 0x17C },
+    { name = "DmaMgr_ProcessRequest", vram = 0x80080A08, size = 0x17C },
     { name = "coss", vram = 0x80092260, size = 0x30 },
     { name = "Main_ThreadEntry", vram = 0x80080300, size = 0x8C },
     { name = "__osMallocR", vram = 0x80087408, size = 0xE4 },
     { name = "Idle_InitVideo", vram = 0x8008038C, size = 0x188 },
-    { name = "DmaMgr_Start", vram = 0x80080D0C, size = 0xF4 },
+    { name = "DmaMgr_Init", vram = 0x80080D0C, size = 0xF4 },
     { name = "floor", vram = 0x80086C7C, size = 0xC },
     { name = "nsleep", vram = 0x800879CC, size = 0x50 },
     { name = "Overlay_AllocateAndLoad", vram = 0x800850C8, size = 0x5C },
@@ -688,14 +688,14 @@ functions = [
     { name = "Lights_New", vram = 0x80102834, size = 0x4C },
     { name = "View_UpdateViewingMatrix", vram = 0x80140024, size = 0xA8 },
     { name = "SubS_AngleDiffLessEqual", vram = 0x8013D5E8, size = 0x60 },
-    { name = "func_8014CCB4", vram = 0x8014CCB4, size = 0x13C },
+    { name = "Message_LoadRupeesJPN", vram = 0x8014CCB4, size = 0x13C },
     { name = "func_8010AD24", vram = 0x8010AD24, size = 0xB0 },
     { name = "AudioThread_ScheduleProcessCmds", vram = 0x80193900, size = 0x90 },
     { name = "Matrix_MtxFCopy", vram = 0x80181CDC, size = 0x88 },
     { name = "ListAlloc_Init", vram = 0x80174AA0, size = 0x14 },
     { name = "Scene_CommandSkyboxDisables", vram = 0x8012FFF0, size = 0x28 },
     { name = "func_80184C48", vram = 0x80184C48, size = 0x458 },
-    { name = "Sched_RetraceUpdateFramebuffer", vram = 0x80176314, size = 0x50 },
+    { name = "Sched_SwapFramebuffer", vram = 0x80176314, size = 0x50 },
     { name = "SkinMatrix_SetScaleRotateYRPTranslate", vram = 0x80139894, size = 0x84 },
     { name = "AudioSynth_Noop13", vram = 0x801880BC, size = 0x8 },
     { name = "CollisionCheck_AC_TrisVsJntSph", vram = 0x800E494C, size = 0x1BC },
@@ -728,7 +728,7 @@ functions = [
     { name = "EnItem00_DrawHeartContainer", vram = 0x800A74D8, size = 0xE0 },
     { name = "CutsceneCamera_Init", vram = 0x8016119C, size = 0x90 },
     { name = "AudioSfx_SetBankLerp", vram = 0x801A7794, size = 0x94 },
-    { name = "AudioPlayback_InitNoteLists", vram = 0x80195DEC, size = 0x50 },
+    { name = "AudioList_InitNoteLists", vram = 0x80195DEC, size = 0x50 },
     { name = "func_800B2364", vram = 0x800B2364, size = 0x74 },
     { name = "func_800FEAB0", vram = 0x800FEAB0, size = 0x10 },
     { name = "Camera_Stub800DE0E0", vram = 0x800DE0E0, size = 0xC },
@@ -752,7 +752,7 @@ functions = [
     { name = "Actor_ChangeCategory", vram = 0x800BC154, size = 0x34 },
     { name = "Animation_OnFrameImpl", vram = 0x80136990, size = 0xB8 },
     { name = "DebugDisplay_Init", vram = 0x800E9470, size = 0x18 },
-    { name = "AudioScript_AudioListPushBack", vram = 0x80197E08, size = 0x40 },
+    { name = "AudioList_PushBack", vram = 0x80197E08, size = 0x40 },
     { name = "CollisionCheck_OC_SphereVsJntSph", vram = 0x800E7130, size = 0x2C },
     { name = "Scene_CommandSpawnList", vram = 0x8012F79C, size = 0x170 },
     { name = "AudioLoad_SyncInitSeqPlayer", vram = 0x8018FAD0, size = 0x50 },
@@ -922,7 +922,7 @@ functions = [
     { name = "CutsceneCmd_SetTime", vram = 0x800EB1DC, size = 0x188 },
     { name = "View_ApplyPerspectiveToOverlay", vram = 0x8013FD74, size = 0x2B0 },
     { name = "func_800B8D50", vram = 0x800B8D50, size = 0x48 },
-    { name = "Sched_TaskUpdateFramebuffer", vram = 0x801768E0, size = 0x3C },
+    { name = "Sched_SetNextFramebufferFromTask", vram = 0x801768E0, size = 0x3C },
     { name = "CollisionCheck_SetInfo", vram = 0x800E7530, size = 0x2C },
     { name = "Sram_SetFlashPagesOwlSave", vram = 0x80147138, size = 0x18 },
     { name = "Collider_SetJntSphToActor", vram = 0x800E0CA8, size = 0xDC },
@@ -1125,7 +1125,7 @@ functions = [
     { name = "func_801845A4", vram = 0x801845A4, size = 0x24 },
     { name = "Environment_EnableUnderwaterLights", vram = 0x800F6834, size = 0x118 },
     { name = "LifeMeter_UpdateColors", vram = 0x8010069C, size = 0x3E4 },
-    { name = "Setup_SetRegs", vram = 0x80173130, size = 0x1AC },
+    { name = "Setup_InitRegs", vram = 0x80173130, size = 0x1AC },
     { name = "func_8017D7C0", vram = 0x8017D7C0, size = 0x54 },
     { name = "Schedule_CheckMiscS", vram = 0x8013296C, size = 0xAC },
     { name = "Message_ShouldAdvanceSilent", vram = 0x80147734, size = 0x80 },
@@ -1217,7 +1217,7 @@ functions = [
     { name = "Gfx_DrawTexQuadIA8", vram = 0x8010DC58, size = 0x1E0 },
     { name = "Player_GetExchangeItemAction", vram = 0x800B8708, size = 0x10 },
     { name = "Jpeg_ScheduleDecoderTask", vram = 0x800F42A0, size = 0x11C },
-    { name = "AudioPlayback_NotePoolClear", vram = 0x80195EE0, size = 0x160 },
+    { name = "AudioList_ClearNotePool", vram = 0x80195EE0, size = 0x160 },
     { name = "Camera_GetPitchAdjFromFloorHeightDiffs", vram = 0x800CC9C0, size = 0x32C },
     { name = "osFlashGetAddr", vram = 0x80186A70, size = 0x48 },
     { name = "Audio_SetSeqTempoAndFreq", vram = 0x801A29D4, size = 0x1E4 },
@@ -1397,7 +1397,7 @@ functions = [
     { name = "Camera_CalcAtForEnemyLockOn", vram = 0x800CE2B8, size = 0x328 },
     { name = "TransitionOverlay_Free", vram = 0x8016537C, size = 0xBC },
     { name = "Scene_CommandLightList", vram = 0x8012FDA4, size = 0x88 },
-    { name = "AudioPlayback_AudioListPushFront", vram = 0x8019617C, size = 0x40 },
+    { name = "AudioList_PushFront", vram = 0x8019617C, size = 0x40 },
     { name = "osFlashInit", vram = 0x80186B78, size = 0x134 },
     { name = "AudioSeq_QueueSeqCmd", vram = 0x801A89A8, size = 0x28 },
     { name = "Scene_CommandEchoSetting", vram = 0x8013043C, size = 0x18 },
@@ -1504,7 +1504,7 @@ functions = [
     { name = "Gfx_SetupDL51_Opa", vram = 0x8012C0D0, size = 0x28 },
     { name = "func_800FE5D0", vram = 0x800FE5D0, size = 0x40 },
     { name = "EffectSsHitmark_SpawnFixedScale", vram = 0x800B2684, size = 0x24 },
-    { name = "Graph_BranchDlist", vram = 0x80174A4C, size = 0x18 },
+    { name = "Gfx_Close", vram = 0x80174A4C, size = 0x18 },
     { name = "SpeedMeter_InitImpl", vram = 0x80177390, size = 0x10 },
     { name = "func_80170200", vram = 0x80170200, size = 0x3C },
     { name = "Play_DecompressI5ToI8", vram = 0x80166644, size = 0x270 },
@@ -1606,7 +1606,7 @@ functions = [
     { name = "WaterBox_GetBgCamSetting", vram = 0x800CA648, size = 0x70 },
     { name = "Message_DrawSceneTitleCard", vram = 0x80153EF0, size = 0x2E4 },
     { name = "func_80109B38", vram = 0x80109B38, size = 0x68 },
-    { name = "func_80143148", vram = 0x80143148, size = 0xA0 },
+    { name = "Skybox_Calculate128", vram = 0x80143148, size = 0xA0 },
     { name = "Audio_ClearSariaBgm2", vram = 0x801A2460, size = 0xC },
     { name = "func_801382C4", vram = 0x801382C4, size = 0x3C },
     { name = "Collider_ResetLineOC", vram = 0x800E2434, size = 0x1C },
@@ -1754,7 +1754,7 @@ functions = [
     { name = "TransitionTile_Destroy", vram = 0x8016424C, size = 0x8C },
     { name = "func_801045AC", vram = 0x801045AC, size = 0x53C },
     { name = "PlayerAnimation_Loop", vram = 0x80136288, size = 0x94 },
-    { name = "Sched_HandleReset", vram = 0x80176364, size = 0xC },
+    { name = "Sched_HandlePreNMI", vram = 0x80176364, size = 0xC },
     { name = "Inventory_DeleteEquipment", vram = 0x8012ED78, size = 0x70 },
     { name = "AudioSfx_SetProperties", vram = 0x8019EB2C, size = 0x4F8 },
     { name = "func_800BE504", vram = 0x800BE504, size = 0x64 },
@@ -1838,7 +1838,7 @@ functions = [
     { name = "Health_ChangeBy", vram = 0x80115908, size = 0xB8 },
     { name = "PadMgr_ThreadEntry", vram = 0x80176010, size = 0x184 },
     { name = "Environment_UpdatePostmanEvents", vram = 0x800F8A9C, size = 0x238 },
-    { name = "Message_SetupLoadItemIcon", vram = 0x8014CFDC, size = 0x328 },
+    { name = "Message_DecodeHeader", vram = 0x8014CFDC, size = 0x328 },
     { name = "AnimatedMat_TexScroll", vram = 0x80130834, size = 0x6C },
     { name = "CollisionCheck_SetATvsAC", vram = 0x800E3324, size = 0x2A4 },
     { name = "Actor_GetArrowDmgFlags", vram = 0x800BC188, size = 0x2C },
@@ -1906,7 +1906,7 @@ functions = [
     { name = "SkelAnime_DrawTransformFlexOpa", vram = 0x801343C0, size = 0x240 },
     { name = "Message_GetTimerDigits", vram = 0x8014CDF0, size = 0x1EC },
     { name = "CollisionCheck_GreenBlood", vram = 0x800E2D88, size = 0x16C },
-    { name = "func_80142440", vram = 0x80142440, size = 0xD08 },
+    { name = "Skybox_CalculateFace128", vram = 0x80142440, size = 0xD08 },
     { name = "BgCheck_CheckDynaCeiling", vram = 0x800C8A60, size = 0x170 },
     { name = "func_80106D08", vram = 0x80106D08, size = 0x54 },
     { name = "Math_Vec3f_Diff", vram = 0x800FF5F4, size = 0x38 },
@@ -1993,7 +1993,7 @@ functions = [
     { name = "Gfx_SetupDL53_Opa", vram = 0x8012C120, size = 0x28 },
     { name = "Play_DrawMotionBlur", vram = 0x80165460, size = 0x1A8 },
     { name = "Scene_CommandCollisionHeader", vram = 0x8012F984, size = 0xA0 },
-    { name = "MsgEvent_SendNullTask", vram = 0x8010C1B0, size = 0x74 },
+    { name = "Sched_FlushTaskQueue", vram = 0x8010C1B0, size = 0x74 },
     { name = "Gfx_SetupDL25_Opa", vram = 0x8012C28C, size = 0x28 },
     { name = "AnimatedMat_DrawAlphaOpa", vram = 0x8013182C, size = 0x38 },
     { name = "func_80109428", vram = 0x80109428, size = 0x78 },
@@ -2109,7 +2109,7 @@ functions = [
     { name = "Skin_DrawLimb", vram = 0x80137F58, size = 0xF8 },
     { name = "Camera_Demo6", vram = 0x800DC718, size = 0x20 },
     { name = "AudioMgr_ThreadEntry", vram = 0x80172ED0, size = 0x178 },
-    { name = "Graph_GfxPlusOne", vram = 0x80174A40, size = 0xC },
+    { name = "Gfx_Open", vram = 0x80174A40, size = 0xC },
     { name = "Actor_Draw", vram = 0x800B9A04, size = 0x318 },
     { name = "func_80152CAC", vram = 0x80152CAC, size = 0x214 },
     { name = "EffectSsKakera_Spawn", vram = 0x800B2810, size = 0xB8 },
@@ -2444,7 +2444,7 @@ functions = [
     { name = "func_80184914", vram = 0x80184914, size = 0x8C },
     { name = "Matrix_Init", vram = 0x80180160, size = 0x3C },
     { name = "Graph_SetNextGfxPool", vram = 0x80173DCC, size = 0x1CC },
-    { name = "AudioPlayback_AudioListRemove", vram = 0x801961BC, size = 0x2C },
+    { name = "AudioList_Remove", vram = 0x801961BC, size = 0x2C },
     { name = "AudioHeap_SearchPermanentCache", vram = 0x8018D57C, size = 0x58 },
     { name = "func_8010AF6C", vram = 0x8010AF6C, size = 0x28 },
     { name = "func_80127438", vram = 0x80127438, size = 0x50 },
@@ -2518,7 +2518,7 @@ functions = [
     { name = "Collider_SetQuadDim", vram = 0x800E1D90, size = 0x88 },
     { name = "Environment_IsTimeStopped", vram = 0x800FE4A8, size = 0x10 },
     { name = "SubS_TimePathing_Update", vram = 0x8013B6B0, size = 0x1C8 },
-    { name = "func_80143324", vram = 0x80143324, size = 0x1C0 },
+    { name = "Skybox_Reload", vram = 0x80143324, size = 0x1C0 },
     { name = "Math3D_LineVsCube", vram = 0x8017AD38, size = 0x954 },
     { name = "Math_Vec3s_DiffToVec3f", vram = 0x800FF62C, size = 0x5C },
     { name = "PlayerCall_Draw", vram = 0x80160BC0, size = 0x40 },
@@ -2591,7 +2591,7 @@ functions = [
     { name = "func_800CBFA4", vram = 0x800CBFA4, size = 0x5C },
     { name = "Camera_GetInputDirYaw", vram = 0x800DFC68, size = 0x28 },
     { name = "AudioVoice_GetVoiceMaskPattern", vram = 0x801A54C4, size = 0xC },
-    { name = "func_80185F90", vram = 0x80185F90, size = 0x98 },
+    { name = "Kanji_OffsetFromShiftJIS", vram = 0x80185F90, size = 0x98 },
     { name = "Schedule_CheckTimeRangeS", vram = 0x80132494, size = 0x224 },
     { name = "PadMgr_LockPadData", vram = 0x8017509C, size = 0x30 },
     { name = "func_800CBAAC", vram = 0x800CBAAC, size = 0x28 },
@@ -2629,7 +2629,7 @@ functions = [
     { name = "func_80107B78", vram = 0x80107B78, size = 0x5AC },
     { name = "func_800B10C0", vram = 0x800B10C0, size = 0x70 },
     { name = "SubS_DrawTransformFlexLimb", vram = 0x8013A860, size = 0x2A0 },
-    { name = "AudioPlayback_NotePoolFill", vram = 0x80196040, size = 0x13C },
+    { name = "AudioList_FillNotePool", vram = 0x80196040, size = 0x13C },
     { name = "func_8010B22C", vram = 0x8010B22C, size = 0x58 },
     { name = "func_8010534C", vram = 0x8010534C, size = 0x150 },
     { name = "SurfaceType_GetFloorEffect", vram = 0x800C9C74, size = 0x28 },
@@ -2664,7 +2664,7 @@ functions = [
     { name = "SubS_OfferTalkExchangeFacing", vram = 0x8013E8F8, size = 0x58 },
     { name = "PreRender_SaveZBuffer", vram = 0x8017057C, size = 0x38 },
     { name = "func_800F8970", vram = 0x800F8970, size = 0x12C },
-    { name = "AudioPlayback_InitNoteList", vram = 0x80195DDC, size = 0x10 },
+    { name = "AudioList_InitNoteList", vram = 0x80195DDC, size = 0x10 },
     { name = "EffectSsIcePiece_Spawn", vram = 0x800B28C8, size = 0x68 },
     { name = "Collider_DestroyJntSph", vram = 0x800E0C18, size = 0x90 },
     { name = "Actor_PlaySfx_FlaggedCentered3", vram = 0x800B8FE8, size = 0x28 },
@@ -2789,7 +2789,7 @@ functions = [
     { name = "Actor_TrackNone", vram = 0x800E8F08, size = 0x9C },
     { name = "Message_StartTextbox", vram = 0x801518B0, size = 0x88 },
     { name = "GameAlloc_Free", vram = 0x80173C7C, size = 0x4C },
-    { name = "D_80186028", vram = 0x80186028, size = 0xA48 },
+    { name = "sNonKanjiIndices", vram = 0x80186028, size = 0xA48 },
     { name = "func_8010A85C", vram = 0x8010A85C, size = 0x48 },
     { name = "Camera_GetInputDir", vram = 0x800DFC1C, size = 0x24 },
     { name = "CollisionCheck_RedBlood", vram = 0x800E2F30, size = 0x24 },
@@ -3033,7 +3033,7 @@ functions = [
     { name = "OLib_Vec3fDistOutDiff", vram = 0x8010C274, size = 0x5C },
     { name = "TitleCard_Update", vram = 0x800B5E68, size = 0xBC },
     { name = "Matrix_RotateZF", vram = 0x80180E90, size = 0x1AC },
-    { name = "Sched_SwapFramebuffer", vram = 0x80176280, size = 0x94 },
+    { name = "Sched_SwapFramebufferImpl", vram = 0x80176280, size = 0x94 },
     { name = "DynaPolyActor_UnsetAllInteractFlags", vram = 0x800CAE7C, size = 0xC },
     { name = "GameState_Noop", vram = 0x80173534, size = 0xC },
     { name = "Collider_ResetOCInfo", vram = 0x800E0944, size = 0x18 },
@@ -3172,7 +3172,7 @@ functions = [
     { name = "Sched_FaultClient", vram = 0x80177084, size = 0xD8 },
     { name = "Play_GetCameraUID", vram = 0x80169BC4, size = 0x34 },
     { name = "CollisionCheck_BlueBlood", vram = 0x800E2C1C, size = 0x16C },
-    { name = "AudioPlayback_FindNodeWithPrioLessThan", vram = 0x801961E8, size = 0x80 },
+    { name = "AudioList_FindNodeWithPrioLessThan", vram = 0x801961E8, size = 0x80 },
     { name = "func_8017D1AC", vram = 0x8017D1AC, size = 0x74 },
     { name = "Math3D_Parallel", vram = 0x80179E88, size = 0x24 },
     { name = "func_800BD9E0", vram = 0x800BD9E0, size = 0xC0 },
@@ -3302,7 +3302,7 @@ functions = [
     { name = "KaleidoScopeCall_LoadPlayer", vram = 0x801639A0, size = 0x4C },
     { name = "GameState_IsRunning", vram = 0x80173B18, size = 0xC },
     { name = "Actor_OffsetOfPointInActorCoords", vram = 0x800B6E6C, size = 0xA0 },
-    { name = "Sched_HandleEntry", vram = 0x80176B34, size = 0xF0 },
+    { name = "Sched_HandleNotify", vram = 0x80176B34, size = 0xF0 },
     { name = "EffectSsKirakira_SpawnSmall", vram = 0x800B16B8, size = 0x3C },
     { name = "AudioSfx_RestoreBgmVolume", vram = 0x801A5C8C, size = 0x70 },
     { name = "Actor_DrawLensOverlay", vram = 0x800B9E84, size = 0x70 },
@@ -3541,7 +3541,7 @@ functions = [
     { name = "Collider_UpdateSpheresElement", vram = 0x800E8160, size = 0xDC },
     { name = "Map_IsInDungeonArea", vram = 0x8010A164, size = 0x30 },
     { name = "Audio_PlaySfx_AtPosWithSyncedFreqAndVolume", vram = 0x8019F780, size = 0x58 },
-    { name = "VisZbuf_Draw", vram = 0x80142100, size = 0x338 },
+    { name = "VisZBuf_Draw", vram = 0x80142100, size = 0x338 },
     { name = "func_8010ADD4", vram = 0x8010ADD4, size = 0x74 },
     { name = "func_8010BF24", vram = 0x8010BF24, size = 0x34 },
     { name = "Sram_OpenSave", vram = 0x80144E78, size = 0x5F4 },
@@ -3685,7 +3685,7 @@ functions = [
     { name = "GameAlloc_Cleanup", vram = 0x80173CC8, size = 0x50 },
     { name = "Camera_Normal2", vram = 0x800D0874, size = 0x20 },
     { name = "SurfaceType_GetSceneExitIndex", vram = 0x800C99AC, size = 0x28 },
-    { name = "Sched_TaskCheckFramebuffers", vram = 0x80176748, size = 0x70 },
+    { name = "Sched_TaskFramebuffersValid", vram = 0x80176748, size = 0x70 },
     { name = "EffectSsGSpk_SpawnNoAccel", vram = 0x800B1BDC, size = 0x94 },
     { name = "SubS_IsObjectLoaded", vram = 0x8013D8DC, size = 0x48 },
     { name = "AudioHeap_AllocSampleCache", vram = 0x8018D658, size = 0x70 },
@@ -3779,7 +3779,7 @@ functions = [
     { name = "CutsceneCmd_ModifySequence", vram = 0x800EADB0, size = 0x11C },
     { name = "SpeedMeter_DrawAllocEntry", vram = 0x80177AC8, size = 0x390 },
     { name = "Skybox_Init", vram = 0x801434E4, size = 0xBC },
-    { name = "Sched_NotifyDone", vram = 0x8017691C, size = 0x6C },
+    { name = "Sched_TaskComplete", vram = 0x8017691C, size = 0x6C },
     { name = "BgCheck_SetContextFlags", vram = 0x800C3C00, size = 0x14 },
     { name = "CutsceneCamera_Interp_Scale", vram = 0x80161E4C, size = 0x280 },
     { name = "Actor_TrackPlayer", vram = 0x800E9250, size = 0x10C },
@@ -3835,7 +3835,7 @@ functions = [
     { name = "func_801242B4", vram = 0x801242B4, size = 0x28 },
     { name = "EffectSsDtBubble_SpawnCustomColor", vram = 0x800B210C, size = 0x90 },
     { name = "func_801234D4", vram = 0x801234D4, size = 0xBC },
-    { name = "AudioScript_AudioListPopBack", vram = 0x80197E48, size = 0x40 },
+    { name = "AudioList_PopBack", vram = 0x80197E48, size = 0x40 },
     { name = "DynaPolyActor_SetActorOnTop", vram = 0x800CAE88, size = 0x14 },
     { name = "Collider_SetSphere", vram = 0x800E21F4, size = 0x68 },
     { name = "Quake_CallbackType6", vram = 0x8012A3B4, size = 0x84 },
@@ -3886,7 +3886,7 @@ functions = [
     { name = "Cutscene_InitContext", vram = 0x800EA060, size = 0x74 },
     { name = "func_8010565C", vram = 0x8010565C, size = 0x1BC },
     { name = "Message_DisplayOcarinaStaff", vram = 0x80152434, size = 0x30 },
-    { name = "VisZbuf_Init", vram = 0x801420C0, size = 0x34 },
+    { name = "VisZBuf_Init", vram = 0x801420C0, size = 0x34 },
     { name = "SysFlashrom_WriteDataSync", vram = 0x80185F64, size = 0x28 },
     { name = "Cutscene_StopManual", vram = 0x800EA0EC, size = 0x24 },
     { name = "AudioScript_InitSequencePlayerChannels", vram = 0x8019AC10, size = 0xDC },
@@ -3894,7 +3894,7 @@ functions = [
     { name = "EnHy_UpdateCollider", vram = 0x800F10AC, size = 0x80 },
     { name = "Sched_SendAudioCancelMsg", vram = 0x8017703C, size = 0x24 },
     { name = "CollisionCheck_RedBloodUnused", vram = 0x800E2F54, size = 0x24 },
-    { name = "Sched_HandleStop", vram = 0x80176370, size = 0x24 },
+    { name = "Sched_HandleNMI", vram = 0x80176370, size = 0x24 },
     { name = "JpegUtils_ParseHuffmanCodesLengths", vram = 0x801A9B78, size = 0x84 },
     { name = "LifeMeter_Init", vram = 0x801005C0, size = 0xDC },
     { name = "AudioSynth_LoadResampledReverbSamples", vram = 0x80188698, size = 0x1A4 },
@@ -3943,10 +3943,10 @@ functions = [
     { name = "AudioHeap_ResetLoadStatus", vram = 0x8018B250, size = 0xC8 },
     { name = "Lib_MemSet", vram = 0x800FECC0, size = 0x84 },
     { name = "Snap_CheckFlag", vram = 0x8013A4C4, size = 0x40 },
-    { name = "Sched_SendEntryMsg", vram = 0x80177018, size = 0x24 },
+    { name = "Sched_SendNotifyMsg", vram = 0x80177018, size = 0x24 },
     { name = "AudioSynth_Noop12", vram = 0x801880B4, size = 0x8 },
     { name = "SkelCurve_Init", vram = 0x800F2650, size = 0x70 },
-    { name = "AudioPlayback_InitNoteFreeList", vram = 0x80195E3C, size = 0xA4 },
+    { name = "AudioList_InitNoteFreeList", vram = 0x80195E3C, size = 0xA4 },
     { name = "Inventory_IncrementSkullTokenCount", vram = 0x8012F1BC, size = 0x70 },
     { name = "SkinMatrix_MtxFToMtx", vram = 0x80139A00, size = 0x218 },
     { name = "AudioHeap_ReleaseNotesForFont", vram = 0x8018B3FC, size = 0x78 },
@@ -4014,7 +4014,7 @@ functions = [
     { name = "AudioLoad_InitSlowLoads", vram = 0x80190F50, size = 0x14 },
     { name = "CutsceneManager_GetAdditionalCsId", vram = 0x800F20B8, size = 0x40 },
     { name = "func_800CC260", vram = 0x800CC260, size = 0x228 },
-    { name = "VisZbuf_Destroy", vram = 0x801420F4, size = 0xC },
+    { name = "VisZBuf_Destroy", vram = 0x801420F4, size = 0xC },
     { name = "Play_ClearCamera", vram = 0x80169600, size = 0x68 },
     { name = "Camera_CalcAtForFriendlyLockOn", vram = 0x800CDE6C, size = 0x44C },
     { name = "Gfx_SetupDL52_Xlu", vram = 0x8012C0F8, size = 0x28 },
@@ -4092,7 +4092,7 @@ functions = [
     { name = "DynaPoly_AllocVtxList", vram = 0x800C5F44, size = 0x48 },
     { name = "Collider_SetTrisVertices", vram = 0x800E7ECC, size = 0xC0 },
     { name = "Audio_PlaySfx_2", vram = 0x8019F128, size = 0x48 },
-    { name = "Graph_DlistAlloc", vram = 0x80174A64, size = 0x34 },
+    { name = "Gfx_Alloc", vram = 0x80174A64, size = 0x34 },
     { name = "Interface_SetOrthoView", vram = 0x801170B8, size = 0x48 },
     { name = "Gfx_DrawTexRectI8", vram = 0x8010D7D0, size = 0x224 },
     { name = "AudioSfx_ComputeCombFilter", vram = 0x8019EA40, size = 0xEC },
@@ -23789,7 +23789,7 @@ functions = [
     { name = "func_8094FE10", vram = 0x8094FE10, size = 0xF4 },
     { name = "EnGm_OverrideLimbDraw", vram = 0x809513AC, size = 0x110 },
     { name = "EnGm_Destroy", vram = 0x80951224, size = 0x40 },
-    { name = "func_8094DEE0", vram = 0x8094DEE0, size = 0xB0 },
+    { name = "EnGm_FindActor", vram = 0x8094DEE0, size = 0xB0 },
     { name = "func_8094EFC4", vram = 0x8094EFC4, size = 0xB0 },
     { name = "func_8094EDBC", vram = 0x8094EDBC, size = 0xC8 },
     { name = "func_8094FAC4", vram = 0x8094FAC4, size = 0x200 },
@@ -24778,19 +24778,19 @@ relocs = [
 
 functions = [
     { name = "func_809613B0", vram = 0x809613B0, size = 0x14 },
-    { name = "func_8096104C", vram = 0x8096104C, size = 0x170 },
-    { name = "func_8096147C", vram = 0x8096147C, size = 0x14 },
-    { name = "func_80960F0C", vram = 0x80960F0C, size = 0x10C },
-    { name = "func_80960E0C", vram = 0x80960E0C, size = 0x100 },
-    { name = "func_809611BC", vram = 0x809611BC, size = 0x100 },
-    { name = "func_809613E8", vram = 0x809613E8, size = 0x14 },
+    { name = "ObjMure2_SpawnChildren", vram = 0x8096104C, size = 0x170 },
+    { name = "ObjMure2_SetupWaitForPlayerOutOfRange", vram = 0x8096147C, size = 0x14 },
+    { name = "ObjMure2_GetRocksSpawnPos", vram = 0x80960F0C, size = 0x10C },
+    { name = "ObjMure2_GetBushScatteredPos", vram = 0x80960E0C, size = 0x100 },
+    { name = "ObjMure2_KillChildren", vram = 0x809611BC, size = 0x100 },
+    { name = "ObjMure2_SetupWaitForPlayerInRange", vram = 0x809613E8, size = 0x14 },
     { name = "ObjMure2_Init", vram = 0x80961350, size = 0x60 },
-    { name = "func_809612BC", vram = 0x809612BC, size = 0x94 },
-    { name = "func_809613FC", vram = 0x809613FC, size = 0x80 },
+    { name = "ObjMure2_ClearChildrenList", vram = 0x809612BC, size = 0x94 },
+    { name = "ObjMure2_WaitForPlayerInRange", vram = 0x809613FC, size = 0x80 },
     { name = "func_809613C4", vram = 0x809613C4, size = 0x24 },
-    { name = "func_80961490", vram = 0x80961490, size = 0x90 },
-    { name = "func_80961018", vram = 0x80961018, size = 0x34 },
-    { name = "func_80960CF0", vram = 0x80960CF0, size = 0x11C },
+    { name = "ObjMure2_WaitForPlayerOutOfRange", vram = 0x80961490, size = 0x90 },
+    { name = "ObjMure2_GetChildParams", vram = 0x80961018, size = 0x34 },
+    { name = "ObjMure2_GetBushCircleSpawnPos", vram = 0x80960CF0, size = 0x11C },
     { name = "ObjMure2_Update", vram = 0x80961520, size = 0x50 },
 ]
 
@@ -42472,53 +42472,53 @@ relocs = [
 ]
 
 functions = [
-    { name = "func_80A8146C", vram = 0x80A8146C, size = 0xD8 },
-    { name = "func_80A81640", vram = 0x80A81640, size = 0xC },
-    { name = "func_80A8131C", vram = 0x80A8131C, size = 0x68 },
-    { name = "func_80A83214", vram = 0x80A83214, size = 0x44 },
-    { name = "func_80A828A8", vram = 0x80A828A8, size = 0x380 },
-    { name = "func_80A832BC", vram = 0x80A832BC, size = 0x14 },
-    { name = "func_80A83E7C", vram = 0x80A83E7C, size = 0x24 },
-    { name = "func_80A83B14", vram = 0x80A83B14, size = 0x14 },
-    { name = "func_80A81FFC", vram = 0x80A81FFC, size = 0x8AC },
-    { name = "func_80A8164C", vram = 0x80A8164C, size = 0x38 },
-    { name = "func_80A811D0", vram = 0x80A811D0, size = 0x3C },
-    { name = "func_80A82FA8", vram = 0x80A82FA8, size = 0x20 },
-    { name = "func_80A81A00", vram = 0x80A81A00, size = 0xA4 },
-    { name = "func_80A82FC8", vram = 0x80A82FC8, size = 0x24C },
-    { name = "func_80A83D00", vram = 0x80A83D00, size = 0x8C },
-    { name = "func_80A81B14", vram = 0x80A81B14, size = 0x68 },
-    { name = "func_80A83A88", vram = 0x80A83A88, size = 0x8C },
-    { name = "func_80A82C28", vram = 0x80A82C28, size = 0x34 },
+    { name = "ObjMine_Air_CheckAC", vram = 0x80A8146C, size = 0xD8 },
+    { name = "ObjMine_AirWater_Noop", vram = 0x80A81640, size = 0xC },
+    { name = "ObjMine_Path_SpawnBomb", vram = 0x80A8131C, size = 0x68 },
+    { name = "ObjMine_SetupExplode", vram = 0x80A83214, size = 0x44 },
+    { name = "ObjMine_Water_UpdateLinks", vram = 0x80A828A8, size = 0x380 },
+    { name = "ObjMine_Air_SetupChained", vram = 0x80A832BC, size = 0x14 },
+    { name = "ObjMine_AirWater_Update", vram = 0x80A83E7C, size = 0x24 },
+    { name = "ObjMine_Water_SetupChained", vram = 0x80A83B14, size = 0x14 },
+    { name = "ObjMine_Water_ApplyForces", vram = 0x80A81FFC, size = 0x8AC },
+    { name = "ObjMine_ReplaceTranslation", vram = 0x80A8164C, size = 0x38 },
+    { name = "ObjMine_Path_MoveToWaypoint", vram = 0x80A811D0, size = 0x3C },
+    { name = "ObjMine_Path_SetupMove", vram = 0x80A82FA8, size = 0x20 },
+    { name = "ObjMine_Air_SetBasis", vram = 0x80A81A00, size = 0xA4 },
+    { name = "ObjMine_Path_Move", vram = 0x80A82FC8, size = 0x24C },
+    { name = "ObjMine_Water_Stationary", vram = 0x80A83D00, size = 0x8C },
+    { name = "ObjMine_Air_SetChainXZ", vram = 0x80A81B14, size = 0x68 },
+    { name = "ObjMine_Air_Stationary", vram = 0x80A83A88, size = 0x8C },
+    { name = "ObjMine_Water_UpdateChain", vram = 0x80A82C28, size = 0x34 },
     { name = "ObjMine_Destroy", vram = 0x80A82F58, size = 0x2C },
-    { name = "func_80A81E7C", vram = 0x80A81E7C, size = 0x180 },
-    { name = "func_80A8140C", vram = 0x80A8140C, size = 0x60 },
-    { name = "func_80A84088", vram = 0x80A84088, size = 0x2B0 },
-    { name = "func_80A81B7C", vram = 0x80A81B7C, size = 0x1F4 },
-    { name = "func_80A81D70", vram = 0x80A81D70, size = 0x7C },
-    { name = "func_80A832D0", vram = 0x80A832D0, size = 0x7A4 },
-    { name = "func_80A81714", vram = 0x80A81714, size = 0x104 },
-    { name = "func_80A81AA4", vram = 0x80A81AA4, size = 0x70 },
-    { name = "func_80A8120C", vram = 0x80A8120C, size = 0x7C },
-    { name = "func_80A81818", vram = 0x80A81818, size = 0x50 },
-    { name = "func_80A81684", vram = 0x80A81684, size = 0x90 },
-    { name = "func_80A81868", vram = 0x80A81868, size = 0x13C },
-    { name = "func_80A81DEC", vram = 0x80A81DEC, size = 0x90 },
+    { name = "ObjMine_Water_WallCheck", vram = 0x80A81E7C, size = 0x180 },
+    { name = "ObjMine_AirWater_CheckOC", vram = 0x80A8140C, size = 0x60 },
+    { name = "ObjMine_Air_Draw", vram = 0x80A84088, size = 0x2B0 },
+    { name = "ObjMine_Water_InitChain", vram = 0x80A81B7C, size = 0x1F4 },
+    { name = "ObjMine_Water_InitCollider", vram = 0x80A81D70, size = 0x7C },
+    { name = "ObjMine_Air_Chained", vram = 0x80A832D0, size = 0x7A4 },
+    { name = "ObjMine_StepUntilParallel", vram = 0x80A81714, size = 0x104 },
+    { name = "ObjMine_Air_SetWorld", vram = 0x80A81AA4, size = 0x70 },
+    { name = "ObjMine_GetUnitVec3f", vram = 0x80A8120C, size = 0x7C },
+    { name = "ObjMine_UpdateCollider", vram = 0x80A81818, size = 0x50 },
+    { name = "ObjMine_SetRotation", vram = 0x80A81684, size = 0x90 },
+    { name = "ObjMine_Air_InitChain", vram = 0x80A81868, size = 0x13C },
+    { name = "ObjMine_Water_SetWorld", vram = 0x80A81DEC, size = 0x90 },
     { name = "ObjMine_Init", vram = 0x80A82C5C, size = 0x2FC },
-    { name = "func_80A81544", vram = 0x80A81544, size = 0xFC },
-    { name = "ObjMine_Update", vram = 0x80A83D8C, size = 0xF0 },
-    { name = "func_80A83FBC", vram = 0x80A83FBC, size = 0xCC },
-    { name = "ObjMine_Draw", vram = 0x80A83EA0, size = 0x11C },
-    { name = "func_80A82F84", vram = 0x80A82F84, size = 0x14 },
-    { name = "func_80A81288", vram = 0x80A81288, size = 0x94 },
-    { name = "func_80A83CEC", vram = 0x80A83CEC, size = 0x14 },
-    { name = "func_80A84338", vram = 0x80A84338, size = 0x218 },
-    { name = "func_80A83A74", vram = 0x80A83A74, size = 0x14 },
-    { name = "func_80A82F98", vram = 0x80A82F98, size = 0x10 },
-    { name = "func_80A81384", vram = 0x80A81384, size = 0x88 },
-    { name = "func_80A819A4", vram = 0x80A819A4, size = 0x5C },
-    { name = "func_80A83B28", vram = 0x80A83B28, size = 0x1C4 },
-    { name = "func_80A83258", vram = 0x80A83258, size = 0x64 },
+    { name = "ObjMine_Water_CheckAC", vram = 0x80A81544, size = 0xFC },
+    { name = "ObjMine_Path_Update", vram = 0x80A83D8C, size = 0xF0 },
+    { name = "ObjMine_DrawExplosion", vram = 0x80A83FBC, size = 0xCC },
+    { name = "ObjMine_Path_Draw", vram = 0x80A83EA0, size = 0x11C },
+    { name = "ObjMine_Path_SetupStationary", vram = 0x80A82F84, size = 0x14 },
+    { name = "ObjMine_GetUnitVec3fNorm", vram = 0x80A81288, size = 0x94 },
+    { name = "ObjMine_Water_SetupStationary", vram = 0x80A83CEC, size = 0x14 },
+    { name = "ObjMine_Water_Draw", vram = 0x80A84338, size = 0x218 },
+    { name = "ObjMine_Air_SetupStationary", vram = 0x80A83A74, size = 0x14 },
+    { name = "ObjMine_Path_Stationary", vram = 0x80A82F98, size = 0x10 },
+    { name = "ObjMine_AirWater_SpawnBomb", vram = 0x80A81384, size = 0x88 },
+    { name = "ObjMine_Air_InitCollider", vram = 0x80A819A4, size = 0x5C },
+    { name = "ObjMine_Water_Chained", vram = 0x80A83B28, size = 0x1C4 },
+    { name = "ObjMine_Explode", vram = 0x80A83258, size = 0x64 },
 ]
 
 # Autogenerated from an ELF via N64Recomp
@@ -48598,13 +48598,13 @@ functions = [
     { name = "func_80AE68F0", vram = 0x80AE68F0, size = 0xF8 },
     { name = "func_80AE626C", vram = 0x80AE626C, size = 0x13C },
     { name = "EnShn_PostLimbDraw", vram = 0x80AE6D40, size = 0x50 },
-    { name = "func_80AE615C", vram = 0x80AE615C, size = 0x64 },
+    { name = "EnShn_ChangeAnim", vram = 0x80AE615C, size = 0x64 },
     { name = "EnShn_Init", vram = 0x80AE6B30, size = 0x11C },
     { name = "EnShn_TransformLimbDraw", vram = 0x80AE6D90, size = 0xFC },
     { name = "EnShn_OverrideLimbDraw", vram = 0x80AE6CF0, size = 0x50 },
     { name = "func_80AE63A8", vram = 0x80AE63A8, size = 0xE0 },
     { name = "func_80AE69E8", vram = 0x80AE69E8, size = 0x7C },
-    { name = "func_80AE6130", vram = 0x80AE6130, size = 0x2C },
+    { name = "EnShn_UpdateSkelAnime", vram = 0x80AE6130, size = 0x2C },
 ]
 
 # Autogenerated from an ELF via N64Recomp
@@ -48927,7 +48927,7 @@ functions = [
     { name = "EnLiftNuts_RunGame", vram = 0x80AEB294, size = 0x14C },
     { name = "EnLiftNuts_StartGameImmediately", vram = 0x80AEB230, size = 0x50 },
     { name = "EnLiftNuts_GetNumDaysWon", vram = 0x80AE9B8C, size = 0x40 },
-    { name = "EnLiftNuts_HandleConversation5", vram = 0x80AEA910, size = 0x2E0 },
+    { name = "EnLiftNuts_HandleConversationEvent", vram = 0x80AEA910, size = 0x2E0 },
     { name = "EnLiftNuts_RiseUp", vram = 0x80AEA128, size = 0x78 },
     { name = "EnLiftNuts_SetupMovePlayerToActor", vram = 0x80AEAF8C, size = 0x14 },
     { name = "EnLiftNuts_UpdateCollision", vram = 0x80AEBB30, size = 0x44 },
@@ -49946,7 +49946,7 @@ functions = [
     { name = "func_80AF8040", vram = 0x80AF8040, size = 0xB4 },
     { name = "func_80AF9008", vram = 0x80AF9008, size = 0x1E0 },
     { name = "func_80AFA4D0", vram = 0x80AFA4D0, size = 0x12C },
-    { name = "func_80AF7CB0", vram = 0x80AF7CB0, size = 0xB0 },
+    { name = "EnPm_FindActor", vram = 0x80AF7CB0, size = 0xB0 },
     { name = "func_80AF8D84", vram = 0x80AF8D84, size = 0x50 },
     { name = "func_80AF992C", vram = 0x80AF992C, size = 0xE0 },
     { name = "func_80AF91E8", vram = 0x80AF91E8, size = 0x2C4 },
@@ -50963,85 +50963,85 @@ relocs = [
 ]
 
 functions = [
-    { name = "func_80B09EDC", vram = 0x80B09EDC, size = 0xA0 },
-    { name = "func_80B0D750", vram = 0x80B0D750, size = 0x27C },
-    { name = "func_80B0E548", vram = 0x80B0E548, size = 0x5C },
-    { name = "func_80B0D9CC", vram = 0x80B0D9CC, size = 0x5DC },
-    { name = "func_80B06C08", vram = 0x80B06C08, size = 0x130 },
-    { name = "func_80B0B660", vram = 0x80B0B660, size = 0x480 },
-    { name = "func_80B0E5A4", vram = 0x80B0E5A4, size = 0x13C },
-    { name = "func_80B0A8C4", vram = 0x80B0A8C4, size = 0x36C },
-    { name = "func_80B07700", vram = 0x80B07700, size = 0x21C },
-    { name = "func_80B0C7B0", vram = 0x80B0C7B0, size = 0x340 },
-    { name = "func_80B0573C", vram = 0x80B0573C, size = 0x68 },
-    { name = "func_80B0AC30", vram = 0x80B0AC30, size = 0x1CC },
-    { name = "func_80B09E20", vram = 0x80B09E20, size = 0x64 },
-    { name = "func_80B07BFC", vram = 0x80B07BFC, size = 0x1A8 },
-    { name = "func_80B0C000", vram = 0x80B0C000, size = 0x1BC },
-    { name = "func_80B0863C", vram = 0x80B0863C, size = 0x20C },
-    { name = "func_80B07DA4", vram = 0x80B07DA4, size = 0x148 },
-    { name = "func_80B05D4C", vram = 0x80B05D4C, size = 0x194 },
-    { name = "func_80B0A2A4", vram = 0x80B0A2A4, size = 0x348 },
-    { name = "func_80B09E84", vram = 0x80B09E84, size = 0x58 },
-    { name = "func_80B09840", vram = 0x80B09840, size = 0x7C },
-    { name = "func_80B0A87C", vram = 0x80B0A87C, size = 0x48 },
-    { name = "func_80B0ADFC", vram = 0x80B0ADFC, size = 0x43C },
-    { name = "func_80B05B04", vram = 0x80B05B04, size = 0x1B8 },
-    { name = "func_80B058C0", vram = 0x80B058C0, size = 0x1A4 },
-    { name = "func_80B093C0", vram = 0x80B093C0, size = 0x120 },
-    { name = "func_80B057A4", vram = 0x80B057A4, size = 0x11C },
-    { name = "func_80B09A94", vram = 0x80B09A94, size = 0x1E4 },
-    { name = "func_80B05EE0", vram = 0x80B05EE0, size = 0x19C },
-    { name = "func_80B08550", vram = 0x80B08550, size = 0xEC },
-    { name = "func_80B0DFA8", vram = 0x80B0DFA8, size = 0x5A0 },
-    { name = "func_80B0813C", vram = 0x80B0813C, size = 0x120 },
-    { name = "func_80B0825C", vram = 0x80B0825C, size = 0x50 },
-    { name = "func_80B082AC", vram = 0x80B082AC, size = 0x2A4 },
-    { name = "func_80B094E0", vram = 0x80B094E0, size = 0x360 },
-    { name = "func_80B0C570", vram = 0x80B0C570, size = 0x240 },
-    { name = "func_80B09F7C", vram = 0x80B09F7C, size = 0x328 },
-    { name = "func_80B07450", vram = 0x80B07450, size = 0x2B0 },
-    { name = "func_80B0D69C", vram = 0x80B0D69C, size = 0xB4 },
-    { name = "func_80B07B88", vram = 0x80B07B88, size = 0x74 },
-    { name = "func_80B0607C", vram = 0x80B0607C, size = 0x4DC },
+    { name = "BossHakugin_CutsceneStart", vram = 0x80B09EDC, size = 0xA0 },
+    { name = "BossHakugin_DrawShadowTex", vram = 0x80B0D750, size = 0x27C },
+    { name = "BossHakugin_UpdateStationaryCrushingRocks", vram = 0x80B0E548, size = 0x5C },
+    { name = "BossHakugin_SpawnCrushingRocks", vram = 0x80B0D9CC, size = 0x5DC },
+    { name = "BossHakugin_SpawnStalactite", vram = 0x80B06C08, size = 0x130 },
+    { name = "BossHakugin_UpdateElectricBalls", vram = 0x80B0B660, size = 0x480 },
+    { name = "BossHakugin_DrawCrushingRocks", vram = 0x80B0E5A4, size = 0x13C },
+    { name = "BossHakugin_DeathCutsceneCrushedByRocks", vram = 0x80B0A8C4, size = 0x36C },
+    { name = "BossHakugin_SpawnSteam", vram = 0x80B07700, size = 0x21C },
+    { name = "BossHakugin_DrawChargingLightning", vram = 0x80B0C7B0, size = 0x340 },
+    { name = "BossHakugin_Vec3fNormalize", vram = 0x80B0573C, size = 0x68 },
+    { name = "BossHakugin_CheckForBodyColliderHit", vram = 0x80B0AC30, size = 0x1CC },
+    { name = "BossHakugin_ShootLightning", vram = 0x80B09E20, size = 0x64 },
+    { name = "BossHakugin_UpdateDrawDmgEffect", vram = 0x80B07BFC, size = 0x1A8 },
+    { name = "BossHakugin_OverrideLimbDraw", vram = 0x80B0C000, size = 0x1BC },
+    { name = "BossHakugin_IntroCutsceneWakeUp", vram = 0x80B0863C, size = 0x20C },
+    { name = "BossHakugin_UpdateSubCam", vram = 0x80B07DA4, size = 0x148 },
+    { name = "BossHakugin_UpdateLight", vram = 0x80B05D4C, size = 0x194 },
+    { name = "BossHakugin_DeathCutsceneRun", vram = 0x80B0A2A4, size = 0x348 },
+    { name = "BossHakugin_SetupCutsceneStart", vram = 0x80B09E84, size = 0x58 },
+    { name = "BossHakugin_SetupThrow", vram = 0x80B09840, size = 0x7C },
+    { name = "BossHakugin_SetupDeathCutsceneCrushedByRocks", vram = 0x80B0A87C, size = 0x48 },
+    { name = "BossHakugin_UpdateDamage", vram = 0x80B0ADFC, size = 0x43C },
+    { name = "BossHakugin_SpawnIceSparkle", vram = 0x80B05B04, size = 0x1B8 },
+    { name = "BossHakugin_SpawnLargeStalactiteWalls", vram = 0x80B058C0, size = 0x1A4 },
+    { name = "BossHakugin_SetupDowned", vram = 0x80B093C0, size = 0x120 },
+    { name = "BossHakugin_StepVector", vram = 0x80B057A4, size = 0x11C },
+    { name = "BossHakugin_SetupWait", vram = 0x80B09A94, size = 0x1E4 },
+    { name = "BossHakugin_SpawnBlueWarpAndHeartContainer", vram = 0x80B05EE0, size = 0x19C },
+    { name = "BossHakugin_SetupIntroCutsceneWakeUp", vram = 0x80B08550, size = 0xEC },
+    { name = "BossHakugin_UpdateCrushingRocksCollision", vram = 0x80B0DFA8, size = 0x5A0 },
+    { name = "BossHakugin_FrozenBeforeFight", vram = 0x80B0813C, size = 0x120 },
+    { name = "BossHakugin_SetupIntroCutsceneThaw", vram = 0x80B0825C, size = 0x50 },
+    { name = "BossHakugin_IntroCutsceneThaw", vram = 0x80B082AC, size = 0x2A4 },
+    { name = "BossHakugin_Downed", vram = 0x80B094E0, size = 0x360 },
+    { name = "BossHakugin_DrawMalfunctionEffects", vram = 0x80B0C570, size = 0x240 },
+    { name = "BossHakugin_SetupDeathCutsceneRun", vram = 0x80B09F7C, size = 0x328 },
+    { name = "BossHakugin_RunUpdateCommon", vram = 0x80B07450, size = 0x2B0 },
+    { name = "BossHakugin_GenShadowTex", vram = 0x80B0D69C, size = 0xB4 },
+    { name = "BossHakugin_Thaw", vram = 0x80B07B88, size = 0x74 },
+    { name = "BossHakugin_UpdateBaseRot", vram = 0x80B0607C, size = 0x4DC },
     { name = "BossHakugin_Update", vram = 0x80B0BAE0, size = 0x520 },
-    { name = "func_80B06D38", vram = 0x80B06D38, size = 0x210 },
-    { name = "func_80B05A64", vram = 0x80B05A64, size = 0xA0 },
-    { name = "func_80B0C398", vram = 0x80B0C398, size = 0x1D8 },
-    { name = "func_80B0791C", vram = 0x80B0791C, size = 0x26C },
-    { name = "func_80B0728C", vram = 0x80B0728C, size = 0x1C4 },
-    { name = "func_80B0B548", vram = 0x80B0B548, size = 0x118 },
-    { name = "func_80B06F48", vram = 0x80B06F48, size = 0x344 },
-    { name = "func_80B09DFC", vram = 0x80B09DFC, size = 0x24 },
-    { name = "func_80B0CCD8", vram = 0x80B0CCD8, size = 0x24C },
-    { name = "func_80B0A5EC", vram = 0x80B0A5EC, size = 0x4C },
-    { name = "func_80B05CBC", vram = 0x80B05CBC, size = 0x90 },
-    { name = "func_80B09178", vram = 0x80B09178, size = 0x60 },
-    { name = "func_80B0CAF0", vram = 0x80B0CAF0, size = 0x1E8 },
+    { name = "BossHakugin_SpawnBomb", vram = 0x80B06D38, size = 0x210 },
+    { name = "BossHakugin_RequestQuakeAndRumble", vram = 0x80B05A64, size = 0xA0 },
+    { name = "BossHakugin_DrawRockEffects", vram = 0x80B0C398, size = 0x1D8 },
+    { name = "BossHakugin_ShouldWait", vram = 0x80B0791C, size = 0x26C },
+    { name = "BossHakugin_ChargeUpAttack", vram = 0x80B0728C, size = 0x1C4 },
+    { name = "BossHakugin_UpdateLightningSegments", vram = 0x80B0B548, size = 0x118 },
+    { name = "BossHakugin_AddMalfunctionEffects", vram = 0x80B06F48, size = 0x344 },
+    { name = "BossHakugin_SetupShootLightning", vram = 0x80B09DFC, size = 0x24 },
+    { name = "BossHakugin_DrawElectricBalls", vram = 0x80B0CCD8, size = 0x24C },
+    { name = "BossHakugin_SetupDeathCutsceneSwerveIntoWall", vram = 0x80B0A5EC, size = 0x4C },
+    { name = "BossHakugin_ApplyGoronSpikeBoost", vram = 0x80B05CBC, size = 0x90 },
+    { name = "BossHakugin_SetupCharge", vram = 0x80B09178, size = 0x60 },
+    { name = "BossHakugin_DrawLightningSegments", vram = 0x80B0CAF0, size = 0x1E8 },
     { name = "BossHakugin_Init", vram = 0x80B05290, size = 0x400 },
-    { name = "func_80B08124", vram = 0x80B08124, size = 0x18 },
-    { name = "func_80B0D2B8", vram = 0x80B0D2B8, size = 0x3E4 },
-    { name = "func_80B08CB8", vram = 0x80B08CB8, size = 0x4C0 },
-    { name = "func_80B0B3F4", vram = 0x80B0B3F4, size = 0x154 },
-    { name = "func_80B091D8", vram = 0x80B091D8, size = 0x1E8 },
-    { name = "func_80B08018", vram = 0x80B08018, size = 0x10C },
-    { name = "func_80B0CF24", vram = 0x80B0CF24, size = 0x1B0 },
+    { name = "BossHakugin_SetupFrozenBeforeFight", vram = 0x80B08124, size = 0x18 },
+    { name = "BossHakugin_FillShadowTex", vram = 0x80B0D2B8, size = 0x3E4 },
+    { name = "BossHakugin_Run", vram = 0x80B08CB8, size = 0x4C0 },
+    { name = "BossHakugin_UpdateMalfunctionEffects", vram = 0x80B0B3F4, size = 0x154 },
+    { name = "BossHakugin_Charge", vram = 0x80B091D8, size = 0x1E8 },
+    { name = "BossHakugin_EntranceCutscene", vram = 0x80B08018, size = 0x10C },
+    { name = "BossHakugin_DrawIce", vram = 0x80B0CF24, size = 0x1B0 },
     { name = "BossHakugin_Destroy", vram = 0x80B05690, size = 0xAC },
-    { name = "func_80B08C1C", vram = 0x80B08C1C, size = 0x9C },
-    { name = "func_80B0696C", vram = 0x80B0696C, size = 0x1B4 },
-    { name = "func_80B098BC", vram = 0x80B098BC, size = 0x1D8 },
+    { name = "BossHakugin_SetupRun", vram = 0x80B08C1C, size = 0x9C },
+    { name = "BossHakugin_SpawnGravel", vram = 0x80B0696C, size = 0x1B4 },
+    { name = "BossHakugin_Throw", vram = 0x80B098BC, size = 0x1D8 },
     { name = "BossHakugin_Draw", vram = 0x80B0D0D4, size = 0x1E4 },
-    { name = "func_80B06B20", vram = 0x80B06B20, size = 0xE8 },
-    { name = "func_80B08848", vram = 0x80B08848, size = 0x118 },
-    { name = "func_80B06558", vram = 0x80B06558, size = 0xA8 },
-    { name = "func_80B0A638", vram = 0x80B0A638, size = 0x244 },
-    { name = "func_80B08960", vram = 0x80B08960, size = 0x2BC },
-    { name = "func_80B06600", vram = 0x80B06600, size = 0x36C },
-    { name = "func_80B0B238", vram = 0x80B0B238, size = 0x114 },
-    { name = "func_80B0C1BC", vram = 0x80B0C1BC, size = 0x1DC },
-    { name = "func_80B0B34C", vram = 0x80B0B34C, size = 0xA8 },
-    { name = "func_80B07EEC", vram = 0x80B07EEC, size = 0x12C },
-    { name = "func_80B09C78", vram = 0x80B09C78, size = 0x184 },
+    { name = "BossHakugin_SpawnBoulder", vram = 0x80B06B20, size = 0xE8 },
+    { name = "BossHakugin_SetupIntroCutsceneRun", vram = 0x80B08848, size = 0x118 },
+    { name = "BossHakugin_SetLightningSegmentColliderVertices", vram = 0x80B06558, size = 0xA8 },
+    { name = "BossHakugin_DeathCutsceneSwerveIntoWall", vram = 0x80B0A638, size = 0x244 },
+    { name = "BossHakugin_IntroCutsceneRun", vram = 0x80B08960, size = 0x2BC },
+    { name = "BossHakugin_AddLightningSegments", vram = 0x80B06600, size = 0x36C },
+    { name = "BossHakugin_UpdateRockEffects", vram = 0x80B0B238, size = 0x114 },
+    { name = "BossHakugin_PostLimbDraw", vram = 0x80B0C1BC, size = 0x1DC },
+    { name = "BossHakugin_UpdateFallingCrushingRocks", vram = 0x80B0B34C, size = 0xA8 },
+    { name = "BossHakugin_SetupEntranceCutscene", vram = 0x80B07EEC, size = 0x12C },
+    { name = "BossHakugin_Wait", vram = 0x80B09C78, size = 0x184 },
 ]
 
 # Autogenerated from an ELF via N64Recomp
@@ -52237,23 +52237,23 @@ relocs = [
 ]
 
 functions = [
-    { name = "func_80B22500", vram = 0x80B22500, size = 0x1AC },
-    { name = "func_80B22750", vram = 0x80B22750, size = 0x3C },
+    { name = "EnHakurock_Stalactite_StuckInGround", vram = 0x80B22500, size = 0x1AC },
+    { name = "EnHakurock_LargeStalactite_Wait", vram = 0x80B22750, size = 0x3C },
     { name = "EnHakurock_Update", vram = 0x80B2278C, size = 0x168 },
     { name = "EnHakurock_Destroy", vram = 0x80B21BB4, size = 0x2C },
-    { name = "func_80B226AC", vram = 0x80B226AC, size = 0xA4 },
-    { name = "func_80B2242C", vram = 0x80B2242C, size = 0x94 },
-    { name = "func_80B21EA4", vram = 0x80B21EA4, size = 0x158 },
-    { name = "func_80B21BE0", vram = 0x80B21BE0, size = 0x2C4 },
-    { name = "func_80B22040", vram = 0x80B22040, size = 0x68 },
+    { name = "EnHakurock_LargeStalactite_SetupWait", vram = 0x80B226AC, size = 0xA4 },
+    { name = "EnHakurock_Stalactite_Fall", vram = 0x80B2242C, size = 0x94 },
+    { name = "EnHakurock_SpawnEffect", vram = 0x80B21EA4, size = 0x158 },
+    { name = "EnHakurock_AddRockEffect", vram = 0x80B21BE0, size = 0x2C4 },
+    { name = "EnHakurock_WaitForSignal", vram = 0x80B22040, size = 0x68 },
     { name = "EnHakurock_Init", vram = 0x80B21B00, size = 0xB4 },
-    { name = "func_80B220A8", vram = 0x80B220A8, size = 0x140 },
-    { name = "func_80B21FFC", vram = 0x80B21FFC, size = 0x44 },
-    { name = "EnHakurock_Draw", vram = 0x80B229A4, size = 0xBC },
-    { name = "func_80B228F4", vram = 0x80B228F4, size = 0xB0 },
-    { name = "func_80B222AC", vram = 0x80B222AC, size = 0x180 },
-    { name = "func_80B221E8", vram = 0x80B221E8, size = 0xC4 },
-    { name = "func_80B224C0", vram = 0x80B224C0, size = 0x40 },
+    { name = "EnHakurock_Boulder_SetupMove", vram = 0x80B220A8, size = 0x140 },
+    { name = "EnHakurock_SetupWaitForSignal", vram = 0x80B21FFC, size = 0x44 },
+    { name = "EnHakurock_DrawStalactite", vram = 0x80B229A4, size = 0xBC },
+    { name = "EnHakurock_DrawBoulder", vram = 0x80B228F4, size = 0xB0 },
+    { name = "EnHakurock_Stalactite_SetupFall", vram = 0x80B222AC, size = 0x180 },
+    { name = "EnHakurock_Boulder_Move", vram = 0x80B221E8, size = 0xC4 },
+    { name = "EnHakurock_Stalactite_SetupStuckInGround", vram = 0x80B224C0, size = 0x40 },
 ]
 
 # Autogenerated from an ELF via N64Recomp
@@ -63391,7 +63391,7 @@ functions = [
     { name = "func_80BD2BA4", vram = 0x80BD2BA4, size = 0x44 },
     { name = "func_80BD35BC", vram = 0x80BD35BC, size = 0x9C },
     { name = "func_80BD3484", vram = 0x80BD3484, size = 0xC4 },
-    { name = "func_80BD2A30", vram = 0x80BD2A30, size = 0xB0 },
+    { name = "EnAh_FindActor", vram = 0x80BD2A30, size = 0xB0 },
     { name = "func_80BD3768", vram = 0x80BD3768, size = 0xEC },
     { name = "func_80BD2FD0", vram = 0x80BD2FD0, size = 0xF0 },
     { name = "func_80BD3118", vram = 0x80BD3118, size = 0x80 },
@@ -64359,7 +64359,7 @@ functions = [
     { name = "func_80BDF244", vram = 0x80BDF244, size = 0xC4 },
     { name = "EnAl_PostLimbDraw", vram = 0x80BDF950, size = 0xE4 },
     { name = "func_80BDF390", vram = 0x80BDF390, size = 0x84 },
-    { name = "func_80BDE1A0", vram = 0x80BDE1A0, size = 0xB0 },
+    { name = "EnAl_FindActor", vram = 0x80BDE1A0, size = 0xB0 },
     { name = "EnAl_Update", vram = 0x80BDF86C, size = 0xA8 },
     { name = "func_80BDE484", vram = 0x80BDE484, size = 0x5C },
     { name = "func_80BDF6C4", vram = 0x80BDF6C4, size = 0x98 },
@@ -64432,7 +64432,7 @@ relocs = [
 
 functions = [
     { name = "func_80BE0D60", vram = 0x80BE0D60, size = 0xA4 },
-    { name = "func_80BE04E0", vram = 0x80BE04E0, size = 0xB0 },
+    { name = "EnTab_FindActor", vram = 0x80BE04E0, size = 0xB0 },
     { name = "func_80BE127C", vram = 0x80BE127C, size = 0xCC },
     { name = "EnTab_Destroy", vram = 0x80BE1524, size = 0x2C },
     { name = "func_80BE0778", vram = 0x80BE0778, size = 0x28 },
@@ -65048,26 +65048,26 @@ relocs = [
 
 functions = [
     { name = "EnDt_Init", vram = 0x80BE9B20, size = 0x128 },
-    { name = "func_80BEABF8", vram = 0x80BEABF8, size = 0x8C },
-    { name = "func_80BEADD4", vram = 0x80BEADD4, size = 0xC0 },
-    { name = "func_80BE9D9C", vram = 0x80BE9D9C, size = 0x5C },
-    { name = "func_80BEA254", vram = 0x80BEA254, size = 0x140 },
-    { name = "func_80BEA394", vram = 0x80BEA394, size = 0x55C },
-    { name = "func_80BEA8F0", vram = 0x80BEA8F0, size = 0x208 },
-    { name = "func_80BEAB44", vram = 0x80BEAB44, size = 0xB4 },
-    { name = "func_80BE9DF8", vram = 0x80BE9DF8, size = 0x9C },
+    { name = "EnDt_TriggerMeetingNotebookEvent", vram = 0x80BEABF8, size = 0x8C },
+    { name = "EnDt_TriggerFinalNightTalkEvent", vram = 0x80BEADD4, size = 0xC0 },
+    { name = "EnDt_UpdateAppearance", vram = 0x80BE9D9C, size = 0x5C },
+    { name = "EnDt_SetupMeetingCutscene", vram = 0x80BEA254, size = 0x140 },
+    { name = "EnDt_UpdateMeetingCutscene", vram = 0x80BEA394, size = 0x55C },
+    { name = "EnDt_FinishMeetingCutscene", vram = 0x80BEA8F0, size = 0x208 },
+    { name = "EnDt_TriggerMeetingRewardEvent", vram = 0x80BEAB44, size = 0xB4 },
+    { name = "EnDt_UpdateCutsceneFocusTarget", vram = 0x80BE9DF8, size = 0x9C },
     { name = "EnDt_Destroy", vram = 0x80BE9C48, size = 0x2C },
-    { name = "func_80BEB06C", vram = 0x80BEB06C, size = 0x3C },
-    { name = "func_80BE9CE8", vram = 0x80BE9CE8, size = 0xB4 },
+    { name = "EnDt_OverrideLimbDraw", vram = 0x80BEB06C, size = 0x3C },
+    { name = "EnDt_ChangeAnim", vram = 0x80BE9CE8, size = 0xB4 },
     { name = "EnDt_Update", vram = 0x80BEAE94, size = 0x1D8 },
-    { name = "func_80BEA088", vram = 0x80BEA088, size = 0x1CC },
-    { name = "func_80BE9EF8", vram = 0x80BE9EF8, size = 0x190 },
-    { name = "func_80BE9C74", vram = 0x80BE9C74, size = 0x74 },
-    { name = "func_80BEADB8", vram = 0x80BEADB8, size = 0x1C },
-    { name = "func_80BE9E94", vram = 0x80BE9E94, size = 0x64 },
-    { name = "func_80BEAC84", vram = 0x80BEAC84, size = 0xA8 },
-    { name = "func_80BEAD2C", vram = 0x80BEAD2C, size = 0x8C },
-    { name = "func_80BEAAF8", vram = 0x80BEAAF8, size = 0x4C },
+    { name = "EnDt_OfferRegularTalk", vram = 0x80BEA088, size = 0x1CC },
+    { name = "EnDt_SetupRegularState", vram = 0x80BE9EF8, size = 0x190 },
+    { name = "EnDt_UpdateHeadRotate", vram = 0x80BE9C74, size = 0x74 },
+    { name = "EnDt_StartFinalNightTalk", vram = 0x80BEADB8, size = 0x1C },
+    { name = "EnDt_SetupCutsceneNpcs", vram = 0x80BE9E94, size = 0x64 },
+    { name = "EnDt_SetupFinalNightState", vram = 0x80BEAC84, size = 0xA8 },
+    { name = "EnDt_OfferFinalNightTalk", vram = 0x80BEAD2C, size = 0x8C },
+    { name = "EnDt_OfferMeetingReward", vram = 0x80BEAAF8, size = 0x4C },
     { name = "EnDt_Draw", vram = 0x80BEB0A8, size = 0x108 },
 ]
 
@@ -65585,7 +65585,7 @@ functions = [
     { name = "func_80BF1AE0", vram = 0x80BF1AE0, size = 0x60 },
     { name = "func_80BF1744", vram = 0x80BF1744, size = 0x78 },
     { name = "func_80BF13E4", vram = 0x80BF13E4, size = 0x88 },
-    { name = "func_80BF1150", vram = 0x80BF1150, size = 0xB0 },
+    { name = "EnIg_FindActor", vram = 0x80BF1150, size = 0xB0 },
     { name = "func_80BF146C", vram = 0x80BF146C, size = 0x44 },
     { name = "EnIg_UpdateSkelAnime", vram = 0x80BF1258, size = 0x2C },
     { name = "EnIg_Update", vram = 0x80BF2E04, size = 0xD8 },
@@ -66965,23 +66965,23 @@ relocs = [
 ]
 
 functions = [
-    { name = "func_80C09418", vram = 0x80C09418, size = 0x90 },
+    { name = "EnKitan_GetQuestionMessageId", vram = 0x80C09418, size = 0x90 },
     { name = "EnKitan_Update", vram = 0x80C09BC8, size = 0xAC },
-    { name = "func_80C095C8", vram = 0x80C095C8, size = 0x80 },
-    { name = "func_80C09708", vram = 0x80C09708, size = 0x288 },
-    { name = "func_80C09C90", vram = 0x80C09C90, size = 0x40 },
-    { name = "func_80C09AA4", vram = 0x80C09AA4, size = 0xAC },
-    { name = "func_80C09648", vram = 0x80C09648, size = 0xC0 },
-    { name = "func_80C09990", vram = 0x80C09990, size = 0x114 },
-    { name = "func_80C09518", vram = 0x80C09518, size = 0xB0 },
-    { name = "func_80C09CD0", vram = 0x80C09CD0, size = 0x60 },
-    { name = "func_80C09390", vram = 0x80C09390, size = 0x88 },
-    { name = "func_80C09C74", vram = 0x80C09C74, size = 0x1C },
+    { name = "EnKitan_WaitForPrizeTextboxClosed", vram = 0x80C095C8, size = 0x80 },
+    { name = "EnKitan_Talk", vram = 0x80C09708, size = 0x288 },
+    { name = "EnKitan_PostLimbDraw", vram = 0x80C09C90, size = 0x40 },
+    { name = "EnKitan_Appear", vram = 0x80C09AA4, size = 0xAC },
+    { name = "EnKitan_OfferPrize", vram = 0x80C09648, size = 0xC0 },
+    { name = "EnKitan_WaitForPlayer", vram = 0x80C09990, size = 0x114 },
+    { name = "EnKitan_TalkAfterGivingPrize", vram = 0x80C09518, size = 0xB0 },
+    { name = "EnKitan_Draw", vram = 0x80C09CD0, size = 0x60 },
+    { name = "EnKitan_CanTalk", vram = 0x80C09390, size = 0x88 },
+    { name = "EnKitan_OverrideLimbDraw", vram = 0x80C09C74, size = 0x1C },
     { name = "EnKitan_Init", vram = 0x80C090D0, size = 0x140 },
-    { name = "func_80C0923C", vram = 0x80C0923C, size = 0x154 },
-    { name = "func_80C09B50", vram = 0x80C09B50, size = 0x78 },
+    { name = "EnKitan_SpawnEffects", vram = 0x80C0923C, size = 0x154 },
+    { name = "EnKitan_WaitToAppear", vram = 0x80C09B50, size = 0x78 },
     { name = "EnKitan_Destroy", vram = 0x80C09210, size = 0x2C },
-    { name = "func_80C094A8", vram = 0x80C094A8, size = 0x70 },
+    { name = "EnKitan_Leave", vram = 0x80C094A8, size = 0x70 },
 ]
 
 # Autogenerated from an ELF via N64Recomp
@@ -68238,7 +68238,7 @@ functions = [
     { name = "DmAh_HandleCutscene", vram = 0x80C1D7FC, size = 0x130 },
     { name = "DmAh_PostLimbDraw", vram = 0x80C1DAD4, size = 0x50 },
     { name = "DmAh_ChangeAnim", vram = 0x80C1D410, size = 0x48 },
-    { name = "func_80C1D78C", vram = 0x80C1D78C, size = 0x70 },
+    { name = "DmAh_FindAnjuActor", vram = 0x80C1D78C, size = 0x70 },
 ]
 
 # Autogenerated from an ELF via N64Recomp
@@ -68639,7 +68639,7 @@ relocs = [
 
 functions = [
     { name = "func_80C229AC", vram = 0x80C229AC, size = 0x40 },
-    { name = "func_80C22350", vram = 0x80C22350, size = 0xB0 },
+    { name = "DmTag_FindActor", vram = 0x80C22350, size = 0xB0 },
     { name = "DmTag_Destroy", vram = 0x80C22B30, size = 0x10 },
     { name = "DmTag_DoNothing", vram = 0x80C229EC, size = 0x10 },
     { name = "func_80C229FC", vram = 0x80C229FC, size = 0x44 },
diff --git a/us.rev1.toml b/us.rev1.toml
index f3bc8b0..eff0e77 100644
--- a/us.rev1.toml
+++ b/us.rev1.toml
@@ -19,7 +19,9 @@ stubs = [
 
 ignored = [
     # Not actually a function
-    "D_80186028"
+    "sNonKanjiIndices",
+    # Was originally named _MakeMotorData
+    "__osMakeMotorData"
 ]
 
 # Single-instruction patches