diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Destroy.s deleted file mode 100644 index 8a95e0d032..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Destroy.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel EnTk_Destroy -/* 012DC 80B1CBDC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 012E0 80B1CBE0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 012E4 80B1CBE4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 012E8 80B1CBE8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 012EC 80B1CBEC 0C0170EB */ jal ActorCollider_FreeCylinder - -/* 012F0 80B1CBF0 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 -/* 012F4 80B1CBF4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 012F8 80B1CBF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 012FC 80B1CBFC 03E00008 */ jr $ra -/* 01300 80B1CC00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Draw.s deleted file mode 100644 index 8c38b27862..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Draw.s +++ /dev/null @@ -1,72 +0,0 @@ -glabel EnTk_Draw -/* 01A98 80B1D398 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 01A9C 80B1D39C AFBF002C */ sw $ra, 0x002C($sp) -/* 01AA0 80B1D3A0 AFB10028 */ sw $s1, 0x0028($sp) -/* 01AA4 80B1D3A4 AFB00024 */ sw $s0, 0x0024($sp) -/* 01AA8 80B1D3A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01AAC 80B1D3AC 0C034213 */ jal Matrix_Push -/* 01AB0 80B1D3B0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01AB4 80B1D3B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01AB8 80B1D3B8 0C2C6EAC */ jal func_80B1BAB0 -/* 01ABC 80B1D3BC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01AC0 80B1D3C0 0C034221 */ jal Matrix_Pull -/* 01AC4 80B1D3C4 00000000 */ nop -/* 01AC8 80B1D3C8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 01ACC 80B1D3CC 3C0680B2 */ lui $a2, %hi(D_80B1D60C) ## $a2 = 80B20000 -/* 01AD0 80B1D3D0 24C6D60C */ addiu $a2, $a2, %lo(D_80B1D60C) ## $a2 = 80B1D60C -/* 01AD4 80B1D3D4 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 -/* 01AD8 80B1D3D8 2407050E */ addiu $a3, $zero, 0x050E ## $a3 = 0000050E -/* 01ADC 80B1D3DC 0C031AB1 */ jal func_800C6AC4 -/* 01AE0 80B1D3E0 AFA50048 */ sw $a1, 0x0048($sp) -/* 01AE4 80B1D3E4 0C024F46 */ jal func_80093D18 -/* 01AE8 80B1D3E8 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01AEC 80B1D3EC 8FA50048 */ lw $a1, 0x0048($sp) -/* 01AF0 80B1D3F0 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 01AF4 80B1D3F4 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 01AF8 80B1D3F8 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 -/* 01AFC 80B1D3FC 3C0480B2 */ lui $a0, %hi(D_80B1D598) ## $a0 = 80B20000 -/* 01B00 80B1D400 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 -/* 01B04 80B1D404 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 -/* 01B08 80B1D408 ACAE02C0 */ sw $t6, 0x02C0($a1) ## 000002C0 -/* 01B0C 80B1D40C AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 -/* 01B10 80B1D410 86180222 */ lh $t8, 0x0222($s0) ## 00000222 -/* 01B14 80B1D414 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 01B18 80B1D418 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01B1C 80B1D41C 0018C880 */ sll $t9, $t8, 2 -/* 01B20 80B1D420 00992021 */ addu $a0, $a0, $t9 -/* 01B24 80B1D424 8C84D598 */ lw $a0, %lo(D_80B1D598)($a0) -/* 01B28 80B1D428 3C1880B2 */ lui $t8, %hi(func_80B1D2E4) ## $t8 = 80B20000 -/* 01B2C 80B1D42C 3C0F80B2 */ lui $t7, %hi(func_80B1D278) ## $t7 = 80B20000 -/* 01B30 80B1D430 00044900 */ sll $t1, $a0, 4 -/* 01B34 80B1D434 00095702 */ srl $t2, $t1, 28 -/* 01B38 80B1D438 000A5880 */ sll $t3, $t2, 2 -/* 01B3C 80B1D43C 018B6021 */ addu $t4, $t4, $t3 -/* 01B40 80B1D440 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 -/* 01B44 80B1D444 00814024 */ and $t0, $a0, $at -/* 01B48 80B1D448 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01B4C 80B1D44C 010C6821 */ addu $t5, $t0, $t4 -/* 01B50 80B1D450 01A17021 */ addu $t6, $t5, $at -/* 01B54 80B1D454 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 -/* 01B58 80B1D458 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 01B5C 80B1D45C 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 01B60 80B1D460 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 01B64 80B1D464 25EFD278 */ addiu $t7, $t7, %lo(func_80B1D278) ## $t7 = 80B1D278 -/* 01B68 80B1D468 2718D2E4 */ addiu $t8, $t8, %lo(func_80B1D2E4) ## $t8 = 80B1D2E4 -/* 01B6C 80B1D46C AFB80014 */ sw $t8, 0x0014($sp) -/* 01B70 80B1D470 AFAF0010 */ sw $t7, 0x0010($sp) -/* 01B74 80B1D474 AFB00018 */ sw $s0, 0x0018($sp) -/* 01B78 80B1D478 0C0286B2 */ jal func_800A1AC8 -/* 01B7C 80B1D47C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01B80 80B1D480 3C0680B2 */ lui $a2, %hi(D_80B1D61C) ## $a2 = 80B20000 -/* 01B84 80B1D484 24C6D61C */ addiu $a2, $a2, %lo(D_80B1D61C) ## $a2 = 80B1D61C -/* 01B88 80B1D488 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 -/* 01B8C 80B1D48C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 01B90 80B1D490 0C031AD5 */ jal func_800C6B54 -/* 01B94 80B1D494 24070520 */ addiu $a3, $zero, 0x0520 ## $a3 = 00000520 -/* 01B98 80B1D498 8FBF002C */ lw $ra, 0x002C($sp) -/* 01B9C 80B1D49C 8FB00024 */ lw $s0, 0x0024($sp) -/* 01BA0 80B1D4A0 8FB10028 */ lw $s1, 0x0028($sp) -/* 01BA4 80B1D4A4 03E00008 */ jr $ra -/* 01BA8 80B1D4A8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 01BAC 80B1D4AC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Init.s deleted file mode 100644 index 8a9ac2398a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Init.s +++ /dev/null @@ -1,108 +0,0 @@ -glabel EnTk_Init -/* 01160 80B1CA60 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01164 80B1CA64 AFB00028 */ sw $s0, 0x0028($sp) -/* 01168 80B1CA68 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0116C 80B1CA6C AFBF002C */ sw $ra, 0x002C($sp) -/* 01170 80B1CA70 AFA50044 */ sw $a1, 0x0044($sp) -/* 01174 80B1CA74 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 01178 80B1CA78 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC -/* 0117C 80B1CA7C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01180 80B1CA80 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 01184 80B1CA84 0C00AC78 */ jal ActorShape_Init - -/* 01188 80B1CA88 3C0741C0 */ lui $a3, 0x41C0 ## $a3 = 41C00000 -/* 0118C 80B1CA8C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 01190 80B1CA90 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 01194 80B1CA94 260E022A */ addiu $t6, $s0, 0x022A ## $t6 = 0000022A -/* 01198 80B1CA98 260F0296 */ addiu $t7, $s0, 0x0296 ## $t7 = 00000296 -/* 0119C 80B1CA9C 24180012 */ addiu $t8, $zero, 0x0012 ## $t8 = 00000012 -/* 011A0 80B1CAA0 AFB80018 */ sw $t8, 0x0018($sp) -/* 011A4 80B1CAA4 AFAF0014 */ sw $t7, 0x0014($sp) -/* 011A8 80B1CAA8 AFAE0010 */ sw $t6, 0x0010($sp) -/* 011AC 80B1CAAC 24C6BE40 */ addiu $a2, $a2, 0xBE40 ## $a2 = 0600BE40 -/* 011B0 80B1CAB0 AFA50030 */ sw $a1, 0x0030($sp) -/* 011B4 80B1CAB4 8FA40044 */ lw $a0, 0x0044($sp) -/* 011B8 80B1CAB8 0C0291BE */ jal func_800A46F8 -/* 011BC 80B1CABC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 011C0 80B1CAC0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 011C4 80B1CAC4 0C028800 */ jal SkelAnime_GetFrameCount - -/* 011C8 80B1CAC8 24842F84 */ addiu $a0, $a0, 0x2F84 ## $a0 = 06002F84 -/* 011CC 80B1CACC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 011D0 80B1CAD0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 011D4 80B1CAD4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 011D8 80B1CAD8 468021A0 */ cvt.s.w $f6, $f4 -/* 011DC 80B1CADC 44070000 */ mfc1 $a3, $f0 -/* 011E0 80B1CAE0 24A52F84 */ addiu $a1, $a1, 0x2F84 ## $a1 = 06002F84 -/* 011E4 80B1CAE4 8FA40030 */ lw $a0, 0x0030($sp) -/* 011E8 80B1CAE8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 011EC 80B1CAEC AFA00014 */ sw $zero, 0x0014($sp) -/* 011F0 80B1CAF0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 011F4 80B1CAF4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 011F8 80B1CAF8 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 011FC 80B1CAFC 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 01200 80B1CB00 AFA50030 */ sw $a1, 0x0030($sp) -/* 01204 80B1CB04 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 01208 80B1CB08 8FA40044 */ lw $a0, 0x0044($sp) -/* 0120C 80B1CB0C 3C0780B2 */ lui $a3, %hi(D_80B1D508) ## $a3 = 80B20000 -/* 01210 80B1CB10 8FA50030 */ lw $a1, 0x0030($sp) -/* 01214 80B1CB14 24E7D508 */ addiu $a3, $a3, %lo(D_80B1D508) ## $a3 = 80B1D508 -/* 01218 80B1CB18 8FA40044 */ lw $a0, 0x0044($sp) -/* 0121C 80B1CB1C 0C01712B */ jal ActorCollider_InitCylinder - -/* 01220 80B1CB20 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 01224 80B1CB24 3C0680B2 */ lui $a2, %hi(D_80B1D534) ## $a2 = 80B20000 -/* 01228 80B1CB28 24C6D534 */ addiu $a2, $a2, %lo(D_80B1D534) ## $a2 = 80B1D534 -/* 0122C 80B1CB2C 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 01230 80B1CB30 0C0187BF */ jal func_80061EFC -/* 01234 80B1CB34 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01238 80B1CB38 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0123C 80B1CB3C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 01240 80B1CB40 9462000C */ lhu $v0, 0x000C($v1) ## 8015E66C -/* 01244 80B1CB44 3401C001 */ ori $at, $zero, 0xC001 ## $at = 0000C001 -/* 01248 80B1CB48 0041082A */ slt $at, $v0, $at -/* 0124C 80B1CB4C 1420000D */ bne $at, $zero, .L80B1CB84 -/* 01250 80B1CB50 3401E000 */ ori $at, $zero, 0xE000 ## $at = 0000E000 -/* 01254 80B1CB54 0041082A */ slt $at, $v0, $at -/* 01258 80B1CB58 1020000A */ beq $at, $zero, .L80B1CB84 -/* 0125C 80B1CB5C 00000000 */ nop -/* 01260 80B1CB60 8C790004 */ lw $t9, 0x0004($v1) ## 8015E664 -/* 01264 80B1CB64 8FA80044 */ lw $t0, 0x0044($sp) -/* 01268 80B1CB68 13200006 */ beq $t9, $zero, .L80B1CB84 -/* 0126C 80B1CB6C 00000000 */ nop -/* 01270 80B1CB70 850900A4 */ lh $t1, 0x00A4($t0) ## 000000A4 -/* 01274 80B1CB74 24010053 */ addiu $at, $zero, 0x0053 ## $at = 00000053 -/* 01278 80B1CB78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0127C 80B1CB7C 11210005 */ beq $t1, $at, .L80B1CB94 -/* 01280 80B1CB80 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -.L80B1CB84: -/* 01284 80B1CB84 0C00B55C */ jal Actor_Kill - -/* 01288 80B1CB88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0128C 80B1CB8C 1000000F */ beq $zero, $zero, .L80B1CBCC -/* 01290 80B1CB90 8FBF002C */ lw $ra, 0x002C($sp) -.L80B1CB94: -/* 01294 80B1CB94 0C00B58B */ jal Actor_SetScale - -/* 01298 80B1CB98 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 0000D70A -/* 0129C 80B1CB9C 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 -/* 012A0 80B1CBA0 A20A001F */ sb $t2, 0x001F($s0) ## 0000001F -/* 012A4 80B1CBA4 3C0180B2 */ lui $at, %hi(D_80B1D684) ## $at = 80B20000 -/* 012A8 80B1CBA8 C428D684 */ lwc1 $f8, %lo(D_80B1D684)($at) -/* 012AC 80B1CBAC 3C0C80B2 */ lui $t4, %hi(func_80B1CC04) ## $t4 = 80B20000 -/* 012B0 80B1CBB0 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 012B4 80B1CBB4 258CCC04 */ addiu $t4, $t4, %lo(func_80B1CC04) ## $t4 = 80B1CC04 -/* 012B8 80B1CBB8 AE0B0214 */ sw $t3, 0x0214($s0) ## 00000214 -/* 012BC 80B1CBBC AE000210 */ sw $zero, 0x0210($s0) ## 00000210 -/* 012C0 80B1CBC0 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 -/* 012C4 80B1CBC4 E608006C */ swc1 $f8, 0x006C($s0) ## 0000006C -/* 012C8 80B1CBC8 8FBF002C */ lw $ra, 0x002C($sp) -.L80B1CBCC: -/* 012CC 80B1CBCC 8FB00028 */ lw $s0, 0x0028($sp) -/* 012D0 80B1CBD0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 012D4 80B1CBD4 03E00008 */ jr $ra -/* 012D8 80B1CBD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Update.s deleted file mode 100644 index 1c06e60083..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Update.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel EnTk_Update -/* 01858 80B1D158 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0185C 80B1D15C AFB00020 */ sw $s0, 0x0020($sp) -/* 01860 80B1D160 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01864 80B1D164 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01868 80B1D168 AFA5003C */ sw $a1, 0x003C($sp) -/* 0186C 80B1D16C 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 -/* 01870 80B1D170 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 -/* 01874 80B1D174 0C0189B7 */ jal ActorCollider_Cylinder_Update - -/* 01878 80B1D178 AFA6002C */ sw $a2, 0x002C($sp) -/* 0187C 80B1D17C 8FA4003C */ lw $a0, 0x003C($sp) -/* 01880 80B1D180 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01884 80B1D184 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 01888 80B1D188 8FA6002C */ lw $a2, 0x002C($sp) -/* 0188C 80B1D18C 0C017713 */ jal Actor_CollisionCheck_SetOT - ## CollisionCheck_setOT -/* 01890 80B1D190 00812821 */ addu $a1, $a0, $at -/* 01894 80B1D194 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01898 80B1D198 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0189C 80B1D19C 0C00B638 */ jal Actor_MoveForward - -/* 018A0 80B1D1A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018A4 80B1D1A4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 018A8 80B1D1A8 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 018AC 80B1D1AC AFAE0014 */ sw $t6, 0x0014($sp) -/* 018B0 80B1D1B0 8FA4003C */ lw $a0, 0x003C($sp) -/* 018B4 80B1D1B4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 018B8 80B1D1B8 3C064220 */ lui $a2, 0x4220 ## $a2 = 42200000 -/* 018BC 80B1D1BC 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 018C0 80B1D1C0 0C00B92D */ jal func_8002E4B4 -/* 018C4 80B1D1C4 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 018C8 80B1D1C8 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 -/* 018CC 80B1D1CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018D0 80B1D1D0 8FA5003C */ lw $a1, 0x003C($sp) -/* 018D4 80B1D1D4 0320F809 */ jalr $ra, $t9 -/* 018D8 80B1D1D8 00000000 */ nop -/* 018DC 80B1D1DC 0C2C6E69 */ jal func_80B1B9A4 -/* 018E0 80B1D1E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018E4 80B1D1E4 0C2C7003 */ jal func_80B1C00C -/* 018E8 80B1D1E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018EC 80B1D1EC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 018F0 80B1D1F0 8FB00020 */ lw $s0, 0x0020($sp) -/* 018F4 80B1D1F4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 018F8 80B1D1F8 03E00008 */ jr $ra -/* 018FC 80B1D1FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1B900.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1B900.s deleted file mode 100644 index 636b918065..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1B900.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80B1B900 -/* 00000 80B1B900 24820310 */ addiu $v0, $a0, 0x0310 ## $v0 = 00000310 -/* 00004 80B1B904 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 00008 80B1B908 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80B1B90C: -/* 0000C 80B1B90C 904E0000 */ lbu $t6, 0x0000($v0) ## 00000310 -/* 00010 80B1B910 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = 00000001 -/* 00014 80B1B914 00031C00 */ sll $v1, $v1, 16 -/* 00018 80B1B918 108E001D */ beq $a0, $t6, .L80B1B990 -/* 0001C 80B1B91C 00031C03 */ sra $v1, $v1, 16 -/* 00020 80B1B920 C7A40014 */ lwc1 $f4, 0x0014($sp) -/* 00024 80B1B924 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00028 80B1B928 E4440004 */ swc1 $f4, 0x0004($v0) ## 00000314 -/* 0002C 80B1B92C C7A60018 */ lwc1 $f6, 0x0018($sp) -/* 00030 80B1B930 E4460008 */ swc1 $f6, 0x0008($v0) ## 00000318 -/* 00034 80B1B934 93B80013 */ lbu $t8, 0x0013($sp) -/* 00038 80B1B938 A0590000 */ sb $t9, 0x0000($v0) ## 00000310 -/* 0003C 80B1B93C A0580001 */ sb $t8, 0x0001($v0) ## 00000311 -/* 00040 80B1B940 A0580002 */ sb $t8, 0x0002($v0) ## 00000312 -/* 00044 80B1B944 8CA90000 */ lw $t1, 0x0000($a1) ## 00000000 -/* 00048 80B1B948 AC490014 */ sw $t1, 0x0014($v0) ## 00000324 -/* 0004C 80B1B94C 8CA80004 */ lw $t0, 0x0004($a1) ## 00000004 -/* 00050 80B1B950 AC480018 */ sw $t0, 0x0018($v0) ## 00000328 -/* 00054 80B1B954 8CA90008 */ lw $t1, 0x0008($a1) ## 00000008 -/* 00058 80B1B958 AC49001C */ sw $t1, 0x001C($v0) ## 0000032C -/* 0005C 80B1B95C 8CEB0000 */ lw $t3, 0x0000($a3) ## 00000000 -/* 00060 80B1B960 AC4B002C */ sw $t3, 0x002C($v0) ## 0000033C -/* 00064 80B1B964 8CEA0004 */ lw $t2, 0x0004($a3) ## 00000004 -/* 00068 80B1B968 AC4A0030 */ sw $t2, 0x0030($v0) ## 00000340 -/* 0006C 80B1B96C 8CEB0008 */ lw $t3, 0x0008($a3) ## 00000008 -/* 00070 80B1B970 AC4B0034 */ sw $t3, 0x0034($v0) ## 00000344 -/* 00074 80B1B974 8CCD0000 */ lw $t5, 0x0000($a2) ## 00000000 -/* 00078 80B1B978 AC4D0020 */ sw $t5, 0x0020($v0) ## 00000330 -/* 0007C 80B1B97C 8CCC0004 */ lw $t4, 0x0004($a2) ## 00000004 -/* 00080 80B1B980 AC4C0024 */ sw $t4, 0x0024($v0) ## 00000334 -/* 00084 80B1B984 8CCD0008 */ lw $t5, 0x0008($a2) ## 00000008 -/* 00088 80B1B988 03E00008 */ jr $ra -/* 0008C 80B1B98C AC4D0028 */ sw $t5, 0x0028($v0) ## 00000338 -.L80B1B990: -/* 00090 80B1B990 28610014 */ slti $at, $v1, 0x0014 -/* 00094 80B1B994 1420FFDD */ bne $at, $zero, .L80B1B90C -/* 00098 80B1B998 24420038 */ addiu $v0, $v0, 0x0038 ## $v0 = 00000348 -/* 0009C 80B1B99C 03E00008 */ jr $ra -/* 000A0 80B1B9A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1B9A4.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1B9A4.s deleted file mode 100644 index a74af4894b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1B9A4.s +++ /dev/null @@ -1,75 +0,0 @@ -glabel func_80B1B9A4 -/* 000A4 80B1B9A4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 000A8 80B1B9A8 F7B60018 */ sdc1 $f22, 0x0018($sp) -/* 000AC 80B1B9AC 3C0180B2 */ lui $at, %hi(D_80B1D62C) ## $at = 80B20000 -/* 000B0 80B1B9B0 C436D62C */ lwc1 $f22, %lo(D_80B1D62C)($at) -/* 000B4 80B1B9B4 AFB10028 */ sw $s1, 0x0028($sp) -/* 000B8 80B1B9B8 AFB00024 */ sw $s0, 0x0024($sp) -/* 000BC 80B1B9BC F7B40010 */ sdc1 $f20, 0x0010($sp) -/* 000C0 80B1B9C0 3C0180B2 */ lui $at, %hi(D_80B1D630) ## $at = 80B20000 -/* 000C4 80B1B9C4 AFBF002C */ sw $ra, 0x002C($sp) -/* 000C8 80B1B9C8 24900310 */ addiu $s0, $a0, 0x0310 ## $s0 = 00000310 -/* 000CC 80B1B9CC C434D630 */ lwc1 $f20, %lo(D_80B1D630)($at) -/* 000D0 80B1B9D0 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -.L80B1B9D4: -/* 000D4 80B1B9D4 920E0000 */ lbu $t6, 0x0000($s0) ## 00000310 -/* 000D8 80B1B9D8 51C00029 */ beql $t6, $zero, .L80B1BA80 -/* 000DC 80B1B9DC 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 000E0 80B1B9E0 920F0001 */ lbu $t7, 0x0001($s0) ## 00000311 -/* 000E4 80B1B9E4 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 000E8 80B1B9E8 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 000000FF -/* 000EC 80B1B9EC 17200002 */ bne $t9, $zero, .L80B1B9F8 -/* 000F0 80B1B9F0 A2180001 */ sb $t8, 0x0001($s0) ## 00000311 -/* 000F4 80B1B9F4 A2000000 */ sb $zero, 0x0000($s0) ## 00000310 -.L80B1B9F8: -/* 000F8 80B1B9F8 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 000FC 80B1B9FC 00000000 */ nop -/* 00100 80B1BA00 46140102 */ mul.s $f4, $f0, $f20 -/* 00104 80B1BA04 46162181 */ sub.s $f6, $f4, $f22 -/* 00108 80B1BA08 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 0010C 80B1BA0C E606002C */ swc1 $f6, 0x002C($s0) ## 0000033C -/* 00110 80B1BA10 C60C0020 */ lwc1 $f12, 0x0020($s0) ## 00000330 -/* 00114 80B1BA14 C60A0014 */ lwc1 $f10, 0x0014($s0) ## 00000324 -/* 00118 80B1BA18 46140202 */ mul.s $f8, $f0, $f20 -/* 0011C 80B1BA1C C60E0024 */ lwc1 $f14, 0x0024($s0) ## 00000334 -/* 00120 80B1BA20 460C5480 */ add.s $f18, $f10, $f12 -/* 00124 80B1BA24 C6040018 */ lwc1 $f4, 0x0018($s0) ## 00000328 -/* 00128 80B1BA28 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000338 -/* 0012C 80B1BA2C E6120014 */ swc1 $f18, 0x0014($s0) ## 00000324 -/* 00130 80B1BA30 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000033C -/* 00134 80B1BA34 460E2180 */ add.s $f6, $f4, $f14 -/* 00138 80B1BA38 46164081 */ sub.s $f2, $f8, $f22 -/* 0013C 80B1BA3C C608001C */ lwc1 $f8, 0x001C($s0) ## 0000032C -/* 00140 80B1BA40 E6060018 */ swc1 $f6, 0x0018($s0) ## 00000328 -/* 00144 80B1BA44 46126100 */ add.s $f4, $f12, $f18 -/* 00148 80B1BA48 C6060030 */ lwc1 $f6, 0x0030($s0) ## 00000340 -/* 0014C 80B1BA4C C6120004 */ lwc1 $f18, 0x0004($s0) ## 00000314 -/* 00150 80B1BA50 46104280 */ add.s $f10, $f8, $f16 -/* 00154 80B1BA54 E6040020 */ swc1 $f4, 0x0020($s0) ## 00000330 -/* 00158 80B1BA58 C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000318 -/* 0015C 80B1BA5C 46067200 */ add.s $f8, $f14, $f6 -/* 00160 80B1BA60 E60A001C */ swc1 $f10, 0x001C($s0) ## 0000032C -/* 00164 80B1BA64 E6020034 */ swc1 $f2, 0x0034($s0) ## 00000344 -/* 00168 80B1BA68 46028280 */ add.s $f10, $f16, $f2 -/* 0016C 80B1BA6C E6080024 */ swc1 $f8, 0x0024($s0) ## 00000334 -/* 00170 80B1BA70 46049180 */ add.s $f6, $f18, $f4 -/* 00174 80B1BA74 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000338 -/* 00178 80B1BA78 E6060004 */ swc1 $f6, 0x0004($s0) ## 00000314 -/* 0017C 80B1BA7C 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000002 -.L80B1BA80: -/* 00180 80B1BA80 00118C00 */ sll $s1, $s1, 16 -/* 00184 80B1BA84 00118C03 */ sra $s1, $s1, 16 -/* 00188 80B1BA88 2A210014 */ slti $at, $s1, 0x0014 -/* 0018C 80B1BA8C 1420FFD1 */ bne $at, $zero, .L80B1B9D4 -/* 00190 80B1BA90 26100038 */ addiu $s0, $s0, 0x0038 ## $s0 = 00000348 -/* 00194 80B1BA94 8FBF002C */ lw $ra, 0x002C($sp) -/* 00198 80B1BA98 D7B40010 */ ldc1 $f20, 0x0010($sp) -/* 0019C 80B1BA9C D7B60018 */ ldc1 $f22, 0x0018($sp) -/* 001A0 80B1BAA0 8FB00024 */ lw $s0, 0x0024($sp) -/* 001A4 80B1BAA4 8FB10028 */ lw $s1, 0x0028($sp) -/* 001A8 80B1BAA8 03E00008 */ jr $ra -/* 001AC 80B1BAAC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BAB0.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BAB0.s deleted file mode 100644 index 77c327790c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BAB0.s +++ /dev/null @@ -1,213 +0,0 @@ -glabel func_80B1BAB0 -/* 001B0 80B1BAB0 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 -/* 001B4 80B1BAB4 AFBE0050 */ sw $s8, 0x0050($sp) -/* 001B8 80B1BAB8 00A0F025 */ or $s8, $a1, $zero ## $s8 = 00000000 -/* 001BC 80B1BABC AFBF0054 */ sw $ra, 0x0054($sp) -/* 001C0 80B1BAC0 AFB7004C */ sw $s7, 0x004C($sp) -/* 001C4 80B1BAC4 AFB60048 */ sw $s6, 0x0048($sp) -/* 001C8 80B1BAC8 AFB50044 */ sw $s5, 0x0044($sp) -/* 001CC 80B1BACC AFB40040 */ sw $s4, 0x0040($sp) -/* 001D0 80B1BAD0 AFB3003C */ sw $s3, 0x003C($sp) -/* 001D4 80B1BAD4 AFB20038 */ sw $s2, 0x0038($sp) -/* 001D8 80B1BAD8 AFB10034 */ sw $s1, 0x0034($sp) -/* 001DC 80B1BADC AFB00030 */ sw $s0, 0x0030($sp) -/* 001E0 80B1BAE0 F7B80028 */ sdc1 $f24, 0x0028($sp) -/* 001E4 80B1BAE4 F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 001E8 80B1BAE8 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 001EC 80B1BAEC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 001F0 80B1BAF0 24920310 */ addiu $s2, $a0, 0x0310 ## $s2 = 00000310 -/* 001F4 80B1BAF4 3C0680B2 */ lui $a2, %hi(D_80B1D5B0) ## $a2 = 80B20000 -/* 001F8 80B1BAF8 24C6D5B0 */ addiu $a2, $a2, %lo(D_80B1D5B0) ## $a2 = 80B1D5B0 -/* 001FC 80B1BAFC 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE0 -/* 00200 80B1BB00 24070072 */ addiu $a3, $zero, 0x0072 ## $a3 = 00000072 -/* 00204 80B1BB04 0C031AB1 */ jal func_800C6AC4 -/* 00208 80B1BB08 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0020C 80B1BB0C 0000B825 */ or $s7, $zero, $zero ## $s7 = 00000000 -/* 00210 80B1BB10 0C024F61 */ jal func_80093D84 -/* 00214 80B1BB14 8FC40000 */ lw $a0, 0x0000($s8) ## 00000000 -/* 00218 80B1BB18 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 0021C 80B1BB1C 4481C000 */ mtc1 $at, $f24 ## $f24 = 8.00 -/* 00220 80B1BB20 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00224 80B1BB24 4481B000 */ mtc1 $at, $f22 ## $f22 = 1.00 -/* 00228 80B1BB28 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 0022C 80B1BB2C 4481A000 */ mtc1 $at, $f20 ## $f20 = 255.00 -/* 00230 80B1BB30 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 00234 80B1BB34 3C16DE00 */ lui $s6, 0xDE00 ## $s6 = DE000000 -.L80B1BB38: -/* 00238 80B1BB38 924E0000 */ lbu $t6, 0x0000($s2) ## 00000310 -/* 0023C 80B1BB3C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00240 80B1BB40 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 00244 80B1BB44 11C0008A */ beq $t6, $zero, .L80B1BD70 -/* 00248 80B1BB48 03C19821 */ addu $s3, $s8, $at -/* 0024C 80B1BB4C 3C150601 */ lui $s5, 0x0601 ## $s5 = 06010000 -/* 00250 80B1BB50 16E00014 */ bne $s7, $zero, .L80B1BBA4 -/* 00254 80B1BB54 26B5BCA0 */ addiu $s5, $s5, 0xBCA0 ## $s5 = 0600BCA0 -/* 00258 80B1BB58 3C110601 */ lui $s1, 0x0601 ## $s1 = 06010000 -/* 0025C 80B1BB5C 2631BC90 */ addiu $s1, $s1, 0xBC90 ## $s1 = 0600BC90 -/* 00260 80B1BB60 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 00264 80B1BB64 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00268 80B1BB68 0C024DDD */ jal func_80093774 -/* 0026C 80B1BB6C 24170001 */ addiu $s7, $zero, 0x0001 ## $s7 = 00000001 -/* 00270 80B1BB70 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 00274 80B1BB74 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00278 80B1BB78 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 0027C 80B1BB7C AC510004 */ sw $s1, 0x0004($v0) ## 00000004 -/* 00280 80B1BB80 AC560000 */ sw $s6, 0x0000($v0) ## 00000000 -/* 00284 80B1BB84 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00288 80B1BB88 3C08643C */ lui $t0, 0x643C ## $t0 = 643C0000 -/* 0028C 80B1BB8C 35081400 */ ori $t0, $t0, 0x1400 ## $t0 = 643C1400 -/* 00290 80B1BB90 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 00294 80B1BB94 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 00298 80B1BB98 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 0029C 80B1BB9C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 002A0 80B1BBA0 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -.L80B1BBA4: -/* 002A4 80B1BBA4 92490001 */ lbu $t1, 0x0001($s2) ## 00000311 -/* 002A8 80B1BBA8 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 002AC 80B1BBAC 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 002B0 80B1BBB0 05210004 */ bgez $t1, .L80B1BBC4 -/* 002B4 80B1BBB4 468021A0 */ cvt.s.w $f6, $f4 -/* 002B8 80B1BBB8 44814000 */ mtc1 $at, $f8 ## $f8 = 4294967296.00 -/* 002BC 80B1BBBC 00000000 */ nop -/* 002C0 80B1BBC0 46083180 */ add.s $f6, $f6, $f8 -.L80B1BBC4: -/* 002C4 80B1BBC4 924A0002 */ lbu $t2, 0x0002($s2) ## 00000312 -/* 002C8 80B1BBC8 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 002CC 80B1BBCC 448A5000 */ mtc1 $t2, $f10 ## $f10 = 0.00 -/* 002D0 80B1BBD0 05410004 */ bgez $t2, .L80B1BBE4 -/* 002D4 80B1BBD4 46805420 */ cvt.s.w $f16, $f10 -/* 002D8 80B1BBD8 44819000 */ mtc1 $at, $f18 ## $f18 = 4294967296.00 -/* 002DC 80B1BBDC 00000000 */ nop -/* 002E0 80B1BBE0 46128400 */ add.s $f16, $f16, $f18 -.L80B1BBE4: -/* 002E4 80B1BBE4 4610A103 */ div.s $f4, $f20, $f16 -/* 002E8 80B1BBE8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 002EC 80B1BBEC 3C01AA82 */ lui $at, 0xAA82 ## $at = AA820000 -/* 002F0 80B1BBF0 34215A00 */ ori $at, $at, 0x5A00 ## $at = AA825A00 -/* 002F4 80B1BBF4 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 002F8 80B1BBF8 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 002FC 80B1BBFC 3C0DFA00 */ lui $t5, 0xFA00 ## $t5 = FA000000 -/* 00300 80B1BC00 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00304 80B1BC04 3C19E700 */ lui $t9, 0xE700 ## $t9 = E7000000 -/* 00308 80B1BC08 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0030C 80B1BC0C 46043202 */ mul.s $f8, $f6, $f4 -/* 00310 80B1BC10 4600428D */ trunc.w.s $f10, $f8 -/* 00314 80B1BC14 44045000 */ mfc1 $a0, $f10 -/* 00318 80B1BC18 00000000 */ nop -/* 0031C 80B1BC1C 00042400 */ sll $a0, $a0, 16 -/* 00320 80B1BC20 00042403 */ sra $a0, $a0, 16 -/* 00324 80B1BC24 308E00FF */ andi $t6, $a0, 0x00FF ## $t6 = 00000000 -/* 00328 80B1BC28 01C17825 */ or $t7, $t6, $at ## $t7 = AA825A00 -/* 0032C 80B1BC2C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 00330 80B1BC30 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00334 80B1BC34 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 00338 80B1BC38 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 0033C 80B1BC3C AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 00340 80B1BC40 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00344 80B1BC44 8E46001C */ lw $a2, 0x001C($s2) ## 0000032C -/* 00348 80B1BC48 C64E0018 */ lwc1 $f14, 0x0018($s2) ## 00000328 -/* 0034C 80B1BC4C 0C034261 */ jal Matrix_Translate -/* 00350 80B1BC50 C64C0014 */ lwc1 $f12, 0x0014($s2) ## 00000324 -/* 00354 80B1BC54 0C0347F5 */ jal func_800D1FD4 -/* 00358 80B1BC58 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 0035C 80B1BC5C C64C0004 */ lwc1 $f12, 0x0004($s2) ## 00000314 -/* 00360 80B1BC60 4406B000 */ mfc1 $a2, $f22 -/* 00364 80B1BC64 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00368 80B1BC68 0C0342A3 */ jal Matrix_Scale -/* 0036C 80B1BC6C 46006386 */ mov.s $f14, $f12 -/* 00370 80B1BC70 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00374 80B1BC74 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 -/* 00378 80B1BC78 35290003 */ ori $t1, $t1, 0x0003 ## $t1 = DA380003 -/* 0037C 80B1BC7C 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 00380 80B1BC80 AE0802D0 */ sw $t0, 0x02D0($s0) ## 000002D0 -/* 00384 80B1BC84 3C0580B2 */ lui $a1, %hi(D_80B1D5C4) ## $a1 = 80B20000 -/* 00388 80B1BC88 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 0038C 80B1BC8C 8FC40000 */ lw $a0, 0x0000($s8) ## 00000000 -/* 00390 80B1BC90 24A5D5C4 */ addiu $a1, $a1, %lo(D_80B1D5C4) ## $a1 = 80B1D5C4 -/* 00394 80B1BC94 2406008C */ addiu $a2, $zero, 0x008C ## $a2 = 0000008C -/* 00398 80B1BC98 0C0346A2 */ jal Matrix_NewMtx -/* 0039C 80B1BC9C 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 -/* 003A0 80B1BCA0 AE220004 */ sw $v0, 0x0004($s1) ## 00000004 -/* 003A4 80B1BCA4 924A0001 */ lbu $t2, 0x0001($s2) ## 00000311 -/* 003A8 80B1BCA8 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 003AC 80B1BCAC 448A9000 */ mtc1 $t2, $f18 ## $f18 = 0.00 -/* 003B0 80B1BCB0 05410004 */ bgez $t2, .L80B1BCC4 -/* 003B4 80B1BCB4 46809420 */ cvt.s.w $f16, $f18 -/* 003B8 80B1BCB8 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 -/* 003BC 80B1BCBC 00000000 */ nop -/* 003C0 80B1BCC0 46068400 */ add.s $f16, $f16, $f6 -.L80B1BCC4: -/* 003C4 80B1BCC4 924B0002 */ lbu $t3, 0x0002($s2) ## 00000312 -/* 003C8 80B1BCC8 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 003CC 80B1BCCC 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 -/* 003D0 80B1BCD0 05610004 */ bgez $t3, .L80B1BCE4 -/* 003D4 80B1BCD4 46802220 */ cvt.s.w $f8, $f4 -/* 003D8 80B1BCD8 44815000 */ mtc1 $at, $f10 ## $f10 = 4294967296.00 -/* 003DC 80B1BCDC 00000000 */ nop -/* 003E0 80B1BCE0 460A4200 */ add.s $f8, $f8, $f10 -.L80B1BCE4: -/* 003E4 80B1BCE4 4608C483 */ div.s $f18, $f24, $f8 -/* 003E8 80B1BCE8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 003EC 80B1BCEC 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 003F0 80B1BCF0 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 -/* 003F4 80B1BCF4 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 003F8 80B1BCF8 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 003FC 80B1BCFC 3C0480B2 */ lui $a0, %hi(D_80B1D4D0) ## $a0 = 80B20000 -/* 00400 80B1BD00 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 00404 80B1BD04 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 00408 80B1BD08 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0040C 80B1BD0C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00410 80B1BD10 46128182 */ mul.s $f6, $f16, $f18 -/* 00414 80B1BD14 4600310D */ trunc.w.s $f4, $f6 -/* 00418 80B1BD18 44052000 */ mfc1 $a1, $f4 -/* 0041C 80B1BD1C 00000000 */ nop -/* 00420 80B1BD20 00052C00 */ sll $a1, $a1, 16 -/* 00424 80B1BD24 00052C03 */ sra $a1, $a1, 16 -/* 00428 80B1BD28 00057880 */ sll $t7, $a1, 2 -/* 0042C 80B1BD2C 008F2021 */ addu $a0, $a0, $t7 -/* 00430 80B1BD30 8C84D4D0 */ lw $a0, %lo(D_80B1D4D0)($a0) -/* 00434 80B1BD34 0004C900 */ sll $t9, $a0, 4 -/* 00438 80B1BD38 00194702 */ srl $t0, $t9, 28 -/* 0043C 80B1BD3C 00084880 */ sll $t1, $t0, 2 -/* 00440 80B1BD40 01495021 */ addu $t2, $t2, $t1 -/* 00444 80B1BD44 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 -/* 00448 80B1BD48 0081C024 */ and $t8, $a0, $at -/* 0044C 80B1BD4C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00450 80B1BD50 030A5821 */ addu $t3, $t8, $t2 -/* 00454 80B1BD54 01616021 */ addu $t4, $t3, $at -/* 00458 80B1BD58 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 0045C 80B1BD5C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00460 80B1BD60 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 00464 80B1BD64 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 00468 80B1BD68 AC550004 */ sw $s5, 0x0004($v0) ## 00000004 -/* 0046C 80B1BD6C AC560000 */ sw $s6, 0x0000($v0) ## 00000000 -.L80B1BD70: -/* 00470 80B1BD70 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000001 -/* 00474 80B1BD74 0014A400 */ sll $s4, $s4, 16 -/* 00478 80B1BD78 0014A403 */ sra $s4, $s4, 16 -/* 0047C 80B1BD7C 2A810014 */ slti $at, $s4, 0x0014 -/* 00480 80B1BD80 1420FF6D */ bne $at, $zero, .L80B1BB38 -/* 00484 80B1BD84 26520038 */ addiu $s2, $s2, 0x0038 ## $s2 = 00000348 -/* 00488 80B1BD88 3C0680B2 */ lui $a2, %hi(D_80B1D5D8) ## $a2 = 80B20000 -/* 0048C 80B1BD8C 24C6D5D8 */ addiu $a2, $a2, %lo(D_80B1D5D8) ## $a2 = 80B1D5D8 -/* 00490 80B1BD90 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE0 -/* 00494 80B1BD94 8FC50000 */ lw $a1, 0x0000($s8) ## 00000000 -/* 00498 80B1BD98 0C031AD5 */ jal func_800C6B54 -/* 0049C 80B1BD9C 2407009A */ addiu $a3, $zero, 0x009A ## $a3 = 0000009A -/* 004A0 80B1BDA0 8FBF0054 */ lw $ra, 0x0054($sp) -/* 004A4 80B1BDA4 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 004A8 80B1BDA8 D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 004AC 80B1BDAC D7B80028 */ ldc1 $f24, 0x0028($sp) -/* 004B0 80B1BDB0 8FB00030 */ lw $s0, 0x0030($sp) -/* 004B4 80B1BDB4 8FB10034 */ lw $s1, 0x0034($sp) -/* 004B8 80B1BDB8 8FB20038 */ lw $s2, 0x0038($sp) -/* 004BC 80B1BDBC 8FB3003C */ lw $s3, 0x003C($sp) -/* 004C0 80B1BDC0 8FB40040 */ lw $s4, 0x0040($sp) -/* 004C4 80B1BDC4 8FB50044 */ lw $s5, 0x0044($sp) -/* 004C8 80B1BDC8 8FB60048 */ lw $s6, 0x0048($sp) -/* 004CC 80B1BDCC 8FB7004C */ lw $s7, 0x004C($sp) -/* 004D0 80B1BDD0 8FBE0050 */ lw $s8, 0x0050($sp) -/* 004D4 80B1BDD4 03E00008 */ jr $ra -/* 004D8 80B1BDD8 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BDDC.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BDDC.s deleted file mode 100644 index 69a8f7fbee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BDDC.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_80B1BDDC -/* 004DC 80B1BDDC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 004E0 80B1BDE0 3C0F80B2 */ lui $t7, %hi(D_80B1D4F0) ## $t7 = 80B20000 -/* 004E4 80B1BDE4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 004E8 80B1BDE8 AFA40048 */ sw $a0, 0x0048($sp) -/* 004EC 80B1BDEC AFA5004C */ sw $a1, 0x004C($sp) -/* 004F0 80B1BDF0 AFA60050 */ sw $a2, 0x0050($sp) -/* 004F4 80B1BDF4 AFA70054 */ sw $a3, 0x0054($sp) -/* 004F8 80B1BDF8 25EFD4F0 */ addiu $t7, $t7, %lo(D_80B1D4F0) ## $t7 = 80B1D4F0 -/* 004FC 80B1BDFC 8DF90000 */ lw $t9, 0x0000($t7) ## 80B1D4F0 -/* 00500 80B1BE00 27AE003C */ addiu $t6, $sp, 0x003C ## $t6 = FFFFFFF4 -/* 00504 80B1BE04 8DF80004 */ lw $t8, 0x0004($t7) ## 80B1D4F4 -/* 00508 80B1BE08 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF4 -/* 0050C 80B1BE0C 8DF90008 */ lw $t9, 0x0008($t7) ## 80B1D4F8 -/* 00510 80B1BE10 3C0980B2 */ lui $t1, %hi(D_80B1D4FC) ## $t1 = 80B20000 -/* 00514 80B1BE14 2529D4FC */ addiu $t1, $t1, %lo(D_80B1D4FC) ## $t1 = 80B1D4FC -/* 00518 80B1BE18 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF8 -/* 0051C 80B1BE1C ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFFC -/* 00520 80B1BE20 8D2B0000 */ lw $t3, 0x0000($t1) ## 80B1D4FC -/* 00524 80B1BE24 27A80030 */ addiu $t0, $sp, 0x0030 ## $t0 = FFFFFFE8 -/* 00528 80B1BE28 8D2A0004 */ lw $t2, 0x0004($t1) ## 80B1D500 -/* 0052C 80B1BE2C AD0B0000 */ sw $t3, 0x0000($t0) ## FFFFFFE8 -/* 00530 80B1BE30 8D2B0008 */ lw $t3, 0x0008($t1) ## 80B1D504 -/* 00534 80B1BE34 AD0A0004 */ sw $t2, 0x0004($t0) ## FFFFFFEC -/* 00538 80B1BE38 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 0053C 80B1BE3C AD0B0008 */ sw $t3, 0x0008($t0) ## FFFFFFF0 -/* 00540 80B1BE40 C7A6005C */ lwc1 $f6, 0x005C($sp) -/* 00544 80B1BE44 C7A40034 */ lwc1 $f4, 0x0034($sp) -/* 00548 80B1BE48 93AC0053 */ lbu $t4, 0x0053($sp) -/* 0054C 80B1BE4C 46060202 */ mul.s $f8, $f0, $f6 -/* 00550 80B1BE50 C7B00054 */ lwc1 $f16, 0x0054($sp) -/* 00554 80B1BE54 C7B20058 */ lwc1 $f18, 0x0058($sp) -/* 00558 80B1BE58 8FA40048 */ lw $a0, 0x0048($sp) -/* 0055C 80B1BE5C 8FA5004C */ lw $a1, 0x004C($sp) -/* 00560 80B1BE60 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFF4 -/* 00564 80B1BE64 27A70030 */ addiu $a3, $sp, 0x0030 ## $a3 = FFFFFFE8 -/* 00568 80B1BE68 46082280 */ add.s $f10, $f4, $f8 -/* 0056C 80B1BE6C AFAC0010 */ sw $t4, 0x0010($sp) -/* 00570 80B1BE70 E7B00014 */ swc1 $f16, 0x0014($sp) -/* 00574 80B1BE74 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00578 80B1BE78 0C2C6E40 */ jal func_80B1B900 -/* 0057C 80B1BE7C E7AA0034 */ swc1 $f10, 0x0034($sp) -/* 00580 80B1BE80 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00584 80B1BE84 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00588 80B1BE88 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0058C 80B1BE8C 03E00008 */ jr $ra -/* 00590 80B1BE90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BE94.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BE94.s deleted file mode 100644 index 21dcf60bfc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BE94.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80B1BE94 -/* 00594 80B1BE94 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00598 80B1BE98 AFA40028 */ sw $a0, 0x0028($sp) -/* 0059C 80B1BE9C AFBF0024 */ sw $ra, 0x0024($sp) -/* 005A0 80B1BEA0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 005A4 80B1BEA4 AFA5002C */ sw $a1, 0x002C($sp) -/* 005A8 80B1BEA8 0C028800 */ jal SkelAnime_GetFrameCount - -/* 005AC 80B1BEAC 24842F84 */ addiu $a0, $a0, 0x2F84 ## $a0 = 06002F84 -/* 005B0 80B1BEB0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 005B4 80B1BEB4 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 005B8 80B1BEB8 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 005BC 80B1BEBC 468021A0 */ cvt.s.w $f6, $f4 -/* 005C0 80B1BEC0 8FA40028 */ lw $a0, 0x0028($sp) -/* 005C4 80B1BEC4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 005C8 80B1BEC8 24A52F84 */ addiu $a1, $a1, 0x2F84 ## $a1 = 06002F84 -/* 005CC 80B1BECC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 005D0 80B1BED0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 005D4 80B1BED4 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 005D8 80B1BED8 AFA00014 */ sw $zero, 0x0014($sp) -/* 005DC 80B1BEDC E7A80018 */ swc1 $f8, 0x0018($sp) -/* 005E0 80B1BEE0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 005E4 80B1BEE4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 005E8 80B1BEE8 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 005EC 80B1BEEC 0C01DF64 */ jal Math_Rand_S16Offset - -/* 005F0 80B1BEF0 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 005F4 80B1BEF4 8FA30028 */ lw $v1, 0x0028($sp) -/* 005F8 80B1BEF8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 005FC 80B1BEFC A462021C */ sh $v0, 0x021C($v1) ## 0000021C -/* 00600 80B1BF00 E46A0068 */ swc1 $f10, 0x0068($v1) ## 00000068 -/* 00604 80B1BF04 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00608 80B1BF08 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0060C 80B1BF0C 03E00008 */ jr $ra -/* 00610 80B1BF10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BF14.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BF14.s deleted file mode 100644 index 72ede3767a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BF14.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80B1BF14 -/* 00614 80B1BF14 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00618 80B1BF18 AFA40028 */ sw $a0, 0x0028($sp) -/* 0061C 80B1BF1C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00620 80B1BF20 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00624 80B1BF24 AFA5002C */ sw $a1, 0x002C($sp) -/* 00628 80B1BF28 0C028800 */ jal SkelAnime_GetFrameCount - -/* 0062C 80B1BF2C 24842F84 */ addiu $a0, $a0, 0x2F84 ## $a0 = 06002F84 -/* 00630 80B1BF30 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00634 80B1BF34 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00638 80B1BF38 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 0063C 80B1BF3C 468021A0 */ cvt.s.w $f6, $f4 -/* 00640 80B1BF40 8FA40028 */ lw $a0, 0x0028($sp) -/* 00644 80B1BF44 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00648 80B1BF48 24A51FA8 */ addiu $a1, $a1, 0x1FA8 ## $a1 = 06001FA8 -/* 0064C 80B1BF4C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00650 80B1BF50 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00654 80B1BF54 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00658 80B1BF58 AFA00014 */ sw $zero, 0x0014($sp) -/* 0065C 80B1BF5C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00660 80B1BF60 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00664 80B1BF64 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00668 80B1BF68 240400F0 */ addiu $a0, $zero, 0x00F0 ## $a0 = 000000F0 -/* 0066C 80B1BF6C 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00670 80B1BF70 240500F0 */ addiu $a1, $zero, 0x00F0 ## $a1 = 000000F0 -/* 00674 80B1BF74 8FAE0028 */ lw $t6, 0x0028($sp) -/* 00678 80B1BF78 A5C2021C */ sh $v0, 0x021C($t6) ## 0000021C -/* 0067C 80B1BF7C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00680 80B1BF80 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00684 80B1BF84 03E00008 */ jr $ra -/* 00688 80B1BF88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BF8C.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BF8C.s deleted file mode 100644 index acea15376f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BF8C.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80B1BF8C -/* 0068C 80B1BF8C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00690 80B1BF90 AFA40028 */ sw $a0, 0x0028($sp) -/* 00694 80B1BF94 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00698 80B1BF98 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0069C 80B1BF9C AFA5002C */ sw $a1, 0x002C($sp) -/* 006A0 80B1BFA0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 006A4 80B1BFA4 24841144 */ addiu $a0, $a0, 0x1144 ## $a0 = 06001144 -/* 006A8 80B1BFA8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 006AC 80B1BFAC 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 006B0 80B1BFB0 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 006B4 80B1BFB4 468021A0 */ cvt.s.w $f6, $f4 -/* 006B8 80B1BFB8 8FA40028 */ lw $a0, 0x0028($sp) -/* 006BC 80B1BFBC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 006C0 80B1BFC0 24A51144 */ addiu $a1, $a1, 0x1144 ## $a1 = 06001144 -/* 006C4 80B1BFC4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 006C8 80B1BFC8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 006CC 80B1BFCC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 006D0 80B1BFD0 AFA00014 */ sw $zero, 0x0014($sp) -/* 006D4 80B1BFD4 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 006D8 80B1BFD8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 006DC 80B1BFDC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006E0 80B1BFE0 8FA40028 */ lw $a0, 0x0028($sp) -/* 006E4 80B1BFE4 0C2C7055 */ jal func_80B1C154 -/* 006E8 80B1BFE8 8FA5002C */ lw $a1, 0x002C($sp) -/* 006EC 80B1BFEC 04400003 */ bltz $v0, .L80B1BFFC -/* 006F0 80B1BFF0 8FAF0028 */ lw $t7, 0x0028($sp) -/* 006F4 80B1BFF4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 006F8 80B1BFF8 A1EE0208 */ sb $t6, 0x0208($t7) ## 00000208 -.L80B1BFFC: -/* 006FC 80B1BFFC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00700 80B1C000 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00704 80B1C004 03E00008 */ jr $ra -/* 00708 80B1C008 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C00C.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C00C.s deleted file mode 100644 index 893baee77b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C00C.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel func_80B1C00C -/* 0070C 80B1C00C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00710 80B1C010 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00714 80B1C014 84820224 */ lh $v0, 0x0224($a0) ## 00000224 -/* 00718 80B1C018 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0071C 80B1C01C 14400003 */ bne $v0, $zero, .L80B1C02C -/* 00720 80B1C020 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00724 80B1C024 10000003 */ beq $zero, $zero, .L80B1C034 -/* 00728 80B1C028 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80B1C02C: -/* 0072C 80B1C02C A4CE0224 */ sh $t6, 0x0224($a2) ## 00000224 -/* 00730 80B1C030 84C30224 */ lh $v1, 0x0224($a2) ## 00000224 -.L80B1C034: -/* 00734 80B1C034 54600023 */ bnel $v1, $zero, .L80B1C0C4 -/* 00738 80B1C038 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0073C 80B1C03C 84CF0222 */ lh $t7, 0x0222($a2) ## 00000222 -/* 00740 80B1C040 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00744 80B1C044 A4D80222 */ sh $t8, 0x0222($a2) ## 00000222 -/* 00748 80B1C048 84D90222 */ lh $t9, 0x0222($a2) ## 00000222 -/* 0074C 80B1C04C 2B210003 */ slti $at, $t9, 0x0003 -/* 00750 80B1C050 5420001C */ bnel $at, $zero, .L80B1C0C4 -/* 00754 80B1C054 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00758 80B1C058 84C80218 */ lh $t0, 0x0218($a2) ## 00000218 -/* 0075C 80B1C05C 2404001E */ addiu $a0, $zero, 0x001E ## $a0 = 0000001E -/* 00760 80B1C060 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 00764 80B1C064 2509FFFF */ addiu $t1, $t0, 0xFFFF ## $t1 = FFFFFFFF -/* 00768 80B1C068 A4C90218 */ sh $t1, 0x0218($a2) ## 00000218 -/* 0076C 80B1C06C 84CA0218 */ lh $t2, 0x0218($a2) ## 00000218 -/* 00770 80B1C070 05430013 */ bgezl $t2, .L80B1C0C0 -/* 00774 80B1C074 A4C00222 */ sh $zero, 0x0222($a2) ## 00000222 -/* 00778 80B1C078 0C01DF64 */ jal Math_Rand_S16Offset - -/* 0077C 80B1C07C AFA60018 */ sw $a2, 0x0018($sp) -/* 00780 80B1C080 8FA60018 */ lw $a2, 0x0018($sp) -/* 00784 80B1C084 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 00788 80B1C088 A4C20224 */ sh $v0, 0x0224($a2) ## 00000224 -/* 0078C 80B1C08C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00790 80B1C090 A4CB0218 */ sh $t3, 0x0218($a2) ## 00000218 -/* 00794 80B1C094 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00798 80B1C098 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 0079C 80B1C09C 8FA60018 */ lw $a2, 0x0018($sp) -/* 007A0 80B1C0A0 4600203C */ c.lt.s $f4, $f0 -/* 007A4 80B1C0A4 00000000 */ nop -/* 007A8 80B1C0A8 45020005 */ bc1fl .L80B1C0C0 -/* 007AC 80B1C0AC A4C00222 */ sh $zero, 0x0222($a2) ## 00000222 -/* 007B0 80B1C0B0 84CC0218 */ lh $t4, 0x0218($a2) ## 00000218 -/* 007B4 80B1C0B4 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 007B8 80B1C0B8 A4CD0218 */ sh $t5, 0x0218($a2) ## 00000218 -/* 007BC 80B1C0BC A4C00222 */ sh $zero, 0x0222($a2) ## 00000222 -.L80B1C0C0: -/* 007C0 80B1C0C0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B1C0C4: -/* 007C4 80B1C0C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007C8 80B1C0C8 03E00008 */ jr $ra -/* 007CC 80B1C0CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C0D0.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C0D0.s deleted file mode 100644 index e690ca31dc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C0D0.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80B1C0D0 -/* 007D0 80B1C0D0 3C0180B2 */ lui $at, %hi(D_80B1D634) ## $at = 80B20000 -/* 007D4 80B1C0D4 C424D634 */ lwc1 $f4, %lo(D_80B1D634)($at) -/* 007D8 80B1C0D8 C486008C */ lwc1 $f6, 0x008C($a0) ## 0000008C -/* 007DC 80B1C0DC 4606203C */ c.lt.s $f4, $f6 -/* 007E0 80B1C0E0 00000000 */ nop -/* 007E4 80B1C0E4 45020004 */ bc1fl .L80B1C0F8 -/* 007E8 80B1C0E8 848200B6 */ lh $v0, 0x00B6($a0) ## 000000B6 -/* 007EC 80B1C0EC 03E00008 */ jr $ra -/* 007F0 80B1C0F0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B1C0F4: -/* 007F4 80B1C0F4 848200B6 */ lh $v0, 0x00B6($a0) ## 000000B6 -.L80B1C0F8: -/* 007F8 80B1C0F8 848E021E */ lh $t6, 0x021E($a0) ## 0000021E -/* 007FC 80B1C0FC 848F0226 */ lh $t7, 0x0226($a0) ## 00000226 -/* 00800 80B1C100 8498008A */ lh $t8, 0x008A($a0) ## 0000008A -/* 00804 80B1C104 004E1023 */ subu $v0, $v0, $t6 -/* 00808 80B1C108 00021400 */ sll $v0, $v0, 16 -/* 0080C 80B1C10C 00021403 */ sra $v0, $v0, 16 -/* 00810 80B1C110 004F1023 */ subu $v0, $v0, $t7 -/* 00814 80B1C114 00021400 */ sll $v0, $v0, 16 -/* 00818 80B1C118 00021403 */ sra $v0, $v0, 16 -/* 0081C 80B1C11C 03021823 */ subu $v1, $t8, $v0 -/* 00820 80B1C120 00031C00 */ sll $v1, $v1, 16 -/* 00824 80B1C124 00031C03 */ sra $v1, $v1, 16 -/* 00828 80B1C128 04600003 */ bltz $v1, .L80B1C138 -/* 0082C 80B1C12C 00031023 */ subu $v0, $zero, $v1 -/* 00830 80B1C130 10000001 */ beq $zero, $zero, .L80B1C138 -/* 00834 80B1C134 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L80B1C138: -/* 00838 80B1C138 28411554 */ slti $at, $v0, 0x1554 -/* 0083C 80B1C13C 10200003 */ beq $at, $zero, .L80B1C14C -/* 00840 80B1C140 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00844 80B1C144 03E00008 */ jr $ra -/* 00848 80B1C148 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B1C14C: -/* 0084C 80B1C14C 03E00008 */ jr $ra -/* 00850 80B1C150 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C154.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C154.s deleted file mode 100644 index 0e3e273754..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C154.s +++ /dev/null @@ -1,68 +0,0 @@ -glabel func_80B1C154 -/* 00854 80B1C154 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00858 80B1C158 AFBF003C */ sw $ra, 0x003C($sp) -/* 0085C 80B1C15C AFB20038 */ sw $s2, 0x0038($sp) -/* 00860 80B1C160 AFB10034 */ sw $s1, 0x0034($sp) -/* 00864 80B1C164 AFB00030 */ sw $s0, 0x0030($sp) -/* 00868 80B1C168 F7B80028 */ sdc1 $f24, 0x0028($sp) -/* 0086C 80B1C16C F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 00870 80B1C170 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 00874 80B1C174 8CB01C64 */ lw $s0, 0x1C64($a1) ## 00001C64 -/* 00878 80B1C178 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 0087C 80B1C17C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00880 80B1C180 52000025 */ beql $s0, $zero, .L80B1C218 -/* 00884 80B1C184 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -/* 00888 80B1C188 4481C000 */ mtc1 $at, $f24 ## $f24 = 10.00 -/* 0088C 80B1C18C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00890 80B1C190 4481B000 */ mtc1 $at, $f22 ## $f22 = 40.00 -/* 00894 80B1C194 24120196 */ addiu $s2, $zero, 0x0196 ## $s2 = 00000196 -/* 00898 80B1C198 860E0000 */ lh $t6, 0x0000($s0) ## 00000000 -.L80B1C19C: -/* 0089C 80B1C19C 524E0004 */ beql $s2, $t6, .L80B1C1B0 -/* 008A0 80B1C1A0 8E2F0210 */ lw $t7, 0x0210($s1) ## 00000210 -/* 008A4 80B1C1A4 10000019 */ beq $zero, $zero, .L80B1C20C -/* 008A8 80B1C1A8 8E100124 */ lw $s0, 0x0124($s0) ## 00000124 -/* 008AC 80B1C1AC 8E2F0210 */ lw $t7, 0x0210($s1) ## 00000210 -.L80B1C1B0: -/* 008B0 80B1C1B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 008B4 80B1C1B4 560F0004 */ bnel $s0, $t7, .L80B1C1C8 -/* 008B8 80B1C1B8 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 008BC 80B1C1BC 10000013 */ beq $zero, $zero, .L80B1C20C -/* 008C0 80B1C1C0 8E100124 */ lw $s0, 0x0124($s0) ## 00000124 -/* 008C4 80B1C1C4 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -.L80B1C1C8: -/* 008C8 80B1C1C8 C6260080 */ lwc1 $f6, 0x0080($s1) ## 00000080 -/* 008CC 80B1C1CC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 008D0 80B1C1D0 0C00B6E3 */ jal func_8002DB8C -/* 008D4 80B1C1D4 46062501 */ sub.s $f20, $f4, $f6 -/* 008D8 80B1C1D8 4600B03C */ c.lt.s $f22, $f0 -/* 008DC 80B1C1DC 00000000 */ nop -/* 008E0 80B1C1E0 45010005 */ bc1t .L80B1C1F8 -/* 008E4 80B1C1E4 00000000 */ nop -/* 008E8 80B1C1E8 4614C03C */ c.lt.s $f24, $f20 -/* 008EC 80B1C1EC 00000000 */ nop -/* 008F0 80B1C1F0 45020004 */ bc1fl .L80B1C204 -/* 008F4 80B1C1F4 AE300210 */ sw $s0, 0x0210($s1) ## 00000210 -.L80B1C1F8: -/* 008F8 80B1C1F8 10000004 */ beq $zero, $zero, .L80B1C20C -/* 008FC 80B1C1FC 8E100124 */ lw $s0, 0x0124($s0) ## 00000124 -/* 00900 80B1C200 AE300210 */ sw $s0, 0x0210($s1) ## 00000210 -.L80B1C204: -/* 00904 80B1C204 10000004 */ beq $zero, $zero, .L80B1C218 -/* 00908 80B1C208 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -.L80B1C20C: -/* 0090C 80B1C20C 5600FFE3 */ bnel $s0, $zero, .L80B1C19C -/* 00910 80B1C210 860E0000 */ lh $t6, 0x0000($s0) ## 00000000 -/* 00914 80B1C214 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -.L80B1C218: -/* 00918 80B1C218 8FBF003C */ lw $ra, 0x003C($sp) -/* 0091C 80B1C21C D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 00920 80B1C220 D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 00924 80B1C224 D7B80028 */ ldc1 $f24, 0x0028($sp) -/* 00928 80B1C228 8FB00030 */ lw $s0, 0x0030($sp) -/* 0092C 80B1C22C 8FB10034 */ lw $s1, 0x0034($sp) -/* 00930 80B1C230 8FB20038 */ lw $s2, 0x0038($sp) -/* 00934 80B1C234 03E00008 */ jr $ra -/* 00938 80B1C238 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C23C.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C23C.s deleted file mode 100644 index 1db52b53ee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C23C.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80B1C23C -/* 0093C 80B1C23C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00940 80B1C240 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00944 80B1C244 8C850210 */ lw $a1, 0x0210($a0) ## 00000210 -/* 00948 80B1C248 50A00017 */ beql $a1, $zero, .L80B1C2A8 -/* 0094C 80B1C24C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00950 80B1C250 C4A40028 */ lwc1 $f4, 0x0028($a1) ## 00000028 -/* 00954 80B1C254 C4860080 */ lwc1 $f6, 0x0080($a0) ## 00000080 -/* 00958 80B1C258 AFA40020 */ sw $a0, 0x0020($sp) -/* 0095C 80B1C25C 46062201 */ sub.s $f8, $f4, $f6 -/* 00960 80B1C260 0C00B6E3 */ jal func_8002DB8C -/* 00964 80B1C264 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00968 80B1C268 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 0096C 80B1C26C 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 -/* 00970 80B1C270 8FA40020 */ lw $a0, 0x0020($sp) -/* 00974 80B1C274 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00978 80B1C278 4600503C */ c.lt.s $f10, $f0 -/* 0097C 80B1C27C C7B20018 */ lwc1 $f18, 0x0018($sp) -/* 00980 80B1C280 45030008 */ bc1tl .L80B1C2A4 -/* 00984 80B1C284 AC800210 */ sw $zero, 0x0210($a0) ## 00000210 -/* 00988 80B1C288 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 0098C 80B1C28C 00000000 */ nop -/* 00990 80B1C290 4612803C */ c.lt.s $f16, $f18 -/* 00994 80B1C294 00000000 */ nop -/* 00998 80B1C298 45020003 */ bc1fl .L80B1C2A8 -/* 0099C 80B1C29C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 009A0 80B1C2A0 AC800210 */ sw $zero, 0x0210($a0) ## 00000210 -.L80B1C2A4: -/* 009A4 80B1C2A4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B1C2A8: -/* 009A8 80B1C2A8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 009AC 80B1C2AC 03E00008 */ jr $ra -/* 009B0 80B1C2B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C2B4.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C2B4.s deleted file mode 100644 index 50d6f15d94..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C2B4.s +++ /dev/null @@ -1,87 +0,0 @@ -glabel func_80B1C2B4 -/* 009B4 80B1C2B4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 009B8 80B1C2B8 3C0F80B2 */ lui $t7, %hi(D_80B1D540) ## $t7 = 80B20000 -/* 009BC 80B1C2BC AFBF0014 */ sw $ra, 0x0014($sp) -/* 009C0 80B1C2C0 AFA50034 */ sw $a1, 0x0034($sp) -/* 009C4 80B1C2C4 25EFD540 */ addiu $t7, $t7, %lo(D_80B1D540) ## $t7 = 80B1D540 -/* 009C8 80B1C2C8 8DF90000 */ lw $t9, 0x0000($t7) ## 80B1D540 -/* 009CC 80B1C2CC 8DF80004 */ lw $t8, 0x0004($t7) ## 80B1D544 -/* 009D0 80B1C2D0 27AE0028 */ addiu $t6, $sp, 0x0028 ## $t6 = FFFFFFF8 -/* 009D4 80B1C2D4 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF8 -/* 009D8 80B1C2D8 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFFC -/* 009DC 80B1C2DC 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 009E0 80B1C2E0 C4800164 */ lwc1 $f0, 0x0164($a0) ## 00000164 -/* 009E4 80B1C2E4 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 009E8 80B1C2E8 240538B8 */ addiu $a1, $zero, 0x38B8 ## $a1 = 000038B8 -/* 009EC 80B1C2EC 46007032 */ c.eq.s $f14, $f0 -/* 009F0 80B1C2F0 00000000 */ nop -/* 009F4 80B1C2F4 45010007 */ bc1t .L80B1C314 -/* 009F8 80B1C2F8 00000000 */ nop -/* 009FC 80B1C2FC 44812000 */ mtc1 $at, $f4 ## $f4 = 25.00 -/* 00A00 80B1C300 00000000 */ nop -/* 00A04 80B1C304 46002032 */ c.eq.s $f4, $f0 -/* 00A08 80B1C308 00000000 */ nop -/* 00A0C 80B1C30C 45020006 */ bc1fl .L80B1C328 -/* 00A10 80B1C310 8C890154 */ lw $t1, 0x0154($a0) ## 00000154 -.L80B1C314: -/* 00A14 80B1C314 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00A18 80B1C318 AFA40030 */ sw $a0, 0x0030($sp) -/* 00A1C 80B1C31C 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 00A20 80B1C320 8FA40030 */ lw $a0, 0x0030($sp) -/* 00A24 80B1C324 8C890154 */ lw $t1, 0x0154($a0) ## 00000154 -.L80B1C328: -/* 00A28 80B1C328 3C080600 */ lui $t0, 0x0600 ## $t0 = 06000000 -/* 00A2C 80B1C32C 25081FA8 */ addiu $t0, $t0, 0x1FA8 ## $t0 = 06001FA8 -/* 00A30 80B1C330 11090003 */ beq $t0, $t1, .L80B1C340 -/* 00A34 80B1C334 27A20028 */ addiu $v0, $sp, 0x0028 ## $v0 = FFFFFFF8 -/* 00A38 80B1C338 10000024 */ beq $zero, $zero, .L80B1C3CC -/* 00A3C 80B1C33C 46007006 */ mov.s $f0, $f14 -.L80B1C340: -/* 00A40 80B1C340 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 00A44 80B1C344 44816000 */ mtc1 $at, $f12 ## $f12 = 12.00 -/* 00A48 80B1C348 C4820164 */ lwc1 $f2, 0x0164($a0) ## 00000164 -/* 00A4C 80B1C34C 27A30030 */ addiu $v1, $sp, 0x0030 ## $v1 = 00000000 -/* 00A50 80B1C350 C4400000 */ lwc1 $f0, 0x0000($v0) ## FFFFFFF8 -.L80B1C354: -/* 00A54 80B1C354 460C0180 */ add.s $f6, $f0, $f12 -/* 00A58 80B1C358 4606103C */ c.lt.s $f2, $f6 -/* 00A5C 80B1C35C 00000000 */ nop -/* 00A60 80B1C360 45020006 */ bc1fl .L80B1C37C -/* 00A64 80B1C364 24420004 */ addiu $v0, $v0, 0x0004 ## $v0 = FFFFFFFC -/* 00A68 80B1C368 4602003E */ c.le.s $f0, $f2 -/* 00A6C 80B1C36C 00000000 */ nop -/* 00A70 80B1C370 45030005 */ bc1tl .L80B1C388 -/* 00A74 80B1C374 27AA0030 */ addiu $t2, $sp, 0x0030 ## $t2 = 00000000 -/* 00A78 80B1C378 24420004 */ addiu $v0, $v0, 0x0004 ## $v0 = 00000000 -.L80B1C37C: -/* 00A7C 80B1C37C 5443FFF5 */ bnel $v0, $v1, .L80B1C354 -/* 00A80 80B1C380 C4400000 */ lwc1 $f0, 0x0000($v0) ## 00000000 -/* 00A84 80B1C384 27AA0030 */ addiu $t2, $sp, 0x0030 ## $t2 = 00000000 -.L80B1C388: -/* 00A88 80B1C388 004A082B */ sltu $at, $v0, $t2 -/* 00A8C 80B1C38C 54200004 */ bnel $at, $zero, .L80B1C3A0 -/* 00A90 80B1C390 C4480000 */ lwc1 $f8, 0x0000($v0) ## 00000000 -/* 00A94 80B1C394 1000000D */ beq $zero, $zero, .L80B1C3CC -/* 00A98 80B1C398 46007006 */ mov.s $f0, $f14 -/* 00A9C 80B1C39C C4480000 */ lwc1 $f8, 0x0000($v0) ## 00000000 -.L80B1C3A0: -/* 00AA0 80B1C3A0 3C0180B2 */ lui $at, %hi(D_80B1D638) ## $at = 80B20000 -/* 00AA4 80B1C3A4 C430D638 */ lwc1 $f16, %lo(D_80B1D638)($at) -/* 00AA8 80B1C3A8 46081281 */ sub.s $f10, $f2, $f8 -/* 00AAC 80B1C3AC 46105082 */ mul.s $f2, $f10, $f16 -/* 00AB0 80B1C3B0 4600148D */ trunc.w.s $f18, $f2 -/* 00AB4 80B1C3B4 44049000 */ mfc1 $a0, $f18 -/* 00AB8 80B1C3B8 00000000 */ nop -/* 00ABC 80B1C3BC 00042400 */ sll $a0, $a0, 16 -/* 00AC0 80B1C3C0 0C01DE1C */ jal Math_Sins - ## sins? -/* 00AC4 80B1C3C4 00042403 */ sra $a0, $a0, 16 -/* 00AC8 80B1C3C8 46000000 */ add.s $f0, $f0, $f0 -.L80B1C3CC: -/* 00ACC 80B1C3CC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00AD0 80B1C3D0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00AD4 80B1C3D4 03E00008 */ jr $ra -/* 00AD8 80B1C3D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C3DC.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C3DC.s deleted file mode 100644 index 95de9f79df..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C3DC.s +++ /dev/null @@ -1,99 +0,0 @@ -glabel func_80B1C3DC -/* 00ADC 80B1C3DC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00AE0 80B1C3E0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00AE4 80B1C3E4 AFB00020 */ sw $s0, 0x0020($sp) -/* 00AE8 80B1C3E8 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 00AEC 80B1C3EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AF0 80B1C3F0 3C040001 */ lui $a0, 0x0001 ## $a0 = 00010000 -/* 00AF4 80B1C3F4 05C10003 */ bgez $t6, .L80B1C404 -/* 00AF8 80B1C3F8 00852021 */ addu $a0, $a0, $a1 -/* 00AFC 80B1C3FC 1000004E */ beq $zero, $zero, .L80B1C538 -/* 00B00 80B1C400 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B1C404: -/* 00B04 80B1C404 8C841E08 */ lw $a0, 0x1E08($a0) ## 00011E08 -/* 00B08 80B1C408 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 00B0C 80B1C40C 860A0228 */ lh $t2, 0x0228($s0) ## 00000228 -/* 00B10 80B1C410 8C830004 */ lw $v1, 0x0004($a0) ## 00010004 -/* 00B14 80B1C414 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00B18 80B1C418 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00B1C 80B1C41C 00037900 */ sll $t7, $v1, 4 -/* 00B20 80B1C420 000FC702 */ srl $t8, $t7, 28 -/* 00B24 80B1C424 0018C880 */ sll $t9, $t8, 2 -/* 00B28 80B1C428 01194021 */ addu $t0, $t0, $t9 -/* 00B2C 80B1C42C 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 -/* 00B30 80B1C430 00614824 */ and $t1, $v1, $at -/* 00B34 80B1C434 000A5880 */ sll $t3, $t2, 2 -/* 00B38 80B1C438 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00B3C 80B1C43C 016A5823 */ subu $t3, $t3, $t2 -/* 00B40 80B1C440 01091021 */ addu $v0, $t0, $t1 -/* 00B44 80B1C444 00411021 */ addu $v0, $v0, $at -/* 00B48 80B1C448 000B5840 */ sll $t3, $t3, 1 -/* 00B4C 80B1C44C 004B1021 */ addu $v0, $v0, $t3 -/* 00B50 80B1C450 844C0000 */ lh $t4, 0x0000($v0) ## 00000001 -/* 00B54 80B1C454 844D0004 */ lh $t5, 0x0004($v0) ## 00000005 -/* 00B58 80B1C458 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 00B5C 80B1C45C 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 00B60 80B1C460 448D5000 */ mtc1 $t5, $f10 ## $f10 = 0.00 -/* 00B64 80B1C464 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 00B68 80B1C468 468021A0 */ cvt.s.w $f6, $f4 -/* 00B6C 80B1C46C AFA40034 */ sw $a0, 0x0034($sp) -/* 00B70 80B1C470 46805420 */ cvt.s.w $f16, $f10 -/* 00B74 80B1C474 46083301 */ sub.s $f12, $f6, $f8 -/* 00B78 80B1C478 46128381 */ sub.s $f14, $f16, $f18 -/* 00B7C 80B1C47C E7AC002C */ swc1 $f12, 0x002C($sp) -/* 00B80 80B1C480 0C03F494 */ jal func_800FD250 -/* 00B84 80B1C484 E7AE0028 */ swc1 $f14, 0x0028($sp) -/* 00B88 80B1C488 3C0180B2 */ lui $at, %hi(D_80B1D63C) ## $at = 80B20000 -/* 00B8C 80B1C48C C424D63C */ lwc1 $f4, %lo(D_80B1D63C)($at) -/* 00B90 80B1C490 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00B94 80B1C494 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00B98 80B1C498 46040182 */ mul.s $f6, $f0, $f4 -/* 00B9C 80B1C49C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 00BA0 80B1C4A0 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 00BA4 80B1C4A4 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 00BA8 80B1C4A8 4600320D */ trunc.w.s $f8, $f6 -/* 00BAC 80B1C4AC 44054000 */ mfc1 $a1, $f8 -/* 00BB0 80B1C4B0 00000000 */ nop -/* 00BB4 80B1C4B4 00052C00 */ sll $a1, $a1, 16 -/* 00BB8 80B1C4B8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00BBC 80B1C4BC 00052C03 */ sra $a1, $a1, 16 -/* 00BC0 80B1C4C0 C7AC002C */ lwc1 $f12, 0x002C($sp) -/* 00BC4 80B1C4C4 C7AE0028 */ lwc1 $f14, 0x0028($sp) -/* 00BC8 80B1C4C8 8A1900B4 */ lwl $t9, 0x00B4($s0) ## 000000B4 -/* 00BCC 80B1C4CC 460C6282 */ mul.s $f10, $f12, $f12 -/* 00BD0 80B1C4D0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00BD4 80B1C4D4 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 00BD8 80B1C4D8 460E7402 */ mul.s $f16, $f14, $f14 -/* 00BDC 80B1C4DC 9A1900B7 */ lwr $t9, 0x00B7($s0) ## 000000B7 -/* 00BE0 80B1C4E0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00BE4 80B1C4E4 AA190030 */ swl $t9, 0x0030($s0) ## 00000030 -/* 00BE8 80B1C4E8 BA190033 */ swr $t9, 0x0033($s0) ## 00000033 -/* 00BEC 80B1C4EC 961900B8 */ lhu $t9, 0x00B8($s0) ## 000000B8 -/* 00BF0 80B1C4F0 46105480 */ add.s $f18, $f10, $f16 -/* 00BF4 80B1C4F4 A6190034 */ sh $t9, 0x0034($s0) ## 00000034 -/* 00BF8 80B1C4F8 4604903C */ c.lt.s $f18, $f4 -/* 00BFC 80B1C4FC 00000000 */ nop -/* 00C00 80B1C500 4500000D */ bc1f .L80B1C538 -/* 00C04 80B1C504 00000000 */ nop -/* 00C08 80B1C508 86080228 */ lh $t0, 0x0228($s0) ## 00000228 -/* 00C0C 80B1C50C 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 00C10 80B1C510 A6090228 */ sh $t1, 0x0228($s0) ## 00000228 -/* 00C14 80B1C514 8FAB0034 */ lw $t3, 0x0034($sp) -/* 00C18 80B1C518 860A0228 */ lh $t2, 0x0228($s0) ## 00000228 -/* 00C1C 80B1C51C 916C0000 */ lbu $t4, 0x0000($t3) ## 00000000 -/* 00C20 80B1C520 014C082A */ slt $at, $t2, $t4 -/* 00C24 80B1C524 14200002 */ bne $at, $zero, .L80B1C530 -/* 00C28 80B1C528 00000000 */ nop -/* 00C2C 80B1C52C A6000228 */ sh $zero, 0x0228($s0) ## 00000228 -.L80B1C530: -/* 00C30 80B1C530 10000001 */ beq $zero, $zero, .L80B1C538 -/* 00C34 80B1C534 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B1C538: -/* 00C38 80B1C538 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00C3C 80B1C53C 8FB00020 */ lw $s0, 0x0020($sp) -/* 00C40 80B1C540 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00C44 80B1C544 03E00008 */ jr $ra -/* 00C48 80B1C548 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C54C.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C54C.s deleted file mode 100644 index 5cbdbbe679..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C54C.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80B1C54C -/* 00C4C 80B1C54C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C50 80B1C550 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C54 80B1C554 AFA5001C */ sw $a1, 0x001C($sp) -/* 00C58 80B1C558 0C01B0D8 */ jal func_8006C360 -/* 00C5C 80B1C55C 2405000E */ addiu $a1, $zero, 0x000E ## $a1 = 0000000E -/* 00C60 80B1C560 10400003 */ beq $v0, $zero, .L80B1C570 -/* 00C64 80B1C564 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000 -/* 00C68 80B1C568 10000009 */ beq $zero, $zero, .L80B1C590 -/* 00C6C 80B1C56C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L80B1C570: -/* 00C70 80B1C570 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00C74 80B1C574 95CEF572 */ lhu $t6, -0x0A8E($t6) ## 8015F572 -/* 00C78 80B1C578 24025018 */ addiu $v0, $zero, 0x5018 ## $v0 = 00005018 -/* 00C7C 80B1C57C 31CF0200 */ andi $t7, $t6, 0x0200 ## $t7 = 00000000 -/* 00C80 80B1C580 11E00003 */ beq $t7, $zero, .L80B1C590 -/* 00C84 80B1C584 00000000 */ nop -/* 00C88 80B1C588 10000001 */ beq $zero, $zero, .L80B1C590 -/* 00C8C 80B1C58C 24025019 */ addiu $v0, $zero, 0x5019 ## $v0 = 00005019 -.L80B1C590: -/* 00C90 80B1C590 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C94 80B1C594 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C98 80B1C598 03E00008 */ jr $ra -/* 00C9C 80B1C59C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C5A0.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C5A0.s deleted file mode 100644 index 7adea6a832..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C5A0.s +++ /dev/null @@ -1,117 +0,0 @@ -glabel func_80B1C5A0 -/* 00CA0 80B1C5A0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00CA4 80B1C5A4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00CA8 80B1C5A8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00CAC 80B1C5AC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00CB0 80B1C5B0 AFAE001C */ sw $t6, 0x001C($sp) -/* 00CB4 80B1C5B4 AFA70020 */ sw $a3, 0x0020($sp) -/* 00CB8 80B1C5B8 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 00CBC 80B1C5BC 0C042F6F */ jal func_8010BDBC -/* 00CC0 80B1C5C0 AFA50024 */ sw $a1, 0x0024($sp) -/* 00CC4 80B1C5C4 2C41000A */ sltiu $at, $v0, 0x000A -/* 00CC8 80B1C5C8 8FA60024 */ lw $a2, 0x0024($sp) -/* 00CCC 80B1C5CC 10200055 */ beq $at, $zero, .L80B1C724 -/* 00CD0 80B1C5D0 8FA70020 */ lw $a3, 0x0020($sp) -/* 00CD4 80B1C5D4 00027880 */ sll $t7, $v0, 2 -/* 00CD8 80B1C5D8 3C0180B2 */ lui $at, %hi(jtbl_80B1D640) ## $at = 80B20000 -/* 00CDC 80B1C5DC 002F0821 */ addu $at, $at, $t7 -/* 00CE0 80B1C5E0 8C2FD640 */ lw $t7, %lo(jtbl_80B1D640)($at) -/* 00CE4 80B1C5E4 01E00008 */ jr $t7 -/* 00CE8 80B1C5E8 00000000 */ nop -glabel L80B1C5EC -/* 00CEC 80B1C5EC 94D8010E */ lhu $t8, 0x010E($a2) ## 0000010E -/* 00CF0 80B1C5F0 24015028 */ addiu $at, $zero, 0x5028 ## $at = 00005028 -/* 00CF4 80B1C5F4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00CF8 80B1C5F8 17010004 */ bne $t8, $at, .L80B1C60C -/* 00CFC 80B1C5FC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 00D00 80B1C600 94790F12 */ lhu $t9, 0x0F12($v1) ## 8015F572 -/* 00D04 80B1C604 37280100 */ ori $t0, $t9, 0x0100 ## $t0 = 00000100 -/* 00D08 80B1C608 A4680F12 */ sh $t0, 0x0F12($v1) ## 8015F572 -.L80B1C60C: -/* 00D0C 80B1C60C 10000045 */ beq $zero, $zero, .L80B1C724 -/* 00D10 80B1C610 AFA0001C */ sw $zero, 0x001C($sp) -glabel L80B1C614 -/* 00D14 80B1C614 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00D18 80B1C618 AFA60024 */ sw $a2, 0x0024($sp) -/* 00D1C 80B1C61C 0C041AF2 */ jal func_80106BC8 -/* 00D20 80B1C620 AFA70020 */ sw $a3, 0x0020($sp) -/* 00D24 80B1C624 8FA60024 */ lw $a2, 0x0024($sp) -/* 00D28 80B1C628 1040003E */ beq $v0, $zero, .L80B1C724 -/* 00D2C 80B1C62C 8FA70020 */ lw $a3, 0x0020($sp) -/* 00D30 80B1C630 94C2010E */ lhu $v0, 0x010E($a2) ## 0000010E -/* 00D34 80B1C634 24015018 */ addiu $at, $zero, 0x5018 ## $at = 00005018 -/* 00D38 80B1C638 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 -/* 00D3C 80B1C63C 10410004 */ beq $v0, $at, .L80B1C650 -/* 00D40 80B1C640 01274821 */ addu $t1, $t1, $a3 -/* 00D44 80B1C644 24015019 */ addiu $at, $zero, 0x5019 ## $at = 00005019 -/* 00D48 80B1C648 54410037 */ bnel $v0, $at, .L80B1C728 -/* 00D4C 80B1C64C 87A2001E */ lh $v0, 0x001E($sp) -.L80B1C650: -/* 00D50 80B1C650 912904BD */ lbu $t1, 0x04BD($t1) ## 000104BD -/* 00D54 80B1C654 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00D58 80B1C658 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00D5C 80B1C65C 15210004 */ bne $t1, $at, .L80B1C670 -/* 00D60 80B1C660 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00D64 80B1C664 240A0084 */ addiu $t2, $zero, 0x0084 ## $t2 = 00000084 -/* 00D68 80B1C668 10000016 */ beq $zero, $zero, .L80B1C6C4 -/* 00D6C 80B1C66C A4CA010E */ sh $t2, 0x010E($a2) ## 0000010E -.L80B1C670: -/* 00D70 80B1C670 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 00D74 80B1C674 846B0034 */ lh $t3, 0x0034($v1) ## 8015E694 -/* 00D78 80B1C678 240C0085 */ addiu $t4, $zero, 0x0085 ## $t4 = 00000085 -/* 00D7C 80B1C67C 240D0037 */ addiu $t5, $zero, 0x0037 ## $t5 = 00000037 -/* 00D80 80B1C680 2961000A */ slti $at, $t3, 0x000A -/* 00D84 80B1C684 50200004 */ beql $at, $zero, .L80B1C698 -/* 00D88 80B1C688 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00D8C 80B1C68C 1000000D */ beq $zero, $zero, .L80B1C6C4 -/* 00D90 80B1C690 A4CC010E */ sh $t4, 0x010E($a2) ## 0000010E -/* 00D94 80B1C694 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -.L80B1C698: -/* 00D98 80B1C698 00270821 */ addu $at, $at, $a3 -/* 00D9C 80B1C69C A02D03DC */ sb $t5, 0x03DC($at) ## 000103DC -/* 00DA0 80B1C6A0 0C021CC3 */ jal Rupees_ChangeBy -/* 00DA4 80B1C6A4 2404FFF6 */ addiu $a0, $zero, 0xFFF6 ## $a0 = FFFFFFF6 -/* 00DA8 80B1C6A8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00DAC 80B1C6AC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 00DB0 80B1C6B0 946E0F12 */ lhu $t6, 0x0F12($v1) ## 8015F572 -/* 00DB4 80B1C6B4 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -/* 00DB8 80B1C6B8 35CF0200 */ ori $t7, $t6, 0x0200 ## $t7 = 00000200 -/* 00DBC 80B1C6BC 1000001A */ beq $zero, $zero, .L80B1C728 -/* 00DC0 80B1C6C0 A46F0F12 */ sh $t7, 0x0F12($v1) ## 8015F572 -.L80B1C6C4: -/* 00DC4 80B1C6C4 0C042DC8 */ jal func_8010B720 -/* 00DC8 80B1C6C8 94C5010E */ lhu $a1, 0x010E($a2) ## 0000010E -/* 00DCC 80B1C6CC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00DD0 80B1C6D0 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 00DD4 80B1C6D4 94780F12 */ lhu $t8, 0x0F12($v1) ## 8015F572 -/* 00DD8 80B1C6D8 37190200 */ ori $t9, $t8, 0x0200 ## $t9 = 00000200 -/* 00DDC 80B1C6DC 10000011 */ beq $zero, $zero, .L80B1C724 -/* 00DE0 80B1C6E0 A4790F12 */ sh $t9, 0x0F12($v1) ## 8015F572 -glabel L80B1C6E4 -/* 00DE4 80B1C6E4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00DE8 80B1C6E8 AFA60024 */ sw $a2, 0x0024($sp) -/* 00DEC 80B1C6EC 0C041AF2 */ jal func_80106BC8 -/* 00DF0 80B1C6F0 AFA70020 */ sw $a3, 0x0020($sp) -/* 00DF4 80B1C6F4 8FA60024 */ lw $a2, 0x0024($sp) -/* 00DF8 80B1C6F8 1040000A */ beq $v0, $zero, .L80B1C724 -/* 00DFC 80B1C6FC 8FA70020 */ lw $a3, 0x0020($sp) -/* 00E00 80B1C700 94C2010E */ lhu $v0, 0x010E($a2) ## 0000010E -/* 00E04 80B1C704 24010084 */ addiu $at, $zero, 0x0084 ## $at = 00000084 -/* 00E08 80B1C708 10410003 */ beq $v0, $at, .L80B1C718 -/* 00E0C 80B1C70C 24010085 */ addiu $at, $zero, 0x0085 ## $at = 00000085 -/* 00E10 80B1C710 54410005 */ bnel $v0, $at, .L80B1C728 -/* 00E14 80B1C714 87A2001E */ lh $v0, 0x001E($sp) -.L80B1C718: -/* 00E18 80B1C718 0C041B33 */ jal func_80106CCC -/* 00E1C 80B1C71C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00E20 80B1C720 AFA0001C */ sw $zero, 0x001C($sp) -glabel L80B1C724 -.L80B1C724: -/* 00E24 80B1C724 87A2001E */ lh $v0, 0x001E($sp) -.L80B1C728: -/* 00E28 80B1C728 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00E2C 80B1C72C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00E30 80B1C730 03E00008 */ jr $ra -/* 00E34 80B1C734 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C738.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C738.s deleted file mode 100644 index 73a3a42ce7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C738.s +++ /dev/null @@ -1,131 +0,0 @@ -glabel func_80B1C738 -/* 00E38 80B1C738 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00E3C 80B1C73C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00E40 80B1C740 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00E44 80B1C744 AFA40018 */ sw $a0, 0x0018($sp) -/* 00E48 80B1C748 3C0180B2 */ lui $at, %hi(D_80B1D668) ## $at = 80B20000 -/* 00E4C 80B1C74C C424D668 */ lwc1 $f4, %lo(D_80B1D668)($at) -/* 00E50 80B1C750 8FA50018 */ lw $a1, 0x0018($sp) -/* 00E54 80B1C754 3C0180B2 */ lui $at, %hi(D_80B1D670) ## $at = 80B20000 -/* 00E58 80B1C758 4604003C */ c.lt.s $f0, $f4 -/* 00E5C 80B1C75C 00000000 */ nop -/* 00E60 80B1C760 45000003 */ bc1f .L80B1C770 -/* 00E64 80B1C764 00000000 */ nop -/* 00E68 80B1C768 10000012 */ beq $zero, $zero, .L80B1C7B4 -/* 00E6C 80B1C76C 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -.L80B1C770: -/* 00E70 80B1C770 D426D670 */ ldc1 $f6, %lo(D_80B1D670)($at) -/* 00E74 80B1C774 460000A1 */ cvt.d.s $f2, $f0 -/* 00E78 80B1C778 3C0180B2 */ lui $at, %hi(D_80B1D678) ## $at = 80B20000 -/* 00E7C 80B1C77C 4626103C */ c.lt.d $f2, $f6 -/* 00E80 80B1C780 00000000 */ nop -/* 00E84 80B1C784 45000003 */ bc1f .L80B1C794 -/* 00E88 80B1C788 00000000 */ nop -/* 00E8C 80B1C78C 10000009 */ beq $zero, $zero, .L80B1C7B4 -/* 00E90 80B1C790 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -.L80B1C794: -/* 00E94 80B1C794 D428D678 */ ldc1 $f8, %lo(D_80B1D678)($at) -/* 00E98 80B1C798 24040003 */ addiu $a0, $zero, 0x0003 ## $a0 = 00000003 -/* 00E9C 80B1C79C 4628103C */ c.lt.d $f2, $f8 -/* 00EA0 80B1C7A0 00000000 */ nop -/* 00EA4 80B1C7A4 45000003 */ bc1f .L80B1C7B4 -/* 00EA8 80B1C7A8 00000000 */ nop -/* 00EAC 80B1C7AC 10000001 */ beq $zero, $zero, .L80B1C7B4 -/* 00EB0 80B1C7B0 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 -.L80B1C7B4: -/* 00EB4 80B1C7B4 10800009 */ beq $a0, $zero, .L80B1C7DC -/* 00EB8 80B1C7B8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00EBC 80B1C7BC 1081000E */ beq $a0, $at, .L80B1C7F8 -/* 00EC0 80B1C7C0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00EC4 80B1C7C4 10810015 */ beq $a0, $at, .L80B1C81C -/* 00EC8 80B1C7C8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00ECC 80B1C7CC 5081001D */ beql $a0, $at, .L80B1C844 -/* 00ED0 80B1C7D0 90A3020C */ lbu $v1, 0x020C($a1) ## 0000020C -/* 00ED4 80B1C7D4 10000021 */ beq $zero, $zero, .L80B1C85C -/* 00ED8 80B1C7D8 90A30209 */ lbu $v1, 0x0209($a1) ## 00000209 -.L80B1C7DC: -/* 00EDC 80B1C7DC 90A30209 */ lbu $v1, 0x0209($a1) ## 00000209 -/* 00EE0 80B1C7E0 00801025 */ or $v0, $a0, $zero ## $v0 = 00000002 -/* 00EE4 80B1C7E4 28610008 */ slti $at, $v1, 0x0008 -/* 00EE8 80B1C7E8 1020001C */ beq $at, $zero, .L80B1C85C -/* 00EEC 80B1C7EC 246E0001 */ addiu $t6, $v1, 0x0001 ## $t6 = 00000001 -/* 00EF0 80B1C7F0 1000003B */ beq $zero, $zero, .L80B1C8E0 -/* 00EF4 80B1C7F4 A0AE0209 */ sb $t6, 0x0209($a1) ## 00000209 -.L80B1C7F8: -/* 00EF8 80B1C7F8 90A3020A */ lbu $v1, 0x020A($a1) ## 0000020A -/* 00EFC 80B1C7FC 00801025 */ or $v0, $a0, $zero ## $v0 = 00000002 -/* 00F00 80B1C800 28610004 */ slti $at, $v1, 0x0004 -/* 00F04 80B1C804 10200003 */ beq $at, $zero, .L80B1C814 -/* 00F08 80B1C808 246F0001 */ addiu $t7, $v1, 0x0001 ## $t7 = 00000001 -/* 00F0C 80B1C80C 10000034 */ beq $zero, $zero, .L80B1C8E0 -/* 00F10 80B1C810 A0AF020A */ sb $t7, 0x020A($a1) ## 0000020A -.L80B1C814: -/* 00F14 80B1C814 10000011 */ beq $zero, $zero, .L80B1C85C -/* 00F18 80B1C818 90A30209 */ lbu $v1, 0x0209($a1) ## 00000209 -.L80B1C81C: -/* 00F1C 80B1C81C 90A3020B */ lbu $v1, 0x020B($a1) ## 0000020B -/* 00F20 80B1C820 00801025 */ or $v0, $a0, $zero ## $v0 = 00000002 -/* 00F24 80B1C824 28610002 */ slti $at, $v1, 0x0002 -/* 00F28 80B1C828 10200003 */ beq $at, $zero, .L80B1C838 -/* 00F2C 80B1C82C 24780001 */ addiu $t8, $v1, 0x0001 ## $t8 = 00000001 -/* 00F30 80B1C830 1000002B */ beq $zero, $zero, .L80B1C8E0 -/* 00F34 80B1C834 A0B8020B */ sb $t8, 0x020B($a1) ## 0000020B -.L80B1C838: -/* 00F38 80B1C838 10000008 */ beq $zero, $zero, .L80B1C85C -/* 00F3C 80B1C83C 90A30209 */ lbu $v1, 0x0209($a1) ## 00000209 -/* 00F40 80B1C840 90A3020C */ lbu $v1, 0x020C($a1) ## 0000020C -.L80B1C844: -/* 00F44 80B1C844 00801025 */ or $v0, $a0, $zero ## $v0 = 00000002 -/* 00F48 80B1C848 1C600003 */ bgtz $v1, .L80B1C858 -/* 00F4C 80B1C84C 24790001 */ addiu $t9, $v1, 0x0001 ## $t9 = 00000001 -/* 00F50 80B1C850 10000023 */ beq $zero, $zero, .L80B1C8E0 -/* 00F54 80B1C854 A0B9020C */ sb $t9, 0x020C($a1) ## 0000020C -.L80B1C858: -/* 00F58 80B1C858 90A30209 */ lbu $v1, 0x0209($a1) ## 00000209 -.L80B1C85C: -/* 00F5C 80B1C85C 28610008 */ slti $at, $v1, 0x0008 -/* 00F60 80B1C860 10200004 */ beq $at, $zero, .L80B1C874 -/* 00F64 80B1C864 24680001 */ addiu $t0, $v1, 0x0001 ## $t0 = 00000001 -/* 00F68 80B1C868 A0A80209 */ sb $t0, 0x0209($a1) ## 00000209 -/* 00F6C 80B1C86C 1000001B */ beq $zero, $zero, .L80B1C8DC -/* 00F70 80B1C870 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -.L80B1C874: -/* 00F74 80B1C874 90A3020A */ lbu $v1, 0x020A($a1) ## 0000020A -/* 00F78 80B1C878 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 00F7C 80B1C87C 28610004 */ slti $at, $v1, 0x0004 -/* 00F80 80B1C880 10200003 */ beq $at, $zero, .L80B1C890 -/* 00F84 80B1C884 24690001 */ addiu $t1, $v1, 0x0001 ## $t1 = 00000001 -/* 00F88 80B1C888 10000014 */ beq $zero, $zero, .L80B1C8DC -/* 00F8C 80B1C88C A0A9020A */ sb $t1, 0x020A($a1) ## 0000020A -.L80B1C890: -/* 00F90 80B1C890 90A3020B */ lbu $v1, 0x020B($a1) ## 0000020B -/* 00F94 80B1C894 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 -/* 00F98 80B1C898 28610002 */ slti $at, $v1, 0x0002 -/* 00F9C 80B1C89C 10200003 */ beq $at, $zero, .L80B1C8AC -/* 00FA0 80B1C8A0 246A0001 */ addiu $t2, $v1, 0x0001 ## $t2 = 00000001 -/* 00FA4 80B1C8A4 1000000D */ beq $zero, $zero, .L80B1C8DC -/* 00FA8 80B1C8A8 A0AA020B */ sb $t2, 0x020B($a1) ## 0000020B -.L80B1C8AC: -/* 00FAC 80B1C8AC 90A3020C */ lbu $v1, 0x020C($a1) ## 0000020C -/* 00FB0 80B1C8B0 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 00FB4 80B1C8B4 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 00FB8 80B1C8B8 1C600004 */ bgtz $v1, .L80B1C8CC -/* 00FBC 80B1C8BC 246B0001 */ addiu $t3, $v1, 0x0001 ## $t3 = 00000001 -/* 00FC0 80B1C8C0 A0AB020C */ sb $t3, 0x020C($a1) ## 0000020C -/* 00FC4 80B1C8C4 10000005 */ beq $zero, $zero, .L80B1C8DC -/* 00FC8 80B1C8C8 24040003 */ addiu $a0, $zero, 0x0003 ## $a0 = 00000003 -.L80B1C8CC: -/* 00FCC 80B1C8CC A0AC0209 */ sb $t4, 0x0209($a1) ## 00000209 -/* 00FD0 80B1C8D0 A0A0020A */ sb $zero, 0x020A($a1) ## 0000020A -/* 00FD4 80B1C8D4 A0A0020B */ sb $zero, 0x020B($a1) ## 0000020B -/* 00FD8 80B1C8D8 A0A0020C */ sb $zero, 0x020C($a1) ## 0000020C -.L80B1C8DC: -/* 00FDC 80B1C8DC 00801025 */ or $v0, $a0, $zero ## $v0 = 00000003 -.L80B1C8E0: -/* 00FE0 80B1C8E0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00FE4 80B1C8E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00FE8 80B1C8E8 03E00008 */ jr $ra -/* 00FEC 80B1C8EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C8F0.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C8F0.s deleted file mode 100644 index 5afdb12925..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C8F0.s +++ /dev/null @@ -1,99 +0,0 @@ -glabel func_80B1C8F0 -/* 00FF0 80B1C8F0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00FF4 80B1C8F4 3C0F80B2 */ lui $t7, %hi(D_80B1D548) ## $t7 = 80B20000 -/* 00FF8 80B1C8F8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00FFC 80B1C8FC AFB00020 */ sw $s0, 0x0020($sp) -/* 01000 80B1C900 25EFD548 */ addiu $t7, $t7, %lo(D_80B1D548) ## $t7 = 80B1D548 -/* 01004 80B1C904 8DF90000 */ lw $t9, 0x0000($t7) ## 80B1D548 -/* 01008 80B1C908 27AE0044 */ addiu $t6, $sp, 0x0044 ## $t6 = FFFFFFF4 -/* 0100C 80B1C90C 8DF80004 */ lw $t8, 0x0004($t7) ## 80B1D54C -/* 01010 80B1C910 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF4 -/* 01014 80B1C914 8DF90008 */ lw $t9, 0x0008($t7) ## 80B1D550 -/* 01018 80B1C918 3C0980B2 */ lui $t1, %hi(D_80B1D554) ## $t1 = 80B20000 -/* 0101C 80B1C91C 2529D554 */ addiu $t1, $t1, %lo(D_80B1D554) ## $t1 = 80B1D554 -/* 01020 80B1C920 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF8 -/* 01024 80B1C924 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFFC -/* 01028 80B1C928 8D2B0000 */ lw $t3, 0x0000($t1) ## 80B1D554 -/* 0102C 80B1C92C 27A80038 */ addiu $t0, $sp, 0x0038 ## $t0 = FFFFFFE8 -/* 01030 80B1C930 8D2A0004 */ lw $t2, 0x0004($t1) ## 80B1D558 -/* 01034 80B1C934 AD0B0000 */ sw $t3, 0x0000($t0) ## FFFFFFE8 -/* 01038 80B1C938 8D2B0008 */ lw $t3, 0x0008($t1) ## 80B1D55C -/* 0103C 80B1C93C 3C0D80B2 */ lui $t5, %hi(D_80B1D560) ## $t5 = 80B20000 -/* 01040 80B1C940 25ADD560 */ addiu $t5, $t5, %lo(D_80B1D560) ## $t5 = 80B1D560 -/* 01044 80B1C944 AD0A0004 */ sw $t2, 0x0004($t0) ## FFFFFFEC -/* 01048 80B1C948 AD0B0008 */ sw $t3, 0x0008($t0) ## FFFFFFF0 -/* 0104C 80B1C94C 8DAF0000 */ lw $t7, 0x0000($t5) ## 80B1D560 -/* 01050 80B1C950 27AC002C */ addiu $t4, $sp, 0x002C ## $t4 = FFFFFFDC -/* 01054 80B1C954 8DAE0004 */ lw $t6, 0x0004($t5) ## 80B1D564 -/* 01058 80B1C958 AD8F0000 */ sw $t7, 0x0000($t4) ## FFFFFFDC -/* 0105C 80B1C95C 8DAF0008 */ lw $t7, 0x0008($t5) ## 80B1D568 -/* 01060 80B1C960 3C014200 */ lui $at, 0x4200 ## $at = 42000000 -/* 01064 80B1C964 AD8E0004 */ sw $t6, 0x0004($t4) ## FFFFFFE0 -/* 01068 80B1C968 AD8F0008 */ sw $t7, 0x0008($t4) ## FFFFFFE4 -/* 0106C 80B1C96C C4800164 */ lwc1 $f0, 0x0164($a0) ## 00000164 -/* 01070 80B1C970 44812000 */ mtc1 $at, $f4 ## $f4 = 32.00 -/* 01074 80B1C974 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01078 80B1C978 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 0107C 80B1C97C 4600203E */ c.le.s $f4, $f0 -/* 01080 80B1C980 00000000 */ nop -/* 01084 80B1C984 45020032 */ bc1fl .L80B1CA50 -/* 01088 80B1C988 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0108C 80B1C98C 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 -/* 01090 80B1C990 00000000 */ nop -/* 01094 80B1C994 4606003C */ c.lt.s $f0, $f6 -/* 01098 80B1C998 00000000 */ nop -/* 0109C 80B1C99C 4502002C */ bc1fl .L80B1CA50 -/* 010A0 80B1C9A0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 010A4 80B1C9A4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 010A8 80B1C9A8 00000000 */ nop -/* 010AC 80B1C9AC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 010B0 80B1C9B0 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 010B4 80B1C9B4 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 010B8 80B1C9B8 44818000 */ mtc1 $at, $f16 ## $f16 = 12.00 -/* 010BC 80B1C9BC 46080281 */ sub.s $f10, $f0, $f8 -/* 010C0 80B1C9C0 C6040304 */ lwc1 $f4, 0x0304($s0) ## 00000304 -/* 010C4 80B1C9C4 46105482 */ mul.s $f18, $f10, $f16 -/* 010C8 80B1C9C8 46049180 */ add.s $f6, $f18, $f4 -/* 010CC 80B1C9CC 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 010D0 80B1C9D0 E7A60044 */ swc1 $f6, 0x0044($sp) -/* 010D4 80B1C9D4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 010D8 80B1C9D8 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 010DC 80B1C9DC 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 010E0 80B1C9E0 44818000 */ mtc1 $at, $f16 ## $f16 = 8.00 -/* 010E4 80B1C9E4 46080281 */ sub.s $f10, $f0, $f8 -/* 010E8 80B1C9E8 C6040308 */ lwc1 $f4, 0x0308($s0) ## 00000308 -/* 010EC 80B1C9EC 46105482 */ mul.s $f18, $f10, $f16 -/* 010F0 80B1C9F0 46049180 */ add.s $f6, $f18, $f4 -/* 010F4 80B1C9F4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 010F8 80B1C9F8 E7A60048 */ swc1 $f6, 0x0048($sp) -/* 010FC 80B1C9FC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01100 80B1CA00 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 01104 80B1CA04 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 01108 80B1CA08 44818000 */ mtc1 $at, $f16 ## $f16 = 12.00 -/* 0110C 80B1CA0C 46080281 */ sub.s $f10, $f0, $f8 -/* 01110 80B1CA10 C604030C */ lwc1 $f4, 0x030C($s0) ## 0000030C -/* 01114 80B1CA14 3C0180B2 */ lui $at, %hi(D_80B1D680) ## $at = 80B20000 -/* 01118 80B1CA18 C428D680 */ lwc1 $f8, %lo(D_80B1D680)($at) -/* 0111C 80B1CA1C 46105482 */ mul.s $f18, $f10, $f16 -/* 01120 80B1CA20 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 01124 80B1CA24 3C073E4C */ lui $a3, 0x3E4C ## $a3 = 3E4C0000 -/* 01128 80B1CA28 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD -/* 0112C 80B1CA2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01130 80B1CA30 27A50044 */ addiu $a1, $sp, 0x0044 ## $a1 = FFFFFFF4 -/* 01134 80B1CA34 2406000C */ addiu $a2, $zero, 0x000C ## $a2 = 0000000C -/* 01138 80B1CA38 46049180 */ add.s $f6, $f18, $f4 -/* 0113C 80B1CA3C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01140 80B1CA40 E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 01144 80B1CA44 0C2C6F77 */ jal func_80B1BDDC -/* 01148 80B1CA48 E7A6004C */ swc1 $f6, 0x004C($sp) -/* 0114C 80B1CA4C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B1CA50: -/* 01150 80B1CA50 8FB00020 */ lw $s0, 0x0020($sp) -/* 01154 80B1CA54 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 01158 80B1CA58 03E00008 */ jr $ra -/* 0115C 80B1CA5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1CC04.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1CC04.s deleted file mode 100644 index 7613b19924..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1CC04.s +++ /dev/null @@ -1,152 +0,0 @@ -glabel func_80B1CC04 -/* 01304 80B1CC04 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01308 80B1CC08 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0130C 80B1CC0C AFB00020 */ sw $s0, 0x0020($sp) -/* 01310 80B1CC10 AFA50034 */ sw $a1, 0x0034($sp) -/* 01314 80B1CC14 848201E0 */ lh $v0, 0x01E0($a0) ## 000001E0 -/* 01318 80B1CC18 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0131C 80B1CC1C 10400028 */ beq $v0, $zero, .L80B1CCC0 -/* 01320 80B1CC20 00000000 */ nop -/* 01324 80B1CC24 848300B6 */ lh $v1, 0x00B6($a0) ## 000000B6 -/* 01328 80B1CC28 848E021E */ lh $t6, 0x021E($a0) ## 0000021E -/* 0132C 80B1CC2C 848F008A */ lh $t7, 0x008A($a0) ## 0000008A -/* 01330 80B1CC30 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01334 80B1CC34 006E1823 */ subu $v1, $v1, $t6 -/* 01338 80B1CC38 00031C00 */ sll $v1, $v1, 16 -/* 0133C 80B1CC3C 00031C03 */ sra $v1, $v1, 16 -/* 01340 80B1CC40 01E31823 */ subu $v1, $t7, $v1 -/* 01344 80B1CC44 00031C00 */ sll $v1, $v1, 16 -/* 01348 80B1CC48 14410008 */ bne $v0, $at, .L80B1CC6C -/* 0134C 80B1CC4C 00031C03 */ sra $v1, $v1, 16 -/* 01350 80B1CC50 0C2C6FE3 */ jal func_80B1BF8C -/* 01354 80B1CC54 00000000 */ nop -/* 01358 80B1CC58 3C1880B2 */ lui $t8, %hi(func_80B1CEF8) ## $t8 = 80B20000 -/* 0135C 80B1CC5C 2718CEF8 */ addiu $t8, $t8, %lo(func_80B1CEF8) ## $t8 = 80B1CEF8 -/* 01360 80B1CC60 A60001E0 */ sh $zero, 0x01E0($s0) ## 000001E0 -/* 01364 80B1CC64 1000006B */ beq $zero, $zero, .L80B1CE14 -/* 01368 80B1CC68 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -.L80B1CC6C: -/* 0136C 80B1CC6C 861901D4 */ lh $t9, 0x01D4($s0) ## 000001D4 -/* 01370 80B1CC70 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 01374 80B1CC74 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 -/* 01378 80B1CC78 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 0137C 80B1CC7C 3C0880B2 */ lui $t0, %hi(func_80B1C54C) ## $t0 = 80B20000 -/* 01380 80B1CC80 3C0980B2 */ lui $t1, %hi(func_80B1C5A0) ## $t1 = 80B20000 -/* 01384 80B1CC84 468021A0 */ cvt.s.w $f6, $f4 -/* 01388 80B1CC88 2529C5A0 */ addiu $t1, $t1, %lo(func_80B1C5A0) ## $t1 = 80B1C5A0 -/* 0138C 80B1CC8C 2508C54C */ addiu $t0, $t0, %lo(func_80B1C54C) ## $t0 = 80B1C54C -/* 01390 80B1CC90 AFA80010 */ sw $t0, 0x0010($sp) -/* 01394 80B1CC94 AFA90014 */ sw $t1, 0x0014($sp) -/* 01398 80B1CC98 A7A3002E */ sh $v1, 0x002E($sp) -/* 0139C 80B1CC9C 46083280 */ add.s $f10, $f6, $f8 -/* 013A0 80B1CCA0 8FA40034 */ lw $a0, 0x0034($sp) -/* 013A4 80B1CCA4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 013A8 80B1CCA8 260601E0 */ addiu $a2, $s0, 0x01E0 ## $a2 = 000001E0 -/* 013AC 80B1CCAC 44075000 */ mfc1 $a3, $f10 -/* 013B0 80B1CCB0 0C00D0F3 */ jal func_800343CC -/* 013B4 80B1CCB4 00000000 */ nop -/* 013B8 80B1CCB8 10000044 */ beq $zero, $zero, .L80B1CDCC -/* 013BC 80B1CCBC 87A3002E */ lh $v1, 0x002E($sp) -.L80B1CCC0: -/* 013C0 80B1CCC0 0C2C7034 */ jal func_80B1C0D0 -/* 013C4 80B1CCC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013C8 80B1CCC8 1040001F */ beq $v0, $zero, .L80B1CD48 -/* 013CC 80B1CCCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013D0 80B1CCD0 860C01D4 */ lh $t4, 0x01D4($s0) ## 000001D4 -/* 013D4 80B1CCD4 860300B6 */ lh $v1, 0x00B6($s0) ## 000000B6 -/* 013D8 80B1CCD8 860A021E */ lh $t2, 0x021E($s0) ## 0000021E -/* 013DC 80B1CCDC 448C8000 */ mtc1 $t4, $f16 ## $f16 = 0.00 -/* 013E0 80B1CCE0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 013E4 80B1CCE4 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 013E8 80B1CCE8 468084A0 */ cvt.s.w $f18, $f16 -/* 013EC 80B1CCEC 860B008A */ lh $t3, 0x008A($s0) ## 0000008A -/* 013F0 80B1CCF0 006A1823 */ subu $v1, $v1, $t2 -/* 013F4 80B1CCF4 00031C00 */ sll $v1, $v1, 16 -/* 013F8 80B1CCF8 00031C03 */ sra $v1, $v1, 16 -/* 013FC 80B1CCFC A600021C */ sh $zero, 0x021C($s0) ## 0000021C -/* 01400 80B1CD00 46049180 */ add.s $f6, $f18, $f4 -/* 01404 80B1CD04 01631823 */ subu $v1, $t3, $v1 -/* 01408 80B1CD08 00031C00 */ sll $v1, $v1, 16 -/* 0140C 80B1CD0C 3C0D80B2 */ lui $t5, %hi(func_80B1C54C) ## $t5 = 80B20000 -/* 01410 80B1CD10 3C0E80B2 */ lui $t6, %hi(func_80B1C5A0) ## $t6 = 80B20000 -/* 01414 80B1CD14 00031C03 */ sra $v1, $v1, 16 -/* 01418 80B1CD18 25CEC5A0 */ addiu $t6, $t6, %lo(func_80B1C5A0) ## $t6 = 80B1C5A0 -/* 0141C 80B1CD1C 25ADC54C */ addiu $t5, $t5, %lo(func_80B1C54C) ## $t5 = 80B1C54C -/* 01420 80B1CD20 44073000 */ mfc1 $a3, $f6 -/* 01424 80B1CD24 AFAD0010 */ sw $t5, 0x0010($sp) -/* 01428 80B1CD28 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0142C 80B1CD2C A7A3002E */ sh $v1, 0x002E($sp) -/* 01430 80B1CD30 8FA40034 */ lw $a0, 0x0034($sp) -/* 01434 80B1CD34 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01438 80B1CD38 0C00D0F3 */ jal func_800343CC -/* 0143C 80B1CD3C 260601E0 */ addiu $a2, $s0, 0x01E0 ## $a2 = 000001E0 -/* 01440 80B1CD40 10000022 */ beq $zero, $zero, .L80B1CDCC -/* 01444 80B1CD44 87A3002E */ lh $v1, 0x002E($sp) -.L80B1CD48: -/* 01448 80B1CD48 0C00BC65 */ jal func_8002F194 -/* 0144C 80B1CD4C 8FA50034 */ lw $a1, 0x0034($sp) -/* 01450 80B1CD50 1040000D */ beq $v0, $zero, .L80B1CD88 -/* 01454 80B1CD54 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 01458 80B1CD58 860300B6 */ lh $v1, 0x00B6($s0) ## 000000B6 -/* 0145C 80B1CD5C 860F021E */ lh $t7, 0x021E($s0) ## 0000021E -/* 01460 80B1CD60 8618008A */ lh $t8, 0x008A($s0) ## 0000008A -/* 01464 80B1CD64 A600021C */ sh $zero, 0x021C($s0) ## 0000021C -/* 01468 80B1CD68 006F1823 */ subu $v1, $v1, $t7 -/* 0146C 80B1CD6C 00031C00 */ sll $v1, $v1, 16 -/* 01470 80B1CD70 00031C03 */ sra $v1, $v1, 16 -/* 01474 80B1CD74 03031823 */ subu $v1, $t8, $v1 -/* 01478 80B1CD78 00031C00 */ sll $v1, $v1, 16 -/* 0147C 80B1CD7C 00031C03 */ sra $v1, $v1, 16 -/* 01480 80B1CD80 10000012 */ beq $zero, $zero, .L80B1CDCC -/* 01484 80B1CD84 A61901E0 */ sh $t9, 0x01E0($s0) ## 000001E0 -.L80B1CD88: -/* 01488 80B1CD88 8603021C */ lh $v1, 0x021C($s0) ## 0000021C -/* 0148C 80B1CD8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01490 80B1CD90 14600003 */ bne $v1, $zero, .L80B1CDA0 -/* 01494 80B1CD94 2468FFFF */ addiu $t0, $v1, 0xFFFF ## $t0 = FFFFFFFF -/* 01498 80B1CD98 10000003 */ beq $zero, $zero, .L80B1CDA8 -/* 0149C 80B1CD9C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B1CDA0: -/* 014A0 80B1CDA0 A608021C */ sh $t0, 0x021C($s0) ## 0000021C -/* 014A4 80B1CDA4 8602021C */ lh $v0, 0x021C($s0) ## 0000021C -.L80B1CDA8: -/* 014A8 80B1CDA8 14400008 */ bne $v0, $zero, .L80B1CDCC -/* 014AC 80B1CDAC 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 014B0 80B1CDB0 0C2C6FC5 */ jal func_80B1BF14 -/* 014B4 80B1CDB4 8FA50034 */ lw $a1, 0x0034($sp) -/* 014B8 80B1CDB8 3C0980B2 */ lui $t1, %hi(func_80B1CE28) ## $t1 = 80B20000 -/* 014BC 80B1CDBC 2529CE28 */ addiu $t1, $t1, %lo(func_80B1CE28) ## $t1 = 80B1CE28 -/* 014C0 80B1CDC0 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 -/* 014C4 80B1CDC4 10000001 */ beq $zero, $zero, .L80B1CDCC -/* 014C8 80B1CDC8 87A3002E */ lh $v1, 0x002E($sp) -.L80B1CDCC: -/* 014CC 80B1CDCC 00032023 */ subu $a0, $zero, $v1 -/* 014D0 80B1CDD0 288104F6 */ slti $at, $a0, 0x04F6 -/* 014D4 80B1CDD4 10200003 */ beq $at, $zero, .L80B1CDE4 -/* 014D8 80B1CDD8 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 014DC 80B1CDDC 10000008 */ beq $zero, $zero, .L80B1CE00 -/* 014E0 80B1CDE0 240504F6 */ addiu $a1, $zero, 0x04F6 ## $a1 = 000004F6 -.L80B1CDE4: -/* 014E4 80B1CDE4 288129EB */ slti $at, $a0, 0x29EB -/* 014E8 80B1CDE8 14200003 */ bne $at, $zero, .L80B1CDF8 -/* 014EC 80B1CDEC 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 -/* 014F0 80B1CDF0 10000001 */ beq $zero, $zero, .L80B1CDF8 -/* 014F4 80B1CDF4 240229EA */ addiu $v0, $zero, 0x29EA ## $v0 = 000029EA -.L80B1CDF8: -/* 014F8 80B1CDF8 00022C00 */ sll $a1, $v0, 16 -/* 014FC 80B1CDFC 00052C03 */ sra $a1, $a1, 16 -.L80B1CE00: -/* 01500 80B1CE00 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 01504 80B1CE04 AFAA0010 */ sw $t2, 0x0010($sp) -/* 01508 80B1CE08 26040226 */ addiu $a0, $s0, 0x0226 ## $a0 = 00000226 -/* 0150C 80B1CE0C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 01510 80B1CE10 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -.L80B1CE14: -/* 01514 80B1CE14 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01518 80B1CE18 8FB00020 */ lw $s0, 0x0020($sp) -/* 0151C 80B1CE1C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01520 80B1CE20 03E00008 */ jr $ra -/* 01524 80B1CE24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1CE28.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1CE28.s deleted file mode 100644 index 0e8ef7f8b0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1CE28.s +++ /dev/null @@ -1,61 +0,0 @@ -glabel func_80B1CE28 -/* 01528 80B1CE28 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0152C 80B1CE2C AFBF0024 */ sw $ra, 0x0024($sp) -/* 01530 80B1CE30 AFB00020 */ sw $s0, 0x0020($sp) -/* 01534 80B1CE34 848E01E0 */ lh $t6, 0x01E0($a0) ## 000001E0 -/* 01538 80B1CE38 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0153C 80B1CE3C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01540 80B1CE40 55C10009 */ bnel $t6, $at, .L80B1CE68 -/* 01544 80B1CE44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01548 80B1CE48 0C2C6FE3 */ jal func_80B1BF8C -/* 0154C 80B1CE4C 00000000 */ nop -/* 01550 80B1CE50 3C0F80B2 */ lui $t7, %hi(func_80B1CEF8) ## $t7 = 80B20000 -/* 01554 80B1CE54 25EFCEF8 */ addiu $t7, $t7, %lo(func_80B1CEF8) ## $t7 = 80B1CEF8 -/* 01558 80B1CE58 A60001E0 */ sh $zero, 0x01E0($s0) ## 000001E0 -/* 0155C 80B1CE5C 10000021 */ beq $zero, $zero, .L80B1CEE4 -/* 01560 80B1CE60 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 -/* 01564 80B1CE64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B1CE68: -/* 01568 80B1CE68 0C2C70AD */ jal func_80B1C2B4 -/* 0156C 80B1CE6C AFA5002C */ sw $a1, 0x002C($sp) -/* 01570 80B1CE70 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 01574 80B1CE74 8FA5002C */ lw $a1, 0x002C($sp) -/* 01578 80B1CE78 0C2C70F7 */ jal func_80B1C3DC -/* 0157C 80B1CE7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01580 80B1CE80 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 01584 80B1CE84 AFB80010 */ sw $t8, 0x0010($sp) -/* 01588 80B1CE88 26040226 */ addiu $a0, $s0, 0x0226 ## $a0 = 00000226 -/* 0158C 80B1CE8C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01590 80B1CE90 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 01594 80B1CE94 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 01598 80B1CE98 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 0159C 80B1CE9C 0C2C708F */ jal func_80B1C23C -/* 015A0 80B1CEA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015A4 80B1CEA4 8602021C */ lh $v0, 0x021C($s0) ## 0000021C -/* 015A8 80B1CEA8 10400002 */ beq $v0, $zero, .L80B1CEB4 -/* 015AC 80B1CEAC 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF -/* 015B0 80B1CEB0 A619021C */ sh $t9, 0x021C($s0) ## 0000021C -.L80B1CEB4: -/* 015B4 80B1CEB4 0C2C7034 */ jal func_80B1C0D0 -/* 015B8 80B1CEB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015BC 80B1CEBC 14400004 */ bne $v0, $zero, .L80B1CED0 -/* 015C0 80B1CEC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015C4 80B1CEC4 8608021C */ lh $t0, 0x021C($s0) ## 0000021C -/* 015C8 80B1CEC8 55000007 */ bnel $t0, $zero, .L80B1CEE8 -/* 015CC 80B1CECC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B1CED0: -/* 015D0 80B1CED0 0C2C6FA5 */ jal func_80B1BE94 -/* 015D4 80B1CED4 8FA5002C */ lw $a1, 0x002C($sp) -/* 015D8 80B1CED8 3C0980B2 */ lui $t1, %hi(func_80B1CC04) ## $t1 = 80B20000 -/* 015DC 80B1CEDC 2529CC04 */ addiu $t1, $t1, %lo(func_80B1CC04) ## $t1 = 80B1CC04 -/* 015E0 80B1CEE0 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 -.L80B1CEE4: -/* 015E4 80B1CEE4 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B1CEE8: -/* 015E8 80B1CEE8 8FB00020 */ lw $s0, 0x0020($sp) -/* 015EC 80B1CEEC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 015F0 80B1CEF0 03E00008 */ jr $ra -/* 015F4 80B1CEF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1CEF8.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1CEF8.s deleted file mode 100644 index 00173da907..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1CEF8.s +++ /dev/null @@ -1,168 +0,0 @@ -glabel func_80B1CEF8 -/* 015F8 80B1CEF8 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 015FC 80B1CEFC 3C0F80B2 */ lui $t7, %hi(D_80B1D56C) ## $t7 = 80B20000 -/* 01600 80B1CF00 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01604 80B1CF04 AFB00020 */ sw $s0, 0x0020($sp) -/* 01608 80B1CF08 AFA5005C */ sw $a1, 0x005C($sp) -/* 0160C 80B1CF0C 25EFD56C */ addiu $t7, $t7, %lo(D_80B1D56C) ## $t7 = 80B1D56C -/* 01610 80B1CF10 8DF90000 */ lw $t9, 0x0000($t7) ## 80B1D56C -/* 01614 80B1CF14 27AE002C */ addiu $t6, $sp, 0x002C ## $t6 = FFFFFFD4 -/* 01618 80B1CF18 8DF80004 */ lw $t8, 0x0004($t7) ## 80B1D570 -/* 0161C 80B1CF1C ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFD4 -/* 01620 80B1CF20 8DF90008 */ lw $t9, 0x0008($t7) ## 80B1D574 -/* 01624 80B1CF24 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFD8 -/* 01628 80B1CF28 8DF8000C */ lw $t8, 0x000C($t7) ## 80B1D578 -/* 0162C 80B1CF2C ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFDC -/* 01630 80B1CF30 8DF90010 */ lw $t9, 0x0010($t7) ## 80B1D57C -/* 01634 80B1CF34 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01638 80B1CF38 ADD8000C */ sw $t8, 0x000C($t6) ## FFFFFFE0 -/* 0163C 80B1CF3C 0C2C723C */ jal func_80B1C8F0 -/* 01640 80B1CF40 ADD90010 */ sw $t9, 0x0010($t6) ## FFFFFFE4 -/* 01644 80B1CF44 3C014200 */ lui $at, 0x4200 ## $at = 42000000 -/* 01648 80B1CF48 44812000 */ mtc1 $at, $f4 ## $f4 = 32.00 -/* 0164C 80B1CF4C C6060164 */ lwc1 $f6, 0x0164($s0) ## 00000164 -/* 01650 80B1CF50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01654 80B1CF54 46062032 */ c.eq.s $f4, $f6 -/* 01658 80B1CF58 00000000 */ nop -/* 0165C 80B1CF5C 45020038 */ bc1fl .L80B1D040 -/* 01660 80B1CF60 3C014200 */ lui $at, 0x4200 ## $at = 42000000 -/* 01664 80B1CF64 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01668 80B1CF68 240528C8 */ addiu $a1, $zero, 0x28C8 ## $a1 = 000028C8 -/* 0166C 80B1CF6C 92080208 */ lbu $t0, 0x0208($s0) ## 00000208 -/* 01670 80B1CF70 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01674 80B1CF74 A600021A */ sh $zero, 0x021A($s0) ## 0000021A -/* 01678 80B1CF78 55010031 */ bnel $t0, $at, .L80B1D040 -/* 0167C 80B1CF7C 3C014200 */ lui $at, 0x4200 ## $at = 42000000 -/* 01680 80B1CF80 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01684 80B1CF84 3C01C220 */ lui $at, 0xC220 ## $at = C2200000 -/* 01688 80B1CF88 44814000 */ mtc1 $at, $f8 ## $f8 = -40.00 -/* 0168C 80B1CF8C E7A0004C */ swc1 $f0, 0x004C($sp) -/* 01690 80B1CF90 E7A00050 */ swc1 $f0, 0x0050($sp) -/* 01694 80B1CF94 E7A80054 */ swc1 $f8, 0x0054($sp) -/* 01698 80B1CF98 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 -/* 0169C 80B1CF9C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 016A0 80B1CFA0 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 -/* 016A4 80B1CFA4 0C034348 */ jal Matrix_RotateY -/* 016A8 80B1CFA8 46805320 */ cvt.s.w $f12, $f10 -/* 016AC 80B1CFAC 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFF4 -/* 016B0 80B1CFB0 0C0346BD */ jal Matrix_MultVec3f -/* 016B4 80B1CFB4 27A50040 */ addiu $a1, $sp, 0x0040 ## $a1 = FFFFFFE8 -/* 016B8 80B1CFB8 C7B00040 */ lwc1 $f16, 0x0040($sp) -/* 016BC 80B1CFBC C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 -/* 016C0 80B1CFC0 C7A60044 */ lwc1 $f6, 0x0044($sp) -/* 016C4 80B1CFC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016C8 80B1CFC8 46128100 */ add.s $f4, $f16, $f18 -/* 016CC 80B1CFCC C7B00048 */ lwc1 $f16, 0x0048($sp) -/* 016D0 80B1CFD0 E7A40040 */ swc1 $f4, 0x0040($sp) -/* 016D4 80B1CFD4 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 016D8 80B1CFD8 46083280 */ add.s $f10, $f6, $f8 -/* 016DC 80B1CFDC E7AA0044 */ swc1 $f10, 0x0044($sp) -/* 016E0 80B1CFE0 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 016E4 80B1CFE4 46128100 */ add.s $f4, $f16, $f18 -/* 016E8 80B1CFE8 0C2C71CE */ jal func_80B1C738 -/* 016EC 80B1CFEC E7A40048 */ swc1 $f4, 0x0048($sp) -/* 016F0 80B1CFF0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 016F4 80B1CFF4 1441000A */ bne $v0, $at, .L80B1D020 -/* 016F8 80B1CFF8 AE020214 */ sw $v0, 0x0214($s0) ## 00000214 -/* 016FC 80B1CFFC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 01700 80B1D000 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 01704 80B1D004 94620EF2 */ lhu $v0, 0x0EF2($v1) ## 8015F552 -/* 01708 80B1D008 240C0004 */ addiu $t4, $zero, 0x0004 ## $t4 = 00000004 -/* 0170C 80B1D00C 304A1000 */ andi $t2, $v0, 0x1000 ## $t2 = 00000000 -/* 01710 80B1D010 15400003 */ bne $t2, $zero, .L80B1D020 -/* 01714 80B1D014 344B1000 */ ori $t3, $v0, 0x1000 ## $t3 = 00001000 -/* 01718 80B1D018 A46B0EF2 */ sh $t3, 0x0EF2($v1) ## 8015F552 -/* 0171C 80B1D01C AE0C0214 */ sw $t4, 0x0214($s0) ## 00000214 -.L80B1D020: -/* 01720 80B1D020 8E0D0214 */ lw $t5, 0x0214($s0) ## 00000214 -/* 01724 80B1D024 8FA4005C */ lw $a0, 0x005C($sp) -/* 01728 80B1D028 27A50040 */ addiu $a1, $sp, 0x0040 ## $a1 = FFFFFFE8 -/* 0172C 80B1D02C 000D7080 */ sll $t6, $t5, 2 -/* 01730 80B1D030 03AE3021 */ addu $a2, $sp, $t6 -/* 01734 80B1D034 0C007D52 */ jal Item_DropCollectible - -/* 01738 80B1D038 84C6002E */ lh $a2, 0x002E($a2) ## 0000002E -/* 0173C 80B1D03C 3C014200 */ lui $at, 0x4200 ## $at = 42000000 -.L80B1D040: -/* 01740 80B1D040 44814000 */ mtc1 $at, $f8 ## $f8 = 32.00 -/* 01744 80B1D044 C6060164 */ lwc1 $f6, 0x0164($s0) ## 00000164 -/* 01748 80B1D048 4606403E */ c.le.s $f8, $f6 -/* 0174C 80B1D04C 00000000 */ nop -/* 01750 80B1D050 45020021 */ bc1fl .L80B1D0D8 -/* 01754 80B1D054 8609021A */ lh $t1, 0x021A($s0) ## 0000021A -/* 01758 80B1D058 860F021A */ lh $t7, 0x021A($s0) ## 0000021A -/* 0175C 80B1D05C 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 01760 80B1D060 55E1001D */ bnel $t7, $at, .L80B1D0D8 -/* 01764 80B1D064 8609021A */ lh $t1, 0x021A($s0) ## 0000021A -/* 01768 80B1D068 92180208 */ lbu $t8, 0x0208($s0) ## 00000208 -/* 0176C 80B1D06C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01770 80B1D070 57000006 */ bnel $t8, $zero, .L80B1D08C -/* 01774 80B1D074 8E190214 */ lw $t9, 0x0214($s0) ## 00000214 -/* 01778 80B1D078 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0177C 80B1D07C 24054806 */ addiu $a1, $zero, 0x4806 ## $a1 = 00004806 -/* 01780 80B1D080 10000015 */ beq $zero, $zero, .L80B1D0D8 -/* 01784 80B1D084 8609021A */ lh $t1, 0x021A($s0) ## 0000021A -/* 01788 80B1D088 8E190214 */ lw $t9, 0x0214($s0) ## 00000214 -.L80B1D08C: -/* 0178C 80B1D08C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01790 80B1D090 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 01794 80B1D094 1721000D */ bne $t9, $at, .L80B1D0CC -/* 01798 80B1D098 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0179C 80B1D09C 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 -/* 017A0 80B1D0A0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 017A4 80B1D0A4 250833E8 */ addiu $t0, $t0, 0x33E8 ## $t0 = 801333E8 -/* 017A8 80B1D0A8 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 017AC 80B1D0AC 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 -/* 017B0 80B1D0B0 AFA80014 */ sw $t0, 0x0014($sp) -/* 017B4 80B1D0B4 AFA70010 */ sw $a3, 0x0010($sp) -/* 017B8 80B1D0B8 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 -/* 017BC 80B1D0BC 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 017C0 80B1D0C0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 017C4 80B1D0C4 10000004 */ beq $zero, $zero, .L80B1D0D8 -/* 017C8 80B1D0C8 8609021A */ lh $t1, 0x021A($s0) ## 0000021A -.L80B1D0CC: -/* 017CC 80B1D0CC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 017D0 80B1D0D0 24054807 */ addiu $a1, $zero, 0x4807 ## $a1 = 00004807 -/* 017D4 80B1D0D4 8609021A */ lh $t1, 0x021A($s0) ## 0000021A -.L80B1D0D8: -/* 017D8 80B1D0D8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 017DC 80B1D0DC 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 017E0 80B1D0E0 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 017E4 80B1D0E4 0C0295B2 */ jal func_800A56C8 -/* 017E8 80B1D0E8 A60A021A */ sh $t2, 0x021A($s0) ## 0000021A -/* 017EC 80B1D0EC 50400016 */ beql $v0, $zero, .L80B1D148 -/* 017F0 80B1D0F0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 017F4 80B1D0F4 8E0B0214 */ lw $t3, 0x0214($s0) ## 00000214 -/* 017F8 80B1D0F8 8FA4005C */ lw $a0, 0x005C($sp) -/* 017FC 80B1D0FC 2405501A */ addiu $a1, $zero, 0x501A ## $a1 = 0000501A -/* 01800 80B1D100 05610005 */ bgez $t3, .L80B1D118 -/* 01804 80B1D104 00000000 */ nop -/* 01808 80B1D108 0C042DA0 */ jal func_8010B680 -/* 0180C 80B1D10C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01810 80B1D110 10000004 */ beq $zero, $zero, .L80B1D124 -/* 01814 80B1D114 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B1D118: -/* 01818 80B1D118 0C041B33 */ jal func_80106CCC -/* 0181C 80B1D11C 8FA4005C */ lw $a0, 0x005C($sp) -/* 01820 80B1D120 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B1D124: -/* 01824 80B1D124 0C2C6FA5 */ jal func_80B1BE94 -/* 01828 80B1D128 8FA5005C */ lw $a1, 0x005C($sp) -/* 0182C 80B1D12C 3C0D80B2 */ lui $t5, %hi(func_80B1CC04) ## $t5 = 80B20000 -/* 01830 80B1D130 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF -/* 01834 80B1D134 25ADCC04 */ addiu $t5, $t5, %lo(func_80B1CC04) ## $t5 = 80B1CC04 -/* 01838 80B1D138 AE0C0214 */ sw $t4, 0x0214($s0) ## 00000214 -/* 0183C 80B1D13C A2000208 */ sb $zero, 0x0208($s0) ## 00000208 -/* 01840 80B1D140 AE0D0190 */ sw $t5, 0x0190($s0) ## 00000190 -/* 01844 80B1D144 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B1D148: -/* 01848 80B1D148 8FB00020 */ lw $s0, 0x0020($sp) -/* 0184C 80B1D14C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 01850 80B1D150 03E00008 */ jr $ra -/* 01854 80B1D154 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1D200.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1D200.s deleted file mode 100644 index 8b7e69da9b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1D200.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80B1D200 -/* 01900 80B1D200 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01904 80B1D204 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01908 80B1D208 AFA40038 */ sw $a0, 0x0038($sp) -/* 0190C 80B1D20C 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 -/* 01910 80B1D210 3C0680B2 */ lui $a2, %hi(D_80B1D5EC) ## $a2 = 80B20000 -/* 01914 80B1D214 24C6D5EC */ addiu $a2, $a2, %lo(D_80B1D5EC) ## $a2 = 80B1D5EC -/* 01918 80B1D218 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFEC -/* 0191C 80B1D21C 240704A4 */ addiu $a3, $zero, 0x04A4 ## $a3 = 000004A4 -/* 01920 80B1D220 0C031AB1 */ jal func_800C6AC4 -/* 01924 80B1D224 AFA50034 */ sw $a1, 0x0034($sp) -/* 01928 80B1D228 8FA80034 */ lw $t0, 0x0034($sp) -/* 0192C 80B1D22C 3C190601 */ lui $t9, 0x0601 ## $t9 = 06010000 -/* 01930 80B1D230 2739ACE0 */ addiu $t9, $t9, 0xACE0 ## $t9 = 0600ACE0 -/* 01934 80B1D234 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 01938 80B1D238 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 -/* 0193C 80B1D23C 3C0680B2 */ lui $a2, %hi(D_80B1D5FC) ## $a2 = 80B20000 -/* 01940 80B1D240 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 -/* 01944 80B1D244 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 01948 80B1D248 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 -/* 0194C 80B1D24C AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 01950 80B1D250 8FA90038 */ lw $t1, 0x0038($sp) -/* 01954 80B1D254 24C6D5FC */ addiu $a2, $a2, %lo(D_80B1D5FC) ## $a2 = 80B1D5FC -/* 01958 80B1D258 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFEC -/* 0195C 80B1D25C 240704A6 */ addiu $a3, $zero, 0x04A6 ## $a3 = 000004A6 -/* 01960 80B1D260 0C031AD5 */ jal func_800C6B54 -/* 01964 80B1D264 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -/* 01968 80B1D268 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0196C 80B1D26C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01970 80B1D270 03E00008 */ jr $ra -/* 01974 80B1D274 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1D278.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1D278.s deleted file mode 100644 index f33dc6acc0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1D278.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80B1D278 -/* 01978 80B1D278 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 0197C 80B1D27C AFA40000 */ sw $a0, 0x0000($sp) -/* 01980 80B1D280 AFA60008 */ sw $a2, 0x0008($sp) -/* 01984 80B1D284 10A10006 */ beq $a1, $at, .L80B1D2A0 -/* 01988 80B1D288 AFA7000C */ sw $a3, 0x000C($sp) -/* 0198C 80B1D28C 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 01990 80B1D290 10A10009 */ beq $a1, $at, .L80B1D2B8 -/* 01994 80B1D294 8FA20014 */ lw $v0, 0x0014($sp) -/* 01998 80B1D298 03E00008 */ jr $ra -/* 0199C 80B1D29C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B1D2A0: -/* 019A0 80B1D2A0 8FA30010 */ lw $v1, 0x0010($sp) -/* 019A4 80B1D2A4 8FA20014 */ lw $v0, 0x0014($sp) -/* 019A8 80B1D2A8 846E0002 */ lh $t6, 0x0002($v1) ## 00000002 -/* 019AC 80B1D2AC A44E021E */ sh $t6, 0x021E($v0) ## 0000021E -/* 019B0 80B1D2B0 03E00008 */ jr $ra -/* 019B4 80B1D2B4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B1D2B8: -/* 019B8 80B1D2B8 8FA30010 */ lw $v1, 0x0010($sp) -/* 019BC 80B1D2BC 844F021E */ lh $t7, 0x021E($v0) ## 0000021E -/* 019C0 80B1D2C0 84490226 */ lh $t1, 0x0226($v0) ## 00000226 -/* 019C4 80B1D2C4 84780002 */ lh $t8, 0x0002($v1) ## 00000002 -/* 019C8 80B1D2C8 01F8C821 */ addu $t9, $t7, $t8 -/* 019CC 80B1D2CC A459021E */ sh $t9, 0x021E($v0) ## 0000021E -/* 019D0 80B1D2D0 84680002 */ lh $t0, 0x0002($v1) ## 00000002 -/* 019D4 80B1D2D4 01095021 */ addu $t2, $t0, $t1 -/* 019D8 80B1D2D8 A46A0002 */ sh $t2, 0x0002($v1) ## 00000002 -/* 019DC 80B1D2DC 03E00008 */ jr $ra -/* 019E0 80B1D2E0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1D2E4.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1D2E4.s deleted file mode 100644 index 7ae1beb53c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1D2E4.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_80B1D2E4 -/* 019E4 80B1D2E4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 019E8 80B1D2E8 3C0F80B2 */ lui $t7, %hi(D_80B1D580) ## $t7 = 80B20000 -/* 019EC 80B1D2EC AFBF0014 */ sw $ra, 0x0014($sp) -/* 019F0 80B1D2F0 AFA40038 */ sw $a0, 0x0038($sp) -/* 019F4 80B1D2F4 AFA5003C */ sw $a1, 0x003C($sp) -/* 019F8 80B1D2F8 AFA60040 */ sw $a2, 0x0040($sp) -/* 019FC 80B1D2FC AFA70044 */ sw $a3, 0x0044($sp) -/* 01A00 80B1D300 25EFD580 */ addiu $t7, $t7, %lo(D_80B1D580) ## $t7 = 80B1D580 -/* 01A04 80B1D304 8DF90000 */ lw $t9, 0x0000($t7) ## 80B1D580 -/* 01A08 80B1D308 27AE0028 */ addiu $t6, $sp, 0x0028 ## $t6 = FFFFFFF0 -/* 01A0C 80B1D30C 8DF80004 */ lw $t8, 0x0004($t7) ## 80B1D584 -/* 01A10 80B1D310 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF0 -/* 01A14 80B1D314 8DF90008 */ lw $t9, 0x0008($t7) ## 80B1D588 -/* 01A18 80B1D318 3C0880B2 */ lui $t0, %hi(D_80B1D58C) ## $t0 = 80B20000 -/* 01A1C 80B1D31C 2508D58C */ addiu $t0, $t0, %lo(D_80B1D58C) ## $t0 = 80B1D58C -/* 01A20 80B1D320 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF4 -/* 01A24 80B1D324 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFF8 -/* 01A28 80B1D328 8D0A0000 */ lw $t2, 0x0000($t0) ## 80B1D58C -/* 01A2C 80B1D32C 27A7001C */ addiu $a3, $sp, 0x001C ## $a3 = FFFFFFE4 -/* 01A30 80B1D330 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 01A34 80B1D334 ACEA0000 */ sw $t2, 0x0000($a3) ## FFFFFFE4 -/* 01A38 80B1D338 8D090004 */ lw $t1, 0x0004($t0) ## 80B1D590 -/* 01A3C 80B1D33C 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 01A40 80B1D340 00E02025 */ or $a0, $a3, $zero ## $a0 = FFFFFFE4 -/* 01A44 80B1D344 ACE90004 */ sw $t1, 0x0004($a3) ## FFFFFFE8 -/* 01A48 80B1D348 8D0A0008 */ lw $t2, 0x0008($t0) ## 80B1D594 -/* 01A4C 80B1D34C 14A10006 */ bne $a1, $at, .L80B1D368 -/* 01A50 80B1D350 ACEA0008 */ sw $t2, 0x0008($a3) ## FFFFFFEC -/* 01A54 80B1D354 8FA50048 */ lw $a1, 0x0048($sp) -/* 01A58 80B1D358 AFA6003C */ sw $a2, 0x003C($sp) -/* 01A5C 80B1D35C 0C0346BD */ jal Matrix_MultVec3f -/* 01A60 80B1D360 24A50038 */ addiu $a1, $a1, 0x0038 ## $a1 = 00000038 -/* 01A64 80B1D364 8FA6003C */ lw $a2, 0x003C($sp) -.L80B1D368: -/* 01A68 80B1D368 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 01A6C 80B1D36C 14C10006 */ bne $a2, $at, .L80B1D388 -/* 01A70 80B1D370 8FA50048 */ lw $a1, 0x0048($sp) -/* 01A74 80B1D374 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFF0 -/* 01A78 80B1D378 0C0346BD */ jal Matrix_MultVec3f -/* 01A7C 80B1D37C 24A50304 */ addiu $a1, $a1, 0x0304 ## $a1 = 00000304 -/* 01A80 80B1D380 0C2C7480 */ jal func_80B1D200 -/* 01A84 80B1D384 8FA40038 */ lw $a0, 0x0038($sp) -.L80B1D388: -/* 01A88 80B1D388 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01A8C 80B1D38C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01A90 80B1D390 03E00008 */ jr $ra -/* 01A94 80B1D394 00000000 */ nop - - diff --git a/data/overlays/actors/z_en_tk.data.s b/data/overlays/actors/z_en_tk.data.s deleted file mode 100644 index 8bd649aeca..0000000000 --- a/data/overlays/actors/z_en_tk.data.s +++ /dev/null @@ -1,42 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel En_Tk_InitVars - .word 0x00850400, 0x00000009, 0x00890000, 0x00000770 -.word EnTk_Init -.word EnTk_Destroy -.word EnTk_Update -.word EnTk_Draw -glabel D_80B1D4D0 - .word 0x040539B0, 0x040535B0, 0x040531B0, 0x04052DB0, 0x040529B0, 0x040525B0, 0x040521B0, 0x04051DB0 -glabel D_80B1D4F0 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80B1D4FC - .word 0x00000000, 0x3E99999A, 0x00000000 -glabel D_80B1D508 - .word 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x001E0034, 0x00000000, 0x00000000 -glabel D_80B1D534 - .word 0x00000000, 0x00000000, 0xFF000000 -glabel D_80B1D540 - .word 0x42100000, 0x41200000 -glabel D_80B1D548 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80B1D554 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80B1D560 - .word 0x00000000, 0x3E99999A, 0x00000000 -glabel D_80B1D56C - .word 0x00000000, 0x00000001, 0x00000002, 0x00000014, 0x00000006 -glabel D_80B1D580 - .word 0x00000000, 0x00000000, 0x458FC000 -glabel D_80B1D58C - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80B1D598 - .word 0x06003B40, 0x06004340, 0x06004B40, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_tk.reloc.s b/data/overlays/actors/z_en_tk.reloc.s deleted file mode 100644 index e63a357638..0000000000 --- a/data/overlays/actors/z_en_tk.reloc.s +++ /dev/null @@ -1,11 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata -glabel D_80B1D690 - -.incbin "baserom/ovl_En_Tk", 0x1D90, 0x00000200 diff --git a/data/overlays/actors/z_en_tk.rodata.s b/data/overlays/actors/z_en_tk.rodata.s deleted file mode 100644 index 8b109d004a..0000000000 --- a/data/overlays/actors/z_en_tk.rodata.s +++ /dev/null @@ -1,70 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_80B1D5B0 - .asciz "../z_en_tk_eff.c" - .balign 4 - -glabel D_80B1D5C4 - .asciz "../z_en_tk_eff.c" - .balign 4 - -glabel D_80B1D5D8 - .asciz "../z_en_tk_eff.c" - .balign 4 - -glabel D_80B1D5EC - .asciz "../z_en_tk.c" - .balign 4 - -glabel D_80B1D5FC - .asciz "../z_en_tk.c" - .balign 4 - -glabel D_80B1D60C - .asciz "../z_en_tk.c" - .balign 4 - -glabel D_80B1D61C - .asciz "../z_en_tk.c" - .balign 4 - -glabel D_80B1D62C - .word 0x3E4CCCCD -glabel D_80B1D630 - .word 0x3ECCCCCD -glabel D_80B1D634 - .word 0x461C4000 -glabel D_80B1D638 - .word 0x452AAAAB -glabel D_80B1D63C - .word 0x4622F983 -glabel jtbl_80B1D640 -.word L80B1C724 -.word L80B1C724 -.word L80B1C5EC -.word L80B1C724 -.word L80B1C614 -.word L80B1C6E4 -.word L80B1C724 -.word L80B1C724 -.word L80B1C724 -.word L80B1C724 -glabel D_80B1D668 - .word 0x3ECCCCCD, 0x00000000 -glabel D_80B1D670 - .word 0x3FE66666, 0x66666666 -glabel D_80B1D678 - .word 0x3FECCCCC, 0xCCCCCCCD -glabel D_80B1D680 - .word 0x3DCCCCCD -glabel D_80B1D684 - .word 0xBDCCCCCD, 0x00000000, 0x00000000 - - diff --git a/include/functions.h b/include/functions.h index 3562b89692..71e14e63be 100644 --- a/include/functions.h +++ b/include/functions.h @@ -389,6 +389,7 @@ void func_8003424C(GlobalContext* globalCtx, Vec3f* arg1); void func_8003426C(Actor* actor, s16 arg1, s16 arg2, s16 arg3, s16 arg4); Hilite* func_800342EC(Vec3f* object, GlobalContext* globalCtx); Hilite* func_8003435C(Vec3f* object, GlobalContext* globalCtx); +s32 func_800343CC(GlobalContext* globalCtx, Actor* actor, s16* arg2, f32 arg3, s16 (*unkFunc1)(GlobalContext*, Actor*), s16 (*unkFunc2)(GlobalContext*, Actor*)); s16 func_800347E8(s16 arg0); void func_80034BA0(GlobalContext* globalCtx, SkelAnime* skelAnime, void* unkFunc1, void* unkFunc2, Actor* actor, s16 alpha); void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, void* unkFunc1, void* unkFunc2, Actor* actor, s16 alpha); @@ -743,7 +744,7 @@ s32 Actor_CollisionCheck_SetOT(GlobalContext* globalCtx, SubGlobalContext11E60* // ? func_80061E48(?); // ? func_80061E8C(?); void func_80061ED4(SubActorStruct98 *sub98, ActorDamageChart *damageChart, SubActor98Init *subActor98Init); -// ? func_80061EFC(?); +void func_80061EFC(SubActorStruct98 *sub98, ActorDamageChart *damageChart, SubActor98Init *subActor98Init); // ? func_80061F64(?); // ? func_800622E4(?); // ? func_80062530(?); @@ -786,6 +787,7 @@ void Audio_PlaySoundAtPosition(GlobalContext* globalCtx, Vec3f* pos2, s32 radius // ? func_8006BE88(?); // ? func_8006BF1C(?); // ? func_8006C0FC(?); +u16 func_8006C360(GlobalContext*, u32); // ? func_8006C3A0(?); // ? func_8006C3D0(?); void func_8006C438(GlobalContext* globalCtx, s16 arg1); @@ -1134,8 +1136,8 @@ Gfx* func_800A273C(GlobalContext* globalCtx, u32 limbIndex, u32 adt, u8 limbDLis // ? func_800A3F08(?); // ? func_800A3D70(?); // ? func_800A4478(?); -void SkelAnime_Init(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 skeleton, u32 animation, u8 unk0, u8 unk1, u8 unk2); -void func_800A46F8(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 skeleton, u32 animation, u8 unk0, u16* unk1, u8 unk2); +void SkelAnime_Init(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 skeleton, u32 animation, u16* unk0, u16* unk1, u8 unk2); +void func_800A46F8(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 skeleton, u32 animation, u16* unk0, u16* unk1, u8 unk2); // ? func_800A4A20(?); // ? func_800A4AD8(?); // ? func_800A4D9C(?); @@ -1151,7 +1153,7 @@ void func_800A5240(SkelAnime *skelAnime, u32 animation, f32 unk0); void func_800A529C(SkelAnime *skelAnime, u32 animation, f32 unk0, Actor *actor); // ? func_800A52F8(?); // ? func_800A54FC(?); -UNK_TYPE func_800A56C8(SkelAnime* skelAnime, f32 arg1); +s32 func_800A56C8(SkelAnime* skelAnime, f32 arg1); // ? func_800A56F0(?); // ? func_800A5774(?); // ? func_800A57C0(?); @@ -2349,7 +2351,7 @@ f32 absf(f32); // ? func_801069B0(?); u8 func_80106BC8(GlobalContext* globalCtx); // ? func_80106C88(?); -// ? func_80106CCC(?); +void func_80106CCC(GlobalContext*); // ? func_80106D40(?); // ? func_80106F1C(?); // ? func_80107244(?); @@ -2363,7 +2365,7 @@ u8 func_80106BC8(GlobalContext* globalCtx); // ? func_80109968(?); // ? func_80109B3C(?); // ? func_8010B0C0(?); -// ? func_8010B680(?); +void func_8010B680(GlobalContext*, u16, s32); void func_8010B720(GlobalContext* globalCtx, u16 textId); // ? func_8010B820(?); // ? func_8010BD58(?); diff --git a/include/macros.h b/include/macros.h index ef435aca55..e9238973ae 100644 --- a/include/macros.h +++ b/include/macros.h @@ -13,6 +13,7 @@ #define SQ(x) ((x)*(x)) #define ABS(x) ((x) >= 0 ? (x) : -(x)) #define DECR(x) ((x) == 0 ? 0 : ((x) -= 1)) +#define CLAMP(x,min,max) ((x) < (min) ? (min) : (x) > (max) ? (max) : (x)) #define PLAYER ((Player*)globalCtx->actorCtx.actorList[ACTORTYPE_PLAYER].first) diff --git a/include/z64.h b/include/z64.h index dc0baf5ee5..26b510e4af 100644 --- a/include/z64.h +++ b/include/z64.h @@ -802,6 +802,12 @@ typedef struct /* 0x01 */ u8 room; } EntranceEntry; +typedef struct +{ + /* 0x00 */ u8 n_points; + /* 0x04 */ Vec3s* point_array; +} Path; // size = 0x8 + typedef struct { /* 0x00 */ u32 vromStart; @@ -947,7 +953,7 @@ typedef struct GlobalContext /* 0x11DFC */ UNK_PTR unk_11DFC; /* 0x11E00 */ EntranceEntry* setupEntranceList; /* 0x11E04 */ UNK_PTR setupExitList; - /* 0x11E08 */ UNK_PTR setupPathList; + /* 0x11E08 */ Path* setupPathList; /* 0x11E0C */ UNK_PTR naviMsgSegment; /* 0x11E10 */ char unk_11E10[0x4]; /* 0x11E14 */ u8 skyboxId; diff --git a/spec b/spec index 1a3b075a91..64771f35e5 100644 --- a/spec +++ b/spec @@ -3693,9 +3693,7 @@ endseg beginseg name "ovl_En_Tk" include "build/src/overlays/actors/ovl_En_Tk/z_en_tk.o" - include "build/data/overlays/actors/z_en_tk.data.o" - include "build/data/overlays/actors/z_en_tk.rodata.o" - include "build/data/overlays/actors/z_en_tk.reloc.o" + include "build/src/overlays/actors/ovl_En_Tk/z_en_tk_reloc.o" endseg beginseg diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 71bba11f23..ba79db4aec 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -4040,10 +4040,7 @@ Hilite* func_8003435C(Vec3f* object, GlobalContext* globalCtx) return func_8002EB44(object, &globalCtx->view.eye, &lightDir, globalCtx->state.gfxCtx); } -typedef s16 (*func_800343CC_arg4)(GlobalContext*, Actor*); -typedef s16 (*func_800343CC_arg5)(GlobalContext*, Actor*); - -s32 func_800343CC(GlobalContext* globalCtx, Actor* actor, s16* arg2, f32 arg3, func_800343CC_arg4 unkFunc1, func_800343CC_arg5 unkFunc2) +s32 func_800343CC(GlobalContext* globalCtx, Actor* actor, s16* arg2, f32 arg3, s16 (*unkFunc1)(GlobalContext*, Actor*), s16 (*unkFunc2)(GlobalContext*, Actor*)) { s16 sp26; s16 sp24; diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index 04943e8722..5d9233314e 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -1,14 +1,48 @@ +#include +#include #include "z_en_tk.h" -#define ROOM 0x00 +typedef struct +{ + /* 0x0000 */ u8 health; /* SubActorStruct98.health */ + /* 0x0002 */ s16 h_2; /* SubActorStruct98.unk_10 */ + /* 0x0004 */ s16 h_4; /* SubActorStruct98.unk_12 */ + /* 0x0006 */ s16 h_6; /* SubActorStruct98.unk_14 */ + /* 0x0008 */ u8 mass; /* SubActorStruct98.mass */ + /* 0x000A */ +} EnTk_SubActorStruct98Init; + +#define ROOM 0x00 #define FLAGS 0x00000009 -void EnTk_Init(EnTk* this, GlobalContext* globalCtx); -void EnTk_Destroy(EnTk* this, GlobalContext* globalCtx); -void EnTk_Update(EnTk* this, GlobalContext* globalCtx); -void EnTk_Draw(EnTk* this, GlobalContext* globalCtx); +s32 EnTk_CheckNextSpot(EnTk *this, GlobalContext *ctxt); +void EnTk_Init(Actor *this, GlobalContext *ctxt); +void EnTk_Destroy(Actor *this, GlobalContext *ctxt); +void EnTk_Stop_Update(EnTk *this, GlobalContext *ctxt); +void EnTk_Walk_Update(EnTk *this, GlobalContext *ctxt); +void EnTk_Dig_Update(EnTk *this, GlobalContext *ctxt); +void EnTk_Update(Actor *this, GlobalContext *ctxt); +void EnTk_Draw(Actor *this, GlobalContext *ctxt); + +extern UNK_TYPE D_04051DB0; +extern UNK_TYPE D_040521B0; +extern UNK_TYPE D_040525B0; +extern UNK_TYPE D_040529B0; +extern UNK_TYPE D_04052DB0; +extern UNK_TYPE D_040531B0; +extern UNK_TYPE D_040535B0; +extern UNK_TYPE D_040539B0; +extern UNK_TYPE D_06001144; +extern UNK_TYPE D_06001FA8; +extern UNK_TYPE D_06002F84; +extern UNK_TYPE D_06003B40; +extern UNK_TYPE D_06004340; +extern UNK_TYPE D_06004B40; +extern UNK_TYPE D_0600ACE0; +extern UNK_TYPE D_0600BC90; +extern UNK_TYPE D_0600BCA0; +extern UNK_TYPE D_0600BE40; -/* const ActorInit En_Tk_InitVars = { ACTOR_EN_TK, @@ -17,62 +51,972 @@ const ActorInit En_Tk_InitVars = FLAGS, OBJECT_TK, sizeof(EnTk), - (ActorFunc)EnTk_Init, - (ActorFunc)EnTk_Destroy, - (ActorFunc)EnTk_Update, - (ActorFunc)EnTk_Draw, + EnTk_Init, + EnTk_Destroy, + EnTk_Update, + EnTk_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1B900.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1B9A4.s") +void EnTk_Eff_Create(EnTk *this, Vec3f *pos, Vec3f *speed, Vec3f *accel, + u8 duration, f32 size, f32 growth) +{ + s16 i; + EnTkEff *eff = this->eff; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BAB0.s") + for (i = 0; i < ARRAY_COUNT(this->eff); i++) + { + if (eff->active != 1) + { + eff->size = size; + eff->growth = growth; + eff->time_total = eff->time_left = duration; + eff->active = 1; + eff->pos = *pos; + eff->accel = *accel; + eff->speed = *speed; + break; + } + eff++; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BDDC.s") +void EnTk_Eff_Update(EnTk *this) +{ + s16 i; + EnTkEff *eff; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BE94.s") + eff = this->eff; + for (i = 0; i < ARRAY_COUNT(this->eff); i++) + { + if (eff->active != 0) + { + eff->time_left--; + if (eff->time_left == 0) + { + eff->active = 0; + } + eff->accel.x = Math_Rand_ZeroOne() * 0.4f - 0.2f; + eff->accel.z = Math_Rand_ZeroOne() * 0.4f - 0.2f; + VEC3_ADD(eff->pos, eff->speed) + VEC3_ADD(eff->speed, eff->accel) + eff->size += eff->growth; + } + eff++; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BF14.s") +void EnTk_Eff_Draw(EnTk *this, GlobalContext *ctxt) +{ + static u32 images[] = + { + (u32)&D_040539B0, + (u32)&D_040535B0, + (u32)&D_040531B0, + (u32)&D_04052DB0, + (u32)&D_040529B0, + (u32)&D_040525B0, + (u32)&D_040521B0, + (u32)&D_04051DB0, + }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BF8C.s") + EnTkEff *eff = this->eff; + GraphicsContext *gfx; + s16 gfx_setup; + s16 i; + s16 alpha; + s16 image_idx; + Gfx *pgdl[4]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C00C.s") + /* + * This assignment always occurs before a call to func_800C6AC4 which + * makes me suspect that they're inside a macro where the function call + * is present only for debug builds. Same for func_800C6B54 most likely. + */ + gfx = ctxt->state.gfxCtx; + func_800C6AC4(pgdl, ctxt->state.gfxCtx, "../z_en_tk_eff.c", 114); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C0D0.s") + gfx_setup = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C154.s") + /* + * Same code is generated without the if, + * but that would make the do...while redundant so there's probably an if. + */ + do { if (1) { func_80093D84(ctxt->state.gfxCtx); } } while (0); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C23C.s") + for (i = 0; i < ARRAY_COUNT(this->eff); i++) + { + if (eff->active != 0) + { + if (gfx_setup == 0) + { + gfx->polyXlu.p = func_80093774(gfx->polyXlu.p, 0); + gSPDisplayList(gfx->polyXlu.p++, &D_0600BC90); + gDPSetEnvColor(gfx->polyXlu.p++, 0x64, 0x3C, 0x14, 0x00); + gfx_setup = 1; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C2B4.s") + alpha = eff->time_left * (255.f / eff->time_total); + gDPSetPrimColor(gfx->polyXlu.p++, 0, 0, 0xAA, 0x82, 0x5A, alpha); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C3DC.s") + gDPPipeSync(gfx->polyXlu.p++); + Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, 0); + func_800D1FD4(&ctxt->mf_11DA0); + Matrix_Scale(eff->size, eff->size, 1.f, 1); + gSPMatrix(gfx->polyXlu.p++, + Matrix_NewMtx(ctxt->state.gfxCtx, "../z_en_tk_eff.c", + 140), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C54C.s") + image_idx = eff->time_left * + ((f32)ARRAY_COUNT(images) / eff->time_total); + gSPSegment(gfx->polyXlu.p++, 0x08, + SEGMENTED_TO_VIRTUAL(images[image_idx])); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C5A0.s") + gSPDisplayList(gfx->polyXlu.p++, &D_0600BCA0); + } + eff++; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C738.s") + func_800C6B54(pgdl, ctxt->state.gfxCtx, "../z_en_tk_eff.c", 154); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C8F0.s") +s32 EnTk_Eff_CreateDflt(EnTk *this, Vec3f *pos, u8 duration, f32 size, + f32 growth, f32 y_accel_max) +{ + Vec3f speed = {0.f, 0.f, 0.f}; + Vec3f accel = {0.f, 0.3f, 0.f}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Init.s") + accel.y += Math_Rand_ZeroOne() * y_accel_max; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Destroy.s") + EnTk_Eff_Create(this, pos, &speed, &accel, duration, size, growth); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1CC04.s") + return 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1CE28.s") +/** z_en_tk_eff.c ends here probably **/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1CEF8.s") +static ColliderCylinderInit D_80B1D508 = +{ + { + 0x0A, + 0x00, + 0x00, + 0x39, + 0x20, + 0x01, + { + 0x00, + 0x00, + }, + }, + { + 0x00, + { + 0x00, + 0x00, + 0x00, + }, + 0x00000000, + 0x00, + 0x00, + { + 0x00, + 0x00, + }, + 0x00000000, + { + 0x00, + 0x00, + 0x00, + 0x00, + }, + 0x00, + 0x00, + 0x01, + 0x00, + }, + { + 0x001E, + 0x0034, + 0x0000, + { + 0x0000, + 0x0000, + 0x0000, + }, + }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Update.s") +static EnTk_SubActorStruct98Init D_80B1D534 = +{ + 0x00, + 0x0000, + 0x0000, + 0x0000, + 0xFF, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1D200.s") +void EnTk_Stop(EnTk *this, GlobalContext *ctxt) +{ + UNK_PTR anim = &D_06002F84; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1D278.s") + SkelAnime_ChangeAnimation(&this->skel_anim, (u32)anim, 1.f, 0.f, + SkelAnime_GetFrameCount((u32)&D_06002F84), 0, + -10.f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1D2E4.s") + this->action_countdown = Math_Rand_S16Offset(60, 60); + this->actor.speedXZ = 0.f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Draw.s") +void EnTk_Walk(EnTk *this, GlobalContext *ctxt) +{ + UNK_PTR anim = &D_06001FA8; + + SkelAnime_ChangeAnimation(&this->skel_anim, (u32)anim, 1.f, 0.f, + SkelAnime_GetFrameCount((u32)&D_06002F84), 0, + -10.f); + + this->action_countdown = Math_Rand_S16Offset(240, 240); +} + +void EnTk_Dig(EnTk *this, GlobalContext *ctxt) +{ + UNK_PTR anim = &D_06001144; + + SkelAnime_ChangeAnimation(&this->skel_anim, (u32)anim, 1.f, 0.f, + SkelAnime_GetFrameCount((u32)&D_06001144), 0, + -10.f); + + if (EnTk_CheckNextSpot(this, ctxt) >= 0) + { + this->valid_dig_here = 1; + } +} + +void EnTk_UpdateEyes(EnTk *this) +{ + if (DECR(this->blink_countdown) == 0) + { + this->eye_image_idx++; + if (this->eye_image_idx > 2) + { + this->blink_cycles--; + if (this->blink_cycles < 0) + { + this->blink_countdown = Math_Rand_S16Offset(30, 30); + this->blink_cycles = 2; + if (Math_Rand_ZeroOne() > 0.5f) + { + this->blink_cycles++; + } + } + this->eye_image_idx = 0; + } + } +} + +s32 EnTk_CheckFacingPlayer(EnTk *this) +{ + s16 v0; + s16 v1; + + if (this->actor.waterSurfaceDist > 10000.f) + { + return 0; + } + + v0 = this->actor.shape.rot.y; + v0 -= this->h_21E; + v0 -= this->head_rot; + + v1 = this->actor.rotTowardsLinkY - v0; + if (ABS(v1) < 0x1554) + { + return 1; + } + else + { + return 0; + } +} + +s32 EnTk_CheckNextSpot(EnTk *this, GlobalContext *ctxt) +{ + Actor *prop; + f32 dxz; + f32 dy; + + prop = ctxt->actorCtx.actorList[ACTORTYPE_PROP].first; + + while (prop != NULL) + { + if (prop->id != ACTOR_EN_IT) + { + prop = prop->next; + continue; + } + + if (prop == this->current_spot) + { + prop = prop->next; + continue; + } + + dy = prop->posRot.pos.y - this->actor.unk_80; + dxz = func_8002DB8C(&this->actor, prop); + if (dxz > 40.f || dy > 10.f) + { + prop = prop->next; + continue; + } + + this->current_spot = prop; + return prop->params; + } + + return -1; +} + +void EnTk_CheckCurrentSpot(EnTk *this) +{ + f32 dxz; + f32 dy; + + if (this->current_spot != NULL) + { + dy = this->current_spot->posRot.pos.y - this->actor.unk_80; + dxz = func_8002DB8C(&this->actor, this->current_spot); + if (dxz > 40.f || dy > 10.f) + { + this->current_spot = NULL; + } + } +} + +f32 EnTk_Step(EnTk *this, GlobalContext *ctxt) +{ + f32 step_frames[] = {36.f, 10.f}; + f32 a1_; + s32 i; + + if (this->skel_anim.animCurrentFrame == 0.f || + this->skel_anim.animCurrentFrame == 25.f) + { + /* NA_SE_EN_MORIBLIN_WALK */ + Audio_PlayActorSound2(&this->actor, 0x38B8); + } + + if (this->skel_anim.animCurrent != (u32)&D_06001FA8) + { + return 0.f; + } + + a1_ = this->skel_anim.animCurrentFrame; + for (i = 0; i < ARRAY_COUNT(step_frames); i++) + { + if (a1_ < step_frames[i] + 12.f && a1_ >= step_frames[i]) + { + break; + } + } + if (i >= ARRAY_COUNT(step_frames)) + { + return 0.f; + } + else + { + a1_ = (0x8000 / 12.f) * (a1_ - step_frames[i]); + return Math_Sins(a1_) * 2.f; + } +} + +s32 EnTk_Orient(EnTk *this, GlobalContext *ctxt) +{ + Path *path; + Vec3s *point; + f32 dx; + f32 dz; + + if (this->actor.params < 0) + { + return 1; + } + + path = &ctxt->setupPathList[0]; + point = SEGMENTED_TO_VIRTUAL(path->point_array); + point += this->current_waypoint; + + dx = point->x - this->actor.posRot.pos.x; + dz = point->z - this->actor.posRot.pos.z; + + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, + func_800FD250(dx, dz) * (0x8000 / M_PI), + 10, 1000, 1); + this->actor.posRot.rot = this->actor.shape.rot; + + if (SQ(dx) + SQ(dz) < 10.f) + { + this->current_waypoint++; + if (this->current_waypoint >= path->n_points) + { + this->current_waypoint = 0; + } + + return 0; + } + else + { + return 1; + } +} + +u16 func_80B1C54C(GlobalContext *ctxt, Actor *a1) +{ + u16 ret; + + ret = func_8006C360(ctxt, 14); + if (ret != 0) + { + return ret; + } + + if (gSaveContext.inf_table[13] & 0x0200) + { + /* "Do you want me to dig here? ..." */ + return 0x5019; + } + else + { + /* "Hey kid! ..." */ + return 0x5018; + } +} + +s16 func_80B1C5A0(GlobalContext *ctxt, Actor *actor) +{ + s32 ret = 1; + + switch (func_8010BDBC(&ctxt->msgCtx)) + { + case 0: + { + break; + } + case 1: + { + break; + } + case 2: + { + /* "I am the boss of the carpenters ..." (wtf?) */ + if (actor->textId == 0x5028) + { + gSaveContext.inf_table[13] |= 0x0100; + } + ret = 0; + break; + } + case 3: + { + break; + } + case 4: + { + if (func_80106BC8(ctxt) != 0 && + (actor->textId == 0x5018 || actor->textId == 0x5019)) + { + if (ctxt->msgCtx.choiceIndex == 1) + { + /* "Thanks a lot!" */ + actor->textId = 0x0084; + } + else if (gSaveContext.rupees < 10) + { + /* "You don't have enough Rupees!" */ + actor->textId = 0x0085; + } + else + { + ctxt->msgCtx.msgMode = 0x37; + Rupees_ChangeBy(-10); + gSaveContext.inf_table[13] |= 0x0200; + return 2; + } + func_8010B720(ctxt, actor->textId); + gSaveContext.inf_table[13] |= 0x0200; + } + break; + } + case 5: + { + if (func_80106BC8(ctxt) != 0 && + (actor->textId == 0x0084 || actor->textId == 0x0085)) + { + func_80106CCC(ctxt); + ret = 0; + } + break; + } + case 6: + { + break; + } + case 7: + { + break; + } + case 8: + { + break; + } + case 9: + { + break; + } + } + + return ret; +} + +s32 EnTk_ChooseReward(EnTk *this) +{ + f32 luck; + s32 reward; + + luck = Math_Rand_ZeroOne(); + + if (luck < 0.4f) + { + reward = 0; + } + else if (luck < 0.7) + { + reward = 1; + } + else if (luck < 0.9) + { + reward = 2; + } + else + { + reward = 3; + } + + switch (reward) + { + case 0: + { + if (this->reward_count[0] < 8) + { + this->reward_count[0] += 1; + return reward; + } + break; + } + case 1: + { + if (this->reward_count[1] < 4) + { + this->reward_count[1] += 1; + return reward; + } + break; + } + case 2: + { + if (this->reward_count[2] < 2) + { + this->reward_count[2] += 1; + return reward; + } + break; + } + case 3: + { + if (this->reward_count[3] < 1) + { + this->reward_count[3] += 1; + return reward; + } + break; + } + } + + if (this->reward_count[0] < 8) + { + this->reward_count[0] += 1; + reward = 0; + } + else if (this->reward_count[1] < 4) + { + this->reward_count[1] += 1; + reward = 1; + } + else if (this->reward_count[2] < 2) + { + this->reward_count[2] += 1; + reward = 2; + } + else if (this->reward_count[3] < 1) + { + this->reward_count[3] += 1; + reward = 3; + } + else + { + reward = 0; + this->reward_count[0] = 1; + this->reward_count[1] = 0; + this->reward_count[2] = 0; + this->reward_count[3] = 0; + } + + return reward; +} + +void EnTk_Dig_Eff(EnTk *this) +{ + Vec3f pos = {0.f, 0.f, 0.f}; + Vec3f speed = {0.f, 0.f, 0.f}; + Vec3f accel = {0.f, 0.3f, 0.f}; + + if (this->skel_anim.animCurrentFrame >= 32.f && + this->skel_anim.animCurrentFrame < 40.f) + { + pos.x = (Math_Rand_ZeroOne() - 0.5f) * 12.f + this->v3f_304.x; + pos.y = (Math_Rand_ZeroOne() - 0.5f) * 8.f + this->v3f_304.y; + pos.z = (Math_Rand_ZeroOne() - 0.5f) * 12.f + this->v3f_304.z; + EnTk_Eff_CreateDflt(this, &pos, 12, 0.2f, 0.1f, 0.f); + } +} + +void EnTk_Init(Actor *this, GlobalContext *ctxt) +{ + EnTk *tk = (EnTk *)this; + UNK_PTR anim = &D_06002F84; + + ActorShape_Init(&tk->actor.shape, 0, ActorShadow_DrawFunc_Circle, 24.f); + + func_800A46F8(ctxt, &tk->skel_anim, (u32)&D_0600BE40, 0, tk->hz_22A, + tk->hz_296, 18); + SkelAnime_ChangeAnimation(&tk->skel_anim, (u32)anim, 1.f, 0.f, + SkelAnime_GetFrameCount((u32)&D_06002F84), + 0, 0.f); + + ActorCollider_AllocCylinder(ctxt, &tk->collider); + ActorCollider_InitCylinder(ctxt, &tk->collider, &tk->actor, &D_80B1D508); + + func_80061EFC(&tk->actor.sub_98, NULL, &D_80B1D534); + + if (gSaveContext.day_time <= 0xC000 || + gSaveContext.day_time >= 0xE000 || + !LINK_IS_CHILD || + ctxt->sceneNum != SCENE_SPOT02) + { + Actor_Kill(&tk->actor); + return; + } + + Actor_SetScale(&tk->actor, 0.01f); + + tk->actor.unk_1F = 6; + tk->actor.gravity = -0.1f; + tk->current_reward = -1; + tk->current_spot = NULL; + tk->action_func = EnTk_Stop_Update; +} + +void EnTk_Destroy(Actor *this, GlobalContext *ctxt) +{ + EnTk *tk = (EnTk *)this; + ActorCollider_FreeCylinder(ctxt, &tk->collider); +} + +void EnTk_Stop_Update(EnTk *this, GlobalContext *ctxt) +{ + s16 v1; + s16 a1_; + + if (this->h_1E0 != 0) + { + v1 = this->actor.shape.rot.y; + v1 -= this->h_21E; + v1 = this->actor.rotTowardsLinkY - v1; + + if (this->h_1E0 == 2) + { + EnTk_Dig(this, ctxt); + this->h_1E0 = 0; + this->action_func = EnTk_Dig_Update; + return; + } + + func_800343CC(ctxt, &this->actor, &this->h_1E0, + this->collider.dim.radius + 30.f, + func_80B1C54C, func_80B1C5A0); + } + else if (EnTk_CheckFacingPlayer(this) != 0) + { + v1 = this->actor.shape.rot.y; + v1 -= this->h_21E; + v1 = this->actor.rotTowardsLinkY - v1; + + this->action_countdown = 0; + func_800343CC(ctxt, &this->actor, &this->h_1E0, + this->collider.dim.radius + 30.f, + func_80B1C54C, func_80B1C5A0); + } + else if (func_8002F194(&this->actor, ctxt) != 0) + { + v1 = this->actor.shape.rot.y; + v1 -= this->h_21E; + v1 = this->actor.rotTowardsLinkY - v1; + + this->action_countdown = 0; + this->h_1E0 = 1; + } + else if (DECR(this->action_countdown) == 0) + { + EnTk_Walk(this, ctxt); + this->action_func = EnTk_Walk_Update; + + /*! @bug v1 is uninitialized past this branch */ + } + else + { + v1 = 0; + } + + a1_ = CLAMP(-v1, 1270, 10730); + Math_SmoothScaleMaxMinS(&this->head_rot, a1_, 6, 1000, 1); +} + +void EnTk_Walk_Update(EnTk *this, GlobalContext *ctxt) +{ + if (this->h_1E0 == 2) + { + EnTk_Dig(this, ctxt); + this->h_1E0 = 0; + this->action_func = EnTk_Dig_Update; + } + else + { + this->actor.speedXZ = EnTk_Step(this, ctxt); + EnTk_Orient(this, ctxt); + Math_SmoothScaleMaxMinS(&this->head_rot, 0, 6, 1000, 1); + EnTk_CheckCurrentSpot(this); + + DECR(this->action_countdown); + if (EnTk_CheckFacingPlayer(this) != 0 || this->action_countdown == 0) + { + EnTk_Stop(this, ctxt); + this->action_func = EnTk_Stop_Update; + } + } +} + +void EnTk_Dig_Update(EnTk *this, GlobalContext *ctxt) +{ + Vec3f reward_origin; + Vec3f reward_pos; + s32 reward_params[] = + { + 0x0000, /* Green rupee */ + 0x0001, /* Blue rupee */ + 0x0002, /* Red rupee */ + 0x0014, /* Purple rupee */ + 0x0006, /* Heart piece */ + }; + + EnTk_Dig_Eff(this); + + if (this->skel_anim.animCurrentFrame == 32.f) + { + /* NA_SE_EV_DIG_UP - What's gonna come out? */ + Audio_PlayActorSound2(&this->actor, 0x28C8); + + this->reward_timer = 0; + + if (this->valid_dig_here == 1) + { + reward_origin.x = 0.f; + reward_origin.y = 0.f; + reward_origin.z = -40.f; + + Matrix_RotateY(this->actor.shape.rot.y, 0); + Matrix_MultVec3f(&reward_origin, &reward_pos); + + VEC3_ADD(reward_pos, this->actor.posRot.pos) + + this->current_reward = EnTk_ChooseReward(this); + if (this->current_reward == 3) + { + /* + * Upgrade the purple rupee reward to the heart piece if this + * is the first grand prize dig. + */ + if ((gSaveContext.item_get_inf[1] & 0x1000) == 0) + { + gSaveContext.item_get_inf[1] |= 0x1000; + this->current_reward = 4; + } + } + + Item_DropCollectible(ctxt, &reward_pos, + reward_params[this->current_reward]); + } + } + + if (this->skel_anim.animCurrentFrame >= 32.f && this->reward_timer == 10) + { + /* Play a reward sound shortly after digging */ + if (this->valid_dig_here == 0) + { + /* NA_SE_SY_ERROR - Bad dig spot */ + Audio_PlayActorSound2(&this->actor, 0x4806); + } + else if (this->current_reward == 4) + { + /* NA_SE_SY_CORRECT_CHIME - Heart piece */ + Audio_PlaySoundGeneral(0x4802, &D_801333D4, 4, &D_801333E0, + &D_801333E0, &D_801333E8); + } + else + { + /* NA_SE_SY_TRE_BOX_APPEAR - Rupee */ + Audio_PlayActorSound2(&this->actor, 0x4807); + } + } + this->reward_timer++; + + if (func_800A56C8(&this->skel_anim, this->skel_anim.animFrameCount) != 0) + { + if (this->current_reward < 0) + { + /* "Nope, nothing here!" */ + func_8010B680(ctxt, 0x501A, 0); + } + else + { + func_80106CCC(ctxt); + } + + EnTk_Stop(this, ctxt); + + this->current_reward = -1; + this->valid_dig_here = 0; + this->action_func = EnTk_Stop_Update; + } +} + +void EnTk_Update(Actor *this, GlobalContext *ctxt) +{ + EnTk *tk = (EnTk *)this; + ColliderCylinderMain *collider = &tk->collider; + + ActorCollider_Cylinder_Update(&tk->actor, collider); + Actor_CollisionCheck_SetOT(ctxt, &ctxt->sub_11E60, collider); + + SkelAnime_FrameUpdateMatrix(&tk->skel_anim); + + Actor_MoveForward(&tk->actor); + + func_8002E4B4(ctxt, &tk->actor, 40.f, 10.f, 0.f, 5); + + tk->action_func(tk, ctxt); + + EnTk_Eff_Update(tk); + + EnTk_UpdateEyes(tk); +} + +void func_80B1D200(GlobalContext *ctxt) +{ + GraphicsContext *gfx; + Gfx *pgdl[4]; + + gfx = ctxt->state.gfxCtx; + func_800C6AC4(pgdl, ctxt->state.gfxCtx, "../z_en_tk.c", 1188); + + gSPDisplayList(gfx->polyOpa.p++, &D_0600ACE0); + + func_800C6B54(pgdl, ctxt->state.gfxCtx, "../z_en_tk.c", 1190); +} + +s32 func_80B1D278(s16 a0, UNK_TYPE a1, UNK_TYPE a2, UNK_TYPE a3, Vec3s *sp10, + Actor *actor) +{ + EnTk *tk = (EnTk *)actor; + + switch (a1) + { + /* Limb 15 - Head */ + case 15: + { + tk->h_21E = sp10->y; + break; + } + /* Limb 16 - Jaw */ + case 16: + { + tk->h_21E += sp10->y; + sp10->y += tk->head_rot; + break; + } + } + + return 0; +} + +void func_80B1D2E4(GlobalContext *ctxt, UNK_TYPE a1, UNK_TYPE a2, UNK_TYPE a3, + Actor *actor) +{ + EnTk *this = (EnTk *)actor; + Vec3f sp28 = {0.f, 0.f, 4600.f}; + Vec3f sp1C = {0.f, 0.f, 0.f}; + + /* Limb 16 - Jaw */ + if (a1 == 16) + { + Matrix_MultVec3f(&sp1C, &this->actor.posRot2.pos); + } + + /* Limb 14 - Neck */ + if (a1 == 14) + { + Matrix_MultVec3f(&sp28, &this->v3f_304); + func_80B1D200(ctxt); + } +} + +void EnTk_Draw(Actor *this, GlobalContext *ctxt) +{ + static u32 eye_images[] = + { + (u32)&D_06003B40, + (u32)&D_06004340, + (u32)&D_06004B40, + }; + + EnTk *tk = (EnTk *)this; + GraphicsContext *gfx; + Gfx *pgdl[4]; + + Matrix_Push(); + EnTk_Eff_Draw(tk, ctxt); + Matrix_Pull(); + + gfx = ctxt->state.gfxCtx; + func_800C6AC4(pgdl, ctxt->state.gfxCtx, "../z_en_tk.c", 1294); + + func_80093D18(ctxt->state.gfxCtx); + + gSPSegment(gfx->polyOpa.p++, 0x08, + SEGMENTED_TO_VIRTUAL(eye_images[tk->eye_image_idx])); + + func_800A1AC8(ctxt, tk->skel_anim.limbIndex, + tk->skel_anim.actorDrawTbl, tk->skel_anim.dListCount, + func_80B1D278, func_80B1D2E4, &tk->actor); + + func_800C6B54(pgdl, ctxt->state.gfxCtx, "../z_en_tk.c", 1312); +} diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.h b/src/overlays/actors/ovl_En_Tk/z_en_tk.h index 9f6b3323b0..22c8ae5d46 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.h +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.h @@ -4,11 +4,54 @@ #include #include +/* Dust particle effect */ typedef struct { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x624]; -} EnTk; // size = 0x0770 + /* 0x0000 */ u8 active; + /* 0x0001 */ u8 time_left; + /* 0x0002 */ u8 time_total; + /* 0x0004 */ f32 size; + /* 0x0008 */ f32 growth; + /* 0x000C */ char unk_C[0x8]; + /* 0x0014 */ Vec3f pos; + /* 0x0020 */ Vec3f speed; + /* 0x002C */ Vec3f accel; + /* 0x0038 */ +} EnTkEff; + +typedef struct EnTk EnTk; + +typedef void EnTkFunc(EnTk *this, GlobalContext *ctxt); + +struct EnTk +{ + /* 0x0000 */ Actor actor; + /* 0x014C */ SkelAnime skel_anim; + /* 0x018C */ char unk_18C[0x4]; + /* 0x0190 */ EnTkFunc *action_func; + /* 0x0194 */ ColliderCylinderMain + collider; + /* 0x01E0 */ s16 h_1E0; + /* 0x01E2 */ char unk_1E2[0x26]; + /* 0x0208 */ u8 valid_dig_here; + /* 0x0209 */ u8 reward_count[4]; + /* 0x0210 */ Actor *current_spot; + /* 0x0214 */ s32 current_reward; + /* 0x0218 */ s16 blink_cycles; + /* 0x021A */ s16 reward_timer; + /* 0x021C */ s16 action_countdown; + /* 0x021E */ s16 h_21E; + /* 0x0220 */ char unk_220[0x2]; + /* 0x0222 */ s16 eye_image_idx; + /* 0x0224 */ s16 blink_countdown; + /* 0x0226 */ s16 head_rot; + /* 0x0228 */ s16 current_waypoint; + /* 0x022A */ u16 hz_22A[54]; + /* 0x022A */ u16 hz_296[55]; + /* 0x0304 */ Vec3f v3f_304; + /* 0x0310 */ EnTkEff eff[20]; + /* 0x0770 */ +}; extern const ActorInit En_Tk_InitVars; diff --git a/undefined_syms.txt b/undefined_syms.txt index 102b185600..43d0132a3d 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -309,6 +309,27 @@ D_06008604 = 0x06008604; D_06001420 = 0x06001420; D_06009A90 = 0x06009A90; +// z_en_tk +D_04051DB0 = 0x04051DB0; +D_040521B0 = 0x040521B0; +D_040525B0 = 0x040525B0; +D_040529B0 = 0x040529B0; +D_04052DB0 = 0x04052DB0; +D_040531B0 = 0x040531B0; +D_040535B0 = 0x040535B0; +D_040539B0 = 0x040539B0; +D_06001144 = 0x06001144; +D_06001FA8 = 0x06001FA8; +D_06002F84 = 0x06002F84; +D_06003B40 = 0x06003B40; +D_06004340 = 0x06004340; +D_06004B40 = 0x06004B40; +D_0600ACE0 = 0x0600ACE0; +D_0600BC90 = 0x0600BC90; +D_0600BCA0 = 0x0600BCA0; +D_0600BE40 = 0x0600BE40; +D_8002B5EC = 0x8002B5EC; + // z_arms_hook D_0602B288 = 0x0602B288; D_0602AFF0 = 0x0602AFF0;