From c705bc4a6a207694e2d14dd641e530980b768d54 Mon Sep 17 00:00:00 2001 From: Tyler McGavran Date: Wed, 28 Dec 2022 22:19:11 -0500 Subject: [PATCH] Lots of matches related to the object list (#284) Identified a couple more lists of object list indices, added some comments indicating what they're used for. Those comments are most likely non-exhaustive so there's still some investigation to be done there. Signed-off-by: Taggerung --- .../code_800431B0/func_80051638.s | 103 - .../code_800431B0/func_800517C8.s | 79 - .../code_800431B0/func_80051EF8.s | 46 - .../code_800431B0/func_80051F9C.s | 47 - .../code_800431B0/func_8005285C.s | 37 - .../code_800431B0/func_80052D70.s | 50 - .../code_800431B0/func_8005309C.s | 124 -- .../code_800431B0/func_80053D74.s | 64 - .../code_800431B0/func_800540CC.s | 63 - .../code_800431B0/func_80054324.s | 63 - .../code_800431B0/func_8005457C.s | 62 - .../code_800431B0/func_8005477C.s | 119 -- .../code_800431B0/func_80054AFC.s | 60 - .../code_800431B0/func_80054D00.s | 70 - .../code_800431B0/func_80054EB8.s | 21 - .../code_800431B0/func_80054F04.s | 107 -- .../code_800431B0/func_800550A4.s | 52 - .../code_800431B0/func_80055CCC.s | 107 -- .../code_800431B0/func_80055E68.s | 39 - .../code_800431B0/func_80056188.s | 90 - .../code_800431B0/func_8005669C.s | 130 -- .../code_80071F00/func_80072044.s | 54 - .../code_80071F00/func_80074EE8.s | 66 - .../code_80071F00/func_80074FD8.s | 70 - .../code_80071F00/func_80075304.s | 81 - .../code_80071F00/func_8007542C.s | 90 - .../code_80071F00/func_800755FC.s | 42 - .../code_80071F00/func_80075F98.s | 36 - .../code_80071F00/func_8007614C.s | 20 - .../code_80071F00/func_80076278.s | 27 - .../code_80071F00/func_800762DC.s | 31 - .../code_80071F00/func_8007661C.s | 88 - .../code_80071F00/func_80076828.s | 25 - .../code_80071F00/func_80076958.s | 33 - .../code_80071F00/func_80076AEC.s | 40 - .../code_80071F00/func_80076B84.s | 76 - .../code_80071F00/func_80076D70.s | 23 - .../code_80071F00/func_80076F2C.s | 51 - .../code_80071F00/func_800770F0.s | 20 - .../code_80071F00/func_80077640.s | 51 - .../code_80071F00/func_80077A54.s | 25 - .../code_80071F00/func_80077AB0.s | 28 - .../code_80071F00/func_80077C9C.s | 51 - .../code_80071F00/func_800786EC.s | 47 - .../code_80071F00/func_80078790.s | 47 - .../code_80071F00/func_80078838.s | 53 - .../code_80071F00/func_8007C420.s | 32 - .../code_80071F00/func_8007C550.s | 26 - .../code_80071F00/func_8007D714.s | 36 - .../code_80071F00/func_8007E1F4.s | 100 - .../code_80071F00/func_8007E4C4.s | 20 - .../code_80071F00/func_8007E59C.s | 43 - include/objects.h | 53 + src/actors.h | 1 - src/audio/external.h | 1 + src/code_800431B0.c | 951 +++------- src/code_800431B0.h | 28 + src/code_80057C60.c | 11 +- src/code_80057C60.h | 1 - src/code_8006E9C0.h | 1 - src/code_80071F00.c | 1677 ++++++----------- src/code_80071F00.h | 57 +- 62 files changed, 974 insertions(+), 4772 deletions(-) delete mode 100644 asm/non_matchings/code_800431B0/func_80051638.s delete mode 100644 asm/non_matchings/code_800431B0/func_800517C8.s delete mode 100644 asm/non_matchings/code_800431B0/func_80051EF8.s delete mode 100644 asm/non_matchings/code_800431B0/func_80051F9C.s delete mode 100644 asm/non_matchings/code_800431B0/func_8005285C.s delete mode 100644 asm/non_matchings/code_800431B0/func_80052D70.s delete mode 100644 asm/non_matchings/code_800431B0/func_8005309C.s delete mode 100644 asm/non_matchings/code_800431B0/func_80053D74.s delete mode 100644 asm/non_matchings/code_800431B0/func_800540CC.s delete mode 100644 asm/non_matchings/code_800431B0/func_80054324.s delete mode 100644 asm/non_matchings/code_800431B0/func_8005457C.s delete mode 100644 asm/non_matchings/code_800431B0/func_8005477C.s delete mode 100644 asm/non_matchings/code_800431B0/func_80054AFC.s delete mode 100644 asm/non_matchings/code_800431B0/func_80054D00.s delete mode 100644 asm/non_matchings/code_800431B0/func_80054EB8.s delete mode 100644 asm/non_matchings/code_800431B0/func_80054F04.s delete mode 100644 asm/non_matchings/code_800431B0/func_800550A4.s delete mode 100644 asm/non_matchings/code_800431B0/func_80055CCC.s delete mode 100644 asm/non_matchings/code_800431B0/func_80055E68.s delete mode 100644 asm/non_matchings/code_800431B0/func_80056188.s delete mode 100644 asm/non_matchings/code_800431B0/func_8005669C.s delete mode 100644 asm/non_matchings/code_80071F00/func_80072044.s delete mode 100644 asm/non_matchings/code_80071F00/func_80074EE8.s delete mode 100644 asm/non_matchings/code_80071F00/func_80074FD8.s delete mode 100644 asm/non_matchings/code_80071F00/func_80075304.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007542C.s delete mode 100644 asm/non_matchings/code_80071F00/func_800755FC.s delete mode 100644 asm/non_matchings/code_80071F00/func_80075F98.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007614C.s delete mode 100644 asm/non_matchings/code_80071F00/func_80076278.s delete mode 100644 asm/non_matchings/code_80071F00/func_800762DC.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007661C.s delete mode 100644 asm/non_matchings/code_80071F00/func_80076828.s delete mode 100644 asm/non_matchings/code_80071F00/func_80076958.s delete mode 100644 asm/non_matchings/code_80071F00/func_80076AEC.s delete mode 100644 asm/non_matchings/code_80071F00/func_80076B84.s delete mode 100644 asm/non_matchings/code_80071F00/func_80076D70.s delete mode 100644 asm/non_matchings/code_80071F00/func_80076F2C.s delete mode 100644 asm/non_matchings/code_80071F00/func_800770F0.s delete mode 100644 asm/non_matchings/code_80071F00/func_80077640.s delete mode 100644 asm/non_matchings/code_80071F00/func_80077A54.s delete mode 100644 asm/non_matchings/code_80071F00/func_80077AB0.s delete mode 100644 asm/non_matchings/code_80071F00/func_80077C9C.s delete mode 100644 asm/non_matchings/code_80071F00/func_800786EC.s delete mode 100644 asm/non_matchings/code_80071F00/func_80078790.s delete mode 100644 asm/non_matchings/code_80071F00/func_80078838.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007C420.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007C550.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007D714.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007E1F4.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007E4C4.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007E59C.s diff --git a/asm/non_matchings/code_800431B0/func_80051638.s b/asm/non_matchings/code_800431B0/func_80051638.s deleted file mode 100644 index a561debe8..000000000 --- a/asm/non_matchings/code_800431B0/func_80051638.s +++ /dev/null @@ -1,103 +0,0 @@ -glabel func_80051638 -/* 052238 80051638 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 05223C 8005163C AFB20020 */ sw $s2, 0x20($sp) -/* 052240 80051640 3C128015 */ lui $s2, %hi(gDisplayListHead) # $s2, 0x8015 -/* 052244 80051644 26520298 */ addiu $s2, %lo(gDisplayListHead) # addiu $s2, $s2, 0x298 -/* 052248 80051648 8E430000 */ lw $v1, ($s2) -/* 05224C 8005164C AFB30024 */ sw $s3, 0x24($sp) -/* 052250 80051650 AFBF003C */ sw $ra, 0x3c($sp) -/* 052254 80051654 246E0008 */ addiu $t6, $v1, 8 -/* 052258 80051658 AFBE0038 */ sw $fp, 0x38($sp) -/* 05225C 8005165C AFB70034 */ sw $s7, 0x34($sp) -/* 052260 80051660 AFB60030 */ sw $s6, 0x30($sp) -/* 052264 80051664 AFB5002C */ sw $s5, 0x2c($sp) -/* 052268 80051668 AFB40028 */ sw $s4, 0x28($sp) -/* 05226C 8005166C AFB1001C */ sw $s1, 0x1c($sp) -/* 052270 80051670 AFB00018 */ sw $s0, 0x18($sp) -/* 052274 80051674 AFA40040 */ sw $a0, 0x40($sp) -/* 052278 80051678 AE4E0000 */ sw $t6, ($s2) -/* 05227C 8005167C 3C0F0D00 */ lui $t7, %hi(D_0D0079C8) # $t7, 0xd00 -/* 052280 80051680 3C130600 */ lui $s3, 0x600 -/* 052284 80051684 25EF79C8 */ addiu $t7, %lo(D_0D0079C8) # addiu $t7, $t7, 0x79c8 -/* 052288 80051688 AC6F0004 */ sw $t7, 4($v1) -/* 05228C 8005168C AC730000 */ sw $s3, ($v1) -/* 052290 80051690 8E430000 */ lw $v1, ($s2) -/* 052294 80051694 3C19B600 */ lui $t9, 0xb600 -/* 052298 80051698 24083000 */ li $t0, 12288 -/* 05229C 8005169C 24780008 */ addiu $t8, $v1, 8 -/* 0522A0 800516A0 AE580000 */ sw $t8, ($s2) -/* 0522A4 800516A4 3C040D03 */ lui $a0, %hi(D_0D028DD8) # $a0, 0xd03 -/* 0522A8 800516A8 24848DD8 */ addiu $a0, %lo(D_0D028DD8) # addiu $a0, $a0, -0x7228 -/* 0522AC 800516AC 24050020 */ li $a1, 32 -/* 0522B0 800516B0 24060010 */ li $a2, 16 -/* 0522B4 800516B4 AC680004 */ sw $t0, 4($v1) -/* 0522B8 800516B8 0C010F54 */ jal func_80043D50 -/* 0522BC 800516BC AC790000 */ sw $t9, ($v1) -/* 0522C0 800516C0 3C108019 */ lui $s0, %hi(D_8018C970) # $s0, 0x8019 -/* 0522C4 800516C4 3C1E8019 */ lui $fp, %hi(D_8018D120) # $fp, 0x8019 -/* 0522C8 800516C8 3C158016 */ lui $s5, %hi(D_80165C18) # $s5, 0x8016 -/* 0522CC 800516CC 26B55C18 */ addiu $s5, %lo(D_80165C18) # addiu $s5, $s5, 0x5c18 -/* 0522D0 800516D0 27DED120 */ addiu $fp, %lo(D_8018D120) # addiu $fp, $fp, -0x2ee0 -/* 0522D4 800516D4 2610C970 */ addiu $s0, %lo(D_8018C970) # addiu $s0, $s0, -0x3690 -/* 0522D8 800516D8 24170007 */ li $s7, 7 -/* 0522DC 800516DC 241600E0 */ li $s6, 224 -/* 0522E0 800516E0 2414FFFF */ li $s4, -1 -/* 0522E4 800516E4 8E040000 */ lw $a0, ($s0) -.L800516E8: -/* 0522E8 800516E8 10940017 */ beq $a0, $s4, .L80051748 -/* 0522EC 800516EC 00000000 */ nop -/* 0522F0 800516F0 00960019 */ multu $a0, $s6 -/* 0522F4 800516F4 00004812 */ mflo $t1 -/* 0522F8 800516F8 02A91021 */ addu $v0, $s5, $t1 -/* 0522FC 800516FC 844A00A6 */ lh $t2, 0xa6($v0) -/* 052300 80051700 29410002 */ slti $at, $t2, 2 -/* 052304 80051704 14200010 */ bnez $at, .L80051748 -/* 052308 80051708 00000000 */ nop -/* 05230C 8005170C 904B00D5 */ lbu $t3, 0xd5($v0) -/* 052310 80051710 16EB000D */ bne $s7, $t3, .L80051748 -/* 052314 80051714 00000000 */ nop -/* 052318 80051718 8FCC0000 */ lw $t4, ($fp) -/* 05231C 8005171C 3C110D00 */ lui $s1, %hi(D_0D0069C8) # $s1, 0xd00 -/* 052320 80051720 298102EF */ slti $at, $t4, 0x2ef -/* 052324 80051724 10200008 */ beqz $at, .L80051748 -/* 052328 80051728 00000000 */ nop -/* 05232C 8005172C 0C010C41 */ jal func_80043104 -/* 052330 80051730 263169C8 */ addiu $s1, %lo(D_0D0069C8) # addiu $s1, $s1, 0x69c8 -/* 052334 80051734 8E430000 */ lw $v1, ($s2) -/* 052338 80051738 246D0008 */ addiu $t5, $v1, 8 -/* 05233C 8005173C AE4D0000 */ sw $t5, ($s2) -/* 052340 80051740 AC710004 */ sw $s1, 4($v1) -/* 052344 80051744 AC730000 */ sw $s3, ($v1) -.L80051748: -/* 052348 80051748 3C0E8019 */ lui $t6, %hi(D_8018CA70) # $t6, 0x8019 -/* 05234C 8005174C 25CECA70 */ addiu $t6, %lo(D_8018CA70) # addiu $t6, $t6, -0x3590 -/* 052350 80051750 26100004 */ addiu $s0, $s0, 4 -/* 052354 80051754 560EFFE4 */ bnel $s0, $t6, .L800516E8 -/* 052358 80051758 8E040000 */ lw $a0, ($s0) -/* 05235C 8005175C 8E430000 */ lw $v1, ($s2) -/* 052360 80051760 3C18B700 */ lui $t8, 0xb700 -/* 052364 80051764 24192000 */ li $t9, 8192 -/* 052368 80051768 246F0008 */ addiu $t7, $v1, 8 -/* 05236C 8005176C AE4F0000 */ sw $t7, ($s2) -/* 052370 80051770 AC790004 */ sw $t9, 4($v1) -/* 052374 80051774 AC780000 */ sw $t8, ($v1) -/* 052378 80051778 8E430000 */ lw $v1, ($s2) -/* 05237C 8005177C 3C0A0001 */ lui $t2, (0x00010001 >> 16) # lui $t2, 1 -/* 052380 80051780 354A0001 */ ori $t2, (0x00010001 & 0xFFFF) # ori $t2, $t2, 1 -/* 052384 80051784 24680008 */ addiu $t0, $v1, 8 -/* 052388 80051788 AE480000 */ sw $t0, ($s2) -/* 05238C 8005178C 3C09BB00 */ lui $t1, 0xbb00 -/* 052390 80051790 AC690000 */ sw $t1, ($v1) -/* 052394 80051794 AC6A0004 */ sw $t2, 4($v1) -/* 052398 80051798 8FBF003C */ lw $ra, 0x3c($sp) -/* 05239C 8005179C 8FBE0038 */ lw $fp, 0x38($sp) -/* 0523A0 800517A0 8FB70034 */ lw $s7, 0x34($sp) -/* 0523A4 800517A4 8FB60030 */ lw $s6, 0x30($sp) -/* 0523A8 800517A8 8FB5002C */ lw $s5, 0x2c($sp) -/* 0523AC 800517AC 8FB40028 */ lw $s4, 0x28($sp) -/* 0523B0 800517B0 8FB30024 */ lw $s3, 0x24($sp) -/* 0523B4 800517B4 8FB20020 */ lw $s2, 0x20($sp) -/* 0523B8 800517B8 8FB1001C */ lw $s1, 0x1c($sp) -/* 0523BC 800517BC 8FB00018 */ lw $s0, 0x18($sp) -/* 0523C0 800517C0 03E00008 */ jr $ra -/* 0523C4 800517C4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/non_matchings/code_800431B0/func_800517C8.s b/asm/non_matchings/code_800431B0/func_800517C8.s deleted file mode 100644 index 09c5565fd..000000000 --- a/asm/non_matchings/code_800431B0/func_800517C8.s +++ /dev/null @@ -1,79 +0,0 @@ -glabel func_800517C8 -/* 0523C8 800517C8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 0523CC 800517CC AFB20020 */ sw $s2, 0x20($sp) -/* 0523D0 800517D0 3C128015 */ lui $s2, %hi(gDisplayListHead) # $s2, 0x8015 -/* 0523D4 800517D4 26520298 */ addiu $s2, %lo(gDisplayListHead) # addiu $s2, $s2, 0x298 -/* 0523D8 800517D8 8E430000 */ lw $v1, ($s2) -/* 0523DC 800517DC AFB60030 */ sw $s6, 0x30($sp) -/* 0523E0 800517E0 AFBF0034 */ sw $ra, 0x34($sp) -/* 0523E4 800517E4 246E0008 */ addiu $t6, $v1, 8 -/* 0523E8 800517E8 AFB5002C */ sw $s5, 0x2c($sp) -/* 0523EC 800517EC AFB40028 */ sw $s4, 0x28($sp) -/* 0523F0 800517F0 AFB30024 */ sw $s3, 0x24($sp) -/* 0523F4 800517F4 AFB1001C */ sw $s1, 0x1c($sp) -/* 0523F8 800517F8 AFB00018 */ sw $s0, 0x18($sp) -/* 0523FC 800517FC AE4E0000 */ sw $t6, ($s2) -/* 052400 80051800 3C0F0D00 */ lui $t7, %hi(D_0D007AE0) # $t7, 0xd00 -/* 052404 80051804 3C160600 */ lui $s6, 0x600 -/* 052408 80051808 25EF7AE0 */ addiu $t7, %lo(D_0D007AE0) # addiu $t7, $t7, 0x7ae0 -/* 05240C 8005180C AC6F0004 */ sw $t7, 4($v1) -/* 052410 80051810 AC760000 */ sw $s6, ($v1) -/* 052414 80051814 8E430000 */ lw $v1, ($s2) -/* 052418 80051818 3C19FC62 */ lui $t9, (0xFC627EC4 >> 16) # lui $t9, 0xfc62 -/* 05241C 8005181C 37397EC4 */ ori $t9, (0xFC627EC4 & 0xFFFF) # ori $t9, $t9, 0x7ec4 -/* 052420 80051820 24780008 */ addiu $t8, $v1, 8 -/* 052424 80051824 AE580000 */ sw $t8, ($s2) -/* 052428 80051828 2408F3F9 */ li $t0, -3079 -/* 05242C 8005182C 3C040D03 */ lui $a0, %hi(D_0D0293D8) # $a0, 0xd03 -/* 052430 80051830 248493D8 */ addiu $a0, %lo(D_0D0293D8) # addiu $a0, $a0, -0x6c28 -/* 052434 80051834 24050010 */ li $a1, 16 -/* 052438 80051838 24060010 */ li $a2, 16 -/* 05243C 8005183C AC680004 */ sw $t0, 4($v1) -/* 052440 80051840 0C0113CD */ jal func_80044F34 -/* 052444 80051844 AC790000 */ sw $t9, ($v1) -/* 052448 80051848 3C108019 */ lui $s0, %hi(D_8018C1B0) # $s0, 0x8019 -/* 05244C 8005184C 3C158019 */ lui $s5, %hi(D_8018C278) # $s5, 0x8019 -/* 052450 80051850 3C138016 */ lui $s3, %hi(D_80165C18) # $s3, 0x8016 -/* 052454 80051854 26735C18 */ addiu $s3, %lo(D_80165C18) # addiu $s3, $s3, 0x5c18 -/* 052458 80051858 26B5C278 */ addiu $s5, %lo(D_8018C278) # addiu $s5, $s5, -0x3d88 -/* 05245C 8005185C 2610C1B0 */ addiu $s0, %lo(D_8018C1B0) # addiu $s0, $s0, -0x3e50 -/* 052460 80051860 241400E0 */ li $s4, 224 -/* 052464 80051864 8E040000 */ lw $a0, ($s0) -.L80051868: -/* 052468 80051868 3C110D00 */ lui $s1, %hi(D_0D006980) # $s1, 0xd00 -/* 05246C 8005186C 00940019 */ multu $a0, $s4 -/* 052470 80051870 00004812 */ mflo $t1 -/* 052474 80051874 02695021 */ addu $t2, $s3, $t1 -/* 052478 80051878 854B00A6 */ lh $t3, 0xa6($t2) -/* 05247C 8005187C 29610002 */ slti $at, $t3, 2 -/* 052480 80051880 54200009 */ bnel $at, $zero, .L800518A8 -/* 052484 80051884 26100004 */ addiu $s0, $s0, 4 -/* 052488 80051888 0C010C41 */ jal func_80043104 -/* 05248C 8005188C 26316980 */ addiu $s1, %lo(D_0D006980) # addiu $s1, $s1, 0x6980 -/* 052490 80051890 8E430000 */ lw $v1, ($s2) -/* 052494 80051894 246C0008 */ addiu $t4, $v1, 8 -/* 052498 80051898 AE4C0000 */ sw $t4, ($s2) -/* 05249C 8005189C AC710004 */ sw $s1, 4($v1) -/* 0524A0 800518A0 AC760000 */ sw $s6, ($v1) -/* 0524A4 800518A4 26100004 */ addiu $s0, $s0, 4 -.L800518A8: -/* 0524A8 800518A8 5615FFEF */ bnel $s0, $s5, .L80051868 -/* 0524AC 800518AC 8E040000 */ lw $a0, ($s0) -/* 0524B0 800518B0 8E430000 */ lw $v1, ($s2) -/* 0524B4 800518B4 3C0F0001 */ lui $t7, (0x00010001 >> 16) # lui $t7, 1 -/* 0524B8 800518B8 35EF0001 */ ori $t7, (0x00010001 & 0xFFFF) # ori $t7, $t7, 1 -/* 0524BC 800518BC 246D0008 */ addiu $t5, $v1, 8 -/* 0524C0 800518C0 AE4D0000 */ sw $t5, ($s2) -/* 0524C4 800518C4 3C0EBB00 */ lui $t6, 0xbb00 -/* 0524C8 800518C8 AC6E0000 */ sw $t6, ($v1) -/* 0524CC 800518CC AC6F0004 */ sw $t7, 4($v1) -/* 0524D0 800518D0 8FBF0034 */ lw $ra, 0x34($sp) -/* 0524D4 800518D4 8FB60030 */ lw $s6, 0x30($sp) -/* 0524D8 800518D8 8FB5002C */ lw $s5, 0x2c($sp) -/* 0524DC 800518DC 8FB40028 */ lw $s4, 0x28($sp) -/* 0524E0 800518E0 8FB30024 */ lw $s3, 0x24($sp) -/* 0524E4 800518E4 8FB20020 */ lw $s2, 0x20($sp) -/* 0524E8 800518E8 8FB1001C */ lw $s1, 0x1c($sp) -/* 0524EC 800518EC 8FB00018 */ lw $s0, 0x18($sp) -/* 0524F0 800518F0 03E00008 */ jr $ra -/* 0524F4 800518F4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/code_800431B0/func_80051EF8.s b/asm/non_matchings/code_800431B0/func_80051EF8.s deleted file mode 100644 index 4db750c75..000000000 --- a/asm/non_matchings/code_800431B0/func_80051EF8.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80051EF8 -/* 052AF8 80051EF8 3C0E800E */ lui $t6, %hi(D_800DC5EC) # $t6, 0x800e -/* 052AFC 80051EFC 8DCEC5EC */ lw $t6, %lo(D_800DC5EC)($t6) -/* 052B00 80051F00 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 052B04 80051F04 AFBF0014 */ sw $ra, 0x14($sp) -/* 052B08 80051F08 85CF0028 */ lh $t7, 0x28($t6) -/* 052B0C 80051F0C 241800F0 */ li $t8, 240 -/* 052B10 80051F10 3C02800E */ lui $v0, %hi(gCurrentCourseId) # $v0, 0x800e -/* 052B14 80051F14 8442C5A0 */ lh $v0, %lo(gCurrentCourseId)($v0) -/* 052B18 80051F18 030F2023 */ subu $a0, $t8, $t7 -/* 052B1C 80051F1C 0004CC00 */ sll $t9, $a0, 0x10 -/* 052B20 80051F20 00194403 */ sra $t0, $t9, 0x10 -/* 052B24 80051F24 24010006 */ li $at, 6 -/* 052B28 80051F28 14410005 */ bne $v0, $at, .L80051F40 -/* 052B2C 80051F2C 01002025 */ move $a0, $t0 -/* 052B30 80051F30 2504FFD0 */ addiu $a0, $t0, -0x30 -/* 052B34 80051F34 00044C00 */ sll $t1, $a0, 0x10 -/* 052B38 80051F38 10000012 */ b .L80051F84 -/* 052B3C 80051F3C 00092403 */ sra $a0, $t1, 0x10 -.L80051F40: -/* 052B40 80051F40 24010009 */ li $at, 9 -/* 052B44 80051F44 54410006 */ bnel $v0, $at, .L80051F60 -/* 052B48 80051F48 24010004 */ li $at, 4 -/* 052B4C 80051F4C 2484FFC0 */ addiu $a0, $a0, -0x40 -/* 052B50 80051F50 00045C00 */ sll $t3, $a0, 0x10 -/* 052B54 80051F54 1000000B */ b .L80051F84 -/* 052B58 80051F58 000B2403 */ sra $a0, $t3, 0x10 -/* 052B5C 80051F5C 24010004 */ li $at, 4 -.L80051F60: -/* 052B60 80051F60 54410006 */ bnel $v0, $at, .L80051F7C -/* 052B64 80051F64 2484FFD0 */ addiu $a0, $a0, -0x30 -/* 052B68 80051F68 2484FFC0 */ addiu $a0, $a0, -0x40 -/* 052B6C 80051F6C 00046C00 */ sll $t5, $a0, 0x10 -/* 052B70 80051F70 10000004 */ b .L80051F84 -/* 052B74 80051F74 000D2403 */ sra $a0, $t5, 0x10 -/* 052B78 80051F78 2484FFD0 */ addiu $a0, $a0, -0x30 -.L80051F7C: -/* 052B7C 80051F7C 0004C400 */ sll $t8, $a0, 0x10 -/* 052B80 80051F80 00182403 */ sra $a0, $t8, 0x10 -.L80051F84: -/* 052B84 80051F84 0C0146AF */ jal func_80051ABC -/* 052B88 80051F88 00002825 */ move $a1, $zero -/* 052B8C 80051F8C 8FBF0014 */ lw $ra, 0x14($sp) -/* 052B90 80051F90 27BD0018 */ addiu $sp, $sp, 0x18 -/* 052B94 80051F94 03E00008 */ jr $ra -/* 052B98 80051F98 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80051F9C.s b/asm/non_matchings/code_800431B0/func_80051F9C.s deleted file mode 100644 index 9d05aa508..000000000 --- a/asm/non_matchings/code_800431B0/func_80051F9C.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80051F9C -/* 052B9C 80051F9C 3C0E800E */ lui $t6, %hi(D_800DC5F0) # $t6, 0x800e -/* 052BA0 80051FA0 8DCEC5F0 */ lw $t6, %lo(D_800DC5F0)($t6) -/* 052BA4 80051FA4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 052BA8 80051FA8 AFBF0014 */ sw $ra, 0x14($sp) -/* 052BAC 80051FAC 85CF0028 */ lh $t7, 0x28($t6) -/* 052BB0 80051FB0 241800F0 */ li $t8, 240 -/* 052BB4 80051FB4 3C02800E */ lui $v0, %hi(gCurrentCourseId) # $v0, 0x800e -/* 052BB8 80051FB8 8442C5A0 */ lh $v0, %lo(gCurrentCourseId)($v0) -/* 052BBC 80051FBC 030F2023 */ subu $a0, $t8, $t7 -/* 052BC0 80051FC0 0004CC00 */ sll $t9, $a0, 0x10 -/* 052BC4 80051FC4 00194403 */ sra $t0, $t9, 0x10 -/* 052BC8 80051FC8 24010006 */ li $at, 6 -/* 052BCC 80051FCC 14410005 */ bne $v0, $at, .L80051FE4 -/* 052BD0 80051FD0 01002025 */ move $a0, $t0 -/* 052BD4 80051FD4 2504FFD0 */ addiu $a0, $t0, -0x30 -/* 052BD8 80051FD8 00044C00 */ sll $t1, $a0, 0x10 -/* 052BDC 80051FDC 10000012 */ b .L80052028 -/* 052BE0 80051FE0 00092403 */ sra $a0, $t1, 0x10 -.L80051FE4: -/* 052BE4 80051FE4 24010009 */ li $at, 9 -/* 052BE8 80051FE8 54410006 */ bnel $v0, $at, .L80052004 -/* 052BEC 80051FEC 24010004 */ li $at, 4 -/* 052BF0 80051FF0 2484FFC0 */ addiu $a0, $a0, -0x40 -/* 052BF4 80051FF4 00045C00 */ sll $t3, $a0, 0x10 -/* 052BF8 80051FF8 1000000B */ b .L80052028 -/* 052BFC 80051FFC 000B2403 */ sra $a0, $t3, 0x10 -/* 052C00 80052000 24010004 */ li $at, 4 -.L80052004: -/* 052C04 80052004 54410006 */ bnel $v0, $at, .L80052020 -/* 052C08 80052008 2484FFD0 */ addiu $a0, $a0, -0x30 -/* 052C0C 8005200C 2484FFC0 */ addiu $a0, $a0, -0x40 -/* 052C10 80052010 00046C00 */ sll $t5, $a0, 0x10 -/* 052C14 80052014 10000004 */ b .L80052028 -/* 052C18 80052018 000D2403 */ sra $a0, $t5, 0x10 -/* 052C1C 8005201C 2484FFD0 */ addiu $a0, $a0, -0x30 -.L80052020: -/* 052C20 80052020 0004C400 */ sll $t8, $a0, 0x10 -/* 052C24 80052024 00182403 */ sra $a0, $t8, 0x10 -.L80052028: -/* 052C28 80052028 3C058019 */ lui $a1, %hi(D_8018D1F0) # $a1, 0x8019 -/* 052C2C 8005202C 0C0146AF */ jal func_80051ABC -/* 052C30 80052030 8CA5D1F0 */ lw $a1, %lo(D_8018D1F0)($a1) -/* 052C34 80052034 8FBF0014 */ lw $ra, 0x14($sp) -/* 052C38 80052038 27BD0018 */ addiu $sp, $sp, 0x18 -/* 052C3C 8005203C 03E00008 */ jr $ra -/* 052C40 80052040 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_8005285C.s b/asm/non_matchings/code_800431B0/func_8005285C.s deleted file mode 100644 index 47928aa9b..000000000 --- a/asm/non_matchings/code_800431B0/func_8005285C.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_8005285C -/* 05345C 8005285C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 053460 80052860 AFA40018 */ sw $a0, 0x18($sp) -/* 053464 80052864 8FAE0018 */ lw $t6, 0x18($sp) -/* 053468 80052868 3C18800E */ lui $t8, %hi(gPlayerOne) # $t8, 0x800e -/* 05346C 8005286C 8F18C4DC */ lw $t8, %lo(gPlayerOne)($t8) -/* 053470 80052870 000E78C0 */ sll $t7, $t6, 3 -/* 053474 80052874 01EE7823 */ subu $t7, $t7, $t6 -/* 053478 80052878 000F7900 */ sll $t7, $t7, 4 -/* 05347C 8005287C 01EE7823 */ subu $t7, $t7, $t6 -/* 053480 80052880 000F7880 */ sll $t7, $t7, 2 -/* 053484 80052884 01EE7823 */ subu $t7, $t7, $t6 -/* 053488 80052888 000F78C0 */ sll $t7, $t7, 3 -/* 05348C 8005288C AFBF0014 */ sw $ra, 0x14($sp) -/* 053490 80052890 01F81021 */ addu $v0, $t7, $t8 -/* 053494 80052894 C4440014 */ lwc1 $f4, 0x14($v0) -/* 053498 80052898 3C048018 */ lui $a0, %hi(D_80183E40) # $a0, 0x8018 -/* 05349C 8005289C 24843E40 */ addiu $a0, %lo(D_80183E40) # addiu $a0, $a0, 0x3e40 -/* 0534A0 800528A0 E4840000 */ swc1 $f4, ($a0) -/* 0534A4 800528A4 C4460018 */ lwc1 $f6, 0x18($v0) -/* 0534A8 800528A8 3C058018 */ lui $a1, %hi(D_80183E80) # $a1, 0x8018 -/* 0534AC 800528AC 24A53E80 */ addiu $a1, %lo(D_80183E80) # addiu $a1, $a1, 0x3e80 -/* 0534B0 800528B0 E4860004 */ swc1 $f6, 4($a0) -/* 0534B4 800528B4 C448001C */ lwc1 $f8, 0x1c($v0) -/* 0534B8 800528B8 3C063CA3 */ lui $a2, (0x3CA3D70A >> 16) # lui $a2, 0x3ca3 -/* 0534BC 800528BC 3C070600 */ lui $a3, %hi(D_06007218) # $a3, 0x600 -/* 0534C0 800528C0 A4A00000 */ sh $zero, ($a1) -/* 0534C4 800528C4 A4A00002 */ sh $zero, 2($a1) -/* 0534C8 800528C8 A4A00004 */ sh $zero, 4($a1) -/* 0534CC 800528CC 24E77218 */ addiu $a3, %lo(D_06007218) # addiu $a3, $a3, 0x7218 -/* 0534D0 800528D0 34C6D70A */ ori $a2, (0x3CA3D70A & 0xFFFF) # ori $a2, $a2, 0xd70a -/* 0534D4 800528D4 0C010D40 */ jal func_80043500 -/* 0534D8 800528D8 E4880008 */ swc1 $f8, 8($a0) -/* 0534DC 800528DC 8FBF0014 */ lw $ra, 0x14($sp) -/* 0534E0 800528E0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0534E4 800528E4 03E00008 */ jr $ra -/* 0534E8 800528E8 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80052D70.s b/asm/non_matchings/code_800431B0/func_80052D70.s deleted file mode 100644 index bf818e6ad..000000000 --- a/asm/non_matchings/code_800431B0/func_80052D70.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_80052D70 -/* 053970 80052D70 000470C0 */ sll $t6, $a0, 3 -/* 053974 80052D74 01C47023 */ subu $t6, $t6, $a0 -/* 053978 80052D78 000E7100 */ sll $t6, $t6, 4 -/* 05397C 80052D7C 01C47023 */ subu $t6, $t6, $a0 -/* 053980 80052D80 000E7080 */ sll $t6, $t6, 2 -/* 053984 80052D84 3C0F800E */ lui $t7, %hi(gPlayerOne) # $t7, 0x800e -/* 053988 80052D88 8DEFC4DC */ lw $t7, %lo(gPlayerOne)($t7) -/* 05398C 80052D8C 01C47023 */ subu $t6, $t6, $a0 -/* 053990 80052D90 0004C080 */ sll $t8, $a0, 2 -/* 053994 80052D94 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 053998 80052D98 000E70C0 */ sll $t6, $t6, 3 -/* 05399C 80052D9C 3C048018 */ lui $a0, %hi(D_80183DB8) # 0x8018 -/* 0539A0 80052DA0 AFBF001C */ sw $ra, 0x1c($sp) -/* 0539A4 80052DA4 00982021 */ addu $a0, $a0, $t8 -/* 0539A8 80052DA8 01CF1821 */ addu $v1, $t6, $t7 -/* 0539AC 80052DAC 8C843DB8 */ lw $a0, %lo(D_80183DB8)($a0) # 0x3db8($a0) -/* 0539B0 80052DB0 AFA30020 */ sw $v1, 0x20($sp) -/* 0539B4 80052DB4 0C01C8C8 */ jal func_80072320 -/* 0539B8 80052DB8 24050008 */ li $a1, 8 -/* 0539BC 80052DBC 10400018 */ beqz $v0, .L80052E20 -/* 0539C0 80052DC0 8FA30020 */ lw $v1, 0x20($sp) -/* 0539C4 80052DC4 C4640014 */ lwc1 $f4, 0x14($v1) -/* 0539C8 80052DC8 3C048018 */ lui $a0, %hi(D_80183E40) # $a0, 0x8018 -/* 0539CC 80052DCC 24843E40 */ addiu $a0, %lo(D_80183E40) # addiu $a0, $a0, 0x3e40 -/* 0539D0 80052DD0 E4840000 */ swc1 $f4, ($a0) -/* 0539D4 80052DD4 C4660074 */ lwc1 $f6, 0x74($v1) -/* 0539D8 80052DD8 3C01401A */ li $at, 0x401A0000 # 2.406250 -/* 0539DC 80052DDC 44815800 */ mtc1 $at, $f11 -/* 0539E0 80052DE0 44805000 */ mtc1 $zero, $f10 -/* 0539E4 80052DE4 46003221 */ cvt.d.s $f8, $f6 -/* 0539E8 80052DE8 3C058018 */ lui $a1, %hi(D_80183E80) # $a1, 0x8018 -/* 0539EC 80052DEC 462A4401 */ sub.d $f16, $f8, $f10 -/* 0539F0 80052DF0 3C063CA3 */ lui $a2, (0x3CA3D70A >> 16) # lui $a2, 0x3ca3 -/* 0539F4 80052DF4 3C070600 */ lui $a3, %hi(D_06007218) # $a3, 0x600 -/* 0539F8 80052DF8 241900FF */ li $t9, 255 -/* 0539FC 80052DFC 462084A0 */ cvt.s.d $f18, $f16 -/* 053A00 80052E00 24E77218 */ addiu $a3, %lo(D_06007218) # addiu $a3, $a3, 0x7218 -/* 053A04 80052E04 34C6D70A */ ori $a2, (0x3CA3D70A & 0xFFFF) # ori $a2, $a2, 0xd70a -/* 053A08 80052E08 24A53E80 */ addiu $a1, %lo(D_80183E80) # addiu $a1, $a1, 0x3e80 -/* 053A0C 80052E0C E4920004 */ swc1 $f18, 4($a0) -/* 053A10 80052E10 C464001C */ lwc1 $f4, 0x1c($v1) -/* 053A14 80052E14 AFB90010 */ sw $t9, 0x10($sp) -/* 053A18 80052E18 0C010D68 */ jal func_800435A0 -/* 053A1C 80052E1C E4840008 */ swc1 $f4, 8($a0) -.L80052E20: -/* 053A20 80052E20 8FBF001C */ lw $ra, 0x1c($sp) -/* 053A24 80052E24 27BD0028 */ addiu $sp, $sp, 0x28 -/* 053A28 80052E28 03E00008 */ jr $ra -/* 053A2C 80052E2C 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_8005309C.s b/asm/non_matchings/code_800431B0/func_8005309C.s deleted file mode 100644 index 20ba8b1c3..000000000 --- a/asm/non_matchings/code_800431B0/func_8005309C.s +++ /dev/null @@ -1,124 +0,0 @@ -glabel func_8005309C -/* 053C9C 8005309C 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 053CA0 800530A0 00047880 */ sll $t7, $a0, 2 -/* 053CA4 800530A4 01E47823 */ subu $t7, $t7, $a0 -/* 053CA8 800530A8 3C18800E */ lui $t8, %hi(camera1) # $t8, 0x800e -/* 053CAC 800530AC 8F18DB40 */ lw $t8, %lo(camera1)($t8) -/* 053CB0 800530B0 000F78C0 */ sll $t7, $t7, 3 -/* 053CB4 800530B4 AFB60048 */ sw $s6, 0x48($sp) -/* 053CB8 800530B8 AFB3003C */ sw $s3, 0x3c($sp) -/* 053CBC 800530BC AFB20038 */ sw $s2, 0x38($sp) -/* 053CC0 800530C0 01E47823 */ subu $t7, $t7, $a0 -/* 053CC4 800530C4 AFBE0050 */ sw $fp, 0x50($sp) -/* 053CC8 800530C8 AFB7004C */ sw $s7, 0x4c($sp) -/* 053CCC 800530CC AFB40040 */ sw $s4, 0x40($sp) -/* 053CD0 800530D0 000F78C0 */ sll $t7, $t7, 3 -/* 053CD4 800530D4 3C128018 */ lui $s2, %hi(D_80183E80) # $s2, 0x8018 -/* 053CD8 800530D8 3C138018 */ lui $s3, %hi(D_80183EA0) # $s3, 0x8018 -/* 053CDC 800530DC 3C168016 */ lui $s6, %hi(D_80165C18) # $s6, 0x8016 -/* 053CE0 800530E0 AFBF0054 */ sw $ra, 0x54($sp) -/* 053CE4 800530E4 AFB50044 */ sw $s5, 0x44($sp) -/* 053CE8 800530E8 AFB10034 */ sw $s1, 0x34($sp) -/* 053CEC 800530EC AFB00030 */ sw $s0, 0x30($sp) -/* 053CF0 800530F0 AFA40058 */ sw $a0, 0x58($sp) -/* 053CF4 800530F4 26D65C18 */ addiu $s6, %lo(D_80165C18) # addiu $s6, $s6, 0x5c18 -/* 053CF8 800530F8 26733EA0 */ addiu $s3, %lo(D_80183EA0) # addiu $s3, $s3, 0x3ea0 -/* 053CFC 800530FC 26523E80 */ addiu $s2, %lo(D_80183E80) # addiu $s2, $s2, 0x3e80 -/* 053D00 80053100 0000A025 */ move $s4, $zero -/* 053D04 80053104 241700E0 */ li $s7, 224 -/* 053D08 80053108 01F8F021 */ addu $fp, $t7, $t8 -.L8005310C: -/* 053D0C 8005310C 8E710000 */ lw $s1, ($s3) -/* 053D10 80053110 8FA50058 */ lw $a1, 0x58($sp) -/* 053D14 80053114 24062AAB */ li $a2, 10923 -/* 053D18 80053118 02370019 */ multu $s1, $s7 -/* 053D1C 8005311C 02202025 */ move $a0, $s1 -/* 053D20 80053120 0000C812 */ mflo $t9 -/* 053D24 80053124 02D98021 */ addu $s0, $s6, $t9 -/* 053D28 80053128 860800A6 */ lh $t0, 0xa6($s0) -/* 053D2C 8005312C 29010002 */ slti $at, $t0, 2 -/* 053D30 80053130 14200041 */ bnez $at, .L80053238 -/* 053D34 80053134 00000000 */ nop -/* 053D38 80053138 0C0228D9 */ jal func_8008A364 -/* 053D3C 8005313C 24070258 */ li $a3, 600 -/* 053D40 80053140 02202025 */ move $a0, $s1 -/* 053D44 80053144 0C01C88F */ jal func_8007223C -/* 053D48 80053148 3C050004 */ lui $a1, 4 -/* 053D4C 8005314C 1040003A */ beqz $v0, .L80053238 -/* 053D50 80053150 03C03025 */ move $a2, $fp -/* 053D54 80053154 960900B2 */ lhu $t1, 0xb2($s0) -/* 053D58 80053158 3C0A8018 */ lui $t2, %hi(D_80183F28) # $t2, 0x8018 -/* 053D5C 8005315C 254A3F28 */ addiu $t2, %lo(D_80183F28) # addiu $t2, $t2, 0x3f28 -/* 053D60 80053160 028AA821 */ addu $s5, $s4, $t2 -/* 053D64 80053164 C60C0004 */ lwc1 $f12, 4($s0) -/* 053D68 80053168 C60E000C */ lwc1 $f14, 0xc($s0) -/* 053D6C 8005316C 0C01062B */ jal func_800418AC -/* 053D70 80053170 A6490000 */ sh $t1, ($s2) -/* 053D74 80053174 960B00B6 */ lhu $t3, 0xb6($s0) -/* 053D78 80053178 A6420002 */ sh $v0, 2($s2) -/* 053D7C 8005317C 02202025 */ move $a0, $s1 -/* 053D80 80053180 24050010 */ li $a1, 16 -/* 053D84 80053184 0C01C88F */ jal func_8007223C -/* 053D88 80053188 A64B0004 */ sh $t3, 4($s2) -/* 053D8C 8005318C 10400011 */ beqz $v0, .L800531D4 -/* 053D90 80053190 26040004 */ addiu $a0, $s0, 4 -/* 053D94 80053194 8E0C0064 */ lw $t4, 0x64($s0) -/* 053D98 80053198 8E0D0074 */ lw $t5, 0x74($s0) -/* 053D9C 8005319C 240E0040 */ li $t6, 64 -/* 053DA0 800531A0 240F0040 */ li $t7, 64 -/* 053DA4 800531A4 24180040 */ li $t8, 64 -/* 053DA8 800531A8 24190020 */ li $t9, 32 -/* 053DAC 800531AC AFB90024 */ sw $t9, 0x24($sp) -/* 053DB0 800531B0 AFB80020 */ sw $t8, 0x20($sp) -/* 053DB4 800531B4 AFAF001C */ sw $t7, 0x1c($sp) -/* 053DB8 800531B8 AFAE0018 */ sw $t6, 0x18($sp) -/* 053DBC 800531BC 02402825 */ move $a1, $s2 -/* 053DC0 800531C0 8E060000 */ lw $a2, ($s0) -/* 053DC4 800531C4 8E070060 */ lw $a3, 0x60($s0) -/* 053DC8 800531C8 AFAC0010 */ sw $t4, 0x10($sp) -/* 053DCC 800531CC 0C01202D */ jal func_800480B4 -/* 053DD0 800531D0 AFAD0014 */ sw $t5, 0x14($sp) -.L800531D4: -/* 053DD4 800531D4 8EB10000 */ lw $s1, ($s5) -/* 053DD8 800531D8 240D0040 */ li $t5, 64 -/* 053DDC 800531DC 240E0040 */ li $t6, 64 -/* 053DE0 800531E0 02370019 */ multu $s1, $s7 -/* 053DE4 800531E4 240F0040 */ li $t7, 64 -/* 053DE8 800531E8 24180020 */ li $t8, 32 -/* 053DEC 800531EC AFB80024 */ sw $t8, 0x24($sp) -/* 053DF0 800531F0 AFAF0020 */ sw $t7, 0x20($sp) -/* 053DF4 800531F4 AFAE001C */ sw $t6, 0x1c($sp) -/* 053DF8 800531F8 AFAD0018 */ sw $t5, 0x18($sp) -/* 053DFC 800531FC 02402825 */ move $a1, $s2 -/* 053E00 80053200 00004012 */ mflo $t0 -/* 053E04 80053204 02C88021 */ addu $s0, $s6, $t0 -/* 053E08 80053208 960900B2 */ lhu $t1, 0xb2($s0) -/* 053E0C 8005320C 960A00B6 */ lhu $t2, 0xb6($s0) -/* 053E10 80053210 8E0B0064 */ lw $t3, 0x64($s0) -/* 053E14 80053214 8E0C0074 */ lw $t4, 0x74($s0) -/* 053E18 80053218 26040004 */ addiu $a0, $s0, 4 -/* 053E1C 8005321C 8E060000 */ lw $a2, ($s0) -/* 053E20 80053220 8E070060 */ lw $a3, 0x60($s0) -/* 053E24 80053224 A6490000 */ sh $t1, ($s2) -/* 053E28 80053228 A64A0004 */ sh $t2, 4($s2) -/* 053E2C 8005322C AFAB0010 */ sw $t3, 0x10($sp) -/* 053E30 80053230 0C01202D */ jal func_800480B4 -/* 053E34 80053234 AFAC0014 */ sw $t4, 0x14($sp) -.L80053238: -/* 053E38 80053238 3C198018 */ lui $t9, %hi(D_80183EEC) # $t9, 0x8018 -/* 053E3C 8005323C 27393EEC */ addiu $t9, %lo(D_80183EEC) # addiu $t9, $t9, 0x3eec -/* 053E40 80053240 26730004 */ addiu $s3, $s3, 4 -/* 053E44 80053244 1679FFB1 */ bne $s3, $t9, .L8005310C -/* 053E48 80053248 26940004 */ addiu $s4, $s4, 4 -/* 053E4C 8005324C 8FBF0054 */ lw $ra, 0x54($sp) -/* 053E50 80053250 8FB00030 */ lw $s0, 0x30($sp) -/* 053E54 80053254 8FB10034 */ lw $s1, 0x34($sp) -/* 053E58 80053258 8FB20038 */ lw $s2, 0x38($sp) -/* 053E5C 8005325C 8FB3003C */ lw $s3, 0x3c($sp) -/* 053E60 80053260 8FB40040 */ lw $s4, 0x40($sp) -/* 053E64 80053264 8FB50044 */ lw $s5, 0x44($sp) -/* 053E68 80053268 8FB60048 */ lw $s6, 0x48($sp) -/* 053E6C 8005326C 8FB7004C */ lw $s7, 0x4c($sp) -/* 053E70 80053270 8FBE0050 */ lw $fp, 0x50($sp) -/* 053E74 80053274 03E00008 */ jr $ra -/* 053E78 80053278 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/non_matchings/code_800431B0/func_80053D74.s b/asm/non_matchings/code_800431B0/func_80053D74.s deleted file mode 100644 index bfac9153c..000000000 --- a/asm/non_matchings/code_800431B0/func_80053D74.s +++ /dev/null @@ -1,64 +0,0 @@ -glabel func_80053D74 -/* 054974 80053D74 3C0E8019 */ lui $t6, %hi(D_8018D120) # $t6, 0x8019 -/* 054978 80053D78 8DCED120 */ lw $t6, %lo(D_8018D120)($t6) -/* 05497C 80053D7C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 054980 80053D80 AFBF0024 */ sw $ra, 0x24($sp) -/* 054984 80053D84 29C102EF */ slti $at, $t6, 0x2ef -/* 054988 80053D88 AFA5003C */ sw $a1, 0x3c($sp) -/* 05498C 80053D8C 10200033 */ beqz $at, .L80053E5C -/* 054990 80053D90 AFA60040 */ sw $a2, 0x40($sp) -/* 054994 80053D94 000478C0 */ sll $t7, $a0, 3 -/* 054998 80053D98 01E47823 */ subu $t7, $t7, $a0 -/* 05499C 80053D9C 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 0549A0 80053DA0 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 0549A4 80053DA4 000F7940 */ sll $t7, $t7, 5 -/* 0549A8 80053DA8 01F81021 */ addu $v0, $t7, $t8 -/* 0549AC 80053DAC 84590090 */ lh $t9, 0x90($v0) -/* 0549B0 80053DB0 3C058018 */ lui $a1, %hi(D_80183E80) # $a1, 0x8018 -/* 0549B4 80053DB4 34018000 */ li $at, 32768 -/* 0549B8 80053DB8 24A53E80 */ addiu $a1, %lo(D_80183E80) # addiu $a1, $a1, 0x3e80 -/* 0549BC 80053DBC 03214021 */ addu $t0, $t9, $at -/* 0549C0 80053DC0 A4A80004 */ sh $t0, 4($a1) -/* 0549C4 80053DC4 24440004 */ addiu $a0, $v0, 4 -/* 0549C8 80053DC8 8C460000 */ lw $a2, ($v0) -/* 0549CC 80053DCC 0C010B80 */ jal func_80042E00 -/* 0549D0 80053DD0 AFA20028 */ sw $v0, 0x28($sp) -/* 0549D4 80053DD4 8FA20028 */ lw $v0, 0x28($sp) -/* 0549D8 80053DD8 8449008C */ lh $t1, 0x8c($v0) -/* 0549DC 80053DDC 844A008E */ lh $t2, 0x8e($v0) -/* 0549E0 80053DE0 844B00A0 */ lh $t3, 0xa0($v0) -/* 0549E4 80053DE4 84440084 */ lh $a0, 0x84($v0) -/* 0549E8 80053DE8 84450086 */ lh $a1, 0x86($v0) -/* 0549EC 80053DEC 84460088 */ lh $a2, 0x88($v0) -/* 0549F0 80053DF0 8447008A */ lh $a3, 0x8a($v0) -/* 0549F4 80053DF4 AFA90010 */ sw $t1, 0x10($sp) -/* 0549F8 80053DF8 AFAA0014 */ sw $t2, 0x14($sp) -/* 0549FC 80053DFC 0C012C72 */ jal func_8004B1C8 -/* 054A00 80053E00 AFAB0018 */ sw $t3, 0x18($sp) -/* 054A04 80053E04 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 054A08 80053E08 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 054A0C 80053E0C 8CA20000 */ lw $v0, ($a1) -/* 054A10 80053E10 3C0D0400 */ lui $t5, (0x0400103F >> 16) # lui $t5, 0x400 -/* 054A14 80053E14 35AD103F */ ori $t5, (0x0400103F & 0xFFFF) # ori $t5, $t5, 0x103f -/* 054A18 80053E18 244C0008 */ addiu $t4, $v0, 8 -/* 054A1C 80053E1C ACAC0000 */ sw $t4, ($a1) -/* 054A20 80053E20 AC4D0000 */ sw $t5, ($v0) -/* 054A24 80053E24 8FAE0040 */ lw $t6, 0x40($sp) -/* 054A28 80053E28 3C180D00 */ lui $t8, %hi(D_0D0060B0) # $t8, 0xd00 -/* 054A2C 80053E2C 271860B0 */ addiu $t8, %lo(D_0D0060B0) # addiu $t8, $t8, 0x60b0 -/* 054A30 80053E30 000E7900 */ sll $t7, $t6, 4 -/* 054A34 80053E34 01F8C821 */ addu $t9, $t7, $t8 -/* 054A38 80053E38 AC590004 */ sw $t9, 4($v0) -/* 054A3C 80053E3C 8CA20000 */ lw $v0, ($a1) -/* 054A40 80053E40 3C0A0D00 */ lui $t2, %hi(D_0D006940) # $t2, 0xd00 -/* 054A44 80053E44 254A6940 */ addiu $t2, %lo(D_0D006940) # addiu $t2, $t2, 0x6940 -/* 054A48 80053E48 24480008 */ addiu $t0, $v0, 8 -/* 054A4C 80053E4C ACA80000 */ sw $t0, ($a1) -/* 054A50 80053E50 3C090600 */ lui $t1, 0x600 -/* 054A54 80053E54 AC490000 */ sw $t1, ($v0) -/* 054A58 80053E58 AC4A0004 */ sw $t2, 4($v0) -.L80053E5C: -/* 054A5C 80053E5C 8FBF0024 */ lw $ra, 0x24($sp) -/* 054A60 80053E60 27BD0038 */ addiu $sp, $sp, 0x38 -/* 054A64 80053E64 03E00008 */ jr $ra -/* 054A68 80053E68 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_800540CC.s b/asm/non_matchings/code_800431B0/func_800540CC.s deleted file mode 100644 index 12768b960..000000000 --- a/asm/non_matchings/code_800431B0/func_800540CC.s +++ /dev/null @@ -1,63 +0,0 @@ -glabel func_800540CC -/* 054CCC 800540CC 00057080 */ sll $t6, $a1, 2 -/* 054CD0 800540D0 01C57023 */ subu $t6, $t6, $a1 -/* 054CD4 800540D4 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e -/* 054CD8 800540D8 8DEFDB40 */ lw $t7, %lo(camera1)($t7) -/* 054CDC 800540DC 000E70C0 */ sll $t6, $t6, 3 -/* 054CE0 800540E0 01C57023 */ subu $t6, $t6, $a1 -/* 054CE4 800540E4 000E70C0 */ sll $t6, $t6, 3 -/* 054CE8 800540E8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 054CEC 800540EC 2401FFFF */ li $at, -1 -/* 054CF0 800540F0 01CFC021 */ addu $t8, $t6, $t7 -/* 054CF4 800540F4 AFBF0024 */ sw $ra, 0x24($sp) -/* 054CF8 800540F8 1081002C */ beq $a0, $at, .L800541AC -/* 054CFC 800540FC AFB8002C */ sw $t8, 0x2c($sp) -/* 054D00 80054100 0004C8C0 */ sll $t9, $a0, 3 -/* 054D04 80054104 0324C823 */ subu $t9, $t9, $a0 -/* 054D08 80054108 3C088016 */ lui $t0, %hi(D_80165C18) # $t0, 0x8016 -/* 054D0C 8005410C 25085C18 */ addiu $t0, %lo(D_80165C18) # addiu $t0, $t0, 0x5c18 -/* 054D10 80054110 0019C940 */ sll $t9, $t9, 5 -/* 054D14 80054114 03281821 */ addu $v1, $t9, $t0 -/* 054D18 80054118 846900A6 */ lh $t1, 0xa6($v1) -/* 054D1C 8005411C 29210002 */ slti $at, $t1, 2 -/* 054D20 80054120 54200023 */ bnel $at, $zero, .L800541B0 -/* 054D24 80054124 8FBF0024 */ lw $ra, 0x24($sp) -/* 054D28 80054128 906A00D5 */ lbu $t2, 0xd5($v1) -/* 054D2C 8005412C 24010001 */ li $at, 1 -/* 054D30 80054130 3C0B8019 */ lui $t3, %hi(D_8018D120) # $t3, 0x8019 -/* 054D34 80054134 5541001E */ bnel $t2, $at, .L800541B0 -/* 054D38 80054138 8FBF0024 */ lw $ra, 0x24($sp) -/* 054D3C 8005413C 8D6BD120 */ lw $t3, %lo(D_8018D120)($t3) -/* 054D40 80054140 00003825 */ move $a3, $zero -/* 054D44 80054144 296102EF */ slti $at, $t3, 0x2ef -/* 054D48 80054148 50200019 */ beql $at, $zero, .L800541B0 -/* 054D4C 8005414C 8FBF0024 */ lw $ra, 0x24($sp) -/* 054D50 80054150 846400A4 */ lh $a0, 0xa4($v1) -/* 054D54 80054154 846C00A0 */ lh $t4, 0xa0($v1) -/* 054D58 80054158 AFA00010 */ sw $zero, 0x10($sp) -/* 054D5C 8005415C AFA00014 */ sw $zero, 0x14($sp) -/* 054D60 80054160 AFA30028 */ sw $v1, 0x28($sp) -/* 054D64 80054164 00802825 */ move $a1, $a0 -/* 054D68 80054168 00803025 */ move $a2, $a0 -/* 054D6C 8005416C 0C012C72 */ jal func_8004B1C8 -/* 054D70 80054170 AFAC0018 */ sw $t4, 0x18($sp) -/* 054D74 80054174 8FA30028 */ lw $v1, 0x28($sp) -/* 054D78 80054178 8FA6002C */ lw $a2, 0x2c($sp) -/* 054D7C 8005417C C46C0004 */ lwc1 $f12, 4($v1) -/* 054D80 80054180 0C01062B */ jal func_800418AC -/* 054D84 80054184 C46E000C */ lwc1 $f14, 0xc($v1) -/* 054D88 80054188 8FA30028 */ lw $v1, 0x28($sp) -/* 054D8C 8005418C 3C058018 */ lui $a1, %hi(D_80183E80) # $a1, 0x8018 -/* 054D90 80054190 24A53E80 */ addiu $a1, %lo(D_80183E80) # addiu $a1, $a1, 0x3e80 -/* 054D94 80054194 3C070D00 */ lui $a3, %hi(D_0D005AE0) # $a3, 0xd00 -/* 054D98 80054198 A4A20002 */ sh $v0, 2($a1) -/* 054D9C 8005419C 24E75AE0 */ addiu $a3, %lo(D_0D005AE0) # addiu $a3, $a3, 0x5ae0 -/* 054DA0 800541A0 24640004 */ addiu $a0, $v1, 4 -/* 054DA4 800541A4 0C010C6C */ jal func_800431B0 -/* 054DA8 800541A8 8C660000 */ lw $a2, ($v1) -.L800541AC: -/* 054DAC 800541AC 8FBF0024 */ lw $ra, 0x24($sp) -.L800541B0: -/* 054DB0 800541B0 27BD0030 */ addiu $sp, $sp, 0x30 -/* 054DB4 800541B4 03E00008 */ jr $ra -/* 054DB8 800541B8 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80054324.s b/asm/non_matchings/code_800431B0/func_80054324.s deleted file mode 100644 index d199399db..000000000 --- a/asm/non_matchings/code_800431B0/func_80054324.s +++ /dev/null @@ -1,63 +0,0 @@ -glabel func_80054324 -/* 054F24 80054324 00057080 */ sll $t6, $a1, 2 -/* 054F28 80054328 01C57023 */ subu $t6, $t6, $a1 -/* 054F2C 8005432C 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e -/* 054F30 80054330 8DEFDB40 */ lw $t7, %lo(camera1)($t7) -/* 054F34 80054334 000E70C0 */ sll $t6, $t6, 3 -/* 054F38 80054338 01C57023 */ subu $t6, $t6, $a1 -/* 054F3C 8005433C 000E70C0 */ sll $t6, $t6, 3 -/* 054F40 80054340 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 054F44 80054344 2401FFFF */ li $at, -1 -/* 054F48 80054348 01CFC021 */ addu $t8, $t6, $t7 -/* 054F4C 8005434C AFBF0024 */ sw $ra, 0x24($sp) -/* 054F50 80054350 1081002C */ beq $a0, $at, .L80054404 -/* 054F54 80054354 AFB8002C */ sw $t8, 0x2c($sp) -/* 054F58 80054358 0004C8C0 */ sll $t9, $a0, 3 -/* 054F5C 8005435C 0324C823 */ subu $t9, $t9, $a0 -/* 054F60 80054360 3C088016 */ lui $t0, %hi(D_80165C18) # $t0, 0x8016 -/* 054F64 80054364 25085C18 */ addiu $t0, %lo(D_80165C18) # addiu $t0, $t0, 0x5c18 -/* 054F68 80054368 0019C940 */ sll $t9, $t9, 5 -/* 054F6C 8005436C 03281821 */ addu $v1, $t9, $t0 -/* 054F70 80054370 846900A6 */ lh $t1, 0xa6($v1) -/* 054F74 80054374 29210002 */ slti $at, $t1, 2 -/* 054F78 80054378 54200023 */ bnel $at, $zero, .L80054408 -/* 054F7C 8005437C 8FBF0024 */ lw $ra, 0x24($sp) -/* 054F80 80054380 906A00D5 */ lbu $t2, 0xd5($v1) -/* 054F84 80054384 24010006 */ li $at, 6 -/* 054F88 80054388 3C0B8019 */ lui $t3, %hi(D_8018D120) # $t3, 0x8019 -/* 054F8C 8005438C 5541001E */ bnel $t2, $at, .L80054408 -/* 054F90 80054390 8FBF0024 */ lw $ra, 0x24($sp) -/* 054F94 80054394 8D6BD120 */ lw $t3, %lo(D_8018D120)($t3) -/* 054F98 80054398 296102EF */ slti $at, $t3, 0x2ef -/* 054F9C 8005439C 5020001A */ beql $at, $zero, .L80054408 -/* 054FA0 800543A0 8FBF0024 */ lw $ra, 0x24($sp) -/* 054FA4 800543A4 846400A4 */ lh $a0, 0xa4($v1) -/* 054FA8 800543A8 846700A2 */ lh $a3, 0xa2($v1) -/* 054FAC 800543AC 846C00A0 */ lh $t4, 0xa0($v1) -/* 054FB0 800543B0 AFA30028 */ sw $v1, 0x28($sp) -/* 054FB4 800543B4 00802825 */ move $a1, $a0 -/* 054FB8 800543B8 00803025 */ move $a2, $a0 -/* 054FBC 800543BC AFA70010 */ sw $a3, 0x10($sp) -/* 054FC0 800543C0 AFA70014 */ sw $a3, 0x14($sp) -/* 054FC4 800543C4 0C012C72 */ jal func_8004B1C8 -/* 054FC8 800543C8 AFAC0018 */ sw $t4, 0x18($sp) -/* 054FCC 800543CC 8FA30028 */ lw $v1, 0x28($sp) -/* 054FD0 800543D0 8FA6002C */ lw $a2, 0x2c($sp) -/* 054FD4 800543D4 C46C0004 */ lwc1 $f12, 4($v1) -/* 054FD8 800543D8 0C01062B */ jal func_800418AC -/* 054FDC 800543DC C46E000C */ lwc1 $f14, 0xc($v1) -/* 054FE0 800543E0 8FA30028 */ lw $v1, 0x28($sp) -/* 054FE4 800543E4 3C058018 */ lui $a1, %hi(D_80183E80) # $a1, 0x8018 -/* 054FE8 800543E8 24A53E80 */ addiu $a1, %lo(D_80183E80) # addiu $a1, $a1, 0x3e80 -/* 054FEC 800543EC 3C070D00 */ lui $a3, %hi(D_0D005AE0) # $a3, 0xd00 -/* 054FF0 800543F0 A4A20002 */ sh $v0, 2($a1) -/* 054FF4 800543F4 24E75AE0 */ addiu $a3, %lo(D_0D005AE0) # addiu $a3, $a3, 0x5ae0 -/* 054FF8 800543F8 24640004 */ addiu $a0, $v1, 4 -/* 054FFC 800543FC 0C010C6C */ jal func_800431B0 -/* 055000 80054400 8C660000 */ lw $a2, ($v1) -.L80054404: -/* 055004 80054404 8FBF0024 */ lw $ra, 0x24($sp) -.L80054408: -/* 055008 80054408 27BD0030 */ addiu $sp, $sp, 0x30 -/* 05500C 8005440C 03E00008 */ jr $ra -/* 055010 80054410 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_8005457C.s b/asm/non_matchings/code_800431B0/func_8005457C.s deleted file mode 100644 index 56b54c884..000000000 --- a/asm/non_matchings/code_800431B0/func_8005457C.s +++ /dev/null @@ -1,62 +0,0 @@ -glabel func_8005457C -/* 05517C 8005457C 00057080 */ sll $t6, $a1, 2 -/* 055180 80054580 01C57023 */ subu $t6, $t6, $a1 -/* 055184 80054584 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e -/* 055188 80054588 3C198019 */ lui $t9, %hi(D_8018D120) # $t9, 0x8019 -/* 05518C 8005458C 8DEFDB40 */ lw $t7, %lo(camera1)($t7) -/* 055190 80054590 8F39D120 */ lw $t9, %lo(D_8018D120)($t9) -/* 055194 80054594 000E70C0 */ sll $t6, $t6, 3 -/* 055198 80054598 01C57023 */ subu $t6, $t6, $a1 -/* 05519C 8005459C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 0551A0 800545A0 000E70C0 */ sll $t6, $t6, 3 -/* 0551A4 800545A4 01CFC021 */ addu $t8, $t6, $t7 -/* 0551A8 800545A8 2B2102EF */ slti $at, $t9, 0x2ef -/* 0551AC 800545AC AFBF002C */ sw $ra, 0x2c($sp) -/* 0551B0 800545B0 AFB00028 */ sw $s0, 0x28($sp) -/* 0551B4 800545B4 10200026 */ beqz $at, .L80054650 -/* 0551B8 800545B8 AFB80034 */ sw $t8, 0x34($sp) -/* 0551BC 800545BC 000440C0 */ sll $t0, $a0, 3 -/* 0551C0 800545C0 01044023 */ subu $t0, $t0, $a0 -/* 0551C4 800545C4 3C098016 */ lui $t1, %hi(D_80165C18) # $t1, 0x8016 -/* 0551C8 800545C8 25295C18 */ addiu $t1, %lo(D_80165C18) # addiu $t1, $t1, 0x5c18 -/* 0551CC 800545CC 00084140 */ sll $t0, $t0, 5 -/* 0551D0 800545D0 01098021 */ addu $s0, $t0, $t1 -/* 0551D4 800545D4 920A00D5 */ lbu $t2, 0xd5($s0) -/* 0551D8 800545D8 24010009 */ li $at, 9 -/* 0551DC 800545DC 240400FF */ li $a0, 255 -/* 0551E0 800545E0 1541000C */ bne $t2, $at, .L80054614 -/* 0551E4 800545E4 00003025 */ move $a2, $zero -/* 0551E8 800545E8 860B00A0 */ lh $t3, 0xa0($s0) -/* 0551EC 800545EC 240400FF */ li $a0, 255 -/* 0551F0 800545F0 860500A4 */ lh $a1, 0xa4($s0) -/* 0551F4 800545F4 00003025 */ move $a2, $zero -/* 0551F8 800545F8 860700A2 */ lh $a3, 0xa2($s0) -/* 0551FC 800545FC AFA00010 */ sw $zero, 0x10($sp) -/* 055200 80054600 AFA00014 */ sw $zero, 0x14($sp) -/* 055204 80054604 0C012DCB */ jal func_8004B72C -/* 055208 80054608 AFAB0018 */ sw $t3, 0x18($sp) -/* 05520C 8005460C 10000005 */ b .L80054624 -/* 055210 80054610 C60C0004 */ lwc1 $f12, 4($s0) -.L80054614: -/* 055214 80054614 860500A4 */ lh $a1, 0xa4($s0) -/* 055218 80054618 0C012C4E */ jal func_8004B138 -/* 05521C 8005461C 860700A0 */ lh $a3, 0xa0($s0) -/* 055220 80054620 C60C0004 */ lwc1 $f12, 4($s0) -.L80054624: -/* 055224 80054624 C60E000C */ lwc1 $f14, 0xc($s0) -/* 055228 80054628 0C01062B */ jal func_800418AC -/* 05522C 8005462C 8FA60034 */ lw $a2, 0x34($sp) -/* 055230 80054630 3C058018 */ lui $a1, %hi(D_80183E80) # $a1, 0x8018 -/* 055234 80054634 24A53E80 */ addiu $a1, %lo(D_80183E80) # addiu $a1, $a1, 0x3e80 -/* 055238 80054638 3C070D00 */ lui $a3, %hi(D_0D005AE0) # $a3, 0xd00 -/* 05523C 8005463C A4A20002 */ sh $v0, 2($a1) -/* 055240 80054640 24E75AE0 */ addiu $a3, %lo(D_0D005AE0) # addiu $a3, $a3, 0x5ae0 -/* 055244 80054644 26040004 */ addiu $a0, $s0, 4 -/* 055248 80054648 0C010C6C */ jal func_800431B0 -/* 05524C 8005464C 8E060000 */ lw $a2, ($s0) -.L80054650: -/* 055250 80054650 8FBF002C */ lw $ra, 0x2c($sp) -/* 055254 80054654 8FB00028 */ lw $s0, 0x28($sp) -/* 055258 80054658 27BD0038 */ addiu $sp, $sp, 0x38 -/* 05525C 8005465C 03E00008 */ jr $ra -/* 055260 80054660 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_8005477C.s b/asm/non_matchings/code_800431B0/func_8005477C.s deleted file mode 100644 index a892dbf05..000000000 --- a/asm/non_matchings/code_800431B0/func_8005477C.s +++ /dev/null @@ -1,119 +0,0 @@ -glabel func_8005477C -/* 05537C 8005477C 3C0F8019 */ lui $t7, %hi(D_8018D120) # $t7, 0x8019 -/* 055380 80054780 8DEFD120 */ lw $t7, %lo(D_8018D120)($t7) -/* 055384 80054784 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 055388 80054788 AFB10028 */ sw $s1, 0x28($sp) -/* 05538C 8005478C 29E102EF */ slti $at, $t7, 0x2ef -/* 055390 80054790 00808825 */ move $s1, $a0 -/* 055394 80054794 AFBF002C */ sw $ra, 0x2c($sp) -/* 055398 80054798 AFB00024 */ sw $s0, 0x24($sp) -/* 05539C 8005479C AFA50034 */ sw $a1, 0x34($sp) -/* 0553A0 800547A0 AFA60038 */ sw $a2, 0x38($sp) -/* 0553A4 800547A4 1020005F */ beqz $at, .L80054924 -/* 0553A8 800547A8 30AE00FF */ andi $t6, $a1, 0xff -/* 0553AC 800547AC 11C00011 */ beqz $t6, .L800547F4 -/* 0553B0 800547B0 240500FF */ li $a1, 255 -/* 0553B4 800547B4 24010001 */ li $at, 1 -/* 0553B8 800547B8 11C1001F */ beq $t6, $at, .L80054838 -/* 0553BC 800547BC 240500FF */ li $a1, 255 -/* 0553C0 800547C0 24010002 */ li $at, 2 -/* 0553C4 800547C4 11C1002C */ beq $t6, $at, .L80054878 -/* 0553C8 800547C8 240500E6 */ li $a1, 230 -/* 0553CC 800547CC 24010003 */ li $at, 3 -/* 0553D0 800547D0 11C1003A */ beq $t6, $at, .L800548BC -/* 0553D4 800547D4 240500FF */ li $a1, 255 -/* 0553D8 800547D8 0004C0C0 */ sll $t8, $a0, 3 -/* 0553DC 800547DC 0304C023 */ subu $t8, $t8, $a0 -/* 0553E0 800547E0 3C198016 */ lui $t9, %hi(D_80165C18) # $t9, 0x8016 -/* 0553E4 800547E4 27395C18 */ addiu $t9, %lo(D_80165C18) # addiu $t9, $t9, 0x5c18 -/* 0553E8 800547E8 0018C140 */ sll $t8, $t8, 5 -/* 0553EC 800547EC 10000041 */ b .L800548F4 -/* 0553F0 800547F0 03198021 */ addu $s0, $t8, $t9 -.L800547F4: -/* 0553F4 800547F4 001148C0 */ sll $t1, $s1, 3 -/* 0553F8 800547F8 01314823 */ subu $t1, $t1, $s1 -/* 0553FC 800547FC 3C0A8016 */ lui $t2, %hi(D_80165C18) # $t2, 0x8016 -/* 055400 80054800 254A5C18 */ addiu $t2, %lo(D_80165C18) # addiu $t2, $t2, 0x5c18 -/* 055404 80054804 00094940 */ sll $t1, $t1, 5 -/* 055408 80054808 012A8021 */ addu $s0, $t1, $t2 -/* 05540C 8005480C 860B00A0 */ lh $t3, 0xa0($s0) -/* 055410 80054810 240800FF */ li $t0, 255 -/* 055414 80054814 AFA80014 */ sw $t0, 0x14($sp) -/* 055418 80054818 240400E6 */ li $a0, 230 -/* 05541C 8005481C 240600FF */ li $a2, 255 -/* 055420 80054820 00003825 */ move $a3, $zero -/* 055424 80054824 AFA00010 */ sw $zero, 0x10($sp) -/* 055428 80054828 0C012C72 */ jal func_8004B1C8 -/* 05542C 8005482C AFAB0018 */ sw $t3, 0x18($sp) -/* 055430 80054830 10000031 */ b .L800548F8 -/* 055434 80054834 C60C0004 */ lwc1 $f12, 4($s0) -.L80054838: -/* 055438 80054838 001160C0 */ sll $t4, $s1, 3 -/* 05543C 8005483C 01916023 */ subu $t4, $t4, $s1 -/* 055440 80054840 3C0D8016 */ lui $t5, %hi(D_80165C18) # $t5, 0x8016 -/* 055444 80054844 25AD5C18 */ addiu $t5, %lo(D_80165C18) # addiu $t5, $t5, 0x5c18 -/* 055448 80054848 000C6140 */ sll $t4, $t4, 5 -/* 05544C 8005484C 018D8021 */ addu $s0, $t4, $t5 -/* 055450 80054850 860E00A0 */ lh $t6, 0xa0($s0) -/* 055454 80054854 240400FF */ li $a0, 255 -/* 055458 80054858 24060096 */ li $a2, 150 -/* 05545C 8005485C 240700FF */ li $a3, 255 -/* 055460 80054860 AFA00010 */ sw $zero, 0x10($sp) -/* 055464 80054864 AFA00014 */ sw $zero, 0x14($sp) -/* 055468 80054868 0C012C72 */ jal func_8004B1C8 -/* 05546C 8005486C AFAE0018 */ sw $t6, 0x18($sp) -/* 055470 80054870 10000021 */ b .L800548F8 -/* 055474 80054874 C60C0004 */ lwc1 $f12, 4($s0) -.L80054878: -/* 055478 80054878 0011C0C0 */ sll $t8, $s1, 3 -/* 05547C 8005487C 0311C023 */ subu $t8, $t8, $s1 -/* 055480 80054880 3C198016 */ lui $t9, %hi(D_80165C18) # $t9, 0x8016 -/* 055484 80054884 27395C18 */ addiu $t9, %lo(D_80165C18) # addiu $t9, $t9, 0x5c18 -/* 055488 80054888 0018C140 */ sll $t8, $t8, 5 -/* 05548C 8005488C 03198021 */ addu $s0, $t8, $t9 -/* 055490 80054890 860800A0 */ lh $t0, 0xa0($s0) -/* 055494 80054894 240F0096 */ li $t7, 150 -/* 055498 80054898 AFAF0014 */ sw $t7, 0x14($sp) -/* 05549C 8005489C 240400FF */ li $a0, 255 -/* 0554A0 800548A0 240600FF */ li $a2, 255 -/* 0554A4 800548A4 240700FF */ li $a3, 255 -/* 0554A8 800548A8 AFA00010 */ sw $zero, 0x10($sp) -/* 0554AC 800548AC 0C012C72 */ jal func_8004B1C8 -/* 0554B0 800548B0 AFA80018 */ sw $t0, 0x18($sp) -/* 0554B4 800548B4 10000010 */ b .L800548F8 -/* 0554B8 800548B8 C60C0004 */ lwc1 $f12, 4($s0) -.L800548BC: -/* 0554BC 800548BC 001148C0 */ sll $t1, $s1, 3 -/* 0554C0 800548C0 01314823 */ subu $t1, $t1, $s1 -/* 0554C4 800548C4 3C0A8016 */ lui $t2, %hi(D_80165C18) # $t2, 0x8016 -/* 0554C8 800548C8 254A5C18 */ addiu $t2, %lo(D_80165C18) # addiu $t2, $t2, 0x5c18 -/* 0554CC 800548CC 00094940 */ sll $t1, $t1, 5 -/* 0554D0 800548D0 012A8021 */ addu $s0, $t1, $t2 -/* 0554D4 800548D4 860B00A0 */ lh $t3, 0xa0($s0) -/* 0554D8 800548D8 240400FF */ li $a0, 255 -/* 0554DC 800548DC 2406001E */ li $a2, 30 -/* 0554E0 800548E0 240700FF */ li $a3, 255 -/* 0554E4 800548E4 AFA00010 */ sw $zero, 0x10($sp) -/* 0554E8 800548E8 AFA00014 */ sw $zero, 0x14($sp) -/* 0554EC 800548EC 0C012C72 */ jal func_8004B1C8 -/* 0554F0 800548F0 AFAB0018 */ sw $t3, 0x18($sp) -.L800548F4: -/* 0554F4 800548F4 C60C0004 */ lwc1 $f12, 4($s0) -.L800548F8: -/* 0554F8 800548F8 C60E000C */ lwc1 $f14, 0xc($s0) -/* 0554FC 800548FC 0C01062B */ jal func_800418AC -/* 055500 80054900 8FA60038 */ lw $a2, 0x38($sp) -/* 055504 80054904 3C058018 */ lui $a1, %hi(D_80183E80) # $a1, 0x8018 -/* 055508 80054908 24A53E80 */ addiu $a1, %lo(D_80183E80) # addiu $a1, $a1, 0x3e80 -/* 05550C 8005490C 3C070D00 */ lui $a3, %hi(D_0D005AE0) # $a3, 0xd00 -/* 055510 80054910 A4A20002 */ sh $v0, 2($a1) -/* 055514 80054914 24E75AE0 */ addiu $a3, %lo(D_0D005AE0) # addiu $a3, $a3, 0x5ae0 -/* 055518 80054918 26040004 */ addiu $a0, $s0, 4 -/* 05551C 8005491C 0C010C6C */ jal func_800431B0 -/* 055520 80054920 8E060000 */ lw $a2, ($s0) -.L80054924: -/* 055524 80054924 8FBF002C */ lw $ra, 0x2c($sp) -/* 055528 80054928 8FB00024 */ lw $s0, 0x24($sp) -/* 05552C 8005492C 8FB10028 */ lw $s1, 0x28($sp) -/* 055530 80054930 03E00008 */ jr $ra -/* 055534 80054934 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/code_800431B0/func_80054AFC.s b/asm/non_matchings/code_800431B0/func_80054AFC.s deleted file mode 100644 index c64f0203b..000000000 --- a/asm/non_matchings/code_800431B0/func_80054AFC.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_80054AFC -/* 0556FC 80054AFC 000470C0 */ sll $t6, $a0, 3 -/* 055700 80054B00 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 055704 80054B04 01C47023 */ subu $t6, $t6, $a0 -/* 055708 80054B08 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 05570C 80054B0C AFB00018 */ sw $s0, 0x18($sp) -/* 055710 80054B10 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 055714 80054B14 000E7140 */ sll $t6, $t6, 5 -/* 055718 80054B18 AFBF001C */ sw $ra, 0x1c($sp) -/* 05571C 80054B1C 01CF8021 */ addu $s0, $t6, $t7 -/* 055720 80054B20 AFA50024 */ sw $a1, 0x24($sp) -/* 055724 80054B24 C60C000C */ lwc1 $f12, 0xc($s0) -/* 055728 80054B28 C60E0008 */ lwc1 $f14, 8($s0) -/* 05572C 80054B2C 0C01063A */ jal func_800418E8 -/* 055730 80054B30 00A03025 */ move $a2, $a1 -/* 055734 80054B34 3C018018 */ lui $at, %hi(D_80183E80) # $at, 0x8018 -/* 055738 80054B38 A4223E80 */ sh $v0, %lo(D_80183E80)($at) -/* 05573C 80054B3C C60E000C */ lwc1 $f14, 0xc($s0) -/* 055740 80054B40 C60C0004 */ lwc1 $f12, 4($s0) -/* 055744 80054B44 0C01062B */ jal func_800418AC -/* 055748 80054B48 8FA60024 */ lw $a2, 0x24($sp) -/* 05574C 80054B4C 961800B6 */ lhu $t8, 0xb6($s0) -/* 055750 80054B50 3C038018 */ lui $v1, %hi(D_80183E80) # $v1, 0x8018 -/* 055754 80054B54 24633E80 */ addiu $v1, %lo(D_80183E80) # addiu $v1, $v1, 0x3e80 -/* 055758 80054B58 A4620002 */ sh $v0, 2($v1) -/* 05575C 80054B5C 86040084 */ lh $a0, 0x84($s0) -/* 055760 80054B60 86050086 */ lh $a1, 0x86($s0) -/* 055764 80054B64 86060088 */ lh $a2, 0x88($s0) -/* 055768 80054B68 860700A0 */ lh $a3, 0xa0($s0) -/* 05576C 80054B6C 0C012C4E */ jal func_8004B138 -/* 055770 80054B70 A4780004 */ sh $t8, 4($v1) -/* 055774 80054B74 3C058018 */ lui $a1, %hi(D_80183E80) # $a1, 0x8018 -/* 055778 80054B78 24A53E80 */ addiu $a1, %lo(D_80183E80) # addiu $a1, $a1, 0x3e80 -/* 05577C 80054B7C 26040004 */ addiu $a0, $s0, 4 -/* 055780 80054B80 0C010B80 */ jal func_80042E00 -/* 055784 80054B84 8E060000 */ lw $a2, ($s0) -/* 055788 80054B88 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 05578C 80054B8C 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 055790 80054B90 8CA20000 */ lw $v0, ($a1) -/* 055794 80054B94 3C080400 */ lui $t0, (0x0400103F >> 16) # lui $t0, 0x400 -/* 055798 80054B98 3C090D00 */ lui $t1, %hi(D_0D005AE0) # $t1, 0xd00 -/* 05579C 80054B9C 24590008 */ addiu $t9, $v0, 8 -/* 0557A0 80054BA0 ACB90000 */ sw $t9, ($a1) -/* 0557A4 80054BA4 25295AE0 */ addiu $t1, %lo(D_0D005AE0) # addiu $t1, $t1, 0x5ae0 -/* 0557A8 80054BA8 3508103F */ ori $t0, (0x0400103F & 0xFFFF) # ori $t0, $t0, 0x103f -/* 0557AC 80054BAC AC480000 */ sw $t0, ($v0) -/* 0557B0 80054BB0 AC490004 */ sw $t1, 4($v0) -/* 0557B4 80054BB4 8CA20000 */ lw $v0, ($a1) -/* 0557B8 80054BB8 3C0C0D00 */ lui $t4, %hi(D_0D006940) # $t4, 0xd00 -/* 0557BC 80054BBC 258C6940 */ addiu $t4, %lo(D_0D006940) # addiu $t4, $t4, 0x6940 -/* 0557C0 80054BC0 244A0008 */ addiu $t2, $v0, 8 -/* 0557C4 80054BC4 ACAA0000 */ sw $t2, ($a1) -/* 0557C8 80054BC8 3C0B0600 */ lui $t3, 0x600 -/* 0557CC 80054BCC AC4B0000 */ sw $t3, ($v0) -/* 0557D0 80054BD0 AC4C0004 */ sw $t4, 4($v0) -/* 0557D4 80054BD4 8FBF001C */ lw $ra, 0x1c($sp) -/* 0557D8 80054BD8 8FB00018 */ lw $s0, 0x18($sp) -/* 0557DC 80054BDC 27BD0020 */ addiu $sp, $sp, 0x20 -/* 0557E0 80054BE0 03E00008 */ jr $ra -/* 0557E4 80054BE4 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80054D00.s b/asm/non_matchings/code_800431B0/func_80054D00.s deleted file mode 100644 index 00c8ac6ed..000000000 --- a/asm/non_matchings/code_800431B0/func_80054D00.s +++ /dev/null @@ -1,70 +0,0 @@ -glabel func_80054D00 -/* 055900 80054D00 0004C8C0 */ sll $t9, $a0, 3 -/* 055904 80054D04 0324C823 */ subu $t9, $t9, $a0 -/* 055908 80054D08 3C088016 */ lui $t0, %hi(D_80165C18) # $t0, 0x8016 -/* 05590C 80054D0C 00057080 */ sll $t6, $a1, 2 -/* 055910 80054D10 25085C18 */ addiu $t0, %lo(D_80165C18) # addiu $t0, $t0, 0x5c18 -/* 055914 80054D14 0019C940 */ sll $t9, $t9, 5 -/* 055918 80054D18 01C57023 */ subu $t6, $t6, $a1 -/* 05591C 80054D1C 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e -/* 055920 80054D20 03281821 */ addu $v1, $t9, $t0 -/* 055924 80054D24 8DEFDB40 */ lw $t7, %lo(camera1)($t7) -/* 055928 80054D28 846900A6 */ lh $t1, 0xa6($v1) -/* 05592C 80054D2C 000E70C0 */ sll $t6, $t6, 3 -/* 055930 80054D30 01C57023 */ subu $t6, $t6, $a1 -/* 055934 80054D34 000E70C0 */ sll $t6, $t6, 3 -/* 055938 80054D38 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 05593C 80054D3C 01CFC021 */ addu $t8, $t6, $t7 -/* 055940 80054D40 29210003 */ slti $at, $t1, 3 -/* 055944 80054D44 AFBF0034 */ sw $ra, 0x34($sp) -/* 055948 80054D48 1420002D */ bnez $at, .L80054E00 -/* 05594C 80054D4C AFB8003C */ sw $t8, 0x3c($sp) -/* 055950 80054D50 24062AAB */ li $a2, 10923 -/* 055954 80054D54 2407012C */ li $a3, 300 -/* 055958 80054D58 AFA30038 */ sw $v1, 0x38($sp) -/* 05595C 80054D5C 0C0228D9 */ jal func_8008A364 -/* 055960 80054D60 AFA40040 */ sw $a0, 0x40($sp) -/* 055964 80054D64 8FA40040 */ lw $a0, 0x40($sp) -/* 055968 80054D68 0C01C88F */ jal func_8007223C -/* 05596C 80054D6C 3C050004 */ lui $a1, 4 -/* 055970 80054D70 10400023 */ beqz $v0, .L80054E00 -/* 055974 80054D74 8FA30038 */ lw $v1, 0x38($sp) -/* 055978 80054D78 946A00B2 */ lhu $t2, 0xb2($v1) -/* 05597C 80054D7C 3C058018 */ lui $a1, %hi(D_80183E80) # $a1, 0x8018 -/* 055980 80054D80 24A53E80 */ addiu $a1, %lo(D_80183E80) # addiu $a1, $a1, 0x3e80 -/* 055984 80054D84 C46C0004 */ lwc1 $f12, 4($v1) -/* 055988 80054D88 C46E000C */ lwc1 $f14, 0xc($v1) -/* 05598C 80054D8C 8FA6003C */ lw $a2, 0x3c($sp) -/* 055990 80054D90 AFA30038 */ sw $v1, 0x38($sp) -/* 055994 80054D94 0C01062B */ jal func_800418AC -/* 055998 80054D98 A4AA0000 */ sh $t2, ($a1) -/* 05599C 80054D9C 8FA30038 */ lw $v1, 0x38($sp) -/* 0559A0 80054DA0 3C058018 */ lui $a1, %hi(D_80183E80) # $a1, 0x8018 -/* 0559A4 80054DA4 3C0D0D00 */ lui $t5, %hi(D_0D0062B0) # $t5, 0xd00 -/* 0559A8 80054DA8 946B00B6 */ lhu $t3, 0xb6($v1) -/* 0559AC 80054DAC 8C6C0064 */ lw $t4, 0x64($v1) -/* 0559B0 80054DB0 24A53E80 */ addiu $a1, %lo(D_80183E80) # addiu $a1, $a1, 0x3e80 -/* 0559B4 80054DB4 25AD62B0 */ addiu $t5, %lo(D_0D0062B0) # addiu $t5, $t5, 0x62b0 -/* 0559B8 80054DB8 240E0020 */ li $t6, 32 -/* 0559BC 80054DBC 240F0040 */ li $t7, 64 -/* 0559C0 80054DC0 24180020 */ li $t8, 32 -/* 0559C4 80054DC4 24190040 */ li $t9, 64 -/* 0559C8 80054DC8 24080005 */ li $t0, 5 -/* 0559CC 80054DCC A4A20002 */ sh $v0, 2($a1) -/* 0559D0 80054DD0 AFA80028 */ sw $t0, 0x28($sp) -/* 0559D4 80054DD4 AFB90024 */ sw $t9, 0x24($sp) -/* 0559D8 80054DD8 AFB80020 */ sw $t8, 0x20($sp) -/* 0559DC 80054DDC AFAF001C */ sw $t7, 0x1c($sp) -/* 0559E0 80054DE0 AFAE0018 */ sw $t6, 0x18($sp) -/* 0559E4 80054DE4 AFAD0014 */ sw $t5, 0x14($sp) -/* 0559E8 80054DE8 24640004 */ addiu $a0, $v1, 4 -/* 0559EC 80054DEC 8C660000 */ lw $a2, ($v1) -/* 0559F0 80054DF0 8C670060 */ lw $a3, 0x60($v1) -/* 0559F4 80054DF4 A4AB0004 */ sh $t3, 4($a1) -/* 0559F8 80054DF8 0C01204C */ jal func_80048130 -/* 0559FC 80054DFC AFAC0010 */ sw $t4, 0x10($sp) -.L80054E00: -/* 055A00 80054E00 8FBF0034 */ lw $ra, 0x34($sp) -/* 055A04 80054E04 27BD0040 */ addiu $sp, $sp, 0x40 -/* 055A08 80054E08 03E00008 */ jr $ra -/* 055A0C 80054E0C 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80054EB8.s b/asm/non_matchings/code_800431B0/func_80054EB8.s deleted file mode 100644 index f89b15161..000000000 --- a/asm/non_matchings/code_800431B0/func_80054EB8.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80054EB8 -/* 055AB8 80054EB8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 055ABC 80054EBC AFB10018 */ sw $s1, 0x18($sp) -/* 055AC0 80054EC0 AFB00014 */ sw $s0, 0x14($sp) -/* 055AC4 80054EC4 3C108019 */ lui $s0, %hi(D_8018C1B0) # $s0, 0x8019 -/* 055AC8 80054EC8 3C118019 */ lui $s1, %hi(D_8018C22C) # $s1, 0x8019 -/* 055ACC 80054ECC AFBF001C */ sw $ra, 0x1c($sp) -/* 055AD0 80054ED0 AFA40020 */ sw $a0, 0x20($sp) -/* 055AD4 80054ED4 2631C22C */ addiu $s1, %lo(D_8018C22C) # addiu $s1, $s1, -0x3dd4 -/* 055AD8 80054ED8 2610C1B0 */ addiu $s0, %lo(D_8018C1B0) # addiu $s0, $s0, -0x3e50 -.L80054EDC: -/* 055ADC 80054EDC 0C015384 */ jal func_80054E10 -/* 055AE0 80054EE0 8E040000 */ lw $a0, ($s0) -/* 055AE4 80054EE4 26100004 */ addiu $s0, $s0, 4 -/* 055AE8 80054EE8 1611FFFC */ bne $s0, $s1, .L80054EDC -/* 055AEC 80054EEC 00000000 */ nop -/* 055AF0 80054EF0 8FBF001C */ lw $ra, 0x1c($sp) -/* 055AF4 80054EF4 8FB00014 */ lw $s0, 0x14($sp) -/* 055AF8 80054EF8 8FB10018 */ lw $s1, 0x18($sp) -/* 055AFC 80054EFC 03E00008 */ jr $ra -/* 055B00 80054F00 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/non_matchings/code_800431B0/func_80054F04.s b/asm/non_matchings/code_800431B0/func_80054F04.s deleted file mode 100644 index 0deb1ff1d..000000000 --- a/asm/non_matchings/code_800431B0/func_80054F04.s +++ /dev/null @@ -1,107 +0,0 @@ -glabel func_80054F04 -/* 055B04 80054F04 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 055B08 80054F08 AFB40028 */ sw $s4, 0x28($sp) -/* 055B0C 80054F0C 3C148015 */ lui $s4, %hi(gDisplayListHead) # $s4, 0x8015 -/* 055B10 80054F10 00047880 */ sll $t7, $a0, 2 -/* 055B14 80054F14 26940298 */ addiu $s4, %lo(gDisplayListHead) # addiu $s4, $s4, 0x298 -/* 055B18 80054F18 01E47823 */ subu $t7, $t7, $a0 -/* 055B1C 80054F1C 3C18800E */ lui $t8, %hi(camera1) # $t8, 0x800e -/* 055B20 80054F20 8F18DB40 */ lw $t8, %lo(camera1)($t8) -/* 055B24 80054F24 8E830000 */ lw $v1, ($s4) -/* 055B28 80054F28 000F78C0 */ sll $t7, $t7, 3 -/* 055B2C 80054F2C 01E47823 */ subu $t7, $t7, $a0 -/* 055B30 80054F30 000F78C0 */ sll $t7, $t7, 3 -/* 055B34 80054F34 AFBF003C */ sw $ra, 0x3c($sp) -/* 055B38 80054F38 AFA40050 */ sw $a0, 0x50($sp) -/* 055B3C 80054F3C 3C0A0D00 */ lui $t2, %hi(D_0D0079C8) # $t2, 0xd00 -/* 055B40 80054F40 01F8C821 */ addu $t9, $t7, $t8 -/* 055B44 80054F44 24680008 */ addiu $t0, $v1, 8 -/* 055B48 80054F48 AFBE0038 */ sw $fp, 0x38($sp) -/* 055B4C 80054F4C AFB70034 */ sw $s7, 0x34($sp) -/* 055B50 80054F50 AFB60030 */ sw $s6, 0x30($sp) -/* 055B54 80054F54 AFB5002C */ sw $s5, 0x2c($sp) -/* 055B58 80054F58 AFB30024 */ sw $s3, 0x24($sp) -/* 055B5C 80054F5C AFB20020 */ sw $s2, 0x20($sp) -/* 055B60 80054F60 AFB1001C */ sw $s1, 0x1c($sp) -/* 055B64 80054F64 AFB00018 */ sw $s0, 0x18($sp) -/* 055B68 80054F68 AFB90044 */ sw $t9, 0x44($sp) -/* 055B6C 80054F6C AE880000 */ sw $t0, ($s4) -/* 055B70 80054F70 254A79C8 */ addiu $t2, %lo(D_0D0079C8) # addiu $t2, $t2, 0x79c8 -/* 055B74 80054F74 3C090600 */ lui $t1, 0x600 -/* 055B78 80054F78 3C040601 */ lui $a0, %hi(D_06013670) # $a0, 0x601 -/* 055B7C 80054F7C 24843670 */ addiu $a0, %lo(D_06013670) # addiu $a0, $a0, 0x3670 -/* 055B80 80054F80 24050010 */ li $a1, 16 -/* 055B84 80054F84 24060010 */ li $a2, 16 -/* 055B88 80054F88 AC690000 */ sw $t1, ($v1) -/* 055B8C 80054F8C 0C010F54 */ jal func_80043D50 -/* 055B90 80054F90 AC6A0004 */ sw $t2, 4($v1) -/* 055B94 80054F94 3C128019 */ lui $s2, %hi(D_8018C3F0) # $s2, 0x8019 -/* 055B98 80054F98 3C1E8019 */ lui $fp, %hi(D_8018D120) # $fp, 0x8019 -/* 055B9C 80054F9C 3C158016 */ lui $s5, %hi(D_80165C18) # $s5, 0x8016 -/* 055BA0 80054FA0 26B55C18 */ addiu $s5, %lo(D_80165C18) # addiu $s5, $s5, 0x5c18 -/* 055BA4 80054FA4 27DED120 */ addiu $fp, %lo(D_8018D120) # addiu $fp, $fp, -0x2ee0 -/* 055BA8 80054FA8 2652C3F0 */ addiu $s2, %lo(D_8018C3F0) # addiu $s2, $s2, -0x3c10 -/* 055BAC 80054FAC 3C170004 */ lui $s7, 4 -/* 055BB0 80054FB0 241600E0 */ li $s6, 224 -/* 055BB4 80054FB4 8E500000 */ lw $s0, ($s2) -.L80054FB8: -/* 055BB8 80054FB8 8FA50050 */ lw $a1, 0x50($sp) -/* 055BBC 80054FBC 24062AAB */ li $a2, 10923 -/* 055BC0 80054FC0 02160019 */ multu $s0, $s6 -/* 055BC4 80054FC4 02002025 */ move $a0, $s0 -/* 055BC8 80054FC8 00005812 */ mflo $t3 -/* 055BCC 80054FCC 02AB8821 */ addu $s1, $s5, $t3 -/* 055BD0 80054FD0 862C00A6 */ lh $t4, 0xa6($s1) -/* 055BD4 80054FD4 1980001A */ blez $t4, .L80055040 -/* 055BD8 80054FD8 00000000 */ nop -/* 055BDC 80054FDC 0C0228D9 */ jal func_8008A364 -/* 055BE0 80054FE0 240700C8 */ li $a3, 200 -/* 055BE4 80054FE4 02002025 */ move $a0, $s0 -/* 055BE8 80054FE8 0C01C88F */ jal func_8007223C -/* 055BEC 80054FEC 02E02825 */ move $a1, $s7 -/* 055BF0 80054FF0 10400013 */ beqz $v0, .L80055040 -/* 055BF4 80054FF4 00000000 */ nop -/* 055BF8 80054FF8 8FCD0000 */ lw $t5, ($fp) -/* 055BFC 80054FFC 3C130D00 */ lui $s3, %hi(D_0D006980) # $s3, 0xd00 -/* 055C00 80055000 26736980 */ addiu $s3, %lo(D_0D006980) # addiu $s3, $s3, 0x6980 -/* 055C04 80055004 29A102EF */ slti $at, $t5, 0x2ef -/* 055C08 80055008 1020000D */ beqz $at, .L80055040 -/* 055C0C 8005500C 8FA60044 */ lw $a2, 0x44($sp) -/* 055C10 80055010 C62C0004 */ lwc1 $f12, 4($s1) -/* 055C14 80055014 0C01062B */ jal func_800418AC -/* 055C18 80055018 C62E000C */ lwc1 $f14, 0xc($s1) -/* 055C1C 8005501C A62200B4 */ sh $v0, 0xb4($s1) -/* 055C20 80055020 0C010C41 */ jal func_80043104 -/* 055C24 80055024 02002025 */ move $a0, $s0 -/* 055C28 80055028 8E830000 */ lw $v1, ($s4) -/* 055C2C 8005502C 3C0F0600 */ lui $t7, 0x600 -/* 055C30 80055030 246E0008 */ addiu $t6, $v1, 8 -/* 055C34 80055034 AE8E0000 */ sw $t6, ($s4) -/* 055C38 80055038 AC730004 */ sw $s3, 4($v1) -/* 055C3C 8005503C AC6F0000 */ sw $t7, ($v1) -.L80055040: -/* 055C40 80055040 3C188019 */ lui $t8, %hi(D_8018C5F0) # $t8, 0x8019 -/* 055C44 80055044 2718C5F0 */ addiu $t8, %lo(D_8018C5F0) # addiu $t8, $t8, -0x3a10 -/* 055C48 80055048 26520004 */ addiu $s2, $s2, 4 -/* 055C4C 8005504C 5658FFDA */ bnel $s2, $t8, .L80054FB8 -/* 055C50 80055050 8E500000 */ lw $s0, ($s2) -/* 055C54 80055054 8E830000 */ lw $v1, ($s4) -/* 055C58 80055058 3C090001 */ lui $t1, (0x00010001 >> 16) # lui $t1, 1 -/* 055C5C 8005505C 35290001 */ ori $t1, (0x00010001 & 0xFFFF) # ori $t1, $t1, 1 -/* 055C60 80055060 24790008 */ addiu $t9, $v1, 8 -/* 055C64 80055064 AE990000 */ sw $t9, ($s4) -/* 055C68 80055068 3C08BB00 */ lui $t0, 0xbb00 -/* 055C6C 8005506C AC680000 */ sw $t0, ($v1) -/* 055C70 80055070 AC690004 */ sw $t1, 4($v1) -/* 055C74 80055074 8FBF003C */ lw $ra, 0x3c($sp) -/* 055C78 80055078 8FBE0038 */ lw $fp, 0x38($sp) -/* 055C7C 8005507C 8FB70034 */ lw $s7, 0x34($sp) -/* 055C80 80055080 8FB60030 */ lw $s6, 0x30($sp) -/* 055C84 80055084 8FB5002C */ lw $s5, 0x2c($sp) -/* 055C88 80055088 8FB40028 */ lw $s4, 0x28($sp) -/* 055C8C 8005508C 8FB30024 */ lw $s3, 0x24($sp) -/* 055C90 80055090 8FB20020 */ lw $s2, 0x20($sp) -/* 055C94 80055094 8FB1001C */ lw $s1, 0x1c($sp) -/* 055C98 80055098 8FB00018 */ lw $s0, 0x18($sp) -/* 055C9C 8005509C 03E00008 */ jr $ra -/* 055CA0 800550A0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/non_matchings/code_800431B0/func_800550A4.s b/asm/non_matchings/code_800431B0/func_800550A4.s deleted file mode 100644 index 01942663b..000000000 --- a/asm/non_matchings/code_800431B0/func_800550A4.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_800550A4 -/* 055CA4 800550A4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 055CA8 800550A8 AFB20020 */ sw $s2, 0x20($sp) -/* 055CAC 800550AC AFB00018 */ sw $s0, 0x18($sp) -/* 055CB0 800550B0 AFB1001C */ sw $s1, 0x1c($sp) -/* 055CB4 800550B4 3C108018 */ lui $s0, %hi(D_80183EA0) # $s0, 0x8018 -/* 055CB8 800550B8 3C128018 */ lui $s2, %hi(D_80183EC0) # $s2, 0x8018 -/* 055CBC 800550BC 00808825 */ move $s1, $a0 -/* 055CC0 800550C0 AFBF0024 */ sw $ra, 0x24($sp) -/* 055CC4 800550C4 26523EC0 */ addiu $s2, %lo(D_80183EC0) # addiu $s2, $s2, 0x3ec0 -/* 055CC8 800550C8 26103EA0 */ addiu $s0, %lo(D_80183EA0) # addiu $s0, $s0, 0x3ea0 -/* 055CCC 800550CC 8E040000 */ lw $a0, ($s0) -.L800550D0: -/* 055CD0 800550D0 0C015340 */ jal func_80054D00 -/* 055CD4 800550D4 02202825 */ move $a1, $s1 -/* 055CD8 800550D8 26100004 */ addiu $s0, $s0, 4 -/* 055CDC 800550DC 0212082B */ sltu $at, $s0, $s2 -/* 055CE0 800550E0 5420FFFB */ bnel $at, $zero, .L800550D0 -/* 055CE4 800550E4 8E040000 */ lw $a0, ($s0) -/* 055CE8 800550E8 3C108018 */ lui $s0, %hi(D_80183F28) # $s0, 0x8018 -/* 055CEC 800550EC 3C128018 */ lui $s2, %hi(D_80183F54) # $s2, 0x8018 -/* 055CF0 800550F0 26523F54 */ addiu $s2, %lo(D_80183F54) # addiu $s2, $s2, 0x3f54 -/* 055CF4 800550F4 26103F28 */ addiu $s0, %lo(D_80183F28) # addiu $s0, $s0, 0x3f28 -/* 055CF8 800550F8 8E040000 */ lw $a0, ($s0) -.L800550FC: -/* 055CFC 800550FC 0C015340 */ jal func_80054D00 -/* 055D00 80055100 02202825 */ move $a1, $s1 -/* 055D04 80055104 26100004 */ addiu $s0, $s0, 4 -/* 055D08 80055108 0212082B */ sltu $at, $s0, $s2 -/* 055D0C 8005510C 5420FFFB */ bnel $at, $zero, .L800550FC -/* 055D10 80055110 8E040000 */ lw $a0, ($s0) -/* 055D14 80055114 3C108019 */ lui $s0, %hi(D_8018BFA8) # $s0, 0x8019 -/* 055D18 80055118 3C128019 */ lui $s2, %hi(D_8018BFD8) # $s2, 0x8019 -/* 055D1C 8005511C 2652BFD8 */ addiu $s2, %lo(D_8018BFD8) # addiu $s2, $s2, -0x4028 -/* 055D20 80055120 2610BFA8 */ addiu $s0, %lo(D_8018BFA8) # addiu $s0, $s0, -0x4058 -/* 055D24 80055124 8E040000 */ lw $a0, ($s0) -.L80055128: -/* 055D28 80055128 0C015340 */ jal func_80054D00 -/* 055D2C 8005512C 02202825 */ move $a1, $s1 -/* 055D30 80055130 26100004 */ addiu $s0, $s0, 4 -/* 055D34 80055134 5612FFFC */ bnel $s0, $s2, .L80055128 -/* 055D38 80055138 8E040000 */ lw $a0, ($s0) -/* 055D3C 8005513C 0C0153AE */ jal func_80054EB8 -/* 055D40 80055140 02202025 */ move $a0, $s1 -/* 055D44 80055144 0C0153C1 */ jal func_80054F04 -/* 055D48 80055148 02202025 */ move $a0, $s1 -/* 055D4C 8005514C 8FBF0024 */ lw $ra, 0x24($sp) -/* 055D50 80055150 8FB00018 */ lw $s0, 0x18($sp) -/* 055D54 80055154 8FB1001C */ lw $s1, 0x1c($sp) -/* 055D58 80055158 8FB20020 */ lw $s2, 0x20($sp) -/* 055D5C 8005515C 03E00008 */ jr $ra -/* 055D60 80055160 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/non_matchings/code_800431B0/func_80055CCC.s b/asm/non_matchings/code_800431B0/func_80055CCC.s deleted file mode 100644 index 89fb78fe1..000000000 --- a/asm/non_matchings/code_800431B0/func_80055CCC.s +++ /dev/null @@ -1,107 +0,0 @@ -glabel func_80055CCC -/* 0568CC 80055CCC 0004C8C0 */ sll $t9, $a0, 3 -/* 0568D0 80055CD0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 0568D4 80055CD4 0324C823 */ subu $t9, $t9, $a0 -/* 0568D8 80055CD8 3C088016 */ lui $t0, %hi(D_80165C18) # $t0, 0x8016 -/* 0568DC 80055CDC AFB00018 */ sw $s0, 0x18($sp) -/* 0568E0 80055CE0 00057080 */ sll $t6, $a1, 2 -/* 0568E4 80055CE4 25085C18 */ addiu $t0, %lo(D_80165C18) # addiu $t0, $t0, 0x5c18 -/* 0568E8 80055CE8 0019C940 */ sll $t9, $t9, 5 -/* 0568EC 80055CEC 01C57023 */ subu $t6, $t6, $a1 -/* 0568F0 80055CF0 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e -/* 0568F4 80055CF4 03288021 */ addu $s0, $t9, $t0 -/* 0568F8 80055CF8 8DEFDB40 */ lw $t7, %lo(camera1)($t7) -/* 0568FC 80055CFC 860900A6 */ lh $t1, 0xa6($s0) -/* 056900 80055D00 000E70C0 */ sll $t6, $t6, 3 -/* 056904 80055D04 01C57023 */ subu $t6, $t6, $a1 -/* 056908 80055D08 000E70C0 */ sll $t6, $t6, 3 -/* 05690C 80055D0C 01CFC021 */ addu $t8, $t6, $t7 -/* 056910 80055D10 29210002 */ slti $at, $t1, 2 -/* 056914 80055D14 AFBF001C */ sw $ra, 0x1c($sp) -/* 056918 80055D18 1420004E */ bnez $at, .L80055E54 -/* 05691C 80055D1C AFB80024 */ sw $t8, 0x24($sp) -/* 056920 80055D20 2406012C */ li $a2, 300 -/* 056924 80055D24 0C022915 */ jal func_8008A454 -/* 056928 80055D28 AFA40030 */ sw $a0, 0x30($sp) -/* 05692C 80055D2C C6040008 */ lwc1 $f4, 8($s0) -/* 056930 80055D30 C6060044 */ lwc1 $f6, 0x44($s0) -/* 056934 80055D34 3C014034 */ li $at, 0x40340000 # 2.812500 -/* 056938 80055D38 44814800 */ mtc1 $at, $f9 -/* 05693C 80055D3C 46062001 */ sub.s $f0, $f4, $f6 -/* 056940 80055D40 44804000 */ mtc1 $zero, $f8 -/* 056944 80055D44 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 -/* 056948 80055D48 44819800 */ mtc1 $at, $f19 -/* 05694C 80055D4C 460002A1 */ cvt.d.s $f10, $f0 -/* 056950 80055D50 44809000 */ mtc1 $zero, $f18 -/* 056954 80055D54 462A4403 */ div.d $f16, $f8, $f10 -/* 056958 80055D58 8FA40030 */ lw $a0, 0x30($sp) -/* 05695C 80055D5C 46328100 */ add.d $f4, $f16, $f18 -/* 056960 80055D60 462021A0 */ cvt.s.d $f6, $f4 -/* 056964 80055D64 44053000 */ mfc1 $a1, $f6 -/* 056968 80055D68 0C0129BB */ jal func_8004A6EC -/* 05696C 80055D6C 00000000 */ nop -/* 056970 80055D70 8FA40030 */ lw $a0, 0x30($sp) -/* 056974 80055D74 0C01C89C */ jal func_80072270 -/* 056978 80055D78 3C050010 */ lui $a1, 0x10 -/* 05697C 80055D7C 10400011 */ beqz $v0, .L80055DC4 -/* 056980 80055D80 26040004 */ addiu $a0, $s0, 4 -/* 056984 80055D84 3C070601 */ lui $a3, %hi(D_0600F960) # $a3, 0x601 -/* 056988 80055D88 24E7F960 */ addiu $a3, %lo(D_0600F960) # addiu $a3, $a3, -0x6a0 -/* 05698C 80055D8C 260500BE */ addiu $a1, $s0, 0xbe -/* 056990 80055D90 0C010CCA */ jal func_80043328 -/* 056994 80055D94 8E060000 */ lw $a2, ($s0) -/* 056998 80055D98 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015 -/* 05699C 80055D9C 24840298 */ addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298 -/* 0569A0 80055DA0 8C830000 */ lw $v1, ($a0) -/* 0569A4 80055DA4 3C0C0601 */ lui $t4, %hi(D_0600F650) # $t4, 0x601 -/* 0569A8 80055DA8 258CF650 */ addiu $t4, %lo(D_0600F650) # addiu $t4, $t4, -0x9b0 -/* 0569AC 80055DAC 246A0008 */ addiu $t2, $v1, 8 -/* 0569B0 80055DB0 AC8A0000 */ sw $t2, ($a0) -/* 0569B4 80055DB4 3C0B0600 */ lui $t3, 0x600 -/* 0569B8 80055DB8 AC6B0000 */ sw $t3, ($v1) -/* 0569BC 80055DBC 10000025 */ b .L80055E54 -/* 0569C0 80055DC0 AC6C0004 */ sw $t4, 4($v1) -.L80055DC4: -/* 0569C4 80055DC4 960D00BE */ lhu $t5, 0xbe($s0) -/* 0569C8 80055DC8 3C058018 */ lui $a1, %hi(D_80183E80) # $a1, 0x8018 -/* 0569CC 80055DCC 24A53E80 */ addiu $a1, %lo(D_80183E80) # addiu $a1, $a1, 0x3e80 -/* 0569D0 80055DD0 C60C0004 */ lwc1 $f12, 4($s0) -/* 0569D4 80055DD4 C60E000C */ lwc1 $f14, 0xc($s0) -/* 0569D8 80055DD8 8FA60024 */ lw $a2, 0x24($sp) -/* 0569DC 80055DDC 0C01062B */ jal func_800418AC -/* 0569E0 80055DE0 A4AD0000 */ sh $t5, ($a1) -/* 0569E4 80055DE4 960F00C2 */ lhu $t7, 0xc2($s0) -/* 0569E8 80055DE8 3C058018 */ lui $a1, %hi(D_80183E80) # $a1, 0x8018 -/* 0569EC 80055DEC 34018000 */ li $at, 32768 -/* 0569F0 80055DF0 00417021 */ addu $t6, $v0, $at -/* 0569F4 80055DF4 24A53E80 */ addiu $a1, %lo(D_80183E80) # addiu $a1, $a1, 0x3e80 -/* 0569F8 80055DF8 3C070601 */ lui $a3, %hi(D_0600FBE0) # $a3, 0x601 -/* 0569FC 80055DFC A4AE0002 */ sh $t6, 2($a1) -/* 056A00 80055E00 24E7FBE0 */ addiu $a3, %lo(D_0600FBE0) # addiu $a3, $a3, -0x420 -/* 056A04 80055E04 26040004 */ addiu $a0, $s0, 4 -/* 056A08 80055E08 8E060000 */ lw $a2, ($s0) -/* 056A0C 80055E0C 0C010CCA */ jal func_80043328 -/* 056A10 80055E10 A4AF0004 */ sh $t7, 4($a1) -/* 056A14 80055E14 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015 -/* 056A18 80055E18 24840298 */ addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298 -/* 056A1C 80055E1C 8C830000 */ lw $v1, ($a0) -/* 056A20 80055E20 3C080601 */ lui $t0, %hi(D_0600FA20) # $t0, 0x601 -/* 056A24 80055E24 2508FA20 */ addiu $t0, %lo(D_0600FA20) # addiu $t0, $t0, -0x5e0 -/* 056A28 80055E28 24780008 */ addiu $t8, $v1, 8 -/* 056A2C 80055E2C AC980000 */ sw $t8, ($a0) -/* 056A30 80055E30 3C190600 */ lui $t9, 0x600 -/* 056A34 80055E34 3C09800E */ lui $t1, %hi(gPlayerCountSelection1) # $t1, 0x800e -/* 056A38 80055E38 AC790000 */ sw $t9, ($v1) -/* 056A3C 80055E3C AC680004 */ sw $t0, 4($v1) -/* 056A40 80055E40 8D29C538 */ lw $t1, %lo(gPlayerCountSelection1)($t1) -/* 056A44 80055E44 24010001 */ li $at, 1 -/* 056A48 80055E48 55210003 */ bnel $t1, $at, .L80055E58 -/* 056A4C 80055E4C 8FBF001C */ lw $ra, 0x1c($sp) -/* 056A50 80055E50 A60000C0 */ sh $zero, 0xc0($s0) -.L80055E54: -/* 056A54 80055E54 8FBF001C */ lw $ra, 0x1c($sp) -.L80055E58: -/* 056A58 80055E58 8FB00018 */ lw $s0, 0x18($sp) -/* 056A5C 80055E5C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 056A60 80055E60 03E00008 */ jr $ra -/* 056A64 80055E64 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80055E68.s b/asm/non_matchings/code_800431B0/func_80055E68.s deleted file mode 100644 index 41881fff7..000000000 --- a/asm/non_matchings/code_800431B0/func_80055E68.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_80055E68 -/* 056A68 80055E68 3C0E800E */ lui $t6, %hi(gGamestate) # $t6, 0x800e -/* 056A6C 80055E6C 8DCEC50C */ lw $t6, %lo(gGamestate)($t6) -/* 056A70 80055E70 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 056A74 80055E74 AFB00018 */ sw $s0, 0x18($sp) -/* 056A78 80055E78 3C108018 */ lui $s0, %hi(D_80183EA0) # $s0, 0x8018 -/* 056A7C 80055E7C 24010009 */ li $at, 9 -/* 056A80 80055E80 AFBF001C */ sw $ra, 0x1c($sp) -/* 056A84 80055E84 AFA40020 */ sw $a0, 0x20($sp) -/* 056A88 80055E88 11C1000F */ beq $t6, $at, .L80055EC8 -/* 056A8C 80055E8C 8E103EA0 */ lw $s0, %lo(D_80183EA0)($s0) -/* 056A90 80055E90 02002025 */ move $a0, $s0 -/* 056A94 80055E94 8FA50020 */ lw $a1, 0x20($sp) -/* 056A98 80055E98 240605DC */ li $a2, 1500 -/* 056A9C 80055E9C 0C022874 */ jal func_8008A1D0 -/* 056AA0 80055EA0 24070BB8 */ li $a3, 3000 -/* 056AA4 80055EA4 02002025 */ move $a0, $s0 -/* 056AA8 80055EA8 0C01C88F */ jal func_8007223C -/* 056AAC 80055EAC 3C050004 */ lui $a1, 4 -/* 056AB0 80055EB0 1040000B */ beqz $v0, .L80055EE0 -/* 056AB4 80055EB4 02002025 */ move $a0, $s0 -/* 056AB8 80055EB8 0C015733 */ jal func_80055CCC -/* 056ABC 80055EBC 8FA50020 */ lw $a1, 0x20($sp) -/* 056AC0 80055EC0 10000008 */ b .L80055EE4 -/* 056AC4 80055EC4 8FBF001C */ lw $ra, 0x1c($sp) -.L80055EC8: -/* 056AC8 80055EC8 02002025 */ move $a0, $s0 -/* 056ACC 80055ECC 0C01C87A */ jal func_800721E8 -/* 056AD0 80055ED0 3C050010 */ lui $a1, 0x10 -/* 056AD4 80055ED4 02002025 */ move $a0, $s0 -/* 056AD8 80055ED8 0C015733 */ jal func_80055CCC -/* 056ADC 80055EDC 8FA50020 */ lw $a1, 0x20($sp) -.L80055EE0: -/* 056AE0 80055EE0 8FBF001C */ lw $ra, 0x1c($sp) -.L80055EE4: -/* 056AE4 80055EE4 8FB00018 */ lw $s0, 0x18($sp) -/* 056AE8 80055EE8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 056AEC 80055EEC 03E00008 */ jr $ra -/* 056AF0 80055EF0 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80056188.s b/asm/non_matchings/code_800431B0/func_80056188.s deleted file mode 100644 index c18eeddf8..000000000 --- a/asm/non_matchings/code_800431B0/func_80056188.s +++ /dev/null @@ -1,90 +0,0 @@ -glabel func_80056188 -/* 056D88 80056188 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 056D8C 8005618C 00047080 */ sll $t6, $a0, 2 -/* 056D90 80056190 01C47023 */ subu $t6, $t6, $a0 -/* 056D94 80056194 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e -/* 056D98 80056198 8DEFDB40 */ lw $t7, %lo(camera1)($t7) -/* 056D9C 8005619C 000E70C0 */ sll $t6, $t6, 3 -/* 056DA0 800561A0 AFBE0050 */ sw $fp, 0x50($sp) -/* 056DA4 800561A4 AFB50044 */ sw $s5, 0x44($sp) -/* 056DA8 800561A8 AFB20038 */ sw $s2, 0x38($sp) -/* 056DAC 800561AC 01C47023 */ subu $t6, $t6, $a0 -/* 056DB0 800561B0 3C188019 */ lui $t8, %hi(D_8018E838) # $t8, 0x8019 -/* 056DB4 800561B4 AFB7004C */ sw $s7, 0x4c($sp) -/* 056DB8 800561B8 AFB60048 */ sw $s6, 0x48($sp) -/* 056DBC 800561BC AFB40040 */ sw $s4, 0x40($sp) -/* 056DC0 800561C0 AFB3003C */ sw $s3, 0x3c($sp) -/* 056DC4 800561C4 000E70C0 */ sll $t6, $t6, 3 -/* 056DC8 800561C8 2718E838 */ addiu $t8, %lo(D_8018E838) # addiu $t8, $t8, -0x17c8 -/* 056DCC 800561CC 3C128018 */ lui $s2, %hi(D_80183EA0) # $s2, 0x8018 -/* 056DD0 800561D0 3C158016 */ lui $s5, %hi(D_80165C18) # $s5, 0x8016 -/* 056DD4 800561D4 3C1E0D00 */ lui $fp, %hi(D_0D0060B0) # $fp, 0xd00 -/* 056DD8 800561D8 AFBF0054 */ sw $ra, 0x54($sp) -/* 056DDC 800561DC AFB10034 */ sw $s1, 0x34($sp) -/* 056DE0 800561E0 AFB00030 */ sw $s0, 0x30($sp) -/* 056DE4 800561E4 27DE60B0 */ addiu $fp, %lo(D_0D0060B0) # addiu $fp, $fp, 0x60b0 -/* 056DE8 800561E8 26B55C18 */ addiu $s5, %lo(D_80165C18) # addiu $s5, $s5, 0x5c18 -/* 056DEC 800561EC 26523EA0 */ addiu $s2, %lo(D_80183EA0) # addiu $s2, $s2, 0x3ea0 -/* 056DF0 800561F0 0098A021 */ addu $s4, $a0, $t8 -/* 056DF4 800561F4 241600E0 */ li $s6, 224 -/* 056DF8 800561F8 3C170008 */ lui $s7, 8 -/* 056DFC 800561FC 01CF9821 */ addu $s3, $t6, $t7 -/* 056E00 80056200 82990000 */ lb $t9, ($s4) -.L80056204: -/* 056E04 80056204 8E510000 */ lw $s1, ($s2) -/* 056E08 80056208 17200025 */ bnez $t9, .L800562A0 -/* 056E0C 8005620C 00000000 */ nop -/* 056E10 80056210 02360019 */ multu $s1, $s6 -/* 056E14 80056214 02202025 */ move $a0, $s1 -/* 056E18 80056218 00004012 */ mflo $t0 -/* 056E1C 8005621C 02A88021 */ addu $s0, $s5, $t0 -/* 056E20 80056220 860900A6 */ lh $t1, 0xa6($s0) -/* 056E24 80056224 29210002 */ slti $at, $t1, 2 -/* 056E28 80056228 1420001D */ bnez $at, .L800562A0 -/* 056E2C 8005622C 00000000 */ nop -/* 056E30 80056230 0C01C89C */ jal func_80072270 -/* 056E34 80056234 02E02825 */ move $a1, $s7 -/* 056E38 80056238 10400019 */ beqz $v0, .L800562A0 -/* 056E3C 8005623C 02202025 */ move $a0, $s1 -/* 056E40 80056240 02602825 */ move $a1, $s3 -/* 056E44 80056244 0C022850 */ jal func_8008A140 -/* 056E48 80056248 24062AAB */ li $a2, 10923 -/* 056E4C 8005624C 10400014 */ beqz $v0, .L800562A0 -/* 056E50 80056250 02202025 */ move $a0, $s1 -/* 056E54 80056254 0C021CB6 */ jal func_800872D8 -/* 056E58 80056258 02602825 */ move $a1, $s3 -/* 056E5C 8005625C 8E0A0064 */ lw $t2, 0x64($s0) -/* 056E60 80056260 240B0040 */ li $t3, 64 -/* 056E64 80056264 240C0040 */ li $t4, 64 -/* 056E68 80056268 240D0040 */ li $t5, 64 -/* 056E6C 8005626C 240E0020 */ li $t6, 32 -/* 056E70 80056270 A60200B4 */ sh $v0, 0xb4($s0) -/* 056E74 80056274 AFAE0024 */ sw $t6, 0x24($sp) -/* 056E78 80056278 AFAD0020 */ sw $t5, 0x20($sp) -/* 056E7C 8005627C AFAC001C */ sw $t4, 0x1c($sp) -/* 056E80 80056280 AFAB0018 */ sw $t3, 0x18($sp) -/* 056E84 80056284 26040004 */ addiu $a0, $s0, 4 -/* 056E88 80056288 260500B2 */ addiu $a1, $s0, 0xb2 -/* 056E8C 8005628C 8E060000 */ lw $a2, ($s0) -/* 056E90 80056290 8E070060 */ lw $a3, 0x60($s0) -/* 056E94 80056294 AFBE0014 */ sw $fp, 0x14($sp) -/* 056E98 80056298 0C01202D */ jal func_800480B4 -/* 056E9C 8005629C AFAA0010 */ sw $t2, 0x10($sp) -.L800562A0: -/* 056EA0 800562A0 3C0F8018 */ lui $t7, %hi(D_80183EC8) # $t7, 0x8018 -/* 056EA4 800562A4 25EF3EC8 */ addiu $t7, %lo(D_80183EC8) # addiu $t7, $t7, 0x3ec8 -/* 056EA8 800562A8 26520004 */ addiu $s2, $s2, 4 -/* 056EAC 800562AC 564FFFD5 */ bnel $s2, $t7, .L80056204 -/* 056EB0 800562B0 82990000 */ lb $t9, ($s4) -/* 056EB4 800562B4 8FBF0054 */ lw $ra, 0x54($sp) -/* 056EB8 800562B8 8FB00030 */ lw $s0, 0x30($sp) -/* 056EBC 800562BC 8FB10034 */ lw $s1, 0x34($sp) -/* 056EC0 800562C0 8FB20038 */ lw $s2, 0x38($sp) -/* 056EC4 800562C4 8FB3003C */ lw $s3, 0x3c($sp) -/* 056EC8 800562C8 8FB40040 */ lw $s4, 0x40($sp) -/* 056ECC 800562CC 8FB50044 */ lw $s5, 0x44($sp) -/* 056ED0 800562D0 8FB60048 */ lw $s6, 0x48($sp) -/* 056ED4 800562D4 8FB7004C */ lw $s7, 0x4c($sp) -/* 056ED8 800562D8 8FBE0050 */ lw $fp, 0x50($sp) -/* 056EDC 800562DC 03E00008 */ jr $ra -/* 056EE0 800562E0 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/non_matchings/code_800431B0/func_8005669C.s b/asm/non_matchings/code_800431B0/func_8005669C.s deleted file mode 100644 index b59451148..000000000 --- a/asm/non_matchings/code_800431B0/func_8005669C.s +++ /dev/null @@ -1,130 +0,0 @@ -glabel func_8005669C -/* 05729C 8005669C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0572A0 800566A0 AFA5002C */ sw $a1, 0x2c($sp) -/* 0572A4 800566A4 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 0572A8 800566A8 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 0572AC 800566AC 8CA30000 */ lw $v1, ($a1) -/* 0572B0 800566B0 AFBF0024 */ sw $ra, 0x24($sp) -/* 0572B4 800566B4 AFA40028 */ sw $a0, 0x28($sp) -/* 0572B8 800566B8 3C180D00 */ lui $t8, %hi(D_0D0079E8) # $t8, 0xd00 -/* 0572BC 800566BC 246E0008 */ addiu $t6, $v1, 8 -/* 0572C0 800566C0 AFB10020 */ sw $s1, 0x20($sp) -/* 0572C4 800566C4 AFB0001C */ sw $s0, 0x1c($sp) -/* 0572C8 800566C8 F7B40010 */ sdc1 $f20, 0x10($sp) -/* 0572CC 800566CC ACAE0000 */ sw $t6, ($a1) -/* 0572D0 800566D0 271879E8 */ addiu $t8, %lo(D_0D0079E8) # addiu $t8, $t8, 0x79e8 -/* 0572D4 800566D4 3C0F0600 */ lui $t7, 0x600 -/* 0572D8 800566D8 00C02025 */ move $a0, $a2 -/* 0572DC 800566DC AC6F0000 */ sw $t7, ($v1) -/* 0572E0 800566E0 0C012CC4 */ jal func_8004B310 -/* 0572E4 800566E4 AC780004 */ sw $t8, 4($v1) -/* 0572E8 800566E8 3C040D03 */ lui $a0, %hi(D_0D02AA58) # $a0, 0xd03 -/* 0572EC 800566EC 2484AA58 */ addiu $a0, %lo(D_0D02AA58) # addiu $a0, $a0, -0x55a8 -/* 0572F0 800566F0 24050010 */ li $a1, 16 -/* 0572F4 800566F4 0C010F54 */ jal func_80043D50 -/* 0572F8 800566F8 24060010 */ li $a2, 16 -/* 0572FC 800566FC 8FB90028 */ lw $t9, 0x28($sp) -/* 057300 80056700 3C098016 */ lui $t1, %hi(D_80165C18) # $t1, 0x8016 -/* 057304 80056704 25295C18 */ addiu $t1, %lo(D_80165C18) # addiu $t1, $t1, 0x5c18 -/* 057308 80056708 001940C0 */ sll $t0, $t9, 3 -/* 05730C 8005670C 01194023 */ subu $t0, $t0, $t9 -/* 057310 80056710 00084140 */ sll $t0, $t0, 5 -/* 057314 80056714 01098821 */ addu $s1, $t0, $t1 -/* 057318 80056718 C6240008 */ lwc1 $f4, 8($s1) -/* 05731C 8005671C 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 057320 80056720 4481A800 */ mtc1 $at, $f21 -/* 057324 80056724 4480A000 */ mtc1 $zero, $f20 -/* 057328 80056728 460021A1 */ cvt.d.s $f6, $f4 -/* 05732C 8005672C C6300004 */ lwc1 $f16, 4($s1) -/* 057330 80056730 46343201 */ sub.d $f8, $f6, $f20 -/* 057334 80056734 3C108018 */ lui $s0, %hi(D_80183E40) # $s0, 0x8018 -/* 057338 80056738 26103E40 */ addiu $s0, %lo(D_80183E40) # addiu $s0, $s0, 0x3e40 -/* 05733C 8005673C 460084A1 */ cvt.d.s $f18, $f16 -/* 057340 80056740 462042A0 */ cvt.s.d $f10, $f8 -/* 057344 80056744 C628000C */ lwc1 $f8, 0xc($s1) -/* 057348 80056748 3C058018 */ lui $a1, %hi(D_80183E80) # $a1, 0x8018 -/* 05734C 8005674C 46349100 */ add.d $f4, $f18, $f20 -/* 057350 80056750 E60A0004 */ swc1 $f10, 4($s0) -/* 057354 80056754 3C063E19 */ lui $a2, (0x3E19999A >> 16) # lui $a2, 0x3e19 -/* 057358 80056758 460042A1 */ cvt.d.s $f10, $f8 -/* 05735C 8005675C 462021A0 */ cvt.s.d $f6, $f4 -/* 057360 80056760 3C070D00 */ lui $a3, %hi(D_0D005770) # $a3, 0xd00 -/* 057364 80056764 24E75770 */ addiu $a3, %lo(D_0D005770) # addiu $a3, $a3, 0x5770 -/* 057368 80056768 46345400 */ add.d $f16, $f10, $f20 -/* 05736C 8005676C E6060000 */ swc1 $f6, ($s0) -/* 057370 80056770 34C6999A */ ori $a2, (0x3E19999A & 0xFFFF) # ori $a2, $a2, 0x999a -/* 057374 80056774 24A53E80 */ addiu $a1, %lo(D_80183E80) # addiu $a1, $a1, 0x3e80 -/* 057378 80056778 462084A0 */ cvt.s.d $f18, $f16 -/* 05737C 8005677C 02002025 */ move $a0, $s0 -/* 057380 80056780 0C010C6C */ jal func_800431B0 -/* 057384 80056784 E6120008 */ swc1 $f18, 8($s0) -/* 057388 80056788 C6240004 */ lwc1 $f4, 4($s1) -/* 05738C 8005678C C630000C */ lwc1 $f16, 0xc($s1) -/* 057390 80056790 3C058018 */ lui $a1, %hi(D_80183E80) # $a1, 0x8018 -/* 057394 80056794 460021A1 */ cvt.d.s $f6, $f4 -/* 057398 80056798 460084A1 */ cvt.d.s $f18, $f16 -/* 05739C 8005679C 46343200 */ add.d $f8, $f6, $f20 -/* 0573A0 800567A0 3C063E19 */ lui $a2, (0x3E19999A >> 16) # lui $a2, 0x3e19 -/* 0573A4 800567A4 3C070D00 */ lui $a3, %hi(D_0D005770) # $a3, 0xd00 -/* 0573A8 800567A8 46349101 */ sub.d $f4, $f18, $f20 -/* 0573AC 800567AC 24E75770 */ addiu $a3, %lo(D_0D005770) # addiu $a3, $a3, 0x5770 -/* 0573B0 800567B0 34C6999A */ ori $a2, (0x3E19999A & 0xFFFF) # ori $a2, $a2, 0x999a -/* 0573B4 800567B4 462042A0 */ cvt.s.d $f10, $f8 -/* 0573B8 800567B8 24A53E80 */ addiu $a1, %lo(D_80183E80) # addiu $a1, $a1, 0x3e80 -/* 0573BC 800567BC 02002025 */ move $a0, $s0 -/* 0573C0 800567C0 462021A0 */ cvt.s.d $f6, $f4 -/* 0573C4 800567C4 E60A0000 */ swc1 $f10, ($s0) -/* 0573C8 800567C8 0C010C6C */ jal func_800431B0 -/* 0573CC 800567CC E6060008 */ swc1 $f6, 8($s0) -/* 0573D0 800567D0 C6280004 */ lwc1 $f8, 4($s1) -/* 0573D4 800567D4 C624000C */ lwc1 $f4, 0xc($s1) -/* 0573D8 800567D8 3C058018 */ lui $a1, %hi(D_80183E80) # $a1, 0x8018 -/* 0573DC 800567DC 460042A1 */ cvt.d.s $f10, $f8 -/* 0573E0 800567E0 460021A1 */ cvt.d.s $f6, $f4 -/* 0573E4 800567E4 46345401 */ sub.d $f16, $f10, $f20 -/* 0573E8 800567E8 3C063E19 */ lui $a2, (0x3E19999A >> 16) # lui $a2, 0x3e19 -/* 0573EC 800567EC 3C070D00 */ lui $a3, %hi(D_0D005770) # $a3, 0xd00 -/* 0573F0 800567F0 46343201 */ sub.d $f8, $f6, $f20 -/* 0573F4 800567F4 24E75770 */ addiu $a3, %lo(D_0D005770) # addiu $a3, $a3, 0x5770 -/* 0573F8 800567F8 34C6999A */ ori $a2, (0x3E19999A & 0xFFFF) # ori $a2, $a2, 0x999a -/* 0573FC 800567FC 462084A0 */ cvt.s.d $f18, $f16 -/* 057400 80056800 24A53E80 */ addiu $a1, %lo(D_80183E80) # addiu $a1, $a1, 0x3e80 -/* 057404 80056804 02002025 */ move $a0, $s0 -/* 057408 80056808 462042A0 */ cvt.s.d $f10, $f8 -/* 05740C 8005680C E6120000 */ swc1 $f18, ($s0) -/* 057410 80056810 0C010C6C */ jal func_800431B0 -/* 057414 80056814 E60A0008 */ swc1 $f10, 8($s0) -/* 057418 80056818 C6300004 */ lwc1 $f16, 4($s1) -/* 05741C 8005681C C628000C */ lwc1 $f8, 0xc($s1) -/* 057420 80056820 3C058018 */ lui $a1, %hi(D_80183E80) # $a1, 0x8018 -/* 057424 80056824 460084A1 */ cvt.d.s $f18, $f16 -/* 057428 80056828 460042A1 */ cvt.d.s $f10, $f8 -/* 05742C 8005682C 46349101 */ sub.d $f4, $f18, $f20 -/* 057430 80056830 3C063E19 */ lui $a2, (0x3E19999A >> 16) # lui $a2, 0x3e19 -/* 057434 80056834 3C070D00 */ lui $a3, %hi(D_0D005770) # $a3, 0xd00 -/* 057438 80056838 46345400 */ add.d $f16, $f10, $f20 -/* 05743C 8005683C 24E75770 */ addiu $a3, %lo(D_0D005770) # addiu $a3, $a3, 0x5770 -/* 057440 80056840 34C6999A */ ori $a2, (0x3E19999A & 0xFFFF) # ori $a2, $a2, 0x999a -/* 057444 80056844 462021A0 */ cvt.s.d $f6, $f4 -/* 057448 80056848 24A53E80 */ addiu $a1, %lo(D_80183E80) # addiu $a1, $a1, 0x3e80 -/* 05744C 8005684C 02002025 */ move $a0, $s0 -/* 057450 80056850 462084A0 */ cvt.s.d $f18, $f16 -/* 057454 80056854 E6060000 */ swc1 $f6, ($s0) -/* 057458 80056858 0C010C6C */ jal func_800431B0 -/* 05745C 8005685C E6120008 */ swc1 $f18, 8($s0) -/* 057460 80056860 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015 -/* 057464 80056864 24840298 */ addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298 -/* 057468 80056868 8C830000 */ lw $v1, ($a0) -/* 05746C 8005686C 3C0C0001 */ lui $t4, (0x00010001 >> 16) # lui $t4, 1 -/* 057470 80056870 358C0001 */ ori $t4, (0x00010001 & 0xFFFF) # ori $t4, $t4, 1 -/* 057474 80056874 246A0008 */ addiu $t2, $v1, 8 -/* 057478 80056878 AC8A0000 */ sw $t2, ($a0) -/* 05747C 8005687C 3C0BBB00 */ lui $t3, 0xbb00 -/* 057480 80056880 AC6B0000 */ sw $t3, ($v1) -/* 057484 80056884 AC6C0004 */ sw $t4, 4($v1) -/* 057488 80056888 8FBF0024 */ lw $ra, 0x24($sp) -/* 05748C 8005688C 8FB10020 */ lw $s1, 0x20($sp) -/* 057490 80056890 8FB0001C */ lw $s0, 0x1c($sp) -/* 057494 80056894 D7B40010 */ ldc1 $f20, 0x10($sp) -/* 057498 80056898 03E00008 */ jr $ra -/* 05749C 8005689C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/non_matchings/code_80071F00/func_80072044.s b/asm/non_matchings/code_80071F00/func_80072044.s deleted file mode 100644 index 143fdb019..000000000 --- a/asm/non_matchings/code_80071F00/func_80072044.s +++ /dev/null @@ -1,54 +0,0 @@ -glabel func_80072044 -/* 072C44 80072044 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 072C48 80072048 AFBF001C */ sw $ra, 0x1c($sp) -/* 072C4C 8007204C AFB00018 */ sw $s0, 0x18($sp) -/* 072C50 80072050 8CA20000 */ lw $v0, ($a1) -/* 072C54 80072054 00808025 */ move $s0, $a0 -/* 072C58 80072058 00001825 */ move $v1, $zero -/* 072C5C 8007205C 0046082A */ slt $at, $v0, $a2 -/* 072C60 80072060 14200003 */ bnez $at, .L80072070 -/* 072C64 80072064 2407FFFF */ li $a3, -1 -/* 072C68 80072068 ACA00000 */ sw $zero, ($a1) -/* 072C6C 8007206C 00001025 */ move $v0, $zero -.L80072070: -/* 072C70 80072070 00027080 */ sll $t6, $v0, 2 -/* 072C74 80072074 18C0001A */ blez $a2, .L800720E0 -/* 072C78 80072078 01D02021 */ addu $a0, $t6, $s0 -.L8007207C: -/* 072C7C 8007207C 8C8F0000 */ lw $t7, ($a0) -/* 072C80 80072080 24480001 */ addiu $t0, $v0, 1 -/* 072C84 80072084 01001025 */ move $v0, $t0 -/* 072C88 80072088 14EF000D */ bne $a3, $t7, .L800720C0 -/* 072C8C 8007208C 0106082A */ slt $at, $t0, $a2 -/* 072C90 80072090 AFA30024 */ sw $v1, 0x24($sp) -/* 072C94 80072094 AFA5002C */ sw $a1, 0x2c($sp) -/* 072C98 80072098 0C01C7C0 */ jal find_unused_obj_index -/* 072C9C 8007209C AFA60030 */ sw $a2, 0x30($sp) -/* 072CA0 800720A0 8FA5002C */ lw $a1, 0x2c($sp) -/* 072CA4 800720A4 8FA30024 */ lw $v1, 0x24($sp) -/* 072CA8 800720A8 8FA60030 */ lw $a2, 0x30($sp) -/* 072CAC 800720AC 8CB80000 */ lw $t8, ($a1) -/* 072CB0 800720B0 27190001 */ addiu $t9, $t8, 1 -/* 072CB4 800720B4 ACB90000 */ sw $t9, ($a1) -/* 072CB8 800720B8 10000009 */ b .L800720E0 -/* 072CBC 800720BC AFA20020 */ sw $v0, 0x20($sp) -.L800720C0: -/* 072CC0 800720C0 14200003 */ bnez $at, .L800720D0 -/* 072CC4 800720C4 ACA80000 */ sw $t0, ($a1) -/* 072CC8 800720C8 ACA00000 */ sw $zero, ($a1) -/* 072CCC 800720CC 00001025 */ move $v0, $zero -.L800720D0: -/* 072CD0 800720D0 24630001 */ addiu $v1, $v1, 1 -/* 072CD4 800720D4 00024880 */ sll $t1, $v0, 2 -/* 072CD8 800720D8 1466FFE8 */ bne $v1, $a2, .L8007207C -/* 072CDC 800720DC 01302021 */ addu $a0, $t1, $s0 -.L800720E0: -/* 072CE0 800720E0 14660002 */ bne $v1, $a2, .L800720EC -/* 072CE4 800720E4 8FA40020 */ lw $a0, 0x20($sp) -/* 072CE8 800720E8 2404FFFF */ li $a0, -1 -.L800720EC: -/* 072CEC 800720EC 8FBF001C */ lw $ra, 0x1c($sp) -/* 072CF0 800720F0 8FB00018 */ lw $s0, 0x18($sp) -/* 072CF4 800720F4 27BD0028 */ addiu $sp, $sp, 0x28 -/* 072CF8 800720F8 03E00008 */ jr $ra -/* 072CFC 800720FC 00801025 */ move $v0, $a0 diff --git a/asm/non_matchings/code_80071F00/func_80074EE8.s b/asm/non_matchings/code_80071F00/func_80074EE8.s deleted file mode 100644 index c657af267..000000000 --- a/asm/non_matchings/code_80071F00/func_80074EE8.s +++ /dev/null @@ -1,66 +0,0 @@ -glabel func_80074EE8 -/* 075AE8 80074EE8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 075AEC 80074EEC 3C028016 */ lui $v0, %hi(D_80165738) # $v0, 0x8016 -/* 075AF0 80074EF0 84425738 */ lh $v0, %lo(D_80165738)($v0) -/* 075AF4 80074EF4 AFB40024 */ sw $s4, 0x24($sp) -/* 075AF8 80074EF8 AFB30020 */ sw $s3, 0x20($sp) -/* 075AFC 80074EFC AFBF0034 */ sw $ra, 0x34($sp) -/* 075B00 80074F00 AFB70030 */ sw $s7, 0x30($sp) -/* 075B04 80074F04 AFB6002C */ sw $s6, 0x2c($sp) -/* 075B08 80074F08 AFB50028 */ sw $s5, 0x28($sp) -/* 075B0C 80074F0C AFB2001C */ sw $s2, 0x1c($sp) -/* 075B10 80074F10 AFB10018 */ sw $s1, 0x18($sp) -/* 075B14 80074F14 AFB00014 */ sw $s0, 0x14($sp) -/* 075B18 80074F18 0000A025 */ move $s4, $zero -/* 075B1C 80074F1C 18400020 */ blez $v0, .L80074FA0 -/* 075B20 80074F20 00009825 */ move $s3, $zero -/* 075B24 80074F24 3C128019 */ lui $s2, %hi(D_8018C630) # $s2, 0x8019 -/* 075B28 80074F28 3C168016 */ lui $s6, %hi(D_80165C18) # $s6, 0x8016 -/* 075B2C 80074F2C 26D65C18 */ addiu $s6, %lo(D_80165C18) # addiu $s6, $s6, 0x5c18 -/* 075B30 80074F30 2652C630 */ addiu $s2, %lo(D_8018C630) # addiu $s2, $s2, -0x39d0 -/* 075B34 80074F34 241700E0 */ li $s7, 224 -/* 075B38 80074F38 2415FFFF */ li $s5, -1 -.L80074F3C: -/* 075B3C 80074F3C 8E500000 */ lw $s0, ($s2) -/* 075B40 80074F40 52150014 */ beql $s0, $s5, .L80074F94 -/* 075B44 80074F44 26730001 */ addiu $s3, $s3, 1 -/* 075B48 80074F48 02170019 */ multu $s0, $s7 -/* 075B4C 80074F4C 00007012 */ mflo $t6 -/* 075B50 80074F50 02CE8821 */ addu $s1, $s6, $t6 -/* 075B54 80074F54 862F00A6 */ lh $t7, 0xa6($s1) -/* 075B58 80074F58 51E0000E */ beql $t7, $zero, .L80074F94 -/* 075B5C 80074F5C 26730001 */ addiu $s3, $s3, 1 -/* 075B60 80074F60 0C01D38A */ jal func_80074E28 -/* 075B64 80074F64 02002025 */ move $a0, $s0 -/* 075B68 80074F68 0C01D365 */ jal func_80074D94 -/* 075B6C 80074F6C 02002025 */ move $a0, $s0 -/* 075B70 80074F70 863800A6 */ lh $t8, 0xa6($s1) -/* 075B74 80074F74 17000003 */ bnez $t8, .L80074F84 -/* 075B78 80074F78 00000000 */ nop -/* 075B7C 80074F7C 0C01C840 */ jal func_80072100 -/* 075B80 80074F80 02402025 */ move $a0, $s2 -.L80074F84: -/* 075B84 80074F84 3C028016 */ lui $v0, %hi(D_80165738) # $v0, 0x8016 -/* 075B88 80074F88 84425738 */ lh $v0, %lo(D_80165738)($v0) -/* 075B8C 80074F8C 26940001 */ addiu $s4, $s4, 1 -/* 075B90 80074F90 26730001 */ addiu $s3, $s3, 1 -.L80074F94: -/* 075B94 80074F94 0262082A */ slt $at, $s3, $v0 -/* 075B98 80074F98 1420FFE8 */ bnez $at, .L80074F3C -/* 075B9C 80074F9C 26520004 */ addiu $s2, $s2, 4 -.L80074FA0: -/* 075BA0 80074FA0 16800002 */ bnez $s4, .L80074FAC -/* 075BA4 80074FA4 3C018016 */ lui $at, %hi(D_80165730) # $at, 0x8016 -/* 075BA8 80074FA8 A4205730 */ sh $zero, %lo(D_80165730)($at) -.L80074FAC: -/* 075BAC 80074FAC 8FBF0034 */ lw $ra, 0x34($sp) -/* 075BB0 80074FB0 8FB00014 */ lw $s0, 0x14($sp) -/* 075BB4 80074FB4 8FB10018 */ lw $s1, 0x18($sp) -/* 075BB8 80074FB8 8FB2001C */ lw $s2, 0x1c($sp) -/* 075BBC 80074FBC 8FB30020 */ lw $s3, 0x20($sp) -/* 075BC0 80074FC0 8FB40024 */ lw $s4, 0x24($sp) -/* 075BC4 80074FC4 8FB50028 */ lw $s5, 0x28($sp) -/* 075BC8 80074FC8 8FB6002C */ lw $s6, 0x2c($sp) -/* 075BCC 80074FCC 8FB70030 */ lw $s7, 0x30($sp) -/* 075BD0 80074FD0 03E00008 */ jr $ra -/* 075BD4 80074FD4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/code_80071F00/func_80074FD8.s b/asm/non_matchings/code_80071F00/func_80074FD8.s deleted file mode 100644 index c320ee76a..000000000 --- a/asm/non_matchings/code_80071F00/func_80074FD8.s +++ /dev/null @@ -1,70 +0,0 @@ -glabel func_80074FD8 -/* 075BD8 80074FD8 000470C0 */ sll $t6, $a0, 3 -/* 075BDC 80074FDC 01C47023 */ subu $t6, $t6, $a0 -/* 075BE0 80074FE0 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 075BE4 80074FE4 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 075BE8 80074FE8 000E7140 */ sll $t6, $t6, 5 -/* 075BEC 80074FEC 01CF1821 */ addu $v1, $t6, $t7 -/* 075BF0 80074FF0 846200A6 */ lh $v0, 0xa6($v1) -/* 075BF4 80074FF4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 075BF8 80074FF8 AFB00020 */ sw $s0, 0x20($sp) -/* 075BFC 80074FFC 00808025 */ move $s0, $a0 -/* 075C00 80075000 10400030 */ beqz $v0, .L800750C4 -/* 075C04 80075004 AFBF0024 */ sw $ra, 0x24($sp) -/* 075C08 80075008 24010001 */ li $at, 1 -/* 075C0C 8007500C 10410006 */ beq $v0, $at, .L80075028 -/* 075C10 80075010 02002025 */ move $a0, $s0 -/* 075C14 80075014 24010002 */ li $at, 2 -/* 075C18 80075018 10410026 */ beq $v0, $at, .L800750B4 -/* 075C1C 8007501C 00000000 */ nop -/* 075C20 80075020 10000029 */ b .L800750C8 -/* 075C24 80075024 8FBF0024 */ lw $ra, 0x24($sp) -.L80075028: -/* 075C28 80075028 947800C0 */ lhu $t8, 0xc0($v1) -/* 075C2C 8007502C 3C063DF5 */ lui $a2, (0x3DF5C28F >> 16) # lui $a2, 0x3df5 -/* 075C30 80075030 24190064 */ li $t9, 100 -/* 075C34 80075034 AFB90014 */ sw $t9, 0x14($sp) -/* 075C38 80075038 34C6C28F */ ori $a2, (0x3DF5C28F & 0xFFFF) # ori $a2, $a2, 0xc28f -/* 075C3C 8007503C 8C65003C */ lw $a1, 0x3c($v1) -/* 075C40 80075040 8C670034 */ lw $a3, 0x34($v1) -/* 075C44 80075044 AFA30028 */ sw $v1, 0x28($sp) -/* 075C48 80075048 0C021F82 */ jal func_80087E08 -/* 075C4C 8007504C AFB80010 */ sw $t8, 0x10($sp) -/* 075C50 80075050 10400005 */ beqz $v0, .L80075068 -/* 075C54 80075054 8FA30028 */ lw $v1, 0x28($sp) -/* 075C58 80075058 02002025 */ move $a0, $s0 -/* 075C5C 8007505C 0C01C922 */ jal func_80072488 -/* 075C60 80075060 AFA30028 */ sw $v1, 0x28($sp) -/* 075C64 80075064 8FA30028 */ lw $v1, 0x28($sp) -.L80075068: -/* 075C68 80075068 02002025 */ move $a0, $s0 -/* 075C6C 8007506C 0C022FC6 */ jal func_8008BF18 -/* 075C70 80075070 AFA30028 */ sw $v1, 0x28($sp) -/* 075C74 80075074 8FA30028 */ lw $v1, 0x28($sp) -/* 075C78 80075078 3C028016 */ lui $v0, %hi(D_8016582C) # $v0, 0x8016 -/* 075C7C 8007507C 2442582C */ addiu $v0, %lo(D_8016582C) # addiu $v0, $v0, 0x582c -/* 075C80 80075080 94490000 */ lhu $t1, ($v0) -/* 075C84 80075084 944C0002 */ lhu $t4, 2($v0) -/* 075C88 80075088 944F0004 */ lhu $t7, 4($v0) -/* 075C8C 8007508C 946800B2 */ lhu $t0, 0xb2($v1) -/* 075C90 80075090 946B00B4 */ lhu $t3, 0xb4($v1) -/* 075C94 80075094 946E00B6 */ lhu $t6, 0xb6($v1) -/* 075C98 80075098 01095021 */ addu $t2, $t0, $t1 -/* 075C9C 8007509C 016C6821 */ addu $t5, $t3, $t4 -/* 075CA0 800750A0 01CFC021 */ addu $t8, $t6, $t7 -/* 075CA4 800750A4 A46A00B2 */ sh $t2, 0xb2($v1) -/* 075CA8 800750A8 A46D00B4 */ sh $t5, 0xb4($v1) -/* 075CAC 800750AC 10000005 */ b .L800750C4 -/* 075CB0 800750B0 A47800B6 */ sh $t8, 0xb6($v1) -.L800750B4: -/* 075CB4 800750B4 0C021BD8 */ jal func_80086F60 -/* 075CB8 800750B8 02002025 */ move $a0, $s0 -/* 075CBC 800750BC 0C01C90A */ jal func_80072428 -/* 075CC0 800750C0 02002025 */ move $a0, $s0 -.L800750C4: -/* 075CC4 800750C4 8FBF0024 */ lw $ra, 0x24($sp) -.L800750C8: -/* 075CC8 800750C8 8FB00020 */ lw $s0, 0x20($sp) -/* 075CCC 800750CC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 075CD0 800750D0 03E00008 */ jr $ra -/* 075CD4 800750D4 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80075304.s b/asm/non_matchings/code_80071F00/func_80075304.s deleted file mode 100644 index 74ca69b59..000000000 --- a/asm/non_matchings/code_80071F00/func_80075304.s +++ /dev/null @@ -1,81 +0,0 @@ -glabel func_80075304 -/* 075F04 80075304 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 075F08 80075308 AFB3002C */ sw $s3, 0x2c($sp) -/* 075F0C 8007530C AFB20028 */ sw $s2, 0x28($sp) -/* 075F10 80075310 AFB10024 */ sw $s1, 0x24($sp) -/* 075F14 80075314 00A09025 */ move $s2, $a1 -/* 075F18 80075318 00E09825 */ move $s3, $a3 -/* 075F1C 8007531C AFBF0044 */ sw $ra, 0x44($sp) -/* 075F20 80075320 AFBE0040 */ sw $fp, 0x40($sp) -/* 075F24 80075324 AFB7003C */ sw $s7, 0x3c($sp) -/* 075F28 80075328 AFB60038 */ sw $s6, 0x38($sp) -/* 075F2C 8007532C AFB50034 */ sw $s5, 0x34($sp) -/* 075F30 80075330 AFB40030 */ sw $s4, 0x30($sp) -/* 075F34 80075334 AFB00020 */ sw $s0, 0x20($sp) -/* 075F38 80075338 AFA40050 */ sw $a0, 0x50($sp) -/* 075F3C 8007533C AFA60058 */ sw $a2, 0x58($sp) -/* 075F40 80075340 18E0002E */ blez $a3, .L800753FC -/* 075F44 80075344 00008825 */ move $s1, $zero -/* 075F48 80075348 3C1E8019 */ lui $fp, %hi(D_8018C630) # $fp, 0x8019 -/* 075F4C 8007534C 27DEC630 */ addiu $fp, %lo(D_8018C630) # addiu $fp, $fp, -0x39d0 -/* 075F50 80075350 2417FFFF */ li $s7, -1 -/* 075F54 80075354 24160003 */ li $s6, 3 -/* 075F58 80075358 24150002 */ li $s5, 2 -/* 075F5C 8007535C 24140001 */ li $s4, 1 -/* 075F60 80075360 8FB00048 */ lw $s0, 0x48($sp) -.L80075364: -/* 075F64 80075364 12540007 */ beq $s2, $s4, .L80075384 -/* 075F68 80075368 3C048019 */ lui $a0, %hi(D_8018C1B0) # 0x8019 -/* 075F6C 8007536C 1255000C */ beq $s2, $s5, .L800753A0 -/* 075F70 80075370 3C048019 */ lui $a0, %hi(D_8018C3F0) # $a0, 0x8019 -/* 075F74 80075374 12560011 */ beq $s2, $s6, .L800753BC -/* 075F78 80075378 03C02025 */ move $a0, $fp -/* 075F7C 8007537C 10000014 */ b .L800753D0 -/* 075F80 80075380 00000000 */ nop -.L80075384: -/* 075F84 80075384 3C058018 */ lui $a1, %hi(D_80183E38) # $a1, 0x8018 -/* 075F88 80075388 24A53E38 */ addiu $a1, %lo(D_80183E38) # addiu $a1, $a1, 0x3e38 -/* 075F8C 8007538C 2484C1B0 */ addiu $a0, %lo(D_8018C1B0) # addiu $a0, $a0, -0x3e50 -/* 075F90 80075390 0C01C811 */ jal func_80072044 -/* 075F94 80075394 24060080 */ li $a2, 128 -/* 075F98 80075398 1000000D */ b .L800753D0 -/* 075F9C 8007539C 00408025 */ move $s0, $v0 -.L800753A0: -/* 075FA0 800753A0 3C058018 */ lui $a1, %hi(D_80183E4C) # $a1, 0x8018 -/* 075FA4 800753A4 24A53E4C */ addiu $a1, %lo(D_80183E4C) # addiu $a1, $a1, 0x3e4c -/* 075FA8 800753A8 2484C3F0 */ addiu $a0, $a0, %lo(D_8018C3F0) # -0x3c10 -/* 075FAC 800753AC 0C01C811 */ jal func_80072044 -/* 075FB0 800753B0 24060080 */ li $a2, 128 -/* 075FB4 800753B4 10000006 */ b .L800753D0 -/* 075FB8 800753B8 00408025 */ move $s0, $v0 -.L800753BC: -/* 075FBC 800753BC 3C058018 */ lui $a1, %hi(D_80183E5C) # $a1, 0x8018 -/* 075FC0 800753C0 24A53E5C */ addiu $a1, %lo(D_80183E5C) # addiu $a1, $a1, 0x3e5c -/* 075FC4 800753C4 0C01C811 */ jal func_80072044 -/* 075FC8 800753C8 24060080 */ li $a2, 128 -/* 075FCC 800753CC 00408025 */ move $s0, $v0 -.L800753D0: -/* 075FD0 800753D0 1217000A */ beq $s0, $s7, .L800753FC -/* 075FD4 800753D4 02002025 */ move $a0, $s0 -/* 075FD8 800753D8 02202825 */ move $a1, $s1 -/* 075FDC 800753DC 8FA60050 */ lw $a2, 0x50($sp) -/* 075FE0 800753E0 8FA70058 */ lw $a3, 0x58($sp) -/* 075FE4 800753E4 0C01D436 */ jal func_800750D8 -/* 075FE8 800753E8 AFB30010 */ sw $s3, 0x10($sp) -/* 075FEC 800753EC 26310001 */ addiu $s1, $s1, 1 -/* 075FF0 800753F0 1633FFDC */ bne $s1, $s3, .L80075364 -/* 075FF4 800753F4 00000000 */ nop -/* 075FF8 800753F8 AFB00048 */ sw $s0, 0x48($sp) -.L800753FC: -/* 075FFC 800753FC 8FBF0044 */ lw $ra, 0x44($sp) -/* 076000 80075400 8FB00020 */ lw $s0, 0x20($sp) -/* 076004 80075404 8FB10024 */ lw $s1, 0x24($sp) -/* 076008 80075408 8FB20028 */ lw $s2, 0x28($sp) -/* 07600C 8007540C 8FB3002C */ lw $s3, 0x2c($sp) -/* 076010 80075410 8FB40030 */ lw $s4, 0x30($sp) -/* 076014 80075414 8FB50034 */ lw $s5, 0x34($sp) -/* 076018 80075418 8FB60038 */ lw $s6, 0x38($sp) -/* 07601C 8007541C 8FB7003C */ lw $s7, 0x3c($sp) -/* 076020 80075420 8FBE0040 */ lw $fp, 0x40($sp) -/* 076024 80075424 03E00008 */ jr $ra -/* 076028 80075428 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/non_matchings/code_80071F00/func_8007542C.s b/asm/non_matchings/code_80071F00/func_8007542C.s deleted file mode 100644 index 1c54a8799..000000000 --- a/asm/non_matchings/code_80071F00/func_8007542C.s +++ /dev/null @@ -1,90 +0,0 @@ -glabel func_8007542C -/* 07602C 8007542C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 076030 80075430 3C028016 */ lui $v0, %hi(D_8016582C) # $v0, 0x8016 -/* 076034 80075434 2442582C */ addiu $v0, %lo(D_8016582C) # addiu $v0, $v0, 0x582c -/* 076038 80075438 944E0000 */ lhu $t6, ($v0) -/* 07603C 8007543C 94580002 */ lhu $t8, 2($v0) -/* 076040 80075440 94480004 */ lhu $t0, 4($v0) -/* 076044 80075444 AFBE0038 */ sw $fp, 0x38($sp) -/* 076048 80075448 AFB70034 */ sw $s7, 0x34($sp) -/* 07604C 8007544C AFB60030 */ sw $s6, 0x30($sp) -/* 076050 80075450 AFB5002C */ sw $s5, 0x2c($sp) -/* 076054 80075454 AFB40028 */ sw $s4, 0x28($sp) -/* 076058 80075458 AFB30024 */ sw $s3, 0x24($sp) -/* 07605C 8007545C AFB20020 */ sw $s2, 0x20($sp) -/* 076060 80075460 AFB1001C */ sw $s1, 0x1c($sp) -/* 076064 80075464 25CF2000 */ addiu $t7, $t6, 0x2000 -/* 076068 80075468 27191000 */ addiu $t9, $t8, 0x1000 -/* 07606C 8007546C 25091800 */ addiu $t1, $t0, 0x1800 -/* 076070 80075470 0080A025 */ move $s4, $a0 -/* 076074 80075474 AFBF003C */ sw $ra, 0x3c($sp) -/* 076078 80075478 AFB00018 */ sw $s0, 0x18($sp) -/* 07607C 8007547C A44F0000 */ sh $t7, ($v0) -/* 076080 80075480 A4590002 */ sh $t9, 2($v0) -/* 076084 80075484 A4490004 */ sh $t1, 4($v0) -/* 076088 80075488 00008825 */ move $s1, $zero -/* 07608C 8007548C 00009025 */ move $s2, $zero -/* 076090 80075490 8FB30044 */ lw $s3, 0x44($sp) -/* 076094 80075494 24150001 */ li $s5, 1 -/* 076098 80075498 24160002 */ li $s6, 2 -/* 07609C 8007549C 24170003 */ li $s7, 3 -/* 0760A0 800754A0 241EFFFF */ li $fp, -1 -.L800754A4: -/* 0760A4 800754A4 12950007 */ beq $s4, $s5, .L800754C4 -/* 0760A8 800754A8 3C0A8019 */ lui $t2, %hi(D_8018C1B0) # 0x8019 -/* 0760AC 800754AC 12960008 */ beq $s4, $s6, .L800754D0 -/* 0760B0 800754B0 3C0B8019 */ lui $t3, %hi(D_8018C3F0) # 0x8019 -/* 0760B4 800754B4 12970009 */ beq $s4, $s7, .L800754DC -/* 0760B8 800754B8 3C0C8019 */ lui $t4, %hi(D_8018C630) # 0x8019 -/* 0760BC 800754BC 10000009 */ b .L800754E4 -/* 0760C0 800754C0 02711021 */ addu $v0, $s3, $s1 -.L800754C4: -/* 0760C4 800754C4 2553C1B0 */ addiu $s3, $t2, %lo(D_8018C1B0) # -0x3e50 -/* 0760C8 800754C8 10000006 */ b .L800754E4 -/* 0760CC 800754CC 02331021 */ addu $v0, $s1, $s3 -.L800754D0: -/* 0760D0 800754D0 2573C3F0 */ addiu $s3, $t3, %lo(D_8018C3F0) # -0x3c10 -/* 0760D4 800754D4 10000003 */ b .L800754E4 -/* 0760D8 800754D8 02331021 */ addu $v0, $s1, $s3 -.L800754DC: -/* 0760DC 800754DC 2593C630 */ addiu $s3, $t4, %lo(D_8018C630) # -0x39d0 -/* 0760E0 800754E0 02331021 */ addu $v0, $s1, $s3 -.L800754E4: -/* 0760E4 800754E4 8C440000 */ lw $a0, ($v0) -/* 0760E8 800754E8 3C0E8016 */ lui $t6, %hi(D_80165C18) # $t6, 0x8016 -/* 0760EC 800754EC 25CE5C18 */ addiu $t6, %lo(D_80165C18) # addiu $t6, $t6, 0x5c18 -/* 0760F0 800754F0 109E000F */ beq $a0, $fp, .L80075530 -/* 0760F4 800754F4 000468C0 */ sll $t5, $a0, 3 -/* 0760F8 800754F8 01A46823 */ subu $t5, $t5, $a0 -/* 0760FC 800754FC 000D6940 */ sll $t5, $t5, 5 -/* 076100 80075500 01AE8021 */ addu $s0, $t5, $t6 -/* 076104 80075504 860F00A6 */ lh $t7, 0xa6($s0) -/* 076108 80075508 51E0000A */ beql $t7, $zero, .L80075534 -/* 07610C 8007550C 26520001 */ addiu $s2, $s2, 1 -/* 076110 80075510 0C01D3F6 */ jal func_80074FD8 -/* 076114 80075514 00000000 */ nop -/* 076118 80075518 861800A6 */ lh $t8, 0xa6($s0) -/* 07611C 8007551C 0012C880 */ sll $t9, $s2, 2 -/* 076120 80075520 57000004 */ bnel $t8, $zero, .L80075534 -/* 076124 80075524 26520001 */ addiu $s2, $s2, 1 -/* 076128 80075528 0C01C840 */ jal func_80072100 -/* 07612C 8007552C 03332021 */ addu $a0, $t9, $s3 -.L80075530: -/* 076130 80075530 26520001 */ addiu $s2, $s2, 1 -.L80075534: -/* 076134 80075534 24010080 */ li $at, 128 -/* 076138 80075538 1641FFDA */ bne $s2, $at, .L800754A4 -/* 07613C 8007553C 26310004 */ addiu $s1, $s1, 4 -/* 076140 80075540 8FBF003C */ lw $ra, 0x3c($sp) -/* 076144 80075544 AFB30044 */ sw $s3, 0x44($sp) -/* 076148 80075548 8FB30024 */ lw $s3, 0x24($sp) -/* 07614C 8007554C 8FB00018 */ lw $s0, 0x18($sp) -/* 076150 80075550 8FB1001C */ lw $s1, 0x1c($sp) -/* 076154 80075554 8FB20020 */ lw $s2, 0x20($sp) -/* 076158 80075558 8FB40028 */ lw $s4, 0x28($sp) -/* 07615C 8007555C 8FB5002C */ lw $s5, 0x2c($sp) -/* 076160 80075560 8FB60030 */ lw $s6, 0x30($sp) -/* 076164 80075564 8FB70034 */ lw $s7, 0x34($sp) -/* 076168 80075568 8FBE0038 */ lw $fp, 0x38($sp) -/* 07616C 8007556C 03E00008 */ jr $ra -/* 076170 80075570 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/non_matchings/code_80071F00/func_800755FC.s b/asm/non_matchings/code_80071F00/func_800755FC.s deleted file mode 100644 index 270bd04c9..000000000 --- a/asm/non_matchings/code_80071F00/func_800755FC.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_800755FC -/* 0761FC 800755FC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 076200 80075600 AFBF0014 */ sw $ra, 0x14($sp) -/* 076204 80075604 AFA50024 */ sw $a1, 0x24($sp) -/* 076208 80075608 14800010 */ bnez $a0, .L8007564C -/* 07620C 8007560C AFA60028 */ sw $a2, 0x28($sp) -/* 076210 80075610 3C048019 */ lui $a0, %hi(D_8018C3F0) # $a0, 0x8019 -/* 076214 80075614 3C058018 */ lui $a1, %hi(D_80183E4C) # $a1, 0x8018 -/* 076218 80075618 24A53E4C */ addiu $a1, %lo(D_80183E4C) # addiu $a1, $a1, 0x3e4c -/* 07621C 8007561C 2484C3F0 */ addiu $a0, %lo(D_8018C3F0) # addiu $a0, $a0, -0x3c10 -/* 076220 80075620 0C01C811 */ jal func_80072044 -/* 076224 80075624 24060080 */ li $a2, 128 -/* 076228 80075628 2401FFFF */ li $at, -1 -/* 07622C 8007562C 10410015 */ beq $v0, $at, .L80075684 -/* 076230 80075630 00402025 */ move $a0, $v0 -/* 076234 80075634 8FA50024 */ lw $a1, 0x24($sp) -/* 076238 80075638 8FA60028 */ lw $a2, 0x28($sp) -/* 07623C 8007563C 0C01D55D */ jal func_80075574 -/* 076240 80075640 AFA2001C */ sw $v0, 0x1c($sp) -/* 076244 80075644 1000000F */ b .L80075684 -/* 076248 80075648 8FA4001C */ lw $a0, 0x1c($sp) -.L8007564C: -/* 07624C 8007564C 3C048019 */ lui $a0, %hi(D_8018C630) # $a0, 0x8019 -/* 076250 80075650 3C058018 */ lui $a1, %hi(D_80183E5C) # $a1, 0x8018 -/* 076254 80075654 24A53E5C */ addiu $a1, %lo(D_80183E5C) # addiu $a1, $a1, 0x3e5c -/* 076258 80075658 2484C630 */ addiu $a0, %lo(D_8018C630) # addiu $a0, $a0, -0x39d0 -/* 07625C 8007565C 0C01C811 */ jal func_80072044 -/* 076260 80075660 24060080 */ li $a2, 128 -/* 076264 80075664 2401FFFF */ li $at, -1 -/* 076268 80075668 10410006 */ beq $v0, $at, .L80075684 -/* 07626C 8007566C 00402025 */ move $a0, $v0 -/* 076270 80075670 8FA50024 */ lw $a1, 0x24($sp) -/* 076274 80075674 8FA60028 */ lw $a2, 0x28($sp) -/* 076278 80075678 0C01D55D */ jal func_80075574 -/* 07627C 8007567C AFA2001C */ sw $v0, 0x1c($sp) -/* 076280 80075680 8FA4001C */ lw $a0, 0x1c($sp) -.L80075684: -/* 076284 80075684 8FBF0014 */ lw $ra, 0x14($sp) -/* 076288 80075688 27BD0020 */ addiu $sp, $sp, 0x20 -/* 07628C 8007568C 00801025 */ move $v0, $a0 -/* 076290 80075690 03E00008 */ jr $ra -/* 076294 80075694 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80075F98.s b/asm/non_matchings/code_80071F00/func_80075F98.s deleted file mode 100644 index 5b54ebbb5..000000000 --- a/asm/non_matchings/code_80071F00/func_80075F98.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80075F98 -/* 076B98 80075F98 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 076B9C 80075F9C F7B40018 */ sdc1 $f20, 0x18($sp) -/* 076BA0 80075FA0 AFB40030 */ sw $s4, 0x30($sp) -/* 076BA4 80075FA4 AFB3002C */ sw $s3, 0x2c($sp) -/* 076BA8 80075FA8 AFB20028 */ sw $s2, 0x28($sp) -/* 076BAC 80075FAC AFB10024 */ sw $s1, 0x24($sp) -/* 076BB0 80075FB0 AFB00020 */ sw $s0, 0x20($sp) -/* 076BB4 80075FB4 4486A000 */ mtc1 $a2, $f20 -/* 076BB8 80075FB8 00808825 */ move $s1, $a0 -/* 076BBC 80075FBC 30B2FFFF */ andi $s2, $a1, 0xffff -/* 076BC0 80075FC0 AFBF0034 */ sw $ra, 0x34($sp) -/* 076BC4 80075FC4 AFA5003C */ sw $a1, 0x3c($sp) -/* 076BC8 80075FC8 00008025 */ move $s0, $zero -/* 076BCC 80075FCC 2413FFFF */ li $s3, -1 -/* 076BD0 80075FD0 2414000A */ li $s4, 10 -/* 076BD4 80075FD4 4406A000 */ mfc1 $a2, $f20 -.L80075FD8: -/* 076BD8 80075FD8 02202025 */ move $a0, $s1 -/* 076BDC 80075FDC 3245FFFF */ andi $a1, $s2, 0xffff -/* 076BE0 80075FE0 0C01D7CA */ jal func_80075F28 -/* 076BE4 80075FE4 02003825 */ move $a3, $s0 -/* 076BE8 80075FE8 10530003 */ beq $v0, $s3, .L80075FF8 -/* 076BEC 80075FEC 26100001 */ addiu $s0, $s0, 1 -/* 076BF0 80075FF0 5614FFF9 */ bnel $s0, $s4, .L80075FD8 -/* 076BF4 80075FF4 4406A000 */ mfc1 $a2, $f20 -.L80075FF8: -/* 076BF8 80075FF8 8FBF0034 */ lw $ra, 0x34($sp) -/* 076BFC 80075FFC D7B40018 */ ldc1 $f20, 0x18($sp) -/* 076C00 80076000 8FB00020 */ lw $s0, 0x20($sp) -/* 076C04 80076004 8FB10024 */ lw $s1, 0x24($sp) -/* 076C08 80076008 8FB20028 */ lw $s2, 0x28($sp) -/* 076C0C 8007600C 8FB3002C */ lw $s3, 0x2c($sp) -/* 076C10 80076010 8FB40030 */ lw $s4, 0x30($sp) -/* 076C14 80076014 03E00008 */ jr $ra -/* 076C18 80076018 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/code_80071F00/func_8007614C.s b/asm/non_matchings/code_80071F00/func_8007614C.s deleted file mode 100644 index f12c4c0fc..000000000 --- a/asm/non_matchings/code_80071F00/func_8007614C.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_8007614C -/* 076D4C 8007614C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 076D50 80076150 AFB10018 */ sw $s1, 0x18($sp) -/* 076D54 80076154 AFB00014 */ sw $s0, 0x14($sp) -/* 076D58 80076158 3C108019 */ lui $s0, %hi(D_8018BFA8) # $s0, 0x8019 -/* 076D5C 8007615C 3C118019 */ lui $s1, %hi(D_8018BFB8) # $s1, 0x8019 -/* 076D60 80076160 AFBF001C */ sw $ra, 0x1c($sp) -/* 076D64 80076164 2631BFB8 */ addiu $s1, %lo(D_8018BFB8) # addiu $s1, $s1, -0x4048 -/* 076D68 80076168 2610BFA8 */ addiu $s0, %lo(D_8018BFA8) # addiu $s0, $s0, -0x4058 -.L8007616C: -/* 076D6C 8007616C 0C01D807 */ jal func_8007601C -/* 076D70 80076170 8E040000 */ lw $a0, ($s0) -/* 076D74 80076174 26100004 */ addiu $s0, $s0, 4 -/* 076D78 80076178 1611FFFC */ bne $s0, $s1, .L8007616C -/* 076D7C 8007617C 00000000 */ nop -/* 076D80 80076180 8FBF001C */ lw $ra, 0x1c($sp) -/* 076D84 80076184 8FB00014 */ lw $s0, 0x14($sp) -/* 076D88 80076188 8FB10018 */ lw $s1, 0x18($sp) -/* 076D8C 8007618C 03E00008 */ jr $ra -/* 076D90 80076190 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/non_matchings/code_80071F00/func_80076278.s b/asm/non_matchings/code_80071F00/func_80076278.s deleted file mode 100644 index 8c1b98650..000000000 --- a/asm/non_matchings/code_80071F00/func_80076278.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80076278 -/* 076E78 80076278 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 076E7C 8007627C AFA40020 */ sw $a0, 0x20($sp) -/* 076E80 80076280 AFA50024 */ sw $a1, 0x24($sp) -/* 076E84 80076284 AFBF0014 */ sw $ra, 0x14($sp) -/* 076E88 80076288 AFA60028 */ sw $a2, 0x28($sp) -/* 076E8C 8007628C 3C058018 */ lui $a1, %hi(D_80183E38) # $a1, 0x8018 -/* 076E90 80076290 3C048019 */ lui $a0, %hi(D_8018C1B0) # $a0, 0x8019 -/* 076E94 80076294 2484C1B0 */ addiu $a0, %lo(D_8018C1B0) # addiu $a0, $a0, -0x3e50 -/* 076E98 80076298 24A53E38 */ addiu $a1, %lo(D_80183E38) # addiu $a1, $a1, 0x3e38 -/* 076E9C 8007629C 0C01C811 */ jal func_80072044 -/* 076EA0 800762A0 24060080 */ li $a2, 128 -/* 076EA4 800762A4 2401FFFF */ li $at, -1 -/* 076EA8 800762A8 10410007 */ beq $v0, $at, .L800762C8 -/* 076EAC 800762AC 00402025 */ move $a0, $v0 -/* 076EB0 800762B0 8FA50020 */ lw $a1, 0x20($sp) -/* 076EB4 800762B4 8FA60024 */ lw $a2, 0x24($sp) -/* 076EB8 800762B8 8FA70028 */ lw $a3, 0x28($sp) -/* 076EBC 800762BC 0C01D865 */ jal func_80076194 -/* 076EC0 800762C0 AFA2001C */ sw $v0, 0x1c($sp) -/* 076EC4 800762C4 8FA4001C */ lw $a0, 0x1c($sp) -.L800762C8: -/* 076EC8 800762C8 8FBF0014 */ lw $ra, 0x14($sp) -/* 076ECC 800762CC 27BD0020 */ addiu $sp, $sp, 0x20 -/* 076ED0 800762D0 00801025 */ move $v0, $a0 -/* 076ED4 800762D4 03E00008 */ jr $ra -/* 076ED8 800762D8 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_800762DC.s b/asm/non_matchings/code_80071F00/func_800762DC.s deleted file mode 100644 index 76b098344..000000000 --- a/asm/non_matchings/code_80071F00/func_800762DC.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_800762DC -/* 076EDC 800762DC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 076EE0 800762E0 F7B40010 */ sdc1 $f20, 0x10($sp) -/* 076EE4 800762E4 AFB30028 */ sw $s3, 0x28($sp) -/* 076EE8 800762E8 AFB20024 */ sw $s2, 0x24($sp) -/* 076EEC 800762EC AFB10020 */ sw $s1, 0x20($sp) -/* 076EF0 800762F0 AFB0001C */ sw $s0, 0x1c($sp) -/* 076EF4 800762F4 4485A000 */ mtc1 $a1, $f20 -/* 076EF8 800762F8 00808825 */ move $s1, $a0 -/* 076EFC 800762FC AFBF002C */ sw $ra, 0x2c($sp) -/* 076F00 80076300 00008025 */ move $s0, $zero -/* 076F04 80076304 2412FFFF */ li $s2, -1 -/* 076F08 80076308 24130014 */ li $s3, 20 -/* 076F0C 8007630C 4405A000 */ mfc1 $a1, $f20 -.L80076310: -/* 076F10 80076310 02202025 */ move $a0, $s1 -/* 076F14 80076314 0C01D89E */ jal func_80076278 -/* 076F18 80076318 02003025 */ move $a2, $s0 -/* 076F1C 8007631C 10520003 */ beq $v0, $s2, .L8007632C -/* 076F20 80076320 26100001 */ addiu $s0, $s0, 1 -/* 076F24 80076324 5613FFFA */ bnel $s0, $s3, .L80076310 -/* 076F28 80076328 4405A000 */ mfc1 $a1, $f20 -.L8007632C: -/* 076F2C 8007632C 8FBF002C */ lw $ra, 0x2c($sp) -/* 076F30 80076330 D7B40010 */ ldc1 $f20, 0x10($sp) -/* 076F34 80076334 8FB0001C */ lw $s0, 0x1c($sp) -/* 076F38 80076338 8FB10020 */ lw $s1, 0x20($sp) -/* 076F3C 8007633C 8FB20024 */ lw $s2, 0x24($sp) -/* 076F40 80076340 8FB30028 */ lw $s3, 0x28($sp) -/* 076F44 80076344 03E00008 */ jr $ra -/* 076F48 80076348 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/code_80071F00/func_8007661C.s b/asm/non_matchings/code_80071F00/func_8007661C.s deleted file mode 100644 index d86bf0d80..000000000 --- a/asm/non_matchings/code_80071F00/func_8007661C.s +++ /dev/null @@ -1,88 +0,0 @@ -glabel func_8007661C -/* 07721C 8007661C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 077220 80076620 AFB10018 */ sw $s1, 0x18($sp) -/* 077224 80076624 3C118018 */ lui $s1, %hi(D_80183F28) # $s1, 0x8018 -/* 077228 80076628 8E313F28 */ lw $s1, %lo(D_80183F28)($s1) -/* 07722C 8007662C 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 077230 80076630 AFB00014 */ sw $s0, 0x14($sp) -/* 077234 80076634 001170C0 */ sll $t6, $s1, 3 -/* 077238 80076638 01D17023 */ subu $t6, $t6, $s1 -/* 07723C 8007663C 000E7140 */ sll $t6, $t6, 5 -/* 077240 80076640 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 077244 80076644 01CF8021 */ addu $s0, $t6, $t7 -/* 077248 80076648 8E02004C */ lw $v0, 0x4c($s0) -/* 07724C 8007664C AFBF001C */ sw $ra, 0x1c($sp) -/* 077250 80076650 18400006 */ blez $v0, .L8007666C -/* 077254 80076654 2458FFFF */ addiu $t8, $v0, -1 -/* 077258 80076658 17000004 */ bnez $t8, .L8007666C -/* 07725C 8007665C AE18004C */ sw $t8, 0x4c($s0) -/* 077260 80076660 02202025 */ move $a0, $s1 -/* 077264 80076664 0C01C8B3 */ jal func_800722CC -/* 077268 80076668 24050001 */ li $a1, 1 -.L8007666C: -/* 07726C 8007666C 8E020048 */ lw $v0, 0x48($s0) -/* 077270 80076670 18400007 */ blez $v0, .L80076690 -/* 077274 80076674 2448FFFF */ addiu $t0, $v0, -1 -/* 077278 80076678 15000005 */ bnez $t0, .L80076690 -/* 07727C 8007667C AE080048 */ sw $t0, 0x48($s0) -/* 077280 80076680 3C055103 */ lui $a1, (0x51038009 >> 16) # lui $a1, 0x5103 -/* 077284 80076684 34A58009 */ ori $a1, (0x51038009 & 0xFFFF) # ori $a1, $a1, 0x8009 -/* 077288 80076688 0C0327BD */ jal func_800C9EF4 -/* 07728C 8007668C 26040004 */ addiu $a0, $s0, 4 -.L80076690: -/* 077290 80076690 8E0A004C */ lw $t2, 0x4c($s0) -/* 077294 80076694 02202025 */ move $a0, $s1 -/* 077298 80076698 3C05443B */ lui $a1, (0x443B8000 >> 16) # lui $a1, 0x443b -/* 07729C 8007669C 55400025 */ bnel $t2, $zero, .L80076734 -/* 0772A0 800766A0 24040004 */ li $a0, 4 -/* 0772A4 800766A4 0C0229B7 */ jal func_8008A6DC -/* 0772A8 800766A8 34A58000 */ ori $a1, (0x443B8000 & 0xFFFF) # ori $a1, $a1, 0x8000 -/* 0772AC 800766AC 02202025 */ move $a0, $s1 -/* 0772B0 800766B0 0C01C88F */ jal func_8007223C -/* 0772B4 800766B4 3C050004 */ lui $a1, 4 -/* 0772B8 800766B8 1040001D */ beqz $v0, .L80076730 -/* 0772BC 800766BC 02202025 */ move $a0, $s1 -/* 0772C0 800766C0 0C01C8D5 */ jal func_80072354 -/* 0772C4 800766C4 24050001 */ li $a1, 1 -/* 0772C8 800766C8 10400019 */ beqz $v0, .L80076730 -/* 0772CC 800766CC 02202025 */ move $a0, $s1 -/* 0772D0 800766D0 260B0004 */ addiu $t3, $s0, 4 -/* 0772D4 800766D4 AFAB0024 */ sw $t3, 0x24($sp) -/* 0772D8 800766D8 0C01C8A9 */ jal func_800722A4 -/* 0772DC 800766DC 24050001 */ li $a1, 1 -/* 0772E0 800766E0 8FB10024 */ lw $s1, 0x24($sp) -/* 0772E4 800766E4 3C053F80 */ lui $a1, 0x3f80 -/* 0772E8 800766E8 0C01D8B7 */ jal func_800762DC -/* 0772EC 800766EC 02202025 */ move $a0, $s1 -/* 0772F0 800766F0 3C065103 */ lui $a2, (0x51038009 >> 16) # lui $a2, 0x5103 -/* 0772F4 800766F4 34C68009 */ ori $a2, (0x51038009 & 0xFFFF) # ori $a2, $a2, 0x8009 -/* 0772F8 800766F8 02202025 */ move $a0, $s1 -/* 0772FC 800766FC 0C032760 */ jal func_800C9D80 -/* 077300 80076700 26050038 */ addiu $a1, $s0, 0x38 -/* 077304 80076704 860200A4 */ lh $v0, 0xa4($s0) -/* 077308 80076708 240E012C */ li $t6, 300 -/* 07730C 8007670C 240F003C */ li $t7, 60 -/* 077310 80076710 18400005 */ blez $v0, .L80076728 -/* 077314 80076714 244CFFFF */ addiu $t4, $v0, -1 -/* 077318 80076718 240D005A */ li $t5, 90 -/* 07731C 8007671C A60C00A4 */ sh $t4, 0xa4($s0) -/* 077320 80076720 10000002 */ b .L8007672C -/* 077324 80076724 AE0D004C */ sw $t5, 0x4c($s0) -.L80076728: -/* 077328 80076728 AE0E004C */ sw $t6, 0x4c($s0) -.L8007672C: -/* 07732C 8007672C AE0F0048 */ sw $t7, 0x48($s0) -.L80076730: -/* 077330 80076730 24040004 */ li $a0, 4 -.L80076734: -/* 077334 80076734 0C022A2C */ jal func_8008A8B0 -/* 077338 80076738 24050005 */ li $a1, 5 -/* 07733C 8007673C 14400002 */ bnez $v0, .L80076748 -/* 077340 80076740 24180002 */ li $t8, 2 -/* 077344 80076744 A61800A4 */ sh $t8, 0xa4($s0) -.L80076748: -/* 077348 80076748 8FBF001C */ lw $ra, 0x1c($sp) -/* 07734C 8007674C 8FB00014 */ lw $s0, 0x14($sp) -/* 077350 80076750 8FB10018 */ lw $s1, 0x18($sp) -/* 077354 80076754 03E00008 */ jr $ra -/* 077358 80076758 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/code_80071F00/func_80076828.s b/asm/non_matchings/code_80071F00/func_80076828.s deleted file mode 100644 index b9ea17f58..000000000 --- a/asm/non_matchings/code_80071F00/func_80076828.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80076828 -/* 077428 80076828 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 07742C 8007682C AFA40020 */ sw $a0, 0x20($sp) -/* 077430 80076830 AFA50024 */ sw $a1, 0x24($sp) -/* 077434 80076834 AFBF0014 */ sw $ra, 0x14($sp) -/* 077438 80076838 3C058018 */ lui $a1, %hi(D_80183E38) # $a1, 0x8018 -/* 07743C 8007683C 3C048019 */ lui $a0, %hi(D_8018C1B0) # $a0, 0x8019 -/* 077440 80076840 2484C1B0 */ addiu $a0, %lo(D_8018C1B0) # addiu $a0, $a0, -0x3e50 -/* 077444 80076844 24A53E38 */ addiu $a1, %lo(D_80183E38) # addiu $a1, $a1, 0x3e38 -/* 077448 80076848 0C01C811 */ jal func_80072044 -/* 07744C 8007684C 24060080 */ li $a2, 128 -/* 077450 80076850 2401FFFF */ li $at, -1 -/* 077454 80076854 10410006 */ beq $v0, $at, .L80076870 -/* 077458 80076858 00402025 */ move $a0, $v0 -/* 07745C 8007685C 8FA50020 */ lw $a1, 0x20($sp) -/* 077460 80076860 8FA60024 */ lw $a2, 0x24($sp) -/* 077464 80076864 0C01D9D7 */ jal func_8007675C -/* 077468 80076868 AFA2001C */ sw $v0, 0x1c($sp) -/* 07746C 8007686C 8FA4001C */ lw $a0, 0x1c($sp) -.L80076870: -/* 077470 80076870 8FBF0014 */ lw $ra, 0x14($sp) -/* 077474 80076874 27BD0020 */ addiu $sp, $sp, 0x20 -/* 077478 80076878 00801025 */ move $v0, $a0 -/* 07747C 8007687C 03E00008 */ jr $ra -/* 077480 80076880 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80076958.s b/asm/non_matchings/code_80071F00/func_80076958.s deleted file mode 100644 index e2306e655..000000000 --- a/asm/non_matchings/code_80071F00/func_80076958.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80076958 -/* 077558 80076958 000470C0 */ sll $t6, $a0, 3 -/* 07755C 8007695C 01C47023 */ subu $t6, $t6, $a0 -/* 077560 80076960 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 077564 80076964 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 077568 80076968 000E7140 */ sll $t6, $t6, 5 -/* 07756C 8007696C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 077570 80076970 3C030D03 */ lui $v1, %hi(D_0D02BC58) # $v1, 0xd03 -/* 077574 80076974 01CF1021 */ addu $v0, $t6, $t7 -/* 077578 80076978 2463BC58 */ addiu $v1, %lo(D_0D02BC58) # addiu $v1, $v1, -0x43a8 -/* 07757C 8007697C AFBF0014 */ sw $ra, 0x14($sp) -/* 077580 80076980 241800FF */ li $t8, 255 -/* 077584 80076984 AC430064 */ sw $v1, 0x64($v0) -/* 077588 80076988 AC43006C */ sw $v1, 0x6c($v0) -/* 07758C 8007698C A45800A0 */ sh $t8, 0xa0($v0) -/* 077590 80076990 AFA40018 */ sw $a0, 0x18($sp) -/* 077594 80076994 00002825 */ move $a1, $zero -/* 077598 80076998 00003025 */ move $a2, $zero -/* 07759C 8007699C 0C022E2F */ jal func_8008B8BC -/* 0775A0 800769A0 00003825 */ move $a3, $zero -/* 0775A4 800769A4 44800000 */ mtc1 $zero, $f0 -/* 0775A8 800769A8 8FA40018 */ lw $a0, 0x18($sp) -/* 0775AC 800769AC 44050000 */ mfc1 $a1, $f0 -/* 0775B0 800769B0 44060000 */ mfc1 $a2, $f0 -/* 0775B4 800769B4 44070000 */ mfc1 $a3, $f0 -/* 0775B8 800769B8 0C022E03 */ jal func_8008B80C -/* 0775BC 800769BC 00000000 */ nop -/* 0775C0 800769C0 0C01C922 */ jal func_80072488 -/* 0775C4 800769C4 8FA40018 */ lw $a0, 0x18($sp) -/* 0775C8 800769C8 8FBF0014 */ lw $ra, 0x14($sp) -/* 0775CC 800769CC 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0775D0 800769D0 03E00008 */ jr $ra -/* 0775D4 800769D4 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80076AEC.s b/asm/non_matchings/code_80071F00/func_80076AEC.s deleted file mode 100644 index a8c40b3b5..000000000 --- a/asm/non_matchings/code_80071F00/func_80076AEC.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80076AEC -/* 0776EC 80076AEC 000470C0 */ sll $t6, $a0, 3 -/* 0776F0 80076AF0 01C47023 */ subu $t6, $t6, $a0 -/* 0776F4 80076AF4 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 0776F8 80076AF8 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 0776FC 80076AFC 000E7140 */ sll $t6, $t6, 5 -/* 077700 80076B00 01CF3021 */ addu $a2, $t6, $t7 -/* 077704 80076B04 84C300AE */ lh $v1, 0xae($a2) -/* 077708 80076B08 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 07770C 80076B0C AFB00018 */ sw $s0, 0x18($sp) -/* 077710 80076B10 00808025 */ move $s0, $a0 -/* 077714 80076B14 AFBF001C */ sw $ra, 0x1c($sp) -/* 077718 80076B18 1060000D */ beqz $v1, .L80076B50 -/* 07771C 80076B1C 00601025 */ move $v0, $v1 -/* 077720 80076B20 24010001 */ li $at, 1 -/* 077724 80076B24 1441000A */ bne $v0, $at, .L80076B50 -/* 077728 80076B28 2405000A */ li $a1, 10 -/* 07772C 80076B2C 0C021C18 */ jal func_80087060 -/* 077730 80076B30 AFA60020 */ sw $a2, 0x20($sp) -/* 077734 80076B34 10400005 */ beqz $v0, .L80076B4C -/* 077738 80076B38 8FA60020 */ lw $a2, 0x20($sp) -/* 07773C 80076B3C 02002025 */ move $a0, $s0 -/* 077740 80076B40 0C021BF5 */ jal func_80086FD4 -/* 077744 80076B44 AFA60020 */ sw $a2, 0x20($sp) -/* 077748 80076B48 8FA60020 */ lw $a2, 0x20($sp) -.L80076B4C: -/* 07774C 80076B4C 84C300AE */ lh $v1, 0xae($a2) -.L80076B50: -/* 077750 80076B50 58600006 */ blezl $v1, .L80076B6C -/* 077754 80076B54 8FBF001C */ lw $ra, 0x1c($sp) -/* 077758 80076B58 0C021DF1 */ jal func_800877C4 -/* 07775C 80076B5C 02002025 */ move $a0, $s0 -/* 077760 80076B60 0C022FC6 */ jal func_8008BF18 -/* 077764 80076B64 02002025 */ move $a0, $s0 -/* 077768 80076B68 8FBF001C */ lw $ra, 0x1c($sp) -.L80076B6C: -/* 07776C 80076B6C 8FB00018 */ lw $s0, 0x18($sp) -/* 077770 80076B70 27BD0028 */ addiu $sp, $sp, 0x28 -/* 077774 80076B74 03E00008 */ jr $ra -/* 077778 80076B78 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80076B84.s b/asm/non_matchings/code_80071F00/func_80076B84.s deleted file mode 100644 index 6b11ba548..000000000 --- a/asm/non_matchings/code_80071F00/func_80076B84.s +++ /dev/null @@ -1,76 +0,0 @@ -glabel func_80076B84 -/* 077784 80076B84 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 077788 80076B88 AFBF003C */ sw $ra, 0x3c($sp) -/* 07778C 80076B8C AFBE0038 */ sw $fp, 0x38($sp) -/* 077790 80076B90 AFB70034 */ sw $s7, 0x34($sp) -/* 077794 80076B94 AFB60030 */ sw $s6, 0x30($sp) -/* 077798 80076B98 AFB5002C */ sw $s5, 0x2c($sp) -/* 07779C 80076B9C AFB40028 */ sw $s4, 0x28($sp) -/* 0777A0 80076BA0 AFB30024 */ sw $s3, 0x24($sp) -/* 0777A4 80076BA4 AFB20020 */ sw $s2, 0x20($sp) -/* 0777A8 80076BA8 AFB1001C */ sw $s1, 0x1c($sp) -/* 0777AC 80076BAC 0C01D987 */ jal func_8007661C -/* 0777B0 80076BB0 AFB00018 */ sw $s0, 0x18($sp) -/* 0777B4 80076BB4 0C01D853 */ jal func_8007614C -/* 0777B8 80076BB8 00000000 */ nop -/* 0777BC 80076BBC 3C128019 */ lui $s2, %hi(D_8018C1B0) # $s2, 0x8019 -/* 0777C0 80076BC0 3C1E8019 */ lui $fp, %hi(D_8018C3B0) # $fp, 0x8019 -/* 0777C4 80076BC4 3C148016 */ lui $s4, %hi(D_80165C18) # $s4, 0x8016 -/* 0777C8 80076BC8 26945C18 */ addiu $s4, %lo(D_80165C18) # addiu $s4, $s4, 0x5c18 -/* 0777CC 80076BCC 27DEC3B0 */ addiu $fp, %lo(D_8018C3B0) # addiu $fp, $fp, -0x3c50 -/* 0777D0 80076BD0 2652C1B0 */ addiu $s2, %lo(D_8018C1B0) # addiu $s2, $s2, -0x3e50 -/* 0777D4 80076BD4 24170005 */ li $s7, 5 -/* 0777D8 80076BD8 24160004 */ li $s6, 4 -/* 0777DC 80076BDC 241500E0 */ li $s5, 224 -/* 0777E0 80076BE0 2413FFFF */ li $s3, -1 -/* 0777E4 80076BE4 8E500000 */ lw $s0, ($s2) -.L80076BE8: -/* 0777E8 80076BE8 5213001E */ beql $s0, $s3, .L80076C64 -/* 0777EC 80076BEC 26520004 */ addiu $s2, $s2, 4 -/* 0777F0 80076BF0 02150019 */ multu $s0, $s5 -/* 0777F4 80076BF4 00007012 */ mflo $t6 -/* 0777F8 80076BF8 028E8821 */ addu $s1, $s4, $t6 -/* 0777FC 80076BFC 862300A6 */ lh $v1, 0xa6($s1) -/* 077800 80076C00 50600018 */ beql $v1, $zero, .L80076C64 -/* 077804 80076C04 26520004 */ addiu $s2, $s2, 4 -/* 077808 80076C08 922200D5 */ lbu $v0, 0xd5($s1) -/* 07780C 80076C0C 12C20003 */ beq $s6, $v0, .L80076C1C -/* 077810 80076C10 00000000 */ nop -/* 077814 80076C14 16E20007 */ bne $s7, $v0, .L80076C34 -/* 077818 80076C18 24010009 */ li $at, 9 -.L80076C1C: -/* 07781C 80076C1C 0C01D8F3 */ jal func_800763CC -/* 077820 80076C20 02002025 */ move $a0, $s0 -/* 077824 80076C24 0C01D94E */ jal func_80076538 -/* 077828 80076C28 02002025 */ move $a0, $s0 -/* 07782C 80076C2C 10000008 */ b .L80076C50 -/* 077830 80076C30 862300A6 */ lh $v1, 0xa6($s1) -.L80076C34: -/* 077834 80076C34 14410006 */ bne $v0, $at, .L80076C50 -/* 077838 80076C38 00000000 */ nop -/* 07783C 80076C3C 0C01DA76 */ jal func_800769D8 -/* 077840 80076C40 02002025 */ move $a0, $s0 -/* 077844 80076C44 0C01DABB */ jal func_80076AEC -/* 077848 80076C48 02002025 */ move $a0, $s0 -/* 07784C 80076C4C 862300A6 */ lh $v1, 0xa6($s1) -.L80076C50: -/* 077850 80076C50 54600004 */ bnel $v1, $zero, .L80076C64 -/* 077854 80076C54 26520004 */ addiu $s2, $s2, 4 -/* 077858 80076C58 0C01C840 */ jal func_80072100 -/* 07785C 80076C5C 02402025 */ move $a0, $s2 -/* 077860 80076C60 26520004 */ addiu $s2, $s2, 4 -.L80076C64: -/* 077864 80076C64 565EFFE0 */ bnel $s2, $fp, .L80076BE8 -/* 077868 80076C68 8E500000 */ lw $s0, ($s2) -/* 07786C 80076C6C 8FBF003C */ lw $ra, 0x3c($sp) -/* 077870 80076C70 8FB00018 */ lw $s0, 0x18($sp) -/* 077874 80076C74 8FB1001C */ lw $s1, 0x1c($sp) -/* 077878 80076C78 8FB20020 */ lw $s2, 0x20($sp) -/* 07787C 80076C7C 8FB30024 */ lw $s3, 0x24($sp) -/* 077880 80076C80 8FB40028 */ lw $s4, 0x28($sp) -/* 077884 80076C84 8FB5002C */ lw $s5, 0x2c($sp) -/* 077888 80076C88 8FB60030 */ lw $s6, 0x30($sp) -/* 07788C 80076C8C 8FB70034 */ lw $s7, 0x34($sp) -/* 077890 80076C90 8FBE0038 */ lw $fp, 0x38($sp) -/* 077894 80076C94 03E00008 */ jr $ra -/* 077898 80076C98 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/non_matchings/code_80071F00/func_80076D70.s b/asm/non_matchings/code_80071F00/func_80076D70.s deleted file mode 100644 index f82bfb000..000000000 --- a/asm/non_matchings/code_80071F00/func_80076D70.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80076D70 -/* 077970 80076D70 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 077974 80076D74 AFA40018 */ sw $a0, 0x18($sp) -/* 077978 80076D78 AFA5001C */ sw $a1, 0x1c($sp) -/* 07797C 80076D7C AFBF0014 */ sw $ra, 0x14($sp) -/* 077980 80076D80 AFA60020 */ sw $a2, 0x20($sp) -/* 077984 80076D84 3C058018 */ lui $a1, %hi(D_80183E6C) # $a1, 0x8018 -/* 077988 80076D88 3C048019 */ lui $a0, %hi(D_8018C870) # $a0, 0x8019 -/* 07798C 80076D8C 2484C870 */ addiu $a0, %lo(D_8018C870) # addiu $a0, $a0, -0x3790 -/* 077990 80076D90 24A53E6C */ addiu $a1, %lo(D_80183E6C) # addiu $a1, $a1, 0x3e6c -/* 077994 80076D94 0C01C811 */ jal func_80072044 -/* 077998 80076D98 24060040 */ li $a2, 64 -/* 07799C 80076D9C 2401FFFF */ li $at, -1 -/* 0779A0 80076DA0 10410004 */ beq $v0, $at, .L80076DB4 -/* 0779A4 80076DA4 00402025 */ move $a0, $v0 -/* 0779A8 80076DA8 8FA50018 */ lw $a1, 0x18($sp) -/* 0779AC 80076DAC 0C01DB27 */ jal func_80076C9C -/* 0779B0 80076DB0 87A60022 */ lh $a2, 0x22($sp) -.L80076DB4: -/* 0779B4 80076DB4 8FBF0014 */ lw $ra, 0x14($sp) -/* 0779B8 80076DB8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0779BC 80076DBC 03E00008 */ jr $ra -/* 0779C0 80076DC0 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80076F2C.s b/asm/non_matchings/code_80071F00/func_80076F2C.s deleted file mode 100644 index facd7c321..000000000 --- a/asm/non_matchings/code_80071F00/func_80076F2C.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_80076F2C -/* 077B2C 80076F2C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 077B30 80076F30 AFB60030 */ sw $s6, 0x30($sp) -/* 077B34 80076F34 AFB40028 */ sw $s4, 0x28($sp) -/* 077B38 80076F38 AFB1001C */ sw $s1, 0x1c($sp) -/* 077B3C 80076F3C AFB5002C */ sw $s5, 0x2c($sp) -/* 077B40 80076F40 AFB30024 */ sw $s3, 0x24($sp) -/* 077B44 80076F44 3C118019 */ lui $s1, %hi(D_8018C870) # $s1, 0x8019 -/* 077B48 80076F48 3C148016 */ lui $s4, %hi(D_80165C18) # $s4, 0x8016 -/* 077B4C 80076F4C 3C168019 */ lui $s6, %hi(D_8018C970) # $s6, 0x8019 -/* 077B50 80076F50 AFBF0034 */ sw $ra, 0x34($sp) -/* 077B54 80076F54 AFB20020 */ sw $s2, 0x20($sp) -/* 077B58 80076F58 AFB00018 */ sw $s0, 0x18($sp) -/* 077B5C 80076F5C 26D6C970 */ addiu $s6, %lo(D_8018C970) # addiu $s6, $s6, -0x3690 -/* 077B60 80076F60 26945C18 */ addiu $s4, %lo(D_80165C18) # addiu $s4, $s4, 0x5c18 -/* 077B64 80076F64 2631C870 */ addiu $s1, %lo(D_8018C870) # addiu $s1, $s1, -0x3790 -/* 077B68 80076F68 2413FFFF */ li $s3, -1 -/* 077B6C 80076F6C 241500E0 */ li $s5, 224 -/* 077B70 80076F70 8E300000 */ lw $s0, ($s1) -.L80076F74: -/* 077B74 80076F74 52130011 */ beql $s0, $s3, .L80076FBC -/* 077B78 80076F78 26310004 */ addiu $s1, $s1, 4 -/* 077B7C 80076F7C 02150019 */ multu $s0, $s5 -/* 077B80 80076F80 00007012 */ mflo $t6 -/* 077B84 80076F84 028E9021 */ addu $s2, $s4, $t6 -/* 077B88 80076F88 864F00A6 */ lh $t7, 0xa6($s2) -/* 077B8C 80076F8C 51E0000B */ beql $t7, $zero, .L80076FBC -/* 077B90 80076F90 26310004 */ addiu $s1, $s1, 4 -/* 077B94 80076F94 0C01DB85 */ jal func_80076E14 -/* 077B98 80076F98 02002025 */ move $a0, $s0 -/* 077B9C 80076F9C 0C01DBB6 */ jal func_80076ED8 -/* 077BA0 80076FA0 02002025 */ move $a0, $s0 -/* 077BA4 80076FA4 865800A6 */ lh $t8, 0xa6($s2) -/* 077BA8 80076FA8 57000004 */ bnel $t8, $zero, .L80076FBC -/* 077BAC 80076FAC 26310004 */ addiu $s1, $s1, 4 -/* 077BB0 80076FB0 0C01C840 */ jal func_80072100 -/* 077BB4 80076FB4 02202025 */ move $a0, $s1 -/* 077BB8 80076FB8 26310004 */ addiu $s1, $s1, 4 -.L80076FBC: -/* 077BBC 80076FBC 5636FFED */ bnel $s1, $s6, .L80076F74 -/* 077BC0 80076FC0 8E300000 */ lw $s0, ($s1) -/* 077BC4 80076FC4 8FBF0034 */ lw $ra, 0x34($sp) -/* 077BC8 80076FC8 8FB00018 */ lw $s0, 0x18($sp) -/* 077BCC 80076FCC 8FB1001C */ lw $s1, 0x1c($sp) -/* 077BD0 80076FD0 8FB20020 */ lw $s2, 0x20($sp) -/* 077BD4 80076FD4 8FB30024 */ lw $s3, 0x24($sp) -/* 077BD8 80076FD8 8FB40028 */ lw $s4, 0x28($sp) -/* 077BDC 80076FDC 8FB5002C */ lw $s5, 0x2c($sp) -/* 077BE0 80076FE0 8FB60030 */ lw $s6, 0x30($sp) -/* 077BE4 80076FE4 03E00008 */ jr $ra -/* 077BE8 80076FE8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/code_80071F00/func_800770F0.s b/asm/non_matchings/code_80071F00/func_800770F0.s deleted file mode 100644 index c7affbad2..000000000 --- a/asm/non_matchings/code_80071F00/func_800770F0.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_800770F0 -/* 077CF0 800770F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 077CF4 800770F4 AFA40018 */ sw $a0, 0x18($sp) -/* 077CF8 800770F8 AFBF0014 */ sw $ra, 0x14($sp) -/* 077CFC 800770FC 3C048019 */ lui $a0, %hi(D_8018C870) # $a0, 0x8019 -/* 077D00 80077100 3C058018 */ lui $a1, %hi(D_80183E6C) # $a1, 0x8018 -/* 077D04 80077104 24A53E6C */ addiu $a1, %lo(D_80183E6C) # addiu $a1, $a1, 0x3e6c -/* 077D08 80077108 2484C870 */ addiu $a0, %lo(D_8018C870) # addiu $a0, $a0, -0x3790 -/* 077D0C 8007710C 0C01C811 */ jal func_80072044 -/* 077D10 80077110 24060040 */ li $a2, 64 -/* 077D14 80077114 2401FFFF */ li $at, -1 -/* 077D18 80077118 10410003 */ beq $v0, $at, .L80077128 -/* 077D1C 8007711C 00402025 */ move $a0, $v0 -/* 077D20 80077120 0C01DBFB */ jal func_80076FEC -/* 077D24 80077124 8FA50018 */ lw $a1, 0x18($sp) -.L80077128: -/* 077D28 80077128 8FBF0014 */ lw $ra, 0x14($sp) -/* 077D2C 8007712C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 077D30 80077130 03E00008 */ jr $ra -/* 077D34 80077134 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80077640.s b/asm/non_matchings/code_80071F00/func_80077640.s deleted file mode 100644 index 064ff34ff..000000000 --- a/asm/non_matchings/code_80071F00/func_80077640.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_80077640 -/* 078240 80077640 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 078244 80077644 AFB60030 */ sw $s6, 0x30($sp) -/* 078248 80077648 AFB40028 */ sw $s4, 0x28($sp) -/* 07824C 8007764C AFB1001C */ sw $s1, 0x1c($sp) -/* 078250 80077650 AFB5002C */ sw $s5, 0x2c($sp) -/* 078254 80077654 AFB30024 */ sw $s3, 0x24($sp) -/* 078258 80077658 3C118019 */ lui $s1, %hi(D_8018C630) # $s1, 0x8019 -/* 07825C 8007765C 3C148016 */ lui $s4, %hi(D_80165C18) # $s4, 0x8016 -/* 078260 80077660 3C168019 */ lui $s6, %hi(D_8018C830) # $s6, 0x8019 -/* 078264 80077664 AFBF0034 */ sw $ra, 0x34($sp) -/* 078268 80077668 AFB20020 */ sw $s2, 0x20($sp) -/* 07826C 8007766C AFB00018 */ sw $s0, 0x18($sp) -/* 078270 80077670 26D6C830 */ addiu $s6, %lo(D_8018C830) # addiu $s6, $s6, -0x37d0 -/* 078274 80077674 26945C18 */ addiu $s4, %lo(D_80165C18) # addiu $s4, $s4, 0x5c18 -/* 078278 80077678 2631C630 */ addiu $s1, %lo(D_8018C630) # addiu $s1, $s1, -0x39d0 -/* 07827C 8007767C 2413FFFF */ li $s3, -1 -/* 078280 80077680 241500E0 */ li $s5, 224 -/* 078284 80077684 8E300000 */ lw $s0, ($s1) -.L80077688: -/* 078288 80077688 52130011 */ beql $s0, $s3, .L800776D0 -/* 07828C 8007768C 26310004 */ addiu $s1, $s1, 4 -/* 078290 80077690 02150019 */ multu $s0, $s5 -/* 078294 80077694 00007012 */ mflo $t6 -/* 078298 80077698 028E9021 */ addu $s2, $s4, $t6 -/* 07829C 8007769C 864F00A6 */ lh $t7, 0xa6($s2) -/* 0782A0 800776A0 51E0000B */ beql $t7, $zero, .L800776D0 -/* 0782A4 800776A4 26310004 */ addiu $s1, $s1, 4 -/* 0782A8 800776A8 0C01DD14 */ jal func_80077450 -/* 0782AC 800776AC 02002025 */ move $a0, $s0 -/* 0782B0 800776B0 0C01DD61 */ jal func_80077584 -/* 0782B4 800776B4 02002025 */ move $a0, $s0 -/* 0782B8 800776B8 865800A6 */ lh $t8, 0xa6($s2) -/* 0782BC 800776BC 57000004 */ bnel $t8, $zero, .L800776D0 -/* 0782C0 800776C0 26310004 */ addiu $s1, $s1, 4 -/* 0782C4 800776C4 0C01C840 */ jal func_80072100 -/* 0782C8 800776C8 02202025 */ move $a0, $s1 -/* 0782CC 800776CC 26310004 */ addiu $s1, $s1, 4 -.L800776D0: -/* 0782D0 800776D0 5636FFED */ bnel $s1, $s6, .L80077688 -/* 0782D4 800776D4 8E300000 */ lw $s0, ($s1) -/* 0782D8 800776D8 8FBF0034 */ lw $ra, 0x34($sp) -/* 0782DC 800776DC 8FB00018 */ lw $s0, 0x18($sp) -/* 0782E0 800776E0 8FB1001C */ lw $s1, 0x1c($sp) -/* 0782E4 800776E4 8FB20020 */ lw $s2, 0x20($sp) -/* 0782E8 800776E8 8FB30024 */ lw $s3, 0x24($sp) -/* 0782EC 800776EC 8FB40028 */ lw $s4, 0x28($sp) -/* 0782F0 800776F0 8FB5002C */ lw $s5, 0x2c($sp) -/* 0782F4 800776F4 8FB60030 */ lw $s6, 0x30($sp) -/* 0782F8 800776F8 03E00008 */ jr $ra -/* 0782FC 800776FC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/code_80071F00/func_80077A54.s b/asm/non_matchings/code_80071F00/func_80077A54.s deleted file mode 100644 index f55f9986f..000000000 --- a/asm/non_matchings/code_80071F00/func_80077A54.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80077A54 -/* 078654 80077A54 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 078658 80077A58 AFA40020 */ sw $a0, 0x20($sp) -/* 07865C 80077A5C AFA50024 */ sw $a1, 0x24($sp) -/* 078660 80077A60 AFBF0014 */ sw $ra, 0x14($sp) -/* 078664 80077A64 3C058018 */ lui $a1, %hi(D_80183E7C) # $a1, 0x8018 -/* 078668 80077A68 3C048019 */ lui $a0, %hi(D_8018C970) # $a0, 0x8019 -/* 07866C 80077A6C 2484C970 */ addiu $a0, %lo(D_8018C970) # addiu $a0, $a0, -0x3690 -/* 078670 80077A70 24A53E7C */ addiu $a1, %lo(D_80183E7C) # addiu $a1, $a1, 0x3e7c -/* 078674 80077A74 0C01C811 */ jal func_80072044 -/* 078678 80077A78 24060040 */ li $a2, 64 -/* 07867C 80077A7C 2401FFFF */ li $at, -1 -/* 078680 80077A80 10410006 */ beq $v0, $at, .L80077A9C -/* 078684 80077A84 00402025 */ move $a0, $v0 -/* 078688 80077A88 8FA50020 */ lw $a1, 0x20($sp) -/* 07868C 80077A8C 8FA60024 */ lw $a2, 0x24($sp) -/* 078690 80077A90 0C01DDC0 */ jal func_80077700 -/* 078694 80077A94 AFA2001C */ sw $v0, 0x1c($sp) -/* 078698 80077A98 8FA4001C */ lw $a0, 0x1c($sp) -.L80077A9C: -/* 07869C 80077A9C 8FBF0014 */ lw $ra, 0x14($sp) -/* 0786A0 80077AA0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 0786A4 80077AA4 00801025 */ move $v0, $a0 -/* 0786A8 80077AA8 03E00008 */ jr $ra -/* 0786AC 80077AAC 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80077AB0.s b/asm/non_matchings/code_80071F00/func_80077AB0.s deleted file mode 100644 index f66500785..000000000 --- a/asm/non_matchings/code_80071F00/func_80077AB0.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80077AB0 -/* 0786B0 80077AB0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0786B4 80077AB4 AFB30020 */ sw $s3, 0x20($sp) -/* 0786B8 80077AB8 AFB2001C */ sw $s2, 0x1c($sp) -/* 0786BC 80077ABC AFB10018 */ sw $s1, 0x18($sp) -/* 0786C0 80077AC0 AFB00014 */ sw $s0, 0x14($sp) -/* 0786C4 80077AC4 00808825 */ move $s1, $a0 -/* 0786C8 80077AC8 AFBF0024 */ sw $ra, 0x24($sp) -/* 0786CC 80077ACC AFA5002C */ sw $a1, 0x2c($sp) -/* 0786D0 80077AD0 00008025 */ move $s0, $zero -/* 0786D4 80077AD4 2412FFFF */ li $s2, -1 -/* 0786D8 80077AD8 24130014 */ li $s3, 20 -/* 0786DC 80077ADC 02202025 */ move $a0, $s1 -.L80077AE0: -/* 0786E0 80077AE0 0C01DE95 */ jal func_80077A54 -/* 0786E4 80077AE4 02002825 */ move $a1, $s0 -/* 0786E8 80077AE8 10520003 */ beq $v0, $s2, .L80077AF8 -/* 0786EC 80077AEC 26100001 */ addiu $s0, $s0, 1 -/* 0786F0 80077AF0 5613FFFB */ bnel $s0, $s3, .L80077AE0 -/* 0786F4 80077AF4 02202025 */ move $a0, $s1 -.L80077AF8: -/* 0786F8 80077AF8 8FBF0024 */ lw $ra, 0x24($sp) -/* 0786FC 80077AFC 8FB00014 */ lw $s0, 0x14($sp) -/* 078700 80077B00 8FB10018 */ lw $s1, 0x18($sp) -/* 078704 80077B04 8FB2001C */ lw $s2, 0x1c($sp) -/* 078708 80077B08 8FB30020 */ lw $s3, 0x20($sp) -/* 07870C 80077B0C 03E00008 */ jr $ra -/* 078710 80077B10 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/non_matchings/code_80071F00/func_80077C9C.s b/asm/non_matchings/code_80071F00/func_80077C9C.s deleted file mode 100644 index bff36178d..000000000 --- a/asm/non_matchings/code_80071F00/func_80077C9C.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_80077C9C -/* 07889C 80077C9C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 0788A0 80077CA0 AFB60030 */ sw $s6, 0x30($sp) -/* 0788A4 80077CA4 AFB40028 */ sw $s4, 0x28($sp) -/* 0788A8 80077CA8 AFB1001C */ sw $s1, 0x1c($sp) -/* 0788AC 80077CAC AFB5002C */ sw $s5, 0x2c($sp) -/* 0788B0 80077CB0 AFB30024 */ sw $s3, 0x24($sp) -/* 0788B4 80077CB4 3C118019 */ lui $s1, %hi(D_8018C970) # $s1, 0x8019 -/* 0788B8 80077CB8 3C148016 */ lui $s4, %hi(D_80165C18) # $s4, 0x8016 -/* 0788BC 80077CBC 3C168019 */ lui $s6, %hi(D_8018CA70) # $s6, 0x8019 -/* 0788C0 80077CC0 AFBF0034 */ sw $ra, 0x34($sp) -/* 0788C4 80077CC4 AFB20020 */ sw $s2, 0x20($sp) -/* 0788C8 80077CC8 AFB00018 */ sw $s0, 0x18($sp) -/* 0788CC 80077CCC 26D6CA70 */ addiu $s6, %lo(D_8018CA70) # addiu $s6, $s6, -0x3590 -/* 0788D0 80077CD0 26945C18 */ addiu $s4, %lo(D_80165C18) # addiu $s4, $s4, 0x5c18 -/* 0788D4 80077CD4 2631C970 */ addiu $s1, %lo(D_8018C970) # addiu $s1, $s1, -0x3690 -/* 0788D8 80077CD8 2413FFFF */ li $s3, -1 -/* 0788DC 80077CDC 241500E0 */ li $s5, 224 -/* 0788E0 80077CE0 8E300000 */ lw $s0, ($s1) -.L80077CE4: -/* 0788E4 80077CE4 52130011 */ beql $s0, $s3, .L80077D2C -/* 0788E8 80077CE8 26310004 */ addiu $s1, $s1, 4 -/* 0788EC 80077CEC 02150019 */ multu $s0, $s5 -/* 0788F0 80077CF0 00007012 */ mflo $t6 -/* 0788F4 80077CF4 028E9021 */ addu $s2, $s4, $t6 -/* 0788F8 80077CF8 864F00A6 */ lh $t7, 0xa6($s2) -/* 0788FC 80077CFC 51E0000B */ beql $t7, $zero, .L80077D2C -/* 078900 80077D00 26310004 */ addiu $s1, $s1, 4 -/* 078904 80077D04 0C01DECF */ jal func_80077B3C -/* 078908 80077D08 02002025 */ move $a0, $s0 -/* 07890C 80077D0C 0C01DEF3 */ jal func_80077BCC -/* 078910 80077D10 02002025 */ move $a0, $s0 -/* 078914 80077D14 865800A6 */ lh $t8, 0xa6($s2) -/* 078918 80077D18 57000004 */ bnel $t8, $zero, .L80077D2C -/* 07891C 80077D1C 26310004 */ addiu $s1, $s1, 4 -/* 078920 80077D20 0C01C840 */ jal func_80072100 -/* 078924 80077D24 02202025 */ move $a0, $s1 -/* 078928 80077D28 26310004 */ addiu $s1, $s1, 4 -.L80077D2C: -/* 07892C 80077D2C 5636FFED */ bnel $s1, $s6, .L80077CE4 -/* 078930 80077D30 8E300000 */ lw $s0, ($s1) -/* 078934 80077D34 8FBF0034 */ lw $ra, 0x34($sp) -/* 078938 80077D38 8FB00018 */ lw $s0, 0x18($sp) -/* 07893C 80077D3C 8FB1001C */ lw $s1, 0x1c($sp) -/* 078940 80077D40 8FB20020 */ lw $s2, 0x20($sp) -/* 078944 80077D44 8FB30024 */ lw $s3, 0x24($sp) -/* 078948 80077D48 8FB40028 */ lw $s4, 0x28($sp) -/* 07894C 80077D4C 8FB5002C */ lw $s5, 0x2c($sp) -/* 078950 80077D50 8FB60030 */ lw $s6, 0x30($sp) -/* 078954 80077D54 03E00008 */ jr $ra -/* 078958 80077D58 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/code_80071F00/func_800786EC.s b/asm/non_matchings/code_80071F00/func_800786EC.s deleted file mode 100644 index 2bc8f4c6f..000000000 --- a/asm/non_matchings/code_80071F00/func_800786EC.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_800786EC -/* 0792EC 800786EC 000470C0 */ sll $t6, $a0, 3 -/* 0792F0 800786F0 01C47023 */ subu $t6, $t6, $a0 -/* 0792F4 800786F4 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 0792F8 800786F8 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 0792FC 800786FC 000E7140 */ sll $t6, $t6, 5 -/* 079300 80078700 01CF1821 */ addu $v1, $t6, $t7 -/* 079304 80078704 846200A6 */ lh $v0, 0xa6($v1) -/* 079308 80078708 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 07930C 8007870C AFBF0014 */ sw $ra, 0x14($sp) -/* 079310 80078710 1040001B */ beqz $v0, .L80078780 -/* 079314 80078714 24010001 */ li $at, 1 -/* 079318 80078718 10410007 */ beq $v0, $at, .L80078738 -/* 07931C 8007871C 24010002 */ li $at, 2 -/* 079320 80078720 10410009 */ beq $v0, $at, .L80078748 -/* 079324 80078724 24010003 */ li $at, 3 -/* 079328 80078728 10410013 */ beq $v0, $at, .L80078778 -/* 07932C 8007872C 00000000 */ nop -/* 079330 80078730 10000014 */ b .L80078784 -/* 079334 80078734 8FBF0014 */ lw $ra, 0x14($sp) -.L80078738: -/* 079338 80078738 0C01E088 */ jal func_80078220 -/* 07933C 8007873C 00000000 */ nop -/* 079340 80078740 10000010 */ b .L80078784 -/* 079344 80078744 8FBF0014 */ lw $ra, 0x14($sp) -.L80078748: -/* 079348 80078748 AFA30018 */ sw $v1, 0x18($sp) -/* 07934C 8007874C 0C01E0A2 */ jal func_80078288 -/* 079350 80078750 AFA40020 */ sw $a0, 0x20($sp) -/* 079354 80078754 8FA30018 */ lw $v1, 0x18($sp) -/* 079358 80078758 8FA40020 */ lw $a0, 0x20($sp) -/* 07935C 8007875C 847800AE */ lh $t8, 0xae($v1) -/* 079360 80078760 57000008 */ bnel $t8, $zero, .L80078784 -/* 079364 80078764 8FBF0014 */ lw $ra, 0x14($sp) -/* 079368 80078768 0C01C922 */ jal func_80072488 -/* 07936C 8007876C 00000000 */ nop -/* 079370 80078770 10000004 */ b .L80078784 -/* 079374 80078774 8FBF0014 */ lw $ra, 0x14($sp) -.L80078778: -/* 079378 80078778 0C01C90A */ jal func_80072428 -/* 07937C 8007877C 00000000 */ nop -.L80078780: -/* 079380 80078780 8FBF0014 */ lw $ra, 0x14($sp) -.L80078784: -/* 079384 80078784 27BD0020 */ addiu $sp, $sp, 0x20 -/* 079388 80078788 03E00008 */ jr $ra -/* 07938C 8007878C 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80078790.s b/asm/non_matchings/code_80071F00/func_80078790.s deleted file mode 100644 index 0592eaefc..000000000 --- a/asm/non_matchings/code_80071F00/func_80078790.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80078790 -/* 079390 80078790 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 079394 80078794 3C028019 */ lui $v0, %hi(D_8018D174) # $v0, 0x8019 -/* 079398 80078798 3C078019 */ lui $a3, %hi(D_8018C1B0) # $a3, 0x8019 -/* 07939C 8007879C 3C058016 */ lui $a1, %hi(D_80165C18) # $a1, 0x8016 -/* 0793A0 800787A0 3C048019 */ lui $a0, %hi(D_8018D174) # $a0, 0x8019 -/* 0793A4 800787A4 AFBF0014 */ sw $ra, 0x14($sp) -/* 0793A8 800787A8 2484D174 */ addiu $a0, %lo(D_8018D174) # addiu $a0, $a0, -0x2e8c -/* 0793AC 800787AC 24A55C18 */ addiu $a1, %lo(D_80165C18) # addiu $a1, $a1, 0x5c18 -/* 0793B0 800787B0 24E7C1B0 */ addiu $a3, %lo(D_8018C1B0) # addiu $a3, $a3, -0x3e50 -/* 0793B4 800787B4 8442D174 */ lh $v0, %lo(D_8018D174)($v0) -/* 0793B8 800787B8 00001825 */ move $v1, $zero -/* 0793BC 800787BC 24090032 */ li $t1, 50 -/* 0793C0 800787C0 240800E0 */ li $t0, 224 -/* 0793C4 800787C4 244E0001 */ addiu $t6, $v0, 1 -.L800787C8: -/* 0793C8 800787C8 A48E0000 */ sh $t6, ($a0) -/* 0793CC 800787CC 84820000 */ lh $v0, ($a0) -/* 0793D0 800787D0 24630001 */ addiu $v1, $v1, 1 -/* 0793D4 800787D4 28410032 */ slti $at, $v0, 0x32 -/* 0793D8 800787D8 54200004 */ bnel $at, $zero, .L800787EC -/* 0793DC 800787DC 00027880 */ sll $t7, $v0, 2 -/* 0793E0 800787E0 A4800000 */ sh $zero, ($a0) -/* 0793E4 800787E4 84820000 */ lh $v0, ($a0) -/* 0793E8 800787E8 00027880 */ sll $t7, $v0, 2 -.L800787EC: -/* 0793EC 800787EC 00EFC021 */ addu $t8, $a3, $t7 -/* 0793F0 800787F0 8F060000 */ lw $a2, ($t8) -/* 0793F4 800787F4 00C80019 */ multu $a2, $t0 -/* 0793F8 800787F8 0000C812 */ mflo $t9 -/* 0793FC 800787FC 00B95021 */ addu $t2, $a1, $t9 -/* 079400 80078800 854B00A6 */ lh $t3, 0xa6($t2) -/* 079404 80078804 15600006 */ bnez $t3, .L80078820 -/* 079408 80078808 00000000 */ nop -/* 07940C 8007880C 00C02025 */ move $a0, $a2 -/* 079410 80078810 0C01C8E9 */ jal func_800723A4 -/* 079414 80078814 24050001 */ li $a1, 1 -/* 079418 80078818 10000004 */ b .L8007882C -/* 07941C 8007881C 8FBF0014 */ lw $ra, 0x14($sp) -.L80078820: -/* 079420 80078820 5469FFE9 */ bnel $v1, $t1, .L800787C8 -/* 079424 80078824 244E0001 */ addiu $t6, $v0, 1 -/* 079428 80078828 8FBF0014 */ lw $ra, 0x14($sp) -.L8007882C: -/* 07942C 8007882C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 079430 80078830 03E00008 */ jr $ra -/* 079434 80078834 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80078838.s b/asm/non_matchings/code_80071F00/func_80078838.s deleted file mode 100644 index bb5df8b6e..000000000 --- a/asm/non_matchings/code_80071F00/func_80078838.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_80078838 -/* 079438 80078838 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 07943C 8007883C 3C0E800E */ lui $t6, %hi(gGamestate) # $t6, 0x800e -/* 079440 80078840 8DCEC50C */ lw $t6, %lo(gGamestate)($t6) -/* 079444 80078844 24010009 */ li $at, 9 -/* 079448 80078848 AFBF0024 */ sw $ra, 0x24($sp) -/* 07944C 8007884C AFB30020 */ sw $s3, 0x20($sp) -/* 079450 80078850 AFB2001C */ sw $s2, 0x1c($sp) -/* 079454 80078854 AFB10018 */ sw $s1, 0x18($sp) -/* 079458 80078858 11C10005 */ beq $t6, $at, .L80078870 -/* 07945C 8007885C AFB00014 */ sw $s0, 0x14($sp) -/* 079460 80078860 0C01E1E4 */ jal func_80078790 -/* 079464 80078864 00000000 */ nop -/* 079468 80078868 10000009 */ b .L80078890 -/* 07946C 8007886C 00000000 */ nop -.L80078870: -/* 079470 80078870 0C01E1E4 */ jal func_80078790 -/* 079474 80078874 00000000 */ nop -/* 079478 80078878 0C01E1E4 */ jal func_80078790 -/* 07947C 8007887C 00000000 */ nop -/* 079480 80078880 0C01E1E4 */ jal func_80078790 -/* 079484 80078884 00000000 */ nop -/* 079488 80078888 0C01E1E4 */ jal func_80078790 -/* 07948C 8007888C 00000000 */ nop -.L80078890: -/* 079490 80078890 3C108019 */ lui $s0, %hi(D_8018C1B0) # $s0, 0x8019 -/* 079494 80078894 3C138019 */ lui $s3, %hi(D_8018C278) # $s3, 0x8019 -/* 079498 80078898 3C118016 */ lui $s1, %hi(D_80165C18) # $s1, 0x8016 -/* 07949C 8007889C 26315C18 */ addiu $s1, %lo(D_80165C18) # addiu $s1, $s1, 0x5c18 -/* 0794A0 800788A0 2673C278 */ addiu $s3, %lo(D_8018C278) # addiu $s3, $s3, -0x3d88 -/* 0794A4 800788A4 2610C1B0 */ addiu $s0, %lo(D_8018C1B0) # addiu $s0, $s0, -0x3e50 -/* 0794A8 800788A8 241200E0 */ li $s2, 224 -/* 0794AC 800788AC 8E040000 */ lw $a0, ($s0) -.L800788B0: -/* 0794B0 800788B0 00920019 */ multu $a0, $s2 -/* 0794B4 800788B4 00007812 */ mflo $t7 -/* 0794B8 800788B8 022FC021 */ addu $t8, $s1, $t7 -/* 0794BC 800788BC 871900A6 */ lh $t9, 0xa6($t8) -/* 0794C0 800788C0 53200004 */ beql $t9, $zero, .L800788D4 -/* 0794C4 800788C4 26100004 */ addiu $s0, $s0, 4 -/* 0794C8 800788C8 0C01E1BB */ jal func_800786EC -/* 0794CC 800788CC 00000000 */ nop -/* 0794D0 800788D0 26100004 */ addiu $s0, $s0, 4 -.L800788D4: -/* 0794D4 800788D4 5613FFF6 */ bnel $s0, $s3, .L800788B0 -/* 0794D8 800788D8 8E040000 */ lw $a0, ($s0) -/* 0794DC 800788DC 8FBF0024 */ lw $ra, 0x24($sp) -/* 0794E0 800788E0 8FB00014 */ lw $s0, 0x14($sp) -/* 0794E4 800788E4 8FB10018 */ lw $s1, 0x18($sp) -/* 0794E8 800788E8 8FB2001C */ lw $s2, 0x1c($sp) -/* 0794EC 800788EC 8FB30020 */ lw $s3, 0x20($sp) -/* 0794F0 800788F0 03E00008 */ jr $ra -/* 0794F4 800788F4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/non_matchings/code_80071F00/func_8007C420.s b/asm/non_matchings/code_80071F00/func_8007C420.s deleted file mode 100644 index e95d4f8d4..000000000 --- a/asm/non_matchings/code_80071F00/func_8007C420.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_8007C420 -/* 07D020 8007C420 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 07D024 8007C424 000478C0 */ sll $t7, $a0, 3 -/* 07D028 8007C428 01E47823 */ subu $t7, $t7, $a0 -/* 07D02C 8007C42C 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 07D030 8007C430 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 07D034 8007C434 000F7940 */ sll $t7, $t7, 5 -/* 07D038 8007C438 AFBF0014 */ sw $ra, 0x14($sp) -/* 07D03C 8007C43C AFA40028 */ sw $a0, 0x28($sp) -/* 07D040 8007C440 AFA60030 */ sw $a2, 0x30($sp) -/* 07D044 8007C444 01F81821 */ addu $v1, $t7, $t8 -/* 07D048 8007C448 C4660004 */ lwc1 $f6, 4($v1) -/* 07D04C 8007C44C C4A40014 */ lwc1 $f4, 0x14($a1) -/* 07D050 8007C450 C46A000C */ lwc1 $f10, 0xc($v1) -/* 07D054 8007C454 C4A8001C */ lwc1 $f8, 0x1c($a1) -/* 07D058 8007C458 AFA30018 */ sw $v1, 0x18($sp) -/* 07D05C 8007C45C 46062301 */ sub.s $f12, $f4, $f6 -/* 07D060 8007C460 0C0ADE0C */ jal atan2s -/* 07D064 8007C464 460A4381 */ sub.s $f14, $f8, $f10 -/* 07D068 8007C468 8FA30018 */ lw $v1, 0x18($sp) -/* 07D06C 8007C46C 3045FFFF */ andi $a1, $v0, 0xffff -/* 07D070 8007C470 0C0105ED */ jal func_800417B4 -/* 07D074 8007C474 946400C0 */ lhu $a0, 0xc0($v1) -/* 07D078 8007C478 8FA30018 */ lw $v1, 0x18($sp) -/* 07D07C 8007C47C 8FA40028 */ lw $a0, 0x28($sp) -/* 07D080 8007C480 8FA50030 */ lw $a1, 0x30($sp) -/* 07D084 8007C484 0C01F0D8 */ jal func_8007C360 -/* 07D088 8007C488 A46200C0 */ sh $v0, 0xc0($v1) -/* 07D08C 8007C48C 8FBF0014 */ lw $ra, 0x14($sp) -/* 07D090 8007C490 27BD0028 */ addiu $sp, $sp, 0x28 -/* 07D094 8007C494 03E00008 */ jr $ra -/* 07D098 8007C498 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007C550.s b/asm/non_matchings/code_80071F00/func_8007C550.s deleted file mode 100644 index 6b09d9e7c..000000000 --- a/asm/non_matchings/code_80071F00/func_8007C550.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_8007C550 -/* 07D150 8007C550 000478C0 */ sll $t7, $a0, 3 -/* 07D154 8007C554 01E47823 */ subu $t7, $t7, $a0 -/* 07D158 8007C558 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 07D15C 8007C55C 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 07D160 8007C560 000F7940 */ sll $t7, $t7, 5 -/* 07D164 8007C564 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 07D168 8007C568 01F81821 */ addu $v1, $t7, $t8 -/* 07D16C 8007C56C AFBF0014 */ sw $ra, 0x14($sp) -/* 07D170 8007C570 AFA40020 */ sw $a0, 0x20($sp) -/* 07D174 8007C574 C46C0038 */ lwc1 $f12, 0x38($v1) -/* 07D178 8007C578 C46E0040 */ lwc1 $f14, 0x40($v1) -/* 07D17C 8007C57C 0C0ADE0C */ jal atan2s -/* 07D180 8007C580 AFA30018 */ sw $v1, 0x18($sp) -/* 07D184 8007C584 8FA30018 */ lw $v1, 0x18($sp) -/* 07D188 8007C588 3045FFFF */ andi $a1, $v0, 0xffff -/* 07D18C 8007C58C 0C0105ED */ jal func_800417B4 -/* 07D190 8007C590 946400C0 */ lhu $a0, 0xc0($v1) -/* 07D194 8007C594 8FA30018 */ lw $v1, 0x18($sp) -/* 07D198 8007C598 8FA40020 */ lw $a0, 0x20($sp) -/* 07D19C 8007C59C 0C01F129 */ jal func_8007C4A4 -/* 07D1A0 8007C5A0 A46200C0 */ sh $v0, 0xc0($v1) -/* 07D1A4 8007C5A4 8FBF0014 */ lw $ra, 0x14($sp) -/* 07D1A8 8007C5A8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 07D1AC 8007C5AC 03E00008 */ jr $ra -/* 07D1B0 8007C5B0 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007D714.s b/asm/non_matchings/code_80071F00/func_8007D714.s deleted file mode 100644 index f0d2c2bc2..000000000 --- a/asm/non_matchings/code_80071F00/func_8007D714.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_8007D714 -/* 07E314 8007D714 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 07E318 8007D718 24010001 */ li $at, 1 -/* 07E31C 8007D71C AFBF0014 */ sw $ra, 0x14($sp) -/* 07E320 8007D720 14810009 */ bne $a0, $at, .L8007D748 -/* 07E324 8007D724 AFA40020 */ sw $a0, 0x20($sp) -/* 07E328 8007D728 3C048019 */ lui $a0, %hi(D_8018C3F0) # $a0, 0x8019 -/* 07E32C 8007D72C 3C058018 */ lui $a1, %hi(D_80183E4C) # $a1, 0x8018 -/* 07E330 8007D730 24A53E4C */ addiu $a1, %lo(D_80183E4C) # addiu $a1, $a1, 0x3e4c -/* 07E334 8007D734 2484C3F0 */ addiu $a0, %lo(D_8018C3F0) # addiu $a0, $a0, -0x3c10 -/* 07E338 8007D738 0C01C811 */ jal func_80072044 -/* 07E33C 8007D73C 24060028 */ li $a2, 40 -/* 07E340 8007D740 10000008 */ b .L8007D764 -/* 07E344 8007D744 00402025 */ move $a0, $v0 -.L8007D748: -/* 07E348 8007D748 3C048019 */ lui $a0, %hi(D_8018C630) # $a0, 0x8019 -/* 07E34C 8007D74C 3C058018 */ lui $a1, %hi(D_80183E5C) # $a1, 0x8018 -/* 07E350 8007D750 24A53E5C */ addiu $a1, %lo(D_80183E5C) # addiu $a1, $a1, 0x3e5c -/* 07E354 8007D754 2484C630 */ addiu $a0, %lo(D_8018C630) # addiu $a0, $a0, -0x39d0 -/* 07E358 8007D758 0C01C811 */ jal func_80072044 -/* 07E35C 8007D75C 2406001E */ li $a2, 30 -/* 07E360 8007D760 00402025 */ move $a0, $v0 -.L8007D764: -/* 07E364 8007D764 2401FFFF */ li $at, -1 -/* 07E368 8007D768 10410006 */ beq $v0, $at, .L8007D784 -/* 07E36C 8007D76C 00002825 */ move $a1, $zero -/* 07E370 8007D770 0C01C8E9 */ jal func_800723A4 -/* 07E374 8007D774 AFA4001C */ sw $a0, 0x1c($sp) -/* 07E378 8007D778 8FA4001C */ lw $a0, 0x1c($sp) -/* 07E37C 8007D77C 0C01F5AA */ jal func_8007D6A8 -/* 07E380 8007D780 8FA50020 */ lw $a1, 0x20($sp) -.L8007D784: -/* 07E384 8007D784 8FBF0014 */ lw $ra, 0x14($sp) -/* 07E388 8007D788 27BD0020 */ addiu $sp, $sp, 0x20 -/* 07E38C 8007D78C 03E00008 */ jr $ra -/* 07E390 8007D790 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007E1F4.s b/asm/non_matchings/code_80071F00/func_8007E1F4.s deleted file mode 100644 index 5c29ff4d3..000000000 --- a/asm/non_matchings/code_80071F00/func_8007E1F4.s +++ /dev/null @@ -1,100 +0,0 @@ -glabel func_8007E1F4 -/* 07EDF4 8007E1F4 000478C0 */ sll $t7, $a0, 3 -/* 07EDF8 8007E1F8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 07EDFC 8007E1FC 01E47823 */ subu $t7, $t7, $a0 -/* 07EE00 8007E200 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 07EE04 8007E204 AFB00018 */ sw $s0, 0x18($sp) -/* 07EE08 8007E208 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 07EE0C 8007E20C 000F7940 */ sll $t7, $t7, 5 -/* 07EE10 8007E210 01F88021 */ addu $s0, $t7, $t8 -/* 07EE14 8007E214 8E02004C */ lw $v0, 0x4c($s0) -/* 07EE18 8007E218 AFBF001C */ sw $ra, 0x1c($sp) -/* 07EE1C 8007E21C AFA40030 */ sw $a0, 0x30($sp) -/* 07EE20 8007E220 18400005 */ blez $v0, .L8007E238 -/* 07EE24 8007E224 2459FFFF */ addiu $t9, $v0, -1 -/* 07EE28 8007E228 17200003 */ bnez $t9, .L8007E238 -/* 07EE2C 8007E22C AE19004C */ sw $t9, 0x4c($s0) -/* 07EE30 8007E230 0C01C8B3 */ jal func_800722CC -/* 07EE34 8007E234 24050001 */ li $a1, 1 -.L8007E238: -/* 07EE38 8007E238 8E020048 */ lw $v0, 0x48($s0) -/* 07EE3C 8007E23C 18400007 */ blez $v0, .L8007E25C -/* 07EE40 8007E240 2449FFFF */ addiu $t1, $v0, -1 -/* 07EE44 8007E244 15200005 */ bnez $t1, .L8007E25C -/* 07EE48 8007E248 AE090048 */ sw $t1, 0x48($s0) -/* 07EE4C 8007E24C 3C055102 */ lui $a1, (0x51028006 >> 16) # lui $a1, 0x5102 -/* 07EE50 8007E250 34A58006 */ ori $a1, (0x51028006 & 0xFFFF) # ori $a1, $a1, 0x8006 -/* 07EE54 8007E254 0C0327BD */ jal func_800C9EF4 -/* 07EE58 8007E258 26040004 */ addiu $a0, $s0, 4 -.L8007E25C: -/* 07EE5C 8007E25C 8E0B004C */ lw $t3, 0x4c($s0) -/* 07EE60 8007E260 3C02800E */ lui $v0, %hi(gCCSelection) # $v0, 0x800e -/* 07EE64 8007E264 55600032 */ bnel $t3, $zero, .L8007E330 -/* 07EE68 8007E268 2404000F */ li $a0, 15 -/* 07EE6C 8007E26C 8C42C548 */ lw $v0, %lo(gCCSelection)($v0) -/* 07EE70 8007E270 24010001 */ li $at, 1 -/* 07EE74 8007E274 50400007 */ beql $v0, $zero, .L8007E294 -/* 07EE78 8007E278 3C01442F */ lui $at, 0x442f -/* 07EE7C 8007E27C 10410004 */ beq $v0, $at, .L8007E290 -/* 07EE80 8007E280 24010002 */ li $at, 2 -/* 07EE84 8007E284 10410002 */ beq $v0, $at, .L8007E290 -/* 07EE88 8007E288 24010003 */ li $at, 3 -/* 07EE8C 8007E28C 14410004 */ bne $v0, $at, .L8007E2A0 -.L8007E290: -/* 07EE90 8007E290 3C01442F */ li $at, 0x442F0000 # 700.000000 -.L8007E294: -/* 07EE94 8007E294 44812000 */ mtc1 $at, $f4 -/* 07EE98 8007E298 00000000 */ nop -/* 07EE9C 8007E29C E7A4002C */ swc1 $f4, 0x2c($sp) -.L8007E2A0: -/* 07EEA0 8007E2A0 8FA40030 */ lw $a0, 0x30($sp) -/* 07EEA4 8007E2A4 0C0229B7 */ jal func_8008A6DC -/* 07EEA8 8007E2A8 8FA5002C */ lw $a1, 0x2c($sp) -/* 07EEAC 8007E2AC 8FA40030 */ lw $a0, 0x30($sp) -/* 07EEB0 8007E2B0 0C01C88F */ jal func_8007223C -/* 07EEB4 8007E2B4 3C050004 */ lui $a1, 4 -/* 07EEB8 8007E2B8 1040001C */ beqz $v0, .L8007E32C -/* 07EEBC 8007E2BC 8FA40030 */ lw $a0, 0x30($sp) -/* 07EEC0 8007E2C0 0C01C8D5 */ jal func_80072354 -/* 07EEC4 8007E2C4 24050001 */ li $a1, 1 -/* 07EEC8 8007E2C8 10400018 */ beqz $v0, .L8007E32C -/* 07EECC 8007E2CC 8FA40030 */ lw $a0, 0x30($sp) -/* 07EED0 8007E2D0 260C0004 */ addiu $t4, $s0, 4 -/* 07EED4 8007E2D4 AFAC0020 */ sw $t4, 0x20($sp) -/* 07EED8 8007E2D8 0C01C8A9 */ jal func_800722A4 -/* 07EEDC 8007E2DC 24050001 */ li $a1, 1 -/* 07EEE0 8007E2E0 3C065102 */ lui $a2, (0x51028006 >> 16) # lui $a2, 0x5102 -/* 07EEE4 8007E2E4 34C68006 */ ori $a2, (0x51028006 & 0xFFFF) # ori $a2, $a2, 0x8006 -/* 07EEE8 8007E2E8 8FA40020 */ lw $a0, 0x20($sp) -/* 07EEEC 8007E2EC 0C032760 */ jal func_800C9D80 -/* 07EEF0 8007E2F0 26050038 */ addiu $a1, $s0, 0x38 -/* 07EEF4 8007E2F4 8FA40030 */ lw $a0, 0x30($sp) -/* 07EEF8 8007E2F8 0C01C9B3 */ jal func_800726CC -/* 07EEFC 8007E2FC 24050003 */ li $a1, 3 -/* 07EF00 8007E300 860200A4 */ lh $v0, 0xa4($s0) -/* 07EF04 8007E304 240F0168 */ li $t7, 360 -/* 07EF08 8007E308 2418012C */ li $t8, 300 -/* 07EF0C 8007E30C 18400005 */ blez $v0, .L8007E324 -/* 07EF10 8007E310 244DFFFF */ addiu $t5, $v0, -1 -/* 07EF14 8007E314 240E0168 */ li $t6, 360 -/* 07EF18 8007E318 A60D00A4 */ sh $t5, 0xa4($s0) -/* 07EF1C 8007E31C 10000002 */ b .L8007E328 -/* 07EF20 8007E320 AE0E004C */ sw $t6, 0x4c($s0) -.L8007E324: -/* 07EF24 8007E324 AE0F004C */ sw $t7, 0x4c($s0) -.L8007E328: -/* 07EF28 8007E328 AE180048 */ sw $t8, 0x48($s0) -.L8007E32C: -/* 07EF2C 8007E32C 2404000F */ li $a0, 15 -.L8007E330: -/* 07EF30 8007E330 0C022A2C */ jal func_8008A8B0 -/* 07EF34 8007E334 24050013 */ li $a1, 19 -/* 07EF38 8007E338 14400002 */ bnez $v0, .L8007E344 -/* 07EF3C 8007E33C 24190002 */ li $t9, 2 -/* 07EF40 8007E340 A61900A4 */ sh $t9, 0xa4($s0) -.L8007E344: -/* 07EF44 8007E344 8FBF001C */ lw $ra, 0x1c($sp) -/* 07EF48 8007E348 8FB00018 */ lw $s0, 0x18($sp) -/* 07EF4C 8007E34C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 07EF50 8007E350 03E00008 */ jr $ra -/* 07EF54 8007E354 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007E4C4.s b/asm/non_matchings/code_80071F00/func_8007E4C4.s deleted file mode 100644 index e0c4805f5..000000000 --- a/asm/non_matchings/code_80071F00/func_8007E4C4.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_8007E4C4 -/* 07F0C4 8007E4C4 3C048018 */ lui $a0, %hi(D_80183EA8) # $a0, 0x8018 -/* 07F0C8 8007E4C8 8C843EA8 */ lw $a0, %lo(D_80183EA8)($a0) -/* 07F0CC 8007E4CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 07F0D0 8007E4D0 AFBF0014 */ sw $ra, 0x14($sp) -/* 07F0D4 8007E4D4 0C01F8FB */ jal func_8007E3EC -/* 07F0D8 8007E4D8 AFA4001C */ sw $a0, 0x1c($sp) -/* 07F0DC 8007E4DC 3C0E800E */ lui $t6, %hi(gModeSelection) # $t6, 0x800e -/* 07F0E0 8007E4E0 8DCEC53C */ lw $t6, %lo(gModeSelection)($t6) -/* 07F0E4 8007E4E4 24010001 */ li $at, 1 -/* 07F0E8 8007E4E8 8FA4001C */ lw $a0, 0x1c($sp) -/* 07F0EC 8007E4EC 51C10004 */ beql $t6, $at, .L8007E500 -/* 07F0F0 8007E4F0 8FBF0014 */ lw $ra, 0x14($sp) -/* 07F0F4 8007E4F4 0C01F87D */ jal func_8007E1F4 -/* 07F0F8 8007E4F8 00000000 */ nop -/* 07F0FC 8007E4FC 8FBF0014 */ lw $ra, 0x14($sp) -.L8007E500: -/* 07F100 8007E500 27BD0020 */ addiu $sp, $sp, 0x20 -/* 07F104 8007E504 03E00008 */ jr $ra -/* 07F108 8007E508 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007E59C.s b/asm/non_matchings/code_80071F00/func_8007E59C.s deleted file mode 100644 index cf6dd289f..000000000 --- a/asm/non_matchings/code_80071F00/func_8007E59C.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_8007E59C -/* 07F19C 8007E59C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 07F1A0 8007E5A0 AFB40028 */ sw $s4, 0x28($sp) -/* 07F1A4 8007E5A4 3C14800E */ lui $s4, %hi(gPlayerCountSelection1) # $s4, 0x800e -/* 07F1A8 8007E5A8 2694C538 */ addiu $s4, %lo(gPlayerCountSelection1) # addiu $s4, $s4, -0x3ac8 -/* 07F1AC 8007E5AC 8E8E0000 */ lw $t6, ($s4) -/* 07F1B0 8007E5B0 AFB1001C */ sw $s1, 0x1c($sp) -/* 07F1B4 8007E5B4 AFB00018 */ sw $s0, 0x18($sp) -/* 07F1B8 8007E5B8 AFB30024 */ sw $s3, 0x24($sp) -/* 07F1BC 8007E5BC AFB20020 */ sw $s2, 0x20($sp) -/* 07F1C0 8007E5C0 3C10800E */ lui $s0, %hi(gPlayerOne) # $s0, 0x800e -/* 07F1C4 8007E5C4 3C11800E */ lui $s1, %hi(camera1) # $s1, 0x800e -/* 07F1C8 8007E5C8 00809825 */ move $s3, $a0 -/* 07F1CC 8007E5CC AFBF002C */ sw $ra, 0x2c($sp) -/* 07F1D0 8007E5D0 00001825 */ move $v1, $zero -/* 07F1D4 8007E5D4 8E10C4DC */ lw $s0, %lo(gPlayerOne)($s0) -/* 07F1D8 8007E5D8 8E31DB40 */ lw $s1, %lo(camera1)($s1) -/* 07F1DC 8007E5DC 19C0000E */ blez $t6, .L8007E618 -/* 07F1E0 8007E5E0 00009025 */ move $s2, $zero -/* 07F1E4 8007E5E4 02002825 */ move $a1, $s0 -.L8007E5E8: -/* 07F1E8 8007E5E8 02203025 */ move $a2, $s1 -/* 07F1EC 8007E5EC 263100B8 */ addiu $s1, $s1, 0xb8 -/* 07F1F0 8007E5F0 26100DD8 */ addiu $s0, $s0, 0xdd8 -/* 07F1F4 8007E5F4 0C01F943 */ jal func_8007E50C -/* 07F1F8 8007E5F8 02602025 */ move $a0, $s3 -/* 07F1FC 8007E5FC 14400006 */ bnez $v0, .L8007E618 -/* 07F200 8007E600 00401825 */ move $v1, $v0 -/* 07F204 8007E604 8E8F0000 */ lw $t7, ($s4) -/* 07F208 8007E608 26520001 */ addiu $s2, $s2, 1 -/* 07F20C 8007E60C 024F082A */ slt $at, $s2, $t7 -/* 07F210 8007E610 5420FFF5 */ bnel $at, $zero, .L8007E5E8 -/* 07F214 8007E614 02002825 */ move $a1, $s0 -.L8007E618: -/* 07F218 8007E618 8FBF002C */ lw $ra, 0x2c($sp) -/* 07F21C 8007E61C 8FB00018 */ lw $s0, 0x18($sp) -/* 07F220 8007E620 8FB1001C */ lw $s1, 0x1c($sp) -/* 07F224 8007E624 8FB20020 */ lw $s2, 0x20($sp) -/* 07F228 8007E628 8FB30024 */ lw $s3, 0x24($sp) -/* 07F22C 8007E62C 8FB40028 */ lw $s4, 0x28($sp) -/* 07F230 8007E630 27BD0030 */ addiu $sp, $sp, 0x30 -/* 07F234 8007E634 03E00008 */ jr $ra -/* 07F238 8007E638 00601025 */ move $v0, $v1 diff --git a/include/objects.h b/include/objects.h index 83ffe9148..4f2f22a49 100644 --- a/include/objects.h +++ b/include/objects.h @@ -96,4 +96,57 @@ extern s32 D_80183F28[]; extern s32 D_8018BFA8[]; extern s32 D_8018C030[]; +#define D_8018C1B0_SIZE 0x80 +#define NUM_MOLES 0x1F +#define NUM_SNOWFLAKES 0x32 +/** + * List of object list indices used for: + * Moles in Moo Moo Farm + * Snow flakes in Frappe Snowland + * Segments of the fire breath from the statues in Bowser's Castle + * Potentially other things +**/ +extern s32 D_8018C1B0[]; +// Next free spot in D_8018C1B0? Wraps back around to 0 if it gets bigger than D_8018C1B0_SIZE +extern s32 D_80183E38; +// Used for cycling through snowflakes in func_80078790 +extern s16 D_8018D174; + +#define D_8018C3F0_SIZE 0x80 +/** + * List of object list indices used for: + * Bats in Banshee's Boardwalk (but only 1 player mode?) +**/ +extern s32 D_8018C3F0[]; +// Next free spot in D_8018C3F0? Wraps back around to 0 if it gets bigger than D_8018C3F0_SIZE +extern s32 D_80183E4C; + +#define D_8018C630_SIZE 0x80 +extern s32 D_8018C630[]; +// Next free spot in D_8018C630? +extern s32 D_80183E5C; +extern s16 D_80165730; +// Tracking a count of some object type, don't know what object type yet +extern s16 D_80165738; + +#define D_8018C870_SIZE 0x40 +/** + * List of object list indices. Used both for the fires in the DK Jungle cave + * and, seemingly for the trail that shells leave behind them. + * I think they're using the same texture, which would explain the dual use +**/ +extern s32 D_8018C870[]; +// Next free spot in D_8018C870? Wraps back around to 0 if it gets bigger than D_8018C870_SIZE +extern s32 D_80183E6C; + +// Maximum number of leaves that can be falling? +#define D_8018C970_SIZE 0x40 +// Number of leaves to spawn each bonk? +#define D_8018C970_SPAWN_SIZE 0x14 +// Seemingly a list of object list indices used for the leaves that sometimes fall +// trees when you bonk into them +extern s32 D_8018C970[]; +// Next free spot in D_8018C970? Wraps back around to 0 if it gets bigger than D_8018C970_SIZE +extern s32 D_80183E7C; + #endif diff --git a/src/actors.h b/src/actors.h index 982428926..03357c9ca 100644 --- a/src/actors.h +++ b/src/actors.h @@ -113,7 +113,6 @@ void update_simple_objects(); // audio/external.c extern void func_800C98B8(Vec3f, Vec3f, u32); extern void func_800C99E0(Vec3f, s32); -extern void func_800C9D80(Vec3f, Vec3f, u32); extern Vec3f D_802B91C8; diff --git a/src/audio/external.h b/src/audio/external.h index e86424044..dfbc7aa3b 100644 --- a/src/audio/external.h +++ b/src/audio/external.h @@ -118,6 +118,7 @@ void func_800C8F44(u8); void func_800C9060(u8, u32); void func_800C90F4(u8, uintptr_t); void func_800C9A88(u8); +void func_800C9D80(Vec3f, Vec3f, u32); void func_800C9EF4(Vec3f, u32); void func_800C9F90(u8); void func_800CA008(u8, u8); diff --git a/src/code_800431B0.c b/src/code_800431B0.c index d3f95a9c4..4eb5775da 100644 --- a/src/code_800431B0.c +++ b/src/code_800431B0.c @@ -12,11 +12,9 @@ #include "code_8001F980.h" #include "code_800431B0.h" #include "code_80071F00.h" +#include "code_80091750.h" #include "main.h" -extern struct UnkStruct_800DC5EC *D_800DC5F0; -extern s32 D_8018D1F0; - void func_800431B0(Vec3f arg0, Vec3s arg1, f32 arg2, Vtx *vtx) { func_80042E00(arg0, arg1, arg2); gSPVertex(gDisplayListHead++, vtx, 4, 0); @@ -4343,100 +4341,44 @@ void func_800514BC(void) { GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800514BC.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern s32 D_8018C970; - void func_80051638(s32 arg0) { - Gfx *temp_v1; - Gfx *temp_v1_2; - Gfx *temp_v1_3; - Gfx *temp_v1_4; - Gfx *temp_v1_5; - s32 *var_s0; - s32 temp_a0; - struct_80165C18_entry *temp_v0; + s32 someIndex; + s32 leafIndex; + struct_80165C18_entry *object; - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->words.w1 = (u32) D_0D0079C8; - temp_v1->words.w0 = 0x06000000; - temp_v1_2 = gDisplayListHead; - gDisplayListHead = temp_v1_2 + 8; - temp_v1_2->words.w1 = 0x00003000; - temp_v1_2->words.w0 = 0xB6000000; + gSPDisplayList(gDisplayListHead++, D_0D0079C8); + gSPClearGeometryMode(gDisplayListHead++, G_CULL_BOTH); func_80043D50(D_0D028DD8, 0x00000020, 0x00000010); - var_s0 = &D_8018C970; - do { - temp_a0 = *var_s0; - if (temp_a0 != -1) { - temp_v0 = &D_80165C18[temp_a0]; - if ((temp_v0->unk_0A6 >= 2) && (temp_v0->unk_0D5 == 7) && (D_8018D120 < 0x2EF)) { - func_80043104(temp_a0); - temp_v1_3 = gDisplayListHead; - gDisplayListHead = temp_v1_3 + 8; - temp_v1_3->words.w1 = (u32) D_0D0069C8; - temp_v1_3->words.w0 = 0x06000000; + for(someIndex = 0; someIndex < D_8018C970_SIZE; someIndex++) { + leafIndex = D_8018C970[someIndex]; + if (leafIndex != -1) { + object = &D_80165C18[leafIndex]; + if ((object->unk_0A6 >= 2) && (object->unk_0D5 == 7) && (D_8018D120 < 0x2EF)) { + func_80043104(leafIndex); + gSPDisplayList(gDisplayListHead++, D_0D0069C8); } } - var_s0 += 4; - } while (var_s0 != D_8018CA70); - temp_v1_4 = gDisplayListHead; - gDisplayListHead = temp_v1_4 + 8; - temp_v1_4->words.w1 = 0x00002000; - temp_v1_4->words.w0 = 0xB7000000; - temp_v1_5 = gDisplayListHead; - gDisplayListHead = temp_v1_5 + 8; - temp_v1_5->words.w0 = 0xBB000000; - temp_v1_5->words.w1 = 0x00010001; + } + gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK); + gSPTexture(gDisplayListHead++, 1, 1, 0, G_TX_RENDERTILE, G_OFF); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80051638.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_80044F34(s8 *, ?, ?); /* extern */ -extern s32 D_8018C1B0; -extern ? D_8018C278; void func_800517C8(void) { - Gfx *temp_v1; - Gfx *temp_v1_2; - Gfx *temp_v1_3; - Gfx *temp_v1_4; - s32 *var_s0; - s32 temp_a0; + s32 someIndex; + s32 snowflakeIndex; - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->words.w1 = (u32) D_0D007AE0; - temp_v1->words.w0 = 0x06000000; - temp_v1_2 = gDisplayListHead; - gDisplayListHead = temp_v1_2 + 8; - temp_v1_2->words.w1 = -0x00000C07U; - temp_v1_2->words.w0 = 0xFC627EC4; + gSPDisplayList(gDisplayListHead++, D_0D007AE0); + gDPSetCombineLERP(gDisplayListHead++, 1, 0, SHADE, 0, 0, 0, 0, TEXEL0, 1, 0, SHADE, 0, 0, 0, 0, TEXEL0); func_80044F34(D_0D0293D8, 0x10, 0x10); - var_s0 = &D_8018C1B0; - do { - temp_a0 = *var_s0; - if (D_80165C18[temp_a0].unk_0A6 >= 2) { - func_80043104(temp_a0); - temp_v1_3 = gDisplayListHead; - gDisplayListHead = temp_v1_3 + 8; - temp_v1_3->words.w1 = (u32) D_0D006980; - temp_v1_3->words.w0 = 0x06000000; + for (someIndex = 0; someIndex < NUM_SNOWFLAKES; someIndex++) { + snowflakeIndex = D_8018C1B0[someIndex]; + if (D_80165C18[snowflakeIndex].unk_0A6 >= 2) { + func_80043104(snowflakeIndex); + gSPDisplayList(gDisplayListHead++, D_0D006980); } - var_s0 += 4; - } while (var_s0 != &D_8018C278); - temp_v1_4 = gDisplayListHead; - gDisplayListHead = temp_v1_4 + 8; - temp_v1_4->words.w0 = 0xBB000000; - temp_v1_4->words.w1 = 0x00010001; + } + gSPTexture(gDisplayListHead++, 1, 1, 0, G_TX_RENDERTILE, G_OFF); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800517C8.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b @@ -4648,60 +4590,37 @@ void func_80051EBC(void) { func_80051ABC(240 - D_800DC5EC->cameraHeight, 0); // 28 } -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern void *D_800DC5EC; -s16 gCurrentCourseId; /* unable to generate initializer */ - void func_80051EF8(void) { s16 temp_a0; - s16 temp_v0; - s16 var_a0; - temp_v0 = gCurrentCourseId; - temp_a0 = 0xF0 - D_800DC5EC->unk28; - if (temp_v0 == 6) { - var_a0 = temp_a0 - 0x30; - } else if (temp_v0 == 9) { - var_a0 = temp_a0 - 0x40; - } else if (temp_v0 == 4) { - var_a0 = temp_a0 - 0x40; + temp_a0 = 0xF0 - D_800DC5EC->cameraHeight; + if (gCurrentCourseId == COURSE_KOOPA_BEACH) { + temp_a0 = temp_a0 - 0x30; + } else if (gCurrentCourseId == COURSE_MOO_MOO_FARM) { + temp_a0 = temp_a0 - 0x40; + } else if (gCurrentCourseId == COURSE_YOSHI_VALLEY) { + temp_a0 = temp_a0 - 0x40; } else { - var_a0 = temp_a0 - 0x30; + temp_a0 = temp_a0 - 0x30; } - func_80051ABC(var_a0, 0); + func_80051ABC(temp_a0, 0); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80051EF8.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern void *D_800DC5F0; -extern s32 D_8018D1F0; -s16 gCurrentCourseId; /* unable to generate initializer */ void func_80051F9C(void) { s16 temp_a0; - s16 temp_v0; - s16 var_a0; - temp_v0 = gCurrentCourseId; - temp_a0 = 0xF0 - D_800DC5F0->unk28; - if (temp_v0 == 6) { - var_a0 = temp_a0 - 0x30; - } else if (temp_v0 == 9) { - var_a0 = temp_a0 - 0x40; - } else if (temp_v0 == 4) { - var_a0 = temp_a0 - 0x40; + temp_a0 = 0xF0 - D_800DC5F0->cameraHeight; + if (gCurrentCourseId == COURSE_KOOPA_BEACH) { + temp_a0 = temp_a0 - 0x30; + } else if (gCurrentCourseId == COURSE_MOO_MOO_FARM) { + temp_a0 = temp_a0 - 0x40; + } else if (gCurrentCourseId == COURSE_YOSHI_VALLEY) { + temp_a0 = temp_a0 - 0x40; } else { - var_a0 = temp_a0 - 0x30; + temp_a0 = temp_a0 - 0x30; } - func_80051ABC(var_a0, D_8018D1F0); + func_80051ABC(temp_a0, D_8018D1F0); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80051F9C.s") -#endif void func_80052044(void) { func_80051C60(240 - D_800DC5EC->cameraHeight, 0); @@ -4983,27 +4902,18 @@ void func_800527D8(s32 arg0) { GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800527D8.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern Gfx D_06007218; -extern f32 D_80183E40; -extern s16 D_80183E80; - -void func_8005285C(s32 playerId) { +void func_8005285C(s32 arg0) { Player *temp_v0; - temp_v0 = &gPlayerOne[playerId]; - D_80183E40.unk0 = temp_v0->pos[0]; - D_80183E40.unk4 = (f32) temp_v0->pos[1]; - D_80183E80.unk0 = 0; - D_80183E80.unk2 = 0; - D_80183E80.unk4 = 0; - D_80183E40.unk8 = (f32) temp_v0->pos[2]; - func_80043500(&D_80183E40, &D_80183E80, 0.02f, &D_06007218); + temp_v0 = &gPlayerOne[arg0]; + D_80183E40[0] = temp_v0->pos[0]; + D_80183E40[1] = temp_v0->pos[1]; + D_80183E40[2] = temp_v0->pos[2]; + D_80183E80[0] = 0; + D_80183E80[1] = 0; + D_80183E80[2] = 0; + func_80043500(D_80183E40, D_80183E80, 0.02f, D_06007218); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8005285C.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b @@ -5173,67 +5083,51 @@ void func_80052C60(s32 arg0) { GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80052C60.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern Gfx D_06007218; -extern ? D_80183DB8; -extern f32 D_80183E40; -extern u16 D_80183E80; - void func_80052D70(s32 playerId) { - Player *sp20; + s32 test; Player *temp_v1; temp_v1 = &gPlayerOne[playerId]; - sp20 = temp_v1; - if (func_80072320(*(&D_80183DB8 + (playerId * 4)), 8) != 0) { - D_80183E40.unk0 = temp_v1->pos[0]; - D_80183E40.unk4 = (f32) ((f64) temp_v1->unk_074 - 6.5); - D_80183E40.unk8 = (f32) temp_v1->pos[2]; - func_800435A0(&D_80183E40, &D_80183E80, 0.02f, &D_06007218, 0x000000FF); + test = D_80183DB8[playerId]; + if (func_80072320(test, 8) != 0) { + D_80183E40[0] = temp_v1->pos[0]; + D_80183E40[1] = temp_v1->unk_074 - 6.5; + D_80183E40[2] = temp_v1->pos[2]; + func_800435A0(D_80183E40, (u16 *) D_80183E80, 0.02f, D_06007218, 0x000000FF); } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80052D70.s") -#endif #ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_80052D70(s32); // extern -extern ? D_800E4620; -extern ? D_800E4628; -extern ? D_80165840; -extern s16 D_80183E80; - +//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-28-2022 +static ? D_800E4620; /* unable to generate initializer */ +static ? D_800E4628; /* unable to generate initializer */ void func_80052E30(s32 arg0) { - s32 temp_s0; - void *temp_v0; - void *temp_v0_2; - s32 phi_s0; + Gfx *temp_v0; + Gfx *temp_v0_2; + s32 var_s0; temp_v0 = gDisplayListHead; gDisplayListHead = temp_v0 + 8; - D_800E4620.unk10 = D_80165840.unk0; - D_800E4620.unk11 = D_80165840.unk1; - D_800E4620.unk12 = D_80165840.unk2; - temp_v0->unk0 = 0x3860010; - temp_v0->unk4 = &D_800E4628; + D_800E4620.unk10 = (s8) D_80165840->unk0; + D_800E4620.unk11 = (s8) D_80165840->unk1; + D_800E4620.unk12 = (s8) D_80165840->unk2; + temp_v0->words.w0 = 0x03860010; + temp_v0->words.w1 = (u32) &D_800E4628; temp_v0_2 = gDisplayListHead; gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0x3880010; - temp_v0_2->unk4 = &D_800E4620; - D_80183E80.unk0 = 0; - D_80183E80.unk2 = 0; - D_80183E80.unk4 = 0; - if (D_8018EDF3 == ONE_PLAYERS_SELECTED) { - phi_s0 = 0; + temp_v0_2->words.w0 = 0x03880010; + temp_v0_2->words.w1 = (u32) &D_800E4620; + D_80183E80->unk0 = 0; + D_80183E80->unk2 = 0; + D_80183E80->unk4 = 0; + if (D_8018EDF3 == 1) { + var_s0 = 0; if (gPlayerCountSelection1 > 0) { do { - func_80052D70(phi_s0); - temp_s0 = phi_s0 + 1; - phi_s0 = temp_s0; - } while (temp_s0 < gPlayerCountSelection1); + func_80052D70(var_s0); + var_s0 += 1; + } while (var_s0 < gPlayerCountSelection1); } } } @@ -5242,13 +5136,12 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80052E30.s") #endif #ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b +//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-28-2022 extern ? D_06006D20; extern ? D_06006F20; -extern s32 D_8018C3F0; extern ? D_8018C5F0; -void func_80052F20(s32 cameraId) { +void func_80052F20(s32 arg0) { Camera *sp44; Gfx *temp_v1; Gfx *temp_v1_2; @@ -5256,15 +5149,15 @@ void func_80052F20(s32 cameraId) { s32 temp_s0; struct_80165C18_entry *temp_s1; - sp44 = &camera1[cameraId]; + sp44 = &camera1[arg0]; func_80046E60((s32) &D_06006D20, (s32) &D_06006F20, 0x00000020, 0x00000020); - var_s2 = &D_8018C3F0; + var_s2 = D_8018C3F0; do { temp_s0 = *var_s2; if (temp_s0 != -1) { temp_s1 = &D_80165C18[temp_s0]; if (temp_s1->unk_0A6 > 0) { - func_8008A364(temp_s0, cameraId, 0x2AABU, 0x000001F4); + func_8008A364(temp_s0, arg0, 0x2AABU, 0x000001F4); if (func_8007223C(temp_s0, 0x00040000) != 0) { temp_s1->unk_0B2[1] = func_800418AC(temp_s1->unk_004[0], temp_s1->unk_004[2], sp44->pos); func_80043104(temp_s0); @@ -5286,50 +5179,34 @@ void func_80052F20(s32 cameraId) { GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80052F20.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern ? D_80183E80; -extern ? D_80183EEC; - void func_8005309C(s32 cameraId) { - Camera *temp_fp; - s32 *var_s3; - s32 temp_s1; s32 var_s4; - struct_80165C18_entry *temp_s0; - struct_80165C18_entry *temp_s0_2; + s32 temp_s1; + Camera *camera; - var_s3 = D_80183EA0; - var_s4 = 0; - temp_fp = &camera1[cameraId]; - do { - temp_s1 = *var_s3; - temp_s0 = &D_80165C18[temp_s1]; - if (temp_s0->unk_0A6 >= 2) { + camera = &camera1[cameraId]; + for (var_s4 = 0; var_s4 < 0x13; var_s4++) { + temp_s1 = D_80183EA0[var_s4]; + if (D_80165C18[temp_s1].unk_0A6 >= 2) { func_8008A364(temp_s1, cameraId, 0x2AABU, 0x00000258); if (func_8007223C(temp_s1, 0x00040000) != 0) { - D_80183E80.unk0 = (u16) temp_s0->unk_0B2; - D_80183E80.unk2 = func_800418AC(temp_s0->unk_004[0], temp_s0->unk_004[2], temp_fp->pos); - D_80183E80.unk4 = (u16) temp_s0->unk_0B6; + D_80183E80[0] = (s16) D_80165C18[temp_s1].unk_0B2[0]; + D_80183E80[1] = func_800418AC(D_80165C18[temp_s1].unk_004[0], D_80165C18[temp_s1].unk_004[2], camera->pos); + D_80183E80[2] = (u16) D_80165C18[temp_s1].unk_0B2[2]; if (func_8007223C(temp_s1, 0x00000010) != 0) { - func_800480B4((s32) temp_s0->unk_004, (s32) &D_80183E80, temp_s0->unk_000, (s32) temp_s0->unk_060, (s32) temp_s0->unk_064, temp_s0->unk_074, 0x00000040, 0x00000040, 0x00000040, 0x00000020); + func_800480B4(D_80165C18[temp_s1].unk_004, (u16 *) D_80183E80, D_80165C18[temp_s1].unk_000, (s32) D_80165C18[temp_s1].unk_060, (s32) D_80165C18[temp_s1].unk_064, D_80165C18[temp_s1].unk_074, 0x00000040, 0x00000040, 0x00000040, 0x00000020); } - temp_s0_2 = &D_80165C18[*(var_s4 + D_80183F28)]; - D_80183E80.unk0 = (u16) temp_s0_2->unk_0B2; - D_80183E80.unk4 = (u16) temp_s0_2->unk_0B6; - func_800480B4((s32) temp_s0_2->unk_004, (s32) &D_80183E80, temp_s0_2->unk_000, (s32) temp_s0_2->unk_060, (s32) temp_s0_2->unk_064, temp_s0_2->unk_074, 0x00000040, 0x00000040, 0x00000040, 0x00000020); + temp_s1 = D_80183F28[var_s4]; + D_80183E80[0] = (s16) D_80165C18[temp_s1].unk_0B2[0]; + D_80183E80[2] = (u16) D_80165C18[temp_s1].unk_0B2[2]; + func_800480B4(D_80165C18[temp_s1].unk_004, (u16 *) D_80183E80, D_80165C18[temp_s1].unk_000, (s32) D_80165C18[temp_s1].unk_060, (s32) D_80165C18[temp_s1].unk_064, D_80165C18[temp_s1].unk_074, 0x00000040, 0x00000040, 0x00000040, 0x00000020); } } - var_s3 += 4; - var_s4 += 4; - } while (var_s3 != &D_80183EEC); + } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8005309C.s") -#endif void func_8005327C(s32 arg0) { - func_8005309C(); + func_8005309C(arg0); func_80052F20(arg0); } @@ -5621,43 +5498,21 @@ void func_80053870(s32 cameraId) { GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80053870.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 6b6e1390bf30013247343623194964ff13d0c45b -extern ? D_0D0060B0; -extern s16 D_80183E80; - -void func_80053D74(s32 objectIndex, s32 arg1, s32 arg2) { - struct_80165C18_entry *sp28; - Gfx *temp_v0_2; - Gfx *temp_v0_3; +void func_80053D74(s32 objectIndex, s32 arg1, s32 vertexIndex) { struct_80165C18_entry *temp_v0; if (D_8018D120 < 0x2EF) { temp_v0 = &D_80165C18[objectIndex]; - D_80183E80.unk4 = (s16) (temp_v0->unk_084[6] + 0x8000); - sp28 = temp_v0; - func_80042E00(temp_v0->unk_004, &D_80183E80, temp_v0->unk_000); + D_80183E80[2] = (s16) (temp_v0->unk_084[6] + 0x8000); + func_80042E00(temp_v0->unk_004, (u16 *) D_80183E80, temp_v0->unk_000); func_8004B1C8((s32) temp_v0->unk_084[0], (s32) temp_v0->unk_084[1], (s32) temp_v0->unk_084[2], (s32) temp_v0->unk_084[3], (s32) temp_v0->unk_084[4], (s32) temp_v0->unk_084[5], (s32) temp_v0->unk_0A0); - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->words.w0 = 0x0400103F; - temp_v0_2->words.w1 = (u32) ((arg2 * 0x10) + &D_0D0060B0); - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->words.w0 = 0x06000000; - temp_v0_3->words.w1 = (u32) D_0D006940; + gSPVertex(gDisplayListHead++, &D_0D0060B0[vertexIndex], 4, 0); + gSPDisplayList(gDisplayListHead++, D_0D006940); } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80053D74.s") -#endif #ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_80053D74(s32, s32, ?); /* extern */ -extern ? D_0D007E98; -extern ? D_80183E80; -extern s32 D_8018C630; +//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-28-2022 extern s8 *D_8018D4BC; extern s8 *D_8018D4C0; static ? D_800E52D0; /* unable to generate initializer */ @@ -5679,7 +5534,7 @@ void func_80053E6C(s32 arg0) { temp_v0 = gDisplayListHead; gDisplayListHead = temp_v0 + 8; temp_v0->words.w0 = 0x06000000; - temp_v0->words.w1 = (u32) &D_0D007E98; + temp_v0->words.w1 = (u32) D_0D007E98; temp_v0_2 = gDisplayListHead; gDisplayListHead = temp_v0_2 + 8; temp_v0_2->words.w0 = 0xFD100000; @@ -5705,10 +5560,10 @@ void func_80053E6C(s32 arg0) { temp_v0_7->words.w1 = 0; temp_v0_7->words.w0 = 0xE7000000; func_8004B614(0, 0, 0, 0, 0, 0, 0); - D_80183E80.unk0 = 0; - D_80183E80.unk2 = 0x8000; + D_80183E80->unk0 = 0; + D_80183E80->unk2 = 0x8000; func_800452A4(D_8018D4BC, 0x00000040, 0x00000020); - var_s0 = &D_8018C630; + var_s0 = D_8018C630; var_s1 = 0; if (D_80165738 > 0) { do { @@ -5722,7 +5577,7 @@ void func_80053E6C(s32 arg0) { var_s1 = 0; } func_800452A4(D_8018D4C0, 0x00000040, 0x00000020); - var_s0_2 = &D_8018C630; + var_s0_2 = D_8018C630; if (D_80165738 > 0) { do { temp_a0_2 = *var_s0_2; @@ -5738,47 +5593,26 @@ void func_80053E6C(s32 arg0) { GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80053E6C.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern Vtx D_0D005AE0; -extern s16 D_80183E80; - void func_800540CC(s32 objectIndex, s32 cameraId) { - Camera *sp2C; - struct_80165C18_entry *sp28; - s16 temp_a0; - struct_80165C18_entry *temp_v1; + Camera *camera; - sp2C = &camera1[cameraId]; + camera = &camera1[cameraId]; if (objectIndex != -1) { - temp_v1 = &D_80165C18[objectIndex]; - if ((temp_v1->unk_0A6 >= 2) && (temp_v1->unk_0D5 == 1) && (D_8018D120 < 0x2EF)) { - temp_a0 = temp_v1->unk_0A4; - sp28 = temp_v1; - func_8004B1C8((s32) temp_a0, (s32) temp_a0, (s32) temp_a0, 0, 0, 0, (s32) temp_v1->unk_0A0); - D_80183E80.unk2 = func_800418AC(temp_v1->unk_004[0], temp_v1->unk_004[2], sp2C->pos); - func_800431B0(temp_v1->unk_004, &D_80183E80, temp_v1->unk_000, &D_0D005AE0); + if ((D_80165C18[objectIndex].unk_0A6 >= 2) && (D_80165C18[objectIndex].unk_0D5 == 1) && (D_8018D120 < 0x2EF)) { + func_8004B1C8((s32) D_80165C18[objectIndex].unk_0A4, (s32) D_80165C18[objectIndex].unk_0A4, (s32) D_80165C18[objectIndex].unk_0A4, 0, 0, 0, (s32) D_80165C18[objectIndex].unk_0A0); + D_80183E80[1] = func_800418AC(D_80165C18[objectIndex].unk_004[0], D_80165C18[objectIndex].unk_004[2], camera->pos); + func_800431B0(D_80165C18[objectIndex].unk_004, D_80183E80, D_80165C18[objectIndex].unk_000, D_0D005AE0); } } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800540CC.s") -#endif #ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_800540CC(s32, s32); /* extern */ -extern ? D_0D007AE0; -extern s8 D_0D029458; +//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-28-2022 extern f32 D_801635A4; extern s32 D_801636A0; extern f32 D_801636B0; extern s32 D_801637AC; -extern ? D_80183E80; -extern s32 D_8018C3F0; extern ? D_8018C5F0; -extern s32 D_8018C630; -extern ? D_8018C830; void func_800541BC(s32 cameraId) { Camera *sp3C; @@ -5790,20 +5624,20 @@ void func_800541BC(s32 cameraId) { sp3C = &camera1[cameraId]; gDisplayListHead = temp_v1 + 8; temp_v1->words.w0 = 0x06000000; - temp_v1->words.w1 = (u32) &D_0D007AE0; - func_8004477C(&D_0D029458, 0x00000020, 0x00000020); + temp_v1->words.w1 = (u32) D_0D007AE0; + func_8004477C(D_0D029458, 0x00000020, 0x00000020); func_8004B72C(0x000000FF, 0x000000FF, 0x000000FF, 0x000000FF, 0x000000FF, 0x000000FF, 0x000000FF); - D_80183E80.unk0 = 0; - D_80183E80.unk4 = 0x8000; + D_80183E80->unk0 = 0; + D_80183E80->unk4 = 0x8000; if ((D_801636A0 != 0) && (func_80041980(&D_801635A4, sp3C, 0x4000U) != 0)) { - var_s0 = &D_8018C3F0; + var_s0 = D_8018C3F0; do { func_800540CC(*var_s0, cameraId); var_s0 += 4; } while (var_s0 != &D_8018C5F0); } if ((D_801637AC != 0) && (func_80041980(&D_801636B0, sp3C, 0x4000U) != 0)) { - var_s0_2 = &D_8018C630; + var_s0_2 = D_8018C630; do { func_800540CC(*var_s0_2, cameraId); var_s0_2 += 4; @@ -5814,49 +5648,26 @@ void func_800541BC(s32 cameraId) { GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800541BC.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern Vtx D_0D005AE0; -extern s16 D_80183E80; - void func_80054324(s32 objectIndex, s32 cameraId) { - Camera *sp2C; - struct_80165C18_entry *sp28; - s16 temp_a0; - s16 temp_a3; - struct_80165C18_entry *temp_v1; + Camera *camera; - sp2C = &camera1[cameraId]; + camera = &camera1[cameraId]; if (objectIndex != -1) { - temp_v1 = &D_80165C18[objectIndex]; - if ((temp_v1->unk_0A6 >= 2) && (temp_v1->unk_0D5 == 6) && (D_8018D120 < 0x2EF)) { - temp_a0 = temp_v1->unk_0A4; - temp_a3 = temp_v1->unk_0A2; - sp28 = temp_v1; - func_8004B1C8((s32) temp_a0, (s32) temp_a0, (s32) temp_a0, (s32) temp_a3, (s32) temp_a3, (s32) temp_a3, (s32) temp_v1->unk_0A0); - D_80183E80.unk2 = func_800418AC(temp_v1->unk_004[0], temp_v1->unk_004[2], sp2C->pos); - func_800431B0(temp_v1->unk_004, &D_80183E80, temp_v1->unk_000, &D_0D005AE0); + if ((D_80165C18[objectIndex].unk_0A6 >= 2) && (D_80165C18[objectIndex].unk_0D5 == 6) && (D_8018D120 < 0x2EF)) { + func_8004B1C8((s32) D_80165C18[objectIndex].unk_0A4, (s32) D_80165C18[objectIndex].unk_0A4, (s32) D_80165C18[objectIndex].unk_0A4, D_80165C18[objectIndex].unk_0A2, D_80165C18[objectIndex].unk_0A2, D_80165C18[objectIndex].unk_0A2, (s32) D_80165C18[objectIndex].unk_0A0); + D_80183E80[1] = func_800418AC(D_80165C18[objectIndex].unk_004[0], D_80165C18[objectIndex].unk_004[2], camera->pos); + func_800431B0(D_80165C18[objectIndex].unk_004, D_80183E80, D_80165C18[objectIndex].unk_000, D_0D005AE0); } } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80054324.s") -#endif #ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_80054324(s32, s32); /* extern */ -extern ? D_0D007AE0; -extern s8 D_0D029458; +//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-28-2022 extern f32 D_801637C4; extern s32 D_801637E8; extern f32 D_801637F0; extern s32 D_80163814; -extern ? D_80183E80; -extern s32 D_8018C3F0; extern ? D_8018C5F0; -extern s32 D_8018C630; -extern ? D_8018C830; void func_80054414(s32 cameraId) { Camera *sp3C; @@ -5868,20 +5679,20 @@ void func_80054414(s32 cameraId) { sp3C = &camera1[cameraId]; gDisplayListHead = temp_v1 + 8; temp_v1->words.w0 = 0x06000000; - temp_v1->words.w1 = (u32) &D_0D007AE0; - func_8004477C(&D_0D029458, 0x00000020, 0x00000020); + temp_v1->words.w1 = (u32) D_0D007AE0; + func_8004477C(D_0D029458, 0x00000020, 0x00000020); func_8004B72C(0x000000FF, 0x000000FF, 0x000000FF, 0x000000FF, 0x000000FF, 0x000000FF, 0x000000FF); - D_80183E80.unk0 = 0; - D_80183E80.unk4 = 0x8000; + D_80183E80->unk0 = 0; + D_80183E80->unk4 = 0x8000; if ((D_801637E8 != 0) && (func_80041980(&D_801637C4, sp3C, 0x4000U) != 0)) { - var_s0 = &D_8018C3F0; + var_s0 = D_8018C3F0; do { func_80054324(*var_s0, cameraId); var_s0 += 4; } while (var_s0 != &D_8018C5F0); } if ((D_80163814 != 0) && (func_80041980(&D_801637F0, sp3C, 0x4000U) != 0)) { - var_s0_2 = &D_8018C630; + var_s0_2 = D_8018C630; do { func_80054324(*var_s0_2, cameraId); var_s0_2 += 4; @@ -5892,16 +5703,11 @@ void func_80054414(s32 cameraId) { GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80054414.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern Vtx D_0D005AE0; -extern s16 D_80183E80; - void func_8005457C(s32 objectIndex, s32 cameraId) { - Camera *sp34; + Camera *camera; struct_80165C18_entry *temp_s0; - sp34 = &camera1[cameraId]; + camera = &camera1[cameraId]; if (D_8018D120 < 0x2EF) { temp_s0 = &D_80165C18[objectIndex]; if (temp_s0->unk_0D5 == 9) { @@ -5909,23 +5715,13 @@ void func_8005457C(s32 objectIndex, s32 cameraId) { } else { func_8004B138(0x000000FF, (s32) temp_s0->unk_0A4, 0, (s32) temp_s0->unk_0A0); } - D_80183E80.unk2 = func_800418AC(temp_s0->unk_004[0], temp_s0->unk_004[2], sp34->pos); - func_800431B0(temp_s0->unk_004, &D_80183E80, temp_s0->unk_000, &D_0D005AE0); + D_80183E80[1] = func_800418AC(temp_s0->unk_004[0], temp_s0->unk_004[2], camera->pos); + func_800431B0(temp_s0->unk_004, D_80183E80, temp_s0->unk_000, D_0D005AE0); } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8005457C.s") -#endif #ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_8005457C(s32, s32); /* extern */ -extern ? D_0D007AE0; -extern ? D_0D02BC58; -extern s32 D_80165598; -extern ? D_80183E80; -extern s32 D_8018C1B0; - +//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-28-2022 void func_80054664(s32 arg0) { Gfx *temp_v1; s32 *var_s0; @@ -5934,12 +5730,12 @@ void func_80054664(s32 arg0) { temp_v1 = gDisplayListHead; gDisplayListHead = temp_v1 + 8; temp_v1->words.w0 = 0x06000000; - temp_v1->words.w1 = (u32) &D_0D007AE0; - func_8004477C((D_80165598 << 0xA) + &D_0D02BC58, 0x00000020, 0x00000020); + temp_v1->words.w1 = (u32) D_0D007AE0; + func_8004477C((D_80165598 << 0xA) + D_0D02BC58, 0x00000020, 0x00000020); func_8004B414(0, 0, 0, 0x000000FF); - D_80183E80.unk0 = 0; - D_80183E80.unk4 = 0x8000; - var_s0 = &D_8018C1B0; + D_80183E80->unk0 = 0; + D_80183E80->unk4 = 0x8000; + var_s0 = D_8018C1B0; do { temp_a0 = *var_s0; if ((temp_a0 != -1) && (D_80165C18[temp_a0].unk_0A6 >= 3)) { @@ -5952,56 +5748,31 @@ void func_80054664(s32 arg0) { GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80054664.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 6b6e1390bf30013247343623194964ff13d0c45b -extern ? D_0D005AE0; -extern s16 D_80183E80; - -void func_8005477C(s32 objectIndex, s32 arg1, f32 *arg2) { - s32 temp_t6; - struct_80165C18_entry *var_s0; - - temp_t6 = arg1 & 0xFF; +void func_8005477C(s32 objectIndex, u8 arg1, Vec3f arg2) { if (D_8018D120 < 0x2EF) { - switch (temp_t6) { /* irregular */ - default: - var_s0 = &D_80165C18[objectIndex]; - break; + switch (arg1) { /* irregular */ case 0: - var_s0 = &D_80165C18[objectIndex]; - func_8004B1C8(0x000000E6, 0x000000FF, 0x000000FF, 0, 0, 0x000000FF, (s32) var_s0->unk_0A0); + func_8004B1C8(0x000000E6, 0x000000FF, 0x000000FF, 0, 0, 0x000000FF, (s32) D_80165C18[objectIndex].unk_0A0); break; case 1: - var_s0 = &D_80165C18[objectIndex]; - func_8004B1C8(0x000000FF, 0x000000FF, 0x00000096, 0x000000FF, 0, 0, (s32) var_s0->unk_0A0); + func_8004B1C8(0x000000FF, 0x000000FF, 0x00000096, 0x000000FF, 0, 0, (s32) D_80165C18[objectIndex].unk_0A0); break; case 2: - var_s0 = &D_80165C18[objectIndex]; - func_8004B1C8(0x000000FF, 0x000000E6, 0x000000FF, 0x000000FF, 0, 0x00000096, (s32) var_s0->unk_0A0); + func_8004B1C8(0x000000FF, 0x000000E6, 0x000000FF, 0x000000FF, 0, 0x00000096, (s32) D_80165C18[objectIndex].unk_0A0); break; case 3: - var_s0 = &D_80165C18[objectIndex]; - func_8004B1C8(0x000000FF, 0x000000FF, 0x0000001E, 0x000000FF, 0, 0, (s32) var_s0->unk_0A0); + func_8004B1C8(0x000000FF, 0x000000FF, 0x0000001E, 0x000000FF, 0, 0, (s32) D_80165C18[objectIndex].unk_0A0); + break; + default: break; } - D_80183E80.unk2 = func_800418AC(var_s0->unk_004[0], var_s0->unk_004[2], arg2); - func_800431B0(var_s0->unk_004, &D_80183E80, var_s0->unk_000, (s32) &D_0D005AE0); + D_80183E80[1] = func_800418AC(D_80165C18[objectIndex].unk_004[0], D_80165C18[objectIndex].unk_004[2], arg2); + func_800431B0(D_80165C18[objectIndex].unk_004, D_80183E80, D_80165C18[objectIndex].unk_000, D_0D005AE0); } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8005477C.s") -#endif #ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_8005477C(s32, u8, Camera *); /* extern */ -extern ? D_0D007AE0; -extern ? D_0D02BC58; -extern s32 D_80165598; -extern ? D_80183E80; -extern s32 D_8018C870; -extern ? D_8018C970; - +//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-28-2022 void func_80054938(s32 cameraId) { Camera *sp54; Gfx *temp_v1; @@ -6013,12 +5784,12 @@ void func_80054938(s32 cameraId) { sp54 = &camera1[cameraId]; gDisplayListHead = temp_v1 + 8; temp_v1->words.w0 = 0x06000000; - temp_v1->words.w1 = (u32) &D_0D007AE0; - func_8004477C((D_80165598 << 0xA) + &D_0D02BC58, 0x00000020, 0x00000020); + temp_v1->words.w1 = (u32) D_0D007AE0; + func_8004477C((D_80165598 << 0xA) + D_0D02BC58, 0x00000020, 0x00000020); func_8004B72C(0x000000FF, 0x000000FF, 0x000000FF, 0x000000FF, 0x000000FF, 0x000000FF, 0x000000FF); - D_80183E80.unk0 = 0; - D_80183E80.unk4 = 0x8000; - var_s2 = &D_8018C870; + D_80183E80->unk0 = 0; + D_80183E80->unk4 = 0x8000; + var_s2 = D_8018C870; do { temp_s0 = *var_s2; if (temp_s0 != -1) { @@ -6030,53 +5801,29 @@ void func_80054938(s32 cameraId) { func_8008A364(temp_s0, cameraId, 0x4000U, 0x000001F4); } if (func_8007223C(temp_s0, 0x00040000) != 0) { - func_8005477C(temp_s0, (u8) temp_s1->unk_0D8, sp54); + func_8005477C(temp_s0, (u8) temp_s1->unk_0D8, sp54->pos); } } } var_s2 += 4; - } while (var_s2 != &D_8018C970); + } while (var_s2 != D_8018C970); } #else GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80054938.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern ? D_0D005AE0; -extern s16 D_80183E80; - void func_80054AFC(s32 objectIndex, Vec3f arg1) { - Gfx *temp_v0; - Gfx *temp_v0_2; - struct_80165C18_entry *temp_s0; - - temp_s0 = &D_80165C18[objectIndex]; - D_80183E80.unk0 = func_800418E8(temp_s0->unk_004[2], temp_s0->unk_004[1], arg1); - D_80183E80.unk2 = func_800418AC(temp_s0->unk_004[0], temp_s0->unk_004[2], arg1); - D_80183E80.unk4 = (u16) temp_s0->unk_0B6; - func_8004B138((s32) temp_s0->unk_084[0], (s32) temp_s0->unk_084[1], (s32) temp_s0->unk_084[2], (s32) temp_s0->unk_0A0); - func_80042E00(temp_s0->unk_004, &D_80183E80, temp_s0->unk_000); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->words.w0 = 0x0400103F; - temp_v0->words.w1 = (u32) &D_0D005AE0; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->words.w0 = 0x06000000; - temp_v0_2->words.w1 = (u32) D_0D006940; + D_80183E80[0] = func_800418E8(D_80165C18[objectIndex].unk_004[2], D_80165C18[objectIndex].unk_004[1], arg1); + D_80183E80[1] = func_800418AC(D_80165C18[objectIndex].unk_004[0], D_80165C18[objectIndex].unk_004[2], arg1); + D_80183E80[2] = (u16) D_80165C18[objectIndex].unk_0B2[2]; + func_8004B138((s32) D_80165C18[objectIndex].unk_084[0], (s32) D_80165C18[objectIndex].unk_084[1], (s32) D_80165C18[objectIndex].unk_084[2], (s32) D_80165C18[objectIndex].unk_0A0); + func_80042E00(D_80165C18[objectIndex].unk_004, (u16 *) D_80183E80, D_80165C18[objectIndex].unk_000); + gSPVertex(gDisplayListHead++, D_0D005AE0, 4, 0); + gSPDisplayList(gDisplayListHead++, D_0D006940); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80054AFC.s") -#endif #ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_80054AFC(s32, Camera *); /* extern */ -extern ? D_0D007AE0; -extern s16 D_80183E80; -extern s32 D_8018C630; -extern ? D_8018C830; +//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-28-2022 extern s8 *D_8018D488; void func_80054BE8(s32 cameraId) { @@ -6088,16 +5835,16 @@ void func_80054BE8(s32 cameraId) { temp_v1 = gDisplayListHead; gDisplayListHead = temp_v1 + 8; temp_v1->words.w0 = 0x06000000; - temp_v1->words.w1 = (u32) &D_0D007AE0; + temp_v1->words.w1 = (u32) D_0D007AE0; temp_s5 = &camera1[cameraId]; func_800444B0(D_8018D488, 0x00000020, 0x00000020); func_8004B35C(0x000000FF, 0x000000FF, 0, 0x000000FF); - D_80183E80 = 0; - var_s0 = &D_8018C630; + *D_80183E80 = 0; + var_s0 = D_8018C630; do { temp_a0 = *var_s0; if ((temp_a0 != -1) && (D_80165C18[temp_a0].unk_0A6 >= 2)) { - func_80054AFC(temp_a0, temp_s5); + func_80054AFC(temp_a0, temp_s5->pos); } var_s0 += 4; } while (var_s0 != &D_8018C830); @@ -6106,54 +5853,35 @@ void func_80054BE8(s32 cameraId) { GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80054BE8.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern ? D_0D0062B0; -extern ? D_80183E80; - void func_80054D00(s32 objectIndex, s32 cameraId) { - Camera *sp3C; - struct_80165C18_entry *sp38; - struct_80165C18_entry *temp_v1; + Camera *camera; - temp_v1 = &D_80165C18[objectIndex]; - sp3C = &camera1[cameraId]; - if (temp_v1->unk_0A6 >= 3) { - sp38 = temp_v1; + camera = &camera1[cameraId]; + if (D_80165C18[objectIndex].unk_0A6 >= 3) { func_8008A364(objectIndex, cameraId, 0x2AABU, 0x0000012C); if (func_8007223C(objectIndex, 0x00040000) != 0) { - sp38 = temp_v1; - D_80183E80.unk0 = (u16) temp_v1->unk_0B2; - D_80183E80.unk2 = func_800418AC(temp_v1->unk_004[0], temp_v1->unk_004[2], sp3C->pos); - D_80183E80.unk4 = (u16) temp_v1->unk_0B6; - func_80048130((s32) temp_v1->unk_004, (s32) &D_80183E80, temp_v1->unk_000, (s32) temp_v1->unk_060, (s32) temp_v1->unk_064, (s32) &D_0D0062B0, 0x00000020, 0x00000040, 0x00000020, 0x00000040, 5); + D_80183E80[0] = (s16) D_80165C18[objectIndex].unk_0B2[0]; + D_80183E80[1] = func_800418AC(D_80165C18[objectIndex].unk_004[0], D_80165C18[objectIndex].unk_004[2], camera->pos); + D_80183E80[2] = (u16) D_80165C18[objectIndex].unk_0B2[2]; + func_80048130(D_80165C18[objectIndex].unk_004, (u16 *) D_80183E80, D_80165C18[objectIndex].unk_000, (s32) D_80165C18[objectIndex].unk_060, (s32) D_80165C18[objectIndex].unk_064, D_0D0062B0, 0x00000020, 0x00000040, 0x00000020, 0x00000040, 5); } } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80054D00.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern ? D_80183E50; -extern ? D_80183E70; +#ifdef NEEDS_RODATA +// data/data_0DD0A0_3_0_1.s +extern f64 D_800EE080; // = 0.8; void func_80054E10(s32 objectIndex) { - struct_80165C18_entry *sp1C; - struct_80165C18_entry *temp_v1; - - temp_v1 = &D_80165C18[objectIndex]; - if (temp_v1->unk_0A6 > 0) { - sp1C = temp_v1; + if (D_80165C18[objectIndex].unk_0A6 > 0) { if (func_8007223C(objectIndex, 0x00800000) != 0) { - D_80183E50.unk0 = (f32) temp_v1->unk_004[0]; - D_80183E50.unk4 = (f32) ((f64) temp_v1->unk_044 + 0.8); - D_80183E50.unk8 = (f32) temp_v1->unk_004[2]; - D_80183E70.unk0 = (f32) temp_v1->unk_038[0]; - D_80183E70.unk4 = (f32) temp_v1->unk_038[1]; - D_80183E70.unk8 = (f32) temp_v1->unk_038[2]; - func_8004A9B8(temp_v1->unk_000); + D_80183E50[0] = D_80165C18[objectIndex].unk_004[0]; + D_80183E50[1] = D_80165C18[objectIndex].unk_044 + 0.8; + D_80183E50[2] = D_80165C18[objectIndex].unk_004[2]; + D_80183E70[0] = D_80165C18[objectIndex].unk_038[0]; + D_80183E70[1] = D_80165C18[objectIndex].unk_038[1]; + D_80183E70[2] = D_80165C18[objectIndex].unk_038[2]; + func_8004A9B8(D_80165C18[objectIndex].unk_000); } } } @@ -6161,111 +5889,54 @@ void func_80054E10(s32 objectIndex) { GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80054E10.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_80054E10(s32); // extern -extern s32 D_8018C1B0; -extern ? D_8018C22C; +// Almost certainly responsible for spawning/handling the moles on Moo Moo farm +void func_80054EB8(s32 unused) { + s32 someIndex; -void func_80054EB8(s32 arg0) { - s32 *temp_s0; - s32 *phi_s0; - - phi_s0 = &D_8018C1B0; - do { - func_80054E10(*phi_s0); - temp_s0 = phi_s0 + 4; - phi_s0 = temp_s0; - } while (temp_s0 != &D_8018C22C); + for (someIndex = 0; someIndex < NUM_MOLES; someIndex++) { + func_80054E10(D_8018C1B0[someIndex]); + } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80054EB8.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern s8 D_06013670; -extern ? D_0D006980; -extern ? D_0D0079C8; -extern s32 D_8018C3F0; -extern ? D_8018C5F0; void func_80054F04(s32 cameraId) { + s32 var_s2; + s32 objectIndex; Camera *sp44; - Gfx *temp_v1; - Gfx *temp_v1_2; - Gfx *temp_v1_3; - s32 *var_s2; - s32 temp_s0; - struct_80165C18_entry *temp_s1; + struct_80165C18_entry * object; - temp_v1 = gDisplayListHead; sp44 = &camera1[cameraId]; - gDisplayListHead = temp_v1 + 8; - temp_v1->words.w0 = 0x06000000; - temp_v1->words.w1 = (u32) &D_0D0079C8; - func_80043D50(&D_06013670, 0x00000010, 0x00000010); - var_s2 = &D_8018C3F0; - do { - temp_s0 = *var_s2; - temp_s1 = &D_80165C18[temp_s0]; - if (temp_s1->unk_0A6 > 0) { - func_8008A364(temp_s0, cameraId, 0x2AABU, 0x000000C8); - if ((func_8007223C(temp_s0, 0x00040000) != 0) && (D_8018D120 < 0x2EF)) { - temp_s1->unk_0B4 = func_800418AC(temp_s1->unk_004[0], temp_s1->unk_004[2], sp44->pos); - func_80043104(temp_s0); - temp_v1_2 = gDisplayListHead; - gDisplayListHead = temp_v1_2 + 8; - temp_v1_2->words.w1 = (u32) &D_0D006980; - temp_v1_2->words.w0 = 0x06000000; + gSPDisplayList(gDisplayListHead++, D_0D0079C8); + func_80043D50(D_06013670, 0x00000010, 0x00000010); + for (var_s2 = 0; var_s2 < D_8018C3F0_SIZE; var_s2++) { + objectIndex = D_8018C3F0[var_s2]; + object = &D_80165C18[objectIndex]; + if (object->unk_0A6 > 0) { + func_8008A364(objectIndex, cameraId, 0x2AABU, 0x000000C8); + if ((func_8007223C(objectIndex, 0x00040000) != 0) && (D_8018D120 < 0x2EF)) { + object->unk_0B2[1] = func_800418AC(object->unk_004[0], object->unk_004[2], sp44->pos); + func_80043104(objectIndex); + gSPDisplayList(gDisplayListHead++, D_0D006980); } } - var_s2 += 4; - } while (var_s2 != &D_8018C5F0); - temp_v1_3 = gDisplayListHead; - gDisplayListHead = temp_v1_3 + 8; - temp_v1_3->words.w0 = 0xBB000000; - temp_v1_3->words.w1 = 0x00010001; + } + gSPTexture(gDisplayListHead++, 1, 1, 0, G_TX_RENDERTILE, G_OFF); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80054F04.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_80054D00(s32, s32); /* extern */ -? func_80054EB8(s32); /* extern */ -? func_80054F04(s32); /* extern */ -extern ? D_80183EC0; -extern ? D_80183F54; -extern ? D_8018BFD8; void func_800550A4(s32 arg0) { - s32 *var_s0; - s32 *var_s0_2; - s32 *var_s0_3; + s32 var_s0; - var_s0 = D_80183EA0; - do { - func_80054D00(*var_s0, arg0); - var_s0 += 4; - } while ((u32) var_s0 < (u32) &D_80183EC0); - var_s0_2 = D_80183F28; - do { - func_80054D00(*var_s0_2, arg0); - var_s0_2 += 4; - } while ((u32) var_s0_2 < (u32) &D_80183F54); - var_s0_3 = D_8018BFA8; - do { - func_80054D00(*var_s0_3, arg0); - var_s0_3 += 4; - } while (var_s0_3 != &D_8018BFD8); + for (var_s0 = 0; var_s0 < 8; var_s0++) { + func_80054D00(D_80183EA0[var_s0], arg0); + } + for (var_s0 = 0; var_s0 < 11; var_s0++) { + func_80054D00(D_80183F28[var_s0], arg0); + } + for (var_s0 = 0; var_s0 < 12; var_s0++) { + func_80054D00(D_8018BFA8[var_s0], arg0); + } func_80054EB8(arg0); func_80054F04(arg0); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800550A4.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b @@ -6611,72 +6282,45 @@ void func_80055C38(s32 arg0) { GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80055C38.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern ? D_0600F650; -extern Gfx D_0600F960; -extern ? D_0600FA20; -extern Gfx D_0600FBE0; -extern s16 D_80183E80; - void func_80055CCC(s32 objectIndex, s32 cameraId) { - Camera *sp24; - Gfx *temp_v1; - Gfx *temp_v1_2; - struct_80165C18_entry *temp_s0; + s32 stackPadding0; + f32 test; + Camera *camera; - temp_s0 = &D_80165C18[objectIndex]; - sp24 = &camera1[cameraId]; - if (temp_s0->unk_0A6 >= 2) { + camera = &camera1[cameraId]; + if (D_80165C18[objectIndex].unk_0A6 >= 2) { func_8008A454(objectIndex, cameraId, 0x0000012C); - func_8004A6EC(objectIndex, (f32) ((20.0 / (f64) (temp_s0->unk_004[1] - temp_s0->unk_044)) + 0.5)); + test = D_80165C18[objectIndex].unk_004[1] - D_80165C18[objectIndex].unk_044; + func_8004A6EC(objectIndex, (20.0 / test) + 0.5); if (func_80072270(objectIndex, 0x00100000) != 0) { - func_80043328(temp_s0->unk_004, (s16 *) temp_s0->unk_0BE, temp_s0->unk_000, &D_0600F960); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->words.w0 = 0x06000000; - temp_v1->words.w1 = (u32) &D_0600F650; - return; - } - D_80183E80.unk0 = (s16) temp_s0->unk_0BE[0]; - D_80183E80.unk2 = (s16) (func_800418AC(temp_s0->unk_004[0], temp_s0->unk_004[2], sp24->pos) + 0x8000); - D_80183E80.unk4 = (u16) temp_s0->unk_0BE[2]; - func_80043328(temp_s0->unk_004, &D_80183E80, temp_s0->unk_000, &D_0600FBE0); - temp_v1_2 = gDisplayListHead; - gDisplayListHead = temp_v1_2 + 8; - temp_v1_2->words.w0 = 0x06000000; - temp_v1_2->words.w1 = (u32) &D_0600FA20; - if (gPlayerCountSelection1 == 1) { - temp_s0->unk_0BE[1] = 0; + func_80043328(D_80165C18[objectIndex].unk_004, (s16 *) D_80165C18[objectIndex].unk_0BE, D_80165C18[objectIndex].unk_000, D_0600F960); + gSPDisplayList(gDisplayListHead++, D_0600F650); + } else { + D_80183E80[0] = (s16) D_80165C18[objectIndex].unk_0BE[0]; + D_80183E80[1] = (s16) (func_800418AC(D_80165C18[objectIndex].unk_004[0], D_80165C18[objectIndex].unk_004[2], camera->pos) + 0x8000); + D_80183E80[2] = (u16) D_80165C18[objectIndex].unk_0BE[2]; + func_80043328(D_80165C18[objectIndex].unk_004, D_80183E80, D_80165C18[objectIndex].unk_000, D_0600FBE0); + gSPDisplayList(gDisplayListHead++, D_0600FA20); + if (gPlayerCountSelection1 == 1) { + D_80165C18[objectIndex].unk_0BE[1] = 0; + } } } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80055CCC.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 6b6e1390bf30013247343623194964ff13d0c45b -? func_80055CCC(s32, s32); /* extern */ -extern s32 gGamestate; void func_80055E68(s32 arg0) { - s32 temp_s0; - - temp_s0 = *D_80183EA0; + s32 objectIndex; + objectIndex = D_80183EA0[0]; if (gGamestate != 9) { - func_8008A1D0(temp_s0, arg0, 0x000005DC, 0x00000BB8); - if (func_8007223C(temp_s0, 0x00040000) != 0) { - func_80055CCC(temp_s0, arg0); + func_8008A1D0(objectIndex, arg0, 0x000005DC, 0x00000BB8); + if (func_8007223C(objectIndex, 0x00040000) != 0) { + func_80055CCC(objectIndex, arg0); } } else { - func_800721E8(temp_s0, 0x00100000); - func_80055CCC(temp_s0, arg0); + func_800721E8(objectIndex, 0x00100000); + func_80055CCC(objectIndex, arg0); } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80055E68.s") -#endif void func_80055EF4(s32 objectIndex, s32 arg1) { struct_80165C18_entry *object; @@ -6720,34 +6364,24 @@ void func_80056160(s32 arg0) { func_80055FA0(D_80183EAC, arg0); } -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern ? D_80183EC8; -extern ? D_8018E838; - void func_80056188(s32 cameraId) { - Camera *temp_s3; - s32 *var_s2; - s32 temp_s1; - struct_80165C18_entry *temp_s0; + Camera *camera; + s32 var_s2; + s32 objectIndex; + struct_80165C18_entry *object; - var_s2 = D_80183EA0; - temp_s3 = &camera1[cameraId]; - do { - temp_s1 = *var_s2; - if (*(cameraId + &D_8018E838) == 0) { - temp_s0 = &D_80165C18[temp_s1]; - if ((temp_s0->unk_0A6 >= 2) && (func_80072270(temp_s1, 0x00080000) != 0) && (func_8008A140(temp_s1, temp_s3, 0x2AABU) != 0)) { - temp_s0->unk_0B4 = func_800872D8(temp_s1, temp_s3); - func_800480B4(temp_s0->unk_004, &temp_s0->unk_0B2, temp_s0->unk_000, (s32) temp_s0->unk_060, (s32) temp_s0->unk_064, D_0D0060B0, 0x00000040, 0x00000040, 0x00000040, 0x00000020); + camera = &camera1[cameraId]; + for (var_s2 =0; var_s2 < 10; var_s2++) { + objectIndex = D_80183EA0[var_s2]; + if (D_8018E838[cameraId] == 0) { + object = &D_80165C18[objectIndex]; + if ((object->unk_0A6 >= 2) && (func_80072270(objectIndex, 0x00080000) != 0) && (func_8008A140(objectIndex, camera, 0x2AABU) != 0)) { + object->unk_0B2[1] = func_800872D8(objectIndex, camera); + func_800480B4(object->unk_004, object->unk_0B2, object->unk_000, (s32) object->unk_060, (s32) object->unk_064, D_0D0060B0, 0x00000040, 0x00000040, 0x00000040, 0x00000020); } } - var_s2 += 4; - } while (var_s2 != &D_80183EC8); + } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80056188.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b @@ -6860,44 +6494,25 @@ void func_800563DC(s32 objectIndex, s32 cameraId, s32 arg2) { GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800563DC.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern f32 D_80183E40; -extern s16 D_80183E80; - void func_8005669C(s32 objectIndex, s32 arg1, s32 arg2) { - Gfx *temp_v1; - Gfx *temp_v1_2; - struct_80165C18_entry *temp_s1; - - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->words.w0 = 0x06000000; - temp_v1->words.w1 = (u32) D_0D0079E8; + gSPDisplayList(gDisplayListHead++, D_0D0079E8); func_8004B310(arg2); func_80043D50(D_0D02AA58, 0x00000010, 0x00000010); - temp_s1 = &D_80165C18[objectIndex]; - D_80183E40.unk4 = (f32) ((f64) temp_s1->unk_004[1] - 2.0); - D_80183E40.unk0 = (f32) ((f64) temp_s1->unk_004[0] + 2.0); - D_80183E40.unk8 = (f32) ((f64) temp_s1->unk_004[2] + 2.0); - func_800431B0(&D_80183E40, &D_80183E80, 0.15f, D_0D005770); - D_80183E40.unk0 = (f32) ((f64) temp_s1->unk_004[0] + 2.0); - D_80183E40.unk8 = (f32) ((f64) temp_s1->unk_004[2] - 2.0); - func_800431B0(&D_80183E40, &D_80183E80, 0.15f, D_0D005770); - D_80183E40.unk0 = (f32) ((f64) temp_s1->unk_004[0] - 2.0); - D_80183E40.unk8 = (f32) ((f64) temp_s1->unk_004[2] - 2.0); - func_800431B0(&D_80183E40, &D_80183E80, 0.15f, D_0D005770); - D_80183E40.unk0 = (f32) ((f64) temp_s1->unk_004[0] - 2.0); - D_80183E40.unk8 = (f32) ((f64) temp_s1->unk_004[2] + 2.0); - func_800431B0(&D_80183E40, &D_80183E80, 0.15f, D_0D005770); - temp_v1_2 = gDisplayListHead; - gDisplayListHead = temp_v1_2 + 8; - temp_v1_2->words.w0 = 0xBB000000; - temp_v1_2->words.w1 = 0x00010001; + D_80183E40[1] = D_80165C18[objectIndex].unk_004[1] - 2.0; + D_80183E40[0] = D_80165C18[objectIndex].unk_004[0] + 2.0; + D_80183E40[2] = D_80165C18[objectIndex].unk_004[2] + 2.0; + func_800431B0(D_80183E40, D_80183E80, 0.15f, D_0D005770); + D_80183E40[0] = D_80165C18[objectIndex].unk_004[0] + 2.0; + D_80183E40[2] = D_80165C18[objectIndex].unk_004[2] - 2.0; + func_800431B0(D_80183E40, D_80183E80, 0.15f, D_0D005770); + D_80183E40[0] = D_80165C18[objectIndex].unk_004[0] - 2.0; + D_80183E40[2] = D_80165C18[objectIndex].unk_004[2] - 2.0; + func_800431B0(D_80183E40, D_80183E80, 0.15f, D_0D005770); + D_80183E40[0] = D_80165C18[objectIndex].unk_004[0] - 2.0; + D_80183E40[2] = D_80165C18[objectIndex].unk_004[2] + 2.0; + func_800431B0(D_80183E40, D_80183E80, 0.15f, D_0D005770); + gSPTexture(gDisplayListHead++, 1, 1, 0, G_TX_RENDERTILE, G_OFF); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8005669C.s") -#endif #ifdef NEEDS_RODATA // data_0DD0A0_3_0_1.s diff --git a/src/code_800431B0.h b/src/code_800431B0.h index 782297999..4a9c9bf94 100644 --- a/src/code_800431B0.h +++ b/src/code_800431B0.h @@ -307,22 +307,35 @@ void func_800523B8(s32, s32, u32); void func_800524B4(s32); void func_800524B4(s32); void func_800527D8(s32); +void func_8005285C(s32); void func_80052590(s32); void func_80052C60(); +void func_80052D70(s32); void func_80052E30(s32); +void func_8005309C(s32); void func_8005327C(s32); void func_800532A4(s32); void func_800534E8(s32); void func_800536C8(s32); void func_80053870(s32); +void func_80053D74(s32, s32, s32); void func_80053E6C(s32); +void func_800540CC(s32, s32); void func_800541BC(s32); +void func_80054324(s32, s32); void func_80054414(s32); +void func_8005457C(s32, s32); void func_80054664(s32); +void func_8005477C(s32, u8, Vec3f); void func_80054938(s32); +void func_80054AFC(s32, Vec3f); void func_80054BE8(s32); +void func_80054D00(s32, s32); +void func_80054E10(s32); +void func_80054EB8(s32); +void func_80054F04(s32); void func_800550A4(s32); void func_80055228(s32); @@ -334,6 +347,7 @@ void func_8005568C(s32); void func_800557AC(); void func_8005592C(s32); void func_80055C38(s32); +void func_80055CCC(s32, s32); void func_80055E68(s32); void func_80055EF4(s32, s32); void func_80055F48(s32); @@ -342,6 +356,7 @@ void func_80055FA0(s32, s32); void func_80056160(s32); void func_80056188(s32); void func_800568A0(s32, s32); +void func_8005669C(s32, s32, s32); void func_800569F4(s32); void func_80056A40(s32, s32); void func_80056A94(s32); @@ -384,13 +399,18 @@ extern u16 D_801656D0; extern u16 D_801656E0; extern s32 D_80183DD8[]; +extern Vec3f D_80183E40; extern Vec3f D_80183E50; extern Vec3f D_80183E70; +extern Vec3s D_80183E80; extern s32 D_80183E88[]; extern Vec3s D_80183E98; extern s32 D_80183EAC; extern UnkActorInner D_8018C830; extern s32 D_8018D1E0; +extern s32 D_8018D1F0; + +extern struct UnkStruct_800DC5EC *D_800DC5F0; extern Lights1 D_800E4638; extern Lights1 D_800E4650; @@ -405,4 +425,12 @@ extern u8 D_06006F38[]; // Some type of pallette? extern Gfx *gDisplayListHead; +// Stuff from undefined_syms.txt, don't know where else to put them +extern s8 D_06013670[]; +extern Gfx D_06007218[]; +extern Gfx D_0600F650[]; +extern Gfx D_0600F960[]; +extern Gfx D_0600FA20[]; +extern Gfx D_0600FBE0[]; + #endif diff --git a/src/code_80057C60.c b/src/code_80057C60.c index 2e938833a..6af4ec101 100644 --- a/src/code_80057C60.c +++ b/src/code_80057C60.c @@ -17,6 +17,7 @@ #include "skybox_and_splitscreen.h" #include "common_textures.h" #include "audio/external.h" +#include "objects.h" // UI Code? void func_80057C60(void) { @@ -390,16 +391,16 @@ void func_800588F4(s32 arg0) { void func_80058B58() { switch(gCurrentCourseId) { - case 5: + case COURSE_FRAPPE_SNOWLAND: if (gGamestate != 9) { - if ((D_8015F894 == 0) && (gPlayerCountSelection1 == COURSE_CHOCO_MOUNTAIN)) { + if ((D_8015F894 == 0) && (gPlayerCountSelection1 == 1)) { func_800517C8(); } - break; + } else { + func_800517C8(); } - func_800517C8(); break; - case 12: + case COURSE_SHERBET_LAND: func_80052C60(); break; } diff --git a/src/code_80057C60.h b/src/code_80057C60.h index 241c772d6..d76be2462 100644 --- a/src/code_80057C60.h +++ b/src/code_80057C60.h @@ -204,7 +204,6 @@ extern s8 D_801657C8; extern s32 D_8018D22C; extern s32 gGamestate; extern u16 D_800DC51C; -extern s16 D_80165730; extern s8 D_8018EDF3; extern s8 D_80165898; extern u16 D_8015F894; diff --git a/src/code_8006E9C0.h b/src/code_8006E9C0.h index e6cb99ca1..2856bf7c6 100644 --- a/src/code_8006E9C0.h +++ b/src/code_8006E9C0.h @@ -14,7 +14,6 @@ void func_80070714(); extern s32 gScreenModeSelection; extern s32 gTextureLogoMarioKart64; extern s16 D_80165730; -extern s16 D_80165738; extern s16 D_80165740; extern s16 D_80165748; extern s32 D_80183D5C; diff --git a/src/code_80071F00.c b/src/code_80071F00.c index 50db05d66..020a5c226 100644 --- a/src/code_80071F00.c +++ b/src/code_80071F00.c @@ -12,6 +12,7 @@ #include "code_80071F00.h" #include "code_80086E70.h" #include "common_textures.h" +#include "audio/external.h" s32 find_unused_obj_index(s32* arg0) { s32 temp_v0; @@ -54,56 +55,43 @@ s32 func_80071FBC(void) { return someCount; } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc s32 func_80072044(s32 *arg0, s32 *arg1, s32 arg2) { - s32 sp24; - s32 sp20; - s32 *var_a0_2; - s32 temp_t0; - s32 temp_v0; - s32 var_a0; - s32 var_v0; s32 var_v1; + s32 temp_v0; + s32 *var_a0_2; - var_v0 = *arg1; - var_v1 = 0; - if (var_v0 >= arg2) { + if (*arg1 >= arg2) { *arg1 = 0; - var_v0 = 0; } - var_a0_2 = &arg0[var_v0]; + var_v1 = 0; + var_a0_2 = &arg0[*arg1]; + /* + * This HAS to be a for-loop of some variety, but I can't make a for-loop to match. + * If you replace this with ```for(var_v1 = 0; var_v1 < arg2; var_v1++)``` + * The diff gets massive. + */ if (arg2 > 0) { loop_3: - temp_t0 = var_v0 + 1; - var_v0 = temp_t0; if (*var_a0_2 == -1) { - sp24 = var_v1; temp_v0 = find_unused_obj_index(var_a0_2); *arg1 += 1; - sp20 = temp_v0; } else { - *arg1 = temp_t0; - if (temp_t0 >= arg2) { + *arg1 += 1; + if (*arg1 >= arg2) { *arg1 = 0; - var_v0 = 0; } var_v1 += 1; - var_a0_2 = &arg0[var_v0]; + var_a0_2 = &arg0[*arg1]; if (var_v1 != arg2) { goto loop_3; } } } - var_a0 = sp20; if (var_v1 == arg2) { - var_a0 = -1; + temp_v0 = -1; } - return var_a0; + return temp_v0; } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80072044.s") -#endif void func_80072100(s32 *arg0) { func_80071F6C(arg0); @@ -129,8 +117,6 @@ void func_80072120(s32 *arg0, s32 arg1) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80072120.s") #endif -extern s32 D_80162DF8; - void func_80072180(void) { if (gModeSelection == TIME_TRIALS) { if (((gPlayerOne->unk_000 & PLAYER_EXISTS) != 0) && @@ -1421,228 +1407,139 @@ void func_80074E28(s32 arg0) { } } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 D_8018C630; - void func_80074EE8(void) { - s32 *var_s2; - s32 temp_s0; - s32 var_s3; - s32 var_s4; - struct_80165C18_entry *temp_s1; + s32 someIndex; + s32 objectIndex; + s32 someCount; + struct_80165C18_entry *object; - var_s4 = 0; - var_s3 = 0; - if (D_80165738 > 0) { - var_s2 = &D_8018C630; - do { - temp_s0 = *var_s2; - if (temp_s0 != -1) { - temp_s1 = &D_80165C18[temp_s0]; - if (temp_s1->unk_0A6 != 0) { - func_80074E28(temp_s0); - func_80074D94(temp_s0); - if (temp_s1->unk_0A6 == 0) { - func_80072100((s32) var_s2); - } - var_s4 += 1; + someCount = 0; + for (someIndex = 0; someIndex < D_80165738; someIndex++) { + objectIndex = D_8018C630[someIndex]; + if (objectIndex != -1) { + object = &D_80165C18[objectIndex]; + if (object->unk_0A6 != 0) { + func_80074E28(objectIndex); + func_80074D94(objectIndex); + if (object->unk_0A6 == 0) { + func_80072100(&D_8018C630[someIndex]); } + someCount += 1; } - var_s3 += 1; - var_s2 += 4; - } while (var_s3 < D_80165738); + } } - if (var_s4 == 0) { + if (someCount == 0) { D_80165730 = 0; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80074EE8.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern ? D_8016582C; void func_80074FD8(s32 objectIndex) { - struct_80165C18_entry *sp28; - s16 temp_v0; - struct_80165C18_entry *temp_v1; - - temp_v1 = &D_80165C18[objectIndex]; - temp_v0 = temp_v1->unk_0A6; - switch (temp_v0) { /* irregular */ + switch (D_80165C18[objectIndex].unk_0A6) { /* irregular */ + case 0: + break; case 1: - sp28 = temp_v1; - if (func_80087E08(objectIndex, temp_v1->unk_038[1], 0.12f, temp_v1->unk_034, (s16) (s32) temp_v1->unk_0BE[1], 0x00000064) != 0) { - sp28 = temp_v1; + if (func_80087E08(objectIndex, D_80165C18[objectIndex].unk_038[1], 0.12f, D_80165C18[objectIndex].unk_034, D_80165C18[objectIndex].unk_0BE[1], 0x00000064) != 0) { func_80072488(objectIndex); } - sp28 = temp_v1; func_8008BF18(objectIndex); - temp_v1->unk_0B2[0] = (u16) temp_v1->unk_0B2[0] + D_8016582C.unk0; - temp_v1->unk_0B2[1] = (u16) temp_v1->unk_0B2[1] + D_8016582C.unk2; - temp_v1->unk_0B2[2] = (u16) temp_v1->unk_0B2[2] + D_8016582C.unk4; - return; + D_80165C18[objectIndex].unk_0B2[0] += D_8016582C[0]; + D_80165C18[objectIndex].unk_0B2[1] += D_8016582C[1]; + D_80165C18[objectIndex].unk_0B2[2] += D_8016582C[2]; + break; case 2: func_80086F60(objectIndex); func_80072428(objectIndex); - /* fallthrough */ - case 0: - return; + break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80074FD8.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_800750D8(s32 objectIndex, s32 arg1, f32 *arg2, s32 arg3, s32 arg4) { +#ifdef NEEDS_RODATA +extern f64 D_800EEAB0;// = 0.0005; +extern f64 D_800EEAB8;// = 0.05 +extern f64 D_800EEAC0;// = 0.05 +extern f64 D_800EEAC8;// = 0.1 + +void func_800750D8(s32 objectIndex, s32 arg1, Vec3f arg2, s32 arg3, s32 arg4) { s32 sp24; - s32 sp20; - struct_80165C18_entry *sp18; - f64 var_f18; - s16 temp_a0; + s32 temp_v0; struct_80165C18_entry *temp_v1; - u16 temp_v0; - u16 temp_v0_2; func_800723A4(objectIndex, 0); sp24 = random_int(0x01F4U); temp_v0 = random_int(0x0032U); temp_v1 = &D_80165C18[objectIndex]; - temp_v1->unk_0D5 = (s8) arg3; - temp_v1->unk_000 = (f32) (((f64) (f32) sp24 * 0.0005) + 0.05); - temp_v1->unk_03C = (f32) (((f64) (f32) temp_v0 * 0.05) + 2.0); - temp_v1->unk_0BE[1] = (u16) ((s32) (arg1 << 0x10) / arg4); - temp_v1->unk_034 = (f32) (((f64) (f32) ((s32) temp_v0 % 5) * 0.1) + 1.0); - sp20 = (s32) temp_v0; - sp18 = temp_v1; - temp_v1->unk_010[0] = (arg2->unk0 + (f32) ((s32) temp_v0 / 2)) - 12.0f; - temp_v0_2 = random_int(0x000AU); - var_f18 = (f64) temp_v0_2; - if ((s32) temp_v0_2 < 0) { - var_f18 += 4294967296.0; - } - temp_a0 = temp_v0 * 0x50; - temp_v1->unk_010[1] = (f32) (var_f18 + ((f64) arg2->unk4 - 10.0)); + temp_v1->unk_0D5 = arg3; + temp_v1->unk_000 = ((f64) (f32) sp24 * 0.0005) + 0.05; + // ALL HAIL THE FAKE MATCH GODS!!!!! + temp_v1->unk_038[1] = ((f64) (f32) temp_v0 * (0.05 * 1.0)) + 2.0; + temp_v1->unk_034 = ((f64) (f32)(temp_v0 % 5) * 0.1) + 1.0; + temp_v1->unk_0BE[1] = (arg1 << 0x10) / arg4; + temp_v1->unk_010[0] = (arg2[0] + (temp_v0 / 2)) - 12.0f; + temp_v1->unk_010[1] = (arg2[1] - 10.0) + random_int(0x000AU); + temp_v1->unk_010[2] = (arg2[2] + (temp_v0 / 2)) - 12.0f; temp_v1->unk_0B2[0] = sp24 << 7; - temp_v1->unk_0B2[1] = temp_a0; - temp_v1->unk_0B2[2] = temp_a0; - temp_v1->unk_010[2] = (arg2->unk8 + (f32) ((s32) temp_v0 / 2)) - 12.0f; + temp_v1->unk_0B2[1] = temp_v0 * 0x50; + temp_v1->unk_0B2[2] = temp_v0 * 0x50; } #else GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800750D8.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_800750D8(s32, s32, s32, s32, s32); /* extern */ -extern s32 D_80183E38; -extern s32 D_80183E4C; -extern s32 D_80183E5C; -extern s32 D_8018C1B0; -extern s32 D_8018C3F0; -extern s32 D_8018C630; - -void func_80075304(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { - s32 sp48; - s32 var_s0; +void func_80075304(Vec3f arg0, s32 arg1, s32 arg2, s32 arg3) { s32 var_s1; - s32 var_v0; + s32 var_s0; - var_s1 = 0; - if (arg3 > 0) { - var_s0 = sp48; -loop_2: + for (var_s1 = 0; var_s1 < arg3; var_s1++) { switch (arg1) { /* irregular */ case 1: - var_v0 = func_80072044(&D_8018C1B0, &D_80183E38, 0x00000080); -block_9: - var_s0 = var_v0; + var_s0 = func_80072044(D_8018C1B0, &D_80183E38, 0x00000080); break; case 2: - var_v0 = func_80072044(&D_8018C3F0, &D_80183E4C, 0x00000080); - goto block_9; + var_s0 = func_80072044(D_8018C3F0, &D_80183E4C, 0x00000080); + break; case 3: - var_v0 = func_80072044(&D_8018C630, &D_80183E5C, 0x00000080); - goto block_9; - } - if (var_s0 != -1) { - func_800750D8(var_s0, var_s1, arg0, arg2, arg3); - var_s1 += 1; - if (var_s1 == arg3) { - sp48 = var_s0; - } else { - goto loop_2; - } + var_s0 = func_80072044(D_8018C630, &D_80183E5C, 0x00000080); + break; } + if (var_s0 == -1) break; + func_800750D8(var_s0, var_s1, arg0, arg2, arg3); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80075304.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_80074FD8(s32); /* extern */ -extern ? D_8016582C; -extern s32 D_8018C1B0; -extern s32 D_8018C3F0; -extern s32 D_8018C630; void func_8007542C(s32 arg0) { - ? *sp44; - ? *var_s3; - s32 *var_v0; - s32 temp_a0; - s32 var_s1; + s32 var_v0; s32 var_s2; + s32 *var_s3; struct_80165C18_entry *temp_s0; - D_8016582C.unk0 = (u16) (D_8016582C.unk0 + 0x2000); - D_8016582C.unk2 = (u16) (D_8016582C.unk2 + 0x1000); - D_8016582C.unk4 = (u16) (D_8016582C.unk4 + 0x1800); - var_s1 = 0; - var_s2 = 0; - var_s3 = sp44; - do { + D_8016582C[0] += 0x2000; + D_8016582C[1] += 0x1000; + D_8016582C[2] += 0x1800; + for (var_s2 = 0; var_s2 < 0x80; var_s2++) { switch (arg0) { /* irregular */ - default: - var_v0 = var_s3 + var_s1; - break; case 1: - var_s3 = &D_8018C1B0; -block_8: - var_v0 = var_s1 + var_s3; + var_s3 = D_8018C1B0; break; case 2: - var_s3 = &D_8018C3F0; - goto block_8; + var_s3 = D_8018C3F0; + break; case 3: - var_s3 = &D_8018C630; - goto block_8; + var_s3 = D_8018C630; + break; } - temp_a0 = *var_v0; - if (temp_a0 != -1) { - temp_s0 = &D_80165C18[temp_a0]; + var_v0 = var_s3[var_s2]; + if (var_v0 != -1) { + temp_s0 = &D_80165C18[var_v0]; if (temp_s0->unk_0A6 != 0) { - func_80074FD8(temp_a0); + func_80074FD8(var_v0); if (temp_s0->unk_0A6 == 0) { - func_80072100((s32) ((var_s2 * 4) + var_s3)); + func_80072100(&var_s3[var_s2]); } } } - var_s2 += 1; - var_s1 += 4; - } while (var_s2 != 0x80); - sp44 = var_s3; + + } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007542C.s") -#endif void func_80075574(s32 objectIndex, Vec3f arg1, f32 arg2) { struct_80165C18_entry *temp_v1; @@ -1658,42 +1555,22 @@ void func_80075574(s32 objectIndex, Vec3f arg1, f32 arg2) { temp_v1->unk_0A4 = random_int(0x0064U) + 0x1E; } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 D_80183E4C; -extern s32 D_80183E5C; -extern s32 D_8018C3F0; -extern s32 D_8018C630; - -s32 func_800755FC(s32 arg0, f32 *arg1, f32 arg2) { - s32 sp1C; +s32 func_800755FC(s32 arg0, Vec3f arg1, f32 arg2) { s32 temp_v0; - s32 temp_v0_2; - s32 var_a0; if (arg0 == 0) { - temp_v0 = func_80072044(&D_8018C3F0, &D_80183E4C, 0x00000080); - var_a0 = temp_v0; + temp_v0 = func_80072044(D_8018C3F0, &D_80183E4C, D_8018C3F0_SIZE); if (temp_v0 != -1) { - sp1C = temp_v0; - func_80075574(var_a0, arg1, arg2); - goto block_5; + func_80075574(temp_v0, arg1, arg2); } } else { - temp_v0_2 = func_80072044(&D_8018C630, &D_80183E5C, 0x00000080); - var_a0 = temp_v0_2; - if (temp_v0_2 != -1) { - sp1C = temp_v0_2; - func_80075574(var_a0, arg1, arg2); -block_5: - var_a0 = sp1C; + temp_v0 = func_80072044(D_8018C630, &D_80183E5C, D_8018C630_SIZE); + if (temp_v0 != -1) { + func_80075574(temp_v0, arg1, arg2); } } - return var_a0; + return temp_v0; } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800755FC.s") -#endif void func_80075698(s32 arg0) { D_80165C18[arg0].unk_0D5 = 1; @@ -1734,19 +1611,14 @@ void func_80075714(s32 objectIndex) { } #ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc +//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-28-2022 extern s32 D_801636A0; extern s32 D_801637AC; extern s16 D_8016578C; extern s16 D_80165790; -extern s32 D_8018C3F0; extern ? D_8018C5F0; -extern s32 D_8018C630; -extern ? D_8018C830; void func_80075838(void) { - s16 temp_v0; - s16 temp_v0_2; s32 *var_s1; s32 *var_s1_2; s32 temp_a0; @@ -1756,17 +1628,15 @@ void func_80075838(void) { struct_80165C18_entry *temp_s0; struct_80165C18_entry *temp_s0_2; - temp_v0 = D_8016578C; - if (temp_v0 != 0) { - D_8016578C = temp_v0 - 1; + if (D_8016578C != 0) { + D_8016578C -= 1; } - temp_v0_2 = D_80165790; - if (temp_v0_2 != 0) { - D_80165790 = temp_v0_2 - 1; + if (D_80165790 != 0) { + D_80165790 -= 1; } var_s2 = 0; if ((D_801636A0 != 0) || (D_8016578C != 0)) { - var_s1 = &D_8018C3F0; + var_s1 = D_8018C3F0; do { temp_a0 = *var_s1; if (temp_a0 != -1) { @@ -1774,7 +1644,7 @@ void func_80075838(void) { if (temp_s0->unk_0A6 != 0) { func_80075714(temp_a0); if (temp_s0->unk_0A6 == 0) { - func_80072100((s32) var_s1); + func_80072100(var_s1); } var_s2 += 1; } @@ -1787,7 +1657,7 @@ void func_80075838(void) { } if ((D_801637AC != 0) || (D_80165790 != 0)) { var_s2_2 = 0; - var_s1_2 = &D_8018C630; + var_s1_2 = D_8018C630; do { temp_a0_2 = *var_s1_2; if (temp_a0_2 != -1) { @@ -1795,7 +1665,7 @@ void func_80075838(void) { if (temp_s0_2->unk_0A6 != 0) { func_80075714(temp_a0_2); if (temp_s0_2->unk_0A6 == 0) { - func_80072100((s32) var_s1_2); + func_80072100(var_s1_2); } var_s2_2 += 1; } @@ -1824,16 +1694,16 @@ void func_800759EC(s32 objectIndex, Vec3f arg1, f32 arg2) { temp_v0->unk_0A2 = 0x0096; } -s32 func_80075A6C(s32 arg0, s32 arg1, f32 arg2) { +s32 func_80075A6C(s32 arg0, Vec3f arg1, f32 arg2) { s32 temp_v0; if (arg0 == 0) { - temp_v0 = func_80072044(&D_8018C3F0, &D_80183E4C, 0x80); + temp_v0 = func_80072044(D_8018C3F0, &D_80183E4C, 0x80); if (temp_v0 != -1) { func_800759EC(temp_v0, arg1, arg2); } } else { - temp_v0 = func_80072044(&D_8018C630, &D_80183E5C, 0x80); + temp_v0 = func_80072044(D_8018C630, &D_80183E5C, 0x80); if (temp_v0 != -1) { func_800759EC(temp_v0, arg1, arg2); } @@ -1881,19 +1751,14 @@ void func_80075B84(s32 arg0) { } #ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc +//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-28-2022 extern s32 D_801637E8; extern s32 D_80163814; extern s16 D_8016578C; extern s16 D_80165790; -extern s32 D_8018C3F0; extern ? D_8018C5F0; -extern s32 D_8018C630; -extern ? D_8018C830; void func_80075CA8(void) { - s16 temp_v0; - s16 temp_v0_2; s32 *var_s1; s32 *var_s1_2; s32 temp_a0; @@ -1903,17 +1768,15 @@ void func_80075CA8(void) { struct_80165C18_entry *temp_s0; struct_80165C18_entry *temp_s0_2; - temp_v0 = D_8016578C; - if (temp_v0 != 0) { - D_8016578C = temp_v0 - 1; + if (D_8016578C != 0) { + D_8016578C -= 1; } - temp_v0_2 = D_80165790; - if (temp_v0_2 != 0) { - D_80165790 = temp_v0_2 - 1; + if (D_80165790 != 0) { + D_80165790 -= 1; } var_s2 = 0; if ((D_801637E8 != 0) || (D_8016578C != 0)) { - var_s1 = &D_8018C3F0; + var_s1 = D_8018C3F0; do { temp_a0 = *var_s1; if (temp_a0 != -1) { @@ -1921,7 +1784,7 @@ void func_80075CA8(void) { if (temp_s0->unk_0A6 != 0) { func_80075B84(temp_a0); if (temp_s0->unk_0A6 == 0) { - func_80072100((s32) var_s1); + func_80072100(var_s1); } var_s2 += 1; } @@ -1934,7 +1797,7 @@ void func_80075CA8(void) { } if ((D_80163814 != 0) || (D_80165790 != 0)) { var_s2_2 = 0; - var_s1_2 = &D_8018C630; + var_s1_2 = D_8018C630; do { temp_a0_2 = *var_s1_2; if (temp_a0_2 != -1) { @@ -1942,7 +1805,7 @@ void func_80075CA8(void) { if (temp_s0_2->unk_0A6 != 0) { func_80075B84(temp_a0_2); if (temp_s0_2->unk_0A6 == 0) { - func_80072100((s32) var_s1_2); + func_80072100(var_s1_2); } var_s2_2 += 1; } @@ -1980,41 +1843,31 @@ void func_80075E5C(s32 objectIndex, Vec3f arg1, u16 arg2, f32 arg3, s32 arg4) { s32 func_80075F28(Vec3f arg0, u16 arg1, f32 arg2, s32 arg3) { s32 temp_v0; - temp_v0 = func_80072044(&D_8018C1B0, &D_80183E38, 0x80); + temp_v0 = func_80072044(D_8018C1B0, &D_80183E38, 0x80); if (temp_v0 != -1) { func_80075E5C(temp_v0, arg0, arg1, arg2, arg3); } return temp_v0; } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_80075F98(Vec3f arg0, s32 arg1, f32 arg2) { - s32 var_s0; +void func_80075F98(Vec3f arg0, u16 arg1, f32 arg2) { + s32 someIndex; - var_s0 = 0; -loop_1: - var_s0 += 1; - if (func_80075F28(arg0, arg1 & 0xFFFF & 0xFFFF, arg2, var_s0) != -1) { - if (var_s0 != 0x0000000A) { - goto loop_1; - } + for (someIndex = 0; someIndex < 10; someIndex++) { + if (func_80075F28(arg0, arg1, arg2, someIndex) == -1) break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80075F98.s") -#endif void func_8007601C(s32 arg0) { if (D_80165C18[arg0].unk_04C > 0) { - --D_80165C18[arg0].unk_04C; + D_80165C18[arg0].unk_04C--; if (D_80165C18[arg0].unk_04C == 0) { func_800722CC(arg0, 1); } } if (D_80165C18[arg0].unk_048 > 0) { - --D_80165C18[arg0].unk_048; + D_80165C18[arg0].unk_048--; if (D_80165C18[arg0].unk_048 == 0) { func_800C9EF4(D_80165C18[arg0].unk_004, 0x5102800A); } @@ -2027,7 +1880,7 @@ void func_8007601C(s32 arg0) { func_80075F98(D_80165C18[arg0].unk_004, (u16) D_80165C18[arg0].unk_0BE[1], 1.0f); func_800C9D80(D_80165C18[arg0].unk_004, &D_80165C18[arg0].unk_038, 0x5102800A); if (D_80165C18[arg0].unk_0A4 > 0) { - --D_80165C18[arg0].unk_0A4; + D_80165C18[arg0].unk_0A4--; D_80165C18[arg0].unk_04C = 0x5A; } else { D_80165C18[arg0].unk_04C = 0x12C; @@ -2042,22 +1895,13 @@ void func_8007601C(s32 arg0) { } } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern ? D_8018BFB8; - void func_8007614C(void) { - s32 *var_s0; + s32 someIndex; - var_s0 = D_8018BFA8; - do { - func_8007601C(*var_s0); - var_s0 += 4; - } while (var_s0 != &D_8018BFB8); + for (someIndex = 0; someIndex < 4; someIndex++) { + func_8007601C(D_8018BFA8[someIndex]); + } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007614C.s") -#endif void func_80076194(s32 objectIndex, Vec3f arg1, f32 arg2, s32 arg3) { struct_80165C18_entry *temp_v0; @@ -2081,93 +1925,55 @@ void func_80076194(s32 objectIndex, Vec3f arg1, f32 arg2, s32 arg3) { temp_v0->unk_034 = arg2 * 8.0; } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 D_80183E38; -extern s32 D_8018C1B0; - -s32 func_80076278(f32 *arg0, f32 arg1, s32 arg2) { - s32 sp1C; +s32 func_80076278(Vec3f arg0, f32 arg1, s32 arg2) { s32 temp_v0; - s32 var_a0; - temp_v0 = func_80072044(&D_8018C1B0, &D_80183E38, 0x00000080); - var_a0 = temp_v0; + temp_v0 = func_80072044(D_8018C1B0, &D_80183E38, D_8018C1B0_SIZE); if (temp_v0 != -1) { - sp1C = temp_v0; - func_80076194(var_a0, arg0, arg1, arg2); - var_a0 = sp1C; + func_80076194(temp_v0, arg0, arg1, arg2); } - return var_a0; + return temp_v0; } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80076278.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -s32 func_80076278(s32, ?, s32); // extern +void func_800762DC(Vec3f arg0, f32 arg1) { + s32 someIndex; -void func_800762DC(s32 arg0, ? arg1) { - s32 temp_s0; - s32 phi_s0; - - phi_s0 = 0; -loop_1: - temp_s0 = phi_s0 + 1; - phi_s0 = temp_s0; - if (func_80076278(arg0, arg1, phi_s0) != -1) { - if (temp_s0 != 0x14) { - goto loop_1; - } + for (someIndex = 0; someIndex < 0x14; someIndex++) { + if (func_80076278(arg0, arg1, someIndex) == -1) break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800762DC.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 D_0D02BC58; void func_8007634C(s32 objectIndex) { struct_80165C18_entry *temp_v0; temp_v0 = &D_80165C18[objectIndex]; - temp_v0->unk_064 = &D_0D02BC58; - temp_v0->unk_06C = (s32) &D_0D02BC58; + temp_v0->unk_064 = D_0D02BC58; + temp_v0->unk_06C = D_0D02BC58; temp_v0->unk_0A0 = 0x00FF; func_8008B8BC(objectIndex, 0U, 0U, 0U); func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f); func_80072488(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007634C.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_8007634C(s32); /* extern */ +#ifdef NEEDS_RODATA +// data/data_0DD0A0_3_0.s +// jpt_800EEAEC void func_800763CC(s32 objectIndex) { struct_80165C18_entry *temp_s0; - u16 temp_t8; + if(objectIndex){} temp_s0 = &D_80165C18[objectIndex]; - temp_t8 = (u16) temp_s0->unk_0A6; - switch (temp_t8) { + switch (temp_s0->unk_0A6) { case 1: func_8007634C(objectIndex); - return; + break; case 2: if (func_8007278C(objectIndex, temp_s0->unk_048) != 0) { func_80086E70(objectIndex); - return; } - default: - return; + break; case 3: - if ((u8) temp_s0->unk_0D5 == 4) { + if (temp_s0->unk_0D5 == 4) { f32_step_towards(&temp_s0->unk_000, 4.0f, 0.1f); s16_step_towards(&temp_s0->unk_0A4, 0, 0x0018); s16_step_towards(&temp_s0->unk_0A2, 0x0080, 0x000C); @@ -2178,13 +1984,15 @@ void func_800763CC(s32 objectIndex) { } if ((temp_s0->unk_0AE >= 2) && (func_80073B00(objectIndex, &temp_s0->unk_0A0, 0x000000FF, 0x00000050, 0x00000020, 0, 0) != 0)) { func_80072488(objectIndex); - return; } break; case 4: func_80072428(objectIndex); func_80086F60(objectIndex); break; + case 0: + default: + break; } } #else @@ -2214,63 +2022,41 @@ void func_80076538(s32 objectIndex) { } } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_800762DC(f32 *, ?); /* extern */ -void func_800C9EF4(f32 *, ?); /* extern */ - void func_8007661C(void) { - f32 *sp24; - s16 temp_v0_3; - s32 temp_s1; - s32 temp_t0; - s32 temp_t8; - s32 temp_v0; - s32 temp_v0_2; - struct_80165C18_entry *temp_s0; + s32 objectIndex; - temp_s1 = *D_80183F28; - temp_s0 = &D_80165C18[temp_s1]; - temp_v0 = temp_s0->unk_04C; - temp_t8 = temp_v0 - 1; - if (temp_v0 > 0) { - temp_s0->unk_04C = temp_t8; - if (temp_t8 == 0) { - func_800722CC(temp_s1, 1); + objectIndex = D_80183F28[0]; + if (D_80165C18[objectIndex].unk_04C > 0) { + D_80165C18[objectIndex].unk_04C--; + if (D_80165C18[objectIndex].unk_04C == 0) { + func_800722CC(objectIndex, 1); } } - temp_v0_2 = temp_s0->unk_048; - temp_t0 = temp_v0_2 - 1; - if (temp_v0_2 > 0) { - temp_s0->unk_048 = temp_t0; - if (temp_t0 == 0) { - func_800C9EF4(temp_s0->unk_004, 0x51038009); + if (D_80165C18[objectIndex].unk_048 > 0) { + D_80165C18[objectIndex].unk_048--; + if (D_80165C18[objectIndex].unk_048 == 0) { + func_800C9EF4(D_80165C18[objectIndex].unk_004, 0x51038009U); } } - if (temp_s0->unk_04C == 0) { - func_8008A6DC(temp_s1, 750.0f); - if ((func_8007223C(temp_s1, 0x00040000) != 0) && (func_80072354(temp_s1, 1) != 0)) { - sp24 = temp_s0->unk_004; - func_800722A4(temp_s1, 1); - func_800762DC(sp24, 0x3F800000); - func_800C9D80((f32 (*)[3]) sp24, (f32 (*)[3]) temp_s0->unk_038, 0x51038009U); - temp_v0_3 = temp_s0->unk_0A4; - if (temp_v0_3 > 0) { - temp_s0->unk_0A4 = temp_v0_3 - 1; - temp_s0->unk_04C = 0x0000005A; + if (D_80165C18[objectIndex].unk_04C == 0) { + func_8008A6DC(objectIndex, 750.0f); + if ((func_8007223C(objectIndex, 0x00040000) != 0) && (func_80072354(objectIndex, 1) != 0)) { + func_800722A4(objectIndex, 1); + func_800762DC(D_80165C18[objectIndex].unk_004, 1.0f); + func_800C9D80(D_80165C18[objectIndex].unk_004, D_80165C18[objectIndex].unk_038, 0x51038009U); + if (D_80165C18[objectIndex].unk_0A4 > 0) { + D_80165C18[objectIndex].unk_0A4--; + D_80165C18[objectIndex].unk_04C = 0x0000005A; } else { - temp_s0->unk_04C = 0x0000012C; + D_80165C18[objectIndex].unk_04C = 0x0000012C; } - temp_s0->unk_048 = 0x0000003C; + D_80165C18[objectIndex].unk_048 = 0x0000003C; } } if (func_8008A8B0(4, 5) == 0) { - temp_s0->unk_0A4 = 2; + D_80165C18[objectIndex].unk_0A4 = 2; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007661C.s") -#endif void func_8007675C(s32 objectIndex, Vec3s arg1, s32 arg2) { struct_80165C18_entry *temp_v0; @@ -2292,48 +2078,40 @@ void func_8007675C(s32 objectIndex, Vec3s arg1, s32 arg2) { temp_v0->unk_048 = arg2; } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 D_80183E38; -extern s32 D_8018C1B0; - -s32 func_80076828(s16 *arg0, s32 arg1) { - s32 sp1C; +s32 func_80076828(Vec3s arg0, s32 arg1) { s32 temp_v0; - s32 var_a0; - temp_v0 = func_80072044(&D_8018C1B0, &D_80183E38, 0x00000080); - var_a0 = temp_v0; + temp_v0 = func_80072044(D_8018C1B0, &D_80183E38, D_8018C1B0_SIZE); if (temp_v0 != -1) { - sp1C = temp_v0; - func_8007675C(var_a0, arg0, arg1); - var_a0 = sp1C; + func_8007675C(temp_v0, arg0, arg1); } - return var_a0; + return temp_v0; } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80076828.s") -#endif #ifdef MIPS_TO_C -UNUSED void func_80076884(s32 arg0) { - s32 temp_v0; - s32 var_s0; - void *var_s2; +//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-25-2022 +s16 D_800E5740[0][3]; /* unable to generate initializer */ +s16 D_800E579C[0][3]; /* unable to generate initializer */ +s16 D_800E57F8[0][3]; /* unable to generate initializer */ - temp_v0 = random_int(0xF); +void func_80076884(s32 arg0) { + s16 *var_s2; + s32 var_s0; + u16 temp_v0; + + temp_v0 = random_int(0x000FU); switch (arg0) { /* irregular */ default: var_s2 = sp28; break; case 0: - var_s2 = (temp_v0 * 6) + &D_800E5740; + var_s2 = D_800E5740[temp_v0]; break; case 1: - var_s2 = (temp_v0 * 6) + &D_800E579C; + var_s2 = D_800E579C[temp_v0]; break; case 2: - var_s2 = (temp_v0 * 6) + &D_800E57F8; + var_s2 = D_800E57F8[temp_v0]; break; } var_s0 = 0; @@ -2349,153 +2127,118 @@ loop_8: GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80076884.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 D_0D02BC58; - void func_80076958(s32 objectIndex) { struct_80165C18_entry *temp_v0; temp_v0 = &D_80165C18[objectIndex]; - temp_v0->unk_064 = &D_0D02BC58; - temp_v0->unk_06C = (s32) &D_0D02BC58; + temp_v0->unk_064 = D_0D02BC58; + temp_v0->unk_06C = D_0D02BC58; temp_v0->unk_0A0 = 0x00FF; func_8008B8BC(objectIndex, 0U, 0U, 0U); func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f); func_80072488(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80076958.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_80076958(s32); /* extern */ +#ifdef NEEDS_RODATA +// data/data_0DD0A0_3_0.s +// jpt_800EEB00 void func_800769D8(s32 objectIndex) { struct_80165C18_entry *temp_s0; - u16 temp_t8; temp_s0 = &D_80165C18[objectIndex]; - temp_t8 = (u16) temp_s0->unk_0A6; - switch (temp_t8) { + switch (temp_s0->unk_0A6) { case 1: func_80076958(objectIndex); - return; + break; case 2: if (func_8007278C(objectIndex, temp_s0->unk_048) != 0) { func_80086E70(objectIndex); - return; } - default: - return; + break; case 3: f32_step_towards(&temp_s0->unk_000, 2.0f, 0.05f); s16_step_towards(&temp_s0->unk_0A4, 0, 0x0018); if ((temp_s0->unk_0AE >= 2) && (func_80073B00(objectIndex, &temp_s0->unk_0A0, 0x000000FF, 0x00000050, 0x00000020, 0, 0) != 0)) { func_80072488(objectIndex); - return; } break; case 4: func_80072428(objectIndex); func_80086F60(objectIndex); break; + case 0: + default: + break; } } #else GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800769D8.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc void func_80076AEC(s32 objectIndex) { - struct_80165C18_entry *sp20; - s16 var_v1; - struct_80165C18_entry *temp_a2; - - temp_a2 = &D_80165C18[objectIndex]; - var_v1 = temp_a2->unk_0AE; - if ((var_v1 != 0) && (var_v1 == 1)) { - sp20 = temp_a2; - if (func_80087060(objectIndex, 0x0000000A) != 0) { - sp20 = temp_a2; - func_80086FD4(objectIndex); + s32 thing; + thing = D_80165C18[objectIndex].unk_0AE; + if(thing) {} + if (thing != 0) { + if (thing == 1) { + if (func_80087060(objectIndex, 0x0000000A) != 0) { + func_80086FD4(objectIndex); + } + } else { + thing = D_80165C18[objectIndex].unk_0AE; } - var_v1 = temp_a2->unk_0AE; } - if (var_v1 > 0) { + if (D_80165C18[objectIndex].unk_0AE > 0) { func_800877C4(objectIndex); func_8008BF18(objectIndex); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80076AEC.s") -#endif void func_80076B7C(void) { } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_8007614C(); /* extern */ -void func_800763CC(s32); /* extern */ -void func_8007661C(); /* extern */ -void func_800769D8(s32); /* extern */ -void func_80076AEC(s32); /* extern */ -extern s32 D_8018C1B0; - void func_80076B84(void) { - s32 *var_s2; - s32 temp_s0; - struct_80165C18_entry *temp_s1; - u8 temp_v0; + s32 someIndex; + s32 objectIndex; + struct_80165C18_entry *object; func_8007661C(); func_8007614C(); - var_s2 = &D_8018C1B0; - do { - temp_s0 = *var_s2; - if (temp_s0 != -1) { - temp_s1 = &D_80165C18[temp_s0]; - if (temp_s1->unk_0A6 != 0) { - temp_v0 = (u8) temp_s1->unk_0D5; - if ((temp_v0 == 4) || (temp_v0 == 5)) { - func_800763CC(temp_s0); - func_80076538(temp_s0); - } else if (temp_v0 == 9) { - func_800769D8(temp_s0); - func_80076AEC(temp_s0); + for (someIndex = 0; someIndex < D_8018C1B0_SIZE; someIndex++) { + objectIndex = D_8018C1B0[someIndex]; + if (objectIndex != -1) { + object = &D_80165C18[objectIndex]; + if (object->unk_0A6 != 0) { + if ((object->unk_0D5 == 4) || (object->unk_0D5 == 5)) { + func_800763CC(objectIndex); + func_80076538(objectIndex); + } else if (object->unk_0D5 == 9) { + func_800769D8(objectIndex); + func_80076AEC(objectIndex); } - if (temp_s1->unk_0A6 == 0) { - func_80072100((s32) var_s2); + if (object->unk_0A6 == 0) { + func_80072100(&D_8018C1B0[someIndex]); } } } - var_s2 += 4; - } while (var_s2 != &D_8018C3B0); + } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80076B84.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 D_0D02BC58; +#ifdef NEEDS_RODATA +// data/data_0DD0A0_3_0.s +extern f32 D_800EEB14; // = 0.3f; void func_80076C9C(s32 objectIndex, Vec3f arg1, s16 arg2) { - struct_80165C18_entry *sp20; struct_80165C18_entry *temp_v0; func_800723A4(objectIndex, (s32) arg2); temp_v0 = &D_80165C18[objectIndex]; temp_v0->unk_0D5 = 0x0A; - temp_v0->unk_064 = &D_0D02BC58; - temp_v0->unk_06C = (s32) &D_0D02BC58; + temp_v0->unk_064 = D_0D02BC58; + temp_v0->unk_06C = D_0D02BC58; temp_v0->unk_000 = 0.3f; - sp20 = temp_v0; - func_8008B7D4(objectIndex, arg1->unk0, arg1->unk4, arg1->unk8); + func_8008B7D4(objectIndex, arg1[0], arg1[1], arg1[2]); temp_v0->unk_0A4 = 0x00FF; temp_v0->unk_034 = 0.0f; func_8008B8BC(objectIndex, 0U, 0U, 0U); @@ -2505,24 +2248,14 @@ void func_80076C9C(s32 objectIndex, Vec3f arg1, s16 arg2) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80076C9C.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -s32 func_80072044(? *, ? *, ?); // extern -void func_80076C9C(s32, s32, s16); // extern -extern s32 D_80183E6C; -extern s32 D_8018C870; - -void func_80076D70(s32 arg0, ? arg1, s16 arg2) { +void func_80076D70(Vec3f arg0, s32 arg1, s16 arg2) { s32 temp_v0; - temp_v0 = func_80072044(&D_8018C870, &D_80183E6C, 0x40); + temp_v0 = func_80072044(D_8018C870, &D_80183E6C, 0x00000040); if (temp_v0 != -1) { func_80076C9C(temp_v0, arg0, arg2); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80076D70.s") -#endif void func_80076DC4(s32 objectIndex) { func_80072488(objectIndex); @@ -2557,91 +2290,63 @@ void func_80076ED8(s32 objectIndex) { func_8008BF18(objectIndex); } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 D_8018C870; -extern s32 D_8018C970; - void func_80076F2C(void) { - s32 *var_s1; - s32 temp_s0; - struct_80165C18_entry *temp_s2; + s32 someIndex; + s32 flameIndex; + struct_80165C18_entry *object; - var_s1 = &D_8018C870; - do { - temp_s0 = *var_s1; - if (temp_s0 != -1) { - temp_s2 = &D_80165C18[temp_s0]; - if (temp_s2->unk_0A6 != 0) { - func_80076E14(temp_s0); - func_80076ED8(temp_s0); - if (temp_s2->unk_0A6 == 0) { - func_80072100((s32) var_s1); + for (someIndex = 0; someIndex < D_8018C870_SIZE; someIndex++) { + flameIndex = D_8018C870[someIndex]; + if (flameIndex != -1) { + object = &D_80165C18[flameIndex]; + if (object->unk_0A6 != 0) { + func_80076E14(flameIndex); + func_80076ED8(flameIndex); + if (object->unk_0A6 == 0) { + func_80072100(&D_8018C870[someIndex]); } } } - var_s1 += 4; - } while (var_s1 != &D_8018C970); + } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80076F2C.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -struct _struct_D_800E6788_0x6 { - /* 0x0 */ s16 unk0; /* inferred */ - /* 0x2 */ s16 unk2; /* inferred */ - /* 0x4 */ s16 unk4; /* inferred */ -}; /* size = 0x6 */ +#ifdef NON_MATCHING +// Non matching due to some register differences surrounding the accessing of D_800E6788 +extern Vec3s D_800E6788[8]; /* unable to generate initializer */ -extern s32 D_0D02BC58; -extern f32 D_8018D01C; -static struct _struct_D_800E6788_0x6 D_800E6788[0]; /* unable to generate initializer */ - -void func_80076FEC(s32 objectIndex, s32 arg1) { - struct _struct_D_800E6788_0x6 *temp_v1; +void func_80076FEC(s32 objectIndex, s32 flameIndex) { struct_80165C18_entry *temp_v0; func_800723A4(objectIndex, 3); - temp_v1 = &D_800E6788[arg1]; temp_v0 = &D_80165C18[objectIndex]; temp_v0->unk_0D5 = 0x0B; - temp_v0->unk_064 = &D_0D02BC58; - temp_v0->unk_06C = (s32) &D_0D02BC58; + temp_v0->unk_064 = D_0D02BC58; + temp_v0->unk_06C = D_0D02BC58; temp_v0->unk_000 = 0.8f; + temp_v0->unk_010[0] = D_800E6788[flameIndex][0] * D_8018D01C; + temp_v0->unk_010[1] = D_800E6788[flameIndex][1]; + temp_v0->unk_010[2] = D_800E6788[flameIndex][2]; + temp_v0->unk_034 = 0.0f; temp_v0->unk_0A4 = 0x00FF; temp_v0->unk_0A2 = 0x00FF; temp_v0->unk_0A0 = 0x00FF; - temp_v0->unk_010[0] = (f32) temp_v1->unk0 * D_8018D01C; - temp_v0->unk_010[1] = (f32) temp_v1->unk2; - temp_v0->unk_034 = 0.0f; - temp_v0->unk_010[2] = (f32) temp_v1->unk4; func_8008B8BC(objectIndex, 0U, 0U, 0U); + // The permuter found this slightly better match, but still no full match + //func_8008B8BC(objectIndex ^ 0, 0U, 0U, 0U); func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f); } #else GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80076FEC.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -s32 func_80072044(? *, ? *, ?); // extern -void func_80076FEC(s32, s32); // extern -extern s32 D_80183E6C; -extern s32 D_8018C870; - void func_800770F0(s32 arg0) { s32 temp_v0; - temp_v0 = func_80072044(&D_8018C870, &D_80183E6C, 0x40); + temp_v0 = func_80072044(D_8018C870, &D_80183E6C, 0x00000040); if (temp_v0 != -1) { func_80076FEC(temp_v0, arg0); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800770F0.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc @@ -2723,7 +2428,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80077138.s") #endif void func_800773D8(s32 arg0, s32 arg1) { - s32 temp_v0 = func_80072044(&D_8018C630, &D_80183E5C, 0x80); + s32 temp_v0 = func_80072044(D_8018C630, &D_80183E5C, 0x80); if (temp_v0 != -1) { func_80077138(temp_v0, arg0, arg1); } @@ -2785,35 +2490,25 @@ void func_80077584(s32 objectIndex) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80077584.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern s32 D_8018C630; -extern ? D_8018C830; - void func_80077640(void) { - s32 *var_s1; - s32 temp_s0; - struct_80165C18_entry *temp_s2; + s32 someIndex; + s32 objectIndex; + struct_80165C18_entry *object; - var_s1 = &D_8018C630; - do { - temp_s0 = *var_s1; - if (temp_s0 != -1) { - temp_s2 = &D_80165C18[temp_s0]; - if (temp_s2->unk_0A6 != 0) { - func_80077450(temp_s0); - func_80077584(temp_s0); - if (temp_s2->unk_0A6 == 0) { - func_80072100(var_s1); + for(someIndex = 0; someIndex < D_8018C630_SIZE; someIndex++) { + objectIndex = D_8018C630[someIndex]; + if (objectIndex != -1) { + object = &D_80165C18[objectIndex]; + if (object->unk_0A6 != 0) { + func_80077450(objectIndex); + func_80077584(objectIndex); + if (object->unk_0A6 == 0) { + func_80072100(&D_8018C630[someIndex]); } } } - var_s1 += 4; - } while (var_s1 != &D_8018C830); + } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80077640.s") -#endif #ifdef NEEDS_RODATA // data_0DD0A0_3_0.s @@ -2864,50 +2559,23 @@ void func_80077700(s32 objectIndex, Vec3f arg1, s32 arg2) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80077700.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -extern s32 D_80183E7C; -extern s32 D_8018C970; - s32 func_80077A54(Vec3f arg0, s32 arg1) { - s32 sp1C; s32 temp_v0; - s32 var_a0; - temp_v0 = func_80072044(&D_8018C970, &D_80183E7C, 0x00000040); - var_a0 = temp_v0; + temp_v0 = func_80072044(D_8018C970, &D_80183E7C, D_8018C970_SIZE); if (temp_v0 != -1) { - sp1C = temp_v0; - func_80077700(var_a0, arg0, arg1); - var_a0 = sp1C; + func_80077700(temp_v0, arg0, arg1); } - return var_a0; + return temp_v0; } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80077A54.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -s32 func_80077A54(s32, s32); // extern +void func_80077AB0(Vec3f arg0, s32 arg1) { + s32 var_s0; -void func_80077AB0(s32 arg0, ? arg1) { - s32 temp_s0; - s32 phi_s0; - - phi_s0 = 0; -loop_1: - temp_s0 = phi_s0 + 1; - phi_s0 = temp_s0; - if (func_80077A54(arg0, phi_s0) != -1) { - if (temp_s0 != 0x14) { - goto loop_1; - } + for (var_s0 = 0; var_s0 < D_8018C970_SPAWN_SIZE; var_s0++) { + if (func_80077A54(arg0, var_s0) == -1) break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80077AB0.s") -#endif void func_80077B14(s32 arg0) { func_80072488(arg0); @@ -2951,34 +2619,25 @@ void func_80077BCC(s32 objectIndex) { D_80165C18[objectIndex].unk_0B2[1] += 0x1000; } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 D_8018C970; - void func_80077C9C(void) { - s32 *var_s1; - s32 temp_s0; - struct_80165C18_entry *temp_s2; + s32 someIndex; + s32 leafIndex; + struct_80165C18_entry *object; - var_s1 = &D_8018C970; - do { - temp_s0 = *var_s1; - if (temp_s0 != -1) { - temp_s2 = &D_80165C18[temp_s0]; - if (temp_s2->unk_0A6 != 0) { - func_80077B3C(temp_s0); - func_80077BCC(temp_s0); - if (temp_s2->unk_0A6 == 0) { - func_80072100((s32) var_s1); + for(someIndex = 0; someIndex < D_8018C970_SIZE; someIndex++) { + leafIndex = D_8018C970[someIndex]; + if (leafIndex != -1) { + object = &D_80165C18[leafIndex]; + if (object->unk_0A6 != 0) { + func_80077B3C(leafIndex); + func_80077BCC(leafIndex); + if (object->unk_0A6 == 0) { + func_80072100(&D_8018C970[someIndex]); } } } - var_s1 += 4; - } while (var_s1 != D_8018CA70); + } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80077C9C.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc @@ -3201,192 +2860,111 @@ void func_80078220(s32 objectIndex) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80078220.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -extern s32 gGamestate; +#ifdef NEEDS_RODATA +// data/data_0DD0A0_3_0.s +extern f64 D_800EEB50; // = 0.03; +extern f64 D_800EEB58; // = 0.01; +extern f64 D_800EEB60; // = -0.3; +extern f64 D_800EEB68; // = 45.0; +extern f64 D_800EEB70; // = 0.03; +extern f64 D_800EEB78; // = 0.01; +extern f64 D_800EEB80; // = -0.6; void func_80078288(s32 objectIndex) { s16 sp3E; s16 sp3C; s16 sp3A; - u16 sp36; - f32 sp24; - Camera *temp_v0_5; - Player *temp_v0_2; - f32 temp_f2; - f32 temp_f2_2; - f32 var_f8; - f32 var_f8_2; - f64 var_f18; - f64 var_f18_2; - s16 temp_v0; - s32 temp_v0_3; - s32 temp_v0_4; - s32 temp_v0_6; - s32 temp_v0_7; - struct_80165C18_entry *temp_s0; - u16 temp_t1; u16 temp_t3; u16 temp_t6; - temp_s0 = &D_80165C18[objectIndex]; - temp_v0 = temp_s0->unk_0AE; - switch (temp_v0) { /* irregular */ + switch (D_80165C18[objectIndex].unk_0AE) { /* irregular */ + case 0: + break; case 1: if (gGamestate != 9) { - sp3A = (s16) (s32) (((gPlayerOneCopy->unk_094 / 18.0f) * 216.0f) / 2.0f); + sp3A = ((gPlayerOneCopy->unk_094 / 18) * 216) / 2; sp3E = (random_int(0x000FU) - sp3A) + 0x2D; sp3C = random_int(0x012CU) + 0x1E; - temp_t6 = (((s32) (random_int(0x3000U) - 0x1800) / (s16) ((sp3A / 15) + 1)) + camera1->rot[1]) & 0xFFFF; - sp36 = temp_t6; - temp_v0_2 = gPlayerOneCopy; - temp_f2 = (f32) sp3C; - temp_s0->unk_010[0] = (sins(temp_t6) * temp_f2) + temp_v0_2->pos[0]; - sp24 = temp_f2; - temp_s0->unk_010[1] = (f32) sp3E + temp_v0_2->unk_074; - temp_s0->unk_010[2] = (coss(sp36) * temp_f2) + gPlayerOneCopy->pos[2]; - temp_s0->unk_0C4 = random_int(0x0400U) + 0x100; - temp_v0_3 = random_int(0x0064U); - var_f8 = (f32) temp_v0_3; - if (temp_v0_3 < 0) { - var_f8 += 4294967296.0f; - } - temp_s0->unk_01C[0] = (f32) (((f64) var_f8 * 0.03) + 2.0); - temp_v0_4 = random_int(0x0032U); - var_f18 = (f64) temp_v0_4; - if (temp_v0_4 < 0) { - var_f18 += 4294967296.0; - } - temp_s0->unk_028[0] = 0.0f; - temp_s0->unk_028[1] = 0.0f; - temp_s0->unk_038[1] = (f32) (-0.3 - (f64) (f32) (var_f18 * 0.01)); + temp_t6 = camera1->rot[1] + ((s32) (random_int(0x3000U) - 0x1800) / (s16) ((sp3A / 15) + 1)); + D_80165C18[objectIndex].unk_010[0] = gPlayerOneCopy->pos[0] + (sins(temp_t6) * sp3C); + D_80165C18[objectIndex].unk_010[1] = sp3E + gPlayerOneCopy->unk_074; + D_80165C18[objectIndex].unk_010[2] = gPlayerOneCopy->pos[2] + (coss(temp_t6) * sp3C); + D_80165C18[objectIndex].unk_0C4 = random_int(0x0400U) + 0x100; + D_80165C18[objectIndex].unk_01C[0] = (f32) (((f32) random_int(0x0064U) * 0.03) + 2.0); + D_80165C18[objectIndex].unk_038[1] = (f32) (-0.3 - (f64) (f32) (random_int(0x0032U) * 0.01)); + D_80165C18[objectIndex].unk_028[0] = 0.0f; + D_80165C18[objectIndex].unk_028[1] = 0.0f; + func_80086FD4(objectIndex); + } else { + sp3C = random_int(0x0064U) + 0x28; + temp_t6 = camera1->rot[1] + random_int(0x3000U) - 0x1800; + D_80165C18[objectIndex].unk_010[0] = camera1->pos[0] + (sins(temp_t6) * sp3C); + D_80165C18[objectIndex].unk_010[1] = camera1->pos[1] + 45.0; + D_80165C18[objectIndex].unk_010[2] = camera1->pos[2] + (coss(temp_t6) * sp3C); + D_80165C18[objectIndex].unk_0C4 = random_int(0x0400U) + 0x100; + D_80165C18[objectIndex].unk_01C[0] = (f32) (((f32) random_int(0x0064U) * 0.03) + 2.0); + D_80165C18[objectIndex].unk_038[1] = (f32) (-0.6 - (f64) (f32) (random_int(0x0032U) * 0.01)); + D_80165C18[objectIndex].unk_028[0] = 0.0f; + D_80165C18[objectIndex].unk_028[1] = 0.0f; func_80086FD4(objectIndex); - return; } - sp3C = random_int(0x0064U) + 0x28; - temp_t3 = ((random_int(0x3000U) + camera1->rot[1]) - 0x1800) & 0xFFFF; - sp36 = temp_t3; - temp_v0_5 = camera1; - temp_f2_2 = (f32) sp3C; - temp_s0->unk_010[0] = (sins(temp_t3) * temp_f2_2) + temp_v0_5->pos[0]; - sp24 = temp_f2_2; - temp_s0->unk_010[1] = (f32) ((f64) temp_v0_5->pos[1] + 45.0); - temp_s0->unk_010[2] = (coss(sp36) * temp_f2_2) + camera1->pos[2]; - temp_s0->unk_0C4 = random_int(0x0400U) + 0x100; - temp_v0_6 = random_int(0x0064U); - var_f8_2 = (f32) temp_v0_6; - if (temp_v0_6 < 0) { - var_f8_2 += 4294967296.0f; - } - temp_s0->unk_01C[0] = (f32) (((f64) var_f8_2 * 0.03) + 2.0); - temp_v0_7 = random_int(0x0032U); - var_f18_2 = (f64) temp_v0_7; - if (temp_v0_7 < 0) { - var_f18_2 += 4294967296.0; - } - temp_s0->unk_028[0] = 0.0f; - temp_s0->unk_028[1] = 0.0f; - temp_s0->unk_038[1] = (f32) (-0.6 - (f64) (f32) (var_f18_2 * 0.01)); - func_80086FD4(objectIndex); - return; + break; case 2: func_800877C4(objectIndex); - temp_t1 = temp_s0->unk_0BE[0] + temp_s0->unk_0C4; - temp_s0->unk_0BE[0] = temp_t1; - temp_s0->unk_028[0] = temp_s0->unk_01C[0] * sins(temp_t1 & 0xFFFF); + D_80165C18[objectIndex].unk_0BE[0] += D_80165C18[objectIndex].unk_0C4; + D_80165C18[objectIndex].unk_028[0] = sins(D_80165C18[objectIndex].unk_0BE[0]) * D_80165C18[objectIndex].unk_01C[0]; func_8008BF18(objectIndex); - if ((f64) temp_s0->unk_004[1] <= 0.0) { + if ((f64) D_80165C18[objectIndex].unk_004[1] <= 0.0) { func_80086FD4(objectIndex); } - temp_s0->unk_0B2[1] = func_800872D8(objectIndex, camera1); - return; + D_80165C18[objectIndex].unk_0B2[1] = func_800872D8(objectIndex, camera1); + break; case 3: func_80086F60(objectIndex); - /* fallthrough */ - case 0: - return; + break; } } #else GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80078288.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_80078220(); /* extern */ -void func_80078288(); /* extern */ - void func_800786EC(s32 objectIndex) { - struct_80165C18_entry *sp18; - s16 temp_v0; - struct_80165C18_entry *temp_v1; - - temp_v1 = &D_80165C18[objectIndex]; - temp_v0 = temp_v1->unk_0A6; - switch (temp_v0) { /* irregular */ - case 1: - func_80078220(); - return; - case 2: - sp18 = temp_v1; - func_80078288(); - if (temp_v1->unk_0AE == 0) { - func_80072488(objectIndex); - return; - } + switch (D_80165C18[objectIndex].unk_0A6) { /* irregular */ case 0: - return; + break; + case 1: + func_80078220(objectIndex); + break; + case 2: + func_80078288(objectIndex); + if (D_80165C18[objectIndex].unk_0AE == 0) { + func_80072488(objectIndex); + } + break; case 3: func_80072428(objectIndex); break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800786EC.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 D_8018C1B0; -extern s16 D_8018D174; void func_80078790(void) { - s32 temp_a2; - s32 var_v1; + s32 someIndex; - var_v1 = 0; -loop_1: - D_8018D174 += 1; - var_v1 += 1; - if (D_8018D174 >= 0x32) { - D_8018D174 = 0; + for (someIndex = 0; someIndex < NUM_SNOWFLAKES; someIndex++) { + D_8018D174 += 1; + if (D_8018D174 >= NUM_SNOWFLAKES) { + D_8018D174 = 0; + } + if (D_80165C18[D_8018C1B0[D_8018D174]].unk_0A6 == 0) { + func_800723A4(D_8018C1B0[D_8018D174], 1); + break; + } } - temp_a2 = *(&D_8018C1B0 + (D_8018D174 * 4)); - if (D_80165C18[temp_a2].unk_0A6 == 0) { - func_800723A4(temp_a2, 1); - return; - } - if (var_v1 == 0x32) { - return; - } - goto loop_1; } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80078790.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_800786EC(s32); // extern -void func_80078790(); // extern -extern struct_80165C18_entry D_80165C18; -extern s32 D_8018C1B0; -extern ? D_8018C278; void func_80078838(void) { - s32 *temp_s0; - s32 temp_a0; - s32 *phi_s0; + s32 someIndex; + s32 snowflakeIndex; if (gGamestate != CREDITS_SEQUENCE) { func_80078790(); @@ -3396,19 +2974,13 @@ void func_80078838(void) { func_80078790(); func_80078790(); } - phi_s0 = &D_8018C1B0; - do { - temp_a0 = *phi_s0; - if ((&D_80165C18 + (temp_a0 * 0xE0))->unkA6 != 0) { - func_800786EC(temp_a0); + for (someIndex = 0; someIndex < NUM_SNOWFLAKES; someIndex++) { + snowflakeIndex = D_8018C1B0[someIndex]; + if (D_80165C18[snowflakeIndex].unk_0A6 != 0) { + func_800786EC(snowflakeIndex); } - temp_s0 = phi_s0 + 4; - phi_s0 = temp_s0; - } while (temp_s0 != &D_8018C278); + } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80078838.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc @@ -4539,21 +4111,20 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007A948.s") #endif #ifdef MIPS_TO_C -//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -void func_80079114(s32, s32, ?); /* extern */ -void func_8007A66C(s32, s32, s32); /* extern */ -void func_8007A778(s32, s32, s32); /* extern */ -void func_8007A910(); /* extern */ +//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-27-2022 +? func_80079114(s32, s32, ?); /* extern */ extern ? D_80165CF0; -extern s32 D_80183DB8; extern ? D_80183FA8; +extern void *D_8018C028; +extern Camera *D_8018CF14; +extern Player *D_8018CF1C; void func_8007AA44(s32 arg0) { s32 temp_s0; u8 temp_t1; - func_8007A910(); - temp_s0 = *(&D_80183DB8 + (arg0 * 4)); + func_8007A910(arg0); + temp_s0 = D_80183DB8[arg0]; temp_t1 = *(&D_80165CF0 + (temp_s0 * 0xE0)); D_8018C028 = (arg0 << 0xD) + &D_80183FA8; switch (temp_t1) { @@ -5469,8 +5040,8 @@ void func_8007C340(void) { } #ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_8007C360(s32 objectIndex, void *arg1) { +//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-27-2022 +void func_8007C360(s32 objectIndex, Camera *camera) { struct_80165C18_entry *sp20; s32 sp1C; s32 temp_t0; @@ -5479,7 +5050,7 @@ void func_8007C360(s32 objectIndex, void *arg1) { struct_80165C18_entry *temp_a2; temp_a2 = &D_80165C18[objectIndex]; - temp_t0 = (((temp_a2->unk_0BE[1] - arg1->unk26) + 0x8000) & 0xFFFF) * 0x24; + temp_t0 = (((temp_a2->unk_0BE[1] - (u16) camera->rot[1]) + 0x8000) & 0xFFFF) * 0x24; var_t1 = temp_t0 >> 0x10; if (temp_t0 < 0) { var_t1 = (s32) (temp_t0 + 0xFFFF) >> 0x10; @@ -5501,23 +5072,15 @@ void func_8007C360(s32 objectIndex, void *arg1) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007C360.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -u16 func_800417B4(u16, s32); /* extern */ -void func_8007C360(s32, s32); /* extern */ +void func_8007C420(s32 objectIndex, Player *player, Camera *camera) { + f32 x; + f32 z; -void func_8007C420(s32 objectIndex, void *arg1, s32 arg2) { - struct_80165C18_entry *sp18; - struct_80165C18_entry *temp_v1; - - temp_v1 = &D_80165C18[objectIndex]; - sp18 = temp_v1; - temp_v1->unk_0BE[1] = func_800417B4(temp_v1->unk_0BE[1], atan2s(arg1->unk14 - temp_v1->unk_004[0], arg1->unk1C - temp_v1->unk_004[2]) & 0xFFFF); - func_8007C360(objectIndex, arg2); + x = player->pos[0] - D_80165C18[objectIndex].unk_004[0]; + z = player->pos[2] - D_80165C18[objectIndex].unk_004[2]; + D_80165C18[objectIndex].unk_0BE[1] = func_800417B4(D_80165C18[objectIndex].unk_0BE[1], atan2s(x, z)); + func_8007C360(objectIndex, camera); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007C420.s") -#endif UNUSED void func_8007C49C(void) { @@ -5556,23 +5119,10 @@ void func_8007C4A4(s32 objectIndex) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007C4A4.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -u16 func_800417B4(u16, s32); /* extern */ -void func_8007C4A4(s32); /* extern */ - void func_8007C550(s32 objectIndex) { - struct_80165C18_entry *sp18; - struct_80165C18_entry *temp_v1; - - temp_v1 = &D_80165C18[objectIndex]; - sp18 = temp_v1; - temp_v1->unk_0BE[1] = func_800417B4(temp_v1->unk_0BE[1], atan2s(temp_v1->unk_038, temp_v1->unk_040) & 0xFFFF); + D_80165C18[objectIndex].unk_0BE[1] = func_800417B4(D_80165C18[objectIndex].unk_0BE[1], atan2s(D_80165C18[objectIndex].unk_038[0], D_80165C18[objectIndex].unk_038[2])); func_8007C4A4(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007C550.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc @@ -5975,31 +5525,26 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007CEDC.s") #endif #ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_8007C420(s32, void *, void *); /* extern */ -void func_8007CEDC(s32); /* extern */ -void func_8008B724(s32); /* extern */ +//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-28-2022 +? func_8007CEDC(s32); /* extern */ +? func_8008B724(s32); /* extern */ extern s32 D_8016559C; -extern s32 D_8018C1B0; extern s32 D_8018C1D8; extern ? D_8018C228; -extern void *D_8018CF14; -extern void *D_8018CF1C; -extern s16 D_8018CF68; -extern s32 D_8018D2A4; -static ? D_800E4470; /* unable to generate initializer */ -static ? D_800E44B0; /* unable to generate initializer */ +extern Camera *D_8018CF14; +extern Player *D_8018CF1C; +static Vtx D_800E4470; /* unable to generate initializer */ +static Vtx D_800E44B0; /* unable to generate initializer */ static ? D_800E5D54; /* unable to generate initializer */ static ? D_800E5DB4; /* unable to generate initializer */ void func_8007D070(void) { f32 sp44; - ? *var_s2; f32 temp_f2; f32 temp_f4; f32 temp_f6; s16 temp_s2; - s16 temp_v1; + s32 *var_s2; s32 temp_s1; s32 temp_s1_2; s32 temp_s3; @@ -6008,59 +5553,54 @@ void func_8007D070(void) { s32 var_v0; struct_80165C18_entry *temp_s0; struct_80165C18_entry *temp_s0_2; - void *temp_a1; var_v0 = 0; - if ((D_8016559C == 0) && (D_8018D2A4 != 0)) { - temp_v1 = D_8018CF68; - if ((temp_v1 < 0x1D) && (*(&D_800E5DB4 + temp_v1) == 1)) { - if (D_80165C18[D_8018C1D8].unk_0A6 != 0) { + if ((D_8016559C == 0) && (D_8018D2A4 != 0) && (*D_8018CF68 < 0x1D) && (*(&D_800E5DB4 + *D_8018CF68) == 1)) { + if (D_80165C18[D_8018C1D8].unk_0A6 != 0) { loop_5: - var_v0 += 1; - if (var_v0 != 0x1E) { - if (D_80165C18[(&D_8018C1B0 + (var_v0 * 4))->unk28].unk_0A6 != 0) { - goto loop_5; - } - } - } - temp_s1 = (&D_8018C1B0 + (var_v0 * 4))->unk28; + var_v0 += 1; if (var_v0 != 0x1E) { - temp_s0 = &D_80165C18[temp_s1]; - if (temp_s0->unk_0A6 == 0) { - func_800723A4(temp_s1, 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->unk2E + 0x8000; - temp_t2 = (D_8018CF14->unk26 + 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->unk14; - temp_f4 = coss(temp_t2 & 0xFFFF) * temp_f2; - temp_s0->unk_080 = (s32) &D_800E5D54; - temp_s0->unk_010[2] = temp_f4 + D_8018CF1C->unk1C; + if (D_80165C18[D_8018C1B0[var_v0].unk28].unk_0A6 != 0) { + goto loop_5; } } } + temp_s1 = D_8018C1B0[var_v0].unk28; + if (var_v0 != 0x1E) { + temp_s0 = &D_80165C18[temp_s1]; + if (temp_s0->unk_0A6 == 0) { + func_800723A4(temp_s1, 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 = (s32) &D_800E5D54; + temp_s0->unk_010[2] = temp_f4 + D_8018CF1C->pos[2]; + } + } } - var_s2 = &D_8018C1B0; + var_s2 = D_8018C1B0; do { temp_s1_2 = var_s2->unk28; temp_s0_2 = &D_80165C18[temp_s1_2]; if (temp_s0_2->unk_0A6 != 0) { func_8007CEDC(temp_s1_2); func_8008B724(temp_s1_2); - temp_a1 = D_8018CF1C; temp_s0_2->unk_004[0] = temp_s0_2->unk_028[0] + temp_s0_2->unk_010[0]; - temp_s0_2->unk_004[1] = temp_s0_2->unk_028[1] + (temp_a1->unk74 + temp_s0_2->unk_010[1]); + temp_s0_2->unk_004[1] = temp_s0_2->unk_028[1] + (D_8018CF1C->unk_074 + temp_s0_2->unk_010[1]); temp_s0_2->unk_004[2] = temp_s0_2->unk_028[2] + temp_s0_2->unk_010[2]; - func_8007C420(temp_s1_2, temp_a1, D_8018CF14); + func_8007C420(temp_s1_2, D_8018CF1C, D_8018CF14); if (func_8007223C(temp_s1_2, 0x00000080) != 0) { - temp_s0_2->unk_074 = (s32) &D_800E44B0; + temp_s0_2->unk_074 = &D_800E44B0; } else { - temp_s0_2->unk_074 = (s32) &D_800E4470; + temp_s0_2->unk_074 = &D_800E4470; } } var_s2 += 4; @@ -6114,52 +5654,39 @@ void func_8007D360(s32 objectIndex, s32 arg1) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007D360.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_8007D360(); /* extern */ +#ifdef NEEDS_RODATA +// data/data_0D00A0_3_0.s +extern f32 D_800EEF18; // = 0.1f; -void func_8007D6A8(s32 objectIndex) { - struct_80165C18_entry *sp18; +void func_8007D6A8(s32 objectIndex, s32 arg1) { + s32 stackPadding0; + s32 stackPadding1; struct_80165C18_entry *temp_v0; temp_v0 = &D_80165C18[objectIndex]; temp_v0->unk_0D5 = 0x0D; - sp18 = temp_v0; - func_8007D360(); - sp18->unk_000 = 0.1f; + func_8007D360(objectIndex, arg1); + temp_v0->unk_000 = 0.1f; func_800721C0(objectIndex, 0x00000200); - sp18->unkC8 = 3; + temp_v0->unk_0C8 = 3; } #else GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007D6A8.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -? func_8007D6A8(s32, s32); /* extern */ -extern s32 D_80183E4C; -extern s32 D_80183E5C; -extern s32 D_8018C3F0; -extern s32 D_8018C630; - void func_8007D714(s32 arg0) { - s32 sp1C; s32 var_v0; if (arg0 == 1) { - var_v0 = func_80072044(&D_8018C3F0, &D_80183E4C, 0x00000028); + var_v0 = func_80072044(D_8018C3F0, &D_80183E4C, 0x00000028); } else { - var_v0 = func_80072044(&D_8018C630, &D_80183E5C, 0x0000001E); + var_v0 = func_80072044(D_8018C630, &D_80183E5C, 0x0000001E); } if (var_v0 != -1) { - sp1C = var_v0; func_800723A4(var_v0, 0); func_8007D6A8(var_v0, arg0); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007D714.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -6272,22 +5799,17 @@ void func_8007DAF8(s32 objectIndex, s32 arg1) { } #ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_8007D794(s32); /* extern */ -extern s32 D_8018C3F0; +//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-28-2022 +? func_8007D794(s32); /* extern */ extern ? D_8018C490; -extern s32 D_8018C630; extern ? D_8018C6A8; extern s16 D_8018CFB0; extern s16 D_8018CFC8; extern s16 D_8018CFD8; -extern s16 D_8018CFE8; extern s16 D_8018D000; extern s16 D_8018D010; void func_8007DB44(void) { - s16 temp_v0; - s16 temp_v0_2; s32 *var_s2; s32 *var_s2_2; s32 temp_s0; @@ -6297,13 +5819,11 @@ void func_8007DB44(void) { struct_80165C18_entry *temp_s1_2; struct_80165C18_entry *temp_s1_3; - temp_v0 = D_8018CFC8; - if (temp_v0 != 0) { - D_8018CFC8 = temp_v0 - 1; + if (D_8018CFC8 != 0) { + D_8018CFC8 -= 1; } - temp_v0_2 = D_8018D000; - if (temp_v0_2 != 0) { - D_8018D000 = temp_v0_2 - 1; + if (D_8018D000 != 0) { + D_8018D000 -= 1; } temp_s0 = *D_80183EA0; func_80072E54(temp_s0, 0, 3, 1, 0, -1); @@ -6313,7 +5833,7 @@ void func_8007DB44(void) { temp_s1->unk_0B2[2] = temp_s1->unk_0A0 + 0x8000; if ((D_8018CFB0 != 0) || (D_8018CFC8 != 0)) { D_8018CFD8 = 0; - var_s2 = &D_8018C3F0; + var_s2 = D_8018C3F0; do { temp_s0_2 = *var_s2; if (temp_s0_2 != -1) { @@ -6323,7 +5843,7 @@ void func_8007DB44(void) { func_8007DAF8(temp_s0_2, 1); func_8007D794(temp_s0_2); if (temp_s1_2->unk_0A6 == 0) { - func_80072100((s32) var_s2); + func_80072100(var_s2); } D_8018CFD8 += 1; } @@ -6334,80 +5854,71 @@ void func_8007DB44(void) { D_8018CFC8 = 0x012C; } } - if ((D_8018CFE8 != 0) || (D_8018D000 != 0)) { - D_8018D010 = 0; - var_s2_2 = &D_8018C630; - do { - temp_s0_3 = *var_s2_2; - if (temp_s0_3 != -1) { - temp_s1_3 = &D_80165C18[temp_s0_3]; - if (temp_s1_3->unk_0A6 != 0) { - func_8007D8D4(temp_s0_3, 2); - func_8007DAF8(temp_s0_3, 2); - func_8007D794(temp_s0_3); - if (temp_s1_3->unk_0A6 == 0) { - func_80072100((s32) var_s2_2); - } - D_8018D010 += 1; - } - } - var_s2_2 += 4; - } while (var_s2_2 != &D_8018C6A8); - if (D_8018D010 != 0) { - D_8018D000 = 0x012C; + if (D_8018CFE8 == 0) { + if (D_8018D000 != 0) { + goto block_19; } + return; + } +block_19: + D_8018D010 = 0; + var_s2_2 = D_8018C630; + do { + temp_s0_3 = *var_s2_2; + if (temp_s0_3 != -1) { + temp_s1_3 = &D_80165C18[temp_s0_3]; + if (temp_s1_3->unk_0A6 != 0) { + func_8007D8D4(temp_s0_3, 2); + func_8007DAF8(temp_s0_3, 2); + func_8007D794(temp_s0_3); + if (temp_s1_3->unk_0A6 == 0) { + func_80072100(var_s2_2); + } + D_8018D010 += 1; + } + } + var_s2_2 += 4; + } while (var_s2_2 != &D_8018C6A8); + if (D_8018D010 != 0) { + D_8018D000 = 0x012C; } } #else GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007DB44.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_800C9EF4(f32 *, ?); /* extern */ +#ifdef NEEDS_RODATA +// data/data_0DD0A0_3_0.s +extern f32 D_800EEF40;// = 1150.0f; void func_8007DDC0(s32 objectIndex) { f32 sp2C; - f32 *sp20; - s16 temp_v0_4; - s32 temp_t1; - s32 temp_t9; - s32 temp_v0; - s32 temp_v0_2; - s32 temp_v0_3; struct_80165C18_entry *temp_s0; temp_s0 = &D_80165C18[objectIndex]; - temp_v0 = temp_s0->unk_04C; - temp_t9 = temp_v0 - 1; - if (temp_v0 > 0) { - temp_s0->unk_04C = temp_t9; - if (temp_t9 == 0) { + if (temp_s0->unk_04C > 0) { + temp_s0->unk_04C--; + if (temp_s0->unk_04C == 0) { func_800722CC(objectIndex, 1); } } - temp_v0_2 = temp_s0->unk_048; - temp_t1 = temp_v0_2 - 1; - if (temp_v0_2 > 0) { - temp_s0->unk_048 = temp_t1; - if (temp_t1 == 0) { - func_800C9EF4(temp_s0->unk_004, 0x51028006); + if (temp_s0->unk_048 > 0) { + temp_s0->unk_048--; + if (temp_s0->unk_048 == 0) { + func_800C9EF4(temp_s0->unk_004, 0x51028006U); } } if (temp_s0->unk_04C == 0) { - temp_v0_3 = gCCSelection; - if ((temp_v0_3 == CC_50) || (temp_v0_3 == CC_100) || (temp_v0_3 == CC_150) || (temp_v0_3 == CC_EXTRA)) { + if ((gCCSelection == CC_50) || (gCCSelection == CC_100) || (gCCSelection == CC_150) || (gCCSelection == CC_EXTRA)) { sp2C = 1150.0f; } func_8008A6DC(objectIndex, sp2C); if ((func_8007223C(objectIndex, 0x00040000) != 0) && (func_80072354(objectIndex, 1) != 0)) { - sp20 = temp_s0->unk_004; func_800722A4(objectIndex, 1); - func_800C9D80((f32 (*)[3]) sp20, (f32 (*)[3]) temp_s0->unk_038, 0x51028006U); + func_800C9D80(temp_s0->unk_004, temp_s0->unk_038, 0x51028006U); func_800726CC(objectIndex, 3); - temp_v0_4 = temp_s0->unk_0A4; - if (temp_v0_4 > 0) { - temp_s0->unk_0A4 = temp_v0_4 - 1; + if (temp_s0->unk_0A4 > 0) { + temp_s0->unk_0A4--; temp_s0->unk_04C = 0x00000168; } else { temp_s0->unk_04C = 0x00000168; @@ -6544,52 +6055,34 @@ void func_8007E1AC(void) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007E1AC.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_800C9EF4(f32 *, ?); /* extern */ - void func_8007E1F4(s32 objectIndex) { f32 sp2C; - f32 *sp20; - s16 temp_v0_4; - s32 temp_t1; - s32 temp_t9; - s32 temp_v0; - s32 temp_v0_2; - s32 temp_v0_3; struct_80165C18_entry *temp_s0; temp_s0 = &D_80165C18[objectIndex]; - temp_v0 = temp_s0->unk_04C; - temp_t9 = temp_v0 - 1; - if (temp_v0 > 0) { - temp_s0->unk_04C = temp_t9; - if (temp_t9 == 0) { + if (temp_s0->unk_04C > 0) { + temp_s0->unk_04C--; + if (temp_s0->unk_04C == 0) { func_800722CC(objectIndex, 1); } } - temp_v0_2 = temp_s0->unk_048; - temp_t1 = temp_v0_2 - 1; - if (temp_v0_2 > 0) { - temp_s0->unk_048 = temp_t1; - if (temp_t1 == 0) { - func_800C9EF4(temp_s0->unk_004, 0x51028006); + if (temp_s0->unk_048 > 0) { + temp_s0->unk_048--; + if (temp_s0->unk_048 == 0) { + func_800C9EF4(temp_s0->unk_004, 0x51028006U); } } if (temp_s0->unk_04C == 0) { - temp_v0_3 = gCCSelection; - if ((temp_v0_3 == CC_50) || (temp_v0_3 == CC_100) || (temp_v0_3 == CC_150) || (temp_v0_3 == CC_EXTRA)) { + if ((gCCSelection == CC_50) || (gCCSelection == CC_100) || (gCCSelection == CC_150) || (gCCSelection == CC_EXTRA)) { sp2C = 700.0f; } func_8008A6DC(objectIndex, sp2C); if ((func_8007223C(objectIndex, 0x00040000) != 0) && (func_80072354(objectIndex, 1) != 0)) { - sp20 = temp_s0->unk_004; func_800722A4(objectIndex, 1); - func_800C9D80((f32 (*)[3]) sp20, (f32 (*)[3]) &temp_s0->unk_038, 0x51028006U); + func_800C9D80(temp_s0->unk_004, temp_s0->unk_038, 0x51028006U); func_800726CC(objectIndex, 3); - temp_v0_4 = temp_s0->unk_0A4; - if (temp_v0_4 > 0) { - temp_s0->unk_0A4 = temp_v0_4 - 1; + if (temp_s0->unk_0A4 > 0) { + temp_s0->unk_0A4--; temp_s0->unk_04C = 0x00000168; } else { temp_s0->unk_04C = 0x00000168; @@ -6601,9 +6094,6 @@ void func_8007E1F4(s32 objectIndex) { temp_s0->unk_0A4 = 2; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007E1F4.s") -#endif #ifdef NEEDS_RODATA // data/data_0DD0A0_3_0.s @@ -6623,69 +6113,52 @@ void func_8007E358(s32 objectIndex) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007E358.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_8007D714(?); /* extern */ -void func_8007E358(); /* extern */ -extern s32 D_80165598; -extern ? D_80165CBE; -extern s16 D_8018CFE8; +#ifdef NEEDS_RODATA +// data/data_0DD0A0_3_0.s +// jpt_800EEF6C void func_8007E3EC(s32 objectIndex) { - u16 temp_t7; - temp_t7 = *(&D_80165CBE + (objectIndex * 0xE0)); - switch (temp_t7) { + switch (D_80165C18[objectIndex].unk_0A6) { case 1: - func_8007E358(); - return; + func_8007E358(objectIndex); + break; case 3: D_8018CFE8 = 1; func_80072488(objectIndex); - return; + break; case 4: func_8007278C(objectIndex, 0x000000D2); if (D_80165598 == 0) { - if (gCCSelection < 2) { + if (gCCSelection < CC_150) { + func_8007D714(2); + } else { + func_8007D714(2); func_8007D714(2); - return; } - func_8007D714(2); - func_8007D714(2); - return; } - default: - return; + break; case 5: D_8018CFE8 = 0; func_80072488(objectIndex); break; + case 0: + case 2: + default: + break; } } #else GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007E3EC.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_8007E1F4(s32); // extern -void func_8007E3EC(s32); // extern -extern s32 D_80183EA8; - void func_8007E4C4(void) { - s32 sp1C; - s32 temp_a0; - - temp_a0 = D_80183EA8; - sp1C = temp_a0; - func_8007E3EC(temp_a0); + s32 objectIndex = D_80183EA8; + func_8007E3EC(objectIndex); if (gModeSelection != TIME_TRIALS) { - func_8007E1F4(temp_a0); + func_8007E1F4(objectIndex); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007E4C4.s") -#endif s32 func_8007E50C(s32 objectIndex, Player *player, Camera *camera) { s32 sp24; @@ -6698,41 +6171,21 @@ s32 func_8007E50C(s32 objectIndex, Player *player, Camera *camera) { return sp24; } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc s32 func_8007E59C(s32 objectIndex) { - Camera *temp_a2; - Camera *var_s1; - Player *temp_a1; - Player *var_s0; + Camera *camera; + Player *player; s32 temp_v0; - s32 var_s2; - s32 var_v1; + s32 someIndex; - var_v1 = 0; - var_s0 = gPlayerOne; - var_s1 = camera1; - var_s2 = 0; - if (gPlayerCountSelection1 > 0) { -loop_1: - temp_a1 = var_s0; - temp_a2 = var_s1; - var_s1 += 0xB8; - var_s0 += 0xDD8; - temp_v0 = func_8007E50C(objectIndex, temp_a1, temp_a2); - var_v1 = temp_v0; - if (temp_v0 == 0) { - var_s2 += 1; - if (var_s2 < gPlayerCountSelection1) { - goto loop_1; - } - } + temp_v0 = 0; + player = gPlayerOne; + camera = camera1; + for (someIndex = 0; someIndex < gPlayerCountSelection1; someIndex++) { + temp_v0 = func_8007E50C(objectIndex, player++, camera++); + if (temp_v0 != 0) break; } - return var_v1; + return temp_v0; } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007E59C.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc @@ -8062,25 +7515,20 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80080E8C.s") #endif #ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -s32 func_80072044(? *, ? *, ?); // extern -void func_80080E8C(s32, s32, s32); // extern -extern s32 D_80183E4C; -extern s32 D_8018C3F0; +//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-28-2022 +? func_80080E8C(s32, s32, s32); /* extern */ void func_80080FEC(s32 arg0) { - s32 temp_s0; s32 temp_v0; - s32 phi_s0; + s32 var_s0; - phi_s0 = 0; + var_s0 = 0; loop_1: - temp_v0 = func_80072044(&D_8018C3F0, &D_80183E4C, 0x80); + temp_v0 = func_80072044(D_8018C3F0, &D_80183E4C, 0x00000080); if (temp_v0 != -1) { - func_80080E8C(temp_v0, arg0, phi_s0); - temp_s0 = phi_s0 + 1; - phi_s0 = temp_s0; - if (temp_s0 != 6) { + func_80080E8C(temp_v0, arg0, var_s0); + var_s0 += 1; + if (var_s0 != 6) { goto loop_1; } } @@ -8157,24 +7605,18 @@ void func_80081208(void) { } #ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_8007542C(?); /* extern */ -void func_8007ED6C(s32); /* extern */ -void func_8007F5A8(s32); /* extern */ -void func_8007F8D8(); /* extern */ -void func_8007FFC0(s32); /* extern */ -void func_800801FC(s32); /* extern */ -void func_80080408(s32); /* extern */ -void func_800808CC(s32); /* extern */ -void func_80080A14(s32, Player *); /* extern */ -void func_80080A4C(s32, s32); /* extern */ -void func_80080B28(s32, s32); /* extern */ -void func_80080FEC(s32); /* extern */ -void func_800810F4(s32); /* extern */ -void func_8008A4CC(s32); /* extern */ +//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-28-2022 +? func_8007ED6C(s32); /* extern */ +? func_8007F5A8(s32); /* extern */ +? func_8007F8D8(); /* extern */ +? func_8007FFC0(s32); /* extern */ +? func_800801FC(s32); /* extern */ +? func_80080408(s32); /* extern */ +? func_800808CC(s32); /* extern */ +? func_80080B28(s32, s32); /* extern */ +? func_80080FEC(s32); /* extern */ +? func_800810F4(s32); /* extern */ extern s16 D_80165750; -extern Vec3s D_80165834; -extern s32 D_8018C3F0; extern ? D_8018C5F0; void func_80081210(void) { @@ -8196,8 +7638,8 @@ void func_80081210(void) { struct_80165C18_entry *temp_s1_2; u8 temp_t5; - D_80165834.unk0 = (u16) (D_80165834.unk0 + 0x100); - D_80165834.unk2 = (u16) (D_80165834.unk2 + 0x200); + D_80165834->unk0 = (u16) D_80165834->unk0 + 0x100; + D_80165834->unk2 = (u16) (D_80165834->unk2 + 0x200); var_s4 = 0; if (D_80165750 > 0) { var_s2 = D_80183EA0; @@ -8217,7 +7659,7 @@ void func_80081210(void) { temp_s0_2 = *var_s2_2; temp_s1 = &D_80165C18[temp_s0_2]; if (temp_s1->unk_0A6 != 0) { - temp_t5 = (u8) temp_s1->unk_0D5; + temp_t5 = temp_s1->unk_0D5; switch (temp_t5) { case 1: func_8007ED6C(temp_s0_2); @@ -8283,7 +7725,7 @@ void func_80081210(void) { var_s2_4 += 4; } while (var_s4_2 < D_80165750); } - var_s2_5 = &D_8018C3F0; + var_s2_5 = D_8018C3F0; do { temp_s0_5 = *var_s2_5; if (temp_s0_5 != -1) { @@ -8291,7 +7733,7 @@ void func_80081210(void) { if (temp_s1_2->unk_0A6 != 0) { func_800810F4(temp_s0_5); if (temp_s1_2->unk_0A6 == 0) { - func_80072100((s32) var_s2_5); + func_80072100(var_s2_5); } } } @@ -9315,31 +8757,26 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083474.s") #endif #ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_80072120(s32 *, ?); // extern -void func_80083248(s32); // extern -void func_800833D0(s32, s32); // extern -void func_80083474(s32); // extern -extern s32 D_80183F28; +//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-28-2022 +? func_800833D0(s32, s32); /* extern */ +? func_80083474(s32); /* extern */ void func_800834B8(void) { - s32 temp_s0; + s32 *var_s2; s32 temp_s1; - s32 *phi_s2; - s32 phi_s0; + s32 var_s0; - phi_s2 = &D_80183F28; - phi_s0 = 0; + var_s2 = D_80183F28; + var_s0 = 0; do { - temp_s1 = *phi_s2; - func_800833D0(temp_s1, phi_s0); + temp_s1 = *var_s2; + func_800833D0(temp_s1, var_s0); func_80083248(temp_s1); func_80083474(temp_s1); - temp_s0 = phi_s0 + 1; - phi_s2 += 4; - phi_s0 = temp_s0; - } while (temp_s0 != 0xF); - func_80072120(&D_80183F28, 0xF); + var_s0 += 1; + var_s2 += 4; + } while (var_s0 != 0xF); + func_80072120(D_80183F28, 0x0000000F); } #else GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800834B8.s") diff --git a/src/code_80071F00.h b/src/code_80071F00.h index e519f81fb..7a3961c56 100644 --- a/src/code_80071F00.h +++ b/src/code_80071F00.h @@ -109,36 +109,64 @@ void func_800748F4(s32, s32); void func_80074924(s32); void func_80074D94(s32); void func_80074E28(s32); +void func_80074EE8(); +void func_80074FD8(s32); +void func_800750D8(s32, s32, Vec3f, s32, s32); +void func_80075304(Vec3f, s32, s32, s32); +void func_8007542C(s32); void func_80075574(s32, Vec3f, f32); +s32 func_800755FC(s32, Vec3f, f32); void func_80075698(s32); void func_80075714(s32); void func_800759EC(s32, Vec3f, f32); -s32 func_80075A6C(s32, s32, f32); +s32 func_80075A6C(s32, Vec3f, f32); void func_80075B08(s32); void func_80075B84(s32); void func_80075E5C(s32, Vec3f, u16, f32, s32); s32 func_80075F28(Vec3f, u16, f32, s32); -void func_80075F98(Vec3f, s32, f32); +void func_80075F98(Vec3f, u16, f32); void func_8007601C(s32); +void func_8007614C(); void func_80076194(s32, Vec3f, f32, s32); +s32 func_80076278(Vec3f, f32, s32); +void func_800762DC(Vec3f, f32); +void func_8007634C(s32); +void func_800763CC(s32); void func_80076538(s32); +void func_8007661C(); void func_8007675C(s32, Vec3s, s32); +s32 func_80076828(Vec3s, s32); +void func_80076958(s32); +void func_800769D8(s32); +void func_80076AEC(s32); void func_80076B7C(); +void func_80076B84(); +void func_80076C9C(s32, Vec3f, s16); +void func_80076D70(Vec3f, s32, s16); void func_80076DC4(s32); void func_80076E14(s32); void func_80076ED8(s32); +void func_80076F2C(); +void func_80076FEC(s32, s32); +void func_800770F0(s32); void func_800773D8(s32, s32); void func_80077428(s32); void func_80077450(s32); void func_80077584(s32); void func_80077640(); void func_80077700(s32, Vec3f, s32); +s32 func_80077A54(Vec3f, s32); void func_80077AB0(Vec3f, s32); void func_80077B14(s32); void func_80077B3C(s32); void func_80077BCC(s32); +void func_80077C9C(); void func_80077E20(s32); void func_80078220(s32); +void func_80078288(s32); +void func_800786EC(s32); +void func_80078790(); +void func_80078838(); void func_80078C68(); void func_80078C70(s32); void func_80078F64(); @@ -164,16 +192,27 @@ void func_8007BD04(s32); void func_8007BDA8(); void func_8007C2F8(s32); void func_8007C340(); +void func_8007C360(s32, Camera*); +void func_8007C420(s32, Player*, Camera*); +void func_8007C4A4(s32); +void func_8007C550(s32); void func_8007C49C(); void func_8007D360(s32, s32); +void func_8007D6A8(s32, s32); +void func_8007D714(s32); s32 func_8007D804(s32); void func_8007D8AC(s32); void func_8007D8D4(s32, s32); void func_8007DA4C(s32); void func_8007DA74(s32); void func_8007DAF8(s32, s32); +void func_8007DDC0(s32); +void func_8007E1F4(s32); void func_8007E358(s32); +void func_8007E3EC(s32); +void func_8007E4C4(); s32 func_8007E50C(s32, Player*, Camera*); +s32 func_8007E59C(s32); void func_8007EFBC(s32); void func_8007F280(s32); void func_8007F544(s32); @@ -205,9 +244,6 @@ void func_80086424(s32); void func_80086604(); void func_80086D80(); -// audio/external.c -void func_800C9D80(Vec3f, Vec3f, u32); - s32 osPiStartDma(OSIoMesg *mb, s32 priority, s32 direction, uintptr_t devAddr, void *vAddr, size_t nbytes, OSMesgQueue *mq); s32 osRecvMesg(OSMesgQueue*, OSMesg*, s32); @@ -221,16 +257,15 @@ extern f64 D_800EEAD0; extern f32 D_800EEAD8; extern f64 D_800EEAE0; extern f32 D_800EEAE8; +extern s32 D_80162DF8; +extern s32 D_80165598; extern s16 D_80165740; extern s8 D_801657B4; +extern Vec3su D_8016582C; extern s32 D_80183D5C; extern s32 D_80183DB8[]; -extern s32 D_80183E38; -extern s32 D_80183E4C; -extern s32 D_80183E5C; -extern s32 D_8018C1B0; -extern s32 D_8018C3F0; -extern s32 D_8018C630; +extern s32 D_80183EA8; +extern s16 D_8018CFE8; extern f32 D_8018D01C; extern s32 D_8018D140; extern s32 D_8018D224;