From a4c7c620e7e44031f2882ab4993ffa34af2df529 Mon Sep 17 00:00:00 2001
From: CoderStig <79828759+CoderStig@users.noreply.github.com>
Date: Sat, 4 Dec 2021 03:58:20 -0700
Subject: [PATCH 1/2] Imported remaining undefined_syms

---
 asm/bss_credits.s                             | 148 +++++++++
 asm/bss_sptask_audio.s                        | 305 +++++++++++++++++-
 .../code_80091750/func_800A8CA4.s             |   4 +-
 asm/os/osCreateViManagerPadding.s             |   5 -
 asm/os/parameters.s                           |  18 ++
 data/data_credits_128480.s                    |   1 +
 mk64.ld                                       |  15 +-
 undefined_syms.txt                            | 168 +---------
 8 files changed, 491 insertions(+), 173 deletions(-)
 create mode 100644 asm/bss_credits.s
 delete mode 100644 asm/os/osCreateViManagerPadding.s
 create mode 100644 asm/os/parameters.s

diff --git a/asm/bss_credits.s b/asm/bss_credits.s
new file mode 100644
index 000000000..016d3ae8c
--- /dev/null
+++ b/asm/bss_credits.s
@@ -0,0 +1,148 @@
+.include "macros.inc"
+
+.section .bss
+
+.skip 36
+
+glabel D_802874C4
+.skip 2
+
+glabel D_802874C6
+.skip 2
+
+glabel D_802874C8
+.skip 2
+
+glabel D_802874CA
+.skip 6
+
+glabel D_802874D0
+.skip 4
+
+glabel D_802874D4
+.skip 4
+
+glabel D_802874D8
+.skip 8
+
+glabel D_802874E0
+.skip 20
+
+glabel D_802874F4
+.skip 1
+
+glabel D_802874F5
+.skip 1
+
+glabel D_802874F6
+.skip 2
+
+glabel D_802874F8
+.skip 4
+
+glabel D_802874FC
+.skip 4
+
+glabel D_80287500
+.skip 64
+
+glabel D_80287540
+.skip 16
+
+glabel D_80287550
+.skip 4
+
+glabel D_80287554
+.skip 12
+
+glabel D_80287560
+.skip 368
+
+glabel D_802876D0
+.skip 2
+
+glabel D_802876D2
+.skip 2
+
+glabel D_802876D4
+.skip 4
+
+glabel D_802876D8
+.skip 8
+
+glabel D_802876E0
+.skip 12
+
+glabel D_802876EC
+.skip 12
+
+glabel D_802876F8
+.skip 4
+
+glabel D_802876FC
+.skip 4
+
+glabel D_80287700
+.skip 4
+
+glabel D_80287704
+.skip 12
+
+glabel D_80287710
+.skip 12
+
+glabel D_8028771C
+.skip 12
+
+glabel D_80287728
+.skip 6
+
+glabel D_8028772E
+.skip 6
+
+glabel D_80287734
+.skip 6
+
+glabel D_8028773A
+.skip 6
+
+glabel D_80287740
+.skip 4
+
+glabel D_80287744
+.skip 4
+
+glabel D_80287748
+.skip 4
+
+glabel D_8028774C
+.skip 2
+
+glabel D_8028774E
+.skip 2
+
+glabel D_80287750
+.skip 12
+
+glabel D_8028775C
+.skip 188
+
+glabel D_80287818
+.skip 12
+
+glabel D_80287824
+.skip 372
+
+glabel D_80287998
+.skip 384
+
+glabel D_80287B18
+.skip 4
+
+glabel D_80287B1C
+.skip 2
+
+glabel D_80287B1E
+.skip 2
+
+glabel D_80287B20
diff --git a/asm/bss_sptask_audio.s b/asm/bss_sptask_audio.s
index 716ab4702..2dd2a6695 100644
--- a/asm/bss_sptask_audio.s
+++ b/asm/bss_sptask_audio.s
@@ -17,4 +17,307 @@
 glabel gGfxSPTaskOutputBuffer # 0x8038FF80
 .skip 129024
 
-glabel gGfxSPTaskOutputBufferSize # 0x803AF780
\ No newline at end of file
+glabel gGfxSPTaskOutputBufferSize # 0x803AF780
+.skip 16
+
+glabel D_803AF790
+.skip 1056
+
+glabel D_803AFBB0
+.skip 16
+
+glabel D_803AFBC0
+.skip 2
+
+glabel D_803AFBC2
+.skip 1
+
+glabel D_803AFBC3
+.skip 1
+
+glabel D_803AFBC4
+.skip 4
+
+glabel D_803AFBC8
+.skip 8
+
+glabel D_803AFBD0
+.skip 8
+
+glabel D_803AFBD8
+.skip 16
+
+glabel D_803AFBE8
+.skip 48
+
+glabel D_803AFC18
+.skip 16
+
+glabel D_803AFC28
+.skip 16
+
+glabel D_803AFC38
+.skip 16
+
+glabel D_803AFC48
+.skip 4
+
+glabel D_803AFC4C
+.skip 400
+
+glabel D_803AFDDC
+.skip 4
+
+glabel D_803AFDE0
+.skip 56
+
+glabel D_803AFE18
+.skip 4
+
+glabel D_803AFE1C
+.skip 400
+
+glabel D_803AFFAC
+.skip 4
+
+glabel D_803AFFB0
+.skip 56
+
+glabel D_803AFFE8
+.skip 4
+
+glabel D_803AFFEC
+.skip 400
+
+glabel D_803B017C
+.skip 4
+
+glabel D_803B0180
+.skip 56
+
+glabel D_803B01B8
+.skip 12
+
+glabel D_803B01C4
+.skip 388
+
+glabel D_803B0348
+.skip 16
+
+glabel D_803B0358
+.skip 8
+
+glabel D_803B0360
+.skip 16
+
+glabel D_803B0370
+.skip 16
+
+glabel D_803B0380
+.skip 64
+
+glabel D_803B03C0
+.skip 64
+
+glabel D_803B0400
+.skip 256
+
+glabel D_803B0500
+.skip 1
+
+glabel D_803B0501
+.skip 3
+
+glabel D_803B0504
+.skip 4100
+
+glabel D_803B1508
+.skip 8
+
+glabel D_803B1510
+.skip 148
+
+glabel D_803B15A4
+.skip 180
+
+glabel D_803B1658
+.skip 328
+
+glabel D_803B17A0
+.skip 48
+
+glabel D_803B17D0
+.skip 280
+
+glabel D_803B18E8
+.skip 328
+
+glabel D_803B1A30
+.skip 9408
+
+glabel D_803B3EF0
+.skip 108
+
+glabel D_803B3F5C
+.skip 8084
+
+glabel D_803B5EF0
+.skip 108
+
+glabel D_803B5F5C
+.skip 92
+
+glabel D_803B5FB8
+.skip 16
+
+glabel D_803B5FC8
+.skip 16
+
+glabel D_803B5FD8
+.skip 16
+
+glabel D_803B5FE8
+.skip 16
+
+glabel D_803B5FF8
+.skip 16
+
+glabel D_803B6008
+.skip 24
+
+glabel D_803B6020
+.skip 256
+
+glabel D_803B6120
+.skip 1536
+
+glabel D_803B6720
+.skip 24
+
+glabel D_803B6738
+.skip 8
+
+glabel D_803B6740
+.skip 24
+
+glabel D_803B6758
+.skip 1792
+
+glabel D_803B6E58
+.skip 4
+
+glabel D_803B6E5C
+.skip 4
+
+glabel D_803B6E60
+.skip 8
+
+glabel D_803B6E68
+.skip 256
+
+glabel D_803B6F68
+.skip 256
+
+glabel D_803B7068
+.skip 1
+
+glabel D_803B7069
+.skip 1
+
+glabel D_803B706A
+.skip 1
+
+glabel D_803B706B
+.skip 1
+
+glabel D_803B706C
+.skip 4
+
+glabel D_803B7070
+.skip 4
+
+glabel D_803B7074
+.skip 4
+
+glabel D_803B7078
+.skip 4
+
+glabel D_803B707C
+.skip 4
+
+glabel D_803B7080
+.skip 8
+
+glabel D_803B7088
+.skip 24
+
+glabel D_803B70A0
+.skip 4
+
+glabel D_803B70A4
+.skip 4
+
+glabel D_803B70A8
+.skip 4
+
+glabel D_803B70AC
+.skip 4
+
+glabel D_803B70B0
+.skip 4
+
+glabel D_803B70B4
+.skip 2
+
+glabel D_803B70B6
+.skip 2
+
+glabel D_803B70B8
+.skip 4
+
+glabel D_803B70BC
+.skip 4
+
+glabel D_803B70C0
+.skip 4
+
+glabel D_803B70C4
+.skip 4
+
+glabel D_803B70C8
+.skip 8
+
+glabel D_803B70D0
+.skip 4
+
+glabel D_803B70D4
+.skip 4
+
+glabel D_803B70D8
+.skip 160
+
+glabel D_803B7178
+.skip 4
+
+glabel D_803B717C
+.skip 4
+
+glabel D_803B7180
+.skip 12
+
+glabel D_803B718C
+.skip 6
+
+glabel D_803B7192
+.skip 2
+
+glabel D_803B7194
+.skip 4
+
+glabel D_803B7198
+.skip 8
+
+glabel D_803B71A0
+.skip 16
+
+glabel D_803B71B0
\ No newline at end of file
diff --git a/asm/non_matchings/code_80091750/func_800A8CA4.s b/asm/non_matchings/code_80091750/func_800A8CA4.s
index d1d5464af..cabcb4fd3 100644
--- a/asm/non_matchings/code_80091750/func_800A8CA4.s
+++ b/asm/non_matchings/code_80091750/func_800A8CA4.s
@@ -18,7 +18,7 @@ glabel func_800A8CA4
 /* 0A98E4 800A8CE4 8E130010 */  lw    $s3, 0x10($s0)
 /* 0A98E8 800A8CE8 246E0008 */  addiu $t6, $v1, 8
 /* 0A98EC 800A8CEC AE2E0000 */  sw    $t6, ($s1)
-/* 0A98F0 800A8CF0 3C0FE700 */  lui   $t7, %hi(D_E6FFFFFC) # $t7, 0xe700
+/* 0A98F0 800A8CF0 3C0FE700 */  lui   $t7, 0xe700
 /* 0A98F4 800A8CF4 AC6F0000 */  sw    $t7, ($v1)
 /* 0A98F8 800A8CF8 AC600004 */  sw    $zero, 4($v1)
 /* 0A98FC 800A8CFC 8E230000 */  lw    $v1, ($s1)
@@ -60,7 +60,7 @@ glabel func_800A8CA4
 /* 0A9988 800A8D88 31CF0003 */   andi  $t7, $t6, 3
 /* 0A998C 800A8D8C 11E00002 */  beqz  $t7, .L800A8D98
 /* 0A9990 800A8D90 00000000 */   nop   
-/* 0A9994 800A8D94 25EFFFFC */  addiu $t7, %lo(D_E6FFFFFC) # addiu $t7, $t7, -4
+/* 0A9994 800A8D94 25EFFFFC */  addiu $t7, $t7, -4
 .L800A8D98:
 /* 0A9998 800A8D98 120F0011 */  beq   $s0, $t7, .L800A8DE0
 /* 0A999C 800A8D9C 240D0064 */   li    $t5, 100
diff --git a/asm/os/osCreateViManagerPadding.s b/asm/os/osCreateViManagerPadding.s
deleted file mode 100644
index c2d2eb92b..000000000
--- a/asm/os/osCreateViManagerPadding.s
+++ /dev/null
@@ -1,5 +0,0 @@
-.include "macros.inc"
-
-.section .text
-
-.skip 64
diff --git a/asm/os/parameters.s b/asm/os/parameters.s
new file mode 100644
index 000000000..3a42dfe2c
--- /dev/null
+++ b/asm/os/parameters.s
@@ -0,0 +1,18 @@
+.macro gsymbol sym addr
+.global \sym
+.set \sym, \addr
+
+nop
+nop
+
+.endm
+
+.text
+gsymbol osTvType 0x80000300
+gsymbol osRomType 0x80000304
+gsymbol osRomBase 0x80000308
+gsymbol osResetType 0x8000030C
+gsymbol osCiCId 0x80000310
+gsymbol osVersion 0x80000314
+gsymbol osMemSize 0x80000318
+gsymbol osAppNmiBuffer 0x8000031C
diff --git a/data/data_credits_128480.s b/data/data_credits_128480.s
index d376bfc05..4a11c0db4 100644
--- a/data/data_credits_128480.s
+++ b/data/data_credits_128480.s
@@ -5,6 +5,7 @@
 # Credits
 # 128480-12AAE0 [2660]
 
+# D_8028461C
 glabel D_80284E40
 .word 0x00FF4080
 .word 0x008040FF
diff --git a/mk64.ld b/mk64.ld
index cf7442cf5..cc4346616 100644
--- a/mk64.ld
+++ b/mk64.ld
@@ -101,7 +101,7 @@ SECTIONS
       BUILD_DIR/src/os/osInitialize.o(.text);
       BUILD_DIR/src/os/osStartThread.o(.text);
       BUILD_DIR/src/os/osCreateViManager.o(.text);
-      BUILD_DIR/asm/os/osCreateViManagerPadding.o(.text);
+      BUILD_DIR/asm/os/parameters.o(.text);
       BUILD_DIR/src/os/osViSetMode.o(.text);
       BUILD_DIR/src/os/osViBlack.o(.text);
       BUILD_DIR/src/os/osViSetSpecialFeatures.o(.text);
@@ -362,6 +362,19 @@ SECTIONS
    }
    END_SEG(code_80280000)
 
+   BEGIN_NOLOAD(code_80280000) {
+      BUILD_DIR/asm/bss_credits.o(.bss);
+   }
+   END_NOLOAD(code_80280000)
+
+   _code_80280000SegmentNoloadSize = SIZEOF(.code_80280000.noload) + 0x10;
+   
+   _code_80280000SegmentNoloadSizeHi = _code_80280000SegmentNoloadSize >> 16;
+   _code_80280000SegmentNoloadSizeLo = _code_80280000SegmentNoloadSize & 0xFFFF;
+
+
+
+
    /* 0x801978D0 12AAE0-132B50 [8070] */
    /* texture tables and DLs, set as segment 0x02 */
    BEGIN_SEG(data_segment2, 0x02000000)
diff --git a/undefined_syms.txt b/undefined_syms.txt
index 033c5fdc4..fbce588a4 100644
--- a/undefined_syms.txt
+++ b/undefined_syms.txt
@@ -634,22 +634,15 @@ d_course_skyscraper_vertex = 0x0F000000;
 
 
 
-osTvType = 0x80000300;
-osRomBase = 0x80000308;
-osResetType = 0x8000030C;
-osAppNmiBuffer = 0x8000031C;
 D_8000035C = 0x8000035C;
 D_80004334 = 0x80004334;
 
-D_800EA5E8 = 0x800EA5E8;
-
-D_800DFF88 = 0x800DFF88;
 
 
-D_800EB6BC = 0x800EB6BC; /* unused */
 
-D_8027FFC4 = 0x8027FFC4;
-D_80280001 = 0x80280001;
+
+
+/* conflict with funcs of same name */
 D_80282434 = 0x80282434;
 D_80283968 = 0x80283968;
 D_80283994 = 0x80283994;
@@ -681,7 +674,7 @@ D_80284184 = 0x80284184;
 D_802841E8 = 0x802841E8;
 D_802845EC = 0x802845EC;
 D_8028461C = 0x8028461C;
-
+/* eof conflict with funcs of same name */
 
 D_802874A0 = 0x802874A0; /* Very end of data_credits_128480.s unused? */
 D_802874BE = 0x802874BE; /* unused? */
@@ -710,159 +703,6 @@ d_course_moo_moo_farm_packed = 0x0f00daec;
 
 
 
-D_802874C4 = 0x802874C4;
-D_802874C6 = 0x802874C6;
-D_802874C8 = 0x802874C8;
-D_802874CA = 0x802874CA;
-D_802874D0 = 0x802874D0;
-D_802874D4 = 0x802874D4;
-D_802874D8 = 0x802874D8;
-D_802874E0 = 0x802874E0;
-D_802874F4 = 0x802874F4;
-D_802874F5 = 0x802874F5;
-D_802874F6 = 0x802874F6;
-D_802874F8 = 0x802874F8;
-D_802874FC = 0x802874FC;
-D_80287500 = 0x80287500;
-D_80287540 = 0x80287540;
-D_80287550 = 0x80287550;
-D_80287554 = 0x80287554;
-D_80287560 = 0x80287560;
-D_802876D0 = 0x802876D0;
-D_802876D2 = 0x802876D2;
-D_802876D4 = 0x802876D4;
-D_802876D8 = 0x802876D8;
-D_802876E0 = 0x802876E0;
-D_802876EC = 0x802876EC;
-D_802876F8 = 0x802876F8;
-D_802876FC = 0x802876FC;
-D_80287700 = 0x80287700;
-D_80287704 = 0x80287704;
-D_80287710 = 0x80287710;
-D_8028771C = 0x8028771C;
-D_80287728 = 0x80287728;
-D_8028772E = 0x8028772E;
-D_80287734 = 0x80287734;
-D_8028773A = 0x8028773A;
-D_80287740 = 0x80287740;
-D_80287744 = 0x80287744;
-D_80287748 = 0x80287748;
-D_8028774C = 0x8028774C;
-D_8028774E = 0x8028774E;
-D_80287750 = 0x80287750;
-D_8028775C = 0x8028775C;
-D_80287818 = 0x80287818;
-D_80287824 = 0x80287824;
-D_80287998 = 0x80287998;
-D_80287B18 = 0x80287B18;
-D_80287B1C = 0x80287B1C;
-D_80287B1E = 0x80287B1E;
-D_80287B20 = 0x80287B20;
-
-
-
-D_803AF790 = 0x803AF790;
-D_803AFBB0 = 0x803AFBB0;
-D_803AFBC0 = 0x803AFBC0;
-D_803AFBC2 = 0x803AFBC2;
-D_803AFBC3 = 0x803AFBC3;
-D_803AFBC4 = 0x803AFBC4;
-D_803AFBC8 = 0x803AFBC8;
-D_803AFBD0 = 0x803AFBD0;
-D_803AFBD8 = 0x803AFBD8;
-D_803AFBE8 = 0x803AFBE8;
-D_803AFC18 = 0x803AFC18;
-D_803AFC28 = 0x803AFC28;
-D_803AFC38 = 0x803AFC38;
-D_803AFC48 = 0x803AFC48;
-D_803AFC4C = 0x803AFC4C;
-D_803AFDDC = 0x803AFDDC;
-D_803AFDE0 = 0x803AFDE0;
-D_803AFE18 = 0x803AFE18;
-D_803AFE1C = 0x803AFE1C;
-D_803AFFAC = 0x803AFFAC;
-D_803AFFB0 = 0x803AFFB0;
-D_803AFFE8 = 0x803AFFE8;
-D_803AFFEC = 0x803AFFEC;
-D_803B017C = 0x803B017C;
-D_803B0180 = 0x803B0180;
-D_803B01B8 = 0x803B01B8;
-D_803B01C4 = 0x803B01C4;
-D_803B0348 = 0x803B0348;
-D_803B0358 = 0x803B0358;
-D_803B0360 = 0x803B0360;
-D_803B0370 = 0x803B0370;
-D_803B0380 = 0x803B0380;
-D_803B03C0 = 0x803B03C0;
-D_803B0400 = 0x803B0400;
-D_803B0500 = 0x803B0500;
-D_803B0501 = 0x803B0501;
-D_803B0504 = 0x803B0504;
-D_803B1508 = 0x803B1508;
-D_803B1510 = 0x803B1510;
-D_803B15A4 = 0x803B15A4;
-D_803B1658 = 0x803B1658;
-D_803B17A0 = 0x803B17A0;
-D_803B17D0 = 0x803B17D0;
-D_803B18E8 = 0x803B18E8;
-D_803B1A30 = 0x803B1A30;
-D_803B3EF0 = 0x803B3EF0;
-D_803B3F5C = 0x803B3F5C;
-D_803B5EF0 = 0x803B5EF0;
-D_803B5F5C = 0x803B5F5C;
-D_803B5FB8 = 0x803B5FB8;
-D_803B5FC8 = 0x803B5FC8;
-D_803B5FD8 = 0x803B5FD8;
-D_803B5FE8 = 0x803B5FE8;
-D_803B5FF8 = 0x803B5FF8;
-D_803B6008 = 0x803B6008;
-D_803B6020 = 0x803B6020;
-D_803B6120 = 0x803B6120;
-D_803B6720 = 0x803B6720;
-D_803B6738 = 0x803B6738;
-D_803B6740 = 0x803B6740;
-D_803B6758 = 0x803B6758;
-D_803B6E58 = 0x803B6E58;
-D_803B6E5C = 0x803B6E5C;
-D_803B6E60 = 0x803B6E60;
-D_803B6E68 = 0x803B6E68;
-D_803B6F68 = 0x803B6F68;
-D_803B7068 = 0x803B7068;
-D_803B7069 = 0x803B7069;
-D_803B706A = 0x803B706A;
-D_803B706B = 0x803B706B;
-D_803B706C = 0x803B706C;
-D_803B7070 = 0x803B7070;
-D_803B7074 = 0x803B7074;
-D_803B7078 = 0x803B7078;
-D_803B707C = 0x803B707C;
-D_803B7080 = 0x803B7080;
-D_803B7088 = 0x803B7088;
-D_803B70A0 = 0x803B70A0;
-D_803B70A4 = 0x803B70A4;
-D_803B70A8 = 0x803B70A8;
-D_803B70AC = 0x803B70AC;
-D_803B70B0 = 0x803B70B0;
-D_803B70B4 = 0x803B70B4;
-D_803B70B6 = 0x803B70B6;
-D_803B70B8 = 0x803B70B8;
-D_803B70BC = 0x803B70BC;
-D_803B70C0 = 0x803B70C0;
-D_803B70C4 = 0x803B70C4;
-D_803B70C8 = 0x803B70C8;
-D_803B70D0 = 0x803B70D0;
-D_803B70D4 = 0x803B70D4;
-D_803B70D8 = 0x803B70D8;
-D_803B7178 = 0x803B7178;
-D_803B717C = 0x803B717C;
-D_803B7180 = 0x803B7180;
-D_803B718C = 0x803B718C;
-D_803B7192 = 0x803B7192;
-D_803B7194 = 0x803B7194;
-D_803B7198 = 0x803B7198;
-D_803B71A0 = 0x803B71A0;
-D_803B71B0 = 0x803B71B0;
-
 
 
 

