blah

2024-09-19 16:01:48 +02:00 · 2021-01-09 16:55:31 +09:00 · 2021-01-09 16:55:31 +09:00 · 765e59e020
commit 765e59e020
parent 00df60c66b
1019 changed files with 8034 additions and 6888 deletions
--- a/asm/boot.s
+++ b/asm/boot.s
@ -294,10 +294,10 @@ glabel func_A4000040
 /* 460 A4000460 3C0BFFF0 */  lui       $t3, 0xfff0
 /* 464 A4000464 3C090010 */  lui       $t1, 0x10
 /* 468 A4000468 014B5024 */  and       $t2, $t2, $t3
-/* 46C A400046C 3C08A400 */  lui       $t0, %hi(D_A40004C0)
+/* 46C A400046C 3C08A400 */  lui       $t0, %hi(func_A40004C0)
 /* 470 A4000470 2529FFFF */  addiu     $t1, $t1, -1
 /* 474 A4000474 3C0BA400 */  lui       $t3, %hi(D_A4000768)
-/* 478 A4000478 250804C0 */  addiu     $t0, $t0, %lo(D_A40004C0)
+/* 478 A4000478 250804C0 */  addiu     $t0, $t0, %lo(func_A40004C0)
 /* 47C A400047C 256B0768 */  addiu     $t3, $t3, %lo(D_A4000768)
 /* 480 A4000480 01094024 */  and       $t0, $t0, $t1
 /* 484 A4000484 01695824 */  and       $t3, $t3, $t1
--- a/asm/data/battle/battle.rodata.s
+++ b/asm/data/battle/battle.rodata.s
@ -0,0 +1,21 @@
 .include "macro.inc"
 .section .rodata
 glabel D_80099E40
 .ascii "\0"
 glabel D_80099F40
 .ascii "\0"
 glabel D_8009A040
 .ascii "\0"
 glabel D_8009A140
 .word 0x00010202, 0x03030303, 0x04040404, 0x04040404, 0x05050505, 0x05050505, 0x05050505, 0x05050505, 0x06060606, 0x06060606, 0x06060606, 0x06060606, 0x06060606, 0x06060606, 0x06060606, 0x06060606, 0x07070707, 0x07070707, 0x07070707, 0x07070707, 0x07070707, 0x07070707, 0x07070707, 0x07070707, 0x07070707, 0x07070707, 0x07070707, 0x07070707, 0x07070707, 0x07070707, 0x07070707, 0x07070707, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x8347838A, 0x83412082, 0x6E826C82, 0x6E825181, 0x51825500, 0x8347838A, 0x83412082, 0x6E826C82, 0x6E825181, 0x51825400, 0x8347838A, 0x83412082, 0x6E826C82, 0x6E825181, 0x51825300, 0x8347838A, 0x83412082, 0x6E826C82, 0x6E825181, 0x51825200, 0x8347838A, 0x83412082, 0x6E826C82, 0x6E825181, 0x51825100, 0x8347838A, 0x83412082, 0x6E826C82, 0x6E825181, 0x51825000, 0x8347838A, 0x83412082, 0x63826882, 0x66000000, 0x8347838A, 0x83412082, 0x6A826A82, 0x69000000, 0x8347838A, 0x83412082, 0x6A826F82, 0x60825300, 0x8347838A, 0x83412082, 0x6A826F82, 0x60825200, 0x8347838A, 0x83412082, 0x6A826F82, 0x60825100, 0x8347838A, 0x83412082, 0x6A826F82, 0x60000000, 0x8347838A, 0x83412082, 0x6F827182, 0x60825200, 0x8347838A, 0x83412082, 0x6F827182, 0x60825100, 0x8347838A, 0x83412082, 0x6F827182, 0x60000000, 0x8347838A, 0x83412082, 0x72826082, 0x6C825100, 0x8347838A, 0x83412082, 0x72826082, 0x6C000000, 0x8347838A, 0x83412082, 0x73826882, 0x6A825200, 0x8347838A, 0x83412082, 0x73826882, 0x6A825100, 0x8347838A, 0x83412082, 0x73826882, 0x6A000000, 0x8347838A, 0x83412082, 0x65826B82, 0x6E825100, 0x8347838A, 0x83412082, 0x65826B82, 0x6E000000, 0x8347838A, 0x83412082, 0x6A827982, 0x6D825100, 0x8347838A, 0x83412082, 0x6A827982, 0x6D000000, 0x8347838A, 0x83412082, 0x69826082, 0x6D825100, 0x8347838A, 0x83412082, 0x69826082, 0x6D000000, 0x8347838A, 0x83412082, 0x6A826682, 0x71000000, 0x8347838A, 0x83412082, 0x6E826C82, 0x6E825200, 0x8347838A, 0x83412082, 0x6E826C82, 0x6E825100, 0x8347838A, 0x83412082, 0x6E826C82, 0x6E000000, 0x8347838A, 0x83412082, 0x63826682, 0x61000000, 0x8347838A, 0x83412082, 0x60827182, 0x6D000000, 0x8347838A, 0x83412082, 0x6C826882, 0x6C000000, 0x8347838A, 0x83412082, 0x68827282, 0x6A2082BB, 0x82CC8251, 0x00000000, 0x8347838A, 0x83412082, 0x68827282, 0x6A2082BB, 0x82CC8250, 0x00000000, 0x8347838A, 0x83412082, 0x72826182, 0x6A000000, 0x8347838A, 0x83412082, 0x68827682, 0x60000000, 0x8347838A, 0x83412082, 0x73827182, 0x632082BB, 0x82CC8252, 0x00000000, 0x8347838A, 0x83412082, 0x73827182, 0x632082BB, 0x82CC8251, 0x00000000, 0x8347838A, 0x83412082, 0x73827182, 0x632082BB, 0x82CC8250, 0x00000000, 0x8347838A, 0x83412082, 0x6D826E82, 0x6A000000, 0x8347838A, 0x83412082, 0x67826E82, 0x72000000, 0x8347838A, 0x83412082, 0x6C826082, 0x62000000, 0x8347838A, 0x83412082, 0x6A826C82, 0x712082BB, 0x82CC8252, 0x00000000, 0x8347838A, 0x83412082, 0x6A826C82, 0x712082BB, 0x82CC8251, 0x00000000, 0x8347838A, 0x83412082, 0x6A826C82, 0x712082BB, 0x82CC8250, 0x00000000
 glabel D_8009A578
 .word 0x80072F38, 0x80072F4C, 0x80072F64, 0x80072F90, 0x80072FA8, 0x00000000
 glabel D_8009A590
 .word 0x8007301C, 0x80073070, 0x80073094, 0x800730CC, 0x800730F8, 0x00000000, 0x00000000, 0x00000000
--- a/asm/data/code_1000_len_60.data.s
+++ b/asm/data/code_1000_len_60.data.s
@ -12,34 +12,34 @@ glabel D_80073E04
 .word 0x00000000
 glabel D_80073E08
-.word 0x00000000
+.short 0x0000
 glabel D_80073E0A
-.word 0x00000000
+.short 0x0000, 0x0000, 0x0000
 glabel D_80073E10
 .word 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
 glabel D_80074010
-.ascii "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+.word 0x00080000, 0x00000000, 0x00000000, 0x00000000
 glabel D_80074020
-.ascii ""
+.byte 0x01
 glabel D_80074021
-.ascii "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+.byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 glabel gGameStatusPtr
 .word 0x80074024
 glabel D_800741A0
-.word 0x00000000
+.short 0x0000
 glabel D_800741A2
-.word 0x00000000
+.short 0x0000, 0x0000, 0x0000
 glabel D_800741A8
-.ascii "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+.word 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
 glabel D_800741F0
 .word 0x00000000
@ -63,10 +63,10 @@ glabel D_80074274
 .word 0x00000000, 0x3C8EF77F, 0x3D0EF241, 0x3D565E46, 0x3D8EDC3C, 0x3DB27ED8, 0x3DD612C7, 0x3DF99674, 0x3E0E835E, 0x3E20303C, 0x3E31D0C8, 0x3E43636F, 0x3E54E6E2, 0x3E66598E, 0x3E77BA67, 0x3E8483ED, 0x3E8D204B, 0x3E95B1C8, 0x3E9E377A, 0x3EA6B0D9, 0x3EAF1D3F, 0x3EB77C03, 0x3EBFCC7D, 0x3EC80DE5, 0x3ED03FD5, 0x3ED86163, 0x3EE0722A, 0x3EE87161, 0x3EF05EA2, 0x3EF83904, 0x3F000000, 0x3F03D988, 0x3F07A8C6, 0x3F0B6D76, 0x3F0F2746, 0x3F12D5E0, 0x3F167914, 0x3F1A108C, 0x3F1D9BF6, 0x3F211B1E, 0x3F248DC1, 0x3F27F37C, 0x3F2B4C2B, 0x3F2E976C, 0x3F31D51B, 0x3F3504F7, 0x3F3826AB, 0x3F3B3A04, 0x3F3E3EC0, 0x3F4134AD, 0x3F441B76, 0x3F46F30A, 0x3F49BB17, 0x3F4C7369, 0x3F4F1BBD, 0x3F51B3F2, 0x3F543BD6, 0x3F56B325, 0x3F5919AC, 0x3F5B6F4C, 0x3F5DB3D0, 0x3F5FE719, 0x3F6208E1, 0x3F641909, 0x3F66175D, 0x3F6803CD, 0x3F69DE16, 0x3F6BA637, 0x3F6D5BEE, 0x3F6EFF19, 0x3F708FB8, 0x3F720D88, 0x3F737879, 0x3F74D068, 0x3F761544, 0x3F7746ED, 0x3F786552, 0x3F797050, 0x3F7A67E8, 0x3F7B4BE8, 0x3F7C1C61, 0x3F7CD91F, 0x3F7D8234, 0x3F7E177F, 0x3F7E98FE, 0x3F7F06A3, 0x3F7F605B, 0x3F7FA637, 0x3F7FD817, 0x3F7FF60A, 0x3F800000
 glabel D_800743E0
-.ascii "0123456789abcdefghijklmnopqrstuvwxyz\0\0\0\0\0\0\0\0\0\0\0\0"
+.word 0x30313233, 0x34353637, 0x38396162, 0x63646566, 0x6768696A, 0x6B6C6D6E, 0x6F707172, 0x73747576, 0x7778797A, 0x00000000, 0x00000000, 0x00000000
 glabel gRandSeed
-.ascii "\0\0\0"
+.word 0x00000001
 glabel D_80074414
 .word 0x3F800000, 0x3FA2F7CB, 0x3FA2F2A6, 0x3FA2EA10, 0x3FA2DE12, 0x3FA2CEAB, 0x3FA2BBDC, 0x3FA2A5AD, 0x3FA28C26, 0x3FA26F48, 0x3FA24F12, 0x3FA22B9D, 0x3FA204E2, 0x3FA1DAF0, 0x3FA1ADC9, 0x3FA17D85, 0x3FA14A23, 0x3FA113AD, 0x3FA0DA34, 0x3FA09DC7, 0x3FA05E68, 0x3FA01C26, 0x3F9FD71B, 0x3F9F8F47, 0x3F9F44BB, 0x3F9EF788, 0x3F9EA7BD, 0x3F9E5565, 0x3F9E0097, 0x3F9DA95D, 0x3F9D4FC6, 0x3F9CF3DC, 0x3F9C95C0, 0x3F9C357A, 0x3F9BD313, 0x3F9B6EAD, 0x3F9B083E, 0x3F9A9FF1, 0x3F9A35C6, 0x3F99C9CD, 0x3F995C21, 0x3F98ECD0, 0x3F987BE5, 0x3F980968, 0x3F979581, 0x3F972029, 0x3F96A97A, 0x3F963183, 0x3F95B84E, 0x3F953DEA, 0x3F94C272, 0x3F9445ED, 0x3F93C865, 0x3F9349E9, 0x3F92CA8A, 0x3F924A51, 0x3F91C958, 0x3F91479D, 0x3F90C533, 0x3F904229, 0x3F8FBE88, 0x3F8F3A60, 0x3F8EB5B3, 0x3F8E3098, 0x3F8DAB11, 0x3F8D252D, 0x3F8C9EF5, 0x3F8C1872, 0x3F8B91B4, 0x3F8B0AC4, 0x3F8A83A1, 0x3F89FC5D, 0x3F897500, 0x3F88ED91, 0x3F88661B, 0x3F87DEA4, 0x3F87572E, 0x3F86CFC8, 0x3F86487C, 0x3F85C140, 0x3F853A2E, 0x3F84B346, 0x3F842C91, 0x3F83A605, 0x3F831FBC, 0x3F8299B7, 0x3F8213F5, 0x3F818E75, 0x3F810953, 0x3F80847B, 0x3F800000
@ -102,7 +102,7 @@ glabel D_800773D8
 .word 0x8009801C, 0x80098008, 0x80097FF4, 0x80097FE8, 0x80097FDC, 0x80097FC8
 glabel D_800773F0
-.ascii "\0\0\0"
+.word 0x00000001
 glabel D_800773F4
 .word 0x00000000
@ -123,19 +123,19 @@ glabel D_80077850
 .word 0x800776E8, 0x800776FC, 0x80077710, 0x80077724, 0x80077774, 0x80077738, 0x8007774C, 0x80077760, 0x80077788, 0x8007779C, 0x800777B0, 0x800777C4, 0x800777D8, 0x800777EC, 0x80077800, 0x80077814, 0x80077828, 0x8007783C, 0x00000000, 0x00000000
 glabel D_800778A0
-.word 0x8038F800, 0x803B5000, D_803DA800, 0x00000000, 0xFFFFFF00, 0xFFFFFF00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xE7000000, 0x00000000, 0xE3000A01, 0x00200000, 0xE3000C00, 0x00000000, 0xE3001001, 0x00000000, 0xFCFFFFFF, 0xFFFCF87C, 0xE200001C, 0x00000000, 0xE3001201, 0x00000000, 0xDF000000, 0x00000000
+.word 0x8038F800, 0x803B5000, 0x803DA800, 0x00000000, 0xFFFFFF00, 0xFFFFFF00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xE7000000, 0x00000000, 0xE3000A01, 0x00200000, 0xE3000C00, 0x00000000, 0xE3001001, 0x00000000, 0xFCFFFFFF, 0xFFFCF87C, 0xE200001C, 0x00000000, 0xE3001201, 0x00000000, 0xDF000000, 0x00000000
 glabel D_80077908
 .word 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE3000C00, 0x00000000, 0xE3001001, 0x00000000, 0xFCFFFFFF, 0xFFFCF87C, 0xE200001C, 0x0F0A4000, 0xE3001201, 0x00000000, 0xDF000000, 0x00000000, 0x00000000, 0x00000000
 glabel D_80077950
-.word 0x8038F800, 0x803B5000, D_803DA800
+.word 0x8038F800, 0x803B5000, 0x803DA800
 glabel D_8007795C
 .word 0x00135EE0, 0x00163400, pause_set_cursor_opacity, pause_set_cursor_opacity, gPauseMenuIconScripts, gPauseMenuIconScripts, gPauseMenuHeldButtons, gPauseMenuHeldButtons, 0x80278640
 glabel D_80077980
-.word 0x8038F800, 0x803B5000, D_803DA800
+.word 0x8038F800, 0x803B5000, 0x803DA800
 glabel D_8007798C
 .word 0x00163400, 0x0016C8E0, pause_set_cursor_opacity, pause_set_cursor_opacity, 0x80249B80, 0x80249B80, 0x8024C080, 0x8024C080, 0x8024C120
--- a/asm/nonmatchings/battle/area_kpa4/6CC070/func_80218000_6CC070.s
+++ b/asm/nonmatchings/battle/area_kpa4/6CC070/func_80218000_6CC070.s
@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 glabel func_80218000_6CC070
-/* 6CC070 80218000 3C028022 */  lui       $v0, %hi(D_80218DF4)
+/* 6CC070 80218000 3C028022 */  lui       $v0, %hi(func_80218DF4_465284)
-/* 6CC074 80218004 24428DF4 */  addiu     $v0, $v0, %lo(D_80218DF4)
+/* 6CC074 80218004 24428DF4 */  addiu     $v0, $v0, %lo(func_80218DF4_465284)
 /* 6CC078 80218008 24030001 */  addiu     $v1, $zero, 1
 /* 6CC07C 8021800C AC43000C */  sw        $v1, 0xc($v0)
 /* 6CC080 80218010 8C830148 */  lw        $v1, 0x148($a0)
--- a/asm/nonmatchings/battle/area_kzn2/59E6E0/func_802188B0_59EF90.s
+++ b/asm/nonmatchings/battle/area_kzn2/59E6E0/func_802188B0_59EF90.s
@ -3,8 +3,8 @@
 glabel func_802188B0_59EF90
 /* 59EF90 802188B0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 59EF94 802188B4 3C028022 */  lui       $v0, %hi(D_8021835C)
+/* 59EF94 802188B4 3C028022 */  lui       $v0, %hi(func_8021835C_59E18C)
-/* 59EF98 802188B8 2442835C */  addiu     $v0, $v0, %lo(D_8021835C)
+/* 59EF98 802188B8 2442835C */  addiu     $v0, $v0, %lo(func_8021835C_59E18C)
 /* 59EF9C 802188BC AFA2001C */  sw        $v0, 0x1c($sp)
 /* 59EFA0 802188C0 2402000A */  addiu     $v0, $zero, 0xa
 /* 59EFA4 802188C4 AFA20014 */  sw        $v0, 0x14($sp)
--- a/asm/nonmatchings/battle/area_kzn2/59E6E0/func_802188FC_59EFDC.s
+++ b/asm/nonmatchings/battle/area_kzn2/59E6E0/func_802188FC_59EFDC.s
@ -4,8 +4,8 @@
 glabel func_802188FC_59EFDC
 /* 59EFDC 802188FC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 59EFE0 80218900 2402FFFF */  addiu     $v0, $zero, -1
-/* 59EFE4 80218904 3C058022 */  lui       $a1, %hi(D_802188B0)
+/* 59EFE4 80218904 3C058022 */  lui       $a1, %hi(func_802188B0_59E694)
-/* 59EFE8 80218908 24A588B0 */  addiu     $a1, $a1, %lo(D_802188B0)
+/* 59EFE8 80218908 24A588B0 */  addiu     $a1, $a1, %lo(func_802188B0_59E694)
 /* 59EFEC 8021890C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 59EFF0 80218910 3C018023 */  lui       $at, %hi(D_8022B550)
 /* 59EFF4 80218914 AC22B550 */  sw        $v0, %lo(D_8022B550)($at)
--- a/asm/nonmatchings/battle/area_omo/512AB0/func_80218A98_513068.s
+++ b/asm/nonmatchings/battle/area_omo/512AB0/func_80218A98_513068.s
@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
-glabel area_omo_GetEntityPosition
+glabel func_80218A98_513068
 /* 513068 80218A98 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 51306C 80218A9C AFB20018 */  sw        $s2, 0x18($sp)
 /* 513070 80218AA0 0080902D */  daddu     $s2, $a0, $zero
--- a/asm/nonmatchings/code_102610_len_2330/func_802E13B8.s
+++ b/asm/nonmatchings/code_102610_len_2330/func_802E13B8.s
@ -9,8 +9,8 @@ glabel func_802E13B8
 /* 102C48 802E13C8 AFB10014 */  sw        $s1, 0x14($sp)
 /* 102C4C 802E13CC 0C0B8DB9 */  jal       entity_init_Hammer23Block_normal
 /* 102C50 802E13D0 8E110040 */   lw       $s1, 0x40($s0)
-/* 102C54 802E13D4 3C02802E */  lui       $v0, %hi(D_802E0DE0)
+/* 102C54 802E13D4 3C02802E */  lui       $v0, %hi(func_802E0DE0)
-/* 102C58 802E13D8 24420DE0 */  addiu     $v0, $v0, %lo(D_802E0DE0)
+/* 102C58 802E13D8 24420DE0 */  addiu     $v0, $v0, %lo(func_802E0DE0)
 /* 102C5C 802E13DC AE02003C */  sw        $v0, 0x3c($s0)
 /* 102C60 802E13E0 24020008 */  addiu     $v0, $zero, 8
 /* 102C64 802E13E4 A6220004 */  sh        $v0, 4($s1)
--- a/asm/nonmatchings/code_102610_len_2330/func_802E246C.s
+++ b/asm/nonmatchings/code_102610_len_2330/func_802E246C.s
@ -21,8 +21,8 @@ glabel func_802E246C
 /* 103D2C 802E24AC 8EB00040 */  lw        $s0, 0x40($s5)
 /* 103D30 802E24B0 00451021 */  addu      $v0, $v0, $a1
 /* 103D34 802E24B4 AE020034 */  sw        $v0, 0x34($s0)
-/* 103D38 802E24B8 3C02802E */  lui       $v0, %hi(D_802E2BA4)
+/* 103D38 802E24B8 3C02802E */  lui       $v0, %hi(func_802E2BA4)
-/* 103D3C 802E24BC 24422BA4 */  addiu     $v0, $v0, %lo(D_802E2BA4)
+/* 103D3C 802E24BC 24422BA4 */  addiu     $v0, $v0, %lo(func_802E2BA4)
 /* 103D40 802E24C0 AEA2003C */  sw        $v0, 0x3c($s5)
 /* 103D44 802E24C4 240200FF */  addiu     $v0, $zero, 0xff
 /* 103D48 802E24C8 A2A2000B */  sb        $v0, 0xb($s5)
--- a/asm/nonmatchings/code_104940_len_dc0/entity_init_Hammer1Block_normal.s
+++ b/asm/nonmatchings/code_104940_len_dc0/entity_init_Hammer1Block_normal.s
@ -7,8 +7,8 @@ glabel entity_init_Hammer1Block_normal
 /* 105688 802E3E08 AFBF0014 */  sw        $ra, 0x14($sp)
 /* 10568C 802E3E0C 0C0B8DB9 */  jal       entity_init_Hammer23Block_normal
 /* 105690 802E3E10 0080802D */   daddu    $s0, $a0, $zero
-/* 105694 802E3E14 3C02802E */  lui       $v0, %hi(D_802E30C0)
+/* 105694 802E3E14 3C02802E */  lui       $v0, %hi(func_802E30C0)
-/* 105698 802E3E18 244230C0 */  addiu     $v0, $v0, %lo(D_802E30C0)
+/* 105698 802E3E18 244230C0 */  addiu     $v0, $v0, %lo(func_802E30C0)
 /* 10569C 802E3E1C AE02003C */  sw        $v0, 0x3c($s0)
 /* 1056A0 802E3E20 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 1056A4 802E3E24 8FB00010 */  lw        $s0, 0x10($sp)
--- a/asm/nonmatchings/code_105700_len_2130/func_802E464C.s
+++ b/asm/nonmatchings/code_105700_len_2130/func_802E464C.s
@ -13,8 +13,8 @@ glabel func_802E464C
 /* 105EEC 802E466C A4620010 */  sh        $v0, 0x10($v1)
 /* 105EF0 802E4670 3402FFFF */  ori       $v0, $zero, 0xffff
 /* 105EF4 802E4674 A462000A */  sh        $v0, 0xa($v1)
-/* 105EF8 802E4678 3C02802E */  lui       $v0, %hi(D_802E455C)
+/* 105EF8 802E4678 3C02802E */  lui       $v0, %hi(func_802E455C)
-/* 105EFC 802E467C 2442455C */  addiu     $v0, $v0, %lo(D_802E455C)
+/* 105EFC 802E467C 2442455C */  addiu     $v0, $v0, %lo(func_802E455C)
 /* 105F00 802E4680 AE02003C */  sw        $v0, 0x3c($s0)
 /* 105F04 802E4684 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 105F08 802E4688 8FB00010 */  lw        $s0, 0x10($sp)
--- a/asm/nonmatchings/code_105700_len_2130/func_802E46BC.s
+++ b/asm/nonmatchings/code_105700_len_2130/func_802E46BC.s
@ -8,8 +8,8 @@ glabel func_802E46BC
 /* 105F48 802E46C8 0C0B8DB9 */  jal       entity_init_Hammer23Block_normal
 /* 105F4C 802E46CC 0080802D */   daddu    $s0, $a0, $zero
 /* 105F50 802E46D0 86040014 */  lh        $a0, 0x14($s0)
-/* 105F54 802E46D4 3C02802E */  lui       $v0, %hi(D_802E455C)
+/* 105F54 802E46D4 3C02802E */  lui       $v0, %hi(func_802E455C)
-/* 105F58 802E46D8 2442455C */  addiu     $v0, $v0, %lo(D_802E455C)
+/* 105F58 802E46D8 2442455C */  addiu     $v0, $v0, %lo(func_802E455C)
 /* 105F5C 802E46DC 0C047FF8 */  jal       get_anim_mesh
 /* 105F60 802E46E0 AE02003C */   sw       $v0, 0x3c($s0)
 /* 105F64 802E46E4 24030011 */  addiu     $v1, $zero, 0x11
