From b8c2ec1f60ebb3b5c55588cdfe8f98000f5a8a20 Mon Sep 17 00:00:00 2001 From: petrie911 <69443847+petrie911@users.noreply.github.com> Date: Fri, 12 Feb 2021 16:25:02 -0600 Subject: [PATCH] Forest Stage and related actors and objects (#618) * starting out * match demo * full match * cleanup * more names * more names * headers * dist from link * docs * objects * format * organization of xmls * merge actor * Update src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * format Co-authored-by: petrie911 Co-authored-by: Fig02 Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> --- .../ovl_En_Dnt_Demo/EnDntDemo_Destroy.s | 4 - .../actors/ovl_En_Dnt_Demo/EnDntDemo_Init.s | 144 --- .../actors/ovl_En_Dnt_Demo/EnDntDemo_Update.s | 92 -- .../actors/ovl_En_Dnt_Demo/func_809F0AA4.s | 535 ----------- .../actors/ovl_En_Dnt_Demo/func_809F1100.s | 167 ---- .../actors/ovl_En_Dnt_Demo/func_809F1374.s | 58 -- .../ovl_En_Dnt_Jiji/EnDntJiji_Destroy.s | 12 - .../actors/ovl_En_Dnt_Jiji/EnDntJiji_Draw.s | 115 --- .../actors/ovl_En_Dnt_Jiji/EnDntJiji_Init.s | 80 -- .../actors/ovl_En_Dnt_Jiji/EnDntJiji_Update.s | 155 --- .../actors/ovl_En_Dnt_Jiji/func_809F1C04.s | 18 - .../actors/ovl_En_Dnt_Jiji/func_809F1C44.s | 47 - .../actors/ovl_En_Dnt_Jiji/func_809F1CF4.s | 49 - .../actors/ovl_En_Dnt_Jiji/func_809F1DA8.s | 61 -- .../actors/ovl_En_Dnt_Jiji/func_809F1E8C.s | 32 - .../actors/ovl_En_Dnt_Jiji/func_809F1EFC.s | 61 -- .../actors/ovl_En_Dnt_Jiji/func_809F1FE0.s | 39 - .../actors/ovl_En_Dnt_Jiji/func_809F2068.s | 47 - .../actors/ovl_En_Dnt_Jiji/func_809F2118.s | 89 -- .../actors/ovl_En_Dnt_Jiji/func_809F2254.s | 65 -- .../actors/ovl_En_Dnt_Jiji/func_809F2344.s | 12 - .../actors/ovl_En_Dnt_Jiji/func_809F236C.s | 87 -- .../actors/ovl_En_Dnt_Jiji/func_809F24AC.s | 47 - .../actors/ovl_En_Dnt_Jiji/func_809F2550.s | 40 - .../actors/ovl_En_Dnt_Jiji/func_809F25E4.s | 55 -- .../actors/ovl_En_Dnt_Jiji/func_809F26B0.s | 32 - .../actors/ovl_En_Dnt_Jiji/func_809F2720.s | 181 ---- .../actors/ovl_En_Dnt_Jiji/func_809F28DC.s | 41 - .../actors/ovl_En_Dnt_Jiji/func_809F2974.s | 30 - .../actors/ovl_En_Dnt_Jiji/func_809F29E0.s | 47 - .../actors/ovl_En_Dnt_Jiji/func_809F2A90.s | 109 --- .../ovl_En_Dnt_Nomal/EnDntNomal_Destroy.s | 22 - .../actors/ovl_En_Dnt_Nomal/EnDntNomal_Init.s | 138 --- .../ovl_En_Dnt_Nomal/EnDntNomal_Update.s | 217 ----- .../actors/ovl_En_Dnt_Nomal/func_809F3480.s | 92 -- .../actors/ovl_En_Dnt_Nomal/func_809F35CC.s | 25 - .../actors/ovl_En_Dnt_Nomal/func_809F3624.s | 45 - .../actors/ovl_En_Dnt_Nomal/func_809F36CC.s | 206 ---- .../actors/ovl_En_Dnt_Nomal/func_809F39B8.s | 76 -- .../actors/ovl_En_Dnt_Nomal/func_809F3AD4.s | 30 - .../actors/ovl_En_Dnt_Nomal/func_809F3B40.s | 44 - .../actors/ovl_En_Dnt_Nomal/func_809F3BE4.s | 73 -- .../actors/ovl_En_Dnt_Nomal/func_809F3CD0.s | 52 -- .../actors/ovl_En_Dnt_Nomal/func_809F3D84.s | 46 - .../actors/ovl_En_Dnt_Nomal/func_809F3E30.s | 44 - .../actors/ovl_En_Dnt_Nomal/func_809F3ED4.s | 41 - .../actors/ovl_En_Dnt_Nomal/func_809F3F6C.s | 101 -- .../actors/ovl_En_Dnt_Nomal/func_809F40D4.s | 133 --- .../actors/ovl_En_Dnt_Nomal/func_809F42A4.s | 30 - .../actors/ovl_En_Dnt_Nomal/func_809F4310.s | 50 - .../actors/ovl_En_Dnt_Nomal/func_809F43C8.s | 12 - .../actors/ovl_En_Dnt_Nomal/func_809F43F0.s | 73 -- .../actors/ovl_En_Dnt_Nomal/func_809F44FC.s | 166 ---- .../actors/ovl_En_Dnt_Nomal/func_809F4730.s | 66 -- .../actors/ovl_En_Dnt_Nomal/func_809F4824.s | 60 -- .../actors/ovl_En_Dnt_Nomal/func_809F48FC.s | 45 - .../actors/ovl_En_Dnt_Nomal/func_809F49A4.s | 149 --- .../actors/ovl_En_Dnt_Nomal/func_809F4BA4.s | 79 -- .../actors/ovl_En_Dnt_Nomal/func_809F4CB4.s | 99 -- .../actors/ovl_En_Dnt_Nomal/func_809F4E18.s | 61 -- .../actors/ovl_En_Dnt_Nomal/func_809F4EF4.s | 132 --- .../actors/ovl_En_Dnt_Nomal/func_809F50B8.s | 15 - .../actors/ovl_En_Dnt_Nomal/func_809F50EC.s | 56 -- .../actors/ovl_En_Dnt_Nomal/func_809F51B8.s | 199 ---- .../actors/ovl_En_Dnt_Nomal/func_809F5478.s | 44 - .../actors/ovl_En_Dnt_Nomal/func_809F551C.s | 77 -- .../actors/ovl_En_Dnt_Nomal/func_809F58E4.s | 77 -- .../actors/ovl_En_Dnt_Nomal/func_809F59E4.s | 37 - .../actors/ovl_En_Dnt_Nomal/func_809F5A6C.s | 160 ---- .../actors/ovl_En_Dnt_Nomal/func_809F5C98.s | 90 -- assets/xml/objects/object_dnk.xml | 30 + assets/xml/objects/object_dns.xml | 35 + assets/xml/objects/object_hintnuts.xml | 23 + data/overlays/actors/z_en_dnt_demo.data.s | 24 - data/overlays/actors/z_en_dnt_demo.reloc.s | 13 - data/overlays/actors/z_en_dnt_jiji.data.s | 22 - data/overlays/actors/z_en_dnt_jiji.reloc.s | 13 - data/overlays/actors/z_en_dnt_nomal.data.s | 34 - data/overlays/actors/z_en_dnt_nomal.reloc.s | 13 - include/functions.h | 4 +- spec | 18 +- .../actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c | 324 ++++++- .../actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h | 55 +- .../actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c | 418 ++++++++- .../actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h | 23 +- .../actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c | 882 ++++++++++++++++-- .../actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h | 36 +- .../actors/ovl_En_Hintnuts/z_en_hintnuts.c | 40 +- .../actors/ovl_En_Nutsball/z_en_nutsball.c | 5 +- undefined_syms.txt | 1 + 90 files changed, 1734 insertions(+), 5992 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F0AA4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F1100.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F1374.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1C04.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1C44.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1CF4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1DA8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1E8C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1EFC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1FE0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2068.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2118.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2254.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2344.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F236C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F24AC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2550.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F25E4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F26B0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2720.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F28DC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2974.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F29E0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2A90.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3480.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F35CC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3624.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F36CC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F39B8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3AD4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3B40.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3BE4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3CD0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3D84.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3E30.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3ED4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3F6C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F40D4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F42A4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4310.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43C8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43F0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F44FC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4730.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4824.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F48FC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F49A4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4BA4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4CB4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4E18.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4EF4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F50B8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F50EC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F51B8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5478.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F551C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F58E4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F59E4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5A6C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5C98.s create mode 100644 assets/xml/objects/object_dnk.xml create mode 100644 assets/xml/objects/object_dns.xml create mode 100644 assets/xml/objects/object_hintnuts.xml delete mode 100644 data/overlays/actors/z_en_dnt_demo.data.s delete mode 100644 data/overlays/actors/z_en_dnt_demo.reloc.s delete mode 100644 data/overlays/actors/z_en_dnt_jiji.data.s delete mode 100644 data/overlays/actors/z_en_dnt_jiji.reloc.s delete mode 100644 data/overlays/actors/z_en_dnt_nomal.data.s delete mode 100644 data/overlays/actors/z_en_dnt_nomal.reloc.s diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Destroy.s deleted file mode 100644 index 3a210a95b9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Destroy.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel EnDntDemo_Destroy -/* 00000 809F08E0 AFA40000 */ sw $a0, 0x0000($sp) -/* 00004 809F08E4 03E00008 */ jr $ra -/* 00008 809F08E8 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Init.s deleted file mode 100644 index 85650ab719..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Init.s +++ /dev/null @@ -1,144 +0,0 @@ -.rdata -glabel D_809F16B0 - .asciz "\n\n" - .balign 4 - -glabel D_809F16B4 - .asciz "\x1b[32m☆☆☆☆☆ デグナッツお面品評会開始 ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -.balign 4 - -glabel D_809F16F0 - .asciz "\x1b[32m☆☆☆☆☆ ザコザコ ☆☆☆☆☆ %x\n\x1b[m" - .balign 4 - -glabel D_809F171C - .asciz "\x1b[32m☆☆☆☆☆ じじじじじじじじじじい ☆☆☆☆☆ %x\n\x1b[m" - .balign 4 - -.late_rodata -glabel D_809F197C - .float 4050.0 - -.text -glabel EnDntDemo_Init -/* 0000C 809F08EC 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 00010 809F08F0 AFB30044 */ sw $s3, 0x0044($sp) -/* 00014 809F08F4 00809825 */ or $s3, $a0, $zero ## $s3 = 00000000 -/* 00018 809F08F8 AFBF005C */ sw $ra, 0x005C($sp) -/* 0001C 809F08FC AFB60050 */ sw $s6, 0x0050($sp) -/* 00020 809F0900 3C04809F */ lui $a0, %hi(D_809F16B0) ## $a0 = 809F0000 -/* 00024 809F0904 00A0B025 */ or $s6, $a1, $zero ## $s6 = 00000000 -/* 00028 809F0908 AFBE0058 */ sw $s8, 0x0058($sp) -/* 0002C 809F090C AFB70054 */ sw $s7, 0x0054($sp) -/* 00030 809F0910 AFB5004C */ sw $s5, 0x004C($sp) -/* 00034 809F0914 AFB40048 */ sw $s4, 0x0048($sp) -/* 00038 809F0918 AFB20040 */ sw $s2, 0x0040($sp) -/* 0003C 809F091C AFB1003C */ sw $s1, 0x003C($sp) -/* 00040 809F0920 AFB00038 */ sw $s0, 0x0038($sp) -/* 00044 809F0924 0C00084C */ jal osSyncPrintf - -/* 00048 809F0928 248416B0 */ addiu $a0, $a0, %lo(D_809F16B0) ## $a0 = 809F16B0 -/* 0004C 809F092C 3C04809F */ lui $a0, %hi(D_809F16B4) ## $a0 = 809F0000 -/* 00050 809F0930 0C00084C */ jal osSyncPrintf - -/* 00054 809F0934 248416B4 */ addiu $a0, $a0, %lo(D_809F16B4) ## $a0 = 809F16B4 -/* 00058 809F0938 3C14809F */ lui $s4, %hi(D_809F163C) ## $s4 = 809F0000 -/* 0005C 809F093C 26C41C24 */ addiu $a0, $s6, 0x1C24 ## $a0 = 00001C24 -/* 00060 809F0940 3C17809F */ lui $s7, %hi(D_809F16F0) ## $s7 = 809F0000 -/* 00064 809F0944 26F716F0 */ addiu $s7, $s7, %lo(D_809F16F0) ## $s7 = 809F16F0 -/* 00068 809F0948 AFA40064 */ sw $a0, 0x0064($sp) -/* 0006C 809F094C 2694163C */ addiu $s4, $s4, %lo(D_809F163C) ## $s4 = 809F163C -/* 00070 809F0950 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00074 809F0954 02609025 */ or $s2, $s3, $zero ## $s2 = 00000000 -/* 00078 809F0958 02608025 */ or $s0, $s3, $zero ## $s0 = 00000000 -/* 0007C 809F095C 26750160 */ addiu $s5, $s3, 0x0160 ## $s5 = 00000160 -/* 00080 809F0960 241E0009 */ addiu $s8, $zero, 0x0009 ## $s8 = 00000009 -.L809F0964: -/* 00084 809F0964 8E8F0000 */ lw $t7, 0x0000($s4) ## 809F163C -/* 00088 809F0968 8FA40064 */ lw $a0, 0x0064($sp) -/* 0008C 809F096C 24510001 */ addiu $s1, $v0, 0x0001 ## $s1 = 00000001 -/* 00090 809F0970 AEAF0000 */ sw $t7, 0x0000($s5) ## 00000160 -/* 00094 809F0974 8E8E0004 */ lw $t6, 0x0004($s4) ## 809F1640 -/* 00098 809F0978 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 0009C 809F097C 02C03025 */ or $a2, $s6, $zero ## $a2 = 00000000 -/* 000A0 809F0980 AEAE0004 */ sw $t6, 0x0004($s5) ## 00000164 -/* 000A4 809F0984 8E8F0008 */ lw $t7, 0x0008($s4) ## 809F1644 -/* 000A8 809F0988 240701A3 */ addiu $a3, $zero, 0x01A3 ## $a3 = 000001A3 -/* 000AC 809F098C AEAF0008 */ sw $t7, 0x0008($s5) ## 00000168 -/* 000B0 809F0990 C6040160 */ lwc1 $f4, 0x0160($s0) ## 00000160 -/* 000B4 809F0994 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 000B8 809F0998 C6060164 */ lwc1 $f6, 0x0164($s0) ## 00000164 -/* 000BC 809F099C E7A60014 */ swc1 $f6, 0x0014($sp) -/* 000C0 809F09A0 C6080168 */ lwc1 $f8, 0x0168($s0) ## 00000168 -/* 000C4 809F09A4 AFB10028 */ sw $s1, 0x0028($sp) -/* 000C8 809F09A8 AFA00024 */ sw $zero, 0x0024($sp) -/* 000CC 809F09AC AFA00020 */ sw $zero, 0x0020($sp) -/* 000D0 809F09B0 AFA0001C */ sw $zero, 0x001C($sp) -/* 000D4 809F09B4 0C00C916 */ jal Actor_SpawnAsChild - -/* 000D8 809F09B8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 000DC 809F09BC 10400004 */ beq $v0, $zero, .L809F09D0 -/* 000E0 809F09C0 AE4201D8 */ sw $v0, 0x01D8($s2) ## 000001D8 -/* 000E4 809F09C4 02E02025 */ or $a0, $s7, $zero ## $a0 = 809F16F0 -/* 000E8 809F09C8 0C00084C */ jal osSyncPrintf - -/* 000EC 809F09CC 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -.L809F09D0: -/* 000F0 809F09D0 02201025 */ or $v0, $s1, $zero ## $v0 = 00000001 -/* 000F4 809F09D4 2694000C */ addiu $s4, $s4, 0x000C ## $s4 = 809F1648 -/* 000F8 809F09D8 26520004 */ addiu $s2, $s2, 0x0004 ## $s2 = 00000004 -/* 000FC 809F09DC 2610000C */ addiu $s0, $s0, 0x000C ## $s0 = 0000000C -/* 00100 809F09E0 163EFFE0 */ bne $s1, $s8, .L809F0964 -/* 00104 809F09E4 26B5000C */ addiu $s5, $s5, 0x000C ## $s5 = 0000016C -/* 00108 809F09E8 3C01809F */ lui $at, %hi(D_809F197C) ## $at = 809F0000 -/* 0010C 809F09EC C420197C */ lwc1 $f0, %lo(D_809F197C)($at) -/* 00110 809F09F0 3C01C1A0 */ lui $at, 0xC1A0 ## $at = C1A00000 -/* 00114 809F09F4 44811000 */ mtc1 $at, $f2 ## $f2 = -20.00 -/* 00118 809F09F8 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 0011C 809F09FC 44816000 */ mtc1 $at, $f12 ## $f12 = 1000.00 -/* 00120 809F0A00 E66001CC */ swc1 $f0, 0x01CC($s3) ## 000001CC -/* 00124 809F0A04 E66201D0 */ swc1 $f2, 0x01D0($s3) ## 000001D0 -/* 00128 809F0A08 E66C01D4 */ swc1 $f12, 0x01D4($s3) ## 000001D4 -/* 0012C 809F0A0C AFA00028 */ sw $zero, 0x0028($sp) -/* 00130 809F0A10 AFA00024 */ sw $zero, 0x0024($sp) -/* 00134 809F0A14 AFA00020 */ sw $zero, 0x0020($sp) -/* 00138 809F0A18 AFA0001C */ sw $zero, 0x001C($sp) -/* 0013C 809F0A1C 8FA40064 */ lw $a0, 0x0064($sp) -/* 00140 809F0A20 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 00144 809F0A24 02C03025 */ or $a2, $s6, $zero ## $a2 = 00000000 -/* 00148 809F0A28 240701A2 */ addiu $a3, $zero, 0x01A2 ## $a3 = 000001A2 -/* 0014C 809F0A2C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00150 809F0A30 E7A20014 */ swc1 $f2, 0x0014($sp) -/* 00154 809F0A34 0C00C916 */ jal Actor_SpawnAsChild - -/* 00158 809F0A38 E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 0015C 809F0A3C 10400005 */ beq $v0, $zero, .L809F0A54 -/* 00160 809F0A40 AE6201FC */ sw $v0, 0x01FC($s3) ## 000001FC -/* 00164 809F0A44 3C04809F */ lui $a0, %hi(D_809F171C) ## $a0 = 809F0000 -/* 00168 809F0A48 2484171C */ addiu $a0, $a0, %lo(D_809F171C) ## $a0 = 809F171C -/* 0016C 809F0A4C 0C00084C */ jal osSyncPrintf - -/* 00170 809F0A50 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -.L809F0A54: -/* 00174 809F0A54 8E780004 */ lw $t8, 0x0004($s3) ## 00000004 -/* 00178 809F0A58 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 0017C 809F0A5C 3C08809F */ lui $t0, %hi(func_809F0AA4) ## $t0 = 809F0000 -/* 00180 809F0A60 25080AA4 */ addiu $t0, $t0, %lo(func_809F0AA4) ## $t0 = 809F0AA4 -/* 00184 809F0A64 0301C824 */ and $t9, $t8, $at -/* 00188 809F0A68 A660015E */ sh $zero, 0x015E($s3) ## 0000015E -/* 0018C 809F0A6C AE790004 */ sw $t9, 0x0004($s3) ## 00000004 -/* 00190 809F0A70 AE68014C */ sw $t0, 0x014C($s3) ## 0000014C -/* 00194 809F0A74 8FBF005C */ lw $ra, 0x005C($sp) -/* 00198 809F0A78 8FBE0058 */ lw $s8, 0x0058($sp) -/* 0019C 809F0A7C 8FB70054 */ lw $s7, 0x0054($sp) -/* 001A0 809F0A80 8FB60050 */ lw $s6, 0x0050($sp) -/* 001A4 809F0A84 8FB5004C */ lw $s5, 0x004C($sp) -/* 001A8 809F0A88 8FB40048 */ lw $s4, 0x0048($sp) -/* 001AC 809F0A8C 8FB30044 */ lw $s3, 0x0044($sp) -/* 001B0 809F0A90 8FB20040 */ lw $s2, 0x0040($sp) -/* 001B4 809F0A94 8FB1003C */ lw $s1, 0x003C($sp) -/* 001B8 809F0A98 8FB00038 */ lw $s0, 0x0038($sp) -/* 001BC 809F0A9C 03E00008 */ jr $ra -/* 001C0 809F0AA0 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Update.s deleted file mode 100644 index 872d6ccfdc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Update.s +++ /dev/null @@ -1,92 +0,0 @@ -glabel EnDntDemo_Update -/* 00B70 809F1450 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00B74 809F1454 AFBF0044 */ sw $ra, 0x0044($sp) -/* 00B78 809F1458 84820154 */ lh $v0, 0x0154($a0) ## 00000154 -/* 00B7C 809F145C 10400002 */ beq $v0, $zero, .L809F1468 -/* 00B80 809F1460 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00B84 809F1464 A48E0154 */ sh $t6, 0x0154($a0) ## 00000154 -.L809F1468: -/* 00B88 809F1468 84820152 */ lh $v0, 0x0152($a0) ## 00000152 -/* 00B8C 809F146C 10400002 */ beq $v0, $zero, .L809F1478 -/* 00B90 809F1470 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 00B94 809F1474 A48F0152 */ sh $t7, 0x0152($a0) ## 00000152 -.L809F1478: -/* 00B98 809F1478 AFA40048 */ sw $a0, 0x0048($sp) -/* 00B9C 809F147C AFA5004C */ sw $a1, 0x004C($sp) -/* 00BA0 809F1480 8C99014C */ lw $t9, 0x014C($a0) ## 0000014C -/* 00BA4 809F1484 0320F809 */ jalr $ra, $t9 -/* 00BA8 809F1488 00000000 */ nop -/* 00BAC 809F148C 3C188016 */ lui $t8, %hi(gGameInfo) -/* 00BB0 809F1490 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) -/* 00BB4 809F1494 8FA40048 */ lw $a0, 0x0048($sp) -/* 00BB8 809F1498 8FA5004C */ lw $a1, 0x004C($sp) -/* 00BBC 809F149C 870812D4 */ lh $t0, 0x12D4($t8) ## 801612D4 -/* 00BC0 809F14A0 5100003B */ beql $t0, $zero, .L809F1590 -/* 00BC4 809F14A4 8FBF0044 */ lw $ra, 0x0044($sp) -/* 00BC8 809F14A8 84820156 */ lh $v0, 0x0156($a0) ## 00000156 -/* 00BCC 809F14AC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00BD0 809F14B0 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 00BD4 809F14B4 1040001E */ beq $v0, $zero, .L809F1530 -/* 00BD8 809F14B8 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 00BDC 809F14BC 30490001 */ andi $t1, $v0, 0x0001 ## $t1 = 00000000 -/* 00BE0 809F14C0 15200032 */ bne $t1, $zero, .L809F158C -/* 00BE4 809F14C4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00BE8 809F14C8 848A0032 */ lh $t2, 0x0032($a0) ## 00000032 -/* 00BEC 809F14CC C48C0024 */ lwc1 $f12, 0x0024($a0) ## 00000024 -/* 00BF0 809F14D0 C48E0028 */ lwc1 $f14, 0x0028($a0) ## 00000028 -/* 00BF4 809F14D4 8C86002C */ lw $a2, 0x002C($a0) ## 0000002C -/* 00BF8 809F14D8 84870030 */ lh $a3, 0x0030($a0) ## 00000030 -/* 00BFC 809F14DC AFAA0010 */ sw $t2, 0x0010($sp) -/* 00C00 809F14E0 848B0034 */ lh $t3, 0x0034($a0) ## 00000034 -/* 00C04 809F14E4 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00C08 809F14E8 240C0078 */ addiu $t4, $zero, 0x0078 ## $t4 = 00000078 -/* 00C0C 809F14EC 240D0078 */ addiu $t5, $zero, 0x0078 ## $t5 = 00000078 -/* 00C10 809F14F0 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 00C14 809F14F4 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 -/* 00C18 809F14F8 AFAF0034 */ sw $t7, 0x0034($sp) -/* 00C1C 809F14FC AFAE0030 */ sw $t6, 0x0030($sp) -/* 00C20 809F1500 AFAD0028 */ sw $t5, 0x0028($sp) -/* 00C24 809F1504 AFAC0024 */ sw $t4, 0x0024($sp) -/* 00C28 809F1508 AFA0002C */ sw $zero, 0x002C($sp) -/* 00C2C 809F150C AFAB0014 */ sw $t3, 0x0014($sp) -/* 00C30 809F1510 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00C34 809F1514 E7A0001C */ swc1 $f0, 0x001C($sp) -/* 00C38 809F1518 E7A00020 */ swc1 $f0, 0x0020($sp) -/* 00C3C 809F151C 8CB90000 */ lw $t9, 0x0000($a1) ## 00000000 -/* 00C40 809F1520 0C018FA7 */ jal DebugDisplay_AddObject - -/* 00C44 809F1524 AFB90038 */ sw $t9, 0x0038($sp) -/* 00C48 809F1528 10000019 */ beq $zero, $zero, .L809F1590 -/* 00C4C 809F152C 8FBF0044 */ lw $ra, 0x0044($sp) -.L809F1530: -/* 00C50 809F1530 84980032 */ lh $t8, 0x0032($a0) ## 00000032 -/* 00C54 809F1534 C48C0024 */ lwc1 $f12, 0x0024($a0) ## 00000024 -/* 00C58 809F1538 C48E0028 */ lwc1 $f14, 0x0028($a0) ## 00000028 -/* 00C5C 809F153C 8C86002C */ lw $a2, 0x002C($a0) ## 0000002C -/* 00C60 809F1540 84870030 */ lh $a3, 0x0030($a0) ## 00000030 -/* 00C64 809F1544 AFB80010 */ sw $t8, 0x0010($sp) -/* 00C68 809F1548 84880034 */ lh $t0, 0x0034($a0) ## 00000034 -/* 00C6C 809F154C 44810000 */ mtc1 $at, $f0 ## $f0 = 0.00 -/* 00C70 809F1550 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 00C74 809F1554 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 00C78 809F1558 240D0004 */ addiu $t5, $zero, 0x0004 ## $t5 = 00000004 -/* 00C7C 809F155C AFAD0034 */ sw $t5, 0x0034($sp) -/* 00C80 809F1560 AFAC0030 */ sw $t4, 0x0030($sp) -/* 00C84 809F1564 AFAB002C */ sw $t3, 0x002C($sp) -/* 00C88 809F1568 AFAA0028 */ sw $t2, 0x0028($sp) -/* 00C8C 809F156C AFA90024 */ sw $t1, 0x0024($sp) -/* 00C90 809F1570 AFA80014 */ sw $t0, 0x0014($sp) -/* 00C94 809F1574 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00C98 809F1578 E7A0001C */ swc1 $f0, 0x001C($sp) -/* 00C9C 809F157C E7A00020 */ swc1 $f0, 0x0020($sp) -/* 00CA0 809F1580 8CAE0000 */ lw $t6, 0x0000($a1) ## 00000000 -/* 00CA4 809F1584 0C018FA7 */ jal DebugDisplay_AddObject - -/* 00CA8 809F1588 AFAE0038 */ sw $t6, 0x0038($sp) -.L809F158C: -/* 00CAC 809F158C 8FBF0044 */ lw $ra, 0x0044($sp) -.L809F1590: -/* 00CB0 809F1590 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00CB4 809F1594 03E00008 */ jr $ra -/* 00CB8 809F1598 00000000 */ nop -/* 00CBC 809F159C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F0AA4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F0AA4.s deleted file mode 100644 index c05a84e8a7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F0AA4.s +++ /dev/null @@ -1,535 +0,0 @@ -.rdata -glabel D_809F1758 - .asciz "\x1b[31m☆☆☆☆☆ げらげら ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -glabel D_809F1784 - .asciz "\x1b[32m☆☆☆☆☆ 特別！ ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -glabel D_809F17AC - .asciz "\x1b[32m☆☆☆☆☆ ヤバいよこれ！ ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -glabel D_809F17DC - .asciz "\x1b[33m☆☆☆☆☆ ヤバいよこれ！ ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -glabel D_809F180C - .asciz "\x1b[35m☆☆☆☆☆ ヤバいよこれ！ ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -glabel D_809F183C - .asciz "\x1b[36m☆☆☆☆☆ ヤバいよこれ！ ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -glabel D_809F186C - .asciz "\n\n" - .balign 4 - -glabel D_809F1870 - .asciz "\x1b[32m☆☆☆☆☆ 各インデックス１ ☆☆☆☆☆ %d\n\x1b[m" - .balign 4 - -glabel D_809F18A4 - .asciz "\x1b[32m☆☆☆☆☆ 各インデックス２ ☆☆☆☆☆ %d\n\x1b[m" - .balign 4 - -glabel D_809F18D8 - .asciz "\x1b[32m☆☆☆☆☆ 各インデックス３ ☆☆☆☆☆ %d\n\x1b[m" - .balign 4 - -glabel D_809F190C - .asciz "\n" - .balign 4 - -glabel D_809F1910 - .asciz "\x1b[33m☆☆☆☆☆ どういう評価？ ☆☆☆☆☆☆ %d\n\x1b[m" - .balign 4 - -glabel D_809F1944 - .asciz "\x1b[35m☆☆☆☆☆ どういうアクション？ ☆☆☆ %d\n\x1b[m" - .balign 4 - -glabel D_809F1978 - .asciz "\n\n" - .balign 4 - -.late_rodata -glabel jtbl_809F1980 -.word L809F0E1C -.word L809F0D50 -.word L809F0E1C -.word L809F0E1C -.word L809F0E1C -.word L809F0E1C -.word L809F0E1C -.word L809F0D80 -glabel D_809F19A0 - .float 8.99 -glabel D_809F19A4 - .float 7.99 - -.text -glabel func_809F0AA4 -/* 001C4 809F0AA4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 001C8 809F0AA8 AFBF002C */ sw $ra, 0x002C($sp) -/* 001CC 809F0AAC AFB20028 */ sw $s2, 0x0028($sp) -/* 001D0 809F0AB0 AFB10024 */ sw $s1, 0x0024($sp) -/* 001D4 809F0AB4 AFB00020 */ sw $s0, 0x0020($sp) -/* 001D8 809F0AB8 AFA50044 */ sw $a1, 0x0044($sp) -/* 001DC 809F0ABC 84860158 */ lh $a2, 0x0158($a0) ## 00000158 -/* 001E0 809F0AC0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 001E4 809F0AC4 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 001E8 809F0AC8 50C0003A */ beql $a2, $zero, .L809F0BB4 -/* 001EC 809F0ACC 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 001F0 809F0AD0 8C8E01D8 */ lw $t6, 0x01D8($a0) ## 000001D8 -/* 001F4 809F0AD4 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 001F8 809F0AD8 26020004 */ addiu $v0, $s0, 0x0004 ## $v0 = 00000004 -/* 001FC 809F0ADC A5C60270 */ sh $a2, 0x0270($t6) ## 00000270 -/* 00200 809F0AE0 8C9801D8 */ lw $t8, 0x01D8($a0) ## 000001D8 -/* 00204 809F0AE4 860F015A */ lh $t7, 0x015A($s0) ## 0000015A -/* 00208 809F0AE8 24120009 */ addiu $s2, $zero, 0x0009 ## $s2 = 00000009 -/* 0020C 809F0AEC A70F0274 */ sh $t7, 0x0274($t8) ## 00000274 -/* 00210 809F0AF0 8C9901D8 */ lw $t9, 0x01D8($a0) ## 000001D8 -/* 00214 809F0AF4 A3200278 */ sb $zero, 0x0278($t9) ## 00000278 -.L809F0AF8: -/* 00218 809F0AF8 860A0158 */ lh $t2, 0x0158($s0) ## 00000158 -/* 0021C 809F0AFC 8C4B01D8 */ lw $t3, 0x01D8($v0) ## 000001DC -/* 00220 809F0B00 24630004 */ addiu $v1, $v1, 0x0004 ## $v1 = 00000005 -/* 00224 809F0B04 24420010 */ addiu $v0, $v0, 0x0010 ## $v0 = 00000014 -/* 00228 809F0B08 A56A0270 */ sh $t2, 0x0270($t3) ## 00000270 -/* 0022C 809F0B0C 860C015A */ lh $t4, 0x015A($s0) ## 0000015A -/* 00230 809F0B10 8C4D01C8 */ lw $t5, 0x01C8($v0) ## 000001DC -/* 00234 809F0B14 A5AC0274 */ sh $t4, 0x0274($t5) ## 00000274 -/* 00238 809F0B18 8C4E01C8 */ lw $t6, 0x01C8($v0) ## 000001DC -/* 0023C 809F0B1C A1C00278 */ sb $zero, 0x0278($t6) ## 00000278 -/* 00240 809F0B20 860F0158 */ lh $t7, 0x0158($s0) ## 00000158 -/* 00244 809F0B24 8C5801CC */ lw $t8, 0x01CC($v0) ## 000001E0 -/* 00248 809F0B28 A70F0270 */ sh $t7, 0x0270($t8) ## 00000270 -/* 0024C 809F0B2C 8619015A */ lh $t9, 0x015A($s0) ## 0000015A -/* 00250 809F0B30 8C4A01CC */ lw $t2, 0x01CC($v0) ## 000001E0 -/* 00254 809F0B34 A5590274 */ sh $t9, 0x0274($t2) ## 00000274 -/* 00258 809F0B38 8C4B01CC */ lw $t3, 0x01CC($v0) ## 000001E0 -/* 0025C 809F0B3C A1600278 */ sb $zero, 0x0278($t3) ## 00000278 -/* 00260 809F0B40 860C0158 */ lh $t4, 0x0158($s0) ## 00000158 -/* 00264 809F0B44 8C4D01D0 */ lw $t5, 0x01D0($v0) ## 000001E4 -/* 00268 809F0B48 A5AC0270 */ sh $t4, 0x0270($t5) ## 00000270 -/* 0026C 809F0B4C 860E015A */ lh $t6, 0x015A($s0) ## 0000015A -/* 00270 809F0B50 8C4F01D0 */ lw $t7, 0x01D0($v0) ## 000001E4 -/* 00274 809F0B54 A5EE0274 */ sh $t6, 0x0274($t7) ## 00000274 -/* 00278 809F0B58 8C5801D0 */ lw $t8, 0x01D0($v0) ## 000001E4 -/* 0027C 809F0B5C A3000278 */ sb $zero, 0x0278($t8) ## 00000278 -/* 00280 809F0B60 8C4A01D4 */ lw $t2, 0x01D4($v0) ## 000001E8 -/* 00284 809F0B64 86190158 */ lh $t9, 0x0158($s0) ## 00000158 -/* 00288 809F0B68 A5590270 */ sh $t9, 0x0270($t2) ## 00000270 -/* 0028C 809F0B6C 8C4C01D4 */ lw $t4, 0x01D4($v0) ## 000001E8 -/* 00290 809F0B70 860B015A */ lh $t3, 0x015A($s0) ## 0000015A -/* 00294 809F0B74 A58B0274 */ sh $t3, 0x0274($t4) ## 00000274 -/* 00298 809F0B78 8C4D01D4 */ lw $t5, 0x01D4($v0) ## 000001E8 -/* 0029C 809F0B7C 1472FFDE */ bne $v1, $s2, .L809F0AF8 -/* 002A0 809F0B80 A1A00278 */ sb $zero, 0x0278($t5) ## 00000278 -/* 002A4 809F0B84 8E0201FC */ lw $v0, 0x01FC($s0) ## 000001FC -/* 002A8 809F0B88 3C18809F */ lui $t8, %hi(func_809F1100) ## $t8 = 809F0000 -/* 002AC 809F0B8C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 002B0 809F0B90 904E023C */ lbu $t6, 0x023C($v0) ## 00000250 -/* 002B4 809F0B94 27181100 */ addiu $t8, $t8, %lo(func_809F1100) ## $t8 = 809F1100 -/* 002B8 809F0B98 51C00003 */ beql $t6, $zero, .L809F0BA8 -/* 002BC 809F0B9C A6000158 */ sh $zero, 0x0158($s0) ## 00000158 -/* 002C0 809F0BA0 A44F024E */ sh $t7, 0x024E($v0) ## 00000262 -/* 002C4 809F0BA4 A6000158 */ sh $zero, 0x0158($s0) ## 00000158 -.L809F0BA8: -/* 002C8 809F0BA8 1000014F */ beq $zero, $zero, .L809F10E8 -/* 002CC 809F0BAC AE18014C */ sw $t8, 0x014C($s0) ## 0000014C -/* 002D0 809F0BB0 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -.L809F0BB4: -/* 002D4 809F0BB4 C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 -/* 002D8 809F0BB8 4606203C */ c.lt.s $f4, $f6 -/* 002DC 809F0BBC 00000000 */ nop -/* 002E0 809F0BC0 45030006 */ bc1tl .L809F0BDC -/* 002E4 809F0BC4 86190156 */ lh $t9, 0x0156($s0) ## 00000156 -/* 002E8 809F0BC8 0C023C20 */ jal Player_GetMask -/* 002EC 809F0BCC 8FA40044 */ lw $a0, 0x0044($sp) -/* 002F0 809F0BD0 1440001D */ bne $v0, $zero, .L809F0C48 -/* 002F4 809F0BD4 00000000 */ nop -/* 002F8 809F0BD8 86190156 */ lh $t9, 0x0156($s0) ## 00000156 -.L809F0BDC: -/* 002FC 809F0BDC 860B015E */ lh $t3, 0x015E($s0) ## 0000015E -/* 00300 809F0BE0 24040004 */ addiu $a0, $zero, 0x0004 ## $a0 = 00000004 -/* 00304 809F0BE4 272A0001 */ addiu $t2, $t9, 0x0001 ## $t2 = 00000001 -/* 00308 809F0BE8 11600002 */ beq $t3, $zero, .L809F0BF4 -/* 0030C 809F0BEC A60A0156 */ sh $t2, 0x0156($s0) ## 00000156 -/* 00310 809F0BF0 A600015E */ sh $zero, 0x015E($s0) ## 0000015E -.L809F0BF4: -/* 00314 809F0BF4 860C0150 */ lh $t4, 0x0150($s0) ## 00000150 -/* 00318 809F0BF8 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 0031C 809F0BFC 5180013B */ beql $t4, $zero, .L809F10EC -/* 00320 809F0C00 8FBF002C */ lw $ra, 0x002C($sp) -/* 00324 809F0C04 8E0D01D8 */ lw $t5, 0x01D8($s0) ## 000001D8 -/* 00328 809F0C08 26020004 */ addiu $v0, $s0, 0x0004 ## $v0 = 00000004 -/* 0032C 809F0C0C 24120009 */ addiu $s2, $zero, 0x0009 ## $s2 = 00000009 -/* 00330 809F0C10 A5A40270 */ sh $a0, 0x0270($t5) ## 00000270 -.L809F0C14: -/* 00334 809F0C14 8C4E01D8 */ lw $t6, 0x01D8($v0) ## 000001DC -/* 00338 809F0C18 24630004 */ addiu $v1, $v1, 0x0004 ## $v1 = 00000005 -/* 0033C 809F0C1C 24420010 */ addiu $v0, $v0, 0x0010 ## $v0 = 00000014 -/* 00340 809F0C20 A5C40270 */ sh $a0, 0x0270($t6) ## 00000270 -/* 00344 809F0C24 8C4F01CC */ lw $t7, 0x01CC($v0) ## 000001E0 -/* 00348 809F0C28 A5E40270 */ sh $a0, 0x0270($t7) ## 00000270 -/* 0034C 809F0C2C 8C5801D0 */ lw $t8, 0x01D0($v0) ## 000001E4 -/* 00350 809F0C30 A7040270 */ sh $a0, 0x0270($t8) ## 00000270 -/* 00354 809F0C34 8C5901D4 */ lw $t9, 0x01D4($v0) ## 000001E8 -/* 00358 809F0C38 1472FFF6 */ bne $v1, $s2, .L809F0C14 -/* 0035C 809F0C3C A7240270 */ sh $a0, 0x0270($t9) ## 00000270 -/* 00360 809F0C40 10000129 */ beq $zero, $zero, .L809F10E8 -/* 00364 809F0C44 A6000150 */ sh $zero, 0x0150($s0) ## 00000150 -.L809F0C48: -/* 00368 809F0C48 0C023C20 */ jal Player_GetMask -/* 0036C 809F0C4C 8FA40044 */ lw $a0, 0x0044($sp) -/* 00370 809F0C50 5040000B */ beql $v0, $zero, .L809F0C80 -/* 00374 809F0C54 86020150 */ lh $v0, 0x0150($s0) ## 00000150 -/* 00378 809F0C58 860A015E */ lh $t2, 0x015E($s0) ## 0000015E -/* 0037C 809F0C5C 8FA40044 */ lw $a0, 0x0044($sp) -/* 00380 809F0C60 240508AC */ addiu $a1, $zero, 0x08AC ## $a1 = 000008AC -/* 00384 809F0C64 15400005 */ bne $t2, $zero, .L809F0C7C -/* 00388 809F0C68 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 0038C 809F0C6C 8E0701E4 */ lw $a3, 0x01E4($s0) ## 000001E4 -/* 00390 809F0C70 0C02003E */ jal func_800800F8 -/* 00394 809F0C74 AFA00010 */ sw $zero, 0x0010($sp) -/* 00398 809F0C78 A602015E */ sh $v0, 0x015E($s0) ## 0000015E -.L809F0C7C: -/* 0039C 809F0C7C 86020150 */ lh $v0, 0x0150($s0) ## 00000150 -.L809F0C80: -/* 003A0 809F0C80 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 003A4 809F0C84 A6000156 */ sh $zero, 0x0156($s0) ## 00000156 -/* 003A8 809F0C88 14410012 */ bne $v0, $at, .L809F0CD4 -/* 003AC 809F0C8C 24110001 */ addiu $s1, $zero, 0x0001 ## $s1 = 00000001 -/* 003B0 809F0C90 8E0B01D8 */ lw $t3, 0x01D8($s0) ## 000001D8 -/* 003B4 809F0C94 02201825 */ or $v1, $s1, $zero ## $v1 = 00000001 -/* 003B8 809F0C98 26020004 */ addiu $v0, $s0, 0x0004 ## $v0 = 00000004 -/* 003BC 809F0C9C 24120009 */ addiu $s2, $zero, 0x0009 ## $s2 = 00000009 -/* 003C0 809F0CA0 A5710270 */ sh $s1, 0x0270($t3) ## 00000270 -.L809F0CA4: -/* 003C4 809F0CA4 8C4C01D8 */ lw $t4, 0x01D8($v0) ## 000001DC -/* 003C8 809F0CA8 24630004 */ addiu $v1, $v1, 0x0004 ## $v1 = 00000005 -/* 003CC 809F0CAC 24420010 */ addiu $v0, $v0, 0x0010 ## $v0 = 00000014 -/* 003D0 809F0CB0 A5910270 */ sh $s1, 0x0270($t4) ## 00000270 -/* 003D4 809F0CB4 8C4D01CC */ lw $t5, 0x01CC($v0) ## 000001E0 -/* 003D8 809F0CB8 A5B10270 */ sh $s1, 0x0270($t5) ## 00000270 -/* 003DC 809F0CBC 8C4E01D0 */ lw $t6, 0x01D0($v0) ## 000001E4 -/* 003E0 809F0CC0 A5D10270 */ sh $s1, 0x0270($t6) ## 00000270 -/* 003E4 809F0CC4 8C4F01D4 */ lw $t7, 0x01D4($v0) ## 000001E8 -/* 003E8 809F0CC8 1472FFF6 */ bne $v1, $s2, .L809F0CA4 -/* 003EC 809F0CCC A5F10270 */ sh $s1, 0x0270($t7) ## 00000270 -/* 003F0 809F0CD0 86020150 */ lh $v0, 0x0150($s0) ## 00000150 -.L809F0CD4: -/* 003F4 809F0CD4 28410029 */ slti $at, $v0, 0x0029 -/* 003F8 809F0CD8 24110001 */ addiu $s1, $zero, 0x0001 ## $s1 = 00000001 -/* 003FC 809F0CDC 14200009 */ bne $at, $zero, .L809F0D04 -/* 00400 809F0CE0 24120009 */ addiu $s2, $zero, 0x0009 ## $s2 = 00000009 -/* 00404 809F0CE4 3C04809F */ lui $a0, %hi(D_809F1758) ## $a0 = 809F0000 -/* 00408 809F0CE8 0C00084C */ jal osSyncPrintf - -/* 0040C 809F0CEC 24841758 */ addiu $a0, $a0, %lo(D_809F1758) ## $a0 = 809F1758 -/* 00410 809F0CF0 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 -/* 00414 809F0CF4 2405205D */ addiu $a1, $zero, 0x205D ## $a1 = 0000205D -/* 00418 809F0CF8 0C03D0DB */ jal func_800F436C -/* 0041C 809F0CFC 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 00420 809F0D00 86020150 */ lh $v0, 0x0150($s0) ## 00000150 -.L809F0D04: -/* 00424 809F0D04 28410078 */ slti $at, $v0, 0x0078 -/* 00428 809F0D08 10200003 */ beq $at, $zero, .L809F0D18 -/* 0042C 809F0D0C 24580001 */ addiu $t8, $v0, 0x0001 ## $t8 = 00000001 -/* 00430 809F0D10 100000F5 */ beq $zero, $zero, .L809F10E8 -/* 00434 809F0D14 A6180150 */ sh $t8, 0x0150($s0) ## 00000150 -.L809F0D18: -/* 00438 809F0D18 A3A00035 */ sb $zero, 0x0035($sp) -/* 0043C 809F0D1C A7A0003C */ sh $zero, 0x003C($sp) -/* 00440 809F0D20 A7A0003E */ sh $zero, 0x003E($sp) -/* 00444 809F0D24 0C023C20 */ jal Player_GetMask -/* 00448 809F0D28 8FA40044 */ lw $a0, 0x0044($sp) -/* 0044C 809F0D2C 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF -/* 00450 809F0D30 2F210008 */ sltiu $at, $t9, 0x0008 -/* 00454 809F0D34 102000B6 */ beq $at, $zero, .L809F1010 -/* 00458 809F0D38 0019C880 */ sll $t9, $t9, 2 -/* 0045C 809F0D3C 3C01809F */ lui $at, %hi(jtbl_809F1980) ## $at = 809F0000 -/* 00460 809F0D40 00390821 */ addu $at, $at, $t9 -/* 00464 809F0D44 8C391980 */ lw $t9, %lo(jtbl_809F1980)($at) -/* 00468 809F0D48 03200008 */ jr $t9 -/* 0046C 809F0D4C 00000000 */ nop -glabel L809F0D50 -/* 00470 809F0D50 3C0A8016 */ lui $t2, %hi(gSaveContext+0xef2) -/* 00474 809F0D54 954AF552 */ lhu $t2, %lo(gSaveContext+0xef2)($t2) -/* 00478 809F0D58 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 0047C 809F0D5C 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 00480 809F0D60 314B4000 */ andi $t3, $t2, 0x4000 ## $t3 = 00000000 -/* 00484 809F0D64 15600006 */ bne $t3, $zero, .L809F0D80 -/* 00488 809F0D68 2404003E */ addiu $a0, $zero, 0x003E ## $a0 = 0000003E -/* 0048C 809F0D6C A7AC003C */ sh $t4, 0x003C($sp) -/* 00490 809F0D70 0C03E803 */ jal Audio_SetBGM - -/* 00494 809F0D74 A60D015C */ sh $t5, 0x015C($s0) ## 0000015C -/* 00498 809F0D78 100000A6 */ beq $zero, $zero, .L809F1014 -/* 0049C 809F0D7C 87A8003C */ lh $t0, 0x003C($sp) -glabel L809F0D80 -.L809F0D80: -/* 004A0 809F0D80 3C0E8016 */ lui $t6, %hi(gSaveContext+0xef2) -/* 004A4 809F0D84 95CEF552 */ lhu $t6, %lo(gSaveContext+0xef2)($t6) -/* 004A8 809F0D88 31CF8000 */ andi $t7, $t6, 0x8000 ## $t7 = 00000000 -/* 004AC 809F0D8C 15E00023 */ bne $t7, $zero, .L809F0E1C -/* 004B0 809F0D90 00000000 */ nop -/* 004B4 809F0D94 0C023C20 */ jal Player_GetMask -/* 004B8 809F0D98 8FA40044 */ lw $a0, 0x0044($sp) -/* 004BC 809F0D9C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 004C0 809F0DA0 1041001E */ beq $v0, $at, .L809F0E1C -/* 004C4 809F0DA4 3C078013 */ lui $a3, %hi(D_801333E0) -/* 004C8 809F0DA8 3C188013 */ lui $t8, %hi(D_801333E8) -/* 004CC 809F0DAC 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 004D0 809F0DB0 271833E8 */ addiu $t8, %lo(D_801333E8) -/* 004D4 809F0DB4 3C058013 */ lui $a1, %hi(D_801333D4) -/* 004D8 809F0DB8 24A533D4 */ addiu $a1, %lo(D_801333D4) -/* 004DC 809F0DBC AFB80014 */ sw $t8, 0x0014($sp) -/* 004E0 809F0DC0 AFA70010 */ sw $a3, 0x0010($sp) -/* 004E4 809F0DC4 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 -/* 004E8 809F0DC8 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 004EC 809F0DCC 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 004F0 809F0DD0 8E1901FC */ lw $t9, 0x01FC($s0) ## 000001FC -/* 004F4 809F0DD4 A611015C */ sh $s1, 0x015C($s0) ## 0000015C -/* 004F8 809F0DD8 00114400 */ sll $t0, $s1, 16 -/* 004FC 809F0DDC 00084403 */ sra $t0, $t0, 16 -/* 00500 809F0DE0 A731024E */ sh $s1, 0x024E($t9) ## 0000024E -/* 00504 809F0DE4 A7A8003C */ sh $t0, 0x003C($sp) -/* 00508 809F0DE8 860A015E */ lh $t2, 0x015E($s0) ## 0000015E -/* 0050C 809F0DEC 24050924 */ addiu $a1, $zero, 0x0924 ## $a1 = 00000924 -/* 00510 809F0DF0 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 00514 809F0DF4 11400007 */ beq $t2, $zero, .L809F0E14 -/* 00518 809F0DF8 00000000 */ nop -/* 0051C 809F0DFC A600015E */ sh $zero, 0x015E($s0) ## 0000015E -/* 00520 809F0E00 8E0701FC */ lw $a3, 0x01FC($s0) ## 000001FC -/* 00524 809F0E04 A7A8003C */ sh $t0, 0x003C($sp) -/* 00528 809F0E08 AFA00010 */ sw $zero, 0x0010($sp) -/* 0052C 809F0E0C 0C02003E */ jal func_800800F8 -/* 00530 809F0E10 8FA40044 */ lw $a0, 0x0044($sp) -.L809F0E14: -/* 00534 809F0E14 1000007F */ beq $zero, $zero, .L809F1014 -/* 00538 809F0E18 87A8003C */ lh $t0, 0x003C($sp) -glabel L809F0E1C -.L809F0E1C: -/* 0053C 809F0E1C 3C01809F */ lui $at, %hi(D_809F19A0) ## $at = 809F0000 -/* 00540 809F0E20 0C00CFBE */ jal Rand_ZeroFloat - -/* 00544 809F0E24 C42C19A0 */ lwc1 $f12, %lo(D_809F19A0)($at) -/* 00548 809F0E28 4600020D */ trunc.w.s $f8, $f0 -/* 0054C 809F0E2C 8FA40044 */ lw $a0, 0x0044($sp) -/* 00550 809F0E30 440C4000 */ mfc1 $t4, $f8 -/* 00554 809F0E34 0C023C20 */ jal Player_GetMask -/* 00558 809F0E38 A7AC003A */ sh $t4, 0x003A($sp) -/* 0055C 809F0E3C 87AD003A */ lh $t5, 0x003A($sp) -/* 00560 809F0E40 00021C00 */ sll $v1, $v0, 16 -/* 00564 809F0E44 00031C03 */ sra $v1, $v1, 16 -/* 00568 809F0E48 2463FFFF */ addiu $v1, $v1, 0xFFFF ## $v1 = FFFFFFFF -/* 0056C 809F0E4C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00570 809F0E50 15A1000C */ bne $t5, $at, .L809F0E84 -/* 00574 809F0E54 A7A30038 */ sh $v1, 0x0038($sp) -/* 00578 809F0E58 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 0057C 809F0E5C 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 -/* 00580 809F0E60 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 -/* 00584 809F0E64 3C04809F */ lui $a0, %hi(D_809F1784) ## $a0 = 809F0000 -/* 00588 809F0E68 A3AE0035 */ sb $t6, 0x0035($sp) -/* 0058C 809F0E6C A7AF003E */ sh $t7, 0x003E($sp) -/* 00590 809F0E70 A7B8003C */ sh $t8, 0x003C($sp) -/* 00594 809F0E74 0C00084C */ jal osSyncPrintf - -/* 00598 809F0E78 24841784 */ addiu $a0, $a0, %lo(D_809F1784) ## $a0 = 809F1784 -/* 0059C 809F0E7C 10000065 */ beq $zero, $zero, .L809F1014 -/* 005A0 809F0E80 87A8003C */ lh $t0, 0x003C($sp) -.L809F0E84: -/* 005A4 809F0E84 0003CC00 */ sll $t9, $v1, 16 -/* 005A8 809F0E88 00195403 */ sra $t2, $t9, 16 -/* 005AC 809F0E8C 29410008 */ slti $at, $t2, 0x0008 -/* 005B0 809F0E90 14200013 */ bne $at, $zero, .L809F0EE0 -/* 005B4 809F0E94 3C04809F */ lui $a0, %hi(D_809F17AC) ## $a0 = 809F0000 -/* 005B8 809F0E98 0C00084C */ jal osSyncPrintf - -/* 005BC 809F0E9C 248417AC */ addiu $a0, $a0, %lo(D_809F17AC) ## $a0 = 809F17AC -/* 005C0 809F0EA0 3C04809F */ lui $a0, %hi(D_809F17DC) ## $a0 = 809F0000 -/* 005C4 809F0EA4 0C00084C */ jal osSyncPrintf - -/* 005C8 809F0EA8 248417DC */ addiu $a0, $a0, %lo(D_809F17DC) ## $a0 = 809F17DC -/* 005CC 809F0EAC 3C04809F */ lui $a0, %hi(D_809F180C) ## $a0 = 809F0000 -/* 005D0 809F0EB0 0C00084C */ jal osSyncPrintf - -/* 005D4 809F0EB4 2484180C */ addiu $a0, $a0, %lo(D_809F180C) ## $a0 = 809F180C -/* 005D8 809F0EB8 3C04809F */ lui $a0, %hi(D_809F183C) ## $a0 = 809F0000 -/* 005DC 809F0EBC 0C00084C */ jal osSyncPrintf - -/* 005E0 809F0EC0 2484183C */ addiu $a0, $a0, %lo(D_809F183C) ## $a0 = 809F183C -/* 005E4 809F0EC4 3C01809F */ lui $at, %hi(D_809F19A4) ## $at = 809F0000 -/* 005E8 809F0EC8 0C00CFBE */ jal Rand_ZeroFloat - -/* 005EC 809F0ECC C42C19A4 */ lwc1 $f12, %lo(D_809F19A4)($at) -/* 005F0 809F0ED0 4600028D */ trunc.w.s $f10, $f0 -/* 005F4 809F0ED4 440C5000 */ mfc1 $t4, $f10 -/* 005F8 809F0ED8 00000000 */ nop -/* 005FC 809F0EDC A7AC0038 */ sh $t4, 0x0038($sp) -.L809F0EE0: -/* 00600 809F0EE0 87AD003A */ lh $t5, 0x003A($sp) -/* 00604 809F0EE4 87AF0038 */ lh $t7, 0x0038($sp) -/* 00608 809F0EE8 3C0A809F */ lui $t2, %hi(D_809F15C0) ## $t2 = 809F0000 -/* 0060C 809F0EEC 000D70C0 */ sll $t6, $t5, 3 -/* 00610 809F0EF0 01CD7023 */ subu $t6, $t6, $t5 -/* 00614 809F0EF4 000E7040 */ sll $t6, $t6, 1 -/* 00618 809F0EF8 000FC040 */ sll $t8, $t7, 1 -/* 0061C 809F0EFC 01D8C821 */ addu $t9, $t6, $t8 -/* 00620 809F0F00 01595021 */ addu $t2, $t2, $t9 -/* 00624 809F0F04 854A15C0 */ lh $t2, %lo(D_809F15C0)($t2) -/* 00628 809F0F08 3C0C809F */ lui $t4, %hi(D_809F1630) ## $t4 = 809F0000 -/* 0062C 809F0F0C 258C1630 */ addiu $t4, $t4, %lo(D_809F1630) ## $t4 = 809F1630 -/* 00630 809F0F10 000A5880 */ sll $t3, $t2, 2 -/* 00634 809F0F14 016C1021 */ addu $v0, $t3, $t4 -/* 00638 809F0F18 844D0000 */ lh $t5, 0x0000($v0) ## 00000000 -/* 0063C 809F0F1C 844F0002 */ lh $t7, 0x0002($v0) ## 00000002 -/* 00640 809F0F20 A7AA0036 */ sh $t2, 0x0036($sp) -/* 00644 809F0F24 A7AD003C */ sh $t5, 0x003C($sp) -/* 00648 809F0F28 A60F015A */ sh $t7, 0x015A($s0) ## 0000015A -/* 0064C 809F0F2C 8603015A */ lh $v1, 0x015A($s0) ## 0000015A -/* 00650 809F0F30 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00654 809F0F34 10710017 */ beq $v1, $s1, .L809F0F94 -/* 00658 809F0F38 00000000 */ nop -/* 0065C 809F0F3C 10610007 */ beq $v1, $at, .L809F0F5C -/* 00660 809F0F40 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00664 809F0F44 14610015 */ bne $v1, $at, .L809F0F9C -/* 00668 809F0F48 00000000 */ nop -/* 0066C 809F0F4C 0C03E803 */ jal Audio_SetBGM - -/* 00670 809F0F50 2404002D */ addiu $a0, $zero, 0x002D ## $a0 = 0000002D -/* 00674 809F0F54 10000011 */ beq $zero, $zero, .L809F0F9C -/* 00678 809F0F58 00000000 */ nop -.L809F0F5C: -/* 0067C 809F0F5C 860E015E */ lh $t6, 0x015E($s0) ## 0000015E -/* 00680 809F0F60 2405092E */ addiu $a1, $zero, 0x092E ## $a1 = 0000092E -/* 00684 809F0F64 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 00688 809F0F68 11C00006 */ beq $t6, $zero, .L809F0F84 -/* 0068C 809F0F6C 00000000 */ nop -/* 00690 809F0F70 A600015E */ sh $zero, 0x015E($s0) ## 0000015E -/* 00694 809F0F74 8E0701E4 */ lw $a3, 0x01E4($s0) ## 000001E4 -/* 00698 809F0F78 AFA00010 */ sw $zero, 0x0010($sp) -/* 0069C 809F0F7C 0C02003E */ jal func_800800F8 -/* 006A0 809F0F80 8FA40044 */ lw $a0, 0x0044($sp) -.L809F0F84: -/* 006A4 809F0F84 0C03E803 */ jal Audio_SetBGM - -/* 006A8 809F0F88 2404081A */ addiu $a0, $zero, 0x081A ## $a0 = 0000081A -/* 006AC 809F0F8C 10000003 */ beq $zero, $zero, .L809F0F9C -/* 006B0 809F0F90 00000000 */ nop -.L809F0F94: -/* 006B4 809F0F94 0C03E803 */ jal Audio_SetBGM - -/* 006B8 809F0F98 24040055 */ addiu $a0, $zero, 0x0055 ## $a0 = 00000055 -.L809F0F9C: -/* 006BC 809F0F9C 3C04809F */ lui $a0, %hi(D_809F186C) ## $a0 = 809F0000 -/* 006C0 809F0FA0 0C00084C */ jal osSyncPrintf - -/* 006C4 809F0FA4 2484186C */ addiu $a0, $a0, %lo(D_809F186C) ## $a0 = 809F186C -/* 006C8 809F0FA8 3C04809F */ lui $a0, %hi(D_809F1870) ## $a0 = 809F0000 -/* 006CC 809F0FAC 24841870 */ addiu $a0, $a0, %lo(D_809F1870) ## $a0 = 809F1870 -/* 006D0 809F0FB0 0C00084C */ jal osSyncPrintf - -/* 006D4 809F0FB4 87A5003A */ lh $a1, 0x003A($sp) -/* 006D8 809F0FB8 3C04809F */ lui $a0, %hi(D_809F18A4) ## $a0 = 809F0000 -/* 006DC 809F0FBC 248418A4 */ addiu $a0, $a0, %lo(D_809F18A4) ## $a0 = 809F18A4 -/* 006E0 809F0FC0 0C00084C */ jal osSyncPrintf - -/* 006E4 809F0FC4 87A50038 */ lh $a1, 0x0038($sp) -/* 006E8 809F0FC8 3C04809F */ lui $a0, %hi(D_809F18D8) ## $a0 = 809F0000 -/* 006EC 809F0FCC 248418D8 */ addiu $a0, $a0, %lo(D_809F18D8) ## $a0 = 809F18D8 -/* 006F0 809F0FD0 0C00084C */ jal osSyncPrintf - -/* 006F4 809F0FD4 87A50036 */ lh $a1, 0x0036($sp) -/* 006F8 809F0FD8 3C04809F */ lui $a0, %hi(D_809F190C) ## $a0 = 809F0000 -/* 006FC 809F0FDC 0C00084C */ jal osSyncPrintf - -/* 00700 809F0FE0 2484190C */ addiu $a0, $a0, %lo(D_809F190C) ## $a0 = 809F190C -/* 00704 809F0FE4 3C04809F */ lui $a0, %hi(D_809F1910) ## $a0 = 809F0000 -/* 00708 809F0FE8 24841910 */ addiu $a0, $a0, %lo(D_809F1910) ## $a0 = 809F1910 -/* 0070C 809F0FEC 0C00084C */ jal osSyncPrintf - -/* 00710 809F0FF0 87A5003C */ lh $a1, 0x003C($sp) -/* 00714 809F0FF4 3C04809F */ lui $a0, %hi(D_809F1944) ## $a0 = 809F0000 -/* 00718 809F0FF8 24841944 */ addiu $a0, $a0, %lo(D_809F1944) ## $a0 = 809F1944 -/* 0071C 809F0FFC 0C00084C */ jal osSyncPrintf - -/* 00720 809F1000 8605015A */ lh $a1, 0x015A($s0) ## 0000015A -/* 00724 809F1004 3C04809F */ lui $a0, %hi(D_809F1978) ## $a0 = 809F0000 -/* 00728 809F1008 0C00084C */ jal osSyncPrintf - -/* 0072C 809F100C 24841978 */ addiu $a0, $a0, %lo(D_809F1978) ## $a0 = 809F1978 -.L809F1010: -/* 00730 809F1010 87A8003C */ lh $t0, 0x003C($sp) -.L809F1014: -/* 00734 809F1014 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 00738 809F1018 02001025 */ or $v0, $s0, $zero ## $v0 = 00000000 -/* 0073C 809F101C 11000032 */ beq $t0, $zero, .L809F10E8 -/* 00740 809F1020 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 00744 809F1024 93A70035 */ lbu $a3, 0x0035($sp) -/* 00748 809F1028 87A6003E */ lh $a2, 0x003E($sp) -/* 0074C 809F102C 2405012C */ addiu $a1, $zero, 0x012C ## $a1 = 0000012C -.L809F1030: -/* 00750 809F1030 50C00007 */ beql $a2, $zero, .L809F1050 -/* 00754 809F1034 860A015A */ lh $t2, 0x015A($s0) ## 0000015A -/* 00758 809F1038 00C30019 */ multu $a2, $v1 -/* 0075C 809F103C 8C5901D8 */ lw $t9, 0x01D8($v0) ## 000001D8 -/* 00760 809F1040 0000C012 */ mflo $t8 -/* 00764 809F1044 A7380264 */ sh $t8, 0x0264($t9) ## 00000264 -/* 00768 809F1048 00000000 */ nop -/* 0076C 809F104C 860A015A */ lh $t2, 0x015A($s0) ## 0000015A -.L809F1050: -/* 00770 809F1050 8C4B01D8 */ lw $t3, 0x01D8($v0) ## 000001D8 -/* 00774 809F1054 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = 00000001 -/* 00778 809F1058 A56A0274 */ sh $t2, 0x0274($t3) ## 00000274 -/* 0077C 809F105C 8C4C01D8 */ lw $t4, 0x01D8($v0) ## 000001D8 -/* 00780 809F1060 A5880270 */ sh $t0, 0x0270($t4) ## 00000270 -/* 00784 809F1064 8C4D01D8 */ lw $t5, 0x01D8($v0) ## 000001D8 -/* 00788 809F1068 A1A70276 */ sb $a3, 0x0276($t5) ## 00000276 -/* 0078C 809F106C 860F015C */ lh $t7, 0x015C($s0) ## 0000015C -/* 00790 809F1070 11E00018 */ beq $t7, $zero, .L809F10D4 -/* 00794 809F1074 00000000 */ nop -/* 00798 809F1078 8C4E01D8 */ lw $t6, 0x01D8($v0) ## 000001D8 -/* 0079C 809F107C A5C50258 */ sh $a1, 0x0258($t6) ## 00000258 -/* 007A0 809F1080 8618015C */ lh $t8, 0x015C($s0) ## 0000015C -/* 007A4 809F1084 8C5901D8 */ lw $t9, 0x01D8($v0) ## 000001D8 -/* 007A8 809F1088 A3380278 */ sb $t8, 0x0278($t9) ## 00000278 -/* 007AC 809F108C 8E0B01FC */ lw $t3, 0x01FC($s0) ## 000001FC -/* 007B0 809F1090 8C4A01D8 */ lw $t2, 0x01D8($v0) ## 000001D8 -/* 007B4 809F1094 8D6D0024 */ lw $t5, 0x0024($t3) ## 00000024 -/* 007B8 809F1098 AD4D0288 */ sw $t5, 0x0288($t2) ## 00000288 -/* 007BC 809F109C 8D6C0028 */ lw $t4, 0x0028($t3) ## 00000028 -/* 007C0 809F10A0 AD4C028C */ sw $t4, 0x028C($t2) ## 0000028C -/* 007C4 809F10A4 8D6D002C */ lw $t5, 0x002C($t3) ## 0000002C -/* 007C8 809F10A8 AD4D0290 */ sw $t5, 0x0290($t2) ## 00000290 -/* 007CC 809F10AC 8604015C */ lh $a0, 0x015C($s0) ## 0000015C -/* 007D0 809F10B0 16240004 */ bne $s1, $a0, .L809F10C4 -/* 007D4 809F10B4 00000000 */ nop -/* 007D8 809F10B8 8E0F01FC */ lw $t7, 0x01FC($s0) ## 000001FC -/* 007DC 809F10BC A5F1024E */ sh $s1, 0x024E($t7) ## 0000024E -/* 007E0 809F10C0 8604015C */ lh $a0, 0x015C($s0) ## 0000015C -.L809F10C4: -/* 007E4 809F10C4 15240003 */ bne $t1, $a0, .L809F10D4 -/* 007E8 809F10C8 00000000 */ nop -/* 007EC 809F10CC 8E0E01FC */ lw $t6, 0x01FC($s0) ## 000001FC -/* 007F0 809F10D0 A5C50240 */ sh $a1, 0x0240($t6) ## 00000240 -.L809F10D4: -/* 007F4 809F10D4 1472FFD6 */ bne $v1, $s2, .L809F1030 -/* 007F8 809F10D8 24420004 */ addiu $v0, $v0, 0x0004 ## $v0 = 00000004 -/* 007FC 809F10DC 3C18809F */ lui $t8, %hi(func_809F1100) ## $t8 = 809F0000 -/* 00800 809F10E0 27181100 */ addiu $t8, $t8, %lo(func_809F1100) ## $t8 = 809F1100 -/* 00804 809F10E4 AE18014C */ sw $t8, 0x014C($s0) ## 0000014C -.L809F10E8: -/* 00808 809F10E8 8FBF002C */ lw $ra, 0x002C($sp) -.L809F10EC: -/* 0080C 809F10EC 8FB00020 */ lw $s0, 0x0020($sp) -/* 00810 809F10F0 8FB10024 */ lw $s1, 0x0024($sp) -/* 00814 809F10F4 8FB20028 */ lw $s2, 0x0028($sp) -/* 00818 809F10F8 03E00008 */ jr $ra -/* 0081C 809F10FC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F1100.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F1100.s deleted file mode 100644 index be4d383f1f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F1100.s +++ /dev/null @@ -1,167 +0,0 @@ -glabel func_809F1100 -/* 00820 809F1100 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 00824 809F1104 AFBF004C */ sw $ra, 0x004C($sp) -/* 00828 809F1108 AFB60048 */ sw $s6, 0x0048($sp) -/* 0082C 809F110C AFB50044 */ sw $s5, 0x0044($sp) -/* 00830 809F1110 AFB40040 */ sw $s4, 0x0040($sp) -/* 00834 809F1114 AFB3003C */ sw $s3, 0x003C($sp) -/* 00838 809F1118 AFB20038 */ sw $s2, 0x0038($sp) -/* 0083C 809F111C AFB10034 */ sw $s1, 0x0034($sp) -/* 00840 809F1120 AFB00030 */ sw $s0, 0x0030($sp) -/* 00844 809F1124 F7B80028 */ sdc1 $f24, 0x0028($sp) -/* 00848 809F1128 F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 0084C 809F112C F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 00850 809F1130 AFA5007C */ sw $a1, 0x007C($sp) -/* 00854 809F1134 848E0158 */ lh $t6, 0x0158($a0) ## 00000158 -/* 00858 809F1138 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 0085C 809F113C 51C00049 */ beql $t6, $zero, .L809F1264 -/* 00860 809F1140 8648015C */ lh $t0, 0x015C($s2) ## 0000015C -/* 00864 809F1144 848F015A */ lh $t7, 0x015A($a0) ## 0000015A -/* 00868 809F1148 8C9801D8 */ lw $t8, 0x01D8($a0) ## 000001D8 -/* 0086C 809F114C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00870 809F1150 24900004 */ addiu $s0, $a0, 0x0004 ## $s0 = 00000004 -/* 00874 809F1154 A70F0274 */ sh $t7, 0x0274($t8) ## 00000274 -/* 00878 809F1158 8C8801D8 */ lw $t0, 0x01D8($a0) ## 000001D8 -/* 0087C 809F115C 84990158 */ lh $t9, 0x0158($a0) ## 00000158 -/* 00880 809F1160 24140009 */ addiu $s4, $zero, 0x0009 ## $s4 = 00000009 -/* 00884 809F1164 A5190270 */ sh $t9, 0x0270($t0) ## 00000270 -/* 00888 809F1168 8C8901D8 */ lw $t1, 0x01D8($a0) ## 000001D8 -/* 0088C 809F116C A1200278 */ sb $zero, 0x0278($t1) ## 00000278 -.L809F1170: -/* 00890 809F1170 864A015A */ lh $t2, 0x015A($s2) ## 0000015A -/* 00894 809F1174 8E0B01D8 */ lw $t3, 0x01D8($s0) ## 000001DC -/* 00898 809F1178 24420004 */ addiu $v0, $v0, 0x0004 ## $v0 = 00000005 -/* 0089C 809F117C 26100010 */ addiu $s0, $s0, 0x0010 ## $s0 = 00000014 -/* 008A0 809F1180 A56A0274 */ sh $t2, 0x0274($t3) ## 00000274 -/* 008A4 809F1184 864C0158 */ lh $t4, 0x0158($s2) ## 00000158 -/* 008A8 809F1188 8E0D01C8 */ lw $t5, 0x01C8($s0) ## 000001DC -/* 008AC 809F118C A5AC0270 */ sh $t4, 0x0270($t5) ## 00000270 -/* 008B0 809F1190 8E0E01C8 */ lw $t6, 0x01C8($s0) ## 000001DC -/* 008B4 809F1194 A1C00278 */ sb $zero, 0x0278($t6) ## 00000278 -/* 008B8 809F1198 864F015A */ lh $t7, 0x015A($s2) ## 0000015A -/* 008BC 809F119C 8E1801CC */ lw $t8, 0x01CC($s0) ## 000001E0 -/* 008C0 809F11A0 A70F0274 */ sh $t7, 0x0274($t8) ## 00000274 -/* 008C4 809F11A4 86590158 */ lh $t9, 0x0158($s2) ## 00000158 -/* 008C8 809F11A8 8E0801CC */ lw $t0, 0x01CC($s0) ## 000001E0 -/* 008CC 809F11AC A5190270 */ sh $t9, 0x0270($t0) ## 00000270 -/* 008D0 809F11B0 8E0901CC */ lw $t1, 0x01CC($s0) ## 000001E0 -/* 008D4 809F11B4 A1200278 */ sb $zero, 0x0278($t1) ## 00000278 -/* 008D8 809F11B8 864A015A */ lh $t2, 0x015A($s2) ## 0000015A -/* 008DC 809F11BC 8E0B01D0 */ lw $t3, 0x01D0($s0) ## 000001E4 -/* 008E0 809F11C0 A56A0274 */ sh $t2, 0x0274($t3) ## 00000274 -/* 008E4 809F11C4 864C0158 */ lh $t4, 0x0158($s2) ## 00000158 -/* 008E8 809F11C8 8E0D01D0 */ lw $t5, 0x01D0($s0) ## 000001E4 -/* 008EC 809F11CC A5AC0270 */ sh $t4, 0x0270($t5) ## 00000270 -/* 008F0 809F11D0 8E0E01D0 */ lw $t6, 0x01D0($s0) ## 000001E4 -/* 008F4 809F11D4 A1C00278 */ sb $zero, 0x0278($t6) ## 00000278 -/* 008F8 809F11D8 8E1801D4 */ lw $t8, 0x01D4($s0) ## 000001E8 -/* 008FC 809F11DC 864F015A */ lh $t7, 0x015A($s2) ## 0000015A -/* 00900 809F11E0 A70F0274 */ sh $t7, 0x0274($t8) ## 00000274 -/* 00904 809F11E4 8E0801D4 */ lw $t0, 0x01D4($s0) ## 000001E8 -/* 00908 809F11E8 86590158 */ lh $t9, 0x0158($s2) ## 00000158 -/* 0090C 809F11EC A5190270 */ sh $t9, 0x0270($t0) ## 00000270 -/* 00910 809F11F0 8E0901D4 */ lw $t1, 0x01D4($s0) ## 000001E8 -/* 00914 809F11F4 1454FFDE */ bne $v0, $s4, .L809F1170 -/* 00918 809F11F8 A1200278 */ sb $zero, 0x0278($t1) ## 00000278 -/* 0091C 809F11FC 8E4301FC */ lw $v1, 0x01FC($s2) ## 000001FC -/* 00920 809F1200 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00924 809F1204 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 00928 809F1208 846A023E */ lh $t2, 0x023E($v1) ## 0000023E -/* 0092C 809F120C 55410004 */ bnel $t2, $at, .L809F1220 -/* 00930 809F1210 846C024A */ lh $t4, 0x024A($v1) ## 0000024A -/* 00934 809F1214 10000009 */ beq $zero, $zero, .L809F123C -/* 00938 809F1218 A46B024E */ sh $t3, 0x024E($v1) ## 0000024E -/* 0093C 809F121C 846C024A */ lh $t4, 0x024A($v1) ## 0000024A -.L809F1220: -/* 00940 809F1220 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 -/* 00944 809F1224 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 00948 809F1228 51800004 */ beql $t4, $zero, .L809F123C -/* 0094C 809F122C A46E023E */ sh $t6, 0x023E($v1) ## 0000023E -/* 00950 809F1230 10000002 */ beq $zero, $zero, .L809F123C -/* 00954 809F1234 A46D024E */ sh $t5, 0x024E($v1) ## 0000024E -/* 00958 809F1238 A46E023E */ sh $t6, 0x023E($v1) ## 0000023E -.L809F123C: -/* 0095C 809F123C 8E4F01FC */ lw $t7, 0x01FC($s2) ## 000001FC -/* 00960 809F1240 3C19809F */ lui $t9, %hi(func_809F1374) ## $t9 = 809F0000 -/* 00964 809F1244 27391374 */ addiu $t9, $t9, %lo(func_809F1374) ## $t9 = 809F1374 -/* 00968 809F1248 A5E00240 */ sh $zero, 0x0240($t7) ## 00000240 -/* 0096C 809F124C A640015A */ sh $zero, 0x015A($s2) ## 0000015A -/* 00970 809F1250 8658015A */ lh $t8, 0x015A($s2) ## 0000015A -/* 00974 809F1254 AE59014C */ sw $t9, 0x014C($s2) ## 0000014C -/* 00978 809F1258 10000039 */ beq $zero, $zero, .L809F1340 -/* 0097C 809F125C A6580158 */ sh $t8, 0x0158($s2) ## 00000158 -/* 00980 809F1260 8648015C */ lh $t0, 0x015C($s2) ## 0000015C -.L809F1264: -/* 00984 809F1264 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00988 809F1268 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0098C 809F126C 15010034 */ bne $t0, $at, .L809F1340 -/* 00990 809F1270 02408025 */ or $s0, $s2, $zero ## $s0 = 00000000 -/* 00994 809F1274 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00998 809F1278 4481C000 */ mtc1 $at, $f24 ## $f24 = 20.00 -/* 0099C 809F127C 2416000A */ addiu $s6, $zero, 0x000A ## $s6 = 0000000A -/* 009A0 809F1280 27B50064 */ addiu $s5, $sp, 0x0064 ## $s5 = FFFFFFEC -/* 009A4 809F1284 24140009 */ addiu $s4, $zero, 0x0009 ## $s4 = 00000009 -.L809F1288: -/* 009A8 809F1288 8E4301FC */ lw $v1, 0x01FC($s2) ## 000001FC -/* 009AC 809F128C 24530001 */ addiu $s3, $v0, 0x0001 ## $s3 = 00000001 -/* 009B0 809F1290 304B0001 */ andi $t3, $v0, 0x0001 ## $t3 = 00000000 -/* 009B4 809F1294 8C6A0024 */ lw $t2, 0x0024($v1) ## 00000024 -/* 009B8 809F1298 847100B6 */ lh $s1, 0x00B6($v1) ## 000000B6 -/* 009BC 809F129C 44932000 */ mtc1 $s3, $f4 ## $f4 = 0.00 -/* 009C0 809F12A0 AEAA0000 */ sw $t2, 0x0000($s5) ## FFFFFFEC -/* 009C4 809F12A4 8C690028 */ lw $t1, 0x0028($v1) ## 00000028 -/* 009C8 809F12A8 00118823 */ subu $s1, $zero, $s1 -/* 009CC 809F12AC 00118C00 */ sll $s1, $s1, 16 -/* 009D0 809F12B0 AEA90004 */ sw $t1, 0x0004($s5) ## FFFFFFF0 -/* 009D4 809F12B4 8C6A002C */ lw $t2, 0x002C($v1) ## 0000002C -/* 009D8 809F12B8 00118C03 */ sra $s1, $s1, 16 -/* 009DC 809F12BC 15600004 */ bne $t3, $zero, .L809F12D0 -/* 009E0 809F12C0 AEAA0008 */ sw $t2, 0x0008($s5) ## FFFFFFF4 -/* 009E4 809F12C4 2631A628 */ addiu $s1, $s1, 0xA628 ## $s1 = FFFFA628 -/* 009E8 809F12C8 00118C00 */ sll $s1, $s1, 16 -/* 009EC 809F12CC 00118C03 */ sra $s1, $s1, 16 -.L809F12D0: -/* 009F0 809F12D0 468021A0 */ cvt.s.w $f6, $f4 -/* 009F4 809F12D4 8E0C01D8 */ lw $t4, 0x01D8($s0) ## 000001D8 -/* 009F8 809F12D8 00112400 */ sll $a0, $s1, 16 -/* 009FC 809F12DC 00042403 */ sra $a0, $a0, 16 -/* 00A00 809F12E0 A596025A */ sh $s6, 0x025A($t4) ## 0000025A -/* 00A04 809F12E4 46183202 */ mul.s $f8, $f6, $f24 -/* 00A08 809F12E8 46184500 */ add.s $f20, $f8, $f24 -/* 00A0C 809F12EC 0C01DE1C */ jal Math_SinS - ## sins? -/* 00A10 809F12F0 4600A586 */ mov.s $f22, $f20 -/* 00A14 809F12F4 46140282 */ mul.s $f10, $f0, $f20 -/* 00A18 809F12F8 C7B00064 */ lwc1 $f16, 0x0064($sp) -/* 00A1C 809F12FC 8E0D01D8 */ lw $t5, 0x01D8($s0) ## 000001D8 -/* 00A20 809F1300 00112400 */ sll $a0, $s1, 16 -/* 00A24 809F1304 00042403 */ sra $a0, $a0, 16 -/* 00A28 809F1308 46105480 */ add.s $f18, $f10, $f16 -/* 00A2C 809F130C E5B20288 */ swc1 $f18, 0x0288($t5) ## 00000288 -/* 00A30 809F1310 8E0E01D8 */ lw $t6, 0x01D8($s0) ## 000001D8 -/* 00A34 809F1314 C7A40068 */ lwc1 $f4, 0x0068($sp) -/* 00A38 809F1318 0C01DE0D */ jal Math_CosS - ## coss? -/* 00A3C 809F131C E5C4028C */ swc1 $f4, 0x028C($t6) ## 0000028C -/* 00A40 809F1320 46160182 */ mul.s $f6, $f0, $f22 -/* 00A44 809F1324 C7A8006C */ lwc1 $f8, 0x006C($sp) -/* 00A48 809F1328 8E0F01D8 */ lw $t7, 0x01D8($s0) ## 000001D8 -/* 00A4C 809F132C 02601025 */ or $v0, $s3, $zero ## $v0 = 00000001 -/* 00A50 809F1330 26100004 */ addiu $s0, $s0, 0x0004 ## $s0 = 00000004 -/* 00A54 809F1334 46083280 */ add.s $f10, $f6, $f8 -/* 00A58 809F1338 1674FFD3 */ bne $s3, $s4, .L809F1288 -/* 00A5C 809F133C E5EA0290 */ swc1 $f10, 0x0290($t7) ## 00000290 -.L809F1340: -/* 00A60 809F1340 8FBF004C */ lw $ra, 0x004C($sp) -/* 00A64 809F1344 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 00A68 809F1348 D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 00A6C 809F134C D7B80028 */ ldc1 $f24, 0x0028($sp) -/* 00A70 809F1350 8FB00030 */ lw $s0, 0x0030($sp) -/* 00A74 809F1354 8FB10034 */ lw $s1, 0x0034($sp) -/* 00A78 809F1358 8FB20038 */ lw $s2, 0x0038($sp) -/* 00A7C 809F135C 8FB3003C */ lw $s3, 0x003C($sp) -/* 00A80 809F1360 8FB40040 */ lw $s4, 0x0040($sp) -/* 00A84 809F1364 8FB50044 */ lw $s5, 0x0044($sp) -/* 00A88 809F1368 8FB60048 */ lw $s6, 0x0048($sp) -/* 00A8C 809F136C 03E00008 */ jr $ra -/* 00A90 809F1370 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F1374.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F1374.s deleted file mode 100644 index c87c9d66ee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F1374.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel func_809F1374 -/* 00A94 809F1374 AFA50004 */ sw $a1, 0x0004($sp) -/* 00A98 809F1378 848E0158 */ lh $t6, 0x0158($a0) ## 00000158 -/* 00A9C 809F137C 11C00032 */ beq $t6, $zero, .L809F1448 -/* 00AA0 809F1380 00000000 */ nop -/* 00AA4 809F1384 848F015A */ lh $t7, 0x015A($a0) ## 0000015A -/* 00AA8 809F1388 8C9801D8 */ lw $t8, 0x01D8($a0) ## 000001D8 -/* 00AAC 809F138C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00AB0 809F1390 24830004 */ addiu $v1, $a0, 0x0004 ## $v1 = 00000004 -/* 00AB4 809F1394 A70F0274 */ sh $t7, 0x0274($t8) ## 00000274 -/* 00AB8 809F1398 8C8801D8 */ lw $t0, 0x01D8($a0) ## 000001D8 -/* 00ABC 809F139C 84990158 */ lh $t9, 0x0158($a0) ## 00000158 -/* 00AC0 809F13A0 24050009 */ addiu $a1, $zero, 0x0009 ## $a1 = 00000009 -/* 00AC4 809F13A4 A5190270 */ sh $t9, 0x0270($t0) ## 00000270 -/* 00AC8 809F13A8 8C8901D8 */ lw $t1, 0x01D8($a0) ## 000001D8 -/* 00ACC 809F13AC A1200278 */ sb $zero, 0x0278($t1) ## 00000278 -.L809F13B0: -/* 00AD0 809F13B0 848A015A */ lh $t2, 0x015A($a0) ## 0000015A -/* 00AD4 809F13B4 8C6B01D8 */ lw $t3, 0x01D8($v1) ## 000001DC -/* 00AD8 809F13B8 24420004 */ addiu $v0, $v0, 0x0004 ## $v0 = 00000005 -/* 00ADC 809F13BC 24630010 */ addiu $v1, $v1, 0x0010 ## $v1 = 00000014 -/* 00AE0 809F13C0 A56A0274 */ sh $t2, 0x0274($t3) ## 00000274 -/* 00AE4 809F13C4 848C0158 */ lh $t4, 0x0158($a0) ## 00000158 -/* 00AE8 809F13C8 8C6D01C8 */ lw $t5, 0x01C8($v1) ## 000001DC -/* 00AEC 809F13CC A5AC0270 */ sh $t4, 0x0270($t5) ## 00000270 -/* 00AF0 809F13D0 8C6E01C8 */ lw $t6, 0x01C8($v1) ## 000001DC -/* 00AF4 809F13D4 A1C00278 */ sb $zero, 0x0278($t6) ## 00000278 -/* 00AF8 809F13D8 848F015A */ lh $t7, 0x015A($a0) ## 0000015A -/* 00AFC 809F13DC 8C7801CC */ lw $t8, 0x01CC($v1) ## 000001E0 -/* 00B00 809F13E0 A70F0274 */ sh $t7, 0x0274($t8) ## 00000274 -/* 00B04 809F13E4 84990158 */ lh $t9, 0x0158($a0) ## 00000158 -/* 00B08 809F13E8 8C6801CC */ lw $t0, 0x01CC($v1) ## 000001E0 -/* 00B0C 809F13EC A5190270 */ sh $t9, 0x0270($t0) ## 00000270 -/* 00B10 809F13F0 8C6901CC */ lw $t1, 0x01CC($v1) ## 000001E0 -/* 00B14 809F13F4 A1200278 */ sb $zero, 0x0278($t1) ## 00000278 -/* 00B18 809F13F8 848A015A */ lh $t2, 0x015A($a0) ## 0000015A -/* 00B1C 809F13FC 8C6B01D0 */ lw $t3, 0x01D0($v1) ## 000001E4 -/* 00B20 809F1400 A56A0274 */ sh $t2, 0x0274($t3) ## 00000274 -/* 00B24 809F1404 848C0158 */ lh $t4, 0x0158($a0) ## 00000158 -/* 00B28 809F1408 8C6D01D0 */ lw $t5, 0x01D0($v1) ## 000001E4 -/* 00B2C 809F140C A5AC0270 */ sh $t4, 0x0270($t5) ## 00000270 -/* 00B30 809F1410 8C6E01D0 */ lw $t6, 0x01D0($v1) ## 000001E4 -/* 00B34 809F1414 A1C00278 */ sb $zero, 0x0278($t6) ## 00000278 -/* 00B38 809F1418 8C7801D4 */ lw $t8, 0x01D4($v1) ## 000001E8 -/* 00B3C 809F141C 848F015A */ lh $t7, 0x015A($a0) ## 0000015A -/* 00B40 809F1420 A70F0274 */ sh $t7, 0x0274($t8) ## 00000274 -/* 00B44 809F1424 8C6801D4 */ lw $t0, 0x01D4($v1) ## 000001E8 -/* 00B48 809F1428 84990158 */ lh $t9, 0x0158($a0) ## 00000158 -/* 00B4C 809F142C A5190270 */ sh $t9, 0x0270($t0) ## 00000270 -/* 00B50 809F1430 8C6901D4 */ lw $t1, 0x01D4($v1) ## 000001E8 -/* 00B54 809F1434 1445FFDE */ bne $v0, $a1, .L809F13B0 -/* 00B58 809F1438 A1200278 */ sb $zero, 0x0278($t1) ## 00000278 -/* 00B5C 809F143C A480015A */ sh $zero, 0x015A($a0) ## 0000015A -/* 00B60 809F1440 848A015A */ lh $t2, 0x015A($a0) ## 0000015A -/* 00B64 809F1444 A48A0158 */ sh $t2, 0x0158($a0) ## 00000158 -.L809F1448: -/* 00B68 809F1448 03E00008 */ jr $ra -/* 00B6C 809F144C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Destroy.s deleted file mode 100644 index ad997e236c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Destroy.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel EnDntJiji_Destroy -/* 000FC 809F1BDC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00100 809F1BE0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00104 809F1BE4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00108 809F1BE8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0010C 809F1BEC 0C0170EB */ jal Collider_DestroyCylinder - -/* 00110 809F1BF0 24C5025C */ addiu $a1, $a2, 0x025C ## $a1 = 0000025C -/* 00114 809F1BF4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00118 809F1BF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0011C 809F1BFC 03E00008 */ jr $ra -/* 00120 809F1C00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Draw.s deleted file mode 100644 index 9a883295a1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Draw.s +++ /dev/null @@ -1,115 +0,0 @@ -.rdata -glabel D_809F30B8 - .asciz "../z_en_dnt_jiji.c" - .balign 4 - -glabel D_809F30CC - .asciz "../z_en_dnt_jiji.c" - .balign 4 - -glabel D_809F30E0 - .asciz "../z_en_dnt_jiji.c" - .balign 4 - -.late_rodata -glabel D_809F30F8 - .float 0.01 -.text -glabel EnDntJiji_Draw -/* 01320 809F2E00 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 01324 809F2E04 AFB20028 */ sw $s2, 0x0028($sp) -/* 01328 809F2E08 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 0132C 809F2E0C AFBF002C */ sw $ra, 0x002C($sp) -/* 01330 809F2E10 AFB10024 */ sw $s1, 0x0024($sp) -/* 01334 809F2E14 AFB00020 */ sw $s0, 0x0020($sp) -/* 01338 809F2E18 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 0133C 809F2E1C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01340 809F2E20 3C06809F */ lui $a2, %hi(D_809F30B8) ## $a2 = 809F0000 -/* 01344 809F2E24 24C630B8 */ addiu $a2, $a2, %lo(D_809F30B8) ## $a2 = 809F30B8 -/* 01348 809F2E28 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 -/* 0134C 809F2E2C 240703FB */ addiu $a3, $zero, 0x03FB ## $a3 = 000003FB -/* 01350 809F2E30 0C031AB1 */ jal Graph_OpenDisps -/* 01354 809F2E34 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01358 809F2E38 0C024F46 */ jal func_80093D18 -/* 0135C 809F2E3C 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 01360 809F2E40 0C034213 */ jal Matrix_Push -/* 01364 809F2E44 00000000 */ nop -/* 01368 809F2E48 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 0136C 809F2E4C 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 01370 809F2E50 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 01374 809F2E54 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 01378 809F2E58 AE2E02C0 */ sw $t6, 0x02C0($s1) ## 000002C0 -/* 0137C 809F2E5C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 01380 809F2E60 8618024C */ lh $t8, 0x024C($s0) ## 0000024C -/* 01384 809F2E64 3C04809F */ lui $a0, %hi(D_809F2FCC) ## $a0 = 809F0000 -/* 01388 809F2E68 3C0C8016 */ lui $t4, %hi(gSegments) -/* 0138C 809F2E6C 0018C880 */ sll $t9, $t8, 2 -/* 01390 809F2E70 00992021 */ addu $a0, $a0, $t9 -/* 01394 809F2E74 8C842FCC */ lw $a0, %lo(D_809F2FCC)($a0) -/* 01398 809F2E78 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0139C 809F2E7C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 013A0 809F2E80 00044900 */ sll $t1, $a0, 4 -/* 013A4 809F2E84 00095702 */ srl $t2, $t1, 28 -/* 013A8 809F2E88 000A5880 */ sll $t3, $t2, 2 -/* 013AC 809F2E8C 018B6021 */ addu $t4, $t4, $t3 -/* 013B0 809F2E90 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) -/* 013B4 809F2E94 00814024 */ and $t0, $a0, $at -/* 013B8 809F2E98 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 013BC 809F2E9C 010C6821 */ addu $t5, $t0, $t4 -/* 013C0 809F2EA0 01A17021 */ addu $t6, $t5, $at -/* 013C4 809F2EA4 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 013C8 809F2EA8 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 013CC 809F2EAC 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 013D0 809F2EB0 AFB00014 */ sw $s0, 0x0014($sp) -/* 013D4 809F2EB4 AFA00010 */ sw $zero, 0x0010($sp) -/* 013D8 809F2EB8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 013DC 809F2EBC 0C028572 */ jal SkelAnime_DrawOpa - -/* 013E0 809F2EC0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 013E4 809F2EC4 0C034221 */ jal Matrix_Pull -/* 013E8 809F2EC8 00000000 */ nop -/* 013EC 809F2ECC C60C0230 */ lwc1 $f12, 0x0230($s0) ## 00000230 -/* 013F0 809F2ED0 C60E0234 */ lwc1 $f14, 0x0234($s0) ## 00000234 -/* 013F4 809F2ED4 8E060238 */ lw $a2, 0x0238($s0) ## 00000238 -/* 013F8 809F2ED8 0C034261 */ jal Matrix_Translate -/* 013FC 809F2EDC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01400 809F2EE0 3C01809F */ lui $at, %hi(D_809F30F8) ## $at = 809F0000 -/* 01404 809F2EE4 C42C30F8 */ lwc1 $f12, %lo(D_809F30F8)($at) -/* 01408 809F2EE8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0140C 809F2EEC 44066000 */ mfc1 $a2, $f12 -/* 01410 809F2EF0 0C0342A3 */ jal Matrix_Scale -/* 01414 809F2EF4 46006386 */ mov.s $f14, $f12 -/* 01418 809F2EF8 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 0141C 809F2EFC 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 -/* 01420 809F2F00 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 -/* 01424 809F2F04 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 01428 809F2F08 AE2F02C0 */ sw $t7, 0x02C0($s1) ## 000002C0 -/* 0142C 809F2F0C 3C05809F */ lui $a1, %hi(D_809F30CC) ## $a1 = 809F0000 -/* 01430 809F2F10 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 01434 809F2F14 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 01438 809F2F18 24A530CC */ addiu $a1, $a1, %lo(D_809F30CC) ## $a1 = 809F30CC -/* 0143C 809F2F1C 24060410 */ addiu $a2, $zero, 0x0410 ## $a2 = 00000410 -/* 01440 809F2F20 0C0346A2 */ jal Matrix_NewMtx -/* 01444 809F2F24 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 01448 809F2F28 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 0144C 809F2F2C 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 01450 809F2F30 3C0A0600 */ lui $t2, %hi(D_06002310) ## $t2 = 06000000 -/* 01454 809F2F34 254A2310 */ addiu $t2, $t2, %lo(D_06002310) ## $t2 = 06002310 -/* 01458 809F2F38 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 0145C 809F2F3C AE3902C0 */ sw $t9, 0x02C0($s1) ## 000002C0 -/* 01460 809F2F40 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 -/* 01464 809F2F44 3C06809F */ lui $a2, %hi(D_809F30E0) ## $a2 = 809F0000 -/* 01468 809F2F48 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 0146C 809F2F4C AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 01470 809F2F50 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 01474 809F2F54 24C630E0 */ addiu $a2, $a2, %lo(D_809F30E0) ## $a2 = 809F30E0 -/* 01478 809F2F58 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 -/* 0147C 809F2F5C 0C031AD5 */ jal Graph_CloseDisps -/* 01480 809F2F60 24070413 */ addiu $a3, $zero, 0x0413 ## $a3 = 00000413 -/* 01484 809F2F64 8FBF002C */ lw $ra, 0x002C($sp) -/* 01488 809F2F68 8FB00020 */ lw $s0, 0x0020($sp) -/* 0148C 809F2F6C 8FB10024 */ lw $s1, 0x0024($sp) -/* 01490 809F2F70 8FB20028 */ lw $s2, 0x0028($sp) -/* 01494 809F2F74 03E00008 */ jr $ra -/* 01498 809F2F78 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 0149C 809F2F7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Init.s deleted file mode 100644 index 103d6b1225..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Init.s +++ /dev/null @@ -1,80 +0,0 @@ -.rdata -glabel D_809F2FE0 - .asciz "\n\n" - .balign 4 - -glabel D_809F2FE4 - .asciz "\x1b[33m☆☆☆☆☆ デグナッツお面品評会長老 ☆☆☆☆☆ %x\n\x1b[m" - .balign 4 - -.text -glabel EnDntJiji_Init -/* 00000 809F1AE0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00004 809F1AE4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00008 809F1AE8 AFB00028 */ sw $s0, 0x0028($sp) -/* 0000C 809F1AEC AFA5003C */ sw $a1, 0x003C($sp) -/* 00010 809F1AF0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00014 809F1AF4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00018 809F1AF8 3C068003 */ lui $a2, %hi(ActorShadow_DrawCircle) -/* 0001C 809F1AFC 44050000 */ mfc1 $a1, $f0 -/* 00020 809F1B00 44070000 */ mfc1 $a3, $f0 -/* 00024 809F1B04 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawCircle) -/* 00028 809F1B08 0C00AC78 */ jal ActorShape_Init - -/* 0002C 809F1B0C 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 00030 809F1B10 3C060600 */ lui $a2, %hi(D_060033E0) ## $a2 = 06000000 -/* 00034 809F1B14 3C070600 */ lui $a3, %hi(D_06000560) ## $a3 = 06000000 -/* 00038 809F1B18 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 -/* 0003C 809F1B1C 260F01DE */ addiu $t7, $s0, 0x01DE ## $t7 = 000001DE -/* 00040 809F1B20 2418000D */ addiu $t8, $zero, 0x000D ## $t8 = 0000000D -/* 00044 809F1B24 AFB80018 */ sw $t8, 0x0018($sp) -/* 00048 809F1B28 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0004C 809F1B2C AFAE0010 */ sw $t6, 0x0010($sp) -/* 00050 809F1B30 24E70560 */ addiu $a3, $a3, %lo(D_06000560) ## $a3 = 06000560 -/* 00054 809F1B34 24C633E0 */ addiu $a2, $a2, %lo(D_060033E0) ## $a2 = 060033E0 -/* 00058 809F1B38 8FA4003C */ lw $a0, 0x003C($sp) -/* 0005C 809F1B3C 0C02915F */ jal SkelAnime_Init - -/* 00060 809F1B40 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00064 809F1B44 2605025C */ addiu $a1, $s0, 0x025C ## $a1 = 0000025C -/* 00068 809F1B48 AFA50030 */ sw $a1, 0x0030($sp) -/* 0006C 809F1B4C 0C0170D9 */ jal Collider_InitCylinder - -/* 00070 809F1B50 8FA4003C */ lw $a0, 0x003C($sp) -/* 00074 809F1B54 3C07809F */ lui $a3, %hi(D_809F2FA0) ## $a3 = 809F0000 -/* 00078 809F1B58 8FA50030 */ lw $a1, 0x0030($sp) -/* 0007C 809F1B5C 24E72FA0 */ addiu $a3, $a3, %lo(D_809F2FA0) ## $a3 = 809F2FA0 -/* 00080 809F1B60 8FA4003C */ lw $a0, 0x003C($sp) -/* 00084 809F1B64 0C01712B */ jal Collider_SetCylinder - -/* 00088 809F1B68 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0008C 809F1B6C 8E190118 */ lw $t9, 0x0118($s0) ## 00000118 -/* 00090 809F1B70 3C04809F */ lui $a0, %hi(D_809F2FE0) ## $a0 = 809F0000 -/* 00094 809F1B74 24842FE0 */ addiu $a0, $a0, %lo(D_809F2FE0) ## $a0 = 809F2FE0 -/* 00098 809F1B78 0C00084C */ jal osSyncPrintf - -/* 0009C 809F1B7C AE190258 */ sw $t9, 0x0258($s0) ## 00000258 -/* 000A0 809F1B80 3C04809F */ lui $a0, %hi(D_809F2FE4) ## $a0 = 809F0000 -/* 000A4 809F1B84 24842FE4 */ addiu $a0, $a0, %lo(D_809F2FE4) ## $a0 = 809F2FE4 -/* 000A8 809F1B88 0C00084C */ jal osSyncPrintf - -/* 000AC 809F1B8C 8E050258 */ lw $a1, 0x0258($s0) ## 00000258 -/* 000B0 809F1B90 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 -/* 000B4 809F1B94 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 000B8 809F1B98 3C0C809F */ lui $t4, %hi(func_809F1C04) ## $t4 = 809F0000 -/* 000BC 809F1B9C 01014824 */ and $t1, $t0, $at -/* 000C0 809F1BA0 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 -/* 000C4 809F1BA4 44812000 */ mtc1 $at, $f4 ## $f4 = -2.00 -/* 000C8 809F1BA8 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 000CC 809F1BAC 240B0006 */ addiu $t3, $zero, 0x0006 ## $t3 = 00000006 -/* 000D0 809F1BB0 258C1C04 */ addiu $t4, $t4, %lo(func_809F1C04) ## $t4 = 809F1C04 -/* 000D4 809F1BB4 AE090004 */ sw $t1, 0x0004($s0) ## 00000004 -/* 000D8 809F1BB8 A20A00AE */ sb $t2, 0x00AE($s0) ## 000000AE -/* 000DC 809F1BBC A20B001F */ sb $t3, 0x001F($s0) ## 0000001F -/* 000E0 809F1BC0 AE0C022C */ sw $t4, 0x022C($s0) ## 0000022C -/* 000E4 809F1BC4 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 000E8 809F1BC8 8FBF002C */ lw $ra, 0x002C($sp) -/* 000EC 809F1BCC 8FB00028 */ lw $s0, 0x0028($sp) -/* 000F0 809F1BD0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 000F4 809F1BD4 03E00008 */ jr $ra -/* 000F8 809F1BD8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Update.s deleted file mode 100644 index 317d63dffa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Update.s +++ /dev/null @@ -1,155 +0,0 @@ -.rdata -glabel D_809F3090 - .asciz "\x1b[33m☆☆☆☆☆ 時間 ☆☆☆☆☆ %d\n\x1b[m" - .balign 4 - -.text -glabel EnDntJiji_Update -/* 01128 809F2C08 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0112C 809F2C0C AFA5003C */ sw $a1, 0x003C($sp) -/* 01130 809F2C10 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01134 809F2C14 AFB00020 */ sw $s0, 0x0020($sp) -/* 01138 809F2C18 3C053C75 */ lui $a1, 0x3C75 ## $a1 = 3C750000 -/* 0113C 809F2C1C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01140 809F2C20 0C00B58B */ jal Actor_SetScale - -/* 01144 809F2C24 34A5C28F */ ori $a1, $a1, 0xC28F ## $a1 = 3C75C28F -/* 01148 809F2C28 860E0246 */ lh $t6, 0x0246($s0) ## 00000246 -/* 0114C 809F2C2C 3C188016 */ lui $t8, %hi(gGameInfo) -/* 01150 809F2C30 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 01154 809F2C34 A60F0246 */ sh $t7, 0x0246($s0) ## 00000246 -/* 01158 809F2C38 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) -/* 0115C 809F2C3C 871912D4 */ lh $t9, 0x12D4($t8) ## 801612D4 -/* 01160 809F2C40 13200004 */ beq $t9, $zero, .L809F2C54 -/* 01164 809F2C44 3C04809F */ lui $a0, %hi(D_809F3090) ## $a0 = 809F0000 -/* 01168 809F2C48 24843090 */ addiu $a0, $a0, %lo(D_809F3090) ## $a0 = 809F3090 -/* 0116C 809F2C4C 0C00084C */ jal osSyncPrintf - -/* 01170 809F2C50 86050240 */ lh $a1, 0x0240($s0) ## 00000240 -.L809F2C54: -/* 01174 809F2C54 86020240 */ lh $v0, 0x0240($s0) ## 00000240 -/* 01178 809F2C58 28410002 */ slti $at, $v0, 0x0002 -/* 0117C 809F2C5C 54200005 */ bnel $at, $zero, .L809F2C74 -/* 01180 809F2C60 86020242 */ lh $v0, 0x0242($s0) ## 00000242 -/* 01184 809F2C64 10400002 */ beq $v0, $zero, .L809F2C70 -/* 01188 809F2C68 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF -/* 0118C 809F2C6C A6080240 */ sh $t0, 0x0240($s0) ## 00000240 -.L809F2C70: -/* 01190 809F2C70 86020242 */ lh $v0, 0x0242($s0) ## 00000242 -.L809F2C74: -/* 01194 809F2C74 10400002 */ beq $v0, $zero, .L809F2C80 -/* 01198 809F2C78 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = FFFFFFFF -/* 0119C 809F2C7C A6090242 */ sh $t1, 0x0242($s0) ## 00000242 -.L809F2C80: -/* 011A0 809F2C80 86020244 */ lh $v0, 0x0244($s0) ## 00000244 -/* 011A4 809F2C84 10400002 */ beq $v0, $zero, .L809F2C90 -/* 011A8 809F2C88 244AFFFF */ addiu $t2, $v0, 0xFFFF ## $t2 = FFFFFFFF -/* 011AC 809F2C8C A60A0244 */ sh $t2, 0x0244($s0) ## 00000244 -.L809F2C90: -/* 011B0 809F2C90 8602024E */ lh $v0, 0x024E($s0) ## 0000024E -/* 011B4 809F2C94 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 011B8 809F2C98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011BC 809F2C9C 50400019 */ beql $v0, $zero, .L809F2D04 -/* 011C0 809F2CA0 960F010E */ lhu $t7, 0x010E($s0) ## 0000010E -/* 011C4 809F2CA4 10430009 */ beq $v0, $v1, .L809F2CCC -/* 011C8 809F2CA8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 011CC 809F2CAC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 011D0 809F2CB0 1041000C */ beq $v0, $at, .L809F2CE4 -/* 011D4 809F2CB4 3C0D809F */ lui $t5, %hi(func_809F2254) ## $t5 = 809F0000 -/* 011D8 809F2CB8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 011DC 809F2CBC 1041000E */ beq $v0, $at, .L809F2CF8 -/* 011E0 809F2CC0 3C0E809F */ lui $t6, %hi(func_809F29E0) ## $t6 = 809F0000 -/* 011E4 809F2CC4 1000000F */ beq $zero, $zero, .L809F2D04 -/* 011E8 809F2CC8 960F010E */ lhu $t7, 0x010E($s0) ## 0000010E -.L809F2CCC: -/* 011EC 809F2CCC 3C0C809F */ lui $t4, %hi(func_809F1DA8) ## $t4 = 809F0000 -/* 011F0 809F2CD0 258C1DA8 */ addiu $t4, $t4, %lo(func_809F1DA8) ## $t4 = 809F1DA8 -/* 011F4 809F2CD4 A20B023C */ sb $t3, 0x023C($s0) ## 0000023C -/* 011F8 809F2CD8 A603023E */ sh $v1, 0x023E($s0) ## 0000023E -/* 011FC 809F2CDC 10000008 */ beq $zero, $zero, .L809F2D00 -/* 01200 809F2CE0 AE0C022C */ sw $t4, 0x022C($s0) ## 0000022C -.L809F2CE4: -/* 01204 809F2CE4 25AD2254 */ addiu $t5, $t5, %lo(func_809F2254) ## $t5 = 809F2254 -/* 01208 809F2CE8 A200023C */ sb $zero, 0x023C($s0) ## 0000023C -/* 0120C 809F2CEC A600023E */ sh $zero, 0x023E($s0) ## 0000023E -/* 01210 809F2CF0 10000003 */ beq $zero, $zero, .L809F2D00 -/* 01214 809F2CF4 AE0D022C */ sw $t5, 0x022C($s0) ## 0000022C -.L809F2CF8: -/* 01218 809F2CF8 25CE29E0 */ addiu $t6, $t6, %lo(func_809F29E0) ## $t6 = 809F29E0 -/* 0121C 809F2CFC AE0E022C */ sw $t6, 0x022C($s0) ## 0000022C -.L809F2D00: -/* 01220 809F2D00 960F010E */ lhu $t7, 0x010E($s0) ## 0000010E -.L809F2D04: -/* 01224 809F2D04 51E00004 */ beql $t7, $zero, .L809F2D18 -/* 01228 809F2D08 8618024E */ lh $t8, 0x024E($s0) ## 0000024E -/* 0122C 809F2D0C 0C00B56E */ jal Actor_SetFocus - -/* 01230 809F2D10 3C0541F0 */ lui $a1, 0x41F0 ## $a1 = 41F00000 -/* 01234 809F2D14 8618024E */ lh $t8, 0x024E($s0) ## 0000024E -.L809F2D18: -/* 01238 809F2D18 53000003 */ beql $t8, $zero, .L809F2D28 -/* 0123C 809F2D1C 86190244 */ lh $t9, 0x0244($s0) ## 00000244 -/* 01240 809F2D20 A600024E */ sh $zero, 0x024E($s0) ## 0000024E -/* 01244 809F2D24 86190244 */ lh $t9, 0x0244($s0) ## 00000244 -.L809F2D28: -/* 01248 809F2D28 57200011 */ bnel $t9, $zero, .L809F2D70 -/* 0124C 809F2D2C 8E19022C */ lw $t9, 0x022C($s0) ## 0000022C -/* 01250 809F2D30 8608024C */ lh $t0, 0x024C($s0) ## 0000024C -/* 01254 809F2D34 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 01258 809F2D38 A609024C */ sh $t1, 0x024C($s0) ## 0000024C -/* 0125C 809F2D3C 860A024C */ lh $t2, 0x024C($s0) ## 0000024C -/* 01260 809F2D40 29410003 */ slti $at, $t2, 0x0003 -/* 01264 809F2D44 14200009 */ bne $at, $zero, .L809F2D6C -/* 01268 809F2D48 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 0126C 809F2D4C 44816000 */ mtc1 $at, $f12 ## $f12 = 60.00 -/* 01270 809F2D50 0C00CFBE */ jal Rand_ZeroFloat - -/* 01274 809F2D54 A600024C */ sh $zero, 0x024C($s0) ## 0000024C -/* 01278 809F2D58 4600010D */ trunc.w.s $f4, $f0 -/* 0127C 809F2D5C 440E2000 */ mfc1 $t6, $f4 -/* 01280 809F2D60 00000000 */ nop -/* 01284 809F2D64 25CF0014 */ addiu $t7, $t6, 0x0014 ## $t7 = 00000014 -/* 01288 809F2D68 A60F0244 */ sh $t7, 0x0244($s0) ## 00000244 -.L809F2D6C: -/* 0128C 809F2D6C 8E19022C */ lw $t9, 0x022C($s0) ## 0000022C -.L809F2D70: -/* 01290 809F2D70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01294 809F2D74 8FA5003C */ lw $a1, 0x003C($sp) -/* 01298 809F2D78 0320F809 */ jalr $ra, $t9 -/* 0129C 809F2D7C 00000000 */ nop -/* 012A0 809F2D80 0C00B638 */ jal Actor_MoveForward - -/* 012A4 809F2D84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012A8 809F2D88 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 012AC 809F2D8C 44810000 */ mtc1 $at, $f0 ## $f0 = 20.00 -/* 012B0 809F2D90 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 012B4 809F2D94 44813000 */ mtc1 $at, $f6 ## $f6 = 60.00 -/* 012B8 809F2D98 2418001D */ addiu $t8, $zero, 0x001D ## $t8 = 0000001D -/* 012BC 809F2D9C 44060000 */ mfc1 $a2, $f0 -/* 012C0 809F2DA0 44070000 */ mfc1 $a3, $f0 -/* 012C4 809F2DA4 AFB80014 */ sw $t8, 0x0014($sp) -/* 012C8 809F2DA8 8FA4003C */ lw $a0, 0x003C($sp) -/* 012CC 809F2DAC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 012D0 809F2DB0 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 012D4 809F2DB4 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 012D8 809F2DB8 2606025C */ addiu $a2, $s0, 0x025C ## $a2 = 0000025C -/* 012DC 809F2DBC 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000025C -/* 012E0 809F2DC0 AFA60028 */ sw $a2, 0x0028($sp) -/* 012E4 809F2DC4 0C0189B7 */ jal Collider_UpdateCylinder - -/* 012E8 809F2DC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012EC 809F2DCC 9208023C */ lbu $t0, 0x023C($s0) ## 0000023C -/* 012F0 809F2DD0 8FA60028 */ lw $a2, 0x0028($sp) -/* 012F4 809F2DD4 8FA4003C */ lw $a0, 0x003C($sp) -/* 012F8 809F2DD8 11000004 */ beq $t0, $zero, .L809F2DEC -/* 012FC 809F2DDC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01300 809F2DE0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 01304 809F2DE4 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 01308 809F2DE8 00812821 */ addu $a1, $a0, $at -.L809F2DEC: -/* 0130C 809F2DEC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01310 809F2DF0 8FB00020 */ lw $s0, 0x0020($sp) -/* 01314 809F2DF4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01318 809F2DF8 03E00008 */ jr $ra -/* 0131C 809F2DFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1C04.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1C04.s deleted file mode 100644 index b769b92f83..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1C04.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_809F1C04 -/* 00124 809F1C04 AFA50004 */ sw $a1, 0x0004($sp) -/* 00128 809F1C08 948E0088 */ lhu $t6, 0x0088($a0) ## 00000088 -/* 0012C 809F1C0C 3C08809F */ lui $t0, %hi(func_809F1C44) ## $t0 = 809F0000 -/* 00130 809F1C10 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 00134 809F1C14 11E00009 */ beq $t7, $zero, .L809F1C3C -/* 00138 809F1C18 00000000 */ nop -/* 0013C 809F1C1C 8C990024 */ lw $t9, 0x0024($a0) ## 00000024 -/* 00140 809F1C20 8C980028 */ lw $t8, 0x0028($a0) ## 00000028 -/* 00144 809F1C24 25081C44 */ addiu $t0, $t0, %lo(func_809F1C44) ## $t0 = 809F1C44 -/* 00148 809F1C28 AC990230 */ sw $t9, 0x0230($a0) ## 00000230 -/* 0014C 809F1C2C 8C99002C */ lw $t9, 0x002C($a0) ## 0000002C -/* 00150 809F1C30 AC88022C */ sw $t0, 0x022C($a0) ## 0000022C -/* 00154 809F1C34 AC980234 */ sw $t8, 0x0234($a0) ## 00000234 -/* 00158 809F1C38 AC990238 */ sw $t9, 0x0238($a0) ## 00000238 -.L809F1C3C: -/* 0015C 809F1C3C 03E00008 */ jr $ra -/* 00160 809F1C40 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1C44.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1C44.s deleted file mode 100644 index 62a4f44634..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1C44.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_809F1C44 -/* 00164 809F1C44 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00168 809F1C48 AFB00028 */ sw $s0, 0x0028($sp) -/* 0016C 809F1C4C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00170 809F1C50 AFBF002C */ sw $ra, 0x002C($sp) -/* 00174 809F1C54 3C040600 */ lui $a0, %hi(D_06000560) ## $a0 = 06000000 -/* 00178 809F1C58 AFA50034 */ sw $a1, 0x0034($sp) -/* 0017C 809F1C5C 0C028800 */ jal Animation_GetLastFrame - -/* 00180 809F1C60 24840560 */ addiu $a0, $a0, %lo(D_06000560) ## $a0 = 06000560 -/* 00184 809F1C64 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00188 809F1C68 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0018C 809F1C6C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00190 809F1C70 468021A0 */ cvt.s.w $f6, $f4 -/* 00194 809F1C74 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00198 809F1C78 3C050600 */ lui $a1, %hi(D_06000560) ## $a1 = 06000000 -/* 0019C 809F1C7C 44060000 */ mfc1 $a2, $f0 -/* 001A0 809F1C80 44070000 */ mfc1 $a3, $f0 -/* 001A4 809F1C84 24A50560 */ addiu $a1, $a1, %lo(D_06000560) ## $a1 = 06000560 -/* 001A8 809F1C88 4600320D */ trunc.w.s $f8, $f6 -/* 001AC 809F1C8C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 001B0 809F1C90 440F4000 */ mfc1 $t7, $f8 -/* 001B4 809F1C94 00000000 */ nop -/* 001B8 809F1C98 A60F0248 */ sh $t7, 0x0248($s0) ## 00000248 -/* 001BC 809F1C9C 86180248 */ lh $t8, 0x0248($s0) ## 00000248 -/* 001C0 809F1CA0 AFA00014 */ sw $zero, 0x0014($sp) -/* 001C4 809F1CA4 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 001C8 809F1CA8 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 001CC 809F1CAC 00000000 */ nop -/* 001D0 809F1CB0 46805420 */ cvt.s.w $f16, $f10 -/* 001D4 809F1CB4 0C029468 */ jal Animation_Change - -/* 001D8 809F1CB8 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 001DC 809F1CBC 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 001E0 809F1CC0 A600023E */ sh $zero, 0x023E($s0) ## 0000023E -/* 001E4 809F1CC4 44812000 */ mtc1 $at, $f4 ## $f4 = 8.00 -/* 001E8 809F1CC8 8619023E */ lh $t9, 0x023E($s0) ## 0000023E -/* 001EC 809F1CCC 3C08809F */ lui $t0, %hi(func_809F1CF4) ## $t0 = 809F0000 -/* 001F0 809F1CD0 25081CF4 */ addiu $t0, $t0, %lo(func_809F1CF4) ## $t0 = 809F1CF4 -/* 001F4 809F1CD4 AE08022C */ sw $t0, 0x022C($s0) ## 0000022C -/* 001F8 809F1CD8 E6040164 */ swc1 $f4, 0x0164($s0) ## 00000164 -/* 001FC 809F1CDC A219023C */ sb $t9, 0x023C($s0) ## 0000023C -/* 00200 809F1CE0 8FBF002C */ lw $ra, 0x002C($sp) -/* 00204 809F1CE4 8FB00028 */ lw $s0, 0x0028($sp) -/* 00208 809F1CE8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0020C 809F1CEC 03E00008 */ jr $ra -/* 00210 809F1CF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1CF4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1CF4.s deleted file mode 100644 index bcd5c0b198..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1CF4.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_809F1CF4 -/* 00214 809F1CF4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00218 809F1CF8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0021C 809F1CFC AFB00020 */ sw $s0, 0x0020($sp) -/* 00220 809F1D00 AFA50034 */ sw $a1, 0x0034($sp) -/* 00224 809F1D04 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 00228 809F1D08 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0022C 809F1D0C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00230 809F1D10 0C02927F */ jal SkelAnime_Update - -/* 00234 809F1D14 AFAF002C */ sw $t7, 0x002C($sp) -/* 00238 809F1D18 86180240 */ lh $t8, 0x0240($s0) ## 00000240 -/* 0023C 809F1D1C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00240 809F1D20 1701001C */ bne $t8, $at, .L809F1D94 -/* 00244 809F1D24 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 00248 809F1D28 44813000 */ mtc1 $at, $f6 ## $f6 = 150.00 -/* 0024C 809F1D2C C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 00250 809F1D30 4606203C */ c.lt.s $f4, $f6 -/* 00254 809F1D34 00000000 */ nop -/* 00258 809F1D38 45020017 */ bc1fl .L809F1D98 -/* 0025C 809F1D3C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00260 809F1D40 0C02FF21 */ jal Gameplay_InCsMode -/* 00264 809F1D44 8FA40034 */ lw $a0, 0x0034($sp) -/* 00268 809F1D48 14400012 */ bne $v0, $zero, .L809F1D94 -/* 0026C 809F1D4C 8FB9002C */ lw $t9, 0x002C($sp) -/* 00270 809F1D50 8F28067C */ lw $t0, 0x067C($t9) ## 0000067C -/* 00274 809F1D54 8FA40034 */ lw $a0, 0x0034($sp) -/* 00278 809F1D58 240508B6 */ addiu $a1, $zero, 0x08B6 ## $a1 = 000008B6 -/* 0027C 809F1D5C 31090800 */ andi $t1, $t0, 0x0800 ## $t1 = 00000000 -/* 00280 809F1D60 1520000C */ bne $t1, $zero, .L809F1D94 -/* 00284 809F1D64 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 00288 809F1D68 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 0028C 809F1D6C 0C02003E */ jal func_800800F8 -/* 00290 809F1D70 AFA00010 */ sw $zero, 0x0010($sp) -/* 00294 809F1D74 A6000240 */ sh $zero, 0x0240($s0) ## 00000240 -/* 00298 809F1D78 8FA40034 */ lw $a0, 0x0034($sp) -/* 0029C 809F1D7C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 002A0 809F1D80 0C00B7D5 */ jal func_8002DF54 -/* 002A4 809F1D84 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 002A8 809F1D88 3C0A809F */ lui $t2, %hi(func_809F1EFC) ## $t2 = 809F0000 -/* 002AC 809F1D8C 254A1EFC */ addiu $t2, $t2, %lo(func_809F1EFC) ## $t2 = 809F1EFC -/* 002B0 809F1D90 AE0A022C */ sw $t2, 0x022C($s0) ## 0000022C -.L809F1D94: -/* 002B4 809F1D94 8FBF0024 */ lw $ra, 0x0024($sp) -.L809F1D98: -/* 002B8 809F1D98 8FB00020 */ lw $s0, 0x0020($sp) -/* 002BC 809F1D9C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 002C0 809F1DA0 03E00008 */ jr $ra -/* 002C4 809F1DA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1DA8.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1DA8.s deleted file mode 100644 index 1790690d90..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1DA8.s +++ /dev/null @@ -1,61 +0,0 @@ -glabel func_809F1DA8 -/* 002C8 809F1DA8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 002CC 809F1DAC AFB00030 */ sw $s0, 0x0030($sp) -/* 002D0 809F1DB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 002D4 809F1DB4 AFBF0034 */ sw $ra, 0x0034($sp) -/* 002D8 809F1DB8 3C040600 */ lui $a0, %hi(D_060012B0) ## $a0 = 06000000 -/* 002DC 809F1DBC AFA5003C */ sw $a1, 0x003C($sp) -/* 002E0 809F1DC0 0C028800 */ jal Animation_GetLastFrame - -/* 002E4 809F1DC4 248412B0 */ addiu $a0, $a0, %lo(D_060012B0) ## $a0 = 060012B0 -/* 002E8 809F1DC8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 002EC 809F1DCC 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 002F0 809F1DD0 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 002F4 809F1DD4 468021A0 */ cvt.s.w $f6, $f4 -/* 002F8 809F1DD8 3C050600 */ lui $a1, %hi(D_060012B0) ## $a1 = 06000000 -/* 002FC 809F1DDC 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 00300 809F1DE0 24A512B0 */ addiu $a1, $a1, %lo(D_060012B0) ## $a1 = 060012B0 -/* 00304 809F1DE4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00308 809F1DE8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0030C 809F1DEC 4600320D */ trunc.w.s $f8, $f6 -/* 00310 809F1DF0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00314 809F1DF4 440F4000 */ mfc1 $t7, $f8 -/* 00318 809F1DF8 00000000 */ nop -/* 0031C 809F1DFC A60F0248 */ sh $t7, 0x0248($s0) ## 00000248 -/* 00320 809F1E00 86180248 */ lh $t8, 0x0248($s0) ## 00000248 -/* 00324 809F1E04 AFB90014 */ sw $t9, 0x0014($sp) -/* 00328 809F1E08 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 0032C 809F1E0C 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 00330 809F1E10 00000000 */ nop -/* 00334 809F1E14 46805420 */ cvt.s.w $f16, $f10 -/* 00338 809F1E18 0C029468 */ jal Animation_Change - -/* 0033C 809F1E1C E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00340 809F1E20 2408000F */ addiu $t0, $zero, 0x000F ## $t0 = 0000000F -/* 00344 809F1E24 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 -/* 00348 809F1E28 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 -/* 0034C 809F1E2C 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 00350 809F1E30 240C000A */ addiu $t4, $zero, 0x000A ## $t4 = 0000000A -/* 00354 809F1E34 AFAC0020 */ sw $t4, 0x0020($sp) -/* 00358 809F1E38 AFAB001C */ sw $t3, 0x001C($sp) -/* 0035C 809F1E3C AFAA0018 */ sw $t2, 0x0018($sp) -/* 00360 809F1E40 AFA90014 */ sw $t1, 0x0014($sp) -/* 00364 809F1E44 AFA80010 */ sw $t0, 0x0010($sp) -/* 00368 809F1E48 8FA4003C */ lw $a0, 0x003C($sp) -/* 0036C 809F1E4C 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 00370 809F1E50 3C0640C0 */ lui $a2, 0x40C0 ## $a2 = 40C00000 -/* 00374 809F1E54 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00378 809F1E58 0C00A5E9 */ jal EffectSsHahen_SpawnBurst -/* 0037C 809F1E5C AFA00024 */ sw $zero, 0x0024($sp) -/* 00380 809F1E60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00384 809F1E64 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00388 809F1E68 2405387C */ addiu $a1, $zero, 0x387C ## $a1 = 0000387C -/* 0038C 809F1E6C 3C0D809F */ lui $t5, %hi(func_809F1E8C) ## $t5 = 809F0000 -/* 00390 809F1E70 25AD1E8C */ addiu $t5, $t5, %lo(func_809F1E8C) ## $t5 = 809F1E8C -/* 00394 809F1E74 AE0D022C */ sw $t5, 0x022C($s0) ## 0000022C -/* 00398 809F1E78 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0039C 809F1E7C 8FB00030 */ lw $s0, 0x0030($sp) -/* 003A0 809F1E80 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 003A4 809F1E84 03E00008 */ jr $ra -/* 003A8 809F1E88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1E8C.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1E8C.s deleted file mode 100644 index ac86446782..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1E8C.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_809F1E8C -/* 003AC 809F1E8C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 003B0 809F1E90 AFB00020 */ sw $s0, 0x0020($sp) -/* 003B4 809F1E94 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 003B8 809F1E98 AFBF0024 */ sw $ra, 0x0024($sp) -/* 003BC 809F1E9C AFA5002C */ sw $a1, 0x002C($sp) -/* 003C0 809F1EA0 0C02927F */ jal SkelAnime_Update - -/* 003C4 809F1EA4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 003C8 809F1EA8 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 003CC 809F1EAC AFA00010 */ sw $zero, 0x0010($sp) -/* 003D0 809F1EB0 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 003D4 809F1EB4 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 003D8 809F1EB8 0C01E1A7 */ jal Math_SmoothStepToS - -/* 003DC 809F1EBC 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 -/* 003E0 809F1EC0 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 003E4 809F1EC4 44813000 */ mtc1 $at, $f6 ## $f6 = 150.00 -/* 003E8 809F1EC8 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 003EC 809F1ECC 3C0E809F */ lui $t6, %hi(func_809F236C) ## $t6 = 809F0000 -/* 003F0 809F1ED0 25CE236C */ addiu $t6, $t6, %lo(func_809F236C) ## $t6 = 809F236C -/* 003F4 809F1ED4 4606203C */ c.lt.s $f4, $f6 -/* 003F8 809F1ED8 00000000 */ nop -/* 003FC 809F1EDC 45020003 */ bc1fl .L809F1EEC -/* 00400 809F1EE0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00404 809F1EE4 AE0E022C */ sw $t6, 0x022C($s0) ## 0000022C -/* 00408 809F1EE8 8FBF0024 */ lw $ra, 0x0024($sp) -.L809F1EEC: -/* 0040C 809F1EEC 8FB00020 */ lw $s0, 0x0020($sp) -/* 00410 809F1EF0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00414 809F1EF4 03E00008 */ jr $ra -/* 00418 809F1EF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1EFC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1EFC.s deleted file mode 100644 index 3a34228129..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1EFC.s +++ /dev/null @@ -1,61 +0,0 @@ -glabel func_809F1EFC -/* 0041C 809F1EFC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00420 809F1F00 AFB00030 */ sw $s0, 0x0030($sp) -/* 00424 809F1F04 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00428 809F1F08 AFBF0034 */ sw $ra, 0x0034($sp) -/* 0042C 809F1F0C 3C040600 */ lui $a0, %hi(D_06000DF8) ## $a0 = 06000000 -/* 00430 809F1F10 AFA5003C */ sw $a1, 0x003C($sp) -/* 00434 809F1F14 0C028800 */ jal Animation_GetLastFrame - -/* 00438 809F1F18 24840DF8 */ addiu $a0, $a0, %lo(D_06000DF8) ## $a0 = 06000DF8 -/* 0043C 809F1F1C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00440 809F1F20 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00444 809F1F24 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00448 809F1F28 468021A0 */ cvt.s.w $f6, $f4 -/* 0044C 809F1F2C 3C050600 */ lui $a1, %hi(D_06000DF8) ## $a1 = 06000000 -/* 00450 809F1F30 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 00454 809F1F34 24A50DF8 */ addiu $a1, $a1, %lo(D_06000DF8) ## $a1 = 06000DF8 -/* 00458 809F1F38 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0045C 809F1F3C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00460 809F1F40 4600320D */ trunc.w.s $f8, $f6 -/* 00464 809F1F44 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00468 809F1F48 440F4000 */ mfc1 $t7, $f8 -/* 0046C 809F1F4C 00000000 */ nop -/* 00470 809F1F50 A60F0248 */ sh $t7, 0x0248($s0) ## 00000248 -/* 00474 809F1F54 86180248 */ lh $t8, 0x0248($s0) ## 00000248 -/* 00478 809F1F58 AFB90014 */ sw $t9, 0x0014($sp) -/* 0047C 809F1F5C E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00480 809F1F60 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 00484 809F1F64 00000000 */ nop -/* 00488 809F1F68 46805420 */ cvt.s.w $f16, $f10 -/* 0048C 809F1F6C 0C029468 */ jal Animation_Change - -/* 00490 809F1F70 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00494 809F1F74 2408000F */ addiu $t0, $zero, 0x000F ## $t0 = 0000000F -/* 00498 809F1F78 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 -/* 0049C 809F1F7C 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 -/* 004A0 809F1F80 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 004A4 809F1F84 240C000A */ addiu $t4, $zero, 0x000A ## $t4 = 0000000A -/* 004A8 809F1F88 AFAC0020 */ sw $t4, 0x0020($sp) -/* 004AC 809F1F8C AFAB001C */ sw $t3, 0x001C($sp) -/* 004B0 809F1F90 AFAA0018 */ sw $t2, 0x0018($sp) -/* 004B4 809F1F94 AFA90014 */ sw $t1, 0x0014($sp) -/* 004B8 809F1F98 AFA80010 */ sw $t0, 0x0010($sp) -/* 004BC 809F1F9C 8FA4003C */ lw $a0, 0x003C($sp) -/* 004C0 809F1FA0 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 004C4 809F1FA4 3C0640C0 */ lui $a2, 0x40C0 ## $a2 = 40C00000 -/* 004C8 809F1FA8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 004CC 809F1FAC 0C00A5E9 */ jal EffectSsHahen_SpawnBurst -/* 004D0 809F1FB0 AFA00024 */ sw $zero, 0x0024($sp) -/* 004D4 809F1FB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004D8 809F1FB8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 004DC 809F1FBC 2405387C */ addiu $a1, $zero, 0x387C ## $a1 = 0000387C -/* 004E0 809F1FC0 3C0D809F */ lui $t5, %hi(func_809F1FE0) ## $t5 = 809F0000 -/* 004E4 809F1FC4 25AD1FE0 */ addiu $t5, $t5, %lo(func_809F1FE0) ## $t5 = 809F1FE0 -/* 004E8 809F1FC8 AE0D022C */ sw $t5, 0x022C($s0) ## 0000022C -/* 004EC 809F1FCC 8FBF0034 */ lw $ra, 0x0034($sp) -/* 004F0 809F1FD0 8FB00030 */ lw $s0, 0x0030($sp) -/* 004F4 809F1FD4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 004F8 809F1FD8 03E00008 */ jr $ra -/* 004FC 809F1FDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1FE0.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1FE0.s deleted file mode 100644 index 2e5225add9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1FE0.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_809F1FE0 -/* 00500 809F1FE0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00504 809F1FE4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00508 809F1FE8 AFA40020 */ sw $a0, 0x0020($sp) -/* 0050C 809F1FEC AFA50024 */ sw $a1, 0x0024($sp) -/* 00510 809F1FF0 C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 -/* 00514 809F1FF4 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00518 809F1FF8 AFA50020 */ sw $a1, 0x0020($sp) -/* 0051C 809F1FFC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00520 809F2000 0C02927F */ jal SkelAnime_Update - -/* 00524 809F2004 E7A4001C */ swc1 $f4, 0x001C($sp) -/* 00528 809F2008 8FA50020 */ lw $a1, 0x0020($sp) -/* 0052C 809F200C C7A6001C */ lwc1 $f6, 0x001C($sp) -/* 00530 809F2010 84AE0248 */ lh $t6, 0x0248($a1) ## 00000248 -/* 00534 809F2014 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 00538 809F2018 00000000 */ nop -/* 0053C 809F201C 468042A0 */ cvt.s.w $f10, $f8 -/* 00540 809F2020 4606503E */ c.le.s $f10, $f6 -/* 00544 809F2024 00000000 */ nop -/* 00548 809F2028 4502000C */ bc1fl .L809F205C -/* 0054C 809F202C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00550 809F2030 84AF023E */ lh $t7, 0x023E($a1) ## 0000023E -/* 00554 809F2034 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00558 809F2038 3C19809F */ lui $t9, %hi(func_809F29E0) ## $t9 = 809F0000 -/* 0055C 809F203C 11E10005 */ beq $t7, $at, .L809F2054 -/* 00560 809F2040 273929E0 */ addiu $t9, $t9, %lo(func_809F29E0) ## $t9 = 809F29E0 -/* 00564 809F2044 3C18809F */ lui $t8, %hi(func_809F2068) ## $t8 = 809F0000 -/* 00568 809F2048 27182068 */ addiu $t8, $t8, %lo(func_809F2068) ## $t8 = 809F2068 -/* 0056C 809F204C 10000002 */ beq $zero, $zero, .L809F2058 -/* 00570 809F2050 ACB8022C */ sw $t8, 0x022C($a1) ## 0000022C -.L809F2054: -/* 00574 809F2054 ACB9022C */ sw $t9, 0x022C($a1) ## 0000022C -.L809F2058: -/* 00578 809F2058 8FBF0014 */ lw $ra, 0x0014($sp) -.L809F205C: -/* 0057C 809F205C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00580 809F2060 03E00008 */ jr $ra -/* 00584 809F2064 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2068.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2068.s deleted file mode 100644 index 788e0dc755..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2068.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_809F2068 -/* 00588 809F2068 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0058C 809F206C AFB00028 */ sw $s0, 0x0028($sp) -/* 00590 809F2070 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00594 809F2074 AFBF002C */ sw $ra, 0x002C($sp) -/* 00598 809F2078 3C040600 */ lui $a0, %hi(D_060037C0) ## $a0 = 06000000 -/* 0059C 809F207C AFA50034 */ sw $a1, 0x0034($sp) -/* 005A0 809F2080 0C028800 */ jal Animation_GetLastFrame - -/* 005A4 809F2084 248437C0 */ addiu $a0, $a0, %lo(D_060037C0) ## $a0 = 060037C0 -/* 005A8 809F2088 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 005AC 809F208C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 005B0 809F2090 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 005B4 809F2094 468021A0 */ cvt.s.w $f6, $f4 -/* 005B8 809F2098 3C050600 */ lui $a1, %hi(D_060037C0) ## $a1 = 06000000 -/* 005BC 809F209C 24A537C0 */ addiu $a1, $a1, %lo(D_060037C0) ## $a1 = 060037C0 -/* 005C0 809F20A0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 005C4 809F20A4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 005C8 809F20A8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 005CC 809F20AC 4600320D */ trunc.w.s $f8, $f6 -/* 005D0 809F20B0 440F4000 */ mfc1 $t7, $f8 -/* 005D4 809F20B4 00000000 */ nop -/* 005D8 809F20B8 A60F0248 */ sh $t7, 0x0248($s0) ## 00000248 -/* 005DC 809F20BC 86180248 */ lh $t8, 0x0248($s0) ## 00000248 -/* 005E0 809F20C0 AFA00014 */ sw $zero, 0x0014($sp) -/* 005E4 809F20C4 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 005E8 809F20C8 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 005EC 809F20CC 00000000 */ nop -/* 005F0 809F20D0 46805420 */ cvt.s.w $f16, $f10 -/* 005F4 809F20D4 0C029468 */ jal Animation_Change - -/* 005F8 809F20D8 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 005FC 809F20DC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00600 809F20E0 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 00604 809F20E4 3C09809F */ lui $t1, %hi(func_809F2118) ## $t1 = 809F0000 -/* 00608 809F20E8 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 0060C 809F20EC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00610 809F20F0 25292118 */ addiu $t1, $t1, %lo(func_809F2118) ## $t1 = 809F2118 -/* 00614 809F20F4 A219023C */ sb $t9, 0x023C($s0) ## 0000023C -/* 00618 809F20F8 A608024A */ sh $t0, 0x024A($s0) ## 0000024A -/* 0061C 809F20FC AE09022C */ sw $t1, 0x022C($s0) ## 0000022C -/* 00620 809F2100 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 00624 809F2104 8FBF002C */ lw $ra, 0x002C($sp) -/* 00628 809F2108 8FB00028 */ lw $s0, 0x0028($sp) -/* 0062C 809F210C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00630 809F2110 03E00008 */ jr $ra -/* 00634 809F2114 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2118.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2118.s deleted file mode 100644 index 22d2a244cb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2118.s +++ /dev/null @@ -1,89 +0,0 @@ -glabel func_809F2118 -/* 00638 809F2118 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0063C 809F211C AFB00020 */ sw $s0, 0x0020($sp) -/* 00640 809F2120 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00644 809F2124 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00648 809F2128 AFA5002C */ sw $a1, 0x002C($sp) -/* 0064C 809F212C 0C02927F */ jal SkelAnime_Update - -/* 00650 809F2130 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00654 809F2134 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 00658 809F2138 AFA00010 */ sw $zero, 0x0010($sp) -/* 0065C 809F213C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 00660 809F2140 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 00664 809F2144 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00668 809F2148 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 0066C 809F214C 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 00670 809F2150 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 00674 809F2154 3C073ECC */ lui $a3, 0x3ECC ## $a3 = 3ECC0000 -/* 00678 809F2158 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3ECCCCCD -/* 0067C 809F215C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 00680 809F2160 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 00684 809F2164 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 00688 809F2168 0C01E107 */ jal Math_ApproachF - -/* 0068C 809F216C A60E0032 */ sh $t6, 0x0032($s0) ## 00000032 -/* 00690 809F2170 860F0242 */ lh $t7, 0x0242($s0) ## 00000242 -/* 00694 809F2174 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 -/* 00698 809F2178 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0069C 809F217C 15E00003 */ bne $t7, $zero, .L809F218C -/* 006A0 809F2180 2405387F */ addiu $a1, $zero, 0x387F ## $a1 = 0000387F -/* 006A4 809F2184 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 006A8 809F2188 A6180242 */ sh $t8, 0x0242($s0) ## 00000242 -.L809F218C: -/* 006AC 809F218C 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 -/* 006B0 809F2190 3C098016 */ lui $t1, %hi(gSaveContext+0xa0) -/* 006B4 809F2194 3C0A8012 */ lui $t2, %hi(gUpgradeMasks+0x18) -/* 006B8 809F2198 30590008 */ andi $t9, $v0, 0x0008 ## $t9 = 00000000 -/* 006BC 809F219C 13200008 */ beq $t9, $zero, .L809F21C0 -/* 006C0 809F21A0 30480001 */ andi $t0, $v0, 0x0001 ## $t0 = 00000000 -/* 006C4 809F21A4 11000006 */ beq $t0, $zero, .L809F21C0 -/* 006C8 809F21A8 3C014110 */ lui $at, 0x4110 ## $at = 41100000 -/* 006CC 809F21AC 44812000 */ mtc1 $at, $f4 ## $f4 = 9.00 -/* 006D0 809F21B0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 006D4 809F21B4 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 -/* 006D8 809F21B8 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 -/* 006DC 809F21BC E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -.L809F21C0: -/* 006E0 809F21C0 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 006E4 809F21C4 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 -/* 006E8 809F21C8 C6080090 */ lwc1 $f8, 0x0090($s0) ## 00000090 -/* 006EC 809F21CC 2418104D */ addiu $t8, $zero, 0x104D ## $t8 = 0000104D -/* 006F0 809F21D0 3C0C8012 */ lui $t4, %hi(gUpgradeShifts+6) -/* 006F4 809F21D4 460A403C */ c.lt.s $f8, $f10 -/* 006F8 809F21D8 3305FFFF */ andi $a1, $t8, 0xFFFF ## $a1 = 0000104D -/* 006FC 809F21DC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00700 809F21E0 45020018 */ bc1fl .L809F2244 -/* 00704 809F21E4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00708 809F21E8 8D29E700 */ lw $t1, %lo(gSaveContext+0xa0)($t1) -/* 0070C 809F21EC 8D4A71C8 */ lw $t2, %lo(gUpgradeMasks+0x18)($t2) -/* 00710 809F21F0 918C71FA */ lbu $t4, %lo(gUpgradeShifts+6)($t4) -/* 00714 809F21F4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00718 809F21F8 012A5824 */ and $t3, $t1, $t2 -/* 0071C 809F21FC 018B6807 */ srav $t5, $t3, $t4 -/* 00720 809F2200 15A10004 */ bne $t5, $at, .L809F2214 -/* 00724 809F2204 240F0078 */ addiu $t7, $zero, 0x0078 ## $t7 = 00000078 -/* 00728 809F2208 240E0077 */ addiu $t6, $zero, 0x0077 ## $t6 = 00000077 -/* 0072C 809F220C 10000002 */ beq $zero, $zero, .L809F2218 -/* 00730 809F2210 AE0E0254 */ sw $t6, 0x0254($s0) ## 00000254 -.L809F2214: -/* 00734 809F2214 AE0F0254 */ sw $t7, 0x0254($s0) ## 00000254 -.L809F2218: -/* 00738 809F2218 A618010E */ sh $t8, 0x010E($s0) ## 0000010E -/* 0073C 809F221C 0C042DA0 */ jal func_8010B680 -/* 00740 809F2220 8FA4002C */ lw $a0, 0x002C($sp) -/* 00744 809F2224 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 00748 809F2228 3C08809F */ lui $t0, %hi(func_809F25E4) ## $t0 = 809F0000 -/* 0074C 809F222C 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 -/* 00750 809F2230 250825E4 */ addiu $t0, $t0, %lo(func_809F25E4) ## $t0 = 809F25E4 -/* 00754 809F2234 A6190250 */ sh $t9, 0x0250($s0) ## 00000250 -/* 00758 809F2238 AE08022C */ sw $t0, 0x022C($s0) ## 0000022C -/* 0075C 809F223C E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 00760 809F2240 8FBF0024 */ lw $ra, 0x0024($sp) -.L809F2244: -/* 00764 809F2244 8FB00020 */ lw $s0, 0x0020($sp) -/* 00768 809F2248 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0076C 809F224C 03E00008 */ jr $ra -/* 00770 809F2250 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2254.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2254.s deleted file mode 100644 index 74a60f6935..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2254.s +++ /dev/null @@ -1,65 +0,0 @@ -glabel func_809F2254 -/* 00774 809F2254 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00778 809F2258 AFB00030 */ sw $s0, 0x0030($sp) -/* 0077C 809F225C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00780 809F2260 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00784 809F2264 3C040600 */ lui $a0, %hi(D_06000560) ## $a0 = 06000000 -/* 00788 809F2268 AFA5003C */ sw $a1, 0x003C($sp) -/* 0078C 809F226C 0C028800 */ jal Animation_GetLastFrame - -/* 00790 809F2270 24840560 */ addiu $a0, $a0, %lo(D_06000560) ## $a0 = 06000560 -/* 00794 809F2274 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00798 809F2278 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 0079C 809F227C 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 007A0 809F2280 468021A0 */ cvt.s.w $f6, $f4 -/* 007A4 809F2284 3C050600 */ lui $a1, %hi(D_06000560) ## $a1 = 06000000 -/* 007A8 809F2288 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 007AC 809F228C 24A50560 */ addiu $a1, $a1, %lo(D_06000560) ## $a1 = 06000560 -/* 007B0 809F2290 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 007B4 809F2294 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 007B8 809F2298 4600320D */ trunc.w.s $f8, $f6 -/* 007BC 809F229C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 007C0 809F22A0 440F4000 */ mfc1 $t7, $f8 -/* 007C4 809F22A4 00000000 */ nop -/* 007C8 809F22A8 A60F0248 */ sh $t7, 0x0248($s0) ## 00000248 -/* 007CC 809F22AC 86180248 */ lh $t8, 0x0248($s0) ## 00000248 -/* 007D0 809F22B0 AFB90014 */ sw $t9, 0x0014($sp) -/* 007D4 809F22B4 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 007D8 809F22B8 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 007DC 809F22BC 00000000 */ nop -/* 007E0 809F22C0 46805420 */ cvt.s.w $f16, $f10 -/* 007E4 809F22C4 0C029468 */ jal Animation_Change - -/* 007E8 809F22C8 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 007EC 809F22CC 2408000F */ addiu $t0, $zero, 0x000F ## $t0 = 0000000F -/* 007F0 809F22D0 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 -/* 007F4 809F22D4 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 -/* 007F8 809F22D8 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 007FC 809F22DC 240C000A */ addiu $t4, $zero, 0x000A ## $t4 = 0000000A -/* 00800 809F22E0 AFAC0020 */ sw $t4, 0x0020($sp) -/* 00804 809F22E4 AFAB001C */ sw $t3, 0x001C($sp) -/* 00808 809F22E8 AFAA0018 */ sw $t2, 0x0018($sp) -/* 0080C 809F22EC AFA90014 */ sw $t1, 0x0014($sp) -/* 00810 809F22F0 AFA80010 */ sw $t0, 0x0010($sp) -/* 00814 809F22F4 8FA4003C */ lw $a0, 0x003C($sp) -/* 00818 809F22F8 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 0081C 809F22FC 3C0640C0 */ lui $a2, 0x40C0 ## $a2 = 40C00000 -/* 00820 809F2300 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00824 809F2304 0C00A5E9 */ jal EffectSsHahen_SpawnBurst -/* 00828 809F2308 AFA00024 */ sw $zero, 0x0024($sp) -/* 0082C 809F230C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00830 809F2310 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00834 809F2314 2405387C */ addiu $a1, $zero, 0x387C ## $a1 = 0000387C -/* 00838 809F2318 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0083C 809F231C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00840 809F2320 2405387D */ addiu $a1, $zero, 0x387D ## $a1 = 0000387D -/* 00844 809F2324 3C0D809F */ lui $t5, %hi(func_809F2344) ## $t5 = 809F0000 -/* 00848 809F2328 25AD2344 */ addiu $t5, $t5, %lo(func_809F2344) ## $t5 = 809F2344 -/* 0084C 809F232C AE0D022C */ sw $t5, 0x022C($s0) ## 0000022C -/* 00850 809F2330 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00854 809F2334 8FB00030 */ lw $s0, 0x0030($sp) -/* 00858 809F2338 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0085C 809F233C 03E00008 */ jr $ra -/* 00860 809F2340 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2344.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2344.s deleted file mode 100644 index bdfd62b92e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2344.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_809F2344 -/* 00864 809F2344 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00868 809F2348 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0086C 809F234C AFA40018 */ sw $a0, 0x0018($sp) -/* 00870 809F2350 AFA5001C */ sw $a1, 0x001C($sp) -/* 00874 809F2354 0C02927F */ jal SkelAnime_Update - -/* 00878 809F2358 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0087C 809F235C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00880 809F2360 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00884 809F2364 03E00008 */ jr $ra -/* 00888 809F2368 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F236C.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F236C.s deleted file mode 100644 index 564b12b109..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F236C.s +++ /dev/null @@ -1,87 +0,0 @@ -glabel func_809F236C -/* 0088C 809F236C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00890 809F2370 AFB00030 */ sw $s0, 0x0030($sp) -/* 00894 809F2374 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00898 809F2378 AFBF0034 */ sw $ra, 0x0034($sp) -/* 0089C 809F237C 3C040600 */ lui $a0, %hi(D_06000944) ## $a0 = 06000000 -/* 008A0 809F2380 AFA5003C */ sw $a1, 0x003C($sp) -/* 008A4 809F2384 0C028800 */ jal Animation_GetLastFrame - -/* 008A8 809F2388 24840944 */ addiu $a0, $a0, %lo(D_06000944) ## $a0 = 06000944 -/* 008AC 809F238C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 008B0 809F2390 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 008B4 809F2394 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 008B8 809F2398 468021A0 */ cvt.s.w $f6, $f4 -/* 008BC 809F239C 3C050600 */ lui $a1, %hi(D_06000944) ## $a1 = 06000000 -/* 008C0 809F23A0 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 008C4 809F23A4 24A50944 */ addiu $a1, $a1, %lo(D_06000944) ## $a1 = 06000944 -/* 008C8 809F23A8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 008CC 809F23AC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 008D0 809F23B0 4600320D */ trunc.w.s $f8, $f6 -/* 008D4 809F23B4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 008D8 809F23B8 440F4000 */ mfc1 $t7, $f8 -/* 008DC 809F23BC 00000000 */ nop -/* 008E0 809F23C0 A60F0248 */ sh $t7, 0x0248($s0) ## 00000248 -/* 008E4 809F23C4 86180248 */ lh $t8, 0x0248($s0) ## 00000248 -/* 008E8 809F23C8 AFB90014 */ sw $t9, 0x0014($sp) -/* 008EC 809F23CC E7B20018 */ swc1 $f18, 0x0018($sp) -/* 008F0 809F23D0 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 008F4 809F23D4 00000000 */ nop -/* 008F8 809F23D8 46805420 */ cvt.s.w $f16, $f10 -/* 008FC 809F23DC 0C029468 */ jal Animation_Change - -/* 00900 809F23E0 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00904 809F23E4 24080009 */ addiu $t0, $zero, 0x0009 ## $t0 = 00000009 -/* 00908 809F23E8 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 -/* 0090C 809F23EC 240A000A */ addiu $t2, $zero, 0x000A ## $t2 = 0000000A -/* 00910 809F23F0 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 00914 809F23F4 240C000A */ addiu $t4, $zero, 0x000A ## $t4 = 0000000A -/* 00918 809F23F8 AFAC0020 */ sw $t4, 0x0020($sp) -/* 0091C 809F23FC AFAB001C */ sw $t3, 0x001C($sp) -/* 00920 809F2400 AFAA0018 */ sw $t2, 0x0018($sp) -/* 00924 809F2404 AFA90014 */ sw $t1, 0x0014($sp) -/* 00928 809F2408 AFA80010 */ sw $t0, 0x0010($sp) -/* 0092C 809F240C 8FA4003C */ lw $a0, 0x003C($sp) -/* 00930 809F2410 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 00934 809F2414 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 00938 809F2418 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0093C 809F241C 0C00A5E9 */ jal EffectSsHahen_SpawnBurst -/* 00940 809F2420 AFA00024 */ sw $zero, 0x0024($sp) -/* 00944 809F2424 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00948 809F2428 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0094C 809F242C 2405387C */ addiu $a1, $zero, 0x387C ## $a1 = 0000387C -/* 00950 809F2430 3C0D8016 */ lui $t5, %hi(gSaveContext+0xa0) -/* 00954 809F2434 3C0E8012 */ lui $t6, %hi(gUpgradeMasks+0x1c) -/* 00958 809F2438 8DCE71CC */ lw $t6, %lo(gUpgradeMasks+0x1c)($t6) -/* 0095C 809F243C 8DADE700 */ lw $t5, %lo(gSaveContext+0xa0)($t5) -/* 00960 809F2440 3C188012 */ lui $t8, %hi(gUpgradeShifts+7) -/* 00964 809F2444 931871FB */ lbu $t8, %lo(gUpgradeShifts+7)($t8) -/* 00968 809F2448 01AE7824 */ and $t7, $t5, $t6 -/* 0096C 809F244C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00970 809F2450 030F1007 */ srav $v0, $t7, $t8 -/* 00974 809F2454 10410003 */ beq $v0, $at, .L809F2464 -/* 00978 809F2458 240B10DB */ addiu $t3, $zero, 0x10DB ## $t3 = 000010DB -/* 0097C 809F245C 14400004 */ bne $v0, $zero, .L809F2470 -/* 00980 809F2460 2408007A */ addiu $t0, $zero, 0x007A ## $t0 = 0000007A -.L809F2464: -/* 00984 809F2464 24190079 */ addiu $t9, $zero, 0x0079 ## $t9 = 00000079 -/* 00988 809F2468 10000002 */ beq $zero, $zero, .L809F2474 -/* 0098C 809F246C AE190254 */ sw $t9, 0x0254($s0) ## 00000254 -.L809F2470: -/* 00990 809F2470 AE080254 */ sw $t0, 0x0254($s0) ## 00000254 -.L809F2474: -/* 00994 809F2474 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 -/* 00998 809F2478 3C0D809F */ lui $t5, %hi(func_809F24AC) ## $t5 = 809F0000 -/* 0099C 809F247C 240C0005 */ addiu $t4, $zero, 0x0005 ## $t4 = 00000005 -/* 009A0 809F2480 25AD24AC */ addiu $t5, $t5, %lo(func_809F24AC) ## $t5 = 809F24AC -/* 009A4 809F2484 352A0001 */ ori $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 009A8 809F2488 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 -/* 009AC 809F248C A60B010E */ sh $t3, 0x010E($s0) ## 0000010E -/* 009B0 809F2490 A60C0250 */ sh $t4, 0x0250($s0) ## 00000250 -/* 009B4 809F2494 AE0D022C */ sw $t5, 0x022C($s0) ## 0000022C -/* 009B8 809F2498 8FBF0034 */ lw $ra, 0x0034($sp) -/* 009BC 809F249C 8FB00030 */ lw $s0, 0x0030($sp) -/* 009C0 809F24A0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 009C4 809F24A4 03E00008 */ jr $ra -/* 009C8 809F24A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F24AC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F24AC.s deleted file mode 100644 index 1baa022d75..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F24AC.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_809F24AC -/* 009CC 809F24AC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 009D0 809F24B0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 009D4 809F24B4 AFB00020 */ sw $s0, 0x0020($sp) -/* 009D8 809F24B8 AFA50034 */ sw $a1, 0x0034($sp) -/* 009DC 809F24BC C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 -/* 009E0 809F24C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 009E4 809F24C4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 009E8 809F24C8 0C02927F */ jal SkelAnime_Update - -/* 009EC 809F24CC E7A4002C */ swc1 $f4, 0x002C($sp) -/* 009F0 809F24D0 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 009F4 809F24D4 AFA00010 */ sw $zero, 0x0010($sp) -/* 009F8 809F24D8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 009FC 809F24DC 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00A00 809F24E0 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00A04 809F24E4 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 -/* 00A08 809F24E8 860E0248 */ lh $t6, 0x0248($s0) ## 00000248 -/* 00A0C 809F24EC C7A6002C */ lwc1 $f6, 0x002C($sp) -/* 00A10 809F24F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A14 809F24F4 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 00A18 809F24F8 00000000 */ nop -/* 00A1C 809F24FC 468042A0 */ cvt.s.w $f10, $f8 -/* 00A20 809F2500 4606503E */ c.le.s $f10, $f6 -/* 00A24 809F2504 00000000 */ nop -/* 00A28 809F2508 4502000D */ bc1fl .L809F2540 -/* 00A2C 809F250C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00A30 809F2510 0C00BC65 */ jal func_8002F194 -/* 00A34 809F2514 8FA50034 */ lw $a1, 0x0034($sp) -/* 00A38 809F2518 10400005 */ beq $v0, $zero, .L809F2530 -/* 00A3C 809F251C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A40 809F2520 3C0F809F */ lui $t7, %hi(func_809F2550) ## $t7 = 809F0000 -/* 00A44 809F2524 25EF2550 */ addiu $t7, $t7, %lo(func_809F2550) ## $t7 = 809F2550 -/* 00A48 809F2528 10000004 */ beq $zero, $zero, .L809F253C -/* 00A4C 809F252C AE0F022C */ sw $t7, 0x022C($s0) ## 0000022C -.L809F2530: -/* 00A50 809F2530 8FA50034 */ lw $a1, 0x0034($sp) -/* 00A54 809F2534 0C00BCB3 */ jal func_8002F2CC -/* 00A58 809F2538 3C0642C8 */ lui $a2, 0x42C8 ## $a2 = 42C80000 -.L809F253C: -/* 00A5C 809F253C 8FBF0024 */ lw $ra, 0x0024($sp) -.L809F2540: -/* 00A60 809F2540 8FB00020 */ lw $s0, 0x0020($sp) -/* 00A64 809F2544 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00A68 809F2548 03E00008 */ jr $ra -/* 00A6C 809F254C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2550.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2550.s deleted file mode 100644 index 74252faf91..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2550.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_809F2550 -/* 00A70 809F2550 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00A74 809F2554 AFA40028 */ sw $a0, 0x0028($sp) -/* 00A78 809F2558 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00A7C 809F255C 3C040600 */ lui $a0, %hi(D_06000BD0) ## $a0 = 06000000 -/* 00A80 809F2560 AFA5002C */ sw $a1, 0x002C($sp) -/* 00A84 809F2564 0C028800 */ jal Animation_GetLastFrame - -/* 00A88 809F2568 24840BD0 */ addiu $a0, $a0, %lo(D_06000BD0) ## $a0 = 06000BD0 -/* 00A8C 809F256C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00A90 809F2570 8FA30028 */ lw $v1, 0x0028($sp) -/* 00A94 809F2574 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00A98 809F2578 468021A0 */ cvt.s.w $f6, $f4 -/* 00A9C 809F257C 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00AA0 809F2580 3C050600 */ lui $a1, %hi(D_06000BD0) ## $a1 = 06000000 -/* 00AA4 809F2584 24A50BD0 */ addiu $a1, $a1, %lo(D_06000BD0) ## $a1 = 06000BD0 -/* 00AA8 809F2588 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00AAC 809F258C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00AB0 809F2590 4600320D */ trunc.w.s $f8, $f6 -/* 00AB4 809F2594 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 00AB8 809F2598 440F4000 */ mfc1 $t7, $f8 -/* 00ABC 809F259C 00000000 */ nop -/* 00AC0 809F25A0 A46F0248 */ sh $t7, 0x0248($v1) ## 00000248 -/* 00AC4 809F25A4 84780248 */ lh $t8, 0x0248($v1) ## 00000248 -/* 00AC8 809F25A8 AFA00014 */ sw $zero, 0x0014($sp) -/* 00ACC 809F25AC E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00AD0 809F25B0 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 00AD4 809F25B4 00000000 */ nop -/* 00AD8 809F25B8 46805420 */ cvt.s.w $f16, $f10 -/* 00ADC 809F25BC 0C029468 */ jal Animation_Change - -/* 00AE0 809F25C0 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00AE4 809F25C4 8FA30028 */ lw $v1, 0x0028($sp) -/* 00AE8 809F25C8 3C19809F */ lui $t9, %hi(func_809F25E4) ## $t9 = 809F0000 -/* 00AEC 809F25CC 273925E4 */ addiu $t9, $t9, %lo(func_809F25E4) ## $t9 = 809F25E4 -/* 00AF0 809F25D0 AC79022C */ sw $t9, 0x022C($v1) ## 0000022C -/* 00AF4 809F25D4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00AF8 809F25D8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00AFC 809F25DC 03E00008 */ jr $ra -/* 00B00 809F25E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F25E4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F25E4.s deleted file mode 100644 index d3f2d78ce4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F25E4.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_809F25E4 -/* 00B04 809F25E4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00B08 809F25E8 AFB0001C */ sw $s0, 0x001C($sp) -/* 00B0C 809F25EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B10 809F25F0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00B14 809F25F4 AFB10020 */ sw $s1, 0x0020($sp) -/* 00B18 809F25F8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00B1C 809F25FC 0C02927F */ jal SkelAnime_Update - -/* 00B20 809F2600 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00B24 809F2604 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 00B28 809F2608 AFA00010 */ sw $zero, 0x0010($sp) -/* 00B2C 809F260C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 00B30 809F2610 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00B34 809F2614 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00B38 809F2618 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 -/* 00B3C 809F261C 0C042F6F */ jal func_8010BDBC -/* 00B40 809F2620 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 00B44 809F2624 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00B48 809F2628 5441001D */ bnel $v0, $at, .L809F26A0 -/* 00B4C 809F262C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00B50 809F2630 0C041AF2 */ jal func_80106BC8 -/* 00B54 809F2634 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00B58 809F2638 50400019 */ beql $v0, $zero, .L809F26A0 -/* 00B5C 809F263C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00B60 809F2640 862E07A0 */ lh $t6, 0x07A0($s1) ## 000007A0 -/* 00B64 809F2644 000E7880 */ sll $t7, $t6, 2 -/* 00B68 809F2648 022FC021 */ addu $t8, $s1, $t7 -/* 00B6C 809F264C 0C016C69 */ jal func_8005B1A4 -/* 00B70 809F2650 8F040790 */ lw $a0, 0x0790($t8) ## 00000790 -/* 00B74 809F2654 0C041B33 */ jal func_80106CCC -/* 00B78 809F2658 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00B7C 809F265C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00B80 809F2660 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00B84 809F2664 0C00B7D5 */ jal func_8002DF54 -/* 00B88 809F2668 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 00B8C 809F266C 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00B90 809F2670 44812000 */ mtc1 $at, $f4 ## $f4 = 200.00 -/* 00B94 809F2674 AE000118 */ sw $zero, 0x0118($s0) ## 00000118 -/* 00B98 809F2678 8E060254 */ lw $a2, 0x0254($s0) ## 00000254 -/* 00B9C 809F267C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BA0 809F2680 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00BA4 809F2684 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 -/* 00BA8 809F2688 0C00BD0D */ jal func_8002F434 -/* 00BAC 809F268C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00BB0 809F2690 3C19809F */ lui $t9, %hi(func_809F26B0) ## $t9 = 809F0000 -/* 00BB4 809F2694 273926B0 */ addiu $t9, $t9, %lo(func_809F26B0) ## $t9 = 809F26B0 -/* 00BB8 809F2698 AE19022C */ sw $t9, 0x022C($s0) ## 0000022C -/* 00BBC 809F269C 8FBF0024 */ lw $ra, 0x0024($sp) -.L809F26A0: -/* 00BC0 809F26A0 8FB0001C */ lw $s0, 0x001C($sp) -/* 00BC4 809F26A4 8FB10020 */ lw $s1, 0x0020($sp) -/* 00BC8 809F26A8 03E00008 */ jr $ra -/* 00BCC 809F26AC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F26B0.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F26B0.s deleted file mode 100644 index e9b5ff58e0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F26B0.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_809F26B0 -/* 00BD0 809F26B0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00BD4 809F26B4 AFB00020 */ sw $s0, 0x0020($sp) -/* 00BD8 809F26B8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00BDC 809F26BC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00BE0 809F26C0 AFA5002C */ sw $a1, 0x002C($sp) -/* 00BE4 809F26C4 0C02927F */ jal SkelAnime_Update - -/* 00BE8 809F26C8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00BEC 809F26CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BF0 809F26D0 0C00BD04 */ jal Actor_HasParent -/* 00BF4 809F26D4 8FA5002C */ lw $a1, 0x002C($sp) -/* 00BF8 809F26D8 10400005 */ beq $v0, $zero, .L809F26F0 -/* 00BFC 809F26DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C00 809F26E0 3C0E809F */ lui $t6, %hi(func_809F2720) ## $t6 = 809F0000 -/* 00C04 809F26E4 25CE2720 */ addiu $t6, $t6, %lo(func_809F2720) ## $t6 = 809F2720 -/* 00C08 809F26E8 10000008 */ beq $zero, $zero, .L809F270C -/* 00C0C 809F26EC AE0E022C */ sw $t6, 0x022C($s0) ## 0000022C -.L809F26F0: -/* 00C10 809F26F0 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00C14 809F26F4 44812000 */ mtc1 $at, $f4 ## $f4 = 200.00 -/* 00C18 809F26F8 8E060254 */ lw $a2, 0x0254($s0) ## 00000254 -/* 00C1C 809F26FC 8FA5002C */ lw $a1, 0x002C($sp) -/* 00C20 809F2700 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 -/* 00C24 809F2704 0C00BD0D */ jal func_8002F434 -/* 00C28 809F2708 E7A40010 */ swc1 $f4, 0x0010($sp) -.L809F270C: -/* 00C2C 809F270C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00C30 809F2710 8FB00020 */ lw $s0, 0x0020($sp) -/* 00C34 809F2714 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00C38 809F2718 03E00008 */ jr $ra -/* 00C3C 809F271C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2720.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2720.s deleted file mode 100644 index 931d28cd79..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2720.s +++ /dev/null @@ -1,181 +0,0 @@ -.rdata -glabel D_809F3020 - .asciz "実 \n" - .balign 4 -glabel D_809F3028 - .asciz "実 \n" - .balign 4 -glabel D_809F3030 - .asciz "実 \n" - .balign 4 -glabel D_809F3038 - .asciz "実 \n" - .balign 4 -glabel D_809F3040 - .asciz "実 \n" - .balign 4 -glabel D_809F3048 - .asciz "実 \n" - .balign 4 -glabel D_809F3050 - .asciz "実 \n" - .balign 4 -glabel D_809F3058 - .asciz "実 \n" - .balign 4 -glabel D_809F3060 - .asciz "棒 \n" - .balign 4 -glabel D_809F3068 - .asciz "棒 \n" - .balign 4 -glabel D_809F3070 - .asciz "棒 \n" - .balign 4 -glabel D_809F3078 - .asciz "棒 \n" - .balign 4 -glabel D_809F3080 - .asciz "棒 \n" - .balign 4 -glabel D_809F3088 - .asciz "棒 \n" - .balign 4 - -.text -glabel func_809F2720 -/* 00C40 809F2720 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00C44 809F2724 AFB00018 */ sw $s0, 0x0018($sp) -/* 00C48 809F2728 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C4C 809F272C AFBF001C */ sw $ra, 0x001C($sp) -/* 00C50 809F2730 AFA50024 */ sw $a1, 0x0024($sp) -/* 00C54 809F2734 0C02927F */ jal SkelAnime_Update - -/* 00C58 809F2738 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00C5C 809F273C 8FA40024 */ lw $a0, 0x0024($sp) -/* 00C60 809F2740 0C042F6F */ jal func_8010BDBC -/* 00C64 809F2744 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 00C68 809F2748 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00C6C 809F274C 5441005F */ bnel $v0, $at, .L809F28CC -/* 00C70 809F2750 8FBF001C */ lw $ra, 0x001C($sp) -/* 00C74 809F2754 0C041AF2 */ jal func_80106BC8 -/* 00C78 809F2758 8FA40024 */ lw $a0, 0x0024($sp) -/* 00C7C 809F275C 5040005B */ beql $v0, $zero, .L809F28CC -/* 00C80 809F2760 8FBF001C */ lw $ra, 0x001C($sp) -/* 00C84 809F2764 8E020254 */ lw $v0, 0x0254($s0) ## 00000254 -/* 00C88 809F2768 24010079 */ addiu $at, $zero, 0x0079 ## $at = 00000079 -/* 00C8C 809F276C 3C04809F */ lui $a0, %hi(D_809F3020) ## $a0 = 809F0000 -/* 00C90 809F2770 10410003 */ beq $v0, $at, .L809F2780 -/* 00C94 809F2774 2401007A */ addiu $at, $zero, 0x007A ## $at = 0000007A -/* 00C98 809F2778 1441001E */ bne $v0, $at, .L809F27F4 -/* 00C9C 809F277C 00000000 */ nop -.L809F2780: -/* 00CA0 809F2780 0C00084C */ jal osSyncPrintf - -/* 00CA4 809F2784 24843020 */ addiu $a0, $a0, %lo(D_809F3020) ## $a0 = 809F3020 -/* 00CA8 809F2788 3C04809F */ lui $a0, %hi(D_809F3028) ## $a0 = 809F0000 -/* 00CAC 809F278C 0C00084C */ jal osSyncPrintf - -/* 00CB0 809F2790 24843028 */ addiu $a0, $a0, %lo(D_809F3028) ## $a0 = 809F3028 -/* 00CB4 809F2794 3C04809F */ lui $a0, %hi(D_809F3030) ## $a0 = 809F0000 -/* 00CB8 809F2798 0C00084C */ jal osSyncPrintf - -/* 00CBC 809F279C 24843030 */ addiu $a0, $a0, %lo(D_809F3030) ## $a0 = 809F3030 -/* 00CC0 809F27A0 3C04809F */ lui $a0, %hi(D_809F3038) ## $a0 = 809F0000 -/* 00CC4 809F27A4 0C00084C */ jal osSyncPrintf - -/* 00CC8 809F27A8 24843038 */ addiu $a0, $a0, %lo(D_809F3038) ## $a0 = 809F3038 -/* 00CCC 809F27AC 3C04809F */ lui $a0, %hi(D_809F3040) ## $a0 = 809F0000 -/* 00CD0 809F27B0 0C00084C */ jal osSyncPrintf - -/* 00CD4 809F27B4 24843040 */ addiu $a0, $a0, %lo(D_809F3040) ## $a0 = 809F3040 -/* 00CD8 809F27B8 3C04809F */ lui $a0, %hi(D_809F3048) ## $a0 = 809F0000 -/* 00CDC 809F27BC 0C00084C */ jal osSyncPrintf - -/* 00CE0 809F27C0 24843048 */ addiu $a0, $a0, %lo(D_809F3048) ## $a0 = 809F3048 -/* 00CE4 809F27C4 3C04809F */ lui $a0, %hi(D_809F3050) ## $a0 = 809F0000 -/* 00CE8 809F27C8 0C00084C */ jal osSyncPrintf - -/* 00CEC 809F27CC 24843050 */ addiu $a0, $a0, %lo(D_809F3050) ## $a0 = 809F3050 -/* 00CF0 809F27D0 3C04809F */ lui $a0, %hi(D_809F3058) ## $a0 = 809F0000 -/* 00CF4 809F27D4 0C00084C */ jal osSyncPrintf - -/* 00CF8 809F27D8 24843058 */ addiu $a0, $a0, %lo(D_809F3058) ## $a0 = 809F3058 -/* 00CFC 809F27DC 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00D00 809F27E0 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00D04 809F27E4 944E0EF2 */ lhu $t6, 0x0EF2($v0) ## 8015F552 -/* 00D08 809F27E8 35CF8000 */ ori $t7, $t6, 0x8000 ## $t7 = 00008000 -/* 00D0C 809F27EC 10000018 */ beq $zero, $zero, .L809F2850 -/* 00D10 809F27F0 A44F0EF2 */ sh $t7, 0x0EF2($v0) ## 8015F552 -.L809F27F4: -/* 00D14 809F27F4 3C04809F */ lui $a0, %hi(D_809F3060) ## $a0 = 809F0000 -/* 00D18 809F27F8 0C00084C */ jal osSyncPrintf - -/* 00D1C 809F27FC 24843060 */ addiu $a0, $a0, %lo(D_809F3060) ## $a0 = 809F3060 -/* 00D20 809F2800 3C04809F */ lui $a0, %hi(D_809F3068) ## $a0 = 809F0000 -/* 00D24 809F2804 0C00084C */ jal osSyncPrintf - -/* 00D28 809F2808 24843068 */ addiu $a0, $a0, %lo(D_809F3068) ## $a0 = 809F3068 -/* 00D2C 809F280C 3C04809F */ lui $a0, %hi(D_809F3070) ## $a0 = 809F0000 -/* 00D30 809F2810 0C00084C */ jal osSyncPrintf - -/* 00D34 809F2814 24843070 */ addiu $a0, $a0, %lo(D_809F3070) ## $a0 = 809F3070 -/* 00D38 809F2818 3C04809F */ lui $a0, %hi(D_809F3078) ## $a0 = 809F0000 -/* 00D3C 809F281C 0C00084C */ jal osSyncPrintf - -/* 00D40 809F2820 24843078 */ addiu $a0, $a0, %lo(D_809F3078) ## $a0 = 809F3078 -/* 00D44 809F2824 3C04809F */ lui $a0, %hi(D_809F3080) ## $a0 = 809F0000 -/* 00D48 809F2828 0C00084C */ jal osSyncPrintf - -/* 00D4C 809F282C 24843080 */ addiu $a0, $a0, %lo(D_809F3080) ## $a0 = 809F3080 -/* 00D50 809F2830 3C04809F */ lui $a0, %hi(D_809F3088) ## $a0 = 809F0000 -/* 00D54 809F2834 0C00084C */ jal osSyncPrintf - -/* 00D58 809F2838 24843088 */ addiu $a0, $a0, %lo(D_809F3088) ## $a0 = 809F3088 -/* 00D5C 809F283C 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00D60 809F2840 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00D64 809F2844 94580EF2 */ lhu $t8, 0x0EF2($v0) ## 8015F552 -/* 00D68 809F2848 37194000 */ ori $t9, $t8, 0x4000 ## $t9 = 00004000 -/* 00D6C 809F284C A4590EF2 */ sh $t9, 0x0EF2($v0) ## 8015F552 -.L809F2850: -/* 00D70 809F2850 8E020258 */ lw $v0, 0x0258($s0) ## 00000258 -/* 00D74 809F2854 3C19809F */ lui $t9, %hi(func_809F28DC) ## $t9 = 809F0000 -/* 00D78 809F2858 A600010E */ sh $zero, 0x010E($s0) ## 0000010E -/* 00D7C 809F285C 1040000F */ beq $v0, $zero, .L809F289C -/* 00D80 809F2860 273928DC */ addiu $t9, $t9, %lo(func_809F28DC) ## $t9 = 809F28DC -/* 00D84 809F2864 8C480130 */ lw $t0, 0x0130($v0) ## 8015E790 -/* 00D88 809F2868 5100000D */ beql $t0, $zero, .L809F28A0 -/* 00D8C 809F286C 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 00D90 809F2870 A440015A */ sh $zero, 0x015A($v0) ## 8015E7BA -/* 00D94 809F2874 8609024A */ lh $t1, 0x024A($s0) ## 0000024A -/* 00D98 809F2878 55200006 */ bnel $t1, $zero, .L809F2894 -/* 00D9C 809F287C 8E0D0258 */ lw $t5, 0x0258($s0) ## 00000258 -/* 00DA0 809F2880 8E0B0258 */ lw $t3, 0x0258($s0) ## 00000258 -/* 00DA4 809F2884 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -/* 00DA8 809F2888 10000004 */ beq $zero, $zero, .L809F289C -/* 00DAC 809F288C A56A0158 */ sh $t2, 0x0158($t3) ## 00000158 -/* 00DB0 809F2890 8E0D0258 */ lw $t5, 0x0258($s0) ## 00000258 -.L809F2894: -/* 00DB4 809F2894 240C0005 */ addiu $t4, $zero, 0x0005 ## $t4 = 00000005 -/* 00DB8 809F2898 A5AC0158 */ sh $t4, 0x0158($t5) ## 00000158 -.L809F289C: -/* 00DBC 809F289C 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -.L809F28A0: -/* 00DC0 809F28A0 8618024A */ lh $t8, 0x024A($s0) ## 0000024A -/* 00DC4 809F28A4 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00DC8 809F28A8 01C17824 */ and $t7, $t6, $at -/* 00DCC 809F28AC 17000003 */ bne $t8, $zero, .L809F28BC -/* 00DD0 809F28B0 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 00DD4 809F28B4 10000004 */ beq $zero, $zero, .L809F28C8 -/* 00DD8 809F28B8 AE19022C */ sw $t9, 0x022C($s0) ## 0000022C -.L809F28BC: -/* 00DDC 809F28BC 3C08809F */ lui $t0, %hi(func_809F29E0) ## $t0 = 809F0000 -/* 00DE0 809F28C0 250829E0 */ addiu $t0, $t0, %lo(func_809F29E0) ## $t0 = 809F29E0 -/* 00DE4 809F28C4 AE08022C */ sw $t0, 0x022C($s0) ## 0000022C -.L809F28C8: -/* 00DE8 809F28C8 8FBF001C */ lw $ra, 0x001C($sp) -.L809F28CC: -/* 00DEC 809F28CC 8FB00018 */ lw $s0, 0x0018($sp) -/* 00DF0 809F28D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00DF4 809F28D4 03E00008 */ jr $ra -/* 00DF8 809F28D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F28DC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F28DC.s deleted file mode 100644 index ada1d7d77a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F28DC.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_809F28DC -/* 00DFC 809F28DC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00E00 809F28E0 AFA40028 */ sw $a0, 0x0028($sp) -/* 00E04 809F28E4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00E08 809F28E8 3C040600 */ lui $a0, %hi(D_06000A70) ## $a0 = 06000000 -/* 00E0C 809F28EC AFA5002C */ sw $a1, 0x002C($sp) -/* 00E10 809F28F0 0C028800 */ jal Animation_GetLastFrame - -/* 00E14 809F28F4 24840A70 */ addiu $a0, $a0, %lo(D_06000A70) ## $a0 = 06000A70 -/* 00E18 809F28F8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00E1C 809F28FC 8FA30028 */ lw $v1, 0x0028($sp) -/* 00E20 809F2900 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00E24 809F2904 468021A0 */ cvt.s.w $f6, $f4 -/* 00E28 809F2908 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00E2C 809F290C 3C050600 */ lui $a1, %hi(D_06000A70) ## $a1 = 06000000 -/* 00E30 809F2910 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 00E34 809F2914 24A50A70 */ addiu $a1, $a1, %lo(D_06000A70) ## $a1 = 06000A70 -/* 00E38 809F2918 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00E3C 809F291C 4600320D */ trunc.w.s $f8, $f6 -/* 00E40 809F2920 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00E44 809F2924 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 00E48 809F2928 440F4000 */ mfc1 $t7, $f8 -/* 00E4C 809F292C 00000000 */ nop -/* 00E50 809F2930 A46F0248 */ sh $t7, 0x0248($v1) ## 00000248 -/* 00E54 809F2934 84780248 */ lh $t8, 0x0248($v1) ## 00000248 -/* 00E58 809F2938 AFB90014 */ sw $t9, 0x0014($sp) -/* 00E5C 809F293C E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00E60 809F2940 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 00E64 809F2944 00000000 */ nop -/* 00E68 809F2948 46805420 */ cvt.s.w $f16, $f10 -/* 00E6C 809F294C 0C029468 */ jal Animation_Change - -/* 00E70 809F2950 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00E74 809F2954 8FA30028 */ lw $v1, 0x0028($sp) -/* 00E78 809F2958 3C08809F */ lui $t0, %hi(func_809F2974) ## $t0 = 809F0000 -/* 00E7C 809F295C 25082974 */ addiu $t0, $t0, %lo(func_809F2974) ## $t0 = 809F2974 -/* 00E80 809F2960 AC68022C */ sw $t0, 0x022C($v1) ## 0000022C -/* 00E84 809F2964 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00E88 809F2968 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00E8C 809F296C 03E00008 */ jr $ra -/* 00E90 809F2970 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2974.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2974.s deleted file mode 100644 index 86fe2cdf2a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2974.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_809F2974 -/* 00E94 809F2974 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00E98 809F2978 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00E9C 809F297C AFA40020 */ sw $a0, 0x0020($sp) -/* 00EA0 809F2980 AFA50024 */ sw $a1, 0x0024($sp) -/* 00EA4 809F2984 C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 -/* 00EA8 809F2988 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00EAC 809F298C AFA50020 */ sw $a1, 0x0020($sp) -/* 00EB0 809F2990 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00EB4 809F2994 0C02927F */ jal SkelAnime_Update - -/* 00EB8 809F2998 E7A4001C */ swc1 $f4, 0x001C($sp) -/* 00EBC 809F299C 8FA50020 */ lw $a1, 0x0020($sp) -/* 00EC0 809F29A0 C7A6001C */ lwc1 $f6, 0x001C($sp) -/* 00EC4 809F29A4 3C0F809F */ lui $t7, %hi(func_809F1C44) ## $t7 = 809F0000 -/* 00EC8 809F29A8 84AE0248 */ lh $t6, 0x0248($a1) ## 00000248 -/* 00ECC 809F29AC 25EF1C44 */ addiu $t7, $t7, %lo(func_809F1C44) ## $t7 = 809F1C44 -/* 00ED0 809F29B0 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 00ED4 809F29B4 00000000 */ nop -/* 00ED8 809F29B8 468042A0 */ cvt.s.w $f10, $f8 -/* 00EDC 809F29BC 4606503E */ c.le.s $f10, $f6 -/* 00EE0 809F29C0 00000000 */ nop -/* 00EE4 809F29C4 45020003 */ bc1fl .L809F29D4 -/* 00EE8 809F29C8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00EEC 809F29CC ACAF022C */ sw $t7, 0x022C($a1) ## 0000022C -/* 00EF0 809F29D0 8FBF0014 */ lw $ra, 0x0014($sp) -.L809F29D4: -/* 00EF4 809F29D4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00EF8 809F29D8 03E00008 */ jr $ra -/* 00EFC 809F29DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F29E0.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F29E0.s deleted file mode 100644 index c029896fa4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F29E0.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_809F29E0 -/* 00F00 809F29E0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00F04 809F29E4 AFB00028 */ sw $s0, 0x0028($sp) -/* 00F08 809F29E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00F0C 809F29EC AFBF002C */ sw $ra, 0x002C($sp) -/* 00F10 809F29F0 3C040600 */ lui $a0, %hi(D_060037C0) ## $a0 = 06000000 -/* 00F14 809F29F4 AFA50034 */ sw $a1, 0x0034($sp) -/* 00F18 809F29F8 0C028800 */ jal Animation_GetLastFrame - -/* 00F1C 809F29FC 248437C0 */ addiu $a0, $a0, %lo(D_060037C0) ## $a0 = 060037C0 -/* 00F20 809F2A00 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00F24 809F2A04 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00F28 809F2A08 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00F2C 809F2A0C 468021A0 */ cvt.s.w $f6, $f4 -/* 00F30 809F2A10 3C050600 */ lui $a1, %hi(D_060037C0) ## $a1 = 06000000 -/* 00F34 809F2A14 24A537C0 */ addiu $a1, $a1, %lo(D_060037C0) ## $a1 = 060037C0 -/* 00F38 809F2A18 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00F3C 809F2A1C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00F40 809F2A20 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00F44 809F2A24 4600320D */ trunc.w.s $f8, $f6 -/* 00F48 809F2A28 440F4000 */ mfc1 $t7, $f8 -/* 00F4C 809F2A2C 00000000 */ nop -/* 00F50 809F2A30 A60F0248 */ sh $t7, 0x0248($s0) ## 00000248 -/* 00F54 809F2A34 86180248 */ lh $t8, 0x0248($s0) ## 00000248 -/* 00F58 809F2A38 AFA00014 */ sw $zero, 0x0014($sp) -/* 00F5C 809F2A3C E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00F60 809F2A40 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 00F64 809F2A44 00000000 */ nop -/* 00F68 809F2A48 46805420 */ cvt.s.w $f16, $f10 -/* 00F6C 809F2A4C 0C029468 */ jal Animation_Change - -/* 00F70 809F2A50 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00F74 809F2A54 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00F78 809F2A58 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00F7C 809F2A5C A619024A */ sh $t9, 0x024A($s0) ## 0000024A -/* 00F80 809F2A60 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 -/* 00F84 809F2A64 8608024A */ lh $t0, 0x024A($s0) ## 0000024A -/* 00F88 809F2A68 3C09809F */ lui $t1, %hi(func_809F2A90) ## $t1 = 809F0000 -/* 00F8C 809F2A6C 25292A90 */ addiu $t1, $t1, %lo(func_809F2A90) ## $t1 = 809F2A90 -/* 00F90 809F2A70 AE09022C */ sw $t1, 0x022C($s0) ## 0000022C -/* 00F94 809F2A74 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 00F98 809F2A78 A208023C */ sb $t0, 0x023C($s0) ## 0000023C -/* 00F9C 809F2A7C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00FA0 809F2A80 8FB00028 */ lw $s0, 0x0028($sp) -/* 00FA4 809F2A84 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00FA8 809F2A88 03E00008 */ jr $ra -/* 00FAC 809F2A8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2A90.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2A90.s deleted file mode 100644 index e6c2b61c2e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2A90.s +++ /dev/null @@ -1,109 +0,0 @@ -.late_rodata -glabel D_809F30F4 - .float 10430.378 - -.text -glabel func_809F2A90 -/* 00FB0 809F2A90 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00FB4 809F2A94 AFB00020 */ sw $s0, 0x0020($sp) -/* 00FB8 809F2A98 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00FBC 809F2A9C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00FC0 809F2AA0 AFA50034 */ sw $a1, 0x0034($sp) -/* 00FC4 809F2AA4 0C02927F */ jal SkelAnime_Update - -/* 00FC8 809F2AA8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00FCC 809F2AAC C6040230 */ lwc1 $f4, 0x0230($s0) ## 00000230 -/* 00FD0 809F2AB0 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 00FD4 809F2AB4 C6080238 */ lwc1 $f8, 0x0238($s0) ## 00000238 -/* 00FD8 809F2AB8 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 00FDC 809F2ABC 46062301 */ sub.s $f12, $f4, $f6 -/* 00FE0 809F2AC0 460A4381 */ sub.s $f14, $f8, $f10 -/* 00FE4 809F2AC4 E7AC002C */ swc1 $f12, 0x002C($sp) -/* 00FE8 809F2AC8 0C03F494 */ jal Math_FAtan2F -/* 00FEC 809F2ACC E7AE0028 */ swc1 $f14, 0x0028($sp) -/* 00FF0 809F2AD0 3C01809F */ lui $at, %hi(D_809F30F4) ## $at = 809F0000 -/* 00FF4 809F2AD4 C43030F4 */ lwc1 $f16, %lo(D_809F30F4)($at) -/* 00FF8 809F2AD8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 00FFC 809F2ADC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01000 809F2AE0 46100482 */ mul.s $f18, $f0, $f16 -/* 01004 809F2AE4 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 -/* 01008 809F2AE8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0100C 809F2AEC 4600910D */ trunc.w.s $f4, $f18 -/* 01010 809F2AF0 44052000 */ mfc1 $a1, $f4 -/* 01014 809F2AF4 00000000 */ nop -/* 01018 809F2AF8 00052C00 */ sll $a1, $a1, 16 -/* 0101C 809F2AFC 0C01E1A7 */ jal Math_SmoothStepToS - -/* 01020 809F2B00 00052C03 */ sra $a1, $a1, 16 -/* 01024 809F2B04 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 -/* 01028 809F2B08 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 0102C 809F2B0C 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 -/* 01030 809F2B10 30580008 */ andi $t8, $v0, 0x0008 ## $t8 = 00000000 -/* 01034 809F2B14 13000009 */ beq $t8, $zero, .L809F2B3C -/* 01038 809F2B18 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 -/* 0103C 809F2B1C 30590001 */ andi $t9, $v0, 0x0001 ## $t9 = 00000000 -/* 01040 809F2B20 13200006 */ beq $t9, $zero, .L809F2B3C -/* 01044 809F2B24 3C014110 */ lui $at, 0x4110 ## $at = 41100000 -/* 01048 809F2B28 44813000 */ mtc1 $at, $f6 ## $f6 = 9.00 -/* 0104C 809F2B2C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 01050 809F2B30 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 -/* 01054 809F2B34 E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 -/* 01058 809F2B38 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -.L809F2B3C: -/* 0105C 809F2B3C 86080242 */ lh $t0, 0x0242($s0) ## 00000242 -/* 01060 809F2B40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01064 809F2B44 2405387F */ addiu $a1, $zero, 0x387F ## $a1 = 0000387F -/* 01068 809F2B48 55000004 */ bnel $t0, $zero, .L809F2B5C -/* 0106C 809F2B4C C7A0002C */ lwc1 $f0, 0x002C($sp) -/* 01070 809F2B50 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01074 809F2B54 A6090242 */ sh $t1, 0x0242($s0) ## 00000242 -/* 01078 809F2B58 C7A0002C */ lwc1 $f0, 0x002C($sp) -.L809F2B5C: -/* 0107C 809F2B5C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 01080 809F2B60 44811000 */ mtc1 $at, $f2 ## $f2 = 5.00 -/* 01084 809F2B64 46000005 */ abs.s $f0, $f0 -/* 01088 809F2B68 4602003C */ c.lt.s $f0, $f2 -/* 0108C 809F2B6C C7A00028 */ lwc1 $f0, 0x0028($sp) -/* 01090 809F2B70 45020021 */ bc1fl .L809F2BF8 -/* 01094 809F2B74 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01098 809F2B78 46000005 */ abs.s $f0, $f0 -/* 0109C 809F2B7C 4602003C */ c.lt.s $f0, $f2 -/* 010A0 809F2B80 00000000 */ nop -/* 010A4 809F2B84 4502001C */ bc1fl .L809F2BF8 -/* 010A8 809F2B88 8FBF0024 */ lw $ra, 0x0024($sp) -/* 010AC 809F2B8C 860A0252 */ lh $t2, 0x0252($s0) ## 00000252 -/* 010B0 809F2B90 C60A0230 */ lwc1 $f10, 0x0230($s0) ## 00000230 -/* 010B4 809F2B94 C6100238 */ lwc1 $f16, 0x0238($s0) ## 00000238 -/* 010B8 809F2B98 E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 -/* 010BC 809F2B9C 1140000F */ beq $t2, $zero, .L809F2BDC -/* 010C0 809F2BA0 E610002C */ swc1 $f16, 0x002C($s0) ## 0000002C -/* 010C4 809F2BA4 8E020258 */ lw $v0, 0x0258($s0) ## 00000258 -/* 010C8 809F2BA8 8C4B0130 */ lw $t3, 0x0130($v0) ## 00000130 -/* 010CC 809F2BAC 5160000C */ beql $t3, $zero, .L809F2BE0 -/* 010D0 809F2BB0 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 010D4 809F2BB4 844C0158 */ lh $t4, 0x0158($v0) ## 00000158 -/* 010D8 809F2BB8 240D0004 */ addiu $t5, $zero, 0x0004 ## $t5 = 00000004 -/* 010DC 809F2BBC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 010E0 809F2BC0 55800007 */ bnel $t4, $zero, .L809F2BE0 -/* 010E4 809F2BC4 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 010E8 809F2BC8 A44D0158 */ sh $t5, 0x0158($v0) ## 00000158 -/* 010EC 809F2BCC 8E0F0258 */ lw $t7, 0x0258($s0) ## 00000258 -/* 010F0 809F2BD0 2404081A */ addiu $a0, $zero, 0x081A ## $a0 = 0000081A -/* 010F4 809F2BD4 0C03E803 */ jal Audio_SetBGM - -/* 010F8 809F2BD8 A5EE015A */ sh $t6, 0x015A($t7) ## 0000015A -.L809F2BDC: -/* 010FC 809F2BDC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -.L809F2BE0: -/* 01100 809F2BE0 3C18809F */ lui $t8, %hi(func_809F2254) ## $t8 = 809F0000 -/* 01104 809F2BE4 27182254 */ addiu $t8, $t8, %lo(func_809F2254) ## $t8 = 809F2254 -/* 01108 809F2BE8 A200023C */ sb $zero, 0x023C($s0) ## 0000023C -/* 0110C 809F2BEC AE18022C */ sw $t8, 0x022C($s0) ## 0000022C -/* 01110 809F2BF0 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 -/* 01114 809F2BF4 8FBF0024 */ lw $ra, 0x0024($sp) -.L809F2BF8: -/* 01118 809F2BF8 8FB00020 */ lw $s0, 0x0020($sp) -/* 0111C 809F2BFC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01120 809F2C00 03E00008 */ jr $ra -/* 01124 809F2C04 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Destroy.s deleted file mode 100644 index 7cdd4e075b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Destroy.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel EnDntNomal_Destroy -/* 00178 809F3438 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0017C 809F343C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00180 809F3440 848E026A */ lh $t6, 0x026A($a0) ## 0000026A -/* 00184 809F3444 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00188 809F3448 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 0018C 809F344C 15C00006 */ bne $t6, $zero, .L809F3468 -/* 00190 809F3450 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00194 809F3454 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00198 809F3458 0C017418 */ jal Collider_DestroyQuad -/* 0019C 809F345C 24C50294 */ addiu $a1, $a2, 0x0294 ## $a1 = 00000294 -/* 001A0 809F3460 10000004 */ beq $zero, $zero, .L809F3474 -/* 001A4 809F3464 8FBF0014 */ lw $ra, 0x0014($sp) -.L809F3468: -/* 001A8 809F3468 0C0170EB */ jal Collider_DestroyCylinder - -/* 001AC 809F346C 24C50314 */ addiu $a1, $a2, 0x0314 ## $a1 = 00000314 -/* 001B0 809F3470 8FBF0014 */ lw $ra, 0x0014($sp) -.L809F3474: -/* 001B4 809F3474 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001B8 809F3478 03E00008 */ jr $ra -/* 001BC 809F347C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Init.s deleted file mode 100644 index db5571f979..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Init.s +++ /dev/null @@ -1,138 +0,0 @@ -.rdata -glabel D_809F5EB0 - .asciz "\n\n" - .balign 4 - -glabel D_809F5EB4 - .asciz "\x1b[32m☆☆☆☆☆ デグナッツ的当て ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -glabel D_809F5EE8 - .asciz "\n\n" - .balign 4 - -glabel D_809F5EEC - .asciz "\x1b[32m☆☆☆☆☆ デグナッツお面品評会一般人 ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -glabel D_809F5F28 - .asciz "\x1b[35m なにみの？ %d\n\x1b[m\n" - .balign 4 - -glabel D_809F5F44 - .asciz "\x1b[36m バンクおかしいしぞ！%d\n\x1b[m\n" - .balign 4 - -.text -glabel EnDntNomal_Init -/* 00000 809F32C0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00004 809F32C4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00008 809F32C8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0000C 809F32CC AFA50034 */ sw $a1, 0x0034($sp) -/* 00010 809F32D0 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 00014 809F32D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00018 809F32D8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 0001C 809F32DC A48E026A */ sh $t6, 0x026A($a0) ## 0000026A -/* 00020 809F32E0 8482026A */ lh $v0, 0x026A($a0) ## 0000026A -/* 00024 809F32E4 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 00028 809F32E8 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 0002C 809F32EC 04430004 */ bgezl $v0, .L809F3300 -/* 00030 809F32F0 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 -/* 00034 809F32F4 A480026A */ sh $zero, 0x026A($a0) ## 0000026A -/* 00038 809F32F8 8482026A */ lh $v0, 0x026A($a0) ## 0000026A -/* 0003C 809F32FC 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 -.L809F3300: -/* 00040 809F3300 A21900AE */ sb $t9, 0x00AE($s0) ## 000000AE -/* 00044 809F3304 A6080266 */ sh $t0, 0x0266($s0) ## 00000266 -/* 00048 809F3308 01E1C024 */ and $t8, $t7, $at -/* 0004C 809F330C 14400017 */ bne $v0, $zero, .L809F336C -/* 00050 809F3310 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 -/* 00054 809F3314 3C04809F */ lui $a0, %hi(D_809F5EB0) ## $a0 = 809F0000 -/* 00058 809F3318 0C00084C */ jal osSyncPrintf - -/* 0005C 809F331C 24845EB0 */ addiu $a0, $a0, %lo(D_809F5EB0) ## $a0 = 809F5EB0 -/* 00060 809F3320 3C04809F */ lui $a0, %hi(D_809F5EB4) ## $a0 = 809F0000 -/* 00064 809F3324 0C00084C */ jal osSyncPrintf - -/* 00068 809F3328 24845EB4 */ addiu $a0, $a0, %lo(D_809F5EB4) ## $a0 = 809F5EB4 -/* 0006C 809F332C 26050294 */ addiu $a1, $s0, 0x0294 ## $a1 = 00000294 -/* 00070 809F3330 AFA50020 */ sw $a1, 0x0020($sp) -/* 00074 809F3334 0C017406 */ jal Collider_InitQuad -/* 00078 809F3338 8FA40034 */ lw $a0, 0x0034($sp) -/* 0007C 809F333C 3C07809F */ lui $a3, %hi(D_809F5DFC) ## $a3 = 809F0000 -/* 00080 809F3340 8FA50020 */ lw $a1, 0x0020($sp) -/* 00084 809F3344 24E75DFC */ addiu $a3, $a3, %lo(D_809F5DFC) ## $a3 = 809F5DFC -/* 00088 809F3348 8FA40034 */ lw $a0, 0x0034($sp) -/* 0008C 809F334C 0C017441 */ jal Collider_SetQuad -/* 00090 809F3350 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00094 809F3354 8603008A */ lh $v1, 0x008A($s0) ## 0000008A -/* 00098 809F3358 24090164 */ addiu $t1, $zero, 0x0164 ## $t1 = 00000164 -/* 0009C 809F335C A6090266 */ sh $t1, 0x0266($s0) ## 00000266 -/* 000A0 809F3360 A60300B6 */ sh $v1, 0x00B6($s0) ## 000000B6 -/* 000A4 809F3364 10000013 */ beq $zero, $zero, .L809F33B4 -/* 000A8 809F3368 A6030032 */ sh $v1, 0x0032($s0) ## 00000032 -.L809F336C: -/* 000AC 809F336C 3C04809F */ lui $a0, %hi(D_809F5EE8) ## $a0 = 809F0000 -/* 000B0 809F3370 0C00084C */ jal osSyncPrintf - -/* 000B4 809F3374 24845EE8 */ addiu $a0, $a0, %lo(D_809F5EE8) ## $a0 = 809F5EE8 -/* 000B8 809F3378 3C04809F */ lui $a0, %hi(D_809F5EEC) ## $a0 = 809F0000 -/* 000BC 809F337C 0C00084C */ jal osSyncPrintf - -/* 000C0 809F3380 24845EEC */ addiu $a0, $a0, %lo(D_809F5EEC) ## $a0 = 809F5EEC -/* 000C4 809F3384 26050314 */ addiu $a1, $s0, 0x0314 ## $a1 = 00000314 -/* 000C8 809F3388 AFA50020 */ sw $a1, 0x0020($sp) -/* 000CC 809F338C 0C0170D9 */ jal Collider_InitCylinder - -/* 000D0 809F3390 8FA40034 */ lw $a0, 0x0034($sp) -/* 000D4 809F3394 3C07809F */ lui $a3, %hi(D_809F5DD0) ## $a3 = 809F0000 -/* 000D8 809F3398 8FA50020 */ lw $a1, 0x0020($sp) -/* 000DC 809F339C 24E75DD0 */ addiu $a3, $a3, %lo(D_809F5DD0) ## $a3 = 809F5DD0 -/* 000E0 809F33A0 8FA40034 */ lw $a0, 0x0034($sp) -/* 000E4 809F33A4 0C01712B */ jal Collider_SetCylinder - -/* 000E8 809F33A8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 000EC 809F33AC 240A0172 */ addiu $t2, $zero, 0x0172 ## $t2 = 00000172 -/* 000F0 809F33B0 A60A0266 */ sh $t2, 0x0266($s0) ## 00000266 -.L809F33B4: -/* 000F4 809F33B4 86050266 */ lh $a1, 0x0266($s0) ## 00000266 -/* 000F8 809F33B8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 000FC 809F33BC 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00100 809F33C0 04A00013 */ bltz $a1, .L809F3410 -/* 00104 809F33C4 8FA40034 */ lw $a0, 0x0034($sp) -/* 00108 809F33C8 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 0010C 809F33CC 00812021 */ addu $a0, $a0, $at -/* 00110 809F33D0 A2020279 */ sb $v0, 0x0279($s0) ## 00000279 -/* 00114 809F33D4 820B0279 */ lb $t3, 0x0279($s0) ## 00000279 -/* 00118 809F33D8 0561000F */ bgez $t3, .L809F3418 -/* 0011C 809F33DC 00000000 */ nop -/* 00120 809F33E0 0C00B55C */ jal Actor_Kill - -/* 00124 809F33E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00128 809F33E8 3C04809F */ lui $a0, %hi(D_809F5F28) ## $a0 = 809F0000 -/* 0012C 809F33EC 24845F28 */ addiu $a0, $a0, %lo(D_809F5F28) ## $a0 = 809F5F28 -/* 00130 809F33F0 0C00084C */ jal osSyncPrintf - -/* 00134 809F33F4 82050279 */ lb $a1, 0x0279($s0) ## 00000279 -/* 00138 809F33F8 3C04809F */ lui $a0, %hi(D_809F5F44) ## $a0 = 809F0000 -/* 0013C 809F33FC 24845F44 */ addiu $a0, $a0, %lo(D_809F5F44) ## $a0 = 809F5F44 -/* 00140 809F3400 0C00084C */ jal osSyncPrintf - -/* 00144 809F3404 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00148 809F3408 10000007 */ beq $zero, $zero, .L809F3428 -/* 0014C 809F340C 8FBF001C */ lw $ra, 0x001C($sp) -.L809F3410: -/* 00150 809F3410 0C00B55C */ jal Actor_Kill - -/* 00154 809F3414 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L809F3418: -/* 00158 809F3418 3C0C809F */ lui $t4, %hi(func_809F3480) ## $t4 = 809F0000 -/* 0015C 809F341C 258C3480 */ addiu $t4, $t4, %lo(func_809F3480) ## $t4 = 809F3480 -/* 00160 809F3420 AE0C0214 */ sw $t4, 0x0214($s0) ## 00000214 -/* 00164 809F3424 8FBF001C */ lw $ra, 0x001C($sp) -.L809F3428: -/* 00168 809F3428 8FB00018 */ lw $s0, 0x0018($sp) -/* 0016C 809F342C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00170 809F3430 03E00008 */ jr $ra -/* 00174 809F3434 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Update.s deleted file mode 100644 index c4e3280982..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Update.s +++ /dev/null @@ -1,217 +0,0 @@ -.late_rodata -glabel jtbl_809F606C -.word L809F57B0 -.word L809F56EC -.word L809F5714 -.word L809F576C -.word L809F5784 -.word L809F5794 -.word L809F57A4 - -.text -glabel EnDntNomal_Update -/* 02360 809F5620 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 02364 809F5624 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02368 809F5628 AFB00020 */ sw $s0, 0x0020($sp) -/* 0236C 809F562C AFA5003C */ sw $a1, 0x003C($sp) -/* 02370 809F5630 84820258 */ lh $v0, 0x0258($a0) ## 00000258 -/* 02374 809F5634 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02378 809F5638 3C0B809F */ lui $t3, %hi(func_809F49A4) ## $t3 = 809F0000 -/* 0237C 809F563C 10400002 */ beq $v0, $zero, .L809F5648 -/* 02380 809F5640 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 02384 809F5644 A60E0258 */ sh $t6, 0x0258($s0) ## 00000258 -.L809F5648: -/* 02388 809F5648 8602025A */ lh $v0, 0x025A($s0) ## 0000025A -/* 0238C 809F564C 10400002 */ beq $v0, $zero, .L809F5658 -/* 02390 809F5650 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 02394 809F5654 A60F025A */ sh $t7, 0x025A($s0) ## 0000025A -.L809F5658: -/* 02398 809F5658 86020264 */ lh $v0, 0x0264($s0) ## 00000264 -/* 0239C 809F565C 10400002 */ beq $v0, $zero, .L809F5668 -/* 023A0 809F5660 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 023A4 809F5664 A6180264 */ sh $t8, 0x0264($s0) ## 00000264 -.L809F5668: -/* 023A8 809F5668 8602025C */ lh $v0, 0x025C($s0) ## 0000025C -/* 023AC 809F566C 10400002 */ beq $v0, $zero, .L809F5678 -/* 023B0 809F5670 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF -/* 023B4 809F5674 A619025C */ sh $t9, 0x025C($s0) ## 0000025C -.L809F5678: -/* 023B8 809F5678 8602025E */ lh $v0, 0x025E($s0) ## 0000025E -/* 023BC 809F567C 10400002 */ beq $v0, $zero, .L809F5688 -/* 023C0 809F5680 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF -/* 023C4 809F5684 A608025E */ sh $t0, 0x025E($s0) ## 0000025E -.L809F5688: -/* 023C8 809F5688 86020260 */ lh $v0, 0x0260($s0) ## 00000260 -/* 023CC 809F568C 10400002 */ beq $v0, $zero, .L809F5698 -/* 023D0 809F5690 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = FFFFFFFF -/* 023D4 809F5694 A6090260 */ sh $t1, 0x0260($s0) ## 00000260 -.L809F5698: -/* 023D8 809F5698 8E0C0214 */ lw $t4, 0x0214($s0) ## 00000214 -/* 023DC 809F569C 860A00B4 */ lh $t2, 0x00B4($s0) ## 000000B4 -/* 023E0 809F56A0 256B49A4 */ addiu $t3, $t3, %lo(func_809F49A4) ## $t3 = 809F49A4 -/* 023E4 809F56A4 116C0003 */ beq $t3, $t4, .L809F56B4 -/* 023E8 809F56A8 A60A0030 */ sh $t2, 0x0030($s0) ## 00000030 -/* 023EC 809F56AC 860D00B6 */ lh $t5, 0x00B6($s0) ## 000000B6 -/* 023F0 809F56B0 A60D0032 */ sh $t5, 0x0032($s0) ## 00000032 -.L809F56B4: -/* 023F4 809F56B4 860E0262 */ lh $t6, 0x0262($s0) ## 00000262 -/* 023F8 809F56B8 8618026A */ lh $t8, 0x026A($s0) ## 0000026A -/* 023FC 809F56BC 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 02400 809F56C0 1300003B */ beq $t8, $zero, .L809F57B0 -/* 02404 809F56C4 A60F0262 */ sh $t7, 0x0262($s0) ## 00000262 -/* 02408 809F56C8 96190270 */ lhu $t9, 0x0270($s0) ## 00000270 -/* 0240C 809F56CC 2F210007 */ sltiu $at, $t9, 0x0007 -/* 02410 809F56D0 10200037 */ beq $at, $zero, .L809F57B0 -/* 02414 809F56D4 0019C880 */ sll $t9, $t9, 2 -/* 02418 809F56D8 3C01809F */ lui $at, %hi(jtbl_809F606C) ## $at = 809F0000 -/* 0241C 809F56DC 00390821 */ addu $at, $at, $t9 -/* 02420 809F56E0 8C39606C */ lw $t9, %lo(jtbl_809F606C)($at) -/* 02424 809F56E4 03200008 */ jr $t9 -/* 02428 809F56E8 00000000 */ nop -glabel L809F56EC -/* 0242C 809F56EC 92080278 */ lbu $t0, 0x0278($s0) ## 00000278 -/* 02430 809F56F0 3C0A809F */ lui $t2, %hi(func_809F44FC) ## $t2 = 809F0000 -/* 02434 809F56F4 3C09809F */ lui $t1, %hi(func_809F43F0) ## $t1 = 809F0000 -/* 02438 809F56F8 15000004 */ bne $t0, $zero, .L809F570C -/* 0243C 809F56FC 254A44FC */ addiu $t2, $t2, %lo(func_809F44FC) ## $t2 = 809F44FC -/* 02440 809F5700 252943F0 */ addiu $t1, $t1, %lo(func_809F43F0) ## $t1 = 809F43F0 -/* 02444 809F5704 1000002A */ beq $zero, $zero, .L809F57B0 -/* 02448 809F5708 AE090214 */ sw $t1, 0x0214($s0) ## 00000214 -.L809F570C: -/* 0244C 809F570C 10000028 */ beq $zero, $zero, .L809F57B0 -/* 02450 809F5710 AE0A0214 */ sw $t2, 0x0214($s0) ## 00000214 -glabel L809F5714 -/* 02454 809F5714 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 02458 809F5718 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 -/* 0245C 809F571C A6000274 */ sh $zero, 0x0274($s0) ## 00000274 -/* 02460 809F5720 0C00CFBE */ jal Rand_ZeroFloat - -/* 02464 809F5724 A20000AE */ sb $zero, 0x00AE($s0) ## 000000AE -/* 02468 809F5728 860B026A */ lh $t3, 0x026A($s0) ## 0000026A -/* 0246C 809F572C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 02470 809F5730 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 02474 809F5734 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 -/* 02478 809F5738 4600048D */ trunc.w.s $f18, $f0 -/* 0247C 809F573C 3C0B809F */ lui $t3, %hi(func_809F4730) ## $t3 = 809F0000 -/* 02480 809F5740 256B4730 */ addiu $t3, $t3, %lo(func_809F4730) ## $t3 = 809F4730 -/* 02484 809F5744 468021A0 */ cvt.s.w $f6, $f4 -/* 02488 809F5748 44099000 */ mfc1 $t1, $f18 -/* 0248C 809F574C AE0B0214 */ sw $t3, 0x0214($s0) ## 00000214 -/* 02490 809F5750 46083282 */ mul.s $f10, $f6, $f8 -/* 02494 809F5754 4600540D */ trunc.w.s $f16, $f10 -/* 02498 809F5758 440F8000 */ mfc1 $t7, $f16 -/* 0249C 809F575C 00000000 */ nop -/* 024A0 809F5760 012F5021 */ addu $t2, $t1, $t7 -/* 024A4 809F5764 10000012 */ beq $zero, $zero, .L809F57B0 -/* 024A8 809F5768 A60A0264 */ sh $t2, 0x0264($s0) ## 00000264 -glabel L809F576C -/* 024AC 809F576C 3C0D809F */ lui $t5, %hi(func_809F4730) ## $t5 = 809F0000 -/* 024B0 809F5770 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 024B4 809F5774 25AD4730 */ addiu $t5, $t5, %lo(func_809F4730) ## $t5 = 809F4730 -/* 024B8 809F5778 A60C0274 */ sh $t4, 0x0274($s0) ## 00000274 -/* 024BC 809F577C 1000000C */ beq $zero, $zero, .L809F57B0 -/* 024C0 809F5780 AE0D0214 */ sw $t5, 0x0214($s0) ## 00000214 -glabel L809F5784 -/* 024C4 809F5784 3C0E809F */ lui $t6, %hi(func_809F4E18) ## $t6 = 809F0000 -/* 024C8 809F5788 25CE4E18 */ addiu $t6, $t6, %lo(func_809F4E18) ## $t6 = 809F4E18 -/* 024CC 809F578C 10000008 */ beq $zero, $zero, .L809F57B0 -/* 024D0 809F5790 AE0E0214 */ sw $t6, 0x0214($s0) ## 00000214 -glabel L809F5794 -/* 024D4 809F5794 3C18809F */ lui $t8, %hi(func_809F5478) ## $t8 = 809F0000 -/* 024D8 809F5798 27185478 */ addiu $t8, $t8, %lo(func_809F5478) ## $t8 = 809F5478 -/* 024DC 809F579C 10000004 */ beq $zero, $zero, .L809F57B0 -/* 024E0 809F57A0 AE180214 */ sw $t8, 0x0214($s0) ## 00000214 -glabel L809F57A4 -/* 024E4 809F57A4 3C19809F */ lui $t9, %hi(func_809F4BA4) ## $t9 = 809F0000 -/* 024E8 809F57A8 27394BA4 */ addiu $t9, $t9, %lo(func_809F4BA4) ## $t9 = 809F4BA4 -/* 024EC 809F57AC AE190214 */ sw $t9, 0x0214($s0) ## 00000214 -glabel L809F57B0 -.L809F57B0: -/* 024F0 809F57B0 86080270 */ lh $t0, 0x0270($s0) ## 00000270 -/* 024F4 809F57B4 51000003 */ beql $t0, $zero, .L809F57C4 -/* 024F8 809F57B8 86090260 */ lh $t1, 0x0260($s0) ## 00000260 -/* 024FC 809F57BC A6000270 */ sh $zero, 0x0270($s0) ## 00000270 -/* 02500 809F57C0 86090260 */ lh $t1, 0x0260($s0) ## 00000260 -.L809F57C4: -/* 02504 809F57C4 55200011 */ bnel $t1, $zero, .L809F580C -/* 02508 809F57C8 8E190214 */ lw $t9, 0x0214($s0) ## 00000214 -/* 0250C 809F57CC 860F0268 */ lh $t7, 0x0268($s0) ## 00000268 -/* 02510 809F57D0 25EA0001 */ addiu $t2, $t7, 0x0001 ## $t2 = 00000001 -/* 02514 809F57D4 A60A0268 */ sh $t2, 0x0268($s0) ## 00000268 -/* 02518 809F57D8 860B0268 */ lh $t3, 0x0268($s0) ## 00000268 -/* 0251C 809F57DC 29610003 */ slti $at, $t3, 0x0003 -/* 02520 809F57E0 14200009 */ bne $at, $zero, .L809F5808 -/* 02524 809F57E4 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 02528 809F57E8 44816000 */ mtc1 $at, $f12 ## $f12 = 60.00 -/* 0252C 809F57EC 0C00CFBE */ jal Rand_ZeroFloat - -/* 02530 809F57F0 A6000268 */ sh $zero, 0x0268($s0) ## 00000268 -/* 02534 809F57F4 4600010D */ trunc.w.s $f4, $f0 -/* 02538 809F57F8 44182000 */ mfc1 $t8, $f4 -/* 0253C 809F57FC 00000000 */ nop -/* 02540 809F5800 27190014 */ addiu $t9, $t8, 0x0014 ## $t9 = 00000014 -/* 02544 809F5804 A6190260 */ sh $t9, 0x0260($s0) ## 00000260 -.L809F5808: -/* 02548 809F5808 8E190214 */ lw $t9, 0x0214($s0) ## 00000214 -.L809F580C: -/* 0254C 809F580C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02550 809F5810 8FA5003C */ lw $a1, 0x003C($sp) -/* 02554 809F5814 0320F809 */ jalr $ra, $t9 -/* 02558 809F5818 00000000 */ nop -/* 0255C 809F581C 0C00B638 */ jal Actor_MoveForward - -/* 02560 809F5820 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02564 809F5824 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 02568 809F5828 44810000 */ mtc1 $at, $f0 ## $f0 = 20.00 -/* 0256C 809F582C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 02570 809F5830 44813000 */ mtc1 $at, $f6 ## $f6 = 60.00 -/* 02574 809F5834 2408001D */ addiu $t0, $zero, 0x001D ## $t0 = 0000001D -/* 02578 809F5838 44060000 */ mfc1 $a2, $f0 -/* 0257C 809F583C 44070000 */ mfc1 $a3, $f0 -/* 02580 809F5840 AFA80014 */ sw $t0, 0x0014($sp) -/* 02584 809F5844 8FA4003C */ lw $a0, 0x003C($sp) -/* 02588 809F5848 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0258C 809F584C 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 02590 809F5850 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 02594 809F5854 8609026A */ lh $t1, 0x026A($s0) ## 0000026A -/* 02598 809F5858 26060314 */ addiu $a2, $s0, 0x0314 ## $a2 = 00000314 -/* 0259C 809F585C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000314 -/* 025A0 809F5860 15200011 */ bne $t1, $zero, .L809F58A8 -/* 025A4 809F5864 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025A8 809F5868 26040294 */ addiu $a0, $s0, 0x0294 ## $a0 = 00000294 -/* 025AC 809F586C 260F024C */ addiu $t7, $s0, 0x024C ## $t7 = 0000024C -/* 025B0 809F5870 AFAF0010 */ sw $t7, 0x0010($sp) -/* 025B4 809F5874 AFA4002C */ sw $a0, 0x002C($sp) -/* 025B8 809F5878 26050228 */ addiu $a1, $s0, 0x0228 ## $a1 = 00000228 -/* 025BC 809F587C 26060234 */ addiu $a2, $s0, 0x0234 ## $a2 = 00000234 -/* 025C0 809F5880 0C0189CD */ jal Collider_SetQuadVertices -/* 025C4 809F5884 26070240 */ addiu $a3, $s0, 0x0240 ## $a3 = 00000240 -/* 025C8 809F5888 8FA4003C */ lw $a0, 0x003C($sp) -/* 025CC 809F588C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 025D0 809F5890 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 025D4 809F5894 8FA6002C */ lw $a2, 0x002C($sp) -/* 025D8 809F5898 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 025DC 809F589C 00812821 */ addu $a1, $a0, $at -/* 025E0 809F58A0 1000000C */ beq $zero, $zero, .L809F58D4 -/* 025E4 809F58A4 8FBF0024 */ lw $ra, 0x0024($sp) -.L809F58A8: -/* 025E8 809F58A8 0C0189B7 */ jal Collider_UpdateCylinder - -/* 025EC 809F58AC AFA6002C */ sw $a2, 0x002C($sp) -/* 025F0 809F58B0 920B0218 */ lbu $t3, 0x0218($s0) ## 00000218 -/* 025F4 809F58B4 8FA6002C */ lw $a2, 0x002C($sp) -/* 025F8 809F58B8 8FA4003C */ lw $a0, 0x003C($sp) -/* 025FC 809F58BC 11600004 */ beq $t3, $zero, .L809F58D0 -/* 02600 809F58C0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02604 809F58C4 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 02608 809F58C8 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 0260C 809F58CC 00812821 */ addu $a1, $a0, $at -.L809F58D0: -/* 02610 809F58D0 8FBF0024 */ lw $ra, 0x0024($sp) -.L809F58D4: -/* 02614 809F58D4 8FB00020 */ lw $s0, 0x0020($sp) -/* 02618 809F58D8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0261C 809F58DC 03E00008 */ jr $ra -/* 02620 809F58E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3480.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3480.s deleted file mode 100644 index ffa021d6dc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3480.s +++ /dev/null @@ -1,92 +0,0 @@ -glabel func_809F3480 -/* 001C0 809F3480 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 001C4 809F3484 AFB00028 */ sw $s0, 0x0028($sp) -/* 001C8 809F3488 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 001CC 809F348C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 001D0 809F3490 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 001D4 809F3494 AFBF002C */ sw $ra, 0x002C($sp) -/* 001D8 809F3498 AFA50034 */ sw $a1, 0x0034($sp) -/* 001DC 809F349C 00A12021 */ addu $a0, $a1, $at -/* 001E0 809F34A0 0C026062 */ jal Object_IsLoaded - -/* 001E4 809F34A4 82050279 */ lb $a1, 0x0279($s0) ## 00000279 -/* 001E8 809F34A8 10400043 */ beq $v0, $zero, .L809F35B8 -/* 001EC 809F34AC 8FAE0034 */ lw $t6, 0x0034($sp) -/* 001F0 809F34B0 820F0279 */ lb $t7, 0x0279($s0) ## 00000279 -/* 001F4 809F34B4 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 -/* 001F8 809F34B8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 001FC 809F34BC 000FC100 */ sll $t8, $t7, 4 -/* 00200 809F34C0 030FC021 */ addu $t8, $t8, $t7 -/* 00204 809F34C4 0018C080 */ sll $t8, $t8, 2 -/* 00208 809F34C8 01D8C821 */ addu $t9, $t6, $t8 -/* 0020C 809F34CC 01194021 */ addu $t0, $t0, $t9 -/* 00210 809F34D0 8D0817B4 */ lw $t0, 0x17B4($t0) ## 000117B4 -/* 00214 809F34D4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00218 809F34D8 3C068003 */ lui $a2, %hi(ActorShadow_DrawCircle) -/* 0021C 809F34DC 01014821 */ addu $t1, $t0, $at -/* 00220 809F34E0 3C018016 */ lui $at, %hi(gSegments+0x18) -/* 00224 809F34E4 AC296FC0 */ sw $t1, %lo(gSegments+0x18)($at) -/* 00228 809F34E8 820A0279 */ lb $t2, 0x0279($s0) ## 00000279 -/* 0022C 809F34EC 44050000 */ mfc1 $a1, $f0 -/* 00230 809F34F0 44070000 */ mfc1 $a3, $f0 -/* 00234 809F34F4 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawCircle) -/* 00238 809F34F8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 0023C 809F34FC 0C00AC78 */ jal ActorShape_Init - -/* 00240 809F3500 A20A001E */ sb $t2, 0x001E($s0) ## 0000001E -/* 00244 809F3504 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 -/* 00248 809F3508 44812000 */ mtc1 $at, $f4 ## $f4 = -2.00 -/* 0024C 809F350C 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 00250 809F3510 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 00254 809F3514 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00258 809F3518 0C00B58B */ jal Actor_SetScale - -/* 0025C 809F351C E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 00260 809F3520 860B026A */ lh $t3, 0x026A($s0) ## 0000026A -/* 00264 809F3524 8FA40034 */ lw $a0, 0x0034($sp) -/* 00268 809F3528 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 0026C 809F352C 15600012 */ bne $t3, $zero, .L809F3578 -/* 00270 809F3530 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00274 809F3534 3C060600 */ lui $a2, %hi(D_060023B8) ## $a2 = 06000000 -/* 00278 809F3538 3C070600 */ lui $a3, %hi(D_060024CC) ## $a3 = 06000000 -/* 0027C 809F353C 260C0190 */ addiu $t4, $s0, 0x0190 ## $t4 = 00000190 -/* 00280 809F3540 260D01D2 */ addiu $t5, $s0, 0x01D2 ## $t5 = 000001D2 -/* 00284 809F3544 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A -/* 00288 809F3548 AFAF0018 */ sw $t7, 0x0018($sp) -/* 0028C 809F354C AFAD0014 */ sw $t5, 0x0014($sp) -/* 00290 809F3550 AFAC0010 */ sw $t4, 0x0010($sp) -/* 00294 809F3554 24E724CC */ addiu $a3, $a3, %lo(D_060024CC) ## $a3 = 060024CC -/* 00298 809F3558 24C623B8 */ addiu $a2, $a2, %lo(D_060023B8) ## $a2 = 060023B8 -/* 0029C 809F355C 8FA40034 */ lw $a0, 0x0034($sp) -/* 002A0 809F3560 0C02915F */ jal SkelAnime_Init - -/* 002A4 809F3564 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 002A8 809F3568 3C0E809F */ lui $t6, %hi(func_809F5C98) ## $t6 = 809F0000 -/* 002AC 809F356C 25CE5C98 */ addiu $t6, $t6, %lo(func_809F5C98) ## $t6 = 809F5C98 -/* 002B0 809F3570 1000000E */ beq $zero, $zero, .L809F35AC -/* 002B4 809F3574 AE0E0134 */ sw $t6, 0x0134($s0) ## 00000134 -.L809F3578: -/* 002B8 809F3578 3C070600 */ lui $a3, %hi(D_06000430) ## $a3 = 06000000 -/* 002BC 809F357C 26180190 */ addiu $t8, $s0, 0x0190 ## $t8 = 00000190 -/* 002C0 809F3580 261901D2 */ addiu $t9, $s0, 0x01D2 ## $t9 = 000001D2 -/* 002C4 809F3584 2408000B */ addiu $t0, $zero, 0x000B ## $t0 = 0000000B -/* 002C8 809F3588 AFA80018 */ sw $t0, 0x0018($sp) -/* 002CC 809F358C AFB90014 */ sw $t9, 0x0014($sp) -/* 002D0 809F3590 AFB80010 */ sw $t8, 0x0010($sp) -/* 002D4 809F3594 24E70430 */ addiu $a3, $a3, %lo(D_06000430) ## $a3 = 06000430 -/* 002D8 809F3598 0C02915F */ jal SkelAnime_Init - -/* 002DC 809F359C 24C62AF0 */ addiu $a2, $a2, 0x2AF0 ## $a2 = 00002AF0 -/* 002E0 809F35A0 3C09809F */ lui $t1, %hi(func_809F5A6C) ## $t1 = 809F0000 -/* 002E4 809F35A4 25295A6C */ addiu $t1, $t1, %lo(func_809F5A6C) ## $t1 = 809F5A6C -/* 002E8 809F35A8 AE090134 */ sw $t1, 0x0134($s0) ## 00000134 -.L809F35AC: -/* 002EC 809F35AC 3C0A809F */ lui $t2, %hi(func_809F35CC) ## $t2 = 809F0000 -/* 002F0 809F35B0 254A35CC */ addiu $t2, $t2, %lo(func_809F35CC) ## $t2 = 809F35CC -/* 002F4 809F35B4 AE0A0214 */ sw $t2, 0x0214($s0) ## 00000214 -.L809F35B8: -/* 002F8 809F35B8 8FBF002C */ lw $ra, 0x002C($sp) -/* 002FC 809F35BC 8FB00028 */ lw $s0, 0x0028($sp) -/* 00300 809F35C0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00304 809F35C4 03E00008 */ jr $ra -/* 00308 809F35C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F35CC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F35CC.s deleted file mode 100644 index 6d10412201..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F35CC.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_809F35CC -/* 0030C 809F35CC AFA50004 */ sw $a1, 0x0004($sp) -/* 00310 809F35D0 948E0088 */ lhu $t6, 0x0088($a0) ## 00000088 -/* 00314 809F35D4 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 00318 809F35D8 11E00010 */ beq $t7, $zero, .L809F361C -/* 0031C 809F35DC 00000000 */ nop -/* 00320 809F35E0 8C990024 */ lw $t9, 0x0024($a0) ## 00000024 -/* 00324 809F35E4 8488026A */ lh $t0, 0x026A($a0) ## 0000026A -/* 00328 809F35E8 8C980028 */ lw $t8, 0x0028($a0) ## 00000028 -/* 0032C 809F35EC AC99021C */ sw $t9, 0x021C($a0) ## 0000021C -/* 00330 809F35F0 8C99002C */ lw $t9, 0x002C($a0) ## 0000002C -/* 00334 809F35F4 AC980220 */ sw $t8, 0x0220($a0) ## 00000220 -/* 00338 809F35F8 15000005 */ bne $t0, $zero, .L809F3610 -/* 0033C 809F35FC AC990224 */ sw $t9, 0x0224($a0) ## 00000224 -/* 00340 809F3600 3C09809F */ lui $t1, %hi(func_809F3624) ## $t1 = 809F0000 -/* 00344 809F3604 25293624 */ addiu $t1, $t1, %lo(func_809F3624) ## $t1 = 809F3624 -/* 00348 809F3608 03E00008 */ jr $ra -/* 0034C 809F360C AC890214 */ sw $t1, 0x0214($a0) ## 00000214 -.L809F3610: -/* 00350 809F3610 3C0A809F */ lui $t2, %hi(func_809F4310) ## $t2 = 809F0000 -/* 00354 809F3614 254A4310 */ addiu $t2, $t2, %lo(func_809F4310) ## $t2 = 809F4310 -/* 00358 809F3618 AC8A0214 */ sw $t2, 0x0214($a0) ## 00000214 -.L809F361C: -/* 0035C 809F361C 03E00008 */ jr $ra -/* 00360 809F3620 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3624.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3624.s deleted file mode 100644 index 4a61c3fad2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3624.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_809F3624 -/* 00364 809F3624 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00368 809F3628 AFB00028 */ sw $s0, 0x0028($sp) -/* 0036C 809F362C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00370 809F3630 AFBF002C */ sw $ra, 0x002C($sp) -/* 00374 809F3634 3C040600 */ lui $a0, %hi(D_060024CC) ## $a0 = 06000000 -/* 00378 809F3638 AFA50034 */ sw $a1, 0x0034($sp) -/* 0037C 809F363C 0C028800 */ jal Animation_GetLastFrame - -/* 00380 809F3640 248424CC */ addiu $a0, $a0, %lo(D_060024CC) ## $a0 = 060024CC -/* 00384 809F3644 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00388 809F3648 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0038C 809F364C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00390 809F3650 468021A0 */ cvt.s.w $f6, $f4 -/* 00394 809F3654 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00398 809F3658 3C050600 */ lui $a1, %hi(D_060024CC) ## $a1 = 06000000 -/* 0039C 809F365C 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 003A0 809F3660 44060000 */ mfc1 $a2, $f0 -/* 003A4 809F3664 44070000 */ mfc1 $a3, $f0 -/* 003A8 809F3668 4600320D */ trunc.w.s $f8, $f6 -/* 003AC 809F366C 24A524CC */ addiu $a1, $a1, %lo(D_060024CC) ## $a1 = 060024CC -/* 003B0 809F3670 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 003B4 809F3674 440F4000 */ mfc1 $t7, $f8 -/* 003B8 809F3678 00000000 */ nop -/* 003BC 809F367C A60F026E */ sh $t7, 0x026E($s0) ## 0000026E -/* 003C0 809F3680 8618026E */ lh $t8, 0x026E($s0) ## 0000026E -/* 003C4 809F3684 AFB90014 */ sw $t9, 0x0014($sp) -/* 003C8 809F3688 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 003CC 809F368C 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 003D0 809F3690 00000000 */ nop -/* 003D4 809F3694 46805420 */ cvt.s.w $f16, $f10 -/* 003D8 809F3698 0C029468 */ jal Animation_Change - -/* 003DC 809F369C E7B00010 */ swc1 $f16, 0x0010($sp) -/* 003E0 809F36A0 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 003E4 809F36A4 44812000 */ mtc1 $at, $f4 ## $f4 = 8.00 -/* 003E8 809F36A8 3C08809F */ lui $t0, %hi(func_809F36CC) ## $t0 = 809F0000 -/* 003EC 809F36AC 250836CC */ addiu $t0, $t0, %lo(func_809F36CC) ## $t0 = 809F36CC -/* 003F0 809F36B0 AE080214 */ sw $t0, 0x0214($s0) ## 00000214 -/* 003F4 809F36B4 E6040164 */ swc1 $f4, 0x0164($s0) ## 00000164 -/* 003F8 809F36B8 8FBF002C */ lw $ra, 0x002C($sp) -/* 003FC 809F36BC 8FB00028 */ lw $s0, 0x0028($sp) -/* 00400 809F36C0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00404 809F36C4 03E00008 */ jr $ra -/* 00408 809F36C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F36CC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F36CC.s deleted file mode 100644 index f31c8293d1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F36CC.s +++ /dev/null @@ -1,206 +0,0 @@ -.rdata -glabel D_809F5F68 - .asciz "\x1b[36m☆☆☆☆☆ 大当り ☆☆☆☆☆ %d\n\x1b[m" - .balign 4 - -.late_rodata -glabel D_809F6034 - .word 0x44A78000 -glabel D_809F6038 - .word 0x44A78000 - -.text -glabel func_809F36CC -/* 0040C 809F36CC 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 00410 809F36D0 3C0F809F */ lui $t7, %hi(D_809F5E70) ## $t7 = 809F0000 -/* 00414 809F36D4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00418 809F36D8 AFB00020 */ sw $s0, 0x0020($sp) -/* 0041C 809F36DC AFA5007C */ sw $a1, 0x007C($sp) -/* 00420 809F36E0 25EF5E70 */ addiu $t7, $t7, %lo(D_809F5E70) ## $t7 = 809F5E70 -/* 00424 809F36E4 8DF90000 */ lw $t9, 0x0000($t7) ## 809F5E70 -/* 00428 809F36E8 3C01809F */ lui $at, %hi(D_809F6034) ## $at = 809F0000 -/* 0042C 809F36EC C4306034 */ lwc1 $f16, %lo(D_809F6034)($at) -/* 00430 809F36F0 27AE0048 */ addiu $t6, $sp, 0x0048 ## $t6 = FFFFFFD0 -/* 00434 809F36F4 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFD0 -/* 00438 809F36F8 8DF90008 */ lw $t9, 0x0008($t7) ## 809F5E78 -/* 0043C 809F36FC 8DF80004 */ lw $t8, 0x0004($t7) ## 809F5E74 -/* 00440 809F3700 3C09809F */ lui $t1, %hi(D_809F5E7C) ## $t1 = 809F0000 -/* 00444 809F3704 25295E7C */ addiu $t1, $t1, %lo(D_809F5E7C) ## $t1 = 809F5E7C -/* 00448 809F3708 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFD8 -/* 0044C 809F370C ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFD4 -/* 00450 809F3710 8D2B0000 */ lw $t3, 0x0000($t1) ## 809F5E7C -/* 00454 809F3714 27A8003C */ addiu $t0, $sp, 0x003C ## $t0 = FFFFFFC4 -/* 00458 809F3718 3C0141C0 */ lui $at, 0x41C0 ## $at = 41C00000 -/* 0045C 809F371C AD0B0000 */ sw $t3, 0x0000($t0) ## FFFFFFC4 -/* 00460 809F3720 44819000 */ mtc1 $at, $f18 ## $f18 = 24.00 -/* 00464 809F3724 8D2B0008 */ lw $t3, 0x0008($t1) ## 809F5E84 -/* 00468 809F3728 8D2A0004 */ lw $t2, 0x0004($t1) ## 809F5E80 -/* 0046C 809F372C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00470 809F3730 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 00474 809F3734 3C01C1F0 */ lui $at, 0xC1F0 ## $at = C1F00000 -/* 00478 809F3738 AD0B0008 */ sw $t3, 0x0008($t0) ## FFFFFFCC -/* 0047C 809F373C AD0A0004 */ sw $t2, 0x0004($t0) ## FFFFFFC8 -/* 00480 809F3740 44813000 */ mtc1 $at, $f6 ## $f6 = -30.00 -/* 00484 809F3744 44814000 */ mtc1 $at, $f8 ## $f8 = -30.00 -/* 00488 809F3748 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 0048C 809F374C 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 -/* 00490 809F3750 46122001 */ sub.s $f0, $f4, $f18 -/* 00494 809F3754 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00498 809F3758 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0049C 809F375C 46123080 */ add.s $f2, $f6, $f18 -/* 004A0 809F3760 E48000E0 */ swc1 $f0, 0x00E0($a0) ## 0000022C -/* 004A4 809F3764 E48000EC */ swc1 $f0, 0x00EC($a0) ## 00000238 -/* 004A8 809F3768 46124301 */ sub.s $f12, $f8, $f18 -/* 004AC 809F376C E48200E4 */ swc1 $f2, 0x00E4($a0) ## 00000230 -/* 004B0 809F3770 E48200FC */ swc1 $f2, 0x00FC($a0) ## 00000248 -/* 004B4 809F3774 46125380 */ add.s $f14, $f10, $f18 -/* 004B8 809F3778 E48C00F0 */ swc1 $f12, 0x00F0($a0) ## 0000023C -/* 004BC 809F377C E48C0108 */ swc1 $f12, 0x0108($a0) ## 00000254 -/* 004C0 809F3780 E49000DC */ swc1 $f16, 0x00DC($a0) ## 00000228 -/* 004C4 809F3784 E48E00F8 */ swc1 $f14, 0x00F8($a0) ## 00000244 -/* 004C8 809F3788 E48E0104 */ swc1 $f14, 0x0104($a0) ## 00000250 -/* 004CC 809F378C E49000E8 */ swc1 $f16, 0x00E8($a0) ## 00000234 -/* 004D0 809F3790 E49000F4 */ swc1 $f16, 0x00F4($a0) ## 00000240 -/* 004D4 809F3794 0C02927F */ jal SkelAnime_Update - -/* 004D8 809F3798 E4900100 */ swc1 $f16, 0x0100($a0) ## 0000024C -/* 004DC 809F379C 920202A5 */ lbu $v0, 0x02A5($s0) ## 000002A5 -/* 004E0 809F37A0 3C01809F */ lui $at, %hi(D_809F6038) ## $at = 809F0000 -/* 004E4 809F37A4 C4306038 */ lwc1 $f16, %lo(D_809F6038)($at) -/* 004E8 809F37A8 304C0002 */ andi $t4, $v0, 0x0002 ## $t4 = 00000000 -/* 004EC 809F37AC 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFC4 -/* 004F0 809F37B0 15800006 */ bne $t4, $zero, .L809F37CC -/* 004F4 809F37B4 27A70048 */ addiu $a3, $sp, 0x0048 ## $a3 = FFFFFFD0 -/* 004F8 809F37B8 3C0D8016 */ lui $t5, %hi(gGameInfo) -/* 004FC 809F37BC 8DADFA90 */ lw $t5, %lo(gGameInfo)($t5) -/* 00500 809F37C0 85AE12D4 */ lh $t6, 0x12D4($t5) ## 801612D4 -/* 00504 809F37C4 51C00078 */ beql $t6, $zero, .L809F39A8 -/* 00508 809F37C8 8FBF0024 */ lw $ra, 0x0024($sp) -.L809F37CC: -/* 0050C 809F37CC 861802BA */ lh $t8, 0x02BA($s0) ## 000002BA -/* 00510 809F37D0 861902BC */ lh $t9, 0x02BC($s0) ## 000002BC -/* 00514 809F37D4 860802BE */ lh $t0, 0x02BE($s0) ## 000002BE -/* 00518 809F37D8 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 0051C 809F37DC 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 00520 809F37E0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00524 809F37E4 468021A0 */ cvt.s.w $f6, $f4 -/* 00528 809F37E8 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 -/* 0052C 809F37EC 3C01C1F0 */ lui $at, 0xC1F0 ## $at = C1F00000 -/* 00530 809F37F0 304FFFFD */ andi $t7, $v0, 0xFFFD ## $t7 = 00000000 -/* 00534 809F37F4 A20F02A5 */ sb $t7, 0x02A5($s0) ## 000002A5 -/* 00538 809F37F8 46805120 */ cvt.s.w $f4, $f10 -/* 0053C 809F37FC 44885000 */ mtc1 $t0, $f10 ## $f10 = 0.00 -/* 00540 809F3800 46068001 */ sub.s $f0, $f16, $f6 -/* 00544 809F3804 44813000 */ mtc1 $at, $f6 ## $f6 = -30.00 -/* 00548 809F3808 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 0054C 809F380C 46000085 */ abs.s $f2, $f0 -/* 00550 809F3810 46044001 */ sub.s $f0, $f8, $f4 -/* 00554 809F3814 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 00558 809F3818 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 0055C 809F381C 46805220 */ cvt.s.w $f8, $f10 -/* 00560 809F3820 46021282 */ mul.s $f10, $f2, $f2 -/* 00564 809F3824 E7A40040 */ swc1 $f4, 0x0040($sp) -/* 00568 809F3828 44812000 */ mtc1 $at, $f4 ## $f4 = 8.00 -/* 0056C 809F382C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00570 809F3830 46000305 */ abs.s $f12, $f0 -/* 00574 809F3834 46083001 */ sub.s $f0, $f6, $f8 -/* 00578 809F3838 460C6182 */ mul.s $f6, $f12, $f12 -/* 0057C 809F383C 46000385 */ abs.s $f14, $f0 -/* 00580 809F3840 460E7202 */ mul.s $f8, $f14, $f14 -/* 00584 809F3844 46065480 */ add.s $f18, $f10, $f6 -/* 00588 809F3848 46089000 */ add.s $f0, $f18, $f8 -/* 0058C 809F384C 46000004 */ sqrt.s $f0, $f0 -/* 00590 809F3850 4604003C */ c.lt.s $f0, $f4 -/* 00594 809F3854 00000000 */ nop -/* 00598 809F3858 45000039 */ bc1f .L809F3940 -/* 0059C 809F385C 00000000 */ nop -/* 005A0 809F3860 44810000 */ mtc1 $at, $f0 ## $f0 = 20.00 -/* 005A4 809F3864 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 005A8 809F3868 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 -/* 005AC 809F386C 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 005B0 809F3870 46005181 */ sub.s $f6, $f10, $f0 -/* 005B4 809F3874 8FA4007C */ lw $a0, 0x007C($sp) -/* 005B8 809F3878 27A5006C */ addiu $a1, $sp, 0x006C ## $a1 = FFFFFFF4 -/* 005BC 809F387C E7A6006C */ swc1 $f6, 0x006C($sp) -/* 005C0 809F3880 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 005C4 809F3884 46004100 */ add.s $f4, $f8, $f0 -/* 005C8 809F3888 E7A40070 */ swc1 $f4, 0x0070($sp) -/* 005CC 809F388C C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 005D0 809F3890 AFAA0014 */ sw $t2, 0x0014($sp) -/* 005D4 809F3894 AFA90010 */ sw $t1, 0x0010($sp) -/* 005D8 809F3898 0C00A97D */ jal EffectSsExtra_Spawn -/* 005DC 809F389C E7AA0074 */ swc1 $f10, 0x0074($sp) -/* 005E0 809F38A0 0C03E341 */ jal func_800F8D04 -/* 005E4 809F38A4 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 -/* 005E8 809F38A8 0C01E221 */ jal func_80078884 -/* 005EC 809F38AC 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 -/* 005F0 809F38B0 3C04809F */ lui $a0, %hi(D_809F5F68) ## $a0 = 809F0000 -/* 005F4 809F38B4 24845F68 */ addiu $a0, $a0, %lo(D_809F5F68) ## $a0 = 809F5F68 -/* 005F8 809F38B8 0C00084C */ jal osSyncPrintf - -/* 005FC 809F38BC 8605026C */ lh $a1, 0x026C($s0) ## 0000026C -/* 00600 809F38C0 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00604 809F38C4 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00608 809F38C8 8C4B0004 */ lw $t3, 0x0004($v0) ## 8015E664 -/* 0060C 809F38CC 51600036 */ beql $t3, $zero, .L809F39A8 -/* 00610 809F38D0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00614 809F38D4 944C0EF2 */ lhu $t4, 0x0EF2($v0) ## 8015F552 -/* 00618 809F38D8 318D2000 */ andi $t5, $t4, 0x2000 ## $t5 = 00000000 -/* 0061C 809F38DC 55A00032 */ bnel $t5, $zero, .L809F39A8 -/* 00620 809F38E0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00624 809F38E4 860E026C */ lh $t6, 0x026C($s0) ## 0000026C -/* 00628 809F38E8 2405102C */ addiu $a1, $zero, 0x102C ## $a1 = 0000102C -/* 0062C 809F38EC 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 00630 809F38F0 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00634 809F38F4 A60F026C */ sh $t7, 0x026C($s0) ## 0000026C -/* 00638 809F38F8 8618026C */ lh $t8, 0x026C($s0) ## 0000026C -/* 0063C 809F38FC 8FA4007C */ lw $a0, 0x007C($sp) -/* 00640 809F3900 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 00644 809F3904 2B010003 */ slti $at, $t8, 0x0003 -/* 00648 809F3908 54200027 */ bnel $at, $zero, .L809F39A8 -/* 0064C 809F390C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00650 809F3910 0C02003E */ jal func_800800F8 -/* 00654 809F3914 AFA00010 */ sw $zero, 0x0010($sp) -/* 00658 809F3918 8FA4007C */ lw $a0, 0x007C($sp) -/* 0065C 809F391C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00660 809F3920 0C00B7D5 */ jal func_8002DF54 -/* 00664 809F3924 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00668 809F3928 3C08809F */ lui $t0, %hi(func_809F39B8) ## $t0 = 809F0000 -/* 0066C 809F392C 24190032 */ addiu $t9, $zero, 0x0032 ## $t9 = 00000032 -/* 00670 809F3930 250839B8 */ addiu $t0, $t0, %lo(func_809F39B8) ## $t0 = 809F39B8 -/* 00674 809F3934 A619025C */ sh $t9, 0x025C($s0) ## 0000025C -/* 00678 809F3938 1000001A */ beq $zero, $zero, .L809F39A4 -/* 0067C 809F393C AE080214 */ sw $t0, 0x0214($s0) ## 00000214 -.L809F3940: -/* 00680 809F3940 460E7182 */ mul.s $f6, $f14, $f14 -/* 00684 809F3944 3C0141C0 */ lui $at, 0x41C0 ## $at = 41C00000 -/* 00688 809F3948 44814000 */ mtc1 $at, $f8 ## $f8 = 24.00 -/* 0068C 809F394C 46069000 */ add.s $f0, $f18, $f6 -/* 00690 809F3950 46000004 */ sqrt.s $f0, $f0 -/* 00694 809F3954 4608003C */ c.lt.s $f0, $f8 -/* 00698 809F3958 00000000 */ nop -/* 0069C 809F395C 45020012 */ bc1fl .L809F39A8 -/* 006A0 809F3960 8FBF0024 */ lw $ra, 0x0024($sp) -/* 006A4 809F3964 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 006A8 809F3968 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 006AC 809F396C 44810000 */ mtc1 $at, $f0 ## $f0 = 20.00 -/* 006B0 809F3970 E7A4006C */ swc1 $f4, 0x006C($sp) -/* 006B4 809F3974 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 006B8 809F3978 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 -/* 006BC 809F397C 8FA4007C */ lw $a0, 0x007C($sp) -/* 006C0 809F3980 46005180 */ add.s $f6, $f10, $f0 -/* 006C4 809F3984 27A5006C */ addiu $a1, $sp, 0x006C ## $a1 = FFFFFFF4 -/* 006C8 809F3988 E7A60070 */ swc1 $f6, 0x0070($sp) -/* 006CC 809F398C C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 006D0 809F3990 AFA00014 */ sw $zero, 0x0014($sp) -/* 006D4 809F3994 AFA90010 */ sw $t1, 0x0010($sp) -/* 006D8 809F3998 0C00A97D */ jal EffectSsExtra_Spawn -/* 006DC 809F399C E7A80074 */ swc1 $f8, 0x0074($sp) -/* 006E0 809F39A0 A600026C */ sh $zero, 0x026C($s0) ## 0000026C -.L809F39A4: -/* 006E4 809F39A4 8FBF0024 */ lw $ra, 0x0024($sp) -.L809F39A8: -/* 006E8 809F39A8 8FB00020 */ lw $s0, 0x0020($sp) -/* 006EC 809F39AC 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 006F0 809F39B0 03E00008 */ jr $ra -/* 006F4 809F39B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F39B8.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F39B8.s deleted file mode 100644 index dde57ce606..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F39B8.s +++ /dev/null @@ -1,76 +0,0 @@ -glabel func_809F39B8 -/* 006F8 809F39B8 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 006FC 809F39BC AFBF0034 */ sw $ra, 0x0034($sp) -/* 00700 809F39C0 AFB00030 */ sw $s0, 0x0030($sp) -/* 00704 809F39C4 AFA5004C */ sw $a1, 0x004C($sp) -/* 00708 809F39C8 848E025C */ lh $t6, 0x025C($a0) ## 0000025C -/* 0070C 809F39CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00710 809F39D0 3C040600 */ lui $a0, %hi(D_060026C4) ## $a0 = 06000000 -/* 00714 809F39D4 55C0003B */ bnel $t6, $zero, .L809F3AC4 -/* 00718 809F39D8 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0071C 809F39DC 0C028800 */ jal Animation_GetLastFrame - -/* 00720 809F39E0 248426C4 */ addiu $a0, $a0, %lo(D_060026C4) ## $a0 = 060026C4 -/* 00724 809F39E4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00728 809F39E8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 0072C 809F39EC 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00730 809F39F0 468021A0 */ cvt.s.w $f6, $f4 -/* 00734 809F39F4 3C050600 */ lui $a1, %hi(D_060026C4) ## $a1 = 06000000 -/* 00738 809F39F8 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 0073C 809F39FC 24A526C4 */ addiu $a1, $a1, %lo(D_060026C4) ## $a1 = 060026C4 -/* 00740 809F3A00 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00744 809F3A04 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00748 809F3A08 4600320D */ trunc.w.s $f8, $f6 -/* 0074C 809F3A0C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00750 809F3A10 44184000 */ mfc1 $t8, $f8 -/* 00754 809F3A14 00000000 */ nop -/* 00758 809F3A18 A618026E */ sh $t8, 0x026E($s0) ## 0000026E -/* 0075C 809F3A1C 8619026E */ lh $t9, 0x026E($s0) ## 0000026E -/* 00760 809F3A20 AFA80014 */ sw $t0, 0x0014($sp) -/* 00764 809F3A24 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00768 809F3A28 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 0076C 809F3A2C 00000000 */ nop -/* 00770 809F3A30 46805420 */ cvt.s.w $f16, $f10 -/* 00774 809F3A34 0C029468 */ jal Animation_Change - -/* 00778 809F3A38 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 0077C 809F3A3C 8E0A0024 */ lw $t2, 0x0024($s0) ## 00000024 -/* 00780 809F3A40 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFF4 -/* 00784 809F3A44 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00788 809F3A48 ACAA0000 */ sw $t2, 0x0000($a1) ## FFFFFFF4 -/* 0078C 809F3A4C 8E090028 */ lw $t1, 0x0028($s0) ## 00000028 -/* 00790 809F3A50 44813000 */ mtc1 $at, $f6 ## $f6 = 50.00 -/* 00794 809F3A54 240B000A */ addiu $t3, $zero, 0x000A ## $t3 = 0000000A -/* 00798 809F3A58 ACA90004 */ sw $t1, 0x0004($a1) ## FFFFFFF8 -/* 0079C 809F3A5C 8E0A002C */ lw $t2, 0x002C($s0) ## 0000002C -/* 007A0 809F3A60 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 -/* 007A4 809F3A64 240D000F */ addiu $t5, $zero, 0x000F ## $t5 = 0000000F -/* 007A8 809F3A68 ACAA0008 */ sw $t2, 0x0008($a1) ## FFFFFFFC -/* 007AC 809F3A6C C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 007B0 809F3A70 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF -/* 007B4 809F3A74 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A -/* 007B8 809F3A78 46062200 */ add.s $f8, $f4, $f6 -/* 007BC 809F3A7C AFAF0020 */ sw $t7, 0x0020($sp) -/* 007C0 809F3A80 AFAE001C */ sw $t6, 0x001C($sp) -/* 007C4 809F3A84 AFA00024 */ sw $zero, 0x0024($sp) -/* 007C8 809F3A88 E7A80040 */ swc1 $f8, 0x0040($sp) -/* 007CC 809F3A8C AFAD0018 */ sw $t5, 0x0018($sp) -/* 007D0 809F3A90 AFAC0014 */ sw $t4, 0x0014($sp) -/* 007D4 809F3A94 AFAB0010 */ sw $t3, 0x0010($sp) -/* 007D8 809F3A98 8FA4004C */ lw $a0, 0x004C($sp) -/* 007DC 809F3A9C 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 007E0 809F3AA0 0C00A5E9 */ jal EffectSsHahen_SpawnBurst -/* 007E4 809F3AA4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 007E8 809F3AA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 007EC 809F3AAC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 007F0 809F3AB0 2405387C */ addiu $a1, $zero, 0x387C ## $a1 = 0000387C -/* 007F4 809F3AB4 3C18809F */ lui $t8, %hi(func_809F3AD4) ## $t8 = 809F0000 -/* 007F8 809F3AB8 27183AD4 */ addiu $t8, $t8, %lo(func_809F3AD4) ## $t8 = 809F3AD4 -/* 007FC 809F3ABC AE180214 */ sw $t8, 0x0214($s0) ## 00000214 -/* 00800 809F3AC0 8FBF0034 */ lw $ra, 0x0034($sp) -.L809F3AC4: -/* 00804 809F3AC4 8FB00030 */ lw $s0, 0x0030($sp) -/* 00808 809F3AC8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 0080C 809F3ACC 03E00008 */ jr $ra -/* 00810 809F3AD0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3AD4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3AD4.s deleted file mode 100644 index 64c2f4f098..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3AD4.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_809F3AD4 -/* 00814 809F3AD4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00818 809F3AD8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0081C 809F3ADC AFA40020 */ sw $a0, 0x0020($sp) -/* 00820 809F3AE0 AFA50024 */ sw $a1, 0x0024($sp) -/* 00824 809F3AE4 C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 -/* 00828 809F3AE8 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 0082C 809F3AEC AFA50020 */ sw $a1, 0x0020($sp) -/* 00830 809F3AF0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00834 809F3AF4 0C02927F */ jal SkelAnime_Update - -/* 00838 809F3AF8 E7A4001C */ swc1 $f4, 0x001C($sp) -/* 0083C 809F3AFC 8FA50020 */ lw $a1, 0x0020($sp) -/* 00840 809F3B00 C7A6001C */ lwc1 $f6, 0x001C($sp) -/* 00844 809F3B04 3C0F809F */ lui $t7, %hi(func_809F3B40) ## $t7 = 809F0000 -/* 00848 809F3B08 84AE026E */ lh $t6, 0x026E($a1) ## 0000026E -/* 0084C 809F3B0C 25EF3B40 */ addiu $t7, $t7, %lo(func_809F3B40) ## $t7 = 809F3B40 -/* 00850 809F3B10 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 00854 809F3B14 00000000 */ nop -/* 00858 809F3B18 468042A0 */ cvt.s.w $f10, $f8 -/* 0085C 809F3B1C 4606503E */ c.le.s $f10, $f6 -/* 00860 809F3B20 00000000 */ nop -/* 00864 809F3B24 45020003 */ bc1fl .L809F3B34 -/* 00868 809F3B28 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0086C 809F3B2C ACAF0214 */ sw $t7, 0x0214($a1) ## 00000214 -/* 00870 809F3B30 8FBF0014 */ lw $ra, 0x0014($sp) -.L809F3B34: -/* 00874 809F3B34 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00878 809F3B38 03E00008 */ jr $ra -/* 0087C 809F3B3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3B40.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3B40.s deleted file mode 100644 index 083e723e52..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3B40.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_809F3B40 -/* 00880 809F3B40 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00884 809F3B44 AFB00028 */ sw $s0, 0x0028($sp) -/* 00888 809F3B48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0088C 809F3B4C AFBF002C */ sw $ra, 0x002C($sp) -/* 00890 809F3B50 3C040600 */ lui $a0, %hi(D_06003128) ## $a0 = 06000000 -/* 00894 809F3B54 AFA50034 */ sw $a1, 0x0034($sp) -/* 00898 809F3B58 0C028800 */ jal Animation_GetLastFrame - -/* 0089C 809F3B5C 24843128 */ addiu $a0, $a0, %lo(D_06003128) ## $a0 = 06003128 -/* 008A0 809F3B60 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 008A4 809F3B64 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 008A8 809F3B68 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 008AC 809F3B6C 468021A0 */ cvt.s.w $f6, $f4 -/* 008B0 809F3B70 3C050600 */ lui $a1, %hi(D_06003128) ## $a1 = 06000000 -/* 008B4 809F3B74 24A53128 */ addiu $a1, $a1, %lo(D_06003128) ## $a1 = 06003128 -/* 008B8 809F3B78 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 008BC 809F3B7C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 008C0 809F3B80 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 008C4 809F3B84 4600320D */ trunc.w.s $f8, $f6 -/* 008C8 809F3B88 440F4000 */ mfc1 $t7, $f8 -/* 008CC 809F3B8C 00000000 */ nop -/* 008D0 809F3B90 A60F026E */ sh $t7, 0x026E($s0) ## 0000026E -/* 008D4 809F3B94 8618026E */ lh $t8, 0x026E($s0) ## 0000026E -/* 008D8 809F3B98 AFA00014 */ sw $zero, 0x0014($sp) -/* 008DC 809F3B9C E7B20018 */ swc1 $f18, 0x0018($sp) -/* 008E0 809F3BA0 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 008E4 809F3BA4 00000000 */ nop -/* 008E8 809F3BA8 46805420 */ cvt.s.w $f16, $f10 -/* 008EC 809F3BAC 0C029468 */ jal Animation_Change - -/* 008F0 809F3BB0 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 008F4 809F3BB4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 008F8 809F3BB8 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 008FC 809F3BBC 3C19809F */ lui $t9, %hi(func_809F3BE4) ## $t9 = 809F0000 -/* 00900 809F3BC0 27393BE4 */ addiu $t9, $t9, %lo(func_809F3BE4) ## $t9 = 809F3BE4 -/* 00904 809F3BC4 A20000AE */ sb $zero, 0x00AE($s0) ## 000000AE -/* 00908 809F3BC8 AE190214 */ sw $t9, 0x0214($s0) ## 00000214 -/* 0090C 809F3BCC E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 00910 809F3BD0 8FBF002C */ lw $ra, 0x002C($sp) -/* 00914 809F3BD4 8FB00028 */ lw $s0, 0x0028($sp) -/* 00918 809F3BD8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0091C 809F3BDC 03E00008 */ jr $ra -/* 00920 809F3BE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3BE4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3BE4.s deleted file mode 100644 index 53da93e6b5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3BE4.s +++ /dev/null @@ -1,73 +0,0 @@ -.late_rodata -glabel D_809F603C - .word 0x44A7E000 -glabel D_809F6040 - .word 0x4622F983 - -.text -glabel func_809F3BE4 -/* 00924 809F3BE4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00928 809F3BE8 AFB00020 */ sw $s0, 0x0020($sp) -/* 0092C 809F3BEC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00930 809F3BF0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00934 809F3BF4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00938 809F3BF8 AFA5003C */ sw $a1, 0x003C($sp) -/* 0093C 809F3BFC 0C02927F */ jal SkelAnime_Update - -/* 00940 809F3C00 AFA40028 */ sw $a0, 0x0028($sp) -/* 00944 809F3C04 3C01809F */ lui $at, %hi(D_809F603C) ## $at = 809F0000 -/* 00948 809F3C08 C424603C */ lwc1 $f4, %lo(D_809F603C)($at) -/* 0094C 809F3C0C C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 00950 809F3C10 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 00954 809F3C14 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 00958 809F3C18 46062301 */ sub.s $f12, $f4, $f6 -/* 0095C 809F3C1C 0C03F494 */ jal Math_FAtan2F -/* 00960 809F3C20 460A4381 */ sub.s $f14, $f8, $f10 -/* 00964 809F3C24 3C01809F */ lui $at, %hi(D_809F6040) ## $at = 809F0000 -/* 00968 809F3C28 C4306040 */ lwc1 $f16, %lo(D_809F6040)($at) -/* 0096C 809F3C2C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 00970 809F3C30 24060032 */ addiu $a2, $zero, 0x0032 ## $a2 = 00000032 -/* 00974 809F3C34 46100482 */ mul.s $f18, $f0, $f16 -/* 00978 809F3C38 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 -/* 0097C 809F3C3C AFA00010 */ sw $zero, 0x0010($sp) -/* 00980 809F3C40 4600910D */ trunc.w.s $f4, $f18 -/* 00984 809F3C44 44052000 */ mfc1 $a1, $f4 -/* 00988 809F3C48 00000000 */ nop -/* 0098C 809F3C4C 00052C00 */ sll $a1, $a1, 16 -/* 00990 809F3C50 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00994 809F3C54 00052C03 */ sra $a1, $a1, 16 -/* 00998 809F3C58 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 0099C 809F3C5C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 009A0 809F3C60 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 -/* 009A4 809F3C64 0C0295B2 */ jal Animation_OnFrame -/* 009A8 809F3C68 8FA40028 */ lw $a0, 0x0028($sp) -/* 009AC 809F3C6C 14400004 */ bne $v0, $zero, .L809F3C80 -/* 009B0 809F3C70 8FA40028 */ lw $a0, 0x0028($sp) -/* 009B4 809F3C74 0C0295B2 */ jal Animation_OnFrame -/* 009B8 809F3C78 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 -/* 009BC 809F3C7C 10400003 */ beq $v0, $zero, .L809F3C8C -.L809F3C80: -/* 009C0 809F3C80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 009C4 809F3C84 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 009C8 809F3C88 2405387F */ addiu $a1, $zero, 0x387F ## $a1 = 0000387F -.L809F3C8C: -/* 009CC 809F3C8C 3C01C1F0 */ lui $at, 0xC1F0 ## $at = C1F00000 -/* 009D0 809F3C90 44813000 */ mtc1 $at, $f6 ## $f6 = -30.00 -/* 009D4 809F3C94 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 009D8 809F3C98 3C18809F */ lui $t8, %hi(func_809F3CD0) ## $t8 = 809F0000 -/* 009DC 809F3C9C 4608303C */ c.lt.s $f6, $f8 -/* 009E0 809F3CA0 00000000 */ nop -/* 009E4 809F3CA4 45020006 */ bc1fl .L809F3CC0 -/* 009E8 809F3CA8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 009EC 809F3CAC 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 009F0 809F3CB0 27183CD0 */ addiu $t8, $t8, %lo(func_809F3CD0) ## $t8 = 809F3CD0 -/* 009F4 809F3CB4 AE180214 */ sw $t8, 0x0214($s0) ## 00000214 -/* 009F8 809F3CB8 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 009FC 809F3CBC 8FBF0024 */ lw $ra, 0x0024($sp) -.L809F3CC0: -/* 00A00 809F3CC0 8FB00020 */ lw $s0, 0x0020($sp) -/* 00A04 809F3CC4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00A08 809F3CC8 03E00008 */ jr $ra -/* 00A0C 809F3CCC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3CD0.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3CD0.s deleted file mode 100644 index 6dc5d2dffb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3CD0.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_809F3CD0 -/* 00A10 809F3CD0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00A14 809F3CD4 AFB00020 */ sw $s0, 0x0020($sp) -/* 00A18 809F3CD8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A1C 809F3CDC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00A20 809F3CE0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00A24 809F3CE4 AFA50034 */ sw $a1, 0x0034($sp) -/* 00A28 809F3CE8 0C02927F */ jal SkelAnime_Update - -/* 00A2C 809F3CEC AFA4002C */ sw $a0, 0x002C($sp) -/* 00A30 809F3CF0 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 00A34 809F3CF4 AFA00010 */ sw $zero, 0x0010($sp) -/* 00A38 809F3CF8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 00A3C 809F3CFC 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00A40 809F3D00 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00A44 809F3D04 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 -/* 00A48 809F3D08 8FA4002C */ lw $a0, 0x002C($sp) -/* 00A4C 809F3D0C 0C0295B2 */ jal Animation_OnFrame -/* 00A50 809F3D10 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00A54 809F3D14 14400004 */ bne $v0, $zero, .L809F3D28 -/* 00A58 809F3D18 8FA4002C */ lw $a0, 0x002C($sp) -/* 00A5C 809F3D1C 0C0295B2 */ jal Animation_OnFrame -/* 00A60 809F3D20 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 -/* 00A64 809F3D24 10400003 */ beq $v0, $zero, .L809F3D34 -.L809F3D28: -/* 00A68 809F3D28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A6C 809F3D2C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00A70 809F3D30 2405387F */ addiu $a1, $zero, 0x387F ## $a1 = 0000387F -.L809F3D34: -/* 00A74 809F3D34 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 00A78 809F3D38 860F008A */ lh $t7, 0x008A($s0) ## 0000008A -/* 00A7C 809F3D3C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00A80 809F3D40 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 -/* 00A84 809F3D44 01CFC023 */ subu $t8, $t6, $t7 -/* 00A88 809F3D48 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 00A8C 809F3D4C 3C19809F */ lui $t9, %hi(func_809F3D84) ## $t9 = 809F0000 -/* 00A90 809F3D50 27393D84 */ addiu $t9, $t9, %lo(func_809F3D84) ## $t9 = 809F3D84 -/* 00A94 809F3D54 46802020 */ cvt.s.w $f0, $f4 -/* 00A98 809F3D58 46000005 */ abs.s $f0, $f0 -/* 00A9C 809F3D5C 4606003C */ c.lt.s $f0, $f6 -/* 00AA0 809F3D60 00000000 */ nop -/* 00AA4 809F3D64 45020003 */ bc1fl .L809F3D74 -/* 00AA8 809F3D68 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00AAC 809F3D6C AE190214 */ sw $t9, 0x0214($s0) ## 00000214 -/* 00AB0 809F3D70 8FBF0024 */ lw $ra, 0x0024($sp) -.L809F3D74: -/* 00AB4 809F3D74 8FB00020 */ lw $s0, 0x0020($sp) -/* 00AB8 809F3D78 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00ABC 809F3D7C 03E00008 */ jr $ra -/* 00AC0 809F3D80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3D84.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3D84.s deleted file mode 100644 index f888e0b290..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3D84.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_809F3D84 -/* 00AC4 809F3D84 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00AC8 809F3D88 AFB00028 */ sw $s0, 0x0028($sp) -/* 00ACC 809F3D8C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AD0 809F3D90 AFBF002C */ sw $ra, 0x002C($sp) -/* 00AD4 809F3D94 3C040600 */ lui $a0, %hi(D_06002E84) ## $a0 = 06000000 -/* 00AD8 809F3D98 AFA50034 */ sw $a1, 0x0034($sp) -/* 00ADC 809F3D9C 0C028800 */ jal Animation_GetLastFrame - -/* 00AE0 809F3DA0 24842E84 */ addiu $a0, $a0, %lo(D_06002E84) ## $a0 = 06002E84 -/* 00AE4 809F3DA4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00AE8 809F3DA8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00AEC 809F3DAC 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00AF0 809F3DB0 468021A0 */ cvt.s.w $f6, $f4 -/* 00AF4 809F3DB4 3C050600 */ lui $a1, %hi(D_06002E84) ## $a1 = 06000000 -/* 00AF8 809F3DB8 24A52E84 */ addiu $a1, $a1, %lo(D_06002E84) ## $a1 = 06002E84 -/* 00AFC 809F3DBC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00B00 809F3DC0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00B04 809F3DC4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00B08 809F3DC8 4600320D */ trunc.w.s $f8, $f6 -/* 00B0C 809F3DCC 440F4000 */ mfc1 $t7, $f8 -/* 00B10 809F3DD0 00000000 */ nop -/* 00B14 809F3DD4 A60F026E */ sh $t7, 0x026E($s0) ## 0000026E -/* 00B18 809F3DD8 8618026E */ lh $t8, 0x026E($s0) ## 0000026E -/* 00B1C 809F3DDC AFA00014 */ sw $zero, 0x0014($sp) -/* 00B20 809F3DE0 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00B24 809F3DE4 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 00B28 809F3DE8 00000000 */ nop -/* 00B2C 809F3DEC 46805420 */ cvt.s.w $f16, $f10 -/* 00B30 809F3DF0 0C029468 */ jal Animation_Change - -/* 00B34 809F3DF4 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00B38 809F3DF8 241910AF */ addiu $t9, $zero, 0x10AF ## $t9 = 000010AF -/* 00B3C 809F3DFC A619010E */ sh $t9, 0x010E($s0) ## 0000010E -/* 00B40 809F3E00 8FA40034 */ lw $a0, 0x0034($sp) -/* 00B44 809F3E04 3325FFFF */ andi $a1, $t9, 0xFFFF ## $a1 = 000010AF -/* 00B48 809F3E08 0C042DA0 */ jal func_8010B680 -/* 00B4C 809F3E0C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00B50 809F3E10 3C08809F */ lui $t0, %hi(func_809F3E30) ## $t0 = 809F0000 -/* 00B54 809F3E14 25083E30 */ addiu $t0, $t0, %lo(func_809F3E30) ## $t0 = 809F3E30 -/* 00B58 809F3E18 AE080214 */ sw $t0, 0x0214($s0) ## 00000214 -/* 00B5C 809F3E1C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00B60 809F3E20 8FB00028 */ lw $s0, 0x0028($sp) -/* 00B64 809F3E24 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00B68 809F3E28 03E00008 */ jr $ra -/* 00B6C 809F3E2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3E30.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3E30.s deleted file mode 100644 index ba5730b446..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3E30.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_809F3E30 -/* 00B70 809F3E30 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00B74 809F3E34 AFBF001C */ sw $ra, 0x001C($sp) -/* 00B78 809F3E38 AFB00018 */ sw $s0, 0x0018($sp) -/* 00B7C 809F3E3C AFA40020 */ sw $a0, 0x0020($sp) -/* 00B80 809F3E40 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00B84 809F3E44 0C02927F */ jal SkelAnime_Update - -/* 00B88 809F3E48 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00B8C 809F3E4C 0C042F6F */ jal func_8010BDBC -/* 00B90 809F3E50 260420D8 */ addiu $a0, $s0, 0x20D8 ## $a0 = 000020D8 -/* 00B94 809F3E54 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00B98 809F3E58 5441001A */ bnel $v0, $at, .L809F3EC4 -/* 00B9C 809F3E5C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00BA0 809F3E60 0C041AF2 */ jal func_80106BC8 -/* 00BA4 809F3E64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BA8 809F3E68 50400016 */ beql $v0, $zero, .L809F3EC4 -/* 00BAC 809F3E6C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00BB0 809F3E70 0C041B33 */ jal func_80106CCC -/* 00BB4 809F3E74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BB8 809F3E78 860E07A0 */ lh $t6, 0x07A0($s0) ## 000007A0 -/* 00BBC 809F3E7C 000E7880 */ sll $t7, $t6, 2 -/* 00BC0 809F3E80 020FC021 */ addu $t8, $s0, $t7 -/* 00BC4 809F3E84 0C016C69 */ jal func_8005B1A4 -/* 00BC8 809F3E88 8F040790 */ lw $a0, 0x0790($t8) ## 00000790 -/* 00BCC 809F3E8C 861907A0 */ lh $t9, 0x07A0($s0) ## 000007A0 -/* 00BD0 809F3E90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BD4 809F3E94 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00BD8 809F3E98 00194080 */ sll $t0, $t9, 2 -/* 00BDC 809F3E9C 02084821 */ addu $t1, $s0, $t0 -/* 00BE0 809F3EA0 8D2A0790 */ lw $t2, 0x0790($t1) ## 00000790 -/* 00BE4 809F3EA4 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 00BE8 809F3EA8 0C00B7D5 */ jal func_8002DF54 -/* 00BEC 809F3EAC A5400168 */ sh $zero, 0x0168($t2) ## 00000168 -/* 00BF0 809F3EB0 8FAC0020 */ lw $t4, 0x0020($sp) -/* 00BF4 809F3EB4 3C0B809F */ lui $t3, %hi(func_809F3ED4) ## $t3 = 809F0000 -/* 00BF8 809F3EB8 256B3ED4 */ addiu $t3, $t3, %lo(func_809F3ED4) ## $t3 = 809F3ED4 -/* 00BFC 809F3EBC AD8B0214 */ sw $t3, 0x0214($t4) ## 00000214 -/* 00C00 809F3EC0 8FBF001C */ lw $ra, 0x001C($sp) -.L809F3EC4: -/* 00C04 809F3EC4 8FB00018 */ lw $s0, 0x0018($sp) -/* 00C08 809F3EC8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00C0C 809F3ECC 03E00008 */ jr $ra -/* 00C10 809F3ED0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3ED4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3ED4.s deleted file mode 100644 index 87d20a93d9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3ED4.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_809F3ED4 -/* 00C14 809F3ED4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00C18 809F3ED8 AFA40028 */ sw $a0, 0x0028($sp) -/* 00C1C 809F3EDC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00C20 809F3EE0 3C040600 */ lui $a0, %hi(D_06000168) ## $a0 = 06000000 -/* 00C24 809F3EE4 AFA5002C */ sw $a1, 0x002C($sp) -/* 00C28 809F3EE8 0C028800 */ jal Animation_GetLastFrame - -/* 00C2C 809F3EEC 24840168 */ addiu $a0, $a0, %lo(D_06000168) ## $a0 = 06000168 -/* 00C30 809F3EF0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00C34 809F3EF4 8FA30028 */ lw $v1, 0x0028($sp) -/* 00C38 809F3EF8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00C3C 809F3EFC 468021A0 */ cvt.s.w $f6, $f4 -/* 00C40 809F3F00 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00C44 809F3F04 3C050600 */ lui $a1, %hi(D_06000168) ## $a1 = 06000000 -/* 00C48 809F3F08 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 00C4C 809F3F0C 24A50168 */ addiu $a1, $a1, %lo(D_06000168) ## $a1 = 06000168 -/* 00C50 809F3F10 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00C54 809F3F14 4600320D */ trunc.w.s $f8, $f6 -/* 00C58 809F3F18 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00C5C 809F3F1C 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 00C60 809F3F20 440F4000 */ mfc1 $t7, $f8 -/* 00C64 809F3F24 00000000 */ nop -/* 00C68 809F3F28 A46F026E */ sh $t7, 0x026E($v1) ## 0000026E -/* 00C6C 809F3F2C 8478026E */ lh $t8, 0x026E($v1) ## 0000026E -/* 00C70 809F3F30 AFB90014 */ sw $t9, 0x0014($sp) -/* 00C74 809F3F34 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00C78 809F3F38 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 00C7C 809F3F3C 00000000 */ nop -/* 00C80 809F3F40 46805420 */ cvt.s.w $f16, $f10 -/* 00C84 809F3F44 0C029468 */ jal Animation_Change - -/* 00C88 809F3F48 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00C8C 809F3F4C 8FA30028 */ lw $v1, 0x0028($sp) -/* 00C90 809F3F50 3C08809F */ lui $t0, %hi(func_809F3F6C) ## $t0 = 809F0000 -/* 00C94 809F3F54 25083F6C */ addiu $t0, $t0, %lo(func_809F3F6C) ## $t0 = 809F3F6C -/* 00C98 809F3F58 AC680214 */ sw $t0, 0x0214($v1) ## 00000214 -/* 00C9C 809F3F5C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00CA0 809F3F60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00CA4 809F3F64 03E00008 */ jr $ra -/* 00CA8 809F3F68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3F6C.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3F6C.s deleted file mode 100644 index 7d15064c8c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3F6C.s +++ /dev/null @@ -1,101 +0,0 @@ -glabel func_809F3F6C -/* 00CAC 809F3F6C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00CB0 809F3F70 AFB00038 */ sw $s0, 0x0038($sp) -/* 00CB4 809F3F74 AFBF003C */ sw $ra, 0x003C($sp) -/* 00CB8 809F3F78 AFA5005C */ sw $a1, 0x005C($sp) -/* 00CBC 809F3F7C C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 -/* 00CC0 809F3F80 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00CC4 809F3F84 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00CC8 809F3F88 AFA40044 */ sw $a0, 0x0044($sp) -/* 00CCC 809F3F8C 0C02927F */ jal SkelAnime_Update - -/* 00CD0 809F3F90 E7A40054 */ swc1 $f4, 0x0054($sp) -/* 00CD4 809F3F94 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 00CD8 809F3F98 44814000 */ mtc1 $at, $f8 ## $f8 = 8.00 -/* 00CDC 809F3F9C C7A60054 */ lwc1 $f6, 0x0054($sp) -/* 00CE0 809F3FA0 4606403E */ c.le.s $f8, $f6 -/* 00CE4 809F3FA4 00000000 */ nop -/* 00CE8 809F3FA8 45020023 */ bc1fl .L809F4038 -/* 00CEC 809F3FAC 8619026E */ lh $t9, 0x026E($s0) ## 0000026E -/* 00CF0 809F3FB0 920E0277 */ lbu $t6, 0x0277($s0) ## 00000277 -/* 00CF4 809F3FB4 8FA6005C */ lw $a2, 0x005C($sp) -/* 00CF8 809F3FB8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00CFC 809F3FBC 15C0001D */ bne $t6, $zero, .L809F4034 -/* 00D00 809F3FC0 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00D04 809F3FC4 C60A027C */ lwc1 $f10, 0x027C($s0) ## 0000027C -/* 00D08 809F3FC8 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 00D0C 809F3FCC C6020280 */ lwc1 $f2, 0x0280($s0) ## 00000280 -/* 00D10 809F3FD0 C60C0284 */ lwc1 $f12, 0x0284($s0) ## 00000284 -/* 00D14 809F3FD4 46105001 */ sub.s $f0, $f10, $f16 -/* 00D18 809F3FD8 240F0013 */ addiu $t7, $zero, 0x0013 ## $t7 = 00000013 -/* 00D1C 809F3FDC AFAF0028 */ sw $t7, 0x0028($sp) -/* 00D20 809F3FE0 AFA00024 */ sw $zero, 0x0024($sp) -/* 00D24 809F3FE4 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00D28 809F3FE8 AFA00020 */ sw $zero, 0x0020($sp) -/* 00D2C 809F3FEC AFA0001C */ sw $zero, 0x001C($sp) -/* 00D30 809F3FF0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00D34 809F3FF4 24070168 */ addiu $a3, $zero, 0x0168 ## $a3 = 00000168 -/* 00D38 809F3FF8 E7A20014 */ swc1 $f2, 0x0014($sp) -/* 00D3C 809F3FFC 0C00C916 */ jal Actor_SpawnAsChild - -/* 00D40 809F4000 E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 00D44 809F4004 14400006 */ bne $v0, $zero, .L809F4020 -/* 00D48 809F4008 8FA4005C */ lw $a0, 0x005C($sp) -/* 00D4C 809F400C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00D50 809F4010 0C00B7D5 */ jal func_8002DF54 -/* 00D54 809F4014 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 00D58 809F4018 0C00B55C */ jal Actor_Kill - -/* 00D5C 809F401C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L809F4020: -/* 00D60 809F4020 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00D64 809F4024 A2180277 */ sb $t8, 0x0277($s0) ## 00000277 -/* 00D68 809F4028 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D6C 809F402C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00D70 809F4030 2405387E */ addiu $a1, $zero, 0x387E ## $a1 = 0000387E -.L809F4034: -/* 00D74 809F4034 8619026E */ lh $t9, 0x026E($s0) ## 0000026E -.L809F4038: -/* 00D78 809F4038 C7B20054 */ lwc1 $f18, 0x0054($sp) -/* 00D7C 809F403C 3C040600 */ lui $a0, %hi(D_06003128) ## $a0 = 06000000 -/* 00D80 809F4040 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 00D84 809F4044 00000000 */ nop -/* 00D88 809F4048 468021A0 */ cvt.s.w $f6, $f4 -/* 00D8C 809F404C 4612303E */ c.le.s $f6, $f18 -/* 00D90 809F4050 00000000 */ nop -/* 00D94 809F4054 4502001B */ bc1fl .L809F40C4 -/* 00D98 809F4058 8FBF003C */ lw $ra, 0x003C($sp) -/* 00D9C 809F405C 0C028800 */ jal Animation_GetLastFrame - -/* 00DA0 809F4060 24843128 */ addiu $a0, $a0, %lo(D_06003128) ## $a0 = 06003128 -/* 00DA4 809F4064 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 00DA8 809F4068 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00DAC 809F406C 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 00DB0 809F4070 468042A0 */ cvt.s.w $f10, $f8 -/* 00DB4 809F4074 3C050600 */ lui $a1, %hi(D_06003128) ## $a1 = 06000000 -/* 00DB8 809F4078 24A53128 */ addiu $a1, $a1, %lo(D_06003128) ## $a1 = 06003128 -/* 00DBC 809F407C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00DC0 809F4080 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00DC4 809F4084 4600540D */ trunc.w.s $f16, $f10 -/* 00DC8 809F4088 44098000 */ mfc1 $t1, $f16 -/* 00DCC 809F408C 00000000 */ nop -/* 00DD0 809F4090 A609026E */ sh $t1, 0x026E($s0) ## 0000026E -/* 00DD4 809F4094 860A026E */ lh $t2, 0x026E($s0) ## 0000026E -/* 00DD8 809F4098 AFA00014 */ sw $zero, 0x0014($sp) -/* 00DDC 809F409C 8FA40044 */ lw $a0, 0x0044($sp) -/* 00DE0 809F40A0 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 00DE4 809F40A4 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00DE8 809F40A8 468024A0 */ cvt.s.w $f18, $f4 -/* 00DEC 809F40AC 0C029468 */ jal Animation_Change - -/* 00DF0 809F40B0 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 00DF4 809F40B4 3C0B809F */ lui $t3, %hi(func_809F40D4) ## $t3 = 809F0000 -/* 00DF8 809F40B8 256B40D4 */ addiu $t3, $t3, %lo(func_809F40D4) ## $t3 = 809F40D4 -/* 00DFC 809F40BC AE0B0214 */ sw $t3, 0x0214($s0) ## 00000214 -/* 00E00 809F40C0 8FBF003C */ lw $ra, 0x003C($sp) -.L809F40C4: -/* 00E04 809F40C4 8FB00038 */ lw $s0, 0x0038($sp) -/* 00E08 809F40C8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 00E0C 809F40CC 03E00008 */ jr $ra -/* 00E10 809F40D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F40D4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F40D4.s deleted file mode 100644 index d9354278eb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F40D4.s +++ /dev/null @@ -1,133 +0,0 @@ -.late_rodata -glabel D_809F6044 - .word 0x4622F983 -glabel D_809F6048 - .word 0x4622F983 - -.text -glabel func_809F40D4 -/* 00E14 809F40D4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00E18 809F40D8 AFB10028 */ sw $s1, 0x0028($sp) -/* 00E1C 809F40DC AFB00024 */ sw $s0, 0x0024($sp) -/* 00E20 809F40E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E24 809F40E4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00E28 809F40E8 2491014C */ addiu $s1, $a0, 0x014C ## $s1 = 0000014C -/* 00E2C 809F40EC AFA5003C */ sw $a1, 0x003C($sp) -/* 00E30 809F40F0 0C02927F */ jal SkelAnime_Update - -/* 00E34 809F40F4 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 00E38 809F40F8 3C01C334 */ lui $at, 0xC334 ## $at = C3340000 -/* 00E3C 809F40FC C604021C */ lwc1 $f4, 0x021C($s0) ## 0000021C -/* 00E40 809F4100 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 00E44 809F4104 44814000 */ mtc1 $at, $f8 ## $f8 = -180.00 -/* 00E48 809F4108 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 00E4C 809F410C 46062301 */ sub.s $f12, $f4, $f6 -/* 00E50 809F4110 460A4381 */ sub.s $f14, $f8, $f10 -/* 00E54 809F4114 E7AC0034 */ swc1 $f12, 0x0034($sp) -/* 00E58 809F4118 0C03F494 */ jal Math_FAtan2F -/* 00E5C 809F411C E7AE0030 */ swc1 $f14, 0x0030($sp) -/* 00E60 809F4120 3C01809F */ lui $at, %hi(D_809F6044) ## $at = 809F0000 -/* 00E64 809F4124 C4306044 */ lwc1 $f16, %lo(D_809F6044)($at) -/* 00E68 809F4128 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 00E6C 809F412C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00E70 809F4130 46100482 */ mul.s $f18, $f0, $f16 -/* 00E74 809F4134 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 -/* 00E78 809F4138 AFA00010 */ sw $zero, 0x0010($sp) -/* 00E7C 809F413C 4600910D */ trunc.w.s $f4, $f18 -/* 00E80 809F4140 44052000 */ mfc1 $a1, $f4 -/* 00E84 809F4144 00000000 */ nop -/* 00E88 809F4148 00052C00 */ sll $a1, $a1, 16 -/* 00E8C 809F414C 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00E90 809F4150 00052C03 */ sra $a1, $a1, 16 -/* 00E94 809F4154 C7AC0034 */ lwc1 $f12, 0x0034($sp) -/* 00E98 809F4158 0C03F494 */ jal Math_FAtan2F -/* 00E9C 809F415C C7AE0030 */ lwc1 $f14, 0x0030($sp) -/* 00EA0 809F4160 3C01809F */ lui $at, %hi(D_809F6048) ## $at = 809F0000 -/* 00EA4 809F4164 C4266048 */ lwc1 $f6, %lo(D_809F6048)($at) -/* 00EA8 809F4168 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 00EAC 809F416C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00EB0 809F4170 46060202 */ mul.s $f8, $f0, $f6 -/* 00EB4 809F4174 44819000 */ mtc1 $at, $f18 ## $f18 = 20.00 -/* 00EB8 809F4178 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00EBC 809F417C 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 00EC0 809F4180 4600428D */ trunc.w.s $f10, $f8 -/* 00EC4 809F4184 44195000 */ mfc1 $t9, $f10 -/* 00EC8 809F4188 00000000 */ nop -/* 00ECC 809F418C 00194400 */ sll $t0, $t9, 16 -/* 00ED0 809F4190 00084C03 */ sra $t1, $t0, 16 -/* 00ED4 809F4194 01E95023 */ subu $t2, $t7, $t1 -/* 00ED8 809F4198 448A8000 */ mtc1 $t2, $f16 ## $f16 = 0.00 -/* 00EDC 809F419C 00000000 */ nop -/* 00EE0 809F41A0 46808020 */ cvt.s.w $f0, $f16 -/* 00EE4 809F41A4 46000005 */ abs.s $f0, $f0 -/* 00EE8 809F41A8 4612003C */ c.lt.s $f0, $f18 -/* 00EEC 809F41AC 00000000 */ nop -/* 00EF0 809F41B0 45000004 */ bc1f .L809F41C4 -/* 00EF4 809F41B4 00000000 */ nop -/* 00EF8 809F41B8 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 00EFC 809F41BC 00000000 */ nop -/* 00F00 809F41C0 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -.L809F41C4: -/* 00F04 809F41C4 0C0295B2 */ jal Animation_OnFrame -/* 00F08 809F41C8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00F0C 809F41CC 14400004 */ bne $v0, $zero, .L809F41E0 -/* 00F10 809F41D0 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 00F14 809F41D4 0C0295B2 */ jal Animation_OnFrame -/* 00F18 809F41D8 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 -/* 00F1C 809F41DC 10400003 */ beq $v0, $zero, .L809F41EC -.L809F41E0: -/* 00F20 809F41E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F24 809F41E4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00F28 809F41E8 2405387F */ addiu $a1, $zero, 0x387F ## $a1 = 0000387F -.L809F41EC: -/* 00F2C 809F41EC 3C01C32C */ lui $at, 0xC32C ## $at = C32C0000 -/* 00F30 809F41F0 44814000 */ mtc1 $at, $f8 ## $f8 = -172.00 -/* 00F34 809F41F4 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 00F38 809F41F8 860B00B6 */ lh $t3, 0x00B6($s0) ## 000000B6 -/* 00F3C 809F41FC 3C040600 */ lui $a0, %hi(D_060024CC) ## $a0 = 06000000 -/* 00F40 809F4200 4608303C */ c.lt.s $f6, $f8 -/* 00F44 809F4204 A60B0032 */ sh $t3, 0x0032($s0) ## 00000032 -/* 00F48 809F4208 45020022 */ bc1fl .L809F4294 -/* 00F4C 809F420C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00F50 809F4210 0C028800 */ jal Animation_GetLastFrame - -/* 00F54 809F4214 248424CC */ addiu $a0, $a0, %lo(D_060024CC) ## $a0 = 060024CC -/* 00F58 809F4218 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 00F5C 809F421C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00F60 809F4220 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 00F64 809F4224 46805420 */ cvt.s.w $f16, $f10 -/* 00F68 809F4228 3C050600 */ lui $a1, %hi(D_060024CC) ## $a1 = 06000000 -/* 00F6C 809F422C 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00F70 809F4230 24A524CC */ addiu $a1, $a1, %lo(D_060024CC) ## $a1 = 060024CC -/* 00F74 809F4234 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 00F78 809F4238 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00F7C 809F423C 4600848D */ trunc.w.s $f18, $f16 -/* 00F80 809F4240 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00F84 809F4244 440D9000 */ mfc1 $t5, $f18 -/* 00F88 809F4248 00000000 */ nop -/* 00F8C 809F424C A60D026E */ sh $t5, 0x026E($s0) ## 0000026E -/* 00F90 809F4250 860E026E */ lh $t6, 0x026E($s0) ## 0000026E -/* 00F94 809F4254 AFB80014 */ sw $t8, 0x0014($sp) -/* 00F98 809F4258 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00F9C 809F425C 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00FA0 809F4260 00000000 */ nop -/* 00FA4 809F4264 468021A0 */ cvt.s.w $f6, $f4 -/* 00FA8 809F4268 0C029468 */ jal Animation_Change - -/* 00FAC 809F426C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00FB0 809F4270 3C01C32D */ lui $at, 0xC32D ## $at = C32D0000 -/* 00FB4 809F4274 44815000 */ mtc1 $at, $f10 ## $f10 = -173.00 -/* 00FB8 809F4278 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 00FBC 809F427C 3C19809F */ lui $t9, %hi(func_809F42A4) ## $t9 = 809F0000 -/* 00FC0 809F4280 273942A4 */ addiu $t9, $t9, %lo(func_809F42A4) ## $t9 = 809F42A4 -/* 00FC4 809F4284 AE190214 */ sw $t9, 0x0214($s0) ## 00000214 -/* 00FC8 809F4288 E60A002C */ swc1 $f10, 0x002C($s0) ## 0000002C -/* 00FCC 809F428C E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 00FD0 809F4290 8FBF002C */ lw $ra, 0x002C($sp) -.L809F4294: -/* 00FD4 809F4294 8FB00024 */ lw $s0, 0x0024($sp) -/* 00FD8 809F4298 8FB10028 */ lw $s1, 0x0028($sp) -/* 00FDC 809F429C 03E00008 */ jr $ra -/* 00FE0 809F42A0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F42A4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F42A4.s deleted file mode 100644 index dcf9f0d8f0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F42A4.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_809F42A4 -/* 00FE4 809F42A4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00FE8 809F42A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00FEC 809F42AC AFA40020 */ sw $a0, 0x0020($sp) -/* 00FF0 809F42B0 AFA50024 */ sw $a1, 0x0024($sp) -/* 00FF4 809F42B4 C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 -/* 00FF8 809F42B8 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00FFC 809F42BC AFA50020 */ sw $a1, 0x0020($sp) -/* 01000 809F42C0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01004 809F42C4 0C02927F */ jal SkelAnime_Update - -/* 01008 809F42C8 E7A4001C */ swc1 $f4, 0x001C($sp) -/* 0100C 809F42CC 8FA50020 */ lw $a1, 0x0020($sp) -/* 01010 809F42D0 C7A6001C */ lwc1 $f6, 0x001C($sp) -/* 01014 809F42D4 3C0F809F */ lui $t7, %hi(func_809F3624) ## $t7 = 809F0000 -/* 01018 809F42D8 84AE026E */ lh $t6, 0x026E($a1) ## 0000026E -/* 0101C 809F42DC 25EF3624 */ addiu $t7, $t7, %lo(func_809F3624) ## $t7 = 809F3624 -/* 01020 809F42E0 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 01024 809F42E4 00000000 */ nop -/* 01028 809F42E8 468042A0 */ cvt.s.w $f10, $f8 -/* 0102C 809F42EC 4606503E */ c.le.s $f10, $f6 -/* 01030 809F42F0 00000000 */ nop -/* 01034 809F42F4 45020003 */ bc1fl .L809F4304 -/* 01038 809F42F8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0103C 809F42FC ACAF0214 */ sw $t7, 0x0214($a1) ## 00000214 -/* 01040 809F4300 8FBF0014 */ lw $ra, 0x0014($sp) -.L809F4304: -/* 01044 809F4304 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01048 809F4308 03E00008 */ jr $ra -/* 0104C 809F430C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4310.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4310.s deleted file mode 100644 index 726791376a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4310.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_809F4310 -/* 01050 809F4310 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01054 809F4314 AFBF002C */ sw $ra, 0x002C($sp) -/* 01058 809F4318 AFB00028 */ sw $s0, 0x0028($sp) -/* 0105C 809F431C AFA50034 */ sw $a1, 0x0034($sp) -/* 01060 809F4320 848E0264 */ lh $t6, 0x0264($a0) ## 00000264 -/* 01064 809F4324 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01068 809F4328 3C040600 */ lui $a0, %hi(D_06000430) ## $a0 = 06000000 -/* 0106C 809F432C 55C00022 */ bnel $t6, $zero, .L809F43B8 -/* 01070 809F4330 8FBF002C */ lw $ra, 0x002C($sp) -/* 01074 809F4334 0C028800 */ jal Animation_GetLastFrame - -/* 01078 809F4338 24840430 */ addiu $a0, $a0, %lo(D_06000430) ## $a0 = 06000430 -/* 0107C 809F433C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01080 809F4340 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01084 809F4344 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01088 809F4348 468021A0 */ cvt.s.w $f6, $f4 -/* 0108C 809F434C 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 01090 809F4350 3C050600 */ lui $a1, %hi(D_06000430) ## $a1 = 06000000 -/* 01094 809F4354 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 01098 809F4358 44060000 */ mfc1 $a2, $f0 -/* 0109C 809F435C 44070000 */ mfc1 $a3, $f0 -/* 010A0 809F4360 4600320D */ trunc.w.s $f8, $f6 -/* 010A4 809F4364 24A50430 */ addiu $a1, $a1, %lo(D_06000430) ## $a1 = 06000430 -/* 010A8 809F4368 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 010AC 809F436C 44184000 */ mfc1 $t8, $f8 -/* 010B0 809F4370 00000000 */ nop -/* 010B4 809F4374 A618026E */ sh $t8, 0x026E($s0) ## 0000026E -/* 010B8 809F4378 8619026E */ lh $t9, 0x026E($s0) ## 0000026E -/* 010BC 809F437C AFA80014 */ sw $t0, 0x0014($sp) -/* 010C0 809F4380 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 010C4 809F4384 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 010C8 809F4388 00000000 */ nop -/* 010CC 809F438C 46805420 */ cvt.s.w $f16, $f10 -/* 010D0 809F4390 0C029468 */ jal Animation_Change - -/* 010D4 809F4394 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 010D8 809F4398 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 010DC 809F439C 44812000 */ mtc1 $at, $f4 ## $f4 = 8.00 -/* 010E0 809F43A0 3C09809F */ lui $t1, %hi(func_809F43C8) ## $t1 = 809F0000 -/* 010E4 809F43A4 252943C8 */ addiu $t1, $t1, %lo(func_809F43C8) ## $t1 = 809F43C8 -/* 010E8 809F43A8 A2000218 */ sb $zero, 0x0218($s0) ## 00000218 -/* 010EC 809F43AC AE090214 */ sw $t1, 0x0214($s0) ## 00000214 -/* 010F0 809F43B0 E6040164 */ swc1 $f4, 0x0164($s0) ## 00000164 -/* 010F4 809F43B4 8FBF002C */ lw $ra, 0x002C($sp) -.L809F43B8: -/* 010F8 809F43B8 8FB00028 */ lw $s0, 0x0028($sp) -/* 010FC 809F43BC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01100 809F43C0 03E00008 */ jr $ra -/* 01104 809F43C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43C8.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43C8.s deleted file mode 100644 index 30fdaddcb5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43C8.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_809F43C8 -/* 01108 809F43C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0110C 809F43CC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01110 809F43D0 AFA40018 */ sw $a0, 0x0018($sp) -/* 01114 809F43D4 AFA5001C */ sw $a1, 0x001C($sp) -/* 01118 809F43D8 0C02927F */ jal SkelAnime_Update - -/* 0111C 809F43DC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01120 809F43E0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01124 809F43E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01128 809F43E8 03E00008 */ jr $ra -/* 0112C 809F43EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43F0.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43F0.s deleted file mode 100644 index ef48ad9993..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43F0.s +++ /dev/null @@ -1,73 +0,0 @@ -glabel func_809F43F0 -/* 01130 809F43F0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01134 809F43F4 AFBF0034 */ sw $ra, 0x0034($sp) -/* 01138 809F43F8 AFB00030 */ sw $s0, 0x0030($sp) -/* 0113C 809F43FC AFA5003C */ sw $a1, 0x003C($sp) -/* 01140 809F4400 848E0264 */ lh $t6, 0x0264($a0) ## 00000264 -/* 01144 809F4404 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01148 809F4408 3C040600 */ lui $a0, %hi(D_06000B70) ## $a0 = 06000000 -/* 0114C 809F440C 55C00037 */ bnel $t6, $zero, .L809F44EC -/* 01150 809F4410 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01154 809F4414 0C028800 */ jal Animation_GetLastFrame - -/* 01158 809F4418 24840B70 */ addiu $a0, $a0, %lo(D_06000B70) ## $a0 = 06000B70 -/* 0115C 809F441C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01160 809F4420 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01164 809F4424 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 01168 809F4428 468021A0 */ cvt.s.w $f6, $f4 -/* 0116C 809F442C 3C050600 */ lui $a1, %hi(D_06000B70) ## $a1 = 06000000 -/* 01170 809F4430 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 01174 809F4434 24A50B70 */ addiu $a1, $a1, %lo(D_06000B70) ## $a1 = 06000B70 -/* 01178 809F4438 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0117C 809F443C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01180 809F4440 4600320D */ trunc.w.s $f8, $f6 -/* 01184 809F4444 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01188 809F4448 44184000 */ mfc1 $t8, $f8 -/* 0118C 809F444C 00000000 */ nop -/* 01190 809F4450 A618026E */ sh $t8, 0x026E($s0) ## 0000026E -/* 01194 809F4454 8619026E */ lh $t9, 0x026E($s0) ## 0000026E -/* 01198 809F4458 AFA80014 */ sw $t0, 0x0014($sp) -/* 0119C 809F445C E7B20018 */ swc1 $f18, 0x0018($sp) -/* 011A0 809F4460 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 011A4 809F4464 00000000 */ nop -/* 011A8 809F4468 46805420 */ cvt.s.w $f16, $f10 -/* 011AC 809F446C 0C029468 */ jal Animation_Change - -/* 011B0 809F4470 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 011B4 809F4474 86090274 */ lh $t1, 0x0274($s0) ## 00000274 -/* 011B8 809F4478 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 011BC 809F447C 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 011C0 809F4480 11210003 */ beq $t1, $at, .L809F4490 -/* 011C4 809F4484 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 011C8 809F4488 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 011CC 809F448C A60A0272 */ sh $t2, 0x0272($s0) ## 00000272 -.L809F4490: -/* 011D0 809F4490 240B000A */ addiu $t3, $zero, 0x000A ## $t3 = 0000000A -/* 011D4 809F4494 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 -/* 011D8 809F4498 240D000F */ addiu $t5, $zero, 0x000F ## $t5 = 0000000F -/* 011DC 809F449C 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF -/* 011E0 809F44A0 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A -/* 011E4 809F44A4 AFAF0020 */ sw $t7, 0x0020($sp) -/* 011E8 809F44A8 AFAE001C */ sw $t6, 0x001C($sp) -/* 011EC 809F44AC AFAD0018 */ sw $t5, 0x0018($sp) -/* 011F0 809F44B0 AFAC0014 */ sw $t4, 0x0014($sp) -/* 011F4 809F44B4 AFAB0010 */ sw $t3, 0x0010($sp) -/* 011F8 809F44B8 8FA4003C */ lw $a0, 0x003C($sp) -/* 011FC 809F44BC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01200 809F44C0 0C00A5E9 */ jal EffectSsHahen_SpawnBurst -/* 01204 809F44C4 AFA00024 */ sw $zero, 0x0024($sp) -/* 01208 809F44C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0120C 809F44CC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01210 809F44D0 2405387C */ addiu $a1, $zero, 0x387C ## $a1 = 0000387C -/* 01214 809F44D4 3C19809F */ lui $t9, %hi(func_809F44FC) ## $t9 = 809F0000 -/* 01218 809F44D8 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 0121C 809F44DC 273944FC */ addiu $t9, $t9, %lo(func_809F44FC) ## $t9 = 809F44FC -/* 01220 809F44E0 A2180218 */ sb $t8, 0x0218($s0) ## 00000218 -/* 01224 809F44E4 AE190214 */ sw $t9, 0x0214($s0) ## 00000214 -/* 01228 809F44E8 8FBF0034 */ lw $ra, 0x0034($sp) -.L809F44EC: -/* 0122C 809F44EC 8FB00030 */ lw $s0, 0x0030($sp) -/* 01230 809F44F0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01234 809F44F4 03E00008 */ jr $ra -/* 01238 809F44F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F44FC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F44FC.s deleted file mode 100644 index 81a4dc4407..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F44FC.s +++ /dev/null @@ -1,166 +0,0 @@ -.late_rodata -glabel D_809F604C - .word 0x4622F983 - -.text -glabel func_809F44FC -/* 0123C 809F44FC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01240 809F4500 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01244 809F4504 AFB00020 */ sw $s0, 0x0020($sp) -/* 01248 809F4508 AFA5003C */ sw $a1, 0x003C($sp) -/* 0124C 809F450C C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 -/* 01250 809F4510 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01254 809F4514 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01258 809F4518 0C02927F */ jal SkelAnime_Update - -/* 0125C 809F451C E7A40030 */ swc1 $f4, 0x0030($sp) -/* 01260 809F4520 860E026E */ lh $t6, 0x026E($s0) ## 0000026E -/* 01264 809F4524 C7A60030 */ lwc1 $f6, 0x0030($sp) -/* 01268 809F4528 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 0126C 809F452C 00000000 */ nop -/* 01270 809F4530 468042A0 */ cvt.s.w $f10, $f8 -/* 01274 809F4534 4606503E */ c.le.s $f10, $f6 -/* 01278 809F4538 00000000 */ nop -/* 0127C 809F453C 45020009 */ bc1fl .L809F4564 -/* 01280 809F4540 8619025C */ lh $t9, 0x025C($s0) ## 0000025C -/* 01284 809F4544 860F0274 */ lh $t7, 0x0274($s0) ## 00000274 -/* 01288 809F4548 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0128C 809F454C 3C18809F */ lui $t8, %hi(func_809F50EC) ## $t8 = 809F0000 -/* 01290 809F4550 15E10003 */ bne $t7, $at, .L809F4560 -/* 01294 809F4554 271850EC */ addiu $t8, $t8, %lo(func_809F50EC) ## $t8 = 809F50EC -/* 01298 809F4558 10000070 */ beq $zero, $zero, .L809F471C -/* 0129C 809F455C AE180214 */ sw $t8, 0x0214($s0) ## 00000214 -.L809F4560: -/* 012A0 809F4560 8619025C */ lh $t9, 0x025C($s0) ## 0000025C -.L809F4564: -/* 012A4 809F4564 5720003D */ bnel $t9, $zero, .L809F465C -/* 012A8 809F4568 8618025A */ lh $t8, 0x025A($s0) ## 0000025A -/* 012AC 809F456C 92080278 */ lbu $t0, 0x0278($s0) ## 00000278 -/* 012B0 809F4570 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 012B4 809F4574 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 012B8 809F4578 15000008 */ bne $t0, $zero, .L809F459C -/* 012BC 809F457C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 012C0 809F4580 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 012C4 809F4584 E7A0002C */ swc1 $f0, 0x002C($sp) -/* 012C8 809F4588 AFA00010 */ sw $zero, 0x0010($sp) -/* 012CC 809F458C 0C01E1A7 */ jal Math_SmoothStepToS - -/* 012D0 809F4590 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 -/* 012D4 809F4594 10000018 */ beq $zero, $zero, .L809F45F8 -/* 012D8 809F4598 C7A0002C */ lwc1 $f0, 0x002C($sp) -.L809F459C: -/* 012DC 809F459C C6100288 */ lwc1 $f16, 0x0288($s0) ## 00000288 -/* 012E0 809F45A0 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 -/* 012E4 809F45A4 C6040290 */ lwc1 $f4, 0x0290($s0) ## 00000290 -/* 012E8 809F45A8 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 012EC 809F45AC 46128301 */ sub.s $f12, $f16, $f18 -/* 012F0 809F45B0 0C03F494 */ jal Math_FAtan2F -/* 012F4 809F45B4 46082381 */ sub.s $f14, $f4, $f8 -/* 012F8 809F45B8 3C01809F */ lui $at, %hi(D_809F604C) ## $at = 809F0000 -/* 012FC 809F45BC C426604C */ lwc1 $f6, %lo(D_809F604C)($at) -/* 01300 809F45C0 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 01304 809F45C4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01308 809F45C8 46060282 */ mul.s $f10, $f0, $f6 -/* 0130C 809F45CC 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 -/* 01310 809F45D0 AFA00010 */ sw $zero, 0x0010($sp) -/* 01314 809F45D4 4600540D */ trunc.w.s $f16, $f10 -/* 01318 809F45D8 44058000 */ mfc1 $a1, $f16 -/* 0131C 809F45DC 00000000 */ nop -/* 01320 809F45E0 00052C00 */ sll $a1, $a1, 16 -/* 01324 809F45E4 0C01E1A7 */ jal Math_SmoothStepToS - -/* 01328 809F45E8 00052C03 */ sra $a1, $a1, 16 -/* 0132C 809F45EC 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 -/* 01330 809F45F0 44810000 */ mtc1 $at, $f0 ## $f0 = 90.00 -/* 01334 809F45F4 00000000 */ nop -.L809F45F8: -/* 01338 809F45F8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0133C 809F45FC 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 01340 809F4600 0C00CFBE */ jal Rand_ZeroFloat - -/* 01344 809F4604 46009300 */ add.s $f12, $f18, $f0 -/* 01348 809F4608 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0134C 809F460C 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 01350 809F4610 00000000 */ nop -/* 01354 809F4614 4604003C */ c.lt.s $f0, $f4 -/* 01358 809F4618 00000000 */ nop -/* 0135C 809F461C 45020036 */ bc1fl .L809F46F8 -/* 01360 809F4620 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 01364 809F4624 860A0274 */ lh $t2, 0x0274($s0) ## 00000274 -/* 01368 809F4628 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0136C 809F462C 11410031 */ beq $t2, $at, .L809F46F4 -/* 01370 809F4630 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 01374 809F4634 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 01378 809F4638 0C00CFBE */ jal Rand_ZeroFloat - -/* 0137C 809F463C 00000000 */ nop -/* 01380 809F4640 4600020D */ trunc.w.s $f8, $f0 -/* 01384 809F4644 440E4000 */ mfc1 $t6, $f8 -/* 01388 809F4648 00000000 */ nop -/* 0138C 809F464C 25CF001E */ addiu $t7, $t6, 0x001E ## $t7 = 0000001E -/* 01390 809F4650 10000028 */ beq $zero, $zero, .L809F46F4 -/* 01394 809F4654 A60F025C */ sh $t7, 0x025C($s0) ## 0000025C -/* 01398 809F4658 8618025A */ lh $t8, 0x025A($s0) ## 0000025A -.L809F465C: -/* 0139C 809F465C 57000014 */ bnel $t8, $zero, .L809F46B0 -/* 013A0 809F4660 86020272 */ lh $v0, 0x0272($s0) ## 00000272 -/* 013A4 809F4664 86190272 */ lh $t9, 0x0272($s0) ## 00000272 -/* 013A8 809F4668 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 013AC 809F466C 27280001 */ addiu $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 013B0 809F4670 A6080272 */ sh $t0, 0x0272($s0) ## 00000272 -/* 013B4 809F4674 86090272 */ lh $t1, 0x0272($s0) ## 00000272 -/* 013B8 809F4678 29210002 */ slti $at, $t1, 0x0002 -/* 013BC 809F467C 54200003 */ bnel $at, $zero, .L809F468C -/* 013C0 809F4680 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 013C4 809F4684 A60A0272 */ sh $t2, 0x0272($s0) ## 00000272 -/* 013C8 809F4688 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -.L809F468C: -/* 013CC 809F468C 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 013D0 809F4690 0C00CFBE */ jal Rand_ZeroFloat - -/* 013D4 809F4694 00000000 */ nop -/* 013D8 809F4698 4600018D */ trunc.w.s $f6, $f0 -/* 013DC 809F469C 440E3000 */ mfc1 $t6, $f6 -/* 013E0 809F46A0 00000000 */ nop -/* 013E4 809F46A4 25CF000A */ addiu $t7, $t6, 0x000A ## $t7 = 0000000A -/* 013E8 809F46A8 A60F025A */ sh $t7, 0x025A($s0) ## 0000025A -/* 013EC 809F46AC 86020272 */ lh $v0, 0x0272($s0) ## 00000272 -.L809F46B0: -/* 013F0 809F46B0 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 013F4 809F46B4 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 013F8 809F46B8 1040000B */ beq $v0, $zero, .L809F46E8 -/* 013FC 809F46BC 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 01400 809F46C0 0002C080 */ sll $t8, $v0, 2 -/* 01404 809F46C4 0302C021 */ addu $t8, $t8, $v0 -/* 01408 809F46C8 0018C0C0 */ sll $t8, $t8, 3 -/* 0140C 809F46CC 0302C023 */ subu $t8, $t8, $v0 -/* 01410 809F46D0 0018C100 */ sll $t8, $t8, 4 -/* 01414 809F46D4 0302C021 */ addu $t8, $t8, $v0 -/* 01418 809F46D8 0018C0C0 */ sll $t8, $t8, 3 -/* 0141C 809F46DC 00B82821 */ addu $a1, $a1, $t8 -/* 01420 809F46E0 00052C00 */ sll $a1, $a1, 16 -/* 01424 809F46E4 00052C03 */ sra $a1, $a1, 16 -.L809F46E8: -/* 01428 809F46E8 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 -/* 0142C 809F46EC 0C01E1A7 */ jal Math_SmoothStepToS - -/* 01430 809F46F0 AFA00010 */ sw $zero, 0x0010($sp) -.L809F46F4: -/* 01434 809F46F4 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -.L809F46F8: -/* 01438 809F46F8 44818000 */ mtc1 $at, $f16 ## $f16 = 70.00 -/* 0143C 809F46FC C60A0090 */ lwc1 $f10, 0x0090($s0) ## 00000090 -/* 01440 809F4700 3C19809F */ lui $t9, %hi(func_809F4E18) ## $t9 = 809F0000 -/* 01444 809F4704 27394E18 */ addiu $t9, $t9, %lo(func_809F4E18) ## $t9 = 809F4E18 -/* 01448 809F4708 4610503C */ c.lt.s $f10, $f16 -/* 0144C 809F470C 00000000 */ nop -/* 01450 809F4710 45020003 */ bc1fl .L809F4720 -/* 01454 809F4714 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01458 809F4718 AE190214 */ sw $t9, 0x0214($s0) ## 00000214 -.L809F471C: -/* 0145C 809F471C 8FBF0024 */ lw $ra, 0x0024($sp) -.L809F4720: -/* 01460 809F4720 8FB00020 */ lw $s0, 0x0020($sp) -/* 01464 809F4724 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01468 809F4728 03E00008 */ jr $ra -/* 0146C 809F472C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4730.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4730.s deleted file mode 100644 index ebd73ff6fe..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4730.s +++ /dev/null @@ -1,66 +0,0 @@ -glabel func_809F4730 -/* 01470 809F4730 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01474 809F4734 AFBF0034 */ sw $ra, 0x0034($sp) -/* 01478 809F4738 AFB00030 */ sw $s0, 0x0030($sp) -/* 0147C 809F473C AFA5003C */ sw $a1, 0x003C($sp) -/* 01480 809F4740 848E0264 */ lh $t6, 0x0264($a0) ## 00000264 -/* 01484 809F4744 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01488 809F4748 3C040600 */ lui $a0, %hi(D_06000894) ## $a0 = 06000000 -/* 0148C 809F474C 55C00031 */ bnel $t6, $zero, .L809F4814 -/* 01490 809F4750 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01494 809F4754 0C028800 */ jal Animation_GetLastFrame - -/* 01498 809F4758 24840894 */ addiu $a0, $a0, %lo(D_06000894) ## $a0 = 06000894 -/* 0149C 809F475C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 014A0 809F4760 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 014A4 809F4764 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 014A8 809F4768 468021A0 */ cvt.s.w $f6, $f4 -/* 014AC 809F476C 3C050600 */ lui $a1, %hi(D_06000894) ## $a1 = 06000000 -/* 014B0 809F4770 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 014B4 809F4774 24A50894 */ addiu $a1, $a1, %lo(D_06000894) ## $a1 = 06000894 -/* 014B8 809F4778 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 014BC 809F477C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 014C0 809F4780 4600320D */ trunc.w.s $f8, $f6 -/* 014C4 809F4784 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 014C8 809F4788 44184000 */ mfc1 $t8, $f8 -/* 014CC 809F478C 00000000 */ nop -/* 014D0 809F4790 A618026E */ sh $t8, 0x026E($s0) ## 0000026E -/* 014D4 809F4794 8619026E */ lh $t9, 0x026E($s0) ## 0000026E -/* 014D8 809F4798 AFA80014 */ sw $t0, 0x0014($sp) -/* 014DC 809F479C E7B20018 */ swc1 $f18, 0x0018($sp) -/* 014E0 809F47A0 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 014E4 809F47A4 00000000 */ nop -/* 014E8 809F47A8 46805420 */ cvt.s.w $f16, $f10 -/* 014EC 809F47AC 0C029468 */ jal Animation_Change - -/* 014F0 809F47B0 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 014F4 809F47B4 A2000218 */ sb $zero, 0x0218($s0) ## 00000218 -/* 014F8 809F47B8 2409000A */ addiu $t1, $zero, 0x000A ## $t1 = 0000000A -/* 014FC 809F47BC 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 -/* 01500 809F47C0 240B000F */ addiu $t3, $zero, 0x000F ## $t3 = 0000000F -/* 01504 809F47C4 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF -/* 01508 809F47C8 240D000A */ addiu $t5, $zero, 0x000A ## $t5 = 0000000A -/* 0150C 809F47CC AFAD0020 */ sw $t5, 0x0020($sp) -/* 01510 809F47D0 AFAC001C */ sw $t4, 0x001C($sp) -/* 01514 809F47D4 AFAB0018 */ sw $t3, 0x0018($sp) -/* 01518 809F47D8 AFAA0014 */ sw $t2, 0x0014($sp) -/* 0151C 809F47DC AFA90010 */ sw $t1, 0x0010($sp) -/* 01520 809F47E0 AFA00024 */ sw $zero, 0x0024($sp) -/* 01524 809F47E4 8FA4003C */ lw $a0, 0x003C($sp) -/* 01528 809F47E8 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 0152C 809F47EC 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 01530 809F47F0 0C00A5E9 */ jal EffectSsHahen_SpawnBurst -/* 01534 809F47F4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01538 809F47F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0153C 809F47FC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01540 809F4800 2405387C */ addiu $a1, $zero, 0x387C ## $a1 = 0000387C -/* 01544 809F4804 3C0E809F */ lui $t6, %hi(func_809F4824) ## $t6 = 809F0000 -/* 01548 809F4808 25CE4824 */ addiu $t6, $t6, %lo(func_809F4824) ## $t6 = 809F4824 -/* 0154C 809F480C AE0E0214 */ sw $t6, 0x0214($s0) ## 00000214 -/* 01550 809F4810 8FBF0034 */ lw $ra, 0x0034($sp) -.L809F4814: -/* 01554 809F4814 8FB00030 */ lw $s0, 0x0030($sp) -/* 01558 809F4818 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0155C 809F481C 03E00008 */ jr $ra -/* 01560 809F4820 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4824.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4824.s deleted file mode 100644 index 1f610a1594..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4824.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_809F4824 -/* 01564 809F4824 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01568 809F4828 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0156C 809F482C AFA40020 */ sw $a0, 0x0020($sp) -/* 01570 809F4830 AFA50024 */ sw $a1, 0x0024($sp) -/* 01574 809F4834 C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 -/* 01578 809F4838 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 0157C 809F483C AFA50020 */ sw $a1, 0x0020($sp) -/* 01580 809F4840 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01584 809F4844 0C02927F */ jal SkelAnime_Update - -/* 01588 809F4848 E7A4001C */ swc1 $f4, 0x001C($sp) -/* 0158C 809F484C 8FA50020 */ lw $a1, 0x0020($sp) -/* 01590 809F4850 C7A6001C */ lwc1 $f6, 0x001C($sp) -/* 01594 809F4854 84AE026E */ lh $t6, 0x026E($a1) ## 0000026E -/* 01598 809F4858 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 0159C 809F485C 00000000 */ nop -/* 015A0 809F4860 468042A0 */ cvt.s.w $f10, $f8 -/* 015A4 809F4864 4606503E */ c.le.s $f10, $f6 -/* 015A8 809F4868 00000000 */ nop -/* 015AC 809F486C 45020020 */ bc1fl .L809F48F0 -/* 015B0 809F4870 8FBF0014 */ lw $ra, 0x0014($sp) -/* 015B4 809F4874 84AF0274 */ lh $t7, 0x0274($a1) ## 00000274 -/* 015B8 809F4878 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 015BC 809F487C 2419012C */ addiu $t9, $zero, 0x012C ## $t9 = 0000012C -/* 015C0 809F4880 11E10017 */ beq $t7, $at, .L809F48E0 -/* 015C4 809F4884 3C08809F */ lui $t0, %hi(func_809F4BA4) ## $t0 = 809F0000 -/* 015C8 809F4888 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 015CC 809F488C 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 015D0 809F4890 0C00CFBE */ jal Rand_ZeroFloat - -/* 015D4 809F4894 AFA50020 */ sw $a1, 0x0020($sp) -/* 015D8 809F4898 8FA50020 */ lw $a1, 0x0020($sp) -/* 015DC 809F489C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 015E0 809F48A0 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 015E4 809F48A4 84B8026A */ lh $t8, 0x026A($a1) ## 0000026A -/* 015E8 809F48A8 4600028D */ trunc.w.s $f10, $f0 -/* 015EC 809F48AC 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 015F0 809F48B0 3C18809F */ lui $t8, %hi(func_809F48FC) ## $t8 = 809F0000 -/* 015F4 809F48B4 440E5000 */ mfc1 $t6, $f10 -/* 015F8 809F48B8 468084A0 */ cvt.s.w $f18, $f16 -/* 015FC 809F48BC 271848FC */ addiu $t8, $t8, %lo(func_809F48FC) ## $t8 = 809F48FC -/* 01600 809F48C0 ACB80214 */ sw $t8, 0x0214($a1) ## 00000214 -/* 01604 809F48C4 46049202 */ mul.s $f8, $f18, $f4 -/* 01608 809F48C8 4600418D */ trunc.w.s $f6, $f8 -/* 0160C 809F48CC 440A3000 */ mfc1 $t2, $f6 -/* 01610 809F48D0 00000000 */ nop -/* 01614 809F48D4 01CA7821 */ addu $t7, $t6, $t2 -/* 01618 809F48D8 10000004 */ beq $zero, $zero, .L809F48EC -/* 0161C 809F48DC A4AF0264 */ sh $t7, 0x0264($a1) ## 00000264 -.L809F48E0: -/* 01620 809F48E0 25084BA4 */ addiu $t0, $t0, %lo(func_809F4BA4) ## $t0 = 00004BA4 -/* 01624 809F48E4 A4B9025A */ sh $t9, 0x025A($a1) ## 0000025A -/* 01628 809F48E8 ACA80214 */ sw $t0, 0x0214($a1) ## 00000214 -.L809F48EC: -/* 0162C 809F48EC 8FBF0014 */ lw $ra, 0x0014($sp) -.L809F48F0: -/* 01630 809F48F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01634 809F48F4 03E00008 */ jr $ra -/* 01638 809F48F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F48FC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F48FC.s deleted file mode 100644 index 499f321ae8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F48FC.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_809F48FC -/* 0163C 809F48FC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01640 809F4900 AFB00028 */ sw $s0, 0x0028($sp) -/* 01644 809F4904 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01648 809F4908 AFBF002C */ sw $ra, 0x002C($sp) -/* 0164C 809F490C 3C040600 */ lui $a0, %hi(D_06002E1C) ## $a0 = 06000000 -/* 01650 809F4910 AFA50034 */ sw $a1, 0x0034($sp) -/* 01654 809F4914 0C028800 */ jal Animation_GetLastFrame - -/* 01658 809F4918 24842E1C */ addiu $a0, $a0, %lo(D_06002E1C) ## $a0 = 06002E1C -/* 0165C 809F491C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01660 809F4920 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01664 809F4924 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 01668 809F4928 468021A0 */ cvt.s.w $f6, $f4 -/* 0166C 809F492C 3C050600 */ lui $a1, %hi(D_06002E1C) ## $a1 = 06000000 -/* 01670 809F4930 24A52E1C */ addiu $a1, $a1, %lo(D_06002E1C) ## $a1 = 06002E1C -/* 01674 809F4934 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01678 809F4938 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0167C 809F493C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01680 809F4940 4600320D */ trunc.w.s $f8, $f6 -/* 01684 809F4944 440F4000 */ mfc1 $t7, $f8 -/* 01688 809F4948 00000000 */ nop -/* 0168C 809F494C A60F026E */ sh $t7, 0x026E($s0) ## 0000026E -/* 01690 809F4950 8618026E */ lh $t8, 0x026E($s0) ## 0000026E -/* 01694 809F4954 AFA00014 */ sw $zero, 0x0014($sp) -/* 01698 809F4958 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 0169C 809F495C 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 016A0 809F4960 00000000 */ nop -/* 016A4 809F4964 46805420 */ cvt.s.w $f16, $f10 -/* 016A8 809F4968 0C029468 */ jal Animation_Change - -/* 016AC 809F496C E7B00010 */ swc1 $f16, 0x0010($sp) -/* 016B0 809F4970 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 016B4 809F4974 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 -/* 016B8 809F4978 3C08809F */ lui $t0, %hi(func_809F49A4) ## $t0 = 809F0000 -/* 016BC 809F497C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 016C0 809F4980 250849A4 */ addiu $t0, $t0, %lo(func_809F49A4) ## $t0 = 809F49A4 -/* 016C4 809F4984 A2190218 */ sb $t9, 0x0218($s0) ## 00000218 -/* 016C8 809F4988 AE080214 */ sw $t0, 0x0214($s0) ## 00000214 -/* 016CC 809F498C E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 016D0 809F4990 8FBF002C */ lw $ra, 0x002C($sp) -/* 016D4 809F4994 8FB00028 */ lw $s0, 0x0028($sp) -/* 016D8 809F4998 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 016DC 809F499C 03E00008 */ jr $ra -/* 016E0 809F49A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F49A4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F49A4.s deleted file mode 100644 index ec4ba14cd6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F49A4.s +++ /dev/null @@ -1,149 +0,0 @@ -.late_rodata -glabel D_809F6050 - .word 0x4622F983 - -.text -glabel func_809F49A4 -/* 016E4 809F49A4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 016E8 809F49A8 AFB00020 */ sw $s0, 0x0020($sp) -/* 016EC 809F49AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 016F0 809F49B0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 016F4 809F49B4 AFA50034 */ sw $a1, 0x0034($sp) -/* 016F8 809F49B8 0C02927F */ jal SkelAnime_Update - -/* 016FC 809F49BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01700 809F49C0 86030258 */ lh $v1, 0x0258($s0) ## 00000258 -/* 01704 809F49C4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01708 809F49C8 14600037 */ bne $v1, $zero, .L809F4AA8 -/* 0170C 809F49CC 00000000 */ nop -/* 01710 809F49D0 860E0264 */ lh $t6, 0x0264($s0) ## 00000264 -/* 01714 809F49D4 15C00034 */ bne $t6, $zero, .L809F4AA8 -/* 01718 809F49D8 00000000 */ nop -/* 0171C 809F49DC C6040288 */ lwc1 $f4, 0x0288($s0) ## 00000288 -/* 01720 809F49E0 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 01724 809F49E4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01728 809F49E8 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 0172C 809F49EC 46062301 */ sub.s $f12, $f4, $f6 -/* 01730 809F49F0 C6080290 */ lwc1 $f8, 0x0290($s0) ## 00000290 -/* 01734 809F49F4 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 01738 809F49F8 46006005 */ abs.s $f0, $f12 -/* 0173C 809F49FC 460A4381 */ sub.s $f14, $f8, $f10 -/* 01740 809F4A00 4602003C */ c.lt.s $f0, $f2 -/* 01744 809F4A04 00000000 */ nop -/* 01748 809F4A08 45000015 */ bc1f .L809F4A60 -/* 0174C 809F4A0C 00000000 */ nop -/* 01750 809F4A10 46007005 */ abs.s $f0, $f14 -/* 01754 809F4A14 8FA40034 */ lw $a0, 0x0034($sp) -/* 01758 809F4A18 4602003C */ c.lt.s $f0, $f2 -/* 0175C 809F4A1C 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 01760 809F4A20 4500000F */ bc1f .L809F4A60 -/* 01764 809F4A24 00000000 */ nop -/* 01768 809F4A28 E7AC002C */ swc1 $f12, 0x002C($sp) -/* 0176C 809F4A2C 0C042F6F */ jal func_8010BDBC -/* 01770 809F4A30 E7AE0028 */ swc1 $f14, 0x0028($sp) -/* 01774 809F4A34 C7AC002C */ lwc1 $f12, 0x002C($sp) -/* 01778 809F4A38 10400009 */ beq $v0, $zero, .L809F4A60 -/* 0177C 809F4A3C C7AE0028 */ lwc1 $f14, 0x0028($sp) -/* 01780 809F4A40 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 01784 809F4A44 3C18809F */ lui $t8, %hi(func_809F4BA4) ## $t8 = 809F0000 -/* 01788 809F4A48 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 -/* 0178C 809F4A4C 27184BA4 */ addiu $t8, $t8, %lo(func_809F4BA4) ## $t8 = 809F4BA4 -/* 01790 809F4A50 A60F0274 */ sh $t7, 0x0274($s0) ## 00000274 -/* 01794 809F4A54 AE180214 */ sw $t8, 0x0214($s0) ## 00000214 -/* 01798 809F4A58 1000004D */ beq $zero, $zero, .L809F4B90 -/* 0179C 809F4A5C E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -.L809F4A60: -/* 017A0 809F4A60 0C03F494 */ jal Math_FAtan2F -/* 017A4 809F4A64 00000000 */ nop -/* 017A8 809F4A68 3C01809F */ lui $at, %hi(D_809F6050) ## $at = 809F0000 -/* 017AC 809F4A6C C4326050 */ lwc1 $f18, %lo(D_809F6050)($at) -/* 017B0 809F4A70 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 017B4 809F4A74 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 017B8 809F4A78 46120102 */ mul.s $f4, $f0, $f18 -/* 017BC 809F4A7C 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 -/* 017C0 809F4A80 AFA00010 */ sw $zero, 0x0010($sp) -/* 017C4 809F4A84 4600218D */ trunc.w.s $f6, $f4 -/* 017C8 809F4A88 44053000 */ mfc1 $a1, $f6 -/* 017CC 809F4A8C 00000000 */ nop -/* 017D0 809F4A90 00052C00 */ sll $a1, $a1, 16 -/* 017D4 809F4A94 0C01E1A7 */ jal Math_SmoothStepToS - -/* 017D8 809F4A98 00052C03 */ sra $a1, $a1, 16 -/* 017DC 809F4A9C 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 017E0 809F4AA0 10000021 */ beq $zero, $zero, .L809F4B28 -/* 017E4 809F4AA4 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 -.L809F4AA8: -/* 017E8 809F4AA8 14610013 */ bne $v1, $at, .L809F4AF8 -/* 017EC 809F4AAC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 017F0 809F4AB0 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 017F4 809F4AB4 0C00CFBE */ jal Rand_ZeroFloat - -/* 017F8 809F4AB8 00000000 */ nop -/* 017FC 809F4ABC 4600020D */ trunc.w.s $f8, $f0 -/* 01800 809F4AC0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01804 809F4AC4 44819000 */ mtc1 $at, $f18 ## $f18 = 20.00 -/* 01808 809F4AC8 440A4000 */ mfc1 $t2, $f8 -/* 0180C 809F4ACC 00000000 */ nop -/* 01810 809F4AD0 000A5C00 */ sll $t3, $t2, 16 -/* 01814 809F4AD4 000B6403 */ sra $t4, $t3, 16 -/* 01818 809F4AD8 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 -/* 0181C 809F4ADC 00000000 */ nop -/* 01820 809F4AE0 46805420 */ cvt.s.w $f16, $f10 -/* 01824 809F4AE4 46128100 */ add.s $f4, $f16, $f18 -/* 01828 809F4AE8 4600218D */ trunc.w.s $f6, $f4 -/* 0182C 809F4AEC 440E3000 */ mfc1 $t6, $f6 -/* 01830 809F4AF0 00000000 */ nop -/* 01834 809F4AF4 A60E0264 */ sh $t6, 0x0264($s0) ## 00000264 -.L809F4AF8: -/* 01838 809F4AF8 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 0183C 809F4AFC AFA00010 */ sw $zero, 0x0010($sp) -/* 01840 809F4B00 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 01844 809F4B04 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 01848 809F4B08 0C01E1A7 */ jal Math_SmoothStepToS - -/* 0184C 809F4B0C 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 -/* 01850 809F4B10 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 01854 809F4B14 AFA00010 */ sw $zero, 0x0010($sp) -/* 01858 809F4B18 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 0185C 809F4B1C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 01860 809F4B20 0C01E1A7 */ jal Math_SmoothStepToS - -/* 01864 809F4B24 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 -.L809F4B28: -/* 01868 809F4B28 8602025E */ lh $v0, 0x025E($s0) ## 0000025E -/* 0186C 809F4B2C 1440000B */ bne $v0, $zero, .L809F4B5C -/* 01870 809F4B30 30480003 */ andi $t0, $v0, 0x0003 ## $t0 = 00000000 -/* 01874 809F4B34 8618026A */ lh $t8, 0x026A($s0) ## 0000026A -/* 01878 809F4B38 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 0187C 809F4B3C A60F025E */ sh $t7, 0x025E($s0) ## 0000025E -/* 01880 809F4B40 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 01884 809F4B44 17200009 */ bne $t9, $zero, .L809F4B6C -/* 01888 809F4B48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0188C 809F4B4C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01890 809F4B50 24053880 */ addiu $a1, $zero, 0x3880 ## $a1 = 00003880 -/* 01894 809F4B54 10000006 */ beq $zero, $zero, .L809F4B70 -/* 01898 809F4B58 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 -.L809F4B5C: -/* 0189C 809F4B5C 15000003 */ bne $t0, $zero, .L809F4B6C -/* 018A0 809F4B60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018A4 809F4B64 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 018A8 809F4B68 2405387F */ addiu $a1, $zero, 0x387F ## $a1 = 0000387F -.L809F4B6C: -/* 018AC 809F4B6C 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 -.L809F4B70: -/* 018B0 809F4B70 30490008 */ andi $t1, $v0, 0x0008 ## $t1 = 00000000 -/* 018B4 809F4B74 11200006 */ beq $t1, $zero, .L809F4B90 -/* 018B8 809F4B78 304A0001 */ andi $t2, $v0, 0x0001 ## $t2 = 00000000 -/* 018BC 809F4B7C 11400004 */ beq $t2, $zero, .L809F4B90 -/* 018C0 809F4B80 3C0140F0 */ lui $at, 0x40F0 ## $at = 40F00000 -/* 018C4 809F4B84 44814000 */ mtc1 $at, $f8 ## $f8 = 7.50 -/* 018C8 809F4B88 00000000 */ nop -/* 018CC 809F4B8C E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 -.L809F4B90: -/* 018D0 809F4B90 8FBF0024 */ lw $ra, 0x0024($sp) -/* 018D4 809F4B94 8FB00020 */ lw $s0, 0x0020($sp) -/* 018D8 809F4B98 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 018DC 809F4B9C 03E00008 */ jr $ra -/* 018E0 809F4BA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4BA4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4BA4.s deleted file mode 100644 index ed56d48a98..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4BA4.s +++ /dev/null @@ -1,79 +0,0 @@ -.late_rodata -glabel D_809F6054 - .float 1.99000000954 - -.text -glabel func_809F4BA4 -/* 018E4 809F4BA4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 018E8 809F4BA8 AFB00028 */ sw $s0, 0x0028($sp) -/* 018EC 809F4BAC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 018F0 809F4BB0 AFBF002C */ sw $ra, 0x002C($sp) -/* 018F4 809F4BB4 3C040600 */ lui $a0, %hi(D_060006CC) ## $a0 = 06000000 -/* 018F8 809F4BB8 AFA50034 */ sw $a1, 0x0034($sp) -/* 018FC 809F4BBC 0C028800 */ jal Animation_GetLastFrame - -/* 01900 809F4BC0 248406CC */ addiu $a0, $a0, %lo(D_060006CC) ## $a0 = 060006CC -/* 01904 809F4BC4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01908 809F4BC8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 0190C 809F4BCC 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 01910 809F4BD0 468021A0 */ cvt.s.w $f6, $f4 -/* 01914 809F4BD4 3C050600 */ lui $a1, %hi(D_060006CC) ## $a1 = 06000000 -/* 01918 809F4BD8 24A506CC */ addiu $a1, $a1, %lo(D_060006CC) ## $a1 = 060006CC -/* 0191C 809F4BDC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01920 809F4BE0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01924 809F4BE4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01928 809F4BE8 4600320D */ trunc.w.s $f8, $f6 -/* 0192C 809F4BEC 440F4000 */ mfc1 $t7, $f8 -/* 01930 809F4BF0 00000000 */ nop -/* 01934 809F4BF4 A60F026E */ sh $t7, 0x026E($s0) ## 0000026E -/* 01938 809F4BF8 8618026E */ lh $t8, 0x026E($s0) ## 0000026E -/* 0193C 809F4BFC AFA00014 */ sw $zero, 0x0014($sp) -/* 01940 809F4C00 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 01944 809F4C04 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 01948 809F4C08 00000000 */ nop -/* 0194C 809F4C0C 46805420 */ cvt.s.w $f16, $f10 -/* 01950 809F4C10 0C029468 */ jal Animation_Change - -/* 01954 809F4C14 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 01958 809F4C18 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 0195C 809F4C1C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 01960 809F4C20 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 01964 809F4C24 0C00CFBE */ jal Rand_ZeroFloat - -/* 01968 809F4C28 A2190218 */ sb $t9, 0x0218($s0) ## 00000218 -/* 0196C 809F4C2C 4600010D */ trunc.w.s $f4, $f0 -/* 01970 809F4C30 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01974 809F4C34 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 01978 809F4C38 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF -/* 0197C 809F4C3C 44092000 */ mfc1 $t1, $f4 -/* 01980 809F4C40 A60E0272 */ sh $t6, 0x0272($s0) ## 00000272 -/* 01984 809F4C44 3C01809F */ lui $at, %hi(D_809F6054) ## $at = 809F0000 -/* 01988 809F4C48 00095400 */ sll $t2, $t1, 16 -/* 0198C 809F4C4C 000A5C03 */ sra $t3, $t2, 16 -/* 01990 809F4C50 448B3000 */ mtc1 $t3, $f6 ## $f6 = 0.00 -/* 01994 809F4C54 00000000 */ nop -/* 01998 809F4C58 46803220 */ cvt.s.w $f8, $f6 -/* 0199C 809F4C5C 460A4400 */ add.s $f16, $f8, $f10 -/* 019A0 809F4C60 4600848D */ trunc.w.s $f18, $f16 -/* 019A4 809F4C64 440D9000 */ mfc1 $t5, $f18 -/* 019A8 809F4C68 00000000 */ nop -/* 019AC 809F4C6C A60D0264 */ sh $t5, 0x0264($s0) ## 00000264 -/* 019B0 809F4C70 0C00CFBE */ jal Rand_ZeroFloat - -/* 019B4 809F4C74 C42C6054 */ lwc1 $f12, %lo(D_809F6054)($at) -/* 019B8 809F4C78 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 019BC 809F4C7C 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 019C0 809F4C80 3C18809F */ lui $t8, %hi(func_809F4CB4) ## $t8 = 809F0000 -/* 019C4 809F4C84 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 019C8 809F4C88 4604003C */ c.lt.s $f0, $f4 -/* 019CC 809F4C8C 27184CB4 */ addiu $t8, $t8, %lo(func_809F4CB4) ## $t8 = 809F4CB4 -/* 019D0 809F4C90 45020003 */ bc1fl .L809F4CA0 -/* 019D4 809F4C94 AE180214 */ sw $t8, 0x0214($s0) ## 00000214 -/* 019D8 809F4C98 A60F0272 */ sh $t7, 0x0272($s0) ## 00000272 -/* 019DC 809F4C9C AE180214 */ sw $t8, 0x0214($s0) ## 00000214 -.L809F4CA0: -/* 019E0 809F4CA0 8FBF002C */ lw $ra, 0x002C($sp) -/* 019E4 809F4CA4 8FB00028 */ lw $s0, 0x0028($sp) -/* 019E8 809F4CA8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 019EC 809F4CAC 03E00008 */ jr $ra -/* 019F0 809F4CB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4CB4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4CB4.s deleted file mode 100644 index 9d044ee390..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4CB4.s +++ /dev/null @@ -1,99 +0,0 @@ -glabel func_809F4CB4 -/* 019F4 809F4CB4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 019F8 809F4CB8 AFB00020 */ sw $s0, 0x0020($sp) -/* 019FC 809F4CBC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01A00 809F4CC0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01A04 809F4CC4 AFA5002C */ sw $a1, 0x002C($sp) -/* 01A08 809F4CC8 0C02927F */ jal SkelAnime_Update - -/* 01A0C 809F4CCC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01A10 809F4CD0 860E025A */ lh $t6, 0x025A($s0) ## 0000025A -/* 01A14 809F4CD4 55C00010 */ bnel $t6, $zero, .L809F4D18 -/* 01A18 809F4CD8 86090264 */ lh $t1, 0x0264($s0) ## 00000264 -/* 01A1C 809F4CDC 860F0274 */ lh $t7, 0x0274($s0) ## 00000274 -/* 01A20 809F4CE0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01A24 809F4CE4 3C08809F */ lui $t0, %hi(func_809F5478) ## $t0 = 809F0000 -/* 01A28 809F4CE8 15E10007 */ bne $t7, $at, .L809F4D08 -/* 01A2C 809F4CEC 25085478 */ addiu $t0, $t0, %lo(func_809F5478) ## $t0 = 809F5478 -/* 01A30 809F4CF0 3C19809F */ lui $t9, %hi(func_809F4E18) ## $t9 = 809F0000 -/* 01A34 809F4CF4 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 -/* 01A38 809F4CF8 27394E18 */ addiu $t9, $t9, %lo(func_809F4E18) ## $t9 = 809F4E18 -/* 01A3C 809F4CFC A6180274 */ sh $t8, 0x0274($s0) ## 00000274 -/* 01A40 809F4D00 10000040 */ beq $zero, $zero, .L809F4E04 -/* 01A44 809F4D04 AE190214 */ sw $t9, 0x0214($s0) ## 00000214 -.L809F4D08: -/* 01A48 809F4D08 A6000274 */ sh $zero, 0x0274($s0) ## 00000274 -/* 01A4C 809F4D0C 1000003D */ beq $zero, $zero, .L809F4E04 -/* 01A50 809F4D10 AE080214 */ sw $t0, 0x0214($s0) ## 00000214 -/* 01A54 809F4D14 86090264 */ lh $t1, 0x0264($s0) ## 00000264 -.L809F4D18: -/* 01A58 809F4D18 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 01A5C 809F4D1C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 01A60 809F4D20 1120001B */ beq $t1, $zero, .L809F4D90 -/* 01A64 809F4D24 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 -/* 01A68 809F4D28 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 01A6C 809F4D2C 0C01E1A7 */ jal Math_SmoothStepToS - -/* 01A70 809F4D30 AFA00010 */ sw $zero, 0x0010($sp) -/* 01A74 809F4D34 860A0264 */ lh $t2, 0x0264($s0) ## 00000264 -/* 01A78 809F4D38 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01A7C 809F4D3C 15410031 */ bne $t2, $at, .L809F4E04 -/* 01A80 809F4D40 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01A84 809F4D44 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 01A88 809F4D48 0C00CFBE */ jal Rand_ZeroFloat - -/* 01A8C 809F4D4C 00000000 */ nop -/* 01A90 809F4D50 4600010D */ trunc.w.s $f4, $f0 -/* 01A94 809F4D54 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01A98 809F4D58 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 01A9C 809F4D5C 86190272 */ lh $t9, 0x0272($s0) ## 00000272 -/* 01AA0 809F4D60 440C2000 */ mfc1 $t4, $f4 -/* 01AA4 809F4D64 00194023 */ subu $t0, $zero, $t9 -/* 01AA8 809F4D68 000C6C00 */ sll $t5, $t4, 16 -/* 01AAC 809F4D6C 000D7403 */ sra $t6, $t5, 16 -/* 01AB0 809F4D70 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 -/* 01AB4 809F4D74 A6080272 */ sh $t0, 0x0272($s0) ## 00000272 -/* 01AB8 809F4D78 46803220 */ cvt.s.w $f8, $f6 -/* 01ABC 809F4D7C 460A4400 */ add.s $f16, $f8, $f10 -/* 01AC0 809F4D80 4600848D */ trunc.w.s $f18, $f16 -/* 01AC4 809F4D84 44189000 */ mfc1 $t8, $f18 -/* 01AC8 809F4D88 1000001E */ beq $zero, $zero, .L809F4E04 -/* 01ACC 809F4D8C A618025C */ sh $t8, 0x025C($s0) ## 0000025C -.L809F4D90: -/* 01AD0 809F4D90 8602025C */ lh $v0, 0x025C($s0) ## 0000025C -/* 01AD4 809F4D94 5040001C */ beql $v0, $zero, .L809F4E08 -/* 01AD8 809F4D98 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01ADC 809F4D9C 860A0272 */ lh $t2, 0x0272($s0) ## 00000272 -/* 01AE0 809F4DA0 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 -/* 01AE4 809F4DA4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01AE8 809F4DA8 000A5AC0 */ sll $t3, $t2, 11 -/* 01AEC 809F4DAC 012B6021 */ addu $t4, $t1, $t3 -/* 01AF0 809F4DB0 14410014 */ bne $v0, $at, .L809F4E04 -/* 01AF4 809F4DB4 A60C00B6 */ sh $t4, 0x00B6($s0) ## 000000B6 -/* 01AF8 809F4DB8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01AFC 809F4DBC 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 01B00 809F4DC0 0C00CFBE */ jal Rand_ZeroFloat - -/* 01B04 809F4DC4 00000000 */ nop -/* 01B08 809F4DC8 4600010D */ trunc.w.s $f4, $f0 -/* 01B0C 809F4DCC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01B10 809F4DD0 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 01B14 809F4DD4 440E2000 */ mfc1 $t6, $f4 -/* 01B18 809F4DD8 00000000 */ nop -/* 01B1C 809F4DDC 000E7C00 */ sll $t7, $t6, 16 -/* 01B20 809F4DE0 000FC403 */ sra $t8, $t7, 16 -/* 01B24 809F4DE4 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 -/* 01B28 809F4DE8 00000000 */ nop -/* 01B2C 809F4DEC 46803220 */ cvt.s.w $f8, $f6 -/* 01B30 809F4DF0 460A4400 */ add.s $f16, $f8, $f10 -/* 01B34 809F4DF4 4600848D */ trunc.w.s $f18, $f16 -/* 01B38 809F4DF8 44089000 */ mfc1 $t0, $f18 -/* 01B3C 809F4DFC 00000000 */ nop -/* 01B40 809F4E00 A6080264 */ sh $t0, 0x0264($s0) ## 00000264 -.L809F4E04: -/* 01B44 809F4E04 8FBF0024 */ lw $ra, 0x0024($sp) -.L809F4E08: -/* 01B48 809F4E08 8FB00020 */ lw $s0, 0x0020($sp) -/* 01B4C 809F4E0C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01B50 809F4E10 03E00008 */ jr $ra -/* 01B54 809F4E14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4E18.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4E18.s deleted file mode 100644 index 9f7e45878d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4E18.s +++ /dev/null @@ -1,61 +0,0 @@ -glabel func_809F4E18 -/* 01B58 809F4E18 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01B5C 809F4E1C AFBF002C */ sw $ra, 0x002C($sp) -/* 01B60 809F4E20 AFB00028 */ sw $s0, 0x0028($sp) -/* 01B64 809F4E24 AFA50034 */ sw $a1, 0x0034($sp) -/* 01B68 809F4E28 84820264 */ lh $v0, 0x0264($a0) ## 00000264 -/* 01B6C 809F4E2C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01B70 809F4E30 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 01B74 809F4E34 1040000A */ beq $v0, $zero, .L809F4E60 -/* 01B78 809F4E38 00000000 */ nop -/* 01B7C 809F4E3C 54620029 */ bnel $v1, $v0, .L809F4EE4 -/* 01B80 809F4E40 8FBF002C */ lw $ra, 0x002C($sp) -/* 01B84 809F4E44 908E0276 */ lbu $t6, 0x0276($a0) ## 00000276 -/* 01B88 809F4E48 546E0026 */ bnel $v1, $t6, .L809F4EE4 -/* 01B8C 809F4E4C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01B90 809F4E50 0C01E221 */ jal func_80078884 -/* 01B94 809F4E54 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 -/* 01B98 809F4E58 10000022 */ beq $zero, $zero, .L809F4EE4 -/* 01B9C 809F4E5C 8FBF002C */ lw $ra, 0x002C($sp) -.L809F4E60: -/* 01BA0 809F4E60 3C040600 */ lui $a0, %hi(D_06000430) ## $a0 = 06000000 -/* 01BA4 809F4E64 0C028800 */ jal Animation_GetLastFrame - -/* 01BA8 809F4E68 24840430 */ addiu $a0, $a0, %lo(D_06000430) ## $a0 = 06000430 -/* 01BAC 809F4E6C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01BB0 809F4E70 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01BB4 809F4E74 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 01BB8 809F4E78 468021A0 */ cvt.s.w $f6, $f4 -/* 01BBC 809F4E7C 3C050600 */ lui $a1, %hi(D_06000430) ## $a1 = 06000000 -/* 01BC0 809F4E80 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 01BC4 809F4E84 24A50430 */ addiu $a1, $a1, %lo(D_06000430) ## $a1 = 06000430 -/* 01BC8 809F4E88 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01BCC 809F4E8C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01BD0 809F4E90 4600320D */ trunc.w.s $f8, $f6 -/* 01BD4 809F4E94 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01BD8 809F4E98 44184000 */ mfc1 $t8, $f8 -/* 01BDC 809F4E9C 00000000 */ nop -/* 01BE0 809F4EA0 A618026E */ sh $t8, 0x026E($s0) ## 0000026E -/* 01BE4 809F4EA4 8619026E */ lh $t9, 0x026E($s0) ## 0000026E -/* 01BE8 809F4EA8 AFA80014 */ sw $t0, 0x0014($sp) -/* 01BEC 809F4EAC E7B20018 */ swc1 $f18, 0x0018($sp) -/* 01BF0 809F4EB0 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 01BF4 809F4EB4 00000000 */ nop -/* 01BF8 809F4EB8 46805420 */ cvt.s.w $f16, $f10 -/* 01BFC 809F4EBC 0C029468 */ jal Animation_Change - -/* 01C00 809F4EC0 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 01C04 809F4EC4 A2000218 */ sb $zero, 0x0218($s0) ## 00000218 -/* 01C08 809F4EC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C0C 809F4ECC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01C10 809F4ED0 2405387D */ addiu $a1, $zero, 0x387D ## $a1 = 0000387D -/* 01C14 809F4ED4 3C09809F */ lui $t1, %hi(func_809F4EF4) ## $t1 = 809F0000 -/* 01C18 809F4ED8 25294EF4 */ addiu $t1, $t1, %lo(func_809F4EF4) ## $t1 = 809F4EF4 -/* 01C1C 809F4EDC AE090214 */ sw $t1, 0x0214($s0) ## 00000214 -/* 01C20 809F4EE0 8FBF002C */ lw $ra, 0x002C($sp) -.L809F4EE4: -/* 01C24 809F4EE4 8FB00028 */ lw $s0, 0x0028($sp) -/* 01C28 809F4EE8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01C2C 809F4EEC 03E00008 */ jr $ra -/* 01C30 809F4EF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4EF4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4EF4.s deleted file mode 100644 index bd6f8e2e87..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4EF4.s +++ /dev/null @@ -1,132 +0,0 @@ -.late_rodata -glabel D_809F6058 - .word 0x407F5C29 - -.text -glabel func_809F4EF4 -/* 01C34 809F4EF4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 01C38 809F4EF8 AFBF0034 */ sw $ra, 0x0034($sp) -/* 01C3C 809F4EFC AFB00030 */ sw $s0, 0x0030($sp) -/* 01C40 809F4F00 AFA5004C */ sw $a1, 0x004C($sp) -/* 01C44 809F4F04 C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 -/* 01C48 809F4F08 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01C4C 809F4F0C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01C50 809F4F10 0C02927F */ jal SkelAnime_Update - -/* 01C54 809F4F14 E7A40040 */ swc1 $f4, 0x0040($sp) -/* 01C58 809F4F18 860E026E */ lh $t6, 0x026E($s0) ## 0000026E -/* 01C5C 809F4F1C C7A60040 */ lwc1 $f6, 0x0040($sp) -/* 01C60 809F4F20 8FA4004C */ lw $a0, 0x004C($sp) -/* 01C64 809F4F24 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 01C68 809F4F28 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 01C6C 809F4F2C 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 01C70 809F4F30 468042A0 */ cvt.s.w $f10, $f8 -/* 01C74 809F4F34 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01C78 809F4F38 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A -/* 01C7C 809F4F3C 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 01C80 809F4F40 2419000F */ addiu $t9, $zero, 0x000F ## $t9 = 0000000F -/* 01C84 809F4F44 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 01C88 809F4F48 4606503E */ c.le.s $f10, $f6 -/* 01C8C 809F4F4C 2409000A */ addiu $t1, $zero, 0x000A ## $t1 = 0000000A -/* 01C90 809F4F50 45020055 */ bc1fl .L809F50A8 -/* 01C94 809F4F54 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01C98 809F4F58 AFAF0010 */ sw $t7, 0x0010($sp) -/* 01C9C 809F4F5C AFB80014 */ sw $t8, 0x0014($sp) -/* 01CA0 809F4F60 AFB90018 */ sw $t9, 0x0018($sp) -/* 01CA4 809F4F64 AFA8001C */ sw $t0, 0x001C($sp) -/* 01CA8 809F4F68 AFA90020 */ sw $t1, 0x0020($sp) -/* 01CAC 809F4F6C 0C00A5E9 */ jal EffectSsHahen_SpawnBurst -/* 01CB0 809F4F70 AFA00024 */ sw $zero, 0x0024($sp) -/* 01CB4 809F4F74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01CB8 809F4F78 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01CBC 809F4F7C 2405387C */ addiu $a1, $zero, 0x387C ## $a1 = 0000387C -/* 01CC0 809F4F80 86020274 */ lh $v0, 0x0274($s0) ## 00000274 -/* 01CC4 809F4F84 3C0A809F */ lui $t2, %hi(func_809F4310) ## $t2 = 809F0000 -/* 01CC8 809F4F88 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01CCC 809F4F8C 1040000A */ beq $v0, $zero, .L809F4FB8 -/* 01CD0 809F4F90 254A4310 */ addiu $t2, $t2, %lo(func_809F4310) ## $t2 = 809F4310 -/* 01CD4 809F4F94 1041000A */ beq $v0, $at, .L809F4FC0 -/* 01CD8 809F4F98 3C0B809F */ lui $t3, %hi(func_809F50B8) ## $t3 = 809F0000 -/* 01CDC 809F4F9C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01CE0 809F4FA0 1041000A */ beq $v0, $at, .L809F4FCC -/* 01CE4 809F4FA4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01CE8 809F4FA8 50410009 */ beql $v0, $at, .L809F4FD0 -/* 01CEC 809F4FAC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01CF0 809F4FB0 1000003D */ beq $zero, $zero, .L809F50A8 -/* 01CF4 809F4FB4 8FBF0034 */ lw $ra, 0x0034($sp) -.L809F4FB8: -/* 01CF8 809F4FB8 1000003A */ beq $zero, $zero, .L809F50A4 -/* 01CFC 809F4FBC AE0A0214 */ sw $t2, 0x0214($s0) ## 00000214 -.L809F4FC0: -/* 01D00 809F4FC0 256B50B8 */ addiu $t3, $t3, %lo(func_809F50B8) ## $t3 = 809F50B8 -/* 01D04 809F4FC4 10000037 */ beq $zero, $zero, .L809F50A4 -/* 01D08 809F4FC8 AE0B0214 */ sw $t3, 0x0214($s0) ## 00000214 -.L809F4FCC: -/* 01D0C 809F4FCC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -.L809F4FD0: -/* 01D10 809F4FD0 44819000 */ mtc1 $at, $f18 ## $f18 = 20.00 -/* 01D14 809F4FD4 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 01D18 809F4FD8 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 01D1C 809F4FDC 8FA5004C */ lw $a1, 0x004C($sp) -/* 01D20 809F4FE0 46128100 */ add.s $f4, $f16, $f18 -/* 01D24 809F4FE4 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 -/* 01D28 809F4FE8 24060131 */ addiu $a2, $zero, 0x0131 ## $a2 = 00000131 -/* 01D2C 809F4FEC 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 01D30 809F4FF0 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01D34 809F4FF4 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 01D38 809F4FF8 AFAD0024 */ sw $t5, 0x0024($sp) -/* 01D3C 809F4FFC AFA00020 */ sw $zero, 0x0020($sp) -/* 01D40 809F5000 AFA0001C */ sw $zero, 0x001C($sp) -/* 01D44 809F5004 AFA00018 */ sw $zero, 0x0018($sp) -/* 01D48 809F5008 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 01D4C 809F500C E7A80014 */ swc1 $f8, 0x0014($sp) -/* 01D50 809F5010 10400020 */ beq $v0, $zero, .L809F5094 -/* 01D54 809F5014 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 01D58 809F5018 86020274 */ lh $v0, 0x0274($s0) ## 00000274 -/* 01D5C 809F501C 3C01809F */ lui $at, %hi(D_809F6058) ## $at = 809F0000 -/* 01D60 809F5020 2442FFFD */ addiu $v0, $v0, 0xFFFD ## $v0 = FFFFFFFD -/* 01D64 809F5024 00021400 */ sll $v0, $v0, 16 -/* 01D68 809F5028 00021403 */ sra $v0, $v0, 16 -/* 01D6C 809F502C A4620150 */ sh $v0, 0x0150($v1) ## 00000150 -/* 01D70 809F5030 AFA30044 */ sw $v1, 0x0044($sp) -/* 01D74 809F5034 A7A2003E */ sh $v0, 0x003E($sp) -/* 01D78 809F5038 0C00CFBE */ jal Rand_ZeroFloat - -/* 01D7C 809F503C C42C6058 */ lwc1 $f12, %lo(D_809F6058)($at) -/* 01D80 809F5040 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01D84 809F5044 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 01D88 809F5048 87A2003E */ lh $v0, 0x003E($sp) -/* 01D8C 809F504C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 01D90 809F5050 4606003C */ c.lt.s $f0, $f6 -/* 01D94 809F5054 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 01D98 809F5058 8FA30044 */ lw $v1, 0x0044($sp) -/* 01D9C 809F505C 244E0001 */ addiu $t6, $v0, 0x0001 ## $t6 = 00000001 -/* 01DA0 809F5060 45020003 */ bc1fl .L809F5070 -/* 01DA4 809F5064 846F0150 */ lh $t7, 0x0150($v1) ## 00000150 -/* 01DA8 809F5068 A46E0150 */ sh $t6, 0x0150($v1) ## 00000150 -/* 01DAC 809F506C 846F0150 */ lh $t7, 0x0150($v1) ## 00000150 -.L809F5070: -/* 01DB0 809F5070 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01DB4 809F5074 E46A0060 */ swc1 $f10, 0x0060($v1) ## 00000060 -/* 01DB8 809F5078 15E10004 */ bne $t7, $at, .L809F508C -/* 01DBC 809F507C 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 01DC0 809F5080 44818000 */ mtc1 $at, $f16 ## $f16 = 7.00 -/* 01DC4 809F5084 00000000 */ nop -/* 01DC8 809F5088 E4700060 */ swc1 $f16, 0x0060($v1) ## 00000060 -.L809F508C: -/* 01DCC 809F508C 0C01E221 */ jal func_80078884 -/* 01DD0 809F5090 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 -.L809F5094: -/* 01DD4 809F5094 3C18809F */ lui $t8, %hi(func_809F4310) ## $t8 = 809F0000 -/* 01DD8 809F5098 27184310 */ addiu $t8, $t8, %lo(func_809F4310) ## $t8 = 809F4310 -/* 01DDC 809F509C A6000274 */ sh $zero, 0x0274($s0) ## 00000274 -/* 01DE0 809F50A0 AE180214 */ sw $t8, 0x0214($s0) ## 00000214 -.L809F50A4: -/* 01DE4 809F50A4 8FBF0034 */ lw $ra, 0x0034($sp) -.L809F50A8: -/* 01DE8 809F50A8 8FB00030 */ lw $s0, 0x0030($sp) -/* 01DEC 809F50AC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 01DF0 809F50B0 03E00008 */ jr $ra -/* 01DF4 809F50B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F50B8.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F50B8.s deleted file mode 100644 index 751e5a06a8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F50B8.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_809F50B8 -/* 01DF8 809F50B8 AFA50004 */ sw $a1, 0x0004($sp) -/* 01DFC 809F50BC 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 01E00 809F50C0 44812000 */ mtc1 $at, $f4 ## $f4 = 70.00 -/* 01E04 809F50C4 C4860090 */ lwc1 $f6, 0x0090($a0) ## 00000090 -/* 01E08 809F50C8 3C0E809F */ lui $t6, %hi(func_809F43F0) ## $t6 = 809F0000 -/* 01E0C 809F50CC 25CE43F0 */ addiu $t6, $t6, %lo(func_809F43F0) ## $t6 = 809F43F0 -/* 01E10 809F50D0 4606203C */ c.lt.s $f4, $f6 -/* 01E14 809F50D4 00000000 */ nop -/* 01E18 809F50D8 45000002 */ bc1f .L809F50E4 -/* 01E1C 809F50DC 00000000 */ nop -/* 01E20 809F50E0 AC8E0214 */ sw $t6, 0x0214($a0) ## 00000214 -.L809F50E4: -/* 01E24 809F50E4 03E00008 */ jr $ra -/* 01E28 809F50E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F50EC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F50EC.s deleted file mode 100644 index fc222b3dc4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F50EC.s +++ /dev/null @@ -1,56 +0,0 @@ -glabel func_809F50EC -/* 01E2C 809F50EC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01E30 809F50F0 AFBF002C */ sw $ra, 0x002C($sp) -/* 01E34 809F50F4 AFB00028 */ sw $s0, 0x0028($sp) -/* 01E38 809F50F8 AFA50034 */ sw $a1, 0x0034($sp) -/* 01E3C 809F50FC 848E0264 */ lh $t6, 0x0264($a0) ## 00000264 -/* 01E40 809F5100 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01E44 809F5104 3C040600 */ lui $a0, %hi(D_0600031C) ## $a0 = 06000000 -/* 01E48 809F5108 55C00027 */ bnel $t6, $zero, .L809F51A8 -/* 01E4C 809F510C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01E50 809F5110 0C028800 */ jal Animation_GetLastFrame - -/* 01E54 809F5114 2484031C */ addiu $a0, $a0, %lo(D_0600031C) ## $a0 = 0600031C -/* 01E58 809F5118 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01E5C 809F511C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01E60 809F5120 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 01E64 809F5124 468021A0 */ cvt.s.w $f6, $f4 -/* 01E68 809F5128 3C050600 */ lui $a1, %hi(D_0600031C) ## $a1 = 06000000 -/* 01E6C 809F512C 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 01E70 809F5130 24A5031C */ addiu $a1, $a1, %lo(D_0600031C) ## $a1 = 0600031C -/* 01E74 809F5134 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01E78 809F5138 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01E7C 809F513C 4600320D */ trunc.w.s $f8, $f6 -/* 01E80 809F5140 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01E84 809F5144 44184000 */ mfc1 $t8, $f8 -/* 01E88 809F5148 00000000 */ nop -/* 01E8C 809F514C A618026E */ sh $t8, 0x026E($s0) ## 0000026E -/* 01E90 809F5150 8619026E */ lh $t9, 0x026E($s0) ## 0000026E -/* 01E94 809F5154 AFA80014 */ sw $t0, 0x0014($sp) -/* 01E98 809F5158 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 01E9C 809F515C 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 01EA0 809F5160 00000000 */ nop -/* 01EA4 809F5164 46805420 */ cvt.s.w $f16, $f10 -/* 01EA8 809F5168 0C029468 */ jal Animation_Change - -/* 01EAC 809F516C E7B00010 */ swc1 $f16, 0x0010($sp) -/* 01EB0 809F5170 8FA40034 */ lw $a0, 0x0034($sp) -/* 01EB4 809F5174 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 01EB8 809F5178 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 01EBC 809F517C A20900AE */ sb $t1, 0x00AE($s0) ## 000000AE -/* 01EC0 809F5180 A20A0218 */ sb $t2, 0x0218($s0) ## 00000218 -/* 01EC4 809F5184 A600025A */ sh $zero, 0x025A($s0) ## 0000025A -/* 01EC8 809F5188 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 01ECC 809F518C 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 01ED0 809F5190 0C00CDD2 */ jal Actor_ChangeCategory - -/* 01ED4 809F5194 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 -/* 01ED8 809F5198 3C0B809F */ lui $t3, %hi(func_809F51B8) ## $t3 = 809F0000 -/* 01EDC 809F519C 256B51B8 */ addiu $t3, $t3, %lo(func_809F51B8) ## $t3 = 809F51B8 -/* 01EE0 809F51A0 AE0B0214 */ sw $t3, 0x0214($s0) ## 00000214 -/* 01EE4 809F51A4 8FBF002C */ lw $ra, 0x002C($sp) -.L809F51A8: -/* 01EE8 809F51A8 8FB00028 */ lw $s0, 0x0028($sp) -/* 01EEC 809F51AC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01EF0 809F51B0 03E00008 */ jr $ra -/* 01EF4 809F51B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F51B8.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F51B8.s deleted file mode 100644 index 580496fe39..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F51B8.s +++ /dev/null @@ -1,199 +0,0 @@ -.late_rodata -glabel D_809F605C - .word 0x4622F983 -glabel D_809F6060 - .float 3.14159274101 - -glabel D_809F6064 - .float 3.14159274101 - -.text -glabel func_809F51B8 -/* 01EF8 809F51B8 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 01EFC 809F51BC AFBF0034 */ sw $ra, 0x0034($sp) -/* 01F00 809F51C0 AFB00030 */ sw $s0, 0x0030($sp) -/* 01F04 809F51C4 AFA50084 */ sw $a1, 0x0084($sp) -/* 01F08 809F51C8 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 01F0C 809F51CC C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 -/* 01F10 809F51D0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01F14 809F51D4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01F18 809F51D8 AFA3007C */ sw $v1, 0x007C($sp) -/* 01F1C 809F51DC 0C02927F */ jal SkelAnime_Update - -/* 01F20 809F51E0 E7A40074 */ swc1 $f4, 0x0074($sp) -/* 01F24 809F51E4 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 01F28 809F51E8 AFA00010 */ sw $zero, 0x0010($sp) -/* 01F2C 809F51EC 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 01F30 809F51F0 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 01F34 809F51F4 0C01E1A7 */ jal Math_SmoothStepToS - -/* 01F38 809F51F8 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 -/* 01F3C 809F51FC 8FA3007C */ lw $v1, 0x007C($sp) -/* 01F40 809F5200 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 01F44 809F5204 C608027C */ lwc1 $f8, 0x027C($s0) ## 0000027C -/* 01F48 809F5208 44819000 */ mtc1 $at, $f18 ## $f18 = 30.00 -/* 01F4C 809F520C C4660024 */ lwc1 $f6, 0x0024($v1) ## 00000024 -/* 01F50 809F5210 C46A0028 */ lwc1 $f10, 0x0028($v1) ## 00000028 -/* 01F54 809F5214 46083081 */ sub.s $f2, $f6, $f8 -/* 01F58 809F5218 C468002C */ lwc1 $f8, 0x002C($v1) ## 0000002C -/* 01F5C 809F521C C6060280 */ lwc1 $f6, 0x0280($s0) ## 00000280 -/* 01F60 809F5220 46125100 */ add.s $f4, $f10, $f18 -/* 01F64 809F5224 C60A0284 */ lwc1 $f10, 0x0284($s0) ## 00000284 -/* 01F68 809F5228 46021482 */ mul.s $f18, $f2, $f2 -/* 01F6C 809F522C 460A4401 */ sub.s $f16, $f8, $f10 -/* 01F70 809F5230 46062301 */ sub.s $f12, $f4, $f6 -/* 01F74 809F5234 46108102 */ mul.s $f4, $f16, $f16 -/* 01F78 809F5238 46049000 */ add.s $f0, $f18, $f4 -/* 01F7C 809F523C 0C03F494 */ jal Math_FAtan2F -/* 01F80 809F5240 46000384 */ sqrt.s $f14, $f0 -/* 01F84 809F5244 3C01809F */ lui $at, %hi(D_809F605C) ## $at = 809F0000 -/* 01F88 809F5248 C426605C */ lwc1 $f6, %lo(D_809F605C)($at) -/* 01F8C 809F524C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 01F90 809F5250 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 01F94 809F5254 46060202 */ mul.s $f8, $f0, $f6 -/* 01F98 809F5258 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 -/* 01F9C 809F525C AFA00010 */ sw $zero, 0x0010($sp) -/* 01FA0 809F5260 4600428D */ trunc.w.s $f10, $f8 -/* 01FA4 809F5264 44055000 */ mfc1 $a1, $f10 -/* 01FA8 809F5268 00000000 */ nop -/* 01FAC 809F526C 00052C00 */ sll $a1, $a1, 16 -/* 01FB0 809F5270 00052C03 */ sra $a1, $a1, 16 -/* 01FB4 809F5274 00052823 */ subu $a1, $zero, $a1 -/* 01FB8 809F5278 00052C00 */ sll $a1, $a1, 16 -/* 01FBC 809F527C 0C01E1A7 */ jal Math_SmoothStepToS - -/* 01FC0 809F5280 00052C03 */ sra $a1, $a1, 16 -/* 01FC4 809F5284 8618026E */ lh $t8, 0x026E($s0) ## 0000026E -/* 01FC8 809F5288 C7B20074 */ lwc1 $f18, 0x0074($sp) -/* 01FCC 809F528C 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 01FD0 809F5290 00000000 */ nop -/* 01FD4 809F5294 468021A0 */ cvt.s.w $f6, $f4 -/* 01FD8 809F5298 4612303E */ c.le.s $f6, $f18 -/* 01FDC 809F529C 00000000 */ nop -/* 01FE0 809F52A0 4502000E */ bc1fl .L809F52DC -/* 01FE4 809F52A4 860D025A */ lh $t5, 0x025A($s0) ## 0000025A -/* 01FE8 809F52A8 8619025A */ lh $t9, 0x025A($s0) ## 0000025A -/* 01FEC 809F52AC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01FF0 809F52B0 5720000A */ bnel $t9, $zero, .L809F52DC -/* 01FF4 809F52B4 860D025A */ lh $t5, 0x025A($s0) ## 0000025A -/* 01FF8 809F52B8 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 01FFC 809F52BC 0C00CFBE */ jal Rand_ZeroFloat - -/* 02000 809F52C0 00000000 */ nop -/* 02004 809F52C4 4600020D */ trunc.w.s $f8, $f0 -/* 02008 809F52C8 440B4000 */ mfc1 $t3, $f8 -/* 0200C 809F52CC 00000000 */ nop -/* 02010 809F52D0 256C000A */ addiu $t4, $t3, 0x000A ## $t4 = 0000000A -/* 02014 809F52D4 A60C025A */ sh $t4, 0x025A($s0) ## 0000025A -/* 02018 809F52D8 860D025A */ lh $t5, 0x025A($s0) ## 0000025A -.L809F52DC: -/* 0201C 809F52DC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02020 809F52E0 3C0E809F */ lui $t6, %hi(func_809F50EC) ## $t6 = 809F0000 -/* 02024 809F52E4 15A10004 */ bne $t5, $at, .L809F52F8 -/* 02028 809F52E8 25CE50EC */ addiu $t6, $t6, %lo(func_809F50EC) ## $t6 = 809F50EC -/* 0202C 809F52EC A2000277 */ sb $zero, 0x0277($s0) ## 00000277 -/* 02030 809F52F0 1000005C */ beq $zero, $zero, .L809F5464 -/* 02034 809F52F4 AE0E0214 */ sw $t6, 0x0214($s0) ## 00000214 -.L809F52F8: -/* 02038 809F52F8 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 0203C 809F52FC 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 02040 809F5300 C60A0090 */ lwc1 $f10, 0x0090($s0) ## 00000090 -/* 02044 809F5304 3C18809F */ lui $t8, %hi(func_809F4E18) ## $t8 = 809F0000 -/* 02048 809F5308 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 0204C 809F530C 4604503C */ c.lt.s $f10, $f4 -/* 02050 809F5310 27184E18 */ addiu $t8, $t8, %lo(func_809F4E18) ## $t8 = 809F4E18 -/* 02054 809F5314 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 02058 809F5318 C7B20074 */ lwc1 $f18, 0x0074($sp) -/* 0205C 809F531C 45020005 */ bc1fl .L809F5334 -/* 02060 809F5320 44813000 */ mtc1 $at, $f6 ## $f6 = 8.00 -/* 02064 809F5324 A60F0274 */ sh $t7, 0x0274($s0) ## 00000274 -/* 02068 809F5328 1000004E */ beq $zero, $zero, .L809F5464 -/* 0206C 809F532C AE180214 */ sw $t8, 0x0214($s0) ## 00000214 -/* 02070 809F5330 44813000 */ mtc1 $at, $f6 ## $f6 = 8.00 -.L809F5334: -/* 02074 809F5334 00000000 */ nop -/* 02078 809F5338 4612303E */ c.le.s $f6, $f18 -/* 0207C 809F533C 00000000 */ nop -/* 02080 809F5340 45020049 */ bc1fl .L809F5468 -/* 02084 809F5344 8FBF0034 */ lw $ra, 0x0034($sp) -/* 02088 809F5348 92190277 */ lbu $t9, 0x0277($s0) ## 00000277 -/* 0208C 809F534C 57200046 */ bnel $t9, $zero, .L809F5468 -/* 02090 809F5350 8FBF0034 */ lw $ra, 0x0034($sp) -/* 02094 809F5354 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 02098 809F5358 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 0209C 809F535C 44812000 */ mtc1 $at, $f4 ## $f4 = 32768.00 -/* 020A0 809F5360 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 -/* 020A4 809F5364 3C01809F */ lui $at, %hi(D_809F6060) ## $at = 809F0000 -/* 020A8 809F5368 C4266060 */ lwc1 $f6, %lo(D_809F6060)($at) -/* 020AC 809F536C 468042A0 */ cvt.s.w $f10, $f8 -/* 020B0 809F5370 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 020B4 809F5374 46045483 */ div.s $f18, $f10, $f4 -/* 020B8 809F5378 46069302 */ mul.s $f12, $f18, $f6 -/* 020BC 809F537C 0C034348 */ jal Matrix_RotateY -/* 020C0 809F5380 00000000 */ nop -/* 020C4 809F5384 860900B4 */ lh $t1, 0x00B4($s0) ## 000000B4 -/* 020C8 809F5388 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 020CC 809F538C 44812000 */ mtc1 $at, $f4 ## $f4 = 32768.00 -/* 020D0 809F5390 44894000 */ mtc1 $t1, $f8 ## $f8 = 0.00 -/* 020D4 809F5394 3C01809F */ lui $at, %hi(D_809F6064) ## $at = 809F0000 -/* 020D8 809F5398 C4266064 */ lwc1 $f6, %lo(D_809F6064)($at) -/* 020DC 809F539C 468042A0 */ cvt.s.w $f10, $f8 -/* 020E0 809F53A0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 020E4 809F53A4 46045483 */ div.s $f18, $f10, $f4 -/* 020E8 809F53A8 46069302 */ mul.s $f12, $f18, $f6 -/* 020EC 809F53AC 0C0342DC */ jal Matrix_RotateX -/* 020F0 809F53B0 00000000 */ nop -/* 020F4 809F53B4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 020F8 809F53B8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 020FC 809F53BC 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 02100 809F53C0 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFDC -/* 02104 809F53C4 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFFD0 -/* 02108 809F53C8 E7A0005C */ swc1 $f0, 0x005C($sp) -/* 0210C 809F53CC E7A00060 */ swc1 $f0, 0x0060($sp) -/* 02110 809F53D0 0C0346BD */ jal Matrix_MultVec3f -/* 02114 809F53D4 E7A80064 */ swc1 $f8, 0x0064($sp) -/* 02118 809F53D8 C60A027C */ lwc1 $f10, 0x027C($s0) ## 0000027C -/* 0211C 809F53DC C7A40050 */ lwc1 $f4, 0x0050($sp) -/* 02120 809F53E0 C6120280 */ lwc1 $f18, 0x0280($s0) ## 00000280 -/* 02124 809F53E4 C7A60054 */ lwc1 $f6, 0x0054($sp) -/* 02128 809F53E8 46045000 */ add.s $f0, $f10, $f4 -/* 0212C 809F53EC C7AA0058 */ lwc1 $f10, 0x0058($sp) -/* 02130 809F53F0 C6080284 */ lwc1 $f8, 0x0284($s0) ## 00000284 -/* 02134 809F53F4 46069080 */ add.s $f2, $f18, $f6 -/* 02138 809F53F8 8FA50084 */ lw $a1, 0x0084($sp) -/* 0213C 809F53FC 44070000 */ mfc1 $a3, $f0 -/* 02140 809F5400 460A4300 */ add.s $f12, $f8, $f10 -/* 02144 809F5404 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 02148 809F5408 240D0004 */ addiu $t5, $zero, 0x0004 ## $t5 = 00000004 -/* 0214C 809F540C 24060193 */ addiu $a2, $zero, 0x0193 ## $a2 = 00000193 -/* 02150 809F5410 E7AC0014 */ swc1 $f12, 0x0014($sp) -/* 02154 809F5414 860A00B4 */ lh $t2, 0x00B4($s0) ## 000000B4 -/* 02158 809F5418 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 0215C 809F541C AFAA0018 */ sw $t2, 0x0018($sp) -/* 02160 809F5420 860B00B6 */ lh $t3, 0x00B6($s0) ## 000000B6 -/* 02164 809F5424 AFAB001C */ sw $t3, 0x001C($sp) -/* 02168 809F5428 860C00B8 */ lh $t4, 0x00B8($s0) ## 000000B8 -/* 0216C 809F542C AFAD0024 */ sw $t5, 0x0024($sp) -/* 02170 809F5430 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 02174 809F5434 AFAC0020 */ sw $t4, 0x0020($sp) -/* 02178 809F5438 10400006 */ beq $v0, $zero, .L809F5454 -/* 0217C 809F543C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02180 809F5440 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 02184 809F5444 44819000 */ mtc1 $at, $f18 ## $f18 = 0.50 -/* 02188 809F5448 C7A40054 */ lwc1 $f4, 0x0054($sp) -/* 0218C 809F544C 46122182 */ mul.s $f6, $f4, $f18 -/* 02190 809F5450 E4460060 */ swc1 $f6, 0x0060($v0) ## 00000060 -.L809F5454: -/* 02194 809F5454 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02198 809F5458 2405387E */ addiu $a1, $zero, 0x387E ## $a1 = 0000387E -/* 0219C 809F545C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 021A0 809F5460 A20E0277 */ sb $t6, 0x0277($s0) ## 00000277 -.L809F5464: -/* 021A4 809F5464 8FBF0034 */ lw $ra, 0x0034($sp) -.L809F5468: -/* 021A8 809F5468 8FB00030 */ lw $s0, 0x0030($sp) -/* 021AC 809F546C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 021B0 809F5470 03E00008 */ jr $ra -/* 021B4 809F5474 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5478.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5478.s deleted file mode 100644 index bc69847047..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5478.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_809F5478 -/* 021B8 809F5478 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 021BC 809F547C AFB00028 */ sw $s0, 0x0028($sp) -/* 021C0 809F5480 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 021C4 809F5484 AFBF002C */ sw $ra, 0x002C($sp) -/* 021C8 809F5488 3C040600 */ lui $a0, %hi(D_06002E1C) ## $a0 = 06000000 -/* 021CC 809F548C AFA50034 */ sw $a1, 0x0034($sp) -/* 021D0 809F5490 0C028800 */ jal Animation_GetLastFrame - -/* 021D4 809F5494 24842E1C */ addiu $a0, $a0, %lo(D_06002E1C) ## $a0 = 06002E1C -/* 021D8 809F5498 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 021DC 809F549C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 021E0 809F54A0 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 021E4 809F54A4 468021A0 */ cvt.s.w $f6, $f4 -/* 021E8 809F54A8 3C050600 */ lui $a1, %hi(D_06002E1C) ## $a1 = 06000000 -/* 021EC 809F54AC 24A52E1C */ addiu $a1, $a1, %lo(D_06002E1C) ## $a1 = 06002E1C -/* 021F0 809F54B0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 021F4 809F54B4 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 021F8 809F54B8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 021FC 809F54BC 4600320D */ trunc.w.s $f8, $f6 -/* 02200 809F54C0 440F4000 */ mfc1 $t7, $f8 -/* 02204 809F54C4 00000000 */ nop -/* 02208 809F54C8 A60F026E */ sh $t7, 0x026E($s0) ## 0000026E -/* 0220C 809F54CC 8618026E */ lh $t8, 0x026E($s0) ## 0000026E -/* 02210 809F54D0 AFA00014 */ sw $zero, 0x0014($sp) -/* 02214 809F54D4 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 02218 809F54D8 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 0221C 809F54DC 00000000 */ nop -/* 02220 809F54E0 46805420 */ cvt.s.w $f16, $f10 -/* 02224 809F54E4 0C029468 */ jal Animation_Change - -/* 02228 809F54E8 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 0222C 809F54EC 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 02230 809F54F0 44812000 */ mtc1 $at, $f4 ## $f4 = 4.00 -/* 02234 809F54F4 3C19809F */ lui $t9, %hi(func_809F551C) ## $t9 = 809F0000 -/* 02238 809F54F8 2739551C */ addiu $t9, $t9, %lo(func_809F551C) ## $t9 = 809F551C -/* 0223C 809F54FC A2000218 */ sb $zero, 0x0218($s0) ## 00000218 -/* 02240 809F5500 AE190214 */ sw $t9, 0x0214($s0) ## 00000214 -/* 02244 809F5504 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 02248 809F5508 8FBF002C */ lw $ra, 0x002C($sp) -/* 0224C 809F550C 8FB00028 */ lw $s0, 0x0028($sp) -/* 02250 809F5510 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02254 809F5514 03E00008 */ jr $ra -/* 02258 809F5518 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F551C.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F551C.s deleted file mode 100644 index d6293c587a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F551C.s +++ /dev/null @@ -1,77 +0,0 @@ -.late_rodata -glabel D_809F6068 - .word 0x4622F983 - -.text -glabel func_809F551C -/* 0225C 809F551C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02260 809F5520 AFB00020 */ sw $s0, 0x0020($sp) -/* 02264 809F5524 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02268 809F5528 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0226C 809F552C AFA50034 */ sw $a1, 0x0034($sp) -/* 02270 809F5530 0C02927F */ jal SkelAnime_Update - -/* 02274 809F5534 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02278 809F5538 C604021C */ lwc1 $f4, 0x021C($s0) ## 0000021C -/* 0227C 809F553C C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 02280 809F5540 C6080224 */ lwc1 $f8, 0x0224($s0) ## 00000224 -/* 02284 809F5544 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 02288 809F5548 46062301 */ sub.s $f12, $f4, $f6 -/* 0228C 809F554C 460A4381 */ sub.s $f14, $f8, $f10 -/* 02290 809F5550 E7AC002C */ swc1 $f12, 0x002C($sp) -/* 02294 809F5554 0C03F494 */ jal Math_FAtan2F -/* 02298 809F5558 E7AE0028 */ swc1 $f14, 0x0028($sp) -/* 0229C 809F555C 3C01809F */ lui $at, %hi(D_809F6068) ## $at = 809F0000 -/* 022A0 809F5560 C4306068 */ lwc1 $f16, %lo(D_809F6068)($at) -/* 022A4 809F5564 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 022A8 809F5568 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 022AC 809F556C 46100482 */ mul.s $f18, $f0, $f16 -/* 022B0 809F5570 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 -/* 022B4 809F5574 AFA00010 */ sw $zero, 0x0010($sp) -/* 022B8 809F5578 4600910D */ trunc.w.s $f4, $f18 -/* 022BC 809F557C 44052000 */ mfc1 $a1, $f4 -/* 022C0 809F5580 00000000 */ nop -/* 022C4 809F5584 00052C00 */ sll $a1, $a1, 16 -/* 022C8 809F5588 0C01E1A7 */ jal Math_SmoothStepToS - -/* 022CC 809F558C 00052C03 */ sra $a1, $a1, 16 -/* 022D0 809F5590 8602025E */ lh $v0, 0x025E($s0) ## 0000025E -/* 022D4 809F5594 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A -/* 022D8 809F5598 14400003 */ bne $v0, $zero, .L809F55A8 -/* 022DC 809F559C 30580001 */ andi $t8, $v0, 0x0001 ## $t8 = 00000000 -/* 022E0 809F55A0 10000005 */ beq $zero, $zero, .L809F55B8 -/* 022E4 809F55A4 A60F025E */ sh $t7, 0x025E($s0) ## 0000025E -.L809F55A8: -/* 022E8 809F55A8 17000003 */ bne $t8, $zero, .L809F55B8 -/* 022EC 809F55AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022F0 809F55B0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 022F4 809F55B4 2405387F */ addiu $a1, $zero, 0x387F ## $a1 = 0000387F -.L809F55B8: -/* 022F8 809F55B8 C7A0002C */ lwc1 $f0, 0x002C($sp) -/* 022FC 809F55BC 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 02300 809F55C0 44811000 */ mtc1 $at, $f2 ## $f2 = 7.00 -/* 02304 809F55C4 46000005 */ abs.s $f0, $f0 -/* 02308 809F55C8 4602003C */ c.lt.s $f0, $f2 -/* 0230C 809F55CC C7A00028 */ lwc1 $f0, 0x0028($sp) -/* 02310 809F55D0 4502000F */ bc1fl .L809F5610 -/* 02314 809F55D4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02318 809F55D8 46000005 */ abs.s $f0, $f0 -/* 0231C 809F55DC 3C19809F */ lui $t9, %hi(func_809F4E18) ## $t9 = 809F0000 -/* 02320 809F55E0 4602003C */ c.lt.s $f0, $f2 -/* 02324 809F55E4 27394E18 */ addiu $t9, $t9, %lo(func_809F4E18) ## $t9 = 809F4E18 -/* 02328 809F55E8 45020009 */ bc1fl .L809F5610 -/* 0232C 809F55EC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02330 809F55F0 C606021C */ lwc1 $f6, 0x021C($s0) ## 0000021C -/* 02334 809F55F4 C6080224 */ lwc1 $f8, 0x0224($s0) ## 00000224 -/* 02338 809F55F8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 0233C 809F55FC AE190214 */ sw $t9, 0x0214($s0) ## 00000214 -/* 02340 809F5600 E6060024 */ swc1 $f6, 0x0024($s0) ## 00000024 -/* 02344 809F5604 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C -/* 02348 809F5608 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 0234C 809F560C 8FBF0024 */ lw $ra, 0x0024($sp) -.L809F5610: -/* 02350 809F5610 8FB00020 */ lw $s0, 0x0020($sp) -/* 02354 809F5614 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02358 809F5618 03E00008 */ jr $ra -/* 0235C 809F561C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F58E4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F58E4.s deleted file mode 100644 index 244e0bc80a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F58E4.s +++ /dev/null @@ -1,77 +0,0 @@ -.rdata -glabel D_809F5F94 - .asciz "../z_en_dnt_nomal.c" - .balign 4 - -glabel D_809F5FA8 - .asciz "../z_en_dnt_nomal.c" - .balign 4 - -.text -glabel func_809F58E4 -/* 02624 809F58E4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 02628 809F58E8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0262C 809F58EC AFBF0014 */ sw $ra, 0x0014($sp) -/* 02630 809F58F0 AFA40040 */ sw $a0, 0x0040($sp) -/* 02634 809F58F4 AFA60048 */ sw $a2, 0x0048($sp) -/* 02638 809F58F8 10A1000A */ beq $a1, $at, .L809F5924 -/* 0263C 809F58FC AFA7004C */ sw $a3, 0x004C($sp) -/* 02640 809F5900 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 02644 809F5904 10A10007 */ beq $a1, $at, .L809F5924 -/* 02648 809F5908 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0264C 809F590C 10A10005 */ beq $a1, $at, .L809F5924 -/* 02650 809F5910 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 02654 809F5914 10A10003 */ beq $a1, $at, .L809F5924 -/* 02658 809F5918 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0265C 809F591C 54A1002D */ bnel $a1, $at, .L809F59D4 -/* 02660 809F5920 8FBF0014 */ lw $ra, 0x0014($sp) -.L809F5924: -/* 02664 809F5924 8FAE0040 */ lw $t6, 0x0040($sp) -/* 02668 809F5928 3C06809F */ lui $a2, %hi(D_809F5F94) ## $a2 = 809F0000 -/* 0266C 809F592C 24C65F94 */ addiu $a2, $a2, %lo(D_809F5F94) ## $a2 = 809F5F94 -/* 02670 809F5930 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 02674 809F5934 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE8 -/* 02678 809F5938 240706C5 */ addiu $a3, $zero, 0x06C5 ## $a3 = 000006C5 -/* 0267C 809F593C 0C031AB1 */ jal Graph_OpenDisps -/* 02680 809F5940 AFA50038 */ sw $a1, 0x0038($sp) -/* 02684 809F5944 8FA80038 */ lw $t0, 0x0038($sp) -/* 02688 809F5948 3C18E700 */ lui $t8, 0xE700 ## $t8 = E7000000 -/* 0268C 809F594C 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 -/* 02690 809F5950 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 02694 809F5954 3C0D809F */ lui $t5, %hi(D_809F5E4C) ## $t5 = 809F0000 -/* 02698 809F5958 25AD5E4C */ addiu $t5, $t5, %lo(D_809F5E4C) ## $t5 = 809F5E4C -/* 0269C 809F595C 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 -/* 026A0 809F5960 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 026A4 809F5964 AC600004 */ sw $zero, 0x0004($v1) ## 00000004 -/* 026A8 809F5968 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 026AC 809F596C 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 026B0 809F5970 3C06809F */ lui $a2, %hi(D_809F5FA8) ## $a2 = 809F0000 -/* 026B4 809F5974 24C65FA8 */ addiu $a2, $a2, %lo(D_809F5FA8) ## $a2 = 809F5FA8 -/* 026B8 809F5978 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 -/* 026BC 809F597C AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 -/* 026C0 809F5980 AC690000 */ sw $t1, 0x0000($v1) ## 00000000 -/* 026C4 809F5984 8FAA0054 */ lw $t2, 0x0054($sp) -/* 026C8 809F5988 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE8 -/* 026CC 809F598C 240706CF */ addiu $a3, $zero, 0x06CF ## $a3 = 000006CF -/* 026D0 809F5990 854B026A */ lh $t3, 0x026A($t2) ## 0000026A -/* 026D4 809F5994 000B6080 */ sll $t4, $t3, 2 -/* 026D8 809F5998 018D1021 */ addu $v0, $t4, $t5 -/* 026DC 809F599C 904FFFFE */ lbu $t7, -0x0002($v0) ## FFFFFFFE -/* 026E0 809F59A0 9049FFFC */ lbu $t1, -0x0004($v0) ## FFFFFFFC -/* 026E4 809F59A4 904DFFFD */ lbu $t5, -0x0003($v0) ## FFFFFFFD -/* 026E8 809F59A8 000FC200 */ sll $t8, $t7, 8 -/* 026EC 809F59AC 00095600 */ sll $t2, $t1, 24 -/* 026F0 809F59B0 030A5825 */ or $t3, $t8, $t2 ## $t3 = E7000000 -/* 026F4 809F59B4 000D7400 */ sll $t6, $t5, 16 -/* 026F8 809F59B8 016E7825 */ or $t7, $t3, $t6 ## $t7 = E7000000 -/* 026FC 809F59BC 35F900FF */ ori $t9, $t7, 0x00FF ## $t9 = E70000FF -/* 02700 809F59C0 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 -/* 02704 809F59C4 8FA90040 */ lw $t1, 0x0040($sp) -/* 02708 809F59C8 0C031AD5 */ jal Graph_CloseDisps -/* 0270C 809F59CC 8D250000 */ lw $a1, 0x0000($t1) ## FB000000 -/* 02710 809F59D0 8FBF0014 */ lw $ra, 0x0014($sp) -.L809F59D4: -/* 02714 809F59D4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 02718 809F59D8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0271C 809F59DC 03E00008 */ jr $ra -/* 02720 809F59E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F59E4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F59E4.s deleted file mode 100644 index 9f8ce3be64..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F59E4.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_809F59E4 -/* 02724 809F59E4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02728 809F59E8 3C0E809F */ lui $t6, %hi(D_809F5E88) ## $t6 = 809F0000 -/* 0272C 809F59EC AFBF0014 */ sw $ra, 0x0014($sp) -/* 02730 809F59F0 AFA40028 */ sw $a0, 0x0028($sp) -/* 02734 809F59F4 AFA60030 */ sw $a2, 0x0030($sp) -/* 02738 809F59F8 AFA70034 */ sw $a3, 0x0034($sp) -/* 0273C 809F59FC 25CE5E88 */ addiu $t6, $t6, %lo(D_809F5E88) ## $t6 = 809F5E88 -/* 02740 809F5A00 8DD80000 */ lw $t8, 0x0000($t6) ## 809F5E88 -/* 02744 809F5A04 8FA60038 */ lw $a2, 0x0038($sp) -/* 02748 809F5A08 27A40018 */ addiu $a0, $sp, 0x0018 ## $a0 = FFFFFFF0 -/* 0274C 809F5A0C AC980000 */ sw $t8, 0x0000($a0) ## FFFFFFF0 -/* 02750 809F5A10 8DCF0004 */ lw $t7, 0x0004($t6) ## 809F5E8C -/* 02754 809F5A14 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 02758 809F5A18 AC8F0004 */ sw $t7, 0x0004($a0) ## FFFFFFF4 -/* 0275C 809F5A1C 8DD80008 */ lw $t8, 0x0008($t6) ## 809F5E90 -/* 02760 809F5A20 AC980008 */ sw $t8, 0x0008($a0) ## FFFFFFF8 -/* 02764 809F5A24 84D9026A */ lh $t9, 0x026A($a2) ## 0000026A -/* 02768 809F5A28 17200008 */ bne $t9, $zero, .L809F5A4C -/* 0276C 809F5A2C 00000000 */ nop -/* 02770 809F5A30 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 02774 809F5A34 54A1000A */ bnel $a1, $at, .L809F5A60 -/* 02778 809F5A38 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0277C 809F5A3C 0C0346BD */ jal Matrix_MultVec3f -/* 02780 809F5A40 24C5027C */ addiu $a1, $a2, 0x027C ## $a1 = 0000027C -/* 02784 809F5A44 10000006 */ beq $zero, $zero, .L809F5A60 -/* 02788 809F5A48 8FBF0014 */ lw $ra, 0x0014($sp) -.L809F5A4C: -/* 0278C 809F5A4C 54A10004 */ bnel $a1, $at, .L809F5A60 -/* 02790 809F5A50 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02794 809F5A54 0C0346BD */ jal Matrix_MultVec3f -/* 02798 809F5A58 24C5027C */ addiu $a1, $a2, 0x027C ## $a1 = 0000027C -/* 0279C 809F5A5C 8FBF0014 */ lw $ra, 0x0014($sp) -.L809F5A60: -/* 027A0 809F5A60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 027A4 809F5A64 03E00008 */ jr $ra -/* 027A8 809F5A68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5A6C.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5A6C.s deleted file mode 100644 index 8ca042d0b5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5A6C.s +++ /dev/null @@ -1,160 +0,0 @@ -.rdata -glabel D_809F5FBC - .asciz "../z_en_dnt_nomal.c" - .balign 4 - -glabel D_809F5FD0 - .asciz "../z_en_dnt_nomal.c" - .balign 4 - -glabel D_809F5FE4 - .asciz "../z_en_dnt_nomal.c" - .balign 4 - -.late_rodata -glabel D_809F6088 - .float 0.01 - -.text -glabel func_809F5A6C -/* 027AC 809F5A6C 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 027B0 809F5A70 3C0F809F */ lui $t7, %hi(D_809F5E94) ## $t7 = 809F0000 -/* 027B4 809F5A74 AFBF002C */ sw $ra, 0x002C($sp) -/* 027B8 809F5A78 AFB20028 */ sw $s2, 0x0028($sp) -/* 027BC 809F5A7C AFB10024 */ sw $s1, 0x0024($sp) -/* 027C0 809F5A80 AFB00020 */ sw $s0, 0x0020($sp) -/* 027C4 809F5A84 25EF5E94 */ addiu $t7, $t7, %lo(D_809F5E94) ## $t7 = 809F5E94 -/* 027C8 809F5A88 8DF90000 */ lw $t9, 0x0000($t7) ## 809F5E94 -/* 027CC 809F5A8C 27AE0060 */ addiu $t6, $sp, 0x0060 ## $t6 = FFFFFFF0 -/* 027D0 809F5A90 8DF80004 */ lw $t8, 0x0004($t7) ## 809F5E98 -/* 027D4 809F5A94 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF0 -/* 027D8 809F5A98 8DF90008 */ lw $t9, 0x0008($t7) ## 809F5E9C -/* 027DC 809F5A9C 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 027E0 809F5AA0 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF4 -/* 027E4 809F5AA4 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFF8 -/* 027E8 809F5AA8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 027EC 809F5AAC 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 027F0 809F5AB0 3C06809F */ lui $a2, %hi(D_809F5FBC) ## $a2 = 809F0000 -/* 027F4 809F5AB4 24C65FBC */ addiu $a2, $a2, %lo(D_809F5FBC) ## $a2 = 809F5FBC -/* 027F8 809F5AB8 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 -/* 027FC 809F5ABC 240706FE */ addiu $a3, $zero, 0x06FE ## $a3 = 000006FE -/* 02800 809F5AC0 0C031AB1 */ jal Graph_OpenDisps -/* 02804 809F5AC4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 02808 809F5AC8 0C024F46 */ jal func_80093D18 -/* 0280C 809F5ACC 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 02810 809F5AD0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 02814 809F5AD4 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 -/* 02818 809F5AD8 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 -/* 0281C 809F5ADC 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 02820 809F5AE0 AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 -/* 02824 809F5AE4 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 02828 809F5AE8 862A0268 */ lh $t2, 0x0268($s1) ## 00000268 -/* 0282C 809F5AEC 3C04809F */ lui $a0, %hi(D_809F5EA0) ## $a0 = 809F0000 -/* 02830 809F5AF0 3C188016 */ lui $t8, %hi(gSegments) -/* 02834 809F5AF4 000A5880 */ sll $t3, $t2, 2 -/* 02838 809F5AF8 008B2021 */ addu $a0, $a0, $t3 -/* 0283C 809F5AFC 8C845EA0 */ lw $a0, %lo(D_809F5EA0)($a0) -/* 02840 809F5B00 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 02844 809F5B04 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 02848 809F5B08 00046900 */ sll $t5, $a0, 4 -/* 0284C 809F5B0C 000D7702 */ srl $t6, $t5, 28 -/* 02850 809F5B10 000E7880 */ sll $t7, $t6, 2 -/* 02854 809F5B14 030FC021 */ addu $t8, $t8, $t7 -/* 02858 809F5B18 8F186FA8 */ lw $t8, %lo(gSegments)($t8) -/* 0285C 809F5B1C 00816024 */ and $t4, $a0, $at -/* 02860 809F5B20 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02864 809F5B24 0198C821 */ addu $t9, $t4, $t8 -/* 02868 809F5B28 03214021 */ addu $t0, $t9, $at -/* 0286C 809F5B2C AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 02870 809F5B30 3C09809F */ lui $t1, %hi(func_809F59E4) ## $t1 = 809F0000 -/* 02874 809F5B34 252959E4 */ addiu $t1, $t1, %lo(func_809F59E4) ## $t1 = 809F59E4 -/* 02878 809F5B38 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C -/* 0287C 809F5B3C 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 02880 809F5B40 3C07809F */ lui $a3, %hi(func_809F58E4) ## $a3 = 809F0000 -/* 02884 809F5B44 24E758E4 */ addiu $a3, $a3, %lo(func_809F58E4) ## $a3 = 809F58E4 -/* 02888 809F5B48 AFB10014 */ sw $s1, 0x0014($sp) -/* 0288C 809F5B4C AFA90010 */ sw $t1, 0x0010($sp) -/* 02890 809F5B50 0C028572 */ jal SkelAnime_DrawOpa - -/* 02894 809F5B54 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02898 809F5B58 C62C021C */ lwc1 $f12, 0x021C($s1) ## 0000021C -/* 0289C 809F5B5C C62E0220 */ lwc1 $f14, 0x0220($s1) ## 00000220 -/* 028A0 809F5B60 8E260224 */ lw $a2, 0x0224($s1) ## 00000224 -/* 028A4 809F5B64 0C034261 */ jal Matrix_Translate -/* 028A8 809F5B68 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 028AC 809F5B6C 3C01809F */ lui $at, %hi(D_809F6088) ## $at = 809F0000 -/* 028B0 809F5B70 C42C6088 */ lwc1 $f12, %lo(D_809F6088)($at) -/* 028B4 809F5B74 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 028B8 809F5B78 44066000 */ mfc1 $a2, $f12 -/* 028BC 809F5B7C 0C0342A3 */ jal Matrix_Scale -/* 028C0 809F5B80 46006386 */ mov.s $f14, $f12 -/* 028C4 809F5B84 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 028C8 809F5B88 3C0BE700 */ lui $t3, 0xE700 ## $t3 = E7000000 -/* 028CC 809F5B8C 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 028D0 809F5B90 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 028D4 809F5B94 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 028D8 809F5B98 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 028DC 809F5B9C AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 028E0 809F5BA0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 028E4 809F5BA4 3C18809F */ lui $t8, %hi(D_809F5E4C) ## $t8 = 809F0000 -/* 028E8 809F5BA8 27185E4C */ addiu $t8, $t8, %lo(D_809F5E4C) ## $t8 = 809F5E4C -/* 028EC 809F5BAC 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 028F0 809F5BB0 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 028F4 809F5BB4 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 028F8 809F5BB8 862F026A */ lh $t7, 0x026A($s1) ## 0000026A -/* 028FC 809F5BBC 3C05809F */ lui $a1, %hi(D_809F5FD0) ## $a1 = 809F0000 -/* 02900 809F5BC0 24A55FD0 */ addiu $a1, $a1, %lo(D_809F5FD0) ## $a1 = 809F5FD0 -/* 02904 809F5BC4 000F6080 */ sll $t4, $t7, 2 -/* 02908 809F5BC8 01981821 */ addu $v1, $t4, $t8 -/* 0290C 809F5BCC 9068FFFE */ lbu $t0, -0x0002($v1) ## FFFFFFFE -/* 02910 809F5BD0 906BFFFC */ lbu $t3, -0x0004($v1) ## FFFFFFFC -/* 02914 809F5BD4 906CFFFD */ lbu $t4, -0x0003($v1) ## FFFFFFFD -/* 02918 809F5BD8 00084A00 */ sll $t1, $t0, 8 -/* 0291C 809F5BDC 000B6E00 */ sll $t5, $t3, 24 -/* 02920 809F5BE0 012D7025 */ or $t6, $t1, $t5 ## $t6 = 00000008 -/* 02924 809F5BE4 000CC400 */ sll $t8, $t4, 16 -/* 02928 809F5BE8 01D8C825 */ or $t9, $t6, $t8 ## $t9 = 809F5E4C -/* 0292C 809F5BEC 372800FF */ ori $t0, $t9, 0x00FF ## $t0 = 809F5EFF -/* 02930 809F5BF0 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 02934 809F5BF4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 02938 809F5BF8 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 -/* 0293C 809F5BFC 356B0003 */ ori $t3, $t3, 0x0003 ## $t3 = DA380003 -/* 02940 809F5C00 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 02944 809F5C04 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 02948 809F5C08 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 0294C 809F5C0C 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 02950 809F5C10 24060716 */ addiu $a2, $zero, 0x0716 ## $a2 = 00000716 -/* 02954 809F5C14 0C0346A2 */ jal Matrix_NewMtx -/* 02958 809F5C18 AFA20038 */ sw $v0, 0x0038($sp) -/* 0295C 809F5C1C 8FA30038 */ lw $v1, 0x0038($sp) -/* 02960 809F5C20 3C0F0600 */ lui $t7, %hi(D_06001B00) ## $t7 = 06000000 -/* 02964 809F5C24 25EF1B00 */ addiu $t7, $t7, %lo(D_06001B00) ## $t7 = 06001B00 -/* 02968 809F5C28 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 0296C 809F5C2C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 02970 809F5C30 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 -/* 02974 809F5C34 3C06809F */ lui $a2, %hi(D_809F5FE4) ## $a2 = 809F0000 -/* 02978 809F5C38 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 0297C 809F5C3C AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 -/* 02980 809F5C40 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 02984 809F5C44 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 02988 809F5C48 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 0298C 809F5C4C 24C65FE4 */ addiu $a2, $a2, %lo(D_809F5FE4) ## $a2 = 809F5FE4 -/* 02990 809F5C50 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 -/* 02994 809F5C54 0C031AD5 */ jal Graph_CloseDisps -/* 02998 809F5C58 24070719 */ addiu $a3, $zero, 0x0719 ## $a3 = 00000719 -/* 0299C 809F5C5C 8E2E0214 */ lw $t6, 0x0214($s1) ## 00000214 -/* 029A0 809F5C60 3C0C809F */ lui $t4, %hi(func_809F49A4) ## $t4 = 809F0000 -/* 029A4 809F5C64 258C49A4 */ addiu $t4, $t4, %lo(func_809F49A4) ## $t4 = 809F49A4 -/* 029A8 809F5C68 158E0005 */ bne $t4, $t6, .L809F5C80 -/* 029AC 809F5C6C 26240024 */ addiu $a0, $s1, 0x0024 ## $a0 = 00000024 -/* 029B0 809F5C70 27A50060 */ addiu $a1, $sp, 0x0060 ## $a1 = FFFFFFF0 -/* 029B4 809F5C74 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 029B8 809F5C78 0C00CF0C */ jal func_80033C30 -/* 029BC 809F5C7C 02403825 */ or $a3, $s2, $zero ## $a3 = 00000000 -.L809F5C80: -/* 029C0 809F5C80 8FBF002C */ lw $ra, 0x002C($sp) -/* 029C4 809F5C84 8FB00020 */ lw $s0, 0x0020($sp) -/* 029C8 809F5C88 8FB10024 */ lw $s1, 0x0024($sp) -/* 029CC 809F5C8C 8FB20028 */ lw $s2, 0x0028($sp) -/* 029D0 809F5C90 03E00008 */ jr $ra -/* 029D4 809F5C94 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5C98.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5C98.s deleted file mode 100644 index 05021ab6e5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5C98.s +++ /dev/null @@ -1,90 +0,0 @@ -.rdata -glabel D_809F5FF8 - .asciz "../z_en_dnt_nomal.c" - .balign 4 - -glabel D_809F600C - .asciz "../z_en_dnt_nomal.c" - .balign 4 - -glabel D_809F6020 - .asciz "../z_en_dnt_nomal.c" - .balign 4 - -.late_rodata -glabel D_809F608C - .float 0.01 - -.text -glabel func_809F5C98 -/* 029D8 809F5C98 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 029DC 809F5C9C AFB20028 */ sw $s2, 0x0028($sp) -/* 029E0 809F5CA0 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 029E4 809F5CA4 AFBF002C */ sw $ra, 0x002C($sp) -/* 029E8 809F5CA8 AFB10024 */ sw $s1, 0x0024($sp) -/* 029EC 809F5CAC AFB00020 */ sw $s0, 0x0020($sp) -/* 029F0 809F5CB0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 029F4 809F5CB4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 029F8 809F5CB8 3C06809F */ lui $a2, %hi(D_809F5FF8) ## $a2 = 809F0000 -/* 029FC 809F5CBC 24C65FF8 */ addiu $a2, $a2, %lo(D_809F5FF8) ## $a2 = 809F5FF8 -/* 02A00 809F5CC0 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 -/* 02A04 809F5CC4 24070729 */ addiu $a3, $zero, 0x0729 ## $a3 = 00000729 -/* 02A08 809F5CC8 0C031AB1 */ jal Graph_OpenDisps -/* 02A0C 809F5CCC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02A10 809F5CD0 0C024F46 */ jal func_80093D18 -/* 02A14 809F5CD4 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 02A18 809F5CD8 3C0E809F */ lui $t6, %hi(func_809F59E4) ## $t6 = 809F0000 -/* 02A1C 809F5CDC 25CE59E4 */ addiu $t6, $t6, %lo(func_809F59E4) ## $t6 = 809F59E4 -/* 02A20 809F5CE0 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 02A24 809F5CE4 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 02A28 809F5CE8 AFB00014 */ sw $s0, 0x0014($sp) -/* 02A2C 809F5CEC AFAE0010 */ sw $t6, 0x0010($sp) -/* 02A30 809F5CF0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02A34 809F5CF4 0C028572 */ jal SkelAnime_DrawOpa - -/* 02A38 809F5CF8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02A3C 809F5CFC C60C021C */ lwc1 $f12, 0x021C($s0) ## 0000021C -/* 02A40 809F5D00 C60E0220 */ lwc1 $f14, 0x0220($s0) ## 00000220 -/* 02A44 809F5D04 8E060224 */ lw $a2, 0x0224($s0) ## 00000224 -/* 02A48 809F5D08 0C034261 */ jal Matrix_Translate -/* 02A4C 809F5D0C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02A50 809F5D10 3C01809F */ lui $at, %hi(D_809F608C) ## $at = 809F0000 -/* 02A54 809F5D14 C42C608C */ lwc1 $f12, %lo(D_809F608C)($at) -/* 02A58 809F5D18 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02A5C 809F5D1C 44066000 */ mfc1 $a2, $f12 -/* 02A60 809F5D20 0C0342A3 */ jal Matrix_Scale -/* 02A64 809F5D24 46006386 */ mov.s $f14, $f12 -/* 02A68 809F5D28 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 02A6C 809F5D2C 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 -/* 02A70 809F5D30 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 -/* 02A74 809F5D34 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 02A78 809F5D38 AE2F02C0 */ sw $t7, 0x02C0($s1) ## 000002C0 -/* 02A7C 809F5D3C 3C05809F */ lui $a1, %hi(D_809F600C) ## $a1 = 809F0000 -/* 02A80 809F5D40 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 02A84 809F5D44 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 02A88 809F5D48 24A5600C */ addiu $a1, $a1, %lo(D_809F600C) ## $a1 = 809F600C -/* 02A8C 809F5D4C 24060738 */ addiu $a2, $zero, 0x0738 ## $a2 = 00000738 -/* 02A90 809F5D50 0C0346A2 */ jal Matrix_NewMtx -/* 02A94 809F5D54 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 02A98 809F5D58 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 02A9C 809F5D5C 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 02AA0 809F5D60 3C090600 */ lui $t1, %hi(D_060014E0) ## $t1 = 06000000 -/* 02AA4 809F5D64 252914E0 */ addiu $t1, $t1, %lo(D_060014E0) ## $t1 = 060014E0 -/* 02AA8 809F5D68 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 02AAC 809F5D6C AE3902C0 */ sw $t9, 0x02C0($s1) ## 000002C0 -/* 02AB0 809F5D70 3C08DE00 */ lui $t0, 0xDE00 ## $t0 = DE000000 -/* 02AB4 809F5D74 3C06809F */ lui $a2, %hi(D_809F6020) ## $a2 = 809F0000 -/* 02AB8 809F5D78 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 02ABC 809F5D7C AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 02AC0 809F5D80 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 02AC4 809F5D84 24C66020 */ addiu $a2, $a2, %lo(D_809F6020) ## $a2 = 809F6020 -/* 02AC8 809F5D88 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 -/* 02ACC 809F5D8C 0C031AD5 */ jal Graph_CloseDisps -/* 02AD0 809F5D90 2407073B */ addiu $a3, $zero, 0x073B ## $a3 = 0000073B -/* 02AD4 809F5D94 8FBF002C */ lw $ra, 0x002C($sp) -/* 02AD8 809F5D98 8FB00020 */ lw $s0, 0x0020($sp) -/* 02ADC 809F5D9C 8FB10024 */ lw $s1, 0x0024($sp) -/* 02AE0 809F5DA0 8FB20028 */ lw $s2, 0x0028($sp) -/* 02AE4 809F5DA4 03E00008 */ jr $ra -/* 02AE8 809F5DA8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 02AEC 809F5DAC 00000000 */ nop diff --git a/assets/xml/objects/object_dnk.xml b/assets/xml/objects/object_dnk.xml new file mode 100644 index 0000000000..6b44b7a824 --- /dev/null +++ b/assets/xml/objects/object_dnk.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_dns.xml b/assets/xml/objects/object_dns.xml new file mode 100644 index 0000000000..08150a4b43 --- /dev/null +++ b/assets/xml/objects/object_dns.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_hintnuts.xml b/assets/xml/objects/object_hintnuts.xml new file mode 100644 index 0000000000..a3a0f28219 --- /dev/null +++ b/assets/xml/objects/object_hintnuts.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/overlays/actors/z_en_dnt_demo.data.s b/data/overlays/actors/z_en_dnt_demo.data.s deleted file mode 100644 index 3ba27cf6da..0000000000 --- a/data/overlays/actors/z_en_dnt_demo.data.s +++ /dev/null @@ -1,24 +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 En_Dnt_Demo_InitVars - .word 0x01A10600, 0x00000000, 0x00010000, 0x00000200 -.word EnDntDemo_Init -.word EnDntDemo_Destroy -.word EnDntDemo_Update -.word 0x00000000 -glabel D_809F15C0 - .word 0x00000001, 0x00000001, 0x00020000, 0x00010001, 0x00000001, 0x00000001, 0x00010002, 0x00020001, 0x00010001, 0x00000000, 0x00000001, 0x00020001, 0x00010001, 0x00010000, 0x00000000, 0x00020000, 0x00000000, 0x00010000, 0x00000000, 0x00020001, 0x00020000, 0x00010001, 0x00010001, 0x00010001, 0x00010002, 0x00020002, 0x00020002, 0x00020002 -glabel D_809F1630 - .word 0x00040003, 0x00040002, 0x00030001 -glabel D_809F163C - .word 0x456E2000, 0xC1A00000, 0x447C8000, 0x45732000, 0xC1A00000, 0x44778000, 0x45692000, 0xC1A00000, 0x446D8000, 0x45700000, 0xC1A00000, 0x44688000, 0x45746000, 0xC1A00000, 0x44598000, 0x456C4000, 0xC1A00000, 0x44570000, 0x4567E000, 0xC1A00000, 0x44520000, 0x45714000, 0xC1A00000, 0x44458000, 0x456A6000, 0xC1A00000, 0x443B8000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_dnt_demo.reloc.s b/data/overlays/actors/z_en_dnt_demo.reloc.s deleted file mode 100644 index ab46efa265..0000000000 --- a/data/overlays/actors/z_en_dnt_demo.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_809F19B0 - .incbin "baserom/ovl_En_Dnt_Demo", 0x10D0, 0x00000130 diff --git a/data/overlays/actors/z_en_dnt_jiji.data.s b/data/overlays/actors/z_en_dnt_jiji.data.s deleted file mode 100644 index 55da4e5472..0000000000 --- a/data/overlays/actors/z_en_dnt_jiji.data.s +++ /dev/null @@ -1,22 +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 En_Dnt_Jiji_InitVars - .word 0x01A20400, 0x00000019, 0x01710000, 0x000002A8 -.word EnDntJiji_Init -.word EnDntJiji_Destroy -.word EnDntJiji_Update -.word EnDntJiji_Draw -glabel D_809F2FA0 - .word 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x001E0050, 0x00000000, 0x00000000 -glabel D_809F2FCC - .word 0x060030A0, 0x06002EA0, 0x06003020, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_dnt_jiji.reloc.s b/data/overlays/actors/z_en_dnt_jiji.reloc.s deleted file mode 100644 index ca697e19df..0000000000 --- a/data/overlays/actors/z_en_dnt_jiji.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_809F3100 - .incbin "baserom/ovl_En_Dnt_Jiji", 0x1620, 0x000001C0 diff --git a/data/overlays/actors/z_en_dnt_nomal.data.s b/data/overlays/actors/z_en_dnt_nomal.data.s deleted file mode 100644 index 12ad307427..0000000000 --- a/data/overlays/actors/z_en_dnt_nomal.data.s +++ /dev/null @@ -1,34 +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 En_Dnt_Nomal_InitVars - .word 0x01A30600, 0x00000030, 0x00010000, 0x00000360 -.word EnDntNomal_Init -.word EnDntNomal_Destroy -.word EnDntNomal_Update -.word 0x00000000 -glabel D_809F5DD0 - .word 0x0A000039, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x0010002E, 0x00000000, 0x00000000 -glabel D_809F5DFC - .word 0x0A000900, 0x20030000, 0x00000000, 0x00000000, 0x00000000, 0x0001F824, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 -glabel D_809F5E4C - .word 0xFFFFFFFF, 0xFFC3AFFF, 0xD2FF00FF, 0xFFFFFFFF, 0xD2FF00FF, 0xFFC3AFFF, 0xFFFFFFFF, 0xFFC3AFFF, 0xD2FF00FF -glabel D_809F5E70 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_809F5E7C - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_809F5E88 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_809F5E94 - .word 0x3E800000, 0x3E800000, 0x3E800000 -glabel D_809F5EA0 - .word 0x060027D0, 0x060025D0, 0x06002750, 0x00000000 - diff --git a/data/overlays/actors/z_en_dnt_nomal.reloc.s b/data/overlays/actors/z_en_dnt_nomal.reloc.s deleted file mode 100644 index aa76c61441..0000000000 --- a/data/overlays/actors/z_en_dnt_nomal.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_809F6090 - .incbin "baserom/ovl_En_Dnt_Nomal", 0x2DD0, 0x00000330 diff --git a/include/functions.h b/include/functions.h index 72c2159997..703bf36417 100644 --- a/include/functions.h +++ b/include/functions.h @@ -2251,8 +2251,8 @@ void func_800F41E0(Vec3f*, u16 sfxId, u8); void func_800F4138(Vec3f*, u16 sfxId, f32); void func_800F4190(Vec3f*, u16 sfxId); void func_800F4254(Vec3f* pos, u8 arg1); -void func_800F436C(Vec3f*, s16 arg1, f32 arg2); -void func_800F4414(Vec3f*, u16, f32); +void func_800F436C(Vec3f*, u16 sfxId, f32 arg2); +void func_800F4414(Vec3f*, u16 sfxId, f32 arg2); void func_800F44EC(UNK_TYPE arg0, UNK_TYPE arg1); void func_800F4524(Vec3f*, u16 sfxId, u8); void func_800F46E0(Vec3f* pos, f32 arg0); diff --git a/spec b/spec index 7e94551108..053d7171a3 100644 --- a/spec +++ b/spec @@ -2100,22 +2100,19 @@ endseg beginseg name "ovl_En_Dnt_Demo" include "build/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.o" - include "build/data/overlays/actors/z_en_dnt_demo.data.o" - include "build/data/overlays/actors/z_en_dnt_demo.reloc.o" + include "build/src/overlays/actors/ovl_En_Dnt_Demo/ovl_En_Dnt_Demo_reloc.o" endseg beginseg name "ovl_En_Dnt_Jiji" include "build/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.o" - include "build/data/overlays/actors/z_en_dnt_jiji.data.o" - include "build/data/overlays/actors/z_en_dnt_jiji.reloc.o" + include "build/src/overlays/actors/ovl_En_Dnt_Jiji/ovl_En_Dnt_Jiji_reloc.o" endseg beginseg name "ovl_En_Dnt_Nomal" include "build/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.o" - include "build/data/overlays/actors/z_en_dnt_nomal.data.o" - include "build/data/overlays/actors/z_en_dnt_nomal.reloc.o" + include "build/src/overlays/actors/ovl_En_Dnt_Nomal/ovl_En_Dnt_Nomal_reloc.o" endseg beginseg @@ -5583,7 +5580,8 @@ endseg beginseg name "object_hintnuts" romalign 0x1000 - include "build/baserom/object_hintnuts.o" + include "build/assets/objects/object_hintnuts/object_hintnuts.o" + number 6 endseg beginseg @@ -5663,13 +5661,15 @@ endseg beginseg name "object_dns" romalign 0x1000 - include "build/baserom/object_dns.o" + include "build/assets/objects/object_dns/object_dns.o" + number 6 endseg beginseg name "object_dnk" romalign 0x1000 - include "build/baserom/object_dnk.o" + include "build/assets/objects/object_dnk/object_dnk.o" + number 6 endseg beginseg diff --git a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c index f6f79d7e59..c106115608 100644 --- a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c +++ b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c @@ -1,14 +1,33 @@ +/* + * File: z_en_dnt_demo.c + * Overlay: ovl_En_Dnt_Demo + * Description: Forest Stage minigame + */ + #include "z_en_dnt_demo.h" +#include "overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h" +#include "overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h" +#include "vt.h" + #define FLAGS 0x00000000 #define THIS ((EnDntDemo*)thisx) +typedef enum { + /* 0 */ DNT_LIKE, + /* 1 */ DNT_HATE, + /* 2 */ DNT_LOVE +} EnDntDemoResults; + void EnDntDemo_Init(Actor* thisx, GlobalContext* globalCtx); void EnDntDemo_Destroy(Actor* thisx, GlobalContext* globalCtx); -void EnDntDemo_Update(Actor* thisx, GlobalContext* globalCtx); +void EnDntDemo_Update(Actor* this, GlobalContext* globalCtx); + +void EnDntDemo_Judge(EnDntDemo* this, GlobalContext* globalCtx); +void EnDntDemo_Results(EnDntDemo* this, GlobalContext* globalCtx); +void EnDntDemo_Prize(EnDntDemo* this, GlobalContext* globalCtx); -/* const ActorInit En_Dnt_Demo_InitVars = { ACTOR_EN_DNT_DEMO, ACTORCAT_PROP, @@ -20,15 +39,302 @@ const ActorInit En_Dnt_Demo_InitVars = { (ActorFunc)EnDntDemo_Update, NULL, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Destroy.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Init.s") +//! @bug +//! This table is missing a column for the Mask of Truth, so it reads the first value of the next row. In the last row, +//! it reads the first entry of sResultValues (4), which is an invalid result. The scrubs have no reaction in this case. +static s16 sResultTable[8][7] = { + /* Keaton Skull Spooky Bunny Goron Zora Gerudo Truth */ + { DNT_LIKE, DNT_HATE, DNT_LIKE, DNT_HATE, DNT_LOVE, DNT_LIKE, DNT_HATE }, /* DNT_HATE */ + { DNT_HATE, DNT_LIKE, DNT_HATE, DNT_LIKE, DNT_HATE, DNT_HATE, DNT_LOVE }, /* DNT_LOVE */ + { DNT_LOVE, DNT_HATE, DNT_HATE, DNT_HATE, DNT_LIKE, DNT_LIKE, DNT_LIKE }, /* DNT_HATE */ + { DNT_HATE, DNT_LOVE, DNT_HATE, DNT_HATE, DNT_HATE, DNT_HATE, DNT_LIKE }, /* DNT_LIKE */ + { DNT_LIKE, DNT_LIKE, DNT_LOVE, DNT_LIKE, DNT_LIKE, DNT_LIKE, DNT_HATE }, /* DNT_LIKE */ + { DNT_LIKE, DNT_LIKE, DNT_LIKE, DNT_LOVE, DNT_HATE, DNT_LOVE, DNT_LIKE }, /* DNT_HATE */ + { DNT_HATE, DNT_HATE, DNT_HATE, DNT_HATE, DNT_HATE, DNT_HATE, DNT_HATE }, /* DNT_LOVE */ + { DNT_LOVE, DNT_LOVE, DNT_LOVE, DNT_LOVE, DNT_LOVE, DNT_LOVE, DNT_LOVE }, /* INVALID */ +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F0AA4.s") +static s16 sResultValues[3][2] = { + /* DNT_LIKE */ { DNT_SIGNAL_HIDE, DNT_ACTION_LOW_RUPEES }, + /* DNT_HATE */ { DNT_SIGNAL_HIDE, DNT_ACTION_ATTACK }, + /* DNT_LOVE */ { DNT_SIGNAL_DANCE, DNT_ACTION_DANCE }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F1100.s") +static Vec3f sScrubPos[] = { + { 3810.0f, -20.0f, 1010.0f }, { 3890.0f, -20.0f, 990.0f }, { 3730.0f, -20.0f, 950.0f }, + { 3840.0f, -20.0f, 930.0f }, { 3910.0f, -20.0f, 870.0f }, { 3780.0f, -20.0f, 860.0f }, + { 3710.0f, -20.0f, 840.0f }, { 3860.0f, -20.0f, 790.0f }, { 3750.0f, -20.0f, 750.0f }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/func_809F1374.s") +void EnDntDemo_Destroy(Actor* thisx, GlobalContext* globalCtx) { +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Demo/EnDntDemo_Update.s") +void EnDntDemo_Init(Actor* thisx, GlobalContext* globalCtx2) { + GlobalContext* globalCtx = globalCtx2; + EnDntDemo* this = THIS; + s32 i; + s32 pad; + + osSyncPrintf("\n\n"); + // Deku Scrub mask show start + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ デグナッツお面品評会開始 ☆☆☆☆☆ \n" VT_RST); + for (i = 0; i < 9; i++) { + this->scrubPos[i] = sScrubPos[i]; + this->scrubs[i] = (EnDntNomal*)Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, + ACTOR_EN_DNT_NOMAL, this->scrubPos[i].x, this->scrubPos[i].y, + this->scrubPos[i].z, 0, 0, 0, i + ENDNTNOMAL_STAGE); + if (this->scrubs[i] != NULL) { + // zako zako [small fries] + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ ザコザコ ☆☆☆☆☆ %x\n" VT_RST, this->scrubs[i]); + } + } + + this->leaderPos.x = 4050.0f; + this->leaderPos.y = -20.0f; + this->leaderPos.z = 1000.0f; + this->leader = (EnDntJiji*)Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_DNT_JIJI, + this->leaderPos.x, this->leaderPos.y, this->leaderPos.z, 0, 0, 0, 0); + if (this->leader != NULL) { + // jiji jiji jiji jiji jiji [onomatopoeia for the scrub sound?] + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ じじじじじじじじじじい ☆☆☆☆☆ %x\n" VT_RST, this->leader); + } + this->subCamera = 0; + this->actor.flags &= ~1; + this->actionFunc = EnDntDemo_Judge; +} + +void EnDntDemo_Judge(EnDntDemo* this, GlobalContext* globalCtx) { + s16 delay; + s16 reaction; + s16 rand9; + s16 maskIdx; + s16 resultIdx; + u8 ignore; + s32 i; + + if (this->leaderSignal != DNT_SIGNAL_NONE) { + for (i = 0; i < 9; i++) { + this->scrubs[i]->stageSignal = this->leaderSignal; + this->scrubs[i]->action = this->action; + this->scrubs[i]->stagePrize = DNT_PRIZE_NONE; + } + if (this->leader->isSolid) { + this->leader->stageSignal = DNT_LEADER_SIGNAL_BURROW; + } + this->leaderSignal = DNT_SIGNAL_NONE; + this->actionFunc = EnDntDemo_Results; + } else if ((this->actor.xzDistToPlayer > 30.0f) || (Player_GetMask(globalCtx) == 0)) { + this->debugArrowTimer++; + if (this->subCamera != 0) { + this->subCamera = 0; + } + if (this->judgeTimer != 0) { + for (i = 0; i < 9; i++) { + this->scrubs[i]->stageSignal = DNT_SIGNAL_HIDE; + } + this->judgeTimer = 0; + } + } else { + if ((Player_GetMask(globalCtx) != 0) && (this->subCamera == 0)) { + this->subCamera = func_800800F8(globalCtx, 0x8AC, -0x63, &this->scrubs[3]->actor, 0); + } + this->debugArrowTimer = 0; + if (this->judgeTimer == 40) { + for (i = 0; i < 9; i++) { + this->scrubs[i]->stageSignal = DNT_SIGNAL_LOOK; + } + } + if (this->judgeTimer > 40) { + // gera gera [onomatopoeia for loud giggling] + osSyncPrintf(VT_FGCOL(RED) "☆☆☆☆☆ げらげら ☆☆☆☆☆ \n" VT_RST); + func_800F436C(&this->actor.projectedPos, NA_SE_EV_CROWD - SFX_FLAG, 2.0f); + } + if (this->judgeTimer < 120) { + this->judgeTimer++; + } else { + ignore = false; + reaction = DNT_SIGNAL_NONE; + delay = 0; + switch (Player_GetMask(globalCtx)) { + case PLAYER_MASK_SKULL: + if (!(gSaveContext.itemGetInf[1] & 0x4000)) { + reaction = DNT_SIGNAL_CELEBRATE; + this->prize = DNT_PRIZE_STICK; + Audio_SetBGM(0x3E); + break; + } + case PLAYER_MASK_TRUTH: + if (!(gSaveContext.itemGetInf[1] & 0x8000) && (Player_GetMask(globalCtx) != PLAYER_MASK_SKULL)) { + Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + this->prize = DNT_PRIZE_NUTS; + this->leader->stageSignal = DNT_LEADER_SIGNAL_UP; + reaction = DNT_SIGNAL_LOOK; + if (this->subCamera != 0) { + this->subCamera = 0; + reaction = DNT_SIGNAL_LOOK; + func_800800F8(globalCtx, 0x924, -0x63, &this->leader->actor, 0); + } + break; + } + case PLAYER_MASK_KEATON: + case PLAYER_MASK_SPOOKY: + case PLAYER_MASK_BUNNY: + case PLAYER_MASK_GORON: + case PLAYER_MASK_ZORA: + case PLAYER_MASK_GERUDO: + rand9 = Rand_ZeroFloat(8.99f); + maskIdx = Player_GetMask(globalCtx); + maskIdx--; + if (rand9 == 8) { + ignore = true; + delay = 8; + reaction = DNT_SIGNAL_HIDE; + // Special! + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 特別！ ☆☆☆☆☆ \n" VT_RST); + } else { + if (maskIdx >= PLAYER_MASK_MAX - 1) { + // This is dangerous! + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ ヤバいよこれ！ ☆☆☆☆☆ \n" VT_RST); + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ ヤバいよこれ！ ☆☆☆☆☆ \n" VT_RST); + osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ ヤバいよこれ！ ☆☆☆☆☆ \n" VT_RST); + osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ ヤバいよこれ！ ☆☆☆☆☆ \n" VT_RST); + maskIdx = Rand_ZeroFloat(7.99f); + } + + resultIdx = sResultTable[rand9][maskIdx]; + reaction = sResultValues[resultIdx][0]; + this->action = sResultValues[resultIdx][1]; + switch (this->action) { + case DNT_ACTION_LOW_RUPEES: + Audio_SetBGM(0x2D); + break; + case DNT_ACTION_ATTACK: + if (this->subCamera != 0) { + this->subCamera = 0; + func_800800F8(globalCtx, 0x92E, -0x63, &this->scrubs[3]->actor, 0); + } + Audio_SetBGM(0x81A); + break; + case DNT_ACTION_DANCE: + Audio_SetBGM(0x55); + break; + } + osSyncPrintf("\n\n"); + // Each index 1 + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 各インデックス１ ☆☆☆☆☆ %d\n" VT_RST, rand9); + // Each index 2 + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 各インデックス２ ☆☆☆☆☆ %d\n" VT_RST, maskIdx); + // Each index 3 + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 各インデックス３ ☆☆☆☆☆ %d\n" VT_RST, resultIdx); + osSyncPrintf("\n"); + // What kind of evaluation? + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ どういう評価？ ☆☆☆☆☆☆ %d\n" VT_RST, reaction); + // What kind of action? + osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ どういうアクション？ ☆☆☆ %d\n" VT_RST, this->action); + osSyncPrintf("\n\n"); + break; + } + } + if (reaction != DNT_SIGNAL_NONE) { + for (i = 0; i < 9; i++) { + if (delay != 0) { + this->scrubs[i]->timer3 = delay * i; + } + this->scrubs[i]->action = this->action; + this->scrubs[i]->stageSignal = reaction; + this->scrubs[i]->ignore = ignore; + if (this->prize != DNT_PRIZE_NONE) { + this->scrubs[i]->timer1 = 300; + this->scrubs[i]->stagePrize = this->prize; + this->scrubs[i]->targetPos = this->leader->actor.world.pos; + if (this->prize == DNT_PRIZE_NUTS) { + this->leader->stageSignal = DNT_LEADER_SIGNAL_UP; + } + if (this->prize == DNT_PRIZE_STICK) { + this->leader->timer = 300; + } + } + } + this->actionFunc = EnDntDemo_Results; + } + } + } +} + +void EnDntDemo_Results(EnDntDemo* this, GlobalContext* globalCtx) { + s32 i; + + if (this->leaderSignal != DNT_SIGNAL_NONE) { + for (i = 0; i < 9; i++) { + this->scrubs[i]->action = this->action; + this->scrubs[i]->stageSignal = this->leaderSignal; + this->scrubs[i]->stagePrize = DNT_PRIZE_NONE; + } + if (this->leader->action == DNT_LEADER_ACTION_UP) { + this->leader->stageSignal = DNT_LEADER_SIGNAL_BURROW; + } else if (this->leader->unburrow) { + this->leader->stageSignal = DNT_LEADER_SIGNAL_RETURN; + } else { + this->leader->action = DNT_LEADER_ACTION_ATTACK; + } + this->leader->timer = 0; + this->leaderSignal = this->action = DNT_SIGNAL_NONE; + this->actionFunc = EnDntDemo_Prize; + } else if (this->prize == DNT_PRIZE_STICK) { + for (i = 0; i < 9; i++) { + s16 offsetAngle = -this->leader->actor.shape.rot.y; + Vec3f leaderPos = this->leader->actor.world.pos; + f32 offsetDist; + + if (!(i & 1)) { + offsetAngle -= 0x59D8; + } + offsetDist = ((i + 1) * 20.0f) + 20.0f; + this->scrubs[i]->timer2 = 10; + this->scrubs[i]->targetPos.x = leaderPos.x + Math_SinS(offsetAngle) * offsetDist; + this->scrubs[i]->targetPos.y = leaderPos.y; + this->scrubs[i]->targetPos.z = leaderPos.z + Math_CosS(offsetAngle) * offsetDist; + } + } +} + +void EnDntDemo_Prize(EnDntDemo* this, GlobalContext* globalCtx) { + s32 i; + + if (this->leaderSignal != DNT_SIGNAL_NONE) { + for (i = 0; i < 9; i++) { + this->scrubs[i]->action = this->action; + this->scrubs[i]->stageSignal = this->leaderSignal; + this->scrubs[i]->stagePrize = DNT_PRIZE_NONE; + } + this->leaderSignal = this->action = DNT_SIGNAL_NONE; + } +} + +void EnDntDemo_Update(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + EnDntDemo* this = THIS; + + if (this->unkTimer2 != 0) { + this->unkTimer2--; + } + if (this->unkTimer1 != 0) { + this->unkTimer1--; + } + this->actionFunc(this, globalCtx); + if (BREG(0)) { + if (this->debugArrowTimer != 0) { + if (!(this->debugArrowTimer & 1)) { + DebugDisplay_AddObject(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, + this->actor.world.rot.x, this->actor.world.rot.y, this->actor.world.rot.z, 1.0f, + 1.0f, 1.0f, 120, 120, 0, 255, 4, globalCtx->state.gfxCtx); + } + } else { + DebugDisplay_AddObject(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, + this->actor.world.rot.x, this->actor.world.rot.y, this->actor.world.rot.z, 1.0f, + 1.0f, 1.0f, 255, 255, 255, 255, 4, globalCtx->state.gfxCtx); + } + } +} diff --git a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h index 2bc1b3c54f..0f456f95d5 100644 --- a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h +++ b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h @@ -6,11 +6,64 @@ struct EnDntDemo; +typedef void (*EnDntDemoActionFunc)(struct EnDntDemo*, GlobalContext*); + typedef struct EnDntDemo { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0xB4]; + /* 0x014C */ EnDntDemoActionFunc actionFunc; + /* 0x0150 */ s16 judgeTimer; + /* 0x0152 */ s16 unkTimer1; + /* 0x0154 */ s16 unkTimer2; + /* 0x0156 */ s16 debugArrowTimer; + /* 0x0158 */ s16 leaderSignal; + /* 0x015A */ s16 action; + /* 0x015C */ s16 prize; + /* 0x015E */ s16 subCamera; + /* 0x0160 */ Vec3f scrubPos[9]; + /* 0x01CC */ Vec3f leaderPos; + /* 0x01D8 */ struct EnDntNomal* scrubs[9]; + /* 0x01FC */ struct EnDntJiji* leader; } EnDntDemo; // size = 0x0200 +typedef enum { + /* 0 */ DNT_SIGNAL_NONE, + /* 1 */ DNT_SIGNAL_LOOK, + /* 2 */ DNT_SIGNAL_CELEBRATE, + /* 3 */ DNT_SIGNAL_DANCE, + /* 4 */ DNT_SIGNAL_HIDE, + /* 5 */ DNT_SIGNAL_RETURN, + /* 6 */ DNT_SIGNAL_UNUSED +} EnDntSignal; + +typedef enum { + /* 0 */ DNT_LEADER_ACTION_NONE, + /* 1 */ DNT_LEADER_ACTION_UP, + /* 2 */ DNT_LEADER_ACTION_UNUSED, + /* 3 */ DNT_LEADER_ACTION_ATTACK +} EnDntLeaderAction; + +typedef enum { + /* 0 */ DNT_LEADER_SIGNAL_NONE, + /* 1 */ DNT_LEADER_SIGNAL_UP, + /* 2 */ DNT_LEADER_SIGNAL_BURROW, + /* 3 */ DNT_LEADER_SIGNAL_RETURN +} EnDntLeaderSignal; + +typedef enum { + /* 0 */ DNT_PRIZE_NONE, + /* 1 */ DNT_PRIZE_NUTS, + /* 2 */ DNT_PRIZE_STICK +} EnDntPrize; + +typedef enum { + /* 0 */ DNT_ACTION_NONE, + /* 1 */ DNT_ACTION_DANCE, + /* 2 */ DNT_ACTION_ATTACK, + /* 3 */ DNT_ACTION_LOW_RUPEES, + /* 4 */ DNT_ACTION_HIGH_RUPEES, + /* 5 */ DNT_ACTION_PRIZE +} EnDntAction; + extern const ActorInit En_Dnt_Demo_InitVars; #endif diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c index c4a9ac3f97..df291f20fd 100644 --- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c +++ b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c @@ -1,4 +1,14 @@ +/* + * File: z_en_dnt_jiji.c + * Overlay: ovl_En_Dnt_Jiji + * Description: Forest Stage scrub leader + */ + #include "z_en_dnt_jiji.h" +#include "objects/object_dns/object_dns.h" +#include "overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h" +#include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" +#include "vt.h" #define FLAGS 0x00000019 @@ -9,17 +19,28 @@ void EnDntJiji_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnDntJiji_Update(Actor* thisx, GlobalContext* globalCtx); void EnDntJiji_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_06000560; -extern UNK_TYPE D_06000944; -extern UNK_TYPE D_06000A70; -extern UNK_TYPE D_06000BD0; -extern UNK_TYPE D_06000DF8; -extern UNK_TYPE D_060012B0; -extern UNK_TYPE D_06002310; -extern UNK_TYPE D_060033E0; -extern UNK_TYPE D_060037C0; +void EnDntJiji_SetFlower(EnDntJiji* this, GlobalContext* globalCtx); + +void EnDntJiji_SetupWait(EnDntJiji* this, GlobalContext* globalCtx); +void EnDntJiji_SetupUnburrow(EnDntJiji* this, GlobalContext* globalCtx); +void EnDntJiji_SetupWalk(EnDntJiji* this, GlobalContext* globalCtx); +void EnDntJiji_SetupCower(EnDntJiji* this, GlobalContext* globalCtx); +void EnDntJiji_SetupGivePrize(EnDntJiji* this, GlobalContext* globalCtx); +void EnDntJiji_SetupHide(EnDntJiji* this, GlobalContext* globalCtx); +void EnDntJiji_SetupReturn(EnDntJiji* this, GlobalContext* globalCtx); + +void EnDntJiji_Wait(EnDntJiji* this, GlobalContext* globalCtx); +void EnDntJiji_Up(EnDntJiji* this, GlobalContext* globalCtx); +void EnDntJiji_Unburrow(EnDntJiji* this, GlobalContext* globalCtx); +void EnDntJiji_Walk(EnDntJiji* this, GlobalContext* globalCtx); +void EnDntJiji_Burrow(EnDntJiji* this, GlobalContext* globalCtx); +void EnDntJiji_Cower(EnDntJiji* this, GlobalContext* globalCtx); +void EnDntJiji_SetupTalk(EnDntJiji* this, GlobalContext* globalCtx); +void EnDntJiji_Talk(EnDntJiji* this, GlobalContext* globalCtx); +void EnDntJiji_GivePrize(EnDntJiji* this, GlobalContext* globalCtx); +void EnDntJiji_Hide(EnDntJiji* this, GlobalContext* globalCtx); +void EnDntJiji_Return(EnDntJiji* this, GlobalContext* globalCtx); -/* const ActorInit En_Dnt_Jiji_InitVars = { ACTOR_EN_DNT_JIJI, ACTORCAT_NPC, @@ -32,7 +53,7 @@ const ActorInit En_Dnt_Jiji_InitVars = { (ActorFunc)EnDntJiji_Draw, }; -static ColliderCylinderInit D_809F2FA0 = { +static ColliderCylinderInit sCylinderInit = { { COLTYPE_NONE, AT_NONE, @@ -51,53 +72,376 @@ static ColliderCylinderInit D_809F2FA0 = { }, { 30, 80, 0, { 0, 0, 0 } }, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Destroy.s") +void EnDntJiji_Init(Actor* thisx, GlobalContext* globalCtx) { + EnDntJiji* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1C04.s") + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 0.0f); + SkelAnime_Init(globalCtx, &this->skelAnime, &gDntJijiSkel, &gDntJijiBurrowAnim, this->jointTable, this->morphTable, + 13); + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + this->stage = (EnDntDemo*)this->actor.parent; + osSyncPrintf("\n\n"); + // Deku Scrub mask show elder + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ デグナッツお面品評会長老 ☆☆☆☆☆ %x\n" VT_RST, this->stage); + this->actor.flags &= ~1; + this->actor.colChkInfo.mass = 0xFF; + this->actor.targetMode = 6; + this->actionFunc = EnDntJiji_SetFlower; + this->actor.gravity = -2.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1C44.s") +void EnDntJiji_Destroy(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + EnDntJiji* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1CF4.s") + Collider_DestroyCylinder(globalCtx, &this->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1DA8.s") +void EnDntJiji_SetFlower(EnDntJiji* this, GlobalContext* globalCtx) { + if (this->actor.bgCheckFlags & 1) { + this->flowerPos = this->actor.world.pos; + this->actionFunc = EnDntJiji_SetupWait; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1E8C.s") +void EnDntJiji_SetupWait(EnDntJiji* this, GlobalContext* globalCtx) { + this->endFrame = (f32)Animation_GetLastFrame(&gDntJijiBurrowAnim); + Animation_Change(&this->skelAnime, &gDntJijiBurrowAnim, 0.0f, 0.0f, this->endFrame, ANIMMODE_LOOP, -10.0f); + this->skelAnime.curFrame = 8.0f; + this->isSolid = this->action = DNT_LEADER_ACTION_NONE; + this->actionFunc = EnDntJiji_Wait; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1EFC.s") +void EnDntJiji_Wait(EnDntJiji* this, GlobalContext* globalCtx) { + Player* player = PLAYER; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1FE0.s") + SkelAnime_Update(&this->skelAnime); + if ((this->timer == 1) && (this->actor.xzDistToPlayer < 150.0f) && !Gameplay_InCsMode(globalCtx) && + !(player->stateFlags1 & 0x800)) { + func_800800F8(globalCtx, 0x8B6, -0x63, &this->actor, 0); + this->timer = 0; + func_8002DF54(globalCtx, NULL, 8); + this->actionFunc = EnDntJiji_SetupUnburrow; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2068.s") +void EnDntJiji_SetupUp(EnDntJiji* this, GlobalContext* globalCtx) { + this->endFrame = (f32)Animation_GetLastFrame(&gDntJijiUpAnim); + Animation_Change(&this->skelAnime, &gDntJijiUpAnim, 1.0f, 0.0f, this->endFrame, ANIMMODE_ONCE, -10.0f); + EffectSsHahen_SpawnBurst(globalCtx, &this->actor.world.pos, 6.0f, 0, 15, 5, 20, HAHEN_OBJECT_DEFAULT, 10, NULL); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_UP); + this->actionFunc = EnDntJiji_Up; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2118.s") +void EnDntJiji_Up(EnDntJiji* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 3, 0x1388, 0); + if (this->actor.xzDistToPlayer < 150.0f) { + this->actionFunc = EnDntJiji_SetupCower; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2254.s") +void EnDntJiji_SetupUnburrow(EnDntJiji* this, GlobalContext* globalCtx) { + this->endFrame = (f32)Animation_GetLastFrame(&gDntJijiUnburrowAnim); + Animation_Change(&this->skelAnime, &gDntJijiUnburrowAnim, 1.0f, 0.0f, this->endFrame, ANIMMODE_ONCE, -10.0f); + EffectSsHahen_SpawnBurst(globalCtx, &this->actor.world.pos, 6.0f, 0, 15, 5, 20, HAHEN_OBJECT_DEFAULT, 10, NULL); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_UP); + this->actionFunc = EnDntJiji_Unburrow; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2344.s") +void EnDntJiji_Unburrow(EnDntJiji* this, GlobalContext* globalCtx) { + f32 frame = this->skelAnime.curFrame; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F236C.s") + SkelAnime_Update(&this->skelAnime); + if (this->endFrame <= frame) { + if (this->action != DNT_LEADER_ACTION_ATTACK) { + this->actionFunc = EnDntJiji_SetupWalk; + } else { + this->actionFunc = EnDntJiji_SetupReturn; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F24AC.s") +void EnDntJiji_SetupWalk(EnDntJiji* this, GlobalContext* globalCtx) { + this->endFrame = (f32)Animation_GetLastFrame(&gDntJijiWalkAnim); + Animation_Change(&this->skelAnime, &gDntJijiWalkAnim, 1.0f, 0.0f, this->endFrame, ANIMMODE_LOOP, -10.0f); + this->actor.speedXZ = 1.0f; + this->isSolid = true; + this->unburrow = true; + this->actionFunc = EnDntJiji_Walk; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2550.s") +void EnDntJiji_Walk(EnDntJiji* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 5, 0x3E8, 0); + this->actor.world.rot.y = this->actor.shape.rot.y; + Math_ApproachF(&this->actor.speedXZ, 1.0f, 0.2f, 0.4f); + if (this->sfxTimer == 0) { + this->sfxTimer = 5; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_WALK); + } + if ((this->actor.bgCheckFlags & 8) && (this->actor.bgCheckFlags & 1)) { + this->actor.velocity.y = 9.0f; + this->actor.speedXZ = 3.0f; + } + if (this->actor.xzDistToPlayer < 100.0f) { + if (CUR_UPG_VALUE(UPG_STICKS) == 1) { + this->getItemId = GI_STICK_UPGRADE_20; + } else { + this->getItemId = GI_STICK_UPGRADE_30; + } + this->actor.textId = 0x104D; + func_8010B680(globalCtx, this->actor.textId, NULL); + this->actor.speedXZ = 0.0f; + this->unused = 5; + this->actionFunc = EnDntJiji_Talk; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F25E4.s") +void EnDntJiji_SetupBurrow(EnDntJiji* this, GlobalContext* globalCtx) { + this->endFrame = (f32)Animation_GetLastFrame(&gDntJijiBurrowAnim); + Animation_Change(&this->skelAnime, &gDntJijiBurrowAnim, 1.0f, 0.0f, this->endFrame, ANIMMODE_ONCE, -10.0f); + EffectSsHahen_SpawnBurst(globalCtx, &this->actor.world.pos, 6.0f, 0, 15, 5, 20, HAHEN_OBJECT_DEFAULT, 10, NULL); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_UP); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_DOWN); + this->actionFunc = EnDntJiji_Burrow; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F26B0.s") +void EnDntJiji_Burrow(EnDntJiji* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2720.s") +void EnDntJiji_SetupCower(EnDntJiji* this, GlobalContext* globalCtx) { + this->endFrame = (f32)Animation_GetLastFrame(&gDntJijiCowerAnim); + Animation_Change(&this->skelAnime, &gDntJijiCowerAnim, 1.0f, 0.0f, this->endFrame, ANIMMODE_ONCE, -10.0f); + EffectSsHahen_SpawnBurst(globalCtx, &this->actor.world.pos, 3.0f, 0, 9, 3, 10, HAHEN_OBJECT_DEFAULT, 10, NULL); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_UP); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F28DC.s") + if ((CUR_UPG_VALUE(UPG_NUTS) == 1) || (CUR_UPG_VALUE(UPG_NUTS) == 0)) { + this->getItemId = GI_NUT_UPGRADE_30; + } else { + this->getItemId = GI_NUT_UPGRADE_40; + } + this->actor.flags |= 1; + this->actor.textId = 0x10DB; + this->unused = 5; + this->actionFunc = EnDntJiji_Cower; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2974.s") +void EnDntJiji_Cower(EnDntJiji* this, GlobalContext* globalCtx) { + f32 frame = this->skelAnime.curFrame; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F29E0.s") + SkelAnime_Update(&this->skelAnime); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 3, 0x1388, 0); + if (frame >= this->endFrame) { + if (func_8002F194(&this->actor, globalCtx)) { + this->actionFunc = EnDntJiji_SetupTalk; + } else { + func_8002F2CC(&this->actor, globalCtx, 100.0f); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2A90.s") +void EnDntJiji_SetupTalk(EnDntJiji* this, GlobalContext* globalCtx) { + this->endFrame = (f32)Animation_GetLastFrame(&gDntJijiTalkAnim); + Animation_Change(&this->skelAnime, &gDntJijiTalkAnim, 1.0f, 0.0f, this->endFrame, ANIMMODE_LOOP, -10.0f); + this->actionFunc = EnDntJiji_Talk; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Update.s") +void EnDntJiji_Talk(EnDntJiji* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 3, 0x1388, 0); + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && func_80106BC8(globalCtx)) { + func_8005B1A4(ACTIVE_CAM); + func_80106CCC(globalCtx); + func_8002DF54(globalCtx, NULL, 7); + this->actor.parent = NULL; + func_8002F434(&this->actor, globalCtx, this->getItemId, 400.0f, 200.0f); + this->actionFunc = EnDntJiji_SetupGivePrize; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Draw.s") +void EnDntJiji_SetupGivePrize(EnDntJiji* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (Actor_HasParent(&this->actor, globalCtx)) { + this->actionFunc = EnDntJiji_GivePrize; + } else { + func_8002F434(&this->actor, globalCtx, this->getItemId, 400.0f, 200.0f); + } +} + +void EnDntJiji_GivePrize(EnDntJiji* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if ((func_8010BDBC(&globalCtx->msgCtx) == 6) && func_80106BC8(globalCtx)) { + if ((this->getItemId == GI_NUT_UPGRADE_30) || (this->getItemId == GI_NUT_UPGRADE_40)) { + // nut + osSyncPrintf("実 \n"); + osSyncPrintf("実 \n"); + osSyncPrintf("実 \n"); + osSyncPrintf("実 \n"); + osSyncPrintf("実 \n"); + osSyncPrintf("実 \n"); + osSyncPrintf("実 \n"); + osSyncPrintf("実 \n"); + gSaveContext.itemGetInf[1] |= 0x8000; + } else { + // stick + osSyncPrintf("棒 \n"); + osSyncPrintf("棒 \n"); + osSyncPrintf("棒 \n"); + osSyncPrintf("棒 \n"); + osSyncPrintf("棒 \n"); + osSyncPrintf("棒 \n"); + gSaveContext.itemGetInf[1] |= 0x4000; + } + this->actor.textId = 0; + if ((this->stage != NULL) && (this->stage->actor.update != NULL)) { + this->stage->action = DNT_ACTION_NONE; + if (!this->unburrow) { + this->stage->leaderSignal = DNT_SIGNAL_HIDE; + } else { + this->stage->leaderSignal = DNT_SIGNAL_RETURN; + } + } + this->actor.flags &= ~1; + if (!this->unburrow) { + this->actionFunc = EnDntJiji_SetupHide; + } else { + this->actionFunc = EnDntJiji_SetupReturn; + } + } +} + +void EnDntJiji_SetupHide(EnDntJiji* this, GlobalContext* globalCtx) { + this->endFrame = (f32)Animation_GetLastFrame(&gDntJijiHideAnim); + Animation_Change(&this->skelAnime, &gDntJijiHideAnim, 1.0f, 0.0f, this->endFrame, ANIMMODE_ONCE, -10.0f); + this->actionFunc = EnDntJiji_Hide; +} + +void EnDntJiji_Hide(EnDntJiji* this, GlobalContext* globalCtx) { + f32 frame = this->skelAnime.curFrame; + + SkelAnime_Update(&this->skelAnime); + if (this->endFrame <= frame) { + this->actionFunc = EnDntJiji_SetupWait; + } +} + +void EnDntJiji_SetupReturn(EnDntJiji* this, GlobalContext* globalCtx) { + this->endFrame = (f32)Animation_GetLastFrame(&gDntJijiWalkAnim); + Animation_Change(&this->skelAnime, &gDntJijiWalkAnim, 1.0f, 0.0f, this->endFrame, ANIMMODE_LOOP, -10.0f); + this->actor.speedXZ = 2.0f; + this->isSolid = this->unburrow = true; + this->actionFunc = EnDntJiji_Return; +} + +void EnDntJiji_Return(EnDntJiji* this, GlobalContext* globalCtx) { + f32 dx; + f32 dz; + + SkelAnime_Update(&this->skelAnime); + dx = this->flowerPos.x - this->actor.world.pos.x; + dz = this->flowerPos.z - this->actor.world.pos.z; + Math_SmoothStepToS(&this->actor.shape.rot.y, Math_FAtan2F(dx, dz) * 10430.378f, 1, 0xBB8, 0); + this->actor.world.rot.y = this->actor.shape.rot.y; + if ((this->actor.bgCheckFlags & 8) && (this->actor.bgCheckFlags & 1)) { + this->actor.velocity.y = 9.0f; + this->actor.speedXZ = 3.0f; + } + if (this->sfxTimer == 0) { + this->sfxTimer = 3; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_WALK); + } + if ((fabsf(dx) < 5.0f) && (fabsf(dz) < 5.0f)) { + this->actor.world.pos.x = this->flowerPos.x; + this->actor.world.pos.z = this->flowerPos.z; + if (this->attackFlag) { + if ((this->stage->actor.update != NULL) && (this->stage->leaderSignal == DNT_SIGNAL_NONE)) { + this->stage->leaderSignal = DNT_SIGNAL_HIDE; + this->stage->action = DNT_ACTION_ATTACK; + Audio_SetBGM(0x81A); + } + } + this->actor.speedXZ = 0.0f; + this->isSolid = 0; + this->actionFunc = EnDntJiji_SetupBurrow; + } +} + +void EnDntJiji_Update(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + EnDntJiji* this = THIS; + + Actor_SetScale(&this->actor, 0.015f); + this->unkTimer++; + if (BREG(0)) { + // time + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 時間 ☆☆☆☆☆ %d\n" VT_RST, this->timer); + } + if ((this->timer > 1) && (this->timer != 0)) { + this->timer--; + } + if (this->sfxTimer != 0) { + this->sfxTimer--; + } + if (this->blinkTimer != 0) { + this->blinkTimer--; + } + switch (this->stageSignal) { + case DNT_LEADER_SIGNAL_UP: + this->isSolid = true; + this->action = DNT_LEADER_ACTION_UP; + this->actionFunc = EnDntJiji_SetupUp; + break; + case DNT_LEADER_SIGNAL_BURROW: + this->isSolid = false; + this->action = DNT_LEADER_ACTION_NONE; + this->actionFunc = EnDntJiji_SetupBurrow; + break; + case DNT_LEADER_SIGNAL_RETURN: + this->actionFunc = EnDntJiji_SetupReturn; + break; + case DNT_LEADER_SIGNAL_NONE: + break; + } + if (this->actor.textId != 0) { + Actor_SetFocus(&this->actor, 30.0f); + } + if (this->stageSignal != DNT_LEADER_SIGNAL_NONE) { + this->stageSignal = DNT_LEADER_SIGNAL_NONE; + } + if (this->blinkTimer == 0) { + this->eyeState++; + if (this->eyeState > 2) { + this->eyeState = 0; + this->blinkTimer = (s16)Rand_ZeroFloat(60.0f) + 20; + } + } + this->actionFunc(this, globalCtx); + Actor_MoveForward(&this->actor); + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 20.0f, 20.0f, 60.0f, 0x1D); + Collider_UpdateCylinder(&this->actor, &this->collider); + if (this->isSolid != 0) { + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } +} + +void EnDntJiji_Draw(Actor* thisx, GlobalContext* globalCtx) { + static void* blinkTex[] = { &gDntJijiEyeOpenTex, &gDntJijiEyeHalfTex, &gDntJijiEyeShutTex }; + EnDntJiji* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_dnt_jiji.c", 1019); + func_80093D18(globalCtx->state.gfxCtx); + Matrix_Push(); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(blinkTex[this->eyeState])); + SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, NULL, NULL, this); + Matrix_Pull(); + Matrix_Translate(this->flowerPos.x, this->flowerPos.y, this->flowerPos.z, MTXMODE_NEW); + Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dnt_jiji.c", 1040), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, gDntJijiFlowerDL); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_dnt_jiji.c", 1043); +} diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h index ecd923095b..6c27d539b2 100644 --- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h +++ b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h @@ -6,9 +6,30 @@ struct EnDntJiji; +typedef void (*EnDntJijiActionFunc)(struct EnDntJiji*, GlobalContext*); + typedef struct EnDntJiji { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x15C]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ Vec3s jointTable[13]; + /* 0x01DE */ Vec3s morphTable[13]; + /* 0x022C */ EnDntJijiActionFunc actionFunc; + /* 0x0230 */ Vec3f flowerPos; + /* 0x023C */ u8 isSolid; + /* 0x023E */ s16 action; + /* 0x0240 */ s16 timer; + /* 0x0242 */ s16 sfxTimer; + /* 0x0244 */ s16 blinkTimer; + /* 0x0246 */ s16 unkTimer; + /* 0x0248 */ s16 endFrame; + /* 0x024A */ s16 unburrow; + /* 0x024C */ s16 eyeState; + /* 0x024E */ s16 stageSignal; + /* 0x0250 */ s16 unused; // always set to 5 + /* 0x0252 */ s16 attackFlag; // Is never set + /* 0x0254 */ s32 getItemId; + /* 0x0258 */ struct EnDntDemo* stage; + /* 0x025C */ ColliderCylinder collider; } EnDntJiji; // size = 0x02A8 extern const ActorInit En_Dnt_Jiji_InitVars; diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c index 90a0b4cc5f..239b81245c 100644 --- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c +++ b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c @@ -1,4 +1,17 @@ +/* + * File: z_en_dnt_nomal + * Overlay: ovl_En_Dnt_Nomal + * Description: Lost Woods minigame scrubs + */ + #include "z_en_dnt_nomal.h" +#include "objects/object_dnk/object_dnk.h" +#include "overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h" +#include "overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h" +#include "overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h" +#include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" +#include "objects/object_hintnuts/object_hintnuts.h" +#include "vt.h" #define FLAGS 0x00000030 @@ -7,23 +20,44 @@ void EnDntNomal_Init(Actor* thisx, GlobalContext* globalCtx); void EnDntNomal_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnDntNomal_Update(Actor* thisx, GlobalContext* globalCtx); +void EnDntNomal_DrawTargetScrub(Actor* thisx, GlobalContext* globalCtx); +void EnDntNomal_DrawStageScrub(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_06000168; -extern UNK_TYPE D_0600031C; -extern UNK_TYPE D_06000430; -extern UNK_TYPE D_060006CC; -extern UNK_TYPE D_06000894; -extern UNK_TYPE D_06000B70; -extern UNK_TYPE D_060014E0; -extern UNK_TYPE D_06001B00; -extern UNK_TYPE D_060023B8; -extern UNK_TYPE D_060024CC; -extern UNK_TYPE D_060026C4; -extern UNK_TYPE D_06002E1C; -extern UNK_TYPE D_06002E84; -extern UNK_TYPE D_06003128; +void EnDntNomal_WaitForObject(EnDntNomal* this, GlobalContext* globalCtx); +void EnDntNomal_SetFlower(EnDntNomal* this, GlobalContext* globalCtx); + +void EnDntNomal_SetupTargetWait(EnDntNomal* this, GlobalContext* globalCtx); +void EnDntNomal_SetupTargetUnburrow(EnDntNomal* this, GlobalContext* globalCtx); +void EnDntNomal_SetupTargetWalk(EnDntNomal* this, GlobalContext* globalCtx); +void EnDntNomal_SetupTargetTalk(EnDntNomal* this, GlobalContext* globalCtx); +void EnDntNomal_SetupTargetGivePrize(EnDntNomal* this, GlobalContext* globalCtx); + +void EnDntNomal_TargetWait(EnDntNomal* this, GlobalContext* globalCtx); +void EnDntNomal_TargetUnburrow(EnDntNomal* this, GlobalContext* globalCtx); +void EnDntNomal_TargetWalk(EnDntNomal* this, GlobalContext* globalCtx); +void EnDntNomal_TargetFacePlayer(EnDntNomal* this, GlobalContext* globalCtx); +void EnDntNomal_TargetTalk(EnDntNomal* this, GlobalContext* globalCtx); +void EnDntNomal_TargetGivePrize(EnDntNomal* this, GlobalContext* globalCtx); +void EnDntNomal_TargetReturn(EnDntNomal* this, GlobalContext* globalCtx); +void EnDntNomal_TargetBurrow(EnDntNomal* this, GlobalContext* globalCtx); + +void EnDntNomal_SetupStageWait(EnDntNomal* this, GlobalContext* globalCtx); +void EnDntNomal_SetupStageCelebrate(EnDntNomal* this, GlobalContext* globalCtx); +void EnDntNomal_SetupStageDance(EnDntNomal* this, GlobalContext* globalCtx); +void EnDntNomal_SetupStageHide(EnDntNomal* this, GlobalContext* globalCtx); +void EnDntNomal_SetupStageAttack(EnDntNomal* this, GlobalContext* globalCtx); +void EnDntNomal_StageSetupReturn(EnDntNomal* this, GlobalContext* globalCtx); + +void EnDntNomal_StageWait(EnDntNomal* this, GlobalContext* globalCtx); +void EnDntNomal_StageUp(EnDntNomal* this, GlobalContext* globalCtx); +void EnDntNomal_StageUnburrow(EnDntNomal* this, GlobalContext* globalCtx); +void EnDntNomal_StageCelebrate(EnDntNomal* this, GlobalContext* globalCtx); +void EnDntNomal_StageDance(EnDntNomal* this, GlobalContext* globalCtx); +void EnDntNomal_StageHide(EnDntNomal* this, GlobalContext* globalCtx); +void EnDntNomal_StageAttackHide(EnDntNomal* this, GlobalContext* globalCtx); +void EnDntNomal_StageAttack(EnDntNomal* this, GlobalContext* globalCtx); +void EnDntNomal_StageReturn(EnDntNomal* this, GlobalContext* globalCtx); -/* const ActorInit En_Dnt_Nomal_InitVars = { ACTOR_EN_DNT_NOMAL, ACTORCAT_PROP, @@ -36,7 +70,27 @@ const ActorInit En_Dnt_Nomal_InitVars = { NULL, }; -static ColliderQuadInit D_809F5DFC = { +static ColliderCylinderInit sBodyCylinderInit = { + { + COLTYPE_NONE, + AT_NONE, + AC_NONE, + OC1_ON | OC1_TYPE_ALL, + OC2_TYPE_1, + COLSHAPE_CYLINDER, + }, + { + ELEMTYPE_UNK0, + { 0x00000000, 0x00, 0x00 }, + { 0x00000000, 0x00, 0x00 }, + TOUCH_NONE, + BUMP_NONE, + OCELEM_ON, + }, + { 16, 46, 0, { 0, 0, 0 } }, +}; + +static ColliderQuadInit sTargetQuadInit = { { COLTYPE_NONE, AT_NONE, @@ -56,100 +110,780 @@ static ColliderQuadInit D_809F5DFC = { { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, }; -static ColliderCylinderInit D_809F5DD0 = { - { - COLTYPE_NONE, - AT_NONE, - AC_NONE, - OC1_ON | OC1_TYPE_ALL, - OC2_TYPE_1, - COLSHAPE_CYLINDER, - }, - { - ELEMTYPE_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE, - BUMP_NONE, - OCELEM_ON, - }, - { 16, 46, 0, { 0, 0, 0 } }, +static Color_RGBA8 sLeafColors[] = { + { 255, 255, 255, 255 }, { 255, 195, 175, 255 }, { 210, 255, 0, 255 }, + { 255, 255, 255, 255 }, { 210, 255, 0, 255 }, { 255, 195, 175, 255 }, + { 255, 255, 255, 255 }, { 255, 195, 175, 255 }, { 210, 255, 0, 255 }, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Destroy.s") +void EnDntNomal_Init(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + EnDntNomal* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3480.s") + this->type = this->actor.params; + if (this->type < ENDNTNOMAL_TARGET) { + this->type = ENDNTNOMAL_TARGET; + } + this->actor.flags &= ~1; + this->actor.colChkInfo.mass = 0xFF; + this->objId = -1; + if (this->type == ENDNTNOMAL_TARGET) { + osSyncPrintf("\n\n"); + // Deku Scrub target + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ デグナッツ的当て ☆☆☆☆☆ \n" VT_RST); + Collider_InitQuad(globalCtx, &this->targetQuad); + Collider_SetQuad(globalCtx, &this->targetQuad, &this->actor, &sTargetQuadInit); + this->actor.world.rot.y = this->actor.shape.rot.y = this->actor.yawTowardsPlayer; + this->objId = OBJECT_HINTNUTS; + } else { + osSyncPrintf("\n\n"); + // Deku Scrub mask show audience + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ デグナッツお面品評会一般人 ☆☆☆☆☆ \n" VT_RST); + Collider_InitCylinder(globalCtx, &this->bodyCyl); + Collider_SetCylinder(globalCtx, &this->bodyCyl, &this->actor, &sBodyCylinderInit); + this->objId = OBJECT_DNK; + } + if (this->objId >= 0) { + this->objIndex = Object_GetIndex(&globalCtx->objectCtx, this->objId); + if (this->objIndex < 0) { + Actor_Kill(&this->actor); + // What? + osSyncPrintf(VT_FGCOL(PURPLE) " なにみの？ %d\n" VT_RST "\n", this->objIndex); + // Bank is funny + osSyncPrintf(VT_FGCOL(CYAN) " バンクおかしいしぞ！%d\n" VT_RST "\n", this->actor.params); + return; + } + } else { + Actor_Kill(&this->actor); + } + this->actionFunc = EnDntNomal_WaitForObject; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F35CC.s") +void EnDntNomal_Destroy(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + EnDntNomal* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3624.s") + if (this->type == ENDNTNOMAL_TARGET) { + Collider_DestroyQuad(globalCtx, &this->targetQuad); + } else { + Collider_DestroyCylinder(globalCtx, &this->bodyCyl); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F36CC.s") +void EnDntNomal_WaitForObject(EnDntNomal* this, GlobalContext* globalCtx) { + if (Object_IsLoaded(&globalCtx->objectCtx, this->objIndex)) { + gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[this->objIndex].segment); + this->actor.objBankIndex = this->objIndex; + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 0.0f); + this->actor.gravity = -2.0f; + Actor_SetScale(&this->actor, 0.01f); + if (this->type == ENDNTNOMAL_TARGET) { + SkelAnime_Init(globalCtx, &this->skelAnime, &gHintNutsSkel, &gHintNutsBurrowAnim, this->jointTable, + this->morphTable, 10); + this->actor.draw = EnDntNomal_DrawTargetScrub; + } else { + SkelAnime_Init(globalCtx, &this->skelAnime, &gDntStageSkel, &gDntStageHideAnim, this->jointTable, + this->morphTable, 11); + this->actor.draw = EnDntNomal_DrawStageScrub; + } + this->actionFunc = EnDntNomal_SetFlower; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F39B8.s") +void EnDntNomal_SetFlower(EnDntNomal* this, GlobalContext* globalCtx) { + if (this->actor.bgCheckFlags & 1) { + this->flowerPos = this->actor.world.pos; + if (this->type == ENDNTNOMAL_TARGET) { + this->actionFunc = EnDntNomal_SetupTargetWait; + } else { + this->actionFunc = EnDntNomal_SetupStageWait; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3AD4.s") +void EnDntNomal_SetupTargetWait(EnDntNomal* this, GlobalContext* globalCtx) { + this->endFrame = (f32)Animation_GetLastFrame(&gHintNutsBurrowAnim); + Animation_Change(&this->skelAnime, &gHintNutsBurrowAnim, 0.0f, 0.0f, this->endFrame, ANIMMODE_ONCE, -10.0f); + this->skelAnime.curFrame = 8.0f; + this->actionFunc = EnDntNomal_TargetWait; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3B40.s") +void EnDntNomal_TargetWait(EnDntNomal* this, GlobalContext* globalCtx) { + Vec3f scorePos; + f32 targetX = 1340.0f; + f32 targetY = 50.0f; + f32 targetZ = -30.0f; + f32 dx; + f32 dy; + f32 dz; + Vec3f scoreAccel = { 0.0f, 0.0f, 0.0f }; + Vec3f scoreVel = { 0.0f, 0.0f, 0.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3BE4.s") + this->targetVtx[0].x = this->targetVtx[1].x = this->targetVtx[2].x = this->targetVtx[3].x = targetX; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3CD0.s") + this->targetVtx[1].y = this->targetVtx[0].y = targetY - 24.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3D84.s") + this->targetVtx[2].z = this->targetVtx[0].z = targetZ + 24.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3E30.s") + this->targetVtx[3].z = this->targetVtx[1].z = targetZ - 24.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3ED4.s") + this->targetVtx[3].y = this->targetVtx[2].y = targetY + 24.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3F6C.s") + SkelAnime_Update(&this->skelAnime); + if ((this->targetQuad.base.acFlags & AC_HIT) || BREG(0)) { + this->targetQuad.base.acFlags &= ~AC_HIT; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F40D4.s") + dx = fabsf(targetX - this->targetQuad.info.bumper.hitPos.x); + dy = fabsf(targetY - this->targetQuad.info.bumper.hitPos.y); + dz = fabsf(targetZ - this->targetQuad.info.bumper.hitPos.z); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F42A4.s") + scoreVel.y = 5.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4310.s") + if (sqrtf(SQ(dx) + SQ(dy) + SQ(dz)) < 8.0f) { + scorePos.x = this->actor.world.pos.x - 20.0f; + scorePos.y = this->actor.world.pos.y + 20.0f; + scorePos.z = this->actor.world.pos.z; + EffectSsExtra_Spawn(globalCtx, &scorePos, &scoreVel, &scoreAccel, 4, 2); + func_800F8D04(NA_SE_SY_TRE_BOX_APPEAR); + func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + // Big hit + osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 大当り ☆☆☆☆☆ %d\n" VT_RST, this->hitCounter); + if (LINK_IS_CHILD && !(gSaveContext.itemGetInf[1] & 0x2000)) { + this->hitCounter++; + if (this->hitCounter >= 3) { + func_800800F8(globalCtx, 0x102C, -0x63, &this->actor, 0); + func_8002DF54(globalCtx, &this->actor, 1); + this->timer4 = 50; + this->actionFunc = EnDntNomal_SetupTargetUnburrow; + } + } + } else if (sqrtf(SQ(dx) + SQ(dy) + SQ(dz)) < 24.0f) { + scorePos.x = this->actor.world.pos.x; + scorePos.y = this->actor.world.pos.y + 20.0f; + scorePos.z = this->actor.world.pos.z; + EffectSsExtra_Spawn(globalCtx, &scorePos, &scoreVel, &scoreAccel, 4, 0); + this->hitCounter = 0; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43C8.s") +void EnDntNomal_SetupTargetUnburrow(EnDntNomal* this, GlobalContext* globalCtx) { + Vec3f spawnPos; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43F0.s") + if (this->timer4 == 0) { + this->endFrame = (f32)Animation_GetLastFrame(&gHintNutsUnburrowAnim); + Animation_Change(&this->skelAnime, &gHintNutsUnburrowAnim, 1.0f, 0.0f, this->endFrame, ANIMMODE_ONCE, -10.0f); + spawnPos = this->actor.world.pos; + spawnPos.y = this->actor.world.pos.y + 50.0f; + EffectSsHahen_SpawnBurst(globalCtx, &spawnPos, 4.0f, 0, 10, 3, 15, HAHEN_OBJECT_DEFAULT, 10, NULL); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_UP); + this->actionFunc = EnDntNomal_TargetUnburrow; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F44FC.s") +void EnDntNomal_TargetUnburrow(EnDntNomal* this, GlobalContext* globalCtx) { + f32 frame = this->skelAnime.curFrame; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4730.s") + SkelAnime_Update(&this->skelAnime); + if (frame >= this->endFrame) { + this->actionFunc = EnDntNomal_SetupTargetWalk; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4824.s") +void EnDntNomal_SetupTargetWalk(EnDntNomal* this, GlobalContext* globalCtx) { + this->endFrame = (f32)Animation_GetLastFrame(&gHintNutsRunAnim); + Animation_Change(&this->skelAnime, &gHintNutsRunAnim, 1.0f, 0.0f, this->endFrame, ANIMMODE_LOOP, -10.0f); + this->actor.speedXZ = 1.0f; + this->actor.colChkInfo.mass = 0; + this->actionFunc = EnDntNomal_TargetWalk; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F48FC.s") +void EnDntNomal_TargetWalk(EnDntNomal* this, GlobalContext* globalCtx) { + f32 dx; + f32 dz; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F49A4.s") + SkelAnime_Update(&this->skelAnime); + dx = 1340.0f + 3.0f - this->actor.world.pos.x; + dz = 0.0f - this->actor.world.pos.z; + Math_SmoothStepToS(&this->actor.shape.rot.y, Math_FAtan2F(dx, dz) * (0x8000 / M_PI), 0x32, 0xBB8, 0); + this->actor.world.rot.y = this->actor.shape.rot.y; + if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 6.0f)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_WALK); + } + if (this->actor.world.pos.z > -30.0f) { + this->actor.speedXZ = 0.0f; + this->actionFunc = EnDntNomal_TargetFacePlayer; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4BA4.s") +void EnDntNomal_TargetFacePlayer(EnDntNomal* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 3, 0x1388, 0); + if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 6.0f)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_WALK); + } + if (fabsf(this->actor.shape.rot.y - this->actor.yawTowardsPlayer) < 30.0f) { + this->actionFunc = EnDntNomal_SetupTargetTalk; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4CB4.s") +void EnDntNomal_SetupTargetTalk(EnDntNomal* this, GlobalContext* globalCtx) { + this->endFrame = (f32)Animation_GetLastFrame(&gHintNutsTalkAnim); + Animation_Change(&this->skelAnime, &gHintNutsTalkAnim, 1.0f, 0.0f, this->endFrame, ANIMMODE_LOOP, -10.0f); + this->actor.textId = 0x10AF; + func_8010B680(globalCtx, this->actor.textId, NULL); + this->actionFunc = EnDntNomal_TargetTalk; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4E18.s") +void EnDntNomal_TargetTalk(EnDntNomal* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && func_80106BC8(globalCtx)) { + func_80106CCC(globalCtx); + func_8005B1A4(ACTIVE_CAM); + ACTIVE_CAM->unk_168 = 0; + func_8002DF54(globalCtx, NULL, 8); + this->actionFunc = EnDntNomal_SetupTargetGivePrize; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4EF4.s") +void EnDntNomal_SetupTargetGivePrize(EnDntNomal* this, GlobalContext* globalCtx) { + this->endFrame = (f32)Animation_GetLastFrame(&gHintNutsSpitAnim); + Animation_Change(&this->skelAnime, &gHintNutsSpitAnim, 1.0f, 0.0f, this->endFrame, ANIMMODE_ONCE, -10.0f); + this->actionFunc = EnDntNomal_TargetGivePrize; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F50B8.s") +void EnDntNomal_TargetGivePrize(EnDntNomal* this, GlobalContext* globalCtx) { + f32 frame = this->skelAnime.curFrame; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F50EC.s") + SkelAnime_Update(&this->skelAnime); + if ((frame >= 8.0f) && !this->spawnedItem) { + f32 itemX = this->mouthPos.x - 10.0f; + f32 itemY = this->mouthPos.y; + f32 itemZ = this->mouthPos.z; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F51B8.s") + if (Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_EX_ITEM, itemX, itemY, itemZ, 0, + 0, 0, EXITEM_BULLET_BAG) == NULL) { + func_8002DF54(globalCtx, NULL, 7); + Actor_Kill(&this->actor); + } + this->spawnedItem = true; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_THROW); + } + if (frame >= this->endFrame) { + this->endFrame = (f32)Animation_GetLastFrame(&gHintNutsRunAnim); + Animation_Change(&this->skelAnime, &gHintNutsRunAnim, 1.0f, 0.0f, this->endFrame, ANIMMODE_LOOP, -10.0f); + this->actionFunc = EnDntNomal_TargetReturn; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5478.s") +void EnDntNomal_TargetReturn(EnDntNomal* this, GlobalContext* globalCtx) { + f32 dx; + f32 dz; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F551C.s") + SkelAnime_Update(&this->skelAnime); + dx = this->flowerPos.x - this->actor.world.pos.x; + dz = -180.0f - this->actor.world.pos.z; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/EnDntNomal_Update.s") + Math_SmoothStepToS(&this->actor.shape.rot.y, Math_FAtan2F(dx, dz) * (0x8000 / M_PI), 3, 0x1388, 0); + if (fabsf(this->actor.shape.rot.y - (s16)(Math_FAtan2F(dx, dz) * (0x8000 / M_PI))) < 20.0f) { + this->actor.speedXZ = 1.0f; + } + if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 6.0f)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_WALK); + } + this->actor.world.rot.y = this->actor.shape.rot.y; + if (this->actor.world.pos.z < -172.0f) { + this->endFrame = (f32)Animation_GetLastFrame(&gHintNutsBurrowAnim); + Animation_Change(&this->skelAnime, &gHintNutsBurrowAnim, 1.0f, 0.0f, this->endFrame, ANIMMODE_ONCE, -10.0f); + this->actor.world.pos.z = -173.0f; + this->actor.speedXZ = 0.0f; + this->actionFunc = EnDntNomal_TargetBurrow; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F58E4.s") +void EnDntNomal_TargetBurrow(EnDntNomal* this, GlobalContext* globalCtx) { + f32 frame = this->skelAnime.curFrame; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F59E4.s") + SkelAnime_Update(&this->skelAnime); + if (frame >= this->endFrame) { + this->actionFunc = EnDntNomal_SetupTargetWait; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5A6C.s") +void EnDntNomal_SetupStageWait(EnDntNomal* this, GlobalContext* globalCtx) { + if (this->timer3 == 0) { + this->endFrame = (f32)Animation_GetLastFrame(&gDntStageHideAnim); + Animation_Change(&this->skelAnime, &gDntStageHideAnim, 0.0f, 0.0f, this->endFrame, ANIMMODE_ONCE, -10.0f); + this->skelAnime.curFrame = 8.0f; + this->isSolid = false; + this->actionFunc = EnDntNomal_StageWait; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5C98.s") +void EnDntNomal_StageWait(EnDntNomal* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); +} + +void EnDntNomal_SetupStageUp(EnDntNomal* this, GlobalContext* globalCtx) { + if (this->timer3 == 0) { + this->endFrame = (f32)Animation_GetLastFrame(&gDntStageUpAnim); + Animation_Change(&this->skelAnime, &gDntStageUpAnim, 1.0f, 0.0f, this->endFrame, ANIMMODE_ONCE, -10.0f); + if (this->action != DNT_ACTION_ATTACK) { + this->rotDirection = -1; + } + EffectSsHahen_SpawnBurst(globalCtx, &this->actor.world.pos, 4.0f, 0, 10, 3, 15, HAHEN_OBJECT_DEFAULT, 10, NULL); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_UP); + this->isSolid = true; + this->actionFunc = EnDntNomal_StageUp; + } +} + +void EnDntNomal_StageUp(EnDntNomal* this, GlobalContext* globalCtx) { + s16 rotTarget; + f32 frame = this->skelAnime.curFrame; + f32 turnMod; + + SkelAnime_Update(&this->skelAnime); + if ((frame >= this->endFrame) && (this->action == DNT_ACTION_ATTACK)) { + this->actionFunc = EnDntNomal_SetupStageAttack; + } else { + if (this->timer4 == 0) { + turnMod = 0.0f; + if (this->stagePrize == DNT_PRIZE_NONE) { + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 3, 0x1388, 0); + } else { + f32 dx = this->targetPos.x - this->actor.world.pos.x; + f32 dz = this->targetPos.z - this->actor.world.pos.z; + + Math_SmoothStepToS(&this->actor.shape.rot.y, Math_FAtan2F(dx, dz) * (0x8000 / M_PI), 1, 0xBB8, 0); + turnMod = 90.0f; + } + if ((Rand_ZeroFloat(10.0f + turnMod) < 1.0f) && (this->action != DNT_ACTION_ATTACK)) { + this->timer4 = (s16)Rand_ZeroFloat(30.0f) + 30; + } + } else { + if (this->timer2 == 0) { + this->rotDirection++; + if (this->rotDirection > 1) { + this->rotDirection = -1; + } + this->timer2 = (s16)Rand_ZeroFloat(10.0f) + 10; + } + rotTarget = this->actor.yawTowardsPlayer; + if (this->rotDirection != 0) { + rotTarget += this->rotDirection * 0x1388; + } + Math_SmoothStepToS(&this->actor.shape.rot.y, rotTarget, 3, 0x1388, 0); + } + if (this->actor.xzDistToPlayer < 70.0f) { + this->actionFunc = EnDntNomal_SetupStageHide; + } + } +} + +void EnDntNomal_SetupStageUnburrow(EnDntNomal* this, GlobalContext* globalCtx) { + if (this->timer3 == 0) { + this->endFrame = (f32)Animation_GetLastFrame(&gDntStageUnburrowAnim); + Animation_Change(&this->skelAnime, &gDntStageUnburrowAnim, 1.0f, 0.0f, this->endFrame, ANIMMODE_ONCE, -10.0f); + this->isSolid = false; + EffectSsHahen_SpawnBurst(globalCtx, &this->actor.world.pos, 4.0f, 0, 10, 3, 15, HAHEN_OBJECT_DEFAULT, 10, NULL); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_UP); + this->actionFunc = EnDntNomal_StageUnburrow; + } +} + +void EnDntNomal_StageUnburrow(EnDntNomal* this, GlobalContext* globalCtx) { + f32 frame = this->skelAnime.curFrame; + + SkelAnime_Update(&this->skelAnime); + if (frame >= this->endFrame) { + if (this->action != DNT_ACTION_DANCE) { + this->timer3 = (s16)Rand_ZeroFloat(2.0f) + (s16)(this->type * 0.5f); + this->actionFunc = EnDntNomal_SetupStageCelebrate; + } else { + this->timer2 = 300; + this->actionFunc = EnDntNomal_SetupStageDance; + } + } +} + +void EnDntNomal_SetupStageCelebrate(EnDntNomal* this, GlobalContext* globalCtx) { + this->endFrame = (f32)Animation_GetLastFrame(&gDntStageWalkAnim); + Animation_Change(&this->skelAnime, &gDntStageWalkAnim, 1.0f, 0.0f, this->endFrame, ANIMMODE_LOOP, -10.0f); + this->actor.speedXZ = 3.0f; + this->isSolid = true; + this->actionFunc = EnDntNomal_StageCelebrate; +} + +void EnDntNomal_StageCelebrate(EnDntNomal* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if ((this->timer1 == 0) && (this->timer3 == 0)) { + f32 dx = this->targetPos.x - this->actor.world.pos.x; + f32 dz = this->targetPos.z - this->actor.world.pos.z; + + if ((fabsf(dx) < 10.0f) && (fabsf(dz) < 10.0f) && func_8010BDBC(&globalCtx->msgCtx)) { + this->action = DNT_ACTION_PRIZE; + this->actionFunc = EnDntNomal_SetupStageDance; + this->actor.speedXZ = 0.0f; + return; + } + Math_SmoothStepToS(&this->actor.shape.rot.y, Math_FAtan2F(dx, dz) * (0x8000 / M_PI), 1, 0xBB8, 0); + this->actor.world.rot.y = this->actor.shape.rot.y; + } else { + if (this->timer1 == 1) { + this->timer3 = (s16)Rand_ZeroFloat(20.0f) + 20.0f; + } + Math_SmoothStepToS(&this->actor.world.rot.y, this->actor.yawTowardsPlayer, 0x14, 0x1388, 0); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 3, 0x1388, 0); + } + if (this->timer5 == 0) { + this->timer5 = 20; + if ((this->type & 1) == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_DAMAGE); + } + } else if ((this->timer5 & 3) == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_WALK); + } + if ((this->actor.bgCheckFlags & 8) && (this->actor.bgCheckFlags & 1)) { + this->actor.velocity.y = 7.5f; + } +} + +void EnDntNomal_SetupStageDance(EnDntNomal* this, GlobalContext* globalCtx) { + this->endFrame = (f32)Animation_GetLastFrame(&gDntStageDanceAnim); + Animation_Change(&this->skelAnime, &gDntStageDanceAnim, 1.0f, 0.0f, this->endFrame, ANIMMODE_LOOP, -10.0f); + this->isSolid = true; + this->timer3 = (s16)Rand_ZeroFloat(20.0f) + 20.0f; + this->rotDirection = -1; + if (Rand_ZeroFloat(1.99f) < 1.0f) { + this->rotDirection = 1; + } + this->actionFunc = EnDntNomal_StageDance; +} + +void EnDntNomal_StageDance(EnDntNomal* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (this->timer2 == 0) { + if (this->action == DNT_ACTION_DANCE) { + this->action = DNT_ACTION_HIGH_RUPEES; + this->actionFunc = EnDntNomal_SetupStageHide; + } else { + this->action = DNT_ACTION_NONE; + this->actionFunc = EnDntNomal_StageSetupReturn; + } + } else if (this->timer3 != 0) { + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 3, 0x1388, 0); + if (this->timer3 == 1) { + this->timer4 = (s16)Rand_ZeroFloat(20.0f) + 20.0f; + this->rotDirection = -this->rotDirection; + } + } else if (this->timer4 != 0) { + this->actor.shape.rot.y += this->rotDirection * 0x800; + if (this->timer4 == 1) { + this->timer3 = (s16)Rand_ZeroFloat(20.0f) + 20.0f; + } + } +} + +void EnDntNomal_SetupStageHide(EnDntNomal* this, GlobalContext* globalCtx) { + if (this->timer3 != 0) { + if ((this->timer3 == 1) && (this->ignore == 1)) { + func_80078884(NA_SE_SY_ERROR); + } + } else { + this->endFrame = (f32)Animation_GetLastFrame(&gDntStageHideAnim); + Animation_Change(&this->skelAnime, &gDntStageHideAnim, 1.0f, 0.0f, this->endFrame, ANIMMODE_ONCE, -10.0f); + this->isSolid = false; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_DOWN); + this->actionFunc = EnDntNomal_StageHide; + } +} + +void EnDntNomal_StageHide(EnDntNomal* this, GlobalContext* globalCtx) { + EnExRuppy* rupee; + f32 frame = this->skelAnime.curFrame; + s16 rupeeColor; + + SkelAnime_Update(&this->skelAnime); + if (frame >= this->endFrame) { + EffectSsHahen_SpawnBurst(globalCtx, &this->actor.world.pos, 4.0f, 0, 10, 3, 15, HAHEN_OBJECT_DEFAULT, 10, NULL); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_UP); + switch (this->action) { + case DNT_ACTION_NONE: + this->actionFunc = EnDntNomal_SetupStageWait; + break; + case DNT_ACTION_ATTACK: + this->actionFunc = EnDntNomal_StageAttackHide; + break; + case DNT_ACTION_LOW_RUPEES: + case DNT_ACTION_HIGH_RUPEES: + rupee = + (EnExRuppy*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_EX_RUPPY, this->actor.world.pos.x, + this->actor.world.pos.y + 20.0f, this->actor.world.pos.z, 0, 0, 0, 3); + if (rupee != NULL) { + rupeeColor = this->action - DNT_ACTION_LOW_RUPEES; + rupee->colorIdx = rupeeColor; + if (Rand_ZeroFloat(3.99f) < 1.0f) { + rupee->colorIdx = rupeeColor + 1; + } + rupee->actor.velocity.y = 5.0f; + if (rupee->colorIdx == 2) { + rupee->actor.velocity.y = 7.0f; + } + func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + } + this->action = DNT_ACTION_NONE; + this->actionFunc = EnDntNomal_SetupStageWait; + break; + } + } +} + +void EnDntNomal_StageAttackHide(EnDntNomal* this, GlobalContext* globalCtx) { + if (this->actor.xzDistToPlayer > 70.0f) { + this->actionFunc = EnDntNomal_SetupStageUp; + } +} + +void EnDntNomal_SetupStageAttack(EnDntNomal* this, GlobalContext* globalCtx) { + if (this->timer3 == 0) { + this->endFrame = (f32)Animation_GetLastFrame(&gDntStageSpitAnim); + Animation_Change(&this->skelAnime, &gDntStageSpitAnim, 1.0f, 0.0f, this->endFrame, ANIMMODE_ONCE, -10.0f); + this->actor.colChkInfo.mass = 0xFF; + this->isSolid = true; + this->timer2 = 0; + Actor_ChangeCategory(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORCAT_ENEMY); + this->actionFunc = EnDntNomal_StageAttack; + } +} + +void EnDntNomal_StageAttack(EnDntNomal* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + Actor* nut; + f32 frame = this->skelAnime.curFrame; + f32 dz; + f32 dx; + f32 dy; + + SkelAnime_Update(&this->skelAnime); + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 3, 0x1388, 0); + dx = player->actor.world.pos.x - this->mouthPos.x; + dy = player->actor.world.pos.y + 30.0f - this->mouthPos.y; + dz = player->actor.world.pos.z - this->mouthPos.z; + Math_SmoothStepToS(&this->actor.shape.rot.x, -(s16)(Math_FAtan2F(dy, sqrtf(SQ(dx) + SQ(dz))) * 10430.378f), 3, + 0x1388, 0); + if ((frame >= this->endFrame) && (this->timer2 == 0)) { + this->timer2 = (s16)Rand_ZeroFloat(10.0f) + 10; + } + if (this->timer2 == 1) { + this->spawnedItem = false; + this->actionFunc = EnDntNomal_SetupStageAttack; + } else if (this->actor.xzDistToPlayer < 50.0f) { + this->action = DNT_ACTION_ATTACK; + this->actionFunc = EnDntNomal_SetupStageHide; + } else if ((frame >= 8.0f) && (!this->spawnedItem)) { + Vec3f baseOffset; + Vec3f spawnOffset; + f32 spawnX; + f32 spawnY; + f32 spawnZ; + + Matrix_RotateY(this->actor.shape.rot.y / (f32)0x8000 * M_PI, MTXMODE_NEW); + Matrix_RotateX(this->actor.shape.rot.x / (f32)0x8000 * M_PI, MTXMODE_APPLY); + baseOffset.x = 0.0f; + baseOffset.y = 0.0f; + baseOffset.z = 5.0f; + Matrix_MultVec3f(&baseOffset, &spawnOffset); + spawnX = this->mouthPos.x + spawnOffset.x; + spawnY = this->mouthPos.y + spawnOffset.y; + spawnZ = this->mouthPos.z + spawnOffset.z; + + nut = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_NUTSBALL, spawnX, spawnY, spawnZ, + this->actor.shape.rot.x, this->actor.shape.rot.y, this->actor.shape.rot.z, 4); + if (nut != NULL) { + nut->velocity.y = spawnOffset.y * 0.5f; + } + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_THROW); + this->spawnedItem = true; + } +} + +void EnDntNomal_StageSetupReturn(EnDntNomal* this, GlobalContext* globalCtx) { + this->endFrame = (f32)Animation_GetLastFrame(&gDntStageWalkAnim); + Animation_Change(&this->skelAnime, &gDntStageWalkAnim, 1.5f, 0.0f, this->endFrame, ANIMMODE_LOOP, -10.0f); + this->actor.speedXZ = 4.0f; + this->isSolid = false; + this->actionFunc = EnDntNomal_StageReturn; +} + +void EnDntNomal_StageReturn(EnDntNomal* this, GlobalContext* globalCtx) { + f32 sp2C; + f32 sp28; + + SkelAnime_Update(&this->skelAnime); + sp2C = this->flowerPos.x - this->actor.world.pos.x; + sp28 = this->flowerPos.z - this->actor.world.pos.z; + Math_SmoothStepToS(&this->actor.shape.rot.y, Math_FAtan2F(sp2C, sp28) * 10430.378f, 1, 0xBB8, 0); + if (this->timer5 == 0) { + this->timer5 = 10; + } else if (!(this->timer5 & 1)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_WALK); + } + if ((fabsf(sp2C) < 7.0f) && (fabsf(sp28) < 7.0f)) { + this->actor.world.pos.x = this->flowerPos.x; + this->actor.world.pos.z = this->flowerPos.z; + this->actor.speedXZ = 0.0f; + this->actionFunc = EnDntNomal_SetupStageHide; + } +} + +void EnDntNomal_Update(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + EnDntNomal* this = THIS; + + if (this->timer1 != 0) { + this->timer1--; + } + if (this->timer2 != 0) { + this->timer2--; + } + if (this->timer3 != 0) { + this->timer3--; + } + if (this->timer4 != 0) { + this->timer4--; + } + if (this->timer5 != 0) { + this->timer5--; + } + if (this->blinkTimer != 0) { + this->blinkTimer--; + } + this->actor.world.rot.x = this->actor.shape.rot.x; + if (this->actionFunc != EnDntNomal_StageCelebrate) { + this->actor.world.rot.y = this->actor.shape.rot.y; + } + this->unkCounter++; + if (this->type != ENDNTNOMAL_TARGET) { + switch (this->stageSignal) { + case DNT_SIGNAL_LOOK: + if (this->stagePrize == DNT_PRIZE_NONE) { + this->actionFunc = EnDntNomal_SetupStageUp; + } else { + this->actionFunc = EnDntNomal_StageUp; + } + break; + case DNT_SIGNAL_CELEBRATE: + this->action = DNT_ACTION_NONE; + this->actor.colChkInfo.mass = 0; + this->timer3 = (s16)Rand_ZeroFloat(3.0f) + (s16)(this->type * 0.5f); + this->actionFunc = EnDntNomal_SetupStageUnburrow; + break; + case DNT_SIGNAL_DANCE: + this->action = DNT_ACTION_DANCE; + this->actionFunc = EnDntNomal_SetupStageUnburrow; + break; + case DNT_SIGNAL_HIDE: + this->actionFunc = EnDntNomal_SetupStageHide; + break; + case DNT_SIGNAL_RETURN: + this->actionFunc = EnDntNomal_StageSetupReturn; + break; + case DNT_SIGNAL_UNUSED: + this->actionFunc = EnDntNomal_SetupStageDance; + break; + case DNT_SIGNAL_NONE: + break; + } + } + if (this->stageSignal != DNT_SIGNAL_NONE) { + this->stageSignal = DNT_SIGNAL_NONE; + } + if (this->blinkTimer == 0) { + this->eyeState++; + if (this->eyeState >= 3) { + this->eyeState = 0; + this->blinkTimer = (s16)Rand_ZeroFloat(60.0f) + 20; + } + } + this->actionFunc(this, globalCtx); + Actor_MoveForward(&this->actor); + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 20.0f, 20.0f, 60.0f, 0x1D); + if (this->type == ENDNTNOMAL_TARGET) { + Collider_SetQuadVertices(&this->targetQuad, &this->targetVtx[0], &this->targetVtx[1], &this->targetVtx[2], + &this->targetVtx[3]); + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->targetQuad.base); + } else { + Collider_UpdateCylinder(&this->actor, &this->bodyCyl); + if (this->isSolid) { + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->bodyCyl.base); + } + } +} + +s32 EnDntNomal_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + void* thisx) { + EnDntNomal* this = THIS; + + if ((limbIndex == 1) || (limbIndex == 3) || (limbIndex == 4) || (limbIndex == 5) || (limbIndex == 6)) { + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_dnt_nomal.c", 1733); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, sLeafColors[this->type - ENDNTNOMAL_STAGE].r, + sLeafColors[this->type - ENDNTNOMAL_STAGE].g, sLeafColors[this->type - ENDNTNOMAL_STAGE].b, 255); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_dnt_nomal.c", 1743); + } + return false; +} + +void EnDntNomal_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { + EnDntNomal* this = THIS; + Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; + + if (this->type == ENDNTNOMAL_TARGET) { + if (limbIndex == 5) { + Matrix_MultVec3f(&zeroVec, &this->mouthPos); + } + } else if (limbIndex == 7) { + Matrix_MultVec3f(&zeroVec, &this->mouthPos); + } +} + +void EnDntNomal_DrawStageScrub(Actor* thisx, GlobalContext* globalCtx) { + static void* blinkTex[] = { &gDntStageEyeOpenTex, &gDntStageEyeHalfTex, &gDntStageEyeShutTex }; + EnDntNomal* this = THIS; + Vec3f dustScale = { 0.25f, 0.25f, 0.25f }; + s32 pad; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_dnt_nomal.c", 1790); + func_80093D18(globalCtx->state.gfxCtx); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(blinkTex[this->eyeState])); + SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, EnDntNomal_OverrideLimbDraw, + EnDntNomal_PostLimbDraw, this); + Matrix_Translate(this->flowerPos.x, this->flowerPos.y, this->flowerPos.z, MTXMODE_NEW); + Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, sLeafColors[this->type - ENDNTNOMAL_STAGE].r, + sLeafColors[this->type - ENDNTNOMAL_STAGE].g, sLeafColors[this->type - ENDNTNOMAL_STAGE].b, 255); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dnt_nomal.c", 1814), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, gDntStageFlowerDL); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_dnt_nomal.c", 1817); + if (this->actionFunc == EnDntNomal_StageCelebrate) { + func_80033C30(&this->actor.world.pos, &dustScale, 255, globalCtx); + } +} + +void EnDntNomal_DrawTargetScrub(Actor* thisx, GlobalContext* globalCtx) { + EnDntNomal* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_dnt_nomal.c", 1833); + func_80093D18(globalCtx->state.gfxCtx); + SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, NULL, EnDntNomal_PostLimbDraw, + this); + Matrix_Translate(this->flowerPos.x, this->flowerPos.y, this->flowerPos.z, MTXMODE_NEW); + Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dnt_nomal.c", 1848), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, gHintNutsFlowerDL); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_dnt_nomal.c", 1851); +} diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h index a171658e0b..2b9b4bbb33 100644 --- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h +++ b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h @@ -6,11 +6,45 @@ struct EnDntNomal; +typedef void (*EnDntNomalActionFunc)(struct EnDntNomal*, GlobalContext*); + typedef struct EnDntNomal { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x214]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ Vec3s jointTable[11]; + /* 0x01D2 */ Vec3s morphTable[11]; + /* 0x0214 */ EnDntNomalActionFunc actionFunc; + /* 0x0218 */ u8 isSolid; + /* 0x0219 */ Vec3f flowerPos; + /* 0x0228 */ Vec3f targetVtx[4]; + /* 0x0258 */ s16 timer1; + /* 0x025A */ s16 timer2; + /* 0x025C */ s16 timer4; + /* 0x025E */ s16 timer5; + /* 0x0260 */ s16 blinkTimer; + /* 0x0262 */ s16 unkCounter; + /* 0x0264 */ s16 timer3; + /* 0x0266 */ s16 objId; + /* 0x0268 */ s16 eyeState; + /* 0x026A */ s16 type; + /* 0x026C */ s16 hitCounter; + /* 0x026E */ s16 endFrame; + /* 0x0270 */ s16 stageSignal; + /* 0x0272 */ s16 rotDirection; + /* 0x0274 */ s16 action; + /* 0x0276 */ u8 ignore; + /* 0x0277 */ u8 spawnedItem; + /* 0x0278 */ u8 stagePrize; + /* 0x0279 */ s8 objIndex; + /* 0x027C */ Vec3f mouthPos; + /* 0x0288 */ Vec3f targetPos; + /* 0x0294 */ ColliderQuad targetQuad; + /* 0x0314 */ ColliderCylinder bodyCyl; } EnDntNomal; // size = 0x0360 +#define ENDNTNOMAL_TARGET 0 +#define ENDNTNOMAL_STAGE 1 + extern const ActorInit En_Dnt_Nomal_InitVars; #endif diff --git a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c index 0adb524d4d..05b468f574 100644 --- a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c +++ b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c @@ -5,6 +5,7 @@ */ #include "z_en_hintnuts.h" +#include "objects/object_hintnuts/object_hintnuts.h" #define FLAGS 0x00000005 @@ -28,18 +29,6 @@ void EnHintnuts_Talk(EnHintnuts* this, GlobalContext* globalCtx); void EnHintnuts_Leave(EnHintnuts* this, GlobalContext* globalCtx); void EnHintnuts_Freeze(EnHintnuts* this, GlobalContext* globalCtx); -extern AnimationHeader D_06000168; -extern Gfx D_060014E0[]; -extern SkeletonHeader D_060023B8; -extern AnimationHeader D_060024CC; -extern AnimationHeader D_060026C4; -extern AnimationHeader D_06002B90; -extern AnimationHeader D_06002894; -extern AnimationHeader D_060029BC; -extern AnimationHeader D_06002E84; -extern AnimationHeader D_06002F7C; -extern AnimationHeader D_06003128; - const ActorInit En_Hintnuts_InitVars = { ACTOR_EN_HINTNUTS, ACTORCAT_ENEMY, @@ -91,7 +80,8 @@ void EnHintnuts_Init(Actor* thisx, GlobalContext* globalCtx) { this->actor.flags &= ~5; } else { ActorShape_Init(&this->actor.shape, 0x0, ActorShadow_DrawCircle, 35.0f); - SkelAnime_Init(globalCtx, &this->skelAnime, &D_060023B8, &D_06002F7C, this->jointTable, this->morphTable, 10); + SkelAnime_Init(globalCtx, &this->skelAnime, &gHintNutsSkel, &gHintNutsStandAnim, this->jointTable, + this->morphTable, 10); Collider_InitCylinder(globalCtx, &this->collider); Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); CollisionCheck_SetInfo(&this->actor.colChkInfo, NULL, &sColChkInfoInit); @@ -128,7 +118,7 @@ void EnHintnuts_HitByScrubProjectile1(EnHintnuts* this, GlobalContext* globalCtx } void EnHintnuts_SetupWait(EnHintnuts* this) { - Animation_PlayOnceSetSpeed(&this->skelAnime, &D_06002B90, 0.0f); + Animation_PlayOnceSetSpeed(&this->skelAnime, &gHintNutsUpAnim, 0.0f); this->animFlagAndTimer = Rand_S16Offset(100, 50); this->collider.dim.height = 5; this->actor.world.pos = this->actor.home.pos; @@ -137,18 +127,18 @@ void EnHintnuts_SetupWait(EnHintnuts* this) { } void EnHintnuts_SetupLookAround(EnHintnuts* this) { - Animation_PlayLoop(&this->skelAnime, &D_06002894); + Animation_PlayLoop(&this->skelAnime, &gHintNutsLookAroundAnim); this->animFlagAndTimer = 2; this->actionFunc = EnHintnuts_LookAround; } void EnHintnuts_SetupThrowScrubProjectile(EnHintnuts* this) { - Animation_PlayOnce(&this->skelAnime, &D_06000168); + Animation_PlayOnce(&this->skelAnime, &gHintNutsSpitAnim); this->actionFunc = EnHintnuts_ThrowNut; } void EnHintnuts_SetupStand(EnHintnuts* this) { - Animation_MorphToLoop(&this->skelAnime, &D_06002F7C, -3.0f); + Animation_MorphToLoop(&this->skelAnime, &gHintNutsStandAnim, -3.0f); if (this->actionFunc == EnHintnuts_ThrowNut) { this->animFlagAndTimer = 2 | 0x1000; // sets timer and flag } else { @@ -158,13 +148,13 @@ void EnHintnuts_SetupStand(EnHintnuts* this) { } void EnHintnuts_SetupBurrow(EnHintnuts* this) { - Animation_MorphToPlayOnce(&this->skelAnime, &D_060024CC, -5.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &gHintNutsBurrowAnim, -5.0f); Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_DOWN); this->actionFunc = EnHintnuts_Burrow; } void EnHintnuts_HitByScrubProjectile2(EnHintnuts* this) { - Animation_MorphToPlayOnce(&this->skelAnime, &D_060026C4, -3.0f); + Animation_MorphToPlayOnce(&this->skelAnime, &gHintNutsUnburrowAnim, -3.0f); this->collider.dim.height = 0x25; Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_DAMAGE); this->collider.base.acFlags &= ~AC_ON; @@ -189,19 +179,19 @@ void EnHintnuts_HitByScrubProjectile2(EnHintnuts* this) { } void EnHintnuts_SetupRun(EnHintnuts* this) { - Animation_PlayLoop(&this->skelAnime, &D_06003128); + Animation_PlayLoop(&this->skelAnime, &gHintNutsRunAnim); this->animFlagAndTimer = 5; this->actionFunc = EnHintnuts_Run; } void EnHintnuts_SetupTalk(EnHintnuts* this) { - Animation_MorphToLoop(&this->skelAnime, &D_06002E84, -5.0f); + Animation_MorphToLoop(&this->skelAnime, &gHintNutsTalkAnim, -5.0f); this->actionFunc = EnHintnuts_Talk; this->actor.speedXZ = 0.0f; } void EnHintnuts_SetupLeave(EnHintnuts* this, GlobalContext* globalCtx) { - Animation_MorphToLoop(&this->skelAnime, &D_06003128, -5.0f); + Animation_MorphToLoop(&this->skelAnime, &gHintNutsRunAnim, -5.0f); this->actor.speedXZ = 3.0f; this->animFlagAndTimer = 100; this->actor.world.rot.y = this->actor.shape.rot.y; @@ -214,7 +204,7 @@ void EnHintnuts_SetupLeave(EnHintnuts* this, GlobalContext* globalCtx) { } void EnHintnuts_SetupFreeze(EnHintnuts* this) { - Animation_PlayLoop(&this->skelAnime, &D_060029BC); + Animation_PlayLoop(&this->skelAnime, &gHintNutsFreezeAnim); this->actor.flags &= ~1; func_8003426C(&this->actor, 0, 0xFF, 0, 100); this->actor.colorFilterTimer = 1; @@ -507,7 +497,7 @@ void EnHintnuts_Update(Actor* thisx, GlobalContext* globalCtx) { Actor_SetFocus(&this->actor, this->skelAnime.curFrame); } else if (this->actionFunc == EnHintnuts_Burrow) { Actor_SetFocus(&this->actor, - 20.0f - ((this->skelAnime.curFrame * 20.0f) / Animation_GetLastFrame(&D_060024CC))); + 20.0f - ((this->skelAnime.curFrame * 20.0f) / Animation_GetLastFrame(&gHintNutsBurrowAnim))); } else { Actor_SetFocus(&this->actor, 20.0f); } @@ -547,7 +537,7 @@ void EnHintnuts_Draw(Actor* thisx, GlobalContext* globalCtx) { EnHintnuts* this = THIS; if (this->actor.params == 0xA) { - Gfx_DrawDListOpa(globalCtx, D_060014E0); + Gfx_DrawDListOpa(globalCtx, gHintNutsFlowerDL); } else { SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, EnHintnuts_OverrideLimbDraw, NULL, this); diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c index 3632ecc0fd..6f419ac1cc 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -5,6 +5,9 @@ */ #include "z_en_nutsball.h" +#include "objects/object_dns/object_dns.h" +#include "objects/object_hintnuts/object_hintnuts.h" +#include "objects/object_dnk/object_dnk.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" #define FLAGS 0x00000010 @@ -53,7 +56,7 @@ static ColliderCylinderInit sCylinderInit = { static s16 sObjectIDs[] = { OBJECT_DEKUNUTS, OBJECT_HINTNUTS, OBJECT_SHOPNUTS, OBJECT_DNS, OBJECT_DNK }; -static Gfx* sDLists[] = { 0x06002028, 0x060012F0, 0x06004008, 0x06002410, 0x06001890 }; +static Gfx* sDLists[] = { 0x06002028, gHintNutsNutDL, 0x06004008, gDntJijiNutDL, gDntStageNutDL }; void EnNutsball_Init(Actor* thisx, GlobalContext* globalCtx) { EnNutsball* this = THIS; diff --git a/undefined_syms.txt b/undefined_syms.txt index 22070ece71..d90a729ef1 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -2131,6 +2131,7 @@ D_06001B00 = 0x06001B00; D_060023B8 = 0x060023B8; D_060024CC = 0x060024CC; D_060026C4 = 0x060026C4; +D_06002AF0 = 0x06002AF0; D_06002E1C = 0x06002E1C; D_06002E84 = 0x06002E84; D_06003128 = 0x06003128;