diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Destroy.s deleted file mode 100644 index 1ff0adf344..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Destroy.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel EnRu2_Destroy -/* 00090 80AF25E0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00094 80AF25E4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00098 80AF25E8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0009C 80AF25EC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000A0 80AF25F0 0C0170EB */ jal ActorCollider_FreeCylinder - -/* 000A4 80AF25F4 24C502C8 */ addiu $a1, $a2, 0x02C8 ## $a1 = 000002C8 -/* 000A8 80AF25F8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000AC 80AF25FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000B0 80AF2600 03E00008 */ jr $ra -/* 000B4 80AF2604 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Draw.s deleted file mode 100644 index 661f6538fc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Draw.s +++ /dev/null @@ -1,37 +0,0 @@ -.rdata - -glabel D_80AF5244 - .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.text - -glabel EnRu2_Draw -/* 01B34 80AF4084 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01B38 80AF4088 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01B3C 80AF408C 8C8202AC */ lw $v0, 0x02AC($a0) ## 000002AC -/* 01B40 80AF4090 04400008 */ bltz $v0, .L80AF40B4 -/* 01B44 80AF4094 28410003 */ slti $at, $v0, 0x0003 -/* 01B48 80AF4098 10200006 */ beq $at, $zero, .L80AF40B4 -/* 01B4C 80AF409C 00027080 */ sll $t6, $v0, 2 -/* 01B50 80AF40A0 3C0380AF */ lui $v1, %hi(D_80AF510C) ## $v1 = 80AF0000 -/* 01B54 80AF40A4 006E1821 */ addu $v1, $v1, $t6 -/* 01B58 80AF40A8 8C63510C */ lw $v1, %lo(D_80AF510C)($v1) -/* 01B5C 80AF40AC 14600006 */ bne $v1, $zero, .L80AF40C8 -/* 01B60 80AF40B0 00000000 */ nop -.L80AF40B4: -/* 01B64 80AF40B4 3C0480AF */ lui $a0, %hi(D_80AF5244) ## $a0 = 80AF0000 -/* 01B68 80AF40B8 0C00084C */ jal osSyncPrintf - -/* 01B6C 80AF40BC 24845244 */ addiu $a0, $a0, %lo(D_80AF5244) ## $a0 = 80AF5244 -/* 01B70 80AF40C0 10000004 */ beq $zero, $zero, .L80AF40D4 -/* 01B74 80AF40C4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF40C8: -/* 01B78 80AF40C8 0060F809 */ jalr $ra, $v1 -/* 01B7C 80AF40CC 00000000 */ nop -/* 01B80 80AF40D0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF40D4: -/* 01B84 80AF40D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01B88 80AF40D8 03E00008 */ jr $ra -/* 01B8C 80AF40DC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Init.s deleted file mode 100644 index 2aa966820b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Init.s +++ /dev/null @@ -1,71 +0,0 @@ -glabel EnRu2_Init -/* 018CC 80AF3E1C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 018D0 80AF3E20 AFB10028 */ sw $s1, 0x0028($sp) -/* 018D4 80AF3E24 AFB00024 */ sw $s0, 0x0024($sp) -/* 018D8 80AF3E28 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 018DC 80AF3E2C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 018E0 80AF3E30 AFBF002C */ sw $ra, 0x002C($sp) -/* 018E4 80AF3E34 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 018E8 80AF3E38 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC -/* 018EC 80AF3E3C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 018F0 80AF3E40 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 018F4 80AF3E44 0C00AC78 */ jal ActorShape_Init - -/* 018F8 80AF3E48 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 018FC 80AF3E4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01900 80AF3E50 0C2BC954 */ jal func_80AF2550 -/* 01904 80AF3E54 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01908 80AF3E58 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 0190C 80AF3E5C 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 -/* 01910 80AF3E60 260F021A */ addiu $t7, $s0, 0x021A ## $t7 = 0000021A -/* 01914 80AF3E64 24180017 */ addiu $t8, $zero, 0x0017 ## $t8 = 00000017 -/* 01918 80AF3E68 AFB80018 */ sw $t8, 0x0018($sp) -/* 0191C 80AF3E6C AFAF0014 */ sw $t7, 0x0014($sp) -/* 01920 80AF3E70 AFAE0010 */ sw $t6, 0x0010($sp) -/* 01924 80AF3E74 24C6C700 */ addiu $a2, $a2, 0xC700 ## $a2 = 0600C700 -/* 01928 80AF3E78 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0192C 80AF3E7C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 01930 80AF3E80 0C0291BE */ jal func_800A46F8 -/* 01934 80AF3E84 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01938 80AF3E88 0C2BC9A8 */ jal func_80AF26A0 -/* 0193C 80AF3E8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01940 80AF3E90 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01944 80AF3E94 10410009 */ beq $v0, $at, .L80AF3EBC -/* 01948 80AF3E98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0194C 80AF3E9C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01950 80AF3EA0 1041000A */ beq $v0, $at, .L80AF3ECC -/* 01954 80AF3EA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01958 80AF3EA8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0195C 80AF3EAC 1041000B */ beq $v0, $at, .L80AF3EDC -/* 01960 80AF3EB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01964 80AF3EB4 1000000D */ beq $zero, $zero, .L80AF3EEC -/* 01968 80AF3EB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AF3EBC: -/* 0196C 80AF3EBC 0C2BCB87 */ jal func_80AF2E1C -/* 01970 80AF3EC0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01974 80AF3EC4 1000000C */ beq $zero, $zero, .L80AF3EF8 -/* 01978 80AF3EC8 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -.L80AF3ECC: -/* 0197C 80AF3ECC 0C2BCCE5 */ jal func_80AF3394 -/* 01980 80AF3ED0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01984 80AF3ED4 10000008 */ beq $zero, $zero, .L80AF3EF8 -/* 01988 80AF3ED8 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -.L80AF3EDC: -/* 0198C 80AF3EDC 0C2BCDD1 */ jal func_80AF3744 -/* 01990 80AF3EE0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01994 80AF3EE4 10000004 */ beq $zero, $zero, .L80AF3EF8 -/* 01998 80AF3EE8 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -.L80AF3EEC: -/* 0199C 80AF3EEC 0C2BCA65 */ jal func_80AF2994 -/* 019A0 80AF3EF0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 019A4 80AF3EF4 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -.L80AF3EF8: -/* 019A8 80AF3EF8 A20002C2 */ sb $zero, 0x02C2($s0) ## 000002C2 -/* 019AC 80AF3EFC A21902C3 */ sb $t9, 0x02C3($s0) ## 000002C3 -/* 019B0 80AF3F00 8FBF002C */ lw $ra, 0x002C($sp) -/* 019B4 80AF3F04 8FB10028 */ lw $s1, 0x0028($sp) -/* 019B8 80AF3F08 8FB00024 */ lw $s0, 0x0024($sp) -/* 019BC 80AF3F0C 03E00008 */ jr $ra -/* 019C0 80AF3F10 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Update.s deleted file mode 100644 index ecacef7611..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Update.s +++ /dev/null @@ -1,38 +0,0 @@ -.rdata - -glabel D_80AF51E8 - .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.text - -glabel EnRu2_Update -/* 01870 80AF3DC0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01874 80AF3DC4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01878 80AF3DC8 8C8202A8 */ lw $v0, 0x02A8($a0) ## 000002A8 -/* 0187C 80AF3DCC 04400008 */ bltz $v0, .L80AF3DF0 -/* 01880 80AF3DD0 28410014 */ slti $at, $v0, 0x0014 -/* 01884 80AF3DD4 10200006 */ beq $at, $zero, .L80AF3DF0 -/* 01888 80AF3DD8 00027080 */ sll $t6, $v0, 2 -/* 0188C 80AF3DDC 3C0380AF */ lui $v1, %hi(D_80AF50BC) ## $v1 = 80AF0000 -/* 01890 80AF3DE0 006E1821 */ addu $v1, $v1, $t6 -/* 01894 80AF3DE4 8C6350BC */ lw $v1, %lo(D_80AF50BC)($v1) -/* 01898 80AF3DE8 14600006 */ bne $v1, $zero, .L80AF3E04 -/* 0189C 80AF3DEC 00000000 */ nop -.L80AF3DF0: -/* 018A0 80AF3DF0 3C0480AF */ lui $a0, %hi(D_80AF51E8) ## $a0 = 80AF0000 -/* 018A4 80AF3DF4 0C00084C */ jal osSyncPrintf - -/* 018A8 80AF3DF8 248451E8 */ addiu $a0, $a0, %lo(D_80AF51E8) ## $a0 = 80AF51E8 -/* 018AC 80AF3DFC 10000004 */ beq $zero, $zero, .L80AF3E10 -/* 018B0 80AF3E00 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF3E04: -/* 018B4 80AF3E04 0060F809 */ jalr $ra, $v1 -/* 018B8 80AF3E08 00000000 */ nop -/* 018BC 80AF3E0C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF3E10: -/* 018C0 80AF3E10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018C4 80AF3E14 03E00008 */ jr $ra -/* 018C8 80AF3E18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2550.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2550.s deleted file mode 100644 index f212f997ab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2550.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80AF2550 -/* 00000 80AF2550 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00004 80AF2554 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00008 80AF2558 AFA50024 */ sw $a1, 0x0024($sp) -/* 0000C 80AF255C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00010 80AF2560 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00014 80AF2564 24C502C8 */ addiu $a1, $a2, 0x02C8 ## $a1 = 000002C8 -/* 00018 80AF2568 AFA50018 */ sw $a1, 0x0018($sp) -/* 0001C 80AF256C 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00020 80AF2570 AFA60020 */ sw $a2, 0x0020($sp) -/* 00024 80AF2574 3C0780AF */ lui $a3, %hi(D_80AF40E0) ## $a3 = 80AF0000 -/* 00028 80AF2578 8FA50018 */ lw $a1, 0x0018($sp) -/* 0002C 80AF257C 8FA60020 */ lw $a2, 0x0020($sp) -/* 00030 80AF2580 24E740E0 */ addiu $a3, $a3, %lo(D_80AF40E0) ## $a3 = 80AF40E0 -/* 00034 80AF2584 0C017114 */ jal func_8005C450 -/* 00038 80AF2588 8FA40024 */ lw $a0, 0x0024($sp) -/* 0003C 80AF258C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00040 80AF2590 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00044 80AF2594 03E00008 */ jr $ra -/* 00048 80AF2598 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF259C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF259C.s deleted file mode 100644 index 3d1d77a6b1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF259C.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80AF259C -/* 0004C 80AF259C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00050 80AF25A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00054 80AF25A4 AFA50034 */ sw $a1, 0x0034($sp) -/* 00058 80AF25A8 248602C8 */ addiu $a2, $a0, 0x02C8 ## $a2 = 000002C8 -/* 0005C 80AF25AC 00C02825 */ or $a1, $a2, $zero ## $a1 = 000002C8 -/* 00060 80AF25B0 0C0189B7 */ jal ActorCollider_Cylinder_Update - -/* 00064 80AF25B4 AFA60018 */ sw $a2, 0x0018($sp) -/* 00068 80AF25B8 8FA40034 */ lw $a0, 0x0034($sp) -/* 0006C 80AF25BC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00070 80AF25C0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00074 80AF25C4 8FA60018 */ lw $a2, 0x0018($sp) -/* 00078 80AF25C8 0C01767D */ jal Actor_CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 0007C 80AF25CC 00812821 */ addu $a1, $a0, $at -/* 00080 80AF25D0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00084 80AF25D4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00088 80AF25D8 03E00008 */ jr $ra -/* 0008C 80AF25DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2608.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2608.s deleted file mode 100644 index 689b173d4f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2608.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80AF2608 -/* 000B8 80AF2608 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 000BC 80AF260C AFBF0014 */ sw $ra, 0x0014($sp) -/* 000C0 80AF2610 848E02A6 */ lh $t6, 0x02A6($a0) ## 000002A6 -/* 000C4 80AF2614 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 000C8 80AF2618 24C302A6 */ addiu $v1, $a2, 0x02A6 ## $v1 = 000002A6 -/* 000CC 80AF261C 15C00003 */ bne $t6, $zero, .L80AF262C -/* 000D0 80AF2620 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 000D4 80AF2624 10000005 */ beq $zero, $zero, .L80AF263C -/* 000D8 80AF2628 248302A6 */ addiu $v1, $a0, 0x02A6 ## $v1 = 000002A6 -.L80AF262C: -/* 000DC 80AF262C 846F0000 */ lh $t7, 0x0000($v1) ## 000002A6 -/* 000E0 80AF2630 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 000E4 80AF2634 A4780000 */ sh $t8, 0x0000($v1) ## 000002A6 -/* 000E8 80AF2638 84620000 */ lh $v0, 0x0000($v1) ## 000002A6 -.L80AF263C: -/* 000EC 80AF263C 14400008 */ bne $v0, $zero, .L80AF2660 -/* 000F0 80AF2640 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 000F4 80AF2644 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 000F8 80AF2648 AFA3001C */ sw $v1, 0x001C($sp) -/* 000FC 80AF264C 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00100 80AF2650 AFA60038 */ sw $a2, 0x0038($sp) -/* 00104 80AF2654 8FA3001C */ lw $v1, 0x001C($sp) -/* 00108 80AF2658 8FA60038 */ lw $a2, 0x0038($sp) -/* 0010C 80AF265C A4620000 */ sh $v0, 0x0000($v1) ## 00000000 -.L80AF2660: -/* 00110 80AF2660 84790000 */ lh $t9, 0x0000($v1) ## 00000000 -/* 00114 80AF2664 24C202A4 */ addiu $v0, $a2, 0x02A4 ## $v0 = 000002A4 -/* 00118 80AF2668 A4590000 */ sh $t9, 0x0000($v0) ## 000002A4 -/* 0011C 80AF266C 84480000 */ lh $t0, 0x0000($v0) ## 000002A4 -/* 00120 80AF2670 29010003 */ slti $at, $t0, 0x0003 -/* 00124 80AF2674 54200003 */ bnel $at, $zero, .L80AF2684 -/* 00128 80AF2678 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0012C 80AF267C A4400000 */ sh $zero, 0x0000($v0) ## 000002A4 -/* 00130 80AF2680 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF2684: -/* 00134 80AF2684 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00138 80AF2688 03E00008 */ jr $ra -/* 0013C 80AF268C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2690.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2690.s deleted file mode 100644 index e35fb3ef0d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2690.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_80AF2690 -/* 00140 80AF2690 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 00144 80AF2694 00031A03 */ sra $v1, $v1, 8 -/* 00148 80AF2698 03E00008 */ jr $ra -/* 0014C 80AF269C 306200FF */ andi $v0, $v1, 0x00FF ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26A0.s deleted file mode 100644 index ac6cdd053e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26A0.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80AF26A0 -/* 00150 80AF26A0 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 00154 80AF26A4 03E00008 */ jr $ra -/* 00158 80AF26A8 306200FF */ andi $v0, $v1, 0x00FF ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26AC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26AC.s deleted file mode 100644 index fde59c5635..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26AC.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80AF26AC -/* 0015C 80AF26AC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00160 80AF26B0 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 00164 80AF26B4 AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 00168 80AF26B8 AC8002AC */ sw $zero, 0x02AC($a0) ## 000002AC -/* 0016C 80AF26BC AC8002B4 */ sw $zero, 0x02B4($a0) ## 000002B4 -/* 00170 80AF26C0 AC8002B8 */ sw $zero, 0x02B8($a0) ## 000002B8 -/* 00174 80AF26C4 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -/* 00178 80AF26C8 03E00008 */ jr $ra -/* 0017C 80AF26CC E48402B0 */ swc1 $f4, 0x02B0($a0) ## 000002B0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26D0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26D0.s deleted file mode 100644 index 1c75801b74..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26D0.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80AF26D0 -/* 00180 80AF26D0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00184 80AF26D4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00188 80AF26D8 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 0018C 80AF26DC 3C0F80AF */ lui $t7, %hi(D_80AF4118) ## $t7 = 80AF0000 -/* 00190 80AF26E0 3C1980AF */ lui $t9, %hi(D_80AF4118) ## $t9 = 80AF0000 -/* 00194 80AF26E4 15C0000D */ bne $t6, $zero, .L80AF271C -/* 00198 80AF26E8 00000000 */ nop -/* 0019C 80AF26EC 8DEF4118 */ lw $t7, %lo(D_80AF4118)($t7) -/* 001A0 80AF26F0 51E00011 */ beql $t7, $zero, .L80AF2738 -/* 001A4 80AF26F4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001A8 80AF26F8 8498001C */ lh $t8, 0x001C($a0) ## 0000001C -/* 001AC 80AF26FC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 001B0 80AF2700 17010003 */ bne $t8, $at, .L80AF2710 -/* 001B4 80AF2704 00000000 */ nop -/* 001B8 80AF2708 0C2BC9AB */ jal func_80AF26AC -/* 001BC 80AF270C 00000000 */ nop -.L80AF2710: -/* 001C0 80AF2710 3C0180AF */ lui $at, %hi(D_80AF4118) ## $at = 80AF0000 -/* 001C4 80AF2714 10000007 */ beq $zero, $zero, .L80AF2734 -/* 001C8 80AF2718 AC204118 */ sw $zero, %lo(D_80AF4118)($at) -.L80AF271C: -/* 001CC 80AF271C 8F394118 */ lw $t9, %lo(D_80AF4118)($t9) -/* 001D0 80AF2720 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 001D4 80AF2724 3C0180AF */ lui $at, %hi(D_80AF4118) ## $at = 80AF0000 -/* 001D8 80AF2728 57200003 */ bnel $t9, $zero, .L80AF2738 -/* 001DC 80AF272C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001E0 80AF2730 AC284118 */ sw $t0, %lo(D_80AF4118)($at) -.L80AF2734: -/* 001E4 80AF2734 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF2738: -/* 001E8 80AF2738 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001EC 80AF273C 03E00008 */ jr $ra -/* 001F0 80AF2740 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2744.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2744.s deleted file mode 100644 index 34e34f9d32..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2744.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80AF2744 -/* 001F4 80AF2744 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 001F8 80AF2748 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 001FC 80AF274C 44810000 */ mtc1 $at, $f0 ## $f0 = 30.00 -/* 00200 80AF2750 AFA50024 */ sw $a1, 0x0024($sp) -/* 00204 80AF2754 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00208 80AF2758 AFBF001C */ sw $ra, 0x001C($sp) -/* 0020C 80AF275C AFA40020 */ sw $a0, 0x0020($sp) -/* 00210 80AF2760 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 00214 80AF2764 44070000 */ mfc1 $a3, $f0 -/* 00218 80AF2768 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0021C 80AF276C 8FA40024 */ lw $a0, 0x0024($sp) -/* 00220 80AF2770 3C064296 */ lui $a2, 0x4296 ## $a2 = 42960000 -/* 00224 80AF2774 0C00B92D */ jal func_8002E4B4 -/* 00228 80AF2778 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 0022C 80AF277C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00230 80AF2780 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00234 80AF2784 03E00008 */ jr $ra -/* 00238 80AF2788 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF278C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF278C.s deleted file mode 100644 index 5d835e03d0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF278C.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80AF278C -/* 0023C 80AF278C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00240 80AF2790 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00244 80AF2794 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00248 80AF2798 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0024C 80AF279C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00250 80AF27A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00254 80AF27A4 03E00008 */ jr $ra -/* 00258 80AF27A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF27AC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF27AC.s deleted file mode 100644 index fc14a3d230..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF27AC.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80AF27AC -/* 0025C 80AF27AC 908E1D6C */ lbu $t6, 0x1D6C($a0) ## 00001D6C -/* 00260 80AF27B0 00057880 */ sll $t7, $a1, 2 -/* 00264 80AF27B4 008FC021 */ addu $t8, $a0, $t7 -/* 00268 80AF27B8 11C00003 */ beq $t6, $zero, .L80AF27C8 -/* 0026C 80AF27BC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00270 80AF27C0 03E00008 */ jr $ra -/* 00274 80AF27C4 8F021D8C */ lw $v0, 0x1D8C($t8) ## 00001D8C -.L80AF27C8: -/* 00278 80AF27C8 03E00008 */ jr $ra -/* 0027C 80AF27CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF27D0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF27D0.s deleted file mode 100644 index 79024f5ba2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF27D0.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80AF27D0 -/* 00280 80AF27D0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00284 80AF27D4 AFA40018 */ sw $a0, 0x0018($sp) -/* 00288 80AF27D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0028C 80AF27DC AFA5001C */ sw $a1, 0x001C($sp) -/* 00290 80AF27E0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00294 80AF27E4 AFA60020 */ sw $a2, 0x0020($sp) -/* 00298 80AF27E8 0C2BC9EB */ jal func_80AF27AC -/* 0029C 80AF27EC 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 002A0 80AF27F0 10400007 */ beq $v0, $zero, .L80AF2810 -/* 002A4 80AF27F4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002A8 80AF27F8 97AE0022 */ lhu $t6, 0x0022($sp) -/* 002AC 80AF27FC 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 002B0 80AF2800 55CF0004 */ bnel $t6, $t7, .L80AF2814 -/* 002B4 80AF2804 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 002B8 80AF2808 10000002 */ beq $zero, $zero, .L80AF2814 -/* 002BC 80AF280C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AF2810: -/* 002C0 80AF2810 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AF2814: -/* 002C4 80AF2814 03E00008 */ jr $ra -/* 002C8 80AF2818 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF281C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF281C.s deleted file mode 100644 index 383bf66480..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF281C.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80AF281C -/* 002CC 80AF281C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002D0 80AF2820 AFA40018 */ sw $a0, 0x0018($sp) -/* 002D4 80AF2824 AFBF0014 */ sw $ra, 0x0014($sp) -/* 002D8 80AF2828 AFA5001C */ sw $a1, 0x001C($sp) -/* 002DC 80AF282C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002E0 80AF2830 AFA60020 */ sw $a2, 0x0020($sp) -/* 002E4 80AF2834 0C2BC9EB */ jal func_80AF27AC -/* 002E8 80AF2838 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 002EC 80AF283C 10400007 */ beq $v0, $zero, .L80AF285C -/* 002F0 80AF2840 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002F4 80AF2844 97AE0022 */ lhu $t6, 0x0022($sp) -/* 002F8 80AF2848 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 002FC 80AF284C 51CF0004 */ beql $t6, $t7, .L80AF2860 -/* 00300 80AF2850 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00304 80AF2854 10000002 */ beq $zero, $zero, .L80AF2860 -/* 00308 80AF2858 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AF285C: -/* 0030C 80AF285C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AF2860: -/* 00310 80AF2860 03E00008 */ jr $ra -/* 00314 80AF2864 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2868.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2868.s deleted file mode 100644 index 9fc4706ad8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2868.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80AF2868 -/* 00318 80AF2868 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0031C 80AF286C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00320 80AF2870 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00324 80AF2874 AFA5001C */ sw $a1, 0x001C($sp) -/* 00328 80AF2878 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0032C 80AF287C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 00330 80AF2880 0C2BC9EB */ jal func_80AF27AC -/* 00334 80AF2884 AFA70018 */ sw $a3, 0x0018($sp) -/* 00338 80AF2888 10400013 */ beq $v0, $zero, .L80AF28D8 -/* 0033C 80AF288C 8FA70018 */ lw $a3, 0x0018($sp) -/* 00340 80AF2890 8C4E000C */ lw $t6, 0x000C($v0) ## 0000000C -/* 00344 80AF2894 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00348 80AF2898 00000000 */ nop -/* 0034C 80AF289C 468021A0 */ cvt.s.w $f6, $f4 -/* 00350 80AF28A0 E4E60024 */ swc1 $f6, 0x0024($a3) ## 00000024 -/* 00354 80AF28A4 8C4F0010 */ lw $t7, 0x0010($v0) ## 00000010 -/* 00358 80AF28A8 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 0035C 80AF28AC 00000000 */ nop -/* 00360 80AF28B0 468042A0 */ cvt.s.w $f10, $f8 -/* 00364 80AF28B4 E4EA0028 */ swc1 $f10, 0x0028($a3) ## 00000028 -/* 00368 80AF28B8 8C580014 */ lw $t8, 0x0014($v0) ## 00000014 -/* 0036C 80AF28BC 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 00370 80AF28C0 00000000 */ nop -/* 00374 80AF28C4 468084A0 */ cvt.s.w $f18, $f16 -/* 00378 80AF28C8 E4F2002C */ swc1 $f18, 0x002C($a3) ## 0000002C -/* 0037C 80AF28CC 84430008 */ lh $v1, 0x0008($v0) ## 00000008 -/* 00380 80AF28D0 A4E300B6 */ sh $v1, 0x00B6($a3) ## 000000B6 -/* 00384 80AF28D4 A4E30032 */ sh $v1, 0x0032($a3) ## 00000032 -.L80AF28D8: -/* 00388 80AF28D8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0038C 80AF28DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00390 80AF28E0 03E00008 */ jr $ra -/* 00394 80AF28E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF28E8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF28E8.s deleted file mode 100644 index 3f85287827..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF28E8.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80AF28E8 -/* 00398 80AF28E8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0039C 80AF28EC AFBF0024 */ sw $ra, 0x0024($sp) -/* 003A0 80AF28F0 AFA40028 */ sw $a0, 0x0028($sp) -/* 003A4 80AF28F4 AFA5002C */ sw $a1, 0x002C($sp) -/* 003A8 80AF28F8 AFA60030 */ sw $a2, 0x0030($sp) -/* 003AC 80AF28FC AFA70034 */ sw $a3, 0x0034($sp) -/* 003B0 80AF2900 0C028800 */ jal SkelAnime_GetFrameCount - -/* 003B4 80AF2904 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 003B8 80AF2908 8FAE0038 */ lw $t6, 0x0038($sp) -/* 003BC 80AF290C 8FA40028 */ lw $a0, 0x0028($sp) -/* 003C0 80AF2910 8FA5002C */ lw $a1, 0x002C($sp) -/* 003C4 80AF2914 15C00007 */ bne $t6, $zero, .L80AF2934 -/* 003C8 80AF2918 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 003CC 80AF291C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 003D0 80AF2920 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 003D4 80AF2924 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 003D8 80AF2928 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 003DC 80AF292C 10000006 */ beq $zero, $zero, .L80AF2948 -/* 003E0 80AF2930 468020A0 */ cvt.s.w $f2, $f4 -.L80AF2934: -/* 003E4 80AF2934 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 003E8 80AF2938 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 003EC 80AF293C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 003F0 80AF2940 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 003F4 80AF2944 46803020 */ cvt.s.w $f0, $f6 -.L80AF2948: -/* 003F8 80AF2948 93AF0033 */ lbu $t7, 0x0033($sp) -/* 003FC 80AF294C C7A80034 */ lwc1 $f8, 0x0034($sp) -/* 00400 80AF2950 44066000 */ mfc1 $a2, $f12 -/* 00404 80AF2954 44070000 */ mfc1 $a3, $f0 -/* 00408 80AF2958 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 0040C 80AF295C AFAF0014 */ sw $t7, 0x0014($sp) -/* 00410 80AF2960 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00414 80AF2964 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00418 80AF2968 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0041C 80AF296C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00420 80AF2970 03E00008 */ jr $ra -/* 00424 80AF2974 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2978.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2978.s deleted file mode 100644 index ebafc849c3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2978.s +++ /dev/null @@ -1,17 +0,0 @@ -.late_rodata - -glabel D_80AF527C - .word 0x42A6AAAB - -.text - -glabel func_80AF2978 -/* 00428 80AF2978 AFA50004 */ sw $a1, 0x0004($sp) -/* 0042C 80AF297C 3C0180AF */ lui $at, %hi(D_80AF527C) ## $at = 80AF0000 -/* 00430 80AF2980 C426527C */ lwc1 $f6, %lo(D_80AF527C)($at) -/* 00434 80AF2984 C48400BC */ lwc1 $f4, 0x00BC($a0) ## 000000BC -/* 00438 80AF2988 46062200 */ add.s $f8, $f4, $f6 -/* 0043C 80AF298C 03E00008 */ jr $ra -/* 00440 80AF2990 E48800BC */ swc1 $f8, 0x00BC($a0) ## 000000BC - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2994.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2994.s deleted file mode 100644 index f76d7773dd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2994.s +++ /dev/null @@ -1,28 +0,0 @@ -.late_rodata - -glabel D_80AF5280 - .word 0xC61C4000, 0x00000000, 0x00000000, 0x00000000 - -.text - -glabel func_80AF2994 -/* 00444 80AF2994 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00448 80AF2998 AFA50024 */ sw $a1, 0x0024($sp) -/* 0044C 80AF299C AFBF001C */ sw $ra, 0x001C($sp) -/* 00450 80AF29A0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00454 80AF29A4 AFA40020 */ sw $a0, 0x0020($sp) -/* 00458 80AF29A8 24A50DE8 */ addiu $a1, $a1, 0x0DE8 ## $a1 = 06000DE8 -/* 0045C 80AF29AC AFA00010 */ sw $zero, 0x0010($sp) -/* 00460 80AF29B0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00464 80AF29B4 0C2BCA3A */ jal func_80AF28E8 -/* 00468 80AF29B8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0046C 80AF29BC 3C0180AF */ lui $at, %hi(D_80AF5280) ## $at = 80AF0000 -/* 00470 80AF29C0 C4245280 */ lwc1 $f4, %lo(D_80AF5280)($at) -/* 00474 80AF29C4 8FAE0020 */ lw $t6, 0x0020($sp) -/* 00478 80AF29C8 E5C400BC */ swc1 $f4, 0x00BC($t6) ## 000000BC -/* 0047C 80AF29CC 8FBF001C */ lw $ra, 0x001C($sp) -/* 00480 80AF29D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00484 80AF29D4 03E00008 */ jr $ra -/* 00488 80AF29D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF29DC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF29DC.s deleted file mode 100644 index b3860facea..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF29DC.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80AF29DC -/* 0048C 80AF29DC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00490 80AF29E0 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00494 80AF29E4 AFA40038 */ sw $a0, 0x0038($sp) -/* 00498 80AF29E8 C4800024 */ lwc1 $f0, 0x0024($a0) ## 00000024 -/* 0049C 80AF29EC C4820028 */ lwc1 $f2, 0x0028($a0) ## 00000028 -/* 004A0 80AF29F0 C48C002C */ lwc1 $f12, 0x002C($a0) ## 0000002C -/* 004A4 80AF29F4 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 004A8 80AF29F8 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 004AC 80AF29FC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 004B0 80AF2A00 AFAE0028 */ sw $t6, 0x0028($sp) -/* 004B4 80AF2A04 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 004B8 80AF2A08 AFA00024 */ sw $zero, 0x0024($sp) -/* 004BC 80AF2A0C AFA00020 */ sw $zero, 0x0020($sp) -/* 004C0 80AF2A10 AFA0001C */ sw $zero, 0x001C($sp) -/* 004C4 80AF2A14 2407005D */ addiu $a3, $zero, 0x005D ## $a3 = 0000005D -/* 004C8 80AF2A18 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 004CC 80AF2A1C E7A20014 */ swc1 $f2, 0x0014($sp) -/* 004D0 80AF2A20 0C00C916 */ jal Actor_SpawnAttached - -/* 004D4 80AF2A24 E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 004D8 80AF2A28 8FBF0034 */ lw $ra, 0x0034($sp) -/* 004DC 80AF2A2C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 004E0 80AF2A30 03E00008 */ jr $ra -/* 004E4 80AF2A34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2A38.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2A38.s deleted file mode 100644 index 1d1a377d57..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2A38.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80AF2A38 -/* 004E8 80AF2A38 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 004EC 80AF2A3C AFBF0034 */ sw $ra, 0x0034($sp) -/* 004F0 80AF2A40 AFA40038 */ sw $a0, 0x0038($sp) -/* 004F4 80AF2A44 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 004F8 80AF2A48 8CC21C44 */ lw $v0, 0x1C44($a2) ## 00001C44 -/* 004FC 80AF2A4C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00500 80AF2A50 44813000 */ mtc1 $at, $f6 ## $f6 = 50.00 -/* 00504 80AF2A54 C4440028 */ lwc1 $f4, 0x0028($v0) ## 00000028 -/* 00508 80AF2A58 C4400024 */ lwc1 $f0, 0x0024($v0) ## 00000024 -/* 0050C 80AF2A5C C44C002C */ lwc1 $f12, 0x002C($v0) ## 0000002C -/* 00510 80AF2A60 46062080 */ add.s $f2, $f4, $f6 -/* 00514 80AF2A64 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00518 80AF2A68 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 0051C 80AF2A6C AFAE0028 */ sw $t6, 0x0028($sp) -/* 00520 80AF2A70 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00524 80AF2A74 E7A20014 */ swc1 $f2, 0x0014($sp) -/* 00528 80AF2A78 AFA6003C */ sw $a2, 0x003C($sp) -/* 0052C 80AF2A7C AFA00024 */ sw $zero, 0x0024($sp) -/* 00530 80AF2A80 AFA00020 */ sw $zero, 0x0020($sp) -/* 00534 80AF2A84 AFA0001C */ sw $zero, 0x001C($sp) -/* 00538 80AF2A88 2407008B */ addiu $a3, $zero, 0x008B ## $a3 = 0000008B -/* 0053C 80AF2A8C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00540 80AF2A90 0C00C916 */ jal Actor_SpawnAttached - -/* 00544 80AF2A94 E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 00548 80AF2A98 8FA4003C */ lw $a0, 0x003C($sp) -/* 0054C 80AF2A9C 0C021344 */ jal Item_Give -/* 00550 80AF2AA0 24050068 */ addiu $a1, $zero, 0x0068 ## $a1 = 00000068 -/* 00554 80AF2AA4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00558 80AF2AA8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0055C 80AF2AAC 03E00008 */ jr $ra -/* 00560 80AF2AB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2AB4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2AB4.s deleted file mode 100644 index f7d6b1819b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2AB4.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80AF2AB4 -/* 00564 80AF2AB4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00568 80AF2AB8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 0056C 80AF2ABC 904E1415 */ lbu $t6, 0x1415($v0) ## 8015FA75 -/* 00570 80AF2AC0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00574 80AF2AC4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00578 80AF2AC8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0057C 80AF2ACC 15C10019 */ bne $t6, $at, .L80AF2B34 -/* 00580 80AF2AD0 AFA40028 */ sw $a0, 0x0028($sp) -/* 00584 80AF2AD4 8C4F1360 */ lw $t7, 0x1360($v0) ## 8015F9C0 -/* 00588 80AF2AD8 3C0880AF */ lui $t0, %hi(D_80AF411C) ## $t0 = 80AF0000 -/* 0058C 80AF2ADC 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00590 80AF2AE0 29E10004 */ slti $at, $t7, 0x0004 -/* 00594 80AF2AE4 10200013 */ beq $at, $zero, .L80AF2B34 -/* 00598 80AF2AE8 2508411C */ addiu $t0, $t0, %lo(D_80AF411C) ## $t0 = 80AF411C -/* 0059C 80AF2AEC 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 005A0 80AF2AF0 AC9802A8 */ sw $t8, 0x02A8($a0) ## 000002A8 -/* 005A4 80AF2AF4 ACA81D68 */ sw $t0, 0x1D68($a1) ## 00001D68 -/* 005A8 80AF2AF8 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 005AC 80AF2AFC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 005B0 80AF2B00 A0491414 */ sb $t1, 0x1414($v0) ## 8015FA74 -/* 005B4 80AF2B04 24050068 */ addiu $a1, $zero, 0x0068 ## $a1 = 00000068 -/* 005B8 80AF2B08 0C021344 */ jal Item_Give -/* 005BC 80AF2B0C AFA3001C */ sw $v1, 0x001C($sp) -/* 005C0 80AF2B10 8FAA0028 */ lw $t2, 0x0028($sp) -/* 005C4 80AF2B14 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 005C8 80AF2B18 8FA3001C */ lw $v1, 0x001C($sp) -/* 005CC 80AF2B1C 85420032 */ lh $v0, 0x0032($t2) ## 00000032 -/* 005D0 80AF2B20 00411021 */ addu $v0, $v0, $at -/* 005D4 80AF2B24 00021400 */ sll $v0, $v0, 16 -/* 005D8 80AF2B28 00021403 */ sra $v0, $v0, 16 -/* 005DC 80AF2B2C A46200B6 */ sh $v0, 0x00B6($v1) ## 000000B6 -/* 005E0 80AF2B30 A4620032 */ sh $v0, 0x0032($v1) ## 00000032 -.L80AF2B34: -/* 005E4 80AF2B34 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005E8 80AF2B38 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 005EC 80AF2B3C 03E00008 */ jr $ra -/* 005F0 80AF2B40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2B44.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2B44.s deleted file mode 100644 index 085a12eb0f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2B44.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80AF2B44 -/* 005F4 80AF2B44 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 005F8 80AF2B48 AFBF0014 */ sw $ra, 0x0014($sp) -/* 005FC 80AF2B4C 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00600 80AF2B50 51C0000D */ beql $t6, $zero, .L80AF2B88 -/* 00604 80AF2B54 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00608 80AF2B58 8CA21D98 */ lw $v0, 0x1D98($a1) ## 00001D98 -/* 0060C 80AF2B5C 5040000A */ beql $v0, $zero, .L80AF2B88 -/* 00610 80AF2B60 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00614 80AF2B64 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 00618 80AF2B68 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 0061C 80AF2B6C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00620 80AF2B70 546F0005 */ bnel $v1, $t7, .L80AF2B88 -/* 00624 80AF2B74 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00628 80AF2B78 AC8302A8 */ sw $v1, 0x02A8($a0) ## 000002A8 -/* 0062C 80AF2B7C 0C2BCA77 */ jal func_80AF29DC -/* 00630 80AF2B80 AC9802AC */ sw $t8, 0x02AC($a0) ## 000002AC -/* 00634 80AF2B84 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF2B88: -/* 00638 80AF2B88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0063C 80AF2B8C 03E00008 */ jr $ra -/* 00640 80AF2B90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2B94.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2B94.s deleted file mode 100644 index b313c39a50..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2B94.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80AF2B94 -/* 00644 80AF2B94 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00648 80AF2B98 C48400BC */ lwc1 $f4, 0x00BC($a0) ## 000000BC -/* 0064C 80AF2B9C 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 00650 80AF2BA0 4604003E */ c.le.s $f0, $f4 -/* 00654 80AF2BA4 00000000 */ nop -/* 00658 80AF2BA8 45000003 */ bc1f .L80AF2BB8 -/* 0065C 80AF2BAC 00000000 */ nop -/* 00660 80AF2BB0 AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 00664 80AF2BB4 E48000BC */ swc1 $f0, 0x00BC($a0) ## 000000BC -.L80AF2BB8: -/* 00668 80AF2BB8 03E00008 */ jr $ra -/* 0066C 80AF2BBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2BC0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2BC0.s deleted file mode 100644 index f9c7fbc101..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2BC0.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80AF2BC0 -/* 00670 80AF2BC0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00674 80AF2BC4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00678 80AF2BC8 AFA40028 */ sw $a0, 0x0028($sp) -/* 0067C 80AF2BCC 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00680 80AF2BD0 51C0001D */ beql $t6, $zero, .L80AF2C48 -/* 00684 80AF2BD4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00688 80AF2BD8 8CA21D98 */ lw $v0, 0x1D98($a1) ## 00001D98 -/* 0068C 80AF2BDC 5040001A */ beql $v0, $zero, .L80AF2C48 -/* 00690 80AF2BE0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00694 80AF2BE4 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 00698 80AF2BE8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0069C 80AF2BEC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 006A0 80AF2BF0 55E10015 */ bnel $t7, $at, .L80AF2C48 -/* 006A4 80AF2BF4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 006A8 80AF2BF8 0C028800 */ jal SkelAnime_GetFrameCount - -/* 006AC 80AF2BFC 2484D3DC */ addiu $a0, $a0, 0xD3DC ## $a0 = 0600D3DC -/* 006B0 80AF2C00 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 006B4 80AF2C04 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 006B8 80AF2C08 8FA40028 */ lw $a0, 0x0028($sp) -/* 006BC 80AF2C0C 468021A0 */ cvt.s.w $f6, $f4 -/* 006C0 80AF2C10 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 006C4 80AF2C14 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 006C8 80AF2C18 44070000 */ mfc1 $a3, $f0 -/* 006CC 80AF2C1C AFB80014 */ sw $t8, 0x0014($sp) -/* 006D0 80AF2C20 24A5D3DC */ addiu $a1, $a1, 0xD3DC ## $a1 = 0600D3DC -/* 006D4 80AF2C24 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 006D8 80AF2C28 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 006DC 80AF2C2C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006E0 80AF2C30 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 006E4 80AF2C34 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 006E8 80AF2C38 8FA80028 */ lw $t0, 0x0028($sp) -/* 006EC 80AF2C3C 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 -/* 006F0 80AF2C40 AD1902A8 */ sw $t9, 0x02A8($t0) ## 000002A8 -/* 006F4 80AF2C44 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AF2C48: -/* 006F8 80AF2C48 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 006FC 80AF2C4C 03E00008 */ jr $ra -/* 00700 80AF2C50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2C54.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2C54.s deleted file mode 100644 index 320c5c7620..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2C54.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80AF2C54 -/* 00704 80AF2C54 10A00002 */ beq $a1, $zero, .L80AF2C60 -/* 00708 80AF2C58 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 0070C 80AF2C5C AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -.L80AF2C60: -/* 00710 80AF2C60 03E00008 */ jr $ra -/* 00714 80AF2C64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2C68.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2C68.s deleted file mode 100644 index 769fc1fb10..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2C68.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80AF2C68 -/* 00718 80AF2C68 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0071C 80AF2C6C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00720 80AF2C70 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00724 80AF2C74 51C0000C */ beql $t6, $zero, .L80AF2CA8 -/* 00728 80AF2C78 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0072C 80AF2C7C 8CA21DA4 */ lw $v0, 0x1DA4($a1) ## 00001DA4 -/* 00730 80AF2C80 50400009 */ beql $v0, $zero, .L80AF2CA8 -/* 00734 80AF2C84 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00738 80AF2C88 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 0073C 80AF2C8C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00740 80AF2C90 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 -/* 00744 80AF2C94 55E10004 */ bnel $t7, $at, .L80AF2CA8 -/* 00748 80AF2C98 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0074C 80AF2C9C 0C2BCA8E */ jal func_80AF2A38 -/* 00750 80AF2CA0 AC9802A8 */ sw $t8, 0x02A8($a0) ## 000002A8 -/* 00754 80AF2CA4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF2CA8: -/* 00758 80AF2CA8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0075C 80AF2CAC 03E00008 */ jr $ra -/* 00760 80AF2CB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CB4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CB4.s deleted file mode 100644 index 79fddbcbb2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CB4.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80AF2CB4 -/* 00764 80AF2CB4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00768 80AF2CB8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0076C 80AF2CBC 0C2BCAAD */ jal func_80AF2AB4 -/* 00770 80AF2CC0 00000000 */ nop -/* 00774 80AF2CC4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00778 80AF2CC8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0077C 80AF2CCC 03E00008 */ jr $ra -/* 00780 80AF2CD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CD4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CD4.s deleted file mode 100644 index 667ac6cdf9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CD4.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80AF2CD4 -/* 00784 80AF2CD4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00788 80AF2CD8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0078C 80AF2CDC 0C2BCAD1 */ jal func_80AF2B44 -/* 00790 80AF2CE0 00000000 */ nop -/* 00794 80AF2CE4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00798 80AF2CE8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0079C 80AF2CEC 03E00008 */ jr $ra -/* 007A0 80AF2CF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CF4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CF4.s deleted file mode 100644 index d2ba0a40bf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CF4.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80AF2CF4 -/* 007A4 80AF2CF4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007A8 80AF2CF8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 007AC 80AF2CFC 0C2BCA5E */ jal func_80AF2978 -/* 007B0 80AF2D00 AFA40018 */ sw $a0, 0x0018($sp) -/* 007B4 80AF2D04 0C2BC9E3 */ jal func_80AF278C -/* 007B8 80AF2D08 8FA40018 */ lw $a0, 0x0018($sp) -/* 007BC 80AF2D0C 0C2BC982 */ jal func_80AF2608 -/* 007C0 80AF2D10 8FA40018 */ lw $a0, 0x0018($sp) -/* 007C4 80AF2D14 0C2BCAE5 */ jal func_80AF2B94 -/* 007C8 80AF2D18 8FA40018 */ lw $a0, 0x0018($sp) -/* 007CC 80AF2D1C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 007D0 80AF2D20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007D4 80AF2D24 03E00008 */ jr $ra -/* 007D8 80AF2D28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2D2C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2D2C.s deleted file mode 100644 index dd3cd8cb0f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2D2C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AF2D2C -/* 007DC 80AF2D2C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007E0 80AF2D30 AFBF0014 */ sw $ra, 0x0014($sp) -/* 007E4 80AF2D34 AFA40018 */ sw $a0, 0x0018($sp) -/* 007E8 80AF2D38 0C2BC9D1 */ jal func_80AF2744 -/* 007EC 80AF2D3C AFA5001C */ sw $a1, 0x001C($sp) -/* 007F0 80AF2D40 0C2BC9E3 */ jal func_80AF278C -/* 007F4 80AF2D44 8FA40018 */ lw $a0, 0x0018($sp) -/* 007F8 80AF2D48 0C2BC982 */ jal func_80AF2608 -/* 007FC 80AF2D4C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00800 80AF2D50 8FA40018 */ lw $a0, 0x0018($sp) -/* 00804 80AF2D54 0C2BCAF0 */ jal func_80AF2BC0 -/* 00808 80AF2D58 8FA5001C */ lw $a1, 0x001C($sp) -/* 0080C 80AF2D5C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00810 80AF2D60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00814 80AF2D64 03E00008 */ jr $ra -/* 00818 80AF2D68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2D6C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2D6C.s deleted file mode 100644 index b41252d63a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2D6C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AF2D6C -/* 0081C 80AF2D6C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00820 80AF2D70 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00824 80AF2D74 0C2BC9D1 */ jal func_80AF2744 -/* 00828 80AF2D78 AFA40020 */ sw $a0, 0x0020($sp) -/* 0082C 80AF2D7C 0C2BC9E3 */ jal func_80AF278C -/* 00830 80AF2D80 8FA40020 */ lw $a0, 0x0020($sp) -/* 00834 80AF2D84 AFA2001C */ sw $v0, 0x001C($sp) -/* 00838 80AF2D88 0C2BC982 */ jal func_80AF2608 -/* 0083C 80AF2D8C 8FA40020 */ lw $a0, 0x0020($sp) -/* 00840 80AF2D90 8FA40020 */ lw $a0, 0x0020($sp) -/* 00844 80AF2D94 0C2BCB15 */ jal func_80AF2C54 -/* 00848 80AF2D98 8FA5001C */ lw $a1, 0x001C($sp) -/* 0084C 80AF2D9C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00850 80AF2DA0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00854 80AF2DA4 03E00008 */ jr $ra -/* 00858 80AF2DA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2DAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2DAC.s deleted file mode 100644 index 04362a1956..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2DAC.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AF2DAC -/* 0085C 80AF2DAC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00860 80AF2DB0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00864 80AF2DB4 AFA40018 */ sw $a0, 0x0018($sp) -/* 00868 80AF2DB8 0C2BC9D1 */ jal func_80AF2744 -/* 0086C 80AF2DBC AFA5001C */ sw $a1, 0x001C($sp) -/* 00870 80AF2DC0 0C2BC9E3 */ jal func_80AF278C -/* 00874 80AF2DC4 8FA40018 */ lw $a0, 0x0018($sp) -/* 00878 80AF2DC8 0C2BC982 */ jal func_80AF2608 -/* 0087C 80AF2DCC 8FA40018 */ lw $a0, 0x0018($sp) -/* 00880 80AF2DD0 8FA40018 */ lw $a0, 0x0018($sp) -/* 00884 80AF2DD4 0C2BCB1A */ jal func_80AF2C68 -/* 00888 80AF2DD8 8FA5001C */ lw $a1, 0x001C($sp) -/* 0088C 80AF2DDC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00890 80AF2DE0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00894 80AF2DE4 03E00008 */ jr $ra -/* 00898 80AF2DE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2DEC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2DEC.s deleted file mode 100644 index 2d037773b9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2DEC.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80AF2DEC -/* 0089C 80AF2DEC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 008A0 80AF2DF0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 008A4 80AF2DF4 0C2BC9D1 */ jal func_80AF2744 -/* 008A8 80AF2DF8 AFA40018 */ sw $a0, 0x0018($sp) -/* 008AC 80AF2DFC 0C2BC9E3 */ jal func_80AF278C -/* 008B0 80AF2E00 8FA40018 */ lw $a0, 0x0018($sp) -/* 008B4 80AF2E04 0C2BC982 */ jal func_80AF2608 -/* 008B8 80AF2E08 8FA40018 */ lw $a0, 0x0018($sp) -/* 008BC 80AF2E0C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 008C0 80AF2E10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 008C4 80AF2E14 03E00008 */ jr $ra -/* 008C8 80AF2E18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E1C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E1C.s deleted file mode 100644 index 086d1c763d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E1C.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80AF2E1C -/* 008CC 80AF2E1C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 008D0 80AF2E20 AFA50024 */ sw $a1, 0x0024($sp) -/* 008D4 80AF2E24 AFBF001C */ sw $ra, 0x001C($sp) -/* 008D8 80AF2E28 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 008DC 80AF2E2C 24A504CC */ addiu $a1, $a1, 0x04CC ## $a1 = 060004CC -/* 008E0 80AF2E30 AFA00010 */ sw $zero, 0x0010($sp) -/* 008E4 80AF2E34 AFA40020 */ sw $a0, 0x0020($sp) -/* 008E8 80AF2E38 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 008EC 80AF2E3C 0C2BCA3A */ jal func_80AF28E8 -/* 008F0 80AF2E40 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 008F4 80AF2E44 8FA40020 */ lw $a0, 0x0020($sp) -/* 008F8 80AF2E48 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 008FC 80AF2E4C AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 00900 80AF2E50 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -/* 00904 80AF2E54 8FBF001C */ lw $ra, 0x001C($sp) -/* 00908 80AF2E58 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0090C 80AF2E5C 03E00008 */ jr $ra -/* 00910 80AF2E60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E64.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E64.s deleted file mode 100644 index 2b3d701f17..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E64.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80AF2E64 -/* 00914 80AF2E64 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00918 80AF2E68 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0091C 80AF2E6C 0C01E233 */ jal func_800788CC -/* 00920 80AF2E70 24044834 */ addiu $a0, $zero, 0x4834 ## $a0 = 00004834 -/* 00924 80AF2E74 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00928 80AF2E78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0092C 80AF2E7C 03E00008 */ jr $ra -/* 00930 80AF2E80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E84.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E84.s deleted file mode 100644 index c5e1a0555a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E84.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80AF2E84 -/* 00934 80AF2E84 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00938 80AF2E88 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 0093C 80AF2E8C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00940 80AF2E90 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00944 80AF2E94 AFA40038 */ sw $a0, 0x0038($sp) -/* 00948 80AF2E98 C4A40024 */ lwc1 $f4, 0x0024($a1) ## 00000024 -/* 0094C 80AF2E9C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00950 80AF2EA0 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 -/* 00954 80AF2EA4 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00958 80AF2EA8 3C0141C0 */ lui $at, 0x41C0 ## $at = 41C00000 -/* 0095C 80AF2EAC 85CF147A */ lh $t7, 0x147A($t6) ## 8016147A -/* 00960 80AF2EB0 44815000 */ mtc1 $at, $f10 ## $f10 = 24.00 -/* 00964 80AF2EB4 C4B20028 */ lwc1 $f18, 0x0028($a1) ## 00000028 -/* 00968 80AF2EB8 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 0096C 80AF2EBC 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 -/* 00970 80AF2EC0 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00974 80AF2EC4 46803220 */ cvt.s.w $f8, $f6 -/* 00978 80AF2EC8 240700F5 */ addiu $a3, $zero, 0x00F5 ## $a3 = 000000F5 -/* 0097C 80AF2ECC 460A4400 */ add.s $f16, $f8, $f10 -/* 00980 80AF2ED0 46128100 */ add.s $f4, $f16, $f18 -/* 00984 80AF2ED4 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 00988 80AF2ED8 C4A6002C */ lwc1 $f6, 0x002C($a1) ## 0000002C -/* 0098C 80AF2EDC AFB80028 */ sw $t8, 0x0028($sp) -/* 00990 80AF2EE0 AFA00024 */ sw $zero, 0x0024($sp) -/* 00994 80AF2EE4 AFA00020 */ sw $zero, 0x0020($sp) -/* 00998 80AF2EE8 AFA0001C */ sw $zero, 0x001C($sp) -/* 0099C 80AF2EEC 0C00C916 */ jal Actor_SpawnAttached - -/* 009A0 80AF2EF0 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 009A4 80AF2EF4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 009A8 80AF2EF8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 009AC 80AF2EFC 03E00008 */ jr $ra -/* 009B0 80AF2F00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2F04.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2F04.s deleted file mode 100644 index af5a05397c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2F04.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AF2F04 -/* 009B4 80AF2F04 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 009B8 80AF2F08 AFBF0014 */ sw $ra, 0x0014($sp) -/* 009BC 80AF2F0C AFA40018 */ sw $a0, 0x0018($sp) -/* 009C0 80AF2F10 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 009C4 80AF2F14 0C2BC9F4 */ jal func_80AF27D0 -/* 009C8 80AF2F18 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 009CC 80AF2F1C 1040000A */ beq $v0, $zero, .L80AF2F48 -/* 009D0 80AF2F20 8FA40018 */ lw $a0, 0x0018($sp) -/* 009D4 80AF2F24 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 009D8 80AF2F28 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 009DC 80AF2F2C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 009E0 80AF2F30 AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 009E4 80AF2F34 AC8F02AC */ sw $t7, 0x02AC($a0) ## 000002AC -/* 009E8 80AF2F38 AC8002B4 */ sw $zero, 0x02B4($a0) ## 000002B4 -/* 009EC 80AF2F3C A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -/* 009F0 80AF2F40 0C2BCB99 */ jal func_80AF2E64 -/* 009F4 80AF2F44 E48402B0 */ swc1 $f4, 0x02B0($a0) ## 000002B0 -.L80AF2F48: -/* 009F8 80AF2F48 8FBF0014 */ lw $ra, 0x0014($sp) -/* 009FC 80AF2F4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A00 80AF2F50 03E00008 */ jr $ra -/* 00A04 80AF2F54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2F58.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2F58.s deleted file mode 100644 index b171bf8054..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2F58.s +++ /dev/null @@ -1,91 +0,0 @@ -glabel func_80AF2F58 -/* 00A08 80AF2F58 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A0C 80AF2F5C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A10 80AF2F60 AFA40018 */ sw $a0, 0x0018($sp) -/* 00A14 80AF2F64 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00A18 80AF2F68 0C2BC9F4 */ jal func_80AF27D0 -/* 00A1C 80AF2F6C 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 00A20 80AF2F70 10400025 */ beq $v0, $zero, .L80AF3008 -/* 00A24 80AF2F74 8FA40018 */ lw $a0, 0x0018($sp) -/* 00A28 80AF2F78 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00A2C 80AF2F7C 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 00A30 80AF2F80 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00A34 80AF2F84 248202B0 */ addiu $v0, $a0, 0x02B0 ## $v0 = 000002B0 -/* 00A38 80AF2F88 C4440000 */ lwc1 $f4, 0x0000($v0) ## 000002B0 -/* 00A3C 80AF2F8C 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 00A40 80AF2F90 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 00A44 80AF2F94 24A5FA90 */ addiu $a1, $a1, 0xFA90 ## $a1 = 8015FA90 -/* 00A48 80AF2F98 46062200 */ add.s $f8, $f4, $f6 -/* 00A4C 80AF2F9C 24180009 */ addiu $t8, $zero, 0x0009 ## $t8 = 00000009 -/* 00A50 80AF2FA0 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00A54 80AF2FA4 E4480000 */ swc1 $f8, 0x0000($v0) ## 000002B0 -/* 00A58 80AF2FA8 8CAE0000 */ lw $t6, 0x0000($a1) ## 8015FA90 -/* 00A5C 80AF2FAC C4400000 */ lwc1 $f0, 0x0000($v0) ## 000002B0 -/* 00A60 80AF2FB0 85CF145E */ lh $t7, 0x145E($t6) ## 0000145E -/* 00A64 80AF2FB4 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 00A68 80AF2FB8 00000000 */ nop -/* 00A6C 80AF2FBC 46805420 */ cvt.s.w $f16, $f10 -/* 00A70 80AF2FC0 46028480 */ add.s $f18, $f16, $f2 -/* 00A74 80AF2FC4 4600903E */ c.le.s $f18, $f0 -/* 00A78 80AF2FC8 00000000 */ nop -/* 00A7C 80AF2FCC 45000020 */ bc1f .L80AF3050 -/* 00A80 80AF2FD0 00000000 */ nop -/* 00A84 80AF2FD4 AC9802A8 */ sw $t8, 0x02A8($a0) ## 000002A8 -/* 00A88 80AF2FD8 AC9902AC */ sw $t9, 0x02AC($a0) ## 000002AC -/* 00A8C 80AF2FDC 8CA80000 */ lw $t0, 0x0000($a1) ## 8015FA90 -/* 00A90 80AF2FE0 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 00A94 80AF2FE4 8509145E */ lh $t1, 0x145E($t0) ## 0000145E -/* 00A98 80AF2FE8 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 00A9C 80AF2FEC 00000000 */ nop -/* 00AA0 80AF2FF0 468021A0 */ cvt.s.w $f6, $f4 -/* 00AA4 80AF2FF4 46023200 */ add.s $f8, $f6, $f2 -/* 00AA8 80AF2FF8 E4480000 */ swc1 $f8, 0x0000($v0) ## 000002B0 -/* 00AAC 80AF2FFC AC8302B4 */ sw $v1, 0x02B4($a0) ## 000002B4 -/* 00AB0 80AF3000 10000026 */ beq $zero, $zero, .L80AF309C -/* 00AB4 80AF3004 A08300C8 */ sb $v1, 0x00C8($a0) ## 000000C8 -.L80AF3008: -/* 00AB8 80AF3008 248202B0 */ addiu $v0, $a0, 0x02B0 ## $v0 = 000002B0 -/* 00ABC 80AF300C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00AC0 80AF3010 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 00AC4 80AF3014 C44A0000 */ lwc1 $f10, 0x0000($v0) ## 000002B0 -/* 00AC8 80AF3018 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 00ACC 80AF301C 46105481 */ sub.s $f18, $f10, $f16 -/* 00AD0 80AF3020 E4520000 */ swc1 $f18, 0x0000($v0) ## 000002B0 -/* 00AD4 80AF3024 C4400000 */ lwc1 $f0, 0x0000($v0) ## 000002B0 -/* 00AD8 80AF3028 4602003E */ c.le.s $f0, $f2 -/* 00ADC 80AF302C 00000000 */ nop -/* 00AE0 80AF3030 45000007 */ bc1f .L80AF3050 -/* 00AE4 80AF3034 240A0007 */ addiu $t2, $zero, 0x0007 ## $t2 = 00000007 -/* 00AE8 80AF3038 AC8A02A8 */ sw $t2, 0x02A8($a0) ## 000002A8 -/* 00AEC 80AF303C AC8002AC */ sw $zero, 0x02AC($a0) ## 000002AC -/* 00AF0 80AF3040 E4420000 */ swc1 $f2, 0x0000($v0) ## 000002B0 -/* 00AF4 80AF3044 AC8002B4 */ sw $zero, 0x02B4($a0) ## 000002B4 -/* 00AF8 80AF3048 10000014 */ beq $zero, $zero, .L80AF309C -/* 00AFC 80AF304C A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -.L80AF3050: -/* 00B00 80AF3050 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 00B04 80AF3054 24A5FA90 */ addiu $a1, $a1, 0xFA90 ## $a1 = 8015FA90 -/* 00B08 80AF3058 8CAB0000 */ lw $t3, 0x0000($a1) ## 8015FA90 -/* 00B0C 80AF305C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00B10 80AF3060 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 00B14 80AF3064 856C145E */ lh $t4, 0x145E($t3) ## 0000145E -/* 00B18 80AF3068 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 00B1C 80AF306C 44818000 */ mtc1 $at, $f16 ## $f16 = 255.00 -/* 00B20 80AF3070 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 00B24 80AF3074 00000000 */ nop -/* 00B28 80AF3078 468021A0 */ cvt.s.w $f6, $f4 -/* 00B2C 80AF307C 46023200 */ add.s $f8, $f6, $f2 -/* 00B30 80AF3080 46080283 */ div.s $f10, $f0, $f8 -/* 00B34 80AF3084 46105482 */ mul.s $f18, $f10, $f16 -/* 00B38 80AF3088 4600910D */ trunc.w.s $f4, $f18 -/* 00B3C 80AF308C 44022000 */ mfc1 $v0, $f4 -/* 00B40 80AF3090 00000000 */ nop -/* 00B44 80AF3094 AC8202B4 */ sw $v0, 0x02B4($a0) ## 000002B4 -/* 00B48 80AF3098 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -.L80AF309C: -/* 00B4C 80AF309C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B50 80AF30A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B54 80AF30A4 03E00008 */ jr $ra -/* 00B58 80AF30A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF30AC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF30AC.s deleted file mode 100644 index 1233bca3e4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF30AC.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80AF30AC -/* 00B5C 80AF30AC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B60 80AF30B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B64 80AF30B4 AFA5001C */ sw $a1, 0x001C($sp) -/* 00B68 80AF30B8 AFA40018 */ sw $a0, 0x0018($sp) -/* 00B6C 80AF30BC 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00B70 80AF30C0 0C2BCA07 */ jal func_80AF281C -/* 00B74 80AF30C4 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 00B78 80AF30C8 1040001A */ beq $v0, $zero, .L80AF3134 -/* 00B7C 80AF30CC 8FA40018 */ lw $a0, 0x0018($sp) -/* 00B80 80AF30D0 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 00B84 80AF30D4 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00B88 80AF30D8 AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 00B8C 80AF30DC AC8F02AC */ sw $t7, 0x02AC($a0) ## 000002AC -/* 00B90 80AF30E0 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 00B94 80AF30E4 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 -/* 00B98 80AF30E8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00B9C 80AF30EC 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 00BA0 80AF30F0 8719145E */ lh $t9, 0x145E($t8) ## 8016145E -/* 00BA4 80AF30F4 8C8902B8 */ lw $t1, 0x02B8($a0) ## 000002B8 -/* 00BA8 80AF30F8 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 00BAC 80AF30FC 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 00BB0 80AF3100 AC8802B4 */ sw $t0, 0x02B4($a0) ## 000002B4 -/* 00BB4 80AF3104 468021A0 */ cvt.s.w $f6, $f4 -/* 00BB8 80AF3108 46083280 */ add.s $f10, $f6, $f8 -/* 00BBC 80AF310C 15200007 */ bne $t1, $zero, .L80AF312C -/* 00BC0 80AF3110 E48A02B0 */ swc1 $f10, 0x02B0($a0) ## 000002B0 -/* 00BC4 80AF3114 8FA5001C */ lw $a1, 0x001C($sp) -/* 00BC8 80AF3118 0C2BCBA1 */ jal func_80AF2E84 -/* 00BCC 80AF311C AFA40018 */ sw $a0, 0x0018($sp) -/* 00BD0 80AF3120 8FA40018 */ lw $a0, 0x0018($sp) -/* 00BD4 80AF3124 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00BD8 80AF3128 AC8A02B8 */ sw $t2, 0x02B8($a0) ## 000002B8 -.L80AF312C: -/* 00BDC 80AF312C 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 00BE0 80AF3130 A08B00C8 */ sb $t3, 0x00C8($a0) ## 000000C8 -.L80AF3134: -/* 00BE4 80AF3134 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00BE8 80AF3138 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00BEC 80AF313C 03E00008 */ jr $ra -/* 00BF0 80AF3140 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3144.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3144.s deleted file mode 100644 index 4cf90133af..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3144.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80AF3144 -/* 00BF4 80AF3144 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00BF8 80AF3148 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00BFC 80AF314C AFA40018 */ sw $a0, 0x0018($sp) -/* 00C00 80AF3150 0C2BCBC1 */ jal func_80AF2F04 -/* 00C04 80AF3154 AFA5001C */ sw $a1, 0x001C($sp) -/* 00C08 80AF3158 8FA40018 */ lw $a0, 0x0018($sp) -/* 00C0C 80AF315C 0C2BC9B4 */ jal func_80AF26D0 -/* 00C10 80AF3160 8FA5001C */ lw $a1, 0x001C($sp) -/* 00C14 80AF3164 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C18 80AF3168 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C1C 80AF316C 03E00008 */ jr $ra -/* 00C20 80AF3170 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3174.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3174.s deleted file mode 100644 index 718a91d4ce..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3174.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80AF3174 -/* 00C24 80AF3174 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00C28 80AF3178 AFBF001C */ sw $ra, 0x001C($sp) -/* 00C2C 80AF317C AFB00018 */ sw $s0, 0x0018($sp) -/* 00C30 80AF3180 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C34 80AF3184 0C2BC9D1 */ jal func_80AF2744 -/* 00C38 80AF3188 AFA50024 */ sw $a1, 0x0024($sp) -/* 00C3C 80AF318C 0C2BC9E3 */ jal func_80AF278C -/* 00C40 80AF3190 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C44 80AF3194 0C2BC982 */ jal func_80AF2608 -/* 00C48 80AF3198 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C4C 80AF319C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C50 80AF31A0 0C2BCBD6 */ jal func_80AF2F58 -/* 00C54 80AF31A4 8FA50024 */ lw $a1, 0x0024($sp) -/* 00C58 80AF31A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C5C 80AF31AC 0C2BC9B4 */ jal func_80AF26D0 -/* 00C60 80AF31B0 8FA50024 */ lw $a1, 0x0024($sp) -/* 00C64 80AF31B4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00C68 80AF31B8 8FB00018 */ lw $s0, 0x0018($sp) -/* 00C6C 80AF31BC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00C70 80AF31C0 03E00008 */ jr $ra -/* 00C74 80AF31C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF31C8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF31C8.s deleted file mode 100644 index 535bc924d9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF31C8.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80AF31C8 -/* 00C78 80AF31C8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00C7C 80AF31CC AFBF001C */ sw $ra, 0x001C($sp) -/* 00C80 80AF31D0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00C84 80AF31D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C88 80AF31D8 0C2BC9D1 */ jal func_80AF2744 -/* 00C8C 80AF31DC AFA50024 */ sw $a1, 0x0024($sp) -/* 00C90 80AF31E0 0C2BC9E3 */ jal func_80AF278C -/* 00C94 80AF31E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C98 80AF31E8 0C2BC982 */ jal func_80AF2608 -/* 00C9C 80AF31EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CA0 80AF31F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CA4 80AF31F4 0C2BCC2B */ jal func_80AF30AC -/* 00CA8 80AF31F8 8FA50024 */ lw $a1, 0x0024($sp) -/* 00CAC 80AF31FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CB0 80AF3200 0C2BC9B4 */ jal func_80AF26D0 -/* 00CB4 80AF3204 8FA50024 */ lw $a1, 0x0024($sp) -/* 00CB8 80AF3208 8FBF001C */ lw $ra, 0x001C($sp) -/* 00CBC 80AF320C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00CC0 80AF3210 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00CC4 80AF3214 03E00008 */ jr $ra -/* 00CC8 80AF3218 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3394.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3394.s deleted file mode 100644 index d14eb5eb82..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3394.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80AF3394 -/* 00E44 80AF3394 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00E48 80AF3398 AFA50024 */ sw $a1, 0x0024($sp) -/* 00E4C 80AF339C AFBF001C */ sw $ra, 0x001C($sp) -/* 00E50 80AF33A0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00E54 80AF33A4 24A5E630 */ addiu $a1, $a1, 0xE630 ## $a1 = 0600E630 -/* 00E58 80AF33A8 AFA00010 */ sw $zero, 0x0010($sp) -/* 00E5C 80AF33AC AFA40020 */ sw $a0, 0x0020($sp) -/* 00E60 80AF33B0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00E64 80AF33B4 0C2BCA3A */ jal func_80AF28E8 -/* 00E68 80AF33B8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00E6C 80AF33BC 8FA40020 */ lw $a0, 0x0020($sp) -/* 00E70 80AF33C0 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 00E74 80AF33C4 AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 00E78 80AF33C8 AC8002AC */ sw $zero, 0x02AC($a0) ## 000002AC -/* 00E7C 80AF33CC A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -/* 00E80 80AF33D0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00E84 80AF33D4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00E88 80AF33D8 03E00008 */ jr $ra -/* 00E8C 80AF33DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF33E0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF33E0.s deleted file mode 100644 index 9823343f9b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF33E0.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80AF33E0 -/* 00E90 80AF33E0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00E94 80AF33E4 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 00E98 80AF33E8 C48402B0 */ lwc1 $f4, 0x02B0($a0) ## 000002B0 -/* 00E9C 80AF33EC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00EA0 80AF33F0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00EA4 80AF33F4 46062200 */ add.s $f8, $f4, $f6 -/* 00EA8 80AF33F8 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 00EAC 80AF33FC 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 00EB0 80AF3400 E48802B0 */ swc1 $f8, 0x02B0($a0) ## 000002B0 -/* 00EB4 80AF3404 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 -/* 00EB8 80AF3408 C48402B0 */ lwc1 $f4, 0x02B0($a0) ## 000002B0 -/* 00EBC 80AF340C 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 -/* 00EC0 80AF3410 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 00EC4 80AF3414 00000000 */ nop -/* 00EC8 80AF3418 46805420 */ cvt.s.w $f16, $f10 -/* 00ECC 80AF341C 46128000 */ add.s $f0, $f16, $f18 -/* 00ED0 80AF3420 4604003E */ c.le.s $f0, $f4 -/* 00ED4 80AF3424 00000000 */ nop -/* 00ED8 80AF3428 45020005 */ bc1fl .L80AF3440 -/* 00EDC 80AF342C C48602B0 */ lwc1 $f6, 0x02B0($a0) ## 000002B0 -/* 00EE0 80AF3430 AC8202B4 */ sw $v0, 0x02B4($a0) ## 000002B4 -/* 00EE4 80AF3434 03E00008 */ jr $ra -/* 00EE8 80AF3438 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -.L80AF343C: -/* 00EEC 80AF343C C48602B0 */ lwc1 $f6, 0x02B0($a0) ## 000002B0 -.L80AF3440: -/* 00EF0 80AF3440 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 00EF4 80AF3444 44815000 */ mtc1 $at, $f10 ## $f10 = 255.00 -/* 00EF8 80AF3448 46003203 */ div.s $f8, $f6, $f0 -/* 00EFC 80AF344C 460A4402 */ mul.s $f16, $f8, $f10 -/* 00F00 80AF3450 4600848D */ trunc.w.s $f18, $f16 -/* 00F04 80AF3454 44029000 */ mfc1 $v0, $f18 -/* 00F08 80AF3458 00000000 */ nop -/* 00F0C 80AF345C AC8202B4 */ sw $v0, 0x02B4($a0) ## 000002B4 -/* 00F10 80AF3460 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -/* 00F14 80AF3464 03E00008 */ jr $ra -/* 00F18 80AF3468 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF346C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF346C.s deleted file mode 100644 index 845ce43dbb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF346C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80AF346C -/* 00F1C 80AF346C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00F20 80AF3470 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00F24 80AF3474 AFA40018 */ sw $a0, 0x0018($sp) -/* 00F28 80AF3478 0C2BCA1A */ jal func_80AF2868 -/* 00F2C 80AF347C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00F30 80AF3480 8FA40018 */ lw $a0, 0x0018($sp) -/* 00F34 80AF3484 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B -/* 00F38 80AF3488 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00F3C 80AF348C AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 00F40 80AF3490 AC8F02AC */ sw $t7, 0x02AC($a0) ## 000002AC -/* 00F44 80AF3494 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00F48 80AF3498 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00F4C 80AF349C 03E00008 */ jr $ra -/* 00F50 80AF34A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF34A4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF34A4.s deleted file mode 100644 index 1103c7db74..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF34A4.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80AF34A4 -/* 00F54 80AF34A4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00F58 80AF34A8 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 -/* 00F5C 80AF34AC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00F60 80AF34B0 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 00F64 80AF34B4 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 -/* 00F68 80AF34B8 C48402B0 */ lwc1 $f4, 0x02B0($a0) ## 000002B0 -/* 00F6C 80AF34BC 2418000C */ addiu $t8, $zero, 0x000C ## $t8 = 0000000C -/* 00F70 80AF34C0 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 00F74 80AF34C4 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00F78 80AF34C8 46803220 */ cvt.s.w $f8, $f6 -/* 00F7C 80AF34CC 460A4400 */ add.s $f16, $f8, $f10 -/* 00F80 80AF34D0 4604803E */ c.le.s $f16, $f4 -/* 00F84 80AF34D4 00000000 */ nop -/* 00F88 80AF34D8 45000003 */ bc1f .L80AF34E8 -/* 00F8C 80AF34DC 00000000 */ nop -/* 00F90 80AF34E0 AC9802A8 */ sw $t8, 0x02A8($a0) ## 000002A8 -/* 00F94 80AF34E4 AC9902AC */ sw $t9, 0x02AC($a0) ## 000002AC -.L80AF34E8: -/* 00F98 80AF34E8 03E00008 */ jr $ra -/* 00F9C 80AF34EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF34F0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF34F0.s deleted file mode 100644 index 5bdad613a7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF34F0.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AF34F0 -/* 00FA0 80AF34F0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00FA4 80AF34F4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00FA8 80AF34F8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00FAC 80AF34FC AFA40020 */ sw $a0, 0x0020($sp) -/* 00FB0 80AF3500 24A5DCAC */ addiu $a1, $a1, 0xDCAC ## $a1 = 0600DCAC -/* 00FB4 80AF3504 AFA00010 */ sw $zero, 0x0010($sp) -/* 00FB8 80AF3508 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00FBC 80AF350C 0C2BCA3A */ jal func_80AF28E8 -/* 00FC0 80AF3510 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00FC4 80AF3514 8FAF0020 */ lw $t7, 0x0020($sp) -/* 00FC8 80AF3518 240E000D */ addiu $t6, $zero, 0x000D ## $t6 = 0000000D -/* 00FCC 80AF351C ADEE02A8 */ sw $t6, 0x02A8($t7) ## 000002A8 -/* 00FD0 80AF3520 8FBF001C */ lw $ra, 0x001C($sp) -/* 00FD4 80AF3524 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00FD8 80AF3528 03E00008 */ jr $ra -/* 00FDC 80AF352C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3530.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3530.s deleted file mode 100644 index 487c66e2fe..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3530.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80AF3530 -/* 00FE0 80AF3530 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00FE4 80AF3534 10A00007 */ beq $a1, $zero, .L80AF3554 -/* 00FE8 80AF3538 AFBF001C */ sw $ra, 0x001C($sp) -/* 00FEC 80AF353C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00FF0 80AF3540 24A5F03C */ addiu $a1, $a1, 0xF03C ## $a1 = 0600F03C -/* 00FF4 80AF3544 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00FF8 80AF3548 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00FFC 80AF354C 0C2BCA3A */ jal func_80AF28E8 -/* 01000 80AF3550 AFA00010 */ sw $zero, 0x0010($sp) -.L80AF3554: -/* 01004 80AF3554 8FBF001C */ lw $ra, 0x001C($sp) -/* 01008 80AF3558 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0100C 80AF355C 03E00008 */ jr $ra -/* 01010 80AF3560 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3604.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3604.s deleted file mode 100644 index 8b3f60163c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3604.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80AF3604 -/* 010B4 80AF3604 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 010B8 80AF3608 AFBF0014 */ sw $ra, 0x0014($sp) -/* 010BC 80AF360C 0C2BCD59 */ jal func_80AF3564 -/* 010C0 80AF3610 00000000 */ nop -/* 010C4 80AF3614 8FBF0014 */ lw $ra, 0x0014($sp) -/* 010C8 80AF3618 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 010CC 80AF361C 03E00008 */ jr $ra -/* 010D0 80AF3620 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3624.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3624.s deleted file mode 100644 index 24efa97a58..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3624.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80AF3624 -/* 010D4 80AF3624 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 010D8 80AF3628 AFBF001C */ sw $ra, 0x001C($sp) -/* 010DC 80AF362C AFB00018 */ sw $s0, 0x0018($sp) -/* 010E0 80AF3630 0C2BC9D1 */ jal func_80AF2744 -/* 010E4 80AF3634 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 010E8 80AF3638 0C2BC9E3 */ jal func_80AF278C -/* 010EC 80AF363C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010F0 80AF3640 0C2BC982 */ jal func_80AF2608 -/* 010F4 80AF3644 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010F8 80AF3648 0C2BCCF8 */ jal func_80AF33E0 -/* 010FC 80AF364C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01100 80AF3650 0C2BCD29 */ jal func_80AF34A4 -/* 01104 80AF3654 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01108 80AF3658 8FBF001C */ lw $ra, 0x001C($sp) -/* 0110C 80AF365C 8FB00018 */ lw $s0, 0x0018($sp) -/* 01110 80AF3660 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01114 80AF3664 03E00008 */ jr $ra -/* 01118 80AF3668 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF366C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF366C.s deleted file mode 100644 index 8758f99720..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF366C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AF366C -/* 0111C 80AF366C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01120 80AF3670 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01124 80AF3674 AFA40018 */ sw $a0, 0x0018($sp) -/* 01128 80AF3678 0C2BC9D1 */ jal func_80AF2744 -/* 0112C 80AF367C AFA5001C */ sw $a1, 0x001C($sp) -/* 01130 80AF3680 0C2BC9E3 */ jal func_80AF278C -/* 01134 80AF3684 8FA40018 */ lw $a0, 0x0018($sp) -/* 01138 80AF3688 0C2BC982 */ jal func_80AF2608 -/* 0113C 80AF368C 8FA40018 */ lw $a0, 0x0018($sp) -/* 01140 80AF3690 8FA40018 */ lw $a0, 0x0018($sp) -/* 01144 80AF3694 0C2BCD59 */ jal func_80AF3564 -/* 01148 80AF3698 8FA5001C */ lw $a1, 0x001C($sp) -/* 0114C 80AF369C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01150 80AF36A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01154 80AF36A4 03E00008 */ jr $ra -/* 01158 80AF36A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF36AC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF36AC.s deleted file mode 100644 index 0b2a0ac35f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF36AC.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AF36AC -/* 0115C 80AF36AC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01160 80AF36B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01164 80AF36B4 0C2BC9D1 */ jal func_80AF2744 -/* 01168 80AF36B8 AFA40020 */ sw $a0, 0x0020($sp) -/* 0116C 80AF36BC 0C2BC9E3 */ jal func_80AF278C -/* 01170 80AF36C0 8FA40020 */ lw $a0, 0x0020($sp) -/* 01174 80AF36C4 AFA2001C */ sw $v0, 0x001C($sp) -/* 01178 80AF36C8 0C2BC982 */ jal func_80AF2608 -/* 0117C 80AF36CC 8FA40020 */ lw $a0, 0x0020($sp) -/* 01180 80AF36D0 8FA40020 */ lw $a0, 0x0020($sp) -/* 01184 80AF36D4 0C2BCD4C */ jal func_80AF3530 -/* 01188 80AF36D8 8FA5001C */ lw $a1, 0x001C($sp) -/* 0118C 80AF36DC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01190 80AF36E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01194 80AF36E4 03E00008 */ jr $ra -/* 01198 80AF36E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF36EC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF36EC.s deleted file mode 100644 index 808be51d67..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF36EC.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80AF36EC -/* 0119C 80AF36EC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 011A0 80AF36F0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 011A4 80AF36F4 0C2BC9A4 */ jal func_80AF2690 -/* 011A8 80AF36F8 AFA5001C */ sw $a1, 0x001C($sp) -/* 011AC 80AF36FC 8FA4001C */ lw $a0, 0x001C($sp) -/* 011B0 80AF3700 0C00B2DD */ jal Flags_SetSwitch - -/* 011B4 80AF3704 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 011B8 80AF3708 8FBF0014 */ lw $ra, 0x0014($sp) -/* 011BC 80AF370C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 011C0 80AF3710 03E00008 */ jr $ra -/* 011C4 80AF3714 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3718.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3718.s deleted file mode 100644 index 64983facbb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3718.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80AF3718 -/* 011C8 80AF3718 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 011CC 80AF371C AFBF0014 */ sw $ra, 0x0014($sp) -/* 011D0 80AF3720 0C2BC9A4 */ jal func_80AF2690 -/* 011D4 80AF3724 AFA5001C */ sw $a1, 0x001C($sp) -/* 011D8 80AF3728 8FA4001C */ lw $a0, 0x001C($sp) -/* 011DC 80AF372C 0C00B2D0 */ jal Flags_GetSwitch - -/* 011E0 80AF3730 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 011E4 80AF3734 8FBF0014 */ lw $ra, 0x0014($sp) -/* 011E8 80AF3738 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 011EC 80AF373C 03E00008 */ jr $ra -/* 011F0 80AF3740 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3744.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3744.s deleted file mode 100644 index 0eeb483e60..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3744.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80AF3744 -/* 011F4 80AF3744 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 011F8 80AF3748 AFBF001C */ sw $ra, 0x001C($sp) -/* 011FC 80AF374C 0C2BCDC6 */ jal func_80AF3718 -/* 01200 80AF3750 AFA40020 */ sw $a0, 0x0020($sp) -/* 01204 80AF3754 10400005 */ beq $v0, $zero, .L80AF376C -/* 01208 80AF3758 8FA40020 */ lw $a0, 0x0020($sp) -/* 0120C 80AF375C 0C00B55C */ jal Actor_Kill - -/* 01210 80AF3760 00000000 */ nop -/* 01214 80AF3764 1000000E */ beq $zero, $zero, .L80AF37A0 -/* 01218 80AF3768 8FBF001C */ lw $ra, 0x001C($sp) -.L80AF376C: -/* 0121C 80AF376C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01220 80AF3770 24A50DE8 */ addiu $a1, $a1, 0x0DE8 ## $a1 = 06000DE8 -/* 01224 80AF3774 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01228 80AF3778 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0122C 80AF377C AFA00010 */ sw $zero, 0x0010($sp) -/* 01230 80AF3780 0C2BCA3A */ jal func_80AF28E8 -/* 01234 80AF3784 AFA40020 */ sw $a0, 0x0020($sp) -/* 01238 80AF3788 8FA40020 */ lw $a0, 0x0020($sp) -/* 0123C 80AF378C 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E -/* 01240 80AF3790 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01244 80AF3794 AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 01248 80AF3798 AC8F02AC */ sw $t7, 0x02AC($a0) ## 000002AC -/* 0124C 80AF379C 8FBF001C */ lw $ra, 0x001C($sp) -.L80AF37A0: -/* 01250 80AF37A0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01254 80AF37A4 03E00008 */ jr $ra -/* 01258 80AF37A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF37AC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF37AC.s deleted file mode 100644 index e45ef9f10d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF37AC.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80AF37AC -/* 0125C 80AF37AC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01260 80AF37B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01264 80AF37B4 0C03D719 */ jal func_800F5C64 -/* 01268 80AF37B8 24040051 */ addiu $a0, $zero, 0x0051 ## $a0 = 00000051 -/* 0126C 80AF37BC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01270 80AF37C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01274 80AF37C4 03E00008 */ jr $ra -/* 01278 80AF37C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF37CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF37CC.s deleted file mode 100644 index 4a2b428053..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF37CC.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80AF37CC -/* 0127C 80AF37CC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01280 80AF37D0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01284 80AF37D4 AFB00020 */ sw $s0, 0x0020($sp) -/* 01288 80AF37D8 948E02C0 */ lhu $t6, 0x02C0($a0) ## 000002C0 -/* 0128C 80AF37DC 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 01290 80AF37E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01294 80AF37E4 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 01298 80AF37E8 A48F02C0 */ sh $t7, 0x02C0($a0) ## 000002C0 -/* 0129C 80AF37EC 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 -/* 012A0 80AF37F0 960602C0 */ lhu $a2, 0x02C0($s0) ## 000002C0 -/* 012A4 80AF37F4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 012A8 80AF37F8 87041458 */ lh $a0, 0x1458($t8) ## 80161458 -/* 012AC 80AF37FC AFA00010 */ sw $zero, 0x0010($sp) -/* 012B0 80AF3800 24070008 */ addiu $a3, $zero, 0x0008 ## $a3 = 00000008 -/* 012B4 80AF3804 24840096 */ addiu $a0, $a0, 0x0096 ## $a0 = 00000096 -/* 012B8 80AF3808 0C01BE6F */ jal func_8006F9BC -/* 012BC 80AF380C 3084FFFF */ andi $a0, $a0, 0xFFFF ## $a0 = 00000096 -/* 012C0 80AF3810 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 012C4 80AF3814 44813000 */ mtc1 $at, $f6 ## $f6 = 300.00 -/* 012C8 80AF3818 C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C -/* 012CC 80AF381C 46003202 */ mul.s $f8, $f6, $f0 -/* 012D0 80AF3820 46082280 */ add.s $f10, $f4, $f8 -/* 012D4 80AF3824 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 012D8 80AF3828 8FBF0024 */ lw $ra, 0x0024($sp) -/* 012DC 80AF382C 8FB00020 */ lw $s0, 0x0020($sp) -/* 012E0 80AF3830 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 012E4 80AF3834 03E00008 */ jr $ra -/* 012E8 80AF3838 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF383C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF383C.s deleted file mode 100644 index 200e319c54..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF383C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AF383C -/* 012EC 80AF383C 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 012F0 80AF3840 C4800024 */ lwc1 $f0, 0x0024($a0) ## 00000024 -/* 012F4 80AF3844 3C01C34A */ lui $at, 0xC34A ## $at = C34A0000 -/* 012F8 80AF3848 C4420024 */ lwc1 $f2, 0x0024($v0) ## 00000024 -/* 012FC 80AF384C 44813000 */ mtc1 $at, $f6 ## $f6 = -202.00 -/* 01300 80AF3850 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01304 80AF3854 46001101 */ sub.s $f4, $f2, $f0 -/* 01308 80AF3858 4604303E */ c.le.s $f6, $f4 -/* 0130C 80AF385C 00000000 */ nop -/* 01310 80AF3860 45000003 */ bc1f .L80AF3870 -/* 01314 80AF3864 00000000 */ nop -/* 01318 80AF3868 03E00008 */ jr $ra -/* 0131C 80AF386C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AF3870: -/* 01320 80AF3870 03E00008 */ jr $ra -/* 01324 80AF3874 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3878.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3878.s deleted file mode 100644 index bdb9f97316..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3878.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80AF3878 -/* 01328 80AF3878 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0132C 80AF387C AFBF001C */ sw $ra, 0x001C($sp) -/* 01330 80AF3880 AFA40020 */ sw $a0, 0x0020($sp) -/* 01334 80AF3884 0C2BCE0F */ jal func_80AF383C -/* 01338 80AF3888 AFA50024 */ sw $a1, 0x0024($sp) -/* 0133C 80AF388C 5040000D */ beql $v0, $zero, .L80AF38C4 -/* 01340 80AF3890 8FBF001C */ lw $ra, 0x001C($sp) -/* 01344 80AF3894 0C02FF21 */ jal func_800BFC84 -/* 01348 80AF3898 8FA40024 */ lw $a0, 0x0024($sp) -/* 0134C 80AF389C 14400008 */ bne $v0, $zero, .L80AF38C0 -/* 01350 80AF38A0 8FA70020 */ lw $a3, 0x0020($sp) -/* 01354 80AF38A4 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 01358 80AF38A8 ACEE02A8 */ sw $t6, 0x02A8($a3) ## 000002A8 -/* 0135C 80AF38AC AFA00010 */ sw $zero, 0x0010($sp) -/* 01360 80AF38B0 8FA40024 */ lw $a0, 0x0024($sp) -/* 01364 80AF38B4 24050C3A */ addiu $a1, $zero, 0x0C3A ## $a1 = 00000C3A -/* 01368 80AF38B8 0C02003E */ jal func_800800F8 -/* 0136C 80AF38BC 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -.L80AF38C0: -/* 01370 80AF38C0 8FBF001C */ lw $ra, 0x001C($sp) -.L80AF38C4: -/* 01374 80AF38C4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01378 80AF38C8 03E00008 */ jr $ra -/* 0137C 80AF38CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF38D0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF38D0.s deleted file mode 100644 index 036e20adba..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF38D0.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80AF38D0 -/* 01380 80AF38D0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01384 80AF38D4 AFBF001C */ sw $ra, 0x001C($sp) -/* 01388 80AF38D8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0138C 80AF38DC 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 01390 80AF38E0 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01394 80AF38E4 AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 01398 80AF38E8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0139C 80AF38EC 8FA40024 */ lw $a0, 0x0024($sp) -/* 013A0 80AF38F0 24050C3A */ addiu $a1, $zero, 0x0C3A ## $a1 = 00000C3A -/* 013A4 80AF38F4 0C02003E */ jal func_800800F8 -/* 013A8 80AF38F8 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 013AC 80AF38FC 8FBF001C */ lw $ra, 0x001C($sp) -/* 013B0 80AF3900 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 013B4 80AF3904 03E00008 */ jr $ra -/* 013B8 80AF3908 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF390C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF390C.s deleted file mode 100644 index 88401c4a2e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF390C.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel func_80AF390C -/* 013BC 80AF390C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 013C0 80AF3910 AFBF0014 */ sw $ra, 0x0014($sp) -/* 013C4 80AF3914 AFA5001C */ sw $a1, 0x001C($sp) -/* 013C8 80AF3918 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 013CC 80AF391C 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 013D0 80AF3920 C48402C4 */ lwc1 $f4, 0x02C4($a0) ## 000002C4 -/* 013D4 80AF3924 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 013D8 80AF3928 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 013DC 80AF392C 46062200 */ add.s $f8, $f4, $f6 -/* 013E0 80AF3930 44812000 */ mtc1 $at, $f4 ## $f4 = 40.00 -/* 013E4 80AF3934 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 013E8 80AF3938 E48802C4 */ swc1 $f8, 0x02C4($a0) ## 000002C4 -/* 013EC 80AF393C 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 -/* 013F0 80AF3940 C48A02C4 */ lwc1 $f10, 0x02C4($a0) ## 000002C4 -/* 013F4 80AF3944 844E1460 */ lh $t6, 0x1460($v0) ## 80161460 -/* 013F8 80AF3948 448E8000 */ mtc1 $t6, $f16 ## $f16 = 0.00 -/* 013FC 80AF394C 00000000 */ nop -/* 01400 80AF3950 468084A0 */ cvt.s.w $f18, $f16 -/* 01404 80AF3954 46049180 */ add.s $f6, $f18, $f4 -/* 01408 80AF3958 46065032 */ c.eq.s $f10, $f6 -/* 0140C 80AF395C 00000000 */ nop -/* 01410 80AF3960 45020006 */ bc1fl .L80AF397C -/* 01414 80AF3964 844F145C */ lh $t7, 0x145C($v0) ## 8016145C -/* 01418 80AF3968 0C2BCDEB */ jal func_80AF37AC -/* 0141C 80AF396C 00000000 */ nop -/* 01420 80AF3970 10000017 */ beq $zero, $zero, .L80AF39D0 -/* 01424 80AF3974 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01428 80AF3978 844F145C */ lh $t7, 0x145C($v0) ## 0000145C -.L80AF397C: -/* 0142C 80AF397C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 01430 80AF3980 44819000 */ mtc1 $at, $f18 ## $f18 = 50.00 -/* 01434 80AF3984 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 01438 80AF3988 C4EA02C4 */ lwc1 $f10, 0x02C4($a3) ## 000002C4 -/* 0143C 80AF398C 2418403E */ addiu $t8, $zero, 0x403E ## $t8 = 0000403E -/* 01440 80AF3990 46804420 */ cvt.s.w $f16, $f8 -/* 01444 80AF3994 3305FFFF */ andi $a1, $t8, 0xFFFF ## $a1 = 0000403E -/* 01448 80AF3998 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0144C 80AF399C 46128100 */ add.s $f4, $f16, $f18 -/* 01450 80AF39A0 460A203C */ c.lt.s $f4, $f10 -/* 01454 80AF39A4 00000000 */ nop -/* 01458 80AF39A8 45020009 */ bc1fl .L80AF39D0 -/* 0145C 80AF39AC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01460 80AF39B0 A4F8010E */ sh $t8, 0x010E($a3) ## 0000010E -/* 01464 80AF39B4 AFA70018 */ sw $a3, 0x0018($sp) -/* 01468 80AF39B8 0C042DA0 */ jal func_8010B680 -/* 0146C 80AF39BC 8FA4001C */ lw $a0, 0x001C($sp) -/* 01470 80AF39C0 8FA70018 */ lw $a3, 0x0018($sp) -/* 01474 80AF39C4 24190011 */ addiu $t9, $zero, 0x0011 ## $t9 = 00000011 -/* 01478 80AF39C8 ACF902A8 */ sw $t9, 0x02A8($a3) ## 000002A8 -/* 0147C 80AF39CC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF39D0: -/* 01480 80AF39D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01484 80AF39D4 03E00008 */ jr $ra -/* 01488 80AF39D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3ADC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3ADC.s deleted file mode 100644 index ea97beb1cb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3ADC.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80AF3ADC -/* 0158C 80AF3ADC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01590 80AF3AE0 AFBF001C */ sw $ra, 0x001C($sp) -/* 01594 80AF3AE4 AFA50024 */ sw $a1, 0x0024($sp) -/* 01598 80AF3AE8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0159C 80AF3AEC 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 015A0 80AF3AF0 C48402C4 */ lwc1 $f4, 0x02C4($a0) ## 000002C4 -/* 015A4 80AF3AF4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 015A8 80AF3AF8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 015AC 80AF3AFC 46062200 */ add.s $f8, $f4, $f6 -/* 015B0 80AF3B00 44819000 */ mtc1 $at, $f18 ## $f18 = 100.00 -/* 015B4 80AF3B04 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 015B8 80AF3B08 24A5F8B8 */ addiu $a1, $a1, 0xF8B8 ## $a1 = 0600F8B8 -/* 015BC 80AF3B0C E48802C4 */ swc1 $f8, 0x02C4($a0) ## 000002C4 -/* 015C0 80AF3B10 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 -/* 015C4 80AF3B14 C48602C4 */ lwc1 $f6, 0x02C4($a0) ## 000002C4 -/* 015C8 80AF3B18 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 015CC 80AF3B1C 85CF145E */ lh $t7, 0x145E($t6) ## 8016145E -/* 015D0 80AF3B20 3C07C140 */ lui $a3, 0xC140 ## $a3 = C1400000 -/* 015D4 80AF3B24 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 015D8 80AF3B28 00000000 */ nop -/* 015DC 80AF3B2C 46805420 */ cvt.s.w $f16, $f10 -/* 015E0 80AF3B30 46128100 */ add.s $f4, $f16, $f18 -/* 015E4 80AF3B34 4606203C */ c.lt.s $f4, $f6 -/* 015E8 80AF3B38 00000000 */ nop -/* 015EC 80AF3B3C 4502000A */ bc1fl .L80AF3B68 -/* 015F0 80AF3B40 8FBF001C */ lw $ra, 0x001C($sp) -/* 015F4 80AF3B44 AFA00010 */ sw $zero, 0x0010($sp) -/* 015F8 80AF3B48 0C2BCA3A */ jal func_80AF28E8 -/* 015FC 80AF3B4C AFA40020 */ sw $a0, 0x0020($sp) -/* 01600 80AF3B50 8FA40020 */ lw $a0, 0x0020($sp) -/* 01604 80AF3B54 24180013 */ addiu $t8, $zero, 0x0013 ## $t8 = 00000013 -/* 01608 80AF3B58 AC9802A8 */ sw $t8, 0x02A8($a0) ## 000002A8 -/* 0160C 80AF3B5C 0C2BCDBB */ jal func_80AF36EC -/* 01610 80AF3B60 8FA50024 */ lw $a1, 0x0024($sp) -/* 01614 80AF3B64 8FBF001C */ lw $ra, 0x001C($sp) -.L80AF3B68: -/* 01618 80AF3B68 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0161C 80AF3B6C 03E00008 */ jr $ra -/* 01620 80AF3B70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3BC8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3BC8.s deleted file mode 100644 index f98bec8beb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3BC8.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AF3BC8 -/* 01678 80AF3BC8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0167C 80AF3BCC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01680 80AF3BD0 AFA40018 */ sw $a0, 0x0018($sp) -/* 01684 80AF3BD4 0C2BCE1E */ jal func_80AF3878 -/* 01688 80AF3BD8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0168C 80AF3BDC 8FA40018 */ lw $a0, 0x0018($sp) -/* 01690 80AF3BE0 0C00B56E */ jal Actor_SetHeight - -/* 01694 80AF3BE4 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 01698 80AF3BE8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0169C 80AF3BEC 0C2BC967 */ jal func_80AF259C -/* 016A0 80AF3BF0 8FA5001C */ lw $a1, 0x001C($sp) -/* 016A4 80AF3BF4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 016A8 80AF3BF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 016AC 80AF3BFC 03E00008 */ jr $ra -/* 016B0 80AF3C00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3C04.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3C04.s deleted file mode 100644 index 000a220f15..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3C04.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80AF3C04 -/* 016B4 80AF3C04 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 016B8 80AF3C08 AFBF001C */ sw $ra, 0x001C($sp) -/* 016BC 80AF3C0C AFB00018 */ sw $s0, 0x0018($sp) -/* 016C0 80AF3C10 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 016C4 80AF3C14 0C2BC9D1 */ jal func_80AF2744 -/* 016C8 80AF3C18 AFA50024 */ sw $a1, 0x0024($sp) -/* 016CC 80AF3C1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016D0 80AF3C20 0C2BC967 */ jal func_80AF259C -/* 016D4 80AF3C24 8FA50024 */ lw $a1, 0x0024($sp) -/* 016D8 80AF3C28 0C2BC9E3 */ jal func_80AF278C -/* 016DC 80AF3C2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016E0 80AF3C30 0C2BC982 */ jal func_80AF2608 -/* 016E4 80AF3C34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016E8 80AF3C38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016EC 80AF3C3C 0C00B56E */ jal Actor_SetHeight - -/* 016F0 80AF3C40 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 016F4 80AF3C44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016F8 80AF3C48 0C2BCE34 */ jal func_80AF38D0 -/* 016FC 80AF3C4C 8FA50024 */ lw $a1, 0x0024($sp) -/* 01700 80AF3C50 8FBF001C */ lw $ra, 0x001C($sp) -/* 01704 80AF3C54 8FB00018 */ lw $s0, 0x0018($sp) -/* 01708 80AF3C58 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0170C 80AF3C5C 03E00008 */ jr $ra -/* 01710 80AF3C60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3C64.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3C64.s deleted file mode 100644 index f5457c574c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3C64.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AF3C64 -/* 01714 80AF3C64 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01718 80AF3C68 AFBF001C */ sw $ra, 0x001C($sp) -/* 0171C 80AF3C6C AFB00018 */ sw $s0, 0x0018($sp) -/* 01720 80AF3C70 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01724 80AF3C74 0C2BC9D1 */ jal func_80AF2744 -/* 01728 80AF3C78 AFA50024 */ sw $a1, 0x0024($sp) -/* 0172C 80AF3C7C 0C2BC9E3 */ jal func_80AF278C -/* 01730 80AF3C80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01734 80AF3C84 0C2BC982 */ jal func_80AF2608 -/* 01738 80AF3C88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0173C 80AF3C8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01740 80AF3C90 0C00B56E */ jal Actor_SetHeight - -/* 01744 80AF3C94 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 01748 80AF3C98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0174C 80AF3C9C 0C2BCE43 */ jal func_80AF390C -/* 01750 80AF3CA0 8FA50024 */ lw $a1, 0x0024($sp) -/* 01754 80AF3CA4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01758 80AF3CA8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0175C 80AF3CAC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01760 80AF3CB0 03E00008 */ jr $ra -/* 01764 80AF3CB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3CB8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3CB8.s deleted file mode 100644 index 9ceea8b97c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3CB8.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AF3CB8 -/* 01768 80AF3CB8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0176C 80AF3CBC AFBF001C */ sw $ra, 0x001C($sp) -/* 01770 80AF3CC0 AFB00018 */ sw $s0, 0x0018($sp) -/* 01774 80AF3CC4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01778 80AF3CC8 0C2BC9D1 */ jal func_80AF2744 -/* 0177C 80AF3CCC AFA50024 */ sw $a1, 0x0024($sp) -/* 01780 80AF3CD0 0C2BC9E3 */ jal func_80AF278C -/* 01784 80AF3CD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01788 80AF3CD8 0C2BC982 */ jal func_80AF2608 -/* 0178C 80AF3CDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01790 80AF3CE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01794 80AF3CE4 0C00B56E */ jal Actor_SetHeight - -/* 01798 80AF3CE8 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 0179C 80AF3CEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017A0 80AF3CF0 0C2BCE77 */ jal func_80AF39DC -/* 017A4 80AF3CF4 8FA50024 */ lw $a1, 0x0024($sp) -/* 017A8 80AF3CF8 8FBF001C */ lw $ra, 0x001C($sp) -/* 017AC 80AF3CFC 8FB00018 */ lw $s0, 0x0018($sp) -/* 017B0 80AF3D00 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 017B4 80AF3D04 03E00008 */ jr $ra -/* 017B8 80AF3D08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3D0C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3D0C.s deleted file mode 100644 index a6cc530e71..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3D0C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AF3D0C -/* 017BC 80AF3D0C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 017C0 80AF3D10 AFBF001C */ sw $ra, 0x001C($sp) -/* 017C4 80AF3D14 AFB00018 */ sw $s0, 0x0018($sp) -/* 017C8 80AF3D18 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 017CC 80AF3D1C 0C2BC9D1 */ jal func_80AF2744 -/* 017D0 80AF3D20 AFA50024 */ sw $a1, 0x0024($sp) -/* 017D4 80AF3D24 0C2BC9E3 */ jal func_80AF278C -/* 017D8 80AF3D28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017DC 80AF3D2C 0C2BC982 */ jal func_80AF2608 -/* 017E0 80AF3D30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017E4 80AF3D34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017E8 80AF3D38 0C00B56E */ jal Actor_SetHeight - -/* 017EC 80AF3D3C 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 017F0 80AF3D40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017F4 80AF3D44 0C2BCEB7 */ jal func_80AF3ADC -/* 017F8 80AF3D48 8FA50024 */ lw $a1, 0x0024($sp) -/* 017FC 80AF3D4C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01800 80AF3D50 8FB00018 */ lw $s0, 0x0018($sp) -/* 01804 80AF3D54 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01808 80AF3D58 03E00008 */ jr $ra -/* 0180C 80AF3D5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3D60.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3D60.s deleted file mode 100644 index b7564d1f25..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3D60.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80AF3D60 -/* 01810 80AF3D60 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01814 80AF3D64 AFBF001C */ sw $ra, 0x001C($sp) -/* 01818 80AF3D68 AFB00018 */ sw $s0, 0x0018($sp) -/* 0181C 80AF3D6C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01820 80AF3D70 0C2BCDF3 */ jal func_80AF37CC -/* 01824 80AF3D74 AFA50024 */ sw $a1, 0x0024($sp) -/* 01828 80AF3D78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0182C 80AF3D7C 0C2BC9D1 */ jal func_80AF2744 -/* 01830 80AF3D80 8FA50024 */ lw $a1, 0x0024($sp) -/* 01834 80AF3D84 0C2BC9E3 */ jal func_80AF278C -/* 01838 80AF3D88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0183C 80AF3D8C 0C2BC982 */ jal func_80AF2608 -/* 01840 80AF3D90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01844 80AF3D94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01848 80AF3D98 0C00B56E */ jal Actor_SetHeight - -/* 0184C 80AF3D9C 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 01850 80AF3DA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01854 80AF3DA4 0C2BCEDD */ jal func_80AF3B74 -/* 01858 80AF3DA8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0185C 80AF3DAC 8FBF001C */ lw $ra, 0x001C($sp) -/* 01860 80AF3DB0 8FB00018 */ lw $s0, 0x0018($sp) -/* 01864 80AF3DB4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01868 80AF3DB8 03E00008 */ jr $ra -/* 0186C 80AF3DBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F14.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F14.s deleted file mode 100644 index 26c87ec112..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F14.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80AF3F14 -/* 019C4 80AF3F14 AFA40000 */ sw $a0, 0x0000($sp) -/* 019C8 80AF3F18 03E00008 */ jr $ra -/* 019CC 80AF3F1C AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/include/functions.h b/include/functions.h index 8c84fe9b62..44ba64924d 100644 --- a/include/functions.h +++ b/include/functions.h @@ -816,6 +816,7 @@ void func_8006EE48(UNK_TYPE); // ? func_8006F0FC(?); // ? func_8006F140(?); f32 func_8006F93C(u16, u16, u16); +f32 func_8006F9BC(u16, u16, u16, u16, u16); // ? func_8006FB94(?); // ? func_8006FC88(?); // ? func_80070600(?); diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index 7b4657ee54..ee72c4d786 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -8,7 +8,6 @@ void EnRu2_Destroy(EnRu2* this, GlobalContext* globalCtx); void EnRu2_Update(EnRu2* this, GlobalContext* globalCtx); void EnRu2_Draw(EnRu2* this, GlobalContext* globalCtx); - void func_80AF2CB4(EnRu2* this, GlobalContext* globalCtx); void func_80AF2CD4(EnRu2* this, GlobalContext* globalCtx); void func_80AF2CF4(EnRu2* this, GlobalContext* globalCtx); @@ -42,7 +41,7 @@ ColliderCylinderInit D_80AF40E0 = { { 0x001E, 0x0064, 0x0000, 0x0000, 0x0000, 0x0000}, }; -u32 D_80AF410C[] = { 0x06000F20, 0x060022E0, 0x06002AE0 }; +u32 D_80AF410C[] = { 0x06000F20, 0x060022E0, 0x06002AE0, }; u32 D_80AF4118 = 0; @@ -152,33 +151,33 @@ u32 D_80AF411C[] = ActorFunc D_80AF50BC[] = { - func_80AF2CB4, - func_80AF2CD4, - func_80AF2CF4, - func_80AF2D2C, - func_80AF2D6C, - func_80AF2DAC, - func_80AF2DEC, - func_80AF3144, - func_80AF3174, - func_80AF31C8, - func_80AF3604, - func_80AF3624, - func_80AF366C, - func_80AF36AC, - func_80AF3BC8, - func_80AF3C04, - func_80AF3C64, - func_80AF3CB8, - func_80AF3D0C, - func_80AF3D60 + (ActorFunc)func_80AF2CB4, + (ActorFunc)func_80AF2CD4, + (ActorFunc)func_80AF2CF4, + (ActorFunc)func_80AF2D2C, + (ActorFunc)func_80AF2D6C, + (ActorFunc)func_80AF2DAC, + (ActorFunc)func_80AF2DEC, + (ActorFunc)func_80AF3144, + (ActorFunc)func_80AF3174, + (ActorFunc)func_80AF31C8, + (ActorFunc)func_80AF3604, + (ActorFunc)func_80AF3624, + (ActorFunc)func_80AF366C, + (ActorFunc)func_80AF36AC, + (ActorFunc)func_80AF3BC8, + (ActorFunc)func_80AF3C04, + (ActorFunc)func_80AF3C64, + (ActorFunc)func_80AF3CB8, + (ActorFunc)func_80AF3D0C, + (ActorFunc)func_80AF3D60 }; ActorFunc D_80AF510C[] = { - func_80AF3F14, - func_80AF3F20, - func_80AF321C + (ActorFunc)func_80AF3F14, + (ActorFunc)func_80AF3F20, + (ActorFunc)func_80AF321C }; const ActorInit En_Ru2_InitVars = @@ -203,155 +202,734 @@ extern u32 D_06000DE8; extern u32 D_0600E630; extern u32 D_0600F03C; extern u32 D_0600F8B8; +extern u32 D_80116280; // z_actor.c +extern u32 D_80116290; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2550.s") +void func_80AF2550(EnRu2* this, GlobalContext* globalCtx) { + EnRu2* thisLocal = this; + ActorCollider_AllocCylinder(globalCtx, &thisLocal->collider); + func_8005C450(globalCtx, &thisLocal->collider, &this->actor, &D_80AF40E0); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF259C.s") +void func_80AF259C(EnRu2* this, GlobalContext* globalCtx) { + s32 pad; + ColliderCylinderMain* collider = &this->collider; + Actor* thisx = &this->actor; + s32 pad2[2]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Destroy.s") + ActorCollider_Cylinder_Update(thisx, collider); + Actor_CollisionCheck_SetAC(globalCtx, &globalCtx->sub_11E60, collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2608.s") +void EnRu2_Destroy(EnRu2* this, GlobalContext* globalCtx) { + ColliderCylinderMain* collider = &this->collider; + ActorCollider_FreeCylinder(globalCtx, collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2690.s") +void func_80AF2608(EnRu2* this) { + s32 pad[3]; + s16* unk_2A6 = &this->unk_2A6; + s16* unk_2A4 = &this->unk_2A4; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26A0.s") + if (!DECR(*unk_2A6)) { + *unk_2A6 = Math_Rand_S16Offset(0x3C, 0x3C); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26AC.s") + *unk_2A4 = *unk_2A6; + if (*unk_2A4 >= 3) { + *unk_2A4 = 0; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26D0.s") +s32 func_80AF2690(EnRu2* this) { + s32 params_shift = this->actor.params >> 8; + return params_shift & 0xFF; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2744.s") +s32 func_80AF26A0(EnRu2* this) { + s16 params = this->actor.params; + return params & 0xFF; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF278C.s") +void func_80AF26AC(EnRu2* this) { + this->action = 7; + this->drawConfig = 0; + this->unk_2B4 = 0; + this->unk_2B8 = 0; + this->actor.shape.unk_14 = 0; + this->unk_2B0 = 0.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF27AC.s") +void func_80AF26D0(EnRu2* this, GlobalContext* globalCtx) { + s32 one; + if (globalCtx->csCtx.state == 0) { + if (D_80AF4118 != 0) { + if (this->actor.params == 2) { + func_80AF26AC(this); + } + D_80AF4118 = 0; + return; + } + } + else { + one = 1; + if (D_80AF4118 == 0) { + D_80AF4118 = one; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF27D0.s") +void func_80AF2744(EnRu2* this, GlobalContext* globalCtx) { + func_8002E4B4(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 4); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF281C.s") +s32 EnRu2_FrameUpdateMatrix(EnRu2* this) { + return SkelAnime_FrameUpdateMatrix(&this->skelAnime); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2868.s") +CsCmdActorAction* func_80AF27AC(GlobalContext* globalCtx, s32 actorActionIdx) { + if (globalCtx->csCtx.state != 0) { + return globalCtx->csCtx.actorActions[actorActionIdx]; + } + return 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF28E8.s") +s32 func_80AF27D0(EnRu2* this, GlobalContext* globalCtx, u16 arg2, s32 actorActionIdx) { + CsCmdActorAction* csCmdActorAction = func_80AF27AC(globalCtx, actorActionIdx); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2978.s") + if (csCmdActorAction != NULL && csCmdActorAction->action == arg2) { + return 1; + } + return 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2994.s") +s32 func_80AF281C(EnRu2* this, GlobalContext* globalCtx, u16 arg2, s32 actorActionIdx) { + CsCmdActorAction* csCmdActorAction = func_80AF27AC(globalCtx, actorActionIdx); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF29DC.s") + if (csCmdActorAction != NULL && csCmdActorAction->action != arg2) { + return 1; + } + return 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2A38.s") +void func_80AF2868(EnRu2* this, GlobalContext* globalCtx, u32 actorActionIdx) { + CsCmdActorAction* csCmdActorAction = func_80AF27AC(globalCtx, actorActionIdx); + s16 newRotY; + Actor* thisx = &this->actor; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2AB4.s") + if (csCmdActorAction != NULL) { + thisx->posRot.pos.x = csCmdActorAction->startPos.x; + thisx->posRot.pos.y = csCmdActorAction->startPos.y; + thisx->posRot.pos.z = csCmdActorAction->startPos.z; + newRotY = csCmdActorAction->rot.y; + thisx->shape.rot.y = newRotY; + thisx->posRot.rot.y = newRotY; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2B44.s") +void func_80AF28E8(EnRu2* this, u32 animation, u8 arg2, f32 transitionRate, s32 arg4) { + f32 frameCount = SkelAnime_GetFrameCount(animation); + f32 playbackSpeed; + f32 unk0; + f32 fc; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2B94.s") + if (arg4 == 0) { + unk0 = 0.0f; + fc = frameCount; + playbackSpeed = 1.0f; + } else { + unk0 = frameCount; + fc = 0.0f; + playbackSpeed = -1.0f; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2BC0.s") + SkelAnime_ChangeAnimation(&this->skelAnime, animation, playbackSpeed, unk0, fc, arg2, transitionRate); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2C54.s") +void func_80AF2978(EnRu2* this, GlobalContext* globalCtx) { + this->actor.shape.unk_08 += 83.333336f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2C68.s") +void func_80AF2994(EnRu2* this, GlobalContext* globalCtx) { + func_80AF28E8(this, &D_06000DE8, 0, 0.0f, 0); + this->actor.shape.unk_08 = -10000.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CB4.s") +void func_80AF29DC(EnRu2* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + f32 posX = thisx->posRot.pos.x; + f32 posY = thisx->posRot.pos.y; + f32 posZ = thisx->posRot.pos.z; + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0, 2); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CD4.s") +void func_80AF2A38(EnRu2* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 posX = player->actor.posRot.pos.x; + f32 posY = player->actor.posRot.pos.y + 50.0f; + f32 posZ = player->actor.posRot.pos.z; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CF4.s") + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0, 10); + Item_Give(globalCtx, ITEM_MEDALLION_WATER); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2D2C.s") +void func_80AF2AB4(EnRu2* this, GlobalContext* globalCtx) { + s32 pad[2]; + Player* player; + s16 temp; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2D6C.s") + if (gSaveContext.chamber_cutscene_num == 2 && gSaveContext.scene_setup_index < 4) { + player = PLAYER; + this->action = 1; + globalCtx->csCtx.segment = &D_80AF411C; + gSaveContext.cutscene_trigger = 2; + Item_Give(globalCtx, ITEM_MEDALLION_WATER); + temp = this->actor.posRot.rot.y + 0x8000; + player->actor.shape.rot.y = temp; + player->actor.posRot.rot.y = temp; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2DAC.s") +void func_80AF2B44(EnRu2* this, GlobalContext* globalCtx) { + CutsceneContext* csCtx = &globalCtx->csCtx; + CsCmdActorAction* csCmdActorAction; + if (csCtx->state != 0) { + csCmdActorAction = csCtx->actorActions[3]; + if (csCmdActorAction != NULL && csCmdActorAction->action == 2) { + this->action = 2; + this->drawConfig = 1; + func_80AF29DC(this, globalCtx); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2DEC.s") +void func_80AF2B94(EnRu2* this) { + if (this->actor.shape.unk_08 >= 0.0f) { + this->action = 3; + this->actor.shape.unk_08 = 0.0f; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E1C.s") +void func_80AF2BC0(EnRu2* this, GlobalContext* globalCtx) { + UNK_PTR animation = &D_0600D3DC; + CsCmdActorAction* csCmdActorAction; + if (globalCtx->csCtx.state != 0) { + csCmdActorAction = globalCtx->csCtx.actorActions[3]; + if (csCmdActorAction != NULL && csCmdActorAction->action == 3) { + SkelAnime_ChangeAnimation(&this->skelAnime, animation, 1.0f, 0.0f, SkelAnime_GetFrameCount(animation), 2, 0.0f); + this->action = 4; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E64.s") +void func_80AF2C54(EnRu2* this, UNK_TYPE arg1) { + if (arg1 != 0) { + this->action = 5; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E84.s") +void func_80AF2C68(EnRu2* this, GlobalContext* globalCtx) { + CsCmdActorAction* csCmdActorAction; + if (globalCtx->csCtx.state != 0) { + csCmdActorAction = globalCtx->csCtx.actorActions[6]; + if (csCmdActorAction != NULL && csCmdActorAction->action == 2) { + this->action = 6; + func_80AF2A38(this, globalCtx); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2F04.s") +void func_80AF2CB4(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2AB4(this, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2F58.s") +void func_80AF2CD4(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2B44(this, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF30AC.s") +void func_80AF2CF4(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2978(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + func_80AF2B94(this); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3144.s") +void func_80AF2D2C(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + func_80AF2BC0(this, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3174.s") +void func_80AF2D6C(EnRu2* this, GlobalContext* globalCtx) { + UNK_TYPE something; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF31C8.s") + func_80AF2744(this, globalCtx); + something = EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + func_80AF2C54(this, something); +} + +void func_80AF2DAC(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + func_80AF2C68(this, globalCtx); +} + +void func_80AF2DEC(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); +} + +void func_80AF2E1C(EnRu2* this, GlobalContext* globalCtx) { + func_80AF28E8(this, &D_060004CC, 2, 0.0f, 0); + this->action = 7; + this->actor.shape.unk_14 = 0; +} + +void func_80AF2E64() { + func_800788CC(NA_SE_SY_WHITE_OUT_T); +} + +void func_80AF2E84(EnRu2* this, GlobalContext* globalCtx) { + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_6K, this->actor.posRot.pos.x, + kREG(19) + 24.0f + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 8); +} + +void func_80AF2F04(EnRu2* this, GlobalContext* globalCtx) { + if (func_80AF27D0(this, globalCtx, 4, 3)) { + this->action = 8; + this->drawConfig = 2; + this->unk_2B4 = 0; + this->actor.shape.unk_14 = 0; + this->unk_2B0 = 0.0f; + func_80AF2E64(); + } +} + +void func_80AF2F58(EnRu2* this, GlobalContext* globalCtx) { + f32* unk_2B0 = &this->unk_2B0; + s32 something; + + if (func_80AF27D0(this, globalCtx, 4, 3)) { + *unk_2B0 += 1.0f; + if (*unk_2B0 >= kREG(5) + 10.0f) { + this->action = 9; + this->drawConfig = 1; + *unk_2B0 = kREG(5) + 10.0f; + this->unk_2B4 = 0xFF; + this->actor.shape.unk_14 = 0xFF; + return; + } + } else { + *unk_2B0 -= 1.0f; + if (*unk_2B0 <= 0.0f) { + this->action = 7; + this->drawConfig = 0; + *unk_2B0 = 0.0f; + this->unk_2B4 = 0; + this->actor.shape.unk_14 = 0; + return; + } + } + something = (*unk_2B0 / (kREG(5) + 10.0f)) * 255.0f; + this->unk_2B4 = something; + this->actor.shape.unk_14 = something; +} + +void func_80AF30AC(EnRu2* this, GlobalContext* globalCtx) { + if (func_80AF281C(this, globalCtx, 4, 3)) { + this->action = 8; + this->drawConfig = 2; + this->unk_2B0 = kREG(5) + 10.0f; + this->unk_2B4 = 0xFF; + if (this->unk_2B8 == 0) { + func_80AF2E84(this, globalCtx); + this->unk_2B8 = 1; + } + this->actor.shape.unk_14 = 0xFF; + } +} + +void func_80AF3144(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2F04(this, globalCtx); + func_80AF26D0(this, globalCtx); +} + +void func_80AF3174(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + func_80AF2F58(this, globalCtx); + func_80AF26D0(this, globalCtx); +} + +void func_80AF31C8(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + func_80AF30AC(this, globalCtx); + func_80AF26D0(this, globalCtx); +} #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF321C.s") +/*void func_80AF321C(EnRu2* this, GlobalContext* globalCtx) { + s32 pad[3]; + u32 addr = D_80AF410C[this->unk_2A4]; + SkelAnime* skelAnime = &this->skelAnime; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* gfxArr[4]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3394.s") + func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 264); + func_80093D84(globalCtx->state.gfxCtx); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF33E0.s") + gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr)); + gSPSegment(gfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr)); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0x00, this->unk_2B4); + gSPSegment(gfxCtx->polyXlu.p++, 0x0C, &D_80116280); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF346C.s") + gfxCtx->polyXlu.p = func_800A273C(globalCtx, skelAnime->limbIndex, skelAnime->actorDrawTbl, skelAnime->dListCount, + 0, 0, 0, gfxCtx->polyXlu.p); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF34A4.s") + func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 291); +}*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF34F0.s") +void func_80AF3394(EnRu2* this, GlobalContext* globalCtx) { + func_80AF28E8(this, &D_0600E630, 0, 0.0f, 0); + this->action = 10; + this->drawConfig = 0; + this->actor.shape.unk_14 = 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3530.s") +void func_80AF33E0(EnRu2* this) { + f32* unk_2B0 = &this->unk_2B0; + f32 temp_f0; + s32 temp_f18; + + *unk_2B0 += 1.0f; + + temp_f0 = kREG(17) + 10.0f; + if (temp_f0 <= *unk_2B0) { + this->unk_2B4 = 0xFF; + this->actor.shape.unk_14 = 0xFF; + } + else { + temp_f18 = (*unk_2B0/ temp_f0) * 255.0f; + this->unk_2B4 = temp_f18; + this->actor.shape.unk_14 = temp_f18; + } +} + +void func_80AF346C(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2868(this, globalCtx, 3); + this->action = 11; + this->drawConfig = 2; +} + +void func_80AF34A4(EnRu2* this) { + if (kREG(17) + 10.0f <= this->unk_2B0) { + this->action = 12; + this->drawConfig = 1; + } +} + +void func_80AF34F0(EnRu2* this) { + func_80AF28E8(this, &D_0600DCAC, 2, 0.0f, 0); + this->action = 13; +} + +void func_80AF3530(EnRu2* this, UNK_TYPE arg1) { + if (arg1 != 0) { + func_80AF28E8(this, &D_0600F03C, 0, 0.0f, 0); + } +} #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3564.s") +/*void func_80AF3564(EnRu2* this, GlobalContext* globalCtx) { + CsCmdActorAction* csCmdActorAction = func_80AF27AC(globalCtx, 3); + s32 action; + + if (csCmdActorAction != NULL) { + action = csCmdActorAction->action; + if (action != this->unk_2BC) { + switch (action) { + case 7: + func_80AF346C(this, globalCtx); + break; + case 8: + func_80AF34F0(this); + break; + default: + osSyncPrintf("En_Ru2_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + break; + } + this->unk_2BC = action; + } + } +}*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3604.s") +void func_80AF3604(EnRu2* this, GlobalContext* globalCtx) { + func_80AF3564(this, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3624.s") +void func_80AF3624(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + func_80AF33E0(this); + func_80AF34A4(this); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF366C.s") +void func_80AF366C(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + func_80AF3564(this, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF36AC.s") +void func_80AF36AC(EnRu2* this, GlobalContext* globalCtx) { + UNK_TYPE something; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF36EC.s") + func_80AF2744(this, globalCtx); + something = EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + func_80AF3530(this, something); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3718.s") +void func_80AF36EC(EnRu2* this, GlobalContext* globalCtx) { + Flags_SetSwitch(globalCtx, func_80AF2690(this)); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3744.s") +s32 func_80AF3718(EnRu2* this, GlobalContext* globalCtx) { + return Flags_GetSwitch(globalCtx, func_80AF2690(this)); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF37AC.s") +void func_80AF3744(EnRu2* this, GlobalContext* globalCtx) { + if (func_80AF3718(this, globalCtx)) { + Actor_Kill(&this->actor); + return; + } + func_80AF28E8(this, &D_06000DE8, 0, 0.0f, 0); + this->action = 14; + this->drawConfig = 1; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF37CC.s") +void func_80AF37AC() { + func_800F5C64(0x51); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF383C.s") +void func_80AF37CC(EnRu2* this) { + f32 funcFloat; + this->unk_2C0 += 1; + funcFloat = func_8006F9BC((kREG(2) + 0x96) & 0xFFFF, 0, this->unk_2C0, 8, 0); + this->actor.posRot.pos.y = this->actor.initPosRot.pos.y + (300.0f * funcFloat); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3878.s") +s32 func_80AF383C(EnRu2* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 thisPosX = this->actor.posRot.pos.x; + f32 playerPosX = player->actor.posRot.pos.x; + if (playerPosX - thisPosX >= -202.0f) { + return 1; + } + return 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF38D0.s") +void func_80AF3878(EnRu2* this, GlobalContext* globalCtx) { + if (func_80AF383C(this, globalCtx) && !func_800BFC84(globalCtx)) { + this->action = 16; + func_800800F8(globalCtx, 0xC3A, -0x63, &this->actor, 0); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF390C.s") +void func_80AF38D0(EnRu2* this, GlobalContext* globalCtx) { + this->action = 16; + func_800800F8(globalCtx, 0xC3A, -0x63, &this->actor, 0); +} + + +void func_80AF390C(EnRu2* this, GlobalContext* globalCtx) { + f32* unk_2C4 = &this->unk_2C4; + *unk_2C4 += 1.0f; + if (*unk_2C4 == kREG(6) + 40.0f) { + func_80AF37AC(); + return; + } + + if (*unk_2C4 > kREG(4) + 50.0f) { + this->actor.textId = 0x403E; + func_8010B680(globalCtx, this->actor.textId, 0); + this->action = 17; + } +} #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF39DC.s") +/*void func_80AF39DC(EnRu2* this, GlobalContext* globalCtx) { + s32 pad; + MessageContext* msgCtx; + u8* unk_2C2; + u8 dialogState; + Player* player; + s32 pad2; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3ADC.s") + msgCtx = &globalCtx->msgCtx; + dialogState = func_8010BDBC(msgCtx); + + if (dialogState == 3) { + if (this->unk_2C3 != 3) { + osSyncPrintf("おれが小松だ！ \n"); + unk_2C2 = &this->unk_2C2; + *unk_2C2 += 1; + *unk_2C2 = *unk_2C2 % 6; + + if (*unk_2C2 == 3) { + player = PLAYER; + osSyncPrintf("うおりゃー！ \n"); + func_8005B1A4(globalCtx->cameraCtx.activeCameraPtrs[0]); + player->actor.posRot.pos.x = 820.0f; + player->actor.posRot.pos.y = 0.0f; + player->actor.posRot.pos.z = 180.0f; + } + } + } + + this->unk_2C3 = dialogState; + if (func_8010BDBC(msgCtx) == 2) { + this->action = 18; + func_8005B1A4(globalCtx->cameraCtx.activeCameraPtrs[0]); + } +}*/ + +void func_80AF3ADC(EnRu2* this, GlobalContext* globalCtx) { + this->unk_2C4 += 1.0f; + if (this->unk_2C4 > kREG(5) + 100.0f) { + func_80AF28E8(this, &D_0600F8B8, 0, -12.0f, 0); + this->action = 0x13; + func_80AF36EC(this, globalCtx); + } +} #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3B74.s") +/*void func_80AF3B74(EnRu2* this, GlobalContext* globalCtx) { + u16 temp = (((u16)(kREG(3) + 0x28)) + ((u16)(kREG(2) + 0x96))) & 0xFFFFFFFFFFFFFFFF; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3BC8.s") + if (this->unk_2C0 > temp) { + Actor_Kill(&this->actor); + } +}*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3C04.s") +void func_80AF3BC8(EnRu2* this, GlobalContext* globalCtx) { + func_80AF3878(this, globalCtx); + Actor_SetHeight(&this->actor, 50.0f); + func_80AF259C(this, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3C64.s") +void func_80AF3C04(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + func_80AF259C(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + Actor_SetHeight(&this->actor, 50.0f); + func_80AF38D0(this, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3CB8.s") +void func_80AF3C64(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + Actor_SetHeight(&this->actor, 50.0f); + func_80AF390C(this, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3D0C.s") +void func_80AF3CB8(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + Actor_SetHeight(&this->actor, 50.0f); + func_80AF39DC(this, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3D60.s") +void func_80AF3D0C(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + Actor_SetHeight(&this->actor, 50.0f); + func_80AF3ADC(this, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Update.s") +void func_80AF3D60(EnRu2* this, GlobalContext* globalCtx) { + func_80AF37CC(this); + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + Actor_SetHeight(&this->actor, 50.0f); + func_80AF3B74(this, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Init.s") +void EnRu2_Update(EnRu2* this, GlobalContext* globalCtx) { + if (this->action < 0 || this->action >= 20 || D_80AF50BC[this->action] == 0) { + osSyncPrintf("メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + return; + } + D_80AF50BC[this->action](this, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F14.s") +void EnRu2_Init(EnRu2* this, GlobalContext* globalCtx) { + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + func_80AF2550(this, globalCtx); + func_800A46F8(globalCtx, &this->skelAnime, &D_0600C700, 0, &this->unk_190, &this->unk_21A, 0x17); + + switch (func_80AF26A0(this)) { + case 2: + func_80AF2E1C(this, globalCtx); + break; + case 3: + func_80AF3394(this, globalCtx); + break; + case 4: + func_80AF3744(this, globalCtx); + break; + default: + func_80AF2994(this, globalCtx); + break; + } + + this->unk_2C2 = 0; + this->unk_2C3 = 3; +} + +void func_80AF3F14(EnRu2* this, GlobalContext* globalCtx) { + +} #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F20.s") +/*void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx) { + s32 pad[3]; + u32 something = D_80AF410C[this->unk_2A4]; + SkelAnime* skelAnime = &this->skelAnime; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* gfxArr[4]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Draw.s") + func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2.c", 642); + func_80093D18(globalCtx->state.gfxCtx); + + gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(something)); + gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(something)); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x00, 0x00, 0x00, 0xFF); + gSPSegment(gfxCtx->polyOpa.p++, 0x0C, &D_80116290); + + func_800A1AC8(globalCtx, skelAnime->limbIndex, skelAnime->actorDrawTbl, skelAnime->dListCount, + NULL, NULL, &this->actor); + func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2.c", 663); +}*/ + +void EnRu2_Draw(EnRu2* this, GlobalContext* globalCtx) { +if (this->drawConfig < 0 || this->drawConfig >= 3 || D_80AF510C[this->drawConfig] == 0) + { + osSyncPrintf("描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + return; + } + D_80AF510C[this->drawConfig](this, globalCtx); +} diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h index 89e41d7c7c..b8e47a90ef 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h @@ -19,10 +19,9 @@ typedef struct /* 0x02B0 */ f32 unk_2B0; /* 0x02B4 */ u32 unk_2B4; /* 0x02B8 */ s32 unk_2B8; - /* 0x02BC */ s16 unk_2BC; - /* 0x02BE */ char unk_2BE[0x2]; + /* 0x02BC */ s32 unk_2BC; /* 0x02C0 */ u16 unk_2C0; - /* 0x02C2 */ u8 unk_2C2; + /* 0x02C2 */ s8 unk_2C2; /* 0x02C3 */ u8 unk_2C3; /* 0x02C4 */ f32 unk_2C4; /* 0x02C8 */ ColliderCylinderMain collider; diff --git a/undefined_syms.txt b/undefined_syms.txt index 1a95ed542d..dc92b7cc64 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -376,6 +376,9 @@ D_06000350 = 0x06000350; // z_en_ru2 D_060004CC = 0x060004CC; +D_06000F20 = 0x06000F20; +D_060022E0 = 0x060022E0; +D_06002AE0 = 0x06002AE0; D_0600C700 = 0x0600C700; D_0600D3DC = 0x0600D3DC; D_0600DCAC = 0x0600DCAC; @@ -383,6 +386,8 @@ D_06000DE8 = 0x06000DE8; D_0600E630 = 0x0600E630; D_0600F03C = 0x0600F03C; D_0600F8B8 = 0x0600F8B8; +D_80116280 = 0x80116280; +D_80116290 = 0x80116290; // z_bg_mjin D_06000140 = 0x06000140;