--- a/asm/nonmatchings/code_105700_len_2130/func_802E4B60.s
+++ b/asm/nonmatchings/code_105700_len_2130/func_802E4B60.s
@ -5,8 +5,8 @@ glabel func_802E4B60
 /* 1063E0 802E4B60 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 1063E4 802E4B64 AFB10014 */  sw        $s1, 0x14($sp)
 /* 1063E8 802E4B68 0080882D */  daddu     $s1, $a0, $zero
-/* 1063EC 802E4B6C 3C02802E */  lui       $v0, %hi(D_802E4AEC)
+/* 1063EC 802E4B6C 3C02802E */  lui       $v0, %hi(func_802E4AEC)
-/* 1063F0 802E4B70 24424AEC */  addiu     $v0, $v0, %lo(D_802E4AEC)
+/* 1063F0 802E4B70 24424AEC */  addiu     $v0, $v0, %lo(func_802E4AEC)
 /* 1063F4 802E4B74 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 1063F8 802E4B78 AFB00010 */  sw        $s0, 0x10($sp)
 /* 1063FC 802E4B7C AE22003C */  sw        $v0, 0x3c($s1)
--- a/asm/nonmatchings/code_105700_len_2130/func_802E4E04.s
+++ b/asm/nonmatchings/code_105700_len_2130/func_802E4E04.s
@ -68,8 +68,8 @@ glabel func_802E4E04
 /* 106780 802E4F00 AE220000 */  sw        $v0, ($s1)
 /* 106784 802E4F04 0C0442F3 */  jal       func_80110BCC
 /* 106788 802E4F08 E6000054 */   swc1     $f0, 0x54($s0)
-/* 10678C 802E4F0C 3C02802E */  lui       $v0, %hi(D_802E4AEC)
+/* 10678C 802E4F0C 3C02802E */  lui       $v0, %hi(func_802E4AEC)
-/* 106790 802E4F10 24424AEC */  addiu     $v0, $v0, %lo(D_802E4AEC)
+/* 106790 802E4F10 24424AEC */  addiu     $v0, $v0, %lo(func_802E4AEC)
 /* 106794 802E4F14 080B94BA */  j         .L802E52E8
 /* 106798 802E4F18 AE22003C */   sw       $v0, 0x3c($s1)
 /* 10679C 802E4F1C C60C0020 */  lwc1      $f12, 0x20($s0)
--- a/asm/nonmatchings/code_105700_len_2130/func_802E5F50.s
+++ b/asm/nonmatchings/code_105700_len_2130/func_802E5F50.s
@ -9,7 +9,7 @@ glabel func_802E5F50
 /* 1077E0 802E5F60 3C020A00 */  lui       $v0, 0xa00
 /* 1077E4 802E5F64 24420380 */  addiu     $v0, $v0, 0x380
 /* 1077E8 802E5F68 AC62012C */  sw        $v0, 0x12c($v1)
-/* 1077EC 802E5F6C 3C02802E */  lui       $v0, %hi(D_802E586C)
+/* 1077EC 802E5F6C 3C02802E */  lui       $v0, %hi(func_802E586C)
-/* 1077F0 802E5F70 2442586C */  addiu     $v0, $v0, %lo(D_802E586C)
+/* 1077F0 802E5F70 2442586C */  addiu     $v0, $v0, %lo(func_802E586C)
 /* 1077F4 802E5F74 03E00008 */  jr        $ra
 /* 1077F8 802E5F78 AC82003C */   sw       $v0, 0x3c($a0)
--- a/asm/nonmatchings/code_105700_len_2130/func_802E5F7C.s
+++ b/asm/nonmatchings/code_105700_len_2130/func_802E5F7C.s
@ -9,8 +9,8 @@ glabel func_802E5F7C
 /* 10780C 802E5F8C 3C020A00 */  lui       $v0, 0xa00
 /* 107810 802E5F90 24420750 */  addiu     $v0, $v0, 0x750
 /* 107814 802E5F94 AC62012C */  sw        $v0, 0x12c($v1)
-/* 107818 802E5F98 3C02802E */  lui       $v0, %hi(D_802E586C)
+/* 107818 802E5F98 3C02802E */  lui       $v0, %hi(func_802E586C)
-/* 10781C 802E5F9C 2442586C */  addiu     $v0, $v0, %lo(D_802E586C)
+/* 10781C 802E5F9C 2442586C */  addiu     $v0, $v0, %lo(func_802E586C)
 /* 107820 802E5FA0 03E00008 */  jr        $ra
 /* 107824 802E5FA4 AC82003C */   sw       $v0, 0x3c($a0)
 /* 107828 802E5FA8 00000000 */  nop       
--- a/asm/nonmatchings/code_1060_len_310/func_80025CC0.s
+++ b/asm/nonmatchings/code_1060_len_310/func_80025CC0.s
@ -8,8 +8,8 @@ glabel func_80025CC0
 /* 10CC 80025CCC AFA7000C */  sw        $a3, 0xc($sp)
 /* 10D0 80025CD0 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 10D4 80025CD4 0080302D */  daddu     $a2, $a0, $zero
-/* 10D8 80025CD8 3C048002 */  lui       $a0, %hi(D_80025D74)
+/* 10D8 80025CD8 3C048002 */  lui       $a0, %hi(func_80025D74)
-/* 10DC 80025CDC 24845D74 */  addiu     $a0, $a0, %lo(D_80025D74)
+/* 10DC 80025CDC 24845D74 */  addiu     $a0, $a0, %lo(func_80025D74)
 /* 10E0 80025CE0 0000282D */  daddu     $a1, $zero, $zero
 /* 10E4 80025CE4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 10E8 80025CE8 0C0192A8 */  jal       _Printf
--- a/asm/nonmatchings/code_1060_len_310/func_80025CFC.s
+++ b/asm/nonmatchings/code_1060_len_310/func_80025CFC.s
@ -8,8 +8,8 @@ glabel func_80025CFC
 /* 1108 80025D08 AFA7000C */  sw        $a3, 0xc($sp)
 /* 110C 80025D0C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 1110 80025D10 0080302D */  daddu     $a2, $a0, $zero
-/* 1114 80025D14 3C048002 */  lui       $a0, %hi(D_80025D74)
+/* 1114 80025D14 3C048002 */  lui       $a0, %hi(func_80025D74)
-/* 1118 80025D18 24845D74 */  addiu     $a0, $a0, %lo(D_80025D74)
+/* 1118 80025D18 24845D74 */  addiu     $a0, $a0, %lo(func_80025D74)
 /* 111C 80025D1C 0000282D */  daddu     $a1, $zero, $zero
 /* 1120 80025D20 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 1124 80025D24 0C0192A8 */  jal       _Printf
--- a/asm/nonmatchings/code_1060_len_310/func_80025D38.s
+++ b/asm/nonmatchings/code_1060_len_310/func_80025D38.s
@ -8,8 +8,8 @@ glabel func_80025D38
 /* 1144 80025D44 AFA7000C */  sw        $a3, 0xc($sp)
 /* 1148 80025D48 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 114C 80025D4C 0080302D */  daddu     $a2, $a0, $zero
-/* 1150 80025D50 3C048002 */  lui       $a0, %hi(D_80025D74)
+/* 1150 80025D50 3C048002 */  lui       $a0, %hi(func_80025D74)
-/* 1154 80025D54 24845D74 */  addiu     $a0, $a0, %lo(D_80025D74)
+/* 1154 80025D54 24845D74 */  addiu     $a0, $a0, %lo(func_80025D74)
 /* 1158 80025D58 0000282D */  daddu     $a1, $zero, $zero
 /* 115C 80025D5C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 1160 80025D60 0C0192A8 */  jal       _Printf
--- a/asm/nonmatchings/code_107830_len_e70/func_802E6C24.s
+++ b/asm/nonmatchings/code_107830_len_e70/func_802E6C24.s
@ -18,8 +18,8 @@ glabel func_802E6C24
 /* 1084D8 802E6C58 8E720040 */  lw        $s2, 0x40($s3)
 /* 1084DC 802E6C5C 0C00A580 */  jal       mem_clear
 /* 1084E0 802E6C60 24050010 */   addiu    $a1, $zero, 0x10
-/* 1084E4 802E6C64 3C02802E */  lui       $v0, %hi(D_802E61B0)
+/* 1084E4 802E6C64 3C02802E */  lui       $v0, %hi(func_802E61B0)
-/* 1084E8 802E6C68 244261B0 */  addiu     $v0, $v0, %lo(D_802E61B0)
+/* 1084E8 802E6C68 244261B0 */  addiu     $v0, $v0, %lo(func_802E61B0)
 /* 1084EC 802E6C6C AE62003C */  sw        $v0, 0x3c($s3)
 /* 1084F0 802E6C70 3402FFFF */  ori       $v0, $zero, 0xffff
 /* 1084F4 802E6C74 A6420006 */  sh        $v0, 6($s2)
--- a/asm/nonmatchings/code_1086a0_len_fc0/entity_init_Chest.s
+++ b/asm/nonmatchings/code_1086a0_len_fc0/entity_init_Chest.s
@ -13,8 +13,8 @@ glabel entity_init_Chest
 /* 109624 802E7DA4 3C013F0F */  lui       $at, 0x3f0f
 /* 109628 802E7DA8 34215C29 */  ori       $at, $at, 0x5c29
 /* 10962C 802E7DAC 44810000 */  mtc1      $at, $f0
-/* 109630 802E7DB0 3C02802E */  lui       $v0, %hi(D_802E6ED8)
+/* 109630 802E7DB0 3C02802E */  lui       $v0, %hi(func_802E6ED8)
-/* 109634 802E7DB4 24426ED8 */  addiu     $v0, $v0, %lo(D_802E6ED8)
+/* 109634 802E7DB4 24426ED8 */  addiu     $v0, $v0, %lo(func_802E6ED8)
 /* 109638 802E7DB8 AE02003C */  sw        $v0, 0x3c($s0)
 /* 10963C 802E7DBC E6000054 */  swc1      $f0, 0x54($s0)
 /* 109640 802E7DC0 E6000058 */  swc1      $f0, 0x58($s0)
--- a/asm/nonmatchings/code_1086a0_len_fc0/func_802E7D54.s
+++ b/asm/nonmatchings/code_1086a0_len_fc0/func_802E7D54.s
@ -7,8 +7,8 @@ glabel func_802E7D54
 /* 1095DC 802E7D5C AFBF0014 */  sw        $ra, 0x14($sp)
 /* 1095E0 802E7D60 0C0B9F4E */  jal       func_802E7D38
 /* 1095E4 802E7D64 0080802D */   daddu    $s0, $a0, $zero
-/* 1095E8 802E7D68 3C02802E */  lui       $v0, %hi(D_802E6ED8)
+/* 1095E8 802E7D68 3C02802E */  lui       $v0, %hi(func_802E6ED8)
-/* 1095EC 802E7D6C 24426ED8 */  addiu     $v0, $v0, %lo(D_802E6ED8)
+/* 1095EC 802E7D6C 24426ED8 */  addiu     $v0, $v0, %lo(func_802E6ED8)
 /* 1095F0 802E7D70 AE02003C */  sw        $v0, 0x3c($s0)
 /* 1095F4 802E7D74 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 1095F8 802E7D78 8FB00010 */  lw        $s0, 0x10($sp)
--- a/asm/nonmatchings/code_109660_len_1270/func_802E7DE0.s
+++ b/asm/nonmatchings/code_109660_len_1270/func_802E7DE0.s
@ -26,8 +26,8 @@ glabel func_802E7DE0
 /* 1096B4 802E7E34 4481A000 */  mtc1      $at, $f20
 /* 1096B8 802E7E38 00451021 */  addu      $v0, $v0, $a1
 /* 1096BC 802E7E3C AE020008 */  sw        $v0, 8($s0)
-/* 1096C0 802E7E40 3C02802F */  lui       $v0, %hi(D_802E854C)
+/* 1096C0 802E7E40 3C02802F */  lui       $v0, %hi(func_802E854C)
-/* 1096C4 802E7E44 2442854C */  addiu     $v0, $v0, %lo(D_802E854C)
+/* 1096C4 802E7E44 2442854C */  addiu     $v0, $v0, %lo(func_802E854C)
 /* 1096C8 802E7E48 AE62003C */  sw        $v0, 0x3c($s3)
 /* 1096CC 802E7E4C 240200FF */  addiu     $v0, $zero, 0xff
 /* 1096D0 802E7E50 A262000B */  sb        $v0, 0xb($s3)
--- a/asm/nonmatchings/code_121f0_len_1290/begin_state_title_screen.s
+++ b/asm/nonmatchings/code_121f0_len_1290/begin_state_title_screen.s
@ -148,8 +148,8 @@ glabel begin_state_title_screen
 /* 1242C 8003702C 0C039CE8 */  jal       clear_player_data
 /* 12430 80037030 AE420000 */   sw       $v0, ($s2)
 /* 12434 80037034 0000202D */  daddu     $a0, $zero, $zero
-/* 12438 80037038 3C058003 */  lui       $a1, %hi(D_80037638)
+/* 12438 80037038 3C058003 */  lui       $a1, %hi(func_80037638)
-/* 1243C 8003703C 24A57638 */  addiu     $a1, $a1, %lo(D_80037638)
+/* 1243C 8003703C 24A57638 */  addiu     $a1, $a1, %lo(func_80037638)
 /* 12440 80037040 8E420000 */  lw        $v0, ($s2)
 /* 12444 80037044 2403FFF7 */  addiu     $v1, $zero, -9
 /* 12448 80037048 00431024 */  and       $v0, $v0, $v1
--- a/asm/nonmatchings/code_135EE0/pause_tabs_handle_input.s
+++ b/asm/nonmatchings/code_135EE0/pause_tabs_handle_input.s
@ -91,16 +91,16 @@ glabel pause_tabs_handle_input
 /* 1387D4 80245494 3C048025 */  lui       $a0, %hi(D_8024F1D8)
 /* 1387D8 80245498 00832021 */  addu      $a0, $a0, $v1
 /* 1387DC 8024549C 9084F1D8 */  lbu       $a0, %lo(D_8024F1D8)($a0)
-/* 1387E0 802454A0 3C068024 */  lui       $a2, %hi(D_80243090)
+/* 1387E0 802454A0 3C068024 */  lui       $a2, %hi(func_80243090)
-/* 1387E4 802454A4 24C63090 */  addiu     $a2, $a2, %lo(D_80243090)
+/* 1387E4 802454A4 24C63090 */  addiu     $a2, $a2, %lo(func_80243090)
 /* 1387E8 802454A8 0C051F92 */  jal       func_80147E48
 /* 1387EC 802454AC 24050040 */   addiu    $a1, $zero, 0x40
 /* 1387F0 802454B0 8E220000 */  lw        $v0, ($s1)
 /* 1387F4 802454B4 3C048025 */  lui       $a0, %hi(D_8024F1D8)
 /* 1387F8 802454B8 00822021 */  addu      $a0, $a0, $v0
 /* 1387FC 802454BC 9084F1D8 */  lbu       $a0, %lo(D_8024F1D8)($a0)
-/* 138800 802454C0 3C068024 */  lui       $a2, %hi(D_80242FF4)
+/* 138800 802454C0 3C068024 */  lui       $a2, %hi(func_80242FF4)
-/* 138804 802454C4 24C62FF4 */  addiu     $a2, $a2, %lo(D_80242FF4)
+/* 138804 802454C4 24C62FF4 */  addiu     $a2, $a2, %lo(func_80242FF4)
 /* 138808 802454C8 0C051F92 */  jal       func_80147E48
 /* 13880C 802454CC 24050040 */   addiu    $a1, $zero, 0x40
 /* 138810 802454D0 3C048016 */  lui       $a0, %hi(D_8015A070)
--- a/asm/nonmatchings/code_135EE0/pause_tabs_update.s
+++ b/asm/nonmatchings/code_135EE0/pause_tabs_update.s
@ -93,20 +93,20 @@ glabel pause_tabs_update
 /* 138A4C 8024570C 14600009 */  bnez      $v1, .L80245734
 /* 138A50 80245710 00000000 */   nop      
 .L80245714:
-/* 138A54 80245714 3C148024 */  lui       $s4, %hi(D_80243238)
+/* 138A54 80245714 3C148024 */  lui       $s4, %hi(func_80243238)
-/* 138A58 80245718 26943238 */  addiu     $s4, $s4, %lo(D_80243238)
+/* 138A58 80245718 26943238 */  addiu     $s4, $s4, %lo(func_80243238)
-/* 138A5C 8024571C 3C128024 */  lui       $s2, %hi(D_802432E8)
+/* 138A5C 8024571C 3C128024 */  lui       $s2, %hi(func_802432E8)
-/* 138A60 80245720 265232E8 */  addiu     $s2, $s2, %lo(D_802432E8)
+/* 138A60 80245720 265232E8 */  addiu     $s2, $s2, %lo(func_802432E8)
 /* 138A64 80245724 080915D2 */  j         .L80245748
 /* 138A68 80245728 0000202D */   daddu    $a0, $zero, $zero
 .L8024572C:
 /* 138A6C 8024572C 080915EE */  j         .L802457B8
 /* 138A70 80245730 24040001 */   addiu    $a0, $zero, 1
 .L80245734:
-/* 138A74 80245734 3C148024 */  lui       $s4, %hi(D_80243188)
+/* 138A74 80245734 3C148024 */  lui       $s4, %hi(func_80243188)
-/* 138A78 80245738 26943188 */  addiu     $s4, $s4, %lo(D_80243188)
+/* 138A78 80245738 26943188 */  addiu     $s4, $s4, %lo(func_80243188)
-/* 138A7C 8024573C 3C128024 */  lui       $s2, %hi(D_80243388)
+/* 138A7C 8024573C 3C128024 */  lui       $s2, %hi(func_80243388)
-/* 138A80 80245740 26523388 */  addiu     $s2, $s2, %lo(D_80243388)
+/* 138A80 80245740 26523388 */  addiu     $s2, $s2, %lo(func_80243388)
 /* 138A84 80245744 0000202D */  daddu     $a0, $zero, $zero
 .L80245748:
 /* 138A88 80245748 0080802D */  daddu     $s0, $a0, $zero
@ -142,12 +142,12 @@ glabel pause_tabs_update
 .L802457B8:
 /* 138AF8 802457B8 14800051 */  bnez      $a0, .L80245900
 /* 138AFC 802457BC 0000802D */   daddu    $s0, $zero, $zero
-/* 138B00 802457C0 3C1E8024 */  lui       $fp, %hi(D_80243238)
+/* 138B00 802457C0 3C1E8024 */  lui       $fp, %hi(func_80243238)
-/* 138B04 802457C4 27DE3238 */  addiu     $fp, $fp, %lo(D_80243238)
+/* 138B04 802457C4 27DE3238 */  addiu     $fp, $fp, %lo(func_80243238)
-/* 138B08 802457C8 3C178024 */  lui       $s7, %hi(D_80243188)
+/* 138B08 802457C8 3C178024 */  lui       $s7, %hi(func_80243188)
-/* 138B0C 802457CC 26F73188 */  addiu     $s7, $s7, %lo(D_80243188)
+/* 138B0C 802457CC 26F73188 */  addiu     $s7, $s7, %lo(func_80243188)
-/* 138B10 802457D0 3C168014 */  lui       $s6, %hi(D_80147474)
+/* 138B10 802457D0 3C168014 */  lui       $s6, %hi(func_80147474)
-/* 138B14 802457D4 26D67474 */  addiu     $s6, $s6, %lo(D_80147474)
+/* 138B14 802457D4 26D67474 */  addiu     $s6, $s6, %lo(func_80147474)
 /* 138B18 802457D8 24150001 */  addiu     $s5, $zero, 1
 /* 138B1C 802457DC 3C118025 */  lui       $s1, %hi(D_8024F1E0)
 /* 138B20 802457E0 2631F1E0 */  addiu     $s1, $s1, %lo(D_8024F1E0)
@ -201,12 +201,12 @@ glabel pause_tabs_update
 /* 138BD4 80245894 3C038016 */  lui       $v1, %hi(D_80159D54)
 /* 138BD8 80245898 00621821 */  addu      $v1, $v1, $v0
 /* 138BDC 8024589C 8C639D54 */  lw        $v1, %lo(D_80159D54)($v1)
-/* 138BE0 802458A0 3C028024 */  lui       $v0, %hi(D_802432E8)
+/* 138BE0 802458A0 3C028024 */  lui       $v0, %hi(func_802432E8)
-/* 138BE4 802458A4 244232E8 */  addiu     $v0, $v0, %lo(D_802432E8)
+/* 138BE4 802458A4 244232E8 */  addiu     $v0, $v0, %lo(func_802432E8)
 /* 138BE8 802458A8 10620007 */  beq       $v1, $v0, .L802458C8
 /* 138BEC 802458AC 00000000 */   nop      
-/* 138BF0 802458B0 3C028024 */  lui       $v0, %hi(D_80243388)
+/* 138BF0 802458B0 3C028024 */  lui       $v0, %hi(func_80243388)
-/* 138BF4 802458B4 24423388 */  addiu     $v0, $v0, %lo(D_80243388)
+/* 138BF4 802458B4 24423388 */  addiu     $v0, $v0, %lo(func_80243388)
 /* 138BF8 802458B8 10620003 */  beq       $v1, $v0, .L802458C8
 /* 138BFC 802458BC 24020002 */   addiu    $v0, $zero, 2
 /* 138C00 802458C0 1462000F */  bne       $v1, $v0, .L80245900
@ -217,8 +217,8 @@ glabel pause_tabs_update
 /* 138C10 802458D0 8C620000 */  lw        $v0, ($v1)
 /* 138C14 802458D4 10400004 */  beqz      $v0, .L802458E8
 /* 138C18 802458D8 00000000 */   nop      
-/* 138C1C 802458DC 3C148014 */  lui       $s4, %hi(D_80147474)
+/* 138C1C 802458DC 3C148014 */  lui       $s4, %hi(func_80147474)
-/* 138C20 802458E0 26947474 */  addiu     $s4, $s4, %lo(D_80147474)
+/* 138C20 802458E0 26947474 */  addiu     $s4, $s4, %lo(func_80147474)
 /* 138C24 802458E4 AC600000 */  sw        $zero, ($v1)
 .L802458E8:
 /* 138C28 802458E8 82620001 */  lb        $v0, 1($s3)
--- a/asm/nonmatchings/code_13870_len_6980/clear_encounter_status.s
+++ b/asm/nonmatchings/code_13870_len_6980/clear_encounter_status.s
@ -65,8 +65,8 @@ glabel clear_encounter_status
 /* 198DC 8003E4DC A0E00012 */  sb        $zero, 0x12($a3)
 /* 198E0 8003E4E0 0C0116B0 */  jal       func_80045AC0
 /* 198E4 8003E4E4 A0E2001F */   sb       $v0, 0x1f($a3)
-/* 198E8 8003E4E8 3C058004 */  lui       $a1, %hi(D_8003E670)
+/* 198E8 8003E4E8 3C058004 */  lui       $a1, %hi(func_8003E670)
-/* 198EC 8003E4EC 24A5E670 */  addiu     $a1, $a1, %lo(D_8003E670)
+/* 198EC 8003E4EC 24A5E670 */  addiu     $a1, $a1, %lo(func_8003E670)
 /* 198F0 8003E4F0 3C01800A */  lui       $at, %hi(gGameState)
 /* 198F4 8003E4F4 AC20A600 */  sw        $zero, %lo(gGameState)($at)
 /* 198F8 8003E4F8 0C048C56 */  jal       bind_dynamic_entity_3
--- a/asm/nonmatchings/code_13870_len_6980/func_8003E338.s
+++ b/asm/nonmatchings/code_13870_len_6980/func_8003E338.s
@ -47,8 +47,8 @@ glabel func_8003E338
 /* 197D0 8003E3D0 2442FFFE */   addiu    $v0, $v0, -2
 /* 197D4 8003E3D4 0C0116B0 */  jal       func_80045AC0
 /* 197D8 8003E3D8 00000000 */   nop      
-/* 197DC 8003E3DC 3C058004 */  lui       $a1, %hi(D_8003E670)
+/* 197DC 8003E3DC 3C058004 */  lui       $a1, %hi(func_8003E670)
-/* 197E0 8003E3E0 24A5E670 */  addiu     $a1, $a1, %lo(D_8003E670)
+/* 197E0 8003E3E0 24A5E670 */  addiu     $a1, $a1, %lo(func_8003E670)
 /* 197E4 8003E3E4 3C01800A */  lui       $at, %hi(gGameState)
 /* 197E8 8003E3E8 AC20A600 */  sw        $zero, %lo(gGameState)($at)
 /* 197EC 8003E3EC 0C048C56 */  jal       bind_dynamic_entity_3