From 1ca7ea1061977e7cdd6808394a1b070b2065f41f Mon Sep 17 00:00:00 2001
From: CoderStig <79828759+CoderStig@users.noreply.github.com>
Date: Sun, 5 Dec 2021 03:24:28 -0700
Subject: [PATCH 2/2] Imported remaining .text undefined syms

---
 asm/bss_80005FD0.s                            |   1 +
 asm/bss_8028DF00.s                            |   1 +
 asm/bss_credits.s                             |   6 +-
 asm/bss_sptask_audio.s                        |   6 +-
 .../code_8008C1D0/code_8008C1D0.s             |   8 +-
 .../code_8008C1D0/func_80090970.s             |   8 +-
 .../code_80281FA0/func_80282D90.s             |  51 --
 .../code_80281FA0/func_80282E58.s             |  22 -
 .../code_80281FA0/func_80282F00.s             |  19 -
 .../code_80281FA0/func_80283330.s             |  17 -
 .../code_80281FA0/func_80283428.s             |   3 -
 .../code_80281FA0/func_80283968.s             |  12 -
 .../code_80281FA0/func_80283994.s             |   9 -
 .../code_80281FA0/func_802839B4.s             |   7 -
 .../code_80281FA0/func_802839CC.s             |   6 -
 .../code_80281FA0/func_802839E0.s             |   9 -
 .../code_80281FA0/func_80283A00.s             |  15 -
 .../code_80281FA0/func_80283A34.s             |   9 -
 .../code_80281FA0/func_80283A54.s             |  11 -
 .../code_80281FA0/func_80283A7C.s             |  11 -
 .../code_80281FA0/func_80283AA4.s             |  11 -
 .../code_80281FA0/func_80283ACC.s             |  11 -
 .../code_80281FA0/func_80283AF4.s             |  11 -
 .../code_80281FA0/func_80283B1C.s             |  11 -
 .../code_80281FA0/func_80283B44.s             |  11 -
 .../code_80281FA0/func_80283B6C.s             |  15 -
 .../code_80281FA0/func_80283BA4.s             |  20 -
 .../code_80281FA0/func_80283BF0.s             |  10 -
 .../code_80281FA0/func_80283C14.s             |  10 -
 .../code_80281FA0/func_80283C38.s             |   9 -
 .../code_80281FA0/func_80283C58.s             |   9 -
 .../code_80281FA0/func_80283C78.s             |  14 -
 .../code_80281FA0/func_80283CA8.s             |  11 -
 .../code_80281FA0/func_80283CD0.s             |  15 -
 .../code_80281FA0/func_80283D04.s             |  11 -
 .../code_80281FA0/func_80283D2C.s             |  94 ---
 .../code_80281FA0/func_80283EA0.s             |  13 -
 .../code_80281FA0/func_80283ED0.s             |  11 -
 .../code_80281FA0/func_80283F6C.s             |  25 -
 .../code_80281FA0/func_80283FCC.s             |  11 -
 .../code_80281FA0/func_80284068.s             |  25 -
 .../code_80281FA0/func_802840C8.s             |  40 -
 .../code_80281FA0/func_80284154.s             |  13 -
 .../code_80281FA0/func_802841E8.s             |  18 -
 .../code_80281FA0/func_8028422C.s             |  32 -
 .../code_80281FA0/func_802842A8.s             |  13 -
 .../code_80281FA0/func_802842D8.s             |  13 -
 .../code_80281FA0/func_80284308.s             |   4 +-
 .../code_80281FA0/func_80284418.s             |  32 -
 .../code_80281FA0/func_80284494.s             |  27 -
 .../code_80281FA0/func_802844FC.s             |  21 -
 .../code_80281FA0/func_8028454C.s             |  41 --
 .../code_80281FA0/func_802845EC.s             |  13 -
 .../code_80281FA0/func_8028461C.s             |  12 -
 .../code_80281FA0/func_80284648.s             |  26 -
 .../code_80281FA0/func_802846AC.s             |   3 -
 .../code_80281FA0/func_802846B4.s             |  13 -
 .../code_80281FA0/func_802847CC.s             |  44 +-
 data/data_0DD0A0_2_1.s                        |   2 -
 data/data_credits_128480.s                    |  12 +-
 include/types.h                               |   7 +
 mk64.ld                                       |   1 +
 src/audio/data.c                              |   2 +-
 src/code_8001F980.c                           |  16 +
 src/code_8008C1D0.c                           |   3 +
 src/code_80281FA0.c                           | 697 ++++--------------
 src/main.c                                    |   8 +-
 undefined_syms.txt                            |  43 --
 68 files changed, 239 insertions(+), 1506 deletions(-)
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80282D90.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80282E58.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80282F00.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283330.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283428.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283968.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283994.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_802839B4.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_802839CC.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_802839E0.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283A00.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283A34.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283A54.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283A7C.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283AA4.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283ACC.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283AF4.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283B1C.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283B44.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283B6C.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283BA4.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283BF0.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283C14.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283C38.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283C58.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283C78.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283CA8.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283CD0.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283D04.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283D2C.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283EA0.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283ED0.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283F6C.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80283FCC.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80284068.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_802840C8.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80284154.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_802841E8.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_8028422C.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_802842A8.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_802842D8.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80284418.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80284494.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_802844FC.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_8028454C.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_802845EC.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_8028461C.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_80284648.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_802846AC.s
 delete mode 100644 asm/non_matchings/code_80281FA0/func_802846B4.s

diff --git a/asm/bss_80005FD0.s b/asm/bss_80005FD0.s
index 39c4ac0e5..596806574 100644
--- a/asm/bss_80005FD0.s
+++ b/asm/bss_80005FD0.s
@@ -2,6 +2,7 @@
 
 .section .bss
 .skip 96
+
 glabel D_80162E70
 .skip 64
 
diff --git a/asm/bss_8028DF00.s b/asm/bss_8028DF00.s
index 1084e99f1..920a0219d 100644
--- a/asm/bss_8028DF00.s
+++ b/asm/bss_8028DF00.s
@@ -55,3 +55,4 @@ glabel D_802BA260
 
 #glabel gZBuffer
 #.skip 153600
+
diff --git a/asm/bss_credits.s b/asm/bss_credits.s
index 016d3ae8c..761a4954e 100644
--- a/asm/bss_credits.s
+++ b/asm/bss_credits.s
@@ -2,7 +2,11 @@
 
 .section .bss
 
-.skip 36
+glabel D_802874A0
+.skip 30
+
+glabel D_802874BE
+.skip 6
 
 glabel D_802874C4
 .skip 2
diff --git a/asm/bss_sptask_audio.s b/asm/bss_sptask_audio.s
index 2dd2a6695..8ba23d19f 100644
--- a/asm/bss_sptask_audio.s
+++ b/asm/bss_sptask_audio.s
@@ -38,6 +38,9 @@ glabel D_803AFBC3
 glabel D_803AFBC4
 .skip 4
 
+
+
+
 glabel D_803AFBC8
 .skip 8
 
@@ -320,4 +323,5 @@ glabel D_803B7198
 glabel D_803B71A0
 .skip 16
 
-glabel D_803B71B0
\ No newline at end of file
+glabel D_803B71B0
+
diff --git a/asm/non_matchings/code_8008C1D0/code_8008C1D0.s b/asm/non_matchings/code_8008C1D0/code_8008C1D0.s
index 71327bd8a..caf551bbc 100644
--- a/asm/non_matchings/code_8008C1D0/code_8008C1D0.s
+++ b/asm/non_matchings/code_8008C1D0/code_8008C1D0.s
@@ -4528,11 +4528,11 @@ glabel L800909D0
 .L80090B58:
 /* 091758 80090B58 8E0800BC */  lw    $t0, 0xbc($s0)
 .L80090B5C:
-/* 09175C 80090B5C 3C028000 */  lui   $v0, %hi(D_80004334) # 0x8000
+/* 09175C 80090B5C 3C028000 */  lui   $v0, 0x8000
 /* 091760 80090B60 02002025 */  move  $a0, $s0
 /* 091764 80090B64 01024824 */  and   $t1, $t0, $v0
 /* 091768 80090B68 54490120 */  bnel  $v0, $t1, .L80090FEC
-/* 09176C 80090B6C 3C014334 */   lui   $at, %lo(D_80004334) # 0x4334
+/* 09176C 80090B6C 3C014334 */   lui   $at, 0x4334
 /* 091770 80090B70 0C023ECC */  jal   func_8008FB30
 /* 091774 80090B74 83A5005F */   lb    $a1, 0x5f($sp)
 /* 091778 80090B78 1000011C */  b     .L80090FEC
@@ -4780,9 +4780,9 @@ glabel L80090E08
 /* 091B10 80090F10 304C0008 */  andi  $t4, $v0, 8
 /* 091B14 80090F14 15810004 */  bne   $t4, $at, .L80090F28
 /* 091B18 80090F18 A60F00C8 */   sh    $t7, 0xc8($s0)
-/* 091B1C 80090F1C 30588000 */  andi  $t8, $v0, %hi(D_80004334) # 0x8000
+/* 091B1C 80090F1C 30588000 */  andi  $t8, $v0, 0x8000
 /* 091B20 80090F20 53000032 */  beql  $t8, $zero, .L80090FEC
-/* 091B24 80090F24 3C014334 */   lui   $at, %lo(D_80004334) # 0x4334
+/* 091B24 80090F24 3C014334 */   lui   $at, 0x4334
 .L80090F28:
 /* 091B28 80090F28 861900CA */  lh    $t9, 0xca($s0)
 /* 091B2C 80090F2C 860900C8 */  lh    $t1, 0xc8($s0)
diff --git a/asm/non_matchings/code_8008C1D0/func_80090970.s b/asm/non_matchings/code_8008C1D0/func_80090970.s
index 33321bac7..57c8186ed 100644
--- a/asm/non_matchings/code_8008C1D0/func_80090970.s
+++ b/asm/non_matchings/code_8008C1D0/func_80090970.s
@@ -128,11 +128,11 @@ glabel L800909D0
 .L80090B58:
 /* 091758 80090B58 8E0800BC */  lw    $t0, 0xbc($s0)
 .L80090B5C:
-/* 09175C 80090B5C 3C028000 */  lui   $v0, %hi(D_80004334) # 0x8000
+/* 09175C 80090B5C 3C028000 */  lui   $v0, 0x8000
 /* 091760 80090B60 02002025 */  move  $a0, $s0
 /* 091764 80090B64 01024824 */  and   $t1, $t0, $v0
 /* 091768 80090B68 54490120 */  bnel  $v0, $t1, .L80090FEC
-/* 09176C 80090B6C 3C014334 */   lui   $at, %lo(D_80004334) # 0x4334
+/* 09176C 80090B6C 3C014334 */   lui   $at, 0x4334
 /* 091770 80090B70 0C023ECC */  jal   func_8008FB30
 /* 091774 80090B74 83A5005F */   lb    $a1, 0x5f($sp)
 /* 091778 80090B78 1000011C */  b     .L80090FEC
@@ -380,9 +380,9 @@ glabel L80090E08
 /* 091B10 80090F10 304C0008 */  andi  $t4, $v0, 8
 /* 091B14 80090F14 15810004 */  bne   $t4, $at, .L80090F28
 /* 091B18 80090F18 A60F00C8 */   sh    $t7, 0xc8($s0)
-/* 091B1C 80090F1C 30588000 */  andi  $t8, $v0, %hi(D_80004334) # 0x8000
+/* 091B1C 80090F1C 30588000 */  andi  $t8, $v0, 0x8000
 /* 091B20 80090F20 53000032 */  beql  $t8, $zero, .L80090FEC
-/* 091B24 80090F24 3C014334 */   lui   $at, %lo(D_80004334) # 0x4334
+/* 091B24 80090F24 3C014334 */   lui   $at, 0x4334
 .L80090F28:
 /* 091B28 80090F28 861900CA */  lh    $t9, 0xca($s0)
 /* 091B2C 80090F2C 860900C8 */  lh    $t1, 0xc8($s0)
