From 98dc90cdd5469619e69b3e39eeb728ba9ffbf689 Mon Sep 17 00:00:00 2001 From: MegaMech Date: Fri, 13 May 2022 04:42:30 -0600 Subject: [PATCH] Decomp more actors (#198) --- asm/non_matchings/code_actors/func_80297818.s | 80 -- asm/non_matchings/code_actors/func_80299144.s | 119 -- asm/non_matchings/code_actors/func_8029930C.s | 119 -- asm/non_matchings/code_actors/func_802994D4.s | 119 -- asm/non_matchings/code_actors/func_8029969C.s | 119 -- asm/non_matchings/code_actors/func_80299864.s | 119 -- asm/non_matchings/code_actors/func_80299A2C.s | 119 -- asm/non_matchings/code_actors/func_80299BF4.s | 119 -- asm/non_matchings/code_actors/func_80299DBC.s | 77 -- asm/non_matchings/code_actors/func_80299EDC.s | 77 -- asm/non_matchings/code_actors/func_80299FFC.s | 77 -- asm/non_matchings/code_actors/func_8029A11C.s | 77 -- asm/non_matchings/code_actors/func_8029A23C.s | 95 -- asm/non_matchings/code_actors/func_8029A3AC.s | 193 --- asm/non_matchings/code_actors/func_8029CF0C.s | 68 - data/data_121DA0.s | 37 +- include/PR/mbi.h | 1 + include/actor_types.h | 13 + src/code_80296A50.c | 1156 +++++------------ 19 files changed, 341 insertions(+), 2443 deletions(-) delete mode 100644 asm/non_matchings/code_actors/func_80297818.s delete mode 100644 asm/non_matchings/code_actors/func_80299144.s delete mode 100644 asm/non_matchings/code_actors/func_8029930C.s delete mode 100644 asm/non_matchings/code_actors/func_802994D4.s delete mode 100644 asm/non_matchings/code_actors/func_8029969C.s delete mode 100644 asm/non_matchings/code_actors/func_80299864.s delete mode 100644 asm/non_matchings/code_actors/func_80299A2C.s delete mode 100644 asm/non_matchings/code_actors/func_80299BF4.s delete mode 100644 asm/non_matchings/code_actors/func_80299DBC.s delete mode 100644 asm/non_matchings/code_actors/func_80299EDC.s delete mode 100644 asm/non_matchings/code_actors/func_80299FFC.s delete mode 100644 asm/non_matchings/code_actors/func_8029A11C.s delete mode 100644 asm/non_matchings/code_actors/func_8029A23C.s delete mode 100644 asm/non_matchings/code_actors/func_8029A3AC.s delete mode 100644 asm/non_matchings/code_actors/func_8029CF0C.s diff --git a/asm/non_matchings/code_actors/func_80297818.s b/asm/non_matchings/code_actors/func_80297818.s deleted file mode 100644 index 0307acb09..000000000 --- a/asm/non_matchings/code_actors/func_80297818.s +++ /dev/null @@ -1,80 +0,0 @@ -glabel func_80297818 -/* 100E28 80297818 3C040D00 */ lui $a0, %hi(D_0D004E38) # $a0, 0xd00 -/* 100E2C 8029781C 24844E38 */ addiu $a0, %lo(D_0D004E38) # addiu $a0, $a0, 0x4e38 -/* 100E30 80297820 00047602 */ srl $t6, $a0, 0x18 -/* 100E34 80297824 000E7880 */ sll $t7, $t6, 2 -/* 100E38 80297828 3C188015 */ lui $t8, %hi(gSegmentTable) -/* 100E3C 8029782C 030FC021 */ addu $t8, $t8, $t7 -/* 100E40 80297830 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* 100E44 80297834 8F180258 */ lw $t8, %lo(gSegmentTable)($t8) -/* 100E48 80297838 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 100E4C 8029783C 0081C824 */ and $t9, $a0, $at -/* 100E50 80297840 3C02802C */ lui $v0, %hi(D_802BA060) # $v0, 0x802c -/* 100E54 80297844 3C018000 */ lui $at, 0x8000 -/* 100E58 80297848 03191821 */ addu $v1, $t8, $t9 -/* 100E5C 8029784C 2442A060 */ addiu $v0, %lo(D_802BA060) # addiu $v0, $v0, -0x5fa0 -/* 100E60 80297850 00611821 */ addu $v1, $v1, $at -/* 100E64 80297854 00002825 */ move $a1, $zero -/* 100E68 80297858 24060100 */ li $a2, 256 -.L8029785C: -/* 100E6C 8029785C 84640000 */ lh $a0, ($v1) -/* 100E70 80297860 24A50004 */ addiu $a1, $a1, 4 -/* 100E74 80297864 24630008 */ addiu $v1, $v1, 8 -/* 100E78 80297868 3088F800 */ andi $t0, $a0, 0xf800 -/* 100E7C 8029786C 00084C00 */ sll $t1, $t0, 0x10 -/* 100E80 80297870 00095403 */ sra $t2, $t1, 0x10 -/* 100E84 80297874 308E07C0 */ andi $t6, $a0, 0x7c0 -/* 100E88 80297878 000E7940 */ sll $t7, $t6, 5 -/* 100E8C 8029787C 000A5943 */ sra $t3, $t2, 5 -/* 100E90 80297880 016FC025 */ or $t8, $t3, $t7 -/* 100E94 80297884 3089003E */ andi $t1, $a0, 0x3e -/* 100E98 80297888 03095025 */ or $t2, $t8, $t1 -/* 100E9C 8029788C 308E0001 */ andi $t6, $a0, 1 -/* 100EA0 80297890 014E5825 */ or $t3, $t2, $t6 -/* 100EA4 80297894 A44B0000 */ sh $t3, ($v0) -/* 100EA8 80297898 8464FFFA */ lh $a0, -6($v1) -/* 100EAC 8029789C 24420008 */ addiu $v0, $v0, 8 -/* 100EB0 802978A0 308FF800 */ andi $t7, $a0, 0xf800 -/* 100EB4 802978A4 000FCC00 */ sll $t9, $t7, 0x10 -/* 100EB8 802978A8 00194403 */ sra $t0, $t9, 0x10 -/* 100EBC 802978AC 308D07C0 */ andi $t5, $a0, 0x7c0 -/* 100EC0 802978B0 000D5140 */ sll $t2, $t5, 5 -/* 100EC4 802978B4 0008C143 */ sra $t8, $t0, 5 -/* 100EC8 802978B8 030A7025 */ or $t6, $t8, $t2 -/* 100ECC 802978BC 3099003E */ andi $t9, $a0, 0x3e -/* 100ED0 802978C0 01D94025 */ or $t0, $t6, $t9 -/* 100ED4 802978C4 308D0001 */ andi $t5, $a0, 1 -/* 100ED8 802978C8 010DC025 */ or $t8, $t0, $t5 -/* 100EDC 802978CC A458FFFA */ sh $t8, -6($v0) -/* 100EE0 802978D0 8464FFFC */ lh $a0, -4($v1) -/* 100EE4 802978D4 308AF800 */ andi $t2, $a0, 0xf800 -/* 100EE8 802978D8 000A5C00 */ sll $t3, $t2, 0x10 -/* 100EEC 802978DC 000B7C03 */ sra $t7, $t3, 0x10 -/* 100EF0 802978E0 308C07C0 */ andi $t4, $a0, 0x7c0 -/* 100EF4 802978E4 000C4140 */ sll $t0, $t4, 5 -/* 100EF8 802978E8 000F7143 */ sra $t6, $t7, 5 -/* 100EFC 802978EC 01C86825 */ or $t5, $t6, $t0 -/* 100F00 802978F0 308B003E */ andi $t3, $a0, 0x3e -/* 100F04 802978F4 01AB7825 */ or $t7, $t5, $t3 -/* 100F08 802978F8 308C0001 */ andi $t4, $a0, 1 -/* 100F0C 802978FC 01EC7025 */ or $t6, $t7, $t4 -/* 100F10 80297900 A44EFFFC */ sh $t6, -4($v0) -/* 100F14 80297904 8464FFFE */ lh $a0, -2($v1) -/* 100F18 80297908 3088F800 */ andi $t0, $a0, 0xf800 -/* 100F1C 8029790C 0008C400 */ sll $t8, $t0, 0x10 -/* 100F20 80297910 00185403 */ sra $t2, $t8, 0x10 -/* 100F24 80297914 308907C0 */ andi $t1, $a0, 0x7c0 -/* 100F28 80297918 00097940 */ sll $t7, $t1, 5 -/* 100F2C 8029791C 000A6943 */ sra $t5, $t2, 5 -/* 100F30 80297920 01AF6025 */ or $t4, $t5, $t7 -/* 100F34 80297924 3098003E */ andi $t8, $a0, 0x3e -/* 100F38 80297928 01985025 */ or $t2, $t4, $t8 -/* 100F3C 8029792C 30890001 */ andi $t1, $a0, 1 -/* 100F40 80297930 01496825 */ or $t5, $t2, $t1 -/* 100F44 80297934 14A6FFC9 */ bne $a1, $a2, .L8029785C -/* 100F48 80297938 A44DFFFE */ sh $t5, -2($v0) -/* 100F4C 8029793C 03E00008 */ jr $ra -/* 100F50 80297940 00000000 */ nop - -/* 100F54 80297944 03E00008 */ jr $ra -/* 100F58 80297948 00000000 */ nop diff --git a/asm/non_matchings/code_actors/func_80299144.s b/asm/non_matchings/code_actors/func_80299144.s deleted file mode 100644 index e5923208e..000000000 --- a/asm/non_matchings/code_actors/func_80299144.s +++ /dev/null @@ -1,119 +0,0 @@ -glabel func_80299144 -/* 102754 80299144 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 102758 80299148 AFBF0024 */ sw $ra, 0x24($sp) -/* 10275C 8029914C AFB00020 */ sw $s0, 0x20($sp) -/* 102760 80299150 AFA50054 */ sw $a1, 0x54($sp) -/* 102764 80299154 84C20002 */ lh $v0, 2($a2) -/* 102768 80299158 00C08025 */ move $s0, $a2 -/* 10276C 8029915C 24C50018 */ addiu $a1, $a2, 0x18 -/* 102770 80299160 304E0800 */ andi $t6, $v0, 0x800 -/* 102774 80299164 15C00064 */ bnez $t6, .L802992F8 -/* 102778 80299168 24070000 */ li $a3, 0 -/* 10277C 8029916C 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e -/* 102780 80299170 8DEFDB40 */ lw $t7, %lo(camera1)($t7) -/* 102784 80299174 240100B8 */ li $at, 184 -/* 102788 80299178 94860026 */ lhu $a2, 0x26($a0) -/* 10278C 8029917C 008FC023 */ subu $t8, $a0, $t7 -/* 102790 80299180 0301001A */ div $zero, $t8, $at -/* 102794 80299184 0000C812 */ mflo $t9 -/* 102798 80299188 00195880 */ sll $t3, $t9, 2 -/* 10279C 8029918C 3C018015 */ lui $at, %hi(D_80150130) -/* 1027A0 80299190 002B0821 */ addu $at, $at, $t3 -/* 1027A4 80299194 C4240130 */ lwc1 $f4, %lo(D_80150130)($at) -/* 1027A8 80299198 3C01802C */ lui $at, %hi(D_802B9658) # $at, 0x802c -/* 1027AC 8029919C C4269658 */ lwc1 $f6, %lo(D_802B9658)($at) -/* 1027B0 802991A0 AFA50028 */ sw $a1, 0x28($sp) -/* 1027B4 802991A4 A7A2004A */ sh $v0, 0x4a($sp) -/* 1027B8 802991A8 E7A40010 */ swc1 $f4, 0x10($sp) -/* 1027BC 802991AC 0C0AE034 */ jal func_802B80D0 -/* 1027C0 802991B0 E7A60014 */ swc1 $f6, 0x14($sp) -/* 1027C4 802991B4 44804000 */ mtc1 $zero, $f8 -/* 1027C8 802991B8 87A2004A */ lh $v0, 0x4a($sp) -/* 1027CC 802991BC 8FA70054 */ lw $a3, 0x54($sp) -/* 1027D0 802991C0 4608003C */ c.lt.s $f0, $f8 -/* 1027D4 802991C4 304C0400 */ andi $t4, $v0, 0x400 -/* 1027D8 802991C8 4503004C */ bc1tl .L802992FC -/* 1027DC 802991CC 8FBF0024 */ lw $ra, 0x24($sp) -/* 1027E0 802991D0 1580000B */ bnez $t4, .L80299200 -/* 1027E4 802991D4 3C01802C */ lui $at, %hi(D_802B965C) # $at, 0x802c -/* 1027E8 802991D8 C42A965C */ lwc1 $f10, %lo(D_802B965C)($at) -/* 1027EC 802991DC 8FA40028 */ lw $a0, 0x28($sp) -/* 1027F0 802991E0 26050010 */ addiu $a1, $s0, 0x10 -/* 1027F4 802991E4 460A003C */ c.lt.s $f0, $f10 -/* 1027F8 802991E8 00000000 */ nop -/* 1027FC 802991EC 45020005 */ bc1fl .L80299204 -/* 102800 802991F0 C6100018 */ lwc1 $f16, 0x18($s0) -/* 102804 802991F4 0C0A5E53 */ jal func_8029794C -/* 102808 802991F8 3C064040 */ lui $a2, 0x4040 -/* 10280C 802991FC 8FA70054 */ lw $a3, 0x54($sp) -.L80299200: -/* 102810 80299200 C6100018 */ lwc1 $f16, 0x18($s0) -.L80299204: -/* 102814 80299204 00E02025 */ move $a0, $a3 -/* 102818 80299208 00002825 */ move $a1, $zero -/* 10281C 8029920C E4F00030 */ swc1 $f16, 0x30($a3) -/* 102820 80299210 C612001C */ lwc1 $f18, 0x1c($s0) -/* 102824 80299214 E4F20034 */ swc1 $f18, 0x34($a3) -/* 102828 80299218 C6040020 */ lwc1 $f4, 0x20($s0) -/* 10282C 8029921C 0C0AD3FE */ jal func_802B4FF8 -/* 102830 80299220 E4E40038 */ swc1 $f4, 0x38($a3) -/* 102834 80299224 10400034 */ beqz $v0, .L802992F8 -/* 102838 80299228 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 10283C 8029922C 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 102840 80299230 8C620000 */ lw $v0, ($v1) -/* 102844 80299234 3C0F0D00 */ lui $t7, %hi(D_0D004C68) # $t7, 0xd00 -/* 102848 80299238 25EF4C68 */ addiu $t7, %lo(D_0D004C68) # addiu $t7, $t7, 0x4c68 -/* 10284C 8029923C 244D0008 */ addiu $t5, $v0, 8 -/* 102850 80299240 AC6D0000 */ sw $t5, ($v1) -/* 102854 80299244 3C0EFD10 */ lui $t6, 0xfd10 -/* 102858 80299248 AC4E0000 */ sw $t6, ($v0) -/* 10285C 8029924C AC4F0004 */ sw $t7, 4($v0) -/* 102860 80299250 8C620000 */ lw $v0, ($v1) -/* 102864 80299254 3C19E800 */ lui $t9, 0xe800 -/* 102868 80299258 3C0CF500 */ lui $t4, (0xF5000100 >> 16) # lui $t4, 0xf500 -/* 10286C 8029925C 24580008 */ addiu $t8, $v0, 8 -/* 102870 80299260 AC780000 */ sw $t8, ($v1) -/* 102874 80299264 AC400004 */ sw $zero, 4($v0) -/* 102878 80299268 AC590000 */ sw $t9, ($v0) -/* 10287C 8029926C 8C620000 */ lw $v0, ($v1) -/* 102880 80299270 358C0100 */ ori $t4, (0xF5000100 & 0xFFFF) # ori $t4, $t4, 0x100 -/* 102884 80299274 3C0D0700 */ lui $t5, 0x700 -/* 102888 80299278 244B0008 */ addiu $t3, $v0, 8 -/* 10288C 8029927C AC6B0000 */ sw $t3, ($v1) -/* 102890 80299280 AC4D0004 */ sw $t5, 4($v0) -/* 102894 80299284 AC4C0000 */ sw $t4, ($v0) -/* 102898 80299288 8C620000 */ lw $v0, ($v1) -/* 10289C 8029928C 3C0FE600 */ lui $t7, 0xe600 -/* 1028A0 80299290 3C0B073F */ lui $t3, (0x073FC000 >> 16) # lui $t3, 0x73f -/* 1028A4 80299294 244E0008 */ addiu $t6, $v0, 8 -/* 1028A8 80299298 AC6E0000 */ sw $t6, ($v1) -/* 1028AC 8029929C AC400004 */ sw $zero, 4($v0) -/* 1028B0 802992A0 AC4F0000 */ sw $t7, ($v0) -/* 1028B4 802992A4 8C620000 */ lw $v0, ($v1) -/* 1028B8 802992A8 356BC000 */ ori $t3, (0x073FC000 & 0xFFFF) # ori $t3, $t3, 0xc000 -/* 1028BC 802992AC 3C19F000 */ lui $t9, 0xf000 -/* 1028C0 802992B0 24580008 */ addiu $t8, $v0, 8 -/* 1028C4 802992B4 AC780000 */ sw $t8, ($v1) -/* 1028C8 802992B8 AC4B0004 */ sw $t3, 4($v0) -/* 1028CC 802992BC AC590000 */ sw $t9, ($v0) -/* 1028D0 802992C0 8C620000 */ lw $v0, ($v1) -/* 1028D4 802992C4 3C0DE700 */ lui $t5, 0xe700 -/* 1028D8 802992C8 3C180600 */ lui $t8, %hi(D_06006A68) # $t8, 0x600 -/* 1028DC 802992CC 244C0008 */ addiu $t4, $v0, 8 -/* 1028E0 802992D0 AC6C0000 */ sw $t4, ($v1) -/* 1028E4 802992D4 AC400004 */ sw $zero, 4($v0) -/* 1028E8 802992D8 AC4D0000 */ sw $t5, ($v0) -/* 1028EC 802992DC 8C620000 */ lw $v0, ($v1) -/* 1028F0 802992E0 27186A68 */ addiu $t8, %lo(D_06006A68) # addiu $t8, $t8, 0x6a68 -/* 1028F4 802992E4 3C0F0600 */ lui $t7, 0x600 -/* 1028F8 802992E8 244E0008 */ addiu $t6, $v0, 8 -/* 1028FC 802992EC AC6E0000 */ sw $t6, ($v1) -/* 102900 802992F0 AC580004 */ sw $t8, 4($v0) -/* 102904 802992F4 AC4F0000 */ sw $t7, ($v0) -.L802992F8: -/* 102908 802992F8 8FBF0024 */ lw $ra, 0x24($sp) -.L802992FC: -/* 10290C 802992FC 8FB00020 */ lw $s0, 0x20($sp) -/* 102910 80299300 27BD0050 */ addiu $sp, $sp, 0x50 -/* 102914 80299304 03E00008 */ jr $ra -/* 102918 80299308 00000000 */ nop diff --git a/asm/non_matchings/code_actors/func_8029930C.s b/asm/non_matchings/code_actors/func_8029930C.s deleted file mode 100644 index 8486059b8..000000000 --- a/asm/non_matchings/code_actors/func_8029930C.s +++ /dev/null @@ -1,119 +0,0 @@ -glabel func_8029930C -/* 10291C 8029930C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 102920 80299310 AFBF0024 */ sw $ra, 0x24($sp) -/* 102924 80299314 AFB00020 */ sw $s0, 0x20($sp) -/* 102928 80299318 AFA50054 */ sw $a1, 0x54($sp) -/* 10292C 8029931C 84C20002 */ lh $v0, 2($a2) -/* 102930 80299320 00C08025 */ move $s0, $a2 -/* 102934 80299324 24C50018 */ addiu $a1, $a2, 0x18 -/* 102938 80299328 304E0800 */ andi $t6, $v0, 0x800 -/* 10293C 8029932C 15C00064 */ bnez $t6, .L802994C0 -/* 102940 80299330 24070000 */ li $a3, 0 -/* 102944 80299334 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e -/* 102948 80299338 8DEFDB40 */ lw $t7, %lo(camera1)($t7) -/* 10294C 8029933C 240100B8 */ li $at, 184 -/* 102950 80299340 94860026 */ lhu $a2, 0x26($a0) -/* 102954 80299344 008FC023 */ subu $t8, $a0, $t7 -/* 102958 80299348 0301001A */ div $zero, $t8, $at -/* 10295C 8029934C 0000C812 */ mflo $t9 -/* 102960 80299350 00195880 */ sll $t3, $t9, 2 -/* 102964 80299354 3C018015 */ lui $at, %hi(D_80150130) -/* 102968 80299358 002B0821 */ addu $at, $at, $t3 -/* 10296C 8029935C C4240130 */ lwc1 $f4, %lo(D_80150130)($at) -/* 102970 80299360 3C01802C */ lui $at, %hi(D_802B9660) # $at, 0x802c -/* 102974 80299364 C4269660 */ lwc1 $f6, %lo(D_802B9660)($at) -/* 102978 80299368 AFA50028 */ sw $a1, 0x28($sp) -/* 10297C 8029936C A7A2004A */ sh $v0, 0x4a($sp) -/* 102980 80299370 E7A40010 */ swc1 $f4, 0x10($sp) -/* 102984 80299374 0C0AE034 */ jal func_802B80D0 -/* 102988 80299378 E7A60014 */ swc1 $f6, 0x14($sp) -/* 10298C 8029937C 44804000 */ mtc1 $zero, $f8 -/* 102990 80299380 87A2004A */ lh $v0, 0x4a($sp) -/* 102994 80299384 8FA70054 */ lw $a3, 0x54($sp) -/* 102998 80299388 4608003C */ c.lt.s $f0, $f8 -/* 10299C 8029938C 304C0400 */ andi $t4, $v0, 0x400 -/* 1029A0 80299390 4503004C */ bc1tl .L802994C4 -/* 1029A4 80299394 8FBF0024 */ lw $ra, 0x24($sp) -/* 1029A8 80299398 1580000B */ bnez $t4, .L802993C8 -/* 1029AC 8029939C 3C01802C */ lui $at, %hi(D_802B9664) # $at, 0x802c -/* 1029B0 802993A0 C42A9664 */ lwc1 $f10, %lo(D_802B9664)($at) -/* 1029B4 802993A4 8FA40028 */ lw $a0, 0x28($sp) -/* 1029B8 802993A8 26050010 */ addiu $a1, $s0, 0x10 -/* 1029BC 802993AC 460A003C */ c.lt.s $f0, $f10 -/* 1029C0 802993B0 3C064033 */ lui $a2, (0x40333333 >> 16) # lui $a2, 0x4033 -/* 1029C4 802993B4 45020005 */ bc1fl .L802993CC -/* 1029C8 802993B8 C6100018 */ lwc1 $f16, 0x18($s0) -/* 1029CC 802993BC 0C0A5E53 */ jal func_8029794C -/* 1029D0 802993C0 34C63333 */ ori $a2, (0x40333333 & 0xFFFF) # ori $a2, $a2, 0x3333 -/* 1029D4 802993C4 8FA70054 */ lw $a3, 0x54($sp) -.L802993C8: -/* 1029D8 802993C8 C6100018 */ lwc1 $f16, 0x18($s0) -.L802993CC: -/* 1029DC 802993CC 00E02025 */ move $a0, $a3 -/* 1029E0 802993D0 00002825 */ move $a1, $zero -/* 1029E4 802993D4 E4F00030 */ swc1 $f16, 0x30($a3) -/* 1029E8 802993D8 C612001C */ lwc1 $f18, 0x1c($s0) -/* 1029EC 802993DC E4F20034 */ swc1 $f18, 0x34($a3) -/* 1029F0 802993E0 C6040020 */ lwc1 $f4, 0x20($s0) -/* 1029F4 802993E4 0C0AD3FE */ jal func_802B4FF8 -/* 1029F8 802993E8 E4E40038 */ swc1 $f4, 0x38($a3) -/* 1029FC 802993EC 10400034 */ beqz $v0, .L802994C0 -/* 102A00 802993F0 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 102A04 802993F4 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 102A08 802993F8 8C620000 */ lw $v0, ($v1) -/* 102A0C 802993FC 3C0F0D00 */ lui $t7, %hi(D_0D004C68) # $t7, 0xd00 -/* 102A10 80299400 25EF4C68 */ addiu $t7, %lo(D_0D004C68) # addiu $t7, $t7, 0x4c68 -/* 102A14 80299404 244D0008 */ addiu $t5, $v0, 8 -/* 102A18 80299408 AC6D0000 */ sw $t5, ($v1) -/* 102A1C 8029940C 3C0EFD10 */ lui $t6, 0xfd10 -/* 102A20 80299410 AC4E0000 */ sw $t6, ($v0) -/* 102A24 80299414 AC4F0004 */ sw $t7, 4($v0) -/* 102A28 80299418 8C620000 */ lw $v0, ($v1) -/* 102A2C 8029941C 3C19E800 */ lui $t9, 0xe800 -/* 102A30 80299420 3C0CF500 */ lui $t4, (0xF5000100 >> 16) # lui $t4, 0xf500 -/* 102A34 80299424 24580008 */ addiu $t8, $v0, 8 -/* 102A38 80299428 AC780000 */ sw $t8, ($v1) -/* 102A3C 8029942C AC400004 */ sw $zero, 4($v0) -/* 102A40 80299430 AC590000 */ sw $t9, ($v0) -/* 102A44 80299434 8C620000 */ lw $v0, ($v1) -/* 102A48 80299438 358C0100 */ ori $t4, (0xF5000100 & 0xFFFF) # ori $t4, $t4, 0x100 -/* 102A4C 8029943C 3C0D0700 */ lui $t5, 0x700 -/* 102A50 80299440 244B0008 */ addiu $t3, $v0, 8 -/* 102A54 80299444 AC6B0000 */ sw $t3, ($v1) -/* 102A58 80299448 AC4D0004 */ sw $t5, 4($v0) -/* 102A5C 8029944C AC4C0000 */ sw $t4, ($v0) -/* 102A60 80299450 8C620000 */ lw $v0, ($v1) -/* 102A64 80299454 3C0FE600 */ lui $t7, 0xe600 -/* 102A68 80299458 3C0B073F */ lui $t3, (0x073FC000 >> 16) # lui $t3, 0x73f -/* 102A6C 8029945C 244E0008 */ addiu $t6, $v0, 8 -/* 102A70 80299460 AC6E0000 */ sw $t6, ($v1) -/* 102A74 80299464 AC400004 */ sw $zero, 4($v0) -/* 102A78 80299468 AC4F0000 */ sw $t7, ($v0) -/* 102A7C 8029946C 8C620000 */ lw $v0, ($v1) -/* 102A80 80299470 356BC000 */ ori $t3, (0x073FC000 & 0xFFFF) # ori $t3, $t3, 0xc000 -/* 102A84 80299474 3C19F000 */ lui $t9, 0xf000 -/* 102A88 80299478 24580008 */ addiu $t8, $v0, 8 -/* 102A8C 8029947C AC780000 */ sw $t8, ($v1) -/* 102A90 80299480 AC4B0004 */ sw $t3, 4($v0) -/* 102A94 80299484 AC590000 */ sw $t9, ($v0) -/* 102A98 80299488 8C620000 */ lw $v0, ($v1) -/* 102A9C 8029948C 3C0DE700 */ lui $t5, 0xe700 -/* 102AA0 80299490 3C180601 */ lui $t8, %hi(D_06015B48) # $t8, 0x601 -/* 102AA4 80299494 244C0008 */ addiu $t4, $v0, 8 -/* 102AA8 80299498 AC6C0000 */ sw $t4, ($v1) -/* 102AAC 8029949C AC400004 */ sw $zero, 4($v0) -/* 102AB0 802994A0 AC4D0000 */ sw $t5, ($v0) -/* 102AB4 802994A4 8C620000 */ lw $v0, ($v1) -/* 102AB8 802994A8 27185B48 */ addiu $t8, %lo(D_06015B48) # addiu $t8, $t8, 0x5b48 -/* 102ABC 802994AC 3C0F0600 */ lui $t7, 0x600 -/* 102AC0 802994B0 244E0008 */ addiu $t6, $v0, 8 -/* 102AC4 802994B4 AC6E0000 */ sw $t6, ($v1) -/* 102AC8 802994B8 AC580004 */ sw $t8, 4($v0) -/* 102ACC 802994BC AC4F0000 */ sw $t7, ($v0) -.L802994C0: -/* 102AD0 802994C0 8FBF0024 */ lw $ra, 0x24($sp) -.L802994C4: -/* 102AD4 802994C4 8FB00020 */ lw $s0, 0x20($sp) -/* 102AD8 802994C8 27BD0050 */ addiu $sp, $sp, 0x50 -/* 102ADC 802994CC 03E00008 */ jr $ra -/* 102AE0 802994D0 00000000 */ nop diff --git a/asm/non_matchings/code_actors/func_802994D4.s b/asm/non_matchings/code_actors/func_802994D4.s deleted file mode 100644 index 93a001916..000000000 --- a/asm/non_matchings/code_actors/func_802994D4.s +++ /dev/null @@ -1,119 +0,0 @@ -glabel func_802994D4 -/* 102AE4 802994D4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 102AE8 802994D8 AFBF0024 */ sw $ra, 0x24($sp) -/* 102AEC 802994DC AFB00020 */ sw $s0, 0x20($sp) -/* 102AF0 802994E0 AFA50054 */ sw $a1, 0x54($sp) -/* 102AF4 802994E4 84C20002 */ lh $v0, 2($a2) -/* 102AF8 802994E8 00C08025 */ move $s0, $a2 -/* 102AFC 802994EC 24C50018 */ addiu $a1, $a2, 0x18 -/* 102B00 802994F0 304E0800 */ andi $t6, $v0, 0x800 -/* 102B04 802994F4 15C00064 */ bnez $t6, .L80299688 -/* 102B08 802994F8 24070000 */ li $a3, 0 -/* 102B0C 802994FC 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e -/* 102B10 80299500 8DEFDB40 */ lw $t7, %lo(camera1)($t7) -/* 102B14 80299504 240100B8 */ li $at, 184 -/* 102B18 80299508 94860026 */ lhu $a2, 0x26($a0) -/* 102B1C 8029950C 008FC023 */ subu $t8, $a0, $t7 -/* 102B20 80299510 0301001A */ div $zero, $t8, $at -/* 102B24 80299514 0000C812 */ mflo $t9 -/* 102B28 80299518 00195880 */ sll $t3, $t9, 2 -/* 102B2C 8029951C 3C018015 */ lui $at, %hi(D_80150130) -/* 102B30 80299520 002B0821 */ addu $at, $at, $t3 -/* 102B34 80299524 C4240130 */ lwc1 $f4, %lo(D_80150130)($at) -/* 102B38 80299528 3C01802C */ lui $at, %hi(D_802B9668) # $at, 0x802c -/* 102B3C 8029952C C4269668 */ lwc1 $f6, %lo(D_802B9668)($at) -/* 102B40 80299530 AFA50028 */ sw $a1, 0x28($sp) -/* 102B44 80299534 A7A2004A */ sh $v0, 0x4a($sp) -/* 102B48 80299538 E7A40010 */ swc1 $f4, 0x10($sp) -/* 102B4C 8029953C 0C0AE034 */ jal func_802B80D0 -/* 102B50 80299540 E7A60014 */ swc1 $f6, 0x14($sp) -/* 102B54 80299544 44804000 */ mtc1 $zero, $f8 -/* 102B58 80299548 87A2004A */ lh $v0, 0x4a($sp) -/* 102B5C 8029954C 8FA70054 */ lw $a3, 0x54($sp) -/* 102B60 80299550 4608003C */ c.lt.s $f0, $f8 -/* 102B64 80299554 304C0400 */ andi $t4, $v0, 0x400 -/* 102B68 80299558 4503004C */ bc1tl .L8029968C -/* 102B6C 8029955C 8FBF0024 */ lw $ra, 0x24($sp) -/* 102B70 80299560 1580000B */ bnez $t4, .L80299590 -/* 102B74 80299564 3C01802C */ lui $at, %hi(D_802B966C) # $at, 0x802c -/* 102B78 80299568 C42A966C */ lwc1 $f10, %lo(D_802B966C)($at) -/* 102B7C 8029956C 8FA40028 */ lw $a0, 0x28($sp) -/* 102B80 80299570 26050010 */ addiu $a1, $s0, 0x10 -/* 102B84 80299574 460A003C */ c.lt.s $f0, $f10 -/* 102B88 80299578 3C064033 */ lui $a2, (0x40333333 >> 16) # lui $a2, 0x4033 -/* 102B8C 8029957C 45020005 */ bc1fl .L80299594 -/* 102B90 80299580 C6100018 */ lwc1 $f16, 0x18($s0) -/* 102B94 80299584 0C0A5E53 */ jal func_8029794C -/* 102B98 80299588 34C63333 */ ori $a2, (0x40333333 & 0xFFFF) # ori $a2, $a2, 0x3333 -/* 102B9C 8029958C 8FA70054 */ lw $a3, 0x54($sp) -.L80299590: -/* 102BA0 80299590 C6100018 */ lwc1 $f16, 0x18($s0) -.L80299594: -/* 102BA4 80299594 00E02025 */ move $a0, $a3 -/* 102BA8 80299598 00002825 */ move $a1, $zero -/* 102BAC 8029959C E4F00030 */ swc1 $f16, 0x30($a3) -/* 102BB0 802995A0 C612001C */ lwc1 $f18, 0x1c($s0) -/* 102BB4 802995A4 E4F20034 */ swc1 $f18, 0x34($a3) -/* 102BB8 802995A8 C6040020 */ lwc1 $f4, 0x20($s0) -/* 102BBC 802995AC 0C0AD3FE */ jal func_802B4FF8 -/* 102BC0 802995B0 E4E40038 */ swc1 $f4, 0x38($a3) -/* 102BC4 802995B4 10400034 */ beqz $v0, .L80299688 -/* 102BC8 802995B8 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 102BCC 802995BC 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 102BD0 802995C0 8C620000 */ lw $v0, ($v1) -/* 102BD4 802995C4 3C0F0D00 */ lui $t7, %hi(D_0D004C68) # $t7, 0xd00 -/* 102BD8 802995C8 25EF4C68 */ addiu $t7, %lo(D_0D004C68) # addiu $t7, $t7, 0x4c68 -/* 102BDC 802995CC 244D0008 */ addiu $t5, $v0, 8 -/* 102BE0 802995D0 AC6D0000 */ sw $t5, ($v1) -/* 102BE4 802995D4 3C0EFD10 */ lui $t6, 0xfd10 -/* 102BE8 802995D8 AC4E0000 */ sw $t6, ($v0) -/* 102BEC 802995DC AC4F0004 */ sw $t7, 4($v0) -/* 102BF0 802995E0 8C620000 */ lw $v0, ($v1) -/* 102BF4 802995E4 3C19E800 */ lui $t9, 0xe800 -/* 102BF8 802995E8 3C0CF500 */ lui $t4, (0xF5000100 >> 16) # lui $t4, 0xf500 -/* 102BFC 802995EC 24580008 */ addiu $t8, $v0, 8 -/* 102C00 802995F0 AC780000 */ sw $t8, ($v1) -/* 102C04 802995F4 AC400004 */ sw $zero, 4($v0) -/* 102C08 802995F8 AC590000 */ sw $t9, ($v0) -/* 102C0C 802995FC 8C620000 */ lw $v0, ($v1) -/* 102C10 80299600 358C0100 */ ori $t4, (0xF5000100 & 0xFFFF) # ori $t4, $t4, 0x100 -/* 102C14 80299604 3C0D0700 */ lui $t5, 0x700 -/* 102C18 80299608 244B0008 */ addiu $t3, $v0, 8 -/* 102C1C 8029960C AC6B0000 */ sw $t3, ($v1) -/* 102C20 80299610 AC4D0004 */ sw $t5, 4($v0) -/* 102C24 80299614 AC4C0000 */ sw $t4, ($v0) -/* 102C28 80299618 8C620000 */ lw $v0, ($v1) -/* 102C2C 8029961C 3C0FE600 */ lui $t7, 0xe600 -/* 102C30 80299620 3C0B073F */ lui $t3, (0x073FC000 >> 16) # lui $t3, 0x73f -/* 102C34 80299624 244E0008 */ addiu $t6, $v0, 8 -/* 102C38 80299628 AC6E0000 */ sw $t6, ($v1) -/* 102C3C 8029962C AC400004 */ sw $zero, 4($v0) -/* 102C40 80299630 AC4F0000 */ sw $t7, ($v0) -/* 102C44 80299634 8C620000 */ lw $v0, ($v1) -/* 102C48 80299638 356BC000 */ ori $t3, (0x073FC000 & 0xFFFF) # ori $t3, $t3, 0xc000 -/* 102C4C 8029963C 3C19F000 */ lui $t9, 0xf000 -/* 102C50 80299640 24580008 */ addiu $t8, $v0, 8 -/* 102C54 80299644 AC780000 */ sw $t8, ($v1) -/* 102C58 80299648 AC4B0004 */ sw $t3, 4($v0) -/* 102C5C 8029964C AC590000 */ sw $t9, ($v0) -/* 102C60 80299650 8C620000 */ lw $v0, ($v1) -/* 102C64 80299654 3C0DE700 */ lui $t5, 0xe700 -/* 102C68 80299658 3C180601 */ lui $t8, %hi(D_0600D4A0) # $t8, 0x601 -/* 102C6C 8029965C 244C0008 */ addiu $t4, $v0, 8 -/* 102C70 80299660 AC6C0000 */ sw $t4, ($v1) -/* 102C74 80299664 AC400004 */ sw $zero, 4($v0) -/* 102C78 80299668 AC4D0000 */ sw $t5, ($v0) -/* 102C7C 8029966C 8C620000 */ lw $v0, ($v1) -/* 102C80 80299670 2718D4A0 */ addiu $t8, %lo(D_0600D4A0) # addiu $t8, $t8, -0x2b60 -/* 102C84 80299674 3C0F0600 */ lui $t7, 0x600 -/* 102C88 80299678 244E0008 */ addiu $t6, $v0, 8 -/* 102C8C 8029967C AC6E0000 */ sw $t6, ($v1) -/* 102C90 80299680 AC580004 */ sw $t8, 4($v0) -/* 102C94 80299684 AC4F0000 */ sw $t7, ($v0) -.L80299688: -/* 102C98 80299688 8FBF0024 */ lw $ra, 0x24($sp) -.L8029968C: -/* 102C9C 8029968C 8FB00020 */ lw $s0, 0x20($sp) -/* 102CA0 80299690 27BD0050 */ addiu $sp, $sp, 0x50 -/* 102CA4 80299694 03E00008 */ jr $ra -/* 102CA8 80299698 00000000 */ nop diff --git a/asm/non_matchings/code_actors/func_8029969C.s b/asm/non_matchings/code_actors/func_8029969C.s deleted file mode 100644 index 1d73160aa..000000000 --- a/asm/non_matchings/code_actors/func_8029969C.s +++ /dev/null @@ -1,119 +0,0 @@ -glabel func_8029969C -/* 102CAC 8029969C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 102CB0 802996A0 AFBF0024 */ sw $ra, 0x24($sp) -/* 102CB4 802996A4 AFB00020 */ sw $s0, 0x20($sp) -/* 102CB8 802996A8 AFA50054 */ sw $a1, 0x54($sp) -/* 102CBC 802996AC 84C20002 */ lh $v0, 2($a2) -/* 102CC0 802996B0 00C08025 */ move $s0, $a2 -/* 102CC4 802996B4 24C50018 */ addiu $a1, $a2, 0x18 -/* 102CC8 802996B8 304E0800 */ andi $t6, $v0, 0x800 -/* 102CCC 802996BC 15C00064 */ bnez $t6, .L80299850 -/* 102CD0 802996C0 24070000 */ li $a3, 0 -/* 102CD4 802996C4 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e -/* 102CD8 802996C8 8DEFDB40 */ lw $t7, %lo(camera1)($t7) -/* 102CDC 802996CC 240100B8 */ li $at, 184 -/* 102CE0 802996D0 94860026 */ lhu $a2, 0x26($a0) -/* 102CE4 802996D4 008FC023 */ subu $t8, $a0, $t7 -/* 102CE8 802996D8 0301001A */ div $zero, $t8, $at -/* 102CEC 802996DC 0000C812 */ mflo $t9 -/* 102CF0 802996E0 00195880 */ sll $t3, $t9, 2 -/* 102CF4 802996E4 3C018015 */ lui $at, %hi(D_80150130) -/* 102CF8 802996E8 002B0821 */ addu $at, $at, $t3 -/* 102CFC 802996EC C4240130 */ lwc1 $f4, %lo(D_80150130)($at) -/* 102D00 802996F0 3C01802C */ lui $at, %hi(D_802B9670) # $at, 0x802c -/* 102D04 802996F4 C4269670 */ lwc1 $f6, %lo(D_802B9670)($at) -/* 102D08 802996F8 AFA50028 */ sw $a1, 0x28($sp) -/* 102D0C 802996FC A7A2004A */ sh $v0, 0x4a($sp) -/* 102D10 80299700 E7A40010 */ swc1 $f4, 0x10($sp) -/* 102D14 80299704 0C0AE034 */ jal func_802B80D0 -/* 102D18 80299708 E7A60014 */ swc1 $f6, 0x14($sp) -/* 102D1C 8029970C 44804000 */ mtc1 $zero, $f8 -/* 102D20 80299710 87A2004A */ lh $v0, 0x4a($sp) -/* 102D24 80299714 8FA70054 */ lw $a3, 0x54($sp) -/* 102D28 80299718 4608003C */ c.lt.s $f0, $f8 -/* 102D2C 8029971C 304C0400 */ andi $t4, $v0, 0x400 -/* 102D30 80299720 4503004C */ bc1tl .L80299854 -/* 102D34 80299724 8FBF0024 */ lw $ra, 0x24($sp) -/* 102D38 80299728 1580000B */ bnez $t4, .L80299758 -/* 102D3C 8029972C 3C014416 */ li $at, 0x44160000 # 600.000000 -/* 102D40 80299730 44815000 */ mtc1 $at, $f10 -/* 102D44 80299734 8FA40028 */ lw $a0, 0x28($sp) -/* 102D48 80299738 26050010 */ addiu $a1, $s0, 0x10 -/* 102D4C 8029973C 460A003C */ c.lt.s $f0, $f10 -/* 102D50 80299740 00000000 */ nop -/* 102D54 80299744 45020005 */ bc1fl .L8029975C -/* 102D58 80299748 C6100018 */ lwc1 $f16, 0x18($s0) -/* 102D5C 8029974C 0C0A5E53 */ jal func_8029794C -/* 102D60 80299750 3C0640A0 */ lui $a2, 0x40a0 -/* 102D64 80299754 8FA70054 */ lw $a3, 0x54($sp) -.L80299758: -/* 102D68 80299758 C6100018 */ lwc1 $f16, 0x18($s0) -.L8029975C: -/* 102D6C 8029975C 00E02025 */ move $a0, $a3 -/* 102D70 80299760 00002825 */ move $a1, $zero -/* 102D74 80299764 E4F00030 */ swc1 $f16, 0x30($a3) -/* 102D78 80299768 C612001C */ lwc1 $f18, 0x1c($s0) -/* 102D7C 8029976C E4F20034 */ swc1 $f18, 0x34($a3) -/* 102D80 80299770 C6040020 */ lwc1 $f4, 0x20($s0) -/* 102D84 80299774 0C0AD3FE */ jal func_802B4FF8 -/* 102D88 80299778 E4E40038 */ swc1 $f4, 0x38($a3) -/* 102D8C 8029977C 10400034 */ beqz $v0, .L80299850 -/* 102D90 80299780 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 102D94 80299784 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 102D98 80299788 8C620000 */ lw $v0, ($v1) -/* 102D9C 8029978C 3C0F0D00 */ lui $t7, %hi(D_0D004C68) # $t7, 0xd00 -/* 102DA0 80299790 25EF4C68 */ addiu $t7, %lo(D_0D004C68) # addiu $t7, $t7, 0x4c68 -/* 102DA4 80299794 244D0008 */ addiu $t5, $v0, 8 -/* 102DA8 80299798 AC6D0000 */ sw $t5, ($v1) -/* 102DAC 8029979C 3C0EFD10 */ lui $t6, 0xfd10 -/* 102DB0 802997A0 AC4E0000 */ sw $t6, ($v0) -/* 102DB4 802997A4 AC4F0004 */ sw $t7, 4($v0) -/* 102DB8 802997A8 8C620000 */ lw $v0, ($v1) -/* 102DBC 802997AC 3C19E800 */ lui $t9, 0xe800 -/* 102DC0 802997B0 3C0CF500 */ lui $t4, (0xF5000100 >> 16) # lui $t4, 0xf500 -/* 102DC4 802997B4 24580008 */ addiu $t8, $v0, 8 -/* 102DC8 802997B8 AC780000 */ sw $t8, ($v1) -/* 102DCC 802997BC AC400004 */ sw $zero, 4($v0) -/* 102DD0 802997C0 AC590000 */ sw $t9, ($v0) -/* 102DD4 802997C4 8C620000 */ lw $v0, ($v1) -/* 102DD8 802997C8 358C0100 */ ori $t4, (0xF5000100 & 0xFFFF) # ori $t4, $t4, 0x100 -/* 102DDC 802997CC 3C0D0700 */ lui $t5, 0x700 -/* 102DE0 802997D0 244B0008 */ addiu $t3, $v0, 8 -/* 102DE4 802997D4 AC6B0000 */ sw $t3, ($v1) -/* 102DE8 802997D8 AC4D0004 */ sw $t5, 4($v0) -/* 102DEC 802997DC AC4C0000 */ sw $t4, ($v0) -/* 102DF0 802997E0 8C620000 */ lw $v0, ($v1) -/* 102DF4 802997E4 3C0FE600 */ lui $t7, 0xe600 -/* 102DF8 802997E8 3C0B073F */ lui $t3, (0x073FC000 >> 16) # lui $t3, 0x73f -/* 102DFC 802997EC 244E0008 */ addiu $t6, $v0, 8 -/* 102E00 802997F0 AC6E0000 */ sw $t6, ($v1) -/* 102E04 802997F4 AC400004 */ sw $zero, 4($v0) -/* 102E08 802997F8 AC4F0000 */ sw $t7, ($v0) -/* 102E0C 802997FC 8C620000 */ lw $v0, ($v1) -/* 102E10 80299800 356BC000 */ ori $t3, (0x073FC000 & 0xFFFF) # ori $t3, $t3, 0xc000 -/* 102E14 80299804 3C19F000 */ lui $t9, 0xf000 -/* 102E18 80299808 24580008 */ addiu $t8, $v0, 8 -/* 102E1C 8029980C AC780000 */ sw $t8, ($v1) -/* 102E20 80299810 AC4B0004 */ sw $t3, 4($v0) -/* 102E24 80299814 AC590000 */ sw $t9, ($v0) -/* 102E28 80299818 8C620000 */ lw $v0, ($v1) -/* 102E2C 8029981C 3C0DE700 */ lui $t5, 0xe700 -/* 102E30 80299820 3C180601 */ lui $t8, %hi(D_06013F20) # $t8, 0x601 -/* 102E34 80299824 244C0008 */ addiu $t4, $v0, 8 -/* 102E38 80299828 AC6C0000 */ sw $t4, ($v1) -/* 102E3C 8029982C AC400004 */ sw $zero, 4($v0) -/* 102E40 80299830 AC4D0000 */ sw $t5, ($v0) -/* 102E44 80299834 8C620000 */ lw $v0, ($v1) -/* 102E48 80299838 27183F20 */ addiu $t8, %lo(D_06013F20) # addiu $t8, $t8, 0x3f20 -/* 102E4C 8029983C 3C0F0600 */ lui $t7, 0x600 -/* 102E50 80299840 244E0008 */ addiu $t6, $v0, 8 -/* 102E54 80299844 AC6E0000 */ sw $t6, ($v1) -/* 102E58 80299848 AC580004 */ sw $t8, 4($v0) -/* 102E5C 8029984C AC4F0000 */ sw $t7, ($v0) -.L80299850: -/* 102E60 80299850 8FBF0024 */ lw $ra, 0x24($sp) -.L80299854: -/* 102E64 80299854 8FB00020 */ lw $s0, 0x20($sp) -/* 102E68 80299858 27BD0050 */ addiu $sp, $sp, 0x50 -/* 102E6C 8029985C 03E00008 */ jr $ra -/* 102E70 80299860 00000000 */ nop diff --git a/asm/non_matchings/code_actors/func_80299864.s b/asm/non_matchings/code_actors/func_80299864.s deleted file mode 100644 index 6a8811c39..000000000 --- a/asm/non_matchings/code_actors/func_80299864.s +++ /dev/null @@ -1,119 +0,0 @@ -glabel func_80299864 -/* 102E74 80299864 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 102E78 80299868 AFBF0024 */ sw $ra, 0x24($sp) -/* 102E7C 8029986C AFB00020 */ sw $s0, 0x20($sp) -/* 102E80 80299870 AFA50054 */ sw $a1, 0x54($sp) -/* 102E84 80299874 84C20002 */ lh $v0, 2($a2) -/* 102E88 80299878 00C08025 */ move $s0, $a2 -/* 102E8C 8029987C 24C50018 */ addiu $a1, $a2, 0x18 -/* 102E90 80299880 304E0800 */ andi $t6, $v0, 0x800 -/* 102E94 80299884 15C00064 */ bnez $t6, .L80299A18 -/* 102E98 80299888 24070000 */ li $a3, 0 -/* 102E9C 8029988C 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e -/* 102EA0 80299890 8DEFDB40 */ lw $t7, %lo(camera1)($t7) -/* 102EA4 80299894 240100B8 */ li $at, 184 -/* 102EA8 80299898 94860026 */ lhu $a2, 0x26($a0) -/* 102EAC 8029989C 008FC023 */ subu $t8, $a0, $t7 -/* 102EB0 802998A0 0301001A */ div $zero, $t8, $at -/* 102EB4 802998A4 0000C812 */ mflo $t9 -/* 102EB8 802998A8 00195880 */ sll $t3, $t9, 2 -/* 102EBC 802998AC 3C018015 */ lui $at, %hi(D_80150130) -/* 102EC0 802998B0 002B0821 */ addu $at, $at, $t3 -/* 102EC4 802998B4 C4240130 */ lwc1 $f4, %lo(D_80150130)($at) -/* 102EC8 802998B8 3C01802C */ lui $at, %hi(D_802B9674) # $at, 0x802c -/* 102ECC 802998BC C4269674 */ lwc1 $f6, %lo(D_802B9674)($at) -/* 102ED0 802998C0 AFA50028 */ sw $a1, 0x28($sp) -/* 102ED4 802998C4 A7A2004A */ sh $v0, 0x4a($sp) -/* 102ED8 802998C8 E7A40010 */ swc1 $f4, 0x10($sp) -/* 102EDC 802998CC 0C0AE034 */ jal func_802B80D0 -/* 102EE0 802998D0 E7A60014 */ swc1 $f6, 0x14($sp) -/* 102EE4 802998D4 44804000 */ mtc1 $zero, $f8 -/* 102EE8 802998D8 87A2004A */ lh $v0, 0x4a($sp) -/* 102EEC 802998DC 8FA70054 */ lw $a3, 0x54($sp) -/* 102EF0 802998E0 4608003C */ c.lt.s $f0, $f8 -/* 102EF4 802998E4 304C0400 */ andi $t4, $v0, 0x400 -/* 102EF8 802998E8 4503004C */ bc1tl .L80299A1C -/* 102EFC 802998EC 8FBF0024 */ lw $ra, 0x24($sp) -/* 102F00 802998F0 1580000B */ bnez $t4, .L80299920 -/* 102F04 802998F4 3C01802C */ lui $at, %hi(D_802B9678) # $at, 0x802c -/* 102F08 802998F8 C42A9678 */ lwc1 $f10, %lo(D_802B9678)($at) -/* 102F0C 802998FC 8FA40028 */ lw $a0, 0x28($sp) -/* 102F10 80299900 26050010 */ addiu $a1, $s0, 0x10 -/* 102F14 80299904 460A003C */ c.lt.s $f0, $f10 -/* 102F18 80299908 3C064033 */ lui $a2, (0x40333333 >> 16) # lui $a2, 0x4033 -/* 102F1C 8029990C 45020005 */ bc1fl .L80299924 -/* 102F20 80299910 C6100018 */ lwc1 $f16, 0x18($s0) -/* 102F24 80299914 0C0A5E53 */ jal func_8029794C -/* 102F28 80299918 34C63333 */ ori $a2, (0x40333333 & 0xFFFF) # ori $a2, $a2, 0x3333 -/* 102F2C 8029991C 8FA70054 */ lw $a3, 0x54($sp) -.L80299920: -/* 102F30 80299920 C6100018 */ lwc1 $f16, 0x18($s0) -.L80299924: -/* 102F34 80299924 00E02025 */ move $a0, $a3 -/* 102F38 80299928 00002825 */ move $a1, $zero -/* 102F3C 8029992C E4F00030 */ swc1 $f16, 0x30($a3) -/* 102F40 80299930 C612001C */ lwc1 $f18, 0x1c($s0) -/* 102F44 80299934 E4F20034 */ swc1 $f18, 0x34($a3) -/* 102F48 80299938 C6040020 */ lwc1 $f4, 0x20($s0) -/* 102F4C 8029993C 0C0AD3FE */ jal func_802B4FF8 -/* 102F50 80299940 E4E40038 */ swc1 $f4, 0x38($a3) -/* 102F54 80299944 10400034 */ beqz $v0, .L80299A18 -/* 102F58 80299948 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 102F5C 8029994C 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 102F60 80299950 8C620000 */ lw $v0, ($v1) -/* 102F64 80299954 3C0F0D00 */ lui $t7, %hi(D_0D004C68) # $t7, 0xd00 -/* 102F68 80299958 25EF4C68 */ addiu $t7, %lo(D_0D004C68) # addiu $t7, $t7, 0x4c68 -/* 102F6C 8029995C 244D0008 */ addiu $t5, $v0, 8 -/* 102F70 80299960 AC6D0000 */ sw $t5, ($v1) -/* 102F74 80299964 3C0EFD10 */ lui $t6, 0xfd10 -/* 102F78 80299968 AC4E0000 */ sw $t6, ($v0) -/* 102F7C 8029996C AC4F0004 */ sw $t7, 4($v0) -/* 102F80 80299970 8C620000 */ lw $v0, ($v1) -/* 102F84 80299974 3C19E800 */ lui $t9, 0xe800 -/* 102F88 80299978 3C0CF500 */ lui $t4, (0xF5000100 >> 16) # lui $t4, 0xf500 -/* 102F8C 8029997C 24580008 */ addiu $t8, $v0, 8 -/* 102F90 80299980 AC780000 */ sw $t8, ($v1) -/* 102F94 80299984 AC400004 */ sw $zero, 4($v0) -/* 102F98 80299988 AC590000 */ sw $t9, ($v0) -/* 102F9C 8029998C 8C620000 */ lw $v0, ($v1) -/* 102FA0 80299990 358C0100 */ ori $t4, (0xF5000100 & 0xFFFF) # ori $t4, $t4, 0x100 -/* 102FA4 80299994 3C0D0700 */ lui $t5, 0x700 -/* 102FA8 80299998 244B0008 */ addiu $t3, $v0, 8 -/* 102FAC 8029999C AC6B0000 */ sw $t3, ($v1) -/* 102FB0 802999A0 AC4D0004 */ sw $t5, 4($v0) -/* 102FB4 802999A4 AC4C0000 */ sw $t4, ($v0) -/* 102FB8 802999A8 8C620000 */ lw $v0, ($v1) -/* 102FBC 802999AC 3C0FE600 */ lui $t7, 0xe600 -/* 102FC0 802999B0 3C0B073F */ lui $t3, (0x073FC000 >> 16) # lui $t3, 0x73f -/* 102FC4 802999B4 244E0008 */ addiu $t6, $v0, 8 -/* 102FC8 802999B8 AC6E0000 */ sw $t6, ($v1) -/* 102FCC 802999BC AC400004 */ sw $zero, 4($v0) -/* 102FD0 802999C0 AC4F0000 */ sw $t7, ($v0) -/* 102FD4 802999C4 8C620000 */ lw $v0, ($v1) -/* 102FD8 802999C8 356BC000 */ ori $t3, (0x073FC000 & 0xFFFF) # ori $t3, $t3, 0xc000 -/* 102FDC 802999CC 3C19F000 */ lui $t9, 0xf000 -/* 102FE0 802999D0 24580008 */ addiu $t8, $v0, 8 -/* 102FE4 802999D4 AC780000 */ sw $t8, ($v1) -/* 102FE8 802999D8 AC4B0004 */ sw $t3, 4($v0) -/* 102FEC 802999DC AC590000 */ sw $t9, ($v0) -/* 102FF0 802999E0 8C620000 */ lw $v0, ($v1) -/* 102FF4 802999E4 3C0DE700 */ lui $t5, 0xe700 -/* 102FF8 802999E8 3C180601 */ lui $t8, %hi(D_0600FC70) # $t8, 0x601 -/* 102FFC 802999EC 244C0008 */ addiu $t4, $v0, 8 -/* 103000 802999F0 AC6C0000 */ sw $t4, ($v1) -/* 103004 802999F4 AC400004 */ sw $zero, 4($v0) -/* 103008 802999F8 AC4D0000 */ sw $t5, ($v0) -/* 10300C 802999FC 8C620000 */ lw $v0, ($v1) -/* 103010 80299A00 2718FC70 */ addiu $t8, %lo(D_0600FC70) # addiu $t8, $t8, -0x390 -/* 103014 80299A04 3C0F0600 */ lui $t7, 0x600 -/* 103018 80299A08 244E0008 */ addiu $t6, $v0, 8 -/* 10301C 80299A0C AC6E0000 */ sw $t6, ($v1) -/* 103020 80299A10 AC580004 */ sw $t8, 4($v0) -/* 103024 80299A14 AC4F0000 */ sw $t7, ($v0) -.L80299A18: -/* 103028 80299A18 8FBF0024 */ lw $ra, 0x24($sp) -.L80299A1C: -/* 10302C 80299A1C 8FB00020 */ lw $s0, 0x20($sp) -/* 103030 80299A20 27BD0050 */ addiu $sp, $sp, 0x50 -/* 103034 80299A24 03E00008 */ jr $ra -/* 103038 80299A28 00000000 */ nop diff --git a/asm/non_matchings/code_actors/func_80299A2C.s b/asm/non_matchings/code_actors/func_80299A2C.s deleted file mode 100644 index 7dc380a98..000000000 --- a/asm/non_matchings/code_actors/func_80299A2C.s +++ /dev/null @@ -1,119 +0,0 @@ -glabel func_80299A2C -/* 10303C 80299A2C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 103040 80299A30 AFBF0024 */ sw $ra, 0x24($sp) -/* 103044 80299A34 AFB00020 */ sw $s0, 0x20($sp) -/* 103048 80299A38 AFA50054 */ sw $a1, 0x54($sp) -/* 10304C 80299A3C 84C20002 */ lh $v0, 2($a2) -/* 103050 80299A40 00C08025 */ move $s0, $a2 -/* 103054 80299A44 24C50018 */ addiu $a1, $a2, 0x18 -/* 103058 80299A48 304E0800 */ andi $t6, $v0, 0x800 -/* 10305C 80299A4C 15C00064 */ bnez $t6, .L80299BE0 -/* 103060 80299A50 24070000 */ li $a3, 0 -/* 103064 80299A54 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e -/* 103068 80299A58 8DEFDB40 */ lw $t7, %lo(camera1)($t7) -/* 10306C 80299A5C 240100B8 */ li $at, 184 -/* 103070 80299A60 94860026 */ lhu $a2, 0x26($a0) -/* 103074 80299A64 008FC023 */ subu $t8, $a0, $t7 -/* 103078 80299A68 0301001A */ div $zero, $t8, $at -/* 10307C 80299A6C 0000C812 */ mflo $t9 -/* 103080 80299A70 00195880 */ sll $t3, $t9, 2 -/* 103084 80299A74 3C018015 */ lui $at, %hi(D_80150130) -/* 103088 80299A78 002B0821 */ addu $at, $at, $t3 -/* 10308C 80299A7C C4240130 */ lwc1 $f4, %lo(D_80150130)($at) -/* 103090 80299A80 3C01802C */ lui $at, %hi(D_802B967C) # $at, 0x802c -/* 103094 80299A84 C426967C */ lwc1 $f6, %lo(D_802B967C)($at) -/* 103098 80299A88 AFA50028 */ sw $a1, 0x28($sp) -/* 10309C 80299A8C A7A2004A */ sh $v0, 0x4a($sp) -/* 1030A0 80299A90 E7A40010 */ swc1 $f4, 0x10($sp) -/* 1030A4 80299A94 0C0AE034 */ jal func_802B80D0 -/* 1030A8 80299A98 E7A60014 */ swc1 $f6, 0x14($sp) -/* 1030AC 80299A9C 44804000 */ mtc1 $zero, $f8 -/* 1030B0 80299AA0 87A2004A */ lh $v0, 0x4a($sp) -/* 1030B4 80299AA4 8FA70054 */ lw $a3, 0x54($sp) -/* 1030B8 80299AA8 4608003C */ c.lt.s $f0, $f8 -/* 1030BC 80299AAC 304C0400 */ andi $t4, $v0, 0x400 -/* 1030C0 80299AB0 4503004C */ bc1tl .L80299BE4 -/* 1030C4 80299AB4 8FBF0024 */ lw $ra, 0x24($sp) -/* 1030C8 80299AB8 1580000B */ bnez $t4, .L80299AE8 -/* 1030CC 80299ABC 3C01802C */ lui $at, %hi(D_802B9680) # $at, 0x802c -/* 1030D0 80299AC0 C42A9680 */ lwc1 $f10, %lo(D_802B9680)($at) -/* 1030D4 80299AC4 8FA40028 */ lw $a0, 0x28($sp) -/* 1030D8 80299AC8 26050010 */ addiu $a1, $s0, 0x10 -/* 1030DC 80299ACC 460A003C */ c.lt.s $f0, $f10 -/* 1030E0 80299AD0 3C064033 */ lui $a2, (0x40333333 >> 16) # lui $a2, 0x4033 -/* 1030E4 80299AD4 45020005 */ bc1fl .L80299AEC -/* 1030E8 80299AD8 C6100018 */ lwc1 $f16, 0x18($s0) -/* 1030EC 80299ADC 0C0A5E53 */ jal func_8029794C -/* 1030F0 80299AE0 34C63333 */ ori $a2, (0x40333333 & 0xFFFF) # ori $a2, $a2, 0x3333 -/* 1030F4 80299AE4 8FA70054 */ lw $a3, 0x54($sp) -.L80299AE8: -/* 1030F8 80299AE8 C6100018 */ lwc1 $f16, 0x18($s0) -.L80299AEC: -/* 1030FC 80299AEC 00E02025 */ move $a0, $a3 -/* 103100 80299AF0 00002825 */ move $a1, $zero -/* 103104 80299AF4 E4F00030 */ swc1 $f16, 0x30($a3) -/* 103108 80299AF8 C612001C */ lwc1 $f18, 0x1c($s0) -/* 10310C 80299AFC E4F20034 */ swc1 $f18, 0x34($a3) -/* 103110 80299B00 C6040020 */ lwc1 $f4, 0x20($s0) -/* 103114 80299B04 0C0AD3FE */ jal func_802B4FF8 -/* 103118 80299B08 E4E40038 */ swc1 $f4, 0x38($a3) -/* 10311C 80299B0C 10400034 */ beqz $v0, .L80299BE0 -/* 103120 80299B10 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 103124 80299B14 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 103128 80299B18 8C620000 */ lw $v0, ($v1) -/* 10312C 80299B1C 3C0F0D00 */ lui $t7, %hi(D_0D004C68) # $t7, 0xd00 -/* 103130 80299B20 25EF4C68 */ addiu $t7, %lo(D_0D004C68) # addiu $t7, $t7, 0x4c68 -/* 103134 80299B24 244D0008 */ addiu $t5, $v0, 8 -/* 103138 80299B28 AC6D0000 */ sw $t5, ($v1) -/* 10313C 80299B2C 3C0EFD10 */ lui $t6, 0xfd10 -/* 103140 80299B30 AC4E0000 */ sw $t6, ($v0) -/* 103144 80299B34 AC4F0004 */ sw $t7, 4($v0) -/* 103148 80299B38 8C620000 */ lw $v0, ($v1) -/* 10314C 80299B3C 3C19E800 */ lui $t9, 0xe800 -/* 103150 80299B40 3C0CF500 */ lui $t4, (0xF5000100 >> 16) # lui $t4, 0xf500 -/* 103154 80299B44 24580008 */ addiu $t8, $v0, 8 -/* 103158 80299B48 AC780000 */ sw $t8, ($v1) -/* 10315C 80299B4C AC400004 */ sw $zero, 4($v0) -/* 103160 80299B50 AC590000 */ sw $t9, ($v0) -/* 103164 80299B54 8C620000 */ lw $v0, ($v1) -/* 103168 80299B58 358C0100 */ ori $t4, (0xF5000100 & 0xFFFF) # ori $t4, $t4, 0x100 -/* 10316C 80299B5C 3C0D0700 */ lui $t5, 0x700 -/* 103170 80299B60 244B0008 */ addiu $t3, $v0, 8 -/* 103174 80299B64 AC6B0000 */ sw $t3, ($v1) -/* 103178 80299B68 AC4D0004 */ sw $t5, 4($v0) -/* 10317C 80299B6C AC4C0000 */ sw $t4, ($v0) -/* 103180 80299B70 8C620000 */ lw $v0, ($v1) -/* 103184 80299B74 3C0FE600 */ lui $t7, 0xe600 -/* 103188 80299B78 3C0B073F */ lui $t3, (0x073FC000 >> 16) # lui $t3, 0x73f -/* 10318C 80299B7C 244E0008 */ addiu $t6, $v0, 8 -/* 103190 80299B80 AC6E0000 */ sw $t6, ($v1) -/* 103194 80299B84 AC400004 */ sw $zero, 4($v0) -/* 103198 80299B88 AC4F0000 */ sw $t7, ($v0) -/* 10319C 80299B8C 8C620000 */ lw $v0, ($v1) -/* 1031A0 80299B90 356BC000 */ ori $t3, (0x073FC000 & 0xFFFF) # ori $t3, $t3, 0xc000 -/* 1031A4 80299B94 3C19F000 */ lui $t9, 0xf000 -/* 1031A8 80299B98 24580008 */ addiu $t8, $v0, 8 -/* 1031AC 80299B9C AC780000 */ sw $t8, ($v1) -/* 1031B0 80299BA0 AC4B0004 */ sw $t3, 4($v0) -/* 1031B4 80299BA4 AC590000 */ sw $t9, ($v0) -/* 1031B8 80299BA8 8C620000 */ lw $v0, ($v1) -/* 1031BC 80299BAC 3C0DE700 */ lui $t5, 0xe700 -/* 1031C0 80299BB0 3C180601 */ lui $t8, %hi(D_0600D578) # $t8, 0x601 -/* 1031C4 80299BB4 244C0008 */ addiu $t4, $v0, 8 -/* 1031C8 80299BB8 AC6C0000 */ sw $t4, ($v1) -/* 1031CC 80299BBC AC400004 */ sw $zero, 4($v0) -/* 1031D0 80299BC0 AC4D0000 */ sw $t5, ($v0) -/* 1031D4 80299BC4 8C620000 */ lw $v0, ($v1) -/* 1031D8 80299BC8 2718D578 */ addiu $t8, %lo(D_0600D578) # addiu $t8, $t8, -0x2a88 -/* 1031DC 80299BCC 3C0F0600 */ lui $t7, 0x600 -/* 1031E0 80299BD0 244E0008 */ addiu $t6, $v0, 8 -/* 1031E4 80299BD4 AC6E0000 */ sw $t6, ($v1) -/* 1031E8 80299BD8 AC580004 */ sw $t8, 4($v0) -/* 1031EC 80299BDC AC4F0000 */ sw $t7, ($v0) -.L80299BE0: -/* 1031F0 80299BE0 8FBF0024 */ lw $ra, 0x24($sp) -.L80299BE4: -/* 1031F4 80299BE4 8FB00020 */ lw $s0, 0x20($sp) -/* 1031F8 80299BE8 27BD0050 */ addiu $sp, $sp, 0x50 -/* 1031FC 80299BEC 03E00008 */ jr $ra -/* 103200 80299BF0 00000000 */ nop diff --git a/asm/non_matchings/code_actors/func_80299BF4.s b/asm/non_matchings/code_actors/func_80299BF4.s deleted file mode 100644 index 28243051c..000000000 --- a/asm/non_matchings/code_actors/func_80299BF4.s +++ /dev/null @@ -1,119 +0,0 @@ -glabel func_80299BF4 -/* 103204 80299BF4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 103208 80299BF8 AFBF0024 */ sw $ra, 0x24($sp) -/* 10320C 80299BFC AFB00020 */ sw $s0, 0x20($sp) -/* 103210 80299C00 AFA50054 */ sw $a1, 0x54($sp) -/* 103214 80299C04 84C20002 */ lh $v0, 2($a2) -/* 103218 80299C08 00C08025 */ move $s0, $a2 -/* 10321C 80299C0C 24C50018 */ addiu $a1, $a2, 0x18 -/* 103220 80299C10 304E0800 */ andi $t6, $v0, 0x800 -/* 103224 80299C14 15C00064 */ bnez $t6, .L80299DA8 -/* 103228 80299C18 24070000 */ li $a3, 0 -/* 10322C 80299C1C 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e -/* 103230 80299C20 8DEFDB40 */ lw $t7, %lo(camera1)($t7) -/* 103234 80299C24 240100B8 */ li $at, 184 -/* 103238 80299C28 94860026 */ lhu $a2, 0x26($a0) -/* 10323C 80299C2C 008FC023 */ subu $t8, $a0, $t7 -/* 103240 80299C30 0301001A */ div $zero, $t8, $at -/* 103244 80299C34 0000C812 */ mflo $t9 -/* 103248 80299C38 00195880 */ sll $t3, $t9, 2 -/* 10324C 80299C3C 3C018015 */ lui $at, %hi(D_80150130) -/* 103250 80299C40 002B0821 */ addu $at, $at, $t3 -/* 103254 80299C44 C4240130 */ lwc1 $f4, %lo(D_80150130)($at) -/* 103258 80299C48 3C01802C */ lui $at, %hi(D_802B9684) # $at, 0x802c -/* 10325C 80299C4C C4269684 */ lwc1 $f6, %lo(D_802B9684)($at) -/* 103260 80299C50 AFA50028 */ sw $a1, 0x28($sp) -/* 103264 80299C54 A7A2004A */ sh $v0, 0x4a($sp) -/* 103268 80299C58 E7A40010 */ swc1 $f4, 0x10($sp) -/* 10326C 80299C5C 0C0AE034 */ jal func_802B80D0 -/* 103270 80299C60 E7A60014 */ swc1 $f6, 0x14($sp) -/* 103274 80299C64 44804000 */ mtc1 $zero, $f8 -/* 103278 80299C68 87A2004A */ lh $v0, 0x4a($sp) -/* 10327C 80299C6C 8FA70054 */ lw $a3, 0x54($sp) -/* 103280 80299C70 4608003C */ c.lt.s $f0, $f8 -/* 103284 80299C74 304C0400 */ andi $t4, $v0, 0x400 -/* 103288 80299C78 4503004C */ bc1tl .L80299DAC -/* 10328C 80299C7C 8FBF0024 */ lw $ra, 0x24($sp) -/* 103290 80299C80 1580000B */ bnez $t4, .L80299CB0 -/* 103294 80299C84 3C01802C */ lui $at, %hi(D_802B9688) # $at, 0x802c -/* 103298 80299C88 C42A9688 */ lwc1 $f10, %lo(D_802B9688)($at) -/* 10329C 80299C8C 8FA40028 */ lw $a0, 0x28($sp) -/* 1032A0 80299C90 26050010 */ addiu $a1, $s0, 0x10 -/* 1032A4 80299C94 460A003C */ c.lt.s $f0, $f10 -/* 1032A8 80299C98 3C064033 */ lui $a2, (0x40333333 >> 16) # lui $a2, 0x4033 -/* 1032AC 80299C9C 45020005 */ bc1fl .L80299CB4 -/* 1032B0 80299CA0 C6100018 */ lwc1 $f16, 0x18($s0) -/* 1032B4 80299CA4 0C0A5E53 */ jal func_8029794C -/* 1032B8 80299CA8 34C63333 */ ori $a2, (0x40333333 & 0xFFFF) # ori $a2, $a2, 0x3333 -/* 1032BC 80299CAC 8FA70054 */ lw $a3, 0x54($sp) -.L80299CB0: -/* 1032C0 80299CB0 C6100018 */ lwc1 $f16, 0x18($s0) -.L80299CB4: -/* 1032C4 80299CB4 00E02025 */ move $a0, $a3 -/* 1032C8 80299CB8 00002825 */ move $a1, $zero -/* 1032CC 80299CBC E4F00030 */ swc1 $f16, 0x30($a3) -/* 1032D0 80299CC0 C612001C */ lwc1 $f18, 0x1c($s0) -/* 1032D4 80299CC4 E4F20034 */ swc1 $f18, 0x34($a3) -/* 1032D8 80299CC8 C6040020 */ lwc1 $f4, 0x20($s0) -/* 1032DC 80299CCC 0C0AD3FE */ jal func_802B4FF8 -/* 1032E0 80299CD0 E4E40038 */ swc1 $f4, 0x38($a3) -/* 1032E4 80299CD4 10400034 */ beqz $v0, .L80299DA8 -/* 1032E8 80299CD8 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 1032EC 80299CDC 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 1032F0 80299CE0 8C620000 */ lw $v0, ($v1) -/* 1032F4 80299CE4 3C0F0D00 */ lui $t7, %hi(D_0D004C68) # $t7, 0xd00 -/* 1032F8 80299CE8 25EF4C68 */ addiu $t7, %lo(D_0D004C68) # addiu $t7, $t7, 0x4c68 -/* 1032FC 80299CEC 244D0008 */ addiu $t5, $v0, 8 -/* 103300 80299CF0 AC6D0000 */ sw $t5, ($v1) -/* 103304 80299CF4 3C0EFD10 */ lui $t6, 0xfd10 -/* 103308 80299CF8 AC4E0000 */ sw $t6, ($v0) -/* 10330C 80299CFC AC4F0004 */ sw $t7, 4($v0) -/* 103310 80299D00 8C620000 */ lw $v0, ($v1) -/* 103314 80299D04 3C19E800 */ lui $t9, 0xe800 -/* 103318 80299D08 3C0CF500 */ lui $t4, (0xF5000100 >> 16) # lui $t4, 0xf500 -/* 10331C 80299D0C 24580008 */ addiu $t8, $v0, 8 -/* 103320 80299D10 AC780000 */ sw $t8, ($v1) -/* 103324 80299D14 AC400004 */ sw $zero, 4($v0) -/* 103328 80299D18 AC590000 */ sw $t9, ($v0) -/* 10332C 80299D1C 8C620000 */ lw $v0, ($v1) -/* 103330 80299D20 358C0100 */ ori $t4, (0xF5000100 & 0xFFFF) # ori $t4, $t4, 0x100 -/* 103334 80299D24 3C0D0700 */ lui $t5, 0x700 -/* 103338 80299D28 244B0008 */ addiu $t3, $v0, 8 -/* 10333C 80299D2C AC6B0000 */ sw $t3, ($v1) -/* 103340 80299D30 AC4D0004 */ sw $t5, 4($v0) -/* 103344 80299D34 AC4C0000 */ sw $t4, ($v0) -/* 103348 80299D38 8C620000 */ lw $v0, ($v1) -/* 10334C 80299D3C 3C0FE600 */ lui $t7, 0xe600 -/* 103350 80299D40 3C0B073F */ lui $t3, (0x073FC000 >> 16) # lui $t3, 0x73f -/* 103354 80299D44 244E0008 */ addiu $t6, $v0, 8 -/* 103358 80299D48 AC6E0000 */ sw $t6, ($v1) -/* 10335C 80299D4C AC400004 */ sw $zero, 4($v0) -/* 103360 80299D50 AC4F0000 */ sw $t7, ($v0) -/* 103364 80299D54 8C620000 */ lw $v0, ($v1) -/* 103368 80299D58 356BC000 */ ori $t3, (0x073FC000 & 0xFFFF) # ori $t3, $t3, 0xc000 -/* 10336C 80299D5C 3C19F000 */ lui $t9, 0xf000 -/* 103370 80299D60 24580008 */ addiu $t8, $v0, 8 -/* 103374 80299D64 AC780000 */ sw $t8, ($v1) -/* 103378 80299D68 AC4B0004 */ sw $t3, 4($v0) -/* 10337C 80299D6C AC590000 */ sw $t9, ($v0) -/* 103380 80299D70 8C620000 */ lw $v0, ($v1) -/* 103384 80299D74 3C0DE700 */ lui $t5, 0xe700 -/* 103388 80299D78 3C180601 */ lui $t8, %hi(D_060090C8) # $t8, 0x601 -/* 10338C 80299D7C 244C0008 */ addiu $t4, $v0, 8 -/* 103390 80299D80 AC6C0000 */ sw $t4, ($v1) -/* 103394 80299D84 AC400004 */ sw $zero, 4($v0) -/* 103398 80299D88 AC4D0000 */ sw $t5, ($v0) -/* 10339C 80299D8C 8C620000 */ lw $v0, ($v1) -/* 1033A0 80299D90 271890C8 */ addiu $t8, %lo(D_060090C8) # addiu $t8, $t8, -0x6f38 -/* 1033A4 80299D94 3C0F0600 */ lui $t7, 0x600 -/* 1033A8 80299D98 244E0008 */ addiu $t6, $v0, 8 -/* 1033AC 80299D9C AC6E0000 */ sw $t6, ($v1) -/* 1033B0 80299DA0 AC580004 */ sw $t8, 4($v0) -/* 1033B4 80299DA4 AC4F0000 */ sw $t7, ($v0) -.L80299DA8: -/* 1033B8 80299DA8 8FBF0024 */ lw $ra, 0x24($sp) -.L80299DAC: -/* 1033BC 80299DAC 8FB00020 */ lw $s0, 0x20($sp) -/* 1033C0 80299DB0 27BD0050 */ addiu $sp, $sp, 0x50 -/* 1033C4 80299DB4 03E00008 */ jr $ra -/* 1033C8 80299DB8 00000000 */ nop diff --git a/asm/non_matchings/code_actors/func_80299DBC.s b/asm/non_matchings/code_actors/func_80299DBC.s deleted file mode 100644 index dd0d29a14..000000000 --- a/asm/non_matchings/code_actors/func_80299DBC.s +++ /dev/null @@ -1,77 +0,0 @@ -glabel func_80299DBC -/* 1033CC 80299DBC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 1033D0 80299DC0 AFBF0024 */ sw $ra, 0x24($sp) -/* 1033D4 80299DC4 AFB00020 */ sw $s0, 0x20($sp) -/* 1033D8 80299DC8 AFA5003C */ sw $a1, 0x3c($sp) -/* 1033DC 80299DCC 84C20002 */ lh $v0, 2($a2) -/* 1033E0 80299DD0 00C08025 */ move $s0, $a2 -/* 1033E4 80299DD4 24C50018 */ addiu $a1, $a2, 0x18 -/* 1033E8 80299DD8 304E0800 */ andi $t6, $v0, 0x800 -/* 1033EC 80299DDC 15C0003A */ bnez $t6, .L80299EC8 -/* 1033F0 80299DE0 24070000 */ li $a3, 0 -/* 1033F4 80299DE4 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e -/* 1033F8 80299DE8 8DEFDB40 */ lw $t7, %lo(camera1)($t7) -/* 1033FC 80299DEC 240100B8 */ li $at, 184 -/* 103400 80299DF0 94860026 */ lhu $a2, 0x26($a0) -/* 103404 80299DF4 008FC023 */ subu $t8, $a0, $t7 -/* 103408 80299DF8 0301001A */ div $zero, $t8, $at -/* 10340C 80299DFC 0000C812 */ mflo $t9 -/* 103410 80299E00 00194080 */ sll $t0, $t9, 2 -/* 103414 80299E04 3C018015 */ lui $at, %hi(D_80150130) -/* 103418 80299E08 00280821 */ addu $at, $at, $t0 -/* 10341C 80299E0C C4240130 */ lwc1 $f4, %lo(D_80150130)($at) -/* 103420 80299E10 3C01802C */ lui $at, %hi(D_802B968C) # $at, 0x802c -/* 103424 80299E14 C426968C */ lwc1 $f6, %lo(D_802B968C)($at) -/* 103428 80299E18 AFA50028 */ sw $a1, 0x28($sp) -/* 10342C 80299E1C A7A20032 */ sh $v0, 0x32($sp) -/* 103430 80299E20 E7A40010 */ swc1 $f4, 0x10($sp) -/* 103434 80299E24 0C0AE034 */ jal func_802B80D0 -/* 103438 80299E28 E7A60014 */ swc1 $f6, 0x14($sp) -/* 10343C 80299E2C 44804000 */ mtc1 $zero, $f8 -/* 103440 80299E30 87A20032 */ lh $v0, 0x32($sp) -/* 103444 80299E34 8FA7003C */ lw $a3, 0x3c($sp) -/* 103448 80299E38 4608003C */ c.lt.s $f0, $f8 -/* 10344C 80299E3C 30490400 */ andi $t1, $v0, 0x400 -/* 103450 80299E40 45030022 */ bc1tl .L80299ECC -/* 103454 80299E44 8FBF0024 */ lw $ra, 0x24($sp) -/* 103458 80299E48 1520000B */ bnez $t1, .L80299E78 -/* 10345C 80299E4C 3C01802C */ lui $at, %hi(D_802B9690) # $at, 0x802c -/* 103460 80299E50 C42A9690 */ lwc1 $f10, %lo(D_802B9690)($at) -/* 103464 80299E54 8FA40028 */ lw $a0, 0x28($sp) -/* 103468 80299E58 26050010 */ addiu $a1, $s0, 0x10 -/* 10346C 80299E5C 460A003C */ c.lt.s $f0, $f10 -/* 103470 80299E60 3C064033 */ lui $a2, (0x40333333 >> 16) # lui $a2, 0x4033 -/* 103474 80299E64 45020005 */ bc1fl .L80299E7C -/* 103478 80299E68 C6100018 */ lwc1 $f16, 0x18($s0) -/* 10347C 80299E6C 0C0A5E53 */ jal func_8029794C -/* 103480 80299E70 34C63333 */ ori $a2, (0x40333333 & 0xFFFF) # ori $a2, $a2, 0x3333 -/* 103484 80299E74 8FA7003C */ lw $a3, 0x3c($sp) -.L80299E78: -/* 103488 80299E78 C6100018 */ lwc1 $f16, 0x18($s0) -.L80299E7C: -/* 10348C 80299E7C 00E02025 */ move $a0, $a3 -/* 103490 80299E80 00002825 */ move $a1, $zero -/* 103494 80299E84 E4F00030 */ swc1 $f16, 0x30($a3) -/* 103498 80299E88 C612001C */ lwc1 $f18, 0x1c($s0) -/* 10349C 80299E8C E4F20034 */ swc1 $f18, 0x34($a3) -/* 1034A0 80299E90 C6040020 */ lwc1 $f4, 0x20($s0) -/* 1034A4 80299E94 0C0AD3FE */ jal func_802B4FF8 -/* 1034A8 80299E98 E4E40038 */ swc1 $f4, 0x38($a3) -/* 1034AC 80299E9C 1040000A */ beqz $v0, .L80299EC8 -/* 1034B0 80299EA0 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015 -/* 1034B4 80299EA4 24840298 */ addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298 -/* 1034B8 80299EA8 8C830000 */ lw $v1, ($a0) -/* 1034BC 80299EAC 3C0C0600 */ lui $t4, %hi(D_060075A0) # $t4, 0x600 -/* 1034C0 80299EB0 258C75A0 */ addiu $t4, %lo(D_060075A0) # addiu $t4, $t4, 0x75a0 -/* 1034C4 80299EB4 246A0008 */ addiu $t2, $v1, 8 -/* 1034C8 80299EB8 AC8A0000 */ sw $t2, ($a0) -/* 1034CC 80299EBC 3C0B0600 */ lui $t3, 0x600 -/* 1034D0 80299EC0 AC6B0000 */ sw $t3, ($v1) -/* 1034D4 80299EC4 AC6C0004 */ sw $t4, 4($v1) -.L80299EC8: -/* 1034D8 80299EC8 8FBF0024 */ lw $ra, 0x24($sp) -.L80299ECC: -/* 1034DC 80299ECC 8FB00020 */ lw $s0, 0x20($sp) -/* 1034E0 80299ED0 27BD0038 */ addiu $sp, $sp, 0x38 -/* 1034E4 80299ED4 03E00008 */ jr $ra -/* 1034E8 80299ED8 00000000 */ nop diff --git a/asm/non_matchings/code_actors/func_80299EDC.s b/asm/non_matchings/code_actors/func_80299EDC.s deleted file mode 100644 index 68162ab68..000000000 --- a/asm/non_matchings/code_actors/func_80299EDC.s +++ /dev/null @@ -1,77 +0,0 @@ -glabel func_80299EDC -/* 1034EC 80299EDC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 1034F0 80299EE0 AFBF0024 */ sw $ra, 0x24($sp) -/* 1034F4 80299EE4 AFB00020 */ sw $s0, 0x20($sp) -/* 1034F8 80299EE8 AFA5003C */ sw $a1, 0x3c($sp) -/* 1034FC 80299EEC 84C20002 */ lh $v0, 2($a2) -/* 103500 80299EF0 00C08025 */ move $s0, $a2 -/* 103504 80299EF4 24C50018 */ addiu $a1, $a2, 0x18 -/* 103508 80299EF8 304E0800 */ andi $t6, $v0, 0x800 -/* 10350C 80299EFC 15C0003A */ bnez $t6, .L80299FE8 -/* 103510 80299F00 24070000 */ li $a3, 0 -/* 103514 80299F04 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e -/* 103518 80299F08 8DEFDB40 */ lw $t7, %lo(camera1)($t7) -/* 10351C 80299F0C 240100B8 */ li $at, 184 -/* 103520 80299F10 94860026 */ lhu $a2, 0x26($a0) -/* 103524 80299F14 008FC023 */ subu $t8, $a0, $t7 -/* 103528 80299F18 0301001A */ div $zero, $t8, $at -/* 10352C 80299F1C 0000C812 */ mflo $t9 -/* 103530 80299F20 00194080 */ sll $t0, $t9, 2 -/* 103534 80299F24 3C018015 */ lui $at, %hi(D_80150130) -/* 103538 80299F28 00280821 */ addu $at, $at, $t0 -/* 10353C 80299F2C C4240130 */ lwc1 $f4, %lo(D_80150130)($at) -/* 103540 80299F30 3C01802C */ lui $at, %hi(D_802B9694) # $at, 0x802c -/* 103544 80299F34 C4269694 */ lwc1 $f6, %lo(D_802B9694)($at) -/* 103548 80299F38 AFA50028 */ sw $a1, 0x28($sp) -/* 10354C 80299F3C A7A20032 */ sh $v0, 0x32($sp) -/* 103550 80299F40 E7A40010 */ swc1 $f4, 0x10($sp) -/* 103554 80299F44 0C0AE034 */ jal func_802B80D0 -/* 103558 80299F48 E7A60014 */ swc1 $f6, 0x14($sp) -/* 10355C 80299F4C 44804000 */ mtc1 $zero, $f8 -/* 103560 80299F50 87A20032 */ lh $v0, 0x32($sp) -/* 103564 80299F54 8FA7003C */ lw $a3, 0x3c($sp) -/* 103568 80299F58 4608003C */ c.lt.s $f0, $f8 -/* 10356C 80299F5C 30490400 */ andi $t1, $v0, 0x400 -/* 103570 80299F60 45030022 */ bc1tl .L80299FEC -/* 103574 80299F64 8FBF0024 */ lw $ra, 0x24($sp) -/* 103578 80299F68 1520000B */ bnez $t1, .L80299F98 -/* 10357C 80299F6C 3C01802C */ lui $at, %hi(D_802B9698) # $at, 0x802c -/* 103580 80299F70 C42A9698 */ lwc1 $f10, %lo(D_802B9698)($at) -/* 103584 80299F74 8FA40028 */ lw $a0, 0x28($sp) -/* 103588 80299F78 26050010 */ addiu $a1, $s0, 0x10 -/* 10358C 80299F7C 460A003C */ c.lt.s $f0, $f10 -/* 103590 80299F80 00000000 */ nop -/* 103594 80299F84 45020005 */ bc1fl .L80299F9C -/* 103598 80299F88 C6100018 */ lwc1 $f16, 0x18($s0) -/* 10359C 80299F8C 0C0A5E53 */ jal func_8029794C -/* 1035A0 80299F90 3C063F80 */ lui $a2, 0x3f80 -/* 1035A4 80299F94 8FA7003C */ lw $a3, 0x3c($sp) -.L80299F98: -/* 1035A8 80299F98 C6100018 */ lwc1 $f16, 0x18($s0) -.L80299F9C: -/* 1035AC 80299F9C 00E02025 */ move $a0, $a3 -/* 1035B0 80299FA0 00002825 */ move $a1, $zero -/* 1035B4 80299FA4 E4F00030 */ swc1 $f16, 0x30($a3) -/* 1035B8 80299FA8 C612001C */ lwc1 $f18, 0x1c($s0) -/* 1035BC 80299FAC E4F20034 */ swc1 $f18, 0x34($a3) -/* 1035C0 80299FB0 C6040020 */ lwc1 $f4, 0x20($s0) -/* 1035C4 80299FB4 0C0AD3FE */ jal func_802B4FF8 -/* 1035C8 80299FB8 E4E40038 */ swc1 $f4, 0x38($a3) -/* 1035CC 80299FBC 1040000A */ beqz $v0, .L80299FE8 -/* 1035D0 80299FC0 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015 -/* 1035D4 80299FC4 24840298 */ addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298 -/* 1035D8 80299FC8 8C830000 */ lw $v1, ($a0) -/* 1035DC 80299FCC 3C0C0601 */ lui $t4, %hi(D_06008528) # $t4, 0x601 -/* 1035E0 80299FD0 258C8528 */ addiu $t4, %lo(D_06008528) # addiu $t4, $t4, -0x7ad8 -/* 1035E4 80299FD4 246A0008 */ addiu $t2, $v1, 8 -/* 1035E8 80299FD8 AC8A0000 */ sw $t2, ($a0) -/* 1035EC 80299FDC 3C0B0600 */ lui $t3, 0x600 -/* 1035F0 80299FE0 AC6B0000 */ sw $t3, ($v1) -/* 1035F4 80299FE4 AC6C0004 */ sw $t4, 4($v1) -.L80299FE8: -/* 1035F8 80299FE8 8FBF0024 */ lw $ra, 0x24($sp) -.L80299FEC: -/* 1035FC 80299FEC 8FB00020 */ lw $s0, 0x20($sp) -/* 103600 80299FF0 27BD0038 */ addiu $sp, $sp, 0x38 -/* 103604 80299FF4 03E00008 */ jr $ra -/* 103608 80299FF8 00000000 */ nop diff --git a/asm/non_matchings/code_actors/func_80299FFC.s b/asm/non_matchings/code_actors/func_80299FFC.s deleted file mode 100644 index 1848a24a1..000000000 --- a/asm/non_matchings/code_actors/func_80299FFC.s +++ /dev/null @@ -1,77 +0,0 @@ -glabel func_80299FFC -/* 10360C 80299FFC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 103610 8029A000 AFBF0024 */ sw $ra, 0x24($sp) -/* 103614 8029A004 AFB00020 */ sw $s0, 0x20($sp) -/* 103618 8029A008 AFA5003C */ sw $a1, 0x3c($sp) -/* 10361C 8029A00C 84C20002 */ lh $v0, 2($a2) -/* 103620 8029A010 00C08025 */ move $s0, $a2 -/* 103624 8029A014 24C50018 */ addiu $a1, $a2, 0x18 -/* 103628 8029A018 304E0800 */ andi $t6, $v0, 0x800 -/* 10362C 8029A01C 15C0003A */ bnez $t6, .L8029A108 -/* 103630 8029A020 24070000 */ li $a3, 0 -/* 103634 8029A024 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e -/* 103638 8029A028 8DEFDB40 */ lw $t7, %lo(camera1)($t7) -/* 10363C 8029A02C 240100B8 */ li $at, 184 -/* 103640 8029A030 94860026 */ lhu $a2, 0x26($a0) -/* 103644 8029A034 008FC023 */ subu $t8, $a0, $t7 -/* 103648 8029A038 0301001A */ div $zero, $t8, $at -/* 10364C 8029A03C 0000C812 */ mflo $t9 -/* 103650 8029A040 00194080 */ sll $t0, $t9, 2 -/* 103654 8029A044 3C018015 */ lui $at, %hi(D_80150130) -/* 103658 8029A048 00280821 */ addu $at, $at, $t0 -/* 10365C 8029A04C C4240130 */ lwc1 $f4, %lo(D_80150130)($at) -/* 103660 8029A050 3C01802C */ lui $at, %hi(D_802B969C) # $at, 0x802c -/* 103664 8029A054 C426969C */ lwc1 $f6, %lo(D_802B969C)($at) -/* 103668 8029A058 AFA50028 */ sw $a1, 0x28($sp) -/* 10366C 8029A05C A7A20032 */ sh $v0, 0x32($sp) -/* 103670 8029A060 E7A40010 */ swc1 $f4, 0x10($sp) -/* 103674 8029A064 0C0AE034 */ jal func_802B80D0 -/* 103678 8029A068 E7A60014 */ swc1 $f6, 0x14($sp) -/* 10367C 8029A06C 44804000 */ mtc1 $zero, $f8 -/* 103680 8029A070 87A20032 */ lh $v0, 0x32($sp) -/* 103684 8029A074 8FA7003C */ lw $a3, 0x3c($sp) -/* 103688 8029A078 4608003C */ c.lt.s $f0, $f8 -/* 10368C 8029A07C 30490400 */ andi $t1, $v0, 0x400 -/* 103690 8029A080 45030022 */ bc1tl .L8029A10C -/* 103694 8029A084 8FBF0024 */ lw $ra, 0x24($sp) -/* 103698 8029A088 1520000B */ bnez $t1, .L8029A0B8 -/* 10369C 8029A08C 3C01802C */ lui $at, %hi(D_802B96A0) # $at, 0x802c -/* 1036A0 8029A090 C42A96A0 */ lwc1 $f10, %lo(D_802B96A0)($at) -/* 1036A4 8029A094 8FA40028 */ lw $a0, 0x28($sp) -/* 1036A8 8029A098 26050010 */ addiu $a1, $s0, 0x10 -/* 1036AC 8029A09C 460A003C */ c.lt.s $f0, $f10 -/* 1036B0 8029A0A0 00000000 */ nop -/* 1036B4 8029A0A4 45020005 */ bc1fl .L8029A0BC -/* 1036B8 8029A0A8 C6100018 */ lwc1 $f16, 0x18($s0) -/* 1036BC 8029A0AC 0C0A5E53 */ jal func_8029794C -/* 1036C0 8029A0B0 3C063F80 */ lui $a2, 0x3f80 -/* 1036C4 8029A0B4 8FA7003C */ lw $a3, 0x3c($sp) -.L8029A0B8: -/* 1036C8 8029A0B8 C6100018 */ lwc1 $f16, 0x18($s0) -.L8029A0BC: -/* 1036CC 8029A0BC 00E02025 */ move $a0, $a3 -/* 1036D0 8029A0C0 00002825 */ move $a1, $zero -/* 1036D4 8029A0C4 E4F00030 */ swc1 $f16, 0x30($a3) -/* 1036D8 8029A0C8 C612001C */ lwc1 $f18, 0x1c($s0) -/* 1036DC 8029A0CC E4F20034 */ swc1 $f18, 0x34($a3) -/* 1036E0 8029A0D0 C6040020 */ lwc1 $f4, 0x20($s0) -/* 1036E4 8029A0D4 0C0AD3FE */ jal func_802B4FF8 -/* 1036E8 8029A0D8 E4E40038 */ swc1 $f4, 0x38($a3) -/* 1036EC 8029A0DC 1040000A */ beqz $v0, .L8029A108 -/* 1036F0 8029A0E0 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015 -/* 1036F4 8029A0E4 24840298 */ addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298 -/* 1036F8 8029A0E8 8C830000 */ lw $v1, ($a0) -/* 1036FC 8029A0EC 3C0C0601 */ lui $t4, %hi(D_06008628) # $t4, 0x601 -/* 103700 8029A0F0 258C8628 */ addiu $t4, %lo(D_06008628) # addiu $t4, $t4, -0x79d8 -/* 103704 8029A0F4 246A0008 */ addiu $t2, $v1, 8 -/* 103708 8029A0F8 AC8A0000 */ sw $t2, ($a0) -/* 10370C 8029A0FC 3C0B0600 */ lui $t3, 0x600 -/* 103710 8029A100 AC6B0000 */ sw $t3, ($v1) -/* 103714 8029A104 AC6C0004 */ sw $t4, 4($v1) -.L8029A108: -/* 103718 8029A108 8FBF0024 */ lw $ra, 0x24($sp) -.L8029A10C: -/* 10371C 8029A10C 8FB00020 */ lw $s0, 0x20($sp) -/* 103720 8029A110 27BD0038 */ addiu $sp, $sp, 0x38 -/* 103724 8029A114 03E00008 */ jr $ra -/* 103728 8029A118 00000000 */ nop diff --git a/asm/non_matchings/code_actors/func_8029A11C.s b/asm/non_matchings/code_actors/func_8029A11C.s deleted file mode 100644 index 33bb11547..000000000 --- a/asm/non_matchings/code_actors/func_8029A11C.s +++ /dev/null @@ -1,77 +0,0 @@ -glabel func_8029A11C -/* 10372C 8029A11C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 103730 8029A120 AFBF0024 */ sw $ra, 0x24($sp) -/* 103734 8029A124 AFB00020 */ sw $s0, 0x20($sp) -/* 103738 8029A128 AFA5003C */ sw $a1, 0x3c($sp) -/* 10373C 8029A12C 84C20002 */ lh $v0, 2($a2) -/* 103740 8029A130 00C08025 */ move $s0, $a2 -/* 103744 8029A134 24C50018 */ addiu $a1, $a2, 0x18 -/* 103748 8029A138 304E0800 */ andi $t6, $v0, 0x800 -/* 10374C 8029A13C 15C0003A */ bnez $t6, .L8029A228 -/* 103750 8029A140 24070000 */ li $a3, 0 -/* 103754 8029A144 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e -/* 103758 8029A148 8DEFDB40 */ lw $t7, %lo(camera1)($t7) -/* 10375C 8029A14C 240100B8 */ li $at, 184 -/* 103760 8029A150 94860026 */ lhu $a2, 0x26($a0) -/* 103764 8029A154 008FC023 */ subu $t8, $a0, $t7 -/* 103768 8029A158 0301001A */ div $zero, $t8, $at -/* 10376C 8029A15C 0000C812 */ mflo $t9 -/* 103770 8029A160 00194080 */ sll $t0, $t9, 2 -/* 103774 8029A164 3C018015 */ lui $at, %hi(D_80150130) -/* 103778 8029A168 00280821 */ addu $at, $at, $t0 -/* 10377C 8029A16C C4240130 */ lwc1 $f4, %lo(D_80150130)($at) -/* 103780 8029A170 3C01802C */ lui $at, %hi(D_802B96A4) # $at, 0x802c -/* 103784 8029A174 C42696A4 */ lwc1 $f6, %lo(D_802B96A4)($at) -/* 103788 8029A178 AFA50028 */ sw $a1, 0x28($sp) -/* 10378C 8029A17C A7A20032 */ sh $v0, 0x32($sp) -/* 103790 8029A180 E7A40010 */ swc1 $f4, 0x10($sp) -/* 103794 8029A184 0C0AE034 */ jal func_802B80D0 -/* 103798 8029A188 E7A60014 */ swc1 $f6, 0x14($sp) -/* 10379C 8029A18C 44804000 */ mtc1 $zero, $f8 -/* 1037A0 8029A190 87A20032 */ lh $v0, 0x32($sp) -/* 1037A4 8029A194 8FA7003C */ lw $a3, 0x3c($sp) -/* 1037A8 8029A198 4608003C */ c.lt.s $f0, $f8 -/* 1037AC 8029A19C 30490400 */ andi $t1, $v0, 0x400 -/* 1037B0 8029A1A0 45030022 */ bc1tl .L8029A22C -/* 1037B4 8029A1A4 8FBF0024 */ lw $ra, 0x24($sp) -/* 1037B8 8029A1A8 1520000B */ bnez $t1, .L8029A1D8 -/* 1037BC 8029A1AC 3C01802C */ lui $at, %hi(D_802B96A8) # $at, 0x802c -/* 1037C0 8029A1B0 C42A96A8 */ lwc1 $f10, %lo(D_802B96A8)($at) -/* 1037C4 8029A1B4 8FA40028 */ lw $a0, 0x28($sp) -/* 1037C8 8029A1B8 26050010 */ addiu $a1, $s0, 0x10 -/* 1037CC 8029A1BC 460A003C */ c.lt.s $f0, $f10 -/* 1037D0 8029A1C0 3C063F4C */ lui $a2, (0x3F4CCCCD >> 16) # lui $a2, 0x3f4c -/* 1037D4 8029A1C4 45020005 */ bc1fl .L8029A1DC -/* 1037D8 8029A1C8 C6100018 */ lwc1 $f16, 0x18($s0) -/* 1037DC 8029A1CC 0C0A5E53 */ jal func_8029794C -/* 1037E0 8029A1D0 34C6CCCD */ ori $a2, (0x3F4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd -/* 1037E4 8029A1D4 8FA7003C */ lw $a3, 0x3c($sp) -.L8029A1D8: -/* 1037E8 8029A1D8 C6100018 */ lwc1 $f16, 0x18($s0) -.L8029A1DC: -/* 1037EC 8029A1DC 00E02025 */ move $a0, $a3 -/* 1037F0 8029A1E0 00002825 */ move $a1, $zero -/* 1037F4 8029A1E4 E4F00030 */ swc1 $f16, 0x30($a3) -/* 1037F8 8029A1E8 C612001C */ lwc1 $f18, 0x1c($s0) -/* 1037FC 8029A1EC E4F20034 */ swc1 $f18, 0x34($a3) -/* 103800 8029A1F0 C6040020 */ lwc1 $f4, 0x20($s0) -/* 103804 8029A1F4 0C0AD3FE */ jal func_802B4FF8 -/* 103808 8029A1F8 E4E40038 */ swc1 $f4, 0x38($a3) -/* 10380C 8029A1FC 1040000A */ beqz $v0, .L8029A228 -/* 103810 8029A200 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015 -/* 103814 8029A204 24840298 */ addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298 -/* 103818 8029A208 8C830000 */ lw $v1, ($a0) -/* 10381C 8029A20C 3C0C0601 */ lui $t4, %hi(D_06008728) # $t4, 0x601 -/* 103820 8029A210 258C8728 */ addiu $t4, %lo(D_06008728) # addiu $t4, $t4, -0x78d8 -/* 103824 8029A214 246A0008 */ addiu $t2, $v1, 8 -/* 103828 8029A218 AC8A0000 */ sw $t2, ($a0) -/* 10382C 8029A21C 3C0B0600 */ lui $t3, 0x600 -/* 103830 8029A220 AC6B0000 */ sw $t3, ($v1) -/* 103834 8029A224 AC6C0004 */ sw $t4, 4($v1) -.L8029A228: -/* 103838 8029A228 8FBF0024 */ lw $ra, 0x24($sp) -.L8029A22C: -/* 10383C 8029A22C 8FB00020 */ lw $s0, 0x20($sp) -/* 103840 8029A230 27BD0038 */ addiu $sp, $sp, 0x38 -/* 103844 8029A234 03E00008 */ jr $ra -/* 103848 8029A238 00000000 */ nop diff --git a/asm/non_matchings/code_actors/func_8029A23C.s b/asm/non_matchings/code_actors/func_8029A23C.s deleted file mode 100644 index 6d3c89664..000000000 --- a/asm/non_matchings/code_actors/func_8029A23C.s +++ /dev/null @@ -1,95 +0,0 @@ -glabel func_8029A23C -/* 10384C 8029A23C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 103850 8029A240 AFBF001C */ sw $ra, 0x1c($sp) -/* 103854 8029A244 AFB00018 */ sw $s0, 0x18($sp) -/* 103858 8029A248 AFA40020 */ sw $a0, 0x20($sp) -/* 10385C 8029A24C 84CE0006 */ lh $t6, 6($a2) -/* 103860 8029A250 00A02025 */ move $a0, $a1 -/* 103864 8029A254 00C08025 */ move $s0, $a2 -/* 103868 8029A258 51C00050 */ beql $t6, $zero, .L8029A39C -/* 10386C 8029A25C 8FBF001C */ lw $ra, 0x1c($sp) -/* 103870 8029A260 C4C40018 */ lwc1 $f4, 0x18($a2) -/* 103874 8029A264 E4A40030 */ swc1 $f4, 0x30($a1) -/* 103878 8029A268 C4C6001C */ lwc1 $f6, 0x1c($a2) -/* 10387C 8029A26C E4A60034 */ swc1 $f6, 0x34($a1) -/* 103880 8029A270 C4C80020 */ lwc1 $f8, 0x20($a2) -/* 103884 8029A274 E4A80038 */ swc1 $f8, 0x38($a1) -/* 103888 8029A278 0C0AD3FE */ jal func_802B4FF8 -/* 10388C 8029A27C 00002825 */ move $a1, $zero -/* 103890 8029A280 10400045 */ beqz $v0, .L8029A398 -/* 103894 8029A284 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 103898 8029A288 860C0010 */ lh $t4, 0x10($s0) -/* 10389C 8029A28C 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 1038A0 8029A290 8C620000 */ lw $v0, ($v1) -/* 1038A4 8029A294 3C010300 */ lui $at, (0x03009000 >> 16) # lui $at, 0x300 -/* 1038A8 8029A298 34219000 */ ori $at, (0x03009000 & 0xFFFF) # ori $at, $at, 0x9000 -/* 1038AC 8029A29C 000C7A80 */ sll $t7, $t4, 0xa -/* 1038B0 8029A2A0 01E16021 */ addu $t4, $t7, $at -/* 1038B4 8029A2A4 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 1038B8 8029A2A8 24580008 */ addiu $t8, $v0, 8 -/* 1038BC 8029A2AC AC780000 */ sw $t8, ($v1) -/* 1038C0 8029A2B0 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 1038C4 8029A2B4 01816824 */ and $t5, $t4, $at -/* 1038C8 8029A2B8 3C19FD50 */ lui $t9, 0xfd50 -/* 1038CC 8029A2BC AC590000 */ sw $t9, ($v0) -/* 1038D0 8029A2C0 AC4D0004 */ sw $t5, 4($v0) -/* 1038D4 8029A2C4 8C620000 */ lw $v0, ($v1) -/* 1038D8 8029A2C8 3C180708 */ lui $t8, (0x07080200 >> 16) # lui $t8, 0x708 -/* 1038DC 8029A2CC 37180200 */ ori $t8, (0x07080200 & 0xFFFF) # ori $t8, $t8, 0x200 -/* 1038E0 8029A2D0 244E0008 */ addiu $t6, $v0, 8 -/* 1038E4 8029A2D4 AC6E0000 */ sw $t6, ($v1) -/* 1038E8 8029A2D8 3C0FF550 */ lui $t7, 0xf550 -/* 1038EC 8029A2DC AC4F0000 */ sw $t7, ($v0) -/* 1038F0 8029A2E0 AC580004 */ sw $t8, 4($v0) -/* 1038F4 8029A2E4 8C620000 */ lw $v0, ($v1) -/* 1038F8 8029A2E8 3C0DE600 */ lui $t5, 0xe600 -/* 1038FC 8029A2EC 3C18071F */ lui $t8, (0x071FF200 >> 16) # lui $t8, 0x71f -/* 103900 8029A2F0 24590008 */ addiu $t9, $v0, 8 -/* 103904 8029A2F4 AC790000 */ sw $t9, ($v1) -/* 103908 8029A2F8 AC400004 */ sw $zero, 4($v0) -/* 10390C 8029A2FC AC4D0000 */ sw $t5, ($v0) -/* 103910 8029A300 8C620000 */ lw $v0, ($v1) -/* 103914 8029A304 3718F200 */ ori $t8, (0x071FF200 & 0xFFFF) # ori $t8, $t8, 0xf200 -/* 103918 8029A308 3C0FF300 */ lui $t7, 0xf300 -/* 10391C 8029A30C 244E0008 */ addiu $t6, $v0, 8 -/* 103920 8029A310 AC6E0000 */ sw $t6, ($v1) -/* 103924 8029A314 AC580004 */ sw $t8, 4($v0) -/* 103928 8029A318 AC4F0000 */ sw $t7, ($v0) -/* 10392C 8029A31C 8C620000 */ lw $v0, ($v1) -/* 103930 8029A320 3C0DE700 */ lui $t5, 0xe700 -/* 103934 8029A324 3C0FF548 */ lui $t7, (0xF5480800 >> 16) # lui $t7, 0xf548 -/* 103938 8029A328 24590008 */ addiu $t9, $v0, 8 -/* 10393C 8029A32C AC790000 */ sw $t9, ($v1) -/* 103940 8029A330 AC400004 */ sw $zero, 4($v0) -/* 103944 8029A334 AC4D0000 */ sw $t5, ($v0) -/* 103948 8029A338 8C620000 */ lw $v0, ($v1) -/* 10394C 8029A33C 3C180008 */ lui $t8, (0x00080200 >> 16) # lui $t8, 8 -/* 103950 8029A340 37180200 */ ori $t8, (0x00080200 & 0xFFFF) # ori $t8, $t8, 0x200 -/* 103954 8029A344 244E0008 */ addiu $t6, $v0, 8 -/* 103958 8029A348 AC6E0000 */ sw $t6, ($v1) -/* 10395C 8029A34C 35EF0800 */ ori $t7, (0xF5480800 & 0xFFFF) # ori $t7, $t7, 0x800 -/* 103960 8029A350 AC4F0000 */ sw $t7, ($v0) -/* 103964 8029A354 AC580004 */ sw $t8, 4($v0) -/* 103968 8029A358 8C620000 */ lw $v0, ($v1) -/* 10396C 8029A35C 3C0E0007 */ lui $t6, (0x0007C07C >> 16) # lui $t6, 7 -/* 103970 8029A360 35CEC07C */ ori $t6, (0x0007C07C & 0xFFFF) # ori $t6, $t6, 0xc07c -/* 103974 8029A364 24590008 */ addiu $t9, $v0, 8 -/* 103978 8029A368 AC790000 */ sw $t9, ($v1) -/* 10397C 8029A36C 3C0DF200 */ lui $t5, 0xf200 -/* 103980 8029A370 AC4D0000 */ sw $t5, ($v0) -/* 103984 8029A374 AC4E0004 */ sw $t6, 4($v0) -/* 103988 8029A378 8C620000 */ lw $v0, ($v1) -/* 10398C 8029A37C 3C190601 */ lui $t9, %hi(D_06013BB8) # $t9, 0x601 -/* 103990 8029A380 27393BB8 */ addiu $t9, %lo(D_06013BB8) # addiu $t9, $t9, 0x3bb8 -/* 103994 8029A384 244F0008 */ addiu $t7, $v0, 8 -/* 103998 8029A388 AC6F0000 */ sw $t7, ($v1) -/* 10399C 8029A38C 3C180600 */ lui $t8, 0x600 -/* 1039A0 8029A390 AC580000 */ sw $t8, ($v0) -/* 1039A4 8029A394 AC590004 */ sw $t9, 4($v0) -.L8029A398: -/* 1039A8 8029A398 8FBF001C */ lw $ra, 0x1c($sp) -.L8029A39C: -/* 1039AC 8029A39C 8FB00018 */ lw $s0, 0x18($sp) -/* 1039B0 8029A3A0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 1039B4 8029A3A4 03E00008 */ jr $ra -/* 1039B8 8029A3A8 00000000 */ nop diff --git a/asm/non_matchings/code_actors/func_8029A3AC.s b/asm/non_matchings/code_actors/func_8029A3AC.s deleted file mode 100644 index 73f78dfbc..000000000 --- a/asm/non_matchings/code_actors/func_8029A3AC.s +++ /dev/null @@ -1,193 +0,0 @@ -glabel func_8029A3AC -/* 1039BC 8029A3AC 27BDFF80 */ addiu $sp, $sp, -0x80 -/* 1039C0 8029A3B0 3C0F802C */ lui $t7, %hi(D_802B87E8) # $t7, 0x802c -/* 1039C4 8029A3B4 AFBF0024 */ sw $ra, 0x24($sp) -/* 1039C8 8029A3B8 AFB00020 */ sw $s0, 0x20($sp) -/* 1039CC 8029A3BC AFA50084 */ sw $a1, 0x84($sp) -/* 1039D0 8029A3C0 25EF87E8 */ addiu $t7, %lo(D_802B87E8) # addiu $t7, $t7, -0x7818 -/* 1039D4 8029A3C4 8DE10000 */ lw $at, ($t7) -/* 1039D8 8029A3C8 27AE0058 */ addiu $t6, $sp, 0x58 -/* 1039DC 8029A3CC 8DED0004 */ lw $t5, 4($t7) -/* 1039E0 8029A3D0 ADC10000 */ sw $at, ($t6) -/* 1039E4 8029A3D4 8DE10008 */ lw $at, 8($t7) -/* 1039E8 8029A3D8 ADCD0004 */ sw $t5, 4($t6) -/* 1039EC 8029A3DC 8DED000C */ lw $t5, 0xc($t7) -/* 1039F0 8029A3E0 ADC10008 */ sw $at, 8($t6) -/* 1039F4 8029A3E4 8DE10010 */ lw $at, 0x10($t7) -/* 1039F8 8029A3E8 ADCD000C */ sw $t5, 0xc($t6) -/* 1039FC 8029A3EC 8DED0014 */ lw $t5, 0x14($t7) -/* 103A00 8029A3F0 ADC10010 */ sw $at, 0x10($t6) -/* 103A04 8029A3F4 8DE10018 */ lw $at, 0x18($t7) -/* 103A08 8029A3F8 3C19800E */ lui $t9, %hi(camera1) # $t9, 0x800e -/* 103A0C 8029A3FC ADCD0014 */ sw $t5, 0x14($t6) -/* 103A10 8029A400 ADC10018 */ sw $at, 0x18($t6) -/* 103A14 8029A404 95E1001C */ lhu $at, 0x1c($t7) -/* 103A18 8029A408 00C08025 */ move $s0, $a2 -/* 103A1C 8029A40C 24C50018 */ addiu $a1, $a2, 0x18 -/* 103A20 8029A410 A5C1001C */ sh $at, 0x1c($t6) -/* 103A24 8029A414 8F39DB40 */ lw $t9, %lo(camera1)($t9) -/* 103A28 8029A418 240100B8 */ li $at, 184 -/* 103A2C 8029A41C 94860026 */ lhu $a2, 0x26($a0) -/* 103A30 8029A420 0099C023 */ subu $t8, $a0, $t9 -/* 103A34 8029A424 0301001A */ div $zero, $t8, $at -/* 103A38 8029A428 00007012 */ mflo $t6 -/* 103A3C 8029A42C 000E7880 */ sll $t7, $t6, 2 -/* 103A40 8029A430 3C018015 */ lui $at, %hi(D_80150130) -/* 103A44 8029A434 002F0821 */ addu $at, $at, $t7 -/* 103A48 8029A438 C4240130 */ lwc1 $f4, %lo(D_80150130)($at) -/* 103A4C 8029A43C 3C01802C */ lui $at, %hi(D_802B96AC) # $at, 0x802c -/* 103A50 8029A440 C42696AC */ lwc1 $f6, %lo(D_802B96AC)($at) -/* 103A54 8029A444 AFA40080 */ sw $a0, 0x80($sp) -/* 103A58 8029A448 24070000 */ li $a3, 0 -/* 103A5C 8029A44C E7A40010 */ swc1 $f4, 0x10($sp) -/* 103A60 8029A450 0C0AE034 */ jal func_802B80D0 -/* 103A64 8029A454 E7A60014 */ swc1 $f6, 0x14($sp) -/* 103A68 8029A458 44804000 */ mtc1 $zero, $f8 -/* 103A6C 8029A45C 8FA40080 */ lw $a0, 0x80($sp) -/* 103A70 8029A460 46000086 */ mov.s $f2, $f0 -/* 103A74 8029A464 4608003C */ c.lt.s $f0, $f8 -/* 103A78 8029A468 02002825 */ move $a1, $s0 -/* 103A7C 8029A46C 45000005 */ bc1f .L8029A484 -/* 103A80 8029A470 00000000 */ nop -/* 103A84 8029A474 0C0A5C8C */ jal func_80297230 -/* 103A88 8029A478 02002825 */ move $a1, $s0 -/* 103A8C 8029A47C 10000080 */ b .L8029A680 -/* 103A90 8029A480 8FBF0024 */ lw $ra, 0x24($sp) -.L8029A484: -/* 103A94 8029A484 0C0A5CAE */ jal func_802972B8 -/* 103A98 8029A488 E7A20050 */ swc1 $f2, 0x50($sp) -/* 103A9C 8029A48C 3C01802C */ lui $at, %hi(D_802B96B0) # $at, 0x802c -/* 103AA0 8029A490 C7A20050 */ lwc1 $f2, 0x50($sp) -/* 103AA4 8029A494 C42A96B0 */ lwc1 $f10, %lo(D_802B96B0)($at) -/* 103AA8 8029A498 8FA60084 */ lw $a2, 0x84($sp) -/* 103AAC 8029A49C 02002025 */ move $a0, $s0 -/* 103AB0 8029A4A0 460A103C */ c.lt.s $f2, $f10 -/* 103AB4 8029A4A4 3C054059 */ lui $a1, (0x4059999A >> 16) # lui $a1, 0x4059 -/* 103AB8 8029A4A8 45020005 */ bc1fl .L8029A4C0 -/* 103ABC 8029A4AC 860D0000 */ lh $t5, ($s0) -/* 103AC0 8029A4B0 0C0A5E7E */ jal func_802979F8 -/* 103AC4 8029A4B4 34A5999A */ ori $a1, (0x4059999A & 0xFFFF) # ori $a1, $a1, 0x999a -/* 103AC8 8029A4B8 8FA60084 */ lw $a2, 0x84($sp) -/* 103ACC 8029A4BC 860D0000 */ lh $t5, ($s0) -.L8029A4C0: -/* 103AD0 8029A4C0 2401002A */ li $at, 42 -/* 103AD4 8029A4C4 3C0B802C */ lui $t3, %hi(D_802BA050) # 0x802c -/* 103AD8 8029A4C8 15A10004 */ bne $t5, $at, .L8029A4DC -/* 103ADC 8029A4CC 00000000 */ nop -/* 103AE0 8029A4D0 3C0B802C */ lui $t3, %hi(D_802BA054) # $t3, 0x802c -/* 103AE4 8029A4D4 10000002 */ b .L8029A4E0 -/* 103AE8 8029A4D8 8D6BA054 */ lw $t3, %lo(D_802BA054)($t3) -.L8029A4DC: -/* 103AEC 8029A4DC 8D6BA050 */ lw $t3, %lo(D_802BA050)($t3) # -0x5fb0($t3) -.L8029A4E0: -/* 103AF0 8029A4E0 960C0010 */ lhu $t4, 0x10($s0) -/* 103AF4 8029A4E4 24011111 */ li $at, 4369 -/* 103AF8 8029A4E8 C6100018 */ lwc1 $f16, 0x18($s0) -/* 103AFC 8029A4EC 0181001A */ div $zero, $t4, $at -/* 103B00 8029A4F0 0000C812 */ mflo $t9 -/* 103B04 8029A4F4 3338FFFF */ andi $t8, $t9, 0xffff -/* 103B08 8029A4F8 00187040 */ sll $t6, $t8, 1 -/* 103B0C 8029A4FC 03AE7821 */ addu $t7, $sp, $t6 -/* 103B10 8029A500 85EF0058 */ lh $t7, 0x58($t7) -/* 103B14 8029A504 E4D00030 */ swc1 $f16, 0x30($a2) -/* 103B18 8029A508 C604000C */ lwc1 $f4, 0xc($s0) -/* 103B1C 8029A50C C612001C */ lwc1 $f18, 0x1c($s0) -/* 103B20 8029A510 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 103B24 8029A514 44814000 */ mtc1 $at, $f8 -/* 103B28 8029A518 46049181 */ sub.s $f6, $f18, $f4 -/* 103B2C 8029A51C 016F5821 */ addu $t3, $t3, $t7 -/* 103B30 8029A520 00C02025 */ move $a0, $a2 -/* 103B34 8029A524 00002825 */ move $a1, $zero -/* 103B38 8029A528 46083280 */ add.s $f10, $f6, $f8 -/* 103B3C 8029A52C E4CA0034 */ swc1 $f10, 0x34($a2) -/* 103B40 8029A530 C6100020 */ lwc1 $f16, 0x20($s0) -/* 103B44 8029A534 E4D00038 */ swc1 $f16, 0x38($a2) -/* 103B48 8029A538 A7B8007C */ sh $t8, 0x7c($sp) -/* 103B4C 8029A53C 0C0AD3FE */ jal func_802B4FF8 -/* 103B50 8029A540 AFAB0054 */ sw $t3, 0x54($sp) -/* 103B54 8029A544 8FAB0054 */ lw $t3, 0x54($sp) -/* 103B58 8029A548 1040004C */ beqz $v0, .L8029A67C -/* 103B5C 8029A54C 97AC007C */ lhu $t4, 0x7c($sp) -/* 103B60 8029A550 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 103B64 8029A554 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 103B68 8029A558 8C620000 */ lw $v0, ($v1) -/* 103B6C 8029A55C 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 103B70 8029A560 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 103B74 8029A564 244D0008 */ addiu $t5, $v0, 8 -/* 103B78 8029A568 AC6D0000 */ sw $t5, ($v1) -/* 103B7C 8029A56C 0161C024 */ and $t8, $t3, $at -/* 103B80 8029A570 3C19FD50 */ lui $t9, 0xfd50 -/* 103B84 8029A574 AC590000 */ sw $t9, ($v0) -/* 103B88 8029A578 AC580004 */ sw $t8, 4($v0) -/* 103B8C 8029A57C 8C620000 */ lw $v0, ($v1) -/* 103B90 8029A580 3C0D0708 */ lui $t5, (0x07080200 >> 16) # lui $t5, 0x708 -/* 103B94 8029A584 35AD0200 */ ori $t5, (0x07080200 & 0xFFFF) # ori $t5, $t5, 0x200 -/* 103B98 8029A588 244E0008 */ addiu $t6, $v0, 8 -/* 103B9C 8029A58C AC6E0000 */ sw $t6, ($v1) -/* 103BA0 8029A590 3C0FF550 */ lui $t7, 0xf550 -/* 103BA4 8029A594 AC4F0000 */ sw $t7, ($v0) -/* 103BA8 8029A598 AC4D0004 */ sw $t5, 4($v0) -/* 103BAC 8029A59C 8C620000 */ lw $v0, ($v1) -/* 103BB0 8029A5A0 3C18E600 */ lui $t8, 0xe600 -/* 103BB4 8029A5A4 3C0D071F */ lui $t5, (0x071FF200 >> 16) # lui $t5, 0x71f -/* 103BB8 8029A5A8 24590008 */ addiu $t9, $v0, 8 -/* 103BBC 8029A5AC AC790000 */ sw $t9, ($v1) -/* 103BC0 8029A5B0 AC400004 */ sw $zero, 4($v0) -/* 103BC4 8029A5B4 AC580000 */ sw $t8, ($v0) -/* 103BC8 8029A5B8 8C620000 */ lw $v0, ($v1) -/* 103BCC 8029A5BC 35ADF200 */ ori $t5, (0x071FF200 & 0xFFFF) # ori $t5, $t5, 0xf200 -/* 103BD0 8029A5C0 3C0FF300 */ lui $t7, 0xf300 -/* 103BD4 8029A5C4 244E0008 */ addiu $t6, $v0, 8 -/* 103BD8 8029A5C8 AC6E0000 */ sw $t6, ($v1) -/* 103BDC 8029A5CC AC4D0004 */ sw $t5, 4($v0) -/* 103BE0 8029A5D0 AC4F0000 */ sw $t7, ($v0) -/* 103BE4 8029A5D4 8C620000 */ lw $v0, ($v1) -/* 103BE8 8029A5D8 3C18E700 */ lui $t8, 0xe700 -/* 103BEC 8029A5DC 3C0FF548 */ lui $t7, (0xF5480800 >> 16) # lui $t7, 0xf548 -/* 103BF0 8029A5E0 24590008 */ addiu $t9, $v0, 8 -/* 103BF4 8029A5E4 AC790000 */ sw $t9, ($v1) -/* 103BF8 8029A5E8 AC400004 */ sw $zero, 4($v0) -/* 103BFC 8029A5EC AC580000 */ sw $t8, ($v0) -/* 103C00 8029A5F0 8C620000 */ lw $v0, ($v1) -/* 103C04 8029A5F4 3C0D0008 */ lui $t5, (0x00080200 >> 16) # lui $t5, 8 -/* 103C08 8029A5F8 35AD0200 */ ori $t5, (0x00080200 & 0xFFFF) # ori $t5, $t5, 0x200 -/* 103C0C 8029A5FC 244E0008 */ addiu $t6, $v0, 8 -/* 103C10 8029A600 AC6E0000 */ sw $t6, ($v1) -/* 103C14 8029A604 35EF0800 */ ori $t7, (0xF5480800 & 0xFFFF) # ori $t7, $t7, 0x800 -/* 103C18 8029A608 AC4F0000 */ sw $t7, ($v0) -/* 103C1C 8029A60C AC4D0004 */ sw $t5, 4($v0) -/* 103C20 8029A610 8C620000 */ lw $v0, ($v1) -/* 103C24 8029A614 3C0E0007 */ lui $t6, (0x0007C07C >> 16) # lui $t6, 7 -/* 103C28 8029A618 35CEC07C */ ori $t6, (0x0007C07C & 0xFFFF) # ori $t6, $t6, 0xc07c -/* 103C2C 8029A61C 24590008 */ addiu $t9, $v0, 8 -/* 103C30 8029A620 AC790000 */ sw $t9, ($v1) -/* 103C34 8029A624 3C18F200 */ lui $t8, 0xf200 -/* 103C38 8029A628 29810008 */ slti $at, $t4, 8 -/* 103C3C 8029A62C AC580000 */ sw $t8, ($v0) -/* 103C40 8029A630 1020000A */ beqz $at, .L8029A65C -/* 103C44 8029A634 AC4E0004 */ sw $t6, 4($v0) -/* 103C48 8029A638 8C620000 */ lw $v0, ($v1) -/* 103C4C 8029A63C 3C190D00 */ lui $t9, %hi(D_0D005338) # $t9, 0xd00 -/* 103C50 8029A640 27395338 */ addiu $t9, %lo(D_0D005338) # addiu $t9, $t9, 0x5338 -/* 103C54 8029A644 244F0008 */ addiu $t7, $v0, 8 -/* 103C58 8029A648 AC6F0000 */ sw $t7, ($v1) -/* 103C5C 8029A64C 3C0D0600 */ lui $t5, 0x600 -/* 103C60 8029A650 AC4D0000 */ sw $t5, ($v0) -/* 103C64 8029A654 10000009 */ b .L8029A67C -/* 103C68 8029A658 AC590004 */ sw $t9, 4($v0) -.L8029A65C: -/* 103C6C 8029A65C 8C620000 */ lw $v0, ($v1) -/* 103C70 8029A660 3C0F0D00 */ lui $t7, %hi(D_0D005368) # $t7, 0xd00 -/* 103C74 8029A664 25EF5368 */ addiu $t7, %lo(D_0D005368) # addiu $t7, $t7, 0x5368 -/* 103C78 8029A668 24580008 */ addiu $t8, $v0, 8 -/* 103C7C 8029A66C AC780000 */ sw $t8, ($v1) -/* 103C80 8029A670 3C0E0600 */ lui $t6, 0x600 -/* 103C84 8029A674 AC4E0000 */ sw $t6, ($v0) -/* 103C88 8029A678 AC4F0004 */ sw $t7, 4($v0) -.L8029A67C: -/* 103C8C 8029A67C 8FBF0024 */ lw $ra, 0x24($sp) -.L8029A680: -/* 103C90 8029A680 8FB00020 */ lw $s0, 0x20($sp) -/* 103C94 8029A684 27BD0080 */ addiu $sp, $sp, 0x80 -/* 103C98 8029A688 03E00008 */ jr $ra -/* 103C9C 8029A68C 00000000 */ nop diff --git a/asm/non_matchings/code_actors/func_8029CF0C.s b/asm/non_matchings/code_actors/func_8029CF0C.s deleted file mode 100644 index a47e0a639..000000000 --- a/asm/non_matchings/code_actors/func_8029CF0C.s +++ /dev/null @@ -1,68 +0,0 @@ -glabel func_8029CF0C -/* 10651C 8029CF0C 00047E02 */ srl $t7, $a0, 0x18 -/* 106520 8029CF10 000FC080 */ sll $t8, $t7, 2 -/* 106524 8029CF14 3C198015 */ lui $t9, %hi(gSegmentTable) -/* 106528 8029CF18 0338C821 */ addu $t9, $t9, $t8 -/* 10652C 8029CF1C 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* 106530 8029CF20 8F390258 */ lw $t9, %lo(gSegmentTable)($t9) -/* 106534 8029CF24 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 106538 8029CF28 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 10653C 8029CF2C 00814824 */ and $t1, $a0, $at -/* 106540 8029CF30 3C018000 */ lui $at, 0x8000 -/* 106544 8029CF34 3C0A802C */ lui $t2, %hi(D_802B8848) # $t2, 0x802c -/* 106548 8029CF38 03291021 */ addu $v0, $t9, $t1 -/* 10654C 8029CF3C AFBF001C */ sw $ra, 0x1c($sp) -/* 106550 8029CF40 AFB00018 */ sw $s0, 0x18($sp) -/* 106554 8029CF44 AFA40038 */ sw $a0, 0x38($sp) -/* 106558 8029CF48 00411021 */ addu $v0, $v0, $at -/* 10655C 8029CF4C 254A8848 */ addiu $t2, %lo(D_802B8848) # addiu $t2, $t2, -0x77b8 -/* 106560 8029CF50 8D410000 */ lw $at, ($t2) -/* 106564 8029CF54 27A80024 */ addiu $t0, $sp, 0x24 -/* 106568 8029CF58 44800000 */ mtc1 $zero, $f0 -/* 10656C 8029CF5C AD010000 */ sw $at, ($t0) -/* 106570 8029CF60 95410004 */ lhu $at, 4($t2) -/* 106574 8029CF64 00A08025 */ move $s0, $a1 -/* 106578 8029CF68 24A40024 */ addiu $a0, $a1, 0x24 -/* 10657C 8029CF6C A5010004 */ sh $at, 4($t0) -/* 106580 8029CF70 84A30006 */ lh $v1, 6($a1) -/* 106584 8029CF74 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016 -/* 106588 8029CF78 44060000 */ mfc1 $a2, $f0 -/* 10658C 8029CF7C 0003C040 */ sll $t8, $v1, 1 -/* 106590 8029CF80 01187021 */ addu $t6, $t0, $t8 -/* 106594 8029CF84 85D90000 */ lh $t9, ($t6) -/* 106598 8029CF88 000378C0 */ sll $t7, $v1, 3 -/* 10659C 8029CF8C 004F1021 */ addu $v0, $v0, $t7 -/* 1065A0 8029CF90 A4B90004 */ sh $t9, 4($a1) -/* 1065A4 8029CF94 84490000 */ lh $t1, ($v0) -/* 1065A8 8029CF98 C428F784 */ lwc1 $f8, %lo(gCourseDirection)($at) -/* 1065AC 8029CF9C 3C014120 */ li $at, 0x41200000 # 10.000000 -/* 1065B0 8029CFA0 44892000 */ mtc1 $t1, $f4 -/* 1065B4 8029CFA4 44070000 */ mfc1 $a3, $f0 -/* 1065B8 8029CFA8 468021A0 */ cvt.s.w $f6, $f4 -/* 1065BC 8029CFAC 44812000 */ mtc1 $at, $f4 -/* 1065C0 8029CFB0 46083282 */ mul.s $f10, $f6, $f8 -/* 1065C4 8029CFB4 E4AA0018 */ swc1 $f10, 0x18($a1) -/* 1065C8 8029CFB8 844C0002 */ lh $t4, 2($v0) -/* 1065CC 8029CFBC 448C8000 */ mtc1 $t4, $f16 -/* 1065D0 8029CFC0 00000000 */ nop -/* 1065D4 8029CFC4 468084A0 */ cvt.s.w $f18, $f16 -/* 1065D8 8029CFC8 46049180 */ add.s $f6, $f18, $f4 -/* 1065DC 8029CFCC E4A6001C */ swc1 $f6, 0x1c($a1) -/* 1065E0 8029CFD0 844B0004 */ lh $t3, 4($v0) -/* 1065E4 8029CFD4 448B4000 */ mtc1 $t3, $f8 -/* 1065E8 8029CFD8 00000000 */ nop -/* 1065EC 8029CFDC 468042A0 */ cvt.s.w $f10, $f8 -/* 1065F0 8029CFE0 E4AA0020 */ swc1 $f10, 0x20($a1) -/* 1065F4 8029CFE4 44050000 */ mfc1 $a1, $f0 -/* 1065F8 8029CFE8 0C0AD4A7 */ jal load_giant_egg -/* 1065FC 8029CFEC 00000000 */ nop -/* 106600 8029CFF0 26040010 */ addiu $a0, $s0, 0x10 -/* 106604 8029CFF4 00002825 */ move $a1, $zero -/* 106608 8029CFF8 00003025 */ move $a2, $zero -/* 10660C 8029CFFC 0C0AD4AF */ jal func_802B52BC -/* 106610 8029D000 00003825 */ move $a3, $zero -/* 106614 8029D004 8FBF001C */ lw $ra, 0x1c($sp) -/* 106618 8029D008 8FB00018 */ lw $s0, 0x18($sp) -/* 10661C 8029D00C 27BD0038 */ addiu $sp, $sp, 0x38 -/* 106620 8029D010 03E00008 */ jr $ra -/* 106624 8029D014 00000000 */ nop diff --git a/data/data_121DA0.s b/data/data_121DA0.s index da28a4642..c15201f08 100644 --- a/data/data_121DA0.s +++ b/data/data_121DA0.s @@ -44,32 +44,33 @@ glabel D_802B87D8 .hword 0 .hword 0 # fill -.word 0 # fill +#.word 0 # fill padding +# start of 80296A50.c -glabel D_802B87E0 -.word 0 -.hword 0 -.hword 0 # fill +#glabel D_802B87E0 +#.word 0 +#.hword 0 +#.hword 0 # fill -glabel D_802B87E8 # probably a struct -.hword 0x0000, 0x0400, 0x0800, 0x0c00 -.hword 0x1000, 0x1400, 0x1800, 0x1c00 -.hword 0x1c00, 0x1800, 0x1400, 0x1000 -.hword 0x0c00, 0x0800, 0x0400 +#glabel D_802B87E8 # struct or array in func_8029A3AC +#.hword 0x0000, 0x0400, 0x0800, 0x0c00 +#.hword 0x1000, 0x1400, 0x1800, 0x1c00 +#.hword 0x1c00, 0x1800, 0x1400, 0x1000 +#.hword 0x0c00, 0x0800, 0x0400 -.hword 0 # fill +#.hword 0 # fill # unknown D_802B8808 -.hword 0x0014, 0x0028, 0x0000, 0x0000 +#.hword 0x0014, 0x0028, 0x0000, 0x0000 # unknown D_802B8810 -.hword 0x0fc0, 0x0000, 0xffff, 0xffff, 0x0014, 0x0000, 0x0000, 0x0000 -.hword 0x0fc0, 0x0fc0, 0xffff, 0xffff, 0xffec, 0x0000, 0x0000, 0x0000 -.hword 0x0000, 0x0fc0, 0xffff, 0xffff, 0xffec, 0x0028, 0x0000, 0x0000 -.hword 0x0000, 0x0000, 0xffff, 0xffff +#.hword 0x0fc0, 0x0000, 0xffff, 0xffff, 0x0014, 0x0000, 0x0000, 0x0000 +#.hword 0x0fc0, 0x0fc0, 0xffff, 0xffff, 0xffec, 0x0000, 0x0000, 0x0000 +#.hword 0x0000, 0x0fc0, 0xffff, 0xffff, 0xffec, 0x0028, 0x0000, 0x0000 +#.hword 0x0000, 0x0000, 0xffff, 0xffff -glabel D_802B8848 # struct -.hword 60, 120, 180 +#glabel D_802B8848 # struct +#.hword 60, 120, 180 .hword 0000 # fill diff --git a/include/PR/mbi.h b/include/PR/mbi.h index fed3510f8..6d54a00e2 100644 --- a/include/PR/mbi.h +++ b/include/PR/mbi.h @@ -91,6 +91,7 @@ #define NUM_SEGMENTS (16) #define SEGMENT_OFFSET(a) ((unsigned int)(a) & 0x00ffffff) #define SEGMENT_NUMBER(a) (((unsigned int)(a) << 4) >> 28) +#define SEGMENT_NUMBER2(a) ((unsigned int)(a) >> 24) #define SEGMENT_ADDR(num, off) (((num) << 24) + (off)) #ifndef NULL diff --git a/include/actor_types.h b/include/actor_types.h index 2a2b48058..276560c05 100644 --- a/include/actor_types.h +++ b/include/actor_types.h @@ -71,6 +71,19 @@ struct FallingRock { /* 0x30 */ UnkActorInner unk30; }; // size = 0x70 +// Data in course_choco_mountain_dl.bin +// 7230? +// func_8029CF0C +struct innerFR { + Vec4s data; +}; + +typedef union { + struct innerFR unk; + s32 unk2; + s32 unk3; +} UnknownFallingRock; + struct YoshiValleyEgg { /* 0x00 */ s16 type; /* 0x02 */ s16 flags; diff --git a/src/code_80296A50.c b/src/code_80296A50.c index ef7a8daf2..4fd343bbf 100644 --- a/src/code_80296A50.c +++ b/src/code_80296A50.c @@ -559,51 +559,26 @@ void func_802977E4(Player *arg0) { arg0->boundingBoxCorners[2].unk_14 &= 0xFFFD; } -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -//extern ? D_0D004E38; -//extern s16 D_802BA060; -//extern ? gSegmentTable; -extern s8 D_0D004E38[]; - - void func_80297818(void) { - s16 *temp_v0; - s16 *temp_v1; - s16 temp_a0; - s16 temp_a0_2; - s16 temp_a0_3; - s16 temp_a0_4; - s32 temp_a1; - s16 *phi_v1; - s16 *phi_v0; - s32 phi_a1; + s16 *phi_v0 = &D_802BA060[0]; + s16 *phi_v1 = VIRTUAL_TO_PHYSICAL2(gSegmentTable[SEGMENT_NUMBER2(&D_0D004E38)] + SEGMENT_OFFSET(&D_0D004E38)); + s16 temp_a0, temp_a0_2, temp_a0_3, temp_a0_4, temp_a0_5; s32 i; - phi_v1 = &gSegmentTable[D_0D004738[0] + D_0D004C68[0x1D0] & 0xFFFFFF] + 0x80000000; - //phi_v1 = *(&gSegmentTable + ((&D_0D004E38 >> 0x18) * 4)) + (&D_0D004E38 & 0xFFFFFF) + 0x80000000; - phi_v0 = &D_802BA060; - phi_a1 = 0; - for (i = 0; i < 100; i++) { - //do { + for (i = 0; i < 256; i++) { temp_a0 = *phi_v1; - temp_a1 = phi_a1 + 4; - temp_v1 = phi_v1 + 8; - *phi_v0 = ((temp_a0 & 0xF800) >> 5) | ((temp_a0 & 0x7C0) << 5) | (temp_a0 & 0x3E) | (temp_a0 & 1); - temp_a0_2 = temp_v1->unk-6; - temp_v0 = phi_v0 + 8; - temp_v0->unk-6 = ((temp_a0_2 & 0xF800) >> 5) | ((temp_a0_2 & 0x7C0) << 5) | (temp_a0_2 & 0x3E) | (temp_a0_2 & 1); - temp_a0_3 = temp_v1->unk-4; - temp_v0->unk-4 = ((temp_a0_3 & 0xF800) >> 5) | ((temp_a0_3 & 0x7C0) << 5) | (temp_a0_3 & 0x3E) | (temp_a0_3 & 1); - temp_a0_4 = temp_v1->unk-2; - temp_v0->unk-2 = ((temp_a0_4 & 0xF800) >> 5) | ((temp_a0_4 & 0x7C0) << 5) | (temp_a0_4 & 0x3E) | (temp_a0_4 & 1); - phi_v1 = temp_v1; - phi_v0 = temp_v0; - phi_a1 = temp_a1; - } //while (temp_a1 != 0x100); + temp_a0_2 = temp_a0 & 0xF800; + temp_a0_3 = temp_a0 & 0x7C0; + temp_a0_4 = temp_a0 & 0x3E; + temp_a0_5 = temp_a0 & 0x1; + + *phi_v0 = (temp_a0_2 >> 5) | (temp_a0_3 << 5) | temp_a0_4 | temp_a0_5; + + phi_v1++; + phi_v0++; + } } -#else -GLOBAL_ASM("asm/non_matchings/code_actors/func_80297818.s") -#endif + +UNUSED func_80297944(void) {}; extern Gfx D_0D007B20[]; @@ -1391,6 +1366,9 @@ void func_80298D10(void) { GLOBAL_ASM("asm/non_matchings/code_actors/func_80298D10.s") #endif +// Might just be an s32 array with a u16 in it... However that might work. +Vec3s D_802B87E0[] = {0x0000, 0x0000, 0x0000}; + #ifdef MIPS_TO_C //generated by m2c commit 685418adfeb3794409e47b45ac5cab60b17d23fd ? func_802B4FF8(f32 (*)[4], ?); /* extern */ @@ -1532,885 +1510,389 @@ block_29: GLOBAL_ASM("asm/non_matchings/code_actors/func_80298D7C.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 685418adfeb3794409e47b45ac5cab60b17d23fd -? func_8029794C(f32 *, s16 *, ?, f32 (*)[4]); /* extern */ -s32 func_802B4FF8(f32 (*)[4], ?); /* extern */ -f32 func_802B80D0(f32 *, u16, ?, f32, f32); /* extern */ -extern ? D_06006A68; -extern ? D_0D004C68; -extern ? D_80150130; -static f32 D_802B9658 = 1.6e7f; -static f32 D_802B965C = 250000.0f; +extern Gfx D_06006A68[]; +extern Gfx D_0D004C68[]; -void func_80299144(Camera *camera, f32 (*arg1)[4], struct Actor *arg2) { - s16 sp4A; - f32 *sp28; - Gfx *temp_v0_2; - Gfx *temp_v0_3; - Gfx *temp_v0_4; - Gfx *temp_v0_5; - Gfx *temp_v0_6; - Gfx *temp_v0_7; - Gfx *temp_v0_8; - f32 *temp_a1; +extern f32 D_802B9658; // = 16000000.0; // static +extern f32 D_802B965C; // = 250000.0f; // static +extern f32 D_802B96B4; + +void func_80299144(Camera *camera, Mat4 arg1, struct Actor *arg2) { f32 temp_f0; - s16 temp_v0; + s16 temp_v0 = arg2->flags; - temp_v0 = arg2->flags; - temp_a1 = arg2->pos; - if ((temp_v0 & 0x800) == 0) { - sp28 = temp_a1; - sp4A = temp_v0; - temp_f0 = func_802B80D0(temp_a1, (u16) camera->rotX2, 0, *(&D_80150130 + (((s32) (camera - camera1) / 184) * 4)), D_802B9658); - if (!(temp_f0 < 0.0f)) { - if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B965C)) { - func_8029794C(sp28, arg2->rot, 0x40400000, arg1); - } - arg1->unk30 = (f32) arg2->pos[0]; - arg1->unk34 = (f32) arg2->pos[1]; - arg1->unk38 = (f32) arg2->pos[2]; - if (func_802B4FF8(arg1, 0) != 0) { - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->words.w0 = 0xFD100000; - temp_v0_2->words.w1 = (u32) &D_0D004C68; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->words.w1 = 0; - temp_v0_3->words.w0 = 0xE8000000; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->words.w1 = 0x07000000; - temp_v0_4->words.w0 = 0xF5000100; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->words.w1 = 0; - temp_v0_5->words.w0 = 0xE6000000; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->words.w1 = 0x073FC000; - temp_v0_6->words.w0 = 0xF0000000; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->words.w1 = 0; - temp_v0_7->words.w0 = 0xE7000000; - temp_v0_8 = gDisplayListHead; - gDisplayListHead = temp_v0_8 + 8; - temp_v0_8->words.w1 = (u32) &D_06006A68; - temp_v0_8->words.w0 = 0x06000000; - } - } + if ((temp_v0 & 0x800) != 0) { return; } + + temp_f0 = func_802B80D0(camera->pos, arg2->pos, camera->rotX[1], 0, D_80150130[camera - camera1], D_802B9658); + + if (temp_f0 < 0.0f) { return; } + + if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B965C)) { + func_8029794C(arg2->pos, arg2->rot, 3.0f); + } + arg1[3][0] = arg2->pos[0]; + arg1[3][1] = arg2->pos[1]; + arg1[3][2] = arg2->pos[2]; + + if (func_802B4FF8(arg1, 0) != 0) { + gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68); + gSPDisplayList(gDisplayListHead++, D_06006A68); } } -#else -GLOBAL_ASM("asm/non_matchings/code_actors/func_80299144.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8029794C(void *, void *, ?, void *); // extern -s32 func_802B4FF8(void *, ?); // extern -f32 func_802B80D0(void *, u16, ?, f32, f32); // extern -extern ? D_06015B48; -extern ? D_0D004C68; extern f32 D_802B9660; extern f32 D_802B9664; +extern Gfx D_06015B48[]; - -void func_8029930C(void *arg0, void *arg1, void *arg2) { - s16 sp4A; - void *sp28; +void func_8029930C(Camera *camera, Mat4 arg1, struct Actor *arg2) { f32 temp_f0; - s16 temp_v0; - void *temp_a1; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; - void *temp_v0_7; - void *temp_v0_8; + s16 temp_v0 = arg2->flags; + + if ((temp_v0 & 0x800) != 0) { return; } - temp_v0 = arg2->unk2; - temp_a1 = arg2 + 0x18; - if ((temp_v0 & 0x800) == 0) { - sp28 = temp_a1; - sp4A = temp_v0; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9660); - if (!(temp_f0 < 0.0f)) { - if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B9664)) { - func_8029794C(sp28, arg2 + 0x10, 0x40333333, arg1); - } - arg1->unk30 = arg2->pos; - arg1->unk34 = arg2->unk1C; - arg1->unk38 = arg2->unk20; - if (func_802B4FF8(arg1, 0) != 0) { - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xFD100000; - temp_v0_2->unk_04 = &D_0D004C68; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk_04 = 0; - temp_v0_3->unk0 = 0xE8000000; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk_04 = 0x7000000; - temp_v0_4->unk0 = 0xF5000100; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk_04 = 0; - temp_v0_5->unk0 = 0xE6000000; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk_04 = 0x73FC000; - temp_v0_6->unk0 = 0xF0000000; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->unk_04 = 0; - temp_v0_7->unk0 = 0xE7000000; - temp_v0_8 = gDisplayListHead; - gDisplayListHead = temp_v0_8 + 8; - temp_v0_8->unk_04 = &D_06015B48; - temp_v0_8->unk0 = 0x6000000; - } - } + temp_f0 = func_802B80D0(camera->pos, arg2->pos, camera->rotX[1], 0, D_80150130[camera - camera1], D_802B9660); + + if (temp_f0 < 0.0f) { return; } + + if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B9664)) { + func_8029794C(arg2->pos, arg2->rot, 2.79999995f); + } + arg1[3][0] = arg2->pos[0]; + arg1[3][1] = arg2->pos[1]; + arg1[3][2] = arg2->pos[2]; + + if (func_802B4FF8(arg1, 0) != 0) { + gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68); + gSPDisplayList(gDisplayListHead++, D_06015B48); } } -#else -GLOBAL_ASM("asm/non_matchings/code_actors/func_8029930C.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8029794C(void *, void *, ?, void *); // extern -s32 func_802B4FF8(void *, ?); // extern -f32 func_802B80D0(void *, u16, ?, f32, f32); // extern -extern ? D_0600D4A0; -extern ? D_0D004C68; extern f32 D_802B9668; extern f32 D_802B966C; +extern Gfx D_0600D4A0[]; - -void func_802994D4(void *arg0, void *arg1, void *arg2) { - s16 sp4A; - void *sp28; +void func_802994D4(Camera *camera, Mat4 arg1, struct Actor *arg2) { f32 temp_f0; - s16 temp_v0; - void *temp_a1; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; - void *temp_v0_7; - void *temp_v0_8; + s16 temp_v0 = arg2->flags; + + if ((temp_v0 & 0x800) != 0) { return; } - temp_v0 = arg2->unk2; - temp_a1 = arg2 + 0x18; - if ((temp_v0 & 0x800) == 0) { - sp28 = temp_a1; - sp4A = temp_v0; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9668); - if (!(temp_f0 < 0.0f)) { - if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B966C)) { - func_8029794C(sp28, arg2 + 0x10, 0x40333333, arg1); - } - arg1->unk30 = arg2->pos; - arg1->unk34 = arg2->unk1C; - arg1->unk38 = arg2->unk20; - if (func_802B4FF8(arg1, 0) != 0) { - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xFD100000; - temp_v0_2->unk_04 = &D_0D004C68; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk_04 = 0; - temp_v0_3->unk0 = 0xE8000000; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk_04 = 0x7000000; - temp_v0_4->unk0 = 0xF5000100; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk_04 = 0; - temp_v0_5->unk0 = 0xE6000000; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk_04 = 0x73FC000; - temp_v0_6->unk0 = 0xF0000000; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->unk_04 = 0; - temp_v0_7->unk0 = 0xE7000000; - temp_v0_8 = gDisplayListHead; - gDisplayListHead = temp_v0_8 + 8; - temp_v0_8->unk_04 = &D_0600D4A0; - temp_v0_8->unk0 = 0x6000000; - } - } + temp_f0 = func_802B80D0(camera->pos, arg2->pos, camera->rotX[1], 0, D_80150130[camera - camera1], D_802B9668); + + if (temp_f0 < 0.0f) { return; } + + if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B966C)) { + func_8029794C(arg2->pos, arg2->rot, 2.79999995f); + } + arg1[3][0] = arg2->pos[0]; + arg1[3][1] = arg2->pos[1]; + arg1[3][2] = arg2->pos[2]; + + if (func_802B4FF8(arg1, 0) != 0) { + gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68); + gSPDisplayList(gDisplayListHead++, D_0600D4A0); } } -#else -GLOBAL_ASM("asm/non_matchings/code_actors/func_802994D4.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8029794C(void *, void *, ?, void *); // extern -s32 func_802B4FF8(void *, ?); // extern -f32 func_802B80D0(void *, u16, ?, f32, f32); // extern -extern ? D_06013F20; -extern ? D_0D004C68; extern f32 D_802B9670; +extern Gfx D_06013F20[]; - -void func_8029969C(void *arg0, void *arg1, void *arg2) { - s16 sp4A; - void *sp28; +void func_8029969C(Camera *camera, Mat4 arg1, struct Actor *arg2) { f32 temp_f0; - s16 temp_v0; - void *temp_a1; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; - void *temp_v0_7; - void *temp_v0_8; + s16 temp_v0 = arg2->flags; + + if ((temp_v0 & 0x800) != 0) { return; } - temp_v0 = arg2->unk2; - temp_a1 = arg2 + 0x18; - if ((temp_v0 & 0x800) == 0) { - sp28 = temp_a1; - sp4A = temp_v0; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9670); - if (!(temp_f0 < 0.0f)) { - if (((temp_v0 & 0x400) == 0) && (temp_f0 < 600.0f)) { - func_8029794C(sp28, arg2 + 0x10, 0x40A00000, arg1); - } - arg1->unk30 = arg2->pos; - arg1->unk34 = arg2->unk1C; - arg1->unk38 = arg2->unk20; - if (func_802B4FF8(arg1, 0) != 0) { - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xFD100000; - temp_v0_2->unk_04 = &D_0D004C68; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk_04 = 0; - temp_v0_3->unk0 = 0xE8000000; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk_04 = 0x7000000; - temp_v0_4->unk0 = 0xF5000100; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk_04 = 0; - temp_v0_5->unk0 = 0xE6000000; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk_04 = 0x73FC000; - temp_v0_6->unk0 = 0xF0000000; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->unk_04 = 0; - temp_v0_7->unk0 = 0xE7000000; - temp_v0_8 = gDisplayListHead; - gDisplayListHead = temp_v0_8 + 8; - temp_v0_8->unk_04 = &D_06013F20; - temp_v0_8->unk0 = 0x6000000; - } - } + temp_f0 = func_802B80D0(camera->pos, arg2->pos, camera->rotX[1], 0, D_80150130[camera - camera1], D_802B9670); + + if (temp_f0 < 0.0f) { return; } + + if (((temp_v0 & 0x400) == 0) && (temp_f0 < 600.0f)) { + func_8029794C(arg2->pos, arg2->rot, 5.0f); + } + arg1[3][0] = arg2->pos[0]; + arg1[3][1] = arg2->pos[1]; + arg1[3][2] = arg2->pos[2]; + + if (func_802B4FF8(arg1, 0) != 0) { + gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68); + gSPDisplayList(gDisplayListHead++, D_06013F20); } } -#else -GLOBAL_ASM("asm/non_matchings/code_actors/func_8029969C.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8029794C(void *, void *, ?, void *); // extern -s32 func_802B4FF8(void *, ?); // extern -f32 func_802B80D0(void *, u16, ?, f32, f32); // extern -extern ? D_0600FC70; -extern ? D_0D004C68; extern f32 D_802B9674; extern f32 D_802B9678; +extern Gfx D_0600FC70[]; - -void func_80299864(void *arg0, void *arg1, void *arg2) { - s16 sp4A; - void *sp28; +void func_80299864(Camera *camera, Mat4 arg1, struct Actor *arg2) { f32 temp_f0; - s16 temp_v0; - void *temp_a1; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; - void *temp_v0_7; - void *temp_v0_8; + s16 temp_v0 = arg2->flags; + + if ((temp_v0 & 0x800) != 0) { return; } - temp_v0 = arg2->unk2; - temp_a1 = arg2 + 0x18; - if ((temp_v0 & 0x800) == 0) { - sp28 = temp_a1; - sp4A = temp_v0; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9674); - if (!(temp_f0 < 0.0f)) { - if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B9678)) { - func_8029794C(sp28, arg2 + 0x10, 0x40333333, arg1); - } - arg1->unk30 = arg2->pos; - arg1->unk34 = arg2->unk1C; - arg1->unk38 = arg2->unk20; - if (func_802B4FF8(arg1, 0) != 0) { - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xFD100000; - temp_v0_2->unk_04 = &D_0D004C68; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk_04 = 0; - temp_v0_3->unk0 = 0xE8000000; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk_04 = 0x7000000; - temp_v0_4->unk0 = 0xF5000100; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk_04 = 0; - temp_v0_5->unk0 = 0xE6000000; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk_04 = 0x73FC000; - temp_v0_6->unk0 = 0xF0000000; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->unk_04 = 0; - temp_v0_7->unk0 = 0xE7000000; - temp_v0_8 = gDisplayListHead; - gDisplayListHead = temp_v0_8 + 8; - temp_v0_8->unk_04 = &D_0600FC70; - temp_v0_8->unk0 = 0x6000000; - } - } + temp_f0 = func_802B80D0(camera->pos, arg2->pos, camera->rotX[1], 0, D_80150130[camera - camera1], D_802B9674); + + if (temp_f0 < 0.0f) { return; } + + if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B9678)) { + func_8029794C(arg2->pos, arg2->rot, 2.79999995f); + } + arg1[3][0] = arg2->pos[0]; + arg1[3][1] = arg2->pos[1]; + arg1[3][2] = arg2->pos[2]; + + if (func_802B4FF8(arg1, 0) != 0) { + gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68); + gSPDisplayList(gDisplayListHead++, D_0600FC70); } } -#else -GLOBAL_ASM("asm/non_matchings/code_actors/func_80299864.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8029794C(void *, void *, ?, void *); // extern -s32 func_802B4FF8(void *, ?); // extern -f32 func_802B80D0(void *, u16, ?, f32, f32); // extern -extern ? D_0600D578; -extern ? D_0D004C68; extern f32 D_802B967C; extern f32 D_802B9680; +extern Gfx D_0600D578[]; - -void func_80299A2C(void *arg0, void *arg1, void *arg2) { - s16 sp4A; - void *sp28; +void func_80299A2C(Camera *camera, Mat4 arg1, struct Actor *arg2) { f32 temp_f0; - s16 temp_v0; - void *temp_a1; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; - void *temp_v0_7; - void *temp_v0_8; + s16 temp_v0 = arg2->flags; + + if ((temp_v0 & 0x800) != 0) { return; } - temp_v0 = arg2->unk2; - temp_a1 = arg2 + 0x18; - if ((temp_v0 & 0x800) == 0) { - sp28 = temp_a1; - sp4A = temp_v0; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B967C); - if (!(temp_f0 < 0.0f)) { - if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B9680)) { - func_8029794C(sp28, arg2 + 0x10, 0x40333333, arg1); - } - arg1->unk30 = arg2->pos; - arg1->unk34 = arg2->unk1C; - arg1->unk38 = arg2->unk20; - if (func_802B4FF8(arg1, 0) != 0) { - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xFD100000; - temp_v0_2->unk_04 = &D_0D004C68; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk_04 = 0; - temp_v0_3->unk0 = 0xE8000000; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk_04 = 0x7000000; - temp_v0_4->unk0 = 0xF5000100; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk_04 = 0; - temp_v0_5->unk0 = 0xE6000000; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk_04 = 0x73FC000; - temp_v0_6->unk0 = 0xF0000000; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->unk_04 = 0; - temp_v0_7->unk0 = 0xE7000000; - temp_v0_8 = gDisplayListHead; - gDisplayListHead = temp_v0_8 + 8; - temp_v0_8->unk_04 = &D_0600D578; - temp_v0_8->unk0 = 0x6000000; - } - } + temp_f0 = func_802B80D0(camera->pos, arg2->pos, camera->rotX[1], 0, D_80150130[camera - camera1], D_802B967C); + + if (temp_f0 < 0.0f) { return; } + + if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B9680)) { + func_8029794C(arg2->pos, arg2->rot, 2.79999995f); + } + arg1[3][0] = arg2->pos[0]; + arg1[3][1] = arg2->pos[1]; + arg1[3][2] = arg2->pos[2]; + + if (func_802B4FF8(arg1, 0) != 0) { + gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68); + gSPDisplayList(gDisplayListHead++, D_0600D578); } } -#else -GLOBAL_ASM("asm/non_matchings/code_actors/func_80299A2C.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8029794C(void *, void *, ?, void *); // extern -s32 func_802B4FF8(void *, ?); // extern -f32 func_802B80D0(void *, u16, ?, f32, f32); // extern -extern ? D_060090C8; -extern ? D_0D004C68; extern f32 D_802B9684; extern f32 D_802B9688; +extern Gfx D_060090C8[]; - -void func_80299BF4(void *arg0, void *arg1, void *arg2) { - s16 sp4A; - void *sp28; +void func_80299BF4(Camera *camera, Mat4 arg1, struct Actor *arg2) { f32 temp_f0; - s16 temp_v0; - void *temp_a1; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; - void *temp_v0_7; - void *temp_v0_8; + s16 temp_v0 = arg2->flags; + + if ((temp_v0 & 0x800) != 0) { return; } - temp_v0 = arg2->unk2; - temp_a1 = arg2 + 0x18; - if ((temp_v0 & 0x800) == 0) { - sp28 = temp_a1; - sp4A = temp_v0; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9684); - if (!(temp_f0 < 0.0f)) { - if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B9688)) { - func_8029794C(sp28, arg2 + 0x10, 0x40333333, arg1); - } - arg1->unk30 = arg2->pos; - arg1->unk34 = arg2->unk1C; - arg1->unk38 = arg2->unk20; - if (func_802B4FF8(arg1, 0) != 0) { - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xFD100000; - temp_v0_2->unk_04 = &D_0D004C68; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk_04 = 0; - temp_v0_3->unk0 = 0xE8000000; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk_04 = 0x7000000; - temp_v0_4->unk0 = 0xF5000100; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk_04 = 0; - temp_v0_5->unk0 = 0xE6000000; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk_04 = 0x73FC000; - temp_v0_6->unk0 = 0xF0000000; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->unk_04 = 0; - temp_v0_7->unk0 = 0xE7000000; - temp_v0_8 = gDisplayListHead; - gDisplayListHead = temp_v0_8 + 8; - temp_v0_8->unk_04 = &D_060090C8; - temp_v0_8->unk0 = 0x6000000; - } - } + temp_f0 = func_802B80D0(camera->pos, arg2->pos, camera->rotX[1], 0, D_80150130[camera - camera1], D_802B9684); + + if (temp_f0 < 0.0f) { return; } + + if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B9688)) { + func_8029794C(arg2->pos, arg2->rot, 2.79999995f); + } + arg1[3][0] = arg2->pos[0]; + arg1[3][1] = arg2->pos[1]; + arg1[3][2] = arg2->pos[2]; + + if (func_802B4FF8(arg1, 0) != 0) { + gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68); + gSPDisplayList(gDisplayListHead++, D_060090C8); } } -#else -GLOBAL_ASM("asm/non_matchings/code_actors/func_80299BF4.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8029794C(void *, void *, ?, void *); // extern -s32 func_802B4FF8(void *, ?); // extern -f32 func_802B80D0(void *, u16, ?, f32, f32); // extern -extern ? D_060075A0; extern f32 D_802B968C; extern f32 D_802B9690; - - -void func_80299DBC(void *arg0, void *arg1, void *arg2) { - s16 sp32; - void *sp28; +extern Gfx D_060075A0[]; +void func_80299DBC(Camera *camera, Mat4 arg1, struct Actor *arg2) { f32 temp_f0; - s16 temp_v0; - void *temp_a1; - void *temp_v1; + s16 temp_v0 = arg2->flags; + + if ((temp_v0 & 0x800) != 0) { return; } - temp_v0 = arg2->unk2; - temp_a1 = arg2 + 0x18; - if ((temp_v0 & 0x800) == 0) { - sp28 = temp_a1; - sp32 = temp_v0; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B968C); - if (!(temp_f0 < 0.0f)) { - if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B9690)) { - func_8029794C(sp28, arg2 + 0x10, 0x40333333, arg1); - } - arg1->unk30 = arg2->pos; - arg1->unk34 = arg2->unk1C; - arg1->unk38 = arg2->unk20; - if (func_802B4FF8(arg1, 0) != 0) { - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk_04 = &D_060075A0; - } - } + temp_f0 = func_802B80D0(camera->pos, arg2->pos, camera->rotX[1], 0, D_80150130[camera - camera1], D_802B968C); + + if (temp_f0 < 0.0f) { return; } + + if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B9690)) { + func_8029794C(arg2->pos, arg2->rot, 2.79999995f); + } + arg1[3][0] = arg2->pos[0]; + arg1[3][1] = arg2->pos[1]; + arg1[3][2] = arg2->pos[2]; + + if (func_802B4FF8(arg1, 0) != 0) { + gSPDisplayList(gDisplayListHead++, D_060075A0); } } -#else -GLOBAL_ASM("asm/non_matchings/code_actors/func_80299DBC.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8029794C(void *, void *, ?, void *); // extern -s32 func_802B4FF8(void *, ?); // extern -f32 func_802B80D0(void *, u16, ?, f32, f32); // extern -extern ? D_06008528; extern f32 D_802B9694; extern f32 D_802B9698; +extern Gfx D_06008528[]; - -void func_80299EDC(void *arg0, void *arg1, void *arg2) { - s16 sp32; - void *sp28; +void func_80299EDC(Camera *camera, Mat4 arg1, struct Actor *arg2) { f32 temp_f0; - s16 temp_v0; - void *temp_a1; - void *temp_v1; + s16 temp_v0 = arg2->flags; + + if ((temp_v0 & 0x800) != 0) { return; } - temp_v0 = arg2->unk2; - temp_a1 = arg2 + 0x18; - if ((temp_v0 & 0x800) == 0) { - sp28 = temp_a1; - sp32 = temp_v0; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9694); - if (!(temp_f0 < 0.0f)) { - if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B9698)) { - func_8029794C(sp28, arg2 + 0x10, 0x3F800000, arg1); - } - arg1->unk30 = arg2->pos; - arg1->unk34 = arg2->unk1C; - arg1->unk38 = arg2->unk20; - if (func_802B4FF8(arg1, 0) != 0) { - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk_04 = &D_06008528; - } - } + temp_f0 = func_802B80D0(camera->pos, arg2->pos, camera->rotX[1], 0, D_80150130[camera - camera1], D_802B9694); + + if (temp_f0 < 0.0f) { return; } + + if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B9698)) { + func_8029794C(arg2->pos, arg2->rot, 1.0f); + } + arg1[3][0] = arg2->pos[0]; + arg1[3][1] = arg2->pos[1]; + arg1[3][2] = arg2->pos[2]; + + if (func_802B4FF8(arg1, 0) != 0) { + gSPDisplayList(gDisplayListHead++, D_06008528); } } -#else -GLOBAL_ASM("asm/non_matchings/code_actors/func_80299EDC.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8029794C(void *, void *, ?, void *); // extern -s32 func_802B4FF8(void *, ?); // extern -f32 func_802B80D0(void *, u16, ?, f32, f32); // extern -extern ? D_06008628; extern f32 D_802B969C; extern f32 D_802B96A0; +extern Gfx D_06008628[]; - -void func_80299FFC(void *arg0, void *arg1, void *arg2) { - s16 sp32; - void *sp28; +void func_80299FFC(Camera *camera, Mat4 arg1, struct Actor *arg2) { f32 temp_f0; - s16 temp_v0; - void *temp_a1; - void *temp_v1; + s16 temp_v0 = arg2->flags; + + if ((temp_v0 & 0x800) != 0) { return; } - temp_v0 = arg2->unk2; - temp_a1 = arg2 + 0x18; - if ((temp_v0 & 0x800) == 0) { - sp28 = temp_a1; - sp32 = temp_v0; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B969C); - if (!(temp_f0 < 0.0f)) { - if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B96A0)) { - func_8029794C(sp28, arg2 + 0x10, 0x3F800000, arg1); - } - arg1->unk30 = arg2->pos; - arg1->unk34 = arg2->unk1C; - arg1->unk38 = arg2->unk20; - if (func_802B4FF8(arg1, 0) != 0) { - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk_04 = &D_06008628; - } - } + temp_f0 = func_802B80D0(camera->pos, arg2->pos, camera->rotX[1], 0, D_80150130[camera - camera1], D_802B969C); + + if (temp_f0 < 0.0f) { return; } + + if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B96A0)) { + func_8029794C(arg2->pos, arg2->rot, 1.0f); + } + arg1[3][0] = arg2->pos[0]; + arg1[3][1] = arg2->pos[1]; + arg1[3][2] = arg2->pos[2]; + + if (func_802B4FF8(arg1, 0) != 0) { + gSPDisplayList(gDisplayListHead++, D_06008628); } } -#else -GLOBAL_ASM("asm/non_matchings/code_actors/func_80299FFC.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8029794C(void *, void *, ?, void *); // extern -s32 func_802B4FF8(void *, ?); // extern -f32 func_802B80D0(void *, u16, ?, f32, f32); // extern -extern ? D_06008728; extern f32 D_802B96A4; extern f32 D_802B96A8; +extern Gfx D_06008728[]; - -void func_8029A11C(void *arg0, void *arg1, void *arg2) { - s16 sp32; - void *sp28; +void func_8029A11C(Camera *camera, Mat4 arg1, struct Actor *arg2) { f32 temp_f0; - s16 temp_v0; - void *temp_a1; - void *temp_v1; + s16 temp_v0 = arg2->flags; + + if ((temp_v0 & 0x800) != 0) { return; } - temp_v0 = arg2->unk2; - temp_a1 = arg2 + 0x18; - if ((temp_v0 & 0x800) == 0) { - sp28 = temp_a1; - sp32 = temp_v0; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B96A4); - if (!(temp_f0 < 0.0f)) { - if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B96A8)) { - func_8029794C(sp28, arg2 + 0x10, 0x3F4CCCCD, arg1); - } - arg1->unk30 = arg2->pos; - arg1->unk34 = arg2->unk1C; - arg1->unk38 = arg2->unk20; - if (func_802B4FF8(arg1, 0) != 0) { - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk_04 = &D_06008728; - } - } + temp_f0 = func_802B80D0(camera->pos, arg2->pos, camera->rotX[1], 0, D_80150130[camera - camera1], D_802B96A4); + + if (temp_f0 < 0.0f) { return; } + + if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B96A8)) { + func_8029794C(arg2->pos, arg2->rot, 0.80000001f); + } + arg1[3][0] = arg2->pos[0]; + arg1[3][1] = arg2->pos[1]; + arg1[3][2] = arg2->pos[2]; + + if (func_802B4FF8(arg1, 0) != 0) { + gSPDisplayList(gDisplayListHead++, D_06008728); } } -#else -GLOBAL_ASM("asm/non_matchings/code_actors/func_8029A11C.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -s32 func_802B4FF8(void *, ?); // extern -extern ? D_06013BB8; +extern Gfx D_06013BB8[]; +void func_8029A23C(Camera *camera, Mat4 arg1, struct Actor *actor) { + uintptr_t addr; + + if (actor->state == 0) { return; } -void func_8029A23C(s32 arg0, void *arg1, void *arg2) { - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; - void *temp_v0_7; - void *temp_v0_8; + arg1[3][0] = actor->pos[0]; + arg1[3][1] = actor->pos[1]; + arg1[3][2] = actor->pos[2]; - if (arg2->unk6 != 0) { - arg1->unk30 = arg2->pos; - arg1->unk34 = arg2->unk1C; - arg1->unk38 = arg2->unk20; - if (func_802B4FF8(arg1, 0) != 0) { - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk0 = 0xFD500000; - temp_v0->unk_04 = ((arg2->rot << 0xA) + 0x3009000) & 0x1FFFFFFF; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xF5500000; - temp_v0_2->unk_04 = 0x7080200; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk_04 = 0; - temp_v0_3->unk0 = 0xE6000000; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk_04 = 0x71FF200; - temp_v0_4->unk0 = 0xF3000000; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk_04 = 0; - temp_v0_5->unk0 = 0xE7000000; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk0 = 0xF5480800; - temp_v0_6->unk_04 = 0x80200; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->unk0 = 0xF2000000; - temp_v0_7->unk_04 = 0x7C07C; - temp_v0_8 = gDisplayListHead; - gDisplayListHead = temp_v0_8 + 8; - temp_v0_8->unk0 = 0x6000000; - temp_v0_8->unk_04 = &D_06013BB8; - } - } + if (func_802B4FF8(arg1, 0) == 0) { return; } + + addr = (actor->rot[0] << 0xA) + 0x03009000; // Can this be a real symbol? Doesn't match. + gDPLoadTextureBlock(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(addr), + G_IM_FMT_CI, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, + G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + gSPDisplayList(gDisplayListHead++, D_06013BB8); } -#else -GLOBAL_ASM("asm/non_matchings/code_actors/func_8029A23C.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit 685418adfeb3794409e47b45ac5cab60b17d23fd -? func_80297230(Camera *, struct ShellActor *); /* extern */ -? func_802972B8(Camera *, struct ShellActor *); /* extern */ -? func_802979F8(struct ShellActor *, ?, f32 (*)[4]); /* extern */ -s32 func_802B4FF8(f32 (*)[4], ?, f32 (*)[4]); /* extern */ -f32 func_802B80D0(f32 *, u16, ?, f32, f32); /* extern */ -extern ? D_0D005338; -extern ? D_0D005368; -extern ? D_80150130; -extern s32 D_802BA050; -extern s32 D_802BA054; -static ? D_802B87E8; /* unable to generate initializer */ -static f32 D_802B96AC = 490000.0f; -static f32 D_802B96B0 = 40000.0f; +extern Gfx D_0D005338[]; +extern Gfx D_0D005368[]; +extern f32 D_802B96AC; // static = 490000.0f; +extern f32 D_802B96B0; // static = 40000.0f; void func_8029A3AC(Camera *camera, Mat4 arg1, struct ShellActor *shell) { - u16 sp7C; - ? sp58; - s32 sp54; - f32 sp50; - Gfx *temp_v0; - Gfx *temp_v0_2; - Gfx *temp_v0_3; - Gfx *temp_v0_4; - Gfx *temp_v0_5; - Gfx *temp_v0_6; - Gfx *temp_v0_7; - Gfx *temp_v0_8; - Gfx *temp_v0_9; - f32 temp_f0; - s32 temp_t3; + s16 pad; u16 temp_t8; - s32 phi_t3; + s32 pad2; + s16 sp58[15] = // D_802B87E8; + { + 0x0000, 0x0400, 0x0800, 0x0c00, + 0x1000, 0x1400, 0x1800, 0x1c00, + 0x1c00, 0x1800, 0x1400, 0x1000, + 0x0c00, 0x0800, 0x0400 + }; + uintptr_t phi_t3; - sp58.unk0 = (s32) D_802B87E8.unk0; - sp58.unk4 = (s32) D_802B87E8.unk4; - sp58.unk8 = (s32) D_802B87E8.unk8; - sp58.unkC = (s32) D_802B87E8.unkC; - sp58.unk10 = (s32) D_802B87E8.unk10; - sp58.unk14 = (s32) D_802B87E8.unk14; - sp58.unk18 = (s32) D_802B87E8.unk18; - sp58.unk1C = (u16) D_802B87E8.unk1C; - temp_f0 = func_802B80D0(shell->pos, (u16) camera->rotX2, 0, *(&D_80150130 + (((s32) (camera - camera1) / 184) * 4)), D_802B96AC); + f32 temp_f0 = func_802B80D0(camera->pos, shell->pos, camera->rotX[1], 0, D_80150130[camera - camera1], D_802B96AC); if (temp_f0 < 0.0f) { - func_80297230(camera, shell); + func_80297230(camera, (struct Actor *)shell); return; } - sp50 = temp_f0; - func_802972B8(camera, shell); + func_802972B8(camera, (struct Actor *) shell); if (temp_f0 < D_802B96B0) { - func_802979F8(shell, 0x4059999A, arg1); + func_802979F8((struct Actor *) shell, 3.4f); } if (shell->type == ACTOR_BLUE_SPINY_SHELL) { phi_t3 = D_802BA054; } else { phi_t3 = D_802BA050; } - temp_t8 = ((s32) (u16) shell->rotVelocity / 4369) & 0xFFFF; - arg1->unk30 = (f32) shell->pos[0]; - temp_t3 = phi_t3 + (sp + (temp_t8 * 2))->unk58; - arg1->unk34 = (f32) ((shell->pos[1] - shell->boundingBoxSize) + 1.0f); - arg1->unk38 = (f32) shell->pos[2]; - sp7C = temp_t8; - sp54 = temp_t3; - if (func_802B4FF8(arg1, 0, arg1) != 0) { - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->words.w0 = 0xFD500000; - temp_v0->words.w1 = temp_t3 & 0x1FFFFFFF; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->words.w0 = 0xF5500000; - temp_v0_2->words.w1 = 0x07080200; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->words.w1 = 0; - temp_v0_3->words.w0 = 0xE6000000; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->words.w1 = 0x071FF200; - temp_v0_4->words.w0 = 0xF3000000; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->words.w1 = 0; - temp_v0_5->words.w0 = 0xE7000000; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->words.w0 = 0xF5480800; - temp_v0_6->words.w1 = 0x00080200; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->words.w0 = 0xF2000000; - temp_v0_7->words.w1 = 0x0007C07C; - if ((s32) sp7C < 8) { - temp_v0_8 = gDisplayListHead; - gDisplayListHead = temp_v0_8 + 8; - temp_v0_8->words.w0 = 0x06000000; - temp_v0_8->words.w1 = (u32) &D_0D005338; - return; - } - temp_v0_9 = gDisplayListHead; - gDisplayListHead = temp_v0_9 + 8; - temp_v0_9->words.w0 = 0x06000000; - temp_v0_9->words.w1 = (u32) &D_0D005368; + temp_t8 = (u16) shell->rotVelocity / 4369; + phi_t3 += sp58[temp_t8]; + + arg1[3][0] = shell->pos[0]; + arg1[3][1] = (shell->pos[1] - shell->boundingBoxSize) + 1.0f; + arg1[3][2] = shell->pos[2]; + + if (func_802B4FF8(arg1, 0) == 0) { return; } + + gDPLoadTextureBlock(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(phi_t3), + G_IM_FMT_CI, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, + G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + + if (temp_t8 < 8) { + gSPDisplayList(gDisplayListHead++, D_0D005338); + + } else { + gSPDisplayList(gDisplayListHead++, D_0D005368); } } -#else -GLOBAL_ASM("asm/non_matchings/code_actors/func_8029A3AC.s") -#endif -void func_8029A3AC(Camera*, Mat4, struct Actor*); // extern +UNUSED s16 D_802B8808[] = { + 0x0014, 0x0028, 0x0000, 0x0000 +}; -void func_8029A690(Camera *arg0, Mat4 arg1, struct Actor *arg2) { +UNUSED s16 D_802B8810[] = { + 0x0fc0, 0x0000, 0xffff, 0xffff, 0x0014, 0x0000, 0x0000, 0x0000, + 0x0fc0, 0x0fc0, 0xffff, 0xffff, 0xffec, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0fc0, 0xffff, 0xffff, 0xffec, 0x0028, 0x0000, 0x0000, + 0x0000, 0x0000, 0xffff, 0xffff +}; + +void func_8029A690(Camera *arg0, Mat4 arg1, struct ShellActor *arg2) { gDPLoadTLUT_pal256(gDisplayListHead++, &D_0D004E38); func_8029A3AC(arg0, arg1, arg2); } -void func_8029A75C(Camera *arg0, Mat4 arg1, struct Actor *arg2) { +void func_8029A75C(Camera *arg0, Mat4 arg1, struct ShellActor *arg2) { gDPLoadTLUT_pal256(gDisplayListHead++, &D_802BA060); func_8029A3AC(arg0, arg1, arg2); } @@ -2418,10 +1900,8 @@ void func_8029A75C(Camera *arg0, Mat4 arg1, struct Actor *arg2) { extern s8 D_0D004E68[]; // Middle of a tlut access -void func_8029A828(Camera *arg0, Mat4 arg1, struct Actor *arg2) { +void func_8029A828(Camera *arg0, Mat4 arg1, struct ShellActor *arg2) { gDPLoadTLUT_pal256(gDisplayListHead++, &D_0D004E68[0x1D0]); - - func_8029A3AC(arg0, arg1, arg2); } @@ -3589,33 +3069,19 @@ void place_palm_trees(u32 arg0) { GLOBAL_ASM("asm/non_matchings/code_actors/place_palm_trees.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_802B52BC(void *, ?, ?, ?); // extern -? load_giant_egg(s32, ?, ?, ?); // extern -extern ? D_802B8848; -extern f32 gCourseDirection; -extern ? gSegmentTable; - -void func_8029CF0C(u32 arg0, void *arg1) { - ? sp24; - s16 temp_v1; - void *temp_v0; - - sp24.unk0 = D_802B8848.unk0; - sp24.unk4 = D_802B8848.unk4; - temp_v1 = arg1->unk6; - temp_v0 = *(&gSegmentTable + ((arg0 >> 0x18) * 4)) + (arg0 & 0xFFFFFF) + 0x80000000 + (temp_v1 * 8); - arg1->unk_04 = *(&sp24 + (temp_v1 * 2)); - arg1->pos = temp_v0->unk0 * gCourseDirection; - arg1->unk1C = temp_v0->unk2 + 10.0f; - arg1->unk20 = temp_v0->unk_04; - load_giant_egg(arg1 + 0x24, 0, 0, 0); - func_802B52BC(arg1 + 0x10, 0, 0, 0); +void func_8029CF0C(Gfx *displaylist, struct FallingRock *rock) { + s32 segment = SEGMENT_NUMBER2(displaylist); + s32 offset = SEGMENT_OFFSET(displaylist); + UnknownFallingRock *temp_v0 = VIRTUAL_TO_PHYSICAL2(gSegmentTable[segment] + offset); // + (temp_v1 * 8); + Vec3s sp24 = {60, 120, 180}; + temp_v0 += rock->unk_06; + rock->respawnTimer = sp24[rock->unk_06]; // * 2 + rock->pos[0] = (f32) temp_v0->unk.data[0] * gCourseDirection; + rock->pos[1] = (f32) temp_v0->unk.data[1] + 10.0f; + rock->pos[2] = (f32) temp_v0->unk.data[2]; + load_giant_egg(rock->velocity, 0, 0, 0); + func_802B52BC(rock->rot, 0, 0, 0); } -#else -GLOBAL_ASM("asm/non_matchings/code_actors/func_8029CF0C.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -6804,8 +6270,6 @@ void func_802A27A0(Camera*, Mat4, struct YoshiValleyEgg*, u16); extern Mat4 D_801502C0; extern s32 D_8015F8E0; -void func_80299144(Camera *, Mat4, struct Actor*); /* extern */ -void func_8029930C(Camera *, Mat4, struct Actor*); /* extern */ void func_802994D4(Camera *, Mat4, struct Actor*); /* extern */ void func_8029969C(Camera *, Mat4, struct Actor*); /* extern */ void func_80299864(Camera *, Mat4, struct Actor*); /* extern */ @@ -6815,10 +6279,6 @@ void func_80299DBC(Camera *, Mat4, struct Actor*); /* extern */ void func_80299EDC(Camera *, Mat4, struct Actor*); /* extern */ void func_80299FFC(Camera *, Mat4, struct Actor*); /* extern */ void func_8029A11C(Camera *, Mat4, struct Actor*); /* extern */ -void func_8029A690(Camera *, Mat4, struct Actor*); /* extern */ -void func_8029A23C(Camera *, Mat4, struct Actor*); /* extern */ -void func_8029A75C(Camera *, Mat4, struct Actor*); /* extern */ -void func_8029A828(Camera *, Mat4, struct Actor*); /* extern */ void func_8029A8F4(Camera *, Mat4, struct BananaActor*); /* extern */ void func_8029AC18(Camera *, Mat4, struct Actor*); /* extern */ //void func_8029AE1C(Camera *, struct Actor*, Mat4, u16); /* extern */ @@ -6923,13 +6383,13 @@ void func_802A3008(struct UnkStruct_800DC5EC *arg0) { func_8029A8F4(temp_s1, D_801502C0, phi_s0); break; case ACTOR_GREEN_SHELL: - func_8029A690(temp_s1, D_801502C0, phi_s0); + func_8029A690(temp_s1, D_801502C0, (struct ShellActor *) phi_s0); break; case ACTOR_RED_SHELL: - func_8029A75C(temp_s1, D_801502C0, phi_s0); + func_8029A75C(temp_s1, D_801502C0, (struct ShellActor *) phi_s0); break; case ACTOR_BLUE_SPINY_SHELL: - func_8029A828(temp_s1, D_801502C0, phi_s0); + func_8029A828(temp_s1, D_801502C0, (struct ShellActor *) phi_s0); break; case ACTOR_PIRANHA_PLANT: func_80298328(temp_s1, D_801502C0, phi_s0);