--- a/asm/nonmatchings/code_165490/func_80245A40.s
+++ b/asm/nonmatchings/code_165490/func_80245A40.s
@ -267,8 +267,8 @@ glabel func_80245A40
 /* 166674 80245E14 0461FFFD */  bgez      $v1, .L80245E0C
 /* 166678 80245E18 2442FFFF */   addiu    $v0, $v0, -1
 /* 16667C 80245E1C 24040030 */  addiu     $a0, $zero, 0x30
-/* 166680 80245E20 3C108024 */  lui       $s0, %hi(D_80243380)
+/* 166680 80245E20 3C108024 */  lui       $s0, %hi(func_80243380)
-/* 166684 80245E24 26103380 */  addiu     $s0, $s0, %lo(D_80243380)
+/* 166684 80245E24 26103380 */  addiu     $s0, $s0, %lo(func_80243380)
 /* 166688 80245E28 3C018025 */  lui       $at, %hi(D_8024C090)
 /* 16668C 80245E2C A020C090 */  sb        $zero, %lo(D_8024C090)($at)
 /* 166690 80245E30 0C051F9F */  jal       func_80147E7C
@ -277,8 +277,8 @@ glabel func_80245A40
 /* 16669C 80245E3C 0C051F9F */  jal       func_80147E7C
 /* 1666A0 80245E40 0200282D */   daddu    $a1, $s0, $zero
 /* 1666A4 80245E44 2404002D */  addiu     $a0, $zero, 0x2d
-/* 1666A8 80245E48 3C108024 */  lui       $s0, %hi(D_80243898)
+/* 1666A8 80245E48 3C108024 */  lui       $s0, %hi(func_80243898)
-/* 1666AC 80245E4C 26103898 */  addiu     $s0, $s0, %lo(D_80243898)
+/* 1666AC 80245E4C 26103898 */  addiu     $s0, $s0, %lo(func_80243898)
 /* 1666B0 80245E50 0C051F9F */  jal       func_80147E7C
 /* 1666B4 80245E54 0200282D */   daddu    $a1, $s0, $zero
 /* 1666B8 80245E58 24040033 */  addiu     $a0, $zero, 0x33
@ -328,18 +328,18 @@ glabel func_80245A40
 /* 166764 80245F04 1462002C */  bne       $v1, $v0, .L80245FB8
 /* 166768 80245F08 24020004 */   addiu    $v0, $zero, 4
 /* 16676C 80245F0C 24040033 */  addiu     $a0, $zero, 0x33
-/* 166770 80245F10 3C128024 */  lui       $s2, %hi(D_8024368C)
+/* 166770 80245F10 3C128024 */  lui       $s2, %hi(func_8024368C)
-/* 166774 80245F14 2652368C */  addiu     $s2, $s2, %lo(D_8024368C)
+/* 166774 80245F14 2652368C */  addiu     $s2, $s2, %lo(func_8024368C)
 /* 166778 80245F18 0C051F9F */  jal       func_80147E7C
 /* 16677C 80245F1C 0240282D */   daddu    $a1, $s2, $zero
 /* 166780 80245F20 24040034 */  addiu     $a0, $zero, 0x34
-/* 166784 80245F24 3C118024 */  lui       $s1, %hi(D_802436F0)
+/* 166784 80245F24 3C118024 */  lui       $s1, %hi(func_802436F0)
-/* 166788 80245F28 263136F0 */  addiu     $s1, $s1, %lo(D_802436F0)
+/* 166788 80245F28 263136F0 */  addiu     $s1, $s1, %lo(func_802436F0)
 /* 16678C 80245F2C 0C051F9F */  jal       func_80147E7C
 /* 166790 80245F30 0220282D */   daddu    $a1, $s1, $zero
 /* 166794 80245F34 24040035 */  addiu     $a0, $zero, 0x35
-/* 166798 80245F38 3C108024 */  lui       $s0, %hi(D_802437B8)
+/* 166798 80245F38 3C108024 */  lui       $s0, %hi(func_802437B8)
-/* 16679C 80245F3C 261037B8 */  addiu     $s0, $s0, %lo(D_802437B8)
+/* 16679C 80245F3C 261037B8 */  addiu     $s0, $s0, %lo(func_802437B8)
 /* 1667A0 80245F40 0C051F9F */  jal       func_80147E7C
 /* 1667A4 80245F44 0200282D */   daddu    $a1, $s0, $zero
 /* 1667A8 80245F48 24040036 */  addiu     $a0, $zero, 0x36
@ -360,8 +360,8 @@ glabel func_80245A40
 /* 1667E4 80245F84 2404003B */  addiu     $a0, $zero, 0x3b
 /* 1667E8 80245F88 0C051F9F */  jal       func_80147E7C
 /* 1667EC 80245F8C 0220282D */   daddu    $a1, $s1, $zero
-/* 1667F0 80245F90 3C058024 */  lui       $a1, %hi(D_80243754)
+/* 1667F0 80245F90 3C058024 */  lui       $a1, %hi(func_80243754)
-/* 1667F4 80245F94 24A53754 */  addiu     $a1, $a1, %lo(D_80243754)
+/* 1667F4 80245F94 24A53754 */  addiu     $a1, $a1, %lo(func_80243754)
 /* 1667F8 80245F98 0C051F9F */  jal       func_80147E7C
 /* 1667FC 80245F9C 2404002D */   addiu    $a0, $zero, 0x2d
 /* 166800 80245FA0 0C05272D */  jal       play_sound
@ -389,17 +389,17 @@ glabel func_80245A40
 /* 16684C 80245FEC 24050001 */  addiu     $a1, $zero, 1
 /* 166850 80245FF0 0C090B65 */  jal       func_80242D94
 /* 166854 80245FF4 24060002 */   addiu    $a2, $zero, 2
-/* 166858 80245FF8 3C058024 */  lui       $a1, %hi(D_8024368C)
+/* 166858 80245FF8 3C058024 */  lui       $a1, %hi(func_8024368C)
-/* 16685C 80245FFC 24A5368C */  addiu     $a1, $a1, %lo(D_8024368C)
+/* 16685C 80245FFC 24A5368C */  addiu     $a1, $a1, %lo(func_8024368C)
 /* 166860 80246000 0C051F9F */  jal       func_80147E7C
 /* 166864 80246004 24040033 */   addiu    $a0, $zero, 0x33
-/* 166868 80246008 3C058024 */  lui       $a1, %hi(D_802436F0)
+/* 166868 80246008 3C058024 */  lui       $a1, %hi(func_802436F0)
-/* 16686C 8024600C 24A536F0 */  addiu     $a1, $a1, %lo(D_802436F0)
+/* 16686C 8024600C 24A536F0 */  addiu     $a1, $a1, %lo(func_802436F0)
 /* 166870 80246010 0C051F9F */  jal       func_80147E7C
 /* 166874 80246014 24040034 */   addiu    $a0, $zero, 0x34
 /* 166878 80246018 24040035 */  addiu     $a0, $zero, 0x35
-/* 16687C 8024601C 3C108024 */  lui       $s0, %hi(D_802437B8)
+/* 16687C 8024601C 3C108024 */  lui       $s0, %hi(func_802437B8)
-/* 166880 80246020 261037B8 */  addiu     $s0, $s0, %lo(D_802437B8)
+/* 166880 80246020 261037B8 */  addiu     $s0, $s0, %lo(func_802437B8)
 /* 166884 80246024 0C051F9F */  jal       func_80147E7C
 /* 166888 80246028 0200282D */   daddu    $a1, $s0, $zero
 /* 16688C 8024602C 24040037 */  addiu     $a0, $zero, 0x37
@ -413,8 +413,8 @@ glabel func_80245A40
 /* 1668A8 80246048 0C05272D */  jal       play_sound
 /* 1668AC 8024604C 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 1668B0 80246050 2404002D */  addiu     $a0, $zero, 0x2d
-/* 1668B4 80246054 3C108024 */  lui       $s0, %hi(D_80243898)
+/* 1668B4 80246054 3C108024 */  lui       $s0, %hi(func_80243898)
-/* 1668B8 80246058 26103898 */  addiu     $s0, $s0, %lo(D_80243898)
+/* 1668B8 80246058 26103898 */  addiu     $s0, $s0, %lo(func_80243898)
 /* 1668BC 8024605C 0C051F9F */  jal       func_80147E7C
 /* 1668C0 80246060 0200282D */   daddu    $a1, $s0, $zero
 /* 1668C4 80246064 24040033 */  addiu     $a0, $zero, 0x33
@ -448,8 +448,8 @@ glabel func_80245A40
 /* 166934 802460D4 0C051F9F */  jal       func_80147E7C
 /* 166938 802460D8 0200282D */   daddu    $a1, $s0, $zero
 /* 16693C 802460DC 92640003 */  lbu       $a0, 3($s3)
-/* 166940 802460E0 3C058024 */  lui       $a1, %hi(D_80243908)
+/* 166940 802460E0 3C058024 */  lui       $a1, %hi(func_80243908)
-/* 166944 802460E4 24A53908 */  addiu     $a1, $a1, %lo(D_80243908)
+/* 166944 802460E4 24A53908 */  addiu     $a1, $a1, %lo(func_80243908)
 /* 166948 802460E8 0C051F9F */  jal       func_80147E7C
 /* 16694C 802460EC 24840038 */   addiu    $a0, $a0, 0x38
 /* 166950 802460F0 0C05272D */  jal       play_sound
@ -525,12 +525,12 @@ glabel func_80245A40
 /* 166A58 802461F8 0C05272D */  jal       play_sound
 /* 166A5C 802461FC 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 166A60 80246200 A2600004 */  sb        $zero, 4($s3)
-/* 166A64 80246204 3C058024 */  lui       $a1, %hi(D_802433F4)
+/* 166A64 80246204 3C058024 */  lui       $a1, %hi(func_802433F4)
-/* 166A68 80246208 24A533F4 */  addiu     $a1, $a1, %lo(D_802433F4)
+/* 166A68 80246208 24A533F4 */  addiu     $a1, $a1, %lo(func_802433F4)
 /* 166A6C 8024620C 0C051F9F */  jal       func_80147E7C
 /* 166A70 80246210 24040033 */   addiu    $a0, $zero, 0x33
-/* 166A74 80246214 3C058024 */  lui       $a1, %hi(D_80243468)
+/* 166A74 80246214 3C058024 */  lui       $a1, %hi(func_80243468)
-/* 166A78 80246218 24A53468 */  addiu     $a1, $a1, %lo(D_80243468)
+/* 166A78 80246218 24A53468 */  addiu     $a1, $a1, %lo(func_80243468)
 /* 166A7C 8024621C 0C051F9F */  jal       func_80147E7C
 /* 166A80 80246220 24040034 */   addiu    $a0, $zero, 0x34
 /* 166A84 80246224 24040035 */  addiu     $a0, $zero, 0x35
@ -556,8 +556,8 @@ glabel func_80245A40
 /* 166AD0 80246270 00000000 */   nop      
 /* 166AD4 80246274 0C05272D */  jal       play_sound
 /* 166AD8 80246278 240400C9 */   addiu    $a0, $zero, 0xc9
-/* 166ADC 8024627C 3C058024 */  lui       $a1, %hi(D_80243CCC)
+/* 166ADC 8024627C 3C058024 */  lui       $a1, %hi(func_80243CCC)
-/* 166AE0 80246280 24A53CCC */  addiu     $a1, $a1, %lo(D_80243CCC)
+/* 166AE0 80246280 24A53CCC */  addiu     $a1, $a1, %lo(func_80243CCC)
 /* 166AE4 80246284 0C051F9F */  jal       func_80147E7C
 /* 166AE8 80246288 24040032 */   addiu    $a0, $zero, 0x32
 /* 166AEC 8024628C 3C048016 */  lui       $a0, %hi(gUIPanels)
@ -628,12 +628,12 @@ glabel func_80245A40
 /* 166BE0 80246380 0C05272D */  jal       play_sound
 /* 166BE4 80246384 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 166BE8 80246388 A2600004 */  sb        $zero, 4($s3)
-/* 166BEC 8024638C 3C058024 */  lui       $a1, %hi(D_802433F4)
+/* 166BEC 8024638C 3C058024 */  lui       $a1, %hi(func_802433F4)
-/* 166BF0 80246390 24A533F4 */  addiu     $a1, $a1, %lo(D_802433F4)
+/* 166BF0 80246390 24A533F4 */  addiu     $a1, $a1, %lo(func_802433F4)
 /* 166BF4 80246394 0C051F9F */  jal       func_80147E7C
 /* 166BF8 80246398 24040033 */   addiu    $a0, $zero, 0x33
-/* 166BFC 8024639C 3C058024 */  lui       $a1, %hi(D_80243468)
+/* 166BFC 8024639C 3C058024 */  lui       $a1, %hi(func_80243468)
-/* 166C00 802463A0 24A53468 */  addiu     $a1, $a1, %lo(D_80243468)
+/* 166C00 802463A0 24A53468 */  addiu     $a1, $a1, %lo(func_80243468)
 /* 166C04 802463A4 0C051F9F */  jal       func_80147E7C
 /* 166C08 802463A8 24040034 */   addiu    $a0, $zero, 0x34
 /* 166C0C 802463AC 24040035 */  addiu     $a0, $zero, 0x35
@ -808,8 +808,8 @@ glabel func_80245A40
 .L80246630:
 /* 166E90 80246630 0C05272D */  jal       play_sound
 /* 166E94 80246634 240400C9 */   addiu    $a0, $zero, 0xc9
-/* 166E98 80246638 3C058024 */  lui       $a1, %hi(D_80243CCC)
+/* 166E98 80246638 3C058024 */  lui       $a1, %hi(func_80243CCC)
-/* 166E9C 8024663C 24A53CCC */  addiu     $a1, $a1, %lo(D_80243CCC)
+/* 166E9C 8024663C 24A53CCC */  addiu     $a1, $a1, %lo(func_80243CCC)
 /* 166EA0 80246640 0C051F9F */  jal       func_80147E7C
 /* 166EA4 80246644 24040032 */   addiu    $a0, $zero, 0x32
 /* 166EA8 80246648 3C048016 */  lui       $a0, %hi(gUIPanels)
@ -897,8 +897,8 @@ glabel func_80245A40
 /* 166FDC 8024677C 0C05272D */  jal       play_sound
 /* 166FE0 80246780 240400C9 */   addiu    $a0, $zero, 0xc9
 /* 166FE4 80246784 2404002C */  addiu     $a0, $zero, 0x2c
-/* 166FE8 80246788 3C058014 */  lui       $a1, %hi(D_80147650)
+/* 166FE8 80246788 3C058014 */  lui       $a1, %hi(func_80147650)
-/* 166FEC 8024678C 24A57650 */  addiu     $a1, $a1, %lo(D_80147650)
+/* 166FEC 8024678C 24A57650 */  addiu     $a1, $a1, %lo(func_80147650)
 /* 166FF0 80246790 24020002 */  addiu     $v0, $zero, 2
 /* 166FF4 80246794 3C018025 */  lui       $at, %hi(D_8024C098)
 /* 166FF8 80246798 A022C098 */  sb        $v0, %lo(D_8024C098)($at)
@ -923,8 +923,8 @@ glabel func_80245A40
 .L802467E4:
 /* 167044 802467E4 0C05272D */  jal       play_sound
 /* 167048 802467E8 240400C9 */   addiu    $a0, $zero, 0xc9
-/* 16704C 802467EC 3C058024 */  lui       $a1, %hi(D_80243CCC)
+/* 16704C 802467EC 3C058024 */  lui       $a1, %hi(func_80243CCC)
-/* 167050 802467F0 24A53CCC */  addiu     $a1, $a1, %lo(D_80243CCC)
+/* 167050 802467F0 24A53CCC */  addiu     $a1, $a1, %lo(func_80243CCC)
 /* 167054 802467F4 0C051F9F */  jal       func_80147E7C
 /* 167058 802467F8 24040032 */   addiu    $a0, $zero, 0x32
 /* 16705C 802467FC 3C048016 */  lui       $a0, %hi(gUIPanels)
@ -1026,18 +1026,18 @@ glabel func_80245A40
 /* 1671B8 80246958 00400008 */  jr        $v0
 /* 1671BC 8024695C 00000000 */   nop      
 /* 1671C0 80246960 24040033 */  addiu     $a0, $zero, 0x33
-/* 1671C4 80246964 3C128024 */  lui       $s2, %hi(D_8024368C)
+/* 1671C4 80246964 3C128024 */  lui       $s2, %hi(func_8024368C)
-/* 1671C8 80246968 2652368C */  addiu     $s2, $s2, %lo(D_8024368C)
+/* 1671C8 80246968 2652368C */  addiu     $s2, $s2, %lo(func_8024368C)
 /* 1671CC 8024696C 0C051F9F */  jal       func_80147E7C
 /* 1671D0 80246970 0240282D */   daddu    $a1, $s2, $zero
 /* 1671D4 80246974 24040034 */  addiu     $a0, $zero, 0x34
-/* 1671D8 80246978 3C118024 */  lui       $s1, %hi(D_802436F0)
+/* 1671D8 80246978 3C118024 */  lui       $s1, %hi(func_802436F0)
-/* 1671DC 8024697C 263136F0 */  addiu     $s1, $s1, %lo(D_802436F0)
+/* 1671DC 8024697C 263136F0 */  addiu     $s1, $s1, %lo(func_802436F0)
 /* 1671E0 80246980 0C051F9F */  jal       func_80147E7C
 /* 1671E4 80246984 0220282D */   daddu    $a1, $s1, $zero
 /* 1671E8 80246988 24040035 */  addiu     $a0, $zero, 0x35
-/* 1671EC 8024698C 3C108024 */  lui       $s0, %hi(D_802437B8)
+/* 1671EC 8024698C 3C108024 */  lui       $s0, %hi(func_802437B8)
-/* 1671F0 80246990 261037B8 */  addiu     $s0, $s0, %lo(D_802437B8)
+/* 1671F0 80246990 261037B8 */  addiu     $s0, $s0, %lo(func_802437B8)
 /* 1671F4 80246994 0C051F9F */  jal       func_80147E7C
 /* 1671F8 80246998 0200282D */   daddu    $a1, $s0, $zero
 /* 1671FC 8024699C 24040036 */  addiu     $a0, $zero, 0x36
@ -1058,8 +1058,8 @@ glabel func_80245A40
 /* 167238 802469D8 2404003B */  addiu     $a0, $zero, 0x3b
 /* 16723C 802469DC 0C051F9F */  jal       func_80147E7C
 /* 167240 802469E0 0220282D */   daddu    $a1, $s1, $zero
-/* 167244 802469E4 3C058024 */  lui       $a1, %hi(D_80243754)
+/* 167244 802469E4 3C058024 */  lui       $a1, %hi(func_80243754)
-/* 167248 802469E8 24A53754 */  addiu     $a1, $a1, %lo(D_80243754)
+/* 167248 802469E8 24A53754 */  addiu     $a1, $a1, %lo(func_80243754)
 /* 16724C 802469EC 0C051F9F */  jal       func_80147E7C
 /* 167250 802469F0 2404002D */   addiu    $a0, $zero, 0x2d
 /* 167254 802469F4 0C05272D */  jal       play_sound
@ -1071,12 +1071,12 @@ glabel func_80245A40
 /* 16726C 80246A0C 0000282D */  daddu     $a1, $zero, $zero
 /* 167270 80246A10 0C090B65 */  jal       func_80242D94
 /* 167274 80246A14 24060002 */   addiu    $a2, $zero, 2
-/* 167278 80246A18 3C058024 */  lui       $a1, %hi(D_802433F4)
+/* 167278 80246A18 3C058024 */  lui       $a1, %hi(func_802433F4)
-/* 16727C 80246A1C 24A533F4 */  addiu     $a1, $a1, %lo(D_802433F4)
+/* 16727C 80246A1C 24A533F4 */  addiu     $a1, $a1, %lo(func_802433F4)
 /* 167280 80246A20 0C051F9F */  jal       func_80147E7C
 /* 167284 80246A24 24040033 */   addiu    $a0, $zero, 0x33
-/* 167288 80246A28 3C058024 */  lui       $a1, %hi(D_80243468)
+/* 167288 80246A28 3C058024 */  lui       $a1, %hi(func_80243468)
-/* 16728C 80246A2C 24A53468 */  addiu     $a1, $a1, %lo(D_80243468)
+/* 16728C 80246A2C 24A53468 */  addiu     $a1, $a1, %lo(func_80243468)
 /* 167290 80246A30 0C051F9F */  jal       func_80147E7C
 /* 167294 80246A34 24040034 */   addiu    $a0, $zero, 0x34
 /* 167298 80246A38 24040035 */  addiu     $a0, $zero, 0x35
@ -1094,12 +1094,12 @@ glabel func_80245A40
 /* 1672C8 80246A68 24050001 */  addiu     $a1, $zero, 1
 /* 1672CC 80246A6C 0C090B65 */  jal       func_80242D94
 /* 1672D0 80246A70 24060002 */   addiu    $a2, $zero, 2
-/* 1672D4 80246A74 3C058024 */  lui       $a1, %hi(D_802433F4)
+/* 1672D4 80246A74 3C058024 */  lui       $a1, %hi(func_802433F4)
-/* 1672D8 80246A78 24A533F4 */  addiu     $a1, $a1, %lo(D_802433F4)
+/* 1672D8 80246A78 24A533F4 */  addiu     $a1, $a1, %lo(func_802433F4)
 /* 1672DC 80246A7C 0C051F9F */  jal       func_80147E7C
 /* 1672E0 80246A80 24040033 */   addiu    $a0, $zero, 0x33
-/* 1672E4 80246A84 3C058024 */  lui       $a1, %hi(D_80243468)
+/* 1672E4 80246A84 3C058024 */  lui       $a1, %hi(func_80243468)
-/* 1672E8 80246A88 24A53468 */  addiu     $a1, $a1, %lo(D_80243468)
+/* 1672E8 80246A88 24A53468 */  addiu     $a1, $a1, %lo(func_80243468)
 /* 1672EC 80246A8C 0C051F9F */  jal       func_80147E7C
 /* 1672F0 80246A90 24040034 */   addiu    $a0, $zero, 0x34
 /* 1672F4 80246A94 24040035 */  addiu     $a0, $zero, 0x35
--- a/asm/nonmatchings/code_167570/func_802471EC.s
+++ b/asm/nonmatchings/code_167570/func_802471EC.s
@ -164,8 +164,8 @@ glabel func_802471EC
 /* 167CA4 80247444 24050001 */  addiu     $a1, $zero, 1
 /* 167CA8 80247448 0C051F9F */  jal       func_80147E7C
 /* 167CAC 8024744C A4C20000 */   sh       $v0, ($a2)
-/* 167CB0 80247450 3C058024 */  lui       $a1, %hi(D_80243EEC)
+/* 167CB0 80247450 3C058024 */  lui       $a1, %hi(func_80243EEC)
-/* 167CB4 80247454 24A53EEC */  addiu     $a1, $a1, %lo(D_80243EEC)
+/* 167CB4 80247454 24A53EEC */  addiu     $a1, $a1, %lo(func_80243EEC)
 /* 167CB8 80247458 0C051F9F */  jal       func_80147E7C
 /* 167CBC 8024745C 24040032 */   addiu    $a0, $zero, 0x32
 /* 167CC0 80247460 0000202D */  daddu     $a0, $zero, $zero
@ -263,8 +263,8 @@ glabel func_802471EC
 /* 167E1C 802475BC 24050001 */  addiu     $a1, $zero, 1
 /* 167E20 802475C0 0C051F9F */  jal       func_80147E7C
 /* 167E24 802475C4 A4C20000 */   sh       $v0, ($a2)
-/* 167E28 802475C8 3C058024 */  lui       $a1, %hi(D_80243EEC)
+/* 167E28 802475C8 3C058024 */  lui       $a1, %hi(func_80243EEC)
-/* 167E2C 802475CC 24A53EEC */  addiu     $a1, $a1, %lo(D_80243EEC)
+/* 167E2C 802475CC 24A53EEC */  addiu     $a1, $a1, %lo(func_80243EEC)
 /* 167E30 802475D0 0C051F9F */  jal       func_80147E7C
 /* 167E34 802475D4 24040032 */   addiu    $a0, $zero, 0x32
 /* 167E38 802475D8 3C118025 */  lui       $s1, %hi(D_8024C094)
@ -363,8 +363,8 @@ glabel func_802471EC
 /* 167F9C 8024773C 24050001 */  addiu     $a1, $zero, 1
 /* 167FA0 80247740 0C051F9F */  jal       func_80147E7C
 /* 167FA4 80247744 A4C20000 */   sh       $v0, ($a2)