diff --git a/asm/non_matchings/code_80281FA0/func_80282D90.s b/asm/non_matchings/code_80281FA0/func_80282D90.s
deleted file mode 100644
index 3a49a5c9d..000000000
--- a/asm/non_matchings/code_80281FA0/func_80282D90.s
+++ /dev/null
@@ -1,51 +0,0 @@
-glabel func_80282D90
-/* 1263D0 80282D90 27BDFFD0 */  addiu $sp, $sp, -0x30
-/* 1263D4 80282D94 AFA40030 */  sw    $a0, 0x30($sp)
-/* 1263D8 80282D98 AFBF001C */  sw    $ra, 0x1c($sp)
-/* 1263DC 80282D9C AFA50034 */  sw    $a1, 0x34($sp)
-/* 1263E0 80282DA0 AFA60038 */  sw    $a2, 0x38($sp)
-/* 1263E4 80282DA4 AFA7003C */  sw    $a3, 0x3c($sp)
-/* 1263E8 80282DA8 3C048028 */  lui   $a0, %hi(D_80282434) # $a0, 0x8028
-/* 1263EC 80282DAC 24842434 */  addiu $a0, %lo(D_80282434) # addiu $a0, $a0, 0x2434
-/* 1263F0 80282DB0 00003825 */  move  $a3, $zero
-/* 1263F4 80282DB4 00003025 */  move  $a2, $zero
-/* 1263F8 80282DB8 0C0A0CB1 */  jal   func_802832C4
-/* 1263FC 80282DBC 8FA50030 */   lw    $a1, 0x30($sp)
-/* 126400 80282DC0 3C048028 */  lui   $a0, %hi(D_80287818) # $a0, 0x8028
-/* 126404 80282DC4 24847818 */  addiu $a0, %lo(D_80287818) # addiu $a0, $a0, 0x7818
-/* 126408 80282DC8 8FA50034 */  lw    $a1, 0x34($sp)
-/* 12640C 80282DCC 0C0A0B10 */  jal   func_80282C40
-/* 126410 80282DD0 8FA6003C */   lw    $a2, 0x3c($sp)
-/* 126414 80282DD4 3C048028 */  lui   $a0, %hi(D_80287998) # $a0, 0x8028
-/* 126418 80282DD8 24847998 */  addiu $a0, %lo(D_80287998) # addiu $a0, $a0, 0x7998
-/* 12641C 80282DDC 8FA50038 */  lw    $a1, 0x38($sp)
-/* 126420 80282DE0 0C0A0B10 */  jal   func_80282C40
-/* 126424 80282DE4 8FA6003C */   lw    $a2, 0x3c($sp)
-/* 126428 80282DE8 8FA20030 */  lw    $v0, 0x30($sp)
-/* 12642C 80282DEC 3C0E8028 */  lui   $t6, %hi(D_80287B18) # $t6, 0x8028
-/* 126430 80282DF0 25CE7B18 */  addiu $t6, %lo(D_80287B18) # addiu $t6, $t6, 0x7b18
-/* 126434 80282DF4 3C068028 */  lui   $a2, %hi(D_80287818) # $a2, 0x8028
-/* 126438 80282DF8 3C078028 */  lui   $a3, %hi(D_80287B1C) # $a3, 0x8028
-/* 12643C 80282DFC 24450018 */  addiu $a1, $v0, 0x18
-/* 126440 80282E00 AFA50024 */  sw    $a1, 0x24($sp)
-/* 126444 80282E04 24E77B1C */  addiu $a3, %lo(D_80287B1C) # addiu $a3, $a3, 0x7b1c
-/* 126448 80282E08 24C67818 */  addiu $a2, %lo(D_80287818) # addiu $a2, $a2, 0x7818
-/* 12644C 80282E0C AFAE0010 */  sw    $t6, 0x10($sp)
-/* 126450 80282E10 0C0A0A32 */  jal   func_802828C8
-/* 126454 80282E14 2444000C */   addiu $a0, $v0, 0xc
-/* 126458 80282E18 3C0F8028 */  lui   $t7, %hi(D_80287B18) # $t7, 0x8028
-/* 12645C 80282E1C 25EF7B18 */  addiu $t7, %lo(D_80287B18) # addiu $t7, $t7, 0x7b18
-/* 126460 80282E20 3C068028 */  lui   $a2, %hi(D_80287998) # $a2, 0x8028
-/* 126464 80282E24 3C078028 */  lui   $a3, %hi(D_80287B1C) # $a3, 0x8028
-/* 126468 80282E28 24E77B1C */  addiu $a3, %lo(D_80287B1C) # addiu $a3, $a3, 0x7b1c
-/* 12646C 80282E2C 24C67998 */  addiu $a2, %lo(D_80287998) # addiu $a2, $a2, 0x7998
-/* 126470 80282E30 AFAF0010 */  sw    $t7, 0x10($sp)
-/* 126474 80282E34 8FA50024 */  lw    $a1, 0x24($sp)
-/* 126478 80282E38 AFA20028 */  sw    $v0, 0x28($sp)
-/* 12647C 80282E3C 0C0A0A32 */  jal   func_802828C8
-/* 126480 80282E40 8FA40030 */   lw    $a0, 0x30($sp)
-/* 126484 80282E44 8FBF001C */  lw    $ra, 0x1c($sp)
-/* 126488 80282E48 8FB80028 */  lw    $t8, 0x28($sp)
-/* 12648C 80282E4C 27BD0030 */  addiu $sp, $sp, 0x30
-/* 126490 80282E50 03E00008 */  jr    $ra
-/* 126494 80282E54 00581025 */   or    $v0, $v0, $t8
diff --git a/asm/non_matchings/code_80281FA0/func_80282E58.s b/asm/non_matchings/code_80281FA0/func_80282E58.s
deleted file mode 100644
index fbeb0b767..000000000
--- a/asm/non_matchings/code_80281FA0/func_80282E58.s
+++ /dev/null
@@ -1,22 +0,0 @@
-glabel func_80282E58
-/* 126498 80282E58 27BDFFE0 */  addiu $sp, $sp, -0x20
-/* 12649C 80282E5C AFA40020 */  sw    $a0, 0x20($sp)
-/* 1264A0 80282E60 AFBF001C */  sw    $ra, 0x1c($sp)
-/* 1264A4 80282E64 3C048028 */  lui   $a0, %hi(D_80287818) # $a0, 0x8028
-/* 1264A8 80282E68 0C0A0B10 */  jal   func_80282C40
-/* 1264AC 80282E6C 24847818 */   addiu $a0, %lo(D_80287818) # addiu $a0, $a0, 0x7818
-/* 1264B0 80282E70 8FA20020 */  lw    $v0, 0x20($sp)
-/* 1264B4 80282E74 3C0E8028 */  lui   $t6, %hi(D_80287B18) # $t6, 0x8028
-/* 1264B8 80282E78 25CE7B18 */  addiu $t6, %lo(D_80287B18) # addiu $t6, $t6, 0x7b18
-/* 1264BC 80282E7C 3C068028 */  lui   $a2, %hi(D_80287818) # $a2, 0x8028
-/* 1264C0 80282E80 3C078028 */  lui   $a3, %hi(D_80287B1C) # $a3, 0x8028
-/* 1264C4 80282E84 24E77B1C */  addiu $a3, %lo(D_80287B1C) # addiu $a3, $a3, 0x7b1c
-/* 1264C8 80282E88 24C67818 */  addiu $a2, %lo(D_80287818) # addiu $a2, $a2, 0x7818
-/* 1264CC 80282E8C AFAE0010 */  sw    $t6, 0x10($sp)
-/* 1264D0 80282E90 2444000C */  addiu $a0, $v0, 0xc
-/* 1264D4 80282E94 0C0A0A32 */  jal   func_802828C8
-/* 1264D8 80282E98 24450018 */   addiu $a1, $v0, 0x18
-/* 1264DC 80282E9C 8FBF001C */  lw    $ra, 0x1c($sp)
-/* 1264E0 80282EA0 27BD0020 */  addiu $sp, $sp, 0x20
-/* 1264E4 80282EA4 03E00008 */  jr    $ra
-/* 1264E8 80282EA8 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80282F00.s b/asm/non_matchings/code_80281FA0/func_80282F00.s
deleted file mode 100644
index 49ef9d162..000000000
--- a/asm/non_matchings/code_80281FA0/func_80282F00.s
+++ /dev/null
@@ -1,19 +0,0 @@
-glabel func_80282F00
-/* 126540 80282F00 AFA50004 */  sw    $a1, 4($sp)
-/* 126544 80282F04 00057400 */  sll   $t6, $a1, 0x10
-/* 126548 80282F08 000E2C03 */  sra   $a1, $t6, 0x10
-/* 12654C 80282F0C 24018000 */  li    $at, -32768
-/* 126550 80282F10 54A10008 */  bnel  $a1, $at, .L80282F34
-/* 126554 80282F14 84890000 */   lh    $t1, ($a0)
-/* 126558 80282F18 84980000 */  lh    $t8, ($a0)
-/* 12655C 80282F1C 3401C000 */  li    $at, 49152
-/* 126560 80282F20 33198000 */  andi  $t9, $t8, 0x8000
-/* 126564 80282F24 03214021 */  addu  $t0, $t9, $at
-/* 126568 80282F28 03E00008 */  jr    $ra
-/* 12656C 80282F2C A4880000 */   sh    $t0, ($a0)
-/* 126570 80282F30 84890000 */  lh    $t1, ($a0)
-.L80282F34:
-/* 126574 80282F34 01255021 */  addu  $t2, $t1, $a1
-/* 126578 80282F38 A48A0000 */  sh    $t2, ($a0)
-/* 12657C 80282F3C 03E00008 */  jr    $ra
-/* 126580 80282F40 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80283330.s b/asm/non_matchings/code_80281FA0/func_80283330.s
deleted file mode 100644
index 412d915d4..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283330.s
+++ /dev/null
@@ -1,17 +0,0 @@
-glabel func_80283330
-/* 126970 80283330 3C028028 */  lui   $v0, %hi(D_802876D8) # $v0, 0x8028
-/* 126974 80283334 244276D8 */  addiu $v0, %lo(D_802876D8) # addiu $v0, $v0, 0x76d8
-/* 126978 80283338 8C430000 */  lw    $v1, ($v0)
-/* 12697C 8028333C 3C018028 */  lui   $at, %hi(D_802876D0) # $at, 0x8028
-/* 126980 80283340 10830008 */  beq   $a0, $v1, .L80283364
-/* 126984 80283344 00000000 */   nop   
-/* 126988 80283348 AC440000 */  sw    $a0, ($v0)
-/* 12698C 8028334C A42076D0 */  sh    $zero, %lo(D_802876D0)($at)
-/* 126990 80283350 3C018028 */  lui   $at, %hi(D_802876D2) # $at, 0x8028
-/* 126994 80283354 A42076D2 */  sh    $zero, %lo(D_802876D2)($at)
-/* 126998 80283358 3C018028 */  lui   $at, %hi(D_802876D4) # $at, 0x8028
-/* 12699C 8028335C AC2076D4 */  sw    $zero, %lo(D_802876D4)($at)
-/* 1269A0 80283360 8C430000 */  lw    $v1, ($v0)
-.L80283364:
-/* 1269A4 80283364 03E00008 */  jr    $ra
-/* 1269A8 80283368 00601025 */   move  $v0, $v1
diff --git a/asm/non_matchings/code_80281FA0/func_80283428.s b/asm/non_matchings/code_80281FA0/func_80283428.s
deleted file mode 100644
index 57e0976b9..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283428.s
+++ /dev/null
@@ -1,3 +0,0 @@
-glabel func_80283428
-/* 126A68 80283428 03E00008 */  jr    $ra
-/* 126A6C 8028342C 00001025 */   move  $v0, $zero
diff --git a/asm/non_matchings/code_80281FA0/func_80283968.s b/asm/non_matchings/code_80281FA0/func_80283968.s
deleted file mode 100644
index 02e3979e9..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283968.s
+++ /dev/null
@@ -1,12 +0,0 @@
-glabel func_80283968
-/* 126FA8 80283968 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 126FAC 8028396C AFBF0014 */  sw    $ra, 0x14($sp)
-/* 126FB0 80283970 AFA40018 */  sw    $a0, 0x18($sp)
-/* 126FB4 80283974 2404F394 */  li    $a0, -3180
-/* 126FB8 80283978 240500D2 */  li    $a1, 210
-/* 126FBC 8028397C 0C0A0403 */  jal   func_8028100C
-/* 126FC0 80283980 2406FE11 */   li    $a2, -495
-/* 126FC4 80283984 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 126FC8 80283988 27BD0018 */  addiu $sp, $sp, 0x18
-/* 126FCC 8028398C 03E00008 */  jr    $ra
-/* 126FD0 80283990 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80283994.s b/asm/non_matchings/code_80281FA0/func_80283994.s
deleted file mode 100644
index cfbcf654c..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283994.s
+++ /dev/null
@@ -1,9 +0,0 @@
-glabel func_80283994
-/* 126FD4 80283994 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 126FD8 80283998 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 126FDC 8028399C 0C0A03FF */  jal   func_80280FFC
-/* 126FE0 802839A0 AFA40018 */   sw    $a0, 0x18($sp)
-/* 126FE4 802839A4 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 126FE8 802839A8 27BD0018 */  addiu $sp, $sp, 0x18
-/* 126FEC 802839AC 03E00008 */  jr    $ra
-/* 126FF0 802839B0 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_802839B4.s b/asm/non_matchings/code_80281FA0/func_802839B4.s
deleted file mode 100644
index 870319619..000000000
--- a/asm/non_matchings/code_80281FA0/func_802839B4.s
+++ /dev/null
@@ -1,7 +0,0 @@
-glabel func_802839B4
-/* 126FF4 802839B4 3C014250 */  li    $at, 0x42500000 # 52.000000
-/* 126FF8 802839B8 44812000 */  mtc1  $at, $f4
-/* 126FFC 802839BC 3C018028 */  lui   $at, %hi(D_802856B8)
-/* 127000 802839C0 AFA40000 */  sw    $a0, ($sp)
-/* 127004 802839C4 03E00008 */  jr    $ra
-/* 127008 802839C8 E42456B8 */   swc1  $f4, %lo(D_802856B8)($at)
diff --git a/asm/non_matchings/code_80281FA0/func_802839CC.s b/asm/non_matchings/code_80281FA0/func_802839CC.s
deleted file mode 100644
index 6d2592902..000000000
--- a/asm/non_matchings/code_80281FA0/func_802839CC.s
+++ /dev/null
@@ -1,6 +0,0 @@
-glabel func_802839CC
-/* 12700C 802839CC 44802000 */  mtc1  $zero, $f4
-/* 127010 802839D0 3C018028 */  lui   $at, %hi(D_802856B8)
-/* 127014 802839D4 AFA40000 */  sw    $a0, ($sp)
-/* 127018 802839D8 03E00008 */  jr    $ra
-/* 12701C 802839DC E42456B8 */   swc1  $f4, %lo(D_802856B8)($at)
diff --git a/asm/non_matchings/code_80281FA0/func_802839E0.s b/asm/non_matchings/code_80281FA0/func_802839E0.s
deleted file mode 100644
index c30fcab42..000000000
--- a/asm/non_matchings/code_80281FA0/func_802839E0.s
+++ /dev/null
@@ -1,9 +0,0 @@
-glabel func_802839E0
-/* 127020 802839E0 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 127024 802839E4 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 127028 802839E8 0C024B20 */  jal   func_80092C80
-/* 12702C 802839EC AFA40018 */   sw    $a0, 0x18($sp)
-/* 127030 802839F0 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 127034 802839F4 27BD0018 */  addiu $sp, $sp, 0x18
-/* 127038 802839F8 03E00008 */  jr    $ra
-/* 12703C 802839FC 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80283A00.s b/asm/non_matchings/code_80281FA0/func_80283A00.s
deleted file mode 100644
index 0accd47e2..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283A00.s
+++ /dev/null
@@ -1,15 +0,0 @@
-glabel func_80283A00
-/* 127040 80283A00 3C0E800E */  lui   $t6, %hi(D_800DC5E4) # $t6, 0x800e
-/* 127044 80283A04 95CEC5E4 */  lhu   $t6, %lo(D_800DC5E4)($t6)
-/* 127048 80283A08 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 12704C 80283A0C AFBF0014 */  sw    $ra, 0x14($sp)
-/* 127050 80283A10 15C00004 */  bnez  $t6, .L80283A24
-/* 127054 80283A14 AFA40018 */   sw    $a0, 0x18($sp)
-/* 127058 80283A18 3C044900 */  lui   $a0, (0x49009009 >> 16) # lui $a0, 0x4900
-/* 12705C 80283A1C 0C032384 */  jal   play_sound2
-/* 127060 80283A20 34849009 */   ori   $a0, (0x49009009 & 0xFFFF) # ori $a0, $a0, 0x9009
-.L80283A24:
-/* 127064 80283A24 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 127068 80283A28 27BD0018 */  addiu $sp, $sp, 0x18
-/* 12706C 80283A2C 03E00008 */  jr    $ra
-/* 127070 80283A30 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80283A34.s b/asm/non_matchings/code_80281FA0/func_80283A34.s
deleted file mode 100644
index 32c0153f8..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283A34.s
+++ /dev/null
@@ -1,9 +0,0 @@
-glabel func_80283A34
-/* 127074 80283A34 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 127078 80283A38 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 12707C 80283A3C 0C032833 */  jal   func_800CA0CC
-/* 127080 80283A40 AFA40018 */   sw    $a0, 0x18($sp)
-/* 127084 80283A44 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 127088 80283A48 27BD0018 */  addiu $sp, $sp, 0x18
-/* 12708C 80283A4C 03E00008 */  jr    $ra
-/* 127090 80283A50 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80283A54.s b/asm/non_matchings/code_80281FA0/func_80283A54.s
deleted file mode 100644
index 111dbf1cc..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283A54.s
+++ /dev/null
@@ -1,11 +0,0 @@
-glabel func_80283A54
-/* 127094 80283A54 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 127098 80283A58 AFA40018 */  sw    $a0, 0x18($sp)
-/* 12709C 80283A5C AFBF0014 */  sw    $ra, 0x14($sp)
-/* 1270A0 80283A60 3C044900 */  lui   $a0, (0x49009014 >> 16) # lui $a0, 0x4900
-/* 1270A4 80283A64 0C032384 */  jal   play_sound2
-/* 1270A8 80283A68 34849014 */   ori   $a0, (0x49009014 & 0xFFFF) # ori $a0, $a0, 0x9014
-/* 1270AC 80283A6C 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 1270B0 80283A70 27BD0018 */  addiu $sp, $sp, 0x18
-/* 1270B4 80283A74 03E00008 */  jr    $ra
-/* 1270B8 80283A78 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80283A7C.s b/asm/non_matchings/code_80281FA0/func_80283A7C.s
deleted file mode 100644
index 0d2c16647..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283A7C.s
+++ /dev/null
@@ -1,11 +0,0 @@
-glabel func_80283A7C
-/* 1270BC 80283A7C 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 1270C0 80283A80 AFA40018 */  sw    $a0, 0x18($sp)
-/* 1270C4 80283A84 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 1270C8 80283A88 3C044900 */  lui   $a0, (0x4900801E >> 16) # lui $a0, 0x4900
-/* 1270CC 80283A8C 0C032384 */  jal   play_sound2
-/* 1270D0 80283A90 3484801E */   ori   $a0, (0x4900801E & 0xFFFF) # ori $a0, $a0, 0x801e
-/* 1270D4 80283A94 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 1270D8 80283A98 27BD0018 */  addiu $sp, $sp, 0x18
-/* 1270DC 80283A9C 03E00008 */  jr    $ra
-/* 1270E0 80283AA0 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80283AA4.s b/asm/non_matchings/code_80281FA0/func_80283AA4.s
deleted file mode 100644
index 965de8d57..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283AA4.s
+++ /dev/null
@@ -1,11 +0,0 @@
-glabel func_80283AA4
-/* 1270E4 80283AA4 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 1270E8 80283AA8 AFA40018 */  sw    $a0, 0x18($sp)
-/* 1270EC 80283AAC AFBF0014 */  sw    $ra, 0x14($sp)
-/* 1270F0 80283AB0 3C044900 */  lui   $a0, (0x4900801F >> 16) # lui $a0, 0x4900
-/* 1270F4 80283AB4 0C032384 */  jal   play_sound2
-/* 1270F8 80283AB8 3484801F */   ori   $a0, (0x4900801F & 0xFFFF) # ori $a0, $a0, 0x801f
-/* 1270FC 80283ABC 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 127100 80283AC0 27BD0018 */  addiu $sp, $sp, 0x18
-/* 127104 80283AC4 03E00008 */  jr    $ra
-/* 127108 80283AC8 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80283ACC.s b/asm/non_matchings/code_80281FA0/func_80283ACC.s
deleted file mode 100644
index c81232ff9..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283ACC.s
+++ /dev/null
@@ -1,11 +0,0 @@
-glabel func_80283ACC
-/* 12710C 80283ACC 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 127110 80283AD0 AFA40018 */  sw    $a0, 0x18($sp)
-/* 127114 80283AD4 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 127118 80283AD8 3C044900 */  lui   $a0, (0x49008020 >> 16) # lui $a0, 0x4900
-/* 12711C 80283ADC 0C032384 */  jal   play_sound2
-/* 127120 80283AE0 34848020 */   ori   $a0, (0x49008020 & 0xFFFF) # ori $a0, $a0, 0x8020
-/* 127124 80283AE4 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 127128 80283AE8 27BD0018 */  addiu $sp, $sp, 0x18
-/* 12712C 80283AEC 03E00008 */  jr    $ra
-/* 127130 80283AF0 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80283AF4.s b/asm/non_matchings/code_80281FA0/func_80283AF4.s
deleted file mode 100644
index 52551a1ab..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283AF4.s
+++ /dev/null
@@ -1,11 +0,0 @@
-glabel func_80283AF4
-/* 127134 80283AF4 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 127138 80283AF8 AFA40018 */  sw    $a0, 0x18($sp)
-/* 12713C 80283AFC AFBF0014 */  sw    $ra, 0x14($sp)
-/* 127140 80283B00 3C044900 */  lui   $a0, (0x49008021 >> 16) # lui $a0, 0x4900
-/* 127144 80283B04 0C032384 */  jal   play_sound2
-/* 127148 80283B08 34848021 */   ori   $a0, (0x49008021 & 0xFFFF) # ori $a0, $a0, 0x8021
-/* 12714C 80283B0C 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 127150 80283B10 27BD0018 */  addiu $sp, $sp, 0x18
-/* 127154 80283B14 03E00008 */  jr    $ra
-/* 127158 80283B18 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80283B1C.s b/asm/non_matchings/code_80281FA0/func_80283B1C.s
deleted file mode 100644
index ecac0440e..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283B1C.s
+++ /dev/null
@@ -1,11 +0,0 @@
-glabel func_80283B1C
-/* 12715C 80283B1C 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 127160 80283B20 AFA40018 */  sw    $a0, 0x18($sp)
-/* 127164 80283B24 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 127168 80283B28 3C044900 */  lui   $a0, (0x49008022 >> 16) # lui $a0, 0x4900
-/* 12716C 80283B2C 0C032384 */  jal   play_sound2
-/* 127170 80283B30 34848022 */   ori   $a0, (0x49008022 & 0xFFFF) # ori $a0, $a0, 0x8022
-/* 127174 80283B34 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 127178 80283B38 27BD0018 */  addiu $sp, $sp, 0x18
-/* 12717C 80283B3C 03E00008 */  jr    $ra
-/* 127180 80283B40 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80283B44.s b/asm/non_matchings/code_80281FA0/func_80283B44.s
deleted file mode 100644
index f989a7baa..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283B44.s
+++ /dev/null
@@ -1,11 +0,0 @@
-glabel func_80283B44
-/* 127184 80283B44 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 127188 80283B48 AFA40018 */  sw    $a0, 0x18($sp)
-/* 12718C 80283B4C AFBF0014 */  sw    $ra, 0x14($sp)
-/* 127190 80283B50 3C044900 */  lui   $a0, (0x49008023 >> 16) # lui $a0, 0x4900
-/* 127194 80283B54 0C032384 */  jal   play_sound2
-/* 127198 80283B58 34848023 */   ori   $a0, (0x49008023 & 0xFFFF) # ori $a0, $a0, 0x8023
-/* 12719C 80283B5C 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 1271A0 80283B60 27BD0018 */  addiu $sp, $sp, 0x18
-/* 1271A4 80283B64 03E00008 */  jr    $ra
-/* 1271A8 80283B68 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80283B6C.s b/asm/non_matchings/code_80281FA0/func_80283B6C.s
deleted file mode 100644
index 2f9526046..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283B6C.s
+++ /dev/null
@@ -1,15 +0,0 @@
-glabel func_80283B6C
-/* 1271AC 80283B6C 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 1271B0 80283B70 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 1271B4 80283B74 0C03282E */  jal   func_800CA0B8
-/* 1271B8 80283B78 AFA40018 */   sw    $a0, 0x18($sp)
-/* 1271BC 80283B7C 3C051900 */  lui   $a1, (0x19009005 >> 16) # lui $a1, 0x1900
-/* 1271C0 80283B80 34A59005 */  ori   $a1, (0x19009005 & 0xFFFF) # ori $a1, $a1, 0x9005
-/* 1271C4 80283B84 0C032418 */  jal   func_800C9060
-/* 1271C8 80283B88 00002025 */   move  $a0, $zero
-/* 1271CC 80283B8C 0C032828 */  jal   func_800CA0A0
-/* 1271D0 80283B90 00000000 */   nop   
-/* 1271D4 80283B94 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 1271D8 80283B98 27BD0018 */  addiu $sp, $sp, 0x18
-/* 1271DC 80283B9C 03E00008 */  jr    $ra
-/* 1271E0 80283BA0 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80283BA4.s b/asm/non_matchings/code_80281FA0/func_80283BA4.s
deleted file mode 100644
index 794f29db4..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283BA4.s
+++ /dev/null
@@ -1,20 +0,0 @@
-glabel func_80283BA4
-/* 1271E4 80283BA4 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 1271E8 80283BA8 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 1271EC 80283BAC 0C03282E */  jal   func_800CA0B8
-/* 1271F0 80283BB0 AFA40018 */   sw    $a0, 0x18($sp)
-/* 1271F4 80283BB4 3C0E800E */  lui   $t6, %hi(D_800DC4E8) # $t6, 0x800e
-/* 1271F8 80283BB8 8DCEC4E8 */  lw    $t6, %lo(D_800DC4E8)($t6)
-/* 1271FC 80283BBC 3C012900 */  lui   $at, (0x29008004 >> 16) # lui $at, 0x2900
-/* 127200 80283BC0 34218004 */  ori   $at, (0x29008004 & 0xFFFF) # ori $at, $at, 0x8004
-/* 127204 80283BC4 95C50254 */  lhu   $a1, 0x254($t6)
-/* 127208 80283BC8 00002025 */  move  $a0, $zero
-/* 12720C 80283BCC 00057900 */  sll   $t7, $a1, 4
-/* 127210 80283BD0 0C03243D */  jal   func_800C90F4
-/* 127214 80283BD4 01E12821 */   addu  $a1, $t7, $at
-/* 127218 80283BD8 0C032828 */  jal   func_800CA0A0
-/* 12721C 80283BDC 00000000 */   nop   
-/* 127220 80283BE0 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 127224 80283BE4 27BD0018 */  addiu $sp, $sp, 0x18
-/* 127228 80283BE8 03E00008 */  jr    $ra
-/* 12722C 80283BEC 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80283BF0.s b/asm/non_matchings/code_80281FA0/func_80283BF0.s
deleted file mode 100644
index 09f345527..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283BF0.s
+++ /dev/null
@@ -1,10 +0,0 @@
-glabel func_80283BF0
-/* 127230 80283BF0 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 127234 80283BF4 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 127238 80283BF8 AFA40018 */  sw    $a0, 0x18($sp)
-/* 12723C 80283BFC 0C0323BE */  jal   func_800C8EF8
-/* 127240 80283C00 2404001A */   li    $a0, 26
-/* 127244 80283C04 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 127248 80283C08 27BD0018 */  addiu $sp, $sp, 0x18
-/* 12724C 80283C0C 03E00008 */  jr    $ra
-/* 127250 80283C10 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80283C14.s b/asm/non_matchings/code_80281FA0/func_80283C14.s
deleted file mode 100644
index ca721c426..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283C14.s
+++ /dev/null
@@ -1,10 +0,0 @@
-glabel func_80283C14
-/* 127254 80283C14 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 127258 80283C18 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 12725C 80283C1C AFA40018 */  sw    $a0, 0x18($sp)
-/* 127260 80283C20 0C0323BE */  jal   func_800C8EF8
-/* 127264 80283C24 2404001B */   li    $a0, 27
-/* 127268 80283C28 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 12726C 80283C2C 27BD0018 */  addiu $sp, $sp, 0x18
-/* 127270 80283C30 03E00008 */  jr    $ra
-/* 127274 80283C34 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80283C38.s b/asm/non_matchings/code_80281FA0/func_80283C38.s
deleted file mode 100644
index 4e1859ddb..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283C38.s
+++ /dev/null
@@ -1,9 +0,0 @@
-glabel func_80283C38
-/* 127278 80283C38 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 12727C 80283C3C AFBF0014 */  sw    $ra, 0x14($sp)
-/* 127280 80283C40 0C032C4D */  jal   func_800CB134
-/* 127284 80283C44 AFA40018 */   sw    $a0, 0x18($sp)
-/* 127288 80283C48 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 12728C 80283C4C 27BD0018 */  addiu $sp, $sp, 0x18
-/* 127290 80283C50 03E00008 */  jr    $ra
-/* 127294 80283C54 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80283C58.s b/asm/non_matchings/code_80281FA0/func_80283C58.s
deleted file mode 100644
index f12b36f32..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283C58.s
+++ /dev/null
@@ -1,9 +0,0 @@
-glabel func_80283C58
-/* 127298 80283C58 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 12729C 80283C5C AFBF0014 */  sw    $ra, 0x14($sp)
-/* 1272A0 80283C60 0C032C53 */  jal   func_800CB14C
-/* 1272A4 80283C64 AFA40018 */   sw    $a0, 0x18($sp)
-/* 1272A8 80283C68 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 1272AC 80283C6C 27BD0018 */  addiu $sp, $sp, 0x18
-/* 1272B0 80283C70 03E00008 */  jr    $ra
-/* 1272B4 80283C74 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80283C78.s b/asm/non_matchings/code_80281FA0/func_80283C78.s
deleted file mode 100644
index daf31d259..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283C78.s
+++ /dev/null
@@ -1,14 +0,0 @@
-glabel func_80283C78
-/* 1272B8 80283C78 3C0E800E */  lui   $t6, %hi(D_800DC5E4) # $t6, 0x800e
-/* 1272BC 80283C7C 95CEC5E4 */  lhu   $t6, %lo(D_800DC5E4)($t6)
-/* 1272C0 80283C80 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 1272C4 80283C84 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 1272C8 80283C88 15C00003 */  bnez  $t6, .L80283C98
-/* 1272CC 80283C8C AFA40018 */   sw    $a0, 0x18($sp)
-/* 1272D0 80283C90 0C0323BE */  jal   func_800C8EF8
-/* 1272D4 80283C94 2404001C */   li    $a0, 28
-.L80283C98:
-/* 1272D8 80283C98 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 1272DC 80283C9C 27BD0018 */  addiu $sp, $sp, 0x18
-/* 1272E0 80283CA0 03E00008 */  jr    $ra
-/* 1272E4 80283CA4 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80283CA8.s b/asm/non_matchings/code_80281FA0/func_80283CA8.s
deleted file mode 100644
index fe45b8264..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283CA8.s
+++ /dev/null
@@ -1,11 +0,0 @@
-glabel func_80283CA8
-/* 1272E8 80283CA8 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 1272EC 80283CAC AFBF0014 */  sw    $ra, 0x14($sp)
-/* 1272F0 80283CB0 AFA40018 */  sw    $a0, 0x18($sp)
-/* 1272F4 80283CB4 00002025 */  move  $a0, $zero
-/* 1272F8 80283CB8 0C032802 */  jal   func_800CA008
-/* 1272FC 80283CBC 24050003 */   li    $a1, 3
-/* 127300 80283CC0 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 127304 80283CC4 27BD0018 */  addiu $sp, $sp, 0x18
-/* 127308 80283CC8 03E00008 */  jr    $ra
-/* 12730C 80283CCC 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80283CD0.s b/asm/non_matchings/code_80281FA0/func_80283CD0.s
deleted file mode 100644
index 9fe6e0780..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283CD0.s
+++ /dev/null
@@ -1,15 +0,0 @@
-glabel func_80283CD0
-/* 127310 80283CD0 3C0E800E */  lui   $t6, %hi(D_800DC5E4) # $t6, 0x800e
-/* 127314 80283CD4 95CEC5E4 */  lhu   $t6, %lo(D_800DC5E4)($t6)
-/* 127318 80283CD8 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 12731C 80283CDC AFBF0014 */  sw    $ra, 0x14($sp)
-/* 127320 80283CE0 15C00004 */  bnez  $t6, .L80283CF4
-/* 127324 80283CE4 AFA40018 */   sw    $a0, 0x18($sp)
-/* 127328 80283CE8 00002025 */  move  $a0, $zero
-/* 12732C 80283CEC 0C032802 */  jal   func_800CA008
-/* 127330 80283CF0 24050002 */   li    $a1, 2
-.L80283CF4:
-/* 127334 80283CF4 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 127338 80283CF8 27BD0018 */  addiu $sp, $sp, 0x18
-/* 12733C 80283CFC 03E00008 */  jr    $ra
-/* 127340 80283D00 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80283D04.s b/asm/non_matchings/code_80281FA0/func_80283D04.s
deleted file mode 100644
index 0cfd2c341..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283D04.s
+++ /dev/null
@@ -1,11 +0,0 @@
-glabel func_80283D04
-/* 127344 80283D04 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 127348 80283D08 AFA40018 */  sw    $a0, 0x18($sp)
-/* 12734C 80283D0C AFBF0014 */  sw    $ra, 0x14($sp)
-/* 127350 80283D10 3C044900 */  lui   $a0, (0x49008026 >> 16) # lui $a0, 0x4900
-/* 127354 80283D14 0C032384 */  jal   play_sound2
-/* 127358 80283D18 34848026 */   ori   $a0, (0x49008026 & 0xFFFF) # ori $a0, $a0, 0x8026
-/* 12735C 80283D1C 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 127360 80283D20 27BD0018 */  addiu $sp, $sp, 0x18
-/* 127364 80283D24 03E00008 */  jr    $ra
-/* 127368 80283D28 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80283D2C.s b/asm/non_matchings/code_80281FA0/func_80283D2C.s
deleted file mode 100644
index 886f6a84e..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283D2C.s
+++ /dev/null
@@ -1,94 +0,0 @@
-glabel func_80283D2C
-/* 12736C 80283D2C 27BDFFE0 */  addiu $sp, $sp, -0x20
-/* 127370 80283D30 3C0142F0 */  li    $at, 0x42F00000 # 120.000000
-/* 127374 80283D34 44812000 */  mtc1  $at, $f4
-/* 127378 80283D38 AFB00014 */  sw    $s0, 0x14($sp)
-/* 12737C 80283D3C 00808025 */  move  $s0, $a0
-/* 127380 80283D40 AFBF001C */  sw    $ra, 0x1c($sp)
-/* 127384 80283D44 3C018028 */  lui   $at, %hi(D_802856B8) # $at, 0x8028
-/* 127388 80283D48 3C048028 */  lui   $a0, %hi(D_80283CA8) # $a0, 0x8028
-/* 12738C 80283D4C AFB10018 */  sw    $s1, 0x18($sp)
-/* 127390 80283D50 24843CA8 */  addiu $a0, %lo(D_80283CA8) # addiu $a0, $a0, 0x3ca8
-/* 127394 80283D54 02002825 */  move  $a1, $s0
-/* 127398 80283D58 00003025 */  move  $a2, $zero
-/* 12739C 80283D5C 00003825 */  move  $a3, $zero
-/* 1273A0 80283D60 0C0A0CB1 */  jal   func_802832C4
-/* 1273A4 80283D64 E42456B8 */   swc1  $f4, %lo(D_802856B8)($at)
-/* 1273A8 80283D68 3C048028 */  lui   $a0, %hi(D_80283A34) # $a0, 0x8028
-/* 1273AC 80283D6C 24843A34 */  addiu $a0, %lo(D_80283A34) # addiu $a0, $a0, 0x3a34
-/* 1273B0 80283D70 02002825 */  move  $a1, $s0
-/* 1273B4 80283D74 24060001 */  li    $a2, 1
-/* 1273B8 80283D78 0C0A0CB1 */  jal   func_802832C4
-/* 1273BC 80283D7C 24070001 */   li    $a3, 1
-/* 1273C0 80283D80 3C048028 */  lui   $a0, %hi(D_80283BF0) # $a0, 0x8028
-/* 1273C4 80283D84 24843BF0 */  addiu $a0, %lo(D_80283BF0) # addiu $a0, $a0, 0x3bf0
-/* 1273C8 80283D88 02002825 */  move  $a1, $s0
-/* 1273CC 80283D8C 00003025 */  move  $a2, $zero
-/* 1273D0 80283D90 0C0A0CB1 */  jal   func_802832C4
-/* 1273D4 80283D94 00003825 */   move  $a3, $zero
-/* 1273D8 80283D98 3C118028 */  lui   $s1, %hi(D_80283A7C) # $s1, 0x8028
-/* 1273DC 80283D9C 26313A7C */  addiu $s1, %lo(D_80283A7C) # addiu $s1, $s1, 0x3a7c
-/* 1273E0 80283DA0 02202025 */  move  $a0, $s1
-/* 1273E4 80283DA4 02002825 */  move  $a1, $s0
-/* 1273E8 80283DA8 2406002D */  li    $a2, 45
-/* 1273EC 80283DAC 0C0A0CB1 */  jal   func_802832C4
-/* 1273F0 80283DB0 2407002D */   li    $a3, 45
-/* 1273F4 80283DB4 02202025 */  move  $a0, $s1
-/* 1273F8 80283DB8 02002825 */  move  $a1, $s0
-/* 1273FC 80283DBC 24060041 */  li    $a2, 65
-/* 127400 80283DC0 0C0A0CB1 */  jal   func_802832C4
-/* 127404 80283DC4 24070041 */   li    $a3, 65
-/* 127408 80283DC8 02202025 */  move  $a0, $s1
-/* 12740C 80283DCC 02002825 */  move  $a1, $s0
-/* 127410 80283DD0 24060046 */  li    $a2, 70
-/* 127414 80283DD4 0C0A0CB1 */  jal   func_802832C4
-/* 127418 80283DD8 24070046 */   li    $a3, 70
-/* 12741C 80283DDC 02202025 */  move  $a0, $s1
-/* 127420 80283DE0 02002825 */  move  $a1, $s0
-/* 127424 80283DE4 2406005E */  li    $a2, 94
-/* 127428 80283DE8 0C0A0CB1 */  jal   func_802832C4
-/* 12742C 80283DEC 2407005E */   li    $a3, 94
-/* 127430 80283DF0 02202025 */  move  $a0, $s1
-/* 127434 80283DF4 02002825 */  move  $a1, $s0
-/* 127438 80283DF8 2406006E */  li    $a2, 110
-/* 12743C 80283DFC 0C0A0CB1 */  jal   func_802832C4
-/* 127440 80283E00 2407006E */   li    $a3, 110
-/* 127444 80283E04 02202025 */  move  $a0, $s1
-/* 127448 80283E08 02002825 */  move  $a1, $s0
-/* 12744C 80283E0C 24060082 */  li    $a2, 130
-/* 127450 80283E10 0C0A0CB1 */  jal   func_802832C4
-/* 127454 80283E14 24070082 */   li    $a3, 130
-/* 127458 80283E18 02202025 */  move  $a0, $s1
-/* 12745C 80283E1C 02002825 */  move  $a1, $s0
-/* 127460 80283E20 24060098 */  li    $a2, 152
-/* 127464 80283E24 0C0A0CB1 */  jal   func_802832C4
-/* 127468 80283E28 24070098 */   li    $a3, 152
-/* 12746C 80283E2C 02202025 */  move  $a0, $s1
-/* 127470 80283E30 02002825 */  move  $a1, $s0
-/* 127474 80283E34 240600A0 */  li    $a2, 160
-/* 127478 80283E38 0C0A0CB1 */  jal   func_802832C4
-/* 12747C 80283E3C 240700A0 */   li    $a3, 160
-/* 127480 80283E40 3C068028 */  lui   $a2, %hi(D_80285D14) # $a2, 0x8028
-/* 127484 80283E44 84C65D14 */  lh    $a2, %lo(D_80285D14)($a2)
-/* 127488 80283E48 3C048028 */  lui   $a0, %hi(D_80283994) # $a0, 0x8028
-/* 12748C 80283E4C 24843994 */  addiu $a0, %lo(D_80283994) # addiu $a0, $a0, 0x3994
-/* 127490 80283E50 24C6FFC4 */  addiu $a2, -0x3c
-/* 127494 80283E54 00067400 */  sll   $t6, $a2, 0x10
-/* 127498 80283E58 000E3403 */  sra   $a2, $t6, 0x10
-/* 12749C 80283E5C 00063C00 */  sll   $a3, $a2, 0x10
-/* 1274A0 80283E60 0007C403 */  sra   $t8, $a3, 0x10
-/* 1274A4 80283E64 03003825 */  move  $a3, $t8
-/* 1274A8 80283E68 0C0A0CB1 */  jal   func_802832C4
-/* 1274AC 80283E6C 02002825 */   move  $a1, $s0
-/* 1274B0 80283E70 3C058028 */  lui   $a1, %hi(D_802856DC) # $a1, 0x8028
-/* 1274B4 80283E74 3C068028 */  lui   $a2, %hi(D_80285718) # $a2, 0x8028
-/* 1274B8 80283E78 24C65718 */  addiu $a2, %lo(D_80285718) # addiu $a2, $a2, 0x5718
-/* 1274BC 80283E7C 24A556DC */  addiu $a1, %lo(D_802856DC) # addiu $a1, $a1, 0x56dc
-/* 1274C0 80283E80 02002025 */  move  $a0, $s0
-/* 1274C4 80283E84 0C0A0B64 */  jal   func_80282D90
-/* 1274C8 80283E88 00003825 */   move  $a3, $zero
-/* 1274CC 80283E8C 8FBF001C */  lw    $ra, 0x1c($sp)
-/* 1274D0 80283E90 8FB00014 */  lw    $s0, 0x14($sp)
-/* 1274D4 80283E94 8FB10018 */  lw    $s1, 0x18($sp)
-/* 1274D8 80283E98 03E00008 */  jr    $ra
-/* 1274DC 80283E9C 27BD0020 */   addiu $sp, $sp, 0x20
diff --git a/asm/non_matchings/code_80281FA0/func_80283EA0.s b/asm/non_matchings/code_80281FA0/func_80283EA0.s
deleted file mode 100644
index f22c9c69d..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283EA0.s
+++ /dev/null
@@ -1,13 +0,0 @@
-glabel func_80283EA0
-/* 1274E0 80283EA0 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 1274E4 80283EA4 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 1274E8 80283EA8 3C058028 */  lui   $a1, %hi(D_80285754) # $a1, 0x8028
-/* 1274EC 80283EAC 3C068028 */  lui   $a2, %hi(D_80285784) # $a2, 0x8028
-/* 1274F0 80283EB0 24C65784 */  addiu $a2, %lo(D_80285784) # addiu $a2, $a2, 0x5784
-/* 1274F4 80283EB4 24A55754 */  addiu $a1, %lo(D_80285754) # addiu $a1, $a1, 0x5754
-/* 1274F8 80283EB8 0C0A0B64 */  jal   func_80282D90
-/* 1274FC 80283EBC 00003825 */   move  $a3, $zero
-/* 127500 80283EC0 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 127504 80283EC4 27BD0018 */  addiu $sp, $sp, 0x18
-/* 127508 80283EC8 03E00008 */  jr    $ra
-/* 12750C 80283ECC 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80283ED0.s b/asm/non_matchings/code_80281FA0/func_80283ED0.s
deleted file mode 100644
index 55cd58707..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283ED0.s
+++ /dev/null
@@ -1,11 +0,0 @@
-glabel func_80283ED0
-/* 127510 80283ED0 3C05800E */  lui   $a1, %hi(D_800DC4E0) # $a1, 0x800e
-/* 127514 80283ED4 8CA5C4E0 */  lw    $a1, %lo(D_800DC4E0)($a1)
-/* 127518 80283ED8 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 12751C 80283EDC AFBF0014 */  sw    $ra, 0x14($sp)
-/* 127520 80283EE0 0C0A0802 */  jal   func_80282008
-/* 127524 80283EE4 24A50014 */   addiu $a1, $a1, 0x14
-/* 127528 80283EE8 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 12752C 80283EEC 27BD0018 */  addiu $sp, $sp, 0x18
-/* 127530 80283EF0 03E00008 */  jr    $ra
-/* 127534 80283EF4 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80283F6C.s b/asm/non_matchings/code_80281FA0/func_80283F6C.s
deleted file mode 100644
index be5cbf049..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283F6C.s
+++ /dev/null
@@ -1,25 +0,0 @@
-glabel func_80283F6C
-/* 1275AC 80283F6C 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 1275B0 80283F70 AFA40018 */  sw    $a0, 0x18($sp)
-/* 1275B4 80283F74 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 1275B8 80283F78 3C048028 */  lui   $a0, %hi(D_80283ED0) # $a0, 0x8028
-/* 1275BC 80283F7C 24843ED0 */  addiu $a0, %lo(D_80283ED0) # addiu $a0, $a0, 0x3ed0
-/* 1275C0 80283F80 8FA50018 */  lw    $a1, 0x18($sp)
-/* 1275C4 80283F84 00003025 */  move  $a2, $zero
-/* 1275C8 80283F88 0C0A0CB1 */  jal   func_802832C4
-/* 1275CC 80283F8C 00003825 */   move  $a3, $zero
-/* 1275D0 80283F90 3C048028 */  lui   $a0, %hi(D_80283EF8) # $a0, 0x8028
-/* 1275D4 80283F94 24843EF8 */  addiu $a0, %lo(D_80283EF8) # addiu $a0, $a0, 0x3ef8
-/* 1275D8 80283F98 8FA50018 */  lw    $a1, 0x18($sp)
-/* 1275DC 80283F9C 00003025 */  move  $a2, $zero
-/* 1275E0 80283FA0 0C0A0CB1 */  jal   func_802832C4
-/* 1275E4 80283FA4 2407FFFF */   li    $a3, -1
-/* 1275E8 80283FA8 3C058028 */  lui   $a1, %hi(D_802857B4) # $a1, 0x8028
-/* 1275EC 80283FAC 24A557B4 */  addiu $a1, %lo(D_802857B4) # addiu $a1, $a1, 0x57b4
-/* 1275F0 80283FB0 8FA40018 */  lw    $a0, 0x18($sp)
-/* 1275F4 80283FB4 0C0A0B96 */  jal   func_80282E58
-/* 1275F8 80283FB8 00003025 */   move  $a2, $zero
-/* 1275FC 80283FBC 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 127600 80283FC0 27BD0018 */  addiu $sp, $sp, 0x18
-/* 127604 80283FC4 03E00008 */  jr    $ra
-/* 127608 80283FC8 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80283FCC.s b/asm/non_matchings/code_80281FA0/func_80283FCC.s
deleted file mode 100644
index dfafbbfba..000000000
--- a/asm/non_matchings/code_80281FA0/func_80283FCC.s
+++ /dev/null
@@ -1,11 +0,0 @@
-glabel func_80283FCC
-/* 12760C 80283FCC 3C05800E */  lui   $a1, %hi(D_800DC4E4) # $a1, 0x800e
-/* 127610 80283FD0 8CA5C4E4 */  lw    $a1, %lo(D_800DC4E4)($a1)
-/* 127614 80283FD4 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 127618 80283FD8 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 12761C 80283FDC 0C0A0802 */  jal   func_80282008
-/* 127620 80283FE0 24A50014 */   addiu $a1, $a1, 0x14
-/* 127624 80283FE4 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 127628 80283FE8 27BD0018 */  addiu $sp, $sp, 0x18
-/* 12762C 80283FEC 03E00008 */  jr    $ra
-/* 127630 80283FF0 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80284068.s b/asm/non_matchings/code_80281FA0/func_80284068.s
deleted file mode 100644
index 84f086e09..000000000
--- a/asm/non_matchings/code_80281FA0/func_80284068.s
+++ /dev/null
@@ -1,25 +0,0 @@
-glabel func_80284068
-/* 1276A8 80284068 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 1276AC 8028406C AFA40018 */  sw    $a0, 0x18($sp)
-/* 1276B0 80284070 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 1276B4 80284074 3C048028 */  lui   $a0, %hi(D_80283FCC) # $a0, 0x8028
-/* 1276B8 80284078 24843FCC */  addiu $a0, %lo(D_80283FCC) # addiu $a0, $a0, 0x3fcc
-/* 1276BC 8028407C 8FA50018 */  lw    $a1, 0x18($sp)
-/* 1276C0 80284080 00003025 */  move  $a2, $zero
-/* 1276C4 80284084 0C0A0CB1 */  jal   func_802832C4
-/* 1276C8 80284088 00003825 */   move  $a3, $zero
-/* 1276CC 8028408C 3C048028 */  lui   $a0, %hi(D_80283FF4) # $a0, 0x8028
-/* 1276D0 80284090 24843FF4 */  addiu $a0, %lo(D_80283FF4) # addiu $a0, $a0, 0x3ff4
-/* 1276D4 80284094 8FA50018 */  lw    $a1, 0x18($sp)
-/* 1276D8 80284098 00003025 */  move  $a2, $zero
-/* 1276DC 8028409C 0C0A0CB1 */  jal   func_802832C4
-/* 1276E0 802840A0 2407FFFF */   li    $a3, -1
-/* 1276E4 802840A4 3C058028 */  lui   $a1, %hi(D_802857CC) # $a1, 0x8028
-/* 1276E8 802840A8 24A557CC */  addiu $a1, %lo(D_802857CC) # addiu $a1, $a1, 0x57cc
-/* 1276EC 802840AC 8FA40018 */  lw    $a0, 0x18($sp)
-/* 1276F0 802840B0 0C0A0B96 */  jal   func_80282E58
-/* 1276F4 802840B4 00003025 */   move  $a2, $zero
-/* 1276F8 802840B8 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 1276FC 802840BC 27BD0018 */  addiu $sp, $sp, 0x18
-/* 127700 802840C0 03E00008 */  jr    $ra
-/* 127704 802840C4 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_802840C8.s b/asm/non_matchings/code_80281FA0/func_802840C8.s
deleted file mode 100644
index 1e86995b4..000000000
--- a/asm/non_matchings/code_80281FA0/func_802840C8.s
+++ /dev/null
@@ -1,40 +0,0 @@
-glabel func_802840C8
-/* 127708 802840C8 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 12770C 802840CC 00802825 */  move  $a1, $a0
-/* 127710 802840D0 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 127714 802840D4 3C048028 */  lui   $a0, %hi(D_80283C14) # $a0, 0x8028
-/* 127718 802840D8 24843C14 */  addiu $a0, %lo(D_80283C14) # addiu $a0, $a0, 0x3c14
-/* 12771C 802840DC AFA50018 */  sw    $a1, 0x18($sp)
-/* 127720 802840E0 24060005 */  li    $a2, 5
-/* 127724 802840E4 0C0A0CB1 */  jal   func_802832C4
-/* 127728 802840E8 24070005 */   li    $a3, 5
-/* 12772C 802840EC 3C028028 */  lui   $v0, %hi(D_802876D8) # $v0, 0x8028
-/* 127730 802840F0 8C4276D8 */  lw    $v0, %lo(D_802876D8)($v0)
-/* 127734 802840F4 24010002 */  li    $at, 2
-/* 127738 802840F8 8FA50018 */  lw    $a1, 0x18($sp)
-/* 12773C 802840FC 10410007 */  beq   $v0, $at, .L8028411C
-/* 127740 80284100 24010003 */   li    $at, 3
-/* 127744 80284104 10410009 */  beq   $v0, $at, .L8028412C
-/* 127748 80284108 24010004 */   li    $at, 4
-/* 12774C 8028410C 1041000B */  beq   $v0, $at, .L8028413C
-/* 127750 80284110 00000000 */   nop   
-/* 127754 80284114 1000000C */  b     .L80284148
-/* 127758 80284118 8FBF0014 */   lw    $ra, 0x14($sp)
-.L8028411C:
-/* 12775C 8028411C 0C0A0FA8 */  jal   func_80283EA0
-/* 127760 80284120 00A02025 */   move  $a0, $a1
-/* 127764 80284124 10000008 */  b     .L80284148
-/* 127768 80284128 8FBF0014 */   lw    $ra, 0x14($sp)
-.L8028412C:
-/* 12776C 8028412C 0C0A0FDB */  jal   func_80283F6C
-/* 127770 80284130 00A02025 */   move  $a0, $a1
-/* 127774 80284134 10000004 */  b     .L80284148
-/* 127778 80284138 8FBF0014 */   lw    $ra, 0x14($sp)
-.L8028413C:
-/* 12777C 8028413C 0C0A101A */  jal   func_80284068
-/* 127780 80284140 00A02025 */   move  $a0, $a1
-/* 127784 80284144 8FBF0014 */  lw    $ra, 0x14($sp)
-.L80284148:
-/* 127788 80284148 27BD0018 */  addiu $sp, $sp, 0x18
-/* 12778C 8028414C 03E00008 */  jr    $ra
-/* 127790 80284150 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80284154.s b/asm/non_matchings/code_80281FA0/func_80284154.s
deleted file mode 100644
index 99f972221..000000000
--- a/asm/non_matchings/code_80281FA0/func_80284154.s
+++ /dev/null
@@ -1,13 +0,0 @@
-glabel func_80284154
-/* 127794 80284154 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 127798 80284158 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 12779C 8028415C 3C058028 */  lui   $a1, %hi(D_80285910) # $a1, 0x8028
-/* 1277A0 80284160 3C068028 */  lui   $a2, %hi(D_80285928) # $a2, 0x8028
-/* 1277A4 80284164 24C65928 */  addiu $a2, %lo(D_80285928) # addiu $a2, $a2, 0x5928
-/* 1277A8 80284168 24A55910 */  addiu $a1, %lo(D_80285910) # addiu $a1, $a1, 0x5910
-/* 1277AC 8028416C 0C0A0B64 */  jal   func_80282D90
-/* 1277B0 80284170 00003825 */   move  $a3, $zero
-/* 1277B4 80284174 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 1277B8 80284178 27BD0018 */  addiu $sp, $sp, 0x18
-/* 1277BC 8028417C 03E00008 */  jr    $ra
-/* 1277C0 80284180 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_802841E8.s b/asm/non_matchings/code_80281FA0/func_802841E8.s
deleted file mode 100644
index bd934561d..000000000
--- a/asm/non_matchings/code_80281FA0/func_802841E8.s
+++ /dev/null
@@ -1,18 +0,0 @@
-glabel func_802841E8
-/* 127828 802841E8 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 12782C 802841EC AFBF0014 */  sw    $ra, 0x14($sp)
-/* 127830 802841F0 3C058028 */  lui   $a1, %hi(D_80285940) # $a1, 0x8028
-/* 127834 802841F4 AFA40018 */  sw    $a0, 0x18($sp)
-/* 127838 802841F8 24A55940 */  addiu $a1, %lo(D_80285940) # addiu $a1, $a1, 0x5940
-/* 12783C 802841FC 0C0A0B96 */  jal   func_80282E58
-/* 127840 80284200 00003025 */   move  $a2, $zero
-/* 127844 80284204 3C05C548 */  lui   $a1, (0xC5482000 >> 16) # lui $a1, 0xc548
-/* 127848 80284208 34A52000 */  ori   $a1, (0xC5482000 & 0xFFFF) # ori $a1, $a1, 0x2000
-/* 12784C 8028420C 8FA40018 */  lw    $a0, 0x18($sp)
-/* 127850 80284210 3C0642B4 */  lui   $a2, 0x42b4
-/* 127854 80284214 0C0A07E8 */  jal   func_80281FA0
-/* 127858 80284218 3C07C3EF */   lui   $a3, 0xc3ef
-/* 12785C 8028421C 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 127860 80284220 27BD0018 */  addiu $sp, $sp, 0x18
-/* 127864 80284224 03E00008 */  jr    $ra
-/* 127868 80284228 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_8028422C.s b/asm/non_matchings/code_80281FA0/func_8028422C.s
deleted file mode 100644
index 20926cdc0..000000000
--- a/asm/non_matchings/code_80281FA0/func_8028422C.s
+++ /dev/null
@@ -1,32 +0,0 @@
-glabel func_8028422C
-/* 12786C 8028422C 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 127870 80284230 AFA40018 */  sw    $a0, 0x18($sp)
-/* 127874 80284234 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 127878 80284238 3C048028 */  lui   $a0, %hi(D_80283AF4) # $a0, 0x8028
-/* 12787C 8028423C 24843AF4 */  addiu $a0, %lo(D_80283AF4) # addiu $a0, $a0, 0x3af4
-/* 127880 80284240 8FA50018 */  lw    $a1, 0x18($sp)
-/* 127884 80284244 24060006 */  li    $a2, 6
-/* 127888 80284248 0C0A0CB1 */  jal   func_802832C4
-/* 12788C 8028424C 24070006 */   li    $a3, 6
-/* 127890 80284250 3C048028 */  lui   $a0, %hi(D_80283B44) # $a0, 0x8028
-/* 127894 80284254 24843B44 */  addiu $a0, %lo(D_80283B44) # addiu $a0, $a0, 0x3b44
-/* 127898 80284258 8FA50018 */  lw    $a1, 0x18($sp)
-/* 12789C 8028425C 2406001E */  li    $a2, 30
-/* 1278A0 80284260 0C0A0CB1 */  jal   func_802832C4
-/* 1278A4 80284264 2407001E */   li    $a3, 30
-/* 1278A8 80284268 3C048028 */  lui   $a0, %hi(D_802841E8) # $a0, 0x8028
-/* 1278AC 8028426C 248441E8 */  addiu $a0, %lo(D_802841E8) # addiu $a0, $a0, 0x41e8
-/* 1278B0 80284270 8FA50018 */  lw    $a1, 0x18($sp)
-/* 1278B4 80284274 00003025 */  move  $a2, $zero
-/* 1278B8 80284278 0C0A0CB1 */  jal   func_802832C4
-/* 1278BC 8028427C 00003825 */   move  $a3, $zero
-/* 1278C0 80284280 3C048028 */  lui   $a0, %hi(D_80284184) # $a0, 0x8028
-/* 1278C4 80284284 24844184 */  addiu $a0, %lo(D_80284184) # addiu $a0, $a0, 0x4184
-/* 1278C8 80284288 8FA50018 */  lw    $a1, 0x18($sp)
-/* 1278CC 8028428C 24060006 */  li    $a2, 6
-/* 1278D0 80284290 0C0A0CB1 */  jal   func_802832C4
-/* 1278D4 80284294 2407FFFF */   li    $a3, -1
-/* 1278D8 80284298 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 1278DC 8028429C 27BD0018 */  addiu $sp, $sp, 0x18
-/* 1278E0 802842A0 03E00008 */  jr    $ra
-/* 1278E4 802842A4 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_802842A8.s b/asm/non_matchings/code_80281FA0/func_802842A8.s
deleted file mode 100644
index dddd92d5f..000000000
--- a/asm/non_matchings/code_80281FA0/func_802842A8.s
+++ /dev/null
@@ -1,13 +0,0 @@
-glabel func_802842A8
-/* 1278E8 802842A8 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 1278EC 802842AC AFBF0014 */  sw    $ra, 0x14($sp)
-/* 1278F0 802842B0 3C058028 */  lui   $a1, %hi(D_802858B0) # $a1, 0x8028
-/* 1278F4 802842B4 3C068028 */  lui   $a2, %hi(D_802858C8) # $a2, 0x8028
-/* 1278F8 802842B8 24C658C8 */  addiu $a2, %lo(D_802858C8) # addiu $a2, $a2, 0x58c8
-/* 1278FC 802842BC 24A558B0 */  addiu $a1, %lo(D_802858B0) # addiu $a1, $a1, 0x58b0
-/* 127900 802842C0 0C0A0B64 */  jal   func_80282D90
-/* 127904 802842C4 00003825 */   move  $a3, $zero
-/* 127908 802842C8 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 12790C 802842CC 27BD0018 */  addiu $sp, $sp, 0x18
-/* 127910 802842D0 03E00008 */  jr    $ra
-/* 127914 802842D4 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_802842D8.s b/asm/non_matchings/code_80281FA0/func_802842D8.s
deleted file mode 100644
index 7c6a34b9a..000000000
--- a/asm/non_matchings/code_80281FA0/func_802842D8.s
+++ /dev/null
@@ -1,13 +0,0 @@
-glabel func_802842D8
-/* 127918 802842D8 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 12791C 802842DC AFBF0014 */  sw    $ra, 0x14($sp)
-/* 127920 802842E0 3C058028 */  lui   $a1, %hi(D_802857F0) # $a1, 0x8028
-/* 127924 802842E4 3C068028 */  lui   $a2, %hi(D_80285850) # $a2, 0x8028
-/* 127928 802842E8 24C65850 */  addiu $a2, %lo(D_80285850) # addiu $a2, $a2, 0x5850
-/* 12792C 802842EC 24A557F0 */  addiu $a1, %lo(D_802857F0) # addiu $a1, $a1, 0x57f0
-/* 127930 802842F0 0C0A0B64 */  jal   func_80282D90
-/* 127934 802842F4 00003825 */   move  $a3, $zero
-/* 127938 802842F8 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 12793C 802842FC 27BD0018 */  addiu $sp, $sp, 0x18
-/* 127940 80284300 03E00008 */  jr    $ra
-/* 127944 80284304 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80284308.s b/asm/non_matchings/code_80281FA0/func_80284308.s
index 09b78f0a5..c497e2faa 100644
--- a/asm/non_matchings/code_80281FA0/func_80284308.s
+++ b/asm/non_matchings/code_80281FA0/func_80284308.s
@@ -12,8 +12,8 @@ glabel func_80284308
 /* 127970 80284330 8DE8000C */  lw    $t0, 0xc($t7)
 /* 127974 80284334 8DE10008 */  lw    $at, 8($t7)
 /* 127978 80284338 00808025 */  move  $s0, $a0
