summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTyler McGavran <tyler.taggerung@gmail.com>2023-11-25 15:24:25 -0500
committerGitHub <noreply@github.com>2023-11-25 13:24:25 -0700
commit8b2bca826805f5f0ce3c6918eeb5a1243f8288d3 (patch)
treeb472b8f270387090014ac29f90c73932d1026e28
parenta4b64d540c7e28b6942e26d2b7f32cf3187fd2d2 (diff)
Some matches in code_80071F00 (#496)
Signed-off-by: Taggerung <tyler.taggerung@email.com>
-rw-r--r--asm/bss_8001C4D0.s10
-rw-r--r--asm/non_matchings/code_80071F00/func_80077D5C.s55
-rw-r--r--asm/non_matchings/code_80071F00/func_8007B254.s65
-rw-r--r--asm/non_matchings/code_80071F00/func_8007B34C.s600
-rw-r--r--asm/non_matchings/code_80071F00/func_8007C7B4.s94
-rw-r--r--asm/non_matchings/code_80071F00/func_8007C91C.s58
-rw-r--r--asm/non_matchings/code_80071F00/func_8007CA70.s108
-rw-r--r--asm/non_matchings/code_80071F00/func_8007D070.s195
-rw-r--r--asm/non_matchings/code_80071F00/func_8007E00C.s124
-rw-r--r--asm/non_matchings/code_80071F00/func_8007FB48.s247
-rw-r--r--asm/non_matchings/code_80071F00/func_800808CC.s90
-rw-r--r--asm/non_matchings/code_80071F00/func_8008241C.s222
-rw-r--r--asm/non_matchings/code_80071F00/func_80084430.s79
-rw-r--r--asm/non_matchings/code_80071F00/func_80086D80.s64
-rw-r--r--include/objects.h2
-rw-r--r--src/code_80071F00.c1004
-rw-r--r--src/code_80071F00.h43
-rw-r--r--src/ending/ceremony_and_credits.h15
18 files changed, 396 insertions, 2679 deletions
diff --git a/asm/bss_8001C4D0.s b/asm/bss_8001C4D0.s
index f66063777..95dfc2450 100644
--- a/asm/bss_8001C4D0.s
+++ b/asm/bss_8001C4D0.s
@@ -757,15 +757,9 @@ glabel D_8018C0B0
.skip 256
# begin D_8018C1B0, should be 512 bytes big
-# D_8018C1D8 through D_8018C278 are fake variables
+# D_8018C278 is a fake variable
glabel D_8018C1B0
-.skip 40
-
-glabel D_8018C1D8
-.skip 80
-
-glabel D_8018C228
-.skip 80
+.skip 200
glabel D_8018C278
.skip 312
diff --git a/asm/non_matchings/code_80071F00/func_80077D5C.s b/asm/non_matchings/code_80071F00/func_80077D5C.s
deleted file mode 100644
index 809483249..000000000
--- a/asm/non_matchings/code_80071F00/func_80077D5C.s
+++ /dev/null
@@ -1,55 +0,0 @@
-glabel func_80077D5C
-/* 07895C 80077D5C 3C0E8016 */ lui $t6, %hi(D_8016559C) # $t6, 0x8016
-/* 078960 80077D60 8DCE559C */ lw $t6, %lo(D_8016559C)($t6)
-/* 078964 80077D64 27BDFFE8 */ addiu $sp, $sp, -0x18
-/* 078968 80077D68 AFBF0014 */ sw $ra, 0x14($sp)
-/* 07896C 80077D6C 15C00028 */ bnez $t6, .L80077E10
-/* 078970 80077D70 3C068019 */ lui $a2, %hi(D_8018D1F0) # $a2, 0x8019
-/* 078974 80077D74 8CC6D1F0 */ lw $a2, %lo(D_8018D1F0)($a2)
-/* 078978 80077D78 00002825 */ move $a1, $zero
-/* 07897C 80077D7C 3C028019 */ lui $v0, %hi(D_8018D17C) # $v0, 0x8019
-/* 078980 80077D80 18C00023 */ blez $a2, .L80077E10
-/* 078984 80077D84 00047880 */ sll $t7, $a0, 2
-/* 078988 80077D88 3C188019 */ lui $t8, %hi(D_8018CC80) # $t8, 0x8019
-/* 07898C 80077D8C 2718CC80 */ addiu $t8, %lo(D_8018CC80) # addiu $t8, $t8, -0x3380
-/* 078990 80077D90 3C088016 */ lui $t0, %hi(gObjectList) # $t0, 0x8016
-/* 078994 80077D94 3C038019 */ lui $v1, %hi(D_8018D17C) # $v1, 0x8019
-/* 078998 80077D98 2463D17C */ addiu $v1, %lo(D_8018D17C) # addiu $v1, $v1, -0x2e84
-/* 07899C 80077D9C 25085C18 */ addiu $t0, %lo(gObjectList) # addiu $t0, $t0, 0x5c18
-/* 0789A0 80077DA0 01F83821 */ addu $a3, $t7, $t8
-/* 0789A4 80077DA4 8442D17C */ lh $v0, %lo(D_8018D17C)($v0)
-/* 0789A8 80077DA8 240900E0 */ li $t1, 224
-/* 0789AC 80077DAC 24590001 */ addiu $t9, $v0, 1
-.L80077DB0:
-/* 0789B0 80077DB0 A4790000 */ sh $t9, ($v1)
-/* 0789B4 80077DB4 84620000 */ lh $v0, ($v1)
-/* 0789B8 80077DB8 24A50001 */ addiu $a1, $a1, 1
-/* 0789BC 80077DBC 0046082A */ slt $at, $v0, $a2
-/* 0789C0 80077DC0 54200004 */ bnel $at, $zero, .L80077DD4
-/* 0789C4 80077DC4 00025080 */ sll $t2, $v0, 2
-/* 0789C8 80077DC8 A4600000 */ sh $zero, ($v1)
-/* 0789CC 80077DCC 84620000 */ lh $v0, ($v1)
-/* 0789D0 80077DD0 00025080 */ sll $t2, $v0, 2
-.L80077DD4:
-/* 0789D4 80077DD4 00EA5821 */ addu $t3, $a3, $t2
-/* 0789D8 80077DD8 8D640000 */ lw $a0, ($t3)
-/* 0789DC 80077DDC 00A6082A */ slt $at, $a1, $a2
-/* 0789E0 80077DE0 00890019 */ multu $a0, $t1
-/* 0789E4 80077DE4 00006012 */ mflo $t4
-/* 0789E8 80077DE8 010C6821 */ addu $t5, $t0, $t4
-/* 0789EC 80077DEC 85AE00A6 */ lh $t6, 0xa6($t5)
-/* 0789F0 80077DF0 15C00005 */ bnez $t6, .L80077E08
-/* 0789F4 80077DF4 00000000 */ nop
-/* 0789F8 80077DF8 0C01C8E9 */ jal func_800723A4
-/* 0789FC 80077DFC 24050001 */ li $a1, 1
-/* 078A00 80077E00 10000004 */ b .L80077E14
-/* 078A04 80077E04 8FBF0014 */ lw $ra, 0x14($sp)
-.L80077E08:
-/* 078A08 80077E08 5420FFE9 */ bnel $at, $zero, .L80077DB0
-/* 078A0C 80077E0C 24590001 */ addiu $t9, $v0, 1
-.L80077E10:
-/* 078A10 80077E10 8FBF0014 */ lw $ra, 0x14($sp)
-.L80077E14:
-/* 078A14 80077E14 27BD0018 */ addiu $sp, $sp, 0x18
-/* 078A18 80077E18 03E00008 */ jr $ra
-/* 078A1C 80077E1C 00000000 */ nop
diff --git a/asm/non_matchings/code_80071F00/func_8007B254.s b/asm/non_matchings/code_80071F00/func_8007B254.s
deleted file mode 100644
index 8108bdddd..000000000
--- a/asm/non_matchings/code_80071F00/func_8007B254.s
+++ /dev/null
@@ -1,65 +0,0 @@
-glabel func_8007B254
-/* 07BE54 8007B254 27BDFFE0 */ addiu $sp, $sp, -0x20
-/* 07BE58 8007B258 AFBF0014 */ sw $ra, 0x14($sp)
-/* 07BE5C 8007B25C AFA40020 */ sw $a0, 0x20($sp)
-/* 07BE60 8007B260 0C01C90A */ jal func_80072428
-/* 07BE64 8007B264 AFA50024 */ sw $a1, 0x24($sp)
-/* 07BE68 8007B268 8FA40020 */ lw $a0, 0x20($sp)
-/* 07BE6C 8007B26C 3C0F8016 */ lui $t7, %hi(gObjectList) # $t7, 0x8016
-/* 07BE70 8007B270 25EF5C18 */ addiu $t7, %lo(gObjectList) # addiu $t7, $t7, 0x5c18
-/* 07BE74 8007B274 000470C0 */ sll $t6, $a0, 3
-/* 07BE78 8007B278 01C47023 */ subu $t6, $t6, $a0
-/* 07BE7C 8007B27C 000E7140 */ sll $t6, $t6, 5
-/* 07BE80 8007B280 01CF1021 */ addu $v0, $t6, $t7
-/* 07BE84 8007B284 3C190D02 */ lui $t9, %hi(gTLUTItemWindowNone) # $t9, 0xd02
-/* 07BE88 8007B288 3C080D02 */ lui $t0, %hi(gTextureItemWindowNone) # $t0, 0xd02
-/* 07BE8C 8007B28C 24180002 */ li $t8, 2
-/* 07BE90 8007B290 2739DED8 */ addiu $t9, %lo(gTLUTItemWindowNone) # addiu $t9, $t9, -0x2128
-/* 07BE94 8007B294 2508FED8 */ addiu $t0, %lo(gTextureItemWindowNone) # addiu $t0, $t0, -0x128
-/* 07BE98 8007B298 24090028 */ li $t1, 40
-/* 07BE9C 8007B29C 240A0020 */ li $t2, 32
-/* 07BEA0 8007B2A0 240B0032 */ li $t3, 50
-/* 07BEA4 8007B2A4 240C0001 */ li $t4, 1
-/* 07BEA8 8007B2A8 A45800A6 */ sh $t8, 0xa6($v0)
-/* 07BEAC 8007B2AC A44000A4 */ sh $zero, 0xa4($v0)
-/* 07BEB0 8007B2B0 AC590068 */ sw $t9, 0x68($v0)
-/* 07BEB4 8007B2B4 AC48006C */ sw $t0, 0x6c($v0)
-/* 07BEB8 8007B2B8 A04900D9 */ sb $t1, 0xd9($v0)
-/* 07BEBC 8007B2BC A04A00DA */ sb $t2, 0xda($v0)
-/* 07BEC0 8007B2C0 AC4B004C */ sw $t3, 0x4c($v0)
-/* 07BEC4 8007B2C4 A04C00D6 */ sb $t4, 0xd6($v0)
-/* 07BEC8 8007B2C8 A4400098 */ sh $zero, 0x98($v0)
-/* 07BECC 8007B2CC AFA20018 */ sw $v0, 0x18($sp)
-/* 07BED0 8007B2D0 0C01C8A9 */ jal func_800722A4
-/* 07BED4 8007B2D4 24050004 */ li $a1, 4
-/* 07BED8 8007B2D8 3C0D8016 */ lui $t5, %hi(D_80165888) # $t5, 0x8016
-/* 07BEDC 8007B2DC 81AD5888 */ lb $t5, %lo(D_80165888)($t5)
-/* 07BEE0 8007B2E0 8FA20018 */ lw $v0, 0x18($sp)
-/* 07BEE4 8007B2E4 8FA40020 */ lw $a0, 0x20($sp)
-/* 07BEE8 8007B2E8 11A00010 */ beqz $t5, .L8007B32C
-/* 07BEEC 8007B2EC 24050008 */ li $a1, 8
-/* 07BEF0 8007B2F0 0C01C9B3 */ jal func_800726CC
-/* 07BEF4 8007B2F4 AFA20018 */ sw $v0, 0x18($sp)
-/* 07BEF8 8007B2F8 8FA20018 */ lw $v0, 0x18($sp)
-/* 07BEFC 8007B2FC 240F000E */ li $t7, 14
-/* 07BF00 8007B300 240E0002 */ li $t6, 2
-/* 07BF04 8007B304 A44F00A4 */ sh $t7, 0xa4($v0)
-/* 07BF08 8007B308 804300A5 */ lb $v1, 0xa5($v0)
-/* 07BF0C 8007B30C 3C018019 */ lui $at, %hi(D_8018CAB8) # $at, 0x8019
-/* 07BF10 8007B310 A04E00D6 */ sb $t6, 0xd6($v0)
-/* 07BF14 8007B314 A04300D2 */ sb $v1, 0xd2($v0)
-/* 07BF18 8007B318 A44300A2 */ sh $v1, 0xa2($v0)
-/* 07BF1C 8007B31C A420CAB8 */ sh $zero, %lo(D_8018CAB8)($at)
-/* 07BF20 8007B320 3C018016 */ lui $at, %hi(D_80165888) # $at, 0x8016
-/* 07BF24 8007B324 10000005 */ b .L8007B33C
-/* 07BF28 8007B328 A0205888 */ sb $zero, %lo(D_80165888)($at)
-.L8007B32C:
-/* 07BF2C 8007B32C 3C050100 */ lui $a1, (0x0100FE1C >> 16) # lui $a1, 0x100
-/* 07BF30 8007B330 34A5FE1C */ ori $a1, (0x0100FE1C & 0xFFFF) # ori $a1, $a1, 0xfe1c
-/* 07BF34 8007B334 0C0323E0 */ jal func_800C8F80
-/* 07BF38 8007B338 93A40027 */ lbu $a0, 0x27($sp)
-.L8007B33C:
-/* 07BF3C 8007B33C 8FBF0014 */ lw $ra, 0x14($sp)
-/* 07BF40 8007B340 27BD0020 */ addiu $sp, $sp, 0x20
-/* 07BF44 8007B344 03E00008 */ jr $ra
-/* 07BF48 8007B348 00000000 */ nop
diff --git a/asm/non_matchings/code_80071F00/func_8007B34C.s b/asm/non_matchings/code_80071F00/func_8007B34C.s
deleted file mode 100644
index 945617b8a..000000000
--- a/asm/non_matchings/code_80071F00/func_8007B34C.s
+++ /dev/null
@@ -1,600 +0,0 @@
-.section .late_rodata
-
-glabel jpt_800EED3C
-.word L8007B998, L8007B41C, L8007B430
-.word L8007B5A4, L8007B5D0, L8007B5FC, L8007B628
-.word L8007B680, L8007B998, L8007B6A8, L8007B6D4
-.word L8007B6E8, L8007B834, L8007B998, L8007B998
-.word L8007B998, L8007B998, L8007B998, L8007B998
-.word L8007B998, L8007B844, L8007B894, L8007B998
-.word L8007B998, L8007B998, L8007B998, L8007B998
-.word L8007B998, L8007B998, L8007B998, L8007B8B0
-.word L8007B900, L8007B998, L8007B998, L8007B998
-.word L8007B998, L8007B998, L8007B998, L8007B998
-.word L8007B998, L8007B914, L8007B964, L8007B998
-.word L8007B998, L8007B998, L8007B998, L8007B998
-.word L8007B998, L8007B998, L8007B998, L8007B978
-
-.section .text
-
-glabel func_8007B34C
-/* 07BF4C 8007B34C 0004C0C0 */ sll $t8, $a0, 3
-/* 07BF50 8007B350 0304C023 */ subu $t8, $t8, $a0
-/* 07BF54 8007B354 0018C100 */ sll $t8, $t8, 4
-/* 07BF58 8007B358 27BDFFB8 */ addiu $sp, $sp, -0x48
-/* 07BF5C 8007B35C 0304C023 */ subu $t8, $t8, $a0
-/* 07BF60 8007B360 3C19800E */ lui $t9, %hi(gPlayerOne) # $t9, 0x800e
-/* 07BF64 8007B364 8F39C4DC */ lw $t9, %lo(gPlayerOne)($t9)
-/* 07BF68 8007B368 0018C080 */ sll $t8, $t8, 2
-/* 07BF6C 8007B36C 3C0A800E */ lui $t2, %hi(gControllerOne) # $t2, 0x800e
-/* 07BF70 8007B370 8D4AC4BC */ lw $t2, %lo(gControllerOne)($t2)
-/* 07BF74 8007B374 0304C023 */ subu $t8, $t8, $a0
-/* 07BF78 8007B378 0018C0C0 */ sll $t8, $t8, 3
-/* 07BF7C 8007B37C 00044900 */ sll $t1, $a0, 4
-/* 07BF80 8007B380 03194021 */ addu $t0, $t8, $t9
-/* 07BF84 8007B384 AFBF0024 */ sw $ra, 0x24($sp)
-/* 07BF88 8007B388 AFB00020 */ sw $s0, 0x20($sp)
-/* 07BF8C 8007B38C AFA40048 */ sw $a0, 0x48($sp)
-/* 07BF90 8007B390 AFA80038 */ sw $t0, 0x38($sp)
-/* 07BF94 8007B394 AFA00040 */ sw $zero, 0x40($sp)
-/* 07BF98 8007B398 012A1021 */ addu $v0, $t1, $t2
-/* 07BF9C 8007B39C 944B0006 */ lhu $t3, 6($v0)
-/* 07BFA0 8007B3A0 3C108018 */ lui $s0, %hi(gItemWindowObjectByPlayerId) # 0x8018
-/* 07BFA4 8007B3A4 00047880 */ sll $t7, $a0, 2
-/* 07BFA8 8007B3A8 020F8021 */ addu $s0, $s0, $t7
-/* 07BFAC 8007B3AC 316C2000 */ andi $t4, $t3, 0x2000
-/* 07BFB0 8007B3B0 11800003 */ beqz $t4, .L8007B3C0
-/* 07BFB4 8007B3B4 8E103E88 */ lw $s0, %lo(gItemWindowObjectByPlayerId)($s0) # 0x3e88($s0)
-/* 07BFB8 8007B3B8 240D0001 */ li $t5, 1
-/* 07BFBC 8007B3BC AFAD0040 */ sw $t5, 0x40($sp)
-.L8007B3C0:
-/* 07BFC0 8007B3C0 3C0F8016 */ lui $t7, %hi(D_80165888) # $t7, 0x8016
-/* 07BFC4 8007B3C4 81EF5888 */ lb $t7, %lo(D_80165888)($t7)
-/* 07BFC8 8007B3C8 02002025 */ move $a0, $s0
-/* 07BFCC 8007B3CC 51E00004 */ beql $t7, $zero, .L8007B3E0
-/* 07BFD0 8007B3D0 0010C0C0 */ sll $t8, $s0, 3
-/* 07BFD4 8007B3D4 0C01C8E9 */ jal func_800723A4
-/* 07BFD8 8007B3D8 00002825 */ move $a1, $zero
-/* 07BFDC 8007B3DC 0010C0C0 */ sll $t8, $s0, 3
-.L8007B3E0:
-/* 07BFE0 8007B3E0 0310C023 */ subu $t8, $t8, $s0
-/* 07BFE4 8007B3E4 3C198016 */ lui $t9, %hi(gObjectList) # $t9, 0x8016
-/* 07BFE8 8007B3E8 27395C18 */ addiu $t9, %lo(gObjectList) # addiu $t9, $t9, 0x5c18
-/* 07BFEC 8007B3EC 0018C140 */ sll $t8, $t8, 5
-/* 07BFF0 8007B3F0 03194021 */ addu $t0, $t8, $t9
-/* 07BFF4 8007B3F4 AFA8002C */ sw $t0, 0x2c($sp)
-/* 07BFF8 8007B3F8 950E00A6 */ lhu $t6, 0xa6($t0)
-/* 07BFFC 8007B3FC 2DC10033 */ sltiu $at, $t6, 0x33
-/* 07C000 8007B400 10200165 */ beqz $at, .L8007B998
-/* 07C004 8007B404 000E7080 */ sll $t6, $t6, 2
-/* 07C008 8007B408 3C01800F */ lui $at, %hi(jpt_800EED3C) # 0x800f
-/* 07C00C 8007B40C 002E0821 */ addu $at, $at, $t6
-/* 07C010 8007B410 8C2EED3C */ lw $t6, %lo(jpt_800EED3C)($at) # -0x12c4($at)
-/* 07C014 8007B414 01C00008 */ jr $t6
-/* 07C018 8007B418 00000000 */ nop
-glabel L8007B41C
-/* 07C01C 8007B41C 02002025 */ move $a0, $s0
-/* 07C020 8007B420 0C01EC95 */ jal func_8007B254
-/* 07C024 8007B424 8FA50048 */ lw $a1, 0x48($sp)
-/* 07C028 8007B428 1000015C */ b .L8007B99C
-/* 07C02C 8007B42C 02002025 */ move $a0, $s0
-glabel L8007B430
-/* 07C030 8007B430 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e
-/* 07C034 8007B434 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0)
-/* 07C038 8007B438 8FA90048 */ lw $t1, 0x48($sp)
-/* 07C03C 8007B43C 24010003 */ li $at, 3
-/* 07C040 8007B440 14400014 */ bnez $v0, .L8007B494
-/* 07C044 8007B444 00095140 */ sll $t2, $t1, 5
-/* 07C048 8007B448 01495021 */ addu $t2, $t2, $t1
-/* 07C04C 8007B44C 3C0B8019 */ lui $t3, %hi(D_8018CA70) # $t3, 0x8019
-/* 07C050 8007B450 256BCA70 */ addiu $t3, %lo(D_8018CA70) # addiu $t3, $t3, -0x3590
-/* 07C054 8007B454 000A5080 */ sll $t2, $t2, 2
-/* 07C058 8007B458 014B1821 */ addu $v1, $t2, $t3
-/* 07C05C 8007B45C 24640048 */ addiu $a0, $v1, 0x48
-/* 07C060 8007B460 AFA30028 */ sw $v1, 0x28($sp)
-/* 07C064 8007B464 24050040 */ li $a1, 64
-/* 07C068 8007B468 0C0103F6 */ jal s16_step_up_towards
-/* 07C06C 8007B46C 24060004 */ li $a2, 4
-/* 07C070 8007B470 8FA30028 */ lw $v1, 0x28($sp)
-/* 07C074 8007B474 24010040 */ li $at, 64
-/* 07C078 8007B478 846C0048 */ lh $t4, 0x48($v1)
-/* 07C07C 8007B47C 55810147 */ bnel $t4, $at, .L8007B99C
-/* 07C080 8007B480 02002025 */ move $a0, $s0
-/* 07C084 8007B484 0C01C922 */ jal func_80072488
-/* 07C088 8007B488 02002025 */ move $a0, $s0
-/* 07C08C 8007B48C 10000143 */ b .L8007B99C
-/* 07C090 8007B490 02002025 */ move $a0, $s0
-.L8007B494:
-/* 07C094 8007B494 1441002F */ bne $v0, $at, .L8007B554
-/* 07C098 8007B498 8FAC0048 */ lw $t4, 0x48($sp)
-/* 07C09C 8007B49C 8FAD0048 */ lw $t5, 0x48($sp)
-/* 07C0A0 8007B4A0 8FAF0048 */ lw $t7, 0x48($sp)
-/* 07C0A4 8007B4A4 24010002 */ li $at, 2
-/* 07C0A8 8007B4A8 11A00003 */ beqz $t5, .L8007B4B8
-/* 07C0AC 8007B4AC 000FC140 */ sll $t8, $t7, 5
-/* 07C0B0 8007B4B0 15A10014 */ bne $t5, $at, .L8007B504
-/* 07C0B4 8007B4B4 8FAE0048 */ lw $t6, 0x48($sp)
-.L8007B4B8:
-/* 07C0B8 8007B4B8 030FC021 */ addu $t8, $t8, $t7
-/* 07C0BC 8007B4BC 3C198019 */ lui $t9, %hi(D_8018CA70) # $t9, 0x8019
-/* 07C0C0 8007B4C0 2739CA70 */ addiu $t9, %lo(D_8018CA70) # addiu $t9, $t9, -0x3590
-/* 07C0C4 8007B4C4 0018C080 */ sll $t8, $t8, 2
-/* 07C0C8 8007B4C8 03191821 */ addu $v1, $t8, $t9
-/* 07C0CC 8007B4CC 24640046 */ addiu $a0, $v1, 0x46
-/* 07C0D0 8007B4D0 AFA30028 */ sw $v1, 0x28($sp)
-/* 07C0D4 8007B4D4 24050080 */ li $a1, 128
-/* 07C0D8 8007B4D8 0C0103F6 */ jal s16_step_up_towards
-/* 07C0DC 8007B4DC 24060008 */ li $a2, 8
-/* 07C0E0 8007B4E0 8FA30028 */ lw $v1, 0x28($sp)
-/* 07C0E4 8007B4E4 24010080 */ li $at, 128
-/* 07C0E8 8007B4E8 84680046 */ lh $t0, 0x46($v1)
-/* 07C0EC 8007B4EC 5501012B */ bnel $t0, $at, .L8007B99C
-/* 07C0F0 8007B4F0 02002025 */ move $a0, $s0
-/* 07C0F4 8007B4F4 0C01C922 */ jal func_80072488
-/* 07C0F8 8007B4F8 02002025 */ move $a0, $s0
-/* 07C0FC 8007B4FC 10000127 */ b .L8007B99C
-/* 07C100 8007B500 02002025 */ move $a0, $s0
-.L8007B504:
-/* 07C104 8007B504 000E4940 */ sll $t1, $t6, 5
-/* 07C108 8007B508 012E4821 */ addu $t1, $t1, $t6
-/* 07C10C 8007B50C 3C0A8019 */ lui $t2, %hi(D_8018CA70) # $t2, 0x8019
-/* 07C110 8007B510 254ACA70 */ addiu $t2, %lo(D_8018CA70) # addiu $t2, $t2, -0x3590
-/* 07C114 8007B514 00094880 */ sll $t1, $t1, 2
-/* 07C118 8007B518 012A1821 */ addu $v1, $t1, $t2
-/* 07C11C 8007B51C 24640046 */ addiu $a0, $v1, 0x46
-/* 07C120 8007B520 AFA30028 */ sw $v1, 0x28($sp)
-/* 07C124 8007B524 2405FF80 */ li $a1, -128
-/* 07C128 8007B528 0C01041B */ jal s16_step_down_towards
-/* 07C12C 8007B52C 24060008 */ li $a2, 8
-/* 07C130 8007B530 8FA30028 */ lw $v1, 0x28($sp)
-/* 07C134 8007B534 2401FF80 */ li $at, -128
-/* 07C138 8007B538 846B0046 */ lh $t3, 0x46($v1)
-/* 07C13C 8007B53C 55610117 */ bnel $t3, $at, .L8007B99C
-/* 07C140 8007B540 02002025 */ move $a0, $s0
-/* 07C144 8007B544 0C01C922 */ jal func_80072488
-/* 07C148 8007B548 02002025 */ move $a0, $s0
-/* 07C14C 8007B54C 10000113 */ b .L8007B99C
-/* 07C150 8007B550 02002025 */ move $a0, $s0
-.L8007B554:
-/* 07C154 8007B554 000C6940 */ sll $t5, $t4, 5
-/* 07C158 8007B558 01AC6821 */ addu $t5, $t5, $t4
-/* 07C15C 8007B55C 3C0F8019 */ lui $t7, %hi(D_8018CA70) # $t7, 0x8019
-/* 07C160 8007B560 25EFCA70 */ addiu $t7, %lo(D_8018CA70) # addiu $t7, $t7, -0x3590
-/* 07C164 8007B564 000D6880 */ sll $t5, $t5, 2
-/* 07C168 8007B568 01AF1821 */ addu $v1, $t5, $t7
-/* 07C16C 8007B56C 24640046 */ addiu $a0, $v1, 0x46
-/* 07C170 8007B570 AFA30028 */ sw $v1, 0x28($sp)
-/* 07C174 8007B574 24050080 */ li $a1, 128
-/* 07C178 8007B578 0C0103F6 */ jal s16_step_up_towards
-/* 07C17C 8007B57C 24060008 */ li $a2, 8
-/* 07C180 8007B580 8FA30028 */ lw $v1, 0x28($sp)
-/* 07C184 8007B584 24010080 */ li $at, 128
-/* 07C188 8007B588 84780046 */ lh $t8, 0x46($v1)
-/* 07C18C 8007B58C 57010103 */ bnel $t8, $at, .L8007B99C
-/* 07C190 8007B590 02002025 */ move $a0, $s0
-/* 07C194 8007B594 0C01C922 */ jal func_80072488
-/* 07C198 8007B598 02002025 */ move $a0, $s0
-/* 07C19C 8007B59C 100000FF */ b .L8007B99C
-/* 07C1A0 8007B5A0 02002025 */ move $a0, $s0
-glabel L8007B5A4
-/* 07C1A4 8007B5A4 24190002 */ li $t9, 2
-/* 07C1A8 8007B5A8 24080002 */ li $t0, 2
-/* 07C1AC 8007B5AC AFA80014 */ sw $t0, 0x14($sp)
-/* 07C1B0 8007B5B0 AFB90010 */ sw $t9, 0x10($sp)
-/* 07C1B4 8007B5B4 02002025 */ move $a0, $s0
-/* 07C1B8 8007B5B8 24050001 */ li $a1, 1
-/* 07C1BC 8007B5BC 2406000F */ li $a2, 15
-/* 07C1C0 8007B5C0 0C01CB95 */ jal func_80072E54
-/* 07C1C4 8007B5C4 24070001 */ li $a3, 1
-/* 07C1C8 8007B5C8 100000F4 */ b .L8007B99C
-/* 07C1CC 8007B5CC 02002025 */ move $a0, $s0
-glabel L8007B5D0
-/* 07C1D0 8007B5D0 240E0008 */ li $t6, 8
-/* 07C1D4 8007B5D4 24090001 */ li $t1, 1
-/* 07C1D8 8007B5D8 AFA90014 */ sw $t1, 0x14($sp)
-/* 07C1DC 8007B5DC AFAE0010 */ sw $t6, 0x10($sp)
-/* 07C1E0 8007B5E0 02002025 */ move $a0, $s0
-/* 07C1E4 8007B5E4 24050001 */ li $a1, 1
-/* 07C1E8 8007B5E8 24060006 */ li $a2, 6
-/* 07C1EC 8007B5EC 0C01CB95 */ jal func_80072E54
-/* 07C1F0 8007B5F0 24070001 */ li $a3, 1
-/* 07C1F4 8007B5F4 100000E9 */ b .L8007B99C
-/* 07C1F8 8007B5F8 02002025 */ move $a0, $s0
-glabel L8007B5FC
-/* 07C1FC 8007B5FC 240A0010 */ li $t2, 16
-/* 07C200 8007B600 240B0001 */ li $t3, 1
-/* 07C204 8007B604 AFAB0014 */ sw $t3, 0x14($sp)
-/* 07C208 8007B608 AFAA0010 */ sw $t2, 0x10($sp)
-/* 07C20C 8007B60C 02002025 */ move $a0, $s0
-/* 07C210 8007B610 24050001 */ li $a1, 1
-/* 07C214 8007B614 24060004 */ li $a2, 4
-/* 07C218 8007B618 0C01CB95 */ jal func_80072E54
-/* 07C21C 8007B61C 24070001 */ li $a3, 1
-/* 07C220 8007B620 100000DE */ b .L8007B99C
-/* 07C224 8007B624 02002025 */ move $a0, $s0
-glabel L8007B628
-/* 07C228 8007B628 02002025 */ move $a0, $s0
-/* 07C22C 8007B62C 0C01EBEC */ jal func_8007AFB0
-/* 07C230 8007B630 8FA50048 */ lw $a1, 0x48($sp)
-/* 07C234 8007B634 8FAC002C */ lw $t4, 0x2c($sp)
-/* 07C238 8007B638 240D0008 */ li $t5, 8
-/* 07C23C 8007B63C 240F0002 */ li $t7, 2
-/* 07C240 8007B640 02002025 */ move $a0, $s0
-/* 07C244 8007B644 A18200D2 */ sb $v0, 0xd2($t4)
-/* 07C248 8007B648 AD8D004C */ sw $t5, 0x4c($t4)
-/* 07C24C 8007B64C 0C01C922 */ jal func_80072488
-/* 07C250 8007B650 A18F00D6 */ sb $t7, 0xd6($t4)
-/* 07C254 8007B654 93A4004B */ lbu $a0, 0x4b($sp)
-/* 07C258 8007B658 3C050100 */ lui $a1, (0x0100FE1C >> 16) # lui $a1, 0x100
-/* 07C25C 8007B65C 34A5FE1C */ ori $a1, (0x0100FE1C & 0xFFFF) # ori $a1, $a1, 0xfe1c
-/* 07C260 8007B660 0C032406 */ jal func_800C9018
-/* 07C264 8007B664 AFA40028 */ sw $a0, 0x28($sp)
-/* 07C268 8007B668 3C050100 */ lui $a1, (0x0100FE47 >> 16) # lui $a1, 0x100
-/* 07C26C 8007B66C 8FA40028 */ lw $a0, 0x28($sp)
-/* 07C270 8007B670 0C0323E0 */ jal func_800C8F80
-/* 07C274 8007B674 34A5FE47 */ ori $a1, (0x0100FE47 & 0xFFFF) # ori $a1, $a1, 0xfe47
-/* 07C278 8007B678 100000C8 */ b .L8007B99C
-/* 07C27C 8007B67C 02002025 */ move $a0, $s0
-glabel L8007B680
-/* 07C280 8007B680 8FB8002C */ lw $t8, 0x2c($sp)
-/* 07C284 8007B684 2419000A */ li $t9, 10
-/* 07C288 8007B688 02002025 */ move $a0, $s0
-/* 07C28C 8007B68C 870500A2 */ lh $a1, 0xa2($t8)
-/* 07C290 8007B690 AFB90010 */ sw $t9, 0x10($sp)
-/* 07C294 8007B694 00003025 */ move $a2, $zero
-/* 07C298 8007B698 0C01CB4F */ jal func_80072D3C
-/* 07C29C 8007B69C 24070008 */ li $a3, 8
-/* 07C2A0 8007B6A0 100000BE */ b .L8007B99C
-/* 07C2A4 8007B6A4 02002025 */ move $a0, $s0
-glabel L8007B6A8
-/* 07C2A8 8007B6A8 02002025 */ move $a0, $s0
-/* 07C2AC 8007B6AC 0C01C8B3 */ jal func_800722CC
-/* 07C2B0 8007B6B0 24050004 */ li $a1, 4
-/* 07C2B4 8007B6B4 0C01CD80 */ jal func_80073600
-/* 07C2B8 8007B6B8 02002025 */ move $a0, $s0
-/* 07C2BC 8007B6BC 8FA8002C */ lw $t0, 0x2c($sp)
-/* 07C2C0 8007B6C0 02002025 */ move $a0, $s0
-/* 07C2C4 8007B6C4 0C01C922 */ jal func_80072488
-/* 07C2C8 8007B6C8 A10000D2 */ sb $zero, 0xd2($t0)
-/* 07C2CC 8007B6CC 100000B3 */ b .L8007B99C
-/* 07C2D0 8007B6D0 02002025 */ move $a0, $s0
-glabel L8007B6D4
-/* 07C2D4 8007B6D4 02002025 */ move $a0, $s0
-/* 07C2D8 8007B6D8 0C01C9E3 */ jal func_8007278C
-/* 07C2DC 8007B6DC 24050014 */ li $a1, 20
-/* 07C2E0 8007B6E0 100000AE */ b .L8007B99C
-/* 07C2E4 8007B6E4 02002025 */ move $a0, $s0
-glabel L8007B6E8
-/* 07C2E8 8007B6E8 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e
-/* 07C2EC 8007B6EC 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0)
-/* 07C2F0 8007B6F0 8FAE0048 */ lw $t6, 0x48($sp)
-/* 07C2F4 8007B6F4 24010003 */ li $at, 3
-/* 07C2F8 8007B6F8 14400010 */ bnez $v0, .L8007B73C
-/* 07C2FC 8007B6FC 000E4940 */ sll $t1, $t6, 5
-/* 07C300 8007B700 012E4821 */ addu $t1, $t1, $t6
-/* 07C304 8007B704 00094880 */ sll $t1, $t1, 2
-/* 07C308 8007B708 3C0B8019 */ lui $t3, %hi(D_8018CA70) # $t3, 0x8019
-/* 07C30C 8007B70C 256BCA70 */ addiu $t3, %lo(D_8018CA70) # addiu $t3, $t3, -0x3590
-/* 07C310 8007B710 252A0048 */ addiu $t2, $t1, 0x48
-/* 07C314 8007B714 014B2021 */ addu $a0, $t2, $t3
-/* 07C318 8007B718 00002825 */ move $a1, $zero
-/* 07C31C 8007B71C 0C01041B */ jal s16_step_down_towards
-/* 07C320 8007B720 24060004 */ li $a2, 4
-/* 07C324 8007B724 5040009D */ beql $v0, $zero, .L8007B99C
-/* 07C328 8007B728 02002025 */ move $a0, $s0
-/* 07C32C 8007B72C 0C01C922 */ jal func_80072488
-/* 07C330 8007B730 02002025 */ move $a0, $s0
-/* 07C334 8007B734 10000099 */ b .L8007B99C
-/* 07C338 8007B738 02002025 */ move $a0, $s0
-.L8007B73C:
-/* 07C33C 8007B73C 1441002D */ bne $v0, $at, .L8007B7F4
-/* 07C340 8007B740 8FAB0048 */ lw $t3, 0x48($sp)
-/* 07C344 8007B744 8FAD0048 */ lw $t5, 0x48($sp)
-/* 07C348 8007B748 8FAF0048 */ lw $t7, 0x48($sp)
-/* 07C34C 8007B74C 24010002 */ li $at, 2
-/* 07C350 8007B750 11A00003 */ beqz $t5, .L8007B760
-/* 07C354 8007B754 000F6140 */ sll $t4, $t7, 5
-/* 07C358 8007B758 15A10013 */ bne $t5, $at, .L8007B7A8
-/* 07C35C 8007B75C 8FA80048 */ lw $t0, 0x48($sp)
-.L8007B760:
-/* 07C360 8007B760 018F6021 */ addu $t4, $t4, $t7
-/* 07C364 8007B764 3C188019 */ lui $t8, %hi(D_8018CA70) # $t8, 0x8019
-/* 07C368 8007B768 2718CA70 */ addiu $t8, %lo(D_8018CA70) # addiu $t8, $t8, -0x3590
-/* 07C36C 8007B76C 000C6080 */ sll $t4, $t4, 2
-/* 07C370 8007B770 01981821 */ addu $v1, $t4, $t8
-/* 07C374 8007B774 24640046 */ addiu $a0, $v1, 0x46
-/* 07C378 8007B778 AFA30028 */ sw $v1, 0x28($sp)
-/* 07C37C 8007B77C 00002825 */ move $a1, $zero
-/* 07C380 8007B780 0C01041B */ jal s16_step_down_towards
-/* 07C384 8007B784 24060008 */ li $a2, 8
-/* 07C388 8007B788 8FA30028 */ lw $v1, 0x28($sp)
-/* 07C38C 8007B78C 84790046 */ lh $t9, 0x46($v1)
-/* 07C390 8007B790 57200082 */ bnel $t9, $zero, .L8007B99C
-/* 07C394 8007B794 02002025 */ move $a0, $s0
-/* 07C398 8007B798 0C01C922 */ jal func_80072488
-/* 07C39C 8007B79C 02002025 */ move $a0, $s0
-/* 07C3A0 8007B7A0 1000007E */ b .L8007B99C
-/* 07C3A4 8007B7A4 02002025 */ move $a0, $s0
-.L8007B7A8:
-/* 07C3A8 8007B7A8 00087140 */ sll $t6, $t0, 5
-/* 07C3AC 8007B7AC 01C87021 */ addu $t6, $t6, $t0
-/* 07C3B0 8007B7B0 3C098019 */ lui $t1, %hi(D_8018CA70) # $t1, 0x8019
-/* 07C3B4 8007B7B4 2529CA70 */ addiu $t1, %lo(D_8018CA70) # addiu $t1, $t1, -0x3590
-/* 07C3B8 8007B7B8 000E7080 */ sll $t6, $t6, 2
-/* 07C3BC 8007B7BC 01C91821 */ addu $v1, $t6, $t1
-/* 07C3C0 8007B7C0 24640046 */ addiu $a0, $v1, 0x46
-/* 07C3C4 8007B7C4 AFA30028 */ sw $v1, 0x28($sp)
-/* 07C3C8 8007B7C8 00002825 */ move $a1, $zero
-/* 07C3CC 8007B7CC 0C0103F6 */ jal s16_step_up_towards
-/* 07C3D0 8007B7D0 24060008 */ li $a2, 8
-/* 07C3D4 8007B7D4 8FA30028 */ lw $v1, 0x28($sp)
-/* 07C3D8 8007B7D8 846A0046 */ lh $t2, 0x46($v1)
-/* 07C3DC 8007B7DC 5540006F */ bnel $t2, $zero, .L8007B99C
-/* 07C3E0 8007B7E0 02002025 */ move $a0, $s0
-/* 07C3E4 8007B7E4 0C01C922 */ jal func_80072488
-/* 07C3E8 8007B7E8 02002025 */ move $a0, $s0
-/* 07C3EC 8007B7EC 1000006B */ b .L8007B99C
-/* 07C3F0 8007B7F0 02002025 */ move $a0, $s0
-.L8007B7F4:
-/* 07C3F4 8007B7F4 000B6940 */ sll $t5, $t3, 5
-/* 07C3F8 8007B7F8 01AB6821 */ addu $t5, $t5, $t3
-/* 07C3FC 8007B7FC 000D6880 */ sll $t5, $t5, 2
-/* 07C400 8007B800 3C0C8019 */ lui $t4, %hi(D_8018CA70) # $t4, 0x8019
-/* 07C404 8007B804 258CCA70 */ addiu $t4, %lo(D_8018CA70) # addiu $t4, $t4, -0x3590
-/* 07C408 8007B808 25AF0046 */ addiu $t7, $t5, 0x46
-/* 07C40C 8007B80C 01EC2021 */ addu $a0, $t7, $t4
-/* 07C410 8007B810 00002825 */ move $a1, $zero
-/* 07C414 8007B814 0C01041B */ jal s16_step_down_towards
-/* 07C418 8007B818 24060008 */ li $a2, 8
-/* 07C41C 8007B81C 5040005F */ beql $v0, $zero, .L8007B99C
-/* 07C420 8007B820 02002025 */ move $a0, $s0
-/* 07C424 8007B824 0C01C922 */ jal func_80072488
-/* 07C428 8007B828 02002025 */ move $a0, $s0
-/* 07C42C 8007B82C 1000005B */ b .L8007B99C
-/* 07C430 8007B830 02002025 */ move $a0, $s0
-glabel L8007B834
-/* 07C434 8007B834 0C01C90A */ jal func_80072428
-/* 07C438 8007B838 02002025 */ move $a0, $s0
-/* 07C43C 8007B83C 10000057 */ b .L8007B99C
-/* 07C440 8007B840 02002025 */ move $a0, $s0
-glabel L8007B844
-/* 07C444 8007B844 8FB8002C */ lw $t8, 0x2c($sp)
-/* 07C448 8007B848 2401000B */ li $at, 11
-/* 07C44C 8007B84C 02002025 */ move $a0, $s0
-/* 07C450 8007B850 870500A2 */ lh $a1, 0xa2($t8)
-/* 07C454 8007B854 2406000B */ li $a2, 11
-/* 07C458 8007B858 24070008 */ li $a3, 8
-/* 07C45C 8007B85C 14A10009 */ bne $a1, $at, .L8007B884
-/* 07C460 8007B860 2408000A */ li $t0, 10
-/* 07C464 8007B864 2419000A */ li $t9, 10
-/* 07C468 8007B868 AFB90010 */ sw $t9, 0x10($sp)
-/* 07C46C 8007B86C 02002025 */ move $a0, $s0
-/* 07C470 8007B870 00003025 */ move $a2, $zero
-/* 07C474 8007B874 0C01CB4F */ jal func_80072D3C
-/* 07C478 8007B878 24070008 */ li $a3, 8
-/* 07C47C 8007B87C 10000047 */ b .L8007B99C
-/* 07C480 8007B880 02002025 */ move $a0, $s0
-.L8007B884:
-/* 07C484 8007B884 0C01CB4F */ jal func_80072D3C
-/* 07C488 8007B888 AFA80010 */ sw $t0, 0x10($sp)
-/* 07C48C 8007B88C 10000043 */ b .L8007B99C
-/* 07C490 8007B890 02002025 */ move $a0, $s0
-glabel L8007B894
-/* 07C494 8007B894 02002025 */ move $a0, $s0
-/* 07C498 8007B898 0C01C9B3 */ jal func_800726CC
-/* 07C49C 8007B89C 24050008 */ li $a1, 8
-/* 07C4A0 8007B8A0 8FA9002C */ lw $t1, 0x2c($sp)
-/* 07C4A4 8007B8A4 240E0002 */ li $t6, 2
-/* 07C4A8 8007B8A8 1000003B */ b .L8007B998
-/* 07C4AC 8007B8AC A12E00D6 */ sb $t6, 0xd6($t1)
-glabel L8007B8B0
-/* 07C4B0 8007B8B0 8FAA002C */ lw $t2, 0x2c($sp)
-/* 07C4B4 8007B8B4 2401000B */ li $at, 11
-/* 07C4B8 8007B8B8 02002025 */ move $a0, $s0
-/* 07C4BC 8007B8BC 854500A2 */ lh $a1, 0xa2($t2)
-/* 07C4C0 8007B8C0 2406000B */ li $a2, 11
-/* 07C4C4 8007B8C4 24070008 */ li $a3, 8
-/* 07C4C8 8007B8C8 14A10009 */ bne $a1, $at, .L8007B8F0
-/* 07C4CC 8007B8CC 240D000A */ li $t5, 10
-/* 07C4D0 8007B8D0 240B000A */ li $t3, 10
-/* 07C4D4 8007B8D4 AFAB0010 */ sw $t3, 0x10($sp)
-/* 07C4D8 8007B8D8 02002025 */ move $a0, $s0
-/* 07C4DC 8007B8DC 00003025 */ move $a2, $zero
-/* 07C4E0 8007B8E0 0C01CB4F */ jal func_80072D3C
-/* 07C4E4 8007B8E4 24070008 */ li $a3, 8
-/* 07C4E8 8007B8E8 1000002C */ b .L8007B99C
-/* 07C4EC 8007B8EC 02002025 */ move $a0, $s0
-.L8007B8F0:
-/* 07C4F0 8007B8F0 0C01CB4F */ jal func_80072D3C
-/* 07C4F4 8007B8F4 AFAD0010 */ sw $t5, 0x10($sp)
-/* 07C4F8 8007B8F8 10000028 */ b .L8007B99C
-/* 07C4FC 8007B8FC 02002025 */ move $a0, $s0
-glabel L8007B900
-/* 07C500 8007B900 02002025 */ move $a0, $s0
-/* 07C504 8007B904 0C01C9B3 */ jal func_800726CC
-/* 07C508 8007B908 24050009 */ li $a1, 9
-/* 07C50C 8007B90C 10000023 */ b .L8007B99C
-/* 07C510 8007B910 02002025 */ move $a0, $s0
-glabel L8007B914
-/* 07C514 8007B914 8FAF002C */ lw $t7, 0x2c($sp)
-/* 07C518 8007B918 2401000D */ li $at, 13
-/* 07C51C 8007B91C 02002025 */ move $a0, $s0
-/* 07C520 8007B920 85E500A2 */ lh $a1, 0xa2($t7)
-/* 07C524 8007B924 2406000D */ li $a2, 13
-/* 07C528 8007B928 24070008 */ li $a3, 8
-/* 07C52C 8007B92C 14A10009 */ bne $a1, $at, .L8007B954
-/* 07C530 8007B930 2418000A */ li $t8, 10
-/* 07C534 8007B934 240C000A */ li $t4, 10
-/* 07C538 8007B938 AFAC0010 */ sw $t4, 0x10($sp)
-/* 07C53C 8007B93C 02002025 */ move $a0, $s0
-/* 07C540 8007B940 2406000E */ li $a2, 14
-/* 07C544 8007B944 0C01CB4F */ jal func_80072D3C
-/* 07C548 8007B948 24070008 */ li $a3, 8
-/* 07C54C 8007B94C 10000013 */ b .L8007B99C
-/* 07C550 8007B950 02002025 */ move $a0, $s0
-.L8007B954:
-/* 07C554 8007B954 0C01CB4F */ jal func_80072D3C
-/* 07C558 8007B958 AFB80010 */ sw $t8, 0x10($sp)
-/* 07C55C 8007B95C 1000000F */ b .L8007B99C
-/* 07C560 8007B960 02002025 */ move $a0, $s0
-glabel L8007B964
-/* 07C564 8007B964 02002025 */ move $a0, $s0
-/* 07C568 8007B968 0C01C9B3 */ jal func_800726CC
-/* 07C56C 8007B96C 24050008 */ li $a1, 8
-/* 07C570 8007B970 1000000A */ b .L8007B99C
-/* 07C574 8007B974 02002025 */ move $a0, $s0
-glabel L8007B978
-/* 07C578 8007B978 8FB9002C */ lw $t9, 0x2c($sp)
-/* 07C57C 8007B97C 24080064 */ li $t0, 100
-/* 07C580 8007B980 02002025 */ move $a0, $s0
-/* 07C584 8007B984 872500A2 */ lh $a1, 0xa2($t9)
-/* 07C588 8007B988 AFA80010 */ sw $t0, 0x10($sp)
-/* 07C58C 8007B98C 00003025 */ move $a2, $zero
-/* 07C590 8007B990 0C01CB4F */ jal func_80072D3C
-/* 07C594 8007B994 24070008 */ li $a3, 8
-.L8007B998:
-glabel L8007B998
-/* 07C598 8007B998 02002025 */ move $a0, $s0
-.L8007B99C:
-/* 07C59C 8007B99C 0C01C8C8 */ jal func_80072320
-/* 07C5A0 8007B9A0 24050002 */ li $a1, 2
-/* 07C5A4 8007B9A4 1040000B */ beqz $v0, .L8007B9D4
-/* 07C5A8 8007B9A8 8FAE002C */ lw $t6, 0x2c($sp)
-/* 07C5AC 8007B9AC 95C20098 */ lhu $v0, 0x98($t6)
-/* 07C5B0 8007B9B0 8FAA002C */ lw $t2, 0x2c($sp)
-/* 07C5B4 8007B9B4 54400006 */ bnel $v0, $zero, .L8007B9D0
-/* 07C5B8 8007B9B8 2449FFFF */ addiu $t1, $v0, -1
-/* 07C5BC 8007B9BC 0C01EB27 */ jal consume_item
-/* 07C5C0 8007B9C0 8FA40048 */ lw $a0, 0x48($sp)
-/* 07C5C4 8007B9C4 10000004 */ b .L8007B9D8
-/* 07C5C8 8007B9C8 8FAB002C */ lw $t3, 0x2c($sp)
-/* 07C5CC 8007B9CC 2449FFFF */ addiu $t1, $v0, -1
-.L8007B9D0:
-/* 07C5D0 8007B9D0 A5490098 */ sh $t1, 0x98($t2)
-.L8007B9D4:
-/* 07C5D4 8007B9D4 8FAB002C */ lw $t3, 0x2c($sp)
-.L8007B9D8:
-/* 07C5D8 8007B9D8 8D62004C */ lw $v0, 0x4c($t3)
-/* 07C5DC 8007B9DC 0442005D */ bltzl $v0, .L8007BB54
-/* 07C5E0 8007B9E0 8FA8002C */ lw $t0, 0x2c($sp)
-/* 07C5E4 8007B9E4 18400004 */ blez $v0, .L8007B9F8
-/* 07C5E8 8007B9E8 8FAF002C */ lw $t7, 0x2c($sp)
-/* 07C5EC 8007B9EC 244DFFFF */ addiu $t5, $v0, -1
-/* 07C5F0 8007B9F0 10000057 */ b .L8007BB50
-/* 07C5F4 8007B9F4 AD6D004C */ sw $t5, 0x4c($t3)
-.L8007B9F8:
-/* 07C5F8 8007B9F8 91E200D6 */ lbu $v0, 0xd6($t7)
-/* 07C5FC 8007B9FC 24010001 */ li $at, 1
-/* 07C600 8007BA00 8FAC0040 */ lw $t4, 0x40($sp)
-/* 07C604 8007BA04 10410008 */ beq $v0, $at, .L8007BA28
-/* 07C608 8007BA08 24010002 */ li $at, 2
-/* 07C60C 8007BA0C 1041000F */ beq $v0, $at, .L8007BA4C
-/* 07C610 8007BA10 8FB8002C */ lw $t8, 0x2c($sp)
-/* 07C614 8007BA14 24010003 */ li $at, 3
-/* 07C618 8007BA18 10410013 */ beq $v0, $at, .L8007BA68
-/* 07C61C 8007BA1C 8FAE002C */ lw $t6, 0x2c($sp)
-/* 07C620 8007BA20 1000004C */ b .L8007BB54
-/* 07C624 8007BA24 8FA8002C */ lw $t0, 0x2c($sp)
-.L8007BA28:
-/* 07C628 8007BA28 5180004A */ beql $t4, $zero, .L8007BB54
-/* 07C62C 8007BA2C 8FA8002C */ lw $t0, 0x2c($sp)
-/* 07C630 8007BA30 0C01CD80 */ jal func_80073600
-/* 07C634 8007BA34 02002025 */ move $a0, $s0
-/* 07C638 8007BA38 02002025 */ move $a0, $s0
-/* 07C63C 8007BA3C 0C01C9B3 */ jal func_800726CC
-/* 07C640 8007BA40 24050006 */ li $a1, 6
-/* 07C644 8007BA44 10000043 */ b .L8007BB54
-/* 07C648 8007BA48 8FA8002C */ lw $t0, 0x2c($sp)
-.L8007BA4C:
-/* 07C64C 8007BA4C 02002025 */ move $a0, $s0
-/* 07C650 8007BA50 0C01CA74 */ jal set_type_object
-/* 07C654 8007BA54 870500A2 */ lh $a1, 0xa2($t8)
-/* 07C658 8007BA58 8FA8002C */ lw $t0, 0x2c($sp)
-/* 07C65C 8007BA5C 24190003 */ li $t9, 3
-/* 07C660 8007BA60 1000003B */ b .L8007BB50
-/* 07C664 8007BA64 A11900D6 */ sb $t9, 0xd6($t0)
-.L8007BA68:
-/* 07C668 8007BA68 85C900A4 */ lh $t1, 0xa4($t6)
-/* 07C66C 8007BA6C 02002025 */ move $a0, $s0
-/* 07C670 8007BA70 55200038 */ bnel $t1, $zero, .L8007BB54
-/* 07C674 8007BA74 8FA8002C */ lw $t0, 0x2c($sp)
-/* 07C678 8007BA78 0C01C8D5 */ jal func_80072354
-/* 07C67C 8007BA7C 24050001 */ li $a1, 1
-/* 07C680 8007BA80 1040002C */ beqz $v0, .L8007BB34
-/* 07C684 8007BA84 02002025 */ move $a0, $s0
-/* 07C688 8007BA88 8FAA002C */ lw $t2, 0x2c($sp)
-/* 07C68C 8007BA8C 2401000B */ li $at, 11
-/* 07C690 8007BA90 02002025 */ move $a0, $s0
-/* 07C694 8007BA94 854200A2 */ lh $v0, 0xa2($t2)
-/* 07C698 8007BA98 54410010 */ bnel $v0, $at, .L8007BADC
-/* 07C69C 8007BA9C 2401000D */ li $at, 13
-/* 07C6A0 8007BAA0 0C01EC10 */ jal func_8007B040
-/* 07C6A4 8007BAA4 8FA50048 */ lw $a1, 0x48($sp)
-/* 07C6A8 8007BAA8 10400007 */ beqz $v0, .L8007BAC8
-/* 07C6AC 8007BAAC 02002025 */ move $a0, $s0
-/* 07C6B0 8007BAB0 02002025 */ move $a0, $s0
-/* 07C6B4 8007BAB4 0C01C9B3 */ jal func_800726CC
-/* 07C6B8 8007BAB8 24050014 */ li $a1, 20
-/* 07C6BC 8007BABC 8FAD002C */ lw $t5, 0x2c($sp)
-/* 07C6C0 8007BAC0 10000023 */ b .L8007BB50
-/* 07C6C4 8007BAC4 A1A000D6 */ sb $zero, 0xd6($t5)
-.L8007BAC8:
-/* 07C6C8 8007BAC8 0C01C9B3 */ jal func_800726CC
-/* 07C6CC 8007BACC 24050009 */ li $a1, 9
-/* 07C6D0 8007BAD0 10000020 */ b .L8007BB54
-/* 07C6D4 8007BAD4 8FA8002C */ lw $t0, 0x2c($sp)
-/* 07C6D8 8007BAD8 2401000D */ li $at, 13
-.L8007BADC:
-/* 07C6DC 8007BADC 10410004 */ beq $v0, $at, .L8007BAF0
-/* 07C6E0 8007BAE0 8FAF002C */ lw $t7, 0x2c($sp)
-/* 07C6E4 8007BAE4 2401000E */ li $at, 14
-/* 07C6E8 8007BAE8 1441000E */ bne $v0, $at, .L8007BB24
-/* 07C6EC 8007BAEC 02002025 */ move $a0, $s0
-.L8007BAF0:
-/* 07C6F0 8007BAF0 244BFFFF */ addiu $t3, $v0, -1
-/* 07C6F4 8007BAF4 A5EB00A2 */ sh $t3, 0xa2($t7)
-/* 07C6F8 8007BAF8 85E500A2 */ lh $a1, 0xa2($t7)
-/* 07C6FC 8007BAFC 0C01CA74 */ jal set_type_object
-/* 07C700 8007BB00 02002025 */ move $a0, $s0
-/* 07C704 8007BB04 8FB8002C */ lw $t8, 0x2c($sp)
-/* 07C708 8007BB08 240C0003 */ li $t4, 3
-/* 07C70C 8007BB0C 02002025 */ move $a0, $s0
-/* 07C710 8007BB10 24050028 */ li $a1, 40
-/* 07C714 8007BB14 0C01C9B3 */ jal func_800726CC
-/* 07C718 8007BB18 A30C00D6 */ sb $t4, 0xd6($t8)
-/* 07C71C 8007BB1C 1000000D */ b .L8007BB54
-/* 07C720 8007BB20 8FA8002C */ lw $t0, 0x2c($sp)
-.L8007BB24:
-/* 07C724 8007BB24 0C01C9B3 */ jal func_800726CC
-/* 07C728 8007BB28 24050009 */ li $a1, 9
-/* 07C72C 8007BB2C 10000009 */ b .L8007BB54
-/* 07C730 8007BB30 8FA8002C */ lw $t0, 0x2c($sp)
-.L8007BB34:
-/* 07C734 8007BB34 0C01C8B3 */ jal func_800722CC
-/* 07C738 8007BB38 24050001 */ li $a1, 1
-/* 07C73C 8007BB3C 02002025 */ move $a0, $s0
-/* 07C740 8007BB40 0C01C9B3 */ jal func_800726CC
-/* 07C744 8007BB44 2405001E */ li $a1, 30
-/* 07C748 8007BB48 8FB9002C */ lw $t9, 0x2c($sp)
-/* 07C74C 8007BB4C A32000D6 */ sb $zero, 0xd6($t9)
-.L8007BB50:
-/* 07C750 8007BB50 8FA8002C */ lw $t0, 0x2c($sp)
-.L8007BB54:
-/* 07C754 8007BB54 3C09800E */ lui $t1, %hi(gItemWindowTLUTs)
-/* 07C758 8007BB58 3C0A800E */ lui $t2, %hi(gItemWindowTextures)
-/* 07C75C 8007BB5C 810200D2 */ lb $v0, 0xd2($t0)
-/* 07C760 8007BB60 850D00A4 */ lh $t5, 0xa4($t0)
-/* 07C764 8007BB64 00027080 */ sll $t6, $v0, 2
-/* 07C768 8007BB68 012E4821 */ addu $t1, $t1, $t6
-/* 07C76C 8007BB6C 8D2944F0 */ lw $t1, %lo(gItemWindowTLUTs)($t1)
-/* 07C770 8007BB70 014E5021 */ addu $t2, $t2, $t6
-/* 07C774 8007BB74 AD090060 */ sw $t1, 0x60($t0)
-/* 07C778 8007BB78 8D4A4530 */ lw $t2, %lo(gItemWindowTextures)($t2)
-/* 07C77C 8007BB7C AD0A0064 */ sw $t2, 0x64($t0)
-/* 07C780 8007BB80 8FAB0038 */ lw $t3, 0x38($sp)
-/* 07C784 8007BB84 A56D0010 */ sh $t5, 0x10($t3)
-/* 07C788 8007BB88 8FBF0024 */ lw $ra, 0x24($sp)
-/* 07C78C 8007BB8C 8FB00020 */ lw $s0, 0x20($sp)
-/* 07C790 8007BB90 27BD0048 */ addiu $sp, $sp, 0x48
-/* 07C794 8007BB94 03E00008 */ jr $ra
-/* 07C798 8007BB98 00000000 */ nop
diff --git a/asm/non_matchings/code_80071F00/func_8007C7B4.s b/asm/non_matchings/code_80071F00/func_8007C7B4.s
deleted file mode 100644
index 7b39fce8b..000000000
--- a/asm/non_matchings/code_80071F00/func_8007C7B4.s
+++ /dev/null
@@ -1,94 +0,0 @@
-glabel func_8007C7B4
-/* 07D3B4 8007C7B4 27BDFFA8 */ addiu $sp, $sp, -0x58
-/* 07D3B8 8007C7B8 3C0F8019 */ lui $t7, %hi(D_8018BFA8) # $t7, 0x8019
-/* 07D3BC 8007C7BC AFB70034 */ sw $s7, 0x34($sp)
-/* 07D3C0 8007C7C0 AFB30024 */ sw $s3, 0x24($sp)
-/* 07D3C4 8007C7C4 AFB20020 */ sw $s2, 0x20($sp)
-/* 07D3C8 8007C7C8 25EFBFA8 */ addiu $t7, %lo(D_8018BFA8) # addiu $t7, $t7, -0x4058
-/* 07D3CC 8007C7CC 00047080 */ sll $t6, $a0, 2
-/* 07D3D0 8007C7D0 AFBE0038 */ sw $fp, 0x38($sp)
-/* 07D3D4 8007C7D4 AFB60030 */ sw $s6, 0x30($sp)
-/* 07D3D8 8007C7D8 01CF9821 */ addu $s3, $t6, $t7
-/* 07D3DC 8007C7DC 3C12800E */ lui $s2, %hi(D_800E5D9C) # $s2, 0x800e
-/* 07D3E0 8007C7E0 3C178016 */ lui $s7, %hi(gObjectList) # $s7, 0x8016
-/* 07D3E4 8007C7E4 00A0B025 */ move $s6, $a1
-/* 07D3E8 8007C7E8 AFBF003C */ sw $ra, 0x3c($sp)
-/* 07D3EC 8007C7EC AFB5002C */ sw $s5, 0x2c($sp)
-/* 07D3F0 8007C7F0 AFB40028 */ sw $s4, 0x28($sp)
-/* 07D3F4 8007C7F4 AFB1001C */ sw $s1, 0x1c($sp)
-/* 07D3F8 8007C7F8 AFB00018 */ sw $s0, 0x18($sp)
-/* 07D3FC 8007C7FC 26F75C18 */ addiu $s7, %lo(gObjectList) # addiu $s7, $s7, 0x5c18
-/* 07D400 8007C800 26525D9C */ addiu $s2, %lo(D_800E5D9C) # addiu $s2, $s2, 0x5d9c
-/* 07D404 8007C804 AFB30040 */ sw $s3, 0x40($sp)
-/* 07D408 8007C808 241E00E0 */ li $fp, 224
-.L8007C80C:
-/* 07D40C 8007C80C 8E710000 */ lw $s1, ($s3)
-/* 07D410 8007C810 24050001 */ li $a1, 1
-/* 07D414 8007C814 0C01C8E9 */ jal func_800723A4
-/* 07D418 8007C818 02202025 */ move $a0, $s1
-/* 07D41C 8007C81C 023E0019 */ multu $s1, $fp
-/* 07D420 8007C820 2404003C */ li $a0, 60
-/* 07D424 8007C824 0000C012 */ mflo $t8
-/* 07D428 8007C828 02F88021 */ addu $s0, $s7, $t8
-/* 07D42C 8007C82C 0C0ADF8D */ jal random_int
-/* 07D430 8007C830 A21600D1 */ sb $s6, 0xd1($s0)
-/* 07D434 8007C834 2451FFE2 */ addiu $s1, $v0, -0x1e
-/* 07D438 8007C838 0011CC00 */ sll $t9, $s1, 0x10
-/* 07D43C 8007C83C 00198C03 */ sra $s1, $t9, 0x10
-/* 07D440 8007C840 0C0ADF8D */ jal random_int
-/* 07D444 8007C844 24040014 */ li $a0, 20
-/* 07D448 8007C848 2454FFF6 */ addiu $s4, $v0, -0xa
-/* 07D44C 8007C84C 00144C00 */ sll $t1, $s4, 0x10
-/* 07D450 8007C850 0009A403 */ sra $s4, $t1, 0x10
-/* 07D454 8007C854 0C0ADF8D */ jal random_int
-/* 07D458 8007C858 24040050 */ li $a0, 80
-/* 07D45C 8007C85C 2455FFD8 */ addiu $s5, $v0, -0x28
-/* 07D460 8007C860 00155C00 */ sll $t3, $s5, 0x10
-/* 07D464 8007C864 000BAC03 */ sra $s5, $t3, 0x10
-/* 07D468 8007C868 0C0ADF8D */ jal random_int
-/* 07D46C 8007C86C 24041000 */ li $a0, 4096
-/* 07D470 8007C870 44912000 */ mtc1 $s1, $f4
-/* 07D474 8007C874 44944000 */ mtc1 $s4, $f8
-/* 07D478 8007C878 44958000 */ mtc1 $s5, $f16
-/* 07D47C 8007C87C 468021A0 */ cvt.s.w $f6, $f4
-/* 07D480 8007C880 8E430000 */ lw $v1, ($s2)
-/* 07D484 8007C884 3C0D800E */ lui $t5, %hi(D_800E5DB0) # $t5, 0x800e
-/* 07D488 8007C888 25AD5DB0 */ addiu $t5, %lo(D_800E5DB0) # addiu $t5, $t5, 0x5db0
-/* 07D48C 8007C88C 26520004 */ addiu $s2, $s2, 4
-/* 07D490 8007C890 468042A0 */ cvt.s.w $f10, $f8
-/* 07D494 8007C894 26730004 */ addiu $s3, $s3, 4
-/* 07D498 8007C898 E6060010 */ swc1 $f6, 0x10($s0)
-/* 07D49C 8007C89C AE030080 */ sw $v1, 0x80($s0)
-/* 07D4A0 8007C8A0 468084A0 */ cvt.s.w $f18, $f16
-/* 07D4A4 8007C8A4 E60A0014 */ swc1 $f10, 0x14($s0)
-/* 07D4A8 8007C8A8 164DFFD8 */ bne $s2, $t5, .L8007C80C
-/* 07D4AC 8007C8AC E6120018 */ swc1 $f18, 0x18($s0)
-/* 07D4B0 8007C8B0 3C051900 */ lui $a1, (0x1900705A >> 16) # lui $a1, 0x1900
-/* 07D4B4 8007C8B4 34A5705A */ ori $a1, (0x1900705A & 0xFFFF) # ori $a1, $a1, 0x705a
-/* 07D4B8 8007C8B8 0C032418 */ jal func_800C9060
-/* 07D4BC 8007C8BC 32C400FF */ andi $a0, $s6, 0xff
-/* 07D4C0 8007C8C0 8FAE0040 */ lw $t6, 0x40($sp)
-/* 07D4C4 8007C8C4 3C0F8019 */ lui $t7, %hi(D_8018BFA8) # $t7, 0x8019
-/* 07D4C8 8007C8C8 25EFBFA8 */ addiu $t7, %lo(D_8018BFA8) # addiu $t7, $t7, -0x4058
-/* 07D4CC 8007C8CC 15CF0005 */ bne $t6, $t7, .L8007C8E4
-/* 07D4D0 8007C8D0 24190001 */ li $t9, 1
-/* 07D4D4 8007C8D4 24180001 */ li $t8, 1
-/* 07D4D8 8007C8D8 3C018019 */ lui $at, %hi(D_8018CFF0) # $at, 0x8019
-/* 07D4DC 8007C8DC 10000003 */ b .L8007C8EC
-/* 07D4E0 8007C8E0 A438CFF0 */ sh $t8, %lo(D_8018CFF0)($at)
-.L8007C8E4:
-/* 07D4E4 8007C8E4 3C018019 */ lui $at, %hi(D_8018D048) # $at, 0x8019
-/* 07D4E8 8007C8E8 A439D048 */ sh $t9, %lo(D_8018D048)($at)
-.L8007C8EC:
-/* 07D4EC 8007C8EC 8FBF003C */ lw $ra, 0x3c($sp)
-/* 07D4F0 8007C8F0 8FB00018 */ lw $s0, 0x18($sp)
-/* 07D4F4 8007C8F4 8FB1001C */ lw $s1, 0x1c($sp)
-/* 07D4F8 8007C8F8 8FB20020 */ lw $s2, 0x20($sp)
-/* 07D4FC 8007C8FC 8FB30024 */ lw $s3, 0x24($sp)
-/* 07D500 8007C900 8FB40028 */ lw $s4, 0x28($sp)
-/* 07D504 8007C904 8FB5002C */ lw $s5, 0x2c($sp)
-/* 07D508 8007C908 8FB60030 */ lw $s6, 0x30($sp)
-/* 07D50C 8007C90C 8FB70034 */ lw $s7, 0x34($sp)
-/* 07D510 8007C910 8FBE0038 */ lw $fp, 0x38($sp)
-/* 07D514 8007C914 03E00008 */ jr $ra
-/* 07D518 8007C918 27BD0058 */ addiu $sp, $sp, 0x58
diff --git a/asm/non_matchings/code_80071F00/func_8007C91C.s b/asm/non_matchings/code_80071F00/func_8007C91C.s
deleted file mode 100644
index b494adfdd..000000000
--- a/asm/non_matchings/code_80071F00/func_8007C91C.s
+++ /dev/null
@@ -1,58 +0,0 @@
-glabel func_8007C91C
-/* 07D51C 8007C91C 3C0F8019 */ lui $t7, %hi(D_8018BFA8) # $t7, 0x8019
-/* 07D520 8007C920 25EFBFA8 */ addiu $t7, %lo(D_8018BFA8) # addiu $t7, $t7, -0x4058
-/* 07D524 8007C924 00047080 */ sll $t6, $a0, 2
-/* 07D528 8007C928 01CF2821 */ addu $a1, $t6, $t7
-/* 07D52C 8007C92C 8CA30000 */ lw $v1, ($a1)
-/* 07D530 8007C930 240900E0 */ li $t1, 224
-/* 07D534 8007C934 24020001 */ li $v0, 1
-/* 07D538 8007C938 00690019 */ multu $v1, $t1
-/* 07D53C 8007C93C 00025880 */ sll $t3, $v0, 2
-/* 07D540 8007C940 00AB2021 */ addu $a0, $a1, $t3
-/* 07D544 8007C944 8C830000 */ lw $v1, ($a0)
-/* 07D548 8007C948 3C088016 */ lui $t0, %hi(gObjectList) # $t0, 0x8016
-/* 07D54C 8007C94C 25085C18 */ addiu $t0, %lo(gObjectList) # addiu $t0, $t0, 0x5c18
-/* 07D550 8007C950 3C018019 */ lui $at, %hi(D_8018CFF0) # 0x8019
-/* 07D554 8007C954 0000C012 */ mflo $t8
-/* 07D558 8007C958 01183021 */ addu $a2, $t0, $t8
-/* 07D55C 8007C95C 90D900DC */ lbu $t9, 0xdc($a2)
-/* 07D560 8007C960 00690019 */ multu $v1, $t1
-/* 07D564 8007C964 8C830004 */ lw $v1, 4($a0)
-/* 07D568 8007C968 272A0001 */ addiu $t2, $t9, 1
-/* 07D56C 8007C96C A0CA00DC */ sb $t2, 0xdc($a2)
-/* 07D570 8007C970 00006012 */ mflo $t4
-/* 07D574 8007C974 010C3021 */ addu $a2, $t0, $t4
-/* 07D578 8007C978 90CD00DC */ lbu $t5, 0xdc($a2)
-/* 07D57C 8007C97C 00690019 */ multu $v1, $t1
-/* 07D580 8007C980 8C830008 */ lw $v1, 8($a0)
-/* 07D584 8007C984 25AE0001 */ addiu $t6, $t5, 1
-/* 07D588 8007C988 A0CE00DC */ sb $t6, 0xdc($a2)
-/* 07D58C 8007C98C 00007812 */ mflo $t7
-/* 07D590 8007C990 010F3021 */ addu $a2, $t0, $t7
-/* 07D594 8007C994 90D800DC */ lbu $t8, 0xdc($a2)
-/* 07D598 8007C998 00690019 */ multu $v1, $t1
-/* 07D59C 8007C99C 8C83000C */ lw $v1, 0xc($a0)
-/* 07D5A0 8007C9A0 27190001 */ addiu $t9, $t8, 1
-/* 07D5A4 8007C9A4 A0D900DC */ sb $t9, 0xdc($a2)
-/* 07D5A8 8007C9A8 3C188019 */ lui $t8, %hi(D_8018BFA8) # $t8, 0x8019
-/* 07D5AC 8007C9AC 2718BFA8 */ addiu $t8, %lo(D_8018BFA8) # addiu $t8, $t8, -0x4058
-/* 07D5B0 8007C9B0 00005012 */ mflo $t2
-/* 07D5B4 8007C9B4 010A3021 */ addu $a2, $t0, $t2
-/* 07D5B8 8007C9B8 90CB00DC */ lbu $t3, 0xdc($a2)
-/* 07D5BC 8007C9BC 00690019 */ multu $v1, $t1
-/* 07D5C0 8007C9C0 256C0001 */ addiu $t4, $t3, 1
-/* 07D5C4 8007C9C4 A0CC00DC */ sb $t4, 0xdc($a2)
-/* 07D5C8 8007C9C8 00006812 */ mflo $t5
-/* 07D5CC 8007C9CC 010D3021 */ addu $a2, $t0, $t5
-/* 07D5D0 8007C9D0 90CE00DC */ lbu $t6, 0xdc($a2)
-/* 07D5D4 8007C9D4 25CF0001 */ addiu $t7, $t6, 1
-/* 07D5D8 8007C9D8 14B80004 */ bne $a1, $t8, .L8007C9EC
-/* 07D5DC 8007C9DC A0CF00DC */ sb $t7, 0xdc($a2)
-/* 07D5E0 8007C9E0 3C018019 */ lui $at, %hi(D_8018D048) # 0x8019
-/* 07D5E4 8007C9E4 03E00008 */ jr $ra
-/* 07D5E8 8007C9E8 A420CFF0 */ sh $zero, %lo(D_8018CFF0)($at) # -0x3010($at)
-
-.L8007C9EC:
-/* 07D5EC 8007C9EC A420D048 */ sh $zero, %lo(D_8018D048)($at) # -0x2fb8($at)
-/* 07D5F0 8007C9F0 03E00008 */ jr $ra
-/* 07D5F4 8007C9F4 00000000 */ nop
diff --git a/asm/non_matchings/code_80071F00/func_8007CA70.s b/asm/non_matchings/code_80071F00/func_8007CA70.s
deleted file mode 100644
index 96afcbdfe..000000000
--- a/asm/non_matchings/code_80071F00/func_8007CA70.s
+++ /dev/null
@@ -1,108 +0,0 @@
-glabel func_8007CA70
-/* 07D670 8007CA70 3C0E8019 */ lui $t6, %hi(D_8018CFF0) # $t6, 0x8019
-/* 07D674 8007CA74 85CECFF0 */ lh $t6, %lo(D_8018CFF0)($t6)
-/* 07D678 8007CA78 27BDFFD8 */ addiu $sp, $sp, -0x28
-/* 07D67C 8007CA7C AFBF0014 */ sw $ra, 0x14($sp)
-/* 07D680 8007CA80 15C00011 */ bnez $t6, .L8007CAC8
-/* 07D684 8007CA84 00000000 */ nop
-/* 07D688 8007CA88 0C01F27E */ jal func_8007C9F8
-/* 07D68C 8007CA8C 00000000 */ nop
-/* 07D690 8007CA90 00027840 */ sll $t7, $v0, 1
-/* 07D694 8007CA94 3C038016 */ lui $v1, %hi(gNearestWaypointByPlayerId) # 0x8016
-/* 07D698 8007CA98 006F1821 */ addu $v1, $v1, $t7
-/* 07D69C 8007CA9C 94634438 */ lhu $v1, %lo(gNearestWaypointByPlayerId)($v1) # 0x4438($v1)
-/* 07D6A0 8007CAA0 3C018019 */ lui $at, %hi(D_8018D018) # $at, 0x8019
-/* 07D6A4 8007CAA4 A422D018 */ sh $v0, %lo(D_8018D018)($at)
-/* 07D6A8 8007CAA8 286100C9 */ slti $at, $v1, 0xc9
-/* 07D6AC 8007CAAC 14200006 */ bnez $at, .L8007CAC8
-/* 07D6B0 8007CAB0 00402825 */ move $a1, $v0
-/* 07D6B4 8007CAB4 286100D2 */ slti $at, $v1, 0xd2
-/* 07D6B8 8007CAB8 10200003 */ beqz $at, .L8007CAC8
-/* 07D6BC 8007CABC 00000000 */ nop
-/* 07D6C0 8007CAC0 0C01F1ED */ jal func_8007C7B4
-/* 07D6C4 8007CAC4 00002025 */ move $a0, $zero
-.L8007CAC8:
-/* 07D6C8 8007CAC8 3C188019 */ lui $t8, %hi(D_8018CFF0) # $t8, 0x8019
-/* 07D6CC 8007CACC 8718CFF0 */ lh $t8, %lo(D_8018CFF0)($t8)
-/* 07D6D0 8007CAD0 3C058019 */ lui $a1, %hi(D_8018D018) # $a1, 0x8019
-/* 07D6D4 8007CAD4 13000017 */ beqz $t8, .L8007CB34
-/* 07D6D8 8007CAD8 00000000 */ nop
-/* 07D6DC 8007CADC 84A5D018 */ lh $a1, %lo(D_8018D018)($a1)
-/* 07D6E0 8007CAE0 3C088016 */ lui $t0, %hi(gNearestWaypointByPlayerId) # $t0, 0x8016
-/* 07D6E4 8007CAE4 25084438 */ addiu $t0, %lo(gNearestWaypointByPlayerId) # addiu $t0, $t0, 0x4438
-/* 07D6E8 8007CAE8 0005C840 */ sll $t9, $a1, 1
-/* 07D6EC 8007CAEC 03281821 */ addu $v1, $t9, $t0
-/* 07D6F0 8007CAF0 94620000 */ lhu $v0, ($v1)
-/* 07D6F4 8007CAF4 284100B5 */ slti $at, $v0, 0xb5
-/* 07D6F8 8007CAF8 14200007 */ bnez $at, .L8007CB18
-/* 07D6FC 8007CAFC 284100BE */ slti $at, $v0, 0xbe
-/* 07D700 8007CB00 10200005 */ beqz $at, .L8007CB18
-/* 07D704 8007CB04 00002025 */ move $a0, $zero
-/* 07D708 8007CB08 0C01F247 */ jal func_8007C91C
-/* 07D70C 8007CB0C AFA3001C */ sw $v1, 0x1c($sp)
-/* 07D710 8007CB10 8FA3001C */ lw $v1, 0x1c($sp)
-/* 07D714 8007CB14 94620000 */ lhu $v0, ($v1)
-.L8007CB18:
-/* 07D718 8007CB18 28410119 */ slti $at, $v0, 0x119
-/* 07D71C 8007CB1C 14200005 */ bnez $at, .L8007CB34
-/* 07D720 8007CB20 28410122 */ slti $at, $v0, 0x122
-/* 07D724 8007CB24 10200003 */ beqz $at, .L8007CB34
-/* 07D728 8007CB28 00000000 */ nop
-/* 07D72C 8007CB2C 0C01F247 */ jal func_8007C91C
-/* 07D730 8007CB30 00002025 */ move $a0, $zero
-.L8007CB34:
-/* 07D734 8007CB34 3C098019 */ lui $t1, %hi(D_8018D048) # $t1, 0x8019
-/* 07D738 8007CB38 8529D048 */ lh $t1, %lo(D_8018D048)($t1)
-/* 07D73C 8007CB3C 15200011 */ bnez $t1, .L8007CB84
-/* 07D740 8007CB40 00000000 */ nop
-/* 07D744 8007CB44 0C01F27E */ jal func_8007C9F8
-/* 07D748 8007CB48 00000000 */ nop
-/* 07D74C 8007CB4C 00025040 */ sll $t2, $v0, 1
-/* 07D750 8007CB50 3C038016 */ lui $v1, %hi(gNearestWaypointByPlayerId) # 0x8016
-/* 07D754 8007CB54 006A1821 */ addu $v1, $v1, $t2
-/* 07D758 8007CB58 94634438 */ lhu $v1, %lo(gNearestWaypointByPlayerId)($v1) # 0x4438($v1)
-/* 07D75C 8007CB5C 3C018019 */ lui $at, %hi(D_8018D110) # $at, 0x8019
-/* 07D760 8007CB60 A422D110 */ sh $v0, %lo(D_8018D110)($at)
-/* 07D764 8007CB64 286101FF */ slti $at, $v1, 0x1ff
-/* 07D768 8007CB68 14200006 */ bnez $at, .L8007CB84
-/* 07D76C 8007CB6C 00402825 */ move $a1, $v0
-/* 07D770 8007CB70 28610208 */ slti $at, $v1, 0x208
-/* 07D774 8007CB74 10200003 */ beqz $at, .L8007CB84
-/* 07D778 8007CB78 00000000 */ nop
-/* 07D77C 8007CB7C 0C01F1ED */ jal func_8007C7B4
-/* 07D780 8007CB80 24040005 */ li $a0, 5
-.L8007CB84:
-/* 07D784 8007CB84 3C0B8019 */ lui $t3, %hi(D_8018D048) # $t3, 0x8019
-/* 07D788 8007CB88 856BD048 */ lh $t3, %lo(D_8018D048)($t3)
-/* 07D78C 8007CB8C 3C058019 */ lui $a1, %hi(D_8018D110) # $a1, 0x8019
-/* 07D790 8007CB90 51600018 */ beql $t3, $zero, .L8007CBF4
-/* 07D794 8007CB94 8FBF0014 */ lw $ra, 0x14($sp)
-/* 07D798 8007CB98 84A5D110 */ lh $a1, %lo(D_8018D110)($a1)
-/* 07D79C 8007CB9C 3C0D8016 */ lui $t5, %hi(gNearestWaypointByPlayerId) # $t5, 0x8016
-/* 07D7A0 8007CBA0 25AD4438 */ addiu $t5, %lo(gNearestWaypointByPlayerId) # addiu $t5, $t5, 0x4438
-/* 07D7A4 8007CBA4 00056040 */ sll $t4, $a1, 1
-/* 07D7A8 8007CBA8 018D1821 */ addu $v1, $t4, $t5
-/* 07D7AC 8007CBAC 94620000 */ lhu $v0, ($v1)
-/* 07D7B0 8007CBB0 284101EB */ slti $at, $v0, 0x1eb
-/* 07D7B4 8007CBB4 14200007 */ bnez $at, .L8007CBD4
-/* 07D7B8 8007CBB8 284101F4 */ slti $at, $v0, 0x1f4
-/* 07D7BC 8007CBBC 10200005 */ beqz $at, .L8007CBD4
-/* 07D7C0 8007CBC0 24040005 */ li $a0, 5
-/* 07D7C4 8007CBC4 0C01F247 */ jal func_8007C91C
-/* 07D7C8 8007CBC8 AFA3001C */ sw $v1, 0x1c($sp)
-/* 07D7CC 8007CBCC 8FA3001C */ lw $v1, 0x1c($sp)
-/* 07D7D0 8007CBD0 94620000 */ lhu $v0, ($v1)
-.L8007CBD4:
-/* 07D7D4 8007CBD4 2841026D */ slti $at, $v0, 0x26d
-/* 07D7D8 8007CBD8 14200005 */ bnez $at, .L8007CBF0
-/* 07D7DC 8007CBDC 28410276 */ slti $at, $v0, 0x276
-/* 07D7E0 8007CBE0 50200004 */ beql $at, $zero, .L8007CBF4
-/* 07D7E4 8007CBE4 8FBF0014 */ lw $ra, 0x14($sp)
-/* 07D7E8 8007CBE8 0C01F247 */ jal func_8007C91C
-/* 07D7EC 8007CBEC 24040005 */ li $a0, 5
-.L8007CBF0:
-/* 07D7F0 8007CBF0 8FBF0014 */ lw $ra, 0x14($sp)
-.L8007CBF4:
-/* 07D7F4 8007CBF4 27BD0028 */ addiu $sp, $sp, 0x28
-/* 07D7F8 8007CBF8 03E00008 */ jr $ra
-/* 07D7FC 8007CBFC 00000000 */ nop
diff --git a/asm/non_matchings/code_80071F00/func_8007D070.s b/asm/non_matchings/code_80071F00/func_8007D070.s
deleted file mode 100644
index 6f5422895..000000000
--- a/asm/non_matchings/code_80071F00/func_8007D070.s
+++ /dev/null
@@ -1,195 +0,0 @@
-glabel func_8007D070
-/* 07DC70 8007D070 27BDFFA0 */ addiu $sp, $sp, -0x60
-/* 07DC74 8007D074 3C0E8016 */ lui $t6, %hi(D_8016559C) # $t6, 0x8016
-/* 07DC78 8007D078 8DCE559C */ lw $t6, %lo(D_8016559C)($t6)
-/* 07DC7C 8007D07C AFBF003C */ sw $ra, 0x3c($sp)
-/* 07DC80 8007D080 AFBE0038 */ sw $fp, 0x38($sp)
-/* 07DC84 8007D084 AFB70034 */ sw $s7, 0x34($sp)
-/* 07DC88 8007D088 AFB60030 */ sw $s6, 0x30($sp)
-/* 07DC8C 8007D08C AFB5002C */ sw $s5, 0x2c($sp)
-/* 07DC90 8007D090 AFB40028 */ sw $s4, 0x28($sp)
-/* 07DC94 8007D094 AFB30024 */ sw $s3, 0x24($sp)
-/* 07DC98 8007D098 AFB20020 */ sw $s2, 0x20($sp)
-/* 07DC9C 8007D09C AFB1001C */ sw $s1, 0x1c($sp)
-/* 07DCA0 8007D0A0 AFB00018 */ sw $s0, 0x18($sp)
-/* 07DCA4 8007D0A4 15C0006C */ bnez $t6, .L8007D258
-/* 07DCA8 8007D0A8 00001025 */ move $v0, $zero
-/* 07DCAC 8007D0AC 3C0F8019 */ lui $t7, %hi(D_8018D2A4) # $t7, 0x8019
-/* 07DCB0 8007D0B0 8DEFD2A4 */ lw $t7, %lo(D_8018D2A4)($t7)
-/* 07DCB4 8007D0B4 3C038019 */ lui $v1, %hi(D_8018CF68) # $v1, 0x8019
-/* 07DCB8 8007D0B8 11E00067 */ beqz $t7, .L8007D258
-/* 07DCBC 8007D0BC 00000000 */ nop
-/* 07DCC0 8007D0C0 8463CF68 */ lh $v1, %lo(D_8018CF68)($v1)
-/* 07DCC4 8007D0C4 3C18800E */ lui $t8, %hi(D_800E5DB4)
-/* 07DCC8 8007D0C8 2861001D */ slti $at, $v1, 0x1d
-/* 07DCCC 8007D0CC 10200062 */ beqz $at, .L8007D258
-/* 07DCD0 8007D0D0 0303C021 */ addu $t8, $t8, $v1
-/* 07DCD4 8007D0D4 83185DB4 */ lb $t8, %lo(D_800E5DB4)($t8)
-/* 07DCD8 8007D0D8 24010001 */ li $at, 1
-/* 07DCDC 8007D0DC 3C198019 */ lui $t9, %hi(D_8018C1D8) # $t9, 0x8019
-/* 07DCE0 8007D0E0 1701005D */ bne $t8, $at, .L8007D258
-/* 07DCE4 8007D0E4 00000000 */ nop
-/* 07DCE8 8007D0E8 8F39C1D8 */ lw $t9, %lo(D_8018C1D8)($t9)
-/* 07DCEC 8007D0EC 241700E0 */ li $s7, 224
-/* 07DCF0 8007D0F0 3C168016 */ lui $s6, %hi(gObjectList) # $s6, 0x8016
-/* 07DCF4 8007D0F4 03370019 */ multu $t9, $s7
-/* 07DCF8 8007D0F8 26D65C18 */ addiu $s6, %lo(gObjectList) # addiu $s6, $s6, 0x5c18
-/* 07DCFC 8007D0FC 3C048019 */ lui $a0, %hi(D_8018C1B0) # $a0, 0x8019
-/* 07DD00 8007D100 2484C1B0 */ addiu $a0, %lo(D_8018C1B0) # addiu $a0, $a0, -0x3e50
-/* 07DD04 8007D104 2403001E */ li $v1, 30
-/* 07DD08 8007D108 00004012 */ mflo $t0
-/* 07DD0C 8007D10C 02C84821 */ addu $t1, $s6, $t0
-/* 07DD10 8007D110 852A00A6 */ lh $t2, 0xa6($t1)
-/* 07DD14 8007D114 1140000C */ beqz $t2, .L8007D148
-/* 07DD18 8007D118 00000000 */ nop
-/* 07DD1C 8007D11C 24420001 */ addiu $v0, $v0, 1
-.L8007D120:
-/* 07DD20 8007D120 10430009 */ beq $v0, $v1, .L8007D148
-/* 07DD24 8007D124 00025880 */ sll $t3, $v0, 2
-/* 07DD28 8007D128 008B6021 */ addu $t4, $a0, $t3
-/* 07DD2C 8007D12C 8D8D0028 */ lw $t5, 0x28($t4)
-/* 07DD30 8007D130 01B70019 */ multu $t5, $s7
-/* 07DD34 8007D134 00007012 */ mflo $t6
-/* 07DD38 8007D138 02CE7821 */ addu $t7, $s6, $t6
-/* 07DD3C 8007D13C 85F800A6 */ lh $t8, 0xa6($t7)
-/* 07DD40 8007D140 5700FFF7 */ bnel $t8, $zero, .L8007D120
-/* 07DD44 8007D144 24420001 */ addiu $v0, $v0, 1
-.L8007D148:
-/* 07DD48 8007D148 3C048019 */ lui $a0, %hi(D_8018C1B0) # $a0, 0x8019
-/* 07DD4C 8007D14C 2484C1B0 */ addiu $a0, %lo(D_8018C1B0) # addiu $a0, $a0, -0x3e50
-/* 07DD50 8007D150 0002C880 */ sll $t9, $v0, 2
-/* 07DD54 8007D154 2403001E */ li $v1, 30
-/* 07DD58 8007D158 00994021 */ addu $t0, $a0, $t9
-/* 07DD5C 8007D15C 1043003E */ beq $v0, $v1, .L8007D258
-/* 07DD60 8007D160 8D110028 */ lw $s1, 0x28($t0)
-/* 07DD64 8007D164 02370019 */ multu $s1, $s7
-/* 07DD68 8007D168 02202025 */ move $a0, $s1
-/* 07DD6C 8007D16C 00004812 */ mflo $t1
-/* 07DD70 8007D170 02C98021 */ addu $s0, $s6, $t1
-/* 07DD74 8007D174 860A00A6 */ lh $t2, 0xa6($s0)
-/* 07DD78 8007D178 15400037 */ bnez $t2, .L8007D258
-/* 07DD7C 8007D17C 00000000 */ nop
-/* 07DD80 8007D180 0C01C8E9 */ jal func_800723A4
-/* 07DD84 8007D184 24050001 */ li $a1, 1
-/* 07DD88 8007D188 0C0ADF8D */ jal random_int
-/* 07DD8C 8007D18C 2404012C */ li $a0, 300
-/* 07DD90 8007D190 00029400 */ sll $s2, $v0, 0x10
-/* 07DD94 8007D194 00125C03 */ sra $t3, $s2, 0x10
-/* 07DD98 8007D198 01609025 */ move $s2, $t3
-/* 07DD9C 8007D19C 0C0ADF8D */ jal random_int
-/* 07DDA0 8007D1A0 24041000 */ li $a0, 4096
-/* 07DDA4 8007D1A4 2453F800 */ addiu $s3, $v0, -0x800
-/* 07DDA8 8007D1A8 326CFFFF */ andi $t4, $s3, 0xffff
-/* 07DDAC 8007D1AC 01809825 */ move $s3, $t4
-/* 07DDB0 8007D1B0 0C0ADF8D */ jal random_int
-/* 07DDB4 8007D1B4 2404000F */ li $a0, 15
-/* 07DDB8 8007D1B8 3C1E8019 */ lui $fp, %hi(D_8018CF1C) # $fp, 0x8019
-/* 07DDBC 8007D1BC 27DECF1C */ addiu $fp, %lo(D_8018CF1C) # addiu $fp, $fp, -0x30e4
-/* 07DDC0 8007D1C0 8FCF0000 */ lw $t7, ($fp)
-/* 07DDC4 8007D1C4 34018000 */ li $at, 32768
-/* 07DDC8 8007D1C8 3C088019 */ lui $t0, %hi(D_8018CF14) # $t0, 0x8019
-/* 07DDCC 8007D1CC 85F8002E */ lh $t8, 0x2e($t7)
-/* 07DDD0 8007D1D0 2454FFFB */ addiu $s4, $v0, -5
-/* 07DDD4 8007D1D4 00146C00 */ sll $t5, $s4, 0x10
-/* 07DDD8 8007D1D8 0301C821 */ addu $t9, $t8, $at
-/* 07DDDC 8007D1DC A61900C0 */ sh $t9, 0xc0($s0)
-/* 07DDE0 8007D1E0 8D08CF14 */ lw $t0, %lo(D_8018CF14)($t0)
-/* 07DDE4 8007D1E4 000DA403 */ sra $s4, $t5, 0x10
-/* 07DDE8 8007D1E8 85090026 */ lh $t1, 0x26($t0)
-/* 07DDEC 8007D1EC 01338821 */ addu $s1, $t1, $s3
-/* 07DDF0 8007D1F0 322AFFFF */ andi $t2, $s1, 0xffff
-/* 07DDF4 8007D1F4 01408825 */ move $s1, $t2
-/* 07DDF8 8007D1F8 0C0AE006 */ jal sins
-/* 07DDFC 8007D1FC 3144FFFF */ andi $a0, $t2, 0xffff
-/* 07DE00 8007D200 44922000 */ mtc1 $s2, $f4
-/* 07DE04 8007D204 8FCB0000 */ lw $t3, ($fp)
-/* 07DE08 8007D208 44948000 */ mtc1 $s4, $f16
-/* 07DE0C 8007D20C 468020A0 */ cvt.s.w $f2, $f4
-/* 07DE10 8007D210 C5680014 */ lwc1 $f8, 0x14($t3)
-/* 07DE14 8007D214 3224FFFF */ andi $a0, $s1, 0xffff
-/* 07DE18 8007D218 468084A0 */ cvt.s.w $f18, $f16
-/* 07DE1C 8007D21C 46020182 */ mul.s $f6, $f0, $f2
-/* 07DE20 8007D220 E7A20044 */ swc1 $f2, 0x44($sp)
-/* 07DE24 8007D224 E6120014 */ swc1 $f18, 0x14($s0)
-/* 07DE28 8007D228 46083280 */ add.s $f10, $f6, $f8
-/* 07DE2C 8007D22C 0C0AE00E */ jal coss
-/* 07DE30 8007D230 E60A0010 */ swc1 $f10, 0x10($s0)
-/* 07DE34 8007D234 C7A20044 */ lwc1 $f2, 0x44($sp)
-/* 07DE38 8007D238 8FCC0000 */ lw $t4, ($fp)
-/* 07DE3C 8007D23C 3C0D800E */ lui $t5, %hi(D_800E5D54) # $t5, 0x800e
-/* 07DE40 8007D240 46020102 */ mul.s $f4, $f0, $f2
-/* 07DE44 8007D244 C586001C */ lwc1 $f6, 0x1c($t4)
-/* 07DE48 8007D248 25AD5D54 */ addiu $t5, %lo(D_800E5D54) # addiu $t5, $t5, 0x5d54
-/* 07DE4C 8007D24C AE0D0080 */ sw $t5, 0x80($s0)
-/* 07DE50 8007D250 46062200 */ add.s $f8, $f4, $f6
-/* 07DE54 8007D254 E6080018 */ swc1 $f8, 0x18($s0)
-.L8007D258:
-/* 07DE58 8007D258 3C168016 */ lui $s6, %hi(gObjectList) # $s6, 0x8016
-/* 07DE5C 8007D25C 3C1E8019 */ lui $fp, %hi(D_8018CF1C) # $fp, 0x8019
-/* 07DE60 8007D260 3C128019 */ lui $s2, %hi(D_8018C1B0) # $s2, 0x8019
-/* 07DE64 8007D264 3C15800E */ lui $s5, %hi(D_800E4470) # $s5, 0x800e
-/* 07DE68 8007D268 3C148019 */ lui $s4, %hi(D_8018C228) # $s4, 0x8019
-/* 07DE6C 8007D26C 3C13800E */ lui $s3, %hi(D_800E44B0) # $s3, 0x800e
-/* 07DE70 8007D270 27DECF1C */ addiu $fp, %lo(D_8018CF1C) # addiu $fp, $fp, -0x30e4
-/* 07DE74 8007D274 26D65C18 */ addiu $s6, %lo(gObjectList) # addiu $s6, $s6, 0x5c18
-/* 07DE78 8007D278 241700E0 */ li $s7, 224
-/* 07DE7C 8007D27C 267344B0 */ addiu $s3, %lo(D_800E44B0) # addiu $s3, $s3, 0x44b0
-/* 07DE80 8007D280 2694C228 */ addiu $s4, %lo(D_8018C228) # addiu $s4, $s4, -0x3dd8
-/* 07DE84 8007D284 26B54470 */ addiu $s5, %lo(D_800E4470) # addiu $s5, $s5, 0x4470
-/* 07DE88 8007D288 2652C1B0 */ addiu $s2, %lo(D_8018C1B0) # addiu $s2, $s2, -0x3e50
-/* 07DE8C 8007D28C 8E510028 */ lw $s1, 0x28($s2)
-.L8007D290:
-/* 07DE90 8007D290 02370019 */ multu $s1, $s7
-/* 07DE94 8007D294 00007012 */ mflo $t6
-/* 07DE98 8007D298 02CE8021 */ addu $s0, $s6, $t6
-/* 07DE9C 8007D29C 860F00A6 */ lh $t7, 0xa6($s0)
-/* 07DEA0 8007D2A0 51E00021 */ beql $t7, $zero, .L8007D328
-/* 07DEA4 8007D2A4 26520004 */ addiu $s2, $s2, 4
-/* 07DEA8 8007D2A8 0C01F3B7 */ jal func_8007CEDC
-/* 07DEAC 8007D2AC 02202025 */ move $a0, $s1
-/* 07DEB0 8007D2B0 0C022DC9 */ jal func_8008B724
-/* 07DEB4 8007D2B4 02202025 */ move $a0, $s1
-/* 07DEB8 8007D2B8 C60A0028 */ lwc1 $f10, 0x28($s0)
-/* 07DEBC 8007D2BC C6100010 */ lwc1 $f16, 0x10($s0)
-/* 07DEC0 8007D2C0 8FC50000 */ lw $a1, ($fp)
-/* 07DEC4 8007D2C4 C6060014 */ lwc1 $f6, 0x14($s0)
-/* 07DEC8 8007D2C8 46105480 */ add.s $f18, $f10, $f16
-/* 07DECC 8007D2CC C60A002C */ lwc1 $f10, 0x2c($s0)
-/* 07DED0 8007D2D0 3C068019 */ lui $a2, %hi(D_8018CF14) # $a2, 0x8019
-/* 07DED4 8007D2D4 02202025 */ move $a0, $s1
-/* 07DED8 8007D2D8 E6120004 */ swc1 $f18, 4($s0)
-/* 07DEDC 8007D2DC C4A40074 */ lwc1 $f4, 0x74($a1)
-/* 07DEE0 8007D2E0 C6120030 */ lwc1 $f18, 0x30($s0)
-/* 07DEE4 8007D2E4 46062200 */ add.s $f8, $f4, $f6
-/* 07DEE8 8007D2E8 C6040018 */ lwc1 $f4, 0x18($s0)
-/* 07DEEC 8007D2EC 46085400 */ add.s $f16, $f10, $f8
-/* 07DEF0 8007D2F0 46049180 */ add.s $f6, $f18, $f4
-/* 07DEF4 8007D2F4 E6100008 */ swc1 $f16, 8($s0)
-/* 07DEF8 8007D2F8 E606000C */ swc1 $f6, 0xc($s0)
-/* 07DEFC 8007D2FC 0C01F108 */ jal func_8007C420
-/* 07DF00 8007D300 8CC6CF14 */ lw $a2, %lo(D_8018CF14)($a2)
-/* 07DF04 8007D304 02202025 */ move $a0, $s1
-/* 07DF08 8007D308 0C01C88F */ jal is_obj_index_flag_unk_054_active
-/* 07DF0C 8007D30C 24050080 */ li $a1, 128
-/* 07DF10 8007D310 50400004 */ beql $v0, $zero, .L8007D324
-/* 07DF14 8007D314 AE150074 */ sw $s5, 0x74($s0)
-/* 07DF18 8007D318 10000002 */ b .L8007D324
-/* 07DF1C 8007D31C AE130074 */ sw $s3, 0x74($s0)
-/* 07DF20 8007D320 AE150074 */ sw $s5, 0x74($s0)
-.L8007D324:
-/* 07DF24 8007D324 26520004 */ addiu $s2, $s2, 4
-.L8007D328:
-/* 07DF28 8007D328 5654FFD9 */ bnel $s2, $s4, .L8007D290
-/* 07DF2C 8007D32C 8E510028 */ lw $s1, 0x28($s2)
-/* 07DF30 8007D330 8FBF003C */ lw $ra, 0x3c($sp)
-/* 07DF34 8007D334 8FB00018 */ lw $s0, 0x18($sp)
-/* 07DF38 8007D338 8FB1001C */ lw $s1, 0x1c($sp)
-/* 07DF3C 8007D33C 8FB20020 */ lw $s2, 0x20($sp)
-/* 07DF40 8007D340 8FB30024 */ lw $s3, 0x24($sp)
-/* 07DF44 8007D344 8FB40028 */ lw $s4, 0x28($sp)
-/* 07DF48 8007D348 8FB5002C */ lw $s5, 0x2c($sp)
-/* 07DF4C 8007D34C 8FB60030 */ lw $s6, 0x30($sp)
-/* 07DF50 8007D350 8FB70034 */ lw $s7, 0x34($sp)
-/* 07DF54 8007D354 8FBE0038 */ lw $fp, 0x38($sp)
-/* 07DF58 8007D358 03E00008 */ jr $ra
-/* 07DF5C 8007D35C 27BD0060 */ addiu $sp, $sp, 0x60
diff --git a/asm/non_matchings/code_80071F00/func_8007E00C.s b/asm/non_matchings/code_80071F00/func_8007E00C.s
deleted file mode 100644
index fbd2b9c5d..000000000
--- a/asm/non_matchings/code_80071F00/func_8007E00C.s
+++ /dev/null
@@ -1,124 +0,0 @@
-.section .late_rodata
-
-glabel jpt_800EEF4C
-.word L8007E198, L8007E058, L8007E198, L8007E068
-.word L8007E084, L8007E154, L8007E180
-
-.section .text
-
-glabel func_8007E00C
-/* 07EC0C 8007E00C 000470C0 */ sll $t6, $a0, 3
-/* 07EC10 8007E010 27BDFFD0 */ addiu $sp, $sp, -0x30
-/* 07EC14 8007E014 01C47023 */ subu $t6, $t6, $a0
-/* 07EC18 8007E018 3C0F8016 */ lui $t7, %hi(gObjectList) # $t7, 0x8016
-/* 07EC1C 8007E01C AFB00028 */ sw $s0, 0x28($sp)
-/* 07EC20 8007E020 25EF5C18 */ addiu $t7, %lo(gObjectList) # addiu $t7, $t7, 0x5c18
-/* 07EC24 8007E024 000E7140 */ sll $t6, $t6, 5
-/* 07EC28 8007E028 01CF8021 */ addu $s0, $t6, $t7
-/* 07EC2C 8007E02C 961800A6 */ lhu $t8, 0xa6($s0)
-/* 07EC30 8007E030 AFBF002C */ sw $ra, 0x2c($sp)
-/* 07EC34 8007E034 00803025 */ move $a2, $a0
-/* 07EC38 8007E038 2F010007 */ sltiu $at, $t8, 7
-/* 07EC3C 8007E03C 10200056 */ beqz $at, .L8007E198
-/* 07EC40 8007E040 0018C080 */ sll $t8, $t8, 2
-/* 07EC44 8007E044 3C01800F */ lui $at, %hi(jpt_800EEF4C)
-/* 07EC48 8007E048 00380821 */ addu $at, $at, $t8
-/* 07EC4C 8007E04C 8C38EF4C */ lw $t8, %lo(jpt_800EEF4C)($at)
-/* 07EC50 8007E050 03000008 */ jr $t8
-/* 07EC54 8007E054 00000000 */ nop
-glabel L8007E058
-/* 07EC58 8007E058 0C01F7C8 */ jal init_bb_trash_bin
-/* 07EC5C 8007E05C 00C02025 */ move $a0, $a2
-/* 07EC60 8007E060 1000004E */ b .L8007E19C
-/* 07EC64 8007E064 8FBF002C */ lw $ra, 0x2c($sp)
-glabel L8007E068
-/* 07EC68 8007E068 24190001 */ li $t9, 1
-/* 07EC6C 8007E06C 3C018019 */ lui $at, %hi(D_8018CFB0) # $at, 0x8019
-/* 07EC70 8007E070 A439CFB0 */ sh $t9, %lo(D_8018CFB0)($at)
-/* 07EC74 8007E074 0C01C922 */ jal func_80072488
-/* 07EC78 8007E078 00C02025 */ move $a0, $a2
-/* 07EC7C 8007E07C 10000047 */ b .L8007E19C
-/* 07EC80 8007E080 8FBF002C */ lw $ra, 0x2c($sp)
-glabel L8007E084
-/* 07EC84 8007E084 00C02025 */ move $a0, $a2
-/* 07EC88 8007E088 240500D2 */ li $a1, 210
-/* 07EC8C 8007E08C 0C01C9E3 */ jal func_8007278C
-/* 07EC90 8007E090 AFA60030 */ sw $a2, 0x30($sp)
-/* 07EC94 8007E094 3C088016 */ lui $t0, %hi(D_80165594) # $t0, 0x8016
-/* 07EC98 8007E098 8D085594 */ lw $t0, %lo(D_80165594)($t0)
-/* 07EC9C 8007E09C 3C09800E */ lui $t1, %hi(gCCSelection) # $t1, 0x800e
-/* 07ECA0 8007E0A0 55000014 */ bnel $t0, $zero, .L8007E0F4
-/* 07ECA4 8007E0A4 240A0400 */ li $t2, 1024
-/* 07ECA8 8007E0A8 8D29C548 */ lw $t1, %lo(gCCSelection)($t1)
-/* 07ECAC 8007E0AC 29210002 */ slti $at, $t1, 2
-/* 07ECB0 8007E0B0 10200007 */ beqz $at, .L8007E0D0
-/* 07ECB4 8007E0B4 00000000 */ nop
-/* 07ECB8 8007E0B8 0C01F5C5 */ jal func_8007D714
-/* 07ECBC 8007E0BC 24040001 */ li $a0, 1
-/* 07ECC0 8007E0C0 0C01F5C5 */ jal func_8007D714
-/* 07ECC4 8007E0C4 24040001 */ li $a0, 1
-/* 07ECC8 8007E0C8 1000000A */ b .L8007E0F4
-/* 07ECCC 8007E0CC 240A0400 */ li $t2, 1024
-.L8007E0D0:
-/* 07ECD0 8007E0D0 0C01F5C5 */ jal func_8007D714
-/* 07ECD4 8007E0D4 24040001 */ li $a0, 1
-/* 07ECD8 8007E0D8 0C01F5C5 */ jal func_8007D714
-/* 07ECDC 8007E0DC 24040001 */ li $a0, 1
-/* 07ECE0 8007E0E0 0C01F5C5 */ jal func_8007D714
-/* 07ECE4 8007E0E4 24040001 */ li $a0, 1
-/* 07ECE8 8007E0E8 0C01F5C5 */ jal func_8007D714
-/* 07ECEC 8007E0EC 24040001 */ li $a0, 1
-/* 07ECF0 8007E0F0 240A0400 */ li $t2, 1024
-.L8007E0F4:
-/* 07ECF4 8007E0F4 240BFFFF */ li $t3, -1
-/* 07ECF8 8007E0F8 AFAB0018 */ sw $t3, 0x18($sp)
-/* 07ECFC 8007E0FC AFAA0010 */ sw $t2, 0x10($sp)
-/* 07ED00 8007E100 8FA40030 */ lw $a0, 0x30($sp)
-/* 07ED04 8007E104 260500A0 */ addiu $a1, $s0, 0xa0
-/* 07ED08 8007E108 2406E000 */ li $a2, -8192
-/* 07ED0C 8007E10C 00003825 */ move $a3, $zero
-/* 07ED10 8007E110 0C01CF2C */ jal func_80073CB0
-/* 07ED14 8007E114 AFA00014 */ sw $zero, 0x14($sp)
-/* 07ED18 8007E118 86030092 */ lh $v1, 0x92($s0)
-/* 07ED1C 8007E11C 860C00A0 */ lh $t4, 0xa0($s0)
-/* 07ED20 8007E120 26040004 */ addiu $a0, $s0, 4
-/* 07ED24 8007E124 14600008 */ bnez $v1, .L8007E148
-/* 07ED28 8007E128 A60C00B6 */ sh $t4, 0xb6($s0)
-/* 07ED2C 8007E12C 3C061901 */ lui $a2, (0x1901904E >> 16) # lui $a2, 0x1901
-/* 07ED30 8007E130 34C6904E */ ori $a2, (0x1901904E & 0xFFFF) # ori $a2, $a2, 0x904e
-/* 07ED34 8007E134 0C03262E */ jal func_800C98B8
-/* 07ED38 8007E138 26050038 */ addiu $a1, $s0, 0x38
-/* 07ED3C 8007E13C 240D0014 */ li $t5, 20
-/* 07ED40 8007E140 10000015 */ b .L8007E198
-/* 07ED44 8007E144 A60D0092 */ sh $t5, 0x92($s0)
-.L8007E148:
-/* 07ED48 8007E148 246EFFFF */ addiu $t6, $v1, -1
-/* 07ED4C 8007E14C 10000012 */ b .L8007E198
-/* 07ED50 8007E150 A60E0092 */ sh $t6, 0x92($s0)
-glabel L8007E154
-/* 07ED54 8007E154 960400B6 */ lhu $a0, 0xb6($s0)
-/* 07ED58 8007E158 00002825 */ move $a1, $zero
-/* 07ED5C 8007E15C 0C0105ED */ jal func_800417B4
-/* 07ED60 8007E160 AFA60030 */ sw $a2, 0x30($sp)
-/* 07ED64 8007E164 304FFFFF */ andi $t7, $v0, 0xffff
-/* 07ED68 8007E168 15E0000B */ bnez $t7, .L8007E198
-/* 07ED6C 8007E16C A60200B6 */ sh $v0, 0xb6($s0)
-/* 07ED70 8007E170 0C01C922 */ jal func_80072488
-/* 07ED74 8007E174 8FA40030 */ lw $a0, 0x30($sp)
-/* 07ED78 8007E178 10000008 */ b .L8007E19C
-/* 07ED7C 8007E17C 8FBF002C */ lw $ra, 0x2c($sp)
-glabel L8007E180
-/* 07ED80 8007E180 A60000B6 */ sh $zero, 0xb6($s0)
-/* 07ED84 8007E184 A6000092 */ sh $zero, 0x92($s0)
-/* 07ED88 8007E188 0C01C922 */ jal func_80072488
-/* 07ED8C 8007E18C 00C02025 */ move $a0, $a2
-/* 07ED90 8007E190 3C018019 */ lui $at, %hi(D_8018CFB0) # $at, 0x8019
-/* 07ED94 8007E194 A420CFB0 */ sh $zero, %lo(D_8018CFB0)($at)
-.L8007E198:
-glabel L8007E198
-/* 07ED98 8007E198 8FBF002C */ lw $ra, 0x2c($sp)
-.L8007E19C:
-/* 07ED9C 8007E19C 8FB00028 */ lw $s0, 0x28($sp)
-/* 07EDA0 8007E1A0 27BD0030 */ addiu $sp, $sp, 0x30
-/* 07EDA4 8007E1A4 03E00008 */ jr $ra
-/* 07EDA8 8007E1A8 00000000 */ nop
diff --git a/asm/non_matchings/code_80071F00/func_8007FB48.s b/asm/non_matchings/code_80071F00/func_8007FB48.s
deleted file mode 100644
index 625f02125..000000000
--- a/asm/non_matchings/code_80071F00/func_8007FB48.s
+++ /dev/null
@@ -1,247 +0,0 @@
-.section .late_rodata
-
-glabel jpt_800EF060
-.word L8007FE94, L8007FBBC, L8007FBE4
-.word L8007FE94, L8007FDE0, L8007FE4C
-
-glabel D_800EF078
-.double -1000.0
-
-glabel D_800EF080
-.double 1000.0
-
-.section .text
-
-glabel func_8007FB48
-/* 080748 8007FB48 000478C0 */ sll $t7, $a0, 3
-/* 08074C 8007FB4C 01E47823 */ subu $t7, $t7, $a0
-/* 080750 8007FB50 3C188016 */ lui $t8, %hi(gObjectList) # $t8, 0x8016
-/* 080754 8007FB54 27185C18 */ addiu $t8, %lo(gObjectList) # addiu $t8, $t8, 0x5c18
-/* 080758 8007FB58 000F7940 */ sll $t7, $t7, 5
-/* 08075C 8007FB5C 01F81821 */ addu $v1, $t7, $t8
-/* 080760 8007FB60 807900D1 */ lb $t9, 0xd1($v1)
-/* 080764 8007FB64 946A00AE */ lhu $t2, 0xae($v1)
-/* 080768 8007FB68 3C09800E */ lui $t1, %hi(gPlayerOne) # $t1, 0x800e
-/* 08076C 8007FB6C 001940C0 */ sll $t0, $t9, 3
-/* 080770 8007FB70 01194023 */ subu $t0, $t0, $t9
-/* 080774 8007FB74 00084100 */ sll $t0, $t0, 4
-/* 080778 8007FB78 01194023 */ subu $t0, $t0, $t9
-/* 08077C 8007FB7C 00084080 */ sll $t0, $t0, 2
-/* 080780 8007FB80 8D29C4DC */ lw $t1, %lo(gPlayerOne)($t1)
-/* 080784 8007FB84 01194023 */ subu $t0, $t0, $t9
-/* 080788 8007FB88 27BDFFD8 */ addiu $sp, $sp, -0x28
-/* 08078C 8007FB8C 000840C0 */ sll $t0, $t0, 3
-/* 080790 8007FB90 2D410006 */ sltiu $at, $t2, 6
-/* 080794 8007FB94 AFBF0014 */ sw $ra, 0x14($sp)
-/* 080798 8007FB98 AFA40028 */ sw $a0, 0x28($sp)
-/* 08079C 8007FB9C 102000BD */ beqz $at, .L8007FE94
-/* 0807A0 8007FBA0 01092821 */ addu $a1, $t0, $t1
-/* 0807A4 8007FBA4 000A5080 */ sll $t2, $t2, 2
-/* 0807A8 8007FBA8 3C01800F */ lui $at, %hi(jpt_800EF060) # 0x800f
-/* 0807AC 8007FBAC 002A0821 */ addu $at, $at, $t2
-/* 0807B0 8007FBB0 8C2AF060 */ lw $t2, %lo(jpt_800EF060)($at) # -0xfa0($at)
-/* 0807B4 8007FBB4 01400008 */ jr $t2
-/* 0807B8 8007FBB8 00000000 */ nop
-glabel L8007FBBC
-/* 0807BC 8007FBBC 44800000 */ mtc1 $zero, $f0
-/* 0807C0 8007FBC0 240B00A0 */ li $t3, 160
-/* 0807C4 8007FBC4 A46B00B0 */ sh $t3, 0xb0($v1)
-/* 0807C8 8007FBC8 8FA40028 */ lw $a0, 0x28($sp)
-/* 0807CC 8007FBCC E4600028 */ swc1 $f0, 0x28($v1)
-/* 0807D0 8007FBD0 E4600030 */ swc1 $f0, 0x30($v1)
-/* 0807D4 8007FBD4 0C021BF5 */ jal func_80086FD4
-/* 0807D8 8007FBD8 E4600040 */ swc1 $f0, 0x40($v1)
-/* 0807DC 8007FBDC 100000AE */ b .L8007FE98
-/* 0807E0 8007FBE0 8FBF0014 */ lw $ra, 0x14($sp)
-glabel L8007FBE4
-/* 0807E4 8007FBE4 3C018019 */ lui $at, %hi(D_8018D01C) # 0x80190000 # -0.000000
-/* 0807E8 8007FBE8 C426D01C */ lwc1 $f6, %lo(D_8018D01C)($at)
-/* 0807EC 8007FBEC C4A40094 */ lwc1 $f4, 0x94($a1)
-/* 0807F0 8007FBF0 3C013FF4 */ li $at, 0x3FF40000 # 1.906250
-/* 0807F4 8007FBF4 44818800 */ mtc1 $at, $f17
-/* 0807F8 8007FBF8 46062202 */ mul.s $f8, $f4, $f6
-/* 0807FC 8007FBFC 44808000 */ mtc1 $zero, $f16
-/* 080800 8007FC00 8C620048 */ lw $v0, 0x48($v1)
-/* 080804 8007FC04 846400B0 */ lh $a0, 0xb0($v1)
-/* 080808 8007FC08 0044082A */ slt $at, $v0, $a0
-/* 08080C 8007FC0C 460042A1 */ cvt.d.s $f10, $f8
-/* 080810 8007FC10 46305482 */ mul.d $f18, $f10, $f16
-/* 080814 8007FC14 46209120 */ cvt.s.d $f4, $f18
-/* 080818 8007FC18 14200031 */ bnez $at, .L8007FCE0
-/* 08081C 8007FC1C E4640038 */ swc1 $f4, 0x38($v1)
-/* 080820 8007FC20 1482000D */ bne $a0, $v0, .L8007FC58
-/* 080824 8007FC24 3C0C8019 */ lui $t4, %hi(D_8018D400) # $t4, 0x8019
-/* 080828 8007FC28 8D8CD400 */ lw $t4, %lo(D_8018D400)($t4)
-/* 08082C 8007FC2C 3C01BFC0 */ li $at, 0xBFC00000 # -1.500000
-/* 080830 8007FC30 318D0001 */ andi $t5, $t4, 1
-/* 080834 8007FC34 51A00006 */ beql $t5, $zero, .L8007FC50
-/* 080838 8007FC38 44814000 */ mtc1 $at, $f8
-/* 08083C 8007FC3C 3C013FC0 */ li $at, 0x3FC00000 # 1.500000
-/* 080840 8007FC40 44813000 */ mtc1 $at, $f6
-/* 080844 8007FC44 10000004 */ b .L8007FC58
-/* 080848 8007FC48 E4660040 */ swc1 $f6, 0x40($v1)
-/* 08084C 8007FC4C 44814000 */ mtc1 $at, $f8
-.L8007FC50:
-/* 080850 8007FC50 00000000 */ nop
-/* 080854 8007FC54 E4680040 */ swc1 $f8, 0x40($v1)
-.L8007FC58:
-/* 080858 8007FC58 C46A0040 */ lwc1 $f10, 0x40($v1)
-/* 08085C 8007FC5C 44809800 */ mtc1 $zero, $f19
-/* 080860 8007FC60 44809000 */ mtc1 $zero, $f18
-/* 080864 8007FC64 46005421 */ cvt.d.s $f16, $f10
-/* 080868 8007FC68 3C01C044 */ li $at, 0xC0440000 # -3.062500
-/* 08086C 8007FC6C 4630903E */ c.le.d $f18, $f16
-/* 080870 8007FC70 00000000 */ nop
-/* 080874 8007FC74 4502000F */ bc1fl .L8007FCB4
-/* 080878 8007FC78 C4720030 */ lwc1 $f18, 0x30($v1)
-/* 08087C 8007FC7C C4640030 */ lwc1 $f4, 0x30($v1)
-/* 080880 8007FC80 3C014044 */ li $at, 0x40440000 # 3.062500
-/* 080884 8007FC84 44814800 */ mtc1 $at, $f9
-/* 080888 8007FC88 44804000 */ mtc1 $zero, $f8
-/* 08088C 8007FC8C 460021A1 */ cvt.d.s $f6, $f4
-/* 080890 8007FC90 3C01BFC0 */ li $at, 0xBFC00000 # -1.500000
-/* 080894 8007FC94 4626403E */ c.le.d $f8, $f6
-/* 080898 8007FC98 00000000 */ nop
-/* 08089C 8007FC9C 45020011 */ bc1fl .L8007FCE4
-/* 0808A0 8007FCA0 8FA40028 */ lw $a0, 0x28($sp)
-/* 0808A4 8007FCA4 44815000 */ mtc1 $at, $f10
-/* 0808A8 8007FCA8 1000000D */ b .L8007FCE0
-/* 0808AC 8007FCAC E46A0040 */ swc1 $f10, 0x40($v1)
-/* 0808B0 8007FCB0 C4720030 */ lwc1 $f18, 0x30($v1)
-.L8007FCB4:
-/* 0808B4 8007FCB4 44818800 */ mtc1 $at, $f17
-/* 0808B8 8007FCB8 44808000 */ mtc1 $zero, $f16
-/* 0808BC 8007FCBC 46009121 */ cvt.d.s $f4, $f18
-/* 0808C0 8007FCC0 3C013FC0 */ li $at, 0x3FC00000 # 1.500000
-/* 0808C4 8007FCC4 4630203E */ c.le.d $f4, $f16
-/* 0808C8 8007FCC8 00000000 */ nop
-/* 0808CC 8007FCCC 45020005 */ bc1fl .L8007FCE4
-/* 0808D0 8007FCD0 8FA40028 */ lw $a0, 0x28($sp)
-/* 0808D4 8007FCD4 44813000 */ mtc1 $at, $f6
-/* 0808D8 8007FCD8 00000000 */ nop
-/* 0808DC 8007FCDC E4660040 */ swc1 $f6, 0x40($v1)
-.L8007FCE0:
-/* 0808E0 8007FCE0 8FA40028 */ lw $a0, 0x28($sp)
-.L8007FCE4:
-/* 0808E4 8007FCE4 0C021DD7 */ jal func_8008775C
-/* 0808E8 8007FCE8 AFA30018 */ sw $v1, 0x18($sp)
-/* 0808EC 8007FCEC 8FA30018 */ lw $v1, 0x18($sp)
-/* 0808F0 8007FCF0 846400B0 */ lh $a0, 0xb0($v1)
-/* 0808F4 8007FCF4 28810065 */ slti $at, $a0, 0x65
-/* 0808F8 8007FCF8 10200012 */ beqz $at, .L8007FD44
-/* 0808FC 8007FCFC 00000000 */ nop
-/* 080900 8007FD00 946500C0 */ lhu $a1, 0xc0($v1)
-/* 080904 8007FD04 34018000 */ li $at, 32768
-/* 080908 8007FD08 946400B4 */ lhu $a0, 0xb4($v1)
-/* 08090C 8007FD0C 00A12821 */ addu $a1, $a1, $at
-/* 080910 8007FD10 30AEFFFF */ andi $t6, $a1, 0xffff
-/* 080914 8007FD14 01C02825 */ move $a1, $t6
-/* 080918 8007FD18 0C0105ED */ jal func_800417B4
-/* 08091C 8007FD1C AFA30018 */ sw $v1, 0x18($sp)
-/* 080920 8007FD20 8FA30018 */ lw $v1, 0x18($sp)
-/* 080924 8007FD24 24010064 */ li $at, 100
-/* 080928 8007FD28 240F0001 */ li $t7, 1
-/* 08092C 8007FD2C 846400B0 */ lh $a0, 0xb0($v1)
-/* 080930 8007FD30 A46200B4 */ sh $v0, 0xb4($v1)
-/* 080934 8007FD34 14810003 */ bne $a0, $at, .L8007FD44
-/* 080938 8007FD38 00000000 */ nop
-/* 08093C 8007FD3C A06F00D2 */ sb $t7, 0xd2($v1)
-/* 080940 8007FD40 846400B0 */ lh $a0, 0xb0($v1)
-.L8007FD44:
-/* 080944 8007FD44 3C18800E */ lui $t8, %hi(gIsMirrorMode) # $t8, 0x800e
-/* 080948 8007FD48 8F18C604 */ lw $t8, %lo(gIsMirrorMode)($t8)
-/* 08094C 8007FD4C 00001025 */ move $v0, $zero
-/* 080950 8007FD50 2499FFFF */ addiu $t9, $a0, -1
-/* 080954 8007FD54 1300000B */ beqz $t8, .L8007FD84
-/* 080958 8007FD58 24050003 */ li $a1, 3
-/* 08095C 8007FD5C C46A0028 */ lwc1 $f10, 0x28($v1)
-/* 080960 8007FD60 3C01800F */ lui $at, %hi(D_800EF078)
-/* 080964 8007FD64 D428F078 */ ldc1 $f8, %lo(D_800EF078)($at)
-/* 080968 8007FD68 460054A1 */ cvt.d.s $f18, $f10
-/* 08096C 8007FD6C 4628903E */ c.le.d $f18, $f8
-/* 080970 8007FD70 00000000 */ nop
-/* 080974 8007FD74 4502000D */ bc1fl .L8007FDAC
-/* 080978 8007FD78 A47900B0 */ sh $t9, 0xb0($v1)
-/* 08097C 8007FD7C 1000000A */ b .L8007FDA8
-/* 080980 8007FD80 24020001 */ li $v0, 1
-.L8007FD84:
-/* 080984 8007FD84 C4700028 */ lwc1 $f16, 0x28($v1)
-/* 080988 8007FD88 3C01800F */ lui $at, %hi(D_800EF080)
-/* 08098C 8007FD8C D426F080 */ ldc1 $f6, %lo(D_800EF080)($at)
-/* 080990 8007FD90 46008121 */ cvt.d.s $f4, $f16
-/* 080994 8007FD94 4624303E */ c.le.d $f6, $f4
-/* 080998 8007FD98 00000000 */ nop
-/* 08099C 8007FD9C 45020003 */ bc1fl .L8007FDAC
-/* 0809A0 8007FDA0 A47900B0 */ sh $t9, 0xb0($v1)
-/* 0809A4 8007FDA4 24020001 */ li $v0, 1
-.L8007FDA8:
-/* 0809A8 8007FDA8 A47900B0 */ sh $t9, 0xb0($v1)
-.L8007FDAC:
-/* 0809AC 8007FDAC 846800B0 */ lh $t0, 0xb0($v1)
-/* 0809B0 8007FDB0 51000004 */ beql $t0, $zero, .L8007FDC4
-/* 0809B4 8007FDB4 44800000 */ mtc1 $zero, $f0
-/* 0809B8 8007FDB8 50400037 */ beql $v0, $zero, .L8007FE98
-/* 0809BC 8007FDBC 8FBF0014 */ lw $ra, 0x14($sp)
-/* 0809C0 8007FDC0 44800000 */ mtc1 $zero, $f0
-.L8007FDC4:
-/* 0809C4 8007FDC4 8FA40028 */ lw $a0, 0x28($sp)
-/* 0809C8 8007FDC8 0C01C9B3 */ jal func_800726CC
-/* 0809CC 8007FDCC E4600034 */ swc1 $f0, 0x34($v1)
-/* 0809D0 8007FDD0 0C021BF5 */ jal func_80086FD4
-/* 0809D4 8007FDD4 8FA40028 */ lw $a0, 0x28($sp)
-/* 0809D8 8007FDD8 1000002F */ b .L8007FE98
-/* 0809DC 8007FDDC 8FBF0014 */ lw $ra, 0x14($sp)
-glabel L8007FDE0
-/* 0809E0 8007FDE0 44800000 */ mtc1 $zero, $f0
-/* 0809E4 8007FDE4 24640030 */ addiu $a0, $v1, 0x30
-/* 0809E8 8007FDE8 3C064000 */ lui $a2, 0x4000
-/* 0809EC 8007FDEC 44050000 */ mfc1 $a1, $f0
-/* 0809F0 8007FDF0 0C0104EE */ jal f32_step_towards
-/* 0809F4 8007FDF4 AFA30018 */ sw $v1, 0x18($sp)
-/* 0809F8 8007FDF8 44800000 */ mtc1 $zero, $f0
-/* 0809FC 8007FDFC 8FA30018 */ lw $v1, 0x18($sp)
-/* 080A00 8007FE00 3C0640A0 */ lui $a2, 0x40a0
-/* 080A04 8007FE04 44050000 */ mfc1 $a1, $f0
-/* 080A08 8007FE08 0C0104EE */ jal f32_step_towards
-/* 080A0C 8007FE0C 24640028 */ addiu $a0, $v1, 0x28
-/* 080A10 8007FE10 8FA30018 */ lw $v1, 0x18($sp)
-/* 080A14 8007FE14 44805800 */ mtc1 $zero, $f11
-/* 080A18 8007FE18 44805000 */ mtc1 $zero, $f10
-/* 080A1C 8007FE1C C4680030 */ lwc1 $f8, 0x30($v1)
-/* 080A20 8007FE20 C4720028 */ lwc1 $f18, 0x28($v1)
-/* 080A24 8007FE24 46124400 */ add.s $f16, $f8, $f18
-/* 080A28 8007FE28 46008121 */ cvt.d.s $f4, $f16
-/* 080A2C 8007FE2C 46245032 */ c.eq.d $f10, $f4
-/* 080A30 8007FE30 00000000 */ nop
-/* 080A34 8007FE34 45020018 */ bc1fl .L8007FE98
-/* 080A38 8007FE38 8FBF0014 */ lw $ra, 0x14($sp)
-/* 080A3C 8007FE3C 0C021BF5 */ jal func_80086FD4
-/* 080A40 8007FE40 8FA40028 */ lw $a0, 0x28($sp)
-/* 080A44 8007FE44 10000014 */ b .L8007FE98
-/* 080A48 8007FE48 8FBF0014 */ lw $ra, 0x14($sp)
-glabel L8007FE4C
-/* 080A4C 8007FE4C 946400B4 */ lhu $a0, 0xb4($v1)
-/* 080A50 8007FE50 946500C0 */ lhu $a1, 0xc0($v1)
-/* 080A54 8007FE54 0C0105ED */ jal func_800417B4
-/* 080A58 8007FE58 AFA30018 */ sw $v1, 0x18($sp)
-/* 080A5C 8007FE5C 8FA30018 */ lw $v1, 0x18($sp)
-/* 080A60 8007FE60 3049FFFF */ andi $t1, $v0, 0xffff
-/* 080A64 8007FE64 24050008 */ li $a1, 8
-/* 080A68 8007FE68 946A00C0 */ lhu $t2, 0xc0($v1)
-/* 080A6C 8007FE6C A46200B4 */ sh $v0, 0xb4($v1)
-/* 080A70 8007FE70 8FA40028 */ lw $a0, 0x28($sp)
-/* 080A74 8007FE74 552A0008 */ bnel $t1, $t2, .L8007FE98
-/* 080A78 8007FE78 8FBF0014 */ lw $ra, 0x14($sp)
-/* 080A7C 8007FE7C 0C01C8B3 */ jal func_800722CC
-/* 080A80 8007FE80 AFA30018 */ sw $v1, 0x18($sp)
-/* 080A84 8007FE84 0C021BF5 */ jal func_80086FD4
-/* 080A88 8007FE88 8FA40028 */ lw $a0, 0x28($sp)
-/* 080A8C 8007FE8C 8FA30018 */ lw $v1, 0x18($sp)
-/* 080A90 8007FE90 A06000D2 */ sb $zero, 0xd2($v1)
-.L8007FE94:
-glabel L8007FE94
-/* 080A94 8007FE94 8FBF0014 */ lw $ra, 0x14($sp)
-.L8007FE98:
-/* 080A98 8007FE98 27BD0028 */ addiu $sp, $sp, 0x28
-/* 080A9C 8007FE9C 03E00008 */ jr $ra
-/* 080AA0 8007FEA0 00000000 */ nop
diff --git a/asm/non_matchings/code_80071F00/func_800808CC.s b/asm/non_matchings/code_80071F00/func_800808CC.s
deleted file mode 100644
index 443f17c7e..000000000
--- a/asm/non_matchings/code_80071F00/func_800808CC.s
+++ /dev/null
@@ -1,90 +0,0 @@
-glabel func_800808CC
-/* 0814CC 800808CC 000478C0 */ sll $t7, $a0, 3
-/* 0814D0 800808D0 01E47823 */ subu $t7, $t7, $a0
-/* 0814D4 800808D4 3C188016 */ lui $t8, %hi(gObjectList) # $t8, 0x8016
-/* 0814D8 800808D8 27185C18 */ addiu $t8, %lo(gObjectList) # addiu $t8, $t8, 0x5c18
-/* 0814DC 800808DC 000F7940 */ sll $t7, $t7, 5
-/* 0814E0 800808E0 01F84021 */ addu $t0, $t7, $t8
-/* 0814E4 800808E4 850300A6 */ lh $v1, 0xa6($t0)
-/* 0814E8 800808E8 27BDFFD8 */ addiu $sp, $sp, -0x28
-/* 0814EC 800808EC AFBF001C */ sw $ra, 0x1c($sp)
-/* 0814F0 800808F0 AFA40028 */ sw $a0, 0x28($sp)
-/* 0814F4 800808F4 10600019 */ beqz $v1, .L8008095C
-/* 0814F8 800808F8 00601025 */ move $v0, $v1
-/* 0814FC 800808FC 24010001 */ li $at, 1
-/* 081500 80080900 10410006 */ beq $v0, $at, .L8008091C
-/* 081504 80080904 8FA40028 */ lw $a0, 0x28($sp)
-/* 081508 80080908 24010002 */ li $at, 2
-/* 08150C 8008090C 10410008 */ beq $v0, $at, .L80080930
-/* 081510 80080910 8FA40028 */ lw $a0, 0x28($sp)
-/* 081514 80080914 10000012 */ b .L80080960
-/* 081518 80080918 28610002 */ slti $at, $v1, 2
-.L8008091C:
-/* 08151C 8008091C 0C020149 */ jal func_80080524
-/* 081520 80080920 AFA80020 */ sw $t0, 0x20($sp)
-/* 081524 80080924 8FA80020 */ lw $t0, 0x20($sp)
-/* 081528 80080928 1000000C */ b .L8008095C
-/* 08152C 8008092C 850300A6 */ lh $v1, 0xa6($t0)
-.L80080930:
-/* 081530 80080930 24190006 */ li $t9, 6
-/* 081534 80080934 2409FFFF */ li $t1, -1
-/* 081538 80080938 AFA90014 */ sw $t1, 0x14($sp)
-/* 08153C 8008093C AFB90010 */ sw $t9, 0x10($sp)
-/* 081540 80080940 24050003 */ li $a1, 3
-/* 081544 80080944 24060005 */ li $a2, 5
-/* 081548 80080948 24070001 */ li $a3, 1
-/* 08154C 8008094C 0C01CC2F */ jal func_800730BC
-/* 081550 80080950 AFA80020 */ sw $t0, 0x20($sp)
-/* 081554 80080954 8FA80020 */ lw $t0, 0x20($sp)
-/* 081558 80080958 850300A6 */ lh $v1, 0xa6($t0)
-.L8008095C:
-/* 08155C 8008095C 28610002 */ slti $at, $v1, 2
-.L80080960:
-/* 081560 80080960 14200028 */ bnez $at, .L80080A04
-/* 081564 80080964 8FA40028 */ lw $a0, 0x28($sp)
-/* 081568 80080968 0C01F98F */ jal func_8007E63C
-/* 08156C 8008096C AFA80020 */ sw $t0, 0x20($sp)
-/* 081570 80080970 0C020217 */ jal func_8008085C
-/* 081574 80080974 8FA40028 */ lw $a0, 0x28($sp)
-/* 081578 80080978 0C01CD45 */ jal func_80073514
-/* 08157C 8008097C 8FA40028 */ lw $a0, 0x28($sp)
-/* 081580 80080980 3C0A800E */ lui $t2, %hi(gGamestate) # $t2, 0x800e
-/* 081584 80080984 8D4AC50C */ lw $t2, %lo(gGamestate)($t2)
-/* 081588 80080988 24010009 */ li $at, 9
-/* 08158C 8008098C 8FA80020 */ lw $t0, 0x20($sp)
-/* 081590 80080990 1141000F */ beq $t2, $at, .L800809D0
-/* 081594 80080994 3C028028 */ lui $v0, %hi(gCutsceneShotTimer) # $v0, 0x8028
-/* 081598 80080998 3C0B8019 */ lui $t3, %hi(D_8018D40C) # $t3, 0x8019
-/* 08159C 8008099C 8D6BD40C */ lw $t3, %lo(D_8018D40C)($t3)
-/* 0815A0 800809A0 55600019 */ bnel $t3, $zero, .L80080A08
-/* 0815A4 800809A4 8FBF001C */ lw $ra, 0x1c($sp)
-/* 0815A8 800809A8 850C00A6 */ lh $t4, 0xa6($t0)
-/* 0815AC 800809AC 24010002 */ li $at, 2
-/* 0815B0 800809B0 25040004 */ addiu $a0, $t0, 4
-/* 0815B4 800809B4 15810013 */ bne $t4, $at, .L80080A04
-/* 0815B8 800809B8 25050038 */ addiu $a1, $t0, 0x38
-/* 0815BC 800809BC 3C061903 */ lui $a2, (0x19036045 >> 16) # lui $a2, 0x1903
-/* 0815C0 800809C0 0C03262E */ jal func_800C98B8
-/* 0815C4 800809C4 34C66045 */ ori $a2, (0x19036045 & 0xFFFF) # ori $a2, $a2, 0x6045
-/* 0815C8 800809C8 1000000F */ b .L80080A08
-/* 0815CC 800809CC 8FBF001C */ lw $ra, 0x1c($sp)
-.L800809D0:
-/* 0815D0 800809D0 844276D2 */ lh $v0, %lo(gCutsceneShotTimer)($v0)
-/* 0815D4 800809D4 284100BF */ slti $at, $v0, 0xbf
-/* 0815D8 800809D8 1020000A */ beqz $at, .L80080A04
-/* 0815DC 800809DC 24010058 */ li $at, 88
-/* 0815E0 800809E0 0041001A */ div $zero, $v0, $at
-/* 0815E4 800809E4 00006810 */ mfhi $t5
-/* 0815E8 800809E8 2401001E */ li $at, 30
-/* 0815EC 800809EC 15A10005 */ bne $t5, $at, .L80080A04
-/* 0815F0 800809F0 25040004 */ addiu $a0, $t0, 4
-/* 0815F4 800809F4 3C061903 */ lui $a2, (0x19036045 >> 16) # lui $a2, 0x1903
-/* 0815F8 800809F8 34C66045 */ ori $a2, (0x19036045 & 0xFFFF) # ori $a2, $a2, 0x6045
-/* 0815FC 800809FC 0C03262E */ jal func_800C98B8
-/* 081600 80080A00 25050038 */ addiu $a1, $t0, 0x38
-.L80080A04:
-/* 081604 80080A04 8FBF001C */ lw $ra, 0x1c($sp)
-.L80080A08:
-/* 081608 80080A08 27BD0028 */ addiu $sp, $sp, 0x28
-/* 08160C 80080A0C 03E00008 */ jr $ra
-/* 081610 80080A10 00000000 */ nop
diff --git a/asm/non_matchings/code_80071F00/func_8008241C.s b/asm/non_matchings/code_80071F00/func_8008241C.s
deleted file mode 100644
index 233405d54..000000000
--- a/asm/non_matchings/code_80071F00/func_8008241C.s
+++ /dev/null
@@ -1,222 +0,0 @@
-.section .late_rodata
-
-glabel D_800EF16C
-.float 0.2
-
-glabel D_800EF170
-.double -360.0
-
-glabel D_800EF178
-.double -1300.0
-
-glabel D_800EF180
-.double 328.0
-
-glabel D_800EF188
-.double 2541.0
-
-glabel D_800EF190
-.double -985.0
-
-glabel D_800EF198
-.double 1200.0
-
-.section .text
-
-glabel func_8008241C
-/* 08301C 8008241C 000470C0 */ sll $t6, $a0, 3
-/* 083020 80082420 27BDFFD8 */ addiu $sp, $sp, -0x28
-/* 083024 80082424 01C47023 */ subu $t6, $t6, $a0
-/* 083028 80082428 3C0F8016 */ lui $t7, %hi(gObjectList) # $t7, 0x8016
-/* 08302C 8008242C AFB00014 */ sw $s0, 0x14($sp)
-/* 083030 80082430 25EF5C18 */ addiu $t7, %lo(gObjectList) # addiu $t7, $t7, 0x5c18
-/* 083034 80082434 000E7140 */ sll $t6, $t6, 5
-/* 083038 80082438 01CF8021 */ addu $s0, $t6, $t7
-/* 08303C 8008243C 3C180601 */ lui $t8, %hi(d_course_koopa_troopa_beach_unk4) # $t8, 0x601
-/* 083040 80082440 3C190601 */ lui $t9, %hi(d_course_koopa_troopa_beach_unk_data5) # $t9, 0x601
-/* 083044 80082444 24020001 */ li $v0, 1
-/* 083048 80082448 271869B0 */ addiu $t8, %lo(d_course_koopa_troopa_beach_unk4) # addiu $t8, $t8, 0x69b0
-/* 08304C 8008244C 27396B60 */ addiu $t9, %lo(d_course_koopa_troopa_beach_unk_data5) # addiu $t9, $t9, 0x6b60
-/* 083050 80082450 A20200D8 */ sb $v0, 0xd8($s0)
-/* 083054 80082454 AE180070 */ sw $t8, 0x70($s0)
-/* 083058 80082458 AE190074 */ sw $t9, 0x74($s0)
-/* 08305C 8008245C 3C01800F */ lui $at, %hi(D_800EF16C) # $at, 0x800f
-/* 083060 80082460 C424F16C */ lwc1 $f4, %lo(D_800EF16C)($at)
-/* 083064 80082464 AFB10018 */ sw $s1, 0x18($sp)
-/* 083068 80082468 00808825 */ move $s1, $a0
-/* 08306C 8008246C AFBF001C */ sw $ra, 0x1c($sp)
-/* 083070 80082470 AFA5002C */ sw $a1, 0x2c($sp)
-/* 083074 80082474 A20200DD */ sb $v0, 0xdd($s0)
-/* 083078 80082478 240400C8 */ li $a0, 200
-/* 08307C 8008247C 0C0ADF8D */ jal random_int
-/* 083080 80082480 E6040000 */ swc1 $f4, ($s0)
-/* 083084 80082484 44823000 */ mtc1 $v0, $f6
-/* 083088 80082488 44808000 */ mtc1 $zero, $f16
-/* 08308C 8008248C 04410006 */ bgez $v0, .L800824A8
-/* 083090 80082490 46803221 */ cvt.d.w $f8, $f6
-/* 083094 80082494 3C0141F0 */ li $at, 0x41F00000 # 30.000000
-/* 083098 80082498 44815800 */ mtc1 $at, $f11
-/* 08309C 8008249C 44805000 */ mtc1 $zero, $f10
-/* 0830A0 800824A0 00000000 */ nop
-/* 0830A4 800824A4 462A4200 */ add.d $f8, $f8, $f10
-.L800824A8:
-/* 0830A8 800824A8 3C01C059 */ li $at, 0xC0590000 # -3.390625
-/* 0830AC 800824AC 44818800 */ mtc1 $at, $f17
-/* 0830B0 800824B0 24040014 */ li $a0, 20
-/* 0830B4 800824B4 46304480 */ add.d $f18, $f8, $f16
-/* 0830B8 800824B8 4620910D */ trunc.w.d $f4, $f18
-/* 0830BC 800824BC 440C2000 */ mfc1 $t4, $f4
-/* 0830C0 800824C0 0C0ADF8D */ jal random_int
-/* 0830C4 800824C4 A7AC0022 */ sh $t4, 0x22($sp)
-/* 0830C8 800824C8 240400C8 */ li $a0, 200
-/* 0830CC 800824CC 0C0ADF8D */ jal random_int
-/* 0830D0 800824D0 A7A20020 */ sh $v0, 0x20($sp)
-/* 0830D4 800824D4 44823000 */ mtc1 $v0, $f6
-/* 0830D8 800824D8 87A80022 */ lh $t0, 0x22($sp)
-/* 0830DC 800824DC 87A90020 */ lh $t1, 0x20($sp)
-/* 0830E0 800824E0 04410006 */ bgez $v0, .L800824FC
-/* 0830E4 800824E4 468032A1 */ cvt.d.w $f10, $f6
-/* 0830E8 800824E8 3C0141F0 */ li $at, 0x41F00000 # 30.000000
-/* 0830EC 800824EC 44814800 */ mtc1 $at, $f9
-/* 0830F0 800824F0 44804000 */ mtc1 $zero, $f8
-/* 0830F4 800824F4 00000000 */ nop
-/* 0830F8 800824F8 46285280 */ add.d $f10, $f10, $f8
-.L800824FC:
-/* 0830FC 800824FC 3C01C059 */ li $at, 0xC0590000 # -3.390625
-/* 083100 80082500 44818800 */ mtc1 $at, $f17
-/* 083104 80082504 44808000 */ mtc1 $zero, $f16
-/* 083108 80082508 3C19800E */ lui $t9, %hi(gGamestate) # $t9, 0x800e
-/* 08310C 8008250C 8F39C50C */ lw $t9, %lo(gGamestate)($t9)
-/* 083110 80082510 46305480 */ add.d $f18, $f10, $f16
-/* 083114 80082514 24010009 */ li $at, 9
-/* 083118 80082518 4620910D */ trunc.w.d $f4, $f18
-/* 08311C 8008251C 44032000 */ mfc1 $v1, $f4
-/* 083120 80082520 00000000 */ nop
-/* 083124 80082524 00037C00 */ sll $t7, $v1, 0x10
-/* 083128 80082528 1721001C */ bne $t9, $at, .L8008259C
-/* 08312C 8008252C 000F1C03 */ sra $v1, $t7, 0x10
-/* 083130 80082530 44883000 */ mtc1 $t0, $f6
-/* 083134 80082534 3C01800F */ lui $at, %hi(D_800EF170)
-/* 083138 80082538 D42AF170 */ ldc1 $f10, %lo(D_800EF170)($at)
-/* 08313C 8008253C 46803221 */ cvt.d.w $f8, $f6
-/* 083140 80082540 44892000 */ mtc1 $t1, $f4
-/* 083144 80082544 3C01404E */ li $at, 0x404E0000 # 3.218750
-/* 083148 80082548 02202025 */ move $a0, $s1
-/* 08314C 8008254C 468021A1 */ cvt.d.w $f6, $f4
-/* 083150 80082550 462A4400 */ add.d $f16, $f8, $f10
-/* 083154 80082554 44804000 */ mtc1 $zero, $f8
-/* 083158 80082558 44814800 */ mtc1 $at, $f9
-/* 08315C 8008255C 3C01800F */ lui $at, %hi(D_800EF178)
-/* 083160 80082560 462084A0 */ cvt.s.d $f18, $f16
-/* 083164 80082564 46283280 */ add.d $f10, $f6, $f8
-/* 083168 80082568 44059000 */ mfc1 $a1, $f18
-/* 08316C 8008256C 44839000 */ mtc1 $v1, $f18
-/* 083170 80082570 D426F178 */ ldc1 $f6, %lo(D_800EF178)($at)
-/* 083174 80082574 46205420 */ cvt.s.d $f16, $f10
-/* 083178 80082578 46809121 */ cvt.d.w $f4, $f18
-/* 08317C 8008257C 44068000 */ mfc1 $a2, $f16
-/* 083180 80082580 46262200 */ add.d $f8, $f4, $f6
-/* 083184 80082584 462042A0 */ cvt.s.d $f10, $f8
-/* 083188 80082588 44075000 */ mfc1 $a3, $f10
-/* 08318C 8008258C 0C022DF5 */ jal func_8008B7D4
-/* 083190 80082590 00000000 */ nop
-/* 083194 80082594 10000041 */ b .L8008269C
-/* 083198 80082598 02202025 */ move $a0, $s1
-.L8008259C:
-/* 08319C 8008259C 920A00D5 */ lbu $t2, 0xd5($s0)
-/* 0831A0 800825A0 51400021 */ beql $t2, $zero, .L80082628
-/* 0831A4 800825A4 44888000 */ mtc1 $t0, $f16
-/* 0831A8 800825A8 44888000 */ mtc1 $t0, $f16
-/* 0831AC 800825AC 3C01800F */ lui $at, %hi(D_800EF180)
-/* 0831B0 800825B0 D424F180 */ ldc1 $f4, %lo(D_800EF180)($at)
-/* 0831B4 800825B4 468084A1 */ cvt.d.w $f18, $f16
-/* 0831B8 800825B8 3C018019 */ lui $at, %hi(D_8018D01C) # $at, 0x8019
-/* 0831BC 800825BC C428D01C */ lwc1 $f8, %lo(D_8018D01C)($at)
-/* 0831C0 800825C0 3C014034 */ li $at, 0x40340000 # 2.812500
-/* 0831C4 800825C4 02202025 */ move $a0, $s1
-/* 0831C8 800825C8 46249180 */ add.d $f6, $f18, $f4
-/* 0831CC 800825CC 44892000 */ mtc1 $t1, $f4
-/* 0831D0 800825D0 460042A1 */ cvt.d.s $f10, $f8
-/* 0831D4 800825D4 46802221 */ cvt.d.w $f8, $f4
-/* 0831D8 800825D8 462A3402 */ mul.d $f16, $f6, $f10
-/* 0831DC 800825DC 44803000 */ mtc1 $zero, $f6
-/* 0831E0 800825E0 44813800 */ mtc1 $at, $f7
-/* 0831E4 800825E4 3C01800F */ lui $at, %hi(D_800EF188)
-/* 0831E8 800825E8 46264280 */ add.d $f10, $f8, $f6
-/* 0831EC 800825EC D428F188 */ ldc1 $f8, %lo(D_800EF188)($at)
-/* 0831F0 800825F0 462084A0 */ cvt.s.d $f18, $f16
-/* 0831F4 800825F4 46205420 */ cvt.s.d $f16, $f10
-/* 0831F8 800825F8 44059000 */ mfc1 $a1, $f18
-/* 0831FC 800825FC 44839000 */ mtc1 $v1, $f18
-/* 083200 80082600 44068000 */ mfc1 $a2, $f16
-/* 083204 80082604 46809121 */ cvt.d.w $f4, $f18
-/* 083208 80082608 46282180 */ add.d $f6, $f4, $f8
-/* 08320C 8008260C 462032A0 */ cvt.s.d $f10, $f6
-/* 083210 80082610 44075000 */ mfc1 $a3, $f10
-/* 083214 80082614 0C022DF5 */ jal func_8008B7D4
-/* 083218 80082618 00000000 */ nop
-/* 08321C 8008261C 1000001F */ b .L8008269C
-/* 083220 80082620 02202025 */ move $a0, $s1
-/* 083224 80082624 44888000 */ mtc1 $t0, $f16
-.L80082628:
-/* 083228 80082628 3C01800F */ lui $at, %hi(D_800EF190)
-/* 08322C 8008262C D424F190 */ ldc1 $f4, %lo(D_800EF190)($at)
-/* 083230 80082630 468084A1 */ cvt.d.w $f18, $f16
-/* 083234 80082634 3C018019 */ lui $at, %hi(D_8018D01C) # $at, 0x8019
-/* 083238 80082638 C426D01C */ lwc1 $f6, %lo(D_8018D01C)($at)
-/* 08323C 8008263C 3C01402E */ li $at, 0x402E0000 # 2.718750
-/* 083240 80082640 02202025 */ move $a0, $s1
-/* 083244 80082644 46249200 */ add.d $f8, $f18, $f4
-/* 083248 80082648 44892000 */ mtc1 $t1, $f4
-/* 08324C 8008264C 460032A1 */ cvt.d.s $f10, $f6
-/* 083250 80082650 468021A1 */ cvt.d.w $f6, $f4
-/* 083254 80082654 462A4402 */ mul.d $f16, $f8, $f10
-/* 083258 80082658 44804000 */ mtc1 $zero, $f8
-/* 08325C 8008265C 44814800 */ mtc1 $at, $f9
-/* 083260 80082660 3C01800F */ lui $at, %hi(D_800EF198)
-/* 083264 80082664 46283280 */ add.d $f10, $f6, $f8
-/* 083268 80082668 D426F198 */ ldc1 $f6, %lo(D_800EF198)($at)
-/* 08326C 8008266C 462084A0 */ cvt.s.d $f18, $f16
-/* 083270 80082670 46205420 */ cvt.s.d $f16, $f10
-/* 083274 80082674 44059000 */ mfc1 $a1, $f18
-/* 083278 80082678 44839000 */ mtc1 $v1, $f18
-/* 08327C 8008267C 44068000 */ mfc1 $a2, $f16
-/* 083280 80082680 46809121 */ cvt.d.w $f4, $f18
-/* 083284 80082684 46262200 */ add.d $f8, $f4, $f6
-/* 083288 80082688 462042A0 */ cvt.s.d $f10, $f8
-/* 08328C 8008268C 44075000 */ mfc1 $a3, $f10
-/* 083290 80082690 0C022DF5 */ jal func_8008B7D4
-/* 083294 80082694 00000000 */ nop
-/* 083298 80082698 02202025 */ move $a0, $s1
-.L8008269C:
-/* 08329C 8008269C 00002825 */ move $a1, $zero
-/* 0832A0 800826A0 00003025 */ move $a2, $zero
-/* 0832A4 800826A4 0C022E22 */ jal func_8008B888
-/* 0832A8 800826A8 00003825 */ move $a3, $zero
-/* 0832AC 800826AC 3C013F80 */ li $at, 0x3F800000 # 1.000000
-/* 0832B0 800826B0 44818000 */ mtc1 $at, $f16
-/* 0832B4 800826B4 02202025 */ move $a0, $s1
-/* 0832B8 800826B8 0C021BBC */ jal func_80086EF0
-/* 0832BC 800826BC E6100034 */ swc1 $f16, 0x34($s0)
-/* 0832C0 800826C0 8FAB002C */ lw $t3, 0x2c($sp)
-/* 0832C4 800826C4 3C0E800E */ lui $t6, %hi(D_800E633C)
-/* 0832C8 800826C8 02202025 */ move $a0, $s1
-/* 0832CC 800826CC 05610004 */ bgez $t3, .L800826E0
-/* 0832D0 800826D0 316C0003 */ andi $t4, $t3, 3
-/* 0832D4 800826D4 11800002 */ beqz $t4, .L800826E0
-/* 0832D8 800826D8 00000000 */ nop
-/* 0832DC 800826DC 258CFFFC */ addiu $t4, $t4, -4
-.L800826E0:
-/* 0832E0 800826E0 000C6880 */ sll $t5, $t4, 2
-/* 0832E4 800826E4 01CD7021 */ addu $t6, $t6, $t5
-/* 0832E8 800826E8 8DCE633C */ lw $t6, %lo(D_800E633C)($t6)
-/* 0832EC 800826EC 24050800 */ li $a1, 2048
-/* 0832F0 800826F0 0C01C870 */ jal set_object_flag_unk_054_true
-/* 0832F4 800826F4 AE0E0080 */ sw $t6, 0x80($s0)
-/* 0832F8 800826F8 0C01C922 */ jal func_80072488
-/* 0832FC 800826FC 02202025 */ move $a0, $s1
-/* 083300 80082700 8FBF001C */ lw $ra, 0x1c($sp)
-/* 083304 80082704 8FB00014 */ lw $s0, 0x14($sp)
-/* 083308 80082708 8FB10018 */ lw $s1, 0x18($sp)
-/* 08330C 8008270C 03E00008 */ jr $ra
-/* 083310 80082710 27BD0028 */ addiu $sp, $sp, 0x28
diff --git a/asm/non_matchings/code_80071F00/func_80084430.s b/asm/non_matchings/code_80071F00/func_80084430.s
deleted file mode 100644
index f98ae1156..000000000
--- a/asm/non_matchings/code_80071F00/func_80084430.s
+++ /dev/null
@@ -1,79 +0,0 @@
-.section .late_rodata
-
-glabel D_800EF2C8
-.float 0.2
-.word 0x00000000
-
-glabel D_800EF2D0
-.double -383.0
-
-.section .text
-
-glabel func_80084430
-/* 085030 80084430 000470C0 */ sll $t6, $a0, 3
-/* 085034 80084434 27BDFFE0 */ addiu $sp, $sp, -0x20
-/* 085038 80084438 01C47023 */ subu $t6, $t6, $a0
-/* 08503C 8008443C 3C0F8016 */ lui $t7, %hi(gObjectList) # $t7, 0x8016
-/* 085040 80084440 AFB00014 */ sw $s0, 0x14($sp)
-/* 085044 80084444 25EF5C18 */ addiu $t7, %lo(gObjectList) # addiu $t7, $t7, 0x5c18
-/* 085048 80084448 000E7140 */ sll $t6, $t6, 5
-/* 08504C 8008444C 01CF8021 */ addu $s0, $t6, $t7
-/* 085050 80084450 3C180601 */ lui $t8, %hi(d_course_sherbet_land_unk_data1) # $t8, 0x601
-/* 085054 80084454 3C190601 */ lui $t9, %hi(d_course_sherbet_land_unk_data11) # $t9, 0x601
-/* 085058 80084458 27188EB0 */ addiu $t8, %lo(d_course_sherbet_land_unk_data1) # addiu $t8, $t8, -0x7150
-/* 08505C 8008445C 27399AC8 */ addiu $t9, %lo(d_course_sherbet_land_unk_data11) # addiu $t9, $t9, -0x6538
-/* 085060 80084460 A20000D8 */ sb $zero, 0xd8($s0)
-/* 085064 80084464 AE180070 */ sw $t8, 0x70($s0)
-/* 085068 80084468 AE190074 */ sw $t9, 0x74($s0)
-/* 08506C 8008446C 3C01800F */ lui $at, %hi(D_800EF2C8) # $at, 0x800f
-/* 085070 80084470 C424F2C8 */ lwc1 $f4, %lo(D_800EF2C8)($at)
-/* 085074 80084474 2408000C */ li $t0, 12
-/* 085078 80084478 24090001 */ li $t1, 1
-/* 08507C 8008447C A60800C8 */ sh $t0, 0xc8($s0)
-/* 085080 80084480 A609009C */ sh $t1, 0x9c($s0)
-/* 085084 80084484 3C018019 */ lui $at, %hi(D_8018D01C) # $at, 0x8019
-/* 085088 80084488 E6040000 */ swc1 $f4, ($s0)
-/* 08508C 8008448C C426D01C */ lwc1 $f6, %lo(D_8018D01C)($at)
-/* 085090 80084490 3C01800F */ lui $at, %hi(D_800EF2D0)
-/* 085094 80084494 D42AF2D0 */ ldc1 $f10, %lo(D_800EF2D0)($at)
-/* 085098 80084498 46003221 */ cvt.d.s $f8, $f6
-/* 08509C 8008449C AFA50024 */ sw $a1, 0x24($sp)
-/* 0850A0 800844A0 462A4402 */ mul.d $f16, $f8, $f10
-/* 0850A4 800844A4 AFBF001C */ sw $ra, 0x1c($sp)
-/* 0850A8 800844A8 AFB10018 */ sw $s1, 0x18($sp)
-/* 0850AC 800844AC 3C07C42C */ lui $a3, (0xC42C8000 >> 16) # lui $a3, 0xc42c
-/* 0850B0 800844B0 00808825 */ move $s1, $a0
-/* 0850B4 800844B4 34E78000 */ ori $a3, (0xC42C8000 & 0xFFFF) # ori $a3, $a3, 0x8000
-/* 0850B8 800844B8 3C064000 */ lui $a2, 0x4000
-/* 0850BC 800844BC 462084A0 */ cvt.s.d $f18, $f16
-/* 0850C0 800844C0 44059000 */ mfc1 $a1, $f18
-/* 0850C4 800844C4 0C022DF5 */ jal func_8008B7D4
-/* 0850C8 800844C8 00000000 */ nop
-/* 0850CC 800844CC 02202025 */ move $a0, $s1
-/* 0850D0 800844D0 00002825 */ move $a1, $zero
-/* 0850D4 800844D4 00003025 */ move $a2, $zero
-/* 0850D8 800844D8 0C022E22 */ jal func_8008B888
-/* 0850DC 800844DC 00003825 */ move $a3, $zero
-/* 0850E0 800844E0 240A0001 */ li $t2, 1
-/* 0850E4 800844E4 A20A00DD */ sb $t2, 0xdd($s0)
-/* 0850E8 800844E8 0C021BBC */ jal func_80086EF0
-/* 0850EC 800844EC 02202025 */ move $a0, $s1
-/* 0850F0 800844F0 3C0B800E */ lui $t3, %hi(D_800E672C) # $t3, 0x800e
-/* 0850F4 800844F4 8D6B672C */ lw $t3, %lo(D_800E672C)($t3)
-/* 0850F8 800844F8 3C050400 */ lui $a1, (0x04000800 >> 16) # lui $a1, 0x400
-/* 0850FC 800844FC 34A50800 */ ori $a1, (0x04000800 & 0xFFFF) # ori $a1, $a1, 0x800
-/* 085100 80084500 02202025 */ move $a0, $s1
-/* 085104 80084504 0C01C870 */ jal set_object_flag_unk_054_true
-/* 085108 80084508 AE0B0080 */ sw $t3, 0x80($s0)
-/* 08510C 8008450C 3C040601 */ lui $a0, %hi(d_course_sherbet_land_unk_data11) # $a0, 0x601
-/* 085110 80084510 24849AC8 */ addiu $a0, %lo(d_course_sherbet_land_unk_data11) # addiu $a0, $a0, -0x6538
-/* 085114 80084514 0C0013AB */ jal func_80004EAC
-/* 085118 80084518 00002825 */ move $a1, $zero
-/* 08511C 8008451C A60200A4 */ sh $v0, 0xa4($s0)
-/* 085120 80084520 0C01C922 */ jal func_80072488
-/* 085124 80084524 02202025 */ move $a0, $s1
-/* 085128 80084528 8FBF001C */ lw $ra, 0x1c($sp)
-/* 08512C 8008452C 8FB00014 */ lw $s0, 0x14($sp)
-/* 085130 80084530 8FB10018 */ lw $s1, 0x18($sp)
-/* 085134 80084534 03E00008 */ jr $ra
-/* 085138 80084538 27BD0020 */ addiu $sp, $sp, 0x20
diff --git a/asm/non_matchings/code_80071F00/func_80086D80.s b/asm/non_matchings/code_80071F00/func_80086D80.s
deleted file mode 100644
index 688442af9..000000000
--- a/asm/non_matchings/code_80071F00/func_80086D80.s
+++ /dev/null
@@ -1,64 +0,0 @@
-glabel func_80086D80
-/* 087980 80086D80 3C0E8016 */ lui $t6, %hi(D_801658CE) # $t6, 0x8016
-/* 087984 80086D84 81CE58CE */ lb $t6, %lo(D_801658CE)($t6)
-/* 087988 80086D88 27BDFFD8 */ addiu $sp, $sp, -0x28
-/* 08798C 80086D8C AFBF0024 */ sw $ra, 0x24($sp)
-/* 087990 80086D90 AFB20020 */ sw $s2, 0x20($sp)
-/* 087994 80086D94 AFB1001C */ sw $s1, 0x1c($sp)
-/* 087998 80086D98 11C0000C */ beqz $t6, .L80086DCC
-/* 08799C 80086D9C AFB00018 */ sw $s0, 0x18($sp)
-/* 0879A0 80086DA0 3C108016 */ lui $s0, %hi(D_801658DC) # $s0, 0x8016
-/* 0879A4 80086DA4 261058DC */ addiu $s0, %lo(D_801658DC) # addiu $s0, $s0, 0x58dc
-/* 0879A8 80086DA8 820F0000 */ lb $t7, ($s0)
-/* 0879AC 80086DAC 3C128018 */ lui $s2, %hi(D_80183EAC) # $s2, 0x8018
-/* 0879B0 80086DB0 00002825 */ move $a1, $zero
-/* 0879B4 80086DB4 15E00005 */ bnez $t7, .L80086DCC
-/* 0879B8 80086DB8 00000000 */ nop
-/* 0879BC 80086DBC 0C01C8E9 */ jal func_800723A4
-/* 0879C0 80086DC0 8E443EAC */ lw $a0, %lo(D_80183EAC)($s2)
-/* 0879C4 80086DC4 24180001 */ li $t8, 1
-/* 0879C8 80086DC8 A2180000 */ sb $t8, ($s0)
-.L80086DCC:
-/* 0879CC 80086DCC 3C128018 */ lui $s2, %hi(D_80183EAC) # $s2, 0x8018
-/* 0879D0 80086DD0 8E523EAC */ lw $s2, %lo(D_80183EAC)($s2)
-/* 0879D4 80086DD4 3C088016 */ lui $t0, %hi(D_80165CBE) # 0x8016
-/* 0879D8 80086DD8 0012C8C0 */ sll $t9, $s2, 3
-/* 0879DC 80086DDC 0332C823 */ subu $t9, $t9, $s2
-/* 0879E0 80086DE0 0019C940 */ sll $t9, $t9, 5
-/* 0879E4 80086DE4 01194021 */ addu $t0, $t0, $t9
-/* 0879E8 80086DE8 85085CBE */ lh $t0, %lo(D_80165CBE)($t0) # 0x5cbe($t0)
-/* 0879EC 80086DEC 51000018 */ beql $t0, $zero, .L80086E50
-/* 0879F0 80086DF0 8FBF0024 */ lw $ra, 0x24($sp)
-/* 0879F4 80086DF4 0C021B05 */ jal func_80086C14
-/* 0879F8 80086DF8 02402025 */ move $a0, $s2
-/* 0879FC 80086DFC 0C021A50 */ jal func_80086940
-/* 087A00 80086E00 02402025 */ move $a0, $s2
-/* 087A04 80086E04 3C098016 */ lui $t1, %hi(D_801658F4) # $t1, 0x8016
-/* 087A08 80086E08 812958F4 */ lb $t1, %lo(D_801658F4)($t1)
-/* 087A0C 80086E0C 3C0A8016 */ lui $t2, %hi(D_8016559C) # $t2, 0x8016
-/* 087A10 80086E10 00008025 */ move $s0, $zero
-/* 087A14 80086E14 11200008 */ beqz $t1, .L80086E38
-/* 087A18 80086E18 24110002 */ li $s1, 2
-/* 087A1C 80086E1C 8D4A559C */ lw $t2, %lo(D_8016559C)($t2)
-/* 087A20 80086E20 5540000B */ bnel $t2, $zero, .L80086E50
-/* 087A24 80086E24 8FBF0024 */ lw $ra, 0x24($sp)
-/* 087A28 80086E28 0C021B1B */ jal func_80086C6C
-/* 087A2C 80086E2C 02402025 */ move $a0, $s2
-/* 087A30 80086E30 10000007 */ b .L80086E50
-/* 087A34 80086E34 8FBF0024 */ lw $ra, 0x24($sp)
-.L80086E38:
-/* 087A38 80086E38 0C021B1B */ jal func_80086C6C
-/* 087A3C 80086E3C 02402025 */ move $a0, $s2
-/* 087A40 80086E40 26100001 */ addiu $s0, $s0, 1
-/* 087A44 80086E44 1611FFFC */ bne $s0, $s1, .L80086E38
-/* 087A48 80086E48 00000000 */ nop
-/* 087A4C 80086E4C 8FBF0024 */ lw $ra, 0x24($sp)
-.L80086E50:
-/* 087A50 80086E50 8FB00018 */ lw $s0, 0x18($sp)
-/* 087A54 80086E54 8FB1001C */ lw $s1, 0x1c($sp)
-/* 087A58 80086E58 8FB20020 */ lw $s2, 0x20($sp)
-/* 087A5C 80086E5C 03E00008 */ jr $ra
-/* 087A60 80086E60 27BD0028 */ addiu $sp, $sp, 0x28
-
-/* 087A64 80086E64 00000000 */ nop
-/* 087A68 80086E68 00000000 */ nop
diff --git a/include/objects.h b/include/objects.h
index 782b00a2e..a4b4c4836 100644
--- a/include/objects.h
+++ b/include/objects.h
@@ -379,6 +379,8 @@ extern s32 D_8018CC80[];
extern s32 D_8018D1F0;
// Next free spot in D_8018CC80?
extern s32 D_8018D1F8;
+// Also next free spot in D_8018CC80?
+extern s16 D_8018D17C;
// Something related to the display of the clouds/stars?
extern s8 D_8018D230;
// Some sort of limiter on how many of some object type can spawn
diff --git a/src/code_80071F00.c b/src/code_80071F00.c
index beac9e4d7..4528d45d8 100644
--- a/src/code_80071F00.c
+++ b/src/code_80071F00.c
@@ -29,6 +29,7 @@
#include "podium_ceremony_actors.h"
#include "courses/all_course_data.h"
#include "src/ending/ceremony_data.inc.h"
+#include "src/ending/ceremony_and_credits.h"
#include "menus.h"
#include "data/other_textures.h"
@@ -973,12 +974,12 @@ bool func_80073B78(s32 arg0, s32 objectIndex, s16* arg2, s32 arg3, s32 arg4, s32
return phi_t0;
}
-void func_80073CB0(s32 objectIndex, s16* arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) {
- func_80073B78(1, objectIndex, arg1, arg2, arg3, arg4, arg5, arg6);
+bool func_80073CB0(s32 objectIndex, s16* arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) {
+ return func_80073B78(1, objectIndex, arg1, arg2, arg3, arg4, arg5, arg6);
}
-void func_80073D0C(s32 objectIndex, s16* arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) {
- func_80073B78(0, objectIndex, arg1, arg2, arg3, arg4, arg5, arg6);
+bool func_80073D0C(s32 objectIndex, s16* arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) {
+ return func_80073B78(0, objectIndex, arg1, arg2, arg3, arg4, arg5, arg6);
}
UNUSED void func_80073D68(s32 objectIndex, s16* arg1, s16 arg2, s32 arg3) {
@@ -2553,40 +2554,24 @@ void func_80077C9C(void) {
}
}
-#ifdef MIPS_TO_C
-//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
-extern s32 D_8016559C;
-extern ? D_8018CC80;
-extern s16 D_8018D17C;
-extern s32 D_8018D1F0;
-
void func_80077D5C(s32 arg0) {
- s32 temp_a0;
- s32 temp_a2;
+ s32 objectIndex;
s32 var_a1;
- if ((D_8016559C == 0) && (temp_a2 = D_8018D1F0, var_a1 = 0, (temp_a2 > 0))) {
-loop_3:
- D_8018D17C += 1;
- var_a1 += 1;
- if (D_8018D17C >= temp_a2) {
- D_8018D17C = 0;
- }
- temp_a0 = *((arg0 * 4) + &D_8018CC80 + (D_8018D17C * 4));
- if (gObjectList[temp_a0].state == 0) {
- func_800723A4(temp_a0, 1);
- return;
- }
- if (var_a1 >= temp_a2) {
-
- } else {
- goto loop_3;
+ if (D_8016559C == 0) {
+ for (var_a1 = 0; var_a1 < D_8018D1F0; var_a1++) {
+ D_8018D17C += 1;
+ if (D_8018D17C >= D_8018D1F0) {
+ D_8018D17C = 0;
+ }
+ objectIndex = D_8018CC80[arg0 + D_8018D17C];
+ if (gObjectList[objectIndex].state == 0) {
+ func_800723A4(objectIndex, 1);
+ break;
+ }
}
}
}
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80077D5C.s")
-#endif
void func_80077E20(s32 objectIndex) {
Objects *temp_v0;
@@ -2827,31 +2812,27 @@ void func_800788F8(s32 objectIndex, u16 rot, Camera *camera) {
}
#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-//void func_800788F8(s32, u16, ?); // extern
-//extern ? D_8018CC80;
-//extern s32 D_8018D1F0;
-
-void func_800789AC(s32 arg0, Camera *arg1, Vec3s *arg2) {
- //s32 temp_s0;
- //s32 *phi_s1;
- s32 i;
+//generated by m2c commit beb457dabfc7a01ec6540a5404a6a05097a13602 on Nov-13-2023
+void func_800789AC(s32 arg0, Camera *arg1, s16 (*arg2)[4]) {
+ s32 *var_s1;
+ s32 var_s0;
- //phi_s1 = &D_8018CC80[arg0];
- for (i = 0; i < D_8018D1F0; i++) {
- func_800788F8(D_8018CC80[arg0 + i], arg2[0][i], arg1);
- //*phi_s1 += 4;
+ var_s0 = 0;
+ if (D_8018D1F0 > 0) {
+ var_s1 = &D_8018CC80[arg0];
+ do {
+ func_800788F8(*var_s1, (u16) *arg2[var_s0], arg1);
+ var_s0 += 1;
+ var_s1 += 4;
+ } while (var_s0 < D_8018D1F0);
}
+ /*
+ s32 var_s0;
- // if (D_8018D1F0 > 0) {
- // phi_s1 = (arg0 * 4) + &D_8018CC80;
- // do {
- // func_800788F8(*phi_s1, *((phi_s0 * 8) + arg2), arg1);
- // temp_s0 = phi_s0 + 1;
- // phi_s1 += 4;
- // phi_s0 = temp_s0;
- // } while (temp_s0 < D_8018D1F0);
- // }
+ for (var_s0 = 0; var_s0 < D_8018D1F0; var_s0++) {
+ func_800788F8(D_8018CC80[arg0 + var_s0], arg2[0][var_s0], arg1);
+ }
+ */
}
#else
GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800789AC.s")
@@ -3883,122 +3864,77 @@ s32 func_8007B040(s32 objectIndex, s32 playerId) {
GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007B040.s")
#endif
-#ifdef MIPS_TO_C
-//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-10-2023
-extern s8 D_80165888;
-extern s16 D_8018CAB8;
-
-void func_8007B254(s32 objectIndex, u8 arg1) {
- Objects *sp18;
- s8 temp_v1;
- ItemWindowObjects *temp_v0;
+void func_8007B254(s32 objectIndex, s32 arg1) {
+ s8 test; // why?
func_80072428(objectIndex);
- temp_v0 = &gObjectList[objectIndex];
- temp_v0->itemDisplayState = 2;
- temp_v0->currentItem = ITEM_NONE;
- temp_v0->tlutList = (u8 *) gTLUTItemWindowNone;
- temp_v0->textureList = gTextureItemWindowNone;
- temp_v0->textureWidth = 0x28;
- temp_v0->textureHeight = 0x20;
- temp_v0->unk_04C = 0x00000032;
- temp_v0->unk_0D6 = 1;
- temp_v0->goldenMushroomTimer = 0;
- sp18 = temp_v0;
+ gObjectList[objectIndex].state = 2;
+ gObjectList[objectIndex].type = 0;
+ gObjectList[objectIndex].tlutList = (u8 *) gTLUTItemWindowNone;
+ gObjectList[objectIndex].textureList = gTextureItemWindowNone;
+ gObjectList[objectIndex].textureWidth = 0x28;
+ gObjectList[objectIndex].textureHeight = 0x20;
+ gObjectList[objectIndex].unk_04C = 0x00000032;
+ gObjectList[objectIndex].unk_0D6 = 1;
+ gObjectList[objectIndex].timer = 0;
func_800722A4(objectIndex, 4);
if (D_80165888 != 0) {
- sp18 = temp_v0;
func_800726CC(objectIndex, 8);
- temp_v0->currentItem = ITEM_TRIPLE_MUSHROOM;
- temp_v1 = temp_v0->unkA5;
- temp_v0->unk_0D6 = 2;
- temp_v0->itemDisplay = temp_v1;
- temp_v0->unk_0A2 = (s16) temp_v1;
+ gObjectList[objectIndex].unk_0D6 = 2;
+ gObjectList[objectIndex].type = 0x000E;
+ test = gObjectList[objectIndex].type;
+ gObjectList[objectIndex].itemDisplay = test;
+ gObjectList[objectIndex].unk_0A2 = test;
D_8018CAB8 = 0;
D_80165888 = 0;
- return;
+ } else {
+ func_800C8F80(arg1, 0x0100FE1CU);
}
- func_800C8F80(arg1, 0x0100FE1C);
}
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007B254.s")
-#endif
-
-#ifdef MIPS_TO_C
-//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Sep-05-2023
-? func_8007B254(s32, s32); /* extern */
-extern s8 D_80165888;
-static u8 *gItemWindowTLUTs[0x10];
-static u8 *gItemWindowTextures[0x10];
void func_8007B34C(s32 playerId) {
- s32 sp40;
- Player *sp38;
- ItemWindowObjects *sp2C;
- struct_8018CA70_entry *sp28;
- s16 temp_a1;
- s16 temp_a1_2;
- s16 temp_a1_3;
- s16 temp_v0_4;
s32 temp_s0;
- s32 temp_v0_2;
- s8 temp_v0_5;
+ s32 sp40;
Objects *temp_t0;
- struct_8018CA70_entry *temp_v1;
- struct_8018CA70_entry *temp_v1_2;
- struct_8018CA70_entry *temp_v1_3;
- struct_8018CA70_entry *temp_v1_4;
- struct_8018CA70_entry *temp_v1_5;
- struct_8018CA70_entry *temp_v1_6;
- u16 temp_t6;
- u16 temp_v0;
- u8 temp_v0_3;
+ Player *sp38;
+ struct Controller *new_var;
+ temp_s0 = gItemWindowObjectByPlayerId[playerId];
sp38 = &gPlayerOne[playerId];
sp40 = 0;
- temp_s0 = gItemWindowObjectByPlayerId[playerId];
- if (gControllerOne[playerId].buttonPressed & 0x2000) {
+ new_var = &gControllerOne[playerId];
+ if (new_var->buttonPressed & 0x2000) {
sp40 = 1;
}
if (D_80165888 != 0) {
func_800723A4(temp_s0, 0);
}
temp_t0 = &gObjectList[temp_s0];
- sp2C = temp_t0;
- temp_t6 = (u16) temp_t0->state;
- switch (temp_t6) {
+ switch (temp_t0->state) {
case 1:
func_8007B254(temp_s0, playerId);
break;
case 2:
- if (gActiveScreenMode == SCREEN_MODE_1P) {
- temp_v1 = &D_8018CA70[playerId];
- sp28 = temp_v1;
- s16_step_up_towards(&temp_v1->slideItemBoxY, 0x0040, 4);
- if (temp_v1->slideItemBoxY == 0x0040) {
+ if (gActiveScreenMode == 0) {
+ s16_step_up_towards(&D_8018CA70[playerId].slideItemBoxY, 0x0040, 4);
+ if (D_8018CA70[playerId].slideItemBoxY == 0x0040) {
func_80072488(temp_s0);
}
- } else if (gActiveScreenMode == SCREEN_MODE_3P_4P_SPLITSCREEN) {
+ } else if (gActiveScreenMode == 3) {
if ((playerId == 0) || (playerId == 2)) {
- temp_v1_2 = &D_8018CA70[playerId];
- sp28 = temp_v1_2;
- s16_step_up_towards(&temp_v1_2->slideItemBoxX, 0x0080, 8);
- if (temp_v1_2->slideItemBoxX == 0x0080) {
+ s16_step_up_towards(&D_8018CA70[playerId].slideItemBoxX, 0x0080, 8);
+ if (D_8018CA70[playerId].slideItemBoxX == 0x0080) {
func_80072488(temp_s0);
}
} else {
- temp_v1_3 = &D_8018CA70[playerId];
- sp28 = temp_v1_3;
- s16_step_down_towards(&temp_v1_3->slideItemBoxX, -0x0080, 8);
- if (temp_v1_3->slideItemBoxX == -0x0080) {
+ s16_step_down_towards(&D_8018CA70[playerId].slideItemBoxX, -0x0080, 8);
+ if (D_8018CA70[playerId].slideItemBoxX == -0x0080) {
func_80072488(temp_s0);
}
}
} else {
- temp_v1_4 = &D_8018CA70[playerId];
- sp28 = temp_v1_4;
- s16_step_up_towards(&temp_v1_4->slideItemBoxX, 0x0080, 8);
- if (temp_v1_4->slideItemBoxX == 0x0080) {
+ s16_step_up_towards(&D_8018CA70[playerId].slideItemBoxX, 0x0080, 8);
+ if (D_8018CA70[playerId].slideItemBoxX == 0x0080) {
func_80072488(temp_s0);
}
}
@@ -4013,44 +3949,39 @@ void func_8007B34C(s32 playerId) {
func_80072E54(temp_s0, 1, 4, 1, 0x00000010, 1);
break;
case 6:
- sp2C->itemDisplay = func_8007AFB0(temp_s0, playerId);
- sp2C->unk_04C = 8;
- sp2C->unk_0D6 = 2;
+ temp_t0->itemDisplay = func_8007AFB0(temp_s0, playerId);
+ temp_t0->unk_04C = 8;
+ temp_t0->unk_0D6 = 2;
func_80072488(temp_s0);
- sp28 = (struct_8018CA70_entry *) (u8) playerId;
func_800C9018((u8) playerId, 0x0100FE1C);
- func_800C8F80((u8) playerId, 0x0100FE47);
+ func_800C8F80((u8) playerId, 0x0100FE47U);
break;
case 7:
- func_80072D3C(temp_s0, (s32) sp2C->unk_0A2, 0, 8, 0x0000000A);
+ func_80072D3C(temp_s0, (s32) temp_t0->unk_0A2, 0, 8, 0x0000000A);
break;
case 9:
func_800722CC(temp_s0, 4);
func_80073600(temp_s0);
- sp2C->itemDisplay = 0;
+ temp_t0->itemDisplay = 0;
func_80072488(temp_s0);
break;
case 10:
func_8007278C(temp_s0, 0x00000014);
break;
case 11:
- if (gActiveScreenMode == SCREEN_MODE_1P) {
+ if (gActiveScreenMode == 0) {
if (s16_step_down_towards(&D_8018CA70[playerId].slideItemBoxY, 0, 4) != 0) {
func_80072488(temp_s0);
}
- } else if (gActiveScreenMode == SCREEN_MODE_3P_4P_SPLITSCREEN) {
+ } else if (gActiveScreenMode == 3) {
if ((playerId == 0) || (playerId == 2)) {
- temp_v1_5 = &D_8018CA70[playerId];
- sp28 = temp_v1_5;
- s16_step_down_towards(&temp_v1_5->slideItemBoxX, 0, 8);
- if (temp_v1_5->slideItemBoxX == 0) {
+ s16_step_down_towards(&D_8018CA70[playerId].slideItemBoxX, 0, 8);
+ if (D_8018CA70[playerId].slideItemBoxX == 0) {
func_80072488(temp_s0);
}
} else {
- temp_v1_6 = &D_8018CA70[playerId];
- sp28 = temp_v1_6;
- s16_step_up_towards(&temp_v1_6->slideItemBoxX, 0, 8);
- if (temp_v1_6->slideItemBoxX == 0) {
+ s16_step_up_towards(&D_8018CA70[playerId].slideItemBoxX, 0, 8);
+ if (D_8018CA70[playerId].slideItemBoxX == 0) {
func_80072488(temp_s0);
}
}
@@ -4062,58 +3993,55 @@ void func_8007B34C(s32 playerId) {
func_80072428(temp_s0);
break;
case 20:
- temp_a1 = sp2C->unk_0A2;
- if (temp_a1 == 0x000B) {
- func_80072D3C(temp_s0, (s32) temp_a1, 0, 8, 0x0000000A);
+ if (temp_t0->unk_0A2 == 0x000B) {
+ func_80072D3C(temp_s0, temp_t0->unk_0A2, 0, 8, 0x0000000A);
} else {
- func_80072D3C(temp_s0, (s32) temp_a1, 0x0000000B, 8, 0x0000000A);
+ func_80072D3C(temp_s0, temp_t0->unk_0A2, 0x0000000B, 8, 0x0000000A);
}
break;
case 21:
func_800726CC(temp_s0, 8);
- sp2C->unk_0D6 = 2;
+ temp_t0->unk_0D6 = 2;
break;
case 30:
- temp_a1_2 = sp2C->unk_0A2;
- if (temp_a1_2 == 0x000B) {
- func_80072D3C(temp_s0, (s32) temp_a1_2, 0, 8, 0x0000000A);
+ if (temp_t0->unk_0A2 == 0x000B) {
+ func_80072D3C(temp_s0, temp_t0->unk_0A2, 0, 8, 0x0000000A);
} else {
- func_80072D3C(temp_s0, (s32) temp_a1_2, 0x0000000B, 8, 0x0000000A);
+ func_80072D3C(temp_s0, temp_t0->unk_0A2, 0x0000000B, 8, 0x0000000A);
}
break;
case 31:
func_800726CC(temp_s0, 9);
break;
case 40:
- temp_a1_3 = sp2C->unk_0A2;
- if (temp_a1_3 == 0x000D) {
- func_80072D3C(temp_s0, (s32) temp_a1_3, 0x0000000E, 8, 0x0000000A);
+ if (temp_t0->unk_0A2 == 0x000D) {
+ func_80072D3C(temp_s0, temp_t0->unk_0A2, 0x0000000E, 8, 0x0000000A);
} else {
- func_80072D3C(temp_s0, (s32) temp_a1_3, 0x0000000D, 8, 0x0000000A);
+ func_80072D3C(temp_s0, temp_t0->unk_0A2, 0x0000000D, 8, 0x0000000A);
}
break;
case 41:
func_800726CC(temp_s0, 8);
break;
case 50:
- func_80072D3C(temp_s0, (s32) sp2C->unk_0A2, 0, 8, 0x00000064);
+ func_80072D3C(temp_s0, (s32) temp_t0->unk_0A2, 0, 8, 0x00000064);
+ break;
+ case 0:
+ default:
break;
}
if (func_80072320(temp_s0, 2) != 0) {
- temp_v0 = sp2C->goldenMushroomTimer;
- if (temp_v0 == 0) {
+ if (temp_t0->timer == 0) {
consume_item(playerId);
} else {
- sp2C->goldenMushroomTimer = temp_v0 - 1;
+ temp_t0->timer--;
}
}
- temp_v0_2 = sp2C->unk_04C;
- if (temp_v0_2 >= 0) {
- if (temp_v0_2 > 0) {
- sp2C->unk_04C = temp_v0_2 - 1;
+ if (temp_t0->unk_04C >= 0) {
+ if (temp_t0->unk_04C > 0) {
+ temp_t0->unk_04C--;
} else {
- temp_v0_3 = sp2C->unk_0D6;
- switch (temp_v0_3) { /* switch 1; irregular */
+ switch (temp_t0->unk_0D6) { /* switch 1; irregular */
case 1: /* switch 1 */
if (sp40 != 0) {
func_80073600(temp_s0);
@@ -4121,24 +4049,23 @@ void func_8007B34C(s32 playerId) {
}
break;
case 2: /* switch 1 */
- set_type_object(temp_s0, (s32) sp2C->unk_0A2);
- sp2C->unk_0D6 = 3;
+ set_type_object(temp_s0, (s32) temp_t0->unk_0A2);
+ temp_t0->unk_0D6 = 3;
break;
case 3: /* switch 1 */
- if (sp2C->type == 0) {
+ if (temp_t0->type == 0) {
if (func_80072354(temp_s0, 1) != 0) {
- temp_v0_4 = sp2C->unk_0A2;
- if (temp_v0_4 == 0x000B) {
+ if (temp_t0->unk_0A2 == 0x000B) {
if (func_8007B040(temp_s0, playerId) != 0) {
func_800726CC(temp_s0, 0x00000014);
- sp2C->unk_0D6 = 0;
+ temp_t0->unk_0D6 = 0;
} else {
func_800726CC(temp_s0, 9);
}
- } else if ((temp_v0_4 == 0x000D) || (temp_v0_4 == 0x000E)) {
- sp2C->unk_0A2 = temp_v0_4 - 1;
- set_type_object(temp_s0, (s32) sp2C->unk_0A2);
- sp2C->unk_0D6 = 3;
+ } else if ((temp_t0->unk_0A2 == 0x000D) || (temp_t0->unk_0A2 == 0x000E)) {
+ temp_t0->unk_0A2--;
+ set_type_object(temp_s0, (s32) temp_t0->unk_0A2);
+ temp_t0->unk_0D6 = 3;
func_800726CC(temp_s0, 0x00000028);
} else {
func_800726CC(temp_s0, 9);
@@ -4146,21 +4073,17 @@ void func_8007B34C(s32 playerId) {
} else {
func_800722CC(temp_s0, 1);
func_800726CC(temp_s0, 0x0000001E);
- sp2C->unk_0D6 = 0;
+ temp_t0->unk_0D6 = 0;
}
}
break;
}
}
}
- temp_v0_5 = sp2C->itemDisplay;
- sp2C->activeTLUT = gItemWindowTLUTs[temp_v0_5];
- sp2C->activeTexture = gItemWindowTextures[temp_v0_5];
- sp38->currentItemCopy = sp2C->currentItem;
+ temp_t0->activeTLUT = gItemWindowTLUTs[temp_t0->itemDisplay];
+ temp_t0->activeTexture = gItemWindowTextures[temp_t0->itemDisplay];
+ sp38->currentItemCopy = temp_t0->type;
}
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007B34C.s")
-#endif
void func_8007BB9C(s32 arg0) {
func_8007B34C(arg0);
@@ -4510,108 +4433,52 @@ void func_8007C684(s32 objectIndex) {
}
}
-#ifdef NON_MATCHING
-//generated by m2c commit 9841ff34ca242f5f14b2eab2b54a7a65ac47d80f
-extern s16 D_8018CFF0;
-extern s16 D_8018D048;
-// static ? D_800E5988; /* unable to generate initializer */
-// static ? D_800E5A44; /* unable to generate initializer */
-// static ? D_800E5B08; /* unable to generate initializer */
-// static ? D_800E5BD4; /* unable to generate initializer */
-// static ? D_800E5C90; /* unable to generate initializer */
-// static s32 D_800E5D9C[5] = {
-// (s32) &D_800E5988,
-// (s32) &D_800E5A44,
-// (s32) &D_800E5B08,
-// (s32) &D_800E5BD4,
-// (s32) &D_800E5C90,
-// };
-// static ? D_800E5DB0; /* unable to generate initializer */
-extern s32 D_800E5D9C[];
-extern s32 D_800E5DB0;
-
-// Close but not yet
-void func_8007C7B4(s32 arg0, s32 arg1) {
- //s32 *sp40;
+void func_8007C7B4(s32 someIndex, s32 arg1) {
+ s32 temp_a0;
+ s32 objectIndex;
s16 temp_s1_2;
s16 temp_s4;
s16 temp_s5;
- s32 *var_s2;
- s32 var_s3;
- s32 *temp_s1;
- UNUSED s32 *temp_v1;
- //Objects *temp_s0;
- //s32 i = 0;
-
- temp_s1 = &D_8018BFA8[arg0];
- //sp40 = D_8018BFA8[arg0];
- var_s2 = (s32 *)&D_800E5D9C;
-
- do { //for (i = 0; i < 20; i++) {
- var_s3 = *temp_s1;
- //temp_s1 = *var_s3;
- func_800723A4(var_s3, 1);
- //temp_s0 = &gObjectList[var_s3[i]];
- gObjectList[var_s3].unk_0D1 = arg1;
- temp_s1_2 = random_int(60) - 30;
- temp_s4 = random_int(20) - 10;
- temp_s5 = random_int(80) - 40;
- random_int(4096); // burn a card?
- temp_v1 = (s32 *) var_s2;
- var_s2 += 4;
- temp_s1 += 4;
- gObjectList[var_s3].unk_010[0] = (f32)temp_s1_2;
- gObjectList[var_s3].unk_080 = (u16 *) var_s2;
- gObjectList[var_s3].unk_010[1] = (f32) temp_s4;
- gObjectList[var_s3].unk_010[2] = (f32) temp_s5;
- } while (*var_s2 != D_800E5DB0);
-
- func_800C9060(arg1, 0x1900705A);
- if (&D_8018BFA8[arg0] == D_8018BFA8) {
+ s16 *something;
+
+ for (temp_a0 = 0; temp_a0 < 5; temp_a0++) {
+ objectIndex = D_8018BFA8[someIndex + temp_a0];
+ func_800723A4(objectIndex, 1);
+ gObjectList[objectIndex].unk_0D1 = arg1;
+ temp_s1_2 = random_int(0x003CU) - 0x1E;
+ temp_s4 = random_int(0x0014U) - 0xA;
+ temp_s5 = random_int(0x0050U) - 0x28;
+ random_int(0x1000U);
+ something = D_800E5D9C[temp_a0];
+ gObjectList[objectIndex].unk_080 = something;
+ gObjectList[objectIndex].unk_010[0] = (f32) temp_s1_2;
+ gObjectList[objectIndex].unk_010[1] = (f32) temp_s4;
+ gObjectList[objectIndex].unk_010[2] = (f32) temp_s5;
+ }
+ func_800C9060(arg1, 0x1900705AU);
+
+ if (someIndex == 0) {
D_8018CFF0 = 1;
- return;
+ } else {
+ D_8018D048 = 1;
}
- D_8018D048 = 1;
}
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007C7B4.s")
-#endif
-#ifdef MIPS_TO_C
-//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
-extern s16 D_8018CFF0;
-extern s16 D_8018D048;
+void func_8007C91C(s32 someIndex) {
+ s32 temp_a0;
+ s32 objectIndex;
-void func_8007C91C(s32 objectIndex) {
- s32 *temp_a0;
- s32 *temp_a1;
- Objects *temp_a2;
- Objects *temp_a2_2;
- Objects *temp_a2_3;
- Objects *temp_a2_4;
- Objects *temp_a2_5;
-
- temp_a1 = &D_8018BFA8[objectIndex];
- temp_a0 = &temp_a1[1];
- temp_a2 = &gObjectList[*temp_a1];
- temp_a2->unk_0DC += 1;
- temp_a2_2 = &gObjectList[temp_a0->unk0];
- temp_a2_2->unk_0DC += 1;
- temp_a2_3 = &gObjectList[temp_a0->unk4];
- temp_a2_3->unk_0DC += 1;
- temp_a2_4 = &gObjectList[temp_a0->unk8];
- temp_a2_4->unk_0DC += 1;
- temp_a2_5 = &gObjectList[temp_a0->unkC];
- temp_a2_5->unk_0DC += 1;
- if (temp_a1 == D_8018BFA8) {
+ for (temp_a0 = 0; temp_a0 < 5; temp_a0++) {
+ objectIndex = D_8018BFA8[someIndex + temp_a0];
+ gObjectList[objectIndex].unk_0DC += 1;
+ }
+
+ if (someIndex == 0) {
+ D_8018CFF0 = 0;
+ } else {
D_8018D048 = 0;
- return;
}
- D_8018CFF0 = 0;
}
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007C91C.s")
-#endif
s32 func_8007C9F8(void) {
s32 ret;
@@ -4638,75 +4505,48 @@ s32 func_8007C9F8(void) {
return ret;
}
-#ifdef MIPS_TO_C
-//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
-void func_8007C7B4(?, s16); /* extern */
-void func_8007C91C(?, s16); /* extern */
-s16 func_8007C9F8(); /* extern */
-extern s16 D_8018CFF0;
-extern s16 D_8018D018;
-extern s16 D_8018D048;
-extern s16 D_8018D110;
-
void func_8007CA70(void) {
- u16 *sp1C;
- s16 temp_a1;
- s16 temp_a1_2;
- s16 temp_v0;
- s16 temp_v0_2;
- u16 *temp_v1_2;
- u16 *temp_v1_4;
- u16 temp_v1;
- u16 temp_v1_3;
- u16 var_v0;
- u16 var_v0_2;
+ s32 playerId;
+ // wtf is up with this pointer? Its such a dumb way of going about things
+ u16 *test;
if (D_8018CFF0 == 0) {
- temp_v0 = func_8007C9F8();
- temp_v1 = gNearestWaypointByPlayerId[temp_v0];
- D_8018D018 = temp_v0;
- if (((s32) temp_v1 >= 0xC9) && ((s32) temp_v1 < 0xD2)) {
- func_8007C7B4(0, temp_v0);
+ playerId = func_8007C9F8();
+ D_8018D018 = playerId;
+ test = &gNearestWaypointByPlayerId[playerId];
+ if ((*test >= 0xC9) && (*test < 0xD2)) {
+ func_8007C7B4(0, (s32) playerId);
}
}
if (D_8018CFF0 != 0) {
- temp_a1 = D_8018D018;
- temp_v1_2 = &gNearestWaypointByPlayerId[temp_a1];
- var_v0 = *temp_v1_2;
- if (((s32) var_v0 >= 0xB5) && ((s32) var_v0 < 0xBE)) {
- sp1C = temp_v1_2;
- func_8007C91C(0, temp_a1);
- var_v0 = *temp_v1_2;
- }
- if (((s32) var_v0 >= 0x119) && ((s32) var_v0 < 0x122)) {
+ playerId = D_8018D018;
+ test = &gNearestWaypointByPlayerId[playerId];
+ if ((*test >= 0xB5) && (*test < 0xBE)) {
+ func_8007C91C(0);
+ }
+ if ((*test >= 0x119) && (*test < 0x122)) {
func_8007C91C(0);
}
}
if (D_8018D048 == 0) {
- temp_v0_2 = func_8007C9F8();
- temp_v1_3 = gNearestWaypointByPlayerId[temp_v0_2];
- D_8018D110 = temp_v0_2;
- if (((s32) temp_v1_3 >= 0x1FF) && ((s32) temp_v1_3 < 0x208)) {
- func_8007C7B4(5, temp_v0_2);
+ playerId = func_8007C9F8();
+ D_8018D110 = playerId;
+ test = &gNearestWaypointByPlayerId[playerId];
+ if ((*test >= 0x1FF) && (*test < 0x208)) {
+ func_8007C7B4(5, (s32) playerId);
}
}
if (D_8018D048 != 0) {
- temp_a1_2 = D_8018D110;
- temp_v1_4 = &gNearestWaypointByPlayerId[temp_a1_2];
- var_v0_2 = *temp_v1_4;
- if (((s32) var_v0_2 >= 0x1EB) && ((s32) var_v0_2 < 0x1F4)) {
- sp1C = temp_v1_4;
- func_8007C91C(5, temp_a1_2);
- var_v0_2 = *temp_v1_4;
- }
- if (((s32) var_v0_2 >= 0x26D) && ((s32) var_v0_2 < 0x276)) {
+ playerId = D_8018D110;
+ test = &gNearestWaypointByPlayerId[playerId];
+ if ((*test >= 0x1EB) && (*test < 0x1F4)) {
+ func_8007C91C(5);
+ }
+ if ((*test >= 0x26D) && (*test < 0x276)) {
func_8007C91C(5);
}
}
}
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007CA70.s")
-#endif
void func_8007CC00(void) {
u16 temp_t4;
@@ -4805,87 +4645,55 @@ void func_8007CEDC(s32 objectIndex) {
}
}
-#ifdef MIPS_TO_C
-//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-10-2023
-extern s32 D_8016559C;
-extern s32 D_8018C1D8;
-extern ? D_8018C228;
-static Vtx D_800E4470; /* unable to generate initializer */
-static Vtx D_800E44B0; /* unable to generate initializer */
-static s16 D_800E5D54[4]; /* unable to generate initializer */
-static ? D_800E5DB4; /* unable to generate initializer */
-
void func_8007D070(void) {
- f32 sp44;
- f32 temp_f2;
- f32 temp_f4;
- f32 temp_f6;
+ s32 stackPadding;
+ s32 stackPadding2;
+ u16 temp_s3;
+ s16 temp_t5;
s16 temp_s2;
- s32 *var_s2;
- s32 temp_s1;
- s32 temp_s1_2;
- s32 temp_s3;
- s32 temp_t2;
- s32 temp_t5;
+ u16 temp_t2;
s32 var_v0;
- Objects *temp_s0;
- Objects *temp_s0_2;
+ s32 objectIndex;
var_v0 = 0;
- if ((D_8016559C == 0) && (D_8018D2A4 != 0) && (*D_8018CF68 < 0x1D) && (*(&D_800E5DB4 + *D_8018CF68) == 1)) {
- if (gObjectList[D_8018C1D8].state != 0) {
-loop_5:
- var_v0 += 1;
- if (var_v0 != 0x1E) {
- if (gObjectList[D_8018C1B0[var_v0].unk28].state != 0) {
- goto loop_5;
- }
- }
- }
- temp_s1 = D_8018C1B0[var_v0].unk28;
- if (var_v0 != 0x1E) {
- temp_s0 = &gObjectList[temp_s1];
- if (temp_s0->state == 0) {
- func_800723A4(temp_s1, 1);
+ if ((D_8016559C == 0) && (D_8018D2A4 != 0) && (D_8018CF68[0] < 0x1D) && (D_800E5DB4[D_8018CF68[0]] == 1)) {
+ while (gObjectList[D_8018C1B0[var_v0 + 10]].state != 0) {
+ var_v0++;
+ if (var_v0 == 30) break;
+ }
+ objectIndex = D_8018C1B0[var_v0 + 10];
+ if (var_v0 != 30) {
+ if (gObjectList[objectIndex].state == 0) {
+ func_800723A4(objectIndex, 1);
temp_s2 = random_int(0x012CU);
- temp_s3 = (random_int(0x1000U) - 0x800) & 0xFFFF;
- temp_t5 = (random_int(0x000FU) - 5) << 0x10;
- temp_s0->unk_0BE[1] = D_8018CF1C->unk_02C[1] + 0x8000;
- temp_t2 = (D_8018CF14->rot[1] + temp_s3) & 0xFFFF;
- temp_f2 = (f32) temp_s2;
- temp_f6 = sins(temp_t2 & 0xFFFF) * temp_f2;
- sp44 = temp_f2;
- temp_s0->unk_010[1] = (f32) (temp_t5 >> 0x10);
- temp_s0->unk_010[0] = temp_f6 + D_8018CF1C->pos[0];
- temp_f4 = coss(temp_t2 & 0xFFFF) * temp_f2;
- temp_s0->unk_080 = (s16 (*)[4]) D_800E5D54;
- temp_s0->unk_010[2] = temp_f4 + D_8018CF1C->pos[2];
+ temp_s3 = random_int(0x1000U) - 0x800;
+ temp_t5 = random_int(0x000FU) - 5;
+ gObjectList[objectIndex].unk_0BE[1] = D_8018CF1C->unk_02C[1] + 0x8000;
+ temp_t2 = (D_8018CF14->rot[1] + temp_s3);
+ gObjectList[objectIndex].unk_010[0] = D_8018CF1C->pos[0] + (sins(temp_t2) * temp_s2);
+ gObjectList[objectIndex].unk_010[1] = temp_t5;
+ gObjectList[objectIndex].unk_010[2] = D_8018CF1C->pos[2] + (coss(temp_t2) * temp_s2);
+ gObjectList[objectIndex].unk_080 = D_800E5D54;
}
}
}
- var_s2 = D_8018C1B0;
- do {
- temp_s1_2 = var_s2->unk28;
- temp_s0_2 = &gObjectList[temp_s1_2];
- if (temp_s0_2->state != 0) {
- func_8007CEDC(temp_s1_2);
- func_8008B724(temp_s1_2);
- temp_s0_2->pos[0] = temp_s0_2->unk_028[0] + temp_s0_2->unk_010[0];
- temp_s0_2->pos[1] = temp_s0_2->unk_028[1] + (D_8018CF1C->unk_074 + temp_s0_2->unk_010[1]);
- temp_s0_2->pos[2] = temp_s0_2->unk_028[2] + temp_s0_2->unk_010[2];
- func_8007C420(temp_s1_2, D_8018CF1C, D_8018CF14);
- if (is_obj_index_flag_unk_054_active(temp_s1_2, 0x00000080) != 0) {
- temp_s0_2->vertex = &D_800E44B0;
+ for (var_v0 = 0; var_v0 < 30; var_v0++) {
+ objectIndex = D_8018C1B0[var_v0 + 10];
+ if (gObjectList[objectIndex].state != 0) {
+ func_8007CEDC(objectIndex);
+ func_8008B724(objectIndex);
+ gObjectList[objectIndex].pos[0] = gObjectList[objectIndex].unk_010[0] + gObjectList[objectIndex].unk_028[0];
+ gObjectList[objectIndex].pos[1] = D_8018CF1C->unk_074 + gObjectList[objectIndex].unk_010[1] + gObjectList[objectIndex].unk_028[1];
+ gObjectList[objectIndex].pos[2] = gObjectList[objectIndex].unk_010[2] + gObjectList[objectIndex].unk_028[2];
+ func_8007C420(objectIndex, D_8018CF1C, D_8018CF14);
+ if (is_obj_index_flag_unk_054_active(objectIndex, 0x00000080) != 0) {
+ gObjectList[objectIndex].vertex = D_800E44B0;
} else {
- temp_s0_2->vertex = &D_800E4470;
+ gObjectList[objectIndex].vertex = D_800E4470;
}
}
- var_s2 += 4;
- } while (var_s2 != &D_8018C228);
+ }
}
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007D070.s")
-#endif
void func_8007D360(s32 objectIndex, s32 arg1) {
if (arg1 == 1) {
@@ -5034,25 +4842,23 @@ void func_8007DAF8(s32 objectIndex, s32 arg1) {
}
#ifdef MIPS_TO_C
-//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-28-2022
-? func_8007D794(s32); /* extern */
+//generated by m2c commit beb457dabfc7a01ec6540a5404a6a05097a13602 on Nov-12-2023
extern ? D_8018C490;
extern ? D_8018C6A8;
-extern s16 D_8018CFB0;
extern s16 D_8018CFC8;
extern s16 D_8018CFD8;
extern s16 D_8018D000;
extern s16 D_8018D010;
void func_8007DB44(void) {
+ Objects *temp_s1;
+ Objects *temp_s1_2;
+ Objects *temp_s1_3;
s32 *var_s2;
s32 *var_s2_2;
s32 temp_s0;
s32 temp_s0_2;
s32 temp_s0_3;
- Objects *temp_s1;
- Objects *temp_s1_2;
- Objects *temp_s1_3;
if (D_8018CFC8 != 0) {
D_8018CFC8 -= 1;
@@ -5182,27 +4988,15 @@ void init_bb_trash_bin(s32 objectIndex) {
func_80072488(objectIndex);
}
-#ifdef MIPS_TO_C
-//generated by m2c commit b52d92c2340f6f4ba1aafb464188bb698752fbb0 on Jul-29-2023
-extern s32 D_80165594;
-extern s16 D_8018CFB0;
-
void func_8007E00C(s32 objectIndex) {
- s16 temp_v1;
- Objects *temp_s0;
- u16 temp_t8;
- u16 temp_v0;
-
- temp_s0 = &gObjectList[objectIndex];
- temp_t8 = (u16) temp_s0->state;
- switch (temp_t8) {
+ switch (gObjectList[objectIndex].state) {
case 1:
init_bb_trash_bin(objectIndex);
- return;
+ break;
case 3:
D_8018CFB0 = 1;
func_80072488(objectIndex);
- return;
+ break;
case 4:
func_8007278C(objectIndex, 0x000000D2);
if (D_80165594 == 0) {
@@ -5216,44 +5010,39 @@ void func_8007E00C(s32 objectIndex) {
func_8007D714(1);
}
}
- func_80073CB0(objectIndex, &temp_s0->unk_0A0, -0x00002000, 0, 0x00000400, 0, -1);
- temp_v1 = temp_s0->unk_084[7];
- temp_s0->unk_0B2[2] = (u16) temp_s0->unk_0A0;
- if (temp_v1 == 0) {
- func_800C98B8(temp_s0->pos, temp_s0->unk_038, 0x1901904EU);
- temp_s0->unk_084[7] = 0x0014;
- return;
+ func_80073CB0(objectIndex, &gObjectList[objectIndex].unk_0A0, -0x00002000, 0, 0x00000400, 0, -1);
+ gObjectList[objectIndex].unk_0B2[2] = gObjectList[objectIndex].unk_0A0;
+ if (gObjectList[objectIndex].unk_084[7] == 0) {
+ func_800C98B8(gObjectList[objectIndex].pos, gObjectList[objectIndex].unk_038, 0x1901904EU);
+ gObjectList[objectIndex].unk_084[7] = 0x0014;
+ } else {
+ gObjectList[objectIndex].unk_084[7]--;
}
- temp_s0->unk_084[7] = temp_v1 - 1;
- return;
+ break;
case 5:
- temp_v0 = func_800417B4(temp_s0->unk_0B2[2], 0U);
- temp_s0->unk_0B2[2] = temp_v0;
- if (!(temp_v0 & 0xFFFF)) {
+ gObjectList[objectIndex].unk_0B2[2] = func_800417B4(gObjectList[objectIndex].unk_0B2[2], 0U);
+ if (gObjectList[objectIndex].unk_0B2[2] == 0) {
func_80072488(objectIndex);
- return;
}
- default:
- return;
+ break;
case 6:
- temp_s0->unk_0B2[2] = 0;
- temp_s0->unk_084[7] = 0;
+ gObjectList[objectIndex].unk_0B2[2] = 0;
+ gObjectList[objectIndex].unk_084[7] = 0;
func_80072488(objectIndex);
D_8018CFB0 = 0;
break;
+ case 0:
+ case 2:
+ default:
+ break;
}
}
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007E00C.s")
-#endif
-
-void func_8007E1AC() {
- s32 temp_a0;
- temp_a0 = D_80183EA4;
- func_8007E00C(temp_a0);
+void func_8007E1AC(void) {
+ s32 objectIndex = D_80183EA0[1];
+ func_8007E00C(objectIndex);
if (gModeSelection != TIME_TRIALS) {
- func_8007DDC0(temp_a0);
+ func_8007DDC0(objectIndex);
}
}
@@ -5892,106 +5681,81 @@ void func_8007FA08(s32 objectIndex) {
func_80072488(objectIndex);
}
-#ifdef MIPS_TO_C
-//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
-extern f32 D_8018D01C;
-extern s32 D_8018D400;
-
void func_8007FB48(s32 objectIndex) {
- Objects *sp18;
- s16 temp_a0;
- s16 var_a0;
- s32 temp_v0;
s32 var_v0;
- Objects *temp_v1;
- u16 temp_t2;
- u16 temp_v0_2;
+ s32 stackPadding;
+ Player *player;
- temp_v1 = &gObjectList[objectIndex];
- temp_t2 = (u16) temp_v1->unk_0AE;
- switch (temp_t2) {
+ player = &gPlayerOne[gObjectList[objectIndex].unk_0D1];
+ switch (gObjectList[objectIndex].unk_0AE) {
case 1:
- temp_v1->unk_0B0 = 0x00A0;
- temp_v1->unk_028[0] = 0.0f;
- temp_v1->unk_028[2] = 0.0f;
- temp_v1->unk_038[2] = 0.0f;
+ gObjectList[objectIndex].unk_0B0 = 0x00A0;
+ gObjectList[objectIndex].unk_028[0] = 0.0f;
+ gObjectList[objectIndex].unk_028[2] = 0.0f;
+ gObjectList[objectIndex].unk_038[2] = 0.0f;
func_80086FD4(objectIndex);
- return;
+ break;
case 2:
- temp_v0 = temp_v1->unk_048;
- temp_a0 = temp_v1->unk_0B0;
- temp_v1->unk_038[0] = (f32) ((f64) (gPlayerOne[temp_v1->unk_0D1].unk_094 * D_8018D01C) * 1.25);
- if (temp_v0 >= temp_a0) {
- if (temp_a0 == temp_v0) {
+ gObjectList[objectIndex].unk_038[0] = player->unk_094 * D_8018D01C * 1.25;
+ if (gObjectList[objectIndex].unk_048 >= gObjectList[objectIndex].unk_0B0) {
+ if (gObjectList[objectIndex].unk_0B0 == gObjectList[objectIndex].unk_048) {
if (D_8018D400 & 1) {
- temp_v1->unk_038[2] = 1.5f;
+ gObjectList[objectIndex].unk_038[2] = 1.5f;
} else {
- temp_v1->unk_038[2] = -1.5f;
+ gObjectList[objectIndex].unk_038[2] = -1.5f;
}
}
- if ((f64) temp_v1->unk_038[2] >= 0.0) {
- if ((f64) temp_v1->unk_028[2] >= 40.0) {
- temp_v1->unk_038[2] = -1.5f;
+ if (gObjectList[objectIndex].unk_038[2] >= 0.0) {
+ if (gObjectList[objectIndex].unk_028[2] >= 40.0) {
+ gObjectList[objectIndex].unk_038[2] = -1.5f;
}
- } else if ((f64) temp_v1->unk_028[2] <= -40.0) {
- temp_v1->unk_038[2] = 1.5f;
+ } else if ((f64) gObjectList[objectIndex].unk_028[2] <= -40.0) {
+ gObjectList[objectIndex].unk_038[2] = 1.5f;
}
}
- sp18 = temp_v1;
func_8008775C(objectIndex);
- var_a0 = temp_v1->unk_0B0;
- if (var_a0 < 0x65) {
- sp18 = temp_v1;
- var_a0 = temp_v1->unk_0B0;
- temp_v1->unk_0B2[1] = func_800417B4(temp_v1->unk_0B2[1], (temp_v1->unk_0BE[1] + 0x8000) & 0xFFFF);
- if (var_a0 == 0x0064) {
- temp_v1->itemDisplay = 1;
- var_a0 = temp_v1->unk_0B0;
+ if (gObjectList[objectIndex].unk_0B0 < 0x65) {
+ gObjectList[objectIndex].unk_0B2[1] = func_800417B4(gObjectList[objectIndex].unk_0B2[1], (gObjectList[objectIndex].unk_0BE[1] + 0x8000));
+ if (gObjectList[objectIndex].unk_0B0 == 0x0064) {
+ gObjectList[objectIndex].itemDisplay = 1;
}
}
var_v0 = 0;
if (gIsMirrorMode != 0) {
- if ((f64) temp_v1->unk_028[0] <= -1000.0) {
- goto block_20;
+ if (gObjectList[objectIndex].unk_028[0] <= -1000.0) {
+ var_v0 = 1;
}
- } else if ((f64) temp_v1->unk_028[0] >= 1000.0) {
-block_20:
+ } else if (gObjectList[objectIndex].unk_028[0] >= 1000.0) {
var_v0 = 1;
}
- temp_v1->unk_0B0 = var_a0 - 1;
- if ((temp_v1->unk_0B0 == 0) || (var_v0 != 0)) {
- temp_v1->unk_034 = 0.0f;
+ gObjectList[objectIndex].unk_0B0--;
+ if ((gObjectList[objectIndex].unk_0B0 == 0) || (var_v0 != 0)) {
+ gObjectList[objectIndex].unk_034 = 0.0f;
func_800726CC(objectIndex, 3);
func_80086FD4(objectIndex);
- return;
}
- default:
- return;
+ break;
case 4:
- sp18 = temp_v1;
- f32_step_towards(&temp_v1->unk_028[2], 0.0f, 2.0f);
- f32_step_towards(temp_v1->unk_028, 0.0f, 5.0f);
- if ((f64) (temp_v1->unk_028[2] + temp_v1->unk_028[0]) == 0.0) {
+ f32_step_towards(&gObjectList[objectIndex].unk_028[2], 0.0f, 2.0f);
+ f32_step_towards(gObjectList[objectIndex].unk_028, 0.0f, 5.0f);
+ if ((gObjectList[objectIndex].unk_028[0] + gObjectList[objectIndex].unk_028[2]) == 0.0) {
func_80086FD4(objectIndex);
- return;
}
break;
case 5:
- sp18 = temp_v1;
- temp_v0_2 = func_800417B4(temp_v1->unk_0B2[1], temp_v1->unk_0BE[1]);
- temp_v1->unk_0B2[1] = temp_v0_2;
- if ((temp_v0_2 & 0xFFFF) == temp_v1->unk_0BE[1]) {
- sp18 = temp_v1;
+ gObjectList[objectIndex].unk_0B2[1] = func_800417B4(gObjectList[objectIndex].unk_0B2[1], gObjectList[objectIndex].unk_0BE[1]);
+ if (gObjectList[objectIndex].unk_0B2[1] == gObjectList[objectIndex].unk_0BE[1]) {
func_800722CC(objectIndex, 8);
func_80086FD4(objectIndex);
- temp_v1->itemDisplay = 0;
+ gObjectList[objectIndex].itemDisplay = 0;
}
break;
+ case 0:
+ case 3:
+ default:
+ break;
}
}
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007FB48.s")
-#endif
void func_8007FEA4(s32 objectIndex) {
Objects *temp_v1;
@@ -6260,49 +6024,30 @@ void func_8008085C(s32 objectIndex) {
func_8008BF18(objectIndex);
}
-#ifdef MIPS_TO_C
-//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-10-2023
-extern s32 D_8018D40C;
-extern s16 gCutsceneShotTimer;
-
-void func_800808CC(s32 arg0) {
- Objects *sp20;
- s16 var_v1;
- Objects *temp_t0;
-
- temp_t0 = &gObjectList[arg0];
- var_v1 = temp_t0->state;
- switch (var_v1) { /* irregular */
+void func_800808CC(s32 objectIndex) {
+ switch (gObjectList[objectIndex].state) { /* irregular */
case 0:
break;
case 1:
- sp20 = temp_t0;
- func_80080524(arg0);
-block_6:
- var_v1 = temp_t0->state;
+ func_80080524(objectIndex);
break;
case 2:
- sp20 = temp_t0;
- func_800730BC(arg0, 3, 5, 1, 6, -1);
- goto block_6;
- }
- if (var_v1 >= 2) {
- sp20 = temp_t0;
- func_8007E63C(arg0);
- func_8008085C(arg0);
- func_80073514(arg0);
+ func_800730BC(objectIndex, 3, 5, 1, 6, -1);
+ break;
+ }
+ if (gObjectList[objectIndex].state >= 2) {
+ func_8007E63C(objectIndex);
+ func_8008085C(objectIndex);
+ func_80073514(objectIndex);
if (gGamestate != 9) {
- if ((D_8018D40C == 0) && (temp_t0->state == 2)) {
- func_800C98B8(temp_t0->pos, temp_t0->unk_038, 0x19036045U);
+ if ((D_8018D40C == 0) && (gObjectList[objectIndex].state == 2)) {
+ func_800C98B8(gObjectList[objectIndex].pos, gObjectList[objectIndex].unk_038, 0x19036045U);
}
} else if ((gCutsceneShotTimer < 0xBF) && (((s16) gCutsceneShotTimer % 88) == 0x0000001E)) {
- func_800C98B8(temp_t0->pos, temp_t0->unk_038, 0x19036045U);
+ func_800C98B8(gObjectList[objectIndex].pos, gObjectList[objectIndex].unk_038, 0x19036045U);
}
}
}
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800808CC.s")
-#endif
void func_80080A14(s32 objectIndex, Player *player) {
if (func_80088A58(objectIndex, player, 12.0f) != 0) {
@@ -6380,45 +6125,27 @@ void func_80080DE4(s32 arg0) {
}
#ifdef MIPS_TO_C
-//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-10-2023
-f32 D_800E594C[5][2] = {
- { -8.0f, 8.0f },
- { 8.0f, 8.0f },
- { 0.0f, 0.0f },
- { 8.0f, -8.0f },
- { -8.0f, -8.0f },
-};
-s16 D_800E597C[6] = { 0, 0, 0x4000, 0x8000, 0x8000, 0xC000 };
+extern f32 D_800E594C[5][2];
+extern s16 D_800E597C[6];
void func_80080E8C(s32 objectIndex1, s32 objectIndex2, s32 arg2) {
- f32 sp38;
- Objects *sp2C;
- s32 sp28;
- f32 *sp24;
+ u16 anAngle;
+ f32 thing0;
+ f32 thing1;
f32 *temp_v1;
- s32 temp_t1;
- s32 temp_t7;
- Objects *temp_s0;
- Objects *temp_v0;
- u16 temp_s1;
func_800723A4(objectIndex1, arg2);
- temp_t1 = arg2 * 2;
- temp_v1 = &(*D_800E594C)[temp_t1];
- temp_s0 = &gObjectList[objectIndex1];
- temp_s0->unk_0D5 = 2;
- sp24 = temp_v1;
- sp28 = temp_t1;
- temp_v0 = &gObjectList[objectIndex2];
- temp_s1 = temp_v0->unk_0BE[1];
- sp2C = temp_v0;
- sp38 = func_800416D8(temp_v1->unk4, temp_v1->unk0, temp_s1);
- temp_s0->unk_010[0] = temp_v0->pos[0] + func_80041724(temp_v1->unk4, temp_v1->unk0, temp_s1 & 0xFFFF);
- temp_s0->unk_010[1] = (f32) ((f64) temp_v0->unk_044 - 9.0);
- temp_s0->unk_010[2] = temp_v0->pos[2] + sp38;
- temp_t7 = (*(D_800E597C + sp28) + temp_v0->unk_0BE[1]) & 0xFFFF;
- temp_s0->unk_038[0] = (f32) ((f64) sins(temp_t7 & 0xFFFF) * 0.6);
- temp_s0->unk_038[2] = (f32) ((f64) coss(temp_t7 & 0xFFFF) * 0.6);
+ temp_v1 = D_800E594C[arg2];
+ gObjectList[objectIndex1].unk_0D5 = 2;
+ anAngle = gObjectList[objectIndex2].unk_0BE[1];
+ thing1 = func_800416D8(temp_v1[1], temp_v1[0], anAngle);
+ thing0 = func_80041724(temp_v1[1], temp_v1[0], anAngle);
+ gObjectList[objectIndex1].unk_010[0] = gObjectList[objectIndex2].pos[0] + thing0;
+ gObjectList[objectIndex1].unk_010[1] = gObjectList[objectIndex2].unk_044 - 9.0;
+ gObjectList[objectIndex1].unk_010[2] = gObjectList[objectIndex2].pos[2] + thing1;
+ anAngle = D_800E597C[arg2] + gObjectList[objectIndex2].unk_0BE[1];
+ gObjectList[objectIndex1].unk_038[0] = sins(anAngle) * 0.6;
+ gObjectList[objectIndex1].unk_038[2] = coss(anAngle) * 0.6;
}
#else
GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80080E8C.s")
@@ -6894,64 +6621,34 @@ void func_800821FC(void) {
}
}
-#ifdef MIPS_TO_C
-//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
-extern ? d_course_koopa_troopa_beach_unk4;
-extern ? d_course_koopa_troopa_beach_unk_data5;
-extern f32 D_8018D01C;
-extern s32 gGamestate;
-static ? D_800E6034; /* unable to generate initializer */
-static ? D_800E60F0; /* unable to generate initializer */
-static ? D_800E61B4; /* unable to generate initializer */
-static ? D_800E6280; /* unable to generate initializer */
-static s32 D_800E633C[4] = { (s32) &D_800E6034, (s32) &D_800E60F0, (s32) &D_800E61B4, (s32) &D_800E6280 };
-
void func_8008241C(s32 objectIndex, s32 arg1) {
+ s16 stackPadding0;
+ s16 temp_f4;
s16 sp22;
- u16 sp20;
- f64 var_f10;
- f64 var_f8;
- s32 temp_f4;
- s32 temp_v0;
- s32 temp_v0_2;
- Objects *temp_s0;
-
- temp_s0 = &gObjectList[objectIndex];
- temp_s0->unk_0D8 = 1;
- temp_s0->unk_070 = (s32) &d_course_koopa_troopa_beach_unk4;
- temp_s0->vertex = (s32) &d_course_koopa_troopa_beach_unk_data5;
- temp_s0->unk_0DD = 1;
- temp_s0->sizeScaling = 0.2f;
- temp_v0 = random_int(0x00C8U);
- var_f8 = (f64) temp_v0;
- if (temp_v0 < 0) {
- var_f8 += 4294967296.0;
- }
- sp22 = (s16) (s32) (var_f8 + -100.0);
- sp20 = random_int(0x0014U);
- temp_v0_2 = random_int(0x00C8U);
- var_f10 = (f64) temp_v0_2;
- if (temp_v0_2 < 0) {
- var_f10 += 4294967296.0;
- }
- temp_f4 = (s32) (var_f10 + -100.0);
+ s16 sp20;
+
+ gObjectList[objectIndex].unk_0D8 = 1;
+ gObjectList[objectIndex].unk_070 = (Gfx *) d_course_koopa_troopa_beach_unk4;
+ gObjectList[objectIndex].vertex = (Vtx *) d_course_koopa_troopa_beach_unk_data5;
+ gObjectList[objectIndex].sizeScaling = 0.2f;
+ gObjectList[objectIndex].unk_0DD = 1;
+ sp22 = random_int(0x00C8) + -100.0;
+ sp20 = random_int(0x0014);
+ temp_f4 = random_int(0x00C8) + -100.0;
if (gGamestate == 9) {
- func_8008B7D4(objectIndex, (f32) ((f64) sp22 + -360.0), (f32) ((f64) (s16) sp20 + 60.0), (f32) ((f64) (s16) temp_f4 + -1300.0));
- } else if ((u8) temp_s0->unk_0D5 != 0) {
- func_8008B7D4(objectIndex, (f32) (((f64) sp22 + 328.0) * (f64) D_8018D01C), (f32) ((f64) (s16) sp20 + 20.0), (f32) ((f64) (s16) temp_f4 + 2541.0));
+ func_8008B7D4(objectIndex, sp22 + -360.0, sp20 + 60.0, temp_f4 + -1300.0);
+ } else if (gObjectList[objectIndex].unk_0D5 != 0) {
+ func_8008B7D4(objectIndex, (sp22 + 328.0) * D_8018D01C, sp20 + 20.0, temp_f4 + 2541.0);
} else {
- func_8008B7D4(objectIndex, (f32) (((f64) sp22 + -985.0) * (f64) D_8018D01C), (f32) ((f64) (s16) sp20 + 15.0), (f32) ((f64) (s16) temp_f4 + 1200.0));
+ func_8008B7D4(objectIndex, (sp22 + -985.0) * D_8018D01C, sp20 + 15.0, temp_f4 + 1200.0);
}
func_8008B888(objectIndex, 0U, 0U, 0U);
- temp_s0->unk_034 = 1.0f;
+ gObjectList[objectIndex].unk_034 = 1.0f;
func_80086EF0(objectIndex);
- temp_s0->unk_080 = D_800E633C[arg1 % 4];
+ gObjectList[objectIndex].unk_080 = D_800E633C[arg1 % 4];
set_object_flag_unk_054_true(objectIndex, 0x00000800);
func_80072488(objectIndex);
}
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8008241C.s")
-#endif
void func_80082714(s32 objectIndex, s32 arg1) {
switch(gObjectList[objectIndex].state) {
@@ -6986,18 +6683,17 @@ void func_8008275C(s32 objectIndex) {
}
#ifdef MIPS_TO_C
-//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-17-2023
+//generated by m2c commit beb457dabfc7a01ec6540a5404a6a05097a13602 on Nov-13-2023
extern s16 D_80165900;
extern s8 D_80165908;
extern s8 D_80165A90;
extern s32 D_80183F2C;
-extern s16 gCutsceneShotTimer;
void func_80082870(void) {
+ Objects *temp_s1;
s32 *var_s4;
s32 temp_s0;
s32 var_s3;
- Objects *temp_s1;
var_s4 = D_80183F28;
var_s3 = 0;
@@ -7565,36 +7261,25 @@ void func_800842C8(void) {
}
}
-#ifdef MIPS_TO_C
-//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-10-2023
-extern Gfx d_course_sherbet_land_unk_data1;
-extern Vtx d_course_sherbet_land_unk_data11;
-static s16 D_800E659C[4]; /* unable to generate initializer */
-static s16 D_800E6668[4]; /* unable to generate initializer */
-static s16 (*D_800E672C[2])[4] = { (s16 (*)[4]) D_800E659C, (s16 (*)[4]) D_800E6668 };
-
void func_80084430(s32 objectIndex, s32 arg1) {
Objects *temp_s0;
temp_s0 = &gObjectList[objectIndex];
temp_s0->unk_0D8 = 0;
- temp_s0->unk_070 = &d_course_sherbet_land_unk_data1;
- temp_s0->vertex = &d_course_sherbet_land_unk_data11;
+ temp_s0->unk_070 = (Gfx *) d_course_sherbet_land_unk_data1;
+ temp_s0->vertex = (Vtx *) d_course_sherbet_land_unk_data11;
+ temp_s0->sizeScaling = 0.2f;
temp_s0->unk_0C8 = 0x000C;
temp_s0->unk_09C = 1;
- temp_s0->sizeScaling = 0.2f;
- func_8008B7D4(objectIndex, (f32) ((f64) D_8018D01C * -383.0), 2.0f, -690.0f);
+ func_8008B7D4(objectIndex, D_8018D01C * -383.0, 2.0f, -690.0f);
func_8008B888(objectIndex, 0U, 0U, 0U);
temp_s0->unk_0DD = 1;
func_80086EF0(objectIndex);
temp_s0->unk_080 = *D_800E672C;
set_object_flag_unk_054_true(objectIndex, 0x04000800);
- temp_s0->type = func_80004EAC(&d_course_sherbet_land_unk_data11, 0);
+ temp_s0->type = func_80004EAC(d_course_sherbet_land_unk_data11, 0);
func_80072488(objectIndex);
}
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80084430.s")
-#endif
void func_8008453C(s32 objectIndex, s32 arg1) {
switch (gObjectList[objectIndex].state) { /* irregular */
@@ -8494,38 +8179,27 @@ void func_80086C6C(s32 objectIndex) {
func_800773D8(sp24, (s32) D_801658F4);
}
-#ifdef MIPS_TO_C
-//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-10-2023
-extern s32 D_8016559C;
-extern s8 D_801658DC;
-extern ? D_80165CBE;
-extern s32 D_80183EAC;
-
void func_80086D80(void) {
s32 temp_s2;
s32 var_s0;
if ((D_801658CE != 0) && (D_801658DC == 0)) {
- func_800723A4(D_80183EAC, 0);
+ temp_s2 = D_80183EA0[3];
+ func_800723A4(temp_s2, 0);
D_801658DC = 1;
}
- temp_s2 = D_80183EAC;
- if (*(&D_80165CBE + (temp_s2 * 0xE0)) != 0) {
+ temp_s2 = D_80183EA0[3];
+ if (gObjectList[temp_s2].state != 0) {
func_80086C14(temp_s2);
func_80086940(temp_s2);
- var_s0 = 0;
if (D_801658F4 != 0) {
if (D_8016559C == 0) {
func_80086C6C(temp_s2);
}
} else {
- do {
+ for (var_s0 = 0; var_s0 < 2; var_s0++) {
func_80086C6C(temp_s2);
- var_s0 += 1;
- } while (var_s0 != 2);
+ }
}
}
}
-#else
-GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80086D80.s")
-#endif
diff --git a/src/code_80071F00.h b/src/code_80071F00.h
index ba28b1b93..a0644601e 100644
--- a/src/code_80071F00.h
+++ b/src/code_80071F00.h
@@ -87,8 +87,8 @@ s32 func_80073A10(s32, s16*, s32, s32, s32, s32, s32);
s32 func_80073B00(s32, s16*, s32, s32, s32, s32, s32);
s32 func_80073B34(s32, s16*, s32, s32, s32, s32, s32);
s32 func_80073B78(s32, s32, s16*, s32, s32, s32, s32, s32);
-void func_80073CB0(s32, s16*, s32, s32, s32, s32, s32);
-void func_80073D0C(s32, s16*, s32, s32, s32, s32, s32);
+bool func_80073CB0(s32, s16*, s32, s32, s32, s32, s32);
+bool func_80073D0C(s32, s16*, s32, s32, s32, s32, s32);
void func_80073D68(s32, s16*, s16, s32);
void func_80073DC0(s32, s16*, s16, s32);
s32 func_80073E18(s32, u16*, u16, s32);
@@ -207,6 +207,7 @@ u8 gen_random_item_human(s16, s16);
u8 gen_random_item_cpu(s32, s16);
s16 func_8007AFB0(s32, s32);
s32 func_8007B040(s32, s32);
+void func_8007B254(s32, s32);
void func_8007B34C(s32);
void func_8007BB9C(s32);
void func_8007BBBC(s32);
@@ -215,8 +216,6 @@ void func_8007BDA8(void);
void func_8007BDE0(s32);
void func_8007BEC8(s32);
void func_8007BFB0(s32);
-void func_8007CA70(void);
-void func_8007CC00(void);
void func_8007C280(void);
void func_8007C2F8(s32);
void func_8007C340(void);
@@ -227,9 +226,14 @@ void func_8007C550(s32);
void func_8007C5B4(s32);
void func_8007C684(s32);
void func_8007C49C(void);
+void func_8007C7B4(s32, s32);
+void func_8007C91C(s32);
s32 func_8007C9F8(void);
+void func_8007CA70(void);
+void func_8007CC00(void);
void func_8007CE0C(s32);
void func_8007CEDC(s32);
+void func_8007D070(void);
void func_8007D360(s32, s32);
void func_8007D6A8(s32, s32);
void func_8007D714(s32);
@@ -242,7 +246,8 @@ void func_8007DA74(s32);
void func_8007DAF8(s32, s32);
void func_8007DDC0(s32);
void init_bb_trash_bin(s32);
-void func_8007E1AC();
+void func_8007E00C(s32);
+void func_8007E1AC(void);
void func_8007E1F4(s32);
void func_8007E358(s32);
void func_8007E3EC(s32);
@@ -366,6 +371,16 @@ void func_80086D80(void);
s32 osPiStartDma(OSIoMesg *mb, s32 priority, s32 direction, uintptr_t devAddr, void *vAddr, size_t nbytes, OSMesgQueue *mq);
s32 osRecvMesg(OSMesgQueue*, OSMesg*, s32);
+extern f32 D_800E43B0[];
+extern Vtx D_800E43F0[];
+extern Vtx D_800E4470[];
+extern Vtx D_800E44B0[];
+extern u8 *gItemWindowTLUTs[];
+extern u8 *gItemWindowTextures[];
+extern u8 *D_800E4570[];
+extern u8 *gPortraitTLUTs[];
+extern u8 *gPortraitTextures[];
+
// Seemingly a pointer to Lakitu texture(s)
extern u8 *D_8018C028;
// Seemingly a list of textures for Lakitu
@@ -381,18 +396,30 @@ extern u16 D_801657A2;
extern s8 D_801658CE;
extern s32 D_80162DF8;
extern s16 D_8016347C;
+extern s32 D_80165594;
extern s32 D_80165598;
extern s16 D_80165740;
extern s8 D_801657B4;
extern Vec3su D_8016582C;
+extern s8 D_80165888;
extern s8 D_801658C6;
+extern s8 D_801658DC;
extern s8 D_801658F4;
extern s32 D_80183D5C;
extern s32 D_80183EA4;
+extern s16 D_8018CAB8;
+extern s16 D_8018CFB0;
extern s16 D_8018CFE8;
+extern s16 D_8018CFF0;
+extern s16 D_8018D018;
extern f32 D_8018D01C;
+extern s16 D_8018D048;
+extern s16 D_8018D110;
extern s32 D_8018D140;
extern s32 D_8018D158;
+extern s8 D_8018D198[];
+extern s8 D_8018D1A8[];
+extern s8 D_8018D1B8[];
extern s32 D_8018D1EC;
extern s32 D_8018D224;
extern u8* D_8018D490;
@@ -404,5 +431,11 @@ extern Vec3s D_800E634C[3]; // static?
extern Vtx D_800E4470[];
extern Vtx D_800E44B0[];
extern u8 *D_800E4570[];
+// The exact type here is a little unknown, but s16* works for now
+extern s16 *D_800E5D54[];
+extern s16 *D_800E5D9C[5];
+extern s8 D_800E5DB4[];
+extern s16 *D_800E633C[];
+extern s16 *D_800E672C[2];
#endif
diff --git a/src/ending/ceremony_and_credits.h b/src/ending/ceremony_and_credits.h
index ce05f354f..64fb1fb4a 100644
--- a/src/ending/ceremony_and_credits.h
+++ b/src/ending/ceremony_and_credits.h
@@ -210,6 +210,21 @@ extern f32 D_802856B4;
extern f32 D_802856B8;
extern f32 D_802856BC;
extern f32 D_802856C0;
+extern s32 D_802856C4;
+extern s32 D_802856C8[]; // padding?
+extern s16 sCutsceneShot;
+extern s16 gCutsceneShotTimer;
+extern s32 D_802876D4;
+extern s32 D_802876D8;
+extern s32 D_802876DC; // fake/padding? Or D8 is array?
+extern struct CinematicCamera D_802876E0;
+extern struct struct_80283431 D_80287750[];
+extern struct struct_80283430 D_80287818[];
+extern struct struct_80283430 D_80287998[];
+extern f32 sCutsceneSplineSegmentProgress;
+extern s16 sCutsceneSplineSegment;
+extern s16 D_80287B1E;
+extern s8 D_80287B20;
extern struct struct_80282C40 D_802856DC[];
extern struct struct_80282C40 D_80285718[];
extern struct struct_80282C40 D_80285754[];