-/* 167FA8 80247748 3C058024 */  lui       $a1, %hi(D_80243EEC)
+/* 167FA8 80247748 3C058024 */  lui       $a1, %hi(func_80243EEC)
-/* 167FAC 8024774C 24A53EEC */  addiu     $a1, $a1, %lo(D_80243EEC)
+/* 167FAC 8024774C 24A53EEC */  addiu     $a1, $a1, %lo(func_80243EEC)
 /* 167FB0 80247750 0C051F9F */  jal       func_80147E7C
 /* 167FB4 80247754 24040032 */   addiu    $a0, $zero, 0x32
 /* 167FB8 80247758 3C108025 */  lui       $s0, %hi(D_80249B84)
@ -447,8 +447,8 @@ glabel func_802471EC
 /* 1680E4 80247884 0C00ACDD */  jal       fio_save_game
 /* 1680E8 80247888 0220202D */   daddu    $a0, $s1, $zero
 /* 1680EC 8024788C 24040030 */  addiu     $a0, $zero, 0x30
-/* 1680F0 80247890 3C108024 */  lui       $s0, %hi(D_80243628)
+/* 1680F0 80247890 3C108024 */  lui       $s0, %hi(func_80243628)
-/* 1680F4 80247894 26103628 */  addiu     $s0, $s0, %lo(D_80243628)
+/* 1680F4 80247894 26103628 */  addiu     $s0, $s0, %lo(func_80243628)
 /* 1680F8 80247898 24020001 */  addiu     $v0, $zero, 1
 /* 1680FC 8024789C 3C018007 */  lui       $at, %hi(D_80077A24)
 /* 168100 802478A0 00310821 */  addu      $at, $at, $s1
@ -459,8 +459,8 @@ glabel func_802471EC
 /* 168114 802478B4 0C051F9F */  jal       func_80147E7C
 /* 168118 802478B8 0200282D */   daddu    $a1, $s0, $zero
 /* 16811C 802478BC 2404002D */  addiu     $a0, $zero, 0x2d
-/* 168120 802478C0 3C108024 */  lui       $s0, %hi(D_8024381C)
+/* 168120 802478C0 3C108024 */  lui       $s0, %hi(func_8024381C)
-/* 168124 802478C4 2610381C */  addiu     $s0, $s0, %lo(D_8024381C)
+/* 168124 802478C4 2610381C */  addiu     $s0, $s0, %lo(func_8024381C)
 /* 168128 802478C8 0C051F9F */  jal       func_80147E7C
 /* 16812C 802478CC 0200282D */   daddu    $a1, $s0, $zero
 /* 168130 802478D0 24040033 */  addiu     $a0, $zero, 0x33
@ -493,8 +493,8 @@ glabel func_802471EC
 /* 16819C 8024793C 2404003B */  addiu     $a0, $zero, 0x3b
 /* 1681A0 80247940 0C051F9F */  jal       func_80147E7C
 /* 1681A4 80247944 0200282D */   daddu    $a1, $s0, $zero
-/* 1681A8 80247948 3C058024 */  lui       $a1, %hi(D_80243EEC)
+/* 1681A8 80247948 3C058024 */  lui       $a1, %hi(func_80243EEC)
-/* 1681AC 8024794C 24A53EEC */  addiu     $a1, $a1, %lo(D_80243EEC)
+/* 1681AC 8024794C 24A53EEC */  addiu     $a1, $a1, %lo(func_80243EEC)
 /* 1681B0 80247950 0C051F9F */  jal       func_80147E7C
 /* 1681B4 80247954 24040032 */   addiu    $a0, $zero, 0x32
 /* 1681B8 80247958 24020002 */  addiu     $v0, $zero, 2
@ -597,20 +597,20 @@ glabel func_802471EC
 /* 168320 80247AC0 00000000 */   nop      
 /* 168324 80247AC4 3C018025 */  lui       $at, %hi(D_8024C098)
 /* 168328 80247AC8 A020C098 */  sb        $zero, %lo(D_8024C098)($at)
-/* 16832C 80247ACC 3C058024 */  lui       $a1, %hi(D_80243EEC)
+/* 16832C 80247ACC 3C058024 */  lui       $a1, %hi(func_80243EEC)
-/* 168330 80247AD0 24A53EEC */  addiu     $a1, $a1, %lo(D_80243EEC)
+/* 168330 80247AD0 24A53EEC */  addiu     $a1, $a1, %lo(func_80243EEC)
 /* 168334 80247AD4 08091EEC */  j         .L80247BB0
 /* 168338 80247AD8 24040032 */   addiu    $a0, $zero, 0x32
 /* 16833C 80247ADC 24020003 */  addiu     $v0, $zero, 3
 /* 168340 80247AE0 3C018025 */  lui       $at, %hi(D_8024C098)
 /* 168344 80247AE4 A022C098 */  sb        $v0, %lo(D_8024C098)($at)
-/* 168348 80247AE8 3C058024 */  lui       $a1, %hi(D_80243EEC)
+/* 168348 80247AE8 3C058024 */  lui       $a1, %hi(func_80243EEC)
-/* 16834C 80247AEC 24A53EEC */  addiu     $a1, $a1, %lo(D_80243EEC)
+/* 16834C 80247AEC 24A53EEC */  addiu     $a1, $a1, %lo(func_80243EEC)
 /* 168350 80247AF0 08091EEC */  j         .L80247BB0
 /* 168354 80247AF4 24040032 */   addiu    $a0, $zero, 0x32
 /* 168358 80247AF8 2404002D */  addiu     $a0, $zero, 0x2d
-/* 16835C 80247AFC 3C108024 */  lui       $s0, %hi(D_8024381C)
+/* 16835C 80247AFC 3C108024 */  lui       $s0, %hi(func_8024381C)
-/* 168360 80247B00 2610381C */  addiu     $s0, $s0, %lo(D_8024381C)
+/* 168360 80247B00 2610381C */  addiu     $s0, $s0, %lo(func_8024381C)
 /* 168364 80247B04 3C028025 */  lui       $v0, %hi(D_80249B84)
 /* 168368 80247B08 8C429B84 */  lw        $v0, %lo(D_80249B84)($v0)
 /* 16836C 80247B0C 3C018025 */  lui       $at, %hi(D_8024C098)
@ -648,8 +648,8 @@ glabel func_802471EC
 /* 1683EC 80247B8C 2404003B */  addiu     $a0, $zero, 0x3b
 /* 1683F0 80247B90 0C051F9F */  jal       func_80147E7C
 /* 1683F4 80247B94 0200282D */   daddu    $a1, $s0, $zero
-/* 1683F8 80247B98 3C058024 */  lui       $a1, %hi(D_80243B10)
+/* 1683F8 80247B98 3C058024 */  lui       $a1, %hi(func_80243B10)
-/* 1683FC 80247B9C 24A53B10 */  addiu     $a1, $a1, %lo(D_80243B10)
+/* 1683FC 80247B9C 24A53B10 */  addiu     $a1, $a1, %lo(func_80243B10)
 /* 168400 80247BA0 0C051F9F */  jal       func_80147E7C
 /* 168404 80247BA4 26240038 */   addiu    $a0, $s1, 0x38
 /* 168408 80247BA8 24040032 */  addiu     $a0, $zero, 0x32
@ -680,20 +680,20 @@ glabel func_802471EC
 /* 168464 80247C04 00000000 */   nop      
 /* 168468 80247C08 3C018025 */  lui       $at, %hi(D_8024C098)
 /* 16846C 80247C0C A020C098 */  sb        $zero, %lo(D_8024C098)($at)
-/* 168470 80247C10 3C058024 */  lui       $a1, %hi(D_80243EEC)
+/* 168470 80247C10 3C058024 */  lui       $a1, %hi(func_80243EEC)
-/* 168474 80247C14 24A53EEC */  addiu     $a1, $a1, %lo(D_80243EEC)
+/* 168474 80247C14 24A53EEC */  addiu     $a1, $a1, %lo(func_80243EEC)
 /* 168478 80247C18 08091F3D */  j         .L80247CF4
 /* 16847C 80247C1C 24040032 */   addiu    $a0, $zero, 0x32
 /* 168480 80247C20 24020003 */  addiu     $v0, $zero, 3
 /* 168484 80247C24 3C018025 */  lui       $at, %hi(D_8024C098)
 /* 168488 80247C28 A022C098 */  sb        $v0, %lo(D_8024C098)($at)
-/* 16848C 80247C2C 3C058024 */  lui       $a1, %hi(D_80243EEC)
+/* 16848C 80247C2C 3C058024 */  lui       $a1, %hi(func_80243EEC)
-/* 168490 80247C30 24A53EEC */  addiu     $a1, $a1, %lo(D_80243EEC)
+/* 168490 80247C30 24A53EEC */  addiu     $a1, $a1, %lo(func_80243EEC)
 /* 168494 80247C34 08091F3D */  j         .L80247CF4
 /* 168498 80247C38 24040032 */   addiu    $a0, $zero, 0x32
 /* 16849C 80247C3C 2404002D */  addiu     $a0, $zero, 0x2d
-/* 1684A0 80247C40 3C108024 */  lui       $s0, %hi(D_8024381C)
+/* 1684A0 80247C40 3C108024 */  lui       $s0, %hi(func_8024381C)
-/* 1684A4 80247C44 2610381C */  addiu     $s0, $s0, %lo(D_8024381C)
+/* 1684A4 80247C44 2610381C */  addiu     $s0, $s0, %lo(func_8024381C)
 /* 1684A8 80247C48 3C028025 */  lui       $v0, %hi(D_80249B84)
 /* 1684AC 80247C4C 8C429B84 */  lw        $v0, %lo(D_80249B84)($v0)
 /* 1684B0 80247C50 3C018025 */  lui       $at, %hi(D_8024C098)
@ -731,8 +731,8 @@ glabel func_802471EC
 /* 168530 80247CD0 2404003B */  addiu     $a0, $zero, 0x3b
 /* 168534 80247CD4 0C051F9F */  jal       func_80147E7C
 /* 168538 80247CD8 0200282D */   daddu    $a1, $s0, $zero
-/* 16853C 80247CDC 3C058024 */  lui       $a1, %hi(D_80243B10)
+/* 16853C 80247CDC 3C058024 */  lui       $a1, %hi(func_80243B10)
-/* 168540 80247CE0 24A53B10 */  addiu     $a1, $a1, %lo(D_80243B10)
+/* 168540 80247CE0 24A53B10 */  addiu     $a1, $a1, %lo(func_80243B10)
 /* 168544 80247CE4 0C051F9F */  jal       func_80147E7C
 /* 168548 80247CE8 26240038 */   addiu    $a0, $s1, 0x38
 /* 16854C 80247CEC 24040032 */  addiu     $a0, $zero, 0x32
--- a/asm/nonmatchings/code_168590/func_80248024.s
+++ b/asm/nonmatchings/code_168590/func_80248024.s
@ -32,12 +32,12 @@ glabel func_80248024
 /* 1688EC 8024808C 00000000 */   nop      
 .L80248090:
 /* 1688F0 80248090 A2200004 */  sb        $zero, 4($s1)
-/* 1688F4 80248094 3C058024 */  lui       $a1, %hi(D_802433F4)
+/* 1688F4 80248094 3C058024 */  lui       $a1, %hi(func_802433F4)
-/* 1688F8 80248098 24A533F4 */  addiu     $a1, $a1, %lo(D_802433F4)
+/* 1688F8 80248098 24A533F4 */  addiu     $a1, $a1, %lo(func_802433F4)
 /* 1688FC 8024809C 0C051F9F */  jal       func_80147E7C
 /* 168900 802480A0 24040033 */   addiu    $a0, $zero, 0x33
-/* 168904 802480A4 3C058024 */  lui       $a1, %hi(D_80243468)
+/* 168904 802480A4 3C058024 */  lui       $a1, %hi(func_80243468)
-/* 168908 802480A8 24A53468 */  addiu     $a1, $a1, %lo(D_80243468)
+/* 168908 802480A8 24A53468 */  addiu     $a1, $a1, %lo(func_80243468)
 /* 16890C 802480AC 0C051F9F */  jal       func_80147E7C
 /* 168910 802480B0 24040034 */   addiu    $a0, $zero, 0x34
 /* 168914 802480B4 24040035 */  addiu     $a0, $zero, 0x35
@ -53,12 +53,12 @@ glabel func_80248024
 /* 16893C 802480DC 0000282D */   daddu    $a1, $zero, $zero
 .L802480E0:
 /* 168940 802480E0 A2200004 */  sb        $zero, 4($s1)
-/* 168944 802480E4 3C058024 */  lui       $a1, %hi(D_802433F4)
+/* 168944 802480E4 3C058024 */  lui       $a1, %hi(func_802433F4)
-/* 168948 802480E8 24A533F4 */  addiu     $a1, $a1, %lo(D_802433F4)
+/* 168948 802480E8 24A533F4 */  addiu     $a1, $a1, %lo(func_802433F4)
 /* 16894C 802480EC 0C051F9F */  jal       func_80147E7C
 /* 168950 802480F0 24040033 */   addiu    $a0, $zero, 0x33
-/* 168954 802480F4 3C058024 */  lui       $a1, %hi(D_80243468)
+/* 168954 802480F4 3C058024 */  lui       $a1, %hi(func_80243468)
-/* 168958 802480F8 24A53468 */  addiu     $a1, $a1, %lo(D_80243468)
+/* 168958 802480F8 24A53468 */  addiu     $a1, $a1, %lo(func_80243468)
 /* 16895C 802480FC 0C051F9F */  jal       func_80147E7C
 /* 168960 80248100 24040034 */   addiu    $a0, $zero, 0x34
 /* 168964 80248104 24040035 */  addiu     $a0, $zero, 0x35
--- a/asm/nonmatchings/code_168590/func_8024830C.s
+++ b/asm/nonmatchings/code_168590/func_8024830C.s
@ -24,8 +24,8 @@ glabel func_8024830C
 /* 168BB8 80248358 10400130 */  beqz      $v0, .L8024881C
 /* 168BBC 8024835C 00A0482D */   daddu    $t1, $a1, $zero
 /* 168BC0 80248360 8C830004 */  lw        $v1, 4($a0)
-/* 168BC4 80248364 3C028025 */  lui       $v0, %hi(D_80248170)
+/* 168BC4 80248364 3C028025 */  lui       $v0, %hi(func_80248170)
-/* 168BC8 80248368 24428170 */  addiu     $v0, $v0, %lo(D_80248170)
+/* 168BC8 80248368 24428170 */  addiu     $v0, $v0, %lo(func_80248170)
 /* 168BCC 8024836C 1462012B */  bne       $v1, $v0, .L8024881C
 /* 168BD0 80248370 00000000 */   nop      
 /* 168BD4 80248374 9082001C */  lbu       $v0, 0x1c($a0)
--- a/asm/nonmatchings/code_168590/func_80248BF4.s
+++ b/asm/nonmatchings/code_168590/func_80248BF4.s
@ -193,8 +193,8 @@ glabel func_80248BF4
 .L80248EB4:
 /* 169714 80248EB4 0C090B65 */  jal       func_80242D94
 /* 169718 80248EB8 00000000 */   nop      
-/* 16971C 80248EBC 3C058025 */  lui       $a1, %hi(D_80248170)
+/* 16971C 80248EBC 3C058025 */  lui       $a1, %hi(func_80248170)
-/* 169720 80248EC0 24A58170 */  addiu     $a1, $a1, %lo(D_80248170)
+/* 169720 80248EC0 24A58170 */  addiu     $a1, $a1, %lo(func_80248170)
 /* 169724 80248EC4 0C051F9F */  jal       func_80147E7C
 /* 169728 80248EC8 24040031 */   addiu    $a0, $zero, 0x31
 /* 16972C 80248ECC 0809240D */  j         .L80249034
@ -223,8 +223,8 @@ glabel func_80248BF4
 .L80248F20:
 /* 169780 80248F20 0C05272D */  jal       play_sound
 /* 169784 80248F24 240400C9 */   addiu    $a0, $zero, 0xc9
-/* 169788 80248F28 3C058024 */  lui       $a1, %hi(D_80243CCC)
+/* 169788 80248F28 3C058024 */  lui       $a1, %hi(func_80243CCC)
-/* 16978C 80248F2C 24A53CCC */  addiu     $a1, $a1, %lo(D_80243CCC)
+/* 16978C 80248F2C 24A53CCC */  addiu     $a1, $a1, %lo(func_80243CCC)
 /* 169790 80248F30 0C051F9F */  jal       func_80147E7C
 /* 169794 80248F34 24040032 */   addiu    $a0, $zero, 0x32
 /* 169798 80248F38 3C048016 */  lui       $a0, %hi(gUIPanels)
@ -335,8 +335,8 @@ glabel func_80248BF4
 /* 16991C 802490BC 04430031 */  bgezl     $v0, .L80249184
 /* 169920 802490C0 0040182D */   daddu    $v1, $v0, $zero
 /* 169924 802490C4 24040030 */  addiu     $a0, $zero, 0x30
-/* 169928 802490C8 3C108024 */  lui       $s0, %hi(D_80243628)
+/* 169928 802490C8 3C108024 */  lui       $s0, %hi(func_80243628)
-/* 16992C 802490CC 26103628 */  addiu     $s0, $s0, %lo(D_80243628)
+/* 16992C 802490CC 26103628 */  addiu     $s0, $s0, %lo(func_80243628)
 /* 169930 802490D0 0200282D */  daddu     $a1, $s0, $zero
 /* 169934 802490D4 0C051F9F */  jal       func_80147E7C
 /* 169938 802490D8 A0600000 */   sb       $zero, ($v1)
@ -344,8 +344,8 @@ glabel func_80248BF4
 /* 169940 802490E0 0C051F9F */  jal       func_80147E7C
 /* 169944 802490E4 0200282D */   daddu    $a1, $s0, $zero
 /* 169948 802490E8 2404002D */  addiu     $a0, $zero, 0x2d
-/* 16994C 802490EC 3C108024 */  lui       $s0, %hi(D_8024381C)
+/* 16994C 802490EC 3C108024 */  lui       $s0, %hi(func_8024381C)
-/* 169950 802490F0 2610381C */  addiu     $s0, $s0, %lo(D_8024381C)
+/* 169950 802490F0 2610381C */  addiu     $s0, $s0, %lo(func_8024381C)
 /* 169954 802490F4 0C051F9F */  jal       func_80147E7C
 /* 169958 802490F8 0200282D */   daddu    $a1, $s0, $zero
 /* 16995C 802490FC 24040033 */  addiu     $a0, $zero, 0x33
@ -425,8 +425,8 @@ glabel func_80248BF4
 .L80249210:
 /* 169A70 80249210 0C05272D */  jal       play_sound
 /* 169A74 80249214 240400C9 */   addiu    $a0, $zero, 0xc9
-/* 169A78 80249218 3C058024 */  lui       $a1, %hi(D_80243CCC)
+/* 169A78 80249218 3C058024 */  lui       $a1, %hi(func_80243CCC)
-/* 169A7C 8024921C 24A53CCC */  addiu     $a1, $a1, %lo(D_80243CCC)
+/* 169A7C 8024921C 24A53CCC */  addiu     $a1, $a1, %lo(func_80243CCC)
 /* 169A80 80249220 0C051F9F */  jal       func_80147E7C
 /* 169A84 80249224 24040032 */   addiu    $a0, $zero, 0x32
 /* 169A88 80249228 3C048016 */  lui       $a0, %hi(gUIPanels)
--- a/asm/nonmatchings/code_16F740/func_80246B2C.s
+++ b/asm/nonmatchings/code_16F740/func_80246B2C.s
@ -0,0 +1,6 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 glabel func_80246B2C
 /* 17540C 80246B2C 03E00008 */  jr        $ra
 /* 175410 80246B30 00000000 */   nop      
--- a/asm/nonmatchings/code_16c8e0/initialize_battle.s
+++ b/asm/nonmatchings/code_16c8e0/initialize_battle.s
@ -87,8 +87,8 @@ glabel initialize_battle
 /* 16CB44 8023E264 00641824 */  and       $v1, $v1, $a0
 /* 16CB48 8023E268 AC430004 */  sw        $v1, 4($v0)
 .L8023E26C:
-/* 16CB4C 8023E26C 3C058024 */  lui       $a1, %hi(D_8023ED5C)
+/* 16CB4C 8023E26C 3C058024 */  lui       $a1, %hi(func_8023ED5C)
-/* 16CB50 8023E270 24A5ED5C */  addiu     $a1, $a1, %lo(D_8023ED5C)
+/* 16CB50 8023E270 24A5ED5C */  addiu     $a1, $a1, %lo(func_8023ED5C)
 /* 16CB54 8023E274 0C048C56 */  jal       bind_dynamic_entity_3
 /* 16CB58 8023E278 0000202D */   daddu    $a0, $zero, $zero
 /* 16CB5C 8023E27C 0C093B70 */  jal       func_8024EDC0
@ -162,12 +162,12 @@ glabel initialize_battle
 /* 16CC60 8023E380 2A22000A */  slti      $v0, $s1, 0xa
 /* 16CC64 8023E384 1440FFF2 */  bnez      $v0, .L8023E350
 /* 16CC68 8023E388 26520004 */   addiu    $s2, $s2, 4
-/* 16CC6C 8023E38C 3C028024 */  lui       $v0, %hi(D_8023F088)
+/* 16CC6C 8023E38C 3C028024 */  lui       $v0, %hi(func_8023F088)
-/* 16CC70 8023E390 2442F088 */  addiu     $v0, $v0, %lo(D_8023F088)
+/* 16CC70 8023E390 2442F088 */  addiu     $v0, $v0, %lo(func_8023F088)
 /* 16CC74 8023E394 AE8201FC */  sw        $v0, 0x1fc($s4)
 /* 16CC78 8023E398 966302A2 */  lhu       $v1, 0x2a2($s3)
-/* 16CC7C 8023E39C 3C028024 */  lui       $v0, %hi(D_8023FF84)
+/* 16CC7C 8023E39C 3C028024 */  lui       $v0, %hi(func_8023FF84)
-/* 16CC80 8023E3A0 2442FF84 */  addiu     $v0, $v0, %lo(D_8023FF84)
+/* 16CC80 8023E3A0 2442FF84 */  addiu     $v0, $v0, %lo(func_8023FF84)
 /* 16CC84 8023E3A4 AE820200 */  sw        $v0, 0x200($s4)
 /* 16CC88 8023E3A8 2C62270F */  sltiu     $v0, $v1, 0x270f
 /* 16CC8C 8023E3AC 10400002 */  beqz      $v0, .L8023E3B8
--- a/asm/nonmatchings/code_17D6A0/func_8024EFE0.s
+++ b/asm/nonmatchings/code_17D6A0/func_8024EFE0.s
@ -67,12 +67,12 @@ glabel func_8024EFE0
 /* 17D9A8 8024F0C8 00042080 */  sll       $a0, $a0, 2
 /* 17D9AC 8024F0CC 00952023 */  subu      $a0, $a0, $s5
 /* 17D9B0 8024F0D0 00042080 */  sll       $a0, $a0, 2
-/* 17D9B4 8024F0D4 3C028025 */  lui       $v0, %hi(D_8024F394)
+/* 17D9B4 8024F0D4 3C028025 */  lui       $v0, %hi(func_8024F394)
-/* 17D9B8 8024F0D8 2442F394 */  addiu     $v0, $v0, %lo(D_8024F394)
+/* 17D9B8 8024F0D8 2442F394 */  addiu     $v0, $v0, %lo(func_8024F394)
 /* 17D9BC 8024F0DC A6200090 */  sh        $zero, 0x90($s1)
 /* 17D9C0 8024F0E0 AE020004 */  sw        $v0, 4($s0)
-/* 17D9C4 8024F0E4 3C028025 */  lui       $v0, %hi(D_8024F5AC)
+/* 17D9C4 8024F0E4 3C028025 */  lui       $v0, %hi(func_8024F5AC)
-/* 17D9C8 8024F0E8 2442F5AC */  addiu     $v0, $v0, %lo(D_8024F5AC)
+/* 17D9C8 8024F0E8 2442F5AC */  addiu     $v0, $v0, %lo(func_8024F5AC)
 /* 17D9CC 8024F0EC AE020008 */  sw        $v0, 8($s0)
 /* 17D9D0 8024F0F0 96020010 */  lhu       $v0, 0x10($s0)
 /* 17D9D4 8024F0F4 24030001 */  addiu     $v1, $zero, 1
@ -116,8 +116,8 @@ glabel func_8024EFE0
 /* 17DA60 8024F180 0C048BBA */  jal       func_80122EE8
 /* 17DA64 8024F184 AE04FFBC */   sw       $a0, -0x44($s0)
 /* 17DA68 8024F188 8E04FFBC */  lw        $a0, -0x44($s0)