-/* 12797C 8028433C 3C048028 */  lui   $a0, %hi(D_80283A54) # $a0, 0x8028
-/* 127980 80284340 24843A54 */  addiu $a0, %lo(D_80283A54) # addiu $a0, $a0, 0x3a54
+/* 12797C 8028433C 3C048028 */  lui   $a0, %hi(func_80283A54) # $a0, 0x8028
+/* 127980 80284340 24843A54 */  addiu $a0, %lo(func_80283A54) # addiu $a0, $a0, 0x3a54
 /* 127984 80284344 02002825 */  move  $a1, $s0
 /* 127988 80284348 2406008C */  li    $a2, 140
 /* 12798C 8028434C 2407008C */  li    $a3, 140
diff --git a/asm/non_matchings/code_80281FA0/func_80284418.s b/asm/non_matchings/code_80281FA0/func_80284418.s
deleted file mode 100644
index 5bb59b538..000000000
--- a/asm/non_matchings/code_80281FA0/func_80284418.s
+++ /dev/null
@@ -1,32 +0,0 @@
-glabel func_80284418
-/* 127A58 80284418 27BDFFE0 */  addiu $sp, $sp, -0x20
-/* 127A5C 8028441C AFA40020 */  sw    $a0, 0x20($sp)
-/* 127A60 80284420 3C048028 */  lui   $a0, %hi(D_80283B1C) # $a0, 0x8028
-/* 127A64 80284424 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 127A68 80284428 24843B1C */  addiu $a0, %lo(D_80283B1C) # addiu $a0, $a0, 0x3b1c
-/* 127A6C 8028442C AFA4001C */  sw    $a0, 0x1c($sp)
-/* 127A70 80284430 8FA50020 */  lw    $a1, 0x20($sp)
-/* 127A74 80284434 24060052 */  li    $a2, 82
-/* 127A78 80284438 0C0A0CB1 */  jal   func_802832C4
-/* 127A7C 8028443C 24070052 */   li    $a3, 82
-/* 127A80 80284440 8FA4001C */  lw    $a0, 0x1c($sp)
-/* 127A84 80284444 8FA50020 */  lw    $a1, 0x20($sp)
-/* 127A88 80284448 24060048 */  li    $a2, 72
-/* 127A8C 8028444C 0C0A0CB1 */  jal   func_802832C4
-/* 127A90 80284450 24070048 */   li    $a3, 72
-/* 127A94 80284454 8FA4001C */  lw    $a0, 0x1c($sp)
-/* 127A98 80284458 8FA50020 */  lw    $a1, 0x20($sp)
-/* 127A9C 8028445C 2406003D */  li    $a2, 61
-/* 127AA0 80284460 0C0A0CB1 */  jal   func_802832C4
-/* 127AA4 80284464 2407003D */   li    $a3, 61
-/* 127AA8 80284468 3C058028 */  lui   $a1, %hi(D_80285A10) # $a1, 0x8028
-/* 127AAC 8028446C 3C068028 */  lui   $a2, %hi(D_80285A4C) # $a2, 0x8028
-/* 127AB0 80284470 24C65A4C */  addiu $a2, %lo(D_80285A4C) # addiu $a2, $a2, 0x5a4c
-/* 127AB4 80284474 24A55A10 */  addiu $a1, %lo(D_80285A10) # addiu $a1, $a1, 0x5a10
-/* 127AB8 80284478 8FA40020 */  lw    $a0, 0x20($sp)
-/* 127ABC 8028447C 0C0A0B64 */  jal   func_80282D90
-/* 127AC0 80284480 00003825 */   move  $a3, $zero
-/* 127AC4 80284484 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 127AC8 80284488 27BD0020 */  addiu $sp, $sp, 0x20
-/* 127ACC 8028448C 03E00008 */  jr    $ra
-/* 127AD0 80284490 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80284494.s b/asm/non_matchings/code_80281FA0/func_80284494.s
deleted file mode 100644
index 89b08dcaa..000000000
--- a/asm/non_matchings/code_80281FA0/func_80284494.s
+++ /dev/null
@@ -1,27 +0,0 @@
-glabel func_80284494
-/* 127AD4 80284494 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 127AD8 80284498 AFA40018 */  sw    $a0, 0x18($sp)
-/* 127ADC 8028449C AFBF0014 */  sw    $ra, 0x14($sp)
-/* 127AE0 802844A0 3C048028 */  lui   $a0, %hi(D_80283ACC) # $a0, 0x8028
-/* 127AE4 802844A4 24843ACC */  addiu $a0, %lo(D_80283ACC) # addiu $a0, $a0, 0x3acc
-/* 127AE8 802844A8 8FA50018 */  lw    $a1, 0x18($sp)
-/* 127AEC 802844AC 2406001E */  li    $a2, 30
-/* 127AF0 802844B0 0C0A0CB1 */  jal   func_802832C4
-/* 127AF4 802844B4 2407001E */   li    $a3, 30
-/* 127AF8 802844B8 3C048028 */  lui   $a0, %hi(D_80283968) # $a0, 0x8028
-/* 127AFC 802844BC 24843968 */  addiu $a0, %lo(D_80283968) # addiu $a0, $a0, 0x3968
-/* 127B00 802844C0 8FA50018 */  lw    $a1, 0x18($sp)
-/* 127B04 802844C4 00003025 */  move  $a2, $zero
-/* 127B08 802844C8 0C0A0CB1 */  jal   func_802832C4
-/* 127B0C 802844CC 00003825 */   move  $a3, $zero
-/* 127B10 802844D0 3C058028 */  lui   $a1, %hi(D_80285A88) # $a1, 0x8028
-/* 127B14 802844D4 3C068028 */  lui   $a2, %hi(D_80285AB8) # $a2, 0x8028
-/* 127B18 802844D8 24C65AB8 */  addiu $a2, %lo(D_80285AB8) # addiu $a2, $a2, 0x5ab8
-/* 127B1C 802844DC 24A55A88 */  addiu $a1, %lo(D_80285A88) # addiu $a1, $a1, 0x5a88
-/* 127B20 802844E0 8FA40018 */  lw    $a0, 0x18($sp)
-/* 127B24 802844E4 0C0A0B64 */  jal   func_80282D90
-/* 127B28 802844E8 00003825 */   move  $a3, $zero
-/* 127B2C 802844EC 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 127B30 802844F0 27BD0018 */  addiu $sp, $sp, 0x18
-/* 127B34 802844F4 03E00008 */  jr    $ra
-/* 127B38 802844F8 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_802844FC.s b/asm/non_matchings/code_80281FA0/func_802844FC.s
deleted file mode 100644
index 00ff43f27..000000000
--- a/asm/non_matchings/code_80281FA0/func_802844FC.s
+++ /dev/null
@@ -1,21 +0,0 @@
-glabel func_802844FC
-/* 127B3C 802844FC 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 127B40 80284500 AFA40018 */  sw    $a0, 0x18($sp)
-/* 127B44 80284504 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 127B48 80284508 3C048028 */  lui   $a0, %hi(D_80283AA4) # $a0, 0x8028
-/* 127B4C 8028450C 24843AA4 */  addiu $a0, %lo(D_80283AA4) # addiu $a0, $a0, 0x3aa4
-/* 127B50 80284510 8FA50018 */  lw    $a1, 0x18($sp)
-/* 127B54 80284514 2406003B */  li    $a2, 59
-/* 127B58 80284518 0C0A0CB1 */  jal   func_802832C4
-/* 127B5C 8028451C 2407003B */   li    $a3, 59
-/* 127B60 80284520 3C058028 */  lui   $a1, %hi(D_80285AE8) # $a1, 0x8028
-/* 127B64 80284524 3C068028 */  lui   $a2, %hi(D_80285B00) # $a2, 0x8028
-/* 127B68 80284528 24C65B00 */  addiu $a2, %lo(D_80285B00) # addiu $a2, $a2, 0x5b00
-/* 127B6C 8028452C 24A55AE8 */  addiu $a1, %lo(D_80285AE8) # addiu $a1, $a1, 0x5ae8
-/* 127B70 80284530 8FA40018 */  lw    $a0, 0x18($sp)
-/* 127B74 80284534 0C0A0B64 */  jal   func_80282D90
-/* 127B78 80284538 00003825 */   move  $a3, $zero
-/* 127B7C 8028453C 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 127B80 80284540 27BD0018 */  addiu $sp, $sp, 0x18
-/* 127B84 80284544 03E00008 */  jr    $ra
-/* 127B88 80284548 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_8028454C.s b/asm/non_matchings/code_80281FA0/func_8028454C.s
deleted file mode 100644
index dd594a6b0..000000000
--- a/asm/non_matchings/code_80281FA0/func_8028454C.s
+++ /dev/null
@@ -1,41 +0,0 @@
-glabel func_8028454C
-/* 127B8C 8028454C 27BDFFE0 */  addiu $sp, $sp, -0x20
-/* 127B90 80284550 AFB00018 */  sw    $s0, 0x18($sp)
-/* 127B94 80284554 00808025 */  move  $s0, $a0
-/* 127B98 80284558 AFBF001C */  sw    $ra, 0x1c($sp)
-/* 127B9C 8028455C 3C048028 */  lui   $a0, %hi(D_80283CA8) # $a0, 0x8028
-/* 127BA0 80284560 24843CA8 */  addiu $a0, %lo(D_80283CA8) # addiu $a0, $a0, 0x3ca8
-/* 127BA4 80284564 02002825 */  move  $a1, $s0
-/* 127BA8 80284568 00003025 */  move  $a2, $zero
-/* 127BAC 8028456C 0C0A0CB1 */  jal   func_802832C4
-/* 127BB0 80284570 00003825 */   move  $a3, $zero
-/* 127BB4 80284574 3C048028 */  lui   $a0, %hi(D_80283A34) # $a0, 0x8028
-/* 127BB8 80284578 24843A34 */  addiu $a0, %lo(D_80283A34) # addiu $a0, $a0, 0x3a34
-/* 127BBC 8028457C 02002825 */  move  $a1, $s0
-/* 127BC0 80284580 24060001 */  li    $a2, 1
-/* 127BC4 80284584 0C0A0CB1 */  jal   func_802832C4
-/* 127BC8 80284588 24070001 */   li    $a3, 1
-/* 127BCC 8028458C 3C048028 */  lui   $a0, %hi(D_80283C38) # $a0, 0x8028
-/* 127BD0 80284590 24843C38 */  addiu $a0, %lo(D_80283C38) # addiu $a0, $a0, 0x3c38
-/* 127BD4 80284594 02002825 */  move  $a1, $s0
-/* 127BD8 80284598 00003025 */  move  $a2, $zero
-/* 127BDC 8028459C 0C0A0CB1 */  jal   func_802832C4
-/* 127BE0 802845A0 00003825 */   move  $a3, $zero
-/* 127BE4 802845A4 3C048028 */  lui   $a0, %hi(D_80283994) # $a0, 0x8028
-/* 127BE8 802845A8 24843994 */  addiu $a0, %lo(D_80283994) # addiu $a0, $a0, 0x3994
-/* 127BEC 802845AC 02002825 */  move  $a1, $s0
-/* 127BF0 802845B0 2406003C */  li    $a2, 60
-/* 127BF4 802845B4 0C0A0CB1 */  jal   func_802832C4
-/* 127BF8 802845B8 2407003C */   li    $a3, 60
-/* 127BFC 802845BC 3C058028 */  lui   $a1, %hi(D_80285B18) # $a1, 0x8028
-/* 127C00 802845C0 3C068028 */  lui   $a2, %hi(D_80285B54) # $a2, 0x8028
-/* 127C04 802845C4 24C65B54 */  addiu $a2, %lo(D_80285B54) # addiu $a2, $a2, 0x5b54
-/* 127C08 802845C8 24A55B18 */  addiu $a1, %lo(D_80285B18) # addiu $a1, $a1, 0x5b18
-/* 127C0C 802845CC 02002025 */  move  $a0, $s0
-/* 127C10 802845D0 0C0A0B64 */  jal   func_80282D90
-/* 127C14 802845D4 00003825 */   move  $a3, $zero
-/* 127C18 802845D8 8FBF001C */  lw    $ra, 0x1c($sp)
-/* 127C1C 802845DC 8FB00018 */  lw    $s0, 0x18($sp)
-/* 127C20 802845E0 27BD0020 */  addiu $sp, $sp, 0x20
-/* 127C24 802845E4 03E00008 */  jr    $ra
-/* 127C28 802845E8 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_802845EC.s b/asm/non_matchings/code_80281FA0/func_802845EC.s
deleted file mode 100644
index 4c9e1f4da..000000000
--- a/asm/non_matchings/code_80281FA0/func_802845EC.s
+++ /dev/null
@@ -1,13 +0,0 @@
-glabel func_802845EC
-/* 127C2C 802845EC 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 127C30 802845F0 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 127C34 802845F4 3C058028 */  lui   $a1, %hi(D_80285B90) # $a1, 0x8028
-/* 127C38 802845F8 3C068028 */  lui   $a2, %hi(D_80285BA8) # $a2, 0x8028
-/* 127C3C 802845FC 24C65BA8 */  addiu $a2, %lo(D_80285BA8) # addiu $a2, $a2, 0x5ba8
-/* 127C40 80284600 24A55B90 */  addiu $a1, %lo(D_80285B90) # addiu $a1, $a1, 0x5b90
-/* 127C44 80284604 0C0A0B64 */  jal   func_80282D90
-/* 127C48 80284608 00003825 */   move  $a3, $zero
-/* 127C4C 8028460C 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 127C50 80284610 27BD0018 */  addiu $sp, $sp, 0x18
-/* 127C54 80284614 03E00008 */  jr    $ra
-/* 127C58 80284618 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_8028461C.s b/asm/non_matchings/code_80281FA0/func_8028461C.s
deleted file mode 100644
index f91cd60ea..000000000
--- a/asm/non_matchings/code_80281FA0/func_8028461C.s
+++ /dev/null
@@ -1,12 +0,0 @@
-glabel func_8028461C
-/* 127C5C 8028461C 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 127C60 80284620 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 127C64 80284624 AFA40018 */  sw    $a0, 0x18($sp)
-/* 127C68 80284628 0C0A0C90 */  jal   func_80283240
-/* 127C6C 8028462C 24040001 */   li    $a0, 1
-/* 127C70 80284630 0C0A0EDB */  jal   func_80283B6C
-/* 127C74 80284634 8FA40018 */   lw    $a0, 0x18($sp)
-/* 127C78 80284638 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 127C7C 8028463C 27BD0018 */  addiu $sp, $sp, 0x18
-/* 127C80 80284640 03E00008 */  jr    $ra
-/* 127C84 80284644 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_80284648.s b/asm/non_matchings/code_80281FA0/func_80284648.s
deleted file mode 100644
index 5fe923c06..000000000
--- a/asm/non_matchings/code_80281FA0/func_80284648.s
+++ /dev/null
@@ -1,26 +0,0 @@
-glabel func_80284648
-/* 127C88 80284648 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 127C8C 8028464C AFA40018 */  sw    $a0, 0x18($sp)
-/* 127C90 80284650 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 127C94 80284654 3C048028 */  lui   $a0, %hi(D_802845EC) # $a0, 0x8028
-/* 127C98 80284658 248445EC */  addiu $a0, %lo(D_802845EC) # addiu $a0, $a0, 0x45ec
-/* 127C9C 8028465C 8FA50018 */  lw    $a1, 0x18($sp)
-/* 127CA0 80284660 00003025 */  move  $a2, $zero
-/* 127CA4 80284664 0C0A0CB1 */  jal   func_802832C4
-/* 127CA8 80284668 00003825 */   move  $a3, $zero
-/* 127CAC 8028466C 3C048028 */  lui   $a0, %hi(D_8028461C) # $a0, 0x8028
-/* 127CB0 80284670 2484461C */  addiu $a0, %lo(D_8028461C) # addiu $a0, $a0, 0x461c
-/* 127CB4 80284674 8FA50018 */  lw    $a1, 0x18($sp)
-/* 127CB8 80284678 24060110 */  li    $a2, 272
-/* 127CBC 8028467C 0C0A0CB1 */  jal   func_802832C4
-/* 127CC0 80284680 24070110 */   li    $a3, 272
-/* 127CC4 80284684 3C048028 */  lui   $a0, %hi(D_80283BA4) # $a0, 0x8028
-/* 127CC8 80284688 24843BA4 */  addiu $a0, %lo(D_80283BA4) # addiu $a0, $a0, 0x3ba4
-/* 127CCC 8028468C 8FA50018 */  lw    $a1, 0x18($sp)
-/* 127CD0 80284690 24060115 */  li    $a2, 277
-/* 127CD4 80284694 0C0A0CB1 */  jal   func_802832C4
-/* 127CD8 80284698 24070115 */   li    $a3, 277
-/* 127CDC 8028469C 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 127CE0 802846A0 27BD0018 */  addiu $sp, $sp, 0x18
-/* 127CE4 802846A4 03E00008 */  jr    $ra
-/* 127CE8 802846A8 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_802846AC.s b/asm/non_matchings/code_80281FA0/func_802846AC.s
deleted file mode 100644
index 26c9640a0..000000000
--- a/asm/non_matchings/code_80281FA0/func_802846AC.s
+++ /dev/null
@@ -1,3 +0,0 @@
-glabel func_802846AC
-/* 127CEC 802846AC 03E00008 */  jr    $ra
-/* 127CF0 802846B0 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_802846B4.s b/asm/non_matchings/code_80281FA0/func_802846B4.s
deleted file mode 100644
index c74356e76..000000000
--- a/asm/non_matchings/code_80281FA0/func_802846B4.s
+++ /dev/null
@@ -1,13 +0,0 @@
-glabel func_802846B4
-/* 127CF4 802846B4 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 127CF8 802846B8 AFBF0014 */  sw    $ra, 0x14($sp)
-/* 127CFC 802846BC 3C058028 */  lui   $a1, %hi(D_80285C38) # $a1, 0x8028
-/* 127D00 802846C0 3C068028 */  lui   $a2, %hi(D_80285C74) # $a2, 0x8028
-/* 127D04 802846C4 24C65C74 */  addiu $a2, %lo(D_80285C74) # addiu $a2, $a2, 0x5c74
-/* 127D08 802846C8 24A55C38 */  addiu $a1, %lo(D_80285C38) # addiu $a1, $a1, 0x5c38
-/* 127D0C 802846CC 0C0A0B64 */  jal   func_80282D90
-/* 127D10 802846D0 00003825 */   move  $a3, $zero
-/* 127D14 802846D4 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 127D18 802846D8 27BD0018 */  addiu $sp, $sp, 0x18
-/* 127D1C 802846DC 03E00008 */  jr    $ra
-/* 127D20 802846E0 00000000 */   nop   
diff --git a/asm/non_matchings/code_80281FA0/func_802847CC.s b/asm/non_matchings/code_80281FA0/func_802847CC.s
index 5ec74386b..2b832c237 100644
--- a/asm/non_matchings/code_80281FA0/func_802847CC.s
+++ b/asm/non_matchings/code_80281FA0/func_802847CC.s
@@ -46,28 +46,28 @@ glabel func_802847CC
 /* 127EB0 80284870 00594823 */  subu  $t1, $v0, $t9
 /* 127EB4 80284874 252AFFF6 */  addiu $t2, $t1, -0xa
 /* 127EB8 80284878 44D8F800 */  ctc1  $t8, $31
