diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Destroy.s deleted file mode 100644 index 665e5eebf6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Destroy.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel EnRu1_Destroy -/* 001EC 80AEADFC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001F0 80AEAE00 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001F4 80AEAE04 0C2BAB66 */ jal func_80AEAD98 -/* 001F8 80AEAE08 00000000 */ nop -/* 001FC 80AEAE0C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00200 80AEAE10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00204 80AEAE14 03E00008 */ jr $ra -/* 00208 80AEAE18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Draw.s deleted file mode 100644 index e523210350..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Draw.s +++ /dev/null @@ -1,34 +0,0 @@ -.rdata -glabel D_80AF1B94 - .asciz "\x1b[31m描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.text -glabel EnRu1_Draw -/* 05B94 80AF07A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05B98 80AF07A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 05B9C 80AF07AC 8C820268 */ lw $v0, 0x0268($a0) ## 00000268 -/* 05BA0 80AF07B0 04400008 */ bltz $v0, .L80AF07D4 -/* 05BA4 80AF07B4 28410003 */ slti $at, $v0, 0x0003 -/* 05BA8 80AF07B8 10200006 */ beq $at, $zero, .L80AF07D4 -/* 05BAC 80AF07BC 00027080 */ sll $t6, $v0, 2 -/* 05BB0 80AF07C0 3C0380AF */ lui $v1, %hi(D_80AF1A04) ## $v1 = 80AF0000 -/* 05BB4 80AF07C4 006E1821 */ addu $v1, $v1, $t6 -/* 05BB8 80AF07C8 8C631A04 */ lw $v1, %lo(D_80AF1A04)($v1) -/* 05BBC 80AF07CC 14600006 */ bne $v1, $zero, .L80AF07E8 -/* 05BC0 80AF07D0 00000000 */ nop -.L80AF07D4: -/* 05BC4 80AF07D4 3C0480AF */ lui $a0, %hi(D_80AF1B94) ## $a0 = 80AF0000 -/* 05BC8 80AF07D8 0C00084C */ jal osSyncPrintf - -/* 05BCC 80AF07DC 24841B94 */ addiu $a0, $a0, %lo(D_80AF1B94) ## $a0 = 80AF1B94 -/* 05BD0 80AF07E0 10000004 */ beq $zero, $zero, .L80AF07F4 -/* 05BD4 80AF07E4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF07E8: -/* 05BD8 80AF07E8 0060F809 */ jalr $ra, $v1 -/* 05BDC 80AF07EC 00000000 */ nop -/* 05BE0 80AF07F0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF07F4: -/* 05BE4 80AF07F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05BE8 80AF07F8 03E00008 */ jr $ra -/* 05BEC 80AF07FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Init.s deleted file mode 100644 index b64ab108ff..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Init.s +++ /dev/null @@ -1,125 +0,0 @@ -.rdata -glabel D_80AF1AFC - .asciz "該当 arge_data = %d 無し\n" - .balign 4 - -.late_rodata -glabel jtbl_80AF1C60 -.word L80AF01A4 -.word L80AF01B8 -.word L80AF01CC -.word L80AF01E0 -.word L80AF01F4 -.word L80AF0208 -.word L80AF021C -.word L80AF0244 -.word L80AF0244 -.word L80AF0244 -.word L80AF0230 - -.text -glabel EnRu1_Init -/* 05500 80AF0110 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 05504 80AF0114 AFB10028 */ sw $s1, 0x0028($sp) -/* 05508 80AF0118 AFB00024 */ sw $s0, 0x0024($sp) -/* 0550C 80AF011C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05510 80AF0120 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 05514 80AF0124 AFBF002C */ sw $ra, 0x002C($sp) -/* 05518 80AF0128 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 0551C 80AF012C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC -/* 05520 80AF0130 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 05524 80AF0134 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 05528 80AF0138 0C00AC78 */ jal ActorShape_Init - -/* 0552C 80AF013C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 05530 80AF0140 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 05534 80AF0144 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 -/* 05538 80AF0148 260F01F6 */ addiu $t7, $s0, 0x01F6 ## $t7 = 000001F6 -/* 0553C 80AF014C 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 -/* 05540 80AF0150 AFB80018 */ sw $t8, 0x0018($sp) -/* 05544 80AF0154 AFAF0014 */ sw $t7, 0x0014($sp) -/* 05548 80AF0158 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0554C 80AF015C 24C62700 */ addiu $a2, $a2, 0x2700 ## $a2 = 06012700 -/* 05550 80AF0160 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 05554 80AF0164 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 05558 80AF0168 0C0291BE */ jal SkelAnime_InitSV -/* 0555C 80AF016C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 05560 80AF0170 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05564 80AF0174 0C2BAB48 */ jal func_80AEAD20 -/* 05568 80AF0178 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0556C 80AF017C 0C2BAB7C */ jal func_80AEADF0 -/* 05570 80AF0180 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05574 80AF0184 2C41000B */ sltiu $at, $v0, 0x000B -/* 05578 80AF0188 1020002E */ beq $at, $zero, .L80AF0244 -/* 0557C 80AF018C 0002C880 */ sll $t9, $v0, 2 -/* 05580 80AF0190 3C0180AF */ lui $at, %hi(jtbl_80AF1C60) ## $at = 80AF0000 -/* 05584 80AF0194 00390821 */ addu $at, $at, $t9 -/* 05588 80AF0198 8C391C60 */ lw $t9, %lo(jtbl_80AF1C60)($at) -/* 0558C 80AF019C 03200008 */ jr $t9 -/* 05590 80AF01A0 00000000 */ nop -glabel L80AF01A4 -/* 05594 80AF01A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05598 80AF01A8 0C2BB368 */ jal func_80AECDA0 -/* 0559C 80AF01AC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 055A0 80AF01B0 1000002D */ beq $zero, $zero, .L80AF0268 -/* 055A4 80AF01B4 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80AF01B8 -/* 055A8 80AF01B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 055AC 80AF01BC 0C2BACF7 */ jal func_80AEB3DC -/* 055B0 80AF01C0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 055B4 80AF01C4 10000028 */ beq $zero, $zero, .L80AF0268 -/* 055B8 80AF01C8 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80AF01CC -/* 055BC 80AF01CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 055C0 80AF01D0 0C2BB0C8 */ jal func_80AEC320 -/* 055C4 80AF01D4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 055C8 80AF01D8 10000023 */ beq $zero, $zero, .L80AF0268 -/* 055CC 80AF01DC 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80AF01E0 -/* 055D0 80AF01E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 055D4 80AF01E4 0C2BB513 */ jal func_80AED44C -/* 055D8 80AF01E8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 055DC 80AF01EC 1000001E */ beq $zero, $zero, .L80AF0268 -/* 055E0 80AF01F0 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80AF01F4 -/* 055E4 80AF01F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 055E8 80AF01F8 0C2BBF15 */ jal func_80AEFC54 -/* 055EC 80AF01FC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 055F0 80AF0200 10000019 */ beq $zero, $zero, .L80AF0268 -/* 055F4 80AF0204 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80AF0208 -/* 055F8 80AF0208 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 055FC 80AF020C 0C2BBF4E */ jal func_80AEFD38 -/* 05600 80AF0210 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05604 80AF0214 10000014 */ beq $zero, $zero, .L80AF0268 -/* 05608 80AF0218 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80AF021C -/* 0560C 80AF021C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05610 80AF0220 0C2BBFE5 */ jal func_80AEFF94 -/* 05614 80AF0224 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05618 80AF0228 1000000F */ beq $zero, $zero, .L80AF0268 -/* 0561C 80AF022C 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80AF0230 -/* 05620 80AF0230 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05624 80AF0234 0C2BC014 */ jal func_80AF0050 -/* 05628 80AF0238 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0562C 80AF023C 1000000A */ beq $zero, $zero, .L80AF0268 -/* 05630 80AF0240 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80AF0244 -.L80AF0244: -/* 05634 80AF0244 0C00B55C */ jal Actor_Kill - -/* 05638 80AF0248 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0563C 80AF024C 0C2BAB7C */ jal func_80AEADF0 -/* 05640 80AF0250 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05644 80AF0254 3C0480AF */ lui $a0, %hi(D_80AF1AFC) ## $a0 = 80AF0000 -/* 05648 80AF0258 24841AFC */ addiu $a0, $a0, %lo(D_80AF1AFC) ## $a0 = 80AF1AFC -/* 0564C 80AF025C 0C00084C */ jal osSyncPrintf - -/* 05650 80AF0260 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 05654 80AF0264 8FBF002C */ lw $ra, 0x002C($sp) -.L80AF0268: -/* 05658 80AF0268 8FB00024 */ lw $s0, 0x0024($sp) -/* 0565C 80AF026C 8FB10028 */ lw $s1, 0x0028($sp) -/* 05660 80AF0270 03E00008 */ jr $ra -/* 05664 80AF0274 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Update.s deleted file mode 100644 index bdb32a7079..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Update.s +++ /dev/null @@ -1,34 +0,0 @@ -.rdata -glabel D_80AF1AC0 - .asciz "\x1b[31mメインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.text -glabel EnRu1_Update -/* 054A4 80AF00B4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 054A8 80AF00B8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 054AC 80AF00BC 8C820264 */ lw $v0, 0x0264($a0) ## 00000264 -/* 054B0 80AF00C0 04400008 */ bltz $v0, .L80AF00E4 -/* 054B4 80AF00C4 2841002E */ slti $at, $v0, 0x002E -/* 054B8 80AF00C8 10200006 */ beq $at, $zero, .L80AF00E4 -/* 054BC 80AF00CC 00027080 */ sll $t6, $v0, 2 -/* 054C0 80AF00D0 3C0380AF */ lui $v1, %hi(D_80AF193C) ## $v1 = 80AF0000 -/* 054C4 80AF00D4 006E1821 */ addu $v1, $v1, $t6 -/* 054C8 80AF00D8 8C63193C */ lw $v1, %lo(D_80AF193C)($v1) -/* 054CC 80AF00DC 14600006 */ bne $v1, $zero, .L80AF00F8 -/* 054D0 80AF00E0 00000000 */ nop -.L80AF00E4: -/* 054D4 80AF00E4 3C0480AF */ lui $a0, %hi(D_80AF1AC0) ## $a0 = 80AF0000 -/* 054D8 80AF00E8 0C00084C */ jal osSyncPrintf - -/* 054DC 80AF00EC 24841AC0 */ addiu $a0, $a0, %lo(D_80AF1AC0) ## $a0 = 80AF1AC0 -/* 054E0 80AF00F0 10000004 */ beq $zero, $zero, .L80AF0104 -/* 054E4 80AF00F4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF00F8: -/* 054E8 80AF00F8 0060F809 */ jalr $ra, $v1 -/* 054EC 80AF00FC 00000000 */ nop -/* 054F0 80AF0100 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF0104: -/* 054F4 80AF0104 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 054F8 80AF0108 03E00008 */ jr $ra -/* 054FC 80AF010C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAC10.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAC10.s deleted file mode 100644 index 0952aa5f8a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAC10.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80AEAC10 -/* 00000 80AEAC10 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00004 80AEAC14 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 80AEAC18 AFA50034 */ sw $a1, 0x0034($sp) -/* 0000C 80AEAC1C 248602B4 */ addiu $a2, $a0, 0x02B4 ## $a2 = 000002B4 -/* 00010 80AEAC20 00C02825 */ or $a1, $a2, $zero ## $a1 = 000002B4 -/* 00014 80AEAC24 0C0189B7 */ jal ActorCollider_Cylinder_Update - -/* 00018 80AEAC28 AFA60018 */ sw $a2, 0x0018($sp) -/* 0001C 80AEAC2C 8FA40034 */ lw $a0, 0x0034($sp) -/* 00020 80AEAC30 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00024 80AEAC34 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00028 80AEAC38 8FA60018 */ lw $a2, 0x0018($sp) -/* 0002C 80AEAC3C 0C017713 */ jal Actor_CollisionCheck_SetOT - ## CollisionCheck_setOT -/* 00030 80AEAC40 00812821 */ addu $a1, $a0, $at -/* 00034 80AEAC44 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00038 80AEAC48 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0003C 80AEAC4C 03E00008 */ jr $ra -/* 00040 80AEAC50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAC54.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAC54.s deleted file mode 100644 index fe6d064a5b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAC54.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_80AEAC54 -/* 00044 80AEAC54 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00048 80AEAC58 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0004C 80AEAC5C AFA50034 */ sw $a1, 0x0034($sp) -/* 00050 80AEAC60 24860300 */ addiu $a2, $a0, 0x0300 ## $a2 = 00000300 -/* 00054 80AEAC64 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000300 -/* 00058 80AEAC68 AFA60018 */ sw $a2, 0x0018($sp) -/* 0005C 80AEAC6C 0C0189B7 */ jal ActorCollider_Cylinder_Update - -/* 00060 80AEAC70 AFA40030 */ sw $a0, 0x0030($sp) -/* 00064 80AEAC74 8FA40030 */ lw $a0, 0x0030($sp) -/* 00068 80AEAC78 8FA60018 */ lw $a2, 0x0018($sp) -/* 0006C 80AEAC7C 8FA70034 */ lw $a3, 0x0034($sp) -/* 00070 80AEAC80 8C8E034C */ lw $t6, 0x034C($a0) ## 0000034C -/* 00074 80AEAC84 3C014200 */ lui $at, 0x4200 ## $at = 42000000 -/* 00078 80AEAC88 51C00009 */ beql $t6, $zero, .L80AEACB0 -/* 0007C 80AEAC8C 44812000 */ mtc1 $at, $f4 ## $f4 = 32.00 -/* 00080 80AEAC90 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00084 80AEAC94 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00088 80AEAC98 00E12821 */ addu $a1, $a3, $at -/* 0008C 80AEAC9C 0C017713 */ jal Actor_CollisionCheck_SetOT - ## CollisionCheck_setOT -/* 00090 80AEACA0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00094 80AEACA4 1000000A */ beq $zero, $zero, .L80AEACD0 -/* 00098 80AEACA8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0009C 80AEACAC 44812000 */ mtc1 $at, $f4 ## $f4 = 0.00 -.L80AEACB0: -/* 000A0 80AEACB0 C4860090 */ lwc1 $f6, 0x0090($a0) ## 00000090 -/* 000A4 80AEACB4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 000A8 80AEACB8 4606203C */ c.lt.s $f4, $f6 -/* 000AC 80AEACBC 00000000 */ nop -/* 000B0 80AEACC0 45020003 */ bc1fl .L80AEACD0 -/* 000B4 80AEACC4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000B8 80AEACC8 AC8F034C */ sw $t7, 0x034C($a0) ## 0000034C -/* 000BC 80AEACCC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AEACD0: -/* 000C0 80AEACD0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 000C4 80AEACD4 03E00008 */ jr $ra -/* 000C8 80AEACD8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEACDC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEACDC.s deleted file mode 100644 index e6bc7190c3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEACDC.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80AEACDC -/* 000CC 80AEACDC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 000D0 80AEACE0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000D4 80AEACE4 AFA50034 */ sw $a1, 0x0034($sp) -/* 000D8 80AEACE8 24860300 */ addiu $a2, $a0, 0x0300 ## $a2 = 00000300 -/* 000DC 80AEACEC 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000300 -/* 000E0 80AEACF0 0C0189B7 */ jal ActorCollider_Cylinder_Update - -/* 000E4 80AEACF4 AFA60018 */ sw $a2, 0x0018($sp) -/* 000E8 80AEACF8 8FA40034 */ lw $a0, 0x0034($sp) -/* 000EC 80AEACFC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 000F0 80AEAD00 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 000F4 80AEAD04 8FA60018 */ lw $a2, 0x0018($sp) -/* 000F8 80AEAD08 0C0175E7 */ jal Actor_CollisionCheck_SetAT - ## CollisionCheck_setAT -/* 000FC 80AEAD0C 00812821 */ addu $a1, $a0, $at -/* 00100 80AEAD10 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00104 80AEAD14 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00108 80AEAD18 03E00008 */ jr $ra -/* 0010C 80AEAD1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAD20.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAD20.s deleted file mode 100644 index b7cf31a656..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAD20.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80AEAD20 -/* 00110 80AEAD20 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00114 80AEAD24 AFB00018 */ sw $s0, 0x0018($sp) -/* 00118 80AEAD28 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0011C 80AEAD2C AFA5002C */ sw $a1, 0x002C($sp) -/* 00120 80AEAD30 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00124 80AEAD34 AFBF001C */ sw $ra, 0x001C($sp) -/* 00128 80AEAD38 260502B4 */ addiu $a1, $s0, 0x02B4 ## $a1 = 000002B4 -/* 0012C 80AEAD3C 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00130 80AEAD40 AFA50020 */ sw $a1, 0x0020($sp) -/* 00134 80AEAD44 3C0780AF */ lui $a3, %hi(D_80AF0800) ## $a3 = 80AF0000 -/* 00138 80AEAD48 8FA50020 */ lw $a1, 0x0020($sp) -/* 0013C 80AEAD4C 24E70800 */ addiu $a3, $a3, %lo(D_80AF0800) ## $a3 = 80AF0800 -/* 00140 80AEAD50 8FA4002C */ lw $a0, 0x002C($sp) -/* 00144 80AEAD54 0C017114 */ jal func_8005C450 -/* 00148 80AEAD58 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0014C 80AEAD5C 26050300 */ addiu $a1, $s0, 0x0300 ## $a1 = 00000300 -/* 00150 80AEAD60 AFA50020 */ sw $a1, 0x0020($sp) -/* 00154 80AEAD64 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00158 80AEAD68 8FA4002C */ lw $a0, 0x002C($sp) -/* 0015C 80AEAD6C 3C0780AF */ lui $a3, %hi(D_80AF082C) ## $a3 = 80AF0000 -/* 00160 80AEAD70 8FA50020 */ lw $a1, 0x0020($sp) -/* 00164 80AEAD74 24E7082C */ addiu $a3, $a3, %lo(D_80AF082C) ## $a3 = 80AF082C -/* 00168 80AEAD78 8FA4002C */ lw $a0, 0x002C($sp) -/* 0016C 80AEAD7C 0C017114 */ jal func_8005C450 -/* 00170 80AEAD80 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00174 80AEAD84 8FBF001C */ lw $ra, 0x001C($sp) -/* 00178 80AEAD88 8FB00018 */ lw $s0, 0x0018($sp) -/* 0017C 80AEAD8C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00180 80AEAD90 03E00008 */ jr $ra -/* 00184 80AEAD94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAD98.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAD98.s deleted file mode 100644 index ea7f09eb67..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAD98.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AEAD98 -/* 00188 80AEAD98 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0018C 80AEAD9C AFA40018 */ sw $a0, 0x0018($sp) -/* 00190 80AEADA0 AFA5001C */ sw $a1, 0x001C($sp) -/* 00194 80AEADA4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00198 80AEADA8 8FA50018 */ lw $a1, 0x0018($sp) -/* 0019C 80AEADAC AFBF0014 */ sw $ra, 0x0014($sp) -/* 001A0 80AEADB0 0C0170EB */ jal ActorCollider_FreeCylinder - -/* 001A4 80AEADB4 24A502B4 */ addiu $a1, $a1, 0x02B4 ## $a1 = 000002B4 -/* 001A8 80AEADB8 8FA50018 */ lw $a1, 0x0018($sp) -/* 001AC 80AEADBC 8FA4001C */ lw $a0, 0x001C($sp) -/* 001B0 80AEADC0 0C0170EB */ jal ActorCollider_FreeCylinder - -/* 001B4 80AEADC4 24A50300 */ addiu $a1, $a1, 0x0300 ## $a1 = 00000300 -/* 001B8 80AEADC8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001BC 80AEADCC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001C0 80AEADD0 03E00008 */ jr $ra -/* 001C4 80AEADD4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEADD8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEADD8.s deleted file mode 100644 index a602cdd4b6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEADD8.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_80AEADD8 -/* 001C8 80AEADD8 03E00008 */ jr $ra -/* 001CC 80AEADDC AC80034C */ sw $zero, 0x034C($a0) ## 0000034C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEADE0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEADE0.s deleted file mode 100644 index 95a6564bdf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEADE0.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80AEADE0 -/* 001D0 80AEADE0 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 001D4 80AEADE4 00031A03 */ sra $v1, $v1, 8 -/* 001D8 80AEADE8 03E00008 */ jr $ra -/* 001DC 80AEADEC 306200FF */ andi $v0, $v1, 0x00FF ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEADF0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEADF0.s deleted file mode 100644 index 8790e65333..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEADF0.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80AEADF0 -/* 001E0 80AEADF0 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 001E4 80AEADF4 03E00008 */ jr $ra -/* 001E8 80AEADF8 306200FF */ andi $v0, $v1, 0x00FF ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAE1C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAE1C.s deleted file mode 100644 index 2a29d0bdd0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAE1C.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80AEAE1C -/* 0020C 80AEAE1C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00210 80AEAE20 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00214 80AEAE24 848E025E */ lh $t6, 0x025E($a0) ## 0000025E -/* 00218 80AEAE28 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0021C 80AEAE2C 24C3025E */ addiu $v1, $a2, 0x025E ## $v1 = 0000025E -/* 00220 80AEAE30 15C00003 */ bne $t6, $zero, .L80AEAE40 -/* 00224 80AEAE34 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00228 80AEAE38 10000005 */ beq $zero, $zero, .L80AEAE50 -/* 0022C 80AEAE3C 2483025E */ addiu $v1, $a0, 0x025E ## $v1 = 0000025E -.L80AEAE40: -/* 00230 80AEAE40 846F0000 */ lh $t7, 0x0000($v1) ## 0000025E -/* 00234 80AEAE44 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 00238 80AEAE48 A4780000 */ sh $t8, 0x0000($v1) ## 0000025E -/* 0023C 80AEAE4C 84620000 */ lh $v0, 0x0000($v1) ## 0000025E -.L80AEAE50: -/* 00240 80AEAE50 14400008 */ bne $v0, $zero, .L80AEAE74 -/* 00244 80AEAE54 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 00248 80AEAE58 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 0024C 80AEAE5C AFA3001C */ sw $v1, 0x001C($sp) -/* 00250 80AEAE60 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00254 80AEAE64 AFA60038 */ sw $a2, 0x0038($sp) -/* 00258 80AEAE68 8FA3001C */ lw $v1, 0x001C($sp) -/* 0025C 80AEAE6C 8FA60038 */ lw $a2, 0x0038($sp) -/* 00260 80AEAE70 A4620000 */ sh $v0, 0x0000($v1) ## 00000000 -.L80AEAE74: -/* 00264 80AEAE74 84790000 */ lh $t9, 0x0000($v1) ## 00000000 -/* 00268 80AEAE78 24C2025C */ addiu $v0, $a2, 0x025C ## $v0 = 0000025C -/* 0026C 80AEAE7C A4590000 */ sh $t9, 0x0000($v0) ## 0000025C -/* 00270 80AEAE80 84480000 */ lh $t0, 0x0000($v0) ## 0000025C -/* 00274 80AEAE84 29010003 */ slti $at, $t0, 0x0003 -/* 00278 80AEAE88 54200003 */ bnel $at, $zero, .L80AEAE98 -/* 0027C 80AEAE8C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00280 80AEAE90 A4400000 */ sh $zero, 0x0000($v0) ## 0000025C -/* 00284 80AEAE94 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AEAE98: -/* 00288 80AEAE98 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0028C 80AEAE9C 03E00008 */ jr $ra -/* 00290 80AEAEA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAEA4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAEA4.s deleted file mode 100644 index ed2028b7f1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAEA4.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80AEAEA4 -/* 00294 80AEAEA4 AFA50004 */ sw $a1, 0x0004($sp) -/* 00298 80AEAEA8 00052C00 */ sll $a1, $a1, 16 -/* 0029C 80AEAEAC 00052C03 */ sra $a1, $a1, 16 -/* 002A0 80AEAEB0 03E00008 */ jr $ra -/* 002A4 80AEAEB4 A485025C */ sh $a1, 0x025C($a0) ## 0000025C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAEB8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAEB8.s deleted file mode 100644 index d0dfae10d2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAEB8.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80AEAEB8 -/* 002A8 80AEAEB8 AFA50004 */ sw $a1, 0x0004($sp) -/* 002AC 80AEAEBC 00052C00 */ sll $a1, $a1, 16 -/* 002B0 80AEAEC0 00052C03 */ sra $a1, $a1, 16 -/* 002B4 80AEAEC4 03E00008 */ jr $ra -/* 002B8 80AEAEC8 A4850260 */ sh $a1, 0x0260($a0) ## 00000260 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAECC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAECC.s deleted file mode 100644 index 9dceb4bd78..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAECC.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80AEAECC -/* 002BC 80AEAECC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 002C0 80AEAED0 AFBF001C */ sw $ra, 0x001C($sp) -/* 002C4 80AEAED4 AFA40028 */ sw $a0, 0x0028($sp) -/* 002C8 80AEAED8 AFA5002C */ sw $a1, 0x002C($sp) -/* 002CC 80AEAEDC C4840060 */ lwc1 $f4, 0x0060($a0) ## 00000060 -/* 002D0 80AEAEE0 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 002D4 80AEAEE4 44813000 */ mtc1 $at, $f6 ## $f6 = -4.00 -/* 002D8 80AEAEE8 E7A40020 */ swc1 $f4, 0x0020($sp) -/* 002DC 80AEAEEC 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 002E0 80AEAEF0 E4860060 */ swc1 $f6, 0x0060($a0) ## 00000060 -/* 002E4 80AEAEF4 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 -/* 002E8 80AEAEF8 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 002EC 80AEAEFC 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 002F0 80AEAF00 AFAE0014 */ sw $t6, 0x0014($sp) -/* 002F4 80AEAF04 AFA50028 */ sw $a1, 0x0028($sp) -/* 002F8 80AEAF08 8FA4002C */ lw $a0, 0x002C($sp) -/* 002FC 80AEAF0C 3C064198 */ lui $a2, 0x4198 ## $a2 = 41980000 -/* 00300 80AEAF10 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 -/* 00304 80AEAF14 0C00B92D */ jal func_8002E4B4 -/* 00308 80AEAF18 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 0030C 80AEAF1C 8FA50028 */ lw $a1, 0x0028($sp) -/* 00310 80AEAF20 C7AA0020 */ lwc1 $f10, 0x0020($sp) -/* 00314 80AEAF24 E4AA0060 */ swc1 $f10, 0x0060($a1) ## 00000060 -/* 00318 80AEAF28 8FBF001C */ lw $ra, 0x001C($sp) -/* 0031C 80AEAF2C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00320 80AEAF30 03E00008 */ jr $ra -/* 00324 80AEAF34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAF38.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAF38.s deleted file mode 100644 index 63cfb11662..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAF38.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80AEAF38 -/* 00328 80AEAF38 908E1D6C */ lbu $t6, 0x1D6C($a0) ## 00001D6C -/* 0032C 80AEAF3C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00330 80AEAF40 15C00003 */ bne $t6, $zero, .L80AEAF50 -/* 00334 80AEAF44 00000000 */ nop -/* 00338 80AEAF48 03E00008 */ jr $ra -/* 0033C 80AEAF4C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AEAF50: -/* 00340 80AEAF50 03E00008 */ jr $ra -/* 00344 80AEAF54 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAF58.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAF58.s deleted file mode 100644 index f605471c2b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAF58.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80AEAF58 -/* 00348 80AEAF58 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0034C 80AEAF5C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00350 80AEAF60 AFA40028 */ sw $a0, 0x0028($sp) -/* 00354 80AEAF64 AFA5002C */ sw $a1, 0x002C($sp) -/* 00358 80AEAF68 0C2BABCE */ jal func_80AEAF38 -/* 0035C 80AEAF6C AFA0001C */ sw $zero, 0x001C($sp) -/* 00360 80AEAF70 14400006 */ bne $v0, $zero, .L80AEAF8C -/* 00364 80AEAF74 8FA3001C */ lw $v1, 0x001C($sp) -/* 00368 80AEAF78 8FAF002C */ lw $t7, 0x002C($sp) -/* 0036C 80AEAF7C 8FAE0028 */ lw $t6, 0x0028($sp) -/* 00370 80AEAF80 000FC080 */ sll $t8, $t7, 2 -/* 00374 80AEAF84 01D8C821 */ addu $t9, $t6, $t8 -/* 00378 80AEAF88 8F231D8C */ lw $v1, 0x1D8C($t9) ## 00001D8C -.L80AEAF8C: -/* 0037C 80AEAF8C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00380 80AEAF90 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00384 80AEAF94 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 00388 80AEAF98 03E00008 */ jr $ra -/* 0038C 80AEAF9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAFA0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAFA0.s deleted file mode 100644 index 948b73c980..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAFA0.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AEAFA0 -/* 00390 80AEAFA0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00394 80AEAFA4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00398 80AEAFA8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0039C 80AEAFAC 0C2BABD6 */ jal func_80AEAF58 -/* 003A0 80AEAFB0 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 003A4 80AEAFB4 10400007 */ beq $v0, $zero, .L80AEAFD4 -/* 003A8 80AEAFB8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003AC 80AEAFBC 97AE001E */ lhu $t6, 0x001E($sp) -/* 003B0 80AEAFC0 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 003B4 80AEAFC4 55CF0004 */ bnel $t6, $t7, .L80AEAFD8 -/* 003B8 80AEAFC8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 003BC 80AEAFCC 10000002 */ beq $zero, $zero, .L80AEAFD8 -/* 003C0 80AEAFD0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AEAFD4: -/* 003C4 80AEAFD4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AEAFD8: -/* 003C8 80AEAFD8 03E00008 */ jr $ra -/* 003CC 80AEAFDC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAFE0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAFE0.s deleted file mode 100644 index 2b22905f24..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAFE0.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AEAFE0 -/* 003D0 80AEAFE0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003D4 80AEAFE4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 003D8 80AEAFE8 AFA5001C */ sw $a1, 0x001C($sp) -/* 003DC 80AEAFEC 0C2BABD6 */ jal func_80AEAF58 -/* 003E0 80AEAFF0 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 003E4 80AEAFF4 10400007 */ beq $v0, $zero, .L80AEB014 -/* 003E8 80AEAFF8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003EC 80AEAFFC 97AE001E */ lhu $t6, 0x001E($sp) -/* 003F0 80AEB000 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 003F4 80AEB004 51CF0004 */ beql $t6, $t7, .L80AEB018 -/* 003F8 80AEB008 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 003FC 80AEB00C 10000002 */ beq $zero, $zero, .L80AEB018 -/* 00400 80AEB010 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AEB014: -/* 00404 80AEB014 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AEB018: -/* 00408 80AEB018 03E00008 */ jr $ra -/* 0040C 80AEB01C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB020.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB020.s deleted file mode 100644 index 6a27fa3542..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB020.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80AEB020 -/* 00410 80AEB020 8CA21C54 */ lw $v0, 0x1C54($a1) ## 00001C54 -/* 00414 80AEB024 24080018 */ addiu $t0, $zero, 0x0018 ## $t0 = 00000018 -/* 00418 80AEB028 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 -/* 0041C 80AEB02C 10400013 */ beq $v0, $zero, .L80AEB07C -/* 00420 80AEB030 2406001F */ addiu $a2, $zero, 0x001F ## $a2 = 0000001F -/* 00424 80AEB034 240500A1 */ addiu $a1, $zero, 0x00A1 ## $a1 = 000000A1 -/* 00428 80AEB038 844E0000 */ lh $t6, 0x0000($v0) ## 00000000 -.L80AEB03C: -/* 0042C 80AEB03C 54AE000D */ bnel $a1, $t6, .L80AEB074 -/* 00430 80AEB040 8C420124 */ lw $v0, 0x0124($v0) ## 00000124 -/* 00434 80AEB044 5044000B */ beql $v0, $a0, .L80AEB074 -/* 00438 80AEB048 8C420124 */ lw $v0, 0x0124($v0) ## 00000124 -/* 0043C 80AEB04C 8C430264 */ lw $v1, 0x0264($v0) ## 00000264 -/* 00440 80AEB050 10C30005 */ beq $a2, $v1, .L80AEB068 -/* 00444 80AEB054 00000000 */ nop -/* 00448 80AEB058 10E30003 */ beq $a3, $v1, .L80AEB068 -/* 0044C 80AEB05C 00000000 */ nop -/* 00450 80AEB060 55030004 */ bnel $t0, $v1, .L80AEB074 -/* 00454 80AEB064 8C420124 */ lw $v0, 0x0124($v0) ## 00000124 -.L80AEB068: -/* 00458 80AEB068 03E00008 */ jr $ra -/* 0045C 80AEB06C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AEB070: -/* 00460 80AEB070 8C420124 */ lw $v0, 0x0124($v0) ## 00000125 -.L80AEB074: -/* 00464 80AEB074 5440FFF1 */ bnel $v0, $zero, .L80AEB03C -/* 00468 80AEB078 844E0000 */ lh $t6, 0x0000($v0) ## 00000001 -.L80AEB07C: -/* 0046C 80AEB07C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00470 80AEB080 03E00008 */ jr $ra -/* 00474 80AEB084 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB088.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB088.s deleted file mode 100644 index bdfca9f992..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB088.s +++ /dev/null @@ -1,37 +0,0 @@ -.rdata -glabel D_80AF1A30 - .asciz "\x1b[31mお立ち台が無い!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.text -glabel func_80AEB088 -/* 00478 80AEB088 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0047C 80AEB08C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00480 80AEB090 8C831C3C */ lw $v1, 0x1C3C($a0) ## 00001C3C -/* 00484 80AEB094 240200C8 */ addiu $v0, $zero, 0x00C8 ## $v0 = 000000C8 -/* 00488 80AEB098 1060000C */ beq $v1, $zero, .L80AEB0CC -/* 0048C 80AEB09C 00000000 */ nop -/* 00490 80AEB0A0 846E0000 */ lh $t6, 0x0000($v1) ## 00000000 -.L80AEB0A4: -/* 00494 80AEB0A4 544E0007 */ bnel $v0, $t6, .L80AEB0C4 -/* 00498 80AEB0A8 8C630124 */ lw $v1, 0x0124($v1) ## 00000124 -/* 0049C 80AEB0AC 846F001C */ lh $t7, 0x001C($v1) ## 0000001C -/* 004A0 80AEB0B0 55E00004 */ bnel $t7, $zero, .L80AEB0C4 -/* 004A4 80AEB0B4 8C630124 */ lw $v1, 0x0124($v1) ## 00000124 -/* 004A8 80AEB0B8 10000008 */ beq $zero, $zero, .L80AEB0DC -/* 004AC 80AEB0BC 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 004B0 80AEB0C0 8C630124 */ lw $v1, 0x0124($v1) ## 00000124 -.L80AEB0C4: -/* 004B4 80AEB0C4 5460FFF7 */ bnel $v1, $zero, .L80AEB0A4 -/* 004B8 80AEB0C8 846E0000 */ lh $t6, 0x0000($v1) ## 00000000 -.L80AEB0CC: -/* 004BC 80AEB0CC 3C0480AF */ lui $a0, %hi(D_80AF1A30) ## $a0 = 80AF0000 -/* 004C0 80AEB0D0 0C00084C */ jal osSyncPrintf - -/* 004C4 80AEB0D4 24841A30 */ addiu $a0, $a0, %lo(D_80AF1A30) ## $a0 = 80AF1A30 -/* 004C8 80AEB0D8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AEB0DC: -/* 004CC 80AEB0DC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 004D0 80AEB0E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004D4 80AEB0E4 03E00008 */ jr $ra -/* 004D8 80AEB0E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB0EC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB0EC.s deleted file mode 100644 index 027818a014..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB0EC.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_80AEB0EC -/* 004DC 80AEB0EC 8C82028C */ lw $v0, 0x028C($a0) ## 0000028C -/* 004E0 80AEB0F0 10400002 */ beq $v0, $zero, .L80AEB0FC -/* 004E4 80AEB0F4 00000000 */ nop -/* 004E8 80AEB0F8 AC4501B8 */ sw $a1, 0x01B8($v0) ## 000001B8 -.L80AEB0FC: -/* 004EC 80AEB0FC 03E00008 */ jr $ra -/* 004F0 80AEB100 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB104.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB104.s deleted file mode 100644 index 94855e06d2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB104.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80AEB104 -/* 004F4 80AEB104 8C83028C */ lw $v1, 0x028C($a0) ## 0000028C -/* 004F8 80AEB108 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 004FC 80AEB10C 10600003 */ beq $v1, $zero, .L80AEB11C -/* 00500 80AEB110 00000000 */ nop -/* 00504 80AEB114 03E00008 */ jr $ra -/* 00508 80AEB118 8C6201B8 */ lw $v0, 0x01B8($v1) ## 000001B8 -.L80AEB11C: -/* 0050C 80AEB11C 03E00008 */ jr $ra -/* 00510 80AEB120 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB124.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB124.s deleted file mode 100644 index a88b1c6063..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB124.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AEB124 -/* 00514 80AEB124 8C831C7C */ lw $v1, 0x1C7C($a0) ## 00001C7C -/* 00518 80AEB128 24040015 */ addiu $a0, $zero, 0x0015 ## $a0 = 00000015 -/* 0051C 80AEB12C 2402008B */ addiu $v0, $zero, 0x008B ## $v0 = 0000008B -/* 00520 80AEB130 5060000E */ beql $v1, $zero, .L80AEB16C -/* 00524 80AEB134 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00528 80AEB138 846E0000 */ lh $t6, 0x0000($v1) ## 00000000 -.L80AEB13C: -/* 0052C 80AEB13C 544E0008 */ bnel $v0, $t6, .L80AEB160 -/* 00530 80AEB140 8C630124 */ lw $v1, 0x0124($v1) ## 00000124 -/* 00534 80AEB144 846F001C */ lh $t7, 0x001C($v1) ## 0000001C -/* 00538 80AEB148 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000000 -/* 0053C 80AEB14C 54980004 */ bnel $a0, $t8, .L80AEB160 -/* 00540 80AEB150 8C630124 */ lw $v1, 0x0124($v1) ## 00000124 -/* 00544 80AEB154 03E00008 */ jr $ra -/* 00548 80AEB158 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L80AEB15C: -/* 0054C 80AEB15C 8C630124 */ lw $v1, 0x0124($v1) ## 00000124 -.L80AEB160: -/* 00550 80AEB160 5460FFF6 */ bnel $v1, $zero, .L80AEB13C -/* 00554 80AEB164 846E0000 */ lh $t6, 0x0000($v1) ## 00000000 -/* 00558 80AEB168 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AEB16C: -/* 0055C 80AEB16C 03E00008 */ jr $ra -/* 00560 80AEB170 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB174.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB174.s deleted file mode 100644 index 0f3796a67c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB174.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80AEB174 -/* 00564 80AEB174 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00568 80AEB178 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0056C 80AEB17C AFA40018 */ sw $a0, 0x0018($sp) -/* 00570 80AEB180 0C042F6F */ jal func_8010BDBC -/* 00574 80AEB184 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 00578 80AEB188 38420005 */ xori $v0, $v0, 0x0005 ## $v0 = 00000005 -/* 0057C 80AEB18C 2C420001 */ sltiu $v0, $v0, 0x0001 -/* 00580 80AEB190 50400005 */ beql $v0, $zero, .L80AEB1A8 -/* 00584 80AEB194 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00588 80AEB198 0C041AF2 */ jal func_80106BC8 -/* 0058C 80AEB19C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00590 80AEB1A0 0002102B */ sltu $v0, $zero, $v0 -/* 00594 80AEB1A4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AEB1A8: -/* 00598 80AEB1A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0059C 80AEB1AC 03E00008 */ jr $ra -/* 005A0 80AEB1B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB1B4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB1B4.s deleted file mode 100644 index c9bacc73c0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB1B4.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80AEB1B4 -/* 005A4 80AEB1B4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 005A8 80AEB1B8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 005AC 80AEB1BC 0C042F6F */ jal func_8010BDBC -/* 005B0 80AEB1C0 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 005B4 80AEB1C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005B8 80AEB1C8 38420002 */ xori $v0, $v0, 0x0002 ## $v0 = 00000002 -/* 005BC 80AEB1CC 2C420001 */ sltiu $v0, $v0, 0x0001 -/* 005C0 80AEB1D0 03E00008 */ jr $ra -/* 005C4 80AEB1D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB1D8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB1D8.s deleted file mode 100644 index df85225999..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB1D8.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AEB1D8 -/* 005C8 80AEB1D8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 005CC 80AEB1DC AFBF0014 */ sw $ra, 0x0014($sp) -/* 005D0 80AEB1E0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 005D4 80AEB1E4 240E0024 */ addiu $t6, $zero, 0x0024 ## $t6 = 00000024 -/* 005D8 80AEB1E8 AC8E0264 */ sw $t6, 0x0264($a0) ## 00000264 -/* 005DC 80AEB1EC AC800268 */ sw $zero, 0x0268($a0) ## 00000268 -/* 005E0 80AEB1F0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 005E4 80AEB1F4 E480005C */ swc1 $f0, 0x005C($a0) ## 0000005C -/* 005E8 80AEB1F8 E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 -/* 005EC 80AEB1FC E4800064 */ swc1 $f0, 0x0064($a0) ## 00000064 -/* 005F0 80AEB200 E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 -/* 005F4 80AEB204 E480006C */ swc1 $f0, 0x006C($a0) ## 0000006C -/* 005F8 80AEB208 0C2BAC3B */ jal func_80AEB0EC -/* 005FC 80AEB20C E4800070 */ swc1 $f0, 0x0070($a0) ## 00000070 -/* 00600 80AEB210 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00604 80AEB214 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00608 80AEB218 03E00008 */ jr $ra -/* 0060C 80AEB21C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB220.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB220.s deleted file mode 100644 index c8c7f5ddf5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB220.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80AEB220 -/* 00610 80AEB220 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00614 80AEB224 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00618 80AEB228 AFA40018 */ sw $a0, 0x0018($sp) -/* 0061C 80AEB22C 0C2BABCE */ jal func_80AEAF38 -/* 00620 80AEB230 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00624 80AEB234 10400007 */ beq $v0, $zero, .L80AEB254 -/* 00628 80AEB238 8FA40018 */ lw $a0, 0x0018($sp) -/* 0062C 80AEB23C 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 00630 80AEB240 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 00634 80AEB244 55C10004 */ bnel $t6, $at, .L80AEB258 -/* 00638 80AEB248 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0063C 80AEB24C 0C2BAC76 */ jal func_80AEB1D8 -/* 00640 80AEB250 00000000 */ nop -.L80AEB254: -/* 00644 80AEB254 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AEB258: -/* 00648 80AEB258 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0064C 80AEB25C 03E00008 */ jr $ra -/* 00650 80AEB260 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB264.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB264.s deleted file mode 100644 index c0ae0a2fb0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB264.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_80AEB264 -/* 00654 80AEB264 00057100 */ sll $t6, $a1, 4 -/* 00658 80AEB268 000E7F02 */ srl $t7, $t6, 28 -/* 0065C 80AEB26C 000FC080 */ sll $t8, $t7, 2 -/* 00660 80AEB270 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 00664 80AEB274 0338C821 */ addu $t9, $t9, $t8 -/* 00668 80AEB278 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0066C 80AEB27C 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 -/* 00670 80AEB280 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00674 80AEB284 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00678 80AEB288 00A14024 */ and $t0, $a1, $at -/* 0067C 80AEB28C AFA40038 */ sw $a0, 0x0038($sp) -/* 00680 80AEB290 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00684 80AEB294 03282021 */ addu $a0, $t9, $t0 -/* 00688 80AEB298 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0068C 80AEB29C 00812021 */ addu $a0, $a0, $at -/* 00690 80AEB2A0 AFA60040 */ sw $a2, 0x0040($sp) -/* 00694 80AEB2A4 AFA70044 */ sw $a3, 0x0044($sp) -/* 00698 80AEB2A8 0C028800 */ jal SkelAnime_GetFrameCount - -/* 0069C 80AEB2AC AFA4002C */ sw $a0, 0x002C($sp) -/* 006A0 80AEB2B0 8FA90048 */ lw $t1, 0x0048($sp) -/* 006A4 80AEB2B4 8FA40038 */ lw $a0, 0x0038($sp) -/* 006A8 80AEB2B8 8FA5002C */ lw $a1, 0x002C($sp) -/* 006AC 80AEB2BC 15200007 */ bne $t1, $zero, .L80AEB2DC -/* 006B0 80AEB2C0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006B4 80AEB2C4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 006B8 80AEB2C8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 006BC 80AEB2CC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 006C0 80AEB2D0 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 006C4 80AEB2D4 10000006 */ beq $zero, $zero, .L80AEB2F0 -/* 006C8 80AEB2D8 468020A0 */ cvt.s.w $f2, $f4 -.L80AEB2DC: -/* 006CC 80AEB2DC 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 006D0 80AEB2E0 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 006D4 80AEB2E4 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 006D8 80AEB2E8 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 006DC 80AEB2EC 46803020 */ cvt.s.w $f0, $f6 -.L80AEB2F0: -/* 006E0 80AEB2F0 93AA0043 */ lbu $t2, 0x0043($sp) -/* 006E4 80AEB2F4 C7A80044 */ lwc1 $f8, 0x0044($sp) -/* 006E8 80AEB2F8 44066000 */ mfc1 $a2, $f12 -/* 006EC 80AEB2FC 44070000 */ mfc1 $a3, $f0 -/* 006F0 80AEB300 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 006F4 80AEB304 AFAA0014 */ sw $t2, 0x0014($sp) -/* 006F8 80AEB308 0C029468 */ jal SkelAnime_ChangeAnim - -/* 006FC 80AEB30C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00700 80AEB310 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00704 80AEB314 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00708 80AEB318 03E00008 */ jr $ra -/* 0070C 80AEB31C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB320.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB320.s deleted file mode 100644 index 98638138c9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB320.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80AEB320 -/* 00710 80AEB320 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00714 80AEB324 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00718 80AEB328 8C8E0264 */ lw $t6, 0x0264($a0) ## 00000264 -/* 0071C 80AEB32C 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 -/* 00720 80AEB330 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00724 80AEB334 11C10005 */ beq $t6, $at, .L80AEB34C -/* 00728 80AEB338 00000000 */ nop -/* 0072C 80AEB33C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00730 80AEB340 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00734 80AEB344 10000004 */ beq $zero, $zero, .L80AEB358 -/* 00738 80AEB348 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AEB34C: -/* 0073C 80AEB34C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00740 80AEB350 24A4014C */ addiu $a0, $a1, 0x014C ## $a0 = 0000014C -/* 00744 80AEB354 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AEB358: -/* 00748 80AEB358 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0074C 80AEB35C 03E00008 */ jr $ra -/* 00750 80AEB360 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB364.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB364.s deleted file mode 100644 index 9c701f43e4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB364.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80AEB364 -/* 00754 80AEB364 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00758 80AEB368 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0075C 80AEB36C AFA40018 */ sw $a0, 0x0018($sp) -/* 00760 80AEB370 AFA5001C */ sw $a1, 0x001C($sp) -/* 00764 80AEB374 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 -/* 00768 80AEB378 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 0076C 80AEB37C 24A6014C */ addiu $a2, $a1, 0x014C ## $a2 = 0000014C -/* 00770 80AEB380 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00774 80AEB384 A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 -/* 00778 80AEB388 8FA4001C */ lw $a0, 0x001C($sp) -/* 0077C 80AEB38C 0C028D88 */ jal SkelAnime_LoadAnimationType5 -/* 00780 80AEB390 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00784 80AEB394 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00788 80AEB398 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0078C 80AEB39C 03E00008 */ jr $ra -/* 00790 80AEB3A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB3A4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB3A4.s deleted file mode 100644 index 7e5e3c0946..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB3A4.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80AEB3A4 -/* 00794 80AEB3A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00798 80AEB3A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0079C 80AEB3AC 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 -/* 007A0 80AEB3B0 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 007A4 80AEB3B4 0C2BACD9 */ jal func_80AEB364 -/* 007A8 80AEB3B8 A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 -/* 007AC 80AEB3BC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 007B0 80AEB3C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007B4 80AEB3C4 03E00008 */ jr $ra -/* 007B8 80AEB3C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB3CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB3CC.s deleted file mode 100644 index c370456dbb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB3CC.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80AEB3CC -/* 007BC 80AEB3CC 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 -/* 007C0 80AEB3D0 31CFFFFE */ andi $t7, $t6, 0xFFFE ## $t7 = 00000000 -/* 007C4 80AEB3D4 03E00008 */ jr $ra -/* 007C8 80AEB3D8 A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB3DC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB3DC.s deleted file mode 100644 index eed9e7008a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB3DC.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80AEB3DC -/* 007CC 80AEB3DC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 007D0 80AEB3E0 AFA50024 */ sw $a1, 0x0024($sp) -/* 007D4 80AEB3E4 AFBF001C */ sw $ra, 0x001C($sp) -/* 007D8 80AEB3E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 007DC 80AEB3EC 24A50690 */ addiu $a1, $a1, 0x0690 ## $a1 = 06000690 -/* 007E0 80AEB3F0 AFA00010 */ sw $zero, 0x0010($sp) -/* 007E4 80AEB3F4 AFA40020 */ sw $a0, 0x0020($sp) -/* 007E8 80AEB3F8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 007EC 80AEB3FC 0C2BAC99 */ jal func_80AEB264 -/* 007F0 80AEB400 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 007F4 80AEB404 8FA40020 */ lw $a0, 0x0020($sp) -/* 007F8 80AEB408 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 007FC 80AEB40C 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 00800 80AEB410 AC800264 */ sw $zero, 0x0264($a0) ## 00000264 -/* 00804 80AEB414 0C2BABA9 */ jal func_80AEAEA4 -/* 00808 80AEB418 AC8E0268 */ sw $t6, 0x0268($a0) ## 00000268 -/* 0080C 80AEB41C 8FA40020 */ lw $a0, 0x0020($sp) -/* 00810 80AEB420 0C2BABAE */ jal func_80AEAEB8 -/* 00814 80AEB424 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00818 80AEB428 8FBF001C */ lw $ra, 0x001C($sp) -/* 0081C 80AEB42C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00820 80AEB430 03E00008 */ jr $ra -/* 00824 80AEB434 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB438.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB438.s deleted file mode 100644 index e38fac0223..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB438.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80AEB438 -/* 00828 80AEB438 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0082C 80AEB43C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00830 80AEB440 0C2BABD6 */ jal func_80AEAF58 -/* 00834 80AEB444 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00838 80AEB448 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0083C 80AEB44C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00840 80AEB450 03E00008 */ jr $ra -/* 00844 80AEB454 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB458.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB458.s deleted file mode 100644 index 5fabdd87fa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB458.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80AEB458 -/* 00848 80AEB458 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0084C 80AEB45C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00850 80AEB460 AFA5001C */ sw $a1, 0x001C($sp) -/* 00854 80AEB464 30A5FFFF */ andi $a1, $a1, 0xFFFF ## $a1 = 00000000 -/* 00858 80AEB468 0C2BABE8 */ jal func_80AEAFA0 -/* 0085C 80AEB46C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00860 80AEB470 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00864 80AEB474 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00868 80AEB478 03E00008 */ jr $ra -/* 0086C 80AEB47C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB480.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB480.s deleted file mode 100644 index 9701a1383a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB480.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80AEB480 -/* 00870 80AEB480 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00874 80AEB484 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00878 80AEB488 AFA5001C */ sw $a1, 0x001C($sp) -/* 0087C 80AEB48C 30A5FFFF */ andi $a1, $a1, 0xFFFF ## $a1 = 00000000 -/* 00880 80AEB490 0C2BABF8 */ jal func_80AEAFE0 -/* 00884 80AEB494 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00888 80AEB498 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0088C 80AEB49C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00890 80AEB4A0 03E00008 */ jr $ra -/* 00894 80AEB4A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB4A8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB4A8.s deleted file mode 100644 index 2188a8a157..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB4A8.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80AEB4A8 -/* 00898 80AEB4A8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0089C 80AEB4AC AFBF001C */ sw $ra, 0x001C($sp) -/* 008A0 80AEB4B0 AFA40030 */ sw $a0, 0x0030($sp) -/* 008A4 80AEB4B4 AFA50034 */ sw $a1, 0x0034($sp) -/* 008A8 80AEB4B8 AFA60038 */ sw $a2, 0x0038($sp) -/* 008AC 80AEB4BC AFA7003C */ sw $a3, 0x003C($sp) -/* 008B0 80AEB4C0 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 008B4 80AEB4C4 87AF003E */ lh $t7, 0x003E($sp) -/* 008B8 80AEB4C8 87A7003A */ lh $a3, 0x003A($sp) -/* 008BC 80AEB4CC E7A40024 */ swc1 $f4, 0x0024($sp) -/* 008C0 80AEB4D0 C4880084 */ lwc1 $f8, 0x0084($a0) ## 00000084 -/* 008C4 80AEB4D4 C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 -/* 008C8 80AEB4D8 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 -/* 008CC 80AEB4DC 46083280 */ add.s $f10, $f6, $f8 -/* 008D0 80AEB4E0 E7AA0028 */ swc1 $f10, 0x0028($sp) -/* 008D4 80AEB4E4 C490002C */ lwc1 $f16, 0x002C($a0) ## 0000002C -/* 008D8 80AEB4E8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 008DC 80AEB4EC 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 -/* 008E0 80AEB4F0 AFAF0010 */ sw $t7, 0x0010($sp) -/* 008E4 80AEB4F4 0C00A511 */ jal func_80029444 -/* 008E8 80AEB4F8 E7B0002C */ swc1 $f16, 0x002C($sp) -/* 008EC 80AEB4FC 8FBF001C */ lw $ra, 0x001C($sp) -/* 008F0 80AEB500 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 008F4 80AEB504 03E00008 */ jr $ra -/* 008F8 80AEB508 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB50C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB50C.s deleted file mode 100644 index 1f7ac4468b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB50C.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80AEB50C -/* 008FC 80AEB50C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00900 80AEB510 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00904 80AEB514 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00908 80AEB518 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 0090C 80AEB51C C4840270 */ lwc1 $f4, 0x0270($a0) ## 00000270 -/* 00910 80AEB520 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00914 80AEB524 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00918 80AEB528 46062200 */ add.s $f8, $f4, $f6 -/* 0091C 80AEB52C 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 00920 80AEB530 E4880270 */ swc1 $f8, 0x0270($a0) ## 00000270 -/* 00924 80AEB534 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 -/* 00928 80AEB538 C48A0270 */ lwc1 $f10, 0x0270($a0) ## 00000270 -/* 0092C 80AEB53C 844E145A */ lh $t6, 0x145A($v0) ## 8016145A -/* 00930 80AEB540 448E8000 */ mtc1 $t6, $f16 ## $f16 = 0.00 -/* 00934 80AEB544 00000000 */ nop -/* 00938 80AEB548 468084A0 */ cvt.s.w $f18, $f16 -/* 0093C 80AEB54C 46049180 */ add.s $f6, $f18, $f4 -/* 00940 80AEB550 460A303E */ c.le.s $f6, $f10 -/* 00944 80AEB554 00000000 */ nop -/* 00948 80AEB558 4502000D */ bc1fl .L80AEB590 -/* 0094C 80AEB55C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00950 80AEB560 84461456 */ lh $a2, 0x1456($v0) ## 80161456 -/* 00954 80AEB564 AFA40018 */ sw $a0, 0x0018($sp) -/* 00958 80AEB568 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0095C 80AEB56C 24C601F4 */ addiu $a2, $a2, 0x01F4 ## $a2 = 000001F4 -/* 00960 80AEB570 00063400 */ sll $a2, $a2, 16 -/* 00964 80AEB574 0C2BAD2A */ jal func_80AEB4A8 -/* 00968 80AEB578 00063403 */ sra $a2, $a2, 16 -/* 0096C 80AEB57C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00970 80AEB580 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 00974 80AEB584 00000000 */ nop -/* 00978 80AEB588 E4880270 */ swc1 $f8, 0x0270($a0) ## 00000270 -/* 0097C 80AEB58C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AEB590: -/* 00980 80AEB590 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00984 80AEB594 03E00008 */ jr $ra -/* 00988 80AEB598 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB59C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB59C.s deleted file mode 100644 index bb90daf989..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB59C.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel func_80AEB59C -/* 0098C 80AEB59C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00990 80AEB5A0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00994 80AEB5A4 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 -/* 00998 80AEB5A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0099C 80AEB5AC AFA40018 */ sw $a0, 0x0018($sp) -/* 009A0 80AEB5B0 AFA5001C */ sw $a1, 0x001C($sp) -/* 009A4 80AEB5B4 85C61458 */ lh $a2, 0x1458($t6) ## 80161458 -/* 009A8 80AEB5B8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 009AC 80AEB5BC 24C601F4 */ addiu $a2, $a2, 0x01F4 ## $a2 = 000001F4 -/* 009B0 80AEB5C0 00063400 */ sll $a2, $a2, 16 -/* 009B4 80AEB5C4 0C2BAD2A */ jal func_80AEB4A8 -/* 009B8 80AEB5C8 00063403 */ sra $a2, $a2, 16 -/* 009BC 80AEB5CC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 009C0 80AEB5D0 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 -/* 009C4 80AEB5D4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 009C8 80AEB5D8 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 009CC 80AEB5DC 844F145A */ lh $t7, 0x145A($v0) ## 8016145A -/* 009D0 80AEB5E0 84461458 */ lh $a2, 0x1458($v0) ## 80161458 -/* 009D4 80AEB5E4 8FA40018 */ lw $a0, 0x0018($sp) -/* 009D8 80AEB5E8 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 009DC 80AEB5EC 24C601F4 */ addiu $a2, $a2, 0x01F4 ## $a2 = 000001F4 -/* 009E0 80AEB5F0 00063400 */ sll $a2, $a2, 16 -/* 009E4 80AEB5F4 468021A0 */ cvt.s.w $f6, $f4 -/* 009E8 80AEB5F8 00063403 */ sra $a2, $a2, 16 -/* 009EC 80AEB5FC 8FA5001C */ lw $a1, 0x001C($sp) -/* 009F0 80AEB600 46083280 */ add.s $f10, $f6, $f8 -/* 009F4 80AEB604 4600540D */ trunc.w.s $f16, $f10 -/* 009F8 80AEB608 44078000 */ mfc1 $a3, $f16 -/* 009FC 80AEB60C 00000000 */ nop -/* 00A00 80AEB610 00073C00 */ sll $a3, $a3, 16 -/* 00A04 80AEB614 0C2BAD2A */ jal func_80AEB4A8 -/* 00A08 80AEB618 00073C03 */ sra $a3, $a3, 16 -/* 00A0C 80AEB61C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00A10 80AEB620 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 -/* 00A14 80AEB624 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00A18 80AEB628 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 00A1C 80AEB62C 8459145A */ lh $t9, 0x145A($v0) ## 8016145A -/* 00A20 80AEB630 84461458 */ lh $a2, 0x1458($v0) ## 80161458 -/* 00A24 80AEB634 8FA40018 */ lw $a0, 0x0018($sp) -/* 00A28 80AEB638 44999000 */ mtc1 $t9, $f18 ## $f18 = 0.00 -/* 00A2C 80AEB63C 24C601F4 */ addiu $a2, $a2, 0x01F4 ## $a2 = 000001F4 -/* 00A30 80AEB640 00063400 */ sll $a2, $a2, 16 -/* 00A34 80AEB644 46809120 */ cvt.s.w $f4, $f18 -/* 00A38 80AEB648 00063403 */ sra $a2, $a2, 16 -/* 00A3C 80AEB64C 8FA5001C */ lw $a1, 0x001C($sp) -/* 00A40 80AEB650 46062000 */ add.s $f0, $f4, $f6 -/* 00A44 80AEB654 46000200 */ add.s $f8, $f0, $f0 -/* 00A48 80AEB658 4600428D */ trunc.w.s $f10, $f8 -/* 00A4C 80AEB65C 44075000 */ mfc1 $a3, $f10 -/* 00A50 80AEB660 00000000 */ nop -/* 00A54 80AEB664 00073C00 */ sll $a3, $a3, 16 -/* 00A58 80AEB668 0C2BAD2A */ jal func_80AEB4A8 -/* 00A5C 80AEB66C 00073C03 */ sra $a3, $a3, 16 -/* 00A60 80AEB670 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00A64 80AEB674 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A68 80AEB678 03E00008 */ jr $ra -/* 00A6C 80AEB67C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB680.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB680.s deleted file mode 100644 index 02616bd6a6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB680.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AEB680 -/* 00A70 80AEB680 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00A74 80AEB684 AFBF001C */ sw $ra, 0x001C($sp) -/* 00A78 80AEB688 AFA40030 */ sw $a0, 0x0030($sp) -/* 00A7C 80AEB68C AFA50034 */ sw $a1, 0x0034($sp) -/* 00A80 80AEB690 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 00A84 80AEB694 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00A88 80AEB698 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00A8C 80AEB69C E7A40024 */ swc1 $f4, 0x0024($sp) -/* 00A90 80AEB6A0 C4880084 */ lwc1 $f8, 0x0084($a0) ## 00000084 -/* 00A94 80AEB6A4 C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 -/* 00A98 80AEB6A8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00A9C 80AEB6AC 46083280 */ add.s $f10, $f6, $f8 -/* 00AA0 80AEB6B0 E7AA0028 */ swc1 $f10, 0x0028($sp) -/* 00AA4 80AEB6B4 C490002C */ lwc1 $f16, 0x002C($a0) ## 0000002C -/* 00AA8 80AEB6B8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00AAC 80AEB6BC 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 -/* 00AB0 80AEB6C0 AFA00014 */ sw $zero, 0x0014($sp) -/* 00AB4 80AEB6C4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00AB8 80AEB6C8 0C00A527 */ jal func_8002949C -/* 00ABC 80AEB6CC E7B0002C */ swc1 $f16, 0x002C($sp) -/* 00AC0 80AEB6D0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00AC4 80AEB6D4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00AC8 80AEB6D8 03E00008 */ jr $ra -/* 00ACC 80AEB6DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB6E0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB6E0.s deleted file mode 100644 index 4a3b62cdec..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB6E0.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80AEB6E0 -/* 00AD0 80AEB6E0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00AD4 80AEB6E4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00AD8 80AEB6E8 AFA40018 */ sw $a0, 0x0018($sp) -/* 00ADC 80AEB6EC AFA5001C */ sw $a1, 0x001C($sp) -/* 00AE0 80AEB6F0 8C98016C */ lw $t8, 0x016C($a0) ## 0000016C -/* 00AE4 80AEB6F4 848F018C */ lh $t7, 0x018C($a0) ## 0000018C -/* 00AE8 80AEB6F8 2486014C */ addiu $a2, $a0, 0x014C ## $a2 = 0000014C -/* 00AEC 80AEB6FC 87190002 */ lh $t9, 0x0002($t8) ## 00000002 -/* 00AF0 80AEB700 01F9082A */ slt $at, $t7, $t9 -/* 00AF4 80AEB704 50200009 */ beql $at, $zero, .L80AEB72C -/* 00AF8 80AEB708 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00AFC 80AEB70C 90C80035 */ lbu $t0, 0x0035($a2) ## 00000181 -/* 00B00 80AEB710 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00B04 80AEB714 35090003 */ ori $t1, $t0, 0x0003 ## $t1 = 00000003 -/* 00B08 80AEB718 A0C90035 */ sb $t1, 0x0035($a2) ## 00000181 -/* 00B0C 80AEB71C 8FA50018 */ lw $a1, 0x0018($sp) -/* 00B10 80AEB720 0C028D88 */ jal SkelAnime_LoadAnimationType5 -/* 00B14 80AEB724 8FA4001C */ lw $a0, 0x001C($sp) -/* 00B18 80AEB728 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AEB72C: -/* 00B1C 80AEB72C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B20 80AEB730 03E00008 */ jr $ra -/* 00B24 80AEB734 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB738.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB738.s deleted file mode 100644 index 7db781b9a1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB738.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80AEB738 -/* 00B28 80AEB738 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00B2C 80AEB73C AFBF001C */ sw $ra, 0x001C($sp) -/* 00B30 80AEB740 AFB00018 */ sw $s0, 0x0018($sp) -/* 00B34 80AEB744 AFA50024 */ sw $a1, 0x0024($sp) -/* 00B38 80AEB748 8C8E016C */ lw $t6, 0x016C($a0) ## 0000016C -/* 00B3C 80AEB74C 8C99016C */ lw $t9, 0x016C($a0) ## 0000016C -/* 00B40 80AEB750 8C8B016C */ lw $t3, 0x016C($a0) ## 0000016C -/* 00B44 80AEB754 89D80000 */ lwl $t8, 0x0000($t6) ## 00000000 -/* 00B48 80AEB758 99D80003 */ lwr $t8, 0x0003($t6) ## 00000003 -/* 00B4C 80AEB75C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B50 80AEB760 2486014C */ addiu $a2, $a0, 0x014C ## $a2 = 0000014C -/* 00B54 80AEB764 A898018A */ swl $t8, 0x018A($a0) ## 0000018A -/* 00B58 80AEB768 B898018D */ swr $t8, 0x018D($a0) ## 0000018D -/* 00B5C 80AEB76C 95D80004 */ lhu $t8, 0x0004($t6) ## 00000004 -/* 00B60 80AEB770 848A018C */ lh $t2, 0x018C($a0) ## 0000018C -/* 00B64 80AEB774 A498018E */ sh $t8, 0x018E($a0) ## 0000018E -/* 00B68 80AEB778 8B290000 */ lwl $t1, 0x0000($t9) ## 00000000 -/* 00B6C 80AEB77C 9B290003 */ lwr $t1, 0x0003($t9) ## 00000003 -/* 00B70 80AEB780 A8890184 */ swl $t1, 0x0184($a0) ## 00000184 -/* 00B74 80AEB784 B8890187 */ swr $t1, 0x0187($a0) ## 00000187 -/* 00B78 80AEB788 97290004 */ lhu $t1, 0x0004($t9) ## 00000004 -/* 00B7C 80AEB78C A4890188 */ sh $t1, 0x0188($a0) ## 00000188 -/* 00B80 80AEB790 856C0002 */ lh $t4, 0x0002($t3) ## 00000002 -/* 00B84 80AEB794 014C082A */ slt $at, $t2, $t4 -/* 00B88 80AEB798 50200009 */ beql $at, $zero, .L80AEB7C0 -/* 00B8C 80AEB79C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00B90 80AEB7A0 90CD0035 */ lbu $t5, 0x0035($a2) ## 00000181 -/* 00B94 80AEB7A4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00B98 80AEB7A8 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00B9C 80AEB7AC 35AE0003 */ ori $t6, $t5, 0x0003 ## $t6 = 00000003 -/* 00BA0 80AEB7B0 A0CE0035 */ sb $t6, 0x0035($a2) ## 00000181 -/* 00BA4 80AEB7B4 0C028D88 */ jal SkelAnime_LoadAnimationType5 -/* 00BA8 80AEB7B8 8FA40024 */ lw $a0, 0x0024($sp) -/* 00BAC 80AEB7BC 8FBF001C */ lw $ra, 0x001C($sp) -.L80AEB7C0: -/* 00BB0 80AEB7C0 8FB00018 */ lw $s0, 0x0018($sp) -/* 00BB4 80AEB7C4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00BB8 80AEB7C8 03E00008 */ jr $ra -/* 00BBC 80AEB7CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB7D0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB7D0.s deleted file mode 100644 index b7919e440e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB7D0.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80AEB7D0 -/* 00BC0 80AEB7D0 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 -/* 00BC4 80AEB7D4 31CFFFFC */ andi $t7, $t6, 0xFFFC ## $t7 = 00000000 -/* 00BC8 80AEB7D8 03E00008 */ jr $ra -/* 00BCC 80AEB7DC A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB7E0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB7E0.s deleted file mode 100644 index b652dc9b9b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB7E0.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80AEB7E0 -/* 00BD0 80AEB7E0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00BD4 80AEB7E4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00BD8 80AEB7E8 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 00BDC 80AEB7EC 94830004 */ lhu $v1, 0x0004($a0) ## 00000004 -/* 00BE0 80AEB7F0 0043082A */ slt $at, $v0, $v1 -/* 00BE4 80AEB7F4 5020001B */ beql $at, $zero, .L80AEB864 -/* 00BE8 80AEB7F8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00BEC 80AEB7FC 94850002 */ lhu $a1, 0x0002($a0) ## 00000002 -/* 00BF0 80AEB800 00653023 */ subu $a2, $v1, $a1 -/* 00BF4 80AEB804 18C00016 */ blez $a2, .L80AEB860 -/* 00BF8 80AEB808 00457023 */ subu $t6, $v0, $a1 -/* 00BFC 80AEB80C 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00C00 80AEB810 44864000 */ mtc1 $a2, $f8 ## $f8 = 0.00 -/* 00C04 80AEB814 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 00C08 80AEB818 468021A0 */ cvt.s.w $f6, $f4 -/* 00C0C 80AEB81C 44819000 */ mtc1 $at, $f18 ## $f18 = 32768.00 -/* 00C10 80AEB820 468042A0 */ cvt.s.w $f10, $f8 -/* 00C14 80AEB824 460A3403 */ div.s $f16, $f6, $f10 -/* 00C18 80AEB828 46128102 */ mul.s $f4, $f16, $f18 -/* 00C1C 80AEB82C 4600220D */ trunc.w.s $f8, $f4 -/* 00C20 80AEB830 44044000 */ mfc1 $a0, $f8 -/* 00C24 80AEB834 00000000 */ nop -/* 00C28 80AEB838 00042400 */ sll $a0, $a0, 16 -/* 00C2C 80AEB83C 0C01DE0D */ jal Math_Coss - ## coss? -/* 00C30 80AEB840 00042403 */ sra $a0, $a0, 16 -/* 00C34 80AEB844 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 -/* 00C38 80AEB848 44813000 */ mtc1 $at, $f6 ## $f6 = -0.50 -/* 00C3C 80AEB84C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00C40 80AEB850 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 00C44 80AEB854 46060282 */ mul.s $f10, $f0, $f6 -/* 00C48 80AEB858 10000004 */ beq $zero, $zero, .L80AEB86C -/* 00C4C 80AEB85C 46105000 */ add.s $f0, $f10, $f16 -.L80AEB860: -/* 00C50 80AEB860 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -.L80AEB864: -/* 00C54 80AEB864 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00C58 80AEB868 00000000 */ nop -.L80AEB86C: -/* 00C5C 80AEB86C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C60 80AEB870 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C64 80AEB874 03E00008 */ jr $ra -/* 00C68 80AEB878 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB87C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB87C.s deleted file mode 100644 index 880635deb4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB87C.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80AEB87C -/* 00C6C 80AEB87C 44852000 */ mtc1 $a1, $f4 ## $f4 = 0.00 -/* 00C70 80AEB880 44863000 */ mtc1 $a2, $f6 ## $f6 = 0.00 -/* 00C74 80AEB884 468020A0 */ cvt.s.w $f2, $f4 -/* 00C78 80AEB888 46803220 */ cvt.s.w $f8, $f6 -/* 00C7C 80AEB88C 46024281 */ sub.s $f10, $f8, $f2 -/* 00C80 80AEB890 460C5402 */ mul.s $f16, $f10, $f12 -/* 00C84 80AEB894 03E00008 */ jr $ra -/* 00C88 80AEB898 46028000 */ add.s $f0, $f16, $f2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB89C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB89C.s deleted file mode 100644 index b2dbc43da5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB89C.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80AEB89C -/* 00C8C 80AEB89C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C90 80AEB8A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C94 80AEB8A4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00C98 80AEB8A8 AFA60018 */ sw $a2, 0x0018($sp) -/* 00C9C 80AEB8AC 0C2BAD0E */ jal func_80AEB438 -/* 00CA0 80AEB8B0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00CA4 80AEB8B4 10400013 */ beq $v0, $zero, .L80AEB904 -/* 00CA8 80AEB8B8 8FA60018 */ lw $a2, 0x0018($sp) -/* 00CAC 80AEB8BC 84430008 */ lh $v1, 0x0008($v0) ## 00000008 -/* 00CB0 80AEB8C0 A4C300B6 */ sh $v1, 0x00B6($a2) ## 000000B6 -/* 00CB4 80AEB8C4 A4C30032 */ sh $v1, 0x0032($a2) ## 00000032 -/* 00CB8 80AEB8C8 8C4E000C */ lw $t6, 0x000C($v0) ## 0000000C -/* 00CBC 80AEB8CC 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00CC0 80AEB8D0 00000000 */ nop -/* 00CC4 80AEB8D4 468021A0 */ cvt.s.w $f6, $f4 -/* 00CC8 80AEB8D8 E4C60024 */ swc1 $f6, 0x0024($a2) ## 00000024 -/* 00CCC 80AEB8DC 8C4F0010 */ lw $t7, 0x0010($v0) ## 00000010 -/* 00CD0 80AEB8E0 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 00CD4 80AEB8E4 00000000 */ nop -/* 00CD8 80AEB8E8 468042A0 */ cvt.s.w $f10, $f8 -/* 00CDC 80AEB8EC E4CA0028 */ swc1 $f10, 0x0028($a2) ## 00000028 -/* 00CE0 80AEB8F0 8C580014 */ lw $t8, 0x0014($v0) ## 00000014 -/* 00CE4 80AEB8F4 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 00CE8 80AEB8F8 00000000 */ nop -/* 00CEC 80AEB8FC 468084A0 */ cvt.s.w $f18, $f16 -/* 00CF0 80AEB900 E4D2002C */ swc1 $f18, 0x002C($a2) ## 0000002C -.L80AEB904: -/* 00CF4 80AEB904 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00CF8 80AEB908 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00CFC 80AEB90C 03E00008 */ jr $ra -/* 00D00 80AEB910 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB914.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB914.s deleted file mode 100644 index 340e1cce78..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB914.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80AEB914 -/* 00D04 80AEB914 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00D08 80AEB918 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00D0C 80AEB91C 0C2BAE27 */ jal func_80AEB89C -/* 00D10 80AEB920 00000000 */ nop -/* 00D14 80AEB924 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00D18 80AEB928 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00D1C 80AEB92C 03E00008 */ jr $ra -/* 00D20 80AEB930 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB934.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB934.s deleted file mode 100644 index 4e372d6af8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB934.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80AEB934 -/* 00D24 80AEB934 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00D28 80AEB938 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00D2C 80AEB93C 0C2BAE27 */ jal func_80AEB89C -/* 00D30 80AEB940 00000000 */ nop -/* 00D34 80AEB944 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00D38 80AEB948 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00D3C 80AEB94C 03E00008 */ jr $ra -/* 00D40 80AEB950 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB954.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB954.s deleted file mode 100644 index 3f6bea806d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB954.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80AEB954 -/* 00D44 80AEB954 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00D48 80AEB958 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00D4C 80AEB95C 0C2BADB8 */ jal func_80AEB6E0 -/* 00D50 80AEB960 00000000 */ nop -/* 00D54 80AEB964 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00D58 80AEB968 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00D5C 80AEB96C 03E00008 */ jr $ra -/* 00D60 80AEB970 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB974.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB974.s deleted file mode 100644 index 602ad25462..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB974.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80AEB974 -/* 00D64 80AEB974 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00D68 80AEB978 AFBF001C */ sw $ra, 0x001C($sp) -/* 00D6C 80AEB97C AFA40038 */ sw $a0, 0x0038($sp) -/* 00D70 80AEB980 AFB00018 */ sw $s0, 0x0018($sp) -/* 00D74 80AEB984 AFA5003C */ sw $a1, 0x003C($sp) -/* 00D78 80AEB988 0C2BAD0E */ jal func_80AEB438 -/* 00D7C 80AEB98C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00D80 80AEB990 10400019 */ beq $v0, $zero, .L80AEB9F8 -/* 00D84 80AEB994 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 00D88 80AEB998 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 00D8C 80AEB99C 0C2BADF8 */ jal func_80AEB7E0 -/* 00D90 80AEB9A0 8FA5003C */ lw $a1, 0x003C($sp) -/* 00D94 80AEB9A4 E7A00030 */ swc1 $f0, 0x0030($sp) -/* 00D98 80AEB9A8 8E060018 */ lw $a2, 0x0018($s0) ## 00000018 -/* 00D9C 80AEB9AC 8E05000C */ lw $a1, 0x000C($s0) ## 0000000C -/* 00DA0 80AEB9B0 0C2BAE1F */ jal func_80AEB87C -/* 00DA4 80AEB9B4 46000306 */ mov.s $f12, $f0 -/* 00DA8 80AEB9B8 8FA20038 */ lw $v0, 0x0038($sp) -/* 00DAC 80AEB9BC E4400024 */ swc1 $f0, 0x0024($v0) ## 00000024 -/* 00DB0 80AEB9C0 8E06001C */ lw $a2, 0x001C($s0) ## 0000001C -/* 00DB4 80AEB9C4 8E050010 */ lw $a1, 0x0010($s0) ## 00000010 -/* 00DB8 80AEB9C8 24420024 */ addiu $v0, $v0, 0x0024 ## $v0 = 00000024 -/* 00DBC 80AEB9CC AFA20024 */ sw $v0, 0x0024($sp) -/* 00DC0 80AEB9D0 0C2BAE1F */ jal func_80AEB87C -/* 00DC4 80AEB9D4 C7AC0030 */ lwc1 $f12, 0x0030($sp) -/* 00DC8 80AEB9D8 8FAE0024 */ lw $t6, 0x0024($sp) -/* 00DCC 80AEB9DC E5C00004 */ swc1 $f0, 0x0004($t6) ## 00000004 -/* 00DD0 80AEB9E0 8E060020 */ lw $a2, 0x0020($s0) ## 00000020 -/* 00DD4 80AEB9E4 8E050014 */ lw $a1, 0x0014($s0) ## 00000014 -/* 00DD8 80AEB9E8 0C2BAE1F */ jal func_80AEB87C -/* 00DDC 80AEB9EC C7AC0030 */ lwc1 $f12, 0x0030($sp) -/* 00DE0 80AEB9F0 8FAF0024 */ lw $t7, 0x0024($sp) -/* 00DE4 80AEB9F4 E5E00008 */ swc1 $f0, 0x0008($t7) ## 00000008 -.L80AEB9F8: -/* 00DE8 80AEB9F8 8FBF001C */ lw $ra, 0x001C($sp) -/* 00DEC 80AEB9FC 8FB00018 */ lw $s0, 0x0018($sp) -/* 00DF0 80AEBA00 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00DF4 80AEBA04 03E00008 */ jr $ra -/* 00DF8 80AEBA08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBA0C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBA0C.s deleted file mode 100644 index 3b9932fde7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBA0C.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80AEBA0C -/* 00DFC 80AEBA0C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00E00 80AEBA10 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00E04 80AEBA14 0C2BADB8 */ jal func_80AEB6E0 -/* 00E08 80AEBA18 00000000 */ nop -/* 00E0C 80AEBA1C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00E10 80AEBA20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00E14 80AEBA24 03E00008 */ jr $ra -/* 00E18 80AEBA28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBA2C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBA2C.s deleted file mode 100644 index cc908033cd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBA2C.s +++ /dev/null @@ -1,54 +0,0 @@ -glabel func_80AEBA2C -/* 00E1C 80AEBA2C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00E20 80AEBA30 AFBF001C */ sw $ra, 0x001C($sp) -/* 00E24 80AEBA34 AFA40040 */ sw $a0, 0x0040($sp) -/* 00E28 80AEBA38 AFB00018 */ sw $s0, 0x0018($sp) -/* 00E2C 80AEBA3C AFA50044 */ sw $a1, 0x0044($sp) -/* 00E30 80AEBA40 0C2BAD0E */ jal func_80AEB438 -/* 00E34 80AEBA44 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00E38 80AEBA48 10400027 */ beq $v0, $zero, .L80AEBAE8 -/* 00E3C 80AEBA4C 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 00E40 80AEBA50 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 00E44 80AEBA54 0C2BADF8 */ jal func_80AEB7E0 -/* 00E48 80AEBA58 8FA50044 */ lw $a1, 0x0044($sp) -/* 00E4C 80AEBA5C 8FA20040 */ lw $v0, 0x0040($sp) -/* 00E50 80AEBA60 E7A00030 */ swc1 $f0, 0x0030($sp) -/* 00E54 80AEBA64 8E060018 */ lw $a2, 0x0018($s0) ## 00000018 -/* 00E58 80AEBA68 C4440364 */ lwc1 $f4, 0x0364($v0) ## 00000364 -/* 00E5C 80AEBA6C 24420364 */ addiu $v0, $v0, 0x0364 ## $v0 = 00000364 -/* 00E60 80AEBA70 AFA20024 */ sw $v0, 0x0024($sp) -/* 00E64 80AEBA74 4600218D */ trunc.w.s $f6, $f4 -/* 00E68 80AEBA78 46000306 */ mov.s $f12, $f0 -/* 00E6C 80AEBA7C 44053000 */ mfc1 $a1, $f6 -/* 00E70 80AEBA80 0C2BAE1F */ jal func_80AEB87C -/* 00E74 80AEBA84 00000000 */ nop -/* 00E78 80AEBA88 8FA20040 */ lw $v0, 0x0040($sp) -/* 00E7C 80AEBA8C E4400024 */ swc1 $f0, 0x0024($v0) ## 00000024 -/* 00E80 80AEBA90 8FAF0024 */ lw $t7, 0x0024($sp) -/* 00E84 80AEBA94 8E06001C */ lw $a2, 0x001C($s0) ## 0000001C -/* 00E88 80AEBA98 24420024 */ addiu $v0, $v0, 0x0024 ## $v0 = 00000024 -/* 00E8C 80AEBA9C C5E80004 */ lwc1 $f8, 0x0004($t7) ## 00000004 -/* 00E90 80AEBAA0 AFA20020 */ sw $v0, 0x0020($sp) -/* 00E94 80AEBAA4 C7AC0030 */ lwc1 $f12, 0x0030($sp) -/* 00E98 80AEBAA8 4600428D */ trunc.w.s $f10, $f8 -/* 00E9C 80AEBAAC 44055000 */ mfc1 $a1, $f10 -/* 00EA0 80AEBAB0 0C2BAE1F */ jal func_80AEB87C -/* 00EA4 80AEBAB4 00000000 */ nop -/* 00EA8 80AEBAB8 8FB90020 */ lw $t9, 0x0020($sp) -/* 00EAC 80AEBABC E7200004 */ swc1 $f0, 0x0004($t9) ## 00000004 -/* 00EB0 80AEBAC0 8FA80024 */ lw $t0, 0x0024($sp) -/* 00EB4 80AEBAC4 8E060020 */ lw $a2, 0x0020($s0) ## 00000020 -/* 00EB8 80AEBAC8 C7AC0030 */ lwc1 $f12, 0x0030($sp) -/* 00EBC 80AEBACC C5100008 */ lwc1 $f16, 0x0008($t0) ## 00000008 -/* 00EC0 80AEBAD0 4600848D */ trunc.w.s $f18, $f16 -/* 00EC4 80AEBAD4 44059000 */ mfc1 $a1, $f18 -/* 00EC8 80AEBAD8 0C2BAE1F */ jal func_80AEB87C -/* 00ECC 80AEBADC 00000000 */ nop -/* 00ED0 80AEBAE0 8FAA0020 */ lw $t2, 0x0020($sp) -/* 00ED4 80AEBAE4 E5400008 */ swc1 $f0, 0x0008($t2) ## 00000008 -.L80AEBAE8: -/* 00ED8 80AEBAE8 8FBF001C */ lw $ra, 0x001C($sp) -/* 00EDC 80AEBAEC 8FB00018 */ lw $s0, 0x0018($sp) -/* 00EE0 80AEBAF0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00EE4 80AEBAF4 03E00008 */ jr $ra -/* 00EE8 80AEBAF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBAFC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBAFC.s deleted file mode 100644 index 4ed59560fe..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBAFC.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80AEBAFC -/* 00EEC 80AEBAFC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00EF0 80AEBB00 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00EF4 80AEBB04 8C8E0298 */ lw $t6, 0x0298($a0) ## 00000298 -/* 00EF8 80AEBB08 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00EFC 80AEBB0C 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 00F00 80AEBB10 15C00006 */ bne $t6, $zero, .L80AEBB2C -/* 00F04 80AEBB14 24052889 */ addiu $a1, $zero, 0x2889 ## $a1 = 00002889 -/* 00F08 80AEBB18 0C01E245 */ jal func_80078914 -/* 00F0C 80AEBB1C AFA60018 */ sw $a2, 0x0018($sp) -/* 00F10 80AEBB20 8FA60018 */ lw $a2, 0x0018($sp) -/* 00F14 80AEBB24 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00F18 80AEBB28 ACCF0298 */ sw $t7, 0x0298($a2) ## 00000298 -.L80AEBB2C: -/* 00F1C 80AEBB2C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00F20 80AEBB30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00F24 80AEBB34 03E00008 */ jr $ra -/* 00F28 80AEBB38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBB3C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBB3C.s deleted file mode 100644 index 1cdc3f5c56..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBB3C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80AEBB3C -/* 00F2C 80AEBB3C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00F30 80AEBB40 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00F34 80AEBB44 AFA40018 */ sw $a0, 0x0018($sp) -/* 00F38 80AEBB48 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00F3C 80AEBB4C 0C0295B2 */ jal func_800A56C8 -/* 00F40 80AEBB50 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 -/* 00F44 80AEBB54 10400004 */ beq $v0, $zero, .L80AEBB68 -/* 00F48 80AEBB58 8FA40018 */ lw $a0, 0x0018($sp) -/* 00F4C 80AEBB5C 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 00F50 80AEBB60 0C01E245 */ jal func_80078914 -/* 00F54 80AEBB64 24050863 */ addiu $a1, $zero, 0x0863 ## $a1 = 00000863 -.L80AEBB68: -/* 00F58 80AEBB68 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00F5C 80AEBB6C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00F60 80AEBB70 03E00008 */ jr $ra -/* 00F64 80AEBB74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBB78.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBB78.s deleted file mode 100644 index db9a21b4e2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBB78.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80AEBB78 -/* 00F68 80AEBB78 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00F6C 80AEBB7C AFB00018 */ sw $s0, 0x0018($sp) -/* 00F70 80AEBB80 AFBF001C */ sw $ra, 0x001C($sp) -/* 00F74 80AEBB84 AFA40020 */ sw $a0, 0x0020($sp) -/* 00F78 80AEBB88 2490014C */ addiu $s0, $a0, 0x014C ## $s0 = 0000014C -/* 00F7C 80AEBB8C 02002025 */ or $a0, $s0, $zero ## $a0 = 0000014C -/* 00F80 80AEBB90 0C0295B2 */ jal func_800A56C8 -/* 00F84 80AEBB94 3C054080 */ lui $a1, 0x4080 ## $a1 = 40800000 -/* 00F88 80AEBB98 1440000D */ bne $v0, $zero, .L80AEBBD0 -/* 00F8C 80AEBB9C 02002025 */ or $a0, $s0, $zero ## $a0 = 0000014C -/* 00F90 80AEBBA0 0C0295B2 */ jal func_800A56C8 -/* 00F94 80AEBBA4 3C054150 */ lui $a1, 0x4150 ## $a1 = 41500000 -/* 00F98 80AEBBA8 14400009 */ bne $v0, $zero, .L80AEBBD0 -/* 00F9C 80AEBBAC 02002025 */ or $a0, $s0, $zero ## $a0 = 0000014C -/* 00FA0 80AEBBB0 0C0295B2 */ jal func_800A56C8 -/* 00FA4 80AEBBB4 3C0541B0 */ lui $a1, 0x41B0 ## $a1 = 41B00000 -/* 00FA8 80AEBBB8 14400005 */ bne $v0, $zero, .L80AEBBD0 -/* 00FAC 80AEBBBC 02002025 */ or $a0, $s0, $zero ## $a0 = 0000014C -/* 00FB0 80AEBBC0 0C0295B2 */ jal func_800A56C8 -/* 00FB4 80AEBBC4 3C0541F8 */ lui $a1, 0x41F8 ## $a1 = 41F80000 -/* 00FB8 80AEBBC8 50400006 */ beql $v0, $zero, .L80AEBBE4 -/* 00FBC 80AEBBCC 8FBF001C */ lw $ra, 0x001C($sp) -.L80AEBBD0: -/* 00FC0 80AEBBD0 8FA40020 */ lw $a0, 0x0020($sp) -/* 00FC4 80AEBBD4 24050839 */ addiu $a1, $zero, 0x0839 ## $a1 = 00000839 -/* 00FC8 80AEBBD8 0C01E245 */ jal func_80078914 -/* 00FCC 80AEBBDC 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 00FD0 80AEBBE0 8FBF001C */ lw $ra, 0x001C($sp) -.L80AEBBE4: -/* 00FD4 80AEBBE4 8FB00018 */ lw $s0, 0x0018($sp) -/* 00FD8 80AEBBE8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00FDC 80AEBBEC 03E00008 */ jr $ra -/* 00FE0 80AEBBF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBBF4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBBF4.s deleted file mode 100644 index 46b14d5510..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBBF4.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80AEBBF4 -/* 00FE4 80AEBBF4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00FE8 80AEBBF8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00FEC 80AEBBFC AFA40018 */ sw $a0, 0x0018($sp) -/* 00FF0 80AEBC00 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00FF4 80AEBC04 0C0295B2 */ jal func_800A56C8 -/* 00FF8 80AEBC08 3C054100 */ lui $a1, 0x4100 ## $a1 = 41000000 -/* 00FFC 80AEBC0C 10400004 */ beq $v0, $zero, .L80AEBC20 -/* 01000 80AEBC10 8FA40018 */ lw $a0, 0x0018($sp) -/* 01004 80AEBC14 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 01008 80AEBC18 0C01E245 */ jal func_80078914 -/* 0100C 80AEBC1C 24050873 */ addiu $a1, $zero, 0x0873 ## $a1 = 00000873 -.L80AEBC20: -/* 01010 80AEBC20 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01014 80AEBC24 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01018 80AEBC28 03E00008 */ jr $ra -/* 0101C 80AEBC2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBC30.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBC30.s deleted file mode 100644 index ee936d7420..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBC30.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80AEBC30 -/* 01020 80AEBC30 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01024 80AEBC34 AFBF001C */ sw $ra, 0x001C($sp) -/* 01028 80AEBC38 AFA40020 */ sw $a0, 0x0020($sp) -/* 0102C 80AEBC3C 948F1D74 */ lhu $t7, 0x1D74($a0) ## 00001D74 -/* 01030 80AEBC40 240100CD */ addiu $at, $zero, 0x00CD ## $at = 000000CD -/* 01034 80AEBC44 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 01038 80AEBC48 15E1000A */ bne $t7, $at, .L80AEBC74 -/* 0103C 80AEBC4C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 01040 80AEBC50 8C821C44 */ lw $v0, 0x1C44($a0) ## 00001C44 -/* 01044 80AEBC54 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 01048 80AEBC58 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 -/* 0104C 80AEBC5C AFB80014 */ sw $t8, 0x0014($sp) -/* 01050 80AEBC60 AFA70010 */ sw $a3, 0x0010($sp) -/* 01054 80AEBC64 24042889 */ addiu $a0, $zero, 0x2889 ## $a0 = 00002889 -/* 01058 80AEBC68 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 0105C 80AEBC6C 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 01060 80AEBC70 244500E4 */ addiu $a1, $v0, 0x00E4 ## $a1 = 000000E4 -.L80AEBC74: -/* 01064 80AEBC74 8FBF001C */ lw $ra, 0x001C($sp) -/* 01068 80AEBC78 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0106C 80AEBC7C 03E00008 */ jr $ra -/* 01070 80AEBC80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBC84.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBC84.s deleted file mode 100644 index 782e5a929b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBC84.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80AEBC84 -/* 01074 80AEBC84 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01078 80AEBC88 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0107C 80AEBC8C 94AE1D74 */ lhu $t6, 0x1D74($a1) ## 00001D74 -/* 01080 80AEBC90 24010082 */ addiu $at, $zero, 0x0082 ## $at = 00000082 -/* 01084 80AEBC94 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 01088 80AEBC98 55C10004 */ bnel $t6, $at, .L80AEBCAC -/* 0108C 80AEBC9C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01090 80AEBCA0 0C01E245 */ jal func_80078914 -/* 01094 80AEBCA4 24056863 */ addiu $a1, $zero, 0x6863 ## $a1 = 00006863 -/* 01098 80AEBCA8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AEBCAC: -/* 0109C 80AEBCAC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 010A0 80AEBCB0 03E00008 */ jr $ra -/* 010A4 80AEBCB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBCB8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBCB8.s deleted file mode 100644 index f3aa3e750b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBCB8.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80AEBCB8 -/* 010A8 80AEBCB8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 010AC 80AEBCBC AFBF0024 */ sw $ra, 0x0024($sp) -/* 010B0 80AEBCC0 10A00012 */ beq $a1, $zero, .L80AEBD0C -/* 010B4 80AEBCC4 AFA40028 */ sw $a0, 0x0028($sp) -/* 010B8 80AEBCC8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 010BC 80AEBCCC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 010C0 80AEBCD0 24842E94 */ addiu $a0, $a0, 0x2E94 ## $a0 = 06012E94 -/* 010C4 80AEBCD4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 010C8 80AEBCD8 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 010CC 80AEBCDC 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 010D0 80AEBCE0 468021A0 */ cvt.s.w $f6, $f4 -/* 010D4 80AEBCE4 8FA40028 */ lw $a0, 0x0028($sp) -/* 010D8 80AEBCE8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 010DC 80AEBCEC 24A52E94 */ addiu $a1, $a1, 0x2E94 ## $a1 = 06012E94 -/* 010E0 80AEBCF0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 010E4 80AEBCF4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 010E8 80AEBCF8 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 010EC 80AEBCFC AFA00014 */ sw $zero, 0x0014($sp) -/* 010F0 80AEBD00 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 010F4 80AEBD04 0C029468 */ jal SkelAnime_ChangeAnim - -/* 010F8 80AEBD08 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -.L80AEBD0C: -/* 010FC 80AEBD0C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01100 80AEBD10 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01104 80AEBD14 03E00008 */ jr $ra -/* 01108 80AEBD18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBD1C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBD1C.s deleted file mode 100644 index 5fe1ba15b2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBD1C.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80AEBD1C -/* 0110C 80AEBD1C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01110 80AEBD20 AFB00014 */ sw $s0, 0x0014($sp) -/* 01114 80AEBD24 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01118 80AEBD28 AFB10018 */ sw $s1, 0x0018($sp) -/* 0111C 80AEBD2C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01120 80AEBD30 AFBF001C */ sw $ra, 0x001C($sp) -/* 01124 80AEBD34 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01128 80AEBD38 0C2BAD20 */ jal func_80AEB480 -/* 0112C 80AEBD3C 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 01130 80AEBD40 1040000F */ beq $v0, $zero, .L80AEBD80 -/* 01134 80AEBD44 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 01138 80AEBD48 AE0E0264 */ sw $t6, 0x0264($s0) ## 00000264 -/* 0113C 80AEBD4C AE000268 */ sw $zero, 0x0268($s0) ## 00000268 -/* 01140 80AEBD50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01144 80AEBD54 0C2BAE45 */ jal func_80AEB914 -/* 01148 80AEBD58 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0114C 80AEBD5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01150 80AEBD60 0C2BABB3 */ jal func_80AEAECC -/* 01154 80AEBD64 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01158 80AEBD68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0115C 80AEBD6C 0C2BADA0 */ jal func_80AEB680 -/* 01160 80AEBD70 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01164 80AEBD74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01168 80AEBD78 0C2BAD67 */ jal func_80AEB59C -/* 0116C 80AEBD7C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -.L80AEBD80: -/* 01170 80AEBD80 8FBF001C */ lw $ra, 0x001C($sp) -/* 01174 80AEBD84 8FB00014 */ lw $s0, 0x0014($sp) -/* 01178 80AEBD88 8FB10018 */ lw $s1, 0x0018($sp) -/* 0117C 80AEBD8C 03E00008 */ jr $ra -/* 01180 80AEBD90 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBD94.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBD94.s deleted file mode 100644 index 0fa7ece5cb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBD94.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80AEBD94 -/* 01184 80AEBD94 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01188 80AEBD98 AFB00028 */ sw $s0, 0x0028($sp) -/* 0118C 80AEBD9C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01190 80AEBDA0 AFBF002C */ sw $ra, 0x002C($sp) -/* 01194 80AEBDA4 AFA50044 */ sw $a1, 0x0044($sp) -/* 01198 80AEBDA8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0119C 80AEBDAC 0C2BAD20 */ jal func_80AEB480 -/* 011A0 80AEBDB0 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 011A4 80AEBDB4 1040001C */ beq $v0, $zero, .L80AEBE28 -/* 011A8 80AEBDB8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 011AC 80AEBDBC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 011B0 80AEBDC0 24849060 */ addiu $a0, $a0, 0x9060 ## $a0 = 06009060 -/* 011B4 80AEBDC4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 011B8 80AEBDC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011BC 80AEBDCC 8FA50044 */ lw $a1, 0x0044($sp) -/* 011C0 80AEBDD0 468021A0 */ cvt.s.w $f6, $f4 -/* 011C4 80AEBDD4 0C2BAE4D */ jal func_80AEB934 -/* 011C8 80AEBDD8 E7A60034 */ swc1 $f6, 0x0034($sp) -/* 011CC 80AEBDDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011D0 80AEBDE0 0C2BADCE */ jal func_80AEB738 -/* 011D4 80AEBDE4 8FA50044 */ lw $a1, 0x0044($sp) -/* 011D8 80AEBDE8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 011DC 80AEBDEC C7A80034 */ lwc1 $f8, 0x0034($sp) -/* 011E0 80AEBDF0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 011E4 80AEBDF4 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 011E8 80AEBDF8 44070000 */ mfc1 $a3, $f0 -/* 011EC 80AEBDFC AFAE0014 */ sw $t6, 0x0014($sp) -/* 011F0 80AEBE00 24A59060 */ addiu $a1, $a1, 0x9060 ## $a1 = 06009060 -/* 011F4 80AEBE04 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 011F8 80AEBE08 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 011FC 80AEBE0C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01200 80AEBE10 0C029468 */ jal SkelAnime_ChangeAnim - -/* 01204 80AEBE14 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01208 80AEBE18 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 0120C 80AEBE1C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 01210 80AEBE20 AE0F0264 */ sw $t7, 0x0264($s0) ## 00000264 -/* 01214 80AEBE24 AE180268 */ sw $t8, 0x0268($s0) ## 00000268 -.L80AEBE28: -/* 01218 80AEBE28 8FBF002C */ lw $ra, 0x002C($sp) -/* 0121C 80AEBE2C 8FB00028 */ lw $s0, 0x0028($sp) -/* 01220 80AEBE30 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 01224 80AEBE34 03E00008 */ jr $ra -/* 01228 80AEBE38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBE3C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBE3C.s deleted file mode 100644 index 6596ac5fc6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBE3C.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80AEBE3C -/* 0122C 80AEBE3C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01230 80AEBE40 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01234 80AEBE44 10C0001A */ beq $a2, $zero, .L80AEBEB0 -/* 01238 80AEBE48 AFA40038 */ sw $a0, 0x0038($sp) -/* 0123C 80AEBE4C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01240 80AEBE50 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01244 80AEBE54 24843A64 */ addiu $a0, $a0, 0x3A64 ## $a0 = 06013A64 -/* 01248 80AEBE58 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0124C 80AEBE5C 8FA40038 */ lw $a0, 0x0038($sp) -/* 01250 80AEBE60 468021A0 */ cvt.s.w $f6, $f4 -/* 01254 80AEBE64 0C2BADF4 */ jal func_80AEB7D0 -/* 01258 80AEBE68 E7A6002C */ swc1 $f6, 0x002C($sp) -/* 0125C 80AEBE6C 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 01260 80AEBE70 44815000 */ mtc1 $at, $f10 ## $f10 = -8.00 -/* 01264 80AEBE74 8FA40038 */ lw $a0, 0x0038($sp) -/* 01268 80AEBE78 C7A8002C */ lwc1 $f8, 0x002C($sp) -/* 0126C 80AEBE7C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01270 80AEBE80 24A53A64 */ addiu $a1, $a1, 0x3A64 ## $a1 = 06013A64 -/* 01274 80AEBE84 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01278 80AEBE88 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0127C 80AEBE8C AFA00014 */ sw $zero, 0x0014($sp) -/* 01280 80AEBE90 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01284 80AEBE94 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 01288 80AEBE98 0C029468 */ jal SkelAnime_ChangeAnim - -/* 0128C 80AEBE9C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01290 80AEBEA0 8FAF0038 */ lw $t7, 0x0038($sp) -/* 01294 80AEBEA4 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 01298 80AEBEA8 10000003 */ beq $zero, $zero, .L80AEBEB8 -/* 0129C 80AEBEAC ADEE0264 */ sw $t6, 0x0264($t7) ## 00000264 -.L80AEBEB0: -/* 012A0 80AEBEB0 0C2BAE55 */ jal func_80AEB954 -/* 012A4 80AEBEB4 8FA40038 */ lw $a0, 0x0038($sp) -.L80AEBEB8: -/* 012A8 80AEBEB8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 012AC 80AEBEBC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 012B0 80AEBEC0 03E00008 */ jr $ra -/* 012B4 80AEBEC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBEC8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBEC8.s deleted file mode 100644 index a78250761c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBEC8.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80AEBEC8 -/* 012B8 80AEBEC8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 012BC 80AEBECC AFA40038 */ sw $a0, 0x0038($sp) -/* 012C0 80AEBED0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 012C4 80AEBED4 AFA5003C */ sw $a1, 0x003C($sp) -/* 012C8 80AEBED8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 012CC 80AEBEDC 0C2BAD16 */ jal func_80AEB458 -/* 012D0 80AEBEE0 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 -/* 012D4 80AEBEE4 1040001A */ beq $v0, $zero, .L80AEBF50 -/* 012D8 80AEBEE8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 012DC 80AEBEEC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 012E0 80AEBEF0 24848AA8 */ addiu $a0, $a0, 0x8AA8 ## $a0 = 06008AA8 -/* 012E4 80AEBEF4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 012E8 80AEBEF8 8FA40038 */ lw $a0, 0x0038($sp) -/* 012EC 80AEBEFC 8FA5003C */ lw $a1, 0x003C($sp) -/* 012F0 80AEBF00 468021A0 */ cvt.s.w $f6, $f4 -/* 012F4 80AEBF04 0C2BADCE */ jal func_80AEB738 -/* 012F8 80AEBF08 E7A6002C */ swc1 $f6, 0x002C($sp) -/* 012FC 80AEBF0C 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 01300 80AEBF10 44815000 */ mtc1 $at, $f10 ## $f10 = -8.00 -/* 01304 80AEBF14 8FA40038 */ lw $a0, 0x0038($sp) -/* 01308 80AEBF18 C7A8002C */ lwc1 $f8, 0x002C($sp) -/* 0130C 80AEBF1C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01310 80AEBF20 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01314 80AEBF24 AFAE0014 */ sw $t6, 0x0014($sp) -/* 01318 80AEBF28 24A58AA8 */ addiu $a1, $a1, 0x8AA8 ## $a1 = 06008AA8 -/* 0131C 80AEBF2C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01320 80AEBF30 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01324 80AEBF34 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01328 80AEBF38 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 0132C 80AEBF3C 0C029468 */ jal SkelAnime_ChangeAnim - -/* 01330 80AEBF40 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01334 80AEBF44 8FB80038 */ lw $t8, 0x0038($sp) -/* 01338 80AEBF48 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 -/* 0133C 80AEBF4C AF0F0264 */ sw $t7, 0x0264($t8) ## 00000264 -.L80AEBF50: -/* 01340 80AEBF50 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01344 80AEBF54 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01348 80AEBF58 03E00008 */ jr $ra -/* 0134C 80AEBF5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBF60.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBF60.s deleted file mode 100644 index 027bc526a2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBF60.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80AEBF60 -/* 01350 80AEBF60 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01354 80AEBF64 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01358 80AEBF68 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0135C 80AEBF6C AFA5001C */ sw $a1, 0x001C($sp) -/* 01360 80AEBF70 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01364 80AEBF74 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 -/* 01368 80AEBF78 0C2BAD20 */ jal func_80AEB480 -/* 0136C 80AEBF7C AFA60018 */ sw $a2, 0x0018($sp) -/* 01370 80AEBF80 1040000E */ beq $v0, $zero, .L80AEBFBC -/* 01374 80AEBF84 8FA60018 */ lw $a2, 0x0018($sp) -/* 01378 80AEBF88 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0137C 80AEBF8C 0C2BADF4 */ jal func_80AEB7D0 -/* 01380 80AEBF90 AFA60018 */ sw $a2, 0x0018($sp) -/* 01384 80AEBF94 8FA60018 */ lw $a2, 0x0018($sp) -/* 01388 80AEBF98 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 0138C 80AEBF9C 8CD80024 */ lw $t8, 0x0024($a2) ## 00000024 -/* 01390 80AEBFA0 8CCF0028 */ lw $t7, 0x0028($a2) ## 00000028 -/* 01394 80AEBFA4 ACCE0264 */ sw $t6, 0x0264($a2) ## 00000264 -/* 01398 80AEBFA8 ACD80364 */ sw $t8, 0x0364($a2) ## 00000364 -/* 0139C 80AEBFAC 8CD8002C */ lw $t8, 0x002C($a2) ## 0000002C -/* 013A0 80AEBFB0 ACCF0368 */ sw $t7, 0x0368($a2) ## 00000368 -/* 013A4 80AEBFB4 10000004 */ beq $zero, $zero, .L80AEBFC8 -/* 013A8 80AEBFB8 ACD8036C */ sw $t8, 0x036C($a2) ## 0000036C -.L80AEBFBC: -/* 013AC 80AEBFBC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 013B0 80AEBFC0 0C2BAE83 */ jal func_80AEBA0C -/* 013B4 80AEBFC4 8FA5001C */ lw $a1, 0x001C($sp) -.L80AEBFC8: -/* 013B8 80AEBFC8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 013BC 80AEBFCC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 013C0 80AEBFD0 03E00008 */ jr $ra -/* 013C4 80AEBFD4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBFD8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBFD8.s deleted file mode 100644 index 225a8bbfb3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBFD8.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80AEBFD8 -/* 013C8 80AEBFD8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 013CC 80AEBFDC AFBF0024 */ sw $ra, 0x0024($sp) -/* 013D0 80AEBFE0 AFA40028 */ sw $a0, 0x0028($sp) -/* 013D4 80AEBFE4 AFA5002C */ sw $a1, 0x002C($sp) -/* 013D8 80AEBFE8 0C2BAD0E */ jal func_80AEB438 -/* 013DC 80AEBFEC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 013E0 80AEBFF0 1040001B */ beq $v0, $zero, .L80AEC060 -/* 013E4 80AEBFF4 8FAE002C */ lw $t6, 0x002C($sp) -/* 013E8 80AEBFF8 94440004 */ lhu $a0, 0x0004($v0) ## 00000004 -/* 013EC 80AEBFFC 95C31D74 */ lhu $v1, 0x1D74($t6) ## 00001D74 -/* 013F0 80AEC000 248FFFFE */ addiu $t7, $a0, 0xFFFE ## $t7 = FFFFFFFE -/* 013F4 80AEC004 006F082A */ slt $at, $v1, $t7 -/* 013F8 80AEC008 14200015 */ bne $at, $zero, .L80AEC060 -/* 013FC 80AEC00C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01400 80AEC010 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01404 80AEC014 24848100 */ addiu $a0, $a0, 0x8100 ## $a0 = 06008100 -/* 01408 80AEC018 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0140C 80AEC01C 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 01410 80AEC020 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 01414 80AEC024 468021A0 */ cvt.s.w $f6, $f4 -/* 01418 80AEC028 8FA40028 */ lw $a0, 0x0028($sp) -/* 0141C 80AEC02C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01420 80AEC030 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 01424 80AEC034 AFB80014 */ sw $t8, 0x0014($sp) -/* 01428 80AEC038 24A58100 */ addiu $a1, $a1, 0x8100 ## $a1 = 06008100 -/* 0142C 80AEC03C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01430 80AEC040 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01434 80AEC044 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01438 80AEC048 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0143C 80AEC04C 0C029468 */ jal SkelAnime_ChangeAnim - -/* 01440 80AEC050 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01444 80AEC054 8FA80028 */ lw $t0, 0x0028($sp) -/* 01448 80AEC058 24190006 */ addiu $t9, $zero, 0x0006 ## $t9 = 00000006 -/* 0144C 80AEC05C AD190264 */ sw $t9, 0x0264($t0) ## 00000264 -.L80AEC060: -/* 01450 80AEC060 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01454 80AEC064 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01458 80AEC068 03E00008 */ jr $ra -/* 0145C 80AEC06C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC070.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC070.s deleted file mode 100644 index f9d47ff711..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC070.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80AEC070 -/* 01460 80AEC070 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01464 80AEC074 AFA40018 */ sw $a0, 0x0018($sp) -/* 01468 80AEC078 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0146C 80AEC07C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01470 80AEC080 AFA60020 */ sw $a2, 0x0020($sp) -/* 01474 80AEC084 0C2BAD16 */ jal func_80AEB458 -/* 01478 80AEC088 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 0147C 80AEC08C 10400005 */ beq $v0, $zero, .L80AEC0A4 -/* 01480 80AEC090 8FAE0020 */ lw $t6, 0x0020($sp) -/* 01484 80AEC094 51C00004 */ beql $t6, $zero, .L80AEC0A8 -/* 01488 80AEC098 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0148C 80AEC09C 0C00B55C */ jal Actor_Kill - -/* 01490 80AEC0A0 8FA40018 */ lw $a0, 0x0018($sp) -.L80AEC0A4: -/* 01494 80AEC0A4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AEC0A8: -/* 01498 80AEC0A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0149C 80AEC0AC 03E00008 */ jr $ra -/* 014A0 80AEC0B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC0B4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC0B4.s deleted file mode 100644 index a681e761f5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC0B4.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80AEC0B4 -/* 014A4 80AEC0B4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 014A8 80AEC0B8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 014AC 80AEC0BC AFA40018 */ sw $a0, 0x0018($sp) -/* 014B0 80AEC0C0 0C2BAE27 */ jal func_80AEB89C -/* 014B4 80AEC0C4 AFA5001C */ sw $a1, 0x001C($sp) -/* 014B8 80AEC0C8 0C2BACC8 */ jal func_80AEB320 -/* 014BC 80AEC0CC 8FA40018 */ lw $a0, 0x0018($sp) -/* 014C0 80AEC0D0 8FA40018 */ lw $a0, 0x0018($sp) -/* 014C4 80AEC0D4 0C2BAF21 */ jal func_80AEBC84 -/* 014C8 80AEC0D8 8FA5001C */ lw $a1, 0x001C($sp) -/* 014CC 80AEC0DC 0C2BAF0C */ jal func_80AEBC30 -/* 014D0 80AEC0E0 8FA4001C */ lw $a0, 0x001C($sp) -/* 014D4 80AEC0E4 8FA40018 */ lw $a0, 0x0018($sp) -/* 014D8 80AEC0E8 0C2BAF47 */ jal func_80AEBD1C -/* 014DC 80AEC0EC 8FA5001C */ lw $a1, 0x001C($sp) -/* 014E0 80AEC0F0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 014E4 80AEC0F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 014E8 80AEC0F8 03E00008 */ jr $ra -/* 014EC 80AEC0FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC100.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC100.s deleted file mode 100644 index 14b3eb1271..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC100.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80AEC100 -/* 014F0 80AEC100 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 014F4 80AEC104 AFBF0014 */ sw $ra, 0x0014($sp) -/* 014F8 80AEC108 AFA40018 */ sw $a0, 0x0018($sp) -/* 014FC 80AEC10C 0C2BAEBF */ jal func_80AEBAFC -/* 01500 80AEC110 AFA5001C */ sw $a1, 0x001C($sp) -/* 01504 80AEC114 8FA40018 */ lw $a0, 0x0018($sp) -/* 01508 80AEC118 0C2BAF65 */ jal func_80AEBD94 -/* 0150C 80AEC11C 8FA5001C */ lw $a1, 0x001C($sp) -/* 01510 80AEC120 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01514 80AEC124 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01518 80AEC128 03E00008 */ jr $ra -/* 0151C 80AEC12C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC130.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC130.s deleted file mode 100644 index 7478f7e06c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC130.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80AEC130 -/* 01520 80AEC130 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01524 80AEC134 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01528 80AEC138 AFA40020 */ sw $a0, 0x0020($sp) -/* 0152C 80AEC13C 0C2BACC8 */ jal func_80AEB320 -/* 01530 80AEC140 AFA50024 */ sw $a1, 0x0024($sp) -/* 01534 80AEC144 AFA2001C */ sw $v0, 0x001C($sp) -/* 01538 80AEC148 8FA40020 */ lw $a0, 0x0020($sp) -/* 0153C 80AEC14C 0C2BABB3 */ jal func_80AEAECC -/* 01540 80AEC150 8FA50024 */ lw $a1, 0x0024($sp) -/* 01544 80AEC154 0C2BAECF */ jal func_80AEBB3C -/* 01548 80AEC158 8FA40020 */ lw $a0, 0x0020($sp) -/* 0154C 80AEC15C 8FA40020 */ lw $a0, 0x0020($sp) -/* 01550 80AEC160 8FA50024 */ lw $a1, 0x0024($sp) -/* 01554 80AEC164 0C2BAF8F */ jal func_80AEBE3C -/* 01558 80AEC168 8FA6001C */ lw $a2, 0x001C($sp) -/* 0155C 80AEC16C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01560 80AEC170 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01564 80AEC174 03E00008 */ jr $ra -/* 01568 80AEC178 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC17C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC17C.s deleted file mode 100644 index d60acff351..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC17C.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80AEC17C -/* 0156C 80AEC17C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01570 80AEC180 AFBF001C */ sw $ra, 0x001C($sp) -/* 01574 80AEC184 AFB00018 */ sw $s0, 0x0018($sp) -/* 01578 80AEC188 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0157C 80AEC18C 0C2BAE5D */ jal func_80AEB974 -/* 01580 80AEC190 AFA50024 */ sw $a1, 0x0024($sp) -/* 01584 80AEC194 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01588 80AEC198 0C2BABB3 */ jal func_80AEAECC -/* 0158C 80AEC19C 8FA50024 */ lw $a1, 0x0024($sp) -/* 01590 80AEC1A0 0C2BACC8 */ jal func_80AEB320 -/* 01594 80AEC1A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01598 80AEC1A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0159C 80AEC1AC 0C2BAD43 */ jal func_80AEB50C -/* 015A0 80AEC1B0 8FA50024 */ lw $a1, 0x0024($sp) -/* 015A4 80AEC1B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015A8 80AEC1B8 0C2BAFB2 */ jal func_80AEBEC8 -/* 015AC 80AEC1BC 8FA50024 */ lw $a1, 0x0024($sp) -/* 015B0 80AEC1C0 8FBF001C */ lw $ra, 0x001C($sp) -/* 015B4 80AEC1C4 8FB00018 */ lw $s0, 0x0018($sp) -/* 015B8 80AEC1C8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 015BC 80AEC1CC 03E00008 */ jr $ra -/* 015C0 80AEC1D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC1D4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC1D4.s deleted file mode 100644 index 0243a5de1e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC1D4.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80AEC1D4 -/* 015C4 80AEC1D4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 015C8 80AEC1D8 AFBF001C */ sw $ra, 0x001C($sp) -/* 015CC 80AEC1DC AFB00018 */ sw $s0, 0x0018($sp) -/* 015D0 80AEC1E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 015D4 80AEC1E4 0C2BACC8 */ jal func_80AEB320 -/* 015D8 80AEC1E8 AFA5002C */ sw $a1, 0x002C($sp) -/* 015DC 80AEC1EC AFA20024 */ sw $v0, 0x0024($sp) -/* 015E0 80AEC1F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015E4 80AEC1F4 0C2BABB3 */ jal func_80AEAECC -/* 015E8 80AEC1F8 8FA5002C */ lw $a1, 0x002C($sp) -/* 015EC 80AEC1FC 0C2BAB87 */ jal func_80AEAE1C -/* 015F0 80AEC200 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015F4 80AEC204 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015F8 80AEC208 0C2BAD43 */ jal func_80AEB50C -/* 015FC 80AEC20C 8FA5002C */ lw $a1, 0x002C($sp) -/* 01600 80AEC210 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01604 80AEC214 0C2BAF2E */ jal func_80AEBCB8 -/* 01608 80AEC218 8FA50024 */ lw $a1, 0x0024($sp) -/* 0160C 80AEC21C 0C2BAEFD */ jal func_80AEBBF4 -/* 01610 80AEC220 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01614 80AEC224 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01618 80AEC228 0C2BAFD8 */ jal func_80AEBF60 -/* 0161C 80AEC22C 8FA5002C */ lw $a1, 0x002C($sp) -/* 01620 80AEC230 8FBF001C */ lw $ra, 0x001C($sp) -/* 01624 80AEC234 8FB00018 */ lw $s0, 0x0018($sp) -/* 01628 80AEC238 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0162C 80AEC23C 03E00008 */ jr $ra -/* 01630 80AEC240 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC244.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC244.s deleted file mode 100644 index 21ebfdfb00..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC244.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80AEC244 -/* 01634 80AEC244 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01638 80AEC248 AFBF001C */ sw $ra, 0x001C($sp) -/* 0163C 80AEC24C AFB00018 */ sw $s0, 0x0018($sp) -/* 01640 80AEC250 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01644 80AEC254 0C2BACC8 */ jal func_80AEB320 -/* 01648 80AEC258 AFA5002C */ sw $a1, 0x002C($sp) -/* 0164C 80AEC25C AFA20024 */ sw $v0, 0x0024($sp) -/* 01650 80AEC260 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01654 80AEC264 0C2BAE8B */ jal func_80AEBA2C -/* 01658 80AEC268 8FA5002C */ lw $a1, 0x002C($sp) -/* 0165C 80AEC26C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01660 80AEC270 0C2BABB3 */ jal func_80AEAECC -/* 01664 80AEC274 8FA5002C */ lw $a1, 0x002C($sp) -/* 01668 80AEC278 0C2BAB87 */ jal func_80AEAE1C -/* 0166C 80AEC27C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01670 80AEC280 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01674 80AEC284 0C2BAD43 */ jal func_80AEB50C -/* 01678 80AEC288 8FA5002C */ lw $a1, 0x002C($sp) -/* 0167C 80AEC28C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01680 80AEC290 0C2BAF2E */ jal func_80AEBCB8 -/* 01684 80AEC294 8FA50024 */ lw $a1, 0x0024($sp) -/* 01688 80AEC298 0C2BAEDE */ jal func_80AEBB78 -/* 0168C 80AEC29C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01690 80AEC2A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01694 80AEC2A4 0C2BAFF6 */ jal func_80AEBFD8 -/* 01698 80AEC2A8 8FA5002C */ lw $a1, 0x002C($sp) -/* 0169C 80AEC2AC 8FBF001C */ lw $ra, 0x001C($sp) -/* 016A0 80AEC2B0 8FB00018 */ lw $s0, 0x0018($sp) -/* 016A4 80AEC2B4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 016A8 80AEC2B8 03E00008 */ jr $ra -/* 016AC 80AEC2BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC2C0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC2C0.s deleted file mode 100644 index 5017743632..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC2C0.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AEC2C0 -/* 016B0 80AEC2C0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 016B4 80AEC2C4 AFBF001C */ sw $ra, 0x001C($sp) -/* 016B8 80AEC2C8 AFB00018 */ sw $s0, 0x0018($sp) -/* 016BC 80AEC2CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 016C0 80AEC2D0 0C2BACC8 */ jal func_80AEB320 -/* 016C4 80AEC2D4 AFA5002C */ sw $a1, 0x002C($sp) -/* 016C8 80AEC2D8 AFA20024 */ sw $v0, 0x0024($sp) -/* 016CC 80AEC2DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016D0 80AEC2E0 0C2BABB3 */ jal func_80AEAECC -/* 016D4 80AEC2E4 8FA5002C */ lw $a1, 0x002C($sp) -/* 016D8 80AEC2E8 0C2BAB87 */ jal func_80AEAE1C -/* 016DC 80AEC2EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016E0 80AEC2F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016E4 80AEC2F4 0C2BAD43 */ jal func_80AEB50C -/* 016E8 80AEC2F8 8FA5002C */ lw $a1, 0x002C($sp) -/* 016EC 80AEC2FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016F0 80AEC300 8FA5002C */ lw $a1, 0x002C($sp) -/* 016F4 80AEC304 0C2BB01C */ jal func_80AEC070 -/* 016F8 80AEC308 8FA60024 */ lw $a2, 0x0024($sp) -/* 016FC 80AEC30C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01700 80AEC310 8FB00018 */ lw $s0, 0x0018($sp) -/* 01704 80AEC314 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01708 80AEC318 03E00008 */ jr $ra -/* 0170C 80AEC31C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC320.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC320.s deleted file mode 100644 index eb9ddd4840..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC320.s +++ /dev/null @@ -1,67 +0,0 @@ -glabel func_80AEC320 -/* 01710 80AEC320 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01714 80AEC324 9442F580 */ lhu $v0, -0x0A80($v0) ## 8015F580 -/* 01718 80AEC328 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0171C 80AEC32C AFB00020 */ sw $s0, 0x0020($sp) -/* 01720 80AEC330 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 01724 80AEC334 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01728 80AEC338 15C0000E */ bne $t6, $zero, .L80AEC374 -/* 0172C 80AEC33C AFBF0024 */ sw $ra, 0x0024($sp) -/* 01730 80AEC340 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01734 80AEC344 24A597B8 */ addiu $a1, $a1, 0x97B8 ## $a1 = 060097B8 -/* 01738 80AEC348 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0173C 80AEC34C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01740 80AEC350 0C2BAC99 */ jal func_80AEB264 -/* 01744 80AEC354 AFA00010 */ sw $zero, 0x0010($sp) -/* 01748 80AEC358 240F0007 */ addiu $t7, $zero, 0x0007 ## $t7 = 00000007 -/* 0174C 80AEC35C AE0F0264 */ sw $t7, 0x0264($s0) ## 00000264 -/* 01750 80AEC360 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01754 80AEC364 0C2BABAE */ jal func_80AEAEB8 -/* 01758 80AEC368 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0175C 80AEC36C 10000023 */ beq $zero, $zero, .L80AEC3FC -/* 01760 80AEC370 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AEC374: -/* 01764 80AEC374 30580080 */ andi $t8, $v0, 0x0080 ## $t8 = 00000000 -/* 01768 80AEC378 1300001D */ beq $t8, $zero, .L80AEC3F0 -/* 0176C 80AEC37C 30590001 */ andi $t9, $v0, 0x0001 ## $t9 = 00000000 -/* 01770 80AEC380 1720001B */ bne $t9, $zero, .L80AEC3F0 -/* 01774 80AEC384 30480020 */ andi $t0, $v0, 0x0020 ## $t0 = 00000000 -/* 01778 80AEC388 15000019 */ bne $t0, $zero, .L80AEC3F0 -/* 0177C 80AEC38C 00000000 */ nop -/* 01780 80AEC390 0C2BAC08 */ jal func_80AEB020 -/* 01784 80AEC394 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01788 80AEC398 14400011 */ bne $v0, $zero, .L80AEC3E0 -/* 0178C 80AEC39C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01790 80AEC3A0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01794 80AEC3A4 24A597B8 */ addiu $a1, $a1, 0x97B8 ## $a1 = 060097B8 -/* 01798 80AEC3A8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0179C 80AEC3AC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 017A0 80AEC3B0 0C2BAC99 */ jal func_80AEB264 -/* 017A4 80AEC3B4 AFA00010 */ sw $zero, 0x0010($sp) -/* 017A8 80AEC3B8 82020003 */ lb $v0, 0x0003($s0) ## 00000003 -/* 017AC 80AEC3BC 24090016 */ addiu $t1, $zero, 0x0016 ## $t1 = 00000016 -/* 017B0 80AEC3C0 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 017B4 80AEC3C4 AE090264 */ sw $t1, 0x0264($s0) ## 00000264 -/* 017B8 80AEC3C8 A20A0003 */ sb $t2, 0x0003($s0) ## 00000003 -/* 017BC 80AEC3CC AE000268 */ sw $zero, 0x0268($s0) ## 00000268 -/* 017C0 80AEC3D0 A2020284 */ sb $v0, 0x0284($s0) ## 00000284 -/* 017C4 80AEC3D4 A2020286 */ sb $v0, 0x0286($s0) ## 00000286 -/* 017C8 80AEC3D8 10000007 */ beq $zero, $zero, .L80AEC3F8 -/* 017CC 80AEC3DC A2020285 */ sb $v0, 0x0285($s0) ## 00000285 -.L80AEC3E0: -/* 017D0 80AEC3E0 0C00B55C */ jal Actor_Kill - -/* 017D4 80AEC3E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017D8 80AEC3E8 10000004 */ beq $zero, $zero, .L80AEC3FC -/* 017DC 80AEC3EC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AEC3F0: -/* 017E0 80AEC3F0 0C00B55C */ jal Actor_Kill - -/* 017E4 80AEC3F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AEC3F8: -/* 017E8 80AEC3F8 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AEC3FC: -/* 017EC 80AEC3FC 8FB00020 */ lw $s0, 0x0020($sp) -/* 017F0 80AEC400 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 017F4 80AEC404 03E00008 */ jr $ra -/* 017F8 80AEC408 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC40C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC40C.s deleted file mode 100644 index 8ec26d08dc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC40C.s +++ /dev/null @@ -1,66 +0,0 @@ -.late_rodata -glabel D_80AF1BCC - .float 0.01 - -glabel D_80AF1BD0 - .float 2.7 - -glabel D_80AF1BD4 - .float 0.01 - -glabel D_80AF1BD8 - .float 2.7 - -.text -glabel func_80AEC40C -/* 017FC 80AEC40C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01800 80AEC410 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01804 80AEC414 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 01808 80AEC418 C480026C */ lwc1 $f0, 0x026C($a0) ## 0000026C -/* 0180C 80AEC41C 44812000 */ mtc1 $at, $f4 ## $f4 = 8.00 -/* 01810 80AEC420 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 01814 80AEC424 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 01818 80AEC428 4604003C */ c.lt.s $f0, $f4 -/* 0181C 80AEC42C 00000000 */ nop -/* 01820 80AEC430 45000012 */ bc1f .L80AEC47C -/* 01824 80AEC434 00000000 */ nop -/* 01828 80AEC438 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 -/* 0182C 80AEC43C 3C0180AF */ lui $at, %hi(D_80AF1BCC) ## $at = 80AF0000 -/* 01830 80AEC440 C42A1BCC */ lwc1 $f10, %lo(D_80AF1BCC)($at) -/* 01834 80AEC444 85CF145A */ lh $t7, 0x145A($t6) ## 8016145A -/* 01838 80AEC448 3C0180AF */ lui $at, %hi(D_80AF1BD0) ## $at = 80AF0000 -/* 0183C 80AEC44C C4321BD0 */ lwc1 $f18, %lo(D_80AF1BD0)($at) -/* 01840 80AEC450 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 01844 80AEC454 3C013E00 */ lui $at, 0x3E00 ## $at = 3E000000 -/* 01848 80AEC458 46803220 */ cvt.s.w $f8, $f6 -/* 0184C 80AEC45C 44813000 */ mtc1 $at, $f6 ## $f6 = 0.12 -/* 01850 80AEC460 460A4402 */ mul.s $f16, $f8, $f10 -/* 01854 80AEC464 46128100 */ add.s $f4, $f16, $f18 -/* 01858 80AEC468 46062202 */ mul.s $f8, $f4, $f6 -/* 0185C 80AEC46C 00000000 */ nop -/* 01860 80AEC470 46004282 */ mul.s $f10, $f8, $f0 -/* 01864 80AEC474 1000000D */ beq $zero, $zero, .L80AEC4AC -/* 01868 80AEC478 E48A0068 */ swc1 $f10, 0x0068($a0) ## 00000068 -.L80AEC47C: -/* 0186C 80AEC47C 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 -/* 01870 80AEC480 3C0180AF */ lui $at, %hi(D_80AF1BD4) ## $at = 80AF0000 -/* 01874 80AEC484 C4241BD4 */ lwc1 $f4, %lo(D_80AF1BD4)($at) -/* 01878 80AEC488 8719145A */ lh $t9, 0x145A($t8) ## 8016145A -/* 0187C 80AEC48C 3C0180AF */ lui $at, %hi(D_80AF1BD8) ## $at = 80AF0000 -/* 01880 80AEC490 C4281BD8 */ lwc1 $f8, %lo(D_80AF1BD8)($at) -/* 01884 80AEC494 44998000 */ mtc1 $t9, $f16 ## $f16 = 0.00 -/* 01888 80AEC498 00000000 */ nop -/* 0188C 80AEC49C 468084A0 */ cvt.s.w $f18, $f16 -/* 01890 80AEC4A0 46049182 */ mul.s $f6, $f18, $f4 -/* 01894 80AEC4A4 46083280 */ add.s $f10, $f6, $f8 -/* 01898 80AEC4A8 E48A0068 */ swc1 $f10, 0x0068($a0) ## 00000068 -.L80AEC4AC: -/* 0189C 80AEC4AC 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 018A0 80AEC4B0 44818000 */ mtc1 $at, $f16 ## $f16 = -1.00 -/* 018A4 80AEC4B4 0C00B638 */ jal Actor_MoveForward - -/* 018A8 80AEC4B8 E4900060 */ swc1 $f16, 0x0060($a0) ## 00000060 -/* 018AC 80AEC4BC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 018B0 80AEC4C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018B4 80AEC4C4 03E00008 */ jr $ra -/* 018B8 80AEC4C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC4CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC4CC.s deleted file mode 100644 index 896cd12a35..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC4CC.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80AEC4CC -/* 018BC 80AEC4CC 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 018C0 80AEC4D0 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 018C4 80AEC4D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 018C8 80AEC4D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 018CC 80AEC4DC 0C00B638 */ jal Actor_MoveForward - -/* 018D0 80AEC4E0 E4840060 */ swc1 $f4, 0x0060($a0) ## 00000060 -/* 018D4 80AEC4E4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 018D8 80AEC4E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018DC 80AEC4EC 03E00008 */ jr $ra -/* 018E0 80AEC4F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC4F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC4F4.s deleted file mode 100644 index 301df6f295..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC4F4.s +++ /dev/null @@ -1,78 +0,0 @@ -.late_rodata -glabel D_80AF1BDC - .float 0.01 - -glabel D_80AF1BE0 - .float 0.01 - -.text -glabel func_80AEC4F4 -/* 018E4 80AEC4F4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 018E8 80AEC4F8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 018EC 80AEC4FC 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 018F0 80AEC500 44811000 */ mtc1 $at, $f2 ## $f2 = 8.00 -/* 018F4 80AEC504 C484026C */ lwc1 $f4, 0x026C($a0) ## 0000026C -/* 018F8 80AEC508 3C013E00 */ lui $at, 0x3E00 ## $at = 3E000000 -/* 018FC 80AEC50C 2482026C */ addiu $v0, $a0, 0x026C ## $v0 = 0000026C -/* 01900 80AEC510 4602203C */ c.lt.s $f4, $f2 -/* 01904 80AEC514 00000000 */ nop -/* 01908 80AEC518 45020023 */ bc1fl .L80AEC5A8 -/* 0190C 80AEC51C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01910 80AEC520 44810000 */ mtc1 $at, $f0 ## $f0 = 0.12 -/* 01914 80AEC524 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01918 80AEC528 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 0191C 80AEC52C C4460000 */ lwc1 $f6, 0x0000($v0) ## 0000026C -/* 01920 80AEC530 24830068 */ addiu $v1, $a0, 0x0068 ## $v1 = 00000068 -/* 01924 80AEC534 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 01928 80AEC538 46083280 */ add.s $f10, $f6, $f8 -/* 0192C 80AEC53C 3C0180AF */ lui $at, %hi(D_80AF1BDC) ## $at = 80AF0000 -/* 01930 80AEC540 E44A0000 */ swc1 $f10, 0x0000($v0) ## 0000026C -/* 01934 80AEC544 C4520000 */ lwc1 $f18, 0x0000($v0) ## 0000026C -/* 01938 80AEC548 C4700000 */ lwc1 $f16, 0x0000($v1) ## 00000068 -/* 0193C 80AEC54C 46121101 */ sub.s $f4, $f2, $f18 -/* 01940 80AEC550 46002182 */ mul.s $f6, $f4, $f0 -/* 01944 80AEC554 00000000 */ nop -/* 01948 80AEC558 46068202 */ mul.s $f8, $f16, $f6 -/* 0194C 80AEC55C E4680000 */ swc1 $f8, 0x0000($v1) ## 00000068 -/* 01950 80AEC560 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 -/* 01954 80AEC564 C4241BDC */ lwc1 $f4, %lo(D_80AF1BDC)($at) -/* 01958 80AEC568 3C014150 */ lui $at, 0x4150 ## $at = 41500000 -/* 0195C 80AEC56C 85CF145C */ lh $t7, 0x145C($t6) ## 8016145C -/* 01960 80AEC570 44813000 */ mtc1 $at, $f6 ## $f6 = 13.00 -/* 01964 80AEC574 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 01968 80AEC578 00000000 */ nop -/* 0196C 80AEC57C 468054A0 */ cvt.s.w $f18, $f10 -/* 01970 80AEC580 46049402 */ mul.s $f16, $f18, $f4 -/* 01974 80AEC584 C4520000 */ lwc1 $f18, 0x0000($v0) ## 0000026C -/* 01978 80AEC588 46009107 */ neg.s $f4, $f18 -/* 0197C 80AEC58C 46068200 */ add.s $f8, $f16, $f6 -/* 01980 80AEC590 46004282 */ mul.s $f10, $f8, $f0 -/* 01984 80AEC594 00000000 */ nop -/* 01988 80AEC598 46045402 */ mul.s $f16, $f10, $f4 -/* 0198C 80AEC59C 10000011 */ beq $zero, $zero, .L80AEC5E4 -/* 01990 80AEC5A0 E4900060 */ swc1 $f16, 0x0060($a0) ## 00000060 -/* 01994 80AEC5A4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -.L80AEC5A8: -/* 01998 80AEC5A8 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 0199C 80AEC5AC 3C0180AF */ lui $at, %hi(D_80AF1BE0) ## $at = 80AF0000 -/* 019A0 80AEC5B0 E4860068 */ swc1 $f6, 0x0068($a0) ## 00000068 -/* 019A4 80AEC5B4 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 -/* 019A8 80AEC5B8 C42A1BE0 */ lwc1 $f10, %lo(D_80AF1BE0)($at) -/* 019AC 80AEC5BC 3C014150 */ lui $at, 0x4150 ## $at = 41500000 -/* 019B0 80AEC5C0 8719145C */ lh $t9, 0x145C($t8) ## 8016145C -/* 019B4 80AEC5C4 44818000 */ mtc1 $at, $f16 ## $f16 = 13.00 -/* 019B8 80AEC5C8 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 -/* 019BC 80AEC5CC 00000000 */ nop -/* 019C0 80AEC5D0 468044A0 */ cvt.s.w $f18, $f8 -/* 019C4 80AEC5D4 460A9102 */ mul.s $f4, $f18, $f10 -/* 019C8 80AEC5D8 46102180 */ add.s $f6, $f4, $f16 -/* 019CC 80AEC5DC 46003207 */ neg.s $f8, $f6 -/* 019D0 80AEC5E0 E4880060 */ swc1 $f8, 0x0060($a0) ## 00000060 -.L80AEC5E4: -/* 019D4 80AEC5E4 0C00B638 */ jal Actor_MoveForward - -/* 019D8 80AEC5E8 00000000 */ nop -/* 019DC 80AEC5EC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 019E0 80AEC5F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 019E4 80AEC5F4 03E00008 */ jr $ra -/* 019E8 80AEC5F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC5FC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC5FC.s deleted file mode 100644 index af8bb8e7cc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC5FC.s +++ /dev/null @@ -1,29 +0,0 @@ -.late_rodata -glabel D_80AF1BE4 - .float 265.0 - -.text -glabel func_80AEC5FC -/* 019EC 80AEC5FC 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 019F0 80AEC600 C480002C */ lwc1 $f0, 0x002C($a0) ## 0000002C -/* 019F4 80AEC604 3C0180AF */ lui $at, %hi(D_80AF1BE4) ## $at = 80AF0000 -/* 019F8 80AEC608 C442002C */ lwc1 $f2, 0x002C($v0) ## 0000002C -/* 019FC 80AEC60C C4241BE4 */ lwc1 $f4, %lo(D_80AF1BE4)($at) -/* 01A00 80AEC610 46001181 */ sub.s $f6, $f2, $f0 -/* 01A04 80AEC614 4604303E */ c.le.s $f6, $f4 -/* 01A08 80AEC618 00000000 */ nop -/* 01A0C 80AEC61C 4502000A */ bc1fl .L80AEC648 -/* 01A10 80AEC620 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01A14 80AEC624 C4480028 */ lwc1 $f8, 0x0028($v0) ## 00000028 -/* 01A18 80AEC628 C48A0028 */ lwc1 $f10, 0x0028($a0) ## 00000028 -/* 01A1C 80AEC62C 4608503E */ c.le.s $f10, $f8 -/* 01A20 80AEC630 00000000 */ nop -/* 01A24 80AEC634 45020004 */ bc1fl .L80AEC648 -/* 01A28 80AEC638 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01A2C 80AEC63C 03E00008 */ jr $ra -/* 01A30 80AEC640 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AEC644: -/* 01A34 80AEC644 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AEC648: -/* 01A38 80AEC648 03E00008 */ jr $ra -/* 01A3C 80AEC64C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC650.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC650.s deleted file mode 100644 index b47dc9082a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC650.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80AEC650 -/* 01A40 80AEC650 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01A44 80AEC654 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01A48 80AEC658 8C8E0280 */ lw $t6, 0x0280($a0) ## 00000280 -/* 01A4C 80AEC65C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01A50 80AEC660 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01A54 80AEC664 15C0000E */ bne $t6, $zero, .L80AEC6A0 -/* 01A58 80AEC668 3C054000 */ lui $a1, 0x4000 ## $a1 = 40000000 -/* 01A5C 80AEC66C AFA4001C */ sw $a0, 0x001C($sp) -/* 01A60 80AEC670 0C0295B2 */ jal func_800A56C8 -/* 01A64 80AEC674 AFA60028 */ sw $a2, 0x0028($sp) -/* 01A68 80AEC678 14400005 */ bne $v0, $zero, .L80AEC690 -/* 01A6C 80AEC67C 8FA4001C */ lw $a0, 0x001C($sp) -/* 01A70 80AEC680 0C0295B2 */ jal func_800A56C8 -/* 01A74 80AEC684 3C0540E0 */ lui $a1, 0x40E0 ## $a1 = 40E00000 -/* 01A78 80AEC688 50400006 */ beql $v0, $zero, .L80AEC6A4 -/* 01A7C 80AEC68C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AEC690: -/* 01A80 80AEC690 8FA40028 */ lw $a0, 0x0028($sp) -/* 01A84 80AEC694 24050803 */ addiu $a1, $zero, 0x0803 ## $a1 = 00000803 -/* 01A88 80AEC698 0C01E245 */ jal func_80078914 -/* 01A8C 80AEC69C 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -.L80AEC6A0: -/* 01A90 80AEC6A0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AEC6A4: -/* 01A94 80AEC6A4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01A98 80AEC6A8 03E00008 */ jr $ra -/* 01A9C 80AEC6AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC6B0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC6B0.s deleted file mode 100644 index 46a2a94549..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC6B0.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80AEC6B0 -/* 01AA0 80AEC6B0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01AA4 80AEC6B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01AA8 80AEC6B8 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 01AAC 80AEC6BC AFA4001C */ sw $a0, 0x001C($sp) -/* 01AB0 80AEC6C0 0C01E245 */ jal func_80078914 -/* 01AB4 80AEC6C4 24052870 */ addiu $a1, $zero, 0x2870 ## $a1 = 00002870 -/* 01AB8 80AEC6C8 8FA4001C */ lw $a0, 0x001C($sp) -/* 01ABC 80AEC6CC 0C01E245 */ jal func_80078914 -/* 01AC0 80AEC6D0 24056862 */ addiu $a1, $zero, 0x6862 ## $a1 = 00006862 -/* 01AC4 80AEC6D4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01AC8 80AEC6D8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01ACC 80AEC6DC 03E00008 */ jr $ra -/* 01AD0 80AEC6E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC6E4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC6E4.s deleted file mode 100644 index 56b247c94e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC6E4.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80AEC6E4 -/* 01AD4 80AEC6E4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01AD8 80AEC6E8 AFA40028 */ sw $a0, 0x0028($sp) -/* 01ADC 80AEC6EC AFBF0024 */ sw $ra, 0x0024($sp) -/* 01AE0 80AEC6F0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01AE4 80AEC6F4 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 01AE8 80AEC6F8 0C2BABE8 */ jal func_80AEAFA0 -/* 01AEC 80AEC6FC 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 01AF0 80AEC700 1040001B */ beq $v0, $zero, .L80AEC770 -/* 01AF4 80AEC704 8FAE0028 */ lw $t6, 0x0028($sp) -/* 01AF8 80AEC708 8DCF0280 */ lw $t7, 0x0280($t6) ## 00000280 -/* 01AFC 80AEC70C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01B00 80AEC710 55E00018 */ bnel $t7, $zero, .L80AEC774 -/* 01B04 80AEC714 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01B08 80AEC718 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01B0C 80AEC71C 24843784 */ addiu $a0, $a0, 0x3784 ## $a0 = 06003784 -/* 01B10 80AEC720 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01B14 80AEC724 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 01B18 80AEC728 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 01B1C 80AEC72C 468021A0 */ cvt.s.w $f6, $f4 -/* 01B20 80AEC730 8FA40028 */ lw $a0, 0x0028($sp) -/* 01B24 80AEC734 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01B28 80AEC738 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 01B2C 80AEC73C AFB80014 */ sw $t8, 0x0014($sp) -/* 01B30 80AEC740 24A53784 */ addiu $a1, $a1, 0x3784 ## $a1 = 06003784 -/* 01B34 80AEC744 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01B38 80AEC748 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01B3C 80AEC74C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01B40 80AEC750 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01B44 80AEC754 0C029468 */ jal SkelAnime_ChangeAnim - -/* 01B48 80AEC758 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01B4C 80AEC75C 8FA80028 */ lw $t0, 0x0028($sp) -/* 01B50 80AEC760 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 01B54 80AEC764 AD190280 */ sw $t9, 0x0280($t0) ## 00000280 -/* 01B58 80AEC768 0C2BB1AC */ jal func_80AEC6B0 -/* 01B5C 80AEC76C 8FA40028 */ lw $a0, 0x0028($sp) -.L80AEC770: -/* 01B60 80AEC770 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AEC774: -/* 01B64 80AEC774 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01B68 80AEC778 03E00008 */ jr $ra -/* 01B6C 80AEC77C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC780.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC780.s deleted file mode 100644 index 5b562a0eed..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC780.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80AEC780 -/* 01B70 80AEC780 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01B74 80AEC784 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01B78 80AEC788 AFA40020 */ sw $a0, 0x0020($sp) -/* 01B7C 80AEC78C 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 01B80 80AEC790 AFA50024 */ sw $a1, 0x0024($sp) -/* 01B84 80AEC794 0C2BB17F */ jal func_80AEC5FC -/* 01B88 80AEC798 AFA30018 */ sw $v1, 0x0018($sp) -/* 01B8C 80AEC79C 1040001B */ beq $v0, $zero, .L80AEC80C -/* 01B90 80AEC7A0 8FA30018 */ lw $v1, 0x0018($sp) -/* 01B94 80AEC7A4 8FA40024 */ lw $a0, 0x0024($sp) -/* 01B98 80AEC7A8 0C02FF21 */ jal Gameplay_InCsMode -/* 01B9C 80AEC7AC AFA30018 */ sw $v1, 0x0018($sp) -/* 01BA0 80AEC7B0 14400016 */ bne $v0, $zero, .L80AEC80C -/* 01BA4 80AEC7B4 8FA30018 */ lw $v1, 0x0018($sp) -/* 01BA8 80AEC7B8 8C6E067C */ lw $t6, 0x067C($v1) ## 0000067C -/* 01BAC 80AEC7BC 3C010020 */ lui $at, 0x0020 ## $at = 00200000 -/* 01BB0 80AEC7C0 34216000 */ ori $at, $at, 0x6000 ## $at = 00206000 -/* 01BB4 80AEC7C4 01C17824 */ and $t7, $t6, $at -/* 01BB8 80AEC7C8 55E00011 */ bnel $t7, $zero, .L80AEC810 -/* 01BBC 80AEC7CC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01BC0 80AEC7D0 94780088 */ lhu $t8, 0x0088($v1) ## 00000088 -/* 01BC4 80AEC7D4 3C0880AF */ lui $t0, %hi(D_80AF0880) ## $t0 = 80AF0000 -/* 01BC8 80AEC7D8 25080880 */ addiu $t0, $t0, %lo(D_80AF0880) ## $t0 = 80AF0880 -/* 01BCC 80AEC7DC 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 01BD0 80AEC7E0 1320000A */ beq $t9, $zero, .L80AEC80C -/* 01BD4 80AEC7E4 8FA90024 */ lw $t1, 0x0024($sp) -/* 01BD8 80AEC7E8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01BDC 80AEC7EC AD281D68 */ sw $t0, 0x1D68($t1) ## 00001D68 -/* 01BE0 80AEC7F0 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 01BE4 80AEC7F4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 01BE8 80AEC7F8 A02AFA74 */ sb $t2, -0x058C($at) ## 8015FA74 -/* 01BEC 80AEC7FC E4640838 */ swc1 $f4, 0x0838($v1) ## 00000838 -/* 01BF0 80AEC800 8FAC0020 */ lw $t4, 0x0020($sp) -/* 01BF4 80AEC804 240B0008 */ addiu $t3, $zero, 0x0008 ## $t3 = 00000008 -/* 01BF8 80AEC808 AD8B0264 */ sw $t3, 0x0264($t4) ## 00000264 -.L80AEC80C: -/* 01BFC 80AEC80C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AEC810: -/* 01C00 80AEC810 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01C04 80AEC814 03E00008 */ jr $ra -/* 01C08 80AEC818 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC81C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC81C.s deleted file mode 100644 index 77bcf5cc3e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC81C.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80AEC81C -/* 01C0C 80AEC81C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01C10 80AEC820 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01C14 80AEC824 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01C18 80AEC828 AFA5001C */ sw $a1, 0x001C($sp) -/* 01C1C 80AEC82C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01C20 80AEC830 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01C24 80AEC834 AFA70018 */ sw $a3, 0x0018($sp) -/* 01C28 80AEC838 0C2BABF8 */ jal func_80AEAFE0 -/* 01C2C 80AEC83C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 01C30 80AEC840 10400019 */ beq $v0, $zero, .L80AEC8A8 -/* 01C34 80AEC844 8FA70018 */ lw $a3, 0x0018($sp) -/* 01C38 80AEC848 8FAE001C */ lw $t6, 0x001C($sp) -/* 01C3C 80AEC84C 24080009 */ addiu $t0, $zero, 0x0009 ## $t0 = 00000009 -/* 01C40 80AEC850 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 01C44 80AEC854 8DC21D98 */ lw $v0, 0x1D98($t6) ## 00001D98 -/* 01C48 80AEC858 8C4F000C */ lw $t7, 0x000C($v0) ## 0000000C -/* 01C4C 80AEC85C 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 01C50 80AEC860 00000000 */ nop -/* 01C54 80AEC864 468021A0 */ cvt.s.w $f6, $f4 -/* 01C58 80AEC868 E4E60024 */ swc1 $f6, 0x0024($a3) ## 00000024 -/* 01C5C 80AEC86C 8C580010 */ lw $t8, 0x0010($v0) ## 00000010 -/* 01C60 80AEC870 44984000 */ mtc1 $t8, $f8 ## $f8 = 0.00 -/* 01C64 80AEC874 00000000 */ nop -/* 01C68 80AEC878 468042A0 */ cvt.s.w $f10, $f8 -/* 01C6C 80AEC87C E4EA0028 */ swc1 $f10, 0x0028($a3) ## 00000028 -/* 01C70 80AEC880 8C590014 */ lw $t9, 0x0014($v0) ## 00000014 -/* 01C74 80AEC884 44998000 */ mtc1 $t9, $f16 ## $f16 = 0.00 -/* 01C78 80AEC888 00000000 */ nop -/* 01C7C 80AEC88C 468084A0 */ cvt.s.w $f18, $f16 -/* 01C80 80AEC890 E4F2002C */ swc1 $f18, 0x002C($a3) ## 0000002C -/* 01C84 80AEC894 84430008 */ lh $v1, 0x0008($v0) ## 00000008 -/* 01C88 80AEC898 ACE80264 */ sw $t0, 0x0264($a3) ## 00000264 -/* 01C8C 80AEC89C ACE90268 */ sw $t1, 0x0268($a3) ## 00000268 -/* 01C90 80AEC8A0 A4E300B6 */ sh $v1, 0x00B6($a3) ## 000000B6 -/* 01C94 80AEC8A4 A4E30032 */ sh $v1, 0x0032($a3) ## 00000032 -.L80AEC8A8: -/* 01C98 80AEC8A8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01C9C 80AEC8AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01CA0 80AEC8B0 03E00008 */ jr $ra -/* 01CA4 80AEC8B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC8B8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC8B8.s deleted file mode 100644 index 4abec3f8a1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC8B8.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80AEC8B8 -/* 01CA8 80AEC8B8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01CAC 80AEC8BC AFA40028 */ sw $a0, 0x0028($sp) -/* 01CB0 80AEC8C0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01CB4 80AEC8C4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01CB8 80AEC8C8 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 01CBC 80AEC8CC 0C2BABE8 */ jal func_80AEAFA0 -/* 01CC0 80AEC8D0 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 01CC4 80AEC8D4 10400015 */ beq $v0, $zero, .L80AEC92C -/* 01CC8 80AEC8D8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01CCC 80AEC8DC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01CD0 80AEC8E0 24844074 */ addiu $a0, $a0, 0x4074 ## $a0 = 06004074 -/* 01CD4 80AEC8E4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01CD8 80AEC8E8 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 01CDC 80AEC8EC 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 01CE0 80AEC8F0 468021A0 */ cvt.s.w $f6, $f4 -/* 01CE4 80AEC8F4 8FA40028 */ lw $a0, 0x0028($sp) -/* 01CE8 80AEC8F8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01CEC 80AEC8FC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01CF0 80AEC900 AFAE0014 */ sw $t6, 0x0014($sp) -/* 01CF4 80AEC904 24A54074 */ addiu $a1, $a1, 0x4074 ## $a1 = 06004074 -/* 01CF8 80AEC908 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01CFC 80AEC90C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01D00 80AEC910 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01D04 80AEC914 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01D08 80AEC918 0C029468 */ jal SkelAnime_ChangeAnim - -/* 01D0C 80AEC91C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01D10 80AEC920 8FB80028 */ lw $t8, 0x0028($sp) -/* 01D14 80AEC924 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A -/* 01D18 80AEC928 AF0F0264 */ sw $t7, 0x0264($t8) ## 00000264 -.L80AEC92C: -/* 01D1C 80AEC92C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01D20 80AEC930 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01D24 80AEC934 03E00008 */ jr $ra -/* 01D28 80AEC938 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC93C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC93C.s deleted file mode 100644 index 9153e85611..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC93C.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80AEC93C -/* 01D2C 80AEC93C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01D30 80AEC940 AFB00028 */ sw $s0, 0x0028($sp) -/* 01D34 80AEC944 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01D38 80AEC948 10A00019 */ beq $a1, $zero, .L80AEC9B0 -/* 01D3C 80AEC94C AFBF002C */ sw $ra, 0x002C($sp) -/* 01D40 80AEC950 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01D44 80AEC954 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01D48 80AEC958 248478E4 */ addiu $a0, $a0, 0x78E4 ## $a0 = 060078E4 -/* 01D4C 80AEC95C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01D50 80AEC960 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 01D54 80AEC964 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 01D58 80AEC968 468021A0 */ cvt.s.w $f6, $f4 -/* 01D5C 80AEC96C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01D60 80AEC970 24A578E4 */ addiu $a1, $a1, 0x78E4 ## $a1 = 060078E4 -/* 01D64 80AEC974 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01D68 80AEC978 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01D6C 80AEC97C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01D70 80AEC980 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01D74 80AEC984 AFA00014 */ sw $zero, 0x0014($sp) -/* 01D78 80AEC988 0C029468 */ jal SkelAnime_ChangeAnim - -/* 01D7C 80AEC98C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01D80 80AEC990 860E0032 */ lh $t6, 0x0032($s0) ## 00000032 -/* 01D84 80AEC994 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 01D88 80AEC998 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 01D8C 80AEC99C 2418000B */ addiu $t8, $zero, 0x000B ## $t8 = 0000000B -/* 01D90 80AEC9A0 01C17821 */ addu $t7, $t6, $at -/* 01D94 80AEC9A4 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 -/* 01D98 80AEC9A8 AE180264 */ sw $t8, 0x0264($s0) ## 00000264 -/* 01D9C 80AEC9AC E60A026C */ swc1 $f10, 0x026C($s0) ## 0000026C -.L80AEC9B0: -/* 01DA0 80AEC9B0 8FBF002C */ lw $ra, 0x002C($sp) -/* 01DA4 80AEC9B4 8FB00028 */ lw $s0, 0x0028($sp) -/* 01DA8 80AEC9B8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01DAC 80AEC9BC 03E00008 */ jr $ra -/* 01DB0 80AEC9C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC9C4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC9C4.s deleted file mode 100644 index 7d64453187..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC9C4.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80AEC9C4 -/* 01DB4 80AEC9C4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01DB8 80AEC9C8 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 01DBC 80AEC9CC C484026C */ lwc1 $f4, 0x026C($a0) ## 0000026C -/* 01DC0 80AEC9D0 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 01DC4 80AEC9D4 44818000 */ mtc1 $at, $f16 ## $f16 = 8.00 -/* 01DC8 80AEC9D8 46062200 */ add.s $f8, $f4, $f6 -/* 01DCC 80AEC9DC 240E000C */ addiu $t6, $zero, 0x000C ## $t6 = 0000000C -/* 01DD0 80AEC9E0 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 01DD4 80AEC9E4 E488026C */ swc1 $f8, 0x026C($a0) ## 0000026C -/* 01DD8 80AEC9E8 C48A026C */ lwc1 $f10, 0x026C($a0) ## 0000026C -/* 01DDC 80AEC9EC 460A803E */ c.le.s $f16, $f10 -/* 01DE0 80AEC9F0 00000000 */ nop -/* 01DE4 80AEC9F4 45000006 */ bc1f .L80AECA10 -/* 01DE8 80AEC9F8 00000000 */ nop -/* 01DEC 80AEC9FC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 01DF0 80AECA00 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 01DF4 80AECA04 AC8E0264 */ sw $t6, 0x0264($a0) ## 00000264 -/* 01DF8 80AECA08 E492026C */ swc1 $f18, 0x026C($a0) ## 0000026C -/* 01DFC 80AECA0C E4840060 */ swc1 $f4, 0x0060($a0) ## 00000060 -.L80AECA10: -/* 01E00 80AECA10 03E00008 */ jr $ra -/* 01E04 80AECA14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECA18.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECA18.s deleted file mode 100644 index 856ece386e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECA18.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80AECA18 -/* 01E08 80AECA18 948E0088 */ lhu $t6, 0x0088($a0) ## 00000088 -/* 01E0C 80AECA1C 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 01E10 80AECA20 15E00006 */ bne $t7, $zero, .L80AECA3C -/* 01E14 80AECA24 00000000 */ nop -/* 01E18 80AECA28 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01E1C 80AECA2C 2418000D */ addiu $t8, $zero, 0x000D ## $t8 = 0000000D -/* 01E20 80AECA30 AC980264 */ sw $t8, 0x0264($a0) ## 00000264 -/* 01E24 80AECA34 E480026C */ swc1 $f0, 0x026C($a0) ## 0000026C -/* 01E28 80AECA38 E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 -.L80AECA3C: -/* 01E2C 80AECA3C 03E00008 */ jr $ra -/* 01E30 80AECA40 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECA44.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECA44.s deleted file mode 100644 index a54aa169ce..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECA44.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80AECA44 -/* 01E34 80AECA44 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01E38 80AECA48 AFA40018 */ sw $a0, 0x0018($sp) -/* 01E3C 80AECA4C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01E40 80AECA50 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01E44 80AECA54 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 01E48 80AECA58 0C2BABE8 */ jal func_80AEAFA0 -/* 01E4C 80AECA5C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 01E50 80AECA60 10400008 */ beq $v0, $zero, .L80AECA84 -/* 01E54 80AECA64 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01E58 80AECA68 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 01E5C 80AECA6C 944E0F20 */ lhu $t6, 0x0F20($v0) ## 8015F580 -/* 01E60 80AECA70 8FB90018 */ lw $t9, 0x0018($sp) -/* 01E64 80AECA74 2418000E */ addiu $t8, $zero, 0x000E ## $t8 = 0000000E -/* 01E68 80AECA78 35CF0002 */ ori $t7, $t6, 0x0002 ## $t7 = 00000002 -/* 01E6C 80AECA7C A44F0F20 */ sh $t7, 0x0F20($v0) ## 8015F580 -/* 01E70 80AECA80 AF380264 */ sw $t8, 0x0264($t9) ## 00000264 -.L80AECA84: -/* 01E74 80AECA84 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01E78 80AECA88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01E7C 80AECA8C 03E00008 */ jr $ra -/* 01E80 80AECA90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECA94.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECA94.s deleted file mode 100644 index 0f0f5f19db..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECA94.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80AECA94 -/* 01E84 80AECA94 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01E88 80AECA98 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01E8C 80AECA9C 0C2BB1E0 */ jal func_80AEC780 -/* 01E90 80AECAA0 00000000 */ nop -/* 01E94 80AECAA4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01E98 80AECAA8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01E9C 80AECAAC 03E00008 */ jr $ra -/* 01EA0 80AECAB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECAB4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECAB4.s deleted file mode 100644 index 278d5fb35b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECAB4.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80AECAB4 -/* 01EA4 80AECAB4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01EA8 80AECAB8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01EAC 80AECABC 0C2BB207 */ jal func_80AEC81C -/* 01EB0 80AECAC0 00000000 */ nop -/* 01EB4 80AECAC4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01EB8 80AECAC8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01EBC 80AECACC 03E00008 */ jr $ra -/* 01EC0 80AECAD0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECAD4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECAD4.s deleted file mode 100644 index 5715a8d22c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECAD4.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80AECAD4 -/* 01EC4 80AECAD4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01EC8 80AECAD8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01ECC 80AECADC AFA40018 */ sw $a0, 0x0018($sp) -/* 01ED0 80AECAE0 0C2BACC8 */ jal func_80AEB320 -/* 01ED4 80AECAE4 AFA5001C */ sw $a1, 0x001C($sp) -/* 01ED8 80AECAE8 0C2BAB87 */ jal func_80AEAE1C -/* 01EDC 80AECAEC 8FA40018 */ lw $a0, 0x0018($sp) -/* 01EE0 80AECAF0 8FA40018 */ lw $a0, 0x0018($sp) -/* 01EE4 80AECAF4 0C2BABB3 */ jal func_80AEAECC -/* 01EE8 80AECAF8 8FA5001C */ lw $a1, 0x001C($sp) -/* 01EEC 80AECAFC 8FA40018 */ lw $a0, 0x0018($sp) -/* 01EF0 80AECB00 0C2BB22E */ jal func_80AEC8B8 -/* 01EF4 80AECB04 8FA5001C */ lw $a1, 0x001C($sp) -/* 01EF8 80AECB08 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01EFC 80AECB0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01F00 80AECB10 03E00008 */ jr $ra -/* 01F04 80AECB14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECB18.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECB18.s deleted file mode 100644 index 9dc5bd4433..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECB18.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AECB18 -/* 01F08 80AECB18 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01F0C 80AECB1C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01F10 80AECB20 AFA40020 */ sw $a0, 0x0020($sp) -/* 01F14 80AECB24 0C2BACC8 */ jal func_80AEB320 -/* 01F18 80AECB28 AFA50024 */ sw $a1, 0x0024($sp) -/* 01F1C 80AECB2C AFA2001C */ sw $v0, 0x001C($sp) -/* 01F20 80AECB30 0C2BAB87 */ jal func_80AEAE1C -/* 01F24 80AECB34 8FA40020 */ lw $a0, 0x0020($sp) -/* 01F28 80AECB38 8FA40020 */ lw $a0, 0x0020($sp) -/* 01F2C 80AECB3C 0C2BABB3 */ jal func_80AEAECC -/* 01F30 80AECB40 8FA50024 */ lw $a1, 0x0024($sp) -/* 01F34 80AECB44 8FA40020 */ lw $a0, 0x0020($sp) -/* 01F38 80AECB48 0C2BB24F */ jal func_80AEC93C -/* 01F3C 80AECB4C 8FA5001C */ lw $a1, 0x001C($sp) -/* 01F40 80AECB50 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01F44 80AECB54 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01F48 80AECB58 03E00008 */ jr $ra -/* 01F4C 80AECB5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECB60.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECB60.s deleted file mode 100644 index 0a88eaceae..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECB60.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80AECB60 -/* 01F50 80AECB60 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01F54 80AECB64 AFBF001C */ sw $ra, 0x001C($sp) -/* 01F58 80AECB68 AFB00018 */ sw $s0, 0x0018($sp) -/* 01F5C 80AECB6C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01F60 80AECB70 0C2BB103 */ jal func_80AEC40C -/* 01F64 80AECB74 AFA50024 */ sw $a1, 0x0024($sp) -/* 01F68 80AECB78 0C2BACC8 */ jal func_80AEB320 -/* 01F6C 80AECB7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01F70 80AECB80 0C2BAB87 */ jal func_80AEAE1C -/* 01F74 80AECB84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01F78 80AECB88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01F7C 80AECB8C 0C2BABB3 */ jal func_80AEAECC -/* 01F80 80AECB90 8FA50024 */ lw $a1, 0x0024($sp) -/* 01F84 80AECB94 0C2BB194 */ jal func_80AEC650 -/* 01F88 80AECB98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01F8C 80AECB9C 0C2BB271 */ jal func_80AEC9C4 -/* 01F90 80AECBA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01F94 80AECBA4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01F98 80AECBA8 8FB00018 */ lw $s0, 0x0018($sp) -/* 01F9C 80AECBAC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01FA0 80AECBB0 03E00008 */ jr $ra -/* 01FA4 80AECBB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECBB8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECBB8.s deleted file mode 100644 index 0649762915..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECBB8.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80AECBB8 -/* 01FA8 80AECBB8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01FAC 80AECBBC AFBF001C */ sw $ra, 0x001C($sp) -/* 01FB0 80AECBC0 AFB00018 */ sw $s0, 0x0018($sp) -/* 01FB4 80AECBC4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01FB8 80AECBC8 0C2BB133 */ jal func_80AEC4CC -/* 01FBC 80AECBCC AFA50024 */ sw $a1, 0x0024($sp) -/* 01FC0 80AECBD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01FC4 80AECBD4 0C2BB1B9 */ jal func_80AEC6E4 -/* 01FC8 80AECBD8 8FA50024 */ lw $a1, 0x0024($sp) -/* 01FCC 80AECBDC 0C2BACC8 */ jal func_80AEB320 -/* 01FD0 80AECBE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01FD4 80AECBE4 0C2BAB87 */ jal func_80AEAE1C -/* 01FD8 80AECBE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01FDC 80AECBEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01FE0 80AECBF0 0C2BABB3 */ jal func_80AEAECC -/* 01FE4 80AECBF4 8FA50024 */ lw $a1, 0x0024($sp) -/* 01FE8 80AECBF8 0C2BB194 */ jal func_80AEC650 -/* 01FEC 80AECBFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01FF0 80AECC00 0C2BB286 */ jal func_80AECA18 -/* 01FF4 80AECC04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01FF8 80AECC08 8FBF001C */ lw $ra, 0x001C($sp) -/* 01FFC 80AECC0C 8FB00018 */ lw $s0, 0x0018($sp) -/* 02000 80AECC10 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02004 80AECC14 03E00008 */ jr $ra -/* 02008 80AECC18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECC1C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECC1C.s deleted file mode 100644 index 14f0981da5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECC1C.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80AECC1C -/* 0200C 80AECC1C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02010 80AECC20 AFBF001C */ sw $ra, 0x001C($sp) -/* 02014 80AECC24 AFB00018 */ sw $s0, 0x0018($sp) -/* 02018 80AECC28 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0201C 80AECC2C 0C2BB13D */ jal func_80AEC4F4 -/* 02020 80AECC30 AFA50024 */ sw $a1, 0x0024($sp) -/* 02024 80AECC34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02028 80AECC38 0C2BB1B9 */ jal func_80AEC6E4 -/* 0202C 80AECC3C 8FA50024 */ lw $a1, 0x0024($sp) -/* 02030 80AECC40 0C2BACC8 */ jal func_80AEB320 -/* 02034 80AECC44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02038 80AECC48 0C2BAB87 */ jal func_80AEAE1C -/* 0203C 80AECC4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02040 80AECC50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02044 80AECC54 0C2BABB3 */ jal func_80AEAECC -/* 02048 80AECC58 8FA50024 */ lw $a1, 0x0024($sp) -/* 0204C 80AECC5C 0C2BB194 */ jal func_80AEC650 -/* 02050 80AECC60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02054 80AECC64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02058 80AECC68 0C2BB291 */ jal func_80AECA44 -/* 0205C 80AECC6C 8FA50024 */ lw $a1, 0x0024($sp) -/* 02060 80AECC70 8FBF001C */ lw $ra, 0x001C($sp) -/* 02064 80AECC74 8FB00018 */ lw $s0, 0x0018($sp) -/* 02068 80AECC78 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0206C 80AECC7C 03E00008 */ jr $ra -/* 02070 80AECC80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECC84.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECC84.s deleted file mode 100644 index 5903394c26..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECC84.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80AECC84 -/* 02074 80AECC84 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02078 80AECC88 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0207C 80AECC8C 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 02080 80AECC90 55C00004 */ bnel $t6, $zero, .L80AECCA4 -/* 02084 80AECC94 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02088 80AECC98 0C00B55C */ jal Actor_Kill - -/* 0208C 80AECC9C 00000000 */ nop -/* 02090 80AECCA0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AECCA4: -/* 02094 80AECCA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02098 80AECCA8 03E00008 */ jr $ra -/* 0209C 80AECCAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECCB0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECCB0.s deleted file mode 100644 index c18739060b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECCB0.s +++ /dev/null @@ -1,64 +0,0 @@ -glabel func_80AECCB0 -/* 020A0 80AECCB0 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 020A4 80AECCB4 AFBF0034 */ sw $ra, 0x0034($sp) -/* 020A8 80AECCB8 AFA40060 */ sw $a0, 0x0060($sp) -/* 020AC 80AECCBC AFA50064 */ sw $a1, 0x0064($sp) -/* 020B0 80AECCC0 8484008A */ lh $a0, 0x008A($a0) ## 0000008A -/* 020B4 80AECCC4 0C01DE1C */ jal Math_Sins - ## sins? -/* 020B8 80AECCC8 A7A40056 */ sh $a0, 0x0056($sp) -/* 020BC 80AECCCC 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 020C0 80AECCD0 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 -/* 020C4 80AECCD4 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 020C8 80AECCD8 44814000 */ mtc1 $at, $f8 ## $f8 = 12.00 -/* 020CC 80AECCDC 85F81456 */ lh $t8, 0x1456($t7) ## 80161456 -/* 020D0 80AECCE0 8FA20060 */ lw $v0, 0x0060($sp) -/* 020D4 80AECCE4 87A40056 */ lh $a0, 0x0056($sp) -/* 020D8 80AECCE8 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 020DC 80AECCEC C4520024 */ lwc1 $f18, 0x0024($v0) ## 00000024 -/* 020E0 80AECCF0 24420024 */ addiu $v0, $v0, 0x0024 ## $v0 = 00000024 -/* 020E4 80AECCF4 468021A0 */ cvt.s.w $f6, $f4 -/* 020E8 80AECCF8 46083280 */ add.s $f10, $f6, $f8 -/* 020EC 80AECCFC 460A0402 */ mul.s $f16, $f0, $f10 -/* 020F0 80AECD00 46128100 */ add.s $f4, $f16, $f18 -/* 020F4 80AECD04 E7A40050 */ swc1 $f4, 0x0050($sp) -/* 020F8 80AECD08 C4460004 */ lwc1 $f6, 0x0004($v0) ## 00000028 -/* 020FC 80AECD0C AFA2003C */ sw $v0, 0x003C($sp) -/* 02100 80AECD10 0C01DE0D */ jal Math_Coss - ## coss? -/* 02104 80AECD14 E7A6004C */ swc1 $f6, 0x004C($sp) -/* 02108 80AECD18 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 0210C 80AECD1C 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 -/* 02110 80AECD20 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 02114 80AECD24 44818000 */ mtc1 $at, $f16 ## $f16 = 12.00 -/* 02118 80AECD28 87281456 */ lh $t0, 0x1456($t9) ## 80161456 -/* 0211C 80AECD2C 8FA2003C */ lw $v0, 0x003C($sp) -/* 02120 80AECD30 8FA60064 */ lw $a2, 0x0064($sp) -/* 02124 80AECD34 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 -/* 02128 80AECD38 C4460008 */ lwc1 $f6, 0x0008($v0) ## 00000008 -/* 0212C 80AECD3C 87A90056 */ lh $t1, 0x0056($sp) -/* 02130 80AECD40 468042A0 */ cvt.s.w $f10, $f8 -/* 02134 80AECD44 C7A80050 */ lwc1 $f8, 0x0050($sp) -/* 02138 80AECD48 240A0005 */ addiu $t2, $zero, 0x0005 ## $t2 = 00000005 -/* 0213C 80AECD4C AFAA0028 */ sw $t2, 0x0028($sp) -/* 02140 80AECD50 AFA00024 */ sw $zero, 0x0024($sp) -/* 02144 80AECD54 AFA0001C */ sw $zero, 0x001C($sp) -/* 02148 80AECD58 46105480 */ add.s $f18, $f10, $f16 -/* 0214C 80AECD5C C7AA004C */ lwc1 $f10, 0x004C($sp) -/* 02150 80AECD60 8FA50060 */ lw $a1, 0x0060($sp) -/* 02154 80AECD64 2407005D */ addiu $a3, $zero, 0x005D ## $a3 = 0000005D -/* 02158 80AECD68 46120102 */ mul.s $f4, $f0, $f18 -/* 0215C 80AECD6C 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 02160 80AECD70 AFA90020 */ sw $t1, 0x0020($sp) -/* 02164 80AECD74 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 02168 80AECD78 E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 0216C 80AECD7C 46062080 */ add.s $f2, $f4, $f6 -/* 02170 80AECD80 0C00C916 */ jal Actor_SpawnAttached - -/* 02174 80AECD84 E7A20018 */ swc1 $f2, 0x0018($sp) -/* 02178 80AECD88 8FAB0060 */ lw $t3, 0x0060($sp) -/* 0217C 80AECD8C AD620278 */ sw $v0, 0x0278($t3) ## 00000278 -/* 02180 80AECD90 8FBF0034 */ lw $ra, 0x0034($sp) -/* 02184 80AECD94 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 02188 80AECD98 03E00008 */ jr $ra -/* 0218C 80AECD9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECDA0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECDA0.s deleted file mode 100644 index d63fc59aa1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECDA0.s +++ /dev/null @@ -1,31 +0,0 @@ -.late_rodata -glabel D_80AF1BE8 - .float -10000.0 - -.text -glabel func_80AECDA0 -/* 02190 80AECDA0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02194 80AECDA4 AFA50024 */ sw $a1, 0x0024($sp) -/* 02198 80AECDA8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0219C 80AECDAC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 021A0 80AECDB0 24A50E54 */ addiu $a1, $a1, 0x0E54 ## $a1 = 06000E54 -/* 021A4 80AECDB4 AFA00010 */ sw $zero, 0x0010($sp) -/* 021A8 80AECDB8 AFA40020 */ sw $a0, 0x0020($sp) -/* 021AC 80AECDBC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 021B0 80AECDC0 0C2BAC99 */ jal func_80AEB264 -/* 021B4 80AECDC4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 021B8 80AECDC8 8FA40020 */ lw $a0, 0x0020($sp) -/* 021BC 80AECDCC 240E000F */ addiu $t6, $zero, 0x000F ## $t6 = 0000000F -/* 021C0 80AECDD0 3C0180AF */ lui $at, %hi(D_80AF1BE8) ## $at = 80AF0000 -/* 021C4 80AECDD4 AC8E0264 */ sw $t6, 0x0264($a0) ## 00000264 -/* 021C8 80AECDD8 C4241BE8 */ lwc1 $f4, %lo(D_80AF1BE8)($at) -/* 021CC 80AECDDC 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 021D0 80AECDE0 0C2BABA9 */ jal func_80AEAEA4 -/* 021D4 80AECDE4 E48400BC */ swc1 $f4, 0x00BC($a0) ## 000000BC -/* 021D8 80AECDE8 8FA40020 */ lw $a0, 0x0020($sp) -/* 021DC 80AECDEC 0C2BABAE */ jal func_80AEAEB8 -/* 021E0 80AECDF0 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 021E4 80AECDF4 8FBF001C */ lw $ra, 0x001C($sp) -/* 021E8 80AECDF8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 021EC 80AECDFC 03E00008 */ jr $ra -/* 021F0 80AECE00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECE04.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECE04.s deleted file mode 100644 index 12086bce25..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECE04.s +++ /dev/null @@ -1,13 +0,0 @@ -.late_rodata -glabel D_80AF1BEC - .float 83.333336 - -.text -glabel func_80AECE04 -/* 021F4 80AECE04 AFA50004 */ sw $a1, 0x0004($sp) -/* 021F8 80AECE08 3C0180AF */ lui $at, %hi(D_80AF1BEC) ## $at = 80AF0000 -/* 021FC 80AECE0C C4261BEC */ lwc1 $f6, %lo(D_80AF1BEC)($at) -/* 02200 80AECE10 C48400BC */ lwc1 $f4, 0x00BC($a0) ## 000000BC -/* 02204 80AECE14 46062200 */ add.s $f8, $f4, $f6 -/* 02208 80AECE18 03E00008 */ jr $ra -/* 0220C 80AECE1C E48800BC */ swc1 $f8, 0x00BC($a0) ## 000000BC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECE20.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECE20.s deleted file mode 100644 index 85d4eef954..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECE20.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80AECE20 -/* 02210 80AECE20 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 02214 80AECE24 AFA40040 */ sw $a0, 0x0040($sp) -/* 02218 80AECE28 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0221C 80AECE2C 8CA61C44 */ lw $a2, 0x1C44($a1) ## 00001C44 -/* 02220 80AECE30 8FAE0040 */ lw $t6, 0x0040($sp) -/* 02224 80AECE34 84C400B6 */ lh $a0, 0x00B6($a2) ## 000000B6 -/* 02228 80AECE38 C5C4027C */ lwc1 $f4, 0x027C($t6) ## 0000027C -/* 0222C 80AECE3C AFA60038 */ sw $a2, 0x0038($sp) -/* 02230 80AECE40 A7A40032 */ sh $a0, 0x0032($sp) -/* 02234 80AECE44 0C01DE1C */ jal Math_Sins - ## sins? -/* 02238 80AECE48 E7A40028 */ swc1 $f4, 0x0028($sp) -/* 0223C 80AECE4C C7A60028 */ lwc1 $f6, 0x0028($sp) -/* 02240 80AECE50 8FA60038 */ lw $a2, 0x0038($sp) -/* 02244 80AECE54 8FA30040 */ lw $v1, 0x0040($sp) -/* 02248 80AECE58 46060202 */ mul.s $f8, $f0, $f6 -/* 0224C 80AECE5C 24C20024 */ addiu $v0, $a2, 0x0024 ## $v0 = 00000024 -/* 02250 80AECE60 C44A0000 */ lwc1 $f10, 0x0000($v0) ## 00000024 -/* 02254 80AECE64 87A40032 */ lh $a0, 0x0032($sp) -/* 02258 80AECE68 24630024 */ addiu $v1, $v1, 0x0024 ## $v1 = 00000024 -/* 0225C 80AECE6C 460A4400 */ add.s $f16, $f8, $f10 -/* 02260 80AECE70 E4700000 */ swc1 $f16, 0x0000($v1) ## 00000024 -/* 02264 80AECE74 C4520004 */ lwc1 $f18, 0x0004($v0) ## 00000028 -/* 02268 80AECE78 E4720004 */ swc1 $f18, 0x0004($v1) ## 00000028 -/* 0226C 80AECE7C AFA3001C */ sw $v1, 0x001C($sp) -/* 02270 80AECE80 0C01DE0D */ jal Math_Coss - ## coss? -/* 02274 80AECE84 AFA20020 */ sw $v0, 0x0020($sp) -/* 02278 80AECE88 C7A40028 */ lwc1 $f4, 0x0028($sp) -/* 0227C 80AECE8C 8FA20020 */ lw $v0, 0x0020($sp) -/* 02280 80AECE90 8FA3001C */ lw $v1, 0x001C($sp) -/* 02284 80AECE94 46040182 */ mul.s $f6, $f0, $f4 -/* 02288 80AECE98 C4480008 */ lwc1 $f8, 0x0008($v0) ## 00000008 -/* 0228C 80AECE9C 46083280 */ add.s $f10, $f6, $f8 -/* 02290 80AECEA0 E46A0008 */ swc1 $f10, 0x0008($v1) ## 00000008 -/* 02294 80AECEA4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02298 80AECEA8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 0229C 80AECEAC 03E00008 */ jr $ra -/* 022A0 80AECEB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECEB4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECEB4.s deleted file mode 100644 index f99979d5da..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECEB4.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_80AECEB4 -/* 022A4 80AECEB4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 022A8 80AECEB8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 022AC 80AECEBC AFA40038 */ sw $a0, 0x0038($sp) -/* 022B0 80AECEC0 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 022B4 80AECEC4 AFAE0030 */ sw $t6, 0x0030($sp) -/* 022B8 80AECEC8 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 -/* 022BC 80AECECC 0C01DE1C */ jal Math_Sins - ## sins? -/* 022C0 80AECED0 A7A40026 */ sh $a0, 0x0026($sp) -/* 022C4 80AECED4 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 022C8 80AECED8 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 -/* 022CC 80AECEDC 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 022D0 80AECEE0 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 -/* 022D4 80AECEE4 87191458 */ lh $t9, 0x1458($t8) ## 80161458 -/* 022D8 80AECEE8 8FA30038 */ lw $v1, 0x0038($sp) -/* 022DC 80AECEEC 8FA20030 */ lw $v0, 0x0030($sp) -/* 022E0 80AECEF0 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 022E4 80AECEF4 C4720024 */ lwc1 $f18, 0x0024($v1) ## 00000024 -/* 022E8 80AECEF8 87A40026 */ lh $a0, 0x0026($sp) -/* 022EC 80AECEFC 468021A0 */ cvt.s.w $f6, $f4 -/* 022F0 80AECF00 24630024 */ addiu $v1, $v1, 0x0024 ## $v1 = 00000024 -/* 022F4 80AECF04 24420450 */ addiu $v0, $v0, 0x0450 ## $v0 = 00000450 -/* 022F8 80AECF08 46083280 */ add.s $f10, $f6, $f8 -/* 022FC 80AECF0C 460A0402 */ mul.s $f16, $f0, $f10 -/* 02300 80AECF10 46128100 */ add.s $f4, $f16, $f18 -/* 02304 80AECF14 E4440000 */ swc1 $f4, 0x0000($v0) ## 00000450 -/* 02308 80AECF18 AFA3001C */ sw $v1, 0x001C($sp) -/* 0230C 80AECF1C 0C01DE0D */ jal Math_Coss - ## coss? -/* 02310 80AECF20 AFA20020 */ sw $v0, 0x0020($sp) -/* 02314 80AECF24 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 02318 80AECF28 8D08FA90 */ lw $t0, -0x0570($t0) ## 8015FA90 -/* 0231C 80AECF2C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 02320 80AECF30 44815000 */ mtc1 $at, $f10 ## $f10 = 30.00 -/* 02324 80AECF34 85091458 */ lh $t1, 0x1458($t0) ## 80161458 -/* 02328 80AECF38 8FA3001C */ lw $v1, 0x001C($sp) -/* 0232C 80AECF3C 8FA20020 */ lw $v0, 0x0020($sp) -/* 02330 80AECF40 44893000 */ mtc1 $t1, $f6 ## $f6 = 0.00 -/* 02334 80AECF44 C4640008 */ lwc1 $f4, 0x0008($v1) ## 00000008 -/* 02338 80AECF48 46803220 */ cvt.s.w $f8, $f6 -/* 0233C 80AECF4C 460A4400 */ add.s $f16, $f8, $f10 -/* 02340 80AECF50 46100482 */ mul.s $f18, $f0, $f16 -/* 02344 80AECF54 46049180 */ add.s $f6, $f18, $f4 -/* 02348 80AECF58 E4460008 */ swc1 $f6, 0x0008($v0) ## 00000008 -/* 0234C 80AECF5C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02350 80AECF60 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 02354 80AECF64 03E00008 */ jr $ra -/* 02358 80AECF68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECF6C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECF6C.s deleted file mode 100644 index f6bff7b30a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECF6C.s +++ /dev/null @@ -1,80 +0,0 @@ -.late_rodata -glabel D_80AF1BF0 - .float 10430.378 - -.text -glabel func_80AECF6C -/* 0235C 80AECF6C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 02360 80AECF70 AFBF001C */ sw $ra, 0x001C($sp) -/* 02364 80AECF74 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 02368 80AECF78 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 0236C 80AECF7C C484026C */ lwc1 $f4, 0x026C($a0) ## 0000026C -/* 02370 80AECF80 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 02374 80AECF84 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 02378 80AECF88 46062200 */ add.s $f8, $f4, $f6 -/* 0237C 80AECF8C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 02380 80AECF90 E488026C */ swc1 $f8, 0x026C($a0) ## 0000026C -/* 02384 80AECF94 C4700068 */ lwc1 $f16, 0x0068($v1) ## 00000068 -/* 02388 80AECF98 46105032 */ c.eq.s $f10, $f16 -/* 0238C 80AECF9C 00000000 */ nop -/* 02390 80AECFA0 45020034 */ bc1fl .L80AED074 -/* 02394 80AECFA4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 02398 80AECFA8 C492026C */ lwc1 $f18, 0x026C($a0) ## 0000026C -/* 0239C 80AECFAC 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 -/* 023A0 80AECFB0 00000000 */ nop -/* 023A4 80AECFB4 4612203E */ c.le.s $f4, $f18 -/* 023A8 80AECFB8 00000000 */ nop -/* 023AC 80AECFBC 4502002D */ bc1fl .L80AED074 -/* 023B0 80AECFC0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 023B4 80AECFC4 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 023B8 80AECFC8 C4460450 */ lwc1 $f6, 0x0450($v0) ## 00000450 -/* 023BC 80AECFCC E4660024 */ swc1 $f6, 0x0024($v1) ## 00000024 -/* 023C0 80AECFD0 C4480454 */ lwc1 $f8, 0x0454($v0) ## 00000454 -/* 023C4 80AECFD4 C4720024 */ lwc1 $f18, 0x0024($v1) ## 00000024 -/* 023C8 80AECFD8 E4680028 */ swc1 $f8, 0x0028($v1) ## 00000028 -/* 023CC 80AECFDC C44A0458 */ lwc1 $f10, 0x0458($v0) ## 00000458 -/* 023D0 80AECFE0 E46A002C */ swc1 $f10, 0x002C($v1) ## 0000002C -/* 023D4 80AECFE4 C4900024 */ lwc1 $f16, 0x0024($a0) ## 00000024 -/* 023D8 80AECFE8 C466002C */ lwc1 $f6, 0x002C($v1) ## 0000002C -/* 023DC 80AECFEC C484002C */ lwc1 $f4, 0x002C($a0) ## 0000002C -/* 023E0 80AECFF0 AFA30048 */ sw $v1, 0x0048($sp) -/* 023E4 80AECFF4 46128301 */ sub.s $f12, $f16, $f18 -/* 023E8 80AECFF8 0C03F494 */ jal Math_atan2f -/* 023EC 80AECFFC 46062381 */ sub.s $f14, $f4, $f6 -/* 023F0 80AED000 3C0180AF */ lui $at, %hi(D_80AF1BF0) ## $at = 80AF0000 -/* 023F4 80AED004 C4281BF0 */ lwc1 $f8, %lo(D_80AF1BF0)($at) -/* 023F8 80AED008 8FA30048 */ lw $v1, 0x0048($sp) -/* 023FC 80AED00C 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 02400 80AED010 46080282 */ mul.s $f10, $f0, $f8 -/* 02404 80AED014 246400B6 */ addiu $a0, $v1, 0x00B6 ## $a0 = 000000B6 -/* 02408 80AED018 84990000 */ lh $t9, 0x0000($a0) ## 000000B6 -/* 0240C 80AED01C 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 02410 80AED020 24080064 */ addiu $t0, $zero, 0x0064 ## $t0 = 00000064 -/* 02414 80AED024 4600540D */ trunc.w.s $f16, $f10 -/* 02418 80AED028 44028000 */ mfc1 $v0, $f16 -/* 0241C 80AED02C 00000000 */ nop -/* 02420 80AED030 00027C00 */ sll $t7, $v0, 16 -/* 02424 80AED034 000FC403 */ sra $t8, $t7, 16 -/* 02428 80AED038 00022C00 */ sll $a1, $v0, 16 -/* 0242C 80AED03C 1319000A */ beq $t8, $t9, .L80AED068 -/* 02430 80AED040 00052C03 */ sra $a1, $a1, 16 -/* 02434 80AED044 AFA80010 */ sw $t0, 0x0010($sp) -/* 02438 80AED048 AFA30048 */ sw $v1, 0x0048($sp) -/* 0243C 80AED04C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 02440 80AED050 AFA40020 */ sw $a0, 0x0020($sp) -/* 02444 80AED054 8FA40020 */ lw $a0, 0x0020($sp) -/* 02448 80AED058 8FA30048 */ lw $v1, 0x0048($sp) -/* 0244C 80AED05C 84890000 */ lh $t1, 0x0000($a0) ## 00000000 -/* 02450 80AED060 10000003 */ beq $zero, $zero, .L80AED070 -/* 02454 80AED064 A4690032 */ sh $t1, 0x0032($v1) ## 00000032 -.L80AED068: -/* 02458 80AED068 10000002 */ beq $zero, $zero, .L80AED074 -/* 0245C 80AED06C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AED070: -/* 02460 80AED070 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AED074: -/* 02464 80AED074 8FBF001C */ lw $ra, 0x001C($sp) -/* 02468 80AED078 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 0246C 80AED07C 03E00008 */ jr $ra -/* 02470 80AED080 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED084.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED084.s deleted file mode 100644 index 0149d884d0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED084.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80AED084 -/* 02474 80AED084 8C820278 */ lw $v0, 0x0278($a0) ## 00000278 -/* 02478 80AED088 50400007 */ beql $v0, $zero, .L80AED0A8 -/* 0247C 80AED08C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 02480 80AED090 8C4E01EC */ lw $t6, 0x01EC($v0) ## 000001EC -/* 02484 80AED094 54AE0004 */ bnel $a1, $t6, .L80AED0A8 -/* 02488 80AED098 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0248C 80AED09C 03E00008 */ jr $ra -/* 02490 80AED0A0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AED0A4: -/* 02494 80AED0A4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AED0A8: -/* 02498 80AED0A8 03E00008 */ jr $ra -/* 0249C 80AED0AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED0B0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED0B0.s deleted file mode 100644 index 50d1ddb542..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED0B0.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_80AED0B0 -/* 024A0 80AED0B0 8C820278 */ lw $v0, 0x0278($a0) ## 00000278 -/* 024A4 80AED0B4 10400002 */ beq $v0, $zero, .L80AED0C0 -/* 024A8 80AED0B8 00000000 */ nop -/* 024AC 80AED0BC AC4501EC */ sw $a1, 0x01EC($v0) ## 000001EC -.L80AED0C0: -/* 024B0 80AED0C0 03E00008 */ jr $ra -/* 024B4 80AED0C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED0C8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED0C8.s deleted file mode 100644 index 279d5da22b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED0C8.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80AED0C8 -/* 024B8 80AED0C8 AFA50004 */ sw $a1, 0x0004($sp) -/* 024BC 80AED0CC 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 024C0 80AED0D0 03E00008 */ jr $ra -/* 024C4 80AED0D4 AC8E0264 */ sw $t6, 0x0264($a0) ## 00000264 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED0D8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED0D8.s deleted file mode 100644 index c3875bae07..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED0D8.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80AED0D8 -/* 024C8 80AED0D8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 024CC 80AED0DC AFBF0014 */ sw $ra, 0x0014($sp) -/* 024D0 80AED0E0 8482008A */ lh $v0, 0x008A($a0) ## 0000008A -/* 024D4 80AED0E4 240E0011 */ addiu $t6, $zero, 0x0011 ## $t6 = 00000011 -/* 024D8 80AED0E8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 024DC 80AED0EC AC8E0264 */ sw $t6, 0x0264($a0) ## 00000264 -/* 024E0 80AED0F0 AC8F0268 */ sw $t7, 0x0268($a0) ## 00000268 -/* 024E4 80AED0F4 A4820032 */ sh $v0, 0x0032($a0) ## 00000032 -/* 024E8 80AED0F8 0C2BB32C */ jal func_80AECCB0 -/* 024EC 80AED0FC A48200B6 */ sh $v0, 0x00B6($a0) ## 000000B6 -/* 024F0 80AED100 8FBF0014 */ lw $ra, 0x0014($sp) -/* 024F4 80AED104 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 024F8 80AED108 03E00008 */ jr $ra -/* 024FC 80AED10C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED110.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED110.s deleted file mode 100644 index fd20b4e19b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED110.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AED110 -/* 02500 80AED110 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02504 80AED114 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02508 80AED118 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0250C 80AED11C C48400BC */ lwc1 $f4, 0x00BC($a0) ## 000000BC -/* 02510 80AED120 240E0012 */ addiu $t6, $zero, 0x0012 ## $t6 = 00000012 -/* 02514 80AED124 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02518 80AED128 4604003E */ c.le.s $f0, $f4 -/* 0251C 80AED12C 00000000 */ nop -/* 02520 80AED130 45020005 */ bc1fl .L80AED148 -/* 02524 80AED134 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02528 80AED138 AC8E0264 */ sw $t6, 0x0264($a0) ## 00000264 -/* 0252C 80AED13C 0C2BB42C */ jal func_80AED0B0 -/* 02530 80AED140 E48000BC */ swc1 $f0, 0x00BC($a0) ## 000000BC -/* 02534 80AED144 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AED148: -/* 02538 80AED148 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0253C 80AED14C 03E00008 */ jr $ra -/* 02540 80AED150 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED154.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED154.s deleted file mode 100644 index 7d4d441b76..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED154.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80AED154 -/* 02544 80AED154 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02548 80AED158 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0254C 80AED15C AFA5001C */ sw $a1, 0x001C($sp) -/* 02550 80AED160 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 02554 80AED164 0C2BB421 */ jal func_80AED084 -/* 02558 80AED168 AFA40018 */ sw $a0, 0x0018($sp) -/* 0255C 80AED16C 10400007 */ beq $v0, $zero, .L80AED18C -/* 02560 80AED170 8FA40018 */ lw $a0, 0x0018($sp) -/* 02564 80AED174 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02568 80AED178 240E0013 */ addiu $t6, $zero, 0x0013 ## $t6 = 00000013 -/* 0256C 80AED17C AC8E0264 */ sw $t6, 0x0264($a0) ## 00000264 -/* 02570 80AED180 E484026C */ swc1 $f4, 0x026C($a0) ## 0000026C -/* 02574 80AED184 0C2BB3AD */ jal func_80AECEB4 -/* 02578 80AED188 8FA5001C */ lw $a1, 0x001C($sp) -.L80AED18C: -/* 0257C 80AED18C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02580 80AED190 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02584 80AED194 03E00008 */ jr $ra -/* 02588 80AED198 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED19C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED19C.s deleted file mode 100644 index 2bcff903c6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED19C.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80AED19C -/* 0258C 80AED19C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02590 80AED1A0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02594 80AED1A4 10A00018 */ beq $a1, $zero, .L80AED208 -/* 02598 80AED1A8 AFA40028 */ sw $a0, 0x0028($sp) -/* 0259C 80AED1AC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 025A0 80AED1B0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 025A4 80AED1B4 24841488 */ addiu $a0, $a0, 0x1488 ## $a0 = 06001488 -/* 025A8 80AED1B8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 025AC 80AED1BC 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 025B0 80AED1C0 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 025B4 80AED1C4 468021A0 */ cvt.s.w $f6, $f4 -/* 025B8 80AED1C8 8FA40028 */ lw $a0, 0x0028($sp) -/* 025BC 80AED1CC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 025C0 80AED1D0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 025C4 80AED1D4 AFAE0014 */ sw $t6, 0x0014($sp) -/* 025C8 80AED1D8 24A51488 */ addiu $a1, $a1, 0x1488 ## $a1 = 06001488 -/* 025CC 80AED1DC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 025D0 80AED1E0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 025D4 80AED1E4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 025D8 80AED1E8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 025DC 80AED1EC 0C029468 */ jal SkelAnime_ChangeAnim - -/* 025E0 80AED1F0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 025E4 80AED1F4 8FA40028 */ lw $a0, 0x0028($sp) -/* 025E8 80AED1F8 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 025EC 80AED1FC 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 025F0 80AED200 0C2BB42C */ jal func_80AED0B0 -/* 025F4 80AED204 AC8F0264 */ sw $t7, 0x0264($a0) ## 00000264 -.L80AED208: -/* 025F8 80AED208 8FBF0024 */ lw $ra, 0x0024($sp) -/* 025FC 80AED20C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02600 80AED210 03E00008 */ jr $ra -/* 02604 80AED214 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED218.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED218.s deleted file mode 100644 index 30e9c43062..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED218.s +++ /dev/null @@ -1,67 +0,0 @@ -glabel func_80AED218 -/* 02608 80AED218 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0260C 80AED21C AFBF002C */ sw $ra, 0x002C($sp) -/* 02610 80AED220 AFB00028 */ sw $s0, 0x0028($sp) -/* 02614 80AED224 AFA50034 */ sw $a1, 0x0034($sp) -/* 02618 80AED228 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0261C 80AED22C 0C2BB421 */ jal func_80AED084 -/* 02620 80AED230 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 02624 80AED234 10400016 */ beq $v0, $zero, .L80AED290 -/* 02628 80AED238 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0262C 80AED23C 8FAE0034 */ lw $t6, 0x0034($sp) -/* 02630 80AED240 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 02634 80AED244 51C0002B */ beql $t6, $zero, .L80AED2F4 -/* 02638 80AED248 8FBF002C */ lw $ra, 0x002C($sp) -/* 0263C 80AED24C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 02640 80AED250 24842058 */ addiu $a0, $a0, 0x2058 ## $a0 = 06002058 -/* 02644 80AED254 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 02648 80AED258 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 0264C 80AED25C 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 02650 80AED260 468021A0 */ cvt.s.w $f6, $f4 -/* 02654 80AED264 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02658 80AED268 24A52058 */ addiu $a1, $a1, 0x2058 ## $a1 = 06002058 -/* 0265C 80AED26C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 02660 80AED270 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02664 80AED274 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02668 80AED278 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0266C 80AED27C AFA00014 */ sw $zero, 0x0014($sp) -/* 02670 80AED280 0C029468 */ jal SkelAnime_ChangeAnim - -/* 02674 80AED284 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 02678 80AED288 1000001A */ beq $zero, $zero, .L80AED2F4 -/* 0267C 80AED28C 8FBF002C */ lw $ra, 0x002C($sp) -.L80AED290: -/* 02680 80AED290 0C2BB421 */ jal func_80AED084 -/* 02684 80AED294 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 02688 80AED298 10400015 */ beq $v0, $zero, .L80AED2F0 -/* 0268C 80AED29C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 02690 80AED2A0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 02694 80AED2A4 24842990 */ addiu $a0, $a0, 0x2990 ## $a0 = 06002990 -/* 02698 80AED2A8 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 0269C 80AED2AC 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 026A0 80AED2B0 44819000 */ mtc1 $at, $f18 ## $f18 = -8.00 -/* 026A4 80AED2B4 46805420 */ cvt.s.w $f16, $f10 -/* 026A8 80AED2B8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 026AC 80AED2BC 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 026B0 80AED2C0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 026B4 80AED2C4 24A52990 */ addiu $a1, $a1, 0x2990 ## $a1 = 06002990 -/* 026B8 80AED2C8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 026BC 80AED2CC E7B00010 */ swc1 $f16, 0x0010($sp) -/* 026C0 80AED2D0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 026C4 80AED2D4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 026C8 80AED2D8 0C029468 */ jal SkelAnime_ChangeAnim - -/* 026CC 80AED2DC E7B20018 */ swc1 $f18, 0x0018($sp) -/* 026D0 80AED2E0 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 026D4 80AED2E4 24180015 */ addiu $t8, $zero, 0x0015 ## $t8 = 00000015 -/* 026D8 80AED2E8 AE180264 */ sw $t8, 0x0264($s0) ## 00000264 -/* 026DC 80AED2EC E604027C */ swc1 $f4, 0x027C($s0) ## 0000027C -.L80AED2F0: -/* 026E0 80AED2F0 8FBF002C */ lw $ra, 0x002C($sp) -.L80AED2F4: -/* 026E4 80AED2F4 8FB00028 */ lw $s0, 0x0028($sp) -/* 026E8 80AED2F8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 026EC 80AED2FC 03E00008 */ jr $ra -/* 026F0 80AED300 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED304.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED304.s deleted file mode 100644 index 2abdea62a3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED304.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80AED304 -/* 026F4 80AED304 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 026F8 80AED308 AFBF0014 */ sw $ra, 0x0014($sp) -/* 026FC 80AED30C 0C2BB432 */ jal func_80AED0C8 -/* 02700 80AED310 00000000 */ nop -/* 02704 80AED314 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02708 80AED318 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0270C 80AED31C 03E00008 */ jr $ra -/* 02710 80AED320 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED324.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED324.s deleted file mode 100644 index 8dedd13421..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED324.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80AED324 -/* 02714 80AED324 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02718 80AED328 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0271C 80AED32C 0C2BB436 */ jal func_80AED0D8 -/* 02720 80AED330 00000000 */ nop -/* 02724 80AED334 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02728 80AED338 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0272C 80AED33C 03E00008 */ jr $ra -/* 02730 80AED340 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED344.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED344.s deleted file mode 100644 index 13ee4c51c6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED344.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80AED344 -/* 02734 80AED344 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02738 80AED348 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0273C 80AED34C 0C2BB381 */ jal func_80AECE04 -/* 02740 80AED350 AFA40018 */ sw $a0, 0x0018($sp) -/* 02744 80AED354 0C2BACC8 */ jal func_80AEB320 -/* 02748 80AED358 8FA40018 */ lw $a0, 0x0018($sp) -/* 0274C 80AED35C 0C2BB444 */ jal func_80AED110 -/* 02750 80AED360 8FA40018 */ lw $a0, 0x0018($sp) -/* 02754 80AED364 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02758 80AED368 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0275C 80AED36C 03E00008 */ jr $ra -/* 02760 80AED370 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED374.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED374.s deleted file mode 100644 index dfbee1cf6c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED374.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80AED374 -/* 02764 80AED374 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02768 80AED378 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0276C 80AED37C AFA40018 */ sw $a0, 0x0018($sp) -/* 02770 80AED380 0C2BACC8 */ jal func_80AEB320 -/* 02774 80AED384 AFA5001C */ sw $a1, 0x001C($sp) -/* 02778 80AED388 8FA40018 */ lw $a0, 0x0018($sp) -/* 0277C 80AED38C 0C2BB455 */ jal func_80AED154 -/* 02780 80AED390 8FA5001C */ lw $a1, 0x001C($sp) -/* 02784 80AED394 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02788 80AED398 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0278C 80AED39C 03E00008 */ jr $ra -/* 02790 80AED3A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED3A4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED3A4.s deleted file mode 100644 index 5d4dd5257f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED3A4.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80AED3A4 -/* 02794 80AED3A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02798 80AED3A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0279C 80AED3AC AFA40018 */ sw $a0, 0x0018($sp) -/* 027A0 80AED3B0 0C2BACC8 */ jal func_80AEB320 -/* 027A4 80AED3B4 AFA5001C */ sw $a1, 0x001C($sp) -/* 027A8 80AED3B8 8FA40018 */ lw $a0, 0x0018($sp) -/* 027AC 80AED3BC 0C2BB3DB */ jal func_80AECF6C -/* 027B0 80AED3C0 8FA5001C */ lw $a1, 0x001C($sp) -/* 027B4 80AED3C4 8FA40018 */ lw $a0, 0x0018($sp) -/* 027B8 80AED3C8 0C2BB467 */ jal func_80AED19C -/* 027BC 80AED3CC 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 027C0 80AED3D0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 027C4 80AED3D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 027C8 80AED3D8 03E00008 */ jr $ra -/* 027CC 80AED3DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED3E0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED3E0.s deleted file mode 100644 index 5309640a75..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED3E0.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80AED3E0 -/* 027D0 80AED3E0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 027D4 80AED3E4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 027D8 80AED3E8 0C2BABB3 */ jal func_80AEAECC -/* 027DC 80AED3EC AFA40018 */ sw $a0, 0x0018($sp) -/* 027E0 80AED3F0 0C2BACC8 */ jal func_80AEB320 -/* 027E4 80AED3F4 8FA40018 */ lw $a0, 0x0018($sp) -/* 027E8 80AED3F8 8FA40018 */ lw $a0, 0x0018($sp) -/* 027EC 80AED3FC 0C2BB486 */ jal func_80AED218 -/* 027F0 80AED400 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 027F4 80AED404 8FBF0014 */ lw $ra, 0x0014($sp) -/* 027F8 80AED408 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 027FC 80AED40C 03E00008 */ jr $ra -/* 02800 80AED410 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED414.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED414.s deleted file mode 100644 index b00c2932b7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED414.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80AED414 -/* 02804 80AED414 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02808 80AED418 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0280C 80AED41C AFA40018 */ sw $a0, 0x0018($sp) -/* 02810 80AED420 0C2BB388 */ jal func_80AECE20 -/* 02814 80AED424 AFA5001C */ sw $a1, 0x001C($sp) -/* 02818 80AED428 8FA40018 */ lw $a0, 0x0018($sp) -/* 0281C 80AED42C 0C2BABB3 */ jal func_80AEAECC -/* 02820 80AED430 8FA5001C */ lw $a1, 0x001C($sp) -/* 02824 80AED434 0C2BACC8 */ jal func_80AEB320 -/* 02828 80AED438 8FA40018 */ lw $a0, 0x0018($sp) -/* 0282C 80AED43C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02830 80AED440 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02834 80AED444 03E00008 */ jr $ra -/* 02838 80AED448 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED44C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED44C.s deleted file mode 100644 index 15e050ef69..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED44C.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_80AED44C -/* 0283C 80AED44C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 02840 80AED450 9442F580 */ lhu $v0, -0x0A80($v0) ## 8015F580 -/* 02844 80AED454 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02848 80AED458 AFBF001C */ sw $ra, 0x001C($sp) -/* 0284C 80AED45C 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 02850 80AED460 11C00020 */ beq $t6, $zero, .L80AED4E4 -/* 02854 80AED464 304F0020 */ andi $t7, $v0, 0x0020 ## $t7 = 00000000 -/* 02858 80AED468 15E0001E */ bne $t7, $zero, .L80AED4E4 -/* 0285C 80AED46C 30580001 */ andi $t8, $v0, 0x0001 ## $t8 = 00000000 -/* 02860 80AED470 1700001C */ bne $t8, $zero, .L80AED4E4 -/* 02864 80AED474 30590080 */ andi $t9, $v0, 0x0080 ## $t9 = 00000000 -/* 02868 80AED478 1720001A */ bne $t9, $zero, .L80AED4E4 -/* 0286C 80AED47C 00000000 */ nop -/* 02870 80AED480 0C2BAC08 */ jal func_80AEB020 -/* 02874 80AED484 AFA40020 */ sw $a0, 0x0020($sp) -/* 02878 80AED488 14400012 */ bne $v0, $zero, .L80AED4D4 -/* 0287C 80AED48C 8FA40020 */ lw $a0, 0x0020($sp) -/* 02880 80AED490 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02884 80AED494 24A597B8 */ addiu $a1, $a1, 0x97B8 ## $a1 = 060097B8 -/* 02888 80AED498 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0288C 80AED49C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02890 80AED4A0 AFA00010 */ sw $zero, 0x0010($sp) -/* 02894 80AED4A4 0C2BAC99 */ jal func_80AEB264 -/* 02898 80AED4A8 AFA40020 */ sw $a0, 0x0020($sp) -/* 0289C 80AED4AC 8FA40020 */ lw $a0, 0x0020($sp) -/* 028A0 80AED4B0 24080016 */ addiu $t0, $zero, 0x0016 ## $t0 = 00000016 -/* 028A4 80AED4B4 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -/* 028A8 80AED4B8 80820003 */ lb $v0, 0x0003($a0) ## 00000003 -/* 028AC 80AED4BC AC880264 */ sw $t0, 0x0264($a0) ## 00000264 -/* 028B0 80AED4C0 A0890003 */ sb $t1, 0x0003($a0) ## 00000003 -/* 028B4 80AED4C4 A0820284 */ sb $v0, 0x0284($a0) ## 00000284 -/* 028B8 80AED4C8 A0820286 */ sb $v0, 0x0286($a0) ## 00000286 -/* 028BC 80AED4CC 10000007 */ beq $zero, $zero, .L80AED4EC -/* 028C0 80AED4D0 A0820285 */ sb $v0, 0x0285($a0) ## 00000285 -.L80AED4D4: -/* 028C4 80AED4D4 0C00B55C */ jal Actor_Kill - -/* 028C8 80AED4D8 00000000 */ nop -/* 028CC 80AED4DC 10000004 */ beq $zero, $zero, .L80AED4F0 -/* 028D0 80AED4E0 8FBF001C */ lw $ra, 0x001C($sp) -.L80AED4E4: -/* 028D4 80AED4E4 0C00B55C */ jal Actor_Kill - -/* 028D8 80AED4E8 00000000 */ nop -.L80AED4EC: -/* 028DC 80AED4EC 8FBF001C */ lw $ra, 0x001C($sp) -.L80AED4F0: -/* 028E0 80AED4F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 028E4 80AED4F4 03E00008 */ jr $ra -/* 028E8 80AED4F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED4FC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED4FC.s deleted file mode 100644 index 6ca2b0a90a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED4FC.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80AED4FC -/* 028EC 80AED4FC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 028F0 80AED500 AFBF0014 */ sw $ra, 0x0014($sp) -/* 028F4 80AED504 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 028F8 80AED508 0C01E245 */ jal func_80078914 -/* 028FC 80AED50C 240528AC */ addiu $a1, $zero, 0x28AC ## $a1 = 000028AC -/* 02900 80AED510 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02904 80AED514 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02908 80AED518 03E00008 */ jr $ra -/* 0290C 80AED51C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED520.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED520.s deleted file mode 100644 index 0e703ee158..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED520.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AED520 -/* 02910 80AED520 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02914 80AED524 AFBF001C */ sw $ra, 0x001C($sp) -/* 02918 80AED528 AFA40020 */ sw $a0, 0x0020($sp) -/* 0291C 80AED52C AFA50024 */ sw $a1, 0x0024($sp) -/* 02920 80AED530 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 02924 80AED534 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 02928 80AED538 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 0292C 80AED53C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 02930 80AED540 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 -/* 02934 80AED544 AFAF0014 */ sw $t7, 0x0014($sp) -/* 02938 80AED548 AFA70010 */ sw $a3, 0x0010($sp) -/* 0293C 80AED54C 24040883 */ addiu $a0, $zero, 0x0883 ## $a0 = 00000883 -/* 02940 80AED550 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 02944 80AED554 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 02948 80AED558 244500E4 */ addiu $a1, $v0, 0x00E4 ## $a1 = 000000E4 -/* 0294C 80AED55C 8FA40020 */ lw $a0, 0x0020($sp) -/* 02950 80AED560 24056864 */ addiu $a1, $zero, 0x6864 ## $a1 = 00006864 -/* 02954 80AED564 0C01E245 */ jal func_80078914 -/* 02958 80AED568 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 0295C 80AED56C 8FBF001C */ lw $ra, 0x001C($sp) -/* 02960 80AED570 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02964 80AED574 03E00008 */ jr $ra -/* 02968 80AED578 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED57C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED57C.s deleted file mode 100644 index ef1d1e5c86..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED57C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80AED57C -/* 0296C 80AED57C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02970 80AED580 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02974 80AED584 C4860068 */ lwc1 $f6, 0x0068($a0) ## 00000068 -/* 02978 80AED588 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0297C 80AED58C 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 02980 80AED590 46062032 */ c.eq.s $f4, $f6 -/* 02984 80AED594 00000000 */ nop -/* 02988 80AED598 45030004 */ bc1tl .L80AED5AC -/* 0298C 80AED59C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02990 80AED5A0 0C01E245 */ jal func_80078914 -/* 02994 80AED5A4 24056865 */ addiu $a1, $zero, 0x6865 ## $a1 = 00006865 -/* 02998 80AED5A8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AED5AC: -/* 0299C 80AED5AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 029A0 80AED5B0 03E00008 */ jr $ra -/* 029A4 80AED5B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED5B8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED5B8.s deleted file mode 100644 index 08676811dd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED5B8.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80AED5B8 -/* 029A8 80AED5B8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 029AC 80AED5BC AFBF0014 */ sw $ra, 0x0014($sp) -/* 029B0 80AED5C0 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 029B4 80AED5C4 0C01E245 */ jal func_80078914 -/* 029B8 80AED5C8 24056860 */ addiu $a1, $zero, 0x6860 ## $a1 = 00006860 -/* 029BC 80AED5CC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 029C0 80AED5D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 029C4 80AED5D4 03E00008 */ jr $ra -/* 029C8 80AED5D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED5DC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED5DC.s deleted file mode 100644 index 883e7233d6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED5DC.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80AED5DC -/* 029CC 80AED5DC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 029D0 80AED5E0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 029D4 80AED5E4 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 029D8 80AED5E8 0C01E245 */ jal func_80078914 -/* 029DC 80AED5EC 24056866 */ addiu $a1, $zero, 0x6866 ## $a1 = 00006866 -/* 029E0 80AED5F0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 029E4 80AED5F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 029E8 80AED5F8 03E00008 */ jr $ra -/* 029EC 80AED5FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED600.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED600.s deleted file mode 100644 index bd7d3cb867..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED600.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80AED600 -/* 029F0 80AED600 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 029F4 80AED604 AFBF0014 */ sw $ra, 0x0014($sp) -/* 029F8 80AED608 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 029FC 80AED60C 0C01E245 */ jal func_80078914 -/* 02A00 80AED610 24056861 */ addiu $a1, $zero, 0x6861 ## $a1 = 00006861 -/* 02A04 80AED614 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02A08 80AED618 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02A0C 80AED61C 03E00008 */ jr $ra -/* 02A10 80AED620 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED624.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED624.s deleted file mode 100644 index e6a990b266..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED624.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_80AED624 -/* 02A14 80AED624 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02A18 80AED628 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02A1C 80AED62C 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 02A20 80AED630 00451021 */ addu $v0, $v0, $a1 -/* 02A24 80AED634 80421CBC */ lb $v0, 0x1CBC($v0) ## 00011CBC -/* 02A28 80AED638 80830285 */ lb $v1, 0x0285($a0) ## 00000285 -/* 02A2C 80AED63C 50430006 */ beql $v0, $v1, .L80AED658 -/* 02A30 80AED640 808E0284 */ lb $t6, 0x0284($a0) ## 00000284 -/* 02A34 80AED644 0C00B55C */ jal Actor_Kill - -/* 02A38 80AED648 00000000 */ nop -/* 02A3C 80AED64C 1000001F */ beq $zero, $zero, .L80AED6CC -/* 02A40 80AED650 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 02A44 80AED654 808E0284 */ lb $t6, 0x0284($a0) ## 00000284 -.L80AED658: -/* 02A48 80AED658 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 02A4C 80AED65C 144E0003 */ bne $v0, $t6, .L80AED66C -/* 02A50 80AED660 00000000 */ nop -/* 02A54 80AED664 50430019 */ beql $v0, $v1, .L80AED6CC -/* 02A58 80AED668 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AED66C: -/* 02A5C 80AED66C 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 -/* 02A60 80AED670 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 02A64 80AED674 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 -/* 02A68 80AED678 85F81474 */ lh $t8, 0x1474($t7) ## 80161474 -/* 02A6C 80AED67C C4900084 */ lwc1 $f16, 0x0084($a0) ## 00000084 -/* 02A70 80AED680 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 02A74 80AED684 00000000 */ nop -/* 02A78 80AED688 468021A0 */ cvt.s.w $f6, $f4 -/* 02A7C 80AED68C 46083280 */ add.s $f10, $f6, $f8 -/* 02A80 80AED690 4610503C */ c.lt.s $f10, $f16 -/* 02A84 80AED694 00000000 */ nop -/* 02A88 80AED698 4502000C */ bc1fl .L80AED6CC -/* 02A8C 80AED69C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 02A90 80AED6A0 8C990264 */ lw $t9, 0x0264($a0) ## 00000264 -/* 02A94 80AED6A4 24020021 */ addiu $v0, $zero, 0x0021 ## $v0 = 00000021 -/* 02A98 80AED6A8 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 02A9C 80AED6AC 10590006 */ beq $v0, $t9, .L80AED6C8 -/* 02AA0 80AED6B0 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 02AA4 80AED6B4 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 02AA8 80AED6B8 AC820264 */ sw $v0, 0x0264($a0) ## 00000264 -/* 02AAC 80AED6BC AC880268 */ sw $t0, 0x0268($a0) ## 00000268 -/* 02AB0 80AED6C0 AC8902A8 */ sw $t1, 0x02A8($a0) ## 000002A8 -/* 02AB4 80AED6C4 E49202A4 */ swc1 $f18, 0x02A4($a0) ## 000002A4 -.L80AED6C8: -/* 02AB8 80AED6C8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AED6CC: -/* 02ABC 80AED6CC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02AC0 80AED6D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02AC4 80AED6D4 03E00008 */ jr $ra -/* 02AC8 80AED6D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED6DC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED6DC.s deleted file mode 100644 index fb010407d8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED6DC.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_80AED6DC -/* 02ACC 80AED6DC 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 02AD0 80AED6E0 00451021 */ addu $v0, $v0, $a1 -/* 02AD4 80AED6E4 80421CBC */ lb $v0, 0x1CBC($v0) ## 00011CBC -/* 02AD8 80AED6E8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02ADC 80AED6EC A0820285 */ sb $v0, 0x0285($a0) ## 00000285 -/* 02AE0 80AED6F0 03E00008 */ jr $ra -/* 02AE4 80AED6F4 E4840288 */ swc1 $f4, 0x0288($a0) ## 00000288 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED6F8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED6F8.s deleted file mode 100644 index bb401d1157..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED6F8.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80AED6F8 -/* 02AE8 80AED6F8 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 02AEC 80AED6FC 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 -/* 02AF0 80AED700 94A20F20 */ lhu $v0, 0x0F20($a1) ## 8015F580 -/* 02AF4 80AED704 3C030001 */ lui $v1, 0x0001 ## $v1 = 00010000 -/* 02AF8 80AED708 00641821 */ addu $v1, $v1, $a0 -/* 02AFC 80AED70C 304E0080 */ andi $t6, $v0, 0x0080 ## $t6 = 00000000 -/* 02B00 80AED710 15C00007 */ bne $t6, $zero, .L80AED730 -/* 02B04 80AED714 00000000 */ nop -/* 02B08 80AED718 80631CBC */ lb $v1, 0x1CBC($v1) ## 00011CBC -/* 02B0C 80AED71C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02B10 80AED720 344F0080 */ ori $t7, $v0, 0x0080 ## $t7 = 00000080 -/* 02B14 80AED724 14610002 */ bne $v1, $at, .L80AED730 -/* 02B18 80AED728 00000000 */ nop -/* 02B1C 80AED72C A4AF0F20 */ sh $t7, 0x0F20($a1) ## 8015F580 -.L80AED730: -/* 02B20 80AED730 03E00008 */ jr $ra -/* 02B24 80AED734 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED738.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED738.s deleted file mode 100644 index 96c827bcbd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED738.s +++ /dev/null @@ -1,72 +0,0 @@ -glabel func_80AED738 -/* 02B28 80AED738 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02B2C 80AED73C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02B30 80AED740 0C2BB589 */ jal func_80AED624 -/* 02B34 80AED744 AFA40018 */ sw $a0, 0x0018($sp) -/* 02B38 80AED748 10400038 */ beq $v0, $zero, .L80AED82C -/* 02B3C 80AED74C 8FA40018 */ lw $a0, 0x0018($sp) -/* 02B40 80AED750 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 02B44 80AED754 44811000 */ mtc1 $at, $f2 ## $f2 = 20.00 -/* 02B48 80AED758 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 02B4C 80AED75C 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 02B50 80AED760 C48402A4 */ lwc1 $f4, 0x02A4($a0) ## 000002A4 -/* 02B54 80AED764 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 02B58 80AED768 46062200 */ add.s $f8, $f4, $f6 -/* 02B5C 80AED76C E48802A4 */ swc1 $f8, 0x02A4($a0) ## 000002A4 -/* 02B60 80AED770 C48002A4 */ lwc1 $f0, 0x02A4($a0) ## 000002A4 -/* 02B64 80AED774 4602003C */ c.lt.s $f0, $f2 -/* 02B68 80AED778 00000000 */ nop -/* 02B6C 80AED77C 45000029 */ bc1f .L80AED824 -/* 02B70 80AED780 00000000 */ nop -/* 02B74 80AED784 46001281 */ sub.s $f10, $f2, $f0 -/* 02B78 80AED788 44818000 */ mtc1 $at, $f16 ## $f16 = 255.00 -/* 02B7C 80AED78C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 02B80 80AED790 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02B84 80AED794 46105482 */ mul.s $f18, $f10, $f16 -/* 02B88 80AED798 46029103 */ div.s $f4, $f18, $f2 -/* 02B8C 80AED79C 444EF800 */ cfc1 $t6, $31 -/* 02B90 80AED7A0 44C2F800 */ ctc1 $v0, $31 -/* 02B94 80AED7A4 00000000 */ nop -/* 02B98 80AED7A8 460021A4 */ cvt.w.s $f6, $f4 -/* 02B9C 80AED7AC 4442F800 */ cfc1 $v0, $31 -/* 02BA0 80AED7B0 00000000 */ nop -/* 02BA4 80AED7B4 30420078 */ andi $v0, $v0, 0x0078 ## $v0 = 00000000 -/* 02BA8 80AED7B8 50400013 */ beql $v0, $zero, .L80AED808 -/* 02BAC 80AED7BC 44023000 */ mfc1 $v0, $f6 -/* 02BB0 80AED7C0 44813000 */ mtc1 $at, $f6 ## $f6 = 2147483648.00 -/* 02BB4 80AED7C4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 02BB8 80AED7C8 46062181 */ sub.s $f6, $f4, $f6 -/* 02BBC 80AED7CC 44C2F800 */ ctc1 $v0, $31 -/* 02BC0 80AED7D0 00000000 */ nop -/* 02BC4 80AED7D4 460031A4 */ cvt.w.s $f6, $f6 -/* 02BC8 80AED7D8 4442F800 */ cfc1 $v0, $31 -/* 02BCC 80AED7DC 00000000 */ nop -/* 02BD0 80AED7E0 30420078 */ andi $v0, $v0, 0x0078 ## $v0 = 00000000 -/* 02BD4 80AED7E4 14400005 */ bne $v0, $zero, .L80AED7FC -/* 02BD8 80AED7E8 00000000 */ nop -/* 02BDC 80AED7EC 44023000 */ mfc1 $v0, $f6 -/* 02BE0 80AED7F0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02BE4 80AED7F4 10000007 */ beq $zero, $zero, .L80AED814 -/* 02BE8 80AED7F8 00411025 */ or $v0, $v0, $at ## $v0 = 80000000 -.L80AED7FC: -/* 02BEC 80AED7FC 10000005 */ beq $zero, $zero, .L80AED814 -/* 02BF0 80AED800 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -/* 02BF4 80AED804 44023000 */ mfc1 $v0, $f6 -.L80AED808: -/* 02BF8 80AED808 00000000 */ nop -/* 02BFC 80AED80C 0440FFFB */ bltz $v0, .L80AED7FC -/* 02C00 80AED810 00000000 */ nop -.L80AED814: -/* 02C04 80AED814 44CEF800 */ ctc1 $t6, $31 -/* 02C08 80AED818 AC8202A8 */ sw $v0, 0x02A8($a0) ## 000002A8 -/* 02C0C 80AED81C 10000003 */ beq $zero, $zero, .L80AED82C -/* 02C10 80AED820 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -.L80AED824: -/* 02C14 80AED824 0C00B55C */ jal Actor_Kill - -/* 02C18 80AED828 00000000 */ nop -.L80AED82C: -/* 02C1C 80AED82C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02C20 80AED830 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02C24 80AED834 03E00008 */ jr $ra -/* 02C28 80AED838 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED83C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED83C.s deleted file mode 100644 index b65fd27950..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED83C.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_80AED83C -/* 02C2C 80AED83C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 02C30 80AED840 AFA40038 */ sw $a0, 0x0038($sp) -/* 02C34 80AED844 AFBF001C */ sw $ra, 0x001C($sp) -/* 02C38 80AED848 2484037C */ addiu $a0, $a0, 0x037C ## $a0 = 0000037C -/* 02C3C 80AED84C 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 02C40 80AED850 AFAE0010 */ sw $t6, 0x0010($sp) -/* 02C44 80AED854 AFA40024 */ sw $a0, 0x0024($sp) -/* 02C48 80AED858 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02C4C 80AED85C 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 02C50 80AED860 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 02C54 80AED864 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 02C58 80AED868 8FA40024 */ lw $a0, 0x0024($sp) -/* 02C5C 80AED86C 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 -/* 02C60 80AED870 AFAF0010 */ sw $t7, 0x0010($sp) -/* 02C64 80AED874 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02C68 80AED878 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 02C6C 80AED87C 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 02C70 80AED880 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 02C74 80AED884 24840002 */ addiu $a0, $a0, 0x0002 ## $a0 = 00000002 -/* 02C78 80AED888 8FA40038 */ lw $a0, 0x0038($sp) -/* 02C7C 80AED88C 24180064 */ addiu $t8, $zero, 0x0064 ## $t8 = 00000064 -/* 02C80 80AED890 AFB80010 */ sw $t8, 0x0010($sp) -/* 02C84 80AED894 24840382 */ addiu $a0, $a0, 0x0382 ## $a0 = 00000382 -/* 02C88 80AED898 AFA40024 */ sw $a0, 0x0024($sp) -/* 02C8C 80AED89C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02C90 80AED8A0 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 02C94 80AED8A4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 02C98 80AED8A8 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 02C9C 80AED8AC 8FA40024 */ lw $a0, 0x0024($sp) -/* 02CA0 80AED8B0 24190064 */ addiu $t9, $zero, 0x0064 ## $t9 = 00000064 -/* 02CA4 80AED8B4 AFB90010 */ sw $t9, 0x0010($sp) -/* 02CA8 80AED8B8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02CAC 80AED8BC 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 02CB0 80AED8C0 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 02CB4 80AED8C4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 02CB8 80AED8C8 24840002 */ addiu $a0, $a0, 0x0002 ## $a0 = 00000002 -/* 02CBC 80AED8CC 8FBF001C */ lw $ra, 0x001C($sp) -/* 02CC0 80AED8D0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 02CC4 80AED8D4 03E00008 */ jr $ra -/* 02CC8 80AED8D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED8DC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED8DC.s deleted file mode 100644 index 00ffa69d39..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED8DC.s +++ /dev/null @@ -1,149 +0,0 @@ -glabel func_80AED8DC -/* 02CCC 80AED8DC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 02CD0 80AED8E0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02CD4 80AED8E4 AFB10020 */ sw $s1, 0x0020($sp) -/* 02CD8 80AED8E8 AFB0001C */ sw $s0, 0x001C($sp) -/* 02CDC 80AED8EC 848E02AC */ lh $t6, 0x02AC($a0) ## 000002AC -/* 02CE0 80AED8F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02CE4 80AED8F4 260302AC */ addiu $v1, $s0, 0x02AC ## $v1 = 000002AC -/* 02CE8 80AED8F8 15C00003 */ bne $t6, $zero, .L80AED908 -/* 02CEC 80AED8FC 2404000A */ addiu $a0, $zero, 0x000A ## $a0 = 0000000A -/* 02CF0 80AED900 10000005 */ beq $zero, $zero, .L80AED918 -/* 02CF4 80AED904 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AED908: -/* 02CF8 80AED908 846F0000 */ lh $t7, 0x0000($v1) ## 000002AC -/* 02CFC 80AED90C 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 02D00 80AED910 A4780000 */ sh $t8, 0x0000($v1) ## 000002AC -/* 02D04 80AED914 84620000 */ lh $v0, 0x0000($v1) ## 000002AC -.L80AED918: -/* 02D08 80AED918 14400016 */ bne $v0, $zero, .L80AED974 -/* 02D0C 80AED91C 24050019 */ addiu $a1, $zero, 0x0019 ## $a1 = 00000019 -/* 02D10 80AED920 260302AC */ addiu $v1, $s0, 0x02AC ## $v1 = 000002AC -/* 02D14 80AED924 0C01DF64 */ jal Math_Rand_S16Offset - -/* 02D18 80AED928 AFA30030 */ sw $v1, 0x0030($sp) -/* 02D1C 80AED92C 8FA30030 */ lw $v1, 0x0030($sp) -/* 02D20 80AED930 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 02D24 80AED934 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 02D28 80AED938 A4620000 */ sh $v0, 0x0000($v1) ## 00000000 -/* 02D2C 80AED93C 84640000 */ lh $a0, 0x0000($v1) ## 00000000 -/* 02D30 80AED940 0081001A */ div $zero, $a0, $at -/* 02D34 80AED944 00002010 */ mfhi $a0 -/* 02D38 80AED948 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02D3C 80AED94C 14800003 */ bne $a0, $zero, .L80AED95C -/* 02D40 80AED950 00000000 */ nop -/* 02D44 80AED954 10000006 */ beq $zero, $zero, .L80AED970 -/* 02D48 80AED958 AE1902B0 */ sw $t9, 0x02B0($s0) ## 000002B0 -.L80AED95C: -/* 02D4C 80AED95C 14810003 */ bne $a0, $at, .L80AED96C -/* 02D50 80AED960 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 02D54 80AED964 10000002 */ beq $zero, $zero, .L80AED970 -/* 02D58 80AED968 AE0802B0 */ sw $t0, 0x02B0($s0) ## 000002B0 -.L80AED96C: -/* 02D5C 80AED96C AE0002B0 */ sw $zero, 0x02B0($s0) ## 000002B0 -.L80AED970: -/* 02D60 80AED970 A600029E */ sh $zero, 0x029E($s0) ## 0000029E -.L80AED974: -/* 02D64 80AED974 8E0202B0 */ lw $v0, 0x02B0($s0) ## 000002B0 -/* 02D68 80AED978 2604029E */ addiu $a0, $s0, 0x029E ## $a0 = 0000029E -/* 02D6C 80AED97C 2611037E */ addiu $s1, $s0, 0x037E ## $s1 = 0000037E -/* 02D70 80AED980 1440001B */ bne $v0, $zero, .L80AED9F0 -/* 02D74 80AED984 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02D78 80AED988 86250000 */ lh $a1, 0x0000($s1) ## 0000037E -/* 02D7C 80AED98C 24090190 */ addiu $t1, $zero, 0x0190 ## $t1 = 00000190 -/* 02D80 80AED990 AFA90010 */ sw $t1, 0x0010($sp) -/* 02D84 80AED994 00052823 */ subu $a1, $zero, $a1 -/* 02D88 80AED998 00052C00 */ sll $a1, $a1, 16 -/* 02D8C 80AED99C 00052C03 */ sra $a1, $a1, 16 -/* 02D90 80AED9A0 AFA4002C */ sw $a0, 0x002C($sp) -/* 02D94 80AED9A4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 02D98 80AED9A8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 02D9C 80AED9AC 24070190 */ addiu $a3, $zero, 0x0190 ## $a3 = 00000190 -/* 02DA0 80AED9B0 8FA4002C */ lw $a0, 0x002C($sp) -/* 02DA4 80AED9B4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02DA8 80AED9B8 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 02DAC 80AED9BC 84830000 */ lh $v1, 0x0000($a0) ## 00000000 -/* 02DB0 80AED9C0 02202025 */ or $a0, $s1, $zero ## $a0 = 0000037E -/* 02DB4 80AED9C4 240A0064 */ addiu $t2, $zero, 0x0064 ## $t2 = 00000064 -/* 02DB8 80AED9C8 04600003 */ bltz $v1, .L80AED9D8 -/* 02DBC 80AED9CC 00031023 */ subu $v0, $zero, $v1 -/* 02DC0 80AED9D0 10000001 */ beq $zero, $zero, .L80AED9D8 -/* 02DC4 80AED9D4 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L80AED9D8: -/* 02DC8 80AED9D8 00023C00 */ sll $a3, $v0, 16 -/* 02DCC 80AED9DC 00073C03 */ sra $a3, $a3, 16 -/* 02DD0 80AED9E0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 02DD4 80AED9E4 AFAA0010 */ sw $t2, 0x0010($sp) -/* 02DD8 80AED9E8 10000039 */ beq $zero, $zero, .L80AEDAD0 -/* 02DDC 80AED9EC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AED9F0: -/* 02DE0 80AED9F0 1441001D */ bne $v0, $at, .L80AEDA68 -/* 02DE4 80AED9F4 2611037E */ addiu $s1, $s0, 0x037E ## $s1 = 0000037E -/* 02DE8 80AED9F8 2611037E */ addiu $s1, $s0, 0x037E ## $s1 = 0000037E -/* 02DEC 80AED9FC 862B0000 */ lh $t3, 0x0000($s1) ## 0000037E -/* 02DF0 80AEDA00 240CD556 */ addiu $t4, $zero, 0xD556 ## $t4 = FFFFD556 -/* 02DF4 80AEDA04 240D0190 */ addiu $t5, $zero, 0x0190 ## $t5 = 00000190 -/* 02DF8 80AEDA08 018B2823 */ subu $a1, $t4, $t3 -/* 02DFC 80AEDA0C 00052C00 */ sll $a1, $a1, 16 -/* 02E00 80AEDA10 00052C03 */ sra $a1, $a1, 16 -/* 02E04 80AEDA14 AFAD0010 */ sw $t5, 0x0010($sp) -/* 02E08 80AEDA18 AFA4002C */ sw $a0, 0x002C($sp) -/* 02E0C 80AEDA1C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 02E10 80AEDA20 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 02E14 80AEDA24 24070190 */ addiu $a3, $zero, 0x0190 ## $a3 = 00000190 -/* 02E18 80AEDA28 8FA4002C */ lw $a0, 0x002C($sp) -/* 02E1C 80AEDA2C 2405D556 */ addiu $a1, $zero, 0xD556 ## $a1 = FFFFD556 -/* 02E20 80AEDA30 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 02E24 80AEDA34 84830000 */ lh $v1, 0x0000($a0) ## 00000000 -/* 02E28 80AEDA38 02202025 */ or $a0, $s1, $zero ## $a0 = 0000037E -/* 02E2C 80AEDA3C 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 02E30 80AEDA40 04600003 */ bltz $v1, .L80AEDA50 -/* 02E34 80AEDA44 00031023 */ subu $v0, $zero, $v1 -/* 02E38 80AEDA48 10000001 */ beq $zero, $zero, .L80AEDA50 -/* 02E3C 80AEDA4C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L80AEDA50: -/* 02E40 80AEDA50 00023C00 */ sll $a3, $v0, 16 -/* 02E44 80AEDA54 00073C03 */ sra $a3, $a3, 16 -/* 02E48 80AEDA58 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 02E4C 80AEDA5C AFAE0010 */ sw $t6, 0x0010($sp) -/* 02E50 80AEDA60 1000001B */ beq $zero, $zero, .L80AEDAD0 -/* 02E54 80AEDA64 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AEDA68: -/* 02E58 80AEDA68 862F0000 */ lh $t7, 0x0000($s1) ## 0000037E -/* 02E5C 80AEDA6C 24182AAA */ addiu $t8, $zero, 0x2AAA ## $t8 = 00002AAA -/* 02E60 80AEDA70 24190190 */ addiu $t9, $zero, 0x0190 ## $t9 = 00000190 -/* 02E64 80AEDA74 030F2823 */ subu $a1, $t8, $t7 -/* 02E68 80AEDA78 00052C00 */ sll $a1, $a1, 16 -/* 02E6C 80AEDA7C 00052C03 */ sra $a1, $a1, 16 -/* 02E70 80AEDA80 AFB90010 */ sw $t9, 0x0010($sp) -/* 02E74 80AEDA84 AFA4002C */ sw $a0, 0x002C($sp) -/* 02E78 80AEDA88 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 02E7C 80AEDA8C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 02E80 80AEDA90 24070190 */ addiu $a3, $zero, 0x0190 ## $a3 = 00000190 -/* 02E84 80AEDA94 8FA4002C */ lw $a0, 0x002C($sp) -/* 02E88 80AEDA98 24052AAA */ addiu $a1, $zero, 0x2AAA ## $a1 = 00002AAA -/* 02E8C 80AEDA9C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 02E90 80AEDAA0 84830000 */ lh $v1, 0x0000($a0) ## 00000000 -/* 02E94 80AEDAA4 02202025 */ or $a0, $s1, $zero ## $a0 = 0000037E -/* 02E98 80AEDAA8 24080064 */ addiu $t0, $zero, 0x0064 ## $t0 = 00000064 -/* 02E9C 80AEDAAC 04600003 */ bltz $v1, .L80AEDABC -/* 02EA0 80AEDAB0 00031023 */ subu $v0, $zero, $v1 -/* 02EA4 80AEDAB4 10000001 */ beq $zero, $zero, .L80AEDABC -/* 02EA8 80AEDAB8 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L80AEDABC: -/* 02EAC 80AEDABC 00023C00 */ sll $a3, $v0, 16 -/* 02EB0 80AEDAC0 00073C03 */ sra $a3, $a3, 16 -/* 02EB4 80AEDAC4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 02EB8 80AEDAC8 AFA80010 */ sw $t0, 0x0010($sp) -/* 02EBC 80AEDACC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AEDAD0: -/* 02EC0 80AEDAD0 8FB0001C */ lw $s0, 0x001C($sp) -/* 02EC4 80AEDAD4 8FB10020 */ lw $s1, 0x0020($sp) -/* 02EC8 80AEDAD8 03E00008 */ jr $ra -/* 02ECC 80AEDADC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDAE0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDAE0.s deleted file mode 100644 index 5d7224ccb8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDAE0.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80AEDAE0 -/* 02ED0 80AEDAE0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02ED4 80AEDAE4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 02ED8 80AEDAE8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02EDC 80AEDAEC 24A407C0 */ addiu $a0, $a1, 0x07C0 ## $a0 = 000007C0 -/* 02EE0 80AEDAF0 90C5007D */ lbu $a1, 0x007D($a2) ## 0000007D -/* 02EE4 80AEDAF4 0C00FAE1 */ jal DynaPolyInfo_GetActor - ## DynaPolyInfo_getActor -/* 02EE8 80AEDAF8 AFA60018 */ sw $a2, 0x0018($sp) -/* 02EEC 80AEDAFC 10400005 */ beq $v0, $zero, .L80AEDB14 -/* 02EF0 80AEDB00 8FA60018 */ lw $a2, 0x0018($sp) -/* 02EF4 80AEDB04 844E0000 */ lh $t6, 0x0000($v0) ## 00000000 -/* 02EF8 80AEDB08 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 02EFC 80AEDB0C 55C10005 */ bnel $t6, $at, .L80AEDB24 -/* 02F00 80AEDB10 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AEDB14: -/* 02F04 80AEDB14 94CF0088 */ lhu $t7, 0x0088($a2) ## 00000088 -/* 02F08 80AEDB18 31F8FFE6 */ andi $t8, $t7, 0xFFE6 ## $t8 = 00000000 -/* 02F0C 80AEDB1C A4D80088 */ sh $t8, 0x0088($a2) ## 00000088 -/* 02F10 80AEDB20 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AEDB24: -/* 02F14 80AEDB24 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02F18 80AEDB28 03E00008 */ jr $ra -/* 02F1C 80AEDB2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDB30.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDB30.s deleted file mode 100644 index 7b8886821a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDB30.s +++ /dev/null @@ -1,289 +0,0 @@ -.late_rodata -glabel D_80AF1BF4 - .float 0.01 - -glabel D_80AF1BF8 - .float 0.01 - -glabel D_80AF1BFC - .float 0.8 - -glabel D_80AF1C00 - .float 0.6 - -glabel D_80AF1C04 - .float 0.6, 0.01 - -glabel D_80AF1C0C - .float 0.01 - -glabel D_80AF1C10 - .float 0.8 - -glabel D_80AF1C14 - .float 0.6 - -glabel D_80AF1C18 - .float 0.01 - -glabel D_80AF1C1C - .float 0.6 - -.text -glabel func_80AEDB30 -/* 02F20 80AEDB30 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02F24 80AEDB34 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02F28 80AEDB38 948E0088 */ lhu $t6, 0x0088($a0) ## 00000088 -/* 02F2C 80AEDB3C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 02F30 80AEDB40 24A407C0 */ addiu $a0, $a1, 0x07C0 ## $a0 = 000007C0 -/* 02F34 80AEDB44 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 02F38 80AEDB48 51E00069 */ beql $t7, $zero, .L80AEDCF0 -/* 02F3C 80AEDB4C 94CF0088 */ lhu $t7, 0x0088($a2) ## 00000088 -/* 02F40 80AEDB50 90C5007D */ lbu $a1, 0x007D($a2) ## 0000007D -/* 02F44 80AEDB54 0C00FAE1 */ jal DynaPolyInfo_GetActor - ## DynaPolyInfo_getActor -/* 02F48 80AEDB58 AFA60018 */ sw $a2, 0x0018($sp) -/* 02F4C 80AEDB5C 8FA60018 */ lw $a2, 0x0018($sp) -/* 02F50 80AEDB60 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 02F54 80AEDB64 24C50060 */ addiu $a1, $a2, 0x0060 ## $a1 = 00000060 -/* 02F58 80AEDB68 C4A40000 */ lwc1 $f4, 0x0000($a1) ## 00000060 -/* 02F5C 80AEDB6C 4602203E */ c.le.s $f4, $f2 -/* 02F60 80AEDB70 00000000 */ nop -/* 02F64 80AEDB74 4502005E */ bc1fl .L80AEDCF0 -/* 02F68 80AEDB78 94CF0088 */ lhu $t7, 0x0088($a2) ## 00000088 -/* 02F6C 80AEDB7C 10400009 */ beq $v0, $zero, .L80AEDBA4 -/* 02F70 80AEDB80 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 02F74 80AEDB84 84580000 */ lh $t8, 0x0000($v0) ## 00000000 -/* 02F78 80AEDB88 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 02F7C 80AEDB8C 13010002 */ beq $t8, $at, .L80AEDB98 -/* 02F80 80AEDB90 00000000 */ nop -/* 02F84 80AEDB94 E4C20068 */ swc1 $f2, 0x0068($a2) ## 00000068 -.L80AEDB98: -/* 02F88 80AEDB98 3C0180AF */ lui $at, %hi(D_80AF1BF4) ## $at = 80AF0000 -/* 02F8C 80AEDB9C 1000001D */ beq $zero, $zero, .L80AEDC14 -/* 02F90 80AEDBA0 C42C1BF4 */ lwc1 $f12, %lo(D_80AF1BF4)($at) -.L80AEDBA4: -/* 02F94 80AEDBA4 8C84FA90 */ lw $a0, -0x0570($a0) ## 8015FA90 -/* 02F98 80AEDBA8 3C0180AF */ lui $at, %hi(D_80AF1BF8) ## $at = 80AF0000 -/* 02F9C 80AEDBAC C42C1BF8 */ lwc1 $f12, %lo(D_80AF1BF8)($at) -/* 02FA0 80AEDBB0 8499148A */ lh $t9, 0x148A($a0) ## 8016148A -/* 02FA4 80AEDBB4 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 02FA8 80AEDBB8 44818000 */ mtc1 $at, $f16 ## $f16 = 3.00 -/* 02FAC 80AEDBBC 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 -/* 02FB0 80AEDBC0 24C30068 */ addiu $v1, $a2, 0x0068 ## $v1 = 00000068 -/* 02FB4 80AEDBC4 C4600000 */ lwc1 $f0, 0x0000($v1) ## 00000068 -/* 02FB8 80AEDBC8 46803220 */ cvt.s.w $f8, $f6 -/* 02FBC 80AEDBCC 460C4282 */ mul.s $f10, $f8, $f12 -/* 02FC0 80AEDBD0 46105480 */ add.s $f18, $f10, $f16 -/* 02FC4 80AEDBD4 4600903E */ c.le.s $f18, $f0 -/* 02FC8 80AEDBD8 00000000 */ nop -/* 02FCC 80AEDBDC 4502000D */ bc1fl .L80AEDC14 -/* 02FD0 80AEDBE0 E4620000 */ swc1 $f2, 0x0000($v1) ## 00000068 -/* 02FD4 80AEDBE4 8489147A */ lh $t1, 0x147A($a0) ## 8016147A -/* 02FD8 80AEDBE8 3C0180AF */ lui $at, %hi(D_80AF1BFC) ## $at = 80AF0000 -/* 02FDC 80AEDBEC C42A1BFC */ lwc1 $f10, %lo(D_80AF1BFC)($at) -/* 02FE0 80AEDBF0 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 02FE4 80AEDBF4 00000000 */ nop -/* 02FE8 80AEDBF8 468021A0 */ cvt.s.w $f6, $f4 -/* 02FEC 80AEDBFC 460C3202 */ mul.s $f8, $f6, $f12 -/* 02FF0 80AEDC00 460A4400 */ add.s $f16, $f8, $f10 -/* 02FF4 80AEDC04 46100482 */ mul.s $f18, $f0, $f16 -/* 02FF8 80AEDC08 10000002 */ beq $zero, $zero, .L80AEDC14 -/* 02FFC 80AEDC0C E4720000 */ swc1 $f18, 0x0000($v1) ## 00000068 -/* 03000 80AEDC10 E4620000 */ swc1 $f2, 0x0000($v1) ## 00000068 -.L80AEDC14: -/* 03004 80AEDC14 1040000F */ beq $v0, $zero, .L80AEDC54 -/* 03008 80AEDC18 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0300C 80AEDC1C 844A0000 */ lh $t2, 0x0000($v0) ## 00000000 -/* 03010 80AEDC20 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 03014 80AEDC24 51410006 */ beql $t2, $at, .L80AEDC40 -/* 03018 80AEDC28 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 0301C 80AEDC2C E4A20000 */ swc1 $f2, 0x0000($a1) ## 00000060 -/* 03020 80AEDC30 E4C20070 */ swc1 $f2, 0x0070($a2) ## 00000070 -/* 03024 80AEDC34 1000002A */ beq $zero, $zero, .L80AEDCE0 -/* 03028 80AEDC38 E4C2006C */ swc1 $f2, 0x006C($a2) ## 0000006C -/* 0302C 80AEDC3C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -.L80AEDC40: -/* 03030 80AEDC40 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00 -/* 03034 80AEDC44 C4A40000 */ lwc1 $f4, 0x0000($a1) ## 00000060 -/* 03038 80AEDC48 46062202 */ mul.s $f8, $f4, $f6 -/* 0303C 80AEDC4C 10000024 */ beq $zero, $zero, .L80AEDCE0 -/* 03040 80AEDC50 E4A80000 */ swc1 $f8, 0x0000($a1) ## 00000060 -.L80AEDC54: -/* 03044 80AEDC54 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 -/* 03048 80AEDC58 8D6BFA90 */ lw $t3, -0x0570($t3) ## 8015FA90 -/* 0304C 80AEDC5C 3C0180AF */ lui $at, %hi(D_80AF1C00) ## $at = 80AF0000 -/* 03050 80AEDC60 C4241C00 */ lwc1 $f4, %lo(D_80AF1C00)($at) -/* 03054 80AEDC64 856C147C */ lh $t4, 0x147C($t3) ## 8016147C -/* 03058 80AEDC68 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 -/* 0305C 80AEDC6C 3C0180AF */ lui $at, %hi(D_80AF1C04) ## $at = 80AF0000 -/* 03060 80AEDC70 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 -/* 03064 80AEDC74 24C2006C */ addiu $v0, $a2, 0x006C ## $v0 = 0000006C -/* 03068 80AEDC78 46805420 */ cvt.s.w $f16, $f10 -/* 0306C 80AEDC7C C4AA0000 */ lwc1 $f10, 0x0000($a1) ## 00000060 -/* 03070 80AEDC80 460C8482 */ mul.s $f18, $f16, $f12 -/* 03074 80AEDC84 46049180 */ add.s $f6, $f18, $f4 -/* 03078 80AEDC88 46003207 */ neg.s $f8, $f6 -/* 0307C 80AEDC8C 46085402 */ mul.s $f16, $f10, $f8 -/* 03080 80AEDC90 E4B00000 */ swc1 $f16, 0x0000($a1) ## 00000060 -/* 03084 80AEDC94 8DADFA90 */ lw $t5, -0x0570($t5) ## 8015FA90 -/* 03088 80AEDC98 C42A1C04 */ lwc1 $f10, %lo(D_80AF1C04)($at) -/* 0308C 80AEDC9C C4500000 */ lwc1 $f16, 0x0000($v0) ## 0000006C -/* 03090 80AEDCA0 85AE147C */ lh $t6, 0x147C($t5) ## 8016147C -/* 03094 80AEDCA4 448E9000 */ mtc1 $t6, $f18 ## $f18 = 0.00 -/* 03098 80AEDCA8 00000000 */ nop -/* 0309C 80AEDCAC 46809120 */ cvt.s.w $f4, $f18 -/* 030A0 80AEDCB0 46008487 */ neg.s $f18, $f16 -/* 030A4 80AEDCB4 460C2182 */ mul.s $f6, $f4, $f12 -/* 030A8 80AEDCB8 460A3200 */ add.s $f8, $f6, $f10 -/* 030AC 80AEDCBC C4A60000 */ lwc1 $f6, 0x0000($a1) ## 00000060 -/* 030B0 80AEDCC0 46124102 */ mul.s $f4, $f8, $f18 -/* 030B4 80AEDCC4 4604303E */ c.le.s $f6, $f4 -/* 030B8 80AEDCC8 00000000 */ nop -/* 030BC 80AEDCCC 45000004 */ bc1f .L80AEDCE0 -/* 030C0 80AEDCD0 00000000 */ nop -/* 030C4 80AEDCD4 E4A20000 */ swc1 $f2, 0x0000($a1) ## 00000060 -/* 030C8 80AEDCD8 E4C20070 */ swc1 $f2, 0x0070($a2) ## 00000070 -/* 030CC 80AEDCDC E4420000 */ swc1 $f2, 0x0000($v0) ## 0000006C -.L80AEDCE0: -/* 030D0 80AEDCE0 0C2BB53F */ jal func_80AED4FC -/* 030D4 80AEDCE4 AFA60018 */ sw $a2, 0x0018($sp) -/* 030D8 80AEDCE8 8FA60018 */ lw $a2, 0x0018($sp) -/* 030DC 80AEDCEC 94CF0088 */ lhu $t7, 0x0088($a2) ## 00000088 -.L80AEDCF0: -/* 030E0 80AEDCF0 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 030E4 80AEDCF4 3C0180AF */ lui $at, %hi(D_80AF1C0C) ## $at = 80AF0000 -/* 030E8 80AEDCF8 31F80010 */ andi $t8, $t7, 0x0010 ## $t8 = 00000000 -/* 030EC 80AEDCFC 13000036 */ beq $t8, $zero, .L80AEDDD8 -/* 030F0 80AEDD00 C42C1C0C */ lwc1 $f12, %lo(D_80AF1C0C)($at) -/* 030F4 80AEDD04 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 030F8 80AEDD08 2508FA90 */ addiu $t0, $t0, 0xFA90 ## $t0 = 8015FA90 -/* 030FC 80AEDD0C 8D040000 */ lw $a0, 0x0000($t0) ## 8015FA90 -/* 03100 80AEDD10 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 03104 80AEDD14 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 -/* 03108 80AEDD18 8499148A */ lh $t9, 0x148A($a0) ## 0000148A -/* 0310C 80AEDD1C C4CA0068 */ lwc1 $f10, 0x0068($a2) ## 00000068 -/* 03110 80AEDD20 24C50060 */ addiu $a1, $a2, 0x0060 ## $a1 = 00000060 -/* 03114 80AEDD24 44998000 */ mtc1 $t9, $f16 ## $f16 = 0.00 -/* 03118 80AEDD28 24C30068 */ addiu $v1, $a2, 0x0068 ## $v1 = 00000068 -/* 0311C 80AEDD2C 46808220 */ cvt.s.w $f8, $f16 -/* 03120 80AEDD30 460C4482 */ mul.s $f18, $f8, $f12 -/* 03124 80AEDD34 46049180 */ add.s $f6, $f18, $f4 -/* 03128 80AEDD38 460A303E */ c.le.s $f6, $f10 -/* 0312C 80AEDD3C 00000000 */ nop -/* 03130 80AEDD40 4502000D */ bc1fl .L80AEDD78 -/* 03134 80AEDD44 E4620000 */ swc1 $f2, 0x0000($v1) ## 00000068 -/* 03138 80AEDD48 8489147A */ lh $t1, 0x147A($a0) ## 0000147A -/* 0313C 80AEDD4C 3C0180AF */ lui $at, %hi(D_80AF1C10) ## $at = 80AF0000 -/* 03140 80AEDD50 C4241C10 */ lwc1 $f4, %lo(D_80AF1C10)($at) -/* 03144 80AEDD54 44898000 */ mtc1 $t1, $f16 ## $f16 = 0.00 -/* 03148 80AEDD58 C4660000 */ lwc1 $f6, 0x0000($v1) ## 00000068 -/* 0314C 80AEDD5C 46808220 */ cvt.s.w $f8, $f16 -/* 03150 80AEDD60 460C4482 */ mul.s $f18, $f8, $f12 -/* 03154 80AEDD64 46049280 */ add.s $f10, $f18, $f4 -/* 03158 80AEDD68 460A3402 */ mul.s $f16, $f6, $f10 -/* 0315C 80AEDD6C 10000002 */ beq $zero, $zero, .L80AEDD78 -/* 03160 80AEDD70 E4700000 */ swc1 $f16, 0x0000($v1) ## 00000068 -/* 03164 80AEDD74 E4620000 */ swc1 $f2, 0x0000($v1) ## 00000068 -.L80AEDD78: -/* 03168 80AEDD78 C4A00000 */ lwc1 $f0, 0x0000($a1) ## 00000060 -/* 0316C 80AEDD7C 4600103E */ c.le.s $f2, $f0 -/* 03170 80AEDD80 00000000 */ nop -/* 03174 80AEDD84 45020015 */ bc1fl .L80AEDDDC -/* 03178 80AEDD88 94CC0088 */ lhu $t4, 0x0088($a2) ## 00000088 -/* 0317C 80AEDD8C 8D0A0000 */ lw $t2, 0x0000($t0) ## 8015FA90 -/* 03180 80AEDD90 3C0180AF */ lui $at, %hi(D_80AF1C14) ## $at = 80AF0000 -/* 03184 80AEDD94 C4261C14 */ lwc1 $f6, %lo(D_80AF1C14)($at) -/* 03188 80AEDD98 854B147C */ lh $t3, 0x147C($t2) ## 0000147C -/* 0318C 80AEDD9C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 03190 80AEDDA0 448B4000 */ mtc1 $t3, $f8 ## $f8 = 0.00 -/* 03194 80AEDDA4 00000000 */ nop -/* 03198 80AEDDA8 468044A0 */ cvt.s.w $f18, $f8 -/* 0319C 80AEDDAC 460C9102 */ mul.s $f4, $f18, $f12 -/* 031A0 80AEDDB0 46062280 */ add.s $f10, $f4, $f6 -/* 031A4 80AEDDB4 46005407 */ neg.s $f16, $f10 -/* 031A8 80AEDDB8 46100202 */ mul.s $f8, $f0, $f16 -/* 031AC 80AEDDBC E4A80000 */ swc1 $f8, 0x0000($a1) ## 00000060 -/* 031B0 80AEDDC0 0C2BB53F */ jal func_80AED4FC -/* 031B4 80AEDDC4 AFA60018 */ sw $a2, 0x0018($sp) -/* 031B8 80AEDDC8 3C0180AF */ lui $at, %hi(D_80AF1C18) ## $at = 80AF0000 -/* 031BC 80AEDDCC 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 031C0 80AEDDD0 C42C1C18 */ lwc1 $f12, %lo(D_80AF1C18)($at) -/* 031C4 80AEDDD4 8FA60018 */ lw $a2, 0x0018($sp) -.L80AEDDD8: -/* 031C8 80AEDDD8 94CC0088 */ lhu $t4, 0x0088($a2) ## 00000088 -.L80AEDDDC: -/* 031CC 80AEDDDC 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 031D0 80AEDDE0 2508FA90 */ addiu $t0, $t0, 0xFA90 ## $t0 = 8015FA90 -/* 031D4 80AEDDE4 318D0008 */ andi $t5, $t4, 0x0008 ## $t5 = 00000000 -/* 031D8 80AEDDE8 51A0003F */ beql $t5, $zero, .L80AEDEE8 -/* 031DC 80AEDDEC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 031E0 80AEDDF0 C4D20068 */ lwc1 $f18, 0x0068($a2) ## 00000068 -/* 031E4 80AEDDF4 46121032 */ c.eq.s $f2, $f18 -/* 031E8 80AEDDF8 00000000 */ nop -/* 031EC 80AEDDFC 4503003A */ bc1tl .L80AEDEE8 -/* 031F0 80AEDE00 8FBF0014 */ lw $ra, 0x0014($sp) -/* 031F4 80AEDE04 84C2007E */ lh $v0, 0x007E($a2) ## 0000007E -/* 031F8 80AEDE08 84C30032 */ lh $v1, 0x0032($a2) ## 00000032 -/* 031FC 80AEDE0C 34078000 */ ori $a3, $zero, 0x8000 ## $a3 = 00008000 -/* 03200 80AEDE10 00027040 */ sll $t6, $v0, 1 -/* 03204 80AEDE14 01C32023 */ subu $a0, $t6, $v1 -/* 03208 80AEDE18 00827823 */ subu $t7, $a0, $v0 -/* 0320C 80AEDE1C 01E7C021 */ addu $t8, $t7, $a3 -/* 03210 80AEDE20 0018CC00 */ sll $t9, $t8, 16 -/* 03214 80AEDE24 00194C03 */ sra $t1, $t9, 16 -/* 03218 80AEDE28 05200006 */ bltz $t1, .L80AEDE44 -/* 0321C 80AEDE2C 00872821 */ addu $a1, $a0, $a3 -/* 03220 80AEDE30 00872821 */ addu $a1, $a0, $a3 -/* 03224 80AEDE34 00A21823 */ subu $v1, $a1, $v0 -/* 03228 80AEDE38 00031C00 */ sll $v1, $v1, 16 -/* 0322C 80AEDE3C 10000005 */ beq $zero, $zero, .L80AEDE54 -/* 03230 80AEDE40 00031C03 */ sra $v1, $v1, 16 -.L80AEDE44: -/* 03234 80AEDE44 00A21823 */ subu $v1, $a1, $v0 -/* 03238 80AEDE48 00031C00 */ sll $v1, $v1, 16 -/* 0323C 80AEDE4C 00031C03 */ sra $v1, $v1, 16 -/* 03240 80AEDE50 00031823 */ subu $v1, $zero, $v1 -.L80AEDE54: -/* 03244 80AEDE54 28614001 */ slti $at, $v1, 0x4001 -/* 03248 80AEDE58 50200023 */ beql $at, $zero, .L80AEDEE8 -/* 0324C 80AEDE5C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03250 80AEDE60 8D040000 */ lw $a0, 0x0000($t0) ## 8015FA90 -/* 03254 80AEDE64 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 03258 80AEDE68 44818000 */ mtc1 $at, $f16 ## $f16 = 3.00 -/* 0325C 80AEDE6C 848A148A */ lh $t2, 0x148A($a0) ## 0000148A -/* 03260 80AEDE70 24C30068 */ addiu $v1, $a2, 0x0068 ## $v1 = 00000068 -/* 03264 80AEDE74 C4600000 */ lwc1 $f0, 0x0000($v1) ## 00000068 -/* 03268 80AEDE78 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 0326C 80AEDE7C 00000000 */ nop -/* 03270 80AEDE80 468021A0 */ cvt.s.w $f6, $f4 -/* 03274 80AEDE84 460C3282 */ mul.s $f10, $f6, $f12 -/* 03278 80AEDE88 46105200 */ add.s $f8, $f10, $f16 -/* 0327C 80AEDE8C 4600403E */ c.le.s $f8, $f0 -/* 03280 80AEDE90 00000000 */ nop -/* 03284 80AEDE94 4502000D */ bc1fl .L80AEDECC -/* 03288 80AEDE98 E4620000 */ swc1 $f2, 0x0000($v1) ## 00000068 -/* 0328C 80AEDE9C 848B147E */ lh $t3, 0x147E($a0) ## 0000147E -/* 03290 80AEDEA0 3C0180AF */ lui $at, %hi(D_80AF1C1C) ## $at = 80AF0000 -/* 03294 80AEDEA4 C42A1C1C */ lwc1 $f10, %lo(D_80AF1C1C)($at) -/* 03298 80AEDEA8 448B9000 */ mtc1 $t3, $f18 ## $f18 = 0.00 -/* 0329C 80AEDEAC 00000000 */ nop -/* 032A0 80AEDEB0 46809120 */ cvt.s.w $f4, $f18 -/* 032A4 80AEDEB4 460C2182 */ mul.s $f6, $f4, $f12 -/* 032A8 80AEDEB8 460A3400 */ add.s $f16, $f6, $f10 -/* 032AC 80AEDEBC 46100202 */ mul.s $f8, $f0, $f16 -/* 032B0 80AEDEC0 10000002 */ beq $zero, $zero, .L80AEDECC -/* 032B4 80AEDEC4 E4680000 */ swc1 $f8, 0x0000($v1) ## 00000068 -/* 032B8 80AEDEC8 E4620000 */ swc1 $f2, 0x0000($v1) ## 00000068 -.L80AEDECC: -/* 032BC 80AEDECC A4C50032 */ sh $a1, 0x0032($a2) ## 00000032 -/* 032C0 80AEDED0 AFA60018 */ sw $a2, 0x0018($sp) -/* 032C4 80AEDED4 0C2BB53F */ jal func_80AED4FC -/* 032C8 80AEDED8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 032CC 80AEDEDC 0C2BB56E */ jal func_80AED5B8 -/* 032D0 80AEDEE0 8FA40018 */ lw $a0, 0x0018($sp) -/* 032D4 80AEDEE4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AEDEE8: -/* 032D8 80AEDEE8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 032DC 80AEDEEC 03E00008 */ jr $ra -/* 032E0 80AEDEF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDEF4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDEF4.s deleted file mode 100644 index f297f2867b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDEF4.s +++ /dev/null @@ -1,81 +0,0 @@ -.late_rodata -glabel D_80AF1C20 - .float 1.1 - -glabel D_80AF1C24 - .float 0.01 - -glabel D_80AF1C28 - .float 0.98 - -.text -glabel func_80AEDEF4 -/* 032E4 80AEDEF4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 032E8 80AEDEF8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 032EC 80AEDEFC AFBF0014 */ sw $ra, 0x0014($sp) -/* 032F0 80AEDF00 24A407C0 */ addiu $a0, $a1, 0x07C0 ## $a0 = 000007C0 -/* 032F4 80AEDF04 90C5007D */ lbu $a1, 0x007D($a2) ## 0000007D -/* 032F8 80AEDF08 0C00FAE1 */ jal DynaPolyInfo_GetActor - ## DynaPolyInfo_getActor -/* 032FC 80AEDF0C AFA60018 */ sw $a2, 0x0018($sp) -/* 03300 80AEDF10 10400015 */ beq $v0, $zero, .L80AEDF68 -/* 03304 80AEDF14 8FA60018 */ lw $a2, 0x0018($sp) -/* 03308 80AEDF18 844E0000 */ lh $t6, 0x0000($v0) ## 00000000 -/* 0330C 80AEDF1C 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 03310 80AEDF20 24C20068 */ addiu $v0, $a2, 0x0068 ## $v0 = 00000068 -/* 03314 80AEDF24 15C10010 */ bne $t6, $at, .L80AEDF68 -/* 03318 80AEDF28 00000000 */ nop -/* 0331C 80AEDF2C C4400000 */ lwc1 $f0, 0x0000($v0) ## 00000068 -/* 03320 80AEDF30 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 03324 80AEDF34 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 03328 80AEDF38 46002032 */ c.eq.s $f4, $f0 -/* 0332C 80AEDF3C 00000000 */ nop -/* 03330 80AEDF40 45030007 */ bc1tl .L80AEDF60 -/* 03334 80AEDF44 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 03338 80AEDF48 3C0180AF */ lui $at, %hi(D_80AF1C20) ## $at = 80AF0000 -/* 0333C 80AEDF4C C4261C20 */ lwc1 $f6, %lo(D_80AF1C20)($at) -/* 03340 80AEDF50 46060202 */ mul.s $f8, $f0, $f6 -/* 03344 80AEDF54 10000004 */ beq $zero, $zero, .L80AEDF68 -/* 03348 80AEDF58 E4480000 */ swc1 $f8, 0x0000($v0) ## 00000068 -/* 0334C 80AEDF5C 44815000 */ mtc1 $at, $f10 ## $f10 = -0.00 -.L80AEDF60: -/* 03350 80AEDF60 00000000 */ nop -/* 03354 80AEDF64 E44A0000 */ swc1 $f10, 0x0000($v0) ## 00000068 -.L80AEDF68: -/* 03358 80AEDF68 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0335C 80AEDF6C 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 -/* 03360 80AEDF70 3C0180AF */ lui $at, %hi(D_80AF1C24) ## $at = 80AF0000 -/* 03364 80AEDF74 C4221C24 */ lwc1 $f2, %lo(D_80AF1C24)($at) -/* 03368 80AEDF78 846F148A */ lh $t7, 0x148A($v1) ## 8016148A -/* 0336C 80AEDF7C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 03370 80AEDF80 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 -/* 03374 80AEDF84 448F8000 */ mtc1 $t7, $f16 ## $f16 = 0.00 -/* 03378 80AEDF88 24C20068 */ addiu $v0, $a2, 0x0068 ## $v0 = 00000068 -/* 0337C 80AEDF8C C4400000 */ lwc1 $f0, 0x0000($v0) ## 00000068 -/* 03380 80AEDF90 468084A0 */ cvt.s.w $f18, $f16 -/* 03384 80AEDF94 46029102 */ mul.s $f4, $f18, $f2 -/* 03388 80AEDF98 46062200 */ add.s $f8, $f4, $f6 -/* 0338C 80AEDF9C 4600403E */ c.le.s $f8, $f0 -/* 03390 80AEDFA0 00000000 */ nop -/* 03394 80AEDFA4 4502000D */ bc1fl .L80AEDFDC -/* 03398 80AEDFA8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 0339C 80AEDFAC 84781480 */ lh $t8, 0x1480($v1) ## 80161480 -/* 033A0 80AEDFB0 3C0180AF */ lui $at, %hi(D_80AF1C28) ## $at = 80AF0000 -/* 033A4 80AEDFB4 C4241C28 */ lwc1 $f4, %lo(D_80AF1C28)($at) -/* 033A8 80AEDFB8 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 033AC 80AEDFBC 00000000 */ nop -/* 033B0 80AEDFC0 46805420 */ cvt.s.w $f16, $f10 -/* 033B4 80AEDFC4 46028482 */ mul.s $f18, $f16, $f2 -/* 033B8 80AEDFC8 46049180 */ add.s $f6, $f18, $f4 -/* 033BC 80AEDFCC 46060202 */ mul.s $f8, $f0, $f6 -/* 033C0 80AEDFD0 10000004 */ beq $zero, $zero, .L80AEDFE4 -/* 033C4 80AEDFD4 E4480000 */ swc1 $f8, 0x0000($v0) ## 00000068 -/* 033C8 80AEDFD8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -.L80AEDFDC: -/* 033CC 80AEDFDC 00000000 */ nop -/* 033D0 80AEDFE0 E44A0000 */ swc1 $f10, 0x0000($v0) ## 00000068 -.L80AEDFE4: -/* 033D4 80AEDFE4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 033D8 80AEDFE8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 033DC 80AEDFEC 03E00008 */ jr $ra -/* 033E0 80AEDFF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDFF4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDFF4.s deleted file mode 100644 index 3223db645b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDFF4.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80AEDFF4 -/* 033E4 80AEDFF4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 033E8 80AEDFF8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 033EC 80AEDFFC AFA40018 */ sw $a0, 0x0018($sp) -/* 033F0 80AEE000 0C2BB6CC */ jal func_80AEDB30 -/* 033F4 80AEE004 AFA5001C */ sw $a1, 0x001C($sp) -/* 033F8 80AEE008 8FA40018 */ lw $a0, 0x0018($sp) -/* 033FC 80AEE00C 0C2BB7BD */ jal func_80AEDEF4 -/* 03400 80AEE010 8FA5001C */ lw $a1, 0x001C($sp) -/* 03404 80AEE014 0C00B638 */ jal Actor_MoveForward - -/* 03408 80AEE018 8FA40018 */ lw $a0, 0x0018($sp) -/* 0340C 80AEE01C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03410 80AEE020 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03414 80AEE024 03E00008 */ jr $ra -/* 03418 80AEE028 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE02C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE02C.s deleted file mode 100644 index a1c3f4d90c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE02C.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80AEE02C -/* 0341C 80AEE02C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 03420 80AEE030 00000000 */ nop -/* 03424 80AEE034 E480005C */ swc1 $f0, 0x005C($a0) ## 0000005C -/* 03428 80AEE038 E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 -/* 0342C 80AEE03C E4800064 */ swc1 $f0, 0x0064($a0) ## 00000064 -/* 03430 80AEE040 E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 -/* 03434 80AEE044 E480006C */ swc1 $f0, 0x006C($a0) ## 0000006C -/* 03438 80AEE048 03E00008 */ jr $ra -/* 0343C 80AEE04C E4800070 */ swc1 $f0, 0x0070($a0) ## 00000070 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE050.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE050.s deleted file mode 100644 index b4d03600c7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE050.s +++ /dev/null @@ -1,158 +0,0 @@ -.late_rodata -glabel D_80AF1C2C - .float 0.2 - -glabel D_80AF1C30 - .float -0.1 -glabel D_80AF1C34 - .float 0.1 - -glabel D_80AF1C38 - .float 0.95 - -.text -glabel func_80AEE050 -/* 03440 80AEE050 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 03444 80AEE054 AFBF001C */ sw $ra, 0x001C($sp) -/* 03448 80AEE058 AFB00018 */ sw $s0, 0x0018($sp) -/* 0344C 80AEE05C 8C820350 */ lw $v0, 0x0350($a0) ## 00000350 -/* 03450 80AEE060 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03454 80AEE064 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03458 80AEE068 14400049 */ bne $v0, $zero, .L80AEE190 -/* 0345C 80AEE06C 00000000 */ nop -/* 03460 80AEE070 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 03464 80AEE074 C4820070 */ lwc1 $f2, 0x0070($a0) ## 00000070 -/* 03468 80AEE078 3C0180AF */ lui $at, %hi(D_80AF1C2C) ## $at = 80AF0000 -/* 0346C 80AEE07C 46020032 */ c.eq.s $f0, $f2 -/* 03470 80AEE080 00000000 */ nop -/* 03474 80AEE084 45000017 */ bc1f .L80AEE0E4 -/* 03478 80AEE088 00000000 */ nop -/* 0347C 80AEE08C C4840068 */ lwc1 $f4, 0x0068($a0) ## 00000068 -/* 03480 80AEE090 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 03484 80AEE094 46040032 */ c.eq.s $f0, $f4 -/* 03488 80AEE098 00000000 */ nop -/* 0348C 80AEE09C 45000011 */ bc1f .L80AEE0E4 -/* 03490 80AEE0A0 00000000 */ nop -/* 03494 80AEE0A4 0C2BB80B */ jal func_80AEE02C -/* 03498 80AEE0A8 AC8E0350 */ sw $t6, 0x0350($a0) ## 00000350 -/* 0349C 80AEE0AC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 034A0 80AEE0B0 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 034A4 80AEE0B4 C6060084 */ lwc1 $f6, 0x0084($s0) ## 00000084 -/* 034A8 80AEE0B8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 034AC 80AEE0BC 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 034B0 80AEE0C0 46083281 */ sub.s $f10, $f6, $f8 -/* 034B4 80AEE0C4 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 034B8 80AEE0C8 A600035C */ sh $zero, 0x035C($s0) ## 0000035C -/* 034BC 80AEE0CC 46105482 */ mul.s $f18, $f10, $f16 -/* 034C0 80AEE0D0 E6120358 */ swc1 $f18, 0x0358($s0) ## 00000358 -/* 034C4 80AEE0D4 C6060358 */ lwc1 $f6, 0x0358($s0) ## 00000358 -/* 034C8 80AEE0D8 46062200 */ add.s $f8, $f4, $f6 -/* 034CC 80AEE0DC 1000005C */ beq $zero, $zero, .L80AEE250 -/* 034D0 80AEE0E0 E6080354 */ swc1 $f8, 0x0354($s0) ## 00000354 -.L80AEE0E4: -/* 034D4 80AEE0E4 C42C1C2C */ lwc1 $f12, %lo(D_80AF1C2C)($at) -/* 034D8 80AEE0E8 C6100060 */ lwc1 $f16, 0x0060($s0) ## 00000060 -/* 034DC 80AEE0EC E600006C */ swc1 $f0, 0x006C($s0) ## 0000006C -/* 034E0 80AEE0F0 460C1282 */ mul.s $f10, $f2, $f12 -/* 034E4 80AEE0F4 3C0180AF */ lui $at, %hi(D_80AF1C30) ## $at = 80AF0000 -/* 034E8 80AEE0F8 460C8482 */ mul.s $f18, $f16, $f12 -/* 034EC 80AEE0FC E60A0070 */ swc1 $f10, 0x0070($s0) ## 00000070 -/* 034F0 80AEE100 C6040070 */ lwc1 $f4, 0x0070($s0) ## 00000070 -/* 034F4 80AEE104 E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060 -/* 034F8 80AEE108 C4261C30 */ lwc1 $f6, %lo(D_80AF1C30)($at) -/* 034FC 80AEE10C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 03500 80AEE110 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 -/* 03504 80AEE114 4604303E */ c.le.s $f6, $f4 -/* 03508 80AEE118 00000000 */ nop -/* 0350C 80AEE11C 45020004 */ bc1fl .L80AEE130 -/* 03510 80AEE120 C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 -/* 03514 80AEE124 E6000070 */ swc1 $f0, 0x0070($s0) ## 00000070 -/* 03518 80AEE128 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 -/* 0351C 80AEE12C C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 -.L80AEE130: -/* 03520 80AEE130 3C0180AF */ lui $at, %hi(D_80AF1C34) ## $at = 80AF0000 -/* 03524 80AEE134 460A4402 */ mul.s $f16, $f8, $f10 -/* 03528 80AEE138 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 0352C 80AEE13C C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 03530 80AEE140 C4321C34 */ lwc1 $f18, %lo(D_80AF1C34)($at) -/* 03534 80AEE144 4612203E */ c.le.s $f4, $f18 -/* 03538 80AEE148 00000000 */ nop -/* 0353C 80AEE14C 45000002 */ bc1f .L80AEE158 -/* 03540 80AEE150 00000000 */ nop -/* 03544 80AEE154 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -.L80AEE158: -/* 03548 80AEE158 0C01DE1C */ jal Math_Sins - ## sins? -/* 0354C 80AEE15C 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 03550 80AEE160 C6060068 */ lwc1 $f6, 0x0068($s0) ## 00000068 -/* 03554 80AEE164 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 03558 80AEE168 46060202 */ mul.s $f8, $f0, $f6 -/* 0355C 80AEE16C 0C01DE0D */ jal Math_Coss - ## coss? -/* 03560 80AEE170 E608005C */ swc1 $f8, 0x005C($s0) ## 0000005C -/* 03564 80AEE174 C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 -/* 03568 80AEE178 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0356C 80AEE17C 460A0402 */ mul.s $f16, $f0, $f10 -/* 03570 80AEE180 0C00B5FB */ jal func_8002D7EC -/* 03574 80AEE184 E6100064 */ swc1 $f16, 0x0064($s0) ## 00000064 -/* 03578 80AEE188 10000032 */ beq $zero, $zero, .L80AEE254 -/* 0357C 80AEE18C 8FBF001C */ lw $ra, 0x001C($sp) -.L80AEE190: -/* 03580 80AEE190 14410022 */ bne $v0, $at, .L80AEE21C -/* 03584 80AEE194 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 03588 80AEE198 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 0358C 80AEE19C C6000358 */ lwc1 $f0, 0x0358($s0) ## 00000358 -/* 03590 80AEE1A0 4612003E */ c.le.s $f0, $f18 -/* 03594 80AEE1A4 00000000 */ nop -/* 03598 80AEE1A8 45020009 */ bc1fl .L80AEE1D0 -/* 0359C 80AEE1AC E7A00028 */ swc1 $f0, 0x0028($sp) -/* 035A0 80AEE1B0 0C2BB80B */ jal func_80AEE02C -/* 035A4 80AEE1B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 035A8 80AEE1B8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 035AC 80AEE1BC 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 035B0 80AEE1C0 AE0F0350 */ sw $t7, 0x0350($s0) ## 00000350 -/* 035B4 80AEE1C4 10000022 */ beq $zero, $zero, .L80AEE250 -/* 035B8 80AEE1C8 E6000360 */ swc1 $f0, 0x0360($s0) ## 00000360 -/* 035BC 80AEE1CC E7A00028 */ swc1 $f0, 0x0028($sp) -.L80AEE1D0: -/* 035C0 80AEE1D0 C6040354 */ lwc1 $f4, 0x0354($s0) ## 00000354 -/* 035C4 80AEE1D4 E7A40024 */ swc1 $f4, 0x0024($sp) -/* 035C8 80AEE1D8 0C01DE0D */ jal Math_Coss - ## coss? -/* 035CC 80AEE1DC 8604035C */ lh $a0, 0x035C($s0) ## 0000035C -/* 035D0 80AEE1E0 C7A60028 */ lwc1 $f6, 0x0028($sp) -/* 035D4 80AEE1E4 C7B00024 */ lwc1 $f16, 0x0024($sp) -/* 035D8 80AEE1E8 8618035C */ lh $t8, 0x035C($s0) ## 0000035C -/* 035DC 80AEE1EC 46003207 */ neg.s $f8, $f6 -/* 035E0 80AEE1F0 3C0180AF */ lui $at, %hi(D_80AF1C38) ## $at = 80AF0000 -/* 035E4 80AEE1F4 46080282 */ mul.s $f10, $f0, $f8 -/* 035E8 80AEE1F8 271903E8 */ addiu $t9, $t8, 0x03E8 ## $t9 = 000003E8 -/* 035EC 80AEE1FC A619035C */ sh $t9, 0x035C($s0) ## 0000035C -/* 035F0 80AEE200 C6040358 */ lwc1 $f4, 0x0358($s0) ## 00000358 -/* 035F4 80AEE204 46105480 */ add.s $f18, $f10, $f16 -/* 035F8 80AEE208 E6120028 */ swc1 $f18, 0x0028($s0) ## 00000028 -/* 035FC 80AEE20C C4261C38 */ lwc1 $f6, %lo(D_80AF1C38)($at) -/* 03600 80AEE210 46062202 */ mul.s $f8, $f4, $f6 -/* 03604 80AEE214 1000000E */ beq $zero, $zero, .L80AEE250 -/* 03608 80AEE218 E6080358 */ swc1 $f8, 0x0358($s0) ## 00000358 -.L80AEE21C: -/* 0360C 80AEE21C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 03610 80AEE220 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 03614 80AEE224 C60A0360 */ lwc1 $f10, 0x0360($s0) ## 00000360 -/* 03618 80AEE228 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0361C 80AEE22C 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 03620 80AEE230 46105480 */ add.s $f18, $f10, $f16 -/* 03624 80AEE234 E6120360 */ swc1 $f18, 0x0360($s0) ## 00000360 -/* 03628 80AEE238 C6040360 */ lwc1 $f4, 0x0360($s0) ## 00000360 -/* 0362C 80AEE23C 4604003C */ c.lt.s $f0, $f4 -/* 03630 80AEE240 00000000 */ nop -/* 03634 80AEE244 45020003 */ bc1fl .L80AEE254 -/* 03638 80AEE248 8FBF001C */ lw $ra, 0x001C($sp) -/* 0363C 80AEE24C AE080350 */ sw $t0, 0x0350($s0) ## 00000350 -.L80AEE250: -/* 03640 80AEE250 8FBF001C */ lw $ra, 0x001C($sp) -.L80AEE254: -/* 03644 80AEE254 8FB00018 */ lw $s0, 0x0018($sp) -/* 03648 80AEE258 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0364C 80AEE25C 03E00008 */ jr $ra -/* 03650 80AEE260 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE264.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE264.s deleted file mode 100644 index 09aaab200a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE264.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80AEE264 -/* 03654 80AEE264 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03658 80AEE268 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0365C 80AEE26C AFA40018 */ sw $a0, 0x0018($sp) -/* 03660 80AEE270 0C00BC65 */ jal func_8002F194 -/* 03664 80AEE274 AFA5001C */ sw $a1, 0x001C($sp) -/* 03668 80AEE278 8FA40018 */ lw $a0, 0x0018($sp) -/* 0366C 80AEE27C 14400019 */ bne $v0, $zero, .L80AEE2E4 -/* 03670 80AEE280 8FA5001C */ lw $a1, 0x001C($sp) -/* 03674 80AEE284 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 03678 80AEE288 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0367C 80AEE28C 2419404E */ addiu $t9, $zero, 0x404E ## $t9 = 0000404E -/* 03680 80AEE290 35CF0009 */ ori $t7, $t6, 0x0009 ## $t7 = 00000009 -/* 03684 80AEE294 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 03688 80AEE298 9442F580 */ lhu $v0, -0x0A80($v0) ## 8015F580 -/* 0368C 80AEE29C 30580008 */ andi $t8, $v0, 0x0008 ## $t8 = 00000000 -/* 03690 80AEE2A0 13000005 */ beq $t8, $zero, .L80AEE2B8 -/* 03694 80AEE2A4 30480004 */ andi $t0, $v0, 0x0004 ## $t0 = 00000000 -/* 03698 80AEE2A8 0C00BCBD */ jal func_8002F2F4 -/* 0369C 80AEE2AC A499010E */ sh $t9, 0x010E($a0) ## 0000010E -/* 036A0 80AEE2B0 1000000D */ beq $zero, $zero, .L80AEE2E8 -/* 036A4 80AEE2B4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AEE2B8: -/* 036A8 80AEE2B8 11000006 */ beq $t0, $zero, .L80AEE2D4 -/* 036AC 80AEE2BC 240A404C */ addiu $t2, $zero, 0x404C ## $t2 = 0000404C -/* 036B0 80AEE2C0 2409404D */ addiu $t1, $zero, 0x404D ## $t1 = 0000404D -/* 036B4 80AEE2C4 0C00BCBD */ jal func_8002F2F4 -/* 036B8 80AEE2C8 A489010E */ sh $t1, 0x010E($a0) ## 0000010E -/* 036BC 80AEE2CC 10000006 */ beq $zero, $zero, .L80AEE2E8 -/* 036C0 80AEE2D0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AEE2D4: -/* 036C4 80AEE2D4 0C00BCBD */ jal func_8002F2F4 -/* 036C8 80AEE2D8 A48A010E */ sh $t2, 0x010E($a0) ## 0000010E -/* 036CC 80AEE2DC 10000002 */ beq $zero, $zero, .L80AEE2E8 -/* 036D0 80AEE2E0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AEE2E4: -/* 036D4 80AEE2E4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AEE2E8: -/* 036D8 80AEE2E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 036DC 80AEE2EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 036E0 80AEE2F0 03E00008 */ jr $ra -/* 036E4 80AEE2F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE2F8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE2F8.s deleted file mode 100644 index 33d42acbfa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE2F8.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80AEE2F8 -/* 036E8 80AEE2F8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 036EC 80AEE2FC AFBF0014 */ sw $ra, 0x0014($sp) -/* 036F0 80AEE300 948E0088 */ lhu $t6, 0x0088($a0) ## 00000088 -/* 036F4 80AEE304 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 036F8 80AEE308 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 036FC 80AEE30C 11E00018 */ beq $t7, $zero, .L80AEE370 -/* 03700 80AEE310 00000000 */ nop -/* 03704 80AEE314 9082007D */ lbu $v0, 0x007D($a0) ## 0000007D -/* 03708 80AEE318 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 0370C 80AEE31C 10410014 */ beq $v0, $at, .L80AEE370 -/* 03710 80AEE320 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 03714 80AEE324 0C00FAE1 */ jal DynaPolyInfo_GetActor - ## DynaPolyInfo_getActor -/* 03718 80AEE328 24C407C0 */ addiu $a0, $a2, 0x07C0 ## $a0 = 000007C0 -/* 0371C 80AEE32C 10400010 */ beq $v0, $zero, .L80AEE370 -/* 03720 80AEE330 00000000 */ nop -/* 03724 80AEE334 84580000 */ lh $t8, 0x0000($v0) ## 00000000 -/* 03728 80AEE338 240100E6 */ addiu $at, $zero, 0x00E6 ## $at = 000000E6 -/* 0372C 80AEE33C 1701000C */ bne $t8, $at, .L80AEE370 -/* 03730 80AEE340 00000000 */ nop -/* 03734 80AEE344 8459001C */ lh $t9, 0x001C($v0) ## 0000001C -/* 03738 80AEE348 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0373C 80AEE34C 24010038 */ addiu $at, $zero, 0x0038 ## $at = 00000038 -/* 03740 80AEE350 00194203 */ sra $t0, $t9, 8 -/* 03744 80AEE354 3109003F */ andi $t1, $t0, 0x003F ## $t1 = 00000000 -/* 03748 80AEE358 15210005 */ bne $t1, $at, .L80AEE370 -/* 0374C 80AEE35C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 03750 80AEE360 944A0F20 */ lhu $t2, 0x0F20($v0) ## 8015F580 -/* 03754 80AEE364 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 03758 80AEE368 10000006 */ beq $zero, $zero, .L80AEE384 -/* 0375C 80AEE36C A44B0F20 */ sh $t3, 0x0F20($v0) ## 8015F580 -.L80AEE370: -/* 03760 80AEE370 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 03764 80AEE374 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 03768 80AEE378 944C0F20 */ lhu $t4, 0x0F20($v0) ## 8015F580 -/* 0376C 80AEE37C 318DFFFE */ andi $t5, $t4, 0xFFFE ## $t5 = 00000000 -/* 03770 80AEE380 A44D0F20 */ sh $t5, 0x0F20($v0) ## 8015F580 -.L80AEE384: -/* 03774 80AEE384 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03778 80AEE388 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0377C 80AEE38C 03E00008 */ jr $ra -/* 03780 80AEE390 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE394.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE394.s deleted file mode 100644 index e160ed10e6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE394.s +++ /dev/null @@ -1,65 +0,0 @@ -glabel func_80AEE394 -/* 03784 80AEE394 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03788 80AEE398 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0378C 80AEE39C AFA5002C */ sw $a1, 0x002C($sp) -/* 03790 80AEE3A0 948E0088 */ lhu $t6, 0x0088($a0) ## 00000088 -/* 03794 80AEE3A4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 03798 80AEE3A8 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 0379C 80AEE3AC 51E00032 */ beql $t7, $zero, .L80AEE478 -/* 037A0 80AEE3B0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 037A4 80AEE3B4 9082007D */ lbu $v0, 0x007D($a0) ## 0000007D -/* 037A8 80AEE3B8 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 037AC 80AEE3BC 8FA4002C */ lw $a0, 0x002C($sp) -/* 037B0 80AEE3C0 1041002C */ beq $v0, $at, .L80AEE474 -/* 037B4 80AEE3C4 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 037B8 80AEE3C8 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 037BC 80AEE3CC 0C00FAE1 */ jal DynaPolyInfo_GetActor - ## DynaPolyInfo_getActor -/* 037C0 80AEE3D0 AFA60028 */ sw $a2, 0x0028($sp) -/* 037C4 80AEE3D4 8FA60028 */ lw $a2, 0x0028($sp) -/* 037C8 80AEE3D8 10400026 */ beq $v0, $zero, .L80AEE474 -/* 037CC 80AEE3DC AFA20018 */ sw $v0, 0x0018($sp) -/* 037D0 80AEE3E0 84580000 */ lh $t8, 0x0000($v0) ## 00000000 -/* 037D4 80AEE3E4 240100C8 */ addiu $at, $zero, 0x00C8 ## $at = 000000C8 -/* 037D8 80AEE3E8 57010023 */ bnel $t8, $at, .L80AEE478 -/* 037DC 80AEE3EC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 037E0 80AEE3F0 8459001C */ lh $t9, 0x001C($v0) ## 0000001C -/* 037E4 80AEE3F4 8FA4002C */ lw $a0, 0x002C($sp) -/* 037E8 80AEE3F8 5720001F */ bnel $t9, $zero, .L80AEE478 -/* 037EC 80AEE3FC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 037F0 80AEE400 0C023A62 */ jal func_8008E988 -/* 037F4 80AEE404 AFA60028 */ sw $a2, 0x0028($sp) -/* 037F8 80AEE408 1440001A */ bne $v0, $zero, .L80AEE474 -/* 037FC 80AEE40C 8FA60028 */ lw $a2, 0x0028($sp) -/* 03800 80AEE410 8FA8002C */ lw $t0, 0x002C($sp) -/* 03804 80AEE414 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 -/* 03808 80AEE418 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0380C 80AEE41C 01284821 */ addu $t1, $t1, $t0 -/* 03810 80AEE420 8D2903D8 */ lw $t1, 0x03D8($t1) ## 000103D8 -/* 03814 80AEE424 55200014 */ bnel $t1, $zero, .L80AEE478 -/* 03818 80AEE428 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0381C 80AEE42C 0C2BB80B */ jal func_80AEE02C -/* 03820 80AEE430 AFA60028 */ sw $a2, 0x0028($sp) -/* 03824 80AEE434 8FAB002C */ lw $t3, 0x002C($sp) -/* 03828 80AEE438 8FA60028 */ lw $a2, 0x0028($sp) -/* 0382C 80AEE43C 3C0A80AF */ lui $t2, %hi(D_80AF10A4) ## $t2 = 80AF0000 -/* 03830 80AEE440 254A10A4 */ addiu $t2, $t2, %lo(D_80AF10A4) ## $t2 = 80AF10A4 -/* 03834 80AEE444 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 03838 80AEE448 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 0383C 80AEE44C AD6A1D68 */ sw $t2, 0x1D68($t3) ## 00001D68 -/* 03840 80AEE450 A02CFA74 */ sb $t4, -0x058C($at) ## 8015FA74 -/* 03844 80AEE454 240D0024 */ addiu $t5, $zero, 0x0024 ## $t5 = 00000024 -/* 03848 80AEE458 ACCD0264 */ sw $t5, 0x0264($a2) ## 00000264 -/* 0384C 80AEE45C ACC00268 */ sw $zero, 0x0268($a2) ## 00000268 -/* 03850 80AEE460 8FAE0018 */ lw $t6, 0x0018($sp) -/* 03854 80AEE464 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 03858 80AEE468 A0C000C8 */ sb $zero, 0x00C8($a2) ## 000000C8 -/* 0385C 80AEE46C 10000002 */ beq $zero, $zero, .L80AEE478 -/* 03860 80AEE470 ACCE028C */ sw $t6, 0x028C($a2) ## 0000028C -.L80AEE474: -/* 03864 80AEE474 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AEE478: -/* 03868 80AEE478 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0386C 80AEE47C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03870 80AEE480 03E00008 */ jr $ra -/* 03874 80AEE484 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE488.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE488.s deleted file mode 100644 index ecbead59f4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE488.s +++ /dev/null @@ -1,70 +0,0 @@ -.late_rodata -glabel D_80AF1C3C - .float 0.01 - -glabel D_80AF1C40 - .float 6.8 -glabel D_80AF1C44 - .float 1.3 - -.text -glabel func_80AEE488 -/* 03878 80AEE488 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0387C 80AEE48C AFBF0014 */ sw $ra, 0x0014($sp) -/* 03880 80AEE490 AFA40018 */ sw $a0, 0x0018($sp) -/* 03884 80AEE494 0C00BD04 */ jal func_8002F410 -/* 03888 80AEE498 AFA5001C */ sw $a1, 0x001C($sp) -/* 0388C 80AEE49C 8FA40018 */ lw $a0, 0x0018($sp) -/* 03890 80AEE4A0 1040000A */ beq $v0, $zero, .L80AEE4CC -/* 03894 80AEE4A4 8FA5001C */ lw $a1, 0x001C($sp) -/* 03898 80AEE4A8 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 0389C 80AEE4AC 00451021 */ addu $v0, $v0, $a1 -/* 038A0 80AEE4B0 80421CBC */ lb $v0, 0x1CBC($v0) ## 00011CBC -/* 038A4 80AEE4B4 240E001F */ addiu $t6, $zero, 0x001F ## $t6 = 0000001F -/* 038A8 80AEE4B8 AC8E0264 */ sw $t6, 0x0264($a0) ## 00000264 -/* 038AC 80AEE4BC 0C2BB548 */ jal func_80AED520 -/* 038B0 80AEE4C0 A0820286 */ sb $v0, 0x0286($a0) ## 00000286 -/* 038B4 80AEE4C4 10000025 */ beq $zero, $zero, .L80AEE55C -/* 038B8 80AEE4C8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AEE4CC: -/* 038BC 80AEE4CC 0C2BB8E5 */ jal func_80AEE394 -/* 038C0 80AEE4D0 AFA40018 */ sw $a0, 0x0018($sp) -/* 038C4 80AEE4D4 14400020 */ bne $v0, $zero, .L80AEE558 -/* 038C8 80AEE4D8 8FA40018 */ lw $a0, 0x0018($sp) -/* 038CC 80AEE4DC 948F0088 */ lhu $t7, 0x0088($a0) ## 00000088 -/* 038D0 80AEE4E0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 038D4 80AEE4E4 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 -/* 038D8 80AEE4E8 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 038DC 80AEE4EC 5700001B */ bnel $t8, $zero, .L80AEE55C -/* 038E0 80AEE4F0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 038E4 80AEE4F4 8C590000 */ lw $t9, 0x0000($v0) ## 8015FA90 -/* 038E8 80AEE4F8 3C0180AF */ lui $at, %hi(D_80AF1C3C) ## $at = 80AF0000 -/* 038EC 80AEE4FC C4201C3C */ lwc1 $f0, %lo(D_80AF1C3C)($at) -/* 038F0 80AEE500 87281484 */ lh $t0, 0x1484($t9) ## 00001484 -/* 038F4 80AEE504 3C0180AF */ lui $at, %hi(D_80AF1C40) ## $at = 80AF0000 -/* 038F8 80AEE508 C42A1C40 */ lwc1 $f10, %lo(D_80AF1C40)($at) -/* 038FC 80AEE50C 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 03900 80AEE510 3C0180AF */ lui $at, %hi(D_80AF1C44) ## $at = 80AF0000 -/* 03904 80AEE514 240B001C */ addiu $t3, $zero, 0x001C ## $t3 = 0000001C -/* 03908 80AEE518 468021A0 */ cvt.s.w $f6, $f4 -/* 0390C 80AEE51C 46003202 */ mul.s $f8, $f6, $f0 -/* 03910 80AEE520 460A4400 */ add.s $f16, $f8, $f10 -/* 03914 80AEE524 46008487 */ neg.s $f18, $f16 -/* 03918 80AEE528 E4920070 */ swc1 $f18, 0x0070($a0) ## 00000070 -/* 0391C 80AEE52C 8C490000 */ lw $t1, 0x0000($v0) ## 8015FA90 -/* 03920 80AEE530 C42A1C44 */ lwc1 $f10, %lo(D_80AF1C44)($at) -/* 03924 80AEE534 852A1482 */ lh $t2, 0x1482($t1) ## 00001482 -/* 03928 80AEE538 AC8B0264 */ sw $t3, 0x0264($a0) ## 00000264 -/* 0392C 80AEE53C 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 03930 80AEE540 00000000 */ nop -/* 03934 80AEE544 468021A0 */ cvt.s.w $f6, $f4 -/* 03938 80AEE548 46003202 */ mul.s $f8, $f6, $f0 -/* 0393C 80AEE54C 460A4400 */ add.s $f16, $f8, $f10 -/* 03940 80AEE550 46008487 */ neg.s $f18, $f16 -/* 03944 80AEE554 E492006C */ swc1 $f18, 0x006C($a0) ## 0000006C -.L80AEE558: -/* 03948 80AEE558 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AEE55C: -/* 0394C 80AEE55C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03950 80AEE560 03E00008 */ jr $ra -/* 03954 80AEE564 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE568.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE568.s deleted file mode 100644 index aedcbafbd7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE568.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_80AEE568 -/* 03958 80AEE568 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0395C 80AEE56C AFBF001C */ sw $ra, 0x001C($sp) -/* 03960 80AEE570 AFB00018 */ sw $s0, 0x0018($sp) -/* 03964 80AEE574 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03968 80AEE578 0C2BB8E5 */ jal func_80AEE394 -/* 0396C 80AEE57C AFA50024 */ sw $a1, 0x0024($sp) -/* 03970 80AEE580 54400025 */ bnel $v0, $zero, .L80AEE618 -/* 03974 80AEE584 8FBF001C */ lw $ra, 0x001C($sp) -/* 03978 80AEE588 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 -/* 0397C 80AEE58C 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 03980 80AEE590 51E00018 */ beql $t7, $zero, .L80AEE5F4 -/* 03984 80AEE594 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 03988 80AEE598 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0398C 80AEE59C C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 03990 80AEE5A0 46040032 */ c.eq.s $f0, $f4 -/* 03994 80AEE5A4 00000000 */ nop -/* 03998 80AEE5A8 45020012 */ bc1fl .L80AEE5F4 -/* 0399C 80AEE5AC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 039A0 80AEE5B0 C6060070 */ lwc1 $f6, 0x0070($s0) ## 00000070 -/* 039A4 80AEE5B4 46060032 */ c.eq.s $f0, $f6 -/* 039A8 80AEE5B8 00000000 */ nop -/* 039AC 80AEE5BC 4502000D */ bc1fl .L80AEE5F4 -/* 039B0 80AEE5C0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 039B4 80AEE5C4 0C2BB80B */ jal func_80AEE02C -/* 039B8 80AEE5C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 039BC 80AEE5CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 039C0 80AEE5D0 0C00BD60 */ jal func_8002F580 -/* 039C4 80AEE5D4 8FA50024 */ lw $a1, 0x0024($sp) -/* 039C8 80AEE5D8 2418001B */ addiu $t8, $zero, 0x001B ## $t8 = 0000001B -/* 039CC 80AEE5DC AE180264 */ sw $t8, 0x0264($s0) ## 00000264 -/* 039D0 80AEE5E0 0C2BAB76 */ jal func_80AEADD8 -/* 039D4 80AEE5E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 039D8 80AEE5E8 1000000B */ beq $zero, $zero, .L80AEE618 -/* 039DC 80AEE5EC 8FBF001C */ lw $ra, 0x001C($sp) -/* 039E0 80AEE5F0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -.L80AEE5F4: -/* 039E4 80AEE5F4 C6080084 */ lwc1 $f8, 0x0084($s0) ## 00000084 -/* 039E8 80AEE5F8 2419001D */ addiu $t9, $zero, 0x001D ## $t9 = 0000001D -/* 039EC 80AEE5FC 4608003C */ c.lt.s $f0, $f8 -/* 039F0 80AEE600 00000000 */ nop -/* 039F4 80AEE604 45020004 */ bc1fl .L80AEE618 -/* 039F8 80AEE608 8FBF001C */ lw $ra, 0x001C($sp) -/* 039FC 80AEE60C AE190264 */ sw $t9, 0x0264($s0) ## 00000264 -/* 03A00 80AEE610 AE000350 */ sw $zero, 0x0350($s0) ## 00000350 -/* 03A04 80AEE614 8FBF001C */ lw $ra, 0x001C($sp) -.L80AEE618: -/* 03A08 80AEE618 8FB00018 */ lw $s0, 0x0018($sp) -/* 03A0C 80AEE61C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03A10 80AEE620 03E00008 */ jr $ra -/* 03A14 80AEE624 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE628.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE628.s deleted file mode 100644 index dff390a67e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE628.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80AEE628 -/* 03A18 80AEE628 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 03A1C 80AEE62C 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 03A20 80AEE630 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03A24 80AEE634 AFA40038 */ sw $a0, 0x0038($sp) -/* 03A28 80AEE638 01C57021 */ addu $t6, $t6, $a1 -/* 03A2C 80AEE63C 81CE1CBC */ lb $t6, 0x1CBC($t6) ## 00011CBC -/* 03A30 80AEE640 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03A34 80AEE644 0C2BABCE */ jal func_80AEAF38 -/* 03A38 80AEE648 A3AE002F */ sb $t6, 0x002F($sp) -/* 03A3C 80AEE64C 10400019 */ beq $v0, $zero, .L80AEE6B4 -/* 03A40 80AEE650 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 03A44 80AEE654 0C028800 */ jal SkelAnime_GetFrameCount - -/* 03A48 80AEE658 24846B9C */ addiu $a0, $a0, 0x6B9C ## $a0 = 06006B9C -/* 03A4C 80AEE65C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 03A50 80AEE660 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 03A54 80AEE664 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 03A58 80AEE668 468021A0 */ cvt.s.w $f6, $f4 -/* 03A5C 80AEE66C 8FA40038 */ lw $a0, 0x0038($sp) -/* 03A60 80AEE670 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 03A64 80AEE674 24A56B9C */ addiu $a1, $a1, 0x6B9C ## $a1 = 06006B9C -/* 03A68 80AEE678 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03A6C 80AEE67C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 03A70 80AEE680 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 03A74 80AEE684 AFA00014 */ sw $zero, 0x0014($sp) -/* 03A78 80AEE688 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 03A7C 80AEE68C 0C029468 */ jal SkelAnime_ChangeAnim - -/* 03A80 80AEE690 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03A84 80AEE694 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 03A88 80AEE698 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 03A8C 80AEE69C 944F0F20 */ lhu $t7, 0x0F20($v0) ## 8015F580 -/* 03A90 80AEE6A0 8FA80038 */ lw $t0, 0x0038($sp) -/* 03A94 80AEE6A4 2419001F */ addiu $t9, $zero, 0x001F ## $t9 = 0000001F -/* 03A98 80AEE6A8 35F80010 */ ori $t8, $t7, 0x0010 ## $t8 = 00000010 -/* 03A9C 80AEE6AC A4580F20 */ sh $t8, 0x0F20($v0) ## 8015F580 -/* 03AA0 80AEE6B0 AD190264 */ sw $t9, 0x0264($t0) ## 00000264 -.L80AEE6B4: -/* 03AA4 80AEE6B4 83A9002F */ lb $t1, 0x002F($sp) -/* 03AA8 80AEE6B8 8FAA0038 */ lw $t2, 0x0038($sp) -/* 03AAC 80AEE6BC A1490286 */ sb $t1, 0x0286($t2) ## 00000286 -/* 03AB0 80AEE6C0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03AB4 80AEE6C4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 03AB8 80AEE6C8 03E00008 */ jr $ra -/* 03ABC 80AEE6CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE6D0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE6D0.s deleted file mode 100644 index 2ccfea6b7f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE6D0.s +++ /dev/null @@ -1,68 +0,0 @@ -glabel func_80AEE6D0 -/* 03AC0 80AEE6D0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 03AC4 80AEE6D4 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 03AC8 80AEE6D8 95EFF580 */ lhu $t7, -0x0A80($t7) ## 8015F580 -/* 03ACC 80AEE6DC 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 03AD0 80AEE6E0 AFBF002C */ sw $ra, 0x002C($sp) -/* 03AD4 80AEE6E4 AFB00028 */ sw $s0, 0x0028($sp) -/* 03AD8 80AEE6E8 01C57021 */ addu $t6, $t6, $a1 -/* 03ADC 80AEE6EC 81CE1CBC */ lb $t6, 0x1CBC($t6) ## 00011CBC -/* 03AE0 80AEE6F0 31F80010 */ andi $t8, $t7, 0x0010 ## $t8 = 00000000 -/* 03AE4 80AEE6F4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03AE8 80AEE6F8 1700002A */ bne $t8, $zero, .L80AEE7A4 -/* 03AEC 80AEE6FC A3AE0033 */ sb $t6, 0x0033($sp) -/* 03AF0 80AEE700 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03AF4 80AEE704 0C2BAC49 */ jal func_80AEB124 -/* 03AF8 80AEE708 AFA5003C */ sw $a1, 0x003C($sp) -/* 03AFC 80AEE70C 50400026 */ beql $v0, $zero, .L80AEE7A8 -/* 03B00 80AEE710 83AC0033 */ lb $t4, 0x0033($sp) -/* 03B04 80AEE714 0C023A62 */ jal func_8008E988 -/* 03B08 80AEE718 8FA4003C */ lw $a0, 0x003C($sp) -/* 03B0C 80AEE71C 1440001D */ bne $v0, $zero, .L80AEE794 -/* 03B10 80AEE720 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 03B14 80AEE724 0C028800 */ jal SkelAnime_GetFrameCount - -/* 03B18 80AEE728 24844350 */ addiu $a0, $a0, 0x4350 ## $a0 = 06004350 -/* 03B1C 80AEE72C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 03B20 80AEE730 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 03B24 80AEE734 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 03B28 80AEE738 468021A0 */ cvt.s.w $f6, $f4 -/* 03B2C 80AEE73C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 03B30 80AEE740 24A54648 */ addiu $a1, $a1, 0x4648 ## $a1 = 06004648 -/* 03B34 80AEE744 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 03B38 80AEE748 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03B3C 80AEE74C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 03B40 80AEE750 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 03B44 80AEE754 AFA00014 */ sw $zero, 0x0014($sp) -/* 03B48 80AEE758 0C029468 */ jal SkelAnime_ChangeAnim - -/* 03B4C 80AEE75C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 03B50 80AEE760 0C2BB580 */ jal func_80AED600 -/* 03B54 80AEE764 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03B58 80AEE768 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 03B5C 80AEE76C 24190022 */ addiu $t9, $zero, 0x0022 ## $t9 = 00000022 -/* 03B60 80AEE770 AE190264 */ sw $t9, 0x0264($s0) ## 00000264 -/* 03B64 80AEE774 E60A026C */ swc1 $f10, 0x026C($s0) ## 0000026C -/* 03B68 80AEE778 8FA9003C */ lw $t1, 0x003C($sp) -/* 03B6C 80AEE77C 3C0880AF */ lui $t0, %hi(D_80AF1728) ## $t0 = 80AF0000 -/* 03B70 80AEE780 25081728 */ addiu $t0, $t0, %lo(D_80AF1728) ## $t0 = 80AF1728 -/* 03B74 80AEE784 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 03B78 80AEE788 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 03B7C 80AEE78C AD281D68 */ sw $t0, 0x1D68($t1) ## 00001D68 -/* 03B80 80AEE790 A02AFA74 */ sb $t2, -0x058C($at) ## 8015FA74 -.L80AEE794: -/* 03B84 80AEE794 83AB0033 */ lb $t3, 0x0033($sp) -/* 03B88 80AEE798 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 03B8C 80AEE79C 10000004 */ beq $zero, $zero, .L80AEE7B0 -/* 03B90 80AEE7A0 A20B0286 */ sb $t3, 0x0286($s0) ## 00000286 -.L80AEE7A4: -/* 03B94 80AEE7A4 83AC0033 */ lb $t4, 0x0033($sp) -.L80AEE7A8: -/* 03B98 80AEE7A8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03B9C 80AEE7AC A20C0286 */ sb $t4, 0x0286($s0) ## 00000286 -.L80AEE7B0: -/* 03BA0 80AEE7B0 8FBF002C */ lw $ra, 0x002C($sp) -/* 03BA4 80AEE7B4 8FB00028 */ lw $s0, 0x0028($sp) -/* 03BA8 80AEE7B8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 03BAC 80AEE7BC 03E00008 */ jr $ra -/* 03BB0 80AEE7C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE7C4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE7C4.s deleted file mode 100644 index af0c0fc2bd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE7C4.s +++ /dev/null @@ -1,221 +0,0 @@ -.late_rodata -glabel D_80AF1C48 - .float 0.01 - -glabel D_80AF1C4C - .float 6.8 - -glabel D_80AF1C50 - .float 1.3 - -.text -glabel func_80AEE7C4 -/* 03BB4 80AEE7C4 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 03BB8 80AEE7C8 AFBF002C */ sw $ra, 0x002C($sp) -/* 03BBC 80AEE7CC AFB00028 */ sw $s0, 0x0028($sp) -/* 03BC0 80AEE7D0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03BC4 80AEE7D4 0C00BD68 */ jal func_8002F5A0 -/* 03BC8 80AEE7D8 AFA5007C */ sw $a1, 0x007C($sp) -/* 03BCC 80AEE7DC 1040004A */ beq $v0, $zero, .L80AEE908 -/* 03BD0 80AEE7E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03BD4 80AEE7E4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 03BD8 80AEE7E8 0C028800 */ jal SkelAnime_GetFrameCount - -/* 03BDC 80AEE7EC 24846B9C */ addiu $a0, $a0, 0x6B9C ## $a0 = 06006B9C -/* 03BE0 80AEE7F0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 03BE4 80AEE7F4 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 03BE8 80AEE7F8 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 03BEC 80AEE7FC 468021A0 */ cvt.s.w $f6, $f4 -/* 03BF0 80AEE800 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 03BF4 80AEE804 24A56B9C */ addiu $a1, $a1, 0x6B9C ## $a1 = 06006B9C -/* 03BF8 80AEE808 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 03BFC 80AEE80C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03C00 80AEE810 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 03C04 80AEE814 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 03C08 80AEE818 AFA00014 */ sw $zero, 0x0014($sp) -/* 03C0C 80AEE81C 0C029468 */ jal SkelAnime_ChangeAnim - -/* 03C10 80AEE820 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 03C14 80AEE824 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03C18 80AEE828 0C2BB5B7 */ jal func_80AED6DC -/* 03C1C 80AEE82C 8FA5007C */ lw $a1, 0x007C($sp) -/* 03C20 80AEE830 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 03C24 80AEE834 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 -/* 03C28 80AEE838 8C4E0000 */ lw $t6, 0x0000($v0) ## 8015FA90 -/* 03C2C 80AEE83C 3C0180AF */ lui $at, %hi(D_80AF1C48) ## $at = 80AF0000 -/* 03C30 80AEE840 C4201C48 */ lwc1 $f0, %lo(D_80AF1C48)($at) -/* 03C34 80AEE844 85CF1486 */ lh $t7, 0x1486($t6) ## 00001486 -/* 03C38 80AEE848 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 03C3C 80AEE84C 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 03C40 80AEE850 448F8000 */ mtc1 $t7, $f16 ## $f16 = 0.00 -/* 03C44 80AEE854 C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 -/* 03C48 80AEE858 3C0180AF */ lui $at, %hi(D_80AF1C4C) ## $at = 80AF0000 -/* 03C4C 80AEE85C 468084A0 */ cvt.s.w $f18, $f16 -/* 03C50 80AEE860 C6100060 */ lwc1 $f16, 0x0060($s0) ## 00000060 -/* 03C54 80AEE864 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03C58 80AEE868 46009102 */ mul.s $f4, $f18, $f0 -/* 03C5C 80AEE86C 46022180 */ add.s $f6, $f4, $f2 -/* 03C60 80AEE870 46065202 */ mul.s $f8, $f10, $f6 -/* 03C64 80AEE874 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 03C68 80AEE878 8C580000 */ lw $t8, 0x0000($v0) ## 8015FA90 -/* 03C6C 80AEE87C 87191488 */ lh $t9, 0x1488($t8) ## 00001488 -/* 03C70 80AEE880 44999000 */ mtc1 $t9, $f18 ## $f18 = 0.00 -/* 03C74 80AEE884 00000000 */ nop -/* 03C78 80AEE888 46809120 */ cvt.s.w $f4, $f18 -/* 03C7C 80AEE88C 46002282 */ mul.s $f10, $f4, $f0 -/* 03C80 80AEE890 46025180 */ add.s $f6, $f10, $f2 -/* 03C84 80AEE894 46068202 */ mul.s $f8, $f16, $f6 -/* 03C88 80AEE898 E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 -/* 03C8C 80AEE89C 8C480000 */ lw $t0, 0x0000($v0) ## 8015FA90 -/* 03C90 80AEE8A0 C4301C4C */ lwc1 $f16, %lo(D_80AF1C4C)($at) -/* 03C94 80AEE8A4 3C0180AF */ lui $at, %hi(D_80AF1C50) ## $at = 80AF0000 -/* 03C98 80AEE8A8 85091484 */ lh $t1, 0x1484($t0) ## 00001484 -/* 03C9C 80AEE8AC 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 -/* 03CA0 80AEE8B0 00000000 */ nop -/* 03CA4 80AEE8B4 46809120 */ cvt.s.w $f4, $f18 -/* 03CA8 80AEE8B8 46002282 */ mul.s $f10, $f4, $f0 -/* 03CAC 80AEE8BC 46105180 */ add.s $f6, $f10, $f16 -/* 03CB0 80AEE8C0 46003207 */ neg.s $f8, $f6 -/* 03CB4 80AEE8C4 E6080070 */ swc1 $f8, 0x0070($s0) ## 00000070 -/* 03CB8 80AEE8C8 8C4A0000 */ lw $t2, 0x0000($v0) ## 8015FA90 -/* 03CBC 80AEE8CC C4301C50 */ lwc1 $f16, %lo(D_80AF1C50)($at) -/* 03CC0 80AEE8D0 854B1482 */ lh $t3, 0x1482($t2) ## 00001482 -/* 03CC4 80AEE8D4 448B9000 */ mtc1 $t3, $f18 ## $f18 = 0.00 -/* 03CC8 80AEE8D8 00000000 */ nop -/* 03CCC 80AEE8DC 46809120 */ cvt.s.w $f4, $f18 -/* 03CD0 80AEE8E0 46002282 */ mul.s $f10, $f4, $f0 -/* 03CD4 80AEE8E4 46105180 */ add.s $f6, $f10, $f16 -/* 03CD8 80AEE8E8 46003207 */ neg.s $f8, $f6 -/* 03CDC 80AEE8EC 0C2BB55F */ jal func_80AED57C -/* 03CE0 80AEE8F0 E608006C */ swc1 $f8, 0x006C($s0) ## 0000006C -/* 03CE4 80AEE8F4 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 03CE8 80AEE8F8 240C001C */ addiu $t4, $zero, 0x001C ## $t4 = 0000001C -/* 03CEC 80AEE8FC AE0C0264 */ sw $t4, 0x0264($s0) ## 00000264 -/* 03CF0 80AEE900 1000006C */ beq $zero, $zero, .L80AEEAB4 -/* 03CF4 80AEE904 E6120370 */ swc1 $f18, 0x0370($s0) ## 00000370 -.L80AEE908: -/* 03CF8 80AEE908 0C2BB9B4 */ jal func_80AEE6D0 -/* 03CFC 80AEE90C 8FA5007C */ lw $a1, 0x007C($sp) -/* 03D00 80AEE910 10400004 */ beq $v0, $zero, .L80AEE924 -/* 03D04 80AEE914 8FAD007C */ lw $t5, 0x007C($sp) -/* 03D08 80AEE918 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 03D0C 80AEE91C 10000065 */ beq $zero, $zero, .L80AEEAB4 -/* 03D10 80AEE920 E6040370 */ swc1 $f4, 0x0370($s0) ## 00000370 -.L80AEE924: -/* 03D14 80AEE924 8DA21C44 */ lw $v0, 0x1C44($t5) ## 00001C44 -/* 03D18 80AEE928 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 03D1C 80AEE92C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 03D20 80AEE930 8C4E0680 */ lw $t6, 0x0680($v0) ## 00000680 -/* 03D24 80AEE934 000E78C0 */ sll $t7, $t6, 3 -/* 03D28 80AEE938 05E1004C */ bgez $t7, .L80AEEA6C -/* 03D2C 80AEE93C 00000000 */ nop -/* 03D30 80AEE940 C60A0370 */ lwc1 $f10, 0x0370($s0) ## 00000370 -/* 03D34 80AEE944 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 03D38 80AEE948 8E180264 */ lw $t8, 0x0264($s0) ## 00000264 -/* 03D3C 80AEE94C 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 -/* 03D40 80AEE950 46105180 */ add.s $f6, $f10, $f16 -/* 03D44 80AEE954 26020370 */ addiu $v0, $s0, 0x0370 ## $v0 = 00000370 -/* 03D48 80AEE958 13010026 */ beq $t8, $at, .L80AEE9F4 -/* 03D4C 80AEE95C E6060370 */ swc1 $f6, 0x0370($s0) ## 00000370 -/* 03D50 80AEE960 26020370 */ addiu $v0, $s0, 0x0370 ## $v0 = 00000370 -/* 03D54 80AEE964 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 03D58 80AEE968 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 -/* 03D5C 80AEE96C C4520000 */ lwc1 $f18, 0x0000($v0) ## 00000370 -/* 03D60 80AEE970 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 03D64 80AEE974 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 03D68 80AEE978 4612403C */ c.lt.s $f8, $f18 -/* 03D6C 80AEE97C 00000000 */ nop -/* 03D70 80AEE980 4502004D */ bc1fl .L80AEEAB8 -/* 03D74 80AEE984 8FBF002C */ lw $ra, 0x002C($sp) -/* 03D78 80AEE988 0C01DF64 */ jal Math_Rand_S16Offset - -/* 03D7C 80AEE98C AFA20034 */ sw $v0, 0x0034($sp) -/* 03D80 80AEE990 14400014 */ bne $v0, $zero, .L80AEE9E4 -/* 03D84 80AEE994 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 03D88 80AEE998 0C028800 */ jal SkelAnime_GetFrameCount - -/* 03D8C 80AEE99C 24844350 */ addiu $a0, $a0, 0x4350 ## $a0 = 06004350 -/* 03D90 80AEE9A0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 03D94 80AEE9A4 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 03D98 80AEE9A8 44818000 */ mtc1 $at, $f16 ## $f16 = -8.00 -/* 03D9C 80AEE9AC 468022A0 */ cvt.s.w $f10, $f4 -/* 03DA0 80AEE9B0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 03DA4 80AEE9B4 24A54350 */ addiu $a1, $a1, 0x4350 ## $a1 = 06004350 -/* 03DA8 80AEE9B8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 03DAC 80AEE9BC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03DB0 80AEE9C0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 03DB4 80AEE9C4 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 03DB8 80AEE9C8 AFA00014 */ sw $zero, 0x0014($sp) -/* 03DBC 80AEE9CC 0C029468 */ jal SkelAnime_ChangeAnim - -/* 03DC0 80AEE9D0 E7B00018 */ swc1 $f16, 0x0018($sp) -/* 03DC4 80AEE9D4 0C2BB577 */ jal func_80AED5DC -/* 03DC8 80AEE9D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03DCC 80AEE9DC 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 -/* 03DD0 80AEE9E0 AE190264 */ sw $t9, 0x0264($s0) ## 00000264 -.L80AEE9E4: -/* 03DD4 80AEE9E4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 03DD8 80AEE9E8 8FA80034 */ lw $t0, 0x0034($sp) -/* 03DDC 80AEE9EC 10000031 */ beq $zero, $zero, .L80AEEAB4 -/* 03DE0 80AEE9F0 E5060000 */ swc1 $f6, 0x0000($t0) ## 00000000 -.L80AEE9F4: -/* 03DE4 80AEE9F4 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 03DE8 80AEE9F8 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 -/* 03DEC 80AEE9FC C4520000 */ lwc1 $f18, 0x0000($v0) ## 00000000 -/* 03DF0 80AEEA00 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 03DF4 80AEEA04 24846B9C */ addiu $a0, $a0, 0x6B9C ## $a0 = 06006B9C -/* 03DF8 80AEEA08 4612403C */ c.lt.s $f8, $f18 -/* 03DFC 80AEEA0C 00000000 */ nop -/* 03E00 80AEEA10 45020029 */ bc1fl .L80AEEAB8 -/* 03E04 80AEEA14 8FBF002C */ lw $ra, 0x002C($sp) -/* 03E08 80AEEA18 0C028800 */ jal SkelAnime_GetFrameCount - -/* 03E0C 80AEEA1C AFA20034 */ sw $v0, 0x0034($sp) -/* 03E10 80AEEA20 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 03E14 80AEEA24 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 03E18 80AEEA28 44818000 */ mtc1 $at, $f16 ## $f16 = -8.00 -/* 03E1C 80AEEA2C 468022A0 */ cvt.s.w $f10, $f4 -/* 03E20 80AEEA30 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 03E24 80AEEA34 24A56B9C */ addiu $a1, $a1, 0x6B9C ## $a1 = 06006B9C -/* 03E28 80AEEA38 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 03E2C 80AEEA3C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03E30 80AEEA40 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 03E34 80AEEA44 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 03E38 80AEEA48 AFA00014 */ sw $zero, 0x0014($sp) -/* 03E3C 80AEEA4C 0C029468 */ jal SkelAnime_ChangeAnim - -/* 03E40 80AEEA50 E7B00018 */ swc1 $f16, 0x0018($sp) -/* 03E44 80AEEA54 2409001F */ addiu $t1, $zero, 0x001F ## $t1 = 0000001F -/* 03E48 80AEEA58 AE090264 */ sw $t1, 0x0264($s0) ## 00000264 -/* 03E4C 80AEEA5C 8FAA0034 */ lw $t2, 0x0034($sp) -/* 03E50 80AEEA60 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 03E54 80AEEA64 10000013 */ beq $zero, $zero, .L80AEEAB4 -/* 03E58 80AEEA68 E5460000 */ swc1 $f6, 0x0000($t2) ## 00000000 -.L80AEEA6C: -/* 03E5C 80AEEA6C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 03E60 80AEEA70 24846B9C */ addiu $a0, $a0, 0x6B9C ## $a0 = 00006B9C -/* 03E64 80AEEA74 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 03E68 80AEEA78 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 03E6C 80AEEA7C 44812000 */ mtc1 $at, $f4 ## $f4 = -8.00 -/* 03E70 80AEEA80 468044A0 */ cvt.s.w $f18, $f8 -/* 03E74 80AEEA84 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 03E78 80AEEA88 24A56B9C */ addiu $a1, $a1, 0x6B9C ## $a1 = 06006B9C -/* 03E7C 80AEEA8C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 03E80 80AEEA90 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03E84 80AEEA94 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 03E88 80AEEA98 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 03E8C 80AEEA9C AFA00014 */ sw $zero, 0x0014($sp) -/* 03E90 80AEEAA0 0C029468 */ jal SkelAnime_ChangeAnim - -/* 03E94 80AEEAA4 E7A40018 */ swc1 $f4, 0x0018($sp) -/* 03E98 80AEEAA8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 03E9C 80AEEAAC 00000000 */ nop -/* 03EA0 80AEEAB0 E60A0370 */ swc1 $f10, 0x0370($s0) ## 00000370 -.L80AEEAB4: -/* 03EA4 80AEEAB4 8FBF002C */ lw $ra, 0x002C($sp) -.L80AEEAB8: -/* 03EA8 80AEEAB8 8FB00028 */ lw $s0, 0x0028($sp) -/* 03EAC 80AEEABC 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 03EB0 80AEEAC0 03E00008 */ jr $ra -/* 03EB4 80AEEAC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEAC8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEAC8.s deleted file mode 100644 index 6f78801363..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEAC8.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AEEAC8 -/* 03EB8 80AEEAC8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03EBC 80AEEACC AFBF0014 */ sw $ra, 0x0014($sp) -/* 03EC0 80AEEAD0 AFA5001C */ sw $a1, 0x001C($sp) -/* 03EC4 80AEEAD4 948E0088 */ lhu $t6, 0x0088($a0) ## 00000088 -/* 03EC8 80AEEAD8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03ECC 80AEEADC 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 03ED0 80AEEAE0 11E0000C */ beq $t7, $zero, .L80AEEB14 -/* 03ED4 80AEEAE4 00000000 */ nop -/* 03ED8 80AEEAE8 0C2BB80B */ jal func_80AEE02C -/* 03EDC 80AEEAEC AFA40018 */ sw $a0, 0x0018($sp) -/* 03EE0 80AEEAF0 8FA40018 */ lw $a0, 0x0018($sp) -/* 03EE4 80AEEAF4 0C00BD60 */ jal func_8002F580 -/* 03EE8 80AEEAF8 8FA5001C */ lw $a1, 0x001C($sp) -/* 03EEC 80AEEAFC 8FA40018 */ lw $a0, 0x0018($sp) -/* 03EF0 80AEEB00 2418001B */ addiu $t8, $zero, 0x001B ## $t8 = 0000001B -/* 03EF4 80AEEB04 0C2BAB76 */ jal func_80AEADD8 -/* 03EF8 80AEEB08 AC980264 */ sw $t8, 0x0264($a0) ## 00000264 -/* 03EFC 80AEEB0C 10000001 */ beq $zero, $zero, .L80AEEB14 -/* 03F00 80AEEB10 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AEEB14: -/* 03F04 80AEEB14 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03F08 80AEEB18 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03F0C 80AEEB1C 03E00008 */ jr $ra -/* 03F10 80AEEB20 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEB24.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEB24.s deleted file mode 100644 index 9553c89f36..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEB24.s +++ /dev/null @@ -1,49 +0,0 @@ -.late_rodata -glabel D_80AF1C54 - .float -0.1 -glabel D_80AF1C58 - .float 0.1 - -glabel D_80AF1C5C - .float 0.7 - -.text -glabel func_80AEEB24 -/* 03F14 80AEEB24 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03F18 80AEEB28 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03F1C 80AEEB2C 0C2BBAB2 */ jal func_80AEEAC8 -/* 03F20 80AEEB30 AFA40018 */ sw $a0, 0x0018($sp) -/* 03F24 80AEEB34 1440001B */ bne $v0, $zero, .L80AEEBA4 -/* 03F28 80AEEB38 8FA40018 */ lw $a0, 0x0018($sp) -/* 03F2C 80AEEB3C 8C8E0350 */ lw $t6, 0x0350($a0) ## 00000350 -/* 03F30 80AEEB40 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 03F34 80AEEB44 240F001E */ addiu $t7, $zero, 0x001E ## $t7 = 0000001E -/* 03F38 80AEEB48 55C10017 */ bnel $t6, $at, .L80AEEBA8 -/* 03F3C 80AEEB4C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03F40 80AEEB50 AC8F0264 */ sw $t7, 0x0264($a0) ## 00000264 -/* 03F44 80AEEB54 0C2BB80B */ jal func_80AEE02C -/* 03F48 80AEEB58 AFA40018 */ sw $a0, 0x0018($sp) -/* 03F4C 80AEEB5C 3C0180AF */ lui $at, %hi(D_80AF1C54) ## $at = 80AF0000 -/* 03F50 80AEEB60 8FA40018 */ lw $a0, 0x0018($sp) -/* 03F54 80AEEB64 C4241C54 */ lwc1 $f4, %lo(D_80AF1C54)($at) -/* 03F58 80AEEB68 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 03F5C 80AEEB6C 3C0180AF */ lui $at, %hi(D_80AF1C58) ## $at = 80AF0000 -/* 03F60 80AEEB70 E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C -/* 03F64 80AEEB74 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 -/* 03F68 80AEEB78 C42A1C58 */ lwc1 $f10, %lo(D_80AF1C58)($at) -/* 03F6C 80AEEB7C 3C0180AF */ lui $at, %hi(D_80AF1C5C) ## $at = 80AF0000 -/* 03F70 80AEEB80 87191478 */ lh $t9, 0x1478($t8) ## 80161478 -/* 03F74 80AEEB84 C4321C5C */ lwc1 $f18, %lo(D_80AF1C5C)($at) -/* 03F78 80AEEB88 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 -/* 03F7C 80AEEB8C 00000000 */ nop -/* 03F80 80AEEB90 46803220 */ cvt.s.w $f8, $f6 -/* 03F84 80AEEB94 460A4402 */ mul.s $f16, $f8, $f10 -/* 03F88 80AEEB98 46128100 */ add.s $f4, $f16, $f18 -/* 03F8C 80AEEB9C 46002187 */ neg.s $f6, $f4 -/* 03F90 80AEEBA0 E4860070 */ swc1 $f6, 0x0070($a0) ## 00000070 -.L80AEEBA4: -/* 03F94 80AEEBA4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AEEBA8: -/* 03F98 80AEEBA8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03F9C 80AEEBAC 03E00008 */ jr $ra -/* 03FA0 80AEEBB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEBB4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEBB4.s deleted file mode 100644 index a64991f426..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEBB4.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80AEEBB4 -/* 03FA4 80AEEBB4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03FA8 80AEEBB8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03FAC 80AEEBBC 0C00BD60 */ jal func_8002F580 -/* 03FB0 80AEEBC0 00000000 */ nop -/* 03FB4 80AEEBC4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03FB8 80AEEBC8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03FBC 80AEEBCC 03E00008 */ jr $ra -/* 03FC0 80AEEBD0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEBD4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEBD4.s deleted file mode 100644 index e44278ea53..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEBD4.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80AEEBD4 -/* 03FC4 80AEEBD4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03FC8 80AEEBD8 AFBF001C */ sw $ra, 0x001C($sp) -/* 03FCC 80AEEBDC AFB10018 */ sw $s1, 0x0018($sp) -/* 03FD0 80AEEBE0 AFB00014 */ sw $s0, 0x0014($sp) -/* 03FD4 80AEEBE4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03FD8 80AEEBE8 0C2BB60F */ jal func_80AED83C -/* 03FDC 80AEEBEC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 03FE0 80AEEBF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03FE4 80AEEBF4 0C2BAB15 */ jal func_80AEAC54 -/* 03FE8 80AEEBF8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03FEC 80AEEBFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03FF0 80AEEC00 0C2BABB3 */ jal func_80AEAECC -/* 03FF4 80AEEC04 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03FF8 80AEEC08 0C2BACC8 */ jal func_80AEB320 -/* 03FFC 80AEEC0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04000 80AEEC10 0C2BAB87 */ jal func_80AEAE1C -/* 04004 80AEEC14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04008 80AEEC18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0400C 80AEEC1C 0C2BBAED */ jal func_80AEEBB4 -/* 04010 80AEEC20 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 04014 80AEEC24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04018 80AEEC28 0C2BB922 */ jal func_80AEE488 -/* 0401C 80AEEC2C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 04020 80AEEC30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04024 80AEEC34 0C2BB589 */ jal func_80AED624 -/* 04028 80AEEC38 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0402C 80AEEC3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04030 80AEEC40 0C2BB6B8 */ jal func_80AEDAE0 -/* 04034 80AEEC44 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 04038 80AEEC48 8FBF001C */ lw $ra, 0x001C($sp) -/* 0403C 80AEEC4C 8FB00014 */ lw $s0, 0x0014($sp) -/* 04040 80AEEC50 8FB10018 */ lw $s1, 0x0018($sp) -/* 04044 80AEEC54 03E00008 */ jr $ra -/* 04048 80AEEC58 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEC5C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEC5C.s deleted file mode 100644 index 40473d131c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEC5C.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80AEEC5C -/* 0404C 80AEEC5C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04050 80AEEC60 AFBF001C */ sw $ra, 0x001C($sp) -/* 04054 80AEEC64 AFB10018 */ sw $s1, 0x0018($sp) -/* 04058 80AEEC68 AFB00014 */ sw $s0, 0x0014($sp) -/* 0405C 80AEEC6C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04060 80AEEC70 0C2BB60F */ jal func_80AED83C -/* 04064 80AEEC74 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 04068 80AEEC78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0406C 80AEEC7C 0C2BAB37 */ jal func_80AEACDC -/* 04070 80AEEC80 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 04074 80AEEC84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04078 80AEEC88 0C2BABB3 */ jal func_80AEAECC -/* 0407C 80AEEC8C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 04080 80AEEC90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04084 80AEEC94 0C2BB8BE */ jal func_80AEE2F8 -/* 04088 80AEEC98 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0408C 80AEEC9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04090 80AEECA0 0C2BB7FD */ jal func_80AEDFF4 -/* 04094 80AEECA4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 04098 80AEECA8 0C2BACC8 */ jal func_80AEB320 -/* 0409C 80AEECAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 040A0 80AEECB0 0C2BAB87 */ jal func_80AEAE1C -/* 040A4 80AEECB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 040A8 80AEECB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 040AC 80AEECBC 0C2BB95A */ jal func_80AEE568 -/* 040B0 80AEECC0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 040B4 80AEECC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 040B8 80AEECC8 0C2BB589 */ jal func_80AED624 -/* 040BC 80AEECCC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 040C0 80AEECD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 040C4 80AEECD4 0C2BB6B8 */ jal func_80AEDAE0 -/* 040C8 80AEECD8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 040CC 80AEECDC 8FBF001C */ lw $ra, 0x001C($sp) -/* 040D0 80AEECE0 8FB00014 */ lw $s0, 0x0014($sp) -/* 040D4 80AEECE4 8FB10018 */ lw $s1, 0x0018($sp) -/* 040D8 80AEECE8 03E00008 */ jr $ra -/* 040DC 80AEECEC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEECF0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEECF0.s deleted file mode 100644 index 908bec5321..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEECF0.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80AEECF0 -/* 040E0 80AEECF0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 040E4 80AEECF4 AFBF001C */ sw $ra, 0x001C($sp) -/* 040E8 80AEECF8 AFB00018 */ sw $s0, 0x0018($sp) -/* 040EC 80AEECFC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 040F0 80AEED00 0C2BB60F */ jal func_80AED83C -/* 040F4 80AEED04 AFA50024 */ sw $a1, 0x0024($sp) -/* 040F8 80AEED08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 040FC 80AEED0C 0C2BABB3 */ jal func_80AEAECC -/* 04100 80AEED10 8FA50024 */ lw $a1, 0x0024($sp) -/* 04104 80AEED14 0C2BB814 */ jal func_80AEE050 -/* 04108 80AEED18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0410C 80AEED1C 0C2BACC8 */ jal func_80AEB320 -/* 04110 80AEED20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04114 80AEED24 0C2BAB87 */ jal func_80AEAE1C -/* 04118 80AEED28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0411C 80AEED2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04120 80AEED30 0C2BBAC9 */ jal func_80AEEB24 -/* 04124 80AEED34 8FA50024 */ lw $a1, 0x0024($sp) -/* 04128 80AEED38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0412C 80AEED3C 0C2BB589 */ jal func_80AED624 -/* 04130 80AEED40 8FA50024 */ lw $a1, 0x0024($sp) -/* 04134 80AEED44 8FBF001C */ lw $ra, 0x001C($sp) -/* 04138 80AEED48 8FB00018 */ lw $s0, 0x0018($sp) -/* 0413C 80AEED4C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04140 80AEED50 03E00008 */ jr $ra -/* 04144 80AEED54 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEED58.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEED58.s deleted file mode 100644 index 64fe722ae4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEED58.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80AEED58 -/* 04148 80AEED58 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0414C 80AEED5C AFBF001C */ sw $ra, 0x001C($sp) -/* 04150 80AEED60 AFB00018 */ sw $s0, 0x0018($sp) -/* 04154 80AEED64 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04158 80AEED68 0C2BB60F */ jal func_80AED83C -/* 0415C 80AEED6C AFA50024 */ sw $a1, 0x0024($sp) -/* 04160 80AEED70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04164 80AEED74 0C2BABB3 */ jal func_80AEAECC -/* 04168 80AEED78 8FA50024 */ lw $a1, 0x0024($sp) -/* 0416C 80AEED7C 0C00B638 */ jal Actor_MoveForward - -/* 04170 80AEED80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04174 80AEED84 0C2BACC8 */ jal func_80AEB320 -/* 04178 80AEED88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0417C 80AEED8C 0C2BAB87 */ jal func_80AEAE1C -/* 04180 80AEED90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04184 80AEED94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04188 80AEED98 0C2BBAB2 */ jal func_80AEEAC8 -/* 0418C 80AEED9C 8FA50024 */ lw $a1, 0x0024($sp) -/* 04190 80AEEDA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04194 80AEEDA4 0C2BB589 */ jal func_80AED624 -/* 04198 80AEEDA8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0419C 80AEEDAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 041A0 80AEEDB0 0C2BB6B8 */ jal func_80AEDAE0 -/* 041A4 80AEEDB4 8FA50024 */ lw $a1, 0x0024($sp) -/* 041A8 80AEEDB8 8FBF001C */ lw $ra, 0x001C($sp) -/* 041AC 80AEEDBC 8FB00018 */ lw $s0, 0x0018($sp) -/* 041B0 80AEEDC0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 041B4 80AEEDC4 03E00008 */ jr $ra -/* 041B8 80AEEDC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEDCC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEDCC.s deleted file mode 100644 index 9fc7d2f9e3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEDCC.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80AEEDCC -/* 041BC 80AEEDCC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 041C0 80AEEDD0 AFBF001C */ sw $ra, 0x001C($sp) -/* 041C4 80AEEDD4 AFB00018 */ sw $s0, 0x0018($sp) -/* 041C8 80AEEDD8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 041CC 80AEEDDC 0C2BB637 */ jal func_80AED8DC -/* 041D0 80AEEDE0 AFA50024 */ sw $a1, 0x0024($sp) -/* 041D4 80AEEDE4 0C2BACC8 */ jal func_80AEB320 -/* 041D8 80AEEDE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 041DC 80AEEDEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 041E0 80AEEDF0 0C2BABB3 */ jal func_80AEAECC -/* 041E4 80AEEDF4 8FA50024 */ lw $a1, 0x0024($sp) -/* 041E8 80AEEDF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 041EC 80AEEDFC 0C2BB8BE */ jal func_80AEE2F8 -/* 041F0 80AEEE00 8FA50024 */ lw $a1, 0x0024($sp) -/* 041F4 80AEEE04 0C2BAB87 */ jal func_80AEAE1C -/* 041F8 80AEEE08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 041FC 80AEEE0C 0C2BB5BE */ jal func_80AED6F8 -/* 04200 80AEEE10 8FA40024 */ lw $a0, 0x0024($sp) -/* 04204 80AEEE14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04208 80AEEE18 0C2BB9F1 */ jal func_80AEE7C4 -/* 0420C 80AEEE1C 8FA50024 */ lw $a1, 0x0024($sp) -/* 04210 80AEEE20 8FBF001C */ lw $ra, 0x001C($sp) -/* 04214 80AEEE24 8FB00018 */ lw $s0, 0x0018($sp) -/* 04218 80AEEE28 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0421C 80AEEE2C 03E00008 */ jr $ra -/* 04220 80AEEE30 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEE34.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEE34.s deleted file mode 100644 index 4a89efb956..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEE34.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80AEEE34 -/* 04224 80AEEE34 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04228 80AEEE38 AFBF001C */ sw $ra, 0x001C($sp) -/* 0422C 80AEEE3C AFB00018 */ sw $s0, 0x0018($sp) -/* 04230 80AEEE40 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04234 80AEEE44 0C2BB60F */ jal func_80AED83C -/* 04238 80AEEE48 AFA50024 */ sw $a1, 0x0024($sp) -/* 0423C 80AEEE4C 0C2BACC8 */ jal func_80AEB320 -/* 04240 80AEEE50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04244 80AEEE54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04248 80AEEE58 0C2BABB3 */ jal func_80AEAECC -/* 0424C 80AEEE5C 8FA50024 */ lw $a1, 0x0024($sp) -/* 04250 80AEEE60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04254 80AEEE64 0C2BB8BE */ jal func_80AEE2F8 -/* 04258 80AEEE68 8FA50024 */ lw $a1, 0x0024($sp) -/* 0425C 80AEEE6C 0C2BAB87 */ jal func_80AEAE1C -/* 04260 80AEEE70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04264 80AEEE74 0C2BB5BE */ jal func_80AED6F8 -/* 04268 80AEEE78 8FA40024 */ lw $a0, 0x0024($sp) -/* 0426C 80AEEE7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04270 80AEEE80 0C2BB9F1 */ jal func_80AEE7C4 -/* 04274 80AEEE84 8FA50024 */ lw $a1, 0x0024($sp) -/* 04278 80AEEE88 8FBF001C */ lw $ra, 0x001C($sp) -/* 0427C 80AEEE8C 8FB00018 */ lw $s0, 0x0018($sp) -/* 04280 80AEEE90 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04284 80AEEE94 03E00008 */ jr $ra -/* 04288 80AEEE98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEE9C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEE9C.s deleted file mode 100644 index 88d27cd086..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEE9C.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80AEEE9C -/* 0428C 80AEEE9C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04290 80AEEEA0 AFBF001C */ sw $ra, 0x001C($sp) -/* 04294 80AEEEA4 AFB00018 */ sw $s0, 0x0018($sp) -/* 04298 80AEEEA8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0429C 80AEEEAC 0C2BB60F */ jal func_80AED83C -/* 042A0 80AEEEB0 AFA50024 */ sw $a1, 0x0024($sp) -/* 042A4 80AEEEB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 042A8 80AEEEB8 0C2BABB3 */ jal func_80AEAECC -/* 042AC 80AEEEBC 8FA50024 */ lw $a1, 0x0024($sp) -/* 042B0 80AEEEC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 042B4 80AEEEC4 0C2BB7FD */ jal func_80AEDFF4 -/* 042B8 80AEEEC8 8FA50024 */ lw $a1, 0x0024($sp) -/* 042BC 80AEEECC 0C2BACC8 */ jal func_80AEB320 -/* 042C0 80AEEED0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 042C4 80AEEED4 0C2BAB87 */ jal func_80AEAE1C -/* 042C8 80AEEED8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 042CC 80AEEEDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 042D0 80AEEEE0 0C2BB5CE */ jal func_80AED738 -/* 042D4 80AEEEE4 8FA50024 */ lw $a1, 0x0024($sp) -/* 042D8 80AEEEE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 042DC 80AEEEEC 0C2BB589 */ jal func_80AED624 -/* 042E0 80AEEEF0 8FA50024 */ lw $a1, 0x0024($sp) -/* 042E4 80AEEEF4 8FBF001C */ lw $ra, 0x001C($sp) -/* 042E8 80AEEEF8 8FB00018 */ lw $s0, 0x0018($sp) -/* 042EC 80AEEEFC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 042F0 80AEEF00 03E00008 */ jr $ra -/* 042F4 80AEEF04 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEF08.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEF08.s deleted file mode 100644 index 22861ead0d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEF08.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80AEEF08 -/* 042F8 80AEEF08 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 042FC 80AEEF0C AFBF001C */ sw $ra, 0x001C($sp) -/* 04300 80AEEF10 AFB00018 */ sw $s0, 0x0018($sp) -/* 04304 80AEEF14 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04308 80AEEF18 0C2BB60F */ jal func_80AED83C -/* 0430C 80AEEF1C AFA50024 */ sw $a1, 0x0024($sp) -/* 04310 80AEEF20 0C2BACC8 */ jal func_80AEB320 -/* 04314 80AEEF24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04318 80AEEF28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0431C 80AEEF2C 0C2BABB3 */ jal func_80AEAECC -/* 04320 80AEEF30 8FA50024 */ lw $a1, 0x0024($sp) -/* 04324 80AEEF34 0C2BAB87 */ jal func_80AEAE1C -/* 04328 80AEEF38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0432C 80AEEF3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04330 80AEEF40 0C2BB98A */ jal func_80AEE628 -/* 04334 80AEEF44 8FA50024 */ lw $a1, 0x0024($sp) -/* 04338 80AEEF48 8FBF001C */ lw $ra, 0x001C($sp) -/* 0433C 80AEEF4C 8FB00018 */ lw $s0, 0x0018($sp) -/* 04340 80AEEF50 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04344 80AEEF54 03E00008 */ jr $ra -/* 04348 80AEEF58 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEF5C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEF5C.s deleted file mode 100644 index 1093f3e439..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEF5C.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80AEEF5C -/* 0434C 80AEEF5C AFA40000 */ sw $a0, 0x0000($sp) -/* 04350 80AEEF60 03E00008 */ jr $ra -/* 04354 80AEEF64 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEF68.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEF68.s deleted file mode 100644 index 971b22c73c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEF68.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80AEEF68 -/* 04358 80AEEF68 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0435C 80AEEF6C AFBF0014 */ sw $ra, 0x0014($sp) -/* 04360 80AEEF70 AFA5001C */ sw $a1, 0x001C($sp) -/* 04364 80AEEF74 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 04368 80AEEF78 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0436C 80AEEF7C 2463FA90 */ addiu $v1, $v1, 0xFA90 ## $v1 = 8015FA90 -/* 04370 80AEEF80 8C580024 */ lw $t8, 0x0024($v0) ## 00000024 -/* 04374 80AEEF84 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 04378 80AEEF88 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 -/* 0437C 80AEEF8C AC98038C */ sw $t8, 0x038C($a0) ## 0000038C -/* 04380 80AEEF90 8C4F0028 */ lw $t7, 0x0028($v0) ## 00000028 -/* 04384 80AEEF94 24850374 */ addiu $a1, $a0, 0x0374 ## $a1 = 00000374 -/* 04388 80AEEF98 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 -/* 0438C 80AEEF9C AC8F0390 */ sw $t7, 0x0390($a0) ## 00000390 -/* 04390 80AEEFA0 8C58002C */ lw $t8, 0x002C($v0) ## 0000002C -/* 04394 80AEEFA4 AC980394 */ sw $t8, 0x0394($a0) ## 00000394 -/* 04398 80AEEFA8 8C790000 */ lw $t9, 0x0000($v1) ## 8015FA90 -/* 0439C 80AEEFAC 87281474 */ lh $t0, 0x1474($t9) ## 00001474 -/* 043A0 80AEEFB0 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 043A4 80AEEFB4 00000000 */ nop -/* 043A8 80AEEFB8 468021A0 */ cvt.s.w $f6, $f4 -/* 043AC 80AEEFBC 46083281 */ sub.s $f10, $f6, $f8 -/* 043B0 80AEEFC0 E48A0388 */ swc1 $f10, 0x0388($a0) ## 00000388 -/* 043B4 80AEEFC4 8C690000 */ lw $t1, 0x0000($v1) ## 8015FA90 -/* 043B8 80AEEFC8 85261476 */ lh $a2, 0x1476($t1) ## 00001476 -/* 043BC 80AEEFCC 24C6000C */ addiu $a2, $a2, 0x000C ## $a2 = 0000000C -/* 043C0 80AEEFD0 00063400 */ sll $a2, $a2, 16 -/* 043C4 80AEEFD4 0C00D285 */ jal func_80034A14 -/* 043C8 80AEEFD8 00063403 */ sra $a2, $a2, 16 -/* 043CC 80AEEFDC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 043D0 80AEEFE0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 043D4 80AEEFE4 03E00008 */ jr $ra -/* 043D8 80AEEFE8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEFEC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEFEC.s deleted file mode 100644 index 3882b338cf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEFEC.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80AEEFEC -/* 043DC 80AEEFEC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 043E0 80AEEFF0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 043E4 80AEEFF4 AFA5001C */ sw $a1, 0x001C($sp) -/* 043E8 80AEEFF8 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 043EC 80AEEFFC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 043F0 80AEF000 2463FA90 */ addiu $v1, $v1, 0xFA90 ## $v1 = 8015FA90 -/* 043F4 80AEF004 8C580024 */ lw $t8, 0x0024($v0) ## 00000024 -/* 043F8 80AEF008 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 043FC 80AEF00C 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 -/* 04400 80AEF010 AC98038C */ sw $t8, 0x038C($a0) ## 0000038C -/* 04404 80AEF014 8C4F0028 */ lw $t7, 0x0028($v0) ## 00000028 -/* 04408 80AEF018 24850374 */ addiu $a1, $a0, 0x0374 ## $a1 = 00000374 -/* 0440C 80AEF01C 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 04410 80AEF020 AC8F0390 */ sw $t7, 0x0390($a0) ## 00000390 -/* 04414 80AEF024 8C58002C */ lw $t8, 0x002C($v0) ## 0000002C -/* 04418 80AEF028 AC980394 */ sw $t8, 0x0394($a0) ## 00000394 -/* 0441C 80AEF02C 8C790000 */ lw $t9, 0x0000($v1) ## 8015FA90 -/* 04420 80AEF030 87281474 */ lh $t0, 0x1474($t9) ## 00001474 -/* 04424 80AEF034 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 04428 80AEF038 00000000 */ nop -/* 0442C 80AEF03C 468021A0 */ cvt.s.w $f6, $f4 -/* 04430 80AEF040 46083281 */ sub.s $f10, $f6, $f8 -/* 04434 80AEF044 E48A0388 */ swc1 $f10, 0x0388($a0) ## 00000388 -/* 04438 80AEF048 8C690000 */ lw $t1, 0x0000($v1) ## 8015FA90 -/* 0443C 80AEF04C 85261476 */ lh $a2, 0x1476($t1) ## 00001476 -/* 04440 80AEF050 AFA40018 */ sw $a0, 0x0018($sp) -/* 04444 80AEF054 24C6000C */ addiu $a2, $a2, 0x000C ## $a2 = 0000000C -/* 04448 80AEF058 00063400 */ sll $a2, $a2, 16 -/* 0444C 80AEF05C 0C00D285 */ jal func_80034A14 -/* 04450 80AEF060 00063403 */ sra $a2, $a2, 16 -/* 04454 80AEF064 8FA40018 */ lw $a0, 0x0018($sp) -/* 04458 80AEF068 848A00B6 */ lh $t2, 0x00B6($a0) ## 000000B6 -/* 0445C 80AEF06C A48A0032 */ sh $t2, 0x0032($a0) ## 00000032 -/* 04460 80AEF070 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04464 80AEF074 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04468 80AEF078 03E00008 */ jr $ra -/* 0446C 80AEF07C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF080.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF080.s deleted file mode 100644 index cc10d1328f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF080.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80AEF080 -/* 04470 80AEF080 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04474 80AEF084 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04478 80AEF088 AFA40018 */ sw $a0, 0x0018($sp) -/* 0447C 80AEF08C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04480 80AEF090 0C0295B2 */ jal func_800A56C8 -/* 04484 80AEF094 3C054130 */ lui $a1, 0x4130 ## $a1 = 41300000 -/* 04488 80AEF098 10400004 */ beq $v0, $zero, .L80AEF0AC -/* 0448C 80AEF09C 8FA40018 */ lw $a0, 0x0018($sp) -/* 04490 80AEF0A0 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 04494 80AEF0A4 0C01E245 */ jal func_80078914 -/* 04498 80AEF0A8 240528AC */ addiu $a1, $zero, 0x28AC ## $a1 = 000028AC -.L80AEF0AC: -/* 0449C 80AEF0AC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 044A0 80AEF0B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 044A4 80AEF0B4 03E00008 */ jr $ra -/* 044A8 80AEF0B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF0BC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF0BC.s deleted file mode 100644 index 575f060979..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF0BC.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_80AEF0BC -/* 044AC 80AEF0BC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 044B0 80AEF0C0 95CEF580 */ lhu $t6, -0x0A80($t6) ## 8015F580 -/* 044B4 80AEF0C4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 044B8 80AEF0C8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 044BC 80AEF0CC 31CF0004 */ andi $t7, $t6, 0x0004 ## $t7 = 00000000 -/* 044C0 80AEF0D0 AFA40028 */ sw $a0, 0x0028($sp) -/* 044C4 80AEF0D4 11E00021 */ beq $t7, $zero, .L80AEF15C -/* 044C8 80AEF0D8 AFA5002C */ sw $a1, 0x002C($sp) -/* 044CC 80AEF0DC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 044D0 80AEF0E0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 044D4 80AEF0E4 24847534 */ addiu $a0, $a0, 0x7534 ## $a0 = 06007534 -/* 044D8 80AEF0E8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 044DC 80AEF0EC 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 044E0 80AEF0F0 8FA30028 */ lw $v1, 0x0028($sp) -/* 044E4 80AEF0F4 468021A0 */ cvt.s.w $f6, $f4 -/* 044E8 80AEF0F8 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 044EC 80AEF0FC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 044F0 80AEF100 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 044F4 80AEF104 AFB80014 */ sw $t8, 0x0014($sp) -/* 044F8 80AEF108 24A57534 */ addiu $a1, $a1, 0x7534 ## $a1 = 06007534 -/* 044FC 80AEF10C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 04500 80AEF110 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04504 80AEF114 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 04508 80AEF118 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 0450C 80AEF11C 0C029468 */ jal SkelAnime_ChangeAnim - -/* 04510 80AEF120 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 04514 80AEF124 8FA8002C */ lw $t0, 0x002C($sp) -/* 04518 80AEF128 8FA30028 */ lw $v1, 0x0028($sp) -/* 0451C 80AEF12C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 04520 80AEF130 24190037 */ addiu $t9, $zero, 0x0037 ## $t9 = 00000037 -/* 04524 80AEF134 00280821 */ addu $at, $at, $t0 -/* 04528 80AEF138 A03903DC */ sb $t9, 0x03DC($at) ## 000103DC -/* 0452C 80AEF13C 8C6A0004 */ lw $t2, 0x0004($v1) ## 00000004 -/* 04530 80AEF140 2401FFF6 */ addiu $at, $zero, 0xFFF6 ## $at = FFFFFFF6 -/* 04534 80AEF144 2409001A */ addiu $t1, $zero, 0x001A ## $t1 = 0000001A -/* 04538 80AEF148 01415824 */ and $t3, $t2, $at -/* 0453C 80AEF14C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 04540 80AEF150 AC690264 */ sw $t1, 0x0264($v1) ## 00000264 -/* 04544 80AEF154 10000002 */ beq $zero, $zero, .L80AEF160 -/* 04548 80AEF158 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 -.L80AEF15C: -/* 0454C 80AEF15C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AEF160: -/* 04550 80AEF160 8FBF0024 */ lw $ra, 0x0024($sp) -/* 04554 80AEF164 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04558 80AEF168 03E00008 */ jr $ra -/* 0455C 80AEF16C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF170.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF170.s deleted file mode 100644 index fdc31eec1e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF170.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_80AEF170 -/* 04560 80AEF170 10C00003 */ beq $a2, $zero, .L80AEF180 -/* 04564 80AEF174 AFA50004 */ sw $a1, 0x0004($sp) -/* 04568 80AEF178 240E0019 */ addiu $t6, $zero, 0x0019 ## $t6 = 00000019 -/* 0456C 80AEF17C AC8E0264 */ sw $t6, 0x0264($a0) ## 00000264 -.L80AEF180: -/* 04570 80AEF180 03E00008 */ jr $ra -/* 04574 80AEF184 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF188.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF188.s deleted file mode 100644 index bdffc5180e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF188.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80AEF188 -/* 04578 80AEF188 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0457C 80AEF18C AFBF0014 */ sw $ra, 0x0014($sp) -/* 04580 80AEF190 AFA40018 */ sw $a0, 0x0018($sp) -/* 04584 80AEF194 AFA5001C */ sw $a1, 0x001C($sp) -/* 04588 80AEF198 0C2BAC5D */ jal func_80AEB174 -/* 0458C 80AEF19C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 04590 80AEF1A0 1040000F */ beq $v0, $zero, .L80AEF1E0 -/* 04594 80AEF1A4 8FA40018 */ lw $a0, 0x0018($sp) -/* 04598 80AEF1A8 0C2BBC2F */ jal func_80AEF0BC -/* 0459C 80AEF1AC 8FA5001C */ lw $a1, 0x001C($sp) -/* 045A0 80AEF1B0 5440000C */ bnel $v0, $zero, .L80AEF1E4 -/* 045A4 80AEF1B4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 045A8 80AEF1B8 0C041B33 */ jal func_80106CCC -/* 045AC 80AEF1BC 8FA4001C */ lw $a0, 0x001C($sp) -/* 045B0 80AEF1C0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 045B4 80AEF1C4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 045B8 80AEF1C8 944E0F20 */ lhu $t6, 0x0F20($v0) ## 8015F580 -/* 045BC 80AEF1CC 8FB90018 */ lw $t9, 0x0018($sp) -/* 045C0 80AEF1D0 24180018 */ addiu $t8, $zero, 0x0018 ## $t8 = 00000018 -/* 045C4 80AEF1D4 35CF0004 */ ori $t7, $t6, 0x0004 ## $t7 = 00000004 -/* 045C8 80AEF1D8 A44F0F20 */ sh $t7, 0x0F20($v0) ## 8015F580 -/* 045CC 80AEF1DC AF380264 */ sw $t8, 0x0264($t9) ## 00000264 -.L80AEF1E0: -/* 045D0 80AEF1E0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AEF1E4: -/* 045D4 80AEF1E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 045D8 80AEF1E8 03E00008 */ jr $ra -/* 045DC 80AEF1EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF1F0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF1F0.s deleted file mode 100644 index cc178f3462..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF1F0.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80AEF1F0 -/* 045E0 80AEF1F0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 045E4 80AEF1F4 AFB00028 */ sw $s0, 0x0028($sp) -/* 045E8 80AEF1F8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 045EC 80AEF1FC AFBF002C */ sw $ra, 0x002C($sp) -/* 045F0 80AEF200 10C00021 */ beq $a2, $zero, .L80AEF288 -/* 045F4 80AEF204 AFA50034 */ sw $a1, 0x0034($sp) -/* 045F8 80AEF208 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 045FC 80AEF20C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 04600 80AEF210 24846B9C */ addiu $a0, $a0, 0x6B9C ## $a0 = 06006B9C -/* 04604 80AEF214 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 04608 80AEF218 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0460C 80AEF21C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 04610 80AEF220 468021A0 */ cvt.s.w $f6, $f4 -/* 04614 80AEF224 44070000 */ mfc1 $a3, $f0 -/* 04618 80AEF228 24A56B9C */ addiu $a1, $a1, 0x6B9C ## $a1 = 06006B9C -/* 0461C 80AEF22C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 04620 80AEF230 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04624 80AEF234 AFA00014 */ sw $zero, 0x0014($sp) -/* 04628 80AEF238 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0462C 80AEF23C 0C029468 */ jal SkelAnime_ChangeAnim - -/* 04630 80AEF240 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 04634 80AEF244 0C041B33 */ jal func_80106CCC -/* 04638 80AEF248 8FA40034 */ lw $a0, 0x0034($sp) -/* 0463C 80AEF24C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 04640 80AEF250 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 04644 80AEF254 944E0F20 */ lhu $t6, 0x0F20($v0) ## 8015F580 -/* 04648 80AEF258 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0464C 80AEF25C 8FA50034 */ lw $a1, 0x0034($sp) -/* 04650 80AEF260 35CF0008 */ ori $t7, $t6, 0x0008 ## $t7 = 00000008 -/* 04654 80AEF264 0C2BB5B7 */ jal func_80AED6DC -/* 04658 80AEF268 A44F0F20 */ sh $t7, 0x0F20($v0) ## 8015F580 -/* 0465C 80AEF26C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04660 80AEF270 0C00BD60 */ jal func_8002F580 -/* 04664 80AEF274 8FA50034 */ lw $a1, 0x0034($sp) -/* 04668 80AEF278 2418001B */ addiu $t8, $zero, 0x001B ## $t8 = 0000001B -/* 0466C 80AEF27C AE180264 */ sw $t8, 0x0264($s0) ## 00000264 -/* 04670 80AEF280 0C2BAB76 */ jal func_80AEADD8 -/* 04674 80AEF284 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AEF288: -/* 04678 80AEF288 8FBF002C */ lw $ra, 0x002C($sp) -/* 0467C 80AEF28C 8FB00028 */ lw $s0, 0x0028($sp) -/* 04680 80AEF290 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 04684 80AEF294 03E00008 */ jr $ra -/* 04688 80AEF298 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF29C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF29C.s deleted file mode 100644 index a2065d8b71..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF29C.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80AEF29C -/* 0468C 80AEF29C AFA50004 */ sw $a1, 0x0004($sp) -/* 04690 80AEF2A0 240E0017 */ addiu $t6, $zero, 0x0017 ## $t6 = 00000017 -/* 04694 80AEF2A4 03E00008 */ jr $ra -/* 04698 80AEF2A8 AC8E0264 */ sw $t6, 0x0264($a0) ## 00000264 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF2AC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF2AC.s deleted file mode 100644 index a2a6acda42..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF2AC.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80AEF2AC -/* 0469C 80AEF2AC AFA50004 */ sw $a1, 0x0004($sp) -/* 046A0 80AEF2B0 8C980004 */ lw $t8, 0x0004($a0) ## 00000004 -/* 046A4 80AEF2B4 240E0018 */ addiu $t6, $zero, 0x0018 ## $t6 = 00000018 -/* 046A8 80AEF2B8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 046AC 80AEF2BC 37190009 */ ori $t9, $t8, 0x0009 ## $t9 = 00000009 -/* 046B0 80AEF2C0 AC8E0264 */ sw $t6, 0x0264($a0) ## 00000264 -/* 046B4 80AEF2C4 AC8F0268 */ sw $t7, 0x0268($a0) ## 00000268 -/* 046B8 80AEF2C8 03E00008 */ jr $ra -/* 046BC 80AEF2CC AC990004 */ sw $t9, 0x0004($a0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF2D0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF2D0.s deleted file mode 100644 index c84e8f22b0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF2D0.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80AEF2D0 -/* 046C0 80AEF2D0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 046C4 80AEF2D4 AFBF001C */ sw $ra, 0x001C($sp) -/* 046C8 80AEF2D8 AFB10018 */ sw $s1, 0x0018($sp) -/* 046CC 80AEF2DC AFB00014 */ sw $s0, 0x0014($sp) -/* 046D0 80AEF2E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 046D4 80AEF2E4 0C2BBBDA */ jal func_80AEEF68 -/* 046D8 80AEF2E8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 046DC 80AEF2EC 0C2BACC8 */ jal func_80AEB320 -/* 046E0 80AEF2F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 046E4 80AEF2F4 0C2BAB87 */ jal func_80AEAE1C -/* 046E8 80AEF2F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 046EC 80AEF2FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 046F0 80AEF300 0C2BAB04 */ jal func_80AEAC10 -/* 046F4 80AEF304 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 046F8 80AEF308 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 046FC 80AEF30C 0C2BABB3 */ jal func_80AEAECC -/* 04700 80AEF310 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 04704 80AEF314 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04708 80AEF318 0C2BB899 */ jal func_80AEE264 -/* 0470C 80AEF31C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 04710 80AEF320 AFA20024 */ sw $v0, 0x0024($sp) -/* 04714 80AEF324 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04718 80AEF328 0C2BB589 */ jal func_80AED624 -/* 0471C 80AEF32C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 04720 80AEF330 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04724 80AEF334 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 04728 80AEF338 0C2BBC5C */ jal func_80AEF170 -/* 0472C 80AEF33C 8FA60024 */ lw $a2, 0x0024($sp) -/* 04730 80AEF340 8FBF001C */ lw $ra, 0x001C($sp) -/* 04734 80AEF344 8FB00014 */ lw $s0, 0x0014($sp) -/* 04738 80AEF348 8FB10018 */ lw $s1, 0x0018($sp) -/* 0473C 80AEF34C 03E00008 */ jr $ra -/* 04740 80AEF350 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF354.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF354.s deleted file mode 100644 index a5efd0aa63..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF354.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80AEF354 -/* 04744 80AEF354 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04748 80AEF358 AFBF001C */ sw $ra, 0x001C($sp) -/* 0474C 80AEF35C AFB00018 */ sw $s0, 0x0018($sp) -/* 04750 80AEF360 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04754 80AEF364 0C2BBBFB */ jal func_80AEEFEC -/* 04758 80AEF368 AFA50024 */ sw $a1, 0x0024($sp) -/* 0475C 80AEF36C 0C2BACC8 */ jal func_80AEB320 -/* 04760 80AEF370 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04764 80AEF374 0C2BAB87 */ jal func_80AEAE1C -/* 04768 80AEF378 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0476C 80AEF37C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04770 80AEF380 0C2BABB3 */ jal func_80AEAECC -/* 04774 80AEF384 8FA50024 */ lw $a1, 0x0024($sp) -/* 04778 80AEF388 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0477C 80AEF38C 0C2BBC62 */ jal func_80AEF188 -/* 04780 80AEF390 8FA50024 */ lw $a1, 0x0024($sp) -/* 04784 80AEF394 8FBF001C */ lw $ra, 0x001C($sp) -/* 04788 80AEF398 8FB00018 */ lw $s0, 0x0018($sp) -/* 0478C 80AEF39C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04790 80AEF3A0 03E00008 */ jr $ra -/* 04794 80AEF3A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF3A8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF3A8.s deleted file mode 100644 index f55dea139b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF3A8.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80AEF3A8 -/* 04798 80AEF3A8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0479C 80AEF3AC AFBF001C */ sw $ra, 0x001C($sp) -/* 047A0 80AEF3B0 AFB00018 */ sw $s0, 0x0018($sp) -/* 047A4 80AEF3B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 047A8 80AEF3B8 0C2BB60F */ jal func_80AED83C -/* 047AC 80AEF3BC AFA5002C */ sw $a1, 0x002C($sp) -/* 047B0 80AEF3C0 0C2BACC8 */ jal func_80AEB320 -/* 047B4 80AEF3C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 047B8 80AEF3C8 AFA20024 */ sw $v0, 0x0024($sp) -/* 047BC 80AEF3CC 0C2BBC20 */ jal func_80AEF080 -/* 047C0 80AEF3D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 047C4 80AEF3D4 0C2BAB87 */ jal func_80AEAE1C -/* 047C8 80AEF3D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 047CC 80AEF3DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 047D0 80AEF3E0 0C2BABB3 */ jal func_80AEAECC -/* 047D4 80AEF3E4 8FA5002C */ lw $a1, 0x002C($sp) -/* 047D8 80AEF3E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 047DC 80AEF3EC 8FA5002C */ lw $a1, 0x002C($sp) -/* 047E0 80AEF3F0 0C2BBC7C */ jal func_80AEF1F0 -/* 047E4 80AEF3F4 8FA60024 */ lw $a2, 0x0024($sp) -/* 047E8 80AEF3F8 8FBF001C */ lw $ra, 0x001C($sp) -/* 047EC 80AEF3FC 8FB00018 */ lw $s0, 0x0018($sp) -/* 047F0 80AEF400 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 047F4 80AEF404 03E00008 */ jr $ra -/* 047F8 80AEF408 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF40C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF40C.s deleted file mode 100644 index b93ac087b9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF40C.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80AEF40C -/* 047FC 80AEF40C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04800 80AEF410 AFB00018 */ sw $s0, 0x0018($sp) -/* 04804 80AEF414 AFBF001C */ sw $ra, 0x001C($sp) -/* 04808 80AEF418 AFA40020 */ sw $a0, 0x0020($sp) -/* 0480C 80AEF41C 2490014C */ addiu $s0, $a0, 0x014C ## $s0 = 0000014C -/* 04810 80AEF420 02002025 */ or $a0, $s0, $zero ## $a0 = 0000014C -/* 04814 80AEF424 0C0295B2 */ jal func_800A56C8 -/* 04818 80AEF428 3C054000 */ lui $a1, 0x4000 ## $a1 = 40000000 -/* 0481C 80AEF42C 14400015 */ bne $v0, $zero, .L80AEF484 -/* 04820 80AEF430 02002025 */ or $a0, $s0, $zero ## $a0 = 0000014C -/* 04824 80AEF434 0C0295B2 */ jal func_800A56C8 -/* 04828 80AEF438 3C0540E0 */ lui $a1, 0x40E0 ## $a1 = 40E00000 -/* 0482C 80AEF43C 14400011 */ bne $v0, $zero, .L80AEF484 -/* 04830 80AEF440 02002025 */ or $a0, $s0, $zero ## $a0 = 0000014C -/* 04834 80AEF444 0C0295B2 */ jal func_800A56C8 -/* 04838 80AEF448 3C054140 */ lui $a1, 0x4140 ## $a1 = 41400000 -/* 0483C 80AEF44C 1440000D */ bne $v0, $zero, .L80AEF484 -/* 04840 80AEF450 02002025 */ or $a0, $s0, $zero ## $a0 = 0000014C -/* 04844 80AEF454 0C0295B2 */ jal func_800A56C8 -/* 04848 80AEF458 3C054190 */ lui $a1, 0x4190 ## $a1 = 41900000 -/* 0484C 80AEF45C 14400009 */ bne $v0, $zero, .L80AEF484 -/* 04850 80AEF460 02002025 */ or $a0, $s0, $zero ## $a0 = 0000014C -/* 04854 80AEF464 0C0295B2 */ jal func_800A56C8 -/* 04858 80AEF468 3C0541C8 */ lui $a1, 0x41C8 ## $a1 = 41C80000 -/* 0485C 80AEF46C 14400005 */ bne $v0, $zero, .L80AEF484 -/* 04860 80AEF470 02002025 */ or $a0, $s0, $zero ## $a0 = 0000014C -/* 04864 80AEF474 0C0295B2 */ jal func_800A56C8 -/* 04868 80AEF478 3C054204 */ lui $a1, 0x4204 ## $a1 = 42040000 -/* 0486C 80AEF47C 50400006 */ beql $v0, $zero, .L80AEF498 -/* 04870 80AEF480 8FBF001C */ lw $ra, 0x001C($sp) -.L80AEF484: -/* 04874 80AEF484 8FA40020 */ lw $a0, 0x0020($sp) -/* 04878 80AEF488 24050803 */ addiu $a1, $zero, 0x0803 ## $a1 = 00000803 -/* 0487C 80AEF48C 0C01E245 */ jal func_80078914 -/* 04880 80AEF490 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 04884 80AEF494 8FBF001C */ lw $ra, 0x001C($sp) -.L80AEF498: -/* 04888 80AEF498 8FB00018 */ lw $s0, 0x0018($sp) -/* 0488C 80AEF49C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04890 80AEF4A0 03E00008 */ jr $ra -/* 04894 80AEF4A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF4A8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF4A8.s deleted file mode 100644 index 2317ef2876..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF4A8.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80AEF4A8 -/* 04898 80AEF4A8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0489C 80AEF4AC AFA40018 */ sw $a0, 0x0018($sp) -/* 048A0 80AEF4B0 AFA5001C */ sw $a1, 0x001C($sp) -/* 048A4 80AEF4B4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 048A8 80AEF4B8 8FA50018 */ lw $a1, 0x0018($sp) -/* 048AC 80AEF4BC AFBF0014 */ sw $ra, 0x0014($sp) -/* 048B0 80AEF4C0 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 048B4 80AEF4C4 24076862 */ addiu $a3, $zero, 0x6862 ## $a3 = 00006862 -/* 048B8 80AEF4C8 0C01AEB6 */ jal Audio_PlaySoundAtPosition - -/* 048BC 80AEF4CC 24A500E4 */ addiu $a1, $a1, 0x00E4 ## $a1 = 000000E4 -/* 048C0 80AEF4D0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 048C4 80AEF4D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 048C8 80AEF4D8 03E00008 */ jr $ra -/* 048CC 80AEF4DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF4E0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF4E0.s deleted file mode 100644 index 4d0846c79c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF4E0.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80AEF4E0 -/* 048D0 80AEF4E0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 048D4 80AEF4E4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 048D8 80AEF4E8 AFA40018 */ sw $a0, 0x0018($sp) -/* 048DC 80AEF4EC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 048E0 80AEF4F0 0C0295B2 */ jal func_800A56C8 -/* 048E4 80AEF4F4 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 -/* 048E8 80AEF4F8 10400004 */ beq $v0, $zero, .L80AEF50C -/* 048EC 80AEF4FC 8FA40018 */ lw $a0, 0x0018($sp) -/* 048F0 80AEF500 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 048F4 80AEF504 0C01E245 */ jal func_80078914 -/* 048F8 80AEF508 24056863 */ addiu $a1, $zero, 0x6863 ## $a1 = 00006863 -.L80AEF50C: -/* 048FC 80AEF50C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04900 80AEF510 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04904 80AEF514 03E00008 */ jr $ra -/* 04908 80AEF518 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF51C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF51C.s deleted file mode 100644 index 95bd300ff1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF51C.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80AEF51C -/* 0490C 80AEF51C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04910 80AEF520 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04914 80AEF524 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 04918 80AEF528 0C01E245 */ jal func_80078914 -/* 0491C 80AEF52C 24056865 */ addiu $a1, $zero, 0x6865 ## $a1 = 00006865 -/* 04920 80AEF530 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04924 80AEF534 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04928 80AEF538 03E00008 */ jr $ra -/* 0492C 80AEF53C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF540.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF540.s deleted file mode 100644 index cdd27ffdf8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF540.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80AEF540 -/* 04930 80AEF540 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04934 80AEF544 AFBF0024 */ sw $ra, 0x0024($sp) -/* 04938 80AEF548 AFB00020 */ sw $s0, 0x0020($sp) -/* 0493C 80AEF54C 0C2BAC41 */ jal func_80AEB104 -/* 04940 80AEF550 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04944 80AEF554 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 04948 80AEF558 14410012 */ bne $v0, $at, .L80AEF5A4 -/* 0494C 80AEF55C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04950 80AEF560 0C2BABA9 */ jal func_80AEAEA4 -/* 04954 80AEF564 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 04958 80AEF568 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0495C 80AEF56C 0C2BABAE */ jal func_80AEAEB8 -/* 04960 80AEF570 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 04964 80AEF574 920E014D */ lbu $t6, 0x014D($s0) ## 0000014D -/* 04968 80AEF578 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0496C 80AEF57C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04970 80AEF580 11C10008 */ beq $t6, $at, .L80AEF5A4 -/* 04974 80AEF584 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 04978 80AEF588 24A54BF0 */ addiu $a1, $a1, 0x4BF0 ## $a1 = 06004BF0 -/* 0497C 80AEF58C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 04980 80AEF590 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 04984 80AEF594 0C2BAC99 */ jal func_80AEB264 -/* 04988 80AEF598 AFA00010 */ sw $zero, 0x0010($sp) -/* 0498C 80AEF59C 0C2BBD47 */ jal func_80AEF51C -/* 04990 80AEF5A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AEF5A4: -/* 04994 80AEF5A4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 04998 80AEF5A8 8FB00020 */ lw $s0, 0x0020($sp) -/* 0499C 80AEF5AC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 049A0 80AEF5B0 03E00008 */ jr $ra -/* 049A4 80AEF5B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF5B8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF5B8.s deleted file mode 100644 index cf91a68398..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF5B8.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80AEF5B8 -/* 049A8 80AEF5B8 3C0E80AF */ lui $t6, %hi(D_80AF1938) ## $t6 = 80AF0000 -/* 049AC 80AEF5BC 8DCE1938 */ lw $t6, %lo(D_80AF1938)($t6) -/* 049B0 80AEF5C0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 049B4 80AEF5C4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 049B8 80AEF5C8 15C00012 */ bne $t6, $zero, .L80AEF614 -/* 049BC 80AEF5CC 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 049C0 80AEF5D0 C4800164 */ lwc1 $f0, 0x0164($a0) ## 00000164 -/* 049C4 80AEF5D4 44812000 */ mtc1 $at, $f4 ## $f4 = 60.00 -/* 049C8 80AEF5D8 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 049CC 80AEF5DC 4600203E */ c.le.s $f4, $f0 -/* 049D0 80AEF5E0 00000000 */ nop -/* 049D4 80AEF5E4 4502000C */ bc1fl .L80AEF618 -/* 049D8 80AEF5E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 049DC 80AEF5EC 0C2BABA9 */ jal func_80AEAEA4 -/* 049E0 80AEF5F0 AFA40018 */ sw $a0, 0x0018($sp) -/* 049E4 80AEF5F4 8FA40018 */ lw $a0, 0x0018($sp) -/* 049E8 80AEF5F8 0C2BABAE */ jal func_80AEAEB8 -/* 049EC 80AEF5FC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 049F0 80AEF600 0C2BB55F */ jal func_80AED57C -/* 049F4 80AEF604 8FA40018 */ lw $a0, 0x0018($sp) -/* 049F8 80AEF608 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 049FC 80AEF60C 3C0180AF */ lui $at, %hi(D_80AF1938) ## $at = 80AF0000 -/* 04A00 80AEF610 AC2F1938 */ sw $t7, %lo(D_80AF1938)($at) -.L80AEF614: -/* 04A04 80AEF614 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AEF618: -/* 04A08 80AEF618 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04A0C 80AEF61C 03E00008 */ jr $ra -/* 04A10 80AEF620 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF624.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF624.s deleted file mode 100644 index b0445d0c3a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF624.s +++ /dev/null @@ -1,69 +0,0 @@ -glabel func_80AEF624 -/* 04A14 80AEF624 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 04A18 80AEF628 AFB00028 */ sw $s0, 0x0028($sp) -/* 04A1C 80AEF62C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04A20 80AEF630 AFBF002C */ sw $ra, 0x002C($sp) -/* 04A24 80AEF634 AFA50034 */ sw $a1, 0x0034($sp) -/* 04A28 80AEF638 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 04A2C 80AEF63C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 04A30 80AEF640 0C2BABF8 */ jal func_80AEAFE0 -/* 04A34 80AEF644 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 04A38 80AEF648 10400032 */ beq $v0, $zero, .L80AEF714 -/* 04A3C 80AEF64C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 04A40 80AEF650 0C028800 */ jal SkelAnime_GetFrameCount - -/* 04A44 80AEF654 248463F4 */ addiu $a0, $a0, 0x63F4 ## $a0 = 060063F4 -/* 04A48 80AEF658 8FAE0034 */ lw $t6, 0x0034($sp) -/* 04A4C 80AEF65C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 04A50 80AEF660 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 04A54 80AEF664 8DC81D98 */ lw $t0, 0x1D98($t6) ## 00001D98 -/* 04A58 80AEF668 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 04A5C 80AEF66C 44070000 */ mfc1 $a3, $f0 -/* 04A60 80AEF670 8D0F000C */ lw $t7, 0x000C($t0) ## 0000000C -/* 04A64 80AEF674 24A563F4 */ addiu $a1, $a1, 0x63F4 ## $a1 = 060063F4 -/* 04A68 80AEF678 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 04A6C 80AEF67C 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 04A70 80AEF680 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04A74 80AEF684 468021A0 */ cvt.s.w $f6, $f4 -/* 04A78 80AEF688 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 04A7C 80AEF68C E6060024 */ swc1 $f6, 0x0024($s0) ## 00000024 -/* 04A80 80AEF690 8D180010 */ lw $t8, 0x0010($t0) ## 00000010 -/* 04A84 80AEF694 468021A0 */ cvt.s.w $f6, $f4 -/* 04A88 80AEF698 44984000 */ mtc1 $t8, $f8 ## $f8 = 0.00 -/* 04A8C 80AEF69C 00000000 */ nop -/* 04A90 80AEF6A0 468042A0 */ cvt.s.w $f10, $f8 -/* 04A94 80AEF6A4 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 04A98 80AEF6A8 8D190014 */ lw $t9, 0x0014($t0) ## 00000014 -/* 04A9C 80AEF6AC 44998000 */ mtc1 $t9, $f16 ## $f16 = 0.00 -/* 04AA0 80AEF6B0 00000000 */ nop -/* 04AA4 80AEF6B4 468084A0 */ cvt.s.w $f18, $f16 -/* 04AA8 80AEF6B8 E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C -/* 04AAC 80AEF6BC 85030006 */ lh $v1, 0x0006($t0) ## 00000006 -/* 04AB0 80AEF6C0 A60300B4 */ sh $v1, 0x00B4($s0) ## 000000B4 -/* 04AB4 80AEF6C4 A6030030 */ sh $v1, 0x0030($s0) ## 00000030 -/* 04AB8 80AEF6C8 85030008 */ lh $v1, 0x0008($t0) ## 00000008 -/* 04ABC 80AEF6CC A60300B6 */ sh $v1, 0x00B6($s0) ## 000000B6 -/* 04AC0 80AEF6D0 A6030032 */ sh $v1, 0x0032($s0) ## 00000032 -/* 04AC4 80AEF6D4 8503000A */ lh $v1, 0x000A($t0) ## 0000000A -/* 04AC8 80AEF6D8 A60300B8 */ sh $v1, 0x00B8($s0) ## 000000B8 -/* 04ACC 80AEF6DC A6030034 */ sh $v1, 0x0034($s0) ## 00000034 -/* 04AD0 80AEF6E0 AFA90014 */ sw $t1, 0x0014($sp) -/* 04AD4 80AEF6E4 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 04AD8 80AEF6E8 0C029468 */ jal SkelAnime_ChangeAnim - -/* 04ADC 80AEF6EC E7A00018 */ swc1 $f0, 0x0018($sp) -/* 04AE0 80AEF6F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04AE4 80AEF6F4 0C2BACE9 */ jal func_80AEB3A4 -/* 04AE8 80AEF6F8 8FA50034 */ lw $a1, 0x0034($sp) -/* 04AEC 80AEF6FC 240A0025 */ addiu $t2, $zero, 0x0025 ## $t2 = 00000025 -/* 04AF0 80AEF700 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 04AF4 80AEF704 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 04AF8 80AEF708 AE0A0264 */ sw $t2, 0x0264($s0) ## 00000264 -/* 04AFC 80AEF70C AE0B0268 */ sw $t3, 0x0268($s0) ## 00000268 -/* 04B00 80AEF710 A20C00C8 */ sb $t4, 0x00C8($s0) ## 000000C8 -.L80AEF714: -/* 04B04 80AEF714 8FBF002C */ lw $ra, 0x002C($sp) -/* 04B08 80AEF718 8FB00028 */ lw $s0, 0x0028($sp) -/* 04B0C 80AEF71C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 04B10 80AEF720 03E00008 */ jr $ra -/* 04B14 80AEF724 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF728.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF728.s deleted file mode 100644 index 7c941c16c5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF728.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80AEF728 -/* 04B18 80AEF728 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04B1C 80AEF72C AFBF0024 */ sw $ra, 0x0024($sp) -/* 04B20 80AEF730 10A00016 */ beq $a1, $zero, .L80AEF78C -/* 04B24 80AEF734 AFA40028 */ sw $a0, 0x0028($sp) -/* 04B28 80AEF738 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 04B2C 80AEF73C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 04B30 80AEF740 24843608 */ addiu $a0, $a0, 0x3608 ## $a0 = 06003608 -/* 04B34 80AEF744 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 04B38 80AEF748 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 04B3C 80AEF74C 8FA40028 */ lw $a0, 0x0028($sp) -/* 04B40 80AEF750 468021A0 */ cvt.s.w $f6, $f4 -/* 04B44 80AEF754 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 04B48 80AEF758 44070000 */ mfc1 $a3, $f0 -/* 04B4C 80AEF75C 24A53608 */ addiu $a1, $a1, 0x3608 ## $a1 = 06003608 -/* 04B50 80AEF760 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04B54 80AEF764 AFA00014 */ sw $zero, 0x0014($sp) -/* 04B58 80AEF768 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 04B5C 80AEF76C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04B60 80AEF770 0C029468 */ jal SkelAnime_ChangeAnim - -/* 04B64 80AEF774 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 04B68 80AEF778 0C2BACF3 */ jal func_80AEB3CC -/* 04B6C 80AEF77C 8FA40028 */ lw $a0, 0x0028($sp) -/* 04B70 80AEF780 8FAF0028 */ lw $t7, 0x0028($sp) -/* 04B74 80AEF784 240E0026 */ addiu $t6, $zero, 0x0026 ## $t6 = 00000026 -/* 04B78 80AEF788 ADEE0264 */ sw $t6, 0x0264($t7) ## 00000264 -.L80AEF78C: -/* 04B7C 80AEF78C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 04B80 80AEF790 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04B84 80AEF794 03E00008 */ jr $ra -/* 04B88 80AEF798 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF79C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF79C.s deleted file mode 100644 index a6c36c20cd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF79C.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80AEF79C -/* 04B8C 80AEF79C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04B90 80AEF7A0 AFA40028 */ sw $a0, 0x0028($sp) -/* 04B94 80AEF7A4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 04B98 80AEF7A8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 04B9C 80AEF7AC 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 04BA0 80AEF7B0 0C2BABF8 */ jal func_80AEAFE0 -/* 04BA4 80AEF7B4 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 04BA8 80AEF7B8 10400015 */ beq $v0, $zero, .L80AEF810 -/* 04BAC 80AEF7BC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 04BB0 80AEF7C0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 04BB4 80AEF7C4 24842EC0 */ addiu $a0, $a0, 0x2EC0 ## $a0 = 06002EC0 -/* 04BB8 80AEF7C8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 04BBC 80AEF7CC 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 04BC0 80AEF7D0 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 04BC4 80AEF7D4 468021A0 */ cvt.s.w $f6, $f4 -/* 04BC8 80AEF7D8 8FA40028 */ lw $a0, 0x0028($sp) -/* 04BCC 80AEF7DC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 04BD0 80AEF7E0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 04BD4 80AEF7E4 AFAE0014 */ sw $t6, 0x0014($sp) -/* 04BD8 80AEF7E8 24A52EC0 */ addiu $a1, $a1, 0x2EC0 ## $a1 = 06002EC0 -/* 04BDC 80AEF7EC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 04BE0 80AEF7F0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04BE4 80AEF7F4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 04BE8 80AEF7F8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 04BEC 80AEF7FC 0C029468 */ jal SkelAnime_ChangeAnim - -/* 04BF0 80AEF800 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04BF4 80AEF804 8FB80028 */ lw $t8, 0x0028($sp) -/* 04BF8 80AEF808 240F0027 */ addiu $t7, $zero, 0x0027 ## $t7 = 00000027 -/* 04BFC 80AEF80C AF0F0264 */ sw $t7, 0x0264($t8) ## 00000264 -.L80AEF810: -/* 04C00 80AEF810 8FBF0024 */ lw $ra, 0x0024($sp) -/* 04C04 80AEF814 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04C08 80AEF818 03E00008 */ jr $ra -/* 04C0C 80AEF81C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF820.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF820.s deleted file mode 100644 index 5dad9ca449..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF820.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80AEF820 -/* 04C10 80AEF820 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04C14 80AEF824 AFBF0024 */ sw $ra, 0x0024($sp) -/* 04C18 80AEF828 10A00015 */ beq $a1, $zero, .L80AEF880 -/* 04C1C 80AEF82C AFA40028 */ sw $a0, 0x0028($sp) -/* 04C20 80AEF830 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 04C24 80AEF834 0C028800 */ jal SkelAnime_GetFrameCount - -/* 04C28 80AEF838 248497B8 */ addiu $a0, $a0, 0x97B8 ## $a0 = 060097B8 -/* 04C2C 80AEF83C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 04C30 80AEF840 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 04C34 80AEF844 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 04C38 80AEF848 468021A0 */ cvt.s.w $f6, $f4 -/* 04C3C 80AEF84C 8FA40028 */ lw $a0, 0x0028($sp) -/* 04C40 80AEF850 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 04C44 80AEF854 24A597B8 */ addiu $a1, $a1, 0x97B8 ## $a1 = 060097B8 -/* 04C48 80AEF858 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04C4C 80AEF85C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 04C50 80AEF860 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 04C54 80AEF864 AFA00014 */ sw $zero, 0x0014($sp) -/* 04C58 80AEF868 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 04C5C 80AEF86C 0C029468 */ jal SkelAnime_ChangeAnim - -/* 04C60 80AEF870 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04C64 80AEF874 8FAF0028 */ lw $t7, 0x0028($sp) -/* 04C68 80AEF878 240E0028 */ addiu $t6, $zero, 0x0028 ## $t6 = 00000028 -/* 04C6C 80AEF87C ADEE0264 */ sw $t6, 0x0264($t7) ## 00000264 -.L80AEF880: -/* 04C70 80AEF880 8FBF0024 */ lw $ra, 0x0024($sp) -/* 04C74 80AEF884 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04C78 80AEF888 03E00008 */ jr $ra -/* 04C7C 80AEF88C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF890.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF890.s deleted file mode 100644 index a610334bc9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF890.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80AEF890 -/* 04C80 80AEF890 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 04C84 80AEF894 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 04C88 80AEF898 8C6E1360 */ lw $t6, 0x1360($v1) ## 8015F9C0 -/* 04C8C 80AEF89C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04C90 80AEF8A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04C94 80AEF8A4 29C10004 */ slti $at, $t6, 0x0004 -/* 04C98 80AEF8A8 AFA40028 */ sw $a0, 0x0028($sp) -/* 04C9C 80AEF8AC 1020001C */ beq $at, $zero, .L80AEF920 -/* 04CA0 80AEF8B0 AFA5002C */ sw $a1, 0x002C($sp) -/* 04CA4 80AEF8B4 0C2BABCE */ jal func_80AEAF38 -/* 04CA8 80AEF8B8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 04CAC 80AEF8BC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 04CB0 80AEF8C0 10400017 */ beq $v0, $zero, .L80AEF920 -/* 04CB4 80AEF8C4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 04CB8 80AEF8C8 8FAF002C */ lw $t7, 0x002C($sp) -/* 04CBC 80AEF8CC 94790F20 */ lhu $t9, 0x0F20($v1) ## 8015F580 -/* 04CC0 80AEF8D0 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 04CC4 80AEF8D4 030FC021 */ addu $t8, $t8, $t7 -/* 04CC8 80AEF8D8 83181CBC */ lb $t8, 0x1CBC($t8) ## 00011CBC -/* 04CCC 80AEF8DC 37280020 */ ori $t0, $t9, 0x0020 ## $t0 = 00000020 -/* 04CD0 80AEF8E0 A4680F20 */ sh $t0, 0x0F20($v1) ## 8015F580 -/* 04CD4 80AEF8E4 8FA40028 */ lw $a0, 0x0028($sp) -/* 04CD8 80AEF8E8 0C2BAB78 */ jal func_80AEADE0 -/* 04CDC 80AEF8EC A3B8001F */ sb $t8, 0x001F($sp) -/* 04CE0 80AEF8F0 8FA4002C */ lw $a0, 0x002C($sp) -/* 04CE4 80AEF8F4 0C00B2DD */ jal Flags_SetSwitch - -/* 04CE8 80AEF8F8 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 04CEC 80AEF8FC 8FA40028 */ lw $a0, 0x0028($sp) -/* 04CF0 80AEF900 0C2BAC3B */ jal func_80AEB0EC -/* 04CF4 80AEF904 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 04CF8 80AEF908 8FAA0028 */ lw $t2, 0x0028($sp) -/* 04CFC 80AEF90C 2409002A */ addiu $t1, $zero, 0x002A ## $t1 = 0000002A -/* 04D00 80AEF910 AD490264 */ sw $t1, 0x0264($t2) ## 00000264 -/* 04D04 80AEF914 8FAC0028 */ lw $t4, 0x0028($sp) -/* 04D08 80AEF918 83AB001F */ lb $t3, 0x001F($sp) -/* 04D0C 80AEF91C A18B0003 */ sb $t3, 0x0003($t4) ## 00000003 -.L80AEF920: -/* 04D10 80AEF920 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04D14 80AEF924 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04D18 80AEF928 03E00008 */ jr $ra -/* 04D1C 80AEF92C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF930.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF930.s deleted file mode 100644 index 1dbb5bfc09..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF930.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80AEF930 -/* 04D20 80AEF930 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04D24 80AEF934 AFBF001C */ sw $ra, 0x001C($sp) -/* 04D28 80AEF938 AFB00018 */ sw $s0, 0x0018($sp) -/* 04D2C 80AEF93C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04D30 80AEF940 0C2BAC41 */ jal func_80AEB104 -/* 04D34 80AEF944 AFA50024 */ sw $a1, 0x0024($sp) -/* 04D38 80AEF948 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 04D3C 80AEF94C 1441000E */ bne $v0, $at, .L80AEF988 -/* 04D40 80AEF950 24184048 */ addiu $t8, $zero, 0x4048 ## $t8 = 00004048 -/* 04D44 80AEF954 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 04D48 80AEF958 A618010E */ sh $t8, 0x010E($s0) ## 0000010E -/* 04D4C 80AEF95C 3305FFFF */ andi $a1, $t8, 0xFFFF ## $a1 = 00004048 -/* 04D50 80AEF960 35CF0009 */ ori $t7, $t6, 0x0009 ## $t7 = 00000009 -/* 04D54 80AEF964 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 04D58 80AEF968 0C042DC8 */ jal func_8010B720 -/* 04D5C 80AEF96C 8FA40024 */ lw $a0, 0x0024($sp) -/* 04D60 80AEF970 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04D64 80AEF974 0C2BBD2A */ jal func_80AEF4A8 -/* 04D68 80AEF978 8FA50024 */ lw $a1, 0x0024($sp) -/* 04D6C 80AEF97C 2419002B */ addiu $t9, $zero, 0x002B ## $t9 = 0000002B -/* 04D70 80AEF980 AE190264 */ sw $t9, 0x0264($s0) ## 00000264 -/* 04D74 80AEF984 AE000268 */ sw $zero, 0x0268($s0) ## 00000268 -.L80AEF988: -/* 04D78 80AEF988 8FBF001C */ lw $ra, 0x001C($sp) -/* 04D7C 80AEF98C 8FB00018 */ lw $s0, 0x0018($sp) -/* 04D80 80AEF990 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04D84 80AEF994 03E00008 */ jr $ra -/* 04D88 80AEF998 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF99C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF99C.s deleted file mode 100644 index bfb9fb8661..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF99C.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80AEF99C -/* 04D8C 80AEF99C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04D90 80AEF9A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04D94 80AEF9A4 AFA40018 */ sw $a0, 0x0018($sp) -/* 04D98 80AEF9A8 0C2BAC6D */ jal func_80AEB1B4 -/* 04D9C 80AEF9AC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 04DA0 80AEF9B0 10400005 */ beq $v0, $zero, .L80AEF9C8 -/* 04DA4 80AEF9B4 8FA40018 */ lw $a0, 0x0018($sp) -/* 04DA8 80AEF9B8 0C2BAC3B */ jal func_80AEB0EC -/* 04DAC 80AEF9BC 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 04DB0 80AEF9C0 0C00B55C */ jal Actor_Kill - -/* 04DB4 80AEF9C4 8FA40018 */ lw $a0, 0x0018($sp) -.L80AEF9C8: -/* 04DB8 80AEF9C8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04DBC 80AEF9CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04DC0 80AEF9D0 03E00008 */ jr $ra -/* 04DC4 80AEF9D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF9D8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF9D8.s deleted file mode 100644 index 702a843649..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF9D8.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80AEF9D8 -/* 04DC8 80AEF9D8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04DCC 80AEF9DC AFBF001C */ sw $ra, 0x001C($sp) -/* 04DD0 80AEF9E0 AFB00018 */ sw $s0, 0x0018($sp) -/* 04DD4 80AEF9E4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04DD8 80AEF9E8 0C2BB60F */ jal func_80AED83C -/* 04DDC 80AEF9EC AFA50024 */ sw $a1, 0x0024($sp) -/* 04DE0 80AEF9F0 0C2BACC8 */ jal func_80AEB320 -/* 04DE4 80AEF9F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04DE8 80AEF9F8 0C2BAB87 */ jal func_80AEAE1C -/* 04DEC 80AEF9FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04DF0 80AEFA00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04DF4 80AEFA04 0C2BBD89 */ jal func_80AEF624 -/* 04DF8 80AEFA08 8FA50024 */ lw $a1, 0x0024($sp) -/* 04DFC 80AEFA0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04E00 80AEFA10 0C2BAC88 */ jal func_80AEB220 -/* 04E04 80AEFA14 8FA50024 */ lw $a1, 0x0024($sp) -/* 04E08 80AEFA18 8FBF001C */ lw $ra, 0x001C($sp) -/* 04E0C 80AEFA1C 8FB00018 */ lw $s0, 0x0018($sp) -/* 04E10 80AEFA20 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04E14 80AEFA24 03E00008 */ jr $ra -/* 04E18 80AEFA28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFA2C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFA2C.s deleted file mode 100644 index 90f550550e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFA2C.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80AEFA2C -/* 04E1C 80AEFA2C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04E20 80AEFA30 AFBF001C */ sw $ra, 0x001C($sp) -/* 04E24 80AEFA34 AFB00018 */ sw $s0, 0x0018($sp) -/* 04E28 80AEFA38 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04E2C 80AEFA3C 0C2BB60F */ jal func_80AED83C -/* 04E30 80AEFA40 AFA5002C */ sw $a1, 0x002C($sp) -/* 04E34 80AEFA44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04E38 80AEFA48 0C2BACD9 */ jal func_80AEB364 -/* 04E3C 80AEFA4C 8FA5002C */ lw $a1, 0x002C($sp) -/* 04E40 80AEFA50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04E44 80AEFA54 0C2BABB3 */ jal func_80AEAECC -/* 04E48 80AEFA58 8FA5002C */ lw $a1, 0x002C($sp) -/* 04E4C 80AEFA5C 0C2BACC8 */ jal func_80AEB320 -/* 04E50 80AEFA60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04E54 80AEFA64 AFA20024 */ sw $v0, 0x0024($sp) -/* 04E58 80AEFA68 0C2BBD38 */ jal func_80AEF4E0 -/* 04E5C 80AEFA6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04E60 80AEFA70 0C2BBD6E */ jal func_80AEF5B8 -/* 04E64 80AEFA74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04E68 80AEFA78 0C2BBD03 */ jal func_80AEF40C -/* 04E6C 80AEFA7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04E70 80AEFA80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04E74 80AEFA84 0C2BBDCA */ jal func_80AEF728 -/* 04E78 80AEFA88 8FA50024 */ lw $a1, 0x0024($sp) -/* 04E7C 80AEFA8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04E80 80AEFA90 0C2BAC88 */ jal func_80AEB220 -/* 04E84 80AEFA94 8FA5002C */ lw $a1, 0x002C($sp) -/* 04E88 80AEFA98 8FBF001C */ lw $ra, 0x001C($sp) -/* 04E8C 80AEFA9C 8FB00018 */ lw $s0, 0x0018($sp) -/* 04E90 80AEFAA0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04E94 80AEFAA4 03E00008 */ jr $ra -/* 04E98 80AEFAA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFAAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFAAC.s deleted file mode 100644 index cea585e4e2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFAAC.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80AEFAAC -/* 04E9C 80AEFAAC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04EA0 80AEFAB0 AFBF001C */ sw $ra, 0x001C($sp) -/* 04EA4 80AEFAB4 AFB00018 */ sw $s0, 0x0018($sp) -/* 04EA8 80AEFAB8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04EAC 80AEFABC 0C2BB60F */ jal func_80AED83C -/* 04EB0 80AEFAC0 AFA50024 */ sw $a1, 0x0024($sp) -/* 04EB4 80AEFAC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04EB8 80AEFAC8 0C2BABB3 */ jal func_80AEAECC -/* 04EBC 80AEFACC 8FA50024 */ lw $a1, 0x0024($sp) -/* 04EC0 80AEFAD0 0C2BACC8 */ jal func_80AEB320 -/* 04EC4 80AEFAD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04EC8 80AEFAD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04ECC 80AEFADC 0C2BBDE7 */ jal func_80AEF79C -/* 04ED0 80AEFAE0 8FA50024 */ lw $a1, 0x0024($sp) -/* 04ED4 80AEFAE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04ED8 80AEFAE8 0C2BAC88 */ jal func_80AEB220 -/* 04EDC 80AEFAEC 8FA50024 */ lw $a1, 0x0024($sp) -/* 04EE0 80AEFAF0 8FBF001C */ lw $ra, 0x001C($sp) -/* 04EE4 80AEFAF4 8FB00018 */ lw $s0, 0x0018($sp) -/* 04EE8 80AEFAF8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04EEC 80AEFAFC 03E00008 */ jr $ra -/* 04EF0 80AEFB00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFB04.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFB04.s deleted file mode 100644 index d04cfee9fd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFB04.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80AEFB04 -/* 04EF4 80AEFB04 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04EF8 80AEFB08 AFBF001C */ sw $ra, 0x001C($sp) -/* 04EFC 80AEFB0C AFB00018 */ sw $s0, 0x0018($sp) -/* 04F00 80AEFB10 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04F04 80AEFB14 0C2BB60F */ jal func_80AED83C -/* 04F08 80AEFB18 AFA5002C */ sw $a1, 0x002C($sp) -/* 04F0C 80AEFB1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04F10 80AEFB20 0C2BABB3 */ jal func_80AEAECC -/* 04F14 80AEFB24 8FA5002C */ lw $a1, 0x002C($sp) -/* 04F18 80AEFB28 0C2BACC8 */ jal func_80AEB320 -/* 04F1C 80AEFB2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04F20 80AEFB30 AFA20024 */ sw $v0, 0x0024($sp) -/* 04F24 80AEFB34 0C2BAB87 */ jal func_80AEAE1C -/* 04F28 80AEFB38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04F2C 80AEFB3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04F30 80AEFB40 0C2BBE08 */ jal func_80AEF820 -/* 04F34 80AEFB44 8FA50024 */ lw $a1, 0x0024($sp) -/* 04F38 80AEFB48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04F3C 80AEFB4C 0C2BAC88 */ jal func_80AEB220 -/* 04F40 80AEFB50 8FA5002C */ lw $a1, 0x002C($sp) -/* 04F44 80AEFB54 8FBF001C */ lw $ra, 0x001C($sp) -/* 04F48 80AEFB58 8FB00018 */ lw $s0, 0x0018($sp) -/* 04F4C 80AEFB5C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04F50 80AEFB60 03E00008 */ jr $ra -/* 04F54 80AEFB64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFB68.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFB68.s deleted file mode 100644 index 7f810aab89..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFB68.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AEFB68 -/* 04F58 80AEFB68 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04F5C 80AEFB6C AFBF001C */ sw $ra, 0x001C($sp) -/* 04F60 80AEFB70 AFB00018 */ sw $s0, 0x0018($sp) -/* 04F64 80AEFB74 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04F68 80AEFB78 0C2BB60F */ jal func_80AED83C -/* 04F6C 80AEFB7C AFA50024 */ sw $a1, 0x0024($sp) -/* 04F70 80AEFB80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04F74 80AEFB84 0C2BABB3 */ jal func_80AEAECC -/* 04F78 80AEFB88 8FA50024 */ lw $a1, 0x0024($sp) -/* 04F7C 80AEFB8C 0C2BACC8 */ jal func_80AEB320 -/* 04F80 80AEFB90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04F84 80AEFB94 0C2BAB87 */ jal func_80AEAE1C -/* 04F88 80AEFB98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04F8C 80AEFB9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04F90 80AEFBA0 0C2BBE24 */ jal func_80AEF890 -/* 04F94 80AEFBA4 8FA50024 */ lw $a1, 0x0024($sp) -/* 04F98 80AEFBA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04F9C 80AEFBAC 0C2BAC88 */ jal func_80AEB220 -/* 04FA0 80AEFBB0 8FA50024 */ lw $a1, 0x0024($sp) -/* 04FA4 80AEFBB4 8FBF001C */ lw $ra, 0x001C($sp) -/* 04FA8 80AEFBB8 8FB00018 */ lw $s0, 0x0018($sp) -/* 04FAC 80AEFBBC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04FB0 80AEFBC0 03E00008 */ jr $ra -/* 04FB4 80AEFBC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFBC8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFBC8.s deleted file mode 100644 index 1b50d59bc4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFBC8.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80AEFBC8 -/* 04FB8 80AEFBC8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04FBC 80AEFBCC AFBF001C */ sw $ra, 0x001C($sp) -/* 04FC0 80AEFBD0 AFB00018 */ sw $s0, 0x0018($sp) -/* 04FC4 80AEFBD4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04FC8 80AEFBD8 0C2BB60F */ jal func_80AED83C -/* 04FCC 80AEFBDC AFA50024 */ sw $a1, 0x0024($sp) -/* 04FD0 80AEFBE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04FD4 80AEFBE4 0C2BABB3 */ jal func_80AEAECC -/* 04FD8 80AEFBE8 8FA50024 */ lw $a1, 0x0024($sp) -/* 04FDC 80AEFBEC 0C2BACC8 */ jal func_80AEB320 -/* 04FE0 80AEFBF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04FE4 80AEFBF4 0C2BAB87 */ jal func_80AEAE1C -/* 04FE8 80AEFBF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04FEC 80AEFBFC 0C2BBD50 */ jal func_80AEF540 -/* 04FF0 80AEFC00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04FF4 80AEFC04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04FF8 80AEFC08 0C2BBE4C */ jal func_80AEF930 -/* 04FFC 80AEFC0C 8FA50024 */ lw $a1, 0x0024($sp) -/* 05000 80AEFC10 8FBF001C */ lw $ra, 0x001C($sp) -/* 05004 80AEFC14 8FB00018 */ lw $s0, 0x0018($sp) -/* 05008 80AEFC18 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0500C 80AEFC1C 03E00008 */ jr $ra -/* 05010 80AEFC20 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFC24.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFC24.s deleted file mode 100644 index 18346c310f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFC24.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80AEFC24 -/* 05014 80AEFC24 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05018 80AEFC28 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0501C 80AEFC2C AFA40018 */ sw $a0, 0x0018($sp) -/* 05020 80AEFC30 0C2BB60F */ jal func_80AED83C -/* 05024 80AEFC34 AFA5001C */ sw $a1, 0x001C($sp) -/* 05028 80AEFC38 8FA40018 */ lw $a0, 0x0018($sp) -/* 0502C 80AEFC3C 0C2BBE67 */ jal func_80AEF99C -/* 05030 80AEFC40 8FA5001C */ lw $a1, 0x001C($sp) -/* 05034 80AEFC44 8FBF0014 */ lw $ra, 0x0014($sp) -/* 05038 80AEFC48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0503C 80AEFC4C 03E00008 */ jr $ra -/* 05040 80AEFC50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFC54.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFC54.s deleted file mode 100644 index 5162a8b3ce..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFC54.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80AEFC54 -/* 05044 80AEFC54 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 05048 80AEFC58 9442F580 */ lhu $v0, -0x0A80($v0) ## 8015F580 -/* 0504C 80AEFC5C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 05050 80AEFC60 AFB00020 */ sw $s0, 0x0020($sp) -/* 05054 80AEFC64 304E0020 */ andi $t6, $v0, 0x0020 ## $t6 = 00000000 -/* 05058 80AEFC68 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0505C 80AEFC6C AFBF0024 */ sw $ra, 0x0024($sp) -/* 05060 80AEFC70 11C00016 */ beq $t6, $zero, .L80AEFCCC -/* 05064 80AEFC74 AFA5002C */ sw $a1, 0x002C($sp) -/* 05068 80AEFC78 304F0040 */ andi $t7, $v0, 0x0040 ## $t7 = 00000000 -/* 0506C 80AEFC7C 15E00013 */ bne $t7, $zero, .L80AEFCCC -/* 05070 80AEFC80 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 05074 80AEFC84 24A597B8 */ addiu $a1, $a1, 0x97B8 ## $a1 = 060097B8 -/* 05078 80AEFC88 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0507C 80AEFC8C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 05080 80AEFC90 0C2BAC99 */ jal func_80AEB264 -/* 05084 80AEFC94 AFA00010 */ sw $zero, 0x0010($sp) -/* 05088 80AEFC98 24180029 */ addiu $t8, $zero, 0x0029 ## $t8 = 00000029 -/* 0508C 80AEFC9C AE180264 */ sw $t8, 0x0264($s0) ## 00000264 -/* 05090 80AEFCA0 0C2BAC22 */ jal func_80AEB088 -/* 05094 80AEFCA4 8FA4002C */ lw $a0, 0x002C($sp) -/* 05098 80AEFCA8 AE02028C */ sw $v0, 0x028C($s0) ## 0000028C -/* 0509C 80AEFCAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 050A0 80AEFCB0 0C2BAC3B */ jal func_80AEB0EC -/* 050A4 80AEFCB4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 050A8 80AEFCB8 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 -/* 050AC 80AEFCBC 2401FFF6 */ addiu $at, $zero, 0xFFF6 ## $at = FFFFFFF6 -/* 050B0 80AEFCC0 03214024 */ and $t0, $t9, $at -/* 050B4 80AEFCC4 10000003 */ beq $zero, $zero, .L80AEFCD4 -/* 050B8 80AEFCC8 AE080004 */ sw $t0, 0x0004($s0) ## 00000004 -.L80AEFCCC: -/* 050BC 80AEFCCC 0C00B55C */ jal Actor_Kill - -/* 050C0 80AEFCD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AEFCD4: -/* 050C4 80AEFCD4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 050C8 80AEFCD8 8FB00020 */ lw $s0, 0x0020($sp) -/* 050CC 80AEFCDC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 050D0 80AEFCE0 03E00008 */ jr $ra -/* 050D4 80AEFCE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFCE8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFCE8.s deleted file mode 100644 index 92b418fa0a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFCE8.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80AEFCE8 -/* 050D8 80AEFCE8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 050DC 80AEFCEC AFBF0014 */ sw $ra, 0x0014($sp) -/* 050E0 80AEFCF0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 050E4 80AEFCF4 AFA60018 */ sw $a2, 0x0018($sp) -/* 050E8 80AEFCF8 0C2BAC22 */ jal func_80AEB088 -/* 050EC 80AEFCFC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 050F0 80AEFD00 8FA60018 */ lw $a2, 0x0018($sp) -/* 050F4 80AEFD04 240E002A */ addiu $t6, $zero, 0x002A ## $t6 = 0000002A -/* 050F8 80AEFD08 10400007 */ beq $v0, $zero, .L80AEFD28 -/* 050FC 80AEFD0C ACC2028C */ sw $v0, 0x028C($a2) ## 0000028C -/* 05100 80AEFD10 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 05104 80AEFD14 ACCE0264 */ sw $t6, 0x0264($a2) ## 00000264 -/* 05108 80AEFD18 ACCF0268 */ sw $t7, 0x0268($a2) ## 00000268 -/* 0510C 80AEFD1C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 05110 80AEFD20 0C2BAC3B */ jal func_80AEB0EC -/* 05114 80AEFD24 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -.L80AEFD28: -/* 05118 80AEFD28 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0511C 80AEFD2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05120 80AEFD30 03E00008 */ jr $ra -/* 05124 80AEFD34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFD38.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFD38.s deleted file mode 100644 index 552ad8de7c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFD38.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80AEFD38 -/* 05128 80AEFD38 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0512C 80AEFD3C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 05130 80AEFD40 944E0EDA */ lhu $t6, 0x0EDA($v0) ## 8015F53A -/* 05134 80AEFD44 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 05138 80AEFD48 AFBF001C */ sw $ra, 0x001C($sp) -/* 0513C 80AEFD4C 31CF0080 */ andi $t7, $t6, 0x0080 ## $t7 = 00000000 -/* 05140 80AEFD50 11E00015 */ beq $t7, $zero, .L80AEFDA8 -/* 05144 80AEFD54 AFA50024 */ sw $a1, 0x0024($sp) -/* 05148 80AEFD58 8C580004 */ lw $t8, 0x0004($v0) ## 8015E664 -/* 0514C 80AEFD5C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 05150 80AEFD60 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 05154 80AEFD64 17010010 */ bne $t8, $at, .L80AEFDA8 -/* 05158 80AEFD68 24A597B8 */ addiu $a1, $a1, 0x97B8 ## $a1 = 060097B8 -/* 0515C 80AEFD6C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 05160 80AEFD70 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 05164 80AEFD74 AFA00010 */ sw $zero, 0x0010($sp) -/* 05168 80AEFD78 0C2BAC99 */ jal func_80AEB264 -/* 0516C 80AEFD7C AFA40020 */ sw $a0, 0x0020($sp) -/* 05170 80AEFD80 8FA40020 */ lw $a0, 0x0020($sp) -/* 05174 80AEFD84 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 05178 80AEFD88 2409002C */ addiu $t1, $zero, 0x002C ## $t1 = 0000002C -/* 0517C 80AEFD8C 8C990004 */ lw $t9, 0x0004($a0) ## 00000004 -/* 05180 80AEFD90 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 05184 80AEFD94 AC890264 */ sw $t1, 0x0264($a0) ## 00000264 -/* 05188 80AEFD98 03214024 */ and $t0, $t9, $at -/* 0518C 80AEFD9C AC880004 */ sw $t0, 0x0004($a0) ## 00000004 -/* 05190 80AEFDA0 10000003 */ beq $zero, $zero, .L80AEFDB0 -/* 05194 80AEFDA4 AC8A0268 */ sw $t2, 0x0268($a0) ## 00000268 -.L80AEFDA8: -/* 05198 80AEFDA8 0C00B55C */ jal Actor_Kill - -/* 0519C 80AEFDAC 00000000 */ nop -.L80AEFDB0: -/* 051A0 80AEFDB0 8FBF001C */ lw $ra, 0x001C($sp) -/* 051A4 80AEFDB4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 051A8 80AEFDB8 03E00008 */ jr $ra -/* 051AC 80AEFDBC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFDC0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFDC0.s deleted file mode 100644 index 6fe2271cb0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFDC0.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80AEFDC0 -/* 051B0 80AEFDC0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 051B4 80AEFDC4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 051B8 80AEFDC8 AFA5001C */ sw $a1, 0x001C($sp) -/* 051BC 80AEFDCC 0C00BC65 */ jal func_8002F194 -/* 051C0 80AEFDD0 AFA40018 */ sw $a0, 0x0018($sp) -/* 051C4 80AEFDD4 14400013 */ bne $v0, $zero, .L80AEFE24 -/* 051C8 80AEFDD8 8FA60018 */ lw $a2, 0x0018($sp) -/* 051CC 80AEFDDC 8CCE0004 */ lw $t6, 0x0004($a2) ## 00000004 -/* 051D0 80AEFDE0 2405001F */ addiu $a1, $zero, 0x001F ## $a1 = 0000001F -/* 051D4 80AEFDE4 35CF0009 */ ori $t7, $t6, 0x0009 ## $t7 = 00000009 -/* 051D8 80AEFDE8 ACCF0004 */ sw $t7, 0x0004($a2) ## 00000004 -/* 051DC 80AEFDEC AFA60018 */ sw $a2, 0x0018($sp) -/* 051E0 80AEFDF0 0C01B0D8 */ jal Text_GetFaceReaction -/* 051E4 80AEFDF4 8FA4001C */ lw $a0, 0x001C($sp) -/* 051E8 80AEFDF8 8FA60018 */ lw $a2, 0x0018($sp) -/* 051EC 80AEFDFC 3058FFFF */ andi $t8, $v0, 0xFFFF ## $t8 = 00000000 -/* 051F0 80AEFE00 17000003 */ bne $t8, $zero, .L80AEFE10 -/* 051F4 80AEFE04 A4C2010E */ sh $v0, 0x010E($a2) ## 0000010E -/* 051F8 80AEFE08 2419402C */ addiu $t9, $zero, 0x402C ## $t9 = 0000402C -/* 051FC 80AEFE0C A4D9010E */ sh $t9, 0x010E($a2) ## 0000010E -.L80AEFE10: -/* 05200 80AEFE10 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 05204 80AEFE14 0C00BCBD */ jal func_8002F2F4 -/* 05208 80AEFE18 8FA5001C */ lw $a1, 0x001C($sp) -/* 0520C 80AEFE1C 10000002 */ beq $zero, $zero, .L80AEFE28 -/* 05210 80AEFE20 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AEFE24: -/* 05214 80AEFE24 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AEFE28: -/* 05218 80AEFE28 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0521C 80AEFE2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05220 80AEFE30 03E00008 */ jr $ra -/* 05224 80AEFE34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFE38.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFE38.s deleted file mode 100644 index 3bed6a3f29..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFE38.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80AEFE38 -/* 05228 80AEFE38 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0522C 80AEFE3C AFBF0014 */ sw $ra, 0x0014($sp) -/* 05230 80AEFE40 AFA40018 */ sw $a0, 0x0018($sp) -/* 05234 80AEFE44 0C042F6F */ jal func_8010BDBC -/* 05238 80AEFE48 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 0523C 80AEFE4C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 05240 80AEFE50 14410007 */ bne $v0, $at, .L80AEFE70 -/* 05244 80AEFE54 8FA30018 */ lw $v1, 0x0018($sp) -/* 05248 80AEFE58 8C6E0004 */ lw $t6, 0x0004($v1) ## 00000004 -/* 0524C 80AEFE5C 2401FFF6 */ addiu $at, $zero, 0xFFF6 ## $at = FFFFFFF6 -/* 05250 80AEFE60 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 05254 80AEFE64 01C17824 */ and $t7, $t6, $at -/* 05258 80AEFE68 10000002 */ beq $zero, $zero, .L80AEFE74 -/* 0525C 80AEFE6C AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 -.L80AEFE70: -/* 05260 80AEFE70 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AEFE74: -/* 05264 80AEFE74 8FBF0014 */ lw $ra, 0x0014($sp) -/* 05268 80AEFE78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0526C 80AEFE7C 03E00008 */ jr $ra -/* 05270 80AEFE80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFE84.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFE84.s deleted file mode 100644 index 72acc6a005..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFE84.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_80AEFE84 -/* 05274 80AEFE84 10C00003 */ beq $a2, $zero, .L80AEFE94 -/* 05278 80AEFE88 AFA50004 */ sw $a1, 0x0004($sp) -/* 0527C 80AEFE8C 240E002D */ addiu $t6, $zero, 0x002D ## $t6 = 0000002D -/* 05280 80AEFE90 AC8E0264 */ sw $t6, 0x0264($a0) ## 00000264 -.L80AEFE94: -/* 05284 80AEFE94 03E00008 */ jr $ra -/* 05288 80AEFE98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFE9C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFE9C.s deleted file mode 100644 index de8f254e0a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFE9C.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80AEFE9C -/* 0528C 80AEFE9C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05290 80AEFEA0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 05294 80AEFEA4 0C2BBF8E */ jal func_80AEFE38 -/* 05298 80AEFEA8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0529C 80AEFEAC 10400003 */ beq $v0, $zero, .L80AEFEBC -/* 052A0 80AEFEB0 8FAF0018 */ lw $t7, 0x0018($sp) -/* 052A4 80AEFEB4 240E002C */ addiu $t6, $zero, 0x002C ## $t6 = 0000002C -/* 052A8 80AEFEB8 ADEE0264 */ sw $t6, 0x0264($t7) ## 00000264 -.L80AEFEBC: -/* 052AC 80AEFEBC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 052B0 80AEFEC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 052B4 80AEFEC4 03E00008 */ jr $ra -/* 052B8 80AEFEC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFECC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFECC.s deleted file mode 100644 index 3999dde68f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFECC.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80AEFECC -/* 052BC 80AEFECC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 052C0 80AEFED0 AFBF001C */ sw $ra, 0x001C($sp) -/* 052C4 80AEFED4 AFB10018 */ sw $s1, 0x0018($sp) -/* 052C8 80AEFED8 AFB00014 */ sw $s0, 0x0014($sp) -/* 052CC 80AEFEDC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 052D0 80AEFEE0 0C2BBBDA */ jal func_80AEEF68 -/* 052D4 80AEFEE4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 052D8 80AEFEE8 0C2BACC8 */ jal func_80AEB320 -/* 052DC 80AEFEEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 052E0 80AEFEF0 0C2BAB87 */ jal func_80AEAE1C -/* 052E4 80AEFEF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 052E8 80AEFEF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 052EC 80AEFEFC 0C2BAB04 */ jal func_80AEAC10 -/* 052F0 80AEFF00 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 052F4 80AEFF04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 052F8 80AEFF08 0C2BABB3 */ jal func_80AEAECC -/* 052FC 80AEFF0C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05300 80AEFF10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05304 80AEFF14 0C2BBF70 */ jal func_80AEFDC0 -/* 05308 80AEFF18 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0530C 80AEFF1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05310 80AEFF20 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05314 80AEFF24 0C2BBFA1 */ jal func_80AEFE84 -/* 05318 80AEFF28 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 0531C 80AEFF2C 8FBF001C */ lw $ra, 0x001C($sp) -/* 05320 80AEFF30 8FB00014 */ lw $s0, 0x0014($sp) -/* 05324 80AEFF34 8FB10018 */ lw $s1, 0x0018($sp) -/* 05328 80AEFF38 03E00008 */ jr $ra -/* 0532C 80AEFF3C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFF40.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFF40.s deleted file mode 100644 index 2c9939ce1e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFF40.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80AEFF40 -/* 05330 80AEFF40 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 05334 80AEFF44 AFBF001C */ sw $ra, 0x001C($sp) -/* 05338 80AEFF48 AFB00018 */ sw $s0, 0x0018($sp) -/* 0533C 80AEFF4C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05340 80AEFF50 0C2BBBFB */ jal func_80AEEFEC -/* 05344 80AEFF54 AFA50024 */ sw $a1, 0x0024($sp) -/* 05348 80AEFF58 0C2BACC8 */ jal func_80AEB320 -/* 0534C 80AEFF5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05350 80AEFF60 0C2BAB87 */ jal func_80AEAE1C -/* 05354 80AEFF64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05358 80AEFF68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0535C 80AEFF6C 0C2BABB3 */ jal func_80AEAECC -/* 05360 80AEFF70 8FA50024 */ lw $a1, 0x0024($sp) -/* 05364 80AEFF74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05368 80AEFF78 0C2BBFA7 */ jal func_80AEFE9C -/* 0536C 80AEFF7C 8FA50024 */ lw $a1, 0x0024($sp) -/* 05370 80AEFF80 8FBF001C */ lw $ra, 0x001C($sp) -/* 05374 80AEFF84 8FB00018 */ lw $s0, 0x0018($sp) -/* 05378 80AEFF88 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0537C 80AEFF8C 03E00008 */ jr $ra -/* 05380 80AEFF90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFF94.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFF94.s deleted file mode 100644 index 8fd3472037..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFF94.s +++ /dev/null @@ -1,62 +0,0 @@ -.rdata -glabel D_80AF1A64 - .asciz "スイッチルトセット!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 -glabel D_80AF1A90 - .asciz "スイッチルトセットしない!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.text -glabel func_80AEFF94 -/* 05384 80AEFF94 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 05388 80AEFF98 9442F580 */ lhu $v0, -0x0A80($v0) ## 8015F580 -/* 0538C 80AEFF9C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 05390 80AEFFA0 AFB00020 */ sw $s0, 0x0020($sp) -/* 05394 80AEFFA4 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 05398 80AEFFA8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0539C 80AEFFAC 11C0001E */ beq $t6, $zero, .L80AF0028 -/* 053A0 80AEFFB0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 053A4 80AEFFB4 304F0001 */ andi $t7, $v0, 0x0001 ## $t7 = 00000000 -/* 053A8 80AEFFB8 11E0001B */ beq $t7, $zero, .L80AF0028 -/* 053AC 80AEFFBC 30580020 */ andi $t8, $v0, 0x0020 ## $t8 = 00000000 -/* 053B0 80AEFFC0 17000019 */ bne $t8, $zero, .L80AF0028 -/* 053B4 80AEFFC4 00000000 */ nop -/* 053B8 80AEFFC8 0C2BAC08 */ jal func_80AEB020 -/* 053BC 80AEFFCC 00000000 */ nop -/* 053C0 80AEFFD0 14400015 */ bne $v0, $zero, .L80AF0028 -/* 053C4 80AEFFD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 053C8 80AEFFD8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 053CC 80AEFFDC 24A597B8 */ addiu $a1, $a1, 0x97B8 ## $a1 = 060097B8 -/* 053D0 80AEFFE0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 053D4 80AEFFE4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 053D8 80AEFFE8 0C2BAC99 */ jal func_80AEB264 -/* 053DC 80AEFFEC AFA00010 */ sw $zero, 0x0010($sp) -/* 053E0 80AEFFF0 82020003 */ lb $v0, 0x0003($s0) ## 00000003 -/* 053E4 80AEFFF4 24190016 */ addiu $t9, $zero, 0x0016 ## $t9 = 00000016 -/* 053E8 80AEFFF8 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 053EC 80AEFFFC 3C0480AF */ lui $a0, %hi(D_80AF1A64) ## $a0 = 80AF0000 -/* 053F0 80AF0000 AE190264 */ sw $t9, 0x0264($s0) ## 00000264 -/* 053F4 80AF0004 A2080003 */ sb $t0, 0x0003($s0) ## 00000003 -/* 053F8 80AF0008 AE000268 */ sw $zero, 0x0268($s0) ## 00000268 -/* 053FC 80AF000C 24841A64 */ addiu $a0, $a0, %lo(D_80AF1A64) ## $a0 = 80AF1A64 -/* 05400 80AF0010 A2020284 */ sb $v0, 0x0284($s0) ## 00000284 -/* 05404 80AF0014 A2020286 */ sb $v0, 0x0286($s0) ## 00000286 -/* 05408 80AF0018 0C00084C */ jal osSyncPrintf - -/* 0540C 80AF001C A2020285 */ sb $v0, 0x0285($s0) ## 00000285 -/* 05410 80AF0020 10000007 */ beq $zero, $zero, .L80AF0040 -/* 05414 80AF0024 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AF0028: -/* 05418 80AF0028 3C0480AF */ lui $a0, %hi(D_80AF1A90) ## $a0 = 80AF0000 -/* 0541C 80AF002C 0C00084C */ jal osSyncPrintf - -/* 05420 80AF0030 24841A90 */ addiu $a0, $a0, %lo(D_80AF1A90) ## $a0 = 80AF1A90 -/* 05424 80AF0034 0C00B55C */ jal Actor_Kill - -/* 05428 80AF0038 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0542C 80AF003C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AF0040: -/* 05430 80AF0040 8FB00020 */ lw $s0, 0x0020($sp) -/* 05434 80AF0044 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 05438 80AF0048 03E00008 */ jr $ra -/* 0543C 80AF004C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0050.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0050.s deleted file mode 100644 index c3e8132f4a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0050.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80AF0050 -/* 05440 80AF0050 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 05444 80AF0054 AFA5002C */ sw $a1, 0x002C($sp) -/* 05448 80AF0058 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0544C 80AF005C AFB00020 */ sw $s0, 0x0020($sp) -/* 05450 80AF0060 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 05454 80AF0064 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05458 80AF0068 24A597B8 */ addiu $a1, $a1, 0x97B8 ## $a1 = 060097B8 -/* 0545C 80AF006C AFA00010 */ sw $zero, 0x0010($sp) -/* 05460 80AF0070 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 05464 80AF0074 0C2BAC99 */ jal func_80AEB264 -/* 05468 80AF0078 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0546C 80AF007C 820F0003 */ lb $t7, 0x0003($s0) ## 00000003 -/* 05470 80AF0080 240E0024 */ addiu $t6, $zero, 0x0024 ## $t6 = 00000024 -/* 05474 80AF0084 AE0E0264 */ sw $t6, 0x0264($s0) ## 00000264 -/* 05478 80AF0088 A20F0284 */ sb $t7, 0x0284($s0) ## 00000284 -/* 0547C 80AF008C 0C2BAC22 */ jal func_80AEB088 -/* 05480 80AF0090 8FA4002C */ lw $a0, 0x002C($sp) -/* 05484 80AF0094 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF -/* 05488 80AF0098 AE02028C */ sw $v0, 0x028C($s0) ## 0000028C -/* 0548C 80AF009C A2180003 */ sb $t8, 0x0003($s0) ## 00000003 -/* 05490 80AF00A0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 05494 80AF00A4 8FB00020 */ lw $s0, 0x0020($sp) -/* 05498 80AF00A8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0549C 80AF00AC 03E00008 */ jr $ra -/* 054A0 80AF00B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0278.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0278.s deleted file mode 100644 index 9db5b27773..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0278.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80AF0278 -/* 05668 80AF0278 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 0566C 80AF027C 10C10006 */ beq $a2, $at, .L80AF0298 -/* 05670 80AF0280 AFA50004 */ sw $a1, 0x0004($sp) -/* 05674 80AF0284 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 05678 80AF0288 10C1000D */ beq $a2, $at, .L80AF02C0 -/* 0567C 80AF028C 2482037C */ addiu $v0, $a0, 0x037C ## $v0 = 0000037C -/* 05680 80AF0290 03E00008 */ jr $ra -/* 05684 80AF0294 00000000 */ nop -.L80AF0298: -/* 05688 80AF0298 24820382 */ addiu $v0, $a0, 0x0382 ## $v0 = 00000382 -/* 0568C 80AF029C 844F0002 */ lh $t7, 0x0002($v0) ## 00000384 -/* 05690 80AF02A0 84EE0000 */ lh $t6, 0x0000($a3) ## 00000000 -/* 05694 80AF02A4 84F90002 */ lh $t9, 0x0002($a3) ## 00000002 -/* 05698 80AF02A8 01CFC021 */ addu $t8, $t6, $t7 -/* 0569C 80AF02AC A4F80000 */ sh $t8, 0x0000($a3) ## 00000000 -/* 056A0 80AF02B0 84480000 */ lh $t0, 0x0000($v0) ## 00000382 -/* 056A4 80AF02B4 03284823 */ subu $t1, $t9, $t0 -/* 056A8 80AF02B8 03E00008 */ jr $ra -/* 056AC 80AF02BC A4E90002 */ sh $t1, 0x0002($a3) ## 00000002 -.L80AF02C0: -/* 056B0 80AF02C0 84EA0000 */ lh $t2, 0x0000($a3) ## 00000000 -/* 056B4 80AF02C4 844B0002 */ lh $t3, 0x0002($v0) ## 00000384 -/* 056B8 80AF02C8 84ED0004 */ lh $t5, 0x0004($a3) ## 00000004 -/* 056BC 80AF02CC 014B6021 */ addu $t4, $t2, $t3 -/* 056C0 80AF02D0 A4EC0000 */ sh $t4, 0x0000($a3) ## 00000000 -/* 056C4 80AF02D4 844E0000 */ lh $t6, 0x0000($v0) ## 00000382 -/* 056C8 80AF02D8 01AE7821 */ addu $t7, $t5, $t6 -/* 056CC 80AF02DC A4EF0004 */ sh $t7, 0x0004($a3) ## 00000004 -/* 056D0 80AF02E0 03E00008 */ jr $ra -/* 056D4 80AF02E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF02E8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF02E8.s deleted file mode 100644 index 45687b55ab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF02E8.s +++ /dev/null @@ -1,43 +0,0 @@ -.rdata -glabel D_80AF1B18 - .asciz "\x1b[31m首回しモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.text -glabel func_80AF02E8 -/* 056D8 80AF02E8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 056DC 80AF02EC 8FAE002C */ lw $t6, 0x002C($sp) -/* 056E0 80AF02F0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 056E4 80AF02F4 AFA40018 */ sw $a0, 0x0018($sp) -/* 056E8 80AF02F8 AFA5001C */ sw $a1, 0x001C($sp) -/* 056EC 80AF02FC AFA60020 */ sw $a2, 0x0020($sp) -/* 056F0 80AF0300 AFA70024 */ sw $a3, 0x0024($sp) -/* 056F4 80AF0304 8DC20290 */ lw $v0, 0x0290($t6) ## 00000290 -/* 056F8 80AF0308 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 056FC 80AF030C 3C0480AF */ lui $a0, %hi(D_80AF1B18) ## $a0 = 80AF0000 -/* 05700 80AF0310 0440000A */ bltz $v0, .L80AF033C -/* 05704 80AF0314 00000000 */ nop -/* 05708 80AF0318 1C400008 */ bgtz $v0, .L80AF033C -/* 0570C 80AF031C 00027880 */ sll $t7, $v0, 2 -/* 05710 80AF0320 3C0380AF */ lui $v1, %hi(D_80AF19F4) ## $v1 = 80AF0000 -/* 05714 80AF0324 006F1821 */ addu $v1, $v1, $t7 -/* 05718 80AF0328 8C6319F4 */ lw $v1, %lo(D_80AF19F4)($v1) -/* 0571C 80AF032C 8FA50018 */ lw $a1, 0x0018($sp) -/* 05720 80AF0330 8FA70028 */ lw $a3, 0x0028($sp) -/* 05724 80AF0334 14600005 */ bne $v1, $zero, .L80AF034C -/* 05728 80AF0338 00000000 */ nop -.L80AF033C: -/* 0572C 80AF033C 0C00084C */ jal osSyncPrintf - -/* 05730 80AF0340 24841B18 */ addiu $a0, $a0, %lo(D_80AF1B18) ## $a0 = 80AF1B18 -/* 05734 80AF0344 10000004 */ beq $zero, $zero, .L80AF0358 -/* 05738 80AF0348 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF034C: -/* 0573C 80AF034C 0060F809 */ jalr $ra, $v1 -/* 05740 80AF0350 8FA4002C */ lw $a0, 0x002C($sp) -/* 05744 80AF0354 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF0358: -/* 05748 80AF0358 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0574C 80AF035C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 05750 80AF0360 03E00008 */ jr $ra -/* 05754 80AF0364 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0368.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0368.s deleted file mode 100644 index 4bb63237c9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0368.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80AF0368 -/* 05758 80AF0368 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0575C 80AF036C 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 05760 80AF0370 AFBF0014 */ sw $ra, 0x0014($sp) -/* 05764 80AF0374 AFA40038 */ sw $a0, 0x0038($sp) -/* 05768 80AF0378 AFA60040 */ sw $a2, 0x0040($sp) -/* 0576C 80AF037C 14A10019 */ bne $a1, $at, .L80AF03E4 -/* 05770 80AF0380 AFA70044 */ sw $a3, 0x0044($sp) -/* 05774 80AF0384 3C0E80AF */ lui $t6, %hi(D_80AF19F8) ## $t6 = 80AF0000 -/* 05778 80AF0388 25CE19F8 */ addiu $t6, $t6, %lo(D_80AF19F8) ## $t6 = 80AF19F8 -/* 0577C 80AF038C 8DD80000 */ lw $t8, 0x0000($t6) ## 80AF19F8 -/* 05780 80AF0390 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFF0 -/* 05784 80AF0394 27A5001C */ addiu $a1, $sp, 0x001C ## $a1 = FFFFFFE4 -/* 05788 80AF0398 AC980000 */ sw $t8, 0x0000($a0) ## FFFFFFF0 -/* 0578C 80AF039C 8DCF0004 */ lw $t7, 0x0004($t6) ## 80AF19FC -/* 05790 80AF03A0 AC8F0004 */ sw $t7, 0x0004($a0) ## FFFFFFF4 -/* 05794 80AF03A4 8DD80008 */ lw $t8, 0x0008($t6) ## 80AF1A00 -/* 05798 80AF03A8 0C0346BD */ jal Matrix_MultVec3f -/* 0579C 80AF03AC AC980008 */ sw $t8, 0x0008($a0) ## FFFFFFF8 -/* 057A0 80AF03B0 8FA20048 */ lw $v0, 0x0048($sp) -/* 057A4 80AF03B4 C7A4001C */ lwc1 $f4, 0x001C($sp) -/* 057A8 80AF03B8 84590030 */ lh $t9, 0x0030($v0) ## 00000030 -/* 057AC 80AF03BC E4440038 */ swc1 $f4, 0x0038($v0) ## 00000038 -/* 057B0 80AF03C0 C7A60020 */ lwc1 $f6, 0x0020($sp) -/* 057B4 80AF03C4 84480032 */ lh $t0, 0x0032($v0) ## 00000032 -/* 057B8 80AF03C8 84490034 */ lh $t1, 0x0034($v0) ## 00000034 -/* 057BC 80AF03CC E446003C */ swc1 $f6, 0x003C($v0) ## 0000003C -/* 057C0 80AF03D0 C7A80024 */ lwc1 $f8, 0x0024($sp) -/* 057C4 80AF03D4 A4590044 */ sh $t9, 0x0044($v0) ## 00000044 -/* 057C8 80AF03D8 A4480046 */ sh $t0, 0x0046($v0) ## 00000046 -/* 057CC 80AF03DC A4490048 */ sh $t1, 0x0048($v0) ## 00000048 -/* 057D0 80AF03E0 E4480040 */ swc1 $f8, 0x0040($v0) ## 00000040 -.L80AF03E4: -/* 057D4 80AF03E4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 057D8 80AF03E8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 057DC 80AF03EC 03E00008 */ jr $ra -/* 057E0 80AF03F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF03F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF03F4.s deleted file mode 100644 index 3088a691c1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF03F4.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80AF03F4 -/* 057E4 80AF03F4 AFA40000 */ sw $a0, 0x0000($sp) -/* 057E8 80AF03F8 03E00008 */ jr $ra -/* 057EC 80AF03FC AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0400.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0400.s deleted file mode 100644 index a809ad78a9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0400.s +++ /dev/null @@ -1,128 +0,0 @@ -.rdata -glabel D_80AF1B54 - .asciz "../z_en_ru1.c" - .balign 4 - -glabel D_80AF1B64 - .asciz "../z_en_ru1.c" - .balign 4 - -.text -glabel func_80AF0400 -/* 057F0 80AF0400 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 057F4 80AF0404 AFBF002C */ sw $ra, 0x002C($sp) -/* 057F8 80AF0408 AFB00028 */ sw $s0, 0x0028($sp) -/* 057FC 80AF040C AFA40088 */ sw $a0, 0x0088($sp) -/* 05800 80AF0410 AFA5008C */ sw $a1, 0x008C($sp) -/* 05804 80AF0414 8482025C */ lh $v0, 0x025C($a0) ## 0000025C -/* 05808 80AF0418 3C1880AF */ lui $t8, %hi(D_80AF0858) ## $t8 = 80AF0000 -/* 0580C 80AF041C 3C0A80AF */ lui $t2, %hi(D_80AF0870) ## $t2 = 80AF0000 -/* 05810 80AF0420 00027880 */ sll $t7, $v0, 2 -/* 05814 80AF0424 030FC021 */ addu $t8, $t8, $t7 -/* 05818 80AF0428 8F180858 */ lw $t8, %lo(D_80AF0858)($t8) -/* 0581C 80AF042C 3C0680AF */ lui $a2, %hi(D_80AF1B54) ## $a2 = 80AF0000 -/* 05820 80AF0430 24C61B54 */ addiu $a2, $a2, %lo(D_80AF1B54) ## $a2 = 80AF1B54 -/* 05824 80AF0434 AFB80078 */ sw $t8, 0x0078($sp) -/* 05828 80AF0438 84830260 */ lh $v1, 0x0260($a0) ## 00000260 -/* 0582C 80AF043C 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC -/* 05830 80AF0440 24070502 */ addiu $a3, $zero, 0x0502 ## $a3 = 00000502 -/* 05834 80AF0444 0003C880 */ sll $t9, $v1, 2 -/* 05838 80AF0448 01595021 */ addu $t2, $t2, $t9 -/* 0583C 80AF044C 8D4A0870 */ lw $t2, %lo(D_80AF0870)($t2) -/* 05840 80AF0450 AFAA006C */ sw $t2, 0x006C($sp) -/* 05844 80AF0454 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 05848 80AF0458 0C031AB1 */ jal Graph_OpenDisps -/* 0584C 80AF045C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 05850 80AF0460 8FAC008C */ lw $t4, 0x008C($sp) -/* 05854 80AF0464 0C024F46 */ jal func_80093D18 -/* 05858 80AF0468 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 0585C 80AF046C 8FA90078 */ lw $t1, 0x0078($sp) -/* 05860 80AF0470 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 05864 80AF0474 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 05868 80AF0478 0009C100 */ sll $t8, $t1, 4 -/* 0586C 80AF047C 00187702 */ srl $t6, $t8, 28 -/* 05870 80AF0480 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 05874 80AF0484 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 05878 80AF0488 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 0587C 80AF048C 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 05880 80AF0490 000EC880 */ sll $t9, $t6, 2 -/* 05884 80AF0494 24E76FA8 */ addiu $a3, $a3, 0x6FA8 ## $a3 = 80166FA8 -/* 05888 80AF0498 00F92021 */ addu $a0, $a3, $t9 -/* 0588C 80AF049C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 05890 80AF04A0 8C8A0000 */ lw $t2, 0x0000($a0) ## 00000000 -/* 05894 80AF04A4 3C0800FF */ lui $t0, 0x00FF ## $t0 = 00FF0000 -/* 05898 80AF04A8 3508FFFF */ ori $t0, $t0, 0xFFFF ## $t0 = 00FFFFFF -/* 0589C 80AF04AC 01282824 */ and $a1, $t1, $t0 -/* 058A0 80AF04B0 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 058A4 80AF04B4 01455821 */ addu $t3, $t2, $a1 -/* 058A8 80AF04B8 01666021 */ addu $t4, $t3, $a2 -/* 058AC 80AF04BC AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 058B0 80AF04C0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 058B4 80AF04C4 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 -/* 058B8 80AF04C8 35290024 */ ori $t1, $t1, 0x0024 ## $t1 = DB060024 -/* 058BC 80AF04CC 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 058C0 80AF04D0 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 058C4 80AF04D4 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 058C8 80AF04D8 8C8F0000 */ lw $t7, 0x0000($a0) ## 00000000 -/* 058CC 80AF04DC 01E5C021 */ addu $t8, $t7, $a1 -/* 058D0 80AF04E0 03067021 */ addu $t6, $t8, $a2 -/* 058D4 80AF04E4 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 058D8 80AF04E8 8FA4006C */ lw $a0, 0x006C($sp) -/* 058DC 80AF04EC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 058E0 80AF04F0 00045100 */ sll $t2, $a0, 4 -/* 058E4 80AF04F4 000A5F02 */ srl $t3, $t2, 28 -/* 058E8 80AF04F8 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 058EC 80AF04FC AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 058F0 80AF0500 000B6080 */ sll $t4, $t3, 2 -/* 058F4 80AF0504 00EC6821 */ addu $t5, $a3, $t4 -/* 058F8 80AF0508 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 058FC 80AF050C 8DAF0000 */ lw $t7, 0x0000($t5) ## 00000008 -/* 05900 80AF0510 0088C024 */ and $t8, $a0, $t0 -/* 05904 80AF0514 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 05908 80AF0518 01F87021 */ addu $t6, $t7, $t8 -/* 0590C 80AF051C 01C6C821 */ addu $t9, $t6, $a2 -/* 05910 80AF0520 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 05914 80AF0524 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 05918 80AF0528 3C0BFB00 */ lui $t3, 0xFB00 ## $t3 = FB000000 -/* 0591C 80AF052C 3C188011 */ lui $t8, 0x8011 ## $t8 = 80110000 -/* 05920 80AF0530 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 05924 80AF0534 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 05928 80AF0538 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 0592C 80AF053C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 05930 80AF0540 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 05934 80AF0544 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 05938 80AF0548 35EF0030 */ ori $t7, $t7, 0x0030 ## $t7 = DB060030 -/* 0593C 80AF054C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 05940 80AF0550 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 05944 80AF0554 27186290 */ addiu $t8, $t8, 0x6290 ## $t8 = 80116290 -/* 05948 80AF0558 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 0594C 80AF055C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 05950 80AF0560 8FA30088 */ lw $v1, 0x0088($sp) -/* 05954 80AF0564 3C1980AF */ lui $t9, %hi(func_80AF0368) ## $t9 = 80AF0000 -/* 05958 80AF0568 3C0E80AF */ lui $t6, %hi(func_80AF02E8) ## $t6 = 80AF0000 -/* 0595C 80AF056C 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C -/* 05960 80AF0570 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 05964 80AF0574 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 05968 80AF0578 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 0596C 80AF057C 25CE02E8 */ addiu $t6, $t6, %lo(func_80AF02E8) ## $t6 = 80AF02E8 -/* 05970 80AF0580 27390368 */ addiu $t9, $t9, %lo(func_80AF0368) ## $t9 = 80AF0368 -/* 05974 80AF0584 AFB90014 */ sw $t9, 0x0014($sp) -/* 05978 80AF0588 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0597C 80AF058C AFA30018 */ sw $v1, 0x0018($sp) -/* 05980 80AF0590 8E0A02C0 */ lw $t2, 0x02C0($s0) ## 000002C0 -/* 05984 80AF0594 8FA4008C */ lw $a0, 0x008C($sp) -/* 05988 80AF0598 0C0289CF */ jal SkelAnime_DrawSV2 -/* 0598C 80AF059C AFAA001C */ sw $t2, 0x001C($sp) -/* 05990 80AF05A0 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 -/* 05994 80AF05A4 8FAB008C */ lw $t3, 0x008C($sp) -/* 05998 80AF05A8 3C0680AF */ lui $a2, %hi(D_80AF1B64) ## $a2 = 80AF0000 -/* 0599C 80AF05AC 24C61B64 */ addiu $a2, $a2, %lo(D_80AF1B64) ## $a2 = 80AF1B64 -/* 059A0 80AF05B0 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC -/* 059A4 80AF05B4 2407051D */ addiu $a3, $zero, 0x051D ## $a3 = 0000051D -/* 059A8 80AF05B8 0C031AD5 */ jal Graph_CloseDisps -/* 059AC 80AF05BC 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 -/* 059B0 80AF05C0 8FBF002C */ lw $ra, 0x002C($sp) -/* 059B4 80AF05C4 8FB00028 */ lw $s0, 0x0028($sp) -/* 059B8 80AF05C8 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 059BC 80AF05CC 03E00008 */ jr $ra -/* 059C0 80AF05D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF05D4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF05D4.s deleted file mode 100644 index f75fe38fa5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF05D4.s +++ /dev/null @@ -1,127 +0,0 @@ -.rdata -glabel D_80AF1B74 - .asciz "../z_en_ru1.c" - .balign 4 - -glabel D_80AF1B84 - .asciz "../z_en_ru1.c" - .balign 4 - -.text -glabel func_80AF05D4 -/* 059C4 80AF05D4 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 059C8 80AF05D8 AFBF002C */ sw $ra, 0x002C($sp) -/* 059CC 80AF05DC AFB10028 */ sw $s1, 0x0028($sp) -/* 059D0 80AF05E0 AFB00024 */ sw $s0, 0x0024($sp) -/* 059D4 80AF05E4 AFA5008C */ sw $a1, 0x008C($sp) -/* 059D8 80AF05E8 8482025C */ lh $v0, 0x025C($a0) ## 0000025C -/* 059DC 80AF05EC 3C0F80AF */ lui $t7, %hi(D_80AF0858) ## $t7 = 80AF0000 -/* 059E0 80AF05F0 3C1980AF */ lui $t9, %hi(D_80AF0870) ## $t9 = 80AF0000 -/* 059E4 80AF05F4 00027080 */ sll $t6, $v0, 2 -/* 059E8 80AF05F8 01EE7821 */ addu $t7, $t7, $t6 -/* 059EC 80AF05FC 8DEF0858 */ lw $t7, %lo(D_80AF0858)($t7) -/* 059F0 80AF0600 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 059F4 80AF0604 3C0680AF */ lui $a2, %hi(D_80AF1B74) ## $a2 = 80AF0000 -/* 059F8 80AF0608 AFAF0078 */ sw $t7, 0x0078($sp) -/* 059FC 80AF060C 84830260 */ lh $v1, 0x0260($a0) ## 00000260 -/* 05A00 80AF0610 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC -/* 05A04 80AF0614 24C61B74 */ addiu $a2, $a2, %lo(D_80AF1B74) ## $a2 = 80AF1B74 -/* 05A08 80AF0618 0003C080 */ sll $t8, $v1, 2 -/* 05A0C 80AF061C 0338C821 */ addu $t9, $t9, $t8 -/* 05A10 80AF0620 8F390870 */ lw $t9, %lo(D_80AF0870)($t9) -/* 05A14 80AF0624 2407052C */ addiu $a3, $zero, 0x052C ## $a3 = 0000052C -/* 05A18 80AF0628 AFB9006C */ sw $t9, 0x006C($sp) -/* 05A1C 80AF062C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 05A20 80AF0630 0C031AB1 */ jal Graph_OpenDisps -/* 05A24 80AF0634 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 05A28 80AF0638 8FAB008C */ lw $t3, 0x008C($sp) -/* 05A2C 80AF063C 0C024F61 */ jal func_80093D84 -/* 05A30 80AF0640 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 05A34 80AF0644 8FA90078 */ lw $t1, 0x0078($sp) -/* 05A38 80AF0648 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 05A3C 80AF064C 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 05A40 80AF0650 00097100 */ sll $t6, $t1, 4 -/* 05A44 80AF0654 000E7F02 */ srl $t7, $t6, 28 -/* 05A48 80AF0658 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 05A4C 80AF065C 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 05A50 80AF0660 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 05A54 80AF0664 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 05A58 80AF0668 000FC080 */ sll $t8, $t7, 2 -/* 05A5C 80AF066C 24E76FA8 */ addiu $a3, $a3, 0x6FA8 ## $a3 = 80166FA8 -/* 05A60 80AF0670 00F82021 */ addu $a0, $a3, $t8 -/* 05A64 80AF0674 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 05A68 80AF0678 8C990000 */ lw $t9, 0x0000($a0) ## 00000000 -/* 05A6C 80AF067C 3C0800FF */ lui $t0, 0x00FF ## $t0 = 00FF0000 -/* 05A70 80AF0680 3508FFFF */ ori $t0, $t0, 0xFFFF ## $t0 = 00FFFFFF -/* 05A74 80AF0684 01282824 */ and $a1, $t1, $t0 -/* 05A78 80AF0688 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 05A7C 80AF068C 03255021 */ addu $t2, $t9, $a1 -/* 05A80 80AF0690 01465821 */ addu $t3, $t2, $a2 -/* 05A84 80AF0694 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 05A88 80AF0698 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 05A8C 80AF069C 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 -/* 05A90 80AF06A0 35290024 */ ori $t1, $t1, 0x0024 ## $t1 = DB060024 -/* 05A94 80AF06A4 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 05A98 80AF06A8 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 05A9C 80AF06AC AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 05AA0 80AF06B0 8C8D0000 */ lw $t5, 0x0000($a0) ## 00000000 -/* 05AA4 80AF06B4 01A57021 */ addu $t6, $t5, $a1 -/* 05AA8 80AF06B8 01C67821 */ addu $t7, $t6, $a2 -/* 05AAC 80AF06BC AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 05AB0 80AF06C0 8FA4006C */ lw $a0, 0x006C($sp) -/* 05AB4 80AF06C4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 05AB8 80AF06C8 0004C900 */ sll $t9, $a0, 4 -/* 05ABC 80AF06CC 00195702 */ srl $t2, $t9, 28 -/* 05AC0 80AF06D0 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 05AC4 80AF06D4 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 05AC8 80AF06D8 000A5880 */ sll $t3, $t2, 2 -/* 05ACC 80AF06DC 00EB6021 */ addu $t4, $a3, $t3 -/* 05AD0 80AF06E0 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 05AD4 80AF06E4 8D8D0000 */ lw $t5, 0x0000($t4) ## 00000008 -/* 05AD8 80AF06E8 00887024 */ and $t6, $a0, $t0 -/* 05ADC 80AF06EC 3C0AFB00 */ lui $t2, 0xFB00 ## $t2 = FB000000 -/* 05AE0 80AF06F0 01AE7821 */ addu $t7, $t5, $t6 -/* 05AE4 80AF06F4 01E6C021 */ addu $t8, $t7, $a2 -/* 05AE8 80AF06F8 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 05AEC 80AF06FC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 05AF0 80AF0700 3C0F8011 */ lui $t7, 0x8011 ## $t7 = 80110000 -/* 05AF4 80AF0704 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 05AF8 80AF0708 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 05AFC 80AF070C AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 05B00 80AF0710 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 05B04 80AF0714 8E2B02A8 */ lw $t3, 0x02A8($s1) ## 000002A8 -/* 05B08 80AF0718 35CE0030 */ ori $t6, $t6, 0x0030 ## $t6 = DB060030 -/* 05B0C 80AF071C 25EF6280 */ addiu $t7, $t7, 0x6280 ## $t7 = 80116280 -/* 05B10 80AF0720 316C00FF */ andi $t4, $t3, 0x00FF ## $t4 = 00000000 -/* 05B14 80AF0724 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 05B18 80AF0728 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 05B1C 80AF072C 3C1880AF */ lui $t8, %hi(func_80AF02E8) ## $t8 = 80AF0000 -/* 05B20 80AF0730 271802E8 */ addiu $t8, $t8, %lo(func_80AF02E8) ## $t8 = 80AF02E8 -/* 05B24 80AF0734 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 05B28 80AF0738 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 05B2C 80AF073C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 05B30 80AF0740 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 05B34 80AF0744 2622014C */ addiu $v0, $s1, 0x014C ## $v0 = 0000014C -/* 05B38 80AF0748 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 05B3C 80AF074C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 05B40 80AF0750 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 05B44 80AF0754 AFB10018 */ sw $s1, 0x0018($sp) -/* 05B48 80AF0758 AFA00014 */ sw $zero, 0x0014($sp) -/* 05B4C 80AF075C AFB80010 */ sw $t8, 0x0010($sp) -/* 05B50 80AF0760 8E1902D0 */ lw $t9, 0x02D0($s0) ## 000002D0 -/* 05B54 80AF0764 8FA4008C */ lw $a0, 0x008C($sp) -/* 05B58 80AF0768 0C0289CF */ jal SkelAnime_DrawSV2 -/* 05B5C 80AF076C AFB9001C */ sw $t9, 0x001C($sp) -/* 05B60 80AF0770 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 05B64 80AF0774 8FAA008C */ lw $t2, 0x008C($sp) -/* 05B68 80AF0778 3C0680AF */ lui $a2, %hi(D_80AF1B84) ## $a2 = 80AF0000 -/* 05B6C 80AF077C 24C61B84 */ addiu $a2, $a2, %lo(D_80AF1B84) ## $a2 = 80AF1B84 -/* 05B70 80AF0780 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC -/* 05B74 80AF0784 24070549 */ addiu $a3, $zero, 0x0549 ## $a3 = 00000549 -/* 05B78 80AF0788 0C031AD5 */ jal Graph_CloseDisps -/* 05B7C 80AF078C 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 -/* 05B80 80AF0790 8FBF002C */ lw $ra, 0x002C($sp) -/* 05B84 80AF0794 8FB00024 */ lw $s0, 0x0024($sp) -/* 05B88 80AF0798 8FB10028 */ lw $s1, 0x0028($sp) -/* 05B8C 80AF079C 03E00008 */ jr $ra -/* 05B90 80AF07A0 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/data/overlays/actors/z_en_ru1.data.s b/data/overlays/actors/z_en_ru1.data.s deleted file mode 100644 index 4e9c4e0873..0000000000 --- a/data/overlays/actors/z_en_ru1.data.s +++ /dev/null @@ -1,87 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel D_80AF0800 - .word 0x00000009, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00190050, 0x00000000, 0x00000000 -glabel D_80AF082C - .word 0x00090009, 0x01000000, 0x00000000, 0x00000101, 0x00000000, 0x00000000, 0x00000000, 0x01000100, 0x0014001E, 0x00000000, 0x00000000 -glabel D_80AF0858 - .word 0x0600E3B8, 0x0600F238, 0x0600F638, 0x0600FE38, 0x06010238, 0x06010A38 -glabel D_80AF0870 - .word 0x0600E838, 0x0600FA38, 0x06010638, 0x00000000 -glabel D_80AF0880 - .word 0x0000000F, 0x0000051A, 0x0000000A, 0x0000000A, 0x00270000, 0x00320000, 0x6C160000, 0x0000000C, 0xFFFFFEAC, 0xFFFFF506, 0x0000000C, 0xFFFFFEAC, 0xFFFFF506, 0x0F671408, 0x00000000, 0x00000001, 0x00030032, 0x00460000, 0x6C160000, 0x0000000C, 0xFFFFFEAC, 0xFFFFF506, 0x0000000C, 0xFFFFFEAC, 0xFFFFF506, 0x0F671408, 0x00000000, 0x00000001, 0x00050046, 0x006D0000, 0x6C160000, 0x0000000C, 0xFFFFFEAC, 0xFFFFF506, 0x0000000C, 0xFFFFFEAC, 0xFFFFF506, 0x0F671408, 0x00000000, 0x00000001, 0x0002006D, 0x00870000, 0x6C160000, 0x0000000C, 0xFFFFFEAC, 0xFFFFF506, 0x00000064, 0xFFFFFEAC, 0xFFFFF451, 0x0F671408, 0x00000000, 0x00000001, 0x00050087, 0x00C70000, 0x6C160000, 0x00000064, 0xFFFFFEAC, 0xFFFFF451, 0x00000064, 0xFFFFFEAC, 0xFFFFF451, 0x0F671408, 0x00000000, 0x00000001, 0x000300C7, 0x00DB0000, 0x6C160000, 0x00000064, 0xFFFFFEAC, 0xFFFFF451, 0x00000064, 0xFFFFFEAC, 0xFFFFF451, 0x0F671408, 0x00000000, 0x00000001, 0x000500DB, 0x01030000, 0x6C160000, 0x00000064, 0xFFFFFEAC, 0xFFFFF451, 0x00000064, 0xFFFFFEAC, 0xFFFFF451, 0x0F671408, 0x00000000, 0x00000001, 0x00030103, 0x01140000, 0x6C160000, 0x00000064, 0xFFFFFEAC, 0xFFFFF451, 0x00000064, 0xFFFFFEAC, 0xFFFFF451, 0x0F671408, 0x00000000, 0x00000001, 0x00020114, 0x01290000, 0x6C160000, 0x00000064, 0xFFFFFEAC, 0xFFFFF451, 0x000000B6, 0xFFFFFEAC, 0xFFFFF3C4, 0x0F671408, 0x00000000, 0x00000001, 0x00050129, 0x034B0000, 0x6C160000, 0x000000B6, 0xFFFFFEAC, 0xFFFFF3C4, 0x000000B6, 0xFFFFFEAC, 0xFFFFF3C4, 0x0F671408, 0x00000000, 0x00000001, 0x0000003F, 0x00000004, 0x00020000, 0x00B20000, 0xEC160000, 0x0000007F, 0xFFFFFEAC, 0xFFFFF41F, 0x0000007F, 0xFFFFFEAC, 0xFFFFF41F, 0x0F671408, 0x00000000, 0x00000001, 0x000300B2, 0x00F50000, 0x6C160000, 0x0000007F, 0xFFFFFEAC, 0xFFFFF41F, 0x0000007F, 0xFFFFFEAC, 0xFFFFF41F, 0x0F671408, 0x00000000, 0x00000001, 0x000400F5, 0x01040000, 0x6C160000, 0x0000007F, 0xFFFFFEAC, 0xFFFFF41F, 0x0000007F, 0xFFFFFEAC, 0xFFFFF41F, 0x0F671408, 0x00000000, 0x00000001, 0x00050104, 0x018C0000, 0x6C160000, 0x0000007F, 0xFFFFFEAC, 0xFFFFF41F, 0x0000007F, 0xFFFFFEAC, 0xFFFFF41F, 0x0F671408, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x000C013B, 0x01590000, 0x00000000, 0x00000000, 0xFFFFFFC0, 0x00000032, 0x00000000, 0xFFFFFFC0, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000004, 0xFFFF0000, 0x009DFFFF, 0xFFFFFFFF, 0x404B009D, 0x00AF0000, 0xFFFFFFFF, 0xFFFF00AF, 0x00FCFFFF, 0xFFFFFFFF, 0x401E00FC, 0x012C0000, 0xFFFFFFFF, 0x00000001, 0x00010000, 0x00F70000, 0x00000000, 0x4235998B, 0x0037FEDE, 0xF54320BA, 0x00000000, 0x4235998B, 0x0037FEDE, 0xF54344B8, 0x00000000, 0x4235998B, 0x0037FEDE, 0xF5438080, 0x00000000, 0x4235998B, 0x0037FEDE, 0xF543E243, 0x00000000, 0x41F6662C, 0x0037FEDE, 0xF543005E, 0x00000000, 0x41F6662C, 0x0037FEDE, 0xF543FFFF, 0x00000000, 0x41F6662C, 0x0037FEDE, 0xF5430000, 0x00000000, 0x41F6662C, 0x0037FEDE, 0xF5435B80, 0xFF000000, 0x41F6662C, 0x0037FEDE, 0xF54349B4, 0x00000001, 0x00010049, 0x00D00000, 0x00000000, 0x4235998B, 0x0063FECD, 0xF45720BA, 0x00000000, 0x4235998B, 0x0063FECD, 0xF45744B8, 0x00000000, 0x4235998B, 0x0063FECD, 0xF4578080, 0x00000000, 0x4235998B, 0x0063FECD, 0xF457E243, 0x00000000, 0x4235998B, 0x0063FECD, 0xF457005E, 0x00000000, 0x4235998B, 0x0063FECD, 0xF457FFFF, 0xFF000000, 0x4235998B, 0x0063FECD, 0xF4570000, 0x00000001, 0x00010074, 0x04B70000, 0x00000000, 0x42373325, 0x009BFEEC, 0xF4A120BA, 0x00000000, 0x42373325, 0x009BFEEC, 0xF4A144B8, 0x00000000, 0x42373325, 0x009BFEEC, 0xF4A18080, 0x00000000, 0x42373325, 0x009BFEEC, 0xF4A1E243, 0xFF000000, 0x42373325, 0x009BFEEC, 0xF4A1005E, 0x00000001, 0x000100BA, 0x04FD0000, 0x00000000, 0x4235998C, 0x004DFEC5, 0xF45020BA, 0x00000000, 0x4235998C, 0x004DFEC5, 0xF45044B8, 0x00000000, 0x4235998C, 0x004DFEC5, 0xF4508080, 0x00000000, 0x4235998C, 0x004DFEC5, 0xF450E243, 0xFF000000, 0x4235998C, 0x004DFEC5, 0xF450005E, 0x00000001, 0x00010100, 0x01A90000, 0x00000000, 0x41E1995C, 0x015EFF13, 0xF30E20BA, 0x00000000, 0x41E1995C, 0x015EFF13, 0xF30E44B8, 0x00000000, 0x41E1995C, 0x015EFF13, 0xF30E8080, 0x00000000, 0x41E1995C, 0x015EFF13, 0xF30EE243, 0x00000000, 0x423B3327, 0x015EFF13, 0xF30E005E, 0x00000000, 0x423B3327, 0x015EFF13, 0xF30EFFFF, 0x00000000, 0x423B3327, 0x015EFF13, 0xF30E0000, 0xFF000000, 0x423B3327, 0x015EFF13, 0xF30E5B80, 0x00000002, 0x00010000, 0x01140000, 0x00000032, 0x4235998B, 0x0028FF00, 0xF4F920BA, 0x00000032, 0x4235998B, 0x0028FF00, 0xF4F944B8, 0x00000028, 0x4235998B, 0x0016FEC7, 0xF4F98080, 0x0000000A, 0x4235998B, 0x0017FEC7, 0xF4F9E243, 0x00000006, 0x41F6662C, 0x0049FED6, 0xF4F4005E, 0x0000001E, 0x41F6662C, 0x0049FED6, 0xF4F4FFFF, 0x0000001E, 0x41F6662C, 0x0049FED6, 0xF4F40000, 0x0000001E, 0x41F6662C, 0x0049FED6, 0xF4F45B80, 0xFF00001E, 0x41F6662C, 0x0049FED6, 0xF4F449B4, 0x00000002, 0x00010049, 0x00ED0000, 0x0000001E, 0x4270CCCD, 0x0088FEC6, 0xF40C20BA, 0x00000007, 0x42726667, 0x0088FEC6, 0xF40C44B8, 0x00000007, 0x4235998B, 0x0088FEC6, 0xF40C8080, 0x0000001E, 0x4235998B, 0x0088FEC6, 0xF40CE243, 0x0000001E, 0x4235998B, 0x0088FEC6, 0xF40C005E, 0x0000001E, 0x4235998B, 0x0087FEC7, 0xF40CFFFF, 0xFF00001E, 0x4235998B, 0x0087FEC7, 0xF40D0000, 0x00000002, 0x00010074, 0x04D40000, 0x0000001E, 0x42373325, 0x0084FECF, 0xF46720BA, 0x0000001E, 0x42373325, 0x0084FED0, 0xF46744B8, 0x000003E8, 0x42373325, 0x0085FED0, 0xF4678080, 0x0000001E, 0x42373325, 0x0085FED0, 0xF467E243, 0xFF00001E, 0x42373325, 0x0085FED0, 0xF467005E, 0x00000002, 0x000100BA, 0x051A0000, 0x0000001E, 0x4235998C, 0x008AFED3, 0xF42820BA, 0x0000001E, 0x4235998C, 0x008AFED3, 0xF42844B8, 0x000003E8, 0x4235998C, 0x008AFED3, 0xF4288080, 0x0000001E, 0x4235998C, 0x008AFED3, 0xF428E243, 0xFF00001E, 0x4235998C, 0x008AFED3, 0xF428005E, 0x00000002, 0x00010100, 0x01C60000, 0x0000001E, 0x41E1995C, 0x0133FF02, 0xF34620BA, 0x0000001E, 0x41E1995C, 0x0133FF02, 0xF34644B8, 0x00000009, 0x41E1995C, 0x0133FF02, 0xF3468080, 0x00000009, 0x423B3327, 0x0130FEEF, 0xF337E243, 0x0000001E, 0x423B3327, 0x0130FEF0, 0xF336005E, 0x0000001E, 0x423B3327, 0x0130FEF0, 0xF336FFFF, 0x0000001E, 0x423B3327, 0x0130FEF0, 0xF3360000, 0xFF00001E, 0x423B3327, 0x0131FEF0, 0xF3365B80, 0x00000056, 0x00000001, 0x0052004A, 0x004B0000, 0x00000000, 0xFFFFFFF1, 0x00000000, 0x0000004E, 0xFFFFFFF1, 0x00000000, 0x0000004E, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000 -glabel D_80AF10A4 - .word 0x0000000E, 0x00000513, 0x0000000A, 0x00000003, 0x00050000, 0x01100000, 0xC0000000, 0xFFFFFBC3, 0xFFFFFBFF, 0xFFFFF2ED, 0xFFFFFBC3, 0xFFFFFBFF, 0xFFFFF2ED, 0x0F671408, 0x00000000, 0x00000001, 0x00030110, 0x01240000, 0xC0000000, 0xFFFFFBC3, 0xFFFFFBFF, 0xFFFFF2ED, 0xFFFFFBC3, 0xFFFFFBFF, 0xFFFFF2ED, 0x0F671408, 0x00000000, 0x00000001, 0x00050124, 0x03090000, 0xC0000000, 0xFFFFFBC3, 0xFFFFFBFF, 0xFFFFF2ED, 0xFFFFFBC3, 0xFFFFFBFF, 0xFFFFF2ED, 0x0F671408, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x000C014A, 0x02730000, 0x00000000, 0x00000000, 0xFFFFFFC0, 0x00000032, 0x00000000, 0xFFFFFFC0, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000042, 0x00000003, 0x00010000, 0x00280000, 0x40000000, 0xFFFFFAB8, 0xFFFFFC37, 0xFFFFF2F3, 0xFFFFFAB8, 0xFFFFFC37, 0xFFFFF2F3, 0x00000000, 0x00000000, 0x00000001, 0x00020028, 0x00D50000, 0x40000000, 0xFFFFFAB8, 0xFFFFFC37, 0xFFFFF2F3, 0xFFFFFAB0, 0xFFFFFC37, 0xFFFFF2F1, 0x00000000, 0x00000000, 0x00000001, 0x000300D5, 0x03E80000, 0x40000000, 0xFFFFFAB0, 0xFFFFFC37, 0xFFFFF2F1, 0xFFFFFAB0, 0xFFFFFC37, 0xFFFFF2F1, 0x00000000, 0x00000000, 0x00000001, 0x00000030, 0x00000001, 0x00020000, 0x005A0000, 0x00000000, 0xFFFFFAB0, 0xFFFFFC3D, 0xFFFFF2F1, 0xFFFFFAB0, 0xFFFFFC3D, 0xFFFFF2F1, 0x00000000, 0x00000000, 0x00000000, 0x00000030, 0x00000002, 0x0002005A, 0x00D30000, 0x00000000, 0xFFFFFAB8, 0xFFFFFC66, 0xFFFFF2F3, 0xFFFFFAB8, 0xFFFFFC66, 0xFFFFF2F3, 0x00000000, 0x00000000, 0x00000000, 0x000600D3, 0x01370000, 0x00000000, 0xFFFFFAB8, 0xFFFFFC66, 0xFFFFF2F3, 0xFFFFFAB8, 0xFFFFFC66, 0xFFFFF2F3, 0x00000000, 0x00000000, 0x00000000, 0x0000003E, 0x00000003, 0x00040000, 0x00D20000, 0x00000000, 0xFFFFFBD7, 0xFFFFFC34, 0xFFFFF317, 0xFFFFFBD7, 0xFFFFFC2E, 0xFFFFF317, 0x00000000, 0xBCEA0EA1, 0x00000000, 0x000400D2, 0x00DC8000, 0x00000000, 0xFFFFFBD7, 0xFFFFFC2E, 0xFFFFF317, 0xFFFFFBD7, 0xFFFFFC33, 0xFFFFF2F0, 0x00000000, 0x3F000000, 0x00000000, 0x000400DC, 0x019A0000, 0x00000000, 0xFFFFFBD7, 0xFFFFFC33, 0xFFFFF2F0, 0xFFFFFBD7, 0xFFFFFC30, 0xFFFFF2F0, 0x00000000, 0xBC8158ED, 0x00000000, 0x00000013, 0x00000006, 0xFFFF0000, 0x00A2FFFF, 0xFFFFFFFF, 0x405000A2, 0x00D30000, 0xFFFFFFFF, 0xFFFF00D3, 0x00E8FFFF, 0xFFFFFFFF, 0x405100E8, 0x00F10000, 0xFFFFFFFF, 0xFFFF00F1, 0x00F7FFFF, 0xFFFFFFFF, 0x405200F7, 0x012B0000, 0xFFFFFFFF, 0x00000056, 0x00000001, 0x00230070, 0x00710000, 0x00000000, 0x00000000, 0xFFFFFFC7, 0x000000B1, 0x00000000, 0xFFFFFFC7, 0x000000B1, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00010000, 0x04980000, 0x00000000, 0x4227A05C, 0xFA92FC4C, 0xF2F500C6, 0x00000000, 0x4222D38E, 0xFA92FC4C, 0xF2F500C8, 0x00000000, 0x4222D38E, 0xFA92FC4C, 0xF2F500D7, 0x00000000, 0x4222D38E, 0xFA76FC56, 0xF2F700E8, 0x00000000, 0x42346D2B, 0xFA76FC56, 0xF2F700EA, 0x00000000, 0x42346D2B, 0xFA76FC56, 0xF2F7013D, 0x00000000, 0x42346D2B, 0xFA76FC56, 0xF2F7013F, 0xFF000000, 0x42346D2B, 0xFA76FC56, 0xF2F7006D, 0x00000001, 0x0001005B, 0x04F60000, 0x00000000, 0x4233A05F, 0xFAD9FC5A, 0xF2F100C6, 0x00000000, 0x4232D392, 0xFAD9FC58, 0xF2F000C8, 0x00000000, 0x4232D392, 0xFAD9FC58, 0xF2F000D7, 0x00000000, 0x4232D392, 0xFAD9FC58, 0xF2F000E8, 0x00000000, 0x4232D392, 0xFAD2FC78, 0xF2F200EA, 0x00000000, 0x4273A06F, 0xFAD2FC78, 0xF2F2013D, 0x00000000, 0x4273A06F, 0xFAD2FC78, 0xF2F2013F, 0x00000000, 0x4273A06F, 0xFAD2FC78, 0xF2F2014E, 0x00000000, 0x4273A06F, 0xFAD2FC78, 0xF2F2015F, 0x00000000, 0x4273A06F, 0xFAD2FC78, 0xF2F20161, 0xFF000000, 0x4273A06F, 0xFAD2FC00, 0xF2F2652E, 0x00000001, 0x000100D3, 0x014C0000, 0x00000000, 0x41F273D3, 0xFA41FCCD, 0xF3B300C6, 0x00000000, 0x41F273D3, 0xFA41FCCD, 0xF3B300C8, 0x00000000, 0x41F273D3, 0xFA41FCCD, 0xF3B300D7, 0x00000000, 0x41F273D3, 0xFA41FCCD, 0xF3B300E8, 0xFF000000, 0x41F273D3, 0xFA41FCCD, 0xF3B300EA, 0x00000002, 0x00010000, 0x04B50000, 0x0000001E, 0x4222D38E, 0xFAF1FC15, 0xF2E800C6, 0x00000032, 0x4222D38E, 0xFAF0FC15, 0xF2E800C8, 0x00000014, 0x4222D38E, 0xFAF0FC15, 0xF2E800D7, 0x0000000F, 0x42346D2B, 0xFADEFC37, 0xF2EE00E8, 0x0000001E, 0x42346D2B, 0xFADFFC36, 0xF2EE00EA, 0x000003E8, 0x42346D2B, 0xFADFFC37, 0xF2EE013D, 0x0000001E, 0x42346D2B, 0xFADFFC36, 0xF2EE013F, 0xFF00001E, 0x42346D2B, 0xFADFFC36, 0xF2EE006D, 0x00000002, 0x0001005B, 0x05130000, 0x0000001E, 0x4232D392, 0xFA83FC24, 0xF2F100C6, 0x00000007, 0x4232D392, 0xFA82FC23, 0xF2F000C8, 0x00000007, 0x4232D392, 0xFA82FC23, 0xF2F000D7, 0x00000007, 0x4232D392, 0xFA82FC23, 0xF2F000E8, 0x00000007, 0x4273A06F, 0xFA8FFC2E, 0xF2F200EA, 0x0000001E, 0x4273A06F, 0xFA8FFC2F, 0xF2F2013D, 0x0000001E, 0x4273A06F, 0xFA8FFC2F, 0xF2F2013F, 0x000003E8, 0x4273A06F, 0xFA8FFC2F, 0xF2F2014E, 0x0000001E, 0x4273A06F, 0xFA8FFC2F, 0xF2F2015F, 0x0000001E, 0x4273A06F, 0xFA8FFC2F, 0xF2F20161, 0xFF00001E, 0x4273A06F, 0xFA87FBBA, 0xF2ED652E, 0x00000002, 0x000100D3, 0x01690000, 0x0000001E, 0x41F273D3, 0xFA6EFCA7, 0xF38A00C6, 0x0000001E, 0x41F273D3, 0xFA6EFCA7, 0xF38A00C8, 0x0000001E, 0x41F273D3, 0xFA6EFCA7, 0xF38A00D7, 0x0000001E, 0x41F273D3, 0xFA6EFCA7, 0xF38A00E8, 0xFF00001E, 0x41F273D3, 0xFA6EFCA7, 0xF38A00EA, 0xFFFFFFFF, 0x00000000, 0x00000000 -glabel D_80AF1728 - .word 0x00000007, 0x00000488, 0x00000003, 0x00000001, 0x000C004B, 0x02730000, 0x00000000, 0x00000000, 0xFFFFFFC0, 0x00000032, 0x00000000, 0xFFFFFFC0, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000030, 0x00000001, 0x00020000, 0x005A0000, 0x00000000, 0xFFFFFAB0, 0xFFFFFC3D, 0xFFFFF2F1, 0xFFFFFAB0, 0xFFFFFC3D, 0xFFFFF2F1, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00010000, 0x04430000, 0x00000000, 0x42226662, 0xFA9BFC42, 0xF2FD8BC0, 0x00000000, 0x42226662, 0xFA9BFC42, 0xF2FD2200, 0x00000000, 0x42226662, 0xFA9BFC42, 0xF2FD0000, 0x00000000, 0x42226662, 0xFA9BFC42, 0xF2FDD0E8, 0xFF000000, 0x42226662, 0xFA9BFC42, 0xF2FD0000, 0x00000005, 0x00010028, 0x046B0000, 0x00000000, 0x424B3339, 0x00130028, 0x00358BC0, 0x00000000, 0x424B3339, 0x00130028, 0x00352200, 0x00000000, 0x424B3339, 0x00130028, 0x00350000, 0x00000000, 0x424B3339, 0x00130028, 0x0035D0E8, 0xFF000000, 0x424B3339, 0x00130028, 0x00350000, 0x00000002, 0x00010000, 0x04600000, 0x0000001E, 0x42226662, 0xFB38FC2D, 0xF2DA8BC0, 0x0000001E, 0x42226662, 0xFB38FC2D, 0xF2DA2200, 0x000003E8, 0x42226662, 0xFB38FC2D, 0xF2DA0000, 0x0000001E, 0x42226662, 0xFB38FC2D, 0xF2DAD0E8, 0xFF00001E, 0x42226662, 0xFB38FC2D, 0xF2DA0000, 0x00000006, 0x00010028, 0x04880000, 0x0000001E, 0x424B3339, 0xFFDD0038, 0xFFA38BC0, 0x0000001E, 0x424B3339, 0xFFDD0038, 0xFFA32200, 0x000003E8, 0x424B3339, 0xFFDD0038, 0xFFA30000, 0x0000001E, 0x424B3339, 0xFFDD0038, 0xFFA3D0E8, 0xFF00001E, 0x424B3339, 0xFFDD0038, 0xFFA30000, 0x00000013, 0x00000002, 0xFFFF0000, 0x0023FFFF, 0xFFFFFFFF, 0x404F0023, 0x00460000, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000 -glabel D_80AF1938 - .word 0x00000000 -glabel D_80AF193C - .word func_80AEC0B4 -.word func_80AEC100 -.word func_80AEC130 -.word func_80AEC17C -.word func_80AEC1D4 -.word func_80AEC244 -.word func_80AEC2C0 -.word func_80AECA94 -.word func_80AECAB4 -.word func_80AECAD4 -.word func_80AECB18 -.word func_80AECB60 -.word func_80AECBB8 -.word func_80AECC1C -.word func_80AECC84 -.word func_80AED304 -.word func_80AED324 -.word func_80AED344 -.word func_80AED374 -.word func_80AED3A4 -.word func_80AED3E0 -.word func_80AED414 -.word func_80AEF29C -.word func_80AEF2AC -.word func_80AEF2D0 -.word func_80AEF354 -.word func_80AEF3A8 -.word func_80AEEBD4 -.word func_80AEEC5C -.word func_80AEECF0 -.word func_80AEED58 -.word func_80AEEDCC -.word func_80AEEE34 -.word func_80AEEE9C -.word func_80AEEF08 -.word func_80AEEF5C -.word func_80AEF9D8 -.word func_80AEFA2C -.word func_80AEFAAC -.word func_80AEFB04 -.word func_80AEFB68 -.word func_80AEFCE8 -.word func_80AEFBC8 -.word func_80AEFC24 -.word func_80AEFECC -.word func_80AEFF40 -glabel D_80AF19F4 - .word func_80AF0278 -glabel D_80AF19F8 - .word 0x00000000, 0x41200000, 0x00000000 -glabel D_80AF1A04 - .word func_80AF03F4 -.word func_80AF0400 -.word func_80AF05D4 -glabel En_Ru1_InitVars - .word 0x00A10400, 0x04000011, 0x00A30000, 0x0000039C -.word EnRu1_Init -.word EnRu1_Destroy -.word EnRu1_Update -.word EnRu1_Draw - diff --git a/data/overlays/actors/z_en_ru1.reloc.s b/data/overlays/actors/z_en_ru1.reloc.s deleted file mode 100644 index 5d297e7a87..0000000000 --- a/data/overlays/actors/z_en_ru1.reloc.s +++ /dev/null @@ -1,11 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata -glabel D_80AF1C90 - -.incbin "baserom/ovl_En_Ru1", 0x7080, 0x000008C0 diff --git a/include/z64.h b/include/z64.h index c2d25a56fe..642837c7c7 100644 --- a/include/z64.h +++ b/include/z64.h @@ -1117,6 +1117,17 @@ typedef struct { /* 0x14 */ f32 transitionRate; } struct_80034EC0_Entry; // size = 0x18 +typedef struct { + /* 0x00 */ s16 unk_00; + /* 0x02 */ s16 unk_02; + /* 0x04 */ s16 unk_04; + /* 0x06 */ s16 unk_06; + /* 0x08 */ Vec3s unk_08; + /* 0x0E */ Vec3s unk_0E; + /* 0x14 */ f32 unk_14; + /* 0x18 */ Vec3f unk_18; +} struct_80034A14_arg1; + typedef struct { /* 0x00 */ u32 unk_00; /* 0x04 */ u32(*init)(GlobalContext*, u32, LoadedParticleEntry*, void*); diff --git a/include/z64actor.h b/include/z64actor.h index 0245eb3c32..4cfe9728f6 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -326,7 +326,9 @@ typedef struct { /* 0x0444 */ u8 action; /* 0x0445 */ char unk_445[0x003]; /* 0x0448 */ Actor* unk_448; - /* 0x0445 */ char unk_44C[0x01E]; + /* 0x044C */ char unk_44C[0x004]; + /* 0x0450 */ Vec3f unk_450; + /* 0x045C */ char unk_45C[0x00E]; /* 0x046A */ u16 unk_46A; /* 0x046C */ char unk_46C[0x6E]; /* 0x04DA */ s16 unk_4DA; @@ -352,7 +354,8 @@ typedef struct { /* 0x06C8 */ SkelAnime skelAnime2; /* 0x070C */ char unk_70C[0x128]; /* 0x0834 */ s16 unk_834; - /* 0x0836 */ char unk_836[0x006]; + /* 0x0836 */ char unk_836[0x002]; + /* 0x0838 */ f32 unk_838; /* 0x083C */ s16 unk_83C; /* 0x083E */ char unk_83E[0x004]; /* 0x0842 */ s8 swordAnimation; diff --git a/makefile b/makefile index 9340a3fb61..2052ddb974 100644 --- a/makefile +++ b/makefile @@ -27,7 +27,7 @@ CC := $(QEMU_IRIX) -L tools/ido7.1_compiler tools/ido7.1_compiler/usr/bi CC_OLD := $(QEMU_IRIX) -L tools/ido5.3_compiler tools/ido5.3_compiler/usr/bin/cc # Check code syntax with host compiler -CC_CHECK := gcc -fno-builtin -fsyntax-only -fsigned-char -std=gnu90 -Wall -Wextra -Wno-format-security -Wno-unknown-pragmas -D _LANGUAGE_C -D NON_MATCHING -I include -include stdarg.h +CC_CHECK := gcc -fno-builtin -fsyntax-only -fsigned-char -std=gnu90 -Wall -Wextra -Wno-format-security -Wno-unknown-pragmas -D _LANGUAGE_C -D NON_MATCHING -Iinclude -Isrc -include stdarg.h CPP := cpp MKLDSCRIPT := tools/mkldscript @@ -35,10 +35,10 @@ ELF2ROM := tools/elf2rom ZAP2 := tools/ZAP2/ZAP2.out OPTIMIZATION := -O2 -ASFLAGS := -march=vr4300 -32 -I include +ASFLAGS := -march=vr4300 -32 -Iinclude # we support Microsoft extensions such as anonymous structs, which the compiler does support but warns for their usage. Surpress the warnings with -woff. -CFLAGS := -mips2 -G 0 -non_shared -Xfullwarn -Xcpluscomm -I include -Wab,-r4300_mul -woff 649,838 +CFLAGS := -mips2 -G 0 -non_shared -Xfullwarn -Xcpluscomm -Iinclude -Isrc -Wab,-r4300_mul -woff 649,838 ifeq ($(shell getconf LONG_BIT), 32) # Work around memory allocation bug in QEMU diff --git a/spec b/spec index 375412368b..90ea497e0d 100644 --- a/spec +++ b/spec @@ -3184,8 +3184,7 @@ endseg beginseg name "ovl_En_Ru1" include "build/src/overlays/actors/ovl_En_Ru1/z_en_ru1.o" - include "build/data/overlays/actors/z_en_ru1.data.o" - include "build/data/overlays/actors/z_en_ru1.reloc.o" + include "build/src/overlays/actors/ovl_En_Ru1/z_en_ru1_reloc.o" endseg beginseg diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 02e5b4efbc..dd4822943c 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -3683,21 +3683,6 @@ s32 func_800343CC(GlobalContext* globalCtx, Actor* actor, s16* arg2, f32 arg3, u return 0; } -typedef struct { - /* 0x00 */ s16 unk_00; - /* 0x02 */ s16 unk_02; - /* 0x04 */ s16 unk_04; - /* 0x06 */ s16 unk_06; - /* 0x08 */ s16 unk_08; - /* 0x0A */ s16 unk_0A; - /* 0x0C */ char unk_0C[0x2]; - /* 0x0E */ s16 unk_0E; - /* 0x10 */ s16 unk_10; - /* 0x12 */ char unk_12[0x2]; - /* 0x14 */ f32 unk_14; - /* 0x18 */ Vec3f unk_18; -} struct_80034A14_arg1; - typedef struct { /* 0x00 */ s16 unk_00; /* 0x02 */ s16 unk_02; @@ -3750,18 +3735,18 @@ void func_800344BC(Actor* actor, struct_80034A14_arg1* arg1, s16 arg2, s16 arg3, sp40 = Math_Vec3f_Yaw(&actor->posRot.pos, &arg1->unk_18) - actor->shape.rot.y; temp1 = (sp40 < -arg2) ? -arg2 : ((sp40 > arg2) ? arg2 : sp40); - Math_SmoothScaleMaxMinS(&arg1->unk_0A, temp1, 6, 2000, 1); + Math_SmoothScaleMaxMinS(&arg1->unk_08.y, temp1, 6, 2000, 1); sp40 = (ABS(sp40) >= 0x8000) ? 0 : ((sp40 >= 0) ? sp40 : -sp40); - arg1->unk_0A = ((arg1->unk_0A < -sp40) ? -sp40 : ((arg1->unk_0A > sp40) ? sp40 : arg1->unk_0A)); + arg1->unk_08.y = ((arg1->unk_08.y < -sp40) ? -sp40 : ((arg1->unk_08.y > sp40) ? sp40 : arg1->unk_08.y)); - sp40 = sp40 - arg1->unk_0A; + sp40 = sp40 - arg1->unk_08.y; temp1 = (sp40 < -arg5) ? -arg5 : ((sp40 > arg5) ? arg5 : sp40); - Math_SmoothScaleMaxMinS(&arg1->unk_10, temp1, 6, 2000, 1); + Math_SmoothScaleMaxMinS(&arg1->unk_08.z, temp1, 6, 2000, 1); sp40 = (ABS(sp40) >= 0x8000) ? 0 : ((sp40 >= 0) ? sp40 : -sp40); - arg1->unk_10 = ((arg1->unk_10 < -sp40) ? -sp40 : ((arg1->unk_10 > sp40) ? sp40 : arg1->unk_10)); + arg1->unk_08.z = ((arg1->unk_08.z < -sp40) ? -sp40 : ((arg1->unk_08.z > sp40) ? sp40 : arg1->unk_08.z)); if (arg8 != 0) { if (arg3) {} // Seems necessary to match @@ -3771,10 +3756,10 @@ void func_800344BC(Actor* actor, struct_80034A14_arg1* arg1, s16 arg2, s16 arg3, temp1 = (sp46 < arg4) ? arg4 : ((sp46 > arg3) ? arg3 : sp46); Math_SmoothScaleMaxMinS(&arg1->unk_08, temp1, 6, 2000, 1); - temp2 = sp46 - arg1->unk_08; + temp2 = sp46 - arg1->unk_08.x; temp1 = (temp2 < arg7) ? arg7 : ((temp2 > arg6) ? arg6 : temp2); - Math_SmoothScaleMaxMinS(&arg1->unk_0E, temp1, 6, 2000, 1); + Math_SmoothScaleMaxMinS(&arg1->unk_0E.x, temp1, 6, 2000, 1); } #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800344BC.s") diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h index 96a6ef1004..b34368ea7f 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h @@ -6,7 +6,8 @@ typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0xA4]; + /* 0x014C */ char unk_14C[0xA0]; + /* 0x01EC */ s32 unk_1EC; } DoorWarp1; // size = 0x01F0 extern const ActorInit Door_Warp1_InitVars; diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index 525a8fd465..23a1868a66 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -1,5 +1,13 @@ +/* + * File: z_en_ru1.c + * Overlay: En_Ru1 + * Description: + */ + #include "z_en_ru1.h" +#include + #define FLAGS 0x04000011 void EnRu1_Init(EnRu1* this, GlobalContext* globalCtx); @@ -7,7 +15,114 @@ void EnRu1_Destroy(EnRu1* this, GlobalContext* globalCtx); void EnRu1_Update(EnRu1* this, GlobalContext* globalCtx); void EnRu1_Draw(EnRu1* this, GlobalContext* globalCtx); -/* +void func_80AEC0B4(EnRu1* this, GlobalContext* globalCtx); +void func_80AEC100(EnRu1* this, GlobalContext* globalCtx); +void func_80AEC130(EnRu1* this, GlobalContext* globalCtx); +void func_80AEC17C(EnRu1* this, GlobalContext* globalCtx); +void func_80AEC1D4(EnRu1* this, GlobalContext* globalCtx); +void func_80AEC244(EnRu1* this, GlobalContext* globalCtx); +void func_80AEC2C0(EnRu1* this, GlobalContext* globalCtx); +void func_80AECA94(EnRu1* this, GlobalContext* globalCtx); +void func_80AECAB4(EnRu1* this, GlobalContext* globalCtx); +void func_80AECAD4(EnRu1* this, GlobalContext* globalCtx); +void func_80AECB18(EnRu1* this, GlobalContext* globalCtx); +void func_80AECB60(EnRu1* this, GlobalContext* globalCtx); +void func_80AECBB8(EnRu1* this, GlobalContext* globalCtx); +void func_80AECC1C(EnRu1* this, GlobalContext* globalCtx); +void func_80AECC84(EnRu1* this, GlobalContext* globalCtx); +void func_80AED304(EnRu1* this, GlobalContext* globalCtx); +void func_80AED324(EnRu1* this, GlobalContext* globalCtx); +void func_80AED344(EnRu1* this, GlobalContext* globalCtx); +void func_80AED374(EnRu1* this, GlobalContext* globalCtx); +void func_80AED3A4(EnRu1* this, GlobalContext* globalCtx); +void func_80AED3E0(EnRu1* this, GlobalContext* globalCtx); +void func_80AED414(EnRu1* this, GlobalContext* globalCtx); +void func_80AEF29C(EnRu1* this, GlobalContext* globalCtx); +void func_80AEF2AC(EnRu1* this, GlobalContext* globalCtx); +void func_80AEF2D0(EnRu1* this, GlobalContext* globalCtx); +void func_80AEF354(EnRu1* this, GlobalContext* globalCtx); +void func_80AEF3A8(EnRu1* this, GlobalContext* globalCtx); +void func_80AEEBD4(EnRu1* this, GlobalContext* globalCtx); +void func_80AEEC5C(EnRu1* this, GlobalContext* globalCtx); +void func_80AEECF0(EnRu1* this, GlobalContext* globalCtx); +void func_80AEED58(EnRu1* this, GlobalContext* globalCtx); +void func_80AEEDCC(EnRu1* this, GlobalContext* globalCtx); +void func_80AEEE34(EnRu1* this, GlobalContext* globalCtx); +void func_80AEEE9C(EnRu1* this, GlobalContext* globalCtx); +void func_80AEEF08(EnRu1* this, GlobalContext* globalCtx); +void func_80AEEF5C(EnRu1* this, GlobalContext* globalCtx); +void func_80AEF9D8(EnRu1* this, GlobalContext* globalCtx); +void func_80AEFA2C(EnRu1* this, GlobalContext* globalCtx); +void func_80AEFAAC(EnRu1* this, GlobalContext* globalCtx); +void func_80AEFB04(EnRu1* this, GlobalContext* globalCtx); +void func_80AEFB68(EnRu1* this, GlobalContext* globalCtx); +void func_80AEFCE8(EnRu1* this, GlobalContext* globalCtx); +void func_80AEFBC8(EnRu1* this, GlobalContext* globalCtx); +void func_80AEFC24(EnRu1* this, GlobalContext* globalCtx); +void func_80AEFECC(EnRu1* this, GlobalContext* globalCtx); +void func_80AEFF40(EnRu1* this, GlobalContext* globalCtx); + +void func_80AF0278(EnRu1* this, GlobalContext* globalCtx, s32 limbIndex, Vec3s* rot); + +void func_80AF03F4(EnRu1* this, GlobalContext* globalCtx); +void func_80AF0400(EnRu1* this, GlobalContext* globalCtx); +void func_80AF05D4(EnRu1* this, GlobalContext* globalCtx); + +ColliderCylinderInit D_80AF0800 = { + 0x00, 0x00, 0x00, 0x09, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00000000, 0x00, 0x00, 0x00, 0x00, 0x00000000, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x0019, 0x0050, 0x0000, 0x0000, 0x0000, 0x0000, +}; + +ColliderCylinderInit D_80AF082C = { + 0x00, 0x09, 0x00, 0x09, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00000101, 0x00, 0x00, 0x00, 0x00, 0x00000000, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x01, 0x00, 0x0014, 0x001E, 0x0000, 0x0000, 0x0000, 0x0000, +}; + +u32 D_80AF0858[] = { + 0x0600E3B8, 0x0600F238, 0x0600F638, 0x0600FE38, 0x06010238, 0x06010A38, +}; + +u32 D_80AF0870[] = { + 0x0600E838, + 0x0600FA38, + 0x06010638, +}; + +s32 D_80AF087C = 0; + +#include "z_en_ru1_cutscene_data.c" + +u32 D_80AF1938 = 0; + +ActorFunc D_80AF193C[] = { + (ActorFunc)func_80AEC0B4, (ActorFunc)func_80AEC100, (ActorFunc)func_80AEC130, (ActorFunc)func_80AEC17C, + (ActorFunc)func_80AEC1D4, (ActorFunc)func_80AEC244, (ActorFunc)func_80AEC2C0, (ActorFunc)func_80AECA94, + (ActorFunc)func_80AECAB4, (ActorFunc)func_80AECAD4, (ActorFunc)func_80AECB18, (ActorFunc)func_80AECB60, + (ActorFunc)func_80AECBB8, (ActorFunc)func_80AECC1C, (ActorFunc)func_80AECC84, (ActorFunc)func_80AED304, + (ActorFunc)func_80AED324, (ActorFunc)func_80AED344, (ActorFunc)func_80AED374, (ActorFunc)func_80AED3A4, + (ActorFunc)func_80AED3E0, (ActorFunc)func_80AED414, (ActorFunc)func_80AEF29C, (ActorFunc)func_80AEF2AC, + (ActorFunc)func_80AEF2D0, (ActorFunc)func_80AEF354, (ActorFunc)func_80AEF3A8, (ActorFunc)func_80AEEBD4, + (ActorFunc)func_80AEEC5C, (ActorFunc)func_80AEECF0, (ActorFunc)func_80AEED58, (ActorFunc)func_80AEEDCC, + (ActorFunc)func_80AEEE34, (ActorFunc)func_80AEEE9C, (ActorFunc)func_80AEEF08, (ActorFunc)func_80AEEF5C, + (ActorFunc)func_80AEF9D8, (ActorFunc)func_80AEFA2C, (ActorFunc)func_80AEFAAC, (ActorFunc)func_80AEFB04, + (ActorFunc)func_80AEFB68, (ActorFunc)func_80AEFCE8, (ActorFunc)func_80AEFBC8, (ActorFunc)func_80AEFC24, + (ActorFunc)func_80AEFECC, (ActorFunc)func_80AEFF40, +}; + +void (*D_80AF19F4[])(EnRu1* this, GlobalContext* globalCtx, s32 limbIndex, Vec3s* rot) = { + func_80AF0278, +}; + +Vec3f D_80AF19F8 = { 0.0f, 10.0f, 0.0f }; + +ActorFunc D_80AF1A04[] = { + (ActorFunc)func_80AF03F4, + (ActorFunc)func_80AF0400, + (ActorFunc)func_80AF05D4, +}; + const ActorInit En_Ru1_InitVars = { ACTOR_EN_RU1, ACTORTYPE_NPC, @@ -19,417 +134,2260 @@ const ActorInit En_Ru1_InitVars = { (ActorFunc)EnRu1_Update, (ActorFunc)EnRu1_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAC10.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAC54.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEACDC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAD20.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAD98.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEADD8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEADE0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEADF0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Destroy.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAE1C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAEA4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAEB8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAECC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAF38.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAF58.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAFA0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEAFE0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB020.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB088.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB0EC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB104.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB124.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB174.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB1B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB1D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB220.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB264.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB320.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB364.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB3A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB3CC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB3DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB438.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB458.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB480.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB4A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB50C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB59C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB680.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB6E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB738.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB7D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB7E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB87C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB89C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB914.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB934.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB954.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB974.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBA0C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBA2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBAFC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBB3C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBB78.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBBF4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBC30.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBC84.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBCB8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBD1C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBD94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBE3C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBEC8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBF60.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBFD8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC070.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC0B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC100.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC130.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC17C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC1D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC244.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC2C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC320.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC40C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC4CC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC4F4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC5FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC650.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC6B0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC6E4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC780.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC81C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC8B8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC93C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC9C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECA18.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECA44.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECA94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECAB4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECAD4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECB18.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECB60.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECBB8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECC1C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECC84.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECCB0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECDA0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECE04.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECE20.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECEB4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECF6C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED084.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED0B0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED0C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED0D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED110.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED154.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED19C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED218.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED304.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED324.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED344.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED374.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED3A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED3E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED414.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED44C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED4FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED520.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED57C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED5B8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED5DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED600.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED624.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED6DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED6F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED738.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED83C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED8DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDAE0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDB30.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDEF4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEDFF4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE02C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE050.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE264.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE2F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE394.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE488.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE568.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE628.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE6D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE7C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEAC8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEB24.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEBB4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEBD4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEC5C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEECF0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEED58.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEDCC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEE34.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEE9C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEF08.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEF5C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEF68.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEEFEC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF080.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF0BC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF170.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF188.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF1F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF29C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF2AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF2D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF354.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF3A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF40C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF4A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF4E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF51C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF540.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF5B8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF624.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF728.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF79C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF820.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF890.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF930.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF99C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF9D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFA2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFAAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFB04.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFB68.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFBC8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFC24.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFC54.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFCE8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFD38.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFDC0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFE38.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFE84.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFE9C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFECC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFF40.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFF94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0050.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Update.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Init.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0278.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF02E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0368.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF03F4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0400.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF05D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Draw.s") +extern AnimationHeader D_06000690; +extern AnimationHeader D_06000E54; +extern AnimationHeader D_06001488; +extern AnimationHeader D_06002058; +extern AnimationHeader D_06002990; +extern AnimationHeader D_06002EC0; +extern AnimationHeader D_06003608; +extern AnimationHeader D_06003784; +extern AnimationHeader D_06004074; +extern AnimationHeader D_06004350; +extern AnimationHeader D_06004648; +extern AnimationHeader D_06004BF0; +extern AnimationHeader D_060063F4; +extern AnimationHeader D_06006B9C; +extern AnimationHeader D_06007534; +extern AnimationHeader D_060078E4; +extern AnimationHeader D_06008100; +extern AnimationHeader D_06008AA8; +extern AnimationHeader D_06009060; +extern AnimationHeader D_060097B8; +extern SkeletonHeader D_06012700; +extern AnimationHeader D_06012E94; +extern AnimationHeader D_06013A64; + +void func_80AEAC10(EnRu1* this, GlobalContext* globalCtx) { + s32 pad[4]; + ColliderCylinderMain* collider = &this->collider; + + ActorCollider_Cylinder_Update(&this->actor, collider); + Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, collider); +} + +void func_80AEAC54(EnRu1* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + ColliderCylinderMain* collider2 = &this->collider2; + s32 pad[3]; + + ActorCollider_Cylinder_Update(thisx, collider2); + if (this->unk_34C != 0) { + Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, collider2); + } else if (thisx->xzDistanceFromLink > 32.0f) { + this->unk_34C = 1; + } +} + +void func_80AEACDC(EnRu1* this, GlobalContext* globalCtx) { + s32 pad[4]; + ColliderCylinderMain* collider2 = &this->collider2; + + ActorCollider_Cylinder_Update(&this->actor, collider2); + Actor_CollisionCheck_SetAT(globalCtx, &globalCtx->sub_11E60, collider2); +} + +void func_80AEAD20(EnRu1* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + + ActorCollider_AllocCylinder(globalCtx, &this->collider); + if (!thisx) {} // necessary to match + func_8005C450(globalCtx, &this->collider, thisx, &D_80AF0800); + + ActorCollider_AllocCylinder(globalCtx, &this->collider2); + func_8005C450(globalCtx, &this->collider2, thisx, &D_80AF082C); +} + +void func_80AEAD98(EnRu1* this, GlobalContext* globalCtx) { + ActorCollider_FreeCylinder(globalCtx, &this->collider); + ActorCollider_FreeCylinder(globalCtx, &this->collider2); +} + +void func_80AEADD8(EnRu1* this) { + this->unk_34C = 0; +} + +u8 func_80AEADE0(EnRu1* this) { + u8 params = this->actor.params >> 8; + return params; +} + +u8 func_80AEADF0(EnRu1* this) { + s16 params = this->actor.params; + return params; +} + +void EnRu1_Destroy(EnRu1* this, GlobalContext* globalCtx) { + func_80AEAD98(this, globalCtx); +} + +void func_80AEAE1C(EnRu1* this) { + s32 pad[3]; + s16* unk_25E = &this->unk_25E; + s16* unk_25C = &this->unk_25C; + + if (DECR(*unk_25E) == 0) { + *unk_25E = Math_Rand_S16Offset(0x3C, 0x3C); + } + + *unk_25C = *unk_25E; + if (*unk_25C >= 3) { + *unk_25C = 0; + } +} + +void func_80AEAEA4(EnRu1* this, s16 arg1) { + this->unk_25C = arg1; +} + +void func_80AEAEB8(EnRu1* this, s16 arg1) { + this->unk_260 = arg1; +} + +void func_80AEAECC(EnRu1* this, GlobalContext* globalCtx) { + f32* velocityY = &this->actor.velocity.y; + f32 velocityYHeld = *velocityY; + + *velocityY = -4.0f; + func_8002E4B4(globalCtx, &this->actor, 19.0f, 25.0f, 30.0f, 7); + *velocityY = velocityYHeld; +} + +s32 func_80AEAF38(GlobalContext* globalCtx) { + if (globalCtx->csCtx.state == 0) { + return 1; + } + return 0; +} + +CsCmdActorAction* func_80AEAF58(GlobalContext* globalCtx, s32 actorActionIdx) { + s32 pad[2]; + CsCmdActorAction* ret = NULL; + + if (!func_80AEAF38(globalCtx)) { + ret = globalCtx->csCtx.actorActions[actorActionIdx]; + } + return ret; +} + +s32 func_80AEAFA0(GlobalContext* globalCtx, u16 action, s32 actorActionIdx) { + CsCmdActorAction* csCmdActorAction = func_80AEAF58(globalCtx, actorActionIdx); + if ((csCmdActorAction != NULL) && (csCmdActorAction->action == action)) { + return 1; + } + return 0; +} + +s32 func_80AEAFE0(GlobalContext* globalCtx, u16 action, s32 actorActionIdx) { + CsCmdActorAction* csCmdActorAction = func_80AEAF58(globalCtx, actorActionIdx); + if ((csCmdActorAction != NULL) && (csCmdActorAction->action != action)) { + return 1; + } + return 0; +} + +s32 func_80AEB020(EnRu1* this, GlobalContext* globalCtx) { + Actor* actorIt = globalCtx->actorCtx.actorList[ACTORTYPE_NPC].first; + EnRu1* someEnRu1; + + while (actorIt != NULL) { + if (actorIt->id == ACTOR_EN_RU1) { + someEnRu1 = actorIt; + if (someEnRu1 != this) { + if ((someEnRu1->action == 31) || (someEnRu1->action == 32) || (someEnRu1->action == 24)) { + return 1; + } + } + } + actorIt = actorIt->next; + } + return 0; +} + +DynaPolyActor* func_80AEB088(GlobalContext* globalCtx) { + Actor* actorIt = globalCtx->actorCtx.actorList[ACTORTYPE_BG].first; + + while (actorIt != NULL) { + if (actorIt->id == ACTOR_BG_BDAN_OBJECTS && actorIt->params == 0) { + return actorIt; + } + actorIt = actorIt->next; + } + osSyncPrintf(VT_FGCOL(RED) "お立ち台が無い!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return NULL; +} + +void func_80AEB0EC(EnRu1* this, s32 arg1) { + if (this->unk_28C != NULL) { + this->unk_28C->unk_1B8 = arg1; + } +} + +s32 func_80AEB104(EnRu1* this) { + if (this->unk_28C != NULL) { + return this->unk_28C->unk_1B8; + } else { + return 0; + } +} + +Actor* func_80AEB124(GlobalContext* globalCtx) { + Actor* actorIt = globalCtx->actorCtx.actorList[ACTORTYPE_BOSS].first; + + while (actorIt != NULL) { + if ((actorIt->id == ACTOR_DEMO_EFFECT) && ((actorIt->params & 0xFF) == 0x15)) { + return actorIt; + } + actorIt = actorIt->next; + } + return NULL; +} + +s32 func_80AEB174(GlobalContext* globalCtx) { + return (func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx)); +} + +s32 func_80AEB1B4(GlobalContext* globalCtx) { + return func_8010BDBC(&globalCtx->msgCtx) == 2; +} + +void func_80AEB1D8(EnRu1* this) { + Actor* thisx = &this->actor; + + this->action = 36; + this->drawConfig = 0; + thisx->velocity.x = 0.0f; + thisx->velocity.y = 0.0f; + thisx->velocity.z = 0.0f; + thisx->speedXZ = 0.0f; + thisx->gravity = 0.0f; + thisx->minVelocityY = 0.0f; + func_80AEB0EC(this, 0); +} + +void func_80AEB220(EnRu1* this, GlobalContext* globalCtx) { + if ((func_80AEAF38(globalCtx)) && (this->actor.params == 0xA)) { + func_80AEB1D8(this); + } +} + +void func_80AEB264(EnRu1* this, AnimationHeader* animation, u8 arg2, f32 transitionRate, s32 arg4) { + s32 pad[2]; + AnimationHeader* animationHeader = SEGMENTED_TO_VIRTUAL(&animation->genericHeader); + f32 frameCount = SkelAnime_GetFrameCount(&animationHeader->genericHeader); + f32 playbackSpeed; + f32 unk0; + f32 fc; + + if (arg4 == 0) { + unk0 = 0.0f; + fc = frameCount; + playbackSpeed = 1.0f; + } else { + unk0 = frameCount; + fc = 0.0f; + playbackSpeed = -1.0f; + } + + SkelAnime_ChangeAnim(&this->skelAnime, animationHeader, playbackSpeed, unk0, fc, arg2, transitionRate); +} + +s32 EnRu1_FrameUpdateMatrix(EnRu1* this) { + // why? + if (this->action != 32) { + return SkelAnime_FrameUpdateMatrix(&this->skelAnime); + } else { + return SkelAnime_FrameUpdateMatrix(&this->skelAnime); + } +} + +void func_80AEB364(EnRu1* this, GlobalContext* globalCtx) { + this->skelAnime.flags |= 1; + SkelAnime_LoadAnimationType5(globalCtx, &this->actor, &this->skelAnime, 1.0f); +} + +void func_80AEB3A4(EnRu1* this, GlobalContext* globalCtx) { + this->skelAnime.flags |= 1; + func_80AEB364(this, globalCtx); +} + +void func_80AEB3CC(EnRu1* this) { + this->skelAnime.flags &= ~0x1; +} + +void func_80AEB3DC(EnRu1* this, GlobalContext* globalCtx) { + func_80AEB264(this, &D_06000690, 0, 0, 0); + this->action = 0; + this->drawConfig = 1; + func_80AEAEA4(this, 4); + func_80AEAEB8(this, 0); +} + +CsCmdActorAction* func_80AEB438(GlobalContext* globalCtx) { + return func_80AEAF58(globalCtx, 3); +} + +s32 func_80AEB458(GlobalContext* globalCtx, u16 action) { + return func_80AEAFA0(globalCtx, action, 3); +} + +s32 func_80AEB480(GlobalContext* globalCtx, u16 action) { + return func_80AEAFE0(globalCtx, action, 3); +} + +void func_80AEB4A8(EnRu1* this, GlobalContext* globalCtx, s16 arg2, s16 arg3) { + Vec3f sp24; + Actor* thisx = &this->actor; + + sp24.x = thisx->posRot.pos.x; + sp24.y = thisx->posRot.pos.y + thisx->unk_84; + sp24.z = thisx->posRot.pos.z; + func_80029444(globalCtx, &sp24, 100, arg2, arg3); +} + +void func_80AEB50C(EnRu1* this, GlobalContext* globalCtx) { + this->unk_270 += 1.0f; + if (this->unk_270 >= kREG(3) + 10.0f) { + func_80AEB4A8(this, globalCtx, kREG(1) + 500, 0); + this->unk_270 = 0.0f; + } +} + +void func_80AEB59C(EnRu1* this, GlobalContext* globalCtx) { + f32 temp_f0; + + func_80AEB4A8(this, globalCtx, kREG(2) + 500, 0); + func_80AEB4A8(this, globalCtx, kREG(2) + 500, kREG(3) + 10.0f); + temp_f0 = kREG(3) + 10.0f; + func_80AEB4A8(this, globalCtx, kREG(2) + 500, temp_f0 + temp_f0); +} + +void func_80AEB680(EnRu1* this, GlobalContext* globalCtx) { + Vec3f pos; + Actor* thisx = &this->actor; + + pos.x = thisx->posRot.pos.x; + pos.y = thisx->posRot.pos.y + thisx->unk_84; + pos.z = thisx->posRot.pos.z; + + func_8002949C(globalCtx, &pos, 0, 0, 1, 0); +} + +void func_80AEB6E0(EnRu1* this, GlobalContext* globalCtx) { + SkelAnime* skelAnime = &this->skelAnime; + + if (skelAnime->unk_3E.y < skelAnime->actorDrawTbl->y) { + skelAnime->flags |= 3; + SkelAnime_LoadAnimationType5(globalCtx, &this->actor, skelAnime, 1.0f); + } +} + +void func_80AEB738(EnRu1* this, GlobalContext* globalCtx) { + SkelAnime* skelAnime = &this->skelAnime; + + skelAnime->unk_3E = *skelAnime->actorDrawTbl; + skelAnime->prevFramePos = *skelAnime->actorDrawTbl; + if (skelAnime->unk_3E.y < skelAnime->actorDrawTbl->y) { + skelAnime->flags |= 3; + SkelAnime_LoadAnimationType5(globalCtx, &this->actor, skelAnime, 1.0f); + } +} + +void func_80AEB7D0(EnRu1* this) { + this->skelAnime.flags &= ~0x3; +} + +f32 func_80AEB7E0(CsCmdActorAction* csCmdActorAction, GlobalContext* globalCtx) { + s32 csCtxFrames = globalCtx->csCtx.frames; + if ((csCtxFrames < csCmdActorAction->endFrame) && (csCmdActorAction->endFrame - csCmdActorAction->startFrame > 0)) { + return (Math_Coss(((csCtxFrames - csCmdActorAction->startFrame) / + (f32)(csCmdActorAction->endFrame - csCmdActorAction->startFrame)) * + 32768.0f) * + -0.5f) + + 0.5f; + } + return 1.0f; +} + +f32 func_80AEB87C(f32 arg0, s32 arg1, s32 arg2) { + return (((f32)arg2 - arg1) * arg0) + arg1; +} + +void func_80AEB89C(EnRu1* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + CsCmdActorAction* actorAction = func_80AEB438(globalCtx); + s16 actorActionRotY; + + if (actorAction != NULL) { + actorActionRotY = actorAction->rot.y; + thisx->shape.rot.y = actorActionRotY; + thisx->posRot.rot.y = actorActionRotY; + thisx->posRot.pos.x = actorAction->startPos.x; + thisx->posRot.pos.y = actorAction->startPos.y; + thisx->posRot.pos.z = actorAction->startPos.z; + } +} + +void func_80AEB914(EnRu1* this, GlobalContext* globalCtx) { + func_80AEB89C(this, globalCtx); +} + +void func_80AEB934(EnRu1* this, GlobalContext* globalCtx) { + func_80AEB89C(this, globalCtx); +} + +void func_80AEB954(EnRu1* this, GlobalContext* globalCtx) { + func_80AEB6E0(this, globalCtx); +} + +void func_80AEB974(EnRu1* this, GlobalContext* globalCtx) { + Vec3f* thisPos; + f32 sp30; + CsCmdActorAction* csCmdActorAction = func_80AEB438(globalCtx); + Actor* thisx = &this->actor; + + if (csCmdActorAction != NULL) { + sp30 = func_80AEB7E0(csCmdActorAction, globalCtx); + thisPos = &thisx->posRot.pos; + thisPos->x = func_80AEB87C(sp30, csCmdActorAction->startPos.x, csCmdActorAction->endPos.x); + thisPos->y = func_80AEB87C(sp30, csCmdActorAction->startPos.y, csCmdActorAction->endPos.y); + thisPos->z = func_80AEB87C(sp30, csCmdActorAction->startPos.z, csCmdActorAction->endPos.z); + } +} + +void func_80AEBA0C(EnRu1* this, GlobalContext* globalCtx) { + func_80AEB6E0(this, globalCtx); +} + +void func_80AEBA2C(EnRu1* this, GlobalContext* globalCtx) { + s32 pad; + Vec3f* unk_364 = &this->unk_364; + Vec3f* thisPos; + f32 temp_ret_2; + CsCmdActorAction* csCmdActorAction = func_80AEB438(globalCtx); + Actor* thisx = &this->actor; + + if (csCmdActorAction != NULL) { + temp_ret_2 = func_80AEB7E0(csCmdActorAction, globalCtx); + thisPos = &thisx->posRot.pos; + thisPos->x = func_80AEB87C(temp_ret_2, unk_364->x, csCmdActorAction->endPos.x); + thisPos->y = func_80AEB87C(temp_ret_2, unk_364->y, csCmdActorAction->endPos.y); + thisPos->z = func_80AEB87C(temp_ret_2, unk_364->z, csCmdActorAction->endPos.z); + } +} + +void func_80AEBAFC(EnRu1* this) { + if (this->unk_298 == 0) { + func_80078914(&this->actor.unk_E4, NA_SE_EV_DIVE_INTO_WATER); + this->unk_298 = 1; + } +} + +void func_80AEBB3C(EnRu1* this) { + if (func_800A56C8(&this->skelAnime, 5.0f)) { + func_80078914(&this->actor.unk_E4, 0x863); + } +} + +void func_80AEBB78(EnRu1* this) { + SkelAnime* skelAnime = &this->skelAnime; + if ((((func_800A56C8(skelAnime, 4.0f)) || (func_800A56C8(skelAnime, 13.0f))) || + (func_800A56C8(skelAnime, 22.0f))) || + (func_800A56C8(skelAnime, 31.0f))) { + func_80078914(&this->actor.unk_E4, 0x839); + } +} + +void func_80AEBBF4(EnRu1* this) { + if (func_800A56C8(&this->skelAnime, 8.0f)) { + func_80078914(&this->actor.unk_E4, 0x873); + } +} + +void func_80AEBC30(GlobalContext* globalCtx) { + Player* player; + + if (globalCtx->csCtx.frames == 0xCD) { + player = PLAYER; + Audio_PlaySoundGeneral(NA_SE_EV_DIVE_INTO_WATER, &player->actor.unk_E4, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + } +} + +void func_80AEBC84(EnRu1* this, GlobalContext* globalCtx) { + if (globalCtx->csCtx.frames == 0x82) { + func_80078914(&this->actor.unk_E4, NA_SE_VO_RT_LAUGH_0); + } +} + +void func_80AEBCB8(EnRu1* this, UNK_TYPE arg1) { + if (arg1 != 0) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06012E94, 1.0f, 0, SkelAnime_GetFrameCount(&D_06012E94.genericHeader), + 0, -8.0f); + } +} + +void func_80AEBD1C(EnRu1* this, GlobalContext* globalCtx) { + if (func_80AEB480(globalCtx, 2)) { + this->action = 1; + this->drawConfig = 0; + func_80AEB914(this, globalCtx); + func_80AEAECC(this, globalCtx); + func_80AEB680(this, globalCtx); + func_80AEB59C(this, globalCtx); + } +} + +void func_80AEBD94(EnRu1* this, GlobalContext* globalCtx) { + s32 pad[2]; + f32 frameCount; + + if (func_80AEB480(globalCtx, 3)) { + frameCount = SkelAnime_GetFrameCount(&D_06009060.genericHeader); + func_80AEB934(this, globalCtx); + func_80AEB738(this, globalCtx); + SkelAnime_ChangeAnim(&this->skelAnime, &D_06009060, 1.0f, 0.0f, frameCount, 2, 0.0f); + this->action = 2; + this->drawConfig = 1; + } +} + +void func_80AEBE3C(EnRu1* this, GlobalContext* globalCtx, s32 arg2) { + s32 pad[2]; + f32 frameCount; + + if (arg2 != 0) { + frameCount = SkelAnime_GetFrameCount(&D_06013A64.genericHeader); + func_80AEB7D0(this); + SkelAnime_ChangeAnim(&this->skelAnime, &D_06013A64, 1.0f, 0, frameCount, 0, -8.0f); + this->action = 3; + } else { + func_80AEB954(this, globalCtx); + } +} + +void func_80AEBEC8(EnRu1* this, GlobalContext* globalCtx) { + s32 pad[2]; + f32 frameCount; + + if (func_80AEB458(globalCtx, 6)) { + frameCount = SkelAnime_GetFrameCount(&D_06008AA8.genericHeader); + func_80AEB738(this, globalCtx); + SkelAnime_ChangeAnim(&this->skelAnime, &D_06008AA8, 1.0f, 0, frameCount, 2, -8.0f); + this->action = 4; + } +} + +void func_80AEBF60(EnRu1* this, GlobalContext* globalCtx) { + if (func_80AEB480(globalCtx, 6)) { + func_80AEB7D0(this); + this->action = 5; + this->unk_364 = this->actor.posRot.pos; + return; + } else { + func_80AEBA0C(this, globalCtx); + } +} + +void func_80AEBFD8(EnRu1* this, GlobalContext* globalCtx) { + CsCmdActorAction* csCmdActorAction = func_80AEB438(globalCtx); + f32 frameCount; + u16 csCtxFrames; + u16 csCmdActorActionEndFrame; + + if (csCmdActorAction != NULL) { + csCtxFrames = globalCtx->csCtx.frames; + csCmdActorActionEndFrame = csCmdActorAction->endFrame; + if (csCtxFrames >= csCmdActorActionEndFrame - 2) { + frameCount = SkelAnime_GetFrameCount(&D_06008100.genericHeader); + SkelAnime_ChangeAnim(&this->skelAnime, &D_06008100, 1.0, 0, frameCount, 2, -8.0f); + this->action = 6; + } + } +} + +void func_80AEC070(EnRu1* this, GlobalContext* globalCtx, UNK_TYPE arg2) { + if ((func_80AEB458(globalCtx, 8)) && (arg2 != 0)) { + Actor_Kill(&this->actor); + } +} + +void func_80AEC0B4(EnRu1* this, GlobalContext* globalCtx) { + func_80AEB89C(this, globalCtx); + EnRu1_FrameUpdateMatrix(this); + func_80AEBC84(this, globalCtx); + func_80AEBC30(globalCtx); + func_80AEBD1C(this, globalCtx); +} + +void func_80AEC100(EnRu1* this, GlobalContext* globalCtx) { + func_80AEBAFC(this); + func_80AEBD94(this, globalCtx); +} + +void func_80AEC130(EnRu1* this, GlobalContext* globalCtx) { + s32 something = EnRu1_FrameUpdateMatrix(this); + func_80AEAECC(this, globalCtx); + func_80AEBB3C(this); + func_80AEBE3C(this, globalCtx, something); +} + +void func_80AEC17C(EnRu1* this, GlobalContext* globalCtx) { + func_80AEB974(this, globalCtx); + func_80AEAECC(this, globalCtx); + EnRu1_FrameUpdateMatrix(this); + func_80AEB50C(this, globalCtx); + func_80AEBEC8(this, globalCtx); +} + +void func_80AEC1D4(EnRu1* this, GlobalContext* globalCtx) { + s32 something; + + something = EnRu1_FrameUpdateMatrix(this); + func_80AEAECC(this, globalCtx); + func_80AEAE1C(this); + func_80AEB50C(this, globalCtx); + func_80AEBCB8(this, something); + func_80AEBBF4(this); + func_80AEBF60(this, globalCtx); +} + +void func_80AEC244(EnRu1* this, GlobalContext* globalCtx) { + s32 something; + + something = EnRu1_FrameUpdateMatrix(this); + func_80AEBA2C(this, globalCtx); + func_80AEAECC(this, globalCtx); + func_80AEAE1C(this); + func_80AEB50C(this, globalCtx); + func_80AEBCB8(this, something); + func_80AEBB78(this); + func_80AEBFD8(this, globalCtx); +} + +void func_80AEC2C0(EnRu1* this, GlobalContext* globalCtx) { + s32 something; + + something = EnRu1_FrameUpdateMatrix(this); + func_80AEAECC(this, globalCtx); + func_80AEAE1C(this); + func_80AEB50C(this, globalCtx); + func_80AEC070(this, globalCtx, something); +} + +void func_80AEC320(EnRu1* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + s8 actorRoom; + + if (!(gSaveContext.infTable[20] & 2)) { + func_80AEB264(this, &D_060097B8, 0, 0, 0); + this->action = 7; + func_80AEAEB8(this, 1); + return; + } + if ((gSaveContext.infTable[20] & 0x80) && (!(gSaveContext.infTable[20] & 1)) && + (!(gSaveContext.infTable[20] & 0x20))) { + if (!func_80AEB020(this, globalCtx)) { + func_80AEB264(this, &D_060097B8, 0, 0, 0); + actorRoom = thisx->room; + this->action = 22; + thisx->room = -1; + this->drawConfig = 0; + this->roomNum1 = actorRoom; + this->roomNum3 = actorRoom; + this->roomNum2 = actorRoom; + } else { + Actor_Kill(thisx); + } + } else { + Actor_Kill(thisx); + } +} + +void func_80AEC40C(EnRu1* this) { + Actor* thisx = &this->actor; + f32 unk_26C = this->unk_26C; + if (unk_26C < 8.0f) { + thisx->speedXZ = (((kREG(3) * 0.01f) + 2.7f) * 0.125f) * unk_26C; + } else { + thisx->speedXZ = (kREG(3) * 0.01f) + 2.7f; + } + thisx->velocity.y = -1.0f; + Actor_MoveForward(thisx); +} + +void func_80AEC4CC(EnRu1* this) { + Actor* thisx = &this->actor; + thisx->velocity.y = -1.0f; + Actor_MoveForward(thisx); +} + +void func_80AEC4F4(EnRu1* this) { + Actor* thisx = &this->actor; + f32* speedXZ = &thisx->speedXZ; + f32* unk_26C = &this->unk_26C; + + if (this->unk_26C < 8.0f) { + *unk_26C += 1.0f; + *speedXZ *= (8.0f - *unk_26C) * 0.125f; + thisx->velocity.y = -*unk_26C * (((kREG(4) * 0.01f) + 13.0f) * 0.125f); + } else { + *speedXZ = 0.0f; + thisx->velocity.y = -((kREG(4) * 0.01f) + 13.0f); + } + Actor_MoveForward(thisx); +} + +s32 func_80AEC5FC(EnRu1* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + Actor* thisx = &this->actor; + f32 thisPosZ = thisx->posRot.pos.z; + f32 playerPosZ = player->actor.posRot.pos.z; + if ((playerPosZ - thisPosZ <= 265.0f) && (player->actor.posRot.pos.y >= thisx->posRot.pos.y)) { + return 1; + } + return 0; +} + +void func_80AEC650(EnRu1* this) { + s32 pad[2]; + if (this->unk_280 == 0) { + if ((func_800A56C8(&this->skelAnime, 2.0f)) || (func_800A56C8(&this->skelAnime, 7.0f))) { + func_80078914(&this->actor.unk_E4, 0x803); + } + } +} + +void func_80AEC6B0(EnRu1* this) { + func_80078914(&this->actor.unk_E4, NA_SE_EV_FALL_DOWN_DIRT); + func_80078914(&this->actor.unk_E4, NA_SE_VO_RT_FALL); +} + +void func_80AEC6E4(EnRu1* this, GlobalContext* globalCtx) { + if ((func_80AEAFA0(globalCtx, 4, 3)) && (this->unk_280 == 0)) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06003784, 1.0f, 0, SkelAnime_GetFrameCount(&D_06003784.genericHeader), + 2, -8.0f); + this->unk_280 = 1; + func_80AEC6B0(this); + } +} + +void func_80AEC780(EnRu1* this, GlobalContext* globalCtx) { + s32 pad; + Player* player = PLAYER; + + if ((func_80AEC5FC(this, globalCtx)) && (!Gameplay_InCsMode(globalCtx)) && (!(player->stateFlags1 & 0x206000)) && + (player->actor.bgCheckFlags & 1)) { + + globalCtx->csCtx.segment = &D_80AF0880; + gSaveContext.cutsceneTrigger = 1; + player->unk_838 = 0.0f; + this->action = 8; + } +} + +void func_80AEC81C(EnRu1* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + CsCmdActorAction* csCmdActorAction; + s16 newRotY; + if (func_80AEAFE0(globalCtx, 1, 3)) { + csCmdActorAction = globalCtx->csCtx.actorActions[3]; + 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; + this->action = 9; + this->drawConfig = 1; + } +} + +void func_80AEC8B8(EnRu1* this, GlobalContext* globalCtx) { + if (func_80AEAFA0(globalCtx, 3, 3)) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06004074, 1.0f, 0, SkelAnime_GetFrameCount(&D_06004074.genericHeader), + 2, -8.0f); + this->action = 10; + } +} + +void func_80AEC93C(EnRu1* this, UNK_TYPE arg1) { + if (arg1 != 0) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_060078E4, 1.0f, 0, SkelAnime_GetFrameCount(&D_060078E4.genericHeader), + 0, -8.0f); + this->actor.posRot.rot.y += 0x8000; + this->action = 0xB; + this->unk_26C = 0.0f; + } +} + +void func_80AEC9C4(EnRu1* this) { + this->unk_26C += 1.0f; + if (this->unk_26C >= 8.0f) { + this->action = 12; + this->unk_26C = 0.0f; + this->actor.velocity.y = -1.0f; + } +} + +void func_80AECA18(EnRu1* this) { + Actor* thisx = &this->actor; + if (!(thisx->bgCheckFlags & 1)) { + this->action = 13; + this->unk_26C = 0.0f; + thisx->velocity.y = 0.0f; + } +} + +void func_80AECA44(EnRu1* this, GlobalContext* globalCtx) { + if (func_80AEAFA0(globalCtx, 5, 3)) { + gSaveContext.infTable[20] |= 2; + this->action = 14; + } +} + +void func_80AECA94(EnRu1* this, GlobalContext* globalCtx) { + func_80AEC780(this, globalCtx); +} + +void func_80AECAB4(EnRu1* this, GlobalContext* globalCtx) { + func_80AEC81C(this, globalCtx); +} + +void func_80AECAD4(EnRu1* this, GlobalContext* globalCtx) { + EnRu1_FrameUpdateMatrix(this); + func_80AEAE1C(this); + func_80AEAECC(this, globalCtx); + func_80AEC8B8(this, globalCtx); +} + +void func_80AECB18(EnRu1* this, GlobalContext* globalCtx) { + s32 something; + + something = EnRu1_FrameUpdateMatrix(this); + func_80AEAE1C(this); + func_80AEAECC(this, globalCtx); + func_80AEC93C(this, something); +} + +void func_80AECB60(EnRu1* this, GlobalContext* globalCtx) { + func_80AEC40C(this); + EnRu1_FrameUpdateMatrix(this); + func_80AEAE1C(this); + func_80AEAECC(this, globalCtx); + func_80AEC650(this); + func_80AEC9C4(this); +} + +void func_80AECBB8(EnRu1* this, GlobalContext* globalCtx) { + func_80AEC4CC(this); + func_80AEC6E4(this, globalCtx); + EnRu1_FrameUpdateMatrix(this); + func_80AEAE1C(this); + func_80AEAECC(this, globalCtx); + func_80AEC650(this); + func_80AECA18(this); +} + +void func_80AECC1C(EnRu1* this, GlobalContext* globalCtx) { + func_80AEC4F4(this); + func_80AEC6E4(this, globalCtx); + EnRu1_FrameUpdateMatrix(this); + func_80AEAE1C(this); + func_80AEAECC(this, globalCtx); + func_80AEC650(this); + func_80AECA44(this, globalCtx); +} + +void func_80AECC84(EnRu1* this, GlobalContext* globalCtx) { + if (globalCtx->csCtx.state == 0) { + Actor_Kill(&this->actor); + } +} + +void func_80AECCB0(EnRu1* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + Vec3f* pos; + s16 rotTowardsLinkY; + f32 spawnX; + f32 spawnY; + f32 spawnZ; + s32 pad[2]; + + rotTowardsLinkY = thisx->rotTowardsLinkY; + pos = &thisx->posRot.pos; + spawnX = ((kREG(1) + 12.0f) * Math_Sins(rotTowardsLinkY)) + pos->x; + spawnY = pos->y; + spawnZ = ((kREG(1) + 12.0f) * Math_Coss(rotTowardsLinkY)) + pos->z; + this->unk_278 = Actor_SpawnAttached(&globalCtx->actorCtx, this, globalCtx, ACTOR_DOOR_WARP1, spawnX, spawnY, spawnZ, + 0, rotTowardsLinkY, 0, 5); +} + +void func_80AECDA0(EnRu1* this, GlobalContext* globalCtx) { + func_80AEB264(this, &D_06000E54, 0, 0, 0); + this->action = 15; + this->actor.shape.unk_08 = -10000.0f; + func_80AEAEA4(this, 5); + func_80AEAEB8(this, 2); +} + +void func_80AECE04(EnRu1* this, GlobalContext* globalCtx) { + this->actor.shape.unk_08 += (250.0f / 3.0f); +} + +void func_80AECE20(EnRu1* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + Player* player = PLAYER; + Vec3f* playerPos = &player->actor.posRot.pos; + s16 shapeRotY = player->actor.shape.rot.y; + s32 pad; + f32 unk_27C = this->unk_27C; + Vec3f* pos = &thisx->posRot.pos; + + pos->x = (Math_Sins(shapeRotY) * unk_27C) + playerPos->x; + pos->y = playerPos->y; + pos->z = (Math_Coss(shapeRotY) * unk_27C) + playerPos->z; +} + +void func_80AECEB4(EnRu1* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + Player* player = PLAYER; + Vec3f* player_unk_450 = &player->unk_450; + Vec3f* pos = &thisx->posRot.pos; + s16 shapeRotY = thisx->shape.rot.y; + + player_unk_450->x = ((kREG(2) + 30.0f) * Math_Sins(shapeRotY)) + pos->x; + player_unk_450->z = ((kREG(2) + 30.0f) * Math_Coss(shapeRotY)) + pos->z; +} + +s32 func_80AECF6C(EnRu1* this, GlobalContext* globalCtx) { + s16* shapeRotY; + Player* player = PLAYER; + Player* otherPlayer; + s16 temp_f16; + f32 temp1; + f32 temp2; + s32 pad2[5]; + + this->unk_26C += 1.0f; + if ((player->actor.speedXZ == 0.0f) && (this->unk_26C >= 3.0f)) { + otherPlayer = PLAYER; + player->actor.posRot.pos.x = otherPlayer->unk_450.x; + player->actor.posRot.pos.y = otherPlayer->unk_450.y; + player->actor.posRot.pos.z = otherPlayer->unk_450.z; + shapeRotY = &player->actor.shape.rot.y; + temp1 = this->actor.posRot.pos.x - player->actor.posRot.pos.x; + temp2 = this->actor.posRot.pos.z - player->actor.posRot.pos.z; + temp_f16 = Math_atan2f(temp1, temp2) * 10430.3779296875f; + if (*shapeRotY != temp_f16) { + Math_SmoothScaleMaxMinS(shapeRotY, temp_f16, 0x14, 0x1838, 0x64); + player->actor.posRot.rot.y = *shapeRotY; + } else { + return 1; + } + } + return 0; +} + +s32 func_80AED084(EnRu1* this, UNK_TYPE arg1) { + if (this->unk_278 != NULL && this->unk_278->unk_1EC == arg1) { + return 1; + } + return 0; +} + +void func_80AED0B0(EnRu1* this, UNK_TYPE arg1) { + if (this->unk_278 != NULL) { + this->unk_278->unk_1EC = arg1; + } +} + +void func_80AED0C8(EnRu1* this, GlobalContext* globalCtx) { + this->action = 16; +} + +void func_80AED0D8(EnRu1* this, GlobalContext* globalCtx) { + this->action = 17; + this->drawConfig = 1; + this->actor.posRot.rot.y = this->actor.rotTowardsLinkY; + this->actor.shape.rot.y = this->actor.rotTowardsLinkY; + func_80AECCB0(this, globalCtx); +} + +void func_80AED110(EnRu1* this) { + Actor* thisx = &this->actor; + if (thisx->shape.unk_08 >= 0.0f) { + this->action = 18; + thisx->shape.unk_08 = 0.0f; + func_80AED0B0(this, 1); + } +} + +void func_80AED154(EnRu1* this, GlobalContext* globalCtx) { + if (func_80AED084(this, 2)) { + this->action = 0x13; + this->unk_26C = 0.0f; + func_80AECEB4(this, globalCtx); + } +} + +void func_80AED19C(EnRu1* this, s32 cond) { + if (cond) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06001488, 1.0f, 0, SkelAnime_GetFrameCount(&D_06001488.genericHeader), + 2, -8.0f); + this->action = 20; + func_80AED0B0(this, 3); + } +} + +void func_80AED218(EnRu1* this, UNK_TYPE arg1) { + if (func_80AED084(this, 4)) { + if (arg1 != 0) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06002058, 1.0f, 0, + SkelAnime_GetFrameCount(&D_06002058.genericHeader), 0, -8.0f); + } + } else if (func_80AED084(this, 5)) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06002990, 1.0f, 0, SkelAnime_GetFrameCount(&D_06002990.genericHeader), + 2, -8.0f); + this->action = 21; + this->unk_27C = this->actor.xzDistanceFromLink; + } +} + +void func_80AED304(EnRu1* this, GlobalContext* globalCtx) { + func_80AED0C8(this, globalCtx); +} + +void func_80AED324(EnRu1* this, GlobalContext* globalCtx) { + func_80AED0D8(this, globalCtx); +} + +void func_80AED344(EnRu1* this, GlobalContext* globalCtx) { + func_80AECE04(this, globalCtx); + EnRu1_FrameUpdateMatrix(this); + func_80AED110(this); +} + +void func_80AED374(EnRu1* this, GlobalContext* globalCtx) { + EnRu1_FrameUpdateMatrix(this); + func_80AED154(this, globalCtx); +} + +void func_80AED3A4(EnRu1* this, GlobalContext* globalCtx) { + EnRu1_FrameUpdateMatrix(this); + func_80AED19C(this, func_80AECF6C(this, globalCtx)); +} + +void func_80AED3E0(EnRu1* this, GlobalContext* globalCtx) { + func_80AEAECC(this, globalCtx); + func_80AED218(this, EnRu1_FrameUpdateMatrix(this)); +} + +void func_80AED414(EnRu1* this, GlobalContext* globalCtx) { + func_80AECE20(this, globalCtx); + func_80AEAECC(this, globalCtx); + EnRu1_FrameUpdateMatrix(this); +} + +void func_80AED44C(EnRu1* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + s8 actorRoom; + + if ((gSaveContext.infTable[20] & 2) && (!(gSaveContext.infTable[20] & 0x20)) && + (!(gSaveContext.infTable[20] & 1)) && (!(gSaveContext.infTable[20] & 0x80))) { + if (!func_80AEB020(this, globalCtx)) { + func_80AEB264(this, &D_060097B8, 0, 0, 0); + actorRoom = thisx->room; + this->action = 22; + thisx->room = -1; + this->roomNum1 = actorRoom; + this->roomNum3 = actorRoom; + this->roomNum2 = actorRoom; + } else { + Actor_Kill(thisx); + } + } else { + Actor_Kill(thisx); + } +} + +void func_80AED4FC(EnRu1* this) { + func_80078914(&this->actor.unk_E4, NA_SE_EV_LAND_DIRT); +} + +func_80AED520(EnRu1* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + Audio_PlaySoundGeneral(0x883, &player->actor.unk_E4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + func_80078914(&this->actor.unk_E4, NA_SE_VO_RT_LIFT); +} + +void func_80AED57C(EnRu1* this) { + if (this->actor.speedXZ != 0.0f) { + func_80078914(&this->actor.unk_E4, NA_SE_VO_RT_THROW); + } +} + +void func_80AED5B8(EnRu1* this) { + func_80078914(&this->actor.unk_E4, NA_SE_VO_RT_CRASH); +} + +void func_80AED5DC(EnRu1* this) { + func_80078914(&this->actor.unk_E4, NA_SE_VO_RT_UNBALLANCE); +} + +void func_80AED600(EnRu1* this) { + func_80078914(&this->actor.unk_E4, NA_SE_VO_RT_DISCOVER); +} + +s32 func_80AED624(EnRu1* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + s8 curRoomNum = globalCtx->roomCtx.curRoom.num; + + if (this->roomNum2 != curRoomNum) { + Actor_Kill(thisx); + return 0; + } else if (((this->roomNum1 != curRoomNum) || (this->roomNum2 != curRoomNum)) && + (thisx->unk_84 > kREG(16) + 50.0f) && (this->action != 33)) { + this->action = 33; + this->drawConfig = 2; + this->unk_2A8 = 0xFF; + this->unk_2A4 = 0.0f; + } + return 1; +} + +void func_80AED6DC(EnRu1* this, GlobalContext* globalCtx) { + s8 curRoomNum = globalCtx->roomCtx.curRoom.num; + this->roomNum2 = curRoomNum; + this->unk_288 = 0.0f; +} + +void func_80AED6F8(GlobalContext* globalCtx) { + s8 curRoomNum; + if ((!(gSaveContext.infTable[20] & 0x80))) { + curRoomNum = globalCtx->roomCtx.curRoom.num; + if (curRoomNum == 2) { + gSaveContext.infTable[20] |= 0x80; + } + } +} + +void func_80AED738(EnRu1* this, GlobalContext* globalCtx) { + u32 temp_v0; + + if (func_80AED624(this, globalCtx)) { + this->unk_2A4 += 1.0f; + if (this->unk_2A4 < 20.0f) { + temp_v0 = ((20.0f - this->unk_2A4) * 255.0f) / 20.0f; + this->unk_2A8 = temp_v0; + this->actor.shape.unk_14 = temp_v0; + } else { + Actor_Kill(this); + } + } +} + +void func_80AED83C(EnRu1* this) { + s32 pad2[2]; + Vec3s* tempPtr; + Vec3s* tempPtr2; + + tempPtr = &this->unk_374.unk_08; + Math_SmoothScaleMaxMinS(&tempPtr->x, 0, 0x14, 0x1838, 0x64); + Math_SmoothScaleMaxMinS(&tempPtr->y, 0, 0x14, 0x1838, 0x64); + tempPtr2 = &this->unk_374.unk_0E; + Math_SmoothScaleMaxMinS(&tempPtr2->x, 0, 0x14, 0x1838, 0x64); + Math_SmoothScaleMaxMinS(&tempPtr2->y, 0, 0x14, 0x1838, 0x64); +} + +void func_80AED8DC(EnRu1* this) { + s32 temp_hi; + s16* unk_2AC = &this->unk_2AC; + s16* someY = &this->unk_374.unk_08.y; + s16* unk_29E = &this->unk_29E; + s32 pad[2]; + + if (DECR(*unk_2AC) == 0) { + *unk_2AC = Math_Rand_S16Offset(0xA, 0x19); + temp_hi = *unk_2AC % 5; + if (temp_hi == 0) { + this->unk_2B0 = 1; + } else if (temp_hi == 1) { + this->unk_2B0 = 2; + } else { + this->unk_2B0 = 0; + } + *unk_29E = 0; + } + + if (this->unk_2B0 == 0) { + Math_SmoothScaleMaxMinS(unk_29E, 0 - *someY, 1, 0x190, 0x190); + Math_SmoothScaleMaxMinS(someY, 0, 3, ABS(*unk_29E), 0x64); + } else if (this->unk_2B0 == 1) { + Math_SmoothScaleMaxMinS(unk_29E, -0x2AAA - *someY, 1, 0x190, 0x190); + Math_SmoothScaleMaxMinS(someY, -0x2AAA, 3, ABS(*unk_29E), 0x64); + } else { + Math_SmoothScaleMaxMinS(unk_29E, 0x2AAA - *someY, 1, 0x190, 0x190); + Math_SmoothScaleMaxMinS(someY, 0x2AAA, 3, ABS(*unk_29E), 0x64); + } +} + +void func_80AEDAE0(EnRu1* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + DynaPolyActor* dyna = DynaPolyInfo_GetActor(&globalCtx->colCtx, thisx->floorPolySource); + + if ((dyna == NULL) || (dyna->actor.id == ACTOR_EN_BOX)) { + thisx->bgCheckFlags &= ~0x19; + } +} + +void func_80AEDB30(EnRu1* this, GlobalContext* globalCtx) { + DynaPolyActor* temp_dyna; + f32* velocityY; + f32* speedXZ; + f32* gravity; + s16 unk_7E; + s16 rotY; + s32 temp_a1_2; + s32 temp_a0; + s32 phi_v1; + + if (this->actor.bgCheckFlags & 1) { + velocityY = &this->actor.velocity.y; + temp_dyna = DynaPolyInfo_GetActor(&globalCtx->colCtx, this->actor.floorPolySource); + if (*velocityY <= 0.0f) { + speedXZ = &this->actor.speedXZ; + if (temp_dyna != NULL) { + if (temp_dyna->actor.id != ACTOR_EN_BOX) { + *speedXZ = 0.0f; + } + } else { + if (*speedXZ >= (kREG(27) * 0.01f) + 3.0f) { + *speedXZ *= (kREG(19) * 0.01f) + 0.8f; + } else { + *speedXZ = 0.0f; + } + } + gravity = &this->actor.gravity; + if (temp_dyna != NULL) { + if (temp_dyna->actor.id != ACTOR_EN_BOX) { + *velocityY = 0.0f; + this->actor.minVelocityY = 0.0f; + *gravity = 0.0f; + } else { + *velocityY *= -1.0f; + } + } else { + *velocityY *= -((kREG(20) * 0.01f) + 0.6f); + if (*velocityY <= -*gravity * ((kREG(20) * 0.01f) + 0.6f)) { + *velocityY = 0.0f; + this->actor.minVelocityY = 0.0f; + *gravity = 0.0f; + } + } + func_80AED4FC(this); + } + } + if (this->actor.bgCheckFlags & 0x10) { + speedXZ = &this->actor.speedXZ; + velocityY = &this->actor.velocity.y; + if (*speedXZ >= (kREG(27) * 0.01f) + 3.0f) { + *speedXZ *= (kREG(19) * 0.01f) + 0.8f; + } else { + *speedXZ = 0.0f; + } + if (*velocityY >= 0.0f) { + *velocityY *= -((kREG(20) * 0.01f) + 0.6f); + func_80AED4FC(this); + } + } + if (this->actor.bgCheckFlags & 8) { + speedXZ = &this->actor.speedXZ; + if (*speedXZ != 0.0f) { + rotY = this->actor.posRot.rot.y; + unk_7E = this->actor.unk_7E; + temp_a0 = (unk_7E * 2) - rotY; + temp_a1_2 = temp_a0 + 0x8000; + if ((s16)((temp_a0 - unk_7E) + 0x8000) >= 0) { + phi_v1 = (s16)(temp_a1_2 - unk_7E); + } else { + phi_v1 = -(s16)(temp_a1_2 - unk_7E); + } + if (phi_v1 < 0x4001) { + if (*speedXZ >= (kREG(27) * 0.01f) + 3.0f) { + *speedXZ *= (kREG(21) * 0.01f) + 0.6f; + } else { + *speedXZ = 0.0f; + } + this->actor.posRot.rot.y = temp_a1_2; + func_80AED4FC(this); + func_80AED5B8(this); + } + } + } +} + +void func_80AEDEF4(EnRu1* this, GlobalContext* globalCtx) { + f32* speedXZ = &this->actor.speedXZ; + DynaPolyActor* dyna = DynaPolyInfo_GetActor(&globalCtx->colCtx, this->actor.floorPolySource); + + if ((dyna != NULL) && (dyna->actor.id == ACTOR_EN_BOX)) { + if (*speedXZ != 0.0f) { + *speedXZ *= 1.1f; + } else { + *speedXZ = 1.0f; + } + } + if (*speedXZ >= (kREG(27) * 0.01f) + 3.0f) { + *speedXZ *= (kREG(22) * 0.01f) + 0.98f; + } else { + *speedXZ = 0.0f; + } +} + +void func_80AEDFF4(EnRu1* this, GlobalContext* globalCtx) { + func_80AEDB30(this, globalCtx); + func_80AEDEF4(this, globalCtx); + Actor_MoveForward(&this->actor); +} + +void func_80AEE02C(EnRu1* this) { + Actor* thisx = &this->actor; + + thisx->velocity.x = 0.0f; + thisx->velocity.y = 0.0f; + thisx->velocity.z = 0.0f; + thisx->speedXZ = 0.0f; + thisx->gravity = 0.0f; + thisx->minVelocityY = 0.0f; +} + +void func_80AEE050(EnRu1* this) { + s32 pad; + f32 sp28; + f32 sp24; + f32 temp_f10; + EnRu1* thisx = this; // necessary to match + + if (this->unk_350 == 0) { + if ((this->actor.minVelocityY == 0.0f) && (this->actor.speedXZ == 0.0f)) { + this->unk_350 = 1; + func_80AEE02C(this); + this->unk_35C = 0; + this->unk_358 = (this->actor.unk_84 - 10.0f) * 0.5f; + this->unk_354 = this->actor.posRot.pos.y + thisx->unk_358; // thisx only used here + } else { + this->actor.gravity = 0.0f; + this->actor.minVelocityY *= 0.2f; + this->actor.velocity.y *= 0.2f; + if (this->actor.minVelocityY >= -0.1f) { + this->actor.minVelocityY = 0.0f; + this->actor.velocity.y = 0.0f; + } + this->actor.speedXZ *= 0.5f; + if (this->actor.speedXZ <= 0.1f) { + this->actor.speedXZ = 0.0f; + } + this->actor.velocity.x = Math_Sins(this->actor.posRot.rot.y) * this->actor.speedXZ; + this->actor.velocity.z = Math_Coss(this->actor.posRot.rot.y) * this->actor.speedXZ; + func_8002D7EC(this); + } + } else { + if (this->unk_350 == 1) { + if (this->unk_358 <= 1.0f) { + func_80AEE02C(this); + this->unk_350 = 2; + this->unk_360 = 0.0f; + } else { + sp28 = this->unk_358; + sp24 = this->unk_354; + temp_f10 = Math_Coss(this->unk_35C) * -sp28; + this->actor.posRot.pos.y = temp_f10 + sp24; + this->unk_35C += 0x3E8; + this->unk_358 *= 0.95f; + } + } else { + this->unk_360 += 1.0f; + if (this->unk_360 > 0.0f) { + this->unk_350 = 3; + } + } + } +} + +s32 func_80AEE264(EnRu1* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + + if (!func_8002F194(thisx, globalCtx)) { + thisx->flags |= 9; + if ((gSaveContext.infTable[20] & 8)) { + thisx->textId = 0x404E; + func_8002F2F4(thisx, globalCtx); + } else if (gSaveContext.infTable[20] & 4) { + thisx->textId = 0x404D; + func_8002F2F4(thisx, globalCtx); + } else { + thisx->textId = 0x404C; + func_8002F2F4(thisx, globalCtx); + } + return 0; + } + return 1; +} + +void func_80AEE2F8(EnRu1* this, GlobalContext* globalCtx) { + DynaPolyActor* dyna; + u32 floorPolySource; + if ((this->actor.bgCheckFlags & 1) && (this->actor.floorPolySource != 0x32)) { + floorPolySource = this->actor.floorPolySource; + dyna = DynaPolyInfo_GetActor(&globalCtx->colCtx, floorPolySource); + if ((dyna != NULL) && (dyna->actor.id == ACTOR_BG_BDAN_SWITCH)) { + if ((((dyna->actor.params) >> 8) & 0x3F) == 0x38) { + gSaveContext.infTable[20] |= 1; + return; + } + } + } + gSaveContext.infTable[20] &= ~0x1; +} + +s32 func_80AEE394(EnRu1* this, GlobalContext* globalCtx) { + s32 pad[2]; + CollisionContext* colCtx; + DynaPolyActor* dynaActor; + s32 floorPolySource; + + if ((this->actor.bgCheckFlags & 1) && (this->actor.floorPolySource != 0x32)) { + colCtx = &globalCtx->colCtx; + floorPolySource = + this->actor.floorPolySource; // necessary match, can't move this out of this block unfortunately + dynaActor = DynaPolyInfo_GetActor(colCtx, floorPolySource); + if ((dynaActor != NULL) && (dynaActor->actor.id == ACTOR_BG_BDAN_OBJECTS) && (dynaActor->actor.params == 0) && + (!func_8008E988(globalCtx)) && (globalCtx->msgCtx.unk_E300 == 0)) { + func_80AEE02C(this); + globalCtx->csCtx.segment = &D_80AF10A4; + gSaveContext.cutsceneTrigger = 1; + this->action = 36; + this->drawConfig = 0; + this->unk_28C = dynaActor; + this->actor.shape.unk_14 = 0; + return 1; + } + } + return 0; +} + +void func_80AEE488(EnRu1* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + s8 curRoomNum; + + if (func_8002F410(thisx, globalCtx)) { + curRoomNum = globalCtx->roomCtx.curRoom.num; + this->roomNum3 = curRoomNum; + this->action = 31; + func_80AED520(this, globalCtx); + } else if ((!func_80AEE394(this, globalCtx)) && (!(thisx->bgCheckFlags & 1))) { + thisx->minVelocityY = -((kREG(24) * 0.01f) + 6.8f); + thisx->gravity = -((kREG(23) * 0.01f) + 1.3f); + this->action = 28; + } +} + +void func_80AEE568(EnRu1* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + + if (!func_80AEE394(this, globalCtx)) { + if ((thisx->bgCheckFlags & 1) && (thisx->speedXZ == 0.0f) && (thisx->minVelocityY == 0.0f)) { + func_80AEE02C(this); + func_8002F580(this, globalCtx); + this->action = 27; + func_80AEADD8(this); + } else if (thisx->unk_84 > 0.0f) { + this->action = 29; + this->unk_350 = 0; + } + } +} + +void func_80AEE628(EnRu1* this, GlobalContext* globalCtx) { + s32 pad[2]; + s8 curRoomNum = globalCtx->roomCtx.curRoom.num; + + if (func_80AEAF38(globalCtx)) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06006B9C, 1.0f, 0, SkelAnime_GetFrameCount(&D_06006B9C.genericHeader), + 0, -8.0f); + gSaveContext.infTable[20] |= 0x10; + this->action = 31; + } + this->roomNum3 = curRoomNum; +} + +s32 func_80AEE6D0(EnRu1* this, GlobalContext* globalCtx) { + s32 pad; + s8 curRoomNum = globalCtx->roomCtx.curRoom.num; + + if ((!(gSaveContext.infTable[20] & 0x10)) && (func_80AEB124(globalCtx) != 0)) { + if (func_8008E988(globalCtx) == 0) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06004648, 1.0f, 0, + SkelAnime_GetFrameCount(&D_06004350.genericHeader), 0, -8.0f); + func_80AED600(this); + this->action = 34; + this->unk_26C = 0.0f; + globalCtx->csCtx.segment = &D_80AF1728; + gSaveContext.cutsceneTrigger = 1; + } + this->roomNum3 = curRoomNum; + return 1; + } + this->roomNum3 = curRoomNum; + return 0; +} + +void func_80AEE7C4(EnRu1* this, GlobalContext* globalCtx) { + f32 frameCount; + s32 pad[13]; + Player* player; + f32* unk_370 = &this->unk_370; + + if (func_8002F5A0(this, globalCtx)) { + frameCount = SkelAnime_GetFrameCount(&D_06006B9C.genericHeader); + SkelAnime_ChangeAnim(&this->skelAnime, &D_06006B9C, 1.0f, 0, frameCount, 0, -8.0f); + func_80AED6DC(this, globalCtx); + this->actor.speedXZ *= (kREG(25) * 0.01f) + 1.0f; + this->actor.velocity.y *= (kREG(26) * 0.01f) + 1.0f; + this->actor.minVelocityY = -((kREG(24) * 0.01f) + 6.8f); + this->actor.gravity = -((kREG(23) * 0.01f) + 1.3f); + func_80AED57C(this); + this->action = 28; + *unk_370 = 0.0f; + return; + } + + if (func_80AEE6D0(this, globalCtx)) { + *unk_370 = 0.0f; + return; + } + + player = PLAYER; + if (player->stateFlags2 & 0x10000000) { + this->unk_370 += 1.0f; + if (this->action != 32) { + if (*unk_370 > 30.0f) { + if (Math_Rand_S16Offset(0, 3) == 0) { + frameCount = SkelAnime_GetFrameCount(&D_06004350.genericHeader); + SkelAnime_ChangeAnim(&this->skelAnime, &D_06004350, 1.0f, 0, frameCount, 0, -8.0f); + func_80AED5DC(this); + this->action = 32; + } + *unk_370 = 0.0f; + } + } else { + if (*unk_370 > 50.0f) { + frameCount = SkelAnime_GetFrameCount(&D_06006B9C.genericHeader); + SkelAnime_ChangeAnim(&this->skelAnime, &D_06006B9C, 1.0f, 0, frameCount, 0, -8.0f); + this->action = 31; + *unk_370 = 0.0f; + } + } + } else { + frameCount = SkelAnime_GetFrameCount(&D_06006B9C.genericHeader); + SkelAnime_ChangeAnim(&this->skelAnime, &D_06006B9C, 1.0f, 0, frameCount, 0, -8.0f); + *unk_370 = 0.0f; + } +} + +s32 func_80AEEAC8(EnRu1* this, GlobalContext* globalCtx) { + if (this->actor.bgCheckFlags & 1) { + func_80AEE02C(this); + func_8002F580(this, globalCtx); + this->action = 27; + func_80AEADD8(this); + return 1; + } + return 0; +} + +void func_80AEEB24(EnRu1* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + + if ((func_80AEEAC8(this, globalCtx) == 0) && (this->unk_350 == 3)) { + this->action = 30; + func_80AEE02C(this); + thisx->gravity = -0.1f; + thisx->minVelocityY = -((kREG(18) * 0.1f) + 0.7f); + } +} + +void func_80AEEBB4(EnRu1* this, GlobalContext* globalCtx) { + func_8002F580(this, globalCtx); +} + +void func_80AEEBD4(EnRu1* this, GlobalContext* globalCtx) { + func_80AED83C(this); + func_80AEAC54(this, globalCtx); + func_80AEAECC(this, globalCtx); + EnRu1_FrameUpdateMatrix(this); + func_80AEAE1C(this); + func_80AEEBB4(this, globalCtx); + func_80AEE488(this, globalCtx); + func_80AED624(this, globalCtx); + func_80AEDAE0(this, globalCtx); +} + +void func_80AEEC5C(EnRu1* this, GlobalContext* globalCtx) { + func_80AED83C(this); + func_80AEACDC(this, globalCtx); + func_80AEAECC(this, globalCtx); + func_80AEE2F8(this, globalCtx); + func_80AEDFF4(this, globalCtx); + EnRu1_FrameUpdateMatrix(this); + func_80AEAE1C(this); + func_80AEE568(this, globalCtx); + func_80AED624(this, globalCtx); + func_80AEDAE0(this, globalCtx); +} + +void func_80AEECF0(EnRu1* this, GlobalContext* globalCtx) { + func_80AED83C(this); + func_80AEAECC(this, globalCtx); + func_80AEE050(this); + EnRu1_FrameUpdateMatrix(this); + func_80AEAE1C(this); + func_80AEEB24(this, globalCtx); + func_80AED624(this, globalCtx); +} + +void func_80AEED58(EnRu1* this, GlobalContext* globalCtx) { + func_80AED83C(this); + func_80AEAECC(this, globalCtx); + Actor_MoveForward(&this->actor); + EnRu1_FrameUpdateMatrix(this); + func_80AEAE1C(this); + func_80AEEAC8(this, globalCtx); + func_80AED624(this, globalCtx); + func_80AEDAE0(this, globalCtx); +} + +void func_80AEEDCC(EnRu1* this, GlobalContext* globalCtx) { + func_80AED8DC(this); + EnRu1_FrameUpdateMatrix(this); + func_80AEAECC(this, globalCtx); + func_80AEE2F8(this, globalCtx); + func_80AEAE1C(this); + func_80AED6F8(globalCtx); + func_80AEE7C4(this, globalCtx); +} + +void func_80AEEE34(EnRu1* this, GlobalContext* globalCtx) { + func_80AED83C(this); + EnRu1_FrameUpdateMatrix(this); + func_80AEAECC(this, globalCtx); + func_80AEE2F8(this, globalCtx); + func_80AEAE1C(this); + func_80AED6F8(globalCtx); + func_80AEE7C4(this, globalCtx); +} + +void func_80AEEE9C(EnRu1* this, GlobalContext* globalCtx) { + func_80AED83C(this); + func_80AEAECC(this, globalCtx); + func_80AEDFF4(this, globalCtx); + EnRu1_FrameUpdateMatrix(this); + func_80AEAE1C(this); + func_80AED738(this, globalCtx); + func_80AED624(this, globalCtx); +} + +void func_80AEEF08(EnRu1* this, GlobalContext* globalCtx) { + func_80AED83C(this); + EnRu1_FrameUpdateMatrix(this); + func_80AEAECC(this, globalCtx); + func_80AEAE1C(this); + func_80AEE628(this, globalCtx); +} + +void func_80AEEF5C(EnRu1* this, GlobalContext* globalCtx) { +} + +void func_80AEEF68(EnRu1* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s16 something; + + this->unk_374.unk_18 = player->actor.posRot.pos; + this->unk_374.unk_14 = kREG(16) - 3.0f; + something = kREG(17) + 0xC; + func_80034A14(&this->actor, &this->unk_374, something, 2); +} + +void func_80AEEFEC(EnRu1* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s16 something; + + this->unk_374.unk_18 = player->actor.posRot.pos; + this->unk_374.unk_14 = kREG(16) - 3.0f; + something = kREG(17) + 0xC; + func_80034A14(&this->actor, &this->unk_374, something, 4); + this->actor.posRot.rot.y = this->actor.shape.rot.y; +} + +void func_80AEF080(EnRu1* this) { + if (func_800A56C8(&this->skelAnime, 11.0f)) { + func_80078914(&this->actor.unk_E4, NA_SE_EV_LAND_DIRT); + } +} + +s32 func_80AEF0BC(EnRu1* this, GlobalContext* globalCtx) { + s32 frameCount; + if (gSaveContext.infTable[20] & 4) { + frameCount = SkelAnime_GetFrameCount(&D_06007534.genericHeader); + SkelAnime_ChangeAnim(&this->skelAnime, &D_06007534, 1.0f, 0, frameCount, 2, -8.0f); + globalCtx->msgCtx.msgMode = 0x37; + this->action = 26; + this->actor.flags &= ~0x9; + return 1; + } + return 0; +} + +void func_80AEF170(EnRu1* this, GlobalContext* globalCtx, s32 cond) { + if (cond) { + this->action = 25; + } +} + +void func_80AEF188(EnRu1* this, GlobalContext* globalCtx) { + if (func_80AEB174(globalCtx) && !func_80AEF0BC(this, globalCtx)) { + func_80106CCC(globalCtx); + gSaveContext.infTable[20] |= 4; + this->action = 24; + } +} + +void func_80AEF1F0(EnRu1* this, GlobalContext* globalCtx, UNK_TYPE arg2) { + if (arg2 != 0) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06006B9C, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&D_06006B9C.genericHeader), 0, 0.0f); + func_80106CCC(globalCtx); + gSaveContext.infTable[20] |= 8; + func_80AED6DC(this, globalCtx); + func_8002F580(this, globalCtx); + this->action = 27; + func_80AEADD8(this); + } +} + +void func_80AEF29C(EnRu1* this, GlobalContext* globalCtx) { + this->action = 23; +} + +void func_80AEF2AC(EnRu1* this, GlobalContext* globalCtx) { + this->action = 24; + this->drawConfig = 1; + this->actor.flags |= 9; +} + +void func_80AEF2D0(EnRu1* this, GlobalContext* globalCtx) { + s32 cond; + + func_80AEEF68(this, globalCtx); + EnRu1_FrameUpdateMatrix(this); + func_80AEAE1C(this); + func_80AEAC10(this, globalCtx); + func_80AEAECC(this, globalCtx); + cond = func_80AEE264(this, globalCtx); + func_80AED624(this, globalCtx); + func_80AEF170(this, globalCtx, cond); +} + +void func_80AEF354(EnRu1* this, GlobalContext* globalCtx) { + func_80AEEFEC(this, globalCtx); + EnRu1_FrameUpdateMatrix(this); + func_80AEAE1C(this); + func_80AEAECC(this, globalCtx); + func_80AEF188(this, globalCtx); +} + +void func_80AEF3A8(EnRu1* this, GlobalContext* globalCtx) { + s32 something; + + func_80AED83C(this); + something = EnRu1_FrameUpdateMatrix(this); + func_80AEF080(this); + func_80AEAE1C(this); + func_80AEAECC(this, globalCtx); + func_80AEF1F0(this, globalCtx, something); +} + +void func_80AEF40C(EnRu1* this) { + SkelAnime* skelAnime = &this->skelAnime; + + if ((func_800A56C8(skelAnime, 2.0f)) || (func_800A56C8(skelAnime, 7.0f)) || (func_800A56C8(skelAnime, 12.0f)) || + (func_800A56C8(skelAnime, 18.0f)) || (func_800A56C8(skelAnime, 25.0f)) || (func_800A56C8(skelAnime, 33.0f))) { + func_80078914(&this->actor.unk_E4, 0x803); + } +} + +void func_80AEF4A8(EnRu1* this, GlobalContext* globalCtx) { + Audio_PlaySoundAtPosition(globalCtx, &this->actor.unk_E4, 0x14, NA_SE_VO_RT_FALL); +} + +void func_80AEF4E0(EnRu1* this) { + if (func_800A56C8(&this->skelAnime, 5.0f)) { + func_80078914(&this->actor.unk_E4, NA_SE_VO_RT_LAUGH_0); + } +} + +void func_80AEF51C(EnRu1* this) { + func_80078914(&this->actor.unk_E4, NA_SE_VO_RT_THROW); +} + +void func_80AEF540(EnRu1* this) { + if (func_80AEB104(this) == 2) { + func_80AEAEA4(this, 3); + func_80AEAEB8(this, 2); + if (this->skelAnime.mode != 2) { + func_80AEB264(this, &D_06004BF0, 2, -8.0f, 0); + func_80AEF51C(this); + } + } +} + +void func_80AEF5B8(EnRu1* this) { + f32 animCurrentFrame; + if (D_80AF1938 == 0) { + animCurrentFrame = this->skelAnime.animCurrentFrame; + if (animCurrentFrame >= 60.0f) { + func_80AEAEA4(this, 3); + func_80AEAEB8(this, 0); + func_80AED57C(this); + D_80AF1938 = 1; + } + } +} + +void func_80AEF624(EnRu1* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + f32 frameCount; + CsCmdActorAction* csCmdActorAction; + CsCmdActorAction* csCmdActorAction2; + s16 newRotTmp; + + if (func_80AEAFE0(globalCtx, 1, 3)) { + frameCount = SkelAnime_GetFrameCount(&D_060063F4.genericHeader); + // this weird part with the redundant variable is necessary to match for some reason + csCmdActorAction2 = globalCtx->csCtx.actorActions[3]; + csCmdActorAction = csCmdActorAction2; + thisx->posRot.pos.x = csCmdActorAction->startPos.x; + thisx->posRot.pos.y = csCmdActorAction->startPos.y; + thisx->posRot.pos.z = csCmdActorAction->startPos.z; + newRotTmp = csCmdActorAction->rot.x; + thisx->shape.rot.x = newRotTmp; + thisx->posRot.rot.x = newRotTmp; + newRotTmp = csCmdActorAction->rot.y; + thisx->shape.rot.y = newRotTmp; + thisx->posRot.rot.y = newRotTmp; + newRotTmp = csCmdActorAction->rot.z; + thisx->shape.rot.z = newRotTmp; + thisx->posRot.rot.z = newRotTmp; + SkelAnime_ChangeAnim(&this->skelAnime, &D_060063F4, 1.0f, 0.0f, frameCount, 2, 0.0f); + func_80AEB3A4(this, globalCtx); + this->action = 37; + this->drawConfig = 1; + thisx->shape.unk_14 = 0xFF; + } +} + +void func_80AEF728(EnRu1* this, UNK_TYPE arg1) { + if (arg1 != 0) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06003608, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&D_06003608.genericHeader), 0, 0.0f); + func_80AEB3CC(this); + this->action = 38; + } +} + +void func_80AEF79C(EnRu1* this, GlobalContext* globalCtx) { + if (func_80AEAFE0(globalCtx, 2, 3)) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06002EC0, 1.0f, 0, SkelAnime_GetFrameCount(&D_06002EC0.genericHeader), + 2, -8.0f); + this->action = 39; + } +} + +void func_80AEF820(EnRu1* this, UNK_TYPE arg1) { + if (arg1 != 0) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_060097B8, 1.0f, 0, SkelAnime_GetFrameCount(&D_060097B8.genericHeader), + 0, -8.0f); + this->action = 40; + } +} + +void func_80AEF890(EnRu1* this, GlobalContext* globalCtx) { + s32 pad[2]; + s8 curRoomNum; + + if ((gSaveContext.sceneSetupIndex < 4) && (func_80AEAF38(globalCtx))) { + curRoomNum = globalCtx->roomCtx.curRoom.num; + gSaveContext.infTable[20] |= 0x20; + Flags_SetSwitch(globalCtx, func_80AEADE0(this)); + func_80AEB0EC(this, 1); + this->action = 42; + this->actor.room = curRoomNum; + } +} + +void func_80AEF930(EnRu1* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + + if (func_80AEB104(this) == 3) { + thisx->flags |= 9; + thisx->textId = 0x4048; + func_8010B720(globalCtx, thisx->textId); + func_80AEF4A8(this, globalCtx); + this->action = 43; + this->drawConfig = 0; + } +} + +void func_80AEF99C(EnRu1* this, GlobalContext* globalCtx) { + if (func_80AEB1B4(globalCtx) != 0) { + func_80AEB0EC(this, 4); + Actor_Kill(&this->actor); + } +} + +void func_80AEF9D8(EnRu1* this, GlobalContext* globalCtx) { + func_80AED83C(this); + EnRu1_FrameUpdateMatrix(this); + func_80AEAE1C(this); + func_80AEF624(this, globalCtx); + func_80AEB220(this, globalCtx); +} + +void func_80AEFA2C(EnRu1* this, GlobalContext* globalCtx) { + s32 something; + + func_80AED83C(this); + func_80AEB364(this, globalCtx); + func_80AEAECC(this, globalCtx); + something = EnRu1_FrameUpdateMatrix(this); + func_80AEF4E0(this); + func_80AEF5B8(this); + func_80AEF40C(this); + func_80AEF728(this, something); + func_80AEB220(this, globalCtx); +} + +void func_80AEFAAC(EnRu1* this, GlobalContext* globalCtx) { + func_80AED83C(this); + func_80AEAECC(this, globalCtx); + EnRu1_FrameUpdateMatrix(this); + func_80AEF79C(this, globalCtx); + func_80AEB220(this, globalCtx); +} + +void func_80AEFB04(EnRu1* this, GlobalContext* globalCtx) { + s32 something; + + func_80AED83C(this); + func_80AEAECC(this, globalCtx); + something = EnRu1_FrameUpdateMatrix(this); + func_80AEAE1C(this); + func_80AEF820(this, something); + func_80AEB220(this, globalCtx); +} + +void func_80AEFB68(EnRu1* this, GlobalContext* globalCtx) { + func_80AED83C(this); + func_80AEAECC(this, globalCtx); + EnRu1_FrameUpdateMatrix(this); + func_80AEAE1C(this); + func_80AEF890(this, globalCtx); + func_80AEB220(this, globalCtx); +} + +void func_80AEFBC8(EnRu1* this, GlobalContext* globalCtx) { + func_80AED83C(this); + func_80AEAECC(this, globalCtx); + EnRu1_FrameUpdateMatrix(this); + func_80AEAE1C(this); + func_80AEF540(this); + func_80AEF930(this, globalCtx); +} + +void func_80AEFC24(EnRu1* this, GlobalContext* globalCtx) { + func_80AED83C(this); + func_80AEF99C(this, globalCtx); +} + +void func_80AEFC54(EnRu1* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + + if ((gSaveContext.infTable[20] & 0x20) && (!(gSaveContext.infTable[20] & 0x40))) { + func_80AEB264(this, &D_060097B8, 0, 0, 0); + this->action = 41; + this->unk_28C = func_80AEB088(globalCtx); + func_80AEB0EC(this, 1); + thisx->flags &= ~0x9; + } else { + Actor_Kill(thisx); + } +} + +void func_80AEFCE8(EnRu1* this, GlobalContext* globalCtx) { + this->unk_28C = func_80AEB088(globalCtx); + if (this->unk_28C != NULL) { + this->action = 42; + this->drawConfig = 1; + func_80AEB0EC(this, 1); + } +} + +void func_80AEFD38(EnRu1* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + + if ((gSaveContext.eventChkInf[3] & 0x80) && (gSaveContext.linkAge == 1)) { + func_80AEB264(this, &D_060097B8, 0, 0, 0); + thisx->flags &= ~0x10; + this->action = 44; + this->drawConfig = 1; + } else { + Actor_Kill(thisx); + } +} + +s32 func_80AEFDC0(EnRu1* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + + if (!func_8002F194(thisx, globalCtx)) { + thisx->flags |= 9; + thisx->textId = Text_GetFaceReaction(globalCtx, 0x1F); + if (thisx->textId == 0) { + thisx->textId = 0x402C; + } + func_8002F2F4(thisx, globalCtx); + return 0; + } + return 1; +} + +s32 func_80AEFE38(EnRu1* this, GlobalContext* globalCtx) { + if (func_8010BDBC(&globalCtx->msgCtx) == 2) { + this->actor.flags &= ~0x9; + return 1; + } + return 0; +} + +void func_80AEFE84(EnRu1* this, GlobalContext* globalCtx, s32 cond) { + if (cond) { + this->action = 45; + } +} + +void func_80AEFE9C(EnRu1* this, GlobalContext* globalCtx) { + if (func_80AEFE38(this, globalCtx)) { + this->action = 44; + } +} + +void func_80AEFECC(EnRu1* this, GlobalContext* globalCtx) { + func_80AEEF68(this, globalCtx); + EnRu1_FrameUpdateMatrix(this); + func_80AEAE1C(this); + func_80AEAC10(this, globalCtx); + func_80AEAECC(this, globalCtx); + func_80AEFE84(this, globalCtx, func_80AEFDC0(this, globalCtx)); +} + +void func_80AEFF40(EnRu1* this, GlobalContext* globalCtx) { + func_80AEEFEC(this, globalCtx); + EnRu1_FrameUpdateMatrix(this); + func_80AEAE1C(this); + func_80AEAECC(this, globalCtx); + func_80AEFE9C(this, globalCtx); +} + +void func_80AEFF94(EnRu1* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + s8 actorRoom; + + if ((gSaveContext.infTable[20] & 2) && (gSaveContext.infTable[20] & 1) && (!(gSaveContext.infTable[20] & 0x20)) && + (!(func_80AEB020(this, globalCtx)))) { + func_80AEB264(this, &D_060097B8, 0, 0, 0); + actorRoom = thisx->room; + this->action = 22; + thisx->room = -1; + this->drawConfig = 0; + this->roomNum1 = actorRoom; + this->roomNum3 = actorRoom; + this->roomNum2 = actorRoom; + osSyncPrintf("スイッチルトセット!!!!!!!!!!!!!!!!!!!!!!\n"); + } else { + osSyncPrintf("スイッチルトセットしない!!!!!!!!!!!!!!!!!!!!!!\n"); + Actor_Kill(thisx); + } +} + +void func_80AF0050(EnRu1* this, GlobalContext* globalCtx) { + func_80AEB264(this, &D_060097B8, 0, 0, 0); + this->action = 36; + this->roomNum1 = this->actor.room; + this->unk_28C = func_80AEB088(globalCtx); + this->actor.room = -1; +} + +void EnRu1_Update(EnRu1* this, GlobalContext* globalCtx) { + if (this->action < 0 || this->action >= 46 || D_80AF193C[this->action] == NULL) { + osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + D_80AF193C[this->action](this, globalCtx); +} + +void EnRu1_Init(EnRu1* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + u32 temp_ret; + + ActorShape_Init(&thisx->shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06012700, NULL, &this->actorDrawTable, &this->transitionDrawTable, + 17); + func_80AEAD20(this, globalCtx); + switch (func_80AEADF0(this)) { + case 0: + func_80AECDA0(this, globalCtx); + break; + case 1: + func_80AEB3DC(this, globalCtx); + break; + case 2: + func_80AEC320(this, globalCtx); + break; + case 3: + func_80AED44C(this, globalCtx); + break; + case 4: + func_80AEFC54(this, globalCtx); + break; + case 5: + func_80AEFD38(this, globalCtx); + break; + case 6: + func_80AEFF94(this, globalCtx); + break; + case 10: + func_80AF0050(this, globalCtx); + break; + default: + Actor_Kill(thisx); + osSyncPrintf("該当 arge_data = %d 無し\n", func_80AEADF0(this)); + break; + } +} + +void func_80AF0278(EnRu1* this, GlobalContext* globalCtx, s32 limbIndex, Vec3s* rot) { + Vec3s* vec1 = &this->unk_374.unk_0E; + Vec3s* vec2 = &this->unk_374.unk_08; + + switch (limbIndex) { + case 8: + rot->x += vec1->y; + rot->y -= vec1->x; + break; + case 15: + rot->x += vec2->y; + rot->z += vec2->x; + break; + } +} + +s32 func_80AF02E8(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, EnRu1* actor, + Gfx** gfx) { + if ((actor->unk_290 < 0) || (actor->unk_290 > 0) || (*D_80AF19F4[actor->unk_290] == NULL)) { + osSyncPrintf(VT_FGCOL(RED) "首回しモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + } else { + D_80AF19F4[actor->unk_290](actor, globalCtx, limbIndex, rot); + } + return 0; +} + +void func_80AF0368(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* actor, Gfx** gfx) { + s32 pad; + Vec3f vec1; + Vec3f vec2; + + if (limbIndex == 15) { + vec1 = D_80AF19F8; + Matrix_MultVec3f(&vec1, &vec2); + actor->posRot2.pos.x = vec2.x; + actor->posRot2.pos.y = vec2.y; + actor->posRot2.pos.z = vec2.z; + actor->posRot2.rot.x = actor->posRot.rot.x; + actor->posRot2.rot.y = actor->posRot.rot.y; + actor->posRot2.rot.z = actor->posRot.rot.z; + } +} + +void func_80AF03F4(EnRu1* this, GlobalContext* globalCtx) { +} + +void func_80AF0400(EnRu1* this, GlobalContext* globalCtx) { + s32 pad[2]; + s16 temp = this->unk_25C; + s32 addr1 = D_80AF0858[temp]; + s16 temp2 = this->unk_260; + SkelAnime* skelAnime = &this->skelAnime; + s32 addr2 = D_80AF0870[temp2]; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ru1.c", 1282); + func_80093D18(globalCtx->state.gfxCtx); + + gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr1)); + gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr1)); + gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr2)); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x00, 0x00, 0x00, 0xFF); + gSPSegment(gfxCtx->polyOpa.p++, 0x0C, &D_80116280[2]); + + gfxCtx->polyOpa.p = + SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->actorDrawTbl, skelAnime->dListCount, func_80AF02E8, + func_80AF0368, &this->actor, gfxCtx->polyOpa.p); + + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ru1.c", 1309); +} + +void func_80AF05D4(EnRu1* this, GlobalContext* globalCtx) { + s32 pad[2]; + s16 temp = this->unk_25C; + s32 addr1 = D_80AF0858[temp]; + s16 temp2 = this->unk_260; + SkelAnime* skelAnime = &this->skelAnime; + s32 addr2 = D_80AF0870[temp2]; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ru1.c", 1324); + func_80093D84(globalCtx->state.gfxCtx); + + gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr1)); + gSPSegment(gfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr1)); + gSPSegment(gfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr2)); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0x00, this->unk_2A8); + gSPSegment(gfxCtx->polyXlu.p++, 0x0C, &D_80116280[0]); + + gfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->actorDrawTbl, + skelAnime->dListCount, func_80AF02E8, NULL, &this->actor, gfxCtx->polyXlu.p); + + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ru1.c", 1353); +} + +void EnRu1_Draw(EnRu1* this, GlobalContext* globalCtx) { + if (this->drawConfig < 0 || this->drawConfig >= 3 || D_80AF1A04[this->drawConfig] == 0) { + osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + D_80AF1A04[this->drawConfig](this, globalCtx); +} diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h index ddce050cb6..4f00f09006 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h @@ -4,9 +4,55 @@ #include #include +#include +#include + typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x250]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ Vec3s actorDrawTable[17]; + /* 0x01F6 */ Vec3s transitionDrawTable[17]; + /* 0x025C */ s16 unk_25C; + /* 0x025E */ char unk_25E[0x2]; + /* 0x0260 */ s16 unk_260; + /* 0x0262 */ char unk_262[0x2]; + /* 0x0264 */ s32 action; + /* 0x0268 */ s32 drawConfig; + /* 0x026C */ f32 unk_26C; + /* 0x0270 */ f32 unk_270; + /* 0x0274 */ char unk_274[0x4]; + /* 0x0278 */ DoorWarp1* unk_278; + /* 0x027C */ f32 unk_27C; + /* 0x0280 */ s32 unk_280; + /* 0x0284 */ s8 roomNum1; + /* 0x0285 */ s8 roomNum2; + /* 0x0286 */ s8 roomNum3; + /* 0x0287 */ char unk_287; + /* 0x0288 */ f32 unk_288; + /* 0x028C */ BgBdanObjects* unk_28C; + /* 0x0290 */ s32 unk_290; + /* 0x0294 */ char unk_294[0x4]; + /* 0x0298 */ s32 unk_298; + /* 0x029C */ char unk_29C[0x2]; + /* 0x029E */ s16 unk_29E; + /* 0x02A0 */ char unk_2A0[0x4]; + /* 0x02A4 */ f32 unk_2A4; + /* 0x02A8 */ s32 unk_2A8; + /* 0x02AC */ s16 unk_2AC; + /* 0x02AE */ char unk_2AE[0x2]; + /* 0x02B0 */ s32 unk_2B0; + /* 0x02B4 */ ColliderCylinderMain collider; + /* 0x0300 */ ColliderCylinderMain collider2; + /* 0x034C */ s32 unk_34C; + /* 0x0350 */ s32 unk_350; + /* 0x0354 */ f32 unk_354; + /* 0x0358 */ f32 unk_358; + /* 0x035C */ s16 unk_35C; + /* 0x0360 */ f32 unk_360; + /* 0x0364 */ Vec3f unk_364; + /* 0x0370 */ f32 unk_370; + /* 0x0374 */ struct_80034A14_arg1 unk_374; + /* 0x0398 */ char unk_398[0x4]; // probably belongs to previous struct } EnRu1; // size = 0x039C extern const ActorInit En_Ru1_InitVars; diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.c new file mode 100644 index 0000000000..ced490f95a --- /dev/null +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.c @@ -0,0 +1,130 @@ +#include "z_en_ru1.h" + +u32 D_80AF0880[] = { + 0x0000000F, 0x0000051A, 0x0000000A, 0x0000000A, 0x00270000, 0x00320000, 0x6C160000, 0x0000000C, 0xFFFFFEAC, + 0xFFFFF506, 0x0000000C, 0xFFFFFEAC, 0xFFFFF506, 0x0F671408, 0x00000000, 0x00000001, 0x00030032, 0x00460000, + 0x6C160000, 0x0000000C, 0xFFFFFEAC, 0xFFFFF506, 0x0000000C, 0xFFFFFEAC, 0xFFFFF506, 0x0F671408, 0x00000000, + 0x00000001, 0x00050046, 0x006D0000, 0x6C160000, 0x0000000C, 0xFFFFFEAC, 0xFFFFF506, 0x0000000C, 0xFFFFFEAC, + 0xFFFFF506, 0x0F671408, 0x00000000, 0x00000001, 0x0002006D, 0x00870000, 0x6C160000, 0x0000000C, 0xFFFFFEAC, + 0xFFFFF506, 0x00000064, 0xFFFFFEAC, 0xFFFFF451, 0x0F671408, 0x00000000, 0x00000001, 0x00050087, 0x00C70000, + 0x6C160000, 0x00000064, 0xFFFFFEAC, 0xFFFFF451, 0x00000064, 0xFFFFFEAC, 0xFFFFF451, 0x0F671408, 0x00000000, + 0x00000001, 0x000300C7, 0x00DB0000, 0x6C160000, 0x00000064, 0xFFFFFEAC, 0xFFFFF451, 0x00000064, 0xFFFFFEAC, + 0xFFFFF451, 0x0F671408, 0x00000000, 0x00000001, 0x000500DB, 0x01030000, 0x6C160000, 0x00000064, 0xFFFFFEAC, + 0xFFFFF451, 0x00000064, 0xFFFFFEAC, 0xFFFFF451, 0x0F671408, 0x00000000, 0x00000001, 0x00030103, 0x01140000, + 0x6C160000, 0x00000064, 0xFFFFFEAC, 0xFFFFF451, 0x00000064, 0xFFFFFEAC, 0xFFFFF451, 0x0F671408, 0x00000000, + 0x00000001, 0x00020114, 0x01290000, 0x6C160000, 0x00000064, 0xFFFFFEAC, 0xFFFFF451, 0x000000B6, 0xFFFFFEAC, + 0xFFFFF3C4, 0x0F671408, 0x00000000, 0x00000001, 0x00050129, 0x034B0000, 0x6C160000, 0x000000B6, 0xFFFFFEAC, + 0xFFFFF3C4, 0x000000B6, 0xFFFFFEAC, 0xFFFFF3C4, 0x0F671408, 0x00000000, 0x00000001, 0x0000003F, 0x00000004, + 0x00020000, 0x00B20000, 0xEC160000, 0x0000007F, 0xFFFFFEAC, 0xFFFFF41F, 0x0000007F, 0xFFFFFEAC, 0xFFFFF41F, + 0x0F671408, 0x00000000, 0x00000001, 0x000300B2, 0x00F50000, 0x6C160000, 0x0000007F, 0xFFFFFEAC, 0xFFFFF41F, + 0x0000007F, 0xFFFFFEAC, 0xFFFFF41F, 0x0F671408, 0x00000000, 0x00000001, 0x000400F5, 0x01040000, 0x6C160000, + 0x0000007F, 0xFFFFFEAC, 0xFFFFF41F, 0x0000007F, 0xFFFFFEAC, 0xFFFFF41F, 0x0F671408, 0x00000000, 0x00000001, + 0x00050104, 0x018C0000, 0x6C160000, 0x0000007F, 0xFFFFFEAC, 0xFFFFF41F, 0x0000007F, 0xFFFFFEAC, 0xFFFFF41F, + 0x0F671408, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x000C013B, 0x01590000, 0x00000000, 0x00000000, + 0xFFFFFFC0, 0x00000032, 0x00000000, 0xFFFFFFC0, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000013, + 0x00000004, 0xFFFF0000, 0x009DFFFF, 0xFFFFFFFF, 0x404B009D, 0x00AF0000, 0xFFFFFFFF, 0xFFFF00AF, 0x00FCFFFF, + 0xFFFFFFFF, 0x401E00FC, 0x012C0000, 0xFFFFFFFF, 0x00000001, 0x00010000, 0x00F70000, 0x00000000, 0x4235998B, + 0x0037FEDE, 0xF54320BA, 0x00000000, 0x4235998B, 0x0037FEDE, 0xF54344B8, 0x00000000, 0x4235998B, 0x0037FEDE, + 0xF5438080, 0x00000000, 0x4235998B, 0x0037FEDE, 0xF543E243, 0x00000000, 0x41F6662C, 0x0037FEDE, 0xF543005E, + 0x00000000, 0x41F6662C, 0x0037FEDE, 0xF543FFFF, 0x00000000, 0x41F6662C, 0x0037FEDE, 0xF5430000, 0x00000000, + 0x41F6662C, 0x0037FEDE, 0xF5435B80, 0xFF000000, 0x41F6662C, 0x0037FEDE, 0xF54349B4, 0x00000001, 0x00010049, + 0x00D00000, 0x00000000, 0x4235998B, 0x0063FECD, 0xF45720BA, 0x00000000, 0x4235998B, 0x0063FECD, 0xF45744B8, + 0x00000000, 0x4235998B, 0x0063FECD, 0xF4578080, 0x00000000, 0x4235998B, 0x0063FECD, 0xF457E243, 0x00000000, + 0x4235998B, 0x0063FECD, 0xF457005E, 0x00000000, 0x4235998B, 0x0063FECD, 0xF457FFFF, 0xFF000000, 0x4235998B, + 0x0063FECD, 0xF4570000, 0x00000001, 0x00010074, 0x04B70000, 0x00000000, 0x42373325, 0x009BFEEC, 0xF4A120BA, + 0x00000000, 0x42373325, 0x009BFEEC, 0xF4A144B8, 0x00000000, 0x42373325, 0x009BFEEC, 0xF4A18080, 0x00000000, + 0x42373325, 0x009BFEEC, 0xF4A1E243, 0xFF000000, 0x42373325, 0x009BFEEC, 0xF4A1005E, 0x00000001, 0x000100BA, + 0x04FD0000, 0x00000000, 0x4235998C, 0x004DFEC5, 0xF45020BA, 0x00000000, 0x4235998C, 0x004DFEC5, 0xF45044B8, + 0x00000000, 0x4235998C, 0x004DFEC5, 0xF4508080, 0x00000000, 0x4235998C, 0x004DFEC5, 0xF450E243, 0xFF000000, + 0x4235998C, 0x004DFEC5, 0xF450005E, 0x00000001, 0x00010100, 0x01A90000, 0x00000000, 0x41E1995C, 0x015EFF13, + 0xF30E20BA, 0x00000000, 0x41E1995C, 0x015EFF13, 0xF30E44B8, 0x00000000, 0x41E1995C, 0x015EFF13, 0xF30E8080, + 0x00000000, 0x41E1995C, 0x015EFF13, 0xF30EE243, 0x00000000, 0x423B3327, 0x015EFF13, 0xF30E005E, 0x00000000, + 0x423B3327, 0x015EFF13, 0xF30EFFFF, 0x00000000, 0x423B3327, 0x015EFF13, 0xF30E0000, 0xFF000000, 0x423B3327, + 0x015EFF13, 0xF30E5B80, 0x00000002, 0x00010000, 0x01140000, 0x00000032, 0x4235998B, 0x0028FF00, 0xF4F920BA, + 0x00000032, 0x4235998B, 0x0028FF00, 0xF4F944B8, 0x00000028, 0x4235998B, 0x0016FEC7, 0xF4F98080, 0x0000000A, + 0x4235998B, 0x0017FEC7, 0xF4F9E243, 0x00000006, 0x41F6662C, 0x0049FED6, 0xF4F4005E, 0x0000001E, 0x41F6662C, + 0x0049FED6, 0xF4F4FFFF, 0x0000001E, 0x41F6662C, 0x0049FED6, 0xF4F40000, 0x0000001E, 0x41F6662C, 0x0049FED6, + 0xF4F45B80, 0xFF00001E, 0x41F6662C, 0x0049FED6, 0xF4F449B4, 0x00000002, 0x00010049, 0x00ED0000, 0x0000001E, + 0x4270CCCD, 0x0088FEC6, 0xF40C20BA, 0x00000007, 0x42726667, 0x0088FEC6, 0xF40C44B8, 0x00000007, 0x4235998B, + 0x0088FEC6, 0xF40C8080, 0x0000001E, 0x4235998B, 0x0088FEC6, 0xF40CE243, 0x0000001E, 0x4235998B, 0x0088FEC6, + 0xF40C005E, 0x0000001E, 0x4235998B, 0x0087FEC7, 0xF40CFFFF, 0xFF00001E, 0x4235998B, 0x0087FEC7, 0xF40D0000, + 0x00000002, 0x00010074, 0x04D40000, 0x0000001E, 0x42373325, 0x0084FECF, 0xF46720BA, 0x0000001E, 0x42373325, + 0x0084FED0, 0xF46744B8, 0x000003E8, 0x42373325, 0x0085FED0, 0xF4678080, 0x0000001E, 0x42373325, 0x0085FED0, + 0xF467E243, 0xFF00001E, 0x42373325, 0x0085FED0, 0xF467005E, 0x00000002, 0x000100BA, 0x051A0000, 0x0000001E, + 0x4235998C, 0x008AFED3, 0xF42820BA, 0x0000001E, 0x4235998C, 0x008AFED3, 0xF42844B8, 0x000003E8, 0x4235998C, + 0x008AFED3, 0xF4288080, 0x0000001E, 0x4235998C, 0x008AFED3, 0xF428E243, 0xFF00001E, 0x4235998C, 0x008AFED3, + 0xF428005E, 0x00000002, 0x00010100, 0x01C60000, 0x0000001E, 0x41E1995C, 0x0133FF02, 0xF34620BA, 0x0000001E, + 0x41E1995C, 0x0133FF02, 0xF34644B8, 0x00000009, 0x41E1995C, 0x0133FF02, 0xF3468080, 0x00000009, 0x423B3327, + 0x0130FEEF, 0xF337E243, 0x0000001E, 0x423B3327, 0x0130FEF0, 0xF336005E, 0x0000001E, 0x423B3327, 0x0130FEF0, + 0xF336FFFF, 0x0000001E, 0x423B3327, 0x0130FEF0, 0xF3360000, 0xFF00001E, 0x423B3327, 0x0131FEF0, 0xF3365B80, + 0x00000056, 0x00000001, 0x0052004A, 0x004B0000, 0x00000000, 0xFFFFFFF1, 0x00000000, 0x0000004E, 0xFFFFFFF1, + 0x00000000, 0x0000004E, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, +}; + +u32 D_80AF10A4[] = { + 0x0000000E, 0x00000513, 0x0000000A, 0x00000003, 0x00050000, 0x01100000, 0xC0000000, 0xFFFFFBC3, 0xFFFFFBFF, + 0xFFFFF2ED, 0xFFFFFBC3, 0xFFFFFBFF, 0xFFFFF2ED, 0x0F671408, 0x00000000, 0x00000001, 0x00030110, 0x01240000, + 0xC0000000, 0xFFFFFBC3, 0xFFFFFBFF, 0xFFFFF2ED, 0xFFFFFBC3, 0xFFFFFBFF, 0xFFFFF2ED, 0x0F671408, 0x00000000, + 0x00000001, 0x00050124, 0x03090000, 0xC0000000, 0xFFFFFBC3, 0xFFFFFBFF, 0xFFFFF2ED, 0xFFFFFBC3, 0xFFFFFBFF, + 0xFFFFF2ED, 0x0F671408, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x000C014A, 0x02730000, 0x00000000, + 0x00000000, 0xFFFFFFC0, 0x00000032, 0x00000000, 0xFFFFFFC0, 0x00000032, 0x00000000, 0x00000000, 0x00000000, + 0x00000042, 0x00000003, 0x00010000, 0x00280000, 0x40000000, 0xFFFFFAB8, 0xFFFFFC37, 0xFFFFF2F3, 0xFFFFFAB8, + 0xFFFFFC37, 0xFFFFF2F3, 0x00000000, 0x00000000, 0x00000001, 0x00020028, 0x00D50000, 0x40000000, 0xFFFFFAB8, + 0xFFFFFC37, 0xFFFFF2F3, 0xFFFFFAB0, 0xFFFFFC37, 0xFFFFF2F1, 0x00000000, 0x00000000, 0x00000001, 0x000300D5, + 0x03E80000, 0x40000000, 0xFFFFFAB0, 0xFFFFFC37, 0xFFFFF2F1, 0xFFFFFAB0, 0xFFFFFC37, 0xFFFFF2F1, 0x00000000, + 0x00000000, 0x00000001, 0x00000030, 0x00000001, 0x00020000, 0x005A0000, 0x00000000, 0xFFFFFAB0, 0xFFFFFC3D, + 0xFFFFF2F1, 0xFFFFFAB0, 0xFFFFFC3D, 0xFFFFF2F1, 0x00000000, 0x00000000, 0x00000000, 0x00000030, 0x00000002, + 0x0002005A, 0x00D30000, 0x00000000, 0xFFFFFAB8, 0xFFFFFC66, 0xFFFFF2F3, 0xFFFFFAB8, 0xFFFFFC66, 0xFFFFF2F3, + 0x00000000, 0x00000000, 0x00000000, 0x000600D3, 0x01370000, 0x00000000, 0xFFFFFAB8, 0xFFFFFC66, 0xFFFFF2F3, + 0xFFFFFAB8, 0xFFFFFC66, 0xFFFFF2F3, 0x00000000, 0x00000000, 0x00000000, 0x0000003E, 0x00000003, 0x00040000, + 0x00D20000, 0x00000000, 0xFFFFFBD7, 0xFFFFFC34, 0xFFFFF317, 0xFFFFFBD7, 0xFFFFFC2E, 0xFFFFF317, 0x00000000, + 0xBCEA0EA1, 0x00000000, 0x000400D2, 0x00DC8000, 0x00000000, 0xFFFFFBD7, 0xFFFFFC2E, 0xFFFFF317, 0xFFFFFBD7, + 0xFFFFFC33, 0xFFFFF2F0, 0x00000000, 0x3F000000, 0x00000000, 0x000400DC, 0x019A0000, 0x00000000, 0xFFFFFBD7, + 0xFFFFFC33, 0xFFFFF2F0, 0xFFFFFBD7, 0xFFFFFC30, 0xFFFFF2F0, 0x00000000, 0xBC8158ED, 0x00000000, 0x00000013, + 0x00000006, 0xFFFF0000, 0x00A2FFFF, 0xFFFFFFFF, 0x405000A2, 0x00D30000, 0xFFFFFFFF, 0xFFFF00D3, 0x00E8FFFF, + 0xFFFFFFFF, 0x405100E8, 0x00F10000, 0xFFFFFFFF, 0xFFFF00F1, 0x00F7FFFF, 0xFFFFFFFF, 0x405200F7, 0x012B0000, + 0xFFFFFFFF, 0x00000056, 0x00000001, 0x00230070, 0x00710000, 0x00000000, 0x00000000, 0xFFFFFFC7, 0x000000B1, + 0x00000000, 0xFFFFFFC7, 0x000000B1, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00010000, 0x04980000, + 0x00000000, 0x4227A05C, 0xFA92FC4C, 0xF2F500C6, 0x00000000, 0x4222D38E, 0xFA92FC4C, 0xF2F500C8, 0x00000000, + 0x4222D38E, 0xFA92FC4C, 0xF2F500D7, 0x00000000, 0x4222D38E, 0xFA76FC56, 0xF2F700E8, 0x00000000, 0x42346D2B, + 0xFA76FC56, 0xF2F700EA, 0x00000000, 0x42346D2B, 0xFA76FC56, 0xF2F7013D, 0x00000000, 0x42346D2B, 0xFA76FC56, + 0xF2F7013F, 0xFF000000, 0x42346D2B, 0xFA76FC56, 0xF2F7006D, 0x00000001, 0x0001005B, 0x04F60000, 0x00000000, + 0x4233A05F, 0xFAD9FC5A, 0xF2F100C6, 0x00000000, 0x4232D392, 0xFAD9FC58, 0xF2F000C8, 0x00000000, 0x4232D392, + 0xFAD9FC58, 0xF2F000D7, 0x00000000, 0x4232D392, 0xFAD9FC58, 0xF2F000E8, 0x00000000, 0x4232D392, 0xFAD2FC78, + 0xF2F200EA, 0x00000000, 0x4273A06F, 0xFAD2FC78, 0xF2F2013D, 0x00000000, 0x4273A06F, 0xFAD2FC78, 0xF2F2013F, + 0x00000000, 0x4273A06F, 0xFAD2FC78, 0xF2F2014E, 0x00000000, 0x4273A06F, 0xFAD2FC78, 0xF2F2015F, 0x00000000, + 0x4273A06F, 0xFAD2FC78, 0xF2F20161, 0xFF000000, 0x4273A06F, 0xFAD2FC00, 0xF2F2652E, 0x00000001, 0x000100D3, + 0x014C0000, 0x00000000, 0x41F273D3, 0xFA41FCCD, 0xF3B300C6, 0x00000000, 0x41F273D3, 0xFA41FCCD, 0xF3B300C8, + 0x00000000, 0x41F273D3, 0xFA41FCCD, 0xF3B300D7, 0x00000000, 0x41F273D3, 0xFA41FCCD, 0xF3B300E8, 0xFF000000, + 0x41F273D3, 0xFA41FCCD, 0xF3B300EA, 0x00000002, 0x00010000, 0x04B50000, 0x0000001E, 0x4222D38E, 0xFAF1FC15, + 0xF2E800C6, 0x00000032, 0x4222D38E, 0xFAF0FC15, 0xF2E800C8, 0x00000014, 0x4222D38E, 0xFAF0FC15, 0xF2E800D7, + 0x0000000F, 0x42346D2B, 0xFADEFC37, 0xF2EE00E8, 0x0000001E, 0x42346D2B, 0xFADFFC36, 0xF2EE00EA, 0x000003E8, + 0x42346D2B, 0xFADFFC37, 0xF2EE013D, 0x0000001E, 0x42346D2B, 0xFADFFC36, 0xF2EE013F, 0xFF00001E, 0x42346D2B, + 0xFADFFC36, 0xF2EE006D, 0x00000002, 0x0001005B, 0x05130000, 0x0000001E, 0x4232D392, 0xFA83FC24, 0xF2F100C6, + 0x00000007, 0x4232D392, 0xFA82FC23, 0xF2F000C8, 0x00000007, 0x4232D392, 0xFA82FC23, 0xF2F000D7, 0x00000007, + 0x4232D392, 0xFA82FC23, 0xF2F000E8, 0x00000007, 0x4273A06F, 0xFA8FFC2E, 0xF2F200EA, 0x0000001E, 0x4273A06F, + 0xFA8FFC2F, 0xF2F2013D, 0x0000001E, 0x4273A06F, 0xFA8FFC2F, 0xF2F2013F, 0x000003E8, 0x4273A06F, 0xFA8FFC2F, + 0xF2F2014E, 0x0000001E, 0x4273A06F, 0xFA8FFC2F, 0xF2F2015F, 0x0000001E, 0x4273A06F, 0xFA8FFC2F, 0xF2F20161, + 0xFF00001E, 0x4273A06F, 0xFA87FBBA, 0xF2ED652E, 0x00000002, 0x000100D3, 0x01690000, 0x0000001E, 0x41F273D3, + 0xFA6EFCA7, 0xF38A00C6, 0x0000001E, 0x41F273D3, 0xFA6EFCA7, 0xF38A00C8, 0x0000001E, 0x41F273D3, 0xFA6EFCA7, + 0xF38A00D7, 0x0000001E, 0x41F273D3, 0xFA6EFCA7, 0xF38A00E8, 0xFF00001E, 0x41F273D3, 0xFA6EFCA7, 0xF38A00EA, + 0xFFFFFFFF, 0x00000000, 0x00000000, +}; + +u32 D_80AF1728[] = { + 0x00000007, 0x00000488, 0x00000003, 0x00000001, 0x000C004B, 0x02730000, 0x00000000, 0x00000000, 0xFFFFFFC0, + 0x00000032, 0x00000000, 0xFFFFFFC0, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000030, 0x00000001, + 0x00020000, 0x005A0000, 0x00000000, 0xFFFFFAB0, 0xFFFFFC3D, 0xFFFFF2F1, 0xFFFFFAB0, 0xFFFFFC3D, 0xFFFFF2F1, + 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00010000, 0x04430000, 0x00000000, 0x42226662, 0xFA9BFC42, + 0xF2FD8BC0, 0x00000000, 0x42226662, 0xFA9BFC42, 0xF2FD2200, 0x00000000, 0x42226662, 0xFA9BFC42, 0xF2FD0000, + 0x00000000, 0x42226662, 0xFA9BFC42, 0xF2FDD0E8, 0xFF000000, 0x42226662, 0xFA9BFC42, 0xF2FD0000, 0x00000005, + 0x00010028, 0x046B0000, 0x00000000, 0x424B3339, 0x00130028, 0x00358BC0, 0x00000000, 0x424B3339, 0x00130028, + 0x00352200, 0x00000000, 0x424B3339, 0x00130028, 0x00350000, 0x00000000, 0x424B3339, 0x00130028, 0x0035D0E8, + 0xFF000000, 0x424B3339, 0x00130028, 0x00350000, 0x00000002, 0x00010000, 0x04600000, 0x0000001E, 0x42226662, + 0xFB38FC2D, 0xF2DA8BC0, 0x0000001E, 0x42226662, 0xFB38FC2D, 0xF2DA2200, 0x000003E8, 0x42226662, 0xFB38FC2D, + 0xF2DA0000, 0x0000001E, 0x42226662, 0xFB38FC2D, 0xF2DAD0E8, 0xFF00001E, 0x42226662, 0xFB38FC2D, 0xF2DA0000, + 0x00000006, 0x00010028, 0x04880000, 0x0000001E, 0x424B3339, 0xFFDD0038, 0xFFA38BC0, 0x0000001E, 0x424B3339, + 0xFFDD0038, 0xFFA32200, 0x000003E8, 0x424B3339, 0xFFDD0038, 0xFFA30000, 0x0000001E, 0x424B3339, 0xFFDD0038, + 0xFFA3D0E8, 0xFF00001E, 0x424B3339, 0xFFDD0038, 0xFFA30000, 0x00000013, 0x00000002, 0xFFFF0000, 0x0023FFFF, + 0xFFFFFFFF, 0x404F0023, 0x00460000, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, +}; 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 ba66c0fb64..a8415dcaf9 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -84,14 +84,14 @@ const ActorInit En_Ru2_InitVars = { (ActorFunc)EnRu2_Draw, }; -extern AnimationHeader* D_060004CC; -extern SkeletonHeader* D_0600C700; -extern AnimationHeader* D_0600D3DC; -extern AnimationHeader* D_0600DCAC; -extern AnimationHeader* D_06000DE8; -extern AnimationHeader* D_0600E630; -extern AnimationHeader* D_0600F03C; -extern AnimationHeader* D_0600F8B8; +extern AnimationHeader D_060004CC; +extern SkeletonHeader D_0600C700; +extern AnimationHeader D_0600D3DC; +extern AnimationHeader D_0600DCAC; +extern AnimationHeader D_06000DE8; +extern AnimationHeader D_0600E630; +extern AnimationHeader D_0600F03C; +extern AnimationHeader D_0600F8B8; void func_80AF2550(EnRu2* this, GlobalContext* globalCtx) { EnRu2* thisLocal = this; @@ -304,7 +304,8 @@ void func_80AF2BC0(EnRu2* this, GlobalContext* globalCtx) { if (globalCtx->csCtx.state != 0) { csCmdActorAction = globalCtx->csCtx.actorActions[3]; if (csCmdActorAction != NULL && csCmdActorAction->action == 3) { - SkelAnime_ChangeAnim(&this->skelAnime, animation, 1.0f, 0.0f, SkelAnime_GetFrameCount(animation), 2, 0.0f); + SkelAnime_ChangeAnim(&this->skelAnime, animation, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&animation->genericHeader), 2, 0.0f); this->action = 4; } } @@ -756,7 +757,7 @@ void EnRu2_Update(EnRu2* this, GlobalContext* globalCtx) { void EnRu2_Init(EnRu2* this, GlobalContext* globalCtx) { ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); func_80AF2550(this, globalCtx); - SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600C700, NULL, &this->unk_190, &this->unk_21A, 0x17); + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600C700, NULL, &this->actorDrawTable, &this->transitionDrawTable, 23); switch (func_80AF26A0(this)) { case 2: 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 441e6ccc51..88b25e1e7c 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h @@ -7,10 +7,8 @@ typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ SkelAnime skelAnime; - /* 0x0190 */ s8 unk_190; // likely a struct - /* 0x0191 */ char unk_191[0x89]; - /* 0x021A */ s8 unk_21A; // another of the same struct - /* 0x021B */ char unk_21B[0x89]; + /* 0x0190 */ Vec3s actorDrawTable[23]; + /* 0x021A */ Vec3s transitionDrawTable[23]; /* 0x02A4 */ s16 unk_2A4; /* 0x02A6 */ s16 unk_2A6; /* 0x02A8 */ s32 action; diff --git a/undefined_syms.txt b/undefined_syms.txt index f26e21b9e0..fc1ab036fc 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -412,6 +412,31 @@ D_060006D0 = 0x060006D0; D_06000000 = 0x06000000; D_06000350 = 0x06000350; +// z_en_ru1 +D_06000690 = 0x06000690; +D_06000E54 = 0x06000E54; +D_06001488 = 0x06001488; +D_06002058 = 0x06002058; +D_06002990 = 0x06002990; +D_06002EC0 = 0x06002EC0; +D_06003608 = 0x06003608; +D_06003784 = 0x06003784; +D_06004074 = 0x06004074; +D_06004350 = 0x06004350; +D_06004648 = 0x06004648; +D_06004BF0 = 0x06004BF0; +D_060063F4 = 0x060063F4; +D_06006B9C = 0x06006B9C; +D_06007534 = 0x06007534; +D_060078E4 = 0x060078E4; +D_06008100 = 0x06008100; +D_06008AA8 = 0x06008AA8; +D_06009060 = 0x06009060; +D_060097B8 = 0x060097B8; +D_06012700 = 0x06012700; +D_06012E94 = 0x06012E94; +D_06013A64 = 0x06013A64; + // z_en_ru2 D_060004CC = 0x060004CC; D_06000F20 = 0x06000F20;