-/* 17DA6C 8024F18C 3C068025 */  lui       $a2, %hi(D_8024F768)
+/* 17DA6C 8024F18C 3C068025 */  lui       $a2, %hi(func_8024F768)
-/* 17DA70 8024F190 24C6F768 */  addiu     $a2, $a2, %lo(D_8024F768)
+/* 17DA70 8024F190 24C6F768 */  addiu     $a2, $a2, %lo(func_8024F768)
 /* 17DA74 8024F194 0C048BD9 */  jal       func_80122F64
 /* 17DA78 8024F198 0260282D */   daddu    $a1, $s3, $zero
 /* 17DA7C 8024F19C 0240102D */  daddu     $v0, $s2, $zero
--- a/asm/nonmatchings/code_17D6A0/func_8024F394.s
+++ b/asm/nonmatchings/code_17D6A0/func_8024F394.s
@ -132,7 +132,7 @@ glabel func_8024F394
 /* 17DE50 8024F570 0C00AB4B */  jal       heap_free
 /* 17DE54 8024F574 8E840018 */   lw       $a0, 0x18($s4)
 /* 17DE58 8024F578 0280202D */  daddu     $a0, $s4, $zero
-/* 17DE5C 8024F57C 0C093BE9 */  jal       func_8024EFA4
+/* 17DE5C 8024F57C 0C093BE9 */  jal       gPauseMenuCursorOpacity
 /* 17DE60 8024F580 AC800018 */   sw       $zero, 0x18($a0)
 .L8024F584:
 /* 17DE64 8024F584 8FBF0028 */  lw        $ra, 0x28($sp)
--- a/asm/nonmatchings/code_17D6A0/func_8024FB3C.s
+++ b/asm/nonmatchings/code_17D6A0/func_8024FB3C.s
@ -846,7 +846,7 @@ glabel func_8024FB3C
 /* 17F0CC 802507EC 24050002 */   addiu    $a1, $zero, 2
 /* 17F0D0 802507F0 3C018028 */  lui       $at, %hi(D_802838F8)
 /* 17F0D4 802507F4 AC2038F8 */  sw        $zero, %lo(D_802838F8)($at)
-/* 17F0D8 802507F8 0C093BE9 */  jal       func_8024EFA4
+/* 17F0D8 802507F8 0C093BE9 */  jal       gPauseMenuCursorOpacity
 /* 17F0DC 802507FC 0220202D */   daddu    $a0, $s1, $zero
 .L80250800:
 /* 17F0E0 80250800 8FBF001C */  lw        $ra, 0x1c($sp)
--- a/asm/nonmatchings/code_17D6A0/show_battle_message.s
+++ b/asm/nonmatchings/code_17D6A0/show_battle_message.s
@ -12,8 +12,8 @@ glabel show_battle_message
 /* 17E25C 8024F97C 0040182D */  daddu     $v1, $v0, $zero
 /* 17E260 8024F980 1060001B */  beqz      $v1, .L8024F9F0
 /* 17E264 8024F984 00000000 */   nop      
-/* 17E268 8024F988 3C028025 */  lui       $v0, %hi(D_8024FB3C)
+/* 17E268 8024F988 3C028025 */  lui       $v0, %hi(func_8024FB3C)
-/* 17E26C 8024F98C 2442FB3C */  addiu     $v0, $v0, %lo(D_8024FB3C)
+/* 17E26C 8024F98C 2442FB3C */  addiu     $v0, $v0, %lo(func_8024FB3C)
 /* 17E270 8024F990 AC620004 */  sw        $v0, 4($v1)
 /* 17E274 8024F994 3C028025 */  lui       $v0, %hi(show_message_popup)
 /* 17E278 8024F998 24420EA4 */  addiu     $v0, $v0, %lo(show_message_popup)
--- a/asm/nonmatchings/code_17D6A0/show_message_popup.s
+++ b/asm/nonmatchings/code_17D6A0/show_message_popup.s
@ -49,8 +49,8 @@ glabel show_message_popup
 /* 17F834 80250F54 3C088028 */  lui       $t0, %hi(D_802835D0)
 /* 17F838 80250F58 01024021 */  addu      $t0, $t0, $v0
 /* 17F83C 80250F5C 850835D0 */  lh        $t0, %lo(D_802835D0)($t0)
-/* 17F840 80250F60 3C028025 */  lui       $v0, %hi(D_80250818)
+/* 17F840 80250F60 3C028025 */  lui       $v0, %hi(func_80250818)
-/* 17F844 80250F64 24420818 */  addiu     $v0, $v0, %lo(D_80250818)
+/* 17F844 80250F64 24420818 */  addiu     $v0, $v0, %lo(func_80250818)
 /* 17F848 80250F68 AFA20018 */  sw        $v0, 0x18($sp)
 /* 17F84C 80250F6C 2402FFFF */  addiu     $v0, $zero, -1
 /* 17F850 80250F70 AFA00014 */  sw        $zero, 0x14($sp)
@ -81,8 +81,8 @@ glabel show_message_popup
 /* 17F8B4 80250FD4 240200A0 */  addiu     $v0, $zero, 0xa0
 /* 17F8B8 80250FD8 00452823 */  subu      $a1, $v0, $a1
 /* 17F8BC 80250FDC 0280302D */  daddu     $a2, $s4, $zero
-/* 17F8C0 80250FE0 3C028025 */  lui       $v0, %hi(D_80250818)
+/* 17F8C0 80250FE0 3C028025 */  lui       $v0, %hi(func_80250818)
-/* 17F8C4 80250FE4 24420818 */  addiu     $v0, $v0, %lo(D_80250818)
+/* 17F8C4 80250FE4 24420818 */  addiu     $v0, $v0, %lo(func_80250818)
 /* 17F8C8 80250FE8 AFA20018 */  sw        $v0, 0x18($sp)
 /* 17F8CC 80250FEC 2402FFFF */  addiu     $v0, $zero, -1
 /* 17F8D0 80250FF0 AFA80010 */  sw        $t0, 0x10($sp)
@ -127,8 +127,8 @@ glabel show_message_popup
 /* 17F96C 8025108C 3C088028 */  lui       $t0, %hi(D_802835D0)
 /* 17F970 80251090 01024021 */  addu      $t0, $t0, $v0
 /* 17F974 80251094 850835D0 */  lh        $t0, %lo(D_802835D0)($t0)
-/* 17F978 80251098 3C028025 */  lui       $v0, %hi(D_80250818)
+/* 17F978 80251098 3C028025 */  lui       $v0, %hi(func_80250818)
-/* 17F97C 8025109C 24420818 */  addiu     $v0, $v0, %lo(D_80250818)
+/* 17F97C 8025109C 24420818 */  addiu     $v0, $v0, %lo(func_80250818)
 /* 17F980 802510A0 AFA20018 */  sw        $v0, 0x18($sp)
 /* 17F984 802510A4 2402FFFF */  addiu     $v0, $zero, -1
 /* 17F988 802510A8 AFA00014 */  sw        $zero, 0x14($sp)
@ -177,8 +177,8 @@ glabel show_message_popup
 /* 17FA34 80251154 3C088028 */  lui       $t0, %hi(D_802835D0)
 /* 17FA38 80251158 01024021 */  addu      $t0, $t0, $v0
 /* 17FA3C 8025115C 850835D0 */  lh        $t0, %lo(D_802835D0)($t0)
-/* 17FA40 80251160 3C028025 */  lui       $v0, %hi(D_80250818)
+/* 17FA40 80251160 3C028025 */  lui       $v0, %hi(func_80250818)
-/* 17FA44 80251164 24420818 */  addiu     $v0, $v0, %lo(D_80250818)
+/* 17FA44 80251164 24420818 */  addiu     $v0, $v0, %lo(func_80250818)
 /* 17FA48 80251168 AFA20018 */  sw        $v0, 0x18($sp)
 /* 17FA4C 8025116C 2402FFFF */  addiu     $v0, $zero, -1
 /* 17FA50 80251170 AFA00014 */  sw        $zero, 0x14($sp)
@ -229,8 +229,8 @@ glabel show_message_popup
 /* 17FB00 80251220 3C018028 */  lui       $at, %hi(D_802835D8)
 /* 17FB04 80251224 00230821 */  addu      $at, $at, $v1
 /* 17FB08 80251228 942335D8 */  lhu       $v1, %lo(D_802835D8)($at)
-/* 17FB0C 8025122C 3C028025 */  lui       $v0, %hi(D_80250818)
+/* 17FB0C 8025122C 3C028025 */  lui       $v0, %hi(func_80250818)
-/* 17FB10 80251230 24420818 */  addiu     $v0, $v0, %lo(D_80250818)
+/* 17FB10 80251230 24420818 */  addiu     $v0, $v0, %lo(func_80250818)
 /* 17FB14 80251234 AFA20018 */  sw        $v0, 0x18($sp)
 /* 17FB18 80251238 2402FFFF */  addiu     $v0, $zero, -1
 /* 17FB1C 8025123C AFA20020 */  sw        $v0, 0x20($sp)
--- a/asm/nonmatchings/code_17D6A0/show_variable_battle_message.s
+++ b/asm/nonmatchings/code_17D6A0/show_variable_battle_message.s
@ -14,8 +14,8 @@ glabel show_variable_battle_message
 /* 17E308 8024FA28 0040182D */  daddu     $v1, $v0, $zero
 /* 17E30C 8024FA2C 1060001B */  beqz      $v1, .L8024FA9C
 /* 17E310 8024FA30 00000000 */   nop      
-/* 17E314 8024FA34 3C028025 */  lui       $v0, %hi(D_8024FB3C)
+/* 17E314 8024FA34 3C028025 */  lui       $v0, %hi(func_8024FB3C)
-/* 17E318 8024FA38 2442FB3C */  addiu     $v0, $v0, %lo(D_8024FB3C)
+/* 17E318 8024FA38 2442FB3C */  addiu     $v0, $v0, %lo(func_8024FB3C)
 /* 17E31C 8024FA3C AC620004 */  sw        $v0, 4($v1)
 /* 17E320 8024FA40 3C028025 */  lui       $v0, %hi(show_message_popup)
 /* 17E324 8024FA44 24420EA4 */  addiu     $v0, $v0, %lo(show_message_popup)
--- a/asm/nonmatchings/code_18C790/func_8025E190.s
+++ b/asm/nonmatchings/code_18C790/func_8025E190.s
@ -1470,8 +1470,8 @@ glabel func_8025E190
 /* 18E0C4 8025F7E4 24020020 */  addiu     $v0, $zero, 0x20
 /* 18E0C8 8025F7E8 AFA30028 */  sw        $v1, 0x28($sp)
 /* 18E0CC 8025F7EC AFA20010 */  sw        $v0, 0x10($sp)
-/* 18E0D0 8025F7F0 3C028026 */  lui       $v0, %hi(D_80260948)
+/* 18E0D0 8025F7F0 3C028026 */  lui       $v0, %hi(func_80260948)
-/* 18E0D4 8025F7F4 24420948 */  addiu     $v0, $v0, %lo(D_80260948)
+/* 18E0D4 8025F7F4 24420948 */  addiu     $v0, $v0, %lo(func_80260948)
 /* 18E0D8 8025F7F8 AFA20018 */  sw        $v0, 0x18($sp)
 /* 18E0DC 8025F7FC 2402FFFF */  addiu     $v0, $zero, -1
 /* 18E0E0 8025F800 AFA30014 */  sw        $v1, 0x14($sp)
@ -1823,8 +1823,8 @@ glabel func_8025E190
 /* 18E5C4 8025FCE4 AFA20010 */  sw        $v0, 0x10($sp)
 /* 18E5C8 8025FCE8 2402000A */  addiu     $v0, $zero, 0xa
 /* 18E5CC 8025FCEC AFA20014 */  sw        $v0, 0x14($sp)
-/* 18E5D0 8025FCF0 3C028026 */  lui       $v0, %hi(D_80260A20)
+/* 18E5D0 8025FCF0 3C028026 */  lui       $v0, %hi(func_80260A20)
-/* 18E5D4 8025FCF4 24420A20 */  addiu     $v0, $v0, %lo(D_80260A20)
+/* 18E5D4 8025FCF4 24420A20 */  addiu     $v0, $v0, %lo(func_80260A20)
 /* 18E5D8 8025FCF8 AFA20018 */  sw        $v0, 0x18($sp)
 /* 18E5DC 8025FCFC 2402FFFF */  addiu     $v0, $zero, -1
 /* 18E5E0 8025FD00 AFA0001C */  sw        $zero, 0x1c($sp)
--- a/asm/nonmatchings/code_196AA0/func_80268E88.s
+++ b/asm/nonmatchings/code_196AA0/func_80268E88.s
@ -6,10 +6,10 @@ glabel func_80268E88
 /* 19776C 80268E8C AFB00010 */  sw        $s0, 0x10($sp)
 /* 197770 80268E90 3C10802A */  lui       $s0, %hi(D_8029FBE0)
 /* 197774 80268E94 2610FBE0 */  addiu     $s0, $s0, %lo(D_8029FBE0)
-/* 197778 80268E98 3C048027 */  lui       $a0, %hi(D_80268938)
+/* 197778 80268E98 3C048027 */  lui       $a0, %hi(func_80268938)
-/* 19777C 80268E9C 24848938 */  addiu     $a0, $a0, %lo(D_80268938)
+/* 19777C 80268E9C 24848938 */  addiu     $a0, $a0, %lo(func_80268938)
-/* 197780 80268EA0 3C058027 */  lui       $a1, %hi(D_80268AF8)
+/* 197780 80268EA0 3C058027 */  lui       $a1, %hi(func_80268AF8)
-/* 197784 80268EA4 24A58AF8 */  addiu     $a1, $a1, %lo(D_80268AF8)
+/* 197784 80268EA4 24A58AF8 */  addiu     $a1, $a1, %lo(func_80268AF8)
 /* 197788 80268EA8 AFBF0014 */  sw        $ra, 0x14($sp)
 /* 19778C 80268EAC 0C048C8F */  jal       bind_dynamic_entity_7
 /* 197790 80268EB0 00000000 */   nop      
--- a/asm/nonmatchings/code_20ec0_len_5040/DoBasicAI.s
+++ b/asm/nonmatchings/code_20ec0_len_5040/DoBasicAI.s
@ -116,7 +116,7 @@ glabel DoBasicAI
 /* 25A20 8004A620 00000000 */   nop      
 /* 25A24 8004A624 0240202D */  daddu     $a0, $s2, $zero
 /* 25A28 8004A628 0260282D */  daddu     $a1, $s3, $zero
-/* 25A2C 8004A62C 0C0126D1 */  jal       base_UnkNpcAIFunc1
+/* 25A2C 8004A62C 0C0126D1 */  jal       func_80049B44
 /* 25A30 8004A630 0280302D */   daddu    $a2, $s4, $zero
 /* 25A34 8004A634 0240202D */  daddu     $a0, $s2, $zero
 /* 25A38 8004A638 0260282D */  daddu     $a1, $s3, $zero
--- a/asm/nonmatchings/code_20ec0_len_5040/func_80045AC0.s
+++ b/asm/nonmatchings/code_20ec0_len_5040/func_80045AC0.s
@ -14,8 +14,8 @@ glabel func_80045AC0
 /* 20EE0 80045AE0 28820020 */  slti      $v0, $a0, 0x20
 /* 20EE4 80045AE4 1440FFFB */  bnez      $v0, .L80045AD4
 /* 20EE8 80045AE8 2463001C */   addiu    $v1, $v1, 0x1c
-/* 20EEC 80045AEC 3C058004 */  lui       $a1, %hi(D_80045BC8)
+/* 20EEC 80045AEC 3C058004 */  lui       $a1, %hi(func_80045BC8)
-/* 20EF0 80045AF0 24A55BC8 */  addiu     $a1, $a1, %lo(D_80045BC8)
+/* 20EF0 80045AF0 24A55BC8 */  addiu     $a1, $a1, %lo(func_80045BC8)
 /* 20EF4 80045AF4 0C048C56 */  jal       bind_dynamic_entity_3
 /* 20EF8 80045AF8 0000202D */   daddu    $a0, $zero, $zero
 /* 20EFC 80045AFC 0C0117ED */  jal       func_80045FB4
--- a/asm/nonmatchings/code_20ec0_len_5040/func_80045D00.s
+++ b/asm/nonmatchings/code_20ec0_len_5040/func_80045D00.s
@ -12,11 +12,11 @@ glabel func_80045D00
 /* 2111C 80045D1C 0040182D */  daddu     $v1, $v0, $zero
 /* 21120 80045D20 10600011 */  beqz      $v1, .L80045D68
 /* 21124 80045D24 00000000 */   nop      
-/* 21128 80045D28 3C028004 */  lui       $v0, %hi(D_80045D7C)
+/* 21128 80045D28 3C028004 */  lui       $v0, %hi(func_80045D7C)
-/* 2112C 80045D2C 24425D7C */  addiu     $v0, $v0, %lo(D_80045D7C)
+/* 2112C 80045D2C 24425D7C */  addiu     $v0, $v0, %lo(func_80045D7C)
 /* 21130 80045D30 AC620004 */  sw        $v0, 4($v1)
-/* 21134 80045D34 3C028004 */  lui       $v0, %hi(D_80045ED0)
+/* 21134 80045D34 3C028004 */  lui       $v0, %hi(func_80045ED0)
-/* 21138 80045D38 24425ED0 */  addiu     $v0, $v0, %lo(D_80045ED0)
+/* 21138 80045D38 24425ED0 */  addiu     $v0, $v0, %lo(func_80045ED0)
 /* 2113C 80045D3C AC62000C */  sw        $v0, 0xc($v1)
 /* 21140 80045D40 24020001 */  addiu     $v0, $zero, 1
 /* 21144 80045D44 A0620017 */  sb        $v0, 0x17($v1)
--- a/asm/nonmatchings/code_20ec0_len_5040/func_80045ED0.s
+++ b/asm/nonmatchings/code_20ec0_len_5040/func_80045ED0.s
@ -35,8 +35,8 @@ glabel func_80045ED0
 /* 21348 80045F48 3C038008 */  lui       $v1, %hi(D_80078160)
 /* 2134C 80045F4C 00621821 */  addu      $v1, $v1, $v0
 /* 21350 80045F50 84638160 */  lh        $v1, %lo(D_80078160)($v1)
-/* 21354 80045F54 3C028004 */  lui       $v0, %hi(D_80045E4C)
+/* 21354 80045F54 3C028004 */  lui       $v0, %hi(func_80045E4C)
-/* 21358 80045F58 24425E4C */  addiu     $v0, $v0, %lo(D_80045E4C)
+/* 21358 80045F58 24425E4C */  addiu     $v0, $v0, %lo(func_80045E4C)
 /* 2135C 80045F5C AFA20018 */  sw        $v0, 0x18($sp)
 /* 21360 80045F60 2402FFFF */  addiu     $v0, $zero, -1
 /* 21364 80045F64 24060050 */  addiu     $a2, $zero, 0x50
--- a/asm/nonmatchings/code_20ec0_len_5040/func_80045FB4.s
+++ b/asm/nonmatchings/code_20ec0_len_5040/func_80045FB4.s
@ -9,11 +9,11 @@ glabel func_80045FB4
 /* 213C4 80045FC4 0040802D */  daddu     $s0, $v0, $zero
 /* 213C8 80045FC8 12000015 */  beqz      $s0, .L80046020
 /* 213CC 80045FCC 24042C00 */   addiu    $a0, $zero, 0x2c00
-/* 213D0 80045FD0 3C028004 */  lui       $v0, %hi(D_80046030)
+/* 213D0 80045FD0 3C028004 */  lui       $v0, %hi(func_80046030)
-/* 213D4 80045FD4 24426030 */  addiu     $v0, $v0, %lo(D_80046030)
+/* 213D4 80045FD4 24426030 */  addiu     $v0, $v0, %lo(func_80046030)
 /* 213D8 80045FD8 AE020004 */  sw        $v0, 4($s0)
-/* 213DC 80045FDC 3C028004 */  lui       $v0, %hi(D_800465E0)
+/* 213DC 80045FDC 3C028004 */  lui       $v0, %hi(func_800465E0)
-/* 213E0 80045FE0 244265E0 */  addiu     $v0, $v0, %lo(D_800465E0)
+/* 213E0 80045FE0 244265E0 */  addiu     $v0, $v0, %lo(func_800465E0)
 /* 213E4 80045FE4 AE000000 */  sw        $zero, ($s0)
 /* 213E8 80045FE8 AE000008 */  sw        $zero, 8($s0)
 /* 213EC 80045FEC 0C00AB0A */  jal       general_heap_malloc
--- a/asm/nonmatchings/code_25f00_len_940/func_8004AB00.s
+++ b/asm/nonmatchings/code_25f00_len_940/func_8004AB00.s
@ -156,8 +156,8 @@ glabel func_8004AB00
 /* 2614C 8004AD4C 24060032 */   addiu    $a2, $zero, 0x32
 /* 26150 8004AD50 3C04800C */  lui       $a0, %hi(D_800B91A0)
 /* 26154 8004AD54 248491A0 */  addiu     $a0, $a0, %lo(D_800B91A0)
-/* 26158 8004AD58 3C028005 */  lui       $v0, %hi(D_8004B328)
+/* 26158 8004AD58 3C028005 */  lui       $v0, %hi(func_8004B328)
-/* 2615C 8004AD5C 2442B328 */  addiu     $v0, $v0, %lo(D_8004B328)
+/* 2615C 8004AD5C 2442B328 */  addiu     $v0, $v0, %lo(func_8004B328)
 /* 26160 8004AD60 3C018008 */  lui       $at, %hi(nuAuPreNMIFunc)
 /* 26164 8004AD64 AC228174 */  sw        $v0, %lo(nuAuPreNMIFunc)($at)
 /* 26168 8004AD68 0C015894 */  jal       func_80056250
@ -169,8 +169,8 @@ glabel func_8004AB00
 /* 26180 8004AD80 26100F58 */  addiu     $s0, $s0, %lo(D_800A0F58)
 /* 26184 8004AD84 0200202D */  daddu     $a0, $s0, $zero
 /* 26188 8004AD88 24050003 */  addiu     $a1, $zero, 3
-/* 2618C 8004AD8C 3C068005 */  lui       $a2, %hi(D_8004AE08)
+/* 2618C 8004AD8C 3C068005 */  lui       $a2, %hi(func_8004AE08)
-/* 26190 8004AD90 24C6AE08 */  addiu     $a2, $a2, %lo(D_8004AE08)
+/* 26190 8004AD90 24C6AE08 */  addiu     $a2, $a2, %lo(func_8004AE08)
 /* 26194 8004AD94 3C02800A */  lui       $v0, %hi(D_800A3510)
 /* 26198 8004AD98 24423510 */  addiu     $v0, $v0, %lo(D_800A3510)
 /* 2619C 8004AD9C AFA20010 */  sw        $v0, 0x10($sp)
--- a/asm/nonmatchings/code_3278F0/func_E0002000.s
+++ b/asm/nonmatchings/code_3278F0/func_E0002000.s
@ -10,14 +10,14 @@ glabel func_E0002000
 /* 327904 E0002014 27A40010 */  addiu     $a0, $sp, 0x10
 /* 327908 E0002018 F7BE0070 */  sdc1      $f30, 0x70($sp)
 /* 32790C E000201C 4486F000 */  mtc1      $a2, $f30
-/* 327910 E0002020 3C02E000 */  lui       $v0, %hi(D_E00021B4)
+/* 327910 E0002020 3C02E000 */  lui       $v0, %hi(func_E00021B4)
-/* 327914 E0002024 244221B4 */  addiu     $v0, $v0, %lo(D_E00021B4)
+/* 327914 E0002024 244221B4 */  addiu     $v0, $v0, %lo(func_E00021B4)
 /* 327918 E0002028 AFA20018 */  sw        $v0, 0x18($sp)
-/* 32791C E000202C 3C02E000 */  lui       $v0, %hi(D_E00021BC)
+/* 32791C E000202C 3C02E000 */  lui       $v0, %hi(func_E00021BC)
-/* 327920 E0002030 244221BC */  addiu     $v0, $v0, %lo(D_E00021BC)
+/* 327920 E0002030 244221BC */  addiu     $v0, $v0, %lo(func_E00021BC)
 /* 327924 E0002034 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 327928 E0002038 3C02E000 */  lui       $v0, %hi(D_E00022BC)
+/* 327928 E0002038 3C02E000 */  lui       $v0, %hi(func_E00022BC)
-/* 32792C E000203C 244222BC */  addiu     $v0, $v0, %lo(D_E00022BC)
+/* 32792C E000203C 244222BC */  addiu     $v0, $v0, %lo(func_E00022BC)
 /* 327930 E0002040 AFA20020 */  sw        $v0, 0x20($sp)
 /* 327934 E0002044 24020001 */  addiu     $v0, $zero, 1
 /* 327938 E0002048 AFBF0044 */  sw        $ra, 0x44($sp)
