diff --git a/src/camera.c b/src/camera.c
new file mode 100644
index 0000000000..2d002466b5
--- /dev/null
+++ b/src/camera.c
@@ -0,0 +1,34 @@
+#include "common.h"
+
+s32 gCurrentCameraID = 0;
+
+s32 func_800328A4(Camera* camera, f32 arg1, f32 arg2);
+void create_camera_leadplayer_matrix(Camera* camera);
+
+INCLUDE_ASM(s32, "camera", test_ray_zone);
+
+INCLUDE_ASM(s32, "camera", func_800322DC);
+
+INCLUDE_ASM(s32, "camera", func_800325E4);
+
+INCLUDE_ASM(s32, "camera", func_800328A4, Camera* camera, f32 arg1, f32 arg2);
+
+INCLUDE_ASM(s32, "camera", func_80032970, Camera* camera, f32 arg1);
+
+INCLUDE_ASM(s32, "camera", func_80032C64);
+
+void create_camera_leadplayer_matrix(Camera *camera) {
+    f32 xTemp = camera->lookAt_eye.x - camera->lookAt_obj.x;
+    f32 yTemp = camera->lookAt_eye.y - camera->lookAt_obj.y;
+    f32 zTemp = camera->lookAt_eye.z - camera->lookAt_obj.z;
+    f32 dist = sqrtf(SQ(xTemp) + SQ(yTemp) + SQ(zTemp));
+    f32 theta = ((camera->vfov * 0.5f) / 180.0f) * PI;
+    f32 distSinTheta = dist * sin_rad(theta);
+
+    func_80032970(camera, (((distSinTheta / cos_rad(theta)) * camera->viewportW) / camera->viewportH) * camera->unk_520);
+    func_80032C64(camera);
+    guTranslateF(camera->viewMtxLeading, -camera->leadAmount, 0.0f, 0.0f);
+}
+
+void func_800334E8(void) {
+}
diff --git a/src/7340_len_b00.c b/src/crash.c
similarity index 69%
rename from src/7340_len_b00.c
rename to src/crash.c
index 5dc579308a..74d9a7dff7 100644
--- a/src/7340_len_b00.c
+++ b/src/crash.c
@@ -1,5 +1,12 @@
 #include "common.h"
 