-/* 127EBC 8028487C 3C048028 */  lui   $a0, %hi(D_80283CD0) # $a0, 0x8028
+/* 127EBC 8028487C 3C048028 */  lui   $a0, %hi(func_80283CD0) # $a0, 0x8028
 /* 127EC0 80284880 A7AA002E */  sh    $t2, 0x2e($sp)
 /* 127EC4 80284884 A7A2002C */  sh    $v0, 0x2c($sp)
-/* 127EC8 80284888 24843CD0 */  addiu $a0, %lo(D_80283CD0) # addiu $a0, $a0, 0x3cd0
+/* 127EC8 80284888 24843CD0 */  addiu $a0, %lo(func_80283CD0) # addiu $a0, $a0, 0x3cd0
 /* 127ECC 8028488C 02002825 */  move  $a1, $s0
 /* 127ED0 80284890 00003025 */  move  $a2, $zero
 /* 127ED4 80284894 0C0A0CB1 */  jal   func_802832C4
 /* 127ED8 80284898 00003825 */   move  $a3, $zero
-/* 127EDC 8028489C 3C048028 */  lui   $a0, %hi(D_80283A00) # $a0, 0x8028
-/* 127EE0 802848A0 24843A00 */  addiu $a0, %lo(D_80283A00) # addiu $a0, $a0, 0x3a00
+/* 127EDC 8028489C 3C048028 */  lui   $a0, %hi(func_80283A00) # $a0, 0x8028
+/* 127EE0 802848A0 24843A00 */  addiu $a0, %lo(func_80283A00) # addiu $a0, $a0, 0x3a00
 /* 127EE4 802848A4 02002825 */  move  $a1, $s0
 /* 127EE8 802848A8 24060008 */  li    $a2, 8
 /* 127EEC 802848AC 0C0A0CB1 */  jal   func_802832C4
 /* 127EF0 802848B0 24070008 */   li    $a3, 8