--- a/asm/nonmatchings/code_3278F0/func_E00022BC.s
+++ b/asm/nonmatchings/code_3278F0/func_E00022BC.s
@ -3,8 +3,8 @@
 glabel func_E00022BC
 /* 327BAC E00022BC 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 327BB0 E00022C0 3C02E000 */  lui       $v0, %hi(D_E0002300)
+/* 327BB0 E00022C0 3C02E000 */  lui       $v0, %hi(func_E0002300)
-/* 327BB4 E00022C4 24422300 */  addiu     $v0, $v0, %lo(D_E0002300)
+/* 327BB4 E00022C4 24422300 */  addiu     $v0, $v0, %lo(func_E0002300)
 /* 327BB8 E00022C8 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 327BBC E00022CC 2402002D */  addiu     $v0, $zero, 0x2d
 /* 327BC0 E00022D0 AFA40018 */  sw        $a0, 0x18($sp)
--- a/asm/nonmatchings/code_328110/func_E000C160.s
+++ b/asm/nonmatchings/code_328110/func_E000C160.s
@ -44,14 +44,14 @@ glabel func_E000C160
 .LE000C1F0:
 /* 328300 E000C1F0 24130009 */  addiu     $s3, $zero, 9
 .LE000C1F4:
-/* 328304 E000C1F4 3C02E001 */  lui       $v0, %hi(D_E000C64C)
+/* 328304 E000C1F4 3C02E001 */  lui       $v0, %hi(func_E000C64C)
-/* 328308 E000C1F8 2442C64C */  addiu     $v0, $v0, %lo(D_E000C64C)
+/* 328308 E000C1F8 2442C64C */  addiu     $v0, $v0, %lo(func_E000C64C)
 /* 32830C E000C1FC AC820008 */  sw        $v0, 8($a0)
-/* 328310 E000C200 3C02E001 */  lui       $v0, %hi(D_E000C654)
+/* 328310 E000C200 3C02E001 */  lui       $v0, %hi(func_E000C654)
-/* 328314 E000C204 2442C654 */  addiu     $v0, $v0, %lo(D_E000C654)
+/* 328314 E000C204 2442C654 */  addiu     $v0, $v0, %lo(func_E000C654)
 /* 328318 E000C208 AC82000C */  sw        $v0, 0xc($a0)
-/* 32831C E000C20C 3C02E001 */  lui       $v0, %hi(D_E000C754)
+/* 32831C E000C20C 3C02E001 */  lui       $v0, %hi(func_E000C754)
-/* 328320 E000C210 2442C754 */  addiu     $v0, $v0, %lo(D_E000C754)
+/* 328320 E000C210 2442C754 */  addiu     $v0, $v0, %lo(func_E000C754)
 /* 328324 E000C214 AC820010 */  sw        $v0, 0x10($a0)
 /* 328328 E000C218 24020006 */  addiu     $v0, $zero, 6
 /* 32832C E000C21C AC800000 */  sw        $zero, ($a0)
--- a/asm/nonmatchings/code_328110/func_E000C754.s
+++ b/asm/nonmatchings/code_328110/func_E000C754.s
@ -3,8 +3,8 @@
 glabel func_E000C754
 /* 328864 E000C754 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 328868 E000C758 3C02E001 */  lui       $v0, %hi(D_E000C798)
+/* 328868 E000C758 3C02E001 */  lui       $v0, %hi(func_E000C798)
-/* 32886C E000C75C 2442C798 */  addiu     $v0, $v0, %lo(D_E000C798)
+/* 32886C E000C75C 2442C798 */  addiu     $v0, $v0, %lo(func_E000C798)
 /* 328870 E000C760 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 328874 E000C764 24020028 */  addiu     $v0, $zero, 0x28
 /* 328878 E000C768 AFA40018 */  sw        $a0, 0x18($sp)
--- a/asm/nonmatchings/code_32C110/func_E000E000.s
+++ b/asm/nonmatchings/code_32C110/func_E000E000.s
@ -16,14 +16,14 @@ glabel func_E000E000
 /* 32C13C E000E02C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 32C140 E000E030 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 32C144 E000E034 C7B4007C */  lwc1      $f20, 0x7c($sp)
-/* 32C148 E000E038 3C02E001 */  lui       $v0, %hi(D_E000E16C)
+/* 32C148 E000E038 3C02E001 */  lui       $v0, %hi(func_E000E16C)
-/* 32C14C E000E03C 2442E16C */  addiu     $v0, $v0, %lo(D_E000E16C)
+/* 32C14C E000E03C 2442E16C */  addiu     $v0, $v0, %lo(func_E000E16C)
 /* 32C150 E000E040 AFA20018 */  sw        $v0, 0x18($sp)
-/* 32C154 E000E044 3C02E001 */  lui       $v0, %hi(D_E000E174)
+/* 32C154 E000E044 3C02E001 */  lui       $v0, %hi(func_E000E174)
-/* 32C158 E000E048 2442E174 */  addiu     $v0, $v0, %lo(D_E000E174)
+/* 32C158 E000E048 2442E174 */  addiu     $v0, $v0, %lo(func_E000E174)
 /* 32C15C E000E04C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 32C160 E000E050 3C02E001 */  lui       $v0, %hi(D_E000E244)
+/* 32C160 E000E050 3C02E001 */  lui       $v0, %hi(func_E000E244)
-/* 32C164 E000E054 2442E244 */  addiu     $v0, $v0, %lo(D_E000E244)
+/* 32C164 E000E054 2442E244 */  addiu     $v0, $v0, %lo(func_E000E244)
 /* 32C168 E000E058 AFA20020 */  sw        $v0, 0x20($sp)
 /* 32C16C E000E05C 24020007 */  addiu     $v0, $zero, 7
 /* 32C170 E000E060 AFBF0038 */  sw        $ra, 0x38($sp)
--- a/asm/nonmatchings/code_32C110/func_E000E244.s
+++ b/asm/nonmatchings/code_32C110/func_E000E244.s
@ -3,8 +3,8 @@
 glabel func_E000E244
 /* 32C354 E000E244 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 32C358 E000E248 3C02E001 */  lui       $v0, %hi(D_E000E288)
+/* 32C358 E000E248 3C02E001 */  lui       $v0, %hi(func_E000E288)
-/* 32C35C E000E24C 2442E288 */  addiu     $v0, $v0, %lo(D_E000E288)
+/* 32C35C E000E24C 2442E288 */  addiu     $v0, $v0, %lo(func_E000E288)
 /* 32C360 E000E250 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 32C364 E000E254 24020028 */  addiu     $v0, $zero, 0x28
 /* 32C368 E000E258 AFA40018 */  sw        $a0, 0x18($sp)
--- a/asm/nonmatchings/code_32E490/func_E0014000.s
+++ b/asm/nonmatchings/code_32E490/func_E0014000.s
@ -10,14 +10,14 @@ glabel func_E0014000
 /* 32E4A4 E0014014 27A40010 */  addiu     $a0, $sp, 0x10
 /* 32E4A8 E0014018 F7BE0068 */  sdc1      $f30, 0x68($sp)
 /* 32E4AC E001401C 4486F000 */  mtc1      $a2, $f30
-/* 32E4B0 E0014020 3C02E001 */  lui       $v0, %hi(D_E0014258)
+/* 32E4B0 E0014020 3C02E001 */  lui       $v0, %hi(func_E0014258)
-/* 32E4B4 E0014024 24424258 */  addiu     $v0, $v0, %lo(D_E0014258)
+/* 32E4B4 E0014024 24424258 */  addiu     $v0, $v0, %lo(func_E0014258)
 /* 32E4B8 E0014028 AFA20018 */  sw        $v0, 0x18($sp)
-/* 32E4BC E001402C 3C02E001 */  lui       $v0, %hi(D_E0014260)
+/* 32E4BC E001402C 3C02E001 */  lui       $v0, %hi(func_E0014260)
-/* 32E4C0 E0014030 24424260 */  addiu     $v0, $v0, %lo(D_E0014260)
+/* 32E4C0 E0014030 24424260 */  addiu     $v0, $v0, %lo(func_E0014260)
 /* 32E4C4 E0014034 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 32E4C8 E0014038 3C02E001 */  lui       $v0, %hi(D_E001449C)
+/* 32E4C8 E0014038 3C02E001 */  lui       $v0, %hi(func_E001449C)
-/* 32E4CC E001403C 2442449C */  addiu     $v0, $v0, %lo(D_E001449C)
+/* 32E4CC E001403C 2442449C */  addiu     $v0, $v0, %lo(func_E001449C)
 /* 32E4D0 E0014040 AFA20020 */  sw        $v0, 0x20($sp)
 /* 32E4D4 E0014044 2402000A */  addiu     $v0, $zero, 0xa
 /* 32E4D8 E0014048 AFBF003C */  sw        $ra, 0x3c($sp)
--- a/asm/nonmatchings/code_32E490/func_E001449C.s
+++ b/asm/nonmatchings/code_32E490/func_E001449C.s
@ -3,8 +3,8 @@
 glabel func_E001449C
 /* 32E92C E001449C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 32E930 E00144A0 3C02E001 */  lui       $v0, %hi(D_E00144E0)
+/* 32E930 E00144A0 3C02E001 */  lui       $v0, %hi(func_E00144E0)
-/* 32E934 E00144A4 244244E0 */  addiu     $v0, $v0, %lo(D_E00144E0)
+/* 32E934 E00144A4 244244E0 */  addiu     $v0, $v0, %lo(func_E00144E0)
 /* 32E938 E00144A8 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 32E93C E00144AC 24020028 */  addiu     $v0, $zero, 0x28
 /* 32E940 E00144B0 AFA40018 */  sw        $a0, 0x18($sp)
--- a/asm/nonmatchings/code_32EE30/func_E0016000.s
+++ b/asm/nonmatchings/code_32EE30/func_E0016000.s
@ -12,14 +12,14 @@ glabel func_E0016000
 /* 32EE4C E001601C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 32EE50 E0016020 F7BC0068 */  sdc1      $f28, 0x68($sp)
 /* 32EE54 E0016024 4487E000 */  mtc1      $a3, $f28
-/* 32EE58 E0016028 3C02E001 */  lui       $v0, %hi(D_E0016220)
+/* 32EE58 E0016028 3C02E001 */  lui       $v0, %hi(func_E0016220)
-/* 32EE5C E001602C 24426220 */  addiu     $v0, $v0, %lo(D_E0016220)
+/* 32EE5C E001602C 24426220 */  addiu     $v0, $v0, %lo(func_E0016220)
 /* 32EE60 E0016030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 32EE64 E0016034 3C02E001 */  lui       $v0, %hi(D_E0016228)
+/* 32EE64 E0016034 3C02E001 */  lui       $v0, %hi(func_E0016228)
-/* 32EE68 E0016038 24426228 */  addiu     $v0, $v0, %lo(D_E0016228)
+/* 32EE68 E0016038 24426228 */  addiu     $v0, $v0, %lo(func_E0016228)
 /* 32EE6C E001603C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 32EE70 E0016040 3C02E001 */  lui       $v0, %hi(D_E0016410)
+/* 32EE70 E0016040 3C02E001 */  lui       $v0, %hi(func_E0016410)
-/* 32EE74 E0016044 24426410 */  addiu     $v0, $v0, %lo(D_E0016410)
+/* 32EE74 E0016044 24426410 */  addiu     $v0, $v0, %lo(func_E0016410)
 /* 32EE78 E0016048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 32EE7C E001604C 2402000B */  addiu     $v0, $zero, 0xb
 /* 32EE80 E0016050 AFBF0044 */  sw        $ra, 0x44($sp)
--- a/asm/nonmatchings/code_32EE30/func_E0016410.s
+++ b/asm/nonmatchings/code_32EE30/func_E0016410.s
@ -3,8 +3,8 @@
 glabel func_E0016410
 /* 32F240 E0016410 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 32F244 E0016414 3C02E001 */  lui       $v0, %hi(D_E0016454)
+/* 32F244 E0016414 3C02E001 */  lui       $v0, %hi(func_E0016454)
-/* 32F248 E0016418 24426454 */  addiu     $v0, $v0, %lo(D_E0016454)
+/* 32F248 E0016418 24426454 */  addiu     $v0, $v0, %lo(func_E0016454)
 /* 32F24C E001641C AFA2001C */  sw        $v0, 0x1c($sp)
 /* 32F250 E0016420 24020028 */  addiu     $v0, $zero, 0x28
 /* 32F254 E0016424 AFA40018 */  sw        $a0, 0x18($sp)
--- a/asm/nonmatchings/code_32FE30/func_E001A000.s
+++ b/asm/nonmatchings/code_32FE30/func_E001A000.s
@ -14,14 +14,14 @@ glabel func_E001A000
 /* 32FE54 E001A024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 32FE58 E001A028 AFB20030 */  sw        $s2, 0x30($sp)
 /* 32FE5C E001A02C 8FB20060 */  lw        $s2, 0x60($sp)
-/* 32FE60 E001A030 3C02E002 */  lui       $v0, %hi(D_E001A21C)
+/* 32FE60 E001A030 3C02E002 */  lui       $v0, %hi(func_E001A21C)
-/* 32FE64 E001A034 2442A21C */  addiu     $v0, $v0, %lo(D_E001A21C)
+/* 32FE64 E001A034 2442A21C */  addiu     $v0, $v0, %lo(func_E001A21C)
 /* 32FE68 E001A038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 32FE6C E001A03C 3C02E002 */  lui       $v0, %hi(D_E001A224)
+/* 32FE6C E001A03C 3C02E002 */  lui       $v0, %hi(func_E001A224)
-/* 32FE70 E001A040 2442A224 */  addiu     $v0, $v0, %lo(D_E001A224)
+/* 32FE70 E001A040 2442A224 */  addiu     $v0, $v0, %lo(func_E001A224)
 /* 32FE74 E001A044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 32FE78 E001A048 3C02E002 */  lui       $v0, %hi(D_E001A3FC)
+/* 32FE78 E001A048 3C02E002 */  lui       $v0, %hi(func_E001A3FC)
-/* 32FE7C E001A04C 2442A3FC */  addiu     $v0, $v0, %lo(D_E001A3FC)
+/* 32FE7C E001A04C 2442A3FC */  addiu     $v0, $v0, %lo(func_E001A3FC)
 /* 32FE80 E001A050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 32FE84 E001A054 2402000D */  addiu     $v0, $zero, 0xd
 /* 32FE88 E001A058 AFBF0034 */  sw        $ra, 0x34($sp)
--- a/asm/nonmatchings/code_32FE30/func_E001A3FC.s
+++ b/asm/nonmatchings/code_32FE30/func_E001A3FC.s
@ -3,8 +3,8 @@
 glabel func_E001A3FC
 /* 33022C E001A3FC 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 330230 E001A400 3C02E002 */  lui       $v0, %hi(D_E001A440)
+/* 330230 E001A400 3C02E002 */  lui       $v0, %hi(func_E001A440)
-/* 330234 E001A404 2442A440 */  addiu     $v0, $v0, %lo(D_E001A440)
+/* 330234 E001A404 2442A440 */  addiu     $v0, $v0, %lo(func_E001A440)
 /* 330238 E001A408 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 33023C E001A40C 2402002D */  addiu     $v0, $zero, 0x2d
 /* 330240 E001A410 AFA40018 */  sw        $a0, 0x18($sp)
--- a/asm/nonmatchings/code_330910/func_E001C000.s
+++ b/asm/nonmatchings/code_330910/func_E001C000.s
@ -12,14 +12,14 @@ glabel func_E001C000
 /* 33092C E001C01C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 330930 E001C020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 330934 E001C024 4486C000 */  mtc1      $a2, $f24
-/* 330938 E001C028 3C02E002 */  lui       $v0, %hi(D_E001C120)
+/* 330938 E001C028 3C02E002 */  lui       $v0, %hi(func_E001C120)
-/* 33093C E001C02C 2442C120 */  addiu     $v0, $v0, %lo(D_E001C120)
+/* 33093C E001C02C 2442C120 */  addiu     $v0, $v0, %lo(func_E001C120)
 /* 330940 E001C030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 330944 E001C034 3C02E002 */  lui       $v0, %hi(D_E001C128)
+/* 330944 E001C034 3C02E002 */  lui       $v0, %hi(func_E001C128)
-/* 330948 E001C038 2442C128 */  addiu     $v0, $v0, %lo(D_E001C128)
+/* 330948 E001C038 2442C128 */  addiu     $v0, $v0, %lo(func_E001C128)
 /* 33094C E001C03C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 330950 E001C040 3C02E002 */  lui       $v0, %hi(D_E001C200)
+/* 330950 E001C040 3C02E002 */  lui       $v0, %hi(func_E001C200)
-/* 330954 E001C044 2442C200 */  addiu     $v0, $v0, %lo(D_E001C200)
+/* 330954 E001C044 2442C200 */  addiu     $v0, $v0, %lo(func_E001C200)
 /* 330958 E001C048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 33095C E001C04C 2402000E */  addiu     $v0, $zero, 0xe
 /* 330960 E001C050 AFBF0030 */  sw        $ra, 0x30($sp)
--- a/asm/nonmatchings/code_330910/func_E001C200.s
+++ b/asm/nonmatchings/code_330910/func_E001C200.s
@ -61,8 +61,8 @@ glabel func_E001C200
 .LE001C2D0:
 /* 330BE0 E001C2D0 E4400008 */  swc1      $f0, 8($v0)
 .LE001C2D4:
-/* 330BE4 E001C2D4 3C02E002 */  lui       $v0, %hi(D_E001C30C)
+/* 330BE4 E001C2D4 3C02E002 */  lui       $v0, %hi(func_E001C30C)
-/* 330BE8 E001C2D8 2442C30C */  addiu     $v0, $v0, %lo(D_E001C30C)
+/* 330BE8 E001C2D8 2442C30C */  addiu     $v0, $v0, %lo(func_E001C30C)
 /* 330BEC E001C2DC AC82000C */  sw        $v0, 0xc($a0)
 /* 330BF0 E001C2E0 2402002D */  addiu     $v0, $zero, 0x2d
 /* 330BF4 E001C2E4 AC850008 */  sw        $a1, 8($a0)
--- a/asm/nonmatchings/code_331940/func_E001E000.s
+++ b/asm/nonmatchings/code_331940/func_E001E000.s
@ -14,14 +14,14 @@ glabel func_E001E000
 /* 331964 E001E024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 331968 E001E028 F7BE0060 */  sdc1      $f30, 0x60($sp)
 /* 33196C E001E02C C7BE0084 */  lwc1      $f30, 0x84($sp)
-/* 331970 E001E030 3C02E002 */  lui       $v0, %hi(D_E001E370)
+/* 331970 E001E030 3C02E002 */  lui       $v0, %hi(func_E001E370)
-/* 331974 E001E034 2442E370 */  addiu     $v0, $v0, %lo(D_E001E370)
+/* 331974 E001E034 2442E370 */  addiu     $v0, $v0, %lo(func_E001E370)
 /* 331978 E001E038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 33197C E001E03C 3C02E002 */  lui       $v0, %hi(D_E001E378)
+/* 33197C E001E03C 3C02E002 */  lui       $v0, %hi(func_E001E378)
-/* 331980 E001E040 2442E378 */  addiu     $v0, $v0, %lo(D_E001E378)
+/* 331980 E001E040 2442E378 */  addiu     $v0, $v0, %lo(func_E001E378)
 /* 331984 E001E044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 331988 E001E048 3C02E002 */  lui       $v0, %hi(D_E001E6E8)
+/* 331988 E001E048 3C02E002 */  lui       $v0, %hi(func_E001E6E8)
-/* 33198C E001E04C 2442E6E8 */  addiu     $v0, $v0, %lo(D_E001E6E8)
+/* 33198C E001E04C 2442E6E8 */  addiu     $v0, $v0, %lo(func_E001E6E8)
 /* 331990 E001E050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 331994 E001E054 2402000F */  addiu     $v0, $zero, 0xf
 /* 331998 E001E058 AFBF0034 */  sw        $ra, 0x34($sp)
--- a/asm/nonmatchings/code_331940/func_E001E6E8.s
+++ b/asm/nonmatchings/code_331940/func_E001E6E8.s
@ -6,8 +6,8 @@ glabel func_E001E6E8
 /* 33202C E001E6EC 0000282D */  daddu     $a1, $zero, $zero
 /* 332030 E001E6F0 AFBF0020 */  sw        $ra, 0x20($sp)
 /* 332034 E001E6F4 8C83000C */  lw        $v1, 0xc($a0)
-/* 332038 E001E6F8 3C02E002 */  lui       $v0, %hi(D_E001E730)
+/* 332038 E001E6F8 3C02E002 */  lui       $v0, %hi(func_E001E730)
-/* 33203C E001E6FC 2442E730 */  addiu     $v0, $v0, %lo(D_E001E730)
+/* 33203C E001E6FC 2442E730 */  addiu     $v0, $v0, %lo(func_E001E730)
 /* 332040 E001E700 AFA40018 */  sw        $a0, 0x18($sp)
 /* 332044 E001E704 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 332048 E001E708 AFA00014 */  sw        $zero, 0x14($sp)
--- a/asm/nonmatchings/code_333EC0/func_E00202CC.s
+++ b/asm/nonmatchings/code_333EC0/func_E00202CC.s
@ -28,14 +28,14 @@ glabel func_E00202CC
 /* 3341E8 E0020328 AFB1002C */   sw       $s1, 0x2c($sp)
 /* 3341EC E002032C 24130003 */  addiu     $s3, $zero, 3
 .LE0020330:
-/* 3341F0 E0020330 3C02E002 */  lui       $v0, %hi(D_E0020460)
+/* 3341F0 E0020330 3C02E002 */  lui       $v0, %hi(func_E0020460)
-/* 3341F4 E0020334 24420460 */  addiu     $v0, $v0, %lo(D_E0020460)
+/* 3341F4 E0020334 24420460 */  addiu     $v0, $v0, %lo(func_E0020460)
 /* 3341F8 E0020338 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3341FC E002033C 3C02E002 */  lui       $v0, %hi(D_E0020468)
+/* 3341FC E002033C 3C02E002 */  lui       $v0, %hi(func_E0020468)
-/* 334200 E0020340 24420468 */  addiu     $v0, $v0, %lo(D_E0020468)
+/* 334200 E0020340 24420468 */  addiu     $v0, $v0, %lo(func_E0020468)
 /* 334204 E0020344 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 334208 E0020348 3C02E002 */  lui       $v0, %hi(D_E002058C)
+/* 334208 E0020348 3C02E002 */  lui       $v0, %hi(func_E002058C)
-/* 33420C E002034C 2442058C */  addiu     $v0, $v0, %lo(D_E002058C)
+/* 33420C E002034C 2442058C */  addiu     $v0, $v0, %lo(func_E002058C)
 /* 334210 E0020350 AFA20020 */  sw        $v0, 0x20($sp)
 /* 334214 E0020354 24020010 */  addiu     $v0, $zero, 0x10
 /* 334218 E0020358 AFA00010 */  sw        $zero, 0x10($sp)
--- a/asm/nonmatchings/code_333EC0/func_E002058C.s
+++ b/asm/nonmatchings/code_333EC0/func_E002058C.s
@ -3,8 +3,8 @@
 glabel func_E002058C
 /* 33444C E002058C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 334450 E0020590 3C02E002 */  lui       $v0, %hi(D_E00205D0)
+/* 334450 E0020590 3C02E002 */  lui       $v0, %hi(func_E00205D0)
-/* 334454 E0020594 244205D0 */  addiu     $v0, $v0, %lo(D_E00205D0)
+/* 334454 E0020594 244205D0 */  addiu     $v0, $v0, %lo(func_E00205D0)
 /* 334458 E0020598 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 33445C E002059C 2402002D */  addiu     $v0, $zero, 0x2d
 /* 334460 E00205A0 AFA40018 */  sw        $a0, 0x18($sp)
--- a/asm/nonmatchings/code_337240/func_E0022000.s
+++ b/asm/nonmatchings/code_337240/func_E0022000.s
@ -58,14 +58,14 @@ glabel func_E0022000
 /* 3372FC E00220BC 4481F000 */  mtc1      $at, $f30
 .LE00220C0:
 /* 337300 E00220C0 26520001 */  addiu     $s2, $s2, 1
-/* 337304 E00220C4 3C02E002 */  lui       $v0, %hi(D_E0022544)
+/* 337304 E00220C4 3C02E002 */  lui       $v0, %hi(func_E0022544)
-/* 337308 E00220C8 24422544 */  addiu     $v0, $v0, %lo(D_E0022544)
+/* 337308 E00220C8 24422544 */  addiu     $v0, $v0, %lo(func_E0022544)
 /* 33730C E00220CC AC820008 */  sw        $v0, 8($a0)