+extern struct {
+    /* 0x000 */ char unk_000[0x9CC];
+    /* 0x9CC */ s32 unk_9CC;
+    /* 0x9D0 */ s16 unk_9D0;
+    /* 0x9D2 */ s16 unk_9D2;
+} D_8009BB30; // size unknown
+
 s32 D_80077210[] = {
     0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFF29FFFF,
     0xFF2BFFFF, 0x2526FF2A, 0xFF272CFF, 0x00010203, 0x04050607, 0x080924FF, 0xFFFFFF28, 0xFF0A0B0C, 0x0D0E0F10,
@@ -48,28 +55,32 @@ char* D_800773D8[6] = {
     "Inexact operation",
 };
 
-INCLUDE_ASM(s32, "7340_len_b00", crash_delay_msec);
+INCLUDE_ASM(s32, "crash", crash_delay_msec);
 
-INCLUDE_ASM(s32, "7340_len_b00", func_8002BFB0);
+INCLUDE_ASM(s32, "crash", func_8002BFB0);
 
-INCLUDE_ASM(s32, "7340_len_b00", func_8002C054);
+INCLUDE_ASM(s32, "crash", func_8002C054);
 
-INCLUDE_ASM(s32, "7340_len_b00", func_8002C1D4);
+INCLUDE_ASM(s32, "crash", func_8002C1D4);
 
-INCLUDE_ASM(s32, "7340_len_b00", crash_printf_string);
+INCLUDE_ASM(s32, "crash", crash_printf_string);
 
-INCLUDE_ASM(s32, "7340_len_b00", crash_print_fpr);
+INCLUDE_ASM(s32, "crash", crash_print_fpr);
 
-INCLUDE_ASM(s32, "7340_len_b00", func_8002C324);
+INCLUDE_ASM(s32, "crash", func_8002C324);
 
-INCLUDE_ASM(s32, "7340_len_b00", crash_show_handler);
+INCLUDE_ASM(s32, "crash", crash_show_handler);
 
-INCLUDE_ASM(s32, "7340_len_b00", func_8002C7B0);
+INCLUDE_ASM(s32, "crash", func_8002C7B0);
 
-INCLUDE_ASM(s32, "7340_len_b00", crash_monitor_thread);
+INCLUDE_ASM(s32, "crash", crash_monitor_thread);
 
-INCLUDE_ASM(s32, "7340_len_b00", func_8002C890);
+void func_8002C890(s32 arg0, s16 arg1, s16 arg2) {
+    D_8009BB30.unk_9CC = arg0 | 0xA0000000;
+    D_8009BB30.unk_9D0 = arg1;
+    D_8009BB30.unk_9D2 = arg2;
+}
 
-INCLUDE_ASM(s32, "7340_len_b00", crash_create_monitor);
+INCLUDE_ASM(s32, "crash", crash_create_monitor);
 
-INCLUDE_ASM(s32, "7340_len_b00", func_8002C94C);
+INCLUDE_ASM(s32, "crash", func_8002C94C);
diff --git a/src/6e40_len_500.c b/src/curtains.c
similarity index 99%
rename from src/6e40_len_500.c
rename to src/curtains.c
index 79604a8b59..333790be2d 100644
--- a/src/6e40_len_500.c
+++ b/src/curtains.c
@@ -89,7 +89,6 @@ void render_curtains(void) {
         gSPDisplayList(gMasterGfxPos++, &D_80076078);
         gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
         gDPPipeSync(gMasterGfxPos++);
-
     }
 
     if (gCurtainDrawCallback != NULL) {
diff --git a/src/f270_len_1190.c b/src/f270_len_1190.c
index 923556312c..a6222b1415 100644
--- a/src/f270_len_1190.c
+++ b/src/f270_len_1190.c
@@ -34,258 +34,6 @@ NUPiOverlaySegment D_8007795C = {
     .bssEnd = 0x80278640
 };
 
-void appendGfx_intro_logos();
-
-// bss?
-extern s8* D_800A0910;
-
-void state_init_logos(void) {
-    s8* romStart;
-    s8* romEnd;
-    s32* logoRam;
-    s32* temp_800A0910;
-
-    general_heap_create();
-    gGameStatusPtr->loadMenuState = 0;
-    gGameStatusPtr->menuCounter = 0;
-    gGameStatusPtr->bSkipIntro = FALSE;
-    intro_logos_set_fade_alpha(255);
-    intro_logos_set_fade_color(0);
-
-    romEnd = logos_ROM_END;
-    romStart = logos_ROM_START;
-    logoRam = heap_malloc(romEnd - romStart);
-
-    temp_800A0910 = &D_800A0910;
-    D_800A0910 = logoRam;
-
-    dma_copy(romStart, romEnd, logoRam);
-
-    // TODO probably this is not ideal
-    D_800A0918 = D_800A0910 + 0x0;
-    D_800A0914 = D_800A0910 + 0x7000;
-    D_800A091C = D_800A0910 + 0x15000;
-
-    nuContRmbForceStop();
-    create_cameras_a();
-    gCameras[0].mode = 6;
-    gCameras[0].unk_06 = 1;
-    gCameras[0].nearClip = 0x10;
-    gCameras[0].farClip = 0x1000;
-    gCurrentCameraID = 0;
-    gCameras[0].vfov = 25.0f;
-    gCameras[0].flags |= 0x2;
-    gCameras[1].flags |= 0x2;
-    gCameras[2].flags |= 0x2;
-    gCameras[3].flags |= 0x2;
-    set_cam_viewport(0, 12, 28, 296, 184);
-    gCameras[0].unk_1E = 0x28;
-    gCameras[0].backgroundColor[0] = 0;
-    gCameras[0].backgroundColor[1] = 0;
-    gCameras[0].backgroundColor[2] = 0;
-    gCameras[0].unk_54 = 25.0f;
-    gCameras[0].unk_58 = 25.0f;
-    gCameras[0].unk_1C = 0;
-    gCameras[0].unk_20 = 100;
-    gCameras[0].unk_22 = 0;
-    gCameras[0].lookAt_eye.x = 500.0f;
-    gCameras[0].lookAt_eye.y = 1000.0f;
-    gCameras[0].lookAt_eye.z = 1500.0f;
-    gCameras[0].unk_5C = 150.0f;
-    clear_script_list();
-    clear_generic_entity_list();
-    clear_render_tasks();
-    spr_init_sprites(0);
-    clear_animator_list();
-    clear_entity_models();
-    clear_npcs();
-    clear_hud_element_cache();
-    reset_background_settings();
-    clear_entity_data(1);
-    clear_effect_data();
-    gOverrideFlags |= 0x2;
-    intro_logos_update_fade();
-    gGameStatusPtr->enableBackground = FALSE;
-}
-
-void state_step_logos(void) {
-    if (gGameStatusPtr->bSkipIntro) {
-        if (intro_logos_fade_out(0xA) != 0) {
-            set_curtain_scale(1.0f);
-            set_curtain_fade(0.0f);
-            set_game_mode(2);
-        }
-    } else {
-        switch (gGameStatusPtr->loadMenuState) {
-            case 1:
-                if (gGameStatusPtr->menuCounter == 0) {
-                    intro_logos_set_fade_color(208);
-                    gGameStatusPtr->loadMenuState++;
-                }
-                gGameStatusPtr->menuCounter--;
-                break;
-            case 2:
-                if (intro_logos_fade_out(0xA) != 0) {
-                    gGameStatusPtr->loadMenuState++;
-                }
-                break;
-            case 3:
-                if (intro_logos_fade_in(0xA) != 0) {
-                    gGameStatusPtr->loadMenuState++;
-                    gGameStatusPtr->menuCounter = 40;
-                }
-                break;
-            case 4:
-                if (gGameStatusPtr->menuCounter == 0) {
-                    gGameStatusPtr->loadMenuState++;
-                    intro_logos_set_fade_color(208);
-                }
-                gGameStatusPtr->menuCounter--;
-                break;
-            case 5:
-                if (intro_logos_fade_out(0xA) != 0) {
-                    gGameStatusPtr->loadMenuState++;
-                }
-                break;
-            case 0:
-            case 6:
-                if (intro_logos_fade_in(0xA) != 0) {
-                    gGameStatusPtr->loadMenuState++;
-                    gGameStatusPtr->menuCounter = 30;
-                }
-                break;
-            case 7:
-                if (gGameStatusPtr->menuCounter == 0) {
-                    gGameStatusPtr->loadMenuState++;
-                    intro_logos_set_fade_color(208);
-                    gGameStatusPtr->menuCounter = 30;
-                }
-                gGameStatusPtr->menuCounter--;
-                break;
-            case 8:
-                if (gGameStatusPtr->menuCounter == 0) {
-                    gGameStatusPtr->loadMenuState++;
-                    set_curtain_scale_goal(1.0f);
-                    set_curtain_draw_callback(NULL);
-                    set_curtain_fade_goal(0.3f);
-                } else {
-                    gGameStatusPtr->menuCounter--;
-                }
-                break;
-            case 9:
-                if (intro_logos_fade_out(0xA) != 0) {
-                    gGameStatusPtr->menuCounter = 15;
-                    gGameStatusPtr->loadMenuState++;
-                }
-                break;
-            case 10:
-                if (gGameStatusPtr->menuCounter == 0) {
-                    gGameStatusPtr->loadMenuState++;
-                } else {
-                    gGameStatusPtr->menuCounter--;
-                }
-                break;
-            case 11:
-                heap_free(D_800A0910);
-                D_800A0910 = 0;
-
-                intro_logos_set_fade_alpha(255);
-                gGameStatusPtr->creditsViewportMode = 0;
-                set_game_mode(16);
-                break;
-        }
-    }
-    update_npcs();
-    update_cameras();
-    intro_logos_update_fade();
-}
-
-void state_drawUI_logos(void) {
-    appendGfx_intro_logos();
-}
-
-// all sorts of issues, but I think it's mostly with D_800A0918, 1C, and 14. Those need better types so they can have
-// proper array accesses. the display list macros should mostly be good
-#ifdef NON_MATCHING
-void appendGfx_intro_logos(void) {
-    s32 i;
-
-    gDPPipeSync(gMasterGfxPos++);
-    gDPSetRenderMode(gMasterGfxPos++, G_RM_NOOP, G_RM_NOOP2);
-    gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGB, G_CC_DECALRGB);
-    gDPSetCycleType(gMasterGfxPos++, G_CYC_FILL);
-    gDPSetFillColor(gMasterGfxPos++, 0xE739E739);
-    gDPFillRectangle(gMasterGfxPos++, 0, 0, 319, 239);
-    gDPPipeSync(gMasterGfxPos++);
-
-    switch (gGameStatusPtr->loadMenuState) {
-        case 0:
-        case 1:
-        case 2:
-            gSPDisplayList(gMasterGfxPos++, D_80077908);
-
-            for (i = 0; i < 7; i++) {
-                gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 128, D_800A0918 + (i << 0xC));
-                gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
-                           G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
-                gDPLoadSync(gMasterGfxPos++);
-                gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, 0, 0, 508, 60);
-                gDPPipeSync(gMasterGfxPos++);
-                gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 0x0000, G_TX_RENDERTILE, 0,
-                           G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
-                           G_TX_NOLOD);
-                gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0, 0, 508, 60);
-                gSPTextureRectangle(gMasterGfxPos++, 384, 256 + i * 64, 896, 320 + i * 64, G_TX_RENDERTILE, 0, 0, 1024, 1024);
-                gDPPipeSync(gMasterGfxPos++);
-            }
-            break;
-        case 3:
-        case 4:
-        case 5:
-            gSPDisplayList(gMasterGfxPos++, D_80077908);
-
-            for (i = 0; i < 6; i++) {
-                gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 256, D_800A091C + (i << 0xC));
-                gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
-                           G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
-                gDPLoadSync(gMasterGfxPos++);
-                gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, 0, 0, 1020, 28);
-                gDPPipeSync(gMasterGfxPos++);
-                gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 0x0000, G_TX_RENDERTILE, 0,
-                           G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
-                           G_TX_NOLOD);
-                gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0, 0, 1020, 28);
-                gSPTextureRectangle(gMasterGfxPos++, 128, 356 + i * 32, 1152, 388 + i * 32, G_TX_RENDERTILE, 0, 0, 1024, 1024);
-                gDPPipeSync(gMasterGfxPos++);
-            }
-            break;
-        case 6:
-        case 7:
-        case 8:
-        case 9:
-            gSPDisplayList(gMasterGfxPos++, D_80077908);
-
-            for (i = 0; i < 14; i++) {
-                gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 256, D_800A0914[i] + (i << 0xC));
-                gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
-                           G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
-                gDPLoadSync(gMasterGfxPos++);
-                gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, 0, 0, 1020, 28);
-                gDPPipeSync(gMasterGfxPos++);
-                gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 0x0000, G_TX_RENDERTILE, 0,
-                           G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
-                           G_TX_NOLOD);
-                gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0, 0, 1020, 28);
-                gSPTextureRectangle(gMasterGfxPos++, 128, 236 + i * 32, 1152, 268 + i * 32, G_TX_RENDERTILE, 0, 0, 1024, 1024);
-                gDPPipeSync(gMasterGfxPos++);
-            }
-            break;
-    }
-}
-#else
-INCLUDE_ASM(void, "f270_len_1190", appendGfx_intro_logos);
-#endif
-
 void state_init_pause(void) {
     D_800A0921 = 0;
     D_800A0922 = 0;
diff --git a/src/fio.c b/src/fio.c
index d724723299..07d34c933b 100644
--- a/src/fio.c
+++ b/src/fio.c
@@ -18,19 +18,19 @@ s32 get_spirits_rescued(void) {
     s32 storyProgress = get_variable(NULL, STORY_PROGRESS);
     s32 ret = 7;
 
-    if (storyProgress < get_variable(NULL, -0x4D)) {
+    if (storyProgress < get_variable(NULL, STORY_CH1_STAR_SPIRIT_RESCUED)) {
         ret = 0;
-    } else if (storyProgress < get_variable(NULL, -0x37)) {
+    } else if (storyProgress < get_variable(NULL, STORY_CH2_STAR_SPIRIT_RESCUED)) {
         ret = 1;
-    } else if (storyProgress < get_variable(NULL, -0xF)) {
+    } else if (storyProgress < get_variable(NULL, STORY_CH3_STAR_SPIRIT_RESCUED)) {
         ret = 2;
-    } else if (storyProgress < get_variable(NULL, 5)) {
+    } else if (storyProgress < get_variable(NULL, STORY_CH4_STAR_SPIRIT_RESCUED)) {
         ret = 3;
-    } else if (storyProgress < get_variable(NULL, 0x25)) {
+    } else if (storyProgress < get_variable(NULL, STORY_CH5_OPENED_ESCAPE_ROUTE)) {
         ret = 4;
-    } else if (storyProgress < get_variable(NULL, 0x39)) {
+    } else if (storyProgress < get_variable(NULL, STORY_CH6_STAR_SPIRIT_RESCUED)) {
         ret = 5;
-    } else if (storyProgress < get_variable(NULL, 0x57)) {
+    } else if (storyProgress < get_variable(NULL, STORY_CH7_STAR_SPIRIT_RESCUED)) {
         ret = 6;
     }
 
diff --git a/src/d610_len_1330.c b/src/game_modes.c
similarity index 79%
rename from src/d610_len_1330.c
rename to src/game_modes.c
index fe1df238c5..eec4852adb 100644
--- a/src/d610_len_1330.c
+++ b/src/game_modes.c
@@ -1,8 +1,6 @@
 #include "common.h"
 
-s32 gCurrentCameraID = 0;
-
-s32 D_80077414[] = {0, 0, 0};
+// TODO: decide whether to call these 'game modes' or 'states'
 
 s32 D_80077420[] = {
     0x000000E4, 0x000000E1, 0x000000EB, 0x000000EF, 0x000000F6, 0x0000010A, 0x0000010C, 0x00000121, 0x00000122,
@@ -78,37 +76,6 @@ StateFunc gameModeMap[] = {
 // BSS
 extern s16 D_800A08F0;
 
-s32 func_800328A4(Camera* camera, f32 arg1, f32 arg2);
-void create_camera_leadplayer_matrix(Camera* camera);
-
-INCLUDE_ASM(s32, "d610_len_1330", test_ray_zone);
-
-INCLUDE_ASM(s32, "d610_len_1330", func_800322DC);
-
-INCLUDE_ASM(s32, "d610_len_1330", func_800325E4);
-
-INCLUDE_ASM(s32, "d610_len_1330", func_800328A4, Camera* camera, f32 arg1, f32 arg2);
-
-INCLUDE_ASM(s32, "d610_len_1330", func_80032970, Camera* camera, f32 arg1);
-
-INCLUDE_ASM(s32, "d610_len_1330", func_80032C64);
-
-void create_camera_leadplayer_matrix(Camera *camera) {
-    f32 xTemp = camera->lookAt_eye.x - camera->lookAt_obj.x;
-    f32 yTemp = camera->lookAt_eye.y - camera->lookAt_obj.y;
-    f32 zTemp = camera->lookAt_eye.z - camera->lookAt_obj.z;
-    f32 dist = sqrtf(SQ(xTemp) + SQ(yTemp) + SQ(zTemp));
-    f32 theta = ((camera->vfov * 0.5f) / 180.0f) * PI;
-    f32 distSinTheta = dist * sin_rad(theta);
-
-    func_80032970(camera, (((distSinTheta / cos_rad(theta)) * camera->viewportW) / camera->viewportH) * camera->unk_520);
-    func_80032C64(camera);
-    guTranslateF(camera->viewMtxLeading, -camera->leadAmount, 0.0f, 0.0f);
-}
-
-void func_800334E8(void) {
-}
-
 void set_game_mode(s16 idx) {
     D_800A08F0 = idx;
     set_game_mode_slot(0, gameModeMap[idx]);
diff --git a/src/3bf0_len_6f0.c b/src/input.c
similarity index 91%
rename from src/3bf0_len_6f0.c
rename to src/input.c
index 6bb2e26d15..4d003ac239 100644
--- a/src/3bf0_len_6f0.c
+++ b/src/input.c
@@ -21,4 +21,4 @@ void func_80028838(void) {
     D_8009A6A6 = 0;
 }
 
-INCLUDE_ASM(s32, "3bf0_len_6f0", update_input);
+INCLUDE_ASM(s32, "input", update_input);
diff --git a/src/intro_logos.c b/src/intro_logos.c
new file mode 100644
index 0000000000..44917c36c9
--- /dev/null
+++ b/src/intro_logos.c
@@ -0,0 +1,46 @@
+#include "common.h"
+
+void intro_logos_set_fade_alpha(s16 alpha);
+void intro_logos_set_fade_color(s16 color);
+s16 intro_logos_fade_in(s16 subtractAlpha);
+s16 intro_logos_fade_out(s16 addAlpha);
+void intro_logos_update_fade(void);
+
+void intro_logos_set_fade_alpha(s16 alpha) {
+    gGameStatusPtr->bootAlpha = alpha;
+}
+
+void intro_logos_set_fade_color(s16 color) {
+    gGameStatusPtr->bootRed = color;
+    gGameStatusPtr->bootGreen = color;
+    gGameStatusPtr->bootBlue = color;
+}
+
+s16 intro_logos_fade_in(s16 subtractAlpha) {
+    if (gGameStatusPtr->bootAlpha != 0) {
+        gGameStatusPtr->bootAlpha -= subtractAlpha;
+        if (gGameStatusPtr->bootAlpha << 16 < 0) {
+            gGameStatusPtr->bootAlpha = 0;
+        }
+    } else {
+        return 1;
+    }
+    return 0;
+}
+
+s16 intro_logos_fade_out(s16 addAlpha) {
+    if (gGameStatusPtr->bootAlpha != 255) {
+        gGameStatusPtr->bootAlpha += addAlpha;
+        if (gGameStatusPtr->bootAlpha > 255) {
+            gGameStatusPtr->bootAlpha = 255;
+        }
+    } else {
+        return 1;
+    }
+    return 0;
+}
+
+void intro_logos_update_fade(void) {
+    set_screen_overlay_params_front(0, gGameStatusPtr->bootAlpha);
+    set_screen_overlay_color(0, gGameStatusPtr->bootBlue, gGameStatusPtr->bootGreen, gGameStatusPtr->bootRed);
+}
diff --git a/src/1b40_len_20b0.c b/src/main_loop.c
similarity index 97%
rename from src/1b40_len_20b0.c
rename to src/main_loop.c
index 44d332991e..5d78ca2754 100644
--- a/src/1b40_len_20b0.c
+++ b/src/main_loop.c
@@ -349,15 +349,15 @@ void gfx_init_state(void) {
     gSPDisplayList(gMasterGfxPos++, OS_K0_TO_PHYSICAL(D_80074210));
 }
 
-INCLUDE_ASM(s32, "1b40_len_20b0", func_800271FC);
+INCLUDE_ASM(s32, "main_loop", func_800271FC);
 
-INCLUDE_ASM(s32, "1b40_len_20b0", func_8002725C);
+INCLUDE_ASM(s32, "main_loop", func_8002725C);
 
-INCLUDE_ASM(s32, "1b40_len_20b0", func_80027600);
+INCLUDE_ASM(s32, "main_loop", func_80027600);
 
-INCLUDE_ASM(s32, "1b40_len_20b0", func_80027774);
+INCLUDE_ASM(s32, "main_loop", func_80027774);
 
-INCLUDE_ASM(s32, "1b40_len_20b0", func_800279B4);
+INCLUDE_ASM(s32, "main_loop", func_800279B4);
 
 void func_80027BAC(s32 arg0, s32 arg1) {
     s32 i;
@@ -389,4 +389,4 @@ void func_80027BAC(s32 arg0, s32 arg1) {
     }
 }
 
-INCLUDE_ASM(void, "1b40_len_20b0", gfx_draw_background);
+INCLUDE_ASM(void, "main_loop", gfx_draw_background);
diff --git a/src/42e0_len_1f60.c b/src/rumble.c
similarity index 100%
rename from src/42e0_len_1f60.c
rename to src/rumble.c
diff --git a/src/ebd0_len_6a0.c b/src/state_battle.c
similarity index 69%
rename from src/ebd0_len_6a0.c
rename to src/state_battle.c
index 55035bbe0a..6ac5291536 100644
--- a/src/ebd0_len_6a0.c
+++ b/src/state_battle.c
@@ -1,12 +1,4 @@
 #include "common.h"
-#include "nu/nusys.h"
-#include "ld_addrs.h"
-
-void intro_logos_set_fade_alpha(s16 alpha);
-void intro_logos_set_fade_color(s16 color);
-s16 intro_logos_fade_in(s16 subtractAlpha);
-s16 intro_logos_fade_out(s16 addAlpha);
-void intro_logos_update_fade(void);
 
 s32 D_800778A0[] = {
     &D_8038F800, &D_803B5000, &D_803DA800, 0x00000000, 0xFFFFFF00, 0xFFFFFF00, 0x00000000, 0x00000000, 0x00000000,
@@ -28,45 +20,6 @@ Gfx D_800778C8[] = {
 extern s32 D_800A0904;
 extern s32 D_800A0908;
 
-void intro_logos_set_fade_alpha(s16 alpha) {
-    gGameStatusPtr->bootAlpha = alpha;
-}
-
-void intro_logos_set_fade_color(s16 color) {
-    gGameStatusPtr->bootRed = color;
-    gGameStatusPtr->bootGreen = color;
-    gGameStatusPtr->bootBlue = color;
-}
-
-s16 intro_logos_fade_in(s16 subtractAlpha) {
-    if (gGameStatusPtr->bootAlpha != 0) {
-        gGameStatusPtr->bootAlpha -= subtractAlpha;
-        if (gGameStatusPtr->bootAlpha << 16 < 0) {
-            gGameStatusPtr->bootAlpha = 0;
-        }
-    } else {
-        return 1;
-    }
-    return 0;
-}
-
-s16 intro_logos_fade_out(s16 addAlpha) {
-    if (gGameStatusPtr->bootAlpha != 255) {
-        gGameStatusPtr->bootAlpha += addAlpha;
-        if (gGameStatusPtr->bootAlpha > 255) {
-            gGameStatusPtr->bootAlpha = 255;
-        }
-    } else {
-        return 1;
-    }
-    return 0;
-}
-
-void intro_logos_update_fade(void) {
-    set_screen_overlay_params_front(0, gGameStatusPtr->bootAlpha);
-    set_screen_overlay_color(0, gGameStatusPtr->bootBlue, gGameStatusPtr->bootGreen, gGameStatusPtr->bootRed);
-}
-
 void state_init_battle(void) {
     D_800A0900 = 5;
 }
@@ -152,7 +105,7 @@ void state_step_battle(void) {
     update_cameras();
 }
 #else
-INCLUDE_ASM(void, "ebd0_len_6a0", state_step_battle, void);
+INCLUDE_ASM(void, "state_battle", state_step_battle, void);
 #endif
 
 void state_drawUI_battle(void) {
@@ -168,7 +121,7 @@ void state_init_end_battle(void) {
     D_800A0900 = 5;
 }
 
-INCLUDE_ASM(void, "ebd0_len_6a0", state_step_end_battle, void);
+INCLUDE_ASM(void, "state_battle", state_step_end_battle, void);
 
 void state_drawUI_end_battle(void) {
 }
diff --git a/src/13480_len_3f0.c b/src/state_demo.c
similarity index 89%
rename from src/13480_len_3f0.c
rename to src/state_demo.c
index 2684c11533..760848f0e3 100644
--- a/src/13480_len_3f0.c
+++ b/src/state_demo.c
@@ -17,7 +17,7 @@ void state_init_demo(void) {
     clear_script_list();
 }
 
-INCLUDE_ASM(void, "13480_len_3f0", state_step_demo, void);
+INCLUDE_ASM(void, "state_demo", state_step_demo, void);
 
 void state_drawUI_demo(void) {
 
diff --git a/src/10400_len_d30.c b/src/state_file_select.c
similarity index 94%
rename from src/10400_len_d30.c
rename to src/state_file_select.c
index b65bfd632f..4aab23250d 100644
--- a/src/10400_len_d30.c
+++ b/src/state_file_select.c
@@ -66,7 +66,7 @@ void state_init_file_select(void) {
     gOverrideFlags |= 0x10000;
 }
 
-INCLUDE_ASM(void, "10400_len_d30", state_step_language_select, void);
+INCLUDE_ASM(void, "state_file_select", state_step_language_select, void);
 
 void state_step_file_select(void) {
     s32 temp = D_800A0931; // needed to match
@@ -132,9 +132,9 @@ void state_init_exit_file_select(void) {
     gOverrideFlags &= ~0x40;
 }
 
-INCLUDE_ASM(void, "10400_len_d30", state_step_exit_language_select, void);
+INCLUDE_ASM(void, "state_file_select", state_step_exit_language_select, void);
 
-INCLUDE_ASM(void, "10400_len_d30", state_step_exit_file_select, void);
+INCLUDE_ASM(void, "state_file_select", state_step_exit_file_select, void);
 
 void state_drawUI_exit_language_select(void) {
 }
diff --git a/src/11a50_len_7a0.c b/src/state_intro.c
similarity index 96%
rename from src/11a50_len_7a0.c
rename to src/state_intro.c
index ca9809a52b..b6d23bc831 100644
--- a/src/11a50_len_7a0.c
+++ b/src/state_intro.c
@@ -68,7 +68,7 @@ void state_init_intro(void) {
     intro_logos_update_fade();
 }
 
-INCLUDE_ASM(void, "11a50_len_7a0", state_step_intro, void);
+INCLUDE_ASM(void, "state_intro", state_step_intro, void);
 
 void state_drawUI_intro(void) {
 }
diff --git a/src/state_logos.c b/src/state_logos.c
new file mode 100644
index 0000000000..a717efef9c
--- /dev/null
+++ b/src/state_logos.c
@@ -0,0 +1,254 @@
+#include "common.h"
+#include "ld_addrs.h"
+
+void appendGfx_intro_logos();
+
+// bss?
+extern s8* D_800A0910;
+
+void state_init_logos(void) {
+    s8* romStart;
+    s8* romEnd;
+    s32* logoRam;
+    s32* temp_800A0910;
+
+    general_heap_create();
+    gGameStatusPtr->loadMenuState = 0;
+    gGameStatusPtr->menuCounter = 0;
+    gGameStatusPtr->bSkipIntro = FALSE;
+    intro_logos_set_fade_alpha(255);
+    intro_logos_set_fade_color(0);
+
+    romEnd = logos_ROM_END;
+    romStart = logos_ROM_START;
+    logoRam = heap_malloc(romEnd - romStart);
+
+    temp_800A0910 = &D_800A0910;
+    D_800A0910 = logoRam;
+
+    dma_copy(romStart, romEnd, logoRam);
+
+    // TODO probably this is not ideal
+    D_800A0918 = D_800A0910 + 0x0;
+    D_800A0914 = D_800A0910 + 0x7000;
+    D_800A091C = D_800A0910 + 0x15000;
+
+    nuContRmbForceStop();
+    create_cameras_a();
+    gCameras[0].mode = 6;
+    gCameras[0].unk_06 = 1;
+    gCameras[0].nearClip = 0x10;
+    gCameras[0].farClip = 0x1000;
+    gCurrentCameraID = 0;
+    gCameras[0].vfov = 25.0f;
+    gCameras[0].flags |= 0x2;
+    gCameras[1].flags |= 0x2;
+    gCameras[2].flags |= 0x2;
+    gCameras[3].flags |= 0x2;
+    set_cam_viewport(0, 12, 28, 296, 184);
+    gCameras[0].unk_1E = 0x28;
+    gCameras[0].backgroundColor[0] = 0;
+    gCameras[0].backgroundColor[1] = 0;
+    gCameras[0].backgroundColor[2] = 0;
+    gCameras[0].unk_54 = 25.0f;
+    gCameras[0].unk_58 = 25.0f;
+    gCameras[0].unk_1C = 0;
+    gCameras[0].unk_20 = 100;
+    gCameras[0].unk_22 = 0;
+    gCameras[0].lookAt_eye.x = 500.0f;
+    gCameras[0].lookAt_eye.y = 1000.0f;
+    gCameras[0].lookAt_eye.z = 1500.0f;
+    gCameras[0].unk_5C = 150.0f;
+    clear_script_list();
+    clear_generic_entity_list();
+    clear_render_tasks();
+    spr_init_sprites(0);
+    clear_animator_list();
+    clear_entity_models();
+    clear_npcs();
+    clear_hud_element_cache();
+    reset_background_settings();
+    clear_entity_data(1);
+    clear_effect_data();
+    gOverrideFlags |= 0x2;
+    intro_logos_update_fade();
+    gGameStatusPtr->enableBackground = FALSE;
+}
+
+void state_step_logos(void) {
+    if (gGameStatusPtr->bSkipIntro) {
+        if (intro_logos_fade_out(0xA) != 0) {
+            set_curtain_scale(1.0f);
+            set_curtain_fade(0.0f);
+            set_game_mode(2);
+        }
+    } else {
+        switch (gGameStatusPtr->loadMenuState) {
+            case 1:
+                if (gGameStatusPtr->menuCounter == 0) {
+                    intro_logos_set_fade_color(208);
+                    gGameStatusPtr->loadMenuState++;
+                }
+                gGameStatusPtr->menuCounter--;
+                break;
+            case 2:
+                if (intro_logos_fade_out(0xA) != 0) {
+                    gGameStatusPtr->loadMenuState++;
+                }
+                break;
+            case 3:
+                if (intro_logos_fade_in(0xA) != 0) {
+                    gGameStatusPtr->loadMenuState++;
+                    gGameStatusPtr->menuCounter = 40;
+                }
+                break;
+            case 4:
+                if (gGameStatusPtr->menuCounter == 0) {
+                    gGameStatusPtr->loadMenuState++;
+                    intro_logos_set_fade_color(208);
+                }
+                gGameStatusPtr->menuCounter--;
+                break;
+            case 5:
+                if (intro_logos_fade_out(0xA) != 0) {
+                    gGameStatusPtr->loadMenuState++;
+                }
+                break;
+            case 0:
+            case 6:
+                if (intro_logos_fade_in(0xA) != 0) {
+                    gGameStatusPtr->loadMenuState++;
+                    gGameStatusPtr->menuCounter = 30;
+                }
+                break;
+            case 7:
+                if (gGameStatusPtr->menuCounter == 0) {
+                    gGameStatusPtr->loadMenuState++;
+                    intro_logos_set_fade_color(208);
+                    gGameStatusPtr->menuCounter = 30;
+                }
+                gGameStatusPtr->menuCounter--;
+                break;
+            case 8:
+                if (gGameStatusPtr->menuCounter == 0) {
+                    gGameStatusPtr->loadMenuState++;
+                    set_curtain_scale_goal(1.0f);
+                    set_curtain_draw_callback(NULL);
+                    set_curtain_fade_goal(0.3f);
+                } else {
+                    gGameStatusPtr->menuCounter--;
+                }
+                break;
+            case 9:
+                if (intro_logos_fade_out(0xA) != 0) {
+                    gGameStatusPtr->menuCounter = 15;
+                    gGameStatusPtr->loadMenuState++;
+                }
+                break;
+            case 10:
+                if (gGameStatusPtr->menuCounter == 0) {
+                    gGameStatusPtr->loadMenuState++;
+                } else {
+                    gGameStatusPtr->menuCounter--;
+                }
+                break;
+            case 11:
+                heap_free(D_800A0910);
+                D_800A0910 = 0;
+
+                intro_logos_set_fade_alpha(255);
+                gGameStatusPtr->creditsViewportMode = 0;
+                set_game_mode(16);
+                break;
+        }
+    }
+    update_npcs();
+    update_cameras();
+    intro_logos_update_fade();
+}
+
+void state_drawUI_logos(void) {
+    appendGfx_intro_logos();
+}
+
+// all sorts of issues, but I think it's mostly with D_800A0918, 1C, and 14. Those need better types so they can have
+// proper array accesses. the display list macros should mostly be good
+#ifdef NON_MATCHING
+void appendGfx_intro_logos(void) {
+    s32 i;
+
+    gDPPipeSync(gMasterGfxPos++);
+    gDPSetRenderMode(gMasterGfxPos++, G_RM_NOOP, G_RM_NOOP2);
+    gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGB, G_CC_DECALRGB);
+    gDPSetCycleType(gMasterGfxPos++, G_CYC_FILL);
+    gDPSetFillColor(gMasterGfxPos++, 0xE739E739);
+    gDPFillRectangle(gMasterGfxPos++, 0, 0, 319, 239);
+    gDPPipeSync(gMasterGfxPos++);
+
+    switch (gGameStatusPtr->loadMenuState) {
+        case 0:
+        case 1:
+        case 2:
+            gSPDisplayList(gMasterGfxPos++, D_80077908);
+
+            for (i = 0; i < 7; i++) {
+                gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 128, D_800A0918 + (i << 0xC));
+                gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
+                           G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
+                gDPLoadSync(gMasterGfxPos++);
+                gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, 0, 0, 508, 60);
+                gDPPipeSync(gMasterGfxPos++);
+                gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 0x0000, G_TX_RENDERTILE, 0,
+                           G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
+                           G_TX_NOLOD);
+                gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0, 0, 508, 60);
+                gSPTextureRectangle(gMasterGfxPos++, 384, 256 + i * 64, 896, 320 + i * 64, G_TX_RENDERTILE, 0, 0, 1024, 1024);
+                gDPPipeSync(gMasterGfxPos++);
+            }
+            break;
+        case 3:
+        case 4:
+        case 5:
+            gSPDisplayList(gMasterGfxPos++, D_80077908);
+
+            for (i = 0; i < 6; i++) {
+                gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 256, D_800A091C + (i << 0xC));
+                gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
+                           G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
+                gDPLoadSync(gMasterGfxPos++);
+                gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, 0, 0, 1020, 28);
+                gDPPipeSync(gMasterGfxPos++);
+                gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 0x0000, G_TX_RENDERTILE, 0,
+                           G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
+                           G_TX_NOLOD);
+                gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0, 0, 1020, 28);
+                gSPTextureRectangle(gMasterGfxPos++, 128, 356 + i * 32, 1152, 388 + i * 32, G_TX_RENDERTILE, 0, 0, 1024, 1024);
+                gDPPipeSync(gMasterGfxPos++);
+            }
+            break;
+        case 6:
+        case 7:
+        case 8:
+        case 9:
+            gSPDisplayList(gMasterGfxPos++, D_80077908);
+
+            for (i = 0; i < 14; i++) {
+                gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 256, D_800A0914[i] + (i << 0xC));
+                gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
+                           G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
+                gDPLoadSync(gMasterGfxPos++);
+                gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, 0, 0, 1020, 28);
+                gDPPipeSync(gMasterGfxPos++);
+                gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 0x0000, G_TX_RENDERTILE, 0,
+                           G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
+                           G_TX_NOLOD);
+                gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0, 0, 1020, 28);
+                gSPTextureRectangle(gMasterGfxPos++, 128, 236 + i * 32, 1152, 268 + i * 32, G_TX_RENDERTILE, 0, 0, 1024, 1024);
+                gDPPipeSync(gMasterGfxPos++);
+            }
+            break;
+    }
+}
+#else
+INCLUDE_ASM(void, "state_logos", appendGfx_intro_logos);
+#endif
diff --git a/src/state_pause.c b/src/state_pause.c
new file mode 100644
index 0000000000..b87ccc11a6
--- /dev/null
+++ b/src/state_pause.c
@@ -0,0 +1,247 @@
+#include "common.h"
+#include "ld_addrs.h"
+#include "map.h"
+#include "nu/nusys.h"
+
+Gfx D_80077908[] = {
+    gsDPPipeSync(),
+    gsDPSetCycleType(G_CYC_1CYCLE),
+    gsDPSetTexturePersp(G_TP_NONE),
+    gsDPSetTextureLUT(G_TT_NONE),
+    gsDPSetCombineMode(G_CC_DECALRGB, G_CC_DECALRGB),
+    gsDPSetRenderMode(G_RM_OPA_SURF, G_RM_OPA_SURF2),
+    gsDPSetTextureFilter(G_TF_POINT),
+    gsSPEndDisplayList(),
+};
+
+// probably a file split
+static s32 padding[] = {0, 0};
+
+s32 D_80077950[] = { 0x8038F800, 0x803B5000, &D_803DA800 };
+
+// TODO the gPauseMenuIconScripts should be DATA_START
+// TODO the gPauseMenuHeldButtons should be BSS_START
+// TODO 80278640 is BSS_END
+NUPiOverlaySegment D_8007795C = {
+    .romStart = pause_ROM_START,
+    .romEnd = pause_ROM_END,
+    .ramStart = pause_VRAM,
+    .textStart = pause_VRAM,
+    .textEnd = gPauseMenuIconScripts,
+    .dataStart = gPauseMenuIconScripts,
+    .dataEnd = &gPauseMenuHeldButtons,
+    .bssStart = &gPauseMenuHeldButtons,
+    .bssEnd = 0x80278640
+};
+
+void state_init_pause(void) {
+    D_800A0921 = 0;
+    D_800A0922 = 0;
+    disable_player_input();
+    set_time_freeze_mode(3);
+    set_windows_visible(2);
+}
+
+void state_step_pause(void) {
+    s32 oldIsBattle = D_800A0921;
+
+    switch (D_800A0921) {
+        case 0:
+            update_encounters();
+            update_npcs();
+            update_player();
+            update_effects();
+            if (D_8009A658[1] == D_8009A64C) {
+                D_800A0920 = 4;
+                D_800A0921 = 2;
+                gOverrideFlags |= 0x8;
+                gGameStatusPtr->enableBackground &= ~0xF0;
+                gGameStatusPtr->enableBackground |= 0x10;
+
+            }
+            break;
+        case 2:
+            if (D_800A0920 >= 0) {
+                if (D_800A0920 != 0) {
+                    (D_800A0920)--;
+                }
+
+                if (D_800A0920 == 0) {
+                    D_800A0920 = -1;
+                    nuGfxSetCfb(&D_80077950, 2);
+                    gGameStatusPtr->unk_15E = gGameStatusPtr->unk_15C;
+                    sfx_stop_env_sounds();
+                    func_8003B1A8();
+                    gGameStatusPtr->isBattle = oldIsBattle;
+                    allocate_hit_tables();
+                    battle_heap_create();
+                    nuContRmbForceStop();
+                    sfx_clear_env_sounds(0);
+                    spr_init_sprites(0);
+                    clear_model_data();
+                    clear_sprite_shading_data();
+                    reset_background_settings();
+                    clear_entity_models();
+                    clear_animator_list();
+                    clear_generic_entity_list();
+                    set_hud_element_nonworld_cache(_3169F0_VRAM, 0x38000);
+                    clear_hud_element_cache();
+                    reset_status_menu();
+                    clear_item_entity_data();
+                    clear_script_list();
+                    clear_npcs();
+                    clear_entity_data(0);
+                    clear_trigger_data();
+                    D_800A0924 = func_80149828();
+                    func_801497FC(0);
+                    bgm_quiet_max_volume();
+                    nuPiReadRomOverlay(&D_8007795C);
+                    pause_init();
+                    gOverrideFlags &= ~0x8;
+                }
+
+                if (D_800A0920 >= 0) {
+                    break;
+                }
+            }
+
+            if (D_800A0920 >= -10) {
+                pause_handle_input(0, 0);
+                D_800A0920--;
+            } else {
+                pause_handle_input(gGameStatusPtr->pressedButtons, gGameStatusPtr->heldButtons);
+            }
+            D_800A0922 = 0;
+            break;
+    }
+}
+
+void state_drawUI_pause(void) {
+}
+
+void state_init_unpause(void) {
+    if (D_800A0922 > 0) {
+        D_800A0921 = 0;
+    } else {
+        D_800A0921 = 1;
+    }
+    D_800A0920 = 4;
+}
+
+void state_step_unpause(void) {
+    switch (D_800A0921) {
+        case 0:
+        case 1:
+            if (D_800A0920 == 4) {
+                gOverrideFlags |= 0x8;
+            }
+
+            if (D_800A0920 >= 0) {
+                if (D_800A0920 != 0) {
+                    D_800A0920--;
+                }
+
+                if (D_800A0920 == 0) {
+                    if (D_800A0920 == 0) {
+                        MapConfig* mapConfig;
+                        Map* map;
+                        s32 assetData;
+                        s32 assetSize;
+
+                        D_800A0920 = -1;
+                        nuGfxSetCfb(&D_80077950, ARRAY_COUNT(D_80077950));
+                        pause_cleanup();
+                        gOverrideFlags &= ~0x8;
+                        mapConfig = get_current_map_header();
+                        map = &gAreas[gGameStatusPtr->areaID].maps[gGameStatusPtr->mapID];
+                        gGameStatusPtr->isBattle = FALSE;
+                        gGameStatusPtr->enableBackground &= ~0xF0;
+                        func_8005AF84();
+                        func_8002ACDC();
+                        nuContRmbForceStopEnd();
+                        sfx_clear_env_sounds(1);
+                        spr_init_sprites(gGameStatusPtr->playerSpriteSet);
+                        init_model_data();
+                        init_sprite_shading_data();
+                        init_entity_models();
+                        reset_animator_list();
+                        init_generic_entity_list();
+                        set_hud_element_nonworld_cache(0, 0);
+                        init_hud_element_list();
+                        init_item_entity_list();
+                        init_script_list();
+                        init_npc_list();
+                        func_80110E58();
+                        init_trigger_list();
+                        func_801497FC(D_800A0924);
+                        bgm_reset_max_volume();
+                        load_map_script_lib();
+                        assetData = load_asset_by_name(&D_800D9230, &assetSize);
+                        decode_yay0(assetData, &D_80210000);
+                        general_heap_free(assetData);
+                        initialize_collision();
+                        load_collision();
+
+                        if (map->dmaStart != NULL) {
+                            dma_copy(map->dmaStart, map->dmaEnd, map->dmaDest);
+                        }
+
+                        load_map_bg(map->bgName);
+                        if (mapConfig->background != NULL) {
+                            read_background_size(mapConfig->background);
+                        } else {
+                            set_background_size(296, 200, 12, 20);
+                        }
+
+                        gGameStatusPtr->unk_15C = gGameStatusPtr->unk_15E;
+                        calculate_model_sizes();
+                        npc_reload_all();
+                        set_windows_visible(0);
+                        func_800E98C4();
+                        set_time_freeze_mode(1);
+                        D_800A0921 = 3;
+                        gPlayerStatus.alpha2 = gPlayerStatus.alpha1 - 1;
+                        D_802D9D71 = D_802D9D70 + 1;
+
+                        update_encounters();
+                        update_npcs();
+                        update_player();
+                        update_effects();
+
+                        D_800A0922 -= 20;
+                        if (D_800A0922 < 0) {
+                            D_800A0922 = 0;
+                        }
+                    }
+                }
+            }
+            break;
+        case 3:
+            update_encounters();
+            update_npcs();
+            update_player();
+            update_effects();
+
+            if (D_800A0922 == 0) {
+                D_800A0921 = 4;
+            } else {
+                D_800A0922 -= 20;
+                if (D_800A0922 < 0) {
+                    D_800A0922 = 0;
+                }
+            }
+            break;
+        case 4:
+            set_time_freeze_mode(0);
+            update_encounters();
+            update_npcs();
+            update_player();
+            update_effects();
+            enable_player_input();
+            set_game_mode(4);
+            break;
+    }
+}
+
+void state_drawUI_unpause(void) {
+}
diff --git a/src/e940_len_290.c b/src/state_startup.c
similarity index 100%
rename from src/e940_len_290.c
rename to src/state_startup.c
diff --git a/src/121f0_len_1290.c b/src/state_title_screen.c
similarity index 95%
rename from src/121f0_len_1290.c
rename to src/state_title_screen.c
index 0119f0daf6..5739d8b4e6 100644
--- a/src/121f0_len_1290.c
+++ b/src/state_title_screen.c
@@ -47,9 +47,9 @@ extern s32* D_800A0978;
 extern s32* D_800A097C;
 extern s32 D_800A0980;
 