-/* 127EF4 802848B4 3C048028 */  lui   $a0, %hi(D_80283C78) # $a0, 0x8028
-/* 127EF8 802848B8 24843C78 */  addiu $a0, %lo(D_80283C78) # addiu $a0, $a0, 0x3c78
+/* 127EF4 802848B4 3C048028 */  lui   $a0, %hi(func_80283C78) # $a0, 0x8028
+/* 127EF8 802848B8 24843C78 */  addiu $a0, %lo(func_80283C78) # addiu $a0, $a0, 0x3c78
 /* 127EFC 802848BC 02002825 */  move  $a1, $s0
 /* 127F00 802848C0 24060095 */  li    $a2, 149
 /* 127F04 802848C4 0C0A0CB1 */  jal   func_802832C4
 /* 127F08 802848C8 24070095 */   li    $a3, 149
-/* 127F0C 802848CC 3C048028 */  lui   $a0, %hi(D_80282434) # $a0, 0x8028
-/* 127F10 802848D0 24842434 */  addiu $a0, %lo(D_80282434) # addiu $a0, $a0, 0x2434
+/* 127F0C 802848CC 3C048028 */  lui   $a0, %hi(func_80282434) # $a0, 0x8028
+/* 127F10 802848D0 24842434 */  addiu $a0, %lo(func_80282434) # addiu $a0, $a0, 0x2434
 /* 127F14 802848D4 02002825 */  move  $a1, $s0
 /* 127F18 802848D8 00003025 */  move  $a2, $zero
 /* 127F1C 802848DC 0C0A0CB1 */  jal   func_802832C4
@@ -79,22 +79,22 @@ glabel func_802847CC
 /* 127F34 802848F4 000B6100 */  sll   $t4, $t3, 4
 /* 127F38 802848F8 004C1021 */  addu  $v0, $v0, $t4
 /* 127F3C 802848FC 90426A04 */  lbu   $v0, %lo(D_80286A04)($v0) # 0x6a04
-/* 127F40 80284900 3C048028 */  lui   $a0, %hi(D_802839CC) # $a0, 0x8028
-/* 127F44 80284904 248439CC */  addiu $a0, %lo(D_802839CC) # addiu $a0, $a0, 0x39cc
+/* 127F40 80284900 3C048028 */  lui   $a0, %hi(func_802839CC) # $a0, 0x8028
+/* 127F44 80284904 248439CC */  addiu $a0, %lo(func_802839CC) # addiu $a0, $a0, 0x39cc
 /* 127F48 80284908 10410006 */  beq   $v0, $at, .L80284924
 /* 127F4C 8028490C 02002825 */   move  $a1, $s0
 /* 127F50 80284910 24010002 */  li    $at, 2
 /* 127F54 80284914 10410013 */  beq   $v0, $at, .L80284964
-/* 127F58 80284918 3C048028 */   lui   $a0, %hi(D_802839E0) # 0x8028
+/* 127F58 80284918 3C048028 */   lui   $a0, %hi(func_802839B4) # 0x8028
 /* 127F5C 8028491C 10000029 */  b     .L802849C4
-/* 127F60 80284920 3C048028 */   lui   $a0, %hi(D_802839E0) # 0x8028
+/* 127F60 80284920 3C048028 */   lui   $a0, %hi(func_802839B4) # 0x8028
 .L80284924:
 /* 127F64 80284924 00003025 */  move  $a2, $zero
 /* 127F68 80284928 0C0A0CB1 */  jal   func_802832C4
 /* 127F6C 8028492C 2407FFFF */   li    $a3, -1
 /* 127F70 80284930 97A6002E */  lhu   $a2, 0x2e($sp)
-/* 127F74 80284934 3C048028 */  lui   $a0, %hi(D_802839E0) # $a0, 0x8028
-/* 127F78 80284938 248439E0 */  addiu $a0, %lo(D_802839E0) # addiu $a0, $a0, 0x39e0
+/* 127F74 80284934 3C048028 */  lui   $a0, %hi(func_802839E0) # $a0, 0x8028
+/* 127F78 80284938 248439E0 */  addiu $a0, %lo(func_802839E0) # addiu $a0, $a0, 0x39e0
 /* 127F7C 8028493C 24C6FFEC */  addiu $a2, $a2, -0x14
 /* 127F80 80284940 00066C00 */  sll   $t5, $a2, 0x10
 /* 127F84 80284944 000D3403 */  sra   $a2, $t5, 0x10
@@ -106,13 +106,13 @@ glabel func_802847CC
 /* 127F9C 8028495C 10000040 */  b     .L80284A60
 /* 127FA0 80284960 00000000 */   nop   
 .L80284964:
-/* 127FA4 80284964 248439B4 */  addiu $a0, $a0, %lo(D_802839B4) # 0x39b4
+/* 127FA4 80284964 248439B4 */  addiu $a0, $a0, %lo(func_802839B4) # 0x39b4
 /* 127FA8 80284968 02002825 */  move  $a1, $s0
 /* 127FAC 8028496C 00003025 */  move  $a2, $zero
 /* 127FB0 80284970 0C0A0CB1 */  jal   func_802832C4
 /* 127FB4 80284974 00003825 */   move  $a3, $zero
-/* 127FB8 80284978 3C048028 */  lui   $a0, %hi(D_80283D04) # $a0, 0x8028
-/* 127FBC 8028497C 24843D04 */  addiu $a0, %lo(D_80283D04) # addiu $a0, $a0, 0x3d04
+/* 127FB8 80284978 3C048028 */  lui   $a0, %hi(func_80283D04) # $a0, 0x8028
+/* 127FBC 8028497C 24843D04 */  addiu $a0, %lo(func_80283D04) # addiu $a0, $a0, 0x3d04
 /* 127FC0 80284980 02002825 */  move  $a1, $s0
 /* 127FC4 80284984 240600F7 */  li    $a2, 247
 /* 127FC8 80284988 0C0A0CB1 */  jal   func_802832C4
@@ -131,14 +131,14 @@ glabel func_802847CC
 /* 127FFC 802849BC 10000028 */  b     .L80284A60
 /* 128000 802849C0 00000000 */   nop   
 .L802849C4:
-/* 128004 802849C4 248439B4 */  addiu $a0, $a0, %lo(D_802839B4) # 0x39b4
+/* 128004 802849C4 248439B4 */  addiu $a0, $a0, %lo(func_802839B4) # 0x39b4
 /* 128008 802849C8 02002825 */  move  $a1, $s0
 /* 12800C 802849CC 00003025 */  move  $a2, $zero
 /* 128010 802849D0 0C0A0CB1 */  jal   func_802832C4
 /* 128014 802849D4 00003825 */   move  $a3, $zero
 /* 128018 802849D8 97A2002E */  lhu   $v0, 0x2e($sp)
-/* 12801C 802849DC 3C048028 */  lui   $a0, %hi(D_802839CC) # $a0, 0x8028
-/* 128020 802849E0 248439CC */  addiu $a0, %lo(D_802839CC) # addiu $a0, $a0, 0x39cc
+/* 12801C 802849DC 3C048028 */  lui   $a0, %hi(func_802839CC) # $a0, 0x8028
+/* 128020 802849E0 248439CC */  addiu $a0, %lo(func_802839CC) # addiu $a0, $a0, 0x39cc
 /* 128024 802849E4 00023400 */  sll   $a2, $v0, 0x10
 /* 128028 802849E8 00064C03 */  sra   $t1, $a2, 0x10
 /* 12802C 802849EC 00093C00 */  sll   $a3, $t1, 0x10
@@ -149,8 +149,8 @@ glabel func_802847CC
 /* 128040 80284A00 0C0A0CB1 */  jal   func_802832C4
 /* 128044 80284A04 AFA20024 */   sw    $v0, 0x24($sp)
 /* 128048 80284A08 8FA20024 */  lw    $v0, 0x24($sp)
-/* 12804C 80284A0C 3C048028 */  lui   $a0, %hi(D_802839E0) # $a0, 0x8028
-/* 128050 80284A10 248439E0 */  addiu $a0, %lo(D_802839E0) # addiu $a0, $a0, 0x39e0
+/* 12804C 80284A0C 3C048028 */  lui   $a0, %hi(func_802839E0) # $a0, 0x8028
+/* 128050 80284A10 248439E0 */  addiu $a0, %lo(func_802839E0) # addiu $a0, $a0, 0x39e0
 /* 128054 80284A14 2446FFEC */  addiu $a2, $v0, -0x14
 /* 128058 80284A18 00065C00 */  sll   $t3, $a2, 0x10
 /* 12805C 80284A1C 000B3403 */  sra   $a2, $t3, 0x10
diff --git a/data/data_0DD0A0_2_1.s b/data/data_0DD0A0_2_1.s
index df8ad6a88..dec478cac 100644
--- a/data/data_0DD0A0_2_1.s
+++ b/data/data_0DD0A0_2_1.s
@@ -13,7 +13,6 @@
 
 #.word 0x00000000
 
-
 #.word 0x00000000
 
 #.word 0x00000000
@@ -54,4 +53,3 @@ glabel D_800EB3B4
 # .word __osBaseTimer
 
 # .word 0x00000000, 0x00000000, 0x00000000
-
diff --git a/data/data_credits_128480.s b/data/data_credits_128480.s
index 4a11c0db4..758b0c42b 100644
--- a/data/data_credits_128480.s
+++ b/data/data_credits_128480.s
@@ -5,7 +5,6 @@
 # Credits
 # 128480-12AAE0 [2660]
 
-# D_8028461C
 glabel D_80284E40
 .word 0x00FF4080
 .word 0x008040FF
@@ -455,20 +454,14 @@ glabel D_80285B18
 
 glabel D_80285B54
 .word 0x00000018
-
-
 .word 0x0000F307, 0x012FFE96
 .word 0x00000018, 0x0000F307, 0x012FFE96, 0x0000001F
-
 .word 0x0000F326, 0x00CEFF12, 0x00000041, 0x0000F35A
 .word 0x0000FF9E, 0xFF000041
-
 .word 0x0000F35A, 0x0000FF9E
 
 glabel D_80285B90
 .word 0x00000000, 0x0000F5BB
-
-
 .word 0x0008FE7E, 0xFF000000
 .word 0x0000F5BB, 0x0008FE7E
 
@@ -481,16 +474,13 @@ glabel D_80285BA8
 .word 0xFF000000, 0x0000F6CD, 0x001BFEA9, 0x00000046
 .word 0x0000F4A5, 0xFFF0FE49, 0x000000C8, 0x0000F4A5
 .word 0xFFF0FE49, 0x00000047
-
-
 .word 0x0000F4A5, 0xFFF0FE49
 .word 0x0000001E, 0x0000F4CE
-
-
 .word 0x0046FE4D, 0xFF00001E
 .word 0x0000F4EB, 0x0084FE5C
 
 glabel D_80285C38
+
 .word 0x00000000, 0x0000F4ED
 .word 0xFFEBFF66, 0x00000000, 0x0000F4ED, 0xFFEBFF66
 .word 0x00000000
diff --git a/include/types.h b/include/types.h
index 95430de1e..a21fd261f 100644
--- a/include/types.h
+++ b/include/types.h
@@ -106,6 +106,13 @@ struct UnkStruct_802B53C8 {
     f32 unkC;
 };
 // end math util structs
+
+struct UnkStruct_800DDB68 {
+    s32 *D_800ED600; s32 *D_800ED608; s32 *D_800ED610; s32 *D_800ED618;
+    s32 *D_800ED620; s32 *D_800ED628; s32 *D_800ED630; s32 *D_800ED638;
+};
+
+
 typedef struct {
     s16        ob[3];    /* x, y, z */
     s16        tc[2];    /* texture coord */
diff --git a/mk64.ld b/mk64.ld
index cc4346616..dd3484903 100644
--- a/mk64.ld
+++ b/mk64.ld
@@ -225,6 +225,7 @@ SECTIONS
       BUILD_DIR/src/staff_ghosts.o(.data);
       BUILD_DIR/data/data_0DD0A0_1.o(.data);
       BUILD_DIR/src/code_8001C4D0.o(.data);
+      BUILD_DIR/src/code_8001F980.o(.data);
       BUILD_DIR/data/data_0DD0A0_1_1.o(.data);
       BUILD_DIR/src/kart_attributes.inc.o(.data);
       BUILD_DIR/data/data_0DD0A0_2.o(.rodata);
diff --git a/src/audio/data.c b/src/audio/data.c
index bfc523131..c0e12c35f 100644
--- a/src/audio/data.c
+++ b/src/audio/data.c
@@ -424,4 +424,4 @@ f32 gDefaultPanVolume[128] = {
     0.280653f, 0.268761f, 0.256827f, 0.244854f, 0.232844f, 0.220798f, 0.208718f, 0.196606f,
     0.184465f, 0.172295f, 0.160098f, 0.147877f, 0.135634f, 0.12337f,  0.111087f, 0.098786f,
     0.086471f, 0.074143f, 0.061803f, 0.049454f, 0.037097f, 0.024734f, 0.012368f, 0.0f
-};
\ No newline at end of file
+};
diff --git a/src/code_8001F980.c b/src/code_8001F980.c
index bea4a9279..7c9e4bc59 100644
--- a/src/code_8001F980.c
+++ b/src/code_8001F980.c
@@ -1,6 +1,22 @@
 #include <ultra64.h>
 #include <macros.h>
 #include <defines.h>