-/* 337310 E00220D0 3C02E002 */  lui       $v0, %hi(D_E002254C)
+/* 337310 E00220D0 3C02E002 */  lui       $v0, %hi(func_E002254C)
-/* 337314 E00220D4 2442254C */  addiu     $v0, $v0, %lo(D_E002254C)
+/* 337314 E00220D4 2442254C */  addiu     $v0, $v0, %lo(func_E002254C)
 /* 337318 E00220D8 AC82000C */  sw        $v0, 0xc($a0)
-/* 33731C E00220DC 3C02E002 */  lui       $v0, %hi(D_E0022960)
+/* 33731C E00220DC 3C02E002 */  lui       $v0, %hi(func_E0022960)
-/* 337320 E00220E0 24422960 */  addiu     $v0, $v0, %lo(D_E0022960)
+/* 337320 E00220E0 24422960 */  addiu     $v0, $v0, %lo(func_E0022960)
 /* 337324 E00220E4 AC820010 */  sw        $v0, 0x10($a0)
 /* 337328 E00220E8 24020011 */  addiu     $v0, $zero, 0x11
 /* 33732C E00220EC AC800000 */  sw        $zero, ($a0)
--- a/asm/nonmatchings/code_337240/func_E0022960.s
+++ b/asm/nonmatchings/code_337240/func_E0022960.s
@ -3,8 +3,8 @@
 glabel func_E0022960
 /* 337BA0 E0022960 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 337BA4 E0022964 3C02E002 */  lui       $v0, %hi(D_E0022998)
+/* 337BA4 E0022964 3C02E002 */  lui       $v0, %hi(func_E0022998)
-/* 337BA8 E0022968 24422998 */  addiu     $v0, $v0, %lo(D_E0022998)
+/* 337BA8 E0022968 24422998 */  addiu     $v0, $v0, %lo(func_E0022998)
 /* 337BAC E002296C AFA2001C */  sw        $v0, 0x1c($sp)
 /* 337BB0 E0022970 2402002D */  addiu     $v0, $zero, 0x2d
 /* 337BB4 E0022974 AFA40018 */  sw        $a0, 0x18($sp)
--- a/asm/nonmatchings/code_339250/func_E0024000.s
+++ b/asm/nonmatchings/code_339250/func_E0024000.s
@ -14,14 +14,14 @@ glabel func_E0024000
 /* 339274 E0024024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 339278 E0024028 AFB20030 */  sw        $s2, 0x30($sp)
 /* 33927C E002402C 8FB2006C */  lw        $s2, 0x6c($sp)
-/* 339280 E0024030 3C02E002 */  lui       $v0, %hi(D_E0024180)
+/* 339280 E0024030 3C02E002 */  lui       $v0, %hi(func_E0024180)
-/* 339284 E0024034 24424180 */  addiu     $v0, $v0, %lo(D_E0024180)
+/* 339284 E0024034 24424180 */  addiu     $v0, $v0, %lo(func_E0024180)
 /* 339288 E0024038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 33928C E002403C 3C02E002 */  lui       $v0, %hi(D_E0024188)
+/* 33928C E002403C 3C02E002 */  lui       $v0, %hi(func_E0024188)
-/* 339290 E0024040 24424188 */  addiu     $v0, $v0, %lo(D_E0024188)
+/* 339290 E0024040 24424188 */  addiu     $v0, $v0, %lo(func_E0024188)
 /* 339294 E0024044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 339298 E0024048 3C02E002 */  lui       $v0, %hi(D_E00242E0)
+/* 339298 E0024048 3C02E002 */  lui       $v0, %hi(func_E00242E0)
-/* 33929C E002404C 244242E0 */  addiu     $v0, $v0, %lo(D_E00242E0)
+/* 33929C E002404C 244242E0 */  addiu     $v0, $v0, %lo(func_E00242E0)
 /* 3392A0 E0024050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3392A4 E0024054 24020012 */  addiu     $v0, $zero, 0x12
 /* 3392A8 E0024058 AFBF0034 */  sw        $ra, 0x34($sp)
--- a/asm/nonmatchings/code_339250/func_E00242E0.s
+++ b/asm/nonmatchings/code_339250/func_E00242E0.s
@ -3,8 +3,8 @@
 glabel func_E00242E0
 /* 339530 E00242E0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 339534 E00242E4 3C02E002 */  lui       $v0, %hi(D_E0024454)
+/* 339534 E00242E4 3C02E002 */  lui       $v0, %hi(func_E0024454)
-/* 339538 E00242E8 24424454 */  addiu     $v0, $v0, %lo(D_E0024454)
+/* 339538 E00242E8 24424454 */  addiu     $v0, $v0, %lo(func_E0024454)
 /* 33953C E00242EC AFA2001C */  sw        $v0, 0x1c($sp)
 /* 339540 E00242F0 2402002D */  addiu     $v0, $zero, 0x2d
 /* 339544 E00242F4 AFA40018 */  sw        $a0, 0x18($sp)
--- a/asm/nonmatchings/code_33B180/func_E0026000.s
+++ b/asm/nonmatchings/code_33B180/func_E0026000.s
@ -14,14 +14,14 @@ glabel func_E0026000
 /* 33B1A4 E0026024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 33B1A8 E0026028 F7BA0050 */  sdc1      $f26, 0x50($sp)
 /* 33B1AC E002602C C7BA0068 */  lwc1      $f26, 0x68($sp)
-/* 33B1B0 E0026030 3C02E002 */  lui       $v0, %hi(D_E0026184)
+/* 33B1B0 E0026030 3C02E002 */  lui       $v0, %hi(func_E0026184)
-/* 33B1B4 E0026034 24426184 */  addiu     $v0, $v0, %lo(D_E0026184)
+/* 33B1B4 E0026034 24426184 */  addiu     $v0, $v0, %lo(func_E0026184)
 /* 33B1B8 E0026038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 33B1BC E002603C 3C02E002 */  lui       $v0, %hi(D_E002618C)
+/* 33B1BC E002603C 3C02E002 */  lui       $v0, %hi(func_E002618C)
-/* 33B1C0 E0026040 2442618C */  addiu     $v0, $v0, %lo(D_E002618C)
+/* 33B1C0 E0026040 2442618C */  addiu     $v0, $v0, %lo(func_E002618C)
 /* 33B1C4 E0026044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 33B1C8 E0026048 3C02E002 */  lui       $v0, %hi(D_E00264B0)
+/* 33B1C8 E0026048 3C02E002 */  lui       $v0, %hi(func_E00264B0)
-/* 33B1CC E002604C 244264B0 */  addiu     $v0, $v0, %lo(D_E00264B0)
+/* 33B1CC E002604C 244264B0 */  addiu     $v0, $v0, %lo(func_E00264B0)
 /* 33B1D0 E0026050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 33B1D4 E0026054 24020013 */  addiu     $v0, $zero, 0x13
 /* 33B1D8 E0026058 AFBF0030 */  sw        $ra, 0x30($sp)
--- a/asm/nonmatchings/code_33B180/func_E00264B0.s
+++ b/asm/nonmatchings/code_33B180/func_E00264B0.s
@ -3,8 +3,8 @@
 glabel func_E00264B0
 /* 33B630 E00264B0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 33B634 E00264B4 3C02E002 */  lui       $v0, %hi(D_E00264F4)
+/* 33B634 E00264B4 3C02E002 */  lui       $v0, %hi(func_E00264F4)
-/* 33B638 E00264B8 244264F4 */  addiu     $v0, $v0, %lo(D_E00264F4)
+/* 33B638 E00264B8 244264F4 */  addiu     $v0, $v0, %lo(func_E00264F4)
 /* 33B63C E00264BC AFA2001C */  sw        $v0, 0x1c($sp)
 /* 33B640 E00264C0 2402002D */  addiu     $v0, $zero, 0x2d
 /* 33B644 E00264C4 AFA40018 */  sw        $a0, 0x18($sp)
--- a/asm/nonmatchings/code_33CDF0/func_E0028000.s
+++ b/asm/nonmatchings/code_33CDF0/func_E0028000.s
@ -12,14 +12,14 @@ glabel func_E0028000
 /* 33CE0C E002801C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 33CE10 E0028020 F7B80050 */  sdc1      $f24, 0x50($sp)
 /* 33CE14 E0028024 4487C000 */  mtc1      $a3, $f24
-/* 33CE18 E0028028 3C02E003 */  lui       $v0, %hi(D_E0028240)
+/* 33CE18 E0028028 3C02E003 */  lui       $v0, %hi(func_E0028240)
-/* 33CE1C E002802C 24428240 */  addiu     $v0, $v0, %lo(D_E0028240)
+/* 33CE1C E002802C 24428240 */  addiu     $v0, $v0, %lo(func_E0028240)
 /* 33CE20 E0028030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 33CE24 E0028034 3C02E003 */  lui       $v0, %hi(D_E0028248)
+/* 33CE24 E0028034 3C02E003 */  lui       $v0, %hi(func_E0028248)
-/* 33CE28 E0028038 24428248 */  addiu     $v0, $v0, %lo(D_E0028248)
+/* 33CE28 E0028038 24428248 */  addiu     $v0, $v0, %lo(func_E0028248)
 /* 33CE2C E002803C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 33CE30 E0028040 3C02E003 */  lui       $v0, %hi(D_E00284E8)
+/* 33CE30 E0028040 3C02E003 */  lui       $v0, %hi(func_E00284E8)
-/* 33CE34 E0028044 244284E8 */  addiu     $v0, $v0, %lo(D_E00284E8)
+/* 33CE34 E0028044 244284E8 */  addiu     $v0, $v0, %lo(func_E00284E8)
 /* 33CE38 E0028048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 33CE3C E002804C 24020014 */  addiu     $v0, $zero, 0x14
 /* 33CE40 E0028050 AFBF0038 */  sw        $ra, 0x38($sp)
--- a/asm/nonmatchings/code_33CDF0/func_E00284E8.s
+++ b/asm/nonmatchings/code_33CDF0/func_E00284E8.s
@ -3,8 +3,8 @@
 glabel func_E00284E8
 /* 33D2D8 E00284E8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 33D2DC E00284EC 3C02E003 */  lui       $v0, %hi(D_E002852C)
+/* 33D2DC E00284EC 3C02E003 */  lui       $v0, %hi(func_E002852C)
-/* 33D2E0 E00284F0 2442852C */  addiu     $v0, $v0, %lo(D_E002852C)
+/* 33D2E0 E00284F0 2442852C */  addiu     $v0, $v0, %lo(func_E002852C)
 /* 33D2E4 E00284F4 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 33D2E8 E00284F8 2402002D */  addiu     $v0, $zero, 0x2d
 /* 33D2EC E00284FC AFA40018 */  sw        $a0, 0x18($sp)
--- a/asm/nonmatchings/code_33E8C0/func_E002A000.s
+++ b/asm/nonmatchings/code_33E8C0/func_E002A000.s
@ -22,14 +22,14 @@ glabel func_E002A000
 /* 33E904 E002A044 AFB00028 */   sw       $s0, 0x28($sp)
 /* 33E908 E002A048 24120005 */  addiu     $s2, $zero, 5
 .LE002A04C:
-/* 33E90C E002A04C 3C02E003 */  lui       $v0, %hi(D_E002A284)
+/* 33E90C E002A04C 3C02E003 */  lui       $v0, %hi(func_E002A284)
-/* 33E910 E002A050 2442A284 */  addiu     $v0, $v0, %lo(D_E002A284)
+/* 33E910 E002A050 2442A284 */  addiu     $v0, $v0, %lo(func_E002A284)
 /* 33E914 E002A054 AFA20018 */  sw        $v0, 0x18($sp)
-/* 33E918 E002A058 3C02E003 */  lui       $v0, %hi(D_E002A28C)
+/* 33E918 E002A058 3C02E003 */  lui       $v0, %hi(func_E002A28C)
-/* 33E91C E002A05C 2442A28C */  addiu     $v0, $v0, %lo(D_E002A28C)
+/* 33E91C E002A05C 2442A28C */  addiu     $v0, $v0, %lo(func_E002A28C)
 /* 33E920 E002A060 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 33E924 E002A064 3C02E003 */  lui       $v0, %hi(D_E002A380)
+/* 33E924 E002A064 3C02E003 */  lui       $v0, %hi(func_E002A380)
-/* 33E928 E002A068 2442A380 */  addiu     $v0, $v0, %lo(D_E002A380)
+/* 33E928 E002A068 2442A380 */  addiu     $v0, $v0, %lo(func_E002A380)
 /* 33E92C E002A06C AFA20020 */  sw        $v0, 0x20($sp)
 /* 33E930 E002A070 24020015 */  addiu     $v0, $zero, 0x15
 /* 33E934 E002A074 AFA00010 */  sw        $zero, 0x10($sp)
--- a/asm/nonmatchings/code_33E8C0/func_E002A380.s
+++ b/asm/nonmatchings/code_33E8C0/func_E002A380.s
@ -3,8 +3,8 @@
 glabel func_E002A380
 /* 33EC40 E002A380 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 33EC44 E002A384 3C02E003 */  lui       $v0, %hi(D_E002A3C4)
+/* 33EC44 E002A384 3C02E003 */  lui       $v0, %hi(func_E002A3C4)
-/* 33EC48 E002A388 2442A3C4 */  addiu     $v0, $v0, %lo(D_E002A3C4)
+/* 33EC48 E002A388 2442A3C4 */  addiu     $v0, $v0, %lo(func_E002A3C4)
 /* 33EC4C E002A38C AFA2001C */  sw        $v0, 0x1c($sp)
 /* 33EC50 E002A390 24020011 */  addiu     $v0, $zero, 0x11
 /* 33EC54 E002A394 AFA40018 */  sw        $a0, 0x18($sp)
--- a/asm/nonmatchings/code_33FE80/func_E002C000.s
+++ b/asm/nonmatchings/code_33FE80/func_E002C000.s
@ -10,14 +10,14 @@ glabel func_E002C000
 /* 33FE94 E002C014 27A40010 */  addiu     $a0, $sp, 0x10
 /* 33FE98 E002C018 F7B80060 */  sdc1      $f24, 0x60($sp)
 /* 33FE9C E002C01C 4487C000 */  mtc1      $a3, $f24
-/* 33FEA0 E002C020 3C02E003 */  lui       $v0, %hi(D_E002C234)
+/* 33FEA0 E002C020 3C02E003 */  lui       $v0, %hi(func_E002C234)
-/* 33FEA4 E002C024 2442C234 */  addiu     $v0, $v0, %lo(D_E002C234)
+/* 33FEA4 E002C024 2442C234 */  addiu     $v0, $v0, %lo(func_E002C234)
 /* 33FEA8 E002C028 AFA20018 */  sw        $v0, 0x18($sp)
-/* 33FEAC E002C02C 3C02E003 */  lui       $v0, %hi(D_E002C23C)
+/* 33FEAC E002C02C 3C02E003 */  lui       $v0, %hi(func_E002C23C)
-/* 33FEB0 E002C030 2442C23C */  addiu     $v0, $v0, %lo(D_E002C23C)
+/* 33FEB0 E002C030 2442C23C */  addiu     $v0, $v0, %lo(func_E002C23C)
 /* 33FEB4 E002C034 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 33FEB8 E002C038 3C02E003 */  lui       $v0, %hi(D_E002C3D0)
+/* 33FEB8 E002C038 3C02E003 */  lui       $v0, %hi(func_E002C3D0)
-/* 33FEBC E002C03C 2442C3D0 */  addiu     $v0, $v0, %lo(D_E002C3D0)
+/* 33FEBC E002C03C 2442C3D0 */  addiu     $v0, $v0, %lo(func_E002C3D0)
 /* 33FEC0 E002C040 AFA20020 */  sw        $v0, 0x20($sp)
 /* 33FEC4 E002C044 24020016 */  addiu     $v0, $zero, 0x16
 /* 33FEC8 E002C048 AFBF0048 */  sw        $ra, 0x48($sp)
--- a/asm/nonmatchings/code_33FE80/func_E002C3D0.s
+++ b/asm/nonmatchings/code_33FE80/func_E002C3D0.s
@ -3,8 +3,8 @@
 glabel func_E002C3D0
 /* 340250 E002C3D0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 340254 E002C3D4 3C02E003 */  lui       $v0, %hi(D_E002C414)
+/* 340254 E002C3D4 3C02E003 */  lui       $v0, %hi(func_E002C414)
-/* 340258 E002C3D8 2442C414 */  addiu     $v0, $v0, %lo(D_E002C414)
+/* 340258 E002C3D8 2442C414 */  addiu     $v0, $v0, %lo(func_E002C414)
 /* 34025C E002C3DC AFA2001C */  sw        $v0, 0x1c($sp)
 /* 340260 E002C3E0 2402002D */  addiu     $v0, $zero, 0x2d
 /* 340264 E002C3E4 AFA40018 */  sw        $a0, 0x18($sp)
--- a/asm/nonmatchings/code_3419E0/func_E002E000.s
+++ b/asm/nonmatchings/code_3419E0/func_E002E000.s
@ -40,14 +40,14 @@ glabel func_E002E000
 /* 341A60 E002E080 3C014228 */  lui       $at, 0x4228
 /* 341A64 E002E084 4481B000 */  mtc1      $at, $f22
 .LE002E088:
-/* 341A68 E002E088 3C02E003 */  lui       $v0, %hi(D_E002E248)
+/* 341A68 E002E088 3C02E003 */  lui       $v0, %hi(func_E002E248)
-/* 341A6C E002E08C 2442E248 */  addiu     $v0, $v0, %lo(D_E002E248)
+/* 341A6C E002E08C 2442E248 */  addiu     $v0, $v0, %lo(func_E002E248)
 /* 341A70 E002E090 AC820008 */  sw        $v0, 8($a0)
-/* 341A74 E002E094 3C02E003 */  lui       $v0, %hi(D_E002E250)
+/* 341A74 E002E094 3C02E003 */  lui       $v0, %hi(func_E002E250)
-/* 341A78 E002E098 2442E250 */  addiu     $v0, $v0, %lo(D_E002E250)
+/* 341A78 E002E098 2442E250 */  addiu     $v0, $v0, %lo(func_E002E250)
 /* 341A7C E002E09C AC82000C */  sw        $v0, 0xc($a0)
-/* 341A80 E002E0A0 3C02E003 */  lui       $v0, %hi(D_E002E330)
+/* 341A80 E002E0A0 3C02E003 */  lui       $v0, %hi(func_E002E330)
-/* 341A84 E002E0A4 2442E330 */  addiu     $v0, $v0, %lo(D_E002E330)
+/* 341A84 E002E0A4 2442E330 */  addiu     $v0, $v0, %lo(func_E002E330)
 /* 341A88 E002E0A8 AC820010 */  sw        $v0, 0x10($a0)
 /* 341A8C E002E0AC 24020017 */  addiu     $v0, $zero, 0x17
 /* 341A90 E002E0B0 AC800000 */  sw        $zero, ($a0)
--- a/asm/nonmatchings/code_3419E0/func_E002E330.s
+++ b/asm/nonmatchings/code_3419E0/func_E002E330.s
@ -3,8 +3,8 @@
 glabel func_E002E330
 /* 341D10 E002E330 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 341D14 E002E334 3C02E003 */  lui       $v0, %hi(D_E002E368)
+/* 341D14 E002E334 3C02E003 */  lui       $v0, %hi(func_E002E368)
-/* 341D18 E002E338 2442E368 */  addiu     $v0, $v0, %lo(D_E002E368)
+/* 341D18 E002E338 2442E368 */  addiu     $v0, $v0, %lo(func_E002E368)
 /* 341D1C E002E33C AFA2001C */  sw        $v0, 0x1c($sp)
 /* 341D20 E002E340 24020028 */  addiu     $v0, $zero, 0x28
 /* 341D24 E002E344 AFA40018 */  sw        $a0, 0x18($sp)
--- a/asm/nonmatchings/code_342140/func_E0030000.s
+++ b/asm/nonmatchings/code_342140/func_E0030000.s
@ -123,16 +123,16 @@ glabel func_E0030000
 /* 34230C E00301CC 4600F782 */  mul.s     $f30, $f30, $f0
 /* 342310 E00301D0 00000000 */  nop       
 /* 342314 E00301D4 0200202D */  daddu     $a0, $s0, $zero
-/* 342318 E00301D8 3C02E003 */  lui       $v0, %hi(D_E0030728)
+/* 342318 E00301D8 3C02E003 */  lui       $v0, %hi(func_E0030728)
-/* 34231C E00301DC 24420728 */  addiu     $v0, $v0, %lo(D_E0030728)
+/* 34231C E00301DC 24420728 */  addiu     $v0, $v0, %lo(func_E0030728)
 /* 342320 E00301E0 AC820008 */  sw        $v0, 8($a0)
 /* 342324 E00301E4 46004202 */  mul.s     $f8, $f8, $f0
 /* 342328 E00301E8 00000000 */  nop       
-/* 34232C E00301EC 3C02E003 */  lui       $v0, %hi(D_E0030730)
+/* 34232C E00301EC 3C02E003 */  lui       $v0, %hi(func_E0030730)
-/* 342330 E00301F0 24420730 */  addiu     $v0, $v0, %lo(D_E0030730)
+/* 342330 E00301F0 24420730 */  addiu     $v0, $v0, %lo(func_E0030730)
 /* 342334 E00301F4 AC82000C */  sw        $v0, 0xc($a0)
-/* 342338 E00301F8 3C02E003 */  lui       $v0, %hi(D_E0030A24)
+/* 342338 E00301F8 3C02E003 */  lui       $v0, %hi(func_E0030A24)
-/* 34233C E00301FC 24420A24 */  addiu     $v0, $v0, %lo(D_E0030A24)
+/* 34233C E00301FC 24420A24 */  addiu     $v0, $v0, %lo(func_E0030A24)
 /* 342340 E0030200 AC800000 */  sw        $zero, ($a0)
 /* 342344 E0030204 4600E702 */  mul.s     $f28, $f28, $f0
 /* 342348 E0030208 00000000 */  nop       
--- a/asm/nonmatchings/code_342140/func_E0030A24.s
+++ b/asm/nonmatchings/code_342140/func_E0030A24.s
@ -3,8 +3,8 @@
 glabel func_E0030A24
 /* 342B64 E0030A24 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 342B68 E0030A28 3C02E003 */  lui       $v0, %hi(D_E0030A68)
+/* 342B68 E0030A28 3C02E003 */  lui       $v0, %hi(func_E0030A68)
-/* 342B6C E0030A2C 24420A68 */  addiu     $v0, $v0, %lo(D_E0030A68)
+/* 342B6C E0030A2C 24420A68 */  addiu     $v0, $v0, %lo(func_E0030A68)
 /* 342B70 E0030A30 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 342B74 E0030A34 2402002D */  addiu     $v0, $zero, 0x2d
 /* 342B78 E0030A38 AFA40018 */  sw        $a0, 0x18($sp)
--- a/asm/nonmatchings/code_343680/func_E0032000.s
+++ b/asm/nonmatchings/code_343680/func_E0032000.s
@ -12,17 +12,17 @@ glabel func_E0032000
 /* 34369C E003201C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3436A0 E0032020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 3436A4 E0032024 4487C000 */  mtc1      $a3, $f24
-/* 3436A8 E0032028 3C02E003 */  lui       $v0, %hi(D_E00321D0)
+/* 3436A8 E0032028 3C02E003 */  lui       $v0, %hi(func_E00321D0)
-/* 3436AC E003202C 244221D0 */  addiu     $v0, $v0, %lo(D_E00321D0)
+/* 3436AC E003202C 244221D0 */  addiu     $v0, $v0, %lo(func_E00321D0)
 /* 3436B0 E0032030 AFBF0030 */  sw        $ra, 0x30($sp)
 /* 3436B4 E0032034 AFB00028 */  sw        $s0, 0x28($sp)
 /* 3436B8 E0032038 AFA00010 */  sw        $zero, 0x10($sp)
 /* 3436BC E003203C AC820008 */  sw        $v0, 8($a0)
-/* 3436C0 E0032040 3C02E003 */  lui       $v0, %hi(D_E00321D8)
+/* 3436C0 E0032040 3C02E003 */  lui       $v0, %hi(func_E00321D8)
-/* 3436C4 E0032044 244221D8 */  addiu     $v0, $v0, %lo(D_E00321D8)
+/* 3436C4 E0032044 244221D8 */  addiu     $v0, $v0, %lo(func_E00321D8)
 /* 3436C8 E0032048 AC82000C */  sw        $v0, 0xc($a0)