-INCLUDE_ASM(void, "121f0_len_1290", state_init_title_screen, void);
+INCLUDE_ASM(void, "state_title_screen", state_init_title_screen, void);
 
-INCLUDE_ASM(void, "121f0_len_1290", state_step_title_screen, void);
+INCLUDE_ASM(void, "state_title_screen", state_step_title_screen, void);
 
 void state_drawUI_title_screen(void) {
     switch (gGameStatusPtr->loadMenuState) {
@@ -74,7 +74,7 @@ void state_drawUI_title_screen(void) {
     }
 }
 
-INCLUDE_ASM(s32, "121f0_len_1290", appendGfx_title_screen);
+INCLUDE_ASM(void, "state_title_screen", appendGfx_title_screen);
 
 void draw_title_screen_NOP(void) {
 }
@@ -84,7 +84,7 @@ void title_screen_draw_images(f32 arg0, f32 arg1) {
     title_screen_draw_copyright(arg1);
 }
 
-INCLUDE_ASM(void, "121f0_len_1290", title_screen_draw_logo);
+INCLUDE_ASM(void, "state_title_screen", title_screen_draw_logo);
 
 void title_screen_draw_press_start(void) {
     switch (D_80077A2C) {
diff --git a/src/11130_len_c0.c b/src/state_world.c
similarity index 100%
rename from src/11130_len_c0.c
rename to src/state_world.c
diff --git a/ver/us/asm/data/fio.data.s b/ver/us/asm/data/fio.data.s
new file mode 100644
index 0000000000..1ff2899842
--- /dev/null
+++ b/ver/us/asm/data/fio.data.s
@@ -0,0 +1,72 @@
+.include "macro.inc"
+
+.section .data
+
+glabel D_800745E0
+.word 0x99999999, 0x33333333, 0x99999999, 0x33333333, 0x99999999, 0x33333333, 0x99999999, 0x33333333, 0x99999999, 0x33333333, 0x99999999, 0x33333333, 0x33333333, 0x99999999, 0x44444444, 0x99999999, 0x44444444, 0xAAAAAAAA, 0x44444444, 0xAAAAAAAA, 0x44444444, 0xAAAAAAAA, 0x44444444, 0xAAAAAAAA, 0x44444444, 0xAAAAAAAA, 0x55555555, 0xAAAAAAAA, 0x55555555, 0xAAAAAAAA, 0x55555555, 0xBBBBBBBB, 0xBBBBBBBB, 0x66666666, 0xBBBBBBBB, 0x66666666, 0xBBBBBBBB, 0x66666666, 0xCCCCCCCC, 0x66666666, 0xCCCCCCCC, 0x66666666, 0xCCCCCCCC, 0x77777777, 0xCCCCCCCC, 0x77777777, 0xCCCCCCCC, 0x77777777, 0xCCCCCCCC, 0x77777777, 0x88888888, 0xDDDDDDDD, 0x88888888, 0xDDDDDDDD, 0x88888888, 0xDDDDDDDD, 0x88888888, 0xDDDDDDDD, 0x88888888, 0xDDDDDDDD, 0x88888888, 0xDDDDDDDD, 0x88888888, 0xDDDDDDDD
+
+glabel D_800746E0
+.word 0xE3001001, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xFD900000, D_800745E0, 0xF5900000, 0x07094040, 0xE6000000, 0x00000000, 0xF3000000, 0x0707F800, 0xE7000000, 0x00000000, 0xF5800200, 0x00094040, 0xF2000000, 0x0003C07C, 0xDF000000, 0x00000000
+
+glabel D_80074730
+.word 0x9F7C1A00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xA9851B00, 0xAA851B00, 0xAA851B00, 0xAA851B00, 0xAA851B00, 0xAA851B00, 0xAA851B00, 0xAA851B00, 0xAA851B00, 0xAA851B00, 0xAA851B02, 0xAA851B03, 0xAA851B05, 0xAA851B05, 0xAA851B05, 0xA07E1A05, 0xAC871C00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB58F1D01, 0xB7931E03, 0xBC9A200E, 0xBE9E2126, 0xC3A72453, 0xC4A92477, 0xD0BA2C92, 0xD1BA2BAA, 0xD5C030CF, 0xCBB327EB, 0xD3BD2EEB, 0xCDB629EC, 0xCAB127E6, 0xCCB327DE, 0xA9851B00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB8931E00, 0xBC9B2112, 0xCEB62C38, 0xCDB52973, 0xCDB627B4, 0xD0B929E0, 0xD3BE2CE8, 0xE2D039ED, 0xC9B122EE, 0xE8D83FEF, 0xDBC734EE, 0xEDDE45ED, 0xCDB422CF, 0xE5D43DF2, 0xD9C42FD8, 0xC6AA1FE9, 0xE4D33AF4, 0xA9851B00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB9951F0C, 0xC3A72341, 0xD1BB2A9D, 0xCCB525DF, 0xEBDC42E1, 0xD5BF2DD2, 0xE3D13AE8, 0xD6C02BCB, 0xDECB37F0, 0xE4D239CC, 0xC2A51CD8, 0xE9DA3FEE, 0xD3BB2AD5, 0xEDDD45E2, 0xCFB824CC, 0xEADB43F1, 0xDCC62FCE, 0xC2A61CE9, 0xE7D73CFC, 0xA9851B00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB8941F06, 0xC2A3232D, 0xC6AA256E, 0xD3BE2BC0, 0xD4BF2BFD, 0xE6D43BDA, 0xC3A61CD5, 0xF0E247EE, 0xD3BB2ACE, 0xE7D63EE2, 0xD9C42DCE, 0xE3D13BF2, 0xEDDE44CF, 0xC4A71DD6, 0xECDD42F0, 0xCFB726CE, 0xECDD44E2, 0xD3BC27CD, 0xE9D942F2, 0xDCC72FCE, 0xC7AC20E9, 0xE3D035FC, 0xAA851B00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB6911E01, 0xBE9E2229, 0xD1BB2AA2, 0xD1BA27ED, 0xD7C22DF3, 0xF2E54AD2, 0xD1BC2BF0, 0xE8D83DCF, 0xC4A81DD6, 0xF2E54AF0, 0xCAB020CE, 0xECDD44E3, 0xD2BB27CC, 0xD2BC2DF1, 0xE5D43CCC, 0xC7AD22D5, 0xEDDE44EF, 0xD4BF2ECF, 0xE4D33DE4, 0xD9C331D2, 0xF4E64CF5, 0xE7D63FD7, 0xD6C230EE, 0xEADA43FD, 0xAE8A1B00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB48D1D00, 0xB58F1D01, 0xBC9A201F, 0xCEB62993, 0xCEB927F3, 0xD9C62DF8, 0xC9AE20CC, 0xE5D43DE2, 0xF4E64CCE, 0xD6C12FF2, 0xEBDB41CF, 0xC4A81DD4, 0xECDD44EF, 0xC8AE22CD, 0xD7C230E4, 0xD1B92AD4, 0xD7C32FF8, 0xDBC833E2, 0xDAC62FF2, 0xDCC634F9, 0xD3B92DF6, 0xCCAC2AFB, 0xC59E26FD, 0xC09324FF, 0xC29124FE, 0xC38F25FF, 0xCA9627FF, 0xB38F1B00, 0xB48D1D00, 0xB38C1D00, 0xB28B1C00, 0xB38C1C01, 0xBC9B2059, 0xCCB328A8, 0xCFB928F0, 0xE0CE34E6, 0xC5A91ED5, 0xE1CF34EF, 0xCAB020CE, 0xE4D23CE2, 0xEEE046CC, 0xCDB629F2, 0xF3E64BCE, 0xCDB529E3, 0xE7D63DF2, 0xDFCD32EF, 0xDDCA31F9, 0xD4BC2DFD, 0xC09024FF, 0xAB5C1AFF, 0xA34715FF, 0x95330FFF, 0x88260BFF, 0x822009FF, 0x811F09FF, 0x801E09FF, 0x821F09FF, 0x811D08FF, 0x801D08FF, 0xC8AF25A0, 0xC5AB2487, 0xBE9E2198, 0xC0A32265, 0xBE9F2174, 0xC8AF23F6, 0xD2BC28EC, 0xC8AF22F3, 0xECDC42CF, 0xD2BA2BD6, 0xEADA40F0, 0xC9AE20CB, 0xD8C332E3, 0xD9C533D6, 0xD8C32EFC, 0xDFCE33F1, 0xE0CB34FF, 0xD7AA2DFF, 0xC17221FF, 0x9F4013FF, 0x87250BFF, 0x7E1D07FF, 0x7A1B06FF, 0x791A06FF, 0x771A06FF, 0x771A06FF, 0x791A06FF, 0x7B1B07FF, 0x7E1E07FF, 0x7C1B07FF, 0x7B1B07FF, 0x7B1B07FF, 0xCDB828FF, 0xCAB326FF, 0xBFA321FF, 0xC8B026FF, 0xE3D434FB, 0xC3A821F5, 0xD3BD2BD2, 0xCBB325F2, 0xE8D73DCF, 0xCEB528D5, 0xE2D03AEC, 0xD3B92BE4, 0xDFCD33F6, 0xDBC331FE, 0xC88B26FF, 0xB75C1AFF, 0xA23712FF, 0x89230AFF, 0x7C1C08FF, 0x781A06FF, 0x771A06FF, 0x771A06FF, 0x771A06FF, 0x781A06FF, 0x781A06FF, 0x781A06FF, 0x791B07FF, 0x7B1B07FF, 0x7C1C07FF, 0x7A1B07FF, 0x7B1B07FF, 0x7B1B07FF, 0xD9C530FF, 0xCBB527FF, 0xD7BF38FF, 0xD0B92DFF, 0xDECE30FC, 0xBFA31FF1, 0xE1CF3ACB, 0xDDC936F2, 0xEDDD45CC, 0xDFCB36F2, 0xE4D536F9, 0xD8BA30FF, 0xB35E1BFF, 0x97300EFF, 0x8A220AFF, 0x811E08FF, 0x7A1B07FF, 0x781B06FF, 0x771A06FF, 0x771A06FF, 0x781A06FF, 0x781A06FF, 0x771A06FF, 0x751906FF, 0x751805FF, 0x741804FF, 0x731704FF, 0x751704FF, 0x771905FF, 0x7A1A06FF, 0x791A06FF, 0x7A1A06FF, 0xE4D33AFF, 0xCCB627FF, 0xDBC63CFF, 0xCFB82EFF, 0xC9B327E3, 0xBC9D27EA, 0xCEB529CC, 0xD5B62FFC, 0xE9DB3BF2, 0xE8D237FF, 0xCB8524FF, 0x98350FFF, 0x831E08FF, 0x801D08FF, 0x811E08FF, 0x7E1C07FF, 0x7B1B07FF, 0x791B07FF, 0x771A06FF, 0x751905FF, 0x731805FF, 0x731804FF, 0x751703FF, 0x761704FF, 0x771804FF, 0x781804FF, 0x791804FF, 0x7A1804FF, 0x7A1804FF, 0x7A1804FF, 0x7B1804FF, 0x7A1804FF, 0xE8D543FF, 0xCDB729FF, 0xDEC841FF, 0xBCA119FF, 0xC2A943DC, 0xB08819F2, 0xD5C02DF5, 0xEAD737FF, 0xCB8A25FF, 0x95330DFF, 0x871E07FF, 0x861E07FF, 0x821D08FF, 0x801C07FF, 0x7B1A06FF, 0x761905FF, 0x741805FF, 0x731704FF, 0x741804FF, 0x771804FF, 0x791804FF, 0x7B1805FF, 0x7B1805FF, 0x7B1805FF, 0x7B1805FF, 0x7B1805FF, 0x7A1805FF, 0x791805FF, 0x791805FF, 0x791905FF, 0x7A1905FF, 0x791805FF, 0xEAD74EFF, 0xD3BD31FF, 0xDEC842FF, 0xB5961AFF, 0xB6913AF4, 0xC9AD24FC, 0xCFA128FF, 0x96370EFF, 0x801804FF, 0x801904FF, 0x821904FF, 0x801803FF, 0x7B1703FF, 0x751502FF, 0x721503FF, 0x731603FF, 0x781704FF, 0x7A1804FF, 0x7B1804FF, 0x7C1804FF, 0x7C1805FF, 0x7A1805FF, 0x7A1805FF, 0x791805FF, 0x781805FF, 0x761805FF, 0x751805FF, 0x741705FF, 0x721705FF, 0x721705FF, 0x721705FF, 0x721705FF, 0xECD955FF, 0xE5D049FF, 0xD2B934FF, 0xB19127FF, 0xC1A12EFF, 0xA56715FF, 0x7C1D05FF, 0x7E1804FF, 0x7D1703FF, 0x7B1702FF, 0x771501FF, 0x761401FF, 0x741401FF, 0x751603FF, 0x781704FF, 0x7A1704FF, 0x7B1704FF, 0x7B1704FF, 0x7A1805FF, 0x791805FF, 0x771705FF, 0x751705FF, 0x731705FF, 0x721705FF, 0x701605FF, 0x6D1605FF, 0x6B1605FF, 0x691505FF, 0x681505FF, 0x671404FF, 0x671405FF, 0x671405FF, 0xEDDA57FF, 0xEAD64FFF, 0xD1B933FF, 0xA88622FF, 0x8C491EFF, 0x6C1302FF, 0x771503FF, 0x761502FF, 0x701402FF, 0x6D1301FF, 0x6E1403FF, 0x701503FF, 0x751603FF, 0x781804FF, 0x7A1804FF, 0x791804FF, 0x781705FF, 0x751705FF, 0x721805FF, 0x6F1705FF, 0x6C1605FF, 0x691605FF, 0x671605FF, 0x661405FF, 0x641305FF, 0x621305FF, 0x601304FF, 0x611304FF, 0x611304FF, 0x611304FF, 0x611304FF, 0x631404FF, 0xEFDB56FF, 0xF0DF53FF, 0xD5BE38FF, 0x9B7016FF, 0x671704FF, 0x6C1202FF, 0x6E1301FF, 0x691302FF, 0x681303FF, 0x6B1404FF, 0x6F1605FF, 0x731805FF, 0x761705FF, 0x761805FF, 0x741705FF, 0x701605FF, 0x6E1705FF, 0x691605FF, 0x651504FF, 0x631404FF, 0x611304FF, 0x5F1204FF, 0x5E1204FF, 0x5E1204FF, 0x5D1204FF, 0x5D1204FF, 0x5F1204FF, 0x5F1204FF, 0x601304FF, 0x621404FF, 0x621404FF, 0x651604FF, 0xF3E44FFF, 0xF4E74CFF, 0xCFB82EFF, 0x905A19FF, 0x610F01FF, 0x641202FF, 0x631203FF, 0x641303FF, 0x691404FF, 0x701705FF, 0x721805FF, 0x721805FF, 0x711705FF, 0x6E1705FF, 0x691504FF, 0x661405FF, 0x621404FF, 0x5F1304FF, 0x5E1204FF, 0x5D1204FF, 0x5C1204FF, 0x5C1204FF, 0x5C1204FF, 0x5D1204FF, 0x5E1204FF, 0x5F1304FF, 0x601304FF, 0x611404FF, 0x621404FF, 0x631504FF, 0x651604FF, 0x671704FF, 0xEBDC42FF, 0xDCCB35FF, 0xAE8B1EFF, 0x692008FF, 0x580E01FF, 0x590F02FF, 0x5F1203FF, 0x681404FF, 0x6F1605FF, 0x711705FF, 0x6D1705FF, 0x6A1605FF, 0x671505FF, 0x641404FF, 0x601303FF, 0x5E1304FF, 0x5D1204FF, 0x5C1204FF, 0x5C1204FF, 0x5C1203FF, 0x5C1203FF, 0x5D1303FF, 0x5D1304FF, 0x5D1404FF, 0x5D1404FF, 0x5E1404FF, 0x5F1403FF, 0x5F1403FF, 0x601403FF, 0x611403FF, 0x621402FF, 0x641402FF, 0xE2CD3AFF, 0xB09020FF, 0x6C2A0BFF, 0x4F0C01FF, 0x4D0D01FF, 0x591102FF, 0x651404FF, 0x6C1605FF, 0x6C1605FF, 0x681605FF, 0x641405FF, 0x611304FF, 0x601204FF, 0x5E1203FF, 0x5C1203FF, 0x5C1203FF, 0x5C1204FF, 0x5D1304FF, 0x5F1304FF, 0x601404FF, 0x611404FF, 0x601403FF, 0x5F1403FF, 0x5D1403FF, 0x5E1403FF, 0x5F1403FF, 0x601403FF, 0x621403FF, 0x621403FF, 0x631403FF, 0x641402FF, 0x651402FF, 0xE9D63EFF, 0xA98421FF, 0x4E0F03FF, 0x470B01FF, 0x530F03FF, 0x621305FF, 0x681605FF, 0x651505FF, 0x611404FF, 0x5E1203FF, 0x5C1204FF, 0x5C1204FF, 0x5C1203FF, 0x5C1304FF, 0x5D1204FF, 0x5F1405FF, 0x611506FF, 0x631505FF, 0x641505FF, 0x641505FF, 0x641504FF, 0x631503FF, 0x621403FF, 0x641403FF, 0x671503FF, 0x681603FF, 0x6A1604FF, 0x6C1704FF, 0x6D1704FF, 0x6D1704FF, 0x6D1804FF, 0x6C1804FF, 0xE4CC37FF, 0x9E7322FF, 0x440901FF, 0x4A0C01FF, 0x5C1204FF, 0x651405FF, 0x611504FF, 0x5C1204FF, 0x5A1102FF, 0x591003FF, 0x5A1104FF, 0x5C1204FF, 0x5E1305FF, 0x601405FF, 0x611405FF, 0x621605FF, 0x621605FF, 0x631604FF, 0x631504FF, 0x651603FF, 0x671603FF, 0x691603FF, 0x6D1703FF, 0x701704FF, 0x721804FF, 0x731804FF, 0x751904FF, 0x751904FF, 0x761904FF, 0x751904FF, 0x751904FF, 0x731804FF, 0xEDD639FF, 0xAA8624FF, 0x460B01FF, 0x510F03FF, 0x5E1304FF, 0x5E1304FF, 0x5A1103FF, 0x571002FF, 0x561002FF, 0x581104FF, 0x5E1205FF, 0x611505FF, 0x621506FF, 0x611505FF, 0x5F1404FF, 0x5D1403FF, 0x5F1403FF, 0x641503FF, 0x681603FF, 0x6B1703FF, 0x6E1704FF, 0x721804FF, 0x751804FF, 0x771904FF, 0x771904FF, 0x781905FF, 0x791905FF, 0x791905FF, 0x781905FF, 0x781905FF, 0x781905FF, 0x751805FF, 0xCBAE27FF, 0x956E1DFF, 0x4A0C02FF, 0x520F03FF, 0x591104FF, 0x571102FF, 0x550F02FF, 0x540F03FF, 0x571104FF, 0x5D1405FF, 0x631506FF, 0x621505FF, 0x5E1404FF, 0x5C1204FF, 0x5B1203FF, 0x5D1303FF, 0x631503FF, 0x6A1703FF, 0x6E1804FF, 0x711804FF, 0x741905FF, 0x771904FF, 0x791A05FF, 0x7A1A05FF, 0x7A1A05FF, 0x7A1A05FF, 0x7A1A05FF, 0x791905FF, 0x791905FF, 0x791905FF, 0x781905FF, 0x751805FF, 0xAF8612FF, 0x612C0CFF, 0x480C02FF, 0x4B0D02FF, 0x510E01FF, 0x510E01FF, 0x530F03FF, 0x571104FF, 0x5D1305FF, 0x611505FF, 0x601404FF, 0x5C1303FF, 0x5B1103FF, 0x5D1203FF, 0x601403FF, 0x651504FF, 0x6C1804FF, 0x721905FF, 0x761A05FF, 0x781905FF, 0x7A1A05FF, 0x7B1A05FF, 0x7B1A05FF, 0x7B1A06FF, 0x7B1A06FF, 0x7B1A05FF, 0x7A1A05FF, 0x7A1A05FF, 0x7A1905FF, 0x781905FF, 0x781905FF, 0x751804FF, 0xA6790EFF, 0x481002FF, 0x400A01FF, 0x420A01FF, 0x490C01FF, 0x510E03FF, 0x571204FF, 0x5D1405FF, 0x5E1405FF, 0x5C1304FF, 0x5A1203FF, 0x5A1203FF, 0x5D1303FF, 0x621504FF, 0x6A1705FF, 0x701805FF, 0x761905FF, 0x791A05FF, 0x7A1A06FF, 0x7B1A06FF, 0x7A1A06FF, 0x791A06FF, 0x781A06FF, 0x781A06FF, 0x771906FF, 0x761905FF, 0x771905FF, 0x781905FF, 0x781905FF, 0x771905FF, 0x761905FF, 0x731804FF, 0xAA7F10FF, 0x440F01FF, 0x390800FF, 0x3D0801FF, 0x4B0E03FF, 0x571204FF, 0x5D1305FF, 0x5D1405FF, 0x5B1304FF, 0x591102FF, 0x581102FF, 0x5A1304FF, 0x621504FF, 0x6C1705FF, 0x741905FF, 0x781A05FF, 0x7A1A05FF, 0x791A06FF, 0x771906FF, 0x751905FF, 0x741805FF, 0x731805FF, 0x711704FF, 0x701704FF, 0x701703FF, 0x711704FF, 0x731805FF, 0x741805FF, 0x741805FF, 0x731804FF, 0x721804FF, 0x701704FF, 0xA97E0FFF, 0x430F02FF, 0x370801FF, 0x420B02FF, 0x531104FF, 0x5C1305FF, 0x5C1305FF, 0x581103FF, 0x561002FF, 0x571103FF, 0x5A1304FF, 0x631605FF, 0x6E1704FF, 0x741905FF, 0x761905FF, 0x751905FF, 0x741805FF, 0x711705FF, 0x6E1703FF, 0x6D1703FF, 0x6C1703FF, 0x6C1604FF, 0x6C1603FF, 0x6D1604FF, 0x6E1704FF, 0x701705FF, 0x701705FF, 0x701704FF, 0x6F1604FF, 0x6D1604FF, 0x6C1604FF, 0x6A1604FF, 0xA97F0FFF, 0x410D01FF, 0x3C0A01FF, 0x4B0F03FF, 0x5A1305FF, 0x591305FF, 0x511002FF, 0x4F0F02FF, 0x551204FF, 0x5F1404FF, 0x681605FF, 0x6C1704FF, 0x6D1704FF, 0x6E1805FF, 0x6D1804FF, 0x6B1604FF, 0x691504FF, 0x691503FF, 0x681503FF, 0x681503FF, 0x691504FF, 0x691504FF, 0x6A1604FF, 0x6A1605FF, 0x6A1504FF, 0x691604FF, 0x681604FF, 0x661504FF, 0x641504FF, 0x641504FF, 0x641504FF, 0x601504FF, 0xA97F10FF, 0x3E0D01FF, 0x420B02FF, 0x521003FF, 0x561205FF, 0x4B0E03FF, 0x4B0D02FF, 0x561203FF, 0x611504FF, 0x671504FF, 0x651604FF, 0x621504FF, 0x611504FF, 0x621404FF, 0x601404FF, 0x5F1404FF, 0x5F1404FF, 0x611404FF, 0x611404FF, 0x611404FF, 0x611404FF, 0x611404FF, 0x601404FF, 0x611503FF, 0x601403FF, 0x5F1403FF, 0x5E1404FF, 0x5D1404FF, 0x5C1403FF, 0x5C1403FF, 0x5C1403FF, 0x5A1403FF, 0xA87E0FFF, 0x430E01FF, 0x4B0E03FF, 0x4E0F03FF, 0x460C02FF, 0x490C02FF, 0x571204FF, 0x5F1504FF, 0x5D1403FF, 0x591404FF, 0x571304FF, 0x571304FF, 0x571304FF, 0x571304FF, 0x571304FF, 0x561303FF, 0x571403FF, 0x571403FF, 0x571403FF, 0x571403FF, 0x581403FF, 0x581403FF, 0x581403FF, 0x581403FF, 0x581403FF, 0x581403FF, 0x571403FF, 0x571303FF, 0x571303FF, 0x561303FF, 0x561303FF, 0x541303F4, 0xA77D12FF, 0x4B1002FF, 0x4B0F03FF, 0x450C03FF, 0x4A0D02FF, 0x541304FF, 0x561404FF, 0x521304FF, 0x501203FF, 0x501203FF, 0x501203FF, 0x511203FF, 0x511203FF, 0x511203FF, 0x511203FF, 0x511203FF, 0x511203FF, 0x511203FF, 0x511203FF, 0x521303FF, 0x531303FF, 0x531303FF, 0x531303FF, 0x531303FF, 0x531303FF, 0x531303FF, 0x531303FF, 0x531203FF, 0x521203FF, 0x521303FF, 0x521303FF, 0x521303FF
+
+glabel D_80075730
+.word 0xE3001001, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xFD180000, D_80074730, 0xF5180000, 0x07094150, 0xE6000000, 0x00000000, 0xF3000000, 0x073FF080, 0xE7000000, 0x00000000, 0xF5181000, 0x00094150, 0xF2000000, 0x0007C07C, 0xDF000000, 0x00000000
+
+glabel D_80075780
+.word 0x09333336, 0x72222222, 0x53333336, 0x72222222, 0x44005553, 0x11177772, 0x00005553, 0x11177D82, 0x44005553, 0x11117772, 0x00005553, 0x11117D82, 0x44A00553, 0x16111772, 0x00000553, 0x16111D82, 0x44A00053, 0x16611172, 0x00000053, 0x16611782, 0x44A00003, 0x16661112, 0x00000003, 0x16661782, 0x44A00003, 0x16666112, 0x00000003, 0x16666182, 0x4400000F, 0x1111111D, 0x0000000F, 0x111111D2, 0x61D22222, 0x53333336, 0x72222222, 0x5333336D, 0xE9677772, 0x00005553, 0x11177772, 0x0000537D, 0xE9617772, 0x00005553, 0x11117772, 0x0000537D, 0xE9611772, 0x00000553, 0x16111772, 0x00000C7D, 0xE9B61172, 0x00000053, 0x16611172, 0x00000C7D, 0xE9B61112, 0x00000003, 0x16661112, 0x0000091D, 0xE9B66112, 0x00000003, 0x16666112, 0x0000051D, 0xEE11111D, 0x0000000F, 0x1111111D, 0x00000097
+
+glabel D_80075880
+.word 0xE5D79BC9, 0x7285BCCF, 0xEE9FDD93, 0xA40D9345, 0x6203C515, 0xE61BAC4F, 0xCD118309, 0xB4D5D555
+
+glabel D_800758A0
+.word 0xE3001001, 0x00008000, 0xFD100000, D_80075880, 0xE8000000, 0x00000000, 0xF5000100, 0x07000000, 0xE6000000, 0x00000000, 0xF0000000, 0x0703C000, 0xE7000000, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xFD500000, D_80075780, 0xF5500000, 0x07010250, 0xE6000000, 0x00000000, 0xF3000000, 0x0707F400, 0xE7000000, 0x00000000, 0xF5400400, 0x00010250, 0xF2000000, 0x0007C03C, 0xDF000000, 0x00000000
+
+glabel D_80075920
+.word 0xF9C0FD44, 0x00500000, 0x00CD0000, 0xFFFFFFFF, 0xFAB0FD44, 0x00500000, 0x035C0000, 0xFFFFFFFF, 0xFAB0039D, 0x00500000, 0x035C1155, 0xFFFFFFFF, 0xF9C0039D, 0x00500000, 0x00CD1155, 0xFFFFFFFF, 0xFAECFD44, 0x00000000, 0x04000000, 0xC1BBA3FF, 0xFAEC039D, 0x00000000, 0x04001155, 0xC1BBA3FF
+
+glabel D_80075980
+.word 0x0514FD44, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0550FD44, 0x00500000, 0x00A40000, 0xFFFFFFFF, 0x0550039D, 0x00500000, 0x00A41155, 0xC1BBA3FF, 0x0514039D, 0x00000000, 0x00001155, 0xFFFFFFFF, 0x0640FD44, 0x00500000, 0x03330000, 0xC5B69FFF, 0x0640039D, 0x00500000, 0x03331155, 0x867C49FF
+
+glabel D_800759E0
+.word 0x0320FD44, 0x00000000, 0x0A800400, 0xFFFFFFFF, 0x0000FD44, 0x00000000, 0x06800400, 0xFFFFFFFF, 0x0000FD13, 0x03480000, 0x0680008B, 0xFFFFFFFF, 0x0320FD13, 0x03480000, 0x0A80008B, 0xFFFFFFFF, 0x0640FD13, 0x03480000, 0x0E80008B, 0xC7C7D0FF, 0x0640FD44, 0x00000000, 0x0E800400, 0xC7C7D0FF, 0xFCE0FD44, 0x00000000, 0x02800400, 0xFFFFFFFF, 0xFCE0FD13, 0x03480000, 0x0280008B, 0xFFFFFFFF, 0x0000FD13, 0x03480000, 0x0680008B, 0xFFFFFFFF, 0x0000FCDD, 0x03520000, 0x06800080, 0xC7C7D0FF, 0x0320FCDD, 0x03520000, 0x0A800080, 0xC7C7D0FF, 0x0640FCDD, 0x03520000, 0x0E800080, 0x8C8CA9FF, 0xFCE0FD13, 0x03480000, 0x0280008B, 0xFFFFFFFF, 0xF9C0FD13, 0x03480000, 0xFE80008B, 0xC7C7D0FF, 0xF9C0FCDD, 0x03520000, 0xFE800080, 0x8C8CA9FF, 0xFCE0FCDD, 0x03520000, 0x02800080, 0xC7C7D0FF, 0xF9C0FD44, 0x00000000, 0xFE800400, 0xC7C7D0FF, 0xF9C0F9BD, 0x03200000, 0xFE80FD00, 0x8C8CA9FF, 0xFCE0F9BD, 0x03200000, 0x0280FD00, 0x8C8CA9FF, 0xFCE0FCDD, 0x03520000, 0x02800080, 0xA5A5B6FF, 0x0640F9BD, 0x03200000, 0x0E80FD00, 0x8C8CA9FF, 0x0320F9BD, 0x03200000, 0x0A80FD00, 0x8C8CA9FF, 0x0320FCDD, 0x03520000, 0x0A800080, 0xA5A5B6FF, 0x0000FCDD, 0x03520000, 0x06800080, 0xA5A5B6FF, 0x0000F9BD, 0x03200000, 0x0680FD00, 0x8C8CA9FF
+
+glabel D_80075B70
+.word 0x04C9FD44, 0x00000000, 0x00000000, 0x00000000, 0x0514FD44, 0x00000000, 0x00000000, 0x00000065, 0x0514038E, 0x00000000, 0x00000000, 0x00000065, 0x04C9038E, 0x00000000, 0x00000000, 0x00000000
+
+glabel D_80075BB0
+.word 0xFAECFD44, 0xFFFF0000, 0x00000000, 0x00000065, 0xFB37FD44, 0xFFFF0000, 0x00000000, 0x00000000, 0xFB37038E, 0xFFFF0000, 0x00000000, 0x00000000, 0xFAEC038E, 0xFFFF0000, 0x00000000, 0x00000065
+
+glabel D_80075BF0
+.word 0x01400470, 0x013A0000, 0xFC000400, 0xFFFFFFFF, 0x03C00467, 0x01080000, 0x04000400, 0xFFFFFFFF, 0x03C00623, 0x00C30000, 0x04000800, 0x000000FF, 0x0140062C, 0x00F40000, 0xFC000800, 0x000000FF, 0xFEC00470, 0x013A0000, 0xFC000400, 0xFFFFFFFF, 0x01400470, 0x013A0000, 0x04000400, 0xFFFFFFFF, 0x0140062C, 0x00F40000, 0x04000800, 0x000000FF, 0xFEC0062C, 0x00F40000, 0xFC000800, 0x000000FF, 0xFC400467, 0x01080000, 0xFC000400, 0xFFFFFFFF, 0xFEC00470, 0x013A0000, 0x04000400, 0xFFFFFFFF, 0xFEC0062C, 0x00F40000, 0x04000800, 0x000000FF, 0xFC400623, 0x00C30000, 0xFC000800, 0x000000FF, 0xF9C0029A, 0x00EB0000, 0xFC000000, 0xC1A9A3FF, 0xFC4002AB, 0x014E0000, 0x04000000, 0xFFFFFFFF, 0xFC400467, 0x01080000, 0x04000400, 0xFFFFFFFF, 0xF9C00456, 0x00A60000, 0xFC000400, 0xC1A9A3FF, 0xFC400467, 0x01080000, 0x04000400, 0xFFFFFFFF, 0xFC400623, 0x00C30000, 0x04000800, 0x000000FF, 0xF9C00612, 0x00610000, 0xFC000800, 0x000000FF, 0x03C00467, 0x01080000, 0xFC000400, 0xFFFFFFFF, 0x06400456, 0x00A60000, 0x04000400, 0xC1A9A3FF, 0x06400612, 0x00610000, 0x04000800, 0x000000FF, 0x03C00623, 0x00C30000, 0xFC000800, 0x000000FF, 0xFEC002B4, 0x017F0000, 0x0C000000, 0xFFFFFFFF, 0xFEC00470, 0x013A0000, 0x0C000400, 0xFFFFFFFF, 0x014002B4, 0x017F0000, 0x14000000, 0xFFFFFFFF, 0x01400470, 0x013A0000, 0x14000400, 0xFFFFFFFF, 0x03C002AB, 0x014E0000, 0x1C000000, 0xFFFFFFFF, 0x03C00467, 0x01080000, 0x1C000400, 0xFFFFFFFF, 0x0640029A, 0x00EB0000, 0x24000000, 0xC1A9A3FF, 0x06400456, 0x00A60000, 0x24000400, 0xC1A9A3FF
+
+glabel D_80075DE0
+.word 0xF9C002A3, 0x006E0000, 0xFC000000, 0x0000004B, 0xFB3702A3, 0x006E0000, 0x00B00000, 0x00000023, 0xFB37039D, 0x006E0000, 0x00B00253, 0x00000023, 0xF9C0039D, 0x006E0000, 0xFC000253, 0x0000004B, 0x04C902A3, 0x006E0000, 0x1F500000, 0x00000023, 0x064002A3, 0x006E0000, 0x24000000, 0x0000004B, 0x0640039D, 0x006E0000, 0x24000253, 0x0000004B, 0x04C9039D, 0x006E0000, 0x1F500253, 0x00000023
+
+glabel D_80075E60
+.word 0xE7000000, 0x00000000, 0xE200001C, 0x0C184340, 0xFC121803, 0xFFFFFFF8, 0xDE000000, D_80075730, 0x01008010, D_80075DE0, 0x06000204, 0x00000406, 0x06080A0C, 0x00080C0E, 0xDF000000, 0x00000000
+
+glabel D_80075EA0
+.word 0xE7000000, 0x00000000, 0xE200001C, 0x0C184240, 0xFC127E03, 0xFFFFF3F8, 0xDE000000, D_80075730, 0x0101F03E, D_80075BF0, 0x06000204, 0x00000406, 0x06080A0C, 0x00080C0E, 0x06101214, 0x00101416, 0x06181A1C, 0x00181C1E, 0x061E2022, 0x001E2224, 0x0626282A, 0x00262A2C, 0x061A2E30, 0x001A301C, 0x062E3234, 0x002E3430, 0x06323638, 0x00323834, 0x06363A3C, 0x00363C38, 0xDF000000, 0x00000000
+
+glabel D_80075F20
+.word 0xE7000000, 0x00000000, 0xE200001C, 0x0C184240, 0xFCFFFE03, 0xFFFE79F8, 0xD7000000, 0x00800080, 0x01004008, D_80075B70, 0x06000204, 0x00000406, 0x01004008, D_80075BB0, 0x06000204, 0x00000406, 0xDF000000, 0x00000000
+
+glabel D_80075F68
+.word 0xE7000000, 0x00000000, 0xE200001C, 0x0F0A4200, 0xFC121803, 0xFFFFFFF8, 0xDE000000, D_800746E0, 0x01019032, D_800759E0, 0x06000204, 0x00000406, 0x06080A00, 0x00080006, 0x06020C0E, 0x00020E04, 0x06061012, 0x00061214, 0x06160806, 0x00160614, 0x06181A1C, 0x00181C1E, 0x0610181E, 0x00101E12, 0x060C201A, 0x000C1A0E, 0x061C2224, 0x00261C24, 0x0628162A, 0x00162C2A, 0x062E2624, 0x002E2430, 0x062C2E30, 0x002C302A, 0xDF000000, 0x00000000
+
+glabel D_80075FF8
+.word 0xE7000000, 0x00000000, 0xE200001C, 0x0F0A4200, 0xFC121803, 0xFFFFFFF8, 0xDE000000, D_800758A0, 0x0100600C, D_80075980, 0x06000204, 0x00000406, 0x0602080A, 0x00020A04, 0xDF000000, 0x00000000
+
+glabel D_80076038
+.word 0xE7000000, 0x00000000, 0xE200001C, 0x0F0A4200, 0xFC121803, 0xFFFFFFF8, 0xDE000000, D_800758A0, 0x0100600C, D_80075920, 0x06000204, 0x00000406, 0x0602080A, 0x00020A04, 0xDF000000, 0x00000000
+
+glabel D_80076078
+.word 0xDE000000, D_80075F68, 0xDE000000, D_80076038, 0xDE000000, D_80075FF8, 0xDE000000, D_80075F20, 0xDE000000, D_80075E60, 0xDE000000, D_80075EA0, 0xDF000000, 0x00000000
+
+glabel D_800760B0
+.word 0x028001E0, 0x01FF0000, 0x028001E0, 0x01FF0000
+
+glabel D_800760C0
+.word 0xDC080008, D_800760B0, 0xE3000A01, 0x00100000, 0xE3000F00, 0x00000000, 0xE3000C00, 0x00080000, 0xE3001201, 0x00002000, 0xE3000D01, 0x00000000, 0xE3001402, 0x00000C00, 0xE3001700, 0x00000000, 0xE2001E01, 0x00000000, 0xED000000, 0x005003C0, 0xE3001801, 0x00000000, 0xE3001A01, 0x00000000, 0xD9000000, 0x00000000, 0xD9FFFFFF, 0x00200004, 0xDB0E0000, 0x00000014, 0xDF000000, 0x00000000
diff --git a/ver/us/asm/nonmatchings/7340_len_b00/func_8002C890.s b/ver/us/asm/nonmatchings/7340_len_b00/func_8002C890.s
deleted file mode 100644
index 4067a5d877..0000000000
--- a/ver/us/asm/nonmatchings/7340_len_b00/func_8002C890.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8002C890
-/* 7C90 8002C890 3C02800A */  lui       $v0, %hi(D_8009BB30)
-/* 7C94 8002C894 2442BB30 */  addiu     $v0, $v0, %lo(D_8009BB30)
-/* 7C98 8002C898 3C03A000 */  lui       $v1, 0xa000
-/* 7C9C 8002C89C 00832025 */  or        $a0, $a0, $v1
-/* 7CA0 8002C8A0 AC4409CC */  sw        $a0, 0x9cc($v0)
-/* 7CA4 8002C8A4 A44509D0 */  sh        $a1, 0x9d0($v0)
-/* 7CA8 8002C8A8 03E00008 */  jr        $ra
-/* 7CAC 8002C8AC A44609D2 */   sh       $a2, 0x9d2($v0)
diff --git a/ver/us/asm/nonmatchings/d610_len_1330/func_800322DC.s b/ver/us/asm/nonmatchings/camera/func_800322DC.s
similarity index 100%
rename from ver/us/asm/nonmatchings/d610_len_1330/func_800322DC.s
rename to ver/us/asm/nonmatchings/camera/func_800322DC.s
diff --git a/ver/us/asm/nonmatchings/d610_len_1330/func_800325E4.s b/ver/us/asm/nonmatchings/camera/func_800325E4.s
similarity index 100%
rename from ver/us/asm/nonmatchings/d610_len_1330/func_800325E4.s
rename to ver/us/asm/nonmatchings/camera/func_800325E4.s
diff --git a/ver/us/asm/nonmatchings/d610_len_1330/func_800328A4.s b/ver/us/asm/nonmatchings/camera/func_800328A4.s
similarity index 100%
rename from ver/us/asm/nonmatchings/d610_len_1330/func_800328A4.s
rename to ver/us/asm/nonmatchings/camera/func_800328A4.s
diff --git a/ver/us/asm/nonmatchings/d610_len_1330/func_80032970.s b/ver/us/asm/nonmatchings/camera/func_80032970.s
similarity index 100%
rename from ver/us/asm/nonmatchings/d610_len_1330/func_80032970.s
rename to ver/us/asm/nonmatchings/camera/func_80032970.s
diff --git a/ver/us/asm/nonmatchings/d610_len_1330/func_80032C64.s b/ver/us/asm/nonmatchings/camera/func_80032C64.s
similarity index 100%
rename from ver/us/asm/nonmatchings/d610_len_1330/func_80032C64.s
rename to ver/us/asm/nonmatchings/camera/func_80032C64.s
diff --git a/ver/us/asm/nonmatchings/d610_len_1330/test_ray_zone.s b/ver/us/asm/nonmatchings/camera/test_ray_zone.s
similarity index 100%
rename from ver/us/asm/nonmatchings/d610_len_1330/test_ray_zone.s
rename to ver/us/asm/nonmatchings/camera/test_ray_zone.s
diff --git a/ver/us/asm/nonmatchings/7340_len_b00/crash_create_monitor.s b/ver/us/asm/nonmatchings/crash/crash_create_monitor.s
similarity index 100%
rename from ver/us/asm/nonmatchings/7340_len_b00/crash_create_monitor.s
rename to ver/us/asm/nonmatchings/crash/crash_create_monitor.s
diff --git a/ver/us/asm/nonmatchings/7340_len_b00/crash_delay_msec.s b/ver/us/asm/nonmatchings/crash/crash_delay_msec.s
similarity index 100%
rename from ver/us/asm/nonmatchings/7340_len_b00/crash_delay_msec.s
rename to ver/us/asm/nonmatchings/crash/crash_delay_msec.s
diff --git a/ver/us/asm/nonmatchings/7340_len_b00/crash_monitor_thread.s b/ver/us/asm/nonmatchings/crash/crash_monitor_thread.s
similarity index 100%
rename from ver/us/asm/nonmatchings/7340_len_b00/crash_monitor_thread.s
rename to ver/us/asm/nonmatchings/crash/crash_monitor_thread.s
diff --git a/ver/us/asm/nonmatchings/7340_len_b00/crash_print_fpr.s b/ver/us/asm/nonmatchings/crash/crash_print_fpr.s
similarity index 100%
rename from ver/us/asm/nonmatchings/7340_len_b00/crash_print_fpr.s
rename to ver/us/asm/nonmatchings/crash/crash_print_fpr.s
diff --git a/ver/us/asm/nonmatchings/7340_len_b00/crash_printf_string.s b/ver/us/asm/nonmatchings/crash/crash_printf_string.s
similarity index 100%
rename from ver/us/asm/nonmatchings/7340_len_b00/crash_printf_string.s
rename to ver/us/asm/nonmatchings/crash/crash_printf_string.s
diff --git a/ver/us/asm/nonmatchings/7340_len_b00/crash_show_handler.s b/ver/us/asm/nonmatchings/crash/crash_show_handler.s
similarity index 100%
rename from ver/us/asm/nonmatchings/7340_len_b00/crash_show_handler.s
rename to ver/us/asm/nonmatchings/crash/crash_show_handler.s
diff --git a/ver/us/asm/nonmatchings/7340_len_b00/func_8002BFB0.s b/ver/us/asm/nonmatchings/crash/func_8002BFB0.s
similarity index 100%
rename from ver/us/asm/nonmatchings/7340_len_b00/func_8002BFB0.s
rename to ver/us/asm/nonmatchings/crash/func_8002BFB0.s
diff --git a/ver/us/asm/nonmatchings/7340_len_b00/func_8002C054.s b/ver/us/asm/nonmatchings/crash/func_8002C054.s
similarity index 100%
rename from ver/us/asm/nonmatchings/7340_len_b00/func_8002C054.s
rename to ver/us/asm/nonmatchings/crash/func_8002C054.s
diff --git a/ver/us/asm/nonmatchings/7340_len_b00/func_8002C1D4.s b/ver/us/asm/nonmatchings/crash/func_8002C1D4.s
similarity index 100%
rename from ver/us/asm/nonmatchings/7340_len_b00/func_8002C1D4.s
rename to ver/us/asm/nonmatchings/crash/func_8002C1D4.s
diff --git a/ver/us/asm/nonmatchings/7340_len_b00/func_8002C324.s b/ver/us/asm/nonmatchings/crash/func_8002C324.s
similarity index 100%
rename from ver/us/asm/nonmatchings/7340_len_b00/func_8002C324.s
rename to ver/us/asm/nonmatchings/crash/func_8002C324.s
diff --git a/ver/us/asm/nonmatchings/7340_len_b00/func_8002C7B0.s b/ver/us/asm/nonmatchings/crash/func_8002C7B0.s
similarity index 100%
rename from ver/us/asm/nonmatchings/7340_len_b00/func_8002C7B0.s
rename to ver/us/asm/nonmatchings/crash/func_8002C7B0.s
diff --git a/ver/us/asm/nonmatchings/7340_len_b00/func_8002C94C.s b/ver/us/asm/nonmatchings/crash/func_8002C94C.s
similarity index 100%
rename from ver/us/asm/nonmatchings/7340_len_b00/func_8002C94C.s
rename to ver/us/asm/nonmatchings/crash/func_8002C94C.s
diff --git a/ver/us/asm/nonmatchings/3bf0_len_6f0/update_input.s b/ver/us/asm/nonmatchings/input/update_input.s
similarity index 100%
rename from ver/us/asm/nonmatchings/3bf0_len_6f0/update_input.s
rename to ver/us/asm/nonmatchings/input/update_input.s
diff --git a/ver/us/asm/nonmatchings/1b40_len_20b0/func_800271FC.s b/ver/us/asm/nonmatchings/main_loop/func_800271FC.s
similarity index 100%
rename from ver/us/asm/nonmatchings/1b40_len_20b0/func_800271FC.s
rename to ver/us/asm/nonmatchings/main_loop/func_800271FC.s
diff --git a/ver/us/asm/nonmatchings/1b40_len_20b0/func_8002725C.s b/ver/us/asm/nonmatchings/main_loop/func_8002725C.s
similarity index 100%
rename from ver/us/asm/nonmatchings/1b40_len_20b0/func_8002725C.s
rename to ver/us/asm/nonmatchings/main_loop/func_8002725C.s
diff --git a/ver/us/asm/nonmatchings/1b40_len_20b0/func_80027600.s b/ver/us/asm/nonmatchings/main_loop/func_80027600.s
similarity index 100%
rename from ver/us/asm/nonmatchings/1b40_len_20b0/func_80027600.s
rename to ver/us/asm/nonmatchings/main_loop/func_80027600.s
diff --git a/ver/us/asm/nonmatchings/1b40_len_20b0/func_80027774.s b/ver/us/asm/nonmatchings/main_loop/func_80027774.s
similarity index 100%
rename from ver/us/asm/nonmatchings/1b40_len_20b0/func_80027774.s
rename to ver/us/asm/nonmatchings/main_loop/func_80027774.s
diff --git a/ver/us/asm/nonmatchings/1b40_len_20b0/func_800279B4.s b/ver/us/asm/nonmatchings/main_loop/func_800279B4.s
similarity index 100%
rename from ver/us/asm/nonmatchings/1b40_len_20b0/func_800279B4.s
rename to ver/us/asm/nonmatchings/main_loop/func_800279B4.s
diff --git a/ver/us/asm/nonmatchings/1b40_len_20b0/gfx_draw_background.s b/ver/us/asm/nonmatchings/main_loop/gfx_draw_background.s
similarity index 100%
rename from ver/us/asm/nonmatchings/1b40_len_20b0/gfx_draw_background.s
rename to ver/us/asm/nonmatchings/main_loop/gfx_draw_background.s
diff --git a/ver/us/asm/nonmatchings/ebd0_len_6a0/state_step_battle.s b/ver/us/asm/nonmatchings/state_battle/state_step_battle.s
similarity index 100%
rename from ver/us/asm/nonmatchings/ebd0_len_6a0/state_step_battle.s
rename to ver/us/asm/nonmatchings/state_battle/state_step_battle.s
diff --git a/ver/us/asm/nonmatchings/ebd0_len_6a0/state_step_end_battle.s b/ver/us/asm/nonmatchings/state_battle/state_step_end_battle.s
similarity index 100%
rename from ver/us/asm/nonmatchings/ebd0_len_6a0/state_step_end_battle.s
rename to ver/us/asm/nonmatchings/state_battle/state_step_end_battle.s
diff --git a/ver/us/asm/nonmatchings/13480_len_3f0/state_step_demo.s b/ver/us/asm/nonmatchings/state_demo/state_step_demo.s
similarity index 100%
rename from ver/us/asm/nonmatchings/13480_len_3f0/state_step_demo.s
rename to ver/us/asm/nonmatchings/state_demo/state_step_demo.s
diff --git a/ver/us/asm/nonmatchings/10400_len_d30/state_step_exit_file_select.s b/ver/us/asm/nonmatchings/state_file_select/state_step_exit_file_select.s
similarity index 100%
rename from ver/us/asm/nonmatchings/10400_len_d30/state_step_exit_file_select.s
rename to ver/us/asm/nonmatchings/state_file_select/state_step_exit_file_select.s
diff --git a/ver/us/asm/nonmatchings/10400_len_d30/state_step_exit_language_select.s b/ver/us/asm/nonmatchings/state_file_select/state_step_exit_language_select.s
similarity index 100%
rename from ver/us/asm/nonmatchings/10400_len_d30/state_step_exit_language_select.s
rename to ver/us/asm/nonmatchings/state_file_select/state_step_exit_language_select.s
diff --git a/ver/us/asm/nonmatchings/10400_len_d30/state_step_language_select.s b/ver/us/asm/nonmatchings/state_file_select/state_step_language_select.s
similarity index 100%
rename from ver/us/asm/nonmatchings/10400_len_d30/state_step_language_select.s
rename to ver/us/asm/nonmatchings/state_file_select/state_step_language_select.s
diff --git a/ver/us/asm/nonmatchings/11a50_len_7a0/state_step_intro.s b/ver/us/asm/nonmatchings/state_intro/state_step_intro.s
similarity index 100%
rename from ver/us/asm/nonmatchings/11a50_len_7a0/state_step_intro.s
rename to ver/us/asm/nonmatchings/state_intro/state_step_intro.s
diff --git a/ver/us/asm/nonmatchings/f270_len_1190/appendGfx_intro_logos.s b/ver/us/asm/nonmatchings/state_logos/appendGfx_intro_logos.s
similarity index 100%
rename from ver/us/asm/nonmatchings/f270_len_1190/appendGfx_intro_logos.s
rename to ver/us/asm/nonmatchings/state_logos/appendGfx_intro_logos.s
diff --git a/ver/us/asm/nonmatchings/121f0_len_1290/appendGfx_title_screen.s b/ver/us/asm/nonmatchings/state_title_screen/appendGfx_title_screen.s
similarity index 100%
rename from ver/us/asm/nonmatchings/121f0_len_1290/appendGfx_title_screen.s
rename to ver/us/asm/nonmatchings/state_title_screen/appendGfx_title_screen.s
diff --git a/ver/us/asm/nonmatchings/121f0_len_1290/state_init_title_screen.s b/ver/us/asm/nonmatchings/state_title_screen/state_init_title_screen.s
similarity index 100%
rename from ver/us/asm/nonmatchings/121f0_len_1290/state_init_title_screen.s
rename to ver/us/asm/nonmatchings/state_title_screen/state_init_title_screen.s
diff --git a/ver/us/asm/nonmatchings/121f0_len_1290/state_step_title_screen.s b/ver/us/asm/nonmatchings/state_title_screen/state_step_title_screen.s
similarity index 100%
rename from ver/us/asm/nonmatchings/121f0_len_1290/state_step_title_screen.s
rename to ver/us/asm/nonmatchings/state_title_screen/state_step_title_screen.s
diff --git a/ver/us/asm/nonmatchings/121f0_len_1290/title_screen_draw_logo.s b/ver/us/asm/nonmatchings/state_title_screen/title_screen_draw_logo.s
similarity index 100%
rename from ver/us/asm/nonmatchings/121f0_len_1290/title_screen_draw_logo.s
rename to ver/us/asm/nonmatchings/state_title_screen/title_screen_draw_logo.s
diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml
index 66b7855050..ac22b8a711 100644
--- a/ver/us/splat.yaml
+++ b/ver/us/splat.yaml
@@ -43,14 +43,14 @@ segments:
     - [0x1000, hasm, entry_point]
     - [0x1060, c, 1060_len_310]
     - [0x1370, c, 1370_len_7d0]
-    - [0x1b40, c, 1b40_len_20b0]
-    - [0x3bf0, c, 3bf0_len_6f0]
-    - [0x42e0, c, 42e0_len_1f60]
+    - [0x1b40, c, main_loop]
+    - [0x3bf0, c, input]
+    - [0x42e0, c, rumble]
     - [0x43F0, c]
     - [0x6000, c, heap]
     - [0x6240, c, fio]
-    - [0x6e40, c, 6e40_len_500]
-    - [0x7340, c, 7340_len_b00]
+    - [0x6e40, c, curtains]
+    - [0x7340, c, crash]
     - [0x7e40, c, os/nusys/7e40_len_3f0]
     - [0x8230, c, os/nusys/nuSiMgr]
     - [0x8560, c]
@@ -58,16 +58,19 @@ segments:
     - [0x9d10, c, 9d10_len_1080]
     - [0xad90, c, ad90_len_2880]
     - [0xB0E0, c]
-    - [0xd610, c, d610_len_1330]
-    - [0xe940, c, e940_len_290]
-    - [0xebd0, c, ebd0_len_6a0]
-    - [0xf270, c, f270_len_1190]
-    - [0x10400, c, 10400_len_d30]
-    - [0x11130, c, 11130_len_c0]
-    - [0x111f0, c, 111f0_len_860]
-    - [0x11a50, c, 11a50_len_7a0]
-    - [0x121f0, c, 121f0_len_1290]
-    - [0x13480, c, 13480_len_3f0]
+    - [0xd610, c, camera]
+    - [0xe8f0, c, game_modes]
+    - [0xe940, c, state_startup]
+    - [0xebd0, c, intro_logos]
+    - [0xecd0, c, state_battle]
+    - [0xf270, c, state_logos]
+    - [0xfd40, c, state_pause]
+    - [0x10400, c, state_file_select]
+    - [0x11130, c, state_world]
+    - [0x111f0, c, 111f0_len_860] # possibly still state_world
+    - [0x11a50, c, state_intro]
+    - [0x121f0, c, state_title_screen]
+    - [0x13480, c, state_demo]
     - [0x13870, c, npc]
     - [0x1a1f0, c, 1a1f0_len_5390]
     - [0x1f580, c, 1f580_len_1940]
@@ -247,21 +250,22 @@ segments:
     - [0x4DF30, c, 4DF30]
     - [0x4E5A0, data, 1000_len_60]
     - [0x4F410, .data, 1370_len_7d0]
-    - [0x4F420, .data, 1b40_len_20b0]
-    - [0x4F660, .data, 42e0_len_1f60]
+    - [0x4F420, .data, main_loop]
+    - [0x4F660, .data, rumble]
     - [0x4F670, .data, 43F0]
     - [0x4F9D0, .data, fio]
     - [0x4F9E0, data, 6e40_beginning_data]
     - [0x51540, ia8, no_controller, 128, 32]
-    - [0x52540, .data, 6e40_len_500]
-    - [0x52610, .data, 7340_len_b00]
+    - [0x52540, .data, curtains]
+    - [0x52610, .data, crash]
     - [0x527F0, .data, os/nusys/7e40_len_3f0]
     - [0x52800, .data, os/nusys/nuSiMgr]
-    - [0x52810, .data, d610_len_1330]
-    - [0x52CA0, .data, ebd0_len_6a0]
-    - [0x52D08, .data, f270_len_1190]
-    - [0x52D80, .data, 10400_len_d30]
-    - [0x52DC0, .data, 121f0_len_1290]
+    - [0x52810, .data, camera]
+    - [auto,    .data, game_modes]
+    - [0x52CA0, .data, state_battle]
+    - [0x52D08, .data, state_pause]
+    - [0x52D80, .data, state_file_select]
+    - [0x52DC0, .data, state_title_screen]
     - [0x52EE0, data] # Start of 13480_len_3f0's data
     - [0x53570, .data, 25f00_len_940]
     - [0x53590, data, 26840_len_20d0]
@@ -290,19 +294,19 @@ segments:
     - [0x70E30, .data, battle/battle]
     - [0x71430, data]
     - [0x73130, .rodata, 1060_len_310]
-    - [0x73148, .rodata, 1b40_len_20b0]
+    - [0x73148, .rodata, main_loop]
     - [0x73160, .rodata, 43F0]
-    - [0x73200, .rodata, 6e40_len_500]
-    - [0x73230, .rodata, 7340_len_b00]
+    - [0x73200, .rodata, curtains]
+    - [0x73230, .rodata, crash]
     - [0x735E0, .rodata, 8800]
     - [0x73610, .rodata, B0E0]
-    - [0x73680, .rodata, d610_len_1330]
-    - [0x73690, .rodata, f270_len_1190]
-    - [0x736E8, .rodata, 10400_len_d30]
+    - [0x73680, .rodata, camera]
+    - [0x73690, .rodata, state_logos]
+    - [0x736E8, .rodata, state_file_select]
     - [0x73720, .rodata, 111f0_len_860]
-    - [0x73738, .rodata, 11a50_len_7a0]
-    - [0x73790, .rodata, 121f0_len_1290]
-    - [0x73860, .rodata, 13480_len_3f0]
+    - [0x73738, .rodata, state_intro]
+    - [0x73790, .rodata, state_title_screen]
+    - [0x73860, .rodata, state_demo]
     - [0x73880, .rodata, npc]
     - [0x739F0, .rodata, 1a1f0_len_5390]
     - [0x73AB0, .rodata, 20ec0_len_5040]
@@ -331,7 +335,7 @@ segments:
     - [0x75978, .rodata, 4DF30]
     # bss starts at 0x8009A5B0
     # 0x800 of bss until...
-    # - [0x75240, .bss, 1b40_len_20b0]
+    # - [0x75240, .bss, main_loop]
     # - [0x75240, .bss, os/39cb0_len_100, 0x0] # size unknown
   - type: code
     start: 0x759B0