From d816ac61227ab5cf5456f5e16419c370a4e9f901 Mon Sep 17 00:00:00 2001 From: fig02 Date: Sun, 1 Aug 2021 15:44:16 -0400 Subject: [PATCH] Stalfos (en_test) OK and object_sk2 documented (#868) * fix colliderinit typo * migrate data * init has 1 problem * progress * progress * builds now * progress * progress * lots of funcs matched * many functions, fix warnings * 1 left * done * docs progress * remove graphovl * missed some * change some funcs * some more * another * format * more docs * cleanups1 * limbs, DLs, textures * limbs named (thanks elliptic) * more docs * Name animations, import symbols * Named sections of xml * more docs * rename limbs and use flag macros * name * review1 and use limb enum * review2 * agro -> aggro * review3 * review4 * review5 Co-authored-by: Elliptic Ellipsis --- .../actors/ovl_En_Test/EnTest_Destroy.s | 44 - .../overlays/actors/ovl_En_Test/EnTest_Draw.s | 74 - .../overlays/actors/ovl_En_Test/EnTest_Init.s | 159 -- .../actors/ovl_En_Test/EnTest_SetupAction.s | 3 - .../actors/ovl_En_Test/EnTest_Update.s | 312 --- .../actors/ovl_En_Test/func_8085F938.s | 121 - .../actors/ovl_En_Test/func_8085FAB0.s | 238 -- .../actors/ovl_En_Test/func_8085FDD0.s | 31 - .../actors/ovl_En_Test/func_8085FE48.s | 63 - .../actors/ovl_En_Test/func_8085FF28.s | 31 - .../actors/ovl_En_Test/func_8085FF9C.s | 57 - .../actors/ovl_En_Test/func_80860068.s | 35 - .../actors/ovl_En_Test/func_808600EC.s | 169 -- .../actors/ovl_En_Test/func_80860318.s | 54 - .../actors/ovl_En_Test/func_808603CC.s | 31 - .../actors/ovl_En_Test/func_80860438.s | 53 - .../actors/ovl_En_Test/func_808604FC.s | 510 ----- .../actors/ovl_En_Test/func_80860BDC.s | 19 - .../actors/ovl_En_Test/func_80860C24.s | 198 -- .../actors/ovl_En_Test/func_80860EC0.s | 53 - .../actors/ovl_En_Test/func_80860F84.s | 339 --- .../actors/ovl_En_Test/func_80861418.s | 35 - .../actors/ovl_En_Test/func_8086149C.s | 76 - .../actors/ovl_En_Test/func_808615A4.s | 21 - .../actors/ovl_En_Test/func_808615F4.s | 162 -- .../actors/ovl_En_Test/func_8086181C.s | 33 - .../actors/ovl_En_Test/func_80861898.s | 51 - .../actors/ovl_En_Test/func_8086194C.s | 45 - .../actors/ovl_En_Test/func_808619EC.s | 123 - .../actors/ovl_En_Test/func_80861B94.s | 46 - .../actors/ovl_En_Test/func_80861C40.s | 79 - .../actors/ovl_En_Test/func_80861D50.s | 32 - .../actors/ovl_En_Test/func_80861DC8.s | 69 - .../actors/ovl_En_Test/func_80861EC0.s | 52 - .../actors/ovl_En_Test/func_80861F80.s | 60 - .../actors/ovl_En_Test/func_80862050.s | 20 - .../actors/ovl_En_Test/func_8086209C.s | 52 - .../actors/ovl_En_Test/func_80862154.s | 34 - .../actors/ovl_En_Test/func_808621D4.s | 131 -- .../actors/ovl_En_Test/func_80862398.s | 34 - .../actors/ovl_En_Test/func_80862418.s | 104 - .../actors/ovl_En_Test/func_80862578.s | 60 - .../actors/ovl_En_Test/func_80862650.s | 109 - .../actors/ovl_En_Test/func_808627C4.s | 72 - .../actors/ovl_En_Test/func_808628C8.s | 366 --- .../actors/ovl_En_Test/func_80862DBC.s | 49 - .../actors/ovl_En_Test/func_80862E6C.s | 92 - .../actors/ovl_En_Test/func_80862FA8.s | 43 - .../actors/ovl_En_Test/func_80863044.s | 49 - .../actors/ovl_En_Test/func_808630F0.s | 43 - .../actors/ovl_En_Test/func_8086318C.s | 52 - .../actors/ovl_En_Test/func_80863240.s | 22 - .../actors/ovl_En_Test/func_80863294.s | 64 - .../actors/ovl_En_Test/func_80863360.s | 45 - .../actors/ovl_En_Test/func_808633E8.s | 35 - .../actors/ovl_En_Test/func_80863460.s | 45 - .../actors/ovl_En_Test/func_808634F8.s | 116 - .../actors/ovl_En_Test/func_80863AB8.s | 150 -- .../actors/ovl_En_Test/func_80863CC4.s | 301 --- .../actors/ovl_En_Test/func_80864158.s | 38 - .../actors/ovl_En_Test/func_808641E8.s | 228 -- assets/xml/objects/object_sk2.xml | 181 +- data/overlays/actors/z_en_test.data.s | 44 - data/overlays/actors/z_en_test.reloc.s | 13 - spec | 3 +- src/code/z_play.c | 4 +- src/overlays/actors/ovl_En_Boom/z_en_boom.c | 42 +- src/overlays/actors/ovl_En_Test/z_en_test.c | 2011 ++++++++++++++++- src/overlays/actors/ovl_En_Test/z_en_test.h | 113 +- undefined_syms.txt | 1 - 70 files changed, 2164 insertions(+), 6080 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_SetupAction.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_8085F938.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FAB0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FDD0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FE48.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF28.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF9C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_808600EC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80860318.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_808603CC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_808604FC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80860BDC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80860C24.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80860F84.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80861418.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_8086149C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_808615A4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_808615F4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_8086181C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80861898.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_8086194C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_808619EC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80861B94.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80861C40.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80861D50.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80861DC8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80861EC0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80861F80.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80862050.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_8086209C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80862154.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_808621D4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80862398.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80862418.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80862578.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80862650.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_808628C8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80862DBC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80862E6C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80862FA8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80863044.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_808630F0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_8086318C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80863240.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80863294.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80863360.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_808633E8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80863460.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_808634F8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80863AB8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80863CC4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Test/func_808641E8.s delete mode 100644 data/overlays/actors/z_en_test.data.s delete mode 100644 data/overlays/actors/z_en_test.reloc.s diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Destroy.s deleted file mode 100644 index 31f3cd7c4d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Destroy.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel EnTest_Destroy -/* 00250 8085F8A0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00254 8085F8A4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00258 8085F8A8 AFB10020 */ sw $s1, 0x0020($sp) -/* 0025C 8085F8AC AFB0001C */ sw $s0, 0x001C($sp) -/* 00260 8085F8B0 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 00264 8085F8B4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00268 8085F8B8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0026C 8085F8BC 11C1000D */ beq $t6, $at, .L8085F8F4 -/* 00270 8085F8C0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00274 8085F8C4 3C0145FA */ lui $at, 0x45FA ## $at = 45FA0000 -/* 00278 8085F8C8 44812000 */ mtc1 $at, $f4 ## $f4 = 8000.00 -/* 0027C 8085F8CC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00280 8085F8D0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00284 8085F8D4 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00288 8085F8D8 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 0028C 8085F8DC 0C00D4FD */ jal Actor_FindNearby - -/* 00290 8085F8E0 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00294 8085F8E4 54400004 */ bnel $v0, $zero, .L8085F8F8 -/* 00298 8085F8E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0029C 8085F8EC 0C03D6D6 */ jal func_800F5B58 -/* 002A0 8085F8F0 00000000 */ nop -.L8085F8F4: -/* 002A4 8085F8F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L8085F8F8: -/* 002A8 8085F8F8 0C009C27 */ jal Effect_Delete -/* 002AC 8085F8FC 8E05080C */ lw $a1, 0x080C($s0) ## 0000080C -/* 002B0 8085F900 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 002B4 8085F904 0C0170EB */ jal Collider_DestroyCylinder - -/* 002B8 8085F908 260508DC */ addiu $a1, $s0, 0x08DC ## $a1 = 000008DC -/* 002BC 8085F90C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 002C0 8085F910 0C0170EB */ jal Collider_DestroyCylinder - -/* 002C4 8085F914 26050810 */ addiu $a1, $s0, 0x0810 ## $a1 = 00000810 -/* 002C8 8085F918 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 002CC 8085F91C 0C017418 */ jal Collider_DestroyQuad -/* 002D0 8085F920 2605085C */ addiu $a1, $s0, 0x085C ## $a1 = 0000085C -/* 002D4 8085F924 8FBF0024 */ lw $ra, 0x0024($sp) -/* 002D8 8085F928 8FB0001C */ lw $s0, 0x001C($sp) -/* 002DC 8085F92C 8FB10020 */ lw $s1, 0x0020($sp) -/* 002E0 8085F930 03E00008 */ jr $ra -/* 002E4 8085F934 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Draw.s deleted file mode 100644 index a0175fe183..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Draw.s +++ /dev/null @@ -1,74 +0,0 @@ -glabel EnTest_Draw -/* 049F8 80864048 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 049FC 8086404C AFB00038 */ sw $s0, 0x0038($sp) -/* 04A00 80864050 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04A04 80864054 AFBF003C */ sw $ra, 0x003C($sp) -/* 04A08 80864058 AFA50044 */ sw $a1, 0x0044($sp) -/* 04A0C 8086405C 0C024F46 */ jal func_80093D18 -/* 04A10 80864060 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 04A14 80864064 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04A18 80864068 8FA50044 */ lw $a1, 0x0044($sp) -/* 04A1C 8086406C 0C00BAF3 */ jal func_8002EBCC -/* 04A20 80864070 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 04A24 80864074 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -/* 04A28 80864078 3C078086 */ lui $a3, %hi(func_80863AB8) ## $a3 = 80860000 -/* 04A2C 8086407C 24E73AB8 */ addiu $a3, $a3, %lo(func_80863AB8) ## $a3 = 80863AB8 -/* 04A30 80864080 29E10004 */ slti $at, $t7, 0x0004 -/* 04A34 80864084 14200003 */ bne $at, $zero, .L80864094 -/* 04A38 80864088 8FA40044 */ lw $a0, 0x0044($sp) -/* 04A3C 8086408C 8E18011C */ lw $t8, 0x011C($s0) ## 0000011C -/* 04A40 80864090 17000007 */ bne $t8, $zero, .L808640B0 -.L80864094: -/* 04A44 80864094 3C198086 */ lui $t9, %hi(func_80863CC4) ## $t9 = 80860000 -/* 04A48 80864098 27393CC4 */ addiu $t9, $t9, %lo(func_80863CC4) ## $t9 = 80863CC4 -/* 04A4C 8086409C 8E05018C */ lw $a1, 0x018C($s0) ## 0000018C -/* 04A50 808640A0 8E0601A8 */ lw $a2, 0x01A8($s0) ## 000001A8 -/* 04A54 808640A4 AFB00014 */ sw $s0, 0x0014($sp) -/* 04A58 808640A8 0C028572 */ jal SkelAnime_DrawOpa - -/* 04A5C 808640AC AFB90010 */ sw $t9, 0x0010($sp) -.L808640B0: -/* 04A60 808640B0 860807E0 */ lh $t0, 0x07E0($s0) ## 000007E0 -/* 04A64 808640B4 51000024 */ beql $t0, $zero, .L80864148 -/* 04A68 808640B8 8FBF003C */ lw $ra, 0x003C($sp) -/* 04A6C 808640BC 860B07E0 */ lh $t3, 0x07E0($s0) ## 000007E0 -/* 04A70 808640C0 92090114 */ lbu $t1, 0x0114($s0) ## 00000114 -/* 04A74 808640C4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04A78 808640C8 256CFFFF */ addiu $t4, $t3, 0xFFFF ## $t4 = FFFFFFFF -/* 04A7C 808640CC A60C07E0 */ sh $t4, 0x07E0($s0) ## 000007E0 -/* 04A80 808640D0 860307E0 */ lh $v1, 0x07E0($s0) ## 000007E0 -/* 04A84 808640D4 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 04A88 808640D8 A20A0114 */ sb $t2, 0x0114($s0) ## 00000114 -/* 04A8C 808640DC 306D0003 */ andi $t5, $v1, 0x0003 ## $t5 = 00000000 -/* 04A90 808640E0 15A00018 */ bne $t5, $zero, .L80864144 -/* 04A94 808640E4 00031083 */ sra $v0, $v1, 2 -/* 04A98 808640E8 00027080 */ sll $t6, $v0, 2 -/* 04A9C 808640EC 01C27023 */ subu $t6, $t6, $v0 -/* 04AA0 808640F0 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 04AA4 808640F4 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 -/* 04AA8 808640F8 000E7040 */ sll $t6, $t6, 1 -/* 04AAC 808640FC 020E3021 */ addu $a2, $s0, $t6 -/* 04AB0 80864100 240F0096 */ addiu $t7, $zero, 0x0096 ## $t7 = 00000096 -/* 04AB4 80864104 24180096 */ addiu $t8, $zero, 0x0096 ## $t8 = 00000096 -/* 04AB8 80864108 241900FA */ addiu $t9, $zero, 0x00FA ## $t9 = 000000FA -/* 04ABC 8086410C 240800EB */ addiu $t0, $zero, 0x00EB ## $t0 = 000000EB -/* 04AC0 80864110 240900F5 */ addiu $t1, $zero, 0x00F5 ## $t1 = 000000F5 -/* 04AC4 80864114 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 04AC8 80864118 AFAA0024 */ sw $t2, 0x0024($sp) -/* 04ACC 8086411C AFA90020 */ sw $t1, 0x0020($sp) -/* 04AD0 80864120 AFA8001C */ sw $t0, 0x001C($sp) -/* 04AD4 80864124 AFB90018 */ sw $t9, 0x0018($sp) -/* 04AD8 80864128 AFB80014 */ sw $t8, 0x0014($sp) -/* 04ADC 8086412C AFAF0010 */ sw $t7, 0x0010($sp) -/* 04AE0 80864130 24C6014C */ addiu $a2, $a2, 0x014C ## $a2 = 0000014C -/* 04AE4 80864134 8FA40044 */ lw $a0, 0x0044($sp) -/* 04AE8 80864138 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 04AEC 8086413C 0C00A877 */ jal EffectSsEnIce_SpawnFlyingVec3s -/* 04AF0 80864140 E7A40028 */ swc1 $f4, 0x0028($sp) -.L80864144: -/* 04AF4 80864144 8FBF003C */ lw $ra, 0x003C($sp) -.L80864148: -/* 04AF8 80864148 8FB00038 */ lw $s0, 0x0038($sp) -/* 04AFC 8086414C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 04B00 80864150 03E00008 */ jr $ra -/* 04B04 80864154 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Init.s deleted file mode 100644 index 579a4a8a0f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Init.s +++ /dev/null @@ -1,159 +0,0 @@ -glabel EnTest_Init -/* 00008 8085F658 27BDFE18 */ addiu $sp, $sp, 0xFE18 ## $sp = FFFFFE18 -/* 0000C 8085F65C AFB10028 */ sw $s1, 0x0028($sp) -/* 00010 8085F660 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00014 8085F664 AFBF002C */ sw $ra, 0x002C($sp) -/* 00018 8085F668 AFB00024 */ sw $s0, 0x0024($sp) -/* 0001C 8085F66C 3C058086 */ lui $a1, %hi(D_80864638) ## $a1 = 80860000 -/* 00020 8085F670 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00024 8085F674 0C01E037 */ jal Actor_ProcessInitChain - -/* 00028 8085F678 24A54638 */ addiu $a1, $a1, %lo(D_80864638) ## $a1 = 80864638 -/* 0002C 8085F67C 3C060600 */ lui $a2, %hi(D_06007C28) ## $a2 = 06000000 -/* 00030 8085F680 3C070600 */ lui $a3, %hi(D_0600316C) ## $a3 = 06000000 -/* 00034 8085F684 260E01CC */ addiu $t6, $s0, 0x01CC ## $t6 = 000001CC -/* 00038 8085F688 260F033A */ addiu $t7, $s0, 0x033A ## $t7 = 0000033A -/* 0003C 8085F68C 2418003D */ addiu $t8, $zero, 0x003D ## $t8 = 0000003D -/* 00040 8085F690 AFB80018 */ sw $t8, 0x0018($sp) -/* 00044 8085F694 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00048 8085F698 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0004C 8085F69C 24E7316C */ addiu $a3, $a3, %lo(D_0600316C) ## $a3 = 0600316C -/* 00050 8085F6A0 24C67C28 */ addiu $a2, $a2, %lo(D_06007C28) ## $a2 = 06007C28 -/* 00054 8085F6A4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00058 8085F6A8 0C02915F */ jal SkelAnime_Init - -/* 0005C 8085F6AC 26050188 */ addiu $a1, $s0, 0x0188 ## $a1 = 00000188 -/* 00060 8085F6B0 3C060600 */ lui $a2, %hi(D_06007C28) ## $a2 = 06000000 -/* 00064 8085F6B4 3C070600 */ lui $a3, %hi(D_0600316C) ## $a3 = 06000000 -/* 00068 8085F6B8 261904EC */ addiu $t9, $s0, 0x04EC ## $t9 = 000004EC -/* 0006C 8085F6BC 2608065A */ addiu $t0, $s0, 0x065A ## $t0 = 0000065A -/* 00070 8085F6C0 2409003D */ addiu $t1, $zero, 0x003D ## $t1 = 0000003D -/* 00074 8085F6C4 AFA90018 */ sw $t1, 0x0018($sp) -/* 00078 8085F6C8 AFA80014 */ sw $t0, 0x0014($sp) -/* 0007C 8085F6CC AFB90010 */ sw $t9, 0x0010($sp) -/* 00080 8085F6D0 24E7316C */ addiu $a3, $a3, %lo(D_0600316C) ## $a3 = 0600316C -/* 00084 8085F6D4 24C67C28 */ addiu $a2, $a2, %lo(D_06007C28) ## $a2 = 06007C28 -/* 00088 8085F6D8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0008C 8085F6DC 0C02915F */ jal SkelAnime_Init - -/* 00090 8085F6E0 260504A8 */ addiu $a1, $s0, 0x04A8 ## $a1 = 000004A8 -/* 00094 8085F6E4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFeet) -/* 00098 8085F6E8 24C6B8C4 */ addiu $a2, %lo(ActorShadow_DrawFeet) -/* 0009C 8085F6EC 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 000A0 8085F6F0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 000A4 8085F6F4 0C00AC78 */ jal ActorShape_Init - -/* 000A8 8085F6F8 3C0742B4 */ lui $a3, 0x42B4 ## $a3 = 42B40000 -/* 000AC 8085F6FC 8E0C0028 */ lw $t4, 0x0028($s0) ## 00000028 -/* 000B0 8085F700 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 000B4 8085F704 8E0D0024 */ lw $t5, 0x0024($s0) ## 00000024 -/* 000B8 8085F708 AE0C003C */ sw $t4, 0x003C($s0) ## 0000003C -/* 000BC 8085F70C C604003C */ lwc1 $f4, 0x003C($s0) ## 0000003C -/* 000C0 8085F710 44813000 */ mtc1 $at, $f6 ## $f6 = 45.00 -/* 000C4 8085F714 AE0D0038 */ sw $t5, 0x0038($s0) ## 00000038 -/* 000C8 8085F718 8E0D002C */ lw $t5, 0x002C($s0) ## 0000002C -/* 000CC 8085F71C 46062200 */ add.s $f8, $f4, $f6 -/* 000D0 8085F720 3C0E8086 */ lui $t6, %hi(D_80864618) ## $t6 = 80860000 -/* 000D4 8085F724 240A0028 */ addiu $t2, $zero, 0x0028 ## $t2 = 00000028 -/* 000D8 8085F728 240B0064 */ addiu $t3, $zero, 0x0064 ## $t3 = 00000064 -/* 000DC 8085F72C 25CE4618 */ addiu $t6, $t6, %lo(D_80864618) ## $t6 = 80864618 -/* 000E0 8085F730 A60A00A8 */ sh $t2, 0x00A8($s0) ## 000000A8 -/* 000E4 8085F734 A60B00AA */ sh $t3, 0x00AA($s0) ## 000000AA -/* 000E8 8085F738 E608003C */ swc1 $f8, 0x003C($s0) ## 0000003C -/* 000EC 8085F73C AE0E0098 */ sw $t6, 0x0098($s0) ## 00000098 -/* 000F0 8085F740 26050810 */ addiu $a1, $s0, 0x0810 ## $a1 = 00000810 -/* 000F4 8085F744 AE0D0040 */ sw $t5, 0x0040($s0) ## 00000040 -/* 000F8 8085F748 AFA50034 */ sw $a1, 0x0034($sp) -/* 000FC 8085F74C 0C0170D9 */ jal Collider_InitCylinder - -/* 00100 8085F750 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00104 8085F754 3C078086 */ lui $a3, %hi(D_80864570) ## $a3 = 80860000 -/* 00108 8085F758 8FA50034 */ lw $a1, 0x0034($sp) -/* 0010C 8085F75C 24E74570 */ addiu $a3, $a3, %lo(D_80864570) ## $a3 = 80864570 -/* 00110 8085F760 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00114 8085F764 0C01712B */ jal Collider_SetCylinder - -/* 00118 8085F768 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0011C 8085F76C 260508DC */ addiu $a1, $s0, 0x08DC ## $a1 = 000008DC -/* 00120 8085F770 AFA50034 */ sw $a1, 0x0034($sp) -/* 00124 8085F774 0C0170D9 */ jal Collider_InitCylinder - -/* 00128 8085F778 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0012C 8085F77C 3C078086 */ lui $a3, %hi(D_8086459C) ## $a3 = 80860000 -/* 00130 8085F780 8FA50034 */ lw $a1, 0x0034($sp) -/* 00134 8085F784 24E7459C */ addiu $a3, $a3, %lo(D_8086459C) ## $a3 = 8086459C -/* 00138 8085F788 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0013C 8085F78C 0C01712B */ jal Collider_SetCylinder - -/* 00140 8085F790 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00144 8085F794 2605085C */ addiu $a1, $s0, 0x085C ## $a1 = 0000085C -/* 00148 8085F798 AFA50034 */ sw $a1, 0x0034($sp) -/* 0014C 8085F79C 0C017406 */ jal Collider_InitQuad -/* 00150 8085F7A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00154 8085F7A4 3C078086 */ lui $a3, %hi(D_808645C8) ## $a3 = 80860000 -/* 00158 8085F7A8 8FA50034 */ lw $a1, 0x0034($sp) -/* 0015C 8085F7AC 24E745C8 */ addiu $a3, $a3, %lo(D_808645C8) ## $a3 = 808645C8 -/* 00160 8085F7B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00164 8085F7B4 0C017441 */ jal Collider_SetQuad -/* 00168 8085F7B8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0016C 8085F7BC 240F00FE */ addiu $t7, $zero, 0x00FE ## $t7 = 000000FE -/* 00170 8085F7C0 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A -/* 00174 8085F7C4 A20F00AE */ sb $t7, 0x00AE($s0) ## 000000AE -/* 00178 8085F7C8 A21800AF */ sb $t8, 0x00AF($s0) ## 000000AF -/* 0017C 8085F7CC 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 00180 8085F7D0 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 00184 8085F7D4 24080040 */ addiu $t0, $zero, 0x0040 ## $t0 = 00000040 -/* 00188 8085F7D8 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 -/* 0018C 8085F7DC 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 00190 8085F7E0 27AB0048 */ addiu $t3, $sp, 0x0048 ## $t3 = FFFFFE60 -/* 00194 8085F7E4 A3B901DA */ sb $t9, 0x01DA($sp) -/* 00198 8085F7E8 A3A201D9 */ sb $v0, 0x01D9($sp) -/* 0019C 8085F7EC A3A201D8 */ sb $v0, 0x01D8($sp) -/* 001A0 8085F7F0 A3A201D6 */ sb $v0, 0x01D6($sp) -/* 001A4 8085F7F4 A3A201D5 */ sb $v0, 0x01D5($sp) -/* 001A8 8085F7F8 A3A201D4 */ sb $v0, 0x01D4($sp) -/* 001AC 8085F7FC A3A201D2 */ sb $v0, 0x01D2($sp) -/* 001B0 8085F800 A3A201D1 */ sb $v0, 0x01D1($sp) -/* 001B4 8085F804 A3A201D0 */ sb $v0, 0x01D0($sp) -/* 001B8 8085F808 A3A201CF */ sb $v0, 0x01CF($sp) -/* 001BC 8085F80C A3A201CE */ sb $v0, 0x01CE($sp) -/* 001C0 8085F810 A3A201CD */ sb $v0, 0x01CD($sp) -/* 001C4 8085F814 A3A201CC */ sb $v0, 0x01CC($sp) -/* 001C8 8085F818 A3A001D7 */ sb $zero, 0x01D7($sp) -/* 001CC 8085F81C A3A001DB */ sb $zero, 0x01DB($sp) -/* 001D0 8085F820 A3A801D3 */ sb $t0, 0x01D3($sp) -/* 001D4 8085F824 AFA901DC */ sw $t1, 0x01DC($sp) -/* 001D8 8085F828 AFA001E0 */ sw $zero, 0x01E0($sp) -/* 001DC 8085F82C AFAA01E4 */ sw $t2, 0x01E4($sp) -/* 001E0 8085F830 AFAB0014 */ sw $t3, 0x0014($sp) -/* 001E4 8085F834 AFA00010 */ sw $zero, 0x0010($sp) -/* 001E8 8085F838 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 001EC 8085F83C 2605080C */ addiu $a1, $s0, 0x080C ## $a1 = 0000080C -/* 001F0 8085F840 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 001F4 8085F844 0C009B35 */ jal Effect_Add - ## Effect_Add -/* 001F8 8085F848 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 001FC 8085F84C 860C001C */ lh $t4, 0x001C($s0) ## 0000001C -/* 00200 8085F850 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00204 8085F854 11810005 */ beq $t4, $at, .L8085F86C -/* 00208 8085F858 00000000 */ nop -/* 0020C 8085F85C 0C217F74 */ jal func_8085FDD0 -/* 00210 8085F860 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00214 8085F864 10000004 */ beq $zero, $zero, .L8085F878 -/* 00218 8085F868 860D001C */ lh $t5, 0x001C($s0) ## 0000001C -.L8085F86C: -/* 0021C 8085F86C 0C217FCA */ jal func_8085FF28 -/* 00220 8085F870 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00224 8085F874 860D001C */ lh $t5, 0x001C($s0) ## 0000001C -.L8085F878: -/* 00228 8085F878 55A00005 */ bnel $t5, $zero, .L8085F890 -/* 0022C 8085F87C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00230 8085F880 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 00234 8085F884 35CF0080 */ ori $t7, $t6, 0x0080 ## $t7 = 00000080 -/* 00238 8085F888 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 0023C 8085F88C 8FBF002C */ lw $ra, 0x002C($sp) -.L8085F890: -/* 00240 8085F890 8FB00024 */ lw $s0, 0x0024($sp) -/* 00244 8085F894 8FB10028 */ lw $s1, 0x0028($sp) -/* 00248 8085F898 03E00008 */ jr $ra -/* 0024C 8085F89C 27BD01E8 */ addiu $sp, $sp, 0x01E8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_SetupAction.s b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_SetupAction.s deleted file mode 100644 index 23b83ce05a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_SetupAction.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel EnTest_SetupAction -/* 00000 8085F650 03E00008 */ jr $ra -/* 00004 8085F654 AC8507CC */ sw $a1, 0x07CC($a0) ## 000007CC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s deleted file mode 100644 index 746b5f6b12..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s +++ /dev/null @@ -1,312 +0,0 @@ -.late_rodata -glabel jtbl_808647E4 -.word L808638F4 -.word L808637D4 -.word L80863848 -.word L80863870 -.word L80863884 - -.text -glabel EnTest_Update -/* 04044 80863694 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 04048 80863698 AFBF002C */ sw $ra, 0x002C($sp) -/* 0404C 8086369C AFB00028 */ sw $s0, 0x0028($sp) -/* 04050 808636A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04054 808636A4 0C218D3E */ jal func_808634F8 -/* 04058 808636A8 AFA50054 */ sw $a1, 0x0054($sp) -/* 0405C 808636AC 920E00B1 */ lbu $t6, 0x00B1($s0) ## 000000B1 -/* 04060 808636B0 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 04064 808636B4 51C100A7 */ beql $t6, $at, .L80863954 -/* 04068 808636B8 26050810 */ addiu $a1, $s0, 0x0810 ## $a1 = 00000810 -/* 0406C 808636BC 0C00B638 */ jal Actor_MoveForward - -/* 04070 808636C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04074 808636C4 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 04078 808636C8 44810000 */ mtc1 $at, $f0 ## $f0 = 30.00 -/* 0407C 808636CC 240F001D */ addiu $t7, $zero, 0x001D ## $t7 = 0000001D -/* 04080 808636D0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 04084 808636D4 44070000 */ mfc1 $a3, $f0 -/* 04088 808636D8 8FA40054 */ lw $a0, 0x0054($sp) -/* 0408C 808636DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04090 808636E0 3C064296 */ lui $a2, 0x4296 ## $a2 = 42960000 -/* 04094 808636E4 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 04098 808636E8 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 0409C 808636EC 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 040A0 808636F0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 040A4 808636F4 5701001F */ bnel $t8, $at, .L80863774 -/* 040A8 808636F8 96090088 */ lhu $t1, 0x0088($s0) ## 00000088 -/* 040AC 808636FC C600000C */ lwc1 $f0, 0x000C($s0) ## 0000000C -/* 040B0 80863700 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 040B4 80863704 4600203E */ c.le.s $f4, $f0 -/* 040B8 80863708 00000000 */ nop -/* 040BC 8086370C 45020005 */ bc1fl .L80863724 -/* 040C0 80863710 C6080080 */ lwc1 $f8, 0x0080($s0) ## 00000080 -/* 040C4 80863714 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 040C8 80863718 E6000028 */ swc1 $f0, 0x0028($s0) ## 00000028 -/* 040CC 8086371C E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 -/* 040D0 80863720 C6080080 */ lwc1 $f8, 0x0080($s0) ## 00000080 -.L80863724: -/* 040D4 80863724 4600403E */ c.le.s $f8, $f0 -/* 040D8 80863728 00000000 */ nop -/* 040DC 8086372C 45020003 */ bc1fl .L8086373C -/* 040E0 80863730 8E1907CC */ lw $t9, 0x07CC($s0) ## 000007CC -/* 040E4 80863734 E6000080 */ swc1 $f0, 0x0080($s0) ## 00000080 -.L80863738: -/* 040E8 80863738 8E1907CC */ lw $t9, 0x07CC($s0) ## 000007CC -.L8086373C: -/* 040EC 8086373C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 040F0 80863740 8FA50054 */ lw $a1, 0x0054($sp) -/* 040F4 80863744 0320F809 */ jalr $ra, $t9 -/* 040F8 80863748 00000000 */ nop -/* 040FC 8086374C 920207DE */ lbu $v0, 0x07DE($s0) ## 000007DE -/* 04100 80863750 2C410005 */ sltiu $at, $v0, 0x0005 -/* 04104 80863754 10200067 */ beq $at, $zero, .L808638F4 -/* 04108 80863758 00024080 */ sll $t0, $v0, 2 -/* 0410C 8086375C 3C018086 */ lui $at, %hi(jtbl_808647E4) ## $at = 80860000 -/* 04110 80863760 00280821 */ addu $at, $at, $t0 -/* 04114 80863764 8C2847E4 */ lw $t0, %lo(jtbl_808647E4)($at) -/* 04118 80863768 01000008 */ jr $t0 -/* 0411C 8086376C 00000000 */ nop -/* 04120 80863770 96090088 */ lhu $t1, 0x0088($s0) ## 00000088 -.L80863774: -/* 04124 80863774 8FA40054 */ lw $a0, 0x0054($sp) -/* 04128 80863778 312A0002 */ andi $t2, $t1, 0x0002 ## $t2 = 00000000 -/* 0412C 8086377C 1140FFEE */ beq $t2, $zero, .L80863738 -/* 04130 80863780 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 04134 80863784 8E050078 */ lw $a1, 0x0078($s0) ## 00000078 -/* 04138 80863788 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D -/* 0413C 8086378C 0C0107A9 */ jal func_80041EA4 -/* 04140 80863790 AFA40038 */ sw $a0, 0x0038($sp) -/* 04144 80863794 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 04148 80863798 1041000A */ beq $v0, $at, .L808637C4 -/* 0414C 8086379C 8FA40038 */ lw $a0, 0x0038($sp) -/* 04150 808637A0 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 04154 808637A4 10410007 */ beq $v0, $at, .L808637C4 -/* 04158 808637A8 00000000 */ nop -/* 0415C 808637AC 8E050078 */ lw $a1, 0x0078($s0) ## 00000078 -/* 04160 808637B0 0C010753 */ jal func_80041D4C -/* 04164 808637B4 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D -/* 04168 808637B8 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 0416C 808637BC 5441FFDF */ bnel $v0, $at, .L8086373C -/* 04170 808637C0 8E1907CC */ lw $t9, 0x07CC($s0) ## 000007CC -.L808637C4: -/* 04174 808637C4 0C00B55C */ jal Actor_Kill - -/* 04178 808637C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0417C 808637CC 100000B6 */ beq $zero, $zero, .L80863AA8 -/* 04180 808637D0 8FBF002C */ lw $ra, 0x002C($sp) -glabel L808637D4 -/* 04184 808637D4 3C040600 */ lui $a0, %hi(D_06001C20) ## $a0 = 06000000 -/* 04188 808637D8 0C028800 */ jal Animation_GetLastFrame - -/* 0418C 808637DC 24841C20 */ addiu $a0, $a0, %lo(D_06001C20) ## $a0 = 06001C20 -/* 04190 808637E0 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 04194 808637E4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 04198 808637E8 44810000 */ mtc1 $at, $f0 ## $f0 = 2.00 -/* 0419C 808637EC 46805420 */ cvt.s.w $f16, $f10 -/* 041A0 808637F0 3C050600 */ lui $a1, %hi(D_06001C20) ## $a1 = 06000000 -/* 041A4 808637F4 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 041A8 808637F8 44060000 */ mfc1 $a2, $f0 -/* 041AC 808637FC AFAB0014 */ sw $t3, 0x0014($sp) -/* 041B0 80863800 24A51C20 */ addiu $a1, $a1, %lo(D_06001C20) ## $a1 = 06001C20 -/* 041B4 80863804 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 041B8 80863808 260404A8 */ addiu $a0, $s0, 0x04A8 ## $a0 = 000004A8 -/* 041BC 8086380C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 041C0 80863810 0C029468 */ jal Animation_Change - -/* 041C4 80863814 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 041C8 80863818 3C0C8086 */ lui $t4, %hi(D_80864510) ## $t4 = 80860000 -/* 041CC 8086381C 258C4510 */ addiu $t4, $t4, %lo(D_80864510) ## $t4 = 80864510 -/* 041D0 80863820 92050188 */ lbu $a1, 0x0188($s0) ## 00000188 -/* 041D4 80863824 8E0601A8 */ lw $a2, 0x01A8($s0) ## 000001A8 -/* 041D8 80863828 8E0704C8 */ lw $a3, 0x04C8($s0) ## 000004C8 -/* 041DC 8086382C AFAC0010 */ sw $t4, 0x0010($sp) -/* 041E0 80863830 0C028D52 */ jal AnimationContext_SetCopyTrue -/* 041E4 80863834 8FA40054 */ lw $a0, 0x0054($sp) -/* 041E8 80863838 920D07DE */ lbu $t5, 0x07DE($s0) ## 000007DE -/* 041EC 8086383C 25AE0001 */ addiu $t6, $t5, 0x0001 ## $t6 = 00000001 -/* 041F0 80863840 1000002C */ beq $zero, $zero, .L808638F4 -/* 041F4 80863844 A20E07DE */ sb $t6, 0x07DE($s0) ## 000007DE -glabel L80863848 -/* 041F8 80863848 0C02927F */ jal SkelAnime_Update - -/* 041FC 8086384C 260404A8 */ addiu $a0, $s0, 0x04A8 ## $a0 = 000004A8 -/* 04200 80863850 3C078086 */ lui $a3, %hi(D_80864510) ## $a3 = 80860000 -/* 04204 80863854 24E74510 */ addiu $a3, $a3, %lo(D_80864510) ## $a3 = 80864510 -/* 04208 80863858 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 0420C 8086385C 8E0501A8 */ lw $a1, 0x01A8($s0) ## 000001A8 -/* 04210 80863860 0C02950A */ jal SkelAnime_CopyFrameTableTrue -/* 04214 80863864 8E0604C8 */ lw $a2, 0x04C8($s0) ## 000004C8 -/* 04218 80863868 10000023 */ beq $zero, $zero, .L808638F8 -/* 0421C 8086386C 92180114 */ lbu $t8, 0x0114($s0) ## 00000114 -glabel L80863870 -/* 04220 80863870 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 04224 80863874 44819000 */ mtc1 $at, $f18 ## $f18 = 4.00 -/* 04228 80863878 244F0001 */ addiu $t7, $v0, 0x0001 ## $t7 = 00000001 -/* 0422C 8086387C A20F07DE */ sb $t7, 0x07DE($s0) ## 000007DE -/* 04230 80863880 E61204D0 */ swc1 $f18, 0x04D0($s0) ## 000004D0 -glabel L80863884 -/* 04234 80863884 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 04238 80863888 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 0423C 8086388C C60004D0 */ lwc1 $f0, 0x04D0($s0) ## 000004D0 -/* 04240 80863890 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 04244 80863894 460C0101 */ sub.s $f4, $f0, $f12 -/* 04248 80863898 46000086 */ mov.s $f2, $f0 -/* 0424C 8086389C E60404D0 */ swc1 $f4, 0x04D0($s0) ## 000004D0 -/* 04250 808638A0 C60004D0 */ lwc1 $f0, 0x04D0($s0) ## 000004D0 -/* 04254 808638A4 4606003E */ c.le.s $f0, $f6 -/* 04258 808638A8 00000000 */ nop -/* 0425C 808638AC 45020004 */ bc1fl .L808638C0 -/* 04260 808638B0 46020203 */ div.s $f8, $f0, $f2 -/* 04264 808638B4 A20007DE */ sb $zero, 0x07DE($s0) ## 000007DE -/* 04268 808638B8 C60004D0 */ lwc1 $f0, 0x04D0($s0) ## 000004D0 -/* 0426C 808638BC 46020203 */ div.s $f8, $f0, $f2 -.L808638C0: -/* 04270 808638C0 8E0504C8 */ lw $a1, 0x04C8($s0) ## 000004C8 -/* 04274 808638C4 92040188 */ lbu $a0, 0x0188($s0) ## 00000188 -/* 04278 808638C8 8E0701A8 */ lw $a3, 0x01A8($s0) ## 000001A8 -/* 0427C 808638CC 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 04280 808638D0 46086281 */ sub.s $f10, $f12, $f8 -/* 04284 808638D4 0C028B9C */ jal SkelAnime_InterpFrameTable -/* 04288 808638D8 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 0428C 808638DC 3C078086 */ lui $a3, %hi(D_80864510) ## $a3 = 80860000 -/* 04290 808638E0 24E74510 */ addiu $a3, $a3, %lo(D_80864510) ## $a3 = 80864510 -/* 04294 808638E4 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 04298 808638E8 8E0501A8 */ lw $a1, 0x01A8($s0) ## 000001A8 -/* 0429C 808638EC 0C02950A */ jal SkelAnime_CopyFrameTableTrue -/* 042A0 808638F0 8E0604C8 */ lw $a2, 0x04C8($s0) ## 000004C8 -glabel L808638F4 -.L808638F4: -/* 042A4 808638F4 92180114 */ lbu $t8, 0x0114($s0) ## 00000114 -.L808638F8: -/* 042A8 808638F8 57000016 */ bnel $t8, $zero, .L80863954 -/* 042AC 808638FC 26050810 */ addiu $a1, $s0, 0x0810 ## $a1 = 00000810 -/* 042B0 80863900 921900AF */ lbu $t9, 0x00AF($s0) ## 000000AF -/* 042B4 80863904 53200013 */ beql $t9, $zero, .L80863954 -/* 042B8 80863908 26050810 */ addiu $a1, $s0, 0x0810 ## $a1 = 00000810 -/* 042BC 8086390C 920207C8 */ lbu $v0, 0x07C8($s0) ## 000007C8 -/* 042C0 80863910 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 042C4 80863914 260407D2 */ addiu $a0, $s0, 0x07D2 ## $a0 = 000007D2 -/* 042C8 80863918 10410009 */ beq $v0, $at, .L80863940 -/* 042CC 8086391C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 042D0 80863920 24010017 */ addiu $at, $zero, 0x0017 ## $at = 00000017 -/* 042D4 80863924 50410007 */ beql $v0, $at, .L80863944 -/* 042D8 80863928 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 042DC 8086392C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 042E0 80863930 0C218D18 */ jal func_80863460 -/* 042E4 80863934 8FA50054 */ lw $a1, 0x0054($sp) -/* 042E8 80863938 10000006 */ beq $zero, $zero, .L80863954 -/* 042EC 8086393C 26050810 */ addiu $a1, $s0, 0x0810 ## $a1 = 00000810 -.L80863940: -/* 042F0 80863940 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -.L80863944: -/* 042F4 80863944 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 042F8 80863948 0C01E1A7 */ jal Math_SmoothStepToS - -/* 042FC 8086394C AFA00010 */ sw $zero, 0x0010($sp) -/* 04300 80863950 26050810 */ addiu $a1, $s0, 0x0810 ## $a1 = 00000810 -.L80863954: -/* 04304 80863954 AFA50034 */ sw $a1, 0x0034($sp) -/* 04308 80863958 0C0189B7 */ jal Collider_UpdateCylinder - -/* 0430C 8086395C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04310 80863960 8E080028 */ lw $t0, 0x0028($s0) ## 00000028 -/* 04314 80863964 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 04318 80863968 8E090024 */ lw $t1, 0x0024($s0) ## 00000024 -/* 0431C 8086396C AE08003C */ sw $t0, 0x003C($s0) ## 0000003C -/* 04320 80863970 C610003C */ lwc1 $f16, 0x003C($s0) ## 0000003C -/* 04324 80863974 44819000 */ mtc1 $at, $f18 ## $f18 = 45.00 -/* 04328 80863978 AE090038 */ sw $t1, 0x0038($s0) ## 00000038 -/* 0432C 8086397C 8E09002C */ lw $t1, 0x002C($s0) ## 0000002C -/* 04330 80863980 46128100 */ add.s $f4, $f16, $f18 -/* 04334 80863984 920A00AF */ lbu $t2, 0x00AF($s0) ## 000000AF -/* 04338 80863988 AE090040 */ sw $t1, 0x0040($s0) ## 00000040 -/* 0433C 8086398C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 04340 80863990 E604003C */ swc1 $f4, 0x003C($s0) ## 0000003C -/* 04344 80863994 1D400003 */ bgtz $t2, .L808639A4 -/* 04348 80863998 8FA40054 */ lw $a0, 0x0054($sp) -/* 0434C 8086399C 920B0114 */ lbu $t3, 0x0114($s0) ## 00000114 -/* 04350 808639A0 1160001B */ beq $t3, $zero, .L80863A10 -.L808639A4: -/* 04354 808639A4 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 04358 808639A8 00812821 */ addu $a1, $a0, $at -/* 0435C 808639AC AFA50038 */ sw $a1, 0x0038($sp) -/* 04360 808639B0 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 04364 808639B4 8FA60034 */ lw $a2, 0x0034($sp) -/* 04368 808639B8 920C07C8 */ lbu $t4, 0x07C8($s0) ## 000007C8 -/* 0436C 808639BC 2981000A */ slti $at, $t4, 0x000A -/* 04370 808639C0 5420000D */ bnel $at, $zero, .L808639F8 -/* 04374 808639C4 921807DE */ lbu $t8, 0x07DE($s0) ## 000007DE -/* 04378 808639C8 920D0114 */ lbu $t5, 0x0114($s0) ## 00000114 -/* 0437C 808639CC 8FA40054 */ lw $a0, 0x0054($sp) -/* 04380 808639D0 8FA50038 */ lw $a1, 0x0038($sp) -/* 04384 808639D4 11A00005 */ beq $t5, $zero, .L808639EC -/* 04388 808639D8 00000000 */ nop -/* 0438C 808639DC 960E0112 */ lhu $t6, 0x0112($s0) ## 00000112 -/* 04390 808639E0 31CF4000 */ andi $t7, $t6, 0x4000 ## $t7 = 00000000 -/* 04394 808639E4 55E00004 */ bnel $t7, $zero, .L808639F8 -/* 04398 808639E8 921807DE */ lbu $t8, 0x07DE($s0) ## 000007DE -.L808639EC: -/* 0439C 808639EC 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 043A0 808639F0 8FA60034 */ lw $a2, 0x0034($sp) -/* 043A4 808639F4 921807DE */ lbu $t8, 0x07DE($s0) ## 000007DE -.L808639F8: -/* 043A8 808639F8 8FA40054 */ lw $a0, 0x0054($sp) -/* 043AC 808639FC 8FA50038 */ lw $a1, 0x0038($sp) -/* 043B0 80863A00 53000004 */ beql $t8, $zero, .L80863A14 -/* 043B4 80863A04 82190808 */ lb $t9, 0x0808($s0) ## 00000808 -/* 043B8 80863A08 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 043BC 80863A0C 260608DC */ addiu $a2, $s0, 0x08DC ## $a2 = 000008DC -.L80863A10: -/* 043C0 80863A10 82190808 */ lb $t9, 0x0808($s0) ## 00000808 -.L80863A14: -/* 043C4 80863A14 5B200011 */ blezl $t9, .L80863A5C -/* 043C8 80863A18 860B001C */ lh $t3, 0x001C($s0) ## 0000001C -/* 043CC 80863A1C 9202086C */ lbu $v0, 0x086C($s0) ## 0000086C -/* 043D0 80863A20 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 043D4 80863A24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 043D8 80863A28 30480004 */ andi $t0, $v0, 0x0004 ## $t0 = 00000000 -/* 043DC 80863A2C 15000008 */ bne $t0, $zero, .L80863A50 -/* 043E0 80863A30 304AFFFB */ andi $t2, $v0, 0xFFFB ## $t2 = 00000000 -/* 043E4 80863A34 8FA40054 */ lw $a0, 0x0054($sp) -/* 043E8 80863A38 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 043EC 80863A3C 2606085C */ addiu $a2, $s0, 0x085C ## $a2 = 0000085C -/* 043F0 80863A40 0C0175E7 */ jal CollisionCheck_SetAT - ## CollisionCheck_setAT -/* 043F4 80863A44 00812821 */ addu $a1, $a0, $at -/* 043F8 80863A48 10000004 */ beq $zero, $zero, .L80863A5C -/* 043FC 80863A4C 860B001C */ lh $t3, 0x001C($s0) ## 0000001C -.L80863A50: -/* 04400 80863A50 0C218C90 */ jal func_80863240 -/* 04404 80863A54 A20A086C */ sb $t2, 0x086C($s0) ## 0000086C -/* 04408 80863A58 860B001C */ lh $t3, 0x001C($s0) ## 0000001C -.L80863A5C: -/* 0440C 80863A5C 8FAC0054 */ lw $t4, 0x0054($sp) -/* 04410 80863A60 55600011 */ bnel $t3, $zero, .L80863AA8 -/* 04414 80863A64 8FBF002C */ lw $ra, 0x002C($sp) -/* 04418 80863A68 918D1C27 */ lbu $t5, 0x1C27($t4) ## 00001C27 -/* 0441C 80863A6C 3C188003 */ lui $t8, %hi(ActorShadow_DrawFeet) -/* 04420 80863A70 51A00008 */ beql $t5, $zero, .L80863A94 -/* 04424 80863A74 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 -/* 04428 80863A78 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 0442C 80863A7C 2718B8C4 */ addiu $t8, %lo(ActorShadow_DrawFeet) -/* 04430 80863A80 AE1800C0 */ sw $t8, 0x00C0($s0) ## 000000C0 -/* 04434 80863A84 35CF0081 */ ori $t7, $t6, 0x0081 ## $t7 = 00000081 -/* 04438 80863A88 10000006 */ beq $zero, $zero, .L80863AA4 -/* 0443C 80863A8C AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 04440 80863A90 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 -.L80863A94: -/* 04444 80863A94 2401FF7E */ addiu $at, $zero, 0xFF7E ## $at = FFFFFF7E -/* 04448 80863A98 AE0000C0 */ sw $zero, 0x00C0($s0) ## 000000C0 -/* 0444C 80863A9C 03214024 */ and $t0, $t9, $at -/* 04450 80863AA0 AE080004 */ sw $t0, 0x0004($s0) ## 00000004 -.L80863AA4: -/* 04454 80863AA4 8FBF002C */ lw $ra, 0x002C($sp) -.L80863AA8: -/* 04458 80863AA8 8FB00028 */ lw $s0, 0x0028($sp) -/* 0445C 80863AAC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 04460 80863AB0 03E00008 */ jr $ra -/* 04464 80863AB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085F938.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085F938.s deleted file mode 100644 index 8c84091b94..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085F938.s +++ /dev/null @@ -1,121 +0,0 @@ -.late_rodata -glabel jtbl_80864720 -.word L8085FA00 -.word L8085FA00 -.word L8085FA98 -.word L8085FA84 -.word L8085FA84 -.word L8085FA00 -.word L8085FA00 -.word L8085FA84 -.word L8085FA74 -.word L8085FA98 -.word L8085FA98 - -.text -glabel func_8085F938 -/* 002E8 8085F938 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002EC 8085F93C AFBF0014 */ sw $ra, 0x0014($sp) -/* 002F0 8085F940 AFA5001C */ sw $a1, 0x001C($sp) -/* 002F4 8085F944 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 002F8 8085F948 AFA40018 */ sw $a0, 0x0018($sp) -/* 002FC 8085F94C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00300 8085F950 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 00304 8085F954 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00308 8085F958 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 0030C 8085F95C 46040182 */ mul.s $f6, $f0, $f4 -/* 00310 8085F960 8FA60018 */ lw $a2, 0x0018($sp) -/* 00314 8085F964 444EF800 */ cfc1 $t6, $31 -/* 00318 8085F968 44CFF800 */ ctc1 $t7, $31 -/* 0031C 8085F96C 00000000 */ nop -/* 00320 8085F970 46003224 */ cvt.w.s $f8, $f6 -/* 00324 8085F974 444FF800 */ cfc1 $t7, $31 -/* 00328 8085F978 00000000 */ nop -/* 0032C 8085F97C 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 00330 8085F980 51E00013 */ beql $t7, $zero, .L8085F9D0 -/* 00334 8085F984 440F4000 */ mfc1 $t7, $f8 -/* 00338 8085F988 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 -/* 0033C 8085F98C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00340 8085F990 46083201 */ sub.s $f8, $f6, $f8 -/* 00344 8085F994 44CFF800 */ ctc1 $t7, $31 -/* 00348 8085F998 00000000 */ nop -/* 0034C 8085F99C 46004224 */ cvt.w.s $f8, $f8 -/* 00350 8085F9A0 444FF800 */ cfc1 $t7, $31 -/* 00354 8085F9A4 00000000 */ nop -/* 00358 8085F9A8 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 0035C 8085F9AC 15E00005 */ bne $t7, $zero, .L8085F9C4 -/* 00360 8085F9B0 00000000 */ nop -/* 00364 8085F9B4 440F4000 */ mfc1 $t7, $f8 -/* 00368 8085F9B8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0036C 8085F9BC 10000007 */ beq $zero, $zero, .L8085F9DC -/* 00370 8085F9C0 01E17825 */ or $t7, $t7, $at ## $t7 = 80000000 -.L8085F9C4: -/* 00374 8085F9C4 10000005 */ beq $zero, $zero, .L8085F9DC -/* 00378 8085F9C8 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 0037C 8085F9CC 440F4000 */ mfc1 $t7, $f8 -.L8085F9D0: -/* 00380 8085F9D0 00000000 */ nop -/* 00384 8085F9D4 05E0FFFB */ bltz $t7, .L8085F9C4 -/* 00388 8085F9D8 00000000 */ nop -.L8085F9DC: -/* 0038C 8085F9DC 44CEF800 */ ctc1 $t6, $31 -/* 00390 8085F9E0 2DE1000B */ sltiu $at, $t7, 0x000B -/* 00394 8085F9E4 1020002E */ beq $at, $zero, .L8085FAA0 -/* 00398 8085F9E8 000F7880 */ sll $t7, $t7, 2 -/* 0039C 8085F9EC 3C018086 */ lui $at, %hi(jtbl_80864720) ## $at = 80860000 -/* 003A0 8085F9F0 002F0821 */ addu $at, $at, $t7 -/* 003A4 8085F9F4 8C2F4720 */ lw $t7, %lo(jtbl_80864720)($at) -/* 003A8 8085F9F8 01E00008 */ jr $t7 -/* 003AC 8085F9FC 00000000 */ nop -glabel L8085FA00 -/* 003B0 8085FA00 3C01435C */ lui $at, 0x435C ## $at = 435C0000 -/* 003B4 8085FA04 44815000 */ mtc1 $at, $f10 ## $f10 = 220.00 -/* 003B8 8085FA08 C4C00090 */ lwc1 $f0, 0x0090($a2) ## 00000090 -/* 003BC 8085FA0C 3C01432A */ lui $at, 0x432A ## $at = 432A0000 -/* 003C0 8085FA10 460A003C */ c.lt.s $f0, $f10 -/* 003C4 8085FA14 00000000 */ nop -/* 003C8 8085FA18 45000016 */ bc1f .L8085FA74 -/* 003CC 8085FA1C 00000000 */ nop -/* 003D0 8085FA20 44818000 */ mtc1 $at, $f16 ## $f16 = 170.00 -/* 003D4 8085FA24 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 003D8 8085FA28 2405071C */ addiu $a1, $zero, 0x071C ## $a1 = 0000071C -/* 003DC 8085FA2C 4600803C */ c.lt.s $f16, $f0 -/* 003E0 8085FA30 00000000 */ nop -/* 003E4 8085FA34 4500000F */ bc1f .L8085FA74 -/* 003E8 8085FA38 00000000 */ nop -/* 003EC 8085FA3C 0C00B821 */ jal Actor_IsFacingPlayer -/* 003F0 8085FA40 AFA60018 */ sw $a2, 0x0018($sp) -/* 003F4 8085FA44 1040000B */ beq $v0, $zero, .L8085FA74 -/* 003F8 8085FA48 8FA60018 */ lw $a2, 0x0018($sp) -/* 003FC 8085FA4C 8FA4001C */ lw $a0, 0x001C($sp) -/* 00400 8085FA50 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 00404 8085FA54 0C00CEA1 */ jal Actor_IsTargeted -/* 00408 8085FA58 AFA60018 */ sw $a2, 0x0018($sp) -/* 0040C 8085FA5C 10400005 */ beq $v0, $zero, .L8085FA74 -/* 00410 8085FA60 8FA60018 */ lw $a2, 0x0018($sp) -/* 00414 8085FA64 0C2186E5 */ jal func_80861B94 -/* 00418 8085FA68 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0041C 8085FA6C 1000000D */ beq $zero, $zero, .L8085FAA4 -/* 00420 8085FA70 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L8085FA74 -.L8085FA74: -/* 00424 8085FA74 0C21810E */ jal func_80860438 -/* 00428 8085FA78 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0042C 8085FA7C 10000009 */ beq $zero, $zero, .L8085FAA4 -/* 00430 8085FA80 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L8085FA84 -/* 00434 8085FA84 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00438 8085FA88 0C2189F1 */ jal func_808627C4 -/* 0043C 8085FA8C 8FA5001C */ lw $a1, 0x001C($sp) -/* 00440 8085FA90 10000004 */ beq $zero, $zero, .L8085FAA4 -/* 00444 8085FA94 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L8085FA98 -/* 00448 8085FA98 0C2187B0 */ jal func_80861EC0 -/* 0044C 8085FA9C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -.L8085FAA0: -/* 00450 8085FAA0 8FBF0014 */ lw $ra, 0x0014($sp) -.L8085FAA4: -/* 00454 8085FAA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00458 8085FAA8 03E00008 */ jr $ra -/* 0045C 8085FAAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FAB0.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FAB0.s deleted file mode 100644 index 204647d91d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FAB0.s +++ /dev/null @@ -1,238 +0,0 @@ -.late_rodata -glabel jtbl_8086474C -.word L8085FBBC -.word L8085FBCC -.word L8085FBE0 -.word L8085FBBC -.word L8085FBE0 -.word L8085FBCC -.word L8085FBCC -.word L8085FBBC -.word L8085FBCC -.word L8085FBE0 - -glabel D_80864774 - .float 0.2 - -.text -glabel func_8085FAB0 -/* 00460 8085FAB0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00464 8085FAB4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00468 8085FAB8 8CA81C44 */ lw $t0, 0x1C44($a1) ## 00001C44 -/* 0046C 8085FABC 848300B6 */ lh $v1, 0x00B6($a0) ## 000000B6 -/* 00470 8085FAC0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00474 8085FAC4 850E00B6 */ lh $t6, 0x00B6($t0) ## 000000B6 -/* 00478 8085FAC8 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 0047C 8085FACC 01C31023 */ subu $v0, $t6, $v1 -/* 00480 8085FAD0 00021400 */ sll $v0, $v0, 16 -/* 00484 8085FAD4 00021403 */ sra $v0, $v0, 16 -/* 00488 8085FAD8 04430005 */ bgezl $v0, .L8085FAF0 -/* 0048C 8085FADC 284161A8 */ slti $at, $v0, 0x61A8 -/* 00490 8085FAE0 00021023 */ subu $v0, $zero, $v0 -/* 00494 8085FAE4 00021400 */ sll $v0, $v0, 16 -/* 00498 8085FAE8 00021403 */ sra $v0, $v0, 16 -/* 0049C 8085FAEC 284161A8 */ slti $at, $v0, 0x61A8 -.L8085FAF0: -/* 004A0 8085FAF0 54200046 */ bnel $at, $zero, .L8085FC0C -/* 004A4 8085FAF4 28413E81 */ slti $at, $v0, 0x3E81 -/* 004A8 8085FAF8 AFA60020 */ sw $a2, 0x0020($sp) -/* 004AC 8085FAFC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 004B0 8085FB00 AFA70024 */ sw $a3, 0x0024($sp) -/* 004B4 8085FB04 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 004B8 8085FB08 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 004BC 8085FB0C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 004C0 8085FB10 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 004C4 8085FB14 46040182 */ mul.s $f6, $f0, $f4 -/* 004C8 8085FB18 8FA60020 */ lw $a2, 0x0020($sp) -/* 004CC 8085FB1C 8FA70024 */ lw $a3, 0x0024($sp) -/* 004D0 8085FB20 444FF800 */ cfc1 $t7, $31 -/* 004D4 8085FB24 44D8F800 */ ctc1 $t8, $31 -/* 004D8 8085FB28 00000000 */ nop -/* 004DC 8085FB2C 46003224 */ cvt.w.s $f8, $f6 -/* 004E0 8085FB30 4458F800 */ cfc1 $t8, $31 -/* 004E4 8085FB34 00000000 */ nop -/* 004E8 8085FB38 33180078 */ andi $t8, $t8, 0x0078 ## $t8 = 00000000 -/* 004EC 8085FB3C 53000013 */ beql $t8, $zero, .L8085FB8C -/* 004F0 8085FB40 44184000 */ mfc1 $t8, $f8 -/* 004F4 8085FB44 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 -/* 004F8 8085FB48 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 004FC 8085FB4C 46083201 */ sub.s $f8, $f6, $f8 -/* 00500 8085FB50 44D8F800 */ ctc1 $t8, $31 -/* 00504 8085FB54 00000000 */ nop -/* 00508 8085FB58 46004224 */ cvt.w.s $f8, $f8 -/* 0050C 8085FB5C 4458F800 */ cfc1 $t8, $31 -/* 00510 8085FB60 00000000 */ nop -/* 00514 8085FB64 33180078 */ andi $t8, $t8, 0x0078 ## $t8 = 00000000 -/* 00518 8085FB68 17000005 */ bne $t8, $zero, .L8085FB80 -/* 0051C 8085FB6C 00000000 */ nop -/* 00520 8085FB70 44184000 */ mfc1 $t8, $f8 -/* 00524 8085FB74 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00528 8085FB78 10000007 */ beq $zero, $zero, .L8085FB98 -/* 0052C 8085FB7C 0301C025 */ or $t8, $t8, $at ## $t8 = 80000000 -.L8085FB80: -/* 00530 8085FB80 10000005 */ beq $zero, $zero, .L8085FB98 -/* 00534 8085FB84 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF -/* 00538 8085FB88 44184000 */ mfc1 $t8, $f8 -.L8085FB8C: -/* 0053C 8085FB8C 00000000 */ nop -/* 00540 8085FB90 0700FFFB */ bltz $t8, .L8085FB80 -/* 00544 8085FB94 00000000 */ nop -.L8085FB98: -/* 00548 8085FB98 44CFF800 */ ctc1 $t7, $31 -/* 0054C 8085FB9C 2F01000A */ sltiu $at, $t8, 0x000A -/* 00550 8085FBA0 10200087 */ beq $at, $zero, .L8085FDC0 -/* 00554 8085FBA4 0018C080 */ sll $t8, $t8, 2 -/* 00558 8085FBA8 3C018086 */ lui $at, %hi(jtbl_8086474C) ## $at = 80860000 -/* 0055C 8085FBAC 00380821 */ addu $at, $at, $t8 -/* 00560 8085FBB0 8C38474C */ lw $t8, %lo(jtbl_8086474C)($at) -/* 00564 8085FBB4 03000008 */ jr $t8 -/* 00568 8085FBB8 00000000 */ nop -glabel L8085FBBC -/* 0056C 8085FBBC 0C2187B0 */ jal func_80861EC0 -/* 00570 8085FBC0 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00574 8085FBC4 1000007F */ beq $zero, $zero, .L8085FDC4 -/* 00578 8085FBC8 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L8085FBCC -/* 0057C 8085FBCC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00580 8085FBD0 0C2189F1 */ jal func_808627C4 -/* 00584 8085FBD4 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00588 8085FBD8 1000007A */ beq $zero, $zero, .L8085FDC4 -/* 0058C 8085FBDC 8FBF0014 */ lw $ra, 0x0014($sp) -glabel L8085FBE0 -/* 00590 8085FBE0 84D9001C */ lh $t9, 0x001C($a2) ## 0000001C -/* 00594 8085FBE4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00598 8085FBE8 53210076 */ beql $t9, $at, .L8085FDC4 -/* 0059C 8085FBEC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005A0 8085FBF0 84C9008A */ lh $t1, 0x008A($a2) ## 0000008A -/* 005A4 8085FBF4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 005A8 8085FBF8 0C218653 */ jal func_8086194C -/* 005AC 8085FBFC A4C90032 */ sh $t1, 0x0032($a2) ## 00000032 -/* 005B0 8085FC00 10000070 */ beq $zero, $zero, .L8085FDC4 -/* 005B4 8085FC04 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005B8 8085FC08 28413E81 */ slti $at, $v0, 0x3E81 -.L8085FC0C: -/* 005BC 8085FC0C 1020006A */ beq $at, $zero, .L8085FDB8 -/* 005C0 8085FC10 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 005C4 8085FC14 84C5008A */ lh $a1, 0x008A($a2) ## 0000008A -/* 005C8 8085FC18 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 -/* 005CC 8085FC1C 01475021 */ addu $t2, $t2, $a3 -/* 005D0 8085FC20 00A31023 */ subu $v0, $a1, $v1 -/* 005D4 8085FC24 00021400 */ sll $v0, $v0, 16 -/* 005D8 8085FC28 00021403 */ sra $v0, $v0, 16 -/* 005DC 8085FC2C 04400003 */ bltz $v0, .L8085FC3C -/* 005E0 8085FC30 00021823 */ subu $v1, $zero, $v0 -/* 005E4 8085FC34 10000001 */ beq $zero, $zero, .L8085FC3C -/* 005E8 8085FC38 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L8085FC3C: -/* 005EC 8085FC3C 28613E81 */ slti $at, $v1, 0x3E81 -/* 005F0 8085FC40 54200032 */ bnel $at, $zero, .L8085FD0C -/* 005F4 8085FC44 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 -/* 005F8 8085FC48 8D4A1DE4 */ lw $t2, 0x1DE4($t2) ## 00011DE4 -/* 005FC 8085FC4C 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 -/* 00600 8085FC50 5160000B */ beql $t3, $zero, .L8085FC80 -/* 00604 8085FC54 3C01435C */ lui $at, 0x435C ## $at = 435C0000 -/* 00608 8085FC58 84CC001C */ lh $t4, 0x001C($a2) ## 0000001C -/* 0060C 8085FC5C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00610 8085FC60 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00614 8085FC64 51810006 */ beql $t4, $at, .L8085FC80 -/* 00618 8085FC68 3C01435C */ lui $at, 0x435C ## $at = 435C0000 -/* 0061C 8085FC6C 0C218653 */ jal func_8086194C -/* 00620 8085FC70 A4C50032 */ sh $a1, 0x0032($a2) ## 00000032 -/* 00624 8085FC74 10000053 */ beq $zero, $zero, .L8085FDC4 -/* 00628 8085FC78 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0062C 8085FC7C 3C01435C */ lui $at, 0x435C ## $at = 435C0000 -.L8085FC80: -/* 00630 8085FC80 44815000 */ mtc1 $at, $f10 ## $f10 = 220.00 -/* 00634 8085FC84 C4C00090 */ lwc1 $f0, 0x0090($a2) ## 00000090 -/* 00638 8085FC88 3C01432A */ lui $at, 0x432A ## $at = 432A0000 -/* 0063C 8085FC8C 460A003C */ c.lt.s $f0, $f10 -/* 00640 8085FC90 00000000 */ nop -/* 00644 8085FC94 45000018 */ bc1f .L8085FCF8 -/* 00648 8085FC98 00000000 */ nop -/* 0064C 8085FC9C 44818000 */ mtc1 $at, $f16 ## $f16 = 170.00 -/* 00650 8085FCA0 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00654 8085FCA4 2405071C */ addiu $a1, $zero, 0x071C ## $a1 = 0000071C -/* 00658 8085FCA8 4600803C */ c.lt.s $f16, $f0 -/* 0065C 8085FCAC 00000000 */ nop -/* 00660 8085FCB0 45000011 */ bc1f .L8085FCF8 -/* 00664 8085FCB4 00000000 */ nop -/* 00668 8085FCB8 AFA60020 */ sw $a2, 0x0020($sp) -/* 0066C 8085FCBC 0C00B821 */ jal Actor_IsFacingPlayer -/* 00670 8085FCC0 AFA70024 */ sw $a3, 0x0024($sp) -/* 00674 8085FCC4 8FA60020 */ lw $a2, 0x0020($sp) -/* 00678 8085FCC8 1040003D */ beq $v0, $zero, .L8085FDC0 -/* 0067C 8085FCCC 8FA70024 */ lw $a3, 0x0024($sp) -/* 00680 8085FCD0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00684 8085FCD4 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 00688 8085FCD8 0C00CEA1 */ jal Actor_IsTargeted -/* 0068C 8085FCDC AFA60020 */ sw $a2, 0x0020($sp) -/* 00690 8085FCE0 14400037 */ bne $v0, $zero, .L8085FDC0 -/* 00694 8085FCE4 8FA60020 */ lw $a2, 0x0020($sp) -/* 00698 8085FCE8 0C2186E5 */ jal func_80861B94 -/* 0069C 8085FCEC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 006A0 8085FCF0 10000034 */ beq $zero, $zero, .L8085FDC4 -/* 006A4 8085FCF4 8FBF0014 */ lw $ra, 0x0014($sp) -.L8085FCF8: -/* 006A8 8085FCF8 0C21810E */ jal func_80860438 -/* 006AC 8085FCFC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 006B0 8085FD00 10000030 */ beq $zero, $zero, .L8085FDC4 -/* 006B4 8085FD04 8FBF0014 */ lw $ra, 0x0014($sp) -/* 006B8 8085FD08 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 -.L8085FD0C: -/* 006BC 8085FD0C 44812000 */ mtc1 $at, $f4 ## $f4 = 110.00 -/* 006C0 8085FD10 C4D20090 */ lwc1 $f18, 0x0090($a2) ## 00000090 -/* 006C4 8085FD14 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 006C8 8085FD18 4604903C */ c.lt.s $f18, $f4 -/* 006CC 8085FD1C 00000000 */ nop -/* 006D0 8085FD20 45000021 */ bc1f .L8085FDA8 -/* 006D4 8085FD24 00000000 */ nop -/* 006D8 8085FD28 AFA60020 */ sw $a2, 0x0020($sp) -/* 006DC 8085FD2C AFA70024 */ sw $a3, 0x0024($sp) -/* 006E0 8085FD30 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 006E4 8085FD34 AFA80018 */ sw $t0, 0x0018($sp) -/* 006E8 8085FD38 3C018086 */ lui $at, %hi(D_80864774) ## $at = 80860000 -/* 006EC 8085FD3C C4264774 */ lwc1 $f6, %lo(D_80864774)($at) -/* 006F0 8085FD40 8FA60020 */ lw $a2, 0x0020($sp) -/* 006F4 8085FD44 8FA70024 */ lw $a3, 0x0024($sp) -/* 006F8 8085FD48 4600303C */ c.lt.s $f6, $f0 -/* 006FC 8085FD4C 8FA80018 */ lw $t0, 0x0018($sp) -/* 00700 8085FD50 4502001C */ bc1fl .L8085FDC4 -/* 00704 8085FD54 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00708 8085FD58 8D0D067C */ lw $t5, 0x067C($t0) ## 0000067C -/* 0070C 8085FD5C 31AE0010 */ andi $t6, $t5, 0x0010 ## $t6 = 00000000 -/* 00710 8085FD60 11C0000D */ beq $t6, $zero, .L8085FD98 -/* 00714 8085FD64 00000000 */ nop -/* 00718 8085FD68 90CF010C */ lbu $t7, 0x010C($a2) ## 0000010C -/* 0071C 8085FD6C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00720 8085FD70 11E00005 */ beq $t7, $zero, .L8085FD88 -/* 00724 8085FD74 00000000 */ nop -/* 00728 8085FD78 0C218506 */ jal func_80861418 -/* 0072C 8085FD7C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00730 8085FD80 10000010 */ beq $zero, $zero, .L8085FDC4 -/* 00734 8085FD84 8FBF0014 */ lw $ra, 0x0014($sp) -.L8085FD88: -/* 00738 8085FD88 0C2189F1 */ jal func_808627C4 -/* 0073C 8085FD8C 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00740 8085FD90 1000000C */ beq $zero, $zero, .L8085FDC4 -/* 00744 8085FD94 8FBF0014 */ lw $ra, 0x0014($sp) -.L8085FD98: -/* 00748 8085FD98 0C218506 */ jal func_80861418 -/* 0074C 8085FD9C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00750 8085FDA0 10000008 */ beq $zero, $zero, .L8085FDC4 -/* 00754 8085FDA4 8FBF0014 */ lw $ra, 0x0014($sp) -.L8085FDA8: -/* 00758 8085FDA8 0C217E4E */ jal func_8085F938 -/* 0075C 8085FDAC 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00760 8085FDB0 10000004 */ beq $zero, $zero, .L8085FDC4 -/* 00764 8085FDB4 8FBF0014 */ lw $ra, 0x0014($sp) -.L8085FDB8: -/* 00768 8085FDB8 0C217E4E */ jal func_8085F938 -/* 0076C 8085FDBC 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -.L8085FDC0: -/* 00770 8085FDC0 8FBF0014 */ lw $ra, 0x0014($sp) -.L8085FDC4: -/* 00774 8085FDC4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00778 8085FDC8 03E00008 */ jr $ra -/* 0077C 8085FDCC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FDD0.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FDD0.s deleted file mode 100644 index 092e314c18..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FDD0.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_8085FDD0 -/* 00780 8085FDD0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00784 8085FDD4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00788 8085FDD8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0078C 8085FDDC 3C050600 */ lui $a1, %hi(D_0600316C) ## $a1 = 06000000 -/* 00790 8085FDE0 24A5316C */ addiu $a1, $a1, %lo(D_0600316C) ## $a1 = 0600316C -/* 00794 8085FDE4 AFA60018 */ sw $a2, 0x0018($sp) -/* 00798 8085FDE8 0C0294BE */ jal Animation_PlayLoop -/* 0079C 8085FDEC 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 007A0 8085FDF0 8FA40018 */ lw $a0, 0x0018($sp) -/* 007A4 8085FDF4 3C014060 */ lui $at, 0x4060 ## $at = 40600000 -/* 007A8 8085FDF8 44814000 */ mtc1 $at, $f8 ## $f8 = 3.50 -/* 007AC 8085FDFC C486000C */ lwc1 $f6, 0x000C($a0) ## 0000000C -/* 007B0 8085FE00 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 -/* 007B4 8085FE04 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 007B8 8085FE08 46083281 */ sub.s $f10, $f6, $f8 -/* 007BC 8085FE0C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 007C0 8085FE10 240E000F */ addiu $t6, $zero, 0x000F ## $t6 = 0000000F -/* 007C4 8085FE14 3C058086 */ lui $a1, %hi(func_8085FE48) ## $a1 = 80860000 -/* 007C8 8085FE18 01E1C024 */ and $t8, $t7, $at -/* 007CC 8085FE1C 24A5FE48 */ addiu $a1, $a1, %lo(func_8085FE48) ## $a1 = 8085FE48 -/* 007D0 8085FE20 A08007C8 */ sb $zero, 0x07C8($a0) ## 000007C8 -/* 007D4 8085FE24 AC8E07E8 */ sw $t6, 0x07E8($a0) ## 000007E8 -/* 007D8 8085FE28 E48A0028 */ swc1 $f10, 0x0028($a0) ## 00000028 -/* 007DC 8085FE2C AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 007E0 8085FE30 0C217D94 */ jal EnTest_SetupAction -/* 007E4 8085FE34 E4840054 */ swc1 $f4, 0x0054($a0) ## 00000054 -/* 007E8 8085FE38 8FBF0014 */ lw $ra, 0x0014($sp) -/* 007EC 8085FE3C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007F0 8085FE40 03E00008 */ jr $ra -/* 007F4 8085FE44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FE48.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FE48.s deleted file mode 100644 index 6ffc1f86d0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FE48.s +++ /dev/null @@ -1,63 +0,0 @@ -glabel func_8085FE48 -/* 007F8 8085FE48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007FC 8085FE4C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00800 8085FE50 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00804 8085FE54 AFA5001C */ sw $a1, 0x001C($sp) -/* 00808 8085FE58 AFA60018 */ sw $a2, 0x0018($sp) -/* 0080C 8085FE5C 0C02927F */ jal SkelAnime_Update - -/* 00810 8085FE60 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 00814 8085FE64 8FA60018 */ lw $a2, 0x0018($sp) -/* 00818 8085FE68 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 0081C 8085FE6C 8CC207E8 */ lw $v0, 0x07E8($a2) ## 000007E8 -/* 00820 8085FE70 14400020 */ bne $v0, $zero, .L8085FEF4 -/* 00824 8085FE74 00000000 */ nop -/* 00828 8085FE78 C4C00094 */ lwc1 $f0, 0x0094($a2) ## 00000094 -/* 0082C 8085FE7C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00830 8085FE80 44813000 */ mtc1 $at, $f6 ## $f6 = 150.00 -/* 00834 8085FE84 3C058086 */ lui $a1, %hi(func_80863360) ## $a1 = 80860000 -/* 00838 8085FE88 4600203E */ c.le.s $f4, $f0 -/* 0083C 8085FE8C 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 00840 8085FE90 24A53360 */ addiu $a1, $a1, %lo(func_80863360) ## $a1 = 80863360 -/* 00844 8085FE94 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00848 8085FE98 45020004 */ bc1fl .L8085FEAC -/* 0084C 8085FE9C 46000087 */ neg.s $f2, $f0 -/* 00850 8085FEA0 10000002 */ beq $zero, $zero, .L8085FEAC -/* 00854 8085FEA4 46000086 */ mov.s $f2, $f0 -/* 00858 8085FEA8 46000087 */ neg.s $f2, $f0 -.L8085FEAC: -/* 0085C 8085FEAC 4606103C */ c.lt.s $f2, $f6 -/* 00860 8085FEB0 00000000 */ nop -/* 00864 8085FEB4 4500000F */ bc1f .L8085FEF4 -/* 00868 8085FEB8 00000000 */ nop -/* 0086C 8085FEBC A0CE07C8 */ sb $t6, 0x07C8($a2) ## 000007C8 -/* 00870 8085FEC0 0C217D94 */ jal EnTest_SetupAction -/* 00874 8085FEC4 AFA60018 */ sw $a2, 0x0018($sp) -/* 00878 8085FEC8 8FA60018 */ lw $a2, 0x0018($sp) -/* 0087C 8085FECC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00880 8085FED0 84C2008A */ lh $v0, 0x008A($a2) ## 0000008A -/* 00884 8085FED4 84CF001C */ lh $t7, 0x001C($a2) ## 0000001C -/* 00888 8085FED8 A4C20032 */ sh $v0, 0x0032($a2) ## 00000032 -/* 0088C 8085FEDC 11E1000E */ beq $t7, $at, .L8085FF18 -/* 00890 8085FEE0 A4C200B6 */ sh $v0, 0x00B6($a2) ## 000000B6 -/* 00894 8085FEE4 0C03D6B3 */ jal func_800F5ACC -/* 00898 8085FEE8 24040038 */ addiu $a0, $zero, 0x0038 ## $a0 = 00000038 -/* 0089C 8085FEEC 1000000B */ beq $zero, $zero, .L8085FF1C -/* 008A0 8085FEF0 8FBF0014 */ lw $ra, 0x0014($sp) -.L8085FEF4: -/* 008A4 8085FEF4 10400003 */ beq $v0, $zero, .L8085FF04 -/* 008A8 8085FEF8 3C014060 */ lui $at, 0x4060 ## $at = 40600000 -/* 008AC 8085FEFC 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 008B0 8085FF00 ACD807E8 */ sw $t8, 0x07E8($a2) ## 000007E8 -.L8085FF04: -/* 008B4 8085FF04 C4C8000C */ lwc1 $f8, 0x000C($a2) ## 0000000C -/* 008B8 8085FF08 44815000 */ mtc1 $at, $f10 ## $f10 = 3.50 -/* 008BC 8085FF0C 00000000 */ nop -/* 008C0 8085FF10 460A4401 */ sub.s $f16, $f8, $f10 -/* 008C4 8085FF14 E4D00028 */ swc1 $f16, 0x0028($a2) ## 00000028 -.L8085FF18: -/* 008C8 8085FF18 8FBF0014 */ lw $ra, 0x0014($sp) -.L8085FF1C: -/* 008CC 8085FF1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 008D0 8085FF20 03E00008 */ jr $ra -/* 008D4 8085FF24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF28.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF28.s deleted file mode 100644 index c3720aeea4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF28.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_8085FF28 -/* 008D8 8085FF28 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 008DC 8085FF2C AFBF0014 */ sw $ra, 0x0014($sp) -/* 008E0 8085FF30 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 008E4 8085FF34 3C050600 */ lui $a1, %hi(D_0600316C) ## $a1 = 06000000 -/* 008E8 8085FF38 24A5316C */ addiu $a1, $a1, %lo(D_0600316C) ## $a1 = 0600316C -/* 008EC 8085FF3C AFA60018 */ sw $a2, 0x0018($sp) -/* 008F0 8085FF40 0C0294BE */ jal Animation_PlayLoop -/* 008F4 8085FF44 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 008F8 8085FF48 8FA40018 */ lw $a0, 0x0018($sp) -/* 008FC 8085FF4C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 00900 8085FF50 44813000 */ mtc1 $at, $f6 ## $f6 = 150.00 -/* 00904 8085FF54 C484000C */ lwc1 $f4, 0x000C($a0) ## 0000000C -/* 00908 8085FF58 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0090C 8085FF5C A08007C8 */ sb $zero, 0x07C8($a0) ## 000007C8 -/* 00910 8085FF60 46062200 */ add.s $f8, $f4, $f6 -/* 00914 8085FF64 0C00B58B */ jal Actor_SetScale - -/* 00918 8085FF68 E4880028 */ swc1 $f8, 0x0028($a0) ## 00000028 -/* 0091C 8085FF6C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00920 8085FF70 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00924 8085FF74 3C058086 */ lui $a1, %hi(func_8085FF9C) ## $a1 = 80860000 -/* 00928 8085FF78 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 0092C 8085FF7C 24A5FF9C */ addiu $a1, $a1, %lo(func_8085FF9C) ## $a1 = 8085FF9C -/* 00930 8085FF80 01C17824 */ and $t7, $t6, $at -/* 00934 8085FF84 0C217D94 */ jal EnTest_SetupAction -/* 00938 8085FF88 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 0093C 8085FF8C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00940 8085FF90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00944 8085FF94 03E00008 */ jr $ra -/* 00948 8085FF98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF9C.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF9C.s deleted file mode 100644 index 0da89cd4f4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF9C.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel func_8085FF9C -/* 0094C 8085FF9C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00950 8085FFA0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00954 8085FFA4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00958 8085FFA8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0095C 8085FFAC AFA60018 */ sw $a2, 0x0018($sp) -/* 00960 8085FFB0 0C02927F */ jal SkelAnime_Update - -/* 00964 8085FFB4 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 00968 8085FFB8 8FA60018 */ lw $a2, 0x0018($sp) -/* 0096C 8085FFBC 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 00970 8085FFC0 44813000 */ mtc1 $at, $f6 ## $f6 = 150.00 -/* 00974 8085FFC4 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00978 8085FFC8 44818000 */ mtc1 $at, $f16 ## $f16 = 200.00 -/* 0097C 8085FFCC C4CA0090 */ lwc1 $f10, 0x0090($a2) ## 00000090 -/* 00980 8085FFD0 C4C4000C */ lwc1 $f4, 0x000C($a2) ## 0000000C -/* 00984 8085FFD4 3C0143E1 */ lui $at, 0x43E1 ## $at = 43E10000 -/* 00988 8085FFD8 4610503C */ c.lt.s $f10, $f16 -/* 0098C 8085FFDC 46062200 */ add.s $f8, $f4, $f6 -/* 00990 8085FFE0 4500001D */ bc1f .L80860058 -/* 00994 8085FFE4 E4C80028 */ swc1 $f8, 0x0028($a2) ## 00000028 -/* 00998 8085FFE8 C4C00094 */ lwc1 $f0, 0x0094($a2) ## 00000094 -/* 0099C 8085FFEC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 009A0 8085FFF0 44812000 */ mtc1 $at, $f4 ## $f4 = 450.00 -/* 009A4 8085FFF4 3C058086 */ lui $a1, %hi(func_80860318) ## $a1 = 80860000 -/* 009A8 8085FFF8 4600903E */ c.le.s $f18, $f0 -/* 009AC 8085FFFC 24A50318 */ addiu $a1, $a1, %lo(func_80860318) ## $a1 = 80860318 -/* 009B0 80860000 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 009B4 80860004 45020004 */ bc1fl .L80860018 -/* 009B8 80860008 46000087 */ neg.s $f2, $f0 -/* 009BC 8086000C 10000002 */ beq $zero, $zero, .L80860018 -/* 009C0 80860010 46000086 */ mov.s $f2, $f0 -/* 009C4 80860014 46000087 */ neg.s $f2, $f0 -.L80860018: -/* 009C8 80860018 4604103C */ c.lt.s $f2, $f4 -/* 009CC 8086001C 00000000 */ nop -/* 009D0 80860020 4502000E */ bc1fl .L8086005C -/* 009D4 80860024 8FBF0014 */ lw $ra, 0x0014($sp) -/* 009D8 80860028 0C217D94 */ jal EnTest_SetupAction -/* 009DC 8086002C AFA60018 */ sw $a2, 0x0018($sp) -/* 009E0 80860030 8FA40018 */ lw $a0, 0x0018($sp) -/* 009E4 80860034 3C053C75 */ lui $a1, 0x3C75 ## $a1 = 3C750000 -/* 009E8 80860038 34A5C28F */ ori $a1, $a1, 0xC28F ## $a1 = 3C75C28F -/* 009EC 8086003C 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 009F0 80860040 8482008A */ lh $v0, 0x008A($a0) ## 0000008A -/* 009F4 80860044 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 009F8 80860048 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 009FC 8086004C A4820032 */ sh $v0, 0x0032($a0) ## 00000032 -/* 00A00 80860050 0C00B58B */ jal Actor_SetScale - -/* 00A04 80860054 A48200B6 */ sh $v0, 0x00B6($a0) ## 000000B6 -.L80860058: -/* 00A08 80860058 8FBF0014 */ lw $ra, 0x0014($sp) -.L8086005C: -/* 00A0C 8086005C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A10 80860060 03E00008 */ jr $ra -/* 00A14 80860064 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s deleted file mode 100644 index 8933fc2128..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80860068 -/* 00A18 80860068 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A1C 8086006C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A20 80860070 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00A24 80860074 3C050600 */ lui $a1, %hi(D_0600316C) ## $a1 = 06000000 -/* 00A28 80860078 24A5316C */ addiu $a1, $a1, %lo(D_0600316C) ## $a1 = 0600316C -/* 00A2C 8086007C AFA60018 */ sw $a2, 0x0018($sp) -/* 00A30 80860080 0C0294BE */ jal Animation_PlayLoop -/* 00A34 80860084 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 00A38 80860088 8FA60018 */ lw $a2, 0x0018($sp) -/* 00A3C 8086008C 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 00A40 80860090 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00A44 80860094 A0CE07C8 */ sb $t6, 0x07C8($a2) ## 000007C8 -/* 00A48 80860098 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00A4C 8086009C 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 00A50 808600A0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00A54 808600A4 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 00A58 808600A8 46040182 */ mul.s $f6, $f0, $f4 -/* 00A5C 808600AC 8FA40018 */ lw $a0, 0x0018($sp) -/* 00A60 808600B0 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 00A64 808600B4 3C058086 */ lui $a1, %hi(func_808600EC) ## $a1 = 80860000 -/* 00A68 808600B8 849900B6 */ lh $t9, 0x00B6($a0) ## 000000B6 -/* 00A6C 808600BC 24A500EC */ addiu $a1, $a1, %lo(func_808600EC) ## $a1 = 808600EC -/* 00A70 808600C0 E4920068 */ swc1 $f18, 0x0068($a0) ## 00000068 -/* 00A74 808600C4 46083280 */ add.s $f10, $f6, $f8 -/* 00A78 808600C8 A4990032 */ sh $t9, 0x0032($a0) ## 00000032 -/* 00A7C 808600CC 4600540D */ trunc.w.s $f16, $f10 -/* 00A80 808600D0 44188000 */ mfc1 $t8, $f16 -/* 00A84 808600D4 0C217D94 */ jal EnTest_SetupAction -/* 00A88 808600D8 AC9807E8 */ sw $t8, 0x07E8($a0) ## 000007E8 -/* 00A8C 808600DC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00A90 808600E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A94 808600E4 03E00008 */ jr $ra -/* 00A98 808600E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808600EC.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808600EC.s deleted file mode 100644 index 387d9dac79..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808600EC.s +++ /dev/null @@ -1,169 +0,0 @@ -.late_rodata -glabel D_80864778 - .float 0.7 - -glabel D_8086477C - .float 0.3 -glabel D_80864780 - .float 0.3 -glabel D_80864784 - .float 0.7 - -.text -glabel func_808600EC -/* 00A9C 808600EC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00AA0 808600F0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00AA4 808600F4 AFB00018 */ sw $s0, 0x0018($sp) -/* 00AA8 808600F8 AFA5002C */ sw $a1, 0x002C($sp) -/* 00AAC 808600FC 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 00AB0 80860100 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AB4 80860104 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 00AB8 80860108 0C02927F */ jal SkelAnime_Update - -/* 00ABC 8086010C AFAF0024 */ sw $t7, 0x0024($sp) -/* 00AC0 80860110 8FA4002C */ lw $a0, 0x002C($sp) -/* 00AC4 80860114 0C21907A */ jal func_808641E8 -/* 00AC8 80860118 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00ACC 8086011C 14400079 */ bne $v0, $zero, .L80860304 -/* 00AD0 80860120 8FA40024 */ lw $a0, 0x0024($sp) -/* 00AD4 80860124 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00AD8 80860128 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 -/* 00ADC 8086012C C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 00AE0 80860130 849800B6 */ lh $t8, 0x00B6($a0) ## 000000B6 -/* 00AE4 80860134 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -/* 00AE8 80860138 4606203C */ c.lt.s $f4, $f6 -/* 00AEC 8086013C 03191023 */ subu $v0, $t8, $t9 -/* 00AF0 80860140 00021400 */ sll $v0, $v0, 16 -/* 00AF4 80860144 45000023 */ bc1f .L808601D4 -/* 00AF8 80860148 00021403 */ sra $v0, $v0, 16 -/* 00AFC 8086014C 80880843 */ lb $t0, 0x0843($a0) ## 00000843 -/* 00B00 80860150 51000021 */ beql $t0, $zero, .L808601D8 -/* 00B04 80860154 8E0207E8 */ lw $v0, 0x07E8($s0) ## 000007E8 -/* 00B08 80860158 04400003 */ bltz $v0, .L80860168 -/* 00B0C 8086015C 00021823 */ subu $v1, $zero, $v0 -/* 00B10 80860160 10000001 */ beq $zero, $zero, .L80860168 -/* 00B14 80860164 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80860168: -/* 00B18 80860168 28611F40 */ slti $at, $v1, 0x1F40 -/* 00B1C 8086016C 5420001A */ bnel $at, $zero, .L808601D8 -/* 00B20 80860170 8E0207E8 */ lw $v0, 0x07E8($s0) ## 000007E8 -/* 00B24 80860174 8602008A */ lh $v0, 0x008A($s0) ## 0000008A -/* 00B28 80860178 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 -/* 00B2C 8086017C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00B30 80860180 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 00B34 80860184 3C018086 */ lui $at, %hi(D_80864778) ## $at = 80860000 -/* 00B38 80860188 C4284778 */ lwc1 $f8, %lo(D_80864778)($at) -/* 00B3C 8086018C 8FA90024 */ lw $t1, 0x0024($sp) -/* 00B40 80860190 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B44 80860194 4600403C */ c.lt.s $f8, $f0 -/* 00B48 80860198 00000000 */ nop -/* 00B4C 8086019C 45000009 */ bc1f .L808601C4 -/* 00B50 808601A0 00000000 */ nop -/* 00B54 808601A4 812A0842 */ lb $t2, 0x0842($t1) ## 00000842 -/* 00B58 808601A8 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 00B5C 808601AC 11410005 */ beq $t2, $at, .L808601C4 -/* 00B60 808601B0 00000000 */ nop -/* 00B64 808601B4 0C218653 */ jal func_8086194C -/* 00B68 808601B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B6C 808601BC 10000052 */ beq $zero, $zero, .L80860308 -/* 00B70 808601C0 8FBF001C */ lw $ra, 0x001C($sp) -.L808601C4: -/* 00B74 808601C4 0C2189F1 */ jal func_808627C4 -/* 00B78 808601C8 8FA5002C */ lw $a1, 0x002C($sp) -/* 00B7C 808601CC 1000004E */ beq $zero, $zero, .L80860308 -/* 00B80 808601D0 8FBF001C */ lw $ra, 0x001C($sp) -.L808601D4: -/* 00B84 808601D4 8E0207E8 */ lw $v0, 0x07E8($s0) ## 000007E8 -.L808601D8: -/* 00B88 808601D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B8C 808601DC 10400003 */ beq $v0, $zero, .L808601EC -/* 00B90 808601E0 244BFFFF */ addiu $t3, $v0, 0xFFFF ## $t3 = FFFFFFFF -/* 00B94 808601E4 10000047 */ beq $zero, $zero, .L80860304 -/* 00B98 808601E8 AE0B07E8 */ sw $t3, 0x07E8($s0) ## 000007E8 -.L808601EC: -/* 00B9C 808601EC 0C00B821 */ jal Actor_IsFacingPlayer -/* 00BA0 808601F0 24051555 */ addiu $a1, $zero, 0x1555 ## $a1 = 00001555 -/* 00BA4 808601F4 10400034 */ beq $v0, $zero, .L808602C8 -/* 00BA8 808601F8 3C01435C */ lui $at, 0x435C ## $at = 435C0000 -/* 00BAC 808601FC C6000090 */ lwc1 $f0, 0x0090($s0) ## 00000090 -/* 00BB0 80860200 44815000 */ mtc1 $at, $f10 ## $f10 = 220.00 -/* 00BB4 80860204 3C014320 */ lui $at, 0x4320 ## $at = 43200000 -/* 00BB8 80860208 460A003C */ c.lt.s $f0, $f10 -/* 00BBC 8086020C 00000000 */ nop -/* 00BC0 80860210 4500001C */ bc1f .L80860284 -/* 00BC4 80860214 00000000 */ nop -/* 00BC8 80860218 44818000 */ mtc1 $at, $f16 ## $f16 = 160.00 -/* 00BCC 8086021C 00000000 */ nop -/* 00BD0 80860220 4600803C */ c.lt.s $f16, $f0 -/* 00BD4 80860224 00000000 */ nop -/* 00BD8 80860228 45000016 */ bc1f .L80860284 -/* 00BDC 8086022C 00000000 */ nop -/* 00BE0 80860230 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00BE4 80860234 00000000 */ nop -/* 00BE8 80860238 3C018086 */ lui $at, %hi(D_8086477C) ## $at = 80860000 -/* 00BEC 8086023C C432477C */ lwc1 $f18, %lo(D_8086477C)($at) -/* 00BF0 80860240 8FA4002C */ lw $a0, 0x002C($sp) -/* 00BF4 80860244 4612003C */ c.lt.s $f0, $f18 -/* 00BF8 80860248 00000000 */ nop -/* 00BFC 8086024C 4500000D */ bc1f .L80860284 -/* 00C00 80860250 00000000 */ nop -/* 00C04 80860254 0C00CEA1 */ jal Actor_IsTargeted -/* 00C08 80860258 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00C0C 8086025C 10400005 */ beq $v0, $zero, .L80860274 -/* 00C10 80860260 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C14 80860264 0C2186E5 */ jal func_80861B94 -/* 00C18 80860268 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C1C 8086026C 10000026 */ beq $zero, $zero, .L80860308 -/* 00C20 80860270 8FBF001C */ lw $ra, 0x001C($sp) -.L80860274: -/* 00C24 80860274 0C2189F1 */ jal func_808627C4 -/* 00C28 80860278 8FA5002C */ lw $a1, 0x002C($sp) -/* 00C2C 8086027C 10000022 */ beq $zero, $zero, .L80860308 -/* 00C30 80860280 8FBF001C */ lw $ra, 0x001C($sp) -.L80860284: -/* 00C34 80860284 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00C38 80860288 00000000 */ nop -/* 00C3C 8086028C 3C018086 */ lui $at, %hi(D_80864780) ## $at = 80860000 -/* 00C40 80860290 C4244780 */ lwc1 $f4, %lo(D_80864780)($at) -/* 00C44 80860294 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C48 80860298 4600203C */ c.lt.s $f4, $f0 -/* 00C4C 8086029C 00000000 */ nop -/* 00C50 808602A0 45000005 */ bc1f .L808602B8 -/* 00C54 808602A4 00000000 */ nop -/* 00C58 808602A8 0C21810E */ jal func_80860438 -/* 00C5C 808602AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C60 808602B0 10000015 */ beq $zero, $zero, .L80860308 -/* 00C64 808602B4 8FBF001C */ lw $ra, 0x001C($sp) -.L808602B8: -/* 00C68 808602B8 0C2189F1 */ jal func_808627C4 -/* 00C6C 808602BC 8FA5002C */ lw $a1, 0x002C($sp) -/* 00C70 808602C0 10000011 */ beq $zero, $zero, .L80860308 -/* 00C74 808602C4 8FBF001C */ lw $ra, 0x001C($sp) -.L808602C8: -/* 00C78 808602C8 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00C7C 808602CC 00000000 */ nop -/* 00C80 808602D0 3C018086 */ lui $at, %hi(D_80864784) ## $at = 80860000 -/* 00C84 808602D4 C4264784 */ lwc1 $f6, %lo(D_80864784)($at) -/* 00C88 808602D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C8C 808602DC 4600303C */ c.lt.s $f6, $f0 -/* 00C90 808602E0 00000000 */ nop -/* 00C94 808602E4 45000005 */ bc1f .L808602FC -/* 00C98 808602E8 00000000 */ nop -/* 00C9C 808602EC 0C2182F7 */ jal func_80860BDC -/* 00CA0 808602F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CA4 808602F4 10000004 */ beq $zero, $zero, .L80860308 -/* 00CA8 808602F8 8FBF001C */ lw $ra, 0x001C($sp) -.L808602FC: -/* 00CAC 808602FC 0C217EAC */ jal func_8085FAB0 -/* 00CB0 80860300 8FA5002C */ lw $a1, 0x002C($sp) -.L80860304: -/* 00CB4 80860304 8FBF001C */ lw $ra, 0x001C($sp) -.L80860308: -/* 00CB8 80860308 8FB00018 */ lw $s0, 0x0018($sp) -/* 00CBC 8086030C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00CC0 80860310 03E00008 */ jr $ra -/* 00CC4 80860314 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860318.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860318.s deleted file mode 100644 index ea47f576f2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860318.s +++ /dev/null @@ -1,54 +0,0 @@ -.late_rodata -glabel D_80864788 - .float 0.15 - -.text -glabel func_80860318 -/* 00CC8 80860318 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00CCC 8086031C AFB00018 */ sw $s0, 0x0018($sp) -/* 00CD0 80860320 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00CD4 80860324 AFA5002C */ sw $a1, 0x002C($sp) -/* 00CD8 80860328 AFBF001C */ sw $ra, 0x001C($sp) -/* 00CDC 8086032C 3C050601 */ lui $a1, %hi(D_0600C438) ## $a1 = 06010000 -/* 00CE0 80860330 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 00CE4 80860334 AFA40024 */ sw $a0, 0x0024($sp) -/* 00CE8 80860338 24A5C438 */ addiu $a1, $a1, %lo(D_0600C438) ## $a1 = 0600C438 -/* 00CEC 8086033C 0C0294A7 */ jal Animation_PlayOnceSetSpeed -/* 00CF0 80860340 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00CF4 80860344 0C02927F */ jal SkelAnime_Update - -/* 00CF8 80860348 8FA40024 */ lw $a0, 0x0024($sp) -/* 00CFC 8086034C C6040080 */ lwc1 $f4, 0x0080($s0) ## 00000080 -/* 00D00 80860350 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 00D04 80860354 4604303E */ c.le.s $f6, $f4 -/* 00D08 80860358 00000000 */ nop -/* 00D0C 8086035C 45020017 */ bc1fl .L808603BC -/* 00D10 80860360 8FBF001C */ lw $ra, 0x001C($sp) -/* 00D14 80860364 8E0F07E4 */ lw $t7, 0x07E4($s0) ## 000007E4 -/* 00D18 80860368 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00D1C 8086036C 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 00D20 80860370 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 00D24 80860374 240E000C */ addiu $t6, $zero, 0x000C ## $t6 = 0000000C -/* 00D28 80860378 A20E07C8 */ sb $t6, 0x07C8($s0) ## 000007C8 -/* 00D2C 8086037C 46805420 */ cvt.s.w $f16, $f10 -/* 00D30 80860380 3C018086 */ lui $at, %hi(D_80864788) ## $at = 80860000 -/* 00D34 80860384 E60801A4 */ swc1 $f8, 0x01A4($s0) ## 000001A4 -/* 00D38 80860388 C4324788 */ lwc1 $f18, %lo(D_80864788)($at) -/* 00D3C 8086038C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D40 80860390 2405387A */ addiu $a1, $zero, 0x387A ## $a1 = 0000387A -/* 00D44 80860394 46128102 */ mul.s $f4, $f16, $f18 -/* 00D48 80860398 4600218D */ trunc.w.s $f6, $f4 -/* 00D4C 8086039C 44193000 */ mfc1 $t9, $f6 -/* 00D50 808603A0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00D54 808603A4 AE1907E8 */ sw $t9, 0x07E8($s0) ## 000007E8 -/* 00D58 808603A8 3C058086 */ lui $a1, %hi(func_808603CC) ## $a1 = 80860000 -/* 00D5C 808603AC 24A503CC */ addiu $a1, $a1, %lo(func_808603CC) ## $a1 = 808603CC -/* 00D60 808603B0 0C217D94 */ jal EnTest_SetupAction -/* 00D64 808603B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D68 808603B8 8FBF001C */ lw $ra, 0x001C($sp) -.L808603BC: -/* 00D6C 808603BC 8FB00018 */ lw $s0, 0x0018($sp) -/* 00D70 808603C0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00D74 808603C4 03E00008 */ jr $ra -/* 00D78 808603C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808603CC.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808603CC.s deleted file mode 100644 index eaee03c6d5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808603CC.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_808603CC -/* 00D7C 808603CC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00D80 808603D0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00D84 808603D4 AFA40018 */ sw $a0, 0x0018($sp) -/* 00D88 808603D8 AFA5001C */ sw $a1, 0x001C($sp) -/* 00D8C 808603DC 0C02927F */ jal SkelAnime_Update - -/* 00D90 808603E0 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 00D94 808603E4 50400011 */ beql $v0, $zero, .L8086042C -/* 00D98 808603E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00D9C 808603EC 0C21801A */ jal func_80860068 -/* 00DA0 808603F0 8FA40018 */ lw $a0, 0x0018($sp) -/* 00DA4 808603F4 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00DA8 808603F8 00000000 */ nop -/* 00DAC 808603FC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00DB0 80860400 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 00DB4 80860404 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00DB8 80860408 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 00DBC 8086040C 46040182 */ mul.s $f6, $f0, $f4 -/* 00DC0 80860410 8FB80018 */ lw $t8, 0x0018($sp) -/* 00DC4 80860414 46083280 */ add.s $f10, $f6, $f8 -/* 00DC8 80860418 4600540D */ trunc.w.s $f16, $f10 -/* 00DCC 8086041C 440F8000 */ mfc1 $t7, $f16 -/* 00DD0 80860420 00000000 */ nop -/* 00DD4 80860424 AF0F07E8 */ sw $t7, 0x07E8($t8) ## 000007E8 -/* 00DD8 80860428 8FBF0014 */ lw $ra, 0x0014($sp) -.L8086042C: -/* 00DDC 8086042C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00DE0 80860430 03E00008 */ jr $ra -/* 00DE4 80860434 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s deleted file mode 100644 index 7b2cdc4e92..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_80860438 -/* 00DE8 80860438 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00DEC 8086043C AFB00028 */ sw $s0, 0x0028($sp) -/* 00DF0 80860440 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00DF4 80860444 AFBF002C */ sw $ra, 0x002C($sp) -/* 00DF8 80860448 3C040600 */ lui $a0, %hi(D_06001C20) ## $a0 = 06000000 -/* 00DFC 8086044C 0C028800 */ jal Animation_GetLastFrame - -/* 00E00 80860450 24841C20 */ addiu $a0, $a0, %lo(D_06001C20) ## $a0 = 06001C20 -/* 00E04 80860454 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00E08 80860458 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00E0C 8086045C 44810000 */ mtc1 $at, $f0 ## $f0 = 2.00 -/* 00E10 80860460 468021A0 */ cvt.s.w $f6, $f4 -/* 00E14 80860464 3C050600 */ lui $a1, %hi(D_06001C20) ## $a1 = 06000000 -/* 00E18 80860468 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00E1C 8086046C 44060000 */ mfc1 $a2, $f0 -/* 00E20 80860470 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00E24 80860474 24A51C20 */ addiu $a1, $a1, %lo(D_06001C20) ## $a1 = 06001C20 -/* 00E28 80860478 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00E2C 8086047C 260404A8 */ addiu $a0, $s0, 0x04A8 ## $a0 = 000004A8 -/* 00E30 80860480 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00E34 80860484 0C029468 */ jal Animation_Change - -/* 00E38 80860488 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00E3C 8086048C 3C050601 */ lui $a1, %hi(D_060081B4) ## $a1 = 06010000 -/* 00E40 80860490 24A581B4 */ addiu $a1, $a1, %lo(D_060081B4) ## $a1 = 060081B4 -/* 00E44 80860494 0C0294BE */ jal Animation_PlayLoop -/* 00E48 80860498 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 00E4C 8086049C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00E50 808604A0 00000000 */ nop -/* 00E54 808604A4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00E58 808604A8 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 00E5C 808604AC 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 -/* 00E60 808604B0 2409000D */ addiu $t1, $zero, 0x000D ## $t1 = 0000000D -/* 00E64 808604B4 46080282 */ mul.s $f10, $f0, $f8 -/* 00E68 808604B8 3C058086 */ lui $a1, %hi(func_808604FC) ## $a1 = 80860000 -/* 00E6C 808604BC A20907C8 */ sb $t1, 0x07C8($s0) ## 000007C8 -/* 00E70 808604C0 24A504FC */ addiu $a1, $a1, %lo(func_808604FC) ## $a1 = 808604FC -/* 00E74 808604C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E78 808604C8 A60A0032 */ sh $t2, 0x0032($s0) ## 00000032 -/* 00E7C 808604CC 4600540D */ trunc.w.s $f16, $f10 -/* 00E80 808604D0 44188000 */ mfc1 $t8, $f16 -/* 00E84 808604D4 00000000 */ nop -/* 00E88 808604D8 0018CC00 */ sll $t9, $t8, 16 -/* 00E8C 808604DC 00194403 */ sra $t0, $t9, 16 -/* 00E90 808604E0 0C217D94 */ jal EnTest_SetupAction -/* 00E94 808604E4 AE0807E8 */ sw $t0, 0x07E8($s0) ## 000007E8 -/* 00E98 808604E8 8FBF002C */ lw $ra, 0x002C($sp) -/* 00E9C 808604EC 8FB00028 */ lw $s0, 0x0028($sp) -/* 00EA0 808604F0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00EA4 808604F4 03E00008 */ jr $ra -/* 00EA8 808604F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808604FC.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808604FC.s deleted file mode 100644 index e7a7dda566..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808604FC.s +++ /dev/null @@ -1,510 +0,0 @@ -.late_rodata -glabel D_8086478C - .float 0.02 -glabel D_80864790 - .float 0.7 -glabel D_80864794 - .float 0.1 -glabel D_80864798 - .float 0.4 -glabel D_8086479C - .float 0.2 -glabel D_808647A0 - .float 0.1 - -.text -glabel func_808604FC -/* 00EAC 808604FC 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 00EB0 80860500 AFBF002C */ sw $ra, 0x002C($sp) -/* 00EB4 80860504 AFB00028 */ sw $s0, 0x0028($sp) -/* 00EB8 80860508 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 00EBC 8086050C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 00EC0 80860510 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00EC4 80860514 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 00EC8 80860518 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00ECC 8086051C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00ED0 80860520 AFA60074 */ sw $a2, 0x0074($sp) -/* 00ED4 80860524 AFAE0054 */ sw $t6, 0x0054($sp) -/* 00ED8 80860528 0C21907A */ jal func_808641E8 -/* 00EDC 8086052C E7A20068 */ swc1 $f2, 0x0068($sp) -/* 00EE0 80860530 144001A5 */ bne $v0, $zero, .L80860BC8 -/* 00EE4 80860534 C7A20068 */ lwc1 $f2, 0x0068($sp) -/* 00EE8 80860538 8E0F07E8 */ lw $t7, 0x07E8($s0) ## 000007E8 -/* 00EEC 8086053C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00EF0 80860540 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00EF4 80860544 AE1807E8 */ sw $t8, 0x07E8($s0) ## 000007E8 -/* 00EF8 80860548 E7A20068 */ swc1 $f2, 0x0068($sp) -/* 00EFC 8086054C 0C00CEAE */ jal Actor_OtherIsTargeted -/* 00F00 80860550 8FA40074 */ lw $a0, 0x0074($sp) -/* 00F04 80860554 10400004 */ beq $v0, $zero, .L80860568 -/* 00F08 80860558 C7A20068 */ lwc1 $f2, 0x0068($sp) -/* 00F0C 8086055C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 00F10 80860560 44811000 */ mtc1 $at, $f2 ## $f2 = 150.00 -/* 00F14 80860564 00000000 */ nop -.L80860568: -/* 00F18 80860568 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 00F1C 8086056C 44812000 */ mtc1 $at, $f4 ## $f4 = 80.00 -/* 00F20 80860570 C6000090 */ lwc1 $f0, 0x0090($s0) ## 00000090 -/* 00F24 80860574 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 00F28 80860578 46022180 */ add.s $f6, $f4, $f2 -/* 00F2C 8086057C 3C05C0A0 */ lui $a1, 0xC0A0 ## $a1 = C0A00000 -/* 00F30 80860580 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00F34 80860584 3C073F4C */ lui $a3, 0x3F4C ## $a3 = 3F4C0000 -/* 00F38 80860588 4606003E */ c.le.s $f0, $f6 -/* 00F3C 8086058C 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 -/* 00F40 80860590 45020008 */ bc1fl .L808605B4 -/* 00F44 80860594 44815000 */ mtc1 $at, $f10 ## $f10 = 110.00 -/* 00F48 80860598 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 00F4C 8086059C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3F4CCCCD -/* 00F50 808605A0 0C01E0C4 */ jal Math_SmoothStepToF - -/* 00F54 808605A4 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 00F58 808605A8 10000010 */ beq $zero, $zero, .L808605EC -/* 00F5C 808605AC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00F60 808605B0 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -.L808605B4: -/* 00F64 808605B4 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 00F68 808605B8 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 -/* 00F6C 808605BC 46025400 */ add.s $f16, $f10, $f2 -/* 00F70 808605C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00F74 808605C4 3C073F4C */ lui $a3, 0x3F4C ## $a3 = 3F4C0000 -/* 00F78 808605C8 4600803C */ c.lt.s $f16, $f0 -/* 00F7C 808605CC 00000000 */ nop -/* 00F80 808605D0 45020006 */ bc1fl .L808605EC -/* 00F84 808605D4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00F88 808605D8 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 00F8C 808605DC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3F4CCCCD -/* 00F90 808605E0 0C01E0C4 */ jal Math_SmoothStepToF - -/* 00F94 808605E4 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 00F98 808605E8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -.L808605EC: -/* 00F9C 808605EC 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 00FA0 808605F0 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 00FA4 808605F4 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 -/* 00FA8 808605F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FAC 808605FC 4600203E */ c.le.s $f4, $f0 -/* 00FB0 80860600 00000000 */ nop -/* 00FB4 80860604 45020006 */ bc1fl .L80860620 -/* 00FB8 80860608 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 -/* 00FBC 8086060C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00FC0 80860610 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 -/* 00FC4 80860614 1000000A */ beq $zero, $zero, .L80860640 -/* 00FC8 80860618 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 00FCC 8086061C 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -.L80860620: -/* 00FD0 80860620 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 -/* 00FD4 80860624 4608003C */ c.lt.s $f0, $f8 -/* 00FD8 80860628 00000000 */ nop -/* 00FDC 8086062C 45020005 */ bc1fl .L80860644 -/* 00FE0 80860630 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 00FE4 80860634 44815000 */ mtc1 $at, $f10 ## $f10 = -5.00 -/* 00FE8 80860638 00000000 */ nop -/* 00FEC 8086063C E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -.L80860640: -/* 00FF0 80860640 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -.L80860644: -/* 00FF4 80860644 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00FF8 80860648 8FA50074 */ lw $a1, 0x0074($sp) -/* 00FFC 8086064C 5721000C */ bnel $t9, $at, .L80860680 -/* 01000 80860650 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 01004 80860654 8E060068 */ lw $a2, 0x0068($s0) ## 00000068 -/* 01008 80860658 0C00CE6E */ jal func_800339B8 -/* 0100C 8086065C 86070032 */ lh $a3, 0x0032($s0) ## 00000032 -/* 01010 80860660 14400006 */ bne $v0, $zero, .L8086067C -/* 01014 80860664 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 01018 80860668 C6100068 */ lwc1 $f16, 0x0068($s0) ## 00000068 -/* 0101C 8086066C 44819000 */ mtc1 $at, $f18 ## $f18 = -1.00 -/* 01020 80860670 00000000 */ nop -/* 01024 80860674 46128102 */ mul.s $f4, $f16, $f18 -/* 01028 80860678 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -.L8086067C: -/* 0102C 8086067C C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -.L80860680: -/* 01030 80860680 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01034 80860684 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 01038 80860688 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 -/* 0103C 8086068C 4600303E */ c.le.s $f6, $f0 -/* 01040 80860690 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01044 80860694 45020004 */ bc1fl .L808606A8 -/* 01048 80860698 46000087 */ neg.s $f2, $f0 -/* 0104C 8086069C 10000002 */ beq $zero, $zero, .L808606A8 -/* 01050 808606A0 46000086 */ mov.s $f2, $f0 -/* 01054 808606A4 46000087 */ neg.s $f2, $f0 -.L808606A8: -/* 01058 808606A8 4608103C */ c.lt.s $f2, $f8 -/* 0105C 808606AC 00000000 */ nop -/* 01060 808606B0 45000019 */ bc1f .L80860718 -/* 01064 808606B4 00000000 */ nop -/* 01068 808606B8 3C040601 */ lui $a0, %hi(D_060081B4) ## $a0 = 06010000 -/* 0106C 808606BC 0C028800 */ jal Animation_GetLastFrame - -/* 01070 808606C0 248481B4 */ addiu $a0, $a0, %lo(D_060081B4) ## $a0 = 060081B4 -/* 01074 808606C4 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 01078 808606C8 8E0701A0 */ lw $a3, 0x01A0($s0) ## 000001A0 -/* 0107C 808606CC 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 -/* 01080 808606D0 46805420 */ cvt.s.w $f16, $f10 -/* 01084 808606D4 44819000 */ mtc1 $at, $f18 ## $f18 = -6.00 -/* 01088 808606D8 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 0108C 808606DC 3C050601 */ lui $a1, %hi(D_060081B4) ## $a1 = 06010000 -/* 01090 808606E0 24A581B4 */ addiu $a1, $a1, %lo(D_060081B4) ## $a1 = 060081B4 -/* 01094 808606E4 AFA40034 */ sw $a0, 0x0034($sp) -/* 01098 808606E8 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 0109C 808606EC AFA00014 */ sw $zero, 0x0014($sp) -/* 010A0 808606F0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 010A4 808606F4 0C029468 */ jal Animation_Change - -/* 010A8 808606F8 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 010AC 808606FC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 010B0 80860700 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 010B4 80860704 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 010B8 80860708 8FA40034 */ lw $a0, 0x0034($sp) -/* 010BC 8086070C 46040082 */ mul.s $f2, $f0, $f4 -/* 010C0 80860710 1000001B */ beq $zero, $zero, .L80860780 -/* 010C4 80860714 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -.L80860718: -/* 010C8 80860718 0C028800 */ jal Animation_GetLastFrame - -/* 010CC 8086071C 248426D4 */ addiu $a0, $a0, 0x26D4 ## $a0 = 000026D4 -/* 010D0 80860720 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 010D4 80860724 8E0701A0 */ lw $a3, 0x01A0($s0) ## 000001A0 -/* 010D8 80860728 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 010DC 8086072C 46803220 */ cvt.s.w $f8, $f6 -/* 010E0 80860730 44815000 */ mtc1 $at, $f10 ## $f10 = -4.00 -/* 010E4 80860734 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 010E8 80860738 3C050600 */ lui $a1, %hi(D_060026D4) ## $a1 = 06000000 -/* 010EC 8086073C 24A526D4 */ addiu $a1, $a1, %lo(D_060026D4) ## $a1 = 060026D4 -/* 010F0 80860740 AFA40034 */ sw $a0, 0x0034($sp) -/* 010F4 80860744 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 010F8 80860748 AFA00014 */ sw $zero, 0x0014($sp) -/* 010FC 8086074C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 01100 80860750 0C029468 */ jal Animation_Change - -/* 01104 80860754 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 01108 80860758 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0110C 8086075C 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 01110 80860760 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 01114 80860764 3C018086 */ lui $at, %hi(D_8086478C) ## $at = 80860000 -/* 01118 80860768 C424478C */ lwc1 $f4, %lo(D_8086478C)($at) -/* 0111C 8086076C 46100482 */ mul.s $f18, $f0, $f16 -/* 01120 80860770 8FA40034 */ lw $a0, 0x0034($sp) -/* 01124 80860774 46049082 */ mul.s $f2, $f18, $f4 -/* 01128 80860778 00000000 */ nop -/* 0112C 8086077C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -.L80860780: -/* 01130 80860780 3C01C020 */ lui $at, 0xC020 ## $at = C0200000 -/* 01134 80860784 4600303E */ c.le.s $f6, $f0 -/* 01138 80860788 00000000 */ nop -/* 0113C 8086078C 4502000F */ bc1fl .L808607CC -/* 01140 80860790 44810000 */ mtc1 $at, $f0 ## $f0 = -2.50 -/* 01144 80860794 920207DE */ lbu $v0, 0x07DE($s0) ## 000007DE -/* 01148 80860798 3C014020 */ lui $at, 0x4020 ## $at = 40200000 -/* 0114C 8086079C 44810000 */ mtc1 $at, $f0 ## $f0 = 2.50 -/* 01150 808607A0 14400002 */ bne $v0, $zero, .L808607AC -/* 01154 808607A4 24480001 */ addiu $t0, $v0, 0x0001 ## $t0 = 00000001 -/* 01158 808607A8 A20807DE */ sb $t0, 0x07DE($s0) ## 000007DE -.L808607AC: -/* 0115C 808607AC 4602003C */ c.lt.s $f0, $f2 -/* 01160 808607B0 00000000 */ nop -/* 01164 808607B4 45000002 */ bc1f .L808607C0 -/* 01168 808607B8 00000000 */ nop -/* 0116C 808607BC 46000086 */ mov.s $f2, $f0 -.L808607C0: -/* 01170 808607C0 10000009 */ beq $zero, $zero, .L808607E8 -/* 01174 808607C4 E60201A4 */ swc1 $f2, 0x01A4($s0) ## 000001A4 -/* 01178 808607C8 44810000 */ mtc1 $at, $f0 ## $f0 = 2.50 -.L808607CC: -/* 0117C 808607CC 00000000 */ nop -/* 01180 808607D0 4600103C */ c.lt.s $f2, $f0 -/* 01184 808607D4 00000000 */ nop -/* 01188 808607D8 45020003 */ bc1fl .L808607E8 -/* 0118C 808607DC E60201A4 */ swc1 $f2, 0x01A4($s0) ## 000001A4 -/* 01190 808607E0 46000086 */ mov.s $f2, $f0 -/* 01194 808607E4 E60201A4 */ swc1 $f2, 0x01A4($s0) ## 000001A4 -.L808607E8: -/* 01198 808607E8 8FA50054 */ lw $a1, 0x0054($sp) -/* 0119C 808607EC 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 011A0 808607F0 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 -/* 011A4 808607F4 C6080090 */ lwc1 $f8, 0x0090($s0) ## 00000090 -/* 011A8 808607F8 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 -/* 011AC 808607FC 84A900B6 */ lh $t1, 0x00B6($a1) ## 000000B6 -/* 011B0 80860800 460A403C */ c.lt.s $f8, $f10 -/* 011B4 80860804 012A1023 */ subu $v0, $t1, $t2 -/* 011B8 80860808 00021400 */ sll $v0, $v0, 16 -/* 011BC 8086080C 45000022 */ bc1f .L80860898 -/* 011C0 80860810 00021403 */ sra $v0, $v0, 16 -/* 011C4 80860814 80AB0843 */ lb $t3, 0x0843($a1) ## 00000843 -/* 011C8 80860818 51600020 */ beql $t3, $zero, .L8086089C -/* 011CC 8086081C C61201A0 */ lwc1 $f18, 0x01A0($s0) ## 000001A0 -/* 011D0 80860820 04400003 */ bltz $v0, .L80860830 -/* 011D4 80860824 00021823 */ subu $v1, $zero, $v0 -/* 011D8 80860828 10000001 */ beq $zero, $zero, .L80860830 -/* 011DC 8086082C 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80860830: -/* 011E0 80860830 28611F40 */ slti $at, $v1, 0x1F40 -/* 011E4 80860834 54200019 */ bnel $at, $zero, .L8086089C -/* 011E8 80860838 C61201A0 */ lwc1 $f18, 0x01A0($s0) ## 000001A0 -/* 011EC 8086083C 8602008A */ lh $v0, 0x008A($s0) ## 0000008A -/* 011F0 80860840 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 -/* 011F4 80860844 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 011F8 80860848 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 011FC 8086084C 3C018086 */ lui $at, %hi(D_80864790) ## $at = 80860000 -/* 01200 80860850 C4304790 */ lwc1 $f16, %lo(D_80864790)($at) -/* 01204 80860854 8FAC0054 */ lw $t4, 0x0054($sp) -/* 01208 80860858 4600803C */ c.lt.s $f16, $f0 -/* 0120C 8086085C 00000000 */ nop -/* 01210 80860860 45000009 */ bc1f .L80860888 -/* 01214 80860864 00000000 */ nop -/* 01218 80860868 818D0842 */ lb $t5, 0x0842($t4) ## 00000842 -/* 0121C 8086086C 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 01220 80860870 11A10005 */ beq $t5, $at, .L80860888 -/* 01224 80860874 00000000 */ nop -/* 01228 80860878 0C218653 */ jal func_8086194C -/* 0122C 8086087C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01230 80860880 100000D2 */ beq $zero, $zero, .L80860BCC -/* 01234 80860884 8FBF002C */ lw $ra, 0x002C($sp) -.L80860888: -/* 01238 80860888 0C2187B0 */ jal func_80861EC0 -/* 0123C 8086088C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01240 80860890 100000CE */ beq $zero, $zero, .L80860BCC -/* 01244 80860894 8FBF002C */ lw $ra, 0x002C($sp) -.L80860898: -/* 01248 80860898 C61201A0 */ lwc1 $f18, 0x01A0($s0) ## 000001A0 -.L8086089C: -/* 0124C 8086089C 4600910D */ trunc.w.s $f4, $f18 -/* 01250 808608A0 44032000 */ mfc1 $v1, $f4 -/* 01254 808608A4 0C02927F */ jal SkelAnime_Update - -/* 01258 808608A8 AFA30060 */ sw $v1, 0x0060($sp) -/* 0125C 808608AC C60001A4 */ lwc1 $f0, 0x01A4($s0) ## 000001A4 -/* 01260 808608B0 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01264 808608B4 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 01268 808608B8 8FA30060 */ lw $v1, 0x0060($sp) -/* 0126C 808608BC 4600303E */ c.le.s $f6, $f0 -/* 01270 808608C0 00000000 */ nop -/* 01274 808608C4 45020004 */ bc1fl .L808608D8 -/* 01278 808608C8 46000087 */ neg.s $f2, $f0 -/* 0127C 808608CC 10000002 */ beq $zero, $zero, .L808608D8 -/* 01280 808608D0 46000086 */ mov.s $f2, $f0 -/* 01284 808608D4 46000087 */ neg.s $f2, $f0 -.L808608D8: -/* 01288 808608D8 C60C01A0 */ lwc1 $f12, 0x01A0($s0) ## 000001A0 -/* 0128C 808608DC 4600803E */ c.le.s $f16, $f0 -/* 01290 808608E0 46026201 */ sub.s $f8, $f12, $f2 -/* 01294 808608E4 4600648D */ trunc.w.s $f18, $f12 -/* 01298 808608E8 4600428D */ trunc.w.s $f10, $f8 -/* 0129C 808608EC 44199000 */ mfc1 $t9, $f18 -/* 012A0 808608F0 44045000 */ mfc1 $a0, $f10 -/* 012A4 808608F4 45020004 */ bc1fl .L80860908 -/* 012A8 808608F8 46000087 */ neg.s $f2, $f0 -/* 012AC 808608FC 10000002 */ beq $zero, $zero, .L80860908 -/* 012B0 80860900 46000086 */ mov.s $f2, $f0 -/* 012B4 80860904 46000087 */ neg.s $f2, $f0 -.L80860908: -/* 012B8 80860908 50790011 */ beql $v1, $t9, .L80860950 -/* 012BC 8086090C 8E0A07E8 */ lw $t2, 0x07E8($s0) ## 000007E8 -/* 012C0 80860910 4600110D */ trunc.w.s $f4, $f2 -/* 012C4 80860914 44092000 */ mfc1 $t1, $f4 -/* 012C8 80860918 00000000 */ nop -/* 012CC 8086091C 01231021 */ addu $v0, $t1, $v1 -/* 012D0 80860920 28410002 */ slti $at, $v0, 0x0002 -/* 012D4 80860924 54200003 */ bnel $at, $zero, .L80860934 -/* 012D8 80860928 28810007 */ slti $at, $a0, 0x0007 -/* 012DC 8086092C 18800004 */ blez $a0, .L80860940 -/* 012E0 80860930 28810007 */ slti $at, $a0, 0x0007 -.L80860934: -/* 012E4 80860934 10200005 */ beq $at, $zero, .L8086094C -/* 012E8 80860938 28410008 */ slti $at, $v0, 0x0008 -/* 012EC 8086093C 14200003 */ bne $at, $zero, .L8086094C -.L80860940: -/* 012F0 80860940 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012F4 80860944 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 012F8 80860948 2405383D */ addiu $a1, $zero, 0x383D ## $a1 = 0000383D -.L8086094C: -/* 012FC 8086094C 8E0A07E8 */ lw $t2, 0x07E8($s0) ## 000007E8 -.L80860950: -/* 01300 80860950 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01304 80860954 314B001F */ andi $t3, $t2, 0x001F ## $t3 = 00000000 -/* 01308 80860958 55600011 */ bnel $t3, $zero, .L808609A0 -/* 0130C 8086095C 3C01435C */ lui $at, 0x435C ## $at = 435C0000 -/* 01310 80860960 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01314 80860964 24053838 */ addiu $a1, $zero, 0x3838 ## $a1 = 00003838 -/* 01318 80860968 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0131C 8086096C 00000000 */ nop -/* 01320 80860970 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 01324 80860974 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 -/* 01328 80860978 8E0C07E8 */ lw $t4, 0x07E8($s0) ## 000007E8 -/* 0132C 8086097C 46060202 */ mul.s $f8, $f0, $f6 -/* 01330 80860980 4600428D */ trunc.w.s $f10, $f8 -/* 01334 80860984 440E5000 */ mfc1 $t6, $f10 -/* 01338 80860988 00000000 */ nop -/* 0133C 8086098C 000E7C00 */ sll $t7, $t6, 16 -/* 01340 80860990 000FC403 */ sra $t8, $t7, 16 -/* 01344 80860994 0198C821 */ addu $t9, $t4, $t8 -/* 01348 80860998 AE1907E8 */ sw $t9, 0x07E8($s0) ## 000007E8 -/* 0134C 8086099C 3C01435C */ lui $at, 0x435C ## $at = 435C0000 -.L808609A0: -/* 01350 808609A0 44818000 */ mtc1 $at, $f16 ## $f16 = 220.00 -/* 01354 808609A4 C6000090 */ lwc1 $f0, 0x0090($s0) ## 00000090 -/* 01358 808609A8 3C014320 */ lui $at, 0x4320 ## $at = 43200000 -/* 0135C 808609AC 4610003C */ c.lt.s $f0, $f16 -/* 01360 808609B0 00000000 */ nop -/* 01364 808609B4 45000033 */ bc1f .L80860A84 -/* 01368 808609B8 00000000 */ nop -/* 0136C 808609BC 44819000 */ mtc1 $at, $f18 ## $f18 = 160.00 -/* 01370 808609C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01374 808609C4 4600903C */ c.lt.s $f18, $f0 -/* 01378 808609C8 00000000 */ nop -/* 0137C 808609CC 4500002D */ bc1f .L80860A84 -/* 01380 808609D0 00000000 */ nop -/* 01384 808609D4 0C00B821 */ jal Actor_IsFacingPlayer -/* 01388 808609D8 2405071C */ addiu $a1, $zero, 0x071C ## $a1 = 0000071C -/* 0138C 808609DC 10400029 */ beq $v0, $zero, .L80860A84 -/* 01390 808609E0 8FA40074 */ lw $a0, 0x0074($sp) -/* 01394 808609E4 0C00CEA1 */ jal Actor_IsTargeted -/* 01398 808609E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0139C 808609EC 1040000D */ beq $v0, $zero, .L80860A24 -/* 013A0 808609F0 8FA80054 */ lw $t0, 0x0054($sp) -/* 013A4 808609F4 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 013A8 808609F8 00000000 */ nop -/* 013AC 808609FC 3C018086 */ lui $at, %hi(D_80864794) ## $at = 80860000 -/* 013B0 80860A00 C4244794 */ lwc1 $f4, %lo(D_80864794)($at) -/* 013B4 80860A04 4604003C */ c.lt.s $f0, $f4 -/* 013B8 80860A08 00000000 */ nop -/* 013BC 80860A0C 4500001D */ bc1f .L80860A84 -/* 013C0 80860A10 00000000 */ nop -/* 013C4 80860A14 0C2186E5 */ jal func_80861B94 -/* 013C8 80860A18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013CC 80860A1C 1000006B */ beq $zero, $zero, .L80860BCC -/* 013D0 80860A20 8FBF002C */ lw $ra, 0x002C($sp) -.L80860A24: -/* 013D4 80860A24 81090151 */ lb $t1, 0x0151($t0) ## 00000151 -/* 013D8 80860A28 11200016 */ beq $t1, $zero, .L80860A84 -/* 013DC 80860A2C 00000000 */ nop -/* 013E0 80860A30 920A010C */ lbu $t2, 0x010C($s0) ## 0000010C -/* 013E4 80860A34 8FAB0074 */ lw $t3, 0x0074($sp) -/* 013E8 80860A38 3C0D0001 */ lui $t5, 0x0001 ## $t5 = 00010000 -/* 013EC 80860A3C 1140000F */ beq $t2, $zero, .L80860A7C -/* 013F0 80860A40 01AB6821 */ addu $t5, $t5, $t3 -/* 013F4 80860A44 8DAD1DE4 */ lw $t5, 0x1DE4($t5) ## 00011DE4 -/* 013F8 80860A48 01602825 */ or $a1, $t3, $zero ## $a1 = 00000000 -/* 013FC 80860A4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01400 80860A50 31AE0001 */ andi $t6, $t5, 0x0001 ## $t6 = 00000000 -/* 01404 80860A54 11C00005 */ beq $t6, $zero, .L80860A6C -/* 01408 80860A58 00000000 */ nop -/* 0140C 80860A5C 0C2189F1 */ jal func_808627C4 -/* 01410 80860A60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01414 80860A64 10000059 */ beq $zero, $zero, .L80860BCC -/* 01418 80860A68 8FBF002C */ lw $ra, 0x002C($sp) -.L80860A6C: -/* 0141C 80860A6C 0C217EAC */ jal func_8085FAB0 -/* 01420 80860A70 8FA50074 */ lw $a1, 0x0074($sp) -/* 01424 80860A74 10000003 */ beq $zero, $zero, .L80860A84 -/* 01428 80860A78 00000000 */ nop -.L80860A7C: -/* 0142C 80860A7C 0C2183B0 */ jal func_80860EC0 -/* 01430 80860A80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80860A84: -/* 01434 80860A84 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01438 80860A88 00000000 */ nop -/* 0143C 80860A8C 3C018086 */ lui $at, %hi(D_80864798) ## $at = 80860000 -/* 01440 80860A90 C4264798 */ lwc1 $f6, %lo(D_80864798)($at) -/* 01444 80860A94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01448 80860A98 4606003C */ c.lt.s $f0, $f6 -/* 0144C 80860A9C 00000000 */ nop -/* 01450 80860AA0 45000004 */ bc1f .L80860AB4 -/* 01454 80860AA4 00000000 */ nop -/* 01458 80860AA8 8602008A */ lh $v0, 0x008A($s0) ## 0000008A -/* 0145C 80860AAC A6020032 */ sh $v0, 0x0032($s0) ## 00000032 -/* 01460 80860AB0 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -.L80860AB4: -/* 01464 80860AB4 0C00B821 */ jal Actor_IsFacingPlayer -/* 01468 80860AB8 240511C7 */ addiu $a1, $zero, 0x11C7 ## $a1 = 000011C7 -/* 0146C 80860ABC 1440000E */ bne $v0, $zero, .L80860AF8 -/* 01470 80860AC0 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 -/* 01474 80860AC4 0C21801A */ jal func_80860068 -/* 01478 80860AC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0147C 80860ACC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01480 80860AD0 00000000 */ nop -/* 01484 80860AD4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01488 80860AD8 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 0148C 80860ADC 00000000 */ nop -/* 01490 80860AE0 46020202 */ mul.s $f8, $f0, $f2 -/* 01494 80860AE4 46024280 */ add.s $f10, $f8, $f2 -/* 01498 80860AE8 4600540D */ trunc.w.s $f16, $f10 -/* 0149C 80860AEC 440C8000 */ mfc1 $t4, $f16 -/* 014A0 80860AF0 10000035 */ beq $zero, $zero, .L80860BC8 -/* 014A4 80860AF4 AE0C07E8 */ sw $t4, 0x07E8($s0) ## 000007E8 -.L80860AF8: -/* 014A8 80860AF8 C6120090 */ lwc1 $f18, 0x0090($s0) ## 00000090 -/* 014AC 80860AFC 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 014B0 80860B00 00000000 */ nop -/* 014B4 80860B04 4604903C */ c.lt.s $f18, $f4 -/* 014B8 80860B08 00000000 */ nop -/* 014BC 80860B0C 45000022 */ bc1f .L80860B98 -/* 014C0 80860B10 00000000 */ nop -/* 014C4 80860B14 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 014C8 80860B18 00000000 */ nop -/* 014CC 80860B1C 3C018086 */ lui $at, %hi(D_8086479C) ## $at = 80860000 -/* 014D0 80860B20 C426479C */ lwc1 $f6, %lo(D_8086479C)($at) -/* 014D4 80860B24 8FB80054 */ lw $t8, 0x0054($sp) -/* 014D8 80860B28 4600303C */ c.lt.s $f6, $f0 -/* 014DC 80860B2C 00000000 */ nop -/* 014E0 80860B30 45000015 */ bc1f .L80860B88 -/* 014E4 80860B34 00000000 */ nop -/* 014E8 80860B38 8F19067C */ lw $t9, 0x067C($t8) ## 0000067C -/* 014EC 80860B3C 33280010 */ andi $t0, $t9, 0x0010 ## $t0 = 00000000 -/* 014F0 80860B40 1100000D */ beq $t0, $zero, .L80860B78 -/* 014F4 80860B44 00000000 */ nop -/* 014F8 80860B48 9209010C */ lbu $t1, 0x010C($s0) ## 0000010C -/* 014FC 80860B4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01500 80860B50 11200005 */ beq $t1, $zero, .L80860B68 -/* 01504 80860B54 00000000 */ nop -/* 01508 80860B58 0C218506 */ jal func_80861418 -/* 0150C 80860B5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01510 80860B60 1000001A */ beq $zero, $zero, .L80860BCC -/* 01514 80860B64 8FBF002C */ lw $ra, 0x002C($sp) -.L80860B68: -/* 01518 80860B68 0C2189F1 */ jal func_808627C4 -/* 0151C 80860B6C 8FA50074 */ lw $a1, 0x0074($sp) -/* 01520 80860B70 10000016 */ beq $zero, $zero, .L80860BCC -/* 01524 80860B74 8FBF002C */ lw $ra, 0x002C($sp) -.L80860B78: -/* 01528 80860B78 0C218506 */ jal func_80861418 -/* 0152C 80860B7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01530 80860B80 10000012 */ beq $zero, $zero, .L80860BCC -/* 01534 80860B84 8FBF002C */ lw $ra, 0x002C($sp) -.L80860B88: -/* 01538 80860B88 0C2187B0 */ jal func_80861EC0 -/* 0153C 80860B8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01540 80860B90 1000000E */ beq $zero, $zero, .L80860BCC -/* 01544 80860B94 8FBF002C */ lw $ra, 0x002C($sp) -.L80860B98: -/* 01548 80860B98 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0154C 80860B9C 00000000 */ nop -/* 01550 80860BA0 3C018086 */ lui $at, %hi(D_808647A0) ## $at = 80860000 -/* 01554 80860BA4 C42847A0 */ lwc1 $f8, %lo(D_808647A0)($at) -/* 01558 80860BA8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 0155C 80860BAC 4608003C */ c.lt.s $f0, $f8 -/* 01560 80860BB0 00000000 */ nop -/* 01564 80860BB4 45020005 */ bc1fl .L80860BCC -/* 01568 80860BB8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0156C 80860BBC 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 01570 80860BC0 00000000 */ nop -/* 01574 80860BC4 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -.L80860BC8: -/* 01578 80860BC8 8FBF002C */ lw $ra, 0x002C($sp) -.L80860BCC: -/* 0157C 80860BCC 8FB00028 */ lw $s0, 0x0028($sp) -/* 01580 80860BD0 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 01584 80860BD4 03E00008 */ jr $ra -/* 01588 80860BD8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860BDC.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860BDC.s deleted file mode 100644 index 5fa8630760..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860BDC.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80860BDC -/* 0158C 80860BDC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01590 80860BE0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01594 80860BE4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01598 80860BE8 3C050601 */ lui $a1, %hi(D_0600E2B0) ## $a1 = 06010000 -/* 0159C 80860BEC 24A5E2B0 */ addiu $a1, $a1, %lo(D_0600E2B0) ## $a1 = 0600E2B0 -/* 015A0 80860BF0 AFA60018 */ sw $a2, 0x0018($sp) -/* 015A4 80860BF4 0C0294BE */ jal Animation_PlayLoop -/* 015A8 80860BF8 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 015AC 80860BFC 8FA40018 */ lw $a0, 0x0018($sp) -/* 015B0 80860C00 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E -/* 015B4 80860C04 3C058086 */ lui $a1, %hi(func_80860C24) ## $a1 = 80860000 -/* 015B8 80860C08 24A50C24 */ addiu $a1, $a1, %lo(func_80860C24) ## $a1 = 80860C24 -/* 015BC 80860C0C 0C217D94 */ jal EnTest_SetupAction -/* 015C0 80860C10 A08E07C8 */ sb $t6, 0x07C8($a0) ## 000007C8 -/* 015C4 80860C14 8FBF0014 */ lw $ra, 0x0014($sp) -/* 015C8 80860C18 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 015CC 80860C1C 03E00008 */ jr $ra -/* 015D0 80860C20 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860C24.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860C24.s deleted file mode 100644 index 5f1027ad8b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860C24.s +++ /dev/null @@ -1,198 +0,0 @@ -.late_rodata -glabel D_808647A4 - .float 0.02 -glabel D_808647A8 - .float 0.02 -glabel D_808647AC - .float 0.8 -glabel D_808647B0 - .float 0.7 - -.text -glabel func_80860C24 -/* 015D4 80860C24 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 015D8 80860C28 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 015DC 80860C2C AFBF0014 */ sw $ra, 0x0014($sp) -/* 015E0 80860C30 AFA5002C */ sw $a1, 0x002C($sp) -/* 015E4 80860C34 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 015E8 80860C38 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 015EC 80860C3C 0C21907A */ jal func_808641E8 -/* 015F0 80860C40 AFA60028 */ sw $a2, 0x0028($sp) -/* 015F4 80860C44 1440009A */ bne $v0, $zero, .L80860EB0 -/* 015F8 80860C48 8FA60028 */ lw $a2, 0x0028($sp) -/* 015FC 80860C4C 84C2008A */ lh $v0, 0x008A($a2) ## 0000008A -/* 01600 80860C50 84C400B6 */ lh $a0, 0x00B6($a2) ## 000000B6 -/* 01604 80860C54 00441023 */ subu $v0, $v0, $a0 -/* 01608 80860C58 00021400 */ sll $v0, $v0, 16 -/* 0160C 80860C5C 00021403 */ sra $v0, $v0, 16 -/* 01610 80860C60 58400013 */ blezl $v0, .L80860CB0 -/* 01614 80860C64 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 01618 80860C68 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0161C 80860C6C 3C014228 */ lui $at, 0x4228 ## $at = 42280000 -/* 01620 80860C70 44814000 */ mtc1 $at, $f8 ## $f8 = 42.00 -/* 01624 80860C74 468021A0 */ cvt.s.w $f6, $f4 -/* 01628 80860C78 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 0162C 80860C7C 44818000 */ mtc1 $at, $f16 ## $f16 = 300.00 -/* 01630 80860C80 46083283 */ div.s $f10, $f6, $f8 -/* 01634 80860C84 46105480 */ add.s $f18, $f10, $f16 -/* 01638 80860C88 4600910D */ trunc.w.s $f4, $f18 -/* 0163C 80860C8C 44182000 */ mfc1 $t8, $f4 -/* 01640 80860C90 00000000 */ nop -/* 01644 80860C94 0018C840 */ sll $t9, $t8, 1 -/* 01648 80860C98 00994021 */ addu $t0, $a0, $t9 -/* 0164C 80860C9C 00182C00 */ sll $a1, $t8, 16 -/* 01650 80860CA0 00052C03 */ sra $a1, $a1, 16 -/* 01654 80860CA4 10000011 */ beq $zero, $zero, .L80860CEC -/* 01658 80860CA8 A4C800B6 */ sh $t0, 0x00B6($a2) ## 000000B6 -/* 0165C 80860CAC 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -.L80860CB0: -/* 01660 80860CB0 3C014228 */ lui $at, 0x4228 ## $at = 42280000 -/* 01664 80860CB4 44815000 */ mtc1 $at, $f10 ## $f10 = 42.00 -/* 01668 80860CB8 46803220 */ cvt.s.w $f8, $f6 -/* 0166C 80860CBC 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 01670 80860CC0 44819000 */ mtc1 $at, $f18 ## $f18 = 300.00 -/* 01674 80860CC4 460A4403 */ div.s $f16, $f8, $f10 -/* 01678 80860CC8 46128101 */ sub.s $f4, $f16, $f18 -/* 0167C 80860CCC 4600218D */ trunc.w.s $f6, $f4 -/* 01680 80860CD0 440B3000 */ mfc1 $t3, $f6 -/* 01684 80860CD4 00000000 */ nop -/* 01688 80860CD8 000B6040 */ sll $t4, $t3, 1 -/* 0168C 80860CDC 008C6821 */ addu $t5, $a0, $t4 -/* 01690 80860CE0 000B2C00 */ sll $a1, $t3, 16 -/* 01694 80860CE4 00052C03 */ sra $a1, $a1, 16 -/* 01698 80860CE8 A4CD00B6 */ sh $t5, 0x00B6($a2) ## 000000B6 -.L80860CEC: -/* 0169C 80860CEC 84CE00B6 */ lh $t6, 0x00B6($a2) ## 000000B6 -/* 016A0 80860CF0 1840000F */ blez $v0, .L80860D30 -/* 016A4 80860CF4 A4CE0032 */ sh $t6, 0x0032($a2) ## 00000032 -/* 016A8 80860CF8 44854000 */ mtc1 $a1, $f8 ## $f8 = 0.00 -/* 016AC 80860CFC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 016B0 80860D00 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 016B4 80860D04 468042A0 */ cvt.s.w $f10, $f8 -/* 016B8 80860D08 3C018086 */ lui $at, %hi(D_808647A4) ## $at = 80860000 -/* 016BC 80860D0C C43047A4 */ lwc1 $f16, %lo(D_808647A4)($at) -/* 016C0 80860D10 46105082 */ mul.s $f2, $f10, $f16 -/* 016C4 80860D14 4602603C */ c.lt.s $f12, $f2 -/* 016C8 80860D18 00000000 */ nop -/* 016CC 80860D1C 45000002 */ bc1f .L80860D28 -/* 016D0 80860D20 00000000 */ nop -/* 016D4 80860D24 46006086 */ mov.s $f2, $f12 -.L80860D28: -/* 016D8 80860D28 1000000E */ beq $zero, $zero, .L80860D64 -/* 016DC 80860D2C E4C201A4 */ swc1 $f2, 0x01A4($a2) ## 000001A4 -.L80860D30: -/* 016E0 80860D30 44859000 */ mtc1 $a1, $f18 ## $f18 = 0.00 -/* 016E4 80860D34 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 016E8 80860D38 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 016EC 80860D3C 46809120 */ cvt.s.w $f4, $f18 -/* 016F0 80860D40 3C018086 */ lui $at, %hi(D_808647A8) ## $at = 80860000 -/* 016F4 80860D44 C42647A8 */ lwc1 $f6, %lo(D_808647A8)($at) -/* 016F8 80860D48 46062082 */ mul.s $f2, $f4, $f6 -/* 016FC 80860D4C 460C103C */ c.lt.s $f2, $f12 -/* 01700 80860D50 00000000 */ nop -/* 01704 80860D54 45020003 */ bc1fl .L80860D64 -/* 01708 80860D58 E4C201A4 */ swc1 $f2, 0x01A4($a2) ## 000001A4 -/* 0170C 80860D5C 46006086 */ mov.s $f2, $f12 -/* 01710 80860D60 E4C201A4 */ swc1 $f2, 0x01A4($a2) ## 000001A4 -.L80860D64: -/* 01714 80860D64 C4C801A0 */ lwc1 $f8, 0x01A0($a2) ## 000001A0 -/* 01718 80860D68 AFA60028 */ sw $a2, 0x0028($sp) -/* 0171C 80860D6C 24C40188 */ addiu $a0, $a2, 0x0188 ## $a0 = 00000188 -/* 01720 80860D70 4600428D */ trunc.w.s $f10, $f8 -/* 01724 80860D74 44035000 */ mfc1 $v1, $f10 -/* 01728 80860D78 0C02927F */ jal SkelAnime_Update - -/* 0172C 80860D7C AFA3001C */ sw $v1, 0x001C($sp) -/* 01730 80860D80 8FA60028 */ lw $a2, 0x0028($sp) -/* 01734 80860D84 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 01738 80860D88 8FA3001C */ lw $v1, 0x001C($sp) -/* 0173C 80860D8C C4C001A4 */ lwc1 $f0, 0x01A4($a2) ## 000001A4 -/* 01740 80860D90 4600703E */ c.le.s $f14, $f0 -/* 01744 80860D94 00000000 */ nop -/* 01748 80860D98 45020004 */ bc1fl .L80860DAC -/* 0174C 80860D9C 46000087 */ neg.s $f2, $f0 -/* 01750 80860DA0 10000002 */ beq $zero, $zero, .L80860DAC -/* 01754 80860DA4 46000086 */ mov.s $f2, $f0 -/* 01758 80860DA8 46000087 */ neg.s $f2, $f0 -.L80860DAC: -/* 0175C 80860DAC C4CC01A0 */ lwc1 $f12, 0x01A0($a2) ## 000001A0 -/* 01760 80860DB0 4600703E */ c.le.s $f14, $f0 -/* 01764 80860DB4 46026401 */ sub.s $f16, $f12, $f2 -/* 01768 80860DB8 4600610D */ trunc.w.s $f4, $f12 -/* 0176C 80860DBC 4600848D */ trunc.w.s $f18, $f16 -/* 01770 80860DC0 44082000 */ mfc1 $t0, $f4 -/* 01774 80860DC4 44049000 */ mfc1 $a0, $f18 -/* 01778 80860DC8 45020004 */ bc1fl .L80860DDC -/* 0177C 80860DCC 46000087 */ neg.s $f2, $f0 -/* 01780 80860DD0 10000002 */ beq $zero, $zero, .L80860DDC -/* 01784 80860DD4 46000086 */ mov.s $f2, $f0 -/* 01788 80860DD8 46000087 */ neg.s $f2, $f0 -.L80860DDC: -/* 0178C 80860DDC 50680013 */ beql $v1, $t0, .L80860E2C -/* 01790 80860DE0 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 01794 80860DE4 4600118D */ trunc.w.s $f6, $f2 -/* 01798 80860DE8 440A3000 */ mfc1 $t2, $f6 -/* 0179C 80860DEC 00000000 */ nop -/* 017A0 80860DF0 01431021 */ addu $v0, $t2, $v1 -/* 017A4 80860DF4 28410003 */ slti $at, $v0, 0x0003 -/* 017A8 80860DF8 54200003 */ bnel $at, $zero, .L80860E08 -/* 017AC 80860DFC 28810007 */ slti $at, $a0, 0x0007 -/* 017B0 80860E00 18800004 */ blez $a0, .L80860E14 -/* 017B4 80860E04 28810007 */ slti $at, $a0, 0x0007 -.L80860E08: -/* 017B8 80860E08 10200007 */ beq $at, $zero, .L80860E28 -/* 017BC 80860E0C 28410009 */ slti $at, $v0, 0x0009 -/* 017C0 80860E10 14200005 */ bne $at, $zero, .L80860E28 -.L80860E14: -/* 017C4 80860E14 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 017C8 80860E18 2405383D */ addiu $a1, $zero, 0x383D ## $a1 = 0000383D -/* 017CC 80860E1C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 017D0 80860E20 AFA60028 */ sw $a2, 0x0028($sp) -/* 017D4 80860E24 8FA60028 */ lw $a2, 0x0028($sp) -.L80860E28: -/* 017D8 80860E28 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -.L80860E2C: -/* 017DC 80860E2C 2405071C */ addiu $a1, $zero, 0x071C ## $a1 = 0000071C -/* 017E0 80860E30 0C00B821 */ jal Actor_IsFacingPlayer -/* 017E4 80860E34 AFA60028 */ sw $a2, 0x0028($sp) -/* 017E8 80860E38 1040001D */ beq $v0, $zero, .L80860EB0 -/* 017EC 80860E3C 8FA60028 */ lw $a2, 0x0028($sp) -/* 017F0 80860E40 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 017F4 80860E44 AFA60028 */ sw $a2, 0x0028($sp) -/* 017F8 80860E48 3C018086 */ lui $at, %hi(D_808647AC) ## $at = 80860000 -/* 017FC 80860E4C C42847AC */ lwc1 $f8, %lo(D_808647AC)($at) -/* 01800 80860E50 8FA60028 */ lw $a2, 0x0028($sp) -/* 01804 80860E54 4600403C */ c.lt.s $f8, $f0 -/* 01808 80860E58 00000000 */ nop -/* 0180C 80860E5C 45000012 */ bc1f .L80860EA8 -/* 01810 80860E60 00000000 */ nop -/* 01814 80860E64 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01818 80860E68 AFA60028 */ sw $a2, 0x0028($sp) -/* 0181C 80860E6C 3C018086 */ lui $at, %hi(D_808647B0) ## $at = 80860000 -/* 01820 80860E70 C42A47B0 */ lwc1 $f10, %lo(D_808647B0)($at) -/* 01824 80860E74 8FA60028 */ lw $a2, 0x0028($sp) -/* 01828 80860E78 4600503C */ c.lt.s $f10, $f0 -/* 0182C 80860E7C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 01830 80860E80 45000005 */ bc1f .L80860E98 -/* 01834 80860E84 00000000 */ nop -/* 01838 80860E88 0C2183B0 */ jal func_80860EC0 -/* 0183C 80860E8C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 01840 80860E90 10000008 */ beq $zero, $zero, .L80860EB4 -/* 01844 80860E94 8FBF0014 */ lw $ra, 0x0014($sp) -.L80860E98: -/* 01848 80860E98 0C217EAC */ jal func_8085FAB0 -/* 0184C 80860E9C 8FA5002C */ lw $a1, 0x002C($sp) -/* 01850 80860EA0 10000004 */ beq $zero, $zero, .L80860EB4 -/* 01854 80860EA4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80860EA8: -/* 01858 80860EA8 0C21810E */ jal func_80860438 -/* 0185C 80860EAC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -.L80860EB0: -/* 01860 80860EB0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80860EB4: -/* 01864 80860EB4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01868 80860EB8 03E00008 */ jr $ra -/* 0186C 80860EBC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s deleted file mode 100644 index 27106b7a4f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_80860EC0 -/* 01870 80860EC0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01874 80860EC4 AFB00018 */ sw $s0, 0x0018($sp) -/* 01878 80860EC8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0187C 80860ECC AFBF001C */ sw $ra, 0x001C($sp) -/* 01880 80860ED0 3C050601 */ lui $a1, %hi(D_0600E2B0) ## $a1 = 06010000 -/* 01884 80860ED4 24A5E2B0 */ addiu $a1, $a1, %lo(D_0600E2B0) ## $a1 = 0600E2B0 -/* 01888 80860ED8 0C0294BE */ jal Animation_PlayLoop -/* 0188C 80860EDC 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 01890 80860EE0 240E000F */ addiu $t6, $zero, 0x000F ## $t6 = 0000000F -/* 01894 80860EE4 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01898 80860EE8 A20E07C8 */ sb $t6, 0x07C8($s0) ## 000007C8 -/* 0189C 80860EEC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 018A0 80860EF0 44811000 */ mtc1 $at, $f2 ## $f2 = 0.50 -/* 018A4 80860EF4 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 -/* 018A8 80860EF8 4600103C */ c.lt.s $f2, $f0 -/* 018AC 80860EFC 00000000 */ nop -/* 018B0 80860F00 45020005 */ bc1fl .L80860F18 -/* 018B4 80860F04 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 018B8 80860F08 44812000 */ mtc1 $at, $f4 ## $f4 = -0.50 -/* 018BC 80860F0C 10000002 */ beq $zero, $zero, .L80860F18 -/* 018C0 80860F10 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 018C4 80860F14 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -.L80860F18: -/* 018C8 80860F18 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 018CC 80860F1C 00000000 */ nop -/* 018D0 80860F20 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 018D4 80860F24 44813000 */ mtc1 $at, $f6 ## $f6 = 15.00 -/* 018D8 80860F28 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 018DC 80860F2C 44815000 */ mtc1 $at, $f10 ## $f10 = 25.00 -/* 018E0 80860F30 46060202 */ mul.s $f8, $f0, $f6 -/* 018E4 80860F34 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 018E8 80860F38 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 -/* 018EC 80860F3C 3C058086 */ lui $a1, %hi(func_80860F84) ## $a1 = 80860000 -/* 018F0 80860F40 24A50F84 */ addiu $a1, $a1, %lo(func_80860F84) ## $a1 = 80860F84 -/* 018F4 80860F44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018F8 80860F48 E60407EC */ swc1 $f4, 0x07EC($s0) ## 000007EC -/* 018FC 80860F4C 460A4400 */ add.s $f16, $f8, $f10 -/* 01900 80860F50 A6090032 */ sh $t1, 0x0032($s0) ## 00000032 -/* 01904 80860F54 4600848D */ trunc.w.s $f18, $f16 -/* 01908 80860F58 44189000 */ mfc1 $t8, $f18 -/* 0190C 80860F5C 00000000 */ nop -/* 01910 80860F60 0018CC00 */ sll $t9, $t8, 16 -/* 01914 80860F64 00194403 */ sra $t0, $t9, 16 -/* 01918 80860F68 0C217D94 */ jal EnTest_SetupAction -/* 0191C 80860F6C AE0807E8 */ sw $t0, 0x07E8($s0) ## 000007E8 -/* 01920 80860F70 8FBF001C */ lw $ra, 0x001C($sp) -/* 01924 80860F74 8FB00018 */ lw $s0, 0x0018($sp) -/* 01928 80860F78 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0192C 80860F7C 03E00008 */ jr $ra -/* 01930 80860F80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860F84.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860F84.s deleted file mode 100644 index d1cd19b74d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860F84.s +++ /dev/null @@ -1,339 +0,0 @@ -.late_rodata -glabel D_808647B4 - .float -0.8 -glabel D_808647B8 - .float -0.8 - -.text -glabel func_80860F84 -/* 01934 80860F84 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 01938 80860F88 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0193C 80860F8C AFB00020 */ sw $s0, 0x0020($sp) -/* 01940 80860F90 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 01944 80860F94 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01948 80860F98 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0194C 80860F9C 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 01950 80860FA0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01954 80860FA4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01958 80860FA8 AFA6004C */ sw $a2, 0x004C($sp) -/* 0195C 80860FAC AFAE0030 */ sw $t6, 0x0030($sp) -/* 01960 80860FB0 0C21907A */ jal func_808641E8 -/* 01964 80860FB4 E7A4002C */ swc1 $f4, 0x002C($sp) -/* 01968 80860FB8 14400112 */ bne $v0, $zero, .L80861404 -/* 0196C 80860FBC 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 01970 80860FC0 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 01974 80860FC4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01978 80860FC8 AFAF0010 */ sw $t7, 0x0010($sp) -/* 0197C 80860FCC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01980 80860FD0 0C01E1A7 */ jal Math_SmoothStepToS - -/* 01984 80860FD4 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 01988 80860FD8 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 -/* 0198C 80860FDC 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 01990 80860FE0 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01994 80860FE4 27193E80 */ addiu $t9, $t8, 0x3E80 ## $t9 = 00003E80 -/* 01998 80860FE8 A6190032 */ sh $t9, 0x0032($s0) ## 00000032 -/* 0199C 80860FEC 8FA80030 */ lw $t0, 0x0030($sp) -/* 019A0 80860FF0 850900B6 */ lh $t1, 0x00B6($t0) ## 000000B6 -/* 019A4 80860FF4 01215021 */ addu $t2, $t1, $at -/* 019A8 80860FF8 A7AA0046 */ sh $t2, 0x0046($sp) -/* 019AC 80860FFC C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 019B0 80861000 4600303E */ c.le.s $f6, $f0 -/* 019B4 80861004 00000000 */ nop -/* 019B8 80861008 4500000E */ bc1f .L80861044 -/* 019BC 8086100C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 019C0 80861010 44811000 */ mtc1 $at, $f2 ## $f2 = 6.00 -/* 019C4 80861014 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 019C8 80861018 4602003C */ c.lt.s $f0, $f2 -/* 019CC 8086101C 00000000 */ nop -/* 019D0 80861020 45000006 */ bc1f .L8086103C -/* 019D4 80861024 00000000 */ nop -/* 019D8 80861028 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 019DC 8086102C 00000000 */ nop -/* 019E0 80861030 46080280 */ add.s $f10, $f0, $f8 -/* 019E4 80861034 10000010 */ beq $zero, $zero, .L80861078 -/* 019E8 80861038 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -.L8086103C: -/* 019EC 8086103C 1000000E */ beq $zero, $zero, .L80861078 -/* 019F0 80861040 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -.L80861044: -/* 019F4 80861044 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 -/* 019F8 80861048 44811000 */ mtc1 $at, $f2 ## $f2 = -6.00 -/* 019FC 8086104C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01A00 80861050 4600103C */ c.lt.s $f2, $f0 -/* 01A04 80861054 00000000 */ nop -/* 01A08 80861058 45020007 */ bc1fl .L80861078 -/* 01A0C 8086105C E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 01A10 80861060 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 01A14 80861064 00000000 */ nop -/* 01A18 80861068 46100481 */ sub.s $f18, $f0, $f16 -/* 01A1C 8086106C 10000002 */ beq $zero, $zero, .L80861078 -/* 01A20 80861070 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 -/* 01A24 80861074 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -.L80861078: -/* 01A28 80861078 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 -/* 01A2C 8086107C 30420008 */ andi $v0, $v0, 0x0008 ## $v0 = 00000000 -/* 01A30 80861080 1440000D */ bne $v0, $zero, .L808610B8 -/* 01A34 80861084 00000000 */ nop -/* 01A38 80861088 860B001C */ lh $t3, 0x001C($s0) ## 0000001C -/* 01A3C 8086108C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01A40 80861090 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01A44 80861094 15610040 */ bne $t3, $at, .L80861198 -/* 01A48 80861098 8FA5004C */ lw $a1, 0x004C($sp) -/* 01A4C 8086109C 8E060068 */ lw $a2, 0x0068($s0) ## 00000068 -/* 01A50 808610A0 0C00CE6E */ jal func_800339B8 -/* 01A54 808610A4 86070032 */ lh $a3, 0x0032($s0) ## 00000032 -/* 01A58 808610A8 5440003C */ bnel $v0, $zero, .L8086119C -/* 01A5C 808610AC 8FA4004C */ lw $a0, 0x004C($sp) -/* 01A60 808610B0 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 -/* 01A64 808610B4 30420008 */ andi $v0, $v0, 0x0008 ## $v0 = 00000000 -.L808610B8: -/* 01A68 808610B8 10400016 */ beq $v0, $zero, .L80861114 -/* 01A6C 808610BC 3C018086 */ lui $at, %hi(D_808647B4) ## $at = 80860000 -/* 01A70 808610C0 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 01A74 808610C4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01A78 808610C8 00000000 */ nop -/* 01A7C 808610CC 4604303E */ c.le.s $f6, $f4 -/* 01A80 808610D0 00000000 */ nop -/* 01A84 808610D4 45020007 */ bc1fl .L808610F4 -/* 01A88 808610D8 860200B6 */ lh $v0, 0x00B6($s0) ## 000000B6 -/* 01A8C 808610DC 860200B6 */ lh $v0, 0x00B6($s0) ## 000000B6 -/* 01A90 808610E0 24423FFF */ addiu $v0, $v0, 0x3FFF ## $v0 = 00003FFF -/* 01A94 808610E4 00021400 */ sll $v0, $v0, 16 -/* 01A98 808610E8 10000005 */ beq $zero, $zero, .L80861100 -/* 01A9C 808610EC 00021403 */ sra $v0, $v0, 16 -/* 01AA0 808610F0 860200B6 */ lh $v0, 0x00B6($s0) ## 000000B6 -.L808610F4: -/* 01AA4 808610F4 2442C001 */ addiu $v0, $v0, 0xC001 ## $v0 = 00000000 -/* 01AA8 808610F8 00021400 */ sll $v0, $v0, 16 -/* 01AAC 808610FC 00021403 */ sra $v0, $v0, 16 -.L80861100: -/* 01AB0 80861100 860C007E */ lh $t4, 0x007E($s0) ## 0000007E -/* 01AB4 80861104 01821023 */ subu $v0, $t4, $v0 -/* 01AB8 80861108 00021400 */ sll $v0, $v0, 16 -/* 01ABC 8086110C 10000006 */ beq $zero, $zero, .L80861128 -/* 01AC0 80861110 00021403 */ sra $v0, $v0, 16 -.L80861114: -/* 01AC4 80861114 C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 -/* 01AC8 80861118 C42A47B4 */ lwc1 $f10, %lo(D_808647B4)($at) -/* 01ACC 8086111C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01AD0 80861120 460A4402 */ mul.s $f16, $f8, $f10 -/* 01AD4 80861124 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -.L80861128: -/* 01AD8 80861128 04400003 */ bltz $v0, .L80861138 -/* 01ADC 8086112C 00021823 */ subu $v1, $zero, $v0 -/* 01AE0 80861130 10000001 */ beq $zero, $zero, .L80861138 -/* 01AE4 80861134 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80861138: -/* 01AE8 80861138 28614001 */ slti $at, $v1, 0x4001 -/* 01AEC 8086113C 14200016 */ bne $at, $zero, .L80861198 -/* 01AF0 80861140 3C018086 */ lui $at, %hi(D_808647B8) ## $at = 80860000 -/* 01AF4 80861144 C42447B8 */ lwc1 $f4, %lo(D_808647B8)($at) -/* 01AF8 80861148 C6120068 */ lwc1 $f18, 0x0068($s0) ## 00000068 -/* 01AFC 8086114C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 01B00 80861150 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01B04 80861154 46049182 */ mul.s $f6, $f18, $f4 -/* 01B08 80861158 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 01B0C 8086115C C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 01B10 80861160 4608003C */ c.lt.s $f0, $f8 -/* 01B14 80861164 00000000 */ nop -/* 01B18 80861168 45020008 */ bc1fl .L8086118C -/* 01B1C 8086116C 44819000 */ mtc1 $at, $f18 ## $f18 = 0.50 -/* 01B20 80861170 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01B24 80861174 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 -/* 01B28 80861178 00000000 */ nop -/* 01B2C 8086117C 460A0401 */ sub.s $f16, $f0, $f10 -/* 01B30 80861180 10000005 */ beq $zero, $zero, .L80861198 -/* 01B34 80861184 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 01B38 80861188 44819000 */ mtc1 $at, $f18 ## $f18 = 0.50 -.L8086118C: -/* 01B3C 8086118C 00000000 */ nop -/* 01B40 80861190 46120100 */ add.s $f4, $f0, $f18 -/* 01B44 80861194 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -.L80861198: -/* 01B48 80861198 8FA4004C */ lw $a0, 0x004C($sp) -.L8086119C: -/* 01B4C 8086119C 0C00CEAE */ jal Actor_OtherIsTargeted -/* 01B50 808611A0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01B54 808611A4 10400004 */ beq $v0, $zero, .L808611B8 -/* 01B58 808611A8 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 01B5C 808611AC 44811000 */ mtc1 $at, $f2 ## $f2 = 200.00 -/* 01B60 808611B0 00000000 */ nop -/* 01B64 808611B4 E7A2002C */ swc1 $f2, 0x002C($sp) -.L808611B8: -/* 01B68 808611B8 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 01B6C 808611BC C7A2002C */ lwc1 $f2, 0x002C($sp) -/* 01B70 808611C0 44813000 */ mtc1 $at, $f6 ## $f6 = 80.00 -/* 01B74 808611C4 C6000090 */ lwc1 $f0, 0x0090($s0) ## 00000090 -/* 01B78 808611C8 260407EC */ addiu $a0, $s0, 0x07EC ## $a0 = 000007EC -/* 01B7C 808611CC 46023200 */ add.s $f8, $f6, $f2 -/* 01B80 808611D0 3C05C020 */ lui $a1, 0xC020 ## $a1 = C0200000 -/* 01B84 808611D4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01B88 808611D8 3C073F4C */ lui $a3, 0x3F4C ## $a3 = 3F4C0000 -/* 01B8C 808611DC 4608003E */ c.le.s $f0, $f8 -/* 01B90 808611E0 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 -/* 01B94 808611E4 45020008 */ bc1fl .L80861208 -/* 01B98 808611E8 44818000 */ mtc1 $at, $f16 ## $f16 = 110.00 -/* 01B9C 808611EC 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 01BA0 808611F0 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3F4CCCCD -/* 01BA4 808611F4 0C01E0C4 */ jal Math_SmoothStepToF - -/* 01BA8 808611F8 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 01BAC 808611FC 1000001A */ beq $zero, $zero, .L80861268 -/* 01BB0 80861200 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 01BB4 80861204 44818000 */ mtc1 $at, $f16 ## $f16 = 0.00 -.L80861208: -/* 01BB8 80861208 260407EC */ addiu $a0, $s0, 0x07EC ## $a0 = 000007EC -/* 01BBC 8086120C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01BC0 80861210 46028480 */ add.s $f18, $f16, $f2 -/* 01BC4 80861214 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01BC8 80861218 3C0740D4 */ lui $a3, 0x40D4 ## $a3 = 40D40000 -/* 01BCC 8086121C 4600903C */ c.lt.s $f18, $f0 -/* 01BD0 80861220 00000000 */ nop -/* 01BD4 80861224 4502000C */ bc1fl .L80861258 -/* 01BD8 80861228 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01BDC 8086122C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01BE0 80861230 3C073F4C */ lui $a3, 0x3F4C ## $a3 = 3F4C0000 -/* 01BE4 80861234 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3F4CCCCD -/* 01BE8 80861238 260407EC */ addiu $a0, $s0, 0x07EC ## $a0 = 000007EC -/* 01BEC 8086123C 3C054020 */ lui $a1, 0x4020 ## $a1 = 40200000 -/* 01BF0 80861240 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01BF4 80861244 0C01E0C4 */ jal Math_SmoothStepToF - -/* 01BF8 80861248 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01BFC 8086124C 10000006 */ beq $zero, $zero, .L80861268 -/* 01C00 80861250 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 01C04 80861254 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -.L80861258: -/* 01C08 80861258 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 0000CCCD -/* 01C0C 8086125C 0C01E0C4 */ jal Math_SmoothStepToF - -/* 01C10 80861260 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01C14 80861264 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -.L80861268: -/* 01C18 80861268 C60A07EC */ lwc1 $f10, 0x07EC($s0) ## 000007EC -/* 01C1C 8086126C 460A4032 */ c.eq.s $f8, $f10 -/* 01C20 80861270 00000000 */ nop -/* 01C24 80861274 45030010 */ bc1tl .L808612B8 -/* 01C28 80861278 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01C2C 8086127C 0C01DE1C */ jal Math_SinS - ## sins? -/* 01C30 80861280 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 01C34 80861284 C61207EC */ lwc1 $f18, 0x07EC($s0) ## 000007EC -/* 01C38 80861288 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 01C3C 8086128C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 01C40 80861290 46120102 */ mul.s $f4, $f0, $f18 -/* 01C44 80861294 46048180 */ add.s $f6, $f16, $f4 -/* 01C48 80861298 0C01DE0D */ jal Math_CosS - ## coss? -/* 01C4C 8086129C E6060024 */ swc1 $f6, 0x0024($s0) ## 00000024 -/* 01C50 808612A0 C60A07EC */ lwc1 $f10, 0x07EC($s0) ## 000007EC -/* 01C54 808612A4 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 01C58 808612A8 460A0482 */ mul.s $f18, $f0, $f10 -/* 01C5C 808612AC 46124400 */ add.s $f16, $f8, $f18 -/* 01C60 808612B0 E610002C */ swc1 $f16, 0x002C($s0) ## 0000002C -/* 01C64 808612B4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -.L808612B8: -/* 01C68 808612B8 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 01C6C 808612BC C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 01C70 808612C0 C60801A0 */ lwc1 $f8, 0x01A0($s0) ## 000001A0 -/* 01C74 808612C4 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 01C78 808612C8 46062282 */ mul.s $f10, $f4, $f6 -/* 01C7C 808612CC 4600448D */ trunc.w.s $f18, $f8 -/* 01C80 808612D0 44039000 */ mfc1 $v1, $f18 -/* 01C84 808612D4 E60A01A4 */ swc1 $f10, 0x01A4($s0) ## 000001A4 -/* 01C88 808612D8 0C02927F */ jal SkelAnime_Update - -/* 01C8C 808612DC AFA3003C */ sw $v1, 0x003C($sp) -/* 01C90 808612E0 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 01C94 808612E4 C60001A4 */ lwc1 $f0, 0x01A4($s0) ## 000001A4 -/* 01C98 808612E8 8FA3003C */ lw $v1, 0x003C($sp) -/* 01C9C 808612EC 4600703E */ c.le.s $f14, $f0 -/* 01CA0 808612F0 00000000 */ nop -/* 01CA4 808612F4 45020004 */ bc1fl .L80861308 -/* 01CA8 808612F8 46000087 */ neg.s $f2, $f0 -/* 01CAC 808612FC 10000002 */ beq $zero, $zero, .L80861308 -/* 01CB0 80861300 46000086 */ mov.s $f2, $f0 -/* 01CB4 80861304 46000087 */ neg.s $f2, $f0 -.L80861308: -/* 01CB8 80861308 C60C01A0 */ lwc1 $f12, 0x01A0($s0) ## 000001A0 -/* 01CBC 8086130C 4600703E */ c.le.s $f14, $f0 -/* 01CC0 80861310 46026401 */ sub.s $f16, $f12, $f2 -/* 01CC4 80861314 4600618D */ trunc.w.s $f6, $f12 -/* 01CC8 80861318 4600810D */ trunc.w.s $f4, $f16 -/* 01CCC 8086131C 44183000 */ mfc1 $t8, $f6 -/* 01CD0 80861320 44042000 */ mfc1 $a0, $f4 -/* 01CD4 80861324 45020004 */ bc1fl .L80861338 -/* 01CD8 80861328 46000087 */ neg.s $f2, $f0 -/* 01CDC 8086132C 10000002 */ beq $zero, $zero, .L80861338 -/* 01CE0 80861330 46000086 */ mov.s $f2, $f0 -/* 01CE4 80861334 46000087 */ neg.s $f2, $f0 -.L80861338: -/* 01CE8 80861338 50780011 */ beql $v1, $t8, .L80861380 -/* 01CEC 8086133C 8FA9004C */ lw $t1, 0x004C($sp) -/* 01CF0 80861340 4600128D */ trunc.w.s $f10, $f2 -/* 01CF4 80861344 44085000 */ mfc1 $t0, $f10 -/* 01CF8 80861348 00000000 */ nop -/* 01CFC 8086134C 01031021 */ addu $v0, $t0, $v1 -/* 01D00 80861350 28410002 */ slti $at, $v0, 0x0002 -/* 01D04 80861354 54200003 */ bnel $at, $zero, .L80861364 -/* 01D08 80861358 28810007 */ slti $at, $a0, 0x0007 -/* 01D0C 8086135C 18800004 */ blez $a0, .L80861370 -/* 01D10 80861360 28810007 */ slti $at, $a0, 0x0007 -.L80861364: -/* 01D14 80861364 10200005 */ beq $at, $zero, .L8086137C -/* 01D18 80861368 28410008 */ slti $at, $v0, 0x0008 -/* 01D1C 8086136C 14200003 */ bne $at, $zero, .L8086137C -.L80861370: -/* 01D20 80861370 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D24 80861374 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01D28 80861378 2405383D */ addiu $a1, $zero, 0x383D ## $a1 = 0000383D -.L8086137C: -/* 01D2C 8086137C 8FA9004C */ lw $t1, 0x004C($sp) -.L80861380: -/* 01D30 80861380 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 -/* 01D34 80861384 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D38 80861388 01495021 */ addu $t2, $t2, $t1 -/* 01D3C 8086138C 8D4A1DE4 */ lw $t2, 0x1DE4($t2) ## 00011DE4 -/* 01D40 80861390 314B005F */ andi $t3, $t2, 0x005F ## $t3 = 00000000 -/* 01D44 80861394 55600004 */ bnel $t3, $zero, .L808613A8 -/* 01D48 80861398 87AC0046 */ lh $t4, 0x0046($sp) -/* 01D4C 8086139C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01D50 808613A0 24053838 */ addiu $a1, $zero, 0x3838 ## $a1 = 00003838 -/* 01D54 808613A4 87AC0046 */ lh $t4, 0x0046($sp) -.L808613A8: -/* 01D58 808613A8 860D00B6 */ lh $t5, 0x00B6($s0) ## 000000B6 -/* 01D5C 808613AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D60 808613B0 018D1023 */ subu $v0, $t4, $t5 -/* 01D64 808613B4 00021400 */ sll $v0, $v0, 16 -/* 01D68 808613B8 00021403 */ sra $v0, $v0, 16 -/* 01D6C 808613BC 04430005 */ bgezl $v0, .L808613D4 -/* 01D70 808613C0 28416801 */ slti $at, $v0, 0x6801 -/* 01D74 808613C4 00021023 */ subu $v0, $zero, $v0 -/* 01D78 808613C8 00021400 */ sll $v0, $v0, 16 -/* 01D7C 808613CC 00021403 */ sra $v0, $v0, 16 -/* 01D80 808613D0 28416801 */ slti $at, $v0, 0x6801 -.L808613D4: -/* 01D84 808613D4 10200004 */ beq $at, $zero, .L808613E8 -/* 01D88 808613D8 00000000 */ nop -/* 01D8C 808613DC 8E0207E8 */ lw $v0, 0x07E8($s0) ## 000007E8 -/* 01D90 808613E0 14400005 */ bne $v0, $zero, .L808613F8 -/* 01D94 808613E4 00000000 */ nop -.L808613E8: -/* 01D98 808613E8 0C217EAC */ jal func_8085FAB0 -/* 01D9C 808613EC 8FA5004C */ lw $a1, 0x004C($sp) -/* 01DA0 808613F0 10000005 */ beq $zero, $zero, .L80861408 -/* 01DA4 808613F4 8FBF0024 */ lw $ra, 0x0024($sp) -.L808613F8: -/* 01DA8 808613F8 10400002 */ beq $v0, $zero, .L80861404 -/* 01DAC 808613FC 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01DB0 80861400 AE0E07E8 */ sw $t6, 0x07E8($s0) ## 000007E8 -.L80861404: -/* 01DB4 80861404 8FBF0024 */ lw $ra, 0x0024($sp) -.L80861408: -/* 01DB8 80861408 8FB00020 */ lw $s0, 0x0020($sp) -/* 01DBC 8086140C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 01DC0 80861410 03E00008 */ jr $ra -/* 01DC4 80861414 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861418.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861418.s deleted file mode 100644 index b1969424bd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861418.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80861418 -/* 01DC8 80861418 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01DCC 8086141C AFB00018 */ sw $s0, 0x0018($sp) -/* 01DD0 80861420 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01DD4 80861424 AFBF001C */ sw $ra, 0x001C($sp) -/* 01DD8 80861428 3C050601 */ lui $a1, %hi(D_0600B00C) ## $a1 = 06010000 -/* 01DDC 8086142C 24A5B00C */ addiu $a1, $a1, %lo(D_0600B00C) ## $a1 = 0600B00C -/* 01DE0 80861430 0C02947A */ jal Animation_PlayOnce -/* 01DE4 80861434 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 01DE8 80861438 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 -/* 01DEC 8086143C 0C03E291 */ jal func_800F8A44 -/* 01DF0 80861440 24053838 */ addiu $a1, $zero, 0x3838 ## $a1 = 00003838 -/* 01DF4 80861444 920E086C */ lbu $t6, 0x086C($s0) ## 0000086C -/* 01DF8 80861448 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01DFC 8086144C 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 -/* 01E00 80861450 3C058086 */ lui $a1, %hi(func_8086149C) ## $a1 = 80860000 -/* 01E04 80861454 31CFFFFB */ andi $t7, $t6, 0xFFFB ## $t7 = 00000000 -/* 01E08 80861458 A20F086C */ sb $t7, 0x086C($s0) ## 0000086C -/* 01E0C 8086145C A21807C8 */ sb $t8, 0x07C8($s0) ## 000007C8 -/* 01E10 80861460 24A5149C */ addiu $a1, $a1, %lo(func_8086149C) ## $a1 = 8086149C -/* 01E14 80861464 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E18 80861468 0C217D94 */ jal EnTest_SetupAction -/* 01E1C 8086146C E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 01E20 80861470 920807DE */ lbu $t0, 0x07DE($s0) ## 000007DE -/* 01E24 80861474 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 -/* 01E28 80861478 A2190879 */ sb $t9, 0x0879($s0) ## 00000879 -/* 01E2C 8086147C 11000002 */ beq $t0, $zero, .L80861488 -/* 01E30 80861480 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 -/* 01E34 80861484 A20907DE */ sb $t1, 0x07DE($s0) ## 000007DE -.L80861488: -/* 01E38 80861488 8FBF001C */ lw $ra, 0x001C($sp) -/* 01E3C 8086148C 8FB00018 */ lw $s0, 0x0018($sp) -/* 01E40 80861490 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01E44 80861494 03E00008 */ jr $ra -/* 01E48 80861498 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086149C.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086149C.s deleted file mode 100644 index 6ce9de647c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086149C.s +++ /dev/null @@ -1,76 +0,0 @@ -glabel func_8086149C -/* 01E4C 8086149C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01E50 808614A0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01E54 808614A4 AFB00020 */ sw $s0, 0x0020($sp) -/* 01E58 808614A8 AFA5002C */ sw $a1, 0x002C($sp) -/* 01E5C 808614AC C48001A0 */ lwc1 $f0, 0x01A0($a0) ## 000001A0 -/* 01E60 808614B0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01E64 808614B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01E68 808614B8 4600018D */ trunc.w.s $f6, $f0 -/* 01E6C 808614BC 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 -/* 01E70 808614C0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01E74 808614C4 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 -/* 01E78 808614C8 44033000 */ mfc1 $v1, $f6 -/* 01E7C 808614CC E484FFB2 */ swc1 $f4, -0x004E($a0) ## 00000068 -/* 01E80 808614D0 28610004 */ slti $at, $v1, 0x0004 -/* 01E84 808614D4 50200009 */ beql $at, $zero, .L808614FC -/* 01E88 808614D8 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01E8C 808614DC 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 01E90 808614E0 0C01E1A7 */ jal Math_SmoothStepToS - -/* 01E94 808614E4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01E98 808614E8 C60001A0 */ lwc1 $f0, 0x01A0($s0) ## 000001A0 -/* 01E9C 808614EC 4600020D */ trunc.w.s $f8, $f0 -/* 01EA0 808614F0 44034000 */ mfc1 $v1, $f8 -/* 01EA4 808614F4 00000000 */ nop -/* 01EA8 808614F8 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -.L808614FC: -/* 01EAC 808614FC 14610004 */ bne $v1, $at, .L80861510 -/* 01EB0 80861500 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01EB4 80861504 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01EB8 80861508 24053839 */ addiu $a1, $zero, 0x3839 ## $a1 = 00003839 -/* 01EBC 8086150C C60001A0 */ lwc1 $f0, 0x01A0($s0) ## 000001A0 -.L80861510: -/* 01EC0 80861510 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 01EC4 80861514 44815000 */ mtc1 $at, $f10 ## $f10 = 7.00 -/* 01EC8 80861518 3C014130 */ lui $at, 0x4130 ## $at = 41300000 -/* 01ECC 8086151C 4600503C */ c.lt.s $f10, $f0 -/* 01ED0 80861520 00000000 */ nop -/* 01ED4 80861524 4502000A */ bc1fl .L80861550 -/* 01ED8 80861528 A2000808 */ sb $zero, 0x0808($s0) ## 00000808 -/* 01EDC 8086152C 44818000 */ mtc1 $at, $f16 ## $f16 = 11.00 -/* 01EE0 80861530 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 01EE4 80861534 4610003C */ c.lt.s $f0, $f16 -/* 01EE8 80861538 00000000 */ nop -/* 01EEC 8086153C 45020004 */ bc1fl .L80861550 -/* 01EF0 80861540 A2000808 */ sb $zero, 0x0808($s0) ## 00000808 -/* 01EF4 80861544 10000002 */ beq $zero, $zero, .L80861550 -/* 01EF8 80861548 A2180808 */ sb $t8, 0x0808($s0) ## 00000808 -/* 01EFC 8086154C A2000808 */ sb $zero, 0x0808($s0) ## 00000808 -.L80861550: -/* 01F00 80861550 0C02927F */ jal SkelAnime_Update - -/* 01F04 80861554 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 01F08 80861558 1040000D */ beq $v0, $zero, .L80861590 -/* 01F0C 8086155C 8FB9002C */ lw $t9, 0x002C($sp) -/* 01F10 80861560 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 -/* 01F14 80861564 01194021 */ addu $t0, $t0, $t9 -/* 01F18 80861568 8D081DE4 */ lw $t0, 0x1DE4($t0) ## 00011DE4 -/* 01F1C 8086156C 31090001 */ andi $t1, $t0, 0x0001 ## $t1 = 00000000 -/* 01F20 80861570 11200005 */ beq $t1, $zero, .L80861588 -/* 01F24 80861574 00000000 */ nop -/* 01F28 80861578 0C218569 */ jal func_808615A4 -/* 01F2C 8086157C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01F30 80861580 10000004 */ beq $zero, $zero, .L80861594 -/* 01F34 80861584 8FBF0024 */ lw $ra, 0x0024($sp) -.L80861588: -/* 01F38 80861588 0C218607 */ jal func_8086181C -/* 01F3C 8086158C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80861590: -/* 01F40 80861590 8FBF0024 */ lw $ra, 0x0024($sp) -.L80861594: -/* 01F44 80861594 8FB00020 */ lw $s0, 0x0020($sp) -/* 01F48 80861598 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01F4C 8086159C 03E00008 */ jr $ra -/* 01F50 808615A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615A4.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615A4.s deleted file mode 100644 index 00050ef2c0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615A4.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_808615A4 -/* 01F54 808615A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01F58 808615A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01F5C 808615AC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01F60 808615B0 3C050601 */ lui $a1, %hi(D_0600B4E4) ## $a1 = 06010000 -/* 01F64 808615B4 24A5B4E4 */ addiu $a1, $a1, %lo(D_0600B4E4) ## $a1 = 0600B4E4 -/* 01F68 808615B8 AFA60018 */ sw $a2, 0x0018($sp) -/* 01F6C 808615BC 0C02947A */ jal Animation_PlayOnce -/* 01F70 808615C0 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 01F74 808615C4 8FA40018 */ lw $a0, 0x0018($sp) -/* 01F78 808615C8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01F7C 808615CC 240E0012 */ addiu $t6, $zero, 0x0012 ## $t6 = 00000012 -/* 01F80 808615D0 3C058086 */ lui $a1, %hi(func_808615F4) ## $a1 = 80860000 -/* 01F84 808615D4 24A515F4 */ addiu $a1, $a1, %lo(func_808615F4) ## $a1 = 808615F4 -/* 01F88 808615D8 A08E07C8 */ sb $t6, 0x07C8($a0) ## 000007C8 -/* 01F8C 808615DC 0C217D94 */ jal EnTest_SetupAction -/* 01F90 808615E0 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 01F94 808615E4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01F98 808615E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01F9C 808615EC 03E00008 */ jr $ra -/* 01FA0 808615F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615F4.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615F4.s deleted file mode 100644 index 76e7de66a6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615F4.s +++ /dev/null @@ -1,162 +0,0 @@ -.late_rodata -glabel D_808647BC - .float 0.7 -glabel D_808647C0 - .float 0.7 - -.text -glabel func_808615F4 -/* 01FA4 808615F4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01FA8 808615F8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01FAC 808615FC AFA50024 */ sw $a1, 0x0024($sp) -/* 01FB0 80861600 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 01FB4 80861604 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01FB8 80861608 AFA60020 */ sw $a2, 0x0020($sp) -/* 01FBC 8086160C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 01FC0 80861610 0C02927F */ jal SkelAnime_Update - -/* 01FC4 80861614 AFAF001C */ sw $t7, 0x001C($sp) -/* 01FC8 80861618 1040007C */ beq $v0, $zero, .L8086180C -/* 01FCC 8086161C 8FA60020 */ lw $a2, 0x0020($sp) -/* 01FD0 80861620 90C2086C */ lbu $v0, 0x086C($a2) ## 0000086C -/* 01FD4 80861624 30580002 */ andi $t8, $v0, 0x0002 ## $t8 = 00000000 -/* 01FD8 80861628 1300000A */ beq $t8, $zero, .L80861654 -/* 01FDC 8086162C 00000000 */ nop -/* 01FE0 80861630 84C8001C */ lh $t0, 0x001C($a2) ## 0000001C -/* 01FE4 80861634 3059FFFD */ andi $t9, $v0, 0xFFFD ## $t9 = 00000000 -/* 01FE8 80861638 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01FEC 8086163C 11010005 */ beq $t0, $at, .L80861654 -/* 01FF0 80861640 A0D9086C */ sb $t9, 0x086C($a2) ## 0000086C -/* 01FF4 80861644 0C218653 */ jal func_8086194C -/* 01FF8 80861648 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 01FFC 8086164C 10000070 */ beq $zero, $zero, .L80861810 -/* 02000 80861650 8FBF0014 */ lw $ra, 0x0014($sp) -.L80861654: -/* 02004 80861654 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02008 80861658 AFA60020 */ sw $a2, 0x0020($sp) -/* 0200C 8086165C 3C018086 */ lui $at, %hi(D_808647BC) ## $at = 80860000 -/* 02010 80861660 C42447BC */ lwc1 $f4, %lo(D_808647BC)($at) -/* 02014 80861664 8FA60020 */ lw $a2, 0x0020($sp) -/* 02018 80861668 8FA5001C */ lw $a1, 0x001C($sp) -/* 0201C 8086166C 4600203C */ c.lt.s $f4, $f0 -/* 02020 80861670 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 02024 80861674 4500000F */ bc1f .L808616B4 -/* 02028 80861678 00000000 */ nop -/* 0202C 8086167C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 02030 80861680 0C21801A */ jal func_80860068 -/* 02034 80861684 AFA60020 */ sw $a2, 0x0020($sp) -/* 02038 80861688 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0203C 8086168C 00000000 */ nop -/* 02040 80861690 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 02044 80861694 44811000 */ mtc1 $at, $f2 ## $f2 = 5.00 -/* 02048 80861698 8FA60020 */ lw $a2, 0x0020($sp) -/* 0204C 8086169C 46020182 */ mul.s $f6, $f0, $f2 -/* 02050 808616A0 46023200 */ add.s $f8, $f6, $f2 -/* 02054 808616A4 4600428D */ trunc.w.s $f10, $f8 -/* 02058 808616A8 440A5000 */ mfc1 $t2, $f10 -/* 0205C 808616AC 10000057 */ beq $zero, $zero, .L8086180C -/* 02060 808616B0 ACCA07E8 */ sw $t2, 0x07E8($a2) ## 000007E8 -.L808616B4: -/* 02064 808616B4 0C00B69E */ jal Actor_WorldYawTowardActor -/* 02068 808616B8 AFA60020 */ sw $a2, 0x0020($sp) -/* 0206C 808616BC 8FA60020 */ lw $a2, 0x0020($sp) -/* 02070 808616C0 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02074 808616C4 A4C20032 */ sh $v0, 0x0032($a2) ## 00000032 -/* 02078 808616C8 3C018086 */ lui $at, %hi(D_808647C0) ## $at = 80860000 -/* 0207C 808616CC C43047C0 */ lwc1 $f16, %lo(D_808647C0)($at) -/* 02080 808616D0 8FA60020 */ lw $a2, 0x0020($sp) -/* 02084 808616D4 8FAC001C */ lw $t4, 0x001C($sp) -/* 02088 808616D8 4600803C */ c.lt.s $f16, $f0 -/* 0208C 808616DC 00000000 */ nop -/* 02090 808616E0 4502000A */ bc1fl .L8086170C -/* 02094 808616E4 84C400B6 */ lh $a0, 0x00B6($a2) ## 000000B6 -/* 02098 808616E8 84CB001C */ lh $t3, 0x001C($a2) ## 0000001C -/* 0209C 808616EC 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 020A0 808616F0 51610006 */ beql $t3, $at, .L8086170C -/* 020A4 808616F4 84C400B6 */ lh $a0, 0x00B6($a2) ## 000000B6 -/* 020A8 808616F8 0C218653 */ jal func_8086194C -/* 020AC 808616FC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 020B0 80861700 10000043 */ beq $zero, $zero, .L80861810 -/* 020B4 80861704 8FBF0014 */ lw $ra, 0x0014($sp) -/* 020B8 80861708 84C400B6 */ lh $a0, 0x00B6($a2) ## 000000B6 -.L8086170C: -/* 020BC 8086170C 858D00B6 */ lh $t5, 0x00B6($t4) ## 000000B6 -/* 020C0 80861710 8FA50024 */ lw $a1, 0x0024($sp) -/* 020C4 80861714 01A41023 */ subu $v0, $t5, $a0 -/* 020C8 80861718 00021400 */ sll $v0, $v0, 16 -/* 020CC 8086171C 00021403 */ sra $v0, $v0, 16 -/* 020D0 80861720 04400003 */ bltz $v0, .L80861730 -/* 020D4 80861724 00021823 */ subu $v1, $zero, $v0 -/* 020D8 80861728 10000001 */ beq $zero, $zero, .L80861730 -/* 020DC 8086172C 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80861730: -/* 020E0 80861730 28612711 */ slti $at, $v1, 0x2711 -/* 020E4 80861734 10200033 */ beq $at, $zero, .L80861804 -/* 020E8 80861738 00000000 */ nop -/* 020EC 8086173C 84C5008A */ lh $a1, 0x008A($a2) ## 0000008A -/* 020F0 80861740 8FAF001C */ lw $t7, 0x001C($sp) -/* 020F4 80861744 00A41023 */ subu $v0, $a1, $a0 -/* 020F8 80861748 00021400 */ sll $v0, $v0, 16 -/* 020FC 8086174C 00021403 */ sra $v0, $v0, 16 -/* 02100 80861750 04400003 */ bltz $v0, .L80861760 -/* 02104 80861754 00021823 */ subu $v1, $zero, $v0 -/* 02108 80861758 10000001 */ beq $zero, $zero, .L80861760 -/* 0210C 8086175C 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80861760: -/* 02110 80861760 28613E81 */ slti $at, $v1, 0x3E81 -/* 02114 80861764 5420000B */ bnel $at, $zero, .L80861794 -/* 02118 80861768 8DF8067C */ lw $t8, 0x067C($t7) ## 0000067C -/* 0211C 8086176C 84CE001C */ lh $t6, 0x001C($a2) ## 0000001C -/* 02120 80861770 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 02124 80861774 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 02128 80861778 51C10006 */ beql $t6, $at, .L80861794 -/* 0212C 8086177C 8DF8067C */ lw $t8, 0x067C($t7) ## 0000067C -/* 02130 80861780 0C218653 */ jal func_8086194C -/* 02134 80861784 A4C50032 */ sh $a1, 0x0032($a2) ## 00000032 -/* 02138 80861788 10000021 */ beq $zero, $zero, .L80861810 -/* 0213C 8086178C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02140 80861790 8DF8067C */ lw $t8, 0x067C($t7) ## 0000067C -.L80861794: -/* 02144 80861794 33190010 */ andi $t9, $t8, 0x0010 ## $t9 = 00000000 -/* 02148 80861798 13200016 */ beq $t9, $zero, .L808617F4 -/* 0214C 8086179C 00000000 */ nop -/* 02150 808617A0 90C8010C */ lbu $t0, 0x010C($a2) ## 0000010C -/* 02154 808617A4 8FA50024 */ lw $a1, 0x0024($sp) -/* 02158 808617A8 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 -/* 0215C 808617AC 11000005 */ beq $t0, $zero, .L808617C4 -/* 02160 808617B0 01254821 */ addu $t1, $t1, $a1 -/* 02164 808617B4 0C218506 */ jal func_80861418 -/* 02168 808617B8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0216C 808617BC 10000014 */ beq $zero, $zero, .L80861810 -/* 02170 808617C0 8FBF0014 */ lw $ra, 0x0014($sp) -.L808617C4: -/* 02174 808617C4 8D291DE4 */ lw $t1, 0x1DE4($t1) ## 00001DE4 -/* 02178 808617C8 312A0001 */ andi $t2, $t1, 0x0001 ## $t2 = 00000000 -/* 0217C 808617CC 11400005 */ beq $t2, $zero, .L808617E4 -/* 02180 808617D0 00000000 */ nop -/* 02184 808617D4 0C2189F1 */ jal func_808627C4 -/* 02188 808617D8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0218C 808617DC 1000000C */ beq $zero, $zero, .L80861810 -/* 02190 808617E0 8FBF0014 */ lw $ra, 0x0014($sp) -.L808617E4: -/* 02194 808617E4 0C218653 */ jal func_8086194C -/* 02198 808617E8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0219C 808617EC 10000008 */ beq $zero, $zero, .L80861810 -/* 021A0 808617F0 8FBF0014 */ lw $ra, 0x0014($sp) -.L808617F4: -/* 021A4 808617F4 0C218506 */ jal func_80861418 -/* 021A8 808617F8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 021AC 808617FC 10000004 */ beq $zero, $zero, .L80861810 -/* 021B0 80861800 8FBF0014 */ lw $ra, 0x0014($sp) -.L80861804: -/* 021B4 80861804 0C2189F1 */ jal func_808627C4 -/* 021B8 80861808 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -.L8086180C: -/* 021BC 8086180C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80861810: -/* 021C0 80861810 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 021C4 80861814 03E00008 */ jr $ra -/* 021C8 80861818 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086181C.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086181C.s deleted file mode 100644 index a2c38a2845..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086181C.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_8086181C -/* 021CC 8086181C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 021D0 80861820 AFBF0014 */ sw $ra, 0x0014($sp) -/* 021D4 80861824 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 021D8 80861828 3C050601 */ lui $a1, %hi(D_0600BE4C) ## $a1 = 06010000 -/* 021DC 8086182C 24A5BE4C */ addiu $a1, $a1, %lo(D_0600BE4C) ## $a1 = 0600BE4C -/* 021E0 80861830 AFA60018 */ sw $a2, 0x0018($sp) -/* 021E4 80861834 0C02947A */ jal Animation_PlayOnce -/* 021E8 80861838 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 021EC 8086183C 8FA40018 */ lw $a0, 0x0018($sp) -/* 021F0 80861840 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 021F4 80861844 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 -/* 021F8 80861848 908E086C */ lbu $t6, 0x086C($a0) ## 0000086C -/* 021FC 8086184C 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 -/* 02200 80861850 3C058086 */ lui $a1, %hi(func_80861898) ## $a1 = 80860000 -/* 02204 80861854 31CFFFFB */ andi $t7, $t6, 0xFFFB ## $t7 = 00000000 -/* 02208 80861858 24A51898 */ addiu $a1, $a1, %lo(func_80861898) ## $a1 = 80861898 -/* 0220C 8086185C A08F086C */ sb $t7, 0x086C($a0) ## 0000086C -/* 02210 80861860 A09807C8 */ sb $t8, 0x07C8($a0) ## 000007C8 -/* 02214 80861864 A0990879 */ sb $t9, 0x0879($a0) ## 00000879 -/* 02218 80861868 0C217D94 */ jal EnTest_SetupAction -/* 0221C 8086186C E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 02220 80861870 8FA60018 */ lw $a2, 0x0018($sp) -/* 02224 80861874 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 -/* 02228 80861878 90C807DE */ lbu $t0, 0x07DE($a2) ## 000007DE -/* 0222C 8086187C 51000003 */ beql $t0, $zero, .L8086188C -/* 02230 80861880 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02234 80861884 A0C907DE */ sb $t1, 0x07DE($a2) ## 000007DE -/* 02238 80861888 8FBF0014 */ lw $ra, 0x0014($sp) -.L8086188C: -/* 0223C 8086188C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02240 80861890 03E00008 */ jr $ra -/* 02244 80861894 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861898.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861898.s deleted file mode 100644 index 8bc3688fca..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861898.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_80861898 -/* 02248 80861898 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0224C 8086189C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02250 808618A0 AFA5001C */ sw $a1, 0x001C($sp) -/* 02254 808618A4 C48001A0 */ lwc1 $f0, 0x01A0($a0) ## 000001A0 -/* 02258 808618A8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0225C 808618AC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02260 808618B0 4600018D */ trunc.w.s $f6, $f0 -/* 02264 808618B4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 02268 808618B8 24053839 */ addiu $a1, $zero, 0x3839 ## $a1 = 00003839 -/* 0226C 808618BC E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 02270 808618C0 440F3000 */ mfc1 $t7, $f6 -/* 02274 808618C4 00000000 */ nop -/* 02278 808618C8 55E10006 */ bnel $t7, $at, .L808618E4 -/* 0227C 808618CC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 02280 808618D0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02284 808618D4 AFA60018 */ sw $a2, 0x0018($sp) -/* 02288 808618D8 8FA60018 */ lw $a2, 0x0018($sp) -/* 0228C 808618DC C4C001A0 */ lwc1 $f0, 0x01A0($a2) ## 000001A0 -/* 02290 808618E0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -.L808618E4: -/* 02294 808618E4 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 02298 808618E8 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 0229C 808618EC 24C40188 */ addiu $a0, $a2, 0x0188 ## $a0 = 00000188 -/* 022A0 808618F0 4600403C */ c.lt.s $f8, $f0 -/* 022A4 808618F4 00000000 */ nop -/* 022A8 808618F8 4502000A */ bc1fl .L80861924 -/* 022AC 808618FC A0C00808 */ sb $zero, 0x0808($a2) ## 00000808 -/* 022B0 80861900 44815000 */ mtc1 $at, $f10 ## $f10 = 8.00 -/* 022B4 80861904 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 022B8 80861908 460A003C */ c.lt.s $f0, $f10 -/* 022BC 8086190C 00000000 */ nop -/* 022C0 80861910 45020004 */ bc1fl .L80861924 -/* 022C4 80861914 A0C00808 */ sb $zero, 0x0808($a2) ## 00000808 -/* 022C8 80861918 10000002 */ beq $zero, $zero, .L80861924 -/* 022CC 8086191C A0D80808 */ sb $t8, 0x0808($a2) ## 00000808 -/* 022D0 80861920 A0C00808 */ sb $zero, 0x0808($a2) ## 00000808 -.L80861924: -/* 022D4 80861924 0C02927F */ jal SkelAnime_Update - -/* 022D8 80861928 AFA60018 */ sw $a2, 0x0018($sp) -/* 022DC 8086192C 10400003 */ beq $v0, $zero, .L8086193C -/* 022E0 80861930 8FA60018 */ lw $a2, 0x0018($sp) -/* 022E4 80861934 0C218506 */ jal func_80861418 -/* 022E8 80861938 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -.L8086193C: -/* 022EC 8086193C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 022F0 80861940 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 022F4 80861944 03E00008 */ jr $ra -/* 022F8 80861948 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086194C.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086194C.s deleted file mode 100644 index 9d99e55907..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086194C.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_8086194C -/* 022FC 8086194C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02300 80861950 AFB00018 */ sw $s0, 0x0018($sp) -/* 02304 80861954 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02308 80861958 AFBF001C */ sw $ra, 0x001C($sp) -/* 0230C 8086195C 3C050600 */ lui $a1, %hi(D_06001978) ## $a1 = 06000000 -/* 02310 80861960 24A51978 */ addiu $a1, $a1, %lo(D_06001978) ## $a1 = 06001978 -/* 02314 80861964 0C02947A */ jal Animation_PlayOnce -/* 02318 80861968 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 0231C 8086196C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02320 80861970 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02324 80861974 2405386C */ addiu $a1, $zero, 0x386C ## $a1 = 0000386C -/* 02328 80861978 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 -/* 0232C 8086197C 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 -/* 02330 80861980 3C058086 */ lui $a1, %hi(func_808619EC) ## $a1 = 80860000 -/* 02334 80861984 A20E07C8 */ sb $t6, 0x07C8($s0) ## 000007C8 -/* 02338 80861988 AE0F07E8 */ sw $t7, 0x07E8($s0) ## 000007E8 -/* 0233C 8086198C 24A519EC */ addiu $a1, $a1, %lo(func_808619EC) ## $a1 = 808619EC -/* 02340 80861990 0C217D94 */ jal EnTest_SetupAction -/* 02344 80861994 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02348 80861998 921807DE */ lbu $t8, 0x07DE($s0) ## 000007DE -/* 0234C 8086199C 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -/* 02350 808619A0 53000003 */ beql $t8, $zero, .L808619B0 -/* 02354 808619A4 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -/* 02358 808619A8 A21907DE */ sb $t9, 0x07DE($s0) ## 000007DE -/* 0235C 808619AC 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -.L808619B0: -/* 02360 808619B0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 02364 808619B4 11010004 */ beq $t0, $at, .L808619C8 -/* 02368 808619B8 3C01C130 */ lui $at, 0xC130 ## $at = C1300000 -/* 0236C 808619BC 44812000 */ mtc1 $at, $f4 ## $f4 = -11.00 -/* 02370 808619C0 10000005 */ beq $zero, $zero, .L808619D8 -/* 02374 808619C4 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -.L808619C8: -/* 02378 808619C8 3C01C0E0 */ lui $at, 0xC0E0 ## $at = C0E00000 -/* 0237C 808619CC 44813000 */ mtc1 $at, $f6 ## $f6 = -7.00 -/* 02380 808619D0 00000000 */ nop -/* 02384 808619D4 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -.L808619D8: -/* 02388 808619D8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0238C 808619DC 8FB00018 */ lw $s0, 0x0018($sp) -/* 02390 808619E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02394 808619E4 03E00008 */ jr $ra -/* 02398 808619E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808619EC.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808619EC.s deleted file mode 100644 index fd294f1070..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808619EC.s +++ /dev/null @@ -1,123 +0,0 @@ -glabel func_808619EC -/* 0239C 808619EC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 023A0 808619F0 AFB00020 */ sw $s0, 0x0020($sp) -/* 023A4 808619F4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 023A8 808619F8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 023AC 808619FC AFA5002C */ sw $a1, 0x002C($sp) -/* 023B0 80861A00 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 023B4 80861A04 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 023B8 80861A08 AFAE0010 */ sw $t6, 0x0010($sp) -/* 023BC 80861A0C 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 -/* 023C0 80861A10 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 023C4 80861A14 0C01E1A7 */ jal Math_SmoothStepToS - -/* 023C8 80861A18 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 -/* 023CC 80861A1C 8E0307E8 */ lw $v1, 0x07E8($s0) ## 000007E8 -/* 023D0 80861A20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 023D4 80861A24 14600005 */ bne $v1, $zero, .L80861A3C -/* 023D8 80861A28 246FFFFF */ addiu $t7, $v1, 0xFFFF ## $t7 = FFFFFFFF -/* 023DC 80861A2C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 023E0 80861A30 24053838 */ addiu $a1, $zero, 0x3838 ## $a1 = 00003838 -/* 023E4 80861A34 10000002 */ beq $zero, $zero, .L80861A40 -/* 023E8 80861A38 00000000 */ nop -.L80861A3C: -/* 023EC 80861A3C AE0F07E8 */ sw $t7, 0x07E8($s0) ## 000007E8 -.L80861A40: -/* 023F0 80861A40 0C02927F */ jal SkelAnime_Update - -/* 023F4 80861A44 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 023F8 80861A48 10400042 */ beq $v0, $zero, .L80861B54 -/* 023FC 80861A4C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 02400 80861A50 8FA4002C */ lw $a0, 0x002C($sp) -/* 02404 80861A54 0C21907A */ jal func_808641E8 -/* 02408 80861A58 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0240C 80861A5C 14400048 */ bne $v0, $zero, .L80861B80 -/* 02410 80861A60 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 02414 80861A64 C6000090 */ lwc1 $f0, 0x0090($s0) ## 00000090 -/* 02418 80861A68 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 -/* 0241C 80861A6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02420 80861A70 3C01435C */ lui $at, 0x435C ## $at = 435C0000 -/* 02424 80861A74 4604003E */ c.le.s $f0, $f4 -/* 02428 80861A78 00000000 */ nop -/* 0242C 80861A7C 45020017 */ bc1fl .L80861ADC -/* 02430 80861A80 44818000 */ mtc1 $at, $f16 ## $f16 = 220.00 -/* 02434 80861A84 0C00B821 */ jal Actor_IsFacingPlayer -/* 02438 80861A88 24051555 */ addiu $a1, $zero, 0x1555 ## $a1 = 00001555 -/* 0243C 80861A8C 10400005 */ beq $v0, $zero, .L80861AA4 -/* 02440 80861A90 00000000 */ nop -/* 02444 80861A94 0C218506 */ jal func_80861418 -/* 02448 80861A98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0244C 80861A9C 1000002A */ beq $zero, $zero, .L80861B48 -/* 02450 80861AA0 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 -.L80861AA4: -/* 02454 80861AA4 0C21801A */ jal func_80860068 -/* 02458 80861AA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0245C 80861AAC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02460 80861AB0 00000000 */ nop -/* 02464 80861AB4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 02468 80861AB8 44811000 */ mtc1 $at, $f2 ## $f2 = 5.00 -/* 0246C 80861ABC 00000000 */ nop -/* 02470 80861AC0 46020182 */ mul.s $f6, $f0, $f2 -/* 02474 80861AC4 46023200 */ add.s $f8, $f6, $f2 -/* 02478 80861AC8 4600428D */ trunc.w.s $f10, $f8 -/* 0247C 80861ACC 44195000 */ mfc1 $t9, $f10 -/* 02480 80861AD0 1000001C */ beq $zero, $zero, .L80861B44 -/* 02484 80861AD4 AE1907E8 */ sw $t9, 0x07E8($s0) ## 000007E8 -/* 02488 80861AD8 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 -.L80861ADC: -/* 0248C 80861ADC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02490 80861AE0 4610003E */ c.le.s $f0, $f16 -/* 02494 80861AE4 00000000 */ nop -/* 02498 80861AE8 45000009 */ bc1f .L80861B10 -/* 0249C 80861AEC 00000000 */ nop -/* 024A0 80861AF0 0C00B821 */ jal Actor_IsFacingPlayer -/* 024A4 80861AF4 24050E38 */ addiu $a1, $zero, 0x0E38 ## $a1 = 00000E38 -/* 024A8 80861AF8 10400005 */ beq $v0, $zero, .L80861B10 -/* 024AC 80861AFC 00000000 */ nop -/* 024B0 80861B00 0C2186E5 */ jal func_80861B94 -/* 024B4 80861B04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 024B8 80861B08 1000000F */ beq $zero, $zero, .L80861B48 -/* 024BC 80861B0C 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 -.L80861B10: -/* 024C0 80861B10 0C21801A */ jal func_80860068 -/* 024C4 80861B14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 024C8 80861B18 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 024CC 80861B1C 00000000 */ nop -/* 024D0 80861B20 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 024D4 80861B24 44811000 */ mtc1 $at, $f2 ## $f2 = 5.00 -/* 024D8 80861B28 00000000 */ nop -/* 024DC 80861B2C 46020482 */ mul.s $f18, $f0, $f2 -/* 024E0 80861B30 46029100 */ add.s $f4, $f18, $f2 -/* 024E4 80861B34 4600218D */ trunc.w.s $f6, $f4 -/* 024E8 80861B38 44093000 */ mfc1 $t1, $f6 -/* 024EC 80861B3C 00000000 */ nop -/* 024F0 80861B40 AE0907E8 */ sw $t1, 0x07E8($s0) ## 000007E8 -.L80861B44: -/* 024F4 80861B44 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 -.L80861B48: -/* 024F8 80861B48 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 024FC 80861B4C 1000000C */ beq $zero, $zero, .L80861B80 -/* 02500 80861B50 AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 -.L80861B54: -/* 02504 80861B54 C6080198 */ lwc1 $f8, 0x0198($s0) ## 00000198 -/* 02508 80861B58 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 0250C 80861B5C C61201A0 */ lwc1 $f18, 0x01A0($s0) ## 000001A0 -/* 02510 80861B60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02514 80861B64 460A4401 */ sub.s $f16, $f8, $f10 -/* 02518 80861B68 46128032 */ c.eq.s $f16, $f18 -/* 0251C 80861B6C 00000000 */ nop -/* 02520 80861B70 45020004 */ bc1fl .L80861B84 -/* 02524 80861B74 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02528 80861B78 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0252C 80861B7C 2405387B */ addiu $a1, $zero, 0x387B ## $a1 = 0000387B -.L80861B80: -/* 02530 80861B80 8FBF0024 */ lw $ra, 0x0024($sp) -.L80861B84: -/* 02534 80861B84 8FB00020 */ lw $s0, 0x0020($sp) -/* 02538 80861B88 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0253C 80861B8C 03E00008 */ jr $ra -/* 02540 80861B90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861B94.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861B94.s deleted file mode 100644 index f5c9220e54..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861B94.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80861B94 -/* 02544 80861B94 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02548 80861B98 AFB00018 */ sw $s0, 0x0018($sp) -/* 0254C 80861B9C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02550 80861BA0 AFBF001C */ sw $ra, 0x001C($sp) -/* 02554 80861BA4 3C050601 */ lui $a1, %hi(D_0600A324) ## $a1 = 06010000 -/* 02558 80861BA8 24A5A324 */ addiu $a1, $a1, %lo(D_0600A324) ## $a1 = 0600A324 -/* 0255C 80861BAC 0C02947A */ jal Animation_PlayOnce -/* 02560 80861BB0 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 02564 80861BB4 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 -/* 02568 80861BB8 0C03E291 */ jal func_800F8A44 -/* 0256C 80861BBC 24053838 */ addiu $a1, $zero, 0x3838 ## $a1 = 00003838 -/* 02570 80861BC0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 02574 80861BC4 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 02578 80861BC8 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 0257C 80861BCC 44813000 */ mtc1 $at, $f6 ## $f6 = 8.00 -/* 02580 80861BD0 240E0017 */ addiu $t6, $zero, 0x0017 ## $t6 = 00000017 -/* 02584 80861BD4 AE0007E8 */ sw $zero, 0x07E8($s0) ## 000007E8 -/* 02588 80861BD8 A20E07C8 */ sb $t6, 0x07C8($s0) ## 000007C8 -/* 0258C 80861BDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02590 80861BE0 2405386C */ addiu $a1, $zero, 0x386C ## $a1 = 0000386C -/* 02594 80861BE4 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 -/* 02598 80861BE8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0259C 80861BEC E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 025A0 80861BF0 9218086C */ lbu $t8, 0x086C($s0) ## 0000086C -/* 025A4 80861BF4 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 025A8 80861BF8 3C058086 */ lui $a1, %hi(func_80861C40) ## $a1 = 80860000 -/* 025AC 80861BFC 3319FFFB */ andi $t9, $t8, 0xFFFB ## $t9 = 00000000 -/* 025B0 80861C00 A219086C */ sb $t9, 0x086C($s0) ## 0000086C -/* 025B4 80861C04 24A51C40 */ addiu $a1, $a1, %lo(func_80861C40) ## $a1 = 80861C40 -/* 025B8 80861C08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025BC 80861C0C 0C217D94 */ jal EnTest_SetupAction -/* 025C0 80861C10 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 -/* 025C4 80861C14 920907DE */ lbu $t1, 0x07DE($s0) ## 000007DE -/* 025C8 80861C18 24080020 */ addiu $t0, $zero, 0x0020 ## $t0 = 00000020 -/* 025CC 80861C1C A2080879 */ sb $t0, 0x0879($s0) ## 00000879 -/* 025D0 80861C20 11200002 */ beq $t1, $zero, .L80861C2C -/* 025D4 80861C24 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 -/* 025D8 80861C28 A20A07DE */ sb $t2, 0x07DE($s0) ## 000007DE -.L80861C2C: -/* 025DC 80861C2C 8FBF001C */ lw $ra, 0x001C($sp) -/* 025E0 80861C30 8FB00018 */ lw $s0, 0x0018($sp) -/* 025E4 80861C34 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 025E8 80861C38 03E00008 */ jr $ra -/* 025EC 80861C3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861C40.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861C40.s deleted file mode 100644 index 88c197e3fd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861C40.s +++ /dev/null @@ -1,79 +0,0 @@ -glabel func_80861C40 -/* 025F0 80861C40 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 025F4 80861C44 AFB00018 */ sw $s0, 0x0018($sp) -/* 025F8 80861C48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 025FC 80861C4C AFBF001C */ sw $ra, 0x001C($sp) -/* 02600 80861C50 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 02604 80861C54 AFA5002C */ sw $a1, 0x002C($sp) -/* 02608 80861C58 0C02927F */ jal SkelAnime_Update - -/* 0260C 80861C5C AFA40024 */ sw $a0, 0x0024($sp) -/* 02610 80861C60 10400016 */ beq $v0, $zero, .L80861CBC -/* 02614 80861C64 8FA40024 */ lw $a0, 0x0024($sp) -/* 02618 80861C68 8E0E07E8 */ lw $t6, 0x07E8($s0) ## 000007E8 -/* 0261C 80861C6C 3C050601 */ lui $a1, %hi(D_0600A99C) ## $a1 = 06010000 -/* 02620 80861C70 55C0000F */ bnel $t6, $zero, .L80861CB0 -/* 02624 80861C74 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02628 80861C78 0C02947A */ jal Animation_PlayOnce -/* 0262C 80861C7C 24A5A99C */ addiu $a1, $a1, %lo(D_0600A99C) ## $a1 = 0600A99C -/* 02630 80861C80 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 02634 80861C84 AE0207E8 */ sw $v0, 0x07E8($s0) ## 000007E8 -/* 02638 80861C88 A2020808 */ sb $v0, 0x0808($s0) ## 00000808 -/* 0263C 80861C8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02640 80861C90 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02644 80861C94 24053839 */ addiu $a1, $zero, 0x3839 ## $a1 = 00003839 -/* 02648 80861C98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0264C 80861C9C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02650 80861CA0 2405386C */ addiu $a1, $zero, 0x386C ## $a1 = 0000386C -/* 02654 80861CA4 10000006 */ beq $zero, $zero, .L80861CC0 -/* 02658 80861CA8 8E0F07E8 */ lw $t7, 0x07E8($s0) ## 000007E8 -/* 0265C 80861CAC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -.L80861CB0: -/* 02660 80861CB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02664 80861CB4 0C21801A */ jal func_80860068 -/* 02668 80861CB8 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -.L80861CBC: -/* 0266C 80861CBC 8E0F07E8 */ lw $t7, 0x07E8($s0) ## 000007E8 -.L80861CC0: -/* 02670 80861CC0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 02674 80861CC4 51E0000A */ beql $t7, $zero, .L80861CF0 -/* 02678 80861CC8 C6000080 */ lwc1 $f0, 0x0080($s0) ## 00000080 -/* 0267C 80861CCC C60601A0 */ lwc1 $f6, 0x01A0($s0) ## 000001A0 -/* 02680 80861CD0 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 02684 80861CD4 00000000 */ nop -/* 02688 80861CD8 4606403E */ c.le.s $f8, $f6 -/* 0268C 80861CDC 00000000 */ nop -/* 02690 80861CE0 45020003 */ bc1fl .L80861CF0 -/* 02694 80861CE4 C6000080 */ lwc1 $f0, 0x0080($s0) ## 00000080 -/* 02698 80861CE8 A2000808 */ sb $zero, 0x0808($s0) ## 00000808 -/* 0269C 80861CEC C6000080 */ lwc1 $f0, 0x0080($s0) ## 00000080 -.L80861CF0: -/* 026A0 80861CF0 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 026A4 80861CF4 4600503E */ c.le.s $f10, $f0 -/* 026A8 80861CF8 00000000 */ nop -/* 026AC 80861CFC 45020010 */ bc1fl .L80861D40 -/* 026B0 80861D00 8FBF001C */ lw $ra, 0x001C($sp) -/* 026B4 80861D04 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 026B8 80861D08 C6100068 */ lwc1 $f16, 0x0068($s0) ## 00000068 -/* 026BC 80861D0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 026C0 80861D10 46101032 */ c.eq.s $f2, $f16 -/* 026C4 80861D14 00000000 */ nop -/* 026C8 80861D18 45030006 */ bc1tl .L80861D34 -/* 026CC 80861D1C E6000028 */ swc1 $f0, 0x0028($s0) ## 00000028 -/* 026D0 80861D20 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 026D4 80861D24 2405387B */ addiu $a1, $zero, 0x387B ## $a1 = 0000387B -/* 026D8 80861D28 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 026DC 80861D2C C6000080 */ lwc1 $f0, 0x0080($s0) ## 00000080 -/* 026E0 80861D30 E6000028 */ swc1 $f0, 0x0028($s0) ## 00000028 -.L80861D34: -/* 026E4 80861D34 E6020060 */ swc1 $f2, 0x0060($s0) ## 00000060 -/* 026E8 80861D38 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 026EC 80861D3C 8FBF001C */ lw $ra, 0x001C($sp) -.L80861D40: -/* 026F0 80861D40 8FB00018 */ lw $s0, 0x0018($sp) -/* 026F4 80861D44 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 026F8 80861D48 03E00008 */ jr $ra -/* 026FC 80861D4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861D50.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861D50.s deleted file mode 100644 index df2a55d76d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861D50.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80861D50 -/* 02700 80861D50 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02704 80861D54 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02708 80861D58 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0270C 80861D5C 3C050601 */ lui $a1, %hi(D_0600A324) ## $a1 = 06010000 -/* 02710 80861D60 24A5A324 */ addiu $a1, $a1, %lo(D_0600A324) ## $a1 = 0600A324 -/* 02714 80861D64 AFA60018 */ sw $a2, 0x0018($sp) -/* 02718 80861D68 0C02947A */ jal Animation_PlayOnce -/* 0271C 80861D6C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 02720 80861D70 8FA40018 */ lw $a0, 0x0018($sp) -/* 02724 80861D74 3C014160 */ lui $at, 0x4160 ## $at = 41600000 -/* 02728 80861D78 44812000 */ mtc1 $at, $f4 ## $f4 = 14.00 -/* 0272C 80861D7C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 02730 80861D80 44813000 */ mtc1 $at, $f6 ## $f6 = 6.00 -/* 02734 80861D84 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 02738 80861D88 2405386C */ addiu $a1, $zero, 0x386C ## $a1 = 0000386C -/* 0273C 80861D8C AC8007E8 */ sw $zero, 0x07E8($a0) ## 000007E8 -/* 02740 80861D90 A08E07C8 */ sb $t6, 0x07C8($a0) ## 000007C8 -/* 02744 80861D94 E4840060 */ swc1 $f4, 0x0060($a0) ## 00000060 -/* 02748 80861D98 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0274C 80861D9C E4860068 */ swc1 $f6, 0x0068($a0) ## 00000068 -/* 02750 80861DA0 8FA40018 */ lw $a0, 0x0018($sp) -/* 02754 80861DA4 3C058086 */ lui $a1, %hi(func_80861DC8) ## $a1 = 80860000 -/* 02758 80861DA8 24A51DC8 */ addiu $a1, $a1, %lo(func_80861DC8) ## $a1 = 80861DC8 -/* 0275C 80861DAC 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 -/* 02760 80861DB0 0C217D94 */ jal EnTest_SetupAction -/* 02764 80861DB4 A48F0032 */ sh $t7, 0x0032($a0) ## 00000032 -/* 02768 80861DB8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0276C 80861DBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02770 80861DC0 03E00008 */ jr $ra -/* 02774 80861DC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861DC8.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861DC8.s deleted file mode 100644 index fb82041712..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861DC8.s +++ /dev/null @@ -1,69 +0,0 @@ -glabel func_80861DC8 -/* 02778 80861DC8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0277C 80861DCC AFB00028 */ sw $s0, 0x0028($sp) -/* 02780 80861DD0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02784 80861DD4 AFBF002C */ sw $ra, 0x002C($sp) -/* 02788 80861DD8 AFA5003C */ sw $a1, 0x003C($sp) -/* 0278C 80861DDC 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 02790 80861DE0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 02794 80861DE4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 02798 80861DE8 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 -/* 0279C 80861DEC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 027A0 80861DF0 0C01E1A7 */ jal Math_SmoothStepToS - -/* 027A4 80861DF4 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 027A8 80861DF8 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 027AC 80861DFC 0C02927F */ jal SkelAnime_Update - -/* 027B0 80861E00 AFA40034 */ sw $a0, 0x0034($sp) -/* 027B4 80861E04 C6040080 */ lwc1 $f4, 0x0080($s0) ## 00000080 -/* 027B8 80861E08 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 027BC 80861E0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 027C0 80861E10 4604303E */ c.le.s $f6, $f4 -/* 027C4 80861E14 00000000 */ nop -/* 027C8 80861E18 45020025 */ bc1fl .L80861EB0 -/* 027CC 80861E1C 8FBF002C */ lw $ra, 0x002C($sp) -/* 027D0 80861E20 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 027D4 80861E24 2405387B */ addiu $a1, $zero, 0x387B ## $a1 = 0000387B -/* 027D8 80861E28 C60A0060 */ lwc1 $f10, 0x0060($s0) ## 00000060 -/* 027DC 80861E2C 860F008A */ lh $t7, 0x008A($s0) ## 0000008A -/* 027E0 80861E30 C6080080 */ lwc1 $f8, 0x0080($s0) ## 00000080 -/* 027E4 80861E34 4600540D */ trunc.w.s $f16, $f10 -/* 027E8 80861E38 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 027EC 80861E3C 2408000C */ addiu $t0, $zero, 0x000C ## $t0 = 0000000C -/* 027F0 80861E40 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 -/* 027F4 80861E44 44028000 */ mfc1 $v0, $f16 -/* 027F8 80861E48 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B6 -/* 027FC 80861E4C E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -/* 02800 80861E50 00021023 */ subu $v0, $zero, $v0 -/* 02804 80861E54 14400003 */ bne $v0, $zero, .L80861E64 -/* 02808 80861E58 AE0207E4 */ sw $v0, 0x07E4($s0) ## 000007E4 -/* 0280C 80861E5C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 02810 80861E60 AE1907E4 */ sw $t9, 0x07E4($s0) ## 000007E4 -.L80861E64: -/* 02814 80861E64 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 -/* 02818 80861E68 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 0281C 80861E6C A20807C8 */ sb $t0, 0x07C8($s0) ## 000007C8 -/* 02820 80861E70 AE0907E8 */ sw $t1, 0x07E8($s0) ## 000007E8 -/* 02824 80861E74 3C050601 */ lui $a1, %hi(D_0600C438) ## $a1 = 06010000 -/* 02828 80861E78 44060000 */ mfc1 $a2, $f0 -/* 0282C 80861E7C 44070000 */ mfc1 $a3, $f0 -/* 02830 80861E80 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 02834 80861E84 AFAA0014 */ sw $t2, 0x0014($sp) -/* 02838 80861E88 24A5C438 */ addiu $a1, $a1, %lo(D_0600C438) ## $a1 = 0600C438 -/* 0283C 80861E8C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 02840 80861E90 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 02844 80861E94 0C029468 */ jal Animation_Change - -/* 02848 80861E98 8FA40034 */ lw $a0, 0x0034($sp) -/* 0284C 80861E9C 3C058086 */ lui $a1, %hi(func_808603CC) ## $a1 = 80860000 -/* 02850 80861EA0 24A503CC */ addiu $a1, $a1, %lo(func_808603CC) ## $a1 = 808603CC -/* 02854 80861EA4 0C217D94 */ jal EnTest_SetupAction -/* 02858 80861EA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0285C 80861EAC 8FBF002C */ lw $ra, 0x002C($sp) -.L80861EB0: -/* 02860 80861EB0 8FB00028 */ lw $s0, 0x0028($sp) -/* 02864 80861EB4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 02868 80861EB8 03E00008 */ jr $ra -/* 0286C 80861EBC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861EC0.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861EC0.s deleted file mode 100644 index 4a3a8097d7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861EC0.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_80861EC0 -/* 02870 80861EC0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02874 80861EC4 AFB00028 */ sw $s0, 0x0028($sp) -/* 02878 80861EC8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0287C 80861ECC AFBF002C */ sw $ra, 0x002C($sp) -/* 02880 80861ED0 3C040600 */ lui $a0, %hi(D_06001C20) ## $a0 = 06000000 -/* 02884 80861ED4 0C028800 */ jal Animation_GetLastFrame - -/* 02888 80861ED8 24841C20 */ addiu $a0, $a0, %lo(D_06001C20) ## $a0 = 06001C20 -/* 0288C 80861EDC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 02890 80861EE0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 02894 80861EE4 44810000 */ mtc1 $at, $f0 ## $f0 = 2.00 -/* 02898 80861EE8 468021A0 */ cvt.s.w $f6, $f4 -/* 0289C 80861EEC 3C050600 */ lui $a1, %hi(D_06001C20) ## $a1 = 06000000 -/* 028A0 80861EF0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 028A4 80861EF4 44060000 */ mfc1 $a2, $f0 -/* 028A8 80861EF8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 028AC 80861EFC 24A51C20 */ addiu $a1, $a1, %lo(D_06001C20) ## $a1 = 06001C20 -/* 028B0 80861F00 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 028B4 80861F04 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 028B8 80861F08 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 028BC 80861F0C 0C029468 */ jal Animation_Change - -/* 028C0 80861F10 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 028C4 80861F14 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 028C8 80861F18 240F0015 */ addiu $t7, $zero, 0x0015 ## $t7 = 00000015 -/* 028CC 80861F1C A20F07C8 */ sb $t7, 0x07C8($s0) ## 000007C8 -/* 028D0 80861F20 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 028D4 80861F24 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 028D8 80861F28 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 028DC 80861F2C 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 028E0 80861F30 3C014130 */ lui $at, 0x4130 ## $at = 41300000 -/* 028E4 80861F34 44819000 */ mtc1 $at, $f18 ## $f18 = 11.00 -/* 028E8 80861F38 460A0402 */ mul.s $f16, $f0, $f10 -/* 028EC 80861F3C 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 028F0 80861F40 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 -/* 028F4 80861F44 3C058086 */ lui $a1, %hi(func_80861F80) ## $a1 = 80860000 -/* 028F8 80861F48 A20907DE */ sb $t1, 0x07DE($s0) ## 000007DE -/* 028FC 80861F4C 24A51F80 */ addiu $a1, $a1, %lo(func_80861F80) ## $a1 = 80861F80 -/* 02900 80861F50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02904 80861F54 46128100 */ add.s $f4, $f16, $f18 -/* 02908 80861F58 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 -/* 0290C 80861F5C 4600218D */ trunc.w.s $f6, $f4 -/* 02910 80861F60 44193000 */ mfc1 $t9, $f6 -/* 02914 80861F64 0C217D94 */ jal EnTest_SetupAction -/* 02918 80861F68 AE1907E8 */ sw $t9, 0x07E8($s0) ## 000007E8 -/* 0291C 80861F6C 8FBF002C */ lw $ra, 0x002C($sp) -/* 02920 80861F70 8FB00028 */ lw $s0, 0x0028($sp) -/* 02924 80861F74 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02928 80861F78 03E00008 */ jr $ra -/* 0292C 80861F7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861F80.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861F80.s deleted file mode 100644 index a3671e754b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861F80.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_80861F80 -/* 02930 80861F80 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 02934 80861F84 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02938 80861F88 AFB00020 */ sw $s0, 0x0020($sp) -/* 0293C 80861F8C AFA5002C */ sw $a1, 0x002C($sp) -/* 02940 80861F90 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02944 80861F94 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02948 80861F98 44050000 */ mfc1 $a1, $f0 -/* 0294C 80861F9C 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 -/* 02950 80861FA0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02954 80861FA4 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 02958 80861FA8 0C01E0C4 */ jal Math_SmoothStepToF - -/* 0295C 80861FAC E7A00010 */ swc1 $f0, 0x0010($sp) -/* 02960 80861FB0 0C02927F */ jal SkelAnime_Update - -/* 02964 80861FB4 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 02968 80861FB8 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 0296C 80861FBC 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 02970 80861FC0 00AE1023 */ subu $v0, $a1, $t6 -/* 02974 80861FC4 00021400 */ sll $v0, $v0, 16 -/* 02978 80861FC8 00021403 */ sra $v0, $v0, 16 -/* 0297C 80861FCC 04400003 */ bltz $v0, .L80861FDC -/* 02980 80861FD0 00021823 */ subu $v1, $zero, $v0 -/* 02984 80861FD4 10000001 */ beq $zero, $zero, .L80861FDC -/* 02988 80861FD8 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80861FDC: -/* 0298C 80861FDC 28613E81 */ slti $at, $v1, 0x3E81 -/* 02990 80861FE0 5420000F */ bnel $at, $zero, .L80862020 -/* 02994 80861FE4 8E0207E8 */ lw $v0, 0x07E8($s0) ## 000007E8 -/* 02998 80861FE8 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -/* 0299C 80861FEC 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 029A0 80861FF0 8FB8002C */ lw $t8, 0x002C($sp) -/* 029A4 80861FF4 11E10009 */ beq $t7, $at, .L8086201C -/* 029A8 80861FF8 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 029AC 80861FFC 0338C821 */ addu $t9, $t9, $t8 -/* 029B0 80862000 8F391DE4 */ lw $t9, 0x1DE4($t9) ## 00011DE4 -/* 029B4 80862004 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 029B8 80862008 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 -/* 029BC 8086200C 51000004 */ beql $t0, $zero, .L80862020 -/* 029C0 80862010 8E0207E8 */ lw $v0, 0x07E8($s0) ## 000007E8 -/* 029C4 80862014 0C218653 */ jal func_8086194C -/* 029C8 80862018 A6050032 */ sh $a1, 0x0032($s0) ## 00000032 -.L8086201C: -/* 029CC 8086201C 8E0207E8 */ lw $v0, 0x07E8($s0) ## 000007E8 -.L80862020: -/* 029D0 80862020 14400005 */ bne $v0, $zero, .L80862038 -/* 029D4 80862024 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = FFFFFFFF -/* 029D8 80862028 0C218814 */ jal func_80862050 -/* 029DC 8086202C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 029E0 80862030 10000003 */ beq $zero, $zero, .L80862040 -/* 029E4 80862034 8FBF0024 */ lw $ra, 0x0024($sp) -.L80862038: -/* 029E8 80862038 AE0907E8 */ sw $t1, 0x07E8($s0) ## 000007E8 -/* 029EC 8086203C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80862040: -/* 029F0 80862040 8FB00020 */ lw $s0, 0x0020($sp) -/* 029F4 80862044 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 029F8 80862048 03E00008 */ jr $ra -/* 029FC 8086204C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862050.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862050.s deleted file mode 100644 index 4c6b427efe..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862050.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80862050 -/* 02A00 80862050 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02A04 80862054 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02A08 80862058 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 02A0C 8086205C 3C050600 */ lui $a1, %hi(D_0600316C) ## $a1 = 06000000 -/* 02A10 80862060 24A5316C */ addiu $a1, $a1, %lo(D_0600316C) ## $a1 = 0600316C -/* 02A14 80862064 AFA70018 */ sw $a3, 0x0018($sp) -/* 02A18 80862068 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 02A1C 8086206C 0C0294D3 */ jal Animation_MorphToLoop -/* 02A20 80862070 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 02A24 80862074 8FA40018 */ lw $a0, 0x0018($sp) -/* 02A28 80862078 240E0016 */ addiu $t6, $zero, 0x0016 ## $t6 = 00000016 -/* 02A2C 8086207C 3C058086 */ lui $a1, %hi(func_8086209C) ## $a1 = 80860000 -/* 02A30 80862080 24A5209C */ addiu $a1, $a1, %lo(func_8086209C) ## $a1 = 8086209C -/* 02A34 80862084 0C217D94 */ jal EnTest_SetupAction -/* 02A38 80862088 A08E07C8 */ sb $t6, 0x07C8($a0) ## 000007C8 -/* 02A3C 8086208C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02A40 80862090 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02A44 80862094 03E00008 */ jr $ra -/* 02A48 80862098 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086209C.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086209C.s deleted file mode 100644 index 3f5a934a61..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086209C.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_8086209C -/* 02A4C 8086209C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 02A50 808620A0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02A54 808620A4 AFB00020 */ sw $s0, 0x0020($sp) -/* 02A58 808620A8 AFA5002C */ sw $a1, 0x002C($sp) -/* 02A5C 808620AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02A60 808620B0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02A64 808620B4 44050000 */ mfc1 $a1, $f0 -/* 02A68 808620B8 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 -/* 02A6C 808620BC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02A70 808620C0 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 -/* 02A74 808620C4 0C01E0C4 */ jal Math_SmoothStepToF - -/* 02A78 808620C8 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 02A7C 808620CC 0C02927F */ jal SkelAnime_Update - -/* 02A80 808620D0 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 02A84 808620D4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 02A88 808620D8 C60401B0 */ lwc1 $f4, 0x01B0($s0) ## 000001B0 -/* 02A8C 808620DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02A90 808620E0 46040032 */ c.eq.s $f0, $f4 -/* 02A94 808620E4 00000000 */ nop -/* 02A98 808620E8 45020016 */ bc1fl .L80862144 -/* 02A9C 808620EC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02AA0 808620F0 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 02AA4 808620F4 A20007DE */ sb $zero, 0x07DE($s0) ## 000007DE -/* 02AA8 808620F8 0C21907A */ jal func_808641E8 -/* 02AAC 808620FC 8FA4002C */ lw $a0, 0x002C($sp) -/* 02AB0 80862100 1440000F */ bne $v0, $zero, .L80862140 -/* 02AB4 80862104 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 -/* 02AB8 80862108 C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 -/* 02ABC 8086210C 44814000 */ mtc1 $at, $f8 ## $f8 = 500.00 -/* 02AC0 80862110 8FA5002C */ lw $a1, 0x002C($sp) -/* 02AC4 80862114 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02AC8 80862118 4608303C */ c.lt.s $f6, $f8 -/* 02ACC 8086211C 00000000 */ nop -/* 02AD0 80862120 45000005 */ bc1f .L80862138 -/* 02AD4 80862124 00000000 */ nop -/* 02AD8 80862128 0C217EAC */ jal func_8085FAB0 -/* 02ADC 8086212C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02AE0 80862130 10000004 */ beq $zero, $zero, .L80862144 -/* 02AE4 80862134 8FBF0024 */ lw $ra, 0x0024($sp) -.L80862138: -/* 02AE8 80862138 0C2189F1 */ jal func_808627C4 -/* 02AEC 8086213C 8FA5002C */ lw $a1, 0x002C($sp) -.L80862140: -/* 02AF0 80862140 8FBF0024 */ lw $ra, 0x0024($sp) -.L80862144: -/* 02AF4 80862144 8FB00020 */ lw $s0, 0x0020($sp) -/* 02AF8 80862148 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02AFC 8086214C 03E00008 */ jr $ra -/* 02B00 80862150 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862154.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862154.s deleted file mode 100644 index f5303fff6a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862154.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80862154 -/* 02B04 80862154 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02B08 80862158 AFB00020 */ sw $s0, 0x0020($sp) -/* 02B0C 8086215C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02B10 80862160 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02B14 80862164 3C050601 */ lui $a1, %hi(D_06008604) ## $a1 = 06010000 -/* 02B18 80862168 24A58604 */ addiu $a1, $a1, %lo(D_06008604) ## $a1 = 06008604 -/* 02B1C 8086216C 0C02947A */ jal Animation_PlayOnce -/* 02B20 80862170 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 02B24 80862174 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02B28 80862178 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02B2C 8086217C 2405383A */ addiu $a1, $zero, 0x383A ## $a1 = 0000383A -/* 02B30 80862180 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 -/* 02B34 80862184 44812000 */ mtc1 $at, $f4 ## $f4 = -2.00 -/* 02B38 80862188 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 02B3C 8086218C A20E07C8 */ sb $t6, 0x07C8($s0) ## 000007C8 -/* 02B40 80862190 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 -/* 02B44 80862194 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 02B48 80862198 AFAF0010 */ sw $t7, 0x0010($sp) -/* 02B4C 8086219C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02B50 808621A0 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 02B54 808621A4 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 02B58 808621A8 0C00D09B */ jal Actor_SetColorFilter -/* 02B5C 808621AC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02B60 808621B0 3C058086 */ lui $a1, %hi(func_808621D4) ## $a1 = 80860000 -/* 02B64 808621B4 24A521D4 */ addiu $a1, $a1, %lo(func_808621D4) ## $a1 = 808621D4 -/* 02B68 808621B8 0C217D94 */ jal EnTest_SetupAction -/* 02B6C 808621BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02B70 808621C0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02B74 808621C4 8FB00020 */ lw $s0, 0x0020($sp) -/* 02B78 808621C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02B7C 808621CC 03E00008 */ jr $ra -/* 02B80 808621D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808621D4.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808621D4.s deleted file mode 100644 index 5b8989ed91..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808621D4.s +++ /dev/null @@ -1,131 +0,0 @@ -.late_rodata -glabel D_808647C4 - .float 0.7 - -.text -glabel func_808621D4 -/* 02B84 808621D4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02B88 808621D8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 02B8C 808621DC AFBF0024 */ sw $ra, 0x0024($sp) -/* 02B90 808621E0 AFB00020 */ sw $s0, 0x0020($sp) -/* 02B94 808621E4 AFA50034 */ sw $a1, 0x0034($sp) -/* 02B98 808621E8 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 02B9C 808621EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02BA0 808621F0 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 -/* 02BA4 808621F4 44050000 */ mfc1 $a1, $f0 -/* 02BA8 808621F8 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD -/* 02BAC 808621FC 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 -/* 02BB0 80862200 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02BB4 80862204 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 02BB8 80862208 0C01E0C4 */ jal Math_SmoothStepToF - -/* 02BBC 8086220C AFAF002C */ sw $t7, 0x002C($sp) -/* 02BC0 80862210 0C02927F */ jal SkelAnime_Update - -/* 02BC4 80862214 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 02BC8 80862218 50400024 */ beql $v0, $zero, .L808622AC -/* 02BCC 8086221C 8FAA002C */ lw $t2, 0x002C($sp) -/* 02BD0 80862220 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 -/* 02BD4 80862224 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02BD8 80862228 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02BDC 8086222C 33190008 */ andi $t9, $t8, 0x0008 ## $t9 = 00000000 -/* 02BE0 80862230 13200017 */ beq $t9, $zero, .L80862290 -/* 02BE4 80862234 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 02BE8 80862238 8608007E */ lh $t0, 0x007E($s0) ## 0000007E -/* 02BEC 8086223C 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 -/* 02BF0 80862240 01091023 */ subu $v0, $t0, $t1 -/* 02BF4 80862244 00021400 */ sll $v0, $v0, 16 -/* 02BF8 80862248 00021403 */ sra $v0, $v0, 16 -/* 02BFC 8086224C 04400003 */ bltz $v0, .L8086225C -/* 02C00 80862250 00021823 */ subu $v1, $zero, $v0 -/* 02C04 80862254 10000001 */ beq $zero, $zero, .L8086225C -/* 02C08 80862258 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L8086225C: -/* 02C0C 8086225C 286138A4 */ slti $at, $v1, 0x38A4 -/* 02C10 80862260 1020000B */ beq $at, $zero, .L80862290 -/* 02C14 80862264 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 02C18 80862268 44814000 */ mtc1 $at, $f8 ## $f8 = 80.00 -/* 02C1C 8086226C C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 -/* 02C20 80862270 4608303C */ c.lt.s $f6, $f8 -/* 02C24 80862274 00000000 */ nop -/* 02C28 80862278 45000005 */ bc1f .L80862290 -/* 02C2C 8086227C 00000000 */ nop -/* 02C30 80862280 0C218754 */ jal func_80861D50 -/* 02C34 80862284 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02C38 80862288 10000008 */ beq $zero, $zero, .L808622AC -/* 02C3C 8086228C 8FAA002C */ lw $t2, 0x002C($sp) -.L80862290: -/* 02C40 80862290 0C21907A */ jal func_808641E8 -/* 02C44 80862294 8FA40034 */ lw $a0, 0x0034($sp) -/* 02C48 80862298 1440003A */ bne $v0, $zero, .L80862384 -/* 02C4C 8086229C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02C50 808622A0 0C217EAC */ jal func_8085FAB0 -/* 02C54 808622A4 8FA50034 */ lw $a1, 0x0034($sp) -/* 02C58 808622A8 8FAA002C */ lw $t2, 0x002C($sp) -.L808622AC: -/* 02C5C 808622AC 814B0843 */ lb $t3, 0x0843($t2) ## 00000843 -/* 02C60 808622B0 51600035 */ beql $t3, $zero, .L80862388 -/* 02C64 808622B4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02C68 808622B8 960C0088 */ lhu $t4, 0x0088($s0) ## 00000088 -/* 02C6C 808622BC 318D0008 */ andi $t5, $t4, 0x0008 ## $t5 = 00000000 -/* 02C70 808622C0 11A00017 */ beq $t5, $zero, .L80862320 -/* 02C74 808622C4 00000000 */ nop -/* 02C78 808622C8 860E007E */ lh $t6, 0x007E($s0) ## 0000007E -/* 02C7C 808622CC 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 02C80 808622D0 01CF1023 */ subu $v0, $t6, $t7 -/* 02C84 808622D4 00021400 */ sll $v0, $v0, 16 -/* 02C88 808622D8 00021403 */ sra $v0, $v0, 16 -/* 02C8C 808622DC 04400003 */ bltz $v0, .L808622EC -/* 02C90 808622E0 00021823 */ subu $v1, $zero, $v0 -/* 02C94 808622E4 10000001 */ beq $zero, $zero, .L808622EC -/* 02C98 808622E8 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L808622EC: -/* 02C9C 808622EC 286138A4 */ slti $at, $v1, 0x38A4 -/* 02CA0 808622F0 1020000B */ beq $at, $zero, .L80862320 -/* 02CA4 808622F4 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 02CA8 808622F8 44818000 */ mtc1 $at, $f16 ## $f16 = 80.00 -/* 02CAC 808622FC C60A0090 */ lwc1 $f10, 0x0090($s0) ## 00000090 -/* 02CB0 80862300 4610503C */ c.lt.s $f10, $f16 -/* 02CB4 80862304 00000000 */ nop -/* 02CB8 80862308 45000005 */ bc1f .L80862320 -/* 02CBC 8086230C 00000000 */ nop -/* 02CC0 80862310 0C218754 */ jal func_80861D50 -/* 02CC4 80862314 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02CC8 80862318 10000019 */ beq $zero, $zero, .L80862380 -/* 02CCC 8086231C 24090008 */ addiu $t1, $zero, 0x0008 ## $t1 = 00000008 -.L80862320: -/* 02CD0 80862320 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02CD4 80862324 00000000 */ nop -/* 02CD8 80862328 3C018086 */ lui $at, %hi(D_808647C4) ## $at = 80860000 -/* 02CDC 8086232C C43247C4 */ lwc1 $f18, %lo(D_808647C4)($at) -/* 02CE0 80862330 4600903C */ c.lt.s $f18, $f0 -/* 02CE4 80862334 00000000 */ nop -/* 02CE8 80862338 4500000E */ bc1f .L80862374 -/* 02CEC 8086233C 00000000 */ nop -/* 02CF0 80862340 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 02CF4 80862344 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 02CF8 80862348 8FB9002C */ lw $t9, 0x002C($sp) -/* 02CFC 8086234C 13010009 */ beq $t8, $at, .L80862374 -/* 02D00 80862350 00000000 */ nop -/* 02D04 80862354 83280842 */ lb $t0, 0x0842($t9) ## 00000842 -/* 02D08 80862358 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 02D0C 8086235C 11010005 */ beq $t0, $at, .L80862374 -/* 02D10 80862360 00000000 */ nop -/* 02D14 80862364 0C218653 */ jal func_8086194C -/* 02D18 80862368 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02D1C 8086236C 10000004 */ beq $zero, $zero, .L80862380 -/* 02D20 80862370 24090008 */ addiu $t1, $zero, 0x0008 ## $t1 = 00000008 -.L80862374: -/* 02D24 80862374 0C2187B0 */ jal func_80861EC0 -/* 02D28 80862378 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02D2C 8086237C 24090008 */ addiu $t1, $zero, 0x0008 ## $t1 = 00000008 -.L80862380: -/* 02D30 80862380 A20907C8 */ sb $t1, 0x07C8($s0) ## 000007C8 -.L80862384: -/* 02D34 80862384 8FBF0024 */ lw $ra, 0x0024($sp) -.L80862388: -/* 02D38 80862388 8FB00020 */ lw $s0, 0x0020($sp) -/* 02D3C 8086238C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02D40 80862390 03E00008 */ jr $ra -/* 02D44 80862394 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862398.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862398.s deleted file mode 100644 index 9383e5c701..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862398.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80862398 -/* 02D48 80862398 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02D4C 8086239C AFB00020 */ sw $s0, 0x0020($sp) -/* 02D50 808623A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02D54 808623A4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02D58 808623A8 3C050600 */ lui $a1, %hi(D_06000444) ## $a1 = 06000000 -/* 02D5C 808623AC 24A50444 */ addiu $a1, $a1, %lo(D_06000444) ## $a1 = 06000444 -/* 02D60 808623B0 0C02947A */ jal Animation_PlayOnce -/* 02D64 808623B4 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 02D68 808623B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02D6C 808623BC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02D70 808623C0 2405383A */ addiu $a1, $zero, 0x383A ## $a1 = 0000383A -/* 02D74 808623C4 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 -/* 02D78 808623C8 44812000 */ mtc1 $at, $f4 ## $f4 = -2.00 -/* 02D7C 808623CC 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 -/* 02D80 808623D0 A20E07C8 */ sb $t6, 0x07C8($s0) ## 000007C8 -/* 02D84 808623D4 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 -/* 02D88 808623D8 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 02D8C 808623DC AFAF0010 */ sw $t7, 0x0010($sp) -/* 02D90 808623E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02D94 808623E4 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 02D98 808623E8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 02D9C 808623EC 0C00D09B */ jal Actor_SetColorFilter -/* 02DA0 808623F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02DA4 808623F4 3C058086 */ lui $a1, %hi(func_80862418) ## $a1 = 80860000 -/* 02DA8 808623F8 24A52418 */ addiu $a1, $a1, %lo(func_80862418) ## $a1 = 80862418 -/* 02DAC 808623FC 0C217D94 */ jal EnTest_SetupAction -/* 02DB0 80862400 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02DB4 80862404 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02DB8 80862408 8FB00020 */ lw $s0, 0x0020($sp) -/* 02DBC 8086240C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02DC0 80862410 03E00008 */ jr $ra -/* 02DC4 80862414 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862418.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862418.s deleted file mode 100644 index c52bebc405..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862418.s +++ /dev/null @@ -1,104 +0,0 @@ -.late_rodata -glabel D_808647C8 - .float 0.7 - -.text -glabel func_80862418 -/* 02DC8 80862418 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02DCC 8086241C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 02DD0 80862420 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02DD4 80862424 AFB00020 */ sw $s0, 0x0020($sp) -/* 02DD8 80862428 AFA50034 */ sw $a1, 0x0034($sp) -/* 02DDC 8086242C 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 02DE0 80862430 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02DE4 80862434 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 -/* 02DE8 80862438 44050000 */ mfc1 $a1, $f0 -/* 02DEC 8086243C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD -/* 02DF0 80862440 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 -/* 02DF4 80862444 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02DF8 80862448 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 02DFC 8086244C 0C01E0C4 */ jal Math_SmoothStepToF - -/* 02E00 80862450 AFAF002C */ sw $t7, 0x002C($sp) -/* 02E04 80862454 0C02927F */ jal SkelAnime_Update - -/* 02E08 80862458 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 02E0C 8086245C 5040000B */ beql $v0, $zero, .L8086248C -/* 02E10 80862460 8FB8002C */ lw $t8, 0x002C($sp) -/* 02E14 80862464 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02E18 80862468 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02E1C 8086246C E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 02E20 80862470 0C21907A */ jal func_808641E8 -/* 02E24 80862474 8FA40034 */ lw $a0, 0x0034($sp) -/* 02E28 80862478 1440003A */ bne $v0, $zero, .L80862564 -/* 02E2C 8086247C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02E30 80862480 0C217EAC */ jal func_8085FAB0 -/* 02E34 80862484 8FA50034 */ lw $a1, 0x0034($sp) -/* 02E38 80862488 8FB8002C */ lw $t8, 0x002C($sp) -.L8086248C: -/* 02E3C 8086248C 83190843 */ lb $t9, 0x0843($t8) ## 00000843 -/* 02E40 80862490 53200035 */ beql $t9, $zero, .L80862568 -/* 02E44 80862494 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02E48 80862498 96080088 */ lhu $t0, 0x0088($s0) ## 00000088 -/* 02E4C 8086249C 31090008 */ andi $t1, $t0, 0x0008 ## $t1 = 00000000 -/* 02E50 808624A0 11200017 */ beq $t1, $zero, .L80862500 -/* 02E54 808624A4 00000000 */ nop -/* 02E58 808624A8 860A007E */ lh $t2, 0x007E($s0) ## 0000007E -/* 02E5C 808624AC 860B00B6 */ lh $t3, 0x00B6($s0) ## 000000B6 -/* 02E60 808624B0 014B1023 */ subu $v0, $t2, $t3 -/* 02E64 808624B4 00021400 */ sll $v0, $v0, 16 -/* 02E68 808624B8 00021403 */ sra $v0, $v0, 16 -/* 02E6C 808624BC 04400003 */ bltz $v0, .L808624CC -/* 02E70 808624C0 00021823 */ subu $v1, $zero, $v0 -/* 02E74 808624C4 10000001 */ beq $zero, $zero, .L808624CC -/* 02E78 808624C8 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L808624CC: -/* 02E7C 808624CC 286138A4 */ slti $at, $v1, 0x38A4 -/* 02E80 808624D0 1020000B */ beq $at, $zero, .L80862500 -/* 02E84 808624D4 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 02E88 808624D8 44814000 */ mtc1 $at, $f8 ## $f8 = 80.00 -/* 02E8C 808624DC C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 -/* 02E90 808624E0 4608303C */ c.lt.s $f6, $f8 -/* 02E94 808624E4 00000000 */ nop -/* 02E98 808624E8 45000005 */ bc1f .L80862500 -/* 02E9C 808624EC 00000000 */ nop -/* 02EA0 808624F0 0C218754 */ jal func_80861D50 -/* 02EA4 808624F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02EA8 808624F8 10000019 */ beq $zero, $zero, .L80862560 -/* 02EAC 808624FC 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 -.L80862500: -/* 02EB0 80862500 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02EB4 80862504 00000000 */ nop -/* 02EB8 80862508 3C018086 */ lui $at, %hi(D_808647C8) ## $at = 80860000 -/* 02EBC 8086250C C42A47C8 */ lwc1 $f10, %lo(D_808647C8)($at) -/* 02EC0 80862510 4600503C */ c.lt.s $f10, $f0 -/* 02EC4 80862514 00000000 */ nop -/* 02EC8 80862518 4500000E */ bc1f .L80862554 -/* 02ECC 8086251C 00000000 */ nop -/* 02ED0 80862520 860C001C */ lh $t4, 0x001C($s0) ## 0000001C -/* 02ED4 80862524 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 02ED8 80862528 8FAD002C */ lw $t5, 0x002C($sp) -/* 02EDC 8086252C 11810009 */ beq $t4, $at, .L80862554 -/* 02EE0 80862530 00000000 */ nop -/* 02EE4 80862534 81AE0842 */ lb $t6, 0x0842($t5) ## 00000842 -/* 02EE8 80862538 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 02EEC 8086253C 11C10005 */ beq $t6, $at, .L80862554 -/* 02EF0 80862540 00000000 */ nop -/* 02EF4 80862544 0C218653 */ jal func_8086194C -/* 02EF8 80862548 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02EFC 8086254C 10000004 */ beq $zero, $zero, .L80862560 -/* 02F00 80862550 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 -.L80862554: -/* 02F04 80862554 0C2187B0 */ jal func_80861EC0 -/* 02F08 80862558 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02F0C 8086255C 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 -.L80862560: -/* 02F10 80862560 A20F07C8 */ sb $t7, 0x07C8($s0) ## 000007C8 -.L80862564: -/* 02F14 80862564 8FBF0024 */ lw $ra, 0x0024($sp) -.L80862568: -/* 02F18 80862568 8FB00020 */ lw $s0, 0x0020($sp) -/* 02F1C 8086256C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02F20 80862570 03E00008 */ jr $ra -/* 02F24 80862574 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862578.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862578.s deleted file mode 100644 index eacf5dc85c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862578.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_80862578 -/* 02F28 80862578 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02F2C 8086257C AFB00020 */ sw $s0, 0x0020($sp) -/* 02F30 80862580 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02F34 80862584 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 02F38 80862588 44813000 */ mtc1 $at, $f6 ## $f6 = -4.00 -/* 02F3C 8086258C 908F07E2 */ lbu $t7, 0x07E2($a0) ## 000007E2 -/* 02F40 80862590 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02F44 80862594 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B -/* 02F48 80862598 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 02F4C 8086259C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02F50 808625A0 A08E07C8 */ sb $t6, 0x07C8($a0) ## 000007C8 -/* 02F54 808625A4 A08007DE */ sb $zero, 0x07DE($a0) ## 000007DE -/* 02F58 808625A8 A0800808 */ sb $zero, 0x0808($a0) ## 00000808 -/* 02F5C 808625AC E4860068 */ swc1 $f6, 0x0068($a0) ## 00000068 -/* 02F60 808625B0 15E10009 */ bne $t7, $at, .L808625D8 -/* 02F64 808625B4 E48401A4 */ swc1 $f4, 0x01A4($a0) ## 000001A4 -/* 02F68 808625B8 24180050 */ addiu $t8, $zero, 0x0050 ## $t8 = 00000050 -/* 02F6C 808625BC AFB80010 */ sw $t8, 0x0010($sp) -/* 02F70 808625C0 24058000 */ addiu $a1, $zero, 0x8000 ## $a1 = FFFF8000 -/* 02F74 808625C4 24060078 */ addiu $a2, $zero, 0x0078 ## $a2 = 00000078 -/* 02F78 808625C8 0C00D09B */ jal Actor_SetColorFilter -/* 02F7C 808625CC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02F80 808625D0 10000014 */ beq $zero, $zero, .L80862624 -/* 02F84 808625D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L808625D8: -/* 02F88 808625D8 24190050 */ addiu $t9, $zero, 0x0050 ## $t9 = 00000050 -/* 02F8C 808625DC AFB90010 */ sw $t9, 0x0010($sp) -/* 02F90 808625E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02F94 808625E4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02F98 808625E8 24060078 */ addiu $a2, $zero, 0x0078 ## $a2 = 00000078 -/* 02F9C 808625EC 0C00D09B */ jal Actor_SetColorFilter -/* 02FA0 808625F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02FA4 808625F4 920807E2 */ lbu $t0, 0x07E2($s0) ## 000007E2 -/* 02FA8 808625F8 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 02FAC 808625FC 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 02FB0 80862600 15010004 */ bne $t0, $at, .L80862614 -/* 02FB4 80862604 3C050601 */ lui $a1, %hi(D_06008604) ## $a1 = 06010000 -/* 02FB8 80862608 24090024 */ addiu $t1, $zero, 0x0024 ## $t1 = 00000024 -/* 02FBC 8086260C 10000004 */ beq $zero, $zero, .L80862620 -/* 02FC0 80862610 A60907E0 */ sh $t1, 0x07E0($s0) ## 000007E0 -.L80862614: -/* 02FC4 80862614 24A58604 */ addiu $a1, $a1, %lo(D_06008604) ## $a1 = 06008604 -/* 02FC8 80862618 0C0294A7 */ jal Animation_PlayOnceSetSpeed -/* 02FCC 8086261C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -.L80862620: -/* 02FD0 80862620 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80862624: -/* 02FD4 80862624 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02FD8 80862628 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E -/* 02FDC 8086262C 3C058086 */ lui $a1, %hi(func_80862650) ## $a1 = 80860000 -/* 02FE0 80862630 24A52650 */ addiu $a1, $a1, %lo(func_80862650) ## $a1 = 80862650 -/* 02FE4 80862634 0C217D94 */ jal EnTest_SetupAction -/* 02FE8 80862638 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02FEC 8086263C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02FF0 80862640 8FB00020 */ lw $s0, 0x0020($sp) -/* 02FF4 80862644 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02FF8 80862648 03E00008 */ jr $ra -/* 02FFC 8086264C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862650.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862650.s deleted file mode 100644 index b2534a63f9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862650.s +++ /dev/null @@ -1,109 +0,0 @@ -.late_rodata -glabel D_808647CC - .float 0.7 - -.text -glabel func_80862650 -/* 03000 80862650 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 03004 80862654 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 03008 80862658 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 0300C 8086265C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 03010 80862660 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03014 80862664 AFB00020 */ sw $s0, 0x0020($sp) -/* 03018 80862668 AFA50034 */ sw $a1, 0x0034($sp) -/* 0301C 8086266C 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 03020 80862670 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03024 80862674 44061000 */ mfc1 $a2, $f2 -/* 03028 80862678 44071000 */ mfc1 $a3, $f2 -/* 0302C 8086267C 44050000 */ mfc1 $a1, $f0 -/* 03030 80862680 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 -/* 03034 80862684 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 03038 80862688 0C01E0C4 */ jal Math_SmoothStepToF - -/* 0303C 8086268C AFAF002C */ sw $t7, 0x002C($sp) -/* 03040 80862690 92180114 */ lbu $t8, 0x0114($s0) ## 00000114 -/* 03044 80862694 57000047 */ bnel $t8, $zero, .L808627B4 -/* 03048 80862698 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0304C 8086269C 921900AF */ lbu $t9, 0x00AF($s0) ## 000000AF -/* 03050 808626A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03054 808626A4 8FA8002C */ lw $t0, 0x002C($sp) -/* 03058 808626A8 57200006 */ bnel $t9, $zero, .L808626C4 -/* 0305C 808626AC 81090843 */ lb $t1, 0x0843($t0) ## 00000843 -/* 03060 808626B0 0C218BEA */ jal func_80862FA8 -/* 03064 808626B4 8FA50034 */ lw $a1, 0x0034($sp) -/* 03068 808626B8 1000003E */ beq $zero, $zero, .L808627B4 -/* 0306C 808626BC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03070 808626C0 81090843 */ lb $t1, 0x0843($t0) ## 00000843 -.L808626C4: -/* 03074 808626C4 51200032 */ beql $t1, $zero, .L80862790 -/* 03078 808626C8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 0307C 808626CC 960A0088 */ lhu $t2, 0x0088($s0) ## 00000088 -/* 03080 808626D0 314B0008 */ andi $t3, $t2, 0x0008 ## $t3 = 00000000 -/* 03084 808626D4 11600017 */ beq $t3, $zero, .L80862734 -/* 03088 808626D8 00000000 */ nop -/* 0308C 808626DC 860C007E */ lh $t4, 0x007E($s0) ## 0000007E -/* 03090 808626E0 860D00B6 */ lh $t5, 0x00B6($s0) ## 000000B6 -/* 03094 808626E4 018D1023 */ subu $v0, $t4, $t5 -/* 03098 808626E8 00021400 */ sll $v0, $v0, 16 -/* 0309C 808626EC 00021403 */ sra $v0, $v0, 16 -/* 030A0 808626F0 04400003 */ bltz $v0, .L80862700 -/* 030A4 808626F4 00021823 */ subu $v1, $zero, $v0 -/* 030A8 808626F8 10000001 */ beq $zero, $zero, .L80862700 -/* 030AC 808626FC 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80862700: -/* 030B0 80862700 286138A4 */ slti $at, $v1, 0x38A4 -/* 030B4 80862704 1020000B */ beq $at, $zero, .L80862734 -/* 030B8 80862708 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 030BC 8086270C 44813000 */ mtc1 $at, $f6 ## $f6 = 80.00 -/* 030C0 80862710 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 030C4 80862714 4606203C */ c.lt.s $f4, $f6 -/* 030C8 80862718 00000000 */ nop -/* 030CC 8086271C 45000005 */ bc1f .L80862734 -/* 030D0 80862720 00000000 */ nop -/* 030D4 80862724 0C218754 */ jal func_80861D50 -/* 030D8 80862728 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 030DC 8086272C 10000015 */ beq $zero, $zero, .L80862784 -/* 030E0 80862730 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 -.L80862734: -/* 030E4 80862734 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 030E8 80862738 00000000 */ nop -/* 030EC 8086273C 3C018086 */ lui $at, %hi(D_808647CC) ## $at = 80860000 -/* 030F0 80862740 C42847CC */ lwc1 $f8, %lo(D_808647CC)($at) -/* 030F4 80862744 8FAE002C */ lw $t6, 0x002C($sp) -/* 030F8 80862748 4600403C */ c.lt.s $f8, $f0 -/* 030FC 8086274C 00000000 */ nop -/* 03100 80862750 45000009 */ bc1f .L80862778 -/* 03104 80862754 00000000 */ nop -/* 03108 80862758 81CF0842 */ lb $t7, 0x0842($t6) ## 00000842 -/* 0310C 8086275C 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 03110 80862760 11E10005 */ beq $t7, $at, .L80862778 -/* 03114 80862764 00000000 */ nop -/* 03118 80862768 0C218653 */ jal func_8086194C -/* 0311C 8086276C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03120 80862770 10000004 */ beq $zero, $zero, .L80862784 -/* 03124 80862774 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 -.L80862778: -/* 03128 80862778 0C2187B0 */ jal func_80861EC0 -/* 0312C 8086277C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03130 80862780 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 -.L80862784: -/* 03134 80862784 1000000A */ beq $zero, $zero, .L808627B0 -/* 03138 80862788 A21807C8 */ sb $t8, 0x07C8($s0) ## 000007C8 -/* 0313C 8086278C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -.L80862790: -/* 03140 80862790 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03144 80862794 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 03148 80862798 0C21907A */ jal func_808641E8 -/* 0314C 8086279C 8FA40034 */ lw $a0, 0x0034($sp) -/* 03150 808627A0 14400003 */ bne $v0, $zero, .L808627B0 -/* 03154 808627A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03158 808627A8 0C217EAC */ jal func_8085FAB0 -/* 0315C 808627AC 8FA50034 */ lw $a1, 0x0034($sp) -.L808627B0: -/* 03160 808627B0 8FBF0024 */ lw $ra, 0x0024($sp) -.L808627B4: -/* 03164 808627B4 8FB00020 */ lw $s0, 0x0020($sp) -/* 03168 808627B8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0316C 808627BC 03E00008 */ jr $ra -/* 03170 808627C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s deleted file mode 100644 index 8e9c322bdb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s +++ /dev/null @@ -1,72 +0,0 @@ -glabel func_808627C4 -/* 03174 808627C4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03178 808627C8 AFB00020 */ sw $s0, 0x0020($sp) -/* 0317C 808627CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03180 808627D0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03184 808627D4 AFA5002C */ sw $a1, 0x002C($sp) -/* 03188 808627D8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0318C 808627DC 0C00CEAE */ jal Actor_OtherIsTargeted -/* 03190 808627E0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03194 808627E4 10400005 */ beq $v0, $zero, .L808627FC -/* 03198 808627E8 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 0319C 808627EC 0C2183B0 */ jal func_80860EC0 -/* 031A0 808627F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031A4 808627F4 10000030 */ beq $zero, $zero, .L808628B8 -/* 031A8 808627F8 8FBF0024 */ lw $ra, 0x0024($sp) -.L808627FC: -/* 031AC 808627FC 3C050601 */ lui $a1, %hi(D_0600E2B0) ## $a1 = 06010000 -/* 031B0 80862800 24A5E2B0 */ addiu $a1, $a1, %lo(D_0600E2B0) ## $a1 = 0600E2B0 -/* 031B4 80862804 0C0294D3 */ jal Animation_MorphToLoop -/* 031B8 80862808 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 -/* 031BC 8086280C 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 031C0 80862810 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 031C4 80862814 AFAE0010 */ sw $t6, 0x0010($sp) -/* 031C8 80862818 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 031CC 8086281C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 031D0 80862820 0C01E1A7 */ jal Math_SmoothStepToS - -/* 031D4 80862824 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 031D8 80862828 8FAF002C */ lw $t7, 0x002C($sp) -/* 031DC 8086282C 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 031E0 80862830 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 031E4 80862834 030FC021 */ addu $t8, $t8, $t7 -/* 031E8 80862838 8F181DE4 */ lw $t8, 0x1DE4($t8) ## 00011DE4 -/* 031EC 8086283C 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 031F0 80862840 53200006 */ beql $t9, $zero, .L8086285C -/* 031F4 80862844 44813000 */ mtc1 $at, $f6 ## $f6 = 4.00 -/* 031F8 80862848 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 031FC 8086284C 44812000 */ mtc1 $at, $f4 ## $f4 = -4.00 -/* 03200 80862850 10000004 */ beq $zero, $zero, .L80862864 -/* 03204 80862854 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 03208 80862858 44813000 */ mtc1 $at, $f6 ## $f6 = -4.00 -.L8086285C: -/* 0320C 8086285C 00000000 */ nop -/* 03210 80862860 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -.L80862864: -/* 03214 80862864 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 03218 80862868 25093FFF */ addiu $t1, $t0, 0x3FFF ## $t1 = 00003FFF -/* 0321C 8086286C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 03220 80862870 A6090032 */ sh $t1, 0x0032($s0) ## 00000032 -/* 03224 80862874 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 03228 80862878 44811000 */ mtc1 $at, $f2 ## $f2 = 20.00 -/* 0322C 8086287C 240C0018 */ addiu $t4, $zero, 0x0018 ## $t4 = 00000018 -/* 03230 80862880 3C058086 */ lui $a1, %hi(func_808628C8) ## $a1 = 80860000 -/* 03234 80862884 46020202 */ mul.s $f8, $f0, $f2 -/* 03238 80862888 A20C07C8 */ sb $t4, 0x07C8($s0) ## 000007C8 -/* 0323C 8086288C 24A528C8 */ addiu $a1, $a1, %lo(func_808628C8) ## $a1 = 808628C8 -/* 03240 80862890 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03244 80862894 46024280 */ add.s $f10, $f8, $f2 -/* 03248 80862898 4600540D */ trunc.w.s $f16, $f10 -/* 0324C 8086289C 440B8000 */ mfc1 $t3, $f16 -/* 03250 808628A0 0C217D94 */ jal EnTest_SetupAction -/* 03254 808628A4 AE0B07E8 */ sw $t3, 0x07E8($s0) ## 000007E8 -/* 03258 808628A8 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 0325C 808628AC 00000000 */ nop -/* 03260 808628B0 E61207EC */ swc1 $f18, 0x07EC($s0) ## 000007EC -/* 03264 808628B4 8FBF0024 */ lw $ra, 0x0024($sp) -.L808628B8: -/* 03268 808628B8 8FB00020 */ lw $s0, 0x0020($sp) -/* 0326C 808628BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03270 808628C0 03E00008 */ jr $ra -/* 03274 808628C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808628C8.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808628C8.s deleted file mode 100644 index 334a576da1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808628C8.s +++ /dev/null @@ -1,366 +0,0 @@ -.late_rodata -glabel D_808647D0 - .float -0.8 -glabel D_808647D4 - .float -0.8 - -.text -glabel func_808628C8 -/* 03278 808628C8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 0327C 808628CC AFBF0024 */ sw $ra, 0x0024($sp) -/* 03280 808628D0 AFB00020 */ sw $s0, 0x0020($sp) -/* 03284 808628D4 AFA50054 */ sw $a1, 0x0054($sp) -/* 03288 808628D8 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 0328C 808628DC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 03290 808628E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03294 808628E4 AFAF0048 */ sw $t7, 0x0048($sp) -/* 03298 808628E8 E7A40034 */ swc1 $f4, 0x0034($sp) -/* 0329C 808628EC 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 032A0 808628F0 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 032A4 808628F4 AFB80010 */ sw $t8, 0x0010($sp) -/* 032A8 808628F8 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 -/* 032AC 808628FC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 032B0 80862900 0C01E1A7 */ jal Math_SmoothStepToS - -/* 032B4 80862904 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 032B8 80862908 920307DE */ lbu $v1, 0x07DE($s0) ## 000007DE -/* 032BC 8086290C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 032C0 80862910 14600002 */ bne $v1, $zero, .L8086291C -/* 032C4 80862914 24790001 */ addiu $t9, $v1, 0x0001 ## $t9 = 00000001 -/* 032C8 80862918 A21907DE */ sb $t9, 0x07DE($s0) ## 000007DE -.L8086291C: -/* 032CC 8086291C C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 032D0 80862920 4600303E */ c.le.s $f6, $f0 -/* 032D4 80862924 00000000 */ nop -/* 032D8 80862928 4500000E */ bc1f .L80862964 -/* 032DC 8086292C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 032E0 80862930 44811000 */ mtc1 $at, $f2 ## $f2 = 6.00 -/* 032E4 80862934 3C013E00 */ lui $at, 0x3E00 ## $at = 3E000000 -/* 032E8 80862938 4602003C */ c.lt.s $f0, $f2 -/* 032EC 8086293C 00000000 */ nop -/* 032F0 80862940 45000006 */ bc1f .L8086295C -/* 032F4 80862944 00000000 */ nop -/* 032F8 80862948 44814000 */ mtc1 $at, $f8 ## $f8 = 0.12 -/* 032FC 8086294C 00000000 */ nop -/* 03300 80862950 46080280 */ add.s $f10, $f0, $f8 -/* 03304 80862954 10000010 */ beq $zero, $zero, .L80862998 -/* 03308 80862958 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -.L8086295C: -/* 0330C 8086295C 1000000E */ beq $zero, $zero, .L80862998 -/* 03310 80862960 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -.L80862964: -/* 03314 80862964 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 -/* 03318 80862968 44811000 */ mtc1 $at, $f2 ## $f2 = -6.00 -/* 0331C 8086296C 3C013E00 */ lui $at, 0x3E00 ## $at = 3E000000 -/* 03320 80862970 4600103C */ c.lt.s $f2, $f0 -/* 03324 80862974 00000000 */ nop -/* 03328 80862978 45020007 */ bc1fl .L80862998 -/* 0332C 8086297C E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 03330 80862980 44818000 */ mtc1 $at, $f16 ## $f16 = 0.12 -/* 03334 80862984 00000000 */ nop -/* 03338 80862988 46100481 */ sub.s $f18, $f0, $f16 -/* 0333C 8086298C 10000002 */ beq $zero, $zero, .L80862998 -/* 03340 80862990 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 -/* 03344 80862994 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -.L80862998: -/* 03348 80862998 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 -/* 0334C 8086299C 30420008 */ andi $v0, $v0, 0x0008 ## $v0 = 00000000 -/* 03350 808629A0 14400011 */ bne $v0, $zero, .L808629E8 -/* 03354 808629A4 00000000 */ nop -/* 03358 808629A8 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -/* 0335C 808629AC 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 03360 808629B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03364 808629B4 55010045 */ bnel $t0, $at, .L80862ACC -/* 03368 808629B8 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 -/* 0336C 808629BC 860700B6 */ lh $a3, 0x00B6($s0) ## 000000B6 -/* 03370 808629C0 8FA50054 */ lw $a1, 0x0054($sp) -/* 03374 808629C4 8E060068 */ lw $a2, 0x0068($s0) ## 00000068 -/* 03378 808629C8 24E73FFF */ addiu $a3, $a3, 0x3FFF ## $a3 = 00003FFF -/* 0337C 808629CC 00073C00 */ sll $a3, $a3, 16 -/* 03380 808629D0 0C00CE6E */ jal func_800339B8 -/* 03384 808629D4 00073C03 */ sra $a3, $a3, 16 -/* 03388 808629D8 5440003C */ bnel $v0, $zero, .L80862ACC -/* 0338C 808629DC 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 -/* 03390 808629E0 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 -/* 03394 808629E4 30420008 */ andi $v0, $v0, 0x0008 ## $v0 = 00000000 -.L808629E8: -/* 03398 808629E8 10400016 */ beq $v0, $zero, .L80862A44 -/* 0339C 808629EC 3C018086 */ lui $at, %hi(D_808647D0) ## $at = 80860000 -/* 033A0 808629F0 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 033A4 808629F4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 033A8 808629F8 00000000 */ nop -/* 033AC 808629FC 4604303E */ c.le.s $f6, $f4 -/* 033B0 80862A00 00000000 */ nop -/* 033B4 80862A04 45020007 */ bc1fl .L80862A24 -/* 033B8 80862A08 860200B6 */ lh $v0, 0x00B6($s0) ## 000000B6 -/* 033BC 80862A0C 860200B6 */ lh $v0, 0x00B6($s0) ## 000000B6 -/* 033C0 80862A10 24423FFF */ addiu $v0, $v0, 0x3FFF ## $v0 = 00003FFF -/* 033C4 80862A14 00021400 */ sll $v0, $v0, 16 -/* 033C8 80862A18 10000005 */ beq $zero, $zero, .L80862A30 -/* 033CC 80862A1C 00021403 */ sra $v0, $v0, 16 -/* 033D0 80862A20 860200B6 */ lh $v0, 0x00B6($s0) ## 000000B6 -.L80862A24: -/* 033D4 80862A24 2442C001 */ addiu $v0, $v0, 0xC001 ## $v0 = 00000000 -/* 033D8 80862A28 00021400 */ sll $v0, $v0, 16 -/* 033DC 80862A2C 00021403 */ sra $v0, $v0, 16 -.L80862A30: -/* 033E0 80862A30 8609007E */ lh $t1, 0x007E($s0) ## 0000007E -/* 033E4 80862A34 01221023 */ subu $v0, $t1, $v0 -/* 033E8 80862A38 00021400 */ sll $v0, $v0, 16 -/* 033EC 80862A3C 10000006 */ beq $zero, $zero, .L80862A58 -/* 033F0 80862A40 00021403 */ sra $v0, $v0, 16 -.L80862A44: -/* 033F4 80862A44 C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 -/* 033F8 80862A48 C42A47D0 */ lwc1 $f10, %lo(D_808647D0)($at) -/* 033FC 80862A4C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03400 80862A50 460A4402 */ mul.s $f16, $f8, $f10 -/* 03404 80862A54 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -.L80862A58: -/* 03408 80862A58 04400003 */ bltz $v0, .L80862A68 -/* 0340C 80862A5C 00021823 */ subu $v1, $zero, $v0 -/* 03410 80862A60 10000001 */ beq $zero, $zero, .L80862A68 -/* 03414 80862A64 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80862A68: -/* 03418 80862A68 28614001 */ slti $at, $v1, 0x4001 -/* 0341C 80862A6C 14200016 */ bne $at, $zero, .L80862AC8 -/* 03420 80862A70 3C018086 */ lui $at, %hi(D_808647D4) ## $at = 80860000 -/* 03424 80862A74 C42447D4 */ lwc1 $f4, %lo(D_808647D4)($at) -/* 03428 80862A78 C6120068 */ lwc1 $f18, 0x0068($s0) ## 00000068 -/* 0342C 80862A7C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 03430 80862A80 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 03434 80862A84 46049182 */ mul.s $f6, $f18, $f4 -/* 03438 80862A88 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 0343C 80862A8C C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 03440 80862A90 4608003C */ c.lt.s $f0, $f8 -/* 03444 80862A94 00000000 */ nop -/* 03448 80862A98 45020008 */ bc1fl .L80862ABC -/* 0344C 80862A9C 44819000 */ mtc1 $at, $f18 ## $f18 = 0.50 -/* 03450 80862AA0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 03454 80862AA4 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 -/* 03458 80862AA8 00000000 */ nop -/* 0345C 80862AAC 460A0401 */ sub.s $f16, $f0, $f10 -/* 03460 80862AB0 10000005 */ beq $zero, $zero, .L80862AC8 -/* 03464 80862AB4 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 03468 80862AB8 44819000 */ mtc1 $at, $f18 ## $f18 = 0.50 -.L80862ABC: -/* 0346C 80862ABC 00000000 */ nop -/* 03470 80862AC0 46120100 */ add.s $f4, $f0, $f18 -/* 03474 80862AC4 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -.L80862AC8: -/* 03478 80862AC8 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 -.L80862ACC: -/* 0347C 80862ACC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03480 80862AD0 254B3FFF */ addiu $t3, $t2, 0x3FFF ## $t3 = 00003FFF -/* 03484 80862AD4 A60B0032 */ sh $t3, 0x0032($s0) ## 00000032 -/* 03488 80862AD8 0C00CEAE */ jal Actor_OtherIsTargeted -/* 0348C 80862ADC 8FA40054 */ lw $a0, 0x0054($sp) -/* 03490 80862AE0 10400004 */ beq $v0, $zero, .L80862AF4 -/* 03494 80862AE4 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 03498 80862AE8 44811000 */ mtc1 $at, $f2 ## $f2 = 200.00 -/* 0349C 80862AEC 00000000 */ nop -/* 034A0 80862AF0 E7A20034 */ swc1 $f2, 0x0034($sp) -.L80862AF4: -/* 034A4 80862AF4 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 034A8 80862AF8 C7A20034 */ lwc1 $f2, 0x0034($sp) -/* 034AC 80862AFC 44813000 */ mtc1 $at, $f6 ## $f6 = 80.00 -/* 034B0 80862B00 C6000090 */ lwc1 $f0, 0x0090($s0) ## 00000090 -/* 034B4 80862B04 260407EC */ addiu $a0, $s0, 0x07EC ## $a0 = 000007EC -/* 034B8 80862B08 46023200 */ add.s $f8, $f6, $f2 -/* 034BC 80862B0C 3C05C020 */ lui $a1, 0xC020 ## $a1 = C0200000 -/* 034C0 80862B10 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 034C4 80862B14 3C073F4C */ lui $a3, 0x3F4C ## $a3 = 3F4C0000 -/* 034C8 80862B18 4608003E */ c.le.s $f0, $f8 -/* 034CC 80862B1C 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 -/* 034D0 80862B20 45020008 */ bc1fl .L80862B44 -/* 034D4 80862B24 44818000 */ mtc1 $at, $f16 ## $f16 = 110.00 -/* 034D8 80862B28 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 034DC 80862B2C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3F4CCCCD -/* 034E0 80862B30 0C01E0C4 */ jal Math_SmoothStepToF - -/* 034E4 80862B34 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 034E8 80862B38 1000001A */ beq $zero, $zero, .L80862BA4 -/* 034EC 80862B3C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 034F0 80862B40 44818000 */ mtc1 $at, $f16 ## $f16 = 0.00 -.L80862B44: -/* 034F4 80862B44 260407EC */ addiu $a0, $s0, 0x07EC ## $a0 = 000007EC -/* 034F8 80862B48 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 034FC 80862B4C 46028480 */ add.s $f18, $f16, $f2 -/* 03500 80862B50 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03504 80862B54 3C0740D4 */ lui $a3, 0x40D4 ## $a3 = 40D40000 -/* 03508 80862B58 4600903C */ c.lt.s $f18, $f0 -/* 0350C 80862B5C 00000000 */ nop -/* 03510 80862B60 4502000C */ bc1fl .L80862B94 -/* 03514 80862B64 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 03518 80862B68 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0351C 80862B6C 3C073F4C */ lui $a3, 0x3F4C ## $a3 = 3F4C0000 -/* 03520 80862B70 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3F4CCCCD -/* 03524 80862B74 260407EC */ addiu $a0, $s0, 0x07EC ## $a0 = 000007EC -/* 03528 80862B78 3C054020 */ lui $a1, 0x4020 ## $a1 = 40200000 -/* 0352C 80862B7C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03530 80862B80 0C01E0C4 */ jal Math_SmoothStepToF - -/* 03534 80862B84 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 03538 80862B88 10000006 */ beq $zero, $zero, .L80862BA4 -/* 0353C 80862B8C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 03540 80862B90 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -.L80862B94: -/* 03544 80862B94 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 0000CCCD -/* 03548 80862B98 0C01E0C4 */ jal Math_SmoothStepToF - -/* 0354C 80862B9C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 03550 80862BA0 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -.L80862BA4: -/* 03554 80862BA4 C60A07EC */ lwc1 $f10, 0x07EC($s0) ## 000007EC -/* 03558 80862BA8 460A4032 */ c.eq.s $f8, $f10 -/* 0355C 80862BAC 00000000 */ nop -/* 03560 80862BB0 45030010 */ bc1tl .L80862BF4 -/* 03564 80862BB4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 03568 80862BB8 0C01DE1C */ jal Math_SinS - ## sins? -/* 0356C 80862BBC 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 03570 80862BC0 C61207EC */ lwc1 $f18, 0x07EC($s0) ## 000007EC -/* 03574 80862BC4 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 03578 80862BC8 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 0357C 80862BCC 46120102 */ mul.s $f4, $f0, $f18 -/* 03580 80862BD0 46048180 */ add.s $f6, $f16, $f4 -/* 03584 80862BD4 0C01DE0D */ jal Math_CosS - ## coss? -/* 03588 80862BD8 E6060024 */ swc1 $f6, 0x0024($s0) ## 00000024 -/* 0358C 80862BDC C60A07EC */ lwc1 $f10, 0x07EC($s0) ## 000007EC -/* 03590 80862BE0 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 03594 80862BE4 460A0482 */ mul.s $f18, $f0, $f10 -/* 03598 80862BE8 46124400 */ add.s $f16, $f8, $f18 -/* 0359C 80862BEC E610002C */ swc1 $f16, 0x002C($s0) ## 0000002C -/* 035A0 80862BF0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -.L80862BF4: -/* 035A4 80862BF4 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 035A8 80862BF8 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 035AC 80862BFC C60801A0 */ lwc1 $f8, 0x01A0($s0) ## 000001A0 -/* 035B0 80862C00 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 035B4 80862C04 46062282 */ mul.s $f10, $f4, $f6 -/* 035B8 80862C08 4600448D */ trunc.w.s $f18, $f8 -/* 035BC 80862C0C 440D9000 */ mfc1 $t5, $f18 -/* 035C0 80862C10 E60A01A4 */ swc1 $f10, 0x01A4($s0) ## 000001A4 -/* 035C4 80862C14 0C02927F */ jal SkelAnime_Update - -/* 035C8 80862C18 AFAD0040 */ sw $t5, 0x0040($sp) -/* 035CC 80862C1C 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 035D0 80862C20 C60001A4 */ lwc1 $f0, 0x01A4($s0) ## 000001A4 -/* 035D4 80862C24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 035D8 80862C28 24053838 */ addiu $a1, $zero, 0x3838 ## $a1 = 00003838 -/* 035DC 80862C2C 4600703E */ c.le.s $f14, $f0 -/* 035E0 80862C30 00000000 */ nop -/* 035E4 80862C34 45020004 */ bc1fl .L80862C48 -/* 035E8 80862C38 46000087 */ neg.s $f2, $f0 -/* 035EC 80862C3C 10000002 */ beq $zero, $zero, .L80862C48 -/* 035F0 80862C40 46000086 */ mov.s $f2, $f0 -/* 035F4 80862C44 46000087 */ neg.s $f2, $f0 -.L80862C48: -/* 035F8 80862C48 C60C01A0 */ lwc1 $f12, 0x01A0($s0) ## 000001A0 -/* 035FC 80862C4C 4600703E */ c.le.s $f14, $f0 -/* 03600 80862C50 46026401 */ sub.s $f16, $f12, $f2 -/* 03604 80862C54 4600810D */ trunc.w.s $f4, $f16 -/* 03608 80862C58 44032000 */ mfc1 $v1, $f4 -/* 0360C 80862C5C 45020004 */ bc1fl .L80862C70 -/* 03610 80862C60 46000087 */ neg.s $f2, $f0 -/* 03614 80862C64 10000002 */ beq $zero, $zero, .L80862C70 -/* 03618 80862C68 46000086 */ mov.s $f2, $f0 -/* 0361C 80862C6C 46000087 */ neg.s $f2, $f0 -.L80862C70: -/* 03620 80862C70 8E0F07E8 */ lw $t7, 0x07E8($s0) ## 000007E8 -/* 03624 80862C74 31F8001F */ andi $t8, $t7, 0x001F ## $t8 = 00000000 -/* 03628 80862C78 57000008 */ bnel $t8, $zero, .L80862C9C -/* 0362C 80862C7C 4600618D */ trunc.w.s $f6, $f12 -/* 03630 80862C80 AFA3003C */ sw $v1, 0x003C($sp) -/* 03634 80862C84 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 03638 80862C88 E7A2002C */ swc1 $f2, 0x002C($sp) -/* 0363C 80862C8C 8FA3003C */ lw $v1, 0x003C($sp) -/* 03640 80862C90 C7A2002C */ lwc1 $f2, 0x002C($sp) -/* 03644 80862C94 C60C01A0 */ lwc1 $f12, 0x01A0($s0) ## 000001A0 -/* 03648 80862C98 4600618D */ trunc.w.s $f6, $f12 -.L80862C9C: -/* 0364C 80862C9C 8FA40040 */ lw $a0, 0x0040($sp) -/* 03650 80862CA0 44083000 */ mfc1 $t0, $f6 -/* 03654 80862CA4 00000000 */ nop -/* 03658 80862CA8 50880011 */ beql $a0, $t0, .L80862CF0 -/* 0365C 80862CAC 8E0207E8 */ lw $v0, 0x07E8($s0) ## 000007E8 -/* 03660 80862CB0 4600128D */ trunc.w.s $f10, $f2 -/* 03664 80862CB4 440A5000 */ mfc1 $t2, $f10 -/* 03668 80862CB8 00000000 */ nop -/* 0366C 80862CBC 01441021 */ addu $v0, $t2, $a0 -/* 03670 80862CC0 28410002 */ slti $at, $v0, 0x0002 -/* 03674 80862CC4 54200003 */ bnel $at, $zero, .L80862CD4 -/* 03678 80862CC8 28610007 */ slti $at, $v1, 0x0007 -/* 0367C 80862CCC 18600004 */ blez $v1, .L80862CE0 -/* 03680 80862CD0 28610007 */ slti $at, $v1, 0x0007 -.L80862CD4: -/* 03684 80862CD4 10200005 */ beq $at, $zero, .L80862CEC -/* 03688 80862CD8 28410008 */ slti $at, $v0, 0x0008 -/* 0368C 80862CDC 14200003 */ bne $at, $zero, .L80862CEC -.L80862CE0: -/* 03690 80862CE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03694 80862CE4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 03698 80862CE8 2405383D */ addiu $a1, $zero, 0x383D ## $a1 = 0000383D -.L80862CEC: -/* 0369C 80862CEC 8E0207E8 */ lw $v0, 0x07E8($s0) ## 000007E8 -.L80862CF0: -/* 036A0 80862CF0 8FA40054 */ lw $a0, 0x0054($sp) -/* 036A4 80862CF4 1440002B */ bne $v0, $zero, .L80862DA4 -/* 036A8 80862CF8 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 036AC 80862CFC 0C00CEAE */ jal Actor_OtherIsTargeted -/* 036B0 80862D00 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 036B4 80862D04 10400005 */ beq $v0, $zero, .L80862D1C -/* 036B8 80862D08 8FA40054 */ lw $a0, 0x0054($sp) -/* 036BC 80862D0C 0C21801A */ jal func_80860068 -/* 036C0 80862D10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 036C4 80862D14 10000025 */ beq $zero, $zero, .L80862DAC -/* 036C8 80862D18 8FBF0024 */ lw $ra, 0x0024($sp) -.L80862D1C: -/* 036CC 80862D1C 0C00CEA1 */ jal Actor_IsTargeted -/* 036D0 80862D20 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 036D4 80862D24 1040000A */ beq $v0, $zero, .L80862D50 -/* 036D8 80862D28 8FAB0048 */ lw $t3, 0x0048($sp) -/* 036DC 80862D2C 8FA40054 */ lw $a0, 0x0054($sp) -/* 036E0 80862D30 0C21907A */ jal func_808641E8 -/* 036E4 80862D34 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 036E8 80862D38 1440001B */ bne $v0, $zero, .L80862DA8 -/* 036EC 80862D3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 036F0 80862D40 0C217EAC */ jal func_8085FAB0 -/* 036F4 80862D44 8FA50054 */ lw $a1, 0x0054($sp) -/* 036F8 80862D48 10000018 */ beq $zero, $zero, .L80862DAC -/* 036FC 80862D4C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80862D50: -/* 03700 80862D50 816C0151 */ lb $t4, 0x0151($t3) ## 00000151 -/* 03704 80862D54 8FAD0054 */ lw $t5, 0x0054($sp) -/* 03708 80862D58 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 0370C 80862D5C 1180000D */ beq $t4, $zero, .L80862D94 -/* 03710 80862D60 01CD7021 */ addu $t6, $t6, $t5 -/* 03714 80862D64 8DCE1DE4 */ lw $t6, 0x1DE4($t6) ## 00011DE4 -/* 03718 80862D68 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 0371C 80862D6C 11E00005 */ beq $t7, $zero, .L80862D84 -/* 03720 80862D70 00000000 */ nop -/* 03724 80862D74 0C21801A */ jal func_80860068 -/* 03728 80862D78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0372C 80862D7C 1000000B */ beq $zero, $zero, .L80862DAC -/* 03730 80862D80 8FBF0024 */ lw $ra, 0x0024($sp) -.L80862D84: -/* 03734 80862D84 0C21810E */ jal func_80860438 -/* 03738 80862D88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0373C 80862D8C 10000007 */ beq $zero, $zero, .L80862DAC -/* 03740 80862D90 8FBF0024 */ lw $ra, 0x0024($sp) -.L80862D94: -/* 03744 80862D94 0C21810E */ jal func_80860438 -/* 03748 80862D98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0374C 80862D9C 10000003 */ beq $zero, $zero, .L80862DAC -/* 03750 80862DA0 8FBF0024 */ lw $ra, 0x0024($sp) -.L80862DA4: -/* 03754 80862DA4 AE1807E8 */ sw $t8, 0x07E8($s0) ## 000007E8 -.L80862DA8: -/* 03758 80862DA8 8FBF0024 */ lw $ra, 0x0024($sp) -.L80862DAC: -/* 0375C 80862DAC 8FB00020 */ lw $s0, 0x0020($sp) -/* 03760 80862DB0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 03764 80862DB4 03E00008 */ jr $ra -/* 03768 80862DB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862DBC.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862DBC.s deleted file mode 100644 index 10df254fa4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862DBC.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_80862DBC -/* 0376C 80862DBC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03770 80862DC0 AFBF001C */ sw $ra, 0x001C($sp) -/* 03774 80862DC4 AFB00018 */ sw $s0, 0x0018($sp) -/* 03778 80862DC8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0377C 80862DCC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03780 80862DD0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 03784 80862DD4 2405383A */ addiu $a1, $zero, 0x383A ## $a1 = 0000383A -/* 03788 80862DD8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 0378C 80862DDC A20E07C8 */ sb $t6, 0x07C8($s0) ## 000007C8 -/* 03790 80862DE0 8FA60024 */ lw $a2, 0x0024($sp) -/* 03794 80862DE4 260407F0 */ addiu $a0, $s0, 0x07F0 ## $a0 = 000007F0 -/* 03798 80862DE8 0C00CB89 */ jal BodyBreak_Alloc -/* 0379C 80862DEC 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 037A0 80862DF0 820F0808 */ lb $t7, 0x0808($s0) ## 00000808 -/* 037A4 80862DF4 A6000014 */ sh $zero, 0x0014($s0) ## 00000014 -/* 037A8 80862DF8 05E20008 */ bltzl $t7, .L80862E1C -/* 037AC 80862DFC 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 -/* 037B0 80862E00 0C009AC3 */ jal Effect_GetByIndex -/* 037B4 80862E04 8E04080C */ lw $a0, 0x080C($s0) ## 0000080C -/* 037B8 80862E08 0C008048 */ jal EffectBlure_AddSpace -/* 037BC 80862E0C 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 037C0 80862E10 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF -/* 037C4 80862E14 A2180808 */ sb $t8, 0x0808($s0) ## 00000808 -/* 037C8 80862E18 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 -.L80862E1C: -/* 037CC 80862E1C 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -/* 037D0 80862E20 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 037D4 80862E24 03214024 */ and $t0, $t9, $at -/* 037D8 80862E28 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 037DC 80862E2C 15210006 */ bne $t1, $at, .L80862E48 -/* 037E0 80862E30 AE080004 */ sw $t0, 0x0004($s0) ## 00000004 -/* 037E4 80862E34 8FA40024 */ lw $a0, 0x0024($sp) -/* 037E8 80862E38 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 037EC 80862E3C 24070006 */ addiu $a3, $zero, 0x0006 ## $a3 = 00000006 -/* 037F0 80862E40 0C00CDD2 */ jal Actor_ChangeCategory - -/* 037F4 80862E44 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 -.L80862E48: -/* 037F8 80862E48 3C058086 */ lui $a1, %hi(func_80862E6C) ## $a1 = 80860000 -/* 037FC 80862E4C 24A52E6C */ addiu $a1, $a1, %lo(func_80862E6C) ## $a1 = 80862E6C -/* 03800 80862E50 0C217D94 */ jal EnTest_SetupAction -/* 03804 80862E54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03808 80862E58 8FBF001C */ lw $ra, 0x001C($sp) -/* 0380C 80862E5C 8FB00018 */ lw $s0, 0x0018($sp) -/* 03810 80862E60 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03814 80862E64 03E00008 */ jr $ra -/* 03818 80862E68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862E6C.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862E6C.s deleted file mode 100644 index aaf9815634..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862E6C.s +++ /dev/null @@ -1,92 +0,0 @@ -glabel func_80862E6C -/* 0381C 80862E6C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03820 80862E70 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03824 80862E74 AFB00020 */ sw $s0, 0x0020($sp) -/* 03828 80862E78 AFA5002C */ sw $a1, 0x002C($sp) -/* 0382C 80862E7C 8C8E011C */ lw $t6, 0x011C($a0) ## 0000011C -/* 03830 80862E80 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03834 80862E84 260507F0 */ addiu $a1, $s0, 0x07F0 ## $a1 = 000007F0 -/* 03838 80862E88 55C00012 */ bnel $t6, $zero, .L80862ED4 -/* 0383C 80862E8C 86190014 */ lh $t9, 0x0014($s0) ## 00000014 -/* 03840 80862E90 848F0014 */ lh $t7, 0x0014($a0) ## 00000014 -/* 03844 80862E94 55E00004 */ bnel $t7, $zero, .L80862EA8 -/* 03848 80862E98 8607001C */ lh $a3, 0x001C($s0) ## 0000001C -/* 0384C 80862E9C 849807F8 */ lh $t8, 0x07F8($a0) ## 000007F8 -/* 03850 80862EA0 A4980014 */ sh $t8, 0x0014($a0) ## 00000014 -/* 03854 80862EA4 8607001C */ lh $a3, 0x001C($s0) ## 0000001C -.L80862EA8: -/* 03858 80862EA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0385C 80862EAC 8FA6002C */ lw $a2, 0x002C($sp) -/* 03860 80862EB0 24E70008 */ addiu $a3, $a3, 0x0008 ## $a3 = 00000008 -/* 03864 80862EB4 00073C00 */ sll $a3, $a3, 16 -/* 03868 80862EB8 0C00CC17 */ jal BodyBreak_SpawnParts -/* 0386C 80862EBC 00073C03 */ sra $a3, $a3, 16 -/* 03870 80862EC0 50400035 */ beql $v0, $zero, .L80862F98 -/* 03874 80862EC4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03878 80862EC8 10000032 */ beq $zero, $zero, .L80862F94 -/* 0387C 80862ECC AE10011C */ sw $s0, 0x011C($s0) ## 0000011C -/* 03880 80862ED0 86190014 */ lh $t9, 0x0014($s0) ## 00000014 -.L80862ED4: -/* 03884 80862ED4 57200017 */ bnel $t9, $zero, .L80862F34 -/* 03888 80862ED8 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 0388C 80862EDC 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -/* 03890 80862EE0 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A -/* 03894 80862EE4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 03898 80862EE8 15210004 */ bne $t1, $at, .L80862EFC -/* 0389C 80862EEC A20800AF */ sb $t0, 0x00AF($s0) ## 000000AF -/* 038A0 80862EF0 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 038A4 80862EF4 10000006 */ beq $zero, $zero, .L80862F10 -/* 038A8 80862EF8 A60A001C */ sh $t2, 0x001C($s0) ## 0000001C -.L80862EFC: -/* 038AC 80862EFC 8FA4002C */ lw $a0, 0x002C($sp) -/* 038B0 80862F00 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 038B4 80862F04 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 038B8 80862F08 0C00CDD2 */ jal Actor_ChangeCategory - -/* 038BC 80862F0C 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 -.L80862F10: -/* 038C0 80862F10 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 -/* 038C4 80862F14 AE00011C */ sw $zero, 0x011C($s0) ## 0000011C -/* 038C8 80862F18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 038CC 80862F1C 358D0001 */ ori $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 038D0 80862F20 0C218653 */ jal func_8086194C -/* 038D4 80862F24 AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 -/* 038D8 80862F28 1000001B */ beq $zero, $zero, .L80862F98 -/* 038DC 80862F2C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 038E0 80862F30 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -.L80862F34: -/* 038E4 80862F34 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 038E8 80862F38 8FA4002C */ lw $a0, 0x002C($sp) -/* 038EC 80862F3C 15C10015 */ bne $t6, $at, .L80862F94 -/* 038F0 80862F40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 038F4 80862F44 3C0145FA */ lui $at, 0x45FA ## $at = 45FA0000 -/* 038F8 80862F48 44812000 */ mtc1 $at, $f4 ## $f4 = 8000.00 -/* 038FC 80862F4C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 03900 80862F50 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 03904 80862F54 0C00D4FD */ jal Actor_FindNearby - -/* 03908 80862F58 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 0390C 80862F5C 1440000D */ bne $v0, $zero, .L80862F94 -/* 03910 80862F60 8FA4002C */ lw $a0, 0x002C($sp) -/* 03914 80862F64 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03918 80862F68 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 0391C 80862F6C 0C007E50 */ jal Item_DropCollectibleRandom - -/* 03920 80862F70 240700D0 */ addiu $a3, $zero, 0x00D0 ## $a3 = 000000D0 -/* 03924 80862F74 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 -/* 03928 80862F78 10400004 */ beq $v0, $zero, .L80862F8C -/* 0392C 80862F7C 00000000 */ nop -/* 03930 80862F80 844F0018 */ lh $t7, 0x0018($v0) ## 00000018 -/* 03934 80862F84 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 03938 80862F88 A4580018 */ sh $t8, 0x0018($v0) ## 00000018 -.L80862F8C: -/* 0393C 80862F8C 0C00B55C */ jal Actor_Kill - -/* 03940 80862F90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80862F94: -/* 03944 80862F94 8FBF0024 */ lw $ra, 0x0024($sp) -.L80862F98: -/* 03948 80862F98 8FB00020 */ lw $s0, 0x0020($sp) -/* 0394C 80862F9C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03950 80862FA0 03E00008 */ jr $ra -/* 03954 80862FA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862FA8.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862FA8.s deleted file mode 100644 index 61ad94f76a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862FA8.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80862FA8 -/* 03958 80862FA8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0395C 80862FAC AFA5001C */ sw $a1, 0x001C($sp) -/* 03960 80862FB0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03964 80862FB4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 03968 80862FB8 3C050600 */ lui $a1, %hi(D_06001420) ## $a1 = 06000000 -/* 0396C 80862FBC 24A51420 */ addiu $a1, $a1, %lo(D_06001420) ## $a1 = 06001420 -/* 03970 80862FC0 AFA60018 */ sw $a2, 0x0018($sp) -/* 03974 80862FC4 0C02947A */ jal Animation_PlayOnce -/* 03978 80862FC8 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 0397C 80862FCC 8FA40018 */ lw $a0, 0x0018($sp) -/* 03980 80862FD0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 03984 80862FD4 2405383B */ addiu $a1, $zero, 0x383B ## $a1 = 0000383B -/* 03988 80862FD8 8FA60018 */ lw $a2, 0x0018($sp) -/* 0398C 80862FDC 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 03990 80862FE0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 03994 80862FE4 8CCE0004 */ lw $t6, 0x0004($a2) ## 00000004 -/* 03998 80862FE8 84D8001C */ lh $t8, 0x001C($a2) ## 0000001C -/* 0399C 80862FEC A0C007DE */ sb $zero, 0x07DE($a2) ## 000007DE -/* 039A0 80862FF0 01C17824 */ and $t7, $t6, $at -/* 039A4 80862FF4 2B010004 */ slti $at, $t8, 0x0004 -/* 039A8 80862FF8 ACCF0004 */ sw $t7, 0x0004($a2) ## 00000004 -/* 039AC 80862FFC A0C00114 */ sb $zero, 0x0114($a2) ## 00000114 -/* 039B0 80863000 10200009 */ beq $at, $zero, .L80863028 -/* 039B4 80863004 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 -/* 039B8 80863008 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 -/* 039BC 8086300C 3C058086 */ lui $a1, %hi(func_80863044) ## $a1 = 80860000 -/* 039C0 80863010 A0D907C8 */ sb $t9, 0x07C8($a2) ## 000007C8 -/* 039C4 80863014 24A53044 */ addiu $a1, $a1, %lo(func_80863044) ## $a1 = 80863044 -/* 039C8 80863018 0C217D94 */ jal EnTest_SetupAction -/* 039CC 8086301C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 039D0 80863020 10000005 */ beq $zero, $zero, .L80863038 -/* 039D4 80863024 8FBF0014 */ lw $ra, 0x0014($sp) -.L80863028: -/* 039D8 80863028 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 039DC 8086302C 0C218B6F */ jal func_80862DBC -/* 039E0 80863030 8FA5001C */ lw $a1, 0x001C($sp) -/* 039E4 80863034 8FBF0014 */ lw $ra, 0x0014($sp) -.L80863038: -/* 039E8 80863038 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 039EC 8086303C 03E00008 */ jr $ra -/* 039F0 80863040 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863044.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863044.s deleted file mode 100644 index aedfd644c0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863044.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_80863044 -/* 039F4 80863044 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 039F8 80863048 AFB00018 */ sw $s0, 0x0018($sp) -/* 039FC 8086304C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03A00 80863050 AFBF001C */ sw $ra, 0x001C($sp) -/* 03A04 80863054 AFA50024 */ sw $a1, 0x0024($sp) -/* 03A08 80863058 0C02927F */ jal SkelAnime_Update - -/* 03A0C 8086305C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 03A10 80863060 50400015 */ beql $v0, $zero, .L808630B8 -/* 03A14 80863064 C60A01A0 */ lwc1 $f10, 0x01A0($s0) ## 000001A0 -/* 03A18 80863068 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 03A1C 8086306C 00000000 */ nop -/* 03A20 80863070 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 03A24 80863074 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 03A28 80863078 24180007 */ addiu $t8, $zero, 0x0007 ## $t8 = 00000007 -/* 03A2C 8086307C 3C058086 */ lui $a1, %hi(func_808633E8) ## $a1 = 80860000 -/* 03A30 80863080 46020102 */ mul.s $f4, $f0, $f2 -/* 03A34 80863084 A21807C8 */ sb $t8, 0x07C8($s0) ## 000007C8 -/* 03A38 80863088 24A533E8 */ addiu $a1, $a1, %lo(func_808633E8) ## $a1 = 808633E8 -/* 03A3C 8086308C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03A40 80863090 46022180 */ add.s $f6, $f4, $f2 -/* 03A44 80863094 4600320D */ trunc.w.s $f8, $f6 -/* 03A48 80863098 440F4000 */ mfc1 $t7, $f8 -/* 03A4C 8086309C 0C217D94 */ jal EnTest_SetupAction -/* 03A50 808630A0 AE0F07E8 */ sw $t7, 0x07E8($s0) ## 000007E8 -/* 03A54 808630A4 260407F0 */ addiu $a0, $s0, 0x07F0 ## $a0 = 000007F0 -/* 03A58 808630A8 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 03A5C 808630AC 0C00CB89 */ jal BodyBreak_Alloc -/* 03A60 808630B0 8FA60024 */ lw $a2, 0x0024($sp) -/* 03A64 808630B4 C60A01A0 */ lwc1 $f10, 0x01A0($s0) ## 000001A0 -.L808630B8: -/* 03A68 808630B8 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 03A6C 808630BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03A70 808630C0 4600540D */ trunc.w.s $f16, $f10 -/* 03A74 808630C4 44088000 */ mfc1 $t0, $f16 -/* 03A78 808630C8 00000000 */ nop -/* 03A7C 808630CC 55010004 */ bnel $t0, $at, .L808630E0 -/* 03A80 808630D0 8FBF001C */ lw $ra, 0x001C($sp) -/* 03A84 808630D4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 03A88 808630D8 2405387A */ addiu $a1, $zero, 0x387A ## $a1 = 0000387A -/* 03A8C 808630DC 8FBF001C */ lw $ra, 0x001C($sp) -.L808630E0: -/* 03A90 808630E0 8FB00018 */ lw $s0, 0x0018($sp) -/* 03A94 808630E4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03A98 808630E8 03E00008 */ jr $ra -/* 03A9C 808630EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808630F0.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808630F0.s deleted file mode 100644 index 1c833d8f80..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808630F0.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_808630F0 -/* 03AA0 808630F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03AA4 808630F4 AFA5001C */ sw $a1, 0x001C($sp) -/* 03AA8 808630F8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03AAC 808630FC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 03AB0 80863100 3C050601 */ lui $a1, %hi(D_06009A90) ## $a1 = 06010000 -/* 03AB4 80863104 24A59A90 */ addiu $a1, $a1, %lo(D_06009A90) ## $a1 = 06009A90 -/* 03AB8 80863108 AFA60018 */ sw $a2, 0x0018($sp) -/* 03ABC 8086310C 0C02947A */ jal Animation_PlayOnce -/* 03AC0 80863110 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 03AC4 80863114 8FA40018 */ lw $a0, 0x0018($sp) -/* 03AC8 80863118 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 03ACC 8086311C 2405383B */ addiu $a1, $zero, 0x383B ## $a1 = 0000383B -/* 03AD0 80863120 8FA60018 */ lw $a2, 0x0018($sp) -/* 03AD4 80863124 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 03AD8 80863128 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 -/* 03ADC 8086312C 84CF001C */ lh $t7, 0x001C($a2) ## 0000001C -/* 03AE0 80863130 A0CE07C8 */ sb $t6, 0x07C8($a2) ## 000007C8 -/* 03AE4 80863134 A0C00114 */ sb $zero, 0x0114($a2) ## 00000114 -/* 03AE8 80863138 29E10004 */ slti $at, $t7, 0x0004 -/* 03AEC 8086313C A0C007DE */ sb $zero, 0x07DE($a2) ## 000007DE -/* 03AF0 80863140 1020000B */ beq $at, $zero, .L80863170 -/* 03AF4 80863144 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 -/* 03AF8 80863148 8CD80004 */ lw $t8, 0x0004($a2) ## 00000004 -/* 03AFC 8086314C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 03B00 80863150 3C058086 */ lui $a1, %hi(func_8086318C) ## $a1 = 80860000 -/* 03B04 80863154 0301C824 */ and $t9, $t8, $at -/* 03B08 80863158 ACD90004 */ sw $t9, 0x0004($a2) ## 00000004 -/* 03B0C 8086315C 24A5318C */ addiu $a1, $a1, %lo(func_8086318C) ## $a1 = 8086318C -/* 03B10 80863160 0C217D94 */ jal EnTest_SetupAction -/* 03B14 80863164 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 03B18 80863168 10000005 */ beq $zero, $zero, .L80863180 -/* 03B1C 8086316C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80863170: -/* 03B20 80863170 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 03B24 80863174 0C218B6F */ jal func_80862DBC -/* 03B28 80863178 8FA5001C */ lw $a1, 0x001C($sp) -/* 03B2C 8086317C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80863180: -/* 03B30 80863180 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03B34 80863184 03E00008 */ jr $ra -/* 03B38 80863188 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086318C.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086318C.s deleted file mode 100644 index d83af35dda..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086318C.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_8086318C -/* 03B3C 8086318C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03B40 80863190 AFB00018 */ sw $s0, 0x0018($sp) -/* 03B44 80863194 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03B48 80863198 AFBF001C */ sw $ra, 0x001C($sp) -/* 03B4C 8086319C AFA50024 */ sw $a1, 0x0024($sp) -/* 03B50 808631A0 0C02927F */ jal SkelAnime_Update - -/* 03B54 808631A4 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 03B58 808631A8 50400015 */ beql $v0, $zero, .L80863200 -/* 03B5C 808631AC C60A01A0 */ lwc1 $f10, 0x01A0($s0) ## 000001A0 -/* 03B60 808631B0 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 03B64 808631B4 00000000 */ nop -/* 03B68 808631B8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 03B6C 808631BC 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 03B70 808631C0 24180007 */ addiu $t8, $zero, 0x0007 ## $t8 = 00000007 -/* 03B74 808631C4 3C058086 */ lui $a1, %hi(func_808633E8) ## $a1 = 80860000 -/* 03B78 808631C8 46020102 */ mul.s $f4, $f0, $f2 -/* 03B7C 808631CC A21807C8 */ sb $t8, 0x07C8($s0) ## 000007C8 -/* 03B80 808631D0 24A533E8 */ addiu $a1, $a1, %lo(func_808633E8) ## $a1 = 808633E8 -/* 03B84 808631D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03B88 808631D8 46022180 */ add.s $f6, $f4, $f2 -/* 03B8C 808631DC 4600320D */ trunc.w.s $f8, $f6 -/* 03B90 808631E0 440F4000 */ mfc1 $t7, $f8 -/* 03B94 808631E4 0C217D94 */ jal EnTest_SetupAction -/* 03B98 808631E8 AE0F07E8 */ sw $t7, 0x07E8($s0) ## 000007E8 -/* 03B9C 808631EC 260407F0 */ addiu $a0, $s0, 0x07F0 ## $a0 = 000007F0 -/* 03BA0 808631F0 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 03BA4 808631F4 0C00CB89 */ jal BodyBreak_Alloc -/* 03BA8 808631F8 8FA60024 */ lw $a2, 0x0024($sp) -/* 03BAC 808631FC C60A01A0 */ lwc1 $f10, 0x01A0($s0) ## 000001A0 -.L80863200: -/* 03BB0 80863200 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 03BB4 80863204 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03BB8 80863208 4600540D */ trunc.w.s $f16, $f10 -/* 03BBC 8086320C 44028000 */ mfc1 $v0, $f16 -/* 03BC0 80863210 00000000 */ nop -/* 03BC4 80863214 10410003 */ beq $v0, $at, .L80863224 -/* 03BC8 80863218 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 03BCC 8086321C 54410004 */ bnel $v0, $at, .L80863230 -/* 03BD0 80863220 8FBF001C */ lw $ra, 0x001C($sp) -.L80863224: -/* 03BD4 80863224 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 03BD8 80863228 2405387A */ addiu $a1, $zero, 0x387A ## $a1 = 0000387A -/* 03BDC 8086322C 8FBF001C */ lw $ra, 0x001C($sp) -.L80863230: -/* 03BE0 80863230 8FB00018 */ lw $s0, 0x0018($sp) -/* 03BE4 80863234 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03BE8 80863238 03E00008 */ jr $ra -/* 03BEC 8086323C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863240.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863240.s deleted file mode 100644 index 63212a0421..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863240.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80863240 -/* 03BF0 80863240 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03BF4 80863244 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03BF8 80863248 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 03BFC 8086324C 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 03C00 80863250 C48601A0 */ lwc1 $f6, 0x01A0($a0) ## 000001A0 -/* 03C04 80863254 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 03C08 80863258 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 03C0C 8086325C 240F0013 */ addiu $t7, $zero, 0x0013 ## $t7 = 00000013 -/* 03C10 80863260 3C058086 */ lui $a1, %hi(func_80863294) ## $a1 = 80860000 -/* 03C14 80863264 A0800808 */ sb $zero, 0x0808($a0) ## 00000808 -/* 03C18 80863268 A08E01BD */ sb $t6, 0x01BD($a0) ## 000001BD -/* 03C1C 8086326C A08F07C8 */ sb $t7, 0x07C8($a0) ## 000007C8 -/* 03C20 80863270 24A53294 */ addiu $a1, $a1, %lo(func_80863294) ## $a1 = 80863294 -/* 03C24 80863274 E48401A4 */ swc1 $f4, 0x01A4($a0) ## 000001A4 -/* 03C28 80863278 E4860194 */ swc1 $f6, 0x0194($a0) ## 00000194 -/* 03C2C 8086327C 0C217D94 */ jal EnTest_SetupAction -/* 03C30 80863280 E4880198 */ swc1 $f8, 0x0198($a0) ## 00000198 -/* 03C34 80863284 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03C38 80863288 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03C3C 8086328C 03E00008 */ jr $ra -/* 03C40 80863290 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863294.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863294.s deleted file mode 100644 index f4a06a1f95..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863294.s +++ /dev/null @@ -1,64 +0,0 @@ -.late_rodata -glabel D_808647D8 - .float 0.7 - -.text -glabel func_80863294 -/* 03C44 80863294 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03C48 80863298 AFB00018 */ sw $s0, 0x0018($sp) -/* 03C4C 8086329C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03C50 808632A0 AFBF001C */ sw $ra, 0x001C($sp) -/* 03C54 808632A4 AFA50024 */ sw $a1, 0x0024($sp) -/* 03C58 808632A8 0C02927F */ jal SkelAnime_Update - -/* 03C5C 808632AC 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 03C60 808632B0 50400027 */ beql $v0, $zero, .L80863350 -/* 03C64 808632B4 8FBF001C */ lw $ra, 0x001C($sp) -/* 03C68 808632B8 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 03C6C 808632BC 00000000 */ nop -/* 03C70 808632C0 3C018086 */ lui $at, %hi(D_808647D8) ## $at = 80860000 -/* 03C74 808632C4 C42447D8 */ lwc1 $f4, %lo(D_808647D8)($at) -/* 03C78 808632C8 8FA50024 */ lw $a1, 0x0024($sp) -/* 03C7C 808632CC 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 03C80 808632D0 4600203C */ c.lt.s $f4, $f0 -/* 03C84 808632D4 0305C021 */ addu $t8, $t8, $a1 -/* 03C88 808632D8 4502000F */ bc1fl .L80863318 -/* 03C8C 808632DC 8F181DE4 */ lw $t8, 0x1DE4($t8) ## 00011DE4 -/* 03C90 808632E0 0C21801A */ jal func_80860068 -/* 03C94 808632E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03C98 808632E8 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 03C9C 808632EC 00000000 */ nop -/* 03CA0 808632F0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 03CA4 808632F4 44811000 */ mtc1 $at, $f2 ## $f2 = 5.00 -/* 03CA8 808632F8 00000000 */ nop -/* 03CAC 808632FC 46020182 */ mul.s $f6, $f0, $f2 -/* 03CB0 80863300 46023200 */ add.s $f8, $f6, $f2 -/* 03CB4 80863304 4600428D */ trunc.w.s $f10, $f8 -/* 03CB8 80863308 440F5000 */ mfc1 $t7, $f10 -/* 03CBC 8086330C 1000000F */ beq $zero, $zero, .L8086334C -/* 03CC0 80863310 AE0F07E8 */ sw $t7, 0x07E8($s0) ## 000007E8 -/* 03CC4 80863314 8F181DE4 */ lw $t8, 0x1DE4($t8) ## 00001DE4 -.L80863318: -/* 03CC8 80863318 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 03CCC 8086331C 13200009 */ beq $t9, $zero, .L80863344 -/* 03CD0 80863320 00000000 */ nop -/* 03CD4 80863324 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -/* 03CD8 80863328 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 03CDC 8086332C 11010005 */ beq $t0, $at, .L80863344 -/* 03CE0 80863330 00000000 */ nop -/* 03CE4 80863334 0C218653 */ jal func_8086194C -/* 03CE8 80863338 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03CEC 8086333C 10000004 */ beq $zero, $zero, .L80863350 -/* 03CF0 80863340 8FBF001C */ lw $ra, 0x001C($sp) -.L80863344: -/* 03CF4 80863344 0C2189F1 */ jal func_808627C4 -/* 03CF8 80863348 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8086334C: -/* 03CFC 8086334C 8FBF001C */ lw $ra, 0x001C($sp) -.L80863350: -/* 03D00 80863350 8FB00018 */ lw $s0, 0x0018($sp) -/* 03D04 80863354 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03D08 80863358 03E00008 */ jr $ra -/* 03D0C 8086335C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863360.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863360.s deleted file mode 100644 index 04ba6260a7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863360.s +++ /dev/null @@ -1,45 +0,0 @@ -.late_rodata -glabel D_808647DC - .float 0.015 -glabel D_808647E0 - .float 0.002 - -.text -glabel func_80863360 -/* 03D10 80863360 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03D14 80863364 AFA5001C */ sw $a1, 0x001C($sp) -/* 03D18 80863368 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 03D1C 8086336C AFBF0014 */ sw $ra, 0x0014($sp) -/* 03D20 80863370 AFA40018 */ sw $a0, 0x0018($sp) -/* 03D24 80863374 AFA50018 */ sw $a1, 0x0018($sp) -/* 03D28 80863378 0C02927F */ jal SkelAnime_Update - -/* 03D2C 8086337C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 03D30 80863380 8FA50018 */ lw $a1, 0x0018($sp) -/* 03D34 80863384 3C018086 */ lui $at, %hi(D_808647DC) ## $at = 80860000 -/* 03D38 80863388 C42447DC */ lwc1 $f4, %lo(D_808647DC)($at) -/* 03D3C 8086338C C4A00054 */ lwc1 $f0, 0x0054($a1) ## 00000054 -/* 03D40 80863390 3C018086 */ lui $at, %hi(D_808647E0) ## $at = 80860000 -/* 03D44 80863394 4604003C */ c.lt.s $f0, $f4 -/* 03D48 80863398 00000000 */ nop -/* 03D4C 8086339C 4502000B */ bc1fl .L808633CC -/* 03D50 808633A0 C4A4000C */ lwc1 $f4, 0x000C($a1) ## 0000000C -/* 03D54 808633A4 C42647E0 */ lwc1 $f6, %lo(D_808647E0)($at) -/* 03D58 808633A8 3C014060 */ lui $at, 0x4060 ## $at = 40600000 -/* 03D5C 808633AC 44818000 */ mtc1 $at, $f16 ## $f16 = 3.50 -/* 03D60 808633B0 C4AA000C */ lwc1 $f10, 0x000C($a1) ## 0000000C -/* 03D64 808633B4 46060200 */ add.s $f8, $f0, $f6 -/* 03D68 808633B8 46105481 */ sub.s $f18, $f10, $f16 -/* 03D6C 808633BC E4A80054 */ swc1 $f8, 0x0054($a1) ## 00000054 -/* 03D70 808633C0 10000005 */ beq $zero, $zero, .L808633D8 -/* 03D74 808633C4 E4B20028 */ swc1 $f18, 0x0028($a1) ## 00000028 -/* 03D78 808633C8 C4A4000C */ lwc1 $f4, 0x000C($a1) ## 0000000C -.L808633CC: -/* 03D7C 808633CC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03D80 808633D0 0C218653 */ jal func_8086194C -/* 03D84 808633D4 E4A40028 */ swc1 $f4, 0x0028($a1) ## 00000028 -.L808633D8: -/* 03D88 808633D8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03D8C 808633DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03D90 808633E0 03E00008 */ jr $ra -/* 03D94 808633E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808633E8.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808633E8.s deleted file mode 100644 index ca31a4e6f9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808633E8.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_808633E8 -/* 03D98 808633E8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03D9C 808633EC AFB00018 */ sw $s0, 0x0018($sp) -/* 03DA0 808633F0 AFA50024 */ sw $a1, 0x0024($sp) -/* 03DA4 808633F4 AFBF001C */ sw $ra, 0x001C($sp) -/* 03DA8 808633F8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 03DAC 808633FC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03DB0 80863400 A48E001C */ sh $t6, 0x001C($a0) ## 0000001C -/* 03DB4 80863404 8607001C */ lh $a3, 0x001C($s0) ## 0000001C -/* 03DB8 80863408 8FA60024 */ lw $a2, 0x0024($sp) -/* 03DBC 8086340C 0C00CC17 */ jal BodyBreak_SpawnParts -/* 03DC0 80863410 260507F0 */ addiu $a1, $s0, 0x07F0 ## $a1 = 000007F0 -/* 03DC4 80863414 1040000D */ beq $v0, $zero, .L8086344C -/* 03DC8 80863418 8FA40024 */ lw $a0, 0x0024($sp) -/* 03DCC 8086341C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03DD0 80863420 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 03DD4 80863424 0C007E50 */ jal Item_DropCollectibleRandom - -/* 03DD8 80863428 240700D0 */ addiu $a3, $zero, 0x00D0 ## $a3 = 000000D0 -/* 03DDC 8086342C 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 -/* 03DE0 80863430 10400004 */ beq $v0, $zero, .L80863444 -/* 03DE4 80863434 00000000 */ nop -/* 03DE8 80863438 844F0018 */ lh $t7, 0x0018($v0) ## 00000018 -/* 03DEC 8086343C 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 03DF0 80863440 A4580018 */ sh $t8, 0x0018($v0) ## 00000018 -.L80863444: -/* 03DF4 80863444 0C00B55C */ jal Actor_Kill - -/* 03DF8 80863448 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8086344C: -/* 03DFC 8086344C 8FBF001C */ lw $ra, 0x001C($sp) -/* 03E00 80863450 8FB00018 */ lw $s0, 0x0018($sp) -/* 03E04 80863454 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03E08 80863458 03E00008 */ jr $ra -/* 03E0C 8086345C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863460.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863460.s deleted file mode 100644 index 54aac8d1eb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863460.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_80863460 -/* 03E10 80863460 AFA50004 */ sw $a1, 0x0004($sp) -/* 03E14 80863464 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 -/* 03E18 80863468 848E07D2 */ lh $t6, 0x07D2($a0) ## 000007D2 -/* 03E1C 8086346C 8482008A */ lh $v0, 0x008A($a0) ## 0000008A -/* 03E20 80863470 2409F830 */ addiu $t1, $zero, 0xF830 ## $t1 = FFFFF830 -/* 03E24 80863474 01CF4021 */ addu $t0, $t6, $t7 -/* 03E28 80863478 00481023 */ subu $v0, $v0, $t0 -/* 03E2C 8086347C 00021400 */ sll $v0, $v0, 16 -/* 03E30 80863480 00021403 */ sra $v0, $v0, 16 -/* 03E34 80863484 2841F830 */ slti $at, $v0, 0xF830 -/* 03E38 80863488 10200003 */ beq $at, $zero, .L80863498 -/* 03E3C 8086348C 240DC7D1 */ addiu $t5, $zero, 0xC7D1 ## $t5 = FFFFC7D1 -/* 03E40 80863490 10000007 */ beq $zero, $zero, .L808634B0 -/* 03E44 80863494 A48907D8 */ sh $t1, 0x07D8($a0) ## 000007D8 -.L80863498: -/* 03E48 80863498 284107D1 */ slti $at, $v0, 0x07D1 -/* 03E4C 8086349C 14200003 */ bne $at, $zero, .L808634AC -/* 03E50 808634A0 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 03E54 808634A4 10000001 */ beq $zero, $zero, .L808634AC -/* 03E58 808634A8 240307D0 */ addiu $v1, $zero, 0x07D0 ## $v1 = 000007D0 -.L808634AC: -/* 03E5C 808634AC A48307D8 */ sh $v1, 0x07D8($a0) ## 000007D8 -.L808634B0: -/* 03E60 808634B0 848A07D2 */ lh $t2, 0x07D2($a0) ## 000007D2 -/* 03E64 808634B4 848B07D8 */ lh $t3, 0x07D8($a0) ## 000007D8 -/* 03E68 808634B8 014B6021 */ addu $t4, $t2, $t3 -/* 03E6C 808634BC A48C07D2 */ sh $t4, 0x07D2($a0) ## 000007D2 -/* 03E70 808634C0 848207D2 */ lh $v0, 0x07D2($a0) ## 000007D2 -/* 03E74 808634C4 2841C7D1 */ slti $at, $v0, 0xC7D1 -/* 03E78 808634C8 50200004 */ beql $at, $zero, .L808634DC -/* 03E7C 808634CC 28413830 */ slti $at, $v0, 0x3830 -/* 03E80 808634D0 03E00008 */ jr $ra -/* 03E84 808634D4 A48D07D2 */ sh $t5, 0x07D2($a0) ## 000007D2 -.L808634D8: -/* 03E88 808634D8 28413830 */ slti $at, $v0, 0x3830 -.L808634DC: -/* 03E8C 808634DC 14200003 */ bne $at, $zero, .L808634EC -/* 03E90 808634E0 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 03E94 808634E4 10000001 */ beq $zero, $zero, .L808634EC -/* 03E98 808634E8 2403382F */ addiu $v1, $zero, 0x382F ## $v1 = 0000382F -.L808634EC: -/* 03E9C 808634EC A48307D2 */ sh $v1, 0x07D2($a0) ## 000007D2 -/* 03EA0 808634F0 03E00008 */ jr $ra -/* 03EA4 808634F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808634F8.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808634F8.s deleted file mode 100644 index eea3b0a88c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808634F8.s +++ /dev/null @@ -1,116 +0,0 @@ -glabel func_808634F8 -/* 03EA8 808634F8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03EAC 808634FC AFBF001C */ sw $ra, 0x001C($sp) -/* 03EB0 80863500 AFB00018 */ sw $s0, 0x0018($sp) -/* 03EB4 80863504 AFA50024 */ sw $a1, 0x0024($sp) -/* 03EB8 80863508 908208ED */ lbu $v0, 0x08ED($a0) ## 000008ED -/* 03EBC 8086350C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03EC0 80863510 8CA71C44 */ lw $a3, 0x1C44($a1) ## 00001C44 -/* 03EC4 80863514 304F0080 */ andi $t7, $v0, 0x0080 ## $t7 = 00000000 -/* 03EC8 80863518 11E0000C */ beq $t7, $zero, .L8086354C -/* 03ECC 8086351C 3058FF7F */ andi $t8, $v0, 0xFF7F ## $t8 = 00000000 -/* 03ED0 80863520 90990821 */ lbu $t9, 0x0821($a0) ## 00000821 -/* 03ED4 80863524 908907C8 */ lbu $t1, 0x07C8($a0) ## 000007C8 -/* 03ED8 80863528 A09808ED */ sb $t8, 0x08ED($a0) ## 000008ED -/* 03EDC 8086352C 3328FFFD */ andi $t0, $t9, 0xFFFD ## $t0 = 00000000 -/* 03EE0 80863530 2921000A */ slti $at, $t1, 0x000A -/* 03EE4 80863534 14200052 */ bne $at, $zero, .L80863680 -/* 03EE8 80863538 A0880821 */ sb $t0, 0x0821($a0) ## 00000821 -/* 03EEC 8086353C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 03EF0 80863540 44812000 */ mtc1 $at, $f4 ## $f4 = -4.00 -/* 03EF4 80863544 1000004E */ beq $zero, $zero, .L80863680 -/* 03EF8 80863548 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -.L8086354C: -/* 03EFC 8086354C 92030821 */ lbu $v1, 0x0821($s0) ## 00000821 -/* 03F00 80863550 306A0002 */ andi $t2, $v1, 0x0002 ## $t2 = 00000000 -/* 03F04 80863554 5140004B */ beql $t2, $zero, .L80863684 -/* 03F08 80863558 8FBF001C */ lw $ra, 0x001C($sp) -/* 03F0C 8086355C 920400B1 */ lbu $a0, 0x00B1($s0) ## 000000B1 -/* 03F10 80863560 306BFFFD */ andi $t3, $v1, 0xFFFD ## $t3 = 00000000 -/* 03F14 80863564 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 03F18 80863568 10810045 */ beq $a0, $at, .L80863680 -/* 03F1C 8086356C A20B0821 */ sb $t3, 0x0821($s0) ## 00000821 -/* 03F20 80863570 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 03F24 80863574 10810042 */ beq $a0, $at, .L80863680 -/* 03F28 80863578 26050828 */ addiu $a1, $s0, 0x0828 ## $a1 = 00000828 -/* 03F2C 8086357C 820C0808 */ lb $t4, 0x0808($s0) ## 00000808 -/* 03F30 80863580 A20407E2 */ sb $a0, 0x07E2($s0) ## 000007E2 -/* 03F34 80863584 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03F38 80863588 59800003 */ blezl $t4, .L80863598 -/* 03F3C 8086358C 90ED0845 */ lbu $t5, 0x0845($a3) ## 00000845 -/* 03F40 80863590 A2000808 */ sb $zero, 0x0808($s0) ## 00000808 -/* 03F44 80863594 90ED0845 */ lbu $t5, 0x0845($a3) ## 00000845 -.L80863598: -/* 03F48 80863598 860E008A */ lh $t6, 0x008A($s0) ## 0000008A -/* 03F4C 8086359C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 03F50 808635A0 A20D07DC */ sb $t5, 0x07DC($s0) ## 000007DC -/* 03F54 808635A4 0C00D594 */ jal Actor_SetDropFlag -/* 03F58 808635A8 A60E0032 */ sh $t6, 0x0032($s0) ## 00000032 -/* 03F5C 808635AC 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 -/* 03F60 808635B0 0C03E291 */ jal func_800F8A44 -/* 03F64 808635B4 24053838 */ addiu $a1, $zero, 0x3838 ## $a1 = 00003838 -/* 03F68 808635B8 920200B1 */ lbu $v0, 0x00B1($s0) ## 000000B1 -/* 03F6C 808635BC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03F70 808635C0 10410005 */ beq $v0, $at, .L808635D8 -/* 03F74 808635C4 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 03F78 808635C8 10410003 */ beq $v0, $at, .L808635D8 -/* 03F7C 808635CC 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 03F80 808635D0 1441000B */ bne $v0, $at, .L80863600 -/* 03F84 808635D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L808635D8: -/* 03F88 808635D8 920F07C8 */ lbu $t7, 0x07C8($s0) ## 000007C8 -/* 03F8C 808635DC 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 03F90 808635E0 51E10028 */ beql $t7, $at, .L80863684 -/* 03F94 808635E4 8FBF001C */ lw $ra, 0x001C($sp) -/* 03F98 808635E8 0C00D58A */ jal Actor_ApplyDamage - -/* 03F9C 808635EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03FA0 808635F0 0C21895E */ jal func_80862578 -/* 03FA4 808635F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03FA8 808635F8 10000022 */ beq $zero, $zero, .L80863684 -/* 03FAC 808635FC 8FBF001C */ lw $ra, 0x001C($sp) -.L80863600: -/* 03FB0 80863600 0C00B821 */ jal Actor_IsFacingPlayer -/* 03FB4 80863604 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 03FB8 80863608 10400010 */ beq $v0, $zero, .L8086364C -/* 03FBC 8086360C 00000000 */ nop -/* 03FC0 80863610 0C00D58A */ jal Actor_ApplyDamage - -/* 03FC4 80863614 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03FC8 80863618 14400008 */ bne $v0, $zero, .L8086363C -/* 03FCC 8086361C 8FA40024 */ lw $a0, 0x0024($sp) -/* 03FD0 80863620 0C00CB1F */ jal Enemy_StartFinishingBlow -/* 03FD4 80863624 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03FD8 80863628 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03FDC 8086362C 0C218BEA */ jal func_80862FA8 -/* 03FE0 80863630 8FA50024 */ lw $a1, 0x0024($sp) -/* 03FE4 80863634 10000013 */ beq $zero, $zero, .L80863684 -/* 03FE8 80863638 8FBF001C */ lw $ra, 0x001C($sp) -.L8086363C: -/* 03FEC 8086363C 0C218855 */ jal func_80862154 -/* 03FF0 80863640 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03FF4 80863644 1000000F */ beq $zero, $zero, .L80863684 -/* 03FF8 80863648 8FBF001C */ lw $ra, 0x001C($sp) -.L8086364C: -/* 03FFC 8086364C 0C00D58A */ jal Actor_ApplyDamage - -/* 04000 80863650 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04004 80863654 14400008 */ bne $v0, $zero, .L80863678 -/* 04008 80863658 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0400C 8086365C 0C218C3C */ jal func_808630F0 -/* 04010 80863660 8FA50024 */ lw $a1, 0x0024($sp) -/* 04014 80863664 8FA40024 */ lw $a0, 0x0024($sp) -/* 04018 80863668 0C00CB1F */ jal Enemy_StartFinishingBlow -/* 0401C 8086366C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04020 80863670 10000004 */ beq $zero, $zero, .L80863684 -/* 04024 80863674 8FBF001C */ lw $ra, 0x001C($sp) -.L80863678: -/* 04028 80863678 0C2188E6 */ jal func_80862398 -/* 0402C 8086367C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80863680: -/* 04030 80863680 8FBF001C */ lw $ra, 0x001C($sp) -.L80863684: -/* 04034 80863684 8FB00018 */ lw $s0, 0x0018($sp) -/* 04038 80863688 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0403C 8086368C 03E00008 */ jr $ra -/* 04040 80863690 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863AB8.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863AB8.s deleted file mode 100644 index 143d5c1062..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863AB8.s +++ /dev/null @@ -1,150 +0,0 @@ -.rdata -glabel D_80864700 - .asciz "../z_en_test.c" - .balign 4 - -glabel D_80864710 - .asciz "../z_en_test.c" - .balign 4 - -.text -glabel func_80863AB8 -/* 04468 80863AB8 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 0446C 80863ABC 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 04470 80863AC0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04474 80863AC4 AFA40048 */ sw $a0, 0x0048($sp) -/* 04478 80863AC8 AFA60050 */ sw $a2, 0x0050($sp) -/* 0447C 80863ACC 14A10010 */ bne $a1, $at, .L80863B10 -/* 04480 80863AD0 AFA70054 */ sw $a3, 0x0054($sp) -/* 04484 80863AD4 8FA20058 */ lw $v0, 0x0058($sp) -/* 04488 80863AD8 8FA3005C */ lw $v1, 0x005C($sp) -/* 0448C 80863ADC 844E0000 */ lh $t6, 0x0000($v0) ## 00000000 -/* 04490 80863AE0 846F07D2 */ lh $t7, 0x07D2($v1) ## 000007D2 -/* 04494 80863AE4 84590002 */ lh $t9, 0x0002($v0) ## 00000002 -/* 04498 80863AE8 844B0004 */ lh $t3, 0x0004($v0) ## 00000004 -/* 0449C 80863AEC 01CFC021 */ addu $t8, $t6, $t7 -/* 044A0 80863AF0 A4580000 */ sh $t8, 0x0000($v0) ## 00000000 -/* 044A4 80863AF4 846907D0 */ lh $t1, 0x07D0($v1) ## 000007D0 -/* 044A8 80863AF8 03295023 */ subu $t2, $t9, $t1 -/* 044AC 80863AFC A44A0002 */ sh $t2, 0x0002($v0) ## 00000002 -/* 044B0 80863B00 846C07D4 */ lh $t4, 0x07D4($v1) ## 000007D4 -/* 044B4 80863B04 016C6821 */ addu $t5, $t3, $t4 -/* 044B8 80863B08 1000005E */ beq $zero, $zero, .L80863C84 -/* 044BC 80863B0C A44D0004 */ sh $t5, 0x0004($v0) ## 00000004 -.L80863B10: -/* 044C0 80863B10 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 044C4 80863B14 14A1005B */ bne $a1, $at, .L80863C84 -/* 044C8 80863B18 8FAE0048 */ lw $t6, 0x0048($sp) -/* 044CC 80863B1C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 044D0 80863B20 3C068086 */ lui $a2, %hi(D_80864700) ## $a2 = 80860000 -/* 044D4 80863B24 24C64700 */ addiu $a2, $a2, %lo(D_80864700) ## $a2 = 80864700 -/* 044D8 80863B28 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFE4 -/* 044DC 80863B2C 24070DFE */ addiu $a3, $zero, 0x0DFE ## $a3 = 00000DFE -/* 044E0 80863B30 0C031AB1 */ jal Graph_OpenDisps -/* 044E4 80863B34 AFA5003C */ sw $a1, 0x003C($sp) -/* 044E8 80863B38 8FA8003C */ lw $t0, 0x003C($sp) -/* 044EC 80863B3C 3C18E700 */ lui $t8, 0xE700 ## $t8 = E7000000 -/* 044F0 80863B40 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 -/* 044F4 80863B44 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 044F8 80863B48 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 044FC 80863B4C 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 -/* 04500 80863B50 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 04504 80863B54 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 04508 80863B58 AC600004 */ sw $zero, 0x0004($v1) ## 00000004 -/* 0450C 80863B5C 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 04510 80863B60 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 -/* 04514 80863B64 AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 -/* 04518 80863B68 AC690000 */ sw $t1, 0x0000($v1) ## 00000000 -/* 0451C 80863B6C 8FA20048 */ lw $v0, 0x0048($sp) -/* 04520 80863B70 00411021 */ addu $v0, $v0, $at -/* 04524 80863B74 8C441DE4 */ lw $a0, 0x1DE4($v0) ## 00001DE4 -/* 04528 80863B78 AFA2001C */ sw $v0, 0x001C($sp) -/* 0452C 80863B7C AFA30024 */ sw $v1, 0x0024($sp) -/* 04530 80863B80 00800821 */ addu $at, $a0, $zero -/* 04534 80863B84 00042140 */ sll $a0, $a0, 5 -/* 04538 80863B88 00812023 */ subu $a0, $a0, $at -/* 0453C 80863B8C 00042080 */ sll $a0, $a0, 2 -/* 04540 80863B90 00812021 */ addu $a0, $a0, $at -/* 04544 80863B94 00042100 */ sll $a0, $a0, 4 -/* 04548 80863B98 00042400 */ sll $a0, $a0, 16 -/* 0454C 80863B9C 0C01DE1C */ jal Math_SinS - ## sins? -/* 04550 80863BA0 00042403 */ sra $a0, $a0, 16 -/* 04554 80863BA4 3C01432F */ lui $at, 0x432F ## $at = 432F0000 -/* 04558 80863BA8 44812000 */ mtc1 $at, $f4 ## $f4 = 175.00 -/* 0455C 80863BAC 8FA2001C */ lw $v0, 0x001C($sp) -/* 04560 80863BB0 240307D0 */ addiu $v1, $zero, 0x07D0 ## $v1 = 000007D0 -/* 04564 80863BB4 46040182 */ mul.s $f6, $f0, $f4 -/* 04568 80863BB8 4600320D */ trunc.w.s $f8, $f6 -/* 0456C 80863BBC 440B4000 */ mfc1 $t3, $f8 -/* 04570 80863BC0 00000000 */ nop -/* 04574 80863BC4 000B6400 */ sll $t4, $t3, 16 -/* 04578 80863BC8 000C6C03 */ sra $t5, $t4, 16 -/* 0457C 80863BCC 05A20012 */ bltzl $t5, .L80863C18 -/* 04580 80863BD0 8C581DE4 */ lw $t8, 0x1DE4($v0) ## 00001DE4 -/* 04584 80863BD4 8C4E1DE4 */ lw $t6, 0x1DE4($v0) ## 00001DE4 -/* 04588 80863BD8 01C30019 */ multu $t6, $v1 -/* 0458C 80863BDC 00002012 */ mflo $a0 -/* 04590 80863BE0 00042400 */ sll $a0, $a0, 16 -/* 04594 80863BE4 0C01DE1C */ jal Math_SinS - ## sins? -/* 04598 80863BE8 00042403 */ sra $a0, $a0, 16 -/* 0459C 80863BEC 3C01432F */ lui $at, 0x432F ## $at = 432F0000 -/* 045A0 80863BF0 44815000 */ mtc1 $at, $f10 ## $f10 = 175.00 -/* 045A4 80863BF4 00000000 */ nop -/* 045A8 80863BF8 460A0402 */ mul.s $f16, $f0, $f10 -/* 045AC 80863BFC 4600848D */ trunc.w.s $f18, $f16 -/* 045B0 80863C00 44029000 */ mfc1 $v0, $f18 -/* 045B4 80863C04 00000000 */ nop -/* 045B8 80863C08 00021400 */ sll $v0, $v0, 16 -/* 045BC 80863C0C 10000011 */ beq $zero, $zero, .L80863C54 -/* 045C0 80863C10 00021403 */ sra $v0, $v0, 16 -/* 045C4 80863C14 8C581DE4 */ lw $t8, 0x1DE4($v0) ## 00001DE4 -.L80863C18: -/* 045C8 80863C18 03030019 */ multu $t8, $v1 -/* 045CC 80863C1C 00002012 */ mflo $a0 -/* 045D0 80863C20 00042400 */ sll $a0, $a0, 16 -/* 045D4 80863C24 0C01DE1C */ jal Math_SinS - ## sins? -/* 045D8 80863C28 00042403 */ sra $a0, $a0, 16 -/* 045DC 80863C2C 3C01432F */ lui $at, 0x432F ## $at = 432F0000 -/* 045E0 80863C30 44812000 */ mtc1 $at, $f4 ## $f4 = 175.00 -/* 045E4 80863C34 00000000 */ nop -/* 045E8 80863C38 46040182 */ mul.s $f6, $f0, $f4 -/* 045EC 80863C3C 4600320D */ trunc.w.s $f8, $f6 -/* 045F0 80863C40 44024000 */ mfc1 $v0, $f8 -/* 045F4 80863C44 00000000 */ nop -/* 045F8 80863C48 00021400 */ sll $v0, $v0, 16 -/* 045FC 80863C4C 00021403 */ sra $v0, $v0, 16 -/* 04600 80863C50 00021023 */ subu $v0, $zero, $v0 -.L80863C54: -/* 04604 80863C54 8FAD0024 */ lw $t5, 0x0024($sp) -/* 04608 80863C58 244A0050 */ addiu $t2, $v0, 0x0050 ## $t2 = 00000050 -/* 0460C 80863C5C 000A5E00 */ sll $t3, $t2, 24 -/* 04610 80863C60 356C00FF */ ori $t4, $t3, 0x00FF ## $t4 = 000000FF -/* 04614 80863C64 ADAC0004 */ sw $t4, 0x0004($t5) ## 00000004 -/* 04618 80863C68 8FAE0048 */ lw $t6, 0x0048($sp) -/* 0461C 80863C6C 3C068086 */ lui $a2, %hi(D_80864710) ## $a2 = 80860000 -/* 04620 80863C70 24C64710 */ addiu $a2, $a2, %lo(D_80864710) ## $a2 = 80864710 -/* 04624 80863C74 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFE4 -/* 04628 80863C78 24070E03 */ addiu $a3, $zero, 0x0E03 ## $a3 = 00000E03 -/* 0462C 80863C7C 0C031AD5 */ jal Graph_CloseDisps -/* 04630 80863C80 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -.L80863C84: -/* 04634 80863C84 8FA3005C */ lw $v1, 0x005C($sp) -/* 04638 80863C88 846F001C */ lh $t7, 0x001C($v1) ## 0000001C -/* 0463C 80863C8C 55E00009 */ bnel $t7, $zero, .L80863CB4 -/* 04640 80863C90 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04644 80863C94 8C780004 */ lw $t8, 0x0004($v1) ## 00000004 -/* 04648 80863C98 24010080 */ addiu $at, $zero, 0x0080 ## $at = 00000080 -/* 0464C 80863C9C 8FA90050 */ lw $t1, 0x0050($sp) -/* 04650 80863CA0 33190080 */ andi $t9, $t8, 0x0080 ## $t9 = 00000000 -/* 04654 80863CA4 53210003 */ beql $t9, $at, .L80863CB4 -/* 04658 80863CA8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0465C 80863CAC AD200000 */ sw $zero, 0x0000($t1) ## 00000000 -/* 04660 80863CB0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80863CB4: -/* 04664 80863CB4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 04668 80863CB8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0466C 80863CBC 03E00008 */ jr $ra -/* 04670 80863CC0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863CC4.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863CC4.s deleted file mode 100644 index ba51e1784a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863CC4.s +++ /dev/null @@ -1,301 +0,0 @@ -.late_rodata -glabel jtbl_808647F8 -.word L80863F68 -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863F70 -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863F88 -.word L80863FCC -.word L80863FA0 -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863F7C -.word L80863FCC -.word L80863FCC -.word L80863F94 -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FB8 -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FCC -.word L80863FC4 -.word L80863FCC -.word L80863FCC -.word L80863FAC - -.text -glabel func_80863CC4 -/* 04674 80863CC4 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 04678 80863CC8 AFB00030 */ sw $s0, 0x0030($sp) -/* 0467C 80863CCC AFA60088 */ sw $a2, 0x0088($sp) -/* 04680 80863CD0 8FB00090 */ lw $s0, 0x0090($sp) -/* 04684 80863CD4 8FB80088 */ lw $t8, 0x0088($sp) -/* 04688 80863CD8 AFBF0034 */ sw $ra, 0x0034($sp) -/* 0468C 80863CDC AFA40080 */ sw $a0, 0x0080($sp) -/* 04690 80863CE0 AFA7008C */ sw $a3, 0x008C($sp) -/* 04694 80863CE4 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF -/* 04698 80863CE8 240F003C */ addiu $t7, $zero, 0x003C ## $t7 = 0000003C -/* 0469C 80863CEC 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 046A0 80863CF0 AFA50084 */ sw $a1, 0x0084($sp) -/* 046A4 80863CF4 AFAE007C */ sw $t6, 0x007C($sp) -/* 046A8 80863CF8 AFB90018 */ sw $t9, 0x0018($sp) -/* 046AC 80863CFC AFAF0010 */ sw $t7, 0x0010($sp) -/* 046B0 80863D00 2407003C */ addiu $a3, $zero, 0x003C ## $a3 = 0000003C -/* 046B4 80863D04 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 046B8 80863D08 260407F0 */ addiu $a0, $s0, 0x07F0 ## $a0 = 000007F0 -/* 046BC 80863D0C 0C00CBD5 */ jal BodyBreak_SetInfo -/* 046C0 80863D10 AFB80014 */ sw $t8, 0x0014($sp) -/* 046C4 80863D14 8FA80084 */ lw $t0, 0x0084($sp) -/* 046C8 80863D18 24010022 */ addiu $at, $zero, 0x0022 ## $at = 00000022 -/* 046CC 80863D1C 3C048086 */ lui $a0, %hi(D_8086467C) ## $a0 = 80860000 -/* 046D0 80863D20 1501003F */ bne $t0, $at, .L80863E20 -/* 046D4 80863D24 8FAE0084 */ lw $t6, 0x0084($sp) -/* 046D8 80863D28 260508A8 */ addiu $a1, $s0, 0x08A8 ## $a1 = 000008A8 -/* 046DC 80863D2C AFA50044 */ sw $a1, 0x0044($sp) -/* 046E0 80863D30 0C0346BD */ jal Matrix_MultVec3f -/* 046E4 80863D34 2484467C */ addiu $a0, $a0, %lo(D_8086467C) ## $a0 = 8086467C -/* 046E8 80863D38 3C048086 */ lui $a0, %hi(D_80864688) ## $a0 = 80860000 -/* 046EC 80863D3C 2605089C */ addiu $a1, $s0, 0x089C ## $a1 = 0000089C -/* 046F0 80863D40 AFA50048 */ sw $a1, 0x0048($sp) -/* 046F4 80863D44 0C0346BD */ jal Matrix_MultVec3f -/* 046F8 80863D48 24844688 */ addiu $a0, $a0, %lo(D_80864688) ## $a0 = 80864688 -/* 046FC 80863D4C 3C048086 */ lui $a0, %hi(D_80864694) ## $a0 = 80860000 -/* 04700 80863D50 260508C0 */ addiu $a1, $s0, 0x08C0 ## $a1 = 000008C0 -/* 04704 80863D54 AFA5003C */ sw $a1, 0x003C($sp) -/* 04708 80863D58 0C0346BD */ jal Matrix_MultVec3f -/* 0470C 80863D5C 24844694 */ addiu $a0, $a0, %lo(D_80864694) ## $a0 = 80864694 -/* 04710 80863D60 3C048086 */ lui $a0, %hi(D_808646A0) ## $a0 = 80860000 -/* 04714 80863D64 260708B4 */ addiu $a3, $s0, 0x08B4 ## $a3 = 000008B4 -/* 04718 80863D68 00E02825 */ or $a1, $a3, $zero ## $a1 = 000008B4 -/* 0471C 80863D6C AFA70040 */ sw $a3, 0x0040($sp) -/* 04720 80863D70 0C0346BD */ jal Matrix_MultVec3f -/* 04724 80863D74 248446A0 */ addiu $a0, $a0, %lo(D_808646A0) ## $a0 = 808646A0 -/* 04728 80863D78 8FA9003C */ lw $t1, 0x003C($sp) -/* 0472C 80863D7C 8FA70040 */ lw $a3, 0x0040($sp) -/* 04730 80863D80 2604085C */ addiu $a0, $s0, 0x085C ## $a0 = 0000085C -/* 04734 80863D84 8FA50048 */ lw $a1, 0x0048($sp) -/* 04738 80863D88 8FA60044 */ lw $a2, 0x0044($sp) -/* 0473C 80863D8C 0C0189CD */ jal Collider_SetQuadVertices -/* 04740 80863D90 AFA90010 */ sw $t1, 0x0010($sp) -/* 04744 80863D94 3C048086 */ lui $a0, %hi(D_80864664) ## $a0 = 80860000 -/* 04748 80863D98 24844664 */ addiu $a0, $a0, %lo(D_80864664) ## $a0 = 80864664 -/* 0474C 80863D9C 0C0346BD */ jal Matrix_MultVec3f -/* 04750 80863DA0 27A50070 */ addiu $a1, $sp, 0x0070 ## $a1 = FFFFFFF0 -/* 04754 80863DA4 3C048086 */ lui $a0, %hi(D_80864670) ## $a0 = 80860000 -/* 04758 80863DA8 24844670 */ addiu $a0, $a0, %lo(D_80864670) ## $a0 = 80864670 -/* 0475C 80863DAC 0C0346BD */ jal Matrix_MultVec3f -/* 04760 80863DB0 27A50064 */ addiu $a1, $sp, 0x0064 ## $a1 = FFFFFFE4 -/* 04764 80863DB4 82020808 */ lb $v0, 0x0808($s0) ## 00000808 -/* 04768 80863DB8 18400010 */ blez $v0, .L80863DFC -/* 0476C 80863DBC 00000000 */ nop -/* 04770 80863DC0 860A001C */ lh $t2, 0x001C($s0) ## 0000001C -/* 04774 80863DC4 8FAB0080 */ lw $t3, 0x0080($sp) -/* 04778 80863DC8 15400004 */ bne $t2, $zero, .L80863DDC -/* 0477C 80863DCC 00000000 */ nop -/* 04780 80863DD0 916C1C27 */ lbu $t4, 0x1C27($t3) ## 00001C27 -/* 04784 80863DD4 11800009 */ beq $t4, $zero, .L80863DFC -/* 04788 80863DD8 00000000 */ nop -.L80863DDC: -/* 0478C 80863DDC 0C009AC3 */ jal Effect_GetByIndex -/* 04790 80863DE0 8E04080C */ lw $a0, 0x080C($s0) ## 0000080C -/* 04794 80863DE4 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 04798 80863DE8 27A50070 */ addiu $a1, $sp, 0x0070 ## $a1 = FFFFFFF0 -/* 0479C 80863DEC 0C007F7C */ jal EffectBlure_AddVertex -/* 047A0 80863DF0 27A60064 */ addiu $a2, $sp, 0x0064 ## $a2 = FFFFFFE4 -/* 047A4 80863DF4 10000051 */ beq $zero, $zero, .L80863F3C -/* 047A8 80863DF8 861907E0 */ lh $t9, 0x07E0($s0) ## 000007E0 -.L80863DFC: -/* 047AC 80863DFC 0442004F */ bltzl $v0, .L80863F3C -/* 047B0 80863E00 861907E0 */ lh $t9, 0x07E0($s0) ## 000007E0 -/* 047B4 80863E04 0C009AC3 */ jal Effect_GetByIndex -/* 047B8 80863E08 8E04080C */ lw $a0, 0x080C($s0) ## 0000080C -/* 047BC 80863E0C 0C008048 */ jal EffectBlure_AddSpace -/* 047C0 80863E10 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 047C4 80863E14 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF -/* 047C8 80863E18 10000047 */ beq $zero, $zero, .L80863F38 -/* 047CC 80863E1C A20D0808 */ sb $t5, 0x0808($s0) ## 00000808 -.L80863E20: -/* 047D0 80863E20 2401001B */ addiu $at, $zero, 0x001B ## $at = 0000001B -/* 047D4 80863E24 15C10017 */ bne $t6, $at, .L80863E84 -/* 047D8 80863E28 3C078086 */ lui $a3, %hi(D_80864658) ## $a3 = 80860000 -/* 047DC 80863E2C 920F07DE */ lbu $t7, 0x07DE($s0) ## 000007DE -/* 047E0 80863E30 3C048086 */ lui $a0, %hi(D_80864670) ## $a0 = 80860000 -/* 047E4 80863E34 24844670 */ addiu $a0, $a0, %lo(D_80864670) ## $a0 = 80864670 -/* 047E8 80863E38 11E00012 */ beq $t7, $zero, .L80863E84 -/* 047EC 80863E3C 00000000 */ nop -/* 047F0 80863E40 0C0346BD */ jal Matrix_MultVec3f -/* 047F4 80863E44 27A50064 */ addiu $a1, $sp, 0x0064 ## $a1 = FFFFFFE4 -/* 047F8 80863E48 C7A40064 */ lwc1 $f4, 0x0064($sp) -/* 047FC 80863E4C 4600218D */ trunc.w.s $f6, $f4 -/* 04800 80863E50 44193000 */ mfc1 $t9, $f6 -/* 04804 80863E54 00000000 */ nop -/* 04808 80863E58 A6190922 */ sh $t9, 0x0922($s0) ## 00000922 -/* 0480C 80863E5C C7A80068 */ lwc1 $f8, 0x0068($sp) -/* 04810 80863E60 4600428D */ trunc.w.s $f10, $f8 -/* 04814 80863E64 44095000 */ mfc1 $t1, $f10 -/* 04818 80863E68 00000000 */ nop -/* 0481C 80863E6C A6090924 */ sh $t1, 0x0924($s0) ## 00000924 -/* 04820 80863E70 C7B0006C */ lwc1 $f16, 0x006C($sp) -/* 04824 80863E74 4600848D */ trunc.w.s $f18, $f16 -/* 04828 80863E78 440B9000 */ mfc1 $t3, $f18 -/* 0482C 80863E7C 1000002E */ beq $zero, $zero, .L80863F38 -/* 04830 80863E80 A60B0926 */ sh $t3, 0x0926($s0) ## 00000926 -.L80863E84: -/* 04834 80863E84 24E74658 */ addiu $a3, $a3, %lo(D_80864658) ## $a3 = 00004658 -/* 04838 80863E88 240C0037 */ addiu $t4, $zero, 0x0037 ## $t4 = 00000037 -/* 0483C 80863E8C AFAC0010 */ sw $t4, 0x0010($sp) -/* 04840 80863E90 AFA70014 */ sw $a3, 0x0014($sp) -/* 04844 80863E94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04848 80863E98 8FA50084 */ lw $a1, 0x0084($sp) -/* 0484C 80863E9C 0C00AF6C */ jal Actor_SetFeetPos -/* 04850 80863EA0 24060030 */ addiu $a2, $zero, 0x0030 ## $a2 = 00000030 -/* 04854 80863EA4 8FAD0084 */ lw $t5, 0x0084($sp) -/* 04858 80863EA8 24010030 */ addiu $at, $zero, 0x0030 ## $at = 00000030 -/* 0485C 80863EAC 11A10003 */ beq $t5, $at, .L80863EBC -/* 04860 80863EB0 24010037 */ addiu $at, $zero, 0x0037 ## $at = 00000037 -/* 04864 80863EB4 55A10021 */ bnel $t5, $at, .L80863F3C -/* 04868 80863EB8 861907E0 */ lh $t9, 0x07E0($s0) ## 000007E0 -.L80863EBC: -/* 0486C 80863EBC 920207C8 */ lbu $v0, 0x07C8($s0) ## 000007C8 -/* 04870 80863EC0 24010015 */ addiu $at, $zero, 0x0015 ## $at = 00000015 -/* 04874 80863EC4 10410003 */ beq $v0, $at, .L80863ED4 -/* 04878 80863EC8 24010016 */ addiu $at, $zero, 0x0016 ## $at = 00000016 -/* 0487C 80863ECC 5441001B */ bnel $v0, $at, .L80863F3C -/* 04880 80863ED0 861907E0 */ lh $t9, 0x07E0($s0) ## 000007E0 -.L80863ED4: -/* 04884 80863ED4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 04888 80863ED8 C6060068 */ lwc1 $f6, 0x0068($s0) ## 00000068 -/* 0488C 80863EDC 3C048086 */ lui $a0, %hi(D_80864658) ## $a0 = 80860000 -/* 04890 80863EE0 24844658 */ addiu $a0, $a0, %lo(D_80864658) ## $a0 = 80864658 -/* 04894 80863EE4 46062032 */ c.eq.s $f4, $f6 -/* 04898 80863EE8 00000000 */ nop -/* 0489C 80863EEC 45030013 */ bc1tl .L80863F3C -/* 048A0 80863EF0 861907E0 */ lh $t9, 0x07E0($s0) ## 000007E0 -/* 048A4 80863EF4 0C0346BD */ jal Matrix_MultVec3f -/* 048A8 80863EF8 27A50064 */ addiu $a1, $sp, 0x0064 ## $a1 = FFFFFFE4 -/* 048AC 80863EFC 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 048B0 80863F00 44814000 */ mtc1 $at, $f8 ## $f8 = 8.00 -/* 048B4 80863F04 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 048B8 80863F08 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 -/* 048BC 80863F0C 2418000F */ addiu $t8, $zero, 0x000F ## $t8 = 0000000F -/* 048C0 80863F10 AFB8001C */ sw $t8, 0x001C($sp) -/* 048C4 80863F14 AFAF0018 */ sw $t7, 0x0018($sp) -/* 048C8 80863F18 AFAE0010 */ sw $t6, 0x0010($sp) -/* 048CC 80863F1C 8FA40080 */ lw $a0, 0x0080($sp) -/* 048D0 80863F20 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 048D4 80863F24 27A60064 */ addiu $a2, $sp, 0x0064 ## $a2 = FFFFFFE4 -/* 048D8 80863F28 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 048DC 80863F2C AFA00020 */ sw $zero, 0x0020($sp) -/* 048E0 80863F30 0C00CC98 */ jal Actor_SpawnFloorDust -/* 048E4 80863F34 E7A80014 */ swc1 $f8, 0x0014($sp) -.L80863F38: -/* 048E8 80863F38 861907E0 */ lh $t9, 0x07E0($s0) ## 000007E0 -.L80863F3C: -/* 048EC 80863F3C 8FA80084 */ lw $t0, 0x0084($sp) -/* 048F0 80863F40 1320003C */ beq $t9, $zero, .L80864034 -/* 048F4 80863F44 2509FFF5 */ addiu $t1, $t0, 0xFFF5 ## $t1 = FFFFFFF5 -/* 048F8 80863F48 2D210032 */ sltiu $at, $t1, 0x0032 -/* 048FC 80863F4C 1020001F */ beq $at, $zero, .L80863FCC -/* 04900 80863F50 00094880 */ sll $t1, $t1, 2 -/* 04904 80863F54 3C018086 */ lui $at, %hi(jtbl_808647F8) ## $at = 80860000 -/* 04908 80863F58 00290821 */ addu $at, $at, $t1 -/* 0490C 80863F5C 8C2947F8 */ lw $t1, %lo(jtbl_808647F8)($at) -/* 04910 80863F60 01200008 */ jr $t1 -/* 04914 80863F64 00000000 */ nop -glabel L80863F68 -/* 04918 80863F68 10000018 */ beq $zero, $zero, .L80863FCC -/* 0491C 80863F6C AFA0007C */ sw $zero, 0x007C($sp) -glabel L80863F70 -/* 04920 80863F70 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 04924 80863F74 10000015 */ beq $zero, $zero, .L80863FCC -/* 04928 80863F78 AFAA007C */ sw $t2, 0x007C($sp) -glabel L80863F7C -/* 0492C 80863F7C 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 04930 80863F80 10000012 */ beq $zero, $zero, .L80863FCC -/* 04934 80863F84 AFAB007C */ sw $t3, 0x007C($sp) -glabel L80863F88 -/* 04938 80863F88 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 -/* 0493C 80863F8C 1000000F */ beq $zero, $zero, .L80863FCC -/* 04940 80863F90 AFAC007C */ sw $t4, 0x007C($sp) -glabel L80863F94 -/* 04944 80863F94 240D0004 */ addiu $t5, $zero, 0x0004 ## $t5 = 00000004 -/* 04948 80863F98 1000000C */ beq $zero, $zero, .L80863FCC -/* 0494C 80863F9C AFAD007C */ sw $t5, 0x007C($sp) -glabel L80863FA0 -/* 04950 80863FA0 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 04954 80863FA4 10000009 */ beq $zero, $zero, .L80863FCC -/* 04958 80863FA8 AFAE007C */ sw $t6, 0x007C($sp) -glabel L80863FAC -/* 0495C 80863FAC 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 -/* 04960 80863FB0 10000006 */ beq $zero, $zero, .L80863FCC -/* 04964 80863FB4 AFAF007C */ sw $t7, 0x007C($sp) -glabel L80863FB8 -/* 04968 80863FB8 24180007 */ addiu $t8, $zero, 0x0007 ## $t8 = 00000007 -/* 0496C 80863FBC 10000003 */ beq $zero, $zero, .L80863FCC -/* 04970 80863FC0 AFB8007C */ sw $t8, 0x007C($sp) -glabel L80863FC4 -/* 04974 80863FC4 24190008 */ addiu $t9, $zero, 0x0008 ## $t9 = 00000008 -/* 04978 80863FC8 AFB9007C */ sw $t9, 0x007C($sp) -glabel L80863FCC -.L80863FCC: -/* 0497C 80863FCC 8FA8007C */ lw $t0, 0x007C($sp) -/* 04980 80863FD0 3C048086 */ lui $a0, %hi(D_80864670) ## $a0 = 80860000 -/* 04984 80863FD4 24844670 */ addiu $a0, $a0, %lo(D_80864670) ## $a0 = 80864670 -/* 04988 80863FD8 05020017 */ bltzl $t0, .L80864038 -/* 0498C 80863FDC 8FBF0034 */ lw $ra, 0x0034($sp) -/* 04990 80863FE0 0C0346BD */ jal Matrix_MultVec3f -/* 04994 80863FE4 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFFD0 -/* 04998 80863FE8 C7AA0050 */ lwc1 $f10, 0x0050($sp) -/* 0499C 80863FEC 8FA9007C */ lw $t1, 0x007C($sp) -/* 049A0 80863FF0 4600540D */ trunc.w.s $f16, $f10 -/* 049A4 80863FF4 00095080 */ sll $t2, $t1, 2 -/* 049A8 80863FF8 01495023 */ subu $t2, $t2, $t1 -/* 049AC 80863FFC 000A5040 */ sll $t2, $t2, 1 -/* 049B0 80864000 440C8000 */ mfc1 $t4, $f16 -/* 049B4 80864004 020A1021 */ addu $v0, $s0, $t2 -/* 049B8 80864008 A44C014C */ sh $t4, 0x014C($v0) ## 0000014C -/* 049BC 8086400C C7B20054 */ lwc1 $f18, 0x0054($sp) -/* 049C0 80864010 4600910D */ trunc.w.s $f4, $f18 -/* 049C4 80864014 440E2000 */ mfc1 $t6, $f4 -/* 049C8 80864018 00000000 */ nop -/* 049CC 8086401C A44E014E */ sh $t6, 0x014E($v0) ## 0000014E -/* 049D0 80864020 C7A60058 */ lwc1 $f6, 0x0058($sp) -/* 049D4 80864024 4600320D */ trunc.w.s $f8, $f6 -/* 049D8 80864028 44184000 */ mfc1 $t8, $f8 -/* 049DC 8086402C 00000000 */ nop -/* 049E0 80864030 A4580150 */ sh $t8, 0x0150($v0) ## 00000150 -.L80864034: -/* 049E4 80864034 8FBF0034 */ lw $ra, 0x0034($sp) -.L80864038: -/* 049E8 80864038 8FB00030 */ lw $s0, 0x0030($sp) -/* 049EC 8086403C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 049F0 80864040 03E00008 */ jr $ra -/* 049F4 80864044 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s deleted file mode 100644 index 55c4e3aeab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80864158 -/* 04B08 80864158 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04B0C 8086415C AFA5001C */ sw $a1, 0x001C($sp) -/* 04B10 80864160 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04B14 80864164 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 04B18 80864168 3C050601 */ lui $a1, %hi(D_0600E2B0) ## $a1 = 06010000 -/* 04B1C 8086416C 24A5E2B0 */ addiu $a1, $a1, %lo(D_0600E2B0) ## $a1 = 0600E2B0 -/* 04B20 80864170 AFA70018 */ sw $a3, 0x0018($sp) -/* 04B24 80864174 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 04B28 80864178 0C0294D3 */ jal Animation_MorphToLoop -/* 04B2C 8086417C 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 -/* 04B30 80864180 8FA70018 */ lw $a3, 0x0018($sp) -/* 04B34 80864184 C7A4001C */ lwc1 $f4, 0x001C($sp) -/* 04B38 80864188 84EE00B6 */ lh $t6, 0x00B6($a3) ## 000000B6 -/* 04B3C 8086418C E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 04B40 80864190 25CF3FFF */ addiu $t7, $t6, 0x3FFF ## $t7 = 00003FFF -/* 04B44 80864194 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 04B48 80864198 A4EF0032 */ sh $t7, 0x0032($a3) ## 00000032 -/* 04B4C 8086419C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 04B50 808641A0 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 -/* 04B54 808641A4 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 04B58 808641A8 44815000 */ mtc1 $at, $f10 ## $f10 = 15.00 -/* 04B5C 808641AC 46060202 */ mul.s $f8, $f0, $f6 -/* 04B60 808641B0 8FA40018 */ lw $a0, 0x0018($sp) -/* 04B64 808641B4 24080018 */ addiu $t0, $zero, 0x0018 ## $t0 = 00000018 -/* 04B68 808641B8 3C058086 */ lui $a1, %hi(func_808628C8) ## $a1 = 80860000 -/* 04B6C 808641BC 24A528C8 */ addiu $a1, $a1, %lo(func_808628C8) ## $a1 = 808628C8 -/* 04B70 808641C0 A08807C8 */ sb $t0, 0x07C8($a0) ## 000007C8 -/* 04B74 808641C4 460A4400 */ add.s $f16, $f8, $f10 -/* 04B78 808641C8 4600848D */ trunc.w.s $f18, $f16 -/* 04B7C 808641CC 44199000 */ mfc1 $t9, $f18 -/* 04B80 808641D0 0C217D94 */ jal EnTest_SetupAction -/* 04B84 808641D4 AC9907E8 */ sw $t9, 0x07E8($a0) ## 000007E8 -/* 04B88 808641D8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04B8C 808641DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04B90 808641E0 03E00008 */ jr $ra -/* 04B94 808641E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808641E8.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808641E8.s deleted file mode 100644 index e8ba44aa7f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808641E8.s +++ /dev/null @@ -1,228 +0,0 @@ -glabel func_808641E8 -/* 04B98 808641E8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04B9C 808641EC AFBF0014 */ sw $ra, 0x0014($sp) -/* 04BA0 808641F0 AFA40028 */ sw $a0, 0x0028($sp) -/* 04BA4 808641F4 AFA5002C */ sw $a1, 0x002C($sp) -/* 04BA8 808641F8 0C00CDE0 */ jal Actor_GetProjectileActor -/* 04BAC 808641FC 3C064396 */ lui $a2, 0x4396 ## $a2 = 43960000 -/* 04BB0 80864200 8FA7002C */ lw $a3, 0x002C($sp) -/* 04BB4 80864204 104000BD */ beq $v0, $zero, .L808644FC -/* 04BB8 80864208 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 04BBC 8086420C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 04BC0 80864210 AFA20024 */ sw $v0, 0x0024($sp) -/* 04BC4 80864214 0C00B69E */ jal Actor_WorldYawTowardActor -/* 04BC8 80864218 AFA7002C */ sw $a3, 0x002C($sp) -/* 04BCC 8086421C 8FA7002C */ lw $a3, 0x002C($sp) -/* 04BD0 80864220 00004025 */ or $t0, $zero, $zero ## $t0 = 00000000 -/* 04BD4 80864224 94E400B6 */ lhu $a0, 0x00B6($a3) ## 000000B6 -/* 04BD8 80864228 94EF0088 */ lhu $t7, 0x0088($a3) ## 00000088 -/* 04BDC 8086422C 00441823 */ subu $v1, $v0, $a0 -/* 04BE0 80864230 00031C00 */ sll $v1, $v1, 16 -/* 04BE4 80864234 31F80008 */ andi $t8, $t7, 0x0008 ## $t8 = 00000000 -/* 04BE8 80864238 13000008 */ beq $t8, $zero, .L8086425C -/* 04BEC 8086423C 00031C03 */ sra $v1, $v1, 16 -/* 04BF0 80864240 94F9007E */ lhu $t9, 0x007E($a3) ## 0000007E -/* 04BF4 80864244 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 04BF8 80864248 03243023 */ subu $a2, $t9, $a0 -/* 04BFC 8086424C 00063400 */ sll $a2, $a2, 16 -/* 04C00 80864250 00063403 */ sra $a2, $a2, 16 -/* 04C04 80864254 10000001 */ beq $zero, $zero, .L8086425C -/* 04C08 80864258 A7A60020 */ sh $a2, 0x0020($sp) -.L8086425C: -/* 04C0C 8086425C 8FA50024 */ lw $a1, 0x0024($sp) -/* 04C10 80864260 24E40024 */ addiu $a0, $a3, 0x0024 ## $a0 = 00000024 -/* 04C14 80864264 A7A30022 */ sh $v1, 0x0022($sp) -/* 04C18 80864268 AFA7002C */ sw $a3, 0x002C($sp) -/* 04C1C 8086426C A7A8001E */ sh $t0, 0x001E($sp) -/* 04C20 80864270 0C01DFE4 */ jal Math_Vec3f_DistXYZ - -/* 04C24 80864274 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 -/* 04C28 80864278 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 04C2C 8086427C 44812000 */ mtc1 $at, $f4 ## $f4 = 200.00 -/* 04C30 80864280 8FA7002C */ lw $a3, 0x002C($sp) -/* 04C34 80864284 87A30022 */ lh $v1, 0x0022($sp) -/* 04C38 80864288 4604003C */ c.lt.s $f0, $f4 -/* 04C3C 8086428C 87A60020 */ lh $a2, 0x0020($sp) -/* 04C40 80864290 87A8001E */ lh $t0, 0x001E($sp) -/* 04C44 80864294 8FA40028 */ lw $a0, 0x0028($sp) -/* 04C48 80864298 4500002C */ bc1f .L8086434C -/* 04C4C 8086429C 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 04C50 808642A0 8FA40028 */ lw $a0, 0x0028($sp) -/* 04C54 808642A4 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 04C58 808642A8 A7A30022 */ sh $v1, 0x0022($sp) -/* 04C5C 808642AC 0C00CEA1 */ jal Actor_IsTargeted -/* 04C60 808642B0 AFA7002C */ sw $a3, 0x002C($sp) -/* 04C64 808642B4 87A30022 */ lh $v1, 0x0022($sp) -/* 04C68 808642B8 1040000A */ beq $v0, $zero, .L808642E4 -/* 04C6C 808642BC 8FA7002C */ lw $a3, 0x002C($sp) -/* 04C70 808642C0 8FA90024 */ lw $t1, 0x0024($sp) -/* 04C74 808642C4 24010066 */ addiu $at, $zero, 0x0066 ## $at = 00000066 -/* 04C78 808642C8 852A0000 */ lh $t2, 0x0000($t1) ## 00000000 -/* 04C7C 808642CC 15410005 */ bne $t2, $at, .L808642E4 -/* 04C80 808642D0 00000000 */ nop -/* 04C84 808642D4 0C218754 */ jal func_80861D50 -/* 04C88 808642D8 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 04C8C 808642DC 10000088 */ beq $zero, $zero, .L80864500 -/* 04C90 808642E0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808642E4: -/* 04C94 808642E4 04600003 */ bltz $v1, .L808642F4 -/* 04C98 808642E8 00031023 */ subu $v0, $zero, $v1 -/* 04C9C 808642EC 10000001 */ beq $zero, $zero, .L808642F4 -/* 04CA0 808642F0 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L808642F4: -/* 04CA4 808642F4 28412000 */ slti $at, $v0, 0x2000 -/* 04CA8 808642F8 10200005 */ beq $at, $zero, .L80864310 -/* 04CAC 808642FC 00000000 */ nop -/* 04CB0 80864300 0C2187B0 */ jal func_80861EC0 -/* 04CB4 80864304 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 04CB8 80864308 1000007D */ beq $zero, $zero, .L80864500 -/* 04CBC 8086430C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80864310: -/* 04CC0 80864310 04600003 */ bltz $v1, .L80864320 -/* 04CC4 80864314 00031023 */ subu $v0, $zero, $v1 -/* 04CC8 80864318 10000001 */ beq $zero, $zero, .L80864320 -/* 04CCC 8086431C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L80864320: -/* 04CD0 80864320 28416000 */ slti $at, $v0, 0x6000 -/* 04CD4 80864324 10200005 */ beq $at, $zero, .L8086433C -/* 04CD8 80864328 00000000 */ nop -/* 04CDC 8086432C 0C218653 */ jal func_8086194C -/* 04CE0 80864330 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 04CE4 80864334 10000072 */ beq $zero, $zero, .L80864500 -/* 04CE8 80864338 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8086433C: -/* 04CEC 8086433C 0C218754 */ jal func_80861D50 -/* 04CF0 80864340 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 04CF4 80864344 1000006E */ beq $zero, $zero, .L80864500 -/* 04CF8 80864348 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L8086434C: -/* 04CFC 8086434C A7A30022 */ sh $v1, 0x0022($sp) -/* 04D00 80864350 A7A60020 */ sh $a2, 0x0020($sp) -/* 04D04 80864354 AFA7002C */ sw $a3, 0x002C($sp) -/* 04D08 80864358 0C00CEA1 */ jal Actor_IsTargeted -/* 04D0C 8086435C A7A8001E */ sh $t0, 0x001E($sp) -/* 04D10 80864360 87A30022 */ lh $v1, 0x0022($sp) -/* 04D14 80864364 87A60020 */ lh $a2, 0x0020($sp) -/* 04D18 80864368 8FA7002C */ lw $a3, 0x002C($sp) -/* 04D1C 8086436C 1040000A */ beq $v0, $zero, .L80864398 -/* 04D20 80864370 87A8001E */ lh $t0, 0x001E($sp) -/* 04D24 80864374 8FAB0024 */ lw $t3, 0x0024($sp) -/* 04D28 80864378 24010066 */ addiu $at, $zero, 0x0066 ## $at = 00000066 -/* 04D2C 8086437C 856C0000 */ lh $t4, 0x0000($t3) ## 00000000 -/* 04D30 80864380 15810005 */ bne $t4, $at, .L80864398 -/* 04D34 80864384 00000000 */ nop -/* 04D38 80864388 0C218754 */ jal func_80861D50 -/* 04D3C 8086438C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 04D40 80864390 1000005B */ beq $zero, $zero, .L80864500 -/* 04D44 80864394 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80864398: -/* 04D48 80864398 04600003 */ bltz $v1, .L808643A8 -/* 04D4C 8086439C 00031023 */ subu $v0, $zero, $v1 -/* 04D50 808643A0 10000001 */ beq $zero, $zero, .L808643A8 -/* 04D54 808643A4 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L808643A8: -/* 04D58 808643A8 28412000 */ slti $at, $v0, 0x2000 -/* 04D5C 808643AC 14200008 */ bne $at, $zero, .L808643D0 -/* 04D60 808643B0 8FAD0028 */ lw $t5, 0x0028($sp) -/* 04D64 808643B4 04600003 */ bltz $v1, .L808643C4 -/* 04D68 808643B8 00031023 */ subu $v0, $zero, $v1 -/* 04D6C 808643BC 10000001 */ beq $zero, $zero, .L808643C4 -/* 04D70 808643C0 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L808643C4: -/* 04D74 808643C4 28416001 */ slti $at, $v0, 0x6001 -/* 04D78 808643C8 14200021 */ bne $at, $zero, .L80864450 -/* 04D7C 808643CC 00000000 */ nop -.L808643D0: -/* 04D80 808643D0 3C030001 */ lui $v1, 0x0001 ## $v1 = 00010000 -/* 04D84 808643D4 006D1821 */ addu $v1, $v1, $t5 -/* 04D88 808643D8 8C631DE4 */ lw $v1, 0x1DE4($v1) ## 00011DE4 -/* 04D8C 808643DC 28C12001 */ slti $at, $a2, 0x2001 -/* 04D90 808643E0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 04D94 808643E4 30630001 */ andi $v1, $v1, 0x0001 ## $v1 = 00000000 -/* 04D98 808643E8 00031C00 */ sll $v1, $v1, 16 -/* 04D9C 808643EC 11000007 */ beq $t0, $zero, .L8086440C -/* 04DA0 808643F0 00031C03 */ sra $v1, $v1, 16 -/* 04DA4 808643F4 14200005 */ bne $at, $zero, .L8086440C -/* 04DA8 808643F8 28C16000 */ slti $at, $a2, 0x6000 -/* 04DAC 808643FC 10200003 */ beq $at, $zero, .L8086440C -/* 04DB0 80864400 00000000 */ nop -/* 04DB4 80864404 10000008 */ beq $zero, $zero, .L80864428 -/* 04DB8 80864408 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L8086440C: -/* 04DBC 8086440C 11000006 */ beq $t0, $zero, .L80864428 -/* 04DC0 80864410 28C1E000 */ slti $at, $a2, 0xE000 -/* 04DC4 80864414 10200004 */ beq $at, $zero, .L80864428 -/* 04DC8 80864418 28C1A001 */ slti $at, $a2, 0xA001 -/* 04DCC 8086441C 14200002 */ bne $at, $zero, .L80864428 -/* 04DD0 80864420 00000000 */ nop -/* 04DD4 80864424 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L80864428: -/* 04DD8 80864428 10600005 */ beq $v1, $zero, .L80864440 -/* 04DDC 8086442C 3C054080 */ lui $a1, 0x4080 ## $a1 = 40800000 -/* 04DE0 80864430 0C219056 */ jal func_80864158 -/* 04DE4 80864434 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 04DE8 80864438 10000031 */ beq $zero, $zero, .L80864500 -/* 04DEC 8086443C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80864440: -/* 04DF0 80864440 0C219056 */ jal func_80864158 -/* 04DF4 80864444 3C05C080 */ lui $a1, 0xC080 ## $a1 = C0800000 -/* 04DF8 80864448 1000002D */ beq $zero, $zero, .L80864500 -/* 04DFC 8086444C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80864450: -/* 04E00 80864450 04600003 */ bltz $v1, .L80864460 -/* 04E04 80864454 00031023 */ subu $v0, $zero, $v1 -/* 04E08 80864458 10000001 */ beq $zero, $zero, .L80864460 -/* 04E0C 8086445C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L80864460: -/* 04E10 80864460 28416000 */ slti $at, $v0, 0x6000 -/* 04E14 80864464 10200023 */ beq $at, $zero, .L808644F4 -/* 04E18 80864468 8FAE0028 */ lw $t6, 0x0028($sp) -/* 04E1C 8086446C 3C030001 */ lui $v1, 0x0001 ## $v1 = 00010000 -/* 04E20 80864470 006E1821 */ addu $v1, $v1, $t6 -/* 04E24 80864474 8C631DE4 */ lw $v1, 0x1DE4($v1) ## 00011DE4 -/* 04E28 80864478 30630001 */ andi $v1, $v1, 0x0001 ## $v1 = 00000000 -/* 04E2C 8086447C 00031C00 */ sll $v1, $v1, 16 -/* 04E30 80864480 1100000A */ beq $t0, $zero, .L808644AC -/* 04E34 80864484 00031C03 */ sra $v1, $v1, 16 -/* 04E38 80864488 04C00003 */ bltz $a2, .L80864498 -/* 04E3C 8086448C 00061023 */ subu $v0, $zero, $a2 -/* 04E40 80864490 10000001 */ beq $zero, $zero, .L80864498 -/* 04E44 80864494 00C01025 */ or $v0, $a2, $zero ## $v0 = 00000000 -.L80864498: -/* 04E48 80864498 28416001 */ slti $at, $v0, 0x6001 -/* 04E4C 8086449C 14200003 */ bne $at, $zero, .L808644AC -/* 04E50 808644A0 00000000 */ nop -/* 04E54 808644A4 1000000B */ beq $zero, $zero, .L808644D4 -/* 04E58 808644A8 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L808644AC: -/* 04E5C 808644AC 11000009 */ beq $t0, $zero, .L808644D4 -/* 04E60 808644B0 00000000 */ nop -/* 04E64 808644B4 04C00003 */ bltz $a2, .L808644C4 -/* 04E68 808644B8 00061023 */ subu $v0, $zero, $a2 -/* 04E6C 808644BC 10000001 */ beq $zero, $zero, .L808644C4 -/* 04E70 808644C0 00C01025 */ or $v0, $a2, $zero ## $v0 = 00000000 -.L808644C4: -/* 04E74 808644C4 28412000 */ slti $at, $v0, 0x2000 -/* 04E78 808644C8 10200002 */ beq $at, $zero, .L808644D4 -/* 04E7C 808644CC 00000000 */ nop -/* 04E80 808644D0 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L808644D4: -/* 04E84 808644D4 10600005 */ beq $v1, $zero, .L808644EC -/* 04E88 808644D8 00000000 */ nop -/* 04E8C 808644DC 0C218653 */ jal func_8086194C -/* 04E90 808644E0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 04E94 808644E4 10000006 */ beq $zero, $zero, .L80864500 -/* 04E98 808644E8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808644EC: -/* 04E9C 808644EC 0C218754 */ jal func_80861D50 -/* 04EA0 808644F0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -.L808644F4: -/* 04EA4 808644F4 10000002 */ beq $zero, $zero, .L80864500 -/* 04EA8 808644F8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808644FC: -/* 04EAC 808644FC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80864500: -/* 04EB0 80864500 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04EB4 80864504 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04EB8 80864508 03E00008 */ jr $ra -/* 04EBC 8086450C 00000000 */ nop diff --git a/assets/xml/objects/object_sk2.xml b/assets/xml/objects/object_sk2.xml index ca79023238..697dc0c951 100644 --- a/assets/xml/objects/object_sk2.xml +++ b/assets/xml/objects/object_sk2.xml @@ -1,55 +1,130 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/data/overlays/actors/z_en_test.data.s b/data/overlays/actors/z_en_test.data.s deleted file mode 100644 index 4dd0970ac3..0000000000 --- a/data/overlays/actors/z_en_test.data.s +++ /dev/null @@ -1,44 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_80864510 - .word 0x00000000, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 -glabel En_Test_InitVars - .word 0x00020500, 0x00000015, 0x00320000, 0x00000928 -.word EnTest_Init -.word EnTest_Destroy -.word EnTest_Update -.word EnTest_Draw -glabel D_80864570 - .word 0x05000939, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00010100, 0x00190041, 0x00000000, 0x00000000 -glabel D_8086459C - .word 0x09000D00, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0xFFC1FFFF, 0x00000000, 0x00010000, 0x00140046, 0xFFCE0000, 0x00000000 -glabel D_808645C8 - .word 0x0A110000, 0x00030000, 0x00000000, 0xFFCFFFFF, 0x00100000, 0x00000000, 0x00000000, 0x81000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 -glabel D_80864618 - .word 0x1002D102, 0x10020210, 0x01020402, 0xF4E20202, 0x0260F3E0, 0x00000104, 0x02020804, 0x00000400 -glabel D_80864638 - .word 0x8917001B, 0xB04C01F4, 0xC850000F, 0xB0540000, 0x386CFA24, 0x44898000, 0xC42F0000, 0x00000000 -glabel D_80864658 - .word 0x43960000, 0x00000000, 0x00000000 -glabel D_80864664 - .word 0x45548000, 0x00000000, 0x00000000 -glabel D_80864670 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_8086467C - .word 0x45DAC000, 0x447A0000, 0x00000000 -glabel D_80864688 - .word 0x453B8000, 0xC4FA0000, 0xC47A0000 -glabel D_80864694 - .word 0x453B8000, 0xC4FA0000, 0x447A0000 -glabel D_808646A0 - .word 0xC4A28000, 0x44898000, 0x00000000, 0xC53B8000, 0x44ED8000, 0x44480000, 0xC53B8000, 0xC4898000, 0x44480000, 0x44ED8000, 0x44ED8000, 0x44480000, 0xC53B8000, 0xC4898000, 0x44480000, 0x44ED8000, 0xC4898000, 0x44480000, 0x44ED8000, 0x44ED8000, 0x44480000, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_test.reloc.s b/data/overlays/actors/z_en_test.reloc.s deleted file mode 100644 index 675e841df7..0000000000 --- a/data/overlays/actors/z_en_test.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_808648C0 - .incbin "baserom/ovl_En_Test", 0x5270, 0x00000640 diff --git a/spec b/spec index b4a288c255..39f5a26088 100644 --- a/spec +++ b/spec @@ -588,8 +588,7 @@ endseg beginseg name "ovl_En_Test" include "build/src/overlays/actors/ovl_En_Test/z_en_test.o" - include "build/data/overlays/actors/z_en_test.data.o" - include "build/data/overlays/actors/z_en_test.reloc.o" + include "build/src/overlays/actors/ovl_En_Test/ovl_En_Test_reloc.o" endseg beginseg diff --git a/src/code/z_play.c b/src/code/z_play.c index 6788a652b6..c6ca9b615e 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -810,8 +810,8 @@ void Gameplay_Update(GlobalContext* globalCtx) { if ((globalCtx->actorCtx.freezeFlashTimer > 0) && ((globalCtx->actorCtx.freezeFlashTimer % 2) != 0)) { globalCtx->envCtx.unk_E1 = 1; - globalCtx->envCtx.unk_E2[0] = globalCtx->envCtx.unk_E2[1] = globalCtx->envCtx.unk_E2[2] = 0x96; - globalCtx->envCtx.unk_E2[3] = 0x50; + globalCtx->envCtx.unk_E2[0] = globalCtx->envCtx.unk_E2[1] = globalCtx->envCtx.unk_E2[2] = 150; + globalCtx->envCtx.unk_E2[3] = 80; } else { globalCtx->envCtx.unk_E1 = 0; } diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c index b96d6201ac..6e922f9093 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -61,37 +61,37 @@ void EnBoom_SetupAction(EnBoom* this, EnBoomActionFunc actionFunc) { void EnBoom_Init(Actor* thisx, GlobalContext* globalCtx) { EnBoom* this = THIS; - EffectBlureInit1 trail; + EffectBlureInit1 blure; this->actor.room = -1; Actor_ProcessInitChain(&this->actor, sInitChain); - trail.p1StartColor[0] = 255; - trail.p1StartColor[1] = 255; - trail.p1StartColor[2] = 100; - trail.p1StartColor[3] = 255; + blure.p1StartColor[0] = 255; + blure.p1StartColor[1] = 255; + blure.p1StartColor[2] = 100; + blure.p1StartColor[3] = 255; - trail.p2StartColor[0] = 255; - trail.p2StartColor[1] = 255; - trail.p2StartColor[2] = 100; - trail.p2StartColor[3] = 64; + blure.p2StartColor[0] = 255; + blure.p2StartColor[1] = 255; + blure.p2StartColor[2] = 100; + blure.p2StartColor[3] = 64; - trail.p1EndColor[0] = 255; - trail.p1EndColor[1] = 255; - trail.p1EndColor[2] = 100; - trail.p1EndColor[3] = 0; + blure.p1EndColor[0] = 255; + blure.p1EndColor[1] = 255; + blure.p1EndColor[2] = 100; + blure.p1EndColor[3] = 0; - trail.p2EndColor[0] = 255; - trail.p2EndColor[1] = 255; - trail.p2EndColor[2] = 100; - trail.p2EndColor[3] = 0; + blure.p2EndColor[0] = 255; + blure.p2EndColor[1] = 255; + blure.p2EndColor[2] = 100; + blure.p2EndColor[3] = 0; - trail.elemDuration = 8; - trail.unkFlag = 0; - trail.calcMode = 0; + blure.elemDuration = 8; + blure.unkFlag = 0; + blure.calcMode = 0; - Effect_Add(globalCtx, &this->effectIndex, EFFECT_BLURE1, 0, 0, &trail); + Effect_Add(globalCtx, &this->effectIndex, EFFECT_BLURE1, 0, 0, &blure); Collider_InitQuad(globalCtx, &this->collider); Collider_SetQuad(globalCtx, &this->collider, &this->actor, &sQuadInit); diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.c b/src/overlays/actors/ovl_En_Test/z_en_test.c index ae069e51ec..89876ee760 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -5,6 +5,7 @@ */ #include "z_en_test.h" +#include "objects/object_sk2/object_sk2.h" #define FLAGS 0x00000015 @@ -15,53 +16,117 @@ void EnTest_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnTest_Update(Actor* thisx, GlobalContext* globalCtx); void EnTest_Draw(Actor* thisx, GlobalContext* globalCtx); -void func_8085F938(EnTest* this, GlobalContext* globalCtx); -void func_8085FAB0(EnTest* this, GlobalContext* globalCtx); -void func_8085FE48(EnTest* this, GlobalContext* globalCtx); -void func_8085FF9C(EnTest* this, GlobalContext* globalCtx); -void func_80860318(EnTest* this, GlobalContext* globalCtx); -void func_808603CC(EnTest* this, GlobalContext* globalCtx); -void func_80863360(EnTest* this, GlobalContext* globalCtx); -void func_808600EC(EnTest* this, GlobalContext* globalCtx); -void func_808604FC(EnTest* this, GlobalContext* globalCtx); +void EnTest_SetupWaitGround(EnTest* this); +void EnTest_SetupWaitAbove(EnTest* this); +void EnTest_SetupJumpBack(EnTest* this); +void EnTest_SetupSlashDownEnd(EnTest* this); +void EnTest_SetupSlashUp(EnTest* this); +void EnTest_SetupJumpslash(EnTest* this); +void EnTest_SetupWalkAndBlock(EnTest* this); +void func_80860EC0(EnTest* this); +void EnTest_SetupSlashDown(EnTest* this); +void func_80860BDC(EnTest* this); +void EnTest_SetupIdleFromBlock(EnTest* this); +void EnTest_SetupRecoil(EnTest* this); +void func_80862398(EnTest* this); +void func_80862154(EnTest* this); +void EnTest_SetupStopAndBlock(EnTest* this); +void func_808627C4(EnTest* this, GlobalContext* globalCtx); + +void EnTest_WaitGround(EnTest* this, GlobalContext* globalCtx); +void EnTest_WaitAbove(EnTest* this, GlobalContext* globalCtx); +void EnTest_Fall(EnTest* this, GlobalContext* globalCtx); +void EnTest_Land(EnTest* this, GlobalContext* globalCtx); +void EnTest_Rise(EnTest* this, GlobalContext* globalCtx); +void EnTest_Idle(EnTest* this, GlobalContext* globalCtx); +void EnTest_WalkAndBlock(EnTest* this, GlobalContext* globalCtx); void func_80860C24(EnTest* this, GlobalContext* globalCtx); void func_80860F84(EnTest* this, GlobalContext* globalCtx); -void func_8086149C(EnTest* this, GlobalContext* globalCtx); -void func_808615F4(EnTest* this, GlobalContext* globalCtx); -void func_80861898(EnTest* this, GlobalContext* globalCtx); -void func_808619EC(EnTest* this, GlobalContext* globalCtx); -void func_80861C40(EnTest* this, GlobalContext* globalCtx); -void func_80861DC8(EnTest* this, GlobalContext* globalCtx); -void func_80861F80(EnTest* this, GlobalContext* globalCtx); -void func_8086209C(EnTest* this, GlobalContext* globalCtx); +void EnTest_SlashDown(EnTest* this, GlobalContext* globalCtx); +void EnTest_SlashDownEnd(EnTest* this, GlobalContext* globalCtx); +void EnTest_SlashUp(EnTest* this, GlobalContext* globalCtx); +void EnTest_JumpBack(EnTest* this, GlobalContext* globalCtx); +void EnTest_Jumpslash(EnTest* this, GlobalContext* globalCtx); +void EnTest_JumpUp(EnTest* this, GlobalContext* globalCtx); +void EnTest_StopAndBlock(EnTest* this, GlobalContext* globalCtx); +void EnTest_IdleFromBlock(EnTest* this, GlobalContext* globalCtx); void func_808621D4(EnTest* this, GlobalContext* globalCtx); void func_80862418(EnTest* this, GlobalContext* globalCtx); -void func_80862650(EnTest* this, GlobalContext* globalCtx); +void EnTest_Stunned(EnTest* this, GlobalContext* globalCtx); void func_808628C8(EnTest* this, GlobalContext* globalCtx); void func_80862E6C(EnTest* this, GlobalContext* globalCtx); void func_80863044(EnTest* this, GlobalContext* globalCtx); void func_8086318C(EnTest* this, GlobalContext* globalCtx); -void func_80863294(EnTest* this, GlobalContext* globalCtx); +void EnTest_Recoil(EnTest* this, GlobalContext* globalCtx); +void func_808633E8(EnTest* this, GlobalContext* globalCtx); +void func_80862FA8(EnTest* this, GlobalContext* globalCtx); -extern UNK_TYPE D_06000444; -extern UNK_TYPE D_06001420; -extern UNK_TYPE D_06001978; -extern UNK_TYPE D_06001C20; -extern UNK_TYPE D_060026D4; -extern UNK_TYPE D_0600316C; -extern UNK_TYPE D_06007C28; -extern UNK_TYPE D_060081B4; -extern UNK_TYPE D_06008604; -extern UNK_TYPE D_06009A90; -extern UNK_TYPE D_0600A324; -extern UNK_TYPE D_0600A99C; -extern UNK_TYPE D_0600B00C; -extern UNK_TYPE D_0600B4E4; -extern UNK_TYPE D_0600BE4C; -extern UNK_TYPE D_0600C438; -extern UNK_TYPE D_0600E2B0; +s32 EnTest_ReactToProjectile(GlobalContext* globalCtx, EnTest* this); + +static u8 sJointCopyFlags[] = { + false, // STALFOS_LIMB_NONE + false, // STALFOS_LIMB_ROOT + false, // STALFOS_LIMB_UPPERBODY_ROOT + false, // STALFOS_LIMB_CORE_LOWER_ROOT + true, // STALFOS_LIMB_CORE_UPPER_ROOT + true, // STALFOS_LIMB_NECK_ROOT + true, // STALFOS_LIMB_HEAD_ROOT + true, // STALFOS_LIMB_7 + true, // STALFOS_LIMB_8 + true, // STALFOS_LIMB_JAW_ROOT + true, // STALFOS_LIMB_JAW + true, // STALFOS_LIMB_HEAD + true, // STALFOS_LIMB_NECK_UPPER + true, // STALFOS_LIMB_NECK_LOWER + true, // STALFOS_LIMB_CORE_UPPER + true, // STALFOS_LIMB_CHEST + true, // STALFOS_LIMB_SHOULDER_R_ROOT + true, // STALFOS_LIMB_SHOULDER_ARMOR_R_ROOT + true, // STALFOS_LIMB_SHOULDER_ARMOR_R + true, // STALFOS_LIMB_SHOULDER_L_ROOT + true, // STALFOS_LIMB_SHOULDER_ARMOR_L_ROOT + true, // STALFOS_LIMB_SHOULDER_ARMOR_L + true, // STALFOS_LIMB_ARM_L_ROOT + true, // STALFOS_LIMB_UPPERARM_L_ROOT + true, // STALFOS_LIMB_FOREARM_L_ROOT + true, // STALFOS_LIMB_HAND_L_ROOT + true, // STALFOS_LIMB_HAND_L + true, // STALFOS_LIMB_SHIELD + true, // STALFOS_LIMB_FOREARM_L + true, // STALFOS_LIMB_UPPERARM_L + true, // STALFOS_LIMB_ARM_R_ROOT + true, // STALFOS_LIMB_UPPERARM_R_ROOT + true, // STALFOS_LIMB_FOREARM_R_ROOT + true, // STALFOS_LIMB_HAND_R_ROOT + true, // STALFOS_LIMB_SWORD + true, // STALFOS_LIMB_HAND_R + true, // STALFOS_LIMB_FOREARM_R + true, // STALFOS_LIMB_UPPERARM_R + true, // STALFOS_LIMB_CORE_LOWER + false, // STALFOS_LIMB_LOWERBODY_ROOT + false, // STALFOS_LIMB_WAIST_ROOT + false, // STALFOS_LIMB_LEGS_ROOT + false, // STALFOS_LIMB_LEG_L_ROOT + false, // STALFOS_LIMB_THIGH_L_ROOT + false, // STALFOS_LIMB_LOWERLEG_L_ROOT + false, // STALFOS_LIMB_ANKLE_L_ROOT + false, // STALFOS_LIMB_ANKLE_L + false, // STALFOS_LIMB_FOOT_L_ROOT + false, // STALFOS_LIMB_FOOT_L + false, // STALFOS_LIMB_LOWERLEG_L + false, // STALFOS_LIMB_THIGH_L + false, // STALFOS_LIMB_LEG_R_ROOT + false, // STALFOS_LIMB_THIGH_R_ROOT + false, // STALFOS_LIMB_LOWERLEG_R_ROOT + false, // STALFOS_LIMB_ANKLE_R_ROOT + false, // STALFOS_LIMB_ANKLE_R + false, // STALFOS_LIMB_FOOT_R_ROOT + false, // STALFOS_LIMB_FOOT_R + false, // STALFOS_LIMB_LOWERLEG_R + false, // STALFOS_LIMB_THIGH_R + false, // STALFOS_LIMB_WAIST +}; -/* const ActorInit En_Test_InitVars = { ACTOR_EN_TEST, ACTORCAT_ENEMY, @@ -74,7 +139,7 @@ const ActorInit En_Test_InitVars = { (ActorFunc)EnTest_Draw, }; -static ColliderCylinderInit D_80864570 = { +static ColliderCylinderInit sBodyColliderInit = { { COLTYPE_HIT5, AT_NONE, @@ -94,7 +159,7 @@ static ColliderCylinderInit D_80864570 = { { 25, 65, 0, { 0, 0, 0 } }, }; -static ColliderCylinderInit D_8086459C = { +static ColliderCylinderInit sShieldColliderInit = { { COLTYPE_METAL, AT_NONE, @@ -114,7 +179,7 @@ static ColliderCylinderInit D_8086459C = { { 20, 70, -50, { 0, 0, 0 } }, }; -static ColliderQuadInit D_808645C8 = { +static ColliderQuadInit sSwordColliderInit = { { COLTYPE_NONE, AT_ON | AT_TYPE_ENEMY, @@ -133,126 +198,1868 @@ static ColliderQuadInit D_808645C8 = { }, { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_SetupAction.s") +typedef enum { + /* 0x0 */ STALFOS_DMGEFF_NORMAL, + /* 0x1 */ STALFOS_DMGEFF_STUN, + /* 0x6 */ STALFOS_DMGEFF_FIREMAGIC = 6, + /* 0xD */ STALFOS_DMGEFF_SLING = 0xD, + /* 0xE */ STALFOS_DMGEFF_LIGHT, + /* 0xF */ STALFOS_DMGEFF_FREEZE +} StalfosDamageEffect; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Init.s") +static DamageTable sDamageTable = { + /* Deku nut */ DMG_ENTRY(0, STALFOS_DMGEFF_STUN), + /* Deku stick */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL), + /* Slingshot */ DMG_ENTRY(1, STALFOS_DMGEFF_SLING), + /* Explosive */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL), + /* Boomerang */ DMG_ENTRY(0, STALFOS_DMGEFF_STUN), + /* Normal arrow */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL), + /* Hammer swing */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL), + /* Hookshot */ DMG_ENTRY(0, STALFOS_DMGEFF_STUN), + /* Kokiri sword */ DMG_ENTRY(1, STALFOS_DMGEFF_NORMAL), + /* Master sword */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL), + /* Giant's Knife */ DMG_ENTRY(4, STALFOS_DMGEFF_NORMAL), + /* Fire arrow */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL), + /* Ice arrow */ DMG_ENTRY(4, STALFOS_DMGEFF_FREEZE), + /* Light arrow */ DMG_ENTRY(2, STALFOS_DMGEFF_LIGHT), + /* Unk arrow 1 */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL), + /* Unk arrow 2 */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL), + /* Unk arrow 3 */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL), + /* Fire magic */ DMG_ENTRY(0, STALFOS_DMGEFF_FIREMAGIC), + /* Ice magic */ DMG_ENTRY(3, STALFOS_DMGEFF_FREEZE), + /* Light magic */ DMG_ENTRY(0, STALFOS_DMGEFF_LIGHT), + /* Shield */ DMG_ENTRY(0, STALFOS_DMGEFF_NORMAL), + /* Mirror Ray */ DMG_ENTRY(0, STALFOS_DMGEFF_NORMAL), + /* Kokiri spin */ DMG_ENTRY(1, STALFOS_DMGEFF_NORMAL), + /* Giant spin */ DMG_ENTRY(4, STALFOS_DMGEFF_NORMAL), + /* Master spin */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL), + /* Kokiri jump */ DMG_ENTRY(2, STALFOS_DMGEFF_NORMAL), + /* Giant jump */ DMG_ENTRY(8, STALFOS_DMGEFF_NORMAL), + /* Master jump */ DMG_ENTRY(4, STALFOS_DMGEFF_NORMAL), + /* Unknown 1 */ DMG_ENTRY(0, STALFOS_DMGEFF_NORMAL), + /* Unblockable */ DMG_ENTRY(0, STALFOS_DMGEFF_NORMAL), + /* Hammer jump */ DMG_ENTRY(4, STALFOS_DMGEFF_NORMAL), + /* Unknown 2 */ DMG_ENTRY(0, STALFOS_DMGEFF_NORMAL), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Destroy.s") +static InitChainEntry sInitChain[] = { + ICHAIN_S8(naviEnemyId, 0x1B, ICHAIN_CONTINUE), ICHAIN_F32(targetArrowOffset, 500, ICHAIN_CONTINUE), + ICHAIN_VEC3F_DIV1000(scale, 15, ICHAIN_CONTINUE), ICHAIN_F32(scale.y, 0, ICHAIN_CONTINUE), + ICHAIN_F32_DIV1000(gravity, -1500, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_8085F938.s") +void EnTest_SetupAction(EnTest* this, EnTestActionFunc actionFunc) { + this->actionFunc = actionFunc; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FAB0.s") +void EnTest_Init(Actor* thisx, GlobalContext* globalCtx) { + EffectBlureInit1 slashBlure; + EnTest* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FDD0.s") + Actor_ProcessInitChain(&this->actor, sInitChain); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FE48.s") + SkelAnime_Init(globalCtx, &this->skelAnime, &gStalfosSkel, &gStalfosMiddleGuardAnim, this->jointTable, + this->morphTable, STALFOS_LIMB_MAX); + SkelAnime_Init(globalCtx, &this->upperSkelanime, &gStalfosSkel, &gStalfosMiddleGuardAnim, this->upperJointTable, + this->upperMorphTable, STALFOS_LIMB_MAX); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF28.s") + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFeet, 90.0f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF9C.s") + this->actor.colChkInfo.cylRadius = 40; + this->actor.colChkInfo.cylHeight = 100; + this->actor.focus.pos = this->actor.world.pos; + this->actor.focus.pos.y += 45.0f; + this->actor.colChkInfo.damageTable = &sDamageTable; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s") + Collider_InitCylinder(globalCtx, &this->bodyCollider); + Collider_SetCylinder(globalCtx, &this->bodyCollider, &this->actor, &sBodyColliderInit); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_808600EC.s") + Collider_InitCylinder(globalCtx, &this->shieldCollider); + Collider_SetCylinder(globalCtx, &this->shieldCollider, &this->actor, &sShieldColliderInit); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80860318.s") + Collider_InitQuad(globalCtx, &this->swordCollider); + Collider_SetQuad(globalCtx, &this->swordCollider, &this->actor, &sSwordColliderInit); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_808603CC.s") + this->actor.colChkInfo.mass = MASS_HEAVY; + this->actor.colChkInfo.health = 10; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s") + slashBlure.p1StartColor[0] = slashBlure.p1StartColor[1] = slashBlure.p1StartColor[2] = slashBlure.p1StartColor[3] = + slashBlure.p2StartColor[0] = slashBlure.p2StartColor[1] = slashBlure.p2StartColor[2] = + slashBlure.p1EndColor[0] = slashBlure.p1EndColor[1] = slashBlure.p1EndColor[2] = slashBlure.p2EndColor[0] = + slashBlure.p2EndColor[1] = slashBlure.p2EndColor[2] = 255; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_808604FC.s") + slashBlure.p1EndColor[3] = 0; + slashBlure.p2EndColor[3] = 0; + slashBlure.p2StartColor[3] = 64; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80860BDC.s") + slashBlure.elemDuration = 4; + slashBlure.unkFlag = 0; + slashBlure.calcMode = 2; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80860C24.s") + Effect_Add(globalCtx, &this->effectIndex, EFFECT_BLURE1, 0, 0, &slashBlure); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s") + if (this->actor.params != STALFOS_TYPE_CEILING) { + EnTest_SetupWaitGround(this); + } else { + EnTest_SetupWaitAbove(this); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80860F84.s") + if (this->actor.params == STALFOS_TYPE_INVISIBLE) { + this->actor.flags |= 0x80; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80861418.s") +void EnTest_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnTest* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_8086149C.s") + if ((this->actor.params != STALFOS_TYPE_2) && + !Actor_FindNearby(globalCtx, &this->actor, ACTOR_EN_TEST, ACTORCAT_ENEMY, 8000.0f)) { + func_800F5B58(); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_808615A4.s") + Effect_Delete(globalCtx, this->effectIndex); + Collider_DestroyCylinder(globalCtx, &this->shieldCollider); + Collider_DestroyCylinder(globalCtx, &this->bodyCollider); + Collider_DestroyQuad(globalCtx, &this->swordCollider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_808615F4.s") +/** + * If EnTest_ChooseAction failed to pick a new action, this function will unconditionally pick + * a new action as a last resort + */ +void EnTest_ChooseRandomAction(EnTest* this, GlobalContext* globalCtx) { + switch ((u32)(Rand_ZeroOne() * 10.0f)) { + case 0: + case 1: + case 5: + case 6: + if ((this->actor.xzDistToPlayer < 220.0f) && (this->actor.xzDistToPlayer > 170.0f) && + Actor_IsFacingPlayer(&this->actor, 0x71C) && Actor_IsTargeted(globalCtx, &this->actor)) { + EnTest_SetupJumpslash(this); + break; + } + // fallthrough + case 8: + EnTest_SetupWalkAndBlock(this); + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_8086181C.s") + case 3: + case 4: + case 7: + func_808627C4(this, globalCtx); + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80861898.s") + case 2: + case 9: + case 10: + EnTest_SetupStopAndBlock(this); + break; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_8086194C.s") +void EnTest_ChooseAction(EnTest* this, GlobalContext* globalCtx) { + s32 pad; + Player* player = PLAYER; + s16 yawDiff = player->actor.shape.rot.y - this->actor.shape.rot.y; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_808619EC.s") + yawDiff = ABS(yawDiff); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80861B94.s") + if (yawDiff >= 0x61A8) { + switch ((u32)(Rand_ZeroOne() * 10.0f)) { + case 0: + case 3: + case 7: + EnTest_SetupStopAndBlock(this); + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80861C40.s") + case 1: + case 5: + case 6: + case 8: + func_808627C4(this, globalCtx); + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80861D50.s") + case 2: + case 4: + case 9: + if (this->actor.params != STALFOS_TYPE_CEILING) { + this->actor.world.rot.y = this->actor.yawTowardsPlayer; + EnTest_SetupJumpBack(this); + } + break; + } + } else if (yawDiff <= 0x3E80) { + if (ABS((s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y)) > 0x3E80) { + if (((globalCtx->gameplayFrames % 2) != 0) && (this->actor.params != STALFOS_TYPE_CEILING)) { + this->actor.world.rot.y = this->actor.yawTowardsPlayer; + EnTest_SetupJumpBack(this); + } else if ((this->actor.xzDistToPlayer < 220.0f) && (this->actor.xzDistToPlayer > 170.0f)) { + if (Actor_IsFacingPlayer(&this->actor, 0x71C) && !Actor_IsTargeted(globalCtx, &this->actor)) { + EnTest_SetupJumpslash(this); + } + } else { + EnTest_SetupWalkAndBlock(this); + } + } else { + if (this->actor.xzDistToPlayer < 110.0f) { + if (Rand_ZeroOne() > 0.2f) { + if (player->stateFlags1 & 0x10) { + if (this->actor.isTargeted) { + EnTest_SetupSlashDown(this); + } else { + func_808627C4(this, globalCtx); + } + } else { + EnTest_SetupSlashDown(this); + } + } + } else { + EnTest_ChooseRandomAction(this, globalCtx); + } + } + } else { + EnTest_ChooseRandomAction(this, globalCtx); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80861DC8.s") +void EnTest_SetupWaitGround(EnTest* this) { + Animation_PlayLoop(&this->skelAnime, &gStalfosMiddleGuardAnim); + this->unk_7C8 = 0; + this->timer = 15; + this->actor.scale.y = 0.0f; + this->actor.world.pos.y = this->actor.home.pos.y - 3.5f; + this->actor.flags &= ~1; + EnTest_SetupAction(this, EnTest_WaitGround); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80861EC0.s") +void EnTest_WaitGround(EnTest* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80861F80.s") + if ((this->timer == 0) && (ABS(this->actor.yDistToPlayer) < 150.0f)) { + this->unk_7C8 = 3; + EnTest_SetupAction(this, EnTest_Rise); + this->actor.world.rot.y = this->actor.yawTowardsPlayer; + this->actor.shape.rot.y = this->actor.yawTowardsPlayer; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80862050.s") + if (this->actor.params != STALFOS_TYPE_2) { + func_800F5ACC(0x38); + } + } else { + if (this->timer != 0) { + this->timer--; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_8086209C.s") + this->actor.world.pos.y = this->actor.home.pos.y - 3.5f; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80862154.s") +void EnTest_SetupWaitAbove(EnTest* this) { + Animation_PlayLoop(&this->skelAnime, &gStalfosMiddleGuardAnim); + this->unk_7C8 = 0; + this->actor.world.pos.y = this->actor.home.pos.y + 150.0f; + Actor_SetScale(&this->actor, 0.0f); + this->actor.flags &= ~1; + EnTest_SetupAction(this, EnTest_WaitAbove); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_808621D4.s") +void EnTest_WaitAbove(EnTest* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + this->actor.world.pos.y = this->actor.home.pos.y + 150.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80862398.s") + if ((this->actor.xzDistToPlayer < 200.0f) && (ABS(this->actor.yDistToPlayer) < 450.0f)) { + EnTest_SetupAction(this, EnTest_Fall); + this->actor.flags |= 1; + this->actor.shape.rot.y = this->actor.world.rot.y = this->actor.yawTowardsPlayer; + Actor_SetScale(&this->actor, 0.015f); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80862418.s") +void EnTest_SetupIdle(EnTest* this) { + Animation_PlayLoop(&this->skelAnime, &gStalfosMiddleGuardAnim); + this->unk_7C8 = 0xA; + this->timer = (Rand_ZeroOne() * 10.0f) + 5.0f; + this->actor.speedXZ = 0.0f; + this->actor.world.rot.y = this->actor.shape.rot.y; + EnTest_SetupAction(this, EnTest_Idle); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80862578.s") +void EnTest_Idle(EnTest* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s16 yawDiff; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80862650.s") + SkelAnime_Update(&this->skelAnime); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s") + if (!EnTest_ReactToProjectile(globalCtx, this)) { + yawDiff = player->actor.shape.rot.y - this->actor.shape.rot.y; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_808628C8.s") + if (this->actor.xzDistToPlayer < 100.0f) { + if ((player->swordState != 0) && (ABS(yawDiff) >= 0x1F40)) { + this->actor.shape.rot.y = this->actor.world.rot.y = this->actor.yawTowardsPlayer; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80862DBC.s") + if (Rand_ZeroOne() > 0.7f && player->swordAnimation != 0x11) { + EnTest_SetupJumpBack(this); + } else { + func_808627C4(this, globalCtx); + } + return; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80862E6C.s") + if (this->timer != 0) { + this->timer--; + } else { + if (Actor_IsFacingPlayer(&this->actor, 0x1555)) { + if ((this->actor.xzDistToPlayer < 220.0f) && (this->actor.xzDistToPlayer > 160.0f) && + (Rand_ZeroOne() < 0.3f)) { + if (Actor_IsTargeted(globalCtx, &this->actor)) { + EnTest_SetupJumpslash(this); + } else { + func_808627C4(this, globalCtx); + } + } else { + if (Rand_ZeroOne() > 0.3f) { + EnTest_SetupWalkAndBlock(this); + } else { + func_808627C4(this, globalCtx); + } + } + } else { + if (Rand_ZeroOne() > 0.7f) { + func_80860BDC(this); + } else { + EnTest_ChooseAction(this, globalCtx); + } + } + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80862FA8.s") +void EnTest_Fall(EnTest* this, GlobalContext* globalCtx) { + Animation_PlayOnceSetSpeed(&this->skelAnime, &gStalfosLandFromLeapAnim, 0.0f); + SkelAnime_Update(&this->skelAnime); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80863044.s") + if (this->actor.world.pos.y <= this->actor.floorHeight) { + this->skelAnime.playSpeed = 1.0f; + this->unk_7C8 = 0xC; + this->timer = this->unk_7E4 * 0.15f; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_RIZA_DOWN); + EnTest_SetupAction(this, EnTest_Land); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_808630F0.s") +void EnTest_Land(EnTest* this, GlobalContext* globalCtx) { + if (SkelAnime_Update(&this->skelAnime)) { + EnTest_SetupIdle(this); + this->timer = (Rand_ZeroOne() * 10.0f) + 5.0f; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_8086318C.s") +void EnTest_SetupWalkAndBlock(EnTest* this) { + Animation_Change(&this->upperSkelanime, &gStalfosBlockWithShieldAnim, 2.0f, 0.0f, + Animation_GetLastFrame(&gStalfosBlockWithShieldAnim), 2, 2.0f); + Animation_PlayLoop(&this->skelAnime, &gStalfosSlowAdvanceAnim); + this->timer = (s16)(Rand_ZeroOne() * 5.0f); + this->unk_7C8 = 0xD; + this->actor.world.rot.y = this->actor.shape.rot.y; + EnTest_SetupAction(this, EnTest_WalkAndBlock); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80863240.s") +void EnTest_WalkAndBlock(EnTest* this, GlobalContext* globalCtx) { + s32 pad; + f32 checkDist = 0.0f; + s32 pad1; + s32 prevFrame; + s32 temp_f16; + f32 playSpeed; + Player* player = PLAYER; + f32 absPlaySpeed; + s16 yawDiff; + s32 temp_v0_2; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80863294.s") + if (!EnTest_ReactToProjectile(globalCtx, this)) { + this->timer++; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80863360.s") + if (Actor_OtherIsTargeted(globalCtx, &this->actor)) { + checkDist = 150.0f; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_808633E8.s") + if (this->actor.xzDistToPlayer <= (80.0f + checkDist)) { + Math_SmoothStepToF(&this->actor.speedXZ, -5.0f, 1.0f, 0.8f, 0.0f); + } else if (this->actor.xzDistToPlayer > (110.0f + checkDist)) { + Math_SmoothStepToF(&this->actor.speedXZ, 5.0f, 1.0f, 0.8f, 0.0f); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80863460.s") + if (this->actor.speedXZ >= 5.0f) { + this->actor.speedXZ = 5.0f; + } else if (this->actor.speedXZ < -5.0f) { + this->actor.speedXZ = -5.0f; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_808634F8.s") + if ((this->actor.params == STALFOS_TYPE_CEILING) && + !func_800339B8(&this->actor, globalCtx, this->actor.speedXZ, this->actor.world.rot.y)) { + this->actor.speedXZ *= -1.0f; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s") + if (ABS(this->actor.speedXZ) < 3.0f) { + Animation_Change(&this->skelAnime, &gStalfosSlowAdvanceAnim, 0.0f, this->skelAnime.curFrame, + Animation_GetLastFrame(&gStalfosSlowAdvanceAnim), 0, -6.0f); + playSpeed = this->actor.speedXZ * 10.0f; + } else { + Animation_Change(&this->skelAnime, &gStalfosFastAdvanceAnim, 0.0f, this->skelAnime.curFrame, + Animation_GetLastFrame(&gStalfosFastAdvanceAnim), 0, -4.0f); + playSpeed = this->actor.speedXZ * 10.0f * 0.02f; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80863AB8.s") + if (this->actor.speedXZ >= 0.0f) { + if (this->unk_7DE == 0) { + this->unk_7DE++; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80863CC4.s") + playSpeed = CLAMP_MAX(playSpeed, 2.5f); + this->skelAnime.playSpeed = playSpeed; + } else { + playSpeed = CLAMP_MIN(playSpeed, -2.5f); + this->skelAnime.playSpeed = playSpeed; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Draw.s") + yawDiff = player->actor.shape.rot.y - this->actor.shape.rot.y; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s") + if ((this->actor.xzDistToPlayer < 100.0f) && (player->swordState != 0)) { + if (ABS(yawDiff) >= 0x1F40) { + this->actor.shape.rot.y = this->actor.world.rot.y = this->actor.yawTowardsPlayer; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Test/func_808641E8.s") + if ((Rand_ZeroOne() > 0.7f) && (player->swordAnimation != 0x11)) { + EnTest_SetupJumpBack(this); + } else { + EnTest_SetupStopAndBlock(this); + } + + return; + } + } + + prevFrame = this->skelAnime.curFrame; + SkelAnime_Update(&this->skelAnime); + + temp_f16 = this->skelAnime.curFrame - ABS(this->skelAnime.playSpeed); + absPlaySpeed = ABS(this->skelAnime.playSpeed); + + if ((s32)this->skelAnime.curFrame != prevFrame) { + temp_v0_2 = (s32)absPlaySpeed + prevFrame; + + if (((temp_v0_2 > 1) && (temp_f16 <= 0)) || ((temp_f16 < 7) && (temp_v0_2 >= 8))) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STAL_WALK); + } + } + + if ((this->timer % 32) == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STAL_WARAU); + this->timer += (s16)(Rand_ZeroOne() * 5.0f); + } + + if ((this->actor.xzDistToPlayer < 220.0f) && (this->actor.xzDistToPlayer > 160.0f) && + (Actor_IsFacingPlayer(&this->actor, 0x71C))) { + if (Actor_IsTargeted(globalCtx, &this->actor)) { + if (Rand_ZeroOne() < 0.1f) { + EnTest_SetupJumpslash(this); + return; + } + } else if (player->heldItemActionParam != PLAYER_AP_NONE) { + if (this->actor.isTargeted) { + if ((globalCtx->gameplayFrames % 2) != 0) { + func_808627C4(this, globalCtx); + return; + } + + EnTest_ChooseAction(this, globalCtx); + } else { + func_80860EC0(this); + } + } + } + + if (Rand_ZeroOne() < 0.4f) { + this->actor.shape.rot.y = this->actor.world.rot.y = this->actor.yawTowardsPlayer; + } + + if (!Actor_IsFacingPlayer(&this->actor, 0x11C7)) { + EnTest_SetupIdle(this); + this->timer = (Rand_ZeroOne() * 10.0f) + 10.0f; + return; + } + + if (this->actor.xzDistToPlayer < 110.0f) { + if (Rand_ZeroOne() > 0.2f) { + if (player->stateFlags1 & 0x10) { + if (this->actor.isTargeted) { + EnTest_SetupSlashDown(this); + } else { + func_808627C4(this, globalCtx); + } + } else { + EnTest_SetupSlashDown(this); + } + } else { + EnTest_SetupStopAndBlock(this); + } + } else if (Rand_ZeroOne() < 0.1f) { + this->actor.speedXZ = 5.0f; + } + } +} + +// a variation of sidestep +void func_80860BDC(EnTest* this) { + Animation_PlayLoop(&this->skelAnime, &gStalfosSidestepAnim); + this->unk_7C8 = 0xE; + EnTest_SetupAction(this, func_80860C24); +} + +// a variation of sidestep +void func_80860C24(EnTest* this, GlobalContext* globalCtx) { + s16 yawDiff; + s16 yawChange; + f32 playSpeed; + s32 prevFrame; + s32 temp1; + s32 temp2; + f32 absPlaySpeed; + + if (!EnTest_ReactToProjectile(globalCtx, this)) { + yawDiff = this->actor.yawTowardsPlayer; + yawDiff -= this->actor.shape.rot.y; + + if (yawDiff > 0) { + yawChange = (yawDiff / 42.0f) + 300.0f; + this->actor.shape.rot.y += yawChange * 2; + } else { + yawChange = (yawDiff / 42.0f) - 300.0f; + this->actor.shape.rot.y += yawChange * 2; + } + + this->actor.world.rot.y = this->actor.shape.rot.y; + + if (yawDiff > 0) { + playSpeed = yawChange * 0.02f; + playSpeed = CLAMP_MAX(playSpeed, 1.0f); + this->skelAnime.playSpeed = playSpeed; + } else { + playSpeed = yawChange * 0.02f; + playSpeed = CLAMP_MIN(playSpeed, -1.0f); + this->skelAnime.playSpeed = playSpeed; + } + + prevFrame = this->skelAnime.curFrame; + + SkelAnime_Update(&this->skelAnime); + + temp1 = this->skelAnime.curFrame - ABS(this->skelAnime.playSpeed); + absPlaySpeed = ABS(this->skelAnime.playSpeed); + + if (1) {} + + if ((s32)this->skelAnime.curFrame != prevFrame) { + temp2 = (s32)absPlaySpeed + prevFrame; + + if (((temp2 > 2) && (temp1 <= 0)) || ((temp1 < 7) && (temp2 >= 9))) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STAL_WALK); + } + } + + if (Actor_IsFacingPlayer(&this->actor, 0x71C)) { + if (Rand_ZeroOne() > 0.8f) { + if ((Rand_ZeroOne() > 0.7f)) { + func_80860EC0(this); + } else { + EnTest_ChooseAction(this, globalCtx); + } + } else { + EnTest_SetupWalkAndBlock(this); + } + } + } +} + +// a variation of sidestep +void func_80860EC0(EnTest* this) { + Animation_PlayLoop(&this->skelAnime, &gStalfosSidestepAnim); + this->unk_7C8 = 0xF; + this->actor.speedXZ = (Rand_ZeroOne() > 0.5f) ? -0.5f : 0.5f; + this->timer = (s16)((Rand_ZeroOne() * 15.0f) + 25.0f); + this->unk_7EC = 0.0f; + this->actor.world.rot.y = this->actor.shape.rot.y; + EnTest_SetupAction(this, func_80860F84); +} + +// a variation of sidestep +void func_80860F84(EnTest* this, GlobalContext* globalCtx) { + s16 playerYaw180; + s32 pad; + s32 prevFrame; + s32 temp_f16; + s16 yawDiff; + Player* player = PLAYER; + f32 checkDist = 0.0f; + s16 newYaw; + f32 absPlaySpeed; + s32 temp_v0_2; + + if (!EnTest_ReactToProjectile(globalCtx, this)) { + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 1, 0xFA0, 1); + this->actor.world.rot.y = this->actor.shape.rot.y + 0x3E80; + playerYaw180 = player->actor.shape.rot.y + 0x8000; + + if (this->actor.speedXZ >= 0.0f) { + if (this->actor.speedXZ < 6.0f) { + this->actor.speedXZ += 0.5f; + } else { + this->actor.speedXZ = 6.0f; + } + } else { + if (this->actor.speedXZ > -6.0f) { + this->actor.speedXZ -= 0.5f; + } else { + this->actor.speedXZ = -6.0f; + } + } + + if ((this->actor.bgCheckFlags & 8) || + ((this->actor.params == STALFOS_TYPE_CEILING) && + !func_800339B8(&this->actor, globalCtx, this->actor.speedXZ, this->actor.world.rot.y))) { + if (this->actor.bgCheckFlags & 8) { + if (this->actor.speedXZ >= 0.0f) { + newYaw = this->actor.shape.rot.y + 0x3FFF; + } else { + newYaw = this->actor.shape.rot.y - 0x3FFF; + } + + newYaw = this->actor.wallYaw - newYaw; + } else { + this->actor.speedXZ *= -0.8f; + newYaw = 0; + } + + if (ABS(newYaw) > 0x4000) { + this->actor.speedXZ *= -0.8f; + + if (this->actor.speedXZ < 0.0f) { + this->actor.speedXZ -= 0.5f; + } else { + this->actor.speedXZ += 0.5f; + } + } + } + + if (Actor_OtherIsTargeted(globalCtx, &this->actor)) { + checkDist = 200.0f; + } + + if (this->actor.xzDistToPlayer <= (80.0f + checkDist)) { + Math_SmoothStepToF(&this->unk_7EC, -2.5f, 1.0f, 0.8f, 0.0f); + } else if (this->actor.xzDistToPlayer > (110.0f + checkDist)) { + Math_SmoothStepToF(&this->unk_7EC, 2.5f, 1.0f, 0.8f, 0.0f); + } else { + Math_SmoothStepToF(&this->unk_7EC, 0.0f, 1.0f, 6.65f, 0.0f); + } + + if (this->unk_7EC != 0.0f) { + this->actor.world.pos.x += Math_SinS(this->actor.shape.rot.y) * this->unk_7EC; + this->actor.world.pos.z += Math_CosS(this->actor.shape.rot.y) * this->unk_7EC; + } + + this->skelAnime.playSpeed = this->actor.speedXZ * 0.5f; + prevFrame = this->skelAnime.curFrame; + SkelAnime_Update(&this->skelAnime); + + temp_f16 = this->skelAnime.curFrame - ABS(this->skelAnime.playSpeed); + absPlaySpeed = ABS(this->skelAnime.playSpeed); + + if ((s32)this->skelAnime.curFrame != prevFrame) { + temp_v0_2 = (s32)absPlaySpeed + prevFrame; + + if (((temp_v0_2 > 1) && (temp_f16 <= 0)) || ((temp_f16 < 7) && (temp_v0_2 >= 8))) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STAL_WALK); + } + } + + if ((globalCtx->gameplayFrames & 95) == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STAL_WARAU); + } + + yawDiff = playerYaw180 - this->actor.shape.rot.y; + yawDiff = ABS(yawDiff); + + if ((yawDiff > 0x6800) || (this->timer == 0)) { + EnTest_ChooseAction(this, globalCtx); + } else if (this->timer != 0) { + this->timer--; + } + } +} + +void EnTest_SetupSlashDown(EnTest* this) { + Animation_PlayOnce(&this->skelAnime, &gStalfosDownSlashAnim); + func_800F8A44(&this->actor.projectedPos, NA_SE_EN_STAL_WARAU); + this->swordCollider.base.atFlags &= ~AT_BOUNCED; + this->unk_7C8 = 0x10; + this->actor.speedXZ = 0.0f; + EnTest_SetupAction(this, EnTest_SlashDown); + this->swordCollider.info.toucher.damage = 16; + + if (this->unk_7DE != 0) { + this->unk_7DE = 3; + } +} + +void EnTest_SlashDown(EnTest* this, GlobalContext* globalCtx) { + this->actor.speedXZ = 0.0f; + + if ((s32)this->skelAnime.curFrame < 4) { + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 1, 0xBB8, 0); + } + + if ((s32)this->skelAnime.curFrame == 7) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STAL_SAKEBI); + } + + if ((this->skelAnime.curFrame > 7.0f) && (this->skelAnime.curFrame < 11.0f)) { + this->swordState = 1; + } else { + this->swordState = 0; + } + + if (SkelAnime_Update(&this->skelAnime)) { + if ((globalCtx->gameplayFrames % 2) != 0) { + EnTest_SetupSlashDownEnd(this); + } else { + EnTest_SetupSlashUp(this); + } + } +} + +void EnTest_SetupSlashDownEnd(EnTest* this) { + Animation_PlayOnce(&this->skelAnime, &gStalfosRecoverFromDownSlashAnim); + this->unk_7C8 = 0x12; + this->actor.speedXZ = 0.0f; + EnTest_SetupAction(this, EnTest_SlashDownEnd); +} + +void EnTest_SlashDownEnd(EnTest* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s16 yawDiff; + + if (SkelAnime_Update(&this->skelAnime)) { + if (this->swordCollider.base.atFlags & AT_HIT) { + this->swordCollider.base.atFlags &= ~AT_HIT; + if (this->actor.params != STALFOS_TYPE_CEILING) { + EnTest_SetupJumpBack(this); + return; + } + } + + if (Rand_ZeroOne() > 0.7f) { + EnTest_SetupIdle(this); + this->timer = (Rand_ZeroOne() * 5.0f) + 5.0f; + return; + } + + this->actor.world.rot.y = Actor_WorldYawTowardActor(&this->actor, &player->actor); + + if (Rand_ZeroOne() > 0.7f) { + if (this->actor.params != STALFOS_TYPE_CEILING) { + EnTest_SetupJumpBack(this); + return; + } + } + + yawDiff = player->actor.shape.rot.y - this->actor.shape.rot.y; + + if (ABS(yawDiff) <= 0x2710) { + yawDiff = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; + + if ((ABS(yawDiff) > 0x3E80) && (this->actor.params != STALFOS_TYPE_CEILING)) { + this->actor.world.rot.y = this->actor.yawTowardsPlayer; + EnTest_SetupJumpBack(this); + } else if (player->stateFlags1 & 0x10) { + if (this->actor.isTargeted) { + EnTest_SetupSlashDown(this); + } else if ((globalCtx->gameplayFrames % 2) != 0) { + func_808627C4(this, globalCtx); + } else { + EnTest_SetupJumpBack(this); + } + } else { + EnTest_SetupSlashDown(this); + } + } else { + func_808627C4(this, globalCtx); + } + } +} + +void EnTest_SetupSlashUp(EnTest* this) { + Animation_PlayOnce(&this->skelAnime, &gStalfosUpSlashAnim); + this->swordCollider.base.atFlags &= ~AT_BOUNCED; + this->unk_7C8 = 0x11; + this->swordCollider.info.toucher.damage = 16; + this->actor.speedXZ = 0.0f; + EnTest_SetupAction(this, EnTest_SlashUp); + + if (this->unk_7DE != 0) { + this->unk_7DE = 3; + } +} + +void EnTest_SlashUp(EnTest* this, GlobalContext* globalCtx) { + this->actor.speedXZ = 0.0f; + + if ((s32)this->skelAnime.curFrame == 2) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STAL_SAKEBI); + } + + if ((this->skelAnime.curFrame > 1.0f) && (this->skelAnime.curFrame < 8.0f)) { + this->swordState = 1; + } else { + this->swordState = 0; + } + + if (SkelAnime_Update(&this->skelAnime)) { + EnTest_SetupSlashDown(this); + } +} + +void EnTest_SetupJumpBack(EnTest* this) { + Animation_PlayOnce(&this->skelAnime, &gStalfosJumpBackwardsAnim); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STAL_JUMP); + this->unk_7C8 = 0x14; + this->timer = 5; + EnTest_SetupAction(this, EnTest_JumpBack); + + if (this->unk_7DE != 0) { + this->unk_7DE = 3; + } + + if (this->actor.params != STALFOS_TYPE_CEILING) { + this->actor.speedXZ = -11.0f; + } else { + this->actor.speedXZ = -7.0f; + } +} + +void EnTest_JumpBack(EnTest* this, GlobalContext* globalCtx) { + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 1, 0xBB8, 1); + + if (this->timer == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STAL_WARAU); + } else { + this->timer--; + } + + if (SkelAnime_Update(&this->skelAnime)) { + if (!EnTest_ReactToProjectile(globalCtx, this)) { + if (this->actor.xzDistToPlayer <= 100.0f) { + if (Actor_IsFacingPlayer(&this->actor, 0x1555)) { + EnTest_SetupSlashDown(this); + } else { + EnTest_SetupIdle(this); + this->timer = (Rand_ZeroOne() * 5.0f) + 5.0f; + } + } else { + if ((this->actor.xzDistToPlayer <= 220.0f) && Actor_IsFacingPlayer(&this->actor, 0xE38)) { + EnTest_SetupJumpslash(this); + } else { + EnTest_SetupIdle(this); + this->timer = (Rand_ZeroOne() * 5.0f) + 5.0f; + } + } + this->actor.flags |= 1; + } + } else if (this->skelAnime.curFrame == (this->skelAnime.endFrame - 4.0f)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_GND); + } +} + +void EnTest_SetupJumpslash(EnTest* this) { + Animation_PlayOnce(&this->skelAnime, &gStalfosJumpAnim); + func_800F8A44(&this->actor.projectedPos, NA_SE_EN_STAL_WARAU); + this->timer = 0; + this->unk_7C8 = 0x17; + this->actor.velocity.y = 10.0f; + this->actor.speedXZ = 8.0f; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STAL_JUMP); + this->actor.world.rot.y = this->actor.shape.rot.y; + this->swordCollider.base.atFlags &= ~AT_BOUNCED; + EnTest_SetupAction(this, EnTest_Jumpslash); + this->swordCollider.info.toucher.damage = 32; + + if (this->unk_7DE != 0) { + this->unk_7DE = 3; + } +} + +void EnTest_Jumpslash(EnTest* this, GlobalContext* globalCtx) { + if (SkelAnime_Update(&this->skelAnime)) { + if (this->timer == 0) { + Animation_PlayOnce(&this->skelAnime, &gStalfosJumpslashAnim); + this->timer = 1; + this->swordState = 1; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STAL_SAKEBI); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STAL_JUMP); + } else { + this->actor.speedXZ = 0.0f; + EnTest_SetupIdle(this); + } + } + + if ((this->timer != 0) && (this->skelAnime.curFrame >= 5.0f)) { + this->swordState = 0; + } + + if (this->actor.world.pos.y <= this->actor.floorHeight) { + if (this->actor.speedXZ != 0.0f) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_GND); + } + + this->actor.world.pos.y = this->actor.floorHeight; + this->actor.velocity.y = 0.0f; + this->actor.speedXZ = 0.0f; + } +} + +void EnTest_SetupJumpUp(EnTest* this) { + Animation_PlayOnce(&this->skelAnime, &gStalfosJumpAnim); + this->timer = 0; + this->unk_7C8 = 4; + this->actor.velocity.y = 14.0f; + this->actor.speedXZ = 6.0f; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STAL_JUMP); + this->actor.world.rot.y = this->actor.shape.rot.y; + EnTest_SetupAction(this, EnTest_JumpUp); +} + +void EnTest_JumpUp(EnTest* this, GlobalContext* globalCtx) { + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 1, 0xFA0, 1); + SkelAnime_Update(&this->skelAnime); + + if (this->actor.world.pos.y <= this->actor.floorHeight) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_GND); + this->actor.shape.rot.y = this->actor.yawTowardsPlayer; + this->actor.world.pos.y = this->actor.floorHeight; + this->unk_7E4 = -(s32)this->actor.velocity.y; + + if (this->unk_7E4 == 0) { + this->unk_7E4 = 1; + } + + this->actor.velocity.y = 0.0f; + this->actor.speedXZ = 0.0f; + this->unk_7C8 = 0xC; + this->timer = 4; + Animation_Change(&this->skelAnime, &gStalfosLandFromLeapAnim, 0.0f, 0.0f, 0.0f, 2, 0.0f); + EnTest_SetupAction(this, EnTest_Land); + } +} + +void EnTest_SetupStopAndBlock(EnTest* this) { + Animation_Change(&this->skelAnime, &gStalfosBlockWithShieldAnim, 2.0f, 0.0f, + Animation_GetLastFrame(&gStalfosBlockWithShieldAnim), 2, 2.0f); + this->unk_7C8 = 0x15; + this->actor.speedXZ = 0.0f; + this->timer = (Rand_ZeroOne() * 10.0f) + 11.0f; + this->actor.world.rot.y = this->actor.shape.rot.y; + this->unk_7DE = 5; + EnTest_SetupAction(this, EnTest_StopAndBlock); +} + +void EnTest_StopAndBlock(EnTest* this, GlobalContext* globalCtx) { + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 0.5f, 0.0f); + SkelAnime_Update(&this->skelAnime); + + if ((ABS((s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y)) > 0x3E80) && + (this->actor.params != STALFOS_TYPE_CEILING) && ((globalCtx->gameplayFrames % 2) != 0)) { + this->actor.world.rot.y = this->actor.yawTowardsPlayer; + EnTest_SetupJumpBack(this); + } + + if (this->timer == 0) { + EnTest_SetupIdleFromBlock(this); + } else { + this->timer--; + } +} + +void EnTest_SetupIdleFromBlock(EnTest* this) { + Animation_MorphToLoop(&this->skelAnime, &gStalfosMiddleGuardAnim, -4.0f); + this->unk_7C8 = 0x16; + EnTest_SetupAction(this, EnTest_IdleFromBlock); +} + +void EnTest_IdleFromBlock(EnTest* this, GlobalContext* globalCtx) { + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 1.5f, 0.0f); + SkelAnime_Update(&this->skelAnime); + + if (this->skelAnime.morphWeight == 0.0f) { + this->actor.speedXZ = 0.0f; + this->unk_7DE = 0; + + if (!EnTest_ReactToProjectile(globalCtx, this)) { + if (this->actor.xzDistToPlayer < 500.0f) { + EnTest_ChooseAction(this, globalCtx); + } else { + func_808627C4(this, globalCtx); + } + } + } +} + +void func_80862154(EnTest* this) { + Animation_PlayOnce(&this->skelAnime, &gStalfosFlinchFromHitFrontAnim); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STAL_DAMAGE); + this->unk_7C8 = 8; + this->actor.speedXZ = -2.0f; + Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0, 8); + EnTest_SetupAction(this, func_808621D4); +} + +void func_808621D4(EnTest* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 0.1f, 0.0f); + + if (SkelAnime_Update(&this->skelAnime)) { + this->actor.speedXZ = 0.0f; + + if ((this->actor.bgCheckFlags & 8) && ((ABS((s16)(this->actor.wallYaw - this->actor.shape.rot.y)) < 0x38A4) && + (this->actor.xzDistToPlayer < 80.0f))) { + EnTest_SetupJumpUp(this); + } else if (!EnTest_ReactToProjectile(globalCtx, this)) { + EnTest_ChooseAction(this, globalCtx); + } else { + return; + } + } + + if (player->swordState != 0) { + if ((this->actor.bgCheckFlags & 8) && ((ABS((s16)(this->actor.wallYaw - this->actor.shape.rot.y)) < 0x38A4) && + (this->actor.xzDistToPlayer < 80.0f))) { + EnTest_SetupJumpUp(this); + } else if ((Rand_ZeroOne() > 0.7f) && (this->actor.params != STALFOS_TYPE_CEILING) && + (player->swordAnimation != 0x11)) { + EnTest_SetupJumpBack(this); + } else { + EnTest_SetupStopAndBlock(this); + } + + this->unk_7C8 = 8; + } +} + +void func_80862398(EnTest* this) { + Animation_PlayOnce(&this->skelAnime, &gStalfosFlinchFromHitBehindAnim); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STAL_DAMAGE); + this->unk_7C8 = 9; + this->actor.speedXZ = -2.0f; + Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0, 8); + EnTest_SetupAction(this, func_80862418); +} + +void func_80862418(EnTest* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 0.1f, 0.0f); + + if (SkelAnime_Update(&this->skelAnime)) { + this->actor.speedXZ = 0.0f; + + if (!EnTest_ReactToProjectile(globalCtx, this)) { + EnTest_ChooseAction(this, globalCtx); + } else { + return; + } + } + + if (player->swordState != 0) { + if ((this->actor.bgCheckFlags & 8) && ((ABS((s16)(this->actor.wallYaw - this->actor.shape.rot.y)) < 0x38A4) && + (this->actor.xzDistToPlayer < 80.0f))) { + EnTest_SetupJumpUp(this); + } else if ((Rand_ZeroOne() > 0.7f) && (this->actor.params != STALFOS_TYPE_CEILING) && + (player->swordAnimation != 0x11)) { + EnTest_SetupJumpBack(this); + } else { + EnTest_SetupStopAndBlock(this); + } + + this->unk_7C8 = 8; + } +} + +void EnTest_SetupStunned(EnTest* this) { + this->unk_7C8 = 0xB; + this->unk_7DE = 0; + this->swordState = 0; + this->skelAnime.playSpeed = 0.0f; + this->actor.speedXZ = -4.0f; + + if (this->lastDamageEffect == STALFOS_DMGEFF_LIGHT) { + Actor_SetColorFilter(&this->actor, -0x8000, 0x78, 0, 0x50); + } else { + Actor_SetColorFilter(&this->actor, 0, 0x78, 0, 0x50); + + if (this->lastDamageEffect == STALFOS_DMGEFF_FREEZE) { + this->iceTimer = 36; + } else { + Animation_PlayOnceSetSpeed(&this->skelAnime, &gStalfosFlinchFromHitFrontAnim, 0.0f); + } + } + + Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE); + EnTest_SetupAction(this, EnTest_Stunned); +} + +void EnTest_Stunned(EnTest* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 1.0f, 0.0f); + + if (this->actor.colorFilterTimer == 0) { + if (this->actor.colChkInfo.health == 0) { + func_80862FA8(this, globalCtx); + } else if (player->swordState != 0) { + if ((this->actor.bgCheckFlags & 8) && + ((ABS((s16)(this->actor.wallYaw - this->actor.shape.rot.y)) < 0x38A4) && + (this->actor.xzDistToPlayer < 80.0f))) { + EnTest_SetupJumpUp(this); + } else if ((Rand_ZeroOne() > 0.7f) && (player->swordAnimation != 0x11)) { + EnTest_SetupJumpBack(this); + } else { + EnTest_SetupStopAndBlock(this); + } + + this->unk_7C8 = 8; + } else { + this->actor.speedXZ = 0.0f; + if (!EnTest_ReactToProjectile(globalCtx, this)) { + EnTest_ChooseAction(this, globalCtx); + } + } + } +} + +// a variation of sidestep +void func_808627C4(EnTest* this, GlobalContext* globalCtx) { + if (Actor_OtherIsTargeted(globalCtx, &this->actor)) { + func_80860EC0(this); + return; + } + + Animation_MorphToLoop(&this->skelAnime, &gStalfosSidestepAnim, -2.0f); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 1, 0xFA0, 1); + this->actor.speedXZ = ((globalCtx->gameplayFrames % 2) != 0) ? -4.0f : 4.0f; + this->actor.world.rot.y = this->actor.shape.rot.y + 0x3FFF; + this->timer = (Rand_ZeroOne() * 20.0f) + 20.0f; + this->unk_7C8 = 0x18; + EnTest_SetupAction(this, func_808628C8); + this->unk_7EC = 0.0f; +} + +// a variation of sidestep +void func_808628C8(EnTest* this, GlobalContext* globalCtx) { + s32 pad; + Player* player = PLAYER; + s32 pad1; + s32 prevFrame; + s32 temp_f16; + s32 pad2; + f32 checkDist = 0.0f; + s16 newYaw; + f32 absPlaySpeed; + s32 temp_v0_2; + + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 1, 0xFA0, 1); + + if (this->unk_7DE == 0) { + this->unk_7DE++; + } + + if (this->actor.speedXZ >= 0.0f) { + if (this->actor.speedXZ < 6.0f) { + this->actor.speedXZ += 0.125f; + } else { + this->actor.speedXZ = 6.0f; + } + } else { + if (this->actor.speedXZ > -6.0f) { + this->actor.speedXZ -= 0.125f; + } else { + this->actor.speedXZ = -6.0f; + } + } + + if ((this->actor.bgCheckFlags & 8) || + ((this->actor.params == STALFOS_TYPE_CEILING) && + !func_800339B8(&this->actor, globalCtx, this->actor.speedXZ, this->actor.shape.rot.y + 0x3FFF))) { + if (this->actor.bgCheckFlags & 8) { + if (this->actor.speedXZ >= 0.0f) { + newYaw = (this->actor.shape.rot.y + 0x3FFF); + } else { + newYaw = (this->actor.shape.rot.y - 0x3FFF); + } + + newYaw = this->actor.wallYaw - newYaw; + } else { + this->actor.speedXZ *= -0.8f; + newYaw = 0; + } + + if (ABS(newYaw) > 0x4000) { + this->actor.speedXZ *= -0.8f; + + if (this->actor.speedXZ < 0.0f) { + this->actor.speedXZ -= 0.5f; + } else { + this->actor.speedXZ += 0.5f; + } + } + } + + this->actor.world.rot.y = this->actor.shape.rot.y + 0x3FFF; + + if (Actor_OtherIsTargeted(globalCtx, &this->actor)) { + checkDist = 200.0f; + } + + if (this->actor.xzDistToPlayer <= (80.0f + checkDist)) { + Math_SmoothStepToF(&this->unk_7EC, -2.5f, 1.0f, 0.8f, 0.0f); + } else if (this->actor.xzDistToPlayer > (110.0f + checkDist)) { + Math_SmoothStepToF(&this->unk_7EC, 2.5f, 1.0f, 0.8f, 0.0f); + } else { + Math_SmoothStepToF(&this->unk_7EC, 0.0f, 1.0f, 6.65f, 0.0f); + } + + if (this->unk_7EC != 0.0f) { + this->actor.world.pos.x += (Math_SinS(this->actor.shape.rot.y) * this->unk_7EC); + this->actor.world.pos.z += (Math_CosS(this->actor.shape.rot.y) * this->unk_7EC); + } + + this->skelAnime.playSpeed = this->actor.speedXZ * 0.5f; + prevFrame = this->skelAnime.curFrame; + SkelAnime_Update(&this->skelAnime); + + temp_f16 = this->skelAnime.curFrame - ABS(this->skelAnime.playSpeed); + absPlaySpeed = ABS(this->skelAnime.playSpeed); + + if ((this->timer % 32) == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STAL_WARAU); + } + if ((s32)this->skelAnime.curFrame != prevFrame) { + temp_v0_2 = (s32)absPlaySpeed + prevFrame; + + if (((temp_v0_2 > 1) && (temp_f16 <= 0)) || ((temp_f16 < 7) && (temp_v0_2 >= 8))) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STAL_WALK); + } + } + + if (this->timer == 0) { + if (Actor_OtherIsTargeted(globalCtx, &this->actor)) { + EnTest_SetupIdle(this); + } else if (Actor_IsTargeted(globalCtx, &this->actor)) { + if (!EnTest_ReactToProjectile(globalCtx, this)) { + EnTest_ChooseAction(this, globalCtx); + } + } else if (player->heldItemActionParam != PLAYER_AP_NONE) { + if ((globalCtx->gameplayFrames % 2) != 0) { + EnTest_SetupIdle(this); + } else { + EnTest_SetupWalkAndBlock(this); + } + } else { + EnTest_SetupWalkAndBlock(this); + } + + } else { + this->timer--; + } +} + +void func_80862DBC(EnTest* this, GlobalContext* globalCtx) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STAL_DAMAGE); + this->unk_7C8 = 2; + BodyBreak_Alloc(&this->bodyBreak, 60, globalCtx); + this->actor.home.rot.x = 0; + + if (this->swordState >= 0) { + EffectBlure_AddSpace(Effect_GetByIndex(this->effectIndex)); + this->swordState = -1; + } + + this->actor.flags &= ~1; + + if (this->actor.params == STALFOS_TYPE_5) { + Actor_ChangeCategory(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORCAT_PROP); + } + + EnTest_SetupAction(this, func_80862E6C); +} + +void func_80862E6C(EnTest* this, GlobalContext* globalCtx) { + if (this->actor.child == NULL) { + if (this->actor.home.rot.x == 0) { + this->actor.home.rot.x = this->bodyBreak.count; + } + + if (BodyBreak_SpawnParts(&this->actor, &this->bodyBreak, globalCtx, this->actor.params + 8)) { + this->actor.child = &this->actor; + } + } else { + if (this->actor.home.rot.x == 0) { + this->actor.colChkInfo.health = 10; + + if (this->actor.params == STALFOS_TYPE_4) { + this->actor.params = -1; + } else { + Actor_ChangeCategory(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORCAT_ENEMY); + } + + this->actor.child = NULL; + this->actor.flags |= 1; + EnTest_SetupJumpBack(this); + } else if ((this->actor.params == STALFOS_TYPE_5) && + !Actor_FindNearby(globalCtx, &this->actor, ACTOR_EN_TEST, ACTORCAT_ENEMY, 8000.0f)) { + Item_DropCollectibleRandom(globalCtx, &this->actor, &this->actor.world.pos, 0xD0); + + if (this->actor.parent != NULL) { + this->actor.parent->home.rot.z--; + } + + Actor_Kill(&this->actor); + } + } +} + +void func_80862FA8(EnTest* this, GlobalContext* globalCtx) { + Animation_PlayOnce(&this->skelAnime, &gStalfosFallOverBackwardsAnim); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STAL_DEAD); + this->unk_7DE = 0; + this->actor.flags &= ~1; + this->actor.colorFilterTimer = 0; + this->actor.speedXZ = 0.0f; + + if (this->actor.params <= STALFOS_TYPE_CEILING) { + this->unk_7C8 = 5; + EnTest_SetupAction(this, func_80863044); + } else { + func_80862DBC(this, globalCtx); + } +} + +void func_80863044(EnTest* this, GlobalContext* globalCtx) { + if (SkelAnime_Update(&this->skelAnime)) { + this->timer = (Rand_ZeroOne() * 10.0f) + 10.0f; + this->unk_7C8 = 7; + EnTest_SetupAction(this, func_808633E8); + BodyBreak_Alloc(&this->bodyBreak, 60, globalCtx); + } + + if ((s32)this->skelAnime.curFrame == 15) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_RIZA_DOWN); + } +} + +void func_808630F0(EnTest* this, GlobalContext* globalCtx) { + Animation_PlayOnce(&this->skelAnime, &gStalfosFallOverForwardsAnim); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STAL_DEAD); + this->unk_7C8 = 6; + this->actor.colorFilterTimer = 0; + this->unk_7DE = 0; + this->actor.speedXZ = 0.0f; + + if (this->actor.params <= STALFOS_TYPE_CEILING) { + this->actor.flags &= ~1; + EnTest_SetupAction(this, func_8086318C); + } else { + func_80862DBC(this, globalCtx); + } +} + +void func_8086318C(EnTest* this, GlobalContext* globalCtx) { + if (SkelAnime_Update(&this->skelAnime)) { + this->timer = (Rand_ZeroOne() * 10.0f) + 10.0f; + this->unk_7C8 = 7; + EnTest_SetupAction(this, func_808633E8); + BodyBreak_Alloc(&this->bodyBreak, 60, globalCtx); + } + + if (((s32)this->skelAnime.curFrame == 10) || ((s32)this->skelAnime.curFrame == 25)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_RIZA_DOWN); + } +} + +void EnTest_SetupRecoil(EnTest* this) { + this->swordState = 0; + this->skelAnime.moveFlags = 2; + this->unk_7C8 = 0x13; + this->skelAnime.playSpeed = -1.0f; + this->skelAnime.startFrame = this->skelAnime.curFrame; + this->skelAnime.endFrame = 0.0f; + EnTest_SetupAction(this, EnTest_Recoil); +} + +void EnTest_Recoil(EnTest* this, GlobalContext* globalCtx) { + if (SkelAnime_Update(&this->skelAnime)) { + if (Rand_ZeroOne() > 0.7f) { + EnTest_SetupIdle(this); + this->timer = (Rand_ZeroOne() * 5.0f) + 5.0f; + } else if (((globalCtx->gameplayFrames % 2) != 0) && (this->actor.params != STALFOS_TYPE_CEILING)) { + EnTest_SetupJumpBack(this); + } else { + func_808627C4(this, globalCtx); + } + } +} + +void EnTest_Rise(EnTest* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + + if (this->actor.scale.y < 0.015f) { + this->actor.scale.y += 0.002f; + this->actor.world.pos.y = this->actor.home.pos.y - 3.5f; + } else { + this->actor.world.pos.y = this->actor.home.pos.y; + EnTest_SetupJumpBack(this); + } +} + +void func_808633E8(EnTest* this, GlobalContext* globalCtx) { + this->actor.params = STALFOS_TYPE_1; + + if (BodyBreak_SpawnParts(&this->actor, &this->bodyBreak, globalCtx, this->actor.params)) { + Item_DropCollectibleRandom(globalCtx, &this->actor, &this->actor.world.pos, 0xD0); + + if (this->actor.parent != NULL) { + this->actor.parent->home.rot.z--; + } + + Actor_Kill(&this->actor); + } +} + +void EnTest_UpdateHeadRot(EnTest* this, GlobalContext* globalCtx) { + s16 lookAngle = this->actor.yawTowardsPlayer; + + lookAngle -= (s16)(this->headRot.y + this->actor.shape.rot.y); + + this->headRotOffset.y = CLAMP(lookAngle, -0x7D0, 0x7D0); + this->headRot.y += this->headRotOffset.y; + this->headRot.y = CLAMP(this->headRot.y, -0x382F, 0x382F); +} + +void EnTest_UpdateDamage(EnTest* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if (this->shieldCollider.base.acFlags & AC_BOUNCED) { + this->shieldCollider.base.acFlags &= ~AC_BOUNCED; + this->bodyCollider.base.acFlags &= ~AC_HIT; + + if (this->unk_7C8 >= 0xA) { + this->actor.speedXZ = -4.0f; + } + } else if (this->bodyCollider.base.acFlags & AC_HIT) { + this->bodyCollider.base.acFlags &= ~AC_HIT; + + if ((this->actor.colChkInfo.damageEffect != STALFOS_DMGEFF_SLING) && + (this->actor.colChkInfo.damageEffect != STALFOS_DMGEFF_FIREMAGIC)) { + this->lastDamageEffect = this->actor.colChkInfo.damageEffect; + if (this->swordState >= 1) { + this->swordState = 0; + } + this->unk_7DC = player->unk_845; + this->actor.world.rot.y = this->actor.yawTowardsPlayer; + Actor_SetDropFlag(&this->actor, &this->bodyCollider.info, false); + func_800F8A44(&this->actor.projectedPos, NA_SE_EN_STAL_WARAU); + + if ((this->actor.colChkInfo.damageEffect == STALFOS_DMGEFF_STUN) || + (this->actor.colChkInfo.damageEffect == STALFOS_DMGEFF_FREEZE) || + (this->actor.colChkInfo.damageEffect == STALFOS_DMGEFF_LIGHT)) { + if (this->unk_7C8 != 0xB) { + Actor_ApplyDamage(&this->actor); + EnTest_SetupStunned(this); + } + } else { + if (Actor_IsFacingPlayer(&this->actor, 0x4000)) { + if (Actor_ApplyDamage(&this->actor) == 0) { + Enemy_StartFinishingBlow(globalCtx, &this->actor); + func_80862FA8(this, globalCtx); + } else { + func_80862154(this); + } + } else if (Actor_ApplyDamage(&this->actor) == 0) { + func_808630F0(this, globalCtx); + Enemy_StartFinishingBlow(globalCtx, &this->actor); + } else { + func_80862398(this); + } + } + } + } +} + +void EnTest_Update(Actor* thisx, GlobalContext* globalCtx) { + EnTest* this = THIS; + f32 oldWeight; + u32 floorProperty; + s32 pad; + + EnTest_UpdateDamage(this, globalCtx); + + if (this->actor.colChkInfo.damageEffect != STALFOS_DMGEFF_FIREMAGIC) { + Actor_MoveForward(&this->actor); + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 0x1D); + + if (this->actor.params == STALFOS_TYPE_1) { + if (this->actor.world.pos.y <= this->actor.home.pos.y) { + this->actor.world.pos.y = this->actor.home.pos.y; + this->actor.velocity.y = 0.0f; + } + + if (this->actor.floorHeight <= this->actor.home.pos.y) { + this->actor.floorHeight = this->actor.home.pos.y; + } + } else if (this->actor.bgCheckFlags & 2) { + floorProperty = func_80041EA4(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorBgId); + + if ((floorProperty == 5) || (floorProperty == 0xC) || + func_80041D4C(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorBgId) == 9) { + Actor_Kill(&this->actor); + return; + } + } + + this->actionFunc(this, globalCtx); + + switch (this->unk_7DE) { + case 0: + break; + + case 1: + Animation_Change(&this->upperSkelanime, &gStalfosBlockWithShieldAnim, 2.0f, 0.0f, + Animation_GetLastFrame(&gStalfosBlockWithShieldAnim), 2, 2.0f); + AnimationContext_SetCopyTrue(globalCtx, this->skelAnime.limbCount, this->skelAnime.jointTable, + this->upperSkelanime.jointTable, sJointCopyFlags); + this->unk_7DE++; + break; + + case 2: + SkelAnime_Update(&this->upperSkelanime); + SkelAnime_CopyFrameTableTrue(&this->skelAnime, this->skelAnime.jointTable, + this->upperSkelanime.jointTable, sJointCopyFlags); + break; + + case 3: + this->unk_7DE++; + this->upperSkelanime.morphWeight = 4.0f; + // fallthrough + case 4: + oldWeight = this->upperSkelanime.morphWeight; + this->upperSkelanime.morphWeight -= 1.0f; + + if (this->upperSkelanime.morphWeight <= 0.0f) { + this->unk_7DE = 0; + } + + SkelAnime_InterpFrameTable(this->skelAnime.limbCount, this->upperSkelanime.jointTable, + this->upperSkelanime.jointTable, this->skelAnime.jointTable, + 1.0f - (this->upperSkelanime.morphWeight / oldWeight)); + SkelAnime_CopyFrameTableTrue(&this->skelAnime, this->skelAnime.jointTable, + this->upperSkelanime.jointTable, sJointCopyFlags); + break; + } + + if ((this->actor.colorFilterTimer == 0) && (this->actor.colChkInfo.health != 0)) { + if ((this->unk_7C8 != 0x10) && (this->unk_7C8 != 0x17)) { + EnTest_UpdateHeadRot(this, globalCtx); + } else { + Math_SmoothStepToS(&this->headRot.y, 0, 1, 0x3E8, 0); + } + } + } + + Collider_UpdateCylinder(&this->actor, &this->bodyCollider); + + this->actor.focus.pos = this->actor.world.pos; + this->actor.focus.pos.y += 45.0f; + + if ((this->actor.colChkInfo.health > 0) || (this->actor.colorFilterTimer != 0)) { + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->bodyCollider.base); + + if ((this->unk_7C8 >= 0xA) && + ((this->actor.colorFilterTimer == 0) || (!(this->actor.colorFilterParams & 0x4000)))) { + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->bodyCollider.base); + } + + if (this->unk_7DE != 0) { + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->shieldCollider.base); + } + } + + if (this->swordState >= 1) { + if (!(this->swordCollider.base.atFlags & AT_BOUNCED)) { + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->swordCollider.base); + } else { + this->swordCollider.base.atFlags &= ~AT_BOUNCED; + EnTest_SetupRecoil(this); + } + } + + if (this->actor.params == STALFOS_TYPE_INVISIBLE) { + if (globalCtx->actorCtx.unk_03 != 0) { + this->actor.flags |= 0x81; + this->actor.shape.shadowDraw = ActorShadow_DrawFeet; + } else { + this->actor.flags &= ~0x81; + this->actor.shape.shadowDraw = NULL; + } + } +} + +s32 EnTest_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { + EnTest* this = THIS; + s32 pad; + + if (limbIndex == STALFOS_LIMB_HEAD_ROOT) { + rot->x += this->headRot.y; + rot->y -= this->headRot.x; + rot->z += this->headRot.z; + } else if (limbIndex == STALFOS_LIMB_HEAD) { + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_test.c", 3582); + + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 80 + ABS((s16)(Math_SinS(globalCtx->gameplayFrames * 2000) * 175.0f)), 0, 0, + 255); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_test.c", 3587); + } + + if ((this->actor.params == STALFOS_TYPE_INVISIBLE) && ((this->actor.flags & 0x80) != 0x80)) { + *dList = NULL; + } + + return false; +} + +void EnTest_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { + static Vec3f unused1 = { 1100.0f, -700.0f, 0.0f }; + static Vec3f D_80864658 = { 300.0f, 0.0f, 0.0f }; + static Vec3f D_80864664 = { 3400.0f, 0.0f, 0.0f }; + static Vec3f D_80864670 = { 0.0f, 0.0f, 0.0f }; + static Vec3f D_8086467C = { 7000.0f, 1000.0f, 0.0f }; + static Vec3f D_80864688 = { 3000.0f, -2000.0f, -1000.0f }; + static Vec3f D_80864694 = { 3000.0f, -2000.0f, 1000.0f }; + static Vec3f D_808646A0 = { -1300.0f, 1100.0f, 0.0f }; + static Vec3f unused2 = { -3000.0f, 1900.0f, 800.0f }; + static Vec3f unused3 = { -3000.0f, -1100.0f, 800.0f }; + static Vec3f unused4 = { 1900.0f, 1900.0f, 800.0f }; + static Vec3f unused5 = { -3000.0f, -1100.0f, 800.0f }; + static Vec3f unused6 = { 1900.0f, -1100.0f, 800.0f }; + static Vec3f unused7 = { 1900.0f, 1900.0f, 800.0f }; + s32 bodyPart = -1; + Vec3f sp70; + Vec3f sp64; + EnTest* this = THIS; + s32 pad; + Vec3f sp50; + + BodyBreak_SetInfo(&this->bodyBreak, limbIndex, 0, 60, 60, dList, BODYBREAK_OBJECT_DEFAULT); + + if (limbIndex == STALFOS_LIMB_SWORD) { + Matrix_MultVec3f(&D_8086467C, &this->swordCollider.dim.quad[1]); + Matrix_MultVec3f(&D_80864688, &this->swordCollider.dim.quad[0]); + Matrix_MultVec3f(&D_80864694, &this->swordCollider.dim.quad[3]); + Matrix_MultVec3f(&D_808646A0, &this->swordCollider.dim.quad[2]); + + Collider_SetQuadVertices(&this->swordCollider, &this->swordCollider.dim.quad[0], + &this->swordCollider.dim.quad[1], &this->swordCollider.dim.quad[2], + &this->swordCollider.dim.quad[3]); + + Matrix_MultVec3f(&D_80864664, &sp70); + Matrix_MultVec3f(&D_80864670, &sp64); + + if ((this->swordState >= 1) && + ((this->actor.params != STALFOS_TYPE_INVISIBLE) || (globalCtx->actorCtx.unk_03 != 0))) { + EffectBlure_AddVertex(Effect_GetByIndex(this->effectIndex), &sp70, &sp64); + } else if (this->swordState >= 0) { + EffectBlure_AddSpace(Effect_GetByIndex(this->effectIndex)); + this->swordState = -1; + } + + } else if ((limbIndex == STALFOS_LIMB_SHIELD) && (this->unk_7DE != 0)) { + Matrix_MultVec3f(&D_80864670, &sp64); + + this->shieldCollider.dim.pos.x = sp64.x; + this->shieldCollider.dim.pos.y = sp64.y; + this->shieldCollider.dim.pos.z = sp64.z; + } else { + Actor_SetFeetPos(&this->actor, limbIndex, STALFOS_LIMB_FOOT_L, &D_80864658, STALFOS_LIMB_ANKLE_R, &D_80864658); + + if ((limbIndex == STALFOS_LIMB_FOOT_L) || (limbIndex == STALFOS_LIMB_ANKLE_R)) { + if ((this->unk_7C8 == 0x15) || (this->unk_7C8 == 0x16)) { + if (this->actor.speedXZ != 0.0f) { + Matrix_MultVec3f(&D_80864658, &sp64); + Actor_SpawnFloorDust(globalCtx, &this->actor, &sp64, 10.0f, 1, 8.0f, 0x64, 0xF, 0); + } + } + } + } + + if (this->iceTimer != 0) { + switch (limbIndex) { + case STALFOS_LIMB_HEAD: + bodyPart = 0; + break; + case STALFOS_LIMB_CHEST: + bodyPart = 1; + break; + case STALFOS_LIMB_SWORD: + bodyPart = 2; + break; + case STALFOS_LIMB_SHIELD: + bodyPart = 3; + break; + case STALFOS_LIMB_UPPERARM_R: + bodyPart = 4; + break; + case STALFOS_LIMB_UPPERARM_L: + bodyPart = 5; + break; + case STALFOS_LIMB_WAIST: + bodyPart = 6; + break; + case STALFOS_LIMB_FOOT_L: + bodyPart = 7; + break; + case STALFOS_LIMB_FOOT_R: + bodyPart = 8; + break; + } + + if (bodyPart >= 0) { + Matrix_MultVec3f(&D_80864670, &sp50); + + this->bodyPartsPos[bodyPart].x = sp50.x; + this->bodyPartsPos[bodyPart].y = sp50.y; + this->bodyPartsPos[bodyPart].z = sp50.z; + } + } +} + +void EnTest_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnTest* this = THIS; + + func_80093D18(globalCtx->state.gfxCtx); + func_8002EBCC(&this->actor, globalCtx, 1); + + if ((thisx->params <= STALFOS_TYPE_CEILING) || (thisx->child == NULL)) { + SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, EnTest_OverrideLimbDraw, + EnTest_PostLimbDraw, this); + } + + if (this->iceTimer != 0) { + thisx->colorFilterTimer++; + this->iceTimer--; + + if ((this->iceTimer % 4) == 0) { + s32 iceIndex = this->iceTimer >> 2; + + EffectSsEnIce_SpawnFlyingVec3s(globalCtx, thisx, &this->bodyPartsPos[iceIndex], 150, 150, 150, 250, 235, + 245, 255, 1.5f); + } + } +} + +// a variation of sidestep +void func_80864158(EnTest* this, f32 xzSpeed) { + Animation_MorphToLoop(&this->skelAnime, &gStalfosSidestepAnim, -2.0f); + this->actor.speedXZ = xzSpeed; + this->actor.world.rot.y = this->actor.shape.rot.y + 0x3FFF; + this->timer = (Rand_ZeroOne() * 20.0f) + 15.0f; + this->unk_7C8 = 0x18; + EnTest_SetupAction(this, func_808628C8); +} + +/** + * Check if a projectile actor is within 300 units and react accordingly. + * Returns true if the projectile test passes and a new action is performed. + */ +s32 EnTest_ReactToProjectile(GlobalContext* globalCtx, EnTest* this) { + Actor* projectileActor; + s16 yawToProjectile; + s16 wallYawDiff; + s16 touchingWall; + s16 directionFlag; + + projectileActor = Actor_GetProjectileActor(globalCtx, &this->actor, 300.0f); + + if (projectileActor != NULL) { + yawToProjectile = Actor_WorldYawTowardActor(&this->actor, projectileActor) - (u16)this->actor.shape.rot.y; + + if ((u8)(this->actor.bgCheckFlags & 8)) { + wallYawDiff = ((u16)this->actor.wallYaw - (u16)this->actor.shape.rot.y); + touchingWall = true; + } else { + touchingWall = false; + } + + if (Math_Vec3f_DistXYZ(&this->actor.world.pos, &projectileActor->world.pos) < 200.0f) { + if (Actor_IsTargeted(globalCtx, &this->actor) && (projectileActor->id == ACTOR_ARMS_HOOK)) { + EnTest_SetupJumpUp(this); + } else if (ABS(yawToProjectile) < 0x2000) { + EnTest_SetupStopAndBlock(this); + } else if (ABS(yawToProjectile) < 0x6000) { + EnTest_SetupJumpBack(this); + } else { + EnTest_SetupJumpUp(this); + } + + return true; + } + + if (Actor_IsTargeted(globalCtx, &this->actor) && (projectileActor->id == ACTOR_ARMS_HOOK)) { + EnTest_SetupJumpUp(this); + return true; + } + + if ((ABS(yawToProjectile) < 0x2000) || (ABS(yawToProjectile) > 0x6000)) { + directionFlag = globalCtx->gameplayFrames % 2; + + if (touchingWall && (wallYawDiff > 0x2000) && (wallYawDiff < 0x6000)) { + directionFlag = false; + } else if (touchingWall && (wallYawDiff < -0x2000) && (wallYawDiff > -0x6000)) { + directionFlag = true; + } + + if (directionFlag) { + func_80864158(this, 4.0f); + } else { + func_80864158(this, -4.0f); + } + } else if (ABS(yawToProjectile) < 0x6000) { + directionFlag = globalCtx->gameplayFrames % 2; + + if (touchingWall && (ABS(wallYawDiff) > 0x6000)) { + directionFlag = false; + } else if (touchingWall && (ABS(wallYawDiff) < 0x2000)) { + directionFlag = true; + } + + if (directionFlag) { + EnTest_SetupJumpBack(this); + } else { + EnTest_SetupJumpUp(this); + } + } + + return true; + } + + return false; +} diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.h b/src/overlays/actors/ovl_En_Test/z_en_test.h index ccb98d8ede..1fd57fcd6f 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.h +++ b/src/overlays/actors/ovl_En_Test/z_en_test.h @@ -6,17 +6,110 @@ struct EnTest; +typedef void (*EnTestActionFunc)(struct EnTest*, GlobalContext*); + +typedef enum { + /* 0x00 */ STALFOS_LIMB_NONE, + /* 0x01 */ STALFOS_LIMB_ROOT, + /* 0x02 */ STALFOS_LIMB_UPPERBODY_ROOT, + /* 0x03 */ STALFOS_LIMB_CORE_LOWER_ROOT, + /* 0x04 */ STALFOS_LIMB_CORE_UPPER_ROOT, + /* 0x05 */ STALFOS_LIMB_NECK_ROOT, + /* 0x06 */ STALFOS_LIMB_HEAD_ROOT, + /* 0x07 */ STALFOS_LIMB_7, + /* 0x08 */ STALFOS_LIMB_8, + /* 0x09 */ STALFOS_LIMB_JAW_ROOT, + /* 0x0A */ STALFOS_LIMB_JAW, + /* 0x0B */ STALFOS_LIMB_HEAD, + /* 0x0C */ STALFOS_LIMB_NECK_UPPER, + /* 0x0D */ STALFOS_LIMB_NECK_LOWER, + /* 0x0E */ STALFOS_LIMB_CORE_UPPER, + /* 0x0F */ STALFOS_LIMB_CHEST, + /* 0x10 */ STALFOS_LIMB_SHOULDER_R_ROOT, + /* 0x11 */ STALFOS_LIMB_SHOULDER_ARMOR_R_ROOT, + /* 0x12 */ STALFOS_LIMB_SHOULDER_ARMOR_R, + /* 0x13 */ STALFOS_LIMB_SHOULDER_L_ROOT, + /* 0x14 */ STALFOS_LIMB_SHOULDER_ARMOR_L_ROOT, + /* 0x15 */ STALFOS_LIMB_SHOULDER_ARMOR_L, + /* 0x16 */ STALFOS_LIMB_ARM_L_ROOT, + /* 0x17 */ STALFOS_LIMB_UPPERARM_L_ROOT, + /* 0x18 */ STALFOS_LIMB_FOREARM_L_ROOT, + /* 0x19 */ STALFOS_LIMB_HAND_L_ROOT, + /* 0x1A */ STALFOS_LIMB_HAND_L, + /* 0x1B */ STALFOS_LIMB_SHIELD, + /* 0x1C */ STALFOS_LIMB_FOREARM_L, + /* 0x1D */ STALFOS_LIMB_UPPERARM_L, + /* 0x1E */ STALFOS_LIMB_ARM_R_ROOT, + /* 0x1F */ STALFOS_LIMB_UPPERARM_R_ROOT, + /* 0x20 */ STALFOS_LIMB_FOREARM_R_ROOT, + /* 0x21 */ STALFOS_LIMB_HAND_R_ROOT, + /* 0x22 */ STALFOS_LIMB_SWORD, + /* 0x23 */ STALFOS_LIMB_HAND_R, + /* 0x24 */ STALFOS_LIMB_FOREARM_R, + /* 0x25 */ STALFOS_LIMB_UPPERARM_R, + /* 0x26 */ STALFOS_LIMB_CORE_LOWER, + /* 0x27 */ STALFOS_LIMB_LOWERBODY_ROOT, + /* 0x28 */ STALFOS_LIMB_WAIST_ROOT, + /* 0x29 */ STALFOS_LIMB_LEGS_ROOT, + /* 0x2A */ STALFOS_LIMB_LEG_L_ROOT, + /* 0x2B */ STALFOS_LIMB_THIGH_L_ROOT, + /* 0x2C */ STALFOS_LIMB_LOWERLEG_L_ROOT, + /* 0x2D */ STALFOS_LIMB_ANKLE_L_ROOT, + /* 0x2E */ STALFOS_LIMB_ANKLE_L, + /* 0x2F */ STALFOS_LIMB_FOOT_L_ROOT, + /* 0x30 */ STALFOS_LIMB_FOOT_L, + /* 0x31 */ STALFOS_LIMB_LOWERLEG_L, + /* 0x32 */ STALFOS_LIMB_THIGH_L, + /* 0x33 */ STALFOS_LIMB_LEG_R_ROOT, + /* 0x34 */ STALFOS_LIMB_THIGH_R_ROOT, + /* 0x35 */ STALFOS_LIMB_LOWERLEG_R_ROOT, + /* 0x36 */ STALFOS_LIMB_ANKLE_R_ROOT, + /* 0x37 */ STALFOS_LIMB_ANKLE_R, + /* 0x38 */ STALFOS_LIMB_FOOT_R_ROOT, + /* 0x39 */ STALFOS_LIMB_FOOT_R, + /* 0x3A */ STALFOS_LIMB_LOWERLEG_R, + /* 0x3B */ STALFOS_LIMB_THIGH_R, + /* 0x3C */ STALFOS_LIMB_WAIST, + /* 0x3D */ STALFOS_LIMB_MAX +} StalfosLimb; + typedef struct EnTest { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x03C]; - /* 0x0188 */ SkelAnime Animation_188; - /* 0x01CC */ Vec3s jointTable_1CC[61]; - /* 0x033A */ Vec3s transitionTbl_16E[61]; - /* 0x04A8 */ SkelAnime Animation_4A8; - /* 0x04EC */ Vec3s jointTable_4EC[61]; - /* 0x065A */ Vec3s transitionTbl_65A[61]; - /* 0x07C8 */ char unk_7C8[0x160]; -} EnTest; // size = 0x0928 + /* 0x000 */ Actor actor; + /* 0x14C */ Vec3s bodyPartsPos[10]; + /* 0x188 */ SkelAnime skelAnime; + /* 0x1CC */ Vec3s jointTable[STALFOS_LIMB_MAX]; + /* 0x33A */ Vec3s morphTable[STALFOS_LIMB_MAX]; + /* 0x4A8 */ SkelAnime upperSkelanime; + /* 0x4EC */ Vec3s upperJointTable[STALFOS_LIMB_MAX]; + /* 0x65A */ Vec3s upperMorphTable[STALFOS_LIMB_MAX]; + /* 0x7C8 */ u8 unk_7C8; + /* 0x7CC */ EnTestActionFunc actionFunc; + /* 0x7D0 */ Vec3s headRot; + /* 0x7D6 */ Vec3s headRotOffset; + /* 0x7DC */ u8 unk_7DC; + /* 0x7DD */ char unk_7DD[0x1]; + /* 0x7DE */ u8 unk_7DE; + /* 0x7E0 */ s16 iceTimer; + /* 0x7E2 */ u8 lastDamageEffect; + /* 0x7E4 */ s32 unk_7E4; + /* 0x7E8 */ s32 timer; + /* 0x7EC */ f32 unk_7EC; + /* 0x7F0 */ BodyBreak bodyBreak; + /* 0x808 */ s8 swordState; + /* 0x80C */ s32 effectIndex; + /* 0x810 */ ColliderCylinder bodyCollider; + /* 0x85C */ ColliderQuad swordCollider; + /* 0x8DC */ ColliderCylinder shieldCollider; +} EnTest; // size = 0x928 + +typedef enum { + /* 0 */ STALFOS_TYPE_INVISIBLE, + /* 1 */ STALFOS_TYPE_1, + /* 2 */ STALFOS_TYPE_2, + /* 3 */ STALFOS_TYPE_CEILING, + /* 4 */ STALFOS_TYPE_4, + /* 5 */ STALFOS_TYPE_5 +} StalfosType; extern const ActorInit En_Test_InitVars; diff --git a/undefined_syms.txt b/undefined_syms.txt index b48eed3349..054fd277f9 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -482,7 +482,6 @@ D_0600BE4C = 0x0600BE4C; D_06001978 = 0x06001978; D_0600A324 = 0x0600A324; D_0600A99C = 0x0600A99C; -D_0600A324 = 0x0600A324; D_0600A99C = 0x0600A99C; D_06000444 = 0x06000444; D_06008604 = 0x06008604;