diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Destroy.s deleted file mode 100644 index 8b72634bd0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Destroy.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel EnXc_Destroy -/* 00090 80B3C270 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00094 80B3C274 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00098 80B3C278 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0009C 80B3C27C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000A0 80B3C280 0C0170EB */ jal Collider_DestroyCylinder - -/* 000A4 80B3C284 24C502C0 */ addiu $a1, $a2, 0x02C0 ## $a1 = 000002C0 -/* 000A8 80B3C288 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000AC 80B3C28C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000B0 80B3C290 03E00008 */ jr $ra -/* 000B4 80B3C294 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Draw.s deleted file mode 100644 index b1ede55b8d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Draw.s +++ /dev/null @@ -1,34 +0,0 @@ -.rdata -glabel D_80B421C0 - .asciz "\x1b[31m描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.text -glabel EnXc_Draw -/* 05B04 80B41CE4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05B08 80B41CE8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 05B0C 80B41CEC 8C820264 */ lw $v0, 0x0264($a0) ## 00000264 -/* 05B10 80B41CF0 04400008 */ bltz $v0, .L80B41D14 -/* 05B14 80B41CF4 28410006 */ slti $at, $v0, 0x0006 -/* 05B18 80B41CF8 10200006 */ beq $at, $zero, .L80B41D14 -/* 05B1C 80B41CFC 00027080 */ sll $t6, $v0, 2 -/* 05B20 80B41D00 3C0380B4 */ lui $v1, %hi(D_80B41F18) ## $v1 = 80B40000 -/* 05B24 80B41D04 006E1821 */ addu $v1, $v1, $t6 -/* 05B28 80B41D08 8C631F18 */ lw $v1, %lo(D_80B41F18)($v1) -/* 05B2C 80B41D0C 14600006 */ bne $v1, $zero, .L80B41D28 -/* 05B30 80B41D10 00000000 */ nop -.L80B41D14: -/* 05B34 80B41D14 3C0480B4 */ lui $a0, %hi(D_80B421C0) ## $a0 = 80B40000 -/* 05B38 80B41D18 0C00084C */ jal osSyncPrintf - -/* 05B3C 80B41D1C 248421C0 */ addiu $a0, $a0, %lo(D_80B421C0) ## $a0 = 80B421C0 -/* 05B40 80B41D20 10000004 */ beq $zero, $zero, .L80B41D34 -/* 05B44 80B41D24 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B41D28: -/* 05B48 80B41D28 0060F809 */ jalr $ra, $v1 -/* 05B4C 80B41D2C 00000000 */ nop -/* 05B50 80B41D30 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B41D34: -/* 05B54 80B41D34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05B58 80B41D38 03E00008 */ jr $ra -/* 05B5C 80B41D3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Init.s deleted file mode 100644 index 4eb14104f6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Init.s +++ /dev/null @@ -1,133 +0,0 @@ -.rdata -glabel D_80B4215C - .asciz "\x1b[31m En_Oa2 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.late_rodata -glabel jtbl_80B422B0 -.word L80B41A48 -.word L80B41994 -.word L80B419A8 -.word L80B419BC -.word L80B419D0 -.word L80B419E4 -.word L80B419F8 -.word L80B41A0C -.word L80B41A20 -.word L80B41A34 -.word 0x00000000, 0x00000000 - -.text -glabel EnXc_Init -/* 05720 80B41900 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 05724 80B41904 AFB10028 */ sw $s1, 0x0028($sp) -/* 05728 80B41908 AFB00024 */ sw $s0, 0x0024($sp) -/* 0572C 80B4190C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05730 80B41910 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 05734 80B41914 AFBF002C */ sw $ra, 0x002C($sp) -/* 05738 80B41918 3C068003 */ lui $a2, %hi(ActorShadow_DrawCircle) -/* 0573C 80B4191C 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawCircle) -/* 05740 80B41920 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 05744 80B41924 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 05748 80B41928 0C00AC78 */ jal ActorShape_Init - -/* 0574C 80B4192C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 05750 80B41930 3C060601 */ lui $a2, %hi(D_06012AF0) ## $a2 = 06010000 -/* 05754 80B41934 3C070600 */ lui $a3, %hi(D_06004828) ## $a3 = 06000000 -/* 05758 80B41938 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 -/* 0575C 80B4193C 260F01F6 */ addiu $t7, $s0, 0x01F6 ## $t7 = 000001F6 -/* 05760 80B41940 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 -/* 05764 80B41944 AFB80018 */ sw $t8, 0x0018($sp) -/* 05768 80B41948 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0576C 80B4194C AFAE0010 */ sw $t6, 0x0010($sp) -/* 05770 80B41950 24E74828 */ addiu $a3, $a3, %lo(D_06004828) ## $a3 = 06004828 -/* 05774 80B41954 24C62AF0 */ addiu $a2, $a2, %lo(D_06012AF0) ## $a2 = 06012AF0 -/* 05778 80B41958 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0577C 80B4195C 0C0291BE */ jal SkelAnime_InitFlex -/* 05780 80B41960 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 05784 80B41964 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05788 80B41968 0C2CF078 */ jal func_80B3C1E0 -/* 0578C 80B4196C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05790 80B41970 9619001C */ lhu $t9, 0x001C($s0) ## 0000001C -/* 05794 80B41974 2F21000A */ sltiu $at, $t9, 0x000A -/* 05798 80B41978 10200038 */ beq $at, $zero, .L80B41A5C -/* 0579C 80B4197C 0019C880 */ sll $t9, $t9, 2 -/* 057A0 80B41980 3C0180B4 */ lui $at, %hi(jtbl_80B422B0) ## $at = 80B40000 -/* 057A4 80B41984 00390821 */ addu $at, $at, $t9 -/* 057A8 80B41988 8C3922B0 */ lw $t9, %lo(jtbl_80B422B0)($at) -/* 057AC 80B4198C 03200008 */ jr $t9 -/* 057B0 80B41990 00000000 */ nop -glabel L80B41994 -/* 057B4 80B41994 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 057B8 80B41998 0C2CFAFC */ jal func_80B3EBF0 -/* 057BC 80B4199C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 057C0 80B419A0 10000035 */ beq $zero, $zero, .L80B41A78 -/* 057C4 80B419A4 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80B419A8 -/* 057C8 80B419A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 057CC 80B419AC 0C2CFB99 */ jal func_80B3EE64 -/* 057D0 80B419B0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 057D4 80B419B4 10000030 */ beq $zero, $zero, .L80B41A78 -/* 057D8 80B419B8 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80B419BC -/* 057DC 80B419BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 057E0 80B419C0 0C2CFCF2 */ jal func_80B3F3C8 -/* 057E4 80B419C4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 057E8 80B419C8 1000002B */ beq $zero, $zero, .L80B41A78 -/* 057EC 80B419CC 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80B419D0 -/* 057F0 80B419D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 057F4 80B419D4 0C2CFE82 */ jal func_80B3FA08 -/* 057F8 80B419D8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 057FC 80B419DC 10000026 */ beq $zero, $zero, .L80B41A78 -/* 05800 80B419E0 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80B419E4 -/* 05804 80B419E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05808 80B419E8 0C2D0164 */ jal func_80B40590 -/* 0580C 80B419EC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05810 80B419F0 10000021 */ beq $zero, $zero, .L80B41A78 -/* 05814 80B419F4 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80B419F8 -/* 05818 80B419F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0581C 80B419FC 0C2CF28E */ jal func_80B3CA38 -/* 05820 80B41A00 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05824 80B41A04 1000001C */ beq $zero, $zero, .L80B41A78 -/* 05828 80B41A08 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80B41A0C -/* 0582C 80B41A0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05830 80B41A10 0C2CF2D6 */ jal func_80B3CB58 -/* 05834 80B41A14 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05838 80B41A18 10000017 */ beq $zero, $zero, .L80B41A78 -/* 0583C 80B41A1C 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80B41A20 -/* 05840 80B41A20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05844 80B41A24 0C2CF340 */ jal func_80B3CD00 -/* 05848 80B41A28 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0584C 80B41A2C 10000012 */ beq $zero, $zero, .L80B41A78 -/* 05850 80B41A30 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80B41A34 -/* 05854 80B41A34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05858 80B41A38 0C2D056E */ jal func_80B415B8 -/* 0585C 80B41A3C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05860 80B41A40 1000000D */ beq $zero, $zero, .L80B41A78 -/* 05864 80B41A44 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80B41A48 -/* 05868 80B41A48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0586C 80B41A4C 0C2CF39E */ jal func_80B3CE78 -/* 05870 80B41A50 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05874 80B41A54 10000008 */ beq $zero, $zero, .L80B41A78 -/* 05878 80B41A58 8FBF002C */ lw $ra, 0x002C($sp) -.L80B41A5C: -/* 0587C 80B41A5C 3C0480B4 */ lui $a0, %hi(D_80B4215C) ## $a0 = 80B40000 -/* 05880 80B41A60 0C00084C */ jal osSyncPrintf - -/* 05884 80B41A64 2484215C */ addiu $a0, $a0, %lo(D_80B4215C) ## $a0 = 80B4215C -/* 05888 80B41A68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0588C 80B41A6C 0C2CF39E */ jal func_80B3CE78 -/* 05890 80B41A70 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05894 80B41A74 8FBF002C */ lw $ra, 0x002C($sp) -.L80B41A78: -/* 05898 80B41A78 8FB00024 */ lw $s0, 0x0024($sp) -/* 0589C 80B41A7C 8FB10028 */ lw $s1, 0x0028($sp) -/* 058A0 80B41A80 03E00008 */ jr $ra -/* 058A4 80B41A84 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Update.s deleted file mode 100644 index c20b8a19fd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Update.s +++ /dev/null @@ -1,34 +0,0 @@ -.rdata -glabel D_80B42120 - .asciz "\x1b[31mメインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.text -glabel EnXc_Update -/* 056C4 80B418A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 056C8 80B418A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 056CC 80B418AC 8C820260 */ lw $v0, 0x0260($a0) ## 00000260 -/* 056D0 80B418B0 04400008 */ bltz $v0, .L80B418D4 -/* 056D4 80B418B4 28410051 */ slti $at, $v0, 0x0051 -/* 056D8 80B418B8 10200006 */ beq $at, $zero, .L80B418D4 -/* 056DC 80B418BC 00027080 */ sll $t6, $v0, 2 -/* 056E0 80B418C0 3C0380B4 */ lui $v1, %hi(D_80B41DC8) ## $v1 = 80B40000 -/* 056E4 80B418C4 006E1821 */ addu $v1, $v1, $t6 -/* 056E8 80B418C8 8C631DC8 */ lw $v1, %lo(D_80B41DC8)($v1) -/* 056EC 80B418CC 14600006 */ bne $v1, $zero, .L80B418E8 -/* 056F0 80B418D0 00000000 */ nop -.L80B418D4: -/* 056F4 80B418D4 3C0480B4 */ lui $a0, %hi(D_80B42120) ## $a0 = 80B40000 -/* 056F8 80B418D8 0C00084C */ jal osSyncPrintf - -/* 056FC 80B418DC 24842120 */ addiu $a0, $a0, %lo(D_80B42120) ## $a0 = 80B42120 -/* 05700 80B418E0 10000004 */ beq $zero, $zero, .L80B418F4 -/* 05704 80B418E4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B418E8: -/* 05708 80B418E8 0060F809 */ jalr $ra, $v1 -/* 0570C 80B418EC 00000000 */ nop -/* 05710 80B418F0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B418F4: -/* 05714 80B418F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05718 80B418F8 03E00008 */ jr $ra -/* 0571C 80B418FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C1E0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C1E0.s deleted file mode 100644 index fd0b927448..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C1E0.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80B3C1E0 -/* 00000 80B3C1E0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00004 80B3C1E4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00008 80B3C1E8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0000C 80B3C1EC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00010 80B3C1F0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00014 80B3C1F4 24C502C0 */ addiu $a1, $a2, 0x02C0 ## $a1 = 000002C0 -/* 00018 80B3C1F8 AFA50018 */ sw $a1, 0x0018($sp) -/* 0001C 80B3C1FC 0C0170D9 */ jal Collider_InitCylinder - -/* 00020 80B3C200 AFA60020 */ sw $a2, 0x0020($sp) -/* 00024 80B3C204 3C0780B4 */ lui $a3, %hi(D_80B41D40) ## $a3 = 80B40000 -/* 00028 80B3C208 8FA50018 */ lw $a1, 0x0018($sp) -/* 0002C 80B3C20C 8FA60020 */ lw $a2, 0x0020($sp) -/* 00030 80B3C210 24E71D40 */ addiu $a3, $a3, %lo(D_80B41D40) ## $a3 = 80B41D40 -/* 00034 80B3C214 0C017114 */ jal Collider_SetCylinderType1 -/* 00038 80B3C218 8FA40024 */ lw $a0, 0x0024($sp) -/* 0003C 80B3C21C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00040 80B3C220 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00044 80B3C224 03E00008 */ jr $ra -/* 00048 80B3C228 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C22C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C22C.s deleted file mode 100644 index c2ffaefc87..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C22C.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B3C22C -/* 0004C 80B3C22C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00050 80B3C230 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00054 80B3C234 AFA50034 */ sw $a1, 0x0034($sp) -/* 00058 80B3C238 248602C0 */ addiu $a2, $a0, 0x02C0 ## $a2 = 000002C0 -/* 0005C 80B3C23C 00C02825 */ or $a1, $a2, $zero ## $a1 = 000002C0 -/* 00060 80B3C240 0C0189B7 */ jal Collider_UpdateCylinder - -/* 00064 80B3C244 AFA60018 */ sw $a2, 0x0018($sp) -/* 00068 80B3C248 8FA40034 */ lw $a0, 0x0034($sp) -/* 0006C 80B3C24C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00070 80B3C250 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00074 80B3C254 8FA60018 */ lw $a2, 0x0018($sp) -/* 00078 80B3C258 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 0007C 80B3C25C 00812821 */ addu $a1, $a0, $at -/* 00080 80B3C260 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00084 80B3C264 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00088 80B3C268 03E00008 */ jr $ra -/* 0008C 80B3C26C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C298.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C298.s deleted file mode 100644 index 15622eae2a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C298.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80B3C298 -/* 000B8 80B3C298 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000BC 80B3C29C AFBF0014 */ sw $ra, 0x0014($sp) -/* 000C0 80B3C2A0 AFA5001C */ sw $a1, 0x001C($sp) -/* 000C4 80B3C2A4 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 000C8 80B3C2A8 3C038016 */ lui $v1, %hi(gGameInfo) -/* 000CC 80B3C2AC 2463FA90 */ addiu $v1, %lo(gGameInfo) -/* 000D0 80B3C2B0 8C580024 */ lw $t8, 0x0024($v0) ## 00000024 -/* 000D4 80B3C2B4 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 000D8 80B3C2B8 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 -/* 000DC 80B3C2BC AC98032C */ sw $t8, 0x032C($a0) ## 0000032C -/* 000E0 80B3C2C0 8C4F0028 */ lw $t7, 0x0028($v0) ## 00000028 -/* 000E4 80B3C2C4 24850314 */ addiu $a1, $a0, 0x0314 ## $a1 = 00000314 -/* 000E8 80B3C2C8 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 -/* 000EC 80B3C2CC AC8F0330 */ sw $t7, 0x0330($a0) ## 00000330 -/* 000F0 80B3C2D0 8C58002C */ lw $t8, 0x002C($v0) ## 0000002C -/* 000F4 80B3C2D4 AC980334 */ sw $t8, 0x0334($a0) ## 00000334 -/* 000F8 80B3C2D8 8C790000 */ lw $t9, 0x0000($v1) ## 8015FA90 -/* 000FC 80B3C2DC 87281474 */ lh $t0, 0x1474($t9) ## 00001474 -/* 00100 80B3C2E0 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 00104 80B3C2E4 00000000 */ nop -/* 00108 80B3C2E8 468021A0 */ cvt.s.w $f6, $f4 -/* 0010C 80B3C2EC 46083281 */ sub.s $f10, $f6, $f8 -/* 00110 80B3C2F0 E48A0328 */ swc1 $f10, 0x0328($a0) ## 00000328 -/* 00114 80B3C2F4 8C690000 */ lw $t1, 0x0000($v1) ## 8015FA90 -/* 00118 80B3C2F8 85261476 */ lh $a2, 0x1476($t1) ## 00001476 -/* 0011C 80B3C2FC 24C6000C */ addiu $a2, $a2, 0x000C ## $a2 = 0000000C -/* 00120 80B3C300 00063400 */ sll $a2, $a2, 16 -/* 00124 80B3C304 0C00D285 */ jal func_80034A14 -/* 00128 80B3C308 00063403 */ sra $a2, $a2, 16 -/* 0012C 80B3C30C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00130 80B3C310 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00134 80B3C314 03E00008 */ jr $ra -/* 00138 80B3C318 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C31C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C31C.s deleted file mode 100644 index c7a0bce935..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C31C.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80B3C31C -/* 0013C 80B3C31C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00140 80B3C320 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00144 80B3C324 848E025E */ lh $t6, 0x025E($a0) ## 0000025E -/* 00148 80B3C328 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0014C 80B3C32C 24C3025E */ addiu $v1, $a2, 0x025E ## $v1 = 0000025E -/* 00150 80B3C330 15C00003 */ bne $t6, $zero, .L80B3C340 -/* 00154 80B3C334 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00158 80B3C338 10000005 */ beq $zero, $zero, .L80B3C350 -/* 0015C 80B3C33C 2483025E */ addiu $v1, $a0, 0x025E ## $v1 = 0000025E -.L80B3C340: -/* 00160 80B3C340 846F0000 */ lh $t7, 0x0000($v1) ## 0000025E -/* 00164 80B3C344 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 00168 80B3C348 A4780000 */ sh $t8, 0x0000($v1) ## 0000025E -/* 0016C 80B3C34C 84620000 */ lh $v0, 0x0000($v1) ## 0000025E -.L80B3C350: -/* 00170 80B3C350 14400008 */ bne $v0, $zero, .L80B3C374 -/* 00174 80B3C354 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 00178 80B3C358 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 0017C 80B3C35C AFA3001C */ sw $v1, 0x001C($sp) -/* 00180 80B3C360 0C01DF64 */ jal Rand_S16Offset - -/* 00184 80B3C364 AFA60038 */ sw $a2, 0x0038($sp) -/* 00188 80B3C368 8FA3001C */ lw $v1, 0x001C($sp) -/* 0018C 80B3C36C 8FA60038 */ lw $a2, 0x0038($sp) -/* 00190 80B3C370 A4620000 */ sh $v0, 0x0000($v1) ## 00000000 -.L80B3C374: -/* 00194 80B3C374 84790000 */ lh $t9, 0x0000($v1) ## 00000000 -/* 00198 80B3C378 24C2025C */ addiu $v0, $a2, 0x025C ## $v0 = 0000025C -/* 0019C 80B3C37C A4590000 */ sh $t9, 0x0000($v0) ## 0000025C -/* 001A0 80B3C380 84480000 */ lh $t0, 0x0000($v0) ## 0000025C -/* 001A4 80B3C384 29010003 */ slti $at, $t0, 0x0003 -/* 001A8 80B3C388 54200003 */ bnel $at, $zero, .L80B3C398 -/* 001AC 80B3C38C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001B0 80B3C390 A4400000 */ sh $zero, 0x0000($v0) ## 0000025C -/* 001B4 80B3C394 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B3C398: -/* 001B8 80B3C398 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 001BC 80B3C39C 03E00008 */ jr $ra -/* 001C0 80B3C3A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C3A4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C3A4.s deleted file mode 100644 index 7c59578b4d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C3A4.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_80B3C3A4 -/* 001C4 80B3C3A4 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 001C8 80B3C3A8 AFBF002C */ sw $ra, 0x002C($sp) -/* 001CC 80B3C3AC AFA40050 */ sw $a0, 0x0050($sp) -/* 001D0 80B3C3B0 AFA50054 */ sw $a1, 0x0054($sp) -/* 001D4 80B3C3B4 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 -/* 001D8 80B3C3B8 0C01DE1C */ jal Math_SinS - ## sins? -/* 001DC 80B3C3BC A7A40046 */ sh $a0, 0x0046($sp) -/* 001E0 80B3C3C0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 001E4 80B3C3C4 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 001E8 80B3C3C8 8FA20050 */ lw $v0, 0x0050($sp) -/* 001EC 80B3C3CC 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 001F0 80B3C3D0 46040182 */ mul.s $f6, $f0, $f4 -/* 001F4 80B3C3D4 C4480024 */ lwc1 $f8, 0x0024($v0) ## 00000024 -/* 001F8 80B3C3D8 44819000 */ mtc1 $at, $f18 ## $f18 = 3.00 -/* 001FC 80B3C3DC 24420024 */ addiu $v0, $v0, 0x0024 ## $v0 = 00000024 -/* 00200 80B3C3E0 87A40046 */ lh $a0, 0x0046($sp) -/* 00204 80B3C3E4 46083280 */ add.s $f10, $f6, $f8 -/* 00208 80B3C3E8 E7AA0040 */ swc1 $f10, 0x0040($sp) -/* 0020C 80B3C3EC C4500004 */ lwc1 $f16, 0x0004($v0) ## 00000028 -/* 00210 80B3C3F0 AFA20034 */ sw $v0, 0x0034($sp) -/* 00214 80B3C3F4 46128100 */ add.s $f4, $f16, $f18 -/* 00218 80B3C3F8 0C01DE0D */ jal Math_CosS - ## coss? -/* 0021C 80B3C3FC E7A4003C */ swc1 $f4, 0x003C($sp) -/* 00220 80B3C400 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00224 80B3C404 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 -/* 00228 80B3C408 8FA20034 */ lw $v0, 0x0034($sp) -/* 0022C 80B3C40C C7B0003C */ lwc1 $f16, 0x003C($sp) -/* 00230 80B3C410 46060202 */ mul.s $f8, $f0, $f6 -/* 00234 80B3C414 C44A0008 */ lwc1 $f10, 0x0008($v0) ## 00000008 -/* 00238 80B3C418 8FB80050 */ lw $t8, 0x0050($sp) -/* 0023C 80B3C41C 240F0FA0 */ addiu $t7, $zero, 0x0FA0 ## $t7 = 00000FA0 -/* 00240 80B3C420 AFAF0018 */ sw $t7, 0x0018($sp) -/* 00244 80B3C424 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00248 80B3C428 8FA50054 */ lw $a1, 0x0054($sp) -/* 0024C 80B3C42C 460A4080 */ add.s $f2, $f8, $f10 -/* 00250 80B3C430 2408FFF6 */ addiu $t0, $zero, 0xFFF6 ## $t0 = FFFFFFF6 -/* 00254 80B3C434 24060016 */ addiu $a2, $zero, 0x0016 ## $a2 = 00000016 -/* 00258 80B3C438 8FA70040 */ lw $a3, 0x0040($sp) -/* 0025C 80B3C43C E7A20014 */ swc1 $f2, 0x0014($sp) -/* 00260 80B3C440 871900B6 */ lh $t9, 0x00B6($t8) ## 000000B6 -/* 00264 80B3C444 AFA80024 */ sw $t0, 0x0024($sp) -/* 00268 80B3C448 AFA00020 */ sw $zero, 0x0020($sp) -/* 0026C 80B3C44C 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 00270 80B3C450 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 00274 80B3C454 AFB9001C */ sw $t9, 0x001C($sp) -/* 00278 80B3C458 8FBF002C */ lw $ra, 0x002C($sp) -/* 0027C 80B3C45C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00280 80B3C460 03E00008 */ jr $ra -/* 00284 80B3C464 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C468.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C468.s deleted file mode 100644 index bdc3a2ad4b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C468.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B3C468 -/* 00288 80B3C468 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0028C 80B3C46C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00290 80B3C470 44810000 */ mtc1 $at, $f0 ## $f0 = 30.00 -/* 00294 80B3C474 AFA50024 */ sw $a1, 0x0024($sp) -/* 00298 80B3C478 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 0029C 80B3C47C AFBF001C */ sw $ra, 0x001C($sp) -/* 002A0 80B3C480 AFA40020 */ sw $a0, 0x0020($sp) -/* 002A4 80B3C484 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 002A8 80B3C488 44070000 */ mfc1 $a3, $f0 -/* 002AC 80B3C48C AFAE0014 */ sw $t6, 0x0014($sp) -/* 002B0 80B3C490 8FA40024 */ lw $a0, 0x0024($sp) -/* 002B4 80B3C494 3C064296 */ lui $a2, 0x4296 ## $a2 = 42960000 -/* 002B8 80B3C498 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 002BC 80B3C49C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 002C0 80B3C4A0 8FBF001C */ lw $ra, 0x001C($sp) -/* 002C4 80B3C4A4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 002C8 80B3C4A8 03E00008 */ jr $ra -/* 002CC 80B3C4AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C4B0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C4B0.s deleted file mode 100644 index 91d8ba6626..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C4B0.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B3C4B0 -/* 002D0 80B3C4B0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002D4 80B3C4B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 002D8 80B3C4B8 0C02927F */ jal SkelAnime_Update - -/* 002DC 80B3C4BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 002E0 80B3C4C0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002E4 80B3C4C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002E8 80B3C4C8 03E00008 */ jr $ra -/* 002EC 80B3C4CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C4D0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C4D0.s deleted file mode 100644 index 0702e8eca6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C4D0.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B3C4D0 -/* 002F0 80B3C4D0 908E1D6C */ lbu $t6, 0x1D6C($a0) ## 00001D6C -/* 002F4 80B3C4D4 00057880 */ sll $t7, $a1, 2 -/* 002F8 80B3C4D8 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 002FC 80B3C4DC 11C00002 */ beq $t6, $zero, .L80B3C4E8 -/* 00300 80B3C4E0 008FC021 */ addu $t8, $a0, $t7 -/* 00304 80B3C4E4 8F031D8C */ lw $v1, 0x1D8C($t8) ## 00001D8C -.L80B3C4E8: -/* 00308 80B3C4E8 03E00008 */ jr $ra -/* 0030C 80B3C4EC 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C4F0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C4F0.s deleted file mode 100644 index 4d74fe8f56..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C4F0.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B3C4F0 -/* 00310 80B3C4F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00314 80B3C4F4 AFA40018 */ sw $a0, 0x0018($sp) -/* 00318 80B3C4F8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0031C 80B3C4FC AFA5001C */ sw $a1, 0x001C($sp) -/* 00320 80B3C500 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00324 80B3C504 AFA60020 */ sw $a2, 0x0020($sp) -/* 00328 80B3C508 0C2CF134 */ jal func_80B3C4D0 -/* 0032C 80B3C50C 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00330 80B3C510 10400007 */ beq $v0, $zero, .L80B3C530 -/* 00334 80B3C514 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00338 80B3C518 97AE0022 */ lhu $t6, 0x0022($sp) -/* 0033C 80B3C51C 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 00340 80B3C520 55CF0004 */ bnel $t6, $t7, .L80B3C534 -/* 00344 80B3C524 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00348 80B3C528 10000002 */ beq $zero, $zero, .L80B3C534 -/* 0034C 80B3C52C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B3C530: -/* 00350 80B3C530 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B3C534: -/* 00354 80B3C534 03E00008 */ jr $ra -/* 00358 80B3C538 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C53C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C53C.s deleted file mode 100644 index 3f98fd5941..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C53C.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B3C53C -/* 0035C 80B3C53C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00360 80B3C540 AFA40018 */ sw $a0, 0x0018($sp) -/* 00364 80B3C544 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00368 80B3C548 AFA5001C */ sw $a1, 0x001C($sp) -/* 0036C 80B3C54C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00370 80B3C550 AFA60020 */ sw $a2, 0x0020($sp) -/* 00374 80B3C554 0C2CF134 */ jal func_80B3C4D0 -/* 00378 80B3C558 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 0037C 80B3C55C 10400007 */ beq $v0, $zero, .L80B3C57C -/* 00380 80B3C560 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00384 80B3C564 97AE0022 */ lhu $t6, 0x0022($sp) -/* 00388 80B3C568 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 0038C 80B3C56C 51CF0004 */ beql $t6, $t7, .L80B3C580 -/* 00390 80B3C570 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00394 80B3C574 10000002 */ beq $zero, $zero, .L80B3C580 -/* 00398 80B3C578 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B3C57C: -/* 0039C 80B3C57C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B3C580: -/* 003A0 80B3C580 03E00008 */ jr $ra -/* 003A4 80B3C584 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C588.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C588.s deleted file mode 100644 index 235012d4d4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C588.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80B3C588 -/* 003A8 80B3C588 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003AC 80B3C58C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 003B0 80B3C590 AFBF0014 */ sw $ra, 0x0014($sp) -/* 003B4 80B3C594 AFA5001C */ sw $a1, 0x001C($sp) -/* 003B8 80B3C598 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 003BC 80B3C59C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 003C0 80B3C5A0 0C2CF134 */ jal func_80B3C4D0 -/* 003C4 80B3C5A4 AFA70018 */ sw $a3, 0x0018($sp) -/* 003C8 80B3C5A8 10400019 */ beq $v0, $zero, .L80B3C610 -/* 003CC 80B3C5AC 8FA70018 */ lw $a3, 0x0018($sp) -/* 003D0 80B3C5B0 8C4E000C */ lw $t6, 0x000C($v0) ## 0000000C -/* 003D4 80B3C5B4 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 003D8 80B3C5B8 00000000 */ nop -/* 003DC 80B3C5BC 468021A0 */ cvt.s.w $f6, $f4 -/* 003E0 80B3C5C0 E4E60024 */ swc1 $f6, 0x0024($a3) ## 00000024 -/* 003E4 80B3C5C4 8C4F0010 */ lw $t7, 0x0010($v0) ## 00000010 -/* 003E8 80B3C5C8 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 003EC 80B3C5CC 00000000 */ nop -/* 003F0 80B3C5D0 468042A0 */ cvt.s.w $f10, $f8 -/* 003F4 80B3C5D4 E4EA0028 */ swc1 $f10, 0x0028($a3) ## 00000028 -/* 003F8 80B3C5D8 8C580014 */ lw $t8, 0x0014($v0) ## 00000014 -/* 003FC 80B3C5DC 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 00400 80B3C5E0 00000000 */ nop -/* 00404 80B3C5E4 468084A0 */ cvt.s.w $f18, $f16 -/* 00408 80B3C5E8 E4F2002C */ swc1 $f18, 0x002C($a3) ## 0000002C -/* 0040C 80B3C5EC 84430006 */ lh $v1, 0x0006($v0) ## 00000006 -/* 00410 80B3C5F0 A4E300B4 */ sh $v1, 0x00B4($a3) ## 000000B4 -/* 00414 80B3C5F4 A4E30030 */ sh $v1, 0x0030($a3) ## 00000030 -/* 00418 80B3C5F8 84430008 */ lh $v1, 0x0008($v0) ## 00000008 -/* 0041C 80B3C5FC A4E300B6 */ sh $v1, 0x00B6($a3) ## 000000B6 -/* 00420 80B3C600 A4E30032 */ sh $v1, 0x0032($a3) ## 00000032 -/* 00424 80B3C604 8443000A */ lh $v1, 0x000A($v0) ## 0000000A -/* 00428 80B3C608 A4E300B8 */ sh $v1, 0x00B8($a3) ## 000000B8 -/* 0042C 80B3C60C A4E30034 */ sh $v1, 0x0034($a3) ## 00000034 -.L80B3C610: -/* 00430 80B3C610 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00434 80B3C614 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00438 80B3C618 03E00008 */ jr $ra -/* 0043C 80B3C61C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C620.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C620.s deleted file mode 100644 index aab656ba75..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C620.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel func_80B3C620 -/* 00440 80B3C620 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00444 80B3C624 AFA40040 */ sw $a0, 0x0040($sp) -/* 00448 80B3C628 AFBF001C */ sw $ra, 0x001C($sp) -/* 0044C 80B3C62C AFA50044 */ sw $a1, 0x0044($sp) -/* 00450 80B3C630 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00454 80B3C634 0C2CF134 */ jal func_80B3C4D0 -/* 00458 80B3C638 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 0045C 80B3C63C 1040002C */ beq $v0, $zero, .L80B3C6F0 -/* 00460 80B3C640 8FAE0044 */ lw $t6, 0x0044($sp) -/* 00464 80B3C644 94440004 */ lhu $a0, 0x0004($v0) ## 00000004 -/* 00468 80B3C648 94450002 */ lhu $a1, 0x0002($v0) ## 00000002 -/* 0046C 80B3C64C 95C61D74 */ lhu $a2, 0x1D74($t6) ## 00001D74 -/* 00470 80B3C650 AFA2003C */ sw $v0, 0x003C($sp) -/* 00474 80B3C654 AFA00010 */ sw $zero, 0x0010($sp) -/* 00478 80B3C658 0C01BE6F */ jal func_8006F9BC -/* 0047C 80B3C65C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00480 80B3C660 8FA3003C */ lw $v1, 0x003C($sp) -/* 00484 80B3C664 8FA20040 */ lw $v0, 0x0040($sp) -/* 00488 80B3C668 8C780010 */ lw $t8, 0x0010($v1) ## 00000010 -/* 0048C 80B3C66C 8C6F000C */ lw $t7, 0x000C($v1) ## 0000000C -/* 00490 80B3C670 8C680018 */ lw $t0, 0x0018($v1) ## 00000018 -/* 00494 80B3C674 8C790014 */ lw $t9, 0x0014($v1) ## 00000014 -/* 00498 80B3C678 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 -/* 0049C 80B3C67C 8C6A0020 */ lw $t2, 0x0020($v1) ## 00000020 -/* 004A0 80B3C680 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 004A4 80B3C684 8C69001C */ lw $t1, 0x001C($v1) ## 0000001C -/* 004A8 80B3C688 44885000 */ mtc1 $t0, $f10 ## $f10 = 0.00 -/* 004AC 80B3C68C 46803320 */ cvt.s.w $f12, $f6 -/* 004B0 80B3C690 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 -/* 004B4 80B3C694 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00 -/* 004B8 80B3C698 24420024 */ addiu $v0, $v0, 0x0024 ## $v0 = 00000024 -/* 004BC 80B3C69C 468020A0 */ cvt.s.w $f2, $f4 -/* 004C0 80B3C6A0 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 004C4 80B3C6A4 46805420 */ cvt.s.w $f16, $f10 -/* 004C8 80B3C6A8 468043A0 */ cvt.s.w $f14, $f8 -/* 004CC 80B3C6AC 46803220 */ cvt.s.w $f8, $f6 -/* 004D0 80B3C6B0 468024A0 */ cvt.s.w $f18, $f4 -/* 004D4 80B3C6B4 E7A80020 */ swc1 $f8, 0x0020($sp) -/* 004D8 80B3C6B8 46028281 */ sub.s $f10, $f16, $f2 -/* 004DC 80B3C6BC 460C9201 */ sub.s $f8, $f18, $f12 -/* 004E0 80B3C6C0 46005102 */ mul.s $f4, $f10, $f0 -/* 004E4 80B3C6C4 00000000 */ nop -/* 004E8 80B3C6C8 46004282 */ mul.s $f10, $f8, $f0 -/* 004EC 80B3C6CC 46022180 */ add.s $f6, $f4, $f2 -/* 004F0 80B3C6D0 460C5100 */ add.s $f4, $f10, $f12 -/* 004F4 80B3C6D4 E4460000 */ swc1 $f6, 0x0000($v0) ## 00000024 -/* 004F8 80B3C6D8 E4440004 */ swc1 $f4, 0x0004($v0) ## 00000028 -/* 004FC 80B3C6DC C7A60020 */ lwc1 $f6, 0x0020($sp) -/* 00500 80B3C6E0 460E3201 */ sub.s $f8, $f6, $f14 -/* 00504 80B3C6E4 46004282 */ mul.s $f10, $f8, $f0 -/* 00508 80B3C6E8 460E5100 */ add.s $f4, $f10, $f14 -/* 0050C 80B3C6EC E4440008 */ swc1 $f4, 0x0008($v0) ## 0000002C -.L80B3C6F0: -/* 00510 80B3C6F0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00514 80B3C6F4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00518 80B3C6F8 03E00008 */ jr $ra -/* 0051C 80B3C6FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C700.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C700.s deleted file mode 100644 index ce333e6fd7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C700.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_80B3C700 -/* 00520 80B3C700 00057100 */ sll $t6, $a1, 4 -/* 00524 80B3C704 000E7F02 */ srl $t7, $t6, 28 -/* 00528 80B3C708 000FC080 */ sll $t8, $t7, 2 -/* 0052C 80B3C70C 3C198016 */ lui $t9, %hi(gSegments) -/* 00530 80B3C710 0338C821 */ addu $t9, $t9, $t8 -/* 00534 80B3C714 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00538 80B3C718 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* 0053C 80B3C71C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00540 80B3C720 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00544 80B3C724 00A14024 */ and $t0, $a1, $at -/* 00548 80B3C728 AFA40038 */ sw $a0, 0x0038($sp) -/* 0054C 80B3C72C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00550 80B3C730 03282021 */ addu $a0, $t9, $t0 -/* 00554 80B3C734 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00558 80B3C738 00812021 */ addu $a0, $a0, $at -/* 0055C 80B3C73C AFA60040 */ sw $a2, 0x0040($sp) -/* 00560 80B3C740 AFA70044 */ sw $a3, 0x0044($sp) -/* 00564 80B3C744 0C028800 */ jal Animation_GetLastFrame - -/* 00568 80B3C748 AFA4002C */ sw $a0, 0x002C($sp) -/* 0056C 80B3C74C 8FA90048 */ lw $t1, 0x0048($sp) -/* 00570 80B3C750 8FA40038 */ lw $a0, 0x0038($sp) -/* 00574 80B3C754 8FA5002C */ lw $a1, 0x002C($sp) -/* 00578 80B3C758 15200007 */ bne $t1, $zero, .L80B3C778 -/* 0057C 80B3C75C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00580 80B3C760 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00584 80B3C764 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00588 80B3C768 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0058C 80B3C76C 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 00590 80B3C770 10000006 */ beq $zero, $zero, .L80B3C78C -/* 00594 80B3C774 468020A0 */ cvt.s.w $f2, $f4 -.L80B3C778: -/* 00598 80B3C778 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 0059C 80B3C77C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 005A0 80B3C780 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 005A4 80B3C784 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 005A8 80B3C788 46803020 */ cvt.s.w $f0, $f6 -.L80B3C78C: -/* 005AC 80B3C78C 93AA0043 */ lbu $t2, 0x0043($sp) -/* 005B0 80B3C790 C7A80044 */ lwc1 $f8, 0x0044($sp) -/* 005B4 80B3C794 44066000 */ mfc1 $a2, $f12 -/* 005B8 80B3C798 44070000 */ mfc1 $a3, $f0 -/* 005BC 80B3C79C E7A20010 */ swc1 $f2, 0x0010($sp) -/* 005C0 80B3C7A0 AFAA0014 */ sw $t2, 0x0014($sp) -/* 005C4 80B3C7A4 0C029468 */ jal Animation_Change - -/* 005C8 80B3C7A8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 005CC 80B3C7AC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 005D0 80B3C7B0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 005D4 80B3C7B4 03E00008 */ jr $ra -/* 005D8 80B3C7B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C7BC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C7BC.s deleted file mode 100644 index 88233263d9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C7BC.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_80B3C7BC -/* 005DC 80B3C7BC 8C8E0260 */ lw $t6, 0x0260($a0) ## 00000260 -/* 005E0 80B3C7C0 10AE0002 */ beq $a1, $t6, .L80B3C7CC -/* 005E4 80B3C7C4 00000000 */ nop -/* 005E8 80B3C7C8 AC860260 */ sw $a2, 0x0260($a0) ## 00000260 -.L80B3C7CC: -/* 005EC 80B3C7CC 03E00008 */ jr $ra -/* 005F0 80B3C7D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C7D4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C7D4.s deleted file mode 100644 index bed068e09d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C7D4.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80B3C7D4 -/* 005F4 80B3C7D4 8C820260 */ lw $v0, 0x0260($a0) ## 00000260 -/* 005F8 80B3C7D8 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 005FC 80B3C7DC 10A20006 */ beq $a1, $v0, .L80B3C7F8 -/* 00600 80B3C7E0 00000000 */ nop -/* 00604 80B3C7E4 54410004 */ bnel $v0, $at, .L80B3C7F8 -/* 00608 80B3C7E8 AC870260 */ sw $a3, 0x0260($a0) ## 00000260 -/* 0060C 80B3C7EC 03E00008 */ jr $ra -/* 00610 80B3C7F0 AC860260 */ sw $a2, 0x0260($a0) ## 00000260 -.L80B3C7F4: -/* 00614 80B3C7F4 AC870260 */ sw $a3, 0x0260($a0) ## 00000260 -.L80B3C7F8: -/* 00618 80B3C7F8 03E00008 */ jr $ra -/* 0061C 80B3C7FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C800.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C800.s deleted file mode 100644 index 60a5d13864..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C800.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B3C800 -/* 00620 80B3C800 908E1D6C */ lbu $t6, 0x1D6C($a0) ## 00001D6C -/* 00624 80B3C804 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00628 80B3C808 15C00003 */ bne $t6, $zero, .L80B3C818 -/* 0062C 80B3C80C 00000000 */ nop -/* 00630 80B3C810 03E00008 */ jr $ra -/* 00634 80B3C814 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B3C818: -/* 00638 80B3C818 03E00008 */ jr $ra -/* 0063C 80B3C81C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C820.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C820.s deleted file mode 100644 index cb069f3b72..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C820.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80B3C820 -/* 00640 80B3C820 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00644 80B3C824 AFA40028 */ sw $a0, 0x0028($sp) -/* 00648 80B3C828 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0064C 80B3C82C 3C040600 */ lui $a0, %hi(D_06004828) ## $a0 = 06000000 -/* 00650 80B3C830 0C028800 */ jal Animation_GetLastFrame - -/* 00654 80B3C834 24844828 */ addiu $a0, $a0, %lo(D_06004828) ## $a0 = 06004828 -/* 00658 80B3C838 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0065C 80B3C83C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00660 80B3C840 8FA40028 */ lw $a0, 0x0028($sp) -/* 00664 80B3C844 468021A0 */ cvt.s.w $f6, $f4 -/* 00668 80B3C848 3C050600 */ lui $a1, %hi(D_06004828) ## $a1 = 06000000 -/* 0066C 80B3C84C 44070000 */ mfc1 $a3, $f0 -/* 00670 80B3C850 24A54828 */ addiu $a1, $a1, %lo(D_06004828) ## $a1 = 06004828 -/* 00674 80B3C854 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00678 80B3C858 AFA00014 */ sw $zero, 0x0014($sp) -/* 0067C 80B3C85C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00680 80B3C860 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00684 80B3C864 0C029468 */ jal Animation_Change - -/* 00688 80B3C868 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 0068C 80B3C86C 8FAF0028 */ lw $t7, 0x0028($sp) -/* 00690 80B3C870 240E0035 */ addiu $t6, $zero, 0x0035 ## $t6 = 00000035 -/* 00694 80B3C874 ADEE0260 */ sw $t6, 0x0260($t7) ## 00000260 -/* 00698 80B3C878 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0069C 80B3C87C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 006A0 80B3C880 03E00008 */ jr $ra -/* 006A4 80B3C884 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C888.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C888.s deleted file mode 100644 index fa5b9c89c0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C888.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B3C888 -/* 006A8 80B3C888 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 006AC 80B3C88C AFBF0014 */ sw $ra, 0x0014($sp) -/* 006B0 80B3C890 AFA40018 */ sw $a0, 0x0018($sp) -/* 006B4 80B3C894 0C2CF200 */ jal func_80B3C800 -/* 006B8 80B3C898 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 006BC 80B3C89C 10400007 */ beq $v0, $zero, .L80B3C8BC -/* 006C0 80B3C8A0 8FA40018 */ lw $a0, 0x0018($sp) -/* 006C4 80B3C8A4 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 006C8 80B3C8A8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 006CC 80B3C8AC 55C10004 */ bnel $t6, $at, .L80B3C8C0 -/* 006D0 80B3C8B0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 006D4 80B3C8B4 0C2CF208 */ jal func_80B3C820 -/* 006D8 80B3C8B8 00000000 */ nop -.L80B3C8BC: -/* 006DC 80B3C8BC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B3C8C0: -/* 006E0 80B3C8C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 006E4 80B3C8C4 03E00008 */ jr $ra -/* 006E8 80B3C8C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C8CC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C8CC.s deleted file mode 100644 index aa005ba3df..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C8CC.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B3C8CC -/* 006EC 80B3C8CC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 006F0 80B3C8D0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 006F4 80B3C8D4 AFA40018 */ sw $a0, 0x0018($sp) -/* 006F8 80B3C8D8 AFA5001C */ sw $a1, 0x001C($sp) -/* 006FC 80B3C8DC 8C8F016C */ lw $t7, 0x016C($a0) ## 0000016C -/* 00700 80B3C8E0 8499018C */ lh $t9, 0x018C($a0) ## 0000018C -/* 00704 80B3C8E4 2486014C */ addiu $a2, $a0, 0x014C ## $a2 = 0000014C -/* 00708 80B3C8E8 85F80002 */ lh $t8, 0x0002($t7) ## 00000002 -/* 0070C 80B3C8EC 0319082A */ slt $at, $t8, $t9 -/* 00710 80B3C8F0 54200009 */ bnel $at, $zero, .L80B3C918 -/* 00714 80B3C8F4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00718 80B3C8F8 90C80035 */ lbu $t0, 0x0035($a2) ## 00000181 -/* 0071C 80B3C8FC 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00720 80B3C900 35090003 */ ori $t1, $t0, 0x0003 ## $t1 = 00000003 -/* 00724 80B3C904 A0C90035 */ sb $t1, 0x0035($a2) ## 00000181 -/* 00728 80B3C908 8FA50018 */ lw $a1, 0x0018($sp) -/* 0072C 80B3C90C 0C028D88 */ jal AnimationContext_SetMoveActor -/* 00730 80B3C910 8FA4001C */ lw $a0, 0x001C($sp) -/* 00734 80B3C914 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B3C918: -/* 00738 80B3C918 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0073C 80B3C91C 03E00008 */ jr $ra -/* 00740 80B3C920 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C924.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C924.s deleted file mode 100644 index 07503c94ea..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C924.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B3C924 -/* 00744 80B3C924 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00748 80B3C928 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0074C 80B3C92C AFA40018 */ sw $a0, 0x0018($sp) -/* 00750 80B3C930 AFA5001C */ sw $a1, 0x001C($sp) -/* 00754 80B3C934 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 -/* 00758 80B3C938 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 0075C 80B3C93C 24A6014C */ addiu $a2, $a1, 0x014C ## $a2 = 0000014C -/* 00760 80B3C940 35CF0003 */ ori $t7, $t6, 0x0003 ## $t7 = 00000003 -/* 00764 80B3C944 A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 -/* 00768 80B3C948 8FA4001C */ lw $a0, 0x001C($sp) -/* 0076C 80B3C94C 0C028D88 */ jal AnimationContext_SetMoveActor -/* 00770 80B3C950 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00774 80B3C954 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00778 80B3C958 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0077C 80B3C95C 03E00008 */ jr $ra -/* 00780 80B3C960 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C964.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C964.s deleted file mode 100644 index a50d732d68..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C964.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80B3C964 -/* 00784 80B3C964 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00788 80B3C968 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0078C 80B3C96C AFA40018 */ sw $a0, 0x0018($sp) -/* 00790 80B3C970 AFA5001C */ sw $a1, 0x001C($sp) -/* 00794 80B3C974 8C8E016C */ lw $t6, 0x016C($a0) ## 0000016C -/* 00798 80B3C978 8C99016C */ lw $t9, 0x016C($a0) ## 0000016C -/* 0079C 80B3C97C 908A0181 */ lbu $t2, 0x0181($a0) ## 00000181 -/* 007A0 80B3C980 89D80000 */ lwl $t8, 0x0000($t6) ## 00000000 -/* 007A4 80B3C984 99D80003 */ lwr $t8, 0x0003($t6) ## 00000003 -/* 007A8 80B3C988 354B0003 */ ori $t3, $t2, 0x0003 ## $t3 = 00000003 -/* 007AC 80B3C98C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 007B0 80B3C990 A898018A */ swl $t8, 0x018A($a0) ## 0000018A -/* 007B4 80B3C994 B898018D */ swr $t8, 0x018D($a0) ## 0000018D -/* 007B8 80B3C998 95D80004 */ lhu $t8, 0x0004($t6) ## 00000004 -/* 007BC 80B3C99C 24A6014C */ addiu $a2, $a1, 0x014C ## $a2 = 0000014C -/* 007C0 80B3C9A0 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 007C4 80B3C9A4 A498018E */ sh $t8, 0x018E($a0) ## 0000018E -/* 007C8 80B3C9A8 8B290000 */ lwl $t1, 0x0000($t9) ## 00000000 -/* 007CC 80B3C9AC 9B290003 */ lwr $t1, 0x0003($t9) ## 00000003 -/* 007D0 80B3C9B0 A8890184 */ swl $t1, 0x0184($a0) ## 00000184 -/* 007D4 80B3C9B4 B8890187 */ swr $t1, 0x0187($a0) ## 00000187 -/* 007D8 80B3C9B8 97290004 */ lhu $t1, 0x0004($t9) ## 00000004 -/* 007DC 80B3C9BC A08B0181 */ sb $t3, 0x0181($a0) ## 00000181 -/* 007E0 80B3C9C0 A4890188 */ sh $t1, 0x0188($a0) ## 00000188 -/* 007E4 80B3C9C4 0C028D88 */ jal AnimationContext_SetMoveActor -/* 007E8 80B3C9C8 8FA4001C */ lw $a0, 0x001C($sp) -/* 007EC 80B3C9CC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 007F0 80B3C9D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007F4 80B3C9D4 03E00008 */ jr $ra -/* 007F8 80B3C9D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C9DC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C9DC.s deleted file mode 100644 index 021eb58ad7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C9DC.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80B3C9DC -/* 007FC 80B3C9DC 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 -/* 00800 80B3C9E0 31CFFFFC */ andi $t7, $t6, 0xFFFC ## $t7 = 00000000 -/* 00804 80B3C9E4 03E00008 */ jr $ra -/* 00808 80B3C9E8 A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C9EC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C9EC.s deleted file mode 100644 index 64d0a1bd0c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C9EC.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B3C9EC -/* 0080C 80B3C9EC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00810 80B3C9F0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00814 80B3C9F4 3C050601 */ lui $a1, %hi(D_06013AA4) ## $a1 = 06010000 -/* 00818 80B3C9F8 24A53AA4 */ addiu $a1, $a1, %lo(D_06013AA4) ## $a1 = 06013AA4 -/* 0081C 80B3C9FC AFA00010 */ sw $zero, 0x0010($sp) -/* 00820 80B3CA00 AFA40020 */ sw $a0, 0x0020($sp) -/* 00824 80B3CA04 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00828 80B3CA08 0C2CF1C0 */ jal func_80B3C700 -/* 0082C 80B3CA0C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00830 80B3CA10 8FA40020 */ lw $a0, 0x0020($sp) -/* 00834 80B3CA14 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00838 80B3CA18 240E004F */ addiu $t6, $zero, 0x004F ## $t6 = 0000004F -/* 0083C 80B3CA1C AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 -/* 00840 80B3CA20 AC820264 */ sw $v0, 0x0264($a0) ## 00000264 -/* 00844 80B3CA24 AC82030C */ sw $v0, 0x030C($a0) ## 0000030C -/* 00848 80B3CA28 8FBF001C */ lw $ra, 0x001C($sp) -/* 0084C 80B3CA2C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00850 80B3CA30 03E00008 */ jr $ra -/* 00854 80B3CA34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA38.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA38.s deleted file mode 100644 index b058e12238..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA38.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B3CA38 -/* 00858 80B3CA38 3C028016 */ lui $v0, %hi(gSaveContext) -/* 0085C 80B3CA3C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00860 80B3CA40 944E0EDE */ lhu $t6, 0x0EDE($v0) ## 8015F53E -/* 00864 80B3CA44 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00868 80B3CA48 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0086C 80B3CA4C 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 00870 80B3CA50 15E00006 */ bne $t7, $zero, .L80B3CA6C -/* 00874 80B3CA54 AFA5001C */ sw $a1, 0x001C($sp) -/* 00878 80B3CA58 8C580004 */ lw $t8, 0x0004($v0) ## 8015E664 -/* 0087C 80B3CA5C 17000003 */ bne $t8, $zero, .L80B3CA6C -/* 00880 80B3CA60 00000000 */ nop -/* 00884 80B3CA64 10000003 */ beq $zero, $zero, .L80B3CA74 -/* 00888 80B3CA68 AC800260 */ sw $zero, 0x0260($a0) ## 00000260 -.L80B3CA6C: -/* 0088C 80B3CA6C 0C00B55C */ jal Actor_Kill - -/* 00890 80B3CA70 00000000 */ nop -.L80B3CA74: -/* 00894 80B3CA74 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00898 80B3CA78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0089C 80B3CA7C 03E00008 */ jr $ra -/* 008A0 80B3CA80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA84.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA84.s deleted file mode 100644 index 6e8f55b7c8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA84.s +++ /dev/null @@ -1,61 +0,0 @@ -.late_rodata -glabel D_80B421F8 - .float -2225.0 - -.text -glabel func_80B3CA84 -/* 008A4 80B3CA84 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 008A8 80B3CA88 AFBF0014 */ sw $ra, 0x0014($sp) -/* 008AC 80B3CA8C 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 008B0 80B3CA90 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 008B4 80B3CA94 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 008B8 80B3CA98 15C1002B */ bne $t6, $at, .L80B3CB48 -/* 008BC 80B3CA9C 00000000 */ nop -/* 008C0 80B3CAA0 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 008C4 80B3CAA4 3C0180B4 */ lui $at, %hi(D_80B421F8) ## $at = 80B40000 -/* 008C8 80B3CAA8 C42421F8 */ lwc1 $f4, %lo(D_80B421F8)($at) -/* 008CC 80B3CAAC C440002C */ lwc1 $f0, 0x002C($v0) ## 0000002D -/* 008D0 80B3CAB0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 008D4 80B3CAB4 4604003C */ c.lt.s $f0, $f4 -/* 008D8 80B3CAB8 00000000 */ nop -/* 008DC 80B3CABC 45000020 */ bc1f .L80B3CB40 -/* 008E0 80B3CAC0 00000000 */ nop -/* 008E4 80B3CAC4 0C02FF21 */ jal Gameplay_InCsMode -/* 008E8 80B3CAC8 AFA5001C */ sw $a1, 0x001C($sp) -/* 008EC 80B3CACC 1440001C */ bne $v0, $zero, .L80B3CB40 -/* 008F0 80B3CAD0 8FA6001C */ lw $a2, 0x001C($sp) -/* 008F4 80B3CAD4 3C020200 */ lui $v0, %hi(D_02003F80) ## $v0 = 02000000 -/* 008F8 80B3CAD8 24423F80 */ addiu $v0, $v0, %lo(D_02003F80) ## $v0 = 02003F80 -/* 008FC 80B3CADC 00027900 */ sll $t7, $v0, 4 -/* 00900 80B3CAE0 000FC702 */ srl $t8, $t7, 28 -/* 00904 80B3CAE4 0018C880 */ sll $t9, $t8, 2 -/* 00908 80B3CAE8 3C088016 */ lui $t0, %hi(gSegments) -/* 0090C 80B3CAEC 01194021 */ addu $t0, $t0, $t9 -/* 00910 80B3CAF0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00914 80B3CAF4 8D086FA8 */ lw $t0, %lo(gSegments)($t0) -/* 00918 80B3CAF8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0091C 80B3CAFC 00414824 */ and $t1, $v0, $at -/* 00920 80B3CB00 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00924 80B3CB04 01095021 */ addu $t2, $t0, $t1 -/* 00928 80B3CB08 3C038016 */ lui $v1, %hi(gSaveContext) -/* 0092C 80B3CB0C 01415821 */ addu $t3, $t2, $at -/* 00930 80B3CB10 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00934 80B3CB14 ACCB1D68 */ sw $t3, 0x1D68($a2) ## 00001D68 -/* 00938 80B3CB18 946D0EDE */ lhu $t5, 0x0EDE($v1) ## 8015F53E -/* 0093C 80B3CB1C 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 00940 80B3CB20 A06C1414 */ sb $t4, 0x1414($v1) ## 8015FA74 -/* 00944 80B3CB24 35AE0001 */ ori $t6, $t5, 0x0001 ## $t6 = 00000001 -/* 00948 80B3CB28 A46E0EDE */ sh $t6, 0x0EDE($v1) ## 8015F53E -/* 0094C 80B3CB2C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00950 80B3CB30 0C021344 */ jal Item_Give -/* 00954 80B3CB34 2405005A */ addiu $a1, $zero, 0x005A ## $a1 = 0000005A -/* 00958 80B3CB38 10000003 */ beq $zero, $zero, .L80B3CB48 -/* 0095C 80B3CB3C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B3CB40: -/* 00960 80B3CB40 10000001 */ beq $zero, $zero, .L80B3CB48 -/* 00964 80B3CB44 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B3CB48: -/* 00968 80B3CB48 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0096C 80B3CB4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00970 80B3CB50 03E00008 */ jr $ra -/* 00974 80B3CB54 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CB58.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CB58.s deleted file mode 100644 index c74d00885a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CB58.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B3CB58 -/* 00978 80B3CB58 3C028016 */ lui $v0, %hi(gSaveContext) -/* 0097C 80B3CB5C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00980 80B3CB60 944E0EDE */ lhu $t6, 0x0EDE($v0) ## 8015F53E -/* 00984 80B3CB64 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00988 80B3CB68 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0098C 80B3CB6C 31CF0002 */ andi $t7, $t6, 0x0002 ## $t7 = 00000000 -/* 00990 80B3CB70 15E00006 */ bne $t7, $zero, .L80B3CB8C -/* 00994 80B3CB74 AFA5001C */ sw $a1, 0x001C($sp) -/* 00998 80B3CB78 8C580004 */ lw $t8, 0x0004($v0) ## 8015E664 -/* 0099C 80B3CB7C 17000003 */ bne $t8, $zero, .L80B3CB8C -/* 009A0 80B3CB80 00000000 */ nop -/* 009A4 80B3CB84 10000003 */ beq $zero, $zero, .L80B3CB94 -/* 009A8 80B3CB88 AC800260 */ sw $zero, 0x0260($a0) ## 00000260 -.L80B3CB8C: -/* 009AC 80B3CB8C 0C00B55C */ jal Actor_Kill - -/* 009B0 80B3CB90 00000000 */ nop -.L80B3CB94: -/* 009B4 80B3CB94 8FBF0014 */ lw $ra, 0x0014($sp) -/* 009B8 80B3CB98 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 009BC 80B3CB9C 03E00008 */ jr $ra -/* 009C0 80B3CBA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CBA4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CBA4.s deleted file mode 100644 index d295de6b2a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CBA4.s +++ /dev/null @@ -1,97 +0,0 @@ -.late_rodata -glabel D_80B421FC - .float 447.0 -glabel D_80B42200 - .float 647.0 - -.text -glabel func_80B3CBA4 -/* 009C4 80B3CBA4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 009C8 80B3CBA8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 009CC 80B3CBAC 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 009D0 80B3CBB0 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 009D4 80B3CBB4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 009D8 80B3CBB8 15C1004D */ bne $t6, $at, .L80B3CCF0 -/* 009DC 80B3CBBC 00000000 */ nop -/* 009E0 80B3CBC0 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 009E4 80B3CBC4 3C01C444 */ lui $at, 0xC444 ## $at = C4440000 -/* 009E8 80B3CBC8 44812000 */ mtc1 $at, $f4 ## $f4 = -784.00 -/* 009EC 80B3CBCC C4660024 */ lwc1 $f6, 0x0024($v1) ## 00000024 -/* 009F0 80B3CBD0 3C01C412 */ lui $at, 0xC412 ## $at = C4120000 -/* 009F4 80B3CBD4 24620024 */ addiu $v0, $v1, 0x0024 ## $v0 = 00000024 -/* 009F8 80B3CBD8 4606203C */ c.lt.s $f4, $f6 -/* 009FC 80B3CBDC 00000000 */ nop -/* 00A00 80B3CBE0 45000041 */ bc1f .L80B3CCE8 -/* 00A04 80B3CBE4 00000000 */ nop -/* 00A08 80B3CBE8 C4480000 */ lwc1 $f8, 0x0000($v0) ## 00000024 -/* 00A0C 80B3CBEC 44815000 */ mtc1 $at, $f10 ## $f10 = -584.00 -/* 00A10 80B3CBF0 3C0180B4 */ lui $at, %hi(D_80B421FC) ## $at = 80B40000 -/* 00A14 80B3CBF4 460A403C */ c.lt.s $f8, $f10 -/* 00A18 80B3CBF8 00000000 */ nop -/* 00A1C 80B3CBFC 4500003A */ bc1f .L80B3CCE8 -/* 00A20 80B3CC00 00000000 */ nop -/* 00A24 80B3CC04 C4400004 */ lwc1 $f0, 0x0004($v0) ## 00000028 -/* 00A28 80B3CC08 C43021FC */ lwc1 $f16, %lo(D_80B421FC)($at) -/* 00A2C 80B3CC0C 3C0180B4 */ lui $at, %hi(D_80B42200) ## $at = 80B40000 -/* 00A30 80B3CC10 4600803C */ c.lt.s $f16, $f0 -/* 00A34 80B3CC14 00000000 */ nop -/* 00A38 80B3CC18 45000033 */ bc1f .L80B3CCE8 -/* 00A3C 80B3CC1C 00000000 */ nop -/* 00A40 80B3CC20 C4322200 */ lwc1 $f18, %lo(D_80B42200)($at) -/* 00A44 80B3CC24 3C01C3DF */ lui $at, 0xC3DF ## $at = C3DF0000 -/* 00A48 80B3CC28 4612003C */ c.lt.s $f0, $f18 -/* 00A4C 80B3CC2C 00000000 */ nop -/* 00A50 80B3CC30 4500002D */ bc1f .L80B3CCE8 -/* 00A54 80B3CC34 00000000 */ nop -/* 00A58 80B3CC38 C4400008 */ lwc1 $f0, 0x0008($v0) ## 0000002C -/* 00A5C 80B3CC3C 44812000 */ mtc1 $at, $f4 ## $f4 = -446.00 -/* 00A60 80B3CC40 3C01C376 */ lui $at, 0xC376 ## $at = C3760000 -/* 00A64 80B3CC44 4600203C */ c.lt.s $f4, $f0 -/* 00A68 80B3CC48 00000000 */ nop -/* 00A6C 80B3CC4C 45000026 */ bc1f .L80B3CCE8 -/* 00A70 80B3CC50 00000000 */ nop -/* 00A74 80B3CC54 44813000 */ mtc1 $at, $f6 ## $f6 = -246.00 -/* 00A78 80B3CC58 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00A7C 80B3CC5C 4606003C */ c.lt.s $f0, $f6 -/* 00A80 80B3CC60 00000000 */ nop -/* 00A84 80B3CC64 45000020 */ bc1f .L80B3CCE8 -/* 00A88 80B3CC68 00000000 */ nop -/* 00A8C 80B3CC6C 0C02FF21 */ jal Gameplay_InCsMode -/* 00A90 80B3CC70 AFA5001C */ sw $a1, 0x001C($sp) -/* 00A94 80B3CC74 1440001C */ bne $v0, $zero, .L80B3CCE8 -/* 00A98 80B3CC78 8FA6001C */ lw $a2, 0x001C($sp) -/* 00A9C 80B3CC7C 3C020200 */ lui $v0, %hi(D_020045D0) ## $v0 = 02000000 -/* 00AA0 80B3CC80 244245D0 */ addiu $v0, $v0, %lo(D_020045D0) ## $v0 = 020045D0 -/* 00AA4 80B3CC84 00027900 */ sll $t7, $v0, 4 -/* 00AA8 80B3CC88 000FC702 */ srl $t8, $t7, 28 -/* 00AAC 80B3CC8C 0018C880 */ sll $t9, $t8, 2 -/* 00AB0 80B3CC90 3C088016 */ lui $t0, %hi(gSegments) -/* 00AB4 80B3CC94 01194021 */ addu $t0, $t0, $t9 -/* 00AB8 80B3CC98 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00ABC 80B3CC9C 8D086FA8 */ lw $t0, %lo(gSegments)($t0) -/* 00AC0 80B3CCA0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00AC4 80B3CCA4 00414824 */ and $t1, $v0, $at -/* 00AC8 80B3CCA8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00ACC 80B3CCAC 01095021 */ addu $t2, $t0, $t1 -/* 00AD0 80B3CCB0 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00AD4 80B3CCB4 01415821 */ addu $t3, $t2, $at -/* 00AD8 80B3CCB8 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00ADC 80B3CCBC ACCB1D68 */ sw $t3, 0x1D68($a2) ## 00001D68 -/* 00AE0 80B3CCC0 946D0EDE */ lhu $t5, 0x0EDE($v1) ## 8015F53E -/* 00AE4 80B3CCC4 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 00AE8 80B3CCC8 A06C1414 */ sb $t4, 0x1414($v1) ## 8015FA74 -/* 00AEC 80B3CCCC 35AE0002 */ ori $t6, $t5, 0x0002 ## $t6 = 00000002 -/* 00AF0 80B3CCD0 A46E0EDE */ sh $t6, 0x0EDE($v1) ## 8015F53E -/* 00AF4 80B3CCD4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00AF8 80B3CCD8 0C021344 */ jal Item_Give -/* 00AFC 80B3CCDC 2405005B */ addiu $a1, $zero, 0x005B ## $a1 = 0000005B -/* 00B00 80B3CCE0 10000003 */ beq $zero, $zero, .L80B3CCF0 -/* 00B04 80B3CCE4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B3CCE8: -/* 00B08 80B3CCE8 10000001 */ beq $zero, $zero, .L80B3CCF0 -/* 00B0C 80B3CCEC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B3CCF0: -/* 00B10 80B3CCF0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B14 80B3CCF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B18 80B3CCF8 03E00008 */ jr $ra -/* 00B1C 80B3CCFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD00.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD00.s deleted file mode 100644 index 551f5371ba..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD00.s +++ /dev/null @@ -1,53 +0,0 @@ -.rdata -glabel D_80B41F50 - .asciz "水のセレナーデ シーク誕生!!!!!!!!!!!!!!!!!!\n" - .balign 4 -glabel D_80B41F80 - .asciz "水のセレナーデ シーク消滅!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.text -glabel func_80B3CD00 -/* 00B20 80B3CD00 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00B24 80B3CD04 3C0E8012 */ lui $t6, %hi(gBitFlags+4) -/* 00B28 80B3CD08 3C0F8012 */ lui $t7, %hi(gEquipShifts+3) -/* 00B2C 80B3CD0C 91EF71F3 */ lbu $t7, %lo(gEquipShifts+3)($t7) -/* 00B30 80B3CD10 8DCE7124 */ lw $t6, %lo(gBitFlags+4)($t6) -/* 00B34 80B3CD14 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00B38 80B3CD18 9459009C */ lhu $t9, 0x009C($v0) ## 8015E6FC -/* 00B3C 80B3CD1C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B40 80B3CD20 01EEC004 */ sllv $t8, $t6, $t7 -/* 00B44 80B3CD24 AFA5001C */ sw $a1, 0x001C($sp) -/* 00B48 80B3CD28 03194024 */ and $t0, $t8, $t9 -/* 00B4C 80B3CD2C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00B50 80B3CD30 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B54 80B3CD34 1500000F */ bne $t0, $zero, .L80B3CD74 -/* 00B58 80B3CD38 AFA40018 */ sw $a0, 0x0018($sp) -/* 00B5C 80B3CD3C 94490EDE */ lhu $t1, 0x0EDE($v0) ## 8015F53E -/* 00B60 80B3CD40 312A0004 */ andi $t2, $t1, 0x0004 ## $t2 = 00000000 -/* 00B64 80B3CD44 1540000B */ bne $t2, $zero, .L80B3CD74 -/* 00B68 80B3CD48 00000000 */ nop -/* 00B6C 80B3CD4C 8C4B0004 */ lw $t3, 0x0004($v0) ## 8015E664 -/* 00B70 80B3CD50 240C001D */ addiu $t4, $zero, 0x001D ## $t4 = 0000001D -/* 00B74 80B3CD54 15600007 */ bne $t3, $zero, .L80B3CD74 -/* 00B78 80B3CD58 00000000 */ nop -/* 00B7C 80B3CD5C AC8C0260 */ sw $t4, 0x0260($a0) ## 00000260 -/* 00B80 80B3CD60 3C0480B4 */ lui $a0, %hi(D_80B41F50) ## $a0 = 80B40000 -/* 00B84 80B3CD64 0C00084C */ jal osSyncPrintf - -/* 00B88 80B3CD68 24841F50 */ addiu $a0, $a0, %lo(D_80B41F50) ## $a0 = 80B41F50 -/* 00B8C 80B3CD6C 10000007 */ beq $zero, $zero, .L80B3CD8C -/* 00B90 80B3CD70 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B3CD74: -/* 00B94 80B3CD74 0C00B55C */ jal Actor_Kill - -/* 00B98 80B3CD78 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00B9C 80B3CD7C 3C0480B4 */ lui $a0, %hi(D_80B41F80) ## $a0 = 80B40000 -/* 00BA0 80B3CD80 0C00084C */ jal osSyncPrintf - -/* 00BA4 80B3CD84 24841F80 */ addiu $a0, $a0, %lo(D_80B41F80) ## $a0 = 80B41F80 -/* 00BA8 80B3CD88 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B3CD8C: -/* 00BAC 80B3CD8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00BB0 80B3CD90 03E00008 */ jr $ra -/* 00BB4 80B3CD94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD98.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD98.s deleted file mode 100644 index 924d617cf6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD98.s +++ /dev/null @@ -1,71 +0,0 @@ -.rdata -glabel D_80B41FB0 - .asciz "ブーツを取った!!!!!!!!!!!!!!!!!!\n" - .balign 4 -glabel D_80B41FD4 - .asciz "はやくブーツを取るべし!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.text -glabel func_80B3CD98 -/* 00BB8 80B3CD98 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00BBC 80B3CD9C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00BC0 80B3CDA0 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 00BC4 80B3CDA4 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00BC8 80B3CDA8 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00BCC 80B3CDAC 15C1002E */ bne $t6, $at, .L80B3CE68 -/* 00BD0 80B3CDB0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00BD4 80B3CDB4 3C0F8012 */ lui $t7, %hi(gBitFlags+4) -/* 00BD8 80B3CDB8 3C188012 */ lui $t8, %hi(gEquipShifts+3) -/* 00BDC 80B3CDBC 931871F3 */ lbu $t8, %lo(gEquipShifts+3)($t8) -/* 00BE0 80B3CDC0 8DEF7124 */ lw $t7, %lo(gBitFlags+4)($t7) -/* 00BE4 80B3CDC4 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00BE8 80B3CDC8 9468009C */ lhu $t0, 0x009C($v1) ## 8015E6FC -/* 00BEC 80B3CDCC 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 00BF0 80B3CDD0 030FC804 */ sllv $t9, $t7, $t8 -/* 00BF4 80B3CDD4 03284824 */ and $t1, $t9, $t0 -/* 00BF8 80B3CDD8 1120001E */ beq $t1, $zero, .L80B3CE54 -/* 00BFC 80B3CDDC 8C44067C */ lw $a0, 0x067C($v0) ## 0000067D -/* 00C00 80B3CDE0 946A0EDE */ lhu $t2, 0x0EDE($v1) ## 8015F53E -/* 00C04 80B3CDE4 00046080 */ sll $t4, $a0, 2 -/* 00C08 80B3CDE8 314B0004 */ andi $t3, $t2, 0x0004 ## $t3 = 00000000 -/* 00C0C 80B3CDEC 15600019 */ bne $t3, $zero, .L80B3CE54 -/* 00C10 80B3CDF0 00000000 */ nop -/* 00C14 80B3CDF4 05800017 */ bltz $t4, .L80B3CE54 -/* 00C18 80B3CDF8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00C1C 80B3CDFC 0C02FF21 */ jal Gameplay_InCsMode -/* 00C20 80B3CE00 AFA5001C */ sw $a1, 0x001C($sp) -/* 00C24 80B3CE04 14400013 */ bne $v0, $zero, .L80B3CE54 -/* 00C28 80B3CE08 8FA4001C */ lw $a0, 0x001C($sp) -/* 00C2C 80B3CE0C 3C050200 */ lui $a1, %hi(D_02000330) ## $a1 = 02000000 -/* 00C30 80B3CE10 0C01A4F6 */ jal Cutscene_SetSegment - -/* 00C34 80B3CE14 24A50330 */ addiu $a1, $a1, %lo(D_02000330) ## $a1 = 02000330 -/* 00C38 80B3CE18 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00C3C 80B3CE1C 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00C40 80B3CE20 946E0EDE */ lhu $t6, 0x0EDE($v1) ## 8015F53E -/* 00C44 80B3CE24 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 00C48 80B3CE28 A06D1414 */ sb $t5, 0x1414($v1) ## 8015FA74 -/* 00C4C 80B3CE2C 35CF0004 */ ori $t7, $t6, 0x0004 ## $t7 = 00000004 -/* 00C50 80B3CE30 A46F0EDE */ sh $t7, 0x0EDE($v1) ## 8015F53E -/* 00C54 80B3CE34 8FA4001C */ lw $a0, 0x001C($sp) -/* 00C58 80B3CE38 0C021344 */ jal Item_Give -/* 00C5C 80B3CE3C 2405005C */ addiu $a1, $zero, 0x005C ## $a1 = 0000005C -/* 00C60 80B3CE40 3C0480B4 */ lui $a0, %hi(D_80B41FB0) ## $a0 = 80B40000 -/* 00C64 80B3CE44 0C00084C */ jal osSyncPrintf - -/* 00C68 80B3CE48 24841FB0 */ addiu $a0, $a0, %lo(D_80B41FB0) ## $a0 = 80B41FB0 -/* 00C6C 80B3CE4C 10000006 */ beq $zero, $zero, .L80B3CE68 -/* 00C70 80B3CE50 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B3CE54: -/* 00C74 80B3CE54 3C0480B4 */ lui $a0, %hi(D_80B41FD4) ## $a0 = 80B40000 -/* 00C78 80B3CE58 0C00084C */ jal osSyncPrintf - -/* 00C7C 80B3CE5C 24841FD4 */ addiu $a0, $a0, %lo(D_80B41FD4) ## $a0 = 80B41FD4 -/* 00C80 80B3CE60 10000001 */ beq $zero, $zero, .L80B3CE68 -/* 00C84 80B3CE64 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B3CE68: -/* 00C88 80B3CE68 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C8C 80B3CE6C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C90 80B3CE70 03E00008 */ jr $ra -/* 00C94 80B3CE74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CE78.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CE78.s deleted file mode 100644 index 266719217b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CE78.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80B3CE78 -/* 00C98 80B3CE78 AFA40000 */ sw $a0, 0x0000($sp) -/* 00C9C 80B3CE7C 03E00008 */ jr $ra -/* 00CA0 80B3CE80 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CE84.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CE84.s deleted file mode 100644 index c88616040d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CE84.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80B3CE84 -/* 00CA4 80B3CE84 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00CA8 80B3CE88 AFB00018 */ sw $s0, 0x0018($sp) -/* 00CAC 80B3CE8C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00CB0 80B3CE90 AFBF001C */ sw $ra, 0x001C($sp) -/* 00CB4 80B3CE94 AFA5003C */ sw $a1, 0x003C($sp) -/* 00CB8 80B3CE98 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00CBC 80B3CE9C AFA40020 */ sw $a0, 0x0020($sp) -/* 00CC0 80B3CEA0 0C0295B2 */ jal Animation_OnFrame -/* 00CC4 80B3CEA4 3C054130 */ lui $a1, 0x4130 ## $a1 = 41300000 -/* 00CC8 80B3CEA8 14400005 */ bne $v0, $zero, .L80B3CEC0 -/* 00CCC 80B3CEAC 8FA40020 */ lw $a0, 0x0020($sp) -/* 00CD0 80B3CEB0 0C0295B2 */ jal Animation_OnFrame -/* 00CD4 80B3CEB4 3C0541B8 */ lui $a1, 0x41B8 ## $a1 = 41B80000 -/* 00CD8 80B3CEB8 5040000E */ beql $v0, $zero, .L80B3CEF4 -/* 00CDC 80B3CEBC 8FBF001C */ lw $ra, 0x001C($sp) -.L80B3CEC0: -/* 00CE0 80B3CEC0 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 -/* 00CE4 80B3CEC4 8FA4003C */ lw $a0, 0x003C($sp) -/* 00CE8 80B3CEC8 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 00CEC 80B3CECC 11E00008 */ beq $t7, $zero, .L80B3CEF0 -/* 00CF0 80B3CED0 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 00CF4 80B3CED4 8E050078 */ lw $a1, 0x0078($s0) ## 00000078 -/* 00CF8 80B3CED8 0C0107CD */ jal SurfaceType_GetSfx -/* 00CFC 80B3CEDC 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D -/* 00D00 80B3CEE0 24430800 */ addiu $v1, $v0, 0x0800 ## $v1 = 00000800 -/* 00D04 80B3CEE4 3065FFFF */ andi $a1, $v1, 0xFFFF ## $a1 = 00000800 -/* 00D08 80B3CEE8 0C01E245 */ jal func_80078914 -/* 00D0C 80B3CEEC 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 -.L80B3CEF0: -/* 00D10 80B3CEF0 8FBF001C */ lw $ra, 0x001C($sp) -.L80B3CEF4: -/* 00D14 80B3CEF4 8FB00018 */ lw $s0, 0x0018($sp) -/* 00D18 80B3CEF8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00D1C 80B3CEFC 03E00008 */ jr $ra -/* 00D20 80B3CF00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CF04.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CF04.s deleted file mode 100644 index b791f7a10e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CF04.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_80B3CF04 -/* 00D24 80B3CF04 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00D28 80B3CF08 AFB00018 */ sw $s0, 0x0018($sp) -/* 00D2C 80B3CF0C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00D30 80B3CF10 AFBF001C */ sw $ra, 0x001C($sp) -/* 00D34 80B3CF14 AFA5003C */ sw $a1, 0x003C($sp) -/* 00D38 80B3CF18 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00D3C 80B3CF1C AFA40020 */ sw $a0, 0x0020($sp) -/* 00D40 80B3CF20 0C0295B2 */ jal Animation_OnFrame -/* 00D44 80B3CF24 3C0540E0 */ lui $a1, 0x40E0 ## $a1 = 40E00000 -/* 00D48 80B3CF28 5040000E */ beql $v0, $zero, .L80B3CF64 -/* 00D4C 80B3CF2C 8FA40020 */ lw $a0, 0x0020($sp) -/* 00D50 80B3CF30 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 -/* 00D54 80B3CF34 8FA4003C */ lw $a0, 0x003C($sp) -/* 00D58 80B3CF38 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 00D5C 80B3CF3C 11E00008 */ beq $t7, $zero, .L80B3CF60 -/* 00D60 80B3CF40 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 00D64 80B3CF44 8E050078 */ lw $a1, 0x0078($s0) ## 00000078 -/* 00D68 80B3CF48 0C0107CD */ jal SurfaceType_GetSfx -/* 00D6C 80B3CF4C 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D -/* 00D70 80B3CF50 24430800 */ addiu $v1, $v0, 0x0800 ## $v1 = 00000800 -/* 00D74 80B3CF54 3065FFFF */ andi $a1, $v1, 0xFFFF ## $a1 = 00000800 -/* 00D78 80B3CF58 0C01E245 */ jal func_80078914 -/* 00D7C 80B3CF5C 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 -.L80B3CF60: -/* 00D80 80B3CF60 8FA40020 */ lw $a0, 0x0020($sp) -.L80B3CF64: -/* 00D84 80B3CF64 0C0295B2 */ jal Animation_OnFrame -/* 00D88 80B3CF68 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 -/* 00D8C 80B3CF6C 10400003 */ beq $v0, $zero, .L80B3CF7C -/* 00D90 80B3CF70 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 -/* 00D94 80B3CF74 0C01E245 */ jal func_80078914 -/* 00D98 80B3CF78 24056874 */ addiu $a1, $zero, 0x6874 ## $a1 = 00006874 -.L80B3CF7C: -/* 00D9C 80B3CF7C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00DA0 80B3CF80 8FB00018 */ lw $s0, 0x0018($sp) -/* 00DA4 80B3CF84 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00DA8 80B3CF88 03E00008 */ jr $ra -/* 00DAC 80B3CF8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CF90.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CF90.s deleted file mode 100644 index c6e5887ed5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CF90.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80B3CF90 -/* 00DB0 80B3CF90 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1360) -/* 00DB4 80B3CF94 8DCEF9C0 */ lw $t6, %lo(gSaveContext+0x1360)($t6) -/* 00DB8 80B3CF98 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00DBC 80B3CF9C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00DC0 80B3CFA0 AFA40018 */ sw $a0, 0x0018($sp) -/* 00DC4 80B3CFA4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00DC8 80B3CFA8 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00DCC 80B3CFAC 15C10004 */ bne $t6, $at, .L80B3CFC0 -/* 00DD0 80B3CFB0 84A200A4 */ lh $v0, 0x00A4($a1) ## 000000A4 -/* 00DD4 80B3CFB4 2401005C */ addiu $at, $zero, 0x005C ## $at = 0000005C -/* 00DD8 80B3CFB8 50410013 */ beql $v0, $at, .L80B3D008 -/* 00DDC 80B3CFBC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B3CFC0: -/* 00DE0 80B3CFC0 8FA40018 */ lw $a0, 0x0018($sp) -/* 00DE4 80B3CFC4 3C054130 */ lui $a1, 0x4130 ## $a1 = 41300000 -/* 00DE8 80B3CFC8 AFA7001C */ sw $a3, 0x001C($sp) -/* 00DEC 80B3CFCC 0C0295B2 */ jal Animation_OnFrame -/* 00DF0 80B3CFD0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00DF4 80B3CFD4 1040000B */ beq $v0, $zero, .L80B3D004 -/* 00DF8 80B3CFD8 8FA7001C */ lw $a3, 0x001C($sp) -/* 00DFC 80B3CFDC 8FA20018 */ lw $v0, 0x0018($sp) -/* 00E00 80B3CFE0 24E407C0 */ addiu $a0, $a3, 0x07C0 ## $a0 = 000007C0 -/* 00E04 80B3CFE4 8C450078 */ lw $a1, 0x0078($v0) ## 00000078 -/* 00E08 80B3CFE8 0C0107CD */ jal SurfaceType_GetSfx -/* 00E0C 80B3CFEC 9046007D */ lbu $a2, 0x007D($v0) ## 0000007D -/* 00E10 80B3CFF0 8FA40018 */ lw $a0, 0x0018($sp) -/* 00E14 80B3CFF4 24430800 */ addiu $v1, $v0, 0x0800 ## $v1 = 00000800 -/* 00E18 80B3CFF8 3065FFFF */ andi $a1, $v1, 0xFFFF ## $a1 = 00000800 -/* 00E1C 80B3CFFC 0C01E245 */ jal func_80078914 -/* 00E20 80B3D000 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -.L80B3D004: -/* 00E24 80B3D004 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B3D008: -/* 00E28 80B3D008 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00E2C 80B3D00C 03E00008 */ jr $ra -/* 00E30 80B3D010 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D014.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D014.s deleted file mode 100644 index 6df66fed98..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D014.s +++ /dev/null @@ -1,69 +0,0 @@ -glabel func_80B3D014 -/* 00E34 80B3D014 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1360) -/* 00E38 80B3D018 8DCEF9C0 */ lw $t6, %lo(gSaveContext+0x1360)($t6) -/* 00E3C 80B3D01C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00E40 80B3D020 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00E44 80B3D024 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00E48 80B3D028 AFA40050 */ sw $a0, 0x0050($sp) -/* 00E4C 80B3D02C 15C10036 */ bne $t6, $at, .L80B3D108 -/* 00E50 80B3D030 AFA50054 */ sw $a1, 0x0054($sp) -/* 00E54 80B3D034 84A200A4 */ lh $v0, 0x00A4($a1) ## 000000A4 -/* 00E58 80B3D038 2401005C */ addiu $at, $zero, 0x005C ## $at = 0000005C -/* 00E5C 80B3D03C 54410033 */ bnel $v0, $at, .L80B3D10C -/* 00E60 80B3D040 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00E64 80B3D044 94A31D74 */ lhu $v1, 0x1D74($a1) ## 00001D74 -/* 00E68 80B3D048 24010077 */ addiu $at, $zero, 0x0077 ## $at = 00000077 -/* 00E6C 80B3D04C 3C1880B4 */ lui $t8, %hi(D_80B41D78) ## $t8 = 80B40000 -/* 00E70 80B3D050 14610016 */ bne $v1, $at, .L80B3D0AC -/* 00E74 80B3D054 27181D78 */ addiu $t8, $t8, %lo(D_80B41D78) ## $t8 = 80B41D78 -/* 00E78 80B3D058 8F080000 */ lw $t0, 0x0000($t8) ## 80B41D78 -/* 00E7C 80B3D05C 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFE0 -/* 00E80 80B3D060 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00E84 80B3D064 ACA80000 */ sw $t0, 0x0000($a1) ## FFFFFFE0 -/* 00E88 80B3D068 8F190004 */ lw $t9, 0x0004($t8) ## 80B41D7C -/* 00E8C 80B3D06C 34211D60 */ ori $at, $at, 0x1D60 ## $at = 00011D60 -/* 00E90 80B3D070 3C0680B4 */ lui $a2, %hi(D_80B42D90) ## $a2 = 80B40000 -/* 00E94 80B3D074 ACB90004 */ sw $t9, 0x0004($a1) ## FFFFFFE4 -/* 00E98 80B3D078 8F080008 */ lw $t0, 0x0008($t8) ## 80B41D80 -/* 00E9C 80B3D07C 24C62D90 */ addiu $a2, $a2, %lo(D_80B42D90) ## $a2 = 80B42D90 -/* 00EA0 80B3D080 27A7003C */ addiu $a3, $sp, 0x003C ## $a3 = FFFFFFEC -/* 00EA4 80B3D084 ACA80008 */ sw $t0, 0x0008($a1) ## FFFFFFE8 -/* 00EA8 80B3D088 8FA40054 */ lw $a0, 0x0054($sp) -/* 00EAC 80B3D08C 0C029B84 */ jal SkinMatrix_Vec3fMtxFMultXYZW -/* 00EB0 80B3D090 00812021 */ addu $a0, $a0, $at -/* 00EB4 80B3D094 3C0480B4 */ lui $a0, %hi(D_80B42D90) ## $a0 = 80B40000 -/* 00EB8 80B3D098 24842D90 */ addiu $a0, $a0, %lo(D_80B42D90) ## $a0 = 80B42D90 -/* 00EBC 80B3D09C 0C01E245 */ jal func_80078914 -/* 00EC0 80B3D0A0 240528A1 */ addiu $a1, $zero, 0x28A1 ## $a1 = 000028A1 -/* 00EC4 80B3D0A4 10000019 */ beq $zero, $zero, .L80B3D10C -/* 00EC8 80B3D0A8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B3D0AC: -/* 00ECC 80B3D0AC 240100A4 */ addiu $at, $zero, 0x00A4 ## $at = 000000A4 -/* 00ED0 80B3D0B0 14610015 */ bne $v1, $at, .L80B3D108 -/* 00ED4 80B3D0B4 3C0980B4 */ lui $t1, %hi(D_80B41D84) ## $t1 = 80B40000 -/* 00ED8 80B3D0B8 25291D84 */ addiu $t1, $t1, %lo(D_80B41D84) ## $t1 = 80B41D84 -/* 00EDC 80B3D0BC 8D2B0000 */ lw $t3, 0x0000($t1) ## 80B41D84 -/* 00EE0 80B3D0C0 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFD4 -/* 00EE4 80B3D0C4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00EE8 80B3D0C8 ACAB0000 */ sw $t3, 0x0000($a1) ## FFFFFFD4 -/* 00EEC 80B3D0CC 8D2A0004 */ lw $t2, 0x0004($t1) ## 80B41D88 -/* 00EF0 80B3D0D0 34211D60 */ ori $at, $at, 0x1D60 ## $at = 00011D60 -/* 00EF4 80B3D0D4 3C0680B4 */ lui $a2, %hi(D_80B42D90) ## $a2 = 80B40000 -/* 00EF8 80B3D0D8 ACAA0004 */ sw $t2, 0x0004($a1) ## FFFFFFD8 -/* 00EFC 80B3D0DC 8D2B0008 */ lw $t3, 0x0008($t1) ## 80B41D8C -/* 00F00 80B3D0E0 24C62D90 */ addiu $a2, $a2, %lo(D_80B42D90) ## $a2 = 80B42D90 -/* 00F04 80B3D0E4 27A7003C */ addiu $a3, $sp, 0x003C ## $a3 = FFFFFFEC -/* 00F08 80B3D0E8 ACAB0008 */ sw $t3, 0x0008($a1) ## FFFFFFDC -/* 00F0C 80B3D0EC 8FA40054 */ lw $a0, 0x0054($sp) -/* 00F10 80B3D0F0 0C029B84 */ jal SkinMatrix_Vec3fMtxFMultXYZW -/* 00F14 80B3D0F4 00812021 */ addu $a0, $a0, $at -/* 00F18 80B3D0F8 3C0480B4 */ lui $a0, %hi(D_80B42D90) ## $a0 = 80B40000 -/* 00F1C 80B3D0FC 24842D90 */ addiu $a0, $a0, %lo(D_80B42D90) ## $a0 = 80B42D90 -/* 00F20 80B3D100 0C01E245 */ jal func_80078914 -/* 00F24 80B3D104 24050802 */ addiu $a1, $zero, 0x0802 ## $a1 = 00000802 -.L80B3D108: -/* 00F28 80B3D108 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B3D10C: -/* 00F2C 80B3D10C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00F30 80B3D110 03E00008 */ jr $ra -/* 00F34 80B3D114 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D118.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D118.s deleted file mode 100644 index 1df1d27364..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D118.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B3D118 -/* 00F38 80B3D118 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1360) -/* 00F3C 80B3D11C 8DCEF9C0 */ lw $t6, %lo(gSaveContext+0x1360)($t6) -/* 00F40 80B3D120 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00F44 80B3D124 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00F48 80B3D128 15C10005 */ bne $t6, $at, .L80B3D140 -/* 00F4C 80B3D12C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00F50 80B3D130 848200A4 */ lh $v0, 0x00A4($a0) ## 000000A4 -/* 00F54 80B3D134 2401005C */ addiu $at, $zero, 0x005C ## $at = 0000005C -/* 00F58 80B3D138 50410004 */ beql $v0, $at, .L80B3D14C -/* 00F5C 80B3D13C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B3D140: -/* 00F60 80B3D140 0C01E233 */ jal func_800788CC -/* 00F64 80B3D144 2404083D */ addiu $a0, $zero, 0x083D ## $a0 = 0000083D -/* 00F68 80B3D148 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B3D14C: -/* 00F6C 80B3D14C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00F70 80B3D150 03E00008 */ jr $ra -/* 00F74 80B3D154 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D158.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D158.s deleted file mode 100644 index 40594e9a7a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D158.s +++ /dev/null @@ -1,102 +0,0 @@ -.rdata -glabel D_80B42000 - .asciz "MAX speed = %f\n" - .balign 4 - -.late_rodata -glabel D_80B42204 - .word 0x40E1E2B0 -glabel D_80B42208 - .float 0.4 - -glabel D_80B4220C - .float 0.6 - -.text -glabel func_80B3D158 -/* 00F78 80B3D158 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1360) -/* 00F7C 80B3D15C 8DCEF9C0 */ lw $t6, %lo(gSaveContext+0x1360)($t6) -/* 00F80 80B3D160 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00F84 80B3D164 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00F88 80B3D168 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00F8C 80B3D16C 15C10046 */ bne $t6, $at, .L80B3D288 -/* 00F90 80B3D170 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00F94 80B3D174 848200A4 */ lh $v0, 0x00A4($a0) ## 000000A4 -/* 00F98 80B3D178 2401005C */ addiu $at, $zero, 0x005C ## $at = 0000005C -/* 00F9C 80B3D17C 54410043 */ bnel $v0, $at, .L80B3D28C -/* 00FA0 80B3D180 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00FA4 80B3D184 94821D74 */ lhu $v0, 0x1D74($a0) ## 00001D74 -/* 00FA8 80B3D188 28410078 */ slti $at, $v0, 0x0078 -/* 00FAC 80B3D18C 1420003E */ bne $at, $zero, .L80B3D288 -/* 00FB0 80B3D190 284100A4 */ slti $at, $v0, 0x00A4 -/* 00FB4 80B3D194 1020003C */ beq $at, $zero, .L80B3D288 -/* 00FB8 80B3D198 3C0F80B4 */ lui $t7, %hi(D_80B41D90) ## $t7 = 80B40000 -/* 00FBC 80B3D19C 8DEF1D90 */ lw $t7, %lo(D_80B41D90)($t7) -/* 00FC0 80B3D1A0 3C0480B4 */ lui $a0, %hi(D_80B42DB0) ## $a0 = 80B40000 -/* 00FC4 80B3D1A4 24842DB0 */ addiu $a0, $a0, %lo(D_80B42DB0) ## $a0 = 80B42DB0 -/* 00FC8 80B3D1A8 11E0002B */ beq $t7, $zero, .L80B3D258 -/* 00FCC 80B3D1AC 24C500E0 */ addiu $a1, $a2, 0x00E0 ## $a1 = 000000E0 -/* 00FD0 80B3D1B0 0C032D9E */ jal Math3D_Vec3f_DistXYZ -/* 00FD4 80B3D1B4 AFA60038 */ sw $a2, 0x0038($sp) -/* 00FD8 80B3D1B8 3C0180B4 */ lui $at, %hi(D_80B41DA0) ## $at = 80B40000 -/* 00FDC 80B3D1BC C42E1DA0 */ lwc1 $f14, %lo(D_80B41DA0)($at) -/* 00FE0 80B3D1C0 3C0180B4 */ lui $at, %hi(D_80B42204) ## $at = 80B40000 -/* 00FE4 80B3D1C4 C4242204 */ lwc1 $f4, %lo(D_80B42204)($at) -/* 00FE8 80B3D1C8 3C0480B4 */ lui $a0, %hi(D_80B42000) ## $a0 = 80B40000 -/* 00FEC 80B3D1CC 24842000 */ addiu $a0, $a0, %lo(D_80B42000) ## $a0 = 80B42000 -/* 00FF0 80B3D1D0 46040083 */ div.s $f2, $f0, $f4 -/* 00FF4 80B3D1D4 3C0180B4 */ lui $at, %hi(D_80B41DA0) ## $at = 80B40000 -/* 00FF8 80B3D1D8 4602703C */ c.lt.s $f14, $f2 -/* 00FFC 80B3D1DC 46001306 */ mov.s $f12, $f2 -/* 01000 80B3D1E0 45020003 */ bc1fl .L80B3D1F0 -/* 01004 80B3D1E4 460071A1 */ cvt.d.s $f6, $f14 -/* 01008 80B3D1E8 46001386 */ mov.s $f14, $f2 -/* 0100C 80B3D1EC 460071A1 */ cvt.d.s $f6, $f14 -.L80B3D1F0: -/* 01010 80B3D1F0 E7AC001C */ swc1 $f12, 0x001C($sp) -/* 01014 80B3D1F4 44073000 */ mfc1 $a3, $f6 -/* 01018 80B3D1F8 44063800 */ mfc1 $a2, $f7 -/* 0101C 80B3D1FC 0C00084C */ jal osSyncPrintf - -/* 01020 80B3D200 E42E1DA0 */ swc1 $f14, %lo(D_80B41DA0)($at) -/* 01024 80B3D204 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 01028 80B3D208 44810000 */ mtc1 $at, $f0 ## $f0 = 2.00 -/* 0102C 80B3D20C C7AC001C */ lwc1 $f12, 0x001C($sp) -/* 01030 80B3D210 3C0180B4 */ lui $at, %hi(D_80B42208) ## $at = 80B40000 -/* 01034 80B3D214 460C003C */ c.lt.s $f0, $f12 -/* 01038 80B3D218 00000000 */ nop -/* 0103C 80B3D21C 45000002 */ bc1f .L80B3D228 -/* 01040 80B3D220 00000000 */ nop -/* 01044 80B3D224 46000306 */ mov.s $f12, $f0 -.L80B3D228: -/* 01048 80B3D228 C4282208 */ lwc1 $f8, %lo(D_80B42208)($at) -/* 0104C 80B3D22C 3C0180B4 */ lui $at, %hi(D_80B4220C) ## $at = 80B40000 -/* 01050 80B3D230 C430220C */ lwc1 $f16, %lo(D_80B4220C)($at) -/* 01054 80B3D234 460C4282 */ mul.s $f10, $f8, $f12 -/* 01058 80B3D238 3C0480B4 */ lui $a0, %hi(D_80B41D94) ## $a0 = 80B40000 -/* 0105C 80B3D23C 24841D94 */ addiu $a0, $a0, %lo(D_80B41D94) ## $a0 = 80B41D94 -/* 01060 80B3D240 240520BD */ addiu $a1, $zero, 0x20BD ## $a1 = 000020BD -/* 01064 80B3D244 46105480 */ add.s $f18, $f10, $f16 -/* 01068 80B3D248 44069000 */ mfc1 $a2, $f18 -/* 0106C 80B3D24C 0C03D0DB */ jal func_800F436C -/* 01070 80B3D250 00000000 */ nop -/* 01074 80B3D254 8FA60038 */ lw $a2, 0x0038($sp) -.L80B3D258: -/* 01078 80B3D258 24C200E0 */ addiu $v0, $a2, 0x00E0 ## $v0 = 000000E0 -/* 0107C 80B3D25C C4440000 */ lwc1 $f4, 0x0000($v0) ## 000000E0 -/* 01080 80B3D260 3C0180B4 */ lui $at, %hi(D_80B42DB0) ## $at = 80B40000 -/* 01084 80B3D264 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 01088 80B3D268 E4242DB0 */ swc1 $f4, %lo(D_80B42DB0)($at) -/* 0108C 80B3D26C C4460004 */ lwc1 $f6, 0x0004($v0) ## 000000E4 -/* 01090 80B3D270 E4262DB4 */ swc1 $f6, %lo(D_80B42DB4)($at) -/* 01094 80B3D274 C4480008 */ lwc1 $f8, 0x0008($v0) ## 000000E8 -/* 01098 80B3D278 3C0180B4 */ lui $at, %hi(D_80B42DB8) ## $at = 80B40000 -/* 0109C 80B3D27C E4282DB8 */ swc1 $f8, %lo(D_80B42DB8)($at) -/* 010A0 80B3D280 3C0180B4 */ lui $at, %hi(D_80B41D90) ## $at = 80B40000 -/* 010A4 80B3D284 AC381D90 */ sw $t8, %lo(D_80B41D90)($at) -.L80B3D288: -/* 010A8 80B3D288 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B3D28C: -/* 010AC 80B3D28C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 010B0 80B3D290 03E00008 */ jr $ra -/* 010B4 80B3D294 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D298.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D298.s deleted file mode 100644 index f11bd6bcb8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D298.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80B3D298 -/* 010B8 80B3D298 3C0E80B4 */ lui $t6, %hi(D_80B41DA4) ## $t6 = 80B40000 -/* 010BC 80B3D29C 8DCE1DA4 */ lw $t6, %lo(D_80B41DA4)($t6) -/* 010C0 80B3D2A0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 010C4 80B3D2A4 AFBF002C */ sw $ra, 0x002C($sp) -/* 010C8 80B3D2A8 AFA40030 */ sw $a0, 0x0030($sp) -/* 010CC 80B3D2AC 15C0001E */ bne $t6, $zero, .L80B3D328 -/* 010D0 80B3D2B0 AFA50034 */ sw $a1, 0x0034($sp) -/* 010D4 80B3D2B4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 010D8 80B3D2B8 0C2CF134 */ jal func_80B3C4D0 -/* 010DC 80B3D2BC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 010E0 80B3D2C0 8C4F000C */ lw $t7, 0x000C($v0) ## 0000000C -/* 010E4 80B3D2C4 8C580010 */ lw $t8, 0x0010($v0) ## 00000010 -/* 010E8 80B3D2C8 8C590014 */ lw $t9, 0x0014($v0) ## 00000014 -/* 010EC 80B3D2CC 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 010F0 80B3D2D0 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 -/* 010F4 80B3D2D4 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 -/* 010F8 80B3D2D8 46802020 */ cvt.s.w $f0, $f4 -/* 010FC 80B3D2DC 8FA50034 */ lw $a1, 0x0034($sp) -/* 01100 80B3D2E0 24080005 */ addiu $t0, $zero, 0x0005 ## $t0 = 00000005 -/* 01104 80B3D2E4 AFA80024 */ sw $t0, 0x0024($sp) -/* 01108 80B3D2E8 AFA00020 */ sw $zero, 0x0020($sp) -/* 0110C 80B3D2EC 468030A0 */ cvt.s.w $f2, $f6 -/* 01110 80B3D2F0 44070000 */ mfc1 $a3, $f0 -/* 01114 80B3D2F4 AFA0001C */ sw $zero, 0x001C($sp) -/* 01118 80B3D2F8 AFA00018 */ sw $zero, 0x0018($sp) -/* 0111C 80B3D2FC 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 01120 80B3D300 46804320 */ cvt.s.w $f12, $f8 -/* 01124 80B3D304 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 01128 80B3D308 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 0112C 80B3D30C 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 01130 80B3D310 E7AC0014 */ swc1 $f12, 0x0014($sp) -/* 01134 80B3D314 8FA90030 */ lw $t1, 0x0030($sp) -/* 01138 80B3D318 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 0113C 80B3D31C 3C0180B4 */ lui $at, %hi(D_80B41DA4) ## $at = 80B40000 -/* 01140 80B3D320 AD220310 */ sw $v0, 0x0310($t1) ## 00000310 -/* 01144 80B3D324 AC2A1DA4 */ sw $t2, %lo(D_80B41DA4)($at) -.L80B3D328: -/* 01148 80B3D328 8FBF002C */ lw $ra, 0x002C($sp) -/* 0114C 80B3D32C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01150 80B3D330 03E00008 */ jr $ra -/* 01154 80B3D334 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D338.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D338.s deleted file mode 100644 index 5b90f7fd1a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D338.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80B3D338 -/* 01158 80B3D338 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0115C 80B3D33C AFA40018 */ sw $a0, 0x0018($sp) -/* 01160 80B3D340 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01164 80B3D344 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01168 80B3D348 0C2CF134 */ jal func_80B3C4D0 -/* 0116C 80B3D34C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01170 80B3D350 8FA50018 */ lw $a1, 0x0018($sp) -/* 01174 80B3D354 8CA40310 */ lw $a0, 0x0310($a1) ## 00000310 -/* 01178 80B3D358 50800012 */ beql $a0, $zero, .L80B3D3A4 -/* 0117C 80B3D35C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01180 80B3D360 8C4E000C */ lw $t6, 0x000C($v0) ## 0000000C -/* 01184 80B3D364 24830024 */ addiu $v1, $a0, 0x0024 ## $v1 = 00000024 -/* 01188 80B3D368 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 0118C 80B3D36C 00000000 */ nop -/* 01190 80B3D370 468021A0 */ cvt.s.w $f6, $f4 -/* 01194 80B3D374 E4660000 */ swc1 $f6, 0x0000($v1) ## 00000024 -/* 01198 80B3D378 8C4F0010 */ lw $t7, 0x0010($v0) ## 00000010 -/* 0119C 80B3D37C 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 011A0 80B3D380 00000000 */ nop -/* 011A4 80B3D384 468042A0 */ cvt.s.w $f10, $f8 -/* 011A8 80B3D388 E46A0004 */ swc1 $f10, 0x0004($v1) ## 00000028 -/* 011AC 80B3D38C 8C580014 */ lw $t8, 0x0014($v0) ## 00000014 -/* 011B0 80B3D390 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 011B4 80B3D394 00000000 */ nop -/* 011B8 80B3D398 468084A0 */ cvt.s.w $f18, $f16 -/* 011BC 80B3D39C E4720008 */ swc1 $f18, 0x0008($v1) ## 0000002C -/* 011C0 80B3D3A0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B3D3A4: -/* 011C4 80B3D3A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 011C8 80B3D3A8 03E00008 */ jr $ra -/* 011CC 80B3D3AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D3B0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D3B0.s deleted file mode 100644 index f84bde8d5e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D3B0.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B3D3B0 -/* 011D0 80B3D3B0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 011D4 80B3D3B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 011D8 80B3D3B8 8C860310 */ lw $a2, 0x0310($a0) ## 00000310 -/* 011DC 80B3D3BC 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 011E0 80B3D3C0 10C00005 */ beq $a2, $zero, .L80B3D3D8 -/* 011E4 80B3D3C4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 011E8 80B3D3C8 0C00B55C */ jal Actor_Kill - -/* 011EC 80B3D3CC AFA50018 */ sw $a1, 0x0018($sp) -/* 011F0 80B3D3D0 8FA50018 */ lw $a1, 0x0018($sp) -/* 011F4 80B3D3D4 ACA00310 */ sw $zero, 0x0310($a1) ## 00000310 -.L80B3D3D8: -/* 011F8 80B3D3D8 0C00B55C */ jal Actor_Kill - -/* 011FC 80B3D3DC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01200 80B3D3E0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01204 80B3D3E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01208 80B3D3E8 03E00008 */ jr $ra -/* 0120C 80B3D3EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D3F0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D3F0.s deleted file mode 100644 index 0380b76a32..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D3F0.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80B3D3F0 -/* 01210 80B3D3F0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01214 80B3D3F4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01218 80B3D3F8 AFA40028 */ sw $a0, 0x0028($sp) -/* 0121C 80B3D3FC 84A200A4 */ lh $v0, 0x00A4($a1) ## 000000A4 -/* 01220 80B3D400 24010061 */ addiu $at, $zero, 0x0061 ## $at = 00000061 -/* 01224 80B3D404 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 01228 80B3D408 1441001C */ bne $v0, $at, .L80B3D47C -/* 0122C 80B3D40C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01230 80B3D410 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01234 80B3D414 0C2CF134 */ jal func_80B3C4D0 -/* 01238 80B3D418 AFA6002C */ sw $a2, 0x002C($sp) -/* 0123C 80B3D41C 10400017 */ beq $v0, $zero, .L80B3D47C -/* 01240 80B3D420 3C0E80B4 */ lui $t6, %hi(D_80B41DA8) ## $t6 = 80B40000 -/* 01244 80B3D424 94430000 */ lhu $v1, 0x0000($v0) ## 00000000 -/* 01248 80B3D428 8DCE1DA8 */ lw $t6, %lo(D_80B41DA8)($t6) -/* 0124C 80B3D42C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01250 80B3D430 51C30010 */ beql $t6, $v1, .L80B3D474 -/* 01254 80B3D434 8FA40028 */ lw $a0, 0x0028($sp) -/* 01258 80B3D438 10610005 */ beq $v1, $at, .L80B3D450 -/* 0125C 80B3D43C 8FA40028 */ lw $a0, 0x0028($sp) -/* 01260 80B3D440 8FA5002C */ lw $a1, 0x002C($sp) -/* 01264 80B3D444 0C2CF4A6 */ jal func_80B3D298 -/* 01268 80B3D448 AFA30018 */ sw $v1, 0x0018($sp) -/* 0126C 80B3D44C 8FA30018 */ lw $v1, 0x0018($sp) -.L80B3D450: -/* 01270 80B3D450 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01274 80B3D454 14610004 */ bne $v1, $at, .L80B3D468 -/* 01278 80B3D458 8FA40028 */ lw $a0, 0x0028($sp) -/* 0127C 80B3D45C 0C2CF4EC */ jal func_80B3D3B0 -/* 01280 80B3D460 AFA30018 */ sw $v1, 0x0018($sp) -/* 01284 80B3D464 8FA30018 */ lw $v1, 0x0018($sp) -.L80B3D468: -/* 01288 80B3D468 3C0180B4 */ lui $at, %hi(D_80B41DA8) ## $at = 80B40000 -/* 0128C 80B3D46C AC231DA8 */ sw $v1, %lo(D_80B41DA8)($at) -/* 01290 80B3D470 8FA40028 */ lw $a0, 0x0028($sp) -.L80B3D474: -/* 01294 80B3D474 0C2CF4CE */ jal func_80B3D338 -/* 01298 80B3D478 8FA5002C */ lw $a1, 0x002C($sp) -.L80B3D47C: -/* 0129C 80B3D47C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 012A0 80B3D480 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 012A4 80B3D484 03E00008 */ jr $ra -/* 012A8 80B3D488 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D48C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D48C.s deleted file mode 100644 index 0ffb5e2e45..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D48C.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B3D48C -/* 012AC 80B3D48C 8CA21D88 */ lw $v0, 0x1D88($a1) ## 00001D88 -/* 012B0 80B3D490 50400008 */ beql $v0, $zero, .L80B3D4B4 -/* 012B4 80B3D494 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 012B8 80B3D498 94430008 */ lhu $v1, 0x0008($v0) ## 00000008 -/* 012BC 80B3D49C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 012C0 80B3D4A0 00611821 */ addu $v1, $v1, $at -/* 012C4 80B3D4A4 00031C00 */ sll $v1, $v1, 16 -/* 012C8 80B3D4A8 10000007 */ beq $zero, $zero, .L80B3D4C8 -/* 012CC 80B3D4AC 00031C03 */ sra $v1, $v1, 16 -/* 012D0 80B3D4B0 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -.L80B3D4B4: -/* 012D4 80B3D4B4 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 012D8 80B3D4B8 84430032 */ lh $v1, 0x0032($v0) ## 00000032 -/* 012DC 80B3D4BC 00611821 */ addu $v1, $v1, $at -/* 012E0 80B3D4C0 00031C00 */ sll $v1, $v1, 16 -/* 012E4 80B3D4C4 00031C03 */ sra $v1, $v1, 16 -.L80B3D4C8: -/* 012E8 80B3D4C8 A4830032 */ sh $v1, 0x0032($a0) ## 00000032 -/* 012EC 80B3D4CC 848E0032 */ lh $t6, 0x0032($a0) ## 00000032 -/* 012F0 80B3D4D0 03E00008 */ jr $ra -/* 012F4 80B3D4D4 A48E00B6 */ sh $t6, 0x00B6($a0) ## 000000B6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D4D8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D4D8.s deleted file mode 100644 index f238666554..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D4D8.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80B3D4D8 -/* 012F8 80B3D4D8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 012FC 80B3D4DC 3C060601 */ lui $a2, %hi(D_060177F8) ## $a2 = 06010000 -/* 01300 80B3D4E0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01304 80B3D4E4 24C677F8 */ addiu $a2, $a2, %lo(D_060177F8) ## $a2 = 060177F8 -/* 01308 80B3D4E8 0C2CF134 */ jal func_80B3C4D0 -/* 0130C 80B3D4EC AFA6001C */ sw $a2, 0x001C($sp) -/* 01310 80B3D4F0 10400019 */ beq $v0, $zero, .L80B3D558 -/* 01314 80B3D4F4 8FA6001C */ lw $a2, 0x001C($sp) -/* 01318 80B3D4F8 94430000 */ lhu $v1, 0x0000($v0) ## 00000000 -/* 0131C 80B3D4FC 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 01320 80B3D500 54610005 */ bnel $v1, $at, .L80B3D518 -/* 01324 80B3D504 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 01328 80B3D508 3C060600 */ lui $a2, %hi(D_060035C8) ## $a2 = 06000000 -/* 0132C 80B3D50C 10000012 */ beq $zero, $zero, .L80B3D558 -/* 01330 80B3D510 24C635C8 */ addiu $a2, $a2, %lo(D_060035C8) ## $a2 = 060035C8 -/* 01334 80B3D514 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -.L80B3D518: -/* 01338 80B3D518 54610005 */ bnel $v1, $at, .L80B3D530 -/* 0133C 80B3D51C 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 01340 80B3D520 3C060600 */ lui $a2, %hi(D_0600289C) ## $a2 = 06000000 -/* 01344 80B3D524 1000000C */ beq $zero, $zero, .L80B3D558 -/* 01348 80B3D528 24C6289C */ addiu $a2, $a2, %lo(D_0600289C) ## $a2 = 0600289C -/* 0134C 80B3D52C 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -.L80B3D530: -/* 01350 80B3D530 54610005 */ bnel $v1, $at, .L80B3D548 -/* 01354 80B3D534 24010017 */ addiu $at, $zero, 0x0017 ## $at = 00000017 -/* 01358 80B3D538 3C060600 */ lui $a2, %hi(D_06004570) ## $a2 = 06000000 -/* 0135C 80B3D53C 10000006 */ beq $zero, $zero, .L80B3D558 -/* 01360 80B3D540 24C64570 */ addiu $a2, $a2, %lo(D_06004570) ## $a2 = 06004570 -/* 01364 80B3D544 24010017 */ addiu $at, $zero, 0x0017 ## $at = 00000017 -.L80B3D548: -/* 01368 80B3D548 54610004 */ bnel $v1, $at, .L80B3D55C -/* 0136C 80B3D54C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01370 80B3D550 3C060600 */ lui $a2, %hi(D_06000B6C) ## $a2 = 06000000 -/* 01374 80B3D554 24C60B6C */ addiu $a2, $a2, %lo(D_06000B6C) ## $a2 = 06000B6C -.L80B3D558: -/* 01378 80B3D558 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B3D55C: -/* 0137C 80B3D55C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01380 80B3D560 00C01025 */ or $v0, $a2, $zero ## $v0 = 06000B6C -/* 01384 80B3D564 03E00008 */ jr $ra -/* 01388 80B3D568 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D56C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D56C.s deleted file mode 100644 index 614c8198bb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D56C.s +++ /dev/null @@ -1,73 +0,0 @@ -.late_rodata -glabel D_80B42210 - .float 0.01 - -glabel D_80B42214 - .float 1.2 - -glabel D_80B42218 - .float 0.01 - -glabel D_80B4221C - .float 1.2 - -.text -glabel func_80B3D56C -/* 0138C 80B3D56C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01390 80B3D570 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01394 80B3D574 3C014110 */ lui $at, 0x4110 ## $at = 41100000 -/* 01398 80B3D578 44811000 */ mtc1 $at, $f2 ## $f2 = 9.00 -/* 0139C 80B3D57C C4800268 */ lwc1 $f0, 0x0268($a0) ## 00000268 -/* 013A0 80B3D580 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 013A4 80B3D584 4602003C */ c.lt.s $f0, $f2 -/* 013A8 80B3D588 00000000 */ nop -/* 013AC 80B3D58C 45020005 */ bc1fl .L80B3D5A4 -/* 013B0 80B3D590 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 -/* 013B4 80B3D594 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 013B8 80B3D598 10000024 */ beq $zero, $zero, .L80B3D62C -/* 013BC 80B3D59C E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 013C0 80B3D5A0 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 -.L80B3D5A4: -/* 013C4 80B3D5A4 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 013C8 80B3D5A8 3C188016 */ lui $t8, %hi(gGameInfo) -/* 013CC 80B3D5AC 460C003C */ c.lt.s $f0, $f12 -/* 013D0 80B3D5B0 00000000 */ nop -/* 013D4 80B3D5B4 45000011 */ bc1f .L80B3D5FC -/* 013D8 80B3D5B8 00000000 */ nop -/* 013DC 80B3D5BC 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 013E0 80B3D5C0 3C0180B4 */ lui $at, %hi(D_80B42210) ## $at = 80B40000 -/* 013E4 80B3D5C4 C42A2210 */ lwc1 $f10, %lo(D_80B42210)($at) -/* 013E8 80B3D5C8 85CF1458 */ lh $t7, 0x1458($t6) ## 80161458 -/* 013EC 80B3D5CC 3C0180B4 */ lui $at, %hi(D_80B42214) ## $at = 80B40000 -/* 013F0 80B3D5D0 C4322214 */ lwc1 $f18, %lo(D_80B42214)($at) -/* 013F4 80B3D5D4 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 013F8 80B3D5D8 00000000 */ nop -/* 013FC 80B3D5DC 46803220 */ cvt.s.w $f8, $f6 -/* 01400 80B3D5E0 460A4402 */ mul.s $f16, $f8, $f10 -/* 01404 80B3D5E4 46020201 */ sub.s $f8, $f0, $f2 -/* 01408 80B3D5E8 46128100 */ add.s $f4, $f16, $f18 -/* 0140C 80B3D5EC 460C2183 */ div.s $f6, $f4, $f12 -/* 01410 80B3D5F0 46083282 */ mul.s $f10, $f6, $f8 -/* 01414 80B3D5F4 1000000D */ beq $zero, $zero, .L80B3D62C -/* 01418 80B3D5F8 E48A0068 */ swc1 $f10, 0x0068($a0) ## 00000068 -.L80B3D5FC: -/* 0141C 80B3D5FC 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) -/* 01420 80B3D600 3C0180B4 */ lui $at, %hi(D_80B42218) ## $at = 80B40000 -/* 01424 80B3D604 C4242218 */ lwc1 $f4, %lo(D_80B42218)($at) -/* 01428 80B3D608 87191458 */ lh $t9, 0x1458($t8) ## 80161458 -/* 0142C 80B3D60C 3C0180B4 */ lui $at, %hi(D_80B4221C) ## $at = 80B40000 -/* 01430 80B3D610 C428221C */ lwc1 $f8, %lo(D_80B4221C)($at) -/* 01434 80B3D614 44998000 */ mtc1 $t9, $f16 ## $f16 = 0.00 -/* 01438 80B3D618 00000000 */ nop -/* 0143C 80B3D61C 468084A0 */ cvt.s.w $f18, $f16 -/* 01440 80B3D620 46049182 */ mul.s $f6, $f18, $f4 -/* 01444 80B3D624 46083280 */ add.s $f10, $f6, $f8 -/* 01448 80B3D628 E48A0068 */ swc1 $f10, 0x0068($a0) ## 00000068 -.L80B3D62C: -/* 0144C 80B3D62C 0C00B638 */ jal Actor_MoveForward - -/* 01450 80B3D630 00000000 */ nop -/* 01454 80B3D634 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01458 80B3D638 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0145C 80B3D63C 03E00008 */ jr $ra -/* 01460 80B3D640 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D644.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D644.s deleted file mode 100644 index cf95993896..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D644.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B3D644 -/* 01464 80B3D644 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01468 80B3D648 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0146C 80B3D64C 0C00B638 */ jal Actor_MoveForward - -/* 01470 80B3D650 00000000 */ nop -/* 01474 80B3D654 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01478 80B3D658 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0147C 80B3D65C 03E00008 */ jr $ra -/* 01480 80B3D660 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D664.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D664.s deleted file mode 100644 index 2fdac86519..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D664.s +++ /dev/null @@ -1,47 +0,0 @@ -.late_rodata -glabel D_80B42220 - .float 0.01 - -glabel D_80B42224 - .float 1.2 - -.text -glabel func_80B3D664 -/* 01484 80B3D664 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01488 80B3D668 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0148C 80B3D66C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 01490 80B3D670 44811000 */ mtc1 $at, $f2 ## $f2 = 3.00 -/* 01494 80B3D674 C4800268 */ lwc1 $f0, 0x0268($a0) ## 00000268 -/* 01498 80B3D678 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 0149C 80B3D67C 4602003C */ c.lt.s $f0, $f2 -/* 014A0 80B3D680 00000000 */ nop -/* 014A4 80B3D684 45020012 */ bc1fl .L80B3D6D0 -/* 014A8 80B3D688 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 014AC 80B3D68C 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 014B0 80B3D690 3C0180B4 */ lui $at, %hi(D_80B42220) ## $at = 80B40000 -/* 014B4 80B3D694 C4282220 */ lwc1 $f8, %lo(D_80B42220)($at) -/* 014B8 80B3D698 85CF1458 */ lh $t7, 0x1458($t6) ## 80161458 -/* 014BC 80B3D69C 3C0180B4 */ lui $at, %hi(D_80B42224) ## $at = 80B40000 -/* 014C0 80B3D6A0 C4302224 */ lwc1 $f16, %lo(D_80B42224)($at) -/* 014C4 80B3D6A4 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 014C8 80B3D6A8 00000000 */ nop -/* 014CC 80B3D6AC 468021A0 */ cvt.s.w $f6, $f4 -/* 014D0 80B3D6B0 46083282 */ mul.s $f10, $f6, $f8 -/* 014D4 80B3D6B4 46001181 */ sub.s $f6, $f2, $f0 -/* 014D8 80B3D6B8 46105480 */ add.s $f18, $f10, $f16 -/* 014DC 80B3D6BC 46029103 */ div.s $f4, $f18, $f2 -/* 014E0 80B3D6C0 46062202 */ mul.s $f8, $f4, $f6 -/* 014E4 80B3D6C4 10000004 */ beq $zero, $zero, .L80B3D6D8 -/* 014E8 80B3D6C8 E4880068 */ swc1 $f8, 0x0068($a0) ## 00000068 -/* 014EC 80B3D6CC 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -.L80B3D6D0: -/* 014F0 80B3D6D0 00000000 */ nop -/* 014F4 80B3D6D4 E48A0068 */ swc1 $f10, 0x0068($a0) ## 00000068 -.L80B3D6D8: -/* 014F8 80B3D6D8 0C00B638 */ jal Actor_MoveForward - -/* 014FC 80B3D6DC 00000000 */ nop -/* 01500 80B3D6E0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01504 80B3D6E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01508 80B3D6E8 03E00008 */ jr $ra -/* 0150C 80B3D6EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D6F0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D6F0.s deleted file mode 100644 index 1dde2054e0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D6F0.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80B3D6F0 -/* 01510 80B3D6F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01514 80B3D6F4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01518 80B3D6F8 0C2CF55B */ jal func_80B3D56C -/* 0151C 80B3D6FC 00000000 */ nop -/* 01520 80B3D700 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01524 80B3D704 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01528 80B3D708 03E00008 */ jr $ra -/* 0152C 80B3D70C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D710.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D710.s deleted file mode 100644 index 2c427b44c6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D710.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B3D710 -/* 01530 80B3D710 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01534 80B3D714 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01538 80B3D718 0C00B638 */ jal Actor_MoveForward - -/* 0153C 80B3D71C 00000000 */ nop -/* 01540 80B3D720 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01544 80B3D724 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01548 80B3D728 03E00008 */ jr $ra -/* 0154C 80B3D72C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D730.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D730.s deleted file mode 100644 index 6eda42ddab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D730.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80B3D730 -/* 01550 80B3D730 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01554 80B3D734 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01558 80B3D738 0C2CF599 */ jal func_80B3D664 -/* 0155C 80B3D73C 00000000 */ nop -/* 01560 80B3D740 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01564 80B3D744 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01568 80B3D748 03E00008 */ jr $ra -/* 0156C 80B3D74C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D750.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D750.s deleted file mode 100644 index 69147ed77f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D750.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B3D750 -/* 01570 80B3D750 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01574 80B3D754 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01578 80B3D758 AFA40018 */ sw $a0, 0x0018($sp) -/* 0157C 80B3D75C 0C2CF2A1 */ jal func_80B3CA84 -/* 01580 80B3D760 AFA5001C */ sw $a1, 0x001C($sp) -/* 01584 80B3D764 10400007 */ beq $v0, $zero, .L80B3D784 -/* 01588 80B3D768 8FA40018 */ lw $a0, 0x0018($sp) -/* 0158C 80B3D76C 0C2CF2E9 */ jal func_80B3CBA4 -/* 01590 80B3D770 8FA5001C */ lw $a1, 0x001C($sp) -/* 01594 80B3D774 10400003 */ beq $v0, $zero, .L80B3D784 -/* 01598 80B3D778 8FAF0018 */ lw $t7, 0x0018($sp) -/* 0159C 80B3D77C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 015A0 80B3D780 ADEE0260 */ sw $t6, 0x0260($t7) ## 00000260 -.L80B3D784: -/* 015A4 80B3D784 8FBF0014 */ lw $ra, 0x0014($sp) -/* 015A8 80B3D788 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 015AC 80B3D78C 03E00008 */ jr $ra -/* 015B0 80B3D790 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D794.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D794.s deleted file mode 100644 index 341e347bf6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D794.s +++ /dev/null @@ -1,73 +0,0 @@ -glabel func_80B3D794 -/* 015B4 80B3D794 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 015B8 80B3D798 AFBF002C */ sw $ra, 0x002C($sp) -/* 015BC 80B3D79C AFB10028 */ sw $s1, 0x0028($sp) -/* 015C0 80B3D7A0 AFB00024 */ sw $s0, 0x0024($sp) -/* 015C4 80B3D7A4 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 015C8 80B3D7A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 015CC 80B3D7AC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 015D0 80B3D7B0 51C00038 */ beql $t6, $zero, .L80B3D894 -/* 015D4 80B3D7B4 8FBF002C */ lw $ra, 0x002C($sp) -/* 015D8 80B3D7B8 8CA61D9C */ lw $a2, 0x1D9C($a1) ## 00001D9C -/* 015DC 80B3D7BC 50C00035 */ beql $a2, $zero, .L80B3D894 -/* 015E0 80B3D7C0 8FBF002C */ lw $ra, 0x002C($sp) -/* 015E4 80B3D7C4 94CF0000 */ lhu $t7, 0x0000($a2) ## 00000000 -/* 015E8 80B3D7C8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 015EC 80B3D7CC 3C040602 */ lui $a0, %hi(D_0601C0E8) ## $a0 = 06020000 -/* 015F0 80B3D7D0 15E1002F */ bne $t7, $at, .L80B3D890 -/* 015F4 80B3D7D4 2484C0E8 */ addiu $a0, $a0, %lo(D_0601C0E8) ## $a0 = 0601C0E8 -/* 015F8 80B3D7D8 0C028800 */ jal Animation_GetLastFrame - -/* 015FC 80B3D7DC AFA60044 */ sw $a2, 0x0044($sp) -/* 01600 80B3D7E0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01604 80B3D7E4 8FA60044 */ lw $a2, 0x0044($sp) -/* 01608 80B3D7E8 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 0160C 80B3D7EC 468021A0 */ cvt.s.w $f6, $f4 -/* 01610 80B3D7F0 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 01614 80B3D7F4 26030024 */ addiu $v1, $s0, 0x0024 ## $v1 = 00000024 -/* 01618 80B3D7F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0161C 80B3D7FC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01620 80B3D800 E7A60034 */ swc1 $f6, 0x0034($sp) -/* 01624 80B3D804 AE180260 */ sw $t8, 0x0260($s0) ## 00000260 -/* 01628 80B3D808 AE190264 */ sw $t9, 0x0264($s0) ## 00000264 -/* 0162C 80B3D80C 8CC8000C */ lw $t0, 0x000C($a2) ## 0000000C -/* 01630 80B3D810 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 -/* 01634 80B3D814 00000000 */ nop -/* 01638 80B3D818 468042A0 */ cvt.s.w $f10, $f8 -/* 0163C 80B3D81C E46A0000 */ swc1 $f10, 0x0000($v1) ## 00000024 -/* 01640 80B3D820 8CC90010 */ lw $t1, 0x0010($a2) ## 00000010 -/* 01644 80B3D824 44898000 */ mtc1 $t1, $f16 ## $f16 = 0.00 -/* 01648 80B3D828 00000000 */ nop -/* 0164C 80B3D82C 468084A0 */ cvt.s.w $f18, $f16 -/* 01650 80B3D830 E4720004 */ swc1 $f18, 0x0004($v1) ## 00000028 -/* 01654 80B3D834 8CCA0014 */ lw $t2, 0x0014($a2) ## 00000014 -/* 01658 80B3D838 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 0165C 80B3D83C 00000000 */ nop -/* 01660 80B3D840 468021A0 */ cvt.s.w $f6, $f4 -/* 01664 80B3D844 0C2CF523 */ jal func_80B3D48C -/* 01668 80B3D848 E4660008 */ swc1 $f6, 0x0008($v1) ## 0000002C -/* 0166C 80B3D84C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01670 80B3D850 0C2CF259 */ jal func_80B3C964 -/* 01674 80B3D854 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01678 80B3D858 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0167C 80B3D85C C7A80034 */ lwc1 $f8, 0x0034($sp) -/* 01680 80B3D860 3C050602 */ lui $a1, %hi(D_0601C0E8) ## $a1 = 06020000 -/* 01684 80B3D864 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 01688 80B3D868 44070000 */ mfc1 $a3, $f0 -/* 0168C 80B3D86C AFAB0014 */ sw $t3, 0x0014($sp) -/* 01690 80B3D870 24A5C0E8 */ addiu $a1, $a1, %lo(D_0601C0E8) ## $a1 = 0601C0E8 -/* 01694 80B3D874 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01698 80B3D878 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0169C 80B3D87C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 016A0 80B3D880 0C029468 */ jal Animation_Change - -/* 016A4 80B3D884 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 016A8 80B3D888 0C2CF446 */ jal func_80B3D118 -/* 016AC 80B3D88C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80B3D890: -/* 016B0 80B3D890 8FBF002C */ lw $ra, 0x002C($sp) -.L80B3D894: -/* 016B4 80B3D894 8FB00024 */ lw $s0, 0x0024($sp) -/* 016B8 80B3D898 8FB10028 */ lw $s1, 0x0028($sp) -/* 016BC 80B3D89C 03E00008 */ jr $ra -/* 016C0 80B3D8A0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D8A4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D8A4.s deleted file mode 100644 index cfd2ab8936..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D8A4.s +++ /dev/null @@ -1,69 +0,0 @@ -.late_rodata -glabel D_80B42228 - .float 0.01 - -.text -glabel func_80B3D8A4 -/* 016C4 80B3D8A4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 016C8 80B3D8A8 AFB00028 */ sw $s0, 0x0028($sp) -/* 016CC 80B3D8AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 016D0 80B3D8B0 10C00030 */ beq $a2, $zero, .L80B3D974 -/* 016D4 80B3D8B4 AFBF002C */ sw $ra, 0x002C($sp) -/* 016D8 80B3D8B8 3C040601 */ lui $a0, %hi(D_06012FD0) ## $a0 = 06010000 -/* 016DC 80B3D8BC 0C028800 */ jal Animation_GetLastFrame - -/* 016E0 80B3D8C0 24842FD0 */ addiu $a0, $a0, %lo(D_06012FD0) ## $a0 = 06012FD0 -/* 016E4 80B3D8C4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 016E8 80B3D8C8 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 016EC 80B3D8CC 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 016F0 80B3D8D0 468021A0 */ cvt.s.w $f6, $f4 -/* 016F4 80B3D8D4 3C050601 */ lui $a1, %hi(D_06012FD0) ## $a1 = 06010000 -/* 016F8 80B3D8D8 24A52FD0 */ addiu $a1, $a1, %lo(D_06012FD0) ## $a1 = 06012FD0 -/* 016FC 80B3D8DC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01700 80B3D8E0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01704 80B3D8E4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01708 80B3D8E8 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0170C 80B3D8EC AFA00014 */ sw $zero, 0x0014($sp) -/* 01710 80B3D8F0 0C029468 */ jal Animation_Change - -/* 01714 80B3D8F4 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01718 80B3D8F8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 0171C 80B3D8FC 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 01720 80B3D900 AE0E0260 */ sw $t6, 0x0260($s0) ## 00000260 -/* 01724 80B3D904 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01728 80B3D908 0C2CF277 */ jal func_80B3C9DC -/* 0172C 80B3D90C E60A0268 */ swc1 $f10, 0x0268($s0) ## 00000268 -/* 01730 80B3D910 3C028016 */ lui $v0, %hi(gGameInfo) -/* 01734 80B3D914 2442FA90 */ addiu $v0, %lo(gGameInfo) -/* 01738 80B3D918 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90 -/* 0173C 80B3D91C 3C0180B4 */ lui $at, %hi(D_80B42228) ## $at = 80B40000 -/* 01740 80B3D920 C4202228 */ lwc1 $f0, %lo(D_80B42228)($at) -/* 01744 80B3D924 85F81456 */ lh $t8, 0x1456($t7) ## 00001456 -/* 01748 80B3D928 3C014150 */ lui $at, 0x4150 ## $at = 41500000 -/* 0174C 80B3D92C 44811000 */ mtc1 $at, $f2 ## $f2 = 13.00 -/* 01750 80B3D930 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 01754 80B3D934 00000000 */ nop -/* 01758 80B3D938 468084A0 */ cvt.s.w $f18, $f16 -/* 0175C 80B3D93C 46009102 */ mul.s $f4, $f18, $f0 -/* 01760 80B3D940 46022180 */ add.s $f6, $f4, $f2 -/* 01764 80B3D944 46003207 */ neg.s $f8, $f6 -/* 01768 80B3D948 E608006C */ swc1 $f8, 0x006C($s0) ## 0000006C -/* 0176C 80B3D94C 8C590000 */ lw $t9, 0x0000($v0) ## 8015FA90 -/* 01770 80B3D950 87281456 */ lh $t0, 0x1456($t9) ## 00001456 -/* 01774 80B3D954 44885000 */ mtc1 $t0, $f10 ## $f10 = 0.00 -/* 01778 80B3D958 00000000 */ nop -/* 0177C 80B3D95C 46805420 */ cvt.s.w $f16, $f10 -/* 01780 80B3D960 46008482 */ mul.s $f18, $f16, $f0 -/* 01784 80B3D964 46029100 */ add.s $f4, $f18, $f2 -/* 01788 80B3D968 46002187 */ neg.s $f6, $f4 -/* 0178C 80B3D96C 10000003 */ beq $zero, $zero, .L80B3D97C -/* 01790 80B3D970 E6060070 */ swc1 $f6, 0x0070($s0) ## 00000070 -.L80B3D974: -/* 01794 80B3D974 0C2CF233 */ jal func_80B3C8CC -/* 01798 80B3D978 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B3D97C: -/* 0179C 80B3D97C 8FBF002C */ lw $ra, 0x002C($sp) -/* 017A0 80B3D980 8FB00028 */ lw $s0, 0x0028($sp) -/* 017A4 80B3D984 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 017A8 80B3D988 03E00008 */ jr $ra -/* 017AC 80B3D98C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D990.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D990.s deleted file mode 100644 index b803390113..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D990.s +++ /dev/null @@ -1,38 +0,0 @@ -.late_rodata -glabel D_80B4222C - .float 0.01 - -glabel D_80B42230 - .float 1.2 - -.text -glabel func_80B3D990 -/* 017B0 80B3D990 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 017B4 80B3D994 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 017B8 80B3D998 C4840268 */ lwc1 $f4, 0x0268($a0) ## 00000268 -/* 017BC 80B3D99C 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 017C0 80B3D9A0 44818000 */ mtc1 $at, $f16 ## $f16 = 12.00 -/* 017C4 80B3D9A4 46062200 */ add.s $f8, $f4, $f6 -/* 017C8 80B3D9A8 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 017CC 80B3D9AC E4880268 */ swc1 $f8, 0x0268($a0) ## 00000268 -/* 017D0 80B3D9B0 C48A0268 */ lwc1 $f10, 0x0268($a0) ## 00000268 -/* 017D4 80B3D9B4 460A803E */ c.le.s $f16, $f10 -/* 017D8 80B3D9B8 00000000 */ nop -/* 017DC 80B3D9BC 4500000E */ bc1f .L80B3D9F8 -/* 017E0 80B3D9C0 00000000 */ nop -/* 017E4 80B3D9C4 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 017E8 80B3D9C8 3C0180B4 */ lui $at, %hi(D_80B4222C) ## $at = 80B40000 -/* 017EC 80B3D9CC C426222C */ lwc1 $f6, %lo(D_80B4222C)($at) -/* 017F0 80B3D9D0 85CF1458 */ lh $t7, 0x1458($t6) ## 80161458 -/* 017F4 80B3D9D4 3C0180B4 */ lui $at, %hi(D_80B42230) ## $at = 80B40000 -/* 017F8 80B3D9D8 C42A2230 */ lwc1 $f10, %lo(D_80B42230)($at) -/* 017FC 80B3D9DC 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 01800 80B3D9E0 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 -/* 01804 80B3D9E4 AC980260 */ sw $t8, 0x0260($a0) ## 00000260 -/* 01808 80B3D9E8 46809120 */ cvt.s.w $f4, $f18 -/* 0180C 80B3D9EC 46062202 */ mul.s $f8, $f4, $f6 -/* 01810 80B3D9F0 460A4400 */ add.s $f16, $f8, $f10 -/* 01814 80B3D9F4 E4900068 */ swc1 $f16, 0x0068($a0) ## 00000068 -.L80B3D9F8: -/* 01818 80B3D9F8 03E00008 */ jr $ra -/* 0181C 80B3D9FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DA00.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DA00.s deleted file mode 100644 index 0fa1838f76..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DA00.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80B3DA00 -/* 01820 80B3DA00 3C0F8016 */ lui $t7, %hi(gGameInfo) -/* 01824 80B3DA04 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) -/* 01828 80B3DA08 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0182C 80B3DA0C AFBF0024 */ sw $ra, 0x0024($sp) -/* 01830 80B3DA10 AFA40028 */ sw $a0, 0x0028($sp) -/* 01834 80B3DA14 85F8145A */ lh $t8, 0x145A($t7) ## 8016145A -/* 01838 80B3DA18 3C0142BE */ lui $at, 0x42BE ## $at = 42BE0000 -/* 0183C 80B3DA1C 44814000 */ mtc1 $at, $f8 ## $f8 = 95.00 -/* 01840 80B3DA20 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 01844 80B3DA24 C4800090 */ lwc1 $f0, 0x0090($a0) ## 00000090 -/* 01848 80B3DA28 3C040600 */ lui $a0, %hi(D_06004828) ## $a0 = 06000000 -/* 0184C 80B3DA2C 468021A0 */ cvt.s.w $f6, $f4 -/* 01850 80B3DA30 46083280 */ add.s $f10, $f6, $f8 -/* 01854 80B3DA34 460A003E */ c.le.s $f0, $f10 -/* 01858 80B3DA38 00000000 */ nop -/* 0185C 80B3DA3C 45020017 */ bc1fl .L80B3DA9C -/* 01860 80B3DA40 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01864 80B3DA44 0C028800 */ jal Animation_GetLastFrame - -/* 01868 80B3DA48 24844828 */ addiu $a0, $a0, %lo(D_06004828) ## $a0 = 06004828 -/* 0186C 80B3DA4C 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 01870 80B3DA50 3C01C140 */ lui $at, 0xC140 ## $at = C1400000 -/* 01874 80B3DA54 44812000 */ mtc1 $at, $f4 ## $f4 = -12.00 -/* 01878 80B3DA58 468084A0 */ cvt.s.w $f18, $f16 -/* 0187C 80B3DA5C 8FA40028 */ lw $a0, 0x0028($sp) -/* 01880 80B3DA60 3C050600 */ lui $a1, %hi(D_06004828) ## $a1 = 06000000 -/* 01884 80B3DA64 24A54828 */ addiu $a1, $a1, %lo(D_06004828) ## $a1 = 06004828 -/* 01888 80B3DA68 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0188C 80B3DA6C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01890 80B3DA70 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 01894 80B3DA74 AFA00014 */ sw $zero, 0x0014($sp) -/* 01898 80B3DA78 E7A40018 */ swc1 $f4, 0x0018($sp) -/* 0189C 80B3DA7C 0C029468 */ jal Animation_Change - -/* 018A0 80B3DA80 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 018A4 80B3DA84 8FA20028 */ lw $v0, 0x0028($sp) -/* 018A8 80B3DA88 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 018AC 80B3DA8C 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 -/* 018B0 80B3DA90 AC590260 */ sw $t9, 0x0260($v0) ## 00000260 -/* 018B4 80B3DA94 E4460268 */ swc1 $f6, 0x0268($v0) ## 00000268 -/* 018B8 80B3DA98 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B3DA9C: -/* 018BC 80B3DA9C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 018C0 80B3DAA0 03E00008 */ jr $ra -/* 018C4 80B3DAA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DAA8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DAA8.s deleted file mode 100644 index 2d432f9e0d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DAA8.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B3DAA8 -/* 018C8 80B3DAA8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 018CC 80B3DAAC 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 018D0 80B3DAB0 C4840268 */ lwc1 $f4, 0x0268($a0) ## 00000268 -/* 018D4 80B3DAB4 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 018D8 80B3DAB8 44818000 */ mtc1 $at, $f16 ## $f16 = 12.00 -/* 018DC 80B3DABC 46062200 */ add.s $f8, $f4, $f6 -/* 018E0 80B3DAC0 E4880268 */ swc1 $f8, 0x0268($a0) ## 00000268 -/* 018E4 80B3DAC4 C48A0268 */ lwc1 $f10, 0x0268($a0) ## 00000268 -/* 018E8 80B3DAC8 460A803E */ c.le.s $f16, $f10 -/* 018EC 80B3DACC 00000000 */ nop -/* 018F0 80B3DAD0 45000005 */ bc1f .L80B3DAE8 -/* 018F4 80B3DAD4 00000000 */ nop -/* 018F8 80B3DAD8 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 018FC 80B3DADC 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 -/* 01900 80B3DAE0 AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 -/* 01904 80B3DAE4 E4920068 */ swc1 $f18, 0x0068($a0) ## 00000068 -.L80B3DAE8: -/* 01908 80B3DAE8 03E00008 */ jr $ra -/* 0190C 80B3DAEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DAF0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DAF0.s deleted file mode 100644 index d7b196f5b5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DAF0.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_80B3DAF0 -/* 01910 80B3DAF0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01914 80B3DAF4 AFA40028 */ sw $a0, 0x0028($sp) -/* 01918 80B3DAF8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0191C 80B3DAFC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01920 80B3DB00 0C2CF134 */ jal func_80B3C4D0 -/* 01924 80B3DB04 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 01928 80B3DB08 50400025 */ beql $v0, $zero, .L80B3DBA0 -/* 0192C 80B3DB0C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01930 80B3DB10 94440000 */ lhu $a0, 0x0000($v0) ## 00000000 -/* 01934 80B3DB14 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01938 80B3DB18 10810008 */ beq $a0, $at, .L80B3DB3C -/* 0193C 80B3DB1C 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 01940 80B3DB20 10810006 */ beq $a0, $at, .L80B3DB3C -/* 01944 80B3DB24 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 01948 80B3DB28 10810004 */ beq $a0, $at, .L80B3DB3C -/* 0194C 80B3DB2C 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 01950 80B3DB30 10810002 */ beq $a0, $at, .L80B3DB3C -/* 01954 80B3DB34 24010017 */ addiu $at, $zero, 0x0017 ## $at = 00000017 -/* 01958 80B3DB38 14810018 */ bne $a0, $at, .L80B3DB9C -.L80B3DB3C: -/* 0195C 80B3DB3C 3C040602 */ lui $a0, %hi(D_0601B19C) ## $a0 = 06020000 -/* 01960 80B3DB40 0C028800 */ jal Animation_GetLastFrame - -/* 01964 80B3DB44 2484B19C */ addiu $a0, $a0, %lo(D_0601B19C) ## $a0 = 0601B19C -/* 01968 80B3DB48 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0196C 80B3DB4C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 01970 80B3DB50 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 01974 80B3DB54 468021A0 */ cvt.s.w $f6, $f4 -/* 01978 80B3DB58 8FA40028 */ lw $a0, 0x0028($sp) -/* 0197C 80B3DB5C 3C050602 */ lui $a1, %hi(D_0601B19C) ## $a1 = 06020000 -/* 01980 80B3DB60 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01984 80B3DB64 AFAE0014 */ sw $t6, 0x0014($sp) -/* 01988 80B3DB68 24A5B19C */ addiu $a1, $a1, %lo(D_0601B19C) ## $a1 = 0601B19C -/* 0198C 80B3DB6C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01990 80B3DB70 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01994 80B3DB74 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01998 80B3DB78 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0199C 80B3DB7C 0C029468 */ jal Animation_Change - -/* 019A0 80B3DB80 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 019A4 80B3DB84 8FB80028 */ lw $t8, 0x0028($sp) -/* 019A8 80B3DB88 240F0007 */ addiu $t7, $zero, 0x0007 ## $t7 = 00000007 -/* 019AC 80B3DB8C 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 019B0 80B3DB90 AF0F0260 */ sw $t7, 0x0260($t8) ## 00000260 -/* 019B4 80B3DB94 8FA80028 */ lw $t0, 0x0028($sp) -/* 019B8 80B3DB98 AD190264 */ sw $t9, 0x0264($t0) ## 00000264 -.L80B3DB9C: -/* 019BC 80B3DB9C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B3DBA0: -/* 019C0 80B3DBA0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 019C4 80B3DBA4 03E00008 */ jr $ra -/* 019C8 80B3DBA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DBAC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DBAC.s deleted file mode 100644 index 7292dfe49f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DBAC.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80B3DBAC -/* 019CC 80B3DBAC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 019D0 80B3DBB0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 019D4 80B3DBB4 10A00017 */ beq $a1, $zero, .L80B3DC14 -/* 019D8 80B3DBB8 AFA40028 */ sw $a0, 0x0028($sp) -/* 019DC 80B3DBBC 3C040601 */ lui $a0, %hi(D_06017C54) ## $a0 = 06010000 -/* 019E0 80B3DBC0 0C028800 */ jal Animation_GetLastFrame - -/* 019E4 80B3DBC4 24847C54 */ addiu $a0, $a0, %lo(D_06017C54) ## $a0 = 06017C54 -/* 019E8 80B3DBC8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 019EC 80B3DBCC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 019F0 80B3DBD0 8FA40028 */ lw $a0, 0x0028($sp) -/* 019F4 80B3DBD4 468021A0 */ cvt.s.w $f6, $f4 -/* 019F8 80B3DBD8 3C050601 */ lui $a1, %hi(D_06017C54) ## $a1 = 06010000 -/* 019FC 80B3DBDC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01A00 80B3DBE0 44070000 */ mfc1 $a3, $f0 -/* 01A04 80B3DBE4 AFAE0014 */ sw $t6, 0x0014($sp) -/* 01A08 80B3DBE8 24A57C54 */ addiu $a1, $a1, %lo(D_06017C54) ## $a1 = 06017C54 -/* 01A0C 80B3DBEC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01A10 80B3DBF0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01A14 80B3DBF4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01A18 80B3DBF8 0C029468 */ jal Animation_Change - -/* 01A1C 80B3DBFC E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01A20 80B3DC00 8FA20028 */ lw $v0, 0x0028($sp) -/* 01A24 80B3DC04 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 -/* 01A28 80B3DC08 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 01A2C 80B3DC0C AC4F0260 */ sw $t7, 0x0260($v0) ## 00000260 -/* 01A30 80B3DC10 AC580264 */ sw $t8, 0x0264($v0) ## 00000264 -.L80B3DC14: -/* 01A34 80B3DC14 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01A38 80B3DC18 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01A3C 80B3DC1C 03E00008 */ jr $ra -/* 01A40 80B3DC20 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DC24.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DC24.s deleted file mode 100644 index 805bad23be..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DC24.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80B3DC24 -/* 01A44 80B3DC24 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01A48 80B3DC28 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01A4C 80B3DC2C 10C0001A */ beq $a2, $zero, .L80B3DC98 -/* 01A50 80B3DC30 AFA40038 */ sw $a0, 0x0038($sp) -/* 01A54 80B3DC34 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01A58 80B3DC38 0C2CF536 */ jal func_80B3D4D8 -/* 01A5C 80B3DC3C 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 01A60 80B3DC40 AFA2002C */ sw $v0, 0x002C($sp) -/* 01A64 80B3DC44 0C028800 */ jal Animation_GetLastFrame - -/* 01A68 80B3DC48 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 01A6C 80B3DC4C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01A70 80B3DC50 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 01A74 80B3DC54 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 01A78 80B3DC58 468021A0 */ cvt.s.w $f6, $f4 -/* 01A7C 80B3DC5C 8FA40038 */ lw $a0, 0x0038($sp) -/* 01A80 80B3DC60 8FA5002C */ lw $a1, 0x002C($sp) -/* 01A84 80B3DC64 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01A88 80B3DC68 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01A8C 80B3DC6C AFA00014 */ sw $zero, 0x0014($sp) -/* 01A90 80B3DC70 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01A94 80B3DC74 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01A98 80B3DC78 0C029468 */ jal Animation_Change - -/* 01A9C 80B3DC7C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01AA0 80B3DC80 8FAF0038 */ lw $t7, 0x0038($sp) -/* 01AA4 80B3DC84 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 -/* 01AA8 80B3DC88 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 01AAC 80B3DC8C ADEE0260 */ sw $t6, 0x0260($t7) ## 00000260 -/* 01AB0 80B3DC90 8FB90038 */ lw $t9, 0x0038($sp) -/* 01AB4 80B3DC94 AF380264 */ sw $t8, 0x0264($t9) ## 00000264 -.L80B3DC98: -/* 01AB8 80B3DC98 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01ABC 80B3DC9C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01AC0 80B3DCA0 03E00008 */ jr $ra -/* 01AC4 80B3DCA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DCA8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DCA8.s deleted file mode 100644 index 9b73989936..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DCA8.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80B3DCA8 -/* 01AC8 80B3DCA8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01ACC 80B3DCAC AFBF0024 */ sw $ra, 0x0024($sp) -/* 01AD0 80B3DCB0 AFA40028 */ sw $a0, 0x0028($sp) -/* 01AD4 80B3DCB4 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 01AD8 80B3DCB8 51C0001D */ beql $t6, $zero, .L80B3DD30 -/* 01ADC 80B3DCBC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01AE0 80B3DCC0 8CA21D9C */ lw $v0, 0x1D9C($a1) ## 00001D9C -/* 01AE4 80B3DCC4 5040001A */ beql $v0, $zero, .L80B3DD30 -/* 01AE8 80B3DCC8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01AEC 80B3DCCC 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 01AF0 80B3DCD0 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 01AF4 80B3DCD4 3C040601 */ lui $a0, %hi(D_06017C54) ## $a0 = 06010000 -/* 01AF8 80B3DCD8 55E10015 */ bnel $t7, $at, .L80B3DD30 -/* 01AFC 80B3DCDC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01B00 80B3DCE0 0C028800 */ jal Animation_GetLastFrame - -/* 01B04 80B3DCE4 24847C54 */ addiu $a0, $a0, %lo(D_06017C54) ## $a0 = 06017C54 -/* 01B08 80B3DCE8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01B0C 80B3DCEC 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 01B10 80B3DCF0 44813000 */ mtc1 $at, $f6 ## $f6 = -8.00 -/* 01B14 80B3DCF4 46802020 */ cvt.s.w $f0, $f4 -/* 01B18 80B3DCF8 8FA40028 */ lw $a0, 0x0028($sp) -/* 01B1C 80B3DCFC 3C050601 */ lui $a1, %hi(D_06017C54) ## $a1 = 06010000 -/* 01B20 80B3DD00 24A57C54 */ addiu $a1, $a1, %lo(D_06017C54) ## $a1 = 06017C54 -/* 01B24 80B3DD04 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 01B28 80B3DD08 AFA00014 */ sw $zero, 0x0014($sp) -/* 01B2C 80B3DD0C 44070000 */ mfc1 $a3, $f0 -/* 01B30 80B3DD10 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01B34 80B3DD14 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 01B38 80B3DD18 0C029468 */ jal Animation_Change - -/* 01B3C 80B3DD1C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01B40 80B3DD20 8FB90028 */ lw $t9, 0x0028($sp) -/* 01B44 80B3DD24 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A -/* 01B48 80B3DD28 AF380260 */ sw $t8, 0x0260($t9) ## 00000260 -/* 01B4C 80B3DD2C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B3DD30: -/* 01B50 80B3DD30 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01B54 80B3DD34 03E00008 */ jr $ra -/* 01B58 80B3DD38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DD3C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DD3C.s deleted file mode 100644 index 39dda9cd56..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DD3C.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_80B3DD3C -/* 01B5C 80B3DD3C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01B60 80B3DD40 AFBF002C */ sw $ra, 0x002C($sp) -/* 01B64 80B3DD44 AFB00028 */ sw $s0, 0x0028($sp) -/* 01B68 80B3DD48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01B6C 80B3DD4C AFA50034 */ sw $a1, 0x0034($sp) -/* 01B70 80B3DD50 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 01B74 80B3DD54 0C2CF13C */ jal func_80B3C4F0 -/* 01B78 80B3DD58 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 01B7C 80B3DD5C 1040001A */ beq $v0, $zero, .L80B3DDC8 -/* 01B80 80B3DD60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B84 80B3DD64 C6000164 */ lwc1 $f0, 0x0164($s0) ## 00000164 -/* 01B88 80B3DD68 C602015C */ lwc1 $f2, 0x015C($s0) ## 0000015C -/* 01B8C 80B3DD6C 3C040601 */ lui $a0, %hi(D_06017C54) ## $a0 = 06010000 -/* 01B90 80B3DD70 4600103E */ c.le.s $f2, $f0 -/* 01B94 80B3DD74 00000000 */ nop -/* 01B98 80B3DD78 4502001D */ bc1fl .L80B3DDF0 -/* 01B9C 80B3DD7C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01BA0 80B3DD80 0C028800 */ jal Animation_GetLastFrame - -/* 01BA4 80B3DD84 24847C54 */ addiu $a0, $a0, %lo(D_06017C54) ## $a0 = 06017C54 -/* 01BA8 80B3DD88 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01BAC 80B3DD8C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01BB0 80B3DD90 3C050601 */ lui $a1, %hi(D_06017C54) ## $a1 = 06010000 -/* 01BB4 80B3DD94 46802120 */ cvt.s.w $f4, $f4 -/* 01BB8 80B3DD98 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01BBC 80B3DD9C AFAE0014 */ sw $t6, 0x0014($sp) -/* 01BC0 80B3DDA0 24A57C54 */ addiu $a1, $a1, %lo(D_06017C54) ## $a1 = 06017C54 -/* 01BC4 80B3DDA4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01BC8 80B3DDA8 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 01BCC 80B3DDAC 44072000 */ mfc1 $a3, $f4 -/* 01BD0 80B3DDB0 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01BD4 80B3DDB4 0C029468 */ jal Animation_Change - -/* 01BD8 80B3DDB8 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01BDC 80B3DDBC 240F000B */ addiu $t7, $zero, 0x000B ## $t7 = 0000000B -/* 01BE0 80B3DDC0 1000000A */ beq $zero, $zero, .L80B3DDEC -/* 01BE4 80B3DDC4 AE0F0260 */ sw $t7, 0x0260($s0) ## 00000260 -.L80B3DDC8: -/* 01BE8 80B3DDC8 8FA50034 */ lw $a1, 0x0034($sp) -/* 01BEC 80B3DDCC 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 01BF0 80B3DDD0 0C2CF14F */ jal func_80B3C53C -/* 01BF4 80B3DDD4 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 01BF8 80B3DDD8 10400004 */ beq $v0, $zero, .L80B3DDEC -/* 01BFC 80B3DDDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C00 80B3DDE0 8FA50034 */ lw $a1, 0x0034($sp) -/* 01C04 80B3DDE4 0C2CF709 */ jal func_80B3DC24 -/* 01C08 80B3DDE8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -.L80B3DDEC: -/* 01C0C 80B3DDEC 8FBF002C */ lw $ra, 0x002C($sp) -.L80B3DDF0: -/* 01C10 80B3DDF0 8FB00028 */ lw $s0, 0x0028($sp) -/* 01C14 80B3DDF4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01C18 80B3DDF8 03E00008 */ jr $ra -/* 01C1C 80B3DDFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE00.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE00.s deleted file mode 100644 index a3ef42afeb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE00.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80B3DE00 -/* 01C20 80B3DE00 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01C24 80B3DE04 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01C28 80B3DE08 10A00017 */ beq $a1, $zero, .L80B3DE68 -/* 01C2C 80B3DE0C AFA40028 */ sw $a0, 0x0028($sp) -/* 01C30 80B3DE10 3C040602 */ lui $a0, %hi(D_0601B19C) ## $a0 = 06020000 -/* 01C34 80B3DE14 0C028800 */ jal Animation_GetLastFrame - -/* 01C38 80B3DE18 2484B19C */ addiu $a0, $a0, %lo(D_0601B19C) ## $a0 = 0601B19C -/* 01C3C 80B3DE1C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01C40 80B3DE20 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01C44 80B3DE24 8FA40028 */ lw $a0, 0x0028($sp) -/* 01C48 80B3DE28 46802120 */ cvt.s.w $f4, $f4 -/* 01C4C 80B3DE2C 3C050602 */ lui $a1, %hi(D_0601B19C) ## $a1 = 06020000 -/* 01C50 80B3DE30 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01C54 80B3DE34 AFAE0014 */ sw $t6, 0x0014($sp) -/* 01C58 80B3DE38 24A5B19C */ addiu $a1, $a1, %lo(D_0601B19C) ## $a1 = 0601B19C -/* 01C5C 80B3DE3C 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 01C60 80B3DE40 44072000 */ mfc1 $a3, $f4 -/* 01C64 80B3DE44 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01C68 80B3DE48 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01C6C 80B3DE4C 0C029468 */ jal Animation_Change - -/* 01C70 80B3DE50 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01C74 80B3DE54 8FA20028 */ lw $v0, 0x0028($sp) -/* 01C78 80B3DE58 240F000C */ addiu $t7, $zero, 0x000C ## $t7 = 0000000C -/* 01C7C 80B3DE5C 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 01C80 80B3DE60 AC4F0260 */ sw $t7, 0x0260($v0) ## 00000260 -/* 01C84 80B3DE64 AC580264 */ sw $t8, 0x0264($v0) ## 00000264 -.L80B3DE68: -/* 01C88 80B3DE68 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01C8C 80B3DE6C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01C90 80B3DE70 03E00008 */ jr $ra -/* 01C94 80B3DE74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE78.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE78.s deleted file mode 100644 index 4e1d552129..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE78.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80B3DE78 -/* 01C98 80B3DE78 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01C9C 80B3DE7C AFBF0024 */ sw $ra, 0x0024($sp) -/* 01CA0 80B3DE80 10A00018 */ beq $a1, $zero, .L80B3DEE4 -/* 01CA4 80B3DE84 AFA40028 */ sw $a0, 0x0028($sp) -/* 01CA8 80B3DE88 3C040600 */ lui $a0, %hi(D_06004828) ## $a0 = 06000000 -/* 01CAC 80B3DE8C 0C028800 */ jal Animation_GetLastFrame - -/* 01CB0 80B3DE90 24844828 */ addiu $a0, $a0, %lo(D_06004828) ## $a0 = 06004828 -/* 01CB4 80B3DE94 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01CB8 80B3DE98 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01CBC 80B3DE9C 8FA30028 */ lw $v1, 0x0028($sp) -/* 01CC0 80B3DEA0 468021A0 */ cvt.s.w $f6, $f4 -/* 01CC4 80B3DEA4 3C050600 */ lui $a1, %hi(D_06004828) ## $a1 = 06000000 -/* 01CC8 80B3DEA8 44070000 */ mfc1 $a3, $f0 -/* 01CCC 80B3DEAC 24A54828 */ addiu $a1, $a1, %lo(D_06004828) ## $a1 = 06004828 -/* 01CD0 80B3DEB0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01CD4 80B3DEB4 AFA00014 */ sw $zero, 0x0014($sp) -/* 01CD8 80B3DEB8 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01CDC 80B3DEBC 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 01CE0 80B3DEC0 0C029468 */ jal Animation_Change - -/* 01CE4 80B3DEC4 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01CE8 80B3DEC8 8FA30028 */ lw $v1, 0x0028($sp) -/* 01CEC 80B3DECC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 01CF0 80B3DED0 240E000D */ addiu $t6, $zero, 0x000D ## $t6 = 0000000D -/* 01CF4 80B3DED4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01CF8 80B3DED8 AC6E0260 */ sw $t6, 0x0260($v1) ## 00000260 -/* 01CFC 80B3DEDC AC6F0264 */ sw $t7, 0x0264($v1) ## 00000264 -/* 01D00 80B3DEE0 E4680268 */ swc1 $f8, 0x0268($v1) ## 00000268 -.L80B3DEE4: -/* 01D04 80B3DEE4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01D08 80B3DEE8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01D0C 80B3DEEC 03E00008 */ jr $ra -/* 01D10 80B3DEF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DEF4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DEF4.s deleted file mode 100644 index 40f0ac8b41..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DEF4.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80B3DEF4 -/* 01D14 80B3DEF4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01D18 80B3DEF8 AFBF002C */ sw $ra, 0x002C($sp) -/* 01D1C 80B3DEFC AFB00028 */ sw $s0, 0x0028($sp) -/* 01D20 80B3DF00 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 01D24 80B3DF04 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01D28 80B3DF08 51C00022 */ beql $t6, $zero, .L80B3DF94 -/* 01D2C 80B3DF0C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01D30 80B3DF10 8CA21D9C */ lw $v0, 0x1D9C($a1) ## 00001D9C -/* 01D34 80B3DF14 5040001F */ beql $v0, $zero, .L80B3DF94 -/* 01D38 80B3DF18 8FBF002C */ lw $ra, 0x002C($sp) -/* 01D3C 80B3DF1C 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 01D40 80B3DF20 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01D44 80B3DF24 3C040601 */ lui $a0, %hi(D_06012FD0) ## $a0 = 06010000 -/* 01D48 80B3DF28 55E1001A */ bnel $t7, $at, .L80B3DF94 -/* 01D4C 80B3DF2C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01D50 80B3DF30 0C028800 */ jal Animation_GetLastFrame - -/* 01D54 80B3DF34 24842FD0 */ addiu $a0, $a0, %lo(D_06012FD0) ## $a0 = 06012FD0 -/* 01D58 80B3DF38 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01D5C 80B3DF3C 3C01C140 */ lui $at, 0xC140 ## $at = C1400000 -/* 01D60 80B3DF40 44814000 */ mtc1 $at, $f8 ## $f8 = -12.00 -/* 01D64 80B3DF44 46802120 */ cvt.s.w $f4, $f4 -/* 01D68 80B3DF48 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01D6C 80B3DF4C 3C050601 */ lui $a1, %hi(D_06012FD0) ## $a1 = 06010000 -/* 01D70 80B3DF50 24A52FD0 */ addiu $a1, $a1, %lo(D_06012FD0) ## $a1 = 06012FD0 -/* 01D74 80B3DF54 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01D78 80B3DF58 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 01D7C 80B3DF5C 44072000 */ mfc1 $a3, $f4 -/* 01D80 80B3DF60 AFA00014 */ sw $zero, 0x0014($sp) -/* 01D84 80B3DF64 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01D88 80B3DF68 0C029468 */ jal Animation_Change - -/* 01D8C 80B3DF6C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01D90 80B3DF70 86190032 */ lh $t9, 0x0032($s0) ## 00000032 -/* 01D94 80B3DF74 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 01D98 80B3DF78 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 01D9C 80B3DF7C 2418000E */ addiu $t8, $zero, 0x000E ## $t8 = 0000000E -/* 01DA0 80B3DF80 03214021 */ addu $t0, $t9, $at -/* 01DA4 80B3DF84 AE180260 */ sw $t8, 0x0260($s0) ## 00000260 -/* 01DA8 80B3DF88 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 -/* 01DAC 80B3DF8C E60A0268 */ swc1 $f10, 0x0268($s0) ## 00000268 -/* 01DB0 80B3DF90 8FBF002C */ lw $ra, 0x002C($sp) -.L80B3DF94: -/* 01DB4 80B3DF94 8FB00028 */ lw $s0, 0x0028($sp) -/* 01DB8 80B3DF98 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01DBC 80B3DF9C 03E00008 */ jr $ra -/* 01DC0 80B3DFA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DFA4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DFA4.s deleted file mode 100644 index 09b331ebcb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DFA4.s +++ /dev/null @@ -1,38 +0,0 @@ -.late_rodata -glabel D_80B42234 - .float 0.01 - -glabel D_80B42238 - .float 1.2 - -.text -glabel func_80B3DFA4 -/* 01DC4 80B3DFA4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01DC8 80B3DFA8 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 01DCC 80B3DFAC C4840268 */ lwc1 $f4, 0x0268($a0) ## 00000268 -/* 01DD0 80B3DFB0 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 01DD4 80B3DFB4 44818000 */ mtc1 $at, $f16 ## $f16 = 12.00 -/* 01DD8 80B3DFB8 46062200 */ add.s $f8, $f4, $f6 -/* 01DDC 80B3DFBC 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 01DE0 80B3DFC0 E4880268 */ swc1 $f8, 0x0268($a0) ## 00000268 -/* 01DE4 80B3DFC4 C48A0268 */ lwc1 $f10, 0x0268($a0) ## 00000268 -/* 01DE8 80B3DFC8 460A803E */ c.le.s $f16, $f10 -/* 01DEC 80B3DFCC 00000000 */ nop -/* 01DF0 80B3DFD0 4500000E */ bc1f .L80B3E00C -/* 01DF4 80B3DFD4 00000000 */ nop -/* 01DF8 80B3DFD8 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 01DFC 80B3DFDC 3C0180B4 */ lui $at, %hi(D_80B42234) ## $at = 80B40000 -/* 01E00 80B3DFE0 C4262234 */ lwc1 $f6, %lo(D_80B42234)($at) -/* 01E04 80B3DFE4 85CF1458 */ lh $t7, 0x1458($t6) ## 80161458 -/* 01E08 80B3DFE8 3C0180B4 */ lui $at, %hi(D_80B42238) ## $at = 80B40000 -/* 01E0C 80B3DFEC C42A2238 */ lwc1 $f10, %lo(D_80B42238)($at) -/* 01E10 80B3DFF0 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 01E14 80B3DFF4 2418000F */ addiu $t8, $zero, 0x000F ## $t8 = 0000000F -/* 01E18 80B3DFF8 AC980260 */ sw $t8, 0x0260($a0) ## 00000260 -/* 01E1C 80B3DFFC 46809120 */ cvt.s.w $f4, $f18 -/* 01E20 80B3E000 46062202 */ mul.s $f8, $f4, $f6 -/* 01E24 80B3E004 460A4400 */ add.s $f16, $f8, $f10 -/* 01E28 80B3E008 E4900068 */ swc1 $f16, 0x0068($a0) ## 00000068 -.L80B3E00C: -/* 01E2C 80B3E00C 03E00008 */ jr $ra -/* 01E30 80B3E010 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E014.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E014.s deleted file mode 100644 index 15ca2d6a6e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E014.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80B3E014 -/* 01E34 80B3E014 3C0F8016 */ lui $t7, %hi(gGameInfo) -/* 01E38 80B3E018 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) -/* 01E3C 80B3E01C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01E40 80B3E020 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01E44 80B3E024 AFA40028 */ sw $a0, 0x0028($sp) -/* 01E48 80B3E028 85F8145E */ lh $t8, 0x145E($t7) ## 8016145E -/* 01E4C 80B3E02C 3C01430C */ lui $at, 0x430C ## $at = 430C0000 -/* 01E50 80B3E030 44814000 */ mtc1 $at, $f8 ## $f8 = 140.00 -/* 01E54 80B3E034 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 01E58 80B3E038 C4800090 */ lwc1 $f0, 0x0090($a0) ## 00000090 -/* 01E5C 80B3E03C 3C040600 */ lui $a0, %hi(D_06004828) ## $a0 = 06000000 -/* 01E60 80B3E040 468021A0 */ cvt.s.w $f6, $f4 -/* 01E64 80B3E044 46083280 */ add.s $f10, $f6, $f8 -/* 01E68 80B3E048 4600503E */ c.le.s $f10, $f0 -/* 01E6C 80B3E04C 00000000 */ nop -/* 01E70 80B3E050 45020017 */ bc1fl .L80B3E0B0 -/* 01E74 80B3E054 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01E78 80B3E058 0C028800 */ jal Animation_GetLastFrame - -/* 01E7C 80B3E05C 24844828 */ addiu $a0, $a0, %lo(D_06004828) ## $a0 = 06004828 -/* 01E80 80B3E060 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 01E84 80B3E064 3C01C140 */ lui $at, 0xC140 ## $at = C1400000 -/* 01E88 80B3E068 44812000 */ mtc1 $at, $f4 ## $f4 = -12.00 -/* 01E8C 80B3E06C 468084A0 */ cvt.s.w $f18, $f16 -/* 01E90 80B3E070 8FA40028 */ lw $a0, 0x0028($sp) -/* 01E94 80B3E074 3C050600 */ lui $a1, %hi(D_06004828) ## $a1 = 06000000 -/* 01E98 80B3E078 24A54828 */ addiu $a1, $a1, %lo(D_06004828) ## $a1 = 06004828 -/* 01E9C 80B3E07C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01EA0 80B3E080 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01EA4 80B3E084 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 01EA8 80B3E088 AFA00014 */ sw $zero, 0x0014($sp) -/* 01EAC 80B3E08C E7A40018 */ swc1 $f4, 0x0018($sp) -/* 01EB0 80B3E090 0C029468 */ jal Animation_Change - -/* 01EB4 80B3E094 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01EB8 80B3E098 8FA20028 */ lw $v0, 0x0028($sp) -/* 01EBC 80B3E09C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01EC0 80B3E0A0 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 -/* 01EC4 80B3E0A4 AC590260 */ sw $t9, 0x0260($v0) ## 00000260 -/* 01EC8 80B3E0A8 E4460268 */ swc1 $f6, 0x0268($v0) ## 00000268 -/* 01ECC 80B3E0AC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B3E0B0: -/* 01ED0 80B3E0B0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01ED4 80B3E0B4 03E00008 */ jr $ra -/* 01ED8 80B3E0B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E0BC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E0BC.s deleted file mode 100644 index 2c0eae5df2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E0BC.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80B3E0BC -/* 01EDC 80B3E0BC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01EE0 80B3E0C0 AFBF002C */ sw $ra, 0x002C($sp) -/* 01EE4 80B3E0C4 AFB00028 */ sw $s0, 0x0028($sp) -/* 01EE8 80B3E0C8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01EEC 80B3E0CC 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 01EF0 80B3E0D0 C4840268 */ lwc1 $f4, 0x0268($a0) ## 00000268 -/* 01EF4 80B3E0D4 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 01EF8 80B3E0D8 44818000 */ mtc1 $at, $f16 ## $f16 = 12.00 -/* 01EFC 80B3E0DC 46062200 */ add.s $f8, $f4, $f6 -/* 01F00 80B3E0E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01F04 80B3E0E4 E4880268 */ swc1 $f8, 0x0268($a0) ## 00000268 -/* 01F08 80B3E0E8 C48A0268 */ lwc1 $f10, 0x0268($a0) ## 00000268 -/* 01F0C 80B3E0EC 3C040602 */ lui $a0, %hi(D_06019598) ## $a0 = 06020000 -/* 01F10 80B3E0F0 460A803E */ c.le.s $f16, $f10 -/* 01F14 80B3E0F4 00000000 */ nop -/* 01F18 80B3E0F8 45020016 */ bc1fl .L80B3E154 -/* 01F1C 80B3E0FC 8FBF002C */ lw $ra, 0x002C($sp) -/* 01F20 80B3E100 0C028800 */ jal Animation_GetLastFrame - -/* 01F24 80B3E104 24849598 */ addiu $a0, $a0, %lo(D_06019598) ## $a0 = 06019598 -/* 01F28 80B3E108 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 -/* 01F2C 80B3E10C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01F30 80B3E110 3C050602 */ lui $a1, %hi(D_06019598) ## $a1 = 06020000 -/* 01F34 80B3E114 46809120 */ cvt.s.w $f4, $f18 -/* 01F38 80B3E118 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01F3C 80B3E11C 44070000 */ mfc1 $a3, $f0 -/* 01F40 80B3E120 AFAE0014 */ sw $t6, 0x0014($sp) -/* 01F44 80B3E124 24A59598 */ addiu $a1, $a1, %lo(D_06019598) ## $a1 = 06019598 -/* 01F48 80B3E128 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01F4C 80B3E12C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01F50 80B3E130 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01F54 80B3E134 0C029468 */ jal Animation_Change - -/* 01F58 80B3E138 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01F5C 80B3E13C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01F60 80B3E140 240F0011 */ addiu $t7, $zero, 0x0011 ## $t7 = 00000011 -/* 01F64 80B3E144 AE0F0260 */ sw $t7, 0x0260($s0) ## 00000260 -/* 01F68 80B3E148 E6000268 */ swc1 $f0, 0x0268($s0) ## 00000268 -/* 01F6C 80B3E14C E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 01F70 80B3E150 8FBF002C */ lw $ra, 0x002C($sp) -.L80B3E154: -/* 01F74 80B3E154 8FB00028 */ lw $s0, 0x0028($sp) -/* 01F78 80B3E158 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01F7C 80B3E15C 03E00008 */ jr $ra -/* 01F80 80B3E160 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E164.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E164.s deleted file mode 100644 index c3713ad5aa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E164.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B3E164 -/* 01F84 80B3E164 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01F88 80B3E168 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01F8C 80B3E16C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01F90 80B3E170 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 01F94 80B3E174 C4840268 */ lwc1 $f4, 0x0268($a0) ## 00000268 -/* 01F98 80B3E178 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 01F9C 80B3E17C 44818000 */ mtc1 $at, $f16 ## $f16 = 30.00 -/* 01FA0 80B3E180 46062200 */ add.s $f8, $f4, $f6 -/* 01FA4 80B3E184 240E0012 */ addiu $t6, $zero, 0x0012 ## $t6 = 00000012 -/* 01FA8 80B3E188 E4880268 */ swc1 $f8, 0x0268($a0) ## 00000268 -/* 01FAC 80B3E18C C48A0268 */ lwc1 $f10, 0x0268($a0) ## 00000268 -/* 01FB0 80B3E190 460A803E */ c.le.s $f16, $f10 -/* 01FB4 80B3E194 00000000 */ nop -/* 01FB8 80B3E198 45020004 */ bc1fl .L80B3E1AC -/* 01FBC 80B3E19C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01FC0 80B3E1A0 0C2CF0E9 */ jal func_80B3C3A4 -/* 01FC4 80B3E1A4 AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 -/* 01FC8 80B3E1A8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B3E1AC: -/* 01FCC 80B3E1AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01FD0 80B3E1B0 03E00008 */ jr $ra -/* 01FD4 80B3E1B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E1B8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E1B8.s deleted file mode 100644 index d58fa0f57b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E1B8.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80B3E1B8 -/* 01FD8 80B3E1B8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01FDC 80B3E1BC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01FE0 80B3E1C0 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 01FE4 80B3E1C4 51C00014 */ beql $t6, $zero, .L80B3E218 -/* 01FE8 80B3E1C8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01FEC 80B3E1CC 8CA21D9C */ lw $v0, 0x1D9C($a1) ## 00001D9C -/* 01FF0 80B3E1D0 50400011 */ beql $v0, $zero, .L80B3E218 -/* 01FF4 80B3E1D4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01FF8 80B3E1D8 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 01FFC 80B3E1DC 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 02000 80B3E1E0 55E1000D */ bnel $t7, $at, .L80B3E218 -/* 02004 80B3E1E4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02008 80B3E1E8 84A200A4 */ lh $v0, 0x00A4($a1) ## 000000A4 -/* 0200C 80B3E1EC 24010061 */ addiu $at, $zero, 0x0061 ## $at = 00000061 -/* 02010 80B3E1F0 24180013 */ addiu $t8, $zero, 0x0013 ## $t8 = 00000013 -/* 02014 80B3E1F4 14410005 */ bne $v0, $at, .L80B3E20C -/* 02018 80B3E1F8 00000000 */ nop -/* 0201C 80B3E1FC AC980260 */ sw $t8, 0x0260($a0) ## 00000260 -/* 02020 80B3E200 AC800264 */ sw $zero, 0x0264($a0) ## 00000264 -/* 02024 80B3E204 10000003 */ beq $zero, $zero, .L80B3E214 -/* 02028 80B3E208 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -.L80B3E20C: -/* 0202C 80B3E20C 0C00B55C */ jal Actor_Kill - -/* 02030 80B3E210 00000000 */ nop -.L80B3E214: -/* 02034 80B3E214 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B3E218: -/* 02038 80B3E218 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0203C 80B3E21C 03E00008 */ jr $ra -/* 02040 80B3E220 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E224.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E224.s deleted file mode 100644 index aa29bcfcf8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E224.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B3E224 -/* 02044 80B3E224 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02048 80B3E228 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0204C 80B3E22C AFA40018 */ sw $a0, 0x0018($sp) -/* 02050 80B3E230 0C2CF405 */ jal func_80B3D014 -/* 02054 80B3E234 AFA5001C */ sw $a1, 0x001C($sp) -/* 02058 80B3E238 0C2CF456 */ jal func_80B3D158 -/* 0205C 80B3E23C 8FA4001C */ lw $a0, 0x001C($sp) -/* 02060 80B3E240 8FA40018 */ lw $a0, 0x0018($sp) -/* 02064 80B3E244 0C2CF5D4 */ jal func_80B3D750 -/* 02068 80B3E248 8FA5001C */ lw $a1, 0x001C($sp) -/* 0206C 80B3E24C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02070 80B3E250 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02074 80B3E254 03E00008 */ jr $ra -/* 02078 80B3E258 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E25C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E25C.s deleted file mode 100644 index fc91e93e08..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E25C.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B3E25C -/* 0207C 80B3E25C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02080 80B3E260 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02084 80B3E264 AFA40018 */ sw $a0, 0x0018($sp) -/* 02088 80B3E268 0C2CF405 */ jal func_80B3D014 -/* 0208C 80B3E26C AFA5001C */ sw $a1, 0x001C($sp) -/* 02090 80B3E270 0C2CF456 */ jal func_80B3D158 -/* 02094 80B3E274 8FA4001C */ lw $a0, 0x001C($sp) -/* 02098 80B3E278 8FA40018 */ lw $a0, 0x0018($sp) -/* 0209C 80B3E27C 0C2CF5E5 */ jal func_80B3D794 -/* 020A0 80B3E280 8FA5001C */ lw $a1, 0x001C($sp) -/* 020A4 80B3E284 8FBF0014 */ lw $ra, 0x0014($sp) -/* 020A8 80B3E288 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 020AC 80B3E28C 03E00008 */ jr $ra -/* 020B0 80B3E290 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E294.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E294.s deleted file mode 100644 index 2135ae99a9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E294.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80B3E294 -/* 020B4 80B3E294 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 020B8 80B3E298 AFBF001C */ sw $ra, 0x001C($sp) -/* 020BC 80B3E29C AFB10018 */ sw $s1, 0x0018($sp) -/* 020C0 80B3E2A0 AFB00014 */ sw $s0, 0x0014($sp) -/* 020C4 80B3E2A4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 020C8 80B3E2A8 0C2CF12C */ jal func_80B3C4B0 -/* 020CC 80B3E2AC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 020D0 80B3E2B0 AFA20024 */ sw $v0, 0x0024($sp) -/* 020D4 80B3E2B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 020D8 80B3E2B8 0C2CF11A */ jal func_80B3C468 -/* 020DC 80B3E2BC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 020E0 80B3E2C0 0C2CF0C7 */ jal func_80B3C31C -/* 020E4 80B3E2C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 020E8 80B3E2C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 020EC 80B3E2CC 0C2CF3E4 */ jal func_80B3CF90 -/* 020F0 80B3E2D0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 020F4 80B3E2D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 020F8 80B3E2D8 0C2CF405 */ jal func_80B3D014 -/* 020FC 80B3E2DC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02100 80B3E2E0 0C2CF456 */ jal func_80B3D158 -/* 02104 80B3E2E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02108 80B3E2E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0210C 80B3E2EC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02110 80B3E2F0 0C2CF629 */ jal func_80B3D8A4 -/* 02114 80B3E2F4 8FA60024 */ lw $a2, 0x0024($sp) -/* 02118 80B3E2F8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0211C 80B3E2FC 8FB00014 */ lw $s0, 0x0014($sp) -/* 02120 80B3E300 8FB10018 */ lw $s1, 0x0018($sp) -/* 02124 80B3E304 03E00008 */ jr $ra -/* 02128 80B3E308 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E30C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E30C.s deleted file mode 100644 index 5d113815dd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E30C.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B3E30C -/* 0212C 80B3E30C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02130 80B3E310 AFBF001C */ sw $ra, 0x001C($sp) -/* 02134 80B3E314 AFB00018 */ sw $s0, 0x0018($sp) -/* 02138 80B3E318 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0213C 80B3E31C 0C2CF55B */ jal func_80B3D56C -/* 02140 80B3E320 AFA50024 */ sw $a1, 0x0024($sp) -/* 02144 80B3E324 0C2CF12C */ jal func_80B3C4B0 -/* 02148 80B3E328 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0214C 80B3E32C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02150 80B3E330 0C2CF11A */ jal func_80B3C468 -/* 02154 80B3E334 8FA50024 */ lw $a1, 0x0024($sp) -/* 02158 80B3E338 0C2CF0C7 */ jal func_80B3C31C -/* 0215C 80B3E33C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02160 80B3E340 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02164 80B3E344 0C2CF3A1 */ jal func_80B3CE84 -/* 02168 80B3E348 8FA50024 */ lw $a1, 0x0024($sp) -/* 0216C 80B3E34C 0C2CF664 */ jal func_80B3D990 -/* 02170 80B3E350 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02174 80B3E354 8FBF001C */ lw $ra, 0x001C($sp) -/* 02178 80B3E358 8FB00018 */ lw $s0, 0x0018($sp) -/* 0217C 80B3E35C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02180 80B3E360 03E00008 */ jr $ra -/* 02184 80B3E364 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E368.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E368.s deleted file mode 100644 index 9cbdb07a5c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E368.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B3E368 -/* 02188 80B3E368 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0218C 80B3E36C AFBF001C */ sw $ra, 0x001C($sp) -/* 02190 80B3E370 AFB00018 */ sw $s0, 0x0018($sp) -/* 02194 80B3E374 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02198 80B3E378 0C2CF591 */ jal func_80B3D644 -/* 0219C 80B3E37C AFA50024 */ sw $a1, 0x0024($sp) -/* 021A0 80B3E380 0C2CF12C */ jal func_80B3C4B0 -/* 021A4 80B3E384 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021A8 80B3E388 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021AC 80B3E38C 0C2CF11A */ jal func_80B3C468 -/* 021B0 80B3E390 8FA50024 */ lw $a1, 0x0024($sp) -/* 021B4 80B3E394 0C2CF0C7 */ jal func_80B3C31C -/* 021B8 80B3E398 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021BC 80B3E39C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021C0 80B3E3A0 0C2CF3A1 */ jal func_80B3CE84 -/* 021C4 80B3E3A4 8FA50024 */ lw $a1, 0x0024($sp) -/* 021C8 80B3E3A8 0C2CF680 */ jal func_80B3DA00 -/* 021CC 80B3E3AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021D0 80B3E3B0 8FBF001C */ lw $ra, 0x001C($sp) -/* 021D4 80B3E3B4 8FB00018 */ lw $s0, 0x0018($sp) -/* 021D8 80B3E3B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 021DC 80B3E3BC 03E00008 */ jr $ra -/* 021E0 80B3E3C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E3C4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E3C4.s deleted file mode 100644 index f8b9505b50..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E3C4.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B3E3C4 -/* 021E4 80B3E3C4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 021E8 80B3E3C8 AFBF001C */ sw $ra, 0x001C($sp) -/* 021EC 80B3E3CC AFB00018 */ sw $s0, 0x0018($sp) -/* 021F0 80B3E3D0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 021F4 80B3E3D4 0C2CF599 */ jal func_80B3D664 -/* 021F8 80B3E3D8 AFA50024 */ sw $a1, 0x0024($sp) -/* 021FC 80B3E3DC 0C2CF12C */ jal func_80B3C4B0 -/* 02200 80B3E3E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02204 80B3E3E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02208 80B3E3E8 0C2CF11A */ jal func_80B3C468 -/* 0220C 80B3E3EC 8FA50024 */ lw $a1, 0x0024($sp) -/* 02210 80B3E3F0 0C2CF0C7 */ jal func_80B3C31C -/* 02214 80B3E3F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02218 80B3E3F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0221C 80B3E3FC 0C2CF3A1 */ jal func_80B3CE84 -/* 02220 80B3E400 8FA50024 */ lw $a1, 0x0024($sp) -/* 02224 80B3E404 0C2CF6AA */ jal func_80B3DAA8 -/* 02228 80B3E408 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0222C 80B3E40C 8FBF001C */ lw $ra, 0x001C($sp) -/* 02230 80B3E410 8FB00018 */ lw $s0, 0x0018($sp) -/* 02234 80B3E414 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02238 80B3E418 03E00008 */ jr $ra -/* 0223C 80B3E41C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E420.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E420.s deleted file mode 100644 index 6526137f73..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E420.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80B3E420 -/* 02240 80B3E420 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02244 80B3E424 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02248 80B3E428 AFA40018 */ sw $a0, 0x0018($sp) -/* 0224C 80B3E42C 0C2CF12C */ jal func_80B3C4B0 -/* 02250 80B3E430 AFA5001C */ sw $a1, 0x001C($sp) -/* 02254 80B3E434 8FA40018 */ lw $a0, 0x0018($sp) -/* 02258 80B3E438 0C2CF11A */ jal func_80B3C468 -/* 0225C 80B3E43C 8FA5001C */ lw $a1, 0x001C($sp) -/* 02260 80B3E440 0C2CF0C7 */ jal func_80B3C31C -/* 02264 80B3E444 8FA40018 */ lw $a0, 0x0018($sp) -/* 02268 80B3E448 8FA40018 */ lw $a0, 0x0018($sp) -/* 0226C 80B3E44C 0C2CF6BC */ jal func_80B3DAF0 -/* 02270 80B3E450 8FA5001C */ lw $a1, 0x001C($sp) -/* 02274 80B3E454 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02278 80B3E458 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0227C 80B3E45C 03E00008 */ jr $ra -/* 02280 80B3E460 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E464.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E464.s deleted file mode 100644 index 5d61ca9b78..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E464.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B3E464 -/* 02284 80B3E464 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02288 80B3E468 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0228C 80B3E46C AFA40020 */ sw $a0, 0x0020($sp) -/* 02290 80B3E470 0C2CF12C */ jal func_80B3C4B0 -/* 02294 80B3E474 AFA50024 */ sw $a1, 0x0024($sp) -/* 02298 80B3E478 AFA2001C */ sw $v0, 0x001C($sp) -/* 0229C 80B3E47C 8FA40020 */ lw $a0, 0x0020($sp) -/* 022A0 80B3E480 0C2CF11A */ jal func_80B3C468 -/* 022A4 80B3E484 8FA50024 */ lw $a1, 0x0024($sp) -/* 022A8 80B3E488 0C2CF0C7 */ jal func_80B3C31C -/* 022AC 80B3E48C 8FA40020 */ lw $a0, 0x0020($sp) -/* 022B0 80B3E490 8FA40020 */ lw $a0, 0x0020($sp) -/* 022B4 80B3E494 0C2CF6EB */ jal func_80B3DBAC -/* 022B8 80B3E498 8FA5001C */ lw $a1, 0x001C($sp) -/* 022BC 80B3E49C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 022C0 80B3E4A0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 022C4 80B3E4A4 03E00008 */ jr $ra -/* 022C8 80B3E4A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E4AC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E4AC.s deleted file mode 100644 index 558715dd3c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E4AC.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B3E4AC -/* 022CC 80B3E4AC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 022D0 80B3E4B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 022D4 80B3E4B4 AFA40020 */ sw $a0, 0x0020($sp) -/* 022D8 80B3E4B8 0C2CF12C */ jal func_80B3C4B0 -/* 022DC 80B3E4BC AFA50024 */ sw $a1, 0x0024($sp) -/* 022E0 80B3E4C0 AFA2001C */ sw $v0, 0x001C($sp) -/* 022E4 80B3E4C4 8FA40020 */ lw $a0, 0x0020($sp) -/* 022E8 80B3E4C8 0C2CF11A */ jal func_80B3C468 -/* 022EC 80B3E4CC 8FA50024 */ lw $a1, 0x0024($sp) -/* 022F0 80B3E4D0 0C2CF0C7 */ jal func_80B3C31C -/* 022F4 80B3E4D4 8FA40020 */ lw $a0, 0x0020($sp) -/* 022F8 80B3E4D8 8FA40020 */ lw $a0, 0x0020($sp) -/* 022FC 80B3E4DC 8FA50024 */ lw $a1, 0x0024($sp) -/* 02300 80B3E4E0 0C2CF709 */ jal func_80B3DC24 -/* 02304 80B3E4E4 8FA6001C */ lw $a2, 0x001C($sp) -/* 02308 80B3E4E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0230C 80B3E4EC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02310 80B3E4F0 03E00008 */ jr $ra -/* 02314 80B3E4F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E4F8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E4F8.s deleted file mode 100644 index ab0e994846..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E4F8.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80B3E4F8 -/* 02318 80B3E4F8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0231C 80B3E4FC AFBF0014 */ sw $ra, 0x0014($sp) -/* 02320 80B3E500 AFA40018 */ sw $a0, 0x0018($sp) -/* 02324 80B3E504 0C2CF12C */ jal func_80B3C4B0 -/* 02328 80B3E508 AFA5001C */ sw $a1, 0x001C($sp) -/* 0232C 80B3E50C 8FA40018 */ lw $a0, 0x0018($sp) -/* 02330 80B3E510 0C2CF11A */ jal func_80B3C468 -/* 02334 80B3E514 8FA5001C */ lw $a1, 0x001C($sp) -/* 02338 80B3E518 0C2CF0C7 */ jal func_80B3C31C -/* 0233C 80B3E51C 8FA40018 */ lw $a0, 0x0018($sp) -/* 02340 80B3E520 8FA40018 */ lw $a0, 0x0018($sp) -/* 02344 80B3E524 0C2CF72A */ jal func_80B3DCA8 -/* 02348 80B3E528 8FA5001C */ lw $a1, 0x001C($sp) -/* 0234C 80B3E52C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02350 80B3E530 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02354 80B3E534 03E00008 */ jr $ra -/* 02358 80B3E538 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E53C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E53C.s deleted file mode 100644 index c21d683653..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E53C.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80B3E53C -/* 0235C 80B3E53C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02360 80B3E540 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02364 80B3E544 AFA40018 */ sw $a0, 0x0018($sp) -/* 02368 80B3E548 0C2CF12C */ jal func_80B3C4B0 -/* 0236C 80B3E54C AFA5001C */ sw $a1, 0x001C($sp) -/* 02370 80B3E550 8FA40018 */ lw $a0, 0x0018($sp) -/* 02374 80B3E554 0C2CF11A */ jal func_80B3C468 -/* 02378 80B3E558 8FA5001C */ lw $a1, 0x001C($sp) -/* 0237C 80B3E55C 0C2CF0C7 */ jal func_80B3C31C -/* 02380 80B3E560 8FA40018 */ lw $a0, 0x0018($sp) -/* 02384 80B3E564 8FA40018 */ lw $a0, 0x0018($sp) -/* 02388 80B3E568 0C2CF74F */ jal func_80B3DD3C -/* 0238C 80B3E56C 8FA5001C */ lw $a1, 0x001C($sp) -/* 02390 80B3E570 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02394 80B3E574 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02398 80B3E578 03E00008 */ jr $ra -/* 0239C 80B3E57C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E580.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E580.s deleted file mode 100644 index 1f76a97ea0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E580.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B3E580 -/* 023A0 80B3E580 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 023A4 80B3E584 AFBF0014 */ sw $ra, 0x0014($sp) -/* 023A8 80B3E588 AFA40020 */ sw $a0, 0x0020($sp) -/* 023AC 80B3E58C 0C2CF12C */ jal func_80B3C4B0 -/* 023B0 80B3E590 AFA50024 */ sw $a1, 0x0024($sp) -/* 023B4 80B3E594 AFA2001C */ sw $v0, 0x001C($sp) -/* 023B8 80B3E598 8FA40020 */ lw $a0, 0x0020($sp) -/* 023BC 80B3E59C 0C2CF11A */ jal func_80B3C468 -/* 023C0 80B3E5A0 8FA50024 */ lw $a1, 0x0024($sp) -/* 023C4 80B3E5A4 0C2CF0C7 */ jal func_80B3C31C -/* 023C8 80B3E5A8 8FA40020 */ lw $a0, 0x0020($sp) -/* 023CC 80B3E5AC 8FA40020 */ lw $a0, 0x0020($sp) -/* 023D0 80B3E5B0 0C2CF780 */ jal func_80B3DE00 -/* 023D4 80B3E5B4 8FA5001C */ lw $a1, 0x001C($sp) -/* 023D8 80B3E5B8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 023DC 80B3E5BC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 023E0 80B3E5C0 03E00008 */ jr $ra -/* 023E4 80B3E5C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E5C8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E5C8.s deleted file mode 100644 index f334ed0fa7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E5C8.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B3E5C8 -/* 023E8 80B3E5C8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 023EC 80B3E5CC AFBF0014 */ sw $ra, 0x0014($sp) -/* 023F0 80B3E5D0 AFA40020 */ sw $a0, 0x0020($sp) -/* 023F4 80B3E5D4 0C2CF12C */ jal func_80B3C4B0 -/* 023F8 80B3E5D8 AFA50024 */ sw $a1, 0x0024($sp) -/* 023FC 80B3E5DC AFA2001C */ sw $v0, 0x001C($sp) -/* 02400 80B3E5E0 8FA40020 */ lw $a0, 0x0020($sp) -/* 02404 80B3E5E4 0C2CF11A */ jal func_80B3C468 -/* 02408 80B3E5E8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0240C 80B3E5EC 0C2CF0C7 */ jal func_80B3C31C -/* 02410 80B3E5F0 8FA40020 */ lw $a0, 0x0020($sp) -/* 02414 80B3E5F4 8FA40020 */ lw $a0, 0x0020($sp) -/* 02418 80B3E5F8 0C2CF79E */ jal func_80B3DE78 -/* 0241C 80B3E5FC 8FA5001C */ lw $a1, 0x001C($sp) -/* 02420 80B3E600 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02424 80B3E604 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02428 80B3E608 03E00008 */ jr $ra -/* 0242C 80B3E60C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E610.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E610.s deleted file mode 100644 index 6cd083d014..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E610.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B3E610 -/* 02430 80B3E610 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02434 80B3E614 AFBF001C */ sw $ra, 0x001C($sp) -/* 02438 80B3E618 AFB00018 */ sw $s0, 0x0018($sp) -/* 0243C 80B3E61C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02440 80B3E620 0C2CF12C */ jal func_80B3C4B0 -/* 02444 80B3E624 AFA50024 */ sw $a1, 0x0024($sp) -/* 02448 80B3E628 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0244C 80B3E62C 0C2CF11A */ jal func_80B3C468 -/* 02450 80B3E630 8FA50024 */ lw $a1, 0x0024($sp) -/* 02454 80B3E634 0C2CF0C7 */ jal func_80B3C31C -/* 02458 80B3E638 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0245C 80B3E63C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02460 80B3E640 0C2CF4FC */ jal func_80B3D3F0 -/* 02464 80B3E644 8FA50024 */ lw $a1, 0x0024($sp) -/* 02468 80B3E648 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0246C 80B3E64C 0C2CF7BD */ jal func_80B3DEF4 -/* 02470 80B3E650 8FA50024 */ lw $a1, 0x0024($sp) -/* 02474 80B3E654 8FBF001C */ lw $ra, 0x001C($sp) -/* 02478 80B3E658 8FB00018 */ lw $s0, 0x0018($sp) -/* 0247C 80B3E65C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02480 80B3E660 03E00008 */ jr $ra -/* 02484 80B3E664 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E668.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E668.s deleted file mode 100644 index 7653390d32..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E668.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80B3E668 -/* 02488 80B3E668 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0248C 80B3E66C AFBF001C */ sw $ra, 0x001C($sp) -/* 02490 80B3E670 AFB00018 */ sw $s0, 0x0018($sp) -/* 02494 80B3E674 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02498 80B3E678 0C2CF5BC */ jal func_80B3D6F0 -/* 0249C 80B3E67C AFA50024 */ sw $a1, 0x0024($sp) -/* 024A0 80B3E680 0C2CF12C */ jal func_80B3C4B0 -/* 024A4 80B3E684 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 024A8 80B3E688 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 024AC 80B3E68C 0C2CF11A */ jal func_80B3C468 -/* 024B0 80B3E690 8FA50024 */ lw $a1, 0x0024($sp) -/* 024B4 80B3E694 0C2CF0C7 */ jal func_80B3C31C -/* 024B8 80B3E698 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 024BC 80B3E69C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 024C0 80B3E6A0 0C2CF3A1 */ jal func_80B3CE84 -/* 024C4 80B3E6A4 8FA50024 */ lw $a1, 0x0024($sp) -/* 024C8 80B3E6A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 024CC 80B3E6AC 0C2CF4FC */ jal func_80B3D3F0 -/* 024D0 80B3E6B0 8FA50024 */ lw $a1, 0x0024($sp) -/* 024D4 80B3E6B4 0C2CF7E9 */ jal func_80B3DFA4 -/* 024D8 80B3E6B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 024DC 80B3E6BC 8FBF001C */ lw $ra, 0x001C($sp) -/* 024E0 80B3E6C0 8FB00018 */ lw $s0, 0x0018($sp) -/* 024E4 80B3E6C4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 024E8 80B3E6C8 03E00008 */ jr $ra -/* 024EC 80B3E6CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E6D0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E6D0.s deleted file mode 100644 index 48aa9c7f77..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E6D0.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80B3E6D0 -/* 024F0 80B3E6D0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 024F4 80B3E6D4 AFBF001C */ sw $ra, 0x001C($sp) -/* 024F8 80B3E6D8 AFB00018 */ sw $s0, 0x0018($sp) -/* 024FC 80B3E6DC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02500 80B3E6E0 0C2CF5C4 */ jal func_80B3D710 -/* 02504 80B3E6E4 AFA50024 */ sw $a1, 0x0024($sp) -/* 02508 80B3E6E8 0C2CF12C */ jal func_80B3C4B0 -/* 0250C 80B3E6EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02510 80B3E6F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02514 80B3E6F4 0C2CF11A */ jal func_80B3C468 -/* 02518 80B3E6F8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0251C 80B3E6FC 0C2CF0C7 */ jal func_80B3C31C -/* 02520 80B3E700 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02524 80B3E704 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02528 80B3E708 0C2CF3A1 */ jal func_80B3CE84 -/* 0252C 80B3E70C 8FA50024 */ lw $a1, 0x0024($sp) -/* 02530 80B3E710 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02534 80B3E714 0C2CF4FC */ jal func_80B3D3F0 -/* 02538 80B3E718 8FA50024 */ lw $a1, 0x0024($sp) -/* 0253C 80B3E71C 0C2CF805 */ jal func_80B3E014 -/* 02540 80B3E720 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02544 80B3E724 8FBF001C */ lw $ra, 0x001C($sp) -/* 02548 80B3E728 8FB00018 */ lw $s0, 0x0018($sp) -/* 0254C 80B3E72C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02550 80B3E730 03E00008 */ jr $ra -/* 02554 80B3E734 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E738.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E738.s deleted file mode 100644 index 6e31fe33fd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E738.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80B3E738 -/* 02558 80B3E738 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0255C 80B3E73C AFBF001C */ sw $ra, 0x001C($sp) -/* 02560 80B3E740 AFB00018 */ sw $s0, 0x0018($sp) -/* 02564 80B3E744 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02568 80B3E748 0C2CF5CC */ jal func_80B3D730 -/* 0256C 80B3E74C AFA50024 */ sw $a1, 0x0024($sp) -/* 02570 80B3E750 0C2CF12C */ jal func_80B3C4B0 -/* 02574 80B3E754 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02578 80B3E758 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0257C 80B3E75C 0C2CF11A */ jal func_80B3C468 -/* 02580 80B3E760 8FA50024 */ lw $a1, 0x0024($sp) -/* 02584 80B3E764 0C2CF0C7 */ jal func_80B3C31C -/* 02588 80B3E768 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0258C 80B3E76C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02590 80B3E770 0C2CF3A1 */ jal func_80B3CE84 -/* 02594 80B3E774 8FA50024 */ lw $a1, 0x0024($sp) -/* 02598 80B3E778 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0259C 80B3E77C 0C2CF4FC */ jal func_80B3D3F0 -/* 025A0 80B3E780 8FA50024 */ lw $a1, 0x0024($sp) -/* 025A4 80B3E784 0C2CF82F */ jal func_80B3E0BC -/* 025A8 80B3E788 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025AC 80B3E78C 8FBF001C */ lw $ra, 0x001C($sp) -/* 025B0 80B3E790 8FB00018 */ lw $s0, 0x0018($sp) -/* 025B4 80B3E794 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 025B8 80B3E798 03E00008 */ jr $ra -/* 025BC 80B3E79C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E7A0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E7A0.s deleted file mode 100644 index 8309a694e4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E7A0.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80B3E7A0 -/* 025C0 80B3E7A0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 025C4 80B3E7A4 AFBF001C */ sw $ra, 0x001C($sp) -/* 025C8 80B3E7A8 AFB00018 */ sw $s0, 0x0018($sp) -/* 025CC 80B3E7AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 025D0 80B3E7B0 0C2CF12C */ jal func_80B3C4B0 -/* 025D4 80B3E7B4 AFA50024 */ sw $a1, 0x0024($sp) -/* 025D8 80B3E7B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025DC 80B3E7BC 0C2CF11A */ jal func_80B3C468 -/* 025E0 80B3E7C0 8FA50024 */ lw $a1, 0x0024($sp) -/* 025E4 80B3E7C4 0C2CF0C7 */ jal func_80B3C31C -/* 025E8 80B3E7C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025EC 80B3E7CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025F0 80B3E7D0 0C2CF3C1 */ jal func_80B3CF04 -/* 025F4 80B3E7D4 8FA50024 */ lw $a1, 0x0024($sp) -/* 025F8 80B3E7D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025FC 80B3E7DC 0C2CF4FC */ jal func_80B3D3F0 -/* 02600 80B3E7E0 8FA50024 */ lw $a1, 0x0024($sp) -/* 02604 80B3E7E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02608 80B3E7E8 0C2CF859 */ jal func_80B3E164 -/* 0260C 80B3E7EC 8FA50024 */ lw $a1, 0x0024($sp) -/* 02610 80B3E7F0 8FBF001C */ lw $ra, 0x001C($sp) -/* 02614 80B3E7F4 8FB00018 */ lw $s0, 0x0018($sp) -/* 02618 80B3E7F8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0261C 80B3E7FC 03E00008 */ jr $ra -/* 02620 80B3E800 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E804.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E804.s deleted file mode 100644 index a9e4fca5df..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E804.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B3E804 -/* 02624 80B3E804 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02628 80B3E808 AFBF001C */ sw $ra, 0x001C($sp) -/* 0262C 80B3E80C AFB00018 */ sw $s0, 0x0018($sp) -/* 02630 80B3E810 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02634 80B3E814 0C2CF12C */ jal func_80B3C4B0 -/* 02638 80B3E818 AFA50024 */ sw $a1, 0x0024($sp) -/* 0263C 80B3E81C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02640 80B3E820 0C2CF11A */ jal func_80B3C468 -/* 02644 80B3E824 8FA50024 */ lw $a1, 0x0024($sp) -/* 02648 80B3E828 0C2CF0C7 */ jal func_80B3C31C -/* 0264C 80B3E82C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02650 80B3E830 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02654 80B3E834 0C2CF4FC */ jal func_80B3D3F0 -/* 02658 80B3E838 8FA50024 */ lw $a1, 0x0024($sp) -/* 0265C 80B3E83C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02660 80B3E840 0C2CF86E */ jal func_80B3E1B8 -/* 02664 80B3E844 8FA50024 */ lw $a1, 0x0024($sp) -/* 02668 80B3E848 8FBF001C */ lw $ra, 0x001C($sp) -/* 0266C 80B3E84C 8FB00018 */ lw $s0, 0x0018($sp) -/* 02670 80B3E850 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02674 80B3E854 03E00008 */ jr $ra -/* 02678 80B3E858 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E85C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E85C.s deleted file mode 100644 index b8d515047f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E85C.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80B3E85C -/* 0267C 80B3E85C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02680 80B3E860 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02684 80B3E864 0C2CF4FC */ jal func_80B3D3F0 -/* 02688 80B3E868 00000000 */ nop -/* 0268C 80B3E86C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02690 80B3E870 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02694 80B3E874 03E00008 */ jr $ra -/* 02698 80B3E878 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E87C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E87C.s deleted file mode 100644 index c263db1243..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E87C.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80B3E87C -/* 0269C 80B3E87C 3C014208 */ lui $at, 0x4208 ## $at = 42080000 -/* 026A0 80B3E880 C4A00164 */ lwc1 $f0, 0x0164($a1) ## 00000164 -/* 026A4 80B3E884 44812000 */ mtc1 $at, $f4 ## $f4 = 34.00 -/* 026A8 80B3E888 3C0E0601 */ lui $t6, %hi(D_06011150) ## $t6 = 06010000 -/* 026AC 80B3E88C 25CE1150 */ addiu $t6, $t6, %lo(D_06011150) ## $t6 = 06011150 -/* 026B0 80B3E890 4600203E */ c.le.s $f4, $f0 -/* 026B4 80B3E894 00000000 */ nop -/* 026B8 80B3E898 45000002 */ bc1f .L80B3E8A4 -/* 026BC 80B3E89C 00000000 */ nop -/* 026C0 80B3E8A0 AC8E0000 */ sw $t6, 0x0000($a0) ## 00000000 -.L80B3E8A4: -/* 026C4 80B3E8A4 03E00008 */ jr $ra -/* 026C8 80B3E8A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E8AC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E8AC.s deleted file mode 100644 index 6056137e11..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E8AC.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80B3E8AC -/* 026CC 80B3E8AC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 026D0 80B3E8B0 AFA40018 */ sw $a0, 0x0018($sp) -/* 026D4 80B3E8B4 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 026D8 80B3E8B8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 026DC 80B3E8BC AFBF0014 */ sw $ra, 0x0014($sp) -/* 026E0 80B3E8C0 14A10003 */ bne $a1, $at, .L80B3E8D0 -/* 026E4 80B3E8C4 AFA70024 */ sw $a3, 0x0024($sp) -/* 026E8 80B3E8C8 0C2CFA1F */ jal func_80B3E87C -/* 026EC 80B3E8CC 8FA5002C */ lw $a1, 0x002C($sp) -.L80B3E8D0: -/* 026F0 80B3E8D0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 026F4 80B3E8D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 026F8 80B3E8D8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 026FC 80B3E8DC 03E00008 */ jr $ra -/* 02700 80B3E8E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E8E4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E8E4.s deleted file mode 100644 index f979859946..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E8E4.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B3E8E4 -/* 02704 80B3E8E4 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 02708 80B3E8E8 AFA40000 */ sw $a0, 0x0000($sp) -/* 0270C 80B3E8EC 14A10004 */ bne $a1, $at, .L80B3E900 -/* 02710 80B3E8F0 AFA7000C */ sw $a3, 0x000C($sp) -/* 02714 80B3E8F4 3C0E0601 */ lui $t6, %hi(D_06011150) ## $t6 = 06010000 -/* 02718 80B3E8F8 25CE1150 */ addiu $t6, $t6, %lo(D_06011150) ## $t6 = 06011150 -/* 0271C 80B3E8FC ACCE0000 */ sw $t6, 0x0000($a2) ## 00000000 -.L80B3E900: -/* 02720 80B3E900 03E00008 */ jr $ra -/* 02724 80B3E904 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E908.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E908.s deleted file mode 100644 index c96d2b2746..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E908.s +++ /dev/null @@ -1,104 +0,0 @@ -.rdata -glabel D_80B42010 - .asciz "../z_en_oA2_inSpot05.c" - .balign 4 - -glabel D_80B42028 - .asciz "../z_en_oA2_inSpot05.c" - .balign 4 - -.text -glabel func_80B3E908 -/* 02728 80B3E908 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 0272C 80B3E90C AFBF002C */ sw $ra, 0x002C($sp) -/* 02730 80B3E910 AFB00028 */ sw $s0, 0x0028($sp) -/* 02734 80B3E914 AFA40080 */ sw $a0, 0x0080($sp) -/* 02738 80B3E918 AFA50084 */ sw $a1, 0x0084($sp) -/* 0273C 80B3E91C 8482025C */ lh $v0, 0x025C($a0) ## 0000025C -/* 02740 80B3E920 3C0880B4 */ lui $t0, %hi(D_80B41D6C) ## $t0 = 80B40000 -/* 02744 80B3E924 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 -/* 02748 80B3E928 00027880 */ sll $t7, $v0, 2 -/* 0274C 80B3E92C 010F4021 */ addu $t0, $t0, $t7 -/* 02750 80B3E930 8D081D6C */ lw $t0, %lo(D_80B41D6C)($t0) -/* 02754 80B3E934 3C0680B4 */ lui $a2, %hi(D_80B42010) ## $a2 = 80B40000 -/* 02758 80B3E938 24C62010 */ addiu $a2, $a2, %lo(D_80B42010) ## $a2 = 80B42010 -/* 0275C 80B3E93C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD0 -/* 02760 80B3E940 240705A4 */ addiu $a3, $zero, 0x05A4 ## $a3 = 000005A4 -/* 02764 80B3E944 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02768 80B3E948 0C031AB1 */ jal Graph_OpenDisps -/* 0276C 80B3E94C AFA80070 */ sw $t0, 0x0070($sp) -/* 02770 80B3E950 8FA80070 */ lw $t0, 0x0070($sp) -/* 02774 80B3E954 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 02778 80B3E958 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 -/* 0277C 80B3E95C 00085100 */ sll $t2, $t0, 4 -/* 02780 80B3E960 000A5F02 */ srl $t3, $t2, 28 -/* 02784 80B3E964 3C0D8016 */ lui $t5, %hi(gSegments) -/* 02788 80B3E968 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 0278C 80B3E96C AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 02790 80B3E970 25AD6FA8 */ addiu $t5, %lo(gSegments) -/* 02794 80B3E974 000B6080 */ sll $t4, $t3, 2 -/* 02798 80B3E978 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 -/* 0279C 80B3E97C 018D2021 */ addu $a0, $t4, $t5 -/* 027A0 80B3E980 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 027A4 80B3E984 8C8E0000 */ lw $t6, 0x0000($a0) ## 00000000 -/* 027A8 80B3E988 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 027AC 80B3E98C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 027B0 80B3E990 01012824 */ and $a1, $t0, $at -/* 027B4 80B3E994 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 027B8 80B3E998 01C57821 */ addu $t7, $t6, $a1 -/* 027BC 80B3E99C 01E6C021 */ addu $t8, $t7, $a2 -/* 027C0 80B3E9A0 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 027C4 80B3E9A4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 027C8 80B3E9A8 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 -/* 027CC 80B3E9AC 35290024 */ ori $t1, $t1, 0x0024 ## $t1 = DB060024 -/* 027D0 80B3E9B0 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 027D4 80B3E9B4 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 027D8 80B3E9B8 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 027DC 80B3E9BC 8C8A0000 */ lw $t2, 0x0000($a0) ## 00000000 -/* 027E0 80B3E9C0 3C0FFFFF */ lui $t7, 0xFFFF ## $t7 = FFFF0000 -/* 027E4 80B3E9C4 35EF1400 */ ori $t7, $t7, 0x1400 ## $t7 = FFFF1400 -/* 027E8 80B3E9C8 01455821 */ addu $t3, $t2, $a1 -/* 027EC 80B3E9CC 01666021 */ addu $t4, $t3, $a2 -/* 027F0 80B3E9D0 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 027F4 80B3E9D4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 027F8 80B3E9D8 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 -/* 027FC 80B3E9DC 3C093C00 */ lui $t1, 0x3C00 ## $t1 = 3C000000 -/* 02800 80B3E9E0 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 02804 80B3E9E4 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 02808 80B3E9E8 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 0280C 80B3E9EC AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 02810 80B3E9F0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 02814 80B3E9F4 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 02818 80B3E9F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0281C 80B3E9FC 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 02820 80B3EA00 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 02824 80B3EA04 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 02828 80B3EA08 0C024F46 */ jal func_80093D18 -/* 0282C 80B3EA0C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 02830 80B3EA10 8FA40080 */ lw $a0, 0x0080($sp) -/* 02834 80B3EA14 8FA50084 */ lw $a1, 0x0084($sp) -/* 02838 80B3EA18 0C00BAF3 */ jal func_8002EBCC -/* 0283C 80B3EA1C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02840 80B3EA20 8FAA0080 */ lw $t2, 0x0080($sp) -/* 02844 80B3EA24 3C0B80B4 */ lui $t3, %hi(func_80B3E8AC) ## $t3 = 80B40000 -/* 02848 80B3EA28 256BE8AC */ addiu $t3, $t3, %lo(func_80B3E8AC) ## $t3 = 80B3E8AC -/* 0284C 80B3EA2C 2542014C */ addiu $v0, $t2, 0x014C ## $v0 = 0000014C -/* 02850 80B3EA30 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 02854 80B3EA34 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 02858 80B3EA38 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 0285C 80B3EA3C AFA00014 */ sw $zero, 0x0014($sp) -/* 02860 80B3EA40 AFAB0010 */ sw $t3, 0x0010($sp) -/* 02864 80B3EA44 8FA40084 */ lw $a0, 0x0084($sp) -/* 02868 80B3EA48 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 0286C 80B3EA4C AFAA0018 */ sw $t2, 0x0018($sp) -/* 02870 80B3EA50 3C0680B4 */ lui $a2, %hi(D_80B42028) ## $a2 = 80B40000 -/* 02874 80B3EA54 24C62028 */ addiu $a2, $a2, %lo(D_80B42028) ## $a2 = 80B42028 -/* 02878 80B3EA58 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD0 -/* 0287C 80B3EA5C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02880 80B3EA60 0C031AD5 */ jal Graph_CloseDisps -/* 02884 80B3EA64 240705D9 */ addiu $a3, $zero, 0x05D9 ## $a3 = 000005D9 -/* 02888 80B3EA68 8FBF002C */ lw $ra, 0x002C($sp) -/* 0288C 80B3EA6C 8FB00028 */ lw $s0, 0x0028($sp) -/* 02890 80B3EA70 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 02894 80B3EA74 03E00008 */ jr $ra -/* 02898 80B3EA78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EA7C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EA7C.s deleted file mode 100644 index 0ff600b9a3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EA7C.s +++ /dev/null @@ -1,104 +0,0 @@ -.rdata -glabel D_80B42040 - .asciz "../z_en_oA2_inSpot05.c" - .balign 4 - -glabel D_80B42058 - .asciz "../z_en_oA2_inSpot05.c" - .balign 4 - -.text -glabel func_80B3EA7C -/* 0289C 80B3EA7C 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 028A0 80B3EA80 AFBF002C */ sw $ra, 0x002C($sp) -/* 028A4 80B3EA84 AFB00028 */ sw $s0, 0x0028($sp) -/* 028A8 80B3EA88 AFA40080 */ sw $a0, 0x0080($sp) -/* 028AC 80B3EA8C AFA50084 */ sw $a1, 0x0084($sp) -/* 028B0 80B3EA90 8482025C */ lh $v0, 0x025C($a0) ## 0000025C -/* 028B4 80B3EA94 3C0880B4 */ lui $t0, %hi(D_80B41D6C) ## $t0 = 80B40000 -/* 028B8 80B3EA98 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 -/* 028BC 80B3EA9C 00027880 */ sll $t7, $v0, 2 -/* 028C0 80B3EAA0 010F4021 */ addu $t0, $t0, $t7 -/* 028C4 80B3EAA4 8D081D6C */ lw $t0, %lo(D_80B41D6C)($t0) -/* 028C8 80B3EAA8 3C0680B4 */ lui $a2, %hi(D_80B42040) ## $a2 = 80B40000 -/* 028CC 80B3EAAC 24C62040 */ addiu $a2, $a2, %lo(D_80B42040) ## $a2 = 80B42040 -/* 028D0 80B3EAB0 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD0 -/* 028D4 80B3EAB4 240705E7 */ addiu $a3, $zero, 0x05E7 ## $a3 = 000005E7 -/* 028D8 80B3EAB8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 028DC 80B3EABC 0C031AB1 */ jal Graph_OpenDisps -/* 028E0 80B3EAC0 AFA80070 */ sw $t0, 0x0070($sp) -/* 028E4 80B3EAC4 8FA80070 */ lw $t0, 0x0070($sp) -/* 028E8 80B3EAC8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 028EC 80B3EACC 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 -/* 028F0 80B3EAD0 00085100 */ sll $t2, $t0, 4 -/* 028F4 80B3EAD4 000A5F02 */ srl $t3, $t2, 28 -/* 028F8 80B3EAD8 3C0D8016 */ lui $t5, %hi(gSegments) -/* 028FC 80B3EADC 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 02900 80B3EAE0 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 02904 80B3EAE4 25AD6FA8 */ addiu $t5, %lo(gSegments) -/* 02908 80B3EAE8 000B6080 */ sll $t4, $t3, 2 -/* 0290C 80B3EAEC 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 -/* 02910 80B3EAF0 018D2021 */ addu $a0, $t4, $t5 -/* 02914 80B3EAF4 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 02918 80B3EAF8 8C8E0000 */ lw $t6, 0x0000($a0) ## 00000000 -/* 0291C 80B3EAFC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 02920 80B3EB00 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 02924 80B3EB04 01012824 */ and $a1, $t0, $at -/* 02928 80B3EB08 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 0292C 80B3EB0C 01C57821 */ addu $t7, $t6, $a1 -/* 02930 80B3EB10 01E6C021 */ addu $t8, $t7, $a2 -/* 02934 80B3EB14 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 02938 80B3EB18 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0293C 80B3EB1C 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 -/* 02940 80B3EB20 35290024 */ ori $t1, $t1, 0x0024 ## $t1 = DB060024 -/* 02944 80B3EB24 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 02948 80B3EB28 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 0294C 80B3EB2C AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 02950 80B3EB30 8C8A0000 */ lw $t2, 0x0000($a0) ## 00000000 -/* 02954 80B3EB34 3C0FFFFF */ lui $t7, 0xFFFF ## $t7 = FFFF0000 -/* 02958 80B3EB38 35EF1400 */ ori $t7, $t7, 0x1400 ## $t7 = FFFF1400 -/* 0295C 80B3EB3C 01455821 */ addu $t3, $t2, $a1 -/* 02960 80B3EB40 01666021 */ addu $t4, $t3, $a2 -/* 02964 80B3EB44 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 02968 80B3EB48 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0296C 80B3EB4C 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 -/* 02970 80B3EB50 3C093C00 */ lui $t1, 0x3C00 ## $t1 = 3C000000 -/* 02974 80B3EB54 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 02978 80B3EB58 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 0297C 80B3EB5C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 02980 80B3EB60 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 02984 80B3EB64 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 02988 80B3EB68 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 0298C 80B3EB6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02990 80B3EB70 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 02994 80B3EB74 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 02998 80B3EB78 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 0299C 80B3EB7C 0C024F46 */ jal func_80093D18 -/* 029A0 80B3EB80 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 029A4 80B3EB84 8FA40080 */ lw $a0, 0x0080($sp) -/* 029A8 80B3EB88 8FA50084 */ lw $a1, 0x0084($sp) -/* 029AC 80B3EB8C 0C00BAF3 */ jal func_8002EBCC -/* 029B0 80B3EB90 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 029B4 80B3EB94 8FAA0080 */ lw $t2, 0x0080($sp) -/* 029B8 80B3EB98 3C0B80B4 */ lui $t3, %hi(func_80B3E8E4) ## $t3 = 80B40000 -/* 029BC 80B3EB9C 256BE8E4 */ addiu $t3, $t3, %lo(func_80B3E8E4) ## $t3 = 80B3E8E4 -/* 029C0 80B3EBA0 2542014C */ addiu $v0, $t2, 0x014C ## $v0 = 0000014C -/* 029C4 80B3EBA4 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 029C8 80B3EBA8 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 029CC 80B3EBAC 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 029D0 80B3EBB0 AFA00014 */ sw $zero, 0x0014($sp) -/* 029D4 80B3EBB4 AFAB0010 */ sw $t3, 0x0010($sp) -/* 029D8 80B3EBB8 8FA40084 */ lw $a0, 0x0084($sp) -/* 029DC 80B3EBBC 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 029E0 80B3EBC0 AFAA0018 */ sw $t2, 0x0018($sp) -/* 029E4 80B3EBC4 3C0680B4 */ lui $a2, %hi(D_80B42058) ## $a2 = 80B40000 -/* 029E8 80B3EBC8 24C62058 */ addiu $a2, $a2, %lo(D_80B42058) ## $a2 = 80B42058 -/* 029EC 80B3EBCC 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD0 -/* 029F0 80B3EBD0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 029F4 80B3EBD4 0C031AD5 */ jal Graph_CloseDisps -/* 029F8 80B3EBD8 2407061C */ addiu $a3, $zero, 0x061C ## $a3 = 0000061C -/* 029FC 80B3EBDC 8FBF002C */ lw $ra, 0x002C($sp) -/* 02A00 80B3EBE0 8FB00028 */ lw $s0, 0x0028($sp) -/* 02A04 80B3EBE4 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 02A08 80B3EBE8 03E00008 */ jr $ra -/* 02A0C 80B3EBEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EBF0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EBF0.s deleted file mode 100644 index cee7fdb052..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EBF0.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80B3EBF0 -/* 02A10 80B3EBF0 AFA50004 */ sw $a1, 0x0004($sp) -/* 02A14 80B3EBF4 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 -/* 02A18 80B3EBF8 03E00008 */ jr $ra -/* 02A1C 80B3EBFC AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EC00.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EC00.s deleted file mode 100644 index c2da82bd3e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EC00.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80B3EC00 -/* 02A20 80B3EC00 240E0015 */ addiu $t6, $zero, 0x0015 ## $t6 = 00000015 -/* 02A24 80B3EC04 03E00008 */ jr $ra -/* 02A28 80B3EC08 AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EC0C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EC0C.s deleted file mode 100644 index abe88654d7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EC0C.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80B3EC0C -/* 02A2C 80B3EC0C 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 02A30 80B3EC10 11C0001D */ beq $t6, $zero, .L80B3EC88 -/* 02A34 80B3EC14 00000000 */ nop -/* 02A38 80B3EC18 8CA21D9C */ lw $v0, 0x1D9C($a1) ## 00001D9C -/* 02A3C 80B3EC1C 1040001A */ beq $v0, $zero, .L80B3EC88 -/* 02A40 80B3EC20 00000000 */ nop -/* 02A44 80B3EC24 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 02A48 80B3EC28 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02A4C 80B3EC2C 10AF0016 */ beq $a1, $t7, .L80B3EC88 -/* 02A50 80B3EC30 00000000 */ nop -/* 02A54 80B3EC34 8C58000C */ lw $t8, 0x000C($v0) ## 0000000C -/* 02A58 80B3EC38 24090016 */ addiu $t1, $zero, 0x0016 ## $t1 = 00000016 -/* 02A5C 80B3EC3C 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 02A60 80B3EC40 00000000 */ nop -/* 02A64 80B3EC44 468021A0 */ cvt.s.w $f6, $f4 -/* 02A68 80B3EC48 E4860024 */ swc1 $f6, 0x0024($a0) ## 00000024 -/* 02A6C 80B3EC4C 8C590010 */ lw $t9, 0x0010($v0) ## 00000010 -/* 02A70 80B3EC50 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 -/* 02A74 80B3EC54 00000000 */ nop -/* 02A78 80B3EC58 468042A0 */ cvt.s.w $f10, $f8 -/* 02A7C 80B3EC5C E48A0028 */ swc1 $f10, 0x0028($a0) ## 00000028 -/* 02A80 80B3EC60 8C480014 */ lw $t0, 0x0014($v0) ## 00000014 -/* 02A84 80B3EC64 44888000 */ mtc1 $t0, $f16 ## $f16 = 0.00 -/* 02A88 80B3EC68 00000000 */ nop -/* 02A8C 80B3EC6C 468084A0 */ cvt.s.w $f18, $f16 -/* 02A90 80B3EC70 E492002C */ swc1 $f18, 0x002C($a0) ## 0000002C -/* 02A94 80B3EC74 84430008 */ lh $v1, 0x0008($v0) ## 00000008 -/* 02A98 80B3EC78 AC890260 */ sw $t1, 0x0260($a0) ## 00000260 -/* 02A9C 80B3EC7C AC850264 */ sw $a1, 0x0264($a0) ## 00000264 -/* 02AA0 80B3EC80 A48300B6 */ sh $v1, 0x00B6($a0) ## 000000B6 -/* 02AA4 80B3EC84 A4830032 */ sh $v1, 0x0032($a0) ## 00000032 -.L80B3EC88: -/* 02AA8 80B3EC88 03E00008 */ jr $ra -/* 02AAC 80B3EC8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EC90.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EC90.s deleted file mode 100644 index ee220a571f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EC90.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B3EC90 -/* 02AB0 80B3EC90 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02AB4 80B3EC94 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02AB8 80B3EC98 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 02ABC 80B3EC9C 51C0000B */ beql $t6, $zero, .L80B3ECCC -/* 02AC0 80B3ECA0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02AC4 80B3ECA4 8CA21D9C */ lw $v0, 0x1D9C($a1) ## 00001D9C -/* 02AC8 80B3ECA8 50400008 */ beql $v0, $zero, .L80B3ECCC -/* 02ACC 80B3ECAC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02AD0 80B3ECB0 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 02AD4 80B3ECB4 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 02AD8 80B3ECB8 51E10004 */ beql $t7, $at, .L80B3ECCC -/* 02ADC 80B3ECBC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02AE0 80B3ECC0 0C2CF27B */ jal func_80B3C9EC -/* 02AE4 80B3ECC4 00000000 */ nop -/* 02AE8 80B3ECC8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B3ECCC: -/* 02AEC 80B3ECCC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02AF0 80B3ECD0 03E00008 */ jr $ra -/* 02AF4 80B3ECD4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ECD8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ECD8.s deleted file mode 100644 index 7255133e1f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ECD8.s +++ /dev/null @@ -1,38 +0,0 @@ -.late_rodata -glabel D_80B4223C - .float 0.01 - -glabel D_80B42240 - .float 1.2 - -.text -glabel func_80B3ECD8 -/* 02AF8 80B3ECD8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 02AFC 80B3ECDC 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 02B00 80B3ECE0 C4840268 */ lwc1 $f4, 0x0268($a0) ## 00000268 -/* 02B04 80B3ECE4 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 02B08 80B3ECE8 44818000 */ mtc1 $at, $f16 ## $f16 = 12.00 -/* 02B0C 80B3ECEC 46062200 */ add.s $f8, $f4, $f6 -/* 02B10 80B3ECF0 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 02B14 80B3ECF4 E4880268 */ swc1 $f8, 0x0268($a0) ## 00000268 -/* 02B18 80B3ECF8 C48A0268 */ lwc1 $f10, 0x0268($a0) ## 00000268 -/* 02B1C 80B3ECFC 460A803E */ c.le.s $f16, $f10 -/* 02B20 80B3ED00 00000000 */ nop -/* 02B24 80B3ED04 4500000E */ bc1f .L80B3ED40 -/* 02B28 80B3ED08 00000000 */ nop -/* 02B2C 80B3ED0C 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 02B30 80B3ED10 3C0180B4 */ lui $at, %hi(D_80B4223C) ## $at = 80B40000 -/* 02B34 80B3ED14 C426223C */ lwc1 $f6, %lo(D_80B4223C)($at) -/* 02B38 80B3ED18 85CF1458 */ lh $t7, 0x1458($t6) ## 80161458 -/* 02B3C 80B3ED1C 3C0180B4 */ lui $at, %hi(D_80B42240) ## $at = 80B40000 -/* 02B40 80B3ED20 C42A2240 */ lwc1 $f10, %lo(D_80B42240)($at) -/* 02B44 80B3ED24 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 02B48 80B3ED28 24180018 */ addiu $t8, $zero, 0x0018 ## $t8 = 00000018 -/* 02B4C 80B3ED2C AC980260 */ sw $t8, 0x0260($a0) ## 00000260 -/* 02B50 80B3ED30 46809120 */ cvt.s.w $f4, $f18 -/* 02B54 80B3ED34 46062202 */ mul.s $f8, $f4, $f6 -/* 02B58 80B3ED38 460A4400 */ add.s $f16, $f8, $f10 -/* 02B5C 80B3ED3C E4900068 */ swc1 $f16, 0x0068($a0) ## 00000068 -.L80B3ED40: -/* 02B60 80B3ED40 03E00008 */ jr $ra -/* 02B64 80B3ED44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ED48.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ED48.s deleted file mode 100644 index 1b736ed7c9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ED48.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80B3ED48 -/* 02B68 80B3ED48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02B6C 80B3ED4C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02B70 80B3ED50 0C2CFB00 */ jal func_80B3EC00 -/* 02B74 80B3ED54 AFA5001C */ sw $a1, 0x001C($sp) -/* 02B78 80B3ED58 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02B7C 80B3ED5C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02B80 80B3ED60 03E00008 */ jr $ra -/* 02B84 80B3ED64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ED68.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ED68.s deleted file mode 100644 index b74a62e76d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ED68.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80B3ED68 -/* 02B88 80B3ED68 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02B8C 80B3ED6C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02B90 80B3ED70 0C2CFB03 */ jal func_80B3EC0C -/* 02B94 80B3ED74 00000000 */ nop -/* 02B98 80B3ED78 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02B9C 80B3ED7C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02BA0 80B3ED80 03E00008 */ jr $ra -/* 02BA4 80B3ED84 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ED88.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ED88.s deleted file mode 100644 index c513efa160..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ED88.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80B3ED88 -/* 02BA8 80B3ED88 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02BAC 80B3ED8C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02BB0 80B3ED90 AFA40018 */ sw $a0, 0x0018($sp) -/* 02BB4 80B3ED94 0C2CF12C */ jal func_80B3C4B0 -/* 02BB8 80B3ED98 AFA5001C */ sw $a1, 0x001C($sp) -/* 02BBC 80B3ED9C 8FA40018 */ lw $a0, 0x0018($sp) -/* 02BC0 80B3EDA0 0C2CF11A */ jal func_80B3C468 -/* 02BC4 80B3EDA4 8FA5001C */ lw $a1, 0x001C($sp) -/* 02BC8 80B3EDA8 0C2CF0C7 */ jal func_80B3C31C -/* 02BCC 80B3EDAC 8FA40018 */ lw $a0, 0x0018($sp) -/* 02BD0 80B3EDB0 8FA40018 */ lw $a0, 0x0018($sp) -/* 02BD4 80B3EDB4 0C2CFB24 */ jal func_80B3EC90 -/* 02BD8 80B3EDB8 8FA5001C */ lw $a1, 0x001C($sp) -/* 02BDC 80B3EDBC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02BE0 80B3EDC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02BE4 80B3EDC4 03E00008 */ jr $ra -/* 02BE8 80B3EDC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EDCC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EDCC.s deleted file mode 100644 index 6e70de6b50..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EDCC.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B3EDCC -/* 02BEC 80B3EDCC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02BF0 80B3EDD0 AFBF001C */ sw $ra, 0x001C($sp) -/* 02BF4 80B3EDD4 AFB00018 */ sw $s0, 0x0018($sp) -/* 02BF8 80B3EDD8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02BFC 80B3EDDC 0C2CF5BC */ jal func_80B3D6F0 -/* 02C00 80B3EDE0 AFA50024 */ sw $a1, 0x0024($sp) -/* 02C04 80B3EDE4 0C2CF12C */ jal func_80B3C4B0 -/* 02C08 80B3EDE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02C0C 80B3EDEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02C10 80B3EDF0 0C2CF11A */ jal func_80B3C468 -/* 02C14 80B3EDF4 8FA50024 */ lw $a1, 0x0024($sp) -/* 02C18 80B3EDF8 0C2CF0C7 */ jal func_80B3C31C -/* 02C1C 80B3EDFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02C20 80B3EE00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02C24 80B3EE04 0C2CF3A1 */ jal func_80B3CE84 -/* 02C28 80B3EE08 8FA50024 */ lw $a1, 0x0024($sp) -/* 02C2C 80B3EE0C 0C2CFB36 */ jal func_80B3ECD8 -/* 02C30 80B3EE10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02C34 80B3EE14 8FBF001C */ lw $ra, 0x001C($sp) -/* 02C38 80B3EE18 8FB00018 */ lw $s0, 0x0018($sp) -/* 02C3C 80B3EE1C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02C40 80B3EE20 03E00008 */ jr $ra -/* 02C44 80B3EE24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE28.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE28.s deleted file mode 100644 index 5435bbc0a8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE28.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80B3EE28 -/* 02C48 80B3EE28 AFA40000 */ sw $a0, 0x0000($sp) -/* 02C4C 80B3EE2C 03E00008 */ jr $ra -/* 02C50 80B3EE30 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE34.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE34.s deleted file mode 100644 index f5e0283e45..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE34.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80B3EE34 -/* 02C54 80B3EE34 AFA40000 */ sw $a0, 0x0000($sp) -/* 02C58 80B3EE38 03E00008 */ jr $ra -/* 02C5C 80B3EE3C AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE40.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE40.s deleted file mode 100644 index e4ca7c03b3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE40.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80B3EE40 -/* 02C60 80B3EE40 AFA40000 */ sw $a0, 0x0000($sp) -/* 02C64 80B3EE44 03E00008 */ jr $ra -/* 02C68 80B3EE48 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE4C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE4C.s deleted file mode 100644 index 462be2c364..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE4C.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80B3EE4C -/* 02C6C 80B3EE4C AFA40000 */ sw $a0, 0x0000($sp) -/* 02C70 80B3EE50 03E00008 */ jr $ra -/* 02C74 80B3EE54 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE58.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE58.s deleted file mode 100644 index ac23e70a51..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE58.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80B3EE58 -/* 02C78 80B3EE58 AFA40000 */ sw $a0, 0x0000($sp) -/* 02C7C 80B3EE5C 03E00008 */ jr $ra -/* 02C80 80B3EE60 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE64.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE64.s deleted file mode 100644 index 00525277a9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE64.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80B3EE64 -/* 02C84 80B3EE64 AFA50004 */ sw $a1, 0x0004($sp) -/* 02C88 80B3EE68 240E001D */ addiu $t6, $zero, 0x001D ## $t6 = 0000001D -/* 02C8C 80B3EE6C 03E00008 */ jr $ra -/* 02C90 80B3EE70 AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE74.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE74.s deleted file mode 100644 index 2f7891bdae..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE74.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80B3EE74 -/* 02C94 80B3EE74 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02C98 80B3EE78 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02C9C 80B3EE7C 0C2CF366 */ jal func_80B3CD98 -/* 02CA0 80B3EE80 AFA40018 */ sw $a0, 0x0018($sp) -/* 02CA4 80B3EE84 10400003 */ beq $v0, $zero, .L80B3EE94 -/* 02CA8 80B3EE88 8FAF0018 */ lw $t7, 0x0018($sp) -/* 02CAC 80B3EE8C 240E001E */ addiu $t6, $zero, 0x001E ## $t6 = 0000001E -/* 02CB0 80B3EE90 ADEE0260 */ sw $t6, 0x0260($t7) ## 00000260 -.L80B3EE94: -/* 02CB4 80B3EE94 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02CB8 80B3EE98 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02CBC 80B3EE9C 03E00008 */ jr $ra -/* 02CC0 80B3EEA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EEA4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EEA4.s deleted file mode 100644 index a31048b9e5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EEA4.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B3EEA4 -/* 02CC4 80B3EEA4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02CC8 80B3EEA8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02CCC 80B3EEAC 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 02CD0 80B3EEB0 0C2CF1EF */ jal func_80B3C7BC -/* 02CD4 80B3EEB4 2406001F */ addiu $a2, $zero, 0x001F ## $a2 = 0000001F -/* 02CD8 80B3EEB8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02CDC 80B3EEBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02CE0 80B3EEC0 03E00008 */ jr $ra -/* 02CE4 80B3EEC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EEC8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EEC8.s deleted file mode 100644 index 42ccfc60af..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EEC8.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B3EEC8 -/* 02CE8 80B3EEC8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02CEC 80B3EECC AFBF0014 */ sw $ra, 0x0014($sp) -/* 02CF0 80B3EED0 2405001F */ addiu $a1, $zero, 0x001F ## $a1 = 0000001F -/* 02CF4 80B3EED4 0C2CF1EF */ jal func_80B3C7BC -/* 02CF8 80B3EED8 24060020 */ addiu $a2, $zero, 0x0020 ## $a2 = 00000020 -/* 02CFC 80B3EEDC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02D00 80B3EEE0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02D04 80B3EEE4 03E00008 */ jr $ra -/* 02D08 80B3EEE8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EEEC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EEEC.s deleted file mode 100644 index 62ece95ff6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EEEC.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B3EEEC -/* 02D0C 80B3EEEC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02D10 80B3EEF0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02D14 80B3EEF4 24050020 */ addiu $a1, $zero, 0x0020 ## $a1 = 00000020 -/* 02D18 80B3EEF8 0C2CF1EF */ jal func_80B3C7BC -/* 02D1C 80B3EEFC 24060021 */ addiu $a2, $zero, 0x0021 ## $a2 = 00000021 -/* 02D20 80B3EF00 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02D24 80B3EF04 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02D28 80B3EF08 03E00008 */ jr $ra -/* 02D2C 80B3EF0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF10.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF10.s deleted file mode 100644 index 2a582a303a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF10.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B3EF10 -/* 02D30 80B3EF10 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02D34 80B3EF14 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02D38 80B3EF18 24050021 */ addiu $a1, $zero, 0x0021 ## $a1 = 00000021 -/* 02D3C 80B3EF1C 0C2CF1EF */ jal func_80B3C7BC -/* 02D40 80B3EF20 24060022 */ addiu $a2, $zero, 0x0022 ## $a2 = 00000022 -/* 02D44 80B3EF24 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02D48 80B3EF28 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02D4C 80B3EF2C 03E00008 */ jr $ra -/* 02D50 80B3EF30 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF34.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF34.s deleted file mode 100644 index b81dcd3653..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF34.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B3EF34 -/* 02D54 80B3EF34 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02D58 80B3EF38 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02D5C 80B3EF3C 24050022 */ addiu $a1, $zero, 0x0022 ## $a1 = 00000022 -/* 02D60 80B3EF40 0C2CF1EF */ jal func_80B3C7BC -/* 02D64 80B3EF44 24060023 */ addiu $a2, $zero, 0x0023 ## $a2 = 00000023 -/* 02D68 80B3EF48 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02D6C 80B3EF4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02D70 80B3EF50 03E00008 */ jr $ra -/* 02D74 80B3EF54 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF58.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF58.s deleted file mode 100644 index 34a573a672..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF58.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B3EF58 -/* 02D78 80B3EF58 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02D7C 80B3EF5C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02D80 80B3EF60 24050023 */ addiu $a1, $zero, 0x0023 ## $a1 = 00000023 -/* 02D84 80B3EF64 24060024 */ addiu $a2, $zero, 0x0024 ## $a2 = 00000024 -/* 02D88 80B3EF68 0C2CF1F5 */ jal func_80B3C7D4 -/* 02D8C 80B3EF6C 24070022 */ addiu $a3, $zero, 0x0022 ## $a3 = 00000022 -/* 02D90 80B3EF70 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02D94 80B3EF74 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02D98 80B3EF78 03E00008 */ jr $ra -/* 02D9C 80B3EF7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF80.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF80.s deleted file mode 100644 index fe265879ff..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF80.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B3EF80 -/* 02DA0 80B3EF80 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02DA4 80B3EF84 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02DA8 80B3EF88 24050024 */ addiu $a1, $zero, 0x0024 ## $a1 = 00000024 -/* 02DAC 80B3EF8C 0C2CF1EF */ jal func_80B3C7BC -/* 02DB0 80B3EF90 24060025 */ addiu $a2, $zero, 0x0025 ## $a2 = 00000025 -/* 02DB4 80B3EF94 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02DB8 80B3EF98 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02DBC 80B3EF9C 03E00008 */ jr $ra -/* 02DC0 80B3EFA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EFA4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EFA4.s deleted file mode 100644 index 6398bf57a0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EFA4.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B3EFA4 -/* 02DC4 80B3EFA4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02DC8 80B3EFA8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02DCC 80B3EFAC 24050025 */ addiu $a1, $zero, 0x0025 ## $a1 = 00000025 -/* 02DD0 80B3EFB0 0C2CF1EF */ jal func_80B3C7BC -/* 02DD4 80B3EFB4 24060026 */ addiu $a2, $zero, 0x0026 ## $a2 = 00000026 -/* 02DD8 80B3EFB8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02DDC 80B3EFBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02DE0 80B3EFC0 03E00008 */ jr $ra -/* 02DE4 80B3EFC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EFC8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EFC8.s deleted file mode 100644 index 8feaeea744..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EFC8.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B3EFC8 -/* 02DE8 80B3EFC8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02DEC 80B3EFCC AFBF0014 */ sw $ra, 0x0014($sp) -/* 02DF0 80B3EFD0 24050026 */ addiu $a1, $zero, 0x0026 ## $a1 = 00000026 -/* 02DF4 80B3EFD4 0C2CF1EF */ jal func_80B3C7BC -/* 02DF8 80B3EFD8 24060027 */ addiu $a2, $zero, 0x0027 ## $a2 = 00000027 -/* 02DFC 80B3EFDC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02E00 80B3EFE0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02E04 80B3EFE4 03E00008 */ jr $ra -/* 02E08 80B3EFE8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EFEC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EFEC.s deleted file mode 100644 index 614c530ad1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EFEC.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B3EFEC -/* 02E0C 80B3EFEC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02E10 80B3EFF0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02E14 80B3EFF4 24050027 */ addiu $a1, $zero, 0x0027 ## $a1 = 00000027 -/* 02E18 80B3EFF8 0C2CF1EF */ jal func_80B3C7BC -/* 02E1C 80B3EFFC 24060028 */ addiu $a2, $zero, 0x0028 ## $a2 = 00000028 -/* 02E20 80B3F000 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02E24 80B3F004 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02E28 80B3F008 03E00008 */ jr $ra -/* 02E2C 80B3F00C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F010.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F010.s deleted file mode 100644 index 72f2d9584c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F010.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80B3F010 -/* 02E30 80B3F010 3C0F8016 */ lui $t7, %hi(gGameInfo) -/* 02E34 80B3F014 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) -/* 02E38 80B3F018 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02E3C 80B3F01C AFBF0024 */ sw $ra, 0x0024($sp) -/* 02E40 80B3F020 AFA40028 */ sw $a0, 0x0028($sp) -/* 02E44 80B3F024 85F8145E */ lh $t8, 0x145E($t7) ## 8016145E -/* 02E48 80B3F028 3C01430C */ lui $at, 0x430C ## $at = 430C0000 -/* 02E4C 80B3F02C 44814000 */ mtc1 $at, $f8 ## $f8 = 140.00 -/* 02E50 80B3F030 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 02E54 80B3F034 C4800090 */ lwc1 $f0, 0x0090($a0) ## 00000090 -/* 02E58 80B3F038 3C040600 */ lui $a0, %hi(D_06004828) ## $a0 = 06000000 -/* 02E5C 80B3F03C 468021A0 */ cvt.s.w $f6, $f4 -/* 02E60 80B3F040 46083280 */ add.s $f10, $f6, $f8 -/* 02E64 80B3F044 4600503E */ c.le.s $f10, $f0 -/* 02E68 80B3F048 00000000 */ nop -/* 02E6C 80B3F04C 45020017 */ bc1fl .L80B3F0AC -/* 02E70 80B3F050 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02E74 80B3F054 0C028800 */ jal Animation_GetLastFrame - -/* 02E78 80B3F058 24844828 */ addiu $a0, $a0, %lo(D_06004828) ## $a0 = 06004828 -/* 02E7C 80B3F05C 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 02E80 80B3F060 3C01C140 */ lui $at, 0xC140 ## $at = C1400000 -/* 02E84 80B3F064 44812000 */ mtc1 $at, $f4 ## $f4 = -12.00 -/* 02E88 80B3F068 468084A0 */ cvt.s.w $f18, $f16 -/* 02E8C 80B3F06C 8FA40028 */ lw $a0, 0x0028($sp) -/* 02E90 80B3F070 3C050600 */ lui $a1, %hi(D_06004828) ## $a1 = 06000000 -/* 02E94 80B3F074 24A54828 */ addiu $a1, $a1, %lo(D_06004828) ## $a1 = 06004828 -/* 02E98 80B3F078 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02E9C 80B3F07C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02EA0 80B3F080 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 02EA4 80B3F084 AFA00014 */ sw $zero, 0x0014($sp) -/* 02EA8 80B3F088 E7A40018 */ swc1 $f4, 0x0018($sp) -/* 02EAC 80B3F08C 0C029468 */ jal Animation_Change - -/* 02EB0 80B3F090 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02EB4 80B3F094 8FA20028 */ lw $v0, 0x0028($sp) -/* 02EB8 80B3F098 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 02EBC 80B3F09C 24190029 */ addiu $t9, $zero, 0x0029 ## $t9 = 00000029 -/* 02EC0 80B3F0A0 AC590260 */ sw $t9, 0x0260($v0) ## 00000260 -/* 02EC4 80B3F0A4 E4460268 */ swc1 $f6, 0x0268($v0) ## 00000268 -/* 02EC8 80B3F0A8 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B3F0AC: -/* 02ECC 80B3F0AC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02ED0 80B3F0B0 03E00008 */ jr $ra -/* 02ED4 80B3F0B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F0B8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F0B8.s deleted file mode 100644 index d21df5912e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F0B8.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B3F0B8 -/* 02ED8 80B3F0B8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02EDC 80B3F0BC AFBF0014 */ sw $ra, 0x0014($sp) -/* 02EE0 80B3F0C0 24050029 */ addiu $a1, $zero, 0x0029 ## $a1 = 00000029 -/* 02EE4 80B3F0C4 0C2CF1EF */ jal func_80B3C7BC -/* 02EE8 80B3F0C8 2406002A */ addiu $a2, $zero, 0x002A ## $a2 = 0000002A -/* 02EEC 80B3F0CC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02EF0 80B3F0D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02EF4 80B3F0D4 03E00008 */ jr $ra -/* 02EF8 80B3F0D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F0DC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F0DC.s deleted file mode 100644 index f3311f9759..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F0DC.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B3F0DC -/* 02EFC 80B3F0DC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02F00 80B3F0E0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02F04 80B3F0E4 2405002A */ addiu $a1, $zero, 0x002A ## $a1 = 0000002A -/* 02F08 80B3F0E8 0C2CF1EF */ jal func_80B3C7BC -/* 02F0C 80B3F0EC 2406002B */ addiu $a2, $zero, 0x002B ## $a2 = 0000002B -/* 02F10 80B3F0F0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02F14 80B3F0F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02F18 80B3F0F8 03E00008 */ jr $ra -/* 02F1C 80B3F0FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F100.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F100.s deleted file mode 100644 index 2fecaabc79..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F100.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B3F100 -/* 02F20 80B3F100 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02F24 80B3F104 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02F28 80B3F108 2405002B */ addiu $a1, $zero, 0x002B ## $a1 = 0000002B -/* 02F2C 80B3F10C 0C2CF1EF */ jal func_80B3C7BC -/* 02F30 80B3F110 2406002C */ addiu $a2, $zero, 0x002C ## $a2 = 0000002C -/* 02F34 80B3F114 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02F38 80B3F118 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02F3C 80B3F11C 03E00008 */ jr $ra -/* 02F40 80B3F120 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F124.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F124.s deleted file mode 100644 index cb3ba2e0cd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F124.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80B3F124 -/* 02F44 80B3F124 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02F48 80B3F128 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02F4C 80B3F12C 0C2CFB9D */ jal func_80B3EE74 -/* 02F50 80B3F130 00000000 */ nop -/* 02F54 80B3F134 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02F58 80B3F138 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02F5C 80B3F13C 03E00008 */ jr $ra -/* 02F60 80B3F140 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F144.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F144.s deleted file mode 100644 index f7b2a13456..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F144.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B3F144 -/* 02F64 80B3F144 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02F68 80B3F148 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02F6C 80B3F14C 0C2CFB5A */ jal func_80B3ED68 -/* 02F70 80B3F150 AFA40018 */ sw $a0, 0x0018($sp) -/* 02F74 80B3F154 0C2CFBA9 */ jal func_80B3EEA4 -/* 02F78 80B3F158 8FA40018 */ lw $a0, 0x0018($sp) -/* 02F7C 80B3F15C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02F80 80B3F160 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02F84 80B3F164 03E00008 */ jr $ra -/* 02F88 80B3F168 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F16C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F16C.s deleted file mode 100644 index a36042e0ef..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F16C.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80B3F16C -/* 02F8C 80B3F16C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02F90 80B3F170 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02F94 80B3F174 AFA40018 */ sw $a0, 0x0018($sp) -/* 02F98 80B3F178 0C2CF908 */ jal func_80B3E420 -/* 02F9C 80B3F17C AFA5001C */ sw $a1, 0x001C($sp) -/* 02FA0 80B3F180 8FA40018 */ lw $a0, 0x0018($sp) -/* 02FA4 80B3F184 8FA5001C */ lw $a1, 0x001C($sp) -/* 02FA8 80B3F188 0C2CF162 */ jal func_80B3C588 -/* 02FAC 80B3F18C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 02FB0 80B3F190 0C2CFBB2 */ jal func_80B3EEC8 -/* 02FB4 80B3F194 8FA40018 */ lw $a0, 0x0018($sp) -/* 02FB8 80B3F198 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02FBC 80B3F19C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02FC0 80B3F1A0 03E00008 */ jr $ra -/* 02FC4 80B3F1A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F1A8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F1A8.s deleted file mode 100644 index 15ee221cac..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F1A8.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B3F1A8 -/* 02FC8 80B3F1A8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02FCC 80B3F1AC AFBF0014 */ sw $ra, 0x0014($sp) -/* 02FD0 80B3F1B0 0C2CF919 */ jal func_80B3E464 -/* 02FD4 80B3F1B4 AFA40018 */ sw $a0, 0x0018($sp) -/* 02FD8 80B3F1B8 0C2CFBBB */ jal func_80B3EEEC -/* 02FDC 80B3F1BC 8FA40018 */ lw $a0, 0x0018($sp) -/* 02FE0 80B3F1C0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02FE4 80B3F1C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02FE8 80B3F1C8 03E00008 */ jr $ra -/* 02FEC 80B3F1CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F1D0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F1D0.s deleted file mode 100644 index 453f23ec02..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F1D0.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B3F1D0 -/* 02FF0 80B3F1D0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02FF4 80B3F1D4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02FF8 80B3F1D8 0C2CF92B */ jal func_80B3E4AC -/* 02FFC 80B3F1DC AFA40018 */ sw $a0, 0x0018($sp) -/* 03000 80B3F1E0 0C2CFBC4 */ jal func_80B3EF10 -/* 03004 80B3F1E4 8FA40018 */ lw $a0, 0x0018($sp) -/* 03008 80B3F1E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0300C 80B3F1EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03010 80B3F1F0 03E00008 */ jr $ra -/* 03014 80B3F1F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F1F8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F1F8.s deleted file mode 100644 index 25b79849b4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F1F8.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B3F1F8 -/* 03018 80B3F1F8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0301C 80B3F1FC AFBF0014 */ sw $ra, 0x0014($sp) -/* 03020 80B3F200 0C2CF93E */ jal func_80B3E4F8 -/* 03024 80B3F204 AFA40018 */ sw $a0, 0x0018($sp) -/* 03028 80B3F208 0C2CFBCD */ jal func_80B3EF34 -/* 0302C 80B3F20C 8FA40018 */ lw $a0, 0x0018($sp) -/* 03030 80B3F210 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03034 80B3F214 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03038 80B3F218 03E00008 */ jr $ra -/* 0303C 80B3F21C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F220.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F220.s deleted file mode 100644 index 5dd91b765e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F220.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B3F220 -/* 03040 80B3F220 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03044 80B3F224 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03048 80B3F228 0C2CF94F */ jal func_80B3E53C -/* 0304C 80B3F22C AFA40018 */ sw $a0, 0x0018($sp) -/* 03050 80B3F230 0C2CFBD6 */ jal func_80B3EF58 -/* 03054 80B3F234 8FA40018 */ lw $a0, 0x0018($sp) -/* 03058 80B3F238 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0305C 80B3F23C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03060 80B3F240 03E00008 */ jr $ra -/* 03064 80B3F244 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F248.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F248.s deleted file mode 100644 index 3ff73a5c8c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F248.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B3F248 -/* 03068 80B3F248 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0306C 80B3F24C AFBF0014 */ sw $ra, 0x0014($sp) -/* 03070 80B3F250 0C2CF960 */ jal func_80B3E580 -/* 03074 80B3F254 AFA40018 */ sw $a0, 0x0018($sp) -/* 03078 80B3F258 0C2CFBE0 */ jal func_80B3EF80 -/* 0307C 80B3F25C 8FA40018 */ lw $a0, 0x0018($sp) -/* 03080 80B3F260 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03084 80B3F264 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03088 80B3F268 03E00008 */ jr $ra -/* 0308C 80B3F26C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F270.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F270.s deleted file mode 100644 index 169d87e160..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F270.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B3F270 -/* 03090 80B3F270 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03094 80B3F274 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03098 80B3F278 0C2CF972 */ jal func_80B3E5C8 -/* 0309C 80B3F27C AFA40018 */ sw $a0, 0x0018($sp) -/* 030A0 80B3F280 0C2CFBE9 */ jal func_80B3EFA4 -/* 030A4 80B3F284 8FA40018 */ lw $a0, 0x0018($sp) -/* 030A8 80B3F288 8FBF0014 */ lw $ra, 0x0014($sp) -/* 030AC 80B3F28C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 030B0 80B3F290 03E00008 */ jr $ra -/* 030B4 80B3F294 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F298.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F298.s deleted file mode 100644 index 4497d863ea..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F298.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B3F298 -/* 030B8 80B3F298 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 030BC 80B3F29C AFBF0014 */ sw $ra, 0x0014($sp) -/* 030C0 80B3F2A0 0C2CF984 */ jal func_80B3E610 -/* 030C4 80B3F2A4 AFA40018 */ sw $a0, 0x0018($sp) -/* 030C8 80B3F2A8 0C2CFBF2 */ jal func_80B3EFC8 -/* 030CC 80B3F2AC 8FA40018 */ lw $a0, 0x0018($sp) -/* 030D0 80B3F2B0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 030D4 80B3F2B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 030D8 80B3F2B8 03E00008 */ jr $ra -/* 030DC 80B3F2BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F2C0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F2C0.s deleted file mode 100644 index 59b558e708..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F2C0.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B3F2C0 -/* 030E0 80B3F2C0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 030E4 80B3F2C4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 030E8 80B3F2C8 0C2CF99A */ jal func_80B3E668 -/* 030EC 80B3F2CC AFA40018 */ sw $a0, 0x0018($sp) -/* 030F0 80B3F2D0 0C2CFBFB */ jal func_80B3EFEC -/* 030F4 80B3F2D4 8FA40018 */ lw $a0, 0x0018($sp) -/* 030F8 80B3F2D8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 030FC 80B3F2DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03100 80B3F2E0 03E00008 */ jr $ra -/* 03104 80B3F2E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F2E8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F2E8.s deleted file mode 100644 index ae2c3e2085..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F2E8.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B3F2E8 -/* 03108 80B3F2E8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0310C 80B3F2EC AFBF001C */ sw $ra, 0x001C($sp) -/* 03110 80B3F2F0 AFB00018 */ sw $s0, 0x0018($sp) -/* 03114 80B3F2F4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03118 80B3F2F8 0C2CF5C4 */ jal func_80B3D710 -/* 0311C 80B3F2FC AFA50024 */ sw $a1, 0x0024($sp) -/* 03120 80B3F300 0C2CF12C */ jal func_80B3C4B0 -/* 03124 80B3F304 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03128 80B3F308 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0312C 80B3F30C 0C2CF11A */ jal func_80B3C468 -/* 03130 80B3F310 8FA50024 */ lw $a1, 0x0024($sp) -/* 03134 80B3F314 0C2CF0C7 */ jal func_80B3C31C -/* 03138 80B3F318 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0313C 80B3F31C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03140 80B3F320 0C2CF3A1 */ jal func_80B3CE84 -/* 03144 80B3F324 8FA50024 */ lw $a1, 0x0024($sp) -/* 03148 80B3F328 0C2CFC04 */ jal func_80B3F010 -/* 0314C 80B3F32C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03150 80B3F330 8FBF001C */ lw $ra, 0x001C($sp) -/* 03154 80B3F334 8FB00018 */ lw $s0, 0x0018($sp) -/* 03158 80B3F338 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0315C 80B3F33C 03E00008 */ jr $ra -/* 03160 80B3F340 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F344.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F344.s deleted file mode 100644 index bd19cd968b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F344.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B3F344 -/* 03164 80B3F344 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03168 80B3F348 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0316C 80B3F34C 0C2CF9CE */ jal func_80B3E738 -/* 03170 80B3F350 AFA40018 */ sw $a0, 0x0018($sp) -/* 03174 80B3F354 0C2CFC2E */ jal func_80B3F0B8 -/* 03178 80B3F358 8FA40018 */ lw $a0, 0x0018($sp) -/* 0317C 80B3F35C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03180 80B3F360 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03184 80B3F364 03E00008 */ jr $ra -/* 03188 80B3F368 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F36C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F36C.s deleted file mode 100644 index 89532e8e2e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F36C.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B3F36C -/* 0318C 80B3F36C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03190 80B3F370 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03194 80B3F374 0C2CF9E8 */ jal func_80B3E7A0 -/* 03198 80B3F378 AFA40018 */ sw $a0, 0x0018($sp) -/* 0319C 80B3F37C 0C2CFC37 */ jal func_80B3F0DC -/* 031A0 80B3F380 8FA40018 */ lw $a0, 0x0018($sp) -/* 031A4 80B3F384 8FBF0014 */ lw $ra, 0x0014($sp) -/* 031A8 80B3F388 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 031AC 80B3F38C 03E00008 */ jr $ra -/* 031B0 80B3F390 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F394.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F394.s deleted file mode 100644 index 3295191d53..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F394.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B3F394 -/* 031B4 80B3F394 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 031B8 80B3F398 AFBF0014 */ sw $ra, 0x0014($sp) -/* 031BC 80B3F39C 0C2CFA01 */ jal func_80B3E804 -/* 031C0 80B3F3A0 AFA40018 */ sw $a0, 0x0018($sp) -/* 031C4 80B3F3A4 0C2CFC40 */ jal func_80B3F100 -/* 031C8 80B3F3A8 8FA40018 */ lw $a0, 0x0018($sp) -/* 031CC 80B3F3AC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 031D0 80B3F3B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 031D4 80B3F3B4 03E00008 */ jr $ra -/* 031D8 80B3F3B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3BC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3BC.s deleted file mode 100644 index fd001266ab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3BC.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80B3F3BC -/* 031DC 80B3F3BC AFA40000 */ sw $a0, 0x0000($sp) -/* 031E0 80B3F3C0 03E00008 */ jr $ra -/* 031E4 80B3F3C4 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3C8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3C8.s deleted file mode 100644 index 5c25ec1ab3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3C8.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80B3F3C8 -/* 031E8 80B3F3C8 AFA50004 */ sw $a1, 0x0004($sp) -/* 031EC 80B3F3CC 240E002D */ addiu $t6, $zero, 0x002D ## $t6 = 0000002D -/* 031F0 80B3F3D0 03E00008 */ jr $ra -/* 031F4 80B3F3D4 AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3D8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3D8.s deleted file mode 100644 index 271d7211b2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3D8.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80B3F3D8 -/* 031F8 80B3F3D8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 031FC 80B3F3DC AFBF0014 */ sw $ra, 0x0014($sp) -/* 03200 80B3F3E0 0C01E233 */ jal func_800788CC -/* 03204 80B3F3E4 2404083D */ addiu $a0, $zero, 0x083D ## $a0 = 0000083D -/* 03208 80B3F3E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0320C 80B3F3EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03210 80B3F3F0 03E00008 */ jr $ra -/* 03214 80B3F3F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3F8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3F8.s deleted file mode 100644 index 3a0f9c053e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3F8.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B3F3F8 -/* 03218 80B3F3F8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0321C 80B3F3FC AFA50024 */ sw $a1, 0x0024($sp) -/* 03220 80B3F400 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 03224 80B3F404 AFA40020 */ sw $a0, 0x0020($sp) -/* 03228 80B3F408 8FA40024 */ lw $a0, 0x0024($sp) -/* 0322C 80B3F40C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 03230 80B3F410 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03234 80B3F414 34211D60 */ ori $at, $at, 0x1D60 ## $at = 00011D60 -/* 03238 80B3F418 3C0680B4 */ lui $a2, %hi(D_80B42DA0) ## $a2 = 80B40000 -/* 0323C 80B3F41C 24C62DA0 */ addiu $a2, $a2, %lo(D_80B42DA0) ## $a2 = 80B42DA0 -/* 03240 80B3F420 27A70018 */ addiu $a3, $sp, 0x0018 ## $a3 = FFFFFFF8 -/* 03244 80B3F424 0C029B84 */ jal SkinMatrix_Vec3fMtxFMultXYZW -/* 03248 80B3F428 00812021 */ addu $a0, $a0, $at -/* 0324C 80B3F42C 3C0480B4 */ lui $a0, %hi(D_80B42DA0) ## $a0 = 80B40000 -/* 03250 80B3F430 24842DA0 */ addiu $a0, $a0, %lo(D_80B42DA0) ## $a0 = 80B42DA0 -/* 03254 80B3F434 0C01E245 */ jal func_80078914 -/* 03258 80B3F438 24052889 */ addiu $a1, $zero, 0x2889 ## $a1 = 00002889 -/* 0325C 80B3F43C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03260 80B3F440 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03264 80B3F444 03E00008 */ jr $ra -/* 03268 80B3F448 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F44C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F44C.s deleted file mode 100644 index 753666cd00..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F44C.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_80B3F44C -/* 0326C 80B3F44C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 03270 80B3F450 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03274 80B3F454 AFB00020 */ sw $s0, 0x0020($sp) -/* 03278 80B3F458 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0327C 80B3F45C 0C2CF134 */ jal func_80B3C4D0 -/* 03280 80B3F460 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03284 80B3F464 5040002F */ beql $v0, $zero, .L80B3F524 -/* 03288 80B3F468 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0328C 80B3F46C 8C4E000C */ lw $t6, 0x000C($v0) ## 0000000C -/* 03290 80B3F470 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03294 80B3F474 27A50028 */ addiu $a1, $sp, 0x0028 ## $a1 = FFFFFFF0 -/* 03298 80B3F478 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 0329C 80B3F47C 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 -/* 032A0 80B3F480 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 -/* 032A4 80B3F484 468021A0 */ cvt.s.w $f6, $f4 -/* 032A8 80B3F488 E7A60028 */ swc1 $f6, 0x0028($sp) -/* 032AC 80B3F48C 8C4F0010 */ lw $t7, 0x0010($v0) ## 00000010 -/* 032B0 80B3F490 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 032B4 80B3F494 00000000 */ nop -/* 032B8 80B3F498 468042A0 */ cvt.s.w $f10, $f8 -/* 032BC 80B3F49C E7AA002C */ swc1 $f10, 0x002C($sp) -/* 032C0 80B3F4A0 8C580014 */ lw $t8, 0x0014($v0) ## 00000014 -/* 032C4 80B3F4A4 AFA00010 */ sw $zero, 0x0010($sp) -/* 032C8 80B3F4A8 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 032CC 80B3F4AC 00000000 */ nop -/* 032D0 80B3F4B0 468084A0 */ cvt.s.w $f18, $f16 -/* 032D4 80B3F4B4 0C00A511 */ jal EffectSsGRipple_Spawn -/* 032D8 80B3F4B8 E7B20030 */ swc1 $f18, 0x0030($sp) -/* 032DC 80B3F4BC 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A -/* 032E0 80B3F4C0 AFB90010 */ sw $t9, 0x0010($sp) -/* 032E4 80B3F4C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 032E8 80B3F4C8 27A50028 */ addiu $a1, $sp, 0x0028 ## $a1 = FFFFFFF0 -/* 032EC 80B3F4CC 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 -/* 032F0 80B3F4D0 0C00A511 */ jal EffectSsGRipple_Spawn -/* 032F4 80B3F4D4 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 -/* 032F8 80B3F4D8 24080014 */ addiu $t0, $zero, 0x0014 ## $t0 = 00000014 -/* 032FC 80B3F4DC AFA80010 */ sw $t0, 0x0010($sp) -/* 03300 80B3F4E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03304 80B3F4E4 27A50028 */ addiu $a1, $sp, 0x0028 ## $a1 = FFFFFFF0 -/* 03308 80B3F4E8 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 -/* 0330C 80B3F4EC 0C00A511 */ jal EffectSsGRipple_Spawn -/* 03310 80B3F4F0 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 -/* 03314 80B3F4F4 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 03318 80B3F4F8 AFA90010 */ sw $t1, 0x0010($sp) -/* 0331C 80B3F4FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03320 80B3F500 27A50028 */ addiu $a1, $sp, 0x0028 ## $a1 = FFFFFFF0 -/* 03324 80B3F504 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 03328 80B3F508 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0332C 80B3F50C 0C00A527 */ jal EffectSsGSplash_Spawn -/* 03330 80B3F510 AFA00014 */ sw $zero, 0x0014($sp) -/* 03334 80B3F514 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFF0 -/* 03338 80B3F518 0C2CFCFE */ jal func_80B3F3F8 -/* 0333C 80B3F51C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03340 80B3F520 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B3F524: -/* 03344 80B3F524 8FB00020 */ lw $s0, 0x0020($sp) -/* 03348 80B3F528 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0334C 80B3F52C 03E00008 */ jr $ra -/* 03350 80B3F530 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F534.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F534.s deleted file mode 100644 index 42507b85a5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F534.s +++ /dev/null @@ -1,36 +0,0 @@ -.late_rodata -glabel D_80B42244 - .word 0xC49B6000 -glabel D_80B42248 - .word 0x45E91000 - -.text -glabel func_80B3F534 -/* 03354 80B3F534 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 03358 80B3F538 AFBF002C */ sw $ra, 0x002C($sp) -/* 0335C 80B3F53C 94821D74 */ lhu $v0, 0x1D74($a0) ## 00001D74 -/* 03360 80B3F540 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 03364 80B3F544 24010136 */ addiu $at, $zero, 0x0136 ## $at = 00000136 -/* 03368 80B3F548 14410010 */ bne $v0, $at, .L80B3F58C -/* 0336C 80B3F54C 24841C24 */ addiu $a0, $a0, 0x1C24 ## $a0 = 00001C24 -/* 03370 80B3F550 3C0180B4 */ lui $at, %hi(D_80B42244) ## $at = 80B40000 -/* 03374 80B3F554 C4242244 */ lwc1 $f4, %lo(D_80B42244)($at) -/* 03378 80B3F558 3C0180B4 */ lui $at, %hi(D_80B42248) ## $at = 80B40000 -/* 0337C 80B3F55C C4262248 */ lwc1 $f6, %lo(D_80B42248)($at) -/* 03380 80B3F560 3C07C482 */ lui $a3, 0xC482 ## $a3 = C4820000 -/* 03384 80B3F564 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 -/* 03388 80B3F568 AFAE0024 */ sw $t6, 0x0024($sp) -/* 0338C 80B3F56C 34E78000 */ ori $a3, $a3, 0x8000 ## $a3 = C4828000 -/* 03390 80B3F570 2406005D */ addiu $a2, $zero, 0x005D ## $a2 = 0000005D -/* 03394 80B3F574 AFA00018 */ sw $zero, 0x0018($sp) -/* 03398 80B3F578 AFA0001C */ sw $zero, 0x001C($sp) -/* 0339C 80B3F57C AFA00020 */ sw $zero, 0x0020($sp) -/* 033A0 80B3F580 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 033A4 80B3F584 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 033A8 80B3F588 E7A60014 */ swc1 $f6, 0x0014($sp) -.L80B3F58C: -/* 033AC 80B3F58C 8FBF002C */ lw $ra, 0x002C($sp) -/* 033B0 80B3F590 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 033B4 80B3F594 03E00008 */ jr $ra -/* 033B8 80B3F598 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F59C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F59C.s deleted file mode 100644 index a42230c29b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F59C.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_80B3F59C -/* 033BC 80B3F59C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 033C0 80B3F5A0 AFA40020 */ sw $a0, 0x0020($sp) -/* 033C4 80B3F5A4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 033C8 80B3F5A8 AFA50024 */ sw $a1, 0x0024($sp) -/* 033CC 80B3F5AC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 033D0 80B3F5B0 0C2CF134 */ jal func_80B3C4D0 -/* 033D4 80B3F5B4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 033D8 80B3F5B8 10400015 */ beq $v0, $zero, .L80B3F610 -/* 033DC 80B3F5BC 3C0E80B4 */ lui $t6, %hi(D_80B41DAC) ## $t6 = 80B40000 -/* 033E0 80B3F5C0 94430000 */ lhu $v1, 0x0000($v0) ## 00000000 -/* 033E4 80B3F5C4 8DCE1DAC */ lw $t6, %lo(D_80B41DAC)($t6) -/* 033E8 80B3F5C8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 033EC 80B3F5CC 506E0011 */ beql $v1, $t6, .L80B3F614 -/* 033F0 80B3F5D0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 033F4 80B3F5D4 10610005 */ beq $v1, $at, .L80B3F5EC -/* 033F8 80B3F5D8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 033FC 80B3F5DC 10610007 */ beq $v1, $at, .L80B3F5FC -/* 03400 80B3F5E0 8FA40024 */ lw $a0, 0x0024($sp) -/* 03404 80B3F5E4 10000008 */ beq $zero, $zero, .L80B3F608 -/* 03408 80B3F5E8 00000000 */ nop -.L80B3F5EC: -/* 0340C 80B3F5EC 0C2CFCF6 */ jal func_80B3F3D8 -/* 03410 80B3F5F0 AFA30018 */ sw $v1, 0x0018($sp) -/* 03414 80B3F5F4 10000004 */ beq $zero, $zero, .L80B3F608 -/* 03418 80B3F5F8 8FA30018 */ lw $v1, 0x0018($sp) -.L80B3F5FC: -/* 0341C 80B3F5FC 0C2CFD13 */ jal func_80B3F44C -/* 03420 80B3F600 AFA30018 */ sw $v1, 0x0018($sp) -/* 03424 80B3F604 8FA30018 */ lw $v1, 0x0018($sp) -.L80B3F608: -/* 03428 80B3F608 3C0180B4 */ lui $at, %hi(D_80B41DAC) ## $at = 80B40000 -/* 0342C 80B3F60C AC231DAC */ sw $v1, %lo(D_80B41DAC)($at) -.L80B3F610: -/* 03430 80B3F610 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B3F614: -/* 03434 80B3F614 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03438 80B3F618 03E00008 */ jr $ra -/* 0343C 80B3F61C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F620.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F620.s deleted file mode 100644 index 46b87fe3bc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F620.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B3F620 -/* 03440 80B3F620 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03444 80B3F624 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03448 80B3F628 2405002D */ addiu $a1, $zero, 0x002D ## $a1 = 0000002D -/* 0344C 80B3F62C 0C2CF1EF */ jal func_80B3C7BC -/* 03450 80B3F630 2406002E */ addiu $a2, $zero, 0x002E ## $a2 = 0000002E -/* 03454 80B3F634 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03458 80B3F638 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0345C 80B3F63C 03E00008 */ jr $ra -/* 03460 80B3F640 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F644.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F644.s deleted file mode 100644 index 7f4aefee0b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F644.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B3F644 -/* 03464 80B3F644 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03468 80B3F648 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0346C 80B3F64C 2405002E */ addiu $a1, $zero, 0x002E ## $a1 = 0000002E -/* 03470 80B3F650 0C2CF1EF */ jal func_80B3C7BC -/* 03474 80B3F654 2406002F */ addiu $a2, $zero, 0x002F ## $a2 = 0000002F -/* 03478 80B3F658 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0347C 80B3F65C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03480 80B3F660 03E00008 */ jr $ra -/* 03484 80B3F664 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F668.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F668.s deleted file mode 100644 index d506a6ff1b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F668.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80B3F668 -/* 03488 80B3F668 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0348C 80B3F66C AFBF001C */ sw $ra, 0x001C($sp) -/* 03490 80B3F670 AFA40020 */ sw $a0, 0x0020($sp) -/* 03494 80B3F674 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 03498 80B3F678 0C2CF13C */ jal func_80B3C4F0 -/* 0349C 80B3F67C 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 034A0 80B3F680 10400012 */ beq $v0, $zero, .L80B3F6CC -/* 034A4 80B3F684 8FA40020 */ lw $a0, 0x0020($sp) -/* 034A8 80B3F688 3C050601 */ lui $a1, %hi(D_06012FD0) ## $a1 = 06010000 -/* 034AC 80B3F68C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 034B0 80B3F690 AFAE0010 */ sw $t6, 0x0010($sp) -/* 034B4 80B3F694 24A52FD0 */ addiu $a1, $a1, %lo(D_06012FD0) ## $a1 = 06012FD0 -/* 034B8 80B3F698 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 034BC 80B3F69C 3C07C140 */ lui $a3, 0xC140 ## $a3 = C1400000 -/* 034C0 80B3F6A0 0C2CF1C0 */ jal func_80B3C700 -/* 034C4 80B3F6A4 AFA40020 */ sw $a0, 0x0020($sp) -/* 034C8 80B3F6A8 8FA40020 */ lw $a0, 0x0020($sp) -/* 034CC 80B3F6AC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 034D0 80B3F6B0 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 034D4 80B3F6B4 84980032 */ lh $t8, 0x0032($a0) ## 00000032 -/* 034D8 80B3F6B8 240F0030 */ addiu $t7, $zero, 0x0030 ## $t7 = 00000030 -/* 034DC 80B3F6BC AC8F0260 */ sw $t7, 0x0260($a0) ## 00000260 -/* 034E0 80B3F6C0 0301C821 */ addu $t9, $t8, $at -/* 034E4 80B3F6C4 A4990032 */ sh $t9, 0x0032($a0) ## 00000032 -/* 034E8 80B3F6C8 E4840268 */ swc1 $f4, 0x0268($a0) ## 00000268 -.L80B3F6CC: -/* 034EC 80B3F6CC 8FBF001C */ lw $ra, 0x001C($sp) -/* 034F0 80B3F6D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 034F4 80B3F6D4 03E00008 */ jr $ra -/* 034F8 80B3F6D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F6DC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F6DC.s deleted file mode 100644 index d27d29ccd3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F6DC.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B3F6DC -/* 034FC 80B3F6DC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03500 80B3F6E0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03504 80B3F6E4 24050030 */ addiu $a1, $zero, 0x0030 ## $a1 = 00000030 -/* 03508 80B3F6E8 0C2CF1EF */ jal func_80B3C7BC -/* 0350C 80B3F6EC 24060031 */ addiu $a2, $zero, 0x0031 ## $a2 = 00000031 -/* 03510 80B3F6F0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03514 80B3F6F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03518 80B3F6F8 03E00008 */ jr $ra -/* 0351C 80B3F6FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F700.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F700.s deleted file mode 100644 index d9d1f93060..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F700.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B3F700 -/* 03520 80B3F700 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03524 80B3F704 AFBF001C */ sw $ra, 0x001C($sp) -/* 03528 80B3F708 AFA40020 */ sw $a0, 0x0020($sp) -/* 0352C 80B3F70C 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 -/* 03530 80B3F710 0C2CF13C */ jal func_80B3C4F0 -/* 03534 80B3F714 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 03538 80B3F718 1040000A */ beq $v0, $zero, .L80B3F744 -/* 0353C 80B3F71C 8FA40020 */ lw $a0, 0x0020($sp) -/* 03540 80B3F720 3C050602 */ lui $a1, %hi(D_06019C30) ## $a1 = 06020000 -/* 03544 80B3F724 24A59C30 */ addiu $a1, $a1, %lo(D_06019C30) ## $a1 = 06019C30 -/* 03548 80B3F728 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0354C 80B3F72C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 03550 80B3F730 0C2CF1C0 */ jal func_80B3C700 -/* 03554 80B3F734 AFA00010 */ sw $zero, 0x0010($sp) -/* 03558 80B3F738 8FAF0020 */ lw $t7, 0x0020($sp) -/* 0355C 80B3F73C 240E0032 */ addiu $t6, $zero, 0x0032 ## $t6 = 00000032 -/* 03560 80B3F740 ADEE0260 */ sw $t6, 0x0260($t7) ## 00000260 -.L80B3F744: -/* 03564 80B3F744 8FBF001C */ lw $ra, 0x001C($sp) -/* 03568 80B3F748 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0356C 80B3F74C 03E00008 */ jr $ra -/* 03570 80B3F750 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F754.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F754.s deleted file mode 100644 index 1609bd9425..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F754.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80B3F754 -/* 03574 80B3F754 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03578 80B3F758 AFBF001C */ sw $ra, 0x001C($sp) -/* 0357C 80B3F75C AFA40020 */ sw $a0, 0x0020($sp) -/* 03580 80B3F760 AFA50024 */ sw $a1, 0x0024($sp) -/* 03584 80B3F764 24060016 */ addiu $a2, $zero, 0x0016 ## $a2 = 00000016 -/* 03588 80B3F768 0C2CF13C */ jal func_80B3C4F0 -/* 0358C 80B3F76C 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 03590 80B3F770 1040000E */ beq $v0, $zero, .L80B3F7AC -/* 03594 80B3F774 8FA40020 */ lw $a0, 0x0020($sp) -/* 03598 80B3F778 3C050602 */ lui $a1, %hi(D_0601A048) ## $a1 = 06020000 -/* 0359C 80B3F77C 24A5A048 */ addiu $a1, $a1, %lo(D_0601A048) ## $a1 = 0601A048 -/* 035A0 80B3F780 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 035A4 80B3F784 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 035A8 80B3F788 0C2CF1C0 */ jal func_80B3C700 -/* 035AC 80B3F78C AFA00010 */ sw $zero, 0x0010($sp) -/* 035B0 80B3F790 8FAF0020 */ lw $t7, 0x0020($sp) -/* 035B4 80B3F794 240E0033 */ addiu $t6, $zero, 0x0033 ## $t6 = 00000033 -/* 035B8 80B3F798 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 035BC 80B3F79C ADEE0260 */ sw $t6, 0x0260($t7) ## 00000260 -/* 035C0 80B3F7A0 8FA50024 */ lw $a1, 0x0024($sp) -/* 035C4 80B3F7A4 0C2CF162 */ jal func_80B3C588 -/* 035C8 80B3F7A8 8FA40020 */ lw $a0, 0x0020($sp) -.L80B3F7AC: -/* 035CC 80B3F7AC 8FBF001C */ lw $ra, 0x001C($sp) -/* 035D0 80B3F7B0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 035D4 80B3F7B4 03E00008 */ jr $ra -/* 035D8 80B3F7B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F7BC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F7BC.s deleted file mode 100644 index 793a834326..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F7BC.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B3F7BC -/* 035DC 80B3F7BC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 035E0 80B3F7C0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 035E4 80B3F7C4 AFA40018 */ sw $a0, 0x0018($sp) -/* 035E8 80B3F7C8 24060009 */ addiu $a2, $zero, 0x0009 ## $a2 = 00000009 -/* 035EC 80B3F7CC 0C2CF13C */ jal func_80B3C4F0 -/* 035F0 80B3F7D0 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 035F4 80B3F7D4 10400004 */ beq $v0, $zero, .L80B3F7E8 -/* 035F8 80B3F7D8 8FA40018 */ lw $a0, 0x0018($sp) -/* 035FC 80B3F7DC 240E0034 */ addiu $t6, $zero, 0x0034 ## $t6 = 00000034 -/* 03600 80B3F7E0 AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 -/* 03604 80B3F7E4 AC800264 */ sw $zero, 0x0264($a0) ## 00000264 -.L80B3F7E8: -/* 03608 80B3F7E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0360C 80B3F7EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03610 80B3F7F0 03E00008 */ jr $ra -/* 03614 80B3F7F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F7F8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F7F8.s deleted file mode 100644 index 515db910e2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F7F8.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B3F7F8 -/* 03618 80B3F7F8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0361C 80B3F7FC AFBF0014 */ sw $ra, 0x0014($sp) -/* 03620 80B3F800 0C2CFB52 */ jal func_80B3ED48 -/* 03624 80B3F804 AFA40018 */ sw $a0, 0x0018($sp) -/* 03628 80B3F808 0C2CFD88 */ jal func_80B3F620 -/* 0362C 80B3F80C 8FA40018 */ lw $a0, 0x0018($sp) -/* 03630 80B3F810 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03634 80B3F814 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03638 80B3F818 03E00008 */ jr $ra -/* 0363C 80B3F81C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F820.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F820.s deleted file mode 100644 index f330426176..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F820.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B3F820 -/* 03640 80B3F820 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03644 80B3F824 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03648 80B3F828 0C2CFB5A */ jal func_80B3ED68 -/* 0364C 80B3F82C AFA40018 */ sw $a0, 0x0018($sp) -/* 03650 80B3F830 0C2CFD91 */ jal func_80B3F644 -/* 03654 80B3F834 8FA40018 */ lw $a0, 0x0018($sp) -/* 03658 80B3F838 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0365C 80B3F83C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03660 80B3F840 03E00008 */ jr $ra -/* 03664 80B3F844 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F848.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F848.s deleted file mode 100644 index 59e1bf411a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F848.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B3F848 -/* 03668 80B3F848 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0366C 80B3F84C AFBF0014 */ sw $ra, 0x0014($sp) -/* 03670 80B3F850 AFA40018 */ sw $a0, 0x0018($sp) -/* 03674 80B3F854 AFA5001C */ sw $a1, 0x001C($sp) -/* 03678 80B3F858 0C2CFD4D */ jal func_80B3F534 -/* 0367C 80B3F85C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03680 80B3F860 0C2CF12C */ jal func_80B3C4B0 -/* 03684 80B3F864 8FA40018 */ lw $a0, 0x0018($sp) -/* 03688 80B3F868 8FA40018 */ lw $a0, 0x0018($sp) -/* 0368C 80B3F86C 0C2CF11A */ jal func_80B3C468 -/* 03690 80B3F870 8FA5001C */ lw $a1, 0x001C($sp) -/* 03694 80B3F874 8FA40018 */ lw $a0, 0x0018($sp) -/* 03698 80B3F878 8FA5001C */ lw $a1, 0x001C($sp) -/* 0369C 80B3F87C 0C2CF162 */ jal func_80B3C588 -/* 036A0 80B3F880 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 036A4 80B3F884 8FA40018 */ lw $a0, 0x0018($sp) -/* 036A8 80B3F888 0C2CFD9A */ jal func_80B3F668 -/* 036AC 80B3F88C 8FA5001C */ lw $a1, 0x001C($sp) -/* 036B0 80B3F890 8FBF0014 */ lw $ra, 0x0014($sp) -/* 036B4 80B3F894 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 036B8 80B3F898 03E00008 */ jr $ra -/* 036BC 80B3F89C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F8A0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F8A0.s deleted file mode 100644 index 8489807c85..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F8A0.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B3F8A0 -/* 036C0 80B3F8A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 036C4 80B3F8A4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 036C8 80B3F8A8 0C2CFB73 */ jal func_80B3EDCC -/* 036CC 80B3F8AC AFA40018 */ sw $a0, 0x0018($sp) -/* 036D0 80B3F8B0 0C2CFDB7 */ jal func_80B3F6DC -/* 036D4 80B3F8B4 8FA40018 */ lw $a0, 0x0018($sp) -/* 036D8 80B3F8B8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 036DC 80B3F8BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 036E0 80B3F8C0 03E00008 */ jr $ra -/* 036E4 80B3F8C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F8C8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F8C8.s deleted file mode 100644 index ec8f58829c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F8C8.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B3F8C8 -/* 036E8 80B3F8C8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 036EC 80B3F8CC AFBF001C */ sw $ra, 0x001C($sp) -/* 036F0 80B3F8D0 AFB00018 */ sw $s0, 0x0018($sp) -/* 036F4 80B3F8D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 036F8 80B3F8D8 0C2CF5C4 */ jal func_80B3D710 -/* 036FC 80B3F8DC AFA50024 */ sw $a1, 0x0024($sp) -/* 03700 80B3F8E0 0C2CF12C */ jal func_80B3C4B0 -/* 03704 80B3F8E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03708 80B3F8E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0370C 80B3F8EC 0C2CF11A */ jal func_80B3C468 -/* 03710 80B3F8F0 8FA50024 */ lw $a1, 0x0024($sp) -/* 03714 80B3F8F4 0C2CF0C7 */ jal func_80B3C31C -/* 03718 80B3F8F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0371C 80B3F8FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03720 80B3F900 0C2CF3A1 */ jal func_80B3CE84 -/* 03724 80B3F904 8FA50024 */ lw $a1, 0x0024($sp) -/* 03728 80B3F908 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0372C 80B3F90C 0C2CFDC0 */ jal func_80B3F700 -/* 03730 80B3F910 8FA50024 */ lw $a1, 0x0024($sp) -/* 03734 80B3F914 8FBF001C */ lw $ra, 0x001C($sp) -/* 03738 80B3F918 8FB00018 */ lw $s0, 0x0018($sp) -/* 0373C 80B3F91C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03740 80B3F920 03E00008 */ jr $ra -/* 03744 80B3F924 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F928.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F928.s deleted file mode 100644 index da8abf008d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F928.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B3F928 -/* 03748 80B3F928 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0374C 80B3F92C AFBF001C */ sw $ra, 0x001C($sp) -/* 03750 80B3F930 AFB00018 */ sw $s0, 0x0018($sp) -/* 03754 80B3F934 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03758 80B3F938 0C2CF12C */ jal func_80B3C4B0 -/* 0375C 80B3F93C AFA50024 */ sw $a1, 0x0024($sp) -/* 03760 80B3F940 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03764 80B3F944 0C2CF11A */ jal func_80B3C468 -/* 03768 80B3F948 8FA50024 */ lw $a1, 0x0024($sp) -/* 0376C 80B3F94C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03770 80B3F950 0C2CFD67 */ jal func_80B3F59C -/* 03774 80B3F954 8FA50024 */ lw $a1, 0x0024($sp) -/* 03778 80B3F958 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0377C 80B3F95C 8FA50024 */ lw $a1, 0x0024($sp) -/* 03780 80B3F960 0C2CF162 */ jal func_80B3C588 -/* 03784 80B3F964 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 03788 80B3F968 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0378C 80B3F96C 0C2CFDD5 */ jal func_80B3F754 -/* 03790 80B3F970 8FA50024 */ lw $a1, 0x0024($sp) -/* 03794 80B3F974 8FBF001C */ lw $ra, 0x001C($sp) -/* 03798 80B3F978 8FB00018 */ lw $s0, 0x0018($sp) -/* 0379C 80B3F97C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 037A0 80B3F980 03E00008 */ jr $ra -/* 037A4 80B3F984 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F988.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F988.s deleted file mode 100644 index 9867ba71e5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F988.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B3F988 -/* 037A8 80B3F988 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 037AC 80B3F98C AFBF001C */ sw $ra, 0x001C($sp) -/* 037B0 80B3F990 AFB00018 */ sw $s0, 0x0018($sp) -/* 037B4 80B3F994 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 037B8 80B3F998 0C2CF12C */ jal func_80B3C4B0 -/* 037BC 80B3F99C AFA50024 */ sw $a1, 0x0024($sp) -/* 037C0 80B3F9A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 037C4 80B3F9A4 0C2CF11A */ jal func_80B3C468 -/* 037C8 80B3F9A8 8FA50024 */ lw $a1, 0x0024($sp) -/* 037CC 80B3F9AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 037D0 80B3F9B0 0C2CFD67 */ jal func_80B3F59C -/* 037D4 80B3F9B4 8FA50024 */ lw $a1, 0x0024($sp) -/* 037D8 80B3F9B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 037DC 80B3F9BC 8FA50024 */ lw $a1, 0x0024($sp) -/* 037E0 80B3F9C0 0C2CF188 */ jal func_80B3C620 -/* 037E4 80B3F9C4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 037E8 80B3F9C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 037EC 80B3F9CC 0C2CFDEF */ jal func_80B3F7BC -/* 037F0 80B3F9D0 8FA50024 */ lw $a1, 0x0024($sp) -/* 037F4 80B3F9D4 8FBF001C */ lw $ra, 0x001C($sp) -/* 037F8 80B3F9D8 8FB00018 */ lw $s0, 0x0018($sp) -/* 037FC 80B3F9DC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03800 80B3F9E0 03E00008 */ jr $ra -/* 03804 80B3F9E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F9E8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F9E8.s deleted file mode 100644 index 92eca312d4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F9E8.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80B3F9E8 -/* 03808 80B3F9E8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0380C 80B3F9EC AFBF0014 */ sw $ra, 0x0014($sp) -/* 03810 80B3F9F0 0C2CFD67 */ jal func_80B3F59C -/* 03814 80B3F9F4 00000000 */ nop -/* 03818 80B3F9F8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0381C 80B3F9FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03820 80B3FA00 03E00008 */ jr $ra -/* 03824 80B3FA04 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA08.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA08.s deleted file mode 100644 index 444ba53cc2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA08.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B3FA08 -/* 03828 80B3FA08 AFA50004 */ sw $a1, 0x0004($sp) -/* 0382C 80B3FA0C 240E0035 */ addiu $t6, $zero, 0x0035 ## $t6 = 00000035 -/* 03830 80B3FA10 AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 -/* 03834 80B3FA14 3C0F8016 */ lui $t7, %hi(gGameInfo) -/* 03838 80B3FA18 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) -/* 0383C 80B3FA1C 85F81484 */ lh $t8, 0x1484($t7) ## 80161484 -/* 03840 80B3FA20 271953FC */ addiu $t9, $t8, 0x53FC ## $t9 = 000053FC -/* 03844 80B3FA24 03E00008 */ jr $ra -/* 03848 80B3FA28 A49902A4 */ sh $t9, 0x02A4($a0) ## 000002A4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA2C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA2C.s deleted file mode 100644 index d51bbd98e7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA2C.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80B3FA2C -/* 0384C 80B3FA2C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03850 80B3FA30 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03854 80B3FA34 0C03CFCF */ jal func_800F3F3C -/* 03858 80B3FA38 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 0385C 80B3FA3C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03860 80B3FA40 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03864 80B3FA44 03E00008 */ jr $ra -/* 03868 80B3FA48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA4C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA4C.s deleted file mode 100644 index 725e59eb18..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA4C.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80B3FA4C -/* 0386C 80B3FA4C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 03870 80B3FA50 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03874 80B3FA54 AFA40048 */ sw $a0, 0x0048($sp) -/* 03878 80B3FA58 AFA5004C */ sw $a1, 0x004C($sp) -/* 0387C 80B3FA5C 8C8F02A8 */ lw $t7, 0x02A8($a0) ## 000002A8 -/* 03880 80B3FA60 3C1880B4 */ lui $t8, %hi(D_80B41DB0) ## $t8 = 80B40000 -/* 03884 80B3FA64 27181DB0 */ addiu $t8, $t8, %lo(D_80B41DB0) ## $t8 = 80B41DB0 -/* 03888 80B3FA68 51E0001A */ beql $t7, $zero, .L80B3FAD4 -/* 0388C 80B3FA6C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03890 80B3FA70 8F080000 */ lw $t0, 0x0000($t8) ## 80B41DB0 -/* 03894 80B3FA74 27A4001C */ addiu $a0, $sp, 0x001C ## $a0 = FFFFFFD4 -/* 03898 80B3FA78 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFEC -/* 0389C 80B3FA7C AC880000 */ sw $t0, 0x0000($a0) ## FFFFFFD4 -/* 038A0 80B3FA80 8F190004 */ lw $t9, 0x0004($t8) ## 80B41DB4 -/* 038A4 80B3FA84 AC990004 */ sw $t9, 0x0004($a0) ## FFFFFFD8 -/* 038A8 80B3FA88 8F080008 */ lw $t0, 0x0008($t8) ## 80B41DB8 -/* 038AC 80B3FA8C 0C0346BD */ jal Matrix_MultVec3f -/* 038B0 80B3FA90 AC880008 */ sw $t0, 0x0008($a0) ## FFFFFFDC -/* 038B4 80B3FA94 8FA4004C */ lw $a0, 0x004C($sp) -/* 038B8 80B3FA98 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 038BC 80B3FA9C 34211D60 */ ori $at, $at, 0x1D60 ## $at = 00011D60 -/* 038C0 80B3FAA0 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFEC -/* 038C4 80B3FAA4 27A60028 */ addiu $a2, $sp, 0x0028 ## $a2 = FFFFFFE0 -/* 038C8 80B3FAA8 27A70018 */ addiu $a3, $sp, 0x0018 ## $a3 = FFFFFFD0 -/* 038CC 80B3FAAC 0C029B84 */ jal SkinMatrix_Vec3fMtxFMultXYZW -/* 038D0 80B3FAB0 00812021 */ addu $a0, $a0, $at -/* 038D4 80B3FAB4 8FA4004C */ lw $a0, 0x004C($sp) -/* 038D8 80B3FAB8 27A50028 */ addiu $a1, $sp, 0x0028 ## $a1 = FFFFFFE0 -/* 038DC 80B3FABC 24060050 */ addiu $a2, $zero, 0x0050 ## $a2 = 00000050 -/* 038E0 80B3FAC0 0C01AEB6 */ jal Audio_PlaySoundAtPosition - -/* 038E4 80B3FAC4 240728C1 */ addiu $a3, $zero, 0x28C1 ## $a3 = 000028C1 -/* 038E8 80B3FAC8 8FA90048 */ lw $t1, 0x0048($sp) -/* 038EC 80B3FACC AD2002A8 */ sw $zero, 0x02A8($t1) ## 000002A8 -/* 038F0 80B3FAD0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B3FAD4: -/* 038F4 80B3FAD4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 038F8 80B3FAD8 03E00008 */ jr $ra -/* 038FC 80B3FADC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FAE0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FAE0.s deleted file mode 100644 index 8cc554d654..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FAE0.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B3FAE0 -/* 03900 80B3FAE0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03904 80B3FAE4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03908 80B3FAE8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0390C 80B3FAEC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03910 80B3FAF0 0C0295B2 */ jal Animation_OnFrame -/* 03914 80B3FAF4 3C054218 */ lui $a1, 0x4218 ## $a1 = 42180000 -/* 03918 80B3FAF8 10400006 */ beq $v0, $zero, .L80B3FB14 -/* 0391C 80B3FAFC 8FA40018 */ lw $a0, 0x0018($sp) -/* 03920 80B3FB00 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 03924 80B3FB04 0C01E245 */ jal func_80078914 -/* 03928 80B3FB08 24056874 */ addiu $a1, $zero, 0x6874 ## $a1 = 00006874 -/* 0392C 80B3FB0C 0C2CFE8B */ jal func_80B3FA2C -/* 03930 80B3FB10 00000000 */ nop -.L80B3FB14: -/* 03934 80B3FB14 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03938 80B3FB18 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0393C 80B3FB1C 03E00008 */ jr $ra -/* 03940 80B3FB20 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FB24.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FB24.s deleted file mode 100644 index 58d0fd7fb0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FB24.s +++ /dev/null @@ -1,272 +0,0 @@ -.late_rodata -glabel D_80B4224C - .float 0.1 - -glabel D_80B42250 - .float 0.1 - -glabel D_80B42254 - .float 0.1 - -.text -glabel func_80B3FB24 -/* 03944 80B3FB24 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 03948 80B3FB28 AFBF002C */ sw $ra, 0x002C($sp) -/* 0394C 80B3FB2C AFB00028 */ sw $s0, 0x0028($sp) -/* 03950 80B3FB30 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03954 80B3FB34 F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 03958 80B3FB38 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 0395C 80B3FB3C AFA50064 */ sw $a1, 0x0064($sp) -/* 03960 80B3FB40 24060015 */ addiu $a2, $zero, 0x0015 ## $a2 = 00000015 -/* 03964 80B3FB44 0C2CF13C */ jal func_80B3C4F0 -/* 03968 80B3FB48 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 0396C 80B3FB4C 10400009 */ beq $v0, $zero, .L80B3FB74 -/* 03970 80B3FB50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03974 80B3FB54 8E0E02AC */ lw $t6, 0x02AC($s0) ## 000002AC -/* 03978 80B3FB58 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 0397C 80B3FB5C AE030274 */ sw $v1, 0x0274($s0) ## 00000274 -/* 03980 80B3FB60 55C0000C */ bnel $t6, $zero, .L80B3FB94 -/* 03984 80B3FB64 8E020274 */ lw $v0, 0x0274($s0) ## 00000274 -/* 03988 80B3FB68 AE0302AC */ sw $v1, 0x02AC($s0) ## 000002AC -/* 0398C 80B3FB6C 10000008 */ beq $zero, $zero, .L80B3FB90 -/* 03990 80B3FB70 AE0302A8 */ sw $v1, 0x02A8($s0) ## 000002A8 -.L80B3FB74: -/* 03994 80B3FB74 8FA50064 */ lw $a1, 0x0064($sp) -/* 03998 80B3FB78 24060013 */ addiu $a2, $zero, 0x0013 ## $a2 = 00000013 -/* 0399C 80B3FB7C 0C2CF13C */ jal func_80B3C4F0 -/* 039A0 80B3FB80 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 039A4 80B3FB84 10400002 */ beq $v0, $zero, .L80B3FB90 -/* 039A8 80B3FB88 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 039AC 80B3FB8C AE0F0274 */ sw $t7, 0x0274($s0) ## 00000274 -.L80B3FB90: -/* 039B0 80B3FB90 8E020274 */ lw $v0, 0x0274($s0) ## 00000274 -.L80B3FB94: -/* 039B4 80B3FB94 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 039B8 80B3FB98 504000D7 */ beql $v0, $zero, .L80B3FEF8 -/* 039BC 80B3FB9C 8FBF002C */ lw $ra, 0x002C($sp) -/* 039C0 80B3FBA0 14620051 */ bne $v1, $v0, .L80B3FCE8 -/* 039C4 80B3FBA4 3C058016 */ lui $a1, %hi(gGameInfo) -/* 039C8 80B3FBA8 24A5FA90 */ addiu $a1, %lo(gGameInfo) -/* 039CC 80B3FBAC 8CB80000 */ lw $t8, 0x0000($a1) ## 8015FA90 -/* 039D0 80B3FBB0 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 039D4 80B3FBB4 4481A000 */ mtc1 $at, $f20 ## $f20 = 40.00 -/* 039D8 80B3FBB8 87191486 */ lh $t9, 0x1486($t8) ## 00001486 -/* 039DC 80B3FBBC 26040268 */ addiu $a0, $s0, 0x0268 ## $a0 = 00000268 -/* 039E0 80B3FBC0 C4920000 */ lwc1 $f18, 0x0000($a0) ## 00000268 -/* 039E4 80B3FBC4 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 039E8 80B3FBC8 26020278 */ addiu $v0, $s0, 0x0278 ## $v0 = 00000278 -/* 039EC 80B3FBCC 240E00AA */ addiu $t6, $zero, 0x00AA ## $t6 = 000000AA -/* 039F0 80B3FBD0 468021A0 */ cvt.s.w $f6, $f4 -/* 039F4 80B3FBD4 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 039F8 80B3FBD8 241800C8 */ addiu $t8, $zero, 0x00C8 ## $t8 = 000000C8 -/* 039FC 80B3FBDC 46143080 */ add.s $f2, $f6, $f20 -/* 03A00 80B3FBE0 4602903C */ c.lt.s $f18, $f2 -/* 03A04 80B3FBE4 00000000 */ nop -/* 03A08 80B3FBE8 45020021 */ bc1fl .L80B3FC70 -/* 03A0C 80B3FBEC AC4E0008 */ sw $t6, 0x0008($v0) ## 00000280 -/* 03A10 80B3FBF0 46029003 */ div.s $f0, $f18, $f2 -/* 03A14 80B3FBF4 3C01C2AA */ lui $at, 0xC2AA ## $at = C2AA0000 -/* 03A18 80B3FBF8 44814000 */ mtc1 $at, $f8 ## $f8 = -85.00 -/* 03A1C 80B3FBFC 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 03A20 80B3FC00 44812000 */ mtc1 $at, $f4 ## $f4 = 255.00 -/* 03A24 80B3FC04 26020278 */ addiu $v0, $s0, 0x0278 ## $v0 = 00000278 -/* 03A28 80B3FC08 46004282 */ mul.s $f10, $f8, $f0 -/* 03A2C 80B3FC0C 46045180 */ add.s $f6, $f10, $f4 -/* 03A30 80B3FC10 44815000 */ mtc1 $at, $f10 ## $f10 = 255.00 -/* 03A34 80B3FC14 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 03A38 80B3FC18 4600320D */ trunc.w.s $f8, $f6 -/* 03A3C 80B3FC1C 46005102 */ mul.s $f4, $f10, $f0 -/* 03A40 80B3FC20 44094000 */ mfc1 $t1, $f8 -/* 03A44 80B3FC24 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 03A48 80B3FC28 AC490008 */ sw $t1, 0x0008($v0) ## 00000280 -/* 03A4C 80B3FC2C 46004282 */ mul.s $f10, $f8, $f0 -/* 03A50 80B3FC30 4600218D */ trunc.w.s $f6, $f4 -/* 03A54 80B3FC34 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 -/* 03A58 80B3FC38 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 03A5C 80B3FC3C 440B3000 */ mfc1 $t3, $f6 -/* 03A60 80B3FC40 46045180 */ add.s $f6, $f10, $f4 -/* 03A64 80B3FC44 AC4B000C */ sw $t3, 0x000C($v0) ## 00000284 -/* 03A68 80B3FC48 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 03A6C 80B3FC4C 4600320D */ trunc.w.s $f8, $f6 -/* 03A70 80B3FC50 440D4000 */ mfc1 $t5, $f8 -/* 03A74 80B3FC54 00000000 */ nop -/* 03A78 80B3FC58 AE0D028C */ sw $t5, 0x028C($s0) ## 0000028C -/* 03A7C 80B3FC5C C48A0000 */ lwc1 $f10, 0x0000($a0) ## 00000268 -/* 03A80 80B3FC60 46045180 */ add.s $f6, $f10, $f4 -/* 03A84 80B3FC64 10000004 */ beq $zero, $zero, .L80B3FC78 -/* 03A88 80B3FC68 E4860000 */ swc1 $f6, 0x0000($a0) ## 00000268 -/* 03A8C 80B3FC6C AC4E0008 */ sw $t6, 0x0008($v0) ## 00000280 -.L80B3FC70: -/* 03A90 80B3FC70 AC4F000C */ sw $t7, 0x000C($v0) ## 00000284 -/* 03A94 80B3FC74 AE18028C */ sw $t8, 0x028C($s0) ## 0000028C -.L80B3FC78: -/* 03A98 80B3FC78 8CB90000 */ lw $t9, 0x0000($a1) ## 8015FA90 -/* 03A9C 80B3FC7C 3C0180B4 */ lui $at, %hi(D_80B4224C) ## $at = 80B40000 -/* 03AA0 80B3FC80 C436224C */ lwc1 $f22, %lo(D_80B4224C)($at) -/* 03AA4 80B3FC84 8728147A */ lh $t0, 0x147A($t9) ## 0000147A -/* 03AA8 80B3FC88 26030298 */ addiu $v1, $s0, 0x0298 ## $v1 = 00000298 -/* 03AAC 80B3FC8C 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 -/* 03AB0 80B3FC90 00000000 */ nop -/* 03AB4 80B3FC94 468042A0 */ cvt.s.w $f10, $f8 -/* 03AB8 80B3FC98 46165102 */ mul.s $f4, $f10, $f22 -/* 03ABC 80B3FC9C 46142180 */ add.s $f6, $f4, $f20 -/* 03AC0 80B3FCA0 E4660000 */ swc1 $f6, 0x0000($v1) ## 00000298 -/* 03AC4 80B3FCA4 8CA90000 */ lw $t1, 0x0000($a1) ## 8015FA90 -/* 03AC8 80B3FCA8 852A147C */ lh $t2, 0x147C($t1) ## 0000147C -/* 03ACC 80B3FCAC 448A4000 */ mtc1 $t2, $f8 ## $f8 = 0.00 -/* 03AD0 80B3FCB0 00000000 */ nop -/* 03AD4 80B3FCB4 468042A0 */ cvt.s.w $f10, $f8 -/* 03AD8 80B3FCB8 46165102 */ mul.s $f4, $f10, $f22 -/* 03ADC 80B3FCBC 46142180 */ add.s $f6, $f4, $f20 -/* 03AE0 80B3FCC0 E4660004 */ swc1 $f6, 0x0004($v1) ## 0000029C -/* 03AE4 80B3FCC4 8CAB0000 */ lw $t3, 0x0000($a1) ## 8015FA90 -/* 03AE8 80B3FCC8 856C147E */ lh $t4, 0x147E($t3) ## 0000147E -/* 03AEC 80B3FCCC 448C4000 */ mtc1 $t4, $f8 ## $f8 = 0.00 -/* 03AF0 80B3FCD0 00000000 */ nop -/* 03AF4 80B3FCD4 468042A0 */ cvt.s.w $f10, $f8 -/* 03AF8 80B3FCD8 46165102 */ mul.s $f4, $f10, $f22 -/* 03AFC 80B3FCDC 46142180 */ add.s $f6, $f4, $f20 -/* 03B00 80B3FCE0 10000084 */ beq $zero, $zero, .L80B3FEF4 -/* 03B04 80B3FCE4 E4660008 */ swc1 $f6, 0x0008($v1) ## 000002A0 -.L80B3FCE8: -/* 03B08 80B3FCE8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 03B0C 80B3FCEC 14410081 */ bne $v0, $at, .L80B3FEF4 -/* 03B10 80B3FCF0 3C058016 */ lui $a1, %hi(gGameInfo) -/* 03B14 80B3FCF4 24A5FA90 */ addiu $a1, %lo(gGameInfo) -/* 03B18 80B3FCF8 8CA20000 */ lw $v0, 0x0000($a1) ## 8015FA90 -/* 03B1C 80B3FCFC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 03B20 80B3FD00 4481A000 */ mtc1 $at, $f20 ## $f20 = 40.00 -/* 03B24 80B3FD04 844D148A */ lh $t5, 0x148A($v0) ## 00001702 -/* 03B28 80B3FD08 844E1486 */ lh $t6, 0x1486($v0) ## 000016FE -/* 03B2C 80B3FD0C 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 -/* 03B30 80B3FD10 448D4000 */ mtc1 $t5, $f8 ## $f8 = 0.00 -/* 03B34 80B3FD14 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 -/* 03B38 80B3FD18 44812000 */ mtc1 $at, $f4 ## $f4 = 90.00 -/* 03B3C 80B3FD1C 468042A0 */ cvt.s.w $f10, $f8 -/* 03B40 80B3FD20 26040268 */ addiu $a0, $s0, 0x0268 ## $a0 = 00000268 -/* 03B44 80B3FD24 C4920000 */ lwc1 $f18, 0x0000($a0) ## 00000268 -/* 03B48 80B3FD28 46803220 */ cvt.s.w $f8, $f6 -/* 03B4C 80B3FD2C 46045300 */ add.s $f12, $f10, $f4 -/* 03B50 80B3FD30 46144080 */ add.s $f2, $f8, $f20 -/* 03B54 80B3FD34 E7AC0034 */ swc1 $f12, 0x0034($sp) -/* 03B58 80B3FD38 46026000 */ add.s $f0, $f12, $f2 -/* 03B5C 80B3FD3C 4600903C */ c.lt.s $f18, $f0 -/* 03B60 80B3FD40 00000000 */ nop -/* 03B64 80B3FD44 4502003E */ bc1fl .L80B3FE40 -/* 03B68 80B3FD48 844B1488 */ lh $t3, 0x1488($v0) ## 00001700 -/* 03B6C 80B3FD4C 844F147A */ lh $t7, 0x147A($v0) ## 000016F2 -/* 03B70 80B3FD50 46029281 */ sub.s $f10, $f18, $f2 -/* 03B74 80B3FD54 C7A40034 */ lwc1 $f4, 0x0034($sp) -/* 03B78 80B3FD58 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 03B7C 80B3FD5C 84581488 */ lh $t8, 0x1488($v0) ## 00001700 -/* 03B80 80B3FD60 46045003 */ div.s $f0, $f10, $f4 -/* 03B84 80B3FD64 3C0180B4 */ lui $at, %hi(D_80B42250) ## $at = 80B40000 -/* 03B88 80B3FD68 C4362250 */ lwc1 $f22, %lo(D_80B42250)($at) -/* 03B8C 80B3FD6C 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 03B90 80B3FD70 46803220 */ cvt.s.w $f8, $f6 -/* 03B94 80B3FD74 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 03B98 80B3FD78 26030298 */ addiu $v1, $s0, 0x0298 ## $v1 = 00000298 -/* 03B9C 80B3FD7C 468021A0 */ cvt.s.w $f6, $f4 -/* 03BA0 80B3FD80 46164282 */ mul.s $f10, $f8, $f22 -/* 03BA4 80B3FD84 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 -/* 03BA8 80B3FD88 46145300 */ add.s $f12, $f10, $f20 -/* 03BAC 80B3FD8C 46083280 */ add.s $f10, $f6, $f8 -/* 03BB0 80B3FD90 460A6102 */ mul.s $f4, $f12, $f10 -/* 03BB4 80B3FD94 00000000 */ nop -/* 03BB8 80B3FD98 46002182 */ mul.s $f6, $f4, $f0 -/* 03BBC 80B3FD9C 460C3200 */ add.s $f8, $f6, $f12 -/* 03BC0 80B3FDA0 E4680000 */ swc1 $f8, 0x0000($v1) ## 00000298 -/* 03BC4 80B3FDA4 8CA20000 */ lw $v0, 0x0000($a1) ## 8015FA90 -/* 03BC8 80B3FDA8 8459147C */ lh $t9, 0x147C($v0) ## 000016F4 -/* 03BCC 80B3FDAC 84481488 */ lh $t0, 0x1488($v0) ## 00001700 -/* 03BD0 80B3FDB0 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 03BD4 80B3FDB4 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 -/* 03BD8 80B3FDB8 46805120 */ cvt.s.w $f4, $f10 -/* 03BDC 80B3FDBC 468042A0 */ cvt.s.w $f10, $f8 -/* 03BE0 80B3FDC0 46162182 */ mul.s $f6, $f4, $f22 -/* 03BE4 80B3FDC4 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 03BE8 80B3FDC8 46143380 */ add.s $f14, $f6, $f20 -/* 03BEC 80B3FDCC 46045180 */ add.s $f6, $f10, $f4 -/* 03BF0 80B3FDD0 46067202 */ mul.s $f8, $f14, $f6 -/* 03BF4 80B3FDD4 00000000 */ nop -/* 03BF8 80B3FDD8 46004282 */ mul.s $f10, $f8, $f0 -/* 03BFC 80B3FDDC 460E5100 */ add.s $f4, $f10, $f14 -/* 03C00 80B3FDE0 E4640004 */ swc1 $f4, 0x0004($v1) ## 0000029C -/* 03C04 80B3FDE4 8CA20000 */ lw $v0, 0x0000($a1) ## 8015FA90 -/* 03C08 80B3FDE8 8449147E */ lh $t1, 0x147E($v0) ## 000016F6 -/* 03C0C 80B3FDEC 844A1488 */ lh $t2, 0x1488($v0) ## 00001700 -/* 03C10 80B3FDF0 44893000 */ mtc1 $t1, $f6 ## $f6 = 0.00 -/* 03C14 80B3FDF4 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 03C18 80B3FDF8 46803220 */ cvt.s.w $f8, $f6 -/* 03C1C 80B3FDFC 468021A0 */ cvt.s.w $f6, $f4 -/* 03C20 80B3FE00 46164282 */ mul.s $f10, $f8, $f22 -/* 03C24 80B3FE04 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 -/* 03C28 80B3FE08 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 03C2C 80B3FE0C 46145400 */ add.s $f16, $f10, $f20 -/* 03C30 80B3FE10 46083280 */ add.s $f10, $f6, $f8 -/* 03C34 80B3FE14 460A8102 */ mul.s $f4, $f16, $f10 -/* 03C38 80B3FE18 00000000 */ nop -/* 03C3C 80B3FE1C 46002182 */ mul.s $f6, $f4, $f0 -/* 03C40 80B3FE20 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 03C44 80B3FE24 46103200 */ add.s $f8, $f6, $f16 -/* 03C48 80B3FE28 E4680008 */ swc1 $f8, 0x0008($v1) ## 000002A0 -/* 03C4C 80B3FE2C C48A0000 */ lwc1 $f10, 0x0000($a0) ## 00000268 -/* 03C50 80B3FE30 46045180 */ add.s $f6, $f10, $f4 -/* 03C54 80B3FE34 10000029 */ beq $zero, $zero, .L80B3FEDC -/* 03C58 80B3FE38 E4860000 */ swc1 $f6, 0x0000($a0) ## 00000268 -/* 03C5C 80B3FE3C 844B1488 */ lh $t3, 0x1488($v0) ## 00001700 -.L80B3FE40: -/* 03C60 80B3FE40 844C147A */ lh $t4, 0x147A($v0) ## 000016F2 -/* 03C64 80B3FE44 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 03C68 80B3FE48 448B4000 */ mtc1 $t3, $f8 ## $f8 = 0.00 -/* 03C6C 80B3FE4C 448C3000 */ mtc1 $t4, $f6 ## $f6 = 0.00 -/* 03C70 80B3FE50 44810000 */ mtc1 $at, $f0 ## $f0 = 50.00 -/* 03C74 80B3FE54 468042A0 */ cvt.s.w $f10, $f8 -/* 03C78 80B3FE58 3C0180B4 */ lui $at, %hi(D_80B42254) ## $at = 80B40000 -/* 03C7C 80B3FE5C C4362254 */ lwc1 $f22, %lo(D_80B42254)($at) -/* 03C80 80B3FE60 26030298 */ addiu $v1, $s0, 0x0298 ## $v1 = 00000298 -/* 03C84 80B3FE64 46803220 */ cvt.s.w $f8, $f6 -/* 03C88 80B3FE68 46005100 */ add.s $f4, $f10, $f0 -/* 03C8C 80B3FE6C 46164282 */ mul.s $f10, $f8, $f22 -/* 03C90 80B3FE70 46145180 */ add.s $f6, $f10, $f20 -/* 03C94 80B3FE74 46062202 */ mul.s $f8, $f4, $f6 -/* 03C98 80B3FE78 E4680000 */ swc1 $f8, 0x0000($v1) ## 00000298 -/* 03C9C 80B3FE7C 8CA20000 */ lw $v0, 0x0000($a1) ## 8015FA90 -/* 03CA0 80B3FE80 844D1488 */ lh $t5, 0x1488($v0) ## 00001700 -/* 03CA4 80B3FE84 844E147C */ lh $t6, 0x147C($v0) ## 000016F4 -/* 03CA8 80B3FE88 448D5000 */ mtc1 $t5, $f10 ## $f10 = 0.00 -/* 03CAC 80B3FE8C 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 03CB0 80B3FE90 46805120 */ cvt.s.w $f4, $f10 -/* 03CB4 80B3FE94 468042A0 */ cvt.s.w $f10, $f8 -/* 03CB8 80B3FE98 46002180 */ add.s $f6, $f4, $f0 -/* 03CBC 80B3FE9C 46165102 */ mul.s $f4, $f10, $f22 -/* 03CC0 80B3FEA0 46142200 */ add.s $f8, $f4, $f20 -/* 03CC4 80B3FEA4 46083282 */ mul.s $f10, $f6, $f8 -/* 03CC8 80B3FEA8 E46A0004 */ swc1 $f10, 0x0004($v1) ## 0000029C -/* 03CCC 80B3FEAC 8CA20000 */ lw $v0, 0x0000($a1) ## 8015FA90 -/* 03CD0 80B3FEB0 844F1488 */ lh $t7, 0x1488($v0) ## 00001700 -/* 03CD4 80B3FEB4 8458147E */ lh $t8, 0x147E($v0) ## 000016F6 -/* 03CD8 80B3FEB8 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 03CDC 80B3FEBC 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 03CE0 80B3FEC0 468021A0 */ cvt.s.w $f6, $f4 -/* 03CE4 80B3FEC4 46805120 */ cvt.s.w $f4, $f10 -/* 03CE8 80B3FEC8 46003200 */ add.s $f8, $f6, $f0 -/* 03CEC 80B3FECC 46162182 */ mul.s $f6, $f4, $f22 -/* 03CF0 80B3FED0 46143280 */ add.s $f10, $f6, $f20 -/* 03CF4 80B3FED4 460A4102 */ mul.s $f4, $f8, $f10 -/* 03CF8 80B3FED8 E4640008 */ swc1 $f4, 0x0008($v1) ## 000002A0 -.L80B3FEDC: -/* 03CFC 80B3FEDC 8CA80000 */ lw $t0, 0x0000($a1) ## 8015FA90 -/* 03D00 80B3FEE0 861902A4 */ lh $t9, 0x02A4($s0) ## 000002A4 -/* 03D04 80B3FEE4 8509148C */ lh $t1, 0x148C($t0) ## 0000148C -/* 03D08 80B3FEE8 252C2EE0 */ addiu $t4, $t1, 0x2EE0 ## $t4 = 00002EE0 -/* 03D0C 80B3FEEC 032C6821 */ addu $t5, $t9, $t4 -/* 03D10 80B3FEF0 A60D02A4 */ sh $t5, 0x02A4($s0) ## 000002A4 -.L80B3FEF4: -/* 03D14 80B3FEF4 8FBF002C */ lw $ra, 0x002C($sp) -.L80B3FEF8: -/* 03D18 80B3FEF8 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 03D1C 80B3FEFC D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 03D20 80B3FF00 8FB00028 */ lw $s0, 0x0028($sp) -/* 03D24 80B3FF04 03E00008 */ jr $ra -/* 03D28 80B3FF08 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FF0C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FF0C.s deleted file mode 100644 index 9cbc3d2f99..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FF0C.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_80B3FF0C -/* 03D2C 80B3FF0C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03D30 80B3FF10 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03D34 80B3FF14 AFA40018 */ sw $a0, 0x0018($sp) -/* 03D38 80B3FF18 AFA5001C */ sw $a1, 0x001C($sp) -/* 03D3C 80B3FF1C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 03D40 80B3FF20 0C2CF14F */ jal func_80B3C53C -/* 03D44 80B3FF24 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 03D48 80B3FF28 8FA40018 */ lw $a0, 0x0018($sp) -/* 03D4C 80B3FF2C 1040001D */ beq $v0, $zero, .L80B3FFA4 -/* 03D50 80B3FF30 8FA5001C */ lw $a1, 0x001C($sp) -/* 03D54 80B3FF34 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 03D58 80B3FF38 24080036 */ addiu $t0, $zero, 0x0036 ## $t0 = 00000036 -/* 03D5C 80B3FF3C 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 03D60 80B3FF40 51C00017 */ beql $t6, $zero, .L80B3FFA0 -/* 03D64 80B3FF44 AC880260 */ sw $t0, 0x0260($a0) ## 00000260 -/* 03D68 80B3FF48 8CA21D9C */ lw $v0, 0x1D9C($a1) ## 00001D9C -/* 03D6C 80B3FF4C 50400014 */ beql $v0, $zero, .L80B3FFA0 -/* 03D70 80B3FF50 AC880260 */ sw $t0, 0x0260($a0) ## 00000260 -/* 03D74 80B3FF54 8C4F000C */ lw $t7, 0x000C($v0) ## 0000000C -/* 03D78 80B3FF58 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 03D7C 80B3FF5C 00000000 */ nop -/* 03D80 80B3FF60 468021A0 */ cvt.s.w $f6, $f4 -/* 03D84 80B3FF64 E4860024 */ swc1 $f6, 0x0024($a0) ## 00000024 -/* 03D88 80B3FF68 8C580010 */ lw $t8, 0x0010($v0) ## 00000010 -/* 03D8C 80B3FF6C 44984000 */ mtc1 $t8, $f8 ## $f8 = 0.00 -/* 03D90 80B3FF70 00000000 */ nop -/* 03D94 80B3FF74 468042A0 */ cvt.s.w $f10, $f8 -/* 03D98 80B3FF78 E48A0028 */ swc1 $f10, 0x0028($a0) ## 00000028 -/* 03D9C 80B3FF7C 8C590014 */ lw $t9, 0x0014($v0) ## 00000014 -/* 03DA0 80B3FF80 44998000 */ mtc1 $t9, $f16 ## $f16 = 0.00 -/* 03DA4 80B3FF84 00000000 */ nop -/* 03DA8 80B3FF88 468084A0 */ cvt.s.w $f18, $f16 -/* 03DAC 80B3FF8C E492002C */ swc1 $f18, 0x002C($a0) ## 0000002C -/* 03DB0 80B3FF90 84430008 */ lh $v1, 0x0008($v0) ## 00000008 -/* 03DB4 80B3FF94 A48300B6 */ sh $v1, 0x00B6($a0) ## 000000B6 -/* 03DB8 80B3FF98 A4830032 */ sh $v1, 0x0032($a0) ## 00000032 -/* 03DBC 80B3FF9C AC880260 */ sw $t0, 0x0260($a0) ## 00000260 -.L80B3FFA0: -/* 03DC0 80B3FFA0 AC890264 */ sw $t1, 0x0264($a0) ## 00000264 -.L80B3FFA4: -/* 03DC4 80B3FFA4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03DC8 80B3FFA8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03DCC 80B3FFAC 03E00008 */ jr $ra -/* 03DD0 80B3FFB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FFB4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FFB4.s deleted file mode 100644 index 8cb48b46c5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FFB4.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_80B3FFB4 -/* 03DD4 80B3FFB4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03DD8 80B3FFB8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03DDC 80B3FFBC AFA40028 */ sw $a0, 0x0028($sp) -/* 03DE0 80B3FFC0 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 03DE4 80B3FFC4 0C2CF13C */ jal func_80B3C4F0 -/* 03DE8 80B3FFC8 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 03DEC 80B3FFCC 10400018 */ beq $v0, $zero, .L80B40030 -/* 03DF0 80B3FFD0 3C040600 */ lui $a0, %hi(D_06001A08) ## $a0 = 06000000 -/* 03DF4 80B3FFD4 0C028800 */ jal Animation_GetLastFrame - -/* 03DF8 80B3FFD8 24841A08 */ addiu $a0, $a0, %lo(D_06001A08) ## $a0 = 06001A08 -/* 03DFC 80B3FFDC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 03E00 80B3FFE0 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 03E04 80B3FFE4 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 03E08 80B3FFE8 468021A0 */ cvt.s.w $f6, $f4 -/* 03E0C 80B3FFEC 8FA40028 */ lw $a0, 0x0028($sp) -/* 03E10 80B3FFF0 3C050600 */ lui $a1, %hi(D_06001A08) ## $a1 = 06000000 -/* 03E14 80B3FFF4 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 03E18 80B3FFF8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 03E1C 80B3FFFC 24A51A08 */ addiu $a1, $a1, %lo(D_06001A08) ## $a1 = 06001A08 -/* 03E20 80B40000 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 03E24 80B40004 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03E28 80B40008 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 03E2C 80B4000C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 03E30 80B40010 0C029468 */ jal Animation_Change - -/* 03E34 80B40014 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03E38 80B40018 8FB80028 */ lw $t8, 0x0028($sp) -/* 03E3C 80B4001C 240F0037 */ addiu $t7, $zero, 0x0037 ## $t7 = 00000037 -/* 03E40 80B40020 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 -/* 03E44 80B40024 AF0F0260 */ sw $t7, 0x0260($t8) ## 00000260 -/* 03E48 80B40028 8FA80028 */ lw $t0, 0x0028($sp) -/* 03E4C 80B4002C AD190264 */ sw $t9, 0x0264($t0) ## 00000264 -.L80B40030: -/* 03E50 80B40030 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03E54 80B40034 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03E58 80B40038 03E00008 */ jr $ra -/* 03E5C 80B4003C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40040.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40040.s deleted file mode 100644 index 2572ff2cac..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40040.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80B40040 -/* 03E60 80B40040 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03E64 80B40044 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03E68 80B40048 10A00014 */ beq $a1, $zero, .L80B4009C -/* 03E6C 80B4004C AFA40028 */ sw $a0, 0x0028($sp) -/* 03E70 80B40050 3C040600 */ lui $a0, %hi(D_06001D14) ## $a0 = 06000000 -/* 03E74 80B40054 0C028800 */ jal Animation_GetLastFrame - -/* 03E78 80B40058 24841D14 */ addiu $a0, $a0, %lo(D_06001D14) ## $a0 = 06001D14 -/* 03E7C 80B4005C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 03E80 80B40060 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 03E84 80B40064 8FA40028 */ lw $a0, 0x0028($sp) -/* 03E88 80B40068 468021A0 */ cvt.s.w $f6, $f4 -/* 03E8C 80B4006C 3C050600 */ lui $a1, %hi(D_06001D14) ## $a1 = 06000000 -/* 03E90 80B40070 44070000 */ mfc1 $a3, $f0 -/* 03E94 80B40074 24A51D14 */ addiu $a1, $a1, %lo(D_06001D14) ## $a1 = 06001D14 -/* 03E98 80B40078 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03E9C 80B4007C AFA00014 */ sw $zero, 0x0014($sp) -/* 03EA0 80B40080 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 03EA4 80B40084 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03EA8 80B40088 0C029468 */ jal Animation_Change - -/* 03EAC 80B4008C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 03EB0 80B40090 8FAF0028 */ lw $t7, 0x0028($sp) -/* 03EB4 80B40094 240E0038 */ addiu $t6, $zero, 0x0038 ## $t6 = 00000038 -/* 03EB8 80B40098 ADEE0260 */ sw $t6, 0x0260($t7) ## 00000260 -.L80B4009C: -/* 03EBC 80B4009C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03EC0 80B400A0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03EC4 80B400A4 03E00008 */ jr $ra -/* 03EC8 80B400A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B400AC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B400AC.s deleted file mode 100644 index 74cf7b1519..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B400AC.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B400AC -/* 03ECC 80B400AC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03ED0 80B400B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03ED4 80B400B4 AFA40018 */ sw $a0, 0x0018($sp) -/* 03ED8 80B400B8 24060009 */ addiu $a2, $zero, 0x0009 ## $a2 = 00000009 -/* 03EDC 80B400BC 0C2CF13C */ jal func_80B3C4F0 -/* 03EE0 80B400C0 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 03EE4 80B400C4 50400004 */ beql $v0, $zero, .L80B400D8 -/* 03EE8 80B400C8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03EEC 80B400CC 0C00B55C */ jal Actor_Kill - -/* 03EF0 80B400D0 8FA40018 */ lw $a0, 0x0018($sp) -/* 03EF4 80B400D4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B400D8: -/* 03EF8 80B400D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03EFC 80B400DC 03E00008 */ jr $ra -/* 03F00 80B400E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B400E4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B400E4.s deleted file mode 100644 index 8b0e24b88a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B400E4.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80B400E4 -/* 03F04 80B400E4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03F08 80B400E8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03F0C 80B400EC 0C2CFFC3 */ jal func_80B3FF0C -/* 03F10 80B400F0 00000000 */ nop -/* 03F14 80B400F4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03F18 80B400F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03F1C 80B400FC 03E00008 */ jr $ra -/* 03F20 80B40100 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40104.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40104.s deleted file mode 100644 index fd4502158b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40104.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B40104 -/* 03F24 80B40104 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03F28 80B40108 AFBF001C */ sw $ra, 0x001C($sp) -/* 03F2C 80B4010C AFB00018 */ sw $s0, 0x0018($sp) -/* 03F30 80B40110 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03F34 80B40114 0C2CF12C */ jal func_80B3C4B0 -/* 03F38 80B40118 AFA50024 */ sw $a1, 0x0024($sp) -/* 03F3C 80B4011C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03F40 80B40120 0C2CF11A */ jal func_80B3C468 -/* 03F44 80B40124 8FA50024 */ lw $a1, 0x0024($sp) -/* 03F48 80B40128 0C2CF0C7 */ jal func_80B3C31C -/* 03F4C 80B4012C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03F50 80B40130 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03F54 80B40134 0C2CFFED */ jal func_80B3FFB4 -/* 03F58 80B40138 8FA50024 */ lw $a1, 0x0024($sp) -/* 03F5C 80B4013C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03F60 80B40140 0C2CF222 */ jal func_80B3C888 -/* 03F64 80B40144 8FA50024 */ lw $a1, 0x0024($sp) -/* 03F68 80B40148 8FBF001C */ lw $ra, 0x001C($sp) -/* 03F6C 80B4014C 8FB00018 */ lw $s0, 0x0018($sp) -/* 03F70 80B40150 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03F74 80B40154 03E00008 */ jr $ra -/* 03F78 80B40158 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4015C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4015C.s deleted file mode 100644 index be91c5991a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4015C.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80B4015C -/* 03F7C 80B4015C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03F80 80B40160 AFBF001C */ sw $ra, 0x001C($sp) -/* 03F84 80B40164 AFB00018 */ sw $s0, 0x0018($sp) -/* 03F88 80B40168 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03F8C 80B4016C 0C2CF12C */ jal func_80B3C4B0 -/* 03F90 80B40170 AFA5002C */ sw $a1, 0x002C($sp) -/* 03F94 80B40174 AFA20024 */ sw $v0, 0x0024($sp) -/* 03F98 80B40178 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03F9C 80B4017C 0C2CF11A */ jal func_80B3C468 -/* 03FA0 80B40180 8FA5002C */ lw $a1, 0x002C($sp) -/* 03FA4 80B40184 0C2CF0C7 */ jal func_80B3C31C -/* 03FA8 80B40188 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03FAC 80B4018C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03FB0 80B40190 0C2CFEC9 */ jal func_80B3FB24 -/* 03FB4 80B40194 8FA5002C */ lw $a1, 0x002C($sp) -/* 03FB8 80B40198 0C2CFEB8 */ jal func_80B3FAE0 -/* 03FBC 80B4019C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03FC0 80B401A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03FC4 80B401A4 0C2D0010 */ jal func_80B40040 -/* 03FC8 80B401A8 8FA50024 */ lw $a1, 0x0024($sp) -/* 03FCC 80B401AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03FD0 80B401B0 0C2CF222 */ jal func_80B3C888 -/* 03FD4 80B401B4 8FA5002C */ lw $a1, 0x002C($sp) -/* 03FD8 80B401B8 8FBF001C */ lw $ra, 0x001C($sp) -/* 03FDC 80B401BC 8FB00018 */ lw $s0, 0x0018($sp) -/* 03FE0 80B401C0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03FE4 80B401C4 03E00008 */ jr $ra -/* 03FE8 80B401C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B401CC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B401CC.s deleted file mode 100644 index 0b41db7eb9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B401CC.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B401CC -/* 03FEC 80B401CC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03FF0 80B401D0 AFBF001C */ sw $ra, 0x001C($sp) -/* 03FF4 80B401D4 AFB00018 */ sw $s0, 0x0018($sp) -/* 03FF8 80B401D8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03FFC 80B401DC 0C2CF12C */ jal func_80B3C4B0 -/* 04000 80B401E0 AFA50024 */ sw $a1, 0x0024($sp) -/* 04004 80B401E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04008 80B401E8 0C2CF11A */ jal func_80B3C468 -/* 0400C 80B401EC 8FA50024 */ lw $a1, 0x0024($sp) -/* 04010 80B401F0 0C2CF0C7 */ jal func_80B3C31C -/* 04014 80B401F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04018 80B401F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0401C 80B401FC 0C2CFEC9 */ jal func_80B3FB24 -/* 04020 80B40200 8FA50024 */ lw $a1, 0x0024($sp) -/* 04024 80B40204 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04028 80B40208 0C2D002B */ jal func_80B400AC -/* 0402C 80B4020C 8FA50024 */ lw $a1, 0x0024($sp) -/* 04030 80B40210 8FBF001C */ lw $ra, 0x001C($sp) -/* 04034 80B40214 8FB00018 */ lw $s0, 0x0018($sp) -/* 04038 80B40218 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0403C 80B4021C 03E00008 */ jr $ra -/* 04040 80B40220 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40224.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40224.s deleted file mode 100644 index b79e65a193..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40224.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B40224 -/* 04044 80B40224 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 04048 80B40228 AFA40000 */ sw $a0, 0x0000($sp) -/* 0404C 80B4022C 14A10004 */ bne $a1, $at, .L80B40240 -/* 04050 80B40230 AFA7000C */ sw $a3, 0x000C($sp) -/* 04054 80B40234 3C0E0601 */ lui $t6, %hi(D_06011620) ## $t6 = 06010000 -/* 04058 80B40238 25CE1620 */ addiu $t6, $t6, %lo(D_06011620) ## $t6 = 06011620 -/* 0405C 80B4023C ACCE0000 */ sw $t6, 0x0000($a2) ## 00000000 -.L80B40240: -/* 04060 80B40240 03E00008 */ jr $ra -/* 04064 80B40244 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40248.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40248.s deleted file mode 100644 index ef1d18b39a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40248.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80B40248 -/* 04068 80B40248 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0406C 80B4024C AFA60038 */ sw $a2, 0x0038($sp) -/* 04070 80B40250 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 04074 80B40254 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 04078 80B40258 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0407C 80B4025C AFA40030 */ sw $a0, 0x0030($sp) -/* 04080 80B40260 14A10014 */ bne $a1, $at, .L80B402B4 -/* 04084 80B40264 AFA7003C */ sw $a3, 0x003C($sp) -/* 04088 80B40268 3C0F80B4 */ lui $t7, %hi(D_80B41DBC) ## $t7 = 80B40000 -/* 0408C 80B4026C 25EF1DBC */ addiu $t7, $t7, %lo(D_80B41DBC) ## $t7 = 80B41DBC -/* 04090 80B40270 8DF90000 */ lw $t9, 0x0000($t7) ## 80B41DBC -/* 04094 80B40274 27AE0018 */ addiu $t6, $sp, 0x0018 ## $t6 = FFFFFFE8 -/* 04098 80B40278 8DF80004 */ lw $t8, 0x0004($t7) ## 80B41DC0 -/* 0409C 80B4027C ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFE8 -/* 040A0 80B40280 8DF90008 */ lw $t9, 0x0008($t7) ## 80B41DC4 -/* 040A4 80B40284 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFEC -/* 040A8 80B40288 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 040AC 80B4028C ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFF0 -/* 040B0 80B40290 0C2CFE93 */ jal func_80B3FA4C -/* 040B4 80B40294 8FA40040 */ lw $a0, 0x0040($sp) -/* 040B8 80B40298 8FA50040 */ lw $a1, 0x0040($sp) -/* 040BC 80B4029C 27A40018 */ addiu $a0, $sp, 0x0018 ## $a0 = FFFFFFE8 -/* 040C0 80B402A0 0C0346BD */ jal Matrix_MultVec3f -/* 040C4 80B402A4 24A502B0 */ addiu $a1, $a1, 0x02B0 ## $a1 = 000002B0 -/* 040C8 80B402A8 8FA90040 */ lw $t1, 0x0040($sp) -/* 040CC 80B402AC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 040D0 80B402B0 AD2802BC */ sw $t0, 0x02BC($t1) ## 000002BC -.L80B402B4: -/* 040D4 80B402B4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 040D8 80B402B8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 040DC 80B402BC 03E00008 */ jr $ra -/* 040E0 80B402C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s deleted file mode 100644 index 8a9db72102..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s +++ /dev/null @@ -1,202 +0,0 @@ -.rdata -glabel D_80B42070 - .asciz "../z_en_oA2_inMetamol.c" - .balign 4 - -glabel D_80B42088 - .asciz "../z_en_oA2_inMetamol.c" - .balign 4 - -glabel D_80B420A0 - .asciz "../z_en_oA2_inMetamol.c" - .balign 4 - -.late_rodata -glabel D_80B42258 - .word 0x458B6000 -glabel D_80B4225C - .word 0x4494C000 - -.text -glabel func_80B402C4 -/* 040E4 80B402C4 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 040E8 80B402C8 AFBF002C */ sw $ra, 0x002C($sp) -/* 040EC 80B402CC AFB10028 */ sw $s1, 0x0028($sp) -/* 040F0 80B402D0 AFB00024 */ sw $s0, 0x0024($sp) -/* 040F4 80B402D4 AFA5009C */ sw $a1, 0x009C($sp) -/* 040F8 80B402D8 8482025C */ lh $v0, 0x025C($a0) ## 0000025C -/* 040FC 80B402DC 3C0F80B4 */ lui $t7, %hi(D_80B41D6C) ## $t7 = 80B40000 -/* 04100 80B402E0 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 04104 80B402E4 00027080 */ sll $t6, $v0, 2 -/* 04108 80B402E8 01EE7821 */ addu $t7, $t7, $t6 -/* 0410C 80B402EC 8DEF1D6C */ lw $t7, %lo(D_80B41D6C)($t7) -/* 04110 80B402F0 3C0680B4 */ lui $a2, %hi(D_80B42070) ## $a2 = 80B40000 -/* 04114 80B402F4 24C62070 */ addiu $a2, $a2, %lo(D_80B42070) ## $a2 = 80B42070 -/* 04118 80B402F8 AFAF0088 */ sw $t7, 0x0088($sp) -/* 0411C 80B402FC 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 -/* 04120 80B40300 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD0 -/* 04124 80B40304 24070235 */ addiu $a3, $zero, 0x0235 ## $a3 = 00000235 -/* 04128 80B40308 0C031AB1 */ jal Graph_OpenDisps -/* 0412C 80B4030C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04130 80B40310 8E3902BC */ lw $t9, 0x02BC($s1) ## 000002BC -/* 04134 80B40314 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04138 80B40318 53200060 */ beql $t9, $zero, .L80B4049C -/* 0413C 80B4031C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 04140 80B40320 0C031A73 */ jal Graph_Alloc - -/* 04144 80B40324 24050040 */ addiu $a1, $zero, 0x0040 ## $a1 = 00000040 -/* 04148 80B40328 0C034213 */ jal Matrix_Push -/* 0414C 80B4032C AFA20064 */ sw $v0, 0x0064($sp) -/* 04150 80B40330 3C028016 */ lui $v0, %hi(gGameInfo) -/* 04154 80B40334 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 04158 80B40338 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 0415C 80B4033C 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 04160 80B40340 84481474 */ lh $t0, 0x1474($v0) ## 80161474 -/* 04164 80B40344 844A1478 */ lh $t2, 0x1478($v0) ## 80161478 -/* 04168 80B40348 84491476 */ lh $t1, 0x1476($v0) ## 80161476 -/* 0416C 80B4034C 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 04170 80B40350 3C0180B4 */ lui $at, %hi(D_80B42258) ## $at = 80B40000 -/* 04174 80B40354 C4322258 */ lwc1 $f18, %lo(D_80B42258)($at) -/* 04178 80B40358 468021A0 */ cvt.s.w $f6, $f4 -/* 0417C 80B4035C 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 04180 80B40360 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 -/* 04184 80B40364 3C0180B4 */ lui $at, %hi(D_80B4225C) ## $at = 80B40000 -/* 04188 80B40368 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0418C 80B4036C 46805420 */ cvt.s.w $f16, $f10 -/* 04190 80B40370 46083300 */ add.s $f12, $f6, $f8 -/* 04194 80B40374 C428225C */ lwc1 $f8, %lo(D_80B4225C)($at) -/* 04198 80B40378 468021A0 */ cvt.s.w $f6, $f4 -/* 0419C 80B4037C 46128380 */ add.s $f14, $f16, $f18 -/* 041A0 80B40380 46083280 */ add.s $f10, $f6, $f8 -/* 041A4 80B40384 44065000 */ mfc1 $a2, $f10 -/* 041A8 80B40388 0C034261 */ jal Matrix_Translate -/* 041AC 80B4038C 00000000 */ nop -/* 041B0 80B40390 3C028016 */ lui $v0, %hi(gGameInfo) -/* 041B4 80B40394 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 041B8 80B40398 862602A4 */ lh $a2, 0x02A4($s1) ## 000002A4 -/* 041BC 80B4039C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 041C0 80B403A0 84441480 */ lh $a0, 0x1480($v0) ## 80161480 -/* 041C4 80B403A4 0C034421 */ jal Matrix_RotateRPY -/* 041C8 80B403A8 84451482 */ lh $a1, 0x1482($v0) ## 80161482 -/* 041CC 80B403AC 26220298 */ addiu $v0, $s1, 0x0298 ## $v0 = 00000298 -/* 041D0 80B403B0 C44C0000 */ lwc1 $f12, 0x0000($v0) ## 00000298 -/* 041D4 80B403B4 C44E0004 */ lwc1 $f14, 0x0004($v0) ## 0000029C -/* 041D8 80B403B8 8C460008 */ lw $a2, 0x0008($v0) ## 000002A0 -/* 041DC 80B403BC 0C0342A3 */ jal Matrix_Scale -/* 041E0 80B403C0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 041E4 80B403C4 3C0580B4 */ lui $a1, %hi(D_80B42088) ## $a1 = 80B40000 -/* 041E8 80B403C8 24A52088 */ addiu $a1, $a1, %lo(D_80B42088) ## $a1 = 80B42088 -/* 041EC 80B403CC 8FA40064 */ lw $a0, 0x0064($sp) -/* 041F0 80B403D0 0C034695 */ jal Matrix_ToMtx -/* 041F4 80B403D4 2406025A */ addiu $a2, $zero, 0x025A ## $a2 = 0000025A -/* 041F8 80B403D8 0C034221 */ jal Matrix_Pop -/* 041FC 80B403DC 00000000 */ nop -/* 04200 80B403E0 0C024F61 */ jal func_80093D84 -/* 04204 80B403E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04208 80B403E8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0420C 80B403EC 3C0CFA00 */ lui $t4, 0xFA00 ## $t4 = FA000000 -/* 04210 80B403F0 358C0080 */ ori $t4, $t4, 0x0080 ## $t4 = FA000080 -/* 04214 80B403F4 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 04218 80B403F8 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 0421C 80B403FC 26240278 */ addiu $a0, $s1, 0x0278 ## $a0 = 00000278 -/* 04220 80B40400 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 04224 80B40404 8C980008 */ lw $t8, 0x0008($a0) ## 00000280 -/* 04228 80B40408 8C8D000C */ lw $t5, 0x000C($a0) ## 00000284 -/* 0422C 80B4040C 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 04230 80B40410 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000000 -/* 04234 80B40414 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 -/* 04238 80B40418 01C17825 */ or $t7, $t6, $at ## $t7 = FFFF0000 -/* 0423C 80B4041C 00194200 */ sll $t0, $t9, 8 -/* 04240 80B40420 01E84825 */ or $t1, $t7, $t0 ## $t1 = FFFF0000 -/* 04244 80B40424 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 04248 80B40428 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0424C 80B4042C 3C0BFB00 */ lui $t3, 0xFB00 ## $t3 = FB000000 -/* 04250 80B40430 3C01FF00 */ lui $at, 0xFF00 ## $at = FF000000 -/* 04254 80B40434 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 04258 80B40438 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 0425C 80B4043C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 04260 80B40440 8E2C028C */ lw $t4, 0x028C($s1) ## 0000028C -/* 04264 80B40444 3C08DA38 */ lui $t0, 0xDA38 ## $t0 = DA380000 -/* 04268 80B40448 35080003 */ ori $t0, $t0, 0x0003 ## $t0 = DA380003 -/* 0426C 80B4044C 318D00FF */ andi $t5, $t4, 0x00FF ## $t5 = 00000080 -/* 04270 80B40450 000D7400 */ sll $t6, $t5, 16 -/* 04274 80B40454 01C1C025 */ or $t8, $t6, $at ## $t8 = FF000000 -/* 04278 80B40458 37190080 */ ori $t9, $t8, 0x0080 ## $t9 = FF000080 -/* 0427C 80B4045C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 04280 80B40460 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 04284 80B40464 3C0C0601 */ lui $t4, %hi(D_06012970) ## $t4 = 06010000 -/* 04288 80B40468 258C2970 */ addiu $t4, $t4, %lo(D_06012970) ## $t4 = 06012970 -/* 0428C 80B4046C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 04290 80B40470 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 04294 80B40474 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 04298 80B40478 8FA90064 */ lw $t1, 0x0064($sp) -/* 0429C 80B4047C 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 -/* 042A0 80B40480 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 042A4 80B40484 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 042A8 80B40488 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 042AC 80B4048C AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 042B0 80B40490 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 042B4 80B40494 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 042B8 80B40498 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80B4049C: -/* 042BC 80B4049C 8FA5009C */ lw $a1, 0x009C($sp) -/* 042C0 80B404A0 0C00BAF3 */ jal func_8002EBCC -/* 042C4 80B404A4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 042C8 80B404A8 8FAD009C */ lw $t5, 0x009C($sp) -/* 042CC 80B404AC 0C024F46 */ jal func_80093D18 -/* 042D0 80B404B0 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 042D4 80B404B4 8FA70088 */ lw $a3, 0x0088($sp) -/* 042D8 80B404B8 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 -/* 042DC 80B404BC 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 042E0 80B404C0 0007C900 */ sll $t9, $a3, 4 -/* 042E4 80B404C4 00197F02 */ srl $t7, $t9, 28 -/* 042E8 80B404C8 3C098016 */ lui $t1, %hi(gSegments) -/* 042EC 80B404CC 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 -/* 042F0 80B404D0 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 -/* 042F4 80B404D4 25296FA8 */ addiu $t1, %lo(gSegments) -/* 042F8 80B404D8 000F4080 */ sll $t0, $t7, 2 -/* 042FC 80B404DC 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 04300 80B404E0 01092021 */ addu $a0, $t0, $t1 -/* 04304 80B404E4 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 04308 80B404E8 8C8A0000 */ lw $t2, 0x0000($a0) ## 00000000 -/* 0430C 80B404EC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 04310 80B404F0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 04314 80B404F4 00E12824 */ and $a1, $a3, $at -/* 04318 80B404F8 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 0431C 80B404FC 01455821 */ addu $t3, $t2, $a1 -/* 04320 80B40500 01666021 */ addu $t4, $t3, $a2 -/* 04324 80B40504 AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 -/* 04328 80B40508 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 -/* 0432C 80B4050C 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 04330 80B40510 35CE0024 */ ori $t6, $t6, 0x0024 ## $t6 = DB060024 -/* 04334 80B40514 246D0008 */ addiu $t5, $v1, 0x0008 ## $t5 = 00000008 -/* 04338 80B40518 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 0433C 80B4051C AC6E0000 */ sw $t6, 0x0000($v1) ## 00000000 -/* 04340 80B40520 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 -/* 04344 80B40524 2622014C */ addiu $v0, $s1, 0x014C ## $v0 = 0000014C -/* 04348 80B40528 3C0980B4 */ lui $t1, %hi(func_80B40248) ## $t1 = 80B40000 -/* 0434C 80B4052C 0305C821 */ addu $t9, $t8, $a1 -/* 04350 80B40530 03267821 */ addu $t7, $t9, $a2 -/* 04354 80B40534 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 -/* 04358 80B40538 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 0435C 80B4053C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 04360 80B40540 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 04364 80B40544 3C0880B4 */ lui $t0, %hi(func_80B40224) ## $t0 = 80B40000 -/* 04368 80B40548 25080224 */ addiu $t0, $t0, %lo(func_80B40224) ## $t0 = 80B40224 -/* 0436C 80B4054C 25290248 */ addiu $t1, $t1, %lo(func_80B40248) ## $t1 = 80B40248 -/* 04370 80B40550 AFA90014 */ sw $t1, 0x0014($sp) -/* 04374 80B40554 AFA80010 */ sw $t0, 0x0010($sp) -/* 04378 80B40558 AFB10018 */ sw $s1, 0x0018($sp) -/* 0437C 80B4055C 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 04380 80B40560 8FA4009C */ lw $a0, 0x009C($sp) -/* 04384 80B40564 3C0680B4 */ lui $a2, %hi(D_80B420A0) ## $a2 = 80B40000 -/* 04388 80B40568 24C620A0 */ addiu $a2, $a2, %lo(D_80B420A0) ## $a2 = 80B420A0 -/* 0438C 80B4056C 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD0 -/* 04390 80B40570 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04394 80B40574 0C031AD5 */ jal Graph_CloseDisps -/* 04398 80B40578 2407029C */ addiu $a3, $zero, 0x029C ## $a3 = 0000029C -/* 0439C 80B4057C 8FBF002C */ lw $ra, 0x002C($sp) -/* 043A0 80B40580 8FB00024 */ lw $s0, 0x0024($sp) -/* 043A4 80B40584 8FB10028 */ lw $s1, 0x0028($sp) -/* 043A8 80B40588 03E00008 */ jr $ra -/* 043AC 80B4058C 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40590.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40590.s deleted file mode 100644 index f68f923b7a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40590.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_80B40590 -/* 043B0 80B40590 AFA50004 */ sw $a1, 0x0004($sp) -/* 043B4 80B40594 240E0039 */ addiu $t6, $zero, 0x0039 ## $t6 = 00000039 -/* 043B8 80B40598 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 -/* 043BC 80B4059C AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 -/* 043C0 80B405A0 03E00008 */ jr $ra -/* 043C4 80B405A4 AC8F0264 */ sw $t7, 0x0264($a0) ## 00000264 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B405A8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B405A8.s deleted file mode 100644 index 2136aefc19..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B405A8.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_80B405A8 -/* 043C8 80B405A8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 043CC 80B405AC AFB10018 */ sw $s1, 0x0018($sp) -/* 043D0 80B405B0 AFB00014 */ sw $s0, 0x0014($sp) -/* 043D4 80B405B4 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 043D8 80B405B8 AFBF001C */ sw $ra, 0x001C($sp) -/* 043DC 80B405BC 2490014C */ addiu $s0, $a0, 0x014C ## $s0 = 0000014C -/* 043E0 80B405C0 02002025 */ or $a0, $s0, $zero ## $a0 = 0000014C -/* 043E4 80B405C4 0C0295B2 */ jal Animation_OnFrame -/* 043E8 80B405C8 3C054110 */ lui $a1, 0x4110 ## $a1 = 41100000 -/* 043EC 80B405CC 1040000A */ beq $v0, $zero, .L80B405F8 -/* 043F0 80B405D0 02002025 */ or $a0, $s0, $zero ## $a0 = 0000014C -/* 043F4 80B405D4 263000E4 */ addiu $s0, $s1, 0x00E4 ## $s0 = 000000E4 -/* 043F8 80B405D8 02002025 */ or $a0, $s0, $zero ## $a0 = 000000E4 -/* 043FC 80B405DC 0C01E245 */ jal func_80078914 -/* 04400 80B405E0 24050858 */ addiu $a1, $zero, 0x0858 ## $a1 = 00000858 -/* 04404 80B405E4 02002025 */ or $a0, $s0, $zero ## $a0 = 000000E4 -/* 04408 80B405E8 0C01E245 */ jal func_80078914 -/* 0440C 80B405EC 24056872 */ addiu $a1, $zero, 0x6872 ## $a1 = 00006872 -/* 04410 80B405F0 1000001A */ beq $zero, $zero, .L80B4065C -/* 04414 80B405F4 8FBF001C */ lw $ra, 0x001C($sp) -.L80B405F8: -/* 04418 80B405F8 0C0295B2 */ jal Animation_OnFrame -/* 0441C 80B405FC 3C0541D0 */ lui $a1, 0x41D0 ## $a1 = 41D00000 -/* 04420 80B40600 10400006 */ beq $v0, $zero, .L80B4061C -/* 04424 80B40604 02002025 */ or $a0, $s0, $zero ## $a0 = 000000E4 -/* 04428 80B40608 262400E4 */ addiu $a0, $s1, 0x00E4 ## $a0 = 000000E4 -/* 0442C 80B4060C 0C01E245 */ jal func_80078914 -/* 04430 80B40610 24050858 */ addiu $a1, $zero, 0x0858 ## $a1 = 00000858 -/* 04434 80B40614 10000011 */ beq $zero, $zero, .L80B4065C -/* 04438 80B40618 8FBF001C */ lw $ra, 0x001C($sp) -.L80B4061C: -/* 0443C 80B4061C 0C0295B2 */ jal Animation_OnFrame -/* 04440 80B40620 3C0541E0 */ lui $a1, 0x41E0 ## $a1 = 41E00000 -/* 04444 80B40624 10400006 */ beq $v0, $zero, .L80B40640 -/* 04448 80B40628 02002025 */ or $a0, $s0, $zero ## $a0 = 000000E4 -/* 0444C 80B4062C 262400E4 */ addiu $a0, $s1, 0x00E4 ## $a0 = 000000E4 -/* 04450 80B40630 0C01E245 */ jal func_80078914 -/* 04454 80B40634 24050808 */ addiu $a1, $zero, 0x0808 ## $a1 = 00000808 -/* 04458 80B40638 10000008 */ beq $zero, $zero, .L80B4065C -/* 0445C 80B4063C 8FBF001C */ lw $ra, 0x001C($sp) -.L80B40640: -/* 04460 80B40640 0C0295B2 */ jal Animation_OnFrame -/* 04464 80B40644 3C054208 */ lui $a1, 0x4208 ## $a1 = 42080000 -/* 04468 80B40648 10400003 */ beq $v0, $zero, .L80B40658 -/* 0446C 80B4064C 262400E4 */ addiu $a0, $s1, 0x00E4 ## $a0 = 000000E4 -/* 04470 80B40650 0C01E245 */ jal func_80078914 -/* 04474 80B40654 24050808 */ addiu $a1, $zero, 0x0808 ## $a1 = 00000808 -.L80B40658: -/* 04478 80B40658 8FBF001C */ lw $ra, 0x001C($sp) -.L80B4065C: -/* 0447C 80B4065C 8FB00014 */ lw $s0, 0x0014($sp) -/* 04480 80B40660 8FB10018 */ lw $s1, 0x0018($sp) -/* 04484 80B40664 03E00008 */ jr $ra -/* 04488 80B40668 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4066C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4066C.s deleted file mode 100644 index d4850c1186..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4066C.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B4066C -/* 0448C 80B4066C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04490 80B40670 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04494 80B40674 AFA40018 */ sw $a0, 0x0018($sp) -/* 04498 80B40678 94AE1D74 */ lhu $t6, 0x1D74($a1) ## 00001D74 -/* 0449C 80B4067C 240105AF */ addiu $at, $zero, 0x05AF ## $at = 000005AF -/* 044A0 80B40680 55C10004 */ bnel $t6, $at, .L80B40694 -/* 044A4 80B40684 8FBF0014 */ lw $ra, 0x0014($sp) -/* 044A8 80B40688 0C03CFCF */ jal func_800F3F3C -/* 044AC 80B4068C 24040007 */ addiu $a0, $zero, 0x0007 ## $a0 = 00000007 -/* 044B0 80B40690 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B40694: -/* 044B4 80B40694 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 044B8 80B40698 03E00008 */ jr $ra -/* 044BC 80B4069C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B406A0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B406A0.s deleted file mode 100644 index 03ee224cf2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B406A0.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B406A0 -/* 044C0 80B406A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 044C4 80B406A4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 044C8 80B406A8 94AE1D74 */ lhu $t6, 0x1D74($a1) ## 00001D74 -/* 044CC 80B406AC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 044D0 80B406B0 24010365 */ addiu $at, $zero, 0x0365 ## $at = 00000365 -/* 044D4 80B406B4 15C10005 */ bne $t6, $at, .L80B406CC -/* 044D8 80B406B8 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 044DC 80B406BC 0C01E245 */ jal func_80078914 -/* 044E0 80B406C0 24056870 */ addiu $a1, $zero, 0x6870 ## $a1 = 00006870 -/* 044E4 80B406C4 10000009 */ beq $zero, $zero, .L80B406EC -/* 044E8 80B406C8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B406CC: -/* 044EC 80B406CC 94AF1D74 */ lhu $t7, 0x1D74($a1) ## 00001D74 -/* 044F0 80B406D0 240103AB */ addiu $at, $zero, 0x03AB ## $at = 000003AB -/* 044F4 80B406D4 24C400E4 */ addiu $a0, $a2, 0x00E4 ## $a0 = 000000E4 -/* 044F8 80B406D8 55E10004 */ bnel $t7, $at, .L80B406EC -/* 044FC 80B406DC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04500 80B406E0 0C01E245 */ jal func_80078914 -/* 04504 80B406E4 24056871 */ addiu $a1, $zero, 0x6871 ## $a1 = 00006871 -/* 04508 80B406E8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B406EC: -/* 0450C 80B406EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04510 80B406F0 03E00008 */ jr $ra -/* 04514 80B406F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B406F8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B406F8.s deleted file mode 100644 index 5e61d9f8de..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B406F8.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80B406F8 -/* 04518 80B406F8 240E0039 */ addiu $t6, $zero, 0x0039 ## $t6 = 00000039 -/* 0451C 80B406FC AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 -/* 04520 80B40700 AC800264 */ sw $zero, 0x0264($a0) ## 00000264 -/* 04524 80B40704 03E00008 */ jr $ra -/* 04528 80B40708 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4070C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4070C.s deleted file mode 100644 index ba5c19e048..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4070C.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80B4070C -/* 0452C 80B4070C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 04530 80B40710 AFB00028 */ sw $s0, 0x0028($sp) -/* 04534 80B40714 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04538 80B40718 AFBF002C */ sw $ra, 0x002C($sp) -/* 0453C 80B4071C 3C040600 */ lui $a0, %hi(D_06004828) ## $a0 = 06000000 -/* 04540 80B40720 AFA50044 */ sw $a1, 0x0044($sp) -/* 04544 80B40724 0C028800 */ jal Animation_GetLastFrame - -/* 04548 80B40728 24844828 */ addiu $a0, $a0, %lo(D_06004828) ## $a0 = 06004828 -/* 0454C 80B4072C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 04550 80B40730 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04554 80B40734 468021A0 */ cvt.s.w $f6, $f4 -/* 04558 80B40738 0C2CF277 */ jal func_80B3C9DC -/* 0455C 80B4073C E7A60030 */ swc1 $f6, 0x0030($sp) -/* 04560 80B40740 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04564 80B40744 8FA50044 */ lw $a1, 0x0044($sp) -/* 04568 80B40748 0C2CF162 */ jal func_80B3C588 -/* 0456C 80B4074C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 04570 80B40750 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 04574 80B40754 C7A80030 */ lwc1 $f8, 0x0030($sp) -/* 04578 80B40758 3C050600 */ lui $a1, %hi(D_06004828) ## $a1 = 06000000 -/* 0457C 80B4075C 44070000 */ mfc1 $a3, $f0 -/* 04580 80B40760 24A54828 */ addiu $a1, $a1, %lo(D_06004828) ## $a1 = 06004828 -/* 04584 80B40764 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 04588 80B40768 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0458C 80B4076C AFA00014 */ sw $zero, 0x0014($sp) -/* 04590 80B40770 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 04594 80B40774 0C029468 */ jal Animation_Change - -/* 04598 80B40778 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 0459C 80B4077C 240E003A */ addiu $t6, $zero, 0x003A ## $t6 = 0000003A -/* 045A0 80B40780 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 -/* 045A4 80B40784 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 045A8 80B40788 AE0E0260 */ sw $t6, 0x0260($s0) ## 00000260 -/* 045AC 80B4078C AE0F0264 */ sw $t7, 0x0264($s0) ## 00000264 -/* 045B0 80B40790 A21800C8 */ sb $t8, 0x00C8($s0) ## 000000C8 -/* 045B4 80B40794 8FBF002C */ lw $ra, 0x002C($sp) -/* 045B8 80B40798 8FB00028 */ lw $s0, 0x0028($sp) -/* 045BC 80B4079C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 045C0 80B407A0 03E00008 */ jr $ra -/* 045C4 80B407A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B407A8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B407A8.s deleted file mode 100644 index 6366f5e64d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B407A8.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80B407A8 -/* 045C8 80B407A8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 045CC 80B407AC AFA40028 */ sw $a0, 0x0028($sp) -/* 045D0 80B407B0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 045D4 80B407B4 3C040602 */ lui $a0, %hi(D_06018B00) ## $a0 = 06020000 -/* 045D8 80B407B8 0C028800 */ jal Animation_GetLastFrame - -/* 045DC 80B407BC 24848B00 */ addiu $a0, $a0, %lo(D_06018B00) ## $a0 = 06018B00 -/* 045E0 80B407C0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 045E4 80B407C4 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 045E8 80B407C8 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 045EC 80B407CC 468021A0 */ cvt.s.w $f6, $f4 -/* 045F0 80B407D0 8FA40028 */ lw $a0, 0x0028($sp) -/* 045F4 80B407D4 3C050602 */ lui $a1, %hi(D_06018B00) ## $a1 = 06020000 -/* 045F8 80B407D8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 045FC 80B407DC AFAE0014 */ sw $t6, 0x0014($sp) -/* 04600 80B407E0 24A58B00 */ addiu $a1, $a1, %lo(D_06018B00) ## $a1 = 06018B00 -/* 04604 80B407E4 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 04608 80B407E8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0460C 80B407EC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 04610 80B407F0 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 04614 80B407F4 0C029468 */ jal Animation_Change - -/* 04618 80B407F8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0461C 80B407FC 8FA20028 */ lw $v0, 0x0028($sp) -/* 04620 80B40800 240F003B */ addiu $t7, $zero, 0x003B ## $t7 = 0000003B -/* 04624 80B40804 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 04628 80B40808 AC4F0260 */ sw $t7, 0x0260($v0) ## 00000260 -/* 0462C 80B4080C AC580264 */ sw $t8, 0x0264($v0) ## 00000264 -/* 04630 80B40810 8FBF0024 */ lw $ra, 0x0024($sp) -/* 04634 80B40814 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04638 80B40818 03E00008 */ jr $ra -/* 0463C 80B4081C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40820.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40820.s deleted file mode 100644 index ff88e8001a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40820.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_80B40820 -/* 04640 80B40820 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 04644 80B40824 AFB00028 */ sw $s0, 0x0028($sp) -/* 04648 80B40828 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0464C 80B4082C AFBF002C */ sw $ra, 0x002C($sp) -/* 04650 80B40830 3C040600 */ lui $a0, %hi(D_06004828) ## $a0 = 06000000 -/* 04654 80B40834 AFA5004C */ sw $a1, 0x004C($sp) -/* 04658 80B40838 0C028800 */ jal Animation_GetLastFrame - -/* 0465C 80B4083C 24844828 */ addiu $a0, $a0, %lo(D_06004828) ## $a0 = 06004828 -/* 04660 80B40840 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 04664 80B40844 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 04668 80B40848 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0466C 80B4084C 468021A0 */ cvt.s.w $f6, $f4 -/* 04670 80B40850 3C050600 */ lui $a1, %hi(D_06004828) ## $a1 = 06000000 -/* 04674 80B40854 44070000 */ mfc1 $a3, $f0 -/* 04678 80B40858 24A54828 */ addiu $a1, $a1, %lo(D_06004828) ## $a1 = 06004828 -/* 0467C 80B4085C AFA40034 */ sw $a0, 0x0034($sp) -/* 04680 80B40860 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04684 80B40864 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 04688 80B40868 AFA00014 */ sw $zero, 0x0014($sp) -/* 0468C 80B4086C 0C029468 */ jal Animation_Change - -/* 04690 80B40870 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 04694 80B40874 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04698 80B40878 8FA5004C */ lw $a1, 0x004C($sp) -/* 0469C 80B4087C 0C2CF162 */ jal func_80B3C588 -/* 046A0 80B40880 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 046A4 80B40884 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 046A8 80B40888 0C2CF259 */ jal func_80B3C964 -/* 046AC 80B4088C 8FA5004C */ lw $a1, 0x004C($sp) -/* 046B0 80B40890 3C040601 */ lui $a0, %hi(D_060169E8) ## $a0 = 06010000 -/* 046B4 80B40894 0C028800 */ jal Animation_GetLastFrame - -/* 046B8 80B40898 248469E8 */ addiu $a0, $a0, %lo(D_060169E8) ## $a0 = 060169E8 -/* 046BC 80B4089C 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 046C0 80B408A0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 046C4 80B408A4 3C050601 */ lui $a1, %hi(D_060169E8) ## $a1 = 06010000 -/* 046C8 80B408A8 468042A0 */ cvt.s.w $f10, $f8 -/* 046CC 80B408AC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 046D0 80B408B0 44070000 */ mfc1 $a3, $f0 -/* 046D4 80B408B4 AFAE0014 */ sw $t6, 0x0014($sp) -/* 046D8 80B408B8 24A569E8 */ addiu $a1, $a1, %lo(D_060169E8) ## $a1 = 060169E8 -/* 046DC 80B408BC 8FA40034 */ lw $a0, 0x0034($sp) -/* 046E0 80B408C0 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 046E4 80B408C4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 046E8 80B408C8 0C029468 */ jal Animation_Change - -/* 046EC 80B408CC E7A00018 */ swc1 $f0, 0x0018($sp) -/* 046F0 80B408D0 240F003C */ addiu $t7, $zero, 0x003C ## $t7 = 0000003C -/* 046F4 80B408D4 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 046F8 80B408D8 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 046FC 80B408DC AE0F0260 */ sw $t7, 0x0260($s0) ## 00000260 -/* 04700 80B408E0 AE180264 */ sw $t8, 0x0264($s0) ## 00000264 -/* 04704 80B408E4 A21900C8 */ sb $t9, 0x00C8($s0) ## 000000C8 -/* 04708 80B408E8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0470C 80B408EC 8FB00028 */ lw $s0, 0x0028($sp) -/* 04710 80B408F0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 04714 80B408F4 03E00008 */ jr $ra -/* 04718 80B408F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B408FC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B408FC.s deleted file mode 100644 index b9a7ec4e27..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B408FC.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_80B408FC -/* 0471C 80B408FC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 04720 80B40900 AFB00028 */ sw $s0, 0x0028($sp) -/* 04724 80B40904 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04728 80B40908 AFBF002C */ sw $ra, 0x002C($sp) -/* 0472C 80B4090C 3C040600 */ lui $a0, %hi(D_06004828) ## $a0 = 06000000 -/* 04730 80B40910 AFA5004C */ sw $a1, 0x004C($sp) -/* 04734 80B40914 0C028800 */ jal Animation_GetLastFrame - -/* 04738 80B40918 24844828 */ addiu $a0, $a0, %lo(D_06004828) ## $a0 = 06004828 -/* 0473C 80B4091C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 04740 80B40920 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 04744 80B40924 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 04748 80B40928 468021A0 */ cvt.s.w $f6, $f4 -/* 0474C 80B4092C 3C050600 */ lui $a1, %hi(D_06004828) ## $a1 = 06000000 -/* 04750 80B40930 44070000 */ mfc1 $a3, $f0 -/* 04754 80B40934 24A54828 */ addiu $a1, $a1, %lo(D_06004828) ## $a1 = 06004828 -/* 04758 80B40938 AFA40034 */ sw $a0, 0x0034($sp) -/* 0475C 80B4093C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04760 80B40940 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 04764 80B40944 AFA00014 */ sw $zero, 0x0014($sp) -/* 04768 80B40948 0C029468 */ jal Animation_Change - -/* 0476C 80B4094C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 04770 80B40950 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04774 80B40954 8FA5004C */ lw $a1, 0x004C($sp) -/* 04778 80B40958 0C2CF162 */ jal func_80B3C588 -/* 0477C 80B4095C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 04780 80B40960 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04784 80B40964 0C2CF259 */ jal func_80B3C964 -/* 04788 80B40968 8FA5004C */ lw $a1, 0x004C($sp) -/* 0478C 80B4096C 3C040601 */ lui $a0, %hi(D_060149E4) ## $a0 = 06010000 -/* 04790 80B40970 0C028800 */ jal Animation_GetLastFrame - -/* 04794 80B40974 248449E4 */ addiu $a0, $a0, %lo(D_060149E4) ## $a0 = 060149E4 -/* 04798 80B40978 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 0479C 80B4097C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 047A0 80B40980 3C050601 */ lui $a1, %hi(D_060149E4) ## $a1 = 06010000 -/* 047A4 80B40984 468042A0 */ cvt.s.w $f10, $f8 -/* 047A8 80B40988 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 047AC 80B4098C 44070000 */ mfc1 $a3, $f0 -/* 047B0 80B40990 AFAE0014 */ sw $t6, 0x0014($sp) -/* 047B4 80B40994 24A549E4 */ addiu $a1, $a1, %lo(D_060149E4) ## $a1 = 060149E4 -/* 047B8 80B40998 8FA40034 */ lw $a0, 0x0034($sp) -/* 047BC 80B4099C E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 047C0 80B409A0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 047C4 80B409A4 0C029468 */ jal Animation_Change - -/* 047C8 80B409A8 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 047CC 80B409AC 240F003D */ addiu $t7, $zero, 0x003D ## $t7 = 0000003D -/* 047D0 80B409B0 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 047D4 80B409B4 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 047D8 80B409B8 AE0F0260 */ sw $t7, 0x0260($s0) ## 00000260 -/* 047DC 80B409BC AE180264 */ sw $t8, 0x0264($s0) ## 00000264 -/* 047E0 80B409C0 A21900C8 */ sb $t9, 0x00C8($s0) ## 000000C8 -/* 047E4 80B409C4 8FBF002C */ lw $ra, 0x002C($sp) -/* 047E8 80B409C8 8FB00028 */ lw $s0, 0x0028($sp) -/* 047EC 80B409CC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 047F0 80B409D0 03E00008 */ jr $ra -/* 047F4 80B409D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B409D8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B409D8.s deleted file mode 100644 index 8ebc16b9f8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B409D8.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80B409D8 -/* 047F8 80B409D8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 047FC 80B409DC AFB00028 */ sw $s0, 0x0028($sp) -/* 04800 80B409E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04804 80B409E4 AFBF002C */ sw $ra, 0x002C($sp) -/* 04808 80B409E8 3C040602 */ lui $a0, %hi(D_06019F78) ## $a0 = 06020000 -/* 0480C 80B409EC AFA50044 */ sw $a1, 0x0044($sp) -/* 04810 80B409F0 0C028800 */ jal Animation_GetLastFrame - -/* 04814 80B409F4 24849F78 */ addiu $a0, $a0, %lo(D_06019F78) ## $a0 = 06019F78 -/* 04818 80B409F8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0481C 80B409FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04820 80B40A00 468021A0 */ cvt.s.w $f6, $f4 -/* 04824 80B40A04 0C2CF277 */ jal func_80B3C9DC -/* 04828 80B40A08 E7A60030 */ swc1 $f6, 0x0030($sp) -/* 0482C 80B40A0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04830 80B40A10 8FA50044 */ lw $a1, 0x0044($sp) -/* 04834 80B40A14 0C2CF162 */ jal func_80B3C588 -/* 04838 80B40A18 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 0483C 80B40A1C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 04840 80B40A20 C7A80030 */ lwc1 $f8, 0x0030($sp) -/* 04844 80B40A24 3C050602 */ lui $a1, %hi(D_06019F78) ## $a1 = 06020000 -/* 04848 80B40A28 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 0484C 80B40A2C 44070000 */ mfc1 $a3, $f0 -/* 04850 80B40A30 AFAE0014 */ sw $t6, 0x0014($sp) -/* 04854 80B40A34 24A59F78 */ addiu $a1, $a1, %lo(D_06019F78) ## $a1 = 06019F78 -/* 04858 80B40A38 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0485C 80B40A3C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04860 80B40A40 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 04864 80B40A44 0C029468 */ jal Animation_Change - -/* 04868 80B40A48 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 0486C 80B40A4C 240F003E */ addiu $t7, $zero, 0x003E ## $t7 = 0000003E -/* 04870 80B40A50 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 04874 80B40A54 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 04878 80B40A58 AE0F0260 */ sw $t7, 0x0260($s0) ## 00000260 -/* 0487C 80B40A5C AE180264 */ sw $t8, 0x0264($s0) ## 00000264 -/* 04880 80B40A60 A21900C8 */ sb $t9, 0x00C8($s0) ## 000000C8 -/* 04884 80B40A64 8FBF002C */ lw $ra, 0x002C($sp) -/* 04888 80B40A68 8FB00028 */ lw $s0, 0x0028($sp) -/* 0488C 80B40A6C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 04890 80B40A70 03E00008 */ jr $ra -/* 04894 80B40A74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40A78.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40A78.s deleted file mode 100644 index d1b82ca904..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40A78.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80B40A78 -/* 04898 80B40A78 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0489C 80B40A7C AFB00028 */ sw $s0, 0x0028($sp) -/* 048A0 80B40A80 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 048A4 80B40A84 AFBF002C */ sw $ra, 0x002C($sp) -/* 048A8 80B40A88 3C040602 */ lui $a0, %hi(D_06019F78) ## $a0 = 06020000 -/* 048AC 80B40A8C AFA50044 */ sw $a1, 0x0044($sp) -/* 048B0 80B40A90 0C028800 */ jal Animation_GetLastFrame - -/* 048B4 80B40A94 24849F78 */ addiu $a0, $a0, %lo(D_06019F78) ## $a0 = 06019F78 -/* 048B8 80B40A98 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 048BC 80B40A9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 048C0 80B40AA0 468021A0 */ cvt.s.w $f6, $f4 -/* 048C4 80B40AA4 0C2CF277 */ jal func_80B3C9DC -/* 048C8 80B40AA8 E7A60030 */ swc1 $f6, 0x0030($sp) -/* 048CC 80B40AAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 048D0 80B40AB0 8FA50044 */ lw $a1, 0x0044($sp) -/* 048D4 80B40AB4 0C2CF162 */ jal func_80B3C588 -/* 048D8 80B40AB8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 048DC 80B40ABC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 048E0 80B40AC0 C7A80030 */ lwc1 $f8, 0x0030($sp) -/* 048E4 80B40AC4 3C050602 */ lui $a1, %hi(D_06019F78) ## $a1 = 06020000 -/* 048E8 80B40AC8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 048EC 80B40ACC 44070000 */ mfc1 $a3, $f0 -/* 048F0 80B40AD0 AFAE0014 */ sw $t6, 0x0014($sp) -/* 048F4 80B40AD4 24A59F78 */ addiu $a1, $a1, %lo(D_06019F78) ## $a1 = 06019F78 -/* 048F8 80B40AD8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 048FC 80B40ADC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04900 80B40AE0 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 04904 80B40AE4 0C029468 */ jal Animation_Change - -/* 04908 80B40AE8 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 0490C 80B40AEC 240F003F */ addiu $t7, $zero, 0x003F ## $t7 = 0000003F -/* 04910 80B40AF0 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 04914 80B40AF4 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 04918 80B40AF8 AE0F0260 */ sw $t7, 0x0260($s0) ## 00000260 -/* 0491C 80B40AFC AE180264 */ sw $t8, 0x0264($s0) ## 00000264 -/* 04920 80B40B00 A21900C8 */ sb $t9, 0x00C8($s0) ## 000000C8 -/* 04924 80B40B04 8FBF002C */ lw $ra, 0x002C($sp) -/* 04928 80B40B08 8FB00028 */ lw $s0, 0x0028($sp) -/* 0492C 80B40B0C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 04930 80B40B10 03E00008 */ jr $ra -/* 04934 80B40B14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40B18.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40B18.s deleted file mode 100644 index 262251ced3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40B18.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80B40B18 -/* 04938 80B40B18 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0493C 80B40B1C AFB00028 */ sw $s0, 0x0028($sp) -/* 04940 80B40B20 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04944 80B40B24 AFBF002C */ sw $ra, 0x002C($sp) -/* 04948 80B40B28 3C040602 */ lui $a0, %hi(D_06019C30) ## $a0 = 06020000 -/* 0494C 80B40B2C AFA50044 */ sw $a1, 0x0044($sp) -/* 04950 80B40B30 0C028800 */ jal Animation_GetLastFrame - -/* 04954 80B40B34 24849C30 */ addiu $a0, $a0, %lo(D_06019C30) ## $a0 = 06019C30 -/* 04958 80B40B38 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0495C 80B40B3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04960 80B40B40 468021A0 */ cvt.s.w $f6, $f4 -/* 04964 80B40B44 0C2CF277 */ jal func_80B3C9DC -/* 04968 80B40B48 E7A60030 */ swc1 $f6, 0x0030($sp) -/* 0496C 80B40B4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04970 80B40B50 8FA50044 */ lw $a1, 0x0044($sp) -/* 04974 80B40B54 0C2CF162 */ jal func_80B3C588 -/* 04978 80B40B58 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 0497C 80B40B5C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 04980 80B40B60 C7A80030 */ lwc1 $f8, 0x0030($sp) -/* 04984 80B40B64 3C050602 */ lui $a1, %hi(D_06019C30) ## $a1 = 06020000 -/* 04988 80B40B68 44070000 */ mfc1 $a3, $f0 -/* 0498C 80B40B6C 24A59C30 */ addiu $a1, $a1, %lo(D_06019C30) ## $a1 = 06019C30 -/* 04990 80B40B70 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 04994 80B40B74 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04998 80B40B78 AFA00014 */ sw $zero, 0x0014($sp) -/* 0499C 80B40B7C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 049A0 80B40B80 0C029468 */ jal Animation_Change - -/* 049A4 80B40B84 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 049A8 80B40B88 240E0040 */ addiu $t6, $zero, 0x0040 ## $t6 = 00000040 -/* 049AC 80B40B8C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 049B0 80B40B90 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 049B4 80B40B94 AE0E0260 */ sw $t6, 0x0260($s0) ## 00000260 -/* 049B8 80B40B98 AE0F0264 */ sw $t7, 0x0264($s0) ## 00000264 -/* 049BC 80B40B9C A21800C8 */ sb $t8, 0x00C8($s0) ## 000000C8 -/* 049C0 80B40BA0 8FBF002C */ lw $ra, 0x002C($sp) -/* 049C4 80B40BA4 8FB00028 */ lw $s0, 0x0028($sp) -/* 049C8 80B40BA8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 049CC 80B40BAC 03E00008 */ jr $ra -/* 049D0 80B40BB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40BB4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40BB4.s deleted file mode 100644 index 369cb7d07b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40BB4.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80B40BB4 -/* 049D4 80B40BB4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 049D8 80B40BB8 AFB00028 */ sw $s0, 0x0028($sp) -/* 049DC 80B40BBC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 049E0 80B40BC0 AFBF002C */ sw $ra, 0x002C($sp) -/* 049E4 80B40BC4 3C040600 */ lui $a0, %hi(D_06004828) ## $a0 = 06000000 -/* 049E8 80B40BC8 AFA50044 */ sw $a1, 0x0044($sp) -/* 049EC 80B40BCC 0C028800 */ jal Animation_GetLastFrame - -/* 049F0 80B40BD0 24844828 */ addiu $a0, $a0, %lo(D_06004828) ## $a0 = 06004828 -/* 049F4 80B40BD4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 049F8 80B40BD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 049FC 80B40BDC 468021A0 */ cvt.s.w $f6, $f4 -/* 04A00 80B40BE0 0C2CF277 */ jal func_80B3C9DC -/* 04A04 80B40BE4 E7A60030 */ swc1 $f6, 0x0030($sp) -/* 04A08 80B40BE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04A0C 80B40BEC 8FA50044 */ lw $a1, 0x0044($sp) -/* 04A10 80B40BF0 0C2CF162 */ jal func_80B3C588 -/* 04A14 80B40BF4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 04A18 80B40BF8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 04A1C 80B40BFC C7A80030 */ lwc1 $f8, 0x0030($sp) -/* 04A20 80B40C00 3C050600 */ lui $a1, %hi(D_06004828) ## $a1 = 06000000 -/* 04A24 80B40C04 44070000 */ mfc1 $a3, $f0 -/* 04A28 80B40C08 24A54828 */ addiu $a1, $a1, %lo(D_06004828) ## $a1 = 06004828 -/* 04A2C 80B40C0C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 04A30 80B40C10 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04A34 80B40C14 AFA00014 */ sw $zero, 0x0014($sp) -/* 04A38 80B40C18 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 04A3C 80B40C1C 0C029468 */ jal Animation_Change - -/* 04A40 80B40C20 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 04A44 80B40C24 240E0041 */ addiu $t6, $zero, 0x0041 ## $t6 = 00000041 -/* 04A48 80B40C28 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 04A4C 80B40C2C 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 04A50 80B40C30 AE0E0260 */ sw $t6, 0x0260($s0) ## 00000260 -/* 04A54 80B40C34 AE0F0264 */ sw $t7, 0x0264($s0) ## 00000264 -/* 04A58 80B40C38 A21800C8 */ sb $t8, 0x00C8($s0) ## 000000C8 -/* 04A5C 80B40C3C 8FBF002C */ lw $ra, 0x002C($sp) -/* 04A60 80B40C40 8FB00028 */ lw $s0, 0x0028($sp) -/* 04A64 80B40C44 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 04A68 80B40C48 03E00008 */ jr $ra -/* 04A6C 80B40C4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40C50.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40C50.s deleted file mode 100644 index 0fb347a530..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40C50.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B40C50 -/* 04A70 80B40C50 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04A74 80B40C54 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04A78 80B40C58 24050041 */ addiu $a1, $zero, 0x0041 ## $a1 = 00000041 -/* 04A7C 80B40C5C 0C2CF1EF */ jal func_80B3C7BC -/* 04A80 80B40C60 24060042 */ addiu $a2, $zero, 0x0042 ## $a2 = 00000042 -/* 04A84 80B40C64 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04A88 80B40C68 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04A8C 80B40C6C 03E00008 */ jr $ra -/* 04A90 80B40C70 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40C74.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40C74.s deleted file mode 100644 index d765364e63..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40C74.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B40C74 -/* 04A94 80B40C74 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04A98 80B40C78 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04A9C 80B40C7C 24050042 */ addiu $a1, $zero, 0x0042 ## $a1 = 00000042 -/* 04AA0 80B40C80 0C2CF1EF */ jal func_80B3C7BC -/* 04AA4 80B40C84 24060043 */ addiu $a2, $zero, 0x0043 ## $a2 = 00000043 -/* 04AA8 80B40C88 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04AAC 80B40C8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04AB0 80B40C90 03E00008 */ jr $ra -/* 04AB4 80B40C94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40C98.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40C98.s deleted file mode 100644 index a5ae8a8789..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40C98.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B40C98 -/* 04AB8 80B40C98 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04ABC 80B40C9C AFBF0014 */ sw $ra, 0x0014($sp) -/* 04AC0 80B40CA0 24050043 */ addiu $a1, $zero, 0x0043 ## $a1 = 00000043 -/* 04AC4 80B40CA4 0C2CF1EF */ jal func_80B3C7BC -/* 04AC8 80B40CA8 24060044 */ addiu $a2, $zero, 0x0044 ## $a2 = 00000044 -/* 04ACC 80B40CAC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04AD0 80B40CB0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04AD4 80B40CB4 03E00008 */ jr $ra -/* 04AD8 80B40CB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40CBC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40CBC.s deleted file mode 100644 index b9647333ab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40CBC.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B40CBC -/* 04ADC 80B40CBC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04AE0 80B40CC0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04AE4 80B40CC4 24050044 */ addiu $a1, $zero, 0x0044 ## $a1 = 00000044 -/* 04AE8 80B40CC8 0C2CF1EF */ jal func_80B3C7BC -/* 04AEC 80B40CCC 24060045 */ addiu $a2, $zero, 0x0045 ## $a2 = 00000045 -/* 04AF0 80B40CD0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04AF4 80B40CD4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04AF8 80B40CD8 03E00008 */ jr $ra -/* 04AFC 80B40CDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40CE0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40CE0.s deleted file mode 100644 index 7160fd61a5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40CE0.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B40CE0 -/* 04B00 80B40CE0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04B04 80B40CE4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04B08 80B40CE8 24050045 */ addiu $a1, $zero, 0x0045 ## $a1 = 00000045 -/* 04B0C 80B40CEC 24060046 */ addiu $a2, $zero, 0x0046 ## $a2 = 00000046 -/* 04B10 80B40CF0 0C2CF1F5 */ jal func_80B3C7D4 -/* 04B14 80B40CF4 24070044 */ addiu $a3, $zero, 0x0044 ## $a3 = 00000044 -/* 04B18 80B40CF8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04B1C 80B40CFC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04B20 80B40D00 03E00008 */ jr $ra -/* 04B24 80B40D04 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D08.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D08.s deleted file mode 100644 index e9afb24a7f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D08.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B40D08 -/* 04B28 80B40D08 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04B2C 80B40D0C AFBF0014 */ sw $ra, 0x0014($sp) -/* 04B30 80B40D10 24050046 */ addiu $a1, $zero, 0x0046 ## $a1 = 00000046 -/* 04B34 80B40D14 0C2CF1EF */ jal func_80B3C7BC -/* 04B38 80B40D18 24060047 */ addiu $a2, $zero, 0x0047 ## $a2 = 00000047 -/* 04B3C 80B40D1C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04B40 80B40D20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04B44 80B40D24 03E00008 */ jr $ra -/* 04B48 80B40D28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D2C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D2C.s deleted file mode 100644 index d2400d6b5d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D2C.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B40D2C -/* 04B4C 80B40D2C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04B50 80B40D30 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04B54 80B40D34 24050047 */ addiu $a1, $zero, 0x0047 ## $a1 = 00000047 -/* 04B58 80B40D38 0C2CF1EF */ jal func_80B3C7BC -/* 04B5C 80B40D3C 24060048 */ addiu $a2, $zero, 0x0048 ## $a2 = 00000048 -/* 04B60 80B40D40 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04B64 80B40D44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04B68 80B40D48 03E00008 */ jr $ra -/* 04B6C 80B40D4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D50.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D50.s deleted file mode 100644 index cf701164b9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D50.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B40D50 -/* 04B70 80B40D50 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04B74 80B40D54 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04B78 80B40D58 24050048 */ addiu $a1, $zero, 0x0048 ## $a1 = 00000048 -/* 04B7C 80B40D5C 0C2CF1EF */ jal func_80B3C7BC -/* 04B80 80B40D60 24060049 */ addiu $a2, $zero, 0x0049 ## $a2 = 00000049 -/* 04B84 80B40D64 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04B88 80B40D68 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04B8C 80B40D6C 03E00008 */ jr $ra -/* 04B90 80B40D70 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D74.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D74.s deleted file mode 100644 index 57611d2e56..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D74.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B40D74 -/* 04B94 80B40D74 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04B98 80B40D78 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04B9C 80B40D7C 24050049 */ addiu $a1, $zero, 0x0049 ## $a1 = 00000049 -/* 04BA0 80B40D80 0C2CF1EF */ jal func_80B3C7BC -/* 04BA4 80B40D84 2406004A */ addiu $a2, $zero, 0x004A ## $a2 = 0000004A -/* 04BA8 80B40D88 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04BAC 80B40D8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04BB0 80B40D90 03E00008 */ jr $ra -/* 04BB4 80B40D94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D98.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D98.s deleted file mode 100644 index 69a94ada6d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D98.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80B40D98 -/* 04BB8 80B40D98 3C0F8016 */ lui $t7, %hi(gGameInfo) -/* 04BBC 80B40D9C 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) -/* 04BC0 80B40DA0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04BC4 80B40DA4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 04BC8 80B40DA8 AFA40028 */ sw $a0, 0x0028($sp) -/* 04BCC 80B40DAC 85F8145E */ lh $t8, 0x145E($t7) ## 8016145E -/* 04BD0 80B40DB0 3C01430C */ lui $at, 0x430C ## $at = 430C0000 -/* 04BD4 80B40DB4 44814000 */ mtc1 $at, $f8 ## $f8 = 140.00 -/* 04BD8 80B40DB8 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 04BDC 80B40DBC C4800090 */ lwc1 $f0, 0x0090($a0) ## 00000090 -/* 04BE0 80B40DC0 3C040600 */ lui $a0, %hi(D_06004828) ## $a0 = 06000000 -/* 04BE4 80B40DC4 468021A0 */ cvt.s.w $f6, $f4 -/* 04BE8 80B40DC8 46083280 */ add.s $f10, $f6, $f8 -/* 04BEC 80B40DCC 4600503E */ c.le.s $f10, $f0 -/* 04BF0 80B40DD0 00000000 */ nop -/* 04BF4 80B40DD4 45020017 */ bc1fl .L80B40E34 -/* 04BF8 80B40DD8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 04BFC 80B40DDC 0C028800 */ jal Animation_GetLastFrame - -/* 04C00 80B40DE0 24844828 */ addiu $a0, $a0, %lo(D_06004828) ## $a0 = 06004828 -/* 04C04 80B40DE4 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 04C08 80B40DE8 3C01C140 */ lui $at, 0xC140 ## $at = C1400000 -/* 04C0C 80B40DEC 44812000 */ mtc1 $at, $f4 ## $f4 = -12.00 -/* 04C10 80B40DF0 468084A0 */ cvt.s.w $f18, $f16 -/* 04C14 80B40DF4 8FA40028 */ lw $a0, 0x0028($sp) -/* 04C18 80B40DF8 3C050600 */ lui $a1, %hi(D_06004828) ## $a1 = 06000000 -/* 04C1C 80B40DFC 24A54828 */ addiu $a1, $a1, %lo(D_06004828) ## $a1 = 06004828 -/* 04C20 80B40E00 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04C24 80B40E04 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 04C28 80B40E08 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 04C2C 80B40E0C AFA00014 */ sw $zero, 0x0014($sp) -/* 04C30 80B40E10 E7A40018 */ swc1 $f4, 0x0018($sp) -/* 04C34 80B40E14 0C029468 */ jal Animation_Change - -/* 04C38 80B40E18 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04C3C 80B40E1C 8FA20028 */ lw $v0, 0x0028($sp) -/* 04C40 80B40E20 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 04C44 80B40E24 2419004B */ addiu $t9, $zero, 0x004B ## $t9 = 0000004B -/* 04C48 80B40E28 AC590260 */ sw $t9, 0x0260($v0) ## 00000260 -/* 04C4C 80B40E2C E4460268 */ swc1 $f6, 0x0268($v0) ## 00000268 -/* 04C50 80B40E30 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B40E34: -/* 04C54 80B40E34 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04C58 80B40E38 03E00008 */ jr $ra -/* 04C5C 80B40E3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40E40.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40E40.s deleted file mode 100644 index 586bcbb78e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40E40.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B40E40 -/* 04C60 80B40E40 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04C64 80B40E44 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04C68 80B40E48 2405004B */ addiu $a1, $zero, 0x004B ## $a1 = 0000004B -/* 04C6C 80B40E4C 0C2CF1EF */ jal func_80B3C7BC -/* 04C70 80B40E50 2406004C */ addiu $a2, $zero, 0x004C ## $a2 = 0000004C -/* 04C74 80B40E54 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04C78 80B40E58 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04C7C 80B40E5C 03E00008 */ jr $ra -/* 04C80 80B40E60 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40E64.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40E64.s deleted file mode 100644 index 2495b3a2c5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40E64.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B40E64 -/* 04C84 80B40E64 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04C88 80B40E68 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04C8C 80B40E6C 2405004C */ addiu $a1, $zero, 0x004C ## $a1 = 0000004C -/* 04C90 80B40E70 0C2CF1EF */ jal func_80B3C7BC -/* 04C94 80B40E74 2406004D */ addiu $a2, $zero, 0x004D ## $a2 = 0000004D -/* 04C98 80B40E78 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04C9C 80B40E7C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04CA0 80B40E80 03E00008 */ jr $ra -/* 04CA4 80B40E84 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40E88.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40E88.s deleted file mode 100644 index a0d3261ff6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40E88.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B40E88 -/* 04CA8 80B40E88 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04CAC 80B40E8C AFBF0014 */ sw $ra, 0x0014($sp) -/* 04CB0 80B40E90 2405004D */ addiu $a1, $zero, 0x004D ## $a1 = 0000004D -/* 04CB4 80B40E94 0C2CF1EF */ jal func_80B3C7BC -/* 04CB8 80B40E98 2406004E */ addiu $a2, $zero, 0x004E ## $a2 = 0000004E -/* 04CBC 80B40E9C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04CC0 80B40EA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04CC4 80B40EA4 03E00008 */ jr $ra -/* 04CC8 80B40EA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40EAC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40EAC.s deleted file mode 100644 index bfcf032279..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40EAC.s +++ /dev/null @@ -1,132 +0,0 @@ -.rdata -glabel D_80B420B8 - .asciz "En_Oa2_Stalker_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -.late_rodata -glabel jtbl_80B42260 -.word L80B40F10 -.word L80B40FCC -.word L80B40FCC -.word L80B40FCC -.word L80B40FCC -.word L80B40F20 -.word L80B40FCC -.word L80B40FCC -.word L80B40FBC -.word L80B40FCC -.word L80B40FCC -.word L80B40FCC -.word L80B40FCC -.word L80B40F58 -.word L80B40F80 -.word L80B40F94 -.word L80B40FA8 -.word L80B40F44 -.word L80B40F6C -.word L80B40F34 - -.text -glabel func_80B40EAC -/* 04CCC 80B40EAC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04CD0 80B40EB0 AFB00018 */ sw $s0, 0x0018($sp) -/* 04CD4 80B40EB4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04CD8 80B40EB8 AFBF001C */ sw $ra, 0x001C($sp) -/* 04CDC 80B40EBC 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 04CE0 80B40EC0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 04CE4 80B40EC4 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 04CE8 80B40EC8 0C2CF134 */ jal func_80B3C4D0 -/* 04CEC 80B40ECC AFA6002C */ sw $a2, 0x002C($sp) -/* 04CF0 80B40ED0 10400045 */ beq $v0, $zero, .L80B40FE8 -/* 04CF4 80B40ED4 8FA6002C */ lw $a2, 0x002C($sp) -/* 04CF8 80B40ED8 944E0000 */ lhu $t6, 0x0000($v0) ## 00000000 -/* 04CFC 80B40EDC AFAE0020 */ sw $t6, 0x0020($sp) -/* 04D00 80B40EE0 8E03026C */ lw $v1, 0x026C($s0) ## 0000026C -/* 04D04 80B40EE4 25D8FFFF */ addiu $t8, $t6, 0xFFFF ## $t8 = FFFFFFFF -/* 04D08 80B40EE8 2F010014 */ sltiu $at, $t8, 0x0014 -/* 04D0C 80B40EEC 51C3003F */ beql $t6, $v1, .L80B40FEC -/* 04D10 80B40EF0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 04D14 80B40EF4 10200035 */ beq $at, $zero, .L80B40FCC -/* 04D18 80B40EF8 0018C080 */ sll $t8, $t8, 2 -/* 04D1C 80B40EFC 3C0180B4 */ lui $at, %hi(jtbl_80B42260) ## $at = 80B40000 -/* 04D20 80B40F00 00380821 */ addu $at, $at, $t8 -/* 04D24 80B40F04 8C382260 */ lw $t8, %lo(jtbl_80B42260)($at) -/* 04D28 80B40F08 03000008 */ jr $t8 -/* 04D2C 80B40F0C 00000000 */ nop -glabel L80B40F10 -/* 04D30 80B40F10 0C2D01BE */ jal func_80B406F8 -/* 04D34 80B40F14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04D38 80B40F18 10000030 */ beq $zero, $zero, .L80B40FDC -/* 04D3C 80B40F1C 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B40F20 -/* 04D40 80B40F20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04D44 80B40F24 0C2D01C3 */ jal func_80B4070C -/* 04D48 80B40F28 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 04D4C 80B40F2C 1000002B */ beq $zero, $zero, .L80B40FDC -/* 04D50 80B40F30 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B40F34 -/* 04D54 80B40F34 0C2D01EA */ jal func_80B407A8 -/* 04D58 80B40F38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04D5C 80B40F3C 10000027 */ beq $zero, $zero, .L80B40FDC -/* 04D60 80B40F40 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B40F44 -/* 04D64 80B40F44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04D68 80B40F48 0C2D0208 */ jal func_80B40820 -/* 04D6C 80B40F4C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 04D70 80B40F50 10000022 */ beq $zero, $zero, .L80B40FDC -/* 04D74 80B40F54 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B40F58 -/* 04D78 80B40F58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04D7C 80B40F5C 0C2D023F */ jal func_80B408FC -/* 04D80 80B40F60 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 04D84 80B40F64 1000001D */ beq $zero, $zero, .L80B40FDC -/* 04D88 80B40F68 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B40F6C -/* 04D8C 80B40F6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04D90 80B40F70 0C2D0276 */ jal func_80B409D8 -/* 04D94 80B40F74 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 04D98 80B40F78 10000018 */ beq $zero, $zero, .L80B40FDC -/* 04D9C 80B40F7C 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B40F80 -/* 04DA0 80B40F80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04DA4 80B40F84 0C2D029E */ jal func_80B40A78 -/* 04DA8 80B40F88 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 04DAC 80B40F8C 10000013 */ beq $zero, $zero, .L80B40FDC -/* 04DB0 80B40F90 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B40F94 -/* 04DB4 80B40F94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04DB8 80B40F98 0C2D02C6 */ jal func_80B40B18 -/* 04DBC 80B40F9C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 04DC0 80B40FA0 1000000E */ beq $zero, $zero, .L80B40FDC -/* 04DC4 80B40FA4 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B40FA8 -/* 04DC8 80B40FA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04DCC 80B40FAC 0C2D02ED */ jal func_80B40BB4 -/* 04DD0 80B40FB0 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 04DD4 80B40FB4 10000009 */ beq $zero, $zero, .L80B40FDC -/* 04DD8 80B40FB8 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B40FBC -/* 04DDC 80B40FBC 0C00B55C */ jal Actor_Kill - -/* 04DE0 80B40FC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04DE4 80B40FC4 10000005 */ beq $zero, $zero, .L80B40FDC -/* 04DE8 80B40FC8 8FB90020 */ lw $t9, 0x0020($sp) -glabel L80B40FCC -.L80B40FCC: -/* 04DEC 80B40FCC 3C0480B4 */ lui $a0, %hi(D_80B420B8) ## $a0 = 80B40000 -/* 04DF0 80B40FD0 0C00084C */ jal osSyncPrintf - -/* 04DF4 80B40FD4 248420B8 */ addiu $a0, $a0, %lo(D_80B420B8) ## $a0 = 80B420B8 -/* 04DF8 80B40FD8 8FB90020 */ lw $t9, 0x0020($sp) -.L80B40FDC: -/* 04DFC 80B40FDC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 04E00 80B40FE0 10000002 */ beq $zero, $zero, .L80B40FEC -/* 04E04 80B40FE4 AE19026C */ sw $t9, 0x026C($s0) ## 0000026C -.L80B40FE8: -/* 04E08 80B40FE8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B40FEC: -/* 04E0C 80B40FEC 8FBF001C */ lw $ra, 0x001C($sp) -/* 04E10 80B40FF0 8FB00018 */ lw $s0, 0x0018($sp) -/* 04E14 80B40FF4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04E18 80B40FF8 03E00008 */ jr $ra -/* 04E1C 80B40FFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41000.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41000.s deleted file mode 100644 index 0a6d82021d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41000.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80B41000 -/* 04E20 80B41000 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04E24 80B41004 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04E28 80B41008 0C2D03AB */ jal func_80B40EAC -/* 04E2C 80B4100C 00000000 */ nop -/* 04E30 80B41010 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04E34 80B41014 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04E38 80B41018 03E00008 */ jr $ra -/* 04E3C 80B4101C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41020.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41020.s deleted file mode 100644 index 5a31a69a54..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41020.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B41020 -/* 04E40 80B41020 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04E44 80B41024 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04E48 80B41028 AFA40018 */ sw $a0, 0x0018($sp) -/* 04E4C 80B4102C AFA5001C */ sw $a1, 0x001C($sp) -/* 04E50 80B41030 0C2CF162 */ jal func_80B3C588 -/* 04E54 80B41034 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 04E58 80B41038 0C2CF12C */ jal func_80B3C4B0 -/* 04E5C 80B4103C 8FA40018 */ lw $a0, 0x0018($sp) -/* 04E60 80B41040 8FA40018 */ lw $a0, 0x0018($sp) -/* 04E64 80B41044 0C2CF11A */ jal func_80B3C468 -/* 04E68 80B41048 8FA5001C */ lw $a1, 0x001C($sp) -/* 04E6C 80B4104C 8FA40018 */ lw $a0, 0x0018($sp) -/* 04E70 80B41050 0C2D03AB */ jal func_80B40EAC -/* 04E74 80B41054 8FA5001C */ lw $a1, 0x001C($sp) -/* 04E78 80B41058 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04E7C 80B4105C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04E80 80B41060 03E00008 */ jr $ra -/* 04E84 80B41064 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41068.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41068.s deleted file mode 100644 index 13b6c2850a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41068.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80B41068 -/* 04E88 80B41068 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04E8C 80B4106C AFBF0014 */ sw $ra, 0x0014($sp) -/* 04E90 80B41070 AFA40018 */ sw $a0, 0x0018($sp) -/* 04E94 80B41074 0C2CF12C */ jal func_80B3C4B0 -/* 04E98 80B41078 AFA5001C */ sw $a1, 0x001C($sp) -/* 04E9C 80B4107C 8FA40018 */ lw $a0, 0x0018($sp) -/* 04EA0 80B41080 0C2CF11A */ jal func_80B3C468 -/* 04EA4 80B41084 8FA5001C */ lw $a1, 0x001C($sp) -/* 04EA8 80B41088 0C2CF0C7 */ jal func_80B3C31C -/* 04EAC 80B4108C 8FA40018 */ lw $a0, 0x0018($sp) -/* 04EB0 80B41090 8FA40018 */ lw $a0, 0x0018($sp) -/* 04EB4 80B41094 0C2D03AB */ jal func_80B40EAC -/* 04EB8 80B41098 8FA5001C */ lw $a1, 0x001C($sp) -/* 04EBC 80B4109C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04EC0 80B410A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04EC4 80B410A4 03E00008 */ jr $ra -/* 04EC8 80B410A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B410AC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B410AC.s deleted file mode 100644 index 7829866576..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B410AC.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80B410AC -/* 04ECC 80B410AC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04ED0 80B410B0 AFBF001C */ sw $ra, 0x001C($sp) -/* 04ED4 80B410B4 AFB00018 */ sw $s0, 0x0018($sp) -/* 04ED8 80B410B8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04EDC 80B410BC 0C2D01A8 */ jal func_80B406A0 -/* 04EE0 80B410C0 AFA50024 */ sw $a1, 0x0024($sp) -/* 04EE4 80B410C4 0C2CF12C */ jal func_80B3C4B0 -/* 04EE8 80B410C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04EEC 80B410CC 0C2CF0C7 */ jal func_80B3C31C -/* 04EF0 80B410D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04EF4 80B410D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04EF8 80B410D8 0C2D03AB */ jal func_80B40EAC -/* 04EFC 80B410DC 8FA50024 */ lw $a1, 0x0024($sp) -/* 04F00 80B410E0 14400006 */ bne $v0, $zero, .L80B410FC -/* 04F04 80B410E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04F08 80B410E8 0C2CF249 */ jal func_80B3C924 -/* 04F0C 80B410EC 8FA50024 */ lw $a1, 0x0024($sp) -/* 04F10 80B410F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04F14 80B410F4 0C2CF11A */ jal func_80B3C468 -/* 04F18 80B410F8 8FA50024 */ lw $a1, 0x0024($sp) -.L80B410FC: -/* 04F1C 80B410FC 8FBF001C */ lw $ra, 0x001C($sp) -/* 04F20 80B41100 8FB00018 */ lw $s0, 0x0018($sp) -/* 04F24 80B41104 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04F28 80B41108 03E00008 */ jr $ra -/* 04F2C 80B4110C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41110.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41110.s deleted file mode 100644 index f2f4250d1a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41110.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80B41110 -/* 04F30 80B41110 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04F34 80B41114 AFBF001C */ sw $ra, 0x001C($sp) -/* 04F38 80B41118 AFB00018 */ sw $s0, 0x0018($sp) -/* 04F3C 80B4111C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04F40 80B41120 0C2CF12C */ jal func_80B3C4B0 -/* 04F44 80B41124 AFA50024 */ sw $a1, 0x0024($sp) -/* 04F48 80B41128 0C2CF0C7 */ jal func_80B3C31C -/* 04F4C 80B4112C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04F50 80B41130 0C2D016A */ jal func_80B405A8 -/* 04F54 80B41134 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04F58 80B41138 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04F5C 80B4113C 0C2D03AB */ jal func_80B40EAC -/* 04F60 80B41140 8FA50024 */ lw $a1, 0x0024($sp) -/* 04F64 80B41144 14400006 */ bne $v0, $zero, .L80B41160 -/* 04F68 80B41148 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04F6C 80B4114C 0C2CF233 */ jal func_80B3C8CC -/* 04F70 80B41150 8FA50024 */ lw $a1, 0x0024($sp) -/* 04F74 80B41154 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04F78 80B41158 0C2CF11A */ jal func_80B3C468 -/* 04F7C 80B4115C 8FA50024 */ lw $a1, 0x0024($sp) -.L80B41160: -/* 04F80 80B41160 8FBF001C */ lw $ra, 0x001C($sp) -/* 04F84 80B41164 8FB00018 */ lw $s0, 0x0018($sp) -/* 04F88 80B41168 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04F8C 80B4116C 03E00008 */ jr $ra -/* 04F90 80B41170 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41174.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41174.s deleted file mode 100644 index 4de18c6233..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41174.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B41174 -/* 04F94 80B41174 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04F98 80B41178 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04F9C 80B4117C AFA40018 */ sw $a0, 0x0018($sp) -/* 04FA0 80B41180 0C2CF11A */ jal func_80B3C468 -/* 04FA4 80B41184 AFA5001C */ sw $a1, 0x001C($sp) -/* 04FA8 80B41188 0C2CF0C7 */ jal func_80B3C31C -/* 04FAC 80B4118C 8FA40018 */ lw $a0, 0x0018($sp) -/* 04FB0 80B41190 8FA40018 */ lw $a0, 0x0018($sp) -/* 04FB4 80B41194 0C2D03AB */ jal func_80B40EAC -/* 04FB8 80B41198 8FA5001C */ lw $a1, 0x001C($sp) -/* 04FBC 80B4119C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04FC0 80B411A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04FC4 80B411A4 03E00008 */ jr $ra -/* 04FC8 80B411A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B411AC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B411AC.s deleted file mode 100644 index da222c8abf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B411AC.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B411AC -/* 04FCC 80B411AC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04FD0 80B411B0 AFBF001C */ sw $ra, 0x001C($sp) -/* 04FD4 80B411B4 AFB00018 */ sw $s0, 0x0018($sp) -/* 04FD8 80B411B8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04FDC 80B411BC 0C2CF12C */ jal func_80B3C4B0 -/* 04FE0 80B411C0 AFA50024 */ sw $a1, 0x0024($sp) -/* 04FE4 80B411C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04FE8 80B411C8 0C2D019B */ jal func_80B4066C -/* 04FEC 80B411CC 8FA50024 */ lw $a1, 0x0024($sp) -/* 04FF0 80B411D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04FF4 80B411D4 0C2CF11A */ jal func_80B3C468 -/* 04FF8 80B411D8 8FA50024 */ lw $a1, 0x0024($sp) -/* 04FFC 80B411DC 0C2CF0C7 */ jal func_80B3C31C -/* 05000 80B411E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05004 80B411E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05008 80B411E8 0C2D03AB */ jal func_80B40EAC -/* 0500C 80B411EC 8FA50024 */ lw $a1, 0x0024($sp) -/* 05010 80B411F0 8FBF001C */ lw $ra, 0x001C($sp) -/* 05014 80B411F4 8FB00018 */ lw $s0, 0x0018($sp) -/* 05018 80B411F8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0501C 80B411FC 03E00008 */ jr $ra -/* 05020 80B41200 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41204.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41204.s deleted file mode 100644 index 03fb55b21c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41204.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80B41204 -/* 05024 80B41204 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05028 80B41208 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0502C 80B4120C AFA40018 */ sw $a0, 0x0018($sp) -/* 05030 80B41210 0C2CF12C */ jal func_80B3C4B0 -/* 05034 80B41214 AFA5001C */ sw $a1, 0x001C($sp) -/* 05038 80B41218 8FA40018 */ lw $a0, 0x0018($sp) -/* 0503C 80B4121C 0C2CF11A */ jal func_80B3C468 -/* 05040 80B41220 8FA5001C */ lw $a1, 0x001C($sp) -/* 05044 80B41224 0C2CF0C7 */ jal func_80B3C31C -/* 05048 80B41228 8FA40018 */ lw $a0, 0x0018($sp) -/* 0504C 80B4122C 8FA40018 */ lw $a0, 0x0018($sp) -/* 05050 80B41230 0C2D03AB */ jal func_80B40EAC -/* 05054 80B41234 8FA5001C */ lw $a1, 0x001C($sp) -/* 05058 80B41238 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0505C 80B4123C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05060 80B41240 03E00008 */ jr $ra -/* 05064 80B41244 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41248.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41248.s deleted file mode 100644 index 8f3e3e8439..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41248.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80B41248 -/* 05068 80B41248 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0506C 80B4124C AFBF0014 */ sw $ra, 0x0014($sp) -/* 05070 80B41250 AFA40018 */ sw $a0, 0x0018($sp) -/* 05074 80B41254 0C2CF908 */ jal func_80B3E420 -/* 05078 80B41258 AFA5001C */ sw $a1, 0x001C($sp) -/* 0507C 80B4125C 8FA40018 */ lw $a0, 0x0018($sp) -/* 05080 80B41260 8FA5001C */ lw $a1, 0x001C($sp) -/* 05084 80B41264 0C2CF162 */ jal func_80B3C588 -/* 05088 80B41268 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 0508C 80B4126C 0C2D0314 */ jal func_80B40C50 -/* 05090 80B41270 8FA40018 */ lw $a0, 0x0018($sp) -/* 05094 80B41274 8FBF0014 */ lw $ra, 0x0014($sp) -/* 05098 80B41278 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0509C 80B4127C 03E00008 */ jr $ra -/* 050A0 80B41280 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41284.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41284.s deleted file mode 100644 index dd1de3041c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41284.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B41284 -/* 050A4 80B41284 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 050A8 80B41288 AFBF0014 */ sw $ra, 0x0014($sp) -/* 050AC 80B4128C 0C2CF919 */ jal func_80B3E464 -/* 050B0 80B41290 AFA40018 */ sw $a0, 0x0018($sp) -/* 050B4 80B41294 0C2D031D */ jal func_80B40C74 -/* 050B8 80B41298 8FA40018 */ lw $a0, 0x0018($sp) -/* 050BC 80B4129C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 050C0 80B412A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 050C4 80B412A4 03E00008 */ jr $ra -/* 050C8 80B412A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B412AC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B412AC.s deleted file mode 100644 index 1f7e0f995f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B412AC.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B412AC -/* 050CC 80B412AC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 050D0 80B412B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 050D4 80B412B4 0C2CF92B */ jal func_80B3E4AC -/* 050D8 80B412B8 AFA40018 */ sw $a0, 0x0018($sp) -/* 050DC 80B412BC 0C2D0326 */ jal func_80B40C98 -/* 050E0 80B412C0 8FA40018 */ lw $a0, 0x0018($sp) -/* 050E4 80B412C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 050E8 80B412C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 050EC 80B412CC 03E00008 */ jr $ra -/* 050F0 80B412D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B412D4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B412D4.s deleted file mode 100644 index d7c0356c70..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B412D4.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B412D4 -/* 050F4 80B412D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 050F8 80B412D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 050FC 80B412DC 0C2CF93E */ jal func_80B3E4F8 -/* 05100 80B412E0 AFA40018 */ sw $a0, 0x0018($sp) -/* 05104 80B412E4 0C2D032F */ jal func_80B40CBC -/* 05108 80B412E8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0510C 80B412EC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 05110 80B412F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05114 80B412F4 03E00008 */ jr $ra -/* 05118 80B412F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B412FC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B412FC.s deleted file mode 100644 index e6685d9d9e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B412FC.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B412FC -/* 0511C 80B412FC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05120 80B41300 AFBF0014 */ sw $ra, 0x0014($sp) -/* 05124 80B41304 0C2CF94F */ jal func_80B3E53C -/* 05128 80B41308 AFA40018 */ sw $a0, 0x0018($sp) -/* 0512C 80B4130C 0C2D0338 */ jal func_80B40CE0 -/* 05130 80B41310 8FA40018 */ lw $a0, 0x0018($sp) -/* 05134 80B41314 8FBF0014 */ lw $ra, 0x0014($sp) -/* 05138 80B41318 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0513C 80B4131C 03E00008 */ jr $ra -/* 05140 80B41320 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41324.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41324.s deleted file mode 100644 index de392caaa3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41324.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B41324 -/* 05144 80B41324 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05148 80B41328 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0514C 80B4132C 0C2CF960 */ jal func_80B3E580 -/* 05150 80B41330 AFA40018 */ sw $a0, 0x0018($sp) -/* 05154 80B41334 0C2D0342 */ jal func_80B40D08 -/* 05158 80B41338 8FA40018 */ lw $a0, 0x0018($sp) -/* 0515C 80B4133C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 05160 80B41340 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05164 80B41344 03E00008 */ jr $ra -/* 05168 80B41348 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4134C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4134C.s deleted file mode 100644 index c6a871ae03..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4134C.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B4134C -/* 0516C 80B4134C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05170 80B41350 AFBF0014 */ sw $ra, 0x0014($sp) -/* 05174 80B41354 0C2CF972 */ jal func_80B3E5C8 -/* 05178 80B41358 AFA40018 */ sw $a0, 0x0018($sp) -/* 0517C 80B4135C 0C2D034B */ jal func_80B40D2C -/* 05180 80B41360 8FA40018 */ lw $a0, 0x0018($sp) -/* 05184 80B41364 8FBF0014 */ lw $ra, 0x0014($sp) -/* 05188 80B41368 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0518C 80B4136C 03E00008 */ jr $ra -/* 05190 80B41370 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41374.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41374.s deleted file mode 100644 index 9290bb9e13..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41374.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B41374 -/* 05194 80B41374 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05198 80B41378 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0519C 80B4137C 0C2CF984 */ jal func_80B3E610 -/* 051A0 80B41380 AFA40018 */ sw $a0, 0x0018($sp) -/* 051A4 80B41384 0C2D0354 */ jal func_80B40D50 -/* 051A8 80B41388 8FA40018 */ lw $a0, 0x0018($sp) -/* 051AC 80B4138C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 051B0 80B41390 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 051B4 80B41394 03E00008 */ jr $ra -/* 051B8 80B41398 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4139C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4139C.s deleted file mode 100644 index 8644bb6141..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4139C.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B4139C -/* 051BC 80B4139C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 051C0 80B413A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 051C4 80B413A4 0C2CF99A */ jal func_80B3E668 -/* 051C8 80B413A8 AFA40018 */ sw $a0, 0x0018($sp) -/* 051CC 80B413AC 0C2D035D */ jal func_80B40D74 -/* 051D0 80B413B0 8FA40018 */ lw $a0, 0x0018($sp) -/* 051D4 80B413B4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 051D8 80B413B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 051DC 80B413BC 03E00008 */ jr $ra -/* 051E0 80B413C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B413C4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B413C4.s deleted file mode 100644 index 7d5685a2ed..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B413C4.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80B413C4 -/* 051E4 80B413C4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 051E8 80B413C8 AFBF001C */ sw $ra, 0x001C($sp) -/* 051EC 80B413CC AFB00018 */ sw $s0, 0x0018($sp) -/* 051F0 80B413D0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 051F4 80B413D4 0C2CF5C4 */ jal func_80B3D710 -/* 051F8 80B413D8 AFA50024 */ sw $a1, 0x0024($sp) -/* 051FC 80B413DC 0C2CF12C */ jal func_80B3C4B0 -/* 05200 80B413E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05204 80B413E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05208 80B413E8 0C2CF11A */ jal func_80B3C468 -/* 0520C 80B413EC 8FA50024 */ lw $a1, 0x0024($sp) -/* 05210 80B413F0 0C2CF0C7 */ jal func_80B3C31C -/* 05214 80B413F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05218 80B413F8 0C2D0366 */ jal func_80B40D98 -/* 0521C 80B413FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05220 80B41400 8FBF001C */ lw $ra, 0x001C($sp) -/* 05224 80B41404 8FB00018 */ lw $s0, 0x0018($sp) -/* 05228 80B41408 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0522C 80B4140C 03E00008 */ jr $ra -/* 05230 80B41410 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41414.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41414.s deleted file mode 100644 index d9c3300e5f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41414.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B41414 -/* 05234 80B41414 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05238 80B41418 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0523C 80B4141C 0C2CF9CE */ jal func_80B3E738 -/* 05240 80B41420 AFA40018 */ sw $a0, 0x0018($sp) -/* 05244 80B41424 0C2D0390 */ jal func_80B40E40 -/* 05248 80B41428 8FA40018 */ lw $a0, 0x0018($sp) -/* 0524C 80B4142C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 05250 80B41430 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05254 80B41434 03E00008 */ jr $ra -/* 05258 80B41438 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4143C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4143C.s deleted file mode 100644 index ccbd3027d2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4143C.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B4143C -/* 0525C 80B4143C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05260 80B41440 AFBF0014 */ sw $ra, 0x0014($sp) -/* 05264 80B41444 0C2CF9E8 */ jal func_80B3E7A0 -/* 05268 80B41448 AFA40018 */ sw $a0, 0x0018($sp) -/* 0526C 80B4144C 0C2D0399 */ jal func_80B40E64 -/* 05270 80B41450 8FA40018 */ lw $a0, 0x0018($sp) -/* 05274 80B41454 8FBF0014 */ lw $ra, 0x0014($sp) -/* 05278 80B41458 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0527C 80B4145C 03E00008 */ jr $ra -/* 05280 80B41460 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41464.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41464.s deleted file mode 100644 index 21fef72e23..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41464.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B41464 -/* 05284 80B41464 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05288 80B41468 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0528C 80B4146C 0C2CFA01 */ jal func_80B3E804 -/* 05290 80B41470 AFA40018 */ sw $a0, 0x0018($sp) -/* 05294 80B41474 0C2D03A2 */ jal func_80B40E88 -/* 05298 80B41478 8FA40018 */ lw $a0, 0x0018($sp) -/* 0529C 80B4147C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 052A0 80B41480 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 052A4 80B41484 03E00008 */ jr $ra -/* 052A8 80B41488 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4148C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4148C.s deleted file mode 100644 index 3b17ef86d8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4148C.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B4148C -/* 052AC 80B4148C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 052B0 80B41490 AFBF0014 */ sw $ra, 0x0014($sp) -/* 052B4 80B41494 0C00B55C */ jal Actor_Kill - -/* 052B8 80B41498 AFA5001C */ sw $a1, 0x001C($sp) -/* 052BC 80B4149C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 052C0 80B414A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 052C4 80B414A4 03E00008 */ jr $ra -/* 052C8 80B414A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B414AC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B414AC.s deleted file mode 100644 index 34535b1dc0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B414AC.s +++ /dev/null @@ -1,78 +0,0 @@ -.rdata -glabel D_80B420F0 - .asciz "../z_en_oA2_inStalker.c" - .balign 4 - -glabel D_80B42108 - .asciz "../z_en_oA2_inStalker.c" - .balign 4 - -.text -glabel func_80B414AC -/* 052CC 80B414AC 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 052D0 80B414B0 AFBF002C */ sw $ra, 0x002C($sp) -/* 052D4 80B414B4 AFB00028 */ sw $s0, 0x0028($sp) -/* 052D8 80B414B8 AFA40068 */ sw $a0, 0x0068($sp) -/* 052DC 80B414BC AFA5006C */ sw $a1, 0x006C($sp) -/* 052E0 80B414C0 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 -/* 052E4 80B414C4 3C0680B4 */ lui $a2, %hi(D_80B420F0) ## $a2 = 80B40000 -/* 052E8 80B414C8 24C620F0 */ addiu $a2, $a2, %lo(D_80B420F0) ## $a2 = 80B420F0 -/* 052EC 80B414CC 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 -/* 052F0 80B414D0 24070347 */ addiu $a3, $zero, 0x0347 ## $a3 = 00000347 -/* 052F4 80B414D4 0C031AB1 */ jal Graph_OpenDisps -/* 052F8 80B414D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 052FC 80B414DC 0C024F46 */ jal func_80093D18 -/* 05300 80B414E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05304 80B414E4 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 -/* 05308 80B414E8 3C030600 */ lui $v1, %hi(D_060058C0) ## $v1 = 06000000 -/* 0530C 80B414EC 246358C0 */ addiu $v1, $v1, %lo(D_060058C0) ## $v1 = 060058C0 -/* 05310 80B414F0 0003C900 */ sll $t9, $v1, 4 -/* 05314 80B414F4 00194702 */ srl $t0, $t9, 28 -/* 05318 80B414F8 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 0531C 80B414FC 3C0A8016 */ lui $t2, %hi(gSegments) -/* 05320 80B41500 248F0008 */ addiu $t7, $a0, 0x0008 ## $t7 = 00000008 -/* 05324 80B41504 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 05328 80B41508 254A6FA8 */ addiu $t2, %lo(gSegments) -/* 0532C 80B4150C 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 05330 80B41510 00084880 */ sll $t1, $t0, 2 -/* 05334 80B41514 012A2821 */ addu $a1, $t1, $t2 -/* 05338 80B41518 AC980000 */ sw $t8, 0x0000($a0) ## 00000000 -/* 0533C 80B4151C 8CAB0000 */ lw $t3, 0x0000($a1) ## 00000000 -/* 05340 80B41520 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 05344 80B41524 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 05348 80B41528 00613024 */ and $a2, $v1, $at -/* 0534C 80B4152C 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 05350 80B41530 01666021 */ addu $t4, $t3, $a2 -/* 05354 80B41534 01876821 */ addu $t5, $t4, $a3 -/* 05358 80B41538 AC8D0004 */ sw $t5, 0x0004($a0) ## 00000004 -/* 0535C 80B4153C 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 -/* 05360 80B41540 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 05364 80B41544 35EF0024 */ ori $t7, $t7, 0x0024 ## $t7 = DB060024 -/* 05368 80B41548 248E0008 */ addiu $t6, $a0, 0x0008 ## $t6 = 00000008 -/* 0536C 80B4154C AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 -/* 05370 80B41550 AC8F0000 */ sw $t7, 0x0000($a0) ## 00000000 -/* 05374 80B41554 8CB80000 */ lw $t8, 0x0000($a1) ## 00000000 -/* 05378 80B41558 0306C821 */ addu $t9, $t8, $a2 -/* 0537C 80B4155C 03274021 */ addu $t0, $t9, $a3 -/* 05380 80B41560 AC880004 */ sw $t0, 0x0004($a0) ## 00000004 -/* 05384 80B41564 8FA20068 */ lw $v0, 0x0068($sp) -/* 05388 80B41568 8FA4006C */ lw $a0, 0x006C($sp) -/* 0538C 80B4156C 9047014E */ lbu $a3, 0x014E($v0) ## 0000014E -/* 05390 80B41570 8C46016C */ lw $a2, 0x016C($v0) ## 0000016C -/* 05394 80B41574 8C450150 */ lw $a1, 0x0150($v0) ## 00000150 -/* 05398 80B41578 AFA00018 */ sw $zero, 0x0018($sp) -/* 0539C 80B4157C AFA00014 */ sw $zero, 0x0014($sp) -/* 053A0 80B41580 AFA00010 */ sw $zero, 0x0010($sp) -/* 053A4 80B41584 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 053A8 80B41588 2442014C */ addiu $v0, $v0, 0x014C ## $v0 = 0000014C -/* 053AC 80B4158C 3C0680B4 */ lui $a2, %hi(D_80B42108) ## $a2 = 80B40000 -/* 053B0 80B41590 24C62108 */ addiu $a2, $a2, %lo(D_80B42108) ## $a2 = 80B42108 -/* 053B4 80B41594 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 -/* 053B8 80B41598 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 053BC 80B4159C 0C031AD5 */ jal Graph_CloseDisps -/* 053C0 80B415A0 24070356 */ addiu $a3, $zero, 0x0356 ## $a3 = 00000356 -/* 053C4 80B415A4 8FBF002C */ lw $ra, 0x002C($sp) -/* 053C8 80B415A8 8FB00028 */ lw $s0, 0x0028($sp) -/* 053CC 80B415AC 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 053D0 80B415B0 03E00008 */ jr $ra -/* 053D4 80B415B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B415B8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B415B8.s deleted file mode 100644 index c4b9edd865..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B415B8.s +++ /dev/null @@ -1,97 +0,0 @@ -glabel func_80B415B8 -/* 053D8 80B415B8 3C038016 */ lui $v1, %hi(gSaveContext) -/* 053DC 80B415BC 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 053E0 80B415C0 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 -/* 053E4 80B415C4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 053E8 80B415C8 AFB00018 */ sw $s0, 0x0018($sp) -/* 053EC 80B415CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 053F0 80B415D0 AFBF001C */ sw $ra, 0x001C($sp) -/* 053F4 80B415D4 15C00049 */ bne $t6, $zero, .L80B416FC -/* 053F8 80B415D8 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 053FC 80B415DC 94660EEC */ lhu $a2, 0x0EEC($v1) ## 8015F54C -/* 05400 80B415E0 3C020200 */ lui $v0, %hi(D_020046F0) ## $v0 = 02000000 -/* 05404 80B415E4 244246F0 */ addiu $v0, $v0, %lo(D_020046F0) ## $v0 = 020046F0 -/* 05408 80B415E8 30CF0020 */ andi $t7, $a2, 0x0020 ## $t7 = 00000000 -/* 0540C 80B415EC 15E00014 */ bne $t7, $zero, .L80B41640 -/* 05410 80B415F0 34D80020 */ ori $t8, $a2, 0x0020 ## $t8 = 00000020 -/* 05414 80B415F4 0002C900 */ sll $t9, $v0, 4 -/* 05418 80B415F8 00194702 */ srl $t0, $t9, 28 -/* 0541C 80B415FC 00084880 */ sll $t1, $t0, 2 -/* 05420 80B41600 3C0A8016 */ lui $t2, %hi(gSegments) -/* 05424 80B41604 A4780EEC */ sh $t8, 0x0EEC($v1) ## 8015F54C -/* 05428 80B41608 01495021 */ addu $t2, $t2, $t1 -/* 0542C 80B4160C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 05430 80B41610 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) -/* 05434 80B41614 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 05438 80B41618 00415824 */ and $t3, $v0, $at -/* 0543C 80B4161C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 05440 80B41620 014B6021 */ addu $t4, $t2, $t3 -/* 05444 80B41624 01816821 */ addu $t5, $t4, $at -/* 05448 80B41628 ACAD1D68 */ sw $t5, 0x1D68($a1) ## 00001D68 -/* 0544C 80B4162C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 05450 80B41630 0C2CFAFC */ jal func_80B3EBF0 -/* 05454 80B41634 A06E1414 */ sb $t6, 0x1414($v1) ## 8015FA74 -/* 05458 80B41638 10000033 */ beq $zero, $zero, .L80B41708 -/* 0545C 80B4163C 8FBF001C */ lw $ra, 0x001C($sp) -.L80B41640: -/* 05460 80B41640 94620EDE */ lhu $v0, 0x0EDE($v1) ## 00000EDE -/* 05464 80B41644 30440020 */ andi $a0, $v0, 0x0020 ## $a0 = 00000000 -/* 05468 80B41648 14800022 */ bne $a0, $zero, .L80B416D4 -/* 0546C 80B4164C 00000000 */ nop -/* 05470 80B41650 946F0EDC */ lhu $t7, 0x0EDC($v1) ## 00000EDC -/* 05474 80B41654 34590020 */ ori $t9, $v0, 0x0020 ## $t9 = 00000020 -/* 05478 80B41658 2405005F */ addiu $a1, $zero, 0x005F ## $a1 = 0000005F -/* 0547C 80B4165C 31F80100 */ andi $t8, $t7, 0x0100 ## $t8 = 00000000 -/* 05480 80B41660 1300001C */ beq $t8, $zero, .L80B416D4 -/* 05484 80B41664 00000000 */ nop -/* 05488 80B41668 A4790EDE */ sh $t9, 0x0EDE($v1) ## 00000EDE -/* 0548C 80B4166C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 05490 80B41670 0C021344 */ jal Item_Give -/* 05494 80B41674 AFA70024 */ sw $a3, 0x0024($sp) -/* 05498 80B41678 3C020200 */ lui $v0, %hi(D_02006D20) ## $v0 = 02000000 -/* 0549C 80B4167C 24426D20 */ addiu $v0, $v0, %lo(D_02006D20) ## $v0 = 02006D20 -/* 054A0 80B41680 00024100 */ sll $t0, $v0, 4 -/* 054A4 80B41684 00084F02 */ srl $t1, $t0, 28 -/* 054A8 80B41688 00095080 */ sll $t2, $t1, 2 -/* 054AC 80B4168C 3C0B8016 */ lui $t3, %hi(gSegments) -/* 054B0 80B41690 016A5821 */ addu $t3, $t3, $t2 -/* 054B4 80B41694 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 054B8 80B41698 8D6B6FA8 */ lw $t3, %lo(gSegments)($t3) -/* 054BC 80B4169C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 054C0 80B416A0 00416024 */ and $t4, $v0, $at -/* 054C4 80B416A4 8FA70024 */ lw $a3, 0x0024($sp) -/* 054C8 80B416A8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 054CC 80B416AC 016C6821 */ addu $t5, $t3, $t4 -/* 054D0 80B416B0 3C038016 */ lui $v1, %hi(gSaveContext) -/* 054D4 80B416B4 01A17021 */ addu $t6, $t5, $at -/* 054D8 80B416B8 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 054DC 80B416BC 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 054E0 80B416C0 ACEE1D68 */ sw $t6, 0x1D68($a3) ## 00001D68 -/* 054E4 80B416C4 A06F1414 */ sb $t7, 0x1414($v1) ## 8015FA74 -/* 054E8 80B416C8 2418001E */ addiu $t8, $zero, 0x001E ## $t8 = 0000001E -/* 054EC 80B416CC 1000000D */ beq $zero, $zero, .L80B41704 -/* 054F0 80B416D0 AE180260 */ sw $t8, 0x0260($s0) ## 00000260 -.L80B416D4: -/* 054F4 80B416D4 14800005 */ bne $a0, $zero, .L80B416EC -/* 054F8 80B416D8 00000000 */ nop -/* 054FC 80B416DC 0C2CF27B */ jal func_80B3C9EC -/* 05500 80B416E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05504 80B416E4 10000008 */ beq $zero, $zero, .L80B41708 -/* 05508 80B416E8 8FBF001C */ lw $ra, 0x001C($sp) -.L80B416EC: -/* 0550C 80B416EC 0C00B55C */ jal Actor_Kill - -/* 05510 80B416F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05514 80B416F4 10000004 */ beq $zero, $zero, .L80B41708 -/* 05518 80B416F8 8FBF001C */ lw $ra, 0x001C($sp) -.L80B416FC: -/* 0551C 80B416FC 0C00B55C */ jal Actor_Kill - -/* 05520 80B41700 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B41704: -/* 05524 80B41704 8FBF001C */ lw $ra, 0x001C($sp) -.L80B41708: -/* 05528 80B41708 8FB00018 */ lw $s0, 0x0018($sp) -/* 0552C 80B4170C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 05530 80B41710 03E00008 */ jr $ra -/* 05534 80B41714 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41718.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41718.s deleted file mode 100644 index 0ae647ef7e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41718.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80B41718 -/* 05538 80B41718 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0553C 80B4171C AFBF0014 */ sw $ra, 0x0014($sp) -/* 05540 80B41720 AFA5001C */ sw $a1, 0x001C($sp) -/* 05544 80B41724 0C00BC65 */ jal func_8002F194 -/* 05548 80B41728 AFA40018 */ sw $a0, 0x0018($sp) -/* 0554C 80B4172C 10400004 */ beq $v0, $zero, .L80B41740 -/* 05550 80B41730 8FA40018 */ lw $a0, 0x0018($sp) -/* 05554 80B41734 240E0050 */ addiu $t6, $zero, 0x0050 ## $t6 = 00000050 -/* 05558 80B41738 10000013 */ beq $zero, $zero, .L80B41788 -/* 0555C 80B4173C AC8E0260 */ sw $t6, 0x0260($a0) ## 00000260 -.L80B41740: -/* 05560 80B41740 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 -/* 05564 80B41744 3C198012 */ lui $t9, %hi(gItemSlots+0xa) -/* 05568 80B41748 3C088016 */ lui $t0, %hi(gSaveContext+0x74) -/* 0556C 80B4174C 35F80009 */ ori $t8, $t7, 0x0009 ## $t8 = 00000009 -/* 05570 80B41750 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 05574 80B41754 9339746E */ lbu $t9, %lo(gItemSlots+0xa)($t9) -/* 05578 80B41758 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 0557C 80B4175C 24097010 */ addiu $t1, $zero, 0x7010 ## $t1 = 00007010 -/* 05580 80B41760 01194021 */ addu $t0, $t0, $t9 -/* 05584 80B41764 9108E6D4 */ lbu $t0, %lo(gSaveContext+0x74)($t0) -/* 05588 80B41768 240A700F */ addiu $t2, $zero, 0x700F ## $t2 = 0000700F -/* 0558C 80B4176C 51010004 */ beql $t0, $at, .L80B41780 -/* 05590 80B41770 A48A010E */ sh $t2, 0x010E($a0) ## 0000010E -/* 05594 80B41774 10000002 */ beq $zero, $zero, .L80B41780 -/* 05598 80B41778 A489010E */ sh $t1, 0x010E($a0) ## 0000010E -/* 0559C 80B4177C A48A010E */ sh $t2, 0x010E($a0) ## 0000010E -.L80B41780: -/* 055A0 80B41780 0C00BCBD */ jal func_8002F2F4 -/* 055A4 80B41784 8FA5001C */ lw $a1, 0x001C($sp) -.L80B41788: -/* 055A8 80B41788 8FBF0014 */ lw $ra, 0x0014($sp) -/* 055AC 80B4178C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 055B0 80B41790 03E00008 */ jr $ra -/* 055B4 80B41794 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41798.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41798.s deleted file mode 100644 index 997e249900..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41798.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80B41798 -/* 055B8 80B41798 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 055BC 80B4179C AFBF0014 */ sw $ra, 0x0014($sp) -/* 055C0 80B417A0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 055C4 80B417A4 AFA60018 */ sw $a2, 0x0018($sp) -/* 055C8 80B417A8 0C042F6F */ jal func_8010BDBC -/* 055CC 80B417AC 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 055D0 80B417B0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 055D4 80B417B4 14410007 */ bne $v0, $at, .L80B417D4 -/* 055D8 80B417B8 8FA60018 */ lw $a2, 0x0018($sp) -/* 055DC 80B417BC 8CCF0004 */ lw $t7, 0x0004($a2) ## 00000004 -/* 055E0 80B417C0 2401FFF6 */ addiu $at, $zero, 0xFFF6 ## $at = FFFFFFF6 -/* 055E4 80B417C4 240E004F */ addiu $t6, $zero, 0x004F ## $t6 = 0000004F -/* 055E8 80B417C8 01E1C024 */ and $t8, $t7, $at -/* 055EC 80B417CC ACCE0260 */ sw $t6, 0x0260($a2) ## 00000260 -/* 055F0 80B417D0 ACD80004 */ sw $t8, 0x0004($a2) ## 00000004 -.L80B417D4: -/* 055F4 80B417D4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 055F8 80B417D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 055FC 80B417DC 03E00008 */ jr $ra -/* 05600 80B417E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B417E4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B417E4.s deleted file mode 100644 index 2f6633d322..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B417E4.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B417E4 -/* 05604 80B417E4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 05608 80B417E8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0560C 80B417EC AFB00018 */ sw $s0, 0x0018($sp) -/* 05610 80B417F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05614 80B417F4 0C2CF11A */ jal func_80B3C468 -/* 05618 80B417F8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0561C 80B417FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05620 80B41800 0C2CF08B */ jal func_80B3C22C -/* 05624 80B41804 8FA50024 */ lw $a1, 0x0024($sp) -/* 05628 80B41808 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0562C 80B4180C 0C2CF0A6 */ jal func_80B3C298 -/* 05630 80B41810 8FA50024 */ lw $a1, 0x0024($sp) -/* 05634 80B41814 0C2CF12C */ jal func_80B3C4B0 -/* 05638 80B41818 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0563C 80B4181C 0C2CF0C7 */ jal func_80B3C31C -/* 05640 80B41820 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05644 80B41824 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05648 80B41828 0C2D05C6 */ jal func_80B41718 -/* 0564C 80B4182C 8FA50024 */ lw $a1, 0x0024($sp) -/* 05650 80B41830 8FBF001C */ lw $ra, 0x001C($sp) -/* 05654 80B41834 8FB00018 */ lw $s0, 0x0018($sp) -/* 05658 80B41838 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0565C 80B4183C 03E00008 */ jr $ra -/* 05660 80B41840 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41844.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41844.s deleted file mode 100644 index b9e134df74..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41844.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B41844 -/* 05664 80B41844 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 05668 80B41848 AFBF001C */ sw $ra, 0x001C($sp) -/* 0566C 80B4184C AFB00018 */ sw $s0, 0x0018($sp) -/* 05670 80B41850 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05674 80B41854 0C2CF11A */ jal func_80B3C468 -/* 05678 80B41858 AFA50024 */ sw $a1, 0x0024($sp) -/* 0567C 80B4185C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05680 80B41860 0C2CF08B */ jal func_80B3C22C -/* 05684 80B41864 8FA50024 */ lw $a1, 0x0024($sp) -/* 05688 80B41868 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0568C 80B4186C 0C2CF0A6 */ jal func_80B3C298 -/* 05690 80B41870 8FA50024 */ lw $a1, 0x0024($sp) -/* 05694 80B41874 0C2CF12C */ jal func_80B3C4B0 -/* 05698 80B41878 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0569C 80B4187C 0C2CF0C7 */ jal func_80B3C31C -/* 056A0 80B41880 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 056A4 80B41884 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 056A8 80B41888 0C2D05E6 */ jal func_80B41798 -/* 056AC 80B4188C 8FA50024 */ lw $a1, 0x0024($sp) -/* 056B0 80B41890 8FBF001C */ lw $ra, 0x001C($sp) -/* 056B4 80B41894 8FB00018 */ lw $s0, 0x0018($sp) -/* 056B8 80B41898 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 056BC 80B4189C 03E00008 */ jr $ra -/* 056C0 80B418A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41A88.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41A88.s deleted file mode 100644 index d0774d0e34..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41A88.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80B41A88 -/* 058A8 80B41A88 AFA40000 */ sw $a0, 0x0000($sp) -/* 058AC 80B41A8C 8FA40014 */ lw $a0, 0x0014($sp) -/* 058B0 80B41A90 AFA60008 */ sw $a2, 0x0008($sp) -/* 058B4 80B41A94 AFA7000C */ sw $a3, 0x000C($sp) -/* 058B8 80B41A98 8C8E030C */ lw $t6, 0x030C($a0) ## 0000030C -/* 058BC 80B41A9C 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 058C0 80B41AA0 11C00018 */ beq $t6, $zero, .L80B41B04 -/* 058C4 80B41AA4 00000000 */ nop -/* 058C8 80B41AA8 14A1000B */ bne $a1, $at, .L80B41AD8 -/* 058CC 80B41AAC 8FA20010 */ lw $v0, 0x0010($sp) -/* 058D0 80B41AB0 844F0000 */ lh $t7, 0x0000($v0) ## 00000000 -/* 058D4 80B41AB4 84980324 */ lh $t8, 0x0324($a0) ## 00000324 -/* 058D8 80B41AB8 84480002 */ lh $t0, 0x0002($v0) ## 00000002 -/* 058DC 80B41ABC 01F8C821 */ addu $t9, $t7, $t8 -/* 058E0 80B41AC0 A4590000 */ sh $t9, 0x0000($v0) ## 00000000 -/* 058E4 80B41AC4 84890322 */ lh $t1, 0x0322($a0) ## 00000322 -/* 058E8 80B41AC8 01095023 */ subu $t2, $t0, $t1 -/* 058EC 80B41ACC A44A0002 */ sh $t2, 0x0002($v0) ## 00000002 -/* 058F0 80B41AD0 03E00008 */ jr $ra -/* 058F4 80B41AD4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B41AD8: -/* 058F8 80B41AD8 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 058FC 80B41ADC 14A10009 */ bne $a1, $at, .L80B41B04 -/* 05900 80B41AE0 8FA20010 */ lw $v0, 0x0010($sp) -/* 05904 80B41AE4 844B0000 */ lh $t3, 0x0000($v0) ## 00000000 -/* 05908 80B41AE8 848C031E */ lh $t4, 0x031E($a0) ## 0000031E -/* 0590C 80B41AEC 844E0004 */ lh $t6, 0x0004($v0) ## 00000004 -/* 05910 80B41AF0 016C6821 */ addu $t5, $t3, $t4 -/* 05914 80B41AF4 A44D0000 */ sh $t5, 0x0000($v0) ## 00000000 -/* 05918 80B41AF8 848F031C */ lh $t7, 0x031C($a0) ## 0000031C -/* 0591C 80B41AFC 01CFC021 */ addu $t8, $t6, $t7 -/* 05920 80B41B00 A4580004 */ sh $t8, 0x0004($v0) ## 00000004 -.L80B41B04: -/* 05924 80B41B04 03E00008 */ jr $ra -/* 05928 80B41B08 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41B0C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41B0C.s deleted file mode 100644 index 4bed658c1d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41B0C.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80B41B0C -/* 0592C 80B41B0C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 05930 80B41B10 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 05934 80B41B14 AFBF0014 */ sw $ra, 0x0014($sp) -/* 05938 80B41B18 AFA40038 */ sw $a0, 0x0038($sp) -/* 0593C 80B41B1C AFA60040 */ sw $a2, 0x0040($sp) -/* 05940 80B41B20 14A10019 */ bne $a1, $at, .L80B41B88 -/* 05944 80B41B24 AFA70044 */ sw $a3, 0x0044($sp) -/* 05948 80B41B28 3C0E80B4 */ lui $t6, %hi(D_80B41F0C) ## $t6 = 80B40000 -/* 0594C 80B41B2C 25CE1F0C */ addiu $t6, $t6, %lo(D_80B41F0C) ## $t6 = 80B41F0C -/* 05950 80B41B30 8DD80000 */ lw $t8, 0x0000($t6) ## 80B41F0C -/* 05954 80B41B34 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFF0 -/* 05958 80B41B38 27A5001C */ addiu $a1, $sp, 0x001C ## $a1 = FFFFFFE4 -/* 0595C 80B41B3C AC980000 */ sw $t8, 0x0000($a0) ## FFFFFFF0 -/* 05960 80B41B40 8DCF0004 */ lw $t7, 0x0004($t6) ## 80B41F10 -/* 05964 80B41B44 AC8F0004 */ sw $t7, 0x0004($a0) ## FFFFFFF4 -/* 05968 80B41B48 8DD80008 */ lw $t8, 0x0008($t6) ## 80B41F14 -/* 0596C 80B41B4C 0C0346BD */ jal Matrix_MultVec3f -/* 05970 80B41B50 AC980008 */ sw $t8, 0x0008($a0) ## FFFFFFF8 -/* 05974 80B41B54 8FA20048 */ lw $v0, 0x0048($sp) -/* 05978 80B41B58 C7A4001C */ lwc1 $f4, 0x001C($sp) -/* 0597C 80B41B5C 84590030 */ lh $t9, 0x0030($v0) ## 00000030 -/* 05980 80B41B60 E4440038 */ swc1 $f4, 0x0038($v0) ## 00000038 -/* 05984 80B41B64 C7A60020 */ lwc1 $f6, 0x0020($sp) -/* 05988 80B41B68 84480032 */ lh $t0, 0x0032($v0) ## 00000032 -/* 0598C 80B41B6C 84490034 */ lh $t1, 0x0034($v0) ## 00000034 -/* 05990 80B41B70 E446003C */ swc1 $f6, 0x003C($v0) ## 0000003C -/* 05994 80B41B74 C7A80024 */ lwc1 $f8, 0x0024($sp) -/* 05998 80B41B78 A4590044 */ sh $t9, 0x0044($v0) ## 00000044 -/* 0599C 80B41B7C A4480046 */ sh $t0, 0x0046($v0) ## 00000046 -/* 059A0 80B41B80 A4490048 */ sh $t1, 0x0048($v0) ## 00000048 -/* 059A4 80B41B84 E4480040 */ swc1 $f8, 0x0040($v0) ## 00000040 -.L80B41B88: -/* 059A8 80B41B88 8FBF0014 */ lw $ra, 0x0014($sp) -/* 059AC 80B41B8C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 059B0 80B41B90 03E00008 */ jr $ra -/* 059B4 80B41B94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41B98.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41B98.s deleted file mode 100644 index a773898aff..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41B98.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80B41B98 -/* 059B8 80B41B98 AFA40000 */ sw $a0, 0x0000($sp) -/* 059BC 80B41B9C 03E00008 */ jr $ra -/* 059C0 80B41BA0 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41BA4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41BA4.s deleted file mode 100644 index 8befe50048..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41BA4.s +++ /dev/null @@ -1,91 +0,0 @@ -.rdata -glabel D_80B421A0 - .asciz "../z_en_oA2.c" - .balign 4 - -glabel D_80B421B0 - .asciz "../z_en_oA2.c" - .balign 4 - -.text -glabel func_80B41BA4 -/* 059C4 80B41BA4 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 059C8 80B41BA8 AFBF002C */ sw $ra, 0x002C($sp) -/* 059CC 80B41BAC AFB00028 */ sw $s0, 0x0028($sp) -/* 059D0 80B41BB0 AFA40078 */ sw $a0, 0x0078($sp) -/* 059D4 80B41BB4 AFA5007C */ sw $a1, 0x007C($sp) -/* 059D8 80B41BB8 8482025C */ lh $v0, 0x025C($a0) ## 0000025C -/* 059DC 80B41BBC 3C1880B4 */ lui $t8, %hi(D_80B41D6C) ## $t8 = 80B40000 -/* 059E0 80B41BC0 3C0680B4 */ lui $a2, %hi(D_80B421A0) ## $a2 = 80B40000 -/* 059E4 80B41BC4 00027880 */ sll $t7, $v0, 2 -/* 059E8 80B41BC8 030FC021 */ addu $t8, $t8, $t7 -/* 059EC 80B41BCC 8F181D6C */ lw $t8, %lo(D_80B41D6C)($t8) -/* 059F0 80B41BD0 24C621A0 */ addiu $a2, $a2, %lo(D_80B421A0) ## $a2 = 80B421A0 -/* 059F4 80B41BD4 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD0 -/* 059F8 80B41BD8 AFB80068 */ sw $t8, 0x0068($sp) -/* 059FC 80B41BDC 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 -/* 05A00 80B41BE0 2407048C */ addiu $a3, $zero, 0x048C ## $a3 = 0000048C -/* 05A04 80B41BE4 0C031AB1 */ jal Graph_OpenDisps -/* 05A08 80B41BE8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05A0C 80B41BEC 8FA40078 */ lw $a0, 0x0078($sp) -/* 05A10 80B41BF0 8FA5007C */ lw $a1, 0x007C($sp) -/* 05A14 80B41BF4 0C00BAF3 */ jal func_8002EBCC -/* 05A18 80B41BF8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 05A1C 80B41BFC 0C024F46 */ jal func_80093D18 -/* 05A20 80B41C00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05A24 80B41C04 8FA70068 */ lw $a3, 0x0068($sp) -/* 05A28 80B41C08 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 -/* 05A2C 80B41C0C 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 -/* 05A30 80B41C10 00075100 */ sll $t2, $a3, 4 -/* 05A34 80B41C14 000A5F02 */ srl $t3, $t2, 28 -/* 05A38 80B41C18 3C0D8016 */ lui $t5, %hi(gSegments) -/* 05A3C 80B41C1C 24680008 */ addiu $t0, $v1, 0x0008 ## $t0 = 00000008 -/* 05A40 80B41C20 AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 -/* 05A44 80B41C24 25AD6FA8 */ addiu $t5, %lo(gSegments) -/* 05A48 80B41C28 000B6080 */ sll $t4, $t3, 2 -/* 05A4C 80B41C2C 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 -/* 05A50 80B41C30 018D2021 */ addu $a0, $t4, $t5 -/* 05A54 80B41C34 AC690000 */ sw $t1, 0x0000($v1) ## 00000000 -/* 05A58 80B41C38 8C8E0000 */ lw $t6, 0x0000($a0) ## 00000000 -/* 05A5C 80B41C3C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 05A60 80B41C40 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 05A64 80B41C44 00E12824 */ and $a1, $a3, $at -/* 05A68 80B41C48 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 05A6C 80B41C4C 01C57821 */ addu $t7, $t6, $a1 -/* 05A70 80B41C50 01E6C021 */ addu $t8, $t7, $a2 -/* 05A74 80B41C54 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 -/* 05A78 80B41C58 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 -/* 05A7C 80B41C5C 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 -/* 05A80 80B41C60 35080024 */ ori $t0, $t0, 0x0024 ## $t0 = DB060024 -/* 05A84 80B41C64 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 -/* 05A88 80B41C68 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 05A8C 80B41C6C AC680000 */ sw $t0, 0x0000($v1) ## 00000000 -/* 05A90 80B41C70 8C890000 */ lw $t1, 0x0000($a0) ## 00000000 -/* 05A94 80B41C74 3C0D80B4 */ lui $t5, %hi(func_80B41B0C) ## $t5 = 80B40000 -/* 05A98 80B41C78 3C0C80B4 */ lui $t4, %hi(func_80B41A88) ## $t4 = 80B40000 -/* 05A9C 80B41C7C 01255021 */ addu $t2, $t1, $a1 -/* 05AA0 80B41C80 01465821 */ addu $t3, $t2, $a2 -/* 05AA4 80B41C84 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 -/* 05AA8 80B41C88 8FA30078 */ lw $v1, 0x0078($sp) -/* 05AAC 80B41C8C 258C1A88 */ addiu $t4, $t4, %lo(func_80B41A88) ## $t4 = 80B41A88 -/* 05AB0 80B41C90 25AD1B0C */ addiu $t5, $t5, %lo(func_80B41B0C) ## $t5 = 80B41B0C -/* 05AB4 80B41C94 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C -/* 05AB8 80B41C98 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 05ABC 80B41C9C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 05AC0 80B41CA0 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 05AC4 80B41CA4 AFAD0014 */ sw $t5, 0x0014($sp) -/* 05AC8 80B41CA8 AFAC0010 */ sw $t4, 0x0010($sp) -/* 05ACC 80B41CAC 8FA4007C */ lw $a0, 0x007C($sp) -/* 05AD0 80B41CB0 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 05AD4 80B41CB4 AFA30018 */ sw $v1, 0x0018($sp) -/* 05AD8 80B41CB8 3C0680B4 */ lui $a2, %hi(D_80B421B0) ## $a2 = 80B40000 -/* 05ADC 80B41CBC 24C621B0 */ addiu $a2, $a2, %lo(D_80B421B0) ## $a2 = 80B421B0 -/* 05AE0 80B41CC0 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD0 -/* 05AE4 80B41CC4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05AE8 80B41CC8 0C031AD5 */ jal Graph_CloseDisps -/* 05AEC 80B41CCC 240704B7 */ addiu $a3, $zero, 0x04B7 ## $a3 = 000004B7 -/* 05AF0 80B41CD0 8FBF002C */ lw $ra, 0x002C($sp) -/* 05AF4 80B41CD4 8FB00028 */ lw $s0, 0x0028($sp) -/* 05AF8 80B41CD8 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 05AFC 80B41CDC 03E00008 */ jr $ra -/* 05B00 80B41CE0 00000000 */ nop diff --git a/assets/xml/objects/object_xc.xml b/assets/xml/objects/object_xc.xml new file mode 100644 index 0000000000..9b7481c6e1 --- /dev/null +++ b/assets/xml/objects/object_xc.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/scenes/indoors/tokinoma.xml b/assets/xml/scenes/indoors/tokinoma.xml index d2fe9c3282..af1b892cf2 100644 --- a/assets/xml/scenes/indoors/tokinoma.xml +++ b/assets/xml/scenes/indoors/tokinoma.xml @@ -1,6 +1,9 @@ - + + + + diff --git a/assets/xml/scenes/overworld/spot05.xml b/assets/xml/scenes/overworld/spot05.xml index 59d824d895..e2a437fb63 100644 --- a/assets/xml/scenes/overworld/spot05.xml +++ b/assets/xml/scenes/overworld/spot05.xml @@ -5,6 +5,7 @@ + diff --git a/assets/xml/scenes/overworld/spot17.xml b/assets/xml/scenes/overworld/spot17.xml index 385645b72a..17e502a422 100644 --- a/assets/xml/scenes/overworld/spot17.xml +++ b/assets/xml/scenes/overworld/spot17.xml @@ -1,6 +1,7 @@ + diff --git a/data/overlays/actors/z_en_xc.bss.s b/data/overlays/actors/z_en_xc.bss.s deleted file mode 100644 index 0a2b1fb1a3..0000000000 --- a/data/overlays/actors/z_en_xc.bss.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 .bss - -.balign 16 - -glabel D_80B42D90 - .space 0x10 -glabel D_80B42DA0 - .space 0x10 -glabel D_80B42DB0 - .space 0x04 -glabel D_80B42DB4 - .space 0x04 -glabel D_80B42DB8 - .space 0x08 - diff --git a/data/overlays/actors/z_en_xc.data.s b/data/overlays/actors/z_en_xc.data.s deleted file mode 100644 index fb8f19d098..0000000000 --- a/data/overlays/actors/z_en_xc.data.s +++ /dev/null @@ -1,133 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_80B41D40 - .word 0x00000009, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00190050, 0x00000000, 0x00000000 -glabel D_80B41D6C - .word 0x06004CC0, 0x060050C0, 0x060054C0 -glabel D_80B41D78 - .word 0xC418C000, 0x44360000, 0xC0000000 -glabel D_80B41D84 - .word 0xC485A000, 0x42180000, 0x00000000 -glabel D_80B41D90 - .word 0x00000000 -glabel D_80B41D94 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80B41DA0 - .word 0x00000000 -glabel D_80B41DA4 - .word 0x00000000 -glabel D_80B41DA8 - .word 0x00000001 -glabel D_80B41DAC - .word 0x00000001 -glabel D_80B41DB0 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80B41DBC - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80B41DC8 - .word func_80B3E224 -.word func_80B3E25C -.word func_80B3E294 -.word func_80B3E30C -.word func_80B3E368 -.word func_80B3E3C4 -.word func_80B3E420 -.word func_80B3E464 -.word func_80B3E4AC -.word func_80B3E4F8 -.word func_80B3E53C -.word func_80B3E580 -.word func_80B3E5C8 -.word func_80B3E610 -.word func_80B3E668 -.word func_80B3E6D0 -.word func_80B3E738 -.word func_80B3E7A0 -.word func_80B3E804 -.word func_80B3E85C -.word func_80B3ED48 -.word func_80B3ED68 -.word func_80B3ED88 -.word func_80B3EDCC -.word func_80B3EE28 -.word func_80B3EE34 -.word func_80B3EE40 -.word func_80B3EE4C -.word func_80B3EE58 -.word func_80B3F124 -.word func_80B3F144 -.word func_80B3F16C -.word func_80B3F1A8 -.word func_80B3F1D0 -.word func_80B3F1F8 -.word func_80B3F220 -.word func_80B3F248 -.word func_80B3F270 -.word func_80B3F298 -.word func_80B3F2C0 -.word func_80B3F2E8 -.word func_80B3F344 -.word func_80B3F36C -.word func_80B3F394 -.word func_80B3F3BC -.word func_80B3F7F8 -.word func_80B3F820 -.word func_80B3F848 -.word func_80B3F8A0 -.word func_80B3F8C8 -.word func_80B3F928 -.word func_80B3F988 -.word func_80B3F9E8 -.word func_80B400E4 -.word func_80B40104 -.word func_80B4015C -.word func_80B401CC -.word func_80B41000 -.word func_80B41020 -.word func_80B41068 -.word func_80B410AC -.word func_80B41110 -.word func_80B41174 -.word func_80B411AC -.word func_80B41204 -.word func_80B41248 -.word func_80B41284 -.word func_80B412AC -.word func_80B412D4 -.word func_80B412FC -.word func_80B41324 -.word func_80B4134C -.word func_80B41374 -.word func_80B4139C -.word func_80B413C4 -.word func_80B41414 -.word func_80B4143C -.word func_80B41464 -.word func_80B4148C -.word func_80B417E4 -.word func_80B41844 -glabel D_80B41F0C - .word 0x00000000, 0x41200000, 0x00000000 -glabel D_80B41F18 - .word func_80B41B98 -.word func_80B41BA4 -.word func_80B3E908 -.word func_80B3EA7C -.word func_80B402C4 -.word func_80B414AC -glabel En_Xc_InitVars - .word 0x00480400, 0x00000010, 0x008A0000, 0x0000033C -.word EnXc_Init -.word EnXc_Destroy -.word EnXc_Update -.word EnXc_Draw - diff --git a/data/overlays/actors/z_en_xc.reloc.s b/data/overlays/actors/z_en_xc.reloc.s deleted file mode 100644 index a84a2bd137..0000000000 --- a/data/overlays/actors/z_en_xc.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_80B422E0 - .incbin "baserom/ovl_En_Xc", 0x6100, 0x00000AB0 diff --git a/spec b/spec index feb470725e..3c6d22f76b 100644 --- a/spec +++ b/spec @@ -3111,9 +3111,7 @@ endseg beginseg name "ovl_En_Xc" include "build/src/overlays/actors/ovl_En_Xc/z_en_xc.o" - include "build/data/overlays/actors/z_en_xc.data.o" - include "build/data/overlays/actors/z_en_xc.bss.o" - include "build/data/overlays/actors/z_en_xc.reloc.o" + include "build/src/overlays/actors/ovl_En_Xc/ovl_En_Xc_reloc.o" endseg beginseg @@ -4201,7 +4199,8 @@ endseg beginseg name "object_xc" romalign 0x1000 - include "build/baserom/object_xc.o" + include "build/assets/objects/object_xc/object_xc.o" + number 6 endseg beginseg diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c index 95773b6b2a..1a24fc4c90 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -5,6 +5,13 @@ */ #include "z_en_xc.h" +#include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" +#include "objects/object_xc/object_xc.h" +#include "scenes/overworld/spot05/spot05_scene.h" +#include "scenes/overworld/spot17/spot17_scene.h" +#include "scenes/indoors/tokinoma/tokinoma_scene.h" +#include "scenes/dungeons/ice_doukutu/ice_doukutu_scene.h" +#include "vt.h" #define FLAGS 0x00000010 @@ -15,49 +22,12 @@ void EnXc_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnXc_Update(Actor* thisx, GlobalContext* globalCtx); void EnXc_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_02000330; -extern UNK_TYPE D_02003F80; -extern UNK_TYPE D_020045D0; -extern UNK_TYPE D_020046F0; -extern UNK_TYPE D_02006D20; -extern UNK_TYPE D_06000B6C; -extern UNK_TYPE D_06001A08; -extern UNK_TYPE D_06001D14; -extern UNK_TYPE D_0600289C; -extern UNK_TYPE D_060035C8; -extern UNK_TYPE D_06004570; -extern UNK_TYPE D_06004828; -extern UNK_TYPE D_060058C0; -extern UNK_TYPE D_06011150; -extern UNK_TYPE D_06011620; -extern UNK_TYPE D_06012970; -extern UNK_TYPE D_06012AF0; -extern UNK_TYPE D_06012FD0; -extern UNK_TYPE D_06013AA4; -extern UNK_TYPE D_060149E4; -extern UNK_TYPE D_060169E8; -extern UNK_TYPE D_060177F8; -extern UNK_TYPE D_06017C54; -extern UNK_TYPE D_06018B00; -extern UNK_TYPE D_06019598; -extern UNK_TYPE D_06019C30; -extern UNK_TYPE D_06019F78; -extern UNK_TYPE D_0601A048; -extern UNK_TYPE D_0601B19C; -extern UNK_TYPE D_0601C0E8; - -/* -const ActorInit En_Xc_InitVars = { - ACTOR_EN_XC, - ACTORCAT_NPC, - FLAGS, - OBJECT_XC, - sizeof(EnXc), - (ActorFunc)EnXc_Init, - (ActorFunc)EnXc_Destroy, - (ActorFunc)EnXc_Update, - (ActorFunc)EnXc_Draw, -}; +void EnXc_DrawNothing(Actor* thisx, GlobalContext* globalCtx); +void EnXc_DrawDefault(Actor* thisx, GlobalContext* globalCtx); +void EnXc_DrawPullingOutHarp(Actor* thisx, GlobalContext* globalCtx); +void EnXc_DrawHarp(Actor* thisx, GlobalContext* globalCtx); +void EnXc_DrawTriforce(Actor* thisx, GlobalContext* globalCtx); +void EnXc_DrawSquintingEyes(Actor* thisx, GlobalContext* globalCtx); static ColliderCylinderInitType1 sCylinderInit = { { @@ -77,479 +47,2373 @@ static ColliderCylinderInitType1 sCylinderInit = { }, { 25, 80, 0, { 0, 0, 0 } }, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C1E0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C22C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Destroy.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C298.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C31C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C3A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C468.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C4B0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C4D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C4F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C53C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C588.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C620.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C700.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C7BC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C7D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C800.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C820.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C888.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C8CC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C924.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C964.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C9DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C9EC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA38.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CA84.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CB58.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CBA4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD00.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CD98.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CE78.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CE84.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CF04.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3CF90.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D014.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D118.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D158.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D298.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D338.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D3B0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D3F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D48C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D4D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D56C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D644.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D664.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D6F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D710.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D730.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D750.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D794.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D8A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D990.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DA00.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DAA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DAF0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DBAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DC24.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DCA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DD3C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE00.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE78.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DEF4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DFA4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E014.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E0BC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E164.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E1B8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E224.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E25C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E294.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E30C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E368.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E3C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E420.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E464.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E4AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E4F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E53C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E580.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E5C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E610.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E668.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E6D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E738.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E7A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E804.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E85C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E87C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E8AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E8E4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E908.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EA7C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EBF0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EC00.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EC0C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EC90.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ECD8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ED48.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ED68.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3ED88.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EDCC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE28.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE34.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE40.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE4C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE58.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE64.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EE74.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EEA4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EEC8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EEEC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF10.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF34.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF58.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EF80.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EFA4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EFC8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EFEC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F010.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F0B8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F0DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F100.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F124.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F144.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F16C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F1A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F1D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F1F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F220.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F248.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F270.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F298.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F2C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F2E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F344.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F36C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F394.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3BC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F3F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F44C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F534.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F59C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F620.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F644.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F668.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F6DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F700.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F754.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F7BC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F7F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F820.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F848.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F8A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F8C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F928.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F988.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F9E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA08.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FA4C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FAE0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FB24.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FF0C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FFB4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40040.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B400AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B400E4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40104.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4015C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B401CC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40224.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40248.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40590.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B405A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4066C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B406A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B406F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4070C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B407A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40820.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B408FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B409D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40A78.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40B18.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40BB4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40C50.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40C74.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40C98.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40CBC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40CE0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D08.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D50.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D74.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D98.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40E40.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40E64.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40E88.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40EAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41000.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41020.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41068.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B410AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41110.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41174.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B411AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41204.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41248.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41284.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B412AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B412D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B412FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41324.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4134C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41374.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4139C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B413C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41414.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4143C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41464.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4148C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B414AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B415B8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41718.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41798.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B417E4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41844.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Update.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Init.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41A88.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41B0C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41B98.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41BA4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Draw.s") +static u64* sEyeTextures[] = { + gShiekEyeOpenTex, + gShiekEyeHalfClosedTex, + gShiekEyeShutTex, +}; + +void EnXc_InitCollider(Actor* thisx, GlobalContext* globalCtx) { + EnXc* this = THIS; + + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinderType1(globalCtx, &this->collider, &this->actor, &sCylinderInit); +} + +void EnXc_UpdateCollider(Actor* thisx, GlobalContext* globalCtx) { + EnXc* this = THIS; + Collider* colliderBase = &this->collider.base; + s32 pad[3]; + + Collider_UpdateCylinder(thisx, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, colliderBase); +} + +void EnXc_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnXc* this = THIS; + + Collider_DestroyCylinder(globalCtx, &this->collider); +} + +void EnXc_CalculateHeadTurn(EnXc* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + this->npcInfo.unk_18 = player->actor.world.pos; + this->npcInfo.unk_14 = kREG(16) - 3.0f; + func_80034A14(&this->actor, &this->npcInfo, kREG(17) + 0xC, 2); +} + +void EnXc_SetEyePattern(EnXc* this) { + s32 pad[3]; + s16* blinkTimer = &this->blinkTimer; + s16* eyePattern = &this->eyeIdx; + + if (!DECR(*blinkTimer)) { + *blinkTimer = Rand_S16Offset(60, 60); + } + + *eyePattern = *blinkTimer; + if (*eyePattern >= ARRAY_COUNT(sEyeTextures)) { + *eyePattern = 0; + } +} + +void EnXc_SpawnNut(EnXc* this, GlobalContext* globalCtx) { + s32 pad; + Vec3f* pos = &this->actor.world.pos; + s16 angle = this->actor.shape.rot.y; + f32 x = (Math_SinS(angle) * 30.0f) + pos->x; + f32 y = pos->y + 3.0f; + f32 z = (Math_CosS(angle) * 30.0f) + pos->z; + + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ARROW, x, y, z, 0xFA0, this->actor.shape.rot.y, 0, + ARROW_CS_NUT); +} + +void EnXc_BgCheck(EnXc* this, GlobalContext* globalCtx) { + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 4); +} + +s32 EnXc_AnimIsFinished(EnXc* this) { + return SkelAnime_Update(&this->skelAnime); +} + +CsCmdActorAction* EnXc_GetCsCmd(GlobalContext* globalCtx, s32 npcActionIdx) { + CsCmdActorAction* action = NULL; + + if (globalCtx->csCtx.state != 0) { + action = globalCtx->csCtx.npcActions[npcActionIdx]; + } + return action; +} + +s32 EnXc_CompareCsAction(EnXc* this, GlobalContext* globalCtx, u16 action, s32 npcActionIdx) { + CsCmdActorAction* csCmdActorAction = EnXc_GetCsCmd(globalCtx, npcActionIdx); + + if (csCmdActorAction != NULL && csCmdActorAction->action == action) { + return true; + } + return false; +} + +s32 EnXc_CsActionsAreNotEqual(EnXc* this, GlobalContext* globalCtx, u16 action, s32 npcActionIdx) { + CsCmdActorAction* csCmdNPCAction = EnXc_GetCsCmd(globalCtx, npcActionIdx); + + if (csCmdNPCAction && csCmdNPCAction->action != action) { + return true; + } + return false; +} + +void func_80B3C588(EnXc* this, GlobalContext* globalCtx, u32 npcActionIdx) { + CsCmdActorAction* csCmdNPCAction = EnXc_GetCsCmd(globalCtx, npcActionIdx); + Actor* thisx = &this->actor; + + if (csCmdNPCAction != NULL) { + thisx->world.pos.x = csCmdNPCAction->startPos.x; + thisx->world.pos.y = csCmdNPCAction->startPos.y; + thisx->world.pos.z = csCmdNPCAction->startPos.z; + thisx->world.rot.x = thisx->shape.rot.x = csCmdNPCAction->rot.x; + thisx->world.rot.y = thisx->shape.rot.y = csCmdNPCAction->rot.y; + thisx->world.rot.z = thisx->shape.rot.z = csCmdNPCAction->rot.z; + } +} + +void func_80B3C620(EnXc* this, GlobalContext* globalCtx, s32 npcActionIdx) { + CsCmdActorAction* npcAction = EnXc_GetCsCmd(globalCtx, npcActionIdx); + Vec3f* xcPos = &this->actor.world.pos; + f32 startX; + f32 startY; + f32 startZ; + f32 endX; + f32 endY; + f32 endZ; + f32 unk; + + if (npcAction != NULL) { + unk = func_8006F9BC(npcAction->endFrame, npcAction->startFrame, globalCtx->csCtx.frames, 0, 0); + startX = npcAction->startPos.x; + startY = npcAction->startPos.y; + startZ = npcAction->startPos.z; + endX = npcAction->endPos.x; + endY = npcAction->endPos.y; + endZ = npcAction->endPos.z; + xcPos->x = ((endX - startX) * unk) + startX; + xcPos->y = ((endY - startY) * unk) + startY; + xcPos->z = ((endZ - startZ) * unk) + startZ; + } +} + +void EnXc_ChangeAnimation(EnXc* this, AnimationHeader* animation, u8 mode, f32 morphFrames, s32 reverseFlag) { + s32 pad[2]; + AnimationHeader* animationSeg = SEGMENTED_TO_VIRTUAL(animation); + f32 frameCount = Animation_GetLastFrame(&animationSeg->common); + f32 playbackSpeed; + f32 startFrame; + f32 endFrame; + + if (!reverseFlag) { + startFrame = 0.0f; + endFrame = frameCount; + playbackSpeed = 1.0f; + } else { + startFrame = frameCount; + endFrame = 0.0f; + playbackSpeed = -1.0f; + } + + Animation_Change(&this->skelAnime, animationSeg, playbackSpeed, startFrame, endFrame, mode, morphFrames); +} + +void EnXc_CheckAndSetAction(EnXc* this, s32 check, s32 set) { + if (check != this->action) { + this->action = set; + } +} + +void func_80B3C7D4(EnXc* this, s32 action1, s32 action2, s32 action3) { + if (action1 != this->action) { + if (this->action == SHIEK_ACTION_PUT_HARP_AWAY) { + this->action = action2; + } else { + this->action = action3; + } + } +} + +s32 EnXc_NoCutscenePlaying(GlobalContext* globalCtx) { + if (globalCtx->csCtx.state == 0) { + return true; + } + return false; +} + +void func_80B3C820(EnXc* this) { + Animation_Change(&this->skelAnime, &gShiekIdleAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gShiekIdleAnim), + ANIMMODE_LOOP, 0.0f); + this->action = SHIEK_ACTION_53; +} + +void func_80B3C888(EnXc* this, GlobalContext* globalCtx) { + if (EnXc_NoCutscenePlaying(globalCtx) && this->actor.params == SHIEK_TYPE_4) { + func_80B3C820(this); + } +} + +void func_80B3C8CC(EnXc* this, GlobalContext* globalCtx) { + SkelAnime* skelAnime = &this->skelAnime; + + if (skelAnime->jointTable[0].y >= skelAnime->baseTransl.y) { + skelAnime->moveFlags |= 3; + AnimationContext_SetMoveActor(globalCtx, &this->actor, skelAnime, 1.0f); + } +} + +void func_80B3C924(EnXc* this, GlobalContext* globalCtx) { + this->skelAnime.moveFlags |= 3; + AnimationContext_SetMoveActor(globalCtx, &this->actor, &this->skelAnime, 1.0f); +} + +void func_80B3C964(EnXc* this, GlobalContext* globalCtx) { + this->skelAnime.baseTransl = this->skelAnime.jointTable[0]; + this->skelAnime.prevTransl = this->skelAnime.jointTable[0]; + this->skelAnime.moveFlags |= 3; + AnimationContext_SetMoveActor(globalCtx, &this->actor, &this->skelAnime, 1.0f); +} + +void func_80B3C9DC(EnXc* this) { + this->skelAnime.moveFlags &= ~0x3; +} + +void func_80B3C9EC(EnXc* this) { + EnXc_ChangeAnimation(this, &gShiekArmsCrossedIdleAnim, ANIMMODE_LOOP, 0.0f, false); + this->action = SHIEK_ACTION_BLOCK_PEDESTAL; + this->drawMode = SHIEK_DRAW_DEFAULT; + this->unk_30C = 1; +} + +void func_80B3CA38(EnXc* this, GlobalContext* globalCtx) { + // If Player is adult but hasn't learned Minuet of Forest + if (!(gSaveContext.eventChkInf[5] & 1) && LINK_IS_ADULT) { + this->action = SHIEK_ACTION_INIT; + } else { + Actor_Kill(&this->actor); + } +} + +s32 EnXc_MinuetCS(EnXc* this, GlobalContext* globalCtx) { + if (this->actor.params == SHIEK_TYPE_MINUET) { + Player* player = PLAYER; + f32 z = player->actor.world.pos.z; + if (z < -2225.0f) { + if (!Gameplay_InCsMode(globalCtx)) { + globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(&gMinuetCs); + gSaveContext.cutsceneTrigger = 1; + gSaveContext.eventChkInf[5] |= 1; + Item_Give(globalCtx, ITEM_SONG_MINUET); + return true; + } + } + return false; + } + return true; +} + +void func_80B3CB58(EnXc* this, GlobalContext* globalCtx) { + // If hasn't learned Bolero and Player is Adult + if (!(gSaveContext.eventChkInf[5] & 2) && LINK_IS_ADULT) { + this->action = SHIEK_ACTION_INIT; + } else { + Actor_Kill(&this->actor); + } +} + +s32 EnXc_BoleroCS(EnXc* this, GlobalContext* globalCtx) { + Player* player; + PosRot* posRot; + + if (this->actor.params == SHIEK_TYPE_BOLERO) { + player = PLAYER; + posRot = &player->actor.world; + if ((posRot->pos.x > -784.0f) && (posRot->pos.x < -584.0f) && (posRot->pos.y > 447.0f) && + (posRot->pos.y < 647.0f) && (posRot->pos.z > -446.0f) && (posRot->pos.z < -246.0f) && + !Gameplay_InCsMode(globalCtx)) { + globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(&gBoleroCs); + gSaveContext.cutsceneTrigger = 1; + gSaveContext.eventChkInf[5] |= 2; + Item_Give(globalCtx, ITEM_SONG_BOLERO); + return true; + } + return false; + } + return true; +} + +void EnXc_SetupSerenadeAction(EnXc* this, GlobalContext* globalCtx) { + // Player is adult and does not have iron boots and has not learned Serenade + if ((!CHECK_OWNED_EQUIP(EQUIP_BOOTS, 1) && !(gSaveContext.eventChkInf[5] & 4)) && LINK_IS_ADULT) { + this->action = SHIEK_ACTION_SERENADE; + osSyncPrintf("水のセレナーデ シーク誕生!!!!!!!!!!!!!!!!!!\n"); + } else { + Actor_Kill(&this->actor); + osSyncPrintf("水のセレナーデ シーク消滅!!!!!!!!!!!!!!!!!!\n"); + } +} + +s32 EnXc_SerenadeCS(EnXc* this, GlobalContext* globalCtx) { + if (this->actor.params == SHIEK_TYPE_SERENADE) { + Player* player = PLAYER; + s32 stateFlags = player->stateFlags1; + if (CHECK_OWNED_EQUIP(EQUIP_BOOTS, 1) && !(gSaveContext.eventChkInf[5] & 4) && !(stateFlags & 0x20000000) && + !Gameplay_InCsMode(globalCtx)) { + Cutscene_SetSegment(globalCtx, &ice_doukutu_sceneCutsceneData0x000330); + gSaveContext.cutsceneTrigger = 1; + gSaveContext.eventChkInf[5] |= 4; // Learned Serenade of Water Flag + Item_Give(globalCtx, ITEM_SONG_SERENADE); + osSyncPrintf("ブーツを取った!!!!!!!!!!!!!!!!!!\n"); + return true; + } + osSyncPrintf("はやくブーツを取るべし!!!!!!!!!!!!!!!!!!\n"); + return false; + } + return true; +} + +void EnXc_DoNothing(EnXc* this, GlobalContext* globalCtx) { +} + +void EnXc_SetWalkingSFX(EnXc* this, GlobalContext* globalCtx) { + s32 pad[2]; + u32 sfxId; + s32 pad2; + + if ((Animation_OnFrame(&this->skelAnime, 11.0f)) || (Animation_OnFrame(&this->skelAnime, 23.0f))) { + if (this->actor.bgCheckFlags & 1) { + sfxId = SFX_FLAG; + sfxId += SurfaceType_GetSfx(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorBgId); + func_80078914(&this->actor.projectedPos, sfxId); + } + } +} + +void EnXc_SetNutThrowSFX(EnXc* this, GlobalContext* globalCtx) { + s32 pad[2]; + u32 sfxId; + s32 pad2; + + if (Animation_OnFrame(&this->skelAnime, 7.0f)) { + if (this->actor.bgCheckFlags & 1) { + sfxId = SFX_FLAG; + sfxId += SurfaceType_GetSfx(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorBgId); + func_80078914(&this->actor.projectedPos, sfxId); + } + } + if (Animation_OnFrame(&this->skelAnime, 20.0f)) { + func_80078914(&this->actor.projectedPos, NA_SE_VO_SK_SHOUT); + } +} + +void EnXc_SetLandingSFX(EnXc* this, GlobalContext* globalCtx) { + u32 sfxId; + s16 sceneNum = globalCtx->sceneNum; + + if ((gSaveContext.sceneSetupIndex != 4) || (sceneNum != SCENE_SPOT11)) { + if (Animation_OnFrame(&this->skelAnime, 11.0f)) { + sfxId = SFX_FLAG; + sfxId += SurfaceType_GetSfx(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorBgId); + func_80078914(&this->actor.projectedPos, sfxId); + } + } +} + +void EnXc_SetColossusAppearSFX(EnXc* this, GlobalContext* globalCtx) { + static Vec3f sXyzDist; + s16 sceneNum; + + if (gSaveContext.sceneSetupIndex == 4) { + sceneNum = globalCtx->sceneNum; + if (sceneNum == SCENE_SPOT11) { + CutsceneContext* csCtx = &globalCtx->csCtx; + u16 frameCount = csCtx->frames; + f32 wDest[2]; + + if (frameCount == 119) { + Vec3f pos = { -611.0f, 728.0f, -2.0f }; + + SkinMatrix_Vec3fMtxFMultXYZW(&globalCtx->mf_11D60, &pos, &sXyzDist, wDest); + func_80078914(&sXyzDist, NA_SE_EV_JUMP_CONC); + } else if (frameCount == 164) { + Vec3f pos = { -1069.0f, 38.0f, 0.0f }; + s32 pad; + + SkinMatrix_Vec3fMtxFMultXYZW(&globalCtx->mf_11D60, &pos, &sXyzDist, wDest); + func_80078914(&sXyzDist, NA_SE_PL_WALK_CONCRETE); + } + } + } +} + +void func_80B3D118(GlobalContext* globalCtx) { + s16 sceneNum; + + if ((gSaveContext.sceneSetupIndex != 4) || (sceneNum = globalCtx->sceneNum, sceneNum != SCENE_SPOT11)) { + func_800788CC(NA_SE_PL_SKIP); + } +} + +static Vec3f D_80B42DA0; + +void EnXc_SetColossusWindSFX(GlobalContext* globalCtx) { + if (gSaveContext.sceneSetupIndex == 4) { + static s32 D_80B41D90 = 0; + static Vec3f sPos = { 0.0f, 0.0f, 0.0f }; + static f32 sMaxSpeed = 0.0f; + static Vec3f D_80B42DB0; + s32 pad; + s16 sceneNum = globalCtx->sceneNum; + + if (sceneNum == SCENE_SPOT11) { + CutsceneContext* csCtx = &globalCtx->csCtx; + u16 frameCount = csCtx->frames; + + if ((frameCount >= 120) && (frameCount < 164)) { + s32 pad; + Vec3f* eye = &globalCtx->view.eye; + + if (D_80B41D90 != 0) { + f32 speed = Math3D_Vec3f_DistXYZ(&D_80B42DB0, eye) / 7.058922f; + + sMaxSpeed = CLAMP_MIN(sMaxSpeed, speed); + + osSyncPrintf("MAX speed = %f\n", sMaxSpeed); + + speed = CLAMP_MAX(speed, 2.0f); + func_800F436C(&sPos, NA_SE_EV_FLYING_AIR - SFX_FLAG, 0.6f + (0.4f * speed)); + } + + D_80B42DB0.x = eye->x; + D_80B42DB0.y = eye->y; + D_80B42DB0.z = eye->z; + D_80B41D90 = 1; + } + } + } +} + +void EnXc_SpawnFlame(EnXc* this, GlobalContext* globalCtx) { + static s32 sFlameSpawned = false; + + if (!sFlameSpawned) { + CsCmdActorAction* npcAction = EnXc_GetCsCmd(globalCtx, 0); + f32 xPos = npcAction->startPos.x; + f32 yPos = npcAction->startPos.y; + f32 zPos = npcAction->startPos.z; + this->flameActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_LIGHT, xPos, yPos, zPos, 0, 0, 0, 5); + sFlameSpawned = true; + } +} + +void EnXc_SetupFlamePos(EnXc* this, GlobalContext* globalCtx) { + Vec3f* attachedPos; + CsCmdActorAction* npcAction = EnXc_GetCsCmd(globalCtx, 0); + + if (this->flameActor != NULL) { + attachedPos = &this->flameActor->world.pos; + if (!this) {} + attachedPos->x = npcAction->startPos.x; + attachedPos->y = npcAction->startPos.y; + attachedPos->z = npcAction->startPos.z; + } +} + +void EnXc_DestroyFlame(EnXc* this) { + if (this->flameActor != NULL) { + Actor_Kill(this->flameActor); + this->flameActor = NULL; + } + Actor_Kill(&this->actor); +} + +void EnXc_InitFlame(EnXc* this, GlobalContext* globalCtx) { + static s32 D_80B41DA8 = 1; + s32 pad; + s16 sceneNum = globalCtx->sceneNum; + + if (sceneNum == SCENE_SPOT17) { + CsCmdActorAction* npcAction = EnXc_GetCsCmd(globalCtx, 0); + if (npcAction != NULL) { + s32 action = npcAction->action; + if (D_80B41DA8 != action) { + if (action != 1) { + EnXc_SpawnFlame(this, globalCtx); + } + + if (action == 1) { + EnXc_DestroyFlame(this); + } + + D_80B41DA8 = action; + } + + EnXc_SetupFlamePos(this, globalCtx); + } + } +} + +void func_80B3D48C(EnXc* this, GlobalContext* globalCtx) { + CutsceneContext* csCtx = &globalCtx->csCtx; + CsCmdActorAction* linkAction = csCtx->linkAction; + s16 yaw; + + if (linkAction != NULL) { + yaw = linkAction->urot.y + 0x8000; + } else { + Player* player = PLAYER; + yaw = player->actor.world.rot.y + 0x8000; + } + + this->actor.shape.rot.y = this->actor.world.rot.y = yaw; +} + +AnimationHeader* EnXc_GetCurrentHarpAnim(GlobalContext* globalCtx, s32 index) { + AnimationHeader* animation = &gShiekPlayingHarp5Anim; + CsCmdActorAction* npcAction = EnXc_GetCsCmd(globalCtx, index); + + if (npcAction != NULL) { + u16 action = npcAction->action; + if (action == 11) { + animation = &gShiekPlayingHarp3Anim; + } else if (action == 12) { + animation = &gShiekPlayingHarp2Anim; + } else if (action == 13) { + animation = &gShiekPlayingHarp4Anim; + } else if (action == 23) { + animation = &gShiekPlayingHarpAnim; + } else { + animation = &gShiekPlayingHarp5Anim; + } + } + return animation; +} + +void EnXc_CalcXZAccel(EnXc* this) { + f32 timer = this->timer; + f32* speedXZ = &this->actor.speedXZ; + + if (timer < 9.0f) { + *speedXZ = 0.0f; + } else if (timer < 3.0f) { + *speedXZ = (((kREG(2) * 0.01f) + 1.2f) / 3.0f) * (timer - 9.0f); + } else { + *speedXZ = (kREG(2) * 0.01f) + 1.2f; + } + + Actor_MoveForward(&this->actor); +} + +void func_80B3D644(EnXc* this) { + Actor_MoveForward(&this->actor); +} + +void EnXc_CalcXZSpeed(EnXc* this) { + f32 timer = this->timer; + f32* speedXZ = &this->actor.speedXZ; + + if (timer < 3.0f) { + *speedXZ = (((kREG(2) * 0.01f) + 1.2f) / 3.0f) * (3.0f - timer); + } else { + *speedXZ = 0.0f; + } + Actor_MoveForward(&this->actor); +} + +void func_80B3D6F0(EnXc* this) { + EnXc_CalcXZAccel(this); +} + +void func_80B3D710(EnXc* this) { + Actor_MoveForward(&this->actor); +} + +void func_80B3D730(EnXc* this) { + EnXc_CalcXZSpeed(this); +} + +void func_80B3D750(EnXc* this, GlobalContext* globalCtx) { + if (EnXc_MinuetCS(this, globalCtx) && EnXc_BoleroCS(this, globalCtx)) { + this->action = SHIEK_ACTION_WAIT; + } +} + +void EnXc_SetupFallFromSkyAction(EnXc* this, GlobalContext* globalCtx) { + s32 pad; + CutsceneContext* csCtx = &globalCtx->csCtx; + + if (csCtx->state != 0) { + CsCmdActorAction* npcAction = csCtx->npcActions[4]; + + if (npcAction && npcAction->action == 2) { + s32 pad; + Vec3f* pos = &this->actor.world.pos; + SkelAnime* skelAnime = &this->skelAnime; + f32 frameCount = Animation_GetLastFrame(&gShiekFallingFromSkyAnim); + + this->action = SHIEK_ACTION_GRACEFUL_FALL; + this->drawMode = SHIEK_DRAW_DEFAULT; + + pos->x = npcAction->startPos.x; + pos->y = npcAction->startPos.y; + pos->z = npcAction->startPos.z; + + func_80B3D48C(this, globalCtx); + func_80B3C964(this, globalCtx); + Animation_Change(skelAnime, &gShiekFallingFromSkyAnim, 1.0f, 0.0f, frameCount, ANIMMODE_ONCE, 0.0f); + func_80B3D118(globalCtx); + } + } +} + +void func_80B3D8A4(EnXc* this, GlobalContext* globalCtx, s32 animFinished) { + if (animFinished) { + SkelAnime* skelAnime = &this->skelAnime; + f32 frameCount = Animation_GetLastFrame(&gShiekWalkingAnim); + + Animation_Change(skelAnime, &gShiekWalkingAnim, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP, -8.0f); + + this->action = SHIEK_ACTION_ACCEL; + this->timer = 0.0f; + + func_80B3C9DC(this); + this->actor.gravity = -((kREG(1) * 0.01f) + 13.0f); + this->actor.minVelocityY = -((kREG(1) * 0.01f) + 13.0f); + } else { + func_80B3C8CC(this, globalCtx); + } +} + +void EnXc_SetupWalkAction(EnXc* this) { + f32* timer = &this->timer; + + *timer += 1.0f; + if (*timer >= 12.0f) { + this->actor.speedXZ = (kREG(2) * 0.01f) + 1.2f; + this->action = SHIEK_ACTION_WALK; + } +} + +void EnXc_SetupHaltAction(EnXc* this) { + SkelAnime* skelAnime = &this->skelAnime; + f32 xzDistToPlayer = this->actor.xzDistToPlayer; + + if (xzDistToPlayer <= (kREG(3) + 95.0f)) { + f32 frameCount = Animation_GetLastFrame(&gShiekIdleAnim); + + Animation_Change(skelAnime, &gShiekIdleAnim, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP, -12.0f); + this->action = SHIEK_ACTION_HALT; + this->timer = 0.0f; + } +} + +void EnXc_SetupStoppedAction(EnXc* this) { + f32* timer = &this->timer; + + *timer += 1.0f; + if (*timer >= 12.0f) { + this->action = SHIEK_ACTION_STOPPED; + this->actor.speedXZ = 0.0f; + } +} + +void func_80B3DAF0(EnXc* this, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = EnXc_GetCsCmd(globalCtx, 4); + u16 action; + + if (npcAction && + (action = npcAction->action, action == 3 || action == 11 || action == 12 || action == 13 || action == 23)) { + f32 frameCount; + + frameCount = Animation_GetLastFrame(&gShiekPullingOutHarpAnim); + Animation_Change(&this->skelAnime, &gShiekPullingOutHarpAnim, 1.0f, 0.0f, frameCount, ANIMMODE_ONCE, -4.0f); + this->action = SHIEK_ACTION_7; + this->drawMode = SHIEK_DRAW_PULLING_OUT_HARP; + } +} + +void EnXc_SetupInitialHarpAction(EnXc* this, s32 animFinished) { + SkelAnime* skelAnime; + f32 frameCount; + + if (animFinished) { + skelAnime = &this->skelAnime; + frameCount = Animation_GetLastFrame(&gShiekInitialHarpAnim); + Animation_Change(skelAnime, &gShiekInitialHarpAnim, 1.0f, 0.0f, frameCount, ANIMMODE_ONCE, 0.0f); + this->action = SHIEK_ACTION_HARP_READY; + this->drawMode = SHIEK_DRAW_HARP; + } +} + +void EnXc_SetupPlayingHarpAction(EnXc* this, GlobalContext* globalCtx, s32 animFinished) { + s32 pad; + SkelAnime* skelAnime; + AnimationHeader* animation; + f32 frameCount; + + if (animFinished) { + skelAnime = &this->skelAnime; + animation = EnXc_GetCurrentHarpAnim(globalCtx, 4); + frameCount = Animation_GetLastFrame(animation); + Animation_Change(skelAnime, animation, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP, -8.0f); + this->action = SHIEK_PLAYING_HARP; + this->drawMode = SHIEK_DRAW_HARP; + } +} + +void func_80B3DCA8(EnXc* this, GlobalContext* globalCtx) { + f32 frameCount; + + if (globalCtx->csCtx.state != 0) { + CsCmdActorAction* npcAction = globalCtx->csCtx.npcActions[4]; + + if (npcAction != NULL && npcAction->action == 8) { + frameCount = Animation_GetLastFrame(&gShiekInitialHarpAnim); + Animation_Change(&this->skelAnime, &gShiekInitialHarpAnim, 0.0f, frameCount, frameCount, ANIMMODE_LOOP, + -8.0f); + this->action = SHIEK_ACTION_10; + } + } +} + +void EnXc_SetupHarpPutawayAction(EnXc* this, GlobalContext* globalCtx) { + f32 curFrame; + f32 animFrameCount; + + if (EnXc_CompareCsAction(this, globalCtx, 5, 4)) { + curFrame = this->skelAnime.curFrame; + animFrameCount = this->skelAnime.endFrame; + if (curFrame >= animFrameCount) { + Animation_Change(&this->skelAnime, &gShiekInitialHarpAnim, -1.0f, + Animation_GetLastFrame(&gShiekInitialHarpAnim), 0.0f, ANIMMODE_ONCE, 0.0f); + this->action = SHIEK_ACTION_PUT_HARP_AWAY; + } + } else if (EnXc_CsActionsAreNotEqual(this, globalCtx, 8, 4)) { + EnXc_SetupPlayingHarpAction(this, globalCtx, true); + } +} + +void func_80B3DE00(EnXc* this, s32 animFinished) { + if (animFinished) { + Animation_Change(&this->skelAnime, &gShiekPullingOutHarpAnim, -1.0f, + Animation_GetLastFrame(&gShiekPullingOutHarpAnim), 0.0f, ANIMMODE_ONCE, 0.0f); + this->action = SHIEK_ACTION_12; + this->drawMode = SHIEK_DRAW_PULLING_OUT_HARP; + } +} + +void func_80B3DE78(EnXc* this, s32 animFinished) { + if (animFinished) { + Animation_Change(&this->skelAnime, &gShiekIdleAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gShiekIdleAnim), + ANIMMODE_LOOP, 0.0f); + this->action = SHIEK_ACTION_13; + this->drawMode = SHIEK_DRAW_DEFAULT; + this->timer = 0.0f; + } +} + +void EnXc_SetupReverseAccel(EnXc* this, GlobalContext* globalCtx) { + if (globalCtx->csCtx.state != 0) { + CsCmdActorAction* npcAction = globalCtx->csCtx.npcActions[4]; + + if (npcAction != NULL && npcAction->action == 4) { + Animation_Change(&this->skelAnime, &gShiekWalkingAnim, -1.0f, Animation_GetLastFrame(&gShiekWalkingAnim), + 0.0f, ANIMMODE_LOOP, -12.0f); + this->action = SHIEK_ACTION_REVERSE_ACCEL; + this->actor.world.rot.y += 0x8000; + this->timer = 0.0f; + } + } +} + +void EnXc_SetupReverseWalkAction(EnXc* this) { + this->timer++; + if (this->timer >= 12.0f) { + this->actor.speedXZ = (kREG(2) * 0.01f) + 1.2f; + this->action = SHIEK_ACTION_REVERSE_WALK; + } +} + +void EnXc_SetupReverseHaltAction(EnXc* this) { + f32 xzDistToPlayer = this->actor.xzDistToPlayer; + + if (xzDistToPlayer >= kREG(5) + 140.0f) { + Animation_Change(&this->skelAnime, &gShiekIdleAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gShiekIdleAnim), + ANIMMODE_LOOP, -12.0f); + this->action = SHIEK_ACTION_REVERSE_HALT; + this->timer = 0.0f; + } +} + +void EnXc_SetupNutThrow(EnXc* this) { + this->timer++; + if (this->timer >= 12.0f) { + Animation_Change(&this->skelAnime, &gShiekThrowingNutAnim, 1.0f, 0.0f, + Animation_GetLastFrame(&gShiekThrowingNutAnim), ANIMMODE_ONCE, 0.0f); + this->action = SHIEK_ACTION_THROW_NUT; + this->timer = 0.0f; + this->actor.speedXZ = 0.0f; + } +} + +void func_80B3E164(EnXc* this, GlobalContext* globalCtx) { + this->timer++; + if (this->timer >= 30.0f) { + this->action = SHIEK_ACTION_DELETE; + EnXc_SpawnNut(this, globalCtx); + } +} + +void EnXc_SetupDisappear(EnXc* this, GlobalContext* globalCtx) { + if (globalCtx->csCtx.state != 0) { + CsCmdActorAction* npcAction = globalCtx->csCtx.npcActions[4]; + + if (npcAction != NULL && npcAction->action == 9) { + s16 sceneNum = globalCtx->sceneNum; + + // Shiek fades away if end of Bolero CS, kill actor otherwise + if (sceneNum == SCENE_SPOT17) { + this->action = SHIEK_ACTION_FADE; + this->drawMode = SHIEK_DRAW_NOTHING; + this->actor.shape.shadowAlpha = 0; + } else { + Actor_Kill(&this->actor); + } + } + } +} + +void EnXc_ActionFunc0(EnXc* this, GlobalContext* globalCtx) { + EnXc_SetColossusAppearSFX(this, globalCtx); + EnXc_SetColossusWindSFX(globalCtx); + func_80B3D750(this, globalCtx); +} + +void EnXc_ActionFunc1(EnXc* this, GlobalContext* globalCtx) { + EnXc_SetColossusAppearSFX(this, globalCtx); + EnXc_SetColossusWindSFX(globalCtx); + EnXc_SetupFallFromSkyAction(this, globalCtx); +} + +void EnXc_GracefulFall(EnXc* this, GlobalContext* globalCtx) { + s32 animFinished = EnXc_AnimIsFinished(this); + + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + EnXc_SetLandingSFX(this, globalCtx); + EnXc_SetColossusAppearSFX(this, globalCtx); + EnXc_SetColossusWindSFX(globalCtx); + func_80B3D8A4(this, globalCtx, animFinished); +} + +void EnXc_Accelerate(EnXc* this, GlobalContext* globalCtx) { + EnXc_CalcXZAccel(this); + EnXc_AnimIsFinished(this); + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + EnXc_SetWalkingSFX(this, globalCtx); + EnXc_SetupWalkAction(this); +} + +void EnXc_Walk(EnXc* this, GlobalContext* globalCtx) { + func_80B3D644(this); + EnXc_AnimIsFinished(this); + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + EnXc_SetWalkingSFX(this, globalCtx); + EnXc_SetupHaltAction(this); +} + +void EnXc_Stopped(EnXc* this, GlobalContext* globalCtx) { + EnXc_CalcXZSpeed(this); + EnXc_AnimIsFinished(this); + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + EnXc_SetWalkingSFX(this, globalCtx); + EnXc_SetupStoppedAction(this); +} + +void EnXc_ActionFunc6(EnXc* this, GlobalContext* globalCtx) { + EnXc_AnimIsFinished(this); + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + func_80B3DAF0(this, globalCtx); +} + +void EnXc_ActionFunc7(EnXc* this, GlobalContext* globalCtx) { + s32 animFinished = EnXc_AnimIsFinished(this); + + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + EnXc_SetupInitialHarpAction(this, animFinished); +} + +void EnXc_ActionFunc8(EnXc* this, GlobalContext* globalCtx) { + s32 animFinished = EnXc_AnimIsFinished(this); + + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + EnXc_SetupPlayingHarpAction(this, globalCtx, animFinished); +} + +void EnXc_ActionFunc9(EnXc* this, GlobalContext* globalCtx) { + EnXc_AnimIsFinished(this); + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + func_80B3DCA8(this, globalCtx); +} + +void EnXc_ActionFunc10(EnXc* this, GlobalContext* globalCtx) { + EnXc_AnimIsFinished(this); + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + EnXc_SetupHarpPutawayAction(this, globalCtx); +} + +void EnXc_ActionFunc11(EnXc* this, GlobalContext* globalCtx) { + s32 animFinished = EnXc_AnimIsFinished(this); + + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + func_80B3DE00(this, animFinished); +} + +void EnXc_ActionFunc12(EnXc* this, GlobalContext* globalCtx) { + s32 animFinished = EnXc_AnimIsFinished(this); + + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + func_80B3DE78(this, animFinished); +} + +void EnXc_ActionFunc13(EnXc* this, GlobalContext* globalCtx) { + EnXc_AnimIsFinished(this); + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + EnXc_InitFlame(this, globalCtx); + EnXc_SetupReverseAccel(this, globalCtx); +} + +void EnXc_ReverseAccelerate(EnXc* this, GlobalContext* globalCtx) { + func_80B3D6F0(this); + EnXc_AnimIsFinished(this); + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + EnXc_SetWalkingSFX(this, globalCtx); + EnXc_InitFlame(this, globalCtx); + EnXc_SetupReverseWalkAction(this); +} + +void EnXc_ActionFunc15(EnXc* this, GlobalContext* globalCtx) { + func_80B3D710(this); + EnXc_AnimIsFinished(this); + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + EnXc_SetWalkingSFX(this, globalCtx); + EnXc_InitFlame(this, globalCtx); + EnXc_SetupReverseHaltAction(this); +} + +void EnXc_HaltAndWaitToThrowNut(EnXc* this, GlobalContext* globalCtx) { + func_80B3D730(this); + EnXc_AnimIsFinished(this); + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + EnXc_SetWalkingSFX(this, globalCtx); + EnXc_InitFlame(this, globalCtx); + EnXc_SetupNutThrow(this); +} + +void EnXc_ThrowNut(EnXc* this, GlobalContext* globalCtx) { + EnXc_AnimIsFinished(this); + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + EnXc_SetNutThrowSFX(this, globalCtx); + EnXc_InitFlame(this, globalCtx); + func_80B3E164(this, globalCtx); +} + +void EnXc_Delete(EnXc* this, GlobalContext* globalCtx) { + EnXc_AnimIsFinished(this); + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + EnXc_InitFlame(this, globalCtx); + EnXc_SetupDisappear(this, globalCtx); +} + +void EnXc_Fade(EnXc* this, GlobalContext* globalCtx) { + EnXc_InitFlame(this, globalCtx); +} + +void func_80B3E87C(Gfx** dList, EnXc* this) { + f32 currentFrame = this->skelAnime.curFrame; + + if (currentFrame >= 34.0f) { + *dList = gShiekHarpDL; + } +} + +s32 EnXc_PullingOutHarpOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + void* thisx) { + EnXc* this = THIS; + + if (limbIndex == 12) { + func_80B3E87C(dList, this); + } + + return 0; +} + +s32 EnXc_HarpOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + void* thisx) { + EnXc* this = THIS; + + if (limbIndex == 12) { + *dList = gShiekHarpDL; + } + + return 0; +} + +void EnXc_DrawPullingOutHarp(Actor* thisx, GlobalContext* globalCtx) { + EnXc* this = THIS; + s32 pad; + s16 eyePattern = this->eyeIdx; + u64* eyeTexture = sEyeTextures[eyePattern]; + SkelAnime* skelAnime = &this->skelAnime; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + s32 pad2; + + OPEN_DISPS(gfxCtx, "../z_en_oA2_inSpot05.c", 1444); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTexture)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(eyeTexture)); + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 20, 0); + gDPSetEnvColor(POLY_OPA_DISP++, 60, 0, 0, 0); + + func_80093D18(gfxCtx); + func_8002EBCC(&this->actor, globalCtx, 0); + SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, + EnXc_PullingOutHarpOverrideLimbDraw, NULL, this); + CLOSE_DISPS(gfxCtx, "../z_en_oA2_inSpot05.c", 1497); +} + +void EnXc_DrawHarp(Actor* thisx, GlobalContext* globalCtx) { + EnXc* this = THIS; + s32 pad; + s16 eyePattern = this->eyeIdx; + u64* eyeTexture = sEyeTextures[eyePattern]; + SkelAnime* skelAnime = &this->skelAnime; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + s32 pad2; + + OPEN_DISPS(gfxCtx, "../z_en_oA2_inSpot05.c", 1511); + + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTexture)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(eyeTexture)); + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 20, 0); + gDPSetEnvColor(POLY_OPA_DISP++, 60, 0, 0, 0); + + func_80093D18(gfxCtx); + func_8002EBCC(&this->actor, globalCtx, 0); + SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, + EnXc_HarpOverrideLimbDraw, NULL, this); + CLOSE_DISPS(gfxCtx, "../z_en_oA2_inSpot05.c", 1564); +} + +void func_80B3EBF0(EnXc* this, GlobalContext* globalCtx) { + this->action = SHIEK_ACTION_20; +} + +void func_80B3EC00(EnXc* this) { + this->action = SHIEK_ACTION_21; +} + +void func_80B3EC0C(EnXc* this, GlobalContext* globalCtx) { + CutsceneContext* csCtx = &globalCtx->csCtx; + + if (csCtx->state != 0) { + CsCmdActorAction* npcAction = csCtx->npcActions[4]; + + if ((npcAction != NULL) && (npcAction->action != 1)) { + PosRot* posRot = &this->actor.world; + Vec3i* startPos = &npcAction->startPos; + ActorShape* shape = &this->actor.shape; + + posRot->pos.x = startPos->x; + posRot->pos.y = startPos->y; + posRot->pos.z = startPos->z; + + posRot->rot.y = shape->rot.y = npcAction->rot.y; + + this->action = SHIEK_ACTION_22; + this->drawMode = SHIEK_DRAW_DEFAULT; + } + } +} + +void func_80B3EC90(EnXc* this, GlobalContext* globalCtx) { + CutsceneContext* csCtx = &globalCtx->csCtx; + + if (csCtx->state != 0) { + CsCmdActorAction* npcAction = csCtx->npcActions[4]; + + if (npcAction != NULL && npcAction->action != 6) { + func_80B3C9EC(this); + } + } +} + +void func_80B3ECD8(EnXc* this) { + this->timer++; + if (this->timer >= 12.0f) { + this->actor.speedXZ = kREG(2) * 0.01f + 1.2f; + this->action = SHIEK_ACTION_24; + } +} + +void EnXc_ActionFunc20(EnXc* this, GlobalContext* globalCtx) { + func_80B3EC00(this); +} + +void EnXc_ActionFunc21(EnXc* this, GlobalContext* globalCtx) { + func_80B3EC0C(this, globalCtx); +} + +void EnXc_ActionFunc22(EnXc* this, GlobalContext* globalCtx) { + EnXc_AnimIsFinished(this); + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + func_80B3EC90(this, globalCtx); +} + +void EnXc_ActionFunc23(EnXc* this, GlobalContext* globalCtx) { + func_80B3D6F0(this); + EnXc_AnimIsFinished(this); + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + EnXc_SetWalkingSFX(this, globalCtx); + func_80B3ECD8(this); +} + +void EnXc_ActionFunc24(EnXc* this, GlobalContext* globalCtx) { +} + +void EnXc_ActionFunc25(EnXc* this, GlobalContext* globalCtx) { +} + +void EnXc_ActionFunc26(EnXc* this, GlobalContext* globalCtx) { +} + +void EnXc_ActionFunc27(EnXc* this, GlobalContext* globalCtx) { +} + +void EnXc_ActionFunc28(EnXc* this, GlobalContext* globalCtx) { +} + +void func_80B3EE64(EnXc* this, GlobalContext* globalCtx) { + this->action = SHIEK_ACTION_SERENADE; +} + +void func_80B3EE74(EnXc* this, GlobalContext* globalCtx) { + if (EnXc_SerenadeCS(this, globalCtx)) { + this->action = SHIEK_ACTION_30; + } +} + +void func_80B3EEA4(EnXc* this) { + EnXc_CheckAndSetAction(this, SHIEK_ACTION_30, SHIEK_ACTION_31); +} + +void func_80B3EEC8(EnXc* this) { + EnXc_CheckAndSetAction(this, SHIEK_ACTION_31, SHIEK_ACTION_32); +} + +void func_80B3EEEC(EnXc* this) { + EnXc_CheckAndSetAction(this, SHIEK_ACTION_32, SHIEK_ACTION_33); +} + +void func_80B3EF10(EnXc* this) { + EnXc_CheckAndSetAction(this, SHIEK_ACTION_33, SHIEK_ACTION_34); +} + +void func_80B3EF34(EnXc* this) { + EnXc_CheckAndSetAction(this, SHIEK_ACTION_34, SHIEK_ACTION_35); +} + +void func_80B3EF58(EnXc* this) { + func_80B3C7D4(this, SHIEK_ACTION_35, SHIEK_ACTION_36, SHIEK_ACTION_34); +} + +void func_80B3EF80(EnXc* this) { + EnXc_CheckAndSetAction(this, SHIEK_ACTION_36, SHIEK_ACTION_37); +} + +void func_80B3EFA4(EnXc* this) { + EnXc_CheckAndSetAction(this, SHIEK_ACTION_37, SHIEK_ACTION_38); +} + +void func_80B3EFC8(EnXc* this) { + EnXc_CheckAndSetAction(this, SHIEK_ACTION_38, SHIEK_ACTION_39); +} + +void func_80B3EFEC(EnXc* this) { + EnXc_CheckAndSetAction(this, SHIEK_ACTION_39, SHIEK_ACTION_40); +} + +void func_80B3F010(EnXc* this) { + f32 xzDistToPlayer = this->actor.xzDistToPlayer; + + if (kREG(5) + 140.0f <= xzDistToPlayer) { + Animation_Change(&this->skelAnime, &gShiekIdleAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gShiekIdleAnim), + ANIMMODE_LOOP, -12.0f); + this->action = SHIEK_ACTION_41; + this->timer = 0.0f; + } +} + +void func_80B3F0B8(EnXc* this) { + EnXc_CheckAndSetAction(this, SHIEK_ACTION_41, SHIEK_ACTION_42); +} + +void func_80B3F0DC(EnXc* this) { + EnXc_CheckAndSetAction(this, SHIEK_ACTION_42, SHIEK_ACTION_43); +} + +void func_80B3F100(EnXc* this) { + EnXc_CheckAndSetAction(this, SHIEK_ACTION_43, SHIEK_ACTION_44); +} + +void EnXc_Serenade(EnXc* this, GlobalContext* globalCtx) { + func_80B3EE74(this, globalCtx); +} + +void EnXc_ActionFunc30(EnXc* this, GlobalContext* globalCtx) { + EnXc_ActionFunc21(this, globalCtx); + func_80B3EEA4(this); +} + +void EnXc_ActionFunc31(EnXc* this, GlobalContext* globalCtx) { + EnXc_ActionFunc6(this, globalCtx); + func_80B3C588(this, globalCtx, 4); + func_80B3EEC8(this); +} + +void EnXc_ActionFunc32(EnXc* this, GlobalContext* globalCtx) { + EnXc_ActionFunc7(this, globalCtx); + func_80B3EEEC(this); +} + +void EnXc_ActionFunc33(EnXc* this, GlobalContext* globalCtx) { + EnXc_ActionFunc8(this, globalCtx); + func_80B3EF10(this); +} + +void EnXc_ActionFunc34(EnXc* this, GlobalContext* globalCtx) { + EnXc_ActionFunc9(this, globalCtx); + func_80B3EF34(this); +} + +void EnXc_ActionFunc35(EnXc* this, GlobalContext* globalCtx) { + EnXc_ActionFunc10(this, globalCtx); + func_80B3EF58(this); +} + +void EnXc_ActionFunc36(EnXc* this, GlobalContext* globalCtx) { + EnXc_ActionFunc11(this, globalCtx); + func_80B3EF80(this); +} + +void EnXc_ActionFunc37(EnXc* this, GlobalContext* globalCtx) { + EnXc_ActionFunc12(this, globalCtx); + func_80B3EFA4(this); +} + +void EnXc_ActionFunc38(EnXc* this, GlobalContext* globalCtx) { + EnXc_ActionFunc13(this, globalCtx); + func_80B3EFC8(this); +} + +void EnXc_ActionFunc39(EnXc* this, GlobalContext* globalCtx) { + EnXc_ReverseAccelerate(this, globalCtx); + func_80B3EFEC(this); +} + +void EnXc_ActionFunc40(EnXc* this, GlobalContext* globalCtx) { + func_80B3D710(this); + EnXc_AnimIsFinished(this); + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + EnXc_SetWalkingSFX(this, globalCtx); + func_80B3F010(this); +} + +void EnXc_ActionFunc41(EnXc* this, GlobalContext* globalCtx) { + EnXc_HaltAndWaitToThrowNut(this, globalCtx); + func_80B3F0B8(this); +} + +void EnXc_ActionFunc42(EnXc* this, GlobalContext* globalCtx) { + EnXc_ThrowNut(this, globalCtx); + func_80B3F0DC(this); +} + +void EnXc_ActionFunc43(EnXc* this, GlobalContext* globalCtx) { + EnXc_Delete(this, globalCtx); + func_80B3F100(this); +} + +void EnXc_ActionFunc44(EnXc* this, GlobalContext* globalCtx) { +} + +void func_80B3F3C8(EnXc* this, GlobalContext* globalCtx) { + this->action = SHIEK_ACTION_45; +} + +void func_80B3F3D8() { + func_800788CC(NA_SE_PL_SKIP); +} + +void EnXc_PlayDiveSFX(Vec3f* src, GlobalContext* globalCtx) { + f32 wDest[2]; + + SkinMatrix_Vec3fMtxFMultXYZW(&globalCtx->mf_11D60, src, &D_80B42DA0, wDest); + func_80078914(&D_80B42DA0, NA_SE_EV_DIVE_INTO_WATER); +} + +void EnXc_LakeHyliaDive(GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = npcAction = EnXc_GetCsCmd(globalCtx, 0); + + if (npcAction != NULL) { + Vec3f startPos; + + startPos.x = npcAction->startPos.x; + startPos.y = npcAction->startPos.y; + startPos.z = npcAction->startPos.z; + + EffectSsGRipple_Spawn(globalCtx, &startPos, 100, 500, 0); + EffectSsGRipple_Spawn(globalCtx, &startPos, 100, 500, 10); + EffectSsGRipple_Spawn(globalCtx, &startPos, 100, 500, 20); + EffectSsGSplash_Spawn(globalCtx, &startPos, NULL, NULL, 1, 0); + EnXc_PlayDiveSFX(&startPos, globalCtx); + } +} + +void func_80B3F534(GlobalContext* globalCtx) { + CutsceneContext* csCtx = &globalCtx->csCtx; + u16 frameCount = csCtx->frames; + + if (frameCount == 310) { + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_DOOR_WARP1, -1044.0f, -1243.0f, 7458.0f, 0, 0, 0, 6); + } +} + +void func_80B3F59C(EnXc* this, GlobalContext* globalCtx) { + static s32 D_80B41DAC = 1; + CsCmdActorAction* npcAction = EnXc_GetCsCmd(globalCtx, 0); + + if (npcAction != NULL) { + s32 action = npcAction->action; + + if (action != D_80B41DAC) { + switch (action) { + case 2: + func_80B3F3D8(); + break; + case 3: + EnXc_LakeHyliaDive(globalCtx); + break; + default: + break; + } + D_80B41DAC = action; + } + } +} + +void func_80B3F620(EnXc* this) { + EnXc_CheckAndSetAction(this, SHIEK_ACTION_45, SHIEK_ACTION_46); +} + +void func_80B3F644(EnXc* this) { + EnXc_CheckAndSetAction(this, SHIEK_ACTION_46, SHIEK_ACTION_47); +} + +void func_80B3F668(EnXc* this, GlobalContext* globalCtx) { + if (EnXc_CompareCsAction(this, globalCtx, 4, 4)) { + EnXc_ChangeAnimation(this, &gShiekWalkingAnim, ANIMMODE_LOOP, -12.0f, true); + this->action = SHIEK_ACTION_48; + this->actor.world.rot.y += 0x8000; + this->timer = 0.0f; + } +} + +void func_80B3F6DC(EnXc* this) { + EnXc_CheckAndSetAction(this, SHIEK_ACTION_48, SHIEK_ACTION_49); +} + +void EnXc_SetupKneelAction(EnXc* this, GlobalContext* globalCtx) { + if (EnXc_CompareCsAction(this, globalCtx, 16, 4)) { + EnXc_ChangeAnimation(this, &gShiekKneelingAnim, ANIMMODE_LOOP, 0.0f, false); + this->action = SHIEK_SHIEK_KNEEL; + } +} + +void func_80B3F754(EnXc* this, GlobalContext* globalCtx) { + if (EnXc_CompareCsAction(this, globalCtx, 22, 4)) { + EnXc_ChangeAnimation(this, &gShiekAnim_01A048, ANIMMODE_LOOP, 0.0f, false); + this->action = SHIEK_ACTION_51; + func_80B3C588(this, globalCtx, 4); + } +} + +void func_80B3F7BC(EnXc* this, GlobalContext* globalCtx) { + if (EnXc_CompareCsAction(this, globalCtx, 9, 4)) { + this->action = SHIEK_ACTION_52; + this->drawMode = SHIEK_DRAW_NOTHING; + } +} + +void EnXc_ActionFunc45(EnXc* this, GlobalContext* globalCtx) { + EnXc_ActionFunc20(this, globalCtx); + func_80B3F620(this); +} + +void EnXc_ActionFunc46(EnXc* this, GlobalContext* globalCtx) { + EnXc_ActionFunc21(this, globalCtx); + func_80B3F644(this); +} + +void EnXc_ActionFunc47(EnXc* this, GlobalContext* globalCtx) { + func_80B3F534(globalCtx); + EnXc_AnimIsFinished(this); + EnXc_BgCheck(this, globalCtx); + func_80B3C588(this, globalCtx, 4); + func_80B3F668(this, globalCtx); +} + +void EnXc_ActionFunc48(EnXc* this, GlobalContext* globalCtx) { + EnXc_ActionFunc23(this, globalCtx); + func_80B3F6DC(this); +} + +void EnXc_ActionFunc49(EnXc* this, GlobalContext* globalCtx) { + func_80B3D710(this); + EnXc_AnimIsFinished(this); + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + EnXc_SetWalkingSFX(this, globalCtx); + EnXc_SetupKneelAction(this, globalCtx); +} + +void EnXc_Kneel(EnXc* this, GlobalContext* globalCtx) { + EnXc_AnimIsFinished(this); + EnXc_BgCheck(this, globalCtx); + func_80B3F59C(this, globalCtx); + func_80B3C588(this, globalCtx, 4); + func_80B3F754(this, globalCtx); +} + +void EnXc_ActionFunc51(EnXc* this, GlobalContext* globalCtx) { + EnXc_AnimIsFinished(this); + EnXc_BgCheck(this, globalCtx); + func_80B3F59C(this, globalCtx); + func_80B3C620(this, globalCtx, 4); + func_80B3F7BC(this, globalCtx); +} + +void EnXc_ActionFunc52(EnXc* this, GlobalContext* globalCtx) { + func_80B3F59C(this, globalCtx); +} + +void func_80B3FA08(EnXc* this, GlobalContext* globalCtx) { + this->action = SHIEK_ACTION_53; + this->triforceAngle = kREG(24) + 0x53FC; +} + +void func_80B3FA2C(void) { + func_800F3F3C(1); +} + +void EnXc_PlayTriforceSFX(Actor* thisx, GlobalContext* globalCtx) { + EnXc* this = THIS; + + if (this->unk_2A8) { + s32 pad; + Vec3f src; + Vec3f pos; + Vec3f sp1C = { 0.0f, 0.0f, 0.0f }; + f32 wDest; + + Matrix_MultVec3f(&sp1C, &src); + SkinMatrix_Vec3fMtxFMultXYZW(&globalCtx->mf_11D60, &src, &pos, &wDest); + Audio_PlaySoundAtPosition(globalCtx, &pos, 80, NA_SE_EV_TRIFORCE_MARK); + this->unk_2A8 = 0; + } +} + +void func_80B3FAE0(EnXc* this) { + if (Animation_OnFrame(&this->skelAnime, 38.0f)) { + func_80078914(&this->actor.projectedPos, NA_SE_VO_SK_SHOUT); + func_80B3FA2C(); + } +} + +void EnXc_CalcTriforce(Actor* thisx, GlobalContext* globalCtx) { + EnXc* this = THIS; + + if (EnXc_CompareCsAction(this, globalCtx, 21, 4)) { + this->unk_274 = 1; + if (this->unk_2AC == 0) { + this->unk_2AC = 1; + this->unk_2A8 = 1; + } + } else if (EnXc_CompareCsAction(this, globalCtx, 19, 4)) { + this->unk_274 = 2; + } + if (this->unk_274 != 0) { + f32* timer = &this->timer; + s32* prim = this->triforcePrimColor; + s32* env = this->triforceEnvColor; + f32* scale = this->triforceScale; + + if (this->unk_274 == 1) { + if (*timer < kREG(25) + 40.0f) { + f32 div = *timer / (kREG(25) + 40.0f); + prim[2] = -85.0f * div + 255; + prim[3] = 255.0f * div; + env[1] = 100.0f * div + 100; + *timer += 1.0f; + } else { + prim[2] = 170; + prim[3] = 255; + env[1] = 200; + } + scale[0] = kREG(19) * 0.1f + 40.0f; + scale[1] = kREG(20) * 0.1f + 40.0f; + scale[2] = kREG(21) * 0.1f + 40.0f; + } else if (this->unk_274 == 2) { + f32 maxTime = (kREG(25) + 40.0f) + (kREG(27) + 90.0f); + if (*timer < maxTime) { + f32 div = (*timer - (kREG(25) + 40.0f)) / (kREG(27) + 90.0f); + scale[0] = (kREG(19) * 0.1f + 40.0f) + div * ((kREG(26) + 50.0f) * (kREG(19) * 0.1f + 40.0f)); + scale[1] = (kREG(20) * 0.1f + 40.0f) + div * ((kREG(26) + 50.0f) * (kREG(20) * 0.1f + 40.0f)); + scale[2] = (kREG(21) * 0.1f + 40.0f) + div * ((kREG(26) + 50.0f) * (kREG(21) * 0.1f + 40.0f)); + *timer += 1.0f; + } else { + scale[0] = (kREG(19) * 0.1f + 40.0f) * (kREG(26) + 50.0f); + scale[1] = (kREG(20) * 0.1f + 40.0f) * (kREG(26) + 50.0f); + scale[2] = (kREG(21) * 0.1f + 40.0f) * (kREG(26) + 50.0f); + } + this->triforceAngle += (s16)(kREG(28) + 0x2EE0); + } + } +} + +void func_80B3FF0C(EnXc* this, GlobalContext* globalCtx) { + if (EnXc_CsActionsAreNotEqual(this, globalCtx, 1, 4)) { + CutsceneContext* csCtx = &globalCtx->csCtx; + + if (csCtx->state != 0) { + CsCmdActorAction* npcAction = globalCtx->csCtx.npcActions[4]; + + if (npcAction != NULL) { + PosRot* posRot = &this->actor.world; + ActorShape* shape = &this->actor.shape; + Vec3i* startPos = &npcAction->startPos; + + posRot->pos.x = startPos->x; + posRot->pos.y = startPos->y; + posRot->pos.z = startPos->z; + + posRot->rot.y = shape->rot.y = npcAction->rot.y; + } + } + + this->action = SHIEK_ACTION_54; + this->drawMode = SHIEK_DRAW_DEFAULT; + } +} + +void EnXc_SetupShowTriforceAction(EnXc* this, GlobalContext* globalCtx) { + if (EnXc_CompareCsAction(this, globalCtx, 10, 4)) { + Animation_Change(&this->skelAnime, &gShiekShowingTriforceOnHandAnim, 1.0f, 0.0f, + Animation_GetLastFrame(&gShiekShowingTriforceOnHandAnim), ANIMMODE_ONCE, -8.0f); + this->action = SHIEK_ACTION_SHOW_TRIFORCE; + this->drawMode = SHIEK_DRAW_TRIFORCE; + } +} + +void EnXc_SetupShowTriforceIdleAction(EnXc* this, s32 animFinished) { + if (animFinished) { + Animation_Change(&this->skelAnime, &gShiekShowingTriforceOnHandIdleAnim, 1.0f, 0.0f, + Animation_GetLastFrame(&gShiekShowingTriforceOnHandIdleAnim), ANIMMODE_LOOP, 0.0f); + this->action = SHIEK_ACTION_SHOW_TRIFORCE_IDLE; + } +} +void func_80B400AC(EnXc* this, GlobalContext* globalCtx) { + if (EnXc_CompareCsAction(this, globalCtx, 9, 4)) { + Actor_Kill(&this->actor); + } +} + +void EnXc_ActionFunc53(EnXc* this, GlobalContext* globalCtx) { + func_80B3FF0C(this, globalCtx); +} + +void EnXc_ActionFunc54(EnXc* this, GlobalContext* globalCtx) { + EnXc_AnimIsFinished(this); + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + EnXc_SetupShowTriforceAction(this, globalCtx); + func_80B3C888(this, globalCtx); +} + +void EnXc_ShowTriforce(EnXc* this, GlobalContext* globalCtx) { + s32 animFinished = EnXc_AnimIsFinished(this); + + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + EnXc_CalcTriforce(&this->actor, globalCtx); + func_80B3FAE0(this); + EnXc_SetupShowTriforceIdleAction(this, animFinished); + func_80B3C888(this, globalCtx); +} + +void EnXc_ShowTriforceIdle(EnXc* this, GlobalContext* globalCtx) { + EnXc_AnimIsFinished(this); + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + EnXc_CalcTriforce(&this->actor, globalCtx); + func_80B400AC(this, globalCtx); +} + +s32 EnXc_TriforceOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + void* thisx) { + if (limbIndex == 15) { + *dList = gShiekDL_011620; + } + return 0; +} + +void EnXc_TriforcePostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { + s32 pad[2]; + EnXc* this = THIS; + + if (limbIndex == 15) { + Vec3f vec = { 0.0f, 0.0f, 0.0f }; + EnXc_PlayTriforceSFX(&this->actor, globalCtx); + Matrix_MultVec3f(&vec, &this->handPos); + this->unk_2BC = 1; + } +} + +void EnXc_DrawTriforce(Actor* thisx, GlobalContext* globalCtx) { + EnXc* this = THIS; + s32 pad; + s16 eyeIdx = this->eyeIdx; + u64* eyeTexture = sEyeTextures[eyeIdx]; + SkelAnime* skelAnime = &this->skelAnime; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + s32 pad2; + + OPEN_DISPS(gfxCtx, "../z_en_oA2_inMetamol.c", 565); + if (this->unk_2BC != 0) { + Mtx* mtx = Graph_Alloc(gfxCtx, sizeof(Mtx)); + s32* primColor = this->triforcePrimColor; + s32* envColor = this->triforceEnvColor; + f32* scale = this->triforceScale; + + Matrix_Push(); + Matrix_Translate(kREG(16) + 100.0f, kREG(17) + 4460.0f, kREG(18) + 1190.0f, MTXMODE_APPLY); + Matrix_RotateRPY(kREG(22), kREG(23), this->triforceAngle, MTXMODE_APPLY); + Matrix_Scale(scale[0], scale[1], scale[2], MTXMODE_APPLY); + Matrix_ToMtx(mtx, "../z_en_oA2_inMetamol.c", 602); + Matrix_Pop(); + func_80093D84(gfxCtx); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 255, 255, primColor[2], primColor[3]); + gDPSetEnvColor(POLY_XLU_DISP++, 255, envColor[1], 0, 128); + gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, gShiekDL_012970); + } + + func_8002EBCC(thisx, globalCtx, 0); + func_80093D18(globalCtx->state.gfxCtx); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTexture)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(eyeTexture)); + SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, + EnXc_TriforceOverrideLimbDraw, EnXc_TriforcePostLimbDraw, this); + CLOSE_DISPS(gfxCtx, "../z_en_oA2_inMetamol.c", 668); +} + +void func_80B40590(EnXc* this, GlobalContext* globalCtx) { + this->action = SHIEK_ACTION_NOCTURNE_INIT; + this->drawMode = SHIEK_DRAW_SQUINT; +} + +void EnXc_SetThrownAroundSFX(EnXc* this) { + SkelAnime* skelAnime = &this->skelAnime; + + if (Animation_OnFrame(skelAnime, 9.0f)) { + func_80078914(&this->actor.projectedPos, NA_SE_PL_BOUND_GRASS); + func_80078914(&this->actor.projectedPos, NA_SE_VO_SK_CRASH); + } else if (Animation_OnFrame(skelAnime, 26.0f)) { + func_80078914(&this->actor.projectedPos, NA_SE_PL_BOUND_GRASS); + } else if (Animation_OnFrame(skelAnime, 28.0f)) { + func_80078914(&this->actor.projectedPos, NA_SE_PL_WALK_GRASS); + } else if (Animation_OnFrame(skelAnime, 34.0f)) { + func_80078914(&this->actor.projectedPos, NA_SE_PL_WALK_GRASS); + } +} + +void EnXc_PlayLinkScreamSFX(EnXc* this, GlobalContext* globalCtx) { + if (globalCtx->csCtx.frames == 1455) { + func_800F3F3C(7); + } +} + +void EnXc_SetCrySFX(EnXc* this, GlobalContext* globalCtx) { + CutsceneContext* csCtx = &globalCtx->csCtx; + + if (csCtx->frames == 869) { + func_80078914(&this->actor.projectedPos, NA_SE_VO_SK_CRY_0); + } else if (csCtx->frames == 939) { + func_80078914(&this->actor.projectedPos, NA_SE_VO_SK_CRY_1); + } +} + +void func_80B406F8(Actor* thisx) { + EnXc* this = THIS; + + this->action = SHIEK_ACTION_NOCTURNE_INIT; + this->drawMode = SHIEK_DRAW_NOTHING; + this->actor.shape.shadowAlpha = 0; +} + +void EnXc_SetupIdleInNocturne(EnXc* this, GlobalContext* globalCtx) { + s32 pad; + ActorShape* actorShape = &this->actor.shape; + SkelAnime* skelAnime = &this->skelAnime; + f32 frameCount = Animation_GetLastFrame(&gShiekIdleAnim); + + func_80B3C9DC(this); + func_80B3C588(this, globalCtx, 4); + Animation_Change(skelAnime, &gShiekIdleAnim, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP, 0.0f); + this->action = SHIEK_ACTION_NOCTURNE_IDLE; + this->drawMode = SHIEK_DRAW_SQUINT; + actorShape->shadowAlpha = 255; +} + +void EnXc_SetupDefenseStance(Actor* thisx) { + EnXc* this = THIS; + SkelAnime* skelAnime = &this->skelAnime; + f32 frameCount = Animation_GetLastFrame(&gShiekDefenseStanceAnim); + + Animation_Change(skelAnime, &gShiekDefenseStanceAnim, 1.0f, 0.0f, frameCount, ANIMMODE_ONCE, -8.0f); + this->action = SHIEK_ACTION_DEFENSE_STANCE; + this->drawMode = SHIEK_DRAW_DEFAULT; +} + +void EnXc_SetupContortions(EnXc* this, GlobalContext* globalCtx) { + s32 pad; + SkelAnime* skelAnime = &this->skelAnime; + f32 frameCount = Animation_GetLastFrame(&gShiekIdleAnim); + + Animation_Change(skelAnime, &gShiekIdleAnim, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP, 0.0f); + func_80B3C588(this, globalCtx, 4); + func_80B3C964(this, globalCtx); + Animation_Change(skelAnime, &gShiekContortionsAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gShiekContortionsAnim), + ANIMMODE_ONCE, 0.0f); + this->action = SHIEK_ACTION_CONTORT; + this->drawMode = SHIEK_DRAW_DEFAULT; + this->actor.shape.shadowAlpha = 255; +} + +void EnXc_SetupFallInNocturne(EnXc* this, GlobalContext* globalCtx) { + s32 pad; + SkelAnime* skelAnime = &this->skelAnime; + f32 frameCount = Animation_GetLastFrame(&gShiekIdleAnim); + + Animation_Change(skelAnime, &gShiekIdleAnim, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP, 0.0f); + func_80B3C588(this, globalCtx, 4); + func_80B3C964(this, globalCtx); + Animation_Change(skelAnime, &gShiekFallingFromContortionsAnim, 1.0f, 0.0f, + Animation_GetLastFrame(&gShiekFallingFromContortionsAnim), ANIMMODE_ONCE, 0.0f); + this->action = SHIEK_ACTION_NOCTURNE_FALL; + this->drawMode = SHIEK_DRAW_DEFAULT; + this->actor.shape.shadowAlpha = 255; +} + +void EnXc_SetupHittingGroundInNocturne(EnXc* this, GlobalContext* globalCtx) { + s32 pad[3]; + f32 frameCount = Animation_GetLastFrame(&gShiekHittingGroundAnim); + + func_80B3C9DC(this); + func_80B3C588(this, globalCtx, 4); + Animation_Change(&this->skelAnime, &gShiekHittingGroundAnim, 1.0f, 0.0f, frameCount, ANIMMODE_ONCE, 0.0f); + this->action = SHIEK_ACTION_NOCTURNE_HIT_GROUND; + this->drawMode = SHIEK_DRAW_DEFAULT; + this->actor.shape.shadowAlpha = 255; +} + +void func_80B40A78(EnXc* this, GlobalContext* globalCtx) { + s32 pad[3]; + f32 frameCount = Animation_GetLastFrame(&gShiekHittingGroundAnim); + + func_80B3C9DC(this); + func_80B3C588(this, globalCtx, 4); + Animation_Change(&this->skelAnime, &gShiekHittingGroundAnim, 1.0f, 0.0f, frameCount, ANIMMODE_ONCE, 0.0f); + this->action = SHIEK_ACTION_63; + this->drawMode = SHIEK_DRAW_DEFAULT; + this->actor.shape.shadowAlpha = 255; +} + +void EnXc_SetupKneelInNocturne(EnXc* this, GlobalContext* globalCtx) { + s32 pad[3]; + f32 frameCount = Animation_GetLastFrame(&gShiekKneelingAnim); + + func_80B3C9DC(this); + func_80B3C588(this, globalCtx, 4); + Animation_Change(&this->skelAnime, &gShiekKneelingAnim, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP, 0.0f); + this->action = SHIEK_ACTION_NOCTURNE_KNEEL; + this->drawMode = SHIEK_DRAW_DEFAULT; + this->actor.shape.shadowAlpha = 255; +} + +void func_80B40BB4(EnXc* this, GlobalContext* globalCtx) { + s32 pad[3]; + f32 frameCount = Animation_GetLastFrame(&gShiekIdleAnim); + func_80B3C9DC(this); + func_80B3C588(this, globalCtx, 4); + Animation_Change(&this->skelAnime, &gShiekIdleAnim, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP, 0.0f); + this->action = SHIEK_ACTION_65; + this->drawMode = SHIEK_DRAW_DEFAULT; + this->actor.shape.shadowAlpha = 255; +} + +void func_80B40C50(EnXc* this) { + EnXc_CheckAndSetAction(this, SHIEK_ACTION_65, SHIEK_ACTION_66); +} + +void func_80B40C74(EnXc* this) { + EnXc_CheckAndSetAction(this, SHIEK_ACTION_66, SHIEK_ACTION_67); +} + +void func_80B40C98(EnXc* this) { + EnXc_CheckAndSetAction(this, SHIEK_ACTION_67, SHIEK_ACTION_68); +} + +void func_80B40CBC(EnXc* this) { + EnXc_CheckAndSetAction(this, SHIEK_ACTION_68, SHIEK_ACTION_69); +} + +void func_80B40CE0(EnXc* this) { + func_80B3C7D4(this, SHIEK_ACTION_69, SHIEK_ACTION_70, SHIEK_ACTION_68); +} + +void func_80B40D08(EnXc* this) { + EnXc_CheckAndSetAction(this, SHIEK_ACTION_70, SHIEK_ACTION_71); +} + +void func_80B40D2C(EnXc* this) { + EnXc_CheckAndSetAction(this, SHIEK_ACTION_71, SHIEK_ACTION_72); +} + +void func_80B40D50(EnXc* this) { + EnXc_CheckAndSetAction(this, SHIEK_ACTION_72, SHIEK_ACTION_NOCTURNE_REVERSE_ACCEL); +} + +void func_80B40D74(EnXc* this) { + EnXc_CheckAndSetAction(this, SHIEK_ACTION_NOCTURNE_REVERSE_ACCEL, SHIEK_ACTION_NOCTURNE_REVERSE_WALK); +} + +void EnXc_SetupReverseHaltInNocturneCS(EnXc* this) { + f32 xzDistToPlayer = this->actor.xzDistToPlayer; + + if (kREG(5) + 140.0f <= xzDistToPlayer) { + Animation_Change(&this->skelAnime, &gShiekIdleAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gShiekIdleAnim), + ANIMMODE_LOOP, -12.0f); + this->action = SHIEK_ACTION_NOCTURNE_REVERSE_HALT; + this->timer = 0.0f; + } +} + +void func_80B40E40(EnXc* this) { + EnXc_CheckAndSetAction(this, SHIEK_ACTION_NOCTURNE_REVERSE_HALT, SHIEK_ACTION_NOCTURNE_THROW_NUT); +} + +void func_80B40E64(EnXc* this) { + EnXc_CheckAndSetAction(this, SHIEK_ACTION_NOCTURNE_THROW_NUT, SHIEK_ACTION_77); +} + +void func_80B40E88(EnXc* this) { + EnXc_CheckAndSetAction(this, SHIEK_ACTION_77, SHIEK_ACTION_78); +} + +s32 EnXc_SetupNocturneState(Actor* thisx, GlobalContext* globalCtx) { + CsCmdActorAction* npcAction = EnXc_GetCsCmd(globalCtx, 4); + + if (npcAction != NULL) { + s32 action = npcAction->action; + EnXc* this = THIS; + s32 prevAction = this->unk_26C; + + if (action != prevAction) { + switch (action) { + case 1: + func_80B406F8(thisx); + break; + case 6: + EnXc_SetupIdleInNocturne(this, globalCtx); + break; + case 20: + EnXc_SetupDefenseStance(thisx); + break; + case 18: + EnXc_SetupContortions(this, globalCtx); + break; + case 14: + EnXc_SetupFallInNocturne(this, globalCtx); + break; + case 19: + EnXc_SetupHittingGroundInNocturne(this, globalCtx); + break; + case 15: + func_80B40A78(this, globalCtx); + break; + case 16: + EnXc_SetupKneelInNocturne(this, globalCtx); + break; + case 17: + func_80B40BB4(this, globalCtx); + break; + case 9: + Actor_Kill(thisx); + break; + default: + osSyncPrintf("En_Oa2_Stalker_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + break; + } + + this->unk_26C = action; + return 1; + } + } + return 0; +} + +void EnXc_InitialNocturneAction(EnXc* this, GlobalContext* globalCtx) { + EnXc_SetupNocturneState(&this->actor, globalCtx); +} + +void EnXc_IdleInNocturne(EnXc* this, GlobalContext* globalCtx) { + func_80B3C588(this, globalCtx, 4); + EnXc_AnimIsFinished(this); + EnXc_BgCheck(this, globalCtx); + EnXc_SetupNocturneState(&this->actor, globalCtx); +} + +void EnXc_DefenseStance(EnXc* this, GlobalContext* globalCtx) { + EnXc_AnimIsFinished(this); + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + EnXc_SetupNocturneState(&this->actor, globalCtx); +} + +void EnXc_Contort(EnXc* this, GlobalContext* globalCtx) { + EnXc_SetCrySFX(this, globalCtx); + EnXc_AnimIsFinished(this); + EnXc_SetEyePattern(this); + if (!EnXc_SetupNocturneState(&this->actor, globalCtx)) { + func_80B3C924(this, globalCtx); + EnXc_BgCheck(this, globalCtx); + } +} + +void EnXc_FallInNocturne(EnXc* this, GlobalContext* globalCtx) { + EnXc_AnimIsFinished(this); + EnXc_SetEyePattern(this); + EnXc_SetThrownAroundSFX(this); + if (!EnXc_SetupNocturneState(&this->actor, globalCtx)) { + func_80B3C8CC(this, globalCtx); + EnXc_BgCheck(this, globalCtx); + } +} + +void EnXc_HitGroundInNocturne(EnXc* this, GlobalContext* globalCtx) { + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + EnXc_SetupNocturneState(&this->actor, globalCtx); +} + +void EnXc_ActionFunc63(EnXc* this, GlobalContext* globalCtx) { + EnXc_AnimIsFinished(this); + EnXc_PlayLinkScreamSFX(this, globalCtx); + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + EnXc_SetupNocturneState(&this->actor, globalCtx); +} + +void EnXc_KneelInNocturneCS(EnXc* this, GlobalContext* globalCtx) { + EnXc_AnimIsFinished(this); + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + EnXc_SetupNocturneState(&this->actor, globalCtx); +} + +void EnXc_ActionFunc65(EnXc* this, GlobalContext* globalCtx) { + EnXc_ActionFunc6(this, globalCtx); + func_80B3C588(this, globalCtx, 4); + func_80B40C50(this); +} + +void EnXc_ActionFunc66(EnXc* this, GlobalContext* globalCtx) { + EnXc_ActionFunc7(this, globalCtx); + func_80B40C74(this); +} + +void EnXc_ActionFunc67(EnXc* this, GlobalContext* globalCtx) { + EnXc_ActionFunc8(this, globalCtx); + func_80B40C98(this); +} + +void EnXc_ActionFunc68(EnXc* this, GlobalContext* globalCtx) { + EnXc_ActionFunc9(this, globalCtx); + func_80B40CBC(this); +} + +void EnXc_ActionFunc69(EnXc* this, GlobalContext* globalCtx) { + EnXc_ActionFunc10(this, globalCtx); + func_80B40CE0(this); +} + +void EnXc_ActionFunc70(EnXc* this, GlobalContext* globalCtx) { + EnXc_ActionFunc11(this, globalCtx); + func_80B40D08(this); +} + +void EnXc_ActionFunc71(EnXc* this, GlobalContext* globalCtx) { + EnXc_ActionFunc12(this, globalCtx); + func_80B40D2C(this); +} + +void EnXc_ActionFunc72(EnXc* this, GlobalContext* globalCtx) { + EnXc_ActionFunc13(this, globalCtx); + func_80B40D50(this); +} + +void EnXc_ReverseAccelInNocturneCS(EnXc* this, GlobalContext* globalCtx) { + EnXc_ReverseAccelerate(this, globalCtx); + func_80B40D74(this); +} + +void EnXc_ReverseWalkInNocturneCS(EnXc* this, GlobalContext* globalCtx) { + func_80B3D710(this); + EnXc_AnimIsFinished(this); + EnXc_BgCheck(this, globalCtx); + EnXc_SetEyePattern(this); + EnXc_SetupReverseHaltInNocturneCS(this); +} + +void EnXc_ReverseHaltInNocturneCS(EnXc* this, GlobalContext* globalCtx) { + EnXc_HaltAndWaitToThrowNut(this, globalCtx); + func_80B40E40(this); +} + +void EnXc_ThrowNutInNocturneCS(EnXc* this, GlobalContext* globalCtx) { + EnXc_ThrowNut(this, globalCtx); + func_80B40E64(this); +} + +void EnXc_DeleteInNocturneCS(EnXc* this, GlobalContext* globalCtx) { + EnXc_Delete(this, globalCtx); + func_80B40E88(this); +} + +void EnXc_KillInNocturneCS(EnXc* this, GlobalContext* globalCtx) { + Actor_Kill(&this->actor); +} + +void EnXc_DrawSquintingEyes(Actor* thisx, GlobalContext* globalCtx) { + EnXc* this = THIS; + SkelAnime* skelAnime = &this->skelAnime; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + + OPEN_DISPS(gfxCtx, "../z_en_oA2_inStalker.c", 839); + func_80093D18(gfxCtx); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gShiekEyeSquintingTex)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(gShiekEyeSquintingTex)); + SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL, NULL, + NULL); + CLOSE_DISPS(gfxCtx, "../z_en_oA2_inStalker.c", 854); +} + +void EnXc_InitTempleOfTime(EnXc* this, GlobalContext* globalCtx) { + if (LINK_IS_ADULT) { + if (!(gSaveContext.eventChkInf[12] & 0x20)) { + gSaveContext.eventChkInf[12] |= 0x20; + globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(gFirstAdultCs); + gSaveContext.cutsceneTrigger = 1; + func_80B3EBF0(this, globalCtx); + } else if (!(gSaveContext.eventChkInf[5] & 0x20) && (gSaveContext.eventChkInf[4] & 0x100)) { + gSaveContext.eventChkInf[5] |= 0x20; + Item_Give(globalCtx, ITEM_SONG_PRELUDE); + globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(gPreludeCs); + gSaveContext.cutsceneTrigger = 1; + this->action = SHIEK_ACTION_30; + } else if (!(gSaveContext.eventChkInf[5] & 0x20)) { + func_80B3C9EC(this); + } else { + Actor_Kill(&this->actor); + } + } else { + Actor_Kill(&this->actor); + } +} + +void EnXc_SetupDialogueAction(EnXc* this, GlobalContext* globalCtx) { + if (func_8002F194(&this->actor, globalCtx)) { + this->action = SHIEK_ACTION_IN_DIALOGUE; + } else { + this->actor.flags |= 9; + if (INV_CONTENT(ITEM_HOOKSHOT) != ITEM_NONE) { + this->actor.textId = 0x7010; + } else { + this->actor.textId = 0x700F; + } + func_8002F2F4(&this->actor, globalCtx); + } +} + +void func_80B41798(EnXc* this, GlobalContext* globalCtx) { + if (func_8010BDBC(&globalCtx->msgCtx) == 2) { + this->action = SHIEK_ACTION_BLOCK_PEDESTAL; + this->actor.flags &= ~9; + } +} + +void EnXc_BlockingPedestalAction(EnXc* this, GlobalContext* globalCtx) { + EnXc_BgCheck(this, globalCtx); + EnXc_UpdateCollider(&this->actor, globalCtx); + EnXc_CalculateHeadTurn(this, globalCtx); + EnXc_AnimIsFinished(this); + EnXc_SetEyePattern(this); + EnXc_SetupDialogueAction(this, globalCtx); +} + +void EnXc_ActionFunc80(EnXc* this, GlobalContext* globalCtx) { + EnXc_BgCheck(this, globalCtx); + EnXc_UpdateCollider(&this->actor, globalCtx); + EnXc_CalculateHeadTurn(this, globalCtx); + EnXc_AnimIsFinished(this); + EnXc_SetEyePattern(this); + func_80B41798(this, globalCtx); +} + +static EnXcActionFunc sActionFuncs[] = { + EnXc_ActionFunc0, + EnXc_ActionFunc1, + EnXc_GracefulFall, + EnXc_Accelerate, + EnXc_Walk, + EnXc_Stopped, + EnXc_ActionFunc6, + EnXc_ActionFunc7, + EnXc_ActionFunc8, + EnXc_ActionFunc9, + EnXc_ActionFunc10, + EnXc_ActionFunc11, + EnXc_ActionFunc12, + EnXc_ActionFunc13, + EnXc_ReverseAccelerate, + EnXc_ActionFunc15, + EnXc_HaltAndWaitToThrowNut, + EnXc_ThrowNut, + EnXc_Delete, + EnXc_Fade, + EnXc_ActionFunc20, + EnXc_ActionFunc21, + EnXc_ActionFunc22, + EnXc_ActionFunc23, + EnXc_ActionFunc24, + EnXc_ActionFunc25, + EnXc_ActionFunc26, + EnXc_ActionFunc27, + EnXc_ActionFunc28, + EnXc_Serenade, + EnXc_ActionFunc30, + EnXc_ActionFunc31, + EnXc_ActionFunc32, + EnXc_ActionFunc33, + EnXc_ActionFunc34, + EnXc_ActionFunc35, + EnXc_ActionFunc36, + EnXc_ActionFunc37, + EnXc_ActionFunc38, + EnXc_ActionFunc39, + EnXc_ActionFunc40, + EnXc_ActionFunc41, + EnXc_ActionFunc42, + EnXc_ActionFunc43, + EnXc_ActionFunc44, + EnXc_ActionFunc45, + EnXc_ActionFunc46, + EnXc_ActionFunc47, + EnXc_ActionFunc48, + EnXc_ActionFunc49, + EnXc_Kneel, + EnXc_ActionFunc51, + EnXc_ActionFunc52, + EnXc_ActionFunc53, + EnXc_ActionFunc54, + EnXc_ShowTriforce, + EnXc_ShowTriforceIdle, + EnXc_InitialNocturneAction, + EnXc_IdleInNocturne, + EnXc_DefenseStance, + EnXc_Contort, + EnXc_FallInNocturne, + EnXc_HitGroundInNocturne, + EnXc_ActionFunc63, + EnXc_KneelInNocturneCS, + EnXc_ActionFunc65, + EnXc_ActionFunc66, + EnXc_ActionFunc67, + EnXc_ActionFunc68, + EnXc_ActionFunc69, + EnXc_ActionFunc70, + EnXc_ActionFunc71, + EnXc_ActionFunc72, + EnXc_ReverseAccelInNocturneCS, + EnXc_ReverseWalkInNocturneCS, + EnXc_ReverseHaltInNocturneCS, + EnXc_ThrowNutInNocturneCS, + EnXc_DeleteInNocturneCS, + EnXc_KillInNocturneCS, + EnXc_BlockingPedestalAction, + EnXc_ActionFunc80, +}; + +void EnXc_Update(Actor* thisx, GlobalContext* globalCtx) { + EnXc* this = THIS; + s32 action = this->action; + + if ((action < 0) || (action >= ARRAY_COUNT(sActionFuncs)) || (sActionFuncs[action] == NULL)) { + osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + } else { + sActionFuncs[action](this, globalCtx); + } +} + +void EnXc_Init(Actor* thisx, GlobalContext* globalCtx) { + EnXc* this = THIS; + + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gShiekSkel, &gShiekIdleAnim, this->jointTable, this->morphTable, + ARRAY_COUNT(this->jointTable)); + EnXc_InitCollider(thisx, globalCtx); + + switch (this->actor.params) { + case SHIEK_TYPE_1: + func_80B3EBF0(this, globalCtx); + break; + case SHIEK_TYPE_2: // Beta Serenade Cutscene or Learning Prelude + func_80B3EE64(this, globalCtx); + break; + case SHIEK_TYPE_3: + func_80B3F3C8(this, globalCtx); + break; + case SHIEK_TYPE_4: + func_80B3FA08(this, globalCtx); + break; + case SHIEK_TYPE_5: + func_80B40590(this, globalCtx); + break; + case SHIEK_TYPE_MINUET: + func_80B3CA38(this, globalCtx); + break; + case SHIEK_TYPE_BOLERO: + func_80B3CB58(this, globalCtx); + break; + case SHIEK_TYPE_SERENADE: + EnXc_SetupSerenadeAction(this, globalCtx); + break; + case SHIEK_TYPE_9: + EnXc_InitTempleOfTime(this, globalCtx); + break; + case SHIEK_TYPE_0: + EnXc_DoNothing(this, globalCtx); + break; + default: + osSyncPrintf(VT_FGCOL(RED) " En_Oa2 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + EnXc_DoNothing(this, globalCtx); + } +} + +s32 EnXc_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { + EnXc* this = THIS; + + if (this->unk_30C != 0) { + if (limbIndex == 9) { + rot->x += this->npcInfo.unk_0E.y; + rot->y -= this->npcInfo.unk_0E.x; + } else if (limbIndex == 16) { + rot->x += this->npcInfo.unk_08.y; + rot->z += this->npcInfo.unk_08.x; + } + } + return 0; +} + +void EnXc_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { + if (limbIndex == 16) { + EnXc* this = THIS; + Vec3f src = { 0.0f, 10.0f, 0.0f }; + Vec3f dest; + + Matrix_MultVec3f(&src, &dest); + this->actor.focus.pos.x = dest.x; + this->actor.focus.pos.y = dest.y; + this->actor.focus.pos.z = dest.z; + this->actor.focus.rot.x = this->actor.world.rot.x; + this->actor.focus.rot.y = this->actor.world.rot.y; + this->actor.focus.rot.z = this->actor.world.rot.z; + } +} + +void EnXc_DrawNothing(Actor* thisx, GlobalContext* globalCtx) { +} + +void EnXc_DrawDefault(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + EnXc* this = THIS; + s16 eyeIdx = this->eyeIdx; + u64* eyeSegment = sEyeTextures[eyeIdx]; + SkelAnime* skelAnime = &this->skelAnime; + GraphicsContext* localGfxCtx = globalCtx->state.gfxCtx; + GraphicsContext* gfxCtx = localGfxCtx; + + OPEN_DISPS(gfxCtx, "../z_en_oA2.c", 1164); + func_8002EBCC(&this->actor, globalCtx, 0); + func_80093D18(gfxCtx); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeSegment)); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(eyeSegment)); + SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, + EnXc_OverrideLimbDraw, EnXc_PostLimbDraw, this); + CLOSE_DISPS(gfxCtx, "../z_en_oA2.c", 1207); +} + +static EnXcDrawFunc sDrawFuncs[] = { + EnXc_DrawNothing, EnXc_DrawDefault, EnXc_DrawPullingOutHarp, + EnXc_DrawHarp, EnXc_DrawTriforce, EnXc_DrawSquintingEyes, +}; + +void EnXc_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnXc* this = THIS; + + if (this->drawMode < 0 || this->drawMode > 5 || sDrawFuncs[this->drawMode] == NULL) { + // "DRAW MODE IS ABNORMAL!!!!!!!!!!!!!!!!!!!!!!!!!" + osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + } else { + sDrawFuncs[this->drawMode](thisx, globalCtx); + } +} + +const ActorInit En_Xc_InitVars = { + ACTOR_EN_XC, + ACTORCAT_NPC, + FLAGS, + OBJECT_XC, + sizeof(EnXc), + (ActorFunc)EnXc_Init, + (ActorFunc)EnXc_Destroy, + (ActorFunc)EnXc_Update, + (ActorFunc)EnXc_Draw, +}; diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.h b/src/overlays/actors/ovl_En_Xc/z_en_xc.h index 65b94bb6ba..89fe198580 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.h +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.h @@ -6,9 +6,140 @@ struct EnXc; +typedef void (*EnXcActionFunc)(struct EnXc*, GlobalContext*); +typedef void (*EnXcDrawFunc)(struct Actor*, GlobalContext*); + +typedef enum { + /* 0 */ SHIEK_TYPE_0, + /* 1 */ SHIEK_TYPE_1, + /* 2 */ SHIEK_TYPE_2, + /* 3 */ SHIEK_TYPE_3, + /* 4 */ SHIEK_TYPE_4, + /* 5 */ SHIEK_TYPE_5, + /* 6 */ SHIEK_TYPE_MINUET, + /* 7 */ SHIEK_TYPE_BOLERO, + /* 8 */ SHIEK_TYPE_SERENADE, + /* 9 */ SHIEK_TYPE_9 +} EnXcType; + +typedef enum { + /* 0 */ SHIEK_DRAW_NOTHING, + /* 1 */ SHIEK_DRAW_DEFAULT, + /* 2 */ SHIEK_DRAW_PULLING_OUT_HARP, + /* 3 */ SHIEK_DRAW_HARP, + /* 4 */ SHIEK_DRAW_TRIFORCE, + /* 5 */ SHIEK_DRAW_SQUINT +} EnXcDrawMode; + +typedef enum { + /* 00 */ SHIEK_ACTION_INIT, + /* 01 */ SHIEK_ACTION_WAIT, + /* 02 */ SHIEK_ACTION_GRACEFUL_FALL, + /* 03 */ SHIEK_ACTION_ACCEL, + /* 04 */ SHIEK_ACTION_WALK, + /* 05 */ SHIEK_ACTION_HALT, + /* 06 */ SHIEK_ACTION_STOPPED, + /* 07 */ SHIEK_ACTION_7, + /* 08 */ SHIEK_ACTION_HARP_READY, + /* 09 */ SHIEK_PLAYING_HARP, + /* 10 */ SHIEK_ACTION_10, + /* 11 */ SHIEK_ACTION_PUT_HARP_AWAY, + /* 12 */ SHIEK_ACTION_12, + /* 13 */ SHIEK_ACTION_13, + /* 14 */ SHIEK_ACTION_REVERSE_ACCEL, + /* 15 */ SHIEK_ACTION_REVERSE_WALK, + /* 16 */ SHIEK_ACTION_REVERSE_HALT, + /* 17 */ SHIEK_ACTION_THROW_NUT, + /* 18 */ SHIEK_ACTION_DELETE, + /* 19 */ SHIEK_ACTION_FADE, + /* 20 */ SHIEK_ACTION_20, + /* 21 */ SHIEK_ACTION_21, + /* 22 */ SHIEK_ACTION_22, + /* 23 */ SHIEK_ACTION_23, + /* 24 */ SHIEK_ACTION_24, + /* 25 */ SHIEK_ACTION_25, + /* 26 */ SHIEK_ACTION_26, + /* 27 */ SHIEK_ACTION_27, + /* 28 */ SHIEK_ACTION_28, + /* 29 */ SHIEK_ACTION_SERENADE, + /* 30 */ SHIEK_ACTION_30, + /* 31 */ SHIEK_ACTION_31, + /* 32 */ SHIEK_ACTION_32, + /* 33 */ SHIEK_ACTION_33, + /* 34 */ SHIEK_ACTION_34, + /* 35 */ SHIEK_ACTION_35, + /* 36 */ SHIEK_ACTION_36, + /* 37 */ SHIEK_ACTION_37, + /* 38 */ SHIEK_ACTION_38, + /* 39 */ SHIEK_ACTION_39, + /* 40 */ SHIEK_ACTION_40, + /* 41 */ SHIEK_ACTION_41, + /* 42 */ SHIEK_ACTION_42, + /* 43 */ SHIEK_ACTION_43, + /* 44 */ SHIEK_ACTION_44, + /* 45 */ SHIEK_ACTION_45, + /* 46 */ SHIEK_ACTION_46, + /* 47 */ SHIEK_ACTION_47, + /* 48 */ SHIEK_ACTION_48, + /* 49 */ SHIEK_ACTION_49, + /* 50 */ SHIEK_SHIEK_KNEEL, + /* 51 */ SHIEK_ACTION_51, + /* 52 */ SHIEK_ACTION_52, + /* 53 */ SHIEK_ACTION_53, + /* 54 */ SHIEK_ACTION_54, + /* 55 */ SHIEK_ACTION_SHOW_TRIFORCE, + /* 56 */ SHIEK_ACTION_SHOW_TRIFORCE_IDLE, + /* 57 */ SHIEK_ACTION_NOCTURNE_INIT, + /* 58 */ SHIEK_ACTION_NOCTURNE_IDLE, + /* 59 */ SHIEK_ACTION_DEFENSE_STANCE, + /* 60 */ SHIEK_ACTION_CONTORT, + /* 61 */ SHIEK_ACTION_NOCTURNE_FALL, + /* 62 */ SHIEK_ACTION_NOCTURNE_HIT_GROUND, + /* 63 */ SHIEK_ACTION_63, + /* 64 */ SHIEK_ACTION_NOCTURNE_KNEEL, + /* 65 */ SHIEK_ACTION_65, + /* 66 */ SHIEK_ACTION_66, + /* 67 */ SHIEK_ACTION_67, + /* 68 */ SHIEK_ACTION_68, + /* 69 */ SHIEK_ACTION_69, + /* 70 */ SHIEK_ACTION_70, + /* 71 */ SHIEK_ACTION_71, + /* 72 */ SHIEK_ACTION_72, + /* 73 */ SHIEK_ACTION_NOCTURNE_REVERSE_ACCEL, + /* 74 */ SHIEK_ACTION_NOCTURNE_REVERSE_WALK, + /* 75 */ SHIEK_ACTION_NOCTURNE_REVERSE_HALT, + /* 76 */ SHIEK_ACTION_NOCTURNE_THROW_NUT, + /* 77 */ SHIEK_ACTION_77, + /* 78 */ SHIEK_ACTION_78, + /* 79 */ SHIEK_ACTION_BLOCK_PEDESTAL, + /* 80 */ SHIEK_ACTION_IN_DIALOGUE +} EnXcAction; + typedef struct EnXc { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x1F0]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ Vec3s jointTable[17]; + /* 0x01F6 */ Vec3s morphTable[17]; + /* 0x025C */ s16 eyeIdx; + /* 0x025E */ s16 blinkTimer; + /* 0x0260 */ s32 action; + /* 0x0264 */ s32 drawMode; + /* 0x0268 */ f32 timer; + /* 0x026C */ s32 unk_26C; + /* 0x0270 */ s32 unk_270; // some sort of flag + /* 0x0274 */ s32 unk_274; + /* 0x0278 */ s32 triforcePrimColor[4]; + /* 0x0288 */ s32 triforceEnvColor[4]; + /* 0x0298 */ f32 triforceScale[3]; + /* 0x02A4 */ s16 triforceAngle; + /* 0x02A8 */ s32 unk_2A8; // sound related + /* 0x02AC */ s32 unk_2AC; // sound related + /* 0x02B0 */ Vec3f handPos; + /* 0x02BC */ s32 unk_2BC; // hand pos related + /* 0x02C0 */ ColliderCylinder collider; + /* 0x030C */ s32 unk_30C; + /* 0x0310 */ Actor* flameActor; + /* 0x0314 */ struct_80034A14_arg1 npcInfo; } EnXc; // size = 0x033C extern const ActorInit En_Xc_InitVars; diff --git a/undefined_syms.txt b/undefined_syms.txt index fb649c4c3e..07a8573d3c 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -2362,38 +2362,6 @@ D_0600A4AC = 0x0600A4AC; // z_en_wood02 D_06000700 = 0x06000700; -// z_en_xc -D_02000330 = 0x02000330; -D_02003F80 = 0x02003F80; -D_020045D0 = 0x020045D0; -D_020046F0 = 0x020046F0; -D_02006D20 = 0x02006D20; -D_06000B6C = 0x06000B6C; -D_06001A08 = 0x06001A08; -D_06001D14 = 0x06001D14; -D_0600289C = 0x0600289C; -D_060035C8 = 0x060035C8; -D_06004570 = 0x06004570; -D_06004828 = 0x06004828; -D_060058C0 = 0x060058C0; -D_06011150 = 0x06011150; -D_06011620 = 0x06011620; -D_06012970 = 0x06012970; -D_06012AF0 = 0x06012AF0; -D_06012FD0 = 0x06012FD0; -D_06013AA4 = 0x06013AA4; -D_060149E4 = 0x060149E4; -D_060169E8 = 0x060169E8; -D_060177F8 = 0x060177F8; -D_06017C54 = 0x06017C54; -D_06018B00 = 0x06018B00; -D_06019598 = 0x06019598; -D_06019C30 = 0x06019C30; -D_06019F78 = 0x06019F78; -D_0601A048 = 0x0601A048; -D_0601B19C = 0x0601B19C; -D_0601C0E8 = 0x0601C0E8; - // z_en_zf D_06006690 = 0x06006690; D_06008138 = 0x06008138;