diff --git a/asm/non_matchings/code_80040E50/func_800413B8.s b/asm/non_matchings/code_80040E50/func_800413B8.s deleted file mode 100644 index ffff47447..000000000 --- a/asm/non_matchings/code_80040E50/func_800413B8.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel f32_step_towards -/* 041FB8 800413B8 44856000 */ mtc1 $a1, $f12 -/* 041FBC 800413BC C4800000 */ lwc1 $f0, ($a0) -/* 041FC0 800413C0 44867000 */ mtc1 $a2, $f14 -/* 041FC4 800413C4 00001825 */ move $v1, $zero -/* 041FC8 800413C8 460C003C */ c.lt.s $f0, $f12 -/* 041FCC 800413CC 00000000 */ nop -/* 041FD0 800413D0 45020014 */ bc1fl .L80041424 -/* 041FD4 800413D4 4600603C */ c.lt.s $f12, $f0 -/* 041FD8 800413D8 44802000 */ mtc1 $zero, $f4 -/* 041FDC 800413DC 24020001 */ li $v0, 1 -/* 041FE0 800413E0 460E203E */ c.le.s $f4, $f14 -/* 041FE4 800413E4 00000000 */ nop -/* 041FE8 800413E8 45020005 */ bc1fl .L80041400 -/* 041FEC 800413EC 460E0201 */ sub.s $f8, $f0, $f14 -/* 041FF0 800413F0 460E0180 */ add.s $f6, $f0, $f14 -/* 041FF4 800413F4 10000003 */ b .L80041404 -/* 041FF8 800413F8 E4860000 */ swc1 $f6, ($a0) -/* 041FFC 800413FC 460E0201 */ sub.s $f8, $f0, $f14 -.L80041400: -/* 042000 80041400 E4880000 */ swc1 $f8, ($a0) -.L80041404: -/* 042004 80041404 C48A0000 */ lwc1 $f10, ($a0) -/* 042008 80041408 460A603E */ c.le.s $f12, $f10 -/* 04200C 8004140C 00000000 */ nop -/* 042010 80041410 45000019 */ bc1f .L80041478 -/* 042014 80041414 00000000 */ nop -/* 042018 80041418 03E00008 */ jr $ra -/* 04201C 8004141C E48C0000 */ swc1 $f12, ($a0) - -/* 042020 80041420 4600603C */ c.lt.s $f12, $f0 -.L80041424: -/* 042024 80041424 00000000 */ nop -/* 042028 80041428 45000013 */ bc1f .L80041478 -/* 04202C 8004142C 00000000 */ nop -/* 042030 80041430 44808000 */ mtc1 $zero, $f16 -/* 042034 80041434 00000000 */ nop -/* 042038 80041438 460E803E */ c.le.s $f16, $f14 -/* 04203C 8004143C 00000000 */ nop -/* 042040 80041440 45020005 */ bc1fl .L80041458 -/* 042044 80041444 460E0100 */ add.s $f4, $f0, $f14 -/* 042048 80041448 460E0481 */ sub.s $f18, $f0, $f14 -/* 04204C 8004144C 10000003 */ b .L8004145C -/* 042050 80041450 E4920000 */ swc1 $f18, ($a0) -/* 042054 80041454 460E0100 */ add.s $f4, $f0, $f14 -.L80041458: -/* 042058 80041458 E4840000 */ swc1 $f4, ($a0) -.L8004145C: -/* 04205C 8004145C C4860000 */ lwc1 $f6, ($a0) -/* 042060 80041460 460C303E */ c.le.s $f6, $f12 -/* 042064 80041464 00000000 */ nop -/* 042068 80041468 45000003 */ bc1f .L80041478 -/* 04206C 8004146C 00000000 */ nop -/* 042070 80041470 E48C0000 */ swc1 $f12, ($a0) -/* 042074 80041474 24030001 */ li $v1, 1 -.L80041478: -/* 042078 80041478 03E00008 */ jr $ra -/* 04207C 8004147C 00601025 */ move $v0, $v1 diff --git a/asm/non_matchings/code_80040E50/func_80041530.s b/asm/non_matchings/code_80040E50/func_80041530.s deleted file mode 100644 index de4c38b69..000000000 --- a/asm/non_matchings/code_80040E50/func_80041530.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80041530 -/* 042130 80041530 AFA40000 */ sw $a0, ($sp) -/* 042134 80041534 C48C0000 */ lwc1 $f12, ($a0) -/* 042138 80041538 C48E0004 */ lwc1 $f14, 4($a0) -/* 04213C 8004153C C4820008 */ lwc1 $f2, 8($a0) -/* 042140 80041540 460C6102 */ mul.s $f4, $f12, $f12 -/* 042144 80041544 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 042148 80041548 44819000 */ mtc1 $at, $f18 -/* 04214C 8004154C 460E7182 */ mul.s $f6, $f14, $f14 -/* 042150 80041550 27A20000 */ addiu $v0, $sp, 0 -/* 042154 80041554 46021282 */ mul.s $f10, $f2, $f2 -/* 042158 80041558 46062200 */ add.s $f8, $f4, $f6 -/* 04215C 8004155C 46085000 */ add.s $f0, $f10, $f8 -/* 042160 80041560 46000004 */ sqrt.s $f0, $f0 -/* 042164 80041564 46009403 */ div.s $f16, $f18, $f0 -/* 042168 80041568 46106102 */ mul.s $f4, $f12, $f16 -/* 04216C 8004156C E4840000 */ swc1 $f4, ($a0) -/* 042170 80041570 8FAF0000 */ lw $t7, ($sp) -/* 042174 80041574 C5E60004 */ lwc1 $f6, 4($t7) -/* 042178 80041578 46103282 */ mul.s $f10, $f6, $f16 -/* 04217C 8004157C E5EA0004 */ swc1 $f10, 4($t7) -/* 042180 80041580 8FB80000 */ lw $t8, ($sp) -/* 042184 80041584 C7080008 */ lwc1 $f8, 8($t8) -/* 042188 80041588 46104482 */ mul.s $f18, $f8, $f16 -/* 04218C 8004158C 03E00008 */ jr $ra -/* 042190 80041590 E7120008 */ swc1 $f18, 8($t8) diff --git a/asm/non_matchings/code_80040E50/func_80041608.s b/asm/non_matchings/code_80040E50/func_80041608.s deleted file mode 100644 index 116077360..000000000 --- a/asm/non_matchings/code_80040E50/func_80041608.s +++ /dev/null @@ -1,23 +0,0 @@ - -glabel func_80041608 -/* 042208 80041608 AFA60008 */ sw $a2, 8($sp) -/* 04220C 8004160C C7A40008 */ lwc1 $f4, 8($sp) -/* 042210 80041610 C7A80010 */ lwc1 $f8, 0x10($sp) -/* 042214 80041614 AFA7000C */ sw $a3, 0xc($sp) -/* 042218 80041618 460C2001 */ sub.s $f0, $f4, $f12 -/* 04221C 8004161C C7A6000C */ lwc1 $f6, 0xc($sp) -/* 042220 80041620 46084282 */ mul.s $f10, $f8, $f8 -/* 042224 80041624 00001825 */ move $v1, $zero -/* 042228 80041628 460E3081 */ sub.s $f2, $f6, $f14 -/* 04222C 8004162C 46000402 */ mul.s $f16, $f0, $f0 -/* 042230 80041630 00000000 */ nop -/* 042234 80041634 46021482 */ mul.s $f18, $f2, $f2 -/* 042238 80041638 46128100 */ add.s $f4, $f16, $f18 -/* 04223C 8004163C 460A203E */ c.le.s $f4, $f10 -/* 042240 80041640 00000000 */ nop -/* 042244 80041644 45000002 */ bc1f .L80041650 -/* 042248 80041648 00000000 */ nop -/* 04224C 8004164C 24030001 */ li $v1, 1 -.L80041650: -/* 042250 80041650 03E00008 */ jr $ra -/* 042254 80041654 00601025 */ move $v0, $v1 diff --git a/asm/non_matchings/code_80040E50/func_800417B4.s b/asm/non_matchings/code_80040E50/func_800417B4.s deleted file mode 100644 index ae3e37723..000000000 --- a/asm/non_matchings/code_80040E50/func_800417B4.s +++ /dev/null @@ -1,79 +0,0 @@ -glabel func_800417B4 -/* 0423B4 800417B4 308EFFFF */ andi $t6, $a0, 0xffff -/* 0423B8 800417B8 30AFFFFF */ andi $t7, $a1, 0xffff -/* 0423BC 800417BC AFA50004 */ sw $a1, 4($sp) -/* 0423C0 800417C0 000FC203 */ sra $t8, $t7, 8 -/* 0423C4 800417C4 000ECA03 */ sra $t9, $t6, 8 -/* 0423C8 800417C8 01E02825 */ move $a1, $t7 -/* 0423CC 800417CC AFA40000 */ sw $a0, ($sp) -/* 0423D0 800417D0 13190033 */ beq $t8, $t9, .L800418A0 -/* 0423D4 800417D4 01C01825 */ move $v1, $t6 -/* 0423D8 800417D8 01EE2023 */ subu $a0, $t7, $t6 -/* 0423DC 800417DC 3088FFFF */ andi $t0, $a0, 0xffff -/* 0423E0 800417E0 29010400 */ slti $at, $t0, 0x400 -/* 0423E4 800417E4 10200004 */ beqz $at, .L800417F8 -/* 0423E8 800417E8 01002025 */ move $a0, $t0 -/* 0423EC 800417EC 25C40080 */ addiu $a0, $t6, 0x80 -/* 0423F0 800417F0 03E00008 */ jr $ra -/* 0423F4 800417F4 3082FFFF */ andi $v0, $a0, 0xffff - -.L800417F8: -/* 0423F8 800417F8 28810800 */ slti $at, $a0, 0x800 -/* 0423FC 800417FC 50200005 */ beql $at, $zero, .L80041814 -/* 042400 80041800 28814000 */ slti $at, $a0, 0x4000 -/* 042404 80041804 24640200 */ addiu $a0, $v1, 0x200 -/* 042408 80041808 03E00008 */ jr $ra -/* 04240C 8004180C 3082FFFF */ andi $v0, $a0, 0xffff - -/* 042410 80041810 28814000 */ slti $at, $a0, 0x4000 -.L80041814: -/* 042414 80041814 50200005 */ beql $at, $zero, .L8004182C -/* 042418 80041818 34018000 */ li $at, 32768 -/* 04241C 8004181C 24640400 */ addiu $a0, $v1, 0x400 -/* 042420 80041820 03E00008 */ jr $ra -/* 042424 80041824 3082FFFF */ andi $v0, $a0, 0xffff - -/* 042428 80041828 34018000 */ li $at, 32768 -.L8004182C: -/* 04242C 8004182C 0081082A */ slt $at, $a0, $at -/* 042430 80041830 50200005 */ beql $at, $zero, .L80041848 -/* 042434 80041834 3401C000 */ li $at, 49152 -/* 042438 80041838 24640700 */ addiu $a0, $v1, 0x700 -/* 04243C 8004183C 03E00008 */ jr $ra -/* 042440 80041840 3082FFFF */ andi $v0, $a0, 0xffff - -/* 042444 80041844 3401C000 */ li $at, 49152 -.L80041848: -/* 042448 80041848 0081082A */ slt $at, $a0, $at -/* 04244C 8004184C 50200005 */ beql $at, $zero, .L80041864 -/* 042450 80041850 3401F800 */ li $at, 63488 -/* 042454 80041854 2464F900 */ addiu $a0, $v1, -0x700 -/* 042458 80041858 03E00008 */ jr $ra -/* 04245C 8004185C 3082FFFF */ andi $v0, $a0, 0xffff - -/* 042460 80041860 3401F800 */ li $at, 63488 -.L80041864: -/* 042464 80041864 0081082A */ slt $at, $a0, $at -/* 042468 80041868 50200005 */ beql $at, $zero, .L80041880 -/* 04246C 8004186C 3401FC00 */ li $at, 64512 -/* 042470 80041870 2464FC00 */ addiu $a0, $v1, -0x400 -/* 042474 80041874 03E00008 */ jr $ra -/* 042478 80041878 3082FFFF */ andi $v0, $a0, 0xffff - -/* 04247C 8004187C 3401FC00 */ li $at, 64512 -.L80041880: -/* 042480 80041880 0081082A */ slt $at, $a0, $at -/* 042484 80041884 10200004 */ beqz $at, .L80041898 -/* 042488 80041888 2464FF80 */ addiu $a0, $v1, -0x80 -/* 04248C 8004188C 2464FE00 */ addiu $a0, $v1, -0x200 -/* 042490 80041890 03E00008 */ jr $ra -/* 042494 80041894 3082FFFF */ andi $v0, $a0, 0xffff - -.L80041898: -/* 042498 80041898 03E00008 */ jr $ra -/* 04249C 8004189C 3082FFFF */ andi $v0, $a0, 0xffff - -.L800418A0: -/* 0424A0 800418A0 30A4FFFF */ andi $a0, $a1, 0xffff -/* 0424A4 800418A4 03E00008 */ jr $ra -/* 0424A8 800418A8 00801025 */ move $v0, $a0 diff --git a/asm/non_matchings/code_80040E50/func_80041924.s b/asm/non_matchings/code_80040E50/func_80041924.s deleted file mode 100644 index a9bebe882..000000000 --- a/asm/non_matchings/code_80040E50/func_80041924.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80041924 -/* 042524 80041924 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 042528 80041928 AFA5002C */ sw $a1, 0x2c($sp) -/* 04252C 8004192C 8FAE002C */ lw $t6, 0x2c($sp) -/* 042530 80041930 AFBF001C */ sw $ra, 0x1c($sp) -/* 042534 80041934 AFA40028 */ sw $a0, 0x28($sp) -/* 042538 80041938 C5C40008 */ lwc1 $f4, 8($t6) -/* 04253C 8004193C 8DC70004 */ lw $a3, 4($t6) -/* 042540 80041940 8DC60000 */ lw $a2, ($t6) -/* 042544 80041944 AFA00024 */ sw $zero, 0x24($sp) -/* 042548 80041948 3C054120 */ lui $a1, 0x4120 -/* 04254C 8004194C 0C0AB772 */ jal func_802ADDC8 -/* 042550 80041950 E7A40010 */ swc1 $f4, 0x10($sp) -/* 042554 80041954 8FAF0028 */ lw $t7, 0x28($sp) -/* 042558 80041958 8FA30024 */ lw $v1, 0x24($sp) -/* 04255C 8004195C 24010001 */ li $at, 1 -/* 042560 80041960 95F80004 */ lhu $t8, 4($t7) -/* 042564 80041964 8FBF001C */ lw $ra, 0x1c($sp) -/* 042568 80041968 27BD0028 */ addiu $sp, $sp, 0x28 -/* 04256C 8004196C 17010002 */ bne $t8, $at, .L80041978 -/* 042570 80041970 00000000 */ nop -/* 042574 80041974 24030001 */ li $v1, 1 -.L80041978: -/* 042578 80041978 03E00008 */ jr $ra -/* 04257C 8004197C 00601025 */ move $v0, $v1 diff --git a/asm/non_matchings/code_80040E50/func_80041980.s b/asm/non_matchings/code_80040E50/func_80041980.s deleted file mode 100644 index a8aa5fcdc..000000000 --- a/asm/non_matchings/code_80040E50/func_80041980.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80041980 -/* 042580 80041980 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 042584 80041984 AFBF0014 */ sw $ra, 0x14($sp) -/* 042588 80041988 AFA60028 */ sw $a2, 0x28($sp) -/* 04258C 8004198C 8C870008 */ lw $a3, 8($a0) -/* 042590 80041990 8CA60008 */ lw $a2, 8($a1) -/* 042594 80041994 C48E0000 */ lwc1 $f14, ($a0) -/* 042598 80041998 C4AC0000 */ lwc1 $f12, ($a1) -/* 04259C 8004199C AFA00018 */ sw $zero, 0x18($sp) -/* 0425A0 800419A0 0C0105DC */ jal func_80041770 -/* 0425A4 800419A4 AFA50024 */ sw $a1, 0x24($sp) -/* 0425A8 800419A8 8FA50024 */ lw $a1, 0x24($sp) -/* 0425AC 800419AC 97A4002A */ lhu $a0, 0x2a($sp) -/* 0425B0 800419B0 8FA80018 */ lw $t0, 0x18($sp) -/* 0425B4 800419B4 84B80026 */ lh $t8, 0x26($a1) -/* 0425B8 800419B8 04810003 */ bgez $a0, .L800419C8 -/* 0425BC 800419BC 00047043 */ sra $t6, $a0, 1 -/* 0425C0 800419C0 24810001 */ addiu $at, $a0, 1 -/* 0425C4 800419C4 00017043 */ sra $t6, $at, 1 -.L800419C8: -/* 0425C8 800419C8 004E7821 */ addu $t7, $v0, $t6 -/* 0425CC 800419CC 01F81823 */ subu $v1, $t7, $t8 -/* 0425D0 800419D0 3079FFFF */ andi $t9, $v1, 0xffff -/* 0425D4 800419D4 07200005 */ bltz $t9, .L800419EC -/* 0425D8 800419D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 0425DC 800419DC 0099082A */ slt $at, $a0, $t9 -/* 0425E0 800419E0 54200003 */ bnel $at, $zero, .L800419F0 -/* 0425E4 800419E4 01001025 */ move $v0, $t0 -/* 0425E8 800419E8 24080001 */ li $t0, 1 -.L800419EC: -/* 0425EC 800419EC 01001025 */ move $v0, $t0 -.L800419F0: -/* 0425F0 800419F0 03E00008 */ jr $ra -/* 0425F4 800419F4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/non_matchings/code_80040E50/func_800419F8.s b/asm/non_matchings/code_80040E50/func_800419F8.s deleted file mode 100644 index 33cc26d79..000000000 --- a/asm/non_matchings/code_80040E50/func_800419F8.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_800419F8 -/* 0425F8 800419F8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 0425FC 800419FC 44800000 */ mtc1 $zero, $f0 -/* 042600 80041A00 3C0142F0 */ li $at, 0x42F00000 # 120.000000 -/* 042604 80041A04 44812000 */ mtc1 $at, $f4 -/* 042608 80041A08 AFBF0014 */ sw $ra, 0x14($sp) -/* 04260C 80041A0C 3C068016 */ lui $a2, %hi(D_80165834) # $a2, 0x8016 -/* 042610 80041A10 24C65834 */ addiu $a2, %lo(D_80165834) # addiu $a2, $a2, 0x5834 -/* 042614 80041A14 27A40018 */ addiu $a0, $sp, 0x18 -/* 042618 80041A18 27A50024 */ addiu $a1, $sp, 0x24 -/* 04261C 80041A1C E7A00024 */ swc1 $f0, 0x24($sp) -/* 042620 80041A20 E7A00028 */ swc1 $f0, 0x28($sp) -/* 042624 80041A24 0C010B45 */ jal func_80042D14 -/* 042628 80041A28 E7A4002C */ swc1 $f4, 0x2c($sp) -/* 04262C 80041A2C C7A60018 */ lwc1 $f6, 0x18($sp) -/* 042630 80041A30 C7AA001C */ lwc1 $f10, 0x1c($sp) -/* 042634 80041A34 C7B20020 */ lwc1 $f18, 0x20($sp) -/* 042638 80041A38 4600320D */ trunc.w.s $f8, $f6 -/* 04263C 80041A3C 8FBF0014 */ lw $ra, 0x14($sp) -/* 042640 80041A40 3C028016 */ lui $v0, %hi(D_80165840) # $v0, 0x8016 -/* 042644 80041A44 4600540D */ trunc.w.s $f16, $f10 -/* 042648 80041A48 440F4000 */ mfc1 $t7, $f8 -/* 04264C 80041A4C 24425840 */ addiu $v0, %lo(D_80165840) # addiu $v0, $v0, 0x5840 -/* 042650 80041A50 4600910D */ trunc.w.s $f4, $f18 -/* 042654 80041A54 44198000 */ mfc1 $t9, $f16 -/* 042658 80041A58 27BD0030 */ addiu $sp, $sp, 0x30 -/* 04265C 80041A5C A04F0000 */ sb $t7, ($v0) -/* 042660 80041A60 44092000 */ mfc1 $t1, $f4 -/* 042664 80041A64 A0590001 */ sb $t9, 1($v0) -/* 042668 80041A68 03E00008 */ jr $ra -/* 04266C 80041A6C A0490002 */ sb $t1, 2($v0) - -/* 042670 80041A70 03E00008 */ jr $ra -/* 042674 80041A74 00000000 */ nop diff --git a/asm/non_matchings/code_80040E50/func_80041A78.s b/asm/non_matchings/code_80040E50/func_80041A78.s deleted file mode 100644 index 03dc85e40..000000000 --- a/asm/non_matchings/code_80040E50/func_80041A78.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80041A78 -/* 042678 80041A78 44801000 */ mtc1 $zero, $f2 -/* 04267C 80041A7C 44852000 */ mtc1 $a1, $f4 -/* 042680 80041A80 44864000 */ mtc1 $a2, $f8 -/* 042684 80041A84 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 042688 80041A88 468021A0 */ cvt.s.w $f6, $f4 -/* 04268C 80041A8C 44810000 */ mtc1 $at, $f0 -/* 042690 80041A90 E4820010 */ swc1 $f2, 0x10($a0) -/* 042694 80041A94 E4820020 */ swc1 $f2, 0x20($a0) -/* 042698 80041A98 E4820004 */ swc1 $f2, 4($a0) -/* 04269C 80041A9C 468042A0 */ cvt.s.w $f10, $f8 -/* 0426A0 80041AA0 E4860030 */ swc1 $f6, 0x30($a0) -/* 0426A4 80041AA4 E4820024 */ swc1 $f2, 0x24($a0) -/* 0426A8 80041AA8 E4820008 */ swc1 $f2, 8($a0) -/* 0426AC 80041AAC E4820018 */ swc1 $f2, 0x18($a0) -/* 0426B0 80041AB0 E4820038 */ swc1 $f2, 0x38($a0) -/* 0426B4 80041AB4 E48A0034 */ swc1 $f10, 0x34($a0) -/* 0426B8 80041AB8 E482000C */ swc1 $f2, 0xc($a0) -/* 0426BC 80041ABC E482001C */ swc1 $f2, 0x1c($a0) -/* 0426C0 80041AC0 E482002C */ swc1 $f2, 0x2c($a0) -/* 0426C4 80041AC4 E4800000 */ swc1 $f0, ($a0) -/* 0426C8 80041AC8 E4800014 */ swc1 $f0, 0x14($a0) -/* 0426CC 80041ACC E4800028 */ swc1 $f0, 0x28($a0) -/* 0426D0 80041AD0 03E00008 */ jr $ra -/* 0426D4 80041AD4 E480003C */ swc1 $f0, 0x3c($a0) diff --git a/asm/non_matchings/code_80040E50/func_80041AD8.s b/asm/non_matchings/code_80040E50/func_80041AD8.s deleted file mode 100644 index b6439fc9d..000000000 --- a/asm/non_matchings/code_80040E50/func_80041AD8.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80041AD8 -/* 0426D8 80041AD8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0426DC 80041ADC AFBF0014 */ sw $ra, 0x14($sp) -/* 0426E0 80041AE0 AFA50024 */ sw $a1, 0x24($sp) -/* 0426E4 80041AE4 00803025 */ move $a2, $a0 -/* 0426E8 80041AE8 AFA60020 */ sw $a2, 0x20($sp) -/* 0426EC 80041AEC 0C0AE006 */ jal sins -/* 0426F0 80041AF0 97A40026 */ lhu $a0, 0x26($sp) -/* 0426F4 80041AF4 97A40026 */ lhu $a0, 0x26($sp) -/* 0426F8 80041AF8 0C0AE00E */ jal coss -/* 0426FC 80041AFC E7A0001C */ swc1 $f0, 0x1c($sp) -/* 042700 80041B00 8FA60020 */ lw $a2, 0x20($sp) -/* 042704 80041B04 C7AC001C */ lwc1 $f12, 0x1c($sp) -/* 042708 80041B08 44801000 */ mtc1 $zero, $f2 -/* 04270C 80041B0C 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 042710 80041B10 44817000 */ mtc1 $at, $f14 -/* 042714 80041B14 46006107 */ neg.s $f4, $f12 -/* 042718 80041B18 E4C00000 */ swc1 $f0, ($a2) -/* 04271C 80041B1C E4C40010 */ swc1 $f4, 0x10($a2) -/* 042720 80041B20 E4C00014 */ swc1 $f0, 0x14($a2) -/* 042724 80041B24 E4CC0004 */ swc1 $f12, 4($a2) -/* 042728 80041B28 E4C20020 */ swc1 $f2, 0x20($a2) -/* 04272C 80041B2C E4C20030 */ swc1 $f2, 0x30($a2) -/* 042730 80041B30 E4C20024 */ swc1 $f2, 0x24($a2) -/* 042734 80041B34 E4C20034 */ swc1 $f2, 0x34($a2) -/* 042738 80041B38 E4C20008 */ swc1 $f2, 8($a2) -/* 04273C 80041B3C E4C20018 */ swc1 $f2, 0x18($a2) -/* 042740 80041B40 E4C20038 */ swc1 $f2, 0x38($a2) -/* 042744 80041B44 E4C2000C */ swc1 $f2, 0xc($a2) -/* 042748 80041B48 E4C2001C */ swc1 $f2, 0x1c($a2) -/* 04274C 80041B4C E4C2002C */ swc1 $f2, 0x2c($a2) -/* 042750 80041B50 E4CE0028 */ swc1 $f14, 0x28($a2) -/* 042754 80041B54 E4CE003C */ swc1 $f14, 0x3c($a2) -/* 042758 80041B58 8FBF0014 */ lw $ra, 0x14($sp) -/* 04275C 80041B5C 27BD0020 */ addiu $sp, $sp, 0x20 -/* 042760 80041B60 03E00008 */ jr $ra -/* 042764 80041B64 00000000 */ nop diff --git a/asm/non_matchings/code_80040E50/func_80041B68.s b/asm/non_matchings/code_80040E50/func_80041B68.s deleted file mode 100644 index 4aa8f9696..000000000 --- a/asm/non_matchings/code_80040E50/func_80041B68.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80041B68 -/* 042768 80041B68 44800000 */ mtc1 $zero, $f0 -/* 04276C 80041B6C 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 042770 80041B70 44811000 */ mtc1 $at, $f2 -/* 042774 80041B74 44856000 */ mtc1 $a1, $f12 -/* 042778 80041B78 E4800010 */ swc1 $f0, 0x10($a0) -/* 04277C 80041B7C E4800020 */ swc1 $f0, 0x20($a0) -/* 042780 80041B80 E4800030 */ swc1 $f0, 0x30($a0) -/* 042784 80041B84 E4800004 */ swc1 $f0, 4($a0) -/* 042788 80041B88 E4800024 */ swc1 $f0, 0x24($a0) -/* 04278C 80041B8C E4800034 */ swc1 $f0, 0x34($a0) -/* 042790 80041B90 E4800008 */ swc1 $f0, 8($a0) -/* 042794 80041B94 E4800018 */ swc1 $f0, 0x18($a0) -/* 042798 80041B98 E4800038 */ swc1 $f0, 0x38($a0) -/* 04279C 80041B9C E480000C */ swc1 $f0, 0xc($a0) -/* 0427A0 80041BA0 E480001C */ swc1 $f0, 0x1c($a0) -/* 0427A4 80041BA4 E480002C */ swc1 $f0, 0x2c($a0) -/* 0427A8 80041BA8 E4820028 */ swc1 $f2, 0x28($a0) -/* 0427AC 80041BAC E482003C */ swc1 $f2, 0x3c($a0) -/* 0427B0 80041BB0 E48C0000 */ swc1 $f12, ($a0) -/* 0427B4 80041BB4 03E00008 */ jr $ra -/* 0427B8 80041BB8 E48C0014 */ swc1 $f12, 0x14($a0) diff --git a/asm/non_matchings/code_80040E50/func_80041BBC.s b/asm/non_matchings/code_80040E50/func_80041BBC.s deleted file mode 100644 index 273e10b53..000000000 --- a/asm/non_matchings/code_80040E50/func_80041BBC.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80041BBC -/* 0427BC 80041BBC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0427C0 80041BC0 AFA60028 */ sw $a2, 0x28($sp) -/* 0427C4 80041BC4 00803025 */ move $a2, $a0 -/* 0427C8 80041BC8 AFBF0014 */ sw $ra, 0x14($sp) -/* 0427CC 80041BCC AFA40020 */ sw $a0, 0x20($sp) -/* 0427D0 80041BD0 AFA50024 */ sw $a1, 0x24($sp) -/* 0427D4 80041BD4 97A40026 */ lhu $a0, 0x26($sp) -/* 0427D8 80041BD8 0C0AE006 */ jal sins -/* 0427DC 80041BDC AFA60020 */ sw $a2, 0x20($sp) -/* 0427E0 80041BE0 97A40026 */ lhu $a0, 0x26($sp) -/* 0427E4 80041BE4 0C0AE00E */ jal coss -/* 0427E8 80041BE8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 0427EC 80041BEC C7B20028 */ lwc1 $f18, 0x28($sp) -/* 0427F0 80041BF0 8FA60020 */ lw $a2, 0x20($sp) -/* 0427F4 80041BF4 C7AE001C */ lwc1 $f14, 0x1c($sp) -/* 0427F8 80041BF8 46120302 */ mul.s $f12, $f0, $f18 -/* 0427FC 80041BFC 44801000 */ mtc1 $zero, $f2 -/* 042800 80041C00 46007107 */ neg.s $f4, $f14 -/* 042804 80041C04 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 042808 80041C08 46122182 */ mul.s $f6, $f4, $f18 -/* 04280C 80041C0C 44818000 */ mtc1 $at, $f16 -/* 042810 80041C10 E4C20020 */ swc1 $f2, 0x20($a2) -/* 042814 80041C14 46127202 */ mul.s $f8, $f14, $f18 -/* 042818 80041C18 E4CC0000 */ swc1 $f12, ($a2) -/* 04281C 80041C1C E4CC0014 */ swc1 $f12, 0x14($a2) -/* 042820 80041C20 E4C20024 */ swc1 $f2, 0x24($a2) -/* 042824 80041C24 E4C60010 */ swc1 $f6, 0x10($a2) -/* 042828 80041C28 E4C20008 */ swc1 $f2, 8($a2) -/* 04282C 80041C2C E4C20018 */ swc1 $f2, 0x18($a2) -/* 042830 80041C30 E4C80004 */ swc1 $f8, 4($a2) -/* 042834 80041C34 E4C20038 */ swc1 $f2, 0x38($a2) -/* 042838 80041C38 E4C2000C */ swc1 $f2, 0xc($a2) -/* 04283C 80041C3C E4C2001C */ swc1 $f2, 0x1c($a2) -/* 042840 80041C40 E4C2002C */ swc1 $f2, 0x2c($a2) -/* 042844 80041C44 E4D00030 */ swc1 $f16, 0x30($a2) -/* 042848 80041C48 E4D00034 */ swc1 $f16, 0x34($a2) -/* 04284C 80041C4C E4D00028 */ swc1 $f16, 0x28($a2) -/* 042850 80041C50 E4D0003C */ swc1 $f16, 0x3c($a2) -/* 042854 80041C54 8FBF0014 */ lw $ra, 0x14($sp) -/* 042858 80041C58 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04285C 80041C5C 03E00008 */ jr $ra -/* 042860 80041C60 00000000 */ nop diff --git a/asm/non_matchings/code_80040E50/func_80041C64.s b/asm/non_matchings/code_80040E50/func_80041C64.s deleted file mode 100644 index 486146bb6..000000000 --- a/asm/non_matchings/code_80040E50/func_80041C64.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_80041C64 -/* 042864 80041C64 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 042868 80041C68 AFB00018 */ sw $s0, 0x18($sp) -/* 04286C 80041C6C 00808025 */ move $s0, $a0 -/* 042870 80041C70 AFBF001C */ sw $ra, 0x1c($sp) -/* 042874 80041C74 AFA70034 */ sw $a3, 0x34($sp) -/* 042878 80041C78 AFA5002C */ sw $a1, 0x2c($sp) -/* 04287C 80041C7C AFA60030 */ sw $a2, 0x30($sp) -/* 042880 80041C80 0C0AE006 */ jal sins -/* 042884 80041C84 97A40036 */ lhu $a0, 0x36($sp) -/* 042888 80041C88 97A40036 */ lhu $a0, 0x36($sp) -/* 04288C 80041C8C 0C0AE00E */ jal coss -/* 042890 80041C90 E7A00024 */ swc1 $f0, 0x24($sp) -/* 042894 80041C94 C7AE0038 */ lwc1 $f14, 0x38($sp) -/* 042898 80041C98 C7B00024 */ lwc1 $f16, 0x24($sp) -/* 04289C 80041C9C 44801000 */ mtc1 $zero, $f2 -/* 0428A0 80041CA0 460E0302 */ mul.s $f12, $f0, $f14 -/* 0428A4 80041CA4 46008107 */ neg.s $f4, $f16 -/* 0428A8 80041CA8 E6020020 */ swc1 $f2, 0x20($s0) -/* 0428AC 80041CAC 460E2182 */ mul.s $f6, $f4, $f14 -/* 0428B0 80041CB0 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 0428B4 80041CB4 44819000 */ mtc1 $at, $f18 -/* 0428B8 80041CB8 460E8102 */ mul.s $f4, $f16, $f14 -/* 0428BC 80041CBC E60C0000 */ swc1 $f12, ($s0) -/* 0428C0 80041CC0 E6060010 */ swc1 $f6, 0x10($s0) -/* 0428C4 80041CC4 8FAE002C */ lw $t6, 0x2c($sp) -/* 0428C8 80041CC8 E60C0014 */ swc1 $f12, 0x14($s0) -/* 0428CC 80041CCC E6040004 */ swc1 $f4, 4($s0) -/* 0428D0 80041CD0 448E4000 */ mtc1 $t6, $f8 -/* 0428D4 80041CD4 E6020024 */ swc1 $f2, 0x24($s0) -/* 0428D8 80041CD8 468042A0 */ cvt.s.w $f10, $f8 -/* 0428DC 80041CDC E60A0030 */ swc1 $f10, 0x30($s0) -/* 0428E0 80041CE0 8FAF0030 */ lw $t7, 0x30($sp) -/* 0428E4 80041CE4 E6020008 */ swc1 $f2, 8($s0) -/* 0428E8 80041CE8 E6020018 */ swc1 $f2, 0x18($s0) -/* 0428EC 80041CEC 448F3000 */ mtc1 $t7, $f6 -/* 0428F0 80041CF0 E6020038 */ swc1 $f2, 0x38($s0) -/* 0428F4 80041CF4 E602000C */ swc1 $f2, 0xc($s0) -/* 0428F8 80041CF8 46803220 */ cvt.s.w $f8, $f6 -/* 0428FC 80041CFC E602001C */ swc1 $f2, 0x1c($s0) -/* 042900 80041D00 E602002C */ swc1 $f2, 0x2c($s0) -/* 042904 80041D04 E6120028 */ swc1 $f18, 0x28($s0) -/* 042908 80041D08 E612003C */ swc1 $f18, 0x3c($s0) -/* 04290C 80041D0C E6080034 */ swc1 $f8, 0x34($s0) -/* 042910 80041D10 8FBF001C */ lw $ra, 0x1c($sp) -/* 042914 80041D14 8FB00018 */ lw $s0, 0x18($sp) -/* 042918 80041D18 27BD0028 */ addiu $sp, $sp, 0x28 -/* 04291C 80041D1C 03E00008 */ jr $ra -/* 042920 80041D20 00000000 */ nop diff --git a/asm/non_matchings/code_80040E50/func_80041D24.s b/asm/non_matchings/code_80040E50/func_80041D24.s deleted file mode 100644 index a1284db01..000000000 --- a/asm/non_matchings/code_80040E50/func_80041D24.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80041D24 -/* 042924 80041D24 240E0001 */ li $t6, 1 -/* 042928 80041D28 3C018016 */ lui $at, %hi(D_801658FE) # 0x8016 -/* 04292C 80041D2C 03E00008 */ jr $ra -/* 042930 80041D30 A02E58FE */ sb $t6, %lo(D_801658FE)($at) # 0x58fe($at) diff --git a/asm/non_matchings/code_80040E50/func_80041D34.s b/asm/non_matchings/code_80040E50/func_80041D34.s deleted file mode 100644 index 1e8b1ea63..000000000 --- a/asm/non_matchings/code_80040E50/func_80041D34.s +++ /dev/null @@ -1,119 +0,0 @@ -glabel func_80041D34 -/* 042934 80041D34 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 042938 80041D38 44811000 */ mtc1 $at, $f2 -/* 04293C 80041D3C 3C01BF80 */ li $at, 0xBF800000 # -1.000000 -/* 042940 80041D40 44816000 */ mtc1 $at, $f12 -/* 042944 80041D44 3C0143A0 */ li $at, 0x43A00000 # 320.000000 -/* 042948 80041D48 44817000 */ mtc1 $at, $f14 -/* 04294C 80041D4C 3C014370 */ li $at, 0x43700000 # 240.000000 -/* 042950 80041D50 44818000 */ mtc1 $at, $f16 -/* 042954 80041D54 44800000 */ mtc1 $zero, $f0 -/* 042958 80041D58 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 04295C 80041D5C AFBF0024 */ sw $ra, 0x24($sp) -/* 042960 80041D60 3C048018 */ lui $a0, %hi(D_80183D60) # $a0, 0x8018 -/* 042964 80041D64 44067000 */ mfc1 $a2, $f14 -/* 042968 80041D68 44078000 */ mfc1 $a3, $f16 -/* 04296C 80041D6C 44050000 */ mfc1 $a1, $f0 -/* 042970 80041D70 24843D60 */ addiu $a0, %lo(D_80183D60) # addiu $a0, $a0, 0x3d60 -/* 042974 80041D74 E7A20018 */ swc1 $f2, 0x18($sp) -/* 042978 80041D78 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 04297C 80041D7C E7AC0014 */ swc1 $f12, 0x14($sp) -/* 042980 80041D80 0C0338A9 */ jal guOrtho -/* 042984 80041D84 E7A00010 */ swc1 $f0, 0x10($sp) -/* 042988 80041D88 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 04298C 80041D8C 44811000 */ mtc1 $at, $f2 -/* 042990 80041D90 3C01BF80 */ li $at, 0xBF800000 # -1.000000 -/* 042994 80041D94 44816000 */ mtc1 $at, $f12 -/* 042998 80041D98 3C0143A0 */ li $at, 0x43A00000 # 320.000000 -/* 04299C 80041D9C 3C02800E */ lui $v0, %hi(gActiveScreenMode) # $v0, 0x800e -/* 0429A0 80041DA0 8C42C52C */ lw $v0, %lo(gActiveScreenMode)($v0) -/* 0429A4 80041DA4 44817000 */ mtc1 $at, $f14 -/* 0429A8 80041DA8 3C014370 */ li $at, 0x43700000 # 240.000000 -/* 0429AC 80041DAC 44818000 */ mtc1 $at, $f16 -/* 0429B0 80041DB0 44800000 */ mtc1 $zero, $f0 -/* 0429B4 80041DB4 1040000C */ beqz $v0, .L80041DE8 -/* 0429B8 80041DB8 3C048015 */ lui $a0, %hi(gGfxPool) # 0x8015 -/* 0429BC 80041DBC 24010001 */ li $at, 1 -/* 0429C0 80041DC0 10410021 */ beq $v0, $at, .L80041E48 -/* 0429C4 80041DC4 3C0E8016 */ lui $t6, %hi(D_801658FE) # $t6, 0x8016 -/* 0429C8 80041DC8 24010002 */ li $at, 2 -/* 0429CC 80041DCC 10410012 */ beq $v0, $at, .L80041E18 -/* 0429D0 80041DD0 3C048015 */ lui $a0, %hi(gGfxPool) # 0x8015 -/* 0429D4 80041DD4 24010003 */ li $at, 3 -/* 0429D8 80041DD8 10410038 */ beq $v0, $at, .L80041EBC -/* 0429DC 80041DDC 3C048015 */ lui $a0, %hi(gGfxPool) # $a0, 0x8015 -/* 0429E0 80041DE0 10000041 */ b .L80041EE8 -/* 0429E4 80041DE4 8FBF0024 */ lw $ra, 0x24($sp) -.L80041DE8: -/* 0429E8 80041DE8 8C84EF40 */ lw $a0, %lo(gGfxPool)($a0) -/* 0429EC 80041DEC 44050000 */ mfc1 $a1, $f0 -/* 0429F0 80041DF0 44067000 */ mfc1 $a2, $f14 -/* 0429F4 80041DF4 44078000 */ mfc1 $a3, $f16 -/* 0429F8 80041DF8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 0429FC 80041DFC E7AC0014 */ swc1 $f12, 0x14($sp) -/* 042A00 80041E00 E7A20018 */ swc1 $f2, 0x18($sp) -/* 042A04 80041E04 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 042A08 80041E08 0C0338A9 */ jal guOrtho -/* 042A0C 80041E0C 24840140 */ addiu $a0, $a0, 0x140 -/* 042A10 80041E10 10000035 */ b .L80041EE8 -/* 042A14 80041E14 8FBF0024 */ lw $ra, 0x24($sp) -.L80041E18: -/* 042A18 80041E18 8C84EF40 */ lw $a0, %lo(gGfxPool)($a0) # -0x10c0($a0) -/* 042A1C 80041E1C 44050000 */ mfc1 $a1, $f0 -/* 042A20 80041E20 3C064320 */ lui $a2, 0x4320 -/* 042A24 80041E24 3C0742F0 */ lui $a3, 0x42f0 -/* 042A28 80041E28 E7A00010 */ swc1 $f0, 0x10($sp) -/* 042A2C 80041E2C E7AC0014 */ swc1 $f12, 0x14($sp) -/* 042A30 80041E30 E7A20018 */ swc1 $f2, 0x18($sp) -/* 042A34 80041E34 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 042A38 80041E38 0C0338A9 */ jal guOrtho -/* 042A3C 80041E3C 24840140 */ addiu $a0, $a0, 0x140 -/* 042A40 80041E40 10000029 */ b .L80041EE8 -/* 042A44 80041E44 8FBF0024 */ lw $ra, 0x24($sp) -.L80041E48: -/* 042A48 80041E48 81CE58FE */ lb $t6, %lo(D_801658FE)($t6) -/* 042A4C 80041E4C 3C0742F0 */ lui $a3, 0x42f0 -/* 042A50 80041E50 3C048015 */ lui $a0, %hi(gGfxPool) # 0x8015 -/* 042A54 80041E54 15C0000D */ bnez $t6, .L80041E8C -/* 042A58 80041E58 00000000 */ nop -/* 042A5C 80041E5C 3C048015 */ lui $a0, %hi(gGfxPool) # $a0, 0x8015 -/* 042A60 80041E60 8C84EF40 */ lw $a0, %lo(gGfxPool)($a0) -/* 042A64 80041E64 44050000 */ mfc1 $a1, $f0 -/* 042A68 80041E68 44067000 */ mfc1 $a2, $f14 -/* 042A6C 80041E6C E7A00010 */ swc1 $f0, 0x10($sp) -/* 042A70 80041E70 E7AC0014 */ swc1 $f12, 0x14($sp) -/* 042A74 80041E74 E7A20018 */ swc1 $f2, 0x18($sp) -/* 042A78 80041E78 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 042A7C 80041E7C 0C0338A9 */ jal guOrtho -/* 042A80 80041E80 24840140 */ addiu $a0, $a0, 0x140 -/* 042A84 80041E84 10000018 */ b .L80041EE8 -/* 042A88 80041E88 8FBF0024 */ lw $ra, 0x24($sp) -.L80041E8C: -/* 042A8C 80041E8C 8C84EF40 */ lw $a0, %lo(gGfxPool)($a0) # -0x10c0($a0) -/* 042A90 80041E90 44050000 */ mfc1 $a1, $f0 -/* 042A94 80041E94 44067000 */ mfc1 $a2, $f14 -/* 042A98 80041E98 44078000 */ mfc1 $a3, $f16 -/* 042A9C 80041E9C E7A00010 */ swc1 $f0, 0x10($sp) -/* 042AA0 80041EA0 E7AC0014 */ swc1 $f12, 0x14($sp) -/* 042AA4 80041EA4 E7A20018 */ swc1 $f2, 0x18($sp) -/* 042AA8 80041EA8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 042AAC 80041EAC 0C0338A9 */ jal guOrtho -/* 042AB0 80041EB0 24840140 */ addiu $a0, $a0, 0x140 -/* 042AB4 80041EB4 1000000C */ b .L80041EE8 -/* 042AB8 80041EB8 8FBF0024 */ lw $ra, 0x24($sp) -.L80041EBC: -/* 042ABC 80041EBC 8C84EF40 */ lw $a0, %lo(gGfxPool)($a0) # -0x10c0($a0) -/* 042AC0 80041EC0 44050000 */ mfc1 $a1, $f0 -/* 042AC4 80041EC4 44067000 */ mfc1 $a2, $f14 -/* 042AC8 80041EC8 44078000 */ mfc1 $a3, $f16 -/* 042ACC 80041ECC E7A00010 */ swc1 $f0, 0x10($sp) -/* 042AD0 80041ED0 E7AC0014 */ swc1 $f12, 0x14($sp) -/* 042AD4 80041ED4 E7A20018 */ swc1 $f2, 0x18($sp) -/* 042AD8 80041ED8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 042ADC 80041EDC 0C0338A9 */ jal guOrtho -/* 042AE0 80041EE0 24840140 */ addiu $a0, $a0, 0x140 -/* 042AE4 80041EE4 8FBF0024 */ lw $ra, 0x24($sp) -.L80041EE8: -/* 042AE8 80041EE8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 042AEC 80041EEC 03E00008 */ jr $ra -/* 042AF0 80041EF0 00000000 */ nop diff --git a/asm/non_matchings/code_80040E50/func_80041F54.s b/asm/non_matchings/code_80040E50/func_80041F54.s deleted file mode 100644 index 7f435ac84..000000000 --- a/asm/non_matchings/code_80040E50/func_80041F54.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80041F54 -/* 042B54 80041F54 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 042B58 80041F58 00A03025 */ move $a2, $a1 -/* 042B5C 80041F5C 00802825 */ move $a1, $a0 -/* 042B60 80041F60 AFBF0014 */ sw $ra, 0x14($sp) -/* 042B64 80041F64 AFA40060 */ sw $a0, 0x60($sp) -/* 042B68 80041F68 0C01069E */ jal func_80041A78 -/* 042B6C 80041F6C 27A40020 */ addiu $a0, $sp, 0x20 -/* 042B70 80041F70 3C068019 */ lui $a2, %hi(D_8018D120) # $a2, 0x8019 -/* 042B74 80041F74 24C6D120 */ addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0 -/* 042B78 80041F78 8CCF0000 */ lw $t7, ($a2) -/* 042B7C 80041F7C 3C0E8015 */ lui $t6, %hi(gGfxPool) # $t6, 0x8015 -/* 042B80 80041F80 8DCEEF40 */ lw $t6, %lo(gGfxPool)($t6) -/* 042B84 80041F84 000FC180 */ sll $t8, $t7, 6 -/* 042B88 80041F88 27A50020 */ addiu $a1, $sp, 0x20 -/* 042B8C 80041F8C 01D82021 */ addu $a0, $t6, $t8 -/* 042B90 80041F90 0C008860 */ jal func_80022180 -/* 042B94 80041F94 248402C0 */ addiu $a0, $a0, 0x2c0 -/* 042B98 80041F98 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015 -/* 042B9C 80041F9C 24840298 */ addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298 -/* 042BA0 80041FA0 8C830000 */ lw $v1, ($a0) -/* 042BA4 80041FA4 3C080102 */ lui $t0, (0x01020040 >> 16) # lui $t0, 0x102 -/* 042BA8 80041FA8 3C068019 */ lui $a2, %hi(D_8018D120) # $a2, 0x8019 -/* 042BAC 80041FAC 24790008 */ addiu $t9, $v1, 8 -/* 042BB0 80041FB0 AC990000 */ sw $t9, ($a0) -/* 042BB4 80041FB4 35080040 */ ori $t0, (0x01020040 & 0xFFFF) # ori $t0, $t0, 0x40 -/* 042BB8 80041FB8 24C6D120 */ addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0 -/* 042BBC 80041FBC AC680000 */ sw $t0, ($v1) -/* 042BC0 80041FC0 8CCA0000 */ lw $t2, ($a2) -/* 042BC4 80041FC4 3C098015 */ lui $t1, %hi(gGfxPool) # $t1, 0x8015 -/* 042BC8 80041FC8 8D29EF40 */ lw $t1, %lo(gGfxPool)($t1) -/* 042BCC 80041FCC 000A5980 */ sll $t3, $t2, 6 -/* 042BD0 80041FD0 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 042BD4 80041FD4 012B6021 */ addu $t4, $t1, $t3 -/* 042BD8 80041FD8 258D02C0 */ addiu $t5, $t4, 0x2c0 -/* 042BDC 80041FDC 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 042BE0 80041FE0 01A17824 */ and $t7, $t5, $at -/* 042BE4 80041FE4 AC6F0004 */ sw $t7, 4($v1) -/* 042BE8 80041FE8 8CCE0000 */ lw $t6, ($a2) -/* 042BEC 80041FEC 8FBF0014 */ lw $ra, 0x14($sp) -/* 042BF0 80041FF0 27BD0060 */ addiu $sp, $sp, 0x60 -/* 042BF4 80041FF4 25D80001 */ addiu $t8, $t6, 1 -/* 042BF8 80041FF8 03E00008 */ jr $ra -/* 042BFC 80041FFC ACD80000 */ sw $t8, ($a2) diff --git a/asm/non_matchings/code_80040E50/func_80042000.s b/asm/non_matchings/code_80040E50/func_80042000.s deleted file mode 100644 index d72e35cc3..000000000 --- a/asm/non_matchings/code_80040E50/func_80042000.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80042000 -/* 042C00 80042000 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 042C04 80042004 AFBF0014 */ sw $ra, 0x14($sp) -/* 042C08 80042008 AFA40060 */ sw $a0, 0x60($sp) -/* 042C0C 8004200C 3085FFFF */ andi $a1, $a0, 0xffff -/* 042C10 80042010 0C0106B6 */ jal func_80041AD8 -/* 042C14 80042014 27A40020 */ addiu $a0, $sp, 0x20 -/* 042C18 80042018 3C068019 */ lui $a2, %hi(D_8018D120) # $a2, 0x8019 -/* 042C1C 8004201C 24C6D120 */ addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0 -/* 042C20 80042020 8CCF0000 */ lw $t7, ($a2) -/* 042C24 80042024 3C0E8015 */ lui $t6, %hi(gGfxPool) # $t6, 0x8015 -/* 042C28 80042028 8DCEEF40 */ lw $t6, %lo(gGfxPool)($t6) -/* 042C2C 8004202C 000FC180 */ sll $t8, $t7, 6 -/* 042C30 80042030 27A50020 */ addiu $a1, $sp, 0x20 -/* 042C34 80042034 01D82021 */ addu $a0, $t6, $t8 -/* 042C38 80042038 0C008860 */ jal func_80022180 -/* 042C3C 8004203C 248402C0 */ addiu $a0, $a0, 0x2c0 -/* 042C40 80042040 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015 -/* 042C44 80042044 24840298 */ addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298 -/* 042C48 80042048 8C830000 */ lw $v1, ($a0) -/* 042C4C 8004204C 3C080102 */ lui $t0, (0x01020040 >> 16) # lui $t0, 0x102 -/* 042C50 80042050 3C068019 */ lui $a2, %hi(D_8018D120) # $a2, 0x8019 -/* 042C54 80042054 24790008 */ addiu $t9, $v1, 8 -/* 042C58 80042058 AC990000 */ sw $t9, ($a0) -/* 042C5C 8004205C 35080040 */ ori $t0, (0x01020040 & 0xFFFF) # ori $t0, $t0, 0x40 -/* 042C60 80042060 24C6D120 */ addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0 -/* 042C64 80042064 AC680000 */ sw $t0, ($v1) -/* 042C68 80042068 8CCA0000 */ lw $t2, ($a2) -/* 042C6C 8004206C 3C098015 */ lui $t1, %hi(gGfxPool) # $t1, 0x8015 -/* 042C70 80042070 8D29EF40 */ lw $t1, %lo(gGfxPool)($t1) -/* 042C74 80042074 000A5980 */ sll $t3, $t2, 6 -/* 042C78 80042078 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 042C7C 8004207C 012B6021 */ addu $t4, $t1, $t3 -/* 042C80 80042080 258D02C0 */ addiu $t5, $t4, 0x2c0 -/* 042C84 80042084 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 042C88 80042088 01A17824 */ and $t7, $t5, $at -/* 042C8C 8004208C AC6F0004 */ sw $t7, 4($v1) -/* 042C90 80042090 8CCE0000 */ lw $t6, ($a2) -/* 042C94 80042094 8FBF0014 */ lw $ra, 0x14($sp) -/* 042C98 80042098 27BD0060 */ addiu $sp, $sp, 0x60 -/* 042C9C 8004209C 25D80001 */ addiu $t8, $t6, 1 -/* 042CA0 800420A0 03E00008 */ jr $ra -/* 042CA4 800420A4 ACD80000 */ sw $t8, ($a2) diff --git a/asm/non_matchings/code_80040E50/func_800420A8.s b/asm/non_matchings/code_80040E50/func_800420A8.s deleted file mode 100644 index c1257af02..000000000 --- a/asm/non_matchings/code_80040E50/func_800420A8.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_800420A8 -/* 042CA8 800420A8 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 042CAC 800420AC AFBF0014 */ sw $ra, 0x14($sp) -/* 042CB0 800420B0 44056000 */ mfc1 $a1, $f12 -/* 042CB4 800420B4 0C0106DA */ jal func_80041B68 -/* 042CB8 800420B8 27A40020 */ addiu $a0, $sp, 0x20 -/* 042CBC 800420BC 3C068019 */ lui $a2, %hi(D_8018D120) # $a2, 0x8019 -/* 042CC0 800420C0 24C6D120 */ addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0 -/* 042CC4 800420C4 8CCF0000 */ lw $t7, ($a2) -/* 042CC8 800420C8 3C0E8015 */ lui $t6, %hi(gGfxPool) # $t6, 0x8015 -/* 042CCC 800420CC 8DCEEF40 */ lw $t6, %lo(gGfxPool)($t6) -/* 042CD0 800420D0 000FC180 */ sll $t8, $t7, 6 -/* 042CD4 800420D4 27A50020 */ addiu $a1, $sp, 0x20 -/* 042CD8 800420D8 01D82021 */ addu $a0, $t6, $t8 -/* 042CDC 800420DC 0C008860 */ jal func_80022180 -/* 042CE0 800420E0 248402C0 */ addiu $a0, $a0, 0x2c0 -/* 042CE4 800420E4 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015 -/* 042CE8 800420E8 24840298 */ addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298 -/* 042CEC 800420EC 8C830000 */ lw $v1, ($a0) -/* 042CF0 800420F0 3C080102 */ lui $t0, (0x01020040 >> 16) # lui $t0, 0x102 -/* 042CF4 800420F4 3C068019 */ lui $a2, %hi(D_8018D120) # $a2, 0x8019 -/* 042CF8 800420F8 24790008 */ addiu $t9, $v1, 8 -/* 042CFC 800420FC AC990000 */ sw $t9, ($a0) -/* 042D00 80042100 35080040 */ ori $t0, (0x01020040 & 0xFFFF) # ori $t0, $t0, 0x40 -/* 042D04 80042104 24C6D120 */ addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0 -/* 042D08 80042108 AC680000 */ sw $t0, ($v1) -/* 042D0C 8004210C 8CCA0000 */ lw $t2, ($a2) -/* 042D10 80042110 3C098015 */ lui $t1, %hi(gGfxPool) # $t1, 0x8015 -/* 042D14 80042114 8D29EF40 */ lw $t1, %lo(gGfxPool)($t1) -/* 042D18 80042118 000A5980 */ sll $t3, $t2, 6 -/* 042D1C 8004211C 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 042D20 80042120 012B6021 */ addu $t4, $t1, $t3 -/* 042D24 80042124 258D02C0 */ addiu $t5, $t4, 0x2c0 -/* 042D28 80042128 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 042D2C 8004212C 01A17824 */ and $t7, $t5, $at -/* 042D30 80042130 AC6F0004 */ sw $t7, 4($v1) -/* 042D34 80042134 8CCE0000 */ lw $t6, ($a2) -/* 042D38 80042138 8FBF0014 */ lw $ra, 0x14($sp) -/* 042D3C 8004213C 27BD0060 */ addiu $sp, $sp, 0x60 -/* 042D40 80042140 25D80001 */ addiu $t8, $t6, 1 -/* 042D44 80042144 03E00008 */ jr $ra -/* 042D48 80042148 ACD80000 */ sw $t8, ($a2) diff --git a/asm/non_matchings/code_80040E50/func_8004214C.s b/asm/non_matchings/code_80040E50/func_8004214C.s deleted file mode 100644 index 75cda0440..000000000 --- a/asm/non_matchings/code_80040E50/func_8004214C.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_8004214C -/* 042D4C 8004214C 44856000 */ mtc1 $a1, $f12 -/* 042D50 80042150 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 042D54 80042154 AFBF0014 */ sw $ra, 0x14($sp) -/* 042D58 80042158 AFA40060 */ sw $a0, 0x60($sp) -/* 042D5C 8004215C 44066000 */ mfc1 $a2, $f12 -/* 042D60 80042160 97A50062 */ lhu $a1, 0x62($sp) -/* 042D64 80042164 0C0106EF */ jal func_80041BBC -/* 042D68 80042168 27A40020 */ addiu $a0, $sp, 0x20 -/* 042D6C 8004216C 3C068019 */ lui $a2, %hi(D_8018D120) # $a2, 0x8019 -/* 042D70 80042170 24C6D120 */ addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0 -/* 042D74 80042174 8CCF0000 */ lw $t7, ($a2) -/* 042D78 80042178 3C0E8015 */ lui $t6, %hi(gGfxPool) # $t6, 0x8015 -/* 042D7C 8004217C 8DCEEF40 */ lw $t6, %lo(gGfxPool)($t6) -/* 042D80 80042180 000FC180 */ sll $t8, $t7, 6 -/* 042D84 80042184 27A50020 */ addiu $a1, $sp, 0x20 -/* 042D88 80042188 01D82021 */ addu $a0, $t6, $t8 -/* 042D8C 8004218C 0C008860 */ jal func_80022180 -/* 042D90 80042190 248402C0 */ addiu $a0, $a0, 0x2c0 -/* 042D94 80042194 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015 -/* 042D98 80042198 24840298 */ addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298 -/* 042D9C 8004219C 8C830000 */ lw $v1, ($a0) -/* 042DA0 800421A0 3C080102 */ lui $t0, (0x01020040 >> 16) # lui $t0, 0x102 -/* 042DA4 800421A4 3C068019 */ lui $a2, %hi(D_8018D120) # $a2, 0x8019 -/* 042DA8 800421A8 24790008 */ addiu $t9, $v1, 8 -/* 042DAC 800421AC AC990000 */ sw $t9, ($a0) -/* 042DB0 800421B0 35080040 */ ori $t0, (0x01020040 & 0xFFFF) # ori $t0, $t0, 0x40 -/* 042DB4 800421B4 24C6D120 */ addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0 -/* 042DB8 800421B8 AC680000 */ sw $t0, ($v1) -/* 042DBC 800421BC 8CCA0000 */ lw $t2, ($a2) -/* 042DC0 800421C0 3C098015 */ lui $t1, %hi(gGfxPool) # $t1, 0x8015 -/* 042DC4 800421C4 8D29EF40 */ lw $t1, %lo(gGfxPool)($t1) -/* 042DC8 800421C8 000A5980 */ sll $t3, $t2, 6 -/* 042DCC 800421CC 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 042DD0 800421D0 012B6021 */ addu $t4, $t1, $t3 -/* 042DD4 800421D4 258D02C0 */ addiu $t5, $t4, 0x2c0 -/* 042DD8 800421D8 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 042DDC 800421DC 01A17824 */ and $t7, $t5, $at -/* 042DE0 800421E0 AC6F0004 */ sw $t7, 4($v1) -/* 042DE4 800421E4 8CCE0000 */ lw $t6, ($a2) -/* 042DE8 800421E8 8FBF0014 */ lw $ra, 0x14($sp) -/* 042DEC 800421EC 27BD0060 */ addiu $sp, $sp, 0x60 -/* 042DF0 800421F0 25D80001 */ addiu $t8, $t6, 1 -/* 042DF4 800421F4 03E00008 */ jr $ra -/* 042DF8 800421F8 ACD80000 */ sw $t8, ($a2) diff --git a/asm/non_matchings/code_80040E50/func_800421FC.s b/asm/non_matchings/code_80040E50/func_800421FC.s deleted file mode 100644 index b57951f40..000000000 --- a/asm/non_matchings/code_80040E50/func_800421FC.s +++ /dev/null @@ -1,78 +0,0 @@ -glabel func_800421FC -/* 042DFC 800421FC 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 042E00 80042200 AFA50074 */ sw $a1, 0x74($sp) -/* 042E04 80042204 00802825 */ move $a1, $a0 -/* 042E08 80042208 AFBF001C */ sw $ra, 0x1c($sp) -/* 042E0C 8004220C AFA40070 */ sw $a0, 0x70($sp) -/* 042E10 80042210 AFA60078 */ sw $a2, 0x78($sp) -/* 042E14 80042214 8FA60074 */ lw $a2, 0x74($sp) -/* 042E18 80042218 AFB00018 */ sw $s0, 0x18($sp) -/* 042E1C 8004221C 0C01069E */ jal func_80041A78 -/* 042E20 80042220 27A40030 */ addiu $a0, $sp, 0x30 -/* 042E24 80042224 3C108019 */ lui $s0, %hi(D_8018D120) # $s0, 0x8019 -/* 042E28 80042228 2610D120 */ addiu $s0, %lo(D_8018D120) # addiu $s0, $s0, -0x2ee0 -/* 042E2C 8004222C 8E0F0000 */ lw $t7, ($s0) -/* 042E30 80042230 3C0E8015 */ lui $t6, %hi(gGfxPool) # $t6, 0x8015 -/* 042E34 80042234 8DCEEF40 */ lw $t6, %lo(gGfxPool)($t6) -/* 042E38 80042238 000FC180 */ sll $t8, $t7, 6 -/* 042E3C 8004223C 27A50030 */ addiu $a1, $sp, 0x30 -/* 042E40 80042240 01D82021 */ addu $a0, $t6, $t8 -/* 042E44 80042244 0C008860 */ jal func_80022180 -/* 042E48 80042248 248402C0 */ addiu $a0, $a0, 0x2c0 -/* 042E4C 8004224C 3C068015 */ lui $a2, %hi(gDisplayListHead) # $a2, 0x8015 -/* 042E50 80042250 24C60298 */ addiu $a2, %lo(gDisplayListHead) # addiu $a2, $a2, 0x298 -/* 042E54 80042254 8CC30000 */ lw $v1, ($a2) -/* 042E58 80042258 3C080102 */ lui $t0, (0x01020040 >> 16) # lui $t0, 0x102 -/* 042E5C 8004225C 35080040 */ ori $t0, (0x01020040 & 0xFFFF) # ori $t0, $t0, 0x40 -/* 042E60 80042260 24790008 */ addiu $t9, $v1, 8 -/* 042E64 80042264 ACD90000 */ sw $t9, ($a2) -/* 042E68 80042268 AC680000 */ sw $t0, ($v1) -/* 042E6C 8004226C 8E0A0000 */ lw $t2, ($s0) -/* 042E70 80042270 3C098015 */ lui $t1, %hi(gGfxPool) # $t1, 0x8015 -/* 042E74 80042274 8D29EF40 */ lw $t1, %lo(gGfxPool)($t1) -/* 042E78 80042278 000A5980 */ sll $t3, $t2, 6 -/* 042E7C 8004227C 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 042E80 80042280 012B6021 */ addu $t4, $t1, $t3 -/* 042E84 80042284 258D02C0 */ addiu $t5, $t4, 0x2c0 -/* 042E88 80042288 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 042E8C 8004228C 01A17824 */ and $t7, $t5, $at -/* 042E90 80042290 AC6F0004 */ sw $t7, 4($v1) -/* 042E94 80042294 8E0E0000 */ lw $t6, ($s0) -/* 042E98 80042298 8FA50078 */ lw $a1, 0x78($sp) -/* 042E9C 8004229C 27A40030 */ addiu $a0, $sp, 0x30 -/* 042EA0 800422A0 25D80001 */ addiu $t8, $t6, 1 -/* 042EA4 800422A4 0C0106DA */ jal func_80041B68 -/* 042EA8 800422A8 AE180000 */ sw $t8, ($s0) -/* 042EAC 800422AC 8E080000 */ lw $t0, ($s0) -/* 042EB0 800422B0 3C198015 */ lui $t9, %hi(gGfxPool) # $t9, 0x8015 -/* 042EB4 800422B4 8F39EF40 */ lw $t9, %lo(gGfxPool)($t9) -/* 042EB8 800422B8 00085180 */ sll $t2, $t0, 6 -/* 042EBC 800422BC 27A50030 */ addiu $a1, $sp, 0x30 -/* 042EC0 800422C0 032A2021 */ addu $a0, $t9, $t2 -/* 042EC4 800422C4 0C008860 */ jal func_80022180 -/* 042EC8 800422C8 248402C0 */ addiu $a0, $a0, 0x2c0 -/* 042ECC 800422CC 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015 -/* 042ED0 800422D0 24840298 */ addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298 -/* 042ED4 800422D4 8C830000 */ lw $v1, ($a0) -/* 042ED8 800422D8 3C0B0100 */ lui $t3, (0x01000040 >> 16) # lui $t3, 0x100 -/* 042EDC 800422DC 356B0040 */ ori $t3, (0x01000040 & 0xFFFF) # ori $t3, $t3, 0x40 -/* 042EE0 800422E0 24690008 */ addiu $t1, $v1, 8 -/* 042EE4 800422E4 AC890000 */ sw $t1, ($a0) -/* 042EE8 800422E8 AC6B0000 */ sw $t3, ($v1) -/* 042EEC 800422EC 8E0D0000 */ lw $t5, ($s0) -/* 042EF0 800422F0 3C0C8015 */ lui $t4, %hi(gGfxPool) # $t4, 0x8015 -/* 042EF4 800422F4 8D8CEF40 */ lw $t4, %lo(gGfxPool)($t4) -/* 042EF8 800422F8 000D7980 */ sll $t7, $t5, 6 -/* 042EFC 800422FC 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 042F00 80042300 018F7021 */ addu $t6, $t4, $t7 -/* 042F04 80042304 25D802C0 */ addiu $t8, $t6, 0x2c0 -/* 042F08 80042308 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 042F0C 8004230C 03014024 */ and $t0, $t8, $at -/* 042F10 80042310 AC680004 */ sw $t0, 4($v1) -/* 042F14 80042314 8E190000 */ lw $t9, ($s0) -/* 042F18 80042318 8FBF001C */ lw $ra, 0x1c($sp) -/* 042F1C 8004231C 272A0001 */ addiu $t2, $t9, 1 -/* 042F20 80042320 AE0A0000 */ sw $t2, ($s0) -/* 042F24 80042324 8FB00018 */ lw $s0, 0x18($sp) -/* 042F28 80042328 03E00008 */ jr $ra -/* 042F2C 8004232C 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/non_matchings/code_80040E50/func_80042330.s b/asm/non_matchings/code_80040E50/func_80042330.s deleted file mode 100644 index 54f197030..000000000 --- a/asm/non_matchings/code_80040E50/func_80042330.s +++ /dev/null @@ -1,171 +0,0 @@ -glabel func_80042330 -/* 042F30 80042330 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 042F34 80042334 44876000 */ mtc1 $a3, $f12 -/* 042F38 80042338 AFA5006C */ sw $a1, 0x6c($sp) -/* 042F3C 8004233C 00802825 */ move $a1, $a0 -/* 042F40 80042340 AFBF001C */ sw $ra, 0x1c($sp) -/* 042F44 80042344 AFA40068 */ sw $a0, 0x68($sp) -/* 042F48 80042348 AFA60070 */ sw $a2, 0x70($sp) -/* 042F4C 8004234C 97A70072 */ lhu $a3, 0x72($sp) -/* 042F50 80042350 8FA6006C */ lw $a2, 0x6c($sp) -/* 042F54 80042354 27A40028 */ addiu $a0, $sp, 0x28 -/* 042F58 80042358 0C010719 */ jal func_80041C64 -/* 042F5C 8004235C E7AC0010 */ swc1 $f12, 0x10($sp) -/* 042F60 80042360 3C068019 */ lui $a2, %hi(D_8018D120) # $a2, 0x8019 -/* 042F64 80042364 24C6D120 */ addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0 -/* 042F68 80042368 8CCF0000 */ lw $t7, ($a2) -/* 042F6C 8004236C 3C0E8015 */ lui $t6, %hi(gGfxPool) # $t6, 0x8015 -/* 042F70 80042370 8DCEEF40 */ lw $t6, %lo(gGfxPool)($t6) -/* 042F74 80042374 000FC180 */ sll $t8, $t7, 6 -/* 042F78 80042378 27A50028 */ addiu $a1, $sp, 0x28 -/* 042F7C 8004237C 01D82021 */ addu $a0, $t6, $t8 -/* 042F80 80042380 0C008860 */ jal func_80022180 -/* 042F84 80042384 248402C0 */ addiu $a0, $a0, 0x2c0 -/* 042F88 80042388 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015 -/* 042F8C 8004238C 24840298 */ addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298 -/* 042F90 80042390 8C830000 */ lw $v1, ($a0) -/* 042F94 80042394 3C080102 */ lui $t0, (0x01020040 >> 16) # lui $t0, 0x102 -/* 042F98 80042398 3C068019 */ lui $a2, %hi(D_8018D120) # $a2, 0x8019 -/* 042F9C 8004239C 24790008 */ addiu $t9, $v1, 8 -/* 042FA0 800423A0 AC990000 */ sw $t9, ($a0) -/* 042FA4 800423A4 35080040 */ ori $t0, (0x01020040 & 0xFFFF) # ori $t0, $t0, 0x40 -/* 042FA8 800423A8 24C6D120 */ addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0 -/* 042FAC 800423AC AC680000 */ sw $t0, ($v1) -/* 042FB0 800423B0 8CCA0000 */ lw $t2, ($a2) -/* 042FB4 800423B4 3C098015 */ lui $t1, %hi(gGfxPool) # $t1, 0x8015 -/* 042FB8 800423B8 8D29EF40 */ lw $t1, %lo(gGfxPool)($t1) -/* 042FBC 800423BC 000A5980 */ sll $t3, $t2, 6 -/* 042FC0 800423C0 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 042FC4 800423C4 012B6021 */ addu $t4, $t1, $t3 -/* 042FC8 800423C8 258D02C0 */ addiu $t5, $t4, 0x2c0 -/* 042FCC 800423CC 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 042FD0 800423D0 01A17824 */ and $t7, $t5, $at -/* 042FD4 800423D4 AC6F0004 */ sw $t7, 4($v1) -/* 042FD8 800423D8 8CCE0000 */ lw $t6, ($a2) -/* 042FDC 800423DC 8FBF001C */ lw $ra, 0x1c($sp) -/* 042FE0 800423E0 27BD0068 */ addiu $sp, $sp, 0x68 -/* 042FE4 800423E4 25D80001 */ addiu $t8, $t6, 1 -/* 042FE8 800423E8 03E00008 */ jr $ra -/* 042FEC 800423EC ACD80000 */ sw $t8, ($a2) - -/* 042FF0 800423F0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 042FF4 800423F4 AFB00020 */ sw $s0, 0x20($sp) -/* 042FF8 800423F8 00808025 */ move $s0, $a0 -/* 042FFC 800423FC AFBF0024 */ sw $ra, 0x24($sp) -/* 043000 80042400 AFA50044 */ sw $a1, 0x44($sp) -/* 043004 80042404 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 043008 80042408 AFA60048 */ sw $a2, 0x48($sp) -/* 04300C 8004240C AFA7004C */ sw $a3, 0x4c($sp) -/* 043010 80042410 0C0AE006 */ jal sins -/* 043014 80042414 97A40046 */ lhu $a0, 0x46($sp) -/* 043018 80042418 E7A0003C */ swc1 $f0, 0x3c($sp) -/* 04301C 8004241C 0C0AE00E */ jal coss -/* 043020 80042420 97A40046 */ lhu $a0, 0x46($sp) -/* 043024 80042424 46000506 */ mov.s $f20, $f0 -/* 043028 80042428 0C0AE006 */ jal sins -/* 04302C 8004242C 97A4004A */ lhu $a0, 0x4a($sp) -/* 043030 80042430 97A4004A */ lhu $a0, 0x4a($sp) -/* 043034 80042434 0C0AE00E */ jal coss -/* 043038 80042438 E7A00034 */ swc1 $f0, 0x34($sp) -/* 04303C 8004243C 97A4004E */ lhu $a0, 0x4e($sp) -/* 043040 80042440 0C0AE006 */ jal sins -/* 043044 80042444 E7A00030 */ swc1 $f0, 0x30($sp) -/* 043048 80042448 97A4004E */ lhu $a0, 0x4e($sp) -/* 04304C 8004244C 0C0AE00E */ jal coss -/* 043050 80042450 E7A0002C */ swc1 $f0, 0x2c($sp) -/* 043054 80042454 C7AE0034 */ lwc1 $f14, 0x34($sp) -/* 043058 80042458 C7A4003C */ lwc1 $f4, 0x3c($sp) -/* 04305C 8004245C C7B00030 */ lwc1 $f16, 0x30($sp) -/* 043060 80042460 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* 043064 80042464 460E2302 */ mul.s $f12, $f4, $f14 -/* 043068 80042468 46008107 */ neg.s $f4, $f16 -/* 04306C 8004246C 44809000 */ mtc1 $zero, $f18 -/* 043070 80042470 46008182 */ mul.s $f6, $f16, $f0 -/* 043074 80042474 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 043078 80042478 E6120030 */ swc1 $f18, 0x30($s0) -/* 04307C 8004247C 46026202 */ mul.s $f8, $f12, $f2 -/* 043080 80042480 46083280 */ add.s $f10, $f6, $f8 -/* 043084 80042484 46022182 */ mul.s $f6, $f4, $f2 -/* 043088 80042488 00000000 */ nop -/* 04308C 8004248C 46006202 */ mul.s $f8, $f12, $f0 -/* 043090 80042490 E60A0000 */ swc1 $f10, ($s0) -/* 043094 80042494 460EA102 */ mul.s $f4, $f20, $f14 -/* 043098 80042498 46083280 */ add.s $f10, $f6, $f8 -/* 04309C 8004249C 4602A182 */ mul.s $f6, $f20, $f2 -/* 0430A0 800424A0 E6040020 */ swc1 $f4, 0x20($s0) -/* 0430A4 800424A4 4600A202 */ mul.s $f8, $f20, $f0 -/* 0430A8 800424A8 E60A0010 */ swc1 $f10, 0x10($s0) -/* 0430AC 800424AC E6060004 */ swc1 $f6, 4($s0) -/* 0430B0 800424B0 E6080014 */ swc1 $f8, 0x14($s0) -/* 0430B4 800424B4 C7AA003C */ lwc1 $f10, 0x3c($sp) -/* 0430B8 800424B8 E6120034 */ swc1 $f18, 0x34($s0) -/* 0430BC 800424BC 46007207 */ neg.s $f8, $f14 -/* 0430C0 800424C0 46005107 */ neg.s $f4, $f10 -/* 0430C4 800424C4 E6040024 */ swc1 $f4, 0x24($s0) -/* 0430C8 800424C8 C7A6003C */ lwc1 $f6, 0x3c($sp) -/* 0430CC 800424CC E6120038 */ swc1 $f18, 0x38($s0) -/* 0430D0 800424D0 E612000C */ swc1 $f18, 0xc($s0) -/* 0430D4 800424D4 46103302 */ mul.s $f12, $f6, $f16 -/* 0430D8 800424D8 E612001C */ swc1 $f18, 0x1c($s0) -/* 0430DC 800424DC E612002C */ swc1 $f18, 0x2c($s0) -/* 0430E0 800424E0 46004282 */ mul.s $f10, $f8, $f0 -/* 0430E4 800424E4 00000000 */ nop -/* 0430E8 800424E8 46026102 */ mul.s $f4, $f12, $f2 -/* 0430EC 800424EC 46045180 */ add.s $f6, $f10, $f4 -/* 0430F0 800424F0 46027202 */ mul.s $f8, $f14, $f2 -/* 0430F4 800424F4 00000000 */ nop -/* 0430F8 800424F8 46006282 */ mul.s $f10, $f12, $f0 -/* 0430FC 800424FC E6060008 */ swc1 $f6, 8($s0) -/* 043100 80042500 4610A182 */ mul.s $f6, $f20, $f16 -/* 043104 80042504 460A4100 */ add.s $f4, $f8, $f10 -/* 043108 80042508 44814000 */ mtc1 $at, $f8 -/* 04310C 8004250C E6060028 */ swc1 $f6, 0x28($s0) -/* 043110 80042510 E6040018 */ swc1 $f4, 0x18($s0) -/* 043114 80042514 E608003C */ swc1 $f8, 0x3c($s0) -/* 043118 80042518 8FBF0024 */ lw $ra, 0x24($sp) -/* 04311C 8004251C 8FB00020 */ lw $s0, 0x20($sp) -/* 043120 80042520 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 043124 80042524 03E00008 */ jr $ra -/* 043128 80042528 27BD0040 */ addiu $sp, $sp, 0x40 - -/* 04312C 8004252C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 043130 80042530 AFB00018 */ sw $s0, 0x18($sp) -/* 043134 80042534 00808025 */ move $s0, $a0 -/* 043138 80042538 AFBF001C */ sw $ra, 0x1c($sp) -/* 04313C 8004253C AFA50034 */ sw $a1, 0x34($sp) -/* 043140 80042540 AFA60038 */ sw $a2, 0x38($sp) -/* 043144 80042544 0C0AE006 */ jal sins -/* 043148 80042548 97A40036 */ lhu $a0, 0x36($sp) -/* 04314C 8004254C E7A0002C */ swc1 $f0, 0x2c($sp) -/* 043150 80042550 0C0AE00E */ jal coss -/* 043154 80042554 97A40036 */ lhu $a0, 0x36($sp) -/* 043158 80042558 97A4003A */ lhu $a0, 0x3a($sp) -/* 04315C 8004255C 0C0AE006 */ jal sins -/* 043160 80042560 E7A00028 */ swc1 $f0, 0x28($sp) -/* 043164 80042564 97A4003A */ lhu $a0, 0x3a($sp) -/* 043168 80042568 0C0AE00E */ jal coss -/* 04316C 8004256C E7A00024 */ swc1 $f0, 0x24($sp) -/* 043170 80042570 C7AC0024 */ lwc1 $f12, 0x24($sp) -/* 043174 80042574 C7AE002C */ lwc1 $f14, 0x2c($sp) -/* 043178 80042578 C7A20028 */ lwc1 $f2, 0x28($sp) -/* 04317C 8004257C 44804000 */ mtc1 $zero, $f8 -/* 043180 80042580 460C7102 */ mul.s $f4, $f14, $f12 -/* 043184 80042584 46006407 */ neg.s $f16, $f12 -/* 043188 80042588 46007287 */ neg.s $f10, $f14 -/* 04318C 8004258C 460C1182 */ mul.s $f6, $f2, $f12 -/* 043190 80042590 E6000000 */ swc1 $f0, ($s0) -/* 043194 80042594 E60A0024 */ swc1 $f10, 0x24($s0) -/* 043198 80042598 46007482 */ mul.s $f18, $f14, $f0 -/* 04319C 8004259C E6040010 */ swc1 $f4, 0x10($s0) -/* 0431A0 800425A0 E6100008 */ swc1 $f16, 8($s0) -/* 0431A4 800425A4 46001102 */ mul.s $f4, $f2, $f0 -/* 0431A8 800425A8 E6060020 */ swc1 $f6, 0x20($s0) -/* 0431AC 800425AC E6020014 */ swc1 $f2, 0x14($s0) -/* 0431B0 800425B0 E6080004 */ swc1 $f8, 4($s0) -/* 0431B4 800425B4 E6120018 */ swc1 $f18, 0x18($s0) -/* 0431B8 800425B8 E6040028 */ swc1 $f4, 0x28($s0) -/* 0431BC 800425BC 8FBF001C */ lw $ra, 0x1c($sp) -/* 0431C0 800425C0 8FB00018 */ lw $s0, 0x18($sp) -/* 0431C4 800425C4 27BD0030 */ addiu $sp, $sp, 0x30 -/* 0431C8 800425C8 03E00008 */ jr $ra -/* 0431CC 800425CC 00000000 */ nop diff --git a/asm/non_matchings/code_80040E50/func_800425D0.s b/asm/non_matchings/code_80040E50/func_800425D0.s deleted file mode 100644 index 823db9e23..000000000 --- a/asm/non_matchings/code_80040E50/func_800425D0.s +++ /dev/null @@ -1,101 +0,0 @@ -glabel func_800425D0 -/* 0431D0 800425D0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 0431D4 800425D4 AFB00024 */ sw $s0, 0x24($sp) -/* 0431D8 800425D8 F7B40010 */ sdc1 $f20, 0x10($sp) -/* 0431DC 800425DC 4487A000 */ mtc1 $a3, $f20 -/* 0431E0 800425E0 00808025 */ move $s0, $a0 -/* 0431E4 800425E4 AFBF002C */ sw $ra, 0x2c($sp) -/* 0431E8 800425E8 AFB10028 */ sw $s1, 0x28($sp) -/* 0431EC 800425EC F7B60018 */ sdc1 $f22, 0x18($sp) -/* 0431F0 800425F0 AFA5004C */ sw $a1, 0x4c($sp) -/* 0431F4 800425F4 00C08825 */ move $s1, $a2 -/* 0431F8 800425F8 0C0AE006 */ jal sins -/* 0431FC 800425FC 94C40000 */ lhu $a0, ($a2) -/* 043200 80042600 E7A00044 */ swc1 $f0, 0x44($sp) -/* 043204 80042604 0C0AE00E */ jal coss -/* 043208 80042608 96240000 */ lhu $a0, ($s1) -/* 04320C 8004260C 46000586 */ mov.s $f22, $f0 -/* 043210 80042610 0C0AE006 */ jal sins -/* 043214 80042614 96240002 */ lhu $a0, 2($s1) -/* 043218 80042618 96240002 */ lhu $a0, 2($s1) -/* 04321C 8004261C 0C0AE00E */ jal coss -/* 043220 80042620 E7A0003C */ swc1 $f0, 0x3c($sp) -/* 043224 80042624 96240004 */ lhu $a0, 4($s1) -/* 043228 80042628 0C0AE006 */ jal sins -/* 04322C 8004262C E7A00038 */ swc1 $f0, 0x38($sp) -/* 043230 80042630 96240004 */ lhu $a0, 4($s1) -/* 043234 80042634 0C0AE00E */ jal coss -/* 043238 80042638 E7A00034 */ swc1 $f0, 0x34($sp) -/* 04323C 8004263C C7AE003C */ lwc1 $f14, 0x3c($sp) -/* 043240 80042640 C7B20044 */ lwc1 $f18, 0x44($sp) -/* 043244 80042644 C7B00038 */ lwc1 $f16, 0x38($sp) -/* 043248 80042648 C7A20034 */ lwc1 $f2, 0x34($sp) -/* 04324C 8004264C 460E9302 */ mul.s $f12, $f18, $f14 -/* 043250 80042650 8FA2004C */ lw $v0, 0x4c($sp) -/* 043254 80042654 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 043258 80042658 46008102 */ mul.s $f4, $f16, $f0 -/* 04325C 8004265C 00000000 */ nop -/* 043260 80042660 46026182 */ mul.s $f6, $f12, $f2 -/* 043264 80042664 46062200 */ add.s $f8, $f4, $f6 -/* 043268 80042668 46008107 */ neg.s $f4, $f16 -/* 04326C 8004266C 46144282 */ mul.s $f10, $f8, $f20 -/* 043270 80042670 00000000 */ nop -/* 043274 80042674 46022182 */ mul.s $f6, $f4, $f2 -/* 043278 80042678 00000000 */ nop -/* 04327C 8004267C 46006202 */ mul.s $f8, $f12, $f0 -/* 043280 80042680 E60A0000 */ swc1 $f10, ($s0) -/* 043284 80042684 46083280 */ add.s $f10, $f6, $f8 -/* 043288 80042688 46145102 */ mul.s $f4, $f10, $f20 -/* 04328C 8004268C 00000000 */ nop -/* 043290 80042690 460EB182 */ mul.s $f6, $f22, $f14 -/* 043294 80042694 E6040010 */ swc1 $f4, 0x10($s0) -/* 043298 80042698 46143202 */ mul.s $f8, $f6, $f20 -/* 04329C 8004269C 00000000 */ nop -/* 0432A0 800426A0 4602B102 */ mul.s $f4, $f22, $f2 -/* 0432A4 800426A4 E6080020 */ swc1 $f8, 0x20($s0) -/* 0432A8 800426A8 C44A0000 */ lwc1 $f10, ($v0) -/* 0432AC 800426AC 46142182 */ mul.s $f6, $f4, $f20 -/* 0432B0 800426B0 E60A0030 */ swc1 $f10, 0x30($s0) -/* 0432B4 800426B4 46009107 */ neg.s $f4, $f18 -/* 0432B8 800426B8 4600B202 */ mul.s $f8, $f22, $f0 -/* 0432BC 800426BC E6060004 */ swc1 $f6, 4($s0) -/* 0432C0 800426C0 46144282 */ mul.s $f10, $f8, $f20 -/* 0432C4 800426C4 E60A0014 */ swc1 $f10, 0x14($s0) -/* 0432C8 800426C8 46142182 */ mul.s $f6, $f4, $f20 -/* 0432CC 800426CC 46007287 */ neg.s $f10, $f14 -/* 0432D0 800426D0 46109302 */ mul.s $f12, $f18, $f16 -/* 0432D4 800426D4 00000000 */ nop -/* 0432D8 800426D8 46005102 */ mul.s $f4, $f10, $f0 -/* 0432DC 800426DC E6060024 */ swc1 $f6, 0x24($s0) -/* 0432E0 800426E0 C4480004 */ lwc1 $f8, 4($v0) -/* 0432E4 800426E4 46026182 */ mul.s $f6, $f12, $f2 -/* 0432E8 800426E8 E6080034 */ swc1 $f8, 0x34($s0) -/* 0432EC 800426EC 46062200 */ add.s $f8, $f4, $f6 -/* 0432F0 800426F0 46144282 */ mul.s $f10, $f8, $f20 -/* 0432F4 800426F4 00000000 */ nop -/* 0432F8 800426F8 46027102 */ mul.s $f4, $f14, $f2 -/* 0432FC 800426FC 00000000 */ nop -/* 043300 80042700 46006182 */ mul.s $f6, $f12, $f0 -/* 043304 80042704 E60A0008 */ swc1 $f10, 8($s0) -/* 043308 80042708 44800000 */ mtc1 $zero, $f0 -/* 04330C 8004270C 46062200 */ add.s $f8, $f4, $f6 -/* 043310 80042710 46144282 */ mul.s $f10, $f8, $f20 -/* 043314 80042714 00000000 */ nop -/* 043318 80042718 4610B102 */ mul.s $f4, $f22, $f16 -/* 04331C 8004271C E60A0018 */ swc1 $f10, 0x18($s0) -/* 043320 80042720 44815000 */ mtc1 $at, $f10 -/* 043324 80042724 46142182 */ mul.s $f6, $f4, $f20 -/* 043328 80042728 E6060028 */ swc1 $f6, 0x28($s0) -/* 04332C 8004272C C4480008 */ lwc1 $f8, 8($v0) -/* 043330 80042730 E600000C */ swc1 $f0, 0xc($s0) -/* 043334 80042734 E600001C */ swc1 $f0, 0x1c($s0) -/* 043338 80042738 E600002C */ swc1 $f0, 0x2c($s0) -/* 04333C 8004273C E60A003C */ swc1 $f10, 0x3c($s0) -/* 043340 80042740 E6080038 */ swc1 $f8, 0x38($s0) -/* 043344 80042744 8FBF002C */ lw $ra, 0x2c($sp) -/* 043348 80042748 8FB10028 */ lw $s1, 0x28($sp) -/* 04334C 8004274C 8FB00024 */ lw $s0, 0x24($sp) -/* 043350 80042750 D7B60018 */ ldc1 $f22, 0x18($sp) -/* 043354 80042754 D7B40010 */ ldc1 $f20, 0x10($sp) -/* 043358 80042758 03E00008 */ jr $ra -/* 04335C 8004275C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/non_matchings/code_80040E50/func_80042760.s b/asm/non_matchings/code_80040E50/func_80042760.s deleted file mode 100644 index 174006986..000000000 --- a/asm/non_matchings/code_80040E50/func_80042760.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80042760 -/* 043360 80042760 44801000 */ mtc1 $zero, $f2 -/* 043364 80042764 44876000 */ mtc1 $a3, $f12 -/* 043368 80042768 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 04336C 8004276C E4820010 */ swc1 $f2, 0x10($a0) -/* 043370 80042770 E4820020 */ swc1 $f2, 0x20($a0) -/* 043374 80042774 E48C0000 */ swc1 $f12, ($a0) -/* 043378 80042778 C4C60000 */ lwc1 $f6, ($a2) -/* 04337C 8004277C C4A40000 */ lwc1 $f4, ($a1) -/* 043380 80042780 46006007 */ neg.s $f0, $f12 -/* 043384 80042784 E4820004 */ swc1 $f2, 4($a0) -/* 043388 80042788 46062201 */ sub.s $f8, $f4, $f6 -/* 04338C 8004278C E4800014 */ swc1 $f0, 0x14($a0) -/* 043390 80042790 E4820024 */ swc1 $f2, 0x24($a0) -/* 043394 80042794 E4880030 */ swc1 $f8, 0x30($a0) -/* 043398 80042798 C4D00004 */ lwc1 $f16, 4($a2) -/* 04339C 8004279C C4AA0004 */ lwc1 $f10, 4($a1) -/* 0433A0 800427A0 E4800028 */ swc1 $f0, 0x28($a0) -/* 0433A4 800427A4 E4820008 */ swc1 $f2, 8($a0) -/* 0433A8 800427A8 46105481 */ sub.s $f18, $f10, $f16 -/* 0433AC 800427AC E4820018 */ swc1 $f2, 0x18($a0) -/* 0433B0 800427B0 44815000 */ mtc1 $at, $f10 -/* 0433B4 800427B4 E4920034 */ swc1 $f18, 0x34($a0) -/* 0433B8 800427B8 C4C60008 */ lwc1 $f6, 8($a2) -/* 0433BC 800427BC C4A40008 */ lwc1 $f4, 8($a1) -/* 0433C0 800427C0 E482000C */ swc1 $f2, 0xc($a0) -/* 0433C4 800427C4 E482001C */ swc1 $f2, 0x1c($a0) -/* 0433C8 800427C8 46062201 */ sub.s $f8, $f4, $f6 -/* 0433CC 800427CC E482002C */ swc1 $f2, 0x2c($a0) -/* 0433D0 800427D0 E48A003C */ swc1 $f10, 0x3c($a0) -/* 0433D4 800427D4 03E00008 */ jr $ra -/* 0433D8 800427D8 E4880038 */ swc1 $f8, 0x38($a0) diff --git a/asm/non_matchings/code_80040E50/func_800427DC.s b/asm/non_matchings/code_80040E50/func_800427DC.s deleted file mode 100644 index 6e9eb7de0..000000000 --- a/asm/non_matchings/code_80040E50/func_800427DC.s +++ /dev/null @@ -1,149 +0,0 @@ -glabel func_800427DC -/* 0433DC 800427DC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 0433E0 800427E0 000470C0 */ sll $t6, $a0, 3 -/* 0433E4 800427E4 01C47023 */ subu $t6, $t6, $a0 -/* 0433E8 800427E8 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 0433EC 800427EC AFB0001C */ sw $s0, 0x1c($sp) -/* 0433F0 800427F0 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 0433F4 800427F4 000E7140 */ sll $t6, $t6, 5 -/* 0433F8 800427F8 AFBF0024 */ sw $ra, 0x24($sp) -/* 0433FC 800427FC AFB10020 */ sw $s1, 0x20($sp) -/* 043400 80042800 01CF8021 */ addu $s0, $t6, $t7 -/* 043404 80042804 00A08825 */ move $s1, $a1 -/* 043408 80042808 F7B40010 */ sdc1 $f20, 0x10($sp) -/* 04340C 8004280C 0C0AE006 */ jal sins -/* 043410 80042810 960400B2 */ lhu $a0, 0xb2($s0) -/* 043414 80042814 E7A0003C */ swc1 $f0, 0x3c($sp) -/* 043418 80042818 0C0AE00E */ jal coss -/* 04341C 8004281C 960400B2 */ lhu $a0, 0xb2($s0) -/* 043420 80042820 46000506 */ mov.s $f20, $f0 -/* 043424 80042824 0C0AE006 */ jal sins -/* 043428 80042828 960400B4 */ lhu $a0, 0xb4($s0) -/* 04342C 8004282C 960400B4 */ lhu $a0, 0xb4($s0) -/* 043430 80042830 0C0AE00E */ jal coss -/* 043434 80042834 E7A00034 */ swc1 $f0, 0x34($sp) -/* 043438 80042838 960400B6 */ lhu $a0, 0xb6($s0) -/* 04343C 8004283C 0C0AE006 */ jal sins -/* 043440 80042840 E7A00030 */ swc1 $f0, 0x30($sp) -/* 043444 80042844 960400B6 */ lhu $a0, 0xb6($s0) -/* 043448 80042848 0C0AE00E */ jal coss -/* 04344C 8004284C E7A0002C */ swc1 $f0, 0x2c($sp) -/* 043450 80042850 C7AE0034 */ lwc1 $f14, 0x34($sp) -/* 043454 80042854 C7B2003C */ lwc1 $f18, 0x3c($sp) -/* 043458 80042858 C7B00030 */ lwc1 $f16, 0x30($sp) -/* 04345C 8004285C C7A2002C */ lwc1 $f2, 0x2c($sp) -/* 043460 80042860 460E9302 */ mul.s $f12, $f18, $f14 -/* 043464 80042864 C60A0000 */ lwc1 $f10, ($s0) -/* 043468 80042868 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 04346C 8004286C 46008102 */ mul.s $f4, $f16, $f0 -/* 043470 80042870 00000000 */ nop -/* 043474 80042874 46026182 */ mul.s $f6, $f12, $f2 -/* 043478 80042878 46062200 */ add.s $f8, $f4, $f6 -/* 04347C 8004287C 46008187 */ neg.s $f6, $f16 -/* 043480 80042880 46085102 */ mul.s $f4, $f10, $f8 -/* 043484 80042884 00000000 */ nop -/* 043488 80042888 46023282 */ mul.s $f10, $f6, $f2 -/* 04348C 8004288C 00000000 */ nop -/* 043490 80042890 46006202 */ mul.s $f8, $f12, $f0 -/* 043494 80042894 E6240000 */ swc1 $f4, ($s1) -/* 043498 80042898 C6060000 */ lwc1 $f6, ($s0) -/* 04349C 8004289C 46085100 */ add.s $f4, $f10, $f8 -/* 0434A0 800428A0 46043282 */ mul.s $f10, $f6, $f4 -/* 0434A4 800428A4 E62A0010 */ swc1 $f10, 0x10($s1) -/* 0434A8 800428A8 460EA182 */ mul.s $f6, $f20, $f14 -/* 0434AC 800428AC C6080000 */ lwc1 $f8, ($s0) -/* 0434B0 800428B0 46064102 */ mul.s $f4, $f8, $f6 -/* 0434B4 800428B4 E6240020 */ swc1 $f4, 0x20($s1) -/* 0434B8 800428B8 4602A182 */ mul.s $f6, $f20, $f2 -/* 0434BC 800428BC C60A0004 */ lwc1 $f10, 4($s0) -/* 0434C0 800428C0 E62A0030 */ swc1 $f10, 0x30($s1) -/* 0434C4 800428C4 C6080000 */ lwc1 $f8, ($s0) -/* 0434C8 800428C8 46064102 */ mul.s $f4, $f8, $f6 -/* 0434CC 800428CC E6240004 */ swc1 $f4, 4($s1) -/* 0434D0 800428D0 4600A202 */ mul.s $f8, $f20, $f0 -/* 0434D4 800428D4 C60A0000 */ lwc1 $f10, ($s0) -/* 0434D8 800428D8 46085182 */ mul.s $f6, $f10, $f8 -/* 0434DC 800428DC 46009287 */ neg.s $f10, $f18 -/* 0434E0 800428E0 E6260014 */ swc1 $f6, 0x14($s1) -/* 0434E4 800428E4 C6040000 */ lwc1 $f4, ($s0) -/* 0434E8 800428E8 460A2202 */ mul.s $f8, $f4, $f10 -/* 0434EC 800428EC 46007107 */ neg.s $f4, $f14 -/* 0434F0 800428F0 46109302 */ mul.s $f12, $f18, $f16 -/* 0434F4 800428F4 00000000 */ nop -/* 0434F8 800428F8 46002282 */ mul.s $f10, $f4, $f0 -/* 0434FC 800428FC E6280024 */ swc1 $f8, 0x24($s1) -/* 043500 80042900 C6060008 */ lwc1 $f6, 8($s0) -/* 043504 80042904 46026202 */ mul.s $f8, $f12, $f2 -/* 043508 80042908 E6260034 */ swc1 $f6, 0x34($s1) -/* 04350C 8004290C C6040000 */ lwc1 $f4, ($s0) -/* 043510 80042910 46085180 */ add.s $f6, $f10, $f8 -/* 043514 80042914 46062282 */ mul.s $f10, $f4, $f6 -/* 043518 80042918 00000000 */ nop -/* 04351C 8004291C 46027202 */ mul.s $f8, $f14, $f2 -/* 043520 80042920 00000000 */ nop -/* 043524 80042924 46006102 */ mul.s $f4, $f12, $f0 -/* 043528 80042928 E62A0008 */ swc1 $f10, 8($s1) -/* 04352C 8004292C C60A0000 */ lwc1 $f10, ($s0) -/* 043530 80042930 44800000 */ mtc1 $zero, $f0 -/* 043534 80042934 46044180 */ add.s $f6, $f8, $f4 -/* 043538 80042938 46065202 */ mul.s $f8, $f10, $f6 -/* 04353C 8004293C E6280018 */ swc1 $f8, 0x18($s1) -/* 043540 80042940 4610A282 */ mul.s $f10, $f20, $f16 -/* 043544 80042944 C6040000 */ lwc1 $f4, ($s0) -/* 043548 80042948 460A2182 */ mul.s $f6, $f4, $f10 -/* 04354C 8004294C 44812000 */ mtc1 $at, $f4 -/* 043550 80042950 E6260028 */ swc1 $f6, 0x28($s1) -/* 043554 80042954 C608000C */ lwc1 $f8, 0xc($s0) -/* 043558 80042958 E620000C */ swc1 $f0, 0xc($s1) -/* 04355C 8004295C E620001C */ swc1 $f0, 0x1c($s1) -/* 043560 80042960 E620002C */ swc1 $f0, 0x2c($s1) -/* 043564 80042964 E624003C */ swc1 $f4, 0x3c($s1) -/* 043568 80042968 E6280038 */ swc1 $f8, 0x38($s1) -/* 04356C 8004296C 8FBF0024 */ lw $ra, 0x24($sp) -/* 043570 80042970 8FB10020 */ lw $s1, 0x20($sp) -/* 043574 80042974 8FB0001C */ lw $s0, 0x1c($sp) -/* 043578 80042978 D7B40010 */ ldc1 $f20, 0x10($sp) -/* 04357C 8004297C 03E00008 */ jr $ra -/* 043580 80042980 27BD0040 */ addiu $sp, $sp, 0x40 - -/* 043584 80042984 44856000 */ mtc1 $a1, $f12 -/* 043588 80042988 C4840000 */ lwc1 $f4, ($a0) -/* 04358C 8004298C C4880010 */ lwc1 $f8, 0x10($a0) -/* 043590 80042990 C4900020 */ lwc1 $f16, 0x20($a0) -/* 043594 80042994 460C2182 */ mul.s $f6, $f4, $f12 -/* 043598 80042998 00000000 */ nop -/* 04359C 8004299C 460C4282 */ mul.s $f10, $f8, $f12 -/* 0435A0 800429A0 00000000 */ nop -/* 0435A4 800429A4 460C8482 */ mul.s $f18, $f16, $f12 -/* 0435A8 800429A8 E4860000 */ swc1 $f6, ($a0) -/* 0435AC 800429AC E48A0010 */ swc1 $f10, 0x10($a0) -/* 0435B0 800429B0 03E00008 */ jr $ra -/* 0435B4 800429B4 E4920020 */ swc1 $f18, 0x20($a0) - -/* 0435B8 800429B8 44856000 */ mtc1 $a1, $f12 -/* 0435BC 800429BC C4840004 */ lwc1 $f4, 4($a0) -/* 0435C0 800429C0 C4880014 */ lwc1 $f8, 0x14($a0) -/* 0435C4 800429C4 C4900024 */ lwc1 $f16, 0x24($a0) -/* 0435C8 800429C8 460C2182 */ mul.s $f6, $f4, $f12 -/* 0435CC 800429CC 00000000 */ nop -/* 0435D0 800429D0 460C4282 */ mul.s $f10, $f8, $f12 -/* 0435D4 800429D4 00000000 */ nop -/* 0435D8 800429D8 460C8482 */ mul.s $f18, $f16, $f12 -/* 0435DC 800429DC E4860004 */ swc1 $f6, 4($a0) -/* 0435E0 800429E0 E48A0014 */ swc1 $f10, 0x14($a0) -/* 0435E4 800429E4 03E00008 */ jr $ra -/* 0435E8 800429E8 E4920024 */ swc1 $f18, 0x24($a0) - -/* 0435EC 800429EC 44856000 */ mtc1 $a1, $f12 -/* 0435F0 800429F0 C4840008 */ lwc1 $f4, 8($a0) -/* 0435F4 800429F4 C4880018 */ lwc1 $f8, 0x18($a0) -/* 0435F8 800429F8 C4900028 */ lwc1 $f16, 0x28($a0) -/* 0435FC 800429FC 460C2182 */ mul.s $f6, $f4, $f12 -/* 043600 80042A00 00000000 */ nop -/* 043604 80042A04 460C4282 */ mul.s $f10, $f8, $f12 -/* 043608 80042A08 00000000 */ nop -/* 04360C 80042A0C 460C8482 */ mul.s $f18, $f16, $f12 -/* 043610 80042A10 E4860008 */ swc1 $f6, 8($a0) -/* 043614 80042A14 E48A0018 */ swc1 $f10, 0x18($a0) -/* 043618 80042A18 03E00008 */ jr $ra -/* 04361C 80042A1C E4920028 */ swc1 $f18, 0x28($a0) diff --git a/asm/non_matchings/code_80040E50/func_80042A20.s b/asm/non_matchings/code_80040E50/func_80042A20.s deleted file mode 100644 index b3d3cfa90..000000000 --- a/asm/non_matchings/code_80040E50/func_80042A20.s +++ /dev/null @@ -1,191 +0,0 @@ -glabel func_80042A20 -/* 043620 80042A20 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 043624 80042A24 AFB00014 */ sw $s0, 0x14($sp) -/* 043628 80042A28 00808025 */ move $s0, $a0 -/* 04362C 80042A2C AFBF001C */ sw $ra, 0x1c($sp) -/* 043630 80042A30 AFB10018 */ sw $s1, 0x18($sp) -/* 043634 80042A34 AFA7005C */ sw $a3, 0x5c($sp) -/* 043638 80042A38 00A08825 */ move $s1, $a1 -/* 04363C 80042A3C AFA60058 */ sw $a2, 0x58($sp) -/* 043640 80042A40 0C0AE006 */ jal sins -/* 043644 80042A44 97A4005E */ lhu $a0, 0x5e($sp) -/* 043648 80042A48 E7A00024 */ swc1 $f0, 0x24($sp) -/* 04364C 80042A4C 0C0AE00E */ jal coss -/* 043650 80042A50 97A4005E */ lhu $a0, 0x5e($sp) -/* 043654 80042A54 44070000 */ mfc1 $a3, $f0 -/* 043658 80042A58 27A40044 */ addiu $a0, $sp, 0x44 -/* 04365C 80042A5C 8FA50024 */ lw $a1, 0x24($sp) -/* 043660 80042A60 0C010540 */ jal func_80041500 -/* 043664 80042A64 24060000 */ li $a2, 0 -/* 043668 80042A68 0C01054C */ jal func_80041530 -/* 04366C 80042A6C 02202025 */ move $a0, $s1 -/* 043670 80042A70 27A40038 */ addiu $a0, $sp, 0x38 -/* 043674 80042A74 02202825 */ move $a1, $s1 -/* 043678 80042A78 0C010565 */ jal func_80041594 -/* 04367C 80042A7C 27A60044 */ addiu $a2, $sp, 0x44 -/* 043680 80042A80 0C01054C */ jal func_80041530 -/* 043684 80042A84 27A40038 */ addiu $a0, $sp, 0x38 -/* 043688 80042A88 27A4002C */ addiu $a0, $sp, 0x2c -/* 04368C 80042A8C 27A50038 */ addiu $a1, $sp, 0x38 -/* 043690 80042A90 0C010565 */ jal func_80041594 -/* 043694 80042A94 02203025 */ move $a2, $s1 -/* 043698 80042A98 0C01054C */ jal func_80041530 -/* 04369C 80042A9C 27A4002C */ addiu $a0, $sp, 0x2c -/* 0436A0 80042AA0 C7A00060 */ lwc1 $f0, 0x60($sp) -/* 0436A4 80042AA4 C7A40038 */ lwc1 $f4, 0x38($sp) -/* 0436A8 80042AA8 8FA20058 */ lw $v0, 0x58($sp) -/* 0436AC 80042AAC 44801000 */ mtc1 $zero, $f2 -/* 0436B0 80042AB0 46002182 */ mul.s $f6, $f4, $f0 -/* 0436B4 80042AB4 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 0436B8 80042AB8 E6060000 */ swc1 $f6, ($s0) -/* 0436BC 80042ABC C7A8003C */ lwc1 $f8, 0x3c($sp) -/* 0436C0 80042AC0 46004282 */ mul.s $f10, $f8, $f0 -/* 0436C4 80042AC4 E60A0004 */ swc1 $f10, 4($s0) -/* 0436C8 80042AC8 C7B00040 */ lwc1 $f16, 0x40($sp) -/* 0436CC 80042ACC 46008482 */ mul.s $f18, $f16, $f0 -/* 0436D0 80042AD0 E6120008 */ swc1 $f18, 8($s0) -/* 0436D4 80042AD4 C4440000 */ lwc1 $f4, ($v0) -/* 0436D8 80042AD8 E6040030 */ swc1 $f4, 0x30($s0) -/* 0436DC 80042ADC C6260000 */ lwc1 $f6, ($s1) -/* 0436E0 80042AE0 46003202 */ mul.s $f8, $f6, $f0 -/* 0436E4 80042AE4 E6080010 */ swc1 $f8, 0x10($s0) -/* 0436E8 80042AE8 C62A0004 */ lwc1 $f10, 4($s1) -/* 0436EC 80042AEC 46005402 */ mul.s $f16, $f10, $f0 -/* 0436F0 80042AF0 E6100014 */ swc1 $f16, 0x14($s0) -/* 0436F4 80042AF4 C6320008 */ lwc1 $f18, 8($s1) -/* 0436F8 80042AF8 46009102 */ mul.s $f4, $f18, $f0 -/* 0436FC 80042AFC E6040018 */ swc1 $f4, 0x18($s0) -/* 043700 80042B00 C4460004 */ lwc1 $f6, 4($v0) -/* 043704 80042B04 E6060034 */ swc1 $f6, 0x34($s0) -/* 043708 80042B08 C7A8002C */ lwc1 $f8, 0x2c($sp) -/* 04370C 80042B0C 46004282 */ mul.s $f10, $f8, $f0 -/* 043710 80042B10 E60A0020 */ swc1 $f10, 0x20($s0) -/* 043714 80042B14 C7B00030 */ lwc1 $f16, 0x30($sp) -/* 043718 80042B18 44815000 */ mtc1 $at, $f10 -/* 04371C 80042B1C 46008482 */ mul.s $f18, $f16, $f0 -/* 043720 80042B20 E6120024 */ swc1 $f18, 0x24($s0) -/* 043724 80042B24 C7A40034 */ lwc1 $f4, 0x34($sp) -/* 043728 80042B28 46002182 */ mul.s $f6, $f4, $f0 -/* 04372C 80042B2C E6060028 */ swc1 $f6, 0x28($s0) -/* 043730 80042B30 C4480008 */ lwc1 $f8, 8($v0) -/* 043734 80042B34 E602000C */ swc1 $f2, 0xc($s0) -/* 043738 80042B38 E602001C */ swc1 $f2, 0x1c($s0) -/* 04373C 80042B3C E602002C */ swc1 $f2, 0x2c($s0) -/* 043740 80042B40 E60A003C */ swc1 $f10, 0x3c($s0) -/* 043744 80042B44 E6080038 */ swc1 $f8, 0x38($s0) -/* 043748 80042B48 8FBF001C */ lw $ra, 0x1c($sp) -/* 04374C 80042B4C 8FB10018 */ lw $s1, 0x18($sp) -/* 043750 80042B50 8FB00014 */ lw $s0, 0x14($sp) -/* 043754 80042B54 03E00008 */ jr $ra -/* 043758 80042B58 27BD0050 */ addiu $sp, $sp, 0x50 - -/* 04375C 80042B5C 27BDFF88 */ addiu $sp, $sp, -0x78 -/* 043760 80042B60 AFBF0024 */ sw $ra, 0x24($sp) -/* 043764 80042B64 AFB00020 */ sw $s0, 0x20($sp) -/* 043768 80042B68 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 04376C 80042B6C AFA40078 */ sw $a0, 0x78($sp) -/* 043770 80042B70 AFA5007C */ sw $a1, 0x7c($sp) -/* 043774 80042B74 00C08025 */ move $s0, $a2 -/* 043778 80042B78 0C0AE006 */ jal sins -/* 04377C 80042B7C 94C40000 */ lhu $a0, ($a2) -/* 043780 80042B80 E7A00050 */ swc1 $f0, 0x50($sp) -/* 043784 80042B84 0C0AE00E */ jal coss -/* 043788 80042B88 96040000 */ lhu $a0, ($s0) -/* 04378C 80042B8C 46000506 */ mov.s $f20, $f0 -/* 043790 80042B90 0C0AE006 */ jal sins -/* 043794 80042B94 96040002 */ lhu $a0, 2($s0) -/* 043798 80042B98 96040002 */ lhu $a0, 2($s0) -/* 04379C 80042B9C 0C0AE00E */ jal coss -/* 0437A0 80042BA0 E7A00048 */ swc1 $f0, 0x48($sp) -/* 0437A4 80042BA4 96040004 */ lhu $a0, 4($s0) -/* 0437A8 80042BA8 0C0AE006 */ jal sins -/* 0437AC 80042BAC E7A00044 */ swc1 $f0, 0x44($sp) -/* 0437B0 80042BB0 96040004 */ lhu $a0, 4($s0) -/* 0437B4 80042BB4 0C0AE00E */ jal coss -/* 0437B8 80042BB8 E7A00040 */ swc1 $f0, 0x40($sp) -/* 0437BC 80042BBC C7AE0048 */ lwc1 $f14, 0x48($sp) -/* 0437C0 80042BC0 C7A80050 */ lwc1 $f8, 0x50($sp) -/* 0437C4 80042BC4 C7B00044 */ lwc1 $f16, 0x44($sp) -/* 0437C8 80042BC8 C7A20040 */ lwc1 $f2, 0x40($sp) -/* 0437CC 80042BCC 460E4302 */ mul.s $f12, $f8, $f14 -/* 0437D0 80042BD0 8FA2007C */ lw $v0, 0x7c($sp) -/* 0437D4 80042BD4 46008282 */ mul.s $f10, $f16, $f0 -/* 0437D8 80042BD8 C4520000 */ lwc1 $f18, ($v0) -/* 0437DC 80042BDC 46026102 */ mul.s $f4, $f12, $f2 -/* 0437E0 80042BE0 46045180 */ add.s $f6, $f10, $f4 -/* 0437E4 80042BE4 46069282 */ mul.s $f10, $f18, $f6 -/* 0437E8 80042BE8 46008187 */ neg.s $f6, $f16 -/* 0437EC 80042BEC E7AA0074 */ swc1 $f10, 0x74($sp) -/* 0437F0 80042BF0 C4440004 */ lwc1 $f4, 4($v0) -/* 0437F4 80042BF4 46023282 */ mul.s $f10, $f6, $f2 -/* 0437F8 80042BF8 E7A40034 */ swc1 $f4, 0x34($sp) -/* 0437FC 80042BFC 46006102 */ mul.s $f4, $f12, $f0 -/* 043800 80042C00 46045180 */ add.s $f6, $f10, $f4 -/* 043804 80042C04 C7AA0034 */ lwc1 $f10, 0x34($sp) -/* 043808 80042C08 46065102 */ mul.s $f4, $f10, $f6 -/* 04380C 80042C0C E7A40068 */ swc1 $f4, 0x68($sp) -/* 043810 80042C10 C4460008 */ lwc1 $f6, 8($v0) -/* 043814 80042C14 E7A80028 */ swc1 $f8, 0x28($sp) -/* 043818 80042C18 460EA202 */ mul.s $f8, $f20, $f14 -/* 04381C 80042C1C E7A60030 */ swc1 $f6, 0x30($sp) -/* 043820 80042C20 C7A60030 */ lwc1 $f6, 0x30($sp) -/* 043824 80042C24 E7AA002C */ swc1 $f10, 0x2c($sp) -/* 043828 80042C28 8FA20078 */ lw $v0, 0x78($sp) -/* 04382C 80042C2C 46083202 */ mul.s $f8, $f6, $f8 -/* 043830 80042C30 00000000 */ nop -/* 043834 80042C34 4602A282 */ mul.s $f10, $f20, $f2 -/* 043838 80042C38 E7A8005C */ swc1 $f8, 0x5c($sp) -/* 04383C 80042C3C 460A9282 */ mul.s $f10, $f18, $f10 -/* 043840 80042C40 E7AA0070 */ swc1 $f10, 0x70($sp) -/* 043844 80042C44 C7AA002C */ lwc1 $f10, 0x2c($sp) -/* 043848 80042C48 E7A4002C */ swc1 $f4, 0x2c($sp) -/* 04384C 80042C4C 4600A102 */ mul.s $f4, $f20, $f0 -/* 043850 80042C50 00000000 */ nop -/* 043854 80042C54 46045102 */ mul.s $f4, $f10, $f4 -/* 043858 80042C58 E7A40064 */ swc1 $f4, 0x64($sp) -/* 04385C 80042C5C C7A40028 */ lwc1 $f4, 0x28($sp) -/* 043860 80042C60 E7A80028 */ swc1 $f8, 0x28($sp) -/* 043864 80042C64 46002207 */ neg.s $f8, $f4 -/* 043868 80042C68 46083202 */ mul.s $f8, $f6, $f8 -/* 04386C 80042C6C E7A80058 */ swc1 $f8, 0x58($sp) -/* 043870 80042C70 46102302 */ mul.s $f12, $f4, $f16 -/* 043874 80042C74 46007207 */ neg.s $f8, $f14 -/* 043878 80042C78 46004102 */ mul.s $f4, $f8, $f0 -/* 04387C 80042C7C 00000000 */ nop -/* 043880 80042C80 46026202 */ mul.s $f8, $f12, $f2 -/* 043884 80042C84 46082100 */ add.s $f4, $f4, $f8 -/* 043888 80042C88 46049202 */ mul.s $f8, $f18, $f4 -/* 04388C 80042C8C E7A8006C */ swc1 $f8, 0x6c($sp) -/* 043890 80042C90 46027102 */ mul.s $f4, $f14, $f2 -/* 043894 80042C94 00000000 */ nop -/* 043898 80042C98 46006202 */ mul.s $f8, $f12, $f0 -/* 04389C 80042C9C 46082100 */ add.s $f4, $f4, $f8 -/* 0438A0 80042CA0 46045202 */ mul.s $f8, $f10, $f4 -/* 0438A4 80042CA4 00000000 */ nop -/* 0438A8 80042CA8 4610A282 */ mul.s $f10, $f20, $f16 -/* 0438AC 80042CAC E7A80060 */ swc1 $f8, 0x60($sp) -/* 0438B0 80042CB0 C7A8002C */ lwc1 $f8, 0x2c($sp) -/* 0438B4 80042CB4 460A3102 */ mul.s $f4, $f6, $f10 -/* 0438B8 80042CB8 C7A60074 */ lwc1 $f6, 0x74($sp) -/* 0438BC 80042CBC 46083280 */ add.s $f10, $f6, $f8 -/* 0438C0 80042CC0 E7A40054 */ swc1 $f4, 0x54($sp) -/* 0438C4 80042CC4 C7A40028 */ lwc1 $f4, 0x28($sp) -/* 0438C8 80042CC8 46045180 */ add.s $f6, $f10, $f4 -/* 0438CC 80042CCC E4460000 */ swc1 $f6, ($v0) -/* 0438D0 80042CD0 C7AA0064 */ lwc1 $f10, 0x64($sp) -/* 0438D4 80042CD4 C7A80070 */ lwc1 $f8, 0x70($sp) -/* 0438D8 80042CD8 C7A60058 */ lwc1 $f6, 0x58($sp) -/* 0438DC 80042CDC 460A4100 */ add.s $f4, $f8, $f10 -/* 0438E0 80042CE0 46062200 */ add.s $f8, $f4, $f6 -/* 0438E4 80042CE4 E4480004 */ swc1 $f8, 4($v0) -/* 0438E8 80042CE8 C7A40060 */ lwc1 $f4, 0x60($sp) -/* 0438EC 80042CEC C7AA006C */ lwc1 $f10, 0x6c($sp) -/* 0438F0 80042CF0 C7A80054 */ lwc1 $f8, 0x54($sp) -/* 0438F4 80042CF4 46045180 */ add.s $f6, $f10, $f4 -/* 0438F8 80042CF8 46083280 */ add.s $f10, $f6, $f8 -/* 0438FC 80042CFC E44A0008 */ swc1 $f10, 8($v0) -/* 043900 80042D00 8FBF0024 */ lw $ra, 0x24($sp) -/* 043904 80042D04 8FB00020 */ lw $s0, 0x20($sp) -/* 043908 80042D08 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 04390C 80042D0C 03E00008 */ jr $ra -/* 043910 80042D10 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/non_matchings/code_80040E50/func_80042D14.s b/asm/non_matchings/code_80040E50/func_80042D14.s deleted file mode 100644 index 491b7bd12..000000000 --- a/asm/non_matchings/code_80040E50/func_80042D14.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_80042D14 -/* 043914 80042D14 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 043918 80042D18 AFBF0014 */ sw $ra, 0x14($sp) -/* 04391C 80042D1C AFA40030 */ sw $a0, 0x30($sp) -/* 043920 80042D20 AFA60038 */ sw $a2, 0x38($sp) -/* 043924 80042D24 C4A40000 */ lwc1 $f4, ($a1) -/* 043928 80042D28 E7A4002C */ swc1 $f4, 0x2c($sp) -/* 04392C 80042D2C C4A60004 */ lwc1 $f6, 4($a1) -/* 043930 80042D30 E7A60028 */ swc1 $f6, 0x28($sp) -/* 043934 80042D34 C4A80008 */ lwc1 $f8, 8($a1) -/* 043938 80042D38 E7A80024 */ swc1 $f8, 0x24($sp) -/* 04393C 80042D3C 0C0AE006 */ jal sins -/* 043940 80042D40 94C40000 */ lhu $a0, ($a2) -/* 043944 80042D44 8FAF0038 */ lw $t7, 0x38($sp) -/* 043948 80042D48 E7A00020 */ swc1 $f0, 0x20($sp) -/* 04394C 80042D4C 0C0AE00E */ jal coss -/* 043950 80042D50 95E40000 */ lhu $a0, ($t7) -/* 043954 80042D54 8FB80038 */ lw $t8, 0x38($sp) -/* 043958 80042D58 97040002 */ lhu $a0, 2($t8) -/* 04395C 80042D5C 0C0AE006 */ jal sins -/* 043960 80042D60 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 043964 80042D64 8FB90038 */ lw $t9, 0x38($sp) -/* 043968 80042D68 97240002 */ lhu $a0, 2($t9) -/* 04396C 80042D6C 0C0AE00E */ jal coss -/* 043970 80042D70 E7A00018 */ swc1 $f0, 0x18($sp) -/* 043974 80042D74 C7AE002C */ lwc1 $f14, 0x2c($sp) -/* 043978 80042D78 C7AC0018 */ lwc1 $f12, 0x18($sp) -/* 04397C 80042D7C C7B00024 */ lwc1 $f16, 0x24($sp) -/* 043980 80042D80 46007282 */ mul.s $f10, $f14, $f0 -/* 043984 80042D84 C7B20020 */ lwc1 $f18, 0x20($sp) -/* 043988 80042D88 8FA20030 */ lw $v0, 0x30($sp) -/* 04398C 80042D8C 460C8102 */ mul.s $f4, $f16, $f12 -/* 043990 80042D90 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 043994 80042D94 46127202 */ mul.s $f8, $f14, $f18 -/* 043998 80042D98 46045181 */ sub.s $f6, $f10, $f4 -/* 04399C 80042D9C 460C4282 */ mul.s $f10, $f8, $f12 -/* 0439A0 80042DA0 E4460000 */ swc1 $f6, ($v0) -/* 0439A4 80042DA4 C7A40028 */ lwc1 $f4, 0x28($sp) -/* 0439A8 80042DA8 46022182 */ mul.s $f6, $f4, $f2 -/* 0439AC 80042DAC 00000000 */ nop -/* 0439B0 80042DB0 46128102 */ mul.s $f4, $f16, $f18 -/* 0439B4 80042DB4 46065200 */ add.s $f8, $f10, $f6 -/* 0439B8 80042DB8 46002282 */ mul.s $f10, $f4, $f0 -/* 0439BC 80042DBC 460A4180 */ add.s $f6, $f8, $f10 -/* 0439C0 80042DC0 46027102 */ mul.s $f4, $f14, $f2 -/* 0439C4 80042DC4 E4460004 */ swc1 $f6, 4($v0) -/* 0439C8 80042DC8 C7AA0028 */ lwc1 $f10, 0x28($sp) -/* 0439CC 80042DCC 460C2202 */ mul.s $f8, $f4, $f12 -/* 0439D0 80042DD0 00000000 */ nop -/* 0439D4 80042DD4 46125182 */ mul.s $f6, $f10, $f18 -/* 0439D8 80042DD8 00000000 */ nop -/* 0439DC 80042DDC 46028282 */ mul.s $f10, $f16, $f2 -/* 0439E0 80042DE0 46064101 */ sub.s $f4, $f8, $f6 -/* 0439E4 80042DE4 46005202 */ mul.s $f8, $f10, $f0 -/* 0439E8 80042DE8 46082180 */ add.s $f6, $f4, $f8 -/* 0439EC 80042DEC E4460008 */ swc1 $f6, 8($v0) -/* 0439F0 80042DF0 8FBF0014 */ lw $ra, 0x14($sp) -/* 0439F4 80042DF4 27BD0030 */ addiu $sp, $sp, 0x30 -/* 0439F8 80042DF8 03E00008 */ jr $ra -/* 0439FC 80042DFC 00000000 */ nop diff --git a/asm/non_matchings/code_80040E50/func_80042E00.s b/asm/non_matchings/code_80040E50/func_80042E00.s deleted file mode 100644 index 445a30f4c..000000000 --- a/asm/non_matchings/code_80040E50/func_80042E00.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80042E00 -/* 043A00 80042E00 44866000 */ mtc1 $a2, $f12 -/* 043A04 80042E04 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 043A08 80042E08 AFA50064 */ sw $a1, 0x64($sp) -/* 043A0C 80042E0C 00802825 */ move $a1, $a0 -/* 043A10 80042E10 AFBF0014 */ sw $ra, 0x14($sp) -/* 043A14 80042E14 AFA40060 */ sw $a0, 0x60($sp) -/* 043A18 80042E18 44076000 */ mfc1 $a3, $f12 -/* 043A1C 80042E1C 8FA60064 */ lw $a2, 0x64($sp) -/* 043A20 80042E20 0C010974 */ jal func_800425D0 -/* 043A24 80042E24 27A40020 */ addiu $a0, $sp, 0x20 -/* 043A28 80042E28 3C068019 */ lui $a2, %hi(D_8018D120) # $a2, 0x8019 -/* 043A2C 80042E2C 24C6D120 */ addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0 -/* 043A30 80042E30 8CCF0000 */ lw $t7, ($a2) -/* 043A34 80042E34 3C0E8015 */ lui $t6, %hi(gGfxPool) # $t6, 0x8015 -/* 043A38 80042E38 8DCEEF40 */ lw $t6, %lo(gGfxPool)($t6) -/* 043A3C 80042E3C 000FC180 */ sll $t8, $t7, 6 -/* 043A40 80042E40 27A50020 */ addiu $a1, $sp, 0x20 -/* 043A44 80042E44 01D82021 */ addu $a0, $t6, $t8 -/* 043A48 80042E48 0C008860 */ jal func_80022180 -/* 043A4C 80042E4C 248402C0 */ addiu $a0, $a0, 0x2c0 -/* 043A50 80042E50 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015 -/* 043A54 80042E54 24840298 */ addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298 -/* 043A58 80042E58 8C830000 */ lw $v1, ($a0) -/* 043A5C 80042E5C 3C080102 */ lui $t0, (0x01020040 >> 16) # lui $t0, 0x102 -/* 043A60 80042E60 3C068019 */ lui $a2, %hi(D_8018D120) # $a2, 0x8019 -/* 043A64 80042E64 24790008 */ addiu $t9, $v1, 8 -/* 043A68 80042E68 AC990000 */ sw $t9, ($a0) -/* 043A6C 80042E6C 35080040 */ ori $t0, (0x01020040 & 0xFFFF) # ori $t0, $t0, 0x40 -/* 043A70 80042E70 24C6D120 */ addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0 -/* 043A74 80042E74 AC680000 */ sw $t0, ($v1) -/* 043A78 80042E78 8CCA0000 */ lw $t2, ($a2) -/* 043A7C 80042E7C 3C098015 */ lui $t1, %hi(gGfxPool) # $t1, 0x8015 -/* 043A80 80042E80 8D29EF40 */ lw $t1, %lo(gGfxPool)($t1) -/* 043A84 80042E84 000A5980 */ sll $t3, $t2, 6 -/* 043A88 80042E88 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 043A8C 80042E8C 012B6021 */ addu $t4, $t1, $t3 -/* 043A90 80042E90 258D02C0 */ addiu $t5, $t4, 0x2c0 -/* 043A94 80042E94 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 043A98 80042E98 01A17824 */ and $t7, $t5, $at -/* 043A9C 80042E9C AC6F0004 */ sw $t7, 4($v1) -/* 043AA0 80042EA0 8CCE0000 */ lw $t6, ($a2) -/* 043AA4 80042EA4 8FBF0014 */ lw $ra, 0x14($sp) -/* 043AA8 80042EA8 27BD0060 */ addiu $sp, $sp, 0x60 -/* 043AAC 80042EAC 25D80001 */ addiu $t8, $t6, 1 -/* 043AB0 80042EB0 03E00008 */ jr $ra -/* 043AB4 80042EB4 ACD80000 */ sw $t8, ($a2) diff --git a/asm/non_matchings/code_80040E50/func_80042EB8.s b/asm/non_matchings/code_80040E50/func_80042EB8.s deleted file mode 100644 index c602578f4..000000000 --- a/asm/non_matchings/code_80040E50/func_80042EB8.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80042EB8 -/* 043AB8 80042EB8 44866000 */ mtc1 $a2, $f12 -/* 043ABC 80042EBC 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 043AC0 80042EC0 AFA50064 */ sw $a1, 0x64($sp) -/* 043AC4 80042EC4 00802825 */ move $a1, $a0 -/* 043AC8 80042EC8 AFBF0014 */ sw $ra, 0x14($sp) -/* 043ACC 80042ECC AFA40060 */ sw $a0, 0x60($sp) -/* 043AD0 80042ED0 44076000 */ mfc1 $a3, $f12 -/* 043AD4 80042ED4 8FA60064 */ lw $a2, 0x64($sp) -/* 043AD8 80042ED8 0C0109D8 */ jal func_80042760 -/* 043ADC 80042EDC 27A40020 */ addiu $a0, $sp, 0x20 -/* 043AE0 80042EE0 3C068019 */ lui $a2, %hi(D_8018D120) # $a2, 0x8019 -/* 043AE4 80042EE4 24C6D120 */ addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0 -/* 043AE8 80042EE8 8CCF0000 */ lw $t7, ($a2) -/* 043AEC 80042EEC 3C0E8015 */ lui $t6, %hi(gGfxPool) # $t6, 0x8015 -/* 043AF0 80042EF0 8DCEEF40 */ lw $t6, %lo(gGfxPool)($t6) -/* 043AF4 80042EF4 000FC180 */ sll $t8, $t7, 6 -/* 043AF8 80042EF8 27A50020 */ addiu $a1, $sp, 0x20 -/* 043AFC 80042EFC 01D82021 */ addu $a0, $t6, $t8 -/* 043B00 80042F00 0C008860 */ jal func_80022180 -/* 043B04 80042F04 248402C0 */ addiu $a0, $a0, 0x2c0 -/* 043B08 80042F08 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015 -/* 043B0C 80042F0C 24840298 */ addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298 -/* 043B10 80042F10 8C830000 */ lw $v1, ($a0) -/* 043B14 80042F14 3C080102 */ lui $t0, (0x01020040 >> 16) # lui $t0, 0x102 -/* 043B18 80042F18 3C068019 */ lui $a2, %hi(D_8018D120) # $a2, 0x8019 -/* 043B1C 80042F1C 24790008 */ addiu $t9, $v1, 8 -/* 043B20 80042F20 AC990000 */ sw $t9, ($a0) -/* 043B24 80042F24 35080040 */ ori $t0, (0x01020040 & 0xFFFF) # ori $t0, $t0, 0x40 -/* 043B28 80042F28 24C6D120 */ addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0 -/* 043B2C 80042F2C AC680000 */ sw $t0, ($v1) -/* 043B30 80042F30 8CCA0000 */ lw $t2, ($a2) -/* 043B34 80042F34 3C098015 */ lui $t1, %hi(gGfxPool) # $t1, 0x8015 -/* 043B38 80042F38 8D29EF40 */ lw $t1, %lo(gGfxPool)($t1) -/* 043B3C 80042F3C 000A5980 */ sll $t3, $t2, 6 -/* 043B40 80042F40 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 043B44 80042F44 012B6021 */ addu $t4, $t1, $t3 -/* 043B48 80042F48 258D02C0 */ addiu $t5, $t4, 0x2c0 -/* 043B4C 80042F4C 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 043B50 80042F50 01A17824 */ and $t7, $t5, $at -/* 043B54 80042F54 AC6F0004 */ sw $t7, 4($v1) -/* 043B58 80042F58 8CCE0000 */ lw $t6, ($a2) -/* 043B5C 80042F5C 8FBF0014 */ lw $ra, 0x14($sp) -/* 043B60 80042F60 27BD0060 */ addiu $sp, $sp, 0x60 -/* 043B64 80042F64 25D80001 */ addiu $t8, $t6, 1 -/* 043B68 80042F68 03E00008 */ jr $ra -/* 043B6C 80042F6C ACD80000 */ sw $t8, ($a2) diff --git a/asm/non_matchings/code_80040E50/func_80042F70.s b/asm/non_matchings/code_80040E50/func_80042F70.s deleted file mode 100644 index c33d87624..000000000 --- a/asm/non_matchings/code_80040E50/func_80042F70.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel func_80042F70 -/* 043B70 80042F70 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 043B74 80042F74 AFA5006C */ sw $a1, 0x6c($sp) -/* 043B78 80042F78 8FAE006C */ lw $t6, 0x6c($sp) -/* 043B7C 80042F7C AFBF0014 */ sw $ra, 0x14($sp) -/* 043B80 80042F80 AFA40068 */ sw $a0, 0x68($sp) -/* 043B84 80042F84 95CF0000 */ lhu $t7, ($t6) -/* 043B88 80042F88 34028000 */ li $v0, 32768 -/* 043B8C 80042F8C 44866000 */ mtc1 $a2, $f12 -/* 043B90 80042F90 01E2C021 */ addu $t8, $t7, $v0 -/* 043B94 80042F94 A7B80020 */ sh $t8, 0x20($sp) -/* 043B98 80042F98 95D90002 */ lhu $t9, 2($t6) -/* 043B9C 80042F9C 00802825 */ move $a1, $a0 -/* 043BA0 80042FA0 44076000 */ mfc1 $a3, $f12 -/* 043BA4 80042FA4 03224021 */ addu $t0, $t9, $v0 -/* 043BA8 80042FA8 A7A80022 */ sh $t0, 0x22($sp) -/* 043BAC 80042FAC 95C90004 */ lhu $t1, 4($t6) -/* 043BB0 80042FB0 27A40028 */ addiu $a0, $sp, 0x28 -/* 043BB4 80042FB4 27A60020 */ addiu $a2, $sp, 0x20 -/* 043BB8 80042FB8 0C010974 */ jal func_800425D0 -/* 043BBC 80042FBC A7A90024 */ sh $t1, 0x24($sp) -/* 043BC0 80042FC0 3C068019 */ lui $a2, %hi(D_8018D120) # $a2, 0x8019 -/* 043BC4 80042FC4 24C6D120 */ addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0 -/* 043BC8 80042FC8 8CCB0000 */ lw $t3, ($a2) -/* 043BCC 80042FCC 3C0A8015 */ lui $t2, %hi(gGfxPool) # $t2, 0x8015 -/* 043BD0 80042FD0 8D4AEF40 */ lw $t2, %lo(gGfxPool)($t2) -/* 043BD4 80042FD4 000B6180 */ sll $t4, $t3, 6 -/* 043BD8 80042FD8 27A50028 */ addiu $a1, $sp, 0x28 -/* 043BDC 80042FDC 014C2021 */ addu $a0, $t2, $t4 -/* 043BE0 80042FE0 0C008860 */ jal func_80022180 -/* 043BE4 80042FE4 248402C0 */ addiu $a0, $a0, 0x2c0 -/* 043BE8 80042FE8 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015 -/* 043BEC 80042FEC 24840298 */ addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298 -/* 043BF0 80042FF0 8C830000 */ lw $v1, ($a0) -/* 043BF4 80042FF4 3C0F0102 */ lui $t7, (0x01020040 >> 16) # lui $t7, 0x102 -/* 043BF8 80042FF8 3C068019 */ lui $a2, %hi(D_8018D120) # $a2, 0x8019 -/* 043BFC 80042FFC 246D0008 */ addiu $t5, $v1, 8 -/* 043C00 80043000 AC8D0000 */ sw $t5, ($a0) -/* 043C04 80043004 35EF0040 */ ori $t7, (0x01020040 & 0xFFFF) # ori $t7, $t7, 0x40 -/* 043C08 80043008 24C6D120 */ addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0 -/* 043C0C 8004300C AC6F0000 */ sw $t7, ($v1) -/* 043C10 80043010 8CD90000 */ lw $t9, ($a2) -/* 043C14 80043014 3C188015 */ lui $t8, %hi(gGfxPool) # $t8, 0x8015 -/* 043C18 80043018 8F18EF40 */ lw $t8, %lo(gGfxPool)($t8) -/* 043C1C 8004301C 00194180 */ sll $t0, $t9, 6 -/* 043C20 80043020 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 043C24 80043024 03087021 */ addu $t6, $t8, $t0 -/* 043C28 80043028 25C902C0 */ addiu $t1, $t6, 0x2c0 -/* 043C2C 8004302C 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 043C30 80043030 01215824 */ and $t3, $t1, $at -/* 043C34 80043034 AC6B0004 */ sw $t3, 4($v1) -/* 043C38 80043038 8CCA0000 */ lw $t2, ($a2) -/* 043C3C 8004303C 8FBF0014 */ lw $ra, 0x14($sp) -/* 043C40 80043040 27BD0068 */ addiu $sp, $sp, 0x68 -/* 043C44 80043044 254C0001 */ addiu $t4, $t2, 1 -/* 043C48 80043048 03E00008 */ jr $ra -/* 043C4C 8004304C ACCC0000 */ sw $t4, ($a2) diff --git a/asm/non_matchings/code_80040E50/func_80043050.s b/asm/non_matchings/code_80040E50/func_80043050.s deleted file mode 100644 index a1e424c8f..000000000 --- a/asm/non_matchings/code_80040E50/func_80043050.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80043050 -/* 043C50 80043050 44866000 */ mtc1 $a2, $f12 -/* 043C54 80043054 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 043C58 80043058 AFBF001C */ sw $ra, 0x1c($sp) -/* 043C5C 8004305C AFA40068 */ sw $a0, 0x68($sp) -/* 043C60 80043060 00803025 */ move $a2, $a0 -/* 043C64 80043064 27A40028 */ addiu $a0, $sp, 0x28 -/* 043C68 80043068 00003825 */ move $a3, $zero -/* 043C6C 8004306C 0C010A88 */ jal func_80042A20 -/* 043C70 80043070 E7AC0010 */ swc1 $f12, 0x10($sp) -/* 043C74 80043074 3C068019 */ lui $a2, %hi(D_8018D120) # $a2, 0x8019 -/* 043C78 80043078 24C6D120 */ addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0 -/* 043C7C 8004307C 8CCF0000 */ lw $t7, ($a2) -/* 043C80 80043080 3C0E8015 */ lui $t6, %hi(gGfxPool) # $t6, 0x8015 -/* 043C84 80043084 8DCEEF40 */ lw $t6, %lo(gGfxPool)($t6) -/* 043C88 80043088 000FC180 */ sll $t8, $t7, 6 -/* 043C8C 8004308C 27A50028 */ addiu $a1, $sp, 0x28 -/* 043C90 80043090 01D82021 */ addu $a0, $t6, $t8 -/* 043C94 80043094 0C008860 */ jal func_80022180 -/* 043C98 80043098 248402C0 */ addiu $a0, $a0, 0x2c0 -/* 043C9C 8004309C 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015 -/* 043CA0 800430A0 24840298 */ addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298 -/* 043CA4 800430A4 8C830000 */ lw $v1, ($a0) -/* 043CA8 800430A8 3C080102 */ lui $t0, (0x01020040 >> 16) # lui $t0, 0x102 -/* 043CAC 800430AC 3C068019 */ lui $a2, %hi(D_8018D120) # $a2, 0x8019 -/* 043CB0 800430B0 24790008 */ addiu $t9, $v1, 8 -/* 043CB4 800430B4 AC990000 */ sw $t9, ($a0) -/* 043CB8 800430B8 35080040 */ ori $t0, (0x01020040 & 0xFFFF) # ori $t0, $t0, 0x40 -/* 043CBC 800430BC 24C6D120 */ addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0 -/* 043CC0 800430C0 AC680000 */ sw $t0, ($v1) -/* 043CC4 800430C4 8CCA0000 */ lw $t2, ($a2) -/* 043CC8 800430C8 3C098015 */ lui $t1, %hi(gGfxPool) # $t1, 0x8015 -/* 043CCC 800430CC 8D29EF40 */ lw $t1, %lo(gGfxPool)($t1) -/* 043CD0 800430D0 000A5980 */ sll $t3, $t2, 6 -/* 043CD4 800430D4 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 043CD8 800430D8 012B6021 */ addu $t4, $t1, $t3 -/* 043CDC 800430DC 258D02C0 */ addiu $t5, $t4, 0x2c0 -/* 043CE0 800430E0 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 043CE4 800430E4 01A17824 */ and $t7, $t5, $at -/* 043CE8 800430E8 AC6F0004 */ sw $t7, 4($v1) -/* 043CEC 800430EC 8CCE0000 */ lw $t6, ($a2) -/* 043CF0 800430F0 8FBF001C */ lw $ra, 0x1c($sp) -/* 043CF4 800430F4 27BD0068 */ addiu $sp, $sp, 0x68 -/* 043CF8 800430F8 25D80001 */ addiu $t8, $t6, 1 -/* 043CFC 800430FC 03E00008 */ jr $ra -/* 043D00 80043100 ACD80000 */ sw $t8, ($a2) diff --git a/asm/non_matchings/code_80040E50/func_80043104.s b/asm/non_matchings/code_80040E50/func_80043104.s deleted file mode 100644 index 5548879e5..000000000 --- a/asm/non_matchings/code_80040E50/func_80043104.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80043104 -/* 043D04 80043104 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 043D08 80043108 AFBF0014 */ sw $ra, 0x14($sp) -/* 043D0C 8004310C 0C0109F7 */ jal func_800427DC -/* 043D10 80043110 27A50020 */ addiu $a1, $sp, 0x20 -/* 043D14 80043114 3C068019 */ lui $a2, %hi(D_8018D120) # $a2, 0x8019 -/* 043D18 80043118 24C6D120 */ addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0 -/* 043D1C 8004311C 8CCF0000 */ lw $t7, ($a2) -/* 043D20 80043120 3C0E8015 */ lui $t6, %hi(gGfxPool) # $t6, 0x8015 -/* 043D24 80043124 8DCEEF40 */ lw $t6, %lo(gGfxPool)($t6) -/* 043D28 80043128 000FC180 */ sll $t8, $t7, 6 -/* 043D2C 8004312C 27A50020 */ addiu $a1, $sp, 0x20 -/* 043D30 80043130 01D82021 */ addu $a0, $t6, $t8 -/* 043D34 80043134 0C008860 */ jal func_80022180 -/* 043D38 80043138 248402C0 */ addiu $a0, $a0, 0x2c0 -/* 043D3C 8004313C 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015 -/* 043D40 80043140 24840298 */ addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298 -/* 043D44 80043144 8C830000 */ lw $v1, ($a0) -/* 043D48 80043148 3C080102 */ lui $t0, (0x01020040 >> 16) # lui $t0, 0x102 -/* 043D4C 8004314C 3C068019 */ lui $a2, %hi(D_8018D120) # $a2, 0x8019 -/* 043D50 80043150 24790008 */ addiu $t9, $v1, 8 -/* 043D54 80043154 AC990000 */ sw $t9, ($a0) -/* 043D58 80043158 35080040 */ ori $t0, (0x01020040 & 0xFFFF) # ori $t0, $t0, 0x40 -/* 043D5C 8004315C 24C6D120 */ addiu $a2, %lo(D_8018D120) # addiu $a2, $a2, -0x2ee0 -/* 043D60 80043160 AC680000 */ sw $t0, ($v1) -/* 043D64 80043164 8CCA0000 */ lw $t2, ($a2) -/* 043D68 80043168 3C098015 */ lui $t1, %hi(gGfxPool) # $t1, 0x8015 -/* 043D6C 8004316C 8D29EF40 */ lw $t1, %lo(gGfxPool)($t1) -/* 043D70 80043170 000A5980 */ sll $t3, $t2, 6 -/* 043D74 80043174 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 043D78 80043178 012B6021 */ addu $t4, $t1, $t3 -/* 043D7C 8004317C 258D02C0 */ addiu $t5, $t4, 0x2c0 -/* 043D80 80043180 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 043D84 80043184 01A17824 */ and $t7, $t5, $at -/* 043D88 80043188 AC6F0004 */ sw $t7, 4($v1) -/* 043D8C 8004318C 8CCE0000 */ lw $t6, ($a2) -/* 043D90 80043190 8FBF0014 */ lw $ra, 0x14($sp) -/* 043D94 80043194 27BD0060 */ addiu $sp, $sp, 0x60 -/* 043D98 80043198 25D80001 */ addiu $t8, $t6, 1 -/* 043D9C 8004319C 03E00008 */ jr $ra -/* 043DA0 800431A0 ACD80000 */ sw $t8, ($a2) - -/* 043DA4 800431A4 00000000 */ nop -/* 043DA8 800431A8 00000000 */ nop diff --git a/include/common_structs.h b/include/common_structs.h index ab0155fc8..fe75e78c4 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -473,7 +473,8 @@ typedef struct { typedef struct { /* 0x00 */ f32 unk_000; - /* 0x04 */ s8 unk_004[0x24]; + /* 0x04 */ Vec3f unk_004; + /* 0x10 */ s8 unk_010[0x18]; /* 0x28 */ f32 unk_028; /* 0x2C */ f32 unk_02C; /* 0x30 */ f32 unk_030; diff --git a/src/code_80040E50.c b/src/code_80040E50.c index 1e60127bf..83e3dcc76 100644 --- a/src/code_80040E50.c +++ b/src/code_80040E50.c @@ -5,6 +5,9 @@ #include "main.h" #include "variables.h" #include "math_util.h" +#include "memory.h" + +#pragma intrinsic (sqrtf) UNUSED void func_80040E50(s32 *arg0, s32 arg1) { *arg0 = (s32) (*arg0 | arg1); @@ -328,26 +331,22 @@ void func_80041480(s16 *arg0, s16 arg1, s16 arg2, s16 *arg3) { } } -s32 func_80041500(Vec3f arg0, f32 arg1, f32 arg2, f32 arg3) { +s32 vec3f_set_dupe_2_electric_boogaloo(Vec3f arg0, f32 arg1, f32 arg2, f32 arg3) { arg0[0] = arg1; arg0[1] = arg2; arg0[2] = arg3; return &arg0; } -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -// weird diff Vec3f *func_80041530(Vec3f dest) { - f32 invsqrt = 1.0f / sqrtf(dest[0] * dest[0] + dest[1] * dest[1] + dest[2] * dest[2]); - dest[0] *= invsqrt; - dest[1] *= invsqrt; - dest[2] *= invsqrt; - return (Vec3f *) dest; + f32 temp_f16; + + temp_f16 = 1.0f / sqrtf((dest[0] * dest[0]) + (dest[1] * dest[1]) + (dest[2] * dest[2])); + dest[0] = dest[0] * temp_f16; + dest[1] = dest[1] * temp_f16; + dest[2] = dest[2] * temp_f16; + return &dest; } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80041530.s") -#endif Vec3f *func_80041594(Vec3f arg0, Vec3f arg1, Vec3f arg2) { @@ -358,23 +357,18 @@ Vec3f *func_80041594(Vec3f arg0, Vec3f arg1, Vec3f arg2) { return &arg0; } -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 UNUSED s32 func_80041608(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { f32 temp_f0; f32 temp_f2; - s32 phi_v1 = 0; + s32 ret = 0; temp_f0 = arg2 - arg0; temp_f2 = arg3 - arg1; - if (((arg2 - arg0 * arg2 - arg0) + (temp_f2 * temp_f2)) <= (arg4 * arg4)) { - return phi_v1 = 1; + if (((temp_f0 * temp_f0) + (temp_f2 * temp_f2)) <= (arg4 * arg4)) { + ret = 1; } - return phi_v1; + return ret; } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80041608.s") -#endif s32 func_80041658(f32 arg0, f32 arg1) { return -atan2s(arg0, arg1) & 0xFFFF; @@ -406,40 +400,33 @@ s32 func_80041770(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { return atan2s(arg1 - arg0, arg3 - arg2); } -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -s32 func_800417B4(s32 arg0, s32 arg1) { - s32 temp_t0; - s32 temp_t6; - s32 temp_t7; +u16 func_800417B4(u16 arg0, u16 arg1) { + u16 ret; - temp_t6 = arg0 & 0xFFFF; - temp_t7 = arg1 & 0xFFFF; - if ((temp_t7 >> 8) != (temp_t6 >> 8)) { - temp_t0 = (temp_t7 - temp_t6) & 0xFFFF; - if (temp_t0 < 0x400) { - return (temp_t6 + 0x80) & 0xFFFF; - } else if (temp_t0 < 0x800) { - return (temp_t6 + 0x200) & 0xFFFF; - } else if (temp_t0 < 0x4000) { - return (temp_t6 + 0x400) & 0xFFFF; - } else if (temp_t0 < 0x8000) { - return (temp_t6 + 0x700) & 0xFFFF; - } else if (temp_t0 < 0xC000) { - return (temp_t6 - 0x700) & 0xFFFF; - } else if (temp_t0 < 0xF800) { - return (temp_t6 - 0x400) & 0xFFFF; - } else if (temp_t0 < 0xFC00) { - return (temp_t6 - 0x200) & 0xFFFF; + if ((arg0 >> 8) != (arg1 >> 8)) { + ret = arg1 - arg0; + if (ret < 0x400) { + ret = arg0 + 0x80; + } else if (ret < 0x800) { + ret = arg0 + 0x200; + } else if (ret < 0x4000) { + ret = arg0 + 0x400; + } else if (ret < 0x8000) { + ret = arg0 + 0x700; + } else if (ret < 0xC000) { + ret = arg0 - 0x700; + }else if (ret < 0xF800) { + ret = arg0 - 0x400; + } else if (ret < 0xFC00) { + ret = arg0 - 0x200; } else { - return (temp_t6 - 0x80) & 0xFFFF; + ret = arg0 - 0x80; } + } else { + ret = arg1; } - return temp_t7 & 0xFFFF; + return ret; } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_800417B4.s") -#endif s32 func_800418AC(f32 arg0, f32 arg1, Vec3f arg2) { return atan2s(arg0 - arg2[0], arg1 - arg2[2]); @@ -449,719 +436,527 @@ s32 func_800418E8(f32 arg0, f32 arg1, Vec3f arg2) { return atan2s(arg0 - arg2[1], arg1 - arg2[2]); } -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_802ADDC8(s32, s32, s32, f32); // extern +s32 func_80041924(UnkActorInner *arg0, f32 *arg1) { + s32 ret = 0; -s32 func_80041924(Vec3f arg0, Vec3f arg1) { - s32 phi_v1 = 0; - - func_802ADDC8(0x41200000, arg1[0], arg1[1], arg1[2]); - if (arg0[1] == 1) { - phi_v1 = 1; + func_802ADDC8(arg0, 10.0f, arg1[0], arg1[1], arg1[2]); + if (arg0->unk34 == 1) { + ret = 1; } - return phi_v1; + return ret; } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80041924.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -s32 func_80041770(f32, f32, s32, s32); // extern +s32 func_80041980(Vec3f arg0, Camera *arg1, u16 arg2) { + u16 temp_t9; + s32 ret; -s32 func_80041980(void *arg0, void *arg1, u16 arg2) { - s32 sp18; - s32 temp_t9; - s32 phi_t0; - - sp18 = 0; - temp_t9 = ((func_80041770(arg1->unk0, arg0->unk0, arg1->unk8, arg0->unk8) + (arg2 / 2)) - arg1->unk26) & 0xFFFF; - phi_t0 = sp18; + ret = 0; + temp_t9 = (func_80041770(arg1->pos[0], arg0[0], arg1->pos[2], arg0[2]) + (arg2 / 2)) - arg1->rotX[1]; if ((temp_t9 >= 0) && (arg2 >= temp_t9)) { - phi_t0 = 1; + ret = 1; } - return phi_t0; + return ret; } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80041980.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042D14(f32 *, f32 *, ? *); // extern -extern ? D_80165834; -extern ? D_80165840; void func_800419F8(void) { - f32 sp2C; - f32 sp28; - f32 sp24; - f32 sp18; - f32 *temp_a1; + Vec3f sp24; + Vec3f sp18; - temp_a1 = &sp24; - sp24 = 0.0f; - sp28 = 0.0f; - sp2C = 120.0f; - func_80042D14(&sp18, temp_a1, &D_80165834); - D_80165840.unk0 = sp18; - D_80165840.unk1 = sp1C; - D_80165840.unk2 = sp20; + sp24[0] = 0.0f; + sp24[1] = 0.0f; + sp24[2] = 120.0f; + func_80042D14(sp18, sp24, D_80165834); + D_80165840[0] = sp18[0]; + D_80165840[1] = sp18[1]; + D_80165840[2] = sp18[2]; } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_800419F8.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_80041A78(void *arg0, s32 arg1, s32 arg2) { - arg0->unk10 = 0.0f; - arg0->unk20 = 0.0f; - arg0->unk4 = 0.0f; - arg0->unk30 = arg1; - arg0->unk24 = 0.0f; - arg0->unk8 = 0.0f; - arg0->unk18 = 0.0f; - arg0->unk38 = 0.0f; - arg0->unk34 = arg2; - arg0->unkC = 0.0f; - arg0->unk1C = 0.0f; - arg0->unk2C = 0.0f; - arg0->unk0 = 1.0f; - arg0->unk14 = 1.0f; - arg0->unk28 = 1.0f; - arg0->unk3C = 1.0f; +UNUSED void func_80041A70(void){ + return; } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80041A78.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -f32 sins(u16, void *); // extern -f32 coss(u16); // extern - -void func_80041AD8(void *arg0, u16 arg1) { - f32 sp1C; - f32 temp_f0; - void *temp_a2; - - temp_a2 = arg0; - arg0 = temp_a2; - sp1C = sins(arg1, temp_a2); - temp_f0 = coss(arg1); - arg0->unk0 = temp_f0; - arg0->unk10 = -sp1C; - arg0->unk14 = temp_f0; - arg0->unk4 = sp1C; - arg0->unk20 = 0.0f; - arg0->unk30 = 0.0f; - arg0->unk24 = 0.0f; - arg0->unk34 = 0.0f; - arg0->unk8 = 0.0f; - arg0->unk18 = 0.0f; - arg0->unk38 = 0.0f; - arg0->unkC = 0.0f; - arg0->unk1C = 0.0f; - arg0->unk2C = 0.0f; - arg0->unk28 = 1.0f; - arg0->unk3C = 1.0f; +void func_80041A78(Mat4 arg0, s32 arg1, s32 arg2) { + arg0[0][0] = 1.0f; + arg0[1][0] = 0.0f; + arg0[2][0] = 0.0f; + arg0[3][0] = arg1; + arg0[0][1] = 0.0f; + arg0[1][1] = 1.0f; + arg0[2][1] = 0.0f; + arg0[3][1] = arg2; + arg0[0][2] = 0.0f; + arg0[1][2] = 0.0f; + arg0[2][2] = 1.0f; + arg0[3][2] = 0.0f; + arg0[0][3] = 0.0f; + arg0[1][3] = 0.0f; + arg0[2][3] = 0.0f; + arg0[3][3] = 1.0f; } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80041AD8.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_80041B68(void *arg0, f32 arg1) { - arg0->unk10 = 0.0f; - arg0->unk20 = 0.0f; - arg0->unk30 = 0.0f; - arg0->unk4 = 0.0f; - arg0->unk24 = 0.0f; - arg0->unk34 = 0.0f; - arg0->unk8 = 0.0f; - arg0->unk18 = 0.0f; - arg0->unk38 = 0.0f; - arg0->unkC = 0.0f; - arg0->unk1C = 0.0f; - arg0->unk2C = 0.0f; - arg0->unk28 = 1.0f; - arg0->unk3C = 1.0f; - arg0->unk0 = arg1; - arg0->unk14 = arg1; +void func_80041AD8(Mat4 arg0, u16 angle) { + f32 sine = sins(angle); + f32 cosine = coss(angle); + + arg0[0][0] = cosine; + arg0[1][0] = -sine; + arg0[2][0] = 0.0f; + arg0[3][0] = 0.0f; + arg0[0][1] = sine; + arg0[1][1] = cosine; + arg0[2][1] = 0.0f; + arg0[3][1] = 0.0f; + arg0[0][2] = 0.0f; + arg0[1][2] = 0.0f; + arg0[2][2] = 1.0f; + arg0[3][2] = 0.0f; + arg0[0][3] = 0.0f; + arg0[1][3] = 0.0f; + arg0[2][3] = 0.0f; + arg0[3][3] = 1.0f; } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80041B68.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -f32 sins(u16, void *); // extern -f32 coss(u16); // extern - -void func_80041BBC(void *arg0, u16 arg1, f32 arg2) { - f32 sp1C; - f32 temp_f12; - void *temp_a2; - - temp_a2 = arg0; - arg0 = temp_a2; - sp1C = sins(arg1, temp_a2); - temp_f12 = coss(arg1) * arg2; - arg0->unk20 = 0.0f; - arg0->unk0 = temp_f12; - arg0->unk14 = temp_f12; - arg0->unk24 = 0.0f; - arg0->unk10 = -sp1C * arg2; - arg0->unk8 = 0.0f; - arg0->unk18 = 0.0f; - arg0->unk4 = sp1C * arg2; - arg0->unk38 = 0.0f; - arg0->unkC = 0.0f; - arg0->unk1C = 0.0f; - arg0->unk2C = 0.0f; - arg0->unk30 = 1.0f; - arg0->unk34 = 1.0f; - arg0->unk28 = 1.0f; - arg0->unk3C = 1.0f; +void func_80041B68(Mat4 arg0, f32 arg1) { + arg0[0][0] = arg1; + arg0[1][0] = 0.0f; + arg0[2][0] = 0.0f; + arg0[3][0] = 0.0f; + arg0[0][1] = 0.0f; + arg0[1][1] = arg1; + arg0[2][1] = 0.0f; + arg0[3][1] = 0.0f; + arg0[0][2] = 0.0f; + arg0[1][2] = 0.0f; + arg0[2][2] = 1.0f; + arg0[3][2] = 0.0f; + arg0[0][3] = 0.0f; + arg0[1][3] = 0.0f; + arg0[2][3] = 0.0f; + arg0[3][3] = 1.0f; } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80041BBC.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -f32 sins(u16); // extern -f32 coss(u16); // extern +void func_80041BBC(Mat4 arg0, u16 angle, f32 arg2) { + f32 sine = sins(angle); + f32 cosine = coss(angle) * arg2; -void func_80041C64(void *arg0, s32 arg1, s32 arg2, u16 arg3, f32 arg4) { - f32 sp24; - f32 temp_f12; - - sp24 = sins(arg3); - temp_f12 = coss(arg3) * arg4; - arg0->unk20 = 0.0f; - arg0->unk0 = temp_f12; - arg0->unk10 = -sp24 * arg4; - arg0->unk14 = temp_f12; - arg0->unk4 = sp24 * arg4; - arg0->unk24 = 0.0f; - arg0->unk30 = arg1; - arg0->unk8 = 0.0f; - arg0->unk18 = 0.0f; - arg0->unk38 = 0.0f; - arg0->unkC = 0.0f; - arg0->unk1C = 0.0f; - arg0->unk2C = 0.0f; - arg0->unk28 = 1.0f; - arg0->unk3C = 1.0f; - arg0->unk34 = arg2; + arg0[0][0] = cosine; + arg0[1][0] = -sine * arg2; + arg0[2][0] = 0.0f; + arg0[3][0] = 1.0f; + arg0[0][1] = sine * arg2; + arg0[1][1] = cosine; + arg0[2][1] = 0.0f; + arg0[3][1] = 1.0f; + arg0[0][2] = 0.0f; + arg0[1][2] = 0.0f; + arg0[2][2] = 1.0f; + arg0[3][2] = 0.0f; + arg0[0][3] = 0.0f; + arg0[1][3] = 0.0f; + arg0[2][3] = 0.0f; + arg0[3][3] = 1.0f; } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80041C64.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern s8 D_801658FE; +void func_80041C64(Mat4 arg0, s32 arg1, s32 arg2, u16 angle, f32 arg4) { + f32 sine = sins(angle); + f32 cosine = coss(angle) * arg4; + + arg0[0][0] = cosine; + arg0[1][0] = -sine * arg4; + arg0[2][0] = 0.0f; + arg0[3][0] = arg1; + arg0[0][1] = sine * arg4; + arg0[1][1] = cosine; + arg0[2][1] = 0.0f; + arg0[3][1] = arg2; + arg0[0][2] = 0.0f; + arg0[1][2] = 0.0f; + arg0[2][2] = 1.0f; + arg0[3][2] = 0.0f; + arg0[0][3] = 0.0f; + arg0[1][3] = 0.0f; + arg0[2][3] = 0.0f; + arg0[3][3] = 1.0f; +} void func_80041D24(void) { D_801658FE = 1; } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80041D24.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 5bd751fca3befef73d6a2e20d84a88cc918a77fe -void guOrtho(Mtx *, f32, f32, f32, f32, f32, f32, f32); /* extern */ -extern s32 gActiveScreenMode; -extern s8 D_801658FE; -extern Mtx D_80183D60; void func_80041D34(void) { guOrtho(&D_80183D60, 0.0f, 320.0f, 240.0f, 0.0f, -1.0f, 1.0f, 1.0f); - switch (gActiveScreenMode) { /* irregular */ - case 0: + switch (gActiveScreenMode) { + case SCREEN_MODE_1P: guOrtho(&gGfxPool->mtxPool[5], 0.0f, 320.0f, 240.0f, 0.0f, -1.0f, 1.0f, 1.0f); break; - case 2: + case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL: guOrtho(&gGfxPool->mtxPool[5], 0.0f, 160.0f, 120.0f, 0.0f, -1.0f, 1.0f, 1.0f); break; - case 1: + case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL: if (D_801658FE == 0) { guOrtho(&gGfxPool->mtxPool[5], 0.0f, 320.0f, 120.0f, 0.0f, -1.0f, 1.0f, 1.0f); - break; } - guOrtho(&gGfxPool->mtxPool[5], 0.0f, 320.0f, 240.0f, 0.0f, -1.0f, 1.0f, 1.0f); + else { + guOrtho(&gGfxPool->mtxPool[5], 0.0f, 320.0f, 240.0f, 0.0f, -1.0f, 1.0f, 1.0f); + } break; - case 3: + case SCREEN_MODE_3P_4P_SPLITSCREEN: guOrtho(&gGfxPool->mtxPool[5], 0.0f, 320.0f, 240.0f, 0.0f, -1.0f, 1.0f, 1.0f); break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80041D34.s") -#endif void func_80041EF4(void) { gDPSetTexturePersp(gDisplayListHead++, G_TP_PERSP); gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[5]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); } -#ifdef MIPS_TO_C -? func_80022180(s32, ? *, s32 *); /* extern */ -? func_80041A78(? *, s32, ?); /* extern */ -extern s32 D_8018D120; -extern void *gDisplayListHead; -extern s32 gGfxPool; +UNUSED void func_80041F54(s32 arg0, s32 arg1) { + Mat4 someMatrix; -UNUSED void func_80041F54(s32 arg0, ? arg1) { - ? sp20; - void *temp_v1; - - func_80041A78(&sp20, arg0, arg1); - func_80022180(gGfxPool + (D_8018D120 << 6) + 0x2C0, &sp20, &D_8018D120); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x01020040; - temp_v1->unk4 = (s32) ((gGfxPool + (D_8018D120 << 6) + 0x2C0) & 0x1FFFFFFF); + func_80041A78(someMatrix, arg0, arg1); + func_80022180(&gGfxPool->mtxPool[D_8018D120 + 0xB], someMatrix); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[D_8018D120 + 0xB]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); D_8018D120 += 1; } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80041F54.s") -#endif -#ifdef MIPS_TO_C -? func_80022180(s32, ? *, s32 *); /* extern */ -? func_80041AD8(? *, s32); /* extern */ -extern s32 D_8018D120; -extern void *gDisplayListHead; -extern s32 gGfxPool; +UNUSED void func_80042000(u16 arg0) { + Mat4 someMatrix; -UNUSED void func_80042000(s32 arg0) { - ? sp20; - void *temp_v1; - - func_80041AD8(&sp20, arg0 & 0xFFFF); - func_80022180(gGfxPool + (D_8018D120 << 6) + 0x2C0, &sp20, &D_8018D120); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x01020040; - temp_v1->unk4 = (s32) ((gGfxPool + (D_8018D120 << 6) + 0x2C0) & 0x1FFFFFFF); + func_80041AD8(someMatrix, arg0); + func_80022180(&gGfxPool->mtxPool[D_8018D120 + 0xB], someMatrix); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[D_8018D120 + 0xB]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); D_8018D120 += 1; } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80042000.s") -#endif - -#ifdef MIPS_TO_C -? func_80022180(s32, ? *, s32 *); /* extern */ -? func_80041B68(? *, f32); /* extern */ -extern s32 D_8018D120; -extern void *gDisplayListHead; -extern s32 gGfxPool; UNUSED void func_800420A8(f32 arg0) { - ? sp20; - void *temp_v1; + Mat4 someMatrix; - func_80041B68(&sp20, arg0); - func_80022180(gGfxPool + (D_8018D120 << 6) + 0x2C0, &sp20, &D_8018D120); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x01020040; - temp_v1->unk4 = (s32) ((gGfxPool + (D_8018D120 << 6) + 0x2C0) & 0x1FFFFFFF); + func_80041B68(someMatrix, arg0); + func_80022180(&gGfxPool->mtxPool[D_8018D120 + 0xB], someMatrix); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[D_8018D120 + 0xB]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); D_8018D120 += 1; } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_800420A8.s") -#endif -#ifdef MIPS_TO_C -? func_80022180(s32, ? *, s32 *); /* extern */ -? func_80041BBC(?, ? *, u16, ?); /* extern */ -extern s32 D_8018D120; -extern void *gDisplayListHead; -extern s32 gGfxPool; +UNUSED void func_8004214C(u16 arg0, f32 arg1) { + Mat4 someMatrix; -UNUSED void func_8004214C(u16 arg0, ? arg1) { - ? sp20; - void *temp_v1; - - func_80041BBC(arg1, &sp20, arg0, arg1); - func_80022180(gGfxPool + (D_8018D120 << 6) + 0x2C0, &sp20, &D_8018D120); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x01020040; - temp_v1->unk4 = (s32) ((gGfxPool + (D_8018D120 << 6) + 0x2C0) & 0x1FFFFFFF); + func_80041BBC(someMatrix, arg0, arg1); + func_80022180(&gGfxPool->mtxPool[D_8018D120 + 0xB], someMatrix); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[D_8018D120 + 0xB]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); D_8018D120 += 1; } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_8004214C.s") -#endif -#ifdef MIPS_TO_C -? func_80022180(s32, ? *); /* extern */ -? func_80041A78(? *, s32, s32); /* extern */ -? func_80041B68(? *, s32, void **); /* extern */ -extern s32 D_8018D120; -extern void *gDisplayListHead; -extern s32 gGfxPool; +UNUSED void func_800421FC(s32 arg0, s32 arg1, f32 arg2) { + Mat4 someMatrix; -UNUSED void func_800421FC(s32 arg0, s32 arg1, s32 arg2) { - ? sp30; - void *temp_v1; - void *temp_v1_2; - - func_80041A78(&sp30, arg0, arg1); - func_80022180(gGfxPool + (D_8018D120 << 6) + 0x2C0, &sp30); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x01020040; - temp_v1->unk4 = (s32) ((gGfxPool + (D_8018D120 << 6) + 0x2C0) & 0x1FFFFFFF); + func_80041A78(someMatrix, arg0, arg1); + func_80022180(&gGfxPool->mtxPool[D_8018D120 + 0xB], someMatrix); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[D_8018D120 + 0xB]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); D_8018D120 += 1; - func_80041B68(&sp30, arg2, &gDisplayListHead); - func_80022180(gGfxPool + (D_8018D120 << 6) + 0x2C0, &sp30); - temp_v1_2 = gDisplayListHead; - gDisplayListHead = temp_v1_2 + 8; - temp_v1_2->unk0 = 0x01000040; - temp_v1_2->unk4 = (s32) ((gGfxPool + (D_8018D120 << 6) + 0x2C0) & 0x1FFFFFFF); + func_80041B68(someMatrix, arg2); + func_80022180(&gGfxPool->mtxPool[D_8018D120 + 0xB], someMatrix); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[D_8018D120 + 0xB]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); D_8018D120 += 1; } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_800421FC.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80022180(void *, ? *, s32 *); // extern -? func_80041C64(f32, ? *, s32, s32, u16, f32); // extern -extern s32 D_8018D120; -extern void *gDisplayListHead; void func_80042330(s32 arg0, s32 arg1, u16 arg2, f32 arg3) { - ? sp28; - void *temp_v1; + Mat4 someMatrix; - func_80041C64(arg3, &sp28, arg0, arg1, arg2, arg3); - func_80022180(gGfxPool + (D_8018D120 << 6) + 0x2C0, &sp28, &D_8018D120); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x1020040; - temp_v1->unk4 = (gGfxPool + (D_8018D120 << 6) + 0x2C0) & 0x1FFFFFFF; - D_8018D120 = D_8018D120 + 1; + func_80041C64(someMatrix, arg0, arg1, arg2, arg3); + func_80022180(&gGfxPool->mtxPool[D_8018D120 + 0xB], someMatrix); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[D_8018D120 + 0xB]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + D_8018D120 += 1; } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80042330.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -f32 sins(u16); // extern -f32 coss(u16); // extern +UNUSED void func_800423F0(Mat4 arg0, u16 arg1, u16 arg2, u16 arg3) { + f32 sine1; + f32 cosine1; + f32 sine2; + f32 cosine2; + f32 sine3; + f32 cosine3; + sine1 = sins(arg1); + cosine1 = coss(arg1); + sine2 = sins(arg2); + cosine2 = coss(arg2); + sine3 = sins(arg3); + cosine3 = coss(arg3); -void func_800425D0(void *arg0, void *arg1, void *arg2, f32 arg3) { - f32 sp44; - f32 sp3C; - f32 sp38; - f32 sp34; - f32 temp_f0; - f32 temp_f12; - f32 temp_f12_2; - f32 temp_f22; - f32 temp_f8; - - sp44 = sins(arg2->unk0); - temp_f22 = coss(arg2->unk0); - sp3C = sins(arg2->unk2); - sp38 = coss(arg2->unk2); - sp34 = sins(arg2->unk4); - temp_f0 = coss(arg2->unk4); - temp_f12 = sp44 * sp3C; - temp_f8 = temp_f12 * temp_f0; - arg0->unk0 = ((sp38 * temp_f0) + (temp_f12 * sp34)) * arg3; - arg0->unk10 = ((-sp38 * sp34) + temp_f8) * arg3; - arg0->unk20 = temp_f22 * sp3C * arg3; - arg0->unk30 = arg1->unk0; - arg0->unk4 = temp_f22 * sp34 * arg3; - arg0->unk14 = temp_f22 * temp_f0 * arg3; - temp_f12_2 = sp44 * sp38; - arg0->unk24 = -sp44 * arg3; - arg0->unk34 = arg1->unk4; - arg0->unk8 = ((-sp3C * temp_f0) + (temp_f12_2 * sp34)) * arg3; - arg0->unk18 = ((sp3C * sp34) + (temp_f12_2 * temp_f0)) * arg3; - arg0->unk28 = temp_f22 * sp38 * arg3; - arg0->unkC = 0.0f; - arg0->unk1C = 0.0f; - arg0->unk2C = 0.0f; - arg0->unk3C = 1.0f; - arg0->unk38 = arg1->unk8; + arg0[0][0] = (cosine2 * cosine3) + ((sine1 * sine2) * sine3); + arg0[1][0] = ((-cosine2) * sine3) + ((sine1 * sine2) * cosine3); + arg0[2][0] = cosine1 * sine2; + arg0[3][0] = 0.0f; + arg0[0][1] = cosine1 * sine3; + arg0[1][1] = cosine1 * cosine3; + arg0[2][1] = -sine1; + arg0[3][1] = 0.0f; + arg0[0][2] = ((-sine2) * cosine3) + ((sine1 * cosine2) * sine3); + arg0[1][2] = (sine2 * sine3) + ((sine1 * cosine2) * cosine3); + arg0[2][2] = cosine1 * cosine2; + arg0[3][2] = 0.0f; + arg0[0][3] = 0.0f; + arg0[1][3] = 0.0f; + arg0[2][3] = 0.0f; + arg0[3][3] = 1.0f; } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_800425D0.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_80042760(void *arg0, void *arg1, void *arg2, f32 arg3) { - f32 temp_f0; +UNUSED void func_8004252C(Mat4 arg0, u16 arg1, u16 arg2) { + f32 sine1; + f32 cosine1; + f32 sine2; + f32 cosine2; - arg0->unk10 = 0.0f; - arg0->unk20 = 0.0f; - arg0->unk0 = arg3; - temp_f0 = -arg3; - arg0->unk4 = 0.0f; - arg0->unk14 = temp_f0; - arg0->unk24 = 0.0f; - arg0->unk30 = arg1->unk0 - arg2->unk0; - arg0->unk28 = temp_f0; - arg0->unk8 = 0.0f; - arg0->unk18 = 0.0f; - arg0->unk34 = arg1->unk4 - arg2->unk4; - arg0->unkC = 0.0f; - arg0->unk1C = 0.0f; - arg0->unk2C = 0.0f; - arg0->unk3C = 1.0f; - arg0->unk38 = arg1->unk8 - arg2->unk8; + sine1 = sins(arg1); + cosine1 = coss(arg1); + sine2 = sins(arg2); + cosine2 = coss(arg2); + arg0[0][0] = cosine2; + arg0[1][0] = sine1 * sine2; + arg0[2][0] = cosine1 * sine2; + arg0[0][1] = 0.0f; + arg0[1][1] = cosine1; + arg0[2][1] = -sine1; + arg0[0][2] = -sine2; + arg0[1][2] = sine1 * cosine2; + arg0[2][2] = cosine1 * cosine2; } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80042760.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -f32 sins(u16); // extern -f32 coss(u16); // extern -extern ? D_80165C18; +void func_800425D0(Mat4 arg0, Vec3f arg1, Vec3s arg2, f32 arg3) { + f32 sine1; + f32 cosine1; + f32 sine2; + f32 cosine2; + f32 sine3; + f32 cosine3; -void func_800427DC(s32 arg0, void *arg1) { - f32 sp3C; - f32 sp34; - f32 sp30; - f32 sp2C; - f32 temp_f0; - f32 temp_f12; - f32 temp_f12_2; - f32 temp_f20; - f32 temp_f8; - void *temp_s0; - - temp_s0 = (arg0 * 0xE0) + &D_80165C18; - sp3C = sins(temp_s0->unkB2); - temp_f20 = coss(temp_s0->unkB2); - sp34 = sins(temp_s0->unkB4); - sp30 = coss(temp_s0->unkB4); - sp2C = sins(temp_s0->unkB6); - temp_f0 = coss(temp_s0->unkB6); - temp_f12 = sp3C * sp34; - temp_f8 = temp_f12 * temp_f0; - arg1->unk0 = temp_s0->unk0 * ((sp30 * temp_f0) + (temp_f12 * sp2C)); - arg1->unk10 = temp_s0->unk0 * ((-sp30 * sp2C) + temp_f8); - arg1->unk20 = temp_s0->unk0 * (temp_f20 * sp34); - arg1->unk30 = temp_s0->unk4; - arg1->unk4 = temp_s0->unk0 * (temp_f20 * sp2C); - arg1->unk14 = temp_s0->unk0 * (temp_f20 * temp_f0); - temp_f12_2 = sp3C * sp30; - arg1->unk24 = temp_s0->unk0 * -sp3C; - arg1->unk34 = temp_s0->unk8; - arg1->unk8 = temp_s0->unk0 * ((-sp34 * temp_f0) + (temp_f12_2 * sp2C)); - arg1->unk18 = temp_s0->unk0 * ((sp34 * sp2C) + (temp_f12_2 * temp_f0)); - arg1->unk28 = temp_s0->unk0 * (temp_f20 * sp30); - arg1->unkC = 0.0f; - arg1->unk1C = 0.0f; - arg1->unk2C = 0.0f; - arg1->unk3C = 1.0f; - arg1->unk38 = temp_s0->unkC; + sine1 = sins(arg2[0]); + cosine1 = coss(arg2[0]); + sine2 = sins(arg2[1]); + cosine2 = coss(arg2[1]); + sine3 = sins(arg2[2]); + cosine3 = coss(arg2[2]); + arg0[0][0] = ((cosine2 * cosine3) + ((sine1 * sine2) * sine3)) * arg3; + arg0[1][0] = ((-cosine2 * sine3) + ((sine1 * sine2) * cosine3)) * arg3; + arg0[2][0] = cosine1 * sine2 * arg3; + arg0[3][0] = arg1[0]; + arg0[0][1] = cosine1 * sine3 * arg3; + arg0[1][1] = cosine1 * cosine3 * arg3; + arg0[2][1] = -sine1 * arg3; + arg0[3][1] = arg1[1]; + arg0[0][2] = ((-sine2 * cosine3) + ((sine1 * cosine2) * sine3)) * arg3; + arg0[1][2] = ((sine2 * sine3) + ((sine1 * cosine2) * cosine3)) * arg3; + arg0[2][2] = cosine1 * cosine2 * arg3; + arg0[3][2] = arg1[2]; + arg0[0][3] = 0.0f; + arg0[1][3] = 0.0f; + arg0[2][3] = 0.0f; + arg0[3][3] = 1.0f; } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_800427DC.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80041500(f32 *, f32, ?, f32); // extern -? func_80041530(f32 *); // extern -? func_80041594(f32 *, f32 *, f32 *); // extern -f32 sins(u16); // extern -f32 coss(u16); // extern +void func_80042760(Mat4 arg0, Vec3f arg1, Vec3f arg2, f32 arg3) { + arg0[0][0] = arg3; + arg0[1][0] = 0.0f; + arg0[2][0] = 0.0f; + arg0[3][0] = arg1[0] - arg2[0]; + arg0[0][1] = 0.0f; + arg0[1][1] = -arg3; + arg0[2][1] = 0.0f; + arg0[3][1] = arg1[1] - arg2[1]; + arg0[0][2] = 0.0f; + arg0[1][2] = 0.0f; + arg0[2][2] = -arg3; + arg0[3][2] = arg1[2] - arg2[2]; + arg0[0][3] = 0.0f; + arg0[1][3] = 0.0f; + arg0[2][3] = 0.0f; + arg0[3][3] = 1.0f; +} -void func_80042A20(void *arg0, f32 *arg1, void *arg2, u16 arg3, f32 arg4) { - f32 sp44; - f32 sp38; - f32 sp2C; - f32 sp24; +void func_800427DC(s32 arg0, Mat4 arg1) { + f32 sine1; + f32 cosine1; + f32 sine2; + f32 cosine2; + f32 sine3; + f32 cosine3; - sp24 = sins(arg3); - func_80041500(&sp44, sp24, 0, coss(arg3)); + sine1 = sins(D_80165C18[arg0].unk_0B2); + cosine1 = coss(D_80165C18[arg0].unk_0B2); + sine2 = sins(D_80165C18[arg0].unk_0B4); + cosine2 = coss(D_80165C18[arg0].unk_0B4); + sine3 = sins(D_80165C18[arg0].unk_0B6); + cosine3 = coss(D_80165C18[arg0].unk_0B6); + arg1[0][0] = D_80165C18[arg0].unk_000 * ((cosine2 * cosine3) + ((sine1 * sine2) * sine3)); + arg1[1][0] = (D_80165C18[arg0].unk_000 * ((-cosine2 * sine3) + ((sine1 * sine2) * cosine3))); + arg1[2][0] = (D_80165C18[arg0].unk_000 * (cosine1 * sine2)); + arg1[3][0] = D_80165C18[arg0].unk_004[0]; + arg1[0][1] = D_80165C18[arg0].unk_000 * (cosine1 * sine3); + arg1[1][1] = (D_80165C18[arg0].unk_000 * (cosine1 * cosine3)); + arg1[2][1] = (D_80165C18[arg0].unk_000 * -sine1); + arg1[3][1] = D_80165C18[arg0].unk_004[1]; + arg1[0][2] = D_80165C18[arg0].unk_000 * ((-sine2 * cosine3) + ((sine1 * cosine2) * sine3)); + arg1[1][2] = (D_80165C18[arg0].unk_000 * ((sine2 * sine3) + ((sine1 * cosine2) * cosine3))); + arg1[2][2] = (D_80165C18[arg0].unk_000 * (cosine1 * cosine2)); + arg1[3][2] = D_80165C18[arg0].unk_004[2]; + arg1[0][3] = 0.0f; + arg1[1][3] = 0.0f; + arg1[2][3] = 0.0f; + arg1[3][3] = 1.0f; +} + +UNUSED void func_80042984(Mat4 arg0, f32 arg1) { + arg0[0][0] *= arg1; + arg0[1][0] *= arg1; + arg0[2][0] *= arg1; +} + +UNUSED void func_800429B8(Mat4 arg0, f32 arg1) { + arg0[0][1] *= arg1; + arg0[1][1] *= arg1; + arg0[2][1] *= arg1; +} + +UNUSED void func_800429EC(Mat4 arg0, f32 arg1) { + arg0[0][2] *= arg1; + arg0[1][2] *= arg1; + arg0[2][2] *= arg1; +} + +void func_80042A20(Mat4 arg0, Vec3f arg1, Vec3f arg2, u16 arg3, f32 arg4) { + Vec3f sp44; + Vec3f sp38; + Vec3f sp2C; + + vec3f_set_dupe_2_electric_boogaloo(sp44, sins(arg3), 0.0f, coss(arg3)); func_80041530(arg1); - func_80041594(&sp38, arg1, &sp44); - func_80041530(&sp38); - func_80041594(&sp2C, &sp38, arg1); - func_80041530(&sp2C); - arg0->unk0 = sp38 * arg4; - arg0->unk4 = sp3C * arg4; - arg0->unk8 = sp40 * arg4; - arg0->unk30 = arg2->unk0; - arg0->unk10 = arg1->unk0 * arg4; - arg0->unk14 = arg1->unk4 * arg4; - arg0->unk18 = arg1->unk8 * arg4; - arg0->unk34 = arg2->unk4; - arg0->unk20 = sp2C * arg4; - arg0->unk24 = sp30 * arg4; - arg0->unk28 = sp34 * arg4; - arg0->unkC = 0.0f; - arg0->unk1C = 0.0f; - arg0->unk2C = 0.0f; - arg0->unk3C = 1.0f; - arg0->unk38 = arg2->unk8; + func_80041594(sp38, arg1, sp44); + func_80041530(sp38); + func_80041594(sp2C, sp38, arg1); + func_80041530(sp2C); + + arg0[0][0] = sp38[0] * arg4; + arg0[0][1] = sp38[1] * arg4; + arg0[0][2] = sp38[2] * arg4; + arg0[3][0] = arg2[0]; + arg0[1][0] = arg1[0] * arg4; + arg0[1][1] = arg1[1] * arg4; + arg0[1][2] = arg1[2] * arg4; + arg0[3][1] = arg2[1]; + arg0[2][0] = sp2C[0] * arg4; + arg0[2][1] = sp2C[1] * arg4; + arg0[2][2] = sp2C[2] * arg4; + arg0[3][2] = arg2[2]; + arg0[0][3] = 0.0f; + arg0[1][3] = 0.0f; + arg0[2][3] = 0.0f; + arg0[3][3] = 1.0f; } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80042A20.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -f32 sins(u16); // extern -f32 coss(u16); // extern +UNUSED void func_80042B5C(Vec3f arg0, Vec3f arg1, Vec3s arg2) { + f32 sp74; + f32 sp70; + f32 sp6C; + f32 temp_f4; + f32 sp64; + f32 sp60; + f32 temp_f8; + f32 sp58; + f32 sp54; + f32 sine1; + f32 cosine1; + f32 sine2; + f32 cosine2; + f32 sine3; + f32 cosine3; -void func_80042D14(void *arg0, void *arg1, void *arg2) { + sine1 = sins(arg2[0]); + cosine1 = coss(arg2[0]); + sine2 = sins(arg2[1]); + cosine2 = coss(arg2[1]); + sine3 = sins(arg2[2]); + cosine3 = coss(arg2[2]); + sp74 = arg1[0] * ((cosine2 * cosine3) + ((sine1 * sine2) * sine3)); + temp_f4 = arg1[1] * ((-cosine2 * sine3) + ((sine1 * sine2) * cosine3)); + temp_f8 = arg1[2] * (cosine1 * sine2); + sp70 = arg1[0] * (cosine1 * sine3); + sp64 = arg1[1] * (cosine1 * cosine3); + sp58 = arg1[2] * -sine1; + sp6C = arg1[0] * ((-sine2 * cosine3) + ((sine1 * cosine2) * sine3)); + sp60 = arg1[1] * ((sine2 * sine3) + ((sine1 * cosine2) * cosine3)); + sp54 = arg1[2] * (cosine1 * cosine2); + arg0[0] = sp74 + temp_f4 + temp_f8; + arg0[1] = sp70 + sp64 + sp58; + arg0[2] = sp6C + sp60 + sp54; +} + +void func_80042D14(Vec3f arg0, Vec3f arg1, Vec3s arg2) { f32 sp2C; f32 sp28; f32 sp24; - f32 sp20; - f32 sp1C; - f32 sp18; - f32 temp_f0; + f32 sine1; + f32 cosine1; + f32 sine2; + f32 cosine2; - sp2C = arg1->unk0; - sp28 = arg1->unk4; - sp24 = arg1->unk8; - sp20 = sins(arg2->unk0); - sp1C = coss(arg2->unk0); - sp18 = sins(arg2->unk2); - temp_f0 = coss(arg2->unk2); - arg0->unk0 = (sp2C * temp_f0) - (sp24 * sp18); - arg0->unk4 = (sp2C * sp20 * sp18) + (sp28 * sp1C) + (sp24 * sp20 * temp_f0); - arg0->unk8 = ((sp2C * sp1C * sp18) - (sp28 * sp20)) + (sp24 * sp1C * temp_f0); + sp2C = arg1[0]; + sp28 = arg1[1]; + sp24 = arg1[2]; + sine1 = sins(arg2[0]); + cosine1 = coss(arg2[0]); + sine2 = sins(arg2[1]); + cosine2 = coss(arg2[1]); + arg0[0] = (sp2C * cosine2) - (sp24 * sine2); + arg0[1] = (sp2C * sine1 * sine2) + (sp28 * cosine1) + (sp24 * sine1 * cosine2); + arg0[2] = ((sp2C * cosine1 * sine2) - (sp28 * sine1)) + (sp24 * cosine1 * cosine2); } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80042D14.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -//? func_80022180(void *, ? *, s32 *); // extern -//? func_800425D0(?, ? *, s32, s32, ?); // extern -extern s32 D_8018D120; -extern void *gDisplayListHead; -extern Gfx gGfxPool[]; +void func_80042E00(Vec3f arg0, Vec3s arg1, f32 arg2) { + Mat4 someMatrix; -void func_80042E00(s32 arg0, s32 arg1) { - Gfx sp20; - void *temp_v1; - - func_800425D0(arg0, arg1); - func_80022180(gGfxPool[&D_8018D120], &sp20, &D_8018D120); - - - gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&D_8018D120), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - //D_8018D120++; -} -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80042E00.s") -#endif - -#ifdef MIPS_TO_C -UNUSED void func_80042EB8(s32 arg0, s32 arg1, ? arg2) { - ? sp20; - void* temp_v1; - - func_80042760(arg2, &sp20, arg0, arg1, arg2); - func_80022180(gGfxPool + (D_8018D120 << 6) + 0x2C0, &sp20, &D_8018D120); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x01020040; - temp_v1->unk4 = (s32) ((gGfxPool + (D_8018D120 << 6) + 0x2C0) & 0x1FFFFFFF); + func_800425D0(someMatrix, arg0, arg1, arg2); + func_80022180(&gGfxPool->mtxPool[D_8018D120 + 0xB], someMatrix); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[D_8018D120 + 0xB]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); D_8018D120 += 1; } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80042EB8.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80022180(void *, ? *, s32 *); // extern -? func_800425D0(?, ? *, s32, s16 *, ?); // extern -extern s32 D_8018D120; -extern void *gDisplayListHead; +UNUSED void func_80042EB8(Vec3f arg0, Vec3f arg1, f32 arg2) { + Mat4 someMatrix; -void func_80042F70(s32 arg0, void *arg1, ? arg2) { - ? sp28; - u16 sp24; - s16 sp22; - s16 sp20; - void *temp_v1; - - sp20 = arg1->unk0 + 0x8000; - sp22 = arg1->unk2 + 0x8000; - sp24 = arg1->unk4; - func_800425D0(arg2, &sp28, arg0, &sp20, arg2); - func_80022180(gGfxPool + (D_8018D120 << 6) + 0x2C0, &sp28, &D_8018D120); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x1020040; - temp_v1->unk4 = (gGfxPool + (D_8018D120 << 6) + 0x2C0) & 0x1FFFFFFF; - D_8018D120 = D_8018D120 + 1; + func_80042760(someMatrix, arg0, arg1, arg2); + func_80022180(&gGfxPool->mtxPool[D_8018D120 + 0xB], someMatrix); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[D_8018D120 + 0xB]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + D_8018D120 += 1; } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80042F70.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80022180(void *, ? *, s32 *); // extern -? func_80042A20(f32, ? *, s32, ?, f32); // extern -extern s32 D_8018D120; -extern void *gDisplayListHead; +void func_80042F70(Vec3f arg0, Vec3s arg1, f32 arg2) { + Mat4 someMatrix; + Vec3s sp20; -void func_80043050(s32 arg0, f32 arg2) { - ? sp28; - void *temp_v1; - - func_80042A20(arg2, &sp28, arg0, 0, arg2); - func_80022180(gGfxPool + (D_8018D120 << 6) + 0x2C0, &sp28, &D_8018D120); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x1020040; - temp_v1->unk4 = (gGfxPool + (D_8018D120 << 6) + 0x2C0) & 0x1FFFFFFF; - D_8018D120 = D_8018D120 + 1; + sp20[0] = (u16)arg1[0] + 0x8000; + sp20[1] = (u16)arg1[1] + 0x8000; + // * 1 done here to force the compiler to respect the u16 typecast + sp20[2] = (u16)arg1[2] * 1; + func_800425D0(someMatrix, arg0, sp20, arg2); + func_80022180(&gGfxPool->mtxPool[D_8018D120 + 0xB], someMatrix); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[D_8018D120 + 0xB]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + D_8018D120 += 1; } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80043050.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80022180(void *, ? *, s32 *); // extern -? func_800427DC(? *); // extern -extern s32 D_8018D120; -extern void *gDisplayListHead; +void func_80043050(Vec3f arg0,Vec3f arg1, f32 arg2) { + Mat4 someMatrix; -void func_80043104(void) { - ? sp20; - void *temp_v1; - - func_800427DC(&sp20); - func_80022180(gGfxPool + (D_8018D120 << 6) + 0x2C0, &sp20, &D_8018D120); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x1020040; - temp_v1->unk4 = (gGfxPool + (D_8018D120 << 6) + 0x2C0) & 0x1FFFFFFF; - D_8018D120 = D_8018D120 + 1; + func_80042A20(someMatrix, arg1, arg0, 0, arg2); + func_80022180(&gGfxPool->mtxPool[D_8018D120 + 0xB], someMatrix); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[D_8018D120 + 0xB]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + D_8018D120 += 1; +} + +void func_80043104(s32 arg0) { + Mat4 someMatrix; + + func_800427DC(arg0, someMatrix); + func_80022180(&gGfxPool->mtxPool[D_8018D120 + 0xB], someMatrix); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[D_8018D120 + 0xB]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + D_8018D120 += 1; } -#else -GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80043104.s") -#endif diff --git a/src/code_80040E50.h b/src/code_80040E50.h index 76b222140..f3b08675e 100644 --- a/src/code_80040E50.h +++ b/src/code_80040E50.h @@ -1,6 +1,7 @@ #ifndef CODE_80040E50_H #define CODE_80040E50_H +#include "types.h" #include "common_structs.h" /* Function Prototypes */ @@ -18,8 +19,22 @@ s32 s32_step_down_towards_alternate(s32*, s32, s32*); s32 s16_step_up_towards_alternate(s16*, s16, s16*); s32 s16_step_down_towards_alternate(s16*, s16, s16*); s32 s32_step_towards(s32*, s32, s32); +s32 func_80041608(f32, f32, f32, f32, f32); s32 func_80041680(f32, f32); s32 func_800416AC(f32, f32); +void func_80041A70(); +void func_80041F54(s32, s32); +void func_80042000(u16); +void func_800420A8(f32); +void func_8004214C(u16, f32); +void func_800421FC(s32, s32, f32); +void func_800423F0(Mat4, u16, u16, u16); +void func_8004252C(Mat4, u16, u16); +void func_80042984(Mat4, f32); +void func_800429B8(Mat4, f32); +void func_800429EC(Mat4, f32); +void func_80042B5C(Vec3f, Vec3f, Vec3s); +void func_80042EB8(Vec3f, Vec3f, f32); void func_80040EC4(Vec3f, Vec3f); @@ -34,16 +49,46 @@ s32 u16_step_down_towards(u16*, s32, s32); s32 s16_step_towards(s16*, s16, s16); s32 f32_step_towards(f32*, f32, f32); void func_80041480(s16*, s16, s16, s16*); -s32 func_80041500(Vec3f, f32, f32, f32); +s32 vec3f_set_dupe_2_electric_boogaloo(Vec3f, f32, f32, f32); +Vec3f *func_80041530(Vec3f dest); Vec3f *func_80041594(Vec3f, Vec3f, Vec3f); s32 func_80041658(f32, f32); f32 func_800416D8(f32, f32, u16); f32 func_80041724(f32, f32, u16); s32 func_80041770(f32, f32, f32, f32); +u16 func_800417B4(u16, u16); s32 func_800418AC(f32, f32, Vec3f); s32 func_800418E8(f32, f32, Vec3f); +s32 func_80041924(UnkActorInner*, Vec3f); +s32 func_80041980(Vec3f, Camera*, u16); +void func_800419F8(); +void func_80041A78(Mat4, s32, s32); +void func_80041AD8(Mat4, u16); +void func_80041B68(Mat4, f32); +void func_80041BBC(Mat4, u16, f32); +void func_80041C64(Mat4, s32, s32, u16, f32); +void func_80041D24(); +void func_80041D34(); void func_80041EF4(); +void func_80042330(s32, s32, u16, f32); +void func_800425D0(Mat4, Vec3f, Vec3s, f32); +void func_80042760(Mat4, Vec3f, Vec3f, f32); +void func_800427DC(s32, Mat4); +void func_80042A20(Mat4, Vec3f, Vec3f, u16, f32); +void func_80042D14(Vec3f, Vec3f, Vec3s); +void func_80042E00(Vec3f, Vec3s, f32); +void func_80042F70(Vec3f, Vec3s, f32); +void func_80043050(Vec3f, Vec3f, f32); +void func_80043104(s32); /* This is where I'd put my static data, if I had any */ +extern Vec3s D_80165834; +extern s8 D_80165840[]; +extern s8 D_801658FE; +extern s32 D_8018D120; + +// This is also used in 80071F00 +extern struct_80165C18_entry D_80165C18[]; + #endif diff --git a/src/code_80071F00.c b/src/code_80071F00.c index cc785a27f..63bc4f833 100644 --- a/src/code_80071F00.c +++ b/src/code_80071F00.c @@ -2,6 +2,7 @@ #include #include #include +#include "code_80040E50.h" #include "code_80071F00.h" s32 find_unused_obj_index(s32* arg0) { @@ -2277,7 +2278,7 @@ void func_8007601C(s32 arg0) { if (D_80165C18[arg0].unk_048 > 0) { --D_80165C18[arg0].unk_048; if (D_80165C18[arg0].unk_048 == 0) { - func_800C9EF4(&D_80165C18[arg0].unk_004, 0x5102800A); + func_800C9EF4(D_80165C18[arg0].unk_004, 0x5102800A); } } @@ -2285,8 +2286,8 @@ void func_8007601C(s32 arg0) { func_8008A6DC(arg0, 300.0f); if ((func_8007223C(arg0, 0x40000) != 0) && (func_80072354(arg0, 1) != 0)) { func_800722A4(arg0, 1); - func_80075F98(&D_80165C18[arg0].unk_004, (u16) D_80165C18[arg0].unk_0C0, 1.0f); - func_800C9D80(&D_80165C18[arg0].unk_004, &D_80165C18[arg0].unk_038, 0x5102800A); + func_80075F98(D_80165C18[arg0].unk_004, (u16) D_80165C18[arg0].unk_0C0, 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_04C = 0x5A; diff --git a/src/code_80071F00.h b/src/code_80071F00.h index e8fa9ecc3..bc7019ee3 100644 --- a/src/code_80071F00.h +++ b/src/code_80071F00.h @@ -3,9 +3,6 @@ #include "common_structs.h" -s32 f32_step_up_towards(f32*, f32, f32); -s32 s16_step_down_towards(s16*, s16, s16); -void func_80041480(s16*, s16, s16, s16*); s32 func_80072044(s32*, s32*, s32); void func_800721C0(s32, s32); void func_800721E8(s32, s32); @@ -38,15 +35,19 @@ void func_80075698(s32); void func_800759EC(s32, s32*, f32); void func_80075B08(s32); void func_80075E5C(s32, void*, u16, s32, s32); -void func_80075F98(s32, s32, f32); +void func_80075F98(Vec3f, s32, f32); void func_80086E70(s32); void func_80086F60(s32); void func_800877C4(s32); void func_8008A6DC(s32, f32); s32 func_8008A8B0(s16, s16); + +// code_80086E70.c void func_8008BF18(s32); -void func_800C9D80(s32*, f32*, s32); -void func_800C9EF4(s32*, s32); + +// audio/external.c +void func_800C9D80(Vec3f, f32*, s32); +void func_800C9EF4(Vec3f, s32); s32 osPiStartDma(OSIoMesg *mb, s32 priority, s32 direction, uintptr_t devAddr, void *vAddr, size_t nbytes, OSMesgQueue *mq); s32 osRecvMesg(OSMesgQueue*, OSMesg*, s32); diff --git a/src/code_80296A50.h b/src/code_80296A50.h index 9c619cde0..e92a778ca 100644 --- a/src/code_80296A50.h +++ b/src/code_80296A50.h @@ -108,7 +108,7 @@ extern void func_800C98B8(Vec3f, Vec3f, u32); extern void func_800C9060(u8, s32); extern void func_800C90F4(u8, uintptr_t); extern void func_800C99E0(Vec3f, s32); -extern void func_800C9D80(Vec3f*, Vec3f*, u32); +extern void func_800C9D80(Vec3f, Vec3f, u32); extern struct Actor gActorList[]; extern Player gPlayers[];