-/* 3436CC E003204C 3C02E003 */  lui       $v0, %hi(D_E0032420)
+/* 3436CC E003204C 3C02E003 */  lui       $v0, %hi(func_E0032420)
-/* 3436D0 E0032050 24422420 */  addiu     $v0, $v0, %lo(D_E0032420)
+/* 3436D0 E0032050 24422420 */  addiu     $v0, $v0, %lo(func_E0032420)
 /* 3436D4 E0032054 AC820010 */  sw        $v0, 0x10($a0)
 /* 3436D8 E0032058 24020019 */  addiu     $v0, $zero, 0x19
 /* 3436DC E003205C AC800014 */  sw        $zero, 0x14($a0)
--- a/asm/nonmatchings/code_343680/func_E0032420.s
+++ b/asm/nonmatchings/code_343680/func_E0032420.s
@ -3,8 +3,8 @@
 glabel func_E0032420
 /* 343AA0 E0032420 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 343AA4 E0032424 3C02E003 */  lui       $v0, %hi(D_E003245C)
+/* 343AA4 E0032424 3C02E003 */  lui       $v0, %hi(func_E003245C)
-/* 343AA8 E0032428 2442245C */  addiu     $v0, $v0, %lo(D_E003245C)
+/* 343AA8 E0032428 2442245C */  addiu     $v0, $v0, %lo(func_E003245C)
 /* 343AAC E003242C AFA2001C */  sw        $v0, 0x1c($sp)
 /* 343AB0 E0032430 2402000A */  addiu     $v0, $zero, 0xa
 /* 343AB4 E0032434 AFA20014 */  sw        $v0, 0x14($sp)
--- a/asm/nonmatchings/code_344A10/func_E0034000.s
+++ b/asm/nonmatchings/code_344A10/func_E0034000.s
@ -12,14 +12,14 @@ glabel func_E0034000
 /* 344A2C E003401C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 344A30 E0034020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 344A34 E0034024 4487C000 */  mtc1      $a3, $f24
-/* 344A38 E0034028 3C02E003 */  lui       $v0, %hi(D_E0034108)
+/* 344A38 E0034028 3C02E003 */  lui       $v0, %hi(func_E0034108)
-/* 344A3C E003402C 24424108 */  addiu     $v0, $v0, %lo(D_E0034108)
+/* 344A3C E003402C 24424108 */  addiu     $v0, $v0, %lo(func_E0034108)
 /* 344A40 E0034030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 344A44 E0034034 3C02E003 */  lui       $v0, %hi(D_E0034110)
+/* 344A44 E0034034 3C02E003 */  lui       $v0, %hi(func_E0034110)
-/* 344A48 E0034038 24424110 */  addiu     $v0, $v0, %lo(D_E0034110)
+/* 344A48 E0034038 24424110 */  addiu     $v0, $v0, %lo(func_E0034110)
 /* 344A4C E003403C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 344A50 E0034040 3C02E003 */  lui       $v0, %hi(D_E00342C8)
+/* 344A50 E0034040 3C02E003 */  lui       $v0, %hi(func_E00342C8)
-/* 344A54 E0034044 244242C8 */  addiu     $v0, $v0, %lo(D_E00342C8)
+/* 344A54 E0034044 244242C8 */  addiu     $v0, $v0, %lo(func_E00342C8)
 /* 344A58 E0034048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 344A5C E003404C 2402001A */  addiu     $v0, $zero, 0x1a
 /* 344A60 E0034050 AFBF0030 */  sw        $ra, 0x30($sp)
--- a/asm/nonmatchings/code_344A10/func_E00342C8.s
+++ b/asm/nonmatchings/code_344A10/func_E00342C8.s
@ -3,8 +3,8 @@
 glabel func_E00342C8
 /* 344CD8 E00342C8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 344CDC E00342CC 3C02E003 */  lui       $v0, %hi(D_E0034310)
+/* 344CDC E00342CC 3C02E003 */  lui       $v0, %hi(func_E0034310)
-/* 344CE0 E00342D0 24424310 */  addiu     $v0, $v0, %lo(D_E0034310)
+/* 344CE0 E00342D0 24424310 */  addiu     $v0, $v0, %lo(func_E0034310)
 /* 344CE4 E00342D4 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 344CE8 E00342D8 24020014 */  addiu     $v0, $zero, 0x14
 /* 344CEC E00342DC AFA20014 */  sw        $v0, 0x14($sp)
--- a/asm/nonmatchings/code_3454E0/func_E0036000.s
+++ b/asm/nonmatchings/code_3454E0/func_E0036000.s
@ -12,14 +12,14 @@ glabel func_E0036000
 /* 3454FC E003601C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 345500 E0036020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 345504 E0036024 4487C000 */  mtc1      $a3, $f24
-/* 345508 E0036028 3C02E003 */  lui       $v0, %hi(D_E00360DC)
+/* 345508 E0036028 3C02E003 */  lui       $v0, %hi(func_E00360DC)
-/* 34550C E003602C 244260DC */  addiu     $v0, $v0, %lo(D_E00360DC)
+/* 34550C E003602C 244260DC */  addiu     $v0, $v0, %lo(func_E00360DC)
 /* 345510 E0036030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 345514 E0036034 3C02E003 */  lui       $v0, %hi(D_E00360E4)
+/* 345514 E0036034 3C02E003 */  lui       $v0, %hi(func_E00360E4)
-/* 345518 E0036038 244260E4 */  addiu     $v0, $v0, %lo(D_E00360E4)
+/* 345518 E0036038 244260E4 */  addiu     $v0, $v0, %lo(func_E00360E4)
 /* 34551C E003603C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 345520 E0036040 3C02E003 */  lui       $v0, %hi(D_E00361D8)
+/* 345520 E0036040 3C02E003 */  lui       $v0, %hi(func_E00361D8)
-/* 345524 E0036044 244261D8 */  addiu     $v0, $v0, %lo(D_E00361D8)
+/* 345524 E0036044 244261D8 */  addiu     $v0, $v0, %lo(func_E00361D8)
 /* 345528 E0036048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 34552C E003604C 2402001B */  addiu     $v0, $zero, 0x1b
 /* 345530 E0036050 AFBF0030 */  sw        $ra, 0x30($sp)
--- a/asm/nonmatchings/code_3454E0/func_E00361D8.s
+++ b/asm/nonmatchings/code_3454E0/func_E00361D8.s
@ -3,8 +3,8 @@
 glabel func_E00361D8
 /* 3456B8 E00361D8 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3456BC E00361DC 3C02E003 */  lui       $v0, %hi(D_E0036224)
+/* 3456BC E00361DC 3C02E003 */  lui       $v0, %hi(func_E0036224)
-/* 3456C0 E00361E0 24426224 */  addiu     $v0, $v0, %lo(D_E0036224)
+/* 3456C0 E00361E0 24426224 */  addiu     $v0, $v0, %lo(func_E0036224)
 /* 3456C4 E00361E4 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 3456C8 E00361E8 2402002D */  addiu     $v0, $zero, 0x2d
 /* 3456CC E00361EC AFA40018 */  sw        $a0, 0x18($sp)
--- a/asm/nonmatchings/code_34DD20/func_E0038000.s
+++ b/asm/nonmatchings/code_34DD20/func_E0038000.s
@ -78,16 +78,16 @@ glabel func_E0038000
 /* 34DE38 E0038118 0200202D */  daddu     $a0, $s0, $zero
 /* 34DE3C E003811C 3C014190 */  lui       $at, 0x4190
 /* 34DE40 E0038120 44810000 */  mtc1      $at, $f0
-/* 34DE44 E0038124 3C02E004 */  lui       $v0, %hi(D_E003841C)
+/* 34DE44 E0038124 3C02E004 */  lui       $v0, %hi(func_E003841C)
-/* 34DE48 E0038128 2442841C */  addiu     $v0, $v0, %lo(D_E003841C)
+/* 34DE48 E0038128 2442841C */  addiu     $v0, $v0, %lo(func_E003841C)
 /* 34DE4C E003812C AC820008 */  sw        $v0, 8($a0)
 /* 34DE50 E0038130 4600D682 */  mul.s     $f26, $f26, $f0
 /* 34DE54 E0038134 00000000 */  nop       
-/* 34DE58 E0038138 3C02E004 */  lui       $v0, %hi(D_E0038424)
+/* 34DE58 E0038138 3C02E004 */  lui       $v0, %hi(func_E0038424)
-/* 34DE5C E003813C 24428424 */  addiu     $v0, $v0, %lo(D_E0038424)
+/* 34DE5C E003813C 24428424 */  addiu     $v0, $v0, %lo(func_E0038424)
 /* 34DE60 E0038140 AC82000C */  sw        $v0, 0xc($a0)
-/* 34DE64 E0038144 3C02E004 */  lui       $v0, %hi(D_E0038704)
+/* 34DE64 E0038144 3C02E004 */  lui       $v0, %hi(func_E0038704)
-/* 34DE68 E0038148 24428704 */  addiu     $v0, $v0, %lo(D_E0038704)
+/* 34DE68 E0038148 24428704 */  addiu     $v0, $v0, %lo(func_E0038704)
 /* 34DE6C E003814C AC820010 */  sw        $v0, 0x10($a0)
 /* 34DE70 E0038150 4600C602 */  mul.s     $f24, $f24, $f0
 /* 34DE74 E0038154 00000000 */  nop       
--- a/asm/nonmatchings/code_34DD20/func_E0038704.s
+++ b/asm/nonmatchings/code_34DD20/func_E0038704.s
@ -3,8 +3,8 @@
 glabel func_E0038704
 /* 34E424 E0038704 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 34E428 E0038708 3C02E004 */  lui       $v0, %hi(D_E0038748)
+/* 34E428 E0038708 3C02E004 */  lui       $v0, %hi(func_E0038748)
-/* 34E42C E003870C 24428748 */  addiu     $v0, $v0, %lo(D_E0038748)
+/* 34E42C E003870C 24428748 */  addiu     $v0, $v0, %lo(func_E0038748)
 /* 34E430 E0038710 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 34E434 E0038714 2402002D */  addiu     $v0, $zero, 0x2d
 /* 34E438 E0038718 AFA40018 */  sw        $a0, 0x18($sp)
--- a/asm/nonmatchings/code_34EC80/func_E003A000.s
+++ b/asm/nonmatchings/code_34EC80/func_E003A000.s
@ -18,14 +18,14 @@ glabel func_E003A000
 /* 34ECB4 E003A034 27A40010 */  addiu     $a0, $sp, 0x10
 /* 34ECB8 E003A038 AFB40038 */  sw        $s4, 0x38($sp)
 /* 34ECBC E003A03C 8FB40084 */  lw        $s4, 0x84($sp)
-/* 34ECC0 E003A040 3C02E004 */  lui       $v0, %hi(D_E003A1D4)
+/* 34ECC0 E003A040 3C02E004 */  lui       $v0, %hi(func_E003A1D4)
-/* 34ECC4 E003A044 2442A1D4 */  addiu     $v0, $v0, %lo(D_E003A1D4)
+/* 34ECC4 E003A044 2442A1D4 */  addiu     $v0, $v0, %lo(func_E003A1D4)
 /* 34ECC8 E003A048 AFA20018 */  sw        $v0, 0x18($sp)
-/* 34ECCC E003A04C 3C02E004 */  lui       $v0, %hi(D_E003A1DC)
+/* 34ECCC E003A04C 3C02E004 */  lui       $v0, %hi(func_E003A1DC)
-/* 34ECD0 E003A050 2442A1DC */  addiu     $v0, $v0, %lo(D_E003A1DC)
+/* 34ECD0 E003A050 2442A1DC */  addiu     $v0, $v0, %lo(func_E003A1DC)
 /* 34ECD4 E003A054 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 34ECD8 E003A058 3C02E004 */  lui       $v0, %hi(D_E003A310)
+/* 34ECD8 E003A058 3C02E004 */  lui       $v0, %hi(func_E003A310)
-/* 34ECDC E003A05C 2442A310 */  addiu     $v0, $v0, %lo(D_E003A310)
+/* 34ECDC E003A05C 2442A310 */  addiu     $v0, $v0, %lo(func_E003A310)
 /* 34ECE0 E003A060 AFA20020 */  sw        $v0, 0x20($sp)
 /* 34ECE4 E003A064 2402001D */  addiu     $v0, $zero, 0x1d
 /* 34ECE8 E003A068 AFBF0040 */  sw        $ra, 0x40($sp)
--- a/asm/nonmatchings/code_34EC80/func_E003A310.s
+++ b/asm/nonmatchings/code_34EC80/func_E003A310.s
@ -3,8 +3,8 @@
 glabel func_E003A310
 /* 34EF90 E003A310 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 34EF94 E003A314 3C02E004 */  lui       $v0, %hi(D_E003A354)
+/* 34EF94 E003A314 3C02E004 */  lui       $v0, %hi(func_E003A354)
-/* 34EF98 E003A318 2442A354 */  addiu     $v0, $v0, %lo(D_E003A354)
+/* 34EF98 E003A318 2442A354 */  addiu     $v0, $v0, %lo(func_E003A354)
 /* 34EF9C E003A31C AFA2001C */  sw        $v0, 0x1c($sp)
 /* 34EFA0 E003A320 24020028 */  addiu     $v0, $zero, 0x28
 /* 34EFA4 E003A324 AFA40018 */  sw        $a0, 0x18($sp)
--- a/asm/nonmatchings/code_34F4C0/func_E003C000.s
+++ b/asm/nonmatchings/code_34F4C0/func_E003C000.s
@ -27,17 +27,17 @@ glabel func_E003C000
 /* 34F518 E003C058 24120014 */  addiu     $s2, $zero, 0x14
 .LE003C05C:
 /* 34F51C E003C05C 26520001 */  addiu     $s2, $s2, 1
-/* 34F520 E003C060 3C02E004 */  lui       $v0, %hi(D_E003C23C)
+/* 34F520 E003C060 3C02E004 */  lui       $v0, %hi(func_E003C23C)
-/* 34F524 E003C064 2442C23C */  addiu     $v0, $v0, %lo(D_E003C23C)
+/* 34F524 E003C064 2442C23C */  addiu     $v0, $v0, %lo(func_E003C23C)
 /* 34F528 E003C068 AFA20018 */  sw        $v0, 0x18($sp)
-/* 34F52C E003C06C 3C02E004 */  lui       $v0, %hi(D_E003C244)
+/* 34F52C E003C06C 3C02E004 */  lui       $v0, %hi(func_E003C244)
-/* 34F530 E003C070 2442C244 */  addiu     $v0, $v0, %lo(D_E003C244)
+/* 34F530 E003C070 2442C244 */  addiu     $v0, $v0, %lo(func_E003C244)
 /* 34F534 E003C074 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 34F538 E003C078 3C02E004 */  lui       $v0, %hi(D_E003C474)
+/* 34F538 E003C078 3C02E004 */  lui       $v0, %hi(func_E003C474)
-/* 34F53C E003C07C 2442C474 */  addiu     $v0, $v0, %lo(D_E003C474)
+/* 34F53C E003C07C 2442C474 */  addiu     $v0, $v0, %lo(func_E003C474)
 /* 34F540 E003C080 AFA20020 */  sw        $v0, 0x20($sp)
-/* 34F544 E003C084 3C02E004 */  lui       $v0, %hi(D_E003C47C)
+/* 34F544 E003C084 3C02E004 */  lui       $v0, %hi(func_E003C47C)
-/* 34F548 E003C088 2442C47C */  addiu     $v0, $v0, %lo(D_E003C47C)
+/* 34F548 E003C088 2442C47C */  addiu     $v0, $v0, %lo(func_E003C47C)
 /* 34F54C E003C08C AFA20024 */  sw        $v0, 0x24($sp)
 /* 34F550 E003C090 2402001E */  addiu     $v0, $zero, 0x1e
 /* 34F554 E003C094 AFA00010 */  sw        $zero, 0x10($sp)
--- a/asm/nonmatchings/code_352440/func_E003E000.s
+++ b/asm/nonmatchings/code_352440/func_E003E000.s
@ -152,16 +152,16 @@ glabel func_E003E000
 /* 352678 E003E238 460C8402 */  mul.s     $f16, $f16, $f12
 /* 35267C E003E23C 00000000 */  nop       
 /* 352680 E003E240 0200202D */  daddu     $a0, $s0, $zero
-/* 352684 E003E244 3C02E004 */  lui       $v0, %hi(D_E003E3F8)
+/* 352684 E003E244 3C02E004 */  lui       $v0, %hi(func_E003E3F8)
-/* 352688 E003E248 2442E3F8 */  addiu     $v0, $v0, %lo(D_E003E3F8)
+/* 352688 E003E248 2442E3F8 */  addiu     $v0, $v0, %lo(func_E003E3F8)
 /* 35268C E003E24C E7B2006C */  swc1      $f18, 0x6c($sp)
 /* 352690 E003E250 E7B00070 */  swc1      $f16, 0x70($sp)
 /* 352694 E003E254 AC820008 */  sw        $v0, 8($a0)
-/* 352698 E003E258 3C02E004 */  lui       $v0, %hi(D_E003E400)
+/* 352698 E003E258 3C02E004 */  lui       $v0, %hi(func_E003E400)
-/* 35269C E003E25C 2442E400 */  addiu     $v0, $v0, %lo(D_E003E400)
+/* 35269C E003E25C 2442E400 */  addiu     $v0, $v0, %lo(func_E003E400)
 /* 3526A0 E003E260 AC82000C */  sw        $v0, 0xc($a0)
-/* 3526A4 E003E264 3C02E004 */  lui       $v0, %hi(D_E003E5F4)
+/* 3526A4 E003E264 3C02E004 */  lui       $v0, %hi(func_E003E5F4)
-/* 3526A8 E003E268 2442E5F4 */  addiu     $v0, $v0, %lo(D_E003E5F4)
+/* 3526A8 E003E268 2442E5F4 */  addiu     $v0, $v0, %lo(func_E003E5F4)
 /* 3526AC E003E26C AC820010 */  sw        $v0, 0x10($a0)
 /* 3526B0 E003E270 2402001F */  addiu     $v0, $zero, 0x1f
 /* 3526B4 E003E274 AC800000 */  sw        $zero, ($a0)
--- a/asm/nonmatchings/code_352440/func_E003E5F4.s
+++ b/asm/nonmatchings/code_352440/func_E003E5F4.s
@ -3,8 +3,8 @@
 glabel func_E003E5F4
 /* 352A34 E003E5F4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 352A38 E003E5F8 3C02E004 */  lui       $v0, %hi(D_E003E638)
+/* 352A38 E003E5F8 3C02E004 */  lui       $v0, %hi(func_E003E638)
-/* 352A3C E003E5FC 2442E638 */  addiu     $v0, $v0, %lo(D_E003E638)
+/* 352A3C E003E5FC 2442E638 */  addiu     $v0, $v0, %lo(func_E003E638)
 /* 352A40 E003E600 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 352A44 E003E604 2402002D */  addiu     $v0, $zero, 0x2d
 /* 352A48 E003E608 AFA40018 */  sw        $a0, 0x18($sp)
--- a/asm/nonmatchings/code_353300/func_E0040000.s
+++ b/asm/nonmatchings/code_353300/func_E0040000.s
@ -20,14 +20,14 @@ glabel func_E0040000
 /* 35333C E004003C AFB1002C */   sw       $s1, 0x2c($sp)
 /* 353340 E0040040 24100003 */  addiu     $s0, $zero, 3
 .LE0040044:
-/* 353344 E0040044 3C02E004 */  lui       $v0, %hi(D_E0040148)
+/* 353344 E0040044 3C02E004 */  lui       $v0, %hi(func_E0040148)
-/* 353348 E0040048 24420148 */  addiu     $v0, $v0, %lo(D_E0040148)
+/* 353348 E0040048 24420148 */  addiu     $v0, $v0, %lo(func_E0040148)
 /* 35334C E004004C AFA20018 */  sw        $v0, 0x18($sp)
-/* 353350 E0040050 3C02E004 */  lui       $v0, %hi(D_E0040150)
+/* 353350 E0040050 3C02E004 */  lui       $v0, %hi(func_E0040150)
-/* 353354 E0040054 24420150 */  addiu     $v0, $v0, %lo(D_E0040150)
+/* 353354 E0040054 24420150 */  addiu     $v0, $v0, %lo(func_E0040150)
 /* 353358 E0040058 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 35335C E004005C 3C02E004 */  lui       $v0, %hi(D_E0040210)
+/* 35335C E004005C 3C02E004 */  lui       $v0, %hi(func_E0040210)
-/* 353360 E0040060 24420210 */  addiu     $v0, $v0, %lo(D_E0040210)
+/* 353360 E0040060 24420210 */  addiu     $v0, $v0, %lo(func_E0040210)
 /* 353364 E0040064 AFA20020 */  sw        $v0, 0x20($sp)
 /* 353368 E0040068 24020020 */  addiu     $v0, $zero, 0x20
 /* 35336C E004006C AFA00010 */  sw        $zero, 0x10($sp)
--- a/asm/nonmatchings/code_353300/func_E0040210.s
+++ b/asm/nonmatchings/code_353300/func_E0040210.s
@ -69,8 +69,8 @@ glabel func_E0040210
 /* 353608 E0040308 0000182D */   daddu    $v1, $zero, $zero
 /* 35360C E004030C 0200202D */  daddu     $a0, $s0, $zero
 .LE0040310:
-/* 353610 E0040310 3C02E004 */  lui       $v0, %hi(D_E0040348)
+/* 353610 E0040310 3C02E004 */  lui       $v0, %hi(func_E0040348)
-/* 353614 E0040314 24420348 */  addiu     $v0, $v0, %lo(D_E0040348)
+/* 353614 E0040314 24420348 */  addiu     $v0, $v0, %lo(func_E0040348)
 /* 353618 E0040318 AC82000C */  sw        $v0, 0xc($a0)
 /* 35361C E004031C 00031023 */  negu      $v0, $v1
 /* 353620 E0040320 AC820004 */  sw        $v0, 4($a0)
--- a/asm/nonmatchings/code_3547A0/func_E0042000.s
+++ b/asm/nonmatchings/code_3547A0/func_E0042000.s
@ -24,14 +24,14 @@ glabel func_E0042000
 /* 3547EC E004204C 12600069 */  beqz      $s3, .LE00421F4
 /* 3547F0 E0042050 AFA700BC */   sw       $a3, 0xbc($sp)
 /* 3547F4 E0042054 26730001 */  addiu     $s3, $s3, 1
-/* 3547F8 E0042058 3C02E004 */  lui       $v0, %hi(D_E004222C)
+/* 3547F8 E0042058 3C02E004 */  lui       $v0, %hi(func_E004222C)
-/* 3547FC E004205C 2442222C */  addiu     $v0, $v0, %lo(D_E004222C)
+/* 3547FC E004205C 2442222C */  addiu     $v0, $v0, %lo(func_E004222C)
 /* 354800 E0042060 AFA20018 */  sw        $v0, 0x18($sp)
-/* 354804 E0042064 3C02E004 */  lui       $v0, %hi(D_E0042234)
+/* 354804 E0042064 3C02E004 */  lui       $v0, %hi(func_E0042234)
-/* 354808 E0042068 24422234 */  addiu     $v0, $v0, %lo(D_E0042234)
+/* 354808 E0042068 24422234 */  addiu     $v0, $v0, %lo(func_E0042234)
 /* 35480C E004206C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 354810 E0042070 3C02E004 */  lui       $v0, %hi(D_E0042374)
+/* 354810 E0042070 3C02E004 */  lui       $v0, %hi(func_E0042374)
-/* 354814 E0042074 24422374 */  addiu     $v0, $v0, %lo(D_E0042374)
+/* 354814 E0042074 24422374 */  addiu     $v0, $v0, %lo(func_E0042374)
 /* 354818 E0042078 AFA20020 */  sw        $v0, 0x20($sp)
 /* 35481C E004207C 24020021 */  addiu     $v0, $zero, 0x21
 /* 354820 E0042080 AFA00010 */  sw        $zero, 0x10($sp)
--- a/asm/nonmatchings/code_3547A0/func_E0042374.s
+++ b/asm/nonmatchings/code_3547A0/func_E0042374.s
@ -3,8 +3,8 @@
 glabel func_E0042374
 /* 354B14 E0042374 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 354B18 E0042378 3C02E004 */  lui       $v0, %hi(D_E00423B8)
+/* 354B18 E0042378 3C02E004 */  lui       $v0, %hi(func_E00423B8)
-/* 354B1C E004237C 244223B8 */  addiu     $v0, $v0, %lo(D_E00423B8)
+/* 354B1C E004237C 244223B8 */  addiu     $v0, $v0, %lo(func_E00423B8)
 /* 354B20 E0042380 AFA2001C */  sw        $v0, 0x1c($sp)
 /* 354B24 E0042384 2402002D */  addiu     $v0, $zero, 0x2d
 /* 354B28 E0042388 AFA40018 */  sw        $a0, 0x18($sp)
--- a/Show More
+++ b/Show More