From c78d93ad78a6ed237676838f98f9b82aa1c43234 Mon Sep 17 00:00:00 2001 From: krimtonz <33664508+krimtonz@users.noreply.github.com> Date: Thu, 4 Jun 2020 16:51:14 -0500 Subject: [PATCH] Remove hard-coded pointers in several files (#186) * fix hard-coded pointers in code_800DACC0.data.s * fix hard coded pointer in code_800E11F0.data.s * fix hard coded pointers in code_800EC960.data.s * remove fixed pointers in code_800F7260.data.s * fix hard coded pointers in code_800F9280.data.s * remove accidental comment * fix hard coded jump table in Camera_Unique9.s --- asm/code_800DACC0.s | 172 ++++---- asm/code_800E11F0.s | 378 +++++++++--------- asm/code_800E88C0.s | 86 ++-- .../code/z_camera/Camera_Unique9.s | 76 ++-- data/code_800D7CD0.data.s | 23 +- data/code_800DACC0.bss.s | 23 +- data/code_800DACC0.data.s | 16 +- data/code_800E11F0.data.s | 2 +- data/code_800EC960.data.s | 55 ++- data/code_800F7260.data.s | 8 +- data/code_800F9280.data.s | 109 ++++- 11 files changed, 584 insertions(+), 364 deletions(-) diff --git a/asm/code_800DACC0.s b/asm/code_800DACC0.s index 370ed7e447..710a0f345f 100644 --- a/asm/code_800DACC0.s +++ b/asm/code_800DACC0.s @@ -9,10 +9,10 @@ .balign 16 -/* B51E50 800DACB0 00000000 */ nop -/* B51E54 800DACB4 00000000 */ nop -/* B51E58 800DACB8 00000000 */ nop -/* B51E5C 800DACBC 00000000 */ nop +/* B51E50 800DACB0 00000000 */ nop +/* B51E54 800DACB4 00000000 */ nop +/* B51E58 800DACB8 00000000 */ nop +/* B51E5C 800DACBC 00000000 */ nop glabel func_800DACC0 /* B51E60 800DACC0 00067080 */ sll $t6, $a2, 2 /* B51E64 800DACC4 01C67023 */ subu $t6, $t6, $a2 @@ -164,14 +164,14 @@ glabel func_800DACC0 /* B52088 800DAEE8 030E1023 */ subu $v0, $t8, $t6 /* B5208C 800DAEEC 24C60040 */ addiu $a2, $a2, 0x40 /* B52090 800DAEF0 15E00002 */ bnez $t7, .L800DAEFC -/* B52094 800DAEF4 00000000 */ nop +/* B52094 800DAEF4 00000000 */ nop /* B52098 800DAEF8 0007000D */ break 7 .L800DAEFC: /* B5209C 800DAEFC 2401FFFF */ li $at, -1 /* B520A0 800DAF00 15E10004 */ bne $t7, $at, .L800DAF14 /* B520A4 800DAF04 3C018000 */ lui $at, 0x8000 /* B520A8 800DAF08 17210002 */ bne $t9, $at, .L800DAF14 -/* B520AC 800DAF0C 00000000 */ nop +/* B520AC 800DAF0C 00000000 */ nop /* B520B0 800DAF10 0006000D */ break 6 .L800DAF14: /* B520B4 800DAF14 00627823 */ subu $t7, $v1, $v0 @@ -224,14 +224,14 @@ glabel func_800DACC0 /* B52164 800DAFC4 01E93021 */ addu $a2, $t7, $t1 /* B52168 800DAFC8 24C60158 */ addiu $a2, $a2, 0x158 /* B5216C 800DAFCC 15C00002 */ bnez $t6, .L800DAFD8 -/* B52170 800DAFD0 00000000 */ nop +/* B52170 800DAFD0 00000000 */ nop /* B52174 800DAFD4 0007000D */ break 7 .L800DAFD8: /* B52178 800DAFD8 2401FFFF */ li $at, -1 /* B5217C 800DAFDC 15C10004 */ bne $t6, $at, .L800DAFF0 /* B52180 800DAFE0 3C018000 */ lui $at, 0x8000 /* B52184 800DAFE4 17010002 */ bne $t8, $at, .L800DAFF0 -/* B52188 800DAFE8 00000000 */ nop +/* B52188 800DAFE8 00000000 */ nop /* B5218C 800DAFEC 0006000D */ break 6 .L800DAFF0: /* B52190 800DAFF0 00626823 */ subu $t5, $v1, $v0 @@ -255,7 +255,7 @@ glabel func_800DACC0 .L800DB030: /* B521D0 800DB030 27BD0050 */ addiu $sp, $sp, 0x50 /* B521D4 800DB034 03E00008 */ jr $ra -/* B521D8 800DB038 00000000 */ nop +/* B521D8 800DB038 00000000 */ nop glabel func_800DB03C /* B521DC 800DB03C 3C078017 */ lui $a3, %hi(gAudioContext) # $a3, 0x8017 @@ -295,7 +295,7 @@ glabel func_800DB03C /* B52258 800DB0B8 24C60020 */ addiu $a2, $a2, 0x20 .L800DB0BC: /* B5225C 800DB0BC 03E00008 */ jr $ra -/* B52260 800DB0C0 00000000 */ nop +/* B52260 800DB0C0 00000000 */ nop glabel func_800DB0C4 /* B52264 800DB0C4 27BDFFC0 */ addiu $sp, $sp, -0x40 @@ -342,14 +342,14 @@ glabel func_800DB0C4 .L800DB15C: /* B522FC 800DB15C 02D4001A */ div $zero, $s6, $s4 /* B52300 800DB160 16800002 */ bnez $s4, .L800DB16C -/* B52304 800DB164 00000000 */ nop +/* B52304 800DB164 00000000 */ nop /* B52308 800DB168 0007000D */ break 7 .L800DB16C: /* B5230C 800DB16C 2401FFFF */ li $at, -1 /* B52310 800DB170 16810004 */ bne $s4, $at, .L800DB184 /* B52314 800DB174 3C018000 */ lui $at, 0x8000 /* B52318 800DB178 16C10002 */ bne $s6, $at, .L800DB184 -/* B5231C 800DB17C 00000000 */ nop +/* B5231C 800DB17C 00000000 */ nop /* B52320 800DB180 0006000D */ break 6 .L800DB184: /* B52324 800DB184 86A32858 */ lh $v1, 0x2858($s5) @@ -448,7 +448,7 @@ glabel func_800DB2C0 /* B5246C 800DB2CC 24820001 */ addiu $v0, $a0, 1 /* B52470 800DB2D0 004E082A */ slt $at, $v0, $t6 /* B52474 800DB2D4 10200014 */ beqz $at, .L800DB328 -/* B52478 800DB2D8 00000000 */ nop +/* B52478 800DB2D8 00000000 */ nop /* B5247C 800DB2DC 8CCF2894 */ lw $t7, 0x2894($a2) .L800DB2E0: /* B52480 800DB2E0 8CC90014 */ lw $t1, 0x14($a2) @@ -460,7 +460,7 @@ glabel func_800DB2C0 /* B52498 800DB2F8 8C6A0000 */ lw $t2, ($v1) /* B5249C 800DB2FC 000A6040 */ sll $t4, $t2, 1 /* B524A0 800DB300 05800009 */ bltz $t4, .L800DB328 -/* B524A4 800DB304 00000000 */ nop +/* B524A4 800DB304 00000000 */ nop /* B524A8 800DB308 906D0000 */ lbu $t5, ($v1) /* B524AC 800DB30C 24420001 */ addiu $v0, $v0, 1 /* B524B0 800DB310 31AEFF7F */ andi $t6, $t5, 0xff7f @@ -471,7 +471,7 @@ glabel func_800DB2C0 /* B524C4 800DB324 8CCF2894 */ lw $t7, 0x2894($a2) .L800DB328: /* B524C8 800DB328 03E00008 */ jr $ra -/* B524CC 800DB32C 00000000 */ nop +/* B524CC 800DB32C 00000000 */ nop glabel func_800DB330 /* B524D0 800DB330 27BDFFD8 */ addiu $sp, $sp, -0x28 @@ -516,7 +516,7 @@ glabel func_800DB330 /* B52568 800DB3C8 27BD0028 */ addiu $sp, $sp, 0x28 /* B5256C 800DB3CC 00801025 */ move $v0, $a0 /* B52570 800DB3D0 03E00008 */ jr $ra -/* B52574 800DB3D4 00000000 */ nop +/* B52574 800DB3D4 00000000 */ nop glabel func_800DB3D8 /* B52578 800DB3D8 27BDFFD8 */ addiu $sp, $sp, -0x28 @@ -561,7 +561,7 @@ glabel func_800DB3D8 /* B52610 800DB470 27BD0028 */ addiu $sp, $sp, 0x28 /* B52614 800DB474 00801025 */ move $v0, $a0 /* B52618 800DB478 03E00008 */ jr $ra -/* B5261C 800DB47C 00000000 */ nop +/* B5261C 800DB47C 00000000 */ nop glabel func_800DB480 /* B52620 800DB480 3C0E0A00 */ lui $t6, (0x0A000C80 >> 16) # lui $t6, 0xa00 @@ -695,7 +695,7 @@ glabel func_800DB4E4 /* B52810 800DB670 8FB00020 */ lw $s0, 0x20($sp) /* B52814 800DB674 27BD0030 */ addiu $sp, $sp, 0x30 /* B52818 800DB678 03E00008 */ jr $ra -/* B5281C 800DB67C 00000000 */ nop +/* B5281C 800DB67C 00000000 */ nop glabel func_800DB680 /* B52820 800DB680 27BDFFD0 */ addiu $sp, $sp, -0x30 @@ -842,26 +842,26 @@ glabel func_800DB828 /* B52A44 800DB8A4 00094C03 */ sra $t1, $t1, 0x10 /* B52A48 800DB8A8 24630040 */ addiu $v1, $v1, 0x40 /* B52A4C 800DB8AC 15E00002 */ bnez $t7, .L800DB8B8 -/* B52A50 800DB8B0 00000000 */ nop +/* B52A50 800DB8B0 00000000 */ nop /* B52A54 800DB8B4 0007000D */ break 7 .L800DB8B8: /* B52A58 800DB8B8 2401FFFF */ li $at, -1 /* B52A5C 800DB8BC 15E10004 */ bne $t7, $at, .L800DB8D0 /* B52A60 800DB8C0 3C018000 */ lui $at, 0x8000 /* B52A64 800DB8C4 15C10002 */ bne $t6, $at, .L800DB8D0 -/* B52A68 800DB8C8 00000000 */ nop +/* B52A68 800DB8C8 00000000 */ nop /* B52A6C 800DB8CC 0006000D */ break 6 .L800DB8D0: /* B52A70 800DB8D0 846F0010 */ lh $t7, 0x10($v1) /* B52A74 800DB8D4 14400002 */ bnez $v0, .L800DB8E0 -/* B52A78 800DB8D8 00000000 */ nop +/* B52A78 800DB8D8 00000000 */ nop /* B52A7C 800DB8DC 0007000D */ break 7 .L800DB8E0: /* B52A80 800DB8E0 2401FFFF */ li $at, -1 /* B52A84 800DB8E4 14410004 */ bne $v0, $at, .L800DB8F8 /* B52A88 800DB8E8 3C018000 */ lui $at, 0x8000 /* B52A8C 800DB8EC 15A10002 */ bne $t5, $at, .L800DB8F8 -/* B52A90 800DB8F0 00000000 */ nop +/* B52A90 800DB8F0 00000000 */ nop /* B52A94 800DB8F4 0006000D */ break 6 .L800DB8F8: /* B52A98 800DB8F8 012F5021 */ addu $t2, $t1, $t7 @@ -947,7 +947,7 @@ glabel func_800DB828 /* B52BD0 800DBA30 8FB00020 */ lw $s0, 0x20($sp) /* B52BD4 800DBA34 27BD0030 */ addiu $sp, $sp, 0x30 /* B52BD8 800DBA38 03E00008 */ jr $ra -/* B52BDC 800DBA3C 00000000 */ nop +/* B52BDC 800DBA3C 00000000 */ nop glabel func_800DBA40 /* B52BE0 800DBA40 8CCE0270 */ lw $t6, 0x270($a2) @@ -1039,11 +1039,11 @@ glabel func_800DBAE8 /* B52D24 800DBB84 27BD0028 */ addiu $sp, $sp, 0x28 /* B52D28 800DBB88 00801025 */ move $v0, $a0 /* B52D2C 800DBB8C 03E00008 */ jr $ra -/* B52D30 800DBB90 00000000 */ nop +/* B52D30 800DBB90 00000000 */ nop glabel func_800DBB94 /* B52D34 800DBB94 03E00008 */ jr $ra -/* B52D38 800DBB98 00000000 */ nop +/* B52D38 800DBB98 00000000 */ nop glabel func_800DBB9C /* B52D3C 800DBB9C 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff @@ -1057,15 +1057,15 @@ glabel func_800DBB9C glabel func_800DBBBC /* B52D5C 800DBBBC 03E00008 */ jr $ra -/* B52D60 800DBBC0 00000000 */ nop +/* B52D60 800DBBC0 00000000 */ nop glabel func_800DBBC4 /* B52D64 800DBBC4 03E00008 */ jr $ra -/* B52D68 800DBBC8 00000000 */ nop +/* B52D68 800DBBC8 00000000 */ nop glabel func_800DBBCC /* B52D6C 800DBBCC 03E00008 */ jr $ra -/* B52D70 800DBBD0 00000000 */ nop +/* B52D70 800DBBD0 00000000 */ nop glabel func_800DBBD4 /* B52D74 800DBBD4 30AE00FF */ andi $t6, $a1, 0xff @@ -1084,15 +1084,15 @@ glabel func_800DBBD4 glabel func_800DBC08 /* B52DA8 800DBC08 03E00008 */ jr $ra -/* B52DAC 800DBC0C 00000000 */ nop +/* B52DAC 800DBC0C 00000000 */ nop glabel func_800DBC10 /* B52DB0 800DBC10 03E00008 */ jr $ra -/* B52DB4 800DBC14 00000000 */ nop +/* B52DB4 800DBC14 00000000 */ nop glabel func_800DBC18 /* B52DB8 800DBC18 03E00008 */ jr $ra -/* B52DBC 800DBC1C 00000000 */ nop +/* B52DBC 800DBC1C 00000000 */ nop glabel func_800DBC20 /* B52DC0 800DBC20 30AE00FF */ andi $t6, $a1, 0xff @@ -1111,11 +1111,11 @@ glabel func_800DBC20 glabel func_800DBC54 /* B52DF4 800DBC54 03E00008 */ jr $ra -/* B52DF8 800DBC58 00000000 */ nop +/* B52DF8 800DBC58 00000000 */ nop glabel func_800DBC5C /* B52DFC 800DBC5C 03E00008 */ jr $ra -/* B52E00 800DBC60 00000000 */ nop +/* B52E00 800DBC60 00000000 */ nop glabel func_800DBC64 /* B52E04 800DBC64 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff @@ -1132,19 +1132,19 @@ glabel func_800DBC64 glabel func_800DBC90 /* B52E30 800DBC90 03E00008 */ jr $ra -/* B52E34 800DBC94 00000000 */ nop +/* B52E34 800DBC94 00000000 */ nop glabel func_800DBC98 /* B52E38 800DBC98 03E00008 */ jr $ra -/* B52E3C 800DBC9C 00000000 */ nop +/* B52E3C 800DBC9C 00000000 */ nop glabel func_800DBCA0 /* B52E40 800DBCA0 03E00008 */ jr $ra -/* B52E44 800DBCA4 00000000 */ nop +/* B52E44 800DBCA4 00000000 */ nop glabel func_800DBCA8 /* B52E48 800DBCA8 03E00008 */ jr $ra -/* B52E4C 800DBCAC 00000000 */ nop +/* B52E4C 800DBCAC 00000000 */ nop glabel func_800DBCB0 /* B52E50 800DBCB0 30EEFFFF */ andi $t6, $a3, 0xffff @@ -1174,7 +1174,7 @@ glabel func_800DBCD4 glabel func_800DBD08 /* B52EA8 800DBD08 03E00008 */ jr $ra -/* B52EAC 800DBD0C 00000000 */ nop +/* B52EAC 800DBD0C 00000000 */ nop glabel func_800DBD10 /* B52EB0 800DBD10 00067103 */ sra $t6, $a2, 4 @@ -1211,15 +1211,15 @@ glabel func_800DBD60 glabel func_800DBD7C /* B52F1C 800DBD7C 03E00008 */ jr $ra -/* B52F20 800DBD80 00000000 */ nop +/* B52F20 800DBD80 00000000 */ nop glabel func_800DBD84 /* B52F24 800DBD84 03E00008 */ jr $ra -/* B52F28 800DBD88 00000000 */ nop +/* B52F28 800DBD88 00000000 */ nop glabel func_800DBD8C /* B52F2C 800DBD8C 03E00008 */ jr $ra -/* B52F30 800DBD90 00000000 */ nop +/* B52F30 800DBD90 00000000 */ nop glabel func_800DBD94 /* B52F34 800DBD94 30AE00FF */ andi $t6, $a1, 0xff @@ -1262,19 +1262,19 @@ glabel func_800DBDE4 glabel func_800DBE18 /* B52FB8 800DBE18 03E00008 */ jr $ra -/* B52FBC 800DBE1C 00000000 */ nop +/* B52FBC 800DBE1C 00000000 */ nop glabel func_800DBE20 /* B52FC0 800DBE20 03E00008 */ jr $ra -/* B52FC4 800DBE24 00000000 */ nop +/* B52FC4 800DBE24 00000000 */ nop glabel func_800DBE28 /* B52FC8 800DBE28 03E00008 */ jr $ra -/* B52FCC 800DBE2C 00000000 */ nop +/* B52FCC 800DBE2C 00000000 */ nop glabel func_800DBE30 /* B52FD0 800DBE30 03E00008 */ jr $ra -/* B52FD4 800DBE34 00000000 */ nop +/* B52FD4 800DBE34 00000000 */ nop glabel func_800DBE38 /* B52FD8 800DBE38 30EEFFFF */ andi $t6, $a3, 0xffff @@ -1289,15 +1289,15 @@ glabel func_800DBE38 glabel func_800DBE5C /* B52FFC 800DBE5C 03E00008 */ jr $ra -/* B53000 800DBE60 00000000 */ nop +/* B53000 800DBE60 00000000 */ nop glabel func_800DBE64 /* B53004 800DBE64 03E00008 */ jr $ra -/* B53008 800DBE68 00000000 */ nop +/* B53008 800DBE68 00000000 */ nop glabel func_800DBE6C /* B5300C 800DBE6C 03E00008 */ jr $ra -/* B53010 800DBE70 00000000 */ nop +/* B53010 800DBE70 00000000 */ nop glabel func_800DBE74 /* B53014 800DBE74 30AE00FF */ andi $t6, $a1, 0xff @@ -1362,7 +1362,7 @@ glabel func_800DBEB0 /* B530EC 800DBF4C 27BD0028 */ addiu $sp, $sp, 0x28 /* B530F0 800DBF50 00801025 */ move $v0, $a0 /* B530F4 800DBF54 03E00008 */ jr $ra -/* B530F8 800DBF58 00000000 */ nop +/* B530F8 800DBF58 00000000 */ nop glabel func_800DBF5C /* B530FC 800DBF5C 27BDFFD8 */ addiu $sp, $sp, -0x28 @@ -1408,7 +1408,7 @@ glabel func_800DBF5C /* B53198 800DBFF8 27BD0028 */ addiu $sp, $sp, 0x28 /* B5319C 800DBFFC 00801025 */ move $v0, $a0 /* B531A0 800DC000 03E00008 */ jr $ra -/* B531A4 800DC004 00000000 */ nop +/* B531A4 800DC004 00000000 */ nop glabel func_800DC008 /* B531A8 800DC008 00074103 */ sra $t0, $a3, 4 @@ -1497,14 +1497,14 @@ glabel func_800DC124 /* B532DC 800DC13C 15C10004 */ bne $t6, $at, .L800DC150 /* B532E0 800DC140 00073C03 */ sra $a3, $a3, 0x10 /* B532E4 800DC144 0C036FD7 */ jal func_800DBF5C -/* B532E8 800DC148 00000000 */ nop +/* B532E8 800DC148 00000000 */ nop /* B532EC 800DC14C 00402025 */ move $a0, $v0 .L800DC150: /* B532F0 800DC150 8FBF0014 */ lw $ra, 0x14($sp) /* B532F4 800DC154 27BD0018 */ addiu $sp, $sp, 0x18 /* B532F8 800DC158 00801025 */ move $v0, $a0 /* B532FC 800DC15C 03E00008 */ jr $ra -/* B53300 800DC160 00000000 */ nop +/* B53300 800DC160 00000000 */ nop glabel func_800DC164 /* B53304 800DC164 27BDFFE0 */ addiu $sp, $sp, -0x20 @@ -1519,9 +1519,9 @@ glabel func_800DC164 /* B53328 800DC188 00808025 */ move $s0, $a0 /* B5332C 800DC18C 90CF0018 */ lbu $t7, 0x18($a2) /* B53330 800DC190 11E00005 */ beqz $t7, .L800DC1A8 -/* B53334 800DC194 00000000 */ nop +/* B53334 800DC194 00000000 */ nop /* B53338 800DC198 0C036E0A */ jal func_800DB828 -/* B5333C 800DC19C 00000000 */ nop +/* B5333C 800DC19C 00000000 */ nop /* B53340 800DC1A0 10000008 */ b .L800DC1C4 /* B53344 800DC1A4 00408025 */ move $s0, $v0 .L800DC1A8: @@ -1569,7 +1569,7 @@ glabel func_800DC1D8 /* B533DC 800DC23C 51200006 */ beql $t1, $zero, .L800DC258 /* B533E0 800DC240 9466000E */ lhu $a2, 0xe($v1) /* B533E4 800DC244 0C036DA0 */ jal func_800DB680 -/* B533E8 800DC248 00000000 */ nop +/* B533E8 800DC248 00000000 */ nop /* B533EC 800DC24C 1000001C */ b .L800DC2C0 /* B533F0 800DC250 00408025 */ move $s0, $v0 /* B533F4 800DC254 9466000E */ lhu $a2, 0xe($v1) @@ -1654,7 +1654,7 @@ glabel func_800DC2DC /* B53514 800DC374 27BD0028 */ addiu $sp, $sp, 0x28 /* B53518 800DC378 00801025 */ move $v0, $a0 /* B5351C 800DC37C 03E00008 */ jr $ra -/* B53520 800DC380 00000000 */ nop +/* B53520 800DC380 00000000 */ nop glabel func_800DC384 /* B53524 800DC384 27BDFF08 */ addiu $sp, $sp, -0xf8 @@ -1741,7 +1741,7 @@ glabel func_800DC384 /* B53648 800DC4A8 0014A403 */ sra $s4, $s4, 0x10 /* B5364C 800DC4AC 0289082A */ slt $at, $s4, $t1 /* B53650 800DC4B0 1420FFE4 */ bnez $at, .L800DC444 -/* B53654 800DC4B4 00000000 */ nop +/* B53654 800DC4B4 00000000 */ nop /* B53658 800DC4B8 0000A025 */ move $s4, $zero .L800DC4BC: /* B5365C 800DC4BC 27A4009C */ addiu $a0, $sp, 0x9c @@ -1843,7 +1843,7 @@ glabel func_800DC384 /* B537C8 800DC628 26730008 */ addiu $s3, $s3, 8 /* B537CC 800DC62C 02602025 */ move $a0, $s3 /* B537D0 800DC630 17200004 */ bnez $t9, .L800DC644 -/* B537D4 800DC634 00000000 */ nop +/* B537D4 800DC634 00000000 */ nop /* B537D8 800DC638 860C0012 */ lh $t4, 0x12($s0) /* B537DC 800DC63C 51800005 */ beql $t4, $zero, .L800DC654 /* B537E0 800DC640 8FAD007C */ lw $t5, 0x7c($sp) @@ -2188,7 +2188,7 @@ glabel func_800DC910 /* B53CD0 800DCB30 10E00003 */ beqz $a3, .L800DCB40 /* B53CD4 800DCB34 24010003 */ li $at, 3 /* B53CD8 800DCB38 14E1002C */ bne $a3, $at, .L800DCBEC -/* B53CDC 800DCB3C 00000000 */ nop +/* B53CDC 800DCB3C 00000000 */ nop .L800DCB40: /* B53CE0 800DCB40 8FAE0150 */ lw $t6, 0x150($sp) /* B53CE4 800DCB44 3C188017 */ lui $t8, %hi(D_8016F190) # $t8, 0x8017 @@ -2198,16 +2198,16 @@ glabel func_800DC910 /* B53CF4 800DCB54 24010001 */ li $at, 1 /* B53CF8 800DCB58 24420008 */ addiu $v0, $v0, 8 /* B53CFC 800DCB5C 13020023 */ beq $t8, $v0, .L800DCBEC -/* B53D00 800DCB60 00000000 */ nop +/* B53D00 800DCB60 00000000 */ nop /* B53D04 800DCB64 11E10008 */ beq $t7, $at, .L800DCB88 /* B53D08 800DCB68 3C0C8013 */ lui $t4, %hi(D_8012FBAA) # $t4, 0x8013 /* B53D0C 800DCB6C 24010002 */ li $at, 2 /* B53D10 800DCB70 11E10009 */ beq $t7, $at, .L800DCB98 /* B53D14 800DCB74 24010003 */ li $at, 3 /* B53D18 800DCB78 11E10007 */ beq $t7, $at, .L800DCB98 -/* B53D1C 800DCB7C 00000000 */ nop +/* B53D1C 800DCB7C 00000000 */ nop /* B53D20 800DCB80 10000005 */ b .L800DCB98 -/* B53D24 800DCB84 00000000 */ nop +/* B53D24 800DCB84 00000000 */ nop .L800DCB88: /* B53D28 800DCB88 258CFBAA */ addiu $t4, %lo(D_8012FBAA) # addiu $t4, $t4, -0x456 /* B53D2C 800DCB8C 3C018017 */ lui $at, %hi(D_8016F190) # $at, 0x8017 @@ -2306,7 +2306,7 @@ glabel func_800DC910 /* B53E74 800DCCD4 002F0821 */ addu $at, $at, $t7 /* B53E78 800DCCD8 8C2F93D0 */ lw $t7, %lo(jtbl_801493D0)($at) /* B53E7C 800DCCDC 01E00008 */ jr $t7 -/* B53E80 800DCCE0 00000000 */ nop +/* B53E80 800DCCE0 00000000 */ nop glabel L800DCCE4 /* B53E84 800DCCE4 240C0010 */ li $t4, 16 /* B53E88 800DCCE8 240A0009 */ li $t2, 9 @@ -2383,7 +2383,7 @@ glabel L800DCDA0 /* B53F88 800DCDE8 032D2821 */ addu $a1, $t9, $t5 .L800DCDEC: /* B53F8C 800DCDEC 14410003 */ bne $v0, $at, .L800DCDFC -/* B53F90 800DCDF0 00000000 */ nop +/* B53F90 800DCDF0 00000000 */ nop /* B53F94 800DCDF4 10000201 */ b .L800DD5FC /* B53F98 800DCDF8 02401025 */ move $v0, $s2 .L800DCDFC: @@ -2410,7 +2410,7 @@ glabel L800DCDA0 /* B53FEC 800DCE4C 00402825 */ move $a1, $v0 .L800DCE50: /* B53FF0 800DCE50 14A00003 */ bnez $a1, .L800DCE60 -/* B53FF4 800DCE54 00000000 */ nop +/* B53FF4 800DCE54 00000000 */ nop /* B53FF8 800DCE58 100001E8 */ b .L800DD5FC /* B53FFC 800DCE5C 02401025 */ move $v0, $s2 .L800DCE60: @@ -2470,9 +2470,9 @@ glabel L800DCDA0 /* B540C0 800DCF20 10E10042 */ beq $a3, $at, .L800DD02C /* B540C4 800DCF24 24010003 */ li $at, 3 /* B540C8 800DCF28 10E10021 */ beq $a3, $at, .L800DCFB0 -/* B540CC 800DCF2C 00000000 */ nop +/* B540CC 800DCF2C 00000000 */ nop /* B540D0 800DCF30 10000059 */ b .L800DD098 -/* B540D4 800DCF34 00000000 */ nop +/* B540D4 800DCF34 00000000 */ nop .L800DCF38: /* B540D8 800DCF38 022A0019 */ multu $s1, $t2 /* B540DC 800DCF3C 240F0940 */ li $t7, 2368 @@ -2910,11 +2910,11 @@ glabel L800DCDA0 /* B5470C 800DD56C 92CC0004 */ lbu $t4, 4($s6) .L800DD570: /* B54710 800DD570 15800005 */ bnez $t4, .L800DD588 -/* B54714 800DD574 00000000 */ nop +/* B54714 800DD574 00000000 */ nop /* B54718 800DD578 922F0003 */ lbu $t7, 3($s1) /* B5471C 800DD57C 00008025 */ move $s0, $zero /* B54720 800DD580 11E00003 */ beqz $t7, .L800DD590 -/* B54724 800DD584 00000000 */ nop +/* B54724 800DD584 00000000 */ nop .L800DD588: /* B54728 800DD588 10000001 */ b .L800DD590 /* B5472C 800DD58C 24100002 */ li $s0, 2 @@ -3031,14 +3031,14 @@ glabel func_800DD6CC /* B548C0 800DD720 00003812 */ mflo $a3 /* B548C4 800DD724 00073C00 */ sll $a3, $a3, 0x10 /* B548C8 800DD728 14400002 */ bnez $v0, .L800DD734 -/* B548CC 800DD72C 00000000 */ nop +/* B548CC 800DD72C 00000000 */ nop /* B548D0 800DD730 0007000D */ break 7 .L800DD734: /* B548D4 800DD734 2401FFFF */ li $at, -1 /* B548D8 800DD738 14410004 */ bne $v0, $at, .L800DD74C /* B548DC 800DD73C 3C018000 */ lui $at, 0x8000 /* B548E0 800DD740 15C10002 */ bne $t6, $at, .L800DD74C -/* B548E4 800DD744 00000000 */ nop +/* B548E4 800DD744 00000000 */ nop /* B548E8 800DD748 0006000D */ break 6 .L800DD74C: /* B548EC 800DD74C 00073C03 */ sra $a3, $a3, 0x10 @@ -3057,14 +3057,14 @@ glabel func_800DD6CC /* B54918 800DD778 00004012 */ mflo $t0 /* B5491C 800DD77C 00084400 */ sll $t0, $t0, 0x10 /* B54920 800DD780 14400002 */ bnez $v0, .L800DD78C -/* B54924 800DD784 00000000 */ nop +/* B54924 800DD784 00000000 */ nop /* B54928 800DD788 0007000D */ break 7 .L800DD78C: /* B5492C 800DD78C 2401FFFF */ li $at, -1 /* B54930 800DD790 14410004 */ bne $v0, $at, .L800DD7A4 /* B54934 800DD794 3C018000 */ lui $at, 0x8000 /* B54938 800DD798 15E10002 */ bne $t7, $at, .L800DD7A4 -/* B5493C 800DD79C 00000000 */ nop +/* B5493C 800DD79C 00000000 */ nop /* B54940 800DD7A0 0006000D */ break 6 .L800DD7A4: /* B54944 800DD7A4 00084403 */ sra $t0, $t0, 0x10 @@ -3085,19 +3085,19 @@ glabel func_800DD6CC /* B54978 800DD7D8 00007812 */ mflo $t7 /* B5497C 800DD7DC A7AF0052 */ sh $t7, 0x52($sp) /* B54980 800DD7E0 14400002 */ bnez $v0, .L800DD7EC -/* B54984 800DD7E4 00000000 */ nop +/* B54984 800DD7E4 00000000 */ nop /* B54988 800DD7E8 0007000D */ break 7 .L800DD7EC: /* B5498C 800DD7EC 2401FFFF */ li $at, -1 /* B54990 800DD7F0 14410004 */ bne $v0, $at, .L800DD804 /* B54994 800DD7F4 3C018000 */ lui $at, 0x8000 /* B54998 800DD7F8 15C10002 */ bne $t6, $at, .L800DD804 -/* B5499C 800DD7FC 00000000 */ nop +/* B5499C 800DD7FC 00000000 */ nop /* B549A0 800DD800 0006000D */ break 6 .L800DD804: /* B549A4 800DD804 A0CA0004 */ sb $t2, 4($a2) /* B549A8 800DD808 10000002 */ b .L800DD814 -/* B549AC 800DD80C 00000000 */ nop +/* B549AC 800DD80C 00000000 */ nop .L800DD810: /* B549B0 800DD810 A7A00052 */ sh $zero, 0x52($sp) .L800DD814: @@ -3240,12 +3240,12 @@ glabel func_800DD9F4 /* B54BBC 800DDA1C 8CC30008 */ lw $v1, 8($a2) /* B54BC0 800DDA20 00073040 */ sll $a2, $a3, 1 /* B54BC4 800DDA24 24C6000F */ addiu $a2, $a2, 0xf -/* B54BC8 800DDA28 3C078013 */ lui $a3, %hi(D_8012F0B0) # $a3, 0x8013 +/* B54BC8 800DDA28 3C078013 */ lui $a3, %hi(gWaveSamples+0x18) # $a3, 0x8013 /* B54BCC 800DDA2C 02002025 */ move $a0, $s0 /* B54BD0 800DDA30 2401FFF0 */ li $at, -16 /* B54BD4 800DDA34 00C13024 */ and $a2, $a2, $at /* B54BD8 800DDA38 26100008 */ addiu $s0, $s0, 8 -/* B54BDC 800DDA3C 8CE7F0B0 */ lw $a3, %lo(D_8012F0B0)($a3) +/* B54BDC 800DDA3C 8CE7F0B0 */ lw $a3, %lo(gWaveSamples+0x20)($a3) /* B54BE0 800DDA40 0C036F44 */ jal func_800DBD10 /* B54BE4 800DDA44 24050580 */ li $a1, 1408 /* B54BE8 800DDA48 3C038013 */ lui $v1, %hi(gWaveSamples) # $v1, 0x8013 @@ -3276,19 +3276,19 @@ glabel func_800DD9F4 /* B54C48 800DDAA8 00780019 */ multu $v1, $t8 /* B54C4C 800DDAAC 914B0000 */ lbu $t3, ($t2) /* B54C50 800DDAB0 00004812 */ mflo $t1 -/* B54C54 800DDAB4 00000000 */ nop -/* B54C58 800DDAB8 00000000 */ nop +/* B54C54 800DDAB4 00000000 */ nop +/* B54C58 800DDAB8 00000000 */ nop /* B54C5C 800DDABC 012B001A */ div $zero, $t1, $t3 /* B54C60 800DDAC0 00001812 */ mflo $v1 /* B54C64 800DDAC4 15600002 */ bnez $t3, .L800DDAD0 -/* B54C68 800DDAC8 00000000 */ nop +/* B54C68 800DDAC8 00000000 */ nop /* B54C6C 800DDACC 0007000D */ break 7 .L800DDAD0: /* B54C70 800DDAD0 2401FFFF */ li $at, -1 /* B54C74 800DDAD4 15610004 */ bne $t3, $at, .L800DDAE8 /* B54C78 800DDAD8 3C018000 */ lui $at, 0x8000 /* B54C7C 800DDADC 15210002 */ bne $t1, $at, .L800DDAE8 -/* B54C80 800DDAE0 00000000 */ nop +/* B54C80 800DDAE0 00000000 */ nop /* B54C84 800DDAE4 0006000D */ break 6 .L800DDAE8: /* B54C88 800DDAE8 8FAD002C */ lw $t5, 0x2c($sp) @@ -3324,7 +3324,7 @@ glabel func_800DD9F4 /* B54CF4 800DDB54 8FB00018 */ lw $s0, 0x18($sp) /* B54CF8 800DDB58 27BD0020 */ addiu $sp, $sp, 0x20 /* B54CFC 800DDB5C 03E00008 */ jr $ra -/* B54D00 800DDB60 00000000 */ nop +/* B54D00 800DDB60 00000000 */ nop glabel func_800DDB64 /* B54D04 800DDB64 8FAE0014 */ lw $t6, 0x14($sp) @@ -3390,14 +3390,14 @@ glabel func_800DDB64 .L800DDC3C: /* B54DDC 800DDC3C 030D001A */ div $zero, $t8, $t5 /* B54DE0 800DDC40 15A00002 */ bnez $t5, .L800DDC4C -/* B54DE4 800DDC44 00000000 */ nop +/* B54DE4 800DDC44 00000000 */ nop /* B54DE8 800DDC48 0007000D */ break 7 .L800DDC4C: /* B54DEC 800DDC4C 2401FFFF */ li $at, -1 /* B54DF0 800DDC50 15A10004 */ bne $t5, $at, .L800DDC64 /* B54DF4 800DDC54 3C018000 */ lui $at, 0x8000 /* B54DF8 800DDC58 17010002 */ bne $t8, $at, .L800DDC64 -/* B54DFC 800DDC5C 00000000 */ nop +/* B54DFC 800DDC5C 00000000 */ nop /* B54E00 800DDC60 0006000D */ break 6 .L800DDC64: /* B54E04 800DDC64 00007012 */ mflo $t6 @@ -3514,4 +3514,4 @@ glabel func_800DDB64 /* B54FA8 800DDE08 AC980004 */ sw $t8, 4($a0) /* B54FAC 800DDE0C 24820008 */ addiu $v0, $a0, 8 /* B54FB0 800DDE10 03E00008 */ jr $ra -/* B54FB4 800DDE14 00000000 */ nop +/* B54FB4 800DDE14 00000000 */ nop diff --git a/asm/code_800E11F0.s b/asm/code_800E11F0.s index f99de7610a..98295a83d1 100644 --- a/asm/code_800E11F0.s +++ b/asm/code_800E11F0.s @@ -47,7 +47,7 @@ glabel func_800E11F0 /* B5840C 800E126C 00032100 */ sll $a0, $v1, 4 /* B58410 800E1270 006C082B */ sltu $at, $v1, $t4 /* B58414 800E1274 10200017 */ beqz $at, .L800E12D4 -/* B58418 800E1278 00000000 */ nop +/* B58418 800E1278 00000000 */ nop /* B5841C 800E127C 8CCD261C */ lw $t5, 0x261c($a2) .L800E1280: /* B58420 800E1280 008D1821 */ addu $v1, $a0, $t5 @@ -173,7 +173,7 @@ glabel func_800E12DC /* B585D4 800E1434 912F282F */ lbu $t7, 0x282f($t1) /* B585D8 800E1438 8FAD0058 */ lw $t5, 0x58($sp) /* B585DC 800E143C 11E2000B */ beq $t7, $v0, .L800E146C -/* B585E0 800E1440 00000000 */ nop +/* B585E0 800E1440 00000000 */ nop /* B585E4 800E1444 11A00009 */ beqz $t5, .L800E146C /* B585E8 800E1448 01227021 */ addu $t6, $t1, $v0 /* B585EC 800E144C 91CA272C */ lbu $t2, 0x272c($t6) @@ -186,7 +186,7 @@ glabel func_800E12DC /* B58608 800E1468 032C4021 */ addu $t0, $t9, $t4 .L800E146C: /* B5860C 800E146C 10000030 */ b .L800E1530 -/* B58610 800E1470 00000000 */ nop +/* B58610 800E1470 00000000 */ nop /* B58614 800E1474 8D25261C */ lw $a1, 0x261c($t1) .L800E1478: /* B58618 800E1478 00027900 */ sll $t7, $v0, 4 @@ -324,7 +324,7 @@ glabel func_800E1618 /* B58800 800E1660 00002812 */ mflo $a1 /* B58804 800E1664 AE4E288C */ sw $t6, 0x288c($s2) /* B58808 800E1668 0C0378F7 */ jal func_800DE3DC -/* B5880C 800E166C 00000000 */ nop +/* B5880C 800E166C 00000000 */ nop /* B58810 800E1670 8E492894 */ lw $t1, 0x2894($s2) /* B58814 800E1674 864B2848 */ lh $t3, 0x2848($s2) /* B58818 800E1678 AE42261C */ sw $v0, 0x261c($s2) @@ -499,7 +499,7 @@ glabel func_800E18B0 /* B58A74 800E18D4 91CE25E8 */ lbu $t6, %lo(D_801725E8)($t6) /* B58A78 800E18D8 29C10002 */ slti $at, $t6, 2 /* B58A7C 800E18DC 14200003 */ bnez $at, .L800E18EC -/* B58A80 800E18E0 00000000 */ nop +/* B58A80 800E18E0 00000000 */ nop /* B58A84 800E18E4 1000000C */ b .L800E1918 /* B58A88 800E18E8 24020001 */ li $v0, 1 .L800E18EC: @@ -511,14 +511,14 @@ glabel func_800E18B0 /* B58AA0 800E1900 00001025 */ move $v0, $zero /* B58AA4 800E1904 29E10002 */ slti $at, $t7, 2 /* B58AA8 800E1908 14200003 */ bnez $at, .L800E1918 -/* B58AAC 800E190C 00000000 */ nop +/* B58AAC 800E190C 00000000 */ nop /* B58AB0 800E1910 10000001 */ b .L800E1918 /* B58AB4 800E1914 24020001 */ li $v0, 1 .L800E1918: /* B58AB8 800E1918 8FBF0014 */ lw $ra, 0x14($sp) /* B58ABC 800E191C 27BD0018 */ addiu $sp, $sp, 0x18 /* B58AC0 800E1920 03E00008 */ jr $ra -/* B58AC4 800E1924 00000000 */ nop +/* B58AC4 800E1924 00000000 */ nop glabel func_800E1928 /* B58AC8 800E1928 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -534,7 +534,7 @@ glabel func_800E1928 /* B58AEC 800E194C 91CE2618 */ lbu $t6, %lo(D_80172618)($t6) /* B58AF0 800E1950 29C10002 */ slti $at, $t6, 2 /* B58AF4 800E1954 14200003 */ bnez $at, .L800E1964 -/* B58AF8 800E1958 00000000 */ nop +/* B58AF8 800E1958 00000000 */ nop /* B58AFC 800E195C 1000000C */ b .L800E1990 /* B58B00 800E1960 24020001 */ li $v0, 1 .L800E1964: @@ -546,14 +546,14 @@ glabel func_800E1928 /* B58B18 800E1978 00001025 */ move $v0, $zero /* B58B1C 800E197C 29E10002 */ slti $at, $t7, 2 /* B58B20 800E1980 14200003 */ bnez $at, .L800E1990 -/* B58B24 800E1984 00000000 */ nop +/* B58B24 800E1984 00000000 */ nop /* B58B28 800E1988 10000001 */ b .L800E1990 /* B58B2C 800E198C 24020001 */ li $v0, 1 .L800E1990: /* B58B30 800E1990 8FBF0014 */ lw $ra, 0x14($sp) /* B58B34 800E1994 27BD0018 */ addiu $sp, $sp, 0x18 /* B58B38 800E1998 03E00008 */ jr $ra -/* B58B3C 800E199C 00000000 */ nop +/* B58B3C 800E199C 00000000 */ nop glabel func_800E19A0 /* B58B40 800E19A0 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -569,7 +569,7 @@ glabel func_800E19A0 /* B58B64 800E19C4 91CE25B8 */ lbu $t6, %lo(D_801725B8)($t6) /* B58B68 800E19C8 29C10002 */ slti $at, $t6, 2 /* B58B6C 800E19CC 14200003 */ bnez $at, .L800E19DC -/* B58B70 800E19D0 00000000 */ nop +/* B58B70 800E19D0 00000000 */ nop /* B58B74 800E19D4 1000000C */ b .L800E1A08 /* B58B78 800E19D8 24020001 */ li $v0, 1 .L800E19DC: @@ -581,14 +581,14 @@ glabel func_800E19A0 /* B58B90 800E19F0 00001025 */ move $v0, $zero /* B58B94 800E19F4 29E10002 */ slti $at, $t7, 2 /* B58B98 800E19F8 14200003 */ bnez $at, .L800E1A08 -/* B58B9C 800E19FC 00000000 */ nop +/* B58B9C 800E19FC 00000000 */ nop /* B58BA0 800E1A00 10000001 */ b .L800E1A08 /* B58BA4 800E1A04 24020001 */ li $v0, 1 .L800E1A08: /* B58BA8 800E1A08 8FBF0014 */ lw $ra, 0x14($sp) /* B58BAC 800E1A0C 27BD0018 */ addiu $sp, $sp, 0x18 /* B58BB0 800E1A10 03E00008 */ jr $ra -/* B58BB4 800E1A14 00000000 */ nop +/* B58BB4 800E1A14 00000000 */ nop glabel func_800E1A18 /* B58BB8 800E1A18 240100FF */ li $at, 255 @@ -599,11 +599,11 @@ glabel func_800E1A18 /* B58BCC 800E1A2C 904F3468 */ lbu $t7, 0x3468($v0) /* B58BD0 800E1A30 24010005 */ li $at, 5 /* B58BD4 800E1A34 11E10002 */ beq $t7, $at, .L800E1A40 -/* B58BD8 800E1A38 00000000 */ nop +/* B58BD8 800E1A38 00000000 */ nop /* B58BDC 800E1A3C A0453468 */ sb $a1, 0x3468($v0) .L800E1A40: /* B58BE0 800E1A40 03E00008 */ jr $ra -/* B58BE4 800E1A44 00000000 */ nop +/* B58BE4 800E1A44 00000000 */ nop glabel func_800E1A48 /* B58BE8 800E1A48 240100FF */ li $at, 255 @@ -614,11 +614,11 @@ glabel func_800E1A48 /* B58BFC 800E1A5C 904F3498 */ lbu $t7, 0x3498($v0) /* B58C00 800E1A60 24010005 */ li $at, 5 /* B58C04 800E1A64 11E10002 */ beq $t7, $at, .L800E1A70 -/* B58C08 800E1A68 00000000 */ nop +/* B58C08 800E1A68 00000000 */ nop /* B58C0C 800E1A6C A0453498 */ sb $a1, 0x3498($v0) .L800E1A70: /* B58C10 800E1A70 03E00008 */ jr $ra -/* B58C14 800E1A74 00000000 */ nop +/* B58C14 800E1A74 00000000 */ nop glabel func_800E1A78 /* B58C18 800E1A78 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -632,23 +632,23 @@ glabel func_800E1A78 /* B58C38 800E1A98 24060005 */ li $a2, 5 /* B58C3C 800E1A9C 24010002 */ li $at, 2 /* B58C40 800E1AA0 10C20003 */ beq $a2, $v0, .L800E1AB0 -/* B58C44 800E1AA4 00000000 */ nop +/* B58C44 800E1AA4 00000000 */ nop /* B58C48 800E1AA8 A0653438 */ sb $a1, 0x3438($v1) /* B58C4C 800E1AAC 30A200FF */ andi $v0, $a1, 0xff .L800E1AB0: /* B58C50 800E1AB0 10C20003 */ beq $a2, $v0, .L800E1AC0 -/* B58C54 800E1AB4 00000000 */ nop +/* B58C54 800E1AB4 00000000 */ nop /* B58C58 800E1AB8 54410004 */ bnel $v0, $at, .L800E1ACC /* B58C5C 800E1ABC 8FBF0014 */ lw $ra, 0x14($sp) .L800E1AC0: /* B58C60 800E1AC0 0C0383A4 */ jal func_800E0E90 -/* B58C64 800E1AC4 00000000 */ nop +/* B58C64 800E1AC4 00000000 */ nop .L800E1AC8: /* B58C68 800E1AC8 8FBF0014 */ lw $ra, 0x14($sp) .L800E1ACC: /* B58C6C 800E1ACC 27BD0018 */ addiu $sp, $sp, 0x18 /* B58C70 800E1AD0 03E00008 */ jr $ra -/* B58C74 800E1AD4 00000000 */ nop +/* B58C74 800E1AD4 00000000 */ nop glabel func_800E1AD8 /* B58C78 800E1AD8 240100FF */ li $at, 255 @@ -659,11 +659,11 @@ glabel func_800E1AD8 /* B58C8C 800E1AEC 904F3438 */ lbu $t7, 0x3438($v0) /* B58C90 800E1AF0 24010005 */ li $at, 5 /* B58C94 800E1AF4 11E10002 */ beq $t7, $at, .L800E1B00 -/* B58C98 800E1AF8 00000000 */ nop +/* B58C98 800E1AF8 00000000 */ nop /* B58C9C 800E1AFC A0453438 */ sb $a1, 0x3438($v0) .L800E1B00: /* B58CA0 800E1B00 03E00008 */ jr $ra -/* B58CA4 800E1B04 00000000 */ nop +/* B58CA4 800E1B04 00000000 */ nop glabel func_800E1B08 /* B58CA8 800E1B08 AFA60008 */ sw $a2, 8($sp) @@ -692,7 +692,7 @@ glabel func_800E1B08 /* B58CFC 800E1B5C 24C60010 */ addiu $a2, $a2, 0x10 .L800E1B60: /* B58D00 800E1B60 03E00008 */ jr $ra -/* B58D04 800E1B64 00000000 */ nop +/* B58D04 800E1B64 00000000 */ nop glabel func_800E1B68 /* B58D08 800E1B68 27BDFFC8 */ addiu $sp, $sp, -0x38 @@ -765,13 +765,13 @@ glabel func_800E1C18 /* B58DF8 800E1C58 53000004 */ beql $t8, $zero, .L800E1C6C /* B58DFC 800E1C5C 8FBF0014 */ lw $ra, 0x14($sp) /* B58E00 800E1C60 0C0388B1 */ jal func_800E22C4 -/* B58E04 800E1C64 00000000 */ nop +/* B58E04 800E1C64 00000000 */ nop .L800E1C68: /* B58E08 800E1C68 8FBF0014 */ lw $ra, 0x14($sp) .L800E1C6C: /* B58E0C 800E1C6C 27BD0020 */ addiu $sp, $sp, 0x20 /* B58E10 800E1C70 03E00008 */ jr $ra -/* B58E14 800E1C74 00000000 */ nop +/* B58E14 800E1C74 00000000 */ nop glabel func_800E1C78 /* B58E18 800E1C78 27BDFFD0 */ addiu $sp, $sp, -0x30 @@ -837,7 +837,7 @@ glabel func_800E1C78 /* B58EF4 800E1D54 8FB00020 */ lw $s0, 0x20($sp) /* B58EF8 800E1D58 27BD0030 */ addiu $sp, $sp, 0x30 /* B58EFC 800E1D5C 03E00008 */ jr $ra -/* B58F00 800E1D60 00000000 */ nop +/* B58F00 800E1D60 00000000 */ nop glabel func_800E1D64 /* B58F04 800E1D64 27BDFFD8 */ addiu $sp, $sp, -0x28 @@ -847,7 +847,7 @@ glabel func_800E1D64 /* B58F14 800E1D74 1020001D */ beqz $at, .L800E1DEC /* B58F18 800E1D78 AFBF001C */ sw $ra, 0x1c($sp) /* B58F1C 800E1D7C 0C039D26 */ jal Audio_GetInstrumentInner -/* B58F20 800E1D80 00000000 */ nop +/* B58F20 800E1D80 00000000 */ nop /* B58F24 800E1D84 14400003 */ bnez $v0, .L800E1D94 /* B58F28 800E1D88 00401825 */ move $v1, $v0 /* B58F2C 800E1D8C 10000024 */ b .L800E1E20 @@ -897,7 +897,7 @@ glabel func_800E1D64 /* B58FC4 800E1E24 8FB00018 */ lw $s0, 0x18($sp) /* B58FC8 800E1E28 27BD0028 */ addiu $sp, $sp, 0x28 /* B58FCC 800E1E2C 03E00008 */ jr $ra -/* B58FD0 800E1E30 00000000 */ nop +/* B58FD0 800E1E30 00000000 */ nop glabel func_800E1E34 /* B58FD4 800E1E34 27BDFFE0 */ addiu $sp, $sp, -0x20 @@ -914,7 +914,7 @@ glabel func_800E1E34 /* B58FFC 800E1E5C 8FBF001C */ lw $ra, 0x1c($sp) /* B59000 800E1E60 27BD0020 */ addiu $sp, $sp, 0x20 /* B59004 800E1E64 03E00008 */ jr $ra -/* B59008 800E1E68 00000000 */ nop +/* B59008 800E1E68 00000000 */ nop glabel func_800E1E6C /* B5900C 800E1E6C 27BDFFE0 */ addiu $sp, $sp, -0x20 @@ -933,7 +933,7 @@ glabel func_800E1E6C /* B59040 800E1EA0 8FBF001C */ lw $ra, 0x1c($sp) /* B59044 800E1EA4 27BD0020 */ addiu $sp, $sp, 0x20 /* B59048 800E1EA8 03E00008 */ jr $ra -/* B5904C 800E1EAC 00000000 */ nop +/* B5904C 800E1EAC 00000000 */ nop glabel func_800E1EB0 /* B59050 800E1EB0 27BDFFE0 */ addiu $sp, $sp, -0x20 @@ -952,7 +952,7 @@ glabel func_800E1EB0 /* B59084 800E1EE4 8FBF001C */ lw $ra, 0x1c($sp) /* B59088 800E1EE8 27BD0020 */ addiu $sp, $sp, 0x20 /* B5908C 800E1EEC 03E00008 */ jr $ra -/* B59090 800E1EF0 00000000 */ nop +/* B59090 800E1EF0 00000000 */ nop glabel func_800E1EF4 /* B59094 800E1EF4 27BDFFE0 */ addiu $sp, $sp, -0x20 @@ -971,7 +971,7 @@ glabel func_800E1EF4 /* B590C8 800E1F28 8FBF001C */ lw $ra, 0x1c($sp) /* B590CC 800E1F2C 27BD0020 */ addiu $sp, $sp, 0x20 /* B590D0 800E1F30 03E00008 */ jr $ra -/* B590D4 800E1F34 00000000 */ nop +/* B590D4 800E1F34 00000000 */ nop glabel func_800E1F38 /* B590D8 800E1F38 3C068017 */ lui $a2, %hi(gAudioContext) # $a2, 0x8017 @@ -992,7 +992,7 @@ glabel func_800E1F38 /* B5910C 800E1F6C 8CC9283C */ lw $t1, 0x283c($a2) /* B59110 800E1F70 01231021 */ addu $v0, $t1, $v1 /* B59114 800E1F74 03E00008 */ jr $ra -/* B59118 800E1F78 00000000 */ nop +/* B59118 800E1F78 00000000 */ nop glabel func_800E1F7C /* B5911C 800E1F7C 27BDFFD8 */ addiu $sp, $sp, -0x28 @@ -1025,7 +1025,7 @@ glabel func_800E1F7C /* B59184 800E1FE4 0C03813A */ jal func_800E04E8 /* B59188 800E1FE8 00402825 */ move $a1, $v0 /* B5918C 800E1FEC 14400006 */ bnez $v0, .L800E2008 -/* B59190 800E1FF0 00000000 */ nop +/* B59190 800E1FF0 00000000 */ nop /* B59194 800E1FF4 0C03880B */ jal func_800E202C /* B59198 800E1FF8 02002025 */ move $a0, $s0 /* B5919C 800E1FFC 02002025 */ move $a0, $s0 @@ -1060,7 +1060,7 @@ glabel func_800E202C /* B591FC 800E205C 2419FFFF */ li $t9, -1 /* B59200 800E2060 3C018017 */ lui $at, %hi(D_80171DAE) # $at, 0x8017 /* B59204 800E2064 14D80002 */ bne $a2, $t8, .L800E2070 -/* B59208 800E2068 00000000 */ nop +/* B59208 800E2068 00000000 */ nop /* B5920C 800E206C A4391DAE */ sh $t9, %lo(D_80171DAE)($at) .L800E2070: /* B59210 800E2070 3C098017 */ lui $t1, %hi(D_80171CB0) # $t1, 0x8017 @@ -1090,7 +1090,7 @@ glabel func_800E202C /* B59264 800E20C4 8FBF0014 */ lw $ra, 0x14($sp) /* B59268 800E20C8 27BD0018 */ addiu $sp, $sp, 0x18 /* B5926C 800E20CC 03E00008 */ jr $ra -/* B59270 800E20D0 00000000 */ nop +/* B59270 800E20D0 00000000 */ nop glabel func_800E20D4 /* B59274 800E20D4 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 @@ -1114,7 +1114,7 @@ glabel func_800E20D4 /* B592B4 800E2114 8FBF0014 */ lw $ra, 0x14($sp) /* B592B8 800E2118 27BD0018 */ addiu $sp, $sp, 0x18 /* B592BC 800E211C 03E00008 */ jr $ra -/* B592C0 800E2120 00000000 */ nop +/* B592C0 800E2120 00000000 */ nop glabel func_800E2124 /* B592C4 800E2124 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 @@ -1140,7 +1140,7 @@ glabel func_800E2124 /* B5930C 800E216C 8FBF0014 */ lw $ra, 0x14($sp) /* B59310 800E2170 27BD0018 */ addiu $sp, $sp, 0x18 /* B59314 800E2174 03E00008 */ jr $ra -/* B59318 800E2178 00000000 */ nop +/* B59318 800E2178 00000000 */ nop glabel func_800E217C /* B5931C 800E217C 27BDFFD0 */ addiu $sp, $sp, -0x30 @@ -1181,7 +1181,7 @@ glabel func_800E217C /* B593A4 800E2204 91710000 */ lbu $s1, ($t3) /* B593A8 800E2208 26100001 */ addiu $s0, $s0, 1 /* B593AC 800E220C 1A20000A */ blez $s1, .L800E2238 -/* B593B0 800E2210 00000000 */ nop +/* B593B0 800E2210 00000000 */ nop /* B593B4 800E2214 8E6C283C */ lw $t4, 0x283c($s3) .L800E2218: /* B593B8 800E2218 020C6821 */ addu $t5, $s0, $t4 @@ -1254,7 +1254,7 @@ glabel func_800E22C4 /* B594A8 800E2308 8FBF0014 */ lw $ra, 0x14($sp) /* B594AC 800E230C 27BD0028 */ addiu $sp, $sp, 0x28 /* B594B0 800E2310 03E00008 */ jr $ra -/* B594B4 800E2314 00000000 */ nop +/* B594B4 800E2314 00000000 */ nop glabel func_800E2318 /* B594B8 800E2318 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -1264,7 +1264,7 @@ glabel func_800E2318 /* B594C8 800E2328 8FBF0014 */ lw $ra, 0x14($sp) /* B594CC 800E232C 27BD0018 */ addiu $sp, $sp, 0x18 /* B594D0 800E2330 03E00008 */ jr $ra -/* B594D4 800E2334 00000000 */ nop +/* B594D4 800E2334 00000000 */ nop glabel func_800E2338 /* B594D8 800E2338 27BDFFC8 */ addiu $sp, $sp, -0x38 @@ -1343,7 +1343,7 @@ glabel func_800E2338 /* B595E4 800E2444 8FB00018 */ lw $s0, 0x18($sp) /* B595E8 800E2448 27BD0038 */ addiu $sp, $sp, 0x38 /* B595EC 800E244C 03E00008 */ jr $ra -/* B595F0 800E2450 00000000 */ nop +/* B595F0 800E2450 00000000 */ nop glabel func_800E2454 /* B595F4 800E2454 27BDFFB8 */ addiu $sp, $sp, -0x48 @@ -1418,7 +1418,7 @@ glabel func_800E2454 /* B596E8 800E2548 8FBF0014 */ lw $ra, 0x14($sp) /* B596EC 800E254C 27BD0048 */ addiu $sp, $sp, 0x48 /* B596F0 800E2550 03E00008 */ jr $ra -/* B596F4 800E2554 00000000 */ nop +/* B596F4 800E2554 00000000 */ nop glabel func_800E2558 /* B596F8 800E2558 27BDFFB0 */ addiu $sp, $sp, -0x50 @@ -1467,7 +1467,7 @@ glabel func_800E2558 /* B597A0 800E2600 002F0821 */ addu $at, $at, $t7 /* B597A4 800E2604 8C2F9458 */ lw $t7, %lo(jtbl_80149458)($at) /* B597A8 800E2608 01E00008 */ jr $t7 -/* B597AC 800E260C 00000000 */ nop +/* B597AC 800E260C 00000000 */ nop glabel L800E2610 /* B597B0 800E2610 8FA40050 */ lw $a0, 0x50($sp) /* B597B4 800E2614 8FA5002C */ lw $a1, 0x2c($sp) @@ -1532,18 +1532,18 @@ glabel L800E2678 .L800E26EC: /* B5988C 800E26EC 24050002 */ li $a1, 2 /* B59890 800E26F0 15400003 */ bnez $t2, .L800E2700 -/* B59894 800E26F4 00000000 */ nop +/* B59894 800E26F4 00000000 */ nop /* B59898 800E26F8 10000001 */ b .L800E2700 /* B5989C 800E26FC 24050005 */ li $a1, 5 .L800E2700: /* B598A0 800E2700 8FA20050 */ lw $v0, 0x50($sp) /* B598A4 800E2704 24010001 */ li $at, 1 /* B598A8 800E2708 10400007 */ beqz $v0, .L800E2728 -/* B598AC 800E270C 00000000 */ nop +/* B598AC 800E270C 00000000 */ nop /* B598B0 800E2710 10410009 */ beq $v0, $at, .L800E2738 /* B598B4 800E2714 24010002 */ li $at, 2 /* B598B8 800E2718 1041000B */ beq $v0, $at, .L800E2748 -/* B598BC 800E271C 00000000 */ nop +/* B598BC 800E271C 00000000 */ nop /* B598C0 800E2720 1000000C */ b .L800E2754 /* B598C4 800E2724 02001025 */ move $v0, $s0 .L800E2728: @@ -1566,7 +1566,7 @@ glabel L800E2678 /* B598F8 800E2758 8FB00018 */ lw $s0, 0x18($sp) /* B598FC 800E275C 27BD0050 */ addiu $sp, $sp, 0x50 /* B59900 800E2760 03E00008 */ jr $ra -/* B59904 800E2764 00000000 */ nop +/* B59904 800E2764 00000000 */ nop glabel func_800E2768 /* B59908 800E2768 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -1610,7 +1610,7 @@ glabel func_800E27A4 .L800E27EC: /* B5998C 800E27EC 27BD0018 */ addiu $sp, $sp, 0x18 /* B59990 800E27F0 03E00008 */ jr $ra -/* B59994 800E27F4 00000000 */ nop +/* B59994 800E27F4 00000000 */ nop glabel func_800E27F8 /* B59998 800E27F8 10800009 */ beqz $a0, .L800E2820 @@ -1914,7 +1914,7 @@ glabel func_800E2BE0 /* B59DBC 800E2C1C 10610005 */ beq $v1, $at, .L800E2C34 /* B59DC0 800E2C20 24010003 */ li $at, 3 /* B59DC4 800E2C24 10610005 */ beq $v1, $at, .L800E2C3C -/* B59DC8 800E2C28 00000000 */ nop +/* B59DC8 800E2C28 00000000 */ nop /* B59DCC 800E2C2C 1000001D */ b .L800E2CA4 /* B59DD0 800E2C30 00001025 */ move $v0, $zero .L800E2C34: @@ -1947,18 +1947,18 @@ glabel func_800E2BE0 /* B59E30 800E2C90 3C198013 */ lui $t9, %hi(D_801304D0) # $t9, 0x8013 /* B59E34 800E2C94 8F3904D0 */ lw $t9, %lo(D_801304D0)($t9) /* B59E38 800E2C98 0320F809 */ jalr $t9 -/* B59E3C 800E2C9C 00000000 */ nop +/* B59E3C 800E2C9C 00000000 */ nop /* B59E40 800E2CA0 00001025 */ move $v0, $zero .L800E2CA4: /* B59E44 800E2CA4 8FBF001C */ lw $ra, 0x1c($sp) /* B59E48 800E2CA8 8FB00018 */ lw $s0, 0x18($sp) /* B59E4C 800E2CAC 27BD0020 */ addiu $sp, $sp, 0x20 /* B59E50 800E2CB0 03E00008 */ jr $ra -/* B59E54 800E2CB4 00000000 */ nop +/* B59E54 800E2CB4 00000000 */ nop glabel func_800E2CB8 /* B59E58 800E2CB8 03E00008 */ jr $ra -/* B59E5C 800E2CBC 00000000 */ nop +/* B59E5C 800E2CBC 00000000 */ nop glabel func_800E2CC0 /* B59E60 800E2CC0 27BDFFE0 */ addiu $sp, $sp, -0x20 @@ -1968,7 +1968,7 @@ glabel func_800E2CC0 /* B59E70 800E2CD0 8FBF0014 */ lw $ra, 0x14($sp) /* B59E74 800E2CD4 27BD0020 */ addiu $sp, $sp, 0x20 /* B59E78 800E2CD8 03E00008 */ jr $ra -/* B59E7C 800E2CDC 00000000 */ nop +/* B59E7C 800E2CDC 00000000 */ nop glabel func_800E2CE0 /* B59E80 800E2CE0 27BDFFA8 */ addiu $sp, $sp, -0x58 @@ -1995,7 +1995,7 @@ glabel func_800E2CE0 /* B59ED0 800E2D30 91CE2618 */ lbu $t6, %lo(D_80172618)($t6) /* B59ED4 800E2D34 24010001 */ li $at, 1 /* B59ED8 800E2D38 15C10003 */ bne $t6, $at, .L800E2D48 -/* B59EDC 800E2D3C 00000000 */ nop +/* B59EDC 800E2D3C 00000000 */ nop /* B59EE0 800E2D40 100000A5 */ b .L800E2FD8 /* B59EE4 800E2D44 00001025 */ move $v0, $zero .L800E2D48: @@ -2029,7 +2029,7 @@ glabel func_800E2CE0 /* B59F48 800E2DA8 0C000C18 */ jal osSendMesg /* B59F4C 800E2DAC 00052E00 */ sll $a1, $a1, 0x18 /* B59F50 800E2DB0 10000074 */ b .L800E2F84 -/* B59F54 800E2DB4 00000000 */ nop +/* B59F54 800E2DB4 00000000 */ nop .L800E2DB8: /* B59F58 800E2DB8 0C0389FE */ jal func_800E27F8 /* B59F5C 800E2DBC 02002025 */ move $a0, $s0 @@ -2060,7 +2060,7 @@ glabel func_800E2CE0 /* B59FC0 800E2E20 00290821 */ addu $at, $at, $t1 /* B59FC4 800E2E24 8C29946C */ lw $t1, %lo(jtbl_8014946C)($at) /* B59FC8 800E2E28 01200008 */ jr $t1 -/* B59FCC 800E2E2C 00000000 */ nop +/* B59FCC 800E2E2C 00000000 */ nop glabel L800E2E30 /* B59FD0 800E2E30 02002025 */ move $a0, $s0 /* B59FD4 800E2E34 8FA50034 */ lw $a1, 0x34($sp) @@ -2185,7 +2185,7 @@ glabel L800E2EA4 /* B5A17C 800E2FDC 8FB00028 */ lw $s0, 0x28($sp) /* B5A180 800E2FE0 27BD0058 */ addiu $sp, $sp, 0x58 /* B5A184 800E2FE4 03E00008 */ jr $ra -/* B5A188 800E2FE8 00000000 */ nop +/* B5A188 800E2FE8 00000000 */ nop glabel func_800E2FEC /* B5A18C 800E2FEC 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -2199,7 +2199,7 @@ glabel func_800E2FEC /* B5A1AC 800E300C 8FBF0014 */ lw $ra, 0x14($sp) /* B5A1B0 800E3010 27BD0018 */ addiu $sp, $sp, 0x18 /* B5A1B4 800E3014 03E00008 */ jr $ra -/* B5A1B8 800E3018 00000000 */ nop +/* B5A1B8 800E3018 00000000 */ nop glabel func_800E301C /* B5A1BC 800E301C 3C018013 */ lui $at, %hi(D_801304D0) @@ -2265,7 +2265,7 @@ glabel func_800E3094 /* B5A290 800E30F0 10410009 */ beq $v0, $at, .L800E3118 /* B5A294 800E30F4 240F003C */ li $t7, 60 /* B5A298 800E30F8 1000000C */ b .L800E312C -/* B5A29C 800E30FC 00000000 */ nop +/* B5A29C 800E30FC 00000000 */ nop .L800E3100: /* B5A2A0 800E3100 3C018015 */ lui $at, %hi(D_80149480) /* B5A2A4 800E3104 C4249480 */ lwc1 $f4, %lo(D_80149480)($at) @@ -2287,7 +2287,7 @@ glabel func_800E3094 /* B5A2DC 800E313C E6282960 */ swc1 $f8, 0x2960($s1) .L800E3140: /* B5A2E0 800E3140 0C039A06 */ jal func_800E6818 -/* B5A2E4 800E3144 00000000 */ nop +/* B5A2E4 800E3144 00000000 */ nop /* B5A2E8 800E3148 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 /* B5A2EC 800E314C 3C048017 */ lui $a0, %hi(D_8016F186) # $a0, 0x8017 /* B5A2F0 800E3150 2484F186 */ addiu $a0, %lo(D_8016F186) # addiu $a0, $a0, -0xe7a @@ -2604,7 +2604,7 @@ glabel func_800E3414 /* B5A770 800E35D0 8FB00020 */ lw $s0, 0x20($sp) /* B5A774 800E35D4 27BD0030 */ addiu $sp, $sp, 0x30 /* B5A778 800E35D8 03E00008 */ jr $ra -/* B5A77C 800E35DC 00000000 */ nop +/* B5A77C 800E35DC 00000000 */ nop glabel func_800E35E0 /* B5A780 800E35E0 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -2613,9 +2613,9 @@ glabel func_800E35E0 /* B5A78C 800E35EC 10200009 */ beqz $at, .L800E3614 /* B5A790 800E35F0 00A03025 */ move $a2, $a1 /* B5A794 800E35F4 0C039D26 */ jal Audio_GetInstrumentInner -/* B5A798 800E35F8 00000000 */ nop +/* B5A798 800E35F8 00000000 */ nop /* B5A79C 800E35FC 14400003 */ bnez $v0, .L800E360C -/* B5A7A0 800E3600 00000000 */ nop +/* B5A7A0 800E3600 00000000 */ nop /* B5A7A4 800E3604 10000016 */ b .L800E3660 /* B5A7A8 800E3608 00001025 */ move $v0, $zero .L800E360C: @@ -2624,11 +2624,11 @@ glabel func_800E35E0 .L800E3614: /* B5A7B4 800E3614 28C10100 */ slti $at, $a2, 0x100 /* B5A7B8 800E3618 10200009 */ beqz $at, .L800E3640 -/* B5A7BC 800E361C 00000000 */ nop +/* B5A7BC 800E361C 00000000 */ nop /* B5A7C0 800E3620 0C039D5B */ jal Audio_GetDrum /* B5A7C4 800E3624 24C5FF80 */ addiu $a1, $a2, -0x80 /* B5A7C8 800E3628 14400003 */ bnez $v0, .L800E3638 -/* B5A7CC 800E362C 00000000 */ nop +/* B5A7CC 800E362C 00000000 */ nop /* B5A7D0 800E3630 1000000B */ b .L800E3660 /* B5A7D4 800E3634 00001025 */ move $v0, $zero .L800E3638: @@ -2648,11 +2648,11 @@ glabel func_800E35E0 /* B5A800 800E3660 8FBF0014 */ lw $ra, 0x14($sp) /* B5A804 800E3664 27BD0018 */ addiu $sp, $sp, 0x18 /* B5A808 800E3668 03E00008 */ jr $ra -/* B5A80C 800E366C 00000000 */ nop +/* B5A80C 800E366C 00000000 */ nop glabel func_800E3670 /* B5A810 800E3670 03E00008 */ jr $ra -/* B5A814 800E3674 00000000 */ nop +/* B5A814 800E3674 00000000 */ nop glabel func_800E3678 /* B5A818 800E3678 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -2685,7 +2685,7 @@ glabel func_800E3678 .L800E36E0: /* B5A880 800E36E0 27BD0018 */ addiu $sp, $sp, 0x18 /* B5A884 800E36E4 03E00008 */ jr $ra -/* B5A888 800E36E8 00000000 */ nop +/* B5A888 800E36E8 00000000 */ nop glabel func_800E36EC /* B5A88C 800E36EC 27BDFFC8 */ addiu $sp, $sp, -0x38 @@ -2716,7 +2716,7 @@ glabel func_800E36EC /* B5A8EC 800E374C 26040030 */ addiu $a0, $s0, 0x30 /* B5A8F0 800E3750 00002825 */ move $a1, $zero /* B5A8F4 800E3754 126E0003 */ beq $s3, $t6, .L800E3764 -/* B5A8F8 800E3758 00000000 */ nop +/* B5A8F8 800E3758 00000000 */ nop /* B5A8FC 800E375C 0C000CA0 */ jal osRecvMesg /* B5A900 800E3760 02603025 */ move $a2, $s3 .L800E3764: @@ -2743,13 +2743,13 @@ glabel func_800E36EC /* B5A94C 800E37AC 02203025 */ move $a2, $s1 /* B5A950 800E37B0 02002025 */ move $a0, $s0 /* B5A954 800E37B4 16780007 */ bne $s3, $t8, .L800E37D4 -/* B5A958 800E37B8 00000000 */ nop +/* B5A958 800E37B8 00000000 */ nop /* B5A95C 800E37BC 8E040008 */ lw $a0, 8($s0) /* B5A960 800E37C0 8E05000C */ lw $a1, 0xc($s0) /* B5A964 800E37C4 0C038E3E */ jal func_800E38F8 /* B5A968 800E37C8 8E070004 */ lw $a3, 4($s0) /* B5A96C 800E37CC 10000003 */ b .L800E37DC -/* B5A970 800E37D0 00000000 */ nop +/* B5A970 800E37D0 00000000 */ nop .L800E37D4: /* B5A974 800E37D4 0C038E1D */ jal func_800E3874 /* B5A978 800E37D8 02202825 */ move $a1, $s1 @@ -2761,7 +2761,7 @@ glabel func_800E36EC /* B5A988 800E37E8 24060400 */ li $a2, 1024 /* B5A98C 800E37EC 02002025 */ move $a0, $s0 /* B5A990 800E37F0 16790007 */ bne $s3, $t9, .L800E3810 -/* B5A994 800E37F4 00000000 */ nop +/* B5A994 800E37F4 00000000 */ nop /* B5A998 800E37F8 8E040008 */ lw $a0, 8($s0) /* B5A99C 800E37FC 8E05000C */ lw $a1, 0xc($s0) /* B5A9A0 800E3800 0C038E3E */ jal func_800E38F8 @@ -2830,7 +2830,7 @@ glabel func_800E3874 /* B5AA88 800E38E8 8FB00030 */ lw $s0, 0x30($sp) /* B5AA8C 800E38EC 27BD0040 */ addiu $sp, $sp, 0x40 /* B5AA90 800E38F0 03E00008 */ jr $ra -/* B5AA94 800E38F4 00000000 */ nop +/* B5AA94 800E38F4 00000000 */ nop glabel func_800E38F8 /* B5AA98 800E38F8 AFA40000 */ sw $a0, ($sp) @@ -2909,7 +2909,7 @@ glabel func_800E390C /* B5ABA4 800E3A04 8FBF0014 */ lw $ra, 0x14($sp) /* B5ABA8 800E3A08 27BD0018 */ addiu $sp, $sp, 0x18 /* B5ABAC 800E3A0C 03E00008 */ jr $ra -/* B5ABB0 800E3A10 00000000 */ nop +/* B5ABB0 800E3A10 00000000 */ nop glabel func_800E3A14 /* B5ABB4 800E3A14 3C038017 */ lui $v1, %hi(gAudioContext) # $v1, 0x8017 @@ -2924,7 +2924,7 @@ glabel func_800E3A14 /* B5ABD4 800E3A34 1462FFFB */ bne $v1, $v0, .L800E3A24 /* B5ABD8 800E3A38 A0601610 */ sb $zero, 0x1610($v1) /* B5ABDC 800E3A3C 03E00008 */ jr $ra -/* B5ABE0 800E3A40 00000000 */ nop +/* B5ABE0 800E3A40 00000000 */ nop glabel func_800E3A44 /* B5ABE4 800E3A44 27BDFFD0 */ addiu $sp, $sp, -0x30 @@ -2961,7 +2961,7 @@ glabel func_800E3A44 /* B5AC58 800E3AB8 8FBF0024 */ lw $ra, 0x24($sp) /* B5AC5C 800E3ABC 27BD0030 */ addiu $sp, $sp, 0x30 /* B5AC60 800E3AC0 03E00008 */ jr $ra -/* B5AC64 800E3AC4 00000000 */ nop +/* B5AC64 800E3AC4 00000000 */ nop glabel func_800E3AC8 /* B5AC68 800E3AC8 27BDFFE0 */ addiu $sp, $sp, -0x20 @@ -3003,20 +3003,20 @@ glabel func_800E3AC8 /* B5ACE8 800E3B48 AC790014 */ sw $t9, 0x14($v1) .L800E3B4C: /* B5ACEC 800E3B4C 14820003 */ bne $a0, $v0, .L800E3B5C -/* B5ACF0 800E3B50 00000000 */ nop +/* B5ACF0 800E3B50 00000000 */ nop /* B5ACF4 800E3B54 10000014 */ b .L800E3BA8 /* B5ACF8 800E3B58 AC660014 */ sw $a2, 0x14($v1) .L800E3B5C: /* B5ACFC 800E3B5C 00C4001A */ div $zero, $a2, $a0 /* B5AD00 800E3B60 14800002 */ bnez $a0, .L800E3B6C -/* B5AD04 800E3B64 00000000 */ nop +/* B5AD04 800E3B64 00000000 */ nop /* B5AD08 800E3B68 0007000D */ break 7 .L800E3B6C: /* B5AD0C 800E3B6C 2401FFFF */ li $at, -1 /* B5AD10 800E3B70 14810004 */ bne $a0, $at, .L800E3B84 /* B5AD14 800E3B74 3C018000 */ lui $at, 0x8000 /* B5AD18 800E3B78 14C10002 */ bne $a2, $at, .L800E3B84 -/* B5AD1C 800E3B7C 00000000 */ nop +/* B5AD1C 800E3B7C 00000000 */ nop /* B5AD20 800E3B80 0006000D */ break 6 .L800E3B84: /* B5AD24 800E3B84 00001012 */ mflo $v0 @@ -3046,7 +3046,7 @@ glabel func_800E3AC8 /* B5AD7C 800E3BDC 8FBF0014 */ lw $ra, 0x14($sp) /* B5AD80 800E3BE0 27BD0020 */ addiu $sp, $sp, 0x20 /* B5AD84 800E3BE4 03E00008 */ jr $ra -/* B5AD88 800E3BE8 00000000 */ nop +/* B5AD88 800E3BE8 00000000 */ nop glabel func_800E3BEC /* B5AD8C 800E3BEC 3C038017 */ lui $v1, %hi(gAudioContext) # $v1, 0x8017 @@ -3063,7 +3063,7 @@ glabel func_800E3BEC /* B5ADB8 800E3C18 AFB00014 */ sw $s0, 0x14($sp) /* B5ADBC 800E3C1C 8C641D48 */ lw $a0, 0x1d48($v1) /* B5ADC0 800E3C20 1480001D */ bnez $a0, .L800E3C98 -/* B5ADC4 800E3C24 00000000 */ nop +/* B5ADC4 800E3C24 00000000 */ nop /* B5ADC8 800E3C28 1260000E */ beqz $s3, .L800E3C64 /* B5ADCC 800E3C2C 3C108017 */ lui $s0, %hi(D_80170E70) /* B5ADD0 800E3C30 3C108017 */ lui $s0, %hi(D_80170E70) # $s0, 0x8017 @@ -3097,7 +3097,7 @@ glabel func_800E3BEC /* B5AE34 800E3C94 AC641D48 */ sw $a0, 0x1d48($v1) .L800E3C98: /* B5AE38 800E3C98 10800003 */ beqz $a0, .L800E3CA8 -/* B5AE3C 800E3C9C 00000000 */ nop +/* B5AE3C 800E3C9C 00000000 */ nop /* B5AE40 800E3CA0 0C038F44 */ jal func_800E3D10 /* B5AE44 800E3CA4 02602825 */ move $a1, $s3 .L800E3CA8: @@ -3224,7 +3224,7 @@ glabel func_800E3D1C /* B5AFE8 800E3E48 8FB00018 */ lw $s0, 0x18($sp) /* B5AFEC 800E3E4C 27BD0060 */ addiu $sp, $sp, 0x60 /* B5AFF0 800E3E50 03E00008 */ jr $ra -/* B5AFF4 800E3E54 00000000 */ nop +/* B5AFF4 800E3E54 00000000 */ nop glabel func_800E3E58 /* B5AFF8 800E3E58 27BDFFD8 */ addiu $sp, $sp, -0x28 @@ -3242,7 +3242,7 @@ glabel func_800E3E58 .L800E3E88: /* B5B028 800E3E88 24070001 */ li $a3, 1 /* B5B02C 800E3E8C 14E20003 */ bne $a3, $v0, .L800E3E9C -/* B5B030 800E3E90 00000000 */ nop +/* B5B030 800E3E90 00000000 */ nop /* B5B034 800E3E94 10000011 */ b .L800E3EDC /* B5B038 800E3E98 A2000001 */ sb $zero, 1($s0) .L800E3E9C: @@ -3281,13 +3281,13 @@ glabel func_800E3E58 /* B5B0B0 800E3F10 03203025 */ move $a2, $t9 /* B5B0B4 800E3F14 02002025 */ move $a0, $s0 /* B5B0B8 800E3F18 14E80007 */ bne $a3, $t0, .L800E3F38 -/* B5B0BC 800E3F1C 00000000 */ nop +/* B5B0BC 800E3F1C 00000000 */ nop /* B5B0C0 800E3F20 8E040008 */ lw $a0, 8($s0) /* B5B0C4 800E3F24 8E05000C */ lw $a1, 0xc($s0) /* B5B0C8 800E3F28 0C039011 */ jal func_800E4044 /* B5B0CC 800E3F2C 84670002 */ lh $a3, 2($v1) /* B5B0D0 800E3F30 10000003 */ b .L800E3F40 -/* B5B0D4 800E3F34 00000000 */ nop +/* B5B0D4 800E3F34 00000000 */ nop .L800E3F38: /* B5B0D8 800E3F38 0C038FED */ jal func_800E3FB4 /* B5B0DC 800E3F3C 8FA50020 */ lw $a1, 0x20($sp) @@ -3298,7 +3298,7 @@ glabel func_800E3E58 .L800E3F4C: /* B5B0EC 800E3F4C 02002025 */ move $a0, $s0 /* B5B0F0 800E3F50 14E90007 */ bne $a3, $t1, .L800E3F70 -/* B5B0F4 800E3F54 00000000 */ nop +/* B5B0F4 800E3F54 00000000 */ nop /* B5B0F8 800E3F58 8E040008 */ lw $a0, 8($s0) /* B5B0FC 800E3F5C 8E05000C */ lw $a1, 0xc($s0) /* B5B100 800E3F60 0C039011 */ jal func_800E4044 @@ -3325,7 +3325,7 @@ glabel func_800E3E58 /* B5B144 800E3FA4 8FB00018 */ lw $s0, 0x18($sp) /* B5B148 800E3FA8 27BD0028 */ addiu $sp, $sp, 0x28 /* B5B14C 800E3FAC 03E00008 */ jr $ra -/* B5B150 800E3FB0 00000000 */ nop +/* B5B150 800E3FB0 00000000 */ nop glabel func_800E3FB4 /* B5B154 800E3FB4 27BDFFC0 */ addiu $sp, $sp, -0x40 @@ -3363,7 +3363,7 @@ glabel func_800E3FB4 /* B5B1D4 800E4034 8FB00030 */ lw $s0, 0x30($sp) /* B5B1D8 800E4038 27BD0040 */ addiu $sp, $sp, 0x40 /* B5B1DC 800E403C 03E00008 */ jr $ra -/* B5B1E0 800E4040 00000000 */ nop +/* B5B1E0 800E4040 00000000 */ nop glabel func_800E4044 /* B5B1E4 800E4044 AFA40000 */ sw $a0, ($sp) @@ -3391,7 +3391,7 @@ glabel func_800E4058 /* B5B234 800E4094 24040001 */ li $a0, 1 /* B5B238 800E4098 33190001 */ andi $t9, $t8, 1 /* B5B23C 800E409C 1099003C */ beq $a0, $t9, .L800E4190 -/* B5B240 800E40A0 00000000 */ nop +/* B5B240 800E40A0 00000000 */ nop /* B5B244 800E40A4 8C680008 */ lw $t0, 8($v1) /* B5B248 800E40A8 8CC20000 */ lw $v0, ($a2) /* B5B24C 800E40AC 8CC9000C */ lw $t1, 0xc($a2) @@ -3457,7 +3457,7 @@ glabel func_800E4058 /* B5B32C 800E418C AC491768 */ sw $t1, 0x1768($v0) .L800E4190: /* B5B330 800E4190 03E00008 */ jr $ra -/* B5B334 800E4194 00000000 */ nop +/* B5B334 800E4194 00000000 */ nop glabel func_800E4198 /* B5B338 800E4198 27BDFF98 */ addiu $sp, $sp, -0x68 @@ -3525,7 +3525,7 @@ glabel func_800E4198 /* B5B41C 800E427C 52B7002D */ beql $s5, $s7, .L800E4334 /* B5B420 800E4280 8E030000 */ lw $v1, ($s0) /* B5B424 800E4284 10000052 */ b .L800E43D0 -/* B5B428 800E4288 00000000 */ nop +/* B5B428 800E4288 00000000 */ nop .L800E428C: /* B5B42C 800E428C 8E030000 */ lw $v1, ($s0) /* B5B430 800E4290 8E590010 */ lw $t9, 0x10($s2) @@ -3615,7 +3615,7 @@ glabel func_800E4198 /* B5B56C 800E43CC 00408825 */ move $s1, $v0 .L800E43D0: /* B5B570 800E43D0 16200003 */ bnez $s1, .L800E43E0 -/* B5B574 800E43D4 00000000 */ nop +/* B5B574 800E43D4 00000000 */ nop /* B5B578 800E43D8 10000041 */ b .L800E44E0 /* B5B57C 800E43DC 8E641768 */ lw $a0, 0x1768($s3) .L800E43E0: @@ -3853,7 +3853,7 @@ glabel func_800E4590 /* B5B8D4 800E4734 8FB00028 */ lw $s0, 0x28($sp) /* B5B8D8 800E4738 27BD0058 */ addiu $sp, $sp, 0x58 /* B5B8DC 800E473C 03E00008 */ jr $ra -/* B5B8E0 800E4740 00000000 */ nop +/* B5B8E0 800E4740 00000000 */ nop glabel func_800E4744 /* B5B8E4 800E4744 18A0000A */ blez $a1, .L800E4770 @@ -3864,7 +3864,7 @@ glabel func_800E4744 /* B5B8F4 800E4754 8CEE0000 */ lw $t6, ($a3) /* B5B8F8 800E4758 8DCF0004 */ lw $t7, 4($t6) /* B5B8FC 800E475C 106F0004 */ beq $v1, $t7, .L800E4770 -/* B5B900 800E4760 00000000 */ nop +/* B5B900 800E4760 00000000 */ nop /* B5B904 800E4764 24420001 */ addiu $v0, $v0, 1 /* B5B908 800E4768 1445FFFA */ bne $v0, $a1, .L800E4754 /* B5B90C 800E476C 24E70004 */ addiu $a3, $a3, 4 @@ -3988,7 +3988,7 @@ glabel func_800E48C0 /* B5BAAC 800E490C AC6D1768 */ sw $t5, 0x1768($v1) .L800E4910: /* B5BAB0 800E4910 03E00008 */ jr $ra -/* B5BAB4 800E4914 00000000 */ nop +/* B5BAB4 800E4914 00000000 */ nop glabel func_800E4918 /* B5BAB8 800E4918 27BDFF88 */ addiu $sp, $sp, -0x78 @@ -4039,7 +4039,7 @@ glabel func_800E4918 .L800E49C4: /* B5BB64 800E49C4 2401007F */ li $at, 127 /* B5BB68 800E49C8 11A10003 */ beq $t5, $at, .L800E49D8 -/* B5BB6C 800E49CC 00000000 */ nop +/* B5BB6C 800E49CC 00000000 */ nop /* B5BB70 800E49D0 0C039230 */ jal func_800E48C0 /* B5BB74 800E49D4 26040018 */ addiu $a0, $s0, 0x18 .L800E49D8: @@ -4078,7 +4078,7 @@ glabel func_800E4918 /* B5BBE0 800E4A40 10400003 */ beqz $v0, .L800E4A50 /* B5BBE4 800E4A44 00402025 */ move $a0, $v0 /* B5BBE8 800E4A48 0C039230 */ jal func_800E48C0 -/* B5BBEC 800E4A4C 00000000 */ nop +/* B5BBEC 800E4A4C 00000000 */ nop .L800E4A50: /* B5BBF0 800E4A50 8FAA006C */ lw $t2, 0x6c($sp) /* B5BBF4 800E4A54 26520001 */ addiu $s2, $s2, 1 @@ -4129,7 +4129,7 @@ glabel func_800E4918 /* B5BC98 800E4AF8 52A10020 */ beql $s5, $at, .L800E4B7C /* B5BC9C 800E4AFC 8E780010 */ lw $t8, 0x10($s3) /* B5BCA0 800E4B00 10000036 */ b .L800E4BDC -/* B5BCA4 800E4B04 00000000 */ nop +/* B5BCA4 800E4B04 00000000 */ nop .L800E4B08: /* B5BCA8 800E4B08 8E6B0010 */ lw $t3, 0x10($s3) /* B5BCAC 800E4B0C 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff @@ -4189,7 +4189,7 @@ glabel func_800E4918 /* B5BD78 800E4BD8 00408825 */ move $s1, $v0 .L800E4BDC: /* B5BD7C 800E4BDC 16200004 */ bnez $s1, .L800E4BF0 -/* B5BD80 800E4BE0 00000000 */ nop +/* B5BD80 800E4BE0 00000000 */ nop /* B5BD84 800E4BE4 8E88176C */ lw $t0, 0x176c($s4) /* B5BD88 800E4BE8 10000041 */ b .L800E4CF0 /* B5BD8C 800E4BEC 8E851768 */ lw $a1, 0x1768($s4) @@ -4398,15 +4398,15 @@ glabel func_800E4D94 glabel func_800E4ED4 /* B5C074 800E4ED4 03E00008 */ jr $ra -/* B5C078 800E4ED8 00000000 */ nop +/* B5C078 800E4ED8 00000000 */ nop glabel func_800E4EDC /* B5C07C 800E4EDC 03E00008 */ jr $ra -/* B5C080 800E4EE0 00000000 */ nop +/* B5C080 800E4EE0 00000000 */ nop glabel func_800E4EE4 /* B5C084 800E4EE4 03E00008 */ jr $ra -/* B5C088 800E4EE8 00000000 */ nop +/* B5C088 800E4EE8 00000000 */ nop glabel func_800E4EEC /* B5C08C 800E4EEC 3C078013 */ lui $a3, %hi(D_801304DC) # $a3, 0x8013 @@ -4436,7 +4436,7 @@ glabel func_800E4EEC /* B5C0E8 800E4F48 8FBF001C */ lw $ra, 0x1c($sp) /* B5C0EC 800E4F4C 27BD0020 */ addiu $sp, $sp, 0x20 /* B5C0F0 800E4F50 03E00008 */ jr $ra -/* B5C0F4 800E4F54 00000000 */ nop +/* B5C0F4 800E4F54 00000000 */ nop glabel func_800E4F58 /* B5C0F8 800E4F58 27BDFFD8 */ addiu $sp, $sp, -0x28 @@ -4462,7 +4462,7 @@ glabel func_800E4F58 .L800E4FA4: /* B5C144 800E4FA4 27BD0028 */ addiu $sp, $sp, 0x28 /* B5C148 800E4FA8 03E00008 */ jr $ra -/* B5C14C 800E4FAC 00000000 */ nop +/* B5C14C 800E4FAC 00000000 */ nop glabel func_800E4FB0 /* B5C150 800E4FB0 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -4476,17 +4476,17 @@ glabel func_800E4FB0 /* B5C170 800E4FD0 8FBF0014 */ lw $ra, 0x14($sp) /* B5C174 800E4FD4 27BD0018 */ addiu $sp, $sp, 0x18 /* B5C178 800E4FD8 03E00008 */ jr $ra -/* B5C17C 800E4FDC 00000000 */ nop +/* B5C17C 800E4FDC 00000000 */ nop glabel func_800E4FE0 /* B5C180 800E4FE0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B5C184 800E4FE4 AFBF0014 */ sw $ra, 0x14($sp) /* B5C188 800E4FE8 0C039400 */ jal func_800E5000 -/* B5C18C 800E4FEC 00000000 */ nop +/* B5C18C 800E4FEC 00000000 */ nop /* B5C190 800E4FF0 8FBF0014 */ lw $ra, 0x14($sp) /* B5C194 800E4FF4 27BD0018 */ addiu $sp, $sp, 0x18 /* B5C198 800E4FF8 03E00008 */ jr $ra -/* B5C19C 800E4FFC 00000000 */ nop +/* B5C19C 800E4FFC 00000000 */ nop glabel func_800E5000 /* B5C1A0 800E5000 27BDFF90 */ addiu $sp, $sp, -0x70 @@ -4504,14 +4504,14 @@ glabel func_800E5000 /* B5C1D0 800E5030 AFB00018 */ sw $s0, 0x18($sp) /* B5C1D4 800E5034 AE4F289C */ sw $t7, 0x289c($s2) /* B5C1D8 800E5038 14600002 */ bnez $v1, .L800E5044 -/* B5C1DC 800E503C 00000000 */ nop +/* B5C1DC 800E503C 00000000 */ nop /* B5C1E0 800E5040 0007000D */ break 7 .L800E5044: /* B5C1E4 800E5044 2401FFFF */ li $at, -1 /* B5C1E8 800E5048 14610004 */ bne $v1, $at, .L800E505C /* B5C1EC 800E504C 3C018000 */ lui $at, 0x8000 /* B5C1F0 800E5050 14E10002 */ bne $a3, $at, .L800E505C -/* B5C1F4 800E5054 00000000 */ nop +/* B5C1F4 800E5054 00000000 */ nop /* B5C1F8 800E5058 0006000D */ break 6 .L800E505C: /* B5C1FC 800E505C 00E02825 */ move $a1, $a3 @@ -4522,7 +4522,7 @@ glabel func_800E5000 /* B5C210 800E5070 50400013 */ beql $v0, $zero, .L800E50C0 /* B5C214 800E5074 24990001 */ addiu $t9, $a0, 1 /* B5C218 800E5078 0040F809 */ jalr $v0 -/* B5C21C 800E507C 00000000 */ nop +/* B5C21C 800E507C 00000000 */ nop /* B5C220 800E5080 3C038017 */ lui $v1, %hi(D_801719C8) # $v1, 0x8017 /* B5C224 800E5084 3C188017 */ lui $t8, %hi(D_80171A1C) # $t8, 0x8017 /* B5C228 800E5088 8F181A1C */ lw $t8, %lo(D_80171A1C)($t8) @@ -4530,14 +4530,14 @@ glabel func_800E5000 /* B5C230 800E5090 0303001A */ div $zero, $t8, $v1 /* B5C234 800E5094 00002010 */ mfhi $a0 /* B5C238 800E5098 14600002 */ bnez $v1, .L800E50A4 -/* B5C23C 800E509C 00000000 */ nop +/* B5C23C 800E509C 00000000 */ nop /* B5C240 800E50A0 0007000D */ break 7 .L800E50A4: /* B5C244 800E50A4 2401FFFF */ li $at, -1 /* B5C248 800E50A8 14610004 */ bne $v1, $at, .L800E50BC /* B5C24C 800E50AC 3C018000 */ lui $at, 0x8000 /* B5C250 800E50B0 17010002 */ bne $t8, $at, .L800E50BC -/* B5C254 800E50B4 00000000 */ nop +/* B5C254 800E50B4 00000000 */ nop /* B5C258 800E50B8 0006000D */ break 6 .L800E50BC: /* B5C25C 800E50BC 24990001 */ addiu $t9, $a0, 1 @@ -4566,31 +4566,31 @@ glabel func_800E5000 /* B5C2AC 800E510C 392A0001 */ xori $t2, $t1, 1 /* B5C2B0 800E5110 AE4A28A4 */ sw $t2, 0x28a4($s2) /* B5C2B4 800E5114 14600002 */ bnez $v1, .L800E5120 -/* B5C2B8 800E5118 00000000 */ nop +/* B5C2B8 800E5118 00000000 */ nop /* B5C2BC 800E511C 0007000D */ break 7 .L800E5120: /* B5C2C0 800E5120 2401FFFF */ li $at, -1 /* B5C2C4 800E5124 14610004 */ bne $v1, $at, .L800E5138 /* B5C2C8 800E5128 3C018000 */ lui $at, 0x8000 /* B5C2CC 800E512C 15A10002 */ bne $t5, $at, .L800E5138 -/* B5C2D0 800E5130 00000000 */ nop +/* B5C2D0 800E5130 00000000 */ nop /* B5C2D4 800E5134 0006000D */ break 6 .L800E5138: /* B5C2D8 800E5138 AE4E28A8 */ sw $t6, 0x28a8($s2) /* B5C2DC 800E513C 01C07825 */ move $t7, $t6 /* B5C2E0 800E5140 14600002 */ bnez $v1, .L800E514C -/* B5C2E4 800E5144 00000000 */ nop +/* B5C2E4 800E5144 00000000 */ nop /* B5C2E8 800E5148 0007000D */ break 7 .L800E514C: /* B5C2EC 800E514C 2401FFFF */ li $at, -1 /* B5C2F0 800E5150 14610004 */ bne $v1, $at, .L800E5164 /* B5C2F4 800E5154 3C018000 */ lui $at, 0x8000 /* B5C2F8 800E5158 17010002 */ bne $t8, $at, .L800E5164 -/* B5C2FC 800E515C 00000000 */ nop +/* B5C2FC 800E515C 00000000 */ nop /* B5C300 800E5160 0006000D */ break 6 .L800E5164: /* B5C304 800E5164 0C041700 */ jal osAiGetLength -/* B5C308 800E5168 00000000 */ nop +/* B5C308 800E5168 00000000 */ nop /* B5C30C 800E516C 8E492984 */ lw $t1, 0x2984($s2) /* B5C310 800E5170 0002C882 */ srl $t9, $v0, 2 /* B5C314 800E5174 AFB9006C */ sw $t9, 0x6c($sp) @@ -4613,7 +4613,7 @@ glabel func_800E5000 /* B5C354 800E51B4 50400004 */ beql $v0, $zero, .L800E51C8 /* B5C358 800E51B8 8E4328A0 */ lw $v1, 0x28a0($s2) /* B5C35C 800E51BC 0040F809 */ jalr $v0 -/* B5C360 800E51C0 00000000 */ nop +/* B5C360 800E51C0 00000000 */ nop /* B5C364 800E51C4 8E4328A0 */ lw $v1, 0x28a0($s2) .L800E51C8: /* B5C368 800E51C8 3C118017 */ lui $s1, %hi(D_80171050) # $s1, 0x8017 @@ -4654,7 +4654,7 @@ glabel func_800E5000 .L800E5244: /* B5C3E4 800E5244 8E431ED8 */ lw $v1, 0x1ed8($s2) /* B5C3E8 800E5248 1060000C */ beqz $v1, .L800E527C -/* B5C3EC 800E524C 00000000 */ nop +/* B5C3EC 800E524C 00000000 */ nop /* B5C3F0 800E5250 1860000A */ blez $v1, .L800E527C /* B5C3F4 800E5254 00008025 */ move $s0, $zero /* B5C3F8 800E5258 02202025 */ move $a0, $s1 @@ -4673,18 +4673,18 @@ glabel func_800E5000 /* B5C424 800E5284 0C038BFB */ jal func_800E2FEC /* B5C428 800E5288 92443518 */ lbu $a0, 0x3518($s2) /* B5C42C 800E528C 0C0393D6 */ jal func_800E4F58 -/* B5C430 800E5290 00000000 */ nop +/* B5C430 800E5290 00000000 */ nop /* B5C434 800E5294 924D3518 */ lbu $t5, 0x3518($s2) /* B5C438 800E5298 51A00011 */ beql $t5, $zero, .L800E52E0 /* B5C43C 800E529C 8E4F2984 */ lw $t7, 0x2984($s2) /* B5C440 800E52A0 0C037E3D */ jal func_800DF8F4 -/* B5C444 800E52A4 00000000 */ nop +/* B5C444 800E52A4 00000000 */ nop /* B5C448 800E52A8 5440000D */ bnezl $v0, .L800E52E0 /* B5C44C 800E52AC 8E4F2984 */ lw $t7, 0x2984($s2) /* B5C450 800E52B0 924E3518 */ lbu $t6, 0x3518($s2) /* B5C454 800E52B4 00003025 */ move $a2, $zero /* B5C458 800E52B8 15C00004 */ bnez $t6, .L800E52CC -/* B5C45C 800E52BC 00000000 */ nop +/* B5C45C 800E52BC 00000000 */ nop /* B5C460 800E52C0 8E445BE4 */ lw $a0, 0x5be4($s2) /* B5C464 800E52C4 0C000C18 */ jal osSendMesg /* B5C468 800E52C8 92453519 */ lbu $a1, 0x3519($s2) @@ -4760,7 +4760,7 @@ glabel func_800E5000 /* B5C568 800E53C8 AFA8003C */ sw $t0, 0x3c($sp) /* B5C56C 800E53CC 2401FFFF */ li $at, -1 /* B5C570 800E53D0 1041000B */ beq $v0, $at, .L800E5400 -/* B5C574 800E53D4 00000000 */ nop +/* B5C574 800E53D4 00000000 */ nop .L800E53D8: /* B5C578 800E53D8 0C03975B */ jal func_800E5D6C /* B5C57C 800E53DC 8FA4004C */ lw $a0, 0x4c($sp) @@ -4771,7 +4771,7 @@ glabel func_800E5000 /* B5C590 800E53F0 26100001 */ addiu $s0, $s0, 1 /* B5C594 800E53F4 2401FFFF */ li $at, -1 /* B5C598 800E53F8 1441FFF7 */ bne $v0, $at, .L800E53D8 -/* B5C59C 800E53FC 00000000 */ nop +/* B5C59C 800E53FC 00000000 */ nop .L800E5400: /* B5C5A0 800E5400 56000007 */ bnezl $s0, .L800E5420 /* B5C5A4 800E5404 8FA8003C */ lw $t0, 0x3c($sp) @@ -4779,7 +4779,7 @@ glabel func_800E5000 /* B5C5AC 800E540C 51200004 */ beql $t1, $zero, .L800E5420 /* B5C5B0 800E5410 8FA8003C */ lw $t0, 0x3c($sp) /* B5C5B4 800E5414 0C0396E0 */ jal func_800E5B80 -/* B5C5B8 800E5418 00000000 */ nop +/* B5C5B8 800E5418 00000000 */ nop /* B5C5BC 800E541C 8FA8003C */ lw $t0, 0x3c($sp) .L800E5420: /* B5C5C0 800E5420 8E4428B4 */ lw $a0, 0x28b4($s2) @@ -4798,7 +4798,7 @@ glabel func_800E5000 /* B5C5F4 800E5454 000FC040 */ sll $t8, $t7, 1 /* B5C5F8 800E5458 3C0F800E */ lui $t7, %hi(func_800E4FE0) # $t7, 0x800e /* B5C5FC 800E545C 25EF4FE0 */ addiu $t7, %lo(func_800E4FE0) # addiu $t7, $t7, 0x4fe0 -/* B5C600 800E5460 3C018013 */ lui $at, %hi(D_8012F0B0) # $at, 0x8013 +/* B5C600 800E5460 3C018013 */ lui $at, %hi(gWaveSamples) # $at, 0x8013 /* B5C604 800E5464 3C068015 */ lui $a2, %hi(D_80155C70) # $a2, 0x8015 /* B5C608 800E5468 3C0A8015 */ lui $t2, %hi(D_80155F50) # $t2, 0x8015 /* B5C60C 800E546C 24C65C70 */ addiu $a2, %lo(D_80155C70) # addiu $a2, $a2, 0x5c70 @@ -4815,7 +4815,7 @@ glabel func_800E5000 /* B5C638 800E5498 316DFFF0 */ andi $t5, $t3, 0xfff0 /* B5C63C 800E549C AE4B297C */ sw $t3, 0x297c($s2) /* B5C640 800E54A0 01AF7021 */ addu $t6, $t5, $t7 -/* B5C644 800E54A4 AC2EF0B0 */ sw $t6, %lo(D_8012F0B0)($at) +/* B5C644 800E54A4 AC2EF0B0 */ sw $t6, %lo(gWaveSamples+0x20)($at) /* B5C648 800E54A8 8E5828B8 */ lw $t8, 0x28b8($s2) /* B5C64C 800E54AC 8E5028A4 */ lw $s0, 0x28a4($s2) /* B5C650 800E54B0 01465823 */ subu $t3, $t2, $a2 @@ -4892,7 +4892,7 @@ glabel func_800E5584 /* B5C758 800E55B8 002E0821 */ addu $at, $at, $t6 /* B5C75C 800E55BC 8C2E9490 */ lw $t6, %lo(jtbl_80149490)($at) /* B5C760 800E55C0 01C00008 */ jr $t6 -/* B5C764 800E55C4 00000000 */ nop +/* B5C764 800E55C4 00000000 */ nop .L800E55C8: /* B5C768 800E55C8 244FFF7F */ addiu $t7, $v0, -0x81 /* B5C76C 800E55CC 2DE10010 */ sltiu $at, $t7, 0x10 @@ -4902,7 +4902,7 @@ glabel func_800E5584 /* B5C77C 800E55DC 002F0821 */ addu $at, $at, $t7 /* B5C780 800E55E0 8C2F950C */ lw $t7, %lo(jtbl_8014950C)($at) /* B5C784 800E55E4 01E00008 */ jr $t7 -/* B5C788 800E55E8 00000000 */ nop +/* B5C788 800E55E8 00000000 */ nop glabel L800E55EC /* B5C78C 800E55EC 92040002 */ lbu $a0, 2($s0) /* B5C790 800E55F0 0C038706 */ jal func_800E1C18 @@ -4942,7 +4942,7 @@ glabel L800E563C /* B5C80C 800E566C 8FBF001C */ lw $ra, 0x1c($sp) /* B5C810 800E5670 8E050004 */ lw $a1, 4($s0) /* B5C814 800E5674 14A00005 */ bnez $a1, .L800E568C -/* B5C818 800E5678 00000000 */ nop +/* B5C818 800E5678 00000000 */ nop /* B5C81C 800E567C 0C03A6D1 */ jal func_800E9B44 /* B5C820 800E5680 24643530 */ addiu $a0, $v1, 0x3530 /* B5C824 800E5684 100000B0 */ b .L800E5948 @@ -4991,7 +4991,7 @@ glabel L800E5700 /* B5C8B8 800E5718 00002825 */ move $a1, $zero /* B5C8BC 800E571C 00002025 */ move $a0, $zero /* B5C8C0 800E5720 18C00019 */ blez $a2, .L800E5788 -/* B5C8C4 800E5724 00000000 */ nop +/* B5C8C4 800E5724 00000000 */ nop .L800E5728: /* B5C8C8 800E5728 8CE9352C */ lw $t1, 0x352c($a3) /* B5C8CC 800E572C 24A50001 */ addiu $a1, $a1, 1 @@ -5152,7 +5152,7 @@ glabel L800E5944 /* B5CAE8 800E5948 8FB00018 */ lw $s0, 0x18($sp) /* B5CAEC 800E594C 27BD0038 */ addiu $sp, $sp, 0x38 /* B5CAF0 800E5950 03E00008 */ jr $ra -/* B5CAF4 800E5954 00000000 */ nop +/* B5CAF4 800E5954 00000000 */ nop glabel func_800E5958 /* B5CAF8 800E5958 14A00002 */ bnez $a1, .L800E5964 @@ -5197,7 +5197,7 @@ glabel func_800E59AC /* B5CB88 800E59E8 E4403550 */ swc1 $f0, 0x3550($v0) .L800E59EC: /* B5CB8C 800E59EC 03E00008 */ jr $ra -/* B5CB90 800E59F0 00000000 */ nop +/* B5CB90 800E59F0 00000000 */ nop glabel func_800E59F4 /* B5CB94 800E59F4 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 @@ -5237,7 +5237,7 @@ glabel func_800E59F4 /* B5CC1C 800E5A7C 8FBF0014 */ lw $ra, 0x14($sp) /* B5CC20 800E5A80 27BD0018 */ addiu $sp, $sp, 0x18 /* B5CC24 800E5A84 03E00008 */ jr $ra -/* B5CC28 800E5A88 00000000 */ nop +/* B5CC28 800E5A88 00000000 */ nop glabel func_800E5A8C /* B5CC2C 800E5A8C 3C068017 */ lui $a2, %hi(gAudioContext) # $a2, 0x8017 @@ -5259,7 +5259,7 @@ glabel func_800E5A8C /* B5CC6C 800E5ACC A0CB5BD8 */ sb $t3, 0x5bd8($a2) .L800E5AD0: /* B5CC70 800E5AD0 03E00008 */ jr $ra -/* B5CC74 800E5AD4 00000000 */ nop +/* B5CC74 800E5AD4 00000000 */ nop glabel func_800E5AD8 /* B5CC78 800E5AD8 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -5270,7 +5270,7 @@ glabel func_800E5AD8 /* B5CC8C 800E5AEC 8FBF0014 */ lw $ra, 0x14($sp) /* B5CC90 800E5AF0 27BD0018 */ addiu $sp, $sp, 0x18 /* B5CC94 800E5AF4 03E00008 */ jr $ra -/* B5CC98 800E5AF8 00000000 */ nop +/* B5CC98 800E5AF8 00000000 */ nop glabel func_800E5AFC /* B5CC9C 800E5AFC 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -5281,7 +5281,7 @@ glabel func_800E5AFC /* B5CCB0 800E5B10 8FBF0014 */ lw $ra, 0x14($sp) /* B5CCB4 800E5B14 27BD0018 */ addiu $sp, $sp, 0x18 /* B5CCB8 800E5B18 03E00008 */ jr $ra -/* B5CCBC 800E5B1C 00000000 */ nop +/* B5CCBC 800E5B1C 00000000 */ nop glabel func_800E5B20 /* B5CCC0 800E5B20 27BDFFE0 */ addiu $sp, $sp, -0x20 @@ -5295,7 +5295,7 @@ glabel func_800E5B20 /* B5CCE0 800E5B40 8FBF0014 */ lw $ra, 0x14($sp) /* B5CCE4 800E5B44 27BD0020 */ addiu $sp, $sp, 0x20 /* B5CCE8 800E5B48 03E00008 */ jr $ra -/* B5CCEC 800E5B4C 00000000 */ nop +/* B5CCEC 800E5B4C 00000000 */ nop glabel func_800E5B50 /* B5CCF0 800E5B50 27BDFFE0 */ addiu $sp, $sp, -0x20 @@ -5309,7 +5309,7 @@ glabel func_800E5B50 /* B5CD10 800E5B70 8FBF0014 */ lw $ra, 0x14($sp) /* B5CD14 800E5B74 27BD0020 */ addiu $sp, $sp, 0x20 /* B5CD18 800E5B78 03E00008 */ jr $ra -/* B5CD1C 800E5B7C 00000000 */ nop +/* B5CD1C 800E5B7C 00000000 */ nop glabel func_800E5B80 /* B5CD20 800E5B80 3C038017 */ lui $v1, %hi(gAudioContext) # $v1, 0x8017 @@ -5350,7 +5350,7 @@ glabel func_800E5B80 /* B5CDA0 800E5C00 8FBF0014 */ lw $ra, 0x14($sp) /* B5CDA4 800E5C04 27BD0018 */ addiu $sp, $sp, 0x18 /* B5CDA8 800E5C08 03E00008 */ jr $ra -/* B5CDAC 800E5C0C 00000000 */ nop +/* B5CDAC 800E5C0C 00000000 */ nop glabel func_800E5C10 /* B5CDB0 800E5C10 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 @@ -5375,7 +5375,7 @@ glabel func_800E5C28 /* B5CDF4 800E5C54 15C10005 */ bne $t6, $at, .L800E5C6C /* B5CDF8 800E5C58 3C058017 */ lui $a1, %hi(gAudioContext) # $a1, 0x8017 /* B5CDFC 800E5C5C 0C039561 */ jal func_800E5584 -/* B5CE00 800E5C60 00000000 */ nop +/* B5CE00 800E5C60 00000000 */ nop /* B5CE04 800E5C64 1000003A */ b .L800E5D50 /* B5CE08 800E5C68 8FBF002C */ lw $ra, 0x2c($sp) .L800E5C6C: @@ -5530,17 +5530,17 @@ glabel func_800E5E20 /* B5D014 800E5E74 8FBF0014 */ lw $ra, 0x14($sp) /* B5D018 800E5E78 27BD0020 */ addiu $sp, $sp, 0x20 /* B5D01C 800E5E7C 03E00008 */ jr $ra -/* B5D020 800E5E80 00000000 */ nop +/* B5D020 800E5E80 00000000 */ nop glabel func_800E5E84 /* B5D024 800E5E84 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B5D028 800E5E88 AFBF0014 */ sw $ra, 0x14($sp) /* B5D02C 800E5E8C 0C0387CE */ jal func_800E1F38 -/* B5D030 800E5E90 00000000 */ nop +/* B5D030 800E5E90 00000000 */ nop /* B5D034 800E5E94 8FBF0014 */ lw $ra, 0x14($sp) /* B5D038 800E5E98 27BD0018 */ addiu $sp, $sp, 0x18 /* B5D03C 800E5E9C 03E00008 */ jr $ra -/* B5D040 800E5EA0 00000000 */ nop +/* B5D040 800E5EA0 00000000 */ nop glabel func_800E5EA4 /* B5D044 800E5EA4 3C038017 */ lui $v1, %hi(gAudioContext) # $v1, 0x8017 @@ -5577,7 +5577,7 @@ glabel func_800E5EDC /* B5D0B4 800E5F14 8FAE0018 */ lw $t6, 0x18($sp) /* B5D0B8 800E5F18 24020001 */ li $v0, 1 /* B5D0BC 800E5F1C 11CF0003 */ beq $t6, $t7, .L800E5F2C -/* B5D0C0 800E5F20 00000000 */ nop +/* B5D0C0 800E5F20 00000000 */ nop /* B5D0C4 800E5F24 10000001 */ b .L800E5F2C /* B5D0C8 800E5F28 2402FFFF */ li $v0, -1 .L800E5F2C: @@ -5617,7 +5617,7 @@ glabel func_800E5F88 /* B5D13C 800E5F9C 2463F180 */ addiu $v1, %lo(gAudioContext) # addiu $v1, $v1, -0xe80 /* B5D140 800E5FA0 90623518 */ lbu $v0, 0x3518($v1) /* B5D144 800E5FA4 10400014 */ beqz $v0, .L800E5FF8 -/* B5D148 800E5FA8 00000000 */ nop +/* B5D148 800E5FA8 00000000 */ nop /* B5D14C 800E5FAC 0C039704 */ jal func_800E5C10 /* B5D150 800E5FB0 AFA20024 */ sw $v0, 0x24($sp) /* B5D154 800E5FB4 3C038017 */ lui $v1, %hi(gAudioContext) # $v1, 0x8017 @@ -5641,17 +5641,17 @@ glabel func_800E5F88 /* B5D194 800E5FF4 24060001 */ li $a2, 1 .L800E5FF8: /* B5D198 800E5FF8 0C0397CD */ jal func_800E5F34 -/* B5D19C 800E5FFC 00000000 */ nop +/* B5D19C 800E5FFC 00000000 */ nop /* B5D1A0 800E6000 3C04F900 */ lui $a0, 0xf900 /* B5D1A4 800E6004 0C0396BF */ jal func_800E5AFC /* B5D1A8 800E6008 8FA50028 */ lw $a1, 0x28($sp) /* B5D1AC 800E600C 0C0396E0 */ jal func_800E5B80 -/* B5D1B0 800E6010 00000000 */ nop +/* B5D1B0 800E6010 00000000 */ nop .L800E6014: /* B5D1B4 800E6014 8FBF0014 */ lw $ra, 0x14($sp) /* B5D1B8 800E6018 27BD0028 */ addiu $sp, $sp, 0x28 /* B5D1BC 800E601C 03E00008 */ jr $ra -/* B5D1C0 800E6020 00000000 */ nop +/* B5D1C0 800E6020 00000000 */ nop glabel func_800E6024 /* B5D1C4 800E6024 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -5673,7 +5673,7 @@ glabel func_800E6024 .L800E6064: /* B5D204 800E6064 27BD0018 */ addiu $sp, $sp, 0x18 /* B5D208 800E6068 03E00008 */ jr $ra -/* B5D20C 800E606C 00000000 */ nop +/* B5D20C 800E606C 00000000 */ nop glabel func_800E6070 /* B5D210 800E6070 00047080 */ sll $t6, $a0, 2 @@ -5697,7 +5697,7 @@ glabel func_800E6070 /* B5D258 800E60B8 2402FFFF */ li $v0, -1 .L800E60BC: /* B5D25C 800E60BC 03E00008 */ jr $ra -/* B5D260 800E60C0 00000000 */ nop +/* B5D260 800E60C0 00000000 */ nop glabel func_800E60C4 /* B5D264 800E60C4 00047080 */ sll $t6, $a0, 2 @@ -5723,7 +5723,7 @@ glabel func_800E60EC /* B5D2AC 800E610C 8FBF0014 */ lw $ra, 0x14($sp) /* B5D2B0 800E6110 27BD0018 */ addiu $sp, $sp, 0x18 /* B5D2B4 800E6114 03E00008 */ jr $ra -/* B5D2B8 800E6118 00000000 */ nop +/* B5D2B8 800E6118 00000000 */ nop glabel func_800E611C /* B5D2BC 800E611C 3C018017 */ lui $at, %hi(D_80171B20) @@ -5740,14 +5740,14 @@ glabel func_800E6128 /* B5D2E0 800E6140 002F0821 */ addu $at, $at, $t7 /* B5D2E4 800E6144 8C2F954C */ lw $t7, %lo(jtbl_8014954C)($at) /* B5D2E8 800E6148 01E00008 */ jr $t7 -/* B5D2EC 800E614C 00000000 */ nop +/* B5D2EC 800E614C 00000000 */ nop glabel L800E6150 /* B5D2F0 800E6150 C4A00004 */ lwc1 $f0, 4($a1) /* B5D2F4 800E6154 C484002C */ lwc1 $f4, 0x2c($a0) /* B5D2F8 800E6158 46040032 */ c.eq.s $f0, $f4 -/* B5D2FC 800E615C 00000000 */ nop +/* B5D2FC 800E615C 00000000 */ nop /* B5D300 800E6160 45010065 */ bc1t .L800E62F8 -/* B5D304 800E6164 00000000 */ nop +/* B5D304 800E6164 00000000 */ nop /* B5D308 800E6168 90990000 */ lbu $t9, ($a0) /* B5D30C 800E616C E480002C */ swc1 $f0, 0x2c($a0) /* B5D310 800E6170 37280004 */ ori $t0, $t9, 4 @@ -5786,7 +5786,7 @@ glabel L800E61D8 /* B5D37C 800E61DC 3C0142FE */ li $at, 0x42FE0000 # 0.000000 /* B5D380 800E61E0 44815000 */ mtc1 $at, $f10 /* B5D384 800E61E4 44883000 */ mtc1 $t0, $f6 -/* B5D388 800E61E8 00000000 */ nop +/* B5D388 800E61E8 00000000 */ nop /* B5D38C 800E61EC 46803220 */ cvt.s.w $f8, $f6 /* B5D390 800E61F0 1000000A */ b .L800E621C /* B5D394 800E61F4 460A4003 */ div.s $f0, $f8, $f10 @@ -5799,12 +5799,12 @@ glabel L800E61F8 /* B5D3AC 800E620C 468084A0 */ cvt.s.w $f18, $f16 /* B5D3B0 800E6210 46049183 */ div.s $f6, $f18, $f4 /* B5D3B4 800E6214 46083002 */ mul.s $f0, $f6, $f8 -/* B5D3B8 800E6218 00000000 */ nop +/* B5D3B8 800E6218 00000000 */ nop .L800E621C: /* B5D3BC 800E621C 908A0001 */ lbu $t2, 1($a0) /* B5D3C0 800E6220 24010002 */ li $at, 2 /* B5D3C4 800E6224 11410034 */ beq $t2, $at, .L800E62F8 -/* B5D3C8 800E6228 00000000 */ nop +/* B5D3C8 800E6228 00000000 */ nop /* B5D3CC 800E622C C482001C */ lwc1 $f2, 0x1c($a0) /* B5D3D0 800E6230 E4820024 */ swc1 $f2, 0x24($a0) /* B5D3D4 800E6234 8CA20004 */ lw $v0, 4($a1) @@ -5825,7 +5825,7 @@ glabel L800E6268 /* B5D408 800E6268 908B0001 */ lbu $t3, 1($a0) /* B5D40C 800E626C 24010002 */ li $at, 2 /* B5D410 800E6270 11610021 */ beq $t3, $at, .L800E62F8 -/* B5D414 800E6274 00000000 */ nop +/* B5D414 800E6274 00000000 */ nop /* B5D418 800E6278 8CA20004 */ lw $v0, 4($a1) /* B5D41C 800E627C 54400005 */ bnezl $v0, .L800E6294 /* B5D420 800E6280 44829000 */ mtc1 $v0, $f18 @@ -5850,7 +5850,7 @@ glabel L800E62B8 /* B5D464 800E62C4 E4880034 */ swc1 $f8, 0x34($a0) /* B5D468 800E62C8 C4920034 */ lwc1 $f18, 0x34($a0) /* B5D46C 800E62CC 46128032 */ c.eq.s $f16, $f18 -/* B5D470 800E62D0 00000000 */ nop +/* B5D470 800E62D0 00000000 */ nop /* B5D474 800E62D4 45020006 */ bc1fl .L800E62F0 /* B5D478 800E62D8 90980000 */ lbu $t8, ($a0) /* B5D47C 800E62DC 908C0000 */ lbu $t4, ($a0) @@ -5864,7 +5864,7 @@ glabel L800E62B8 .L800E62F8: glabel L800E62F8 /* B5D498 800E62F8 03E00008 */ jr $ra -/* B5D49C 800E62FC 00000000 */ nop +/* B5D49C 800E62FC 00000000 */ nop glabel func_800E6300 /* B5D4A0 800E6300 90AE0000 */ lbu $t6, ($a1) @@ -5876,14 +5876,14 @@ glabel func_800E6300 /* B5D4B8 800E6318 002F0821 */ addu $at, $at, $t7 /* B5D4BC 800E631C 8C2F9584 */ lw $t7, %lo(jtbl_80149584)($at) /* B5D4C0 800E6320 01E00008 */ jr $t7 -/* B5D4C4 800E6324 00000000 */ nop +/* B5D4C4 800E6324 00000000 */ nop glabel L800E6328 /* B5D4C8 800E6328 C4A00004 */ lwc1 $f0, 4($a1) /* B5D4CC 800E632C C4840028 */ lwc1 $f4, 0x28($a0) /* B5D4D0 800E6330 46040032 */ c.eq.s $f0, $f4 -/* B5D4D4 800E6334 00000000 */ nop +/* B5D4D4 800E6334 00000000 */ nop /* B5D4D8 800E6338 4501005B */ bc1t .L800E64A8 -/* B5D4DC 800E633C 00000000 */ nop +/* B5D4DC 800E633C 00000000 */ nop /* B5D4E0 800E6340 90990001 */ lbu $t9, 1($a0) /* B5D4E4 800E6344 E4800028 */ swc1 $f0, 0x28($a0) /* B5D4E8 800E6348 37280040 */ ori $t0, $t9, 0x40 @@ -5893,9 +5893,9 @@ glabel L800E6354 /* B5D4F4 800E6354 C4A00004 */ lwc1 $f0, 4($a1) /* B5D4F8 800E6358 C486002C */ lwc1 $f6, 0x2c($a0) /* B5D4FC 800E635C 46060032 */ c.eq.s $f0, $f6 -/* B5D500 800E6360 00000000 */ nop +/* B5D500 800E6360 00000000 */ nop /* B5D504 800E6364 45010050 */ bc1t .L800E64A8 -/* B5D508 800E6368 00000000 */ nop +/* B5D508 800E6368 00000000 */ nop /* B5D50C 800E636C 908A0001 */ lbu $t2, 1($a0) /* B5D510 800E6370 E480002C */ swc1 $f0, 0x2c($a0) /* B5D514 800E6374 354B0040 */ ori $t3, $t2, 0x40 @@ -5905,7 +5905,7 @@ glabel L800E6380 /* B5D520 800E6380 80A20004 */ lb $v0, 4($a1) /* B5D524 800E6384 908C000A */ lbu $t4, 0xa($a0) /* B5D528 800E6388 104C0047 */ beq $v0, $t4, .L800E64A8 -/* B5D52C 800E638C 00000000 */ nop +/* B5D52C 800E638C 00000000 */ nop /* B5D530 800E6390 908E0001 */ lbu $t6, 1($a0) /* B5D534 800E6394 A082000A */ sb $v0, 0xa($a0) /* B5D538 800E6398 35CF0020 */ ori $t7, $t6, 0x20 @@ -5915,7 +5915,7 @@ glabel L800E63A4 /* B5D544 800E63A4 80A20004 */ lb $v0, 4($a1) /* B5D548 800E63A8 9098000A */ lbu $t8, 0xa($a0) /* B5D54C 800E63AC 1058003E */ beq $v0, $t8, .L800E64A8 -/* B5D550 800E63B0 00000000 */ nop +/* B5D550 800E63B0 00000000 */ nop /* B5D554 800E63B4 90880001 */ lbu $t0, 1($a0) /* B5D558 800E63B8 A082000B */ sb $v0, 0xb($a0) /* B5D55C 800E63BC 35090020 */ ori $t1, $t0, 0x20 @@ -5925,9 +5925,9 @@ glabel L800E63C8 /* B5D568 800E63C8 C4A00004 */ lwc1 $f0, 4($a1) /* B5D56C 800E63CC C4880038 */ lwc1 $f8, 0x38($a0) /* B5D570 800E63D0 46080032 */ c.eq.s $f0, $f8 -/* B5D574 800E63D4 00000000 */ nop +/* B5D574 800E63D4 00000000 */ nop /* B5D578 800E63D8 45010033 */ bc1t .L800E64A8 -/* B5D57C 800E63DC 00000000 */ nop +/* B5D57C 800E63DC 00000000 */ nop /* B5D580 800E63E0 908B0001 */ lbu $t3, 1($a0) /* B5D584 800E63E4 E4800038 */ swc1 $f0, 0x38($a0) /* B5D588 800E63E8 356C0080 */ ori $t4, $t3, 0x80 @@ -5937,14 +5937,14 @@ glabel L800E63F4 /* B5D594 800E63F4 80A20004 */ lb $v0, 4($a1) /* B5D598 800E63F8 908D0004 */ lbu $t5, 4($a0) /* B5D59C 800E63FC 104D002A */ beq $v0, $t5, .L800E64A8 -/* B5D5A0 800E6400 00000000 */ nop +/* B5D5A0 800E6400 00000000 */ nop /* B5D5A4 800E6404 03E00008 */ jr $ra /* B5D5A8 800E6408 A0820004 */ sb $v0, 4($a0) glabel L800E640C /* B5D5AC 800E640C 90A20003 */ lbu $v0, 3($a1) /* B5D5B0 800E6410 28410008 */ slti $at, $v0, 8 /* B5D5B4 800E6414 10200024 */ beqz $at, .L800E64A8 -/* B5D5B8 800E6418 00000000 */ nop +/* B5D5B8 800E6418 00000000 */ nop /* B5D5BC 800E641C 80AE0004 */ lb $t6, 4($a1) /* B5D5C0 800E6420 00827821 */ addu $t7, $a0, $v0 /* B5D5C4 800E6424 03E00008 */ jr $ra @@ -5989,7 +5989,7 @@ glabel L800E64A0 /* B5D644 800E64A4 A08C00D0 */ sb $t4, 0xd0($a0) .L800E64A8: /* B5D648 800E64A8 03E00008 */ jr $ra -/* B5D64C 800E64AC 00000000 */ nop +/* B5D64C 800E64AC 00000000 */ nop glabel func_800E64B0 /* B5D650 800E64B0 308E00FF */ andi $t6, $a0, 0xff @@ -6009,7 +6009,7 @@ glabel func_800E64B0 /* B5D688 800E64E8 8FBF0014 */ lw $ra, 0x14($sp) /* B5D68C 800E64EC 27BD0018 */ addiu $sp, $sp, 0x18 /* B5D690 800E64F0 03E00008 */ jr $ra -/* B5D694 800E64F4 00000000 */ nop +/* B5D694 800E64F4 00000000 */ nop glabel func_800E64F8 /* B5D698 800E64F8 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -6020,7 +6020,7 @@ glabel func_800E64F8 /* B5D6AC 800E650C 8FBF0014 */ lw $ra, 0x14($sp) /* B5D6B0 800E6510 27BD0018 */ addiu $sp, $sp, 0x18 /* B5D6B4 800E6514 03E00008 */ jr $ra -/* B5D6B8 800E6518 00000000 */ nop +/* B5D6B8 800E6518 00000000 */ nop glabel func_800E651C /* B5D6BC 800E651C 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -6035,7 +6035,7 @@ glabel func_800E651C /* B5D6E0 800E6540 8FBF0014 */ lw $ra, 0x14($sp) /* B5D6E4 800E6544 27BD0018 */ addiu $sp, $sp, 0x18 /* B5D6E8 800E6548 03E00008 */ jr $ra -/* B5D6EC 800E654C 00000000 */ nop +/* B5D6EC 800E654C 00000000 */ nop glabel func_800E6550 /* B5D6F0 800E6550 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -6053,7 +6053,7 @@ glabel func_800E6550 /* B5D720 800E6580 8FBF0014 */ lw $ra, 0x14($sp) /* B5D724 800E6584 27BD0018 */ addiu $sp, $sp, 0x18 /* B5D728 800E6588 03E00008 */ jr $ra -/* B5D72C 800E658C 00000000 */ nop +/* B5D72C 800E658C 00000000 */ nop glabel func_800E6590 /* B5D730 800E6590 00047080 */ sll $t6, $a0, 2 @@ -6090,7 +6090,7 @@ glabel func_800E6590 /* B5D7A8 800E6608 8C44002C */ lw $a0, 0x2c($v0) /* B5D7AC 800E660C 0003C100 */ sll $t8, $v1, 4 /* B5D7B0 800E6610 14800003 */ bnez $a0, .L800E6620 -/* B5D7B4 800E6614 00000000 */ nop +/* B5D7B4 800E6614 00000000 */ nop /* B5D7B8 800E6618 03E00008 */ jr $ra /* B5D7BC 800E661C 00001025 */ move $v0, $zero .L800E6620: @@ -6102,7 +6102,7 @@ glabel func_800E6590 .L800E6634: /* B5D7D4 800E6634 00801825 */ move $v1, $a0 /* B5D7D8 800E6638 1459000C */ bne $v0, $t9, .L800E666C -/* B5D7DC 800E663C 00000000 */ nop +/* B5D7DC 800E663C 00000000 */ nop /* B5D7E0 800E6640 8C8400D0 */ lw $a0, 0xd0($a0) /* B5D7E4 800E6644 54800004 */ bnezl $a0, .L800E6658 /* B5D7E8 800E6648 8C880000 */ lw $t0, ($a0) @@ -6121,7 +6121,7 @@ glabel func_800E6590 /* B5D814 800E6674 00001025 */ move $v0, $zero .L800E6678: /* B5D818 800E6678 03E00008 */ jr $ra -/* B5D81C 800E667C 00000000 */ nop +/* B5D81C 800E667C 00000000 */ nop glabel func_800E6680 /* B5D820 800E6680 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -6131,7 +6131,7 @@ glabel func_800E6680 /* B5D830 800E6690 8FBF0014 */ lw $ra, 0x14($sp) /* B5D834 800E6694 27BD0018 */ addiu $sp, $sp, 0x18 /* B5D838 800E6698 03E00008 */ jr $ra -/* B5D83C 800E669C 00000000 */ nop +/* B5D83C 800E669C 00000000 */ nop glabel func_800E66A0 /* B5D840 800E66A0 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -6141,7 +6141,7 @@ glabel func_800E66A0 /* B5D850 800E66B0 8FBF0014 */ lw $ra, 0x14($sp) /* B5D854 800E66B4 27BD0018 */ addiu $sp, $sp, 0x18 /* B5D858 800E66B8 03E00008 */ jr $ra -/* B5D85C 800E66BC 00000000 */ nop +/* B5D85C 800E66BC 00000000 */ nop glabel func_800E66C0 /* B5D860 800E66C0 3C0A8017 */ lui $t2, %hi(gAudioContext) # $t2, 0x8017 @@ -6174,7 +6174,7 @@ glabel func_800E66C0 /* B5D8C8 800E6728 000510C0 */ sll $v0, $a1, 3 /* B5D8CC 800E672C 00451023 */ subu $v0, $v0, $a1 /* B5D8D0 800E6730 11000005 */ beqz $t0, .L800E6748 -/* B5D8D4 800E6734 00000000 */ nop +/* B5D8D4 800E6734 00000000 */ nop /* B5D8D8 800E6738 8CEC0000 */ lw $t4, ($a3) /* B5D8DC 800E673C 000C7340 */ sll $t6, $t4, 0xd /* B5D8E0 800E6740 05C30004 */ bgezl $t6, .L800E6754 @@ -6222,7 +6222,7 @@ glabel func_800E67C0 /* B5D960 800E67C0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B5D964 800E67C4 AFBF0014 */ sw $ra, 0x14($sp) /* B5D968 800E67C8 0C001BA8 */ jal osGetCount -/* B5D96C 800E67CC 00000000 */ nop +/* B5D96C 800E67CC 00000000 */ nop /* B5D970 800E67D0 3C048017 */ lui $a0, %hi(gAudioContext) # $a0, 0x8017 /* B5D974 800E67D4 2484F180 */ addiu $a0, %lo(gAudioContext) # addiu $a0, $a0, -0xe80 /* B5D978 800E67D8 3C038013 */ lui $v1, %hi(D_801304F0) # $v1, 0x8013 @@ -6246,8 +6246,8 @@ glabel func_800E6818 /* B5D9B8 800E6818 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B5D9BC 800E681C AFBF0014 */ sw $ra, 0x14($sp) /* B5D9C0 800E6820 0C03967D */ jal func_800E59F4 -/* B5D9C4 800E6824 00000000 */ nop +/* B5D9C4 800E6824 00000000 */ nop /* B5D9C8 800E6828 8FBF0014 */ lw $ra, 0x14($sp) /* B5D9CC 800E682C 27BD0018 */ addiu $sp, $sp, 0x18 /* B5D9D0 800E6830 03E00008 */ jr $ra -/* B5D9D4 800E6834 00000000 */ nop +/* B5D9D4 800E6834 00000000 */ nop diff --git a/asm/code_800E88C0.s b/asm/code_800E88C0.s index af9c64bd78..66bd07d1f2 100644 --- a/asm/code_800E88C0.s +++ b/asm/code_800E88C0.s @@ -28,14 +28,14 @@ glabel func_800E88C0 /* B5FA98 800E88F8 00185080 */ sll $t2, $t8, 2 /* B5FA9C 800E88FC 460A4002 */ mul.s $f0, $f8, $f10 /* B5FAA0 800E8900 05410008 */ bgez $t2, .L800E8924 -/* B5FAA4 800E8904 00000000 */ nop +/* B5FAA4 800E8904 00000000 */ nop /* B5FAA8 800E8908 908B0003 */ lbu $t3, 3($a0) /* B5FAAC 800E890C 316C0020 */ andi $t4, $t3, 0x20 /* B5FAB0 800E8910 11800004 */ beqz $t4, .L800E8924 -/* B5FAB4 800E8914 00000000 */ nop +/* B5FAB4 800E8914 00000000 */ nop /* B5FAB8 800E8918 C4500028 */ lwc1 $f16, 0x28($v0) /* B5FABC 800E891C 46008002 */ mul.s $f0, $f16, $f0 -/* B5FAC0 800E8920 00000000 */ nop +/* B5FAC0 800E8920 00000000 */ nop .L800E8924: /* B5FAC4 800E8924 46000482 */ mul.s $f18, $f0, $f0 /* B5FAC8 800E8928 8C820000 */ lw $v0, ($a0) @@ -43,13 +43,13 @@ glabel func_800E88C0 /* B5FAD0 800E8930 00027280 */ sll $t6, $v0, 0xa .L800E8934: /* B5FAD4 800E8934 05C10007 */ bgez $t6, .L800E8954 -/* B5FAD8 800E8938 00000000 */ nop +/* B5FAD8 800E8938 00000000 */ nop /* B5FADC 800E893C 908F000A */ lbu $t7, 0xa($a0) /* B5FAE0 800E8940 9098000B */ lbu $t8, 0xb($a0) /* B5FAE4 800E8944 01F80019 */ multu $t7, $t8 /* B5FAE8 800E8948 0000C812 */ mflo $t9 /* B5FAEC 800E894C AC990030 */ sw $t9, 0x30($a0) -/* B5FAF0 800E8950 00000000 */ nop +/* B5FAF0 800E8950 00000000 */ nop .L800E8954: /* B5FAF4 800E8954 10C00008 */ beqz $a2, .L800E8978 /* B5FAF8 800E8958 C4800038 */ lwc1 $f0, 0x38($a0) @@ -59,21 +59,21 @@ glabel func_800E88C0 /* B5FB08 800E8968 358D0080 */ ori $t5, $t4, 0x80 /* B5FB0C 800E896C A08D0001 */ sb $t5, 1($a0) /* B5FB10 800E8970 46040002 */ mul.s $f0, $f0, $f4 -/* B5FB14 800E8974 00000000 */ nop +/* B5FB14 800E8974 00000000 */ nop .L800E8978: /* B5FB18 800E8978 00003025 */ move $a2, $zero .L800E897C: /* B5FB1C 800E897C 8CE30050 */ lw $v1, 0x50($a3) /* B5FB20 800E8980 24C60004 */ addiu $a2, $a2, 4 /* B5FB24 800E8984 1060003C */ beqz $v1, .L800E8A78 -/* B5FB28 800E8988 00000000 */ nop +/* B5FB28 800E8988 00000000 */ nop /* B5FB2C 800E898C 8C6E0000 */ lw $t6, ($v1) /* B5FB30 800E8990 000E7FC2 */ srl $t7, $t6, 0x1f /* B5FB34 800E8994 11E00038 */ beqz $t7, .L800E8A78 -/* B5FB38 800E8998 00000000 */ nop +/* B5FB38 800E8998 00000000 */ nop /* B5FB3C 800E899C 8C78002C */ lw $t8, 0x2c($v1) /* B5FB40 800E89A0 13000035 */ beqz $t8, .L800E8A78 -/* B5FB44 800E89A4 00000000 */ nop +/* B5FB44 800E89A4 00000000 */ nop /* B5FB48 800E89A8 90620000 */ lbu $v0, ($v1) /* B5FB4C 800E89AC 30590001 */ andi $t9, $v0, 1 /* B5FB50 800E89B0 53200015 */ beql $t9, $zero, .L800E8A08 @@ -120,7 +120,7 @@ glabel func_800E88C0 /* B5FBE8 800E8A48 00027A80 */ sll $t7, $v0, 0xa .L800E8A4C: /* B5FBEC 800E8A4C 05E1000A */ bgez $t7, .L800E8A78 -/* B5FBF0 800E8A50 00000000 */ nop +/* B5FBF0 800E8A50 00000000 */ nop /* B5FBF4 800E8A54 9099000B */ lbu $t9, 0xb($a0) /* B5FBF8 800E8A58 90780006 */ lbu $t8, 6($v1) /* B5FBFC 800E8A5C 8C8C0030 */ lw $t4, 0x30($a0) @@ -160,16 +160,16 @@ glabel func_800E8A88 /* B5FC78 800E8AD8 37190004 */ ori $t9, $t8, 4 /* B5FC7C 800E8ADC A0990000 */ sb $t9, ($a0) /* B5FC80 800E8AE0 4600103C */ c.lt.s $f2, $f0 -/* B5FC84 800E8AE4 00000000 */ nop +/* B5FC84 800E8AE4 00000000 */ nop /* B5FC88 800E8AE8 45020004 */ bc1fl .L800E8AFC /* B5FC8C 800E8AEC 44801000 */ mtc1 $zero, $f2 /* B5FC90 800E8AF0 E482001C */ swc1 $f2, 0x1c($a0) /* B5FC94 800E8AF4 C480001C */ lwc1 $f0, 0x1c($a0) /* B5FC98 800E8AF8 44801000 */ mtc1 $zero, $f2 .L800E8AFC: -/* B5FC9C 800E8AFC 00000000 */ nop +/* B5FC9C 800E8AFC 00000000 */ nop /* B5FCA0 800E8B00 4602003C */ c.lt.s $f0, $f2 -/* B5FCA4 800E8B04 00000000 */ nop +/* B5FCA4 800E8B04 00000000 */ nop /* B5FCA8 800E8B08 45020003 */ bc1fl .L800E8B18 /* B5FCAC 800E8B0C 96480012 */ lhu $t0, 0x12($s2) /* B5FCB0 800E8B10 E642001C */ swc1 $f2, 0x1c($s2) @@ -194,7 +194,7 @@ glabel func_800E8A88 /* B5FCF0 800E8B50 24130001 */ li $s3, 1 /* B5FCF4 800E8B54 000C7140 */ sll $t6, $t4, 5 /* B5FCF8 800E8B58 05C10005 */ bgez $t6, .L800E8B70 -/* B5FCFC 800E8B5C 00000000 */ nop +/* B5FCFC 800E8B5C 00000000 */ nop /* B5FD00 800E8B60 C64A001C */ lwc1 $f10, 0x1c($s2) /* B5FD04 800E8B64 C650002C */ lwc1 $f16, 0x2c($s2) /* B5FD08 800E8B68 46105482 */ mul.s $f18, $f10, $f16 @@ -260,7 +260,7 @@ glabel func_800E8C30 /* B5FDD8 800E8C38 8C880008 */ lw $t0, 8($a0) /* B5FDDC 800E8C3C 4600218D */ trunc.w.s $f6, $f4 /* B5FDE0 800E8C40 44183000 */ mfc1 $t8, $f6 -/* B5FDE4 800E8C44 00000000 */ nop +/* B5FDE4 800E8C44 00000000 */ nop /* B5FDE8 800E8C48 01D8C821 */ addu $t9, $t6, $t8 /* B5FDEC 800E8C4C 00191A82 */ srl $v1, $t9, 0xa /* B5FDF0 800E8C50 3063003F */ andi $v1, $v1, 0x3f @@ -294,7 +294,7 @@ glabel func_800E8C68 /* B5FE54 800E8CB4 946F0016 */ lhu $t7, 0x16($v1) /* B5FE58 800E8CB8 94820018 */ lhu $v0, 0x18($a0) /* B5FE5C 800E8CBC 448F2000 */ mtc1 $t7, $f4 -/* B5FE60 800E8CC0 00000000 */ nop +/* B5FE60 800E8CC0 00000000 */ nop /* B5FE64 800E8CC4 468021A0 */ cvt.s.w $f6, $f4 /* B5FE68 800E8CC8 1000000C */ b .L800E8CFC /* B5FE6C 800E8CCC E486000C */ swc1 $f6, 0xc($a0) @@ -303,7 +303,7 @@ glabel func_800E8C68 /* B5FE74 800E8CD4 44853000 */ mtc1 $a1, $f6 /* B5FE78 800E8CD8 C480000C */ lwc1 $f0, 0xc($a0) /* B5FE7C 800E8CDC 44984000 */ mtc1 $t8, $f8 -/* B5FE80 800E8CE0 00000000 */ nop +/* B5FE80 800E8CE0 00000000 */ nop /* B5FE84 800E8CE4 468042A0 */ cvt.s.w $f10, $f8 /* B5FE88 800E8CE8 46803220 */ cvt.s.w $f8, $f6 /* B5FE8C 800E8CEC 46005101 */ sub.s $f4, $f10, $f0 @@ -319,7 +319,7 @@ glabel func_800E8C68 /* B5FEAC 800E8D0C 946A0016 */ lhu $t2, 0x16($v1) /* B5FEB0 800E8D10 4600220D */ trunc.w.s $f8, $f4 /* B5FEB4 800E8D14 44094000 */ mfc1 $t1, $f8 -/* B5FEB8 800E8D18 00000000 */ nop +/* B5FEB8 800E8D18 00000000 */ nop /* B5FEBC 800E8D1C 512A000A */ beql $t1, $t2, .L800E8D48 /* B5FEC0 800E8D20 94820016 */ lhu $v0, 0x16($a0) /* B5FEC4 800E8D24 9462001A */ lhu $v0, 0x1a($v1) @@ -327,7 +327,7 @@ glabel func_800E8C68 /* B5FECC 800E8D2C A4820018 */ sh $v0, 0x18($a0) /* B5FED0 800E8D30 946B0016 */ lhu $t3, 0x16($v1) /* B5FED4 800E8D34 448B5000 */ mtc1 $t3, $f10 -/* B5FED8 800E8D38 00000000 */ nop +/* B5FED8 800E8D38 00000000 */ nop /* B5FEDC 800E8D3C 468051A0 */ cvt.s.w $f6, $f10 /* B5FEE0 800E8D40 E486000C */ swc1 $f6, 0xc($a0) .L800E8D44: @@ -341,7 +341,7 @@ glabel func_800E8C68 /* B5FEFC 800E8D5C 946C0014 */ lhu $t4, 0x14($v1) /* B5FF00 800E8D60 94820016 */ lhu $v0, 0x16($a0) /* B5FF04 800E8D64 448C2000 */ mtc1 $t4, $f4 -/* B5FF08 800E8D68 00000000 */ nop +/* B5FF08 800E8D68 00000000 */ nop /* B5FF0C 800E8D6C 46802220 */ cvt.s.w $f8, $f4 /* B5FF10 800E8D70 1000000C */ b .L800E8DA4 /* B5FF14 800E8D74 E4880010 */ swc1 $f8, 0x10($a0) @@ -350,7 +350,7 @@ glabel func_800E8C68 /* B5FF1C 800E8D7C 44854000 */ mtc1 $a1, $f8 /* B5FF20 800E8D80 C4800010 */ lwc1 $f0, 0x10($a0) /* B5FF24 800E8D84 448D5000 */ mtc1 $t5, $f10 -/* B5FF28 800E8D88 00000000 */ nop +/* B5FF28 800E8D88 00000000 */ nop /* B5FF2C 800E8D8C 468051A0 */ cvt.s.w $f6, $f10 /* B5FF30 800E8D90 468042A0 */ cvt.s.w $f10, $f8 /* B5FF34 800E8D94 46003101 */ sub.s $f4, $f6, $f0 @@ -366,7 +366,7 @@ glabel func_800E8C68 /* B5FF54 800E8DB4 94790014 */ lhu $t9, 0x14($v1) /* B5FF58 800E8DB8 4600228D */ trunc.w.s $f10, $f4 /* B5FF5C 800E8DBC 44185000 */ mfc1 $t8, $f10 -/* B5FF60 800E8DC0 00000000 */ nop +/* B5FF60 800E8DC0 00000000 */ nop /* B5FF64 800E8DC4 5319000A */ beql $t8, $t9, .L800E8DF0 /* B5FF68 800E8DC8 44802000 */ mtc1 $zero, $f4 /* B5FF6C 800E8DCC 94620018 */ lhu $v0, 0x18($v1) @@ -374,7 +374,7 @@ glabel func_800E8C68 /* B5FF74 800E8DD4 A4820016 */ sh $v0, 0x16($a0) /* B5FF78 800E8DD8 94680014 */ lhu $t0, 0x14($v1) /* B5FF7C 800E8DDC 44883000 */ mtc1 $t0, $f6 -/* B5FF80 800E8DE0 00000000 */ nop +/* B5FF80 800E8DE0 00000000 */ nop /* B5FF84 800E8DE4 46803220 */ cvt.s.w $f8, $f6 /* B5FF88 800E8DE8 E4880010 */ swc1 $f8, 0x10($a0) .L800E8DEC: @@ -383,9 +383,9 @@ glabel func_800E8C68 /* B5FF90 800E8DF0 C48A000C */ lwc1 $f10, 0xc($a0) /* B5FF94 800E8DF4 3C013F80 */ li $at, 0x3F800000 # 0.000000 /* B5FF98 800E8DF8 460A2032 */ c.eq.s $f4, $f10 -/* B5FF9C 800E8DFC 00000000 */ nop +/* B5FF9C 800E8DFC 00000000 */ nop /* B5FFA0 800E8E00 45000004 */ bc1f .L800E8E14 -/* B5FFA4 800E8E04 00000000 */ nop +/* B5FFA4 800E8E04 00000000 */ nop /* B5FFA8 800E8E08 44810000 */ mtc1 $at, $f0 /* B5FFAC 800E8E0C 10000022 */ b .L800E8E98 /* B5FFB0 800E8E10 8FBF0014 */ lw $ra, 0x14($sp) @@ -427,7 +427,7 @@ glabel func_800E8C68 .L800E8E98: /* B60038 800E8E98 27BD0018 */ addiu $sp, $sp, 0x18 /* B6003C 800E8E9C 03E00008 */ jr $ra -/* B60040 800E8EA0 00000000 */ nop +/* B60040 800E8EA0 00000000 */ nop glabel func_800E8EA4 /* B60044 800E8EA4 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -454,7 +454,7 @@ glabel func_800E8EA4 .L800E8EF4: /* B60094 800E8EF4 27BD0018 */ addiu $sp, $sp, 0x18 /* B60098 800E8EF8 03E00008 */ jr $ra -/* B6009C 800E8EFC 00000000 */ nop +/* B6009C 800E8EFC 00000000 */ nop glabel func_800E8F00 /* B600A0 800E8F00 3C013F80 */ li $at, 0x3F800000 # 0.000000 @@ -462,9 +462,9 @@ glabel func_800E8F00 /* B600A8 800E8F08 240E0001 */ li $t6, 1 /* B600AC 800E8F0C A08E00B0 */ sb $t6, 0xb0($a0) /* B600B0 800E8F10 AC8000A0 */ sw $zero, 0xa0($a0) -/* B600B4 800E8F14 3C0F8013 */ lui $t7, %hi(D_8012F098) # $t7, 0x8013 +/* B600B4 800E8F14 3C0F8013 */ lui $t7, %hi(gWaveSamples) # $t7, 0x8013 /* B600B8 800E8F18 E484003C */ swc1 $f4, 0x3c($a0) -/* B600BC 800E8F1C 8DEFF098 */ lw $t7, %lo(D_8012F098)($t7) +/* B600BC 800E8F1C 8DEFF098 */ lw $t7, %lo(gWaveSamples+0x8)($t7) /* B600C0 800E8F20 8C980044 */ lw $t8, 0x44($a0) /* B600C4 800E8F24 AC8F00A4 */ sw $t7, 0xa4($a0) /* B600C8 800E8F28 8F190050 */ lw $t9, 0x50($t8) @@ -476,7 +476,7 @@ glabel func_800E8F00 /* B600E0 800E8F40 97280016 */ lhu $t0, 0x16($t9) /* B600E4 800E8F44 2482009C */ addiu $v0, $a0, 0x9c /* B600E8 800E8F48 44883000 */ mtc1 $t0, $f6 -/* B600EC 800E8F4C 00000000 */ nop +/* B600EC 800E8F4C 00000000 */ nop /* B600F0 800E8F50 46803220 */ cvt.s.w $f8, $f6 /* B600F4 800E8F54 10000007 */ b .L800E8F74 /* B600F8 800E8F58 E448000C */ swc1 $f8, 0xc($v0) @@ -484,7 +484,7 @@ glabel func_800E8F00 /* B600FC 800E8F5C 94690012 */ lhu $t1, 0x12($v1) /* B60100 800E8F60 2482009C */ addiu $v0, $a0, 0x9c /* B60104 800E8F64 44895000 */ mtc1 $t1, $f10 -/* B60108 800E8F68 00000000 */ nop +/* B60108 800E8F68 00000000 */ nop /* B6010C 800E8F6C 46805420 */ cvt.s.w $f16, $f10 /* B60110 800E8F70 E450000C */ swc1 $f16, 0xc($v0) .L800E8F74: @@ -493,14 +493,14 @@ glabel func_800E8F00 /* B6011C 800E8F7C A4450016 */ sh $a1, 0x16($v0) /* B60120 800E8F80 946A0014 */ lhu $t2, 0x14($v1) /* B60124 800E8F84 448A9000 */ mtc1 $t2, $f18 -/* B60128 800E8F88 00000000 */ nop +/* B60128 800E8F88 00000000 */ nop /* B6012C 800E8F8C 46809120 */ cvt.s.w $f4, $f18 /* B60130 800E8F90 10000006 */ b .L800E8FAC /* B60134 800E8F94 E4440010 */ swc1 $f4, 0x10($v0) .L800E8F98: /* B60138 800E8F98 946B0010 */ lhu $t3, 0x10($v1) /* B6013C 800E8F9C 448B3000 */ mtc1 $t3, $f6 -/* B60140 800E8FA0 00000000 */ nop +/* B60140 800E8FA0 00000000 */ nop /* B60144 800E8FA4 46803220 */ cvt.s.w $f8, $f6 /* B60148 800E8FA8 E4480010 */ swc1 $f8, 0x10($v0) .L800E8FAC: @@ -543,11 +543,11 @@ glabel func_800E9004 /* B601C4 800E9024 002E0821 */ addu $at, $at, $t6 /* B601C8 800E9028 8C2E95F0 */ lw $t6, %lo(jtbl_801495F0)($at) /* B601CC 800E902C 01C00008 */ jr $t6 -/* B601D0 800E9030 00000000 */ nop +/* B601D0 800E9030 00000000 */ nop glabel L800E9034 /* B601D4 800E9034 44800000 */ mtc1 $zero, $f0 /* B601D8 800E9038 03E00008 */ jr $ra -/* B601DC 800E903C 00000000 */ nop +/* B601DC 800E903C 00000000 */ nop glabel L800E9040 /* B601E0 800E9040 8C8F0000 */ lw $t7, ($a0) /* B601E4 800E9044 3068FFF0 */ andi $t0, $v1, 0xfff0 @@ -610,7 +610,7 @@ glabel L800E9070 /* B602A8 800E9108 46083282 */ mul.s $f10, $f6, $f8 /* B602AC 800E910C 4600540D */ trunc.w.s $f16, $f10 /* B602B0 800E9110 44188000 */ mfc1 $t8, $f16 -/* B602B4 800E9114 00000000 */ nop +/* B602B4 800E9114 00000000 */ nop /* B602B8 800E9118 A4980002 */ sh $t8, 2($a0) /* B602BC 800E911C 84850002 */ lh $a1, 2($a0) /* B602C0 800E9120 54A00004 */ bnezl $a1, .L800E9134 @@ -677,11 +677,11 @@ glabel L800E91E8 /* B603A4 800E9204 45010010 */ bc1t .L800E9248 /* B603A8 800E9208 E48A0010 */ swc1 $f10, 0x10($a0) /* B603AC 800E920C 14A1000E */ bne $a1, $at, .L800E9248 -/* B603B0 800E9210 00000000 */ nop +/* B603B0 800E9210 00000000 */ nop /* B603B4 800E9214 C4900010 */ lwc1 $f16, 0x10($a0) /* B603B8 800E9218 240E0080 */ li $t6, 128 /* B603BC 800E921C 4600803C */ c.lt.s $f16, $f0 -/* B603C0 800E9220 00000000 */ nop +/* B603C0 800E9220 00000000 */ nop /* B603C4 800E9224 4502001F */ bc1fl .L800E92A4 /* B603C8 800E9228 8C820000 */ lw $v0, ($a0) /* B603CC 800E922C 908F0000 */ lbu $t7, ($a0) @@ -696,7 +696,7 @@ glabel L800E91E8 /* B603EC 800E924C C4269618 */ lwc1 $f6, %lo(D_80149618)($at) /* B603F0 800E9250 C4920010 */ lwc1 $f18, 0x10($a0) /* B603F4 800E9254 4606903C */ c.lt.s $f18, $f6 -/* B603F8 800E9258 00000000 */ nop +/* B603F8 800E9258 00000000 */ nop /* B603FC 800E925C 45020011 */ bc1fl .L800E92A4 /* B60400 800E9260 8C820000 */ lw $v0, ($a0) /* B60404 800E9264 90880000 */ lbu $t0, ($a0) @@ -744,16 +744,16 @@ glabel L800E92A0 /* B60498 800E92F8 C4820010 */ lwc1 $f2, 0x10($a0) .L800E92FC: /* B6049C 800E92FC 460C103C */ c.lt.s $f2, $f12 -/* B604A0 800E9300 00000000 */ nop +/* B604A0 800E9300 00000000 */ nop /* B604A4 800E9304 45020004 */ bc1fl .L800E9318 /* B604A8 800E9308 44816000 */ mtc1 $at, $f12 /* B604AC 800E930C 03E00008 */ jr $ra /* B604B0 800E9310 46006006 */ mov.s $f0, $f12 /* B604B4 800E9314 44816000 */ mtc1 $at, $f12 .L800E9318: -/* B604B8 800E9318 00000000 */ nop +/* B604B8 800E9318 00000000 */ nop /* B604BC 800E931C 4602603C */ c.lt.s $f12, $f2 -/* B604C0 800E9320 00000000 */ nop +/* B604C0 800E9320 00000000 */ nop /* B604C4 800E9324 45020004 */ bc1fl .L800E9338 /* B604C8 800E9328 46001006 */ mov.s $f0, $f2 /* B604CC 800E932C 03E00008 */ jr $ra @@ -761,4 +761,4 @@ glabel L800E92A0 /* B604D4 800E9334 46001006 */ mov.s $f0, $f2 .L800E9338: /* B604D8 800E9338 03E00008 */ jr $ra -/* B604DC 800E933C 00000000 */ nop +/* B604DC 800E933C 00000000 */ nop diff --git a/asm/non_matchings/code/z_camera/Camera_Unique9.s b/asm/non_matchings/code/z_camera/Camera_Unique9.s index 9694d63402..72ad418661 100644 --- a/asm/non_matchings/code/z_camera/Camera_Unique9.s +++ b/asm/non_matchings/code/z_camera/Camera_Unique9.s @@ -52,30 +52,30 @@ glabel D_8013A250 .float 182.041672 # 32768 / PI glabel jtbl_8013A254 - .word 0x80053B74 # 1 - .word 0x80053C60 # 2 - .word 0x80053F00 # 3 - .word 0x80053E60 # 4 - .word 0x800541C8 - .word 0x800541C8 - .word 0x800541C8 - .word 0x800541C8 - .word 0x80053D18 # 9 - .word 0x80053D18 # 10 - .word 0x80053F54 # 11 - .word 0x80053F54 # 12 - .word 0x80053FE4 # 13 - .word 0x800541C8 - .word 0x80053A0C # 15 - .word 0x80053AF4 # 16 - .word 0x800541C8 - .word 0x80054180 # 17 - .word 0x80054150 # 18 - .word 0x800541C8 - .word 0x80053A68 # 20 - .word 0x800541C8 - .word 0x800541C8 - .word 0x80054140 # 23 + .word L80053B74 # 1 + .word L80053C60 # 2 + .word L80053F00 # 3 + .word L80053E60 # 4 + .word L800541C8 + .word L800541C8 + .word L800541C8 + .word L800541C8 + .word L80053D18 # 9 + .word L80053D18 # 10 + .word L80053F54 # 11 + .word L80053F54 # 12 + .word L80053FE4 # 13 + .word L800541C8 + .word L80053A0C # 15 + .word L80053AF4 # 16 + .word L800541C8 + .word L80054180 # 17 + .word L80054150 # 18 + .word L800541C8 + .word L80053A68 # 20 + .word L800541C8 + .word L800541C8 + .word L80054140 # 23 glabel D_8013A2B4 .float 182.041672 # 32768 / PI @@ -922,6 +922,8 @@ glabel Camera_Unique9 /* ACABA0 80053A00 8C2DA254 */ lw $t5, %lo(jtbl_8013A254)($at) /* ACABA4 80053A04 01A00008 */ jr $t5 /* ACABA8 80053A08 00000000 */ nop + +glabel L80053A0C /* ACABAC 80053A0C 8FAE0030 */ lw $t6, 0x30($sp) /* ACABB0 80053A10 8E180004 */ lw $t8, 4($s0) /* ACABB4 80053A14 2626005C */ addiu $a2, $s1, 0x5c @@ -945,6 +947,8 @@ glabel Camera_Unique9 /* ACABFC 80053A5C A62E014C */ sh $t6, 0x14c($s1) /* ACAC00 80053A60 100001DE */ b .L800541DC /* ACAC04 80053A64 A62C015A */ sh $t4, 0x15a($s1) + +glabel L80053A68 /* ACAC08 80053A68 860F0038 */ lh $t7, 0x38($s0) /* ACAC0C 80053A6C 26070004 */ addiu $a3, $s0, 4 /* ACAC10 80053A70 26020010 */ addiu $v0, $s0, 0x10 @@ -983,6 +987,8 @@ glabel Camera_Unique9 /* ACAC88 80053AE8 860A0034 */ lh $t2, 0x34($s0) /* ACAC8C 80053AEC 100001BB */ b .L800541DC /* ACAC90 80053AF0 A62A015A */ sh $t2, 0x15a($s1) + +glabel L80053AF4 /* ACAC94 80053AF4 860C0038 */ lh $t4, 0x38($s0) /* ACAC98 80053AF8 26070004 */ addiu $a3, $s0, 4 /* ACAC9C 80053AFC 26020010 */ addiu $v0, $s0, 0x10 @@ -1018,6 +1024,8 @@ glabel Camera_Unique9 /* ACAD08 80053B68 860E0034 */ lh $t6, 0x34($s0) /* ACAD0C 80053B6C 1000019B */ b .L800541DC /* ACAD10 80053B70 A62E015A */ sh $t6, 0x15a($s1) + +glabel L80053B74 /* ACAD14 80053B74 26070004 */ addiu $a3, $s0, 4 /* ACAD18 80053B78 260F0010 */ addiu $t7, $s0, 0x10 /* ACAD1C 80053B7C AFAF0024 */ sw $t7, 0x24($sp) @@ -1077,6 +1085,8 @@ glabel Camera_Unique9 /* ACADF4 80053C54 A7AE00EA */ sh $t6, 0xea($sp) /* ACADF8 80053C58 1000001A */ b .L80053CC4 /* ACADFC 80053C5C 8E180000 */ lw $t8, ($s0) + +glabel L80053C60 /* ACAE00 80053C60 860F003C */ lh $t7, 0x3c($s0) /* ACAE04 80053C64 3C013F80 */ li $at, 0x3F800000 # 0.000000 /* ACAE08 80053C68 44813000 */ mtc1 $at, $f6 @@ -1124,6 +1134,8 @@ glabel Camera_Unique9 /* ACAEAC 80053D0C 8D86000C */ lw $a2, 0xc($t4) /* ACAEB0 80053D10 E620007C */ swc1 $f0, 0x7c($s1) /* ACAEB4 80053D14 8E030000 */ lw $v1, ($s0) + +glabel L80053D18 /* ACAEB8 80053D18 860D003C */ lh $t5, 0x3c($s0) /* ACAEBC 80053D1C 3C013F80 */ li $at, 0x3F800000 # 0.000000 /* ACAEC0 80053D20 44819000 */ mtc1 $at, $f18 @@ -1208,6 +1220,8 @@ glabel Camera_Unique9 /* ACAFF4 80053E54 A622015A */ sh $v0, 0x15a($s1) /* ACAFF8 80053E58 100000E0 */ b .L800541DC /* ACAFFC 80053E5C 2626005C */ addiu $a2, $s1, 0x5c + +glabel L80053E60 /* ACB000 80053E60 26070004 */ addiu $a3, $s0, 4 /* ACB004 80053E64 260E0010 */ addiu $t6, $s0, 0x10 /* ACB008 80053E68 AFAE0024 */ sw $t6, 0x24($sp) @@ -1248,6 +1262,8 @@ glabel Camera_Unique9 /* ACB094 80053EF4 27A600E4 */ addiu $a2, $sp, 0xe4 /* ACB098 80053EF8 10000016 */ b .L80053F54 /* ACB09C 80053EFC 8E030000 */ lw $v1, ($s0) + +glabel L80053F00 /* ACB0A0 80053F00 C60C0010 */ lwc1 $f12, 0x10($s0) /* ACB0A4 80053F04 C62E0074 */ lwc1 $f14, 0x74($s1) /* ACB0A8 80053F08 8C66000C */ lw $a2, 0xc($v1) @@ -1269,6 +1285,8 @@ glabel Camera_Unique9 /* ACB0E8 80053F48 8DA6000C */ lw $a2, 0xc($t5) /* ACB0EC 80053F4C E620007C */ swc1 $f0, 0x7c($s1) /* ACB0F0 80053F50 8E030000 */ lw $v1, ($s0) + +glabel L80053F54 .L80053F54: /* ACB0F4 80053F54 C60C0004 */ lwc1 $f12, 4($s0) /* ACB0F8 80053F58 C62E0050 */ lwc1 $f14, 0x50($s1) @@ -1306,6 +1324,8 @@ glabel Camera_Unique9 /* ACB178 80053FD8 A622015A */ sh $v0, 0x15a($s1) /* ACB17C 80053FDC 1000007F */ b .L800541DC /* ACB180 80053FE0 2626005C */ addiu $a2, $s1, 0x5c + +glabel L80053FE4 /* ACB184 80053FE4 C60C0004 */ lwc1 $f12, 4($s0) /* ACB188 80053FE8 C62E0050 */ lwc1 $f14, 0x50($s1) /* ACB18C 80053FEC 8C66000C */ lw $a2, 0xc($v1) @@ -1396,10 +1416,14 @@ glabel Camera_Unique9 /* ACB2D4 80054134 A622015A */ sh $v0, 0x15a($s1) /* ACB2D8 80054138 10000028 */ b .L800541DC /* ACB2DC 8005413C 2626005C */ addiu $a2, $s1, 0x5c + +glabel L80054140 /* ACB2E0 80054140 860E0034 */ lh $t6, 0x34($s0) /* ACB2E4 80054144 2626005C */ addiu $a2, $s1, 0x5c /* ACB2E8 80054148 10000024 */ b .L800541DC /* ACB2EC 8005414C A60E0036 */ sh $t6, 0x36($s0) + +glabel L80054150 /* ACB2F0 80054150 86220162 */ lh $v0, 0x162($s1) /* ACB2F4 80054154 00002825 */ move $a1, $zero /* ACB2F8 80054158 04410003 */ bgez $v0, .L80054168 @@ -1413,6 +1437,8 @@ glabel Camera_Unique9 /* ACB314 80054174 030A6021 */ addu $t4, $t8, $t2 /* ACB318 80054178 0C016813 */ jal Camera_ChangeMode /* ACB31C 8005417C 8D840790 */ lw $a0, 0x790($t4) + +glabel L80054180 /* ACB320 80054180 86220162 */ lh $v0, 0x162($s1) /* ACB324 80054184 8FAF0034 */ lw $t7, 0x34($sp) /* ACB328 80054188 04410003 */ bgez $v0, .L80054198 @@ -1432,6 +1458,8 @@ glabel Camera_Unique9 /* ACB35C 800541BC 8DF80008 */ lw $t8, 8($t7) /* ACB360 800541C0 0C016B99 */ jal func_8005AE64 /* ACB364 800541C4 AE380064 */ sw $t8, 0x64($s1) + +glabel L800541C8 .L800541C8: /* ACB368 800541C8 862A0164 */ lh $t2, 0x164($s1) /* ACB36C 800541CC 2626005C */ addiu $a2, $s1, 0x5c diff --git a/data/code_800D7CD0.data.s b/data/code_800D7CD0.data.s index f2d869d0a1..17d66816b3 100644 --- a/data/code_800D7CD0.data.s +++ b/data/code_800D7CD0.data.s @@ -25,7 +25,28 @@ glabel D_8012DE1C .incbin "baserom.z64", 0xBA4FBC, 0x210 glabel D_8012E02C - .incbin "baserom.z64", 0xBA51CC, 0xE64 + .incbin "baserom.z64", 0xBA51CC, 0x64 + +glabel D_8012E090 + .incbin "baserom.z64", 0xBA5230, 0x200 + +glabel D_8012E290 + .incbin "baserom.z64", 0xBA5430, 0x200 + +glabel D_8012E490 + .incbin "baserom.z64", 0xBA5630, 0x200 + +glabel D_8012E690 + .incbin "baserom.z64", 0xBA5830, 0x200 + +glabel D_8012E890 + .incbin "baserom.z64", 0xBA5A30, 0x200 + +glabel D_8012EA90 + .incbin "baserom.z64", 0xBA5C30, 0x200 + +glabel D_8012EC90 + .incbin "baserom.z64", 0xBA5E30, 0x200 glabel D_8012EE90 .incbin "baserom.z64", 0xBA6030, 0x200 diff --git a/data/code_800DACC0.bss.s b/data/code_800DACC0.bss.s index 2816d24dc9..da5a7979b9 100644 --- a/data/code_800DACC0.bss.s +++ b/data/code_800DACC0.bss.s @@ -187,7 +187,28 @@ glabel D_8016BABC .space 0x4 glabel D_8016BAC0 - .space 0xEE0 + .space 0x10 + +glabel D_8016BAD0 + .space 0x1B0 + +glabel D_8016BC80 + .space 0x240 + +glabel D_8016BEC0 + .space 0x420 + +glabel D_8016C2E0 + .space 0x3C0 + +glabel D_8016C6A0 + .space 0x180 + +glabel D_8016C820 + .space 0x90 + +glabel D_8016C8B0 + .space 0xF0 glabel D_8016C9A0 .space 0x1800 diff --git a/data/code_800DACC0.data.s b/data/code_800DACC0.data.s index e48616f020..ab4cbe12fc 100644 --- a/data/code_800DACC0.data.s +++ b/data/code_800DACC0.data.s @@ -10,13 +10,15 @@ .balign 16 glabel gWaveSamples - .incbin "baserom.z64", 0xBA6230, 0x8 - -glabel D_8012F098 - .incbin "baserom.z64", 0xBA6238, 0x18 - -glabel D_8012F0B0 - .incbin "baserom.z64", 0xBA6250, 0x4 + .word D_8012E090 + .word D_8012E290 + .word D_8012E490 + .word D_8012E690 + .word D_8012E890 + .word D_8012EA90 + .word D_8012EC90 + .word D_8012EE90 + .word D_8012EE90 glabel D_8012F0B4 .incbin "baserom.z64", 0xBA6254, 0x200 diff --git a/data/code_800E11F0.data.s b/data/code_800E11F0.data.s index 2cf54e8960..7930292c92 100644 --- a/data/code_800E11F0.data.s +++ b/data/code_800E11F0.data.s @@ -10,7 +10,7 @@ .balign 16 glabel D_801304D0 - .incbin "baserom.z64", 0xBA7670, 0x4 + .word osEPiStartDma glabel D_801304D4 .incbin "baserom.z64", 0xBA7674, 0x4 diff --git a/data/code_800EC960.data.s b/data/code_800EC960.data.s index a011aa59cb..243e2b9fbe 100644 --- a/data/code_800EC960.data.s +++ b/data/code_800EC960.data.s @@ -235,16 +235,25 @@ glabel D_80130F80 .incbin "baserom.z64", 0xBA8120, 0x180 glabel D_80131100 - .incbin "baserom.z64", 0xBA82A0, 0x60C + .incbin "baserom.z64", 0xBA82A0, 0x600 + +glabel D_80131700 + .incbin "baserom.z64", 0xBA88A0, 0xC glabel D_8013170C - .incbin "baserom.z64", 0xBA88AC, 0x134 + .incbin "baserom.z64", 0xBA88AC, 0x94 + +glabel D_801317A0 + .incbin "baserom.z64", 0xBA8940, 0xA0 glabel D_80131840 - .incbin "baserom.z64", 0xBA89E0, 0x14 + .word D_80130F80 + +glabel D_80131844 + .incbin "baserom.z64", 0xBA89E4, 0x10 glabel D_80131854 - .incbin "baserom.z64", 0xBA89F4, 0x4 + .word D_80131844 glabel D_80131858 .incbin "baserom.z64", 0xBA89F8, 0x4 @@ -286,13 +295,13 @@ glabel D_8013188C .incbin "baserom.z64", 0xBA8A2C, 0x358 glabel D_80131BE4 - .incbin "baserom.z64", 0xBA8D84, 0x4 + .word D_80131884 glabel D_80131BE8 - .incbin "baserom.z64", 0xBA8D88, 0x4 + .word D_80131700 glabel D_80131BEC - .incbin "baserom.z64", 0xBA8D8C, 0x4 + .word D_801317A0 glabel D_80131BF0 .incbin "baserom.z64", 0xBA8D90, 0x10 @@ -457,7 +466,35 @@ glabel D_80131F68 .incbin "baserom.z64", 0xBA9108, 0x4 glabel D_80131F6C - .incbin "baserom.z64", 0xBA910C, 0x13B0 + .incbin "baserom.z64", 0xBA910C, 0x4 + +glabel D_80131F70 + .incbin "baserom.z64", 0xBA9110, 0x7CC + +glabel D_8013273C + .incbin "baserom.z64", 0xBA98DC, 0x380 + +glabel D_80132ABC + .incbin "baserom.z64", 0xBA9C5C, 0x140 + +glabel D_80132BFC + .incbin "baserom.z64", 0xBA9D9C, 0x3E0 + +glabel D_80132FDC + .incbin "baserom.z64", 0xBAA17C, 0x120 + +glabel D_801330FC + .incbin "baserom.z64", 0xBAA29C, 0x20 + +glabel D_8013311C + .incbin "baserom.z64", 0xBAA2BC, 0x200 glabel D_8013331C - .incbin "baserom.z64", 0xBAA4BC, 0x24 + .word D_8013273C + .word D_80132ABC + .word D_80132BFC + .word D_80131F70 + .word D_80132FDC + .word D_801330FC + .word D_8013311C + .incbin "baserom.z64", 0xBAA4D8, 0x8 diff --git a/data/code_800F7260.data.s b/data/code_800F7260.data.s index 19449a1088..9828691dd4 100644 --- a/data/code_800F7260.data.s +++ b/data/code_800F7260.data.s @@ -28,7 +28,13 @@ glabel D_801333A4 .incbin "baserom.z64", 0xBAA544, 0x4 glabel D_801333A8 - .incbin "baserom.z64", 0xBAA548, 0x1C + .word D_8016BAD0 + .word D_8016BC80 + .word D_8016BEC0 + .word D_8016C2E0 + .word D_8016C6A0 + .word D_8016C820 + .word D_8016C8B0 glabel D_801333C4 .incbin "baserom.z64", 0xBAA564, 0x8 diff --git a/data/code_800F9280.data.s b/data/code_800F9280.data.s index cbd438aa19..b381115d49 100644 --- a/data/code_800F9280.data.s +++ b/data/code_800F9280.data.s @@ -28,7 +28,40 @@ glabel D_80133414 .incbin "baserom.z64", 0xBAA5B4, 0x4 glabel D_80133418 - .incbin "baserom.z64", 0xBAA5B8, 0x3B0 + .incbin "baserom.z64", 0xBAA5B8, 0x8 + +glabel D_80133420 + .incbin "baserom.z64", 0xBAA5C0, 0x48 + +glabel D_80133468 + .incbin "baserom.z64", 0xBAA608, 0x48 + +glabel D_801334B0 + .incbin "baserom.z64", 0xBAA650, 0x90 + +glabel D_80133540 + .incbin "baserom.z64", 0xBAA6E0, 0x48 + +glabel D_80133588 + .incbin "baserom.z64", 0xBAA728, 0x48 + +glabel D_801335D0 + .incbin "baserom.z64", 0xBAA770, 0x48 + +glabel D_80133618 + .incbin "baserom.z64", 0xBAA7B8, 0x48 + +glabel D_80133660 + .incbin "baserom.z64", 0xBAA800, 0x48 + +glabel D_801336A8 + .incbin "baserom.z64", 0xBAA848, 0x48 + +glabel D_801336F0 + .incbin "baserom.z64", 0xBAA890, 0x48 + +glabel D_80133738 + .incbin "baserom.z64", 0xBAA8D8, 0x90 glabel D_801337C8 .incbin "baserom.z64", 0xBAA968, 0x5 @@ -37,4 +70,76 @@ glabel D_801337CD .incbin "baserom.z64", 0xBAA96D, 0x1 glabel D_801337CE - .incbin "baserom.z64", 0xBAA96E, 0x3F2 + .incbin "baserom.z64", 0xBAA96E, 0x6 + +glabel D_801337D4 + .word D_80133420 + .incbin "baserom.z64", 0xBAA978, 0x34 + +glabel D_8013380C + .word D_80133468 + .incbin "baserom.z64", 0xBAA9B0, 0x34 + +glabel D_80133844 + .word D_801334B0 + .incbin "baserom.z64", 0xBAA9E8, 0x34 + +glabel D_8013387C + .word D_80133540 + .incbin "baserom.z64", 0xBAAA20, 0x34 + +glabel D_801338B4 + .word D_80133588 + .incbin "baserom.z64", 0xBAAA58, 0x34 + +glabel D_801338EC + .word D_801335D0 + .incbin "baserom.z64", 0xBAAA90, 0x34 + +glabel D_80133924 + .word D_80133618 + .incbin "baserom.z64", 0xBAAAC8, 0x34 + +glabel D_8013395C + .word D_80133660 + .incbin "baserom.z64", 0xBAAB00, 0x34 + +glabel D_80133994 + .word D_801336A8 + .incbin "baserom.z64", 0xBAAB38, 0x34 + +glabel D_801339CC + .word D_80133660 + .incbin "baserom.z64", 0xBAAB70, 0x34 + +glabel D_80133A04 + .word D_801336F0 + .incbin "baserom.z64", 0xBAABA8, 0x34 + +glabel D_80133A3C + .word D_80133738 + .incbin "baserom.z64", 0xBAABE0, 0x34 + +glabel D_80133A74 + .word D_80133738 + .incbin "baserom.z64", 0xBAAC18, 0x34 + +glabel D_80133AAC + .word D_80133420 + .incbin "baserom.z64", 0xBAAC50, 0x34 + +glabel D_80133AE4 + .word D_80133660 + .incbin "baserom.z64", 0xBAAC88, 0x34 + +glabel D_80133B1C + .word D_80133420 + .incbin "baserom.z64", 0xBAACC0, 0x34 + +glabel D_80133B54 + .word D_80133420 + .incbin "baserom.z64", 0xBAACF8, 0x34 + +glabel D_80133B8C + .word D_801334B0 + .incbin "baserom.z64", 0xBAAD30, 0x30