+#include "framebuffers.h"
+
+extern s32 D_800ED600, D_800ED608, D_800ED610, D_800ED618, D_800ED620, D_800ED628, D_800ED630;
+extern s32 D_800ED638;
+
+// Not yet implemented. Needs more work to match.
+// Remove ifdef when matching.
+#ifdef NON_MATCHING
+s8 D_800DDB50[] = {
+    0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02
+};
+
+s32 D_800DDB58[] = {
+    0x00000000, gFramebuffer0, gFramebuffer1, gFramebuffer2
+};
+#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
diff --git a/src/code_8008C1D0.c b/src/code_8008C1D0.c
index 98a85338a..e2733e147 100644
--- a/src/code_8008C1D0.c
+++ b/src/code_8008C1D0.c
@@ -2984,6 +2984,8 @@ void func_80090868(void *arg0) {
 GLOBAL_ASM("asm/non_matchings/code_8008C1D0/func_80090868.s")
 #endif
 
+// Note that D_80004334 is a fake pointer.
+// Should put this func through mips to C prior to decomp.
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
 ? func_800225CC(void *, f32, ?);                    /* extern */
@@ -3072,6 +3074,7 @@ void func_80090970(void *arg0, s8 arg1, s8 arg2) {
         if (&D_80004334 != (arg0->unkBC & &D_80004334)) {
             // Error: Got lui instruction with macro other than %hi
             // At instruction: lui $at, %lo(D_80004334)
+            // D_80004334 FAKE POINTER
         } else {
             func_8008FB30(arg0, arg1);
         default:
diff --git a/src/code_80281FA0.c b/src/code_80281FA0.c
index 77aa84579..60002ea80 100644
--- a/src/code_80281FA0.c
+++ b/src/code_80281FA0.c
@@ -3,6 +3,13 @@
 #include <types.h>
 #include <common_structs.h>
 
+extern Player *D_800DC4DC;
+extern Player *D_800DC4E0;
+extern Player *D_800DC4E4;
+extern Player *D_800DC4E8;
+
+s32 func_802832C4(s32, s32, s16, s16);
+
 void func_80281FA0(Vec3f arg0, f32 arg1, f32 arg2, f32 arg3) {
     arg0[0] = arg1;
     arg0[1] = arg2;
@@ -522,49 +529,32 @@ loop_1:
 GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80282C40.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-s32 func_802828C8(s32, s32, ? *, ? *, ? *); // extern
-? func_80282C40(? *, s32, s32); // extern
-? func_802832C4(? *, s32, ?, ?); // extern
-extern ? D_80282434;
-extern ? D_80287818;
-extern ? D_80287998;
-extern ? D_80287B18;
-extern ? D_80287B1C;
+extern s32 D_80287818;
+extern s32 D_80287998;
 
 s32 func_80282D90(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
-    s32 sp28;
     s32 sp24;
+    s32 sp28;
     s32 temp_a1;
 
-    func_802832C4(&D_80282434, arg0, 0, 0);
+    func_802832C4(&func_80282434, arg0, 0, 0);
     func_80282C40(&D_80287818, arg1, arg3);
-    func_80282C40(&D_80287998, arg2, arg3);
-    temp_a1 = arg0 + 0x18;
-    sp24 = temp_a1;
-    sp28 = func_802828C8(arg0 + 0xC, temp_a1, &D_80287818, &D_80287B1C, &D_80287B18);
-    return func_802828C8(arg0, temp_a1, &D_80287998, &D_80287B1C, &D_80287B18) | sp28;
+    
+        func_80282C40(&D_80287998, arg2, arg3);
+
+        do { 
+            temp_a1 = arg0 + 0x18;
+            sp24 = temp_a1;
+        } while (0);
+
+        // Needed for matching including the above while loop.
+        sp28 = func_802828C8(arg0 + 0xC, temp_a1, &D_80287818, &D_80287B1C, &D_80287B18); return func_802828C8(arg0, temp_a1, &D_80287998, &D_80287B1C, &D_80287B18) | sp28;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80282D90.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_802828C8(s32, s32, ? *, ? *, ? *); // extern
-? func_80282C40(? *); // extern
-extern ? D_80287818;
-extern ? D_80287B18;
-extern ? D_80287B1C;
-
-void func_80282E58(s32 arg0) {
-    func_80282C40(&D_80287818);
+void func_80282E58(s32 arg0, s32 arg1, s32 arg2) {
+    func_80282C40(&D_80287818, arg1, arg2);
     func_802828C8(arg0 + 0xC, arg0 + 0x18, &D_80287818, &D_80287B1C, &D_80287B18);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80282E58.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -584,18 +574,13 @@ void func_80282EAC(s32 arg0, s32 arg1, s16 arg2, s16 arg3, s16 arg4) {
 GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80282EAC.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
 void func_80282F00(s16 *arg0, s16 arg1) {
     if (arg1 == -0x8000) {
         *arg0 = (*arg0 & 0x8000) + 0xC000;
         return;
     }
-    *arg0 = *arg0 + arg1;
+    *arg0 += arg1;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80282F00.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -701,21 +686,18 @@ void func_80283240(s16 arg0) {
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
 extern s16 D_802876D2;
 
-? func_802832C4(? (*arg0)(?), ? arg1, s16 arg2, s16 arg3) {
-    s16 temp_v0;
+s32 func_802832C4(s32 arg0, s32 arg1, s16 arg2, s16 arg3) {
 
-    temp_v0 = D_802876D2;
-    if ((temp_v0 >= arg2) && ((arg3 == -1) || (arg3 >= temp_v0))) {
-        arg0(arg1);
+    if ((D_802876D2 >= arg2) && ((arg3 == -1) || (arg3 >= D_802876D2))) {
+        return arg0;
     }
-    return 0;
+    return arg1;
 }
 #else
 GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_802832C4.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
+
 extern s16 D_802876D0;
 extern s16 D_802876D2;
 extern s32 D_802876D4;
@@ -730,9 +712,6 @@ s32 func_80283330(s32 arg0) {
     }
     return D_802876D8;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283330.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -771,14 +750,9 @@ s32 func_8028336C(s32 arg0, ? arg1) {
 GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_8028336C.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80283428(void) {
+s32 func_80283428(void) {
     return 0;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283428.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -992,64 +966,30 @@ s32 func_80283648(? *arg0) {
 GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283648.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_8028100C(?, ?, ?); // extern
-
 void func_80283968(s32 arg0) {
     func_8028100C(-0xC6C, 0xD2, -0x1EF);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283968.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80280FFC(); // extern
 
 void func_80283994(s32 arg0) {
     func_80280FFC();
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283994.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
 extern f32 D_802856B8;
 
 void func_802839B4(s32 arg0) {
     D_802856B8 = 52.0f;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_802839B4.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
 extern f32 D_802856B8;
 
 void func_802839CC(s32 arg0) {
     D_802856B8 = 0.0f;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_802839CC.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80092C80(); // extern
 
 void func_802839E0(s32 arg0) {
     func_80092C80();
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_802839E0.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? play_sound2(?); // extern
 extern u16 D_800DC5E4;
 
 void func_80283A00(s32 arg0) {
@@ -1057,175 +997,67 @@ void func_80283A00(s32 arg0) {
         play_sound2(0x49009009);
     }
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283A00.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800CA0CC(); // extern
 
 void func_80283A34(s32 arg0) {
     func_800CA0CC();
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283A34.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? play_sound2(?); // extern
 
 void func_80283A54(s32 arg0) {
     play_sound2(0x49009014);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283A54.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? play_sound2(?); // extern
 
 void func_80283A7C(s32 arg0) {
     play_sound2(0x4900801E);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283A7C.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? play_sound2(?); // extern
 
 void func_80283AA4(s32 arg0) {
     play_sound2(0x4900801F);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283AA4.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? play_sound2(?); // extern
 
 void func_80283ACC(s32 arg0) {
     play_sound2(0x49008020);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283ACC.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? play_sound2(?); // extern
 
 void func_80283AF4(s32 arg0) {
     play_sound2(0x49008021);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283AF4.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? play_sound2(?); // extern
 
 void func_80283B1C(s32 arg0) {
     play_sound2(0x49008022);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283B1C.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? play_sound2(?); // extern
 
 void func_80283B44(s32 arg0) {
     play_sound2(0x49008023);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283B44.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800C9060(?, ?); // extern
-? func_800CA0A0(); // extern
-? func_800CA0B8(); // extern
 
 void func_80283B6C(s32 arg0) {
     func_800CA0B8();
     func_800C9060(0, 0x19009005);
     func_800CA0A0();
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283B6C.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800C90F4(?, s32); // extern
-? func_800CA0A0(); // extern
-? func_800CA0B8(); // extern
 
 void func_80283BA4(s32 arg0) {
     func_800CA0B8();
     func_800C90F4(0, (D_800DC4E8->characterId * 0x10) + 0x29008004);
     func_800CA0A0();
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283BA4.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800C8EF8(?); // extern
 
 void func_80283BF0(s32 arg0) {
     func_800C8EF8(0x1A);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283BF0.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800C8EF8(?); // extern
 
 void func_80283C14(s32 arg0) {
     func_800C8EF8(0x1B);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283C14.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800CB134(); // extern
 
 void func_80283C38(s32 arg0) {
     func_800CB134();
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283C38.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800CB14C(); // extern
 
 void func_80283C58(s32 arg0) {
     func_800CB14C();
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283C58.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800C8EF8(?); // extern
 extern u16 D_800DC5E4;
 
 void func_80283C78(s32 arg0) {
@@ -1233,24 +1065,11 @@ void func_80283C78(s32 arg0) {
         func_800C8EF8(0x1C);
     }
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283C78.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800CA008(?, ?); // extern
 
 void func_80283CA8(s32 arg0) {
     func_800CA008(0, 3);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283CA8.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_800CA008(?, ?); // extern
 extern u16 D_800DC5E4;
 
 void func_80283CD0(s32 arg0) {
@@ -1258,81 +1077,43 @@ void func_80283CD0(s32 arg0) {
         func_800CA008(0, 2);
     }
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283CD0.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? play_sound2(?); // extern
 
 void func_80283D04(s32 arg0) {
     play_sound2(0x49008026);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283D04.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80282D90(s32, ? *, ? *, ?); // extern
-? func_802832C4(? *, s32, s16, s16); // extern
-extern ? D_80283994;
-extern ? D_80283A34;
-extern ? D_80283A7C;
-extern ? D_80283BF0;
-extern ? D_80283CA8;
 extern f32 D_802856B8;
-extern ? D_802856DC;
-extern ? D_80285718;
+extern s32 D_802856DC;
+extern s32 D_80285718;
 extern s16 D_80285D14;
 
 void func_80283D2C(s32 arg0) {
-    s16 temp_a2;
-
     D_802856B8 = 120.0f;
-    func_802832C4(&D_80283CA8, arg0, 0, 0);
-    func_802832C4(&D_80283A34, arg0, 1, 1);
-    func_802832C4(&D_80283BF0, arg0, 0, 0);
-    func_802832C4(&D_80283A7C, arg0, 0x2D, 0x2D);
-    func_802832C4(&D_80283A7C, arg0, 0x41, 0x41);
-    func_802832C4(&D_80283A7C, arg0, 0x46, 0x46);
-    func_802832C4(&D_80283A7C, arg0, 0x5E, 0x5E);
-    func_802832C4(&D_80283A7C, arg0, 0x6E, 0x6E);
-    func_802832C4(&D_80283A7C, arg0, 0x82, 0x82);
-    func_802832C4(&D_80283A7C, arg0, 0x98, 0x98);
-    func_802832C4(&D_80283A7C, arg0, 0xA0, 0xA0);
-    temp_a2 = D_80285D14 - 0x3C;
-    func_802832C4(&D_80283994, arg0, temp_a2, temp_a2);
+    func_802832C4(&func_80283CA8, arg0, 0, 0);
+    func_802832C4(&func_80283A34, arg0, 1, 1);
+    func_802832C4(&func_80283BF0, arg0, 0, 0);
+    func_802832C4(&func_80283A7C, arg0, 0x2D, 0x2D);
+    func_802832C4(&func_80283A7C, arg0, 0x41, 0x41);
+    func_802832C4(&func_80283A7C, arg0, 0x46, 0x46);
+    func_802832C4(&func_80283A7C, arg0, 0x5E, 0x5E);
+    func_802832C4(&func_80283A7C, arg0, 0x6E, 0x6E);
+    func_802832C4(&func_80283A7C, arg0, 0x82, 0x82);
+    func_802832C4(&func_80283A7C, arg0, 0x98, 0x98);
+    func_802832C4(&func_80283A7C, arg0, 0xA0, 0xA0);
+    func_802832C4(&func_80283994, arg0, D_80285D14 - 0x3C, D_80285D14 - 0x3C);
     func_80282D90(arg0, &D_802856DC, &D_80285718, 0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283D2C.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80282D90(? *, ? *, ?); // extern
-extern ? D_80285754;
-extern ? D_80285784;
+extern s32 D_80285754;
+extern s32 D_80285784;
 
-void func_80283EA0(void) {
-    func_80282D90(&D_80285754, &D_80285784, 0);
+void func_80283EA0(s32 arg0) {
+    func_80282D90(arg0, &D_80285754, &D_80285784, 0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283EA0.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80282008(f32 *); // extern
-
-void func_80283ED0(void) {
-    func_80282008(&D_800DC4E0->posX);
+void func_80283ED0(Vec3f arg0) {
+    func_80282008(arg0, &D_800DC4E0->posX);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283ED0.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -1347,119 +1128,74 @@ void func_80283EF8(s32 arg0) {
 GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283EF8.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80282E58(s32, ? *, ?); // extern
-? func_802832C4(? *, s32, ?, ?); // extern
-extern ? D_80283ED0;
-extern ? D_80283EF8;
-extern ? D_802857B4;
-
+extern s32 D_802857B4;
+extern void func_80283EF8();
 void func_80283F6C(s32 arg0) {
-    func_802832C4(&D_80283ED0, arg0, 0, 0);
-    func_802832C4(&D_80283EF8, arg0, 0, -1);
+    func_802832C4(&func_80283ED0, arg0, 0, 0);
+    func_802832C4(&func_80283EF8, arg0, 0, -1);
     func_80282E58(arg0, &D_802857B4, 0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283F6C.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80282008(f32 *); // extern
-
-void func_80283FCC(void) {
-    func_80282008(&D_800DC4E4->posX);
+void func_80283FCC(Vec3f arg0) {
+    func_80282008(arg0, &D_800DC4E4->posX);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283FCC.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_802821A0(f32, f32, ?); // extern
+//? func_802821A0(f32, f32, ?); // extern
 
-void func_80283FF4(s32 arg0) {
+void func_80283FF4(f32 arg0) {
     func_802821A0(D_800DC4E4->posX, 0.12f);
-    func_802821A0((bitwise f32) (arg0 + 4), D_800DC4E4->posY, 0x3DF5C28F);
-    func_802821A0((bitwise f32) (arg0 + 8), D_800DC4E4->posZ, 0x3DF5C28F);
+    func_802821A0(arg0 + 4, D_800DC4E4->posY, 0x3DF5C28F);
+    func_802821A0(arg0 + 8, D_800DC4E4->posZ, 0x3DF5C28F);
 }
 #else
 GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283FF4.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80282E58(s32, ? *, ?); // extern
-? func_802832C4(? *, s32, ?, ?); // extern
-extern ? D_80283FCC;
-extern ? D_80283FF4;
-extern ? D_802857CC;
-
+extern s32 D_80283FCC;
+extern s32 D_80283FF4;
+extern s32 D_802857CC;
+extern void func_80283FF4();
 void func_80284068(s32 arg0) {
-    func_802832C4(&D_80283FCC, arg0, 0, 0);
-    func_802832C4(&D_80283FF4, arg0, 0, -1);
+    func_802832C4(&func_80283FCC, arg0, 0, 0);
+    func_802832C4(&func_80283FF4, arg0, 0, -1);
     func_80282E58(arg0, &D_802857CC, 0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80284068.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_802832C4(? *, s32, ?, ?); // extern
-? func_80283EA0(s32, s32); // extern
-? func_80283F6C(s32, s32); // extern
-? func_80284068(s32, s32); // extern
-extern ? D_80283C14;
 extern s32 D_802876D8;
 
 void func_802840C8(s32 arg0) {
-    s32 temp_a1;
-    s32 temp_v0;
+    func_802832C4(&func_80283C14, arg0, 5, 5);
 
-    temp_a1 = arg0;
-    arg0 = temp_a1;
-    func_802832C4(&D_80283C14, temp_a1, 5, 5);
-    temp_v0 = D_802876D8;
-    if (temp_v0 != 2) {
-        if (temp_v0 != 3) {
-            if (temp_v0 != 4) {
-                return;
-            }
-            func_80284068(arg0, arg0);
-            return;
-        }
-        func_80283F6C(arg0, arg0);
-        return;
+    switch(D_802876D8) {
+        case 2:
+            func_80283EA0(arg0);
+            break;
+        case 3:
+            func_80283F6C(arg0);
+            break;
+        case 4:
+            func_80284068(arg0);
+            break;
     }
-    func_80283EA0(arg0, arg0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_802840C8.s")
-#endif
+
+extern s32 D_80285910;
+extern s32 D_80285928;
+
+void func_80284154(s32 arg0) {
+    func_80282D90(arg0, &D_80285910, &D_80285928, 0);
+}
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80282D90(? *, ? *, ?); // extern
-extern ? D_80285910;
-extern ? D_80285928;
-
-void func_80284154(void) {
-    func_80282D90(&D_80285910, &D_80285928, 0);
-}
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80284154.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_802821A0(void *, f32, ?); // extern
-extern ? D_80165C20;
+//? func_802821A0(void *, f32, ?); // extern
+extern s32 D_80165C20;
 extern s32 D_80183EAC;
 extern f32 D_80287478;
 
-void func_80284184(void *arg0) {
+void func_80284184(s32 *arg0) {
     f32 temp_f0;
 
     temp_f0 = arg0->unk10;
@@ -1469,69 +1205,41 @@ void func_80284184(void *arg0) {
 GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80284184.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80281FA0(s32, ?, ?, ?); // extern
-? func_80282E58(? *, ?); // extern
-extern ? D_80285940;
+extern s32 D_80285940;
 
-void func_802841E8(s32 arg0) {
-    func_80282E58(&D_80285940, 0);
-    func_80281FA0(arg0, 0xC5482000, 0x42B40000, 0xC3EF0000);
+void func_802841E8(Vec3f arg0) {
+  func_80282E58(arg0, &D_80285940, 0);
+  func_80281FA0(arg0, -3202.0f, 90.0f, -478.0f);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_802841E8.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_802832C4(? *, s32, ?, ?); // extern
-extern ? D_80283AF4;
-extern ? D_80283B44;
-extern ? D_80284184;
-extern ? D_802841E8;
+extern void func_802841E8();
+extern void func_80284184();
 
 void func_8028422C(s32 arg0) {
-    func_802832C4(&D_80283AF4, arg0, 6, 6);
-    func_802832C4(&D_80283B44, arg0, 0x1E, 0x1E);
-    func_802832C4(&D_802841E8, arg0, 0, 0);
-    func_802832C4(&D_80284184, arg0, 6, -1);
+    func_802832C4(&func_80283AF4, arg0, 6, 6);
+    func_802832C4(&func_80283B44, arg0, 0x1E, 0x1E);
+    func_802832C4(&func_802841E8, arg0, 0, 0);
+    func_802832C4(&func_80284184, arg0, 6, -1);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_8028422C.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80282D90(? *, ? *, ?); // extern
-extern ? D_802858B0;
-extern ? D_802858C8;
+extern s32 D_802858B0;
+extern s32 D_802858C8;
 
-void func_802842A8(void) {
-    func_80282D90(&D_802858B0, &D_802858C8, 0);
+void func_802842A8(s32 arg0) {
+    func_80282D90(arg0, &D_802858B0, &D_802858C8, 0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_802842A8.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80282D90(? *, ? *, ?); // extern
-extern ? D_802857F0;
-extern ? D_80285850;
+extern s32 D_802857F0;
+extern s32 D_80285850;
 
-void func_802842D8(void) {
-    func_80282D90(&D_802857F0, &D_80285850, 0);
+void func_802842D8(s32 arg0) {
+    func_80282D90(arg0, &D_802857F0, &D_80285850, 0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_802842D8.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
 ? func_80282D90(void *, ? *, ? *, ?); // extern
 ? func_802832C4(? *, void *, ?, ?); // extern
-extern ? D_80283A54;
 extern ? D_802858E0;
 extern ? D_802858F8;
 extern ? D_80285A00;
@@ -1539,7 +1247,7 @@ extern s8 D_802874F5;
 
 void func_80284308(void *arg0) {
     s32 sp30;
-    Player *temp_v1;
+    Player *player = &D_800DC4DC;
     f32 temp_f0;
     f32 temp_f12;
     f32 temp_f2;
@@ -1549,13 +1257,13 @@ void func_80284308(void *arg0) {
     sp30.unk4 = D_80285A00.unk4;
     sp30.unkC = D_80285A00.unkC;
     sp30.unk8 = D_80285A00.unk8;
-    func_802832C4(&D_80283A54, arg0, 0x8C, 0x8C);
+    func_802832C4(&func_80283A54, arg0, 0x8C, 0x8C);
     func_80282D90(arg0, &D_802858E0, &D_802858F8, 0);
     temp_v0 = *(sp30 + (D_802874F5 * 4));
-    temp_v1 = D_800DC4DC;
-    temp_f0 = temp_v0->unk14 - temp_v1->posX;
-    temp_f12 = temp_v0->unk1C - temp_v1->posZ;
-    temp_f2 = temp_v0->unk18 - temp_v1->posY;
+    //player = D_800DC4DC;
+    temp_f0 = temp_v0->unk14 - player->posX;
+    temp_f12 = temp_v0->unk1C - player->posZ;
+    temp_f2 = temp_v0->unk18 - player->posY;
     arg0->unkC = arg0->unkC + temp_f0;
     arg0->unk0 = arg0->unk0 + temp_f0;
     arg0->unk14 = arg0->unk14 + temp_f12;
@@ -1567,158 +1275,84 @@ void func_80284308(void *arg0) {
 GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80284308.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80282D90(s32, ? *, ? *, ?); // extern
-? func_802832C4(? *, s32, ?, ?); // extern
-extern ? D_80283B1C;
-extern ? D_80285A10;
-extern ? D_80285A4C;
+extern s32 D_80285A10;
+extern s32 D_80285A4C;
 
 void func_80284418(s32 arg0) {
-    ? *sp1C;
-
-    sp1C = &D_80283B1C;
-    func_802832C4(&D_80283B1C, arg0, 0x52, 0x52);
-    func_802832C4(&D_80283B1C, arg0, 0x48, 0x48);
-    func_802832C4(&D_80283B1C, arg0, 0x3D, 0x3D);
+    func_802832C4(&func_80283B1C, arg0, 0x52, 0x52);
+    func_802832C4(&func_80283B1C, arg0, 0x48, 0x48);
+    func_802832C4(&func_80283B1C, arg0, 0x3D, 0x3D);
     func_80282D90(arg0, &D_80285A10, &D_80285A4C, 0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80284418.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80282D90(s32, ? *, ? *, ?); // extern
-? func_802832C4(? *, s32, ?, ?); // extern
-extern ? D_80283968;
-extern ? D_80283ACC;
-extern ? D_80285A88;
-extern ? D_80285AB8;
+extern s32 D_80285A88;
+extern s32 D_80285AB8;
 
 void func_80284494(s32 arg0) {
-    func_802832C4(&D_80283ACC, arg0, 0x1E, 0x1E);
-    func_802832C4(&D_80283968, arg0, 0, 0);
+    func_802832C4(&func_80283ACC, arg0, 0x1E, 0x1E);
+    func_802832C4(&func_80283968, arg0, 0, 0);
     func_80282D90(arg0, &D_80285A88, &D_80285AB8, 0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80284494.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80282D90(s32, ? *, ? *, ?); // extern
-? func_802832C4(? *, s32, ?, ?); // extern
-extern ? D_80283AA4;
-extern ? D_80285AE8;
-extern ? D_80285B00;
+extern s32 D_80285AE8;
+extern s32 D_80285B00;
 
 void func_802844FC(s32 arg0) {
-    func_802832C4(&D_80283AA4, arg0, 0x3B, 0x3B);
+    func_802832C4(&func_80283AA4, arg0, 0x3B, 0x3B);
     func_80282D90(arg0, &D_80285AE8, &D_80285B00, 0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_802844FC.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80282D90(s32, ? *, ? *, ?); // extern
-? func_802832C4(? *, s32, ?, ?); // extern
-extern ? D_80283994;
-extern ? D_80283A34;
-extern ? D_80283C38;
-extern ? D_80283CA8;
-extern ? D_80285B18;
-extern ? D_80285B54;
+extern s32 D_80285B18;
+extern s32 D_80285B54;
 
 void func_8028454C(s32 arg0) {
-    func_802832C4(&D_80283CA8, arg0, 0, 0);
-    func_802832C4(&D_80283A34, arg0, 1, 1);
-    func_802832C4(&D_80283C38, arg0, 0, 0);
-    func_802832C4(&D_80283994, arg0, 0x3C, 0x3C);
+    func_802832C4(&func_80283CA8, arg0, 0, 0);
+    func_802832C4(&func_80283A34, arg0, 1, 1);
+    func_802832C4(&func_80283C38, arg0, 0, 0);
+    func_802832C4(&func_80283994, arg0, 0x3C, 0x3C);
     func_80282D90(arg0, &D_80285B18, &D_80285B54, 0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_8028454C.s")
-#endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80282D90(? *, ? *, ?); // extern
-extern ? D_80285B90;
-extern ? D_80285BA8;
+extern s32 D_80285B90;
+extern s32 D_80285BA8;
 
-void func_802845EC(void) {
-    func_80282D90(&D_80285B90, &D_80285BA8, 0);
+void func_802845EC(s32 arg0) {
+    func_80282D90(arg0, &D_80285B90, &D_80285BA8, 0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_802845EC.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80283240(?); // extern
-? func_80283B6C(s32); // extern
 
 void func_8028461C(s32 arg0) {
     func_80283240(1);
     func_80283B6C(arg0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_8028461C.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_802832C4(? *, s32, ?, ?); // extern
-extern ? D_80283BA4;
-extern ? D_802845EC;
-extern ? D_8028461C;
 
 void func_80284648(s32 arg0) {
-    func_802832C4(&D_802845EC, arg0, 0, 0);
-    func_802832C4(&D_8028461C, arg0, 0x110, 0x110);
-    func_802832C4(&D_80283BA4, arg0, 0x115, 0x115);
+    func_802832C4(&func_802845EC, arg0, 0, 0);
+    func_802832C4(&func_8028461C, arg0, 0x110, 0x110);
+    func_802832C4(&func_80283BA4, arg0, 0x115, 0x115);
+}
+
+UNUSED void func_802846AC(void) {
+
+}
+
+extern s32 D_80285C38;
+extern s32 D_80285C74;
+
+void func_802846B4(s32 arg0) {
+    func_80282D90(arg0, &D_80285C38, &D_80285C74, 0);
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80284648.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-void func_802846AC(void) {
-
-}
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_802846AC.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80282D90(? *, ? *, ?); // extern
-extern ? D_80285C38;
-extern ? D_80285C74;
-
-void func_802846B4(void) {
-    func_80282D90(&D_80285C38, &D_80285C74, 0);
-}
-#else
-GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_802846B4.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80282D90(? *, ? *, ?); // extern
-extern ? D_80285CB0;
-extern ? D_80285CE0;
+//? func_80282D90(? *, ? *, ?); // extern
+extern s32 D_80285CB0;
+extern s32 D_80285CE0;
 extern f32 D_8028747C;
 
 void func_802846E4(void *arg0) {
     f32 temp_f0;
 
-    func_80282D90(&D_80285CB0, &D_80285CE0, 0);
+    func_80282D90(arg0, &D_80285CB0, &D_80285CE0, 0);
     temp_f0 = D_8028747C;
     arg0->unkC = arg0->unkC + (D_800DC4E8->posX - temp_f0);
     arg0->unk10 = arg0->unk10 + (D_800DC4E8->posY - -29.0f);
@@ -1737,13 +1371,6 @@ GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_802846E4.s")
 ? func_80282D90(s32, s32, s32, ?); // extern
 ? func_802832C4(? *, s32, s16, s16); // extern
 extern u16 D_800DC5E4;
-extern ? D_80282434;
-extern ? D_802839CC;
-extern ? D_802839E0;
-extern ? D_80283A00;
-extern ? D_80283C78;
-extern ? D_80283CD0;
-extern ? D_80283D04;
 extern f32 D_802856B4;
 extern ? D_80286A04;
 extern ? D_80286A10;
@@ -1783,30 +1410,30 @@ block_3:
     }
     sp2E = (temp_v0 - phi_t9) - 0xA;
     sp2C = temp_v0;
-    func_802832C4(&D_80283CD0, arg0, 0, 0);
-    func_802832C4(&D_80283A00, arg0, 8, 8);
-    func_802832C4(&D_80283C78, arg0, 0x95, 0x95);
-    func_802832C4(&D_80282434, arg0, 0, 0);
+    func_802832C4(&func_80283CD0, arg0, 0, 0);
+    func_802832C4(&func_80283A00, arg0, 8, 8);
+    func_802832C4(&func_80283C78, arg0, 0x95, 0x95);
+    func_802832C4(&func_80282434, arg0, 0, 0);
     temp_v0_2 = *(&D_80286A04 + (D_800DC5E4 * 0x10));
     if (temp_v0_2 != 1) {
         if (temp_v0_2 != 2) {
-            func_802832C4(&D_802839E0, arg0, 0, 0);
+            func_802832C4(&func_802839E0, arg0, 0, 0);
             sp24 = sp2E;
-            func_802832C4(&D_802839CC, arg0, sp2E, sp2E);
+            func_802832C4(&func_802839CC, arg0, sp2E, sp2E);
             temp_a2 = sp2E - 0x14;
-            func_802832C4(&D_802839E0, arg0, temp_a2, temp_a2);
+            func_802832C4(&func_802839E0, arg0, temp_a2, temp_a2);
             temp_v0_3 = (D_800DC5E4 * 0x10) + &D_80286A04;
             func_80282D90(arg0, temp_v0_3->unk4, temp_v0_3->unk8, 0);
         } else {
-            func_802832C4(&D_802839E0, arg0, 0, 0);
-            func_802832C4(&D_80283D04, arg0, 0xF7, 0xF7);
+            func_802832C4(&func_802839E0, arg0, 0, 0);
+            func_802832C4(&func_80283D04, arg0, 0xF7, 0xF7);
             temp_v0_4 = (D_800DC5E4 * 0x10) + &D_80286A04;
             func_80282D90(arg0, temp_v0_4->unk4, temp_v0_4->unk8, 0);
         }
     } else {
-        func_802832C4(&D_802839CC, arg0, 0, -1);
+        func_802832C4(&func_802839CC, arg0, 0, -1);
         temp_a2_2 = sp2E - 0x14;
-        func_802832C4(&D_802839E0, arg0, temp_a2_2, temp_a2_2);
+        func_802832C4(&func_802839E0, arg0, temp_a2_2, temp_a2_2);
     }
     if (gCCSelection == CC_EXTRA) {
         sp2C = *(&D_80286B34 + (D_800DC5E4 * 2));
diff --git a/src/main.c b/src/main.c
index 6e375fd98..f0ee3f18a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -10,6 +10,7 @@
 #include "segment_symbols.h"
 #include "common_structs.h"
 #include <defines.h>
+#include "framebuffers.h"
 
 // Declarations (not in this file)
 void func_8008C214(void);
@@ -214,11 +215,10 @@ extern u32 gHeapEndPtr;
 extern u32 *D_801978D0;
 
 
-extern u32 gZBuffer;
 
-extern u16 gFramebuffer0;
-extern u16 gFramebuffer1;
-extern u16 gFramebuffer2;
+//extern u16 gFramebuffer0;
+//extern u16 gFramebuffer1;
+//extern u16 gFramebuffer2;
 
 extern void thread5_game_logic();
 extern void thread4_audio();
diff --git a/undefined_syms.txt b/undefined_syms.txt
index fbce588a4..81bbbcf44 100644
--- a/undefined_syms.txt
+++ b/undefined_syms.txt
@@ -634,51 +634,8 @@ d_course_skyscraper_vertex = 0x0F000000;
 
 
 
-D_8000035C = 0x8000035C;
-D_80004334 = 0x80004334;
 
 
-
-
-
-
-/* conflict with funcs of same name */
-D_80282434 = 0x80282434;
-D_80283968 = 0x80283968;
-D_80283994 = 0x80283994;
-D_802839B4 = 0x802839B4;
-D_802839CC = 0x802839CC;
-D_802839E0 = 0x802839E0;
-D_80283A00 = 0x80283A00;
-D_80283A34 = 0x80283A34;
-D_80283A54 = 0x80283A54;
-D_80283A7C = 0x80283A7C;
-D_80283AA4 = 0x80283AA4;
-D_80283ACC = 0x80283ACC;
-D_80283AF4 = 0x80283AF4;
-D_80283B1C = 0x80283B1C;
-D_80283B44 = 0x80283B44;
-D_80283BA4 = 0x80283BA4;
-D_80283BF0 = 0x80283BF0;
-D_80283C14 = 0x80283C14;
-D_80283C38 = 0x80283C38;
-D_80283C78 = 0x80283C78;
-D_80283CA8 = 0x80283CA8;
-D_80283CD0 = 0x80283CD0;
-D_80283D04 = 0x80283D04;
-D_80283ED0 = 0x80283ED0;
-D_80283EF8 = 0x80283EF8;
-D_80283FCC = 0x80283FCC;
-D_80283FF4 = 0x80283FF4;
-D_80284184 = 0x80284184;
-D_802841E8 = 0x802841E8;
-D_802845EC = 0x802845EC;
-D_8028461C = 0x8028461C;
-/* eof conflict with funcs of same name */
-
-D_802874A0 = 0x802874A0; /* Very end of data_credits_128480.s unused? */
-D_802874BE = 0x802874BE; /* unused? */
-
 d_course_luigi_raceway_packed = 0x0F009800;
 d_course_mario_raceway_packed = 0x0F0096f4;
 d_course_choco_mountain_packed = 0x0F00A0B4;