diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Destroy.s deleted file mode 100644 index 5201401700..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Destroy.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel EnTa_Destroy -/* 007DC 80B1427C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007E0 80B14280 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 007E4 80B14284 AFBF0014 */ sw $ra, 0x0014($sp) -/* 007E8 80B14288 AFA5001C */ sw $a1, 0x001C($sp) -/* 007EC 80B1428C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 007F0 80B14290 24C50264 */ addiu $a1, $a2, 0x0264 ## $a1 = 00000264 -/* 007F4 80B14294 0C0170EB */ jal Collider_DestroyCylinder - -/* 007F8 80B14298 AFA60018 */ sw $a2, 0x0018($sp) -/* 007FC 80B1429C 8FA60018 */ lw $a2, 0x0018($sp) -/* 00800 80B142A0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00804 80B142A4 84C2001C */ lh $v0, 0x001C($a2) ## 0000001C -/* 00808 80B142A8 10410008 */ beq $v0, $at, .L80B142CC -/* 0080C 80B142AC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00810 80B142B0 10410006 */ beq $v0, $at, .L80B142CC -/* 00814 80B142B4 8FAE001C */ lw $t6, 0x001C($sp) -/* 00818 80B142B8 85CF00A4 */ lh $t7, 0x00A4($t6) ## 000000A4 -/* 0081C 80B142BC 2401004C */ addiu $at, $zero, 0x004C ## $at = 0000004C -/* 00820 80B142C0 15E10002 */ bne $t7, $at, .L80B142CC -/* 00824 80B142C4 3C018016 */ lui $at, %hi(gSaveContext+0x13ce) -/* 00828 80B142C8 A420FA2E */ sh $zero, %lo(gSaveContext+0x13ce)($at) -.L80B142CC: -/* 0082C 80B142CC 94D802E0 */ lhu $t8, 0x02E0($a2) ## 000002E0 -/* 00830 80B142D0 33190200 */ andi $t9, $t8, 0x0200 ## $t9 = 00000000 -/* 00834 80B142D4 53200004 */ beql $t9, $zero, .L80B142E8 -/* 00838 80B142D8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0083C 80B142DC 0C03D6D6 */ jal func_800F5B58 -/* 00840 80B142E0 00000000 */ nop -/* 00844 80B142E4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B142E8: -/* 00848 80B142E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0084C 80B142EC 03E00008 */ jr $ra -/* 00850 80B142F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Draw.s deleted file mode 100644 index 296236815d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Draw.s +++ /dev/null @@ -1,95 +0,0 @@ -.rdata -glabel D_80B16F2C - .asciz "../z_en_ta.c" - .balign 4 - -glabel D_80B16F3C - .asciz "../z_en_ta.c" - .balign 4 - -.text -glabel EnTa_Draw -/* 03240 80B16CE0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 03244 80B16CE4 AFBF002C */ sw $ra, 0x002C($sp) -/* 03248 80B16CE8 AFB00028 */ sw $s0, 0x0028($sp) -/* 0324C 80B16CEC AFA5005C */ sw $a1, 0x005C($sp) -/* 03250 80B16CF0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 03254 80B16CF4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03258 80B16CF8 3C0680B1 */ lui $a2, %hi(D_80B16F2C) ## $a2 = 80B10000 -/* 0325C 80B16CFC 24C66F2C */ addiu $a2, $a2, %lo(D_80B16F2C) ## $a2 = 80B16F2C -/* 03260 80B16D00 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 03264 80B16D04 2407094D */ addiu $a3, $zero, 0x094D ## $a3 = 0000094D -/* 03268 80B16D08 0C031AB1 */ jal Graph_OpenDisps -/* 0326C 80B16D0C AFA5004C */ sw $a1, 0x004C($sp) -/* 03270 80B16D10 8FAF005C */ lw $t7, 0x005C($sp) -/* 03274 80B16D14 0C0250F2 */ jal func_800943C8 -/* 03278 80B16D18 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 0327C 80B16D1C 8FA8004C */ lw $t0, 0x004C($sp) -/* 03280 80B16D20 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 03284 80B16D24 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 -/* 03288 80B16D28 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 0328C 80B16D2C 3C0480B1 */ lui $a0, %hi(D_80B16E88) ## $a0 = 80B10000 -/* 03290 80B16D30 3C068016 */ lui $a2, %hi(gSegments) -/* 03294 80B16D34 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 -/* 03298 80B16D38 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 0329C 80B16D3C AC790000 */ sw $t9, 0x0000($v1) ## 00000000 -/* 032A0 80B16D40 860902B4 */ lh $t1, 0x02B4($s0) ## 000002B4 -/* 032A4 80B16D44 24C66FA8 */ addiu $a2, %lo(gSegments) -/* 032A8 80B16D48 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 032AC 80B16D4C 00095080 */ sll $t2, $t1, 2 -/* 032B0 80B16D50 008A2021 */ addu $a0, $a0, $t2 -/* 032B4 80B16D54 8C846E88 */ lw $a0, %lo(D_80B16E88)($a0) -/* 032B8 80B16D58 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF -/* 032BC 80B16D5C 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 032C0 80B16D60 00046100 */ sll $t4, $a0, 4 -/* 032C4 80B16D64 000C6F02 */ srl $t5, $t4, 28 -/* 032C8 80B16D68 000D7080 */ sll $t6, $t5, 2 -/* 032CC 80B16D6C 00CE7821 */ addu $t7, $a2, $t6 -/* 032D0 80B16D70 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 -/* 032D4 80B16D74 00855824 */ and $t3, $a0, $a1 -/* 032D8 80B16D78 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 032DC 80B16D7C 0178C821 */ addu $t9, $t3, $t8 -/* 032E0 80B16D80 03274821 */ addu $t1, $t9, $a3 -/* 032E4 80B16D84 AC690004 */ sw $t1, 0x0004($v1) ## 00000004 -/* 032E8 80B16D88 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 032EC 80B16D8C 24846DC0 */ addiu $a0, $a0, 0x6DC0 ## $a0 = 06006DC0 -/* 032F0 80B16D90 00046900 */ sll $t5, $a0, 4 -/* 032F4 80B16D94 000D7702 */ srl $t6, $t5, 28 -/* 032F8 80B16D98 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 032FC 80B16D9C 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 -/* 03300 80B16DA0 358C0024 */ ori $t4, $t4, 0x0024 ## $t4 = DB060024 -/* 03304 80B16DA4 000E7880 */ sll $t7, $t6, 2 -/* 03308 80B16DA8 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 0330C 80B16DAC 00CF5821 */ addu $t3, $a2, $t7 -/* 03310 80B16DB0 AC6C0000 */ sw $t4, 0x0000($v1) ## 00000000 -/* 03314 80B16DB4 8D780000 */ lw $t8, 0x0000($t3) ## 00000000 -/* 03318 80B16DB8 0085C824 */ and $t9, $a0, $a1 -/* 0331C 80B16DBC 3C0C80B1 */ lui $t4, %hi(func_80B16B1C) ## $t4 = 80B10000 -/* 03320 80B16DC0 03194821 */ addu $t1, $t8, $t9 -/* 03324 80B16DC4 01275021 */ addu $t2, $t1, $a3 -/* 03328 80B16DC8 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 -/* 0332C 80B16DCC 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 03330 80B16DD0 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 03334 80B16DD4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 03338 80B16DD8 3C0D80B1 */ lui $t5, %hi(func_80B16CA0) ## $t5 = 80B10000 -/* 0333C 80B16DDC 25AD6CA0 */ addiu $t5, $t5, %lo(func_80B16CA0) ## $t5 = 80B16CA0 -/* 03340 80B16DE0 258C6B1C */ addiu $t4, $t4, %lo(func_80B16B1C) ## $t4 = 80B16B1C -/* 03344 80B16DE4 AFAC0010 */ sw $t4, 0x0010($sp) -/* 03348 80B16DE8 AFAD0014 */ sw $t5, 0x0014($sp) -/* 0334C 80B16DEC AFB00018 */ sw $s0, 0x0018($sp) -/* 03350 80B16DF0 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 03354 80B16DF4 8FA4005C */ lw $a0, 0x005C($sp) -/* 03358 80B16DF8 8FAE005C */ lw $t6, 0x005C($sp) -/* 0335C 80B16DFC 3C0680B1 */ lui $a2, %hi(D_80B16F3C) ## $a2 = 80B10000 -/* 03360 80B16E00 24C66F3C */ addiu $a2, $a2, %lo(D_80B16F3C) ## $a2 = 80B16F3C -/* 03364 80B16E04 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 03368 80B16E08 24070960 */ addiu $a3, $zero, 0x0960 ## $a3 = 00000960 -/* 0336C 80B16E0C 0C031AD5 */ jal Graph_CloseDisps -/* 03370 80B16E10 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 03374 80B16E14 8FBF002C */ lw $ra, 0x002C($sp) -/* 03378 80B16E18 8FB00028 */ lw $s0, 0x0028($sp) -/* 0337C 80B16E1C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 03380 80B16E20 03E00008 */ jr $ra -/* 03384 80B16E24 00000000 */ nop -/* 03388 80B16E28 00000000 */ nop -/* 0338C 80B16E2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s deleted file mode 100644 index 9fee2133b3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s +++ /dev/null @@ -1,497 +0,0 @@ -.rdata -glabel D_80B16EA0 - .asciz "\x1b[36m 追放タロン \n\x1b[m" - .balign 4 - -glabel D_80B16EB8 - .asciz "\x1b[36m 出戻りタロン \n\x1b[m" - .balign 4 - -glabel D_80B16ED0 - .asciz "\x1b[36m 夜はいない \n\x1b[m" - .balign 4 - -glabel D_80B16EE8 - .asciz "\x1b[36m その他のタロン \n\x1b[m" - .balign 4 - -glabel D_80B16F04 - .asciz "\x1b[36m ロンロン牧場の倉庫 の タロン\n\x1b[m" - .balign 4 - -.text -glabel EnTa_Init -/* 000E8 80B13B88 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 000EC 80B13B8C AFB00030 */ sw $s0, 0x0030($sp) -/* 000F0 80B13B90 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 000F4 80B13B94 AFBF0034 */ sw $ra, 0x0034($sp) -/* 000F8 80B13B98 AFA50054 */ sw $a1, 0x0054($sp) -/* 000FC 80B13B9C 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 00100 80B13BA0 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 00104 80B13BA4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00108 80B13BA8 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 0010C 80B13BAC 0C00AC78 */ jal ActorShape_Init - -/* 00110 80B13BB0 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 -/* 00114 80B13BB4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00118 80B13BB8 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 0011C 80B13BBC 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00120 80B13BC0 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 -/* 00124 80B13BC4 260F01F6 */ addiu $t7, $s0, 0x01F6 ## $t7 = 000001F6 -/* 00128 80B13BC8 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 -/* 0012C 80B13BCC AFB80018 */ sw $t8, 0x0018($sp) -/* 00130 80B13BD0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00134 80B13BD4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00138 80B13BD8 24E71C94 */ addiu $a3, $a3, 0x1C94 ## $a3 = 06001C94 -/* 0013C 80B13BDC 24C6B7B8 */ addiu $a2, $a2, 0xB7B8 ## $a2 = 0600B7B8 -/* 00140 80B13BE0 AFA50038 */ sw $a1, 0x0038($sp) -/* 00144 80B13BE4 0C0291BE */ jal SkelAnime_InitFlex -/* 00148 80B13BE8 8FA40054 */ lw $a0, 0x0054($sp) -/* 0014C 80B13BEC 26050264 */ addiu $a1, $s0, 0x0264 ## $a1 = 00000264 -/* 00150 80B13BF0 AFA5003C */ sw $a1, 0x003C($sp) -/* 00154 80B13BF4 0C0170D9 */ jal Collider_InitCylinder - -/* 00158 80B13BF8 8FA40054 */ lw $a0, 0x0054($sp) -/* 0015C 80B13BFC 3C0780B1 */ lui $a3, %hi(D_80B16E50) ## $a3 = 80B10000 -/* 00160 80B13C00 8FA5003C */ lw $a1, 0x003C($sp) -/* 00164 80B13C04 24E76E50 */ addiu $a3, $a3, %lo(D_80B16E50) ## $a3 = 80B16E50 -/* 00168 80B13C08 8FA40054 */ lw $a0, 0x0054($sp) -/* 0016C 80B13C0C 0C01712B */ jal Collider_SetCylinder - -/* 00170 80B13C10 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00174 80B13C14 3C0980B1 */ lui $t1, %hi(func_80B166CC) ## $t1 = 80B10000 -/* 00178 80B13C18 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 0017C 80B13C1C 24080014 */ addiu $t0, $zero, 0x0014 ## $t0 = 00000014 -/* 00180 80B13C20 252966CC */ addiu $t1, $t1, %lo(func_80B166CC) ## $t1 = 80B166CC -/* 00184 80B13C24 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 00188 80B13C28 A21900AE */ sb $t9, 0x00AE($s0) ## 000000AE -/* 0018C 80B13C2C A60002E0 */ sh $zero, 0x02E0($s0) ## 000002E0 -/* 00190 80B13C30 A60002CE */ sh $zero, 0x02CE($s0) ## 000002CE -/* 00194 80B13C34 A60002E2 */ sh $zero, 0x02E2($s0) ## 000002E2 -/* 00198 80B13C38 A60802B6 */ sh $t0, 0x02B6($s0) ## 000002B6 -/* 0019C 80B13C3C AE0902B0 */ sw $t1, 0x02B0($s0) ## 000002B0 -/* 001A0 80B13C40 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 001A4 80B13C44 0C00B58B */ jal Actor_SetScale - -/* 001A8 80B13C48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001AC 80B13C4C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 001B0 80B13C50 44810000 */ mtc1 $at, $f0 ## $f0 = -4.00 -/* 001B4 80B13C54 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 001B8 80B13C58 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 001BC 80B13C5C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 001C0 80B13C60 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 -/* 001C4 80B13C64 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 001C8 80B13C68 A20A001F */ sb $t2, 0x001F($s0) ## 0000001F -/* 001CC 80B13C6C E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 -/* 001D0 80B13C70 E6000070 */ swc1 $f0, 0x0070($s0) ## 00000070 -/* 001D4 80B13C74 10410006 */ beq $v0, $at, .L80B13C90 -/* 001D8 80B13C78 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 001DC 80B13C7C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 001E0 80B13C80 1041003B */ beq $v0, $at, .L80B13D70 -/* 001E4 80B13C84 3C0480B1 */ lui $a0, %hi(D_80B16EB8) ## $a0 = 80B10000 -/* 001E8 80B13C88 10000069 */ beq $zero, $zero, .L80B13E30 -/* 001EC 80B13C8C 3C0480B1 */ lui $a0, %hi(D_80B16EE8) ## $a0 = 80B10000 -.L80B13C90: -/* 001F0 80B13C90 3C0480B1 */ lui $a0, %hi(D_80B16EA0) ## $a0 = 80B10000 -/* 001F4 80B13C94 0C00084C */ jal osSyncPrintf - -/* 001F8 80B13C98 24846EA0 */ addiu $a0, $a0, %lo(D_80B16EA0) ## $a0 = 80B16EA0 -/* 001FC 80B13C9C 3C028016 */ lui $v0, %hi(gSaveContext+0xee0) -/* 00200 80B13CA0 9442F540 */ lhu $v0, %lo(gSaveContext+0xee0)($v0) -/* 00204 80B13CA4 3C0C8016 */ lui $t4, %hi(gSaveContext+4) -/* 00208 80B13CA8 304B0800 */ andi $t3, $v0, 0x0800 ## $t3 = 00000000 -/* 0020C 80B13CAC 11600005 */ beq $t3, $zero, .L80B13CC4 -/* 00210 80B13CB0 00000000 */ nop -/* 00214 80B13CB4 0C00B55C */ jal Actor_Kill - -/* 00218 80B13CB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0021C 80B13CBC 1000015E */ beq $zero, $zero, .L80B14238 -/* 00220 80B13CC0 8FBF0034 */ lw $ra, 0x0034($sp) -.L80B13CC4: -/* 00224 80B13CC4 8D8CE664 */ lw $t4, %lo(gSaveContext+4)($t4) -/* 00228 80B13CC8 304D0400 */ andi $t5, $v0, 0x0400 ## $t5 = 00000000 -/* 0022C 80B13CCC 11800005 */ beq $t4, $zero, .L80B13CE4 -/* 00230 80B13CD0 00000000 */ nop -/* 00234 80B13CD4 0C00B55C */ jal Actor_Kill - -/* 00238 80B13CD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0023C 80B13CDC 10000156 */ beq $zero, $zero, .L80B14238 -/* 00240 80B13CE0 8FBF0034 */ lw $ra, 0x0034($sp) -.L80B13CE4: -/* 00244 80B13CE4 11A00010 */ beq $t5, $zero, .L80B13D28 -/* 00248 80B13CE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0024C 80B13CEC 3C0580B1 */ lui $a1, %hi(func_80B14CAC) ## $a1 = 80B10000 -/* 00250 80B13CF0 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 -/* 00254 80B13CF4 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 -/* 00258 80B13CF8 24A54CAC */ addiu $a1, $a1, %lo(func_80B14CAC) ## $a1 = 80B14CAC -/* 0025C 80B13CFC 0C2C4EA8 */ jal func_80B13AA0 -/* 00260 80B13D00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00264 80B13D04 A60002B4 */ sh $zero, 0x02B4($s0) ## 000002B4 -/* 00268 80B13D08 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0026C 80B13D0C 24A51C94 */ addiu $a1, $a1, 0x1C94 ## $a1 = 06001C94 -/* 00270 80B13D10 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop -/* 00274 80B13D14 8FA40038 */ lw $a0, 0x0038($sp) -/* 00278 80B13D18 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 0027C 80B13D1C 25CE1C94 */ addiu $t6, $t6, 0x1C94 ## $t6 = 06001C94 -/* 00280 80B13D20 10000144 */ beq $zero, $zero, .L80B14234 -/* 00284 80B13D24 AE0E02E4 */ sw $t6, 0x02E4($s0) ## 000002E4 -.L80B13D28: -/* 00288 80B13D28 3C0580B1 */ lui $a1, %hi(func_80B14754) ## $a1 = 80B10000 -/* 0028C 80B13D2C 3C0680B1 */ lui $a2, %hi(func_80B167FC) ## $a2 = 80B10000 -/* 00290 80B13D30 24C667FC */ addiu $a2, $a2, %lo(func_80B167FC) ## $a2 = 80B167FC -/* 00294 80B13D34 0C2C4EA8 */ jal func_80B13AA0 -/* 00298 80B13D38 24A54754 */ addiu $a1, $a1, %lo(func_80B14754) ## $a1 = 80B14754 -/* 0029C 80B13D3C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 002A0 80B13D40 A60F02B4 */ sh $t7, 0x02B4($s0) ## 000002B4 -/* 002A4 80B13D44 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 002A8 80B13D48 24A5CD50 */ addiu $a1, $a1, 0xCD50 ## $a1 = 0600CD50 -/* 002AC 80B13D4C 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop -/* 002B0 80B13D50 8FA40038 */ lw $a0, 0x0038($sp) -/* 002B4 80B13D54 3C014258 */ lui $at, 0x4258 ## $at = 42580000 -/* 002B8 80B13D58 44813000 */ mtc1 $at, $f6 ## $f6 = 54.00 -/* 002BC 80B13D5C 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 -/* 002C0 80B13D60 2718CD50 */ addiu $t8, $t8, 0xCD50 ## $t8 = 0600CD50 -/* 002C4 80B13D64 AE1802E4 */ sw $t8, 0x02E4($s0) ## 000002E4 -/* 002C8 80B13D68 10000132 */ beq $zero, $zero, .L80B14234 -/* 002CC 80B13D6C E60600C4 */ swc1 $f6, 0x00C4($s0) ## 000000C4 -.L80B13D70: -/* 002D0 80B13D70 0C00084C */ jal osSyncPrintf - -/* 002D4 80B13D74 24846EB8 */ addiu $a0, $a0, %lo(D_80B16EB8) ## $a0 = 00006EB8 -/* 002D8 80B13D78 3C028016 */ lui $v0, %hi(gSaveContext) -/* 002DC 80B13D7C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 002E0 80B13D80 94590EE0 */ lhu $t9, 0x0EE0($v0) ## 8015F540 -/* 002E4 80B13D84 33280800 */ andi $t0, $t9, 0x0800 ## $t0 = 00000000 -/* 002E8 80B13D88 55000006 */ bnel $t0, $zero, .L80B13DA4 -/* 002EC 80B13D8C 8C490004 */ lw $t1, 0x0004($v0) ## 8015E664 -/* 002F0 80B13D90 0C00B55C */ jal Actor_Kill - -/* 002F4 80B13D94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002F8 80B13D98 10000127 */ beq $zero, $zero, .L80B14238 -/* 002FC 80B13D9C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00300 80B13DA0 8C490004 */ lw $t1, 0x0004($v0) ## 00000004 -.L80B13DA4: -/* 00304 80B13DA4 8FAA0054 */ lw $t2, 0x0054($sp) -/* 00308 80B13DA8 51200006 */ beql $t1, $zero, .L80B13DC4 -/* 0030C 80B13DAC 854B00A4 */ lh $t3, 0x00A4($t2) ## 000000A4 -/* 00310 80B13DB0 0C00B55C */ jal Actor_Kill - -/* 00314 80B13DB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00318 80B13DB8 1000011F */ beq $zero, $zero, .L80B14238 -/* 0031C 80B13DBC 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00320 80B13DC0 854B00A4 */ lh $t3, 0x00A4($t2) ## 000000A4 -.L80B13DC4: -/* 00324 80B13DC4 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 -/* 00328 80B13DC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0032C 80B13DCC 1561000B */ bne $t3, $at, .L80B13DFC -/* 00330 80B13DD0 3C0580B1 */ lui $a1, %hi(func_80B14D98) ## $a1 = 80B10000 -/* 00334 80B13DD4 8C4C0010 */ lw $t4, 0x0010($v0) ## 00000010 -/* 00338 80B13DD8 11800008 */ beq $t4, $zero, .L80B13DFC -/* 0033C 80B13DDC 00000000 */ nop -/* 00340 80B13DE0 0C00B55C */ jal Actor_Kill - -/* 00344 80B13DE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00348 80B13DE8 3C0480B1 */ lui $a0, %hi(D_80B16ED0) ## $a0 = 80B10000 -/* 0034C 80B13DEC 0C00084C */ jal osSyncPrintf - -/* 00350 80B13DF0 24846ED0 */ addiu $a0, $a0, %lo(D_80B16ED0) ## $a0 = 80B16ED0 -/* 00354 80B13DF4 10000110 */ beq $zero, $zero, .L80B14238 -/* 00358 80B13DF8 8FBF0034 */ lw $ra, 0x0034($sp) -.L80B13DFC: -/* 0035C 80B13DFC 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 -/* 00360 80B13E00 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 -/* 00364 80B13E04 0C2C4EA8 */ jal func_80B13AA0 -/* 00368 80B13E08 24A54D98 */ addiu $a1, $a1, %lo(func_80B14D98) ## $a1 = 00004D98 -/* 0036C 80B13E0C A60002B4 */ sh $zero, 0x02B4($s0) ## 000002B4 -/* 00370 80B13E10 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00374 80B13E14 24A51C94 */ addiu $a1, $a1, 0x1C94 ## $a1 = 06001C94 -/* 00378 80B13E18 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop -/* 0037C 80B13E1C 8FA40038 */ lw $a0, 0x0038($sp) -/* 00380 80B13E20 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 00384 80B13E24 25AD1C94 */ addiu $t5, $t5, 0x1C94 ## $t5 = 06001C94 -/* 00388 80B13E28 10000102 */ beq $zero, $zero, .L80B14234 -/* 0038C 80B13E2C AE0D02E4 */ sw $t5, 0x02E4($s0) ## 000002E4 -.L80B13E30: -/* 00390 80B13E30 0C00084C */ jal osSyncPrintf - -/* 00394 80B13E34 24846EE8 */ addiu $a0, $a0, %lo(D_80B16EE8) ## $a0 = 00006EE8 -/* 00398 80B13E38 8FA30054 */ lw $v1, 0x0054($sp) -/* 0039C 80B13E3C 2401005F */ addiu $at, $zero, 0x005F ## $at = 0000005F -/* 003A0 80B13E40 846200A4 */ lh $v0, 0x00A4($v1) ## 000000A4 -/* 003A4 80B13E44 5441002E */ bnel $v0, $at, .L80B13F00 -/* 003A8 80B13E48 2401004C */ addiu $at, $zero, 0x004C ## $at = 0000004C -/* 003AC 80B13E4C 3C028016 */ lui $v0, %hi(gSaveContext+0xed6) -/* 003B0 80B13E50 9442F536 */ lhu $v0, %lo(gSaveContext+0xed6)($v0) -/* 003B4 80B13E54 304E0010 */ andi $t6, $v0, 0x0010 ## $t6 = 00000000 -/* 003B8 80B13E58 11C00005 */ beq $t6, $zero, .L80B13E70 -/* 003BC 80B13E5C 304F0008 */ andi $t7, $v0, 0x0008 ## $t7 = 00000000 -/* 003C0 80B13E60 0C00B55C */ jal Actor_Kill - -/* 003C4 80B13E64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003C8 80B13E68 100000F3 */ beq $zero, $zero, .L80B14238 -/* 003CC 80B13E6C 8FBF0034 */ lw $ra, 0x0034($sp) -.L80B13E70: -/* 003D0 80B13E70 11E00010 */ beq $t7, $zero, .L80B13EB4 -/* 003D4 80B13E74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003D8 80B13E78 3C0580B1 */ lui $a1, %hi(func_80B14C18) ## $a1 = 80B10000 -/* 003DC 80B13E7C 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 -/* 003E0 80B13E80 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 -/* 003E4 80B13E84 24A54C18 */ addiu $a1, $a1, %lo(func_80B14C18) ## $a1 = 80B14C18 -/* 003E8 80B13E88 0C2C4EA8 */ jal func_80B13AA0 -/* 003EC 80B13E8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003F0 80B13E90 A60002B4 */ sh $zero, 0x02B4($s0) ## 000002B4 -/* 003F4 80B13E94 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 003F8 80B13E98 24A51C94 */ addiu $a1, $a1, 0x1C94 ## $a1 = 06001C94 -/* 003FC 80B13E9C 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop -/* 00400 80B13EA0 8FA40038 */ lw $a0, 0x0038($sp) -/* 00404 80B13EA4 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 -/* 00408 80B13EA8 27181C94 */ addiu $t8, $t8, 0x1C94 ## $t8 = 06001C94 -/* 0040C 80B13EAC 100000E1 */ beq $zero, $zero, .L80B14234 -/* 00410 80B13EB0 AE1802E4 */ sw $t8, 0x02E4($s0) ## 000002E4 -.L80B13EB4: -/* 00414 80B13EB4 3C0580B1 */ lui $a1, %hi(func_80B14634) ## $a1 = 80B10000 -/* 00418 80B13EB8 3C0680B1 */ lui $a2, %hi(func_80B167FC) ## $a2 = 80B10000 -/* 0041C 80B13EBC 24C667FC */ addiu $a2, $a2, %lo(func_80B167FC) ## $a2 = 80B167FC -/* 00420 80B13EC0 0C2C4EA8 */ jal func_80B13AA0 -/* 00424 80B13EC4 24A54634 */ addiu $a1, $a1, %lo(func_80B14634) ## $a1 = 80B14634 -/* 00428 80B13EC8 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 0042C 80B13ECC A61902B4 */ sh $t9, 0x02B4($s0) ## 000002B4 -/* 00430 80B13ED0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00434 80B13ED4 24A5CD50 */ addiu $a1, $a1, 0xCD50 ## $a1 = 0600CD50 -/* 00438 80B13ED8 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop -/* 0043C 80B13EDC 8FA40038 */ lw $a0, 0x0038($sp) -/* 00440 80B13EE0 3C014258 */ lui $at, 0x4258 ## $at = 42580000 -/* 00444 80B13EE4 44814000 */ mtc1 $at, $f8 ## $f8 = 54.00 -/* 00448 80B13EE8 3C080601 */ lui $t0, 0x0601 ## $t0 = 06010000 -/* 0044C 80B13EEC 2508CD50 */ addiu $t0, $t0, 0xCD50 ## $t0 = 0600CD50 -/* 00450 80B13EF0 AE0802E4 */ sw $t0, 0x02E4($s0) ## 000002E4 -/* 00454 80B13EF4 100000CF */ beq $zero, $zero, .L80B14234 -/* 00458 80B13EF8 E60800C4 */ swc1 $f8, 0x00C4($s0) ## 000000C4 -/* 0045C 80B13EFC 2401004C */ addiu $at, $zero, 0x004C ## $at = 0000004C -.L80B13F00: -/* 00460 80B13F00 144100BB */ bne $v0, $at, .L80B141F0 -/* 00464 80B13F04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00468 80B13F08 3C0480B1 */ lui $a0, %hi(D_80B16F04) ## $a0 = 80B10000 -/* 0046C 80B13F0C 0C00084C */ jal osSyncPrintf - -/* 00470 80B13F10 24846F04 */ addiu $a0, $a0, %lo(D_80B16F04) ## $a0 = 80B16F04 -/* 00474 80B13F14 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00478 80B13F18 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 0047C 80B13F1C 94690ED6 */ lhu $t1, 0x0ED6($v1) ## 8015F536 -/* 00480 80B13F20 312A0010 */ andi $t2, $t1, 0x0010 ## $t2 = 00000000 -/* 00484 80B13F24 55400006 */ bnel $t2, $zero, .L80B13F40 -/* 00488 80B13F28 8C6B0004 */ lw $t3, 0x0004($v1) ## 8015E664 -/* 0048C 80B13F2C 0C00B55C */ jal Actor_Kill - -/* 00490 80B13F30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00494 80B13F34 100000C0 */ beq $zero, $zero, .L80B14238 -/* 00498 80B13F38 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0049C 80B13F3C 8C6B0004 */ lw $t3, 0x0004($v1) ## 00000004 -.L80B13F40: -/* 004A0 80B13F40 55600006 */ bnel $t3, $zero, .L80B13F5C -/* 004A4 80B13F44 8C6C0010 */ lw $t4, 0x0010($v1) ## 00000010 -/* 004A8 80B13F48 0C00B55C */ jal Actor_Kill - -/* 004AC 80B13F4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004B0 80B13F50 100000B9 */ beq $zero, $zero, .L80B14238 -/* 004B4 80B13F54 8FBF0034 */ lw $ra, 0x0034($sp) -/* 004B8 80B13F58 8C6C0010 */ lw $t4, 0x0010($v1) ## 00000010 -.L80B13F5C: -/* 004BC 80B13F5C 3C0580B1 */ lui $a1, %hi(func_80B146F8) ## $a1 = 80B10000 -/* 004C0 80B13F60 24A546F8 */ addiu $a1, $a1, %lo(func_80B146F8) ## $a1 = 80B146F8 -/* 004C4 80B13F64 15800092 */ bne $t4, $zero, .L80B141B0 -/* 004C8 80B13F68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004CC 80B13F6C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 004D0 80B13F70 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 -/* 004D4 80B13F74 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 004D8 80B13F78 8FA50054 */ lw $a1, 0x0054($sp) -/* 004DC 80B13F7C 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 -/* 004E0 80B13F80 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 004E4 80B13F84 240F0007 */ addiu $t7, $zero, 0x0007 ## $t7 = 00000007 -/* 004E8 80B13F88 A60F02C8 */ sh $t7, 0x02C8($s0) ## 000002C8 -/* 004EC 80B13F8C 8E0D0004 */ lw $t5, 0x0004($s0) ## 00000004 -/* 004F0 80B13F90 860202C8 */ lh $v0, 0x02C8($s0) ## 000002C8 -/* 004F4 80B13F94 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 004F8 80B13F98 46062200 */ add.s $f8, $f4, $f6 -/* 004FC 80B13F9C 35AE0010 */ ori $t6, $t5, 0x0010 ## $t6 = 00000010 -/* 00500 80B13FA0 AE0E0004 */ sw $t6, 0x0004($s0) ## 00000004 -/* 00504 80B13FA4 46105480 */ add.s $f18, $f10, $f16 -/* 00508 80B13FA8 A60202C6 */ sh $v0, 0x02C6($s0) ## 000002C6 -/* 0050C 80B13FAC A60202C4 */ sh $v0, 0x02C4($s0) ## 000002C4 -/* 00510 80B13FB0 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 00514 80B13FB4 3C0141D0 */ lui $at, 0x41D0 ## $at = 41D00000 -/* 00518 80B13FB8 44818000 */ mtc1 $at, $f16 ## $f16 = 26.00 -/* 0051C 80B13FBC C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 00520 80B13FC0 44079000 */ mfc1 $a3, $f18 -/* 00524 80B13FC4 2418000D */ addiu $t8, $zero, 0x000D ## $t8 = 0000000D -/* 00528 80B13FC8 46105480 */ add.s $f18, $f10, $f16 -/* 0052C 80B13FCC 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 80B1631C -/* 00530 80B13FD0 AFA4003C */ sw $a0, 0x003C($sp) -/* 00534 80B13FD4 AFB80024 */ sw $t8, 0x0024($sp) -/* 00538 80B13FD8 E7B20014 */ swc1 $f18, 0x0014($sp) -/* 0053C 80B13FDC AFA00020 */ sw $zero, 0x0020($sp) -/* 00540 80B13FE0 AFA0001C */ sw $zero, 0x001C($sp) -/* 00544 80B13FE4 AFA00018 */ sw $zero, 0x0018($sp) -/* 00548 80B13FE8 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 0054C 80B13FEC 24060019 */ addiu $a2, $zero, 0x0019 ## $a2 = 00000019 -/* 00550 80B13FF0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00554 80B13FF4 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 -/* 00558 80B13FF8 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 0055C 80B13FFC 44818000 */ mtc1 $at, $f16 ## $f16 = 40.00 -/* 00560 80B14000 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 00564 80B14004 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 00568 80B14008 8FA50054 */ lw $a1, 0x0054($sp) -/* 0056C 80B1400C 46105480 */ add.s $f18, $f10, $f16 -/* 00570 80B14010 AE0202B8 */ sw $v0, 0x02B8($s0) ## 000002B8 -/* 00574 80B14014 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00578 80B14018 46062201 */ sub.s $f8, $f4, $f6 -/* 0057C 80B1401C E7B20010 */ swc1 $f18, 0x0010($sp) -/* 00580 80B14020 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 00584 80B14024 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 -/* 00588 80B14028 44074000 */ mfc1 $a3, $f8 -/* 0058C 80B1402C 2419000D */ addiu $t9, $zero, 0x000D ## $t9 = 0000000D -/* 00590 80B14030 46062201 */ sub.s $f8, $f4, $f6 -/* 00594 80B14034 AFB90024 */ sw $t9, 0x0024($sp) -/* 00598 80B14038 AFA00020 */ sw $zero, 0x0020($sp) -/* 0059C 80B1403C AFA0001C */ sw $zero, 0x001C($sp) -/* 005A0 80B14040 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 005A4 80B14044 AFA00018 */ sw $zero, 0x0018($sp) -/* 005A8 80B14048 8FA4003C */ lw $a0, 0x003C($sp) -/* 005AC 80B1404C 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 005B0 80B14050 24060019 */ addiu $a2, $zero, 0x0019 ## $a2 = 00000019 -/* 005B4 80B14054 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 005B8 80B14058 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 -/* 005BC 80B1405C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 005C0 80B14060 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 -/* 005C4 80B14064 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 005C8 80B14068 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 005CC 80B1406C 8FA50054 */ lw $a1, 0x0054($sp) -/* 005D0 80B14070 46062200 */ add.s $f8, $f4, $f6 -/* 005D4 80B14074 AE0202BC */ sw $v0, 0x02BC($s0) ## 000002BC -/* 005D8 80B14078 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 005DC 80B1407C 46105480 */ add.s $f18, $f10, $f16 -/* 005E0 80B14080 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 005E4 80B14084 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 005E8 80B14088 44818000 */ mtc1 $at, $f16 ## $f16 = 30.00 -/* 005EC 80B1408C 44079000 */ mfc1 $a3, $f18 -/* 005F0 80B14090 2408000D */ addiu $t0, $zero, 0x000D ## $t0 = 0000000D -/* 005F4 80B14094 46105481 */ sub.s $f18, $f10, $f16 -/* 005F8 80B14098 AFA80024 */ sw $t0, 0x0024($sp) -/* 005FC 80B1409C AFA00020 */ sw $zero, 0x0020($sp) -/* 00600 80B140A0 AFA0001C */ sw $zero, 0x001C($sp) -/* 00604 80B140A4 E7B20014 */ swc1 $f18, 0x0014($sp) -/* 00608 80B140A8 AFA00018 */ sw $zero, 0x0018($sp) -/* 0060C 80B140AC 8FA4003C */ lw $a0, 0x003C($sp) -/* 00610 80B140B0 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 00614 80B140B4 24060019 */ addiu $a2, $zero, 0x0019 ## $a2 = 00000019 -/* 00618 80B140B8 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 -/* 0061C 80B140BC 8FA50054 */ lw $a1, 0x0054($sp) -/* 00620 80B140C0 0C2C4EAB */ jal func_80B13AAC -/* 00624 80B140C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00628 80B140C8 3C098016 */ lui $t1, %hi(gSaveContext+0x13fa) -/* 0062C 80B140CC 9529FA5A */ lhu $t1, %lo(gSaveContext+0x13fa)($t1) -/* 00630 80B140D0 3C0580B1 */ lui $a1, %hi(func_80B16608) ## $a1 = 80B10000 -/* 00634 80B140D4 24A56608 */ addiu $a1, $a1, %lo(func_80B16608) ## $a1 = 80B16608 -/* 00638 80B140D8 312A0400 */ andi $t2, $t1, 0x0400 ## $t2 = 00000000 -/* 0063C 80B140DC 11400025 */ beq $t2, $zero, .L80B14174 -/* 00640 80B140E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00644 80B140E4 3C0680B1 */ lui $a2, %hi(func_80B16938) ## $a2 = 80B10000 -/* 00648 80B140E8 0C2C4EA8 */ jal func_80B13AA0 -/* 0064C 80B140EC 24C66938 */ addiu $a2, $a2, %lo(func_80B16938) ## $a2 = 80B16938 -/* 00650 80B140F0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00654 80B140F4 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00658 80B140F8 2484C48C */ addiu $a0, $a0, 0xC48C ## $a0 = 0600C48C -/* 0065C 80B140FC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00660 80B14100 2484C48C */ addiu $a0, $a0, 0xC48C ## $a0 = 0600C48C -/* 00664 80B14104 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00668 80B14108 A7A20040 */ sh $v0, 0x0040($sp) -/* 0066C 80B1410C 87AB0040 */ lh $t3, 0x0040($sp) -/* 00670 80B14110 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00674 80B14114 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00678 80B14118 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 -/* 0067C 80B1411C 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 00680 80B14120 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 00684 80B14124 468021A0 */ cvt.s.w $f6, $f4 -/* 00688 80B14128 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 0068C 80B1412C 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 00690 80B14130 44060000 */ mfc1 $a2, $f0 -/* 00694 80B14134 AFAC0014 */ sw $t4, 0x0014($sp) -/* 00698 80B14138 46805420 */ cvt.s.w $f16, $f10 -/* 0069C 80B1413C 24A5C48C */ addiu $a1, $a1, 0xC48C ## $a1 = 0600C48C -/* 006A0 80B14140 8FA40038 */ lw $a0, 0x0038($sp) -/* 006A4 80B14144 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 006A8 80B14148 46003201 */ sub.s $f8, $f6, $f0 -/* 006AC 80B1414C E7B00010 */ swc1 $f16, 0x0010($sp) -/* 006B0 80B14150 44074000 */ mfc1 $a3, $f8 -/* 006B4 80B14154 0C029468 */ jal SkelAnime_ChangeAnim - -/* 006B8 80B14158 00000000 */ nop -/* 006BC 80B1415C 3C028016 */ lui $v0, %hi(gSaveContext) -/* 006C0 80B14160 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 006C4 80B14164 944D13FA */ lhu $t5, 0x13FA($v0) ## 8015FA5A -/* 006C8 80B14168 31AEFBFF */ andi $t6, $t5, 0xFBFF ## $t6 = 00000000 -/* 006CC 80B1416C 10000031 */ beq $zero, $zero, .L80B14234 -/* 006D0 80B14170 A44E13FA */ sh $t6, 0x13FA($v0) ## 8015FA5A -.L80B14174: -/* 006D4 80B14174 3C0580B1 */ lui $a1, %hi(func_80B16504) ## $a1 = 80B10000 -/* 006D8 80B14178 3C0680B1 */ lui $a2, %hi(func_80B16854) ## $a2 = 80B10000 -/* 006DC 80B1417C 24C66854 */ addiu $a2, $a2, %lo(func_80B16854) ## $a2 = 80B16854 -/* 006E0 80B14180 24A56504 */ addiu $a1, $a1, %lo(func_80B16504) ## $a1 = 80B16504 -/* 006E4 80B14184 0C2C4EA8 */ jal func_80B13AA0 -/* 006E8 80B14188 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006EC 80B1418C A60002B4 */ sh $zero, 0x02B4($s0) ## 000002B4 -/* 006F0 80B14190 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 006F4 80B14194 24A517E8 */ addiu $a1, $a1, 0x17E8 ## $a1 = 060017E8 -/* 006F8 80B14198 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop -/* 006FC 80B1419C 8FA40038 */ lw $a0, 0x0038($sp) -/* 00700 80B141A0 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 -/* 00704 80B141A4 25EF17E8 */ addiu $t7, $t7, 0x17E8 ## $t7 = 060017E8 -/* 00708 80B141A8 10000022 */ beq $zero, $zero, .L80B14234 -/* 0070C 80B141AC AE0F02E4 */ sw $t7, 0x02E4($s0) ## 000002E4 -.L80B141B0: -/* 00710 80B141B0 3C0680B1 */ lui $a2, %hi(func_80B167FC) ## $a2 = 80B10000 -/* 00714 80B141B4 0C2C4EA8 */ jal func_80B13AA0 -/* 00718 80B141B8 24C667FC */ addiu $a2, $a2, %lo(func_80B167FC) ## $a2 = 80B167FC -/* 0071C 80B141BC 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00720 80B141C0 A61802B4 */ sh $t8, 0x02B4($s0) ## 000002B4 -/* 00724 80B141C4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00728 80B141C8 24A5CD50 */ addiu $a1, $a1, 0xCD50 ## $a1 = 0600CD50 -/* 0072C 80B141CC 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop -/* 00730 80B141D0 8FA40038 */ lw $a0, 0x0038($sp) -/* 00734 80B141D4 3C014258 */ lui $at, 0x4258 ## $at = 42580000 -/* 00738 80B141D8 44812000 */ mtc1 $at, $f4 ## $f4 = 54.00 -/* 0073C 80B141DC 3C190601 */ lui $t9, 0x0601 ## $t9 = 06010000 -/* 00740 80B141E0 2739CD50 */ addiu $t9, $t9, 0xCD50 ## $t9 = 0600CD50 -/* 00744 80B141E4 AE1902E4 */ sw $t9, 0x02E4($s0) ## 000002E4 -/* 00748 80B141E8 10000012 */ beq $zero, $zero, .L80B14234 -/* 0074C 80B141EC E60400C4 */ swc1 $f4, 0x00C4($s0) ## 000000C4 -.L80B141F0: -/* 00750 80B141F0 3C0580B1 */ lui $a1, %hi(func_80B14634) ## $a1 = 80B10000 -/* 00754 80B141F4 3C0680B1 */ lui $a2, %hi(func_80B167FC) ## $a2 = 80B10000 -/* 00758 80B141F8 24C667FC */ addiu $a2, $a2, %lo(func_80B167FC) ## $a2 = 80B167FC -/* 0075C 80B141FC 0C2C4EA8 */ jal func_80B13AA0 -/* 00760 80B14200 24A54634 */ addiu $a1, $a1, %lo(func_80B14634) ## $a1 = 80B14634 -/* 00764 80B14204 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 00768 80B14208 A60802B4 */ sh $t0, 0x02B4($s0) ## 000002B4 -/* 0076C 80B1420C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00770 80B14210 24A5CD50 */ addiu $a1, $a1, 0xCD50 ## $a1 = 0600CD50 -/* 00774 80B14214 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop -/* 00778 80B14218 8FA40038 */ lw $a0, 0x0038($sp) -/* 0077C 80B1421C 3C014258 */ lui $at, 0x4258 ## $at = 42580000 -/* 00780 80B14220 44813000 */ mtc1 $at, $f6 ## $f6 = 54.00 -/* 00784 80B14224 3C090601 */ lui $t1, 0x0601 ## $t1 = 06010000 -/* 00788 80B14228 2529CD50 */ addiu $t1, $t1, 0xCD50 ## $t1 = 0600CD50 -/* 0078C 80B1422C AE0902E4 */ sw $t1, 0x02E4($s0) ## 000002E4 -/* 00790 80B14230 E60600C4 */ swc1 $f6, 0x00C4($s0) ## 000000C4 -.L80B14234: -/* 00794 80B14234 8FBF0034 */ lw $ra, 0x0034($sp) -.L80B14238: -/* 00798 80B14238 8FB00030 */ lw $s0, 0x0030($sp) -/* 0079C 80B1423C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 007A0 80B14240 03E00008 */ jr $ra -/* 007A4 80B14244 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Update.s deleted file mode 100644 index 9229091134..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Update.s +++ /dev/null @@ -1,111 +0,0 @@ -glabel EnTa_Update -/* 02EF0 80B16990 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 02EF4 80B16994 AFB00028 */ sw $s0, 0x0028($sp) -/* 02EF8 80B16998 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02EFC 80B1699C AFBF002C */ sw $ra, 0x002C($sp) -/* 02F00 80B169A0 AFA50044 */ sw $a1, 0x0044($sp) -/* 02F04 80B169A4 26060264 */ addiu $a2, $s0, 0x0264 ## $a2 = 00000264 -/* 02F08 80B169A8 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000264 -/* 02F0C 80B169AC 0C0189B7 */ jal Collider_CylinderUpdate - -/* 02F10 80B169B0 AFA60034 */ sw $a2, 0x0034($sp) -/* 02F14 80B169B4 8FA40044 */ lw $a0, 0x0044($sp) -/* 02F18 80B169B8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02F1C 80B169BC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 02F20 80B169C0 8FA60034 */ lw $a2, 0x0034($sp) -/* 02F24 80B169C4 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 02F28 80B169C8 00812821 */ addu $a1, $a0, $at -/* 02F2C 80B169CC 0C00B638 */ jal Actor_MoveForward - -/* 02F30 80B169D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02F34 80B169D4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 02F38 80B169D8 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 02F3C 80B169DC AFAE0014 */ sw $t6, 0x0014($sp) -/* 02F40 80B169E0 44060000 */ mfc1 $a2, $f0 -/* 02F44 80B169E4 44070000 */ mfc1 $a3, $f0 -/* 02F48 80B169E8 8FA40044 */ lw $a0, 0x0044($sp) -/* 02F4C 80B169EC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02F50 80B169F0 0C00B92D */ jal func_8002E4B4 -/* 02F54 80B169F4 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 02F58 80B169F8 8E190260 */ lw $t9, 0x0260($s0) ## 00000260 -/* 02F5C 80B169FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02F60 80B16A00 0320F809 */ jalr $ra, $t9 -/* 02F64 80B16A04 00000000 */ nop -/* 02F68 80B16A08 8E19025C */ lw $t9, 0x025C($s0) ## 0000025C -/* 02F6C 80B16A0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02F70 80B16A10 8FA50044 */ lw $a1, 0x0044($sp) -/* 02F74 80B16A14 0320F809 */ jalr $ra, $t9 -/* 02F78 80B16A18 00000000 */ nop -/* 02F7C 80B16A1C 960202E0 */ lhu $v0, 0x02E0($s0) ## 000002E0 -/* 02F80 80B16A20 304F0004 */ andi $t7, $v0, 0x0004 ## $t7 = 00000000 -/* 02F84 80B16A24 55E00007 */ bnel $t7, $zero, .L80B16A44 -/* 02F88 80B16A28 30580001 */ andi $t8, $v0, 0x0001 ## $t8 = 00000000 -/* 02F8C 80B16A2C 8E1902B0 */ lw $t9, 0x02B0($s0) ## 000002B0 -/* 02F90 80B16A30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02F94 80B16A34 0320F809 */ jalr $ra, $t9 -/* 02F98 80B16A38 00000000 */ nop -/* 02F9C 80B16A3C 960202E0 */ lhu $v0, 0x02E0($s0) ## 000002E0 -/* 02FA0 80B16A40 30580001 */ andi $t8, $v0, 0x0001 ## $t8 = 00000000 -.L80B16A44: -/* 02FA4 80B16A44 1300000E */ beq $t8, $zero, .L80B16A80 -/* 02FA8 80B16A48 260402D4 */ addiu $a0, $s0, 0x02D4 ## $a0 = 000002D4 -/* 02FAC 80B16A4C 8E090038 */ lw $t1, 0x0038($s0) ## 00000038 -/* 02FB0 80B16A50 8FA40044 */ lw $a0, 0x0044($sp) -/* 02FB4 80B16A54 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02FB8 80B16A58 AFA90010 */ sw $t1, 0x0010($sp) -/* 02FBC 80B16A5C 8E08003C */ lw $t0, 0x003C($s0) ## 0000003C -/* 02FC0 80B16A60 260602D4 */ addiu $a2, $s0, 0x02D4 ## $a2 = 000002D4 -/* 02FC4 80B16A64 260702DA */ addiu $a3, $s0, 0x02DA ## $a3 = 000002DA -/* 02FC8 80B16A68 AFA80014 */ sw $t0, 0x0014($sp) -/* 02FCC 80B16A6C 8E090040 */ lw $t1, 0x0040($s0) ## 00000040 -/* 02FD0 80B16A70 0C00E0A4 */ jal func_80038290 -/* 02FD4 80B16A74 AFA90018 */ sw $t1, 0x0018($sp) -/* 02FD8 80B16A78 1000001D */ beq $zero, $zero, .L80B16AF0 -/* 02FDC 80B16A7C 960E02E0 */ lhu $t6, 0x02E0($s0) ## 000002E0 -.L80B16A80: -/* 02FE0 80B16A80 240A0064 */ addiu $t2, $zero, 0x0064 ## $t2 = 00000064 -/* 02FE4 80B16A84 AFAA0010 */ sw $t2, 0x0010($sp) -/* 02FE8 80B16A88 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02FEC 80B16A8C 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 02FF0 80B16A90 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 02FF4 80B16A94 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 02FF8 80B16A98 240B0064 */ addiu $t3, $zero, 0x0064 ## $t3 = 00000064 -/* 02FFC 80B16A9C AFAB0010 */ sw $t3, 0x0010($sp) -/* 03000 80B16AA0 260402D6 */ addiu $a0, $s0, 0x02D6 ## $a0 = 000002D6 -/* 03004 80B16AA4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03008 80B16AA8 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 0300C 80B16AAC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 03010 80B16AB0 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 03014 80B16AB4 240C0064 */ addiu $t4, $zero, 0x0064 ## $t4 = 00000064 -/* 03018 80B16AB8 AFAC0010 */ sw $t4, 0x0010($sp) -/* 0301C 80B16ABC 260402DA */ addiu $a0, $s0, 0x02DA ## $a0 = 000002DA -/* 03020 80B16AC0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03024 80B16AC4 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 03028 80B16AC8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 0302C 80B16ACC 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 03030 80B16AD0 240D0064 */ addiu $t5, $zero, 0x0064 ## $t5 = 00000064 -/* 03034 80B16AD4 AFAD0010 */ sw $t5, 0x0010($sp) -/* 03038 80B16AD8 260402DC */ addiu $a0, $s0, 0x02DC ## $a0 = 000002DC -/* 0303C 80B16ADC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03040 80B16AE0 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 03044 80B16AE4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 03048 80B16AE8 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 0304C 80B16AEC 960E02E0 */ lhu $t6, 0x02E0($s0) ## 000002E0 -.L80B16AF0: -/* 03050 80B16AF0 860202CC */ lh $v0, 0x02CC($s0) ## 000002CC -/* 03054 80B16AF4 31CFFFFA */ andi $t7, $t6, 0xFFFA ## $t7 = 00000000 -/* 03058 80B16AF8 18400003 */ blez $v0, .L80B16B08 -/* 0305C 80B16AFC A60F02E0 */ sh $t7, 0x02E0($s0) ## 000002E0 -/* 03060 80B16B00 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF -/* 03064 80B16B04 A61902CC */ sh $t9, 0x02CC($s0) ## 000002CC -.L80B16B08: -/* 03068 80B16B08 8FBF002C */ lw $ra, 0x002C($sp) -/* 0306C 80B16B0C 8FB00028 */ lw $s0, 0x0028($sp) -/* 03070 80B16B10 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 03074 80B16B14 03E00008 */ jr $ra -/* 03078 80B16B18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AA0.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AA0.s deleted file mode 100644 index 3353dc9179..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AA0.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80B13AA0 -/* 00000 80B13AA0 AC85025C */ sw $a1, 0x025C($a0) ## 0000025C -/* 00004 80B13AA4 03E00008 */ jr $ra -/* 00008 80B13AA8 AC860260 */ sw $a2, 0x0260($a0) ## 00000260 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AAC.s deleted file mode 100644 index 7e95864cf4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AAC.s +++ /dev/null @@ -1,63 +0,0 @@ -glabel func_80B13AAC -/* 0000C 80B13AAC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00010 80B13AB0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00014 80B13AB4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00018 80B13AB8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0001C 80B13ABC 24050018 */ addiu $a1, $zero, 0x0018 ## $a1 = 00000018 -/* 00020 80B13AC0 0C01B0D8 */ jal Text_GetFaceReaction -/* 00024 80B13AC4 AFA60018 */ sw $a2, 0x0018($sp) -/* 00028 80B13AC8 3C048016 */ lui $a0, %hi(gSaveContext) -/* 0002C 80B13ACC 2484E660 */ addiu $a0, %lo(gSaveContext) -/* 00030 80B13AD0 948313FA */ lhu $v1, 0x13FA($a0) ## 8015FA5A -/* 00034 80B13AD4 8FA60018 */ lw $a2, 0x0018($sp) -/* 00038 80B13AD8 306E0400 */ andi $t6, $v1, 0x0400 ## $t6 = 00000000 -/* 0003C 80B13ADC 11C00012 */ beq $t6, $zero, .L80B13B28 -/* 00040 80B13AE0 306F0100 */ andi $t7, $v1, 0x0100 ## $t7 = 00000000 -/* 00044 80B13AE4 11E0000B */ beq $t7, $zero, .L80B13B14 -/* 00048 80B13AE8 240A2085 */ addiu $t2, $zero, 0x2085 ## $t2 = 00002085 -/* 0004C 80B13AEC 94980EF0 */ lhu $t8, 0x0EF0($a0) ## 8015F550 -/* 00050 80B13AF0 24082088 */ addiu $t0, $zero, 0x2088 ## $t0 = 00002088 -/* 00054 80B13AF4 24092086 */ addiu $t1, $zero, 0x2086 ## $t1 = 00002086 -/* 00058 80B13AF8 33190004 */ andi $t9, $t8, 0x0004 ## $t9 = 00000000 -/* 0005C 80B13AFC 13200003 */ beq $t9, $zero, .L80B13B0C -/* 00060 80B13B00 00000000 */ nop -/* 00064 80B13B04 10000004 */ beq $zero, $zero, .L80B13B18 -/* 00068 80B13B08 A4C8010E */ sh $t0, 0x010E($a2) ## 0000010E -.L80B13B0C: -/* 0006C 80B13B0C 10000002 */ beq $zero, $zero, .L80B13B18 -/* 00070 80B13B10 A4C9010E */ sh $t1, 0x010E($a2) ## 0000010E -.L80B13B14: -/* 00074 80B13B14 A4CA010E */ sh $t2, 0x010E($a2) ## 0000010E -.L80B13B18: -/* 00078 80B13B18 948B13FA */ lhu $t3, 0x13FA($a0) ## 8015FA5A -/* 0007C 80B13B1C 316CFEFF */ andi $t4, $t3, 0xFEFF ## $t4 = 00000000 -/* 00080 80B13B20 10000015 */ beq $zero, $zero, .L80B13B78 -/* 00084 80B13B24 A48C13FA */ sh $t4, 0x13FA($a0) ## 8015FA5A -.L80B13B28: -/* 00088 80B13B28 54400013 */ bnel $v0, $zero, .L80B13B78 -/* 0008C 80B13B2C A4C2010E */ sh $v0, 0x010E($a2) ## 0000010E -/* 00090 80B13B30 948D0F06 */ lhu $t5, 0x0F06($a0) ## 8015F566 -/* 00094 80B13B34 2409207E */ addiu $t1, $zero, 0x207E ## $t1 = 0000207E -/* 00098 80B13B38 31AE4000 */ andi $t6, $t5, 0x4000 ## $t6 = 00000000 -/* 0009C 80B13B3C 11C0000B */ beq $t6, $zero, .L80B13B6C -/* 000A0 80B13B40 00000000 */ nop -/* 000A4 80B13B44 948F0EF0 */ lhu $t7, 0x0EF0($a0) ## 8015F550 -/* 000A8 80B13B48 2419208B */ addiu $t9, $zero, 0x208B ## $t9 = 0000208B -/* 000AC 80B13B4C 2408207F */ addiu $t0, $zero, 0x207F ## $t0 = 0000207F -/* 000B0 80B13B50 31F80004 */ andi $t8, $t7, 0x0004 ## $t8 = 00000000 -/* 000B4 80B13B54 13000003 */ beq $t8, $zero, .L80B13B64 -/* 000B8 80B13B58 00000000 */ nop -/* 000BC 80B13B5C 10000006 */ beq $zero, $zero, .L80B13B78 -/* 000C0 80B13B60 A4D9010E */ sh $t9, 0x010E($a2) ## 0000010E -.L80B13B64: -/* 000C4 80B13B64 10000004 */ beq $zero, $zero, .L80B13B78 -/* 000C8 80B13B68 A4C8010E */ sh $t0, 0x010E($a2) ## 0000010E -.L80B13B6C: -/* 000CC 80B13B6C 10000002 */ beq $zero, $zero, .L80B13B78 -/* 000D0 80B13B70 A4C9010E */ sh $t1, 0x010E($a2) ## 0000010E -/* 000D4 80B13B74 A4C2010E */ sh $v0, 0x010E($a2) ## 0000010E -.L80B13B78: -/* 000D8 80B13B78 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000DC 80B13B7C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000E0 80B13B80 03E00008 */ jr $ra -/* 000E4 80B13B84 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14248.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14248.s deleted file mode 100644 index 3d3f066eed..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14248.s +++ /dev/null @@ -1,20 +0,0 @@ -.late_rodata -glabel D_80B16F4C - .float 0.8 - -.text -glabel func_80B14248 -/* 007A8 80B14248 3C014210 */ lui $at, 0x4210 ## $at = 42100000 -/* 007AC 80B1424C 44812000 */ mtc1 $at, $f4 ## $f4 = 36.00 -/* 007B0 80B14250 C48000C4 */ lwc1 $f0, 0x00C4($a0) ## 000000C4 -/* 007B4 80B14254 3C0180B1 */ lui $at, %hi(D_80B16F4C) ## $at = 80B10000 -/* 007B8 80B14258 4600203C */ c.lt.s $f4, $f0 -/* 007BC 80B1425C 00000000 */ nop -/* 007C0 80B14260 45000004 */ bc1f .L80B14274 -/* 007C4 80B14264 00000000 */ nop -/* 007C8 80B14268 C4266F4C */ lwc1 $f6, %lo(D_80B16F4C)($at) -/* 007CC 80B1426C 46060201 */ sub.s $f8, $f0, $f6 -/* 007D0 80B14270 E48800C4 */ swc1 $f8, 0x00C4($a0) ## 000000C4 -.L80B14274: -/* 007D4 80B14274 03E00008 */ jr $ra -/* 007D8 80B14278 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B142F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B142F4.s deleted file mode 100644 index 4721f96a98..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B142F4.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80B142F4 -/* 00854 80B142F4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00858 80B142F8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0085C 80B142FC AFA5001C */ sw $a1, 0x001C($sp) -/* 00860 80B14300 AFA60020 */ sw $a2, 0x0020($sp) -/* 00864 80B14304 0C00BC65 */ jal func_8002F194 -/* 00868 80B14308 AFA40018 */ sw $a0, 0x0018($sp) -/* 0086C 80B1430C 10400003 */ beq $v0, $zero, .L80B1431C -/* 00870 80B14310 8FA40018 */ lw $a0, 0x0018($sp) -/* 00874 80B14314 1000001C */ beq $zero, $zero, .L80B14388 -/* 00878 80B14318 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B1431C: -/* 0087C 80B1431C 848F008A */ lh $t7, 0x008A($a0) ## 0000008A -/* 00880 80B14320 849800B6 */ lh $t8, 0x00B6($a0) ## 000000B6 -/* 00884 80B14324 97AE0022 */ lhu $t6, 0x0022($sp) -/* 00888 80B14328 01F81023 */ subu $v0, $t7, $t8 -/* 0088C 80B1432C 00021400 */ sll $v0, $v0, 16 -/* 00890 80B14330 00021403 */ sra $v0, $v0, 16 -/* 00894 80B14334 04400003 */ bltz $v0, .L80B14344 -/* 00898 80B14338 A48E010E */ sh $t6, 0x010E($a0) ## 0000010E -/* 0089C 80B1433C 10000002 */ beq $zero, $zero, .L80B14348 -/* 008A0 80B14340 00401825 */ or $v1, $v0, $zero ## $v1 = 00000001 -.L80B14344: -/* 008A4 80B14344 00021823 */ subu $v1, $zero, $v0 -.L80B14348: -/* 008A8 80B14348 28614301 */ slti $at, $v1, 0x4301 -/* 008AC 80B1434C 1020000D */ beq $at, $zero, .L80B14384 -/* 008B0 80B14350 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 008B4 80B14354 44810000 */ mtc1 $at, $f0 ## $f0 = 100.00 -/* 008B8 80B14358 C4840090 */ lwc1 $f4, 0x0090($a0) ## 00000090 -/* 008BC 80B1435C 4600203C */ c.lt.s $f4, $f0 -/* 008C0 80B14360 00000000 */ nop -/* 008C4 80B14364 45020008 */ bc1fl .L80B14388 -/* 008C8 80B14368 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 008CC 80B1436C 949902E0 */ lhu $t9, 0x02E0($a0) ## 000002E0 -/* 008D0 80B14370 44060000 */ mfc1 $a2, $f0 -/* 008D4 80B14374 37280001 */ ori $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 008D8 80B14378 A48802E0 */ sh $t0, 0x02E0($a0) ## 000002E0 -/* 008DC 80B1437C 0C00BCB3 */ jal func_8002F2CC -/* 008E0 80B14380 8FA5001C */ lw $a1, 0x001C($sp) -.L80B14384: -/* 008E4 80B14384 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B14388: -/* 008E8 80B14388 8FBF0014 */ lw $ra, 0x0014($sp) -/* 008EC 80B1438C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 008F0 80B14390 03E00008 */ jr $ra -/* 008F4 80B14394 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14398.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14398.s deleted file mode 100644 index daec547dea..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14398.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B14398 -/* 008F8 80B14398 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 008FC 80B1439C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00900 80B143A0 0C00BCCD */ jal func_8002F334 -/* 00904 80B143A4 AFA40018 */ sw $a0, 0x0018($sp) -/* 00908 80B143A8 10400006 */ beq $v0, $zero, .L80B143C4 -/* 0090C 80B143AC 8FA40018 */ lw $a0, 0x0018($sp) -/* 00910 80B143B0 3C0580B1 */ lui $a1, %hi(func_80B14754) ## $a1 = 80B10000 -/* 00914 80B143B4 3C0680B1 */ lui $a2, %hi(func_80B167FC) ## $a2 = 80B10000 -/* 00918 80B143B8 24C667FC */ addiu $a2, $a2, %lo(func_80B167FC) ## $a2 = 80B167FC -/* 0091C 80B143BC 0C2C4EA8 */ jal func_80B13AA0 -/* 00920 80B143C0 24A54754 */ addiu $a1, $a1, %lo(func_80B14754) ## $a1 = 80B14754 -.L80B143C4: -/* 00924 80B143C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00928 80B143C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0092C 80B143CC 03E00008 */ jr $ra -/* 00930 80B143D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B143D4.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B143D4.s deleted file mode 100644 index 8ab2349506..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B143D4.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B143D4 -/* 00934 80B143D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00938 80B143D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0093C 80B143DC 0C00BCCD */ jal func_8002F334 -/* 00940 80B143E0 AFA40018 */ sw $a0, 0x0018($sp) -/* 00944 80B143E4 10400006 */ beq $v0, $zero, .L80B14400 -/* 00948 80B143E8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0094C 80B143EC 3C0580B1 */ lui $a1, %hi(func_80B146F8) ## $a1 = 80B10000 -/* 00950 80B143F0 3C0680B1 */ lui $a2, %hi(func_80B167FC) ## $a2 = 80B10000 -/* 00954 80B143F4 24C667FC */ addiu $a2, $a2, %lo(func_80B167FC) ## $a2 = 80B167FC -/* 00958 80B143F8 0C2C4EA8 */ jal func_80B13AA0 -/* 0095C 80B143FC 24A546F8 */ addiu $a1, $a1, %lo(func_80B146F8) ## $a1 = 80B146F8 -.L80B14400: -/* 00960 80B14400 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00964 80B14404 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00968 80B14408 03E00008 */ jr $ra -/* 0096C 80B1440C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14410.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14410.s deleted file mode 100644 index 972eae1d45..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14410.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80B14410 -/* 00970 80B14410 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00974 80B14414 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00978 80B14418 8C4E0004 */ lw $t6, 0x0004($v0) ## 8015E664 -/* 0097C 80B1441C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00980 80B14420 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00984 80B14424 11C0000C */ beq $t6, $zero, .L80B14458 -/* 00988 80B14428 3C0580B1 */ lui $a1, %hi(func_80B14CAC) ## $a1 = 80B10000 -/* 0098C 80B1442C 3C0580B1 */ lui $a1, %hi(func_80B14C18) ## $a1 = 80B10000 -/* 00990 80B14430 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 -/* 00994 80B14434 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 -/* 00998 80B14438 0C2C4EA8 */ jal func_80B13AA0 -/* 0099C 80B1443C 24A54C18 */ addiu $a1, $a1, %lo(func_80B14C18) ## $a1 = 80B14C18 -/* 009A0 80B14440 3C028016 */ lui $v0, %hi(gSaveContext) -/* 009A4 80B14444 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 009A8 80B14448 944F0ED6 */ lhu $t7, 0x0ED6($v0) ## 8015F536 -/* 009AC 80B1444C 35F80008 */ ori $t8, $t7, 0x0008 ## $t8 = 00000008 -/* 009B0 80B14450 1000000A */ beq $zero, $zero, .L80B1447C -/* 009B4 80B14454 A4580ED6 */ sh $t8, 0x0ED6($v0) ## 8015F536 -.L80B14458: -/* 009B8 80B14458 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 -/* 009BC 80B1445C 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 -/* 009C0 80B14460 0C2C4EA8 */ jal func_80B13AA0 -/* 009C4 80B14464 24A54CAC */ addiu $a1, $a1, %lo(func_80B14CAC) ## $a1 = 00004CAC -/* 009C8 80B14468 3C028016 */ lui $v0, %hi(gSaveContext) -/* 009CC 80B1446C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 009D0 80B14470 94590EE0 */ lhu $t9, 0x0EE0($v0) ## 8015F540 -/* 009D4 80B14474 37280400 */ ori $t0, $t9, 0x0400 ## $t0 = 00000400 -/* 009D8 80B14478 A4480EE0 */ sh $t0, 0x0EE0($v0) ## 8015F540 -.L80B1447C: -/* 009DC 80B1447C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 009E0 80B14480 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 009E4 80B14484 03E00008 */ jr $ra -/* 009E8 80B14488 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1448C.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1448C.s deleted file mode 100644 index deb12f7d09..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1448C.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80B1448C -/* 009EC 80B1448C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 009F0 80B14490 AFBF001C */ sw $ra, 0x001C($sp) -/* 009F4 80B14494 AFB00018 */ sw $s0, 0x0018($sp) -/* 009F8 80B14498 0C00BCCD */ jal func_8002F334 -/* 009FC 80B1449C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A00 80B144A0 10400003 */ beq $v0, $zero, .L80B144B0 -/* 00A04 80B144A4 00000000 */ nop -/* 00A08 80B144A8 0C2C5104 */ jal func_80B14410 -/* 00A0C 80B144AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B144B0: -/* 00A10 80B144B0 0C2C5092 */ jal func_80B14248 -/* 00A14 80B144B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A18 80B144B8 960E02E0 */ lhu $t6, 0x02E0($s0) ## 000002E0 -/* 00A1C 80B144BC 35CF0004 */ ori $t7, $t6, 0x0004 ## $t7 = 00000004 -/* 00A20 80B144C0 A60F02E0 */ sh $t7, 0x02E0($s0) ## 000002E0 -/* 00A24 80B144C4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00A28 80B144C8 8FB00018 */ lw $s0, 0x0018($sp) -/* 00A2C 80B144CC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00A30 80B144D0 03E00008 */ jr $ra -/* 00A34 80B144D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B144D8.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B144D8.s deleted file mode 100644 index c54c33a415..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B144D8.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80B144D8 -/* 00A38 80B144D8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00A3C 80B144DC AFBF001C */ sw $ra, 0x001C($sp) -/* 00A40 80B144E0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00A44 80B144E4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A48 80B144E8 0C00BCCD */ jal func_8002F334 -/* 00A4C 80B144EC AFA50024 */ sw $a1, 0x0024($sp) -/* 00A50 80B144F0 50400009 */ beql $v0, $zero, .L80B14518 -/* 00A54 80B144F4 8FA40024 */ lw $a0, 0x0024($sp) -/* 00A58 80B144F8 0C2C5104 */ jal func_80B14410 -/* 00A5C 80B144FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A60 80B14500 3C0F80B1 */ lui $t7, %hi(func_80B16700) ## $t7 = 80B10000 -/* 00A64 80B14504 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00A68 80B14508 25EF6700 */ addiu $t7, $t7, %lo(func_80B16700) ## $t7 = 80B16700 -/* 00A6C 80B1450C A60E02B6 */ sh $t6, 0x02B6($s0) ## 000002B6 -/* 00A70 80B14510 AE0F02B0 */ sw $t7, 0x02B0($s0) ## 000002B0 -/* 00A74 80B14514 8FA40024 */ lw $a0, 0x0024($sp) -.L80B14518: -/* 00A78 80B14518 0C042F6F */ jal func_8010BDBC -/* 00A7C 80B1451C 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 00A80 80B14520 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00A84 80B14524 14410008 */ bne $v0, $at, .L80B14548 -/* 00A88 80B14528 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00A8C 80B1452C 3C0580B1 */ lui $a1, %hi(func_80B1448C) ## $a1 = 80B10000 -/* 00A90 80B14530 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 -/* 00A94 80B14534 A61802B4 */ sh $t8, 0x02B4($s0) ## 000002B4 -/* 00A98 80B14538 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 -/* 00A9C 80B1453C 24A5448C */ addiu $a1, $a1, %lo(func_80B1448C) ## $a1 = 80B1448C -/* 00AA0 80B14540 0C2C4EA8 */ jal func_80B13AA0 -/* 00AA4 80B14544 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B14548: -/* 00AA8 80B14548 0C2C5092 */ jal func_80B14248 -/* 00AAC 80B1454C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AB0 80B14550 961902E0 */ lhu $t9, 0x02E0($s0) ## 000002E0 -/* 00AB4 80B14554 37280004 */ ori $t0, $t9, 0x0004 ## $t0 = 00000004 -/* 00AB8 80B14558 A60802E0 */ sh $t0, 0x02E0($s0) ## 000002E0 -/* 00ABC 80B1455C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00AC0 80B14560 8FB00018 */ lw $s0, 0x0018($sp) -/* 00AC4 80B14564 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00AC8 80B14568 03E00008 */ jr $ra -/* 00ACC 80B1456C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14570.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14570.s deleted file mode 100644 index d158f29448..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14570.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80B14570 -/* 00AD0 80B14570 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00AD4 80B14574 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00AD8 80B14578 AFA5001C */ sw $a1, 0x001C($sp) -/* 00ADC 80B1457C 948E02E0 */ lhu $t6, 0x02E0($a0) ## 000002E0 -/* 00AE0 80B14580 849802CC */ lh $t8, 0x02CC($a0) ## 000002CC -/* 00AE4 80B14584 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00AE8 80B14588 35CF0004 */ ori $t7, $t6, 0x0004 ## $t7 = 00000004 -/* 00AEC 80B1458C 17000016 */ bne $t8, $zero, .L80B145E8 -/* 00AF0 80B14590 A48F02E0 */ sh $t7, 0x02E0($a0) ## 000002E0 -/* 00AF4 80B14594 3C0580B1 */ lui $a1, %hi(func_80B144D8) ## $a1 = 80B10000 -/* 00AF8 80B14598 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 -/* 00AFC 80B1459C 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 -/* 00B00 80B145A0 24A544D8 */ addiu $a1, $a1, %lo(func_80B144D8) ## $a1 = 80B144D8 -/* 00B04 80B145A4 0C2C4EA8 */ jal func_80B13AA0 -/* 00B08 80B145A8 AFA70018 */ sw $a3, 0x0018($sp) -/* 00B0C 80B145AC 8FA70018 */ lw $a3, 0x0018($sp) -/* 00B10 80B145B0 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -/* 00B14 80B145B4 2408003C */ addiu $t0, $zero, 0x003C ## $t0 = 0000003C -/* 00B18 80B145B8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00B1C 80B145BC 24A5E3D8 */ addiu $a1, $a1, 0xE3D8 ## $a1 = 0600E3D8 -/* 00B20 80B145C0 A4F902CE */ sh $t9, 0x02CE($a3) ## 000002CE -/* 00B24 80B145C4 A4E802CC */ sh $t0, 0x02CC($a3) ## 000002CC -/* 00B28 80B145C8 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop -/* 00B2C 80B145CC 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C -/* 00B30 80B145D0 8FA40018 */ lw $a0, 0x0018($sp) -/* 00B34 80B145D4 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 -/* 00B38 80B145D8 25291C94 */ addiu $t1, $t1, 0x1C94 ## $t1 = 06001C94 -/* 00B3C 80B145DC 24056851 */ addiu $a1, $zero, 0x6851 ## $a1 = 00006851 -/* 00B40 80B145E0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00B44 80B145E4 AC8902E4 */ sw $t1, 0x02E4($a0) ## 000002E4 -.L80B145E8: -/* 00B48 80B145E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B4C 80B145EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B50 80B145F0 03E00008 */ jr $ra -/* 00B54 80B145F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B145F8.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B145F8.s deleted file mode 100644 index 5225ad9507..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B145F8.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B145F8 -/* 00B58 80B145F8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B5C 80B145FC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B60 80B14600 0C00BCCD */ jal func_8002F334 -/* 00B64 80B14604 AFA40018 */ sw $a0, 0x0018($sp) -/* 00B68 80B14608 10400006 */ beq $v0, $zero, .L80B14624 -/* 00B6C 80B1460C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00B70 80B14610 3C0580B1 */ lui $a1, %hi(func_80B14634) ## $a1 = 80B10000 -/* 00B74 80B14614 3C0680B1 */ lui $a2, %hi(func_80B167FC) ## $a2 = 80B10000 -/* 00B78 80B14618 24C667FC */ addiu $a2, $a2, %lo(func_80B167FC) ## $a2 = 80B167FC -/* 00B7C 80B1461C 0C2C4EA8 */ jal func_80B13AA0 -/* 00B80 80B14620 24A54634 */ addiu $a1, $a1, %lo(func_80B14634) ## $a1 = 80B14634 -.L80B14624: -/* 00B84 80B14624 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B88 80B14628 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B8C 80B1462C 03E00008 */ jr $ra -/* 00B90 80B14630 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14634.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14634.s deleted file mode 100644 index fbbf669037..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14634.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_80B14634 -/* 00B94 80B14634 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00B98 80B14638 AFBF001C */ sw $ra, 0x001C($sp) -/* 00B9C 80B1463C AFB00018 */ sw $s0, 0x0018($sp) -/* 00BA0 80B14640 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 00BA4 80B14644 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00BA8 80B14648 AFA5002C */ sw $a1, 0x002C($sp) -/* 00BAC 80B1464C 0C00BC65 */ jal func_8002F194 -/* 00BB0 80B14650 AFAE0024 */ sw $t6, 0x0024($sp) -/* 00BB4 80B14654 1040001D */ beq $v0, $zero, .L80B146CC -/* 00BB8 80B14658 8FA5002C */ lw $a1, 0x002C($sp) -/* 00BBC 80B1465C 0C00BCDA */ jal func_8002F368 -/* 00BC0 80B14660 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00BC4 80B14664 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00BC8 80B14668 1441000D */ bne $v0, $at, .L80B146A0 -/* 00BCC 80B1466C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BD0 80B14670 8FB80024 */ lw $t8, 0x0024($sp) -/* 00BD4 80B14674 240F702B */ addiu $t7, $zero, 0x702B ## $t7 = 0000702B -/* 00BD8 80B14678 3C0580B1 */ lui $a1, %hi(func_80B14570) ## $a1 = 80B10000 -/* 00BDC 80B1467C 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 -/* 00BE0 80B14680 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 -/* 00BE4 80B14684 24A54570 */ addiu $a1, $a1, %lo(func_80B14570) ## $a1 = 80B14570 -/* 00BE8 80B14688 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BEC 80B1468C 0C2C4EA8 */ jal func_80B13AA0 -/* 00BF0 80B14690 A70F010E */ sh $t7, 0x010E($t8) ## 0000010E -/* 00BF4 80B14694 24190028 */ addiu $t9, $zero, 0x0028 ## $t9 = 00000028 -/* 00BF8 80B14698 10000012 */ beq $zero, $zero, .L80B146E4 -/* 00BFC 80B1469C A61902CC */ sh $t9, 0x02CC($s0) ## 000002CC -.L80B146A0: -/* 00C00 80B146A0 10400004 */ beq $v0, $zero, .L80B146B4 -/* 00C04 80B146A4 3C0580B1 */ lui $a1, %hi(func_80B145F8) ## $a1 = 80B10000 -/* 00C08 80B146A8 8FA90024 */ lw $t1, 0x0024($sp) -/* 00C0C 80B146AC 2408702A */ addiu $t0, $zero, 0x702A ## $t0 = 0000702A -/* 00C10 80B146B0 A528010E */ sh $t0, 0x010E($t1) ## 0000010E -.L80B146B4: -/* 00C14 80B146B4 3C0680B1 */ lui $a2, %hi(func_80B167FC) ## $a2 = 80B10000 -/* 00C18 80B146B8 24C667FC */ addiu $a2, $a2, %lo(func_80B167FC) ## $a2 = 80B167FC -/* 00C1C 80B146BC 0C2C4EA8 */ jal func_80B13AA0 -/* 00C20 80B146C0 24A545F8 */ addiu $a1, $a1, %lo(func_80B145F8) ## $a1 = 80B145F8 -/* 00C24 80B146C4 10000008 */ beq $zero, $zero, .L80B146E8 -/* 00C28 80B146C8 8FBF001C */ lw $ra, 0x001C($sp) -.L80B146CC: -/* 00C2C 80B146CC 240A702A */ addiu $t2, $zero, 0x702A ## $t2 = 0000702A -/* 00C30 80B146D0 A60A010E */ sh $t2, 0x010E($s0) ## 0000010E -/* 00C34 80B146D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C38 80B146D8 3C0642C8 */ lui $a2, 0x42C8 ## $a2 = 42C80000 -/* 00C3C 80B146DC 0C00BCA6 */ jal func_8002F298 -/* 00C40 80B146E0 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -.L80B146E4: -/* 00C44 80B146E4 8FBF001C */ lw $ra, 0x001C($sp) -.L80B146E8: -/* 00C48 80B146E8 8FB00018 */ lw $s0, 0x0018($sp) -/* 00C4C 80B146EC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00C50 80B146F0 03E00008 */ jr $ra -/* 00C54 80B146F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B146F8.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B146F8.s deleted file mode 100644 index 95a009fa8e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B146F8.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B146F8 -/* 00C58 80B146F8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C5C 80B146FC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C60 80B14700 AFA40018 */ sw $a0, 0x0018($sp) -/* 00C64 80B14704 0C00BC65 */ jal func_8002F194 -/* 00C68 80B14708 AFA5001C */ sw $a1, 0x001C($sp) -/* 00C6C 80B1470C 10400006 */ beq $v0, $zero, .L80B14728 -/* 00C70 80B14710 8FA40018 */ lw $a0, 0x0018($sp) -/* 00C74 80B14714 3C0580B1 */ lui $a1, %hi(func_80B143D4) ## $a1 = 80B10000 -/* 00C78 80B14718 3C0680B1 */ lui $a2, %hi(func_80B167FC) ## $a2 = 80B10000 -/* 00C7C 80B1471C 24C667FC */ addiu $a2, $a2, %lo(func_80B167FC) ## $a2 = 80B167FC -/* 00C80 80B14720 0C2C4EA8 */ jal func_80B13AA0 -/* 00C84 80B14724 24A543D4 */ addiu $a1, $a1, %lo(func_80B143D4) ## $a1 = 80B143D4 -.L80B14728: -/* 00C88 80B14728 8FAF0018 */ lw $t7, 0x0018($sp) -/* 00C8C 80B1472C 240E204B */ addiu $t6, $zero, 0x204B ## $t6 = 0000204B -/* 00C90 80B14730 3C0642C8 */ lui $a2, 0x42C8 ## $a2 = 42C80000 -/* 00C94 80B14734 A5EE010E */ sh $t6, 0x010E($t7) ## 0000010E -/* 00C98 80B14738 8FA5001C */ lw $a1, 0x001C($sp) -/* 00C9C 80B1473C 0C00BCB3 */ jal func_8002F2CC -/* 00CA0 80B14740 8FA40018 */ lw $a0, 0x0018($sp) -/* 00CA4 80B14744 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00CA8 80B14748 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00CAC 80B1474C 03E00008 */ jr $ra -/* 00CB0 80B14750 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14754.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14754.s deleted file mode 100644 index 6075e14747..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14754.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_80B14754 -/* 00CB4 80B14754 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00CB8 80B14758 AFBF001C */ sw $ra, 0x001C($sp) -/* 00CBC 80B1475C AFB00018 */ sw $s0, 0x0018($sp) -/* 00CC0 80B14760 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 00CC4 80B14764 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00CC8 80B14768 AFA5002C */ sw $a1, 0x002C($sp) -/* 00CCC 80B1476C 0C00BC65 */ jal func_8002F194 -/* 00CD0 80B14770 AFAE0024 */ sw $t6, 0x0024($sp) -/* 00CD4 80B14774 1040001D */ beq $v0, $zero, .L80B147EC -/* 00CD8 80B14778 8FA5002C */ lw $a1, 0x002C($sp) -/* 00CDC 80B1477C 0C00BCDA */ jal func_8002F368 -/* 00CE0 80B14780 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00CE4 80B14784 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00CE8 80B14788 1441000D */ bne $v0, $at, .L80B147C0 -/* 00CEC 80B1478C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CF0 80B14790 8FB80024 */ lw $t8, 0x0024($sp) -/* 00CF4 80B14794 240F702B */ addiu $t7, $zero, 0x702B ## $t7 = 0000702B -/* 00CF8 80B14798 3C0580B1 */ lui $a1, %hi(func_80B14570) ## $a1 = 80B10000 -/* 00CFC 80B1479C 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 -/* 00D00 80B147A0 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 -/* 00D04 80B147A4 24A54570 */ addiu $a1, $a1, %lo(func_80B14570) ## $a1 = 80B14570 -/* 00D08 80B147A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D0C 80B147AC 0C2C4EA8 */ jal func_80B13AA0 -/* 00D10 80B147B0 A70F010E */ sh $t7, 0x010E($t8) ## 0000010E -/* 00D14 80B147B4 24190028 */ addiu $t9, $zero, 0x0028 ## $t9 = 00000028 -/* 00D18 80B147B8 10000012 */ beq $zero, $zero, .L80B14804 -/* 00D1C 80B147BC A61902CC */ sh $t9, 0x02CC($s0) ## 000002CC -.L80B147C0: -/* 00D20 80B147C0 10400004 */ beq $v0, $zero, .L80B147D4 -/* 00D24 80B147C4 3C0580B1 */ lui $a1, %hi(func_80B14398) ## $a1 = 80B10000 -/* 00D28 80B147C8 8FA90024 */ lw $t1, 0x0024($sp) -/* 00D2C 80B147CC 24085015 */ addiu $t0, $zero, 0x5015 ## $t0 = 00005015 -/* 00D30 80B147D0 A528010E */ sh $t0, 0x010E($t1) ## 0000010E -.L80B147D4: -/* 00D34 80B147D4 3C0680B1 */ lui $a2, %hi(func_80B167FC) ## $a2 = 80B10000 -/* 00D38 80B147D8 24C667FC */ addiu $a2, $a2, %lo(func_80B167FC) ## $a2 = 80B167FC -/* 00D3C 80B147DC 0C2C4EA8 */ jal func_80B13AA0 -/* 00D40 80B147E0 24A54398 */ addiu $a1, $a1, %lo(func_80B14398) ## $a1 = 80B14398 -/* 00D44 80B147E4 10000008 */ beq $zero, $zero, .L80B14808 -/* 00D48 80B147E8 8FBF001C */ lw $ra, 0x001C($sp) -.L80B147EC: -/* 00D4C 80B147EC 240A5015 */ addiu $t2, $zero, 0x5015 ## $t2 = 00005015 -/* 00D50 80B147F0 A60A010E */ sh $t2, 0x010E($s0) ## 0000010E -/* 00D54 80B147F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D58 80B147F8 3C0642C8 */ lui $a2, 0x42C8 ## $a2 = 42C80000 -/* 00D5C 80B147FC 0C00BCA6 */ jal func_8002F298 -/* 00D60 80B14800 24070006 */ addiu $a3, $zero, 0x0006 ## $a3 = 00000006 -.L80B14804: -/* 00D64 80B14804 8FBF001C */ lw $ra, 0x001C($sp) -.L80B14808: -/* 00D68 80B14808 8FB00018 */ lw $s0, 0x0018($sp) -/* 00D6C 80B1480C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00D70 80B14810 03E00008 */ jr $ra -/* 00D74 80B14814 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14818.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14818.s deleted file mode 100644 index 6709f7bc0e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14818.s +++ /dev/null @@ -1,43 +0,0 @@ -.late_rodata -glabel D_80B16F50 - .float 0.4 - -.text -glabel func_80B14818 -/* 00D78 80B14818 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00D7C 80B1481C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00D80 80B14820 8CA2009C */ lw $v0, 0x009C($a1) ## 0000009C -/* 00D84 80B14824 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 00D88 80B14828 24050800 */ addiu $a1, $zero, 0x0800 ## $a1 = 00000800 -/* 00D8C 80B1482C 0041001A */ div $zero, $v0, $at -/* 00D90 80B14830 00001010 */ mfhi $v0 -/* 00D94 80B14834 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00D98 80B14838 10400003 */ beq $v0, $zero, .L80B14848 -/* 00D9C 80B1483C 00000000 */ nop -/* 00DA0 80B14840 54410005 */ bnel $v0, $at, .L80B14858 -/* 00DA4 80B14844 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -.L80B14848: -/* 00DA8 80B14848 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00DAC 80B1484C AFA40018 */ sw $a0, 0x0018($sp) -/* 00DB0 80B14850 8FA40018 */ lw $a0, 0x0018($sp) -/* 00DB4 80B14854 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -.L80B14858: -/* 00DB8 80B14858 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 -/* 00DBC 80B1485C C4800068 */ lwc1 $f0, 0x0068($a0) ## 00000068 -/* 00DC0 80B14860 3C0180B1 */ lui $at, %hi(D_80B16F50) ## $at = 80B10000 -/* 00DC4 80B14864 4604003C */ c.lt.s $f0, $f4 -/* 00DC8 80B14868 00000000 */ nop -/* 00DCC 80B1486C 45000004 */ bc1f .L80B14880 -/* 00DD0 80B14870 00000000 */ nop -/* 00DD4 80B14874 C4266F50 */ lwc1 $f6, %lo(D_80B16F50)($at) -/* 00DD8 80B14878 46060200 */ add.s $f8, $f0, $f6 -/* 00DDC 80B1487C E4880068 */ swc1 $f8, 0x0068($a0) ## 00000068 -.L80B14880: -/* 00DE0 80B14880 0C00B638 */ jal Actor_MoveForward - -/* 00DE4 80B14884 00000000 */ nop -/* 00DE8 80B14888 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00DEC 80B1488C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00DF0 80B14890 03E00008 */ jr $ra -/* 00DF4 80B14894 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14898.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14898.s deleted file mode 100644 index cb9f8711d6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14898.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80B14898 -/* 00DF8 80B14898 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00DFC 80B1489C AFA40028 */ sw $a0, 0x0028($sp) -/* 00E00 80B148A0 AFA5002C */ sw $a1, 0x002C($sp) -/* 00E04 80B148A4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00E08 80B148A8 8FA50028 */ lw $a1, 0x0028($sp) -/* 00E0C 80B148AC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00E10 80B148B0 240E00FA */ addiu $t6, $zero, 0x00FA ## $t6 = 000000FA -/* 00E14 80B148B4 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 00E18 80B148B8 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00E1C 80B148BC AFB80018 */ sw $t8, 0x0018($sp) -/* 00E20 80B148C0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00E24 80B148C4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00E28 80B148C8 3C064248 */ lui $a2, 0x4248 ## $a2 = 42480000 -/* 00E2C 80B148CC 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 -/* 00E30 80B148D0 0C00CD20 */ jal func_80033480 -/* 00E34 80B148D4 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 -/* 00E38 80B148D8 8FA40028 */ lw $a0, 0x0028($sp) -/* 00E3C 80B148DC 0C2C5206 */ jal func_80B14818 -/* 00E40 80B148E0 8FA5002C */ lw $a1, 0x002C($sp) -/* 00E44 80B148E4 8FA40028 */ lw $a0, 0x0028($sp) -/* 00E48 80B148E8 849902CC */ lh $t9, 0x02CC($a0) ## 000002CC -/* 00E4C 80B148EC 57200004 */ bnel $t9, $zero, .L80B14900 -/* 00E50 80B148F0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00E54 80B148F4 0C00B55C */ jal Actor_Kill - -/* 00E58 80B148F8 00000000 */ nop -/* 00E5C 80B148FC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B14900: -/* 00E60 80B14900 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00E64 80B14904 03E00008 */ jr $ra -/* 00E68 80B14908 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1490C.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1490C.s deleted file mode 100644 index 16a6a42474..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1490C.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80B1490C -/* 00E6C 80B1490C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00E70 80B14910 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00E74 80B14914 AFA5001C */ sw $a1, 0x001C($sp) -/* 00E78 80B14918 848E0032 */ lh $t6, 0x0032($a0) ## 00000032 -/* 00E7C 80B1491C 849800B6 */ lh $t8, 0x00B6($a0) ## 000000B6 -/* 00E80 80B14920 848802CC */ lh $t0, 0x02CC($a0) ## 000002CC -/* 00E84 80B14924 25CF0C00 */ addiu $t7, $t6, 0x0C00 ## $t7 = 00000C00 -/* 00E88 80B14928 27190C00 */ addiu $t9, $t8, 0x0C00 ## $t9 = 00000C00 -/* 00E8C 80B1492C A48F0032 */ sh $t7, 0x0032($a0) ## 00000032 -/* 00E90 80B14930 1500000A */ bne $t0, $zero, .L80B1495C -/* 00E94 80B14934 A49900B6 */ sh $t9, 0x00B6($a0) ## 000000B6 -/* 00E98 80B14938 3C0580B1 */ lui $a1, %hi(func_80B14898) ## $a1 = 80B10000 -/* 00E9C 80B1493C 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 -/* 00EA0 80B14940 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 -/* 00EA4 80B14944 24A54898 */ addiu $a1, $a1, %lo(func_80B14898) ## $a1 = 80B14898 -/* 00EA8 80B14948 0C2C4EA8 */ jal func_80B13AA0 -/* 00EAC 80B1494C AFA40018 */ sw $a0, 0x0018($sp) -/* 00EB0 80B14950 8FA40018 */ lw $a0, 0x0018($sp) -/* 00EB4 80B14954 2409003C */ addiu $t1, $zero, 0x003C ## $t1 = 0000003C -/* 00EB8 80B14958 A48902CC */ sh $t1, 0x02CC($a0) ## 000002CC -.L80B1495C: -/* 00EBC 80B1495C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00EC0 80B14960 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00EC4 80B14964 03E00008 */ jr $ra -/* 00EC8 80B14968 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1496C.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1496C.s deleted file mode 100644 index c2eb5e7d11..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1496C.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80B1496C -/* 00ECC 80B1496C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00ED0 80B14970 AFB00028 */ sw $s0, 0x0028($sp) -/* 00ED4 80B14974 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00ED8 80B14978 AFBF002C */ sw $ra, 0x002C($sp) -/* 00EDC 80B1497C AFA50034 */ sw $a1, 0x0034($sp) -/* 00EE0 80B14980 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00EE4 80B14984 240E00FA */ addiu $t6, $zero, 0x00FA ## $t6 = 000000FA -/* 00EE8 80B14988 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 00EEC 80B1498C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00EF0 80B14990 AFB80018 */ sw $t8, 0x0018($sp) -/* 00EF4 80B14994 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00EF8 80B14998 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00EFC 80B1499C 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 00F00 80B149A0 3C064248 */ lui $a2, 0x4248 ## $a2 = 42480000 -/* 00F04 80B149A4 0C00CD20 */ jal func_80033480 -/* 00F08 80B149A8 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 -/* 00F0C 80B149AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F10 80B149B0 0C2C5206 */ jal func_80B14818 -/* 00F14 80B149B4 8FA50034 */ lw $a1, 0x0034($sp) -/* 00F18 80B149B8 861902CC */ lh $t9, 0x02CC($s0) ## 000002CC -/* 00F1C 80B149BC 3C0580B1 */ lui $a1, %hi(func_80B1490C) ## $a1 = 80B10000 -/* 00F20 80B149C0 24A5490C */ addiu $a1, $a1, %lo(func_80B1490C) ## $a1 = 80B1490C -/* 00F24 80B149C4 17200006 */ bne $t9, $zero, .L80B149E0 -/* 00F28 80B149C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F2C 80B149CC 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 -/* 00F30 80B149D0 0C2C4EA8 */ jal func_80B13AA0 -/* 00F34 80B149D4 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 -/* 00F38 80B149D8 24080005 */ addiu $t0, $zero, 0x0005 ## $t0 = 00000005 -/* 00F3C 80B149DC A60802CC */ sh $t0, 0x02CC($s0) ## 000002CC -.L80B149E0: -/* 00F40 80B149E0 8FBF002C */ lw $ra, 0x002C($sp) -/* 00F44 80B149E4 8FB00028 */ lw $s0, 0x0028($sp) -/* 00F48 80B149E8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00F4C 80B149EC 03E00008 */ jr $ra -/* 00F50 80B149F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B149F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B149F4.s deleted file mode 100644 index 899795a6e8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B149F4.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80B149F4 -/* 00F54 80B149F4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00F58 80B149F8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00F5C 80B149FC AFA5001C */ sw $a1, 0x001C($sp) -/* 00F60 80B14A00 848E0032 */ lh $t6, 0x0032($a0) ## 00000032 -/* 00F64 80B14A04 849800B6 */ lh $t8, 0x00B6($a0) ## 000000B6 -/* 00F68 80B14A08 848802CC */ lh $t0, 0x02CC($a0) ## 000002CC -/* 00F6C 80B14A0C 25CFF300 */ addiu $t7, $t6, 0xF300 ## $t7 = FFFFF300 -/* 00F70 80B14A10 2719F300 */ addiu $t9, $t8, 0xF300 ## $t9 = FFFFF300 -/* 00F74 80B14A14 A48F0032 */ sh $t7, 0x0032($a0) ## 00000032 -/* 00F78 80B14A18 1500000A */ bne $t0, $zero, .L80B14A44 -/* 00F7C 80B14A1C A49900B6 */ sh $t9, 0x00B6($a0) ## 000000B6 -/* 00F80 80B14A20 3C0580B1 */ lui $a1, %hi(func_80B1496C) ## $a1 = 80B10000 -/* 00F84 80B14A24 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 -/* 00F88 80B14A28 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 -/* 00F8C 80B14A2C 24A5496C */ addiu $a1, $a1, %lo(func_80B1496C) ## $a1 = 80B1496C -/* 00F90 80B14A30 0C2C4EA8 */ jal func_80B13AA0 -/* 00F94 80B14A34 AFA40018 */ sw $a0, 0x0018($sp) -/* 00F98 80B14A38 8FA40018 */ lw $a0, 0x0018($sp) -/* 00F9C 80B14A3C 24090041 */ addiu $t1, $zero, 0x0041 ## $t1 = 00000041 -/* 00FA0 80B14A40 A48902CC */ sh $t1, 0x02CC($a0) ## 000002CC -.L80B14A44: -/* 00FA4 80B14A44 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00FA8 80B14A48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00FAC 80B14A4C 03E00008 */ jr $ra -/* 00FB0 80B14A50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14A54.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14A54.s deleted file mode 100644 index d35ce50ac7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14A54.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80B14A54 -/* 00FB4 80B14A54 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00FB8 80B14A58 AFB00028 */ sw $s0, 0x0028($sp) -/* 00FBC 80B14A5C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00FC0 80B14A60 AFBF002C */ sw $ra, 0x002C($sp) -/* 00FC4 80B14A64 AFA50034 */ sw $a1, 0x0034($sp) -/* 00FC8 80B14A68 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00FCC 80B14A6C 240E00FA */ addiu $t6, $zero, 0x00FA ## $t6 = 000000FA -/* 00FD0 80B14A70 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 00FD4 80B14A74 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00FD8 80B14A78 AFB80018 */ sw $t8, 0x0018($sp) -/* 00FDC 80B14A7C AFAF0014 */ sw $t7, 0x0014($sp) -/* 00FE0 80B14A80 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00FE4 80B14A84 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 00FE8 80B14A88 3C064248 */ lui $a2, 0x4248 ## $a2 = 42480000 -/* 00FEC 80B14A8C 0C00CD20 */ jal func_80033480 -/* 00FF0 80B14A90 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 -/* 00FF4 80B14A94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FF8 80B14A98 0C2C5206 */ jal func_80B14818 -/* 00FFC 80B14A9C 8FA50034 */ lw $a1, 0x0034($sp) -/* 01000 80B14AA0 860202CC */ lh $v0, 0x02CC($s0) ## 000002CC -/* 01004 80B14AA4 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 01008 80B14AA8 14410004 */ bne $v0, $at, .L80B14ABC -/* 0100C 80B14AAC 00000000 */ nop -/* 01010 80B14AB0 0C041B33 */ jal func_80106CCC -/* 01014 80B14AB4 8FA40034 */ lw $a0, 0x0034($sp) -/* 01018 80B14AB8 860202CC */ lh $v0, 0x02CC($s0) ## 000002CC -.L80B14ABC: -/* 0101C 80B14ABC 14400008 */ bne $v0, $zero, .L80B14AE0 -/* 01020 80B14AC0 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 -/* 01024 80B14AC4 3C0580B1 */ lui $a1, %hi(func_80B149F4) ## $a1 = 80B10000 -/* 01028 80B14AC8 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 -/* 0102C 80B14ACC A61902CC */ sh $t9, 0x02CC($s0) ## 000002CC -/* 01030 80B14AD0 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 -/* 01034 80B14AD4 24A549F4 */ addiu $a1, $a1, %lo(func_80B149F4) ## $a1 = 80B149F4 -/* 01038 80B14AD8 0C2C4EA8 */ jal func_80B13AA0 -/* 0103C 80B14ADC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B14AE0: -/* 01040 80B14AE0 8FBF002C */ lw $ra, 0x002C($sp) -/* 01044 80B14AE4 8FB00028 */ lw $s0, 0x0028($sp) -/* 01048 80B14AE8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0104C 80B14AEC 03E00008 */ jr $ra -/* 01050 80B14AF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14AF4.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14AF4.s deleted file mode 100644 index 53870a96d2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14AF4.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80B14AF4 -/* 01054 80B14AF4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01058 80B14AF8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0105C 80B14AFC AFA5001C */ sw $a1, 0x001C($sp) -/* 01060 80B14B00 848E0032 */ lh $t6, 0x0032($a0) ## 00000032 -/* 01064 80B14B04 849800B6 */ lh $t8, 0x00B6($a0) ## 000000B6 -/* 01068 80B14B08 848802CC */ lh $t0, 0x02CC($a0) ## 000002CC -/* 0106C 80B14B0C 25CFF400 */ addiu $t7, $t6, 0xF400 ## $t7 = FFFFF400 -/* 01070 80B14B10 2719F400 */ addiu $t9, $t8, 0xF400 ## $t9 = FFFFF400 -/* 01074 80B14B14 A48F0032 */ sh $t7, 0x0032($a0) ## 00000032 -/* 01078 80B14B18 15000010 */ bne $t0, $zero, .L80B14B5C -/* 0107C 80B14B1C A49900B6 */ sh $t9, 0x00B6($a0) ## 000000B6 -/* 01080 80B14B20 24056853 */ addiu $a1, $zero, 0x6853 ## $a1 = 00006853 -/* 01084 80B14B24 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01088 80B14B28 AFA40018 */ sw $a0, 0x0018($sp) -/* 0108C 80B14B2C 3C0580B1 */ lui $a1, %hi(func_80B14A54) ## $a1 = 80B10000 -/* 01090 80B14B30 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 -/* 01094 80B14B34 8FA40018 */ lw $a0, 0x0018($sp) -/* 01098 80B14B38 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 -/* 0109C 80B14B3C 0C2C4EA8 */ jal func_80B13AA0 -/* 010A0 80B14B40 24A54A54 */ addiu $a1, $a1, %lo(func_80B14A54) ## $a1 = 80B14A54 -/* 010A4 80B14B44 8FA40018 */ lw $a0, 0x0018($sp) -/* 010A8 80B14B48 24090041 */ addiu $t1, $zero, 0x0041 ## $t1 = 00000041 -/* 010AC 80B14B4C 8C8A0004 */ lw $t2, 0x0004($a0) ## 00000004 -/* 010B0 80B14B50 A48902CC */ sh $t1, 0x02CC($a0) ## 000002CC -/* 010B4 80B14B54 354B0010 */ ori $t3, $t2, 0x0010 ## $t3 = 00000010 -/* 010B8 80B14B58 AC8B0004 */ sw $t3, 0x0004($a0) ## 00000004 -.L80B14B5C: -/* 010BC 80B14B5C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 010C0 80B14B60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 010C4 80B14B64 03E00008 */ jr $ra -/* 010C8 80B14B68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14B6C.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14B6C.s deleted file mode 100644 index b128afbbf6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14B6C.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_80B14B6C -/* 010CC 80B14B6C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 010D0 80B14B70 AFB00020 */ sw $s0, 0x0020($sp) -/* 010D4 80B14B74 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 010D8 80B14B78 AFBF0024 */ sw $ra, 0x0024($sp) -/* 010DC 80B14B7C AFA5002C */ sw $a1, 0x002C($sp) -/* 010E0 80B14B80 0C042F6F */ jal func_8010BDBC -/* 010E4 80B14B84 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 010E8 80B14B88 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 010EC 80B14B8C 1441001A */ bne $v0, $at, .L80B14BF8 -/* 010F0 80B14B90 8FA4002C */ lw $a0, 0x002C($sp) -/* 010F4 80B14B94 2405104F */ addiu $a1, $zero, 0x104F ## $a1 = 0000104F -/* 010F8 80B14B98 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 010FC 80B14B9C 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 01100 80B14BA0 0C02003E */ jal func_800800F8 -/* 01104 80B14BA4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01108 80B14BA8 3C0580B1 */ lui $a1, %hi(func_80B14AF4) ## $a1 = 80B10000 -/* 0110C 80B14BAC 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 -/* 01110 80B14BB0 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 -/* 01114 80B14BB4 24A54AF4 */ addiu $a1, $a1, %lo(func_80B14AF4) ## $a1 = 80B14AF4 -/* 01118 80B14BB8 0C2C4EA8 */ jal func_80B13AA0 -/* 0111C 80B14BBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01120 80B14BC0 3C028016 */ lui $v0, %hi(gSaveContext) -/* 01124 80B14BC4 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 01128 80B14BC8 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 0112C 80B14BCC A60E02CC */ sh $t6, 0x02CC($s0) ## 000002CC -/* 01130 80B14BD0 944F0ED6 */ lhu $t7, 0x0ED6($v0) ## 8015F536 -/* 01134 80B14BD4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01138 80B14BD8 24A5CF28 */ addiu $a1, $a1, 0xCF28 ## $a1 = 0600CF28 -/* 0113C 80B14BDC 35F80010 */ ori $t8, $t7, 0x0010 ## $t8 = 00000010 -/* 01140 80B14BE0 A4580ED6 */ sh $t8, 0x0ED6($v0) ## 8015F536 -/* 01144 80B14BE4 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop -/* 01148 80B14BE8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0114C 80B14BEC 3C190601 */ lui $t9, 0x0601 ## $t9 = 06010000 -/* 01150 80B14BF0 2739C858 */ addiu $t9, $t9, 0xC858 ## $t9 = 0600C858 -/* 01154 80B14BF4 AE1902E4 */ sw $t9, 0x02E4($s0) ## 000002E4 -.L80B14BF8: -/* 01158 80B14BF8 960802E0 */ lhu $t0, 0x02E0($s0) ## 000002E0 -/* 0115C 80B14BFC 35090001 */ ori $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 01160 80B14C00 A60902E0 */ sh $t1, 0x02E0($s0) ## 000002E0 -/* 01164 80B14C04 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01168 80B14C08 8FB00020 */ lw $s0, 0x0020($sp) -/* 0116C 80B14C0C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01170 80B14C10 03E00008 */ jr $ra -/* 01174 80B14C14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14C18.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14C18.s deleted file mode 100644 index 917c7b6b48..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14C18.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B14C18 -/* 01178 80B14C18 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0117C 80B14C1C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01180 80B14C20 AFA40018 */ sw $a0, 0x0018($sp) -/* 01184 80B14C24 0C2C50BD */ jal func_80B142F4 -/* 01188 80B14C28 2406702C */ addiu $a2, $zero, 0x702C ## $a2 = 0000702C -/* 0118C 80B14C2C 10400006 */ beq $v0, $zero, .L80B14C48 -/* 01190 80B14C30 8FA40018 */ lw $a0, 0x0018($sp) -/* 01194 80B14C34 3C0580B1 */ lui $a1, %hi(func_80B14B6C) ## $a1 = 80B10000 -/* 01198 80B14C38 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 -/* 0119C 80B14C3C 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 -/* 011A0 80B14C40 0C2C4EA8 */ jal func_80B13AA0 -/* 011A4 80B14C44 24A54B6C */ addiu $a1, $a1, %lo(func_80B14B6C) ## $a1 = 80B14B6C -.L80B14C48: -/* 011A8 80B14C48 0C2C5092 */ jal func_80B14248 -/* 011AC 80B14C4C 8FA40018 */ lw $a0, 0x0018($sp) -/* 011B0 80B14C50 8FBF0014 */ lw $ra, 0x0014($sp) -/* 011B4 80B14C54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 011B8 80B14C58 03E00008 */ jr $ra -/* 011BC 80B14C5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14C60.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14C60.s deleted file mode 100644 index 51af4eb29a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14C60.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80B14C60 -/* 011C0 80B14C60 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 011C4 80B14C64 AFBF0014 */ sw $ra, 0x0014($sp) -/* 011C8 80B14C68 0C00BCCD */ jal func_8002F334 -/* 011CC 80B14C6C AFA40018 */ sw $a0, 0x0018($sp) -/* 011D0 80B14C70 10400006 */ beq $v0, $zero, .L80B14C8C -/* 011D4 80B14C74 8FA40018 */ lw $a0, 0x0018($sp) -/* 011D8 80B14C78 3C0580B1 */ lui $a1, %hi(func_80B14CAC) ## $a1 = 80B10000 -/* 011DC 80B14C7C 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 -/* 011E0 80B14C80 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 -/* 011E4 80B14C84 0C2C4EA8 */ jal func_80B13AA0 -/* 011E8 80B14C88 24A54CAC */ addiu $a1, $a1, %lo(func_80B14CAC) ## $a1 = 80B14CAC -.L80B14C8C: -/* 011EC 80B14C8C 8FAE0018 */ lw $t6, 0x0018($sp) -/* 011F0 80B14C90 95CF02E0 */ lhu $t7, 0x02E0($t6) ## 000002E0 -/* 011F4 80B14C94 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 011F8 80B14C98 A5D802E0 */ sh $t8, 0x02E0($t6) ## 000002E0 -/* 011FC 80B14C9C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01200 80B14CA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01204 80B14CA4 03E00008 */ jr $ra -/* 01208 80B14CA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14CAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14CAC.s deleted file mode 100644 index 9be847c4fe..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14CAC.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80B14CAC -/* 0120C 80B14CAC 3C0E8016 */ lui $t6, %hi(gSaveContext+0xed6) -/* 01210 80B14CB0 95CEF536 */ lhu $t6, %lo(gSaveContext+0xed6)($t6) -/* 01214 80B14CB4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01218 80B14CB8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0121C 80B14CBC 31CF0100 */ andi $t7, $t6, 0x0100 ## $t7 = 00000000 -/* 01220 80B14CC0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01224 80B14CC4 11E00010 */ beq $t7, $zero, .L80B14D08 -/* 01228 80B14CC8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0122C 80B14CCC 0C2C50BD */ jal func_80B142F4 -/* 01230 80B14CD0 24065017 */ addiu $a2, $zero, 0x5017 ## $a2 = 00005017 -/* 01234 80B14CD4 10400016 */ beq $v0, $zero, .L80B14D30 -/* 01238 80B14CD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0123C 80B14CDC 3C0580B1 */ lui $a1, %hi(func_80B14C60) ## $a1 = 80B10000 -/* 01240 80B14CE0 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 -/* 01244 80B14CE4 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 -/* 01248 80B14CE8 0C2C4EA8 */ jal func_80B13AA0 -/* 0124C 80B14CEC 24A54C60 */ addiu $a1, $a1, %lo(func_80B14C60) ## $a1 = 80B14C60 -/* 01250 80B14CF0 3C028016 */ lui $v0, %hi(gSaveContext) -/* 01254 80B14CF4 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01258 80B14CF8 94580EE0 */ lhu $t8, 0x0EE0($v0) ## 8015F540 -/* 0125C 80B14CFC 37190800 */ ori $t9, $t8, 0x0800 ## $t9 = 00000800 -/* 01260 80B14D00 1000000B */ beq $zero, $zero, .L80B14D30 -/* 01264 80B14D04 A4590EE0 */ sh $t9, 0x0EE0($v0) ## 8015F540 -.L80B14D08: -/* 01268 80B14D08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0126C 80B14D0C 0C2C50BD */ jal func_80B142F4 -/* 01270 80B14D10 24065016 */ addiu $a2, $zero, 0x5016 ## $a2 = 00005016 -/* 01274 80B14D14 10400006 */ beq $v0, $zero, .L80B14D30 -/* 01278 80B14D18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0127C 80B14D1C 3C0580B1 */ lui $a1, %hi(func_80B14C60) ## $a1 = 80B10000 -/* 01280 80B14D20 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 -/* 01284 80B14D24 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 -/* 01288 80B14D28 0C2C4EA8 */ jal func_80B13AA0 -/* 0128C 80B14D2C 24A54C60 */ addiu $a1, $a1, %lo(func_80B14C60) ## $a1 = 80B14C60 -.L80B14D30: -/* 01290 80B14D30 0C2C5092 */ jal func_80B14248 -/* 01294 80B14D34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01298 80B14D38 8FBF001C */ lw $ra, 0x001C($sp) -/* 0129C 80B14D3C 8FB00018 */ lw $s0, 0x0018($sp) -/* 012A0 80B14D40 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 012A4 80B14D44 03E00008 */ jr $ra -/* 012A8 80B14D48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14D4C.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14D4C.s deleted file mode 100644 index 1dab39ed08..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14D4C.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80B14D4C -/* 012AC 80B14D4C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 012B0 80B14D50 AFBF0014 */ sw $ra, 0x0014($sp) -/* 012B4 80B14D54 0C00BCCD */ jal func_8002F334 -/* 012B8 80B14D58 AFA40018 */ sw $a0, 0x0018($sp) -/* 012BC 80B14D5C 10400006 */ beq $v0, $zero, .L80B14D78 -/* 012C0 80B14D60 8FA40018 */ lw $a0, 0x0018($sp) -/* 012C4 80B14D64 3C0580B1 */ lui $a1, %hi(func_80B14D98) ## $a1 = 80B10000 -/* 012C8 80B14D68 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 -/* 012CC 80B14D6C 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 -/* 012D0 80B14D70 0C2C4EA8 */ jal func_80B13AA0 -/* 012D4 80B14D74 24A54D98 */ addiu $a1, $a1, %lo(func_80B14D98) ## $a1 = 80B14D98 -.L80B14D78: -/* 012D8 80B14D78 8FAE0018 */ lw $t6, 0x0018($sp) -/* 012DC 80B14D7C 95CF02E0 */ lhu $t7, 0x02E0($t6) ## 000002E0 -/* 012E0 80B14D80 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 012E4 80B14D84 A5D802E0 */ sh $t8, 0x02E0($t6) ## 000002E0 -/* 012E8 80B14D88 8FBF0014 */ lw $ra, 0x0014($sp) -/* 012EC 80B14D8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 012F0 80B14D90 03E00008 */ jr $ra -/* 012F4 80B14D94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14D98.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14D98.s deleted file mode 100644 index 5c6597224d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14D98.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80B14D98 -/* 012F8 80B14D98 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 012FC 80B14D9C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01300 80B14DA0 AFA40018 */ sw $a0, 0x0018($sp) -/* 01304 80B14DA4 0C2C50BD */ jal func_80B142F4 -/* 01308 80B14DA8 24062055 */ addiu $a2, $zero, 0x2055 ## $a2 = 00002055 -/* 0130C 80B14DAC 10400006 */ beq $v0, $zero, .L80B14DC8 -/* 01310 80B14DB0 8FA40018 */ lw $a0, 0x0018($sp) -/* 01314 80B14DB4 3C0580B1 */ lui $a1, %hi(func_80B14D4C) ## $a1 = 80B10000 -/* 01318 80B14DB8 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 -/* 0131C 80B14DBC 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 -/* 01320 80B14DC0 0C2C4EA8 */ jal func_80B13AA0 -/* 01324 80B14DC4 24A54D4C */ addiu $a1, $a1, %lo(func_80B14D4C) ## $a1 = 80B14D4C -.L80B14DC8: -/* 01328 80B14DC8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0132C 80B14DCC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01330 80B14DD0 03E00008 */ jr $ra -/* 01334 80B14DD4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14DD8.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14DD8.s deleted file mode 100644 index 02896c1442..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14DD8.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B14DD8 -/* 01338 80B14DD8 3C0E8016 */ lui $t6, %hi(gSaveContext+0x34) -/* 0133C 80B14DDC 85CEE694 */ lh $t6, %lo(gSaveContext+0x34)($t6) -/* 01340 80B14DE0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01344 80B14DE4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01348 80B14DE8 29C1001E */ slti $at, $t6, 0x001E -/* 0134C 80B14DEC 10200003 */ beq $at, $zero, .L80B14DFC -/* 01350 80B14DF0 00000000 */ nop -/* 01354 80B14DF4 10000008 */ beq $zero, $zero, .L80B14E18 -/* 01358 80B14DF8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B14DFC: -/* 0135C 80B14DFC 0C021AAF */ jal Inventory_HasEmptyBottle -/* 01360 80B14E00 00000000 */ nop -/* 01364 80B14E04 54400004 */ bnel $v0, $zero, .L80B14E18 -/* 01368 80B14E08 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -/* 0136C 80B14E0C 10000002 */ beq $zero, $zero, .L80B14E18 -/* 01370 80B14E10 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 01374 80B14E14 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -.L80B14E18: -/* 01378 80B14E18 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0137C 80B14E1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01380 80B14E20 03E00008 */ jr $ra -/* 01384 80B14E24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14E28.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14E28.s deleted file mode 100644 index 3e3700f539..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14E28.s +++ /dev/null @@ -1,51 +0,0 @@ -.late_rodata -glabel D_80B16F54 - .word 0x4483A000 - -.text -glabel func_80B14E28 -/* 01388 80B14E28 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0138C 80B14E2C AFB10018 */ sw $s1, 0x0018($sp) -/* 01390 80B14E30 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 01394 80B14E34 AFBF001C */ sw $ra, 0x001C($sp) -/* 01398 80B14E38 AFB00014 */ sw $s0, 0x0014($sp) -/* 0139C 80B14E3C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 013A0 80B14E40 0C03008C */ jal Gameplay_CreateSubCamera -/* 013A4 80B14E44 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 013A8 80B14E48 A62202D0 */ sh $v0, 0x02D0($s1) ## 000002D0 -/* 013AC 80B14E4C 860E07A0 */ lh $t6, 0x07A0($s0) ## 000007A0 -/* 013B0 80B14E50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013B4 80B14E54 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 013B8 80B14E58 A62E02D2 */ sh $t6, 0x02D2($s1) ## 000002D2 -/* 013BC 80B14E5C 0C0300C5 */ jal Gameplay_ChangeCameraStatus -/* 013C0 80B14E60 862502D2 */ lh $a1, 0x02D2($s1) ## 000002D2 -/* 013C4 80B14E64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013C8 80B14E68 862502D0 */ lh $a1, 0x02D0($s1) ## 000002D0 -/* 013CC 80B14E6C 0C0300C5 */ jal Gameplay_ChangeCameraStatus -/* 013D0 80B14E70 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 013D4 80B14E74 3C0180B1 */ lui $at, %hi(D_80B16F54) ## $at = 80B10000 -/* 013D8 80B14E78 C4206F54 */ lwc1 $f0, %lo(D_80B16F54)($at) -/* 013DC 80B14E7C 3C014130 */ lui $at, 0x4130 ## $at = 41300000 -/* 013E0 80B14E80 44812000 */ mtc1 $at, $f4 ## $f4 = 11.00 -/* 013E4 80B14E84 3C0141B0 */ lui $at, 0x41B0 ## $at = 41B00000 -/* 013E8 80B14E88 44813000 */ mtc1 $at, $f6 ## $f6 = 22.00 -/* 013EC 80B14E8C 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 013F0 80B14E90 44814000 */ mtc1 $at, $f8 ## $f8 = 45.00 -/* 013F4 80B14E94 3C01C220 */ lui $at, 0xC220 ## $at = C2200000 -/* 013F8 80B14E98 44815000 */ mtc1 $at, $f10 ## $f10 = -40.00 -/* 013FC 80B14E9C E7A0002C */ swc1 $f0, 0x002C($sp) -/* 01400 80B14EA0 E7A00020 */ swc1 $f0, 0x0020($sp) -/* 01404 80B14EA4 E7A40030 */ swc1 $f4, 0x0030($sp) -/* 01408 80B14EA8 E7A60034 */ swc1 $f6, 0x0034($sp) -/* 0140C 80B14EAC E7A80024 */ swc1 $f8, 0x0024($sp) -/* 01410 80B14EB0 E7AA0028 */ swc1 $f10, 0x0028($sp) -/* 01414 80B14EB4 862502D0 */ lh $a1, 0x02D0($s1) ## 000002D0 -/* 01418 80B14EB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0141C 80B14EBC 27A60020 */ addiu $a2, $sp, 0x0020 ## $a2 = FFFFFFE8 -/* 01420 80B14EC0 0C030136 */ jal Gameplay_CameraSetAtEye -/* 01424 80B14EC4 27A7002C */ addiu $a3, $sp, 0x002C ## $a3 = FFFFFFF4 -/* 01428 80B14EC8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0142C 80B14ECC 8FB00014 */ lw $s0, 0x0014($sp) -/* 01430 80B14ED0 8FB10018 */ lw $s1, 0x0018($sp) -/* 01434 80B14ED4 03E00008 */ jr $ra -/* 01438 80B14ED8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14EDC.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14EDC.s deleted file mode 100644 index 7a36eed732..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14EDC.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80B14EDC -/* 0143C 80B14EDC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01440 80B14EE0 AFA40018 */ sw $a0, 0x0018($sp) -/* 01444 80B14EE4 8FAE0018 */ lw $t6, 0x0018($sp) -/* 01448 80B14EE8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0144C 80B14EEC AFA5001C */ sw $a1, 0x001C($sp) -/* 01450 80B14EF0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01454 80B14EF4 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 01458 80B14EF8 0C0300C5 */ jal Gameplay_ChangeCameraStatus -/* 0145C 80B14EFC 85C502D2 */ lh $a1, 0x02D2($t6) ## 000002D2 -/* 01460 80B14F00 8FAF0018 */ lw $t7, 0x0018($sp) -/* 01464 80B14F04 8FA4001C */ lw $a0, 0x001C($sp) -/* 01468 80B14F08 0C0300E1 */ jal Gameplay_ClearCamera -/* 0146C 80B14F0C 85E502D0 */ lh $a1, 0x02D0($t7) ## 000002D0 -/* 01470 80B14F10 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01474 80B14F14 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01478 80B14F18 03E00008 */ jr $ra -/* 0147C 80B14F1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14F20.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14F20.s deleted file mode 100644 index 1dde19d055..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14F20.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80B14F20 -/* 01480 80B14F20 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01484 80B14F24 AFBF002C */ sw $ra, 0x002C($sp) -/* 01488 80B14F28 AFB00028 */ sw $s0, 0x0028($sp) -/* 0148C 80B14F2C 3C0680B1 */ lui $a2, %hi(func_80B16854) ## $a2 = 80B10000 -/* 01490 80B14F30 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01494 80B14F34 0C2C4EA8 */ jal func_80B13AA0 -/* 01498 80B14F38 24C66854 */ addiu $a2, $a2, %lo(func_80B16854) ## $a2 = 80B16854 -/* 0149C 80B14F3C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 014A0 80B14F40 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 014A4 80B14F44 A60E02B4 */ sh $t6, 0x02B4($s0) ## 000002B4 -/* 014A8 80B14F48 0C028800 */ jal SkelAnime_GetFrameCount - -/* 014AC 80B14F4C 248417E8 */ addiu $a0, $a0, 0x17E8 ## $a0 = 060017E8 -/* 014B0 80B14F50 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 014B4 80B14F54 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 -/* 014B8 80B14F58 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 -/* 014BC 80B14F5C 468021A0 */ cvt.s.w $f6, $f4 -/* 014C0 80B14F60 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 014C4 80B14F64 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 014C8 80B14F68 AFAF0014 */ sw $t7, 0x0014($sp) -/* 014CC 80B14F6C 24A517E8 */ addiu $a1, $a1, 0x17E8 ## $a1 = 060017E8 -/* 014D0 80B14F70 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 014D4 80B14F74 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 014D8 80B14F78 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 014DC 80B14F7C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 014E0 80B14F80 0C029468 */ jal SkelAnime_ChangeAnim - -/* 014E4 80B14F84 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 014E8 80B14F88 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 -/* 014EC 80B14F8C 271817E8 */ addiu $t8, $t8, 0x17E8 ## $t8 = 060017E8 -/* 014F0 80B14F90 A60002E2 */ sh $zero, 0x02E2($s0) ## 000002E2 -/* 014F4 80B14F94 AE1802E4 */ sw $t8, 0x02E4($s0) ## 000002E4 -/* 014F8 80B14F98 8FBF002C */ lw $ra, 0x002C($sp) -/* 014FC 80B14F9C 8FB00028 */ lw $s0, 0x0028($sp) -/* 01500 80B14FA0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01504 80B14FA4 03E00008 */ jr $ra -/* 01508 80B14FA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14FAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14FAC.s deleted file mode 100644 index 9ed14b8d75..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14FAC.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80B14FAC -/* 0150C 80B14FAC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01510 80B14FB0 AFBF002C */ sw $ra, 0x002C($sp) -/* 01514 80B14FB4 AFB00028 */ sw $s0, 0x0028($sp) -/* 01518 80B14FB8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 0151C 80B14FBC 3C0680B1 */ lui $a2, %hi(func_80B16938) ## $a2 = 80B10000 -/* 01520 80B14FC0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01524 80B14FC4 A48E02B4 */ sh $t6, 0x02B4($a0) ## 000002B4 -/* 01528 80B14FC8 0C2C4EA8 */ jal func_80B13AA0 -/* 0152C 80B14FCC 24C66938 */ addiu $a2, $a2, %lo(func_80B16938) ## $a2 = 80B16938 -/* 01530 80B14FD0 960F02E0 */ lhu $t7, 0x02E0($s0) ## 000002E0 -/* 01534 80B14FD4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01538 80B14FD8 2484C48C */ addiu $a0, $a0, 0xC48C ## $a0 = 0600C48C -/* 0153C 80B14FDC 31F8FFEF */ andi $t8, $t7, 0xFFEF ## $t8 = 00000000 -/* 01540 80B14FE0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01544 80B14FE4 A61802E0 */ sh $t8, 0x02E0($s0) ## 000002E0 -/* 01548 80B14FE8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0154C 80B14FEC 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 -/* 01550 80B14FF0 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 -/* 01554 80B14FF4 468021A0 */ cvt.s.w $f6, $f4 -/* 01558 80B14FF8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 0155C 80B14FFC 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 01560 80B15000 AFB90014 */ sw $t9, 0x0014($sp) -/* 01564 80B15004 24A5C48C */ addiu $a1, $a1, 0xC48C ## $a1 = 0600C48C -/* 01568 80B15008 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0156C 80B1500C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01570 80B15010 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01574 80B15014 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01578 80B15018 0C029468 */ jal SkelAnime_ChangeAnim - -/* 0157C 80B1501C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01580 80B15020 8FBF002C */ lw $ra, 0x002C($sp) -/* 01584 80B15024 8FB00028 */ lw $s0, 0x0028($sp) -/* 01588 80B15028 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0158C 80B1502C 03E00008 */ jr $ra -/* 01590 80B15030 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15034.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15034.s deleted file mode 100644 index 8d9f362e22..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15034.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80B15034 -/* 01594 80B15034 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01598 80B15038 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0159C 80B1503C AFA40018 */ sw $a0, 0x0018($sp) -/* 015A0 80B15040 AFA5001C */ sw $a1, 0x001C($sp) -/* 015A4 80B15044 0C042F6F */ jal func_8010BDBC -/* 015A8 80B15048 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 015AC 80B1504C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 015B0 80B15050 5441000F */ bnel $v0, $at, .L80B15090 -/* 015B4 80B15054 8FAE0018 */ lw $t6, 0x0018($sp) -/* 015B8 80B15058 0C041AF2 */ jal func_80106BC8 -/* 015BC 80B1505C 8FA4001C */ lw $a0, 0x001C($sp) -/* 015C0 80B15060 5040000B */ beql $v0, $zero, .L80B15090 -/* 015C4 80B15064 8FAE0018 */ lw $t6, 0x0018($sp) -/* 015C8 80B15068 0C041B33 */ jal func_80106CCC -/* 015CC 80B1506C 8FA4001C */ lw $a0, 0x001C($sp) -/* 015D0 80B15070 3C0580B1 */ lui $a1, %hi(func_80B16504) ## $a1 = 80B10000 -/* 015D4 80B15074 24A56504 */ addiu $a1, $a1, %lo(func_80B16504) ## $a1 = 80B16504 -/* 015D8 80B15078 0C2C53C8 */ jal func_80B14F20 -/* 015DC 80B1507C 8FA40018 */ lw $a0, 0x0018($sp) -/* 015E0 80B15080 8FA40018 */ lw $a0, 0x0018($sp) -/* 015E4 80B15084 0C2C4EAB */ jal func_80B13AAC -/* 015E8 80B15088 8FA5001C */ lw $a1, 0x001C($sp) -/* 015EC 80B1508C 8FAE0018 */ lw $t6, 0x0018($sp) -.L80B15090: -/* 015F0 80B15090 95CF02E0 */ lhu $t7, 0x02E0($t6) ## 000002E0 -/* 015F4 80B15094 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 015F8 80B15098 A5D802E0 */ sh $t8, 0x02E0($t6) ## 000002E0 -/* 015FC 80B1509C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01600 80B150A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01604 80B150A4 03E00008 */ jr $ra -/* 01608 80B150A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B150AC.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B150AC.s deleted file mode 100644 index b277da38ba..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B150AC.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B150AC -/* 0160C 80B150AC 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 01610 80B150B0 8C4E067C */ lw $t6, 0x067C($v0) ## 0000067C -/* 01614 80B150B4 31CF0800 */ andi $t7, $t6, 0x0800 ## $t7 = 00000000 -/* 01618 80B150B8 51E0000F */ beql $t7, $zero, .L80B150F8 -/* 0161C 80B150BC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01620 80B150C0 8C430438 */ lw $v1, 0x0438($v0) ## 00000438 -/* 01624 80B150C4 5060000C */ beql $v1, $zero, .L80B150F8 -/* 01628 80B150C8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0162C 80B150CC 84780000 */ lh $t8, 0x0000($v1) ## 00000000 -/* 01630 80B150D0 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 01634 80B150D4 0006C880 */ sll $t9, $a2, 2 -/* 01638 80B150D8 17010006 */ bne $t8, $at, .L80B150F4 -/* 0163C 80B150DC 00994021 */ addu $t0, $a0, $t9 -/* 01640 80B150E0 8D0902B8 */ lw $t1, 0x02B8($t0) ## 000002B8 -/* 01644 80B150E4 54690004 */ bnel $v1, $t1, .L80B150F8 -/* 01648 80B150E8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0164C 80B150EC 03E00008 */ jr $ra -/* 01650 80B150F0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B150F4: -/* 01654 80B150F4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B150F8: -/* 01658 80B150F8 03E00008 */ jr $ra -/* 0165C 80B150FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15100.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15100.s deleted file mode 100644 index 755b2a9e5d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15100.s +++ /dev/null @@ -1,101 +0,0 @@ -.late_rodata -glabel D_80B16F58 - .float 0.1 - -.text -glabel func_80B15100 -/* 01660 80B15100 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01664 80B15104 AFB10028 */ sw $s1, 0x0028($sp) -/* 01668 80B15108 AFBF002C */ sw $ra, 0x002C($sp) -/* 0166C 80B1510C AFB00024 */ sw $s0, 0x0024($sp) -/* 01670 80B15110 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 01674 80B15114 8CB01C44 */ lw $s0, 0x1C44($a1) ## 00001C44 -/* 01678 80B15118 AFA50044 */ sw $a1, 0x0044($sp) -/* 0167C 80B1511C 0C042F6F */ jal func_8010BDBC -/* 01680 80B15120 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 01684 80B15124 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01688 80B15128 54410046 */ bnel $v0, $at, .L80B15244 -/* 0168C 80B1512C 962802E0 */ lhu $t0, 0x02E0($s1) ## 000002E0 -/* 01690 80B15130 0C041AF2 */ jal func_80106BC8 -/* 01694 80B15134 8FA40044 */ lw $a0, 0x0044($sp) -/* 01698 80B15138 10400041 */ beq $v0, $zero, .L80B15240 -/* 0169C 80B1513C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 016A0 80B15140 0C028800 */ jal SkelAnime_GetFrameCount - -/* 016A4 80B15144 2484C48C */ addiu $a0, $a0, 0xC48C ## $a0 = 0600C48C -/* 016A8 80B15148 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 016AC 80B1514C 2484C48C */ addiu $a0, $a0, 0xC48C ## $a0 = 0600C48C -/* 016B0 80B15150 0C028800 */ jal SkelAnime_GetFrameCount - -/* 016B4 80B15154 A7A20034 */ sh $v0, 0x0034($sp) -/* 016B8 80B15158 87AE0034 */ lh $t6, 0x0034($sp) -/* 016BC 80B1515C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 016C0 80B15160 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 016C4 80B15164 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 016C8 80B15168 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 016CC 80B1516C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 016D0 80B15170 468021A0 */ cvt.s.w $f6, $f4 -/* 016D4 80B15174 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 016D8 80B15178 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 016DC 80B1517C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 016E0 80B15180 44060000 */ mfc1 $a2, $f0 -/* 016E4 80B15184 46805420 */ cvt.s.w $f16, $f10 -/* 016E8 80B15188 AFAF0014 */ sw $t7, 0x0014($sp) -/* 016EC 80B1518C 24A5C48C */ addiu $a1, $a1, 0xC48C ## $a1 = 0600C48C -/* 016F0 80B15190 2624014C */ addiu $a0, $s1, 0x014C ## $a0 = 0000014C -/* 016F4 80B15194 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 016F8 80B15198 46003201 */ sub.s $f8, $f6, $f0 -/* 016FC 80B1519C E7B00010 */ swc1 $f16, 0x0010($sp) -/* 01700 80B151A0 44074000 */ mfc1 $a3, $f8 -/* 01704 80B151A4 0C029468 */ jal SkelAnime_ChangeAnim - -/* 01708 80B151A8 00000000 */ nop -/* 0170C 80B151AC 963802E0 */ lhu $t8, 0x02E0($s1) ## 000002E0 -/* 01710 80B151B0 3319FFEF */ andi $t9, $t8, 0xFFEF ## $t9 = 00000000 -/* 01714 80B151B4 A63902E0 */ sh $t9, 0x02E0($s1) ## 000002E0 -/* 01718 80B151B8 0C041B33 */ jal func_80106CCC -/* 0171C 80B151BC 8FA40044 */ lw $a0, 0x0044($sp) -/* 01720 80B151C0 922302CA */ lbu $v1, 0x02CA($s1) ## 000002CA -/* 01724 80B151C4 3C0880B1 */ lui $t0, %hi(func_80B154FC) ## $t0 = 80B10000 -/* 01728 80B151C8 250854FC */ addiu $t0, $t0, %lo(func_80B154FC) ## $t0 = 80B154FC -/* 0172C 80B151CC AE28025C */ sw $t0, 0x025C($s1) ## 0000025C -/* 01730 80B151D0 00034880 */ sll $t1, $v1, 2 -/* 01734 80B151D4 02291021 */ addu $v0, $s1, $t1 -/* 01738 80B151D8 3C0180B1 */ lui $at, %hi(D_80B16F58) ## $at = 80B10000 -/* 0173C 80B151DC C4246F58 */ lwc1 $f4, %lo(D_80B16F58)($at) -/* 01740 80B151E0 8C4A02B8 */ lw $t2, 0x02B8($v0) ## 000002B8 -/* 01744 80B151E4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01748 80B151E8 E544006C */ swc1 $f4, 0x006C($t2) ## 0000006C -/* 0174C 80B151EC 8C4B02B8 */ lw $t3, 0x02B8($v0) ## 000002B8 -/* 01750 80B151F0 E5600060 */ swc1 $f0, 0x0060($t3) ## 00000060 -/* 01754 80B151F4 8C4C02B8 */ lw $t4, 0x02B8($v0) ## 000002B8 -/* 01758 80B151F8 E5800068 */ swc1 $f0, 0x0068($t4) ## 00000068 -/* 0175C 80B151FC 8C4D02B8 */ lw $t5, 0x02B8($v0) ## 000002B8 -/* 01760 80B15200 ADA00118 */ sw $zero, 0x0118($t5) ## 00000118 -/* 01764 80B15204 8E0E0438 */ lw $t6, 0x0438($s0) ## 00000438 -/* 01768 80B15208 8C4402B8 */ lw $a0, 0x02B8($v0) ## 000002B8 -/* 0176C 80B1520C 55C40004 */ bnel $t6, $a0, .L80B15220 -/* 01770 80B15210 8E0F03AC */ lw $t7, 0x03AC($s0) ## 000003AC -/* 01774 80B15214 AE000438 */ sw $zero, 0x0438($s0) ## 00000438 -/* 01778 80B15218 8C4402B8 */ lw $a0, 0x02B8($v0) ## 000002B8 -/* 0177C 80B1521C 8E0F03AC */ lw $t7, 0x03AC($s0) ## 000003AC -.L80B15220: -/* 01780 80B15220 55E40003 */ bnel $t7, $a0, .L80B15230 -/* 01784 80B15224 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -/* 01788 80B15228 AE0003AC */ sw $zero, 0x03AC($s0) ## 000003AC -/* 0178C 80B1522C 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -.L80B15230: -/* 01790 80B15230 2401F7FF */ addiu $at, $zero, 0xF7FF ## $at = FFFFF7FF -/* 01794 80B15234 0301C824 */ and $t9, $t8, $at -/* 01798 80B15238 AE19067C */ sw $t9, 0x067C($s0) ## 0000067C -/* 0179C 80B1523C AC4002B8 */ sw $zero, 0x02B8($v0) ## 000002B8 -.L80B15240: -/* 017A0 80B15240 962802E0 */ lhu $t0, 0x02E0($s1) ## 000002E0 -.L80B15244: -/* 017A4 80B15244 35090001 */ ori $t1, $t0, 0x0001 ## $t1 = 80B154FD -/* 017A8 80B15248 A62902E0 */ sh $t1, 0x02E0($s1) ## 000002E0 -/* 017AC 80B1524C 8FBF002C */ lw $ra, 0x002C($sp) -/* 017B0 80B15250 8FB10028 */ lw $s1, 0x0028($sp) -/* 017B4 80B15254 8FB00024 */ lw $s0, 0x0024($sp) -/* 017B8 80B15258 03E00008 */ jr $ra -/* 017BC 80B1525C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15260.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15260.s deleted file mode 100644 index 3d95acea96..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15260.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80B15260 -/* 017C0 80B15260 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 017C4 80B15264 AFBF0014 */ sw $ra, 0x0014($sp) -/* 017C8 80B15268 AFA5001C */ sw $a1, 0x001C($sp) -/* 017CC 80B1526C 0C00BC65 */ jal func_8002F194 -/* 017D0 80B15270 AFA40018 */ sw $a0, 0x0018($sp) -/* 017D4 80B15274 1040000A */ beq $v0, $zero, .L80B152A0 -/* 017D8 80B15278 8FA40018 */ lw $a0, 0x0018($sp) -/* 017DC 80B1527C 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 -/* 017E0 80B15280 3C01FFFE */ lui $at, 0xFFFE ## $at = FFFE0000 -/* 017E4 80B15284 3C0E80B1 */ lui $t6, %hi(func_80B15100) ## $t6 = 80B10000 -/* 017E8 80B15288 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFEFFFF -/* 017EC 80B1528C 25CE5100 */ addiu $t6, $t6, %lo(func_80B15100) ## $t6 = 80B15100 -/* 017F0 80B15290 01E1C024 */ and $t8, $t7, $at -/* 017F4 80B15294 AC8E025C */ sw $t6, 0x025C($a0) ## 0000025C -/* 017F8 80B15298 10000006 */ beq $zero, $zero, .L80B152B4 -/* 017FC 80B1529C AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -.L80B152A0: -/* 01800 80B152A0 8FA5001C */ lw $a1, 0x001C($sp) -/* 01804 80B152A4 3C06447A */ lui $a2, 0x447A ## $a2 = 447A0000 -/* 01808 80B152A8 0C00BCB3 */ jal func_8002F2CC -/* 0180C 80B152AC AFA40018 */ sw $a0, 0x0018($sp) -/* 01810 80B152B0 8FA40018 */ lw $a0, 0x0018($sp) -.L80B152B4: -/* 01814 80B152B4 949902E0 */ lhu $t9, 0x02E0($a0) ## 000002E0 -/* 01818 80B152B8 37280001 */ ori $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 0181C 80B152BC A48802E0 */ sh $t0, 0x02E0($a0) ## 000002E0 -/* 01820 80B152C0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01824 80B152C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01828 80B152C8 03E00008 */ jr $ra -/* 0182C 80B152CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B152D0.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B152D0.s deleted file mode 100644 index cd761ce724..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B152D0.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B152D0 -/* 01830 80B152D0 AFA50004 */ sw $a1, 0x0004($sp) -/* 01834 80B152D4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01838 80B152D8 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 0183C 80B152DC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01840 80B152E0 2402000C */ addiu $v0, $zero, 0x000C ## $v0 = 0000000C -.L80B152E4: -/* 01844 80B152E4 8CCE02B8 */ lw $t6, 0x02B8($a2) ## 000002B8 -/* 01848 80B152E8 24A50004 */ addiu $a1, $a1, 0x0004 ## $a1 = 00000004 -/* 0184C 80B152EC 11C00002 */ beq $t6, $zero, .L80B152F8 -/* 01850 80B152F0 00000000 */ nop -/* 01854 80B152F4 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = 00000001 -.L80B152F8: -/* 01858 80B152F8 14A2FFFA */ bne $a1, $v0, .L80B152E4 -/* 0185C 80B152FC 24C60004 */ addiu $a2, $a2, 0x0004 ## $a2 = 00000004 -/* 01860 80B15300 03E00008 */ jr $ra -/* 01864 80B15304 00601025 */ or $v0, $v1, $zero ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15308.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15308.s deleted file mode 100644 index d36f1de44b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15308.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel func_80B15308 -/* 01868 80B15308 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0186C 80B1530C AFBF002C */ sw $ra, 0x002C($sp) -/* 01870 80B15310 AFB00028 */ sw $s0, 0x0028($sp) -/* 01874 80B15314 948202E0 */ lhu $v0, 0x02E0($a0) ## 000002E0 -/* 01878 80B15318 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0187C 80B1531C 304E0010 */ andi $t6, $v0, 0x0010 ## $t6 = 00000000 -/* 01880 80B15320 11C00027 */ beq $t6, $zero, .L80B153C0 -/* 01884 80B15324 304F0100 */ andi $t7, $v0, 0x0100 ## $t7 = 00000000 -/* 01888 80B15328 11E00012 */ beq $t7, $zero, .L80B15374 -/* 0188C 80B1532C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01890 80B15330 3C0141B0 */ lui $at, 0x41B0 ## $at = 41B00000 -/* 01894 80B15334 44812000 */ mtc1 $at, $f4 ## $f4 = 22.00 -/* 01898 80B15338 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 0189C 80B1533C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 018A0 80B15340 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 018A4 80B15344 AFB80014 */ sw $t8, 0x0014($sp) -/* 018A8 80B15348 24A5BF38 */ addiu $a1, $a1, 0xBF38 ## $a1 = 0600BF38 -/* 018AC 80B1534C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 018B0 80B15350 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 018B4 80B15354 3C074188 */ lui $a3, 0x4188 ## $a3 = 41880000 -/* 018B8 80B15358 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 018BC 80B1535C 0C029468 */ jal SkelAnime_ChangeAnim - -/* 018C0 80B15360 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 018C4 80B15364 961902E0 */ lhu $t9, 0x02E0($s0) ## 000002E0 -/* 018C8 80B15368 3328FEFF */ andi $t0, $t9, 0xFEFF ## $t0 = 00000000 -/* 018CC 80B1536C 10000011 */ beq $zero, $zero, .L80B153B4 -/* 018D0 80B15370 A60802E0 */ sh $t0, 0x02E0($s0) ## 000002E0 -.L80B15374: -/* 018D4 80B15374 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 018D8 80B15378 44814000 */ mtc1 $at, $f8 ## $f8 = 16.00 -/* 018DC 80B1537C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 018E0 80B15380 44815000 */ mtc1 $at, $f10 ## $f10 = 3.00 -/* 018E4 80B15384 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 018E8 80B15388 AFA90014 */ sw $t1, 0x0014($sp) -/* 018EC 80B1538C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 018F0 80B15390 24A5BF38 */ addiu $a1, $a1, 0xBF38 ## $a1 = FFFFBF38 -/* 018F4 80B15394 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 018F8 80B15398 3C0741A8 */ lui $a3, 0x41A8 ## $a3 = 41A80000 -/* 018FC 80B1539C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01900 80B153A0 0C029468 */ jal SkelAnime_ChangeAnim - -/* 01904 80B153A4 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 01908 80B153A8 960A02E0 */ lhu $t2, 0x02E0($s0) ## 000002E0 -/* 0190C 80B153AC 354B0100 */ ori $t3, $t2, 0x0100 ## $t3 = 00000100 -/* 01910 80B153B0 A60B02E0 */ sh $t3, 0x02E0($s0) ## 000002E0 -.L80B153B4: -/* 01914 80B153B4 960C02E0 */ lhu $t4, 0x02E0($s0) ## 000002E0 -/* 01918 80B153B8 318DFFEF */ andi $t5, $t4, 0xFFEF ## $t5 = 00000000 -/* 0191C 80B153BC A60D02E0 */ sh $t5, 0x02E0($s0) ## 000002E0 -.L80B153C0: -/* 01920 80B153C0 8FBF002C */ lw $ra, 0x002C($sp) -/* 01924 80B153C4 8FB00028 */ lw $s0, 0x0028($sp) -/* 01928 80B153C8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0192C 80B153CC 03E00008 */ jr $ra -/* 01930 80B153D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B153D4.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B153D4.s deleted file mode 100644 index 424991ba41..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B153D4.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B153D4 -/* 01934 80B153D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01938 80B153D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0193C 80B153DC AFA5001C */ sw $a1, 0x001C($sp) -/* 01940 80B153E0 0C2C54C2 */ jal func_80B15308 -/* 01944 80B153E4 AFA40018 */ sw $a0, 0x0018($sp) -/* 01948 80B153E8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0194C 80B153EC 848E02CC */ lh $t6, 0x02CC($a0) ## 000002CC -/* 01950 80B153F0 55C00009 */ bnel $t6, $zero, .L80B15418 -/* 01954 80B153F4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01958 80B153F8 948202E0 */ lhu $v0, 0x02E0($a0) ## 000002E0 -/* 0195C 80B153FC 304F0080 */ andi $t7, $v0, 0x0080 ## $t7 = 00000000 -/* 01960 80B15400 11E00004 */ beq $t7, $zero, .L80B15414 -/* 01964 80B15404 3058FF7F */ andi $t8, $v0, 0xFF7F ## $t8 = 00000000 -/* 01968 80B15408 A49802E0 */ sh $t8, 0x02E0($a0) ## 000002E0 -/* 0196C 80B1540C 0C2C53B7 */ jal func_80B14EDC -/* 01970 80B15410 8FA5001C */ lw $a1, 0x001C($sp) -.L80B15414: -/* 01974 80B15414 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B15418: -/* 01978 80B15418 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0197C 80B1541C 03E00008 */ jr $ra -/* 01980 80B15420 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15424.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15424.s deleted file mode 100644 index 30ef03ffbe..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15424.s +++ /dev/null @@ -1,59 +0,0 @@ -glabel func_80B15424 -/* 01984 80B15424 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01988 80B15428 AFBF001C */ sw $ra, 0x001C($sp) -/* 0198C 80B1542C AFB00018 */ sw $s0, 0x0018($sp) -/* 01990 80B15430 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 01994 80B15434 0C2C54C2 */ jal func_80B15308 -/* 01998 80B15438 AFA40020 */ sw $a0, 0x0020($sp) -/* 0199C 80B1543C 0C042F6F */ jal func_8010BDBC -/* 019A0 80B15440 260420D8 */ addiu $a0, $s0, 0x20D8 ## $a0 = 000020D8 -/* 019A4 80B15444 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 019A8 80B15448 54410028 */ bnel $v0, $at, .L80B154EC -/* 019AC 80B1544C 8FBF001C */ lw $ra, 0x001C($sp) -/* 019B0 80B15450 0C041AF2 */ jal func_80106BC8 -/* 019B4 80B15454 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 019B8 80B15458 10400023 */ beq $v0, $zero, .L80B154E8 -/* 019BC 80B1545C 240E05E4 */ addiu $t6, $zero, 0x05E4 ## $t6 = 000005E4 -/* 019C0 80B15460 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 019C4 80B15464 3C028016 */ lui $v0, %hi(gSaveContext) -/* 019C8 80B15468 00300821 */ addu $at, $at, $s0 -/* 019CC 80B1546C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 019D0 80B15470 A42E1E1A */ sh $t6, 0x1E1A($at) ## 00011E1A -/* 019D4 80B15474 944F13FA */ lhu $t7, 0x13FA($v0) ## 8015FA5A -/* 019D8 80B15478 24090026 */ addiu $t1, $zero, 0x0026 ## $t1 = 00000026 -/* 019DC 80B1547C 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 019E0 80B15480 31F80100 */ andi $t8, $t7, 0x0100 ## $t8 = 00000000 -/* 019E4 80B15484 13000008 */ beq $t8, $zero, .L80B154A8 -/* 019E8 80B15488 3C0E80B1 */ lui $t6, %hi(func_80B153D4) ## $t6 = 80B10000 -/* 019EC 80B1548C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 019F0 80B15490 00300821 */ addu $at, $at, $s0 -/* 019F4 80B15494 2419002E */ addiu $t9, $zero, 0x002E ## $t9 = 0000002E -/* 019F8 80B15498 A0391E5E */ sb $t9, 0x1E5E($at) ## 00011E5E -/* 019FC 80B1549C 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 01A00 80B154A0 10000006 */ beq $zero, $zero, .L80B154BC -/* 01A04 80B154A4 A048141D */ sb $t0, 0x141D($v0) ## 8015FA7D -.L80B154A8: -/* 01A08 80B154A8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01A0C 80B154AC 00300821 */ addu $at, $at, $s0 -/* 01A10 80B154B0 A0291E5E */ sb $t1, 0x1E5E($at) ## 00011E5E -/* 01A14 80B154B4 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 01A18 80B154B8 A04A141D */ sb $t2, 0x141D($v0) ## 8015FA7D -.L80B154BC: -/* 01A1C 80B154BC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01A20 80B154C0 8FA30020 */ lw $v1, 0x0020($sp) -/* 01A24 80B154C4 00300821 */ addu $at, $at, $s0 -/* 01A28 80B154C8 A02B1E15 */ sb $t3, 0x1E15($at) ## 00011E15 -/* 01A2C 80B154CC 944C13FA */ lhu $t4, 0x13FA($v0) ## 8015FA5A -/* 01A30 80B154D0 25CE53D4 */ addiu $t6, $t6, %lo(func_80B153D4) ## $t6 = 80B153D4 -/* 01A34 80B154D4 240F0016 */ addiu $t7, $zero, 0x0016 ## $t7 = 00000016 -/* 01A38 80B154D8 358D0400 */ ori $t5, $t4, 0x0400 ## $t5 = 00000400 -/* 01A3C 80B154DC A44D13FA */ sh $t5, 0x13FA($v0) ## 8015FA5A -/* 01A40 80B154E0 AC6E025C */ sw $t6, 0x025C($v1) ## 0000025C -/* 01A44 80B154E4 A46F02CC */ sh $t7, 0x02CC($v1) ## 000002CC -.L80B154E8: -/* 01A48 80B154E8 8FBF001C */ lw $ra, 0x001C($sp) -.L80B154EC: -/* 01A4C 80B154EC 8FB00018 */ lw $s0, 0x0018($sp) -/* 01A50 80B154F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01A54 80B154F4 03E00008 */ jr $ra -/* 01A58 80B154F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B154FC.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B154FC.s deleted file mode 100644 index 176995e1c1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B154FC.s +++ /dev/null @@ -1,242 +0,0 @@ -.late_rodata -glabel D_80B16F5C - .float 0.03 - -.text -glabel func_80B154FC -/* 01A5C 80B154FC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 01A60 80B15500 AFB20030 */ sw $s2, 0x0030($sp) -/* 01A64 80B15504 AFB1002C */ sw $s1, 0x002C($sp) -/* 01A68 80B15508 AFB00028 */ sw $s0, 0x0028($sp) -/* 01A6C 80B1550C 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 01A70 80B15510 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 01A74 80B15514 AFBF0034 */ sw $ra, 0x0034($sp) -/* 01A78 80B15518 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 01A7C 80B1551C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -.L80B15520: -/* 01A80 80B15520 8CE202B8 */ lw $v0, 0x02B8($a3) ## 000002B8 -/* 01A84 80B15524 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 -/* 01A88 80B15528 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01A8C 80B1552C 1040007F */ beq $v0, $zero, .L80B1572C -/* 01A90 80B15530 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 01A94 80B15534 C440006C */ lwc1 $f0, 0x006C($v0) ## 0000006C -/* 01A98 80B15538 44812000 */ mtc1 $at, $f4 ## $f4 = -2.00 -/* 01A9C 80B1553C 00107040 */ sll $t6, $s0, 1 -/* 01AA0 80B15540 022E1821 */ addu $v1, $s1, $t6 -/* 01AA4 80B15544 4600203C */ c.lt.s $f4, $f0 -/* 01AA8 80B15548 3C0180B1 */ lui $at, %hi(D_80B16F5C) ## $at = 80B10000 -/* 01AAC 80B1554C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 01AB0 80B15550 45020005 */ bc1fl .L80B15568 -/* 01AB4 80B15554 AFA30038 */ sw $v1, 0x0038($sp) -/* 01AB8 80B15558 C4266F5C */ lwc1 $f6, %lo(D_80B16F5C)($at) -/* 01ABC 80B1555C 46060201 */ sub.s $f8, $f0, $f6 -/* 01AC0 80B15560 E448006C */ swc1 $f8, 0x006C($v0) ## 0000006C -/* 01AC4 80B15564 AFA30038 */ sw $v1, 0x0038($sp) -.L80B15568: -/* 01AC8 80B15568 0C2C542B */ jal func_80B150AC -/* 01ACC 80B1556C AFA70044 */ sw $a3, 0x0044($sp) -/* 01AD0 80B15570 8FA30038 */ lw $v1, 0x0038($sp) -/* 01AD4 80B15574 1040006B */ beq $v0, $zero, .L80B15724 -/* 01AD8 80B15578 8FA70044 */ lw $a3, 0x0044($sp) -/* 01ADC 80B1557C 846202C4 */ lh $v0, 0x02C4($v1) ## 000002C4 -/* 01AE0 80B15580 18400003 */ blez $v0, .L80B15590 -/* 01AE4 80B15584 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 01AE8 80B15588 10000068 */ beq $zero, $zero, .L80B1572C -/* 01AEC 80B1558C A46F02C4 */ sh $t7, 0x02C4($v1) ## 000002C4 -.L80B15590: -/* 01AF0 80B15590 3C0141E8 */ lui $at, 0x41E8 ## $at = 41E80000 -/* 01AF4 80B15594 44815000 */ mtc1 $at, $f10 ## $f10 = 29.00 -/* 01AF8 80B15598 A23002CA */ sb $s0, 0x02CA($s1) ## 000002CA -/* 01AFC 80B1559C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01B00 80B155A0 44818000 */ mtc1 $at, $f16 ## $f16 = -10.00 -/* 01B04 80B155A4 2624014C */ addiu $a0, $s1, 0x014C ## $a0 = 0000014C -/* 01B08 80B155A8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01B0C 80B155AC 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 01B10 80B155B0 AFB80014 */ sw $t8, 0x0014($sp) -/* 01B14 80B155B4 24A5BF38 */ addiu $a1, $a1, 0xBF38 ## $a1 = 0600BF38 -/* 01B18 80B155B8 AFA40044 */ sw $a0, 0x0044($sp) -/* 01B1C 80B155BC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01B20 80B155C0 3C074100 */ lui $a3, 0x4100 ## $a3 = 41000000 -/* 01B24 80B155C4 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 01B28 80B155C8 0C029468 */ jal SkelAnime_ChangeAnim - -/* 01B2C 80B155CC E7B00018 */ swc1 $f16, 0x0018($sp) -/* 01B30 80B155D0 963902E0 */ lhu $t9, 0x02E0($s1) ## 000002E0 -/* 01B34 80B155D4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01B38 80B155D8 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 01B3C 80B155DC 3328FFEF */ andi $t0, $t9, 0xFFEF ## $t0 = 00000000 -/* 01B40 80B155E0 0C2C54B4 */ jal func_80B152D0 -/* 01B44 80B155E4 A62802E0 */ sh $t0, 0x02E0($s1) ## 000002E0 -/* 01B48 80B155E8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01B4C 80B155EC 10410009 */ beq $v0, $at, .L80B15614 -/* 01B50 80B155F0 3C108016 */ lui $s0, %hi(gSaveContext) -/* 01B54 80B155F4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01B58 80B155F8 10410033 */ beq $v0, $at, .L80B156C8 -/* 01B5C 80B155FC 24092083 */ addiu $t1, $zero, 0x2083 ## $t1 = 00002083 -/* 01B60 80B15600 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01B64 80B15604 10410036 */ beq $v0, $at, .L80B156E0 -/* 01B68 80B15608 240A2082 */ addiu $t2, $zero, 0x2082 ## $t2 = 00002082 -/* 01B6C 80B1560C 10000039 */ beq $zero, $zero, .L80B156F4 -/* 01B70 80B15610 8E2C0004 */ lw $t4, 0x0004($s1) ## 00000004 -.L80B15614: -/* 01B74 80B15614 2610E660 */ addiu $s0, %lo(gSaveContext) -/* 01B78 80B15618 A60013CE */ sh $zero, 0x13CE($s0) ## 8015FA2E -/* 01B7C 80B1561C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01B80 80B15620 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01B84 80B15624 0C00B7D5 */ jal func_8002DF54 -/* 01B88 80B15628 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01B8C 80B1562C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01B90 80B15630 24052084 */ addiu $a1, $zero, 0x2084 ## $a1 = 00002084 -/* 01B94 80B15634 0C042DA0 */ jal func_8010B680 -/* 01B98 80B15638 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -/* 01B9C 80B1563C 3C0980B1 */ lui $t1, %hi(func_80B15424) ## $t1 = 80B10000 -/* 01BA0 80B15640 3C0141E8 */ lui $at, 0x41E8 ## $at = 41E80000 -/* 01BA4 80B15644 44819000 */ mtc1 $at, $f18 ## $f18 = 29.00 -/* 01BA8 80B15648 25295424 */ addiu $t1, $t1, %lo(func_80B15424) ## $t1 = 80B15424 -/* 01BAC 80B1564C AE29025C */ sw $t1, 0x025C($s1) ## 0000025C -/* 01BB0 80B15650 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01BB4 80B15654 44812000 */ mtc1 $at, $f4 ## $f4 = -10.00 -/* 01BB8 80B15658 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01BBC 80B1565C 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 01BC0 80B15660 AFAA0014 */ sw $t2, 0x0014($sp) -/* 01BC4 80B15664 24A5BF38 */ addiu $a1, $a1, 0xBF38 ## $a1 = 0600BF38 -/* 01BC8 80B15668 8FA40044 */ lw $a0, 0x0044($sp) -/* 01BCC 80B1566C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01BD0 80B15670 3C074100 */ lui $a3, 0x4100 ## $a3 = 41000000 -/* 01BD4 80B15674 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 01BD8 80B15678 0C029468 */ jal SkelAnime_ChangeAnim - -/* 01BDC 80B1567C E7A40018 */ swc1 $f4, 0x0018($sp) -/* 01BE0 80B15680 962B02E0 */ lhu $t3, 0x02E0($s1) ## 000002E0 -/* 01BE4 80B15684 3C041000 */ lui $a0, 0x1000 ## $a0 = 10000000 -/* 01BE8 80B15688 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100000FF -/* 01BEC 80B1568C 316DFFEF */ andi $t5, $t3, 0xFFEF ## $t5 = 00000000 -/* 01BF0 80B15690 A62D02E0 */ sh $t5, 0x02E0($s1) ## 000002E0 -/* 01BF4 80B15694 31AEFEFF */ andi $t6, $t5, 0xFEFF ## $t6 = 00000000 -/* 01BF8 80B15698 A62E02E0 */ sh $t6, 0x02E0($s1) ## 000002E0 -/* 01BFC 80B1569C 960F13FA */ lhu $t7, 0x13FA($s0) ## 8015FA5A -/* 01C00 80B156A0 35F80100 */ ori $t8, $t7, 0x0100 ## $t8 = 00000100 -/* 01C04 80B156A4 0C03E803 */ jal Audio_SetBGM - -/* 01C08 80B156A8 A61813FA */ sh $t8, 0x13FA($s0) ## 8015FA5A -/* 01C0C 80B156AC 963902E0 */ lhu $t9, 0x02E0($s1) ## 000002E0 -/* 01C10 80B156B0 24040039 */ addiu $a0, $zero, 0x0039 ## $a0 = 00000039 -/* 01C14 80B156B4 3328FDFF */ andi $t0, $t9, 0xFDFF ## $t0 = 00000000 -/* 01C18 80B156B8 0C03D719 */ jal func_800F5C64 -/* 01C1C 80B156BC A62802E0 */ sh $t0, 0x02E0($s1) ## 000002E0 -/* 01C20 80B156C0 10000061 */ beq $zero, $zero, .L80B15848 -/* 01C24 80B156C4 8FBF0034 */ lw $ra, 0x0034($sp) -.L80B156C8: -/* 01C28 80B156C8 A629010E */ sh $t1, 0x010E($s1) ## 0000010E -/* 01C2C 80B156CC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01C30 80B156D0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01C34 80B156D4 24056853 */ addiu $a1, $zero, 0x6853 ## $a1 = 00006853 -/* 01C38 80B156D8 10000006 */ beq $zero, $zero, .L80B156F4 -/* 01C3C 80B156DC 8E2C0004 */ lw $t4, 0x0004($s1) ## 00000004 -.L80B156E0: -/* 01C40 80B156E0 A62A010E */ sh $t2, 0x010E($s1) ## 0000010E -/* 01C44 80B156E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01C48 80B156E8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01C4C 80B156EC 24056851 */ addiu $a1, $zero, 0x6851 ## $a1 = 00006851 -/* 01C50 80B156F0 8E2C0004 */ lw $t4, 0x0004($s1) ## 00000004 -.L80B156F4: -/* 01C54 80B156F4 3C0B80B1 */ lui $t3, %hi(func_80B15260) ## $t3 = 80B10000 -/* 01C58 80B156F8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01C5C 80B156FC 256B5260 */ addiu $t3, $t3, %lo(func_80B15260) ## $t3 = 80B15260 -/* 01C60 80B15700 01816825 */ or $t5, $t4, $at ## $t5 = 00010000 -/* 01C64 80B15704 AE2B025C */ sw $t3, 0x025C($s1) ## 0000025C -/* 01C68 80B15708 AE2D0004 */ sw $t5, 0x0004($s1) ## 00000004 -/* 01C6C 80B1570C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01C70 80B15710 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 01C74 80B15714 0C00BCB3 */ jal func_8002F2CC -/* 01C78 80B15718 3C06447A */ lui $a2, 0x447A ## $a2 = 447A0000 -/* 01C7C 80B1571C 1000004A */ beq $zero, $zero, .L80B15848 -/* 01C80 80B15720 8FBF0034 */ lw $ra, 0x0034($sp) -.L80B15724: -/* 01C84 80B15724 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 01C88 80B15728 A46E02C4 */ sh $t6, 0x02C4($v1) ## 000002C4 -.L80B1572C: -/* 01C8C 80B1572C 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 8015E661 -/* 01C90 80B15730 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01C94 80B15734 1601FF7A */ bne $s0, $at, .L80B15520 -/* 01C98 80B15738 24E70004 */ addiu $a3, $a3, 0x0004 ## $a3 = 00000004 -/* 01C9C 80B1573C 3C108016 */ lui $s0, %hi(gSaveContext) -/* 01CA0 80B15740 2610E660 */ addiu $s0, %lo(gSaveContext) -/* 01CA4 80B15744 860213D0 */ lh $v0, 0x13D0($s0) ## 8015FA30 -/* 01CA8 80B15748 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 01CAC 80B1574C 14410004 */ bne $v0, $at, .L80B15760 -/* 01CB0 80B15750 00000000 */ nop -/* 01CB4 80B15754 0C03D646 */ jal func_800F5918 -/* 01CB8 80B15758 00000000 */ nop -/* 01CBC 80B1575C 860213D0 */ lh $v0, 0x13D0($s0) ## 8015FA30 -.L80B15760: -/* 01CC0 80B15760 54400036 */ bnel $v0, $zero, .L80B1583C -/* 01CC4 80B15764 963902E0 */ lhu $t9, 0x02E0($s1) ## 000002E0 -/* 01CC8 80B15768 0C02FF21 */ jal Gameplay_InCsMode -/* 01CCC 80B1576C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01CD0 80B15770 14400031 */ bne $v0, $zero, .L80B15838 -/* 01CD4 80B15774 3C041000 */ lui $a0, 0x1000 ## $a0 = 10000000 -/* 01CD8 80B15778 0C03E803 */ jal Audio_SetBGM - -/* 01CDC 80B1577C 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100000FF -/* 01CE0 80B15780 962F02E0 */ lhu $t7, 0x02E0($s1) ## 000002E0 -/* 01CE4 80B15784 2404482C */ addiu $a0, $zero, 0x482C ## $a0 = 0000482C -/* 01CE8 80B15788 31F8FDFF */ andi $t8, $t7, 0xFDFF ## $t8 = 00000000 -/* 01CEC 80B1578C 0C01E221 */ jal func_80078884 -/* 01CF0 80B15790 A63802E0 */ sh $t8, 0x02E0($s1) ## 000002E0 -/* 01CF4 80B15794 A60013CE */ sh $zero, 0x13CE($s0) ## 8015FA2E -/* 01CF8 80B15798 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01CFC 80B1579C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01D00 80B157A0 0C00B7D5 */ jal func_8002DF54 -/* 01D04 80B157A4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01D08 80B157A8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01D0C 80B157AC 24052081 */ addiu $a1, $zero, 0x2081 ## $a1 = 00002081 -/* 01D10 80B157B0 0C042DA0 */ jal func_8010B680 -/* 01D14 80B157B4 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -/* 01D18 80B157B8 3C1980B1 */ lui $t9, %hi(func_80B15424) ## $t9 = 80B10000 -/* 01D1C 80B157BC 27395424 */ addiu $t9, $t9, %lo(func_80B15424) ## $t9 = 80B15424 -/* 01D20 80B157C0 AE39025C */ sw $t9, 0x025C($s1) ## 0000025C -/* 01D24 80B157C4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01D28 80B157C8 0C2C538A */ jal func_80B14E28 -/* 01D2C 80B157CC 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 01D30 80B157D0 960813FA */ lhu $t0, 0x13FA($s0) ## 8015FA5A -/* 01D34 80B157D4 3C0141E8 */ lui $at, 0x41E8 ## $at = 41E80000 -/* 01D38 80B157D8 44813000 */ mtc1 $at, $f6 ## $f6 = 29.00 -/* 01D3C 80B157DC 3109FEFF */ andi $t1, $t0, 0xFEFF ## $t1 = 00000000 -/* 01D40 80B157E0 A60913FA */ sh $t1, 0x13FA($s0) ## 8015FA5A -/* 01D44 80B157E4 962A02E0 */ lhu $t2, 0x02E0($s1) ## 000002E0 -/* 01D48 80B157E8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01D4C 80B157EC 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 01D50 80B157F0 354B0080 */ ori $t3, $t2, 0x0080 ## $t3 = 00000080 -/* 01D54 80B157F4 A62B02E0 */ sh $t3, 0x02E0($s1) ## 000002E0 -/* 01D58 80B157F8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01D5C 80B157FC 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 01D60 80B15800 2412FEFF */ addiu $s2, $zero, 0xFEFF ## $s2 = FFFFFEFF -/* 01D64 80B15804 AFAC0014 */ sw $t4, 0x0014($sp) -/* 01D68 80B15808 24A5BF38 */ addiu $a1, $a1, 0xBF38 ## $a1 = 0600BF38 -/* 01D6C 80B1580C 2624014C */ addiu $a0, $s1, 0x014C ## $a0 = 0000014C -/* 01D70 80B15810 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01D74 80B15814 3C074100 */ lui $a3, 0x4100 ## $a3 = 41000000 -/* 01D78 80B15818 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01D7C 80B1581C 0C029468 */ jal SkelAnime_ChangeAnim - -/* 01D80 80B15820 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01D84 80B15824 962D02E0 */ lhu $t5, 0x02E0($s1) ## 000002E0 -/* 01D88 80B15828 31AFFFEF */ andi $t7, $t5, 0xFFEF ## $t7 = 00000000 -/* 01D8C 80B1582C A62F02E0 */ sh $t7, 0x02E0($s1) ## 000002E0 -/* 01D90 80B15830 01F2C024 */ and $t8, $t7, $s2 -/* 01D94 80B15834 A63802E0 */ sh $t8, 0x02E0($s1) ## 000002E0 -.L80B15838: -/* 01D98 80B15838 963902E0 */ lhu $t9, 0x02E0($s1) ## 000002E0 -.L80B1583C: -/* 01D9C 80B1583C 37280001 */ ori $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 01DA0 80B15840 A62802E0 */ sh $t0, 0x02E0($s1) ## 000002E0 -/* 01DA4 80B15844 8FBF0034 */ lw $ra, 0x0034($sp) -.L80B15848: -/* 01DA8 80B15848 8FB00028 */ lw $s0, 0x0028($sp) -/* 01DAC 80B1584C 8FB1002C */ lw $s1, 0x002C($sp) -/* 01DB0 80B15850 8FB20030 */ lw $s2, 0x0030($sp) -/* 01DB4 80B15854 03E00008 */ jr $ra -/* 01DB8 80B15858 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1585C.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1585C.s deleted file mode 100644 index d81ac1efe5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1585C.s +++ /dev/null @@ -1,179 +0,0 @@ -.late_rodata -glabel D_80B16F60 - .float 0.03 - -.text -glabel func_80B1585C -/* 01DBC 80B1585C 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 01DC0 80B15860 AFBF005C */ sw $ra, 0x005C($sp) -/* 01DC4 80B15864 AFB60058 */ sw $s6, 0x0058($sp) -/* 01DC8 80B15868 AFB50054 */ sw $s5, 0x0054($sp) -/* 01DCC 80B1586C AFB40050 */ sw $s4, 0x0050($sp) -/* 01DD0 80B15870 AFB3004C */ sw $s3, 0x004C($sp) -/* 01DD4 80B15874 AFB20048 */ sw $s2, 0x0048($sp) -/* 01DD8 80B15878 AFB10044 */ sw $s1, 0x0044($sp) -/* 01DDC 80B1587C AFB00040 */ sw $s0, 0x0040($sp) -/* 01DE0 80B15880 F7B80038 */ sdc1 $f24, 0x0038($sp) -/* 01DE4 80B15884 F7B60030 */ sdc1 $f22, 0x0030($sp) -/* 01DE8 80B15888 F7B40028 */ sdc1 $f20, 0x0028($sp) -/* 01DEC 80B1588C AFA50064 */ sw $a1, 0x0064($sp) -/* 01DF0 80B15890 848202CC */ lh $v0, 0x02CC($a0) ## 000002CC -/* 01DF4 80B15894 0080B025 */ or $s6, $a0, $zero ## $s6 = 00000000 -/* 01DF8 80B15898 24110001 */ addiu $s1, $zero, 0x0001 ## $s1 = 00000001 -/* 01DFC 80B1589C 28410024 */ slti $at, $v0, 0x0024 -/* 01E00 80B158A0 1420001C */ bne $at, $zero, .L80B15914 -/* 01E04 80B158A4 24030023 */ addiu $v1, $zero, 0x0023 ## $v1 = 00000023 -/* 01E08 80B158A8 24920004 */ addiu $s2, $a0, 0x0004 ## $s2 = 00000004 -/* 01E0C 80B158AC 2414D8F0 */ addiu $s4, $zero, 0xD8F0 ## $s4 = FFFFD8F0 -/* 01E10 80B158B0 24130003 */ addiu $s3, $zero, 0x0003 ## $s3 = 00000003 -.L80B158B4: -/* 01E14 80B158B4 8E5002B8 */ lw $s0, 0x02B8($s2) ## 000002BC -/* 01E18 80B158B8 52000010 */ beql $s0, $zero, .L80B158FC -/* 01E1C 80B158BC 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000002 -/* 01E20 80B158C0 02340019 */ multu $s1, $s4 -/* 01E24 80B158C4 240E0100 */ addiu $t6, $zero, 0x0100 ## $t6 = 00000100 -/* 01E28 80B158C8 AFAE0010 */ sw $t6, 0x0010($sp) -/* 01E2C 80B158CC 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 01E30 80B158D0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01E34 80B158D4 24070800 */ addiu $a3, $zero, 0x0800 ## $a3 = 00000800 -/* 01E38 80B158D8 00002812 */ mflo $a1 -/* 01E3C 80B158DC 24A5F448 */ addiu $a1, $a1, 0xF448 ## $a1 = FFFFF448 -/* 01E40 80B158E0 00052C00 */ sll $a1, $a1, 16 -/* 01E44 80B158E4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 01E48 80B158E8 00052C03 */ sra $a1, $a1, 16 -/* 01E4C 80B158EC 8E5002B8 */ lw $s0, 0x02B8($s2) ## 000002BC -/* 01E50 80B158F0 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 -/* 01E54 80B158F4 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B6 -/* 01E58 80B158F8 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000003 -.L80B158FC: -/* 01E5C 80B158FC 1633FFED */ bne $s1, $s3, .L80B158B4 -/* 01E60 80B15900 26520004 */ addiu $s2, $s2, 0x0004 ## $s2 = 00000008 -/* 01E64 80B15904 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01E68 80B15908 4481C000 */ mtc1 $at, $f24 ## $f24 = 10.00 -/* 01E6C 80B1590C 1000003D */ beq $zero, $zero, .L80B15A04 -/* 01E70 80B15910 86C202CC */ lh $v0, 0x02CC($s6) ## 000002CC -.L80B15914: -/* 01E74 80B15914 1462001D */ bne $v1, $v0, .L80B1598C -/* 01E78 80B15918 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 01E7C 80B1591C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01E80 80B15920 4481C000 */ mtc1 $at, $f24 ## $f24 = 10.00 -/* 01E84 80B15924 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 01E88 80B15928 4481A000 */ mtc1 $at, $f20 ## $f20 = 6.00 -/* 01E8C 80B1592C 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 -/* 01E90 80B15930 02C09025 */ or $s2, $s6, $zero ## $s2 = 00000000 -/* 01E94 80B15934 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 -/* 01E98 80B15938 02C0A025 */ or $s4, $s6, $zero ## $s4 = 00000000 -/* 01E9C 80B1593C 24150006 */ addiu $s5, $zero, 0x0006 ## $s5 = 00000006 -/* 01EA0 80B15940 24110001 */ addiu $s1, $zero, 0x0001 ## $s1 = 00000001 -.L80B15944: -/* 01EA4 80B15944 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 01EA8 80B15948 4600A306 */ mov.s $f12, $f20 -/* 01EAC 80B1594C 46180100 */ add.s $f4, $f0, $f24 -/* 01EB0 80B15950 26520004 */ addiu $s2, $s2, 0x0004 ## $s2 = 00000004 -/* 01EB4 80B15954 26730002 */ addiu $s3, $s3, 0x0002 ## $s3 = 00000002 -/* 01EB8 80B15958 4600218D */ trunc.w.s $f6, $f4 -/* 01EBC 80B1595C 44193000 */ mfc1 $t9, $f6 -/* 01EC0 80B15960 00000000 */ nop -/* 01EC4 80B15964 A69902C4 */ sh $t9, 0x02C4($s4) ## 000002C4 -/* 01EC8 80B15968 8E5002B4 */ lw $s0, 0x02B4($s2) ## 000002B8 -/* 01ECC 80B1596C 12000003 */ beq $s0, $zero, .L80B1597C -/* 01ED0 80B15970 00000000 */ nop -/* 01ED4 80B15974 A2110308 */ sb $s1, 0x0308($s0) ## 00000308 -/* 01ED8 80B15978 E616006C */ swc1 $f22, 0x006C($s0) ## 0000006C -.L80B1597C: -/* 01EDC 80B1597C 1675FFF1 */ bne $s3, $s5, .L80B15944 -/* 01EE0 80B15980 26940002 */ addiu $s4, $s4, 0x0002 ## $s4 = 00000002 -/* 01EE4 80B15984 1000001F */ beq $zero, $zero, .L80B15A04 -/* 01EE8 80B15988 86C202CC */ lh $v0, 0x02CC($s6) ## 000002CC -.L80B1598C: -/* 01EEC 80B1598C 3C0180B1 */ lui $at, %hi(D_80B16F60) ## $at = 80B10000 -/* 01EF0 80B15990 C42C6F60 */ lwc1 $f12, %lo(D_80B16F60)($at) -/* 01EF4 80B15994 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 -/* 01EF8 80B15998 44811000 */ mtc1 $at, $f2 ## $f2 = -2.00 -/* 01EFC 80B1599C 02C0A025 */ or $s4, $s6, $zero ## $s4 = 00000000 -/* 01F00 80B159A0 24130003 */ addiu $s3, $zero, 0x0003 ## $s3 = 00000003 -.L80B159A4: -/* 01F04 80B159A4 868802C4 */ lh $t0, 0x02C4($s4) ## 000002C4 -/* 01F08 80B159A8 00115080 */ sll $t2, $s1, 2 -/* 01F0C 80B159AC 02CA5821 */ addu $t3, $s6, $t2 -/* 01F10 80B159B0 00684823 */ subu $t1, $v1, $t0 -/* 01F14 80B159B4 0049082A */ slt $at, $v0, $t1 -/* 01F18 80B159B8 5020000D */ beql $at, $zero, .L80B159F0 -/* 01F1C 80B159BC 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000002 -/* 01F20 80B159C0 8D7002B8 */ lw $s0, 0x02B8($t3) ## 000002B8 -/* 01F24 80B159C4 5200000A */ beql $s0, $zero, .L80B159F0 -/* 01F28 80B159C8 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000003 -/* 01F2C 80B159CC C600006C */ lwc1 $f0, 0x006C($s0) ## 0000006C -/* 01F30 80B159D0 4600103C */ c.lt.s $f2, $f0 -/* 01F34 80B159D4 00000000 */ nop -/* 01F38 80B159D8 45020005 */ bc1fl .L80B159F0 -/* 01F3C 80B159DC 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000004 -/* 01F40 80B159E0 460C0201 */ sub.s $f8, $f0, $f12 -/* 01F44 80B159E4 E608006C */ swc1 $f8, 0x006C($s0) ## 0000006C -/* 01F48 80B159E8 86C202CC */ lh $v0, 0x02CC($s6) ## 000002CC -/* 01F4C 80B159EC 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000005 -.L80B159F0: -/* 01F50 80B159F0 1633FFEC */ bne $s1, $s3, .L80B159A4 -/* 01F54 80B159F4 26940002 */ addiu $s4, $s4, 0x0002 ## $s4 = 00000002 -/* 01F58 80B159F8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01F5C 80B159FC 4481C000 */ mtc1 $at, $f24 ## $f24 = 10.00 -/* 01F60 80B15A00 00000000 */ nop -.L80B15A04: -/* 01F64 80B15A04 14400026 */ bne $v0, $zero, .L80B15AA0 -/* 01F68 80B15A08 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 01F6C 80B15A0C 3C0580B1 */ lui $a1, %hi(func_80B154FC) ## $a1 = 80B10000 -/* 01F70 80B15A10 3C0680B1 */ lui $a2, %hi(func_80B16938) ## $a2 = 80B10000 -/* 01F74 80B15A14 24C66938 */ addiu $a2, $a2, %lo(func_80B16938) ## $a2 = 80B16938 -/* 01F78 80B15A18 0C2C4EA8 */ jal func_80B13AA0 -/* 01F7C 80B15A1C 24A554FC */ addiu $a1, $a1, %lo(func_80B154FC) ## $a1 = 80B154FC -/* 01F80 80B15A20 96CC02E0 */ lhu $t4, 0x02E0($s6) ## 000002E0 -/* 01F84 80B15A24 3C110601 */ lui $s1, 0x0601 ## $s1 = 06010000 -/* 01F88 80B15A28 2631C48C */ addiu $s1, $s1, 0xC48C ## $s1 = 0600C48C -/* 01F8C 80B15A2C 318DFFEF */ andi $t5, $t4, 0xFFEF ## $t5 = 00000000 -/* 01F90 80B15A30 A6CD02E0 */ sh $t5, 0x02E0($s6) ## 000002E0 -/* 01F94 80B15A34 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01F98 80B15A38 02202025 */ or $a0, $s1, $zero ## $a0 = 0600C48C -/* 01F9C 80B15A3C 00028400 */ sll $s0, $v0, 16 -/* 01FA0 80B15A40 00108403 */ sra $s0, $s0, 16 -/* 01FA4 80B15A44 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01FA8 80B15A48 02202025 */ or $a0, $s1, $zero ## $a0 = 0600C48C -/* 01FAC 80B15A4C 44905000 */ mtc1 $s0, $f10 ## $f10 = 0.00 -/* 01FB0 80B15A50 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01FB4 80B15A54 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 01FB8 80B15A58 46805420 */ cvt.s.w $f16, $f10 -/* 01FBC 80B15A5C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01FC0 80B15A60 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01FC4 80B15A64 44060000 */ mfc1 $a2, $f0 -/* 01FC8 80B15A68 AFAE0014 */ sw $t6, 0x0014($sp) -/* 01FCC 80B15A6C 468021A0 */ cvt.s.w $f6, $f4 -/* 01FD0 80B15A70 26C4014C */ addiu $a0, $s6, 0x014C ## $a0 = 0000014C -/* 01FD4 80B15A74 02202825 */ or $a1, $s1, $zero ## $a1 = 0600C48C -/* 01FD8 80B15A78 E7B80018 */ swc1 $f24, 0x0018($sp) -/* 01FDC 80B15A7C 46008481 */ sub.s $f18, $f16, $f0 -/* 01FE0 80B15A80 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01FE4 80B15A84 44079000 */ mfc1 $a3, $f18 -/* 01FE8 80B15A88 0C029468 */ jal SkelAnime_ChangeAnim - -/* 01FEC 80B15A8C 00000000 */ nop -/* 01FF0 80B15A90 8FA40064 */ lw $a0, 0x0064($sp) -/* 01FF4 80B15A94 02C02825 */ or $a1, $s6, $zero ## $a1 = 00000000 -/* 01FF8 80B15A98 0C00B7D5 */ jal func_8002DF54 -/* 01FFC 80B15A9C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -.L80B15AA0: -/* 02000 80B15AA0 8FBF005C */ lw $ra, 0x005C($sp) -/* 02004 80B15AA4 D7B40028 */ ldc1 $f20, 0x0028($sp) -/* 02008 80B15AA8 D7B60030 */ ldc1 $f22, 0x0030($sp) -/* 0200C 80B15AAC D7B80038 */ ldc1 $f24, 0x0038($sp) -/* 02010 80B15AB0 8FB00040 */ lw $s0, 0x0040($sp) -/* 02014 80B15AB4 8FB10044 */ lw $s1, 0x0044($sp) -/* 02018 80B15AB8 8FB20048 */ lw $s2, 0x0048($sp) -/* 0201C 80B15ABC 8FB3004C */ lw $s3, 0x004C($sp) -/* 02020 80B15AC0 8FB40050 */ lw $s4, 0x0050($sp) -/* 02024 80B15AC4 8FB50054 */ lw $s5, 0x0054($sp) -/* 02028 80B15AC8 8FB60058 */ lw $s6, 0x0058($sp) -/* 0202C 80B15ACC 03E00008 */ jr $ra -/* 02030 80B15AD0 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15AD4.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15AD4.s deleted file mode 100644 index 3f66280ce2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15AD4.s +++ /dev/null @@ -1,79 +0,0 @@ -glabel func_80B15AD4 -/* 02034 80B15AD4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02038 80B15AD8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0203C 80B15ADC AFB00028 */ sw $s0, 0x0028($sp) -/* 02040 80B15AE0 AFA50034 */ sw $a1, 0x0034($sp) -/* 02044 80B15AE4 848E02CC */ lh $t6, 0x02CC($a0) ## 000002CC -/* 02048 80B15AE8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0204C 80B15AEC 55C0002E */ bnel $t6, $zero, .L80B15BA8 -/* 02050 80B15AF0 8FA40034 */ lw $a0, 0x0034($sp) -/* 02054 80B15AF4 948F02E0 */ lhu $t7, 0x02E0($a0) ## 000002E0 -/* 02058 80B15AF8 3C0580B1 */ lui $a1, %hi(func_80B1585C) ## $a1 = 80B10000 -/* 0205C 80B15AFC 24A5585C */ addiu $a1, $a1, %lo(func_80B1585C) ## $a1 = 80B1585C -/* 02060 80B15B00 31F80020 */ andi $t8, $t7, 0x0020 ## $t8 = 00000000 -/* 02064 80B15B04 13000027 */ beq $t8, $zero, .L80B15BA4 -/* 02068 80B15B08 3C0680B1 */ lui $a2, %hi(func_80B16938) ## $a2 = 80B10000 -/* 0206C 80B15B0C 0C2C4EA8 */ jal func_80B13AA0 -/* 02070 80B15B10 24C66938 */ addiu $a2, $a2, %lo(func_80B16938) ## $a2 = 80B16938 -/* 02074 80B15B14 961902E0 */ lhu $t9, 0x02E0($s0) ## 000002E0 -/* 02078 80B15B18 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 0207C 80B15B1C 2484BF38 */ addiu $a0, $a0, 0xBF38 ## $a0 = 0600BF38 -/* 02080 80B15B20 3328FFEF */ andi $t0, $t9, 0xFFEF ## $t0 = 00000000 -/* 02084 80B15B24 0C028800 */ jal SkelAnime_GetFrameCount - -/* 02088 80B15B28 A60802E0 */ sh $t0, 0x02E0($s0) ## 000002E0 -/* 0208C 80B15B2C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 02090 80B15B30 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 02094 80B15B34 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 02098 80B15B38 468021A0 */ cvt.s.w $f6, $f4 -/* 0209C 80B15B3C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 020A0 80B15B40 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 020A4 80B15B44 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 020A8 80B15B48 44060000 */ mfc1 $a2, $f0 -/* 020AC 80B15B4C 44070000 */ mfc1 $a3, $f0 -/* 020B0 80B15B50 AFA90014 */ sw $t1, 0x0014($sp) -/* 020B4 80B15B54 24A5BF38 */ addiu $a1, $a1, 0xBF38 ## $a1 = 0600BF38 -/* 020B8 80B15B58 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 020BC 80B15B5C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 020C0 80B15B60 0C029468 */ jal SkelAnime_ChangeAnim - -/* 020C4 80B15B64 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 020C8 80B15B68 240A0032 */ addiu $t2, $zero, 0x0032 ## $t2 = 00000032 -/* 020CC 80B15B6C A60A02CC */ sh $t2, 0x02CC($s0) ## 000002CC -/* 020D0 80B15B70 0C0222CD */ jal func_80088B34 -/* 020D4 80B15B74 2404001E */ addiu $a0, $zero, 0x001E ## $a0 = 0000001E -/* 020D8 80B15B78 0C03D6B3 */ jal func_800F5ACC -/* 020DC 80B15B7C 2404006C */ addiu $a0, $zero, 0x006C ## $a0 = 0000006C -/* 020E0 80B15B80 960B02E0 */ lhu $t3, 0x02E0($s0) ## 000002E0 -/* 020E4 80B15B84 356C0200 */ ori $t4, $t3, 0x0200 ## $t4 = 00000200 -/* 020E8 80B15B88 A60C02E0 */ sh $t4, 0x02E0($s0) ## 000002E0 -/* 020EC 80B15B8C 0C041B33 */ jal func_80106CCC -/* 020F0 80B15B90 8FA40034 */ lw $a0, 0x0034($sp) -/* 020F4 80B15B94 8FA40034 */ lw $a0, 0x0034($sp) -/* 020F8 80B15B98 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 020FC 80B15B9C 0C00B7D5 */ jal func_8002DF54 -/* 02100 80B15BA0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -.L80B15BA4: -/* 02104 80B15BA4 8FA40034 */ lw $a0, 0x0034($sp) -.L80B15BA8: -/* 02108 80B15BA8 0C042F6F */ jal func_8010BDBC -/* 0210C 80B15BAC 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 02110 80B15BB0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 02114 80B15BB4 54410009 */ bnel $v0, $at, .L80B15BDC -/* 02118 80B15BB8 960F02E0 */ lhu $t7, 0x02E0($s0) ## 000002E0 -/* 0211C 80B15BBC 0C041AF2 */ jal func_80106BC8 -/* 02120 80B15BC0 8FA40034 */ lw $a0, 0x0034($sp) -/* 02124 80B15BC4 50400005 */ beql $v0, $zero, .L80B15BDC -/* 02128 80B15BC8 960F02E0 */ lhu $t7, 0x02E0($s0) ## 000002E0 -/* 0212C 80B15BCC 960D02E0 */ lhu $t5, 0x02E0($s0) ## 000002E0 -/* 02130 80B15BD0 35AE0020 */ ori $t6, $t5, 0x0020 ## $t6 = 00000020 -/* 02134 80B15BD4 A60E02E0 */ sh $t6, 0x02E0($s0) ## 000002E0 -/* 02138 80B15BD8 960F02E0 */ lhu $t7, 0x02E0($s0) ## 000002E0 -.L80B15BDC: -/* 0213C 80B15BDC 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 02140 80B15BE0 A61802E0 */ sh $t8, 0x02E0($s0) ## 000002E0 -/* 02144 80B15BE4 8FBF002C */ lw $ra, 0x002C($sp) -/* 02148 80B15BE8 8FB00028 */ lw $s0, 0x0028($sp) -/* 0214C 80B15BEC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02150 80B15BF0 03E00008 */ jr $ra -/* 02154 80B15BF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15BF8.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15BF8.s deleted file mode 100644 index 338811a16d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15BF8.s +++ /dev/null @@ -1,56 +0,0 @@ -glabel func_80B15BF8 -/* 02158 80B15BF8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0215C 80B15BFC AFBF002C */ sw $ra, 0x002C($sp) -/* 02160 80B15C00 AFB00028 */ sw $s0, 0x0028($sp) -/* 02164 80B15C04 AFA50034 */ sw $a1, 0x0034($sp) -/* 02168 80B15C08 948E02E0 */ lhu $t6, 0x02E0($a0) ## 000002E0 -/* 0216C 80B15C0C 3C0580B1 */ lui $a1, %hi(func_80B15AD4) ## $a1 = 80B10000 -/* 02170 80B15C10 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02174 80B15C14 31CF0010 */ andi $t7, $t6, 0x0010 ## $t7 = 00000000 -/* 02178 80B15C18 11E00016 */ beq $t7, $zero, .L80B15C74 -/* 0217C 80B15C1C 24A55AD4 */ addiu $a1, $a1, %lo(func_80B15AD4) ## $a1 = 80B15AD4 -/* 02180 80B15C20 3C0680B1 */ lui $a2, %hi(func_80B16938) ## $a2 = 80B10000 -/* 02184 80B15C24 0C2C4EA8 */ jal func_80B13AA0 -/* 02188 80B15C28 24C66938 */ addiu $a2, $a2, %lo(func_80B16938) ## $a2 = 80B16938 -/* 0218C 80B15C2C 961802E0 */ lhu $t8, 0x02E0($s0) ## 000002E0 -/* 02190 80B15C30 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 02194 80B15C34 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 02198 80B15C38 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 0219C 80B15C3C 3319FFEF */ andi $t9, $t8, 0xFFEF ## $t9 = 00000000 -/* 021A0 80B15C40 A61902E0 */ sh $t9, 0x02E0($s0) ## 000002E0 -/* 021A4 80B15C44 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 021A8 80B15C48 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 021AC 80B15C4C 44060000 */ mfc1 $a2, $f0 -/* 021B0 80B15C50 44071000 */ mfc1 $a3, $f2 -/* 021B4 80B15C54 AFA80014 */ sw $t0, 0x0014($sp) -/* 021B8 80B15C58 24A5BF38 */ addiu $a1, $a1, 0xBF38 ## $a1 = 0600BF38 -/* 021BC 80B15C5C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 021C0 80B15C60 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 021C4 80B15C64 0C029468 */ jal SkelAnime_ChangeAnim - -/* 021C8 80B15C68 E7A20018 */ swc1 $f2, 0x0018($sp) -/* 021CC 80B15C6C 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 -/* 021D0 80B15C70 A60902CC */ sh $t1, 0x02CC($s0) ## 000002CC -.L80B15C74: -/* 021D4 80B15C74 8FA40034 */ lw $a0, 0x0034($sp) -/* 021D8 80B15C78 0C042F6F */ jal func_8010BDBC -/* 021DC 80B15C7C 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 021E0 80B15C80 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 021E4 80B15C84 54410009 */ bnel $v0, $at, .L80B15CAC -/* 021E8 80B15C88 960C02E0 */ lhu $t4, 0x02E0($s0) ## 000002E0 -/* 021EC 80B15C8C 0C041AF2 */ jal func_80106BC8 -/* 021F0 80B15C90 8FA40034 */ lw $a0, 0x0034($sp) -/* 021F4 80B15C94 50400005 */ beql $v0, $zero, .L80B15CAC -/* 021F8 80B15C98 960C02E0 */ lhu $t4, 0x02E0($s0) ## 000002E0 -/* 021FC 80B15C9C 960A02E0 */ lhu $t2, 0x02E0($s0) ## 000002E0 -/* 02200 80B15CA0 354B0020 */ ori $t3, $t2, 0x0020 ## $t3 = 00000020 -/* 02204 80B15CA4 A60B02E0 */ sh $t3, 0x02E0($s0) ## 000002E0 -/* 02208 80B15CA8 960C02E0 */ lhu $t4, 0x02E0($s0) ## 000002E0 -.L80B15CAC: -/* 0220C 80B15CAC 358D0001 */ ori $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 02210 80B15CB0 A60D02E0 */ sh $t5, 0x02E0($s0) ## 000002E0 -/* 02214 80B15CB4 8FBF002C */ lw $ra, 0x002C($sp) -/* 02218 80B15CB8 8FB00028 */ lw $s0, 0x0028($sp) -/* 0221C 80B15CBC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02220 80B15CC0 03E00008 */ jr $ra -/* 02224 80B15CC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15CC8.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15CC8.s deleted file mode 100644 index 759716f723..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15CC8.s +++ /dev/null @@ -1,54 +0,0 @@ -glabel func_80B15CC8 -/* 02228 80B15CC8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0222C 80B15CCC AFBF002C */ sw $ra, 0x002C($sp) -/* 02230 80B15CD0 AFB00028 */ sw $s0, 0x0028($sp) -/* 02234 80B15CD4 AFA50034 */ sw $a1, 0x0034($sp) -/* 02238 80B15CD8 948E02E0 */ lhu $t6, 0x02E0($a0) ## 000002E0 -/* 0223C 80B15CDC 3C0580B1 */ lui $a1, %hi(func_80B15BF8) ## $a1 = 80B10000 -/* 02240 80B15CE0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02244 80B15CE4 31CF0010 */ andi $t7, $t6, 0x0010 ## $t7 = 00000000 -/* 02248 80B15CE8 11E00014 */ beq $t7, $zero, .L80B15D3C -/* 0224C 80B15CEC 24A55BF8 */ addiu $a1, $a1, %lo(func_80B15BF8) ## $a1 = 80B15BF8 -/* 02250 80B15CF0 3C0680B1 */ lui $a2, %hi(func_80B16938) ## $a2 = 80B10000 -/* 02254 80B15CF4 0C2C4EA8 */ jal func_80B13AA0 -/* 02258 80B15CF8 24C66938 */ addiu $a2, $a2, %lo(func_80B16938) ## $a2 = 80B16938 -/* 0225C 80B15CFC 961802E0 */ lhu $t8, 0x02E0($s0) ## 000002E0 -/* 02260 80B15D00 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 02264 80B15D04 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 02268 80B15D08 3319FFEF */ andi $t9, $t8, 0xFFEF ## $t9 = 00000000 -/* 0226C 80B15D0C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02270 80B15D10 A61902E0 */ sh $t9, 0x02E0($s0) ## 000002E0 -/* 02274 80B15D14 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02278 80B15D18 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 0227C 80B15D1C AFA80014 */ sw $t0, 0x0014($sp) -/* 02280 80B15D20 24A5BF38 */ addiu $a1, $a1, 0xBF38 ## $a1 = 0600BF38 -/* 02284 80B15D24 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 02288 80B15D28 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 0228C 80B15D2C 3C0741E8 */ lui $a3, 0x41E8 ## $a3 = 41E80000 -/* 02290 80B15D30 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 02294 80B15D34 0C029468 */ jal SkelAnime_ChangeAnim - -/* 02298 80B15D38 E7A40010 */ swc1 $f4, 0x0010($sp) -.L80B15D3C: -/* 0229C 80B15D3C 8FA40034 */ lw $a0, 0x0034($sp) -/* 022A0 80B15D40 0C042F6F */ jal func_8010BDBC -/* 022A4 80B15D44 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 022A8 80B15D48 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 022AC 80B15D4C 54410009 */ bnel $v0, $at, .L80B15D74 -/* 022B0 80B15D50 960B02E0 */ lhu $t3, 0x02E0($s0) ## 000002E0 -/* 022B4 80B15D54 0C041AF2 */ jal func_80106BC8 -/* 022B8 80B15D58 8FA40034 */ lw $a0, 0x0034($sp) -/* 022BC 80B15D5C 50400005 */ beql $v0, $zero, .L80B15D74 -/* 022C0 80B15D60 960B02E0 */ lhu $t3, 0x02E0($s0) ## 000002E0 -/* 022C4 80B15D64 960902E0 */ lhu $t1, 0x02E0($s0) ## 000002E0 -/* 022C8 80B15D68 352A0020 */ ori $t2, $t1, 0x0020 ## $t2 = 00000020 -/* 022CC 80B15D6C A60A02E0 */ sh $t2, 0x02E0($s0) ## 000002E0 -/* 022D0 80B15D70 960B02E0 */ lhu $t3, 0x02E0($s0) ## 000002E0 -.L80B15D74: -/* 022D4 80B15D74 356C0001 */ ori $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 022D8 80B15D78 A60C02E0 */ sh $t4, 0x02E0($s0) ## 000002E0 -/* 022DC 80B15D7C 8FBF002C */ lw $ra, 0x002C($sp) -/* 022E0 80B15D80 8FB00028 */ lw $s0, 0x0028($sp) -/* 022E4 80B15D84 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 022E8 80B15D88 03E00008 */ jr $ra -/* 022EC 80B15D8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15D90.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15D90.s deleted file mode 100644 index 6cdec95443..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15D90.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80B15D90 -/* 022F0 80B15D90 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 022F4 80B15D94 AFA50034 */ sw $a1, 0x0034($sp) -/* 022F8 80B15D98 AFBF002C */ sw $ra, 0x002C($sp) -/* 022FC 80B15D9C AFB00028 */ sw $s0, 0x0028($sp) -/* 02300 80B15DA0 3C0580B1 */ lui $a1, %hi(func_80B15CC8) ## $a1 = 80B10000 -/* 02304 80B15DA4 3C0680B1 */ lui $a2, %hi(func_80B16938) ## $a2 = 80B10000 -/* 02308 80B15DA8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0230C 80B15DAC 24C66938 */ addiu $a2, $a2, %lo(func_80B16938) ## $a2 = 80B16938 -/* 02310 80B15DB0 0C2C4EA8 */ jal func_80B13AA0 -/* 02314 80B15DB4 24A55CC8 */ addiu $a1, $a1, %lo(func_80B15CC8) ## $a1 = 80B15CC8 -/* 02318 80B15DB8 960E02E0 */ lhu $t6, 0x02E0($s0) ## 000002E0 -/* 0231C 80B15DBC 3C0141E8 */ lui $at, 0x41E8 ## $at = 41E80000 -/* 02320 80B15DC0 44812000 */ mtc1 $at, $f4 ## $f4 = 29.00 -/* 02324 80B15DC4 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 02328 80B15DC8 31CFFFEF */ andi $t7, $t6, 0xFFEF ## $t7 = 00000000 -/* 0232C 80B15DCC 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 02330 80B15DD0 A60F02E0 */ sh $t7, 0x02E0($s0) ## 000002E0 -/* 02334 80B15DD4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02338 80B15DD8 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 0233C 80B15DDC AFB80014 */ sw $t8, 0x0014($sp) -/* 02340 80B15DE0 24A5BF38 */ addiu $a1, $a1, 0xBF38 ## $a1 = 0600BF38 -/* 02344 80B15DE4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 02348 80B15DE8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0234C 80B15DEC 3C074100 */ lui $a3, 0x4100 ## $a3 = 41000000 -/* 02350 80B15DF0 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 02354 80B15DF4 0C029468 */ jal SkelAnime_ChangeAnim - -/* 02358 80B15DF8 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 0235C 80B15DFC 8FA40034 */ lw $a0, 0x0034($sp) -/* 02360 80B15E00 0C042DC8 */ jal func_8010B720 -/* 02364 80B15E04 24052080 */ addiu $a1, $zero, 0x2080 ## $a1 = 00002080 -/* 02368 80B15E08 961902E0 */ lhu $t9, 0x02E0($s0) ## 000002E0 -/* 0236C 80B15E0C 3328FFDF */ andi $t0, $t9, 0xFFDF ## $t0 = 00000000 -/* 02370 80B15E10 A60802E0 */ sh $t0, 0x02E0($s0) ## 000002E0 -/* 02374 80B15E14 8FBF002C */ lw $ra, 0x002C($sp) -/* 02378 80B15E18 8FB00028 */ lw $s0, 0x0028($sp) -/* 0237C 80B15E1C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02380 80B15E20 03E00008 */ jr $ra -/* 02384 80B15E24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15E28.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15E28.s deleted file mode 100644 index 0786e5234d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15E28.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B15E28 -/* 02388 80B15E28 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0238C 80B15E2C AFBF001C */ sw $ra, 0x001C($sp) -/* 02390 80B15E30 AFB00018 */ sw $s0, 0x0018($sp) -/* 02394 80B15E34 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02398 80B15E38 0C00BCCD */ jal func_8002F334 -/* 0239C 80B15E3C AFA50024 */ sw $a1, 0x0024($sp) -/* 023A0 80B15E40 10400007 */ beq $v0, $zero, .L80B15E60 -/* 023A4 80B15E44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 023A8 80B15E48 3C0580B1 */ lui $a1, %hi(func_80B16504) ## $a1 = 80B10000 -/* 023AC 80B15E4C 0C2C53C8 */ jal func_80B14F20 -/* 023B0 80B15E50 24A56504 */ addiu $a1, $a1, %lo(func_80B16504) ## $a1 = 80B16504 -/* 023B4 80B15E54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 023B8 80B15E58 0C2C4EAB */ jal func_80B13AAC -/* 023BC 80B15E5C 8FA50024 */ lw $a1, 0x0024($sp) -.L80B15E60: -/* 023C0 80B15E60 960E02E0 */ lhu $t6, 0x02E0($s0) ## 000002E0 -/* 023C4 80B15E64 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 023C8 80B15E68 A60F02E0 */ sh $t7, 0x02E0($s0) ## 000002E0 -/* 023CC 80B15E6C 8FBF001C */ lw $ra, 0x001C($sp) -/* 023D0 80B15E70 8FB00018 */ lw $s0, 0x0018($sp) -/* 023D4 80B15E74 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 023D8 80B15E78 03E00008 */ jr $ra -/* 023DC 80B15E7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15E80.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15E80.s deleted file mode 100644 index 38aeef7a8f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15E80.s +++ /dev/null @@ -1,59 +0,0 @@ -glabel func_80B15E80 -/* 023E0 80B15E80 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 023E4 80B15E84 AFBF0024 */ sw $ra, 0x0024($sp) -/* 023E8 80B15E88 AFB00020 */ sw $s0, 0x0020($sp) -/* 023EC 80B15E8C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 023F0 80B15E90 0C00BD04 */ jal Actor_HasParent -/* 023F4 80B15E94 AFA5002C */ sw $a1, 0x002C($sp) -/* 023F8 80B15E98 10400011 */ beq $v0, $zero, .L80B15EE0 -/* 023FC 80B15E9C 8FA5002C */ lw $a1, 0x002C($sp) -/* 02400 80B15EA0 960202E0 */ lhu $v0, 0x02E0($s0) ## 000002E0 -/* 02404 80B15EA4 3C0E80B1 */ lui $t6, %hi(func_80B15E28) ## $t6 = 80B10000 -/* 02408 80B15EA8 25CE5E28 */ addiu $t6, $t6, %lo(func_80B15E28) ## $t6 = 80B15E28 -/* 0240C 80B15EAC 304F0002 */ andi $t7, $v0, 0x0002 ## $t7 = 00000000 -/* 02410 80B15EB0 AE000118 */ sw $zero, 0x0118($s0) ## 00000118 -/* 02414 80B15EB4 15E00007 */ bne $t7, $zero, .L80B15ED4 -/* 02418 80B15EB8 AE0E025C */ sw $t6, 0x025C($s0) ## 0000025C -/* 0241C 80B15EBC 3C038016 */ lui $v1, %hi(gSaveContext) -/* 02420 80B15EC0 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 02424 80B15EC4 94780EF0 */ lhu $t8, 0x0EF0($v1) ## 8015F550 -/* 02428 80B15EC8 37190004 */ ori $t9, $t8, 0x0004 ## $t9 = 00000004 -/* 0242C 80B15ECC A4790EF0 */ sh $t9, 0x0EF0($v1) ## 8015F550 -/* 02430 80B15ED0 960202E0 */ lhu $v0, 0x02E0($s0) ## 000002E0 -.L80B15ED4: -/* 02434 80B15ED4 3048FFFD */ andi $t0, $v0, 0xFFFD ## $t0 = 00000000 -/* 02438 80B15ED8 10000016 */ beq $zero, $zero, .L80B15F34 -/* 0243C 80B15EDC A60802E0 */ sh $t0, 0x02E0($s0) ## 000002E0 -.L80B15EE0: -/* 02440 80B15EE0 960902E0 */ lhu $t1, 0x02E0($s0) ## 000002E0 -/* 02444 80B15EE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02448 80B15EE8 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 0244C 80B15EEC 312A0002 */ andi $t2, $t1, 0x0002 ## $t2 = 00000000 -/* 02450 80B15EF0 1140000B */ beq $t2, $zero, .L80B15F20 -/* 02454 80B15EF4 3C07461C */ lui $a3, 0x461C ## $a3 = 461C0000 -/* 02458 80B15EF8 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 0245C 80B15EFC 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 02460 80B15F00 3C07461C */ lui $a3, 0x461C ## $a3 = 461C0000 -/* 02464 80B15F04 34E74000 */ ori $a3, $a3, 0x4000 ## $a3 = 461C4000 -/* 02468 80B15F08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0246C 80B15F0C 24060050 */ addiu $a2, $zero, 0x0050 ## $a2 = 00000050 -/* 02470 80B15F10 0C00BD0D */ jal func_8002F434 -/* 02474 80B15F14 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 02478 80B15F18 10000007 */ beq $zero, $zero, .L80B15F38 -/* 0247C 80B15F1C 960B02E0 */ lhu $t3, 0x02E0($s0) ## 000002E0 -.L80B15F20: -/* 02480 80B15F20 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 02484 80B15F24 44813000 */ mtc1 $at, $f6 ## $f6 = 50.00 -/* 02488 80B15F28 34E74000 */ ori $a3, $a3, 0x4000 ## $a3 = 00004000 -/* 0248C 80B15F2C 0C00BD0D */ jal func_8002F434 -/* 02490 80B15F30 E7A60010 */ swc1 $f6, 0x0010($sp) -.L80B15F34: -/* 02494 80B15F34 960B02E0 */ lhu $t3, 0x02E0($s0) ## 000002E0 -.L80B15F38: -/* 02498 80B15F38 356C0001 */ ori $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 0249C 80B15F3C A60C02E0 */ sh $t4, 0x02E0($s0) ## 000002E0 -/* 024A0 80B15F40 8FBF0024 */ lw $ra, 0x0024($sp) -/* 024A4 80B15F44 8FB00020 */ lw $s0, 0x0020($sp) -/* 024A8 80B15F48 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 024AC 80B15F4C 03E00008 */ jr $ra -/* 024B0 80B15F50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15F54.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15F54.s deleted file mode 100644 index a28e72acf0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15F54.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_80B15F54 -/* 024B4 80B15F54 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 024B8 80B15F58 AFBF001C */ sw $ra, 0x001C($sp) -/* 024BC 80B15F5C AFA40020 */ sw $a0, 0x0020($sp) -/* 024C0 80B15F60 AFA50024 */ sw $a1, 0x0024($sp) -/* 024C4 80B15F64 0C042F6F */ jal func_8010BDBC -/* 024C8 80B15F68 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 024CC 80B15F6C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 024D0 80B15F70 5441001A */ bnel $v0, $at, .L80B15FDC -/* 024D4 80B15F74 8FBF001C */ lw $ra, 0x001C($sp) -/* 024D8 80B15F78 0C041AF2 */ jal func_80106BC8 -/* 024DC 80B15F7C 8FA40024 */ lw $a0, 0x0024($sp) -/* 024E0 80B15F80 50400016 */ beql $v0, $zero, .L80B15FDC -/* 024E4 80B15F84 8FBF001C */ lw $ra, 0x001C($sp) -/* 024E8 80B15F88 0C041B33 */ jal func_80106CCC -/* 024EC 80B15F8C 8FA40024 */ lw $a0, 0x0024($sp) -/* 024F0 80B15F90 8FA40020 */ lw $a0, 0x0020($sp) -/* 024F4 80B15F94 3C0580B1 */ lui $a1, %hi(func_80B15E80) ## $a1 = 80B10000 -/* 024F8 80B15F98 3C0680B1 */ lui $a2, %hi(func_80B16938) ## $a2 = 80B10000 -/* 024FC 80B15F9C 948E02E0 */ lhu $t6, 0x02E0($a0) ## 000002E0 -/* 02500 80B15FA0 24C66938 */ addiu $a2, $a2, %lo(func_80B16938) ## $a2 = 80B16938 -/* 02504 80B15FA4 24A55E80 */ addiu $a1, $a1, %lo(func_80B15E80) ## $a1 = 80B15E80 -/* 02508 80B15FA8 31CFFFFD */ andi $t7, $t6, 0xFFFD ## $t7 = 00000000 -/* 0250C 80B15FAC 0C2C4EA8 */ jal func_80B13AA0 -/* 02510 80B15FB0 A48F02E0 */ sh $t7, 0x02E0($a0) ## 000002E0 -/* 02514 80B15FB4 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 02518 80B15FB8 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 0251C 80B15FBC 3C07461C */ lui $a3, 0x461C ## $a3 = 461C0000 -/* 02520 80B15FC0 34E74000 */ ori $a3, $a3, 0x4000 ## $a3 = 461C4000 -/* 02524 80B15FC4 8FA40020 */ lw $a0, 0x0020($sp) -/* 02528 80B15FC8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0252C 80B15FCC 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 02530 80B15FD0 0C00BD0D */ jal func_8002F434 -/* 02534 80B15FD4 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 02538 80B15FD8 8FBF001C */ lw $ra, 0x001C($sp) -.L80B15FDC: -/* 0253C 80B15FDC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02540 80B15FE0 03E00008 */ jr $ra -/* 02544 80B15FE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15FE8.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15FE8.s deleted file mode 100644 index 7ea658c932..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15FE8.s +++ /dev/null @@ -1,129 +0,0 @@ -glabel func_80B15FE8 -/* 02548 80B15FE8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0254C 80B15FEC AFB00020 */ sw $s0, 0x0020($sp) -/* 02550 80B15FF0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02554 80B15FF4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02558 80B15FF8 AFA5002C */ sw $a1, 0x002C($sp) -/* 0255C 80B15FFC 0C042F6F */ jal func_8010BDBC -/* 02560 80B16000 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 02564 80B16004 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 02568 80B16008 54410064 */ bnel $v0, $at, .L80B1619C -/* 0256C 80B1600C 960202E0 */ lhu $v0, 0x02E0($s0) ## 000002E0 -/* 02570 80B16010 0C041AF2 */ jal func_80106BC8 -/* 02574 80B16014 8FA4002C */ lw $a0, 0x002C($sp) -/* 02578 80B16018 1040005F */ beq $v0, $zero, .L80B16198 -/* 0257C 80B1601C 8FA6002C */ lw $a2, 0x002C($sp) -/* 02580 80B16020 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 02584 80B16024 00461021 */ addu $v0, $v0, $a2 -/* 02588 80B16028 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 0258C 80B1602C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02590 80B16030 10400008 */ beq $v0, $zero, .L80B16054 -/* 02594 80B16034 00000000 */ nop -/* 02598 80B16038 1041003B */ beq $v0, $at, .L80B16128 -/* 0259C 80B1603C 3C188016 */ lui $t8, %hi(gSaveContext+0x34) -/* 025A0 80B16040 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 025A4 80B16044 1041004E */ beq $v0, $at, .L80B16180 -/* 025A8 80B16048 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025AC 80B1604C 10000053 */ beq $zero, $zero, .L80B1619C -/* 025B0 80B16050 960202E0 */ lhu $v0, 0x02E0($s0) ## 000002E0 -.L80B16054: -/* 025B4 80B16054 0C2C5376 */ jal func_80B14DD8 -/* 025B8 80B16058 00000000 */ nop -/* 025BC 80B1605C 10400009 */ beq $v0, $zero, .L80B16084 -/* 025C0 80B16060 8FA4002C */ lw $a0, 0x002C($sp) -/* 025C4 80B16064 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 025C8 80B16068 10410010 */ beq $v0, $at, .L80B160AC -/* 025CC 80B1606C 8FA4002C */ lw $a0, 0x002C($sp) -/* 025D0 80B16070 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 025D4 80B16074 10410017 */ beq $v0, $at, .L80B160D4 -/* 025D8 80B16078 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025DC 80B1607C 10000047 */ beq $zero, $zero, .L80B1619C -/* 025E0 80B16080 960202E0 */ lhu $v0, 0x02E0($s0) ## 000002E0 -.L80B16084: -/* 025E4 80B16084 0C042DC8 */ jal func_8010B720 -/* 025E8 80B16088 24050085 */ addiu $a1, $zero, 0x0085 ## $a1 = 00000085 -/* 025EC 80B1608C 3C0580B1 */ lui $a1, %hi(func_80B15034) ## $a1 = 80B10000 -/* 025F0 80B16090 3C0680B1 */ lui $a2, %hi(func_80B16938) ## $a2 = 80B10000 -/* 025F4 80B16094 24C66938 */ addiu $a2, $a2, %lo(func_80B16938) ## $a2 = 80B16938 -/* 025F8 80B16098 24A55034 */ addiu $a1, $a1, %lo(func_80B15034) ## $a1 = 80B15034 -/* 025FC 80B1609C 0C2C4EA8 */ jal func_80B13AA0 -/* 02600 80B160A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02604 80B160A4 1000003D */ beq $zero, $zero, .L80B1619C -/* 02608 80B160A8 960202E0 */ lhu $v0, 0x02E0($s0) ## 000002E0 -.L80B160AC: -/* 0260C 80B160AC 0C042DC8 */ jal func_8010B720 -/* 02610 80B160B0 2405208A */ addiu $a1, $zero, 0x208A ## $a1 = 0000208A -/* 02614 80B160B4 3C0580B1 */ lui $a1, %hi(func_80B15E28) ## $a1 = 80B10000 -/* 02618 80B160B8 3C0680B1 */ lui $a2, %hi(func_80B16938) ## $a2 = 80B10000 -/* 0261C 80B160BC 24C66938 */ addiu $a2, $a2, %lo(func_80B16938) ## $a2 = 80B16938 -/* 02620 80B160C0 24A55E28 */ addiu $a1, $a1, %lo(func_80B15E28) ## $a1 = 80B15E28 -/* 02624 80B160C4 0C2C4EA8 */ jal func_80B13AA0 -/* 02628 80B160C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0262C 80B160CC 10000033 */ beq $zero, $zero, .L80B1619C -/* 02630 80B160D0 960202E0 */ lhu $v0, 0x02E0($s0) ## 000002E0 -.L80B160D4: -/* 02634 80B160D4 960E02E0 */ lhu $t6, 0x02E0($s0) ## 000002E0 -/* 02638 80B160D8 3C0580B1 */ lui $a1, %hi(func_80B15E80) ## $a1 = 80B10000 -/* 0263C 80B160DC 3C0680B1 */ lui $a2, %hi(func_80B16938) ## $a2 = 80B10000 -/* 02640 80B160E0 35CF0002 */ ori $t7, $t6, 0x0002 ## $t7 = 00000002 -/* 02644 80B160E4 A60F02E0 */ sh $t7, 0x02E0($s0) ## 000002E0 -/* 02648 80B160E8 24C66938 */ addiu $a2, $a2, %lo(func_80B16938) ## $a2 = 80B16938 -/* 0264C 80B160EC 0C2C4EA8 */ jal func_80B13AA0 -/* 02650 80B160F0 24A55E80 */ addiu $a1, $a1, %lo(func_80B15E80) ## $a1 = 80B15E80 -/* 02654 80B160F4 0C021CC3 */ jal Rupees_ChangeBy -/* 02658 80B160F8 2404FFE2 */ addiu $a0, $zero, 0xFFE2 ## $a0 = FFFFFFE2 -/* 0265C 80B160FC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 02660 80B16100 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 02664 80B16104 3C07461C */ lui $a3, 0x461C ## $a3 = 461C0000 -/* 02668 80B16108 34E74000 */ ori $a3, $a3, 0x4000 ## $a3 = 461C4000 -/* 0266C 80B1610C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02670 80B16110 8FA5002C */ lw $a1, 0x002C($sp) -/* 02674 80B16114 24060050 */ addiu $a2, $zero, 0x0050 ## $a2 = 00000050 -/* 02678 80B16118 0C00BD0D */ jal func_8002F434 -/* 0267C 80B1611C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 02680 80B16120 1000001E */ beq $zero, $zero, .L80B1619C -/* 02684 80B16124 960202E0 */ lhu $v0, 0x02E0($s0) ## 000002E0 -.L80B16128: -/* 02688 80B16128 8718E694 */ lh $t8, %lo(gSaveContext+0x34)($t8) -/* 0268C 80B1612C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 02690 80B16130 2B01000A */ slti $at, $t8, 0x000A -/* 02694 80B16134 1020000B */ beq $at, $zero, .L80B16164 -/* 02698 80B16138 00000000 */ nop -/* 0269C 80B1613C 0C042DC8 */ jal func_8010B720 -/* 026A0 80B16140 24050085 */ addiu $a1, $zero, 0x0085 ## $a1 = 00000085 -/* 026A4 80B16144 3C0580B1 */ lui $a1, %hi(func_80B15034) ## $a1 = 80B10000 -/* 026A8 80B16148 3C0680B1 */ lui $a2, %hi(func_80B16938) ## $a2 = 80B10000 -/* 026AC 80B1614C 24C66938 */ addiu $a2, $a2, %lo(func_80B16938) ## $a2 = 80B16938 -/* 026B0 80B16150 24A55034 */ addiu $a1, $a1, %lo(func_80B15034) ## $a1 = 80B15034 -/* 026B4 80B16154 0C2C4EA8 */ jal func_80B13AA0 -/* 026B8 80B16158 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 026BC 80B1615C 1000000F */ beq $zero, $zero, .L80B1619C -/* 026C0 80B16160 960202E0 */ lhu $v0, 0x02E0($s0) ## 000002E0 -.L80B16164: -/* 026C4 80B16164 0C021CC3 */ jal Rupees_ChangeBy -/* 026C8 80B16168 2404FFF6 */ addiu $a0, $zero, 0xFFF6 ## $a0 = FFFFFFF6 -/* 026CC 80B1616C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 026D0 80B16170 0C2C5764 */ jal func_80B15D90 -/* 026D4 80B16174 8FA5002C */ lw $a1, 0x002C($sp) -/* 026D8 80B16178 10000008 */ beq $zero, $zero, .L80B1619C -/* 026DC 80B1617C 960202E0 */ lhu $v0, 0x02E0($s0) ## 000002E0 -.L80B16180: -/* 026E0 80B16180 3C0580B1 */ lui $a1, %hi(func_80B16504) ## $a1 = 80B10000 -/* 026E4 80B16184 0C2C53C8 */ jal func_80B14F20 -/* 026E8 80B16188 24A56504 */ addiu $a1, $a1, %lo(func_80B16504) ## $a1 = 80B16504 -/* 026EC 80B1618C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 026F0 80B16190 0C2C4EAB */ jal func_80B13AAC -/* 026F4 80B16194 8FA5002C */ lw $a1, 0x002C($sp) -.L80B16198: -/* 026F8 80B16198 960202E0 */ lhu $v0, 0x02E0($s0) ## 000002E0 -.L80B1619C: -/* 026FC 80B1619C 30590010 */ andi $t9, $v0, 0x0010 ## $t9 = 00000000 -/* 02700 80B161A0 13200002 */ beq $t9, $zero, .L80B161AC -/* 02704 80B161A4 34480001 */ ori $t0, $v0, 0x0001 ## $t0 = 00000001 -/* 02708 80B161A8 A60802E0 */ sh $t0, 0x02E0($s0) ## 000002E0 -.L80B161AC: -/* 0270C 80B161AC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02710 80B161B0 8FB00020 */ lw $s0, 0x0020($sp) -/* 02714 80B161B4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02718 80B161B8 03E00008 */ jr $ra -/* 0271C 80B161BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B161C0.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B161C0.s deleted file mode 100644 index fb00af250e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B161C0.s +++ /dev/null @@ -1,83 +0,0 @@ -glabel func_80B161C0 -/* 02720 80B161C0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02724 80B161C4 AFBF001C */ sw $ra, 0x001C($sp) -/* 02728 80B161C8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0272C 80B161CC AFA5002C */ sw $a1, 0x002C($sp) -/* 02730 80B161D0 948E010E */ lhu $t6, 0x010E($a0) ## 0000010E -/* 02734 80B161D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02738 80B161D8 24012085 */ addiu $at, $zero, 0x2085 ## $at = 00002085 -/* 0273C 80B161DC 15C10003 */ bne $t6, $at, .L80B161EC -/* 02740 80B161E0 8FA4002C */ lw $a0, 0x002C($sp) -/* 02744 80B161E4 10000002 */ beq $zero, $zero, .L80B161F0 -/* 02748 80B161E8 24030005 */ addiu $v1, $zero, 0x0005 ## $v1 = 00000005 -.L80B161EC: -/* 0274C 80B161EC 2403000A */ addiu $v1, $zero, 0x000A ## $v1 = 0000000A -.L80B161F0: -/* 02750 80B161F0 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 02754 80B161F4 0C042F6F */ jal func_8010BDBC -/* 02758 80B161F8 AFA30024 */ sw $v1, 0x0024($sp) -/* 0275C 80B161FC 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 02760 80B16200 1441002F */ bne $v0, $at, .L80B162C0 -/* 02764 80B16204 8FA30024 */ lw $v1, 0x0024($sp) -/* 02768 80B16208 8FA4002C */ lw $a0, 0x002C($sp) -/* 0276C 80B1620C 0C041AF2 */ jal func_80106BC8 -/* 02770 80B16210 AFA30024 */ sw $v1, 0x0024($sp) -/* 02774 80B16214 1040002A */ beq $v0, $zero, .L80B162C0 -/* 02778 80B16218 8FA30024 */ lw $v1, 0x0024($sp) -/* 0277C 80B1621C 8FA6002C */ lw $a2, 0x002C($sp) -/* 02780 80B16220 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 02784 80B16224 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02788 80B16228 00461021 */ addu $v0, $v0, $a2 -/* 0278C 80B1622C 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 02790 80B16230 3C0F8016 */ lui $t7, %hi(gSaveContext+0x34) -/* 02794 80B16234 10400005 */ beq $v0, $zero, .L80B1624C -/* 02798 80B16238 00000000 */ nop -/* 0279C 80B1623C 1041001A */ beq $v0, $at, .L80B162A8 -/* 027A0 80B16240 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 027A4 80B16244 1000001F */ beq $zero, $zero, .L80B162C4 -/* 027A8 80B16248 960202E0 */ lhu $v0, 0x02E0($s0) ## 000002E0 -.L80B1624C: -/* 027AC 80B1624C 85EFE694 */ lh $t7, %lo(gSaveContext+0x34)($t7) -/* 027B0 80B16250 00032023 */ subu $a0, $zero, $v1 -/* 027B4 80B16254 24050085 */ addiu $a1, $zero, 0x0085 ## $a1 = 00000085 -/* 027B8 80B16258 01E3082A */ slt $at, $t7, $v1 -/* 027BC 80B1625C 1020000B */ beq $at, $zero, .L80B1628C -/* 027C0 80B16260 00042400 */ sll $a0, $a0, 16 -/* 027C4 80B16264 0C042DC8 */ jal func_8010B720 -/* 027C8 80B16268 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 027CC 80B1626C 3C0580B1 */ lui $a1, %hi(func_80B15034) ## $a1 = 80B10000 -/* 027D0 80B16270 3C0680B1 */ lui $a2, %hi(func_80B16938) ## $a2 = 80B10000 -/* 027D4 80B16274 24C66938 */ addiu $a2, $a2, %lo(func_80B16938) ## $a2 = 80B16938 -/* 027D8 80B16278 24A55034 */ addiu $a1, $a1, %lo(func_80B15034) ## $a1 = 80B15034 -/* 027DC 80B1627C 0C2C4EA8 */ jal func_80B13AA0 -/* 027E0 80B16280 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 027E4 80B16284 1000000F */ beq $zero, $zero, .L80B162C4 -/* 027E8 80B16288 960202E0 */ lhu $v0, 0x02E0($s0) ## 000002E0 -.L80B1628C: -/* 027EC 80B1628C 0C021CC3 */ jal Rupees_ChangeBy -/* 027F0 80B16290 00042403 */ sra $a0, $a0, 16 -/* 027F4 80B16294 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 027F8 80B16298 0C2C5764 */ jal func_80B15D90 -/* 027FC 80B1629C 8FA5002C */ lw $a1, 0x002C($sp) -/* 02800 80B162A0 10000008 */ beq $zero, $zero, .L80B162C4 -/* 02804 80B162A4 960202E0 */ lhu $v0, 0x02E0($s0) ## 000002E0 -.L80B162A8: -/* 02808 80B162A8 3C0580B1 */ lui $a1, %hi(func_80B16504) ## $a1 = 80B10000 -/* 0280C 80B162AC 0C2C53C8 */ jal func_80B14F20 -/* 02810 80B162B0 24A56504 */ addiu $a1, $a1, %lo(func_80B16504) ## $a1 = 80B16504 -/* 02814 80B162B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02818 80B162B8 0C2C4EAB */ jal func_80B13AAC -/* 0281C 80B162BC 8FA5002C */ lw $a1, 0x002C($sp) -.L80B162C0: -/* 02820 80B162C0 960202E0 */ lhu $v0, 0x02E0($s0) ## 000002E0 -.L80B162C4: -/* 02824 80B162C4 30580010 */ andi $t8, $v0, 0x0010 ## $t8 = 00000000 -/* 02828 80B162C8 13000002 */ beq $t8, $zero, .L80B162D4 -/* 0282C 80B162CC 34590001 */ ori $t9, $v0, 0x0001 ## $t9 = 00000001 -/* 02830 80B162D0 A61902E0 */ sh $t9, 0x02E0($s0) ## 000002E0 -.L80B162D4: -/* 02834 80B162D4 8FBF001C */ lw $ra, 0x001C($sp) -/* 02838 80B162D8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0283C 80B162DC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02840 80B162E0 03E00008 */ jr $ra -/* 02844 80B162E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B162E8.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B162E8.s deleted file mode 100644 index 03140b15f7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B162E8.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80B162E8 -/* 02848 80B162E8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0284C 80B162EC AFBF0014 */ sw $ra, 0x0014($sp) -/* 02850 80B162F0 AFA40018 */ sw $a0, 0x0018($sp) -/* 02854 80B162F4 AFA5001C */ sw $a1, 0x001C($sp) -/* 02858 80B162F8 0C042F6F */ jal func_8010BDBC -/* 0285C 80B162FC 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 02860 80B16300 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 02864 80B16304 5441000E */ bnel $v0, $at, .L80B16340 -/* 02868 80B16308 8FAE0018 */ lw $t6, 0x0018($sp) -/* 0286C 80B1630C 0C041AF2 */ jal func_80106BC8 -/* 02870 80B16310 8FA4001C */ lw $a0, 0x001C($sp) -/* 02874 80B16314 10400009 */ beq $v0, $zero, .L80B1633C -/* 02878 80B16318 8FA4001C */ lw $a0, 0x001C($sp) -/* 0287C 80B1631C 0C042DC8 */ jal func_8010B720 -/* 02880 80B16320 24052087 */ addiu $a1, $zero, 0x2087 ## $a1 = 00002087 -/* 02884 80B16324 3C0580B1 */ lui $a1, %hi(func_80B15F54) ## $a1 = 80B10000 -/* 02888 80B16328 3C0680B1 */ lui $a2, %hi(func_80B16938) ## $a2 = 80B10000 -/* 0288C 80B1632C 24C66938 */ addiu $a2, $a2, %lo(func_80B16938) ## $a2 = 80B16938 -/* 02890 80B16330 24A55F54 */ addiu $a1, $a1, %lo(func_80B15F54) ## $a1 = 80B15F54 -/* 02894 80B16334 0C2C4EA8 */ jal func_80B13AA0 -/* 02898 80B16338 8FA40018 */ lw $a0, 0x0018($sp) -.L80B1633C: -/* 0289C 80B1633C 8FAE0018 */ lw $t6, 0x0018($sp) -.L80B16340: -/* 028A0 80B16340 95C202E0 */ lhu $v0, 0x02E0($t6) ## 000002E0 -/* 028A4 80B16344 304F0010 */ andi $t7, $v0, 0x0010 ## $t7 = 00000000 -/* 028A8 80B16348 11E00002 */ beq $t7, $zero, .L80B16354 -/* 028AC 80B1634C 34580001 */ ori $t8, $v0, 0x0001 ## $t8 = 00000001 -/* 028B0 80B16350 A5D802E0 */ sh $t8, 0x02E0($t6) ## 000002E0 -.L80B16354: -/* 028B4 80B16354 8FBF0014 */ lw $ra, 0x0014($sp) -/* 028B8 80B16358 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 028BC 80B1635C 03E00008 */ jr $ra -/* 028C0 80B16360 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16364.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16364.s deleted file mode 100644 index 7ae3230efa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16364.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_80B16364 -/* 028C4 80B16364 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 028C8 80B16368 AFBF0014 */ sw $ra, 0x0014($sp) -/* 028CC 80B1636C AFA40018 */ sw $a0, 0x0018($sp) -/* 028D0 80B16370 AFA5001C */ sw $a1, 0x001C($sp) -/* 028D4 80B16374 0C042F6F */ jal func_8010BDBC -/* 028D8 80B16378 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 028DC 80B1637C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 028E0 80B16380 54410021 */ bnel $v0, $at, .L80B16408 -/* 028E4 80B16384 8FA30018 */ lw $v1, 0x0018($sp) -/* 028E8 80B16388 0C041AF2 */ jal func_80106BC8 -/* 028EC 80B1638C 8FA4001C */ lw $a0, 0x001C($sp) -/* 028F0 80B16390 1040001C */ beq $v0, $zero, .L80B16404 -/* 028F4 80B16394 3C028016 */ lui $v0, %hi(gSaveContext) -/* 028F8 80B16398 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 028FC 80B1639C 944E0F06 */ lhu $t6, 0x0F06($v0) ## 8015F566 -/* 02900 80B163A0 94580EF0 */ lhu $t8, 0x0EF0($v0) ## 8015F550 -/* 02904 80B163A4 2405207F */ addiu $a1, $zero, 0x207F ## $a1 = 0000207F -/* 02908 80B163A8 35CF4000 */ ori $t7, $t6, 0x4000 ## $t7 = 00004000 -/* 0290C 80B163AC 33190004 */ andi $t9, $t8, 0x0004 ## $t9 = 00000000 -/* 02910 80B163B0 1320000C */ beq $t9, $zero, .L80B163E4 -/* 02914 80B163B4 A44F0F06 */ sh $t7, 0x0F06($v0) ## 8015F566 -/* 02918 80B163B8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0291C 80B163BC 0C042DC8 */ jal func_8010B720 -/* 02920 80B163C0 2405208B */ addiu $a1, $zero, 0x208B ## $a1 = 0000208B -/* 02924 80B163C4 3C0580B1 */ lui $a1, %hi(func_80B15FE8) ## $a1 = 80B10000 -/* 02928 80B163C8 3C0680B1 */ lui $a2, %hi(func_80B16938) ## $a2 = 80B10000 -/* 0292C 80B163CC 24C66938 */ addiu $a2, $a2, %lo(func_80B16938) ## $a2 = 80B16938 -/* 02930 80B163D0 24A55FE8 */ addiu $a1, $a1, %lo(func_80B15FE8) ## $a1 = 80B15FE8 -/* 02934 80B163D4 0C2C4EA8 */ jal func_80B13AA0 -/* 02938 80B163D8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0293C 80B163DC 1000000A */ beq $zero, $zero, .L80B16408 -/* 02940 80B163E0 8FA30018 */ lw $v1, 0x0018($sp) -.L80B163E4: -/* 02944 80B163E4 0C042DC8 */ jal func_8010B720 -/* 02948 80B163E8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0294C 80B163EC 3C0580B1 */ lui $a1, %hi(func_80B161C0) ## $a1 = 80B10000 -/* 02950 80B163F0 3C0680B1 */ lui $a2, %hi(func_80B16938) ## $a2 = 80B10000 -/* 02954 80B163F4 24C66938 */ addiu $a2, $a2, %lo(func_80B16938) ## $a2 = 80B16938 -/* 02958 80B163F8 24A561C0 */ addiu $a1, $a1, %lo(func_80B161C0) ## $a1 = 80B161C0 -/* 0295C 80B163FC 0C2C4EA8 */ jal func_80B13AA0 -/* 02960 80B16400 8FA40018 */ lw $a0, 0x0018($sp) -.L80B16404: -/* 02964 80B16404 8FA30018 */ lw $v1, 0x0018($sp) -.L80B16408: -/* 02968 80B16408 946202E0 */ lhu $v0, 0x02E0($v1) ## 000002E0 -/* 0296C 80B1640C 30480010 */ andi $t0, $v0, 0x0010 ## $t0 = 00000000 -/* 02970 80B16410 11000002 */ beq $t0, $zero, .L80B1641C -/* 02974 80B16414 34490001 */ ori $t1, $v0, 0x0001 ## $t1 = 00000001 -/* 02978 80B16418 A46902E0 */ sh $t1, 0x02E0($v1) ## 000002E0 -.L80B1641C: -/* 0297C 80B1641C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02980 80B16420 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02984 80B16424 03E00008 */ jr $ra -/* 02988 80B16428 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1642C.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1642C.s deleted file mode 100644 index d86c4dd3e0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1642C.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel func_80B1642C -/* 0298C 80B1642C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02990 80B16430 AFB10020 */ sw $s1, 0x0020($sp) -/* 02994 80B16434 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 02998 80B16438 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0299C 80B1643C AFB0001C */ sw $s0, 0x001C($sp) -/* 029A0 80B16440 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 029A4 80B16444 0C042F6F */ jal func_8010BDBC -/* 029A8 80B16448 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 029AC 80B1644C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 029B0 80B16450 54410028 */ bnel $v0, $at, .L80B164F4 -/* 029B4 80B16454 8FBF0024 */ lw $ra, 0x0024($sp) -/* 029B8 80B16458 0C041AF2 */ jal func_80106BC8 -/* 029BC 80B1645C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 029C0 80B16460 50400024 */ beql $v0, $zero, .L80B164F4 -/* 029C4 80B16464 8FBF0024 */ lw $ra, 0x0024($sp) -/* 029C8 80B16468 0C021AAF */ jal Inventory_HasEmptyBottle -/* 029CC 80B1646C 00000000 */ nop -/* 029D0 80B16470 10400017 */ beq $v0, $zero, .L80B164D0 -/* 029D4 80B16474 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 029D8 80B16478 0C041B33 */ jal func_80106CCC -/* 029DC 80B1647C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 029E0 80B16480 962E02E0 */ lhu $t6, 0x02E0($s1) ## 000002E0 -/* 029E4 80B16484 3C0580B1 */ lui $a1, %hi(func_80B15E80) ## $a1 = 80B10000 -/* 029E8 80B16488 3C0680B1 */ lui $a2, %hi(func_80B16938) ## $a2 = 80B10000 -/* 029EC 80B1648C 35CF0002 */ ori $t7, $t6, 0x0002 ## $t7 = 00000002 -/* 029F0 80B16490 A62F02E0 */ sh $t7, 0x02E0($s1) ## 000002E0 -/* 029F4 80B16494 24C66938 */ addiu $a2, $a2, %lo(func_80B16938) ## $a2 = 80B16938 -/* 029F8 80B16498 24A55E80 */ addiu $a1, $a1, %lo(func_80B15E80) ## $a1 = 80B15E80 -/* 029FC 80B1649C 0C2C4EA8 */ jal func_80B13AA0 -/* 02A00 80B164A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02A04 80B164A4 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 02A08 80B164A8 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 02A0C 80B164AC 3C07461C */ lui $a3, 0x461C ## $a3 = 461C0000 -/* 02A10 80B164B0 34E74000 */ ori $a3, $a3, 0x4000 ## $a3 = 461C4000 -/* 02A14 80B164B4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02A18 80B164B8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02A1C 80B164BC 24060050 */ addiu $a2, $zero, 0x0050 ## $a2 = 00000050 -/* 02A20 80B164C0 0C00BD0D */ jal func_8002F434 -/* 02A24 80B164C4 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 02A28 80B164C8 1000000A */ beq $zero, $zero, .L80B164F4 -/* 02A2C 80B164CC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B164D0: -/* 02A30 80B164D0 0C042DC8 */ jal func_8010B720 -/* 02A34 80B164D4 2405208A */ addiu $a1, $zero, 0x208A ## $a1 = 0000208A -/* 02A38 80B164D8 3C0580B1 */ lui $a1, %hi(func_80B15E28) ## $a1 = 80B10000 -/* 02A3C 80B164DC 3C0680B1 */ lui $a2, %hi(func_80B16938) ## $a2 = 80B10000 -/* 02A40 80B164E0 24C66938 */ addiu $a2, $a2, %lo(func_80B16938) ## $a2 = 80B16938 -/* 02A44 80B164E4 24A55E28 */ addiu $a1, $a1, %lo(func_80B15E28) ## $a1 = 80B15E28 -/* 02A48 80B164E8 0C2C4EA8 */ jal func_80B13AA0 -/* 02A4C 80B164EC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02A50 80B164F0 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B164F4: -/* 02A54 80B164F4 8FB0001C */ lw $s0, 0x001C($sp) -/* 02A58 80B164F8 8FB10020 */ lw $s1, 0x0020($sp) -/* 02A5C 80B164FC 03E00008 */ jr $ra -/* 02A60 80B16500 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16504.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16504.s deleted file mode 100644 index d1611d82b7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16504.s +++ /dev/null @@ -1,73 +0,0 @@ -glabel func_80B16504 -/* 02A64 80B16504 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02A68 80B16508 AFB00018 */ sw $s0, 0x0018($sp) -/* 02A6C 80B1650C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02A70 80B16510 AFBF001C */ sw $ra, 0x001C($sp) -/* 02A74 80B16514 AFA5002C */ sw $a1, 0x002C($sp) -/* 02A78 80B16518 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02A7C 80B1651C 0C01B0D8 */ jal Text_GetFaceReaction -/* 02A80 80B16520 24050018 */ addiu $a1, $zero, 0x0018 ## $a1 = 00000018 -/* 02A84 80B16524 A7A20026 */ sh $v0, 0x0026($sp) -/* 02A88 80B16528 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A8C 80B1652C 0C2C4EAB */ jal func_80B13AAC -/* 02A90 80B16530 8FA5002C */ lw $a1, 0x002C($sp) -/* 02A94 80B16534 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A98 80B16538 8FA5002C */ lw $a1, 0x002C($sp) -/* 02A9C 80B1653C 0C2C50BD */ jal func_80B142F4 -/* 02AA0 80B16540 9606010E */ lhu $a2, 0x010E($s0) ## 0000010E -/* 02AA4 80B16544 10400028 */ beq $v0, $zero, .L80B165E8 -/* 02AA8 80B16548 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02AAC 80B1654C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02AB0 80B16550 24056851 */ addiu $a1, $zero, 0x6851 ## $a1 = 00006851 -/* 02AB4 80B16554 97AE0026 */ lhu $t6, 0x0026($sp) -/* 02AB8 80B16558 3C038016 */ lui $v1, %hi(gSaveContext) -/* 02ABC 80B1655C 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 02AC0 80B16560 11C00006 */ beq $t6, $zero, .L80B1657C -/* 02AC4 80B16564 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02AC8 80B16568 3C0580B1 */ lui $a1, %hi(func_80B15E28) ## $a1 = 80B10000 -/* 02ACC 80B1656C 0C2C53EB */ jal func_80B14FAC -/* 02AD0 80B16570 24A55E28 */ addiu $a1, $a1, %lo(func_80B15E28) ## $a1 = 80B15E28 -/* 02AD4 80B16574 1000001D */ beq $zero, $zero, .L80B165EC -/* 02AD8 80B16578 961902E0 */ lhu $t9, 0x02E0($s0) ## 000002E0 -.L80B1657C: -/* 02ADC 80B1657C 946F0F06 */ lhu $t7, 0x0F06($v1) ## 00000F06 -/* 02AE0 80B16580 2401207E */ addiu $at, $zero, 0x207E ## $at = 0000207E -/* 02AE4 80B16584 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02AE8 80B16588 35F84000 */ ori $t8, $t7, 0x4000 ## $t8 = 00004000 -/* 02AEC 80B1658C A4780F06 */ sh $t8, 0x0F06($v1) ## 00000F06 -/* 02AF0 80B16590 9602010E */ lhu $v0, 0x010E($s0) ## 0000010E -/* 02AF4 80B16594 3C0580B1 */ lui $a1, %hi(func_80B161C0) ## $a1 = 80B10000 -/* 02AF8 80B16598 10410007 */ beq $v0, $at, .L80B165B8 -/* 02AFC 80B1659C 2401207F */ addiu $at, $zero, 0x207F ## $at = 0000207F -/* 02B00 80B165A0 10410005 */ beq $v0, $at, .L80B165B8 -/* 02B04 80B165A4 2401208B */ addiu $at, $zero, 0x208B ## $at = 0000208B -/* 02B08 80B165A8 10410007 */ beq $v0, $at, .L80B165C8 -/* 02B0C 80B165AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02B10 80B165B0 1000000A */ beq $zero, $zero, .L80B165DC -/* 02B14 80B165B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B165B8: -/* 02B18 80B165B8 0C2C53EB */ jal func_80B14FAC -/* 02B1C 80B165BC 24A561C0 */ addiu $a1, $a1, %lo(func_80B161C0) ## $a1 = 80B161C0 -/* 02B20 80B165C0 1000000A */ beq $zero, $zero, .L80B165EC -/* 02B24 80B165C4 961902E0 */ lhu $t9, 0x02E0($s0) ## 000002E0 -.L80B165C8: -/* 02B28 80B165C8 3C0580B1 */ lui $a1, %hi(func_80B15FE8) ## $a1 = 80B10000 -/* 02B2C 80B165CC 0C2C53EB */ jal func_80B14FAC -/* 02B30 80B165D0 24A55FE8 */ addiu $a1, $a1, %lo(func_80B15FE8) ## $a1 = 80B15FE8 -/* 02B34 80B165D4 10000005 */ beq $zero, $zero, .L80B165EC -/* 02B38 80B165D8 961902E0 */ lhu $t9, 0x02E0($s0) ## 000002E0 -.L80B165DC: -/* 02B3C 80B165DC 3C0580B1 */ lui $a1, %hi(func_80B16364) ## $a1 = 80B10000 -/* 02B40 80B165E0 0C2C53EB */ jal func_80B14FAC -/* 02B44 80B165E4 24A56364 */ addiu $a1, $a1, %lo(func_80B16364) ## $a1 = 80B16364 -.L80B165E8: -/* 02B48 80B165E8 961902E0 */ lhu $t9, 0x02E0($s0) ## 000002E0 -.L80B165EC: -/* 02B4C 80B165EC 3328FFFE */ andi $t0, $t9, 0xFFFE ## $t0 = 00000000 -/* 02B50 80B165F0 A60802E0 */ sh $t0, 0x02E0($s0) ## 000002E0 -/* 02B54 80B165F4 8FBF001C */ lw $ra, 0x001C($sp) -/* 02B58 80B165F8 8FB00018 */ lw $s0, 0x0018($sp) -/* 02B5C 80B165FC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02B60 80B16600 03E00008 */ jr $ra -/* 02B64 80B16604 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16608.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16608.s deleted file mode 100644 index 93744e6399..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16608.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel func_80B16608 -/* 02B68 80B16608 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02B6C 80B1660C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02B70 80B16610 AFA5001C */ sw $a1, 0x001C($sp) -/* 02B74 80B16614 0C00BC65 */ jal func_8002F194 -/* 02B78 80B16618 AFA40018 */ sw $a0, 0x0018($sp) -/* 02B7C 80B1661C 1040001B */ beq $v0, $zero, .L80B1668C -/* 02B80 80B16620 8FA40018 */ lw $a0, 0x0018($sp) -/* 02B84 80B16624 9482010E */ lhu $v0, 0x010E($a0) ## 0000010E -/* 02B88 80B16628 24012085 */ addiu $at, $zero, 0x2085 ## $at = 00002085 -/* 02B8C 80B1662C 3C0E80B1 */ lui $t6, %hi(func_80B161C0) ## $t6 = 80B10000 -/* 02B90 80B16630 10410009 */ beq $v0, $at, .L80B16658 -/* 02B94 80B16634 25CE61C0 */ addiu $t6, $t6, %lo(func_80B161C0) ## $t6 = 80B161C0 -/* 02B98 80B16638 24012086 */ addiu $at, $zero, 0x2086 ## $at = 00002086 -/* 02B9C 80B1663C 10410008 */ beq $v0, $at, .L80B16660 -/* 02BA0 80B16640 3C0F80B1 */ lui $t7, %hi(func_80B162E8) ## $t7 = 80B10000 -/* 02BA4 80B16644 24012088 */ addiu $at, $zero, 0x2088 ## $at = 00002088 -/* 02BA8 80B16648 10410008 */ beq $v0, $at, .L80B1666C -/* 02BAC 80B1664C 3C1880B1 */ lui $t8, %hi(func_80B1642C) ## $t8 = 80B10000 -/* 02BB0 80B16650 10000009 */ beq $zero, $zero, .L80B16678 -/* 02BB4 80B16654 8C990004 */ lw $t9, 0x0004($a0) ## 00000004 -.L80B16658: -/* 02BB8 80B16658 10000006 */ beq $zero, $zero, .L80B16674 -/* 02BBC 80B1665C AC8E025C */ sw $t6, 0x025C($a0) ## 0000025C -.L80B16660: -/* 02BC0 80B16660 25EF62E8 */ addiu $t7, $t7, %lo(func_80B162E8) ## $t7 = 80B162E8 -/* 02BC4 80B16664 10000003 */ beq $zero, $zero, .L80B16674 -/* 02BC8 80B16668 AC8F025C */ sw $t7, 0x025C($a0) ## 0000025C -.L80B1666C: -/* 02BCC 80B1666C 2718642C */ addiu $t8, $t8, %lo(func_80B1642C) ## $t8 = 80B1642C -/* 02BD0 80B16670 AC98025C */ sw $t8, 0x025C($a0) ## 0000025C -.L80B16674: -/* 02BD4 80B16674 8C990004 */ lw $t9, 0x0004($a0) ## 00000004 -.L80B16678: -/* 02BD8 80B16678 3C01FFFE */ lui $at, 0xFFFE ## $at = FFFE0000 -/* 02BDC 80B1667C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFEFFFF -/* 02BE0 80B16680 03214024 */ and $t0, $t9, $at -/* 02BE4 80B16684 1000000A */ beq $zero, $zero, .L80B166B0 -/* 02BE8 80B16688 AC880004 */ sw $t0, 0x0004($a0) ## 00000004 -.L80B1668C: -/* 02BEC 80B1668C 8C890004 */ lw $t1, 0x0004($a0) ## 00000004 -/* 02BF0 80B16690 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02BF4 80B16694 3C06447A */ lui $a2, 0x447A ## $a2 = 447A0000 -/* 02BF8 80B16698 01215025 */ or $t2, $t1, $at ## $t2 = 00010000 -/* 02BFC 80B1669C AC8A0004 */ sw $t2, 0x0004($a0) ## 00000004 -/* 02C00 80B166A0 AFA40018 */ sw $a0, 0x0018($sp) -/* 02C04 80B166A4 0C00BCB3 */ jal func_8002F2CC -/* 02C08 80B166A8 8FA5001C */ lw $a1, 0x001C($sp) -/* 02C0C 80B166AC 8FA40018 */ lw $a0, 0x0018($sp) -.L80B166B0: -/* 02C10 80B166B0 948B02E0 */ lhu $t3, 0x02E0($a0) ## 000002E0 -/* 02C14 80B166B4 356C0001 */ ori $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 02C18 80B166B8 A48C02E0 */ sh $t4, 0x02E0($a0) ## 000002E0 -/* 02C1C 80B166BC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02C20 80B166C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02C24 80B166C4 03E00008 */ jr $ra -/* 02C28 80B166C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B166CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B166CC.s deleted file mode 100644 index d0d61b2db5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B166CC.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80B166CC -/* 02C2C 80B166CC 848202B6 */ lh $v0, 0x02B6($a0) ## 000002B6 -/* 02C30 80B166D0 3C0E80B1 */ lui $t6, %hi(func_80B16700) ## $t6 = 80B10000 -/* 02C34 80B166D4 25CE6700 */ addiu $t6, $t6, %lo(func_80B16700) ## $t6 = 80B16700 -/* 02C38 80B166D8 2442FFFF */ addiu $v0, $v0, 0xFFFF ## $v0 = FFFFFFFF -/* 02C3C 80B166DC 00021400 */ sll $v0, $v0, 16 -/* 02C40 80B166E0 00021403 */ sra $v0, $v0, 16 -/* 02C44 80B166E4 50400004 */ beql $v0, $zero, .L80B166F8 -/* 02C48 80B166E8 AC8E02B0 */ sw $t6, 0x02B0($a0) ## 000002B0 -/* 02C4C 80B166EC 03E00008 */ jr $ra -/* 02C50 80B166F0 A48202B6 */ sh $v0, 0x02B6($a0) ## 000002B6 -.L80B166F4: -/* 02C54 80B166F4 AC8E02B0 */ sw $t6, 0x02B0($a0) ## 000002B0 -.L80B166F8: -/* 02C58 80B166F8 03E00008 */ jr $ra -/* 02C5C 80B166FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16700.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16700.s deleted file mode 100644 index 9768cf7740..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16700.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_80B16700 -/* 02C60 80B16700 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02C64 80B16704 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02C68 80B16708 848202B6 */ lh $v0, 0x02B6($a0) ## 000002B6 -/* 02C6C 80B1670C 2442FFFF */ addiu $v0, $v0, 0xFFFF ## $v0 = FFFFFFFF -/* 02C70 80B16710 00021400 */ sll $v0, $v0, 16 -/* 02C74 80B16714 00021403 */ sra $v0, $v0, 16 -/* 02C78 80B16718 50400004 */ beql $v0, $zero, .L80B1672C -/* 02C7C 80B1671C 848202B4 */ lh $v0, 0x02B4($a0) ## 000002B4 -/* 02C80 80B16720 10000023 */ beq $zero, $zero, .L80B167B0 -/* 02C84 80B16724 A48202B6 */ sh $v0, 0x02B6($a0) ## 000002B6 -/* 02C88 80B16728 848202B4 */ lh $v0, 0x02B4($a0) ## 000002B4 -.L80B1672C: -/* 02C8C 80B1672C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 02C90 80B16730 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000000 -/* 02C94 80B16734 00021400 */ sll $v0, $v0, 16 -/* 02C98 80B16738 00021403 */ sra $v0, $v0, 16 -/* 02C9C 80B1673C 28410003 */ slti $at, $v0, 0x0003 -/* 02CA0 80B16740 5420001A */ bnel $at, $zero, .L80B167AC -/* 02CA4 80B16744 A48202B4 */ sh $v0, 0x02B4($a0) ## 000002B4 -/* 02CA8 80B16748 848302CE */ lh $v1, 0x02CE($a0) ## 000002CE -/* 02CAC 80B1674C A48002B4 */ sh $zero, 0x02B4($a0) ## 000002B4 -/* 02CB0 80B16750 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 02CB4 80B16754 18600003 */ blez $v1, .L80B16764 -/* 02CB8 80B16758 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 02CBC 80B1675C 1000000D */ beq $zero, $zero, .L80B16794 -/* 02CC0 80B16760 A48E02CE */ sh $t6, 0x02CE($a0) ## 000002CE -.L80B16764: -/* 02CC4 80B16764 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 02CC8 80B16768 AFA40018 */ sw $a0, 0x0018($sp) -/* 02CCC 80B1676C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 02CD0 80B16770 44812000 */ mtc1 $at, $f4 ## $f4 = 60.00 -/* 02CD4 80B16774 8FA40018 */ lw $a0, 0x0018($sp) -/* 02CD8 80B16778 46040182 */ mul.s $f6, $f0, $f4 -/* 02CDC 80B1677C 4600320D */ trunc.w.s $f8, $f6 -/* 02CE0 80B16780 44024000 */ mfc1 $v0, $f8 -/* 02CE4 80B16784 00000000 */ nop -/* 02CE8 80B16788 24420014 */ addiu $v0, $v0, 0x0014 ## $v0 = 00000014 -/* 02CEC 80B1678C 00021400 */ sll $v0, $v0, 16 -/* 02CF0 80B16790 00021403 */ sra $v0, $v0, 16 -.L80B16794: -/* 02CF4 80B16794 3C1880B1 */ lui $t8, %hi(func_80B166CC) ## $t8 = 80B10000 -/* 02CF8 80B16798 271866CC */ addiu $t8, $t8, %lo(func_80B166CC) ## $t8 = 80B166CC -/* 02CFC 80B1679C A48202B6 */ sh $v0, 0x02B6($a0) ## 000002B6 -/* 02D00 80B167A0 10000003 */ beq $zero, $zero, .L80B167B0 -/* 02D04 80B167A4 AC9802B0 */ sw $t8, 0x02B0($a0) ## 000002B0 -/* 02D08 80B167A8 A48202B4 */ sh $v0, 0x02B4($a0) ## 000002B4 -.L80B167AC: -/* 02D0C 80B167AC A49902B6 */ sh $t9, 0x02B6($a0) ## 000002B6 -.L80B167B0: -/* 02D10 80B167B0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02D14 80B167B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02D18 80B167B8 03E00008 */ jr $ra -/* 02D1C 80B167BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167C0.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167C0.s deleted file mode 100644 index 97f30be9fa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167C0.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80B167C0 -/* 02D20 80B167C0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02D24 80B167C4 AFA40020 */ sw $a0, 0x0020($sp) -/* 02D28 80B167C8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02D2C 80B167CC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02D30 80B167D0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02D34 80B167D4 AFA4001C */ sw $a0, 0x001C($sp) -/* 02D38 80B167D8 10400004 */ beq $v0, $zero, .L80B167EC -/* 02D3C 80B167DC 8FA4001C */ lw $a0, 0x001C($sp) -/* 02D40 80B167E0 8FAE0020 */ lw $t6, 0x0020($sp) -/* 02D44 80B167E4 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop -/* 02D48 80B167E8 8DC502E4 */ lw $a1, 0x02E4($t6) ## 000002E4 -.L80B167EC: -/* 02D4C 80B167EC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02D50 80B167F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02D54 80B167F4 03E00008 */ jr $ra -/* 02D58 80B167F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167FC.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167FC.s deleted file mode 100644 index f3fccbb409..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167FC.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80B167FC -/* 02D5C 80B167FC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02D60 80B16800 AFB00018 */ sw $s0, 0x0018($sp) -/* 02D64 80B16804 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02D68 80B16808 AFBF001C */ sw $ra, 0x001C($sp) -/* 02D6C 80B1680C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02D70 80B16810 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02D74 80B16814 AFA40024 */ sw $a0, 0x0024($sp) -/* 02D78 80B16818 10400006 */ beq $v0, $zero, .L80B16834 -/* 02D7C 80B1681C 8FA40024 */ lw $a0, 0x0024($sp) -/* 02D80 80B16820 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop -/* 02D84 80B16824 8E0502E4 */ lw $a1, 0x02E4($s0) ## 000002E4 -/* 02D88 80B16828 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02D8C 80B1682C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02D90 80B16830 24056850 */ addiu $a1, $zero, 0x6850 ## $a1 = 00006850 -.L80B16834: -/* 02D94 80B16834 960E02E0 */ lhu $t6, 0x02E0($s0) ## 000002E0 -/* 02D98 80B16838 35CF000C */ ori $t7, $t6, 0x000C ## $t7 = 0000000C -/* 02D9C 80B1683C A60F02E0 */ sh $t7, 0x02E0($s0) ## 000002E0 -/* 02DA0 80B16840 8FBF001C */ lw $ra, 0x001C($sp) -/* 02DA4 80B16844 8FB00018 */ lw $s0, 0x0018($sp) -/* 02DA8 80B16848 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02DAC 80B1684C 03E00008 */ jr $ra -/* 02DB0 80B16850 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16854.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16854.s deleted file mode 100644 index 62b2d489a5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16854.s +++ /dev/null @@ -1,64 +0,0 @@ -glabel func_80B16854 -/* 02DB4 80B16854 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02DB8 80B16858 AFBF001C */ sw $ra, 0x001C($sp) -/* 02DBC 80B1685C AFB00018 */ sw $s0, 0x0018($sp) -/* 02DC0 80B16860 848202E2 */ lh $v0, 0x02E2($a0) ## 000002E2 -/* 02DC4 80B16864 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02DC8 80B16868 18400003 */ blez $v0, .L80B16878 -/* 02DCC 80B1686C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 02DD0 80B16870 10000029 */ beq $zero, $zero, .L80B16918 -/* 02DD4 80B16874 A48E02E2 */ sh $t6, 0x02E2($a0) ## 000002E2 -.L80B16878: -/* 02DD8 80B16878 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 02DDC 80B1687C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02DE0 80B16880 AFA40024 */ sw $a0, 0x0024($sp) -/* 02DE4 80B16884 1040000F */ beq $v0, $zero, .L80B168C4 -/* 02DE8 80B16888 8FA40024 */ lw $a0, 0x0024($sp) -/* 02DEC 80B1688C 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop -/* 02DF0 80B16890 8E0502E4 */ lw $a1, 0x02E4($s0) ## 000002E4 -/* 02DF4 80B16894 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 02DF8 80B16898 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 -/* 02DFC 80B1689C 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 02E00 80B168A0 00000000 */ nop -/* 02E04 80B168A4 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 02E08 80B168A8 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 -/* 02E0C 80B168AC 00000000 */ nop -/* 02E10 80B168B0 46040180 */ add.s $f6, $f0, $f4 -/* 02E14 80B168B4 4600320D */ trunc.w.s $f8, $f6 -/* 02E18 80B168B8 44184000 */ mfc1 $t8, $f8 -/* 02E1C 80B168BC 00000000 */ nop -/* 02E20 80B168C0 A61802E2 */ sh $t8, 0x02E2($s0) ## 000002E2 -.L80B168C4: -/* 02E24 80B168C4 3C0142C0 */ lui $at, 0x42C0 ## $at = 42C00000 -/* 02E28 80B168C8 44815000 */ mtc1 $at, $f10 ## $f10 = 96.00 -/* 02E2C 80B168CC C6000164 */ lwc1 $f0, 0x0164($s0) ## 00000164 -/* 02E30 80B168D0 3C014254 */ lui $at, 0x4254 ## $at = 42540000 -/* 02E34 80B168D4 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 02E38 80B168D8 460A003C */ c.lt.s $f0, $f10 -/* 02E3C 80B168DC 00000000 */ nop -/* 02E40 80B168E0 4502000A */ bc1fl .L80B1690C -/* 02E44 80B168E4 A60802B4 */ sh $t0, 0x02B4($s0) ## 000002B4 -/* 02E48 80B168E8 44818000 */ mtc1 $at, $f16 ## $f16 = 53.00 -/* 02E4C 80B168EC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 02E50 80B168F0 4600803E */ c.le.s $f16, $f0 -/* 02E54 80B168F4 00000000 */ nop -/* 02E58 80B168F8 45020004 */ bc1fl .L80B1690C -/* 02E5C 80B168FC A60802B4 */ sh $t0, 0x02B4($s0) ## 000002B4 -/* 02E60 80B16900 10000002 */ beq $zero, $zero, .L80B1690C -/* 02E64 80B16904 A61902B4 */ sh $t9, 0x02B4($s0) ## 000002B4 -/* 02E68 80B16908 A60802B4 */ sh $t0, 0x02B4($s0) ## 000002B4 -.L80B1690C: -/* 02E6C 80B1690C 960902E0 */ lhu $t1, 0x02E0($s0) ## 000002E0 -/* 02E70 80B16910 352A0008 */ ori $t2, $t1, 0x0008 ## $t2 = 00000008 -/* 02E74 80B16914 A60A02E0 */ sh $t2, 0x02E0($s0) ## 000002E0 -.L80B16918: -/* 02E78 80B16918 960B02E0 */ lhu $t3, 0x02E0($s0) ## 000002E0 -/* 02E7C 80B1691C 356C0004 */ ori $t4, $t3, 0x0004 ## $t4 = 00000004 -/* 02E80 80B16920 A60C02E0 */ sh $t4, 0x02E0($s0) ## 000002E0 -/* 02E84 80B16924 8FBF001C */ lw $ra, 0x001C($sp) -/* 02E88 80B16928 8FB00018 */ lw $s0, 0x0018($sp) -/* 02E8C 80B1692C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02E90 80B16930 03E00008 */ jr $ra -/* 02E94 80B16934 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16938.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16938.s deleted file mode 100644 index 6aebac892c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16938.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80B16938 -/* 02E98 80B16938 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02E9C 80B1693C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02EA0 80B16940 948E02E0 */ lhu $t6, 0x02E0($a0) ## 000002E0 -/* 02EA4 80B16944 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 02EA8 80B16948 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02EAC 80B1694C 31CF0010 */ andi $t7, $t6, 0x0010 ## $t7 = 00000000 -/* 02EB0 80B16950 55E0000C */ bnel $t7, $zero, .L80B16984 -/* 02EB4 80B16954 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02EB8 80B16958 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02EBC 80B1695C AFA50018 */ sw $a1, 0x0018($sp) -/* 02EC0 80B16960 10400004 */ beq $v0, $zero, .L80B16974 -/* 02EC4 80B16964 8FA50018 */ lw $a1, 0x0018($sp) -/* 02EC8 80B16968 94B802E0 */ lhu $t8, 0x02E0($a1) ## 000002E0 -/* 02ECC 80B1696C 37190010 */ ori $t9, $t8, 0x0010 ## $t9 = 00000010 -/* 02ED0 80B16970 A4B902E0 */ sh $t9, 0x02E0($a1) ## 000002E0 -.L80B16974: -/* 02ED4 80B16974 94A802E0 */ lhu $t0, 0x02E0($a1) ## 000002E0 -/* 02ED8 80B16978 35090008 */ ori $t1, $t0, 0x0008 ## $t1 = 00000008 -/* 02EDC 80B1697C A4A902E0 */ sh $t1, 0x02E0($a1) ## 000002E0 -/* 02EE0 80B16980 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B16984: -/* 02EE4 80B16984 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02EE8 80B16988 03E00008 */ jr $ra -/* 02EEC 80B1698C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16B1C.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16B1C.s deleted file mode 100644 index 1ae3e54bb4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16B1C.s +++ /dev/null @@ -1,107 +0,0 @@ -glabel func_80B16B1C -/* 0307C 80B16B1C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 03080 80B16B20 AFA60038 */ sw $a2, 0x0038($sp) -/* 03084 80B16B24 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 03088 80B16B28 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0308C 80B16B2C AFA40030 */ sw $a0, 0x0030($sp) -/* 03090 80B16B30 10A60006 */ beq $a1, $a2, .L80B16B4C -/* 03094 80B16B34 AFA7003C */ sw $a3, 0x003C($sp) -/* 03098 80B16B38 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 0309C 80B16B3C 10A1000E */ beq $a1, $at, .L80B16B78 -/* 030A0 80B16B40 8FA20040 */ lw $v0, 0x0040($sp) -/* 030A4 80B16B44 10000015 */ beq $zero, $zero, .L80B16B9C -/* 030A8 80B16B48 8FA30044 */ lw $v1, 0x0044($sp) -.L80B16B4C: -/* 030AC 80B16B4C 8FA20040 */ lw $v0, 0x0040($sp) -/* 030B0 80B16B50 8FA30044 */ lw $v1, 0x0044($sp) -/* 030B4 80B16B54 844E0000 */ lh $t6, 0x0000($v0) ## 00000000 -/* 030B8 80B16B58 846F02DC */ lh $t7, 0x02DC($v1) ## 000002DC -/* 030BC 80B16B5C 84590002 */ lh $t9, 0x0002($v0) ## 00000002 -/* 030C0 80B16B60 01CFC021 */ addu $t8, $t6, $t7 -/* 030C4 80B16B64 A4580000 */ sh $t8, 0x0000($v0) ## 00000000 -/* 030C8 80B16B68 846802DA */ lh $t0, 0x02DA($v1) ## 000002DA -/* 030CC 80B16B6C 03284823 */ subu $t1, $t9, $t0 -/* 030D0 80B16B70 1000000A */ beq $zero, $zero, .L80B16B9C -/* 030D4 80B16B74 A4490002 */ sh $t1, 0x0002($v0) ## 00000002 -.L80B16B78: -/* 030D8 80B16B78 8FA30044 */ lw $v1, 0x0044($sp) -/* 030DC 80B16B7C 844A0000 */ lh $t2, 0x0000($v0) ## 00000000 -/* 030E0 80B16B80 844D0004 */ lh $t5, 0x0004($v0) ## 00000004 -/* 030E4 80B16B84 846B02D6 */ lh $t3, 0x02D6($v1) ## 000002D6 -/* 030E8 80B16B88 014B6021 */ addu $t4, $t2, $t3 -/* 030EC 80B16B8C A44C0000 */ sh $t4, 0x0000($v0) ## 00000000 -/* 030F0 80B16B90 846E02D4 */ lh $t6, 0x02D4($v1) ## 000002D4 -/* 030F4 80B16B94 01AE7821 */ addu $t7, $t5, $t6 -/* 030F8 80B16B98 A44F0004 */ sh $t7, 0x0004($v0) ## 00000004 -.L80B16B9C: -/* 030FC 80B16B9C 946402E0 */ lhu $a0, 0x02E0($v1) ## 000002E0 -/* 03100 80B16BA0 30980008 */ andi $t8, $a0, 0x0008 ## $t8 = 00000000 -/* 03104 80B16BA4 13000003 */ beq $t8, $zero, .L80B16BB4 -/* 03108 80B16BA8 3099FFF7 */ andi $t9, $a0, 0xFFF7 ## $t9 = 00000000 -/* 0310C 80B16BAC 10000037 */ beq $zero, $zero, .L80B16C8C -/* 03110 80B16BB0 A47902E0 */ sh $t9, 0x02E0($v1) ## 000002E0 -.L80B16BB4: -/* 03114 80B16BB4 10A60005 */ beq $a1, $a2, .L80B16BCC -/* 03118 80B16BB8 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 0311C 80B16BBC 10A10003 */ beq $a1, $at, .L80B16BCC -/* 03120 80B16BC0 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 03124 80B16BC4 54A10032 */ bnel $a1, $at, .L80B16C90 -/* 03128 80B16BC8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B16BCC: -/* 0312C 80B16BCC 8FA80030 */ lw $t0, 0x0030($sp) -/* 03130 80B16BD0 00051880 */ sll $v1, $a1, 2 -/* 03134 80B16BD4 00651823 */ subu $v1, $v1, $a1 -/* 03138 80B16BD8 000318C0 */ sll $v1, $v1, 3 -/* 0313C 80B16BDC 8D09009C */ lw $t1, 0x009C($t0) ## 0000009C -/* 03140 80B16BE0 00651821 */ addu $v1, $v1, $a1 -/* 03144 80B16BE4 00031840 */ sll $v1, $v1, 1 -/* 03148 80B16BE8 246A0814 */ addiu $t2, $v1, 0x0814 ## $t2 = 00000814 -/* 0314C 80B16BEC 012A0019 */ multu $t1, $t2 -/* 03150 80B16BF0 AFA3001C */ sw $v1, 0x001C($sp) -/* 03154 80B16BF4 00002012 */ mflo $a0 -/* 03158 80B16BF8 00042400 */ sll $a0, $a0, 16 -/* 0315C 80B16BFC 0C01DE1C */ jal Math_Sins - ## sins? -/* 03160 80B16C00 00042403 */ sra $a0, $a0, 16 -/* 03164 80B16C04 8FA20040 */ lw $v0, 0x0040($sp) -/* 03168 80B16C08 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 0316C 80B16C0C 44814000 */ mtc1 $at, $f8 ## $f8 = 200.00 -/* 03170 80B16C10 844B0002 */ lh $t3, 0x0002($v0) ## 00000002 -/* 03174 80B16C14 8FA3001C */ lw $v1, 0x001C($sp) -/* 03178 80B16C18 46080282 */ mul.s $f10, $f0, $f8 -/* 0317C 80B16C1C 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 -/* 03180 80B16C20 24780940 */ addiu $t8, $v1, 0x0940 ## $t8 = 00000940 -/* 03184 80B16C24 468021A0 */ cvt.s.w $f6, $f4 -/* 03188 80B16C28 460A3400 */ add.s $f16, $f6, $f10 -/* 0318C 80B16C2C 4600848D */ trunc.w.s $f18, $f16 -/* 03190 80B16C30 440D9000 */ mfc1 $t5, $f18 -/* 03194 80B16C34 00000000 */ nop -/* 03198 80B16C38 A44D0002 */ sh $t5, 0x0002($v0) ## 00000002 -/* 0319C 80B16C3C 8FAE0030 */ lw $t6, 0x0030($sp) -/* 031A0 80B16C40 8DCF009C */ lw $t7, 0x009C($t6) ## 0000009C -/* 031A4 80B16C44 01F80019 */ multu $t7, $t8 -/* 031A8 80B16C48 00002012 */ mflo $a0 -/* 031AC 80B16C4C 00042400 */ sll $a0, $a0, 16 -/* 031B0 80B16C50 0C01DE0D */ jal Math_Coss - ## coss? -/* 031B4 80B16C54 00042403 */ sra $a0, $a0, 16 -/* 031B8 80B16C58 8FA20040 */ lw $v0, 0x0040($sp) -/* 031BC 80B16C5C 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 031C0 80B16C60 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 031C4 80B16C64 84590004 */ lh $t9, 0x0004($v0) ## 00000004 -/* 031C8 80B16C68 46060282 */ mul.s $f10, $f0, $f6 -/* 031CC 80B16C6C 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 031D0 80B16C70 00000000 */ nop -/* 031D4 80B16C74 46802220 */ cvt.s.w $f8, $f4 -/* 031D8 80B16C78 460A4400 */ add.s $f16, $f8, $f10 -/* 031DC 80B16C7C 4600848D */ trunc.w.s $f18, $f16 -/* 031E0 80B16C80 44099000 */ mfc1 $t1, $f18 -/* 031E4 80B16C84 00000000 */ nop -/* 031E8 80B16C88 A4490004 */ sh $t1, 0x0004($v0) ## 00000004 -.L80B16C8C: -/* 031EC 80B16C8C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B16C90: -/* 031F0 80B16C90 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 031F4 80B16C94 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 031F8 80B16C98 03E00008 */ jr $ra -/* 031FC 80B16C9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16CA0.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16CA0.s deleted file mode 100644 index 6178c46f8f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16CA0.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80B16CA0 -/* 03200 80B16CA0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03204 80B16CA4 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 03208 80B16CA8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0320C 80B16CAC AFA40018 */ sw $a0, 0x0018($sp) -/* 03210 80B16CB0 AFA60020 */ sw $a2, 0x0020($sp) -/* 03214 80B16CB4 14A10006 */ bne $a1, $at, .L80B16CD0 -/* 03218 80B16CB8 AFA70024 */ sw $a3, 0x0024($sp) -/* 0321C 80B16CBC 8FA50028 */ lw $a1, 0x0028($sp) -/* 03220 80B16CC0 3C0480B1 */ lui $a0, %hi(D_80B16E7C) ## $a0 = 80B10000 -/* 03224 80B16CC4 24846E7C */ addiu $a0, $a0, %lo(D_80B16E7C) ## $a0 = 80B16E7C -/* 03228 80B16CC8 0C0346BD */ jal Matrix_MultVec3f -/* 0322C 80B16CCC 24A50038 */ addiu $a1, $a1, 0x0038 ## $a1 = 00000038 -.L80B16CD0: -/* 03230 80B16CD0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03234 80B16CD4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03238 80B16CD8 03E00008 */ jr $ra -/* 0323C 80B16CDC 00000000 */ nop diff --git a/data/overlays/actors/z_en_ta.data.s b/data/overlays/actors/z_en_ta.data.s deleted file mode 100644 index 8e6829d032..0000000000 --- a/data/overlays/actors/z_en_ta.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel En_Ta_InitVars - .word 0x00840400, 0x00000009, 0x00880000, 0x000002E8 -.word EnTa_Init -.word EnTa_Destroy -.word EnTa_Update -.word EnTa_Draw -glabel D_80B16E50 - .word 0x0A000939, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00010100, 0x001E0028, 0x00000000, 0x00000000 -glabel D_80B16E7C - .word 0x44898000, 0x447A0000, 0x00000000 -glabel D_80B16E88 - .word 0x06007F80, 0x06006EC0, 0x060072C0, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_ta.reloc.s b/data/overlays/actors/z_en_ta.reloc.s deleted file mode 100644 index bafe214aa0..0000000000 --- a/data/overlays/actors/z_en_ta.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_80B16F70 - .incbin "baserom/ovl_En_Ta", 0x34D0, 0x000005F0 diff --git a/include/functions.h b/include/functions.h index 87ac77906a..030f9d6d7e 100644 --- a/include/functions.h +++ b/include/functions.h @@ -2228,6 +2228,7 @@ void func_800F4C58(Vec3f*, u16, u8); // ? func_800F5550(?); // ? func_800F56A8(?); void func_800F574C(f32 arg0, UNK_TYPE arg2); +void func_800F5918(void); void func_800F595C(u16); void func_800F59E8(u16); void func_800F5ACC(u32 bgmID); diff --git a/spec b/spec index 61a84a4b8a..9fd9748ad4 100644 --- a/spec +++ b/spec @@ -3042,8 +3042,7 @@ endseg beginseg name "ovl_En_Ta" include "build/src/overlays/actors/ovl_En_Ta/z_en_ta.o" - include "build/data/overlays/actors/z_en_ta.data.o" - include "build/data/overlays/actors/z_en_ta.reloc.o" + include "build/src/overlays/actors/ovl_En_Ta/ovl_En_Ta_reloc.o" endseg beginseg diff --git a/src/code/z_debug.c b/src/code/z_debug.c index 91137e190e..e585edc73f 100644 --- a/src/code/z_debug.c +++ b/src/code/z_debug.c @@ -151,19 +151,16 @@ void func_8006390C(Input* input) { gGameInfo->dpadLast = dpad; } - increment = (CHECK_BTN_ANY(dpad, BTN_DRIGHT)) - ? (CHECK_BTN_ALL(input->cur.button, BTN_A | BTN_B) - ? 1000 - : CHECK_BTN_ALL(input->cur.button, BTN_A) - ? 100 - : CHECK_BTN_ALL(input->cur.button, BTN_B) ? 10 : 1) - : (CHECK_BTN_ANY(dpad, BTN_DLEFT)) - ? (CHECK_BTN_ALL(input->cur.button, BTN_A | BTN_B) - ? -1000 - : CHECK_BTN_ALL(input->cur.button, BTN_A) - ? -100 - : CHECK_BTN_ALL(input->cur.button, BTN_B) ? -10 : -1) - : 0; + increment = (CHECK_BTN_ANY(dpad, BTN_DRIGHT)) ? (CHECK_BTN_ALL(input->cur.button, BTN_A | BTN_B) ? 1000 + : CHECK_BTN_ALL(input->cur.button, BTN_A) ? 100 + : CHECK_BTN_ALL(input->cur.button, BTN_B) ? 10 + : 1) + : (CHECK_BTN_ANY(dpad, BTN_DLEFT)) + ? (CHECK_BTN_ALL(input->cur.button, BTN_A | BTN_B) ? -1000 + : CHECK_BTN_ALL(input->cur.button, BTN_A) ? -100 + : CHECK_BTN_ALL(input->cur.button, BTN_B) ? -10 + : -1) + : 0; gGameInfo->data[gGameInfo->regCur + regGroup] += increment; if (CHECK_BTN_ANY(dpad, BTN_DUP)) { diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/src/overlays/actors/ovl_En_Ta/z_en_ta.c index 91abbe2610..158ad30973 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -5,6 +5,7 @@ */ #include "z_en_ta.h" +#include "vt.h" #define FLAGS 0x00000009 @@ -15,18 +16,22 @@ void EnTa_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnTa_Update(Actor* thisx, GlobalContext* globalCtx); void EnTa_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_060017E8; -extern UNK_TYPE D_06001C94; -extern UNK_TYPE D_06006DC0; -extern UNK_TYPE D_0600B7B8; -extern UNK_TYPE D_0600BF38; -extern UNK_TYPE D_0600C48C; -extern UNK_TYPE D_0600C858; -extern UNK_TYPE D_0600CD50; -extern UNK_TYPE D_0600CF28; -extern UNK_TYPE D_0600E3D8; +void func_80B14634(EnTa* this, GlobalContext* globalCtx); +void func_80B146F8(EnTa* this, GlobalContext* globalCtx); +void func_80B14754(EnTa* this, GlobalContext* globalCtx); +void func_80B14C18(EnTa* this, GlobalContext* globalCtx); +void func_80B14CAC(EnTa* this, GlobalContext* globalCtx); +void func_80B14D98(EnTa* this, GlobalContext* globalCtx); +void func_80B154FC(EnTa* this, GlobalContext* globalCtx); +void func_80B16504(EnTa* this, GlobalContext* globalCtx); +void func_80B16608(EnTa* this, GlobalContext* globalCtx); +void func_80B166CC(EnTa* this); +void func_80B16700(EnTa* this); +void func_80B167C0(EnTa* this); +void func_80B167FC(EnTa* this); +void func_80B16854(EnTa* this); +void func_80B16938(EnTa* this); -/* const ActorInit En_Ta_InitVars = { ACTOR_EN_TA, ACTORTYPE_NPC, @@ -38,139 +43,1172 @@ const ActorInit En_Ta_InitVars = { (ActorFunc)EnTa_Update, (ActorFunc)EnTa_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AA0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14248.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Destroy.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B142F4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14398.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B143D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14410.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1448C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B144D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14570.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B145F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14634.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B146F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14754.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14818.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14898.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1490C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1496C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B149F4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14A54.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14AF4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14B6C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14C18.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14C60.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14CAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14D4C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14D98.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14DD8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14E28.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14EDC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14F20.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14FAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15034.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B150AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15100.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15260.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B152D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15308.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B153D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15424.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B154FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1585C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15AD4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15BF8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15CC8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15D90.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15E28.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15E80.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15F54.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15FE8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B161C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B162E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16364.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1642C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16504.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16608.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B166CC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16700.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16854.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16938.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Update.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16B1C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16CA0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Draw.s") +static ColliderCylinderInit sCylinderInit = { + { COLTYPE_UNK10, 0x00, 0x09, 0x39, 0x10, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000004, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, + { 30, 40, 0, { 0, 0, 0 } }, +}; + +Vec3f D_80B16E7C = { + 1100.0f, + 1000.0f, + 0.0f, +}; + +UNK_TYPE D_80B16E88[] = { + 0x06007F80, 0x06006EC0, 0x060072C0, +}; + +extern AnimationHeader D_060017E8; +extern AnimationHeader D_06001C94; +extern UNK_TYPE D_06006DC0; +extern FlexSkeletonHeader D_0600B7B8; +extern AnimationHeader D_0600BF38; +extern AnimationHeader D_0600C48C; +extern AnimationHeader D_0600C858; +extern AnimationHeader D_0600CD50; +extern AnimationHeader D_0600CF28; +extern AnimationHeader D_0600E3D8; + +void func_80B13AA0(EnTa* this, EnTaActionFunc arg1, EnTaUnkFunc arg2) { + this->unk_25C = arg1; + this->unk_260 = arg2; +} + +void func_80B13AAC(EnTa* this, GlobalContext* globalCtx) { + u16 faceReaction = Text_GetFaceReaction(globalCtx, 24); + + if (gSaveContext.eventInf[0] & 0x400) { + if (gSaveContext.eventInf[0] & 0x100) { + if (gSaveContext.itemGetInf[0] & 4) { + this->actor.textId = 0x2088; + } else { + this->actor.textId = 0x2086; + } + } else { + this->actor.textId = 0x2085; + } + gSaveContext.eventInf[0] &= ~0x100; + } else if (faceReaction == 0) { + if (gSaveContext.infTable[7] & 0x4000) { + if (gSaveContext.itemGetInf[0] & 4) { + this->actor.textId = 0x208B; + } else { + this->actor.textId = 0x207F; + } + } else { + this->actor.textId = 0x207E; + } + } else { + this->actor.textId = faceReaction; + } +} + +void EnTa_Init(Actor* thisx, GlobalContext* globalCtx) { + EnTa* this = THIS; + GlobalContext* globalCtx2 = globalCtx; + + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 36.0f); + SkelAnime_InitFlex(globalCtx2, &this->skelAnime, &D_0600B7B8, &D_06001C94, this->limbDrawTable, + this->transitionDrawTable, 17); + Collider_InitCylinder(globalCtx2, &this->collider); + Collider_SetCylinder(globalCtx2, &this->collider, &this->actor, &sCylinderInit); + + this->actor.colChkInfo.mass = 0xFF; + this->unk_2E0 = 0; + this->unk_2CE = 0; + this->unk_2E2 = 0; + this->unk_2B6 = 20; + this->unk_2B0 = func_80B166CC; + Actor_SetScale(&this->actor, 0.01f); + this->actor.unk_1F = 6; + this->actor.velocity.y = -4.0f; + this->actor.minVelocityY = -4.0f; + this->actor.gravity = -1.0f; + + switch (this->actor.params) { + case 1: + osSyncPrintf(VT_FGCOL(CYAN) " 追放タロン \n" VT_RST); + if (gSaveContext.eventChkInf[6] & 0x800) { + Actor_Kill(&this->actor); + } else if (LINK_IS_CHILD) { + Actor_Kill(&this->actor); + } else if (gSaveContext.eventChkInf[6] & 0x400) { + func_80B13AA0(this, func_80B14CAC, func_80B167C0); + this->unk_2B4 = 0; + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_06001C94); + this->unk_2E4 = &D_06001C94; + } else { + func_80B13AA0(this, func_80B14754, func_80B167FC); + this->unk_2B4 = 2; + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_0600CD50); + this->unk_2E4 = &D_0600CD50; + this->actor.shape.unk_10 = 54.0f; + } + break; + case 2: + osSyncPrintf(VT_FGCOL(CYAN) " 出戻りタロン \n" VT_RST); + if (!(gSaveContext.eventChkInf[6] & 0x800)) { + Actor_Kill(&this->actor); + } else if (LINK_IS_CHILD) { + Actor_Kill(&this->actor); + } else if (globalCtx2->sceneNum == SCENE_MALON_STABLE && gSaveContext.nightFlag) { + Actor_Kill(&this->actor); + osSyncPrintf(VT_FGCOL(CYAN) " 夜はいない \n" VT_RST); + } else { + func_80B13AA0(this, func_80B14D98, func_80B167C0); + this->unk_2B4 = 0; + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_06001C94); + this->unk_2E4 = &D_06001C94; + } + break; + default: + osSyncPrintf(VT_FGCOL(CYAN) " その他のタロン \n" VT_RST); + if (globalCtx2->sceneNum == SCENE_SPOT15) { + if (gSaveContext.eventChkInf[1] & 0x10) { + Actor_Kill(&this->actor); + } else if (gSaveContext.eventChkInf[1] & 0x8) { + func_80B13AA0(this, func_80B14C18, func_80B167C0); + this->unk_2B4 = 0; + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_06001C94); + this->unk_2E4 = &D_06001C94; + } else { + func_80B13AA0(this, func_80B14634, func_80B167FC); + this->unk_2B4 = 2; + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_0600CD50); + this->unk_2E4 = &D_0600CD50; + this->actor.shape.unk_10 = 54.0f; + } + } else if (globalCtx2->sceneNum == SCENE_SOUKO) { + osSyncPrintf(VT_FGCOL(CYAN) " ロンロン牧場の倉庫 の タロン\n" VT_RST); + if (!(gSaveContext.eventChkInf[1] & 0x10)) { + Actor_Kill(&this->actor); + } else if (LINK_IS_ADULT) { + Actor_Kill(&this->actor); + } else { + if (!gSaveContext.nightFlag) { + this->actor.flags |= 0x10; + this->unk_2C4[0] = this->unk_2C4[1] = this->unk_2C4[2] = 7; + this->unk_2B8[0] = (EnNiw*)Actor_Spawn( + &globalCtx2->actorCtx, globalCtx2, ACTOR_EN_NIW, this->actor.posRot.pos.x + 5.0f, + this->actor.posRot.pos.y + 3.0f, this->actor.posRot.pos.z + 26.0f, 0, 0, 0, 0xD); + this->unk_2B8[1] = (EnNiw*)Actor_Spawn( + &globalCtx2->actorCtx, globalCtx2, ACTOR_EN_NIW, this->actor.posRot.pos.x - 20.0f, + this->actor.posRot.pos.y + 40.0f, this->actor.posRot.pos.z - 30.0f, 0, 0, 0, 0xD); + this->unk_2B8[2] = (EnNiw*)Actor_Spawn( + &globalCtx2->actorCtx, globalCtx2, ACTOR_EN_NIW, this->actor.posRot.pos.x + 20.0f, + this->actor.posRot.pos.y + 40.0f, this->actor.posRot.pos.z - 30.0f, 0, 0, 0, 0xD); + func_80B13AAC(this, globalCtx2); + + if (gSaveContext.eventInf[0] & 0x400) { + func_80B13AA0(this, func_80B16608, func_80B16938); + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600C48C, 1.0f, + SkelAnime_GetFrameCount(&D_0600C48C) - 1.0f, + SkelAnime_GetFrameCount(&D_0600C48C), 2, 0.0f); + gSaveContext.eventInf[0] &= ~0x400; + } else { + func_80B13AA0(this, func_80B16504, func_80B16854); + this->unk_2B4 = 0; + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_060017E8); + this->unk_2E4 = &D_060017E8; + } + } else { + func_80B13AA0(this, func_80B146F8, func_80B167FC); + this->unk_2B4 = 2; + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_0600CD50); + this->unk_2E4 = &D_0600CD50; + this->actor.shape.unk_10 = 54.0f; + } + } + } else { + func_80B13AA0(this, func_80B14634, func_80B167FC); + this->unk_2B4 = 2; + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_0600CD50); + this->unk_2E4 = &D_0600CD50; + this->actor.shape.unk_10 = 54.0f; + } + break; + } +} + +void func_80B14248(EnTa* this) { + if (this->actor.shape.unk_10 > 36.0f) { + this->actor.shape.unk_10 -= 0.8f; + } +} + +void EnTa_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnTa* this = THIS; + + Collider_DestroyCylinder(globalCtx, &this->collider); + + if (this->actor.params != 1 && this->actor.params != 2 && globalCtx->sceneNum == SCENE_SOUKO) { + gSaveContext.timer1State = 0; + } + + if (this->unk_2E0 & 0x200) { + func_800F5B58(); + } +} + +s32 func_80B142F4(EnTa* this, GlobalContext* globalCtx, u16 textId) { + if (func_8002F194(&this->actor, globalCtx)) { + return true; + } + + this->actor.textId = textId; + + if ((ABS((s16)(this->actor.yawTowardsLink - this->actor.shape.rot.y)) <= 0x4300) && + (this->actor.xzDistFromLink < 100.0f)) { + this->unk_2E0 |= 1; + func_8002F2CC(&this->actor, globalCtx, 100.0f); + } + return false; +} + +void func_80B14398(EnTa* this, GlobalContext* globalCtx) { + if (func_8002F334(&this->actor, globalCtx)) { + func_80B13AA0(this, func_80B14754, func_80B167FC); + } +} + +void func_80B143D4(EnTa* this, GlobalContext* globalCtx) { + if (func_8002F334(&this->actor, globalCtx)) { + func_80B13AA0(this, func_80B146F8, func_80B167FC); + } +} + +void func_80B14410(EnTa* this) { + if (LINK_IS_CHILD) { + func_80B13AA0(this, func_80B14C18, func_80B167C0); + gSaveContext.eventChkInf[1] |= 0x8; + } else { + func_80B13AA0(this, func_80B14CAC, func_80B167C0); + gSaveContext.eventChkInf[6] |= 0x400; + } +} + +void func_80B1448C(EnTa* this, GlobalContext* globalCtx) { + if (func_8002F334(&this->actor, globalCtx)) { + func_80B14410(this); + } + func_80B14248(this); + this->unk_2E0 |= 0x4; +} + +void func_80B144D8(EnTa* this, GlobalContext* globalCtx) { + if (func_8002F334(&this->actor, globalCtx)) { + func_80B14410(this); + this->unk_2B6 = 1; + this->unk_2B0 = func_80B16700; + } + if (func_8010BDBC(&globalCtx->msgCtx) == 6) { + this->unk_2B4 = 1; + func_80B13AA0(this, func_80B1448C, func_80B167C0); + } + func_80B14248(this); + this->unk_2E0 |= 4; +} + +void func_80B14570(EnTa* this, GlobalContext* globalCtx) { + this->unk_2E0 |= 4; + + if (this->unk_2CC == 0) { + func_80B13AA0(this, func_80B144D8, func_80B167C0); + this->unk_2CE = 3; + this->unk_2CC = 60; + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_0600E3D8); + this->unk_2E4 = &D_06001C94; + Audio_PlayActorSound2(&this->actor, NA_SE_VO_TA_SURPRISE); + } +} + +void func_80B145F8(EnTa* this, GlobalContext* globalCtx) { + if (func_8002F334(&this->actor, globalCtx)) { + func_80B13AA0(this, func_80B14634, func_80B167FC); + } +} + +void func_80B14634(EnTa* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if (func_8002F194(&this->actor, globalCtx)) { + s32 exchangeItemId = func_8002F368(globalCtx); + + switch (exchangeItemId) { + case EXCH_ITEM_CHICKEN: + player->actor.textId = 0x702B; + func_80B13AA0(this, func_80B14570, func_80B167C0); + this->unk_2CC = 40; + break; + default: + if (exchangeItemId != EXCH_ITEM_NONE) { + player->actor.textId = 0x702A; + } + func_80B13AA0(this, func_80B145F8, func_80B167FC); + break; + } + } else { + this->actor.textId = 0x702A; + func_8002F298(&this->actor, globalCtx, 100.0f, 3); + } +} + +void func_80B146F8(EnTa* this, GlobalContext* globalCtx) { + if (func_8002F194(&this->actor, globalCtx)) { + func_80B13AA0(this, func_80B143D4, func_80B167FC); + } + this->actor.textId = 0x204B; + func_8002F2CC(&this->actor, globalCtx, 100.0f); +} + +void func_80B14754(EnTa* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if (func_8002F194(&this->actor, globalCtx) != 0) { + s32 exchangeItemId = func_8002F368(globalCtx); + + switch (exchangeItemId) { + case EXCH_ITEM_POCKET_CUCCO: + player->actor.textId = 0x702B; + func_80B13AA0(this, func_80B14570, func_80B167C0); + this->unk_2CC = 40; + break; + default: + if (exchangeItemId != EXCH_ITEM_NONE) { + player->actor.textId = 0x5015; + } + func_80B13AA0(this, func_80B14398, func_80B167FC); + break; + } + } else { + this->actor.textId = 0x5015; + func_8002F298(&this->actor, globalCtx, 100.0f, 6); + } +} + +void func_80B14818(EnTa* this, GlobalContext* globalCtx) { + s32 framesMod12 = (s32)globalCtx->state.frames % 12; + + if (framesMod12 == 0 || framesMod12 == 6) { + Audio_PlayActorSound2(&this->actor, NA_SE_PL_WALK_GROUND); + } + if (this->actor.speedXZ < 6.0f) { + this->actor.speedXZ += 0.4f; + } + Actor_MoveForward(&this->actor); +} + +void func_80B14898(EnTa* this, GlobalContext* globalCtx) { + func_80033480(globalCtx, &this->actor.posRot.pos, 50.0f, 2, 250, 20, 1); + func_80B14818(this, globalCtx); + + if (this->unk_2CC == 0) { + Actor_Kill(&this->actor); + } +} + +void func_80B1490C(EnTa* this, GlobalContext* globalCtx) { + this->actor.posRot.rot.y += 0xC00; + this->actor.shape.rot.y += 0xC00; + + if (this->unk_2CC == 0) { + func_80B13AA0(this, func_80B14898, func_80B167C0); + this->unk_2CC = 60; + } +} + +void func_80B1496C(EnTa* this, GlobalContext* globalCtx) { + func_80033480(globalCtx, &this->actor.posRot.pos, 50.0f, 2, 250, 20, 1); + func_80B14818(this, globalCtx); + + if (this->unk_2CC == 0) { + func_80B13AA0(this, func_80B1490C, func_80B167C0); + this->unk_2CC = 5; + } +} + +void func_80B149F4(EnTa* this, GlobalContext* globalCtx) { + this->actor.posRot.rot.y -= 0xD00; + this->actor.shape.rot.y -= 0xD00; + + if (this->unk_2CC == 0) { + func_80B13AA0(this, func_80B1496C, func_80B167C0); + this->unk_2CC = 65; + } +} + +void func_80B14A54(EnTa* this, GlobalContext* globalCtx) { + func_80033480(globalCtx, &this->actor.posRot.pos, 50.0f, 2, 250, 20, 1); + func_80B14818(this, globalCtx); + + if (this->unk_2CC == 20) { + func_80106CCC(globalCtx); + } + if (this->unk_2CC == 0) { + this->unk_2CC = 5; + func_80B13AA0(this, func_80B149F4, func_80B167C0); + } +} + +void func_80B14AF4(EnTa* this, GlobalContext* globalCtx) { + this->actor.posRot.rot.y -= 0xC00; + this->actor.shape.rot.y -= 0xC00; + + if (this->unk_2CC == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_VO_TA_CRY_1); + func_80B13AA0(this, func_80B14A54, func_80B167C0); + this->unk_2CC = 65; + this->actor.flags |= 0x10; + } +} + +void func_80B14B6C(EnTa* this, GlobalContext* globalCtx) { + if (func_8010BDBC(&globalCtx->msgCtx) == 5) { + func_800800F8(globalCtx, 0x104F, -0x63, &this->actor, 0); + func_80B13AA0(this, func_80B14AF4, func_80B167C0); + this->unk_2CC = 5; + gSaveContext.eventChkInf[1] |= 0x10; + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_0600CF28); + this->unk_2E4 = &D_0600C858; + } + this->unk_2E0 |= 1; +} + +void func_80B14C18(EnTa* this, GlobalContext* globalCtx) { + if (func_80B142F4(this, globalCtx, 0x702C)) { + func_80B13AA0(this, func_80B14B6C, func_80B167C0); + } + func_80B14248(this); +} + +void func_80B14C60(EnTa* this, GlobalContext* globalCtx) { + if (func_8002F334(&this->actor, globalCtx)) { + func_80B13AA0(this, func_80B14CAC, func_80B167C0); + } + this->unk_2E0 |= 1; +} + +void func_80B14CAC(EnTa* this, GlobalContext* globalCtx) { + if (gSaveContext.eventChkInf[1] & 0x100) { + if (func_80B142F4(this, globalCtx, 0x5017)) { + func_80B13AA0(this, func_80B14C60, func_80B167C0); + gSaveContext.eventChkInf[6] |= 0x800; + } + } else if (func_80B142F4(this, globalCtx, 0x5016)) { + func_80B13AA0(this, func_80B14C60, func_80B167C0); + } + func_80B14248(this); +} + +void func_80B14D4C(EnTa* this, GlobalContext* globalCtx) { + if (func_8002F334(&this->actor, globalCtx)) { + func_80B13AA0(this, func_80B14D98, func_80B167C0); + } + this->unk_2E0 |= 1; +} + +void func_80B14D98(EnTa* this, GlobalContext* globalCtx) { + if (func_80B142F4(this, globalCtx, 0x2055)) { + func_80B13AA0(this, func_80B14D4C, func_80B167C0); + } +} + +s32 func_80B14DD8(void) { + if (gSaveContext.rupees < 30) { + return 0; + } else if (!Inventory_HasEmptyBottle()) { + return 1; + } else { + return 2; + } +} + +void func_80B14E28(EnTa* this, GlobalContext* globalCtx) { + Vec3f b; + Vec3f a; + + this->unk_2D0 = Gameplay_CreateSubCamera(globalCtx); + this->unk_2D2 = globalCtx->activeCamera; + Gameplay_ChangeCameraStatus(globalCtx, this->unk_2D2, 1); + Gameplay_ChangeCameraStatus(globalCtx, this->unk_2D0, 7); + + b.x = 1053.0f; + b.y = 11.0f; + b.z = 22.0f; + + a.x = 1053.0f; + a.y = 45.0f; + a.z = -40.0f; + + Gameplay_CameraSetAtEye(globalCtx, this->unk_2D0, &a, &b); +} + +void func_80B14EDC(EnTa* this, GlobalContext* globalCtx) { + Gameplay_ChangeCameraStatus(globalCtx, this->unk_2D2, 7); + Gameplay_ClearCamera(globalCtx, this->unk_2D0); +} + +void func_80B14F20(EnTa* this, EnTaActionFunc arg1) { + func_80B13AA0(this, arg1, func_80B16854); + this->unk_2B4 = 2; + SkelAnime_ChangeAnim(&this->skelAnime, &D_060017E8, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_060017E8), 2, -5.0f); + this->unk_2E2 = 0; + this->unk_2E4 = &D_060017E8; +} + +void func_80B14FAC(EnTa* this, EnTaActionFunc arg1) { + this->unk_2B4 = 1; + func_80B13AA0(this, arg1, func_80B16938); + this->unk_2E0 &= ~0x10; + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600C48C, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_0600C48C), 2, -5.0f); +} + +void func_80B15034(EnTa* this, GlobalContext* globalCtx) { + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { + func_80106CCC(globalCtx); + func_80B14F20(this, func_80B16504); + func_80B13AAC(this, globalCtx); + } + this->unk_2E0 |= 1; +} + +s32 func_80B150AC(EnTa* this, GlobalContext* globalCtx, s32 idx) { + Player* player = PLAYER; + Actor* interactRangeActor; + + if (player->stateFlags1 & 0x800) { + interactRangeActor = player->interactRangeActor; + if (interactRangeActor != NULL && interactRangeActor->id == ACTOR_EN_NIW && + interactRangeActor == &this->unk_2B8[idx]->actor) { + return true; + } + } + return false; +} + +void func_80B15100(EnTa* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { + s32 unk_2CA; + + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600C48C, 1.0f, SkelAnime_GetFrameCount(&D_0600C48C) - 1.0f, + SkelAnime_GetFrameCount(&D_0600C48C), 2, 10.0f); + this->unk_2E0 &= ~0x10; + func_80106CCC(globalCtx); + unk_2CA = this->unk_2CA; + this->unk_25C = func_80B154FC; + this->unk_2B8[unk_2CA]->actor.gravity = 0.1f; + this->unk_2B8[unk_2CA]->actor.velocity.y = 0.0f; + this->unk_2B8[unk_2CA]->actor.speedXZ = 0.0f; + this->unk_2B8[unk_2CA]->actor.parent = NULL; + + if (player->interactRangeActor == &this->unk_2B8[unk_2CA]->actor) { + player->interactRangeActor = NULL; + } + if (player->heldActor == &this->unk_2B8[unk_2CA]->actor) { + player->heldActor = NULL; + } + player->stateFlags1 &= ~0x800; + this->unk_2B8[unk_2CA] = NULL; + } + this->unk_2E0 |= 1; +} + +void func_80B15260(EnTa* this, GlobalContext* globalCtx) { + if (func_8002F194(&this->actor, globalCtx)) { + this->unk_25C = func_80B15100; + this->actor.flags &= ~0x10000; + } else { + func_8002F2CC(&this->actor, globalCtx, 1000.0f); + } + this->unk_2E0 |= 1; +} + +s32 func_80B152D0(EnTa* this, GlobalContext* globalCtx) { + s32 ct; + s32 i; + + for (ct = 0, i = 0; i < ARRAY_COUNT(this->unk_2B8); i++) { + if (this->unk_2B8[i] != NULL) { + ct++; + } + } + return ct; +} + +void func_80B15308(EnTa* this) { + if (this->unk_2E0 & 0x10) { + if (this->unk_2E0 & 0x100) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600BF38, 1.0f, 17.0f, 22.0f, 2, 0.0f); + this->unk_2E0 &= ~0x100; + } else { + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600BF38, -1.0f, 21.0f, 16.0f, 2, 3.0f); + this->unk_2E0 |= 0x100; + } + this->unk_2E0 &= ~0x10; + } +} + +void func_80B153D4(EnTa* this, GlobalContext* globalCtx) { + func_80B15308(this); + + if (this->unk_2CC == 0) { + if (this->unk_2E0 & 0x80) { + this->unk_2E0 &= ~0x80; + func_80B14EDC(this, globalCtx); + } + } +} + +void func_80B15424(EnTa* this, GlobalContext* globalCtx) { + func_80B15308(this); + + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { + globalCtx->nextEntranceIndex = 0x5E4; + + if (gSaveContext.eventInf[0] & 0x100) { + globalCtx->fadeTransition = 46; + gSaveContext.nextTransition = 3; + } else { + globalCtx->fadeTransition = 38; + gSaveContext.nextTransition = 2; + } + + globalCtx->sceneLoadFlag = 0x14; + gSaveContext.eventInf[0] |= 0x400; + this->unk_25C = func_80B153D4; + this->unk_2CC = 22; + } +} + +void func_80B154FC(EnTa* this, GlobalContext* globalCtx) { + s32 i; + + for (i = 0; i < ARRAY_COUNT(this->unk_2B8); i++) { + if (this->unk_2B8[i] != NULL) { + if (this->unk_2B8[i]->actor.gravity > -2.0f) { + this->unk_2B8[i]->actor.gravity -= 0.03f; + } + + if (func_80B150AC(this, globalCtx, i)) { + if (this->unk_2C4[i] > 0) { + this->unk_2C4[i]--; + } else { + this->unk_2CA = i; + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600BF38, 1.0f, 8.0f, 29.0f, 2, -10.0f); + this->unk_2E0 &= ~0x10; + + switch (func_80B152D0(this, globalCtx)) { + case 1: + gSaveContext.timer1State = 0; + func_8002DF54(globalCtx, &this->actor, 1); + func_8010B680(globalCtx, 0x2084, &this->actor); + this->unk_25C = func_80B15424; + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600BF38, 1.0f, 8.0f, 29.0f, 2, -10.0f); + this->unk_2E0 &= ~0x10; + this->unk_2E0 &= ~0x100; + gSaveContext.eventInf[0] |= 0x100; + Audio_SetBGM(NA_BGM_STOP); + this->unk_2E0 &= ~0x200; + func_800F5C64(0x39); + return; + case 2: + this->actor.textId = 0x2083; + Audio_PlayActorSound2(&this->actor, NA_SE_VO_TA_CRY_1); + break; + case 3: + this->actor.textId = 0x2082; + Audio_PlayActorSound2(&this->actor, NA_SE_VO_TA_SURPRISE); + break; + } + this->unk_25C = func_80B15260; + this->actor.flags |= 0x10000; + func_8002F2CC(&this->actor, globalCtx, 1000.0f); + return; + } + } else { + this->unk_2C4[i] = 7; + } + } + } + + if (gSaveContext.timer1Value == 10) { + func_800F5918(); + } + + if (gSaveContext.timer1Value == 0 && !Gameplay_InCsMode(globalCtx)) { + Audio_SetBGM(NA_BGM_STOP); + this->unk_2E0 &= ~0x200; + func_80078884(NA_SE_SY_FOUND); + gSaveContext.timer1State = 0; + func_8002DF54(globalCtx, &this->actor, 1); + func_8010B680(globalCtx, 0x2081, &this->actor); + this->unk_25C = func_80B15424; + func_80B14E28(this, globalCtx); + gSaveContext.eventInf[0] &= ~0x100; + this->unk_2E0 |= 0x80; + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600BF38, 1.0f, 8.0f, 29.0f, 2, -10.0f); + this->unk_2E0 &= ~0x10; + this->unk_2E0 &= ~0x100; + } + + this->unk_2E0 |= 1; +} + +void func_80B1585C(EnTa* this, GlobalContext* globalCtx) { + s32 i; + + if (this->unk_2CC > 35) { + for (i = 1; i < ARRAY_COUNT(this->unk_2B8); i++) { + if (this->unk_2B8[i] != NULL) { + Math_SmoothScaleMaxMinS(&this->unk_2B8[i]->actor.posRot.rot.y, i * -10000 - 3000, 2, 0x800, 0x100); + this->unk_2B8[i]->actor.shape.rot.y = this->unk_2B8[i]->actor.posRot.rot.y; + } + } + } else if (this->unk_2CC == 35) { + for (i = 0; i < ARRAY_COUNT(this->unk_2B8); i++) { + this->unk_2C4[i] = (s32)(Math_Rand_CenteredFloat(6.0f) + 10.0f); + + if (this->unk_2B8[i] != NULL) { + EnNiw* niw = this->unk_2B8[i]; + niw->unk_308 = 1; + niw->actor.gravity = 0.0f; + } + } + } else { + for (i = 0; i < ARRAY_COUNT(this->unk_2B8); i++) { + if (this->unk_2CC < 35 - this->unk_2C4[i]) { + if (this->unk_2B8[i] != NULL) { + if (this->unk_2B8[i]->actor.gravity > -2.0f) { + this->unk_2B8[i]->actor.gravity -= 0.03f; + } + } + } + } + } + + if (this->unk_2CC == 0) { + func_80B13AA0(this, func_80B154FC, func_80B16938); + this->unk_2E0 &= ~0x10; + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600C48C, 1.0f, SkelAnime_GetFrameCount(&D_0600C48C) - 1.0f, + SkelAnime_GetFrameCount(&D_0600C48C), 2, 10.0f); + func_8002DF54(globalCtx, &this->actor, 7); + } +} + +void func_80B15AD4(EnTa* this, GlobalContext* globalCtx) { + if (this->unk_2CC == 0 && this->unk_2E0 & 0x20) { + func_80B13AA0(this, func_80B1585C, func_80B16938); + this->unk_2E0 &= ~0x10; + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600BF38, 1.0f, 1.0f, SkelAnime_GetFrameCount(&D_0600BF38), 2, 0.0f); + this->unk_2CC = 50; + func_80088B34(0x1E); + func_800F5ACC(0x6C); + this->unk_2E0 |= 0x200; + func_80106CCC(globalCtx); + func_8002DF54(globalCtx, &this->actor, 1); + } + + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { + this->unk_2E0 |= 0x20; + } + + this->unk_2E0 |= 1; +} + +void func_80B15BF8(EnTa* this, GlobalContext* globalCtx) { + if (this->unk_2E0 & 0x10) { + func_80B13AA0(this, func_80B15AD4, func_80B16938); + this->unk_2E0 &= ~0x10; + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600BF38, 1.0f, 0.0f, 1.0f, 2, 0.0f); + this->unk_2CC = 5; + } + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { + this->unk_2E0 |= 0x20; + } + this->unk_2E0 |= 1; +} + +void func_80B15CC8(EnTa* this, GlobalContext* globalCtx) { + if (this->unk_2E0 & 0x10) { + func_80B13AA0(this, func_80B15BF8, func_80B16938); + this->unk_2E0 &= ~0x10; + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600BF38, -1.0f, 29.0f, 0.0f, 2, 10.0f); + } + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { + this->unk_2E0 |= 0x20; + } + this->unk_2E0 |= 1; +} + +void func_80B15D90(EnTa* this, GlobalContext* globalCtx) { + func_80B13AA0(this, func_80B15CC8, func_80B16938); + this->unk_2E0 &= ~0x10; + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600BF38, 1.0f, 8.0f, 29.0f, 2, -10.0f); + func_8010B720(globalCtx, 0x2080); + this->unk_2E0 &= ~0x20; +} + +void func_80B15E28(EnTa* this, GlobalContext* globalCtx) { + if (func_8002F334(&this->actor, globalCtx)) { + func_80B14F20(this, func_80B16504); + func_80B13AAC(this, globalCtx); + } + this->unk_2E0 |= 1; +} + +void func_80B15E80(EnTa* this, GlobalContext* globalCtx) { + if (Actor_HasParent(&this->actor, globalCtx)) { + this->actor.parent = NULL; + this->unk_25C = func_80B15E28; + if (!(this->unk_2E0 & 0x2)) { + gSaveContext.itemGetInf[0] |= 4; + } + this->unk_2E0 &= ~0x2; + } else if (this->unk_2E0 & 2) { + func_8002F434(&this->actor, globalCtx, GI_MILK, 10000.0f, 50.0f); + } else { + func_8002F434(&this->actor, globalCtx, GI_MILK_BOTTLE, 10000.0f, 50.0f); + } + this->unk_2E0 |= 1; +} + +void func_80B15F54(EnTa* this, GlobalContext* globalCtx) { + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { + func_80106CCC(globalCtx); + this->unk_2E0 &= ~0x2; + func_80B13AA0(this, func_80B15E80, func_80B16938); + func_8002F434(&this->actor, globalCtx, GI_MILK_BOTTLE, 10000.0f, 50.0f); + } +} + +void func_80B15FE8(EnTa* this, GlobalContext* globalCtx) { + if ((func_8010BDBC(&globalCtx->msgCtx) == 4) && (func_80106BC8(globalCtx) != 0)) { + switch (globalCtx->msgCtx.choiceIndex) { + case 0: + switch (func_80B14DD8()) { + case 0: + func_8010B720(globalCtx, 0x85); + func_80B13AA0(this, func_80B15034, func_80B16938); + break; + case 1: + func_8010B720(globalCtx, 0x208A); + func_80B13AA0(this, func_80B15E28, func_80B16938); + break; + case 2: + this->unk_2E0 |= 2; + func_80B13AA0(this, func_80B15E80, func_80B16938); + Rupees_ChangeBy(-30); + func_8002F434(&this->actor, globalCtx, GI_MILK, 10000.0f, 50.0f); + break; + } + break; + case 1: + if (gSaveContext.rupees < 10) { + func_8010B720(globalCtx, 0x85); + func_80B13AA0(this, func_80B15034, func_80B16938); + } else { + Rupees_ChangeBy(-10); + func_80B15D90(this, globalCtx); + } + break; + case 2: + func_80B14F20(this, func_80B16504); + func_80B13AAC(this, globalCtx); + break; + } + } + + if (this->unk_2E0 & 0x10) { + this->unk_2E0 |= 1; + } +} + +void func_80B161C0(EnTa* this, GlobalContext* globalCtx) { + s32 price; + + if (this->actor.textId == 0x2085) { + price = 5; + } else { + price = 10; + } + + if (func_8010BDBC(&globalCtx->msgCtx) == 4) { + if (func_80106BC8(globalCtx) != 0) { + switch (globalCtx->msgCtx.choiceIndex) { + case 0: + if (gSaveContext.rupees < price) { + func_8010B720(globalCtx, 0x85); + func_80B13AA0(this, func_80B15034, func_80B16938); + } else { + Rupees_ChangeBy(-price); + func_80B15D90(this, globalCtx); + } + break; + case 1: + func_80B14F20(this, func_80B16504); + func_80B13AAC(this, globalCtx); + break; + } + } + } + + if (this->unk_2E0 & 0x10) { + this->unk_2E0 |= 1; + } +} + +void func_80B162E8(EnTa* this, GlobalContext* globalCtx) { + if ((func_8010BDBC(&globalCtx->msgCtx) == 4) && (func_80106BC8(globalCtx) != 0)) { + func_8010B720(globalCtx, 0x2087); + func_80B13AA0(this, func_80B15F54, func_80B16938); + } + + if (this->unk_2E0 & 0x10) { + this->unk_2E0 |= 1; + } +} + +void func_80B16364(EnTa* this, GlobalContext* globalCtx) { + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { + gSaveContext.infTable[7] |= 0x4000; + if (gSaveContext.itemGetInf[0] & 4) { + func_8010B720(globalCtx, 0x208B); + func_80B13AA0(this, func_80B15FE8, func_80B16938); + } else { + func_8010B720(globalCtx, 0x207F); + func_80B13AA0(this, func_80B161C0, func_80B16938); + } + } + + if (this->unk_2E0 & 0x10) { + this->unk_2E0 |= 1; + } +} + +void func_80B1642C(EnTa* this, GlobalContext* globalCtx) { + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { + if (Inventory_HasEmptyBottle()) { + func_80106CCC(globalCtx); + this->unk_2E0 |= 2; + func_80B13AA0(this, func_80B15E80, func_80B16938); + func_8002F434(&this->actor, globalCtx, GI_MILK, 10000.0f, 50.0f); + } else { + func_8010B720(globalCtx, 0x208A); + func_80B13AA0(this, func_80B15E28, func_80B16938); + } + } +} + +void func_80B16504(EnTa* this, GlobalContext* globalCtx) { + u16 faceReaction = Text_GetFaceReaction(globalCtx, 0x18); + + func_80B13AAC(this, globalCtx); + + if (func_80B142F4(this, globalCtx, this->actor.textId)) { + Audio_PlayActorSound2(&this->actor, NA_SE_VO_TA_SURPRISE); + + if (faceReaction != 0) { + func_80B14FAC(this, func_80B15E28); + } else { + gSaveContext.infTable[7] |= 0x4000; + + switch (this->actor.textId) { + case 0x207E: + case 0x207F: + func_80B14FAC(this, func_80B161C0); + break; + case 0x208B: + func_80B14FAC(this, func_80B15FE8); + break; + default: + func_80B14FAC(this, func_80B16364); + break; + } + } + } + this->unk_2E0 &= ~1; +} + +void func_80B16608(EnTa* this, GlobalContext* globalCtx) { + if (func_8002F194(&this->actor, globalCtx)) { + switch (this->actor.textId) { + case 0x2085: + this->unk_25C = func_80B161C0; + break; + case 0x2086: + this->unk_25C = func_80B162E8; + break; + case 0x2088: + this->unk_25C = func_80B1642C; + break; + } + this->actor.flags &= ~0x10000; + } else { + this->actor.flags |= 0x10000; + func_8002F2CC(&this->actor, globalCtx, 1000.0f); + } + this->unk_2E0 |= 1; +} + +void func_80B166CC(EnTa* this) { + s16 temp_v0 = this->unk_2B6 - 1; + + if (temp_v0 != 0) { + this->unk_2B6 = temp_v0; + } else { + this->unk_2B0 = func_80B16700; + } +} + +void func_80B16700(EnTa* this) { + s16 temp2B6 = this->unk_2B6 - 1; + + if (temp2B6 != 0) { + this->unk_2B6 = temp2B6; + } else { + s16 temp2B4 = this->unk_2B4 + 1; + s16 temp2B6 = 3; + + if (temp2B4 >= temp2B6) { + this->unk_2B4 = 0; + if (this->unk_2CE > 0) { + this->unk_2CE--; + temp2B6 = 1; + } else { + temp2B6 = (s32)(Math_Rand_ZeroOne() * 60.0f) + 20; + } + this->unk_2B6 = temp2B6; + this->unk_2B0 = func_80B166CC; + } else { + this->unk_2B4 = temp2B4; + this->unk_2B6 = 1; + } + } +} + +void func_80B167C0(EnTa* this) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, this->unk_2E4); + } +} + +void func_80B167FC(EnTa* this) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, this->unk_2E4); + Audio_PlayActorSound2(&this->actor, NA_SE_VO_TA_SLEEP); + } + this->unk_2E0 |= 0xC; +} + +void func_80B16854(EnTa* this) { + if (this->unk_2E2 > 0) { + this->unk_2E2--; + } else { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, this->unk_2E4); + this->unk_2E2 = Math_Rand_ZeroFloat(100.0f) + 100.0f; + } + + if (this->skelAnime.animCurrentFrame < 96.0f && this->skelAnime.animCurrentFrame >= 53.0f) { + this->unk_2B4 = 1; + } else { + this->unk_2B4 = 2; + } + this->unk_2E0 |= 8; + } + this->unk_2E0 |= 4; +} + +void func_80B16938(EnTa* this) { + if (!(this->unk_2E0 & 0x10)) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + this->unk_2E0 |= 0x10; + } + this->unk_2E0 |= 8; + } +} + +void EnTa_Update(Actor* thisx, GlobalContext* globalCtx) { + EnTa* this = THIS; + s32 pad; + + Collider_CylinderUpdate(&this->actor, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + Actor_MoveForward(&this->actor); + func_8002E4B4(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4); + this->unk_260(this); + this->unk_25C(this, globalCtx); + + if (!(this->unk_2E0 & 4)) { + this->unk_2B0(this); + } + + if (this->unk_2E0 & 1) { + func_80038290(globalCtx, &this->actor, &this->unk_2D4, &this->unk_2DA, this->actor.posRot2.pos); + } else { + Math_SmoothScaleMaxMinS(&this->unk_2D4.x, 0, 6, 6200, 100); + Math_SmoothScaleMaxMinS(&this->unk_2D4.y, 0, 6, 6200, 100); + Math_SmoothScaleMaxMinS(&this->unk_2DA.x, 0, 6, 6200, 100); + Math_SmoothScaleMaxMinS(&this->unk_2DA.y, 0, 6, 6200, 100); + } + + this->unk_2E0 &= ~0x5; + + if (this->unk_2CC > 0) { + this->unk_2CC--; + } +} + +s32 EnTa_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { + EnTa* this = THIS; + + switch (limbIndex) { + case 8: + rot->x += this->unk_2DA.y; + rot->y -= this->unk_2DA.x; + break; + case 15: + rot->x += this->unk_2D4.y; + rot->z += this->unk_2D4.x; + break; + } + + if (this->unk_2E0 & 0x8) { + this->unk_2E0 &= ~0x8; + } else if ((limbIndex == 8) || (limbIndex == 10) || (limbIndex == 13)) { + s32 limbIdx50 = limbIndex * 50; + rot->y += Math_Sins(globalCtx->state.frames * (limbIdx50 + 0x814)) * 200.0f; + rot->z += Math_Coss(globalCtx->state.frames * (limbIdx50 + 0x940)) * 200.0f; + } + + return 0; +} + +void EnTa_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { + EnTa* this = THIS; + + if (limbIndex == 15) { + Matrix_MultVec3f(&D_80B16E7C, &this->actor.posRot2.pos); + } +} + +void EnTa_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnTa* this = THIS; + s32 pad; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ta.c", 2381); + + func_800943C8(globalCtx->state.gfxCtx); + + gSPSegment(POLY_OPA_DISP++, 0x8, SEGMENTED_TO_VIRTUAL(D_80B16E88[this->unk_2B4])); + gSPSegment(POLY_OPA_DISP++, 0x9, SEGMENTED_TO_VIRTUAL(&D_06006DC0)); + + SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, + EnTa_OverrideLimbDraw, EnTa_PostLimbDraw, this); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ta.c", 2400); +} diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.h b/src/overlays/actors/ovl_En_Ta/z_en_ta.h index 9b9f63bf91..6d2c3409f2 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.h +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.h @@ -4,11 +4,36 @@ #include "ultra64.h" #include "global.h" +#include "overlays/actors/ovl_En_Niw/z_en_niw.h" + struct EnTa; +typedef void (*EnTaActionFunc)(struct EnTa*, GlobalContext*); +typedef void (*EnTaUnkFunc)(struct EnTa*); + typedef struct EnTa { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x19C]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ Vec3s limbDrawTable[17]; + /* 0x01F6 */ Vec3s transitionDrawTable[17]; + /* 0x025C */ EnTaActionFunc unk_25C; + /* 0x0260 */ EnTaUnkFunc unk_260; + /* 0x0264 */ ColliderCylinder collider; + /* 0x02B0 */ EnTaUnkFunc unk_2B0; + /* 0x02B4 */ s16 unk_2B4; + /* 0x02B6 */ s16 unk_2B6; + /* 0x02B8 */ EnNiw* unk_2B8[3]; + /* 0x02C4 */ s16 unk_2C4[3]; + /* 0x02CA */ u8 unk_2CA; + /* 0x02CC */ s16 unk_2CC; + /* 0x02CE */ s16 unk_2CE; + /* 0x02D0 */ s16 unk_2D0; + /* 0x02D2 */ s16 unk_2D2; + /* 0x02D4 */ Vec3s unk_2D4; + /* 0x02DA */ Vec3s unk_2DA; + /* 0x02E0 */ u16 unk_2E0; + /* 0x02E2 */ s16 unk_2E2; + /* 0x02E4 */ AnimationHeader* unk_2E4; } EnTa; // size = 0x02E8 extern const ActorInit En_Ta_InitVars;