From 0ebe904d0c0511b48cae28670b8dfcad7e12fadf Mon Sep 17 00:00:00 2001 From: krimtonz <33664508+krimtonz@users.noreply.github.com> Date: Thu, 7 May 2020 18:18:09 -0500 Subject: [PATCH] En_Floormas OK (#97) * EnFloorMas wip * floormaster formatting * floormaster wip * ovl_En_Floormas OK * pr recommendations * pr updates --- .../ovl_En_Floormas/EnFloormas_Destroy.s | 12 - .../actors/ovl_En_Floormas/EnFloormas_Draw.s | 76 -- .../actors/ovl_En_Floormas/EnFloormas_Init.s | 148 --- .../ovl_En_Floormas/EnFloormas_Update.s | 179 --- .../actors/ovl_En_Floormas/func_80A17748.s | 9 - .../actors/ovl_En_Floormas/func_80A17768.s | 7 - .../actors/ovl_En_Floormas/func_80A17780.s | 19 - .../actors/ovl_En_Floormas/func_80A177C8.s | 17 - .../actors/ovl_En_Floormas/func_80A17808.s | 39 - .../actors/ovl_En_Floormas/func_80A17894.s | 19 - .../actors/ovl_En_Floormas/func_80A178DC.s | 12 - .../actors/ovl_En_Floormas/func_80A17908.s | 92 -- .../actors/ovl_En_Floormas/func_80A17A38.s | 58 - .../actors/ovl_En_Floormas/func_80A17B10.s | 18 - .../actors/ovl_En_Floormas/func_80A17B40.s | 48 - .../actors/ovl_En_Floormas/func_80A17BEC.s | 99 -- .../actors/ovl_En_Floormas/func_80A17D4C.s | 21 - .../actors/ovl_En_Floormas/func_80A17D9C.s | 26 - .../actors/ovl_En_Floormas/func_80A17DFC.s | 55 - .../actors/ovl_En_Floormas/func_80A17ED4.s | 28 - .../actors/ovl_En_Floormas/func_80A17F3C.s | 28 - .../actors/ovl_En_Floormas/func_80A17FA4.s | 134 -- .../actors/ovl_En_Floormas/func_80A1817C.s | 23 - .../actors/ovl_En_Floormas/func_80A181D4.s | 39 - .../actors/ovl_En_Floormas/func_80A18254.s | 50 - .../actors/ovl_En_Floormas/func_80A18310.s | 22 - .../actors/ovl_En_Floormas/func_80A18364.s | 76 -- .../actors/ovl_En_Floormas/func_80A18464.s | 49 - .../actors/ovl_En_Floormas/func_80A18500.s | 55 - .../actors/ovl_En_Floormas/func_80A185C4.s | 46 - .../actors/ovl_En_Floormas/func_80A18650.s | 98 -- .../actors/ovl_En_Floormas/func_80A187AC.s | 17 - .../actors/ovl_En_Floormas/func_80A187E4.s | 75 -- .../actors/ovl_En_Floormas/func_80A188F0.s | 137 -- .../actors/ovl_En_Floormas/func_80A18AB4.s | 38 - .../actors/ovl_En_Floormas/func_80A18B38.s | 85 -- .../actors/ovl_En_Floormas/func_80A18C78.s | 73 -- .../actors/ovl_En_Floormas/func_80A18D68.s | 147 --- .../actors/ovl_En_Floormas/func_80A18F50.s | 41 - .../actors/ovl_En_Floormas/func_80A18FD8.s | 70 - .../actors/ovl_En_Floormas/func_80A190C8.s | 104 -- .../actors/ovl_En_Floormas/func_80A19230.s | 26 - .../actors/ovl_En_Floormas/func_80A1928C.s | 87 -- .../actors/ovl_En_Floormas/func_80A193C4.s | 227 ---- .../actors/ovl_En_Floormas/func_80A196DC.s | 146 --- .../actors/ovl_En_Floormas/func_80A198EC.s | 201 --- .../actors/ovl_En_Floormas/func_80A19B9C.s | 4 - .../actors/ovl_En_Floormas/func_80A19BA8.s | 64 - .../actors/ovl_En_Floormas/func_80A19C6C.s | 17 - .../actors/ovl_En_Floormas/func_80A19CA4.s | 34 - .../actors/ovl_En_Floormas/func_80A19D18.s | 130 -- .../actors/ovl_En_Floormas/func_80A1A128.s | 16 - .../actors/ovl_En_Floormas/func_80A1A160.s | 75 -- .../actors/ovl_En_Floormas/func_80A1A350.s | 77 -- include/functions.h | 8 +- include/math.h | 1 + include/sfx.h | 4 +- include/z64.h | 4 +- include/z64actor.h | 2 +- spec | 3 +- src/code/z_actor.c | 2 +- src/code/z_en_a_keep.c | 3 +- .../actors/ovl_En_Floormas/z_en_floormas.c | 1129 ++++++++++++++++- .../actors/ovl_En_Floormas/z_en_floormas.h | 18 +- .../actors/ovl_En_Lightbox/z_en_lightbox.c | 2 +- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 12 +- undefined_syms.txt | 4 + 67 files changed, 1110 insertions(+), 3575 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17748.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17768.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17780.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A177C8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17808.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17894.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A178DC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17908.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17A38.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17B10.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17B40.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17BEC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D4C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D9C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17DFC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17ED4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17F3C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17FA4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1817C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A181D4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18254.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18310.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18364.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18464.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18500.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A185C4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18650.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A187AC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A187E4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A188F0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18AB4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18B38.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18C78.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18D68.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18F50.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18FD8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A190C8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19230.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1928C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A193C4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A196DC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A198EC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19B9C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19BA8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19C6C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19CA4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19D18.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A128.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A160.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A350.s diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Destroy.s deleted file mode 100644 index f5b3a6887e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Destroy.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel EnFloormas_Destroy -/* 00210 80A17720 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00214 80A17724 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00218 80A17728 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0021C 80A1772C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00220 80A17730 0C0170EB */ jal Collider_DestroyCylinder - -/* 00224 80A17734 24C502C8 */ addiu $a1, $a2, 0x02C8 ## $a1 = 000002C8 -/* 00228 80A17738 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0022C 80A1773C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00230 80A17740 03E00008 */ jr $ra -/* 00234 80A17744 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Draw.s deleted file mode 100644 index 4ada824a4c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Draw.s +++ /dev/null @@ -1,76 +0,0 @@ -.rdata -glabel D_80A1A514 - .asciz "../z_en_floormas.c" - .balign 4 - -glabel D_80A1A528 - .asciz "../z_en_floormas.c" - .balign 4 - -.text -glabel EnFloormas_Draw -/* 02D44 80A1A254 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 02D48 80A1A258 AFB10028 */ sw $s1, 0x0028($sp) -/* 02D4C 80A1A25C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02D50 80A1A260 AFBF002C */ sw $ra, 0x002C($sp) -/* 02D54 80A1A264 AFB00024 */ sw $s0, 0x0024($sp) -/* 02D58 80A1A268 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 02D5C 80A1A26C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02D60 80A1A270 3C0680A2 */ lui $a2, %hi(D_80A1A514) ## $a2 = 80A20000 -/* 02D64 80A1A274 24C6A514 */ addiu $a2, $a2, %lo(D_80A1A514) ## $a2 = 80A1A514 -/* 02D68 80A1A278 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 -/* 02D6C 80A1A27C 2407090E */ addiu $a3, $zero, 0x090E ## $a3 = 0000090E -/* 02D70 80A1A280 0C031AB1 */ jal Graph_OpenDisps -/* 02D74 80A1A284 AFA50048 */ sw $a1, 0x0048($sp) -/* 02D78 80A1A288 0C024F46 */ jal func_80093D18 -/* 02D7C 80A1A28C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 02D80 80A1A290 920E02DC */ lbu $t6, 0x02DC($s0) ## 000002DC -/* 02D84 80A1A294 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 02D88 80A1A298 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02D8C 80A1A29C 15C1000A */ bne $t6, $at, .L80A1A2C8 -/* 02D90 80A1A2A0 3C0580A2 */ lui $a1, %hi(D_80A1A4F4) ## $a1 = 80A20000 -/* 02D94 80A1A2A4 86060196 */ lh $a2, 0x0196($s0) ## 00000196 -/* 02D98 80A1A2A8 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 02D9C 80A1A2AC 24A5A4F4 */ addiu $a1, $a1, %lo(D_80A1A4F4) ## $a1 = 80A1A4F4 -/* 02DA0 80A1A2B0 00C1001A */ div $zero, $a2, $at -/* 02DA4 80A1A2B4 00003010 */ mfhi $a2 -/* 02DA8 80A1A2B8 00063400 */ sll $a2, $a2, 16 -/* 02DAC 80A1A2BC 00063403 */ sra $a2, $a2, 16 -/* 02DB0 80A1A2C0 0C00988C */ jal func_80026230 -/* 02DB4 80A1A2C4 24070028 */ addiu $a3, $zero, 0x0028 ## $a3 = 00000028 -.L80A1A2C8: -/* 02DB8 80A1A2C8 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 02DBC 80A1A2CC 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 02DC0 80A1A2D0 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 02DC4 80A1A2D4 8FB90048 */ lw $t9, 0x0048($sp) -/* 02DC8 80A1A2D8 3C0F80A2 */ lui $t7, %hi(func_80A1A128) ## $t7 = 80A20000 -/* 02DCC 80A1A2DC 3C1880A2 */ lui $t8, %hi(func_80A1A160) ## $t8 = 80A20000 -/* 02DD0 80A1A2E0 2718A160 */ addiu $t8, $t8, %lo(func_80A1A160) ## $t8 = 80A1A160 -/* 02DD4 80A1A2E4 25EFA128 */ addiu $t7, $t7, %lo(func_80A1A128) ## $t7 = 80A1A128 -/* 02DD8 80A1A2E8 AFAF0010 */ sw $t7, 0x0010($sp) -/* 02DDC 80A1A2EC AFB80014 */ sw $t8, 0x0014($sp) -/* 02DE0 80A1A2F0 AFB00018 */ sw $s0, 0x0018($sp) -/* 02DE4 80A1A2F4 8F2802C0 */ lw $t0, 0x02C0($t9) ## 000002C0 -/* 02DE8 80A1A2F8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02DEC 80A1A2FC 0C0289CF */ jal SkelAnime_DrawSV2 -/* 02DF0 80A1A300 AFA8001C */ sw $t0, 0x001C($sp) -/* 02DF4 80A1A304 8FA90048 */ lw $t1, 0x0048($sp) -/* 02DF8 80A1A308 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 02DFC 80A1A30C AD2202C0 */ sw $v0, 0x02C0($t1) ## 000002C0 -/* 02E00 80A1A310 920A02DC */ lbu $t2, 0x02DC($s0) ## 000002DC -/* 02E04 80A1A314 15410003 */ bne $t2, $at, .L80A1A324 -/* 02E08 80A1A318 00000000 */ nop -/* 02E0C 80A1A31C 0C009982 */ jal func_80026608 -/* 02E10 80A1A320 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80A1A324: -/* 02E14 80A1A324 3C0680A2 */ lui $a2, %hi(D_80A1A528) ## $a2 = 80A20000 -/* 02E18 80A1A328 24C6A528 */ addiu $a2, $a2, %lo(D_80A1A528) ## $a2 = 80A1A528 -/* 02E1C 80A1A32C 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 -/* 02E20 80A1A330 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 02E24 80A1A334 0C031AD5 */ jal Graph_CloseDisps -/* 02E28 80A1A338 24070924 */ addiu $a3, $zero, 0x0924 ## $a3 = 00000924 -/* 02E2C 80A1A33C 8FBF002C */ lw $ra, 0x002C($sp) -/* 02E30 80A1A340 8FB00024 */ lw $s0, 0x0024($sp) -/* 02E34 80A1A344 8FB10028 */ lw $s1, 0x0028($sp) -/* 02E38 80A1A348 03E00008 */ jr $ra -/* 02E3C 80A1A34C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Init.s deleted file mode 100644 index f2c8c06b6d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Init.s +++ /dev/null @@ -1,148 +0,0 @@ -glabel EnFloormas_Init -/* 00000 80A17510 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00004 80A17514 AFB10030 */ sw $s1, 0x0030($sp) -/* 00008 80A17518 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0000C 80A1751C AFBF0034 */ sw $ra, 0x0034($sp) -/* 00010 80A17520 AFB0002C */ sw $s0, 0x002C($sp) -/* 00014 80A17524 3C0580A2 */ lui $a1, %hi(D_80A1A4C4) ## $a1 = 80A20000 -/* 00018 80A17528 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0001C 80A1752C 0C01E037 */ jal Actor_ProcessInitChain - -/* 00020 80A17530 24A5A4C4 */ addiu $a1, $a1, %lo(D_80A1A4C4) ## $a1 = 80A1A4C4 -/* 00024 80A17534 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 00028 80A17538 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 0002C 80A1753C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00030 80A17540 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00034 80A17544 0C00AC78 */ jal ActorShape_Init - -/* 00038 80A17548 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 0003C 80A1754C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 00040 80A17550 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 -/* 00044 80A17554 260E019C */ addiu $t6, $s0, 0x019C ## $t6 = 0000019C -/* 00048 80A17558 260F0232 */ addiu $t7, $s0, 0x0232 ## $t7 = 00000232 -/* 0004C 80A1755C 24180019 */ addiu $t8, $zero, 0x0019 ## $t8 = 00000019 -/* 00050 80A17560 AFB80018 */ sw $t8, 0x0018($sp) -/* 00054 80A17564 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00058 80A17568 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0005C 80A1756C 24E79DB0 */ addiu $a3, $a3, 0x9DB0 ## $a3 = 06009DB0 -/* 00060 80A17570 24C68FB0 */ addiu $a2, $a2, 0x8FB0 ## $a2 = 06008FB0 -/* 00064 80A17574 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00068 80A17578 0C0291BE */ jal SkelAnime_InitSV -/* 0006C 80A1757C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00070 80A17580 260502C8 */ addiu $a1, $s0, 0x02C8 ## $a1 = 000002C8 -/* 00074 80A17584 AFA5003C */ sw $a1, 0x003C($sp) -/* 00078 80A17588 0C0170D9 */ jal Collider_InitCylinder - -/* 0007C 80A1758C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00080 80A17590 3C0780A2 */ lui $a3, %hi(D_80A1A470) ## $a3 = 80A20000 -/* 00084 80A17594 8FA5003C */ lw $a1, 0x003C($sp) -/* 00088 80A17598 24E7A470 */ addiu $a3, $a3, %lo(D_80A1A470) ## $a3 = 80A1A470 -/* 0008C 80A1759C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00090 80A175A0 0C01712B */ jal Collider_SetCylinder - -/* 00094 80A175A4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00098 80A175A8 3C0580A2 */ lui $a1, %hi(D_80A1A4A4) ## $a1 = 80A20000 -/* 0009C 80A175AC 3C0680A2 */ lui $a2, %hi(D_80A1A49C) ## $a2 = 80A20000 -/* 000A0 80A175B0 24C6A49C */ addiu $a2, $a2, %lo(D_80A1A49C) ## $a2 = 80A1A49C -/* 000A4 80A175B4 24A5A4A4 */ addiu $a1, $a1, %lo(D_80A1A4A4) ## $a1 = 80A1A4A4 -/* 000A8 80A175B8 0C0187B5 */ jal func_80061ED4 -/* 000AC 80A175BC 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 000B0 80A175C0 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 000B4 80A175C4 2419F9C0 */ addiu $t9, $zero, 0xF9C0 ## $t9 = FFFFF9C0 -/* 000B8 80A175C8 A6190198 */ sh $t9, 0x0198($s0) ## 00000198 -/* 000BC 80A175CC 30438000 */ andi $v1, $v0, 0x8000 ## $v1 = 00000000 -/* 000C0 80A175D0 30497FFF */ andi $t1, $v0, 0x7FFF ## $t1 = 00000000 -/* 000C4 80A175D4 10600007 */ beq $v1, $zero, .L80A175F4 -/* 000C8 80A175D8 A609001C */ sh $t1, 0x001C($s0) ## 0000001C -/* 000CC 80A175DC 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 -/* 000D0 80A175E0 3C0C80A2 */ lui $t4, %hi(func_80A1A350) ## $t4 = 80A20000 -/* 000D4 80A175E4 258CA350 */ addiu $t4, $t4, %lo(func_80A1A350) ## $t4 = 80A1A350 -/* 000D8 80A175E8 354B0080 */ ori $t3, $t2, 0x0080 ## $t3 = 00000080 -/* 000DC 80A175EC AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 -/* 000E0 80A175F0 AE0C0134 */ sw $t4, 0x0134($s0) ## 00000134 -.L80A175F4: -/* 000E4 80A175F4 860D001C */ lh $t5, 0x001C($s0) ## 0000001C -/* 000E8 80A175F8 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 000EC 80A175FC 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 000F0 80A17600 15A1000A */ bne $t5, $at, .L80A1762C -/* 000F4 80A17604 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 000F8 80A17608 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 000FC 80A1760C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00100 80A17610 3C1880A2 */ lui $t8, %hi(func_80A19B9C) ## $t8 = 80A20000 -/* 00104 80A17614 27189B9C */ addiu $t8, $t8, %lo(func_80A19B9C) ## $t8 = 80A19B9C -/* 00108 80A17618 01C17824 */ and $t7, $t6, $at -/* 0010C 80A1761C AE000134 */ sw $zero, 0x0134($s0) ## 00000134 -/* 00110 80A17620 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 00114 80A17624 10000039 */ beq $zero, $zero, .L80A1770C -/* 00118 80A17628 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -.L80A1762C: -/* 0011C 80A1762C C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 00120 80A17630 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 00124 80A17634 24680010 */ addiu $t0, $v1, 0x0010 ## $t0 = 00000010 -/* 00128 80A17638 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 0012C 80A1763C C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 00130 80A17640 00084400 */ sll $t0, $t0, 16 -/* 00134 80A17644 00084403 */ sra $t0, $t0, 16 -/* 00138 80A17648 AFA80024 */ sw $t0, 0x0024($sp) -/* 0013C 80A1764C AFA8003C */ sw $t0, 0x003C($sp) -/* 00140 80A17650 AFA40038 */ sw $a0, 0x0038($sp) -/* 00144 80A17654 AFA00020 */ sw $zero, 0x0020($sp) -/* 00148 80A17658 AFA0001C */ sw $zero, 0x001C($sp) -/* 0014C 80A1765C AFA00018 */ sw $zero, 0x0018($sp) -/* 00150 80A17660 2406008E */ addiu $a2, $zero, 0x008E ## $a2 = 0000008E -/* 00154 80A17664 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 00158 80A17668 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 0015C 80A1766C 8FA40038 */ lw $a0, 0x0038($sp) -/* 00160 80A17670 8FA8003C */ lw $t0, 0x003C($sp) -/* 00164 80A17674 14400005 */ bne $v0, $zero, .L80A1768C -/* 00168 80A17678 AE020118 */ sw $v0, 0x0118($s0) ## 00000118 -/* 0016C 80A1767C 0C00B55C */ jal Actor_Kill - -/* 00170 80A17680 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00174 80A17684 10000022 */ beq $zero, $zero, .L80A17710 -/* 00178 80A17688 8FBF0034 */ lw $ra, 0x0034($sp) -.L80A1768C: -/* 0017C 80A1768C C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 00180 80A17690 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 00184 80A17694 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00188 80A17698 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 0018C 80A1769C C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 00190 80A176A0 AFA80024 */ sw $t0, 0x0024($sp) -/* 00194 80A176A4 AFA00020 */ sw $zero, 0x0020($sp) -/* 00198 80A176A8 AFA0001C */ sw $zero, 0x001C($sp) -/* 0019C 80A176AC AFA00018 */ sw $zero, 0x0018($sp) -/* 001A0 80A176B0 2406008E */ addiu $a2, $zero, 0x008E ## $a2 = 0000008E -/* 001A4 80A176B4 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 001A8 80A176B8 E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 001AC 80A176BC 14400007 */ bne $v0, $zero, .L80A176DC -/* 001B0 80A176C0 AE02011C */ sw $v0, 0x011C($s0) ## 0000011C -/* 001B4 80A176C4 0C00B55C */ jal Actor_Kill - -/* 001B8 80A176C8 8E040118 */ lw $a0, 0x0118($s0) ## 00000118 -/* 001BC 80A176CC 0C00B55C */ jal Actor_Kill - -/* 001C0 80A176D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001C4 80A176D4 1000000E */ beq $zero, $zero, .L80A17710 -/* 001C8 80A176D8 8FBF0034 */ lw $ra, 0x0034($sp) -.L80A176DC: -/* 001CC 80A176DC 8E190118 */ lw $t9, 0x0118($s0) ## 00000118 -/* 001D0 80A176E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001D4 80A176E4 AF30011C */ sw $s0, 0x011C($t9) ## 0000011C -/* 001D8 80A176E8 8E09011C */ lw $t1, 0x011C($s0) ## 0000011C -/* 001DC 80A176EC 8E0A0118 */ lw $t2, 0x0118($s0) ## 00000118 -/* 001E0 80A176F0 AD490118 */ sw $t1, 0x0118($t2) ## 00000118 -/* 001E4 80A176F4 8E0B011C */ lw $t3, 0x011C($s0) ## 0000011C -/* 001E8 80A176F8 AD700118 */ sw $s0, 0x0118($t3) ## 00000118 -/* 001EC 80A176FC 8E0D011C */ lw $t5, 0x011C($s0) ## 0000011C -/* 001F0 80A17700 8E0C0118 */ lw $t4, 0x0118($s0) ## 00000118 -/* 001F4 80A17704 0C285DE0 */ jal func_80A17780 -/* 001F8 80A17708 ADAC011C */ sw $t4, 0x011C($t5) ## 0000011C -.L80A1770C: -/* 001FC 80A1770C 8FBF0034 */ lw $ra, 0x0034($sp) -.L80A17710: -/* 00200 80A17710 8FB0002C */ lw $s0, 0x002C($sp) -/* 00204 80A17714 8FB10030 */ lw $s1, 0x0030($sp) -/* 00208 80A17718 03E00008 */ jr $ra -/* 0020C 80A1771C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Update.s deleted file mode 100644 index 07d6a485b7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Update.s +++ /dev/null @@ -1,179 +0,0 @@ -.late_rodata -glabel D_80A1A5B4 - .float 3000.0 - -glabel D_80A1A5B8 - .float 2500.0 - -.text -glabel EnFloormas_Update -/* 029B4 80A19EC4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 029B8 80A19EC8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 029BC 80A19ECC AFB00020 */ sw $s0, 0x0020($sp) -/* 029C0 80A19ED0 AFA50044 */ sw $a1, 0x0044($sp) -/* 029C4 80A19ED4 8C8F0190 */ lw $t7, 0x0190($a0) ## 00000190 -/* 029C8 80A19ED8 3C0E80A2 */ lui $t6, %hi(func_80A19B9C) ## $t6 = 80A20000 -/* 029CC 80A19EDC 25CE9B9C */ addiu $t6, $t6, %lo(func_80A19B9C) ## $t6 = 80A19B9C -/* 029D0 80A19EE0 11CF008C */ beq $t6, $t7, .L80A1A114 -/* 029D4 80A19EE4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 029D8 80A19EE8 908202D8 */ lbu $v0, 0x02D8($a0) ## 000002D8 -/* 029DC 80A19EEC 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 -/* 029E0 80A19EF0 30580002 */ andi $t8, $v0, 0x0002 ## $t8 = 00000000 -/* 029E4 80A19EF4 53000017 */ beql $t8, $zero, .L80A19F54 -/* 029E8 80A19EF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 029EC 80A19EFC 44811000 */ mtc1 $at, $f2 ## $f2 = -5.00 -/* 029F0 80A19F00 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 -/* 029F4 80A19F04 44813000 */ mtc1 $at, $f6 ## $f6 = -0.50 -/* 029F8 80A19F08 C4840068 */ lwc1 $f4, 0x0068($a0) ## 00000068 -/* 029FC 80A19F0C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 02A00 80A19F10 3059FFFD */ andi $t9, $v0, 0xFFFD ## $t9 = 00000000 -/* 02A04 80A19F14 46062202 */ mul.s $f8, $f4, $f6 -/* 02A08 80A19F18 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 02A0C 80A19F1C A09902D8 */ sb $t9, 0x02D8($a0) ## 000002D8 -/* 02A10 80A19F20 E4880068 */ swc1 $f8, 0x0068($a0) ## 00000068 -/* 02A14 80A19F24 C4800068 */ lwc1 $f0, 0x0068($a0) ## 00000068 -/* 02A18 80A19F28 4600103C */ c.lt.s $f2, $f0 -/* 02A1C 80A19F2C 00000000 */ nop -/* 02A20 80A19F30 45020004 */ bc1fl .L80A19F44 -/* 02A24 80A19F34 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 02A28 80A19F38 10000002 */ beq $zero, $zero, .L80A19F44 -/* 02A2C 80A19F3C E4820068 */ swc1 $f2, 0x0068($a0) ## 00000068 -/* 02A30 80A19F40 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -.L80A19F44: -/* 02A34 80A19F44 E60A0060 */ swc1 $f10, 0x0060($s0) ## 00000060 -/* 02A38 80A19F48 0C285ED0 */ jal func_80A17B40 -/* 02A3C 80A19F4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A40 80A19F50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A19F54: -/* 02A44 80A19F54 0C286746 */ jal func_80A19D18 -/* 02A48 80A19F58 8FA50044 */ lw $a1, 0x0044($sp) -/* 02A4C 80A19F5C 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 -/* 02A50 80A19F60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A54 80A19F64 8FA50044 */ lw $a1, 0x0044($sp) -/* 02A58 80A19F68 0320F809 */ jalr $ra, $t9 -/* 02A5C 80A19F6C 00000000 */ nop -/* 02A60 80A19F70 3C0880A2 */ lui $t0, %hi(func_80A19BA8) ## $t0 = 80A20000 -/* 02A64 80A19F74 25089BA8 */ addiu $t0, $t0, %lo(func_80A19BA8) ## $t0 = 80A19BA8 -/* 02A68 80A19F78 AFA80030 */ sw $t0, 0x0030($sp) -/* 02A6C 80A19F7C 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -/* 02A70 80A19F80 3C0A80A2 */ lui $t2, %hi(func_80A193C4) ## $t2 = 80A20000 -/* 02A74 80A19F84 254A93C4 */ addiu $t2, $t2, %lo(func_80A193C4) ## $t2 = 80A193C4 -/* 02A78 80A19F88 11020004 */ beq $t0, $v0, .L80A19F9C -/* 02A7C 80A19F8C 00000000 */ nop -/* 02A80 80A19F90 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 -/* 02A84 80A19F94 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -/* 02A88 80A19F98 A6090032 */ sh $t1, 0x0032($s0) ## 00000032 -.L80A19F9C: -/* 02A8C 80A19F9C 11420003 */ beq $t2, $v0, .L80A19FAC -/* 02A90 80A19FA0 AFAA002C */ sw $t2, 0x002C($sp) -/* 02A94 80A19FA4 0C00B638 */ jal Actor_MoveForward - -/* 02A98 80A19FA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A19FAC: -/* 02A9C 80A19FAC 3C0180A2 */ lui $at, %hi(D_80A1A5B4) ## $at = 80A20000 -/* 02AA0 80A19FB0 C432A5B4 */ lwc1 $f18, %lo(D_80A1A5B4)($at) -/* 02AA4 80A19FB4 C6100050 */ lwc1 $f16, 0x0050($s0) ## 00000050 -/* 02AA8 80A19FB8 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 02AAC 80A19FBC 240B001D */ addiu $t3, $zero, 0x001D ## $t3 = 0000001D -/* 02AB0 80A19FC0 46128102 */ mul.s $f4, $f16, $f18 -/* 02AB4 80A19FC4 AFAB0014 */ sw $t3, 0x0014($sp) -/* 02AB8 80A19FC8 8FA40044 */ lw $a0, 0x0044($sp) -/* 02ABC 80A19FCC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02AC0 80A19FD0 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 -/* 02AC4 80A19FD4 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 02AC8 80A19FD8 44072000 */ mfc1 $a3, $f4 -/* 02ACC 80A19FDC 0C00B92D */ jal func_8002E4B4 -/* 02AD0 80A19FE0 00000000 */ nop -/* 02AD4 80A19FE4 260502C8 */ addiu $a1, $s0, 0x02C8 ## $a1 = 000002C8 -/* 02AD8 80A19FE8 AFA50028 */ sw $a1, 0x0028($sp) -/* 02ADC 80A19FEC 0C0189B7 */ jal Collider_CylinderUpdate - -/* 02AE0 80A19FF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02AE4 80A19FF4 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -/* 02AE8 80A19FF8 3C0C80A2 */ lui $t4, %hi(func_80A18C78) ## $t4 = 80A20000 -/* 02AEC 80A19FFC 258C8C78 */ addiu $t4, $t4, %lo(func_80A18C78) ## $t4 = 80A18C78 -/* 02AF0 80A1A000 5582000D */ bnel $t4, $v0, .L80A1A038 -/* 02AF4 80A1A004 8FAF002C */ lw $t7, 0x002C($sp) -/* 02AF8 80A1A008 8E0D0004 */ lw $t5, 0x0004($s0) ## 00000004 -/* 02AFC 80A1A00C 3C010100 */ lui $at, 0x0100 ## $at = 01000000 -/* 02B00 80A1A010 8FA40044 */ lw $a0, 0x0044($sp) -/* 02B04 80A1A014 01A17025 */ or $t6, $t5, $at ## $t6 = 01000000 -/* 02B08 80A1A018 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02B0C 80A1A01C AE0E0004 */ sw $t6, 0x0004($s0) ## 00000004 -/* 02B10 80A1A020 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 02B14 80A1A024 8FA60028 */ lw $a2, 0x0028($sp) -/* 02B18 80A1A028 0C0175E7 */ jal CollisionCheck_SetAT - ## CollisionCheck_setAT -/* 02B1C 80A1A02C 00812821 */ addu $a1, $a0, $at -/* 02B20 80A1A030 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -/* 02B24 80A1A034 8FAF002C */ lw $t7, 0x002C($sp) -.L80A1A038: -/* 02B28 80A1A038 3C1880A2 */ lui $t8, %hi(func_80A18F50) ## $t8 = 80A20000 -/* 02B2C 80A1A03C 27188F50 */ addiu $t8, $t8, %lo(func_80A18F50) ## $t8 = 80A18F50 -/* 02B30 80A1A040 11E2001F */ beq $t7, $v0, .L80A1A0C0 -/* 02B34 80A1A044 00000000 */ nop -/* 02B38 80A1A048 1302000C */ beq $t8, $v0, .L80A1A07C -/* 02B3C 80A1A04C 8FB90030 */ lw $t9, 0x0030($sp) -/* 02B40 80A1A050 1322000A */ beq $t9, $v0, .L80A1A07C -/* 02B44 80A1A054 00000000 */ nop -/* 02B48 80A1A058 96080110 */ lhu $t0, 0x0110($s0) ## 00000110 -/* 02B4C 80A1A05C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02B50 80A1A060 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 02B54 80A1A064 15000005 */ bne $t0, $zero, .L80A1A07C -/* 02B58 80A1A068 8FA40044 */ lw $a0, 0x0044($sp) -/* 02B5C 80A1A06C 00812821 */ addu $a1, $a0, $at -/* 02B60 80A1A070 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 02B64 80A1A074 8FA60028 */ lw $a2, 0x0028($sp) -/* 02B68 80A1A078 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -.L80A1A07C: -/* 02B6C 80A1A07C 3C0A80A2 */ lui $t2, %hi(func_80A196DC) ## $t2 = 80A20000 -/* 02B70 80A1A080 254A96DC */ addiu $t2, $t2, %lo(func_80A196DC) ## $t2 = 80A196DC -/* 02B74 80A1A084 15420008 */ bne $t2, $v0, .L80A1A0A8 -/* 02B78 80A1A088 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 02B7C 80A1A08C C6080164 */ lwc1 $f8, 0x0164($s0) ## 00000164 -/* 02B80 80A1A090 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 02B84 80A1A094 00000000 */ nop -/* 02B88 80A1A098 460A403C */ c.lt.s $f8, $f10 -/* 02B8C 80A1A09C 00000000 */ nop -/* 02B90 80A1A0A0 45000007 */ bc1f .L80A1A0C0 -/* 02B94 80A1A0A4 00000000 */ nop -.L80A1A0A8: -/* 02B98 80A1A0A8 8FA40044 */ lw $a0, 0x0044($sp) -/* 02B9C 80A1A0AC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02BA0 80A1A0B0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 02BA4 80A1A0B4 8FA60028 */ lw $a2, 0x0028($sp) -/* 02BA8 80A1A0B8 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 02BAC 80A1A0BC 00812821 */ addu $a1, $a0, $at -.L80A1A0C0: -/* 02BB0 80A1A0C0 3C0180A2 */ lui $at, %hi(D_80A1A5B8) ## $at = 80A20000 -/* 02BB4 80A1A0C4 C432A5B8 */ lwc1 $f18, %lo(D_80A1A5B8)($at) -/* 02BB8 80A1A0C8 C6100050 */ lwc1 $f16, 0x0050($s0) ## 00000050 -/* 02BBC 80A1A0CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02BC0 80A1A0D0 46128102 */ mul.s $f4, $f16, $f18 -/* 02BC4 80A1A0D4 44052000 */ mfc1 $a1, $f4 -/* 02BC8 80A1A0D8 0C00B56E */ jal Actor_SetHeight - -/* 02BCC 80A1A0DC 00000000 */ nop -/* 02BD0 80A1A0E0 920C02DC */ lbu $t4, 0x02DC($s0) ## 000002DC -/* 02BD4 80A1A0E4 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 02BD8 80A1A0E8 5581000B */ bnel $t4, $at, .L80A1A118 -/* 02BDC 80A1A0EC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02BE0 80A1A0F0 86020196 */ lh $v0, 0x0196($s0) ## 00000196 -/* 02BE4 80A1A0F4 240E0028 */ addiu $t6, $zero, 0x0028 ## $t6 = 00000028 -/* 02BE8 80A1A0F8 10400003 */ beq $v0, $zero, .L80A1A108 -/* 02BEC 80A1A0FC 244DFFFF */ addiu $t5, $v0, 0xFFFF ## $t5 = FFFFFFFF -/* 02BF0 80A1A100 A60D0196 */ sh $t5, 0x0196($s0) ## 00000196 -/* 02BF4 80A1A104 86020196 */ lh $v0, 0x0196($s0) ## 00000196 -.L80A1A108: -/* 02BF8 80A1A108 54400003 */ bnel $v0, $zero, .L80A1A118 -/* 02BFC 80A1A10C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02C00 80A1A110 A60E0196 */ sh $t6, 0x0196($s0) ## 00000196 -.L80A1A114: -/* 02C04 80A1A114 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A1A118: -/* 02C08 80A1A118 8FB00020 */ lw $s0, 0x0020($sp) -/* 02C0C 80A1A11C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 02C10 80A1A120 03E00008 */ jr $ra -/* 02C14 80A1A124 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17748.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17748.s deleted file mode 100644 index bc74db7ff1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17748.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80A17748 -/* 00238 80A17748 908F02D9 */ lbu $t7, 0x02D9($a0) ## 000002D9 -/* 0023C 80A1774C 240E000C */ addiu $t6, $zero, 0x000C ## $t6 = 0000000C -/* 00240 80A17750 24190028 */ addiu $t9, $zero, 0x0028 ## $t9 = 00000028 -/* 00244 80A17754 35F80004 */ ori $t8, $t7, 0x0004 ## $t8 = 00000004 -/* 00248 80A17758 A08E02DC */ sb $t6, 0x02DC($a0) ## 000002DC -/* 0024C 80A1775C A09802D9 */ sb $t8, 0x02D9($a0) ## 000002D9 -/* 00250 80A17760 03E00008 */ jr $ra -/* 00254 80A17764 A4990196 */ sh $t9, 0x0196($a0) ## 00000196 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17768.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17768.s deleted file mode 100644 index 6468d84888..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17768.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_80A17768 -/* 00258 80A17768 908E02D9 */ lbu $t6, 0x02D9($a0) ## 000002D9 -/* 0025C 80A1776C A08002DC */ sb $zero, 0x02DC($a0) ## 000002DC -/* 00260 80A17770 A4800196 */ sh $zero, 0x0196($a0) ## 00000196 -/* 00264 80A17774 31CFFFFB */ andi $t7, $t6, 0xFFFB ## $t7 = 00000000 -/* 00268 80A17778 03E00008 */ jr $ra -/* 0026C 80A1777C A08F02D9 */ sb $t7, 0x02D9($a0) ## 000002D9 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17780.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17780.s deleted file mode 100644 index 2da717db50..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17780.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80A17780 -/* 00270 80A17780 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00274 80A17784 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00278 80A17788 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0027C 80A1778C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00280 80A17790 24A59DB0 */ addiu $a1, $a1, 0x9DB0 ## $a1 = 06009DB0 -/* 00284 80A17794 AFA60018 */ sw $a2, 0x0018($sp) -/* 00288 80A17798 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop -/* 0028C 80A1779C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00290 80A177A0 8FA60018 */ lw $a2, 0x0018($sp) -/* 00294 80A177A4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00298 80A177A8 3C0E80A2 */ lui $t6, %hi(func_80A18500) ## $t6 = 80A20000 -/* 0029C 80A177AC 25CE8500 */ addiu $t6, $t6, %lo(func_80A18500) ## $t6 = 80A18500 -/* 002A0 80A177B0 ACCE0190 */ sw $t6, 0x0190($a2) ## 00000190 -/* 002A4 80A177B4 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 -/* 002A8 80A177B8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002AC 80A177BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002B0 80A177C0 03E00008 */ jr $ra -/* 002B4 80A177C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A177C8.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A177C8.s deleted file mode 100644 index 37829b9846..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A177C8.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80A177C8 -/* 002B8 80A177C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002BC 80A177CC AFBF0014 */ sw $ra, 0x0014($sp) -/* 002C0 80A177D0 AFA40018 */ sw $a0, 0x0018($sp) -/* 002C4 80A177D4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 002C8 80A177D8 24A5A054 */ addiu $a1, $a1, 0xA054 ## $a1 = 0600A054 -/* 002CC 80A177DC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 002D0 80A177E0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop -/* 002D4 80A177E4 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 002D8 80A177E8 8FAF0018 */ lw $t7, 0x0018($sp) -/* 002DC 80A177EC 3C0E80A2 */ lui $t6, %hi(func_80A185C4) ## $t6 = 80A20000 -/* 002E0 80A177F0 25CE85C4 */ addiu $t6, $t6, %lo(func_80A185C4) ## $t6 = 80A185C4 -/* 002E4 80A177F4 ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 -/* 002E8 80A177F8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002EC 80A177FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002F0 80A17800 03E00008 */ jr $ra -/* 002F4 80A17804 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17808.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17808.s deleted file mode 100644 index d4e8dbb69a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17808.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_80A17808 -/* 002F8 80A17808 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002FC 80A1780C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00300 80A17810 8C8F0190 */ lw $t7, 0x0190($a0) ## 00000190 -/* 00304 80A17814 3C0E80A2 */ lui $t6, %hi(func_80A187E4) ## $t6 = 80A20000 -/* 00308 80A17818 25CE87E4 */ addiu $t6, $t6, %lo(func_80A187E4) ## $t6 = 80A187E4 -/* 0030C 80A1781C 11CF0009 */ beq $t6, $t7, .L80A17844 -/* 00310 80A17820 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00314 80A17824 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00318 80A17828 24A541F4 */ addiu $a1, $a1, 0x41F4 ## $a1 = 060041F4 -/* 0031C 80A1782C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00320 80A17830 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 00324 80A17834 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat -/* 00328 80A17838 AFA70018 */ sw $a3, 0x0018($sp) -/* 0032C 80A1783C 10000005 */ beq $zero, $zero, .L80A17854 -/* 00330 80A17840 8FA70018 */ lw $a3, 0x0018($sp) -.L80A17844: -/* 00334 80A17844 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 00338 80A17848 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 -/* 0033C 80A1784C 00000000 */ nop -/* 00340 80A17850 E4E40168 */ swc1 $f4, 0x0168($a3) ## 00000168 -.L80A17854: -/* 00344 80A17854 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 -/* 00348 80A17858 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 0034C 80A1785C 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00350 80A17860 AFA70018 */ sw $a3, 0x0018($sp) -/* 00354 80A17864 8FA70018 */ lw $a3, 0x0018($sp) -/* 00358 80A17868 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 0035C 80A1786C 44813000 */ mtc1 $at, $f6 ## $f6 = 1.50 -/* 00360 80A17870 3C1880A2 */ lui $t8, %hi(func_80A18650) ## $t8 = 80A20000 -/* 00364 80A17874 27188650 */ addiu $t8, $t8, %lo(func_80A18650) ## $t8 = 80A18650 -/* 00368 80A17878 A4E20194 */ sh $v0, 0x0194($a3) ## 00000194 -/* 0036C 80A1787C ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -/* 00370 80A17880 E4E60068 */ swc1 $f6, 0x0068($a3) ## 00000068 -/* 00374 80A17884 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00378 80A17888 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0037C 80A1788C 03E00008 */ jr $ra -/* 00380 80A17890 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17894.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17894.s deleted file mode 100644 index 79c8e0fd13..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17894.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80A17894 -/* 00384 80A17894 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00388 80A17898 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0038C 80A1789C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00390 80A178A0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00394 80A178A4 24A59244 */ addiu $a1, $a1, 0x9244 ## $a1 = 06009244 -/* 00398 80A178A8 AFA60018 */ sw $a2, 0x0018($sp) -/* 0039C 80A178AC 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop -/* 003A0 80A178B0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 003A4 80A178B4 8FA60018 */ lw $a2, 0x0018($sp) -/* 003A8 80A178B8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 003AC 80A178BC 3C0E80A2 */ lui $t6, %hi(func_80A187AC) ## $t6 = 80A20000 -/* 003B0 80A178C0 25CE87AC */ addiu $t6, $t6, %lo(func_80A187AC) ## $t6 = 80A187AC -/* 003B4 80A178C4 ACCE0190 */ sw $t6, 0x0190($a2) ## 00000190 -/* 003B8 80A178C8 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 -/* 003BC 80A178CC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003C0 80A178D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003C4 80A178D4 03E00008 */ jr $ra -/* 003C8 80A178D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A178DC.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A178DC.s deleted file mode 100644 index 0cd51db45c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A178DC.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80A178DC -/* 003CC 80A178DC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 003D0 80A178E0 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 003D4 80A178E4 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 003D8 80A178E8 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 -/* 003DC 80A178EC 3C0E80A2 */ lui $t6, %hi(func_80A187E4) ## $t6 = 80A20000 -/* 003E0 80A178F0 25CE87E4 */ addiu $t6, $t6, %lo(func_80A187E4) ## $t6 = 80A187E4 -/* 003E4 80A178F4 A4800194 */ sh $zero, 0x0194($a0) ## 00000194 -/* 003E8 80A178F8 AC8E0190 */ sw $t6, 0x0190($a0) ## 00000190 -/* 003EC 80A178FC E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 003F0 80A17900 03E00008 */ jr $ra -/* 003F4 80A17904 E4860168 */ swc1 $f6, 0x0168($a0) ## 00000168 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17908.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17908.s deleted file mode 100644 index ea2ae2319b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17908.s +++ /dev/null @@ -1,92 +0,0 @@ -.late_rodata -glabel D_80A1A564 - .word 0x3B83126F -glabel D_80A1A568 - .word 0x3D888889 -glabel D_80A1A56C - .word 0x3E088889 - -.text -glabel func_80A17908 -/* 003F8 80A17908 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 003FC 80A1790C AFBF002C */ sw $ra, 0x002C($sp) -/* 00400 80A17910 AFB00028 */ sw $s0, 0x0028($sp) -/* 00404 80A17914 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 -/* 00408 80A17918 848E0196 */ lh $t6, 0x0196($a0) ## 00000196 -/* 0040C 80A1791C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00410 80A17920 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00414 80A17924 01CF1823 */ subu $v1, $t6, $t7 -/* 00418 80A17928 00031C00 */ sll $v1, $v1, 16 -/* 0041C 80A1792C 00031C03 */ sra $v1, $v1, 16 -/* 00420 80A17930 18600009 */ blez $v1, .L80A17958 -/* 00424 80A17934 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00428 80A17938 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0042C 80A1793C 24A52158 */ addiu $a1, $a1, 0x2158 ## $a1 = 06002158 -/* 00430 80A17940 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00434 80A17944 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00438 80A17948 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop -/* 0043C 80A1794C A7A30036 */ sh $v1, 0x0036($sp) -/* 00440 80A17950 10000015 */ beq $zero, $zero, .L80A179A8 -/* 00444 80A17954 87A30036 */ lh $v1, 0x0036($sp) -.L80A17958: -/* 00448 80A17958 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0044C 80A1795C 24842158 */ addiu $a0, $a0, 0x2158 ## $a0 = 06002158 -/* 00450 80A17960 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00454 80A17964 A7A30036 */ sh $v1, 0x0036($sp) -/* 00458 80A17968 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 0045C 80A1796C 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 00460 80A17970 44815000 */ mtc1 $at, $f10 ## $f10 = -3.00 -/* 00464 80A17974 468031A0 */ cvt.s.w $f6, $f6 -/* 00468 80A17978 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 0046C 80A1797C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00470 80A17980 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00474 80A17984 AFB80014 */ sw $t8, 0x0014($sp) -/* 00478 80A17988 24A52158 */ addiu $a1, $a1, 0x2158 ## $a1 = 06002158 -/* 0047C 80A1798C 44073000 */ mfc1 $a3, $f6 -/* 00480 80A17990 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00484 80A17994 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 00488 80A17998 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 0048C 80A1799C 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00490 80A179A0 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 00494 80A179A4 87A30036 */ lh $v1, 0x0036($sp) -.L80A179A8: -/* 00498 80A179A8 3C0180A2 */ lui $at, %hi(D_80A1A564) ## $at = 80A20000 -/* 0049C 80A179AC C430A564 */ lwc1 $f16, %lo(D_80A1A564)($at) -/* 004A0 80A179B0 C6120050 */ lwc1 $f18, 0x0050($s0) ## 00000050 -/* 004A4 80A179B4 3C0B80A2 */ lui $t3, %hi(func_80A188F0) ## $t3 = 80A20000 -/* 004A8 80A179B8 256B88F0 */ addiu $t3, $t3, %lo(func_80A188F0) ## $t3 = 80A188F0 -/* 004AC 80A179BC 4612803C */ c.lt.s $f16, $f18 -/* 004B0 80A179C0 00000000 */ nop -/* 004B4 80A179C4 4502000B */ bc1fl .L80A179F4 -/* 004B8 80A179C8 C6000168 */ lwc1 $f0, 0x0168($s0) ## 00000168 -/* 004BC 80A179CC 44832000 */ mtc1 $v1, $f4 ## $f4 = 0.00 -/* 004C0 80A179D0 3C0180A2 */ lui $at, %hi(D_80A1A568) ## $at = 80A20000 -/* 004C4 80A179D4 C428A568 */ lwc1 $f8, %lo(D_80A1A568)($at) -/* 004C8 80A179D8 468021A0 */ cvt.s.w $f6, $f4 -/* 004CC 80A179DC 46083282 */ mul.s $f10, $f6, $f8 -/* 004D0 80A179E0 4600540D */ trunc.w.s $f16, $f10 -/* 004D4 80A179E4 44088000 */ mfc1 $t0, $f16 -/* 004D8 80A179E8 1000000D */ beq $zero, $zero, .L80A17A20 -/* 004DC 80A179EC A6080196 */ sh $t0, 0x0196($s0) ## 00000196 -/* 004E0 80A179F0 C6000168 */ lwc1 $f0, 0x0168($s0) ## 00000168 -.L80A179F4: -/* 004E4 80A179F4 44832000 */ mtc1 $v1, $f4 ## $f4 = 0.00 -/* 004E8 80A179F8 3C0180A2 */ lui $at, %hi(D_80A1A56C) ## $at = 80A20000 -/* 004EC 80A179FC 46000480 */ add.s $f18, $f0, $f0 -/* 004F0 80A17A00 468021A0 */ cvt.s.w $f6, $f4 -/* 004F4 80A17A04 E6120168 */ swc1 $f18, 0x0168($s0) ## 00000168 -/* 004F8 80A17A08 C428A56C */ lwc1 $f8, %lo(D_80A1A56C)($at) -/* 004FC 80A17A0C 46083282 */ mul.s $f10, $f6, $f8 -/* 00500 80A17A10 4600540D */ trunc.w.s $f16, $f10 -/* 00504 80A17A14 440A8000 */ mfc1 $t2, $f16 -/* 00508 80A17A18 00000000 */ nop -/* 0050C 80A17A1C A60A0196 */ sh $t2, 0x0196($s0) ## 00000196 -.L80A17A20: -/* 00510 80A17A20 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 -/* 00514 80A17A24 8FBF002C */ lw $ra, 0x002C($sp) -/* 00518 80A17A28 8FB00028 */ lw $s0, 0x0028($sp) -/* 0051C 80A17A2C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00520 80A17A30 03E00008 */ jr $ra -/* 00524 80A17A34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17A38.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17A38.s deleted file mode 100644 index 97d4fd7cc3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17A38.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel func_80A17A38 -/* 00528 80A17A38 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0052C 80A17A3C AFB00030 */ sw $s0, 0x0030($sp) -/* 00530 80A17A40 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00534 80A17A44 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00538 80A17A48 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 0053C 80A17A4C AFA5003C */ sw $a1, 0x003C($sp) -/* 00540 80A17A50 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00544 80A17A54 24849520 */ addiu $a0, $a0, 0x9520 ## $a0 = 06009520 -/* 00548 80A17A58 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0054C 80A17A5C 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 00550 80A17A60 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 00554 80A17A64 468021A0 */ cvt.s.w $f6, $f4 -/* 00558 80A17A68 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 0055C 80A17A6C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00560 80A17A70 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00564 80A17A74 24A59520 */ addiu $a1, $a1, 0x9520 ## $a1 = 06009520 -/* 00568 80A17A78 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0056C 80A17A7C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00570 80A17A80 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 00574 80A17A84 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00578 80A17A88 0C029468 */ jal SkelAnime_ChangeAnim - -/* 0057C 80A17A8C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00580 80A17A90 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00584 80A17A94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00588 80A17A98 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 0058C 80A17A9C 0C285DD2 */ jal func_80A17748 -/* 00590 80A17AA0 E600006C */ swc1 $f0, 0x006C($s0) ## 0000006C -/* 00594 80A17AA4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00598 80A17AA8 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 0059C 80A17AAC 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 -/* 005A0 80A17AB0 2418012C */ addiu $t8, $zero, 0x012C ## $t8 = 0000012C -/* 005A4 80A17AB4 24190064 */ addiu $t9, $zero, 0x0064 ## $t9 = 00000064 -/* 005A8 80A17AB8 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 005AC 80A17ABC AFA80020 */ sw $t0, 0x0020($sp) -/* 005B0 80A17AC0 AFB9001C */ sw $t9, 0x001C($sp) -/* 005B4 80A17AC4 AFB80018 */ sw $t8, 0x0018($sp) -/* 005B8 80A17AC8 AFAF0010 */ sw $t7, 0x0010($sp) -/* 005BC 80A17ACC 8FA4003C */ lw $a0, 0x003C($sp) -/* 005C0 80A17AD0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 005C4 80A17AD4 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 005C8 80A17AD8 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 -/* 005CC 80A17ADC 0C00CC98 */ jal func_80033260 -/* 005D0 80A17AE0 E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 005D4 80A17AE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005D8 80A17AE8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 005DC 80A17AEC 24053930 */ addiu $a1, $zero, 0x3930 ## $a1 = 00003930 -/* 005E0 80A17AF0 3C0980A2 */ lui $t1, %hi(func_80A18AB4) ## $t1 = 80A20000 -/* 005E4 80A17AF4 25298AB4 */ addiu $t1, $t1, %lo(func_80A18AB4) ## $t1 = 80A18AB4 -/* 005E8 80A17AF8 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 -/* 005EC 80A17AFC 8FBF0034 */ lw $ra, 0x0034($sp) -/* 005F0 80A17B00 8FB00030 */ lw $s0, 0x0030($sp) -/* 005F4 80A17B04 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 005F8 80A17B08 03E00008 */ jr $ra -/* 005FC 80A17B0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17B10.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17B10.s deleted file mode 100644 index 6787a43fb5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17B10.s +++ /dev/null @@ -1,18 +0,0 @@ -.late_rodata -glabel D_80A1A570 - .word 0xBE19999A - -.text -glabel func_80A17B10 -/* 00600 80A17B10 240E0019 */ addiu $t6, $zero, 0x0019 ## $t6 = 00000019 -/* 00604 80A17B14 A48E0194 */ sh $t6, 0x0194($a0) ## 00000194 -/* 00608 80A17B18 3C0180A2 */ lui $at, %hi(D_80A1A570) ## $at = 80A20000 -/* 0060C 80A17B1C C424A570 */ lwc1 $f4, %lo(D_80A1A570)($at) -/* 00610 80A17B20 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00614 80A17B24 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 00618 80A17B28 3C0F80A2 */ lui $t7, %hi(func_80A18C78) ## $t7 = 80A20000 -/* 0061C 80A17B2C 25EF8C78 */ addiu $t7, $t7, %lo(func_80A18C78) ## $t7 = 80A18C78 -/* 00620 80A17B30 AC8F0190 */ sw $t7, 0x0190($a0) ## 00000190 -/* 00624 80A17B34 E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C -/* 00628 80A17B38 03E00008 */ jr $ra -/* 0062C 80A17B3C E4860068 */ swc1 $f6, 0x0068($a0) ## 00000068 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17B40.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17B40.s deleted file mode 100644 index b7112b5555..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17B40.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80A17B40 -/* 00630 80A17B40 3C014228 */ lui $at, 0x4228 ## $at = 42280000 -/* 00634 80A17B44 44812000 */ mtc1 $at, $f4 ## $f4 = 42.00 -/* 00638 80A17B48 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0063C 80A17B4C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00640 80A17B50 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 -/* 00644 80A17B54 AFB00028 */ sw $s0, 0x0028($sp) -/* 00648 80A17B58 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0064C 80A17B5C AFBF002C */ sw $ra, 0x002C($sp) -/* 00650 80A17B60 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00654 80A17B64 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00658 80A17B68 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0065C 80A17B6C 24A519CC */ addiu $a1, $a1, 0x19CC ## $a1 = 060019CC -/* 00660 80A17B70 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00664 80A17B74 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00668 80A17B78 3C074224 */ lui $a3, 0x4224 ## $a3 = 42240000 -/* 0066C 80A17B7C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00670 80A17B80 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00674 80A17B84 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00678 80A17B88 C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 -/* 0067C 80A17B8C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 00680 80A17B90 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00684 80A17B94 44818000 */ mtc1 $at, $f16 ## $f16 = -1.00 -/* 00688 80A17B98 460A403C */ c.lt.s $f8, $f10 -/* 0068C 80A17B9C 3C0980A2 */ lui $t1, %hi(func_80A18D68) ## $t1 = 80A20000 -/* 00690 80A17BA0 2419001E */ addiu $t9, $zero, 0x001E ## $t9 = 0000001E -/* 00694 80A17BA4 25298D68 */ addiu $t1, $t1, %lo(func_80A18D68) ## $t1 = 80A18D68 -/* 00698 80A17BA8 45010006 */ bc1t .L80A17BC4 -/* 0069C 80A17BAC 00000000 */ nop -/* 006A0 80A17BB0 8E180190 */ lw $t8, 0x0190($s0) ## 00000190 -/* 006A4 80A17BB4 3C0F80A2 */ lui $t7, %hi(func_80A18C78) ## $t7 = 80A20000 -/* 006A8 80A17BB8 25EF8C78 */ addiu $t7, $t7, %lo(func_80A18C78) ## $t7 = 80A18C78 -/* 006AC 80A17BBC 11F80003 */ beq $t7, $t8, .L80A17BCC -/* 006B0 80A17BC0 2408002D */ addiu $t0, $zero, 0x002D ## $t0 = 0000002D -.L80A17BC4: -/* 006B4 80A17BC4 10000002 */ beq $zero, $zero, .L80A17BD0 -/* 006B8 80A17BC8 A6190194 */ sh $t9, 0x0194($s0) ## 00000194 -.L80A17BCC: -/* 006BC 80A17BCC A6080194 */ sh $t0, 0x0194($s0) ## 00000194 -.L80A17BD0: -/* 006C0 80A17BD0 E610006C */ swc1 $f16, 0x006C($s0) ## 0000006C -/* 006C4 80A17BD4 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 -/* 006C8 80A17BD8 8FBF002C */ lw $ra, 0x002C($sp) -/* 006CC 80A17BDC 8FB00028 */ lw $s0, 0x0028($sp) -/* 006D0 80A17BE0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 006D4 80A17BE4 03E00008 */ jr $ra -/* 006D8 80A17BE8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17BEC.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17BEC.s deleted file mode 100644 index 986e4c2ece..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17BEC.s +++ /dev/null @@ -1,99 +0,0 @@ -.late_rodata -glabel D_80A1A574 - .float 0.6 - -.text -glabel func_80A17BEC -/* 006DC 80A17BEC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 006E0 80A17BF0 AFBF002C */ sw $ra, 0x002C($sp) -/* 006E4 80A17BF4 AFB00028 */ sw $s0, 0x0028($sp) -/* 006E8 80A17BF8 3C053B83 */ lui $a1, 0x3B83 ## $a1 = 3B830000 -/* 006EC 80A17BFC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 006F0 80A17C00 0C00B58B */ jal Actor_SetScale - -/* 006F4 80A17C04 34A5126F */ ori $a1, $a1, 0x126F ## $a1 = 3B83126F -/* 006F8 80A17C08 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 006FC 80A17C0C 24010080 */ addiu $at, $zero, 0x0080 ## $at = 00000080 -/* 00700 80A17C10 3C0980A2 */ lui $t1, %hi(EnFloormas_Draw) ## $t1 = 80A20000 -/* 00704 80A17C14 35CF0010 */ ori $t7, $t6, 0x0010 ## $t7 = 00000010 -/* 00708 80A17C18 31F90080 */ andi $t9, $t7, 0x0080 ## $t9 = 00000000 -/* 0070C 80A17C1C 17210005 */ bne $t9, $at, .L80A17C34 -/* 00710 80A17C20 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 00714 80A17C24 3C0880A2 */ lui $t0, %hi(func_80A1A350) ## $t0 = 80A20000 -/* 00718 80A17C28 2508A350 */ addiu $t0, $t0, %lo(func_80A1A350) ## $t0 = 80A1A350 -/* 0071C 80A17C2C 10000003 */ beq $zero, $zero, .L80A17C3C -/* 00720 80A17C30 AE080134 */ sw $t0, 0x0134($s0) ## 00000134 -.L80A17C34: -/* 00724 80A17C34 2529A254 */ addiu $t1, $t1, %lo(EnFloormas_Draw) ## $t1 = 80A1A254 -/* 00728 80A17C38 AE090134 */ sw $t1, 0x0134($s0) ## 00000134 -.L80A17C3C: -/* 0072C 80A17C3C 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 -/* 00730 80A17C40 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 00734 80A17C44 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00738 80A17C48 844A00B6 */ lh $t2, 0x00B6($v0) ## 000000B6 -/* 0073C 80A17C4C 248419CC */ addiu $a0, $a0, 0x19CC ## $a0 = 060019CC -/* 00740 80A17C50 254B5555 */ addiu $t3, $t2, 0x5555 ## $t3 = 00005555 -/* 00744 80A17C54 A60B00B6 */ sh $t3, 0x00B6($s0) ## 000000B6 -/* 00748 80A17C58 8C4D0024 */ lw $t5, 0x0024($v0) ## 00000024 -/* 0074C 80A17C5C AE0D0024 */ sw $t5, 0x0024($s0) ## 00000024 -/* 00750 80A17C60 8C4C0028 */ lw $t4, 0x0028($v0) ## 00000028 -/* 00754 80A17C64 AE0C0028 */ sw $t4, 0x0028($s0) ## 00000028 -/* 00758 80A17C68 8C4D002C */ lw $t5, 0x002C($v0) ## 0000002C -/* 0075C 80A17C6C A60E001C */ sh $t6, 0x001C($s0) ## 0000001C -/* 00760 80A17C70 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00764 80A17C74 AE0D002C */ sw $t5, 0x002C($s0) ## 0000002C -/* 00768 80A17C78 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0076C 80A17C7C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 00770 80A17C80 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00774 80A17C84 468021A0 */ cvt.s.w $f6, $f4 -/* 00778 80A17C88 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 0077C 80A17C8C AFAF0014 */ sw $t7, 0x0014($sp) -/* 00780 80A17C90 24A519CC */ addiu $a1, $a1, 0x19CC ## $a1 = 060019CC -/* 00784 80A17C94 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00788 80A17C98 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0078C 80A17C9C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00790 80A17CA0 3C074224 */ lui $a3, 0x4224 ## $a3 = 42240000 -/* 00794 80A17CA4 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00798 80A17CA8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0079C 80A17CAC 3C0280A2 */ lui $v0, %hi(D_80A1A470) ## $v0 = 80A20000 -/* 007A0 80A17CB0 2442A470 */ addiu $v0, $v0, %lo(D_80A1A470) ## $v0 = 80A1A470 -/* 007A4 80A17CB4 84580020 */ lh $t8, 0x0020($v0) ## 80A1A490 -/* 007A8 80A17CB8 3C0180A2 */ lui $at, %hi(D_80A1A574) ## $at = 80A20000 -/* 007AC 80A17CBC C420A574 */ lwc1 $f0, %lo(D_80A1A574)($at) -/* 007B0 80A17CC0 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 007B4 80A17CC4 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 007B8 80A17CC8 920C02F6 */ lbu $t4, 0x02F6($s0) ## 000002F6 -/* 007BC 80A17CCC 46805420 */ cvt.s.w $f16, $f10 -/* 007C0 80A17CD0 3C0E80A2 */ lui $t6, %hi(D_80A1A49C) ## $t6 = 80A20000 -/* 007C4 80A17CD4 318DFFFB */ andi $t5, $t4, 0xFFFB ## $t5 = 00000000 -/* 007C8 80A17CD8 3C1880A2 */ lui $t8, %hi(func_80A18F50) ## $t8 = 80A20000 -/* 007CC 80A17CDC 27188F50 */ addiu $t8, $t8, %lo(func_80A18F50) ## $t8 = 80A18F50 -/* 007D0 80A17CE0 46008482 */ mul.s $f18, $f16, $f0 -/* 007D4 80A17CE4 4600910D */ trunc.w.s $f4, $f18 -/* 007D8 80A17CE8 44819000 */ mtc1 $at, $f18 ## $f18 = 4.00 -/* 007DC 80A17CEC 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 007E0 80A17CF0 44082000 */ mfc1 $t0, $f4 -/* 007E4 80A17CF4 44812000 */ mtc1 $at, $f4 ## $f4 = 7.00 -/* 007E8 80A17CF8 A6080308 */ sh $t0, 0x0308($s0) ## 00000308 -/* 007EC 80A17CFC 84490022 */ lh $t1, 0x0022($v0) ## 80A1A492 -/* 007F0 80A17D00 A20D02F6 */ sb $t5, 0x02F6($s0) ## 000002F6 -/* 007F4 80A17D04 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 -/* 007F8 80A17D08 44893000 */ mtc1 $t1, $f6 ## $f6 = 0.00 -/* 007FC 80A17D0C E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 -/* 00800 80A17D10 46803220 */ cvt.s.w $f8, $f6 -/* 00804 80A17D14 46004282 */ mul.s $f10, $f8, $f0 -/* 00808 80A17D18 4600540D */ trunc.w.s $f16, $f10 -/* 0080C 80A17D1C 440B8000 */ mfc1 $t3, $f16 -/* 00810 80A17D20 00000000 */ nop -/* 00814 80A17D24 A60B030A */ sh $t3, 0x030A($s0) ## 0000030A -/* 00818 80A17D28 91CEA49C */ lbu $t6, %lo(D_80A1A49C)($t6) -/* 0081C 80A17D2C AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -/* 00820 80A17D30 000E7843 */ sra $t7, $t6, 1 -/* 00824 80A17D34 A20F00AF */ sb $t7, 0x00AF($s0) ## 000000AF -/* 00828 80A17D38 8FBF002C */ lw $ra, 0x002C($sp) -/* 0082C 80A17D3C 8FB00028 */ lw $s0, 0x0028($sp) -/* 00830 80A17D40 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00834 80A17D44 03E00008 */ jr $ra -/* 00838 80A17D48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D4C.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D4C.s deleted file mode 100644 index eacf43c02c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D4C.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80A17D4C -/* 0083C 80A17D4C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00840 80A17D50 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00844 80A17D54 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00848 80A17D58 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0084C 80A17D5C 24A541F4 */ addiu $a1, $a1, 0x41F4 ## $a1 = 060041F4 -/* 00850 80A17D60 AFA70018 */ sw $a3, 0x0018($sp) -/* 00854 80A17D64 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00858 80A17D68 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat -/* 0085C 80A17D6C 3C064090 */ lui $a2, 0x4090 ## $a2 = 40900000 -/* 00860 80A17D70 8FA70018 */ lw $a3, 0x0018($sp) -/* 00864 80A17D74 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00868 80A17D78 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 0086C 80A17D7C 3C0E80A2 */ lui $t6, %hi(func_80A18FD8) ## $t6 = 80A20000 -/* 00870 80A17D80 25CE8FD8 */ addiu $t6, $t6, %lo(func_80A18FD8) ## $t6 = 80A18FD8 -/* 00874 80A17D84 ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 -/* 00878 80A17D88 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 0087C 80A17D8C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00880 80A17D90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00884 80A17D94 03E00008 */ jr $ra -/* 00888 80A17D98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D9C.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D9C.s deleted file mode 100644 index 748df73e6c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D9C.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80A17D9C -/* 0088C 80A17D9C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00890 80A17DA0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00894 80A17DA4 8C8F0190 */ lw $t7, 0x0190($a0) ## 00000190 -/* 00898 80A17DA8 3C0E80A2 */ lui $t6, %hi(func_80A18FD8) ## $t6 = 80A20000 -/* 0089C 80A17DAC 25CE8FD8 */ addiu $t6, $t6, %lo(func_80A18FD8) ## $t6 = 80A18FD8 -/* 008A0 80A17DB0 11CF0008 */ beq $t6, $t7, .L80A17DD4 -/* 008A4 80A17DB4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 008A8 80A17DB8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 008AC 80A17DBC 24A541F4 */ addiu $a1, $a1, 0x41F4 ## $a1 = 060041F4 -/* 008B0 80A17DC0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 008B4 80A17DC4 3C064090 */ lui $a2, 0x4090 ## $a2 = 40900000 -/* 008B8 80A17DC8 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat -/* 008BC 80A17DCC AFA70018 */ sw $a3, 0x0018($sp) -/* 008C0 80A17DD0 8FA70018 */ lw $a3, 0x0018($sp) -.L80A17DD4: -/* 008C4 80A17DD4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 008C8 80A17DD8 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 008CC 80A17DDC 3C1880A2 */ lui $t8, %hi(func_80A190C8) ## $t8 = 80A20000 -/* 008D0 80A17DE0 271890C8 */ addiu $t8, $t8, %lo(func_80A190C8) ## $t8 = 80A190C8 -/* 008D4 80A17DE4 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -/* 008D8 80A17DE8 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 008DC 80A17DEC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 008E0 80A17DF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 008E4 80A17DF4 03E00008 */ jr $ra -/* 008E8 80A17DF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17DFC.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17DFC.s deleted file mode 100644 index 88f15160bd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17DFC.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_80A17DFC -/* 008EC 80A17DFC 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 008F0 80A17E00 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 008F4 80A17E04 AFBF004C */ sw $ra, 0x004C($sp) -/* 008F8 80A17E08 AFB00048 */ sw $s0, 0x0048($sp) -/* 008FC 80A17E0C AFA50064 */ sw $a1, 0x0064($sp) -/* 00900 80A17E10 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 00904 80A17E14 E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 -/* 00908 80A17E18 E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 -/* 0090C 80A17E1C 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 00910 80A17E20 E7A40054 */ swc1 $f4, 0x0054($sp) -/* 00914 80A17E24 C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 -/* 00918 80A17E28 44814000 */ mtc1 $at, $f8 ## $f8 = 15.00 -/* 0091C 80A17E2C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00920 80A17E30 3C0680A2 */ lui $a2, %hi(D_80A1A4D0) ## $a2 = 80A20000 -/* 00924 80A17E34 46083280 */ add.s $f10, $f6, $f8 -/* 00928 80A17E38 3C0780A2 */ lui $a3, %hi(D_80A1A4DC) ## $a3 = 80A20000 -/* 0092C 80A17E3C 240E0096 */ addiu $t6, $zero, 0x0096 ## $t6 = 00000096 -/* 00930 80A17E40 240FFFF6 */ addiu $t7, $zero, 0xFFF6 ## $t7 = FFFFFFF6 -/* 00934 80A17E44 E7AA0058 */ swc1 $f10, 0x0058($sp) -/* 00938 80A17E48 C490002C */ lwc1 $f16, 0x002C($a0) ## 0000002C -/* 0093C 80A17E4C 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 00940 80A17E50 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 00944 80A17E54 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 00948 80A17E58 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 0094C 80A17E5C 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 00950 80A17E60 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00954 80A17E64 240C0009 */ addiu $t4, $zero, 0x0009 ## $t4 = 00000009 -/* 00958 80A17E68 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 0095C 80A17E6C AFAD003C */ sw $t5, 0x003C($sp) -/* 00960 80A17E70 AFAC0038 */ sw $t4, 0x0038($sp) -/* 00964 80A17E74 AFAB0034 */ sw $t3, 0x0034($sp) -/* 00968 80A17E78 AFAA0030 */ sw $t2, 0x0030($sp) -/* 0096C 80A17E7C AFA90024 */ sw $t1, 0x0024($sp) -/* 00970 80A17E80 AFA80020 */ sw $t0, 0x0020($sp) -/* 00974 80A17E84 AFB9001C */ sw $t9, 0x001C($sp) -/* 00978 80A17E88 AFB80018 */ sw $t8, 0x0018($sp) -/* 0097C 80A17E8C AFA0002C */ sw $zero, 0x002C($sp) -/* 00980 80A17E90 AFA00028 */ sw $zero, 0x0028($sp) -/* 00984 80A17E94 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00988 80A17E98 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0098C 80A17E9C 8FA40064 */ lw $a0, 0x0064($sp) -/* 00990 80A17EA0 24E7A4DC */ addiu $a3, $a3, %lo(D_80A1A4DC) ## $a3 = 80A1A4DC -/* 00994 80A17EA4 24C6A4D0 */ addiu $a2, $a2, %lo(D_80A1A4D0) ## $a2 = 80A1A4D0 -/* 00998 80A17EA8 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFFF4 -/* 0099C 80A17EAC 0C00A9AE */ jal func_8002A6B8 -/* 009A0 80A17EB0 E7B0005C */ swc1 $f16, 0x005C($sp) -/* 009A4 80A17EB4 3C0E80A2 */ lui $t6, %hi(func_80A19230) ## $t6 = 80A20000 -/* 009A8 80A17EB8 25CE9230 */ addiu $t6, $t6, %lo(func_80A19230) ## $t6 = 80A19230 -/* 009AC 80A17EBC AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 -/* 009B0 80A17EC0 8FBF004C */ lw $ra, 0x004C($sp) -/* 009B4 80A17EC4 8FB00048 */ lw $s0, 0x0048($sp) -/* 009B8 80A17EC8 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 009BC 80A17ECC 03E00008 */ jr $ra -/* 009C0 80A17ED0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17ED4.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17ED4.s deleted file mode 100644 index a486129aec..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17ED4.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80A17ED4 -/* 009C4 80A17ED4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 009C8 80A17ED8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 009CC 80A17EDC 3C014224 */ lui $at, 0x4224 ## $at = 42240000 -/* 009D0 80A17EE0 44812000 */ mtc1 $at, $f4 ## $f4 = 41.00 -/* 009D4 80A17EE4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 009D8 80A17EE8 AFA40028 */ sw $a0, 0x0028($sp) -/* 009DC 80A17EEC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 009E0 80A17EF0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 009E4 80A17EF4 44070000 */ mfc1 $a3, $f0 -/* 009E8 80A17EF8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 009EC 80A17EFC 24A519CC */ addiu $a1, $a1, 0x19CC ## $a1 = 060019CC -/* 009F0 80A17F00 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 009F4 80A17F04 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 009F8 80A17F08 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 009FC 80A17F0C 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00A00 80A17F10 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00A04 80A17F14 8FA20028 */ lw $v0, 0x0028($sp) -/* 00A08 80A17F18 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00A0C 80A17F1C 3C0F80A2 */ lui $t7, %hi(func_80A196DC) ## $t7 = 80A20000 -/* 00A10 80A17F20 25EF96DC */ addiu $t7, $t7, %lo(func_80A196DC) ## $t7 = 80A196DC -/* 00A14 80A17F24 AC4F0190 */ sw $t7, 0x0190($v0) ## 00000190 -/* 00A18 80A17F28 E4460068 */ swc1 $f6, 0x0068($v0) ## 00000068 -/* 00A1C 80A17F2C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00A20 80A17F30 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A24 80A17F34 03E00008 */ jr $ra -/* 00A28 80A17F38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17F3C.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17F3C.s deleted file mode 100644 index bc5ed4de2b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17F3C.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80A17F3C -/* 00A2C 80A17F3C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00A30 80A17F40 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00A34 80A17F44 3C014224 */ lui $at, 0x4224 ## $at = 42240000 -/* 00A38 80A17F48 44812000 */ mtc1 $at, $f4 ## $f4 = 41.00 -/* 00A3C 80A17F4C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00A40 80A17F50 AFA40028 */ sw $a0, 0x0028($sp) -/* 00A44 80A17F54 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00A48 80A17F58 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00A4C 80A17F5C 44070000 */ mfc1 $a3, $f0 -/* 00A50 80A17F60 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00A54 80A17F64 24A519CC */ addiu $a1, $a1, 0x19CC ## $a1 = 060019CC -/* 00A58 80A17F68 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00A5C 80A17F6C 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 00A60 80A17F70 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00A64 80A17F74 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00A68 80A17F78 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00A6C 80A17F7C 8FA20028 */ lw $v0, 0x0028($sp) -/* 00A70 80A17F80 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00A74 80A17F84 3C0F80A2 */ lui $t7, %hi(func_80A1928C) ## $t7 = 80A20000 -/* 00A78 80A17F88 25EF928C */ addiu $t7, $t7, %lo(func_80A1928C) ## $t7 = 80A1928C -/* 00A7C 80A17F8C AC4F0190 */ sw $t7, 0x0190($v0) ## 00000190 -/* 00A80 80A17F90 E4460068 */ swc1 $f6, 0x0068($v0) ## 00000068 -/* 00A84 80A17F94 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00A88 80A17F98 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A8C 80A17F9C 03E00008 */ jr $ra -/* 00A90 80A17FA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17FA4.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17FA4.s deleted file mode 100644 index b212ff4602..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17FA4.s +++ /dev/null @@ -1,134 +0,0 @@ -.late_rodata -glabel D_80A1A578 - .float 0.1 - -.text -glabel func_80A17FA4 -/* 00A94 80A17FA4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00A98 80A17FA8 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 00A9C 80A17FAC 44812000 */ mtc1 $at, $f4 ## $f4 = 45.00 -/* 00AA0 80A17FB0 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 00AA4 80A17FB4 44813000 */ mtc1 $at, $f6 ## $f6 = -3.00 -/* 00AA8 80A17FB8 AFB00028 */ sw $s0, 0x0028($sp) -/* 00AAC 80A17FBC AFA50044 */ sw $a1, 0x0044($sp) -/* 00AB0 80A17FC0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AB4 80A17FC4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00AB8 80A17FC8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00ABC 80A17FCC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00AC0 80A17FD0 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00AC4 80A17FD4 24A519CC */ addiu $a1, $a1, 0x19CC ## $a1 = 060019CC -/* 00AC8 80A17FD8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00ACC 80A17FDC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00AD0 80A17FE0 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 -/* 00AD4 80A17FE4 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00AD8 80A17FE8 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00ADC 80A17FEC E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00AE0 80A17FF0 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 -/* 00AE4 80A17FF4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00AE8 80A17FF8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00AEC 80A17FFC 01E1C024 */ and $t8, $t7, $at -/* 00AF0 80A18000 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 -/* 00AF4 80A18004 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AF8 80A18008 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 00AFC 80A1800C 0C285DD2 */ jal func_80A17748 -/* 00B00 80A18010 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 -/* 00B04 80A18014 3C198016 */ lui $t9, %hi(gSaveContext+4) -/* 00B08 80A18018 8F39E664 */ lw $t9, %lo(gSaveContext+4)($t9) -/* 00B0C 80A1801C 8FA80044 */ lw $t0, 0x0044($sp) -/* 00B10 80A18020 5320001D */ beql $t9, $zero, .L80A18098 -/* 00B14 80A18024 C6000094 */ lwc1 $f0, 0x0094($s0) ## 00000094 -/* 00B18 80A18028 C6000094 */ lwc1 $f0, 0x0094($s0) ## 00000094 -/* 00B1C 80A1802C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00B20 80A18030 44811000 */ mtc1 $at, $f2 ## $f2 = 20.00 -/* 00B24 80A18034 46000007 */ neg.s $f0, $f0 -/* 00B28 80A18038 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00B2C 80A1803C 4602003C */ c.lt.s $f0, $f2 -/* 00B30 80A18040 00000000 */ nop -/* 00B34 80A18044 45020007 */ bc1fl .L80A18064 -/* 00B38 80A18048 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 00B3C 80A1804C 46001006 */ mov.s $f0, $f2 -/* 00B40 80A18050 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00B44 80A18054 44811000 */ mtc1 $at, $f2 ## $f2 = -10.00 -/* 00B48 80A18058 10000027 */ beq $zero, $zero, .L80A180F8 -/* 00B4C 80A1805C C5080028 */ lwc1 $f8, 0x0028($t0) ## 00000028 -/* 00B50 80A18060 44816000 */ mtc1 $at, $f12 ## $f12 = -10.00 -.L80A18064: -/* 00B54 80A18064 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00B58 80A18068 4600603C */ c.lt.s $f12, $f0 -/* 00B5C 80A1806C 00000000 */ nop -/* 00B60 80A18070 45020004 */ bc1fl .L80A18084 -/* 00B64 80A18074 46000086 */ mov.s $f2, $f0 -/* 00B68 80A18078 10000002 */ beq $zero, $zero, .L80A18084 -/* 00B6C 80A1807C 46006086 */ mov.s $f2, $f12 -/* 00B70 80A18080 46000086 */ mov.s $f2, $f0 -.L80A18084: -/* 00B74 80A18084 46001006 */ mov.s $f0, $f2 -/* 00B78 80A18088 44811000 */ mtc1 $at, $f2 ## $f2 = -10.00 -/* 00B7C 80A1808C 1000001A */ beq $zero, $zero, .L80A180F8 -/* 00B80 80A18090 C5080028 */ lwc1 $f8, 0x0028($t0) ## 00000028 -/* 00B84 80A18094 C6000094 */ lwc1 $f0, 0x0094($s0) ## 00000094 -.L80A18098: -/* 00B88 80A18098 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 00B8C 80A1809C 44811000 */ mtc1 $at, $f2 ## $f2 = 25.00 -/* 00B90 80A180A0 46000007 */ neg.s $f0, $f0 -/* 00B94 80A180A4 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 00B98 80A180A8 4602003C */ c.lt.s $f0, $f2 -/* 00B9C 80A180AC 00000000 */ nop -/* 00BA0 80A180B0 45020004 */ bc1fl .L80A180C4 -/* 00BA4 80A180B4 44816000 */ mtc1 $at, $f12 ## $f12 = 45.00 -/* 00BA8 80A180B8 1000000B */ beq $zero, $zero, .L80A180E8 -/* 00BAC 80A180BC 46001006 */ mov.s $f0, $f2 -/* 00BB0 80A180C0 44816000 */ mtc1 $at, $f12 ## $f12 = 45.00 -.L80A180C4: -/* 00BB4 80A180C4 00000000 */ nop -/* 00BB8 80A180C8 4600603C */ c.lt.s $f12, $f0 -/* 00BBC 80A180CC 00000000 */ nop -/* 00BC0 80A180D0 45020004 */ bc1fl .L80A180E4 -/* 00BC4 80A180D4 46000086 */ mov.s $f2, $f0 -/* 00BC8 80A180D8 10000002 */ beq $zero, $zero, .L80A180E4 -/* 00BCC 80A180DC 46006086 */ mov.s $f2, $f12 -/* 00BD0 80A180E0 46000086 */ mov.s $f2, $f0 -.L80A180E4: -/* 00BD4 80A180E4 46001006 */ mov.s $f0, $f2 -.L80A180E8: -/* 00BD8 80A180E8 3C01C28C */ lui $at, 0xC28C ## $at = C28C0000 -/* 00BDC 80A180EC 44811000 */ mtc1 $at, $f2 ## $f2 = -70.00 -/* 00BE0 80A180F0 00000000 */ nop -/* 00BE4 80A180F4 C5080028 */ lwc1 $f8, 0x0028($t0) ## 00000028 -.L80A180F8: -/* 00BE8 80A180F8 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 00BEC 80A180FC 46004280 */ add.s $f10, $f8, $f0 -/* 00BF0 80A18100 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 00BF4 80A18104 0C01DE1C */ jal Math_Sins - ## sins? -/* 00BF8 80A18108 E7A20038 */ swc1 $f2, 0x0038($sp) -/* 00BFC 80A1810C 3C0180A2 */ lui $at, %hi(D_80A1A578) ## $at = 80A20000 -/* 00C00 80A18110 C430A578 */ lwc1 $f16, %lo(D_80A1A578)($at) -/* 00C04 80A18114 C7A20038 */ lwc1 $f2, 0x0038($sp) -/* 00C08 80A18118 8FA90044 */ lw $t1, 0x0044($sp) -/* 00C0C 80A1811C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 00C10 80A18120 46101302 */ mul.s $f12, $f2, $f16 -/* 00C14 80A18124 C5240024 */ lwc1 $f4, 0x0024($t1) ## 00000024 -/* 00C18 80A18128 460C0482 */ mul.s $f18, $f0, $f12 -/* 00C1C 80A1812C 46049180 */ add.s $f6, $f18, $f4 -/* 00C20 80A18130 E6060024 */ swc1 $f6, 0x0024($s0) ## 00000024 -/* 00C24 80A18134 0C01DE0D */ jal Math_Coss - ## coss? -/* 00C28 80A18138 E7AC0030 */ swc1 $f12, 0x0030($sp) -/* 00C2C 80A1813C C7AC0030 */ lwc1 $f12, 0x0030($sp) -/* 00C30 80A18140 8FAA0044 */ lw $t2, 0x0044($sp) -/* 00C34 80A18144 3C0C80A2 */ lui $t4, %hi(func_80A193C4) ## $t4 = 80A20000 -/* 00C38 80A18148 460C0202 */ mul.s $f8, $f0, $f12 -/* 00C3C 80A1814C C54A002C */ lwc1 $f10, 0x002C($t2) ## 0000002C -/* 00C40 80A18150 240BB320 */ addiu $t3, $zero, 0xB320 ## $t3 = FFFFB320 -/* 00C44 80A18154 258C93C4 */ addiu $t4, $t4, %lo(func_80A193C4) ## $t4 = 80A193C4 -/* 00C48 80A18158 A60B00B4 */ sh $t3, 0x00B4($s0) ## 000000B4 -/* 00C4C 80A1815C AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 -/* 00C50 80A18160 460A4400 */ add.s $f16, $f8, $f10 -/* 00C54 80A18164 E610002C */ swc1 $f16, 0x002C($s0) ## 0000002C -/* 00C58 80A18168 8FBF002C */ lw $ra, 0x002C($sp) -/* 00C5C 80A1816C 8FB00028 */ lw $s0, 0x0028($sp) -/* 00C60 80A18170 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00C64 80A18174 03E00008 */ jr $ra -/* 00C68 80A18178 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1817C.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1817C.s deleted file mode 100644 index 4ccc654b16..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1817C.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80A1817C -/* 00C6C 80A1817C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C70 80A18180 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C74 80A18184 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00C78 80A18188 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00C7C 80A1818C 24A59DB0 */ addiu $a1, $a1, 0x9DB0 ## $a1 = 06009DB0 -/* 00C80 80A18190 AFA60018 */ sw $a2, 0x0018($sp) -/* 00C84 80A18194 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop -/* 00C88 80A18198 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00C8C 80A1819C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00C90 80A181A0 848E019A */ lh $t6, 0x019A($a0) ## 0000019A -/* 00C94 80A181A4 A4800194 */ sh $zero, 0x0194($a0) ## 00000194 -/* 00C98 80A181A8 25CF05DC */ addiu $t7, $t6, 0x05DC ## $t7 = 000005DC -/* 00C9C 80A181AC 0C285DD2 */ jal func_80A17748 -/* 00CA0 80A181B0 A48F019A */ sh $t7, 0x019A($a0) ## 0000019A -/* 00CA4 80A181B4 8FA60018 */ lw $a2, 0x0018($sp) -/* 00CA8 80A181B8 3C1880A2 */ lui $t8, %hi(func_80A198EC) ## $t8 = 80A20000 -/* 00CAC 80A181BC 271898EC */ addiu $t8, $t8, %lo(func_80A198EC) ## $t8 = 80A198EC -/* 00CB0 80A181C0 ACD80190 */ sw $t8, 0x0190($a2) ## 00000190 -/* 00CB4 80A181C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00CB8 80A181C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00CBC 80A181CC 03E00008 */ jr $ra -/* 00CC0 80A181D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A181D4.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A181D4.s deleted file mode 100644 index 69045b6016..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A181D4.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_80A181D4 -/* 00CC4 80A181D4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00CC8 80A181D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00CCC 80A181DC 8C860118 */ lw $a2, 0x0118($a0) ## 00000118 -/* 00CD0 80A181E0 3C0280A2 */ lui $v0, %hi(func_80A19B9C) ## $v0 = 80A20000 -/* 00CD4 80A181E4 24429B9C */ addiu $v0, $v0, %lo(func_80A19B9C) ## $v0 = 80A19B9C -/* 00CD8 80A181E8 8CCE0190 */ lw $t6, 0x0190($a2) ## 00000190 -/* 00CDC 80A181EC 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00CE0 80A181F0 8C87011C */ lw $a3, 0x011C($a0) ## 0000011C -/* 00CE4 80A181F4 144E000E */ bne $v0, $t6, .L80A18230 -/* 00CE8 80A181F8 2401FFEE */ addiu $at, $zero, 0xFFEE ## $at = FFFFFFEE -/* 00CEC 80A181FC 8CEF0190 */ lw $t7, 0x0190($a3) ## 00000190 -/* 00CF0 80A18200 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00CF4 80A18204 544F000B */ bnel $v0, $t7, .L80A18234 -/* 00CF8 80A18208 8CB80004 */ lw $t8, 0x0004($a1) ## 00000004 -/* 00CFC 80A1820C AFA50020 */ sw $a1, 0x0020($sp) -/* 00D00 80A18210 0C00B55C */ jal Actor_Kill - -/* 00D04 80A18214 AFA70018 */ sw $a3, 0x0018($sp) -/* 00D08 80A18218 0C00B55C */ jal Actor_Kill - -/* 00D0C 80A1821C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00D10 80A18220 0C00B55C */ jal Actor_Kill - -/* 00D14 80A18224 8FA40020 */ lw $a0, 0x0020($sp) -/* 00D18 80A18228 10000007 */ beq $zero, $zero, .L80A18248 -/* 00D1C 80A1822C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A18230: -/* 00D20 80A18230 8CB80004 */ lw $t8, 0x0004($a1) ## 00000004 -.L80A18234: -/* 00D24 80A18234 ACA00134 */ sw $zero, 0x0134($a1) ## 00000134 -/* 00D28 80A18238 ACA20190 */ sw $v0, 0x0190($a1) ## 00000190 -/* 00D2C 80A1823C 0301C824 */ and $t9, $t8, $at -/* 00D30 80A18240 ACB90004 */ sw $t9, 0x0004($a1) ## 00000004 -/* 00D34 80A18244 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A18248: -/* 00D38 80A18248 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00D3C 80A1824C 03E00008 */ jr $ra -/* 00D40 80A18250 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18254.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18254.s deleted file mode 100644 index d4f2c94076..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18254.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_80A18254 -/* 00D44 80A18254 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00D48 80A18258 AFB00020 */ sw $s0, 0x0020($sp) -/* 00D4C 80A1825C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00D50 80A18260 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00D54 80A18264 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00D58 80A18268 24A50590 */ addiu $a1, $a1, 0x0590 ## $a1 = 06000590 -/* 00D5C 80A1826C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00D60 80A18270 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop -/* 00D64 80A18274 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00D68 80A18278 8E0E0304 */ lw $t6, 0x0304($s0) ## 00000304 -/* 00D6C 80A1827C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00D70 80A18280 3421F824 */ ori $at, $at, 0xF824 ## $at = 0001F824 -/* 00D74 80A18284 8DCF0000 */ lw $t7, 0x0000($t6) ## 00000000 -/* 00D78 80A18288 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D7C 80A1828C 01E1C024 */ and $t8, $t7, $at -/* 00D80 80A18290 13000005 */ beq $t8, $zero, .L80A182A8 -/* 00D84 80A18294 00000000 */ nop -/* 00D88 80A18298 8E1902D0 */ lw $t9, 0x02D0($s0) ## 000002D0 -/* 00D8C 80A1829C 87280032 */ lh $t0, 0x0032($t9) ## 00000032 -/* 00D90 80A182A0 10000006 */ beq $zero, $zero, .L80A182BC -/* 00D94 80A182A4 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 -.L80A182A8: -/* 00D98 80A182A8 0C00B69E */ jal func_8002DA78 -/* 00D9C 80A182AC 8E0502D0 */ lw $a1, 0x02D0($s0) ## 000002D0 -/* 00DA0 80A182B0 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00DA4 80A182B4 00414821 */ addu $t1, $v0, $at -/* 00DA8 80A182B8 A6090032 */ sh $t1, 0x0032($s0) ## 00000032 -.L80A182BC: -/* 00DAC 80A182BC 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 -/* 00DB0 80A182C0 AFAA0010 */ sw $t2, 0x0010($sp) -/* 00DB4 80A182C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DB8 80A182C8 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 00DBC 80A182CC 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 00DC0 80A182D0 0C00D09B */ jal func_8003426C -/* 00DC4 80A182D4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00DC8 80A182D8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00DCC 80A182DC 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 00DD0 80A182E0 3C0140B0 */ lui $at, 0x40B0 ## $at = 40B00000 -/* 00DD4 80A182E4 44813000 */ mtc1 $at, $f6 ## $f6 = 5.50 -/* 00DD8 80A182E8 3C0B80A2 */ lui $t3, %hi(func_80A19BA8) ## $t3 = 80A20000 -/* 00DDC 80A182EC 256B9BA8 */ addiu $t3, $t3, %lo(func_80A19BA8) ## $t3 = 80A19BA8 -/* 00DE0 80A182F0 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 -/* 00DE4 80A182F4 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 00DE8 80A182F8 E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 -/* 00DEC 80A182FC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00DF0 80A18300 8FB00020 */ lw $s0, 0x0020($sp) -/* 00DF4 80A18304 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00DF8 80A18308 03E00008 */ jr $ra -/* 00DFC 80A1830C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18310.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18310.s deleted file mode 100644 index bef1e99e9e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18310.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80A18310 -/* 00E00 80A18310 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00E04 80A18314 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00E08 80A18318 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00E0C 80A1831C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00E10 80A18320 24A50EA4 */ addiu $a1, $a1, 0x0EA4 ## $a1 = 06000EA4 -/* 00E14 80A18324 AFA60018 */ sw $a2, 0x0018($sp) -/* 00E18 80A18328 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop -/* 00E1C 80A1832C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00E20 80A18330 8FA60018 */ lw $a2, 0x0018($sp) -/* 00E24 80A18334 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00E28 80A18338 3C0F80A2 */ lui $t7, %hi(func_80A19C6C) ## $t7 = 80A20000 -/* 00E2C 80A1833C 84CE00B6 */ lh $t6, 0x00B6($a2) ## 000000B6 -/* 00E30 80A18340 25EF9C6C */ addiu $t7, $t7, %lo(func_80A19C6C) ## $t7 = 80A19C6C -/* 00E34 80A18344 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 -/* 00E38 80A18348 E4C00068 */ swc1 $f0, 0x0068($a2) ## 00000068 -/* 00E3C 80A1834C E4C00060 */ swc1 $f0, 0x0060($a2) ## 00000060 -/* 00E40 80A18350 A4CE0032 */ sh $t6, 0x0032($a2) ## 00000032 -/* 00E44 80A18354 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00E48 80A18358 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00E4C 80A1835C 03E00008 */ jr $ra -/* 00E50 80A18360 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18364.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18364.s deleted file mode 100644 index 9bbec5df9a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18364.s +++ /dev/null @@ -1,76 +0,0 @@ -.late_rodata -glabel D_80A1A57C - .word 0x3B83126F - -.text -glabel func_80A18364 -/* 00E54 80A18364 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00E58 80A18368 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 -/* 00E5C 80A1836C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00E60 80A18370 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 00E64 80A18374 44813000 */ mtc1 $at, $f6 ## $f6 = -3.00 -/* 00E68 80A18378 AFB00028 */ sw $s0, 0x0028($sp) -/* 00E6C 80A1837C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E70 80A18380 AFBF002C */ sw $ra, 0x002C($sp) -/* 00E74 80A18384 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00E78 80A18388 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00E7C 80A1838C AFAE0014 */ sw $t6, 0x0014($sp) -/* 00E80 80A18390 24A519CC */ addiu $a1, $a1, 0x19CC ## $a1 = 060019CC -/* 00E84 80A18394 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00E88 80A18398 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 00E8C 80A1839C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00E90 80A183A0 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00E94 80A183A4 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00E98 80A183A8 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00E9C 80A183AC 920F00B1 */ lbu $t7, 0x00B1($s0) ## 000000B1 -/* 00EA0 80A183B0 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 00EA4 80A183B4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00EA8 80A183B8 15E1000A */ bne $t7, $at, .L80A183E4 -/* 00EAC 80A183BC E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 00EB0 80A183C0 24180050 */ addiu $t8, $zero, 0x0050 ## $t8 = 00000050 -/* 00EB4 80A183C4 AFB80010 */ sw $t8, 0x0010($sp) -/* 00EB8 80A183C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00EBC 80A183CC 24058000 */ addiu $a1, $zero, 0x8000 ## $a1 = FFFF8000 -/* 00EC0 80A183D0 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 00EC4 80A183D4 0C00D09B */ jal func_8003426C -/* 00EC8 80A183D8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00ECC 80A183DC 10000017 */ beq $zero, $zero, .L80A1843C -/* 00ED0 80A183E0 00000000 */ nop -.L80A183E4: -/* 00ED4 80A183E4 24190050 */ addiu $t9, $zero, 0x0050 ## $t9 = 00000050 -/* 00ED8 80A183E8 AFB90010 */ sw $t9, 0x0010($sp) -/* 00EDC 80A183EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00EE0 80A183F0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00EE4 80A183F4 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 00EE8 80A183F8 0C00D09B */ jal func_8003426C -/* 00EEC 80A183FC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00EF0 80A18400 3C0180A2 */ lui $at, %hi(D_80A1A57C) ## $at = 80A20000 -/* 00EF4 80A18404 C42AA57C */ lwc1 $f10, %lo(D_80A1A57C)($at) -/* 00EF8 80A18408 C6100050 */ lwc1 $f16, 0x0050($s0) ## 00000050 -/* 00EFC 80A1840C 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E -/* 00F00 80A18410 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F04 80A18414 4610503C */ c.lt.s $f10, $f16 -/* 00F08 80A18418 00000000 */ nop -/* 00F0C 80A1841C 45000005 */ bc1f .L80A18434 -/* 00F10 80A18420 00000000 */ nop -/* 00F14 80A18424 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00F18 80A18428 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F1C 80A1842C 10000003 */ beq $zero, $zero, .L80A1843C -/* 00F20 80A18430 00000000 */ nop -.L80A18434: -/* 00F24 80A18434 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00F28 80A18438 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E -.L80A1843C: -/* 00F2C 80A1843C 3C0980A2 */ lui $t1, %hi(func_80A19CA4) ## $t1 = 80A20000 -/* 00F30 80A18440 24080050 */ addiu $t0, $zero, 0x0050 ## $t0 = 00000050 -/* 00F34 80A18444 25299CA4 */ addiu $t1, $t1, %lo(func_80A19CA4) ## $t1 = 80A19CA4 -/* 00F38 80A18448 A6080194 */ sh $t0, 0x0194($s0) ## 00000194 -/* 00F3C 80A1844C AE090190 */ sw $t1, 0x0190($s0) ## 00000190 -/* 00F40 80A18450 8FBF002C */ lw $ra, 0x002C($sp) -/* 00F44 80A18454 8FB00028 */ lw $s0, 0x0028($sp) -/* 00F48 80A18458 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00F4C 80A1845C 03E00008 */ jr $ra -/* 00F50 80A18460 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18464.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18464.s deleted file mode 100644 index e7694c7f7e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18464.s +++ /dev/null @@ -1,49 +0,0 @@ -.late_rodata -glabel D_80A1A580 - .word 0x3B83126F - -.text -glabel func_80A18464 -/* 00F54 80A18464 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00F58 80A18468 AFBF001C */ sw $ra, 0x001C($sp) -/* 00F5C 80A1846C AFB00018 */ sw $s0, 0x0018($sp) -/* 00F60 80A18470 AFA50024 */ sw $a1, 0x0024($sp) -/* 00F64 80A18474 3C0180A2 */ lui $at, %hi(D_80A1A580) ## $at = 80A20000 -/* 00F68 80A18478 C424A580 */ lwc1 $f4, %lo(D_80A1A580)($at) -/* 00F6C 80A1847C C4860050 */ lwc1 $f6, 0x0050($a0) ## 00000050 -/* 00F70 80A18480 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00F74 80A18484 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00F78 80A18488 4606203C */ c.lt.s $f4, $f6 -/* 00F7C 80A1848C 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 00F80 80A18490 24070090 */ addiu $a3, $zero, 0x0090 ## $a3 = 00000090 -/* 00F84 80A18494 45000010 */ bc1f .L80A184D8 -/* 00F88 80A18498 00000000 */ nop -/* 00F8C 80A1849C 848E008A */ lh $t6, 0x008A($a0) ## 0000008A -/* 00F90 80A184A0 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00F94 80A184A4 01C17821 */ addu $t7, $t6, $at -/* 00F98 80A184A8 A48F00B6 */ sh $t7, 0x00B6($a0) ## 000000B6 -/* 00F9C 80A184AC 0C285EFB */ jal func_80A17BEC -/* 00FA0 80A184B0 8C84011C */ lw $a0, 0x011C($a0) ## 0000011C -/* 00FA4 80A184B4 0C285EFB */ jal func_80A17BEC -/* 00FA8 80A184B8 8E040118 */ lw $a0, 0x0118($s0) ## 00000118 -/* 00FAC 80A184BC 0C285EFB */ jal func_80A17BEC -/* 00FB0 80A184C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FB4 80A184C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FB8 80A184C8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00FBC 80A184CC 24053935 */ addiu $a1, $zero, 0x3935 ## $a1 = 00003935 -/* 00FC0 80A184D0 10000007 */ beq $zero, $zero, .L80A184F0 -/* 00FC4 80A184D4 8FBF001C */ lw $ra, 0x001C($sp) -.L80A184D8: -/* 00FC8 80A184D8 0C007E50 */ jal Item_DropCollectibleRandom - -/* 00FCC 80A184DC 8FA40024 */ lw $a0, 0x0024($sp) -/* 00FD0 80A184E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FD4 80A184E4 0C285F7F */ jal func_80A17DFC -/* 00FD8 80A184E8 8FA50024 */ lw $a1, 0x0024($sp) -/* 00FDC 80A184EC 8FBF001C */ lw $ra, 0x001C($sp) -.L80A184F0: -/* 00FE0 80A184F0 8FB00018 */ lw $s0, 0x0018($sp) -/* 00FE4 80A184F4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00FE8 80A184F8 03E00008 */ jr $ra -/* 00FEC 80A184FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18500.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18500.s deleted file mode 100644 index a346f072c1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18500.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_80A18500 -/* 00FF0 80A18500 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00FF4 80A18504 AFB00018 */ sw $s0, 0x0018($sp) -/* 00FF8 80A18508 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00FFC 80A1850C AFBF001C */ sw $ra, 0x001C($sp) -/* 01000 80A18510 AFA50024 */ sw $a1, 0x0024($sp) -/* 01004 80A18514 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01008 80A18518 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0100C 80A1851C 10400024 */ beq $v0, $zero, .L80A185B0 -/* 01010 80A18520 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 01014 80A18524 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 01018 80A18528 44813000 */ mtc1 $at, $f6 ## $f6 = 400.00 -/* 0101C 80A1852C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01020 80A18530 4606203C */ c.lt.s $f4, $f6 -/* 01024 80A18534 00000000 */ nop -/* 01028 80A18538 4502000C */ bc1fl .L80A1856C -/* 0102C 80A1853C 3C01438C */ lui $at, 0x438C ## $at = 438C0000 -/* 01030 80A18540 0C00B821 */ jal func_8002E084 -/* 01034 80A18544 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 01038 80A18548 54400008 */ bnel $v0, $zero, .L80A1856C -/* 0103C 80A1854C 3C01438C */ lui $at, 0x438C ## $at = 438C0000 -/* 01040 80A18550 860E008A */ lh $t6, 0x008A($s0) ## 0000008A -/* 01044 80A18554 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01048 80A18558 0C285E42 */ jal func_80A17908 -/* 0104C 80A1855C A60E0196 */ sh $t6, 0x0196($s0) ## 00000196 -/* 01050 80A18560 10000014 */ beq $zero, $zero, .L80A185B4 -/* 01054 80A18564 8FBF001C */ lw $ra, 0x001C($sp) -/* 01058 80A18568 3C01438C */ lui $at, 0x438C ## $at = 438C0000 -.L80A1856C: -/* 0105C 80A1856C 44815000 */ mtc1 $at, $f10 ## $f10 = 280.00 -/* 01060 80A18570 C6080090 */ lwc1 $f8, 0x0090($s0) ## 00000090 -/* 01064 80A18574 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01068 80A18578 460A403C */ c.lt.s $f8, $f10 -/* 0106C 80A1857C 00000000 */ nop -/* 01070 80A18580 45000009 */ bc1f .L80A185A8 -/* 01074 80A18584 00000000 */ nop -/* 01078 80A18588 0C00B821 */ jal func_8002E084 -/* 0107C 80A1858C 24052000 */ addiu $a1, $zero, 0x2000 ## $a1 = 00002000 -/* 01080 80A18590 10400005 */ beq $v0, $zero, .L80A185A8 -/* 01084 80A18594 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01088 80A18598 0C285E8E */ jal func_80A17A38 -/* 0108C 80A1859C 8FA50024 */ lw $a1, 0x0024($sp) -/* 01090 80A185A0 10000004 */ beq $zero, $zero, .L80A185B4 -/* 01094 80A185A4 8FBF001C */ lw $ra, 0x001C($sp) -.L80A185A8: -/* 01098 80A185A8 0C285DF2 */ jal func_80A177C8 -/* 0109C 80A185AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A185B0: -/* 010A0 80A185B0 8FBF001C */ lw $ra, 0x001C($sp) -.L80A185B4: -/* 010A4 80A185B4 8FB00018 */ lw $s0, 0x0018($sp) -/* 010A8 80A185B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 010AC 80A185BC 03E00008 */ jr $ra -/* 010B0 80A185C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A185C4.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A185C4.s deleted file mode 100644 index 9b4c4a4f95..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A185C4.s +++ /dev/null @@ -1,46 +0,0 @@ -.late_rodata -glabel D_80A1A584 - .word 0x3B83126F - -.text -glabel func_80A185C4 -/* 010B4 80A185C4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 010B8 80A185C8 AFA5001C */ sw $a1, 0x001C($sp) -/* 010BC 80A185CC 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 010C0 80A185D0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 010C4 80A185D4 AFA40018 */ sw $a0, 0x0018($sp) -/* 010C8 80A185D8 AFA50018 */ sw $a1, 0x0018($sp) -/* 010CC 80A185DC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 010D0 80A185E0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 010D4 80A185E4 10400016 */ beq $v0, $zero, .L80A18640 -/* 010D8 80A185E8 8FA50018 */ lw $a1, 0x0018($sp) -/* 010DC 80A185EC 3C0180A2 */ lui $at, %hi(D_80A1A584) ## $at = 80A20000 -/* 010E0 80A185F0 C424A584 */ lwc1 $f4, %lo(D_80A1A584)($at) -/* 010E4 80A185F4 C4A60050 */ lwc1 $f6, 0x0050($a1) ## 00000050 -/* 010E8 80A185F8 4606203C */ c.lt.s $f4, $f6 -/* 010EC 80A185FC 00000000 */ nop -/* 010F0 80A18600 45020006 */ bc1fl .L80A1861C -/* 010F4 80A18604 84AE001C */ lh $t6, 0x001C($a1) ## 0000001C -/* 010F8 80A18608 0C285E02 */ jal func_80A17808 -/* 010FC 80A1860C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01100 80A18610 1000000C */ beq $zero, $zero, .L80A18644 -/* 01104 80A18614 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01108 80A18618 84AE001C */ lh $t6, 0x001C($a1) ## 0000001C -.L80A1861C: -/* 0110C 80A1861C 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 -/* 01110 80A18620 15C10005 */ bne $t6, $at, .L80A18638 -/* 01114 80A18624 00000000 */ nop -/* 01118 80A18628 0C285F67 */ jal func_80A17D9C -/* 0111C 80A1862C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01120 80A18630 10000004 */ beq $zero, $zero, .L80A18644 -/* 01124 80A18634 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A18638: -/* 01128 80A18638 0C285F53 */ jal func_80A17D4C -/* 0112C 80A1863C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -.L80A18640: -/* 01130 80A18640 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A18644: -/* 01134 80A18644 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01138 80A18648 03E00008 */ jr $ra -/* 0113C 80A1864C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18650.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18650.s deleted file mode 100644 index f8ab3fc95b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18650.s +++ /dev/null @@ -1,98 +0,0 @@ -glabel func_80A18650 -/* 01140 80A18650 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01144 80A18654 AFB00018 */ sw $s0, 0x0018($sp) -/* 01148 80A18658 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0114C 80A1865C AFBF001C */ sw $ra, 0x001C($sp) -/* 01150 80A18660 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01154 80A18664 AFA5002C */ sw $a1, 0x002C($sp) -/* 01158 80A18668 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 0115C 80A1866C AFA40020 */ sw $a0, 0x0020($sp) -/* 01160 80A18670 8FA40020 */ lw $a0, 0x0020($sp) -/* 01164 80A18674 0C0295B2 */ jal func_800A56C8 -/* 01168 80A18678 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0116C 80A1867C 10400005 */ beq $v0, $zero, .L80A18694 -/* 01170 80A18680 3C054140 */ lui $a1, 0x4140 ## $a1 = 41400000 -/* 01174 80A18684 86030194 */ lh $v1, 0x0194($s0) ## 00000194 -/* 01178 80A18688 10600002 */ beq $v1, $zero, .L80A18694 -/* 0117C 80A1868C 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 01180 80A18690 A60E0194 */ sh $t6, 0x0194($s0) ## 00000194 -.L80A18694: -/* 01184 80A18694 5440000D */ bnel $v0, $zero, .L80A186CC -/* 01188 80A18698 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0118C 80A1869C 0C0295B2 */ jal func_800A56C8 -/* 01190 80A186A0 8FA40020 */ lw $a0, 0x0020($sp) -/* 01194 80A186A4 14400008 */ bne $v0, $zero, .L80A186C8 -/* 01198 80A186A8 8FA40020 */ lw $a0, 0x0020($sp) -/* 0119C 80A186AC 0C0295B2 */ jal func_800A56C8 -/* 011A0 80A186B0 3C0541C0 */ lui $a1, 0x41C0 ## $a1 = 41C00000 -/* 011A4 80A186B4 14400004 */ bne $v0, $zero, .L80A186C8 -/* 011A8 80A186B8 8FA40020 */ lw $a0, 0x0020($sp) -/* 011AC 80A186BC 0C0295B2 */ jal func_800A56C8 -/* 011B0 80A186C0 3C054210 */ lui $a1, 0x4210 ## $a1 = 42100000 -/* 011B4 80A186C4 10400003 */ beq $v0, $zero, .L80A186D4 -.L80A186C8: -/* 011B8 80A186C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A186CC: -/* 011BC 80A186CC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 011C0 80A186D0 24053894 */ addiu $a1, $zero, 0x3894 ## $a1 = 00003894 -.L80A186D4: -/* 011C4 80A186D4 3C0143A0 */ lui $at, 0x43A0 ## $at = 43A00000 -/* 011C8 80A186D8 44813000 */ mtc1 $at, $f6 ## $f6 = 320.00 -/* 011CC 80A186DC C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 011D0 80A186E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011D4 80A186E4 4606203C */ c.lt.s $f4, $f6 -/* 011D8 80A186E8 00000000 */ nop -/* 011DC 80A186EC 4502000A */ bc1fl .L80A18718 -/* 011E0 80A186F0 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 -/* 011E4 80A186F4 0C00B821 */ jal func_8002E084 -/* 011E8 80A186F8 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 011EC 80A186FC 50400006 */ beql $v0, $zero, .L80A18718 -/* 011F0 80A18700 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 -/* 011F4 80A18704 0C285E37 */ jal func_80A178DC -/* 011F8 80A18708 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011FC 80A1870C 10000023 */ beq $zero, $zero, .L80A1879C -/* 01200 80A18710 8FBF001C */ lw $ra, 0x001C($sp) -/* 01204 80A18714 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 -.L80A18718: -/* 01208 80A18718 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 0120C 80A1871C 31F80008 */ andi $t8, $t7, 0x0008 ## $t8 = 00000000 -/* 01210 80A18720 53000008 */ beql $t8, $zero, .L80A18744 -/* 01214 80A18724 C6080090 */ lwc1 $f8, 0x0090($s0) ## 00000090 -/* 01218 80A18728 8619007E */ lh $t9, 0x007E($s0) ## 0000007E -/* 0121C 80A1872C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01220 80A18730 0C285E42 */ jal func_80A17908 -/* 01224 80A18734 A6190196 */ sh $t9, 0x0196($s0) ## 00000196 -/* 01228 80A18738 10000018 */ beq $zero, $zero, .L80A1879C -/* 0122C 80A1873C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01230 80A18740 C6080090 */ lwc1 $f8, 0x0090($s0) ## 00000090 -.L80A18744: -/* 01234 80A18744 44815000 */ mtc1 $at, $f10 ## $f10 = 0.00 -/* 01238 80A18748 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0123C 80A1874C 460A403C */ c.lt.s $f8, $f10 -/* 01240 80A18750 00000000 */ nop -/* 01244 80A18754 4502000C */ bc1fl .L80A18788 -/* 01248 80A18758 86090194 */ lh $t1, 0x0194($s0) ## 00000194 -/* 0124C 80A1875C 0C00B821 */ jal func_8002E084 -/* 01250 80A18760 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 01254 80A18764 54400008 */ bnel $v0, $zero, .L80A18788 -/* 01258 80A18768 86090194 */ lh $t1, 0x0194($s0) ## 00000194 -/* 0125C 80A1876C 8608008A */ lh $t0, 0x008A($s0) ## 0000008A -/* 01260 80A18770 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01264 80A18774 0C285E42 */ jal func_80A17908 -/* 01268 80A18778 A6080196 */ sh $t0, 0x0196($s0) ## 00000196 -/* 0126C 80A1877C 10000007 */ beq $zero, $zero, .L80A1879C -/* 01270 80A18780 8FBF001C */ lw $ra, 0x001C($sp) -/* 01274 80A18784 86090194 */ lh $t1, 0x0194($s0) ## 00000194 -.L80A18788: -/* 01278 80A18788 55200004 */ bnel $t1, $zero, .L80A1879C -/* 0127C 80A1878C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01280 80A18790 0C285E25 */ jal func_80A17894 -/* 01284 80A18794 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01288 80A18798 8FBF001C */ lw $ra, 0x001C($sp) -.L80A1879C: -/* 0128C 80A1879C 8FB00018 */ lw $s0, 0x0018($sp) -/* 01290 80A187A0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01294 80A187A4 03E00008 */ jr $ra -/* 01298 80A187A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A187AC.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A187AC.s deleted file mode 100644 index 6535b7f514..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A187AC.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80A187AC -/* 0129C 80A187AC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 012A0 80A187B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 012A4 80A187B4 AFA40018 */ sw $a0, 0x0018($sp) -/* 012A8 80A187B8 AFA5001C */ sw $a1, 0x001C($sp) -/* 012AC 80A187BC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 012B0 80A187C0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 012B4 80A187C4 50400004 */ beql $v0, $zero, .L80A187D8 -/* 012B8 80A187C8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 012BC 80A187CC 0C285DE0 */ jal func_80A17780 -/* 012C0 80A187D0 8FA40018 */ lw $a0, 0x0018($sp) -/* 012C4 80A187D4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A187D8: -/* 012C8 80A187D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 012CC 80A187DC 03E00008 */ jr $ra -/* 012D0 80A187E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A187E4.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A187E4.s deleted file mode 100644 index eec52f046d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A187E4.s +++ /dev/null @@ -1,75 +0,0 @@ -glabel func_80A187E4 -/* 012D4 80A187E4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 012D8 80A187E8 AFB00018 */ sw $s0, 0x0018($sp) -/* 012DC 80A187EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 012E0 80A187F0 AFBF001C */ sw $ra, 0x001C($sp) -/* 012E4 80A187F4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 012E8 80A187F8 AFA5002C */ sw $a1, 0x002C($sp) -/* 012EC 80A187FC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 012F0 80A18800 AFA40024 */ sw $a0, 0x0024($sp) -/* 012F4 80A18804 8FA40024 */ lw $a0, 0x0024($sp) -/* 012F8 80A18808 0C0295B2 */ jal func_800A56C8 -/* 012FC 80A1880C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01300 80A18810 1440000C */ bne $v0, $zero, .L80A18844 -/* 01304 80A18814 8FA40024 */ lw $a0, 0x0024($sp) -/* 01308 80A18818 0C0295B2 */ jal func_800A56C8 -/* 0130C 80A1881C 3C054140 */ lui $a1, 0x4140 ## $a1 = 41400000 -/* 01310 80A18820 14400008 */ bne $v0, $zero, .L80A18844 -/* 01314 80A18824 8FA40024 */ lw $a0, 0x0024($sp) -/* 01318 80A18828 0C0295B2 */ jal func_800A56C8 -/* 0131C 80A1882C 3C0541C0 */ lui $a1, 0x41C0 ## $a1 = 41C00000 -/* 01320 80A18830 14400004 */ bne $v0, $zero, .L80A18844 -/* 01324 80A18834 8FA40024 */ lw $a0, 0x0024($sp) -/* 01328 80A18838 0C0295B2 */ jal func_800A56C8 -/* 0132C 80A1883C 3C054210 */ lui $a1, 0x4210 ## $a1 = 42100000 -/* 01330 80A18840 10400003 */ beq $v0, $zero, .L80A18850 -.L80A18844: -/* 01334 80A18844 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01338 80A18848 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0133C 80A1884C 24053894 */ addiu $a1, $zero, 0x3894 ## $a1 = 00003894 -.L80A18850: -/* 01340 80A18850 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 01344 80A18854 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 01348 80A18858 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 0134C 80A1885C 0C01E1EF */ jal Math_SmoothScaleMaxS - -/* 01350 80A18860 2407071C */ addiu $a3, $zero, 0x071C ## $a3 = 0000071C -/* 01354 80A18864 3C01438C */ lui $at, 0x438C ## $at = 438C0000 -/* 01358 80A18868 44813000 */ mtc1 $at, $f6 ## $f6 = 280.00 -/* 0135C 80A1886C C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 01360 80A18870 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01364 80A18874 4606203C */ c.lt.s $f4, $f6 -/* 01368 80A18878 00000000 */ nop -/* 0136C 80A1887C 4502000F */ bc1fl .L80A188BC -/* 01370 80A18880 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 01374 80A18884 0C00B821 */ jal func_8002E084 -/* 01378 80A18888 24052000 */ addiu $a1, $zero, 0x2000 ## $a1 = 00002000 -/* 0137C 80A1888C 5040000B */ beql $v0, $zero, .L80A188BC -/* 01380 80A18890 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 01384 80A18894 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 -/* 01388 80A18898 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0138C 80A1889C 31CF0008 */ andi $t7, $t6, 0x0008 ## $t7 = 00000000 -/* 01390 80A188A0 55E00006 */ bnel $t7, $zero, .L80A188BC -/* 01394 80A188A4 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 01398 80A188A8 0C285E8E */ jal func_80A17A38 -/* 0139C 80A188AC 8FA5002C */ lw $a1, 0x002C($sp) -/* 013A0 80A188B0 1000000B */ beq $zero, $zero, .L80A188E0 -/* 013A4 80A188B4 8FBF001C */ lw $ra, 0x001C($sp) -/* 013A8 80A188B8 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -.L80A188BC: -/* 013AC 80A188BC 44814000 */ mtc1 $at, $f8 ## $f8 = 400.00 -/* 013B0 80A188C0 C60A0090 */ lwc1 $f10, 0x0090($s0) ## 00000090 -/* 013B4 80A188C4 460A403C */ c.lt.s $f8, $f10 -/* 013B8 80A188C8 00000000 */ nop -/* 013BC 80A188CC 45020004 */ bc1fl .L80A188E0 -/* 013C0 80A188D0 8FBF001C */ lw $ra, 0x001C($sp) -/* 013C4 80A188D4 0C285E02 */ jal func_80A17808 -/* 013C8 80A188D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013CC 80A188DC 8FBF001C */ lw $ra, 0x001C($sp) -.L80A188E0: -/* 013D0 80A188E0 8FB00018 */ lw $s0, 0x0018($sp) -/* 013D4 80A188E4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 013D8 80A188E8 03E00008 */ jr $ra -/* 013DC 80A188EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A188F0.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A188F0.s deleted file mode 100644 index 22c5517b20..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A188F0.s +++ /dev/null @@ -1,137 +0,0 @@ -.late_rodata -glabel D_80A1A588 - .word 0x3B83126F -glabel D_80A1A58C - .word 0x4528C000 -glabel D_80A1A590 - .word 0x4528C000 - -.text -glabel func_80A188F0 -/* 013E0 80A188F0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 013E4 80A188F4 AFB00018 */ sw $s0, 0x0018($sp) -/* 013E8 80A188F8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 013EC 80A188FC AFBF001C */ sw $ra, 0x001C($sp) -/* 013F0 80A18900 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 013F4 80A18904 AFA5003C */ sw $a1, 0x003C($sp) -/* 013F8 80A18908 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 013FC 80A1890C AFA40024 */ sw $a0, 0x0024($sp) -/* 01400 80A18910 50400004 */ beql $v0, $zero, .L80A18924 -/* 01404 80A18914 C6000168 */ lwc1 $f0, 0x0168($s0) ## 00000168 -/* 01408 80A18918 0C285DF2 */ jal func_80A177C8 -/* 0140C 80A1891C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01410 80A18920 C6000168 */ lwc1 $f0, 0x0168($s0) ## 00000168 -.L80A18924: -/* 01414 80A18924 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01418 80A18928 8FA40024 */ lw $a0, 0x0024($sp) -/* 0141C 80A1892C 4600203C */ c.lt.s $f4, $f0 -/* 01420 80A18930 00000000 */ nop -/* 01424 80A18934 45020007 */ bc1fl .L80A18954 -/* 01428 80A18938 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 0142C 80A1893C 0C0295B2 */ jal func_800A56C8 -/* 01430 80A18940 3C0541A8 */ lui $a1, 0x41A8 ## $a1 = 41A80000 -/* 01434 80A18944 1440000B */ bne $v0, $zero, .L80A18974 -/* 01438 80A18948 00000000 */ nop -/* 0143C 80A1894C C6000168 */ lwc1 $f0, 0x0168($s0) ## 00000168 -/* 01440 80A18950 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -.L80A18954: -/* 01444 80A18954 8FA40024 */ lw $a0, 0x0024($sp) -/* 01448 80A18958 4606003C */ c.lt.s $f0, $f6 -/* 0144C 80A1895C 00000000 */ nop -/* 01450 80A18960 45020014 */ bc1fl .L80A189B4 -/* 01454 80A18964 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 01458 80A18968 0C0295B2 */ jal func_800A56C8 -/* 0145C 80A1896C 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 -/* 01460 80A18970 1040000F */ beq $v0, $zero, .L80A189B0 -.L80A18974: -/* 01464 80A18974 3C0180A2 */ lui $at, %hi(D_80A1A588) ## $at = 80A20000 -/* 01468 80A18978 C428A588 */ lwc1 $f8, %lo(D_80A1A588)($at) -/* 0146C 80A1897C C60A0050 */ lwc1 $f10, 0x0050($s0) ## 00000050 -/* 01470 80A18980 24053894 */ addiu $a1, $zero, 0x3894 ## $a1 = 00003894 -/* 01474 80A18984 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01478 80A18988 460A403C */ c.lt.s $f8, $f10 -/* 0147C 80A1898C 00000000 */ nop -/* 01480 80A18990 45000005 */ bc1f .L80A189A8 -/* 01484 80A18994 00000000 */ nop -/* 01488 80A18998 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0148C 80A1899C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01490 80A189A0 10000004 */ beq $zero, $zero, .L80A189B4 -/* 01494 80A189A4 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -.L80A189A8: -/* 01498 80A189A8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0149C 80A189AC 24053931 */ addiu $a1, $zero, 0x3931 ## $a1 = 00003931 -.L80A189B0: -/* 014A0 80A189B0 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -.L80A189B4: -/* 014A4 80A189B4 C6000164 */ lwc1 $f0, 0x0164($s0) ## 00000164 -/* 014A8 80A189B8 44818000 */ mtc1 $at, $f16 ## $f16 = 7.00 -/* 014AC 80A189BC 3C0141B0 */ lui $at, 0x41B0 ## $at = 41B00000 -/* 014B0 80A189C0 4600803E */ c.le.s $f16, $f0 -/* 014B4 80A189C4 00000000 */ nop -/* 014B8 80A189C8 45020036 */ bc1fl .L80A18AA4 -/* 014BC 80A189CC 8FBF001C */ lw $ra, 0x001C($sp) -/* 014C0 80A189D0 44819000 */ mtc1 $at, $f18 ## $f18 = 22.00 -/* 014C4 80A189D4 00000000 */ nop -/* 014C8 80A189D8 4612003C */ c.lt.s $f0, $f18 -/* 014CC 80A189DC 00000000 */ nop -/* 014D0 80A189E0 45020030 */ bc1fl .L80A18AA4 -/* 014D4 80A189E4 8FBF001C */ lw $ra, 0x001C($sp) -/* 014D8 80A189E8 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 014DC 80A189EC 24844268 */ addiu $a0, $a0, 0x4268 ## $a0 = 00004268 -/* 014E0 80A189F0 00042400 */ sll $a0, $a0, 16 -/* 014E4 80A189F4 0C01DE1C */ jal Math_Sins - ## sins? -/* 014E8 80A189F8 00042403 */ sra $a0, $a0, 16 -/* 014EC 80A189FC E7A00030 */ swc1 $f0, 0x0030($sp) -/* 014F0 80A18A00 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 014F4 80A18A04 24844268 */ addiu $a0, $a0, 0x4268 ## $a0 = 00004268 -/* 014F8 80A18A08 00042400 */ sll $a0, $a0, 16 -/* 014FC 80A18A0C 0C01DE0D */ jal Math_Coss - ## coss? -/* 01500 80A18A10 00042403 */ sra $a0, $a0, 16 -/* 01504 80A18A14 E7A0002C */ swc1 $f0, 0x002C($sp) -/* 01508 80A18A18 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 0150C 80A18A1C 860F0196 */ lh $t7, 0x0196($s0) ## 00000196 -/* 01510 80A18A20 01CFC021 */ addu $t8, $t6, $t7 -/* 01514 80A18A24 A61800B6 */ sh $t8, 0x00B6($s0) ## 000000B6 -/* 01518 80A18A28 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 0151C 80A18A2C 24844268 */ addiu $a0, $a0, 0x4268 ## $a0 = 00004268 -/* 01520 80A18A30 00042400 */ sll $a0, $a0, 16 -/* 01524 80A18A34 0C01DE1C */ jal Math_Sins - ## sins? -/* 01528 80A18A38 00042403 */ sra $a0, $a0, 16 -/* 0152C 80A18A3C 3C0180A2 */ lui $at, %hi(D_80A1A58C) ## $at = 80A20000 -/* 01530 80A18A40 C426A58C */ lwc1 $f6, %lo(D_80A1A58C)($at) -/* 01534 80A18A44 C6040050 */ lwc1 $f4, 0x0050($s0) ## 00000050 -/* 01538 80A18A48 C7AA0030 */ lwc1 $f10, 0x0030($sp) -/* 0153C 80A18A4C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 01540 80A18A50 46062202 */ mul.s $f8, $f4, $f6 -/* 01544 80A18A54 460A0401 */ sub.s $f16, $f0, $f10 -/* 01548 80A18A58 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 0154C 80A18A5C 24844268 */ addiu $a0, $a0, 0x4268 ## $a0 = 00004268 -/* 01550 80A18A60 00042400 */ sll $a0, $a0, 16 -/* 01554 80A18A64 00042403 */ sra $a0, $a0, 16 -/* 01558 80A18A68 46104482 */ mul.s $f18, $f8, $f16 -/* 0155C 80A18A6C 46122181 */ sub.s $f6, $f4, $f18 -/* 01560 80A18A70 0C01DE0D */ jal Math_Coss - ## coss? -/* 01564 80A18A74 E6060024 */ swc1 $f6, 0x0024($s0) ## 00000024 -/* 01568 80A18A78 3C0180A2 */ lui $at, %hi(D_80A1A590) ## $at = 80A20000 -/* 0156C 80A18A7C C428A590 */ lwc1 $f8, %lo(D_80A1A590)($at) -/* 01570 80A18A80 C60A0050 */ lwc1 $f10, 0x0050($s0) ## 00000050 -/* 01574 80A18A84 C7A4002C */ lwc1 $f4, 0x002C($sp) -/* 01578 80A18A88 46085402 */ mul.s $f16, $f10, $f8 -/* 0157C 80A18A8C 46040481 */ sub.s $f18, $f0, $f4 -/* 01580 80A18A90 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 01584 80A18A94 46128182 */ mul.s $f6, $f16, $f18 -/* 01588 80A18A98 46065201 */ sub.s $f8, $f10, $f6 -/* 0158C 80A18A9C E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C -/* 01590 80A18AA0 8FBF001C */ lw $ra, 0x001C($sp) -.L80A18AA4: -/* 01594 80A18AA4 8FB00018 */ lw $s0, 0x0018($sp) -/* 01598 80A18AA8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0159C 80A18AAC 03E00008 */ jr $ra -/* 015A0 80A18AB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18AB4.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18AB4.s deleted file mode 100644 index 9f97c5fc5b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18AB4.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80A18AB4 -/* 015A4 80A18AB4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 015A8 80A18AB8 AFB00018 */ sw $s0, 0x0018($sp) -/* 015AC 80A18ABC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 015B0 80A18AC0 AFBF001C */ sw $ra, 0x001C($sp) -/* 015B4 80A18AC4 AFA50024 */ sw $a1, 0x0024($sp) -/* 015B8 80A18AC8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 015BC 80A18ACC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 015C0 80A18AD0 50400004 */ beql $v0, $zero, .L80A18AE4 -/* 015C4 80A18AD4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 015C8 80A18AD8 0C285EC4 */ jal func_80A17B10 -/* 015CC 80A18ADC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015D0 80A18AE0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -.L80A18AE4: -/* 015D4 80A18AE4 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 015D8 80A18AE8 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 015DC 80A18AEC 860E00B4 */ lh $t6, 0x00B4($s0) ## 000000B4 -/* 015E0 80A18AF0 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 015E4 80A18AF4 46062200 */ add.s $f8, $f4, $f6 -/* 015E8 80A18AF8 25CF0140 */ addiu $t7, $t6, 0x0140 ## $t7 = 00000140 -/* 015EC 80A18AFC A60F00B4 */ sh $t7, 0x00B4($s0) ## 000000B4 -/* 015F0 80A18B00 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 015F4 80A18B04 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -/* 015F8 80A18B08 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 015FC 80A18B0C 0C01E1EF */ jal Math_SmoothScaleMaxS - -/* 01600 80A18B10 24070AAA */ addiu $a3, $zero, 0x0AAA ## $a3 = 00000AAA -/* 01604 80A18B14 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 -/* 01608 80A18B18 240504B0 */ addiu $a1, $zero, 0x04B0 ## $a1 = 000004B0 -/* 0160C 80A18B1C 0C01DE5F */ jal Math_ApproxS - -/* 01610 80A18B20 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 -/* 01614 80A18B24 8FBF001C */ lw $ra, 0x001C($sp) -/* 01618 80A18B28 8FB00018 */ lw $s0, 0x0018($sp) -/* 0161C 80A18B2C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01620 80A18B30 03E00008 */ jr $ra -/* 01624 80A18B34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18B38.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18B38.s deleted file mode 100644 index ca45e13f7d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18B38.s +++ /dev/null @@ -1,85 +0,0 @@ -glabel func_80A18B38 -/* 01628 80A18B38 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0162C 80A18B3C AFBF0024 */ sw $ra, 0x0024($sp) -/* 01630 80A18B40 AFB00020 */ sw $s0, 0x0020($sp) -/* 01634 80A18B44 AFA50044 */ sw $a1, 0x0044($sp) -/* 01638 80A18B48 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 0163C 80A18B4C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 01640 80A18B50 44815000 */ mtc1 $at, $f10 ## $f10 = 2.00 -/* 01644 80A18B54 E7A40034 */ swc1 $f4, 0x0034($sp) -/* 01648 80A18B58 C486002C */ lwc1 $f6, 0x002C($a0) ## 0000002C -/* 0164C 80A18B5C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01650 80A18B60 E7A6003C */ swc1 $f6, 0x003C($sp) -/* 01654 80A18B64 C4880080 */ lwc1 $f8, 0x0080($a0) ## 00000080 -/* 01658 80A18B68 E7AA002C */ swc1 $f10, 0x002C($sp) -/* 0165C 80A18B6C E7A80038 */ swc1 $f8, 0x0038($sp) -/* 01660 80A18B70 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 -/* 01664 80A18B74 24846000 */ addiu $a0, $a0, 0x6000 ## $a0 = 00006000 -/* 01668 80A18B78 00042400 */ sll $a0, $a0, 16 -/* 0166C 80A18B7C 0C01DE1C */ jal Math_Sins - ## sins? -/* 01670 80A18B80 00042403 */ sra $a0, $a0, 16 -/* 01674 80A18B84 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 01678 80A18B88 44818000 */ mtc1 $at, $f16 ## $f16 = 7.00 -/* 0167C 80A18B8C 00000000 */ nop -/* 01680 80A18B90 46100482 */ mul.s $f18, $f0, $f16 -/* 01684 80A18B94 E7B20028 */ swc1 $f18, 0x0028($sp) -/* 01688 80A18B98 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 0168C 80A18B9C 24846000 */ addiu $a0, $a0, 0x6000 ## $a0 = 00006000 -/* 01690 80A18BA0 00042400 */ sll $a0, $a0, 16 -/* 01694 80A18BA4 0C01DE0D */ jal Math_Coss - ## coss? -/* 01698 80A18BA8 00042403 */ sra $a0, $a0, 16 -/* 0169C 80A18BAC 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 016A0 80A18BB0 44812000 */ mtc1 $at, $f4 ## $f4 = 7.00 -/* 016A4 80A18BB4 3C0780A2 */ lui $a3, %hi(D_80A1A4E8) ## $a3 = 80A20000 -/* 016A8 80A18BB8 240E01C2 */ addiu $t6, $zero, 0x01C2 ## $t6 = 000001C2 -/* 016AC 80A18BBC 46040182 */ mul.s $f6, $f0, $f4 -/* 016B0 80A18BC0 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 -/* 016B4 80A18BC4 AFAF0014 */ sw $t7, 0x0014($sp) -/* 016B8 80A18BC8 AFAE0010 */ sw $t6, 0x0010($sp) -/* 016BC 80A18BCC 24E7A4E8 */ addiu $a3, $a3, %lo(D_80A1A4E8) ## $a3 = 80A1A4E8 -/* 016C0 80A18BD0 8FA40044 */ lw $a0, 0x0044($sp) -/* 016C4 80A18BD4 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFF4 -/* 016C8 80A18BD8 E7A60030 */ swc1 $f6, 0x0030($sp) -/* 016CC 80A18BDC 0C00A1B3 */ jal func_800286CC -/* 016D0 80A18BE0 27A60028 */ addiu $a2, $sp, 0x0028 ## $a2 = FFFFFFE8 -/* 016D4 80A18BE4 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 016D8 80A18BE8 2484A000 */ addiu $a0, $a0, 0xA000 ## $a0 = FFFFA000 -/* 016DC 80A18BEC 00042400 */ sll $a0, $a0, 16 -/* 016E0 80A18BF0 0C01DE1C */ jal Math_Sins - ## sins? -/* 016E4 80A18BF4 00042403 */ sra $a0, $a0, 16 -/* 016E8 80A18BF8 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 016EC 80A18BFC 44814000 */ mtc1 $at, $f8 ## $f8 = 7.00 -/* 016F0 80A18C00 00000000 */ nop -/* 016F4 80A18C04 46080282 */ mul.s $f10, $f0, $f8 -/* 016F8 80A18C08 E7AA0028 */ swc1 $f10, 0x0028($sp) -/* 016FC 80A18C0C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 01700 80A18C10 2484A000 */ addiu $a0, $a0, 0xA000 ## $a0 = FFFFA000 -/* 01704 80A18C14 00042400 */ sll $a0, $a0, 16 -/* 01708 80A18C18 0C01DE0D */ jal Math_Coss - ## coss? -/* 0170C 80A18C1C 00042403 */ sra $a0, $a0, 16 -/* 01710 80A18C20 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 01714 80A18C24 44818000 */ mtc1 $at, $f16 ## $f16 = 7.00 -/* 01718 80A18C28 3C0780A2 */ lui $a3, %hi(D_80A1A4E8) ## $a3 = 80A20000 -/* 0171C 80A18C2C 241801C2 */ addiu $t8, $zero, 0x01C2 ## $t8 = 000001C2 -/* 01720 80A18C30 46100482 */ mul.s $f18, $f0, $f16 -/* 01724 80A18C34 24190064 */ addiu $t9, $zero, 0x0064 ## $t9 = 00000064 -/* 01728 80A18C38 AFB90014 */ sw $t9, 0x0014($sp) -/* 0172C 80A18C3C AFB80010 */ sw $t8, 0x0010($sp) -/* 01730 80A18C40 24E7A4E8 */ addiu $a3, $a3, %lo(D_80A1A4E8) ## $a3 = 80A1A4E8 -/* 01734 80A18C44 8FA40044 */ lw $a0, 0x0044($sp) -/* 01738 80A18C48 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFF4 -/* 0173C 80A18C4C E7B20030 */ swc1 $f18, 0x0030($sp) -/* 01740 80A18C50 0C00A1B3 */ jal func_800286CC -/* 01744 80A18C54 27A60028 */ addiu $a2, $sp, 0x0028 ## $a2 = FFFFFFE8 -/* 01748 80A18C58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0174C 80A18C5C 0C00BE5D */ jal func_8002F974 -/* 01750 80A18C60 24053034 */ addiu $a1, $zero, 0x3034 ## $a1 = 00003034 -/* 01754 80A18C64 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01758 80A18C68 8FB00020 */ lw $s0, 0x0020($sp) -/* 0175C 80A18C6C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 01760 80A18C70 03E00008 */ jr $ra -/* 01764 80A18C74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18C78.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18C78.s deleted file mode 100644 index 11d3876156..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18C78.s +++ /dev/null @@ -1,73 +0,0 @@ -.late_rodata -glabel D_80A1A594 - .word 0x3EAAAAAB - -.text -glabel func_80A18C78 -/* 01768 80A18C78 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0176C 80A18C7C AFBF001C */ sw $ra, 0x001C($sp) -/* 01770 80A18C80 AFB00018 */ sw $s0, 0x0018($sp) -/* 01774 80A18C84 AFA50024 */ sw $a1, 0x0024($sp) -/* 01778 80A18C88 84820194 */ lh $v0, 0x0194($a0) ## 00000194 -/* 0177C 80A18C8C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01780 80A18C90 10400002 */ beq $v0, $zero, .L80A18C9C -/* 01784 80A18C94 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01788 80A18C98 A48E0194 */ sh $t6, 0x0194($a0) ## 00000194 -.L80A18C9C: -/* 0178C 80A18C9C C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 01790 80A18CA0 3C0180A2 */ lui $at, %hi(D_80A1A594) ## $at = 80A20000 -/* 01794 80A18CA4 C426A594 */ lwc1 $f6, %lo(D_80A1A594)($at) -/* 01798 80A18CA8 46000102 */ mul.s $f4, $f0, $f0 -/* 0179C 80A18CAC 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 017A0 80A18CB0 3C054170 */ lui $a1, 0x4170 ## $a1 = 41700000 -/* 017A4 80A18CB4 46062202 */ mul.s $f8, $f4, $f6 -/* 017A8 80A18CB8 44064000 */ mfc1 $a2, $f8 -/* 017AC 80A18CBC 0C01DE80 */ jal Math_ApproxF - -/* 017B0 80A18CC0 00000000 */ nop -/* 017B4 80A18CC4 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 017B8 80A18CC8 2405E980 */ addiu $a1, $zero, 0xE980 ## $a1 = FFFFE980 -/* 017BC 80A18CCC 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 017C0 80A18CD0 24060140 */ addiu $a2, $zero, 0x0140 ## $a2 = 00000140 -/* 017C4 80A18CD4 C6020080 */ lwc1 $f2, 0x0080($s0) ## 00000080 -/* 017C8 80A18CD8 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 017CC 80A18CDC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 017D0 80A18CE0 44817000 */ mtc1 $at, $f14 ## $f14 = 10.00 -/* 017D4 80A18CE4 46025001 */ sub.s $f0, $f10, $f2 -/* 017D8 80A18CE8 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 017DC 80A18CEC 44819000 */ mtc1 $at, $f18 ## $f18 = 12.00 -/* 017E0 80A18CF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017E4 80A18CF4 460E003C */ c.lt.s $f0, $f14 -/* 017E8 80A18CF8 00000000 */ nop -/* 017EC 80A18CFC 45020007 */ bc1fl .L80A18D1C -/* 017F0 80A18D00 4612003C */ c.lt.s $f0, $f18 -/* 017F4 80A18D04 460E1400 */ add.s $f16, $f2, $f14 -/* 017F8 80A18D08 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 017FC 80A18D0C E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 -/* 01800 80A18D10 E60C006C */ swc1 $f12, 0x006C($s0) ## 0000006C -/* 01804 80A18D14 E60C0060 */ swc1 $f12, 0x0060($s0) ## 00000060 -/* 01808 80A18D18 4612003C */ c.lt.s $f0, $f18 -.L80A18D1C: -/* 0180C 80A18D1C 00000000 */ nop -/* 01810 80A18D20 45020004 */ bc1fl .L80A18D34 -/* 01814 80A18D24 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 -/* 01818 80A18D28 0C2862CE */ jal func_80A18B38 -/* 0181C 80A18D2C 8FA50024 */ lw $a1, 0x0024($sp) -/* 01820 80A18D30 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 -.L80A18D34: -/* 01824 80A18D34 31F80008 */ andi $t8, $t7, 0x0008 ## $t8 = 00000000 -/* 01828 80A18D38 17000004 */ bne $t8, $zero, .L80A18D4C -/* 0182C 80A18D3C 00000000 */ nop -/* 01830 80A18D40 86190194 */ lh $t9, 0x0194($s0) ## 00000194 -/* 01834 80A18D44 57200004 */ bnel $t9, $zero, .L80A18D58 -/* 01838 80A18D48 8FBF001C */ lw $ra, 0x001C($sp) -.L80A18D4C: -/* 0183C 80A18D4C 0C285ED0 */ jal func_80A17B40 -/* 01840 80A18D50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01844 80A18D54 8FBF001C */ lw $ra, 0x001C($sp) -.L80A18D58: -/* 01848 80A18D58 8FB00018 */ lw $s0, 0x0018($sp) -/* 0184C 80A18D5C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01850 80A18D60 03E00008 */ jr $ra -/* 01854 80A18D64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18D68.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18D68.s deleted file mode 100644 index 06873ede56..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18D68.s +++ /dev/null @@ -1,147 +0,0 @@ -.late_rodata -glabel D_80A1A598 - .word 0x3B83126F - -.text -glabel func_80A18D68 -/* 01858 80A18D68 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0185C 80A18D6C AFBF001C */ sw $ra, 0x001C($sp) -/* 01860 80A18D70 AFB00018 */ sw $s0, 0x0018($sp) -/* 01864 80A18D74 AFA5002C */ sw $a1, 0x002C($sp) -/* 01868 80A18D78 94820088 */ lhu $v0, 0x0088($a0) ## 00000088 -/* 0186C 80A18D7C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01870 80A18D80 304E0001 */ andi $t6, $v0, 0x0001 ## $t6 = 00000000 -/* 01874 80A18D84 304F0002 */ andi $t7, $v0, 0x0002 ## $t7 = 00000000 -/* 01878 80A18D88 11E0001D */ beq $t7, $zero, .L80A18E00 -/* 0187C 80A18D8C AFAE0024 */ sw $t6, 0x0024($sp) -/* 01880 80A18D90 8498001C */ lh $t8, 0x001C($a0) ## 0000001C -/* 01884 80A18D94 24010040 */ addiu $at, $zero, 0x0040 ## $at = 00000040 -/* 01888 80A18D98 53010004 */ beql $t8, $at, .L80A18DAC -/* 0188C 80A18D9C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 01890 80A18DA0 0C285DDA */ jal func_80A17768 -/* 01894 80A18DA4 00000000 */ nop -/* 01898 80A18DA8 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -.L80A18DAC: -/* 0189C 80A18DAC 44813000 */ mtc1 $at, $f6 ## $f6 = -4.00 -/* 018A0 80A18DB0 C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 -/* 018A4 80A18DB4 3C0180A2 */ lui $at, %hi(D_80A1A598) ## $at = 80A20000 -/* 018A8 80A18DB8 4606203C */ c.lt.s $f4, $f6 -/* 018AC 80A18DBC 00000000 */ nop -/* 018B0 80A18DC0 45020010 */ bc1fl .L80A18E04 -/* 018B4 80A18DC4 96190088 */ lhu $t9, 0x0088($s0) ## 00000088 -/* 018B8 80A18DC8 C428A598 */ lwc1 $f8, %lo(D_80A1A598)($at) -/* 018BC 80A18DCC C60A0050 */ lwc1 $f10, 0x0050($s0) ## 00000050 -/* 018C0 80A18DD0 24053893 */ addiu $a1, $zero, 0x3893 ## $a1 = 00003893 -/* 018C4 80A18DD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018C8 80A18DD8 460A403C */ c.lt.s $f8, $f10 -/* 018CC 80A18DDC 00000000 */ nop -/* 018D0 80A18DE0 45000005 */ bc1f .L80A18DF8 -/* 018D4 80A18DE4 00000000 */ nop -/* 018D8 80A18DE8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 018DC 80A18DEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018E0 80A18DF0 10000004 */ beq $zero, $zero, .L80A18E04 -/* 018E4 80A18DF4 96190088 */ lhu $t9, 0x0088($s0) ## 00000088 -.L80A18DF8: -/* 018E8 80A18DF8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 018EC 80A18DFC 24053937 */ addiu $a1, $zero, 0x3937 ## $a1 = 00003937 -.L80A18E00: -/* 018F0 80A18E00 96190088 */ lhu $t9, 0x0088($s0) ## 00000088 -.L80A18E04: -/* 018F4 80A18E04 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 018F8 80A18E08 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 018FC 80A18E0C 33280008 */ andi $t0, $t9, 0x0008 ## $t0 = 00000000 -/* 01900 80A18E10 51000005 */ beql $t0, $zero, .L80A18E28 -/* 01904 80A18E14 8FA90024 */ lw $t1, 0x0024($sp) -/* 01908 80A18E18 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 0190C 80A18E1C 00000000 */ nop -/* 01910 80A18E20 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 01914 80A18E24 8FA90024 */ lw $t1, 0x0024($sp) -.L80A18E28: -/* 01918 80A18E28 51200004 */ beql $t1, $zero, .L80A18E3C -/* 0191C 80A18E2C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 01920 80A18E30 0C01DE80 */ jal Math_ApproxF - -/* 01924 80A18E34 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 01928 80A18E38 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -.L80A18E3C: -/* 0192C 80A18E3C C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 01930 80A18E40 4604903C */ c.lt.s $f18, $f4 -/* 01934 80A18E44 00000000 */ nop -/* 01938 80A18E48 4500000D */ bc1f .L80A18E80 -/* 0193C 80A18E4C 00000000 */ nop -/* 01940 80A18E50 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 01944 80A18E54 C6080080 */ lwc1 $f8, 0x0080($s0) ## 00000080 -/* 01948 80A18E58 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 0194C 80A18E5C 44818000 */ mtc1 $at, $f16 ## $f16 = 12.00 -/* 01950 80A18E60 46083281 */ sub.s $f10, $f6, $f8 -/* 01954 80A18E64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01958 80A18E68 4610503C */ c.lt.s $f10, $f16 -/* 0195C 80A18E6C 00000000 */ nop -/* 01960 80A18E70 45000003 */ bc1f .L80A18E80 -/* 01964 80A18E74 00000000 */ nop -/* 01968 80A18E78 0C2862CE */ jal func_80A18B38 -/* 0196C 80A18E7C 8FA5002C */ lw $a1, 0x002C($sp) -.L80A18E80: -/* 01970 80A18E80 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01974 80A18E84 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01978 80A18E88 50400025 */ beql $v0, $zero, .L80A18F20 -/* 0197C 80A18E8C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 01980 80A18E90 86020194 */ lh $v0, 0x0194($s0) ## 00000194 -/* 01984 80A18E94 10400003 */ beq $v0, $zero, .L80A18EA4 -/* 01988 80A18E98 244AFFFF */ addiu $t2, $v0, 0xFFFF ## $t2 = FFFFFFFF -/* 0198C 80A18E9C A60A0194 */ sh $t2, 0x0194($s0) ## 00000194 -/* 01990 80A18EA0 86020194 */ lh $v0, 0x0194($s0) ## 00000194 -.L80A18EA4: -/* 01994 80A18EA4 1440001D */ bne $v0, $zero, .L80A18F1C -/* 01998 80A18EA8 8FAB0024 */ lw $t3, 0x0024($sp) -/* 0199C 80A18EAC 1160001B */ beq $t3, $zero, .L80A18F1C -/* 019A0 80A18EB0 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 019A4 80A18EB4 C612015C */ lwc1 $f18, 0x015C($s0) ## 0000015C -/* 019A8 80A18EB8 44812000 */ mtc1 $at, $f4 ## $f4 = 45.00 -/* 019AC 80A18EBC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 019B0 80A18EC0 4604903C */ c.lt.s $f18, $f4 -/* 019B4 80A18EC4 00000000 */ nop -/* 019B8 80A18EC8 45020009 */ bc1fl .L80A18EF0 -/* 019BC 80A18ECC 860C001C */ lh $t4, 0x001C($s0) ## 0000001C -/* 019C0 80A18ED0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 019C4 80A18ED4 248419CC */ addiu $a0, $a0, 0x19CC ## $a0 = 060019CC -/* 019C8 80A18ED8 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 019CC 80A18EDC 00000000 */ nop -/* 019D0 80A18EE0 46803220 */ cvt.s.w $f8, $f6 -/* 019D4 80A18EE4 1000000D */ beq $zero, $zero, .L80A18F1C -/* 019D8 80A18EE8 E608015C */ swc1 $f8, 0x015C($s0) ## 0000015C -/* 019DC 80A18EEC 860C001C */ lh $t4, 0x001C($s0) ## 0000001C -.L80A18EF0: -/* 019E0 80A18EF0 24010040 */ addiu $at, $zero, 0x0040 ## $at = 00000040 -/* 019E4 80A18EF4 15810005 */ bne $t4, $at, .L80A18F0C -/* 019E8 80A18EF8 00000000 */ nop -/* 019EC 80A18EFC 0C28605F */ jal func_80A1817C -/* 019F0 80A18F00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 019F4 80A18F04 10000006 */ beq $zero, $zero, .L80A18F20 -/* 019F8 80A18F08 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -.L80A18F0C: -/* 019FC 80A18F0C 0C285DF2 */ jal func_80A177C8 -/* 01A00 80A18F10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01A04 80A18F14 240D0032 */ addiu $t5, $zero, 0x0032 ## $t5 = 00000032 -/* 01A08 80A18F18 A60D019A */ sh $t5, 0x019A($s0) ## 0000019A -.L80A18F1C: -/* 01A0C 80A18F1C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -.L80A18F20: -/* 01A10 80A18F20 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01A14 80A18F24 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 01A18 80A18F28 24060140 */ addiu $a2, $zero, 0x0140 ## $a2 = 00000140 -/* 01A1C 80A18F2C 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 -/* 01A20 80A18F30 2405F9C0 */ addiu $a1, $zero, 0xF9C0 ## $a1 = FFFFF9C0 -/* 01A24 80A18F34 0C01DE5F */ jal Math_ApproxS - -/* 01A28 80A18F38 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 -/* 01A2C 80A18F3C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01A30 80A18F40 8FB00018 */ lw $s0, 0x0018($sp) -/* 01A34 80A18F44 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01A38 80A18F48 03E00008 */ jr $ra -/* 01A3C 80A18F4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18F50.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18F50.s deleted file mode 100644 index 8241424019..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18F50.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80A18F50 -/* 01A40 80A18F50 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01A44 80A18F54 AFBF001C */ sw $ra, 0x001C($sp) -/* 01A48 80A18F58 AFB00018 */ sw $s0, 0x0018($sp) -/* 01A4C 80A18F5C AFA50024 */ sw $a1, 0x0024($sp) -/* 01A50 80A18F60 94830088 */ lhu $v1, 0x0088($a0) ## 00000088 -/* 01A54 80A18F64 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01A58 80A18F68 306E0001 */ andi $t6, $v1, 0x0001 ## $t6 = 00000000 -/* 01A5C 80A18F6C 51C00011 */ beql $t6, $zero, .L80A18FB4 -/* 01A60 80A18F70 30680002 */ andi $t0, $v1, 0x0002 ## $t0 = 00000000 -/* 01A64 80A18F74 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01A68 80A18F78 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01A6C 80A18F7C 10400007 */ beq $v0, $zero, .L80A18F9C -/* 01A70 80A18F80 24190032 */ addiu $t9, $zero, 0x0032 ## $t9 = 00000032 -/* 01A74 80A18F84 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 -/* 01A78 80A18F88 A619019A */ sh $t9, 0x019A($s0) ## 0000019A -/* 01A7C 80A18F8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01A80 80A18F90 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 01A84 80A18F94 0C285DF2 */ jal func_80A177C8 -/* 01A88 80A18F98 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 -.L80A18F9C: -/* 01A8C 80A18F9C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 01A90 80A18FA0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01A94 80A18FA4 0C01DE80 */ jal Math_ApproxF - -/* 01A98 80A18FA8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01A9C 80A18FAC 96030088 */ lhu $v1, 0x0088($s0) ## 00000088 -/* 01AA0 80A18FB0 30680002 */ andi $t0, $v1, 0x0002 ## $t0 = 00000000 -.L80A18FB4: -/* 01AA4 80A18FB4 11000003 */ beq $t0, $zero, .L80A18FC4 -/* 01AA8 80A18FB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01AAC 80A18FBC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01AB0 80A18FC0 24053937 */ addiu $a1, $zero, 0x3937 ## $a1 = 00003937 -.L80A18FC4: -/* 01AB4 80A18FC4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01AB8 80A18FC8 8FB00018 */ lw $s0, 0x0018($sp) -/* 01ABC 80A18FCC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01AC0 80A18FD0 03E00008 */ jr $ra -/* 01AC4 80A18FD4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18FD8.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18FD8.s deleted file mode 100644 index a52c610adf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18FD8.s +++ /dev/null @@ -1,70 +0,0 @@ -glabel func_80A18FD8 -/* 01AC8 80A18FD8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01ACC 80A18FDC AFB00018 */ sw $s0, 0x0018($sp) -/* 01AD0 80A18FE0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01AD4 80A18FE4 AFBF001C */ sw $ra, 0x001C($sp) -/* 01AD8 80A18FE8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01ADC 80A18FEC AFA5002C */ sw $a1, 0x002C($sp) -/* 01AE0 80A18FF0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01AE4 80A18FF4 AFA40024 */ sw $a0, 0x0024($sp) -/* 01AE8 80A18FF8 8603019A */ lh $v1, 0x019A($s0) ## 0000019A -/* 01AEC 80A18FFC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01AF0 80A19000 10600002 */ beq $v1, $zero, .L80A1900C -/* 01AF4 80A19004 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 01AF8 80A19008 A60E019A */ sh $t6, 0x019A($s0) ## 0000019A -.L80A1900C: -/* 01AFC 80A1900C 0C0295B2 */ jal func_800A56C8 -/* 01B00 80A19010 8FA40024 */ lw $a0, 0x0024($sp) -/* 01B04 80A19014 14400004 */ bne $v0, $zero, .L80A19028 -/* 01B08 80A19018 8FA40024 */ lw $a0, 0x0024($sp) -/* 01B0C 80A1901C 0C0295B2 */ jal func_800A56C8 -/* 01B10 80A19020 3C054190 */ lui $a1, 0x4190 ## $a1 = 41900000 -/* 01B14 80A19024 10400003 */ beq $v0, $zero, .L80A19034 -.L80A19028: -/* 01B18 80A19028 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B1C 80A1902C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01B20 80A19030 24053931 */ addiu $a1, $zero, 0x3931 ## $a1 = 00003931 -.L80A19034: -/* 01B24 80A19034 860F019A */ lh $t7, 0x019A($s0) ## 0000019A -/* 01B28 80A19038 55E00006 */ bnel $t7, $zero, .L80A19054 -/* 01B2C 80A1903C 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 -/* 01B30 80A19040 0C285F67 */ jal func_80A17D9C -/* 01B34 80A19044 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B38 80A19048 1000001B */ beq $zero, $zero, .L80A190B8 -/* 01B3C 80A1904C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01B40 80A19050 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 -.L80A19054: -/* 01B44 80A19054 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 01B48 80A19058 33190008 */ andi $t9, $t8, 0x0008 ## $t9 = 00000000 -/* 01B4C 80A1905C 53200008 */ beql $t9, $zero, .L80A19080 -/* 01B50 80A19060 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 01B54 80A19064 8608007E */ lh $t0, 0x007E($s0) ## 0000007E -/* 01B58 80A19068 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B5C 80A1906C 0C285E42 */ jal func_80A17908 -/* 01B60 80A19070 A6080196 */ sh $t0, 0x0196($s0) ## 00000196 -/* 01B64 80A19074 10000010 */ beq $zero, $zero, .L80A190B8 -/* 01B68 80A19078 8FBF001C */ lw $ra, 0x001C($sp) -/* 01B6C 80A1907C C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -.L80A19080: -/* 01B70 80A19080 44813000 */ mtc1 $at, $f6 ## $f6 = 0.00 -/* 01B74 80A19084 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 01B78 80A19088 4606203C */ c.lt.s $f4, $f6 -/* 01B7C 80A1908C 00000000 */ nop -/* 01B80 80A19090 45020009 */ bc1fl .L80A190B8 -/* 01B84 80A19094 8FBF001C */ lw $ra, 0x001C($sp) -/* 01B88 80A19098 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 01B8C 80A1909C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 01B90 80A190A0 2406038E */ addiu $a2, $zero, 0x038E ## $a2 = 0000038E -/* 01B94 80A190A4 00A12821 */ addu $a1, $a1, $at -/* 01B98 80A190A8 00052C00 */ sll $a1, $a1, 16 -/* 01B9C 80A190AC 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 01BA0 80A190B0 00052C03 */ sra $a1, $a1, 16 -/* 01BA4 80A190B4 8FBF001C */ lw $ra, 0x001C($sp) -.L80A190B8: -/* 01BA8 80A190B8 8FB00018 */ lw $s0, 0x0018($sp) -/* 01BAC 80A190BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01BB0 80A190C0 03E00008 */ jr $ra -/* 01BB4 80A190C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A190C8.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A190C8.s deleted file mode 100644 index b11c1316b1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A190C8.s +++ /dev/null @@ -1,104 +0,0 @@ -glabel func_80A190C8 -/* 01BB8 80A190C8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01BBC 80A190CC AFB00018 */ sw $s0, 0x0018($sp) -/* 01BC0 80A190D0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01BC4 80A190D4 AFBF001C */ sw $ra, 0x001C($sp) -/* 01BC8 80A190D8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01BCC 80A190DC AFA50034 */ sw $a1, 0x0034($sp) -/* 01BD0 80A190E0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01BD4 80A190E4 AFA40020 */ sw $a0, 0x0020($sp) -/* 01BD8 80A190E8 8FA40020 */ lw $a0, 0x0020($sp) -/* 01BDC 80A190EC 0C0295B2 */ jal func_800A56C8 -/* 01BE0 80A190F0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01BE4 80A190F4 14400004 */ bne $v0, $zero, .L80A19108 -/* 01BE8 80A190F8 8FA40020 */ lw $a0, 0x0020($sp) -/* 01BEC 80A190FC 0C0295B2 */ jal func_800A56C8 -/* 01BF0 80A19100 3C054190 */ lui $a1, 0x4190 ## $a1 = 41900000 -/* 01BF4 80A19104 10400003 */ beq $v0, $zero, .L80A19114 -.L80A19108: -/* 01BF8 80A19108 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01BFC 80A1910C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01C00 80A19110 24053931 */ addiu $a1, $zero, 0x3931 ## $a1 = 00003931 -.L80A19114: -/* 01C04 80A19114 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 -/* 01C08 80A19118 30420008 */ andi $v0, $v0, 0x0008 ## $v0 = 00000000 -/* 01C0C 80A1911C 50400008 */ beql $v0, $zero, .L80A19140 -/* 01C10 80A19120 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -/* 01C14 80A19124 860E007E */ lh $t6, 0x007E($s0) ## 0000007E -/* 01C18 80A19128 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C1C 80A1912C 0C285E42 */ jal func_80A17908 -/* 01C20 80A19130 A60E0196 */ sh $t6, 0x0196($s0) ## 00000196 -/* 01C24 80A19134 1000003A */ beq $zero, $zero, .L80A19220 -/* 01C28 80A19138 8FBF001C */ lw $ra, 0x001C($sp) -/* 01C2C 80A1913C 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -.L80A19140: -/* 01C30 80A19140 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 -/* 01C34 80A19144 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 01C38 80A19148 15E10028 */ bne $t7, $at, .L80A191EC -/* 01C3C 80A1914C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 01C40 80A19150 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 -/* 01C44 80A19154 24030040 */ addiu $v1, $zero, 0x0040 ## $v1 = 00000040 -/* 01C48 80A19158 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C4C 80A1915C 8458001C */ lh $t8, 0x001C($v0) ## 0000001C -/* 01C50 80A19160 54780004 */ bnel $v1, $t8, .L80A19174 -/* 01C54 80A19164 8E02011C */ lw $v0, 0x011C($s0) ## 0000011C -/* 01C58 80A19168 1000000A */ beq $zero, $zero, .L80A19194 -/* 01C5C 80A1916C 00403825 */ or $a3, $v0, $zero ## $a3 = 00000000 -/* 01C60 80A19170 8E02011C */ lw $v0, 0x011C($s0) ## 0000011C -.L80A19174: -/* 01C64 80A19174 24080010 */ addiu $t0, $zero, 0x0010 ## $t0 = 00000010 -/* 01C68 80A19178 8459001C */ lh $t9, 0x001C($v0) ## 0000001C -/* 01C6C 80A1917C 14790003 */ bne $v1, $t9, .L80A1918C -/* 01C70 80A19180 00000000 */ nop -/* 01C74 80A19184 10000003 */ beq $zero, $zero, .L80A19194 -/* 01C78 80A19188 00403825 */ or $a3, $v0, $zero ## $a3 = 00000000 -.L80A1918C: -/* 01C7C 80A1918C 10000023 */ beq $zero, $zero, .L80A1921C -/* 01C80 80A19190 A608001C */ sh $t0, 0x001C($s0) ## 0000001C -.L80A19194: -/* 01C84 80A19194 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 01C88 80A19198 0C00B69E */ jal func_8002DA78 -/* 01C8C 80A1919C AFA7002C */ sw $a3, 0x002C($sp) -/* 01C90 80A191A0 00022C00 */ sll $a1, $v0, 16 -/* 01C94 80A191A4 00052C03 */ sra $a1, $a1, 16 -/* 01C98 80A191A8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 01C9C 80A191AC 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 01CA0 80A191B0 2406038E */ addiu $a2, $zero, 0x038E ## $a2 = 0000038E -/* 01CA4 80A191B4 8FA5002C */ lw $a1, 0x002C($sp) -/* 01CA8 80A191B8 0C00B6E3 */ jal func_8002DB8C -/* 01CAC 80A191BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01CB0 80A191C0 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 01CB4 80A191C4 44812000 */ mtc1 $at, $f4 ## $f4 = 80.00 -/* 01CB8 80A191C8 00000000 */ nop -/* 01CBC 80A191CC 4604003C */ c.lt.s $f0, $f4 -/* 01CC0 80A191D0 00000000 */ nop -/* 01CC4 80A191D4 45020012 */ bc1fl .L80A19220 -/* 01CC8 80A191D8 8FBF001C */ lw $ra, 0x001C($sp) -/* 01CCC 80A191DC 0C285FB5 */ jal func_80A17ED4 -/* 01CD0 80A191E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01CD4 80A191E4 1000000E */ beq $zero, $zero, .L80A19220 -/* 01CD8 80A191E8 8FBF001C */ lw $ra, 0x001C($sp) -.L80A191EC: -/* 01CDC 80A191EC 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 01CE0 80A191F0 0C01E1EF */ jal Math_SmoothScaleMaxS - -/* 01CE4 80A191F4 2407071C */ addiu $a3, $zero, 0x071C ## $a3 = 0000071C -/* 01CE8 80A191F8 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 01CEC 80A191FC 44814000 */ mtc1 $at, $f8 ## $f8 = 80.00 -/* 01CF0 80A19200 C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 -/* 01CF4 80A19204 4608303C */ c.lt.s $f6, $f8 -/* 01CF8 80A19208 00000000 */ nop -/* 01CFC 80A1920C 45020004 */ bc1fl .L80A19220 -/* 01D00 80A19210 8FBF001C */ lw $ra, 0x001C($sp) -/* 01D04 80A19214 0C285FCF */ jal func_80A17F3C -/* 01D08 80A19218 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A1921C: -/* 01D0C 80A1921C 8FBF001C */ lw $ra, 0x001C($sp) -.L80A19220: -/* 01D10 80A19220 8FB00018 */ lw $s0, 0x0018($sp) -/* 01D14 80A19224 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01D18 80A19228 03E00008 */ jr $ra -/* 01D1C 80A1922C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19230.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19230.s deleted file mode 100644 index 30c8717713..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19230.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80A19230 -/* 01D20 80A19230 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01D24 80A19234 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01D28 80A19238 AFA5001C */ sw $a1, 0x001C($sp) -/* 01D2C 80A1923C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01D30 80A19240 3C063AC4 */ lui $a2, 0x3AC4 ## $a2 = 3AC40000 -/* 01D34 80A19244 34C69BA6 */ ori $a2, $a2, 0x9BA6 ## $a2 = 3AC49BA6 -/* 01D38 80A19248 AFA70018 */ sw $a3, 0x0018($sp) -/* 01D3C 80A1924C 24840050 */ addiu $a0, $a0, 0x0050 ## $a0 = 00000050 -/* 01D40 80A19250 0C01DE80 */ jal Math_ApproxF - -/* 01D44 80A19254 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01D48 80A19258 10400005 */ beq $v0, $zero, .L80A19270 -/* 01D4C 80A1925C 8FA70018 */ lw $a3, 0x0018($sp) -/* 01D50 80A19260 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 01D54 80A19264 0C286075 */ jal func_80A181D4 -/* 01D58 80A19268 AFA70018 */ sw $a3, 0x0018($sp) -/* 01D5C 80A1926C 8FA70018 */ lw $a3, 0x0018($sp) -.L80A19270: -/* 01D60 80A19270 C4E00050 */ lwc1 $f0, 0x0050($a3) ## 00000050 -/* 01D64 80A19274 E4E00058 */ swc1 $f0, 0x0058($a3) ## 00000058 -/* 01D68 80A19278 E4E00054 */ swc1 $f0, 0x0054($a3) ## 00000054 -/* 01D6C 80A1927C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01D70 80A19280 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01D74 80A19284 03E00008 */ jr $ra -/* 01D78 80A19288 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1928C.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1928C.s deleted file mode 100644 index f7f76b8a82..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1928C.s +++ /dev/null @@ -1,87 +0,0 @@ -glabel func_80A1928C -/* 01D7C 80A1928C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01D80 80A19290 AFB00018 */ sw $s0, 0x0018($sp) -/* 01D84 80A19294 AFBF001C */ sw $ra, 0x001C($sp) -/* 01D88 80A19298 AFA5002C */ sw $a1, 0x002C($sp) -/* 01D8C 80A1929C 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 01D90 80A192A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01D94 80A192A4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01D98 80A192A8 AFA40020 */ sw $a0, 0x0020($sp) -/* 01D9C 80A192AC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01DA0 80A192B0 AFAF0024 */ sw $t7, 0x0024($sp) -/* 01DA4 80A192B4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01DA8 80A192B8 44810000 */ mtc1 $at, $f0 ## $f0 = 20.00 -/* 01DAC 80A192BC C6040164 */ lwc1 $f4, 0x0164($s0) ## 00000164 -/* 01DB0 80A192C0 8FA40020 */ lw $a0, 0x0020($sp) -/* 01DB4 80A192C4 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01DB8 80A192C8 4600203C */ c.lt.s $f4, $f0 -/* 01DBC 80A192CC 24070E38 */ addiu $a3, $zero, 0x0E38 ## $a3 = 00000E38 -/* 01DC0 80A192D0 45020007 */ bc1fl .L80A192F0 -/* 01DC4 80A192D4 44050000 */ mfc1 $a1, $f0 -/* 01DC8 80A192D8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 01DCC 80A192DC 0C01E1EF */ jal Math_SmoothScaleMaxS - -/* 01DD0 80A192E0 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 01DD4 80A192E4 10000033 */ beq $zero, $zero, .L80A193B4 -/* 01DD8 80A192E8 8FBF001C */ lw $ra, 0x001C($sp) -/* 01DDC 80A192EC 44050000 */ mfc1 $a1, $f0 -.L80A192F0: -/* 01DE0 80A192F0 0C0295B2 */ jal func_800A56C8 -/* 01DE4 80A192F4 00000000 */ nop -/* 01DE8 80A192F8 10400007 */ beq $v0, $zero, .L80A19318 -/* 01DEC 80A192FC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 01DF0 80A19300 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 -/* 01DF4 80A19304 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 01DF8 80A19308 44814000 */ mtc1 $at, $f8 ## $f8 = 7.00 -/* 01DFC 80A1930C E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 01E00 80A19310 10000027 */ beq $zero, $zero, .L80A193B0 -/* 01E04 80A19314 E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 -.L80A19318: -/* 01E08 80A19318 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 -/* 01E0C 80A1931C 24080032 */ addiu $t0, $zero, 0x0032 ## $t0 = 00000032 -/* 01E10 80A19320 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E14 80A19324 33190002 */ andi $t9, $t8, 0x0002 ## $t9 = 00000000 -/* 01E18 80A19328 1320000A */ beq $t9, $zero, .L80A19354 -/* 01E1C 80A1932C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01E20 80A19330 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 01E24 80A19334 A6080194 */ sh $t0, 0x0194($s0) ## 00000194 -/* 01E28 80A19338 24053937 */ addiu $a1, $zero, 0x3937 ## $a1 = 00003937 -/* 01E2C 80A1933C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01E30 80A19340 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 01E34 80A19344 0C285ED0 */ jal func_80A17B40 -/* 01E38 80A19348 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E3C 80A1934C 10000019 */ beq $zero, $zero, .L80A193B4 -/* 01E40 80A19350 8FBF001C */ lw $ra, 0x001C($sp) -.L80A19354: -/* 01E44 80A19354 C6100094 */ lwc1 $f16, 0x0094($s0) ## 00000094 -/* 01E48 80A19358 44819000 */ mtc1 $at, $f18 ## $f18 = 0.00 -/* 01E4C 80A1935C 00000000 */ nop -/* 01E50 80A19360 4612803C */ c.lt.s $f16, $f18 -/* 01E54 80A19364 00000000 */ nop -/* 01E58 80A19368 45020012 */ bc1fl .L80A193B4 -/* 01E5C 80A1936C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01E60 80A19370 920902DA */ lbu $t1, 0x02DA($s0) ## 000002DA -/* 01E64 80A19374 8FA50024 */ lw $a1, 0x0024($sp) -/* 01E68 80A19378 312A0002 */ andi $t2, $t1, 0x0002 ## $t2 = 00000000 -/* 01E6C 80A1937C 5140000D */ beql $t2, $zero, .L80A193B4 -/* 01E70 80A19380 8FBF001C */ lw $ra, 0x001C($sp) -/* 01E74 80A19384 8E0B02D4 */ lw $t3, 0x02D4($s0) ## 000002D4 -/* 01E78 80A19388 8FA4002C */ lw $a0, 0x002C($sp) -/* 01E7C 80A1938C 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 01E80 80A19390 14AB0007 */ bne $a1, $t3, .L80A193B0 -/* 01E84 80A19394 0324C821 */ addu $t9, $t9, $a0 -/* 01E88 80A19398 8F391D4C */ lw $t9, 0x1D4C($t9) ## 00011D4C -/* 01E8C 80A1939C 0320F809 */ jalr $ra, $t9 -/* 01E90 80A193A0 00000000 */ nop -/* 01E94 80A193A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E98 80A193A8 0C285FE9 */ jal func_80A17FA4 -/* 01E9C 80A193AC 8FA50024 */ lw $a1, 0x0024($sp) -.L80A193B0: -/* 01EA0 80A193B0 8FBF001C */ lw $ra, 0x001C($sp) -.L80A193B4: -/* 01EA4 80A193B4 8FB00018 */ lw $s0, 0x0018($sp) -/* 01EA8 80A193B8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01EAC 80A193BC 03E00008 */ jr $ra -/* 01EB0 80A193C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A193C4.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A193C4.s deleted file mode 100644 index c91075f482..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A193C4.s +++ /dev/null @@ -1,227 +0,0 @@ -.late_rodata -glabel D_80A1A59C - .float 0.1 - -.text -glabel func_80A193C4 -/* 01EB4 80A193C4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01EB8 80A193C8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01EBC 80A193CC AFA5003C */ sw $a1, 0x003C($sp) -/* 01EC0 80A193D0 8CA71C44 */ lw $a3, 0x1C44($a1) ## 00001C44 -/* 01EC4 80A193D4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01EC8 80A193D8 AFA60038 */ sw $a2, 0x0038($sp) -/* 01ECC 80A193DC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01ED0 80A193E0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01ED4 80A193E4 AFA70034 */ sw $a3, 0x0034($sp) -/* 01ED8 80A193E8 8FA60038 */ lw $a2, 0x0038($sp) -/* 01EDC 80A193EC 1040001A */ beq $v0, $zero, .L80A19458 -/* 01EE0 80A193F0 8FA70034 */ lw $a3, 0x0034($sp) -/* 01EE4 80A193F4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01EE8 80A193F8 C4C60168 */ lwc1 $f6, 0x0168($a2) ## 00000168 -/* 01EEC 80A193FC 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 01EF0 80A19400 4606203C */ c.lt.s $f4, $f6 -/* 01EF4 80A19404 00000000 */ nop -/* 01EF8 80A19408 4502000C */ bc1fl .L80A1943C -/* 01EFC 80A1940C 44816000 */ mtc1 $at, $f12 ## $f12 = 45.00 -/* 01F00 80A19410 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 01F04 80A19414 44816000 */ mtc1 $at, $f12 ## $f12 = 45.00 -/* 01F08 80A19418 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 01F0C 80A1941C 44814000 */ mtc1 $at, $f8 ## $f8 = -1.00 -/* 01F10 80A19420 3C014210 */ lui $at, 0x4210 ## $at = 42100000 -/* 01F14 80A19424 44815000 */ mtc1 $at, $f10 ## $f10 = 36.00 -/* 01F18 80A19428 E4CC0158 */ swc1 $f12, 0x0158($a2) ## 00000158 -/* 01F1C 80A1942C E4C80168 */ swc1 $f8, 0x0168($a2) ## 00000168 -/* 01F20 80A19430 10000009 */ beq $zero, $zero, .L80A19458 -/* 01F24 80A19434 E4CA015C */ swc1 $f10, 0x015C($a2) ## 0000015C -/* 01F28 80A19438 44816000 */ mtc1 $at, $f12 ## $f12 = 36.00 -.L80A1943C: -/* 01F2C 80A1943C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01F30 80A19440 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 01F34 80A19444 3C014210 */ lui $at, 0x4210 ## $at = 42100000 -/* 01F38 80A19448 44819000 */ mtc1 $at, $f18 ## $f18 = 36.00 -/* 01F3C 80A1944C E4CC015C */ swc1 $f12, 0x015C($a2) ## 0000015C -/* 01F40 80A19450 E4D00168 */ swc1 $f16, 0x0168($a2) ## 00000168 -/* 01F44 80A19454 E4D20158 */ swc1 $f18, 0x0158($a2) ## 00000158 -.L80A19458: -/* 01F48 80A19458 3C0F8016 */ lui $t7, %hi(gSaveContext+4) -/* 01F4C 80A1945C 8DEFE664 */ lw $t7, %lo(gSaveContext+4)($t7) -/* 01F50 80A19460 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 01F54 80A19464 44816000 */ mtc1 $at, $f12 ## $f12 = 45.00 -/* 01F58 80A19468 51E0001D */ beql $t7, $zero, .L80A194E0 -/* 01F5C 80A1946C C4C00094 */ lwc1 $f0, 0x0094($a2) ## 00000094 -/* 01F60 80A19470 C4C00094 */ lwc1 $f0, 0x0094($a2) ## 00000094 -/* 01F64 80A19474 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01F68 80A19478 44811000 */ mtc1 $at, $f2 ## $f2 = 20.00 -/* 01F6C 80A1947C 46000007 */ neg.s $f0, $f0 -/* 01F70 80A19480 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 01F74 80A19484 4602003C */ c.lt.s $f0, $f2 -/* 01F78 80A19488 00000000 */ nop -/* 01F7C 80A1948C 45020007 */ bc1fl .L80A194AC -/* 01F80 80A19490 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 01F84 80A19494 46001006 */ mov.s $f0, $f2 -/* 01F88 80A19498 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01F8C 80A1949C 44811000 */ mtc1 $at, $f2 ## $f2 = -10.00 -/* 01F90 80A194A0 10000024 */ beq $zero, $zero, .L80A19534 -/* 01F94 80A194A4 C4E40028 */ lwc1 $f4, 0x0028($a3) ## 00000028 -/* 01F98 80A194A8 44816000 */ mtc1 $at, $f12 ## $f12 = -10.00 -.L80A194AC: -/* 01F9C 80A194AC 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01FA0 80A194B0 4600603C */ c.lt.s $f12, $f0 -/* 01FA4 80A194B4 00000000 */ nop -/* 01FA8 80A194B8 45020004 */ bc1fl .L80A194CC -/* 01FAC 80A194BC 46000086 */ mov.s $f2, $f0 -/* 01FB0 80A194C0 10000002 */ beq $zero, $zero, .L80A194CC -/* 01FB4 80A194C4 46006086 */ mov.s $f2, $f12 -/* 01FB8 80A194C8 46000086 */ mov.s $f2, $f0 -.L80A194CC: -/* 01FBC 80A194CC 46001006 */ mov.s $f0, $f2 -/* 01FC0 80A194D0 44811000 */ mtc1 $at, $f2 ## $f2 = -10.00 -/* 01FC4 80A194D4 10000017 */ beq $zero, $zero, .L80A19534 -/* 01FC8 80A194D8 C4E40028 */ lwc1 $f4, 0x0028($a3) ## 00000028 -/* 01FCC 80A194DC C4C00094 */ lwc1 $f0, 0x0094($a2) ## 00000094 -.L80A194E0: -/* 01FD0 80A194E0 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 01FD4 80A194E4 44811000 */ mtc1 $at, $f2 ## $f2 = 25.00 -/* 01FD8 80A194E8 46000007 */ neg.s $f0, $f0 -/* 01FDC 80A194EC 3C01C1F0 */ lui $at, 0xC1F0 ## $at = C1F00000 -/* 01FE0 80A194F0 4602003C */ c.lt.s $f0, $f2 -/* 01FE4 80A194F4 00000000 */ nop -/* 01FE8 80A194F8 45020004 */ bc1fl .L80A1950C -/* 01FEC 80A194FC 4600603C */ c.lt.s $f12, $f0 -/* 01FF0 80A19500 10000009 */ beq $zero, $zero, .L80A19528 -/* 01FF4 80A19504 46001006 */ mov.s $f0, $f2 -/* 01FF8 80A19508 4600603C */ c.lt.s $f12, $f0 -.L80A1950C: -/* 01FFC 80A1950C 00000000 */ nop -/* 02000 80A19510 45020004 */ bc1fl .L80A19524 -/* 02004 80A19514 46000086 */ mov.s $f2, $f0 -/* 02008 80A19518 10000002 */ beq $zero, $zero, .L80A19524 -/* 0200C 80A1951C 46006086 */ mov.s $f2, $f12 -/* 02010 80A19520 46000086 */ mov.s $f2, $f0 -.L80A19524: -/* 02014 80A19524 46001006 */ mov.s $f0, $f2 -.L80A19528: -/* 02018 80A19528 44811000 */ mtc1 $at, $f2 ## $f2 = -30.00 -/* 0201C 80A1952C 00000000 */ nop -/* 02020 80A19530 C4E40028 */ lwc1 $f4, 0x0028($a3) ## 00000028 -.L80A19534: -/* 02024 80A19534 84C400B6 */ lh $a0, 0x00B6($a2) ## 000000B6 -/* 02028 80A19538 46002180 */ add.s $f6, $f4, $f0 -/* 0202C 80A1953C E4C60028 */ swc1 $f6, 0x0028($a2) ## 00000028 -/* 02030 80A19540 E7A20024 */ swc1 $f2, 0x0024($sp) -/* 02034 80A19544 AFA70034 */ sw $a3, 0x0034($sp) -/* 02038 80A19548 0C01DE1C */ jal Math_Sins - ## sins? -/* 0203C 80A1954C AFA60038 */ sw $a2, 0x0038($sp) -/* 02040 80A19550 3C0180A2 */ lui $at, %hi(D_80A1A59C) ## $at = 80A20000 -/* 02044 80A19554 C428A59C */ lwc1 $f8, %lo(D_80A1A59C)($at) -/* 02048 80A19558 C7A20024 */ lwc1 $f2, 0x0024($sp) -/* 0204C 80A1955C 8FA70034 */ lw $a3, 0x0034($sp) -/* 02050 80A19560 8FA60038 */ lw $a2, 0x0038($sp) -/* 02054 80A19564 46081302 */ mul.s $f12, $f2, $f8 -/* 02058 80A19568 C4F00024 */ lwc1 $f16, 0x0024($a3) ## 00000024 -/* 0205C 80A1956C 84C400B6 */ lh $a0, 0x00B6($a2) ## 000000B6 -/* 02060 80A19570 460C0282 */ mul.s $f10, $f0, $f12 -/* 02064 80A19574 46105480 */ add.s $f18, $f10, $f16 -/* 02068 80A19578 E4D20024 */ swc1 $f18, 0x0024($a2) ## 00000024 -/* 0206C 80A1957C 0C01DE0D */ jal Math_Coss - ## coss? -/* 02070 80A19580 E7AC001C */ swc1 $f12, 0x001C($sp) -/* 02074 80A19584 C7AC001C */ lwc1 $f12, 0x001C($sp) -/* 02078 80A19588 8FA70034 */ lw $a3, 0x0034($sp) -/* 0207C 80A1958C 8FA60038 */ lw $a2, 0x0038($sp) -/* 02080 80A19590 460C0102 */ mul.s $f4, $f0, $f12 -/* 02084 80A19594 C4E6002C */ lwc1 $f6, 0x002C($a3) ## 0000002C -/* 02088 80A19598 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 0208C 80A1959C 46062200 */ add.s $f8, $f4, $f6 -/* 02090 80A195A0 E4C8002C */ swc1 $f8, 0x002C($a2) ## 0000002C -/* 02094 80A195A4 8CF80680 */ lw $t8, 0x0680($a3) ## 00000680 -/* 02098 80A195A8 33190080 */ andi $t9, $t8, 0x0080 ## $t9 = 00000000 -/* 0209C 80A195AC 53200005 */ beql $t9, $zero, .L80A195C4 -/* 020A0 80A195B0 8CC40118 */ lw $a0, 0x0118($a2) ## 00000118 -/* 020A4 80A195B4 80E80A78 */ lb $t0, 0x0A78($a3) ## 00000A78 -/* 020A8 80A195B8 05030024 */ bgezl $t0, .L80A1964C -/* 020AC 80A195BC 84CE0196 */ lh $t6, 0x0196($a2) ## 00000196 -/* 020B0 80A195C0 8CC40118 */ lw $a0, 0x0118($a2) ## 00000118 -.L80A195C4: -/* 020B4 80A195C4 3C0280A2 */ lui $v0, %hi(func_80A193C4) ## $v0 = 80A20000 -/* 020B8 80A195C8 244293C4 */ addiu $v0, $v0, %lo(func_80A193C4) ## $v0 = 80A193C4 -/* 020BC 80A195CC 8C830190 */ lw $v1, 0x0190($a0) ## 00000190 -/* 020C0 80A195D0 44815000 */ mtc1 $at, $f10 ## $f10 = 6.00 -/* 020C4 80A195D4 8CC5011C */ lw $a1, 0x011C($a2) ## 0000011C -/* 020C8 80A195D8 10430005 */ beq $v0, $v1, .L80A195F0 -/* 020CC 80A195DC 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 020D0 80A195E0 3C0980A2 */ lui $t1, %hi(func_80A19B9C) ## $t1 = 80A20000 -/* 020D4 80A195E4 25299B9C */ addiu $t1, $t1, %lo(func_80A19B9C) ## $t1 = 80A19B9C -/* 020D8 80A195E8 5523000C */ bnel $t1, $v1, .L80A1961C -/* 020DC 80A195EC 8CCC0004 */ lw $t4, 0x0004($a2) ## 00000004 -.L80A195F0: -/* 020E0 80A195F0 8CA30190 */ lw $v1, 0x0190($a1) ## 00000190 -/* 020E4 80A195F4 3C0A80A2 */ lui $t2, %hi(func_80A19B9C) ## $t2 = 80A20000 -/* 020E8 80A195F8 254A9B9C */ addiu $t2, $t2, %lo(func_80A19B9C) ## $t2 = 80A19B9C -/* 020EC 80A195FC 10430002 */ beq $v0, $v1, .L80A19608 -/* 020F0 80A19600 240B0040 */ addiu $t3, $zero, 0x0040 ## $t3 = 00000040 -/* 020F4 80A19604 15430004 */ bne $t2, $v1, .L80A19618 -.L80A19608: -/* 020F8 80A19608 24020020 */ addiu $v0, $zero, 0x0020 ## $v0 = 00000020 -/* 020FC 80A1960C A482001C */ sh $v0, 0x001C($a0) ## 0000001C -/* 02100 80A19610 A4A2001C */ sh $v0, 0x001C($a1) ## 0000001C -/* 02104 80A19614 A4CB001C */ sh $t3, 0x001C($a2) ## 0000001C -.L80A19618: -/* 02108 80A19618 8CCC0004 */ lw $t4, 0x0004($a2) ## 00000004 -.L80A1961C: -/* 0210C 80A1961C 44818000 */ mtc1 $at, $f16 ## $f16 = -3.00 -/* 02110 80A19620 A4C000B4 */ sh $zero, 0x00B4($a2) ## 000000B4 -/* 02114 80A19624 358D0001 */ ori $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 02118 80A19628 E4CA0060 */ swc1 $f10, 0x0060($a2) ## 00000060 -/* 0211C 80A1962C ACCD0004 */ sw $t5, 0x0004($a2) ## 00000004 -/* 02120 80A19630 E4D00068 */ swc1 $f16, 0x0068($a2) ## 00000068 -/* 02124 80A19634 AFA60038 */ sw $a2, 0x0038($sp) -/* 02128 80A19638 0C285ED0 */ jal func_80A17B40 -/* 0212C 80A1963C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 02130 80A19640 1000001F */ beq $zero, $zero, .L80A196C0 -/* 02134 80A19644 8FA60038 */ lw $a2, 0x0038($sp) -/* 02138 80A19648 84CE0196 */ lh $t6, 0x0196($a2) ## 00000196 -.L80A1964C: -/* 0213C 80A1964C 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 02140 80A19650 3C188016 */ lui $t8, %hi(gSaveContext+4) -/* 02144 80A19654 01C1001A */ div $zero, $t6, $at -/* 02148 80A19658 00007810 */ mfhi $t7 -/* 0214C 80A1965C 55E00019 */ bnel $t7, $zero, .L80A196C4 -/* 02150 80A19660 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 02154 80A19664 8F18E664 */ lw $t8, %lo(gSaveContext+4)($t8) -/* 02158 80A19668 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0215C 80A1966C 24056805 */ addiu $a1, $zero, 0x6805 ## $a1 = 00006805 -/* 02160 80A19670 13000007 */ beq $t8, $zero, .L80A19690 -/* 02164 80A19674 00000000 */ nop -/* 02168 80A19678 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0216C 80A1967C 24056825 */ addiu $a1, $zero, 0x6825 ## $a1 = 00006825 -/* 02170 80A19680 0C00BDF7 */ jal func_8002F7DC -/* 02174 80A19684 AFA60038 */ sw $a2, 0x0038($sp) -/* 02178 80A19688 10000004 */ beq $zero, $zero, .L80A1969C -/* 0217C 80A1968C 8FA60038 */ lw $a2, 0x0038($sp) -.L80A19690: -/* 02180 80A19690 0C00BDF7 */ jal func_8002F7DC -/* 02184 80A19694 AFA60038 */ sw $a2, 0x0038($sp) -/* 02188 80A19698 8FA60038 */ lw $a2, 0x0038($sp) -.L80A1969C: -/* 0218C 80A1969C 8FA4003C */ lw $a0, 0x003C($sp) -/* 02190 80A196A0 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 02194 80A196A4 AFA60038 */ sw $a2, 0x0038($sp) -/* 02198 80A196A8 0324C821 */ addu $t9, $t9, $a0 -/* 0219C 80A196AC 8F391D58 */ lw $t9, 0x1D58($t9) ## 00011D58 -/* 021A0 80A196B0 2405FFF8 */ addiu $a1, $zero, 0xFFF8 ## $a1 = FFFFFFF8 -/* 021A4 80A196B4 0320F809 */ jalr $ra, $t9 -/* 021A8 80A196B8 00000000 */ nop -/* 021AC 80A196BC 8FA60038 */ lw $a2, 0x0038($sp) -.L80A196C0: -/* 021B0 80A196C0 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -.L80A196C4: -/* 021B4 80A196C4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 021B8 80A196C8 24053136 */ addiu $a1, $zero, 0x3136 ## $a1 = 00003136 -/* 021BC 80A196CC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 021C0 80A196D0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 021C4 80A196D4 03E00008 */ jr $ra -/* 021C8 80A196D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A196DC.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A196DC.s deleted file mode 100644 index 6d84be86bb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A196DC.s +++ /dev/null @@ -1,146 +0,0 @@ -glabel func_80A196DC -/* 021CC 80A196DC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 021D0 80A196E0 AFB00014 */ sw $s0, 0x0014($sp) -/* 021D4 80A196E4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 021D8 80A196E8 AFBF001C */ sw $ra, 0x001C($sp) -/* 021DC 80A196EC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 021E0 80A196F0 AFB10018 */ sw $s1, 0x0018($sp) -/* 021E4 80A196F4 AFA50034 */ sw $a1, 0x0034($sp) -/* 021E8 80A196F8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 021EC 80A196FC AFA40024 */ sw $a0, 0x0024($sp) -/* 021F0 80A19700 8E030118 */ lw $v1, 0x0118($s0) ## 00000118 -/* 021F4 80A19704 24050040 */ addiu $a1, $zero, 0x0040 ## $a1 = 00000040 -/* 021F8 80A19708 8FA40024 */ lw $a0, 0x0024($sp) -/* 021FC 80A1970C 846E001C */ lh $t6, 0x001C($v1) ## 0000001C -/* 02200 80A19710 54AE0004 */ bnel $a1, $t6, .L80A19724 -/* 02204 80A19714 8E02011C */ lw $v0, 0x011C($s0) ## 0000011C -/* 02208 80A19718 10000011 */ beq $zero, $zero, .L80A19760 -/* 0220C 80A1971C 00608825 */ or $s1, $v1, $zero ## $s1 = 00000000 -/* 02210 80A19720 8E02011C */ lw $v0, 0x011C($s0) ## 0000011C -.L80A19724: -/* 02214 80A19724 844F001C */ lh $t7, 0x001C($v0) ## 0000001C -/* 02218 80A19728 54AF0004 */ bnel $a1, $t7, .L80A1973C -/* 0221C 80A1972C 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 -/* 02220 80A19730 1000000B */ beq $zero, $zero, .L80A19760 -/* 02224 80A19734 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 -/* 02228 80A19738 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 -.L80A1973C: -/* 0222C 80A1973C 24080010 */ addiu $t0, $zero, 0x0010 ## $t0 = 00000010 -/* 02230 80A19740 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02234 80A19744 33190002 */ andi $t9, $t8, 0x0002 ## $t9 = 00000000 -/* 02238 80A19748 53200064 */ beql $t9, $zero, .L80A198DC -/* 0223C 80A1974C 8FBF001C */ lw $ra, 0x001C($sp) -/* 02240 80A19750 0C285ED0 */ jal func_80A17B40 -/* 02244 80A19754 A608001C */ sh $t0, 0x001C($s0) ## 0000001C -/* 02248 80A19758 10000060 */ beq $zero, $zero, .L80A198DC -/* 0224C 80A1975C 8FBF001C */ lw $ra, 0x001C($sp) -.L80A19760: -/* 02250 80A19760 0C0295B2 */ jal func_800A56C8 -/* 02254 80A19764 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 -/* 02258 80A19768 10400008 */ beq $v0, $zero, .L80A1978C -/* 0225C 80A1976C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 02260 80A19770 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 02264 80A19774 44811000 */ mtc1 $at, $f2 ## $f2 = 5.00 -/* 02268 80A19778 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 0226C 80A1977C 44812000 */ mtc1 $at, $f4 ## $f4 = 7.00 -/* 02270 80A19780 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 02274 80A19784 1000003E */ beq $zero, $zero, .L80A19880 -/* 02278 80A19788 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 -.L80A1978C: -/* 0227C 80A1978C C6060164 */ lwc1 $f6, 0x0164($s0) ## 00000164 -/* 02280 80A19790 44814000 */ mtc1 $at, $f8 ## $f8 = 7.00 -/* 02284 80A19794 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02288 80A19798 4608303C */ c.lt.s $f6, $f8 -/* 0228C 80A1979C 00000000 */ nop -/* 02290 80A197A0 4502000C */ bc1fl .L80A197D4 -/* 02294 80A197A4 C62A0028 */ lwc1 $f10, 0x0028($s1) ## 00000028 -/* 02298 80A197A8 0C00B69E */ jal func_8002DA78 -/* 0229C 80A197AC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 022A0 80A197B0 00022C00 */ sll $a1, $v0, 16 -/* 022A4 80A197B4 00052C03 */ sra $a1, $a1, 16 -/* 022A8 80A197B8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 022AC 80A197BC 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 022B0 80A197C0 0C01E1EF */ jal Math_SmoothScaleMaxS - -/* 022B4 80A197C4 24070E38 */ addiu $a3, $zero, 0x0E38 ## $a3 = 00000E38 -/* 022B8 80A197C8 1000002E */ beq $zero, $zero, .L80A19884 -/* 022BC 80A197CC C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 022C0 80A197D0 C62A0028 */ lwc1 $f10, 0x0028($s1) ## 00000028 -.L80A197D4: -/* 022C4 80A197D4 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 022C8 80A197D8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 022CC 80A197DC 44812000 */ mtc1 $at, $f4 ## $f4 = -10.00 -/* 022D0 80A197E0 46105481 */ sub.s $f18, $f10, $f16 -/* 022D4 80A197E4 4604903C */ c.lt.s $f18, $f4 -/* 022D8 80A197E8 00000000 */ nop -/* 022DC 80A197EC 4502001A */ bc1fl .L80A19858 -/* 022E0 80A197F0 960B0088 */ lhu $t3, 0x0088($s0) ## 00000088 -/* 022E4 80A197F4 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 022E8 80A197F8 C6280024 */ lwc1 $f8, 0x0024($s1) ## 00000024 -/* 022EC 80A197FC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 022F0 80A19800 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 022F4 80A19804 46083001 */ sub.s $f0, $f6, $f8 -/* 022F8 80A19808 46000005 */ abs.s $f0, $f0 -/* 022FC 80A1980C 4602003C */ c.lt.s $f0, $f2 -/* 02300 80A19810 00000000 */ nop -/* 02304 80A19814 45020010 */ bc1fl .L80A19858 -/* 02308 80A19818 960B0088 */ lhu $t3, 0x0088($s0) ## 00000088 -/* 0230C 80A1981C C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 02310 80A19820 C630002C */ lwc1 $f16, 0x002C($s1) ## 0000002C -/* 02314 80A19824 46105001 */ sub.s $f0, $f10, $f16 -/* 02318 80A19828 46000005 */ abs.s $f0, $f0 -/* 0231C 80A1982C 4602003C */ c.lt.s $f0, $f2 -/* 02320 80A19830 00000000 */ nop -/* 02324 80A19834 45020008 */ bc1fl .L80A19858 -/* 02328 80A19838 960B0088 */ lhu $t3, 0x0088($s0) ## 00000088 -/* 0232C 80A1983C 0C286075 */ jal func_80A181D4 -/* 02330 80A19840 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02334 80A19844 920902DA */ lbu $t1, 0x02DA($s0) ## 000002DA -/* 02338 80A19848 352A0001 */ ori $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 0233C 80A1984C 1000000C */ beq $zero, $zero, .L80A19880 -/* 02340 80A19850 A20A02DA */ sb $t2, 0x02DA($s0) ## 000002DA -/* 02344 80A19854 960B0088 */ lhu $t3, 0x0088($s0) ## 00000088 -.L80A19858: -/* 02348 80A19858 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0234C 80A1985C 316C0002 */ andi $t4, $t3, 0x0002 ## $t4 = 00000000 -/* 02350 80A19860 51800008 */ beql $t4, $zero, .L80A19884 -/* 02354 80A19864 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 02358 80A19868 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 0235C 80A1986C 24053937 */ addiu $a1, $zero, 0x3937 ## $a1 = 00003937 -/* 02360 80A19870 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02364 80A19874 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 -/* 02368 80A19878 0C285ED0 */ jal func_80A17B40 -/* 0236C 80A1987C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A19880: -/* 02370 80A19880 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -.L80A19884: -/* 02374 80A19884 C6260024 */ lwc1 $f6, 0x0024($s1) ## 00000024 -/* 02378 80A19888 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 0237C 80A1988C 44811000 */ mtc1 $at, $f2 ## $f2 = 5.00 -/* 02380 80A19890 46062001 */ sub.s $f0, $f4, $f6 -/* 02384 80A19894 46000005 */ abs.s $f0, $f0 -/* 02388 80A19898 4602003C */ c.lt.s $f0, $f2 -/* 0238C 80A1989C 00000000 */ nop -/* 02390 80A198A0 4502000E */ bc1fl .L80A198DC -/* 02394 80A198A4 8FBF001C */ lw $ra, 0x001C($sp) -/* 02398 80A198A8 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 0239C 80A198AC C62A002C */ lwc1 $f10, 0x002C($s1) ## 0000002C -/* 023A0 80A198B0 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 023A4 80A198B4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 023A8 80A198B8 460A4001 */ sub.s $f0, $f8, $f10 -/* 023AC 80A198BC 46000005 */ abs.s $f0, $f0 -/* 023B0 80A198C0 4602003C */ c.lt.s $f0, $f2 -/* 023B4 80A198C4 00000000 */ nop -/* 023B8 80A198C8 45020004 */ bc1fl .L80A198DC -/* 023BC 80A198CC 8FBF001C */ lw $ra, 0x001C($sp) -/* 023C0 80A198D0 0C01DE80 */ jal Math_ApproxF - -/* 023C4 80A198D4 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 023C8 80A198D8 8FBF001C */ lw $ra, 0x001C($sp) -.L80A198DC: -/* 023CC 80A198DC 8FB00014 */ lw $s0, 0x0014($sp) -/* 023D0 80A198E0 8FB10018 */ lw $s1, 0x0018($sp) -/* 023D4 80A198E4 03E00008 */ jr $ra -/* 023D8 80A198E8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A198EC.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A198EC.s deleted file mode 100644 index 88ba453391..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A198EC.s +++ /dev/null @@ -1,201 +0,0 @@ -.late_rodata -glabel D_80A1A5A0 - .word 0x3BE56042 -glabel D_80A1A5A4 - .word 0x3B83126F -glabel D_80A1A5A8 - .float 0.01 - -.text -glabel func_80A198EC -/* 023DC 80A198EC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 023E0 80A198F0 AFBF001C */ sw $ra, 0x001C($sp) -/* 023E4 80A198F4 AFB00018 */ sw $s0, 0x0018($sp) -/* 023E8 80A198F8 AFA50044 */ sw $a1, 0x0044($sp) -/* 023EC 80A198FC 8482019A */ lh $v0, 0x019A($a0) ## 0000019A -/* 023F0 80A19900 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 023F4 80A19904 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 023F8 80A19908 10400003 */ beq $v0, $zero, .L80A19918 -/* 023FC 80A1990C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 02400 80A19910 A48E019A */ sh $t6, 0x019A($a0) ## 0000019A -/* 02404 80A19914 8482019A */ lh $v0, 0x019A($a0) ## 0000019A -.L80A19918: -/* 02408 80A19918 8E040118 */ lw $a0, 0x0118($s0) ## 00000118 -/* 0240C 80A1991C 14400016 */ bne $v0, $zero, .L80A19978 -/* 02410 80A19920 8E07011C */ lw $a3, 0x011C($s0) ## 0000011C -/* 02414 80A19924 8C8F0190 */ lw $t7, 0x0190($a0) ## 00000190 -/* 02418 80A19928 3C0280A2 */ lui $v0, %hi(func_80A19B9C) ## $v0 = 80A20000 -/* 0241C 80A1992C 24429B9C */ addiu $v0, $v0, %lo(func_80A19B9C) ## $v0 = 80A19B9C -/* 02420 80A19930 104F0008 */ beq $v0, $t7, .L80A19954 -/* 02424 80A19934 8FA50044 */ lw $a1, 0x0044($sp) -/* 02428 80A19938 AFA20028 */ sw $v0, 0x0028($sp) -/* 0242C 80A1993C AFA60034 */ sw $a2, 0x0034($sp) -/* 02430 80A19940 0C285F7F */ jal func_80A17DFC -/* 02434 80A19944 AFA70038 */ sw $a3, 0x0038($sp) -/* 02438 80A19948 8FA20028 */ lw $v0, 0x0028($sp) -/* 0243C 80A1994C 8FA60034 */ lw $a2, 0x0034($sp) -/* 02440 80A19950 8FA70038 */ lw $a3, 0x0038($sp) -.L80A19954: -/* 02444 80A19954 8CF80190 */ lw $t8, 0x0190($a3) ## 00000190 -/* 02448 80A19958 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0244C 80A1995C 8FA50044 */ lw $a1, 0x0044($sp) -/* 02450 80A19960 50580017 */ beql $v0, $t8, .L80A199C0 -/* 02454 80A19964 C6020050 */ lwc1 $f2, 0x0050($s0) ## 00000050 -/* 02458 80A19968 0C285F7F */ jal func_80A17DFC -/* 0245C 80A1996C AFA60034 */ sw $a2, 0x0034($sp) -/* 02460 80A19970 10000012 */ beq $zero, $zero, .L80A199BC -/* 02464 80A19974 8FA60034 */ lw $a2, 0x0034($sp) -.L80A19978: -/* 02468 80A19978 8C830190 */ lw $v1, 0x0190($a0) ## 00000190 -/* 0246C 80A1997C 3C0280A2 */ lui $v0, %hi(func_80A19B9C) ## $v0 = 80A20000 -/* 02470 80A19980 24429B9C */ addiu $v0, $v0, %lo(func_80A19B9C) ## $v0 = 80A19B9C -/* 02474 80A19984 10430005 */ beq $v0, $v1, .L80A1999C -/* 02478 80A19988 3C1980A2 */ lui $t9, %hi(func_80A19230) ## $t9 = 80A20000 -/* 0247C 80A1998C 27399230 */ addiu $t9, $t9, %lo(func_80A19230) ## $t9 = 80A19230 -/* 02480 80A19990 53230003 */ beql $t9, $v1, .L80A199A0 -/* 02484 80A19994 8CE30190 */ lw $v1, 0x0190($a3) ## 00000190 -/* 02488 80A19998 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -.L80A1999C: -/* 0248C 80A1999C 8CE30190 */ lw $v1, 0x0190($a3) ## 00000190 -.L80A199A0: -/* 02490 80A199A0 3C0880A2 */ lui $t0, %hi(func_80A19230) ## $t0 = 80A20000 -/* 02494 80A199A4 25089230 */ addiu $t0, $t0, %lo(func_80A19230) ## $t0 = 80A19230 -/* 02498 80A199A8 50430005 */ beql $v0, $v1, .L80A199C0 -/* 0249C 80A199AC C6020050 */ lwc1 $f2, 0x0050($s0) ## 00000050 -/* 024A0 80A199B0 51030003 */ beql $t0, $v1, .L80A199C0 -/* 024A4 80A199B4 C6020050 */ lwc1 $f2, 0x0050($s0) ## 00000050 -/* 024A8 80A199B8 24C60001 */ addiu $a2, $a2, 0x0001 ## $a2 = 00000002 -.L80A199BC: -/* 024AC 80A199BC C6020050 */ lwc1 $f2, 0x0050($s0) ## 00000050 -.L80A199C0: -/* 024B0 80A199C0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 024B4 80A199C4 14C1000B */ bne $a2, $at, .L80A199F4 -/* 024B8 80A199C8 46001306 */ mov.s $f12, $f2 -/* 024BC 80A199CC 3C053BE5 */ lui $a1, 0x3BE5 ## $a1 = 3BE50000 -/* 024C0 80A199D0 3C063A03 */ lui $a2, 0x3A03 ## $a2 = 3A030000 -/* 024C4 80A199D4 34C6126F */ ori $a2, $a2, 0x126F ## $a2 = 3A03126F -/* 024C8 80A199D8 34A56042 */ ori $a1, $a1, 0x6042 ## $a1 = 3BE56042 -/* 024CC 80A199DC 26040050 */ addiu $a0, $s0, 0x0050 ## $a0 = 00000050 -/* 024D0 80A199E0 0C01DE80 */ jal Math_ApproxF - -/* 024D4 80A199E4 E7AC0030 */ swc1 $f12, 0x0030($sp) -/* 024D8 80A199E8 C7AC0030 */ lwc1 $f12, 0x0030($sp) -/* 024DC 80A199EC 1000000B */ beq $zero, $zero, .L80A19A1C -/* 024E0 80A199F0 C6020050 */ lwc1 $f2, 0x0050($s0) ## 00000050 -.L80A199F4: -/* 024E4 80A199F4 14C00009 */ bne $a2, $zero, .L80A19A1C -/* 024E8 80A199F8 26040050 */ addiu $a0, $s0, 0x0050 ## $a0 = 00000050 -/* 024EC 80A199FC 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 024F0 80A19A00 3C063A03 */ lui $a2, 0x3A03 ## $a2 = 3A030000 -/* 024F4 80A19A04 34C6126F */ ori $a2, $a2, 0x126F ## $a2 = 3A03126F -/* 024F8 80A19A08 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 024FC 80A19A0C 0C01DE80 */ jal Math_ApproxF - -/* 02500 80A19A10 E7AC0030 */ swc1 $f12, 0x0030($sp) -/* 02504 80A19A14 C7AC0030 */ lwc1 $f12, 0x0030($sp) -/* 02508 80A19A18 C6020050 */ lwc1 $f2, 0x0050($s0) ## 00000050 -.L80A19A1C: -/* 0250C 80A19A1C E6020058 */ swc1 $f2, 0x0058($s0) ## 00000058 -/* 02510 80A19A20 E6020054 */ swc1 $f2, 0x0054($s0) ## 00000054 -/* 02514 80A19A24 3C0180A2 */ lui $at, %hi(D_80A1A5A0) ## $at = 80A20000 -/* 02518 80A19A28 C424A5A0 */ lwc1 $f4, %lo(D_80A1A5A0)($at) -/* 0251C 80A19A2C 3C0180A2 */ lui $at, %hi(D_80A1A5A4) ## $at = 80A20000 -/* 02520 80A19A30 46046032 */ c.eq.s $f12, $f4 -/* 02524 80A19A34 00000000 */ nop -/* 02528 80A19A38 45030007 */ bc1tl .L80A19A58 -/* 0252C 80A19A3C 46026032 */ c.eq.s $f12, $f2 -/* 02530 80A19A40 C426A5A4 */ lwc1 $f6, %lo(D_80A1A5A4)($at) -/* 02534 80A19A44 46066032 */ c.eq.s $f12, $f6 -/* 02538 80A19A48 00000000 */ nop -/* 0253C 80A19A4C 45000008 */ bc1f .L80A19A70 -/* 02540 80A19A50 00000000 */ nop -/* 02544 80A19A54 46026032 */ c.eq.s $f12, $f2 -.L80A19A58: -/* 02548 80A19A58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0254C 80A19A5C 45010004 */ bc1t .L80A19A70 -/* 02550 80A19A60 00000000 */ nop -/* 02554 80A19A64 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02558 80A19A68 24053934 */ addiu $a1, $zero, 0x3934 ## $a1 = 00003934 -/* 0255C 80A19A6C C6020050 */ lwc1 $f2, 0x0050($s0) ## 00000050 -.L80A19A70: -/* 02560 80A19A70 3C0280A2 */ lui $v0, %hi(D_80A1A470) ## $v0 = 80A20000 -/* 02564 80A19A74 2442A470 */ addiu $v0, $v0, %lo(D_80A1A470) ## $v0 = 80A1A470 -/* 02568 80A19A78 84490020 */ lh $t1, 0x0020($v0) ## 80A1A490 -/* 0256C 80A19A7C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 02570 80A19A80 44810000 */ mtc1 $at, $f0 ## $f0 = 100.00 -/* 02574 80A19A84 44894000 */ mtc1 $t1, $f8 ## $f8 = 0.00 -/* 02578 80A19A88 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0257C 80A19A8C 468042A0 */ cvt.s.w $f10, $f8 -/* 02580 80A19A90 46005402 */ mul.s $f16, $f10, $f0 -/* 02584 80A19A94 00000000 */ nop -/* 02588 80A19A98 46028482 */ mul.s $f18, $f16, $f2 -/* 0258C 80A19A9C 4600910D */ trunc.w.s $f4, $f18 -/* 02590 80A19AA0 440B2000 */ mfc1 $t3, $f4 -/* 02594 80A19AA4 00000000 */ nop -/* 02598 80A19AA8 A60B0308 */ sh $t3, 0x0308($s0) ## 00000308 -/* 0259C 80A19AAC 844C0022 */ lh $t4, 0x0022($v0) ## 80A1A492 -/* 025A0 80A19AB0 448C3000 */ mtc1 $t4, $f6 ## $f6 = 0.00 -/* 025A4 80A19AB4 00000000 */ nop -/* 025A8 80A19AB8 46803220 */ cvt.s.w $f8, $f6 -/* 025AC 80A19ABC 46004282 */ mul.s $f10, $f8, $f0 -/* 025B0 80A19AC0 00000000 */ nop -/* 025B4 80A19AC4 46025402 */ mul.s $f16, $f10, $f2 -/* 025B8 80A19AC8 4600848D */ trunc.w.s $f18, $f16 -/* 025BC 80A19ACC 440E9000 */ mfc1 $t6, $f18 -/* 025C0 80A19AD0 00000000 */ nop -/* 025C4 80A19AD4 A60E030A */ sh $t6, 0x030A($s0) ## 0000030A -/* 025C8 80A19AD8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 025CC 80A19ADC AFA40024 */ sw $a0, 0x0024($sp) -/* 025D0 80A19AE0 10400026 */ beq $v0, $zero, .L80A19B7C -/* 025D4 80A19AE4 8FA40024 */ lw $a0, 0x0024($sp) -/* 025D8 80A19AE8 3C0180A2 */ lui $at, %hi(D_80A1A5A8) ## $at = 80A20000 -/* 025DC 80A19AEC C426A5A8 */ lwc1 $f6, %lo(D_80A1A5A8)($at) -/* 025E0 80A19AF0 C6040050 */ lwc1 $f4, 0x0050($s0) ## 00000050 -/* 025E4 80A19AF4 4604303E */ c.le.s $f6, $f4 -/* 025E8 80A19AF8 00000000 */ nop -/* 025EC 80A19AFC 45020013 */ bc1fl .L80A19B4C -/* 025F0 80A19B00 860A0194 */ lh $t2, 0x0194($s0) ## 00000194 -/* 025F4 80A19B04 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 -/* 025F8 80A19B08 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 025FC 80A19B0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02600 80A19B10 01E1C024 */ and $t8, $t7, $at -/* 02604 80A19B14 0C285DDA */ jal func_80A17768 -/* 02608 80A19B18 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 -/* 0260C 80A19B1C 921902F6 */ lbu $t9, 0x02F6($s0) ## 000002F6 -/* 02610 80A19B20 A600001C */ sh $zero, 0x001C($s0) ## 0000001C -/* 02614 80A19B24 3C0980A2 */ lui $t1, %hi(D_80A1A49C) ## $t1 = 80A20000 -/* 02618 80A19B28 37280004 */ ori $t0, $t9, 0x0004 ## $t0 = 00000004 -/* 0261C 80A19B2C A20802F6 */ sb $t0, 0x02F6($s0) ## 000002F6 -/* 02620 80A19B30 9129A49C */ lbu $t1, %lo(D_80A1A49C)($t1) -/* 02624 80A19B34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02628 80A19B38 0C285DF2 */ jal func_80A177C8 -/* 0262C 80A19B3C A20900AF */ sb $t1, 0x00AF($s0) ## 000000AF -/* 02630 80A19B40 1000000F */ beq $zero, $zero, .L80A19B80 -/* 02634 80A19B44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02638 80A19B48 860A0194 */ lh $t2, 0x0194($s0) ## 00000194 -.L80A19B4C: -/* 0263C 80A19B4C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02640 80A19B50 15400007 */ bne $t2, $zero, .L80A19B70 -/* 02644 80A19B54 00000000 */ nop -/* 02648 80A19B58 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0264C 80A19B5C 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop -/* 02650 80A19B60 24A539B0 */ addiu $a1, $a1, 0x39B0 ## $a1 = 060039B0 -/* 02654 80A19B64 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 02658 80A19B68 10000004 */ beq $zero, $zero, .L80A19B7C -/* 0265C 80A19B6C A60B0194 */ sh $t3, 0x0194($s0) ## 00000194 -.L80A19B70: -/* 02660 80A19B70 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop -/* 02664 80A19B74 24A59DB0 */ addiu $a1, $a1, 0x9DB0 ## $a1 = FFFF9DB0 -/* 02668 80A19B78 A6000194 */ sh $zero, 0x0194($s0) ## 00000194 -.L80A19B7C: -/* 0266C 80A19B7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A19B80: -/* 02670 80A19B80 0C00BE5D */ jal func_8002F974 -/* 02674 80A19B84 24053133 */ addiu $a1, $zero, 0x3133 ## $a1 = 00003133 -/* 02678 80A19B88 8FBF001C */ lw $ra, 0x001C($sp) -/* 0267C 80A19B8C 8FB00018 */ lw $s0, 0x0018($sp) -/* 02680 80A19B90 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 02684 80A19B94 03E00008 */ jr $ra -/* 02688 80A19B98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19B9C.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19B9C.s deleted file mode 100644 index 6999c23697..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19B9C.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80A19B9C -/* 0268C 80A19B9C AFA40000 */ sw $a0, 0x0000($sp) -/* 02690 80A19BA0 03E00008 */ jr $ra -/* 02694 80A19BA4 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19BA8.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19BA8.s deleted file mode 100644 index 3f6dcae43f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19BA8.s +++ /dev/null @@ -1,64 +0,0 @@ -.late_rodata -glabel D_80A1A5AC - .word 0x3B83126F - -.text -glabel func_80A19BA8 -/* 02698 80A19BA8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0269C 80A19BAC AFB00018 */ sw $s0, 0x0018($sp) -/* 026A0 80A19BB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 026A4 80A19BB4 AFBF001C */ sw $ra, 0x001C($sp) -/* 026A8 80A19BB8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 026AC 80A19BBC AFA5002C */ sw $a1, 0x002C($sp) -/* 026B0 80A19BC0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 026B4 80A19BC4 AFA40024 */ sw $a0, 0x0024($sp) -/* 026B8 80A19BC8 5040000C */ beql $v0, $zero, .L80A19BFC -/* 026BC 80A19BCC 8FA40024 */ lw $a0, 0x0024($sp) -/* 026C0 80A19BD0 920E00AF */ lbu $t6, 0x00AF($s0) ## 000000AF -/* 026C4 80A19BD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 026C8 80A19BD8 15C00005 */ bne $t6, $zero, .L80A19BF0 -/* 026CC 80A19BDC 00000000 */ nop -/* 026D0 80A19BE0 0C286119 */ jal func_80A18464 -/* 026D4 80A19BE4 8FA5002C */ lw $a1, 0x002C($sp) -/* 026D8 80A19BE8 10000004 */ beq $zero, $zero, .L80A19BFC -/* 026DC 80A19BEC 8FA40024 */ lw $a0, 0x0024($sp) -.L80A19BF0: -/* 026E0 80A19BF0 0C2860C4 */ jal func_80A18310 -/* 026E4 80A19BF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 026E8 80A19BF8 8FA40024 */ lw $a0, 0x0024($sp) -.L80A19BFC: -/* 026EC 80A19BFC 0C0295B2 */ jal func_800A56C8 -/* 026F0 80A19C00 3C054150 */ lui $a1, 0x4150 ## $a1 = 41500000 -/* 026F4 80A19C04 1040000F */ beq $v0, $zero, .L80A19C44 -/* 026F8 80A19C08 3C0180A2 */ lui $at, %hi(D_80A1A5AC) ## $at = 80A20000 -/* 026FC 80A19C0C C424A5AC */ lwc1 $f4, %lo(D_80A1A5AC)($at) -/* 02700 80A19C10 C6060050 */ lwc1 $f6, 0x0050($s0) ## 00000050 -/* 02704 80A19C14 2405387B */ addiu $a1, $zero, 0x387B ## $a1 = 0000387B -/* 02708 80A19C18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0270C 80A19C1C 4606203C */ c.lt.s $f4, $f6 -/* 02710 80A19C20 00000000 */ nop -/* 02714 80A19C24 45000005 */ bc1f .L80A19C3C -/* 02718 80A19C28 00000000 */ nop -/* 0271C 80A19C2C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02720 80A19C30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02724 80A19C34 10000004 */ beq $zero, $zero, .L80A19C48 -/* 02728 80A19C38 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -.L80A19C3C: -/* 0272C 80A19C3C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02730 80A19C40 2405387B */ addiu $a1, $zero, 0x387B ## $a1 = 0000387B -.L80A19C44: -/* 02734 80A19C44 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -.L80A19C48: -/* 02738 80A19C48 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 0273C 80A19C4C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 02740 80A19C50 0C01DE80 */ jal Math_ApproxF - -/* 02744 80A19C54 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 02748 80A19C58 8FBF001C */ lw $ra, 0x001C($sp) -/* 0274C 80A19C5C 8FB00018 */ lw $s0, 0x0018($sp) -/* 02750 80A19C60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02754 80A19C64 03E00008 */ jr $ra -/* 02758 80A19C68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19C6C.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19C6C.s deleted file mode 100644 index 9a47683c80..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19C6C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80A19C6C -/* 0275C 80A19C6C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02760 80A19C70 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02764 80A19C74 AFA40018 */ sw $a0, 0x0018($sp) -/* 02768 80A19C78 AFA5001C */ sw $a1, 0x001C($sp) -/* 0276C 80A19C7C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02770 80A19C80 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02774 80A19C84 50400004 */ beql $v0, $zero, .L80A19C98 -/* 02778 80A19C88 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0277C 80A19C8C 0C285DF2 */ jal func_80A177C8 -/* 02780 80A19C90 8FA40018 */ lw $a0, 0x0018($sp) -/* 02784 80A19C94 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A19C98: -/* 02788 80A19C98 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0278C 80A19C9C 03E00008 */ jr $ra -/* 02790 80A19CA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19CA4.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19CA4.s deleted file mode 100644 index 24755cbff6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19CA4.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80A19CA4 -/* 02794 80A19CA4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02798 80A19CA8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0279C 80A19CAC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 027A0 80A19CB0 AFA5001C */ sw $a1, 0x001C($sp) -/* 027A4 80A19CB4 AFA60018 */ sw $a2, 0x0018($sp) -/* 027A8 80A19CB8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 027AC 80A19CBC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 027B0 80A19CC0 8FA60018 */ lw $a2, 0x0018($sp) -/* 027B4 80A19CC4 84C20194 */ lh $v0, 0x0194($a2) ## 00000194 -/* 027B8 80A19CC8 10400003 */ beq $v0, $zero, .L80A19CD8 -/* 027BC 80A19CCC 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 027C0 80A19CD0 A4CE0194 */ sh $t6, 0x0194($a2) ## 00000194 -/* 027C4 80A19CD4 84C20194 */ lh $v0, 0x0194($a2) ## 00000194 -.L80A19CD8: -/* 027C8 80A19CD8 5440000C */ bnel $v0, $zero, .L80A19D0C -/* 027CC 80A19CDC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 027D0 80A19CE0 90CF00AF */ lbu $t7, 0x00AF($a2) ## 000000AF -/* 027D4 80A19CE4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 027D8 80A19CE8 15E00005 */ bne $t7, $zero, .L80A19D00 -/* 027DC 80A19CEC 00000000 */ nop -/* 027E0 80A19CF0 0C286119 */ jal func_80A18464 -/* 027E4 80A19CF4 8FA5001C */ lw $a1, 0x001C($sp) -/* 027E8 80A19CF8 10000004 */ beq $zero, $zero, .L80A19D0C -/* 027EC 80A19CFC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A19D00: -/* 027F0 80A19D00 0C285DF2 */ jal func_80A177C8 -/* 027F4 80A19D04 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 027F8 80A19D08 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A19D0C: -/* 027FC 80A19D0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02800 80A19D10 03E00008 */ jr $ra -/* 02804 80A19D14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19D18.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19D18.s deleted file mode 100644 index 1c3b28173b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19D18.s +++ /dev/null @@ -1,130 +0,0 @@ -.late_rodata -glabel D_80A1A5B0 - .float 0.01 - -.text -glabel func_80A19D18 -/* 02808 80A19D18 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0280C 80A19D1C AFBF0024 */ sw $ra, 0x0024($sp) -/* 02810 80A19D20 AFB00020 */ sw $s0, 0x0020($sp) -/* 02814 80A19D24 AFA50034 */ sw $a1, 0x0034($sp) -/* 02818 80A19D28 908202D9 */ lbu $v0, 0x02D9($a0) ## 000002D9 -/* 0281C 80A19D2C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02820 80A19D30 260502E0 */ addiu $a1, $s0, 0x02E0 ## $a1 = 000002E0 -/* 02824 80A19D34 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 02828 80A19D38 11C0005D */ beq $t6, $zero, .L80A19EB0 -/* 0282C 80A19D3C 304FFFFD */ andi $t7, $v0, 0xFFFD ## $t7 = 00000000 -/* 02830 80A19D40 A08F02D9 */ sb $t7, 0x02D9($a0) ## 000002D9 -/* 02834 80A19D44 0C00D594 */ jal func_80035650 -/* 02838 80A19D48 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0283C 80A19D4C 921800B1 */ lbu $t8, 0x00B1($s0) ## 000000B1 -/* 02840 80A19D50 57000005 */ bnel $t8, $zero, .L80A19D68 -/* 02844 80A19D54 920802DC */ lbu $t0, 0x02DC($s0) ## 000002DC -/* 02848 80A19D58 921900B0 */ lbu $t9, 0x00B0($s0) ## 000000B0 -/* 0284C 80A19D5C 53200055 */ beql $t9, $zero, .L80A19EB4 -/* 02850 80A19D60 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02854 80A19D64 920802DC */ lbu $t0, 0x02DC($s0) ## 000002DC -.L80A19D68: -/* 02858 80A19D68 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 0285C 80A19D6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02860 80A19D70 1101004F */ beq $t0, $at, .L80A19EB0 -/* 02864 80A19D74 3C0180A2 */ lui $at, %hi(D_80A1A5B0) ## $at = 80A20000 -/* 02868 80A19D78 C426A5B0 */ lwc1 $f6, %lo(D_80A1A5B0)($at) -/* 0286C 80A19D7C C6040050 */ lwc1 $f4, 0x0050($s0) ## 00000050 -/* 02870 80A19D80 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 02874 80A19D84 4606203C */ c.lt.s $f4, $f6 -/* 02878 80A19D88 00000000 */ nop -/* 0287C 80A19D8C 45000002 */ bc1f .L80A19D98 -/* 02880 80A19D90 00000000 */ nop -/* 02884 80A19D94 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L80A19D98: -/* 02888 80A19D98 10600009 */ beq $v1, $zero, .L80A19DC0 -/* 0288C 80A19D9C 00000000 */ nop -/* 02890 80A19DA0 8E090304 */ lw $t1, 0x0304($s0) ## 00000304 -/* 02894 80A19DA4 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 02898 80A19DA8 8D2A0000 */ lw $t2, 0x0000($t1) ## 00000000 -/* 0289C 80A19DAC 314B0080 */ andi $t3, $t2, 0x0080 ## $t3 = 00000000 -/* 028A0 80A19DB0 11600003 */ beq $t3, $zero, .L80A19DC0 -/* 028A4 80A19DB4 00000000 */ nop -/* 028A8 80A19DB8 A20C00B0 */ sb $t4, 0x00B0($s0) ## 000000B0 -/* 028AC 80A19DBC A20000B1 */ sb $zero, 0x00B1($s0) ## 000000B1 -.L80A19DC0: -/* 028B0 80A19DC0 0C00D58A */ jal Actor_ApplyDamage - -/* 028B4 80A19DC4 AFA30028 */ sw $v1, 0x0028($sp) -/* 028B8 80A19DC8 14400012 */ bne $v0, $zero, .L80A19E14 -/* 028BC 80A19DCC 8FA30028 */ lw $v1, 0x0028($sp) -/* 028C0 80A19DD0 10600006 */ beq $v1, $zero, .L80A19DEC -/* 028C4 80A19DD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028C8 80A19DD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028CC 80A19DDC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 028D0 80A19DE0 24053932 */ addiu $a1, $zero, 0x3932 ## $a1 = 00003932 -/* 028D4 80A19DE4 10000004 */ beq $zero, $zero, .L80A19DF8 -/* 028D8 80A19DE8 8FA40034 */ lw $a0, 0x0034($sp) -.L80A19DEC: -/* 028DC 80A19DEC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 028E0 80A19DF0 24053896 */ addiu $a1, $zero, 0x3896 ## $a1 = 00003896 -/* 028E4 80A19DF4 8FA40034 */ lw $a0, 0x0034($sp) -.L80A19DF8: -/* 028E8 80A19DF8 0C00CB1F */ jal func_80032C7C -/* 028EC 80A19DFC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 028F0 80A19E00 8E0D0004 */ lw $t5, 0x0004($s0) ## 00000004 -/* 028F4 80A19E04 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 028F8 80A19E08 01A17024 */ and $t6, $t5, $at -/* 028FC 80A19E0C 10000007 */ beq $zero, $zero, .L80A19E2C -/* 02900 80A19E10 AE0E0004 */ sw $t6, 0x0004($s0) ## 00000004 -.L80A19E14: -/* 02904 80A19E14 920F00B0 */ lbu $t7, 0x00B0($s0) ## 000000B0 -/* 02908 80A19E18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0290C 80A19E1C 51E00004 */ beql $t7, $zero, .L80A19E30 -/* 02910 80A19E20 920200B1 */ lbu $v0, 0x00B1($s0) ## 000000B1 -/* 02914 80A19E24 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02918 80A19E28 24053895 */ addiu $a1, $zero, 0x3895 ## $a1 = 00003895 -.L80A19E2C: -/* 0291C 80A19E2C 920200B1 */ lbu $v0, 0x00B1($s0) ## 000000B1 -.L80A19E30: -/* 02920 80A19E30 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 02924 80A19E34 10410003 */ beq $v0, $at, .L80A19E44 -/* 02928 80A19E38 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0292C 80A19E3C 5441000B */ bnel $v0, $at, .L80A19E6C -/* 02930 80A19E40 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -.L80A19E44: -/* 02934 80A19E44 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 -/* 02938 80A19E48 3C1880A2 */ lui $t8, %hi(func_80A19CA4) ## $t8 = 80A20000 -/* 0293C 80A19E4C 27189CA4 */ addiu $t8, $t8, %lo(func_80A19CA4) ## $t8 = 80A19CA4 -/* 02940 80A19E50 53190018 */ beql $t8, $t9, .L80A19EB4 -/* 02944 80A19E54 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02948 80A19E58 0C2860D9 */ jal func_80A18364 -/* 0294C 80A19E5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02950 80A19E60 10000014 */ beq $zero, $zero, .L80A19EB4 -/* 02954 80A19E64 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02958 80A19E68 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -.L80A19E6C: -/* 0295C 80A19E6C 1441000E */ bne $v0, $at, .L80A19EA8 -/* 02960 80A19E70 3C01457A */ lui $at, 0x457A ## $at = 457A0000 -/* 02964 80A19E74 44815000 */ mtc1 $at, $f10 ## $f10 = 4000.00 -/* 02968 80A19E78 C6080050 */ lwc1 $f8, 0x0050($s0) ## 00000050 -/* 0296C 80A19E7C 8FA40034 */ lw $a0, 0x0034($sp) -/* 02970 80A19E80 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02974 80A19E84 460A4402 */ mul.s $f16, $f8, $f10 -/* 02978 80A19E88 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 0297C 80A19E8C 4600848D */ trunc.w.s $f18, $f16 -/* 02980 80A19E90 44079000 */ mfc1 $a3, $f18 -/* 02984 80A19E94 00000000 */ nop -/* 02988 80A19E98 00073C00 */ sll $a3, $a3, 16 -/* 0298C 80A19E9C 00073C03 */ sra $a3, $a3, 16 -/* 02990 80A19EA0 0C00A997 */ jal func_8002A65C -/* 02994 80A19EA4 AFA70010 */ sw $a3, 0x0010($sp) -.L80A19EA8: -/* 02998 80A19EA8 0C286095 */ jal func_80A18254 -/* 0299C 80A19EAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A19EB0: -/* 029A0 80A19EB0 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A19EB4: -/* 029A4 80A19EB4 8FB00020 */ lw $s0, 0x0020($sp) -/* 029A8 80A19EB8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 029AC 80A19EBC 03E00008 */ jr $ra -/* 029B0 80A19EC0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A128.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A128.s deleted file mode 100644 index 6bc8263581..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A128.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80A1A128 -/* 02C18 80A1A128 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02C1C 80A1A12C AFA40000 */ sw $a0, 0x0000($sp) -/* 02C20 80A1A130 14A10009 */ bne $a1, $at, .L80A1A158 -/* 02C24 80A1A134 AFA60008 */ sw $a2, 0x0008($sp) -/* 02C28 80A1A138 8FAE0014 */ lw $t6, 0x0014($sp) -/* 02C2C 80A1A13C C4E40008 */ lwc1 $f4, 0x0008($a3) ## 00000008 -/* 02C30 80A1A140 85CF0198 */ lh $t7, 0x0198($t6) ## 00000198 -/* 02C34 80A1A144 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 02C38 80A1A148 00000000 */ nop -/* 02C3C 80A1A14C 46803220 */ cvt.s.w $f8, $f6 -/* 02C40 80A1A150 46082280 */ add.s $f10, $f4, $f8 -/* 02C44 80A1A154 E4EA0008 */ swc1 $f10, 0x0008($a3) ## 00000008 -.L80A1A158: -/* 02C48 80A1A158 03E00008 */ jr $ra -/* 02C4C 80A1A15C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A160.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A160.s deleted file mode 100644 index e5531d1ccb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A160.s +++ /dev/null @@ -1,75 +0,0 @@ -.rdata -glabel D_80A1A500 - .asciz "../z_en_floormas.c" - .balign 4 - -.late_rodata -glabel D_80A1A5BC - .word 0x3F860A92 -glabel D_80A1A5C0 - .word 0x3E860A92, 0x00000000, 0x00000000, 0x00000000 - -.text -glabel func_80A1A160 -/* 02C50 80A1A160 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02C54 80A1A164 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02C58 80A1A168 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02C5C 80A1A16C AFA40020 */ sw $a0, 0x0020($sp) -/* 02C60 80A1A170 AFA60028 */ sw $a2, 0x0028($sp) -/* 02C64 80A1A174 14A10033 */ bne $a1, $at, .L80A1A244 -/* 02C68 80A1A178 AFA7002C */ sw $a3, 0x002C($sp) -/* 02C6C 80A1A17C 0C034213 */ jal Matrix_Push -/* 02C70 80A1A180 00000000 */ nop -/* 02C74 80A1A184 3C0144C8 */ lui $at, 0x44C8 ## $at = 44C80000 -/* 02C78 80A1A188 44816000 */ mtc1 $at, $f12 ## $f12 = 1600.00 -/* 02C7C 80A1A18C 3C01C42F */ lui $at, 0xC42F ## $at = C42F0000 -/* 02C80 80A1A190 44817000 */ mtc1 $at, $f14 ## $f14 = -700.00 -/* 02C84 80A1A194 3C06C4D4 */ lui $a2, 0xC4D4 ## $a2 = C4D40000 -/* 02C88 80A1A198 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = C4D48000 -/* 02C8C 80A1A19C 0C034261 */ jal Matrix_Translate -/* 02C90 80A1A1A0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02C94 80A1A1A4 3C0180A2 */ lui $at, %hi(D_80A1A5BC) ## $at = 80A20000 -/* 02C98 80A1A1A8 C42CA5BC */ lwc1 $f12, %lo(D_80A1A5BC)($at) -/* 02C9C 80A1A1AC 0C034348 */ jal Matrix_RotateY -/* 02CA0 80A1A1B0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02CA4 80A1A1B4 3C0180A2 */ lui $at, %hi(D_80A1A5C0) ## $at = 80A20000 -/* 02CA8 80A1A1B8 C42CA5C0 */ lwc1 $f12, %lo(D_80A1A5C0)($at) -/* 02CAC 80A1A1BC 0C0343B5 */ jal Matrix_RotateZ -/* 02CB0 80A1A1C0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02CB4 80A1A1C4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 02CB8 80A1A1C8 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 02CBC 80A1A1CC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02CC0 80A1A1D0 44066000 */ mfc1 $a2, $f12 -/* 02CC4 80A1A1D4 0C0342A3 */ jal Matrix_Scale -/* 02CC8 80A1A1D8 46006386 */ mov.s $f14, $f12 -/* 02CCC 80A1A1DC 8FA70034 */ lw $a3, 0x0034($sp) -/* 02CD0 80A1A1E0 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 -/* 02CD4 80A1A1E4 35EF0003 */ ori $t7, $t7, 0x0003 ## $t7 = DA380003 -/* 02CD8 80A1A1E8 8CE20000 */ lw $v0, 0x0000($a3) ## 00000000 -/* 02CDC 80A1A1EC 3C0580A2 */ lui $a1, %hi(D_80A1A500) ## $a1 = 80A20000 -/* 02CE0 80A1A1F0 24A5A500 */ addiu $a1, $a1, %lo(D_80A1A500) ## $a1 = 80A1A500 -/* 02CE4 80A1A1F4 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 02CE8 80A1A1F8 ACEE0000 */ sw $t6, 0x0000($a3) ## 00000000 -/* 02CEC 80A1A1FC AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 02CF0 80A1A200 8FB80020 */ lw $t8, 0x0020($sp) -/* 02CF4 80A1A204 240608FB */ addiu $a2, $zero, 0x08FB ## $a2 = 000008FB -/* 02CF8 80A1A208 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 -/* 02CFC 80A1A20C 0C0346A2 */ jal Matrix_NewMtx -/* 02D00 80A1A210 AFA2001C */ sw $v0, 0x001C($sp) -/* 02D04 80A1A214 8FA3001C */ lw $v1, 0x001C($sp) -/* 02D08 80A1A218 8FA70034 */ lw $a3, 0x0034($sp) -/* 02D0C 80A1A21C 3C090601 */ lui $t1, 0x0601 ## $t1 = 06010000 -/* 02D10 80A1A220 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 02D14 80A1A224 8CE20000 */ lw $v0, 0x0000($a3) ## 00000000 -/* 02D18 80A1A228 25298688 */ addiu $t1, $t1, 0x8688 ## $t1 = 06008688 -/* 02D1C 80A1A22C 3C08DE00 */ lui $t0, 0xDE00 ## $t0 = DE000000 -/* 02D20 80A1A230 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 02D24 80A1A234 ACF90000 */ sw $t9, 0x0000($a3) ## 00000000 -/* 02D28 80A1A238 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 02D2C 80A1A23C 0C034221 */ jal Matrix_Pull -/* 02D30 80A1A240 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -.L80A1A244: -/* 02D34 80A1A244 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02D38 80A1A248 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02D3C 80A1A24C 03E00008 */ jr $ra -/* 02D40 80A1A250 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A350.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A350.s deleted file mode 100644 index 3cb87446ae..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A350.s +++ /dev/null @@ -1,77 +0,0 @@ -.rdata -glabel D_80A1A53C - .asciz "../z_en_floormas.c" - .balign 4 - -glabel D_80A1A550 - .asciz "../z_en_floormas.c" - .balign 4 - -.text -glabel func_80A1A350 -/* 02E40 80A1A350 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 02E44 80A1A354 AFB10028 */ sw $s1, 0x0028($sp) -/* 02E48 80A1A358 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02E4C 80A1A35C AFBF002C */ sw $ra, 0x002C($sp) -/* 02E50 80A1A360 AFB00024 */ sw $s0, 0x0024($sp) -/* 02E54 80A1A364 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 02E58 80A1A368 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02E5C 80A1A36C 3C0680A2 */ lui $a2, %hi(D_80A1A53C) ## $a2 = 80A20000 -/* 02E60 80A1A370 24C6A53C */ addiu $a2, $a2, %lo(D_80A1A53C) ## $a2 = 80A1A53C -/* 02E64 80A1A374 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 -/* 02E68 80A1A378 24070930 */ addiu $a3, $zero, 0x0930 ## $a3 = 00000930 -/* 02E6C 80A1A37C 0C031AB1 */ jal Graph_OpenDisps -/* 02E70 80A1A380 AFA50048 */ sw $a1, 0x0048($sp) -/* 02E74 80A1A384 0C024F61 */ jal func_80093D84 -/* 02E78 80A1A388 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 02E7C 80A1A38C 920E02DC */ lbu $t6, 0x02DC($s0) ## 000002DC -/* 02E80 80A1A390 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 02E84 80A1A394 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02E88 80A1A398 15C1000A */ bne $t6, $at, .L80A1A3C4 -/* 02E8C 80A1A39C 3C0580A2 */ lui $a1, %hi(D_80A1A4F4) ## $a1 = 80A20000 -/* 02E90 80A1A3A0 86060196 */ lh $a2, 0x0196($s0) ## 00000196 -/* 02E94 80A1A3A4 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 02E98 80A1A3A8 24A5A4F4 */ addiu $a1, $a1, %lo(D_80A1A4F4) ## $a1 = 80A1A4F4 -/* 02E9C 80A1A3AC 00C1001A */ div $zero, $a2, $at -/* 02EA0 80A1A3B0 00003010 */ mfhi $a2 -/* 02EA4 80A1A3B4 00063400 */ sll $a2, $a2, 16 -/* 02EA8 80A1A3B8 00063403 */ sra $a2, $a2, 16 -/* 02EAC 80A1A3BC 0C0099A4 */ jal func_80026690 -/* 02EB0 80A1A3C0 24070028 */ addiu $a3, $zero, 0x0028 ## $a3 = 00000028 -.L80A1A3C4: -/* 02EB4 80A1A3C4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 02EB8 80A1A3C8 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 02EBC 80A1A3CC 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 02EC0 80A1A3D0 8FB90048 */ lw $t9, 0x0048($sp) -/* 02EC4 80A1A3D4 3C0F80A2 */ lui $t7, %hi(func_80A1A128) ## $t7 = 80A20000 -/* 02EC8 80A1A3D8 3C1880A2 */ lui $t8, %hi(func_80A1A160) ## $t8 = 80A20000 -/* 02ECC 80A1A3DC 2718A160 */ addiu $t8, $t8, %lo(func_80A1A160) ## $t8 = 80A1A160 -/* 02ED0 80A1A3E0 25EFA128 */ addiu $t7, $t7, %lo(func_80A1A128) ## $t7 = 80A1A128 -/* 02ED4 80A1A3E4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 02ED8 80A1A3E8 AFB80014 */ sw $t8, 0x0014($sp) -/* 02EDC 80A1A3EC AFB00018 */ sw $s0, 0x0018($sp) -/* 02EE0 80A1A3F0 8F2802D0 */ lw $t0, 0x02D0($t9) ## 000002D0 -/* 02EE4 80A1A3F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02EE8 80A1A3F8 0C0289CF */ jal SkelAnime_DrawSV2 -/* 02EEC 80A1A3FC AFA8001C */ sw $t0, 0x001C($sp) -/* 02EF0 80A1A400 8FA90048 */ lw $t1, 0x0048($sp) -/* 02EF4 80A1A404 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 02EF8 80A1A408 AD2202D0 */ sw $v0, 0x02D0($t1) ## 000002D0 -/* 02EFC 80A1A40C 920A02DC */ lbu $t2, 0x02DC($s0) ## 000002DC -/* 02F00 80A1A410 15410003 */ bne $t2, $at, .L80A1A420 -/* 02F04 80A1A414 00000000 */ nop -/* 02F08 80A1A418 0C009A9B */ jal func_80026A6C -/* 02F0C 80A1A41C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80A1A420: -/* 02F10 80A1A420 3C0680A2 */ lui $a2, %hi(D_80A1A550) ## $a2 = 80A20000 -/* 02F14 80A1A424 24C6A550 */ addiu $a2, $a2, %lo(D_80A1A550) ## $a2 = 80A1A550 -/* 02F18 80A1A428 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 -/* 02F1C 80A1A42C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 02F20 80A1A430 0C031AD5 */ jal Graph_CloseDisps -/* 02F24 80A1A434 24070946 */ addiu $a3, $zero, 0x0946 ## $a3 = 00000946 -/* 02F28 80A1A438 8FBF002C */ lw $ra, 0x002C($sp) -/* 02F2C 80A1A43C 8FB00024 */ lw $s0, 0x0024($sp) -/* 02F30 80A1A440 8FB10028 */ lw $s1, 0x0028($sp) -/* 02F34 80A1A444 03E00008 */ jr $ra -/* 02F38 80A1A448 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 02F3C 80A1A44C 00000000 */ nop diff --git a/include/functions.h b/include/functions.h index c28dbcaa23..40d3769475 100644 --- a/include/functions.h +++ b/include/functions.h @@ -183,10 +183,12 @@ void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3 // ? func_80022A10(?); // ? func_8002389C(?); void func_80024F0C(UNK_TYPE); +void func_80026230(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 arg3); void func_80026400(GlobalContext*, Color_RGBA8*, u8, s16); -// ? func_80026608(?); +void func_80026608(GlobalContext*); +void func_80026690(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 arg3); void func_80026860(GlobalContext*, Color_RGBA8*, u8, s16); -// ? func_80026A6C(?); +void func_80026A6C(GlobalContext* globalCtx); GlobalContext* func_80026B00(void); // ? func_80026B0C(?); // ? func_80026C1C(?); @@ -237,7 +239,7 @@ void func_80029CA4(GlobalContext* globalCtx, s32 a, Vec3f* pos); // ? func_80029F44(?); // ? func_8002A32C(?); // ? func_8002A3C4(?); -void func_8002A65C(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, u32 arg3, u32 arg4); +void func_8002A65C(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, s16 arg3, s16 arg4); void func_8002A6B8(GlobalContext* globalCtx, Vec3f* pos, Vec3f* arg2, Vec3f* arg3, u32 arg4, s32 arg5, u32 arg6, u32 arg7, u32 arg8, u32 arg9, u32 arg10, u32 arg11, u32 arg12, u32 arg13, u32 arg14, u32 arg15); // ? func_8002A894(?); diff --git a/include/math.h b/include/math.h index 511e8830ed..48331dad7e 100644 --- a/include/math.h +++ b/include/math.h @@ -6,6 +6,7 @@ #define FLT_MAX 340282346638528859811704183484516925440.0f #define SHT_MAX 32767.0f #define SHT_MINV (1.0f / SHT_MAX) +#define DEGTORAD(x) (x * M_PI / 180.0f) float sinf(float); double sin(double); diff --git a/include/sfx.h b/include/sfx.h index cf97e3cb80..30069a5c42 100644 --- a/include/sfx.h +++ b/include/sfx.h @@ -627,6 +627,8 @@ #define NA_SE_EV_YOBI24 0x2917 #define NA_SE_EV_YOBI25 0x2918 //------------ENEMY------------ +#define NA_SE_EN_FLOORMASTER_SLIDING 0x3034 +#define NA_SE_EN_FLOORMASTER_SM_STICK 0x3136 #define NA_SE_EN_DODO_J_WALK 0x3800 #define NA_SE_EN_DODO_J_CRY 0x3801 #define NA_SE_EN_DODO_J_FIRE 0x3802 @@ -679,7 +681,6 @@ #define NA_SE_EN_STALKID_ATTACK 0x3831 #define NA_SE_EN_STALKID_DAMAGE 0x3832 #define NA_SE_EN_STALKID_DEAD 0x3833 -#define NA_SE_EN_FLOORMASTER_SLIDING 0x3834 #define NA_SE_EN_TEKU_WALK_WATER 0x3835 #define NA_SE_EN_LIGHT_ARROW_HIT 0x3836 #define NA_SE_EN_TUBOOCK_FLY 0x3837 @@ -937,7 +938,6 @@ #define NA_SE_EN_FLOORMASTER_RESTORE 0x3933 #define NA_SE_EN_FLOORMASTER_EXPAND 0x3934 #define NA_SE_EN_FLOORMASTER_SPLIT 0x3935 -#define NA_SE_EN_FLOORMASTER_SM_STICK 0x3936 #define NA_SE_EN_FLOORMASTER_SM_LAND 0x3937 #define NA_SE_EN_IRONNACK_WAVE_DEMO 0x3938 #define NA_SE_EN_IRONNACK_FINGER_DEMO 0x3939 diff --git a/include/z64.h b/include/z64.h index e76f55c200..19927ce0ee 100644 --- a/include/z64.h +++ b/include/z64.h @@ -1047,7 +1047,9 @@ typedef struct GlobalContext { /* 0x11D30 */ s16 unk_11D30[2]; /* 0x11D34 */ u8 nbTransitionActors; /* 0x11D38 */ TransitionActorEntry* transitionActorList; - /* 0x11D3C */ char unk_11D3C[0x1C]; + /* 0x11D3C */ char unk_11D3C[0x10]; + /* 0x11D4C */ void (*unk_11D4C)(struct GlobalContext*, Actor*); + /* 0x11D50 */ char unk_11D50[0x8]; /* 0x11D58 */ void (*unk_11D58)(struct GlobalContext*, s32); /* 0x11D5C */ char unk_11D5C[0x4]; /* 0x11D60 */ MtxF mf_11D60; diff --git a/include/z64actor.h b/include/z64actor.h index b0d22ba82f..3e3c655c90 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -125,7 +125,7 @@ typedef struct Actor { /* 0x078 */ CollisionPoly* floorPoly; // Floor polygon an actor is over/touching /* 0x07C */ u8 wallPolySource; // Complex Poly Surface Source. 0x32 = Scene /* 0x07D */ u8 floorPolySource; // Complex Poly Surface Source. 0x32 = Scene. related to 0x80/88 - /* 0x07E */ s16 unk_7E; + /* 0x07E */ s16 wallPolyRot; // Rotation of the wall poly /* 0x080 */ f32 unk_80; // Floor poly height? /* 0x084 */ f32 unk_84; /* 0x088 */ u16 bgCheckFlags; diff --git a/spec b/spec index 4f5ac168ff..031d3b4467 100644 --- a/spec +++ b/spec @@ -2485,8 +2485,7 @@ endseg beginseg name "ovl_En_Floormas" include "build/src/overlays/actors/ovl_En_Floormas/z_en_floormas.o" - include "build/data/overlays/actors/z_en_floormas.data.o" - include "build/data/overlays/actors/z_en_floormas.reloc.o" + include "build/src/overlays/actors/ovl_En_Floormas/z_en_floormas_reloc.o" endseg beginseg diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 250402d451..97cd22c7ce 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -1253,7 +1253,7 @@ void func_8002E4B4(GlobalContext* globalCtx, Actor* actor, f32 arg2, f32 arg3, f &actor->wallPoly, &sp60, actor, arg2))) { sp5C = actor->wallPoly; Math_Vec3f_Copy(&actor->posRot.pos, &sp64); - actor->unk_7E = atan2s(sp5C->norm.z, sp5C->norm.x); + actor->wallPolyRot = atan2s(sp5C->norm.z, sp5C->norm.x); actor->bgCheckFlags |= 8; actor->wallPolySource = sp60; } else { diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index 3358876b9a..2e7266d05d 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -273,7 +273,8 @@ void func_8001D4A8(EnAObj* this, GlobalContext* globalCtx) { if ((this->dyna.actor.speedXZ != 0.0f) && (this->dyna.actor.bgCheckFlags & 0x8)) { if (1) { // Necessary to match this->dyna.actor.posRot.rot.y = - ((this->dyna.actor.unk_7E - this->dyna.actor.posRot.rot.y) + this->dyna.actor.unk_7E) - 0x8000; + ((this->dyna.actor.wallPolyRot - this->dyna.actor.posRot.rot.y) + this->dyna.actor.wallPolyRot) - + 0x8000; } this->dyna.actor.bgCheckFlags &= ~0x8; } diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index 1a8eb4b4e2..c6fce77cbc 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -1,131 +1,1140 @@ +/* + * File: z_en_floormas + * Overlay: En_Floormas + * Description: Floormaster + */ + #include "z_en_floormas.h" #define FLAGS 0x00000405 #define THIS ((EnFloormas*)thisx) +#define SPAWN_INVISIBLE 0x8000 +#define SPAWN_SMALL 0x10 + +// Merge params +#define MERGE_MASTER 0x40 +#define MERGE_SLAVE 0x20 + void EnFloormas_Init(Actor* thisx, GlobalContext* globalCtx); void EnFloormas_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnFloormas_Update(Actor* thisx, GlobalContext* globalCtx); void EnFloormas_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void EnFloormas_GrabLink(EnFloormas* this, GlobalContext* globalCtx); +void EnFloormas_Split(EnFloormas* this, GlobalContext* globalCtx); +void EnFloormas_Recover(EnFloormas* this, GlobalContext* globalCtx); +void EnFloormas_DrawHighlighted(Actor* this, GlobalContext* globalCtx); +void EnFloormas_SmWait(EnFloormas* this, GlobalContext* globalCtx); +void EnFloormas_BigDecideActionBegin(EnFloormas* this); +void EnFloormas_Freeze(EnFloormas* this, GlobalContext* globalCtx); +void EnFloormas_TakeDamage(EnFloormas* this, GlobalContext* globalCtx); +void EnFloormas_Merge(EnFloormas* this, GlobalContext* globalCtx); +void EnFloormas_JumpAtLink(EnFloormas* this, GlobalContext* globalCtx); +void EnFloormas_SmSlaveJumpAtMaster(EnFloormas* this, GlobalContext* globalCtx); +void EnFloormas_SmShrink(EnFloormas* this, GlobalContext* globalCtx); +void EnFloormas_SmDecideAction(EnFloormas* this, GlobalContext* globalCtx); +void EnFloormas_SmWalk(EnFloormas* this, GlobalContext* globalCtx); +void EnFloormas_Land(EnFloormas* this, GlobalContext* globalCtx); +void EnFloormas_Hover(EnFloormas* this, GlobalContext* globalCtx); +void EnFloormas_Turn(EnFloormas* this, GlobalContext* globalCtx); +void EnFloormas_Run(EnFloormas* this, GlobalContext* globalCtx); +void EnFloormas_BigStopWalk(EnFloormas* this, GlobalContext* globalCtx); +void EnFloormas_BigWalk(EnFloormas* this, GlobalContext* globalCtx); +void EnFloormas_Stand(EnFloormas* this, GlobalContext* globalCtx); +void EnFloormas_BigDecideAction(EnFloormas* this, GlobalContext* globalCtx); +void EnFloormas_Charge(EnFloormas* this, GlobalContext* globalCtx); + const ActorInit En_Floormas_InitVars = { ACTOR_EN_FLOORMAS, ACTORTYPE_ENEMY, FLAGS, OBJECT_WALLMASTER, sizeof(EnFloormas), - (ActorFunc)EnFloormas_Init, - (ActorFunc)EnFloormas_Destroy, - (ActorFunc)EnFloormas_Update, - (ActorFunc)EnFloormas_Draw, + EnFloormas_Init, + EnFloormas_Destroy, + EnFloormas_Update, + EnFloormas_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Destroy.s") +static ColliderCylinderInit cylinderInit = { + { COLTYPE_UNK0, 0x11, 0x09, 0x39, 0x10, COLSHAPE_CYLINDER }, + { 0x00, { 0xFFCFFFFF, 0x04, 0x10 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x09, 0x05, 0x01 }, + { 25, 40, 0, { 0, 0, 0 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17748.s") +static CollisionCheckInfoInit colCheckInfoInit = { 0x04, 0x001E, 0x0028, 0x96 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17768.s") +static DamageTable damageTable = { { + 0x10, 0x02, 0x01, 0x02, 0x10, 0x02, 0x02, 0x10, 0x01, 0x02, 0x04, 0x24, 0x02, 0x44, 0x04, 0x02, + 0x02, 0x24, 0x00, 0x44, 0x00, 0x00, 0x01, 0x04, 0x02, 0x02, 0x08, 0x04, 0x00, 0x00, 0x04, 0x00, +} }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17780.s") +static InitChainEntry initChain[] = { + ICHAIN_S8(naviEnemyId, 0x31, ICHAIN_CONTINUE), + ICHAIN_F32(unk_4C, 0x157C, ICHAIN_CONTINUE), + ICHAIN_F32_DIV1000(gravity, 0xFC18, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A177C8.s") +static Vec3f D_80A1A4D0 = { + 0.0f, + 0.0f, + 0.0f, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17808.s") +static Vec3f D_80A1A4DC = { + 0.0f, + 0.0f, + 0.0f, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17894.s") +static Vec3f dustPos = { + 0.0f, + 0.0f, + 0.0f +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A178DC.s") +static Color_RGBA8 mergeColor = { + 0x00, + 0xFF, + 0x00, + 0x00, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17908.s") +// display lists +extern Gfx D_06008688[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17A38.s") +// skeleton +extern SkeletonHeader D_06008FB0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17B10.s") +// animations +extern AnimationHeader D_06009DB0; +extern AnimationHeader D_060039B0; +extern AnimationHeader D_06000EA4; +extern AnimationHeader D_06000590; +extern AnimationHeader D_060019CC; +extern AnimationHeader D_06009520; +extern AnimationHeader D_06002158; +extern AnimationHeader D_0600A054; +extern AnimationHeader D_060041F4; +extern AnimationHeader D_06009244; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17B40.s") +void EnFloormas_Init(Actor* thisx, GlobalContext* globalCtx) { + EnFloormas* this = THIS; + GlobalContext* gctx = globalCtx; + s32 invisble; + s32 pad; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17BEC.s") + Actor_ProcessInitChain(&this->actor, initChain); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 50.0f); + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06008FB0, &D_06009DB0, &this->limbDrawTable, &this->transitionDrawTable, + 25); + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &cylinderInit); + func_80061ED4(&this->actor.colChkInfo, &damageTable, &colCheckInfoInit); + this->zOffset = -1600; + invisble = this->actor.params & SPAWN_INVISIBLE; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D4C.s") + // s16 cast needed + this->actor.params &= (s16)~(SPAWN_INVISIBLE); + if (invisble) { + this->actor.flags |= 0x80; + this->actor.draw = EnFloormas_DrawHighlighted; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D9C.s") + if (this->actor.params == SPAWN_SMALL) { + this->actor.draw = NULL; + this->actor.flags &= ~1; + this->actionFunc = EnFloormas_SmWait; + } else { + // spawn first small floormaster + this->actor.attachedA = + Actor_Spawn(&gctx->actorCtx, gctx, ACTOR_EN_FLOORMAS, this->actor.posRot.pos.x, this->actor.posRot.pos.y, + this->actor.posRot.pos.z, 0, 0, 0, invisble + SPAWN_SMALL); + if (this->actor.attachedA == NULL) { + Actor_Kill(&this->actor); + return; + } + // spawn 2nd small floormaster + this->actor.attachedB = + Actor_Spawn(&gctx->actorCtx, gctx, ACTOR_EN_FLOORMAS, this->actor.posRot.pos.x, this->actor.posRot.pos.y, + this->actor.posRot.pos.z, 0, 0, 0, invisble + SPAWN_SMALL); + if (this->actor.attachedB == NULL) { + Actor_Kill(this->actor.attachedA); + Actor_Kill(&this->actor); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17DFC.s") + // link floormasters together + this->actor.attachedA->attachedB = &this->actor; + this->actor.attachedA->attachedA = this->actor.attachedB; + this->actor.attachedB->attachedA = &this->actor; + this->actor.attachedB->attachedB = this->actor.attachedA; + EnFloormas_BigDecideActionBegin(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17ED4.s") +void EnFloormas_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnFloormas* this = THIS; + ColliderCylinder* col = &this->collider; + Collider_DestroyCylinder(globalCtx, col); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17F3C.s") +void EnFloormas_MakeInvulnerable(EnFloormas* this) { + this->collider.base.type = COLTYPE_UNK12; + this->collider.base.acFlags |= 4; + this->actionTarget = 0x28; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17FA4.s") +void EnFloormas_MakeVulnerable(EnFloormas* this) { + this->collider.base.type = COLTYPE_UNK0; + this->actionTarget = 0; + this->collider.base.acFlags &= ~4; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1817C.s") +void EnFloormas_BigDecideActionBegin(EnFloormas* this) { + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_06009DB0); + this->actionFunc = EnFloormas_BigDecideAction; + this->actor.speedXZ = 0.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A181D4.s") +void EnFloormas_StandBegin(EnFloormas* this) { + SkelAnime_ChangeAnimTransitionStop(&this->skelAnime, &D_0600A054, -3.0f); + this->actionFunc = EnFloormas_Stand; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18254.s") +void EnFloormas_BigWalkBegin(EnFloormas* this) { + if (this->actionFunc != EnFloormas_Run) { + SkelAnime_ChangeAnimPlaybackRepeat(&this->skelAnime, &D_060041F4, 1.5f); + } else { + this->skelAnime.animPlaybackSpeed = 1.5f; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18310.s") + this->actionTimer = Math_Rand_S16Offset(2, 4); + this->actionFunc = EnFloormas_BigWalk; + this->actor.speedXZ = 1.5f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18364.s") +void EnFloormas_BigStopWalkBegin(EnFloormas* this) { + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_06009244); + this->actionFunc = EnFloormas_BigStopWalk; + this->actor.speedXZ = 0.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18464.s") +void EnFloormas_RunBegin(EnFloormas* this) { + this->actionTimer = 0; + this->actionFunc = EnFloormas_Run; + this->actor.speedXZ = 5.0f; + this->skelAnime.animPlaybackSpeed = 3.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18500.s") +void EnFloormas_TurnBegin(EnFloormas* this) { + s16 rotDelta = this->actionTarget - this->actor.shape.rot.y; + this->actor.speedXZ = 0.0f; + if (rotDelta > 0) { + SkelAnime_ChangeAnimTransitionStop(&this->skelAnime, &D_06002158, -3.0f); + } else { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06002158, -1.0f, SkelAnime_GetFrameCount(&D_06002158), 0.0f, 2, + -3.0f); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A185C4.s") + if (this->actor.scale.x > 0.004f) { + this->actionTarget = (rotDelta * (2.0f / 30.0f)); + } else { + this->skelAnime.animPlaybackSpeed = this->skelAnime.animPlaybackSpeed + this->skelAnime.animPlaybackSpeed; + this->actionTarget = rotDelta * (2.0f / 15.0f); + } + this->actionFunc = EnFloormas_Turn; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18650.s") +void EnFloormas_HoverBegin(EnFloormas* this, GlobalContext* globalCtx) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06009520, 3.0f, 0, SkelAnime_GetFrameCount(&D_06009520), 2, -3.0f); + this->actor.speedXZ = 0.0f; + this->actor.gravity = 0.0f; + EnFloormas_MakeInvulnerable(this); + func_80033260(globalCtx, &this->actor, &this->actor.posRot.pos, 15.0f, 6, 20.0f, 0x12C, 0x64, 1); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_FLOORMASTER_ATTACK); + this->actionFunc = EnFloormas_Hover; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A187AC.s") +void EnFloormas_ChargeBegin(EnFloormas* this) { + this->actionTimer = 25; + this->actor.gravity = -0.15f; + this->actionFunc = EnFloormas_Charge; + this->actor.speedXZ = 0.5f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A187E4.s") +void EnFloormas_LandBegin(EnFloormas* this) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_060019CC, 1.0f, 41.0f, 42.0f, 2, 5.0f); + if ((this->actor.speedXZ < 0.0f) || (this->actionFunc != EnFloormas_Charge)) { + this->actionTimer = 30; + } else { + this->actionTimer = 45; + } + this->actor.gravity = -1.0f; + this->actionFunc = EnFloormas_Land; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A188F0.s") +void EnFloormas_SplitBegin(EnFloormas* this) { -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18AB4.s") + Actor_SetScale(&this->actor, 0.004f); + this->actor.flags |= 0x10; + if ((this->actor.flags & 0x80) == 0x80) { + this->actor.draw = EnFloormas_DrawHighlighted; + } else { + this->actor.draw = EnFloormas_Draw; + } + this->actor.shape.rot.y = this->actor.attachedA->shape.rot.y + 0x5555; + this->actor.posRot.pos = this->actor.attachedA->posRot.pos; + this->actor.params = 0x10; + SkelAnime_ChangeAnim(&this->skelAnime, &D_060019CC, 1.0f, 41.0f, SkelAnime_GetFrameCount(&D_060019CC), 2, 0.0f); + this->collider.dim.radius = cylinderInit.dim.radius * 0.6f; + this->collider.dim.height = cylinderInit.dim.height * 0.6f; + this->collider.body.bumperFlags &= ~4; + this->actor.speedXZ = 4.0f; + this->actor.velocity.y = 7.0f; + // using div creates a signed check. + this->actor.colChkInfo.health = colCheckInfoInit.health >> 1; + this->actionFunc = EnFloormas_Split; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18B38.s") +void EnFloormas_SmWalkBegin(EnFloormas* this) { + SkelAnime_ChangeAnimPlaybackRepeat(&this->skelAnime, &D_060041F4, 4.5f); + this->actionFunc = EnFloormas_SmWalk; + this->actor.speedXZ = 5.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18C78.s") +void EnFloormas_SmDecideActionBegin(EnFloormas* this) { + if (this->actionFunc != EnFloormas_SmWalk) { + SkelAnime_ChangeAnimPlaybackRepeat(&this->skelAnime, &D_060041F4, 4.5f); + } + this->actionFunc = EnFloormas_SmDecideAction; + this->actor.speedXZ = 5.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18D68.s") +void EnFloormas_SmShrinkBegin(EnFloormas* this, GlobalContext* globalCtx) { + Vec3f pos; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18F50.s") + this->actor.speedXZ = 0.0f; + this->actor.velocity.y = 0.0f; + pos.x = this->actor.posRot.pos.x; + pos.y = this->actor.posRot.pos.y + 15.0f; + pos.z = this->actor.posRot.pos.z; + func_8002A6B8(globalCtx, &pos, &D_80A1A4D0, &D_80A1A4DC, 0x96, -0xA, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0, 0xFF, 1, 9, 1); + this->actionFunc = EnFloormas_SmShrink; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18FD8.s") +void EnFloormas_SmSlaveJumpAtMasterBegin(EnFloormas* this) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_060019CC, 2.0f, 0.0f, 41.0f, 2, 0.0f); + this->actionFunc = EnFloormas_SmSlaveJumpAtMaster; + this->actor.speedXZ = 0.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A190C8.s") +void EnFloormas_JumpAtLinkBegin(EnFloormas* this) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_060019CC, 2.0f, 0.0f, 41.0f, 2, 0.0f); + this->actionFunc = EnFloormas_JumpAtLink; + this->actor.speedXZ = 0.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19230.s") +void EnFloormas_GrabLinkBegin(EnFloormas* this, Player* player) { + f32 yDelta; + f32 xzDelta; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1928C.s") + SkelAnime_ChangeAnim(&this->skelAnime, &D_060019CC, 1.0f, 36.0f, 45.0f, 2, -3.0f); + this->actor.flags &= ~1; + this->actor.speedXZ = 0.0f; + this->actor.velocity.y = 0.0f; + EnFloormas_MakeInvulnerable(this); + if (LINK_IS_CHILD) { + yDelta = CLAMP(-this->actor.yDistanceFromLink, 20.0f, 30.0f); + xzDelta = -10.0f; + } else { + yDelta = CLAMP(-this->actor.yDistanceFromLink, 25.0f, 45.0f); + xzDelta = -70.0f; + } + this->actor.posRot.pos.y = player->actor.posRot.pos.y + yDelta; + this->actor.posRot.pos.x = Math_Sins(this->actor.shape.rot.y) * (xzDelta * 0.1f) + player->actor.posRot.pos.x; + this->actor.posRot.pos.z = Math_Coss(this->actor.shape.rot.y) * (xzDelta * 0.1f) + player->actor.posRot.pos.z; + this->actor.shape.rot.x = -0x4CE0; + this->actionFunc = EnFloormas_GrabLink; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A193C4.s") +void EnFloormas_MergeBegin(EnFloormas* this) { + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_06009DB0); + this->actionTimer = 0; + this->smActionTimer += 1500; + EnFloormas_MakeInvulnerable(this); + this->actionFunc = EnFloormas_Merge; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A196DC.s") +void EnFloormas_SmWaitBegin(EnFloormas* this) { + EnFloormas* attachedA = (EnFloormas*)this->actor.attachedA; + EnFloormas* attachedB = (EnFloormas*)this->actor.attachedB; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A198EC.s") + // if this is the last remaining small floor master, kill all. + if ((attachedA->actionFunc == EnFloormas_SmWait) && (attachedB->actionFunc == EnFloormas_SmWait)) { + Actor_Kill(&attachedA->actor); + Actor_Kill(&attachedB->actor); + Actor_Kill(&this->actor); + return; + } + this->actor.draw = NULL; + this->actionFunc = EnFloormas_SmWait; + this->actor.flags &= ~0x11; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19B9C.s") +void EnFloormas_TakeDamageBegin(EnFloormas* this) { + SkelAnime_ChangeAnimTransitionStop(&this->skelAnime, &D_06000590, -3.0f); + if ((this->collider.body.acHitItem->toucher.flags & 0x1F824) != 0) { + this->actor.posRot.rot.y = this->collider.base.ac->posRot.rot.y; + } else { + this->actor.posRot.rot.y = func_8002DA78(&this->actor, this->collider.base.ac) + 0x8000; + } + func_8003426C(&this->actor, 0x4000, 0xFF, 0, 0x14); + this->actionFunc = EnFloormas_TakeDamage; + this->actor.speedXZ = 5.0f; + this->actor.velocity.y = 5.5f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19BA8.s") +void EnFloormas_RecoverBegin(EnFloormas* this) { + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_06000EA4); + this->actor.velocity.y = this->actor.speedXZ = 0.0f; + this->actor.posRot.rot.y = this->actor.shape.rot.y; + this->actionFunc = EnFloormas_Recover; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19C6C.s") +void EnFloormas_FreezeBegin(EnFloormas* this) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_060019CC, 1.5f, 0, 20.0f, 2, -3.0f); + this->actor.speedXZ = 0.0f; + if (this->actor.colChkInfo.damageEffect == 4) { + func_8003426C(&this->actor, -0x8000, 0xFF, 0, 0x50); + } else { + func_8003426C(&this->actor, 0, 0xFF, 0, 0x50); + if (this->actor.scale.x > 0.004f) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE); + } else { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE); + } + } + this->actionTimer = 80; + this->actionFunc = EnFloormas_Freeze; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19CA4.s") +void EnFloormas_Die(EnFloormas* this, GlobalContext* globalCtx) { + if (this->actor.scale.x > 0.004f) { + // split + this->actor.shape.rot.y = this->actor.rotTowardsLinkY + 0x8000; + EnFloormas_SplitBegin((EnFloormas*)this->actor.attachedB); + EnFloormas_SplitBegin((EnFloormas*)this->actor.attachedA); + EnFloormas_SplitBegin(this); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_FLOORMASTER_SPLIT); + } else { + // Die + Item_DropCollectibleRandom(globalCtx, &this->actor, &this->actor.posRot.pos, 0x90); + EnFloormas_SmShrinkBegin(this, globalCtx); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A19D18.s") +void EnFloormas_BigDecideAction(EnFloormas* this, GlobalContext* globalCtx) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + // within 400 units of link and within 90 degrees rotation of him + if (this->actor.xzDistanceFromLink < 400.0f && !func_8002E084(&this->actor, 0x4000)) { + this->actionTarget = this->actor.rotTowardsLinkY; + EnFloormas_TurnBegin(this); + // within 280 units of link and within 45 degrees rotation of him + } else if (this->actor.xzDistanceFromLink < 280.0f && func_8002E084(&this->actor, 0x2000)) { + EnFloormas_HoverBegin(this, globalCtx); + } else { + EnFloormas_StandBegin(this); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Update.s") +void EnFloormas_Stand(EnFloormas* this, GlobalContext* globalCtx) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + if (this->actor.scale.x > 0.004f) { + EnFloormas_BigWalkBegin(this); + } else if (this->actor.params == MERGE_SLAVE) { + EnFloormas_SmDecideActionBegin(this); + } else { + EnFloormas_SmWalkBegin(this); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A128.s") +void EnFloormas_BigWalk(EnFloormas* this, GlobalContext* globalCtx) { + s32 animPastFrame; + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + animPastFrame = func_800A56C8(&this->skelAnime, 0.0f); + if (animPastFrame) { + if (this->actionTimer != 0) { + this->actionTimer--; + } + } + if (((animPastFrame || (func_800A56C8(&this->skelAnime, 12.0f))) || + (func_800A56C8(&this->skelAnime, 24.0f) != 0)) || + (func_800A56C8(&this->skelAnime, 36.0f) != 0)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_FALL_WALK); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A160.s") + if ((this->actor.xzDistanceFromLink < 320.0f) && (func_8002E084(&this->actor, 0x4000))) { + EnFloormas_RunBegin(this); + } else if (this->actor.bgCheckFlags & 8) { + // set target rotation to the colliding wall's rotation + this->actionTarget = this->actor.wallPolyRot; + EnFloormas_TurnBegin(this); + } else if ((this->actor.xzDistanceFromLink < 400.0f) && !func_8002E084(&this->actor, 0x4000)) { + // set target rotation to link. + this->actionTarget = this->actor.rotTowardsLinkY; + EnFloormas_TurnBegin(this); + } else if (this->actionTimer == 0) { + EnFloormas_BigStopWalkBegin(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Draw.s") +void EnFloormas_BigStopWalk(EnFloormas* this, GlobalContext* globalCtx) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + EnFloormas_BigDecideActionBegin(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A350.s") +void EnFloormas_Run(EnFloormas* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if ((((func_800A56C8(&this->skelAnime, 0.0f)) || (func_800A56C8(&this->skelAnime, 12.0f))) || + (func_800A56C8(&this->skelAnime, 24.0f))) || + (func_800A56C8(&this->skelAnime, 36.0f))) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_FALL_WALK); + } + + Math_SmoothScaleMaxS(&this->actor.shape.rot.y, this->actor.rotTowardsLinkY, 3, 0x71C); + + if ((this->actor.xzDistanceFromLink < 280.0f) && func_8002E084(&this->actor, 0x2000) && + !(this->actor.bgCheckFlags & 8)) { + EnFloormas_HoverBegin(this, globalCtx); + } else if (this->actor.xzDistanceFromLink > 400.0f) { + EnFloormas_BigWalkBegin(this); + } +} + +void EnFloormas_Turn(EnFloormas* this, GlobalContext* globalCtx) { + char pad[4]; + f32 sp30; + f32 sp2C; + + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + EnFloormas_StandBegin(this); + } + + if (((this->skelAnime.animPlaybackSpeed > 0.0f) && func_800A56C8(&this->skelAnime, 21.0f)) || + ((this->skelAnime.animPlaybackSpeed < 0.0f) && func_800A56C8(&this->skelAnime, 6.0f))) { + if (this->actor.scale.x > 0.004f) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_FALL_WALK); + } else { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_FLOORMASTER_SM_WALK); + } + } + // Needed to match + if (!this->skelAnime.animCurrentFrame) {} + if (this->skelAnime.animCurrentFrame >= 7.0f && this->skelAnime.animCurrentFrame < 22.0f) { + sp30 = Math_Sins(this->actor.shape.rot.y + 0x4268); + sp2C = Math_Coss(this->actor.shape.rot.y + 0x4268); + this->actor.shape.rot.y += this->actionTarget; + this->actor.posRot.pos.x -= + (this->actor.scale.x * 2700.0f) * (Math_Sins(this->actor.shape.rot.y + 0x4268) - sp30); + this->actor.posRot.pos.z -= + (this->actor.scale.x * 2700.0f) * (Math_Coss(this->actor.shape.rot.y + 0x4268) - sp2C); + } +} + +void EnFloormas_Hover(EnFloormas* this, GlobalContext* globalCtx) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + EnFloormas_ChargeBegin(this); + } + this->actor.shape.rot.x += 0x140; + this->actor.posRot.pos.y += 10.0f; + Math_SmoothScaleMaxS(&this->actor.shape.rot.y, this->actor.rotTowardsLinkY, 3, 2730); + Math_ApproxS(&this->zOffset, 1200, 100); +} + +void EnFloormas_Slide(EnFloormas* this, GlobalContext* globalCtx) { + Vec3f pos; + Vec3f pos2; + + pos.x = this->actor.posRot.pos.x; + pos.z = this->actor.posRot.pos.z; + pos.y = this->actor.unk_80; + + pos2.y = 2.0f; + pos2.x = Math_Sins(this->actor.shape.rot.y + 0x6000) * 7.0f; + pos2.z = Math_Coss(this->actor.shape.rot.y + 0x6000) * 7.0f; + + // create dust particle + func_800286CC(globalCtx, &pos, &pos2, &dustPos, 0x1C2, 0x64); + + pos2.x = Math_Sins(this->actor.shape.rot.y - 0x6000) * 7.0f; + pos2.z = Math_Coss(this->actor.shape.rot.y - 0x6000) * 7.0f; + + // create dust particle + func_800286CC(globalCtx, &pos, &pos2, &dustPos, 0x1C2, 0x64); + + func_8002F974(this, NA_SE_EN_FLOORMASTER_SLIDING); +} + +void EnFloormas_Charge(EnFloormas* this, GlobalContext* globalCtx) { + f32 distFromGround; + + if (this->actionTimer != 0) { + this->actionTimer--; + } + + Math_ApproxF(&this->actor.speedXZ, 15.0f, SQ(this->actor.speedXZ) * (1.0f / 3.0f)); + Math_ApproxUpdateScaledS(&this->actor.shape.rot.x, -0x1680, 0x140); + + distFromGround = this->actor.posRot.pos.y - this->actor.unk_80; + if (distFromGround < 10.0f) { + this->actor.posRot.pos.y = this->actor.unk_80 + 10.0f; + this->actor.gravity = 0.0f; + this->actor.velocity.y = 0.0f; + } + + if (distFromGround < 12.0f) { + EnFloormas_Slide(this, globalCtx); + } + + if ((this->actor.bgCheckFlags & 8) || (this->actionTimer == 0)) { + EnFloormas_LandBegin(this); + } +} + +void EnFloormas_Land(EnFloormas* this, GlobalContext* globalCtx) { + s32 isOnGround; + + isOnGround = this->actor.bgCheckFlags & 1; + if (this->actor.bgCheckFlags & 2) { + if (this->actor.params != MERGE_MASTER) { + EnFloormas_MakeVulnerable(this); + } + + if (this->actor.velocity.y < -4.0f) { + if (this->actor.scale.x > 0.004f) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_FALL_LAND); + } else { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_FLOORMASTER_SM_LAND); + } + } + } + if (this->actor.bgCheckFlags & 8) { + this->actor.speedXZ = 0.0f; + } + + if (isOnGround) { + Math_ApproxF(&this->actor.speedXZ, 0.0f, 2.0f); + } + + if ((this->actor.speedXZ > 0.0f) && ((this->actor.posRot.pos.y - this->actor.unk_80) < 12.0f)) { + EnFloormas_Slide(this, globalCtx); + } + + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + if (this->actionTimer != 0) { + this->actionTimer--; + } + + if (this->actionTimer == 0 && isOnGround) { + if (this->skelAnime.animFrameCount < 45.0f) { + this->skelAnime.animFrameCount = SkelAnime_GetFrameCount(&D_060019CC); + } else if (this->actor.params == MERGE_MASTER) { + EnFloormas_MergeBegin(this); + } else { + EnFloormas_StandBegin(this); + this->smActionTimer = 50; + } + } + } + + Math_ApproxUpdateScaledS(&this->actor.shape.rot.x, 0, 0x140); + Math_ApproxS(&this->zOffset, -1600, 100); +} + +void EnFloormas_Split(EnFloormas* this, GlobalContext* globalCtx) { + if (this->actor.bgCheckFlags & 1) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + this->actor.flags |= 1; + this->smActionTimer = 50; + EnFloormas_StandBegin(this); + } + Math_ApproxF(&this->actor.speedXZ, 0.0f, 1.0f); + } + + if (this->actor.bgCheckFlags & 2) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_FLOORMASTER_SM_LAND); + } +} + +void EnFloormas_SmWalk(EnFloormas* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + DECR(this->smActionTimer); + + if ((func_800A56C8(&this->skelAnime, 0.0f)) || (func_800A56C8(&this->skelAnime, 18.0f))) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_FLOORMASTER_SM_WALK); + } + + if (this->smActionTimer == 0) { + EnFloormas_SmDecideActionBegin(this); + } else if (this->actor.bgCheckFlags & 8) { + this->actionTarget = this->actor.wallPolyRot; + EnFloormas_TurnBegin(this); + } else if (this->actor.xzDistanceFromLink < 120.0f) { + Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, this->actor.rotTowardsLinkY + 0x8000, 0x38E); + } +} + +void EnFloormas_SmDecideAction(EnFloormas* this, GlobalContext* globalCtx) { + Actor* primaryFloormas; + s32 isAgainstWall; + + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if ((func_800A56C8(&this->skelAnime, 0.0f)) || (func_800A56C8(&this->skelAnime, 18.0f))) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_FLOORMASTER_SM_WALK); + } + isAgainstWall = this->actor.bgCheckFlags & 8; + if (isAgainstWall) { + this->actionTarget = this->actor.wallPolyRot; + EnFloormas_TurnBegin(this); + return; + } + + if (this->actor.params == MERGE_SLAVE) { + if (this->actor.attachedA->params == MERGE_MASTER) { + primaryFloormas = this->actor.attachedA; + } else if (this->actor.attachedB->params == MERGE_MASTER) { + primaryFloormas = this->actor.attachedB; + } else { + this->actor.params = 0x10; + return; + } + + Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, func_8002DA78(&this->actor, primaryFloormas), 0x38E); + if (func_8002DB8C(&this->actor, primaryFloormas) < 80.0f) { + EnFloormas_SmSlaveJumpAtMasterBegin(this); + } + } else { + Math_SmoothScaleMaxS(&this->actor.shape.rot.y, this->actor.rotTowardsLinkY, 3, 0x71C); + if (this->actor.xzDistanceFromLink < 80.0f) { + EnFloormas_JumpAtLinkBegin(this); + } + } +} + +void EnFloormas_SmShrink(EnFloormas* this, GlobalContext* globalCtx) { + if (Math_ApproxF(&this->actor.scale.x, 0.0f, 0.0015f)) { + EnFloormas_SmWaitBegin(this); + } + this->actor.scale.z = this->actor.scale.x; + this->actor.scale.y = this->actor.scale.x; +} + +void EnFloormas_JumpAtLink(EnFloormas* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (this->skelAnime.animCurrentFrame < 20.0f) { + Math_SmoothScaleMaxS(&this->actor.shape.rot.y, this->actor.rotTowardsLinkY, 2, 0xE38); + } else if (func_800A56C8(&this->skelAnime, 20.0f)) { + this->actor.speedXZ = 5.0f; + this->actor.velocity.y = 7.0f; + } else if (this->actor.bgCheckFlags & 2) { + this->actionTimer = 0x32; + this->actor.speedXZ = 0.0f; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_FLOORMASTER_SM_LAND); + EnFloormas_LandBegin(this); + } else if ((this->actor.yDistanceFromLink < -10.0f) && this->collider.base.maskA & 2 && + (&player->actor == this->collider.base.oc)) { + globalCtx->unk_11D4C(globalCtx, player); + EnFloormas_GrabLinkBegin(this, player); + } +} + +void EnFloormas_GrabLink(EnFloormas* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + EnFloormas* attachedA; + EnFloormas* attachedB; + f32 yDelta; + f32 xzDelta; + + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + if (this->skelAnime.animPlaybackSpeed > 0.0f) { + this->skelAnime.animPlaybackSpeed = -1.0f; + this->skelAnime.animFrameCount = 36.0f; + this->skelAnime.initialFrame = 45.0f; + } else { + this->skelAnime.animPlaybackSpeed = 1.0f; + this->skelAnime.animFrameCount = 45.0f; + this->skelAnime.initialFrame = 36.0f; + } + } + + if (LINK_IS_CHILD) { + yDelta = CLAMP(-this->actor.yDistanceFromLink, 20.0f, 30.0f); + xzDelta = -10.0f; + } else { + yDelta = CLAMP(-this->actor.yDistanceFromLink, 25.0f, 45.0f); + xzDelta = -30.0f; + } + + this->actor.posRot.pos.y = player->actor.posRot.pos.y + yDelta; + this->actor.posRot.pos.x = Math_Sins(this->actor.shape.rot.y) * (xzDelta * 0.1f) + player->actor.posRot.pos.x; + this->actor.posRot.pos.z = Math_Coss(this->actor.shape.rot.y) * (xzDelta * 0.1f) + player->actor.posRot.pos.z; + + // let go + if (!(player->stateFlags2 & 0x80) || (player->unk_A78 < 0)) { + attachedA = this->actor.attachedA; + attachedB = this->actor.attachedB; + + if (((attachedA->actionFunc == EnFloormas_GrabLink) || attachedA->actionFunc == EnFloormas_SmWait) && + (attachedB->actionFunc == EnFloormas_GrabLink || attachedB->actionFunc == EnFloormas_SmWait)) { + + attachedA->actor.params = MERGE_SLAVE; + attachedB->actor.params = MERGE_SLAVE; + this->actor.params = MERGE_MASTER; + } + + this->actor.shape.rot.x = 0; + this->actor.velocity.y = 6.0f; + this->actor.flags |= 1; + this->actor.speedXZ = -3.0f; + EnFloormas_LandBegin(this); + } else { + // Damage link every 20 frames + if ((this->actionTarget % 20) == 0) { + if (LINK_IS_CHILD) { + func_8002F7DC(&player->actor, NA_SE_VO_LI_DAMAGE_S_KID); + } else { + func_8002F7DC(&player->actor, NA_SE_VO_LI_DAMAGE_S); + } + globalCtx->unk_11D58(globalCtx, -8); + } + } + + Audio_PlayActorSound2(&this->actor, NA_SE_EN_FLOORMASTER_SM_STICK); +} + +void EnFloormas_SmSlaveJumpAtMaster(EnFloormas* this, GlobalContext* globalCtx) { + Actor* primFloormas; + + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (this->actor.attachedA->params == MERGE_MASTER) { + primFloormas = this->actor.attachedA; + } else if (this->actor.attachedB->params == MERGE_MASTER) { + primFloormas = this->actor.attachedB; + } else { + if (this->actor.bgCheckFlags & 2) { + this->actor.params = 0x10; + EnFloormas_LandBegin(this); + } + return; + } + if (func_800A56C8(&this->skelAnime, 20.0f)) { + this->actor.speedXZ = 5.0f; + this->actor.velocity.y = 7.0f; + } else if (this->skelAnime.animCurrentFrame < 20.0f) { + Math_SmoothScaleMaxS(&this->actor.shape.rot.y, func_8002DA78(&this->actor, primFloormas), 2, 0xE38); + } else if ((((primFloormas->posRot.pos.y - this->actor.posRot.pos.y) < -10.0f) && + (fabsf(this->actor.posRot.pos.x - primFloormas->posRot.pos.x) < 10.0f)) && + (fabsf(this->actor.posRot.pos.z - primFloormas->posRot.pos.z) < 10.0f)) { + EnFloormas_SmWaitBegin(this); + this->collider.base.maskA |= 1; + } else if (this->actor.bgCheckFlags & 2) { + this->actor.speedXZ = 0.0f; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_FLOORMASTER_SM_LAND); + EnFloormas_LandBegin(this); + } + + if (fabsf(this->actor.posRot.pos.x - primFloormas->posRot.pos.x) < 5.0f && + fabsf(this->actor.posRot.pos.z - primFloormas->posRot.pos.z) < 5.0f) { + Math_ApproxF(&this->actor.speedXZ, 0, 2.0f); + } +} + +void EnFloormas_Merge(EnFloormas* this, GlobalContext* globalCtx) { + EnFloormas* attachedA; + EnFloormas* attachedB; + s32 mergeCnt; + f32 prevScale; + f32 curScale; + + mergeCnt = 0; + + DECR(this->smActionTimer); + + attachedA = this->actor.attachedA; + attachedB = this->actor.attachedB; + + if (this->smActionTimer == 0) { + if (attachedA->actionFunc != EnFloormas_SmWait) { + EnFloormas_SmShrinkBegin(attachedA, globalCtx); + } + + if (attachedB->actionFunc != EnFloormas_SmWait) { + EnFloormas_SmShrinkBegin(attachedB, globalCtx); + } + } else { + if ((attachedA->actionFunc != EnFloormas_SmWait) && (attachedA->actionFunc != EnFloormas_SmShrink)) { + mergeCnt++; + } + + if ((attachedB->actionFunc != EnFloormas_SmWait) && (attachedB->actionFunc != EnFloormas_SmShrink)) { + mergeCnt++; + } + } + + prevScale = this->actor.scale.x; + + if (mergeCnt == 1) { + Math_ApproxF(&this->actor.scale.x, 0.007f, 0.0005f); + } else if (mergeCnt == 0) { + Math_ApproxF(&this->actor.scale.x, 0.01f, 0.0005f); + } + + curScale = this->actor.scale.x; + this->actor.scale.y = this->actor.scale.z = curScale; + + if (((prevScale == 0.007f) || (prevScale == 0.004f)) && (prevScale != this->actor.scale.x)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_FLOORMASTER_EXPAND); + } + + this->collider.dim.radius = (cylinderInit.dim.radius * 100.0f) * this->actor.scale.x; + this->collider.dim.height = (cylinderInit.dim.height * 100.0f) * this->actor.scale.x; + + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { + if (this->actor.scale.x >= 0.01f) { + this->actor.flags &= ~0x10; + EnFloormas_MakeVulnerable(this); + this->actor.params = 0; + this->collider.body.bumperFlags |= 4; + this->actor.colChkInfo.health = colCheckInfoInit.health; + EnFloormas_StandBegin(this); + } else { + if (this->actionTimer == 0) { + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_060039B0); + this->actionTimer = 1; + } else { + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_06009DB0); + this->actionTimer = 0; + } + } + } + func_8002F974(&this->actor, 0x3133); +} + +void EnFloormas_SmWait(EnFloormas* this, GlobalContext* globalCtx) { +} + +void EnFloormas_TakeDamage(EnFloormas* this, GlobalContext* globalCtx) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { + if (this->actor.colChkInfo.health == 0) { + EnFloormas_Die(this, globalCtx); + } else { + EnFloormas_RecoverBegin(this); + } + } + + if (func_800A56C8(&this->skelAnime, 13.0f)) { + if (this->actor.scale.x > 0.004f) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_GND); + } else { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_GND); + } + } + Math_ApproxF(&this->actor.speedXZ, 0.0f, 0.2f); +} + +void EnFloormas_Recover(EnFloormas* this, GlobalContext* globalCtx) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { + EnFloormas_StandBegin(this); + } +} + +void EnFloormas_Freeze(EnFloormas* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (this->actionTimer != 0) { + this->actionTimer--; + } + if (this->actionTimer == 0) { + if (this->actor.colChkInfo.health == 0) { + EnFloormas_Die(this, globalCtx); + return; + } + EnFloormas_StandBegin(this); + } +} + +void EnFloormas_ColliderCheck(EnFloormas* this, GlobalContext* globalCtx) { + s32 pad; + s32 isSmall; + + if ((this->collider.base.acFlags & 2) != 0) { + this->collider.base.acFlags &= ~2; + func_80035650(&this->actor, &this->collider.body, 1); + if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { + if (this->collider.base.type != COLTYPE_UNK12) { + isSmall = 0; + if (this->actor.scale.x < 0.01f) { + isSmall = 1; + } + if (isSmall && this->collider.body.acHitItem->toucher.flags & 0x80) { + this->actor.colChkInfo.damage = 2; + this->actor.colChkInfo.damageEffect = 0; + } + if (Actor_ApplyDamage(&this->actor) == 0) { + if (isSmall) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_FLOORMASTER_SM_DEAD); + } else { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_FALL_DEAD); + } + func_80032C7C(globalCtx, &this->actor); + this->actor.flags &= ~1; + } else if (this->actor.colChkInfo.damage != 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_FALL_DAMAGE); + } + + if ((this->actor.colChkInfo.damageEffect == 4) || (this->actor.colChkInfo.damageEffect == 1)) { + if (this->actionFunc != EnFloormas_Freeze) { + EnFloormas_FreezeBegin(this); + } + } else { + if (this->actor.colChkInfo.damageEffect == 2) { + func_8002A65C(globalCtx, &this->actor, &this->actor.posRot.pos, this->actor.scale.x * 4000.f, + this->actor.scale.x * 4000.f); + } + EnFloormas_TakeDamageBegin(this); + } + } + } + } +} + +void EnFloormas_Update(Actor* thisx, GlobalContext* globalCtx) { + EnFloormas* this = THIS; + s32 pad; + + if (this->actionFunc != EnFloormas_SmWait) { + if (this->collider.base.atFlags & 2) { + this->collider.base.atFlags &= ~2; + this->actor.speedXZ *= -0.5f; + + if (-5.0f < this->actor.speedXZ) { + this->actor.speedXZ = -5.0f; + } else { + this->actor.speedXZ = this->actor.speedXZ; + } + + this->actor.velocity.y = 5.0f; + + EnFloormas_LandBegin(this); + } + EnFloormas_ColliderCheck(this, globalCtx); + this->actionFunc(this, globalCtx); + + if (this->actionFunc != EnFloormas_TakeDamage) { + this->actor.posRot.rot.y = this->actor.shape.rot.y; + } + + if (this->actionFunc != EnFloormas_GrabLink) { + Actor_MoveForward(&this->actor); + } + + func_8002E4B4(globalCtx, &this->actor, 20.0f, this->actor.scale.x * 3000.0f, 0.0f, 0x1D); + Collider_CylinderUpdate(&this->actor, &this->collider); + if (this->actionFunc == EnFloormas_Charge) { + this->actor.flags |= 0x1000000; + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->collider); + } + if (this->actionFunc != EnFloormas_GrabLink) { + if (this->actionFunc != EnFloormas_Split && this->actionFunc != EnFloormas_TakeDamage && + this->actor.freeze == 0) { + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider); + } + + if ((this->actionFunc != EnFloormas_SmSlaveJumpAtMaster) || (this->skelAnime.animCurrentFrame < 20.0f)) { + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider); + } + } + + Actor_SetHeight(&this->actor, this->actor.scale.x * 2500.0f); + + if (this->collider.base.type == COLTYPE_UNK12) { + if (this->actionTarget != 0) { + this->actionTarget--; + } + + if (this->actionTarget == 0) { + this->actionTarget = 0x28; + } + } + } +} + +s32 EnFloormas_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + Actor* thisx, Gfx** gfx) { + EnFloormas* this = THIS; + if (limbIndex == 1) { + pos->z += this->zOffset; + } + return 0; +} + +void EnFloormas_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx, + Gfx** gfx) { + if (limbIndex == 2) { + Matrix_Push(); + Matrix_Translate(1600.0f, -700.0f, -1700.0f, MTXMODE_APPLY); + Matrix_RotateY(DEGTORAD(60.0f), 1); + Matrix_RotateZ(DEGTORAD(15.0f), 1); + Matrix_Scale(2.0f, 2.0f, 2.0f, MTXMODE_APPLY); + gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_floormas.c", 2299), G_MTX_LOAD); + gSPDisplayList((*gfx)++, D_06008688); + Matrix_Pull(); + } +} + +void EnFloormas_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnFloormas* this = THIS; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* gfx[4]; + s32 pad; + + Graph_OpenDisps(gfx, globalCtx->state.gfxCtx, "../z_en_floormas.c", 2318); + func_80093D18(globalCtx->state.gfxCtx); + if (this->collider.base.type == COLTYPE_UNK12) { + func_80026230(globalCtx, &mergeColor, this->actionTarget % 0x28, 0x28); + } + + gfxCtx->polyOpa.p = + SkelAnime_DrawSV2(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, + EnFloormas_OverrideLimbDraw, EnFloormas_PostLimbDraw, &this->actor, gfxCtx->polyOpa.p); + if (this->collider.base.type == COLTYPE_UNK12) { + func_80026608(globalCtx); + } + Graph_CloseDisps(gfx, globalCtx->state.gfxCtx, "../z_en_floormas.c", 2340); +} + +void EnFloormas_DrawHighlighted(Actor* thisx, GlobalContext* globalCtx) { + EnFloormas* this = THIS; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* gfx[4]; + + Graph_OpenDisps(gfx, globalCtx->state.gfxCtx, "../z_en_floormas.c", 2352); + func_80093D84(globalCtx->state.gfxCtx); + if (this->collider.base.type == COLTYPE_UNK12) { + func_80026690(globalCtx, &mergeColor, this->actionTarget % 0x28, 0x28); + } + gfxCtx->polyXlu.p = + SkelAnime_DrawSV2(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, + EnFloormas_OverrideLimbDraw, EnFloormas_PostLimbDraw, &this->actor, gfxCtx->polyXlu.p); + if (this->collider.base.type == COLTYPE_UNK12) { + func_80026A6C(globalCtx); + } + Graph_CloseDisps(gfx, globalCtx->state.gfxCtx, "../z_en_floormas.c", 2374); +} diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h index b0732984f4..a4bcf5e032 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h @@ -4,12 +4,22 @@ #include #include -struct EnFloormas; +typedef struct EnFloormas EnFloormas; -typedef struct EnFloormas { +typedef void (*EnFloormasActionFunc)(EnFloormas* this, GlobalContext* globalCtx); + +struct EnFloormas{ /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x1C8]; -} EnFloormas; // size = 0x0314 + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ EnFloormasActionFunc actionFunc; + /* 0x0194 */ s16 actionTimer; + /* 0x0196 */ s16 actionTarget; + /* 0x0198 */ s16 zOffset; + /* 0x019A */ s16 smActionTimer; + /* 0x019C */ Vec3s limbDrawTable[25]; + /* 0x0232 */ Vec3s transitionDrawTable[25]; + /* 0x02C8 */ ColliderCylinder collider; +}; // size = 0x0314 extern const ActorInit En_Floormas_InitVars; diff --git a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c index 9f3f4ff95f..b609636d41 100644 --- a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c +++ b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c @@ -82,7 +82,7 @@ void EnLightbox_Update(Actor* thisx, GlobalContext* globalCtx) { } else { if (thisx->speedXZ) { if (thisx->bgCheckFlags & 8) { - thisx->posRot.rot.y = (thisx->posRot.rot.y + thisx->unk_7E) - thisx->posRot.rot.y; + thisx->posRot.rot.y = (thisx->posRot.rot.y + thisx->wallPolyRot) - thisx->posRot.rot.y; Audio_PlaySoundGeneral(NA_SE_EV_BOMB_BOUND, &thisx->unk_E4, 4, &D_801333E0, &D_801333E0, &D_801333E8); thisx->speedXZ *= 0.7f; diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index 1206ca49a2..ccc0849598 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -1352,7 +1352,7 @@ void func_80AEDB30(EnRu1* this, GlobalContext* globalCtx) { f32* velocityY; f32* speedXZ; f32* gravity; - s16 unk_7E; + s16 wallPolyRot; s16 rotY; s32 temp_a1_2; s32 temp_a0; @@ -1411,13 +1411,13 @@ void func_80AEDB30(EnRu1* this, GlobalContext* globalCtx) { speedXZ = &this->actor.speedXZ; if (*speedXZ != 0.0f) { rotY = this->actor.posRot.rot.y; - unk_7E = this->actor.unk_7E; - temp_a0 = (unk_7E * 2) - rotY; + wallPolyRot = this->actor.wallPolyRot; + temp_a0 = (wallPolyRot * 2) - rotY; temp_a1_2 = temp_a0 + 0x8000; - if ((s16)((temp_a0 - unk_7E) + 0x8000) >= 0) { - phi_v1 = (s16)(temp_a1_2 - unk_7E); + if ((s16)((temp_a0 - wallPolyRot) + 0x8000) >= 0) { + phi_v1 = (s16)(temp_a1_2 - wallPolyRot); } else { - phi_v1 = -(s16)(temp_a1_2 - unk_7E); + phi_v1 = -(s16)(temp_a1_2 - wallPolyRot); } if (phi_v1 < 0x4001) { if (*speedXZ >= (kREG(27) * 0.01f) + 3.0f) { diff --git a/undefined_syms.txt b/undefined_syms.txt index fda8d706bf..0073e6f619 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -541,3 +541,7 @@ D_06005B78 = 0x06005B78; D_06002CE4 = 0x06002CE4; D_06002650 = 0x06002650; D_06003858 = 0x06003858; + +// z_en_floormas +D_06002158 = 0x06002158; +D_060039B0 = 0x060039B0;