diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Destroy.s deleted file mode 100644 index c3fb00ce87..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Destroy.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel EnZl3_Destroy -/* 00090 80B53440 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00094 80B53444 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00098 80B53448 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0009C 80B5344C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000A0 80B53450 0C0170EB */ jal Collider_DestroyCylinder - -/* 000A4 80B53454 24C50378 */ addiu $a1, $a2, 0x0378 ## $a1 = 00000378 -/* 000A8 80B53458 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000AC 80B5345C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000B0 80B53460 03E00008 */ jr $ra -/* 000B4 80B53464 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Draw.s deleted file mode 100644 index 8bc77d5d37..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Draw.s +++ /dev/null @@ -1,37 +0,0 @@ -.rdata -glabel D_80B5AA8C - .asciz "\x1b[31m描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.text -glabel EnZl3_Draw -/* 06FF8 80B5A3A8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 06FFC 80B5A3AC AFBF0014 */ sw $ra, 0x0014($sp) -/* 07000 80B5A3B0 8C820250 */ lw $v0, 0x0250($a0) ## 00000250 -/* 07004 80B5A3B4 04400008 */ bltz $v0, .L80B5A3D8 -/* 07008 80B5A3B8 28410003 */ slti $at, $v0, 0x0003 -/* 0700C 80B5A3BC 10200006 */ beq $at, $zero, .L80B5A3D8 -/* 07010 80B5A3C0 00027080 */ sll $t6, $v0, 2 -/* 07014 80B5A3C4 3C0380B6 */ lui $v1, %hi(D_80B5A568) ## $v1 = 80B60000 -/* 07018 80B5A3C8 006E1821 */ addu $v1, $v1, $t6 -/* 0701C 80B5A3CC 8C63A568 */ lw $v1, %lo(D_80B5A568)($v1) -/* 07020 80B5A3D0 14600006 */ bne $v1, $zero, .L80B5A3EC -/* 07024 80B5A3D4 00000000 */ nop -.L80B5A3D8: -/* 07028 80B5A3D8 3C0480B6 */ lui $a0, %hi(D_80B5AA8C) ## $a0 = 80B60000 -/* 0702C 80B5A3DC 0C00084C */ jal osSyncPrintf - -/* 07030 80B5A3E0 2484AA8C */ addiu $a0, $a0, %lo(D_80B5AA8C) ## $a0 = 80B5AA8C -/* 07034 80B5A3E4 10000004 */ beq $zero, $zero, .L80B5A3F8 -/* 07038 80B5A3E8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B5A3EC: -/* 0703C 80B5A3EC 0060F809 */ jalr $ra, $v1 -/* 07040 80B5A3F0 00000000 */ nop -/* 07044 80B5A3F4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B5A3F8: -/* 07048 80B5A3F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0704C 80B5A3FC 03E00008 */ jr $ra -/* 07050 80B5A400 00000000 */ nop -/* 07054 80B5A404 00000000 */ nop -/* 07058 80B5A408 00000000 */ nop -/* 0705C 80B5A40C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Init.s deleted file mode 100644 index 4cbe7ab9b6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Init.s +++ /dev/null @@ -1,71 +0,0 @@ -.rdata -glabel D_80B5A994 - .asciz "ゼルダ姫のEn_Zl3_Actor_ct通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80B5A9D0 - .asciz "ゼルダ姫のEn_Zl3_Actor_ctは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.text -glabel EnZl3_Init -/* 06AEC 80B59E9C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 06AF0 80B59EA0 AFB00028 */ sw $s0, 0x0028($sp) -/* 06AF4 80B59EA4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 06AF8 80B59EA8 AFBF002C */ sw $ra, 0x002C($sp) -/* 06AFC 80B59EAC 3C0480B6 */ lui $a0, %hi(D_80B5A994) ## $a0 = 80B60000 -/* 06B00 80B59EB0 AFA5004C */ sw $a1, 0x004C($sp) -/* 06B04 80B59EB4 0C00084C */ jal osSyncPrintf - -/* 06B08 80B59EB8 2484A994 */ addiu $a0, $a0, %lo(D_80B5A994) ## $a0 = 80B5A994 -/* 06B0C 80B59EBC 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 06B10 80B59EC0 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 06B14 80B59EC4 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 06B18 80B59EC8 AFA40034 */ sw $a0, 0x0034($sp) -/* 06B1C 80B59ECC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 06B20 80B59ED0 0C00AC78 */ jal ActorShape_Init - -/* 06B24 80B59ED4 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 06B28 80B59ED8 8FAE0034 */ lw $t6, 0x0034($sp) -/* 06B2C 80B59EDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06B30 80B59EE0 A1C00014 */ sb $zero, 0x0014($t6) ## 00000014 -/* 06B34 80B59EE4 0C2D4CEC */ jal func_80B533B0 -/* 06B38 80B59EE8 8FA5004C */ lw $a1, 0x004C($sp) -/* 06B3C 80B59EEC 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 06B40 80B59EF0 260F0190 */ addiu $t7, $s0, 0x0190 ## $t7 = 00000190 -/* 06B44 80B59EF4 261801EA */ addiu $t8, $s0, 0x01EA ## $t8 = 000001EA -/* 06B48 80B59EF8 2419000F */ addiu $t9, $zero, 0x000F ## $t9 = 0000000F -/* 06B4C 80B59EFC AFB90018 */ sw $t9, 0x0018($sp) -/* 06B50 80B59F00 AFB80014 */ sw $t8, 0x0014($sp) -/* 06B54 80B59F04 AFAF0010 */ sw $t7, 0x0010($sp) -/* 06B58 80B59F08 24C60D70 */ addiu $a2, $a2, 0x0D70 ## $a2 = 06010D70 -/* 06B5C 80B59F0C 8FA4004C */ lw $a0, 0x004C($sp) -/* 06B60 80B59F10 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 06B64 80B59F14 0C0291BE */ jal SkelAnime_InitSV -/* 06B68 80B59F18 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 06B6C 80B59F1C 0C2D5375 */ jal func_80B54DD4 -/* 06B70 80B59F20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06B74 80B59F24 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 06B78 80B59F28 10410005 */ beq $v0, $at, .L80B59F40 -/* 06B7C 80B59F2C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 06B80 80B59F30 10410006 */ beq $v0, $at, .L80B59F4C -/* 06B84 80B59F34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06B88 80B59F38 10000006 */ beq $zero, $zero, .L80B59F54 -/* 06B8C 80B59F3C 00000000 */ nop -.L80B59F40: -/* 06B90 80B59F40 3C018016 */ lui $at, %hi(gSaveContext+0x13d2) -/* 06B94 80B59F44 10000003 */ beq $zero, $zero, .L80B59F54 -/* 06B98 80B59F48 A420FA32 */ sh $zero, %lo(gSaveContext+0x13d2)($at) -.L80B59F4C: -/* 06B9C 80B59F4C 0C2D66A0 */ jal func_80B59A80 -/* 06BA0 80B59F50 8FA5004C */ lw $a1, 0x004C($sp) -.L80B59F54: -/* 06BA4 80B59F54 3C0480B6 */ lui $a0, %hi(D_80B5A9D0) ## $a0 = 80B60000 -/* 06BA8 80B59F58 0C00084C */ jal osSyncPrintf - -/* 06BAC 80B59F5C 2484A9D0 */ addiu $a0, $a0, %lo(D_80B5A9D0) ## $a0 = 80B5A9D0 -/* 06BB0 80B59F60 8FBF002C */ lw $ra, 0x002C($sp) -/* 06BB4 80B59F64 8FB00028 */ lw $s0, 0x0028($sp) -/* 06BB8 80B59F68 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 06BBC 80B59F6C 03E00008 */ jr $ra -/* 06BC0 80B59F70 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Update.s deleted file mode 100644 index a7c15bdbc9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Update.s +++ /dev/null @@ -1,34 +0,0 @@ -.rdata -glabel D_80B5A958 - .asciz "\x1b[31mメインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.text -glabel EnZl3_Update -/* 06A90 80B59E40 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 06A94 80B59E44 AFBF0014 */ sw $ra, 0x0014($sp) -/* 06A98 80B59E48 8C82024C */ lw $v0, 0x024C($a0) ## 0000024C -/* 06A9C 80B59E4C 04400008 */ bltz $v0, .L80B59E70 -/* 06AA0 80B59E50 28410028 */ slti $at, $v0, 0x0028 -/* 06AA4 80B59E54 10200006 */ beq $at, $zero, .L80B59E70 -/* 06AA8 80B59E58 00027080 */ sll $t6, $v0, 2 -/* 06AAC 80B59E5C 3C0380B6 */ lui $v1, %hi(D_80B5A4C0) ## $v1 = 80B60000 -/* 06AB0 80B59E60 006E1821 */ addu $v1, $v1, $t6 -/* 06AB4 80B59E64 8C63A4C0 */ lw $v1, %lo(D_80B5A4C0)($v1) -/* 06AB8 80B59E68 14600006 */ bne $v1, $zero, .L80B59E84 -/* 06ABC 80B59E6C 00000000 */ nop -.L80B59E70: -/* 06AC0 80B59E70 3C0480B6 */ lui $a0, %hi(D_80B5A958) ## $a0 = 80B60000 -/* 06AC4 80B59E74 0C00084C */ jal osSyncPrintf - -/* 06AC8 80B59E78 2484A958 */ addiu $a0, $a0, %lo(D_80B5A958) ## $a0 = 80B5A958 -/* 06ACC 80B59E7C 10000004 */ beq $zero, $zero, .L80B59E90 -/* 06AD0 80B59E80 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B59E84: -/* 06AD4 80B59E84 0060F809 */ jalr $ra, $v1 -/* 06AD8 80B59E88 00000000 */ nop -/* 06ADC 80B59E8C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B59E90: -/* 06AE0 80B59E90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 06AE4 80B59E94 03E00008 */ jr $ra -/* 06AE8 80B59E98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B533B0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B533B0.s deleted file mode 100644 index 3a10a7837e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B533B0.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80B533B0 -/* 00000 80B533B0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00004 80B533B4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00008 80B533B8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0000C 80B533BC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00010 80B533C0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00014 80B533C4 24C50378 */ addiu $a1, $a2, 0x0378 ## $a1 = 00000378 -/* 00018 80B533C8 AFA50018 */ sw $a1, 0x0018($sp) -/* 0001C 80B533CC 0C0170D9 */ jal Collider_InitCylinder - -/* 00020 80B533D0 AFA60020 */ sw $a2, 0x0020($sp) -/* 00024 80B533D4 3C0780B6 */ lui $a3, %hi(D_80B5A410) ## $a3 = 80B60000 -/* 00028 80B533D8 8FA50018 */ lw $a1, 0x0018($sp) -/* 0002C 80B533DC 8FA60020 */ lw $a2, 0x0020($sp) -/* 00030 80B533E0 24E7A410 */ addiu $a3, $a3, %lo(D_80B5A410) ## $a3 = 80B5A410 -/* 00034 80B533E4 0C017114 */ jal Collider_SetCylinder_Set3 -/* 00038 80B533E8 8FA40024 */ lw $a0, 0x0024($sp) -/* 0003C 80B533EC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00040 80B533F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00044 80B533F4 03E00008 */ jr $ra -/* 00048 80B533F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B533FC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B533FC.s deleted file mode 100644 index 11a350c2b2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B533FC.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B533FC -/* 0004C 80B533FC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00050 80B53400 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00054 80B53404 AFA50034 */ sw $a1, 0x0034($sp) -/* 00058 80B53408 24860378 */ addiu $a2, $a0, 0x0378 ## $a2 = 00000378 -/* 0005C 80B5340C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000378 -/* 00060 80B53410 0C0189B7 */ jal Collider_CylinderUpdate - -/* 00064 80B53414 AFA60018 */ sw $a2, 0x0018($sp) -/* 00068 80B53418 8FA40034 */ lw $a0, 0x0034($sp) -/* 0006C 80B5341C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00070 80B53420 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00074 80B53424 8FA60018 */ lw $a2, 0x0018($sp) -/* 00078 80B53428 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 0007C 80B5342C 00812821 */ addu $a1, $a0, $at -/* 00080 80B53430 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00084 80B53434 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00088 80B53438 03E00008 */ jr $ra -/* 0008C 80B5343C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53468.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53468.s deleted file mode 100644 index d93398770d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53468.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B53468 -/* 000B8 80B53468 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000BC 80B5346C AFBF0014 */ sw $ra, 0x0014($sp) -/* 000C0 80B53470 0C03E803 */ jal Audio_SetBGM - -/* 000C4 80B53474 24040062 */ addiu $a0, $zero, 0x0062 ## $a0 = 00000062 -/* 000C8 80B53478 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000CC 80B5347C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000D0 80B53480 03E00008 */ jr $ra -/* 000D4 80B53484 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53488.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53488.s deleted file mode 100644 index b4e6fe35b7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53488.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B53488 -/* 000D8 80B53488 8C8303D4 */ lw $v1, 0x03D4($a0) ## 000003D4 -/* 000DC 80B5348C 1460000D */ bne $v1, $zero, .L80B534C4 -/* 000E0 80B53490 00000000 */ nop -/* 000E4 80B53494 8CA21C7C */ lw $v0, 0x1C7C($a1) ## 00001C7C -/* 000E8 80B53498 2405017A */ addiu $a1, $zero, 0x017A ## $a1 = 0000017A -/* 000EC 80B5349C 10400009 */ beq $v0, $zero, .L80B534C4 -/* 000F0 80B534A0 00000000 */ nop -/* 000F4 80B534A4 844E0000 */ lh $t6, 0x0000($v0) ## 00000000 -.L80B534A8: -/* 000F8 80B534A8 54AE0004 */ bnel $a1, $t6, .L80B534BC -/* 000FC 80B534AC 8C420124 */ lw $v0, 0x0124($v0) ## 00000124 -/* 00100 80B534B0 03E00008 */ jr $ra -/* 00104 80B534B4 AC8203D4 */ sw $v0, 0x03D4($a0) ## 000003D4 -.L80B534B8: -/* 00108 80B534B8 8C420124 */ lw $v0, 0x0124($v0) ## 00000124 -.L80B534BC: -/* 0010C 80B534BC 5440FFFA */ bnel $v0, $zero, .L80B534A8 -/* 00110 80B534C0 844E0000 */ lh $t6, 0x0000($v0) ## 00000000 -.L80B534C4: -/* 00114 80B534C4 03E00008 */ jr $ra -/* 00118 80B534C8 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B534CC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B534CC.s deleted file mode 100644 index 04e625ee05..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B534CC.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80B534CC -/* 0011C 80B534CC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00120 80B534D0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00124 80B534D4 848E0246 */ lh $t6, 0x0246($a0) ## 00000246 -/* 00128 80B534D8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0012C 80B534DC 24C30246 */ addiu $v1, $a2, 0x0246 ## $v1 = 00000246 -/* 00130 80B534E0 15C00003 */ bne $t6, $zero, .L80B534F0 -/* 00134 80B534E4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00138 80B534E8 10000005 */ beq $zero, $zero, .L80B53500 -/* 0013C 80B534EC 24830246 */ addiu $v1, $a0, 0x0246 ## $v1 = 00000246 -.L80B534F0: -/* 00140 80B534F0 846F0000 */ lh $t7, 0x0000($v1) ## 00000246 -/* 00144 80B534F4 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 00148 80B534F8 A4780000 */ sh $t8, 0x0000($v1) ## 00000246 -/* 0014C 80B534FC 84620000 */ lh $v0, 0x0000($v1) ## 00000246 -.L80B53500: -/* 00150 80B53500 14400008 */ bne $v0, $zero, .L80B53524 -/* 00154 80B53504 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 00158 80B53508 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 0015C 80B5350C AFA3001C */ sw $v1, 0x001C($sp) -/* 00160 80B53510 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00164 80B53514 AFA60038 */ sw $a2, 0x0038($sp) -/* 00168 80B53518 8FA3001C */ lw $v1, 0x001C($sp) -/* 0016C 80B5351C 8FA60038 */ lw $a2, 0x0038($sp) -/* 00170 80B53520 A4620000 */ sh $v0, 0x0000($v1) ## 00000000 -.L80B53524: -/* 00174 80B53524 84790000 */ lh $t9, 0x0000($v1) ## 00000000 -/* 00178 80B53528 24C20244 */ addiu $v0, $a2, 0x0244 ## $v0 = 00000244 -/* 0017C 80B5352C A4590000 */ sh $t9, 0x0000($v0) ## 00000244 -/* 00180 80B53530 84480000 */ lh $t0, 0x0000($v0) ## 00000244 -/* 00184 80B53534 29010003 */ slti $at, $t0, 0x0003 -/* 00188 80B53538 54200003 */ bnel $at, $zero, .L80B53548 -/* 0018C 80B5353C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00190 80B53540 A4400000 */ sh $zero, 0x0000($v0) ## 00000244 -/* 00194 80B53544 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B53548: -/* 00198 80B53548 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0019C 80B5354C 03E00008 */ jr $ra -/* 001A0 80B53550 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53554.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53554.s deleted file mode 100644 index 992b643536..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53554.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80B53554 -/* 001A4 80B53554 AFA50004 */ sw $a1, 0x0004($sp) -/* 001A8 80B53558 00052C00 */ sll $a1, $a1, 16 -/* 001AC 80B5355C 00052C03 */ sra $a1, $a1, 16 -/* 001B0 80B53560 03E00008 */ jr $ra -/* 001B4 80B53564 A4850244 */ sh $a1, 0x0244($a0) ## 00000244 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53568.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53568.s deleted file mode 100644 index 44340e9c97..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53568.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80B53568 -/* 001B8 80B53568 AFA50004 */ sw $a1, 0x0004($sp) -/* 001BC 80B5356C 00052C00 */ sll $a1, $a1, 16 -/* 001C0 80B53570 00052C03 */ sra $a1, $a1, 16 -/* 001C4 80B53574 03E00008 */ jr $ra -/* 001C8 80B53578 A4850248 */ sh $a1, 0x0248($a0) ## 00000248 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5357C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5357C.s deleted file mode 100644 index bf0a3c86a6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5357C.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80B5357C -/* 001CC 80B5357C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 001D0 80B53580 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001D4 80B53584 AFA40030 */ sw $a0, 0x0030($sp) -/* 001D8 80B53588 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 001DC 80B5358C AFA50034 */ sw $a1, 0x0034($sp) -/* 001E0 80B53590 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 001E4 80B53594 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 001E8 80B53598 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 001EC 80B5359C 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 001F0 80B535A0 46040181 */ sub.s $f6, $f0, $f4 -/* 001F4 80B535A4 8FA20030 */ lw $v0, 0x0030($sp) -/* 001F8 80B535A8 46083282 */ mul.s $f10, $f6, $f8 -/* 001FC 80B535AC C4500024 */ lwc1 $f16, 0x0024($v0) ## 00000024 -/* 00200 80B535B0 24420024 */ addiu $v0, $v0, 0x0024 ## $v0 = 00000024 -/* 00204 80B535B4 46105480 */ add.s $f18, $f10, $f16 -/* 00208 80B535B8 E7B20020 */ swc1 $f18, 0x0020($sp) -/* 0020C 80B535BC C4440004 */ lwc1 $f4, 0x0004($v0) ## 00000028 -/* 00210 80B535C0 AFA2001C */ sw $v0, 0x001C($sp) -/* 00214 80B535C4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00218 80B535C8 E7A40024 */ swc1 $f4, 0x0024($sp) -/* 0021C 80B535CC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00220 80B535D0 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 00224 80B535D4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00228 80B535D8 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 0022C 80B535DC 46060201 */ sub.s $f8, $f0, $f6 -/* 00230 80B535E0 8FA2001C */ lw $v0, 0x001C($sp) -/* 00234 80B535E4 8FA40034 */ lw $a0, 0x0034($sp) -/* 00238 80B535E8 27A50020 */ addiu $a1, $sp, 0x0020 ## $a1 = FFFFFFF0 -/* 0023C 80B535EC 460A4402 */ mul.s $f16, $f8, $f10 -/* 00240 80B535F0 C4520008 */ lwc1 $f18, 0x0008($v0) ## 00000008 -/* 00244 80B535F4 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00248 80B535F8 46128100 */ add.s $f4, $f16, $f18 -/* 0024C 80B535FC 0C007D52 */ jal Item_DropCollectible - -/* 00250 80B53600 E7A40028 */ swc1 $f4, 0x0028($sp) -/* 00254 80B53604 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00258 80B53608 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0025C 80B5360C 03E00008 */ jr $ra -/* 00260 80B53610 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53614.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53614.s deleted file mode 100644 index 922976a4be..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53614.s +++ /dev/null @@ -1,31 +0,0 @@ -.late_rodata -glabel D_80B5AAC4 - .word 0x45803000 -glabel D_80B5AAC8 - .word 0xC3B98000 - -.text -glabel func_80B53614 -/* 00264 80B53614 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00268 80B53618 3C0180B6 */ lui $at, %hi(D_80B5AAC4) ## $at = 80B60000 -/* 0026C 80B5361C C424AAC4 */ lwc1 $f4, %lo(D_80B5AAC4)($at) -/* 00270 80B53620 3C0180B6 */ lui $at, %hi(D_80B5AAC8) ## $at = 80B60000 -/* 00274 80B53624 C426AAC8 */ lwc1 $f6, %lo(D_80B5AAC8)($at) -/* 00278 80B53628 AFBF002C */ sw $ra, 0x002C($sp) -/* 0027C 80B5362C AFA40030 */ sw $a0, 0x0030($sp) -/* 00280 80B53630 240E0012 */ addiu $t6, $zero, 0x0012 ## $t6 = 00000012 -/* 00284 80B53634 AFAE0024 */ sw $t6, 0x0024($sp) -/* 00288 80B53638 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 0028C 80B5363C AFA00018 */ sw $zero, 0x0018($sp) -/* 00290 80B53640 AFA0001C */ sw $zero, 0x001C($sp) -/* 00294 80B53644 AFA00020 */ sw $zero, 0x0020($sp) -/* 00298 80B53648 2406003B */ addiu $a2, $zero, 0x003B ## $a2 = 0000003B -/* 0029C 80B5364C 3C07C3DD */ lui $a3, 0xC3DD ## $a3 = C3DD0000 -/* 002A0 80B53650 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 002A4 80B53654 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 002A8 80B53658 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 002AC 80B5365C 8FBF002C */ lw $ra, 0x002C($sp) -/* 002B0 80B53660 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 002B4 80B53664 03E00008 */ jr $ra -/* 002B8 80B53668 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5366C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5366C.s deleted file mode 100644 index a070dca791..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5366C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B5366C -/* 002BC 80B5366C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 002C0 80B53670 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 002C4 80B53674 44810000 */ mtc1 $at, $f0 ## $f0 = 30.00 -/* 002C8 80B53678 AFA50024 */ sw $a1, 0x0024($sp) -/* 002CC 80B5367C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 002D0 80B53680 AFBF001C */ sw $ra, 0x001C($sp) -/* 002D4 80B53684 AFA40020 */ sw $a0, 0x0020($sp) -/* 002D8 80B53688 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 002DC 80B5368C 44070000 */ mfc1 $a3, $f0 -/* 002E0 80B53690 AFAE0014 */ sw $t6, 0x0014($sp) -/* 002E4 80B53694 8FA40024 */ lw $a0, 0x0024($sp) -/* 002E8 80B53698 3C064296 */ lui $a2, 0x4296 ## $a2 = 42960000 -/* 002EC 80B5369C 0C00B92D */ jal func_8002E4B4 -/* 002F0 80B536A0 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 002F4 80B536A4 8FBF001C */ lw $ra, 0x001C($sp) -/* 002F8 80B536A8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 002FC 80B536AC 03E00008 */ jr $ra -/* 00300 80B536B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B536B4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B536B4.s deleted file mode 100644 index 6f1e18d4d0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B536B4.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80B536B4 -/* 00304 80B536B4 948E0088 */ lhu $t6, 0x0088($a0) ## 00000088 -/* 00308 80B536B8 31CFFFF6 */ andi $t7, $t6, 0xFFF6 ## $t7 = 00000000 -/* 0030C 80B536BC 03E00008 */ jr $ra -/* 00310 80B536C0 A48F0088 */ sh $t7, 0x0088($a0) ## 00000088 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B536C4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B536C4.s deleted file mode 100644 index 241c786695..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B536C4.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_80B536C4 -/* 00314 80B536C4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00318 80B536C8 AFA40038 */ sw $a0, 0x0038($sp) -/* 0031C 80B536CC AFBF001C */ sw $ra, 0x001C($sp) -/* 00320 80B536D0 24840400 */ addiu $a0, $a0, 0x0400 ## $a0 = 00000400 -/* 00324 80B536D4 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 00328 80B536D8 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0032C 80B536DC AFA40024 */ sw $a0, 0x0024($sp) -/* 00330 80B536E0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00334 80B536E4 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 00338 80B536E8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 0033C 80B536EC 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 00340 80B536F0 8FA40024 */ lw $a0, 0x0024($sp) -/* 00344 80B536F4 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 -/* 00348 80B536F8 AFAF0010 */ sw $t7, 0x0010($sp) -/* 0034C 80B536FC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00350 80B53700 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 00354 80B53704 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 00358 80B53708 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 0035C 80B5370C 24840002 */ addiu $a0, $a0, 0x0002 ## $a0 = 00000002 -/* 00360 80B53710 8FA40038 */ lw $a0, 0x0038($sp) -/* 00364 80B53714 24180064 */ addiu $t8, $zero, 0x0064 ## $t8 = 00000064 -/* 00368 80B53718 AFB80010 */ sw $t8, 0x0010($sp) -/* 0036C 80B5371C 24840406 */ addiu $a0, $a0, 0x0406 ## $a0 = 00000406 -/* 00370 80B53720 AFA40024 */ sw $a0, 0x0024($sp) -/* 00374 80B53724 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00378 80B53728 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 0037C 80B5372C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00380 80B53730 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 00384 80B53734 8FA40024 */ lw $a0, 0x0024($sp) -/* 00388 80B53738 24190064 */ addiu $t9, $zero, 0x0064 ## $t9 = 00000064 -/* 0038C 80B5373C AFB90010 */ sw $t9, 0x0010($sp) -/* 00390 80B53740 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00394 80B53744 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 00398 80B53748 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 0039C 80B5374C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 003A0 80B53750 24840002 */ addiu $a0, $a0, 0x0002 ## $a0 = 00000002 -/* 003A4 80B53754 8FBF001C */ lw $ra, 0x001C($sp) -/* 003A8 80B53758 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 003AC 80B5375C 03E00008 */ jr $ra -/* 003B0 80B53760 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53764.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53764.s deleted file mode 100644 index d180e5e230..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53764.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80B53764 -/* 003B4 80B53764 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003B8 80B53768 AFBF0014 */ sw $ra, 0x0014($sp) -/* 003BC 80B5376C AFA5001C */ sw $a1, 0x001C($sp) -/* 003C0 80B53770 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 003C4 80B53774 3C038016 */ lui $v1, %hi(gGameInfo) -/* 003C8 80B53778 2463FA90 */ addiu $v1, %lo(gGameInfo) -/* 003CC 80B5377C 8C580024 */ lw $t8, 0x0024($v0) ## 00000024 -/* 003D0 80B53780 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 003D4 80B53784 44814000 */ mtc1 $at, $f8 ## $f8 = 16.00 -/* 003D8 80B53788 AC980410 */ sw $t8, 0x0410($a0) ## 00000410 -/* 003DC 80B5378C 8C4F0028 */ lw $t7, 0x0028($v0) ## 00000028 -/* 003E0 80B53790 248503F8 */ addiu $a1, $a0, 0x03F8 ## $a1 = 000003F8 -/* 003E4 80B53794 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 -/* 003E8 80B53798 AC8F0414 */ sw $t7, 0x0414($a0) ## 00000414 -/* 003EC 80B5379C 8C58002C */ lw $t8, 0x002C($v0) ## 0000002C -/* 003F0 80B537A0 AC980418 */ sw $t8, 0x0418($a0) ## 00000418 -/* 003F4 80B537A4 8C790000 */ lw $t9, 0x0000($v1) ## 8015FA90 -/* 003F8 80B537A8 87281474 */ lh $t0, 0x1474($t9) ## 00001474 -/* 003FC 80B537AC 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 00400 80B537B0 00000000 */ nop -/* 00404 80B537B4 468021A0 */ cvt.s.w $f6, $f4 -/* 00408 80B537B8 46083281 */ sub.s $f10, $f6, $f8 -/* 0040C 80B537BC E48A040C */ swc1 $f10, 0x040C($a0) ## 0000040C -/* 00410 80B537C0 8C690000 */ lw $t1, 0x0000($v1) ## 8015FA90 -/* 00414 80B537C4 85261476 */ lh $a2, 0x1476($t1) ## 00001476 -/* 00418 80B537C8 24C6000C */ addiu $a2, $a2, 0x000C ## $a2 = 0000000C -/* 0041C 80B537CC 00063400 */ sll $a2, $a2, 16 -/* 00420 80B537D0 0C00D285 */ jal func_80034A14 -/* 00424 80B537D4 00063403 */ sra $a2, $a2, 16 -/* 00428 80B537D8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0042C 80B537DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00430 80B537E0 03E00008 */ jr $ra -/* 00434 80B537E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B537E8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B537E8.s deleted file mode 100644 index b73a193aa5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B537E8.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_80B537E8 -/* 00438 80B537E8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 0043C 80B537EC AFBF002C */ sw $ra, 0x002C($sp) -/* 00440 80B537F0 AFB20028 */ sw $s2, 0x0028($sp) -/* 00444 80B537F4 AFB10024 */ sw $s1, 0x0024($sp) -/* 00448 80B537F8 AFB00020 */ sw $s0, 0x0020($sp) -/* 0044C 80B537FC 8491008A */ lh $s1, 0x008A($a0) ## 0000008A -/* 00450 80B53800 848E0032 */ lh $t6, 0x0032($a0) ## 00000032 -/* 00454 80B53804 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 00458 80B53808 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 0045C 80B5380C 022E7823 */ subu $t7, $s1, $t6 -/* 00460 80B53810 000FC400 */ sll $t8, $t7, 16 -/* 00464 80B53814 0018CC03 */ sra $t9, $t8, 16 -/* 00468 80B53818 07200007 */ bltz $t9, .L80B53838 -/* 0046C 80B5381C 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 00470 80B53820 24900032 */ addiu $s0, $a0, 0x0032 ## $s0 = 00000032 -/* 00474 80B53824 86080000 */ lh $t0, 0x0000($s0) ## 00000032 -/* 00478 80B53828 02281023 */ subu $v0, $s1, $t0 -/* 0047C 80B5382C 00021400 */ sll $v0, $v0, 16 -/* 00480 80B53830 10000007 */ beq $zero, $zero, .L80B53850 -/* 00484 80B53834 00021403 */ sra $v0, $v0, 16 -.L80B53838: -/* 00488 80B53838 26500032 */ addiu $s0, $s2, 0x0032 ## $s0 = 00000032 -/* 0048C 80B5383C 86090000 */ lh $t1, 0x0000($s0) ## 00000032 -/* 00490 80B53840 02291023 */ subu $v0, $s1, $t1 -/* 00494 80B53844 00021400 */ sll $v0, $v0, 16 -/* 00498 80B53848 00021403 */ sra $v0, $v0, 16 -/* 0049C 80B5384C 00021023 */ subu $v0, $zero, $v0 -.L80B53850: -/* 004A0 80B53850 264403D0 */ addiu $a0, $s2, 0x03D0 ## $a0 = 000003D0 -/* 004A4 80B53854 00022C00 */ sll $a1, $v0, 16 -/* 004A8 80B53858 240A0064 */ addiu $t2, $zero, 0x0064 ## $t2 = 00000064 -/* 004AC 80B5385C AFAA0010 */ sw $t2, 0x0010($sp) -/* 004B0 80B53860 00052C03 */ sra $a1, $a1, 16 -/* 004B4 80B53864 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 004B8 80B53868 AFA40030 */ sw $a0, 0x0030($sp) -/* 004BC 80B5386C 8FAB0030 */ lw $t3, 0x0030($sp) -/* 004C0 80B53870 00112C00 */ sll $a1, $s1, 16 -/* 004C4 80B53874 240C0064 */ addiu $t4, $zero, 0x0064 ## $t4 = 00000064 -/* 004C8 80B53878 85670000 */ lh $a3, 0x0000($t3) ## 00000000 -/* 004CC 80B5387C AFAC0010 */ sw $t4, 0x0010($sp) -/* 004D0 80B53880 00052C03 */ sra $a1, $a1, 16 -/* 004D4 80B53884 02002025 */ or $a0, $s0, $zero ## $a0 = 00000032 -/* 004D8 80B53888 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 004DC 80B5388C 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 004E0 80B53890 860D0000 */ lh $t5, 0x0000($s0) ## 00000032 -/* 004E4 80B53894 A64D00B6 */ sh $t5, 0x00B6($s2) ## 000000B6 -/* 004E8 80B53898 8FBF002C */ lw $ra, 0x002C($sp) -/* 004EC 80B5389C 8FB20028 */ lw $s2, 0x0028($sp) -/* 004F0 80B538A0 8FB10024 */ lw $s1, 0x0024($sp) -/* 004F4 80B538A4 8FB00020 */ lw $s0, 0x0020($sp) -/* 004F8 80B538A8 03E00008 */ jr $ra -/* 004FC 80B538AC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B538B0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B538B0.s deleted file mode 100644 index fb04399428..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B538B0.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80B538B0 -/* 00500 80B538B0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00504 80B538B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00508 80B538B8 8482008A */ lh $v0, 0x008A($a0) ## 0000008A -/* 0050C 80B538BC 848E0032 */ lh $t6, 0x0032($a0) ## 00000032 -/* 00510 80B538C0 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00514 80B538C4 3C0B80B6 */ lui $t3, %hi(D_80B5A468) ## $t3 = 80B60000 -/* 00518 80B538C8 004E7823 */ subu $t7, $v0, $t6 -/* 0051C 80B538CC 000FC400 */ sll $t8, $t7, 16 -/* 00520 80B538D0 0018CC03 */ sra $t9, $t8, 16 -/* 00524 80B538D4 07220007 */ bltzl $t9, .L80B538F4 -/* 00528 80B538D8 84890032 */ lh $t1, 0x0032($a0) ## 00000032 -/* 0052C 80B538DC 84880032 */ lh $t0, 0x0032($a0) ## 00000032 -/* 00530 80B538E0 00481823 */ subu $v1, $v0, $t0 -/* 00534 80B538E4 00031C00 */ sll $v1, $v1, 16 -/* 00538 80B538E8 10000006 */ beq $zero, $zero, .L80B53904 -/* 0053C 80B538EC 00031C03 */ sra $v1, $v1, 16 -/* 00540 80B538F0 84890032 */ lh $t1, 0x0032($a0) ## 00000032 -.L80B538F4: -/* 00544 80B538F4 00491823 */ subu $v1, $v0, $t1 -/* 00548 80B538F8 00031C00 */ sll $v1, $v1, 16 -/* 0054C 80B538FC 00031C03 */ sra $v1, $v1, 16 -/* 00550 80B53900 00031823 */ subu $v1, $zero, $v1 -.L80B53904: -/* 00554 80B53904 28611556 */ slti $at, $v1, 0x1556 -/* 00558 80B53908 14200002 */ bne $at, $zero, .L80B53914 -/* 0055C 80B5390C 3C0180B6 */ lui $at, %hi(D_80B5A468) ## $at = 80B60000 -/* 00560 80B53910 AC2AA468 */ sw $t2, %lo(D_80B5A468)($at) -.L80B53914: -/* 00564 80B53914 8D6BA468 */ lw $t3, %lo(D_80B5A468)($t3) -/* 00568 80B53918 51600008 */ beql $t3, $zero, .L80B5393C -/* 0056C 80B5391C A48003D0 */ sh $zero, 0x03D0($a0) ## 000003D0 -/* 00570 80B53920 0C2D4DFA */ jal func_80B537E8 -/* 00574 80B53924 00000000 */ nop -/* 00578 80B53928 14400004 */ bne $v0, $zero, .L80B5393C -/* 0057C 80B5392C 3C0180B6 */ lui $at, %hi(D_80B5A468) ## $at = 80B60000 -/* 00580 80B53930 10000002 */ beq $zero, $zero, .L80B5393C -/* 00584 80B53934 AC20A468 */ sw $zero, %lo(D_80B5A468)($at) -/* 00588 80B53938 A48003D0 */ sh $zero, 0x03D0($a0) ## 000003D0 -.L80B5393C: -/* 0058C 80B5393C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00590 80B53940 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00594 80B53944 03E00008 */ jr $ra -/* 00598 80B53948 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5394C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5394C.s deleted file mode 100644 index a5ffa93522..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5394C.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B5394C -/* 0059C 80B5394C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 005A0 80B53950 AFBF0014 */ sw $ra, 0x0014($sp) -/* 005A4 80B53954 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 005A8 80B53958 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 005AC 80B5395C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005B0 80B53960 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 005B4 80B53964 03E00008 */ jr $ra -/* 005B8 80B53968 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5396C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5396C.s deleted file mode 100644 index 1d1b1b59dc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5396C.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_80B5396C -/* 005BC 80B5396C 03E00008 */ jr $ra -/* 005C0 80B53970 908203C8 */ lbu $v0, 0x03C8($a0) ## 000003C8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53974.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53974.s deleted file mode 100644 index d0c3b121c9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53974.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80B53974 -/* 005C4 80B53974 AFA50004 */ sw $a1, 0x0004($sp) -/* 005C8 80B53978 03E00008 */ jr $ra -/* 005CC 80B5397C A08503C8 */ sb $a1, 0x03C8($a0) ## 000003C8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54360.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54360.s deleted file mode 100644 index 4aa259f9a4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54360.s +++ /dev/null @@ -1,161 +0,0 @@ -glabel func_80B54360 -/* 00FB0 80B54360 AFA50004 */ sw $a1, 0x0004($sp) -/* 00FB4 80B54364 8C8E02FC */ lw $t6, 0x02FC($a0) ## 000002FC -/* 00FB8 80B54368 00053C00 */ sll $a3, $a1, 16 -/* 00FBC 80B5436C 00073C03 */ sra $a3, $a3, 16 -/* 00FC0 80B54370 11C00082 */ beq $t6, $zero, .L80B5457C -/* 00FC4 80B54374 00067840 */ sll $t7, $a2, 1 -/* 00FC8 80B54378 008F2821 */ addu $a1, $a0, $t7 -/* 00FCC 80B5437C 84B8028C */ lh $t8, 0x028C($a1) ## 0000028C -/* 00FD0 80B54380 84A9025C */ lh $t1, 0x025C($a1) ## 0000025C -/* 00FD4 80B54384 84B902BC */ lh $t9, 0x02BC($a1) ## 000002BC -/* 00FD8 80B54388 03071823 */ subu $v1, $t8, $a3 -/* 00FDC 80B5438C 00034400 */ sll $t0, $v1, 16 -/* 00FE0 80B54390 00084403 */ sra $t0, $t0, 16 -/* 00FE4 80B54394 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00FE8 80B54398 01005025 */ or $t2, $t0, $zero ## $t2 = 00000000 -/* 00FEC 80B5439C 01201025 */ or $v0, $t1, $zero ## $v0 = 00000000 -/* 00FF0 80B543A0 14C10004 */ bne $a2, $at, .L80B543B4 -/* 00FF4 80B543A4 00F95823 */ subu $t3, $a3, $t9 -/* 00FF8 80B543A8 00006025 */ or $t4, $zero, $zero ## $t4 = 00000000 -/* 00FFC 80B543AC 1000003B */ beq $zero, $zero, .L80B5449C -/* 01000 80B543B0 848D025C */ lh $t5, 0x025C($a0) ## 0000025C -.L80B543B4: -/* 01004 80B543B4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01008 80B543B8 14C10003 */ bne $a2, $at, .L80B543C8 -/* 0100C 80B543BC 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 -/* 01010 80B543C0 10000036 */ beq $zero, $zero, .L80B5449C -/* 01014 80B543C4 848D0262 */ lh $t5, 0x0262($a0) ## 00000262 -.L80B543C8: -/* 01018 80B543C8 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 0101C 80B543CC 14C10003 */ bne $a2, $at, .L80B543DC -/* 01020 80B543D0 240C0006 */ addiu $t4, $zero, 0x0006 ## $t4 = 00000006 -/* 01024 80B543D4 10000031 */ beq $zero, $zero, .L80B5449C -/* 01028 80B543D8 848D0268 */ lh $t5, 0x0268($a0) ## 00000268 -.L80B543DC: -/* 0102C 80B543DC 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 01030 80B543E0 54C1000B */ bnel $a2, $at, .L80B54410 -/* 01034 80B543E4 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 01038 80B543E8 848E026E */ lh $t6, 0x026E($a0) ## 0000026E -/* 0103C 80B543EC 240C0009 */ addiu $t4, $zero, 0x0009 ## $t4 = 00000009 -/* 01040 80B543F0 05C20004 */ bltzl $t6, .L80B54404 -/* 01044 80B543F4 848D026E */ lh $t5, 0x026E($a0) ## 0000026E -/* 01048 80B543F8 10000028 */ beq $zero, $zero, .L80B5449C -/* 0104C 80B543FC 848D026E */ lh $t5, 0x026E($a0) ## 0000026E -/* 01050 80B54400 848D026E */ lh $t5, 0x026E($a0) ## 0000026E -.L80B54404: -/* 01054 80B54404 10000025 */ beq $zero, $zero, .L80B5449C -/* 01058 80B54408 000D6823 */ subu $t5, $zero, $t5 -/* 0105C 80B5440C 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -.L80B54410: -/* 01060 80B54410 54C1000B */ bnel $a2, $at, .L80B54440 -/* 01064 80B54414 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 01068 80B54418 848F0274 */ lh $t7, 0x0274($a0) ## 00000274 -/* 0106C 80B5441C 240C000C */ addiu $t4, $zero, 0x000C ## $t4 = 0000000C -/* 01070 80B54420 05E20004 */ bltzl $t7, .L80B54434 -/* 01074 80B54424 848D0274 */ lh $t5, 0x0274($a0) ## 00000274 -/* 01078 80B54428 1000001C */ beq $zero, $zero, .L80B5449C -/* 0107C 80B5442C 848D0274 */ lh $t5, 0x0274($a0) ## 00000274 -/* 01080 80B54430 848D0274 */ lh $t5, 0x0274($a0) ## 00000274 -.L80B54434: -/* 01084 80B54434 10000019 */ beq $zero, $zero, .L80B5449C -/* 01088 80B54438 000D6823 */ subu $t5, $zero, $t5 -/* 0108C 80B5443C 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -.L80B54440: -/* 01090 80B54440 54C1000D */ bnel $a2, $at, .L80B54478 -/* 01094 80B54444 84990280 */ lh $t9, 0x0280($a0) ## 00000280 -/* 01098 80B54448 8498027A */ lh $t8, 0x027A($a0) ## 0000027A -/* 0109C 80B5444C 240C000F */ addiu $t4, $zero, 0x000F ## $t4 = 0000000F -/* 010A0 80B54450 07020005 */ bltzl $t8, .L80B54468 -/* 010A4 80B54454 848D027A */ lh $t5, 0x027A($a0) ## 0000027A -/* 010A8 80B54458 848D027A */ lh $t5, 0x027A($a0) ## 0000027A -/* 010AC 80B5445C 1000000F */ beq $zero, $zero, .L80B5449C -/* 010B0 80B54460 000D6823 */ subu $t5, $zero, $t5 -/* 010B4 80B54464 848D027A */ lh $t5, 0x027A($a0) ## 0000027A -.L80B54468: -/* 010B8 80B54468 000D6823 */ subu $t5, $zero, $t5 -/* 010BC 80B5446C 1000000B */ beq $zero, $zero, .L80B5449C -/* 010C0 80B54470 000D6823 */ subu $t5, $zero, $t5 -/* 010C4 80B54474 84990280 */ lh $t9, 0x0280($a0) ## 00000280 -.L80B54478: -/* 010C8 80B54478 240C0012 */ addiu $t4, $zero, 0x0012 ## $t4 = 00000012 -/* 010CC 80B5447C 07220005 */ bltzl $t9, .L80B54494 -/* 010D0 80B54480 848D0280 */ lh $t5, 0x0280($a0) ## 00000280 -/* 010D4 80B54484 848D0280 */ lh $t5, 0x0280($a0) ## 00000280 -/* 010D8 80B54488 10000004 */ beq $zero, $zero, .L80B5449C -/* 010DC 80B5448C 000D6823 */ subu $t5, $zero, $t5 -/* 010E0 80B54490 848D0280 */ lh $t5, 0x0280($a0) ## 00000280 -.L80B54494: -/* 010E4 80B54494 000D6823 */ subu $t5, $zero, $t5 -/* 010E8 80B54498 000D6823 */ subu $t5, $zero, $t5 -.L80B5449C: -/* 010EC 80B5449C 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 -/* 010F0 80B544A0 34018001 */ ori $at, $zero, 0x8001 ## $at = 00008001 -/* 010F4 80B544A4 46802020 */ cvt.s.w $f0, $f4 -/* 010F8 80B544A8 46000005 */ abs.s $f0, $f0 -/* 010FC 80B544AC 4600018D */ trunc.w.s $f6, $f0 -/* 01100 80B544B0 440F3000 */ mfc1 $t7, $f6 -/* 01104 80B544B4 00000000 */ nop -/* 01108 80B544B8 01E1082A */ slt $at, $t7, $at -/* 0110C 80B544BC 14200007 */ bne $at, $zero, .L80B544DC -/* 01110 80B544C0 00000000 */ nop -/* 01114 80B544C4 18E00004 */ blez $a3, .L80B544D8 -/* 01118 80B544C8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0111C 80B544CC 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 01120 80B544D0 10000002 */ beq $zero, $zero, .L80B544DC -/* 01124 80B544D4 01615821 */ addu $t3, $t3, $at -.L80B544D8: -/* 01128 80B544D8 01615821 */ addu $t3, $t3, $at -.L80B544DC: -/* 0112C 80B544DC 05800005 */ bltz $t4, .L80B544F4 -/* 01130 80B544E0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01134 80B544E4 01A1001A */ div $zero, $t5, $at -/* 01138 80B544E8 0000C012 */ mflo $t8 -/* 0113C 80B544EC 01785821 */ addu $t3, $t3, $t8 -/* 01140 80B544F0 00000000 */ nop -.L80B544F4: -/* 01144 80B544F4 11600006 */ beq $t3, $zero, .L80B54510 -/* 01148 80B544F8 0162C823 */ subu $t9, $t3, $v0 -/* 0114C 80B544FC 07210003 */ bgez $t9, .L80B5450C -/* 01150 80B54500 00197103 */ sra $t6, $t9, 4 -/* 01154 80B54504 2721000F */ addiu $at, $t9, 0x000F ## $at = 0000000F -/* 01158 80B54508 00017103 */ sra $t6, $at, 4 -.L80B5450C: -/* 0115C 80B5450C 004E1021 */ addu $v0, $v0, $t6 -.L80B54510: -/* 01160 80B54510 10400005 */ beq $v0, $zero, .L80B54528 -/* 01164 80B54514 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 01168 80B54518 0041001A */ div $zero, $v0, $at -/* 0116C 80B5451C 00007812 */ mflo $t7 -/* 01170 80B54520 004F1023 */ subu $v0, $v0, $t7 -/* 01174 80B54524 00000000 */ nop -.L80B54528: -/* 01178 80B54528 11000005 */ beq $t0, $zero, .L80B54540 -/* 0117C 80B5452C 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 01180 80B54530 0101001A */ div $zero, $t0, $at -/* 01184 80B54534 0000C012 */ mflo $t8 -/* 01188 80B54538 00581023 */ subu $v0, $v0, $t8 -/* 0118C 80B5453C 00000000 */ nop -.L80B54540: -/* 01190 80B54540 01220019 */ multu $t1, $v0 -/* 01194 80B54544 00621821 */ addu $v1, $v1, $v0 -/* 01198 80B54548 2941FF9D */ slti $at, $t2, 0xFF9D -/* 0119C 80B5454C 0000C812 */ mflo $t9 -/* 011A0 80B54550 5F200008 */ bgtzl $t9, .L80B54574 -/* 011A4 80B54554 00E37021 */ addu $t6, $a3, $v1 -/* 011A8 80B54558 14200005 */ bne $at, $zero, .L80B54570 -/* 011AC 80B5455C 29410064 */ slti $at, $t2, 0x0064 -/* 011B0 80B54560 50200004 */ beql $at, $zero, .L80B54574 -/* 011B4 80B54564 00E37021 */ addu $t6, $a3, $v1 -/* 011B8 80B54568 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 011BC 80B5456C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B54570: -/* 011C0 80B54570 00E37021 */ addu $t6, $a3, $v1 -.L80B54574: -/* 011C4 80B54574 A4A2025C */ sh $v0, 0x025C($a1) ## 0000025C -/* 011C8 80B54578 A4AE028C */ sh $t6, 0x028C($a1) ## 0000028C -.L80B5457C: -/* 011CC 80B5457C 00067840 */ sll $t7, $a2, 1 -/* 011D0 80B54580 008FC021 */ addu $t8, $a0, $t7 -/* 011D4 80B54584 03E00008 */ jr $ra -/* 011D8 80B54588 A70702BC */ sh $a3, 0x02BC($t8) ## 000002BC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5458C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5458C.s deleted file mode 100644 index b6536225a8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5458C.s +++ /dev/null @@ -1,528 +0,0 @@ -.rdata -glabel D_80B5A5A0 - .asciz "../z_en_zl3.c" - .balign 4 - -glabel D_80B5A5B0 - .asciz "../z_en_zl3.c" - .balign 4 - -glabel D_80B5A5C0 - .asciz "../z_en_zl3.c" - .balign 4 - -glabel D_80B5A5D0 - .asciz "../z_en_zl3.c" - .balign 4 - -glabel D_80B5A5E0 - .asciz "../z_en_zl3.c" - .balign 4 - -glabel D_80B5A5F0 - .asciz "../z_en_zl3.c" - .balign 4 - -glabel D_80B5A600 - .asciz "../z_en_zl3.c" - .balign 4 - -.late_rodata -glabel D_80B5AAEC - .word 0xC47EC000 -glabel D_80B5AAF0 - .word 0x43E98000 -glabel D_80B5AAF4 - .word 0x43848000 -glabel D_80B5AAF8 - .word 0xC3D58000 -glabel D_80B5AAFC - .word 0x43E98000 -glabel D_80B5AB00 - .word 0x43848000 -glabel D_80B5AB04 - .word 0xC3D58000 - -.text -glabel func_80B5458C -/* 011DC 80B5458C 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 -/* 011E0 80B54590 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 011E4 80B54594 AFBF0014 */ sw $ra, 0x0014($sp) -/* 011E8 80B54598 AFA40090 */ sw $a0, 0x0090($sp) -/* 011EC 80B5459C AFA60098 */ sw $a2, 0x0098($sp) -/* 011F0 80B545A0 14A101BF */ bne $a1, $at, .L80B54CA0 -/* 011F4 80B545A4 AFA7009C */ sw $a3, 0x009C($sp) -/* 011F8 80B545A8 8C840000 */ lw $a0, 0x0000($a0) ## 00000000 -/* 011FC 80B545AC 0C031A73 */ jal Graph_Alloc - -/* 01200 80B545B0 240501C0 */ addiu $a1, $zero, 0x01C0 ## $a1 = 000001C0 -/* 01204 80B545B4 8FA800A0 */ lw $t0, 0x00A0($sp) -/* 01208 80B545B8 8FA300A4 */ lw $v1, 0x00A4($sp) -/* 0120C 80B545BC AFA20078 */ sw $v0, 0x0078($sp) -/* 01210 80B545C0 850F0000 */ lh $t7, 0x0000($t0) ## 00000000 -/* 01214 80B545C4 84780402 */ lh $t8, 0x0402($v1) ## 00000402 -/* 01218 80B545C8 850A0004 */ lh $t2, 0x0004($t0) ## 00000004 -/* 0121C 80B545CC 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 01220 80B545D0 01F8C821 */ addu $t9, $t7, $t8 -/* 01224 80B545D4 A5190000 */ sh $t9, 0x0000($t0) ## 00000000 -/* 01228 80B545D8 846B0400 */ lh $t3, 0x0400($v1) ## 00000400 -/* 0122C 80B545DC 35CE0030 */ ori $t6, $t6, 0x0030 ## $t6 = DB060030 -/* 01230 80B545E0 24630400 */ addiu $v1, $v1, 0x0400 ## $v1 = 00000400 -/* 01234 80B545E4 014B6021 */ addu $t4, $t2, $t3 -/* 01238 80B545E8 A50C0004 */ sh $t4, 0x0004($t0) ## 00000004 -/* 0123C 80B545EC 8FA500A8 */ lw $a1, 0x00A8($sp) -/* 01240 80B545F0 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 01244 80B545F4 248D0008 */ addiu $t5, $a0, 0x0008 ## $t5 = 00000008 -/* 01248 80B545F8 ACAD0000 */ sw $t5, 0x0000($a1) ## 00000000 -/* 0124C 80B545FC AC820004 */ sw $v0, 0x0004($a0) ## 00000004 -/* 01250 80B54600 0C034213 */ jal Matrix_Push -/* 01254 80B54604 AC8E0000 */ sw $t6, 0x0000($a0) ## 00000000 -/* 01258 80B54608 8FA9009C */ lw $t1, 0x009C($sp) -/* 0125C 80B5460C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01260 80B54610 C52C0000 */ lwc1 $f12, 0x0000($t1) ## 00000000 -/* 01264 80B54614 C52E0004 */ lwc1 $f14, 0x0004($t1) ## 00000004 -/* 01268 80B54618 0C034261 */ jal Matrix_Translate -/* 0126C 80B5461C 8D260008 */ lw $a2, 0x0008($t1) ## 00000008 -/* 01270 80B54620 8FA800A0 */ lw $t0, 0x00A0($sp) -/* 01274 80B54624 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01278 80B54628 85040000 */ lh $a0, 0x0000($t0) ## 00000000 -/* 0127C 80B5462C 85050002 */ lh $a1, 0x0002($t0) ## 00000002 -/* 01280 80B54630 0C034421 */ jal Matrix_RotateRPY -/* 01284 80B54634 85060004 */ lh $a2, 0x0004($t0) ## 00000004 -/* 01288 80B54638 0C034213 */ jal Matrix_Push -/* 0128C 80B5463C 00000000 */ nop -/* 01290 80B54640 3C0143B5 */ lui $at, 0x43B5 ## $at = 43B50000 -/* 01294 80B54644 44816000 */ mtc1 $at, $f12 ## $f12 = 362.00 -/* 01298 80B54648 3C01C305 */ lui $at, 0xC305 ## $at = C3050000 -/* 0129C 80B5464C 44817000 */ mtc1 $at, $f14 ## $f14 = -133.00 -/* 012A0 80B54650 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 012A4 80B54654 0C034261 */ jal Matrix_Translate -/* 012A8 80B54658 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 012AC 80B5465C 0C034236 */ jal Matrix_Get -/* 012B0 80B54660 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 -/* 012B4 80B54664 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 -/* 012B8 80B54668 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFA0 -/* 012BC 80B5466C 0C034833 */ jal func_800D20CC -/* 012C0 80B54670 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 012C4 80B54674 0C03034A */ jal func_800C0D28 -/* 012C8 80B54678 8FA40090 */ lw $a0, 0x0090($sp) -/* 012CC 80B5467C 1440000D */ bne $v0, $zero, .L80B546B4 -/* 012D0 80B54680 00000000 */ nop -/* 012D4 80B54684 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 012D8 80B54688 87A50032 */ lh $a1, 0x0032($sp) -/* 012DC 80B5468C 0C2D4E60 */ jal func_80B53980 -/* 012E0 80B54690 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 012E4 80B54694 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 012E8 80B54698 87A50030 */ lh $a1, 0x0030($sp) -/* 012EC 80B5469C 0C2D50D8 */ jal func_80B54360 -/* 012F0 80B546A0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 012F4 80B546A4 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 012F8 80B546A8 87A50034 */ lh $a1, 0x0034($sp) -/* 012FC 80B546AC 0C2D4ED9 */ jal func_80B53B64 -/* 01300 80B546B0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -.L80B546B4: -/* 01304 80B546B4 3C028016 */ lui $v0, %hi(gGameInfo) -/* 01308 80B546B8 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 0130C 80B546BC 8FA300A4 */ lw $v1, 0x00A4($sp) -/* 01310 80B546C0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01314 80B546C4 844F1492 */ lh $t7, 0x1492($v0) ## 80161492 -/* 01318 80B546C8 84591494 */ lh $t9, 0x1494($v0) ## 80161494 -/* 0131C 80B546CC 844B1496 */ lh $t3, 0x1496($v0) ## 80161496 -/* 01320 80B546D0 846C0290 */ lh $t4, 0x0290($v1) ## 00000290 -/* 01324 80B546D4 846A028E */ lh $t2, 0x028E($v1) ## 0000028E -/* 01328 80B546D8 8478028C */ lh $t8, 0x028C($v1) ## 0000028C -/* 0132C 80B546DC 016C3021 */ addu $a2, $t3, $t4 -/* 01330 80B546E0 032A2821 */ addu $a1, $t9, $t2 -/* 01334 80B546E4 01F82021 */ addu $a0, $t7, $t8 -/* 01338 80B546E8 00042400 */ sll $a0, $a0, 16 -/* 0133C 80B546EC 00052C00 */ sll $a1, $a1, 16 -/* 01340 80B546F0 00063400 */ sll $a2, $a2, 16 -/* 01344 80B546F4 2463028C */ addiu $v1, $v1, 0x028C ## $v1 = 0000028C -/* 01348 80B546F8 AFA30020 */ sw $v1, 0x0020($sp) -/* 0134C 80B546FC 00063403 */ sra $a2, $a2, 16 -/* 01350 80B54700 00052C03 */ sra $a1, $a1, 16 -/* 01354 80B54704 0C034421 */ jal Matrix_RotateRPY -/* 01358 80B54708 00042403 */ sra $a0, $a0, 16 -/* 0135C 80B5470C 3C01C33C */ lui $at, 0xC33C ## $at = C33C0000 -/* 01360 80B54710 44816000 */ mtc1 $at, $f12 ## $f12 = -188.00 -/* 01364 80B54714 3C01C338 */ lui $at, 0xC338 ## $at = C3380000 -/* 01368 80B54718 44817000 */ mtc1 $at, $f14 ## $f14 = -184.00 -/* 0136C 80B5471C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 01370 80B54720 0C034261 */ jal Matrix_Translate -/* 01374 80B54724 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01378 80B54728 3C0580B6 */ lui $a1, %hi(D_80B5A5A0) ## $a1 = 80B60000 -/* 0137C 80B5472C 24A5A5A0 */ addiu $a1, $a1, %lo(D_80B5A5A0) ## $a1 = 80B5A5A0 -/* 01380 80B54730 8FA40078 */ lw $a0, 0x0078($sp) -/* 01384 80B54734 0C034695 */ jal Matrix_ToMtx -/* 01388 80B54738 240605D2 */ addiu $a2, $zero, 0x05D2 ## $a2 = 000005D2 -/* 0138C 80B5473C 0C034236 */ jal Matrix_Get -/* 01390 80B54740 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 -/* 01394 80B54744 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 -/* 01398 80B54748 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFA0 -/* 0139C 80B5474C 0C034833 */ jal func_800D20CC -/* 013A0 80B54750 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 013A4 80B54754 0C03034A */ jal func_800C0D28 -/* 013A8 80B54758 8FA40090 */ lw $a0, 0x0090($sp) -/* 013AC 80B5475C 14400005 */ bne $v0, $zero, .L80B54774 -/* 013B0 80B54760 00000000 */ nop -/* 013B4 80B54764 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 013B8 80B54768 87A50032 */ lh $a1, 0x0032($sp) -/* 013BC 80B5476C 0C2D4E60 */ jal func_80B53980 -/* 013C0 80B54770 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -.L80B54774: -/* 013C4 80B54774 3C028016 */ lui $v0, %hi(gGameInfo) -/* 013C8 80B54778 8FA30020 */ lw $v1, 0x0020($sp) -/* 013CC 80B5477C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 013D0 80B54780 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 013D4 80B54784 846E0006 */ lh $t6, 0x0006($v1) ## 00000006 -/* 013D8 80B54788 84780008 */ lh $t8, 0x0008($v1) ## 00000008 -/* 013DC 80B5478C 846A000A */ lh $t2, 0x000A($v1) ## 0000000A -/* 013E0 80B54790 844D1498 */ lh $t5, 0x1498($v0) ## 80161498 -/* 013E4 80B54794 844F149A */ lh $t7, 0x149A($v0) ## 8016149A -/* 013E8 80B54798 8459149C */ lh $t9, 0x149C($v0) ## 8016149C -/* 013EC 80B5479C 01AE2021 */ addu $a0, $t5, $t6 -/* 013F0 80B547A0 01F82821 */ addu $a1, $t7, $t8 -/* 013F4 80B547A4 032A3021 */ addu $a2, $t9, $t2 -/* 013F8 80B547A8 00063400 */ sll $a2, $a2, 16 -/* 013FC 80B547AC 00052C00 */ sll $a1, $a1, 16 -/* 01400 80B547B0 00042400 */ sll $a0, $a0, 16 -/* 01404 80B547B4 00042403 */ sra $a0, $a0, 16 -/* 01408 80B547B8 00052C03 */ sra $a1, $a1, 16 -/* 0140C 80B547BC 0C034421 */ jal Matrix_RotateRPY -/* 01410 80B547C0 00063403 */ sra $a2, $a2, 16 -/* 01414 80B547C4 3C01C3CD */ lui $at, 0xC3CD ## $at = C3CD0000 -/* 01418 80B547C8 44816000 */ mtc1 $at, $f12 ## $f12 = -410.00 -/* 0141C 80B547CC 3C01C338 */ lui $at, 0xC338 ## $at = C3380000 -/* 01420 80B547D0 44817000 */ mtc1 $at, $f14 ## $f14 = -184.00 -/* 01424 80B547D4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 01428 80B547D8 0C034261 */ jal Matrix_Translate -/* 0142C 80B547DC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01430 80B547E0 8FA40078 */ lw $a0, 0x0078($sp) -/* 01434 80B547E4 3C0580B6 */ lui $a1, %hi(D_80B5A5B0) ## $a1 = 80B60000 -/* 01438 80B547E8 24A5A5B0 */ addiu $a1, $a1, %lo(D_80B5A5B0) ## $a1 = 80B5A5B0 -/* 0143C 80B547EC 240605FE */ addiu $a2, $zero, 0x05FE ## $a2 = 000005FE -/* 01440 80B547F0 0C034695 */ jal Matrix_ToMtx -/* 01444 80B547F4 24840040 */ addiu $a0, $a0, 0x0040 ## $a0 = 00000040 -/* 01448 80B547F8 0C034236 */ jal Matrix_Get -/* 0144C 80B547FC 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 -/* 01450 80B54800 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 -/* 01454 80B54804 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFA0 -/* 01458 80B54808 0C034833 */ jal func_800D20CC -/* 0145C 80B5480C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01460 80B54810 0C03034A */ jal func_800C0D28 -/* 01464 80B54814 8FA40090 */ lw $a0, 0x0090($sp) -/* 01468 80B54818 14400005 */ bne $v0, $zero, .L80B54830 -/* 0146C 80B5481C 00000000 */ nop -/* 01470 80B54820 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01474 80B54824 87A50030 */ lh $a1, 0x0030($sp) -/* 01478 80B54828 0C2D50D8 */ jal func_80B54360 -/* 0147C 80B5482C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -.L80B54830: -/* 01480 80B54830 3C028016 */ lui $v0, %hi(gGameInfo) -/* 01484 80B54834 8FA30020 */ lw $v1, 0x0020($sp) -/* 01488 80B54838 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 0148C 80B5483C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01490 80B54840 846C000C */ lh $t4, 0x000C($v1) ## 0000000C -/* 01494 80B54844 846E000E */ lh $t6, 0x000E($v1) ## 0000000E -/* 01498 80B54848 84780010 */ lh $t8, 0x0010($v1) ## 00000010 -/* 0149C 80B5484C 844B149E */ lh $t3, 0x149E($v0) ## 8016149E -/* 014A0 80B54850 844D14A0 */ lh $t5, 0x14A0($v0) ## 801614A0 -/* 014A4 80B54854 844F14A2 */ lh $t7, 0x14A2($v0) ## 801614A2 -/* 014A8 80B54858 016C2021 */ addu $a0, $t3, $t4 -/* 014AC 80B5485C 01AE2821 */ addu $a1, $t5, $t6 -/* 014B0 80B54860 01F83021 */ addu $a2, $t7, $t8 -/* 014B4 80B54864 00063400 */ sll $a2, $a2, 16 -/* 014B8 80B54868 00052C00 */ sll $a1, $a1, 16 -/* 014BC 80B5486C 00042400 */ sll $a0, $a0, 16 -/* 014C0 80B54870 00042403 */ sra $a0, $a0, 16 -/* 014C4 80B54874 00052C03 */ sra $a1, $a1, 16 -/* 014C8 80B54878 0C034421 */ jal Matrix_RotateRPY -/* 014CC 80B5487C 00063403 */ sra $a2, $a2, 16 -/* 014D0 80B54880 3C0180B6 */ lui $at, %hi(D_80B5AAEC) ## $at = 80B60000 -/* 014D4 80B54884 C42CAAEC */ lwc1 $f12, %lo(D_80B5AAEC)($at) -/* 014D8 80B54888 3C01C1D0 */ lui $at, 0xC1D0 ## $at = C1D00000 -/* 014DC 80B5488C 44817000 */ mtc1 $at, $f14 ## $f14 = -26.00 -/* 014E0 80B54890 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 014E4 80B54894 0C034261 */ jal Matrix_Translate -/* 014E8 80B54898 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 014EC 80B5489C 8FA40078 */ lw $a0, 0x0078($sp) -/* 014F0 80B548A0 3C0580B6 */ lui $a1, %hi(D_80B5A5C0) ## $a1 = 80B60000 -/* 014F4 80B548A4 24A5A5C0 */ addiu $a1, $a1, %lo(D_80B5A5C0) ## $a1 = 80B5A5C0 -/* 014F8 80B548A8 24060612 */ addiu $a2, $zero, 0x0612 ## $a2 = 00000612 -/* 014FC 80B548AC 0C034695 */ jal Matrix_ToMtx -/* 01500 80B548B0 24840080 */ addiu $a0, $a0, 0x0080 ## $a0 = 00000080 -/* 01504 80B548B4 0C034221 */ jal Matrix_Pull -/* 01508 80B548B8 00000000 */ nop -/* 0150C 80B548BC 0C034213 */ jal Matrix_Push -/* 01510 80B548C0 00000000 */ nop -/* 01514 80B548C4 3C0180B6 */ lui $at, %hi(D_80B5AAF0) ## $at = 80B60000 -/* 01518 80B548C8 C42CAAF0 */ lwc1 $f12, %lo(D_80B5AAF0)($at) -/* 0151C 80B548CC 3C0180B6 */ lui $at, %hi(D_80B5AAF4) ## $at = 80B60000 -/* 01520 80B548D0 3C0643C2 */ lui $a2, 0x43C2 ## $a2 = 43C20000 -/* 01524 80B548D4 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = 43C28000 -/* 01528 80B548D8 C42EAAF4 */ lwc1 $f14, %lo(D_80B5AAF4)($at) -/* 0152C 80B548DC 0C034261 */ jal Matrix_Translate -/* 01530 80B548E0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01534 80B548E4 0C034236 */ jal Matrix_Get -/* 01538 80B548E8 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 -/* 0153C 80B548EC 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 -/* 01540 80B548F0 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFA0 -/* 01544 80B548F4 0C034833 */ jal func_800D20CC -/* 01548 80B548F8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0154C 80B548FC 0C03034A */ jal func_800C0D28 -/* 01550 80B54900 8FA40090 */ lw $a0, 0x0090($sp) -/* 01554 80B54904 1440000D */ bne $v0, $zero, .L80B5493C -/* 01558 80B54908 00000000 */ nop -/* 0155C 80B5490C 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01560 80B54910 87A50032 */ lh $a1, 0x0032($sp) -/* 01564 80B54914 0C2D4E60 */ jal func_80B53980 -/* 01568 80B54918 24060009 */ addiu $a2, $zero, 0x0009 ## $a2 = 00000009 -/* 0156C 80B5491C 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01570 80B54920 87A50030 */ lh $a1, 0x0030($sp) -/* 01574 80B54924 0C2D50D8 */ jal func_80B54360 -/* 01578 80B54928 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 0157C 80B5492C 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01580 80B54930 87A50034 */ lh $a1, 0x0034($sp) -/* 01584 80B54934 0C2D4ED9 */ jal func_80B53B64 -/* 01588 80B54938 2406000B */ addiu $a2, $zero, 0x000B ## $a2 = 0000000B -.L80B5493C: -/* 0158C 80B5493C 3C028016 */ lui $v0, %hi(gGameInfo) -/* 01590 80B54940 8FA30020 */ lw $v1, 0x0020($sp) -/* 01594 80B54944 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 01598 80B54948 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0159C 80B5494C 846A0012 */ lh $t2, 0x0012($v1) ## 00000012 -/* 015A0 80B54950 846C0014 */ lh $t4, 0x0014($v1) ## 00000014 -/* 015A4 80B54954 846E0016 */ lh $t6, 0x0016($v1) ## 00000016 -/* 015A8 80B54958 845914A4 */ lh $t9, 0x14A4($v0) ## 801614A4 -/* 015AC 80B5495C 844B14A6 */ lh $t3, 0x14A6($v0) ## 801614A6 -/* 015B0 80B54960 844D14A8 */ lh $t5, 0x14A8($v0) ## 801614A8 -/* 015B4 80B54964 032A2021 */ addu $a0, $t9, $t2 -/* 015B8 80B54968 016C2821 */ addu $a1, $t3, $t4 -/* 015BC 80B5496C 01AE3021 */ addu $a2, $t5, $t6 -/* 015C0 80B54970 00063400 */ sll $a2, $a2, 16 -/* 015C4 80B54974 00052C00 */ sll $a1, $a1, 16 -/* 015C8 80B54978 00042400 */ sll $a0, $a0, 16 -/* 015CC 80B5497C 00042403 */ sra $a0, $a0, 16 -/* 015D0 80B54980 00052C03 */ sra $a1, $a1, 16 -/* 015D4 80B54984 0C034421 */ jal Matrix_RotateRPY -/* 015D8 80B54988 00063403 */ sra $a2, $a2, 16 -/* 015DC 80B5498C 3C0180B6 */ lui $at, %hi(D_80B5AAF8) ## $at = 80B60000 -/* 015E0 80B54990 C42CAAF8 */ lwc1 $f12, %lo(D_80B5AAF8)($at) -/* 015E4 80B54994 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 015E8 80B54998 44817000 */ mtc1 $at, $f14 ## $f14 = -1.00 -/* 015EC 80B5499C 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 015F0 80B549A0 0C034261 */ jal Matrix_Translate -/* 015F4 80B549A4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 015F8 80B549A8 8FA40078 */ lw $a0, 0x0078($sp) -/* 015FC 80B549AC 3C0580B6 */ lui $a1, %hi(D_80B5A5D0) ## $a1 = 80B60000 -/* 01600 80B549B0 24A5A5D0 */ addiu $a1, $a1, %lo(D_80B5A5D0) ## $a1 = 80B5A5D0 -/* 01604 80B549B4 2406062B */ addiu $a2, $zero, 0x062B ## $a2 = 0000062B -/* 01608 80B549B8 0C034695 */ jal Matrix_ToMtx -/* 0160C 80B549BC 248400C0 */ addiu $a0, $a0, 0x00C0 ## $a0 = 000000C0 -/* 01610 80B549C0 0C034236 */ jal Matrix_Get -/* 01614 80B549C4 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 -/* 01618 80B549C8 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 -/* 0161C 80B549CC 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFA0 -/* 01620 80B549D0 0C034833 */ jal func_800D20CC -/* 01624 80B549D4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01628 80B549D8 0C03034A */ jal func_800C0D28 -/* 0162C 80B549DC 8FA40090 */ lw $a0, 0x0090($sp) -/* 01630 80B549E0 1440000D */ bne $v0, $zero, .L80B54A18 -/* 01634 80B549E4 00000000 */ nop -/* 01638 80B549E8 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 0163C 80B549EC 87A50032 */ lh $a1, 0x0032($sp) -/* 01640 80B549F0 0C2D4E60 */ jal func_80B53980 -/* 01644 80B549F4 2406000C */ addiu $a2, $zero, 0x000C ## $a2 = 0000000C -/* 01648 80B549F8 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 0164C 80B549FC 87A50030 */ lh $a1, 0x0030($sp) -/* 01650 80B54A00 0C2D50D8 */ jal func_80B54360 -/* 01654 80B54A04 2406000D */ addiu $a2, $zero, 0x000D ## $a2 = 0000000D -/* 01658 80B54A08 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 0165C 80B54A0C 87A50034 */ lh $a1, 0x0034($sp) -/* 01660 80B54A10 0C2D4ED9 */ jal func_80B53B64 -/* 01664 80B54A14 2406000E */ addiu $a2, $zero, 0x000E ## $a2 = 0000000E -.L80B54A18: -/* 01668 80B54A18 3C028016 */ lui $v0, %hi(gGameInfo) -/* 0166C 80B54A1C 8FA30020 */ lw $v1, 0x0020($sp) -/* 01670 80B54A20 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 01674 80B54A24 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01678 80B54A28 84780018 */ lh $t8, 0x0018($v1) ## 00000018 -/* 0167C 80B54A2C 846A001A */ lh $t2, 0x001A($v1) ## 0000001A -/* 01680 80B54A30 846C001C */ lh $t4, 0x001C($v1) ## 0000001C -/* 01684 80B54A34 844F14AA */ lh $t7, 0x14AA($v0) ## 801614AA -/* 01688 80B54A38 845914AC */ lh $t9, 0x14AC($v0) ## 801614AC -/* 0168C 80B54A3C 844B14AE */ lh $t3, 0x14AE($v0) ## 801614AE -/* 01690 80B54A40 01F82021 */ addu $a0, $t7, $t8 -/* 01694 80B54A44 032A2821 */ addu $a1, $t9, $t2 -/* 01698 80B54A48 016C3021 */ addu $a2, $t3, $t4 -/* 0169C 80B54A4C 00063400 */ sll $a2, $a2, 16 -/* 016A0 80B54A50 00052C00 */ sll $a1, $a1, 16 -/* 016A4 80B54A54 00042400 */ sll $a0, $a0, 16 -/* 016A8 80B54A58 00042403 */ sra $a0, $a0, 16 -/* 016AC 80B54A5C 00052C03 */ sra $a1, $a1, 16 -/* 016B0 80B54A60 0C034421 */ jal Matrix_RotateRPY -/* 016B4 80B54A64 00063403 */ sra $a2, $a2, 16 -/* 016B8 80B54A68 3C01C3DF */ lui $at, 0xC3DF ## $at = C3DF0000 -/* 016BC 80B54A6C 44816000 */ mtc1 $at, $f12 ## $f12 = -446.00 -/* 016C0 80B54A70 3C01C250 */ lui $at, 0xC250 ## $at = C2500000 -/* 016C4 80B54A74 44817000 */ mtc1 $at, $f14 ## $f14 = -52.00 -/* 016C8 80B54A78 3C0642A8 */ lui $a2, 0x42A8 ## $a2 = 42A80000 -/* 016CC 80B54A7C 0C034261 */ jal Matrix_Translate -/* 016D0 80B54A80 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 016D4 80B54A84 8FA40078 */ lw $a0, 0x0078($sp) -/* 016D8 80B54A88 3C0580B6 */ lui $a1, %hi(D_80B5A5E0) ## $a1 = 80B60000 -/* 016DC 80B54A8C 24A5A5E0 */ addiu $a1, $a1, %lo(D_80B5A5E0) ## $a1 = 80B5A5E0 -/* 016E0 80B54A90 2406063E */ addiu $a2, $zero, 0x063E ## $a2 = 0000063E -/* 016E4 80B54A94 0C034695 */ jal Matrix_ToMtx -/* 016E8 80B54A98 24840100 */ addiu $a0, $a0, 0x0100 ## $a0 = 00000100 -/* 016EC 80B54A9C 0C034221 */ jal Matrix_Pull -/* 016F0 80B54AA0 00000000 */ nop -/* 016F4 80B54AA4 0C034213 */ jal Matrix_Push -/* 016F8 80B54AA8 00000000 */ nop -/* 016FC 80B54AAC 3C0180B6 */ lui $at, %hi(D_80B5AAFC) ## $at = 80B60000 -/* 01700 80B54AB0 C42CAAFC */ lwc1 $f12, %lo(D_80B5AAFC)($at) -/* 01704 80B54AB4 3C0180B6 */ lui $at, %hi(D_80B5AB00) ## $at = 80B60000 -/* 01708 80B54AB8 3C06C3C2 */ lui $a2, 0xC3C2 ## $a2 = C3C20000 -/* 0170C 80B54ABC 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = C3C28000 -/* 01710 80B54AC0 C42EAB00 */ lwc1 $f14, %lo(D_80B5AB00)($at) -/* 01714 80B54AC4 0C034261 */ jal Matrix_Translate -/* 01718 80B54AC8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0171C 80B54ACC 0C034236 */ jal Matrix_Get -/* 01720 80B54AD0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 -/* 01724 80B54AD4 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 -/* 01728 80B54AD8 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFA0 -/* 0172C 80B54ADC 0C034833 */ jal func_800D20CC -/* 01730 80B54AE0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01734 80B54AE4 0C03034A */ jal func_800C0D28 -/* 01738 80B54AE8 8FA40090 */ lw $a0, 0x0090($sp) -/* 0173C 80B54AEC 1440000D */ bne $v0, $zero, .L80B54B24 -/* 01740 80B54AF0 00000000 */ nop -/* 01744 80B54AF4 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01748 80B54AF8 87A50032 */ lh $a1, 0x0032($sp) -/* 0174C 80B54AFC 0C2D4E60 */ jal func_80B53980 -/* 01750 80B54B00 2406000F */ addiu $a2, $zero, 0x000F ## $a2 = 0000000F -/* 01754 80B54B04 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01758 80B54B08 87A50030 */ lh $a1, 0x0030($sp) -/* 0175C 80B54B0C 0C2D50D8 */ jal func_80B54360 -/* 01760 80B54B10 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 -/* 01764 80B54B14 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01768 80B54B18 87A50034 */ lh $a1, 0x0034($sp) -/* 0176C 80B54B1C 0C2D4ED9 */ jal func_80B53B64 -/* 01770 80B54B20 24060011 */ addiu $a2, $zero, 0x0011 ## $a2 = 00000011 -.L80B54B24: -/* 01774 80B54B24 3C028016 */ lui $v0, %hi(gGameInfo) -/* 01778 80B54B28 8FA30020 */ lw $v1, 0x0020($sp) -/* 0177C 80B54B2C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 01780 80B54B30 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01784 80B54B34 846E001E */ lh $t6, 0x001E($v1) ## 0000001E -/* 01788 80B54B38 84780020 */ lh $t8, 0x0020($v1) ## 00000020 -/* 0178C 80B54B3C 846A0022 */ lh $t2, 0x0022($v1) ## 00000022 -/* 01790 80B54B40 844D14B0 */ lh $t5, 0x14B0($v0) ## 801614B0 -/* 01794 80B54B44 844F14B2 */ lh $t7, 0x14B2($v0) ## 801614B2 -/* 01798 80B54B48 845914B4 */ lh $t9, 0x14B4($v0) ## 801614B4 -/* 0179C 80B54B4C 01AE2021 */ addu $a0, $t5, $t6 -/* 017A0 80B54B50 01F82821 */ addu $a1, $t7, $t8 -/* 017A4 80B54B54 032A3021 */ addu $a2, $t9, $t2 -/* 017A8 80B54B58 00063400 */ sll $a2, $a2, 16 -/* 017AC 80B54B5C 00052C00 */ sll $a1, $a1, 16 -/* 017B0 80B54B60 00042400 */ sll $a0, $a0, 16 -/* 017B4 80B54B64 00042403 */ sra $a0, $a0, 16 -/* 017B8 80B54B68 00052C03 */ sra $a1, $a1, 16 -/* 017BC 80B54B6C 0C034421 */ jal Matrix_RotateRPY -/* 017C0 80B54B70 00063403 */ sra $a2, $a2, 16 -/* 017C4 80B54B74 3C0180B6 */ lui $at, %hi(D_80B5AB04) ## $at = 80B60000 -/* 017C8 80B54B78 C42CAB04 */ lwc1 $f12, %lo(D_80B5AB04)($at) -/* 017CC 80B54B7C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 017D0 80B54B80 44817000 */ mtc1 $at, $f14 ## $f14 = -1.00 -/* 017D4 80B54B84 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 017D8 80B54B88 0C034261 */ jal Matrix_Translate -/* 017DC 80B54B8C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 017E0 80B54B90 8FA40078 */ lw $a0, 0x0078($sp) -/* 017E4 80B54B94 3C0580B6 */ lui $a1, %hi(D_80B5A5F0) ## $a1 = 80B60000 -/* 017E8 80B54B98 24A5A5F0 */ addiu $a1, $a1, %lo(D_80B5A5F0) ## $a1 = 80B5A5F0 -/* 017EC 80B54B9C 24060657 */ addiu $a2, $zero, 0x0657 ## $a2 = 00000657 -/* 017F0 80B54BA0 0C034695 */ jal Matrix_ToMtx -/* 017F4 80B54BA4 24840140 */ addiu $a0, $a0, 0x0140 ## $a0 = 00000140 -/* 017F8 80B54BA8 0C034236 */ jal Matrix_Get -/* 017FC 80B54BAC 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 -/* 01800 80B54BB0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 -/* 01804 80B54BB4 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFA0 -/* 01808 80B54BB8 0C034833 */ jal func_800D20CC -/* 0180C 80B54BBC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01810 80B54BC0 0C03034A */ jal func_800C0D28 -/* 01814 80B54BC4 8FA40090 */ lw $a0, 0x0090($sp) -/* 01818 80B54BC8 1440000C */ bne $v0, $zero, .L80B54BFC -/* 0181C 80B54BCC 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01820 80B54BD0 87A50032 */ lh $a1, 0x0032($sp) -/* 01824 80B54BD4 0C2D4E60 */ jal func_80B53980 -/* 01828 80B54BD8 24060012 */ addiu $a2, $zero, 0x0012 ## $a2 = 00000012 -/* 0182C 80B54BDC 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01830 80B54BE0 87A50030 */ lh $a1, 0x0030($sp) -/* 01834 80B54BE4 0C2D50D8 */ jal func_80B54360 -/* 01838 80B54BE8 24060013 */ addiu $a2, $zero, 0x0013 ## $a2 = 00000013 -/* 0183C 80B54BEC 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01840 80B54BF0 87A50034 */ lh $a1, 0x0034($sp) -/* 01844 80B54BF4 0C2D4ED9 */ jal func_80B53B64 -/* 01848 80B54BF8 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -.L80B54BFC: -/* 0184C 80B54BFC 3C028016 */ lui $v0, %hi(gGameInfo) -/* 01850 80B54C00 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 01854 80B54C04 8FAC0020 */ lw $t4, 0x0020($sp) -/* 01858 80B54C08 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0185C 80B54C0C 844B14B6 */ lh $t3, 0x14B6($v0) ## 801614B6 -/* 01860 80B54C10 844E14B8 */ lh $t6, 0x14B8($v0) ## 801614B8 -/* 01864 80B54C14 845814BA */ lh $t8, 0x14BA($v0) ## 801614BA -/* 01868 80B54C18 858D0024 */ lh $t5, 0x0024($t4) ## 00000024 -/* 0186C 80B54C1C 858F0026 */ lh $t7, 0x0026($t4) ## 00000026 -/* 01870 80B54C20 85990028 */ lh $t9, 0x0028($t4) ## 00000028 -/* 01874 80B54C24 016D2021 */ addu $a0, $t3, $t5 -/* 01878 80B54C28 01CF2821 */ addu $a1, $t6, $t7 -/* 0187C 80B54C2C 03193021 */ addu $a2, $t8, $t9 -/* 01880 80B54C30 00063400 */ sll $a2, $a2, 16 -/* 01884 80B54C34 00052C00 */ sll $a1, $a1, 16 -/* 01888 80B54C38 00042400 */ sll $a0, $a0, 16 -/* 0188C 80B54C3C 00042403 */ sra $a0, $a0, 16 -/* 01890 80B54C40 00052C03 */ sra $a1, $a1, 16 -/* 01894 80B54C44 0C034421 */ jal Matrix_RotateRPY -/* 01898 80B54C48 00063403 */ sra $a2, $a2, 16 -/* 0189C 80B54C4C 3C01C3DF */ lui $at, 0xC3DF ## $at = C3DF0000 -/* 018A0 80B54C50 44816000 */ mtc1 $at, $f12 ## $f12 = -446.00 -/* 018A4 80B54C54 3C01C250 */ lui $at, 0xC250 ## $at = C2500000 -/* 018A8 80B54C58 44817000 */ mtc1 $at, $f14 ## $f14 = -52.00 -/* 018AC 80B54C5C 3C06C2A8 */ lui $a2, 0xC2A8 ## $a2 = C2A80000 -/* 018B0 80B54C60 0C034261 */ jal Matrix_Translate -/* 018B4 80B54C64 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 018B8 80B54C68 8FA40078 */ lw $a0, 0x0078($sp) -/* 018BC 80B54C6C 3C0580B6 */ lui $a1, %hi(D_80B5A600) ## $a1 = 80B60000 -/* 018C0 80B54C70 24A5A600 */ addiu $a1, $a1, %lo(D_80B5A600) ## $a1 = 80B5A600 -/* 018C4 80B54C74 2406066A */ addiu $a2, $zero, 0x066A ## $a2 = 0000066A -/* 018C8 80B54C78 0C034695 */ jal Matrix_ToMtx -/* 018CC 80B54C7C 24840180 */ addiu $a0, $a0, 0x0180 ## $a0 = 00000180 -/* 018D0 80B54C80 0C034221 */ jal Matrix_Pull -/* 018D4 80B54C84 00000000 */ nop -/* 018D8 80B54C88 0C034221 */ jal Matrix_Pull -/* 018DC 80B54C8C 00000000 */ nop -/* 018E0 80B54C90 8FAB00A4 */ lw $t3, 0x00A4($sp) -/* 018E4 80B54C94 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 018E8 80B54C98 1000000E */ beq $zero, $zero, .L80B54CD4 -/* 018EC 80B54C9C AD6A02FC */ sw $t2, 0x02FC($t3) ## 000002FC -.L80B54CA0: -/* 018F0 80B54CA0 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 018F4 80B54CA4 14A1000B */ bne $a1, $at, .L80B54CD4 -/* 018F8 80B54CA8 8FA800A0 */ lw $t0, 0x00A0($sp) -/* 018FC 80B54CAC 8FA200A4 */ lw $v0, 0x00A4($sp) -/* 01900 80B54CB0 850D0000 */ lh $t5, 0x0000($t0) ## 00000000 -/* 01904 80B54CB4 850C0002 */ lh $t4, 0x0002($t0) ## 00000002 -/* 01908 80B54CB8 844E0408 */ lh $t6, 0x0408($v0) ## 00000408 -/* 0190C 80B54CBC 24420406 */ addiu $v0, $v0, 0x0406 ## $v0 = 00000406 -/* 01910 80B54CC0 01AE7821 */ addu $t7, $t5, $t6 -/* 01914 80B54CC4 A50F0000 */ sh $t7, 0x0000($t0) ## 00000000 -/* 01918 80B54CC8 84580000 */ lh $t8, 0x0000($v0) ## 00000406 -/* 0191C 80B54CCC 0198C823 */ subu $t9, $t4, $t8 -/* 01920 80B54CD0 A5190002 */ sh $t9, 0x0002($t0) ## 00000002 -.L80B54CD4: -/* 01924 80B54CD4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01928 80B54CD8 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 -/* 0192C 80B54CDC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01930 80B54CE0 03E00008 */ jr $ra -/* 01934 80B54CE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54CE8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54CE8.s deleted file mode 100644 index af12ee60bc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54CE8.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_80B54CE8 -/* 01938 80B54CE8 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 0193C 80B54CEC 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 01940 80B54CF0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01944 80B54CF4 AFA40048 */ sw $a0, 0x0048($sp) -/* 01948 80B54CF8 AFA60050 */ sw $a2, 0x0050($sp) -/* 0194C 80B54CFC 14A1000F */ bne $a1, $at, .L80B54D3C -/* 01950 80B54D00 AFA70054 */ sw $a3, 0x0054($sp) -/* 01954 80B54D04 3C0E80B6 */ lui $t6, %hi(D_80B5A46C) ## $t6 = 80B60000 -/* 01958 80B54D08 25CEA46C */ addiu $t6, $t6, %lo(D_80B5A46C) ## $t6 = 80B5A46C -/* 0195C 80B54D0C 8DD80000 */ lw $t8, 0x0000($t6) ## 80B5A46C -/* 01960 80B54D10 8FA20058 */ lw $v0, 0x0058($sp) -/* 01964 80B54D14 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC -/* 01968 80B54D18 AC980000 */ sw $t8, 0x0000($a0) ## FFFFFFEC -/* 0196C 80B54D1C 8DCF0004 */ lw $t7, 0x0004($t6) ## 80B5A470 -/* 01970 80B54D20 2445031C */ addiu $a1, $v0, 0x031C ## $a1 = 0000031C -/* 01974 80B54D24 AC8F0004 */ sw $t7, 0x0004($a0) ## FFFFFFF0 -/* 01978 80B54D28 8DD80008 */ lw $t8, 0x0008($t6) ## 80B5A474 -/* 0197C 80B54D2C 0C0346BD */ jal Matrix_MultVec3f -/* 01980 80B54D30 AC980008 */ sw $t8, 0x0008($a0) ## FFFFFFF4 -/* 01984 80B54D34 1000001C */ beq $zero, $zero, .L80B54DA8 -/* 01988 80B54D38 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B54D3C: -/* 0198C 80B54D3C 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 01990 80B54D40 14A10018 */ bne $a1, $at, .L80B54DA4 -/* 01994 80B54D44 3C1980B6 */ lui $t9, %hi(D_80B5A478) ## $t9 = 80B60000 -/* 01998 80B54D48 2739A478 */ addiu $t9, $t9, %lo(D_80B5A478) ## $t9 = 80B5A478 -/* 0199C 80B54D4C 8F290000 */ lw $t1, 0x0000($t9) ## 80B5A478 -/* 019A0 80B54D50 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFDC -/* 019A4 80B54D54 27A50018 */ addiu $a1, $sp, 0x0018 ## $a1 = FFFFFFD0 -/* 019A8 80B54D58 AC890000 */ sw $t1, 0x0000($a0) ## FFFFFFDC -/* 019AC 80B54D5C 8F280004 */ lw $t0, 0x0004($t9) ## 80B5A47C -/* 019B0 80B54D60 AC880004 */ sw $t0, 0x0004($a0) ## FFFFFFE0 -/* 019B4 80B54D64 8F290008 */ lw $t1, 0x0008($t9) ## 80B5A480 -/* 019B8 80B54D68 0C0346BD */ jal Matrix_MultVec3f -/* 019BC 80B54D6C AC890008 */ sw $t1, 0x0008($a0) ## FFFFFFE4 -/* 019C0 80B54D70 8FA20058 */ lw $v0, 0x0058($sp) -/* 019C4 80B54D74 C7A40018 */ lwc1 $f4, 0x0018($sp) -/* 019C8 80B54D78 844A0030 */ lh $t2, 0x0030($v0) ## 00000030 -/* 019CC 80B54D7C E4440038 */ swc1 $f4, 0x0038($v0) ## 00000038 -/* 019D0 80B54D80 C7A6001C */ lwc1 $f6, 0x001C($sp) -/* 019D4 80B54D84 844B0032 */ lh $t3, 0x0032($v0) ## 00000032 -/* 019D8 80B54D88 844C0034 */ lh $t4, 0x0034($v0) ## 00000034 -/* 019DC 80B54D8C E446003C */ swc1 $f6, 0x003C($v0) ## 0000003C -/* 019E0 80B54D90 C7A80020 */ lwc1 $f8, 0x0020($sp) -/* 019E4 80B54D94 A44A0044 */ sh $t2, 0x0044($v0) ## 00000044 -/* 019E8 80B54D98 A44B0046 */ sh $t3, 0x0046($v0) ## 00000046 -/* 019EC 80B54D9C A44C0048 */ sh $t4, 0x0048($v0) ## 00000048 -/* 019F0 80B54DA0 E4480040 */ swc1 $f8, 0x0040($v0) ## 00000040 -.L80B54DA4: -/* 019F4 80B54DA4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B54DA8: -/* 019F8 80B54DA8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 019FC 80B54DAC 03E00008 */ jr $ra -/* 01A00 80B54DB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DB4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DB4.s deleted file mode 100644 index 07643dec39..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DB4.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80B54DB4 -/* 01A04 80B54DB4 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 01A08 80B54DB8 00031A03 */ sra $v1, $v1, 8 -/* 01A0C 80B54DBC 03E00008 */ jr $ra -/* 01A10 80B54DC0 306200FF */ andi $v0, $v1, 0x00FF ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DC4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DC4.s deleted file mode 100644 index 305854b8d0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DC4.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80B54DC4 -/* 01A14 80B54DC4 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 01A18 80B54DC8 00031903 */ sra $v1, $v1, 4 -/* 01A1C 80B54DCC 03E00008 */ jr $ra -/* 01A20 80B54DD0 3062000F */ andi $v0, $v1, 0x000F ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DD4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DD4.s deleted file mode 100644 index 2551e0fd2d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DD4.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80B54DD4 -/* 01A24 80B54DD4 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 01A28 80B54DD8 03E00008 */ jr $ra -/* 01A2C 80B54DDC 3062000F */ andi $v0, $v1, 0x000F ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DE0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DE0.s deleted file mode 100644 index 66a07e630e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DE0.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80B54DE0 -/* 01A30 80B54DE0 8C820318 */ lw $v0, 0x0318($a0) ## 00000318 -/* 01A34 80B54DE4 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 01A38 80B54DE8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01A3C 80B54DEC 00027100 */ sll $t6, $v0, 4 -/* 01A40 80B54DF0 01C27021 */ addu $t6, $t6, $v0 -/* 01A44 80B54DF4 000E7080 */ sll $t6, $t6, 2 -/* 01A48 80B54DF8 00AE7821 */ addu $t7, $a1, $t6 -/* 01A4C 80B54DFC 030FC021 */ addu $t8, $t8, $t7 -/* 01A50 80B54E00 8F1817B4 */ lw $t8, 0x17B4($t8) ## 000117B4 -/* 01A54 80B54E04 0301C821 */ addu $t9, $t8, $at -/* 01A58 80B54E08 3C018016 */ lui $at, %hi(gSegments+0x18) -/* 01A5C 80B54E0C 03E00008 */ jr $ra -/* 01A60 80B54E10 AC396FC0 */ sw $t9, %lo(gSegments+0x18)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54E14.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54E14.s deleted file mode 100644 index 7c4b807789..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54E14.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80B54E14 -/* 01A64 80B54E14 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01A68 80B54E18 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01A6C 80B54E1C AFA40028 */ sw $a0, 0x0028($sp) -/* 01A70 80B54E20 AFA5002C */ sw $a1, 0x002C($sp) -/* 01A74 80B54E24 AFA60030 */ sw $a2, 0x0030($sp) -/* 01A78 80B54E28 AFA70034 */ sw $a3, 0x0034($sp) -/* 01A7C 80B54E2C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01A80 80B54E30 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01A84 80B54E34 8FAE0038 */ lw $t6, 0x0038($sp) -/* 01A88 80B54E38 8FA40028 */ lw $a0, 0x0028($sp) -/* 01A8C 80B54E3C 8FA5002C */ lw $a1, 0x002C($sp) -/* 01A90 80B54E40 15C00007 */ bne $t6, $zero, .L80B54E60 -/* 01A94 80B54E44 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01A98 80B54E48 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01A9C 80B54E4C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01AA0 80B54E50 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01AA4 80B54E54 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 01AA8 80B54E58 10000006 */ beq $zero, $zero, .L80B54E74 -/* 01AAC 80B54E5C 468020A0 */ cvt.s.w $f2, $f4 -.L80B54E60: -/* 01AB0 80B54E60 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 01AB4 80B54E64 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 01AB8 80B54E68 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 01ABC 80B54E6C 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 01AC0 80B54E70 46803020 */ cvt.s.w $f0, $f6 -.L80B54E74: -/* 01AC4 80B54E74 93AF0033 */ lbu $t7, 0x0033($sp) -/* 01AC8 80B54E78 C7A80034 */ lwc1 $f8, 0x0034($sp) -/* 01ACC 80B54E7C 44066000 */ mfc1 $a2, $f12 -/* 01AD0 80B54E80 44070000 */ mfc1 $a3, $f0 -/* 01AD4 80B54E84 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 01AD8 80B54E88 AFAF0014 */ sw $t7, 0x0014($sp) -/* 01ADC 80B54E8C 0C029468 */ jal SkelAnime_ChangeAnim - -/* 01AE0 80B54E90 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01AE4 80B54E94 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01AE8 80B54E98 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01AEC 80B54E9C 03E00008 */ jr $ra -/* 01AF0 80B54EA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54EA4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54EA4.s deleted file mode 100644 index c4273ae870..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54EA4.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B54EA4 -/* 01AF4 80B54EA4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01AF8 80B54EA8 AFBF002C */ sw $ra, 0x002C($sp) -/* 01AFC 80B54EAC AFA40030 */ sw $a0, 0x0030($sp) -/* 01B00 80B54EB0 C4800024 */ lwc1 $f0, 0x0024($a0) ## 00000024 -/* 01B04 80B54EB4 C4820028 */ lwc1 $f2, 0x0028($a0) ## 00000028 -/* 01B08 80B54EB8 C48C002C */ lwc1 $f12, 0x002C($a0) ## 0000002C -/* 01B0C 80B54EBC 44070000 */ mfc1 $a3, $f0 -/* 01B10 80B54EC0 AFA00024 */ sw $zero, 0x0024($sp) -/* 01B14 80B54EC4 AFA00020 */ sw $zero, 0x0020($sp) -/* 01B18 80B54EC8 AFA0001C */ sw $zero, 0x001C($sp) -/* 01B1C 80B54ECC AFA00018 */ sw $zero, 0x0018($sp) -/* 01B20 80B54ED0 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 01B24 80B54ED4 240601CC */ addiu $a2, $zero, 0x01CC ## $a2 = 000001CC -/* 01B28 80B54ED8 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 01B2C 80B54EDC 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 01B30 80B54EE0 E7AC0014 */ swc1 $f12, 0x0014($sp) -/* 01B34 80B54EE4 8FBF002C */ lw $ra, 0x002C($sp) -/* 01B38 80B54EE8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01B3C 80B54EEC 03E00008 */ jr $ra -/* 01B40 80B54EF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54EF4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54EF4.s deleted file mode 100644 index c7e20b3f4f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54EF4.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B54EF4 -/* 01B44 80B54EF4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01B48 80B54EF8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01B4C 80B54EFC 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 01B50 80B54F00 0C01E245 */ jal func_80078914 -/* 01B54 80B54F04 24056879 */ addiu $a1, $zero, 0x6879 ## $a1 = 00006879 -/* 01B58 80B54F08 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01B5C 80B54F0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01B60 80B54F10 03E00008 */ jr $ra -/* 01B64 80B54F14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54F18.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54F18.s deleted file mode 100644 index dbe9b2ffc4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54F18.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80B54F18 -/* 01B68 80B54F18 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01B6C 80B54F1C AFBF003C */ sw $ra, 0x003C($sp) -/* 01B70 80B54F20 AFB00038 */ sw $s0, 0x0038($sp) -/* 01B74 80B54F24 8C8E02F8 */ lw $t6, 0x02F8($a0) ## 000002F8 -/* 01B78 80B54F28 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01B7C 80B54F2C 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 01B80 80B54F30 15C0001B */ bne $t6, $zero, .L80B54FA0 -/* 01B84 80B54F34 3C0F8016 */ lui $t7, %hi(gGameInfo) -/* 01B88 80B54F38 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) -/* 01B8C 80B54F3C 3C01C1D0 */ lui $at, 0xC1D0 ## $at = C1D00000 -/* 01B90 80B54F40 44814000 */ mtc1 $at, $f8 ## $f8 = -26.00 -/* 01B94 80B54F44 85F8145E */ lh $t8, 0x145E($t7) ## 8016145E -/* 01B98 80B54F48 C4900028 */ lwc1 $f16, 0x0028($a0) ## 00000028 -/* 01B9C 80B54F4C C4800024 */ lwc1 $f0, 0x0024($a0) ## 00000024 -/* 01BA0 80B54F50 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 01BA4 80B54F54 C48C002C */ lwc1 $f12, 0x002C($a0) ## 0000002C -/* 01BA8 80B54F58 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 01BAC 80B54F5C 468021A0 */ cvt.s.w $f6, $f4 -/* 01BB0 80B54F60 24194000 */ addiu $t9, $zero, 0x4000 ## $t9 = 00004000 -/* 01BB4 80B54F64 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 01BB8 80B54F68 AFA80028 */ sw $t0, 0x0028($sp) -/* 01BBC 80B54F6C AFB90020 */ sw $t9, 0x0020($sp) -/* 01BC0 80B54F70 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01BC4 80B54F74 46083280 */ add.s $f10, $f6, $f8 -/* 01BC8 80B54F78 AFA00024 */ sw $zero, 0x0024($sp) -/* 01BCC 80B54F7C AFA0001C */ sw $zero, 0x001C($sp) -/* 01BD0 80B54F80 2407005D */ addiu $a3, $zero, 0x005D ## $a3 = 0000005D -/* 01BD4 80B54F84 46105080 */ add.s $f2, $f10, $f16 -/* 01BD8 80B54F88 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01BDC 80B54F8C E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 01BE0 80B54F90 0C00C916 */ jal Actor_SpawnAsChild - -/* 01BE4 80B54F94 E7A20014 */ swc1 $f2, 0x0014($sp) -/* 01BE8 80B54F98 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 01BEC 80B54F9C AE0902F8 */ sw $t1, 0x02F8($s0) ## 000002F8 -.L80B54FA0: -/* 01BF0 80B54FA0 8FBF003C */ lw $ra, 0x003C($sp) -/* 01BF4 80B54FA4 8FB00038 */ lw $s0, 0x0038($sp) -/* 01BF8 80B54FA8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 01BFC 80B54FAC 03E00008 */ jr $ra -/* 01C00 80B54FB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54FB4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54FB4.s deleted file mode 100644 index 2053d92b59..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54FB4.s +++ /dev/null @@ -1,53 +0,0 @@ -.rdata -glabel D_80B5A610 - .asciz "ゼルダ姫のEn_Zl3_Actor_inFinal_Init通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80B5A654 - .asciz "ゼルダ姫のEn_Zl3_Actor_inFinal_Initは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.text -glabel func_80B54FB4 -/* 01C04 80B54FB4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01C08 80B54FB8 AFB00020 */ sw $s0, 0x0020($sp) -/* 01C0C 80B54FBC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01C10 80B54FC0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01C14 80B54FC4 3C0480B6 */ lui $a0, %hi(D_80B5A610) ## $a0 = 80B60000 -/* 01C18 80B54FC8 AFA5002C */ sw $a1, 0x002C($sp) -/* 01C1C 80B54FCC 0C00084C */ jal osSyncPrintf - -/* 01C20 80B54FD0 2484A610 */ addiu $a0, $a0, %lo(D_80B5A610) ## $a0 = 80B5A610 -/* 01C24 80B54FD4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01C28 80B54FD8 24A58AD0 */ addiu $a1, $a1, 0x8AD0 ## $a1 = 06008AD0 -/* 01C2C 80B54FDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C30 80B54FE0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01C34 80B54FE4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01C38 80B54FE8 0C2D5385 */ jal func_80B54E14 -/* 01C3C 80B54FEC AFA00010 */ sw $zero, 0x0010($sp) -/* 01C40 80B54FF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C44 80B54FF4 0C2D4D55 */ jal func_80B53554 -/* 01C48 80B54FF8 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 01C4C 80B54FFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C50 80B55000 0C2D4D5A */ jal func_80B53568 -/* 01C54 80B55004 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 01C58 80B55008 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 01C5C 80B5500C AE02024C */ sw $v0, 0x024C($s0) ## 0000024C -/* 01C60 80B55010 AE020250 */ sw $v0, 0x0250($s0) ## 00000250 -/* 01C64 80B55014 8FA5002C */ lw $a1, 0x002C($sp) -/* 01C68 80B55018 0C2D53C6 */ jal func_80B54F18 -/* 01C6C 80B5501C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C70 80B55020 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 -/* 01C74 80B55024 860E0034 */ lh $t6, 0x0034($s0) ## 00000034 -/* 01C78 80B55028 860F00B8 */ lh $t7, 0x00B8($s0) ## 000000B8 -/* 01C7C 80B5502C 3C0480B6 */ lui $a0, %hi(D_80B5A654) ## $a0 = 80B60000 -/* 01C80 80B55030 2484A654 */ addiu $a0, $a0, %lo(D_80B5A654) ## $a0 = 80B5A654 -/* 01C84 80B55034 AE0E03C4 */ sw $t6, 0x03C4($s0) ## 000003C4 -/* 01C88 80B55038 0C00084C */ jal osSyncPrintf - -/* 01C8C 80B5503C A60F0034 */ sh $t7, 0x0034($s0) ## 00000034 -/* 01C90 80B55040 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01C94 80B55044 8FB00020 */ lw $s0, 0x0020($sp) -/* 01C98 80B55048 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01C9C 80B5504C 03E00008 */ jr $ra -/* 01CA0 80B55050 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55054.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55054.s deleted file mode 100644 index 1c1eb562be..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55054.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80B55054 -/* 01CA4 80B55054 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01CA8 80B55058 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01CAC 80B5505C 8C8E0328 */ lw $t6, 0x0328($a0) ## 00000328 -/* 01CB0 80B55060 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 01CB4 80B55064 51C0001F */ beql $t6, $zero, .L80B550E4 -/* 01CB8 80B55068 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01CBC 80B5506C 8C84011C */ lw $a0, 0x011C($a0) ## 0000011C -/* 01CC0 80B55070 3C014198 */ lui $at, 0x4198 ## $at = 41980000 -/* 01CC4 80B55074 5080001B */ beql $a0, $zero, .L80B550E4 -/* 01CC8 80B55078 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01CCC 80B5507C C4A402EC */ lwc1 $f4, 0x02EC($a1) ## 000002EC -/* 01CD0 80B55080 44813000 */ mtc1 $at, $f6 ## $f6 = 19.00 -/* 01CD4 80B55084 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01CD8 80B55088 24A202EC */ addiu $v0, $a1, 0x02EC ## $v0 = 000002EC -/* 01CDC 80B5508C 4606203C */ c.lt.s $f4, $f6 -/* 01CE0 80B55090 00000000 */ nop -/* 01CE4 80B55094 4500000E */ bc1f .L80B550D0 -/* 01CE8 80B55098 00000000 */ nop -/* 01CEC 80B5509C 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 -/* 01CF0 80B550A0 C44A0000 */ lwc1 $f10, 0x0000($v0) ## 000002EC -/* 01CF4 80B550A4 3C01414C */ lui $at, 0x414C ## $at = 414C0000 -/* 01CF8 80B550A8 44819000 */ mtc1 $at, $f18 ## $f18 = 12.75 -/* 01CFC 80B550AC 460A4401 */ sub.s $f16, $f8, $f10 -/* 01D00 80B550B0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01D04 80B550B4 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 01D08 80B550B8 46128102 */ mul.s $f4, $f16, $f18 -/* 01D0C 80B550BC E48401A8 */ swc1 $f4, 0x01A8($a0) ## 000001A8 -/* 01D10 80B550C0 C4460000 */ lwc1 $f6, 0x0000($v0) ## 000002EC -/* 01D14 80B550C4 46083280 */ add.s $f10, $f6, $f8 -/* 01D18 80B550C8 10000005 */ beq $zero, $zero, .L80B550E0 -/* 01D1C 80B550CC E44A0000 */ swc1 $f10, 0x0000($v0) ## 000002EC -.L80B550D0: -/* 01D20 80B550D0 0C00B55C */ jal Actor_Kill - -/* 01D24 80B550D4 AFA50018 */ sw $a1, 0x0018($sp) -/* 01D28 80B550D8 8FA50018 */ lw $a1, 0x0018($sp) -/* 01D2C 80B550DC ACA0011C */ sw $zero, 0x011C($a1) ## 0000011C -.L80B550E0: -/* 01D30 80B550E0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B550E4: -/* 01D34 80B550E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01D38 80B550E8 03E00008 */ jr $ra -/* 01D3C 80B550EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B550F0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B550F0.s deleted file mode 100644 index b85d85f883..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B550F0.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B550F0 -/* 01D40 80B550F0 8C82011C */ lw $v0, 0x011C($a0) ## 0000011C -/* 01D44 80B550F4 10400011 */ beq $v0, $zero, .L80B5513C -/* 01D48 80B550F8 00000000 */ nop -/* 01D4C 80B550FC C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 01D50 80B55100 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 01D54 80B55104 3C01C1D0 */ lui $at, 0xC1D0 ## $at = C1D00000 -/* 01D58 80B55108 E4440024 */ swc1 $f4, 0x0024($v0) ## 00000024 -/* 01D5C 80B5510C 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 01D60 80B55110 44815000 */ mtc1 $at, $f10 ## $f10 = -26.00 -/* 01D64 80B55114 C4920028 */ lwc1 $f18, 0x0028($a0) ## 00000028 -/* 01D68 80B55118 85CF145E */ lh $t7, 0x145E($t6) ## 8016145E -/* 01D6C 80B5511C 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 01D70 80B55120 00000000 */ nop -/* 01D74 80B55124 46803220 */ cvt.s.w $f8, $f6 -/* 01D78 80B55128 460A4400 */ add.s $f16, $f8, $f10 -/* 01D7C 80B5512C 46128100 */ add.s $f4, $f16, $f18 -/* 01D80 80B55130 E4440028 */ swc1 $f4, 0x0028($v0) ## 00000028 -/* 01D84 80B55134 C486002C */ lwc1 $f6, 0x002C($a0) ## 0000002C -/* 01D88 80B55138 E446002C */ swc1 $f6, 0x002C($v0) ## 0000002C -.L80B5513C: -/* 01D8C 80B5513C 03E00008 */ jr $ra -/* 01D90 80B55140 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55144.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55144.s deleted file mode 100644 index 069c8985db..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55144.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80B55144 -/* 01D94 80B55144 3C0180B6 */ lui $at, %hi(D_80B5A484) ## $at = 80B60000 -/* 01D98 80B55148 C420A484 */ lwc1 $f0, %lo(D_80B5A484)($at) -/* 01D9C 80B5514C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 01DA0 80B55150 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 -/* 01DA4 80B55154 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01DA8 80B55158 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01DAC 80B5515C 4604003C */ c.lt.s $f0, $f4 -/* 01DB0 80B55160 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 01DB4 80B55164 4502000B */ bc1fl .L80B55194 -/* 01DB8 80B55168 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 -/* 01DBC 80B5516C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01DC0 80B55170 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 01DC4 80B55174 3C0180B6 */ lui $at, %hi(D_80B5A484) ## $at = 80B60000 -/* 01DC8 80B55178 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 01DCC 80B5517C 46060000 */ add.s $f0, $f0, $f6 -/* 01DD0 80B55180 0C2D4D55 */ jal func_80B53554 -/* 01DD4 80B55184 E420A484 */ swc1 $f0, %lo(D_80B5A484)($at) -/* 01DD8 80B55188 10000012 */ beq $zero, $zero, .L80B551D4 -/* 01DDC 80B5518C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01DE0 80B55190 44814000 */ mtc1 $at, $f8 ## $f8 = 0.00 -.L80B55194: -/* 01DE4 80B55194 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01DE8 80B55198 4608003C */ c.lt.s $f0, $f8 -/* 01DEC 80B5519C 00000000 */ nop -/* 01DF0 80B551A0 45000009 */ bc1f .L80B551C8 -/* 01DF4 80B551A4 00000000 */ nop -/* 01DF8 80B551A8 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 01DFC 80B551AC 3C0180B6 */ lui $at, %hi(D_80B5A484) ## $at = 80B60000 -/* 01E00 80B551B0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01E04 80B551B4 460A0000 */ add.s $f0, $f0, $f10 -/* 01E08 80B551B8 0C2D4D55 */ jal func_80B53554 -/* 01E0C 80B551BC E420A484 */ swc1 $f0, %lo(D_80B5A484)($at) -/* 01E10 80B551C0 10000004 */ beq $zero, $zero, .L80B551D4 -/* 01E14 80B551C4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B551C8: -/* 01E18 80B551C8 0C2D4D33 */ jal func_80B534CC -/* 01E1C 80B551CC 00000000 */ nop -/* 01E20 80B551D0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B551D4: -/* 01E24 80B551D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01E28 80B551D8 03E00008 */ jr $ra -/* 01E2C 80B551DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B551E0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B551E0.s deleted file mode 100644 index 031ea32890..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B551E0.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B551E0 -/* 01E30 80B551E0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01E34 80B551E4 AFBF001C */ sw $ra, 0x001C($sp) -/* 01E38 80B551E8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01E3C 80B551EC AFA40020 */ sw $a0, 0x0020($sp) -/* 01E40 80B551F0 24A58AD0 */ addiu $a1, $a1, 0x8AD0 ## $a1 = 06008AD0 -/* 01E44 80B551F4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01E48 80B551F8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01E4C 80B551FC 0C2D5385 */ jal func_80B54E14 -/* 01E50 80B55200 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01E54 80B55204 8FAF0020 */ lw $t7, 0x0020($sp) -/* 01E58 80B55208 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 01E5C 80B5520C ADEE024C */ sw $t6, 0x024C($t7) ## 0000024C -/* 01E60 80B55210 8FBF001C */ lw $ra, 0x001C($sp) -/* 01E64 80B55214 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01E68 80B55218 03E00008 */ jr $ra -/* 01E6C 80B5521C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55220.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55220.s deleted file mode 100644 index 47a76740b8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55220.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B55220 -/* 01E70 80B55220 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01E74 80B55224 AFBF001C */ sw $ra, 0x001C($sp) -/* 01E78 80B55228 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01E7C 80B5522C 24A591D8 */ addiu $a1, $a1, 0x91D8 ## $a1 = 060091D8 -/* 01E80 80B55230 AFA00010 */ sw $zero, 0x0010($sp) -/* 01E84 80B55234 AFA40020 */ sw $a0, 0x0020($sp) -/* 01E88 80B55238 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01E8C 80B5523C 0C2D5385 */ jal func_80B54E14 -/* 01E90 80B55240 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01E94 80B55244 8FA40020 */ lw $a0, 0x0020($sp) -/* 01E98 80B55248 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01E9C 80B5524C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01EA0 80B55250 0C2D4D5A */ jal func_80B53568 -/* 01EA4 80B55254 AC8E024C */ sw $t6, 0x024C($a0) ## 0000024C -/* 01EA8 80B55258 8FBF001C */ lw $ra, 0x001C($sp) -/* 01EAC 80B5525C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01EB0 80B55260 03E00008 */ jr $ra -/* 01EB4 80B55264 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55268.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55268.s deleted file mode 100644 index 3804121555..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55268.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B55268 -/* 01EB8 80B55268 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01EBC 80B5526C AFBF001C */ sw $ra, 0x001C($sp) -/* 01EC0 80B55270 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01EC4 80B55274 AFA40020 */ sw $a0, 0x0020($sp) -/* 01EC8 80B55278 24A591D8 */ addiu $a1, $a1, 0x91D8 ## $a1 = 060091D8 -/* 01ECC 80B5527C AFA00010 */ sw $zero, 0x0010($sp) -/* 01ED0 80B55280 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01ED4 80B55284 0C2D5385 */ jal func_80B54E14 -/* 01ED8 80B55288 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01EDC 80B5528C 8FAF0020 */ lw $t7, 0x0020($sp) -/* 01EE0 80B55290 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 01EE4 80B55294 ADEE024C */ sw $t6, 0x024C($t7) ## 0000024C -/* 01EE8 80B55298 8FBF001C */ lw $ra, 0x001C($sp) -/* 01EEC 80B5529C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01EF0 80B552A0 03E00008 */ jr $ra -/* 01EF4 80B552A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B552A8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B552A8.s deleted file mode 100644 index b45be3a2c2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B552A8.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B552A8 -/* 01EF8 80B552A8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01EFC 80B552AC 10A00007 */ beq $a1, $zero, .L80B552CC -/* 01F00 80B552B0 AFBF001C */ sw $ra, 0x001C($sp) -/* 01F04 80B552B4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01F08 80B552B8 24A599A0 */ addiu $a1, $a1, 0x99A0 ## $a1 = 060099A0 -/* 01F0C 80B552BC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01F10 80B552C0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01F14 80B552C4 0C2D5385 */ jal func_80B54E14 -/* 01F18 80B552C8 AFA00010 */ sw $zero, 0x0010($sp) -.L80B552CC: -/* 01F1C 80B552CC 8FBF001C */ lw $ra, 0x001C($sp) -/* 01F20 80B552D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01F24 80B552D4 03E00008 */ jr $ra -/* 01F28 80B552D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B552DC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B552DC.s deleted file mode 100644 index 8be4a0d98a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B552DC.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B552DC -/* 01F2C 80B552DC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01F30 80B552E0 AFBF001C */ sw $ra, 0x001C($sp) -/* 01F34 80B552E4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01F38 80B552E8 AFA40020 */ sw $a0, 0x0020($sp) -/* 01F3C 80B552EC 24A5A598 */ addiu $a1, $a1, 0xA598 ## $a1 = 0600A598 -/* 01F40 80B552F0 AFA00010 */ sw $zero, 0x0010($sp) -/* 01F44 80B552F4 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01F48 80B552F8 0C2D5385 */ jal func_80B54E14 -/* 01F4C 80B552FC 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 01F50 80B55300 0C2D53BD */ jal func_80B54EF4 -/* 01F54 80B55304 8FA40020 */ lw $a0, 0x0020($sp) -/* 01F58 80B55308 8FA40020 */ lw $a0, 0x0020($sp) -/* 01F5C 80B5530C 0C2D4D5A */ jal func_80B53568 -/* 01F60 80B55310 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 01F64 80B55314 8FAF0020 */ lw $t7, 0x0020($sp) -/* 01F68 80B55318 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 01F6C 80B5531C 0C2D4D1A */ jal func_80B53468 -/* 01F70 80B55320 ADEE024C */ sw $t6, 0x024C($t7) ## 0000024C -/* 01F74 80B55324 8FBF001C */ lw $ra, 0x001C($sp) -/* 01F78 80B55328 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01F7C 80B5532C 03E00008 */ jr $ra -/* 01F80 80B55330 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55334.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55334.s deleted file mode 100644 index 7118b33b49..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55334.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B55334 -/* 01F84 80B55334 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01F88 80B55338 10A00007 */ beq $a1, $zero, .L80B55358 -/* 01F8C 80B5533C AFBF001C */ sw $ra, 0x001C($sp) -/* 01F90 80B55340 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01F94 80B55344 24A5AACC */ addiu $a1, $a1, 0xAACC ## $a1 = 0600AACC -/* 01F98 80B55348 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01F9C 80B5534C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01FA0 80B55350 0C2D5385 */ jal func_80B54E14 -/* 01FA4 80B55354 AFA00010 */ sw $zero, 0x0010($sp) -.L80B55358: -/* 01FA8 80B55358 8FBF001C */ lw $ra, 0x001C($sp) -/* 01FAC 80B5535C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01FB0 80B55360 03E00008 */ jr $ra -/* 01FB4 80B55364 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55368.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55368.s deleted file mode 100644 index 539d6365ac..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55368.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B55368 -/* 01FB8 80B55368 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01FBC 80B5536C AFBF001C */ sw $ra, 0x001C($sp) -/* 01FC0 80B55370 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01FC4 80B55374 AFA40020 */ sw $a0, 0x0020($sp) -/* 01FC8 80B55378 24A5A334 */ addiu $a1, $a1, 0xA334 ## $a1 = 0600A334 -/* 01FCC 80B5537C AFA00010 */ sw $zero, 0x0010($sp) -/* 01FD0 80B55380 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01FD4 80B55384 0C2D5385 */ jal func_80B54E14 -/* 01FD8 80B55388 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 01FDC 80B5538C 8FA40020 */ lw $a0, 0x0020($sp) -/* 01FE0 80B55390 0C2D4D5A */ jal func_80B53568 -/* 01FE4 80B55394 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01FE8 80B55398 8FAF0020 */ lw $t7, 0x0020($sp) -/* 01FEC 80B5539C 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 01FF0 80B553A0 ADEE024C */ sw $t6, 0x024C($t7) ## 0000024C -/* 01FF4 80B553A4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01FF8 80B553A8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01FFC 80B553AC 03E00008 */ jr $ra -/* 02000 80B553B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B553B4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B553B4.s deleted file mode 100644 index 164a6834ae..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B553B4.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B553B4 -/* 02004 80B553B4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02008 80B553B8 10A00007 */ beq $a1, $zero, .L80B553D8 -/* 0200C 80B553BC AFBF001C */ sw $ra, 0x001C($sp) -/* 02010 80B553C0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02014 80B553C4 24A59FBC */ addiu $a1, $a1, 0x9FBC ## $a1 = 06009FBC -/* 02018 80B553C8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0201C 80B553CC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02020 80B553D0 0C2D5385 */ jal func_80B54E14 -/* 02024 80B553D4 AFA00010 */ sw $zero, 0x0010($sp) -.L80B553D8: -/* 02028 80B553D8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0202C 80B553DC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02030 80B553E0 03E00008 */ jr $ra -/* 02034 80B553E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B553E8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B553E8.s deleted file mode 100644 index a2b9090395..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B553E8.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80B553E8 -/* 02038 80B553E8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0203C 80B553EC AFBF0014 */ sw $ra, 0x0014($sp) -/* 02040 80B553F0 0C2D66B4 */ jal func_80B59AD0 -/* 02044 80B553F4 00000000 */ nop -/* 02048 80B553F8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0204C 80B553FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02050 80B55400 03E00008 */ jr $ra -/* 02054 80B55404 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55408.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55408.s deleted file mode 100644 index f62ff6f4c6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55408.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B55408 -/* 02058 80B55408 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0205C 80B5540C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02060 80B55410 8C85011C */ lw $a1, 0x011C($a0) ## 0000011C -/* 02064 80B55414 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 02068 80B55418 10A00004 */ beq $a1, $zero, .L80B5542C -/* 0206C 80B5541C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02070 80B55420 0C00B55C */ jal Actor_Kill - -/* 02074 80B55424 AFA60018 */ sw $a2, 0x0018($sp) -/* 02078 80B55428 8FA60018 */ lw $a2, 0x0018($sp) -.L80B5542C: -/* 0207C 80B5542C 0C00B55C */ jal Actor_Kill - -/* 02080 80B55430 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 02084 80B55434 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02088 80B55438 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0208C 80B5543C 03E00008 */ jr $ra -/* 02090 80B55440 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55444.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55444.s deleted file mode 100644 index 60c97b0dd3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55444.s +++ /dev/null @@ -1,100 +0,0 @@ -.rdata -glabel D_80B5A69C - .asciz "En_Zl3_inFinal_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -.late_rodata -glabel jtbl_80B5AB08 -.word L80B55490 -.word L80B554A0 -.word L80B55510 -.word L80B554BC -.word L80B554CC -.word L80B554DC -.word L80B554EC -.word L80B554FC -.word L80B55520 - -.text -glabel func_80B55444 -/* 02094 80B55444 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02098 80B55448 AFBF001C */ sw $ra, 0x001C($sp) -/* 0209C 80B5544C AFB00018 */ sw $s0, 0x0018($sp) -/* 020A0 80B55450 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 020A4 80B55454 0C2D4E5B */ jal func_80B5396C -/* 020A8 80B55458 AFA5002C */ sw $a1, 0x002C($sp) -/* 020AC 80B5545C 04400037 */ bltz $v0, .L80B5553C -/* 020B0 80B55460 AFA20024 */ sw $v0, 0x0024($sp) -/* 020B4 80B55464 8E0302F0 */ lw $v1, 0x02F0($s0) ## 000002F0 -/* 020B8 80B55468 2C410009 */ sltiu $at, $v0, 0x0009 -/* 020BC 80B5546C 50430034 */ beql $v0, $v1, .L80B55540 -/* 020C0 80B55470 8FBF001C */ lw $ra, 0x001C($sp) -/* 020C4 80B55474 1020002C */ beq $at, $zero, .L80B55528 -/* 020C8 80B55478 00027080 */ sll $t6, $v0, 2 -/* 020CC 80B5547C 3C0180B6 */ lui $at, %hi(jtbl_80B5AB08) ## $at = 80B60000 -/* 020D0 80B55480 002E0821 */ addu $at, $at, $t6 -/* 020D4 80B55484 8C2EAB08 */ lw $t6, %lo(jtbl_80B5AB08)($at) -/* 020D8 80B55488 01C00008 */ jr $t6 -/* 020DC 80B5548C 00000000 */ nop -glabel L80B55490 -/* 020E0 80B55490 0C2D5478 */ jal func_80B551E0 -/* 020E4 80B55494 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 020E8 80B55498 10000027 */ beq $zero, $zero, .L80B55538 -/* 020EC 80B5549C 8FB80024 */ lw $t8, 0x0024($sp) -glabel L80B554A0 -/* 020F0 80B554A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 020F4 80B554A4 0C2D4D55 */ jal func_80B53554 -/* 020F8 80B554A8 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 020FC 80B554AC 0C2D53BD */ jal func_80B54EF4 -/* 02100 80B554B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02104 80B554B4 10000020 */ beq $zero, $zero, .L80B55538 -/* 02108 80B554B8 8FB80024 */ lw $t8, 0x0024($sp) -glabel L80B554BC -/* 0210C 80B554BC 0C2D5488 */ jal func_80B55220 -/* 02110 80B554C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02114 80B554C4 1000001C */ beq $zero, $zero, .L80B55538 -/* 02118 80B554C8 8FB80024 */ lw $t8, 0x0024($sp) -glabel L80B554CC -/* 0211C 80B554CC 0C2D549A */ jal func_80B55268 -/* 02120 80B554D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02124 80B554D4 10000018 */ beq $zero, $zero, .L80B55538 -/* 02128 80B554D8 8FB80024 */ lw $t8, 0x0024($sp) -glabel L80B554DC -/* 0212C 80B554DC 0C2D54B7 */ jal func_80B552DC -/* 02130 80B554E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02134 80B554E4 10000014 */ beq $zero, $zero, .L80B55538 -/* 02138 80B554E8 8FB80024 */ lw $t8, 0x0024($sp) -glabel L80B554EC -/* 0213C 80B554EC 0C2D54DA */ jal func_80B55368 -/* 02140 80B554F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02144 80B554F4 10000010 */ beq $zero, $zero, .L80B55538 -/* 02148 80B554F8 8FB80024 */ lw $t8, 0x0024($sp) -glabel L80B554FC -/* 0214C 80B554FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02150 80B55500 0C2D54FA */ jal func_80B553E8 -/* 02154 80B55504 8FA5002C */ lw $a1, 0x002C($sp) -/* 02158 80B55508 1000000B */ beq $zero, $zero, .L80B55538 -/* 0215C 80B5550C 8FB80024 */ lw $t8, 0x0024($sp) -glabel L80B55510 -/* 02160 80B55510 0C2D5502 */ jal func_80B55408 -/* 02164 80B55514 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02168 80B55518 10000007 */ beq $zero, $zero, .L80B55538 -/* 0216C 80B5551C 8FB80024 */ lw $t8, 0x0024($sp) -glabel L80B55520 -/* 02170 80B55520 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02174 80B55524 AE0F0328 */ sw $t7, 0x0328($s0) ## 00000328 -.L80B55528: -/* 02178 80B55528 3C0480B6 */ lui $a0, %hi(D_80B5A69C) ## $a0 = 80B60000 -/* 0217C 80B5552C 0C00084C */ jal osSyncPrintf - -/* 02180 80B55530 2484A69C */ addiu $a0, $a0, %lo(D_80B5A69C) ## $a0 = 80B5A69C -/* 02184 80B55534 8FB80024 */ lw $t8, 0x0024($sp) -.L80B55538: -/* 02188 80B55538 AE1802F0 */ sw $t8, 0x02F0($s0) ## 000002F0 -.L80B5553C: -/* 0218C 80B5553C 8FBF001C */ lw $ra, 0x001C($sp) -.L80B55540: -/* 02190 80B55540 8FB00018 */ lw $s0, 0x0018($sp) -/* 02194 80B55544 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02198 80B55548 03E00008 */ jr $ra -/* 0219C 80B5554C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55550.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55550.s deleted file mode 100644 index 2cc816b22d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55550.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B55550 -/* 021A0 80B55550 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 021A4 80B55554 AFBF001C */ sw $ra, 0x001C($sp) -/* 021A8 80B55558 AFB00018 */ sw $s0, 0x0018($sp) -/* 021AC 80B5555C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 021B0 80B55560 0C2D5378 */ jal func_80B54DE0 -/* 021B4 80B55564 AFA50024 */ sw $a1, 0x0024($sp) -/* 021B8 80B55568 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021BC 80B5556C 0C2D4D9B */ jal func_80B5366C -/* 021C0 80B55570 8FA50024 */ lw $a1, 0x0024($sp) -/* 021C4 80B55574 0C2D4E53 */ jal func_80B5394C -/* 021C8 80B55578 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021CC 80B5557C 0C2D543C */ jal func_80B550F0 -/* 021D0 80B55580 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021D4 80B55584 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021D8 80B55588 0C2D5511 */ jal func_80B55444 -/* 021DC 80B5558C 8FA50024 */ lw $a1, 0x0024($sp) -/* 021E0 80B55590 8FBF001C */ lw $ra, 0x001C($sp) -/* 021E4 80B55594 8FB00018 */ lw $s0, 0x0018($sp) -/* 021E8 80B55598 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 021EC 80B5559C 03E00008 */ jr $ra -/* 021F0 80B555A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B555A4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B555A4.s deleted file mode 100644 index cff4188d30..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B555A4.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B555A4 -/* 021F4 80B555A4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 021F8 80B555A8 AFBF001C */ sw $ra, 0x001C($sp) -/* 021FC 80B555AC AFB00018 */ sw $s0, 0x0018($sp) -/* 02200 80B555B0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02204 80B555B4 0C2D5378 */ jal func_80B54DE0 -/* 02208 80B555B8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0220C 80B555BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02210 80B555C0 0C2D4D9B */ jal func_80B5366C -/* 02214 80B555C4 8FA50024 */ lw $a1, 0x0024($sp) -/* 02218 80B555C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0221C 80B555CC 0C2D4D55 */ jal func_80B53554 -/* 02220 80B555D0 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 02224 80B555D4 0C2D543C */ jal func_80B550F0 -/* 02228 80B555D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0222C 80B555DC 0C2D5415 */ jal func_80B55054 -/* 02230 80B555E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02234 80B555E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02238 80B555E8 0C2D5511 */ jal func_80B55444 -/* 0223C 80B555EC 8FA50024 */ lw $a1, 0x0024($sp) -/* 02240 80B555F0 8FBF001C */ lw $ra, 0x001C($sp) -/* 02244 80B555F4 8FB00018 */ lw $s0, 0x0018($sp) -/* 02248 80B555F8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0224C 80B555FC 03E00008 */ jr $ra -/* 02250 80B55600 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55604.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55604.s deleted file mode 100644 index dfc17b64f5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55604.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80B55604 -/* 02254 80B55604 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02258 80B55608 AFBF001C */ sw $ra, 0x001C($sp) -/* 0225C 80B5560C AFB00018 */ sw $s0, 0x0018($sp) -/* 02260 80B55610 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02264 80B55614 0C2D5378 */ jal func_80B54DE0 -/* 02268 80B55618 AFA50024 */ sw $a1, 0x0024($sp) -/* 0226C 80B5561C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02270 80B55620 0C2D4D9B */ jal func_80B5366C -/* 02274 80B55624 8FA50024 */ lw $a1, 0x0024($sp) -/* 02278 80B55628 0C2D5451 */ jal func_80B55144 -/* 0227C 80B5562C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02280 80B55630 0C2D4E53 */ jal func_80B5394C -/* 02284 80B55634 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02288 80B55638 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0228C 80B5563C 0C2D54AA */ jal func_80B552A8 -/* 02290 80B55640 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 02294 80B55644 0C2D5415 */ jal func_80B55054 -/* 02298 80B55648 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0229C 80B5564C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022A0 80B55650 0C2D5511 */ jal func_80B55444 -/* 022A4 80B55654 8FA50024 */ lw $a1, 0x0024($sp) -/* 022A8 80B55658 8FBF001C */ lw $ra, 0x001C($sp) -/* 022AC 80B5565C 8FB00018 */ lw $s0, 0x0018($sp) -/* 022B0 80B55660 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 022B4 80B55664 03E00008 */ jr $ra -/* 022B8 80B55668 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5566C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5566C.s deleted file mode 100644 index 15f8cf01f0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5566C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B5566C -/* 022BC 80B5566C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 022C0 80B55670 AFBF001C */ sw $ra, 0x001C($sp) -/* 022C4 80B55674 AFB00018 */ sw $s0, 0x0018($sp) -/* 022C8 80B55678 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 022CC 80B5567C 0C2D5378 */ jal func_80B54DE0 -/* 022D0 80B55680 AFA50024 */ sw $a1, 0x0024($sp) -/* 022D4 80B55684 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022D8 80B55688 0C2D4D9B */ jal func_80B5366C -/* 022DC 80B5568C 8FA50024 */ lw $a1, 0x0024($sp) -/* 022E0 80B55690 0C2D4D33 */ jal func_80B534CC -/* 022E4 80B55694 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022E8 80B55698 0C2D4E53 */ jal func_80B5394C -/* 022EC 80B5569C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022F0 80B556A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022F4 80B556A4 0C2D54CD */ jal func_80B55334 -/* 022F8 80B556A8 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 022FC 80B556AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02300 80B556B0 0C2D5511 */ jal func_80B55444 -/* 02304 80B556B4 8FA50024 */ lw $a1, 0x0024($sp) -/* 02308 80B556B8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0230C 80B556BC 8FB00018 */ lw $s0, 0x0018($sp) -/* 02310 80B556C0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02314 80B556C4 03E00008 */ jr $ra -/* 02318 80B556C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B556CC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B556CC.s deleted file mode 100644 index 9b5e5588f2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B556CC.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B556CC -/* 0231C 80B556CC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02320 80B556D0 AFBF001C */ sw $ra, 0x001C($sp) -/* 02324 80B556D4 AFB00018 */ sw $s0, 0x0018($sp) -/* 02328 80B556D8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0232C 80B556DC 0C2D5378 */ jal func_80B54DE0 -/* 02330 80B556E0 AFA50024 */ sw $a1, 0x0024($sp) -/* 02334 80B556E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02338 80B556E8 0C2D4D9B */ jal func_80B5366C -/* 0233C 80B556EC 8FA50024 */ lw $a1, 0x0024($sp) -/* 02340 80B556F0 0C2D4D33 */ jal func_80B534CC -/* 02344 80B556F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02348 80B556F8 0C2D4E53 */ jal func_80B5394C -/* 0234C 80B556FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02350 80B55700 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02354 80B55704 0C2D54ED */ jal func_80B553B4 -/* 02358 80B55708 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 0235C 80B5570C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02360 80B55710 0C2D5511 */ jal func_80B55444 -/* 02364 80B55714 8FA50024 */ lw $a1, 0x0024($sp) -/* 02368 80B55718 8FBF001C */ lw $ra, 0x001C($sp) -/* 0236C 80B5571C 8FB00018 */ lw $s0, 0x0018($sp) -/* 02370 80B55720 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02374 80B55724 03E00008 */ jr $ra -/* 02378 80B55728 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5572C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5572C.s deleted file mode 100644 index 3e1dbdbf22..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5572C.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B5572C -/* 0237C 80B5572C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02380 80B55730 AFBF001C */ sw $ra, 0x001C($sp) -/* 02384 80B55734 AFB00018 */ sw $s0, 0x0018($sp) -/* 02388 80B55738 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0238C 80B5573C 0C2D5378 */ jal func_80B54DE0 -/* 02390 80B55740 AFA50024 */ sw $a1, 0x0024($sp) -/* 02394 80B55744 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02398 80B55748 0C2D4D9B */ jal func_80B5366C -/* 0239C 80B5574C 8FA50024 */ lw $a1, 0x0024($sp) -/* 023A0 80B55750 0C2D4D33 */ jal func_80B534CC -/* 023A4 80B55754 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 023A8 80B55758 0C2D4E53 */ jal func_80B5394C -/* 023AC 80B5575C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 023B0 80B55760 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 023B4 80B55764 0C2D5511 */ jal func_80B55444 -/* 023B8 80B55768 8FA50024 */ lw $a1, 0x0024($sp) -/* 023BC 80B5576C 8FBF001C */ lw $ra, 0x001C($sp) -/* 023C0 80B55770 8FB00018 */ lw $s0, 0x0018($sp) -/* 023C4 80B55774 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 023C8 80B55778 03E00008 */ jr $ra -/* 023CC 80B5577C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55780.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55780.s deleted file mode 100644 index 9046917f4e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55780.s +++ /dev/null @@ -1,47 +0,0 @@ -.rdata -glabel D_80B5A6D4 - .asciz "ゼルダ姫のEn_Zl3_Actor_inFinal2_Init通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80B5A71C - .asciz "ゼルダ姫のEn_Zl3_Actor_inFinal2_Initは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.text -glabel func_80B55780 -/* 023D0 80B55780 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 023D4 80B55784 AFB00020 */ sw $s0, 0x0020($sp) -/* 023D8 80B55788 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 023DC 80B5578C AFBF0024 */ sw $ra, 0x0024($sp) -/* 023E0 80B55790 3C0480B6 */ lui $a0, %hi(D_80B5A6D4) ## $a0 = 80B60000 -/* 023E4 80B55794 AFA5002C */ sw $a1, 0x002C($sp) -/* 023E8 80B55798 0C00084C */ jal osSyncPrintf - -/* 023EC 80B5579C 2484A6D4 */ addiu $a0, $a0, %lo(D_80B5A6D4) ## $a0 = 80B5A6D4 -/* 023F0 80B557A0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 023F4 80B557A4 24A55A0C */ addiu $a1, $a1, 0x5A0C ## $a1 = 06005A0C -/* 023F8 80B557A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 023FC 80B557AC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02400 80B557B0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02404 80B557B4 0C2D5385 */ jal func_80B54E14 -/* 02408 80B557B8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0240C 80B557BC 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 02410 80B557C0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02414 80B557C4 3C0480B6 */ lui $a0, %hi(D_80B5A71C) ## $a0 = 80B60000 -/* 02418 80B557C8 AE0E024C */ sw $t6, 0x024C($s0) ## 0000024C -/* 0241C 80B557CC AE0F0250 */ sw $t7, 0x0250($s0) ## 00000250 -/* 02420 80B557D0 0C00084C */ jal osSyncPrintf - -/* 02424 80B557D4 2484A71C */ addiu $a0, $a0, %lo(D_80B5A71C) ## $a0 = 80B5A71C -/* 02428 80B557D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0242C 80B557DC 0C2D4D5A */ jal func_80B53568 -/* 02430 80B557E0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02434 80B557E4 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 -/* 02438 80B557E8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 0243C 80B557EC 0301C824 */ and $t9, $t8, $at -/* 02440 80B557F0 AE190004 */ sw $t9, 0x0004($s0) ## 00000004 -/* 02444 80B557F4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02448 80B557F8 8FB00020 */ lw $s0, 0x0020($sp) -/* 0244C 80B557FC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02450 80B55800 03E00008 */ jr $ra -/* 02454 80B55804 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55808.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55808.s deleted file mode 100644 index 4d1028f29c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55808.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B55808 -/* 02458 80B55808 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0245C 80B5580C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02460 80B55810 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 02464 80B55814 0C01E245 */ jal func_80078914 -/* 02468 80B55818 24056879 */ addiu $a1, $zero, 0x6879 ## $a1 = 00006879 -/* 0246C 80B5581C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02470 80B55820 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02474 80B55824 03E00008 */ jr $ra -/* 02478 80B55828 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5582C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5582C.s deleted file mode 100644 index 82aeeb10ee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5582C.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80B5582C -/* 0247C 80B5582C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02480 80B55830 AFA40018 */ sw $a0, 0x0018($sp) -/* 02484 80B55834 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02488 80B55838 3C0480B6 */ lui $a0, %hi(D_80B5A488) ## $a0 = 80B60000 -/* 0248C 80B5583C 2484A488 */ addiu $a0, $a0, %lo(D_80B5A488) ## $a0 = 80B5A488 -/* 02490 80B55840 24056875 */ addiu $a1, $zero, 0x6875 ## $a1 = 00006875 -/* 02494 80B55844 0C03D078 */ jal func_800F41E0 -/* 02498 80B55848 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 0249C 80B5584C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 024A0 80B55850 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 024A4 80B55854 03E00008 */ jr $ra -/* 024A8 80B55858 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5585C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5585C.s deleted file mode 100644 index b66e46ece3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5585C.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80B5585C -/* 024AC 80B5585C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 024B0 80B55860 AFBF0014 */ sw $ra, 0x0014($sp) -/* 024B4 80B55864 908E014D */ lbu $t6, 0x014D($a0) ## 0000014D -/* 024B8 80B55868 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 024BC 80B5586C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 024C0 80B55870 15C10009 */ bne $t6, $at, .L80B55898 -/* 024C4 80B55874 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 024C8 80B55878 3C054080 */ lui $a1, 0x4080 ## $a1 = 40800000 -/* 024CC 80B5587C 0C0295B2 */ jal func_800A56C8 -/* 024D0 80B55880 AFA60018 */ sw $a2, 0x0018($sp) -/* 024D4 80B55884 10400004 */ beq $v0, $zero, .L80B55898 -/* 024D8 80B55888 8FA60018 */ lw $a2, 0x0018($sp) -/* 024DC 80B5588C 24C400E4 */ addiu $a0, $a2, 0x00E4 ## $a0 = 000000E4 -/* 024E0 80B55890 0C01E245 */ jal func_80078914 -/* 024E4 80B55894 24056879 */ addiu $a1, $zero, 0x6879 ## $a1 = 00006879 -.L80B55898: -/* 024E8 80B55898 8FBF0014 */ lw $ra, 0x0014($sp) -/* 024EC 80B5589C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 024F0 80B558A0 03E00008 */ jr $ra -/* 024F4 80B558A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B558A8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B558A8.s deleted file mode 100644 index 8d0edbda61..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B558A8.s +++ /dev/null @@ -1,89 +0,0 @@ -.late_rodata -glabel D_80B5AB2C - .word 0x404A5E38 -glabel D_80B5AB30 - .word 0xBFCDBF48 -glabel D_80B5AB34 - .word 0x404A5E38 -glabel D_80B5AB38 - .word 0xBFCDBF48 -glabel D_80B5AB3C - .word 0xBC47E000 - -.text -glabel func_80B558A8 -/* 024F8 80B558A8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 024FC 80B558AC AFBF001C */ sw $ra, 0x001C($sp) -/* 02500 80B558B0 AFB10018 */ sw $s1, 0x0018($sp) -/* 02504 80B558B4 AFB00014 */ sw $s0, 0x0014($sp) -/* 02508 80B558B8 8C8F0024 */ lw $t7, 0x0024($a0) ## 00000024 -/* 0250C 80B558BC 84910032 */ lh $s1, 0x0032($a0) ## 00000032 -/* 02510 80B558C0 27A2002C */ addiu $v0, $sp, 0x002C ## $v0 = FFFFFFDC -/* 02514 80B558C4 AC4F0000 */ sw $t7, 0x0000($v0) ## FFFFFFDC -/* 02518 80B558C8 8C8E0028 */ lw $t6, 0x0028($a0) ## 00000028 -/* 0251C 80B558CC 8C590000 */ lw $t9, 0x0000($v0) ## FFFFFFDC -/* 02520 80B558D0 24900338 */ addiu $s0, $a0, 0x0338 ## $s0 = 00000338 -/* 02524 80B558D4 AC4E0004 */ sw $t6, 0x0004($v0) ## FFFFFFE0 -/* 02528 80B558D8 8C8F002C */ lw $t7, 0x002C($a0) ## 0000002C -/* 0252C 80B558DC AC4F0008 */ sw $t7, 0x0008($v0) ## FFFFFFE4 -/* 02530 80B558E0 AC99032C */ sw $t9, 0x032C($a0) ## 0000032C -/* 02534 80B558E4 8C580004 */ lw $t8, 0x0004($v0) ## FFFFFFE0 -/* 02538 80B558E8 AC980330 */ sw $t8, 0x0330($a0) ## 00000330 -/* 0253C 80B558EC 8C590008 */ lw $t9, 0x0008($v0) ## FFFFFFE4 -/* 02540 80B558F0 AC990334 */ sw $t9, 0x0334($a0) ## 00000334 -/* 02544 80B558F4 8C490000 */ lw $t1, 0x0000($v0) ## FFFFFFDC -/* 02548 80B558F8 00112400 */ sll $a0, $s1, 16 -/* 0254C 80B558FC 00042403 */ sra $a0, $a0, 16 -/* 02550 80B55900 AE090000 */ sw $t1, 0x0000($s0) ## 00000338 -/* 02554 80B55904 8C480004 */ lw $t0, 0x0004($v0) ## FFFFFFE0 -/* 02558 80B55908 AE080004 */ sw $t0, 0x0004($s0) ## 0000033C -/* 0255C 80B5590C 8C490008 */ lw $t1, 0x0008($v0) ## FFFFFFE4 -/* 02560 80B55910 0C01DE1C */ jal Math_Sins - ## sins? -/* 02564 80B55914 AE090008 */ sw $t1, 0x0008($s0) ## 00000340 -/* 02568 80B55918 00112400 */ sll $a0, $s1, 16 -/* 0256C 80B5591C 00042403 */ sra $a0, $a0, 16 -/* 02570 80B55920 0C01DE0D */ jal Math_Coss - ## coss? -/* 02574 80B55924 E7A00024 */ swc1 $f0, 0x0024($sp) -/* 02578 80B55928 3C0180B6 */ lui $at, %hi(D_80B5AB2C) ## $at = 80B60000 -/* 0257C 80B5592C C424AB2C */ lwc1 $f4, %lo(D_80B5AB2C)($at) -/* 02580 80B55930 C7A60024 */ lwc1 $f6, 0x0024($sp) -/* 02584 80B55934 3C0180B6 */ lui $at, %hi(D_80B5AB30) ## $at = 80B60000 -/* 02588 80B55938 C42AAB30 */ lwc1 $f10, %lo(D_80B5AB30)($at) -/* 0258C 80B5593C 46062202 */ mul.s $f8, $f4, $f6 -/* 02590 80B55940 C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000340 -/* 02594 80B55944 00112400 */ sll $a0, $s1, 16 -/* 02598 80B55948 46005402 */ mul.s $f16, $f10, $f0 -/* 0259C 80B5594C 00042403 */ sra $a0, $a0, 16 -/* 025A0 80B55950 46088481 */ sub.s $f18, $f16, $f8 -/* 025A4 80B55954 46122180 */ add.s $f6, $f4, $f18 -/* 025A8 80B55958 0C01DE0D */ jal Math_Coss - ## coss? -/* 025AC 80B5595C E6060008 */ swc1 $f6, 0x0008($s0) ## 00000340 -/* 025B0 80B55960 00112400 */ sll $a0, $s1, 16 -/* 025B4 80B55964 00042403 */ sra $a0, $a0, 16 -/* 025B8 80B55968 0C01DE1C */ jal Math_Sins - ## sins? -/* 025BC 80B5596C E7A00024 */ swc1 $f0, 0x0024($sp) -/* 025C0 80B55970 3C0180B6 */ lui $at, %hi(D_80B5AB34) ## $at = 80B60000 -/* 025C4 80B55974 C42AAB34 */ lwc1 $f10, %lo(D_80B5AB34)($at) -/* 025C8 80B55978 C7B00024 */ lwc1 $f16, 0x0024($sp) -/* 025CC 80B5597C 3C0180B6 */ lui $at, %hi(D_80B5AB38) ## $at = 80B60000 -/* 025D0 80B55980 C424AB38 */ lwc1 $f4, %lo(D_80B5AB38)($at) -/* 025D4 80B55984 46105202 */ mul.s $f8, $f10, $f16 -/* 025D8 80B55988 C60A0000 */ lwc1 $f10, 0x0000($s0) ## 00000338 -/* 025DC 80B5598C 3C0180B6 */ lui $at, %hi(D_80B5AB3C) ## $at = 80B60000 -/* 025E0 80B55990 46002482 */ mul.s $f18, $f4, $f0 -/* 025E4 80B55994 C6040004 */ lwc1 $f4, 0x0004($s0) ## 0000033C -/* 025E8 80B55998 46089180 */ add.s $f6, $f18, $f8 -/* 025EC 80B5599C 46065400 */ add.s $f16, $f10, $f6 -/* 025F0 80B559A0 E6100000 */ swc1 $f16, 0x0000($s0) ## 00000338 -/* 025F4 80B559A4 C432AB3C */ lwc1 $f18, %lo(D_80B5AB3C)($at) -/* 025F8 80B559A8 46122200 */ add.s $f8, $f4, $f18 -/* 025FC 80B559AC E6080004 */ swc1 $f8, 0x0004($s0) ## 0000033C -/* 02600 80B559B0 8FBF001C */ lw $ra, 0x001C($sp) -/* 02604 80B559B4 8FB10018 */ lw $s1, 0x0018($sp) -/* 02608 80B559B8 8FB00014 */ lw $s0, 0x0014($sp) -/* 0260C 80B559BC 03E00008 */ jr $ra -/* 02610 80B559C0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B559C4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B559C4.s deleted file mode 100644 index 3c2d3e12f0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B559C4.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_80B559C4 -/* 02614 80B559C4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02618 80B559C8 AFA40020 */ sw $a0, 0x0020($sp) -/* 0261C 80B559CC AFBF001C */ sw $ra, 0x001C($sp) -/* 02620 80B559D0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 02624 80B559D4 0C028800 */ jal SkelAnime_GetFrameCount - -/* 02628 80B559D8 24845248 */ addiu $a0, $a0, 0x5248 ## $a0 = 06005248 -/* 0262C 80B559DC 8FA80020 */ lw $t0, 0x0020($sp) -/* 02630 80B559E0 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 02634 80B559E4 3044FFFF */ andi $a0, $v0, 0xFFFF ## $a0 = 00000000 -/* 02638 80B559E8 C5040164 */ lwc1 $f4, 0x0164($t0) ## 00000164 -/* 0263C 80B559EC AFAF0010 */ sw $t7, 0x0010($sp) -/* 02640 80B559F0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02644 80B559F4 4600218D */ trunc.w.s $f6, $f4 -/* 02648 80B559F8 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 0264C 80B559FC 44063000 */ mfc1 $a2, $f6 -/* 02650 80B55A00 0C01BE6F */ jal func_8006F9BC -/* 02654 80B55A04 30C6FFFF */ andi $a2, $a2, 0xFFFF ## $a2 = 00000000 -/* 02658 80B55A08 8FA80020 */ lw $t0, 0x0020($sp) -/* 0265C 80B55A0C 2503032C */ addiu $v1, $t0, 0x032C ## $v1 = 0000032C -/* 02660 80B55A10 25040338 */ addiu $a0, $t0, 0x0338 ## $a0 = 00000338 -/* 02664 80B55A14 C4880000 */ lwc1 $f8, 0x0000($a0) ## 00000338 -/* 02668 80B55A18 C4620000 */ lwc1 $f2, 0x0000($v1) ## 0000032C -/* 0266C 80B55A1C 25020024 */ addiu $v0, $t0, 0x0024 ## $v0 = 00000024 -/* 02670 80B55A20 46024281 */ sub.s $f10, $f8, $f2 -/* 02674 80B55A24 460A0402 */ mul.s $f16, $f0, $f10 -/* 02678 80B55A28 46101480 */ add.s $f18, $f2, $f16 -/* 0267C 80B55A2C E4520000 */ swc1 $f18, 0x0000($v0) ## 00000024 -/* 02680 80B55A30 C4840008 */ lwc1 $f4, 0x0008($a0) ## 00000340 -/* 02684 80B55A34 C46C0008 */ lwc1 $f12, 0x0008($v1) ## 00000334 -/* 02688 80B55A38 460C2181 */ sub.s $f6, $f4, $f12 -/* 0268C 80B55A3C 46060202 */ mul.s $f8, $f0, $f6 -/* 02690 80B55A40 46086280 */ add.s $f10, $f12, $f8 -/* 02694 80B55A44 E44A0008 */ swc1 $f10, 0x0008($v0) ## 0000002C -/* 02698 80B55A48 8FBF001C */ lw $ra, 0x001C($sp) -/* 0269C 80B55A4C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 026A0 80B55A50 03E00008 */ jr $ra -/* 026A4 80B55A54 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55A58.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55A58.s deleted file mode 100644 index f0b608a61d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55A58.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80B55A58 -/* 026A8 80B55A58 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 026AC 80B55A5C AFBF0014 */ sw $ra, 0x0014($sp) -/* 026B0 80B55A60 84AE07A0 */ lh $t6, 0x07A0($a1) ## 000007A0 -/* 026B4 80B55A64 55C00004 */ bnel $t6, $zero, .L80B55A78 -/* 026B8 80B55A68 8FBF0014 */ lw $ra, 0x0014($sp) -/* 026BC 80B55A6C 0C2D4DFA */ jal func_80B537E8 -/* 026C0 80B55A70 00000000 */ nop -/* 026C4 80B55A74 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B55A78: -/* 026C8 80B55A78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 026CC 80B55A7C 03E00008 */ jr $ra -/* 026D0 80B55A80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55A84.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55A84.s deleted file mode 100644 index 3b71086e4d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55A84.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B55A84 -/* 026D4 80B55A84 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 026D8 80B55A88 AFBF001C */ sw $ra, 0x001C($sp) -/* 026DC 80B55A8C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 026E0 80B55A90 AFA40020 */ sw $a0, 0x0020($sp) -/* 026E4 80B55A94 24A55A0C */ addiu $a1, $a1, 0x5A0C ## $a1 = 06005A0C -/* 026E8 80B55A98 AFA00010 */ sw $zero, 0x0010($sp) -/* 026EC 80B55A9C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 026F0 80B55AA0 0C2D5385 */ jal func_80B54E14 -/* 026F4 80B55AA4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 026F8 80B55AA8 8FAF0020 */ lw $t7, 0x0020($sp) -/* 026FC 80B55AAC 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 02700 80B55AB0 ADEE024C */ sw $t6, 0x024C($t7) ## 0000024C -/* 02704 80B55AB4 8FBF001C */ lw $ra, 0x001C($sp) -/* 02708 80B55AB8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0270C 80B55ABC 03E00008 */ jr $ra -/* 02710 80B55AC0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55AC4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55AC4.s deleted file mode 100644 index 3d7db18947..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55AC4.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B55AC4 -/* 02714 80B55AC4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02718 80B55AC8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0271C 80B55ACC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02720 80B55AD0 AFA40020 */ sw $a0, 0x0020($sp) -/* 02724 80B55AD4 24A5499C */ addiu $a1, $a1, 0x499C ## $a1 = 0600499C -/* 02728 80B55AD8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0272C 80B55ADC 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02730 80B55AE0 0C2D5385 */ jal func_80B54E14 -/* 02734 80B55AE4 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02738 80B55AE8 8FAF0020 */ lw $t7, 0x0020($sp) -/* 0273C 80B55AEC 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 02740 80B55AF0 ADEE024C */ sw $t6, 0x024C($t7) ## 0000024C -/* 02744 80B55AF4 8FBF001C */ lw $ra, 0x001C($sp) -/* 02748 80B55AF8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0274C 80B55AFC 03E00008 */ jr $ra -/* 02750 80B55B00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55B04.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55B04.s deleted file mode 100644 index 989eb18243..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55B04.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B55B04 -/* 02754 80B55B04 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02758 80B55B08 10A00007 */ beq $a1, $zero, .L80B55B28 -/* 0275C 80B55B0C AFBF001C */ sw $ra, 0x001C($sp) -/* 02760 80B55B10 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02764 80B55B14 24A54408 */ addiu $a1, $a1, 0x4408 ## $a1 = 06004408 -/* 02768 80B55B18 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0276C 80B55B1C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02770 80B55B20 0C2D5385 */ jal func_80B54E14 -/* 02774 80B55B24 AFA00010 */ sw $zero, 0x0010($sp) -.L80B55B28: -/* 02778 80B55B28 8FBF001C */ lw $ra, 0x001C($sp) -/* 0277C 80B55B2C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02780 80B55B30 03E00008 */ jr $ra -/* 02784 80B55B34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55B38.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55B38.s deleted file mode 100644 index 0c3e80eddc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55B38.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B55B38 -/* 02788 80B55B38 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0278C 80B55B3C AFBF001C */ sw $ra, 0x001C($sp) -/* 02790 80B55B40 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02794 80B55B44 AFA40020 */ sw $a0, 0x0020($sp) -/* 02798 80B55B48 24A56508 */ addiu $a1, $a1, 0x6508 ## $a1 = 06006508 -/* 0279C 80B55B4C AFA00010 */ sw $zero, 0x0010($sp) -/* 027A0 80B55B50 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 027A4 80B55B54 0C2D5385 */ jal func_80B54E14 -/* 027A8 80B55B58 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 027AC 80B55B5C 8FAF0020 */ lw $t7, 0x0020($sp) -/* 027B0 80B55B60 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 -/* 027B4 80B55B64 ADEE024C */ sw $t6, 0x024C($t7) ## 0000024C -/* 027B8 80B55B68 8FBF001C */ lw $ra, 0x001C($sp) -/* 027BC 80B55B6C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 027C0 80B55B70 03E00008 */ jr $ra -/* 027C4 80B55B74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55B78.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55B78.s deleted file mode 100644 index bf770766d2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55B78.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B55B78 -/* 027C8 80B55B78 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 027CC 80B55B7C 10A00007 */ beq $a1, $zero, .L80B55B9C -/* 027D0 80B55B80 AFBF001C */ sw $ra, 0x001C($sp) -/* 027D4 80B55B84 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 027D8 80B55B88 24A561C4 */ addiu $a1, $a1, 0x61C4 ## $a1 = 060061C4 -/* 027DC 80B55B8C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 027E0 80B55B90 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 027E4 80B55B94 0C2D5385 */ jal func_80B54E14 -/* 027E8 80B55B98 AFA00010 */ sw $zero, 0x0010($sp) -.L80B55B9C: -/* 027EC 80B55B9C 8FBF001C */ lw $ra, 0x001C($sp) -/* 027F0 80B55BA0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 027F4 80B55BA4 03E00008 */ jr $ra -/* 027F8 80B55BA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55BAC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55BAC.s deleted file mode 100644 index 7329281ff8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55BAC.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B55BAC -/* 027FC 80B55BAC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02800 80B55BB0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02804 80B55BB4 AFB00020 */ sw $s0, 0x0020($sp) -/* 02808 80B55BB8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0280C 80B55BBC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02810 80B55BC0 24A55248 */ addiu $a1, $a1, 0x5248 ## $a1 = 06005248 -/* 02814 80B55BC4 AFA00010 */ sw $zero, 0x0010($sp) -/* 02818 80B55BC8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 0281C 80B55BCC 0C2D5385 */ jal func_80B54E14 -/* 02820 80B55BD0 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02824 80B55BD4 0C2D562A */ jal func_80B558A8 -/* 02828 80B55BD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0282C 80B55BDC 0C2D5602 */ jal func_80B55808 -/* 02830 80B55BE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02834 80B55BE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02838 80B55BE8 0C2D4D5A */ jal func_80B53568 -/* 0283C 80B55BEC 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 02840 80B55BF0 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 02844 80B55BF4 AE0E024C */ sw $t6, 0x024C($s0) ## 0000024C -/* 02848 80B55BF8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0284C 80B55BFC 8FB00020 */ lw $s0, 0x0020($sp) -/* 02850 80B55C00 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02854 80B55C04 03E00008 */ jr $ra -/* 02858 80B55C08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55C0C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55C0C.s deleted file mode 100644 index 63633fbccf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55C0C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B55C0C -/* 0285C 80B55C0C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02860 80B55C10 AFBF001C */ sw $ra, 0x001C($sp) -/* 02864 80B55C14 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02868 80B55C18 AFA40020 */ sw $a0, 0x0020($sp) -/* 0286C 80B55C1C 24A554E0 */ addiu $a1, $a1, 0x54E0 ## $a1 = 060054E0 -/* 02870 80B55C20 AFA00010 */ sw $zero, 0x0010($sp) -/* 02874 80B55C24 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02878 80B55C28 0C2D5385 */ jal func_80B54E14 -/* 0287C 80B55C2C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02880 80B55C30 8FAF0020 */ lw $t7, 0x0020($sp) -/* 02884 80B55C34 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B -/* 02888 80B55C38 ADEE024C */ sw $t6, 0x024C($t7) ## 0000024C -/* 0288C 80B55C3C 8FBF001C */ lw $ra, 0x001C($sp) -/* 02890 80B55C40 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02894 80B55C44 03E00008 */ jr $ra -/* 02898 80B55C48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55C4C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55C4C.s deleted file mode 100644 index 38198c6646..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55C4C.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B55C4C -/* 0289C 80B55C4C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 028A0 80B55C50 10A00003 */ beq $a1, $zero, .L80B55C60 -/* 028A4 80B55C54 AFBF0014 */ sw $ra, 0x0014($sp) -/* 028A8 80B55C58 0C2D5703 */ jal func_80B55C0C -/* 028AC 80B55C5C 00000000 */ nop -.L80B55C60: -/* 028B0 80B55C60 8FBF0014 */ lw $ra, 0x0014($sp) -/* 028B4 80B55C64 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 028B8 80B55C68 03E00008 */ jr $ra -/* 028BC 80B55C6C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55C70.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55C70.s deleted file mode 100644 index 6760e84f7c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55C70.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B55C70 -/* 028C0 80B55C70 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 028C4 80B55C74 AFBF001C */ sw $ra, 0x001C($sp) -/* 028C8 80B55C78 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 028CC 80B55C7C 24A58684 */ addiu $a1, $a1, 0x8684 ## $a1 = 06008684 -/* 028D0 80B55C80 AFA00010 */ sw $zero, 0x0010($sp) -/* 028D4 80B55C84 AFA40020 */ sw $a0, 0x0020($sp) -/* 028D8 80B55C88 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 028DC 80B55C8C 0C2D5385 */ jal func_80B54E14 -/* 028E0 80B55C90 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 028E4 80B55C94 8FA40020 */ lw $a0, 0x0020($sp) -/* 028E8 80B55C98 2401FFF6 */ addiu $at, $zero, 0xFFF6 ## $at = FFFFFFF6 -/* 028EC 80B55C9C 240E000C */ addiu $t6, $zero, 0x000C ## $t6 = 0000000C -/* 028F0 80B55CA0 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 -/* 028F4 80B55CA4 AC8E024C */ sw $t6, 0x024C($a0) ## 0000024C -/* 028F8 80B55CA8 01E1C024 */ and $t8, $t7, $at -/* 028FC 80B55CAC 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 02900 80B55CB0 03014024 */ and $t0, $t8, $at -/* 02904 80B55CB4 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 02908 80B55CB8 AC880004 */ sw $t0, 0x0004($a0) ## 00000004 -/* 0290C 80B55CBC 8FBF001C */ lw $ra, 0x001C($sp) -/* 02910 80B55CC0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02914 80B55CC4 03E00008 */ jr $ra -/* 02918 80B55CC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55CCC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55CCC.s deleted file mode 100644 index f96fde8c26..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55CCC.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B55CCC -/* 0291C 80B55CCC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02920 80B55CD0 10A00007 */ beq $a1, $zero, .L80B55CF0 -/* 02924 80B55CD4 AFBF001C */ sw $ra, 0x001C($sp) -/* 02928 80B55CD8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0292C 80B55CDC 24A56F04 */ addiu $a1, $a1, 0x6F04 ## $a1 = 06006F04 -/* 02930 80B55CE0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02934 80B55CE4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02938 80B55CE8 0C2D5385 */ jal func_80B54E14 -/* 0293C 80B55CEC AFA00010 */ sw $zero, 0x0010($sp) -.L80B55CF0: -/* 02940 80B55CF0 8FBF001C */ lw $ra, 0x001C($sp) -/* 02944 80B55CF4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02948 80B55CF8 03E00008 */ jr $ra -/* 0294C 80B55CFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55D00.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55D00.s deleted file mode 100644 index 76645de6f1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55D00.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_80B55D00 -/* 02950 80B55D00 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02954 80B55D04 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02958 80B55D08 AFA5001C */ sw $a1, 0x001C($sp) -/* 0295C 80B55D0C 0C00BC65 */ jal func_8002F194 -/* 02960 80B55D10 AFA40018 */ sw $a0, 0x0018($sp) -/* 02964 80B55D14 10400004 */ beq $v0, $zero, .L80B55D28 -/* 02968 80B55D18 8FA40018 */ lw $a0, 0x0018($sp) -/* 0296C 80B55D1C 240E000D */ addiu $t6, $zero, 0x000D ## $t6 = 0000000D -/* 02970 80B55D20 1000001F */ beq $zero, $zero, .L80B55DA0 -/* 02974 80B55D24 AC8E024C */ sw $t6, 0x024C($a0) ## 0000024C -.L80B55D28: -/* 02978 80B55D28 848F008A */ lh $t7, 0x008A($a0) ## 0000008A -/* 0297C 80B55D2C 849800B6 */ lh $t8, 0x00B6($a0) ## 000000B6 -/* 02980 80B55D30 01F81023 */ subu $v0, $t7, $t8 -/* 02984 80B55D34 00021400 */ sll $v0, $v0, 16 -/* 02988 80B55D38 00021403 */ sra $v0, $v0, 16 -/* 0298C 80B55D3C 04400003 */ bltz $v0, .L80B55D4C -/* 02990 80B55D40 00021823 */ subu $v1, $zero, $v0 -/* 02994 80B55D44 10000001 */ beq $zero, $zero, .L80B55D4C -/* 02998 80B55D48 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80B55D4C: -/* 0299C 80B55D4C 28614301 */ slti $at, $v1, 0x4301 -/* 029A0 80B55D50 5020000D */ beql $at, $zero, .L80B55D88 -/* 029A4 80B55D54 8C8C0004 */ lw $t4, 0x0004($a0) ## 00000004 -/* 029A8 80B55D58 8C990004 */ lw $t9, 0x0004($a0) ## 00000004 -/* 029AC 80B55D5C 240B70D5 */ addiu $t3, $zero, 0x70D5 ## $t3 = 000070D5 -/* 029B0 80B55D60 A48B010E */ sh $t3, 0x010E($a0) ## 0000010E -/* 029B4 80B55D64 37280009 */ ori $t0, $t9, 0x0009 ## $t0 = 00000009 -/* 029B8 80B55D68 AC880004 */ sw $t0, 0x0004($a0) ## 00000004 -/* 029BC 80B55D6C 350A0001 */ ori $t2, $t0, 0x0001 ## $t2 = 00000009 -/* 029C0 80B55D70 AC8A0004 */ sw $t2, 0x0004($a0) ## 00000004 -/* 029C4 80B55D74 0C00BCBD */ jal func_8002F2F4 -/* 029C8 80B55D78 8FA5001C */ lw $a1, 0x001C($sp) -/* 029CC 80B55D7C 10000009 */ beq $zero, $zero, .L80B55DA4 -/* 029D0 80B55D80 8FBF0014 */ lw $ra, 0x0014($sp) -/* 029D4 80B55D84 8C8C0004 */ lw $t4, 0x0004($a0) ## 00000004 -.L80B55D88: -/* 029D8 80B55D88 2401FFF6 */ addiu $at, $zero, 0xFFF6 ## $at = FFFFFFF6 -/* 029DC 80B55D8C 01816824 */ and $t5, $t4, $at -/* 029E0 80B55D90 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 029E4 80B55D94 AC8D0004 */ sw $t5, 0x0004($a0) ## 00000004 -/* 029E8 80B55D98 01A17824 */ and $t7, $t5, $at -/* 029EC 80B55D9C AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -.L80B55DA0: -/* 029F0 80B55DA0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B55DA4: -/* 029F4 80B55DA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 029F8 80B55DA8 03E00008 */ jr $ra -/* 029FC 80B55DAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55DB0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55DB0.s deleted file mode 100644 index 0660f994fb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55DB0.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B55DB0 -/* 02A00 80B55DB0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02A04 80B55DB4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02A08 80B55DB8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 02A0C 80B55DBC AFA60018 */ sw $a2, 0x0018($sp) -/* 02A10 80B55DC0 0C042F6F */ jal func_8010BDBC -/* 02A14 80B55DC4 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 02A18 80B55DC8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02A1C 80B55DCC 1441000A */ bne $v0, $at, .L80B55DF8 -/* 02A20 80B55DD0 8FA60018 */ lw $a2, 0x0018($sp) -/* 02A24 80B55DD4 8CCE0004 */ lw $t6, 0x0004($a2) ## 00000004 -/* 02A28 80B55DD8 2401FFF6 */ addiu $at, $zero, 0xFFF6 ## $at = FFFFFFF6 -/* 02A2C 80B55DDC 2408000C */ addiu $t0, $zero, 0x000C ## $t0 = 0000000C -/* 02A30 80B55DE0 01C17824 */ and $t7, $t6, $at -/* 02A34 80B55DE4 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 02A38 80B55DE8 ACCF0004 */ sw $t7, 0x0004($a2) ## 00000004 -/* 02A3C 80B55DEC 01E1C824 */ and $t9, $t7, $at -/* 02A40 80B55DF0 ACD90004 */ sw $t9, 0x0004($a2) ## 00000004 -/* 02A44 80B55DF4 ACC8024C */ sw $t0, 0x024C($a2) ## 0000024C -.L80B55DF8: -/* 02A48 80B55DF8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02A4C 80B55DFC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02A50 80B55E00 03E00008 */ jr $ra -/* 02A54 80B55E04 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55E08.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55E08.s deleted file mode 100644 index 81ca01719c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55E08.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B55E08 -/* 02A58 80B55E08 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02A5C 80B55E0C AFBF001C */ sw $ra, 0x001C($sp) -/* 02A60 80B55E10 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02A64 80B55E14 AFA40020 */ sw $a0, 0x0020($sp) -/* 02A68 80B55E18 24A56AB0 */ addiu $a1, $a1, 0x6AB0 ## $a1 = 06006AB0 -/* 02A6C 80B55E1C AFA00010 */ sw $zero, 0x0010($sp) -/* 02A70 80B55E20 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02A74 80B55E24 0C2D5385 */ jal func_80B54E14 -/* 02A78 80B55E28 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02A7C 80B55E2C 8FAF0020 */ lw $t7, 0x0020($sp) -/* 02A80 80B55E30 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E -/* 02A84 80B55E34 ADEE024C */ sw $t6, 0x024C($t7) ## 0000024C -/* 02A88 80B55E38 8FBF001C */ lw $ra, 0x001C($sp) -/* 02A8C 80B55E3C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02A90 80B55E40 03E00008 */ jr $ra -/* 02A94 80B55E44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55E48.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55E48.s deleted file mode 100644 index fac15cd00c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55E48.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B55E48 -/* 02A98 80B55E48 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02A9C 80B55E4C 10A00007 */ beq $a1, $zero, .L80B55E6C -/* 02AA0 80B55E50 AFBF001C */ sw $ra, 0x001C($sp) -/* 02AA4 80B55E54 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02AA8 80B55E58 24A58050 */ addiu $a1, $a1, 0x8050 ## $a1 = 06008050 -/* 02AAC 80B55E5C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02AB0 80B55E60 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02AB4 80B55E64 0C2D5385 */ jal func_80B54E14 -/* 02AB8 80B55E68 AFA00010 */ sw $zero, 0x0010($sp) -.L80B55E6C: -/* 02ABC 80B55E6C 8FBF001C */ lw $ra, 0x001C($sp) -/* 02AC0 80B55E70 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02AC4 80B55E74 03E00008 */ jr $ra -/* 02AC8 80B55E78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55E7C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55E7C.s deleted file mode 100644 index fbec50a298..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55E7C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B55E7C -/* 02ACC 80B55E7C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02AD0 80B55E80 AFBF001C */ sw $ra, 0x001C($sp) -/* 02AD4 80B55E84 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02AD8 80B55E88 AFA40020 */ sw $a0, 0x0020($sp) -/* 02ADC 80B55E8C 24A57A78 */ addiu $a1, $a1, 0x7A78 ## $a1 = 06007A78 -/* 02AE0 80B55E90 AFA00010 */ sw $zero, 0x0010($sp) -/* 02AE4 80B55E94 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02AE8 80B55E98 0C2D5385 */ jal func_80B54E14 -/* 02AEC 80B55E9C 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02AF0 80B55EA0 8FAF0020 */ lw $t7, 0x0020($sp) -/* 02AF4 80B55EA4 240E000F */ addiu $t6, $zero, 0x000F ## $t6 = 0000000F -/* 02AF8 80B55EA8 ADEE024C */ sw $t6, 0x024C($t7) ## 0000024C -/* 02AFC 80B55EAC 8FBF001C */ lw $ra, 0x001C($sp) -/* 02B00 80B55EB0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02B04 80B55EB4 03E00008 */ jr $ra -/* 02B08 80B55EB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55EBC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55EBC.s deleted file mode 100644 index 9aa7602dd7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55EBC.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B55EBC -/* 02B0C 80B55EBC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02B10 80B55EC0 10A00007 */ beq $a1, $zero, .L80B55EE0 -/* 02B14 80B55EC4 AFBF001C */ sw $ra, 0x001C($sp) -/* 02B18 80B55EC8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02B1C 80B55ECC 24A57C84 */ addiu $a1, $a1, 0x7C84 ## $a1 = 06007C84 -/* 02B20 80B55ED0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02B24 80B55ED4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02B28 80B55ED8 0C2D5385 */ jal func_80B54E14 -/* 02B2C 80B55EDC AFA00010 */ sw $zero, 0x0010($sp) -.L80B55EE0: -/* 02B30 80B55EE0 8FBF001C */ lw $ra, 0x001C($sp) -/* 02B34 80B55EE4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02B38 80B55EE8 03E00008 */ jr $ra -/* 02B3C 80B55EEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55EF0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55EF0.s deleted file mode 100644 index 6cda58676e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55EF0.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B55EF0 -/* 02B40 80B55EF0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02B44 80B55EF4 AFBF001C */ sw $ra, 0x001C($sp) -/* 02B48 80B55EF8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02B4C 80B55EFC 24A582F8 */ addiu $a1, $a1, 0x82F8 ## $a1 = 060082F8 -/* 02B50 80B55F00 AFA00010 */ sw $zero, 0x0010($sp) -/* 02B54 80B55F04 AFA40020 */ sw $a0, 0x0020($sp) -/* 02B58 80B55F08 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02B5C 80B55F0C 0C2D5385 */ jal func_80B54E14 -/* 02B60 80B55F10 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02B64 80B55F14 8FA40020 */ lw $a0, 0x0020($sp) -/* 02B68 80B55F18 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 02B6C 80B55F1C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02B70 80B55F20 0C2D4D5A */ jal func_80B53568 -/* 02B74 80B55F24 AC8E024C */ sw $t6, 0x024C($a0) ## 0000024C -/* 02B78 80B55F28 8FBF001C */ lw $ra, 0x001C($sp) -/* 02B7C 80B55F2C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02B80 80B55F30 03E00008 */ jr $ra -/* 02B84 80B55F34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55F38.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55F38.s deleted file mode 100644 index 21c6961f25..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55F38.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B55F38 -/* 02B88 80B55F38 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02B8C 80B55F3C 10A00007 */ beq $a1, $zero, .L80B55F5C -/* 02B90 80B55F40 AFBF001C */ sw $ra, 0x001C($sp) -/* 02B94 80B55F44 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02B98 80B55F48 24A53FF8 */ addiu $a1, $a1, 0x3FF8 ## $a1 = 06003FF8 -/* 02B9C 80B55F4C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02BA0 80B55F50 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02BA4 80B55F54 0C2D5385 */ jal func_80B54E14 -/* 02BA8 80B55F58 AFA00010 */ sw $zero, 0x0010($sp) -.L80B55F5C: -/* 02BAC 80B55F5C 8FBF001C */ lw $ra, 0x001C($sp) -/* 02BB0 80B55F60 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02BB4 80B55F64 03E00008 */ jr $ra -/* 02BB8 80B55F68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55F6C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55F6C.s deleted file mode 100644 index daab5b8c61..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55F6C.s +++ /dev/null @@ -1,67 +0,0 @@ -.late_rodata -glabel D_80B5AB40 - .word 0x3DFCD6EA - -.text -glabel func_80B55F6C -/* 02BBC 80B55F6C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02BC0 80B55F70 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02BC4 80B55F74 AFA5001C */ sw $a1, 0x001C($sp) -/* 02BC8 80B55F78 0C00BC65 */ jal func_8002F194 -/* 02BCC 80B55F7C AFA40018 */ sw $a0, 0x0018($sp) -/* 02BD0 80B55F80 10400004 */ beq $v0, $zero, .L80B55F94 -/* 02BD4 80B55F84 8FA40018 */ lw $a0, 0x0018($sp) -/* 02BD8 80B55F88 240E0012 */ addiu $t6, $zero, 0x0012 ## $t6 = 00000012 -/* 02BDC 80B55F8C 1000002B */ beq $zero, $zero, .L80B5603C -/* 02BE0 80B55F90 AC8E024C */ sw $t6, 0x024C($a0) ## 0000024C -.L80B55F94: -/* 02BE4 80B55F94 848F008A */ lh $t7, 0x008A($a0) ## 0000008A -/* 02BE8 80B55F98 849800B6 */ lh $t8, 0x00B6($a0) ## 000000B6 -/* 02BEC 80B55F9C 8FA5001C */ lw $a1, 0x001C($sp) -/* 02BF0 80B55FA0 01F81023 */ subu $v0, $t7, $t8 -/* 02BF4 80B55FA4 00021400 */ sll $v0, $v0, 16 -/* 02BF8 80B55FA8 00021403 */ sra $v0, $v0, 16 -/* 02BFC 80B55FAC 04400003 */ bltz $v0, .L80B55FBC -/* 02C00 80B55FB0 00021823 */ subu $v1, $zero, $v0 -/* 02C04 80B55FB4 10000001 */ beq $zero, $zero, .L80B55FBC -/* 02C08 80B55FB8 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80B55FBC: -/* 02C0C 80B55FBC 28614301 */ slti $at, $v1, 0x4301 -/* 02C10 80B55FC0 50200018 */ beql $at, $zero, .L80B56024 -/* 02C14 80B55FC4 8C8C0004 */ lw $t4, 0x0004($a0) ## 00000004 -/* 02C18 80B55FC8 0C2D4D22 */ jal func_80B53488 -/* 02C1C 80B55FCC AFA40018 */ sw $a0, 0x0018($sp) -/* 02C20 80B55FD0 1040001A */ beq $v0, $zero, .L80B5603C -/* 02C24 80B55FD4 8FA40018 */ lw $a0, 0x0018($sp) -/* 02C28 80B55FD8 3C0180B6 */ lui $at, %hi(D_80B5AB40) ## $at = 80B60000 -/* 02C2C 80B55FDC C424AB40 */ lwc1 $f4, %lo(D_80B5AB40)($at) -/* 02C30 80B55FE0 C4460324 */ lwc1 $f6, 0x0324($v0) ## 00000324 -/* 02C34 80B55FE4 4604303E */ c.le.s $f6, $f4 -/* 02C38 80B55FE8 00000000 */ nop -/* 02C3C 80B55FEC 45020014 */ bc1fl .L80B56040 -/* 02C40 80B55FF0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02C44 80B55FF4 8C990004 */ lw $t9, 0x0004($a0) ## 00000004 -/* 02C48 80B55FF8 240B7059 */ addiu $t3, $zero, 0x7059 ## $t3 = 00007059 -/* 02C4C 80B55FFC A48B010E */ sh $t3, 0x010E($a0) ## 0000010E -/* 02C50 80B56000 37280009 */ ori $t0, $t9, 0x0009 ## $t0 = 00000009 -/* 02C54 80B56004 AC880004 */ sw $t0, 0x0004($a0) ## 00000004 -/* 02C58 80B56008 350A0001 */ ori $t2, $t0, 0x0001 ## $t2 = 00000009 -/* 02C5C 80B5600C AC8A0004 */ sw $t2, 0x0004($a0) ## 00000004 -/* 02C60 80B56010 0C00BCBD */ jal func_8002F2F4 -/* 02C64 80B56014 8FA5001C */ lw $a1, 0x001C($sp) -/* 02C68 80B56018 10000009 */ beq $zero, $zero, .L80B56040 -/* 02C6C 80B5601C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02C70 80B56020 8C8C0004 */ lw $t4, 0x0004($a0) ## 00000004 -.L80B56024: -/* 02C74 80B56024 2401FFF6 */ addiu $at, $zero, 0xFFF6 ## $at = FFFFFFF6 -/* 02C78 80B56028 01816824 */ and $t5, $t4, $at -/* 02C7C 80B5602C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 02C80 80B56030 AC8D0004 */ sw $t5, 0x0004($a0) ## 00000004 -/* 02C84 80B56034 01A17824 */ and $t7, $t5, $at -/* 02C88 80B56038 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -.L80B5603C: -/* 02C8C 80B5603C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B56040: -/* 02C90 80B56040 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02C94 80B56044 03E00008 */ jr $ra -/* 02C98 80B56048 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5604C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5604C.s deleted file mode 100644 index 76d812f4d5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5604C.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80B5604C -/* 02C9C 80B5604C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02CA0 80B56050 AFBF001C */ sw $ra, 0x001C($sp) -/* 02CA4 80B56054 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02CA8 80B56058 24A57664 */ addiu $a1, $a1, 0x7664 ## $a1 = 06007664 -/* 02CAC 80B5605C AFA00010 */ sw $zero, 0x0010($sp) -/* 02CB0 80B56060 AFA40020 */ sw $a0, 0x0020($sp) -/* 02CB4 80B56064 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02CB8 80B56068 0C2D5385 */ jal func_80B54E14 -/* 02CBC 80B5606C 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02CC0 80B56070 8FA40020 */ lw $a0, 0x0020($sp) -/* 02CC4 80B56074 240E0011 */ addiu $t6, $zero, 0x0011 ## $t6 = 00000011 -/* 02CC8 80B56078 0C2D560B */ jal func_80B5582C -/* 02CCC 80B5607C AC8E024C */ sw $t6, 0x024C($a0) ## 0000024C -/* 02CD0 80B56080 8FBF001C */ lw $ra, 0x001C($sp) -/* 02CD4 80B56084 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02CD8 80B56088 03E00008 */ jr $ra -/* 02CDC 80B5608C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56090.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56090.s deleted file mode 100644 index 7c17853aa3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56090.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80B56090 -/* 02CE0 80B56090 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02CE4 80B56094 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02CE8 80B56098 AFB00020 */ sw $s0, 0x0020($sp) -/* 02CEC 80B5609C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02CF0 80B560A0 0C2D4E5B */ jal func_80B5396C -/* 02CF4 80B560A4 AFA5002C */ sw $a1, 0x002C($sp) -/* 02CF8 80B560A8 8E0E02F0 */ lw $t6, 0x02F0($s0) ## 000002F0 -/* 02CFC 80B560AC 8FAF002C */ lw $t7, 0x002C($sp) -/* 02D00 80B560B0 544E0011 */ bnel $v0, $t6, .L80B560F8 -/* 02D04 80B560B4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02D08 80B560B8 11E0000E */ beq $t7, $zero, .L80B560F4 -/* 02D0C 80B560BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02D10 80B560C0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02D14 80B560C4 24A53FF8 */ addiu $a1, $a1, 0x3FF8 ## $a1 = 06003FF8 -/* 02D18 80B560C8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02D1C 80B560CC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02D20 80B560D0 0C2D5385 */ jal func_80B54E14 -/* 02D24 80B560D4 AFA00010 */ sw $zero, 0x0010($sp) -/* 02D28 80B560D8 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 -/* 02D2C 80B560DC AE18024C */ sw $t8, 0x024C($s0) ## 0000024C -/* 02D30 80B560E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02D34 80B560E4 0C2D4E5D */ jal func_80B53974 -/* 02D38 80B560E8 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 -/* 02D3C 80B560EC 24190007 */ addiu $t9, $zero, 0x0007 ## $t9 = 00000007 -/* 02D40 80B560F0 AE1902F0 */ sw $t9, 0x02F0($s0) ## 000002F0 -.L80B560F4: -/* 02D44 80B560F4 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B560F8: -/* 02D48 80B560F8 8FB00020 */ lw $s0, 0x0020($sp) -/* 02D4C 80B560FC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02D50 80B56100 03E00008 */ jr $ra -/* 02D54 80B56104 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56108.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56108.s deleted file mode 100644 index 6400ecff5b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56108.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B56108 -/* 02D58 80B56108 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02D5C 80B5610C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02D60 80B56110 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 02D64 80B56114 AFA60018 */ sw $a2, 0x0018($sp) -/* 02D68 80B56118 0C042F6F */ jal func_8010BDBC -/* 02D6C 80B5611C 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 02D70 80B56120 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02D74 80B56124 1441000A */ bne $v0, $at, .L80B56150 -/* 02D78 80B56128 8FA60018 */ lw $a2, 0x0018($sp) -/* 02D7C 80B5612C 8CCE0004 */ lw $t6, 0x0004($a2) ## 00000004 -/* 02D80 80B56130 2401FFF6 */ addiu $at, $zero, 0xFFF6 ## $at = FFFFFFF6 -/* 02D84 80B56134 24080010 */ addiu $t0, $zero, 0x0010 ## $t0 = 00000010 -/* 02D88 80B56138 01C17824 */ and $t7, $t6, $at -/* 02D8C 80B5613C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 02D90 80B56140 ACCF0004 */ sw $t7, 0x0004($a2) ## 00000004 -/* 02D94 80B56144 01E1C824 */ and $t9, $t7, $at -/* 02D98 80B56148 ACD90004 */ sw $t9, 0x0004($a2) ## 00000004 -/* 02D9C 80B5614C ACC8024C */ sw $t0, 0x024C($a2) ## 0000024C -.L80B56150: -/* 02DA0 80B56150 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02DA4 80B56154 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02DA8 80B56158 03E00008 */ jr $ra -/* 02DAC 80B5615C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56160.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56160.s deleted file mode 100644 index dccf0426ce..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56160.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B56160 -/* 02DB0 80B56160 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02DB4 80B56164 AFBF001C */ sw $ra, 0x001C($sp) -/* 02DB8 80B56168 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02DBC 80B5616C AFA40020 */ sw $a0, 0x0020($sp) -/* 02DC0 80B56170 24A501D8 */ addiu $a1, $a1, 0x01D8 ## $a1 = 060001D8 -/* 02DC4 80B56174 AFA00010 */ sw $zero, 0x0010($sp) -/* 02DC8 80B56178 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02DCC 80B5617C 0C2D5385 */ jal func_80B54E14 -/* 02DD0 80B56180 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02DD4 80B56184 8FAF0020 */ lw $t7, 0x0020($sp) -/* 02DD8 80B56188 240E0013 */ addiu $t6, $zero, 0x0013 ## $t6 = 00000013 -/* 02DDC 80B5618C ADEE024C */ sw $t6, 0x024C($t7) ## 0000024C -/* 02DE0 80B56190 8FBF001C */ lw $ra, 0x001C($sp) -/* 02DE4 80B56194 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02DE8 80B56198 03E00008 */ jr $ra -/* 02DEC 80B5619C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B561A0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B561A0.s deleted file mode 100644 index c979d521a5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B561A0.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B561A0 -/* 02DF0 80B561A0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02DF4 80B561A4 AFBF001C */ sw $ra, 0x001C($sp) -/* 02DF8 80B561A8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02DFC 80B561AC AFA40020 */ sw $a0, 0x0020($sp) -/* 02E00 80B561B0 24A51110 */ addiu $a1, $a1, 0x1110 ## $a1 = 06001110 -/* 02E04 80B561B4 AFA00010 */ sw $zero, 0x0010($sp) -/* 02E08 80B561B8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02E0C 80B561BC 0C2D5385 */ jal func_80B54E14 -/* 02E10 80B561C0 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02E14 80B561C4 8FAF0020 */ lw $t7, 0x0020($sp) -/* 02E18 80B561C8 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 -/* 02E1C 80B561CC ADEE024C */ sw $t6, 0x024C($t7) ## 0000024C -/* 02E20 80B561D0 8FBF001C */ lw $ra, 0x001C($sp) -/* 02E24 80B561D4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02E28 80B561D8 03E00008 */ jr $ra -/* 02E2C 80B561DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B561E0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B561E0.s deleted file mode 100644 index 884bfcf0a8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B561E0.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B561E0 -/* 02E30 80B561E0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02E34 80B561E4 10A00007 */ beq $a1, $zero, .L80B56204 -/* 02E38 80B561E8 AFBF001C */ sw $ra, 0x001C($sp) -/* 02E3C 80B561EC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02E40 80B561F0 24A504F4 */ addiu $a1, $a1, 0x04F4 ## $a1 = 060004F4 -/* 02E44 80B561F4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02E48 80B561F8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02E4C 80B561FC 0C2D5385 */ jal func_80B54E14 -/* 02E50 80B56200 AFA00010 */ sw $zero, 0x0010($sp) -.L80B56204: -/* 02E54 80B56204 8FBF001C */ lw $ra, 0x001C($sp) -/* 02E58 80B56208 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02E5C 80B5620C 03E00008 */ jr $ra -/* 02E60 80B56210 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56214.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56214.s deleted file mode 100644 index b92551b722..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56214.s +++ /dev/null @@ -1,67 +0,0 @@ -.late_rodata -glabel D_80B5AB44 - .word 0x3DFCD6EA - -.text -glabel func_80B56214 -/* 02E64 80B56214 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02E68 80B56218 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02E6C 80B5621C AFA5001C */ sw $a1, 0x001C($sp) -/* 02E70 80B56220 0C00BC65 */ jal func_8002F194 -/* 02E74 80B56224 AFA40018 */ sw $a0, 0x0018($sp) -/* 02E78 80B56228 10400004 */ beq $v0, $zero, .L80B5623C -/* 02E7C 80B5622C 8FA40018 */ lw $a0, 0x0018($sp) -/* 02E80 80B56230 240E0015 */ addiu $t6, $zero, 0x0015 ## $t6 = 00000015 -/* 02E84 80B56234 1000002B */ beq $zero, $zero, .L80B562E4 -/* 02E88 80B56238 AC8E024C */ sw $t6, 0x024C($a0) ## 0000024C -.L80B5623C: -/* 02E8C 80B5623C 848F008A */ lh $t7, 0x008A($a0) ## 0000008A -/* 02E90 80B56240 849800B6 */ lh $t8, 0x00B6($a0) ## 000000B6 -/* 02E94 80B56244 8FA5001C */ lw $a1, 0x001C($sp) -/* 02E98 80B56248 01F81023 */ subu $v0, $t7, $t8 -/* 02E9C 80B5624C 00021400 */ sll $v0, $v0, 16 -/* 02EA0 80B56250 00021403 */ sra $v0, $v0, 16 -/* 02EA4 80B56254 04400003 */ bltz $v0, .L80B56264 -/* 02EA8 80B56258 00021823 */ subu $v1, $zero, $v0 -/* 02EAC 80B5625C 10000001 */ beq $zero, $zero, .L80B56264 -/* 02EB0 80B56260 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80B56264: -/* 02EB4 80B56264 28614301 */ slti $at, $v1, 0x4301 -/* 02EB8 80B56268 50200018 */ beql $at, $zero, .L80B562CC -/* 02EBC 80B5626C 8C8C0004 */ lw $t4, 0x0004($a0) ## 00000004 -/* 02EC0 80B56270 0C2D4D22 */ jal func_80B53488 -/* 02EC4 80B56274 AFA40018 */ sw $a0, 0x0018($sp) -/* 02EC8 80B56278 1040001A */ beq $v0, $zero, .L80B562E4 -/* 02ECC 80B5627C 8FA40018 */ lw $a0, 0x0018($sp) -/* 02ED0 80B56280 3C0180B6 */ lui $at, %hi(D_80B5AB44) ## $at = 80B60000 -/* 02ED4 80B56284 C424AB44 */ lwc1 $f4, %lo(D_80B5AB44)($at) -/* 02ED8 80B56288 C4460324 */ lwc1 $f6, 0x0324($v0) ## 00000324 -/* 02EDC 80B5628C 4604303E */ c.le.s $f6, $f4 -/* 02EE0 80B56290 00000000 */ nop -/* 02EE4 80B56294 45020014 */ bc1fl .L80B562E8 -/* 02EE8 80B56298 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02EEC 80B5629C 8C990004 */ lw $t9, 0x0004($a0) ## 00000004 -/* 02EF0 80B562A0 240B7059 */ addiu $t3, $zero, 0x7059 ## $t3 = 00007059 -/* 02EF4 80B562A4 A48B010E */ sh $t3, 0x010E($a0) ## 0000010E -/* 02EF8 80B562A8 37280009 */ ori $t0, $t9, 0x0009 ## $t0 = 00000009 -/* 02EFC 80B562AC AC880004 */ sw $t0, 0x0004($a0) ## 00000004 -/* 02F00 80B562B0 350A0001 */ ori $t2, $t0, 0x0001 ## $t2 = 00000009 -/* 02F04 80B562B4 AC8A0004 */ sw $t2, 0x0004($a0) ## 00000004 -/* 02F08 80B562B8 0C00BCBD */ jal func_8002F2F4 -/* 02F0C 80B562BC 8FA5001C */ lw $a1, 0x001C($sp) -/* 02F10 80B562C0 10000009 */ beq $zero, $zero, .L80B562E8 -/* 02F14 80B562C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02F18 80B562C8 8C8C0004 */ lw $t4, 0x0004($a0) ## 00000004 -.L80B562CC: -/* 02F1C 80B562CC 2401FFF6 */ addiu $at, $zero, 0xFFF6 ## $at = FFFFFFF6 -/* 02F20 80B562D0 01816824 */ and $t5, $t4, $at -/* 02F24 80B562D4 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 02F28 80B562D8 AC8D0004 */ sw $t5, 0x0004($a0) ## 00000004 -/* 02F2C 80B562DC 01A17824 */ and $t7, $t5, $at -/* 02F30 80B562E0 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -.L80B562E4: -/* 02F34 80B562E4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B562E8: -/* 02F38 80B562E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02F3C 80B562EC 03E00008 */ jr $ra -/* 02F40 80B562F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B562F4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B562F4.s deleted file mode 100644 index 8ff617e0f0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B562F4.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B562F4 -/* 02F44 80B562F4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02F48 80B562F8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02F4C 80B562FC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 02F50 80B56300 AFA60018 */ sw $a2, 0x0018($sp) -/* 02F54 80B56304 0C042F6F */ jal func_8010BDBC -/* 02F58 80B56308 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 02F5C 80B5630C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02F60 80B56310 1441000A */ bne $v0, $at, .L80B5633C -/* 02F64 80B56314 8FA60018 */ lw $a2, 0x0018($sp) -/* 02F68 80B56318 8CCE0004 */ lw $t6, 0x0004($a2) ## 00000004 -/* 02F6C 80B5631C 2401FFF6 */ addiu $at, $zero, 0xFFF6 ## $at = FFFFFFF6 -/* 02F70 80B56320 24080014 */ addiu $t0, $zero, 0x0014 ## $t0 = 00000014 -/* 02F74 80B56324 01C17824 */ and $t7, $t6, $at -/* 02F78 80B56328 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 02F7C 80B5632C ACCF0004 */ sw $t7, 0x0004($a2) ## 00000004 -/* 02F80 80B56330 01E1C824 */ and $t9, $t7, $at -/* 02F84 80B56334 ACD90004 */ sw $t9, 0x0004($a2) ## 00000004 -/* 02F88 80B56338 ACC8024C */ sw $t0, 0x024C($a2) ## 0000024C -.L80B5633C: -/* 02F8C 80B5633C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02F90 80B56340 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02F94 80B56344 03E00008 */ jr $ra -/* 02F98 80B56348 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5634C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5634C.s deleted file mode 100644 index b5a2d88934..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5634C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B5634C -/* 02F9C 80B5634C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02FA0 80B56350 AFBF001C */ sw $ra, 0x001C($sp) -/* 02FA4 80B56354 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02FA8 80B56358 AFA40020 */ sw $a0, 0x0020($sp) -/* 02FAC 80B5635C 24A52348 */ addiu $a1, $a1, 0x2348 ## $a1 = 06002348 -/* 02FB0 80B56360 AFA00010 */ sw $zero, 0x0010($sp) -/* 02FB4 80B56364 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02FB8 80B56368 0C2D5385 */ jal func_80B54E14 -/* 02FBC 80B5636C 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 02FC0 80B56370 8FAF0020 */ lw $t7, 0x0020($sp) -/* 02FC4 80B56374 240E0016 */ addiu $t6, $zero, 0x0016 ## $t6 = 00000016 -/* 02FC8 80B56378 ADEE024C */ sw $t6, 0x024C($t7) ## 0000024C -/* 02FCC 80B5637C 8FBF001C */ lw $ra, 0x001C($sp) -/* 02FD0 80B56380 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02FD4 80B56384 03E00008 */ jr $ra -/* 02FD8 80B56388 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5638C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5638C.s deleted file mode 100644 index 8f88afe7af..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5638C.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B5638C -/* 02FDC 80B5638C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02FE0 80B56390 10A00007 */ beq $a1, $zero, .L80B563B0 -/* 02FE4 80B56394 AFBF001C */ sw $ra, 0x001C($sp) -/* 02FE8 80B56398 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02FEC 80B5639C 24A5210C */ addiu $a1, $a1, 0x210C ## $a1 = 0600210C -/* 02FF0 80B563A0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02FF4 80B563A4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02FF8 80B563A8 0C2D5385 */ jal func_80B54E14 -/* 02FFC 80B563AC AFA00010 */ sw $zero, 0x0010($sp) -.L80B563B0: -/* 03000 80B563B0 8FBF001C */ lw $ra, 0x001C($sp) -/* 03004 80B563B4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03008 80B563B8 03E00008 */ jr $ra -/* 0300C 80B563BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B563C0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B563C0.s deleted file mode 100644 index 9f435c00d4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B563C0.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B563C0 -/* 03010 80B563C0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03014 80B563C4 AFBF001C */ sw $ra, 0x001C($sp) -/* 03018 80B563C8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0301C 80B563CC AFA40020 */ sw $a0, 0x0020($sp) -/* 03020 80B563D0 24A52E54 */ addiu $a1, $a1, 0x2E54 ## $a1 = 06002E54 -/* 03024 80B563D4 AFA00010 */ sw $zero, 0x0010($sp) -/* 03028 80B563D8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 0302C 80B563DC 0C2D5385 */ jal func_80B54E14 -/* 03030 80B563E0 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 03034 80B563E4 8FAF0020 */ lw $t7, 0x0020($sp) -/* 03038 80B563E8 240E0017 */ addiu $t6, $zero, 0x0017 ## $t6 = 00000017 -/* 0303C 80B563EC ADEE024C */ sw $t6, 0x024C($t7) ## 0000024C -/* 03040 80B563F0 8FBF001C */ lw $ra, 0x001C($sp) -/* 03044 80B563F4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03048 80B563F8 03E00008 */ jr $ra -/* 0304C 80B563FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56400.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56400.s deleted file mode 100644 index 091da46d1b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56400.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B56400 -/* 03050 80B56400 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03054 80B56404 10A00007 */ beq $a1, $zero, .L80B56424 -/* 03058 80B56408 AFBF001C */ sw $ra, 0x001C($sp) -/* 0305C 80B5640C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 03060 80B56410 24A52710 */ addiu $a1, $a1, 0x2710 ## $a1 = 06002710 -/* 03064 80B56414 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 03068 80B56418 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0306C 80B5641C 0C2D5385 */ jal func_80B54E14 -/* 03070 80B56420 AFA00010 */ sw $zero, 0x0010($sp) -.L80B56424: -/* 03074 80B56424 8FBF001C */ lw $ra, 0x001C($sp) -/* 03078 80B56428 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0307C 80B5642C 03E00008 */ jr $ra -/* 03080 80B56430 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56434.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56434.s deleted file mode 100644 index f62d01af1a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56434.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B56434 -/* 03084 80B56434 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03088 80B56438 AFBF001C */ sw $ra, 0x001C($sp) -/* 0308C 80B5643C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 03090 80B56440 AFA40020 */ sw $a0, 0x0020($sp) -/* 03094 80B56444 24A51D8C */ addiu $a1, $a1, 0x1D8C ## $a1 = 06001D8C -/* 03098 80B56448 AFA00010 */ sw $zero, 0x0010($sp) -/* 0309C 80B5644C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 030A0 80B56450 0C2D5385 */ jal func_80B54E14 -/* 030A4 80B56454 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 030A8 80B56458 8FAF0020 */ lw $t7, 0x0020($sp) -/* 030AC 80B5645C 240E0018 */ addiu $t6, $zero, 0x0018 ## $t6 = 00000018 -/* 030B0 80B56460 ADEE024C */ sw $t6, 0x024C($t7) ## 0000024C -/* 030B4 80B56464 8FBF001C */ lw $ra, 0x001C($sp) -/* 030B8 80B56468 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 030BC 80B5646C 03E00008 */ jr $ra -/* 030C0 80B56470 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56474.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56474.s deleted file mode 100644 index 1b82fc7f8c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56474.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B56474 -/* 030C4 80B56474 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 030C8 80B56478 10A00007 */ beq $a1, $zero, .L80B56498 -/* 030CC 80B5647C AFBF001C */ sw $ra, 0x001C($sp) -/* 030D0 80B56480 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 030D4 80B56484 24A514DC */ addiu $a1, $a1, 0x14DC ## $a1 = 060014DC -/* 030D8 80B56488 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 030DC 80B5648C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 030E0 80B56490 0C2D5385 */ jal func_80B54E14 -/* 030E4 80B56494 AFA00010 */ sw $zero, 0x0010($sp) -.L80B56498: -/* 030E8 80B56498 8FBF001C */ lw $ra, 0x001C($sp) -/* 030EC 80B5649C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 030F0 80B564A0 03E00008 */ jr $ra -/* 030F4 80B564A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B564A8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B564A8.s deleted file mode 100644 index 29784c0902..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B564A8.s +++ /dev/null @@ -1,157 +0,0 @@ -.rdata -glabel D_80B5A764 - .asciz "En_Zl3_inFinal2_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -.late_rodata -glabel jtbl_80B5AB48 -.word L80B56544 -.word L80B56554 -.word L80B56564 -.word L80B56574 -.word L80B56584 -.word L80B56594 -.word L80B565A4 -.word L80B565B4 -.word L80B565C4 -.word L80B565D4 -.word L80B565E4 -.word L80B565F4 -.word L80B56604 -.word L80B56614 -.word L80B56624 - -.text -glabel func_80B564A8 -/* 030F8 80B564A8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 030FC 80B564AC AFBF001C */ sw $ra, 0x001C($sp) -/* 03100 80B564B0 AFB00018 */ sw $s0, 0x0018($sp) -/* 03104 80B564B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03108 80B564B8 0C2D4E5B */ jal func_80B5396C -/* 0310C 80B564BC AFA5002C */ sw $a1, 0x002C($sp) -/* 03110 80B564C0 3C0380B6 */ lui $v1, %hi(D_80B5A494) ## $v1 = 80B60000 -/* 03114 80B564C4 8C63A494 */ lw $v1, %lo(D_80B5A494)($v1) -/* 03118 80B564C8 AFA20024 */ sw $v0, 0x0024($sp) -/* 0311C 80B564CC 3C0180B6 */ lui $at, %hi(D_80B5A494) ## $at = 80B60000 -/* 03120 80B564D0 18600004 */ blez $v1, .L80B564E4 -/* 03124 80B564D4 00000000 */ nop -/* 03128 80B564D8 2463FFFF */ addiu $v1, $v1, 0xFFFF ## $v1 = 80B5FFFF -/* 0312C 80B564DC 1000000A */ beq $zero, $zero, .L80B56508 -/* 03130 80B564E0 AC23A494 */ sw $v1, %lo(D_80B5A494)($at) -.L80B564E4: -/* 03134 80B564E4 14600008 */ bne $v1, $zero, .L80B56508 -/* 03138 80B564E8 3C0180B6 */ lui $at, %hi(D_80B5A494) ## $at = 80B60000 -/* 0313C 80B564EC 2463FFFF */ addiu $v1, $v1, 0xFFFF ## $v1 = 80B5FFFE -/* 03140 80B564F0 AC23A494 */ sw $v1, %lo(D_80B5A494)($at) -/* 03144 80B564F4 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 03148 80B564F8 54410004 */ bnel $v0, $at, .L80B5650C -/* 0314C 80B564FC 8FAE0024 */ lw $t6, 0x0024($sp) -/* 03150 80B56500 0C2D5813 */ jal func_80B5604C -/* 03154 80B56504 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B56508: -/* 03158 80B56508 8FAE0024 */ lw $t6, 0x0024($sp) -.L80B5650C: -/* 0315C 80B5650C 05C2004E */ bltzl $t6, .L80B56648 -/* 03160 80B56510 8FBF001C */ lw $ra, 0x001C($sp) -/* 03164 80B56514 8E0202F0 */ lw $v0, 0x02F0($s0) ## 000002F0 -/* 03168 80B56518 2DC1000F */ sltiu $at, $t6, 0x000F -/* 0316C 80B5651C 51C2004A */ beql $t6, $v0, .L80B56648 -/* 03170 80B56520 8FBF001C */ lw $ra, 0x001C($sp) -/* 03174 80B56524 10200043 */ beq $at, $zero, .L80B56634 -/* 03178 80B56528 3C0480B6 */ lui $a0, %hi(D_80B5A764) ## $a0 = 80B60000 -/* 0317C 80B5652C 000E7880 */ sll $t7, $t6, 2 -/* 03180 80B56530 3C0180B6 */ lui $at, %hi(jtbl_80B5AB48) ## $at = 80B60000 -/* 03184 80B56534 002F0821 */ addu $at, $at, $t7 -/* 03188 80B56538 8C2FAB48 */ lw $t7, %lo(jtbl_80B5AB48)($at) -/* 0318C 80B5653C 01E00008 */ jr $t7 -/* 03190 80B56540 00000000 */ nop -glabel L80B56544 -/* 03194 80B56544 0C2D56A1 */ jal func_80B55A84 -/* 03198 80B56548 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0319C 80B5654C 1000003C */ beq $zero, $zero, .L80B56640 -/* 031A0 80B56550 8FB80024 */ lw $t8, 0x0024($sp) -glabel L80B56554 -/* 031A4 80B56554 0C2D56B1 */ jal func_80B55AC4 -/* 031A8 80B56558 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031AC 80B5655C 10000038 */ beq $zero, $zero, .L80B56640 -/* 031B0 80B56560 8FB80024 */ lw $t8, 0x0024($sp) -glabel L80B56564 -/* 031B4 80B56564 0C2D56CE */ jal func_80B55B38 -/* 031B8 80B56568 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031BC 80B5656C 10000034 */ beq $zero, $zero, .L80B56640 -/* 031C0 80B56570 8FB80024 */ lw $t8, 0x0024($sp) -glabel L80B56574 -/* 031C4 80B56574 0C2D56EB */ jal func_80B55BAC -/* 031C8 80B56578 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031CC 80B5657C 10000030 */ beq $zero, $zero, .L80B56640 -/* 031D0 80B56580 8FB80024 */ lw $t8, 0x0024($sp) -glabel L80B56584 -/* 031D4 80B56584 0C2D571C */ jal func_80B55C70 -/* 031D8 80B56588 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031DC 80B5658C 1000002C */ beq $zero, $zero, .L80B56640 -/* 031E0 80B56590 8FB80024 */ lw $t8, 0x0024($sp) -glabel L80B56594 -/* 031E4 80B56594 0C2D5782 */ jal func_80B55E08 -/* 031E8 80B56598 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031EC 80B5659C 10000028 */ beq $zero, $zero, .L80B56640 -/* 031F0 80B565A0 8FB80024 */ lw $t8, 0x0024($sp) -glabel L80B565A4 -/* 031F4 80B565A4 0C2D579F */ jal func_80B55E7C -/* 031F8 80B565A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031FC 80B565AC 10000024 */ beq $zero, $zero, .L80B56640 -/* 03200 80B565B0 8FB80024 */ lw $t8, 0x0024($sp) -glabel L80B565B4 -/* 03204 80B565B4 0C2D57BC */ jal func_80B55EF0 -/* 03208 80B565B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0320C 80B565BC 10000020 */ beq $zero, $zero, .L80B56640 -/* 03210 80B565C0 8FB80024 */ lw $t8, 0x0024($sp) -glabel L80B565C4 -/* 03214 80B565C4 2403000A */ addiu $v1, $zero, 0x000A ## $v1 = 0000000A -/* 03218 80B565C8 3C0180B6 */ lui $at, %hi(D_80B5A494) ## $at = 80B60000 -/* 0321C 80B565CC 1000001B */ beq $zero, $zero, .L80B5663C -/* 03220 80B565D0 AC23A494 */ sw $v1, %lo(D_80B5A494)($at) -glabel L80B565D4 -/* 03224 80B565D4 0C2D5858 */ jal func_80B56160 -/* 03228 80B565D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0322C 80B565DC 10000018 */ beq $zero, $zero, .L80B56640 -/* 03230 80B565E0 8FB80024 */ lw $t8, 0x0024($sp) -glabel L80B565E4 -/* 03234 80B565E4 0C2D5868 */ jal func_80B561A0 -/* 03238 80B565E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0323C 80B565EC 10000014 */ beq $zero, $zero, .L80B56640 -/* 03240 80B565F0 8FB80024 */ lw $t8, 0x0024($sp) -glabel L80B565F4 -/* 03244 80B565F4 0C2D58D3 */ jal func_80B5634C -/* 03248 80B565F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0324C 80B565FC 10000010 */ beq $zero, $zero, .L80B56640 -/* 03250 80B56600 8FB80024 */ lw $t8, 0x0024($sp) -glabel L80B56604 -/* 03254 80B56604 0C2D58F0 */ jal func_80B563C0 -/* 03258 80B56608 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0325C 80B5660C 1000000C */ beq $zero, $zero, .L80B56640 -/* 03260 80B56610 8FB80024 */ lw $t8, 0x0024($sp) -glabel L80B56614 -/* 03264 80B56614 0C2D590D */ jal func_80B56434 -/* 03268 80B56618 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0326C 80B5661C 10000008 */ beq $zero, $zero, .L80B56640 -/* 03270 80B56620 8FB80024 */ lw $t8, 0x0024($sp) -glabel L80B56624 -/* 03274 80B56624 0C00B55C */ jal Actor_Kill - -/* 03278 80B56628 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0327C 80B5662C 10000004 */ beq $zero, $zero, .L80B56640 -/* 03280 80B56630 8FB80024 */ lw $t8, 0x0024($sp) -.L80B56634: -/* 03284 80B56634 0C00084C */ jal osSyncPrintf - -/* 03288 80B56638 2484A764 */ addiu $a0, $a0, %lo(D_80B5A764) ## $a0 = FFFFA764 -.L80B5663C: -/* 0328C 80B5663C 8FB80024 */ lw $t8, 0x0024($sp) -.L80B56640: -/* 03290 80B56640 AE1802F0 */ sw $t8, 0x02F0($s0) ## 000002F0 -/* 03294 80B56644 8FBF001C */ lw $ra, 0x001C($sp) -.L80B56648: -/* 03298 80B56648 8FB00018 */ lw $s0, 0x0018($sp) -/* 0329C 80B5664C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 032A0 80B56650 03E00008 */ jr $ra -/* 032A4 80B56654 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56658.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56658.s deleted file mode 100644 index 5200a283d5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56658.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B56658 -/* 032A8 80B56658 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 032AC 80B5665C AFBF001C */ sw $ra, 0x001C($sp) -/* 032B0 80B56660 AFB00018 */ sw $s0, 0x0018($sp) -/* 032B4 80B56664 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 032B8 80B56668 0C2D5378 */ jal func_80B54DE0 -/* 032BC 80B5666C AFA50024 */ sw $a1, 0x0024($sp) -/* 032C0 80B56670 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 032C4 80B56674 0C2D4D9B */ jal func_80B5366C -/* 032C8 80B56678 8FA50024 */ lw $a1, 0x0024($sp) -/* 032CC 80B5667C 0C2D4D33 */ jal func_80B534CC -/* 032D0 80B56680 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 032D4 80B56684 0C2D4E53 */ jal func_80B5394C -/* 032D8 80B56688 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 032DC 80B5668C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 032E0 80B56690 0C2D592A */ jal func_80B564A8 -/* 032E4 80B56694 8FA50024 */ lw $a1, 0x0024($sp) -/* 032E8 80B56698 8FBF001C */ lw $ra, 0x001C($sp) -/* 032EC 80B5669C 8FB00018 */ lw $s0, 0x0018($sp) -/* 032F0 80B566A0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 032F4 80B566A4 03E00008 */ jr $ra -/* 032F8 80B566A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B566AC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B566AC.s deleted file mode 100644 index 855ac93416..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B566AC.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B566AC -/* 032FC 80B566AC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03300 80B566B0 AFBF001C */ sw $ra, 0x001C($sp) -/* 03304 80B566B4 AFB00018 */ sw $s0, 0x0018($sp) -/* 03308 80B566B8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0330C 80B566BC 0C2D5378 */ jal func_80B54DE0 -/* 03310 80B566C0 AFA50024 */ sw $a1, 0x0024($sp) -/* 03314 80B566C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03318 80B566C8 0C2D4D9B */ jal func_80B5366C -/* 0331C 80B566CC 8FA50024 */ lw $a1, 0x0024($sp) -/* 03320 80B566D0 0C2D4D33 */ jal func_80B534CC -/* 03324 80B566D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03328 80B566D8 0C2D4E53 */ jal func_80B5394C -/* 0332C 80B566DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03330 80B566E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03334 80B566E4 0C2D56C1 */ jal func_80B55B04 -/* 03338 80B566E8 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 0333C 80B566EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03340 80B566F0 0C2D592A */ jal func_80B564A8 -/* 03344 80B566F4 8FA50024 */ lw $a1, 0x0024($sp) -/* 03348 80B566F8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0334C 80B566FC 8FB00018 */ lw $s0, 0x0018($sp) -/* 03350 80B56700 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03354 80B56704 03E00008 */ jr $ra -/* 03358 80B56708 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5670C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5670C.s deleted file mode 100644 index 51c70dbb43..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5670C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B5670C -/* 0335C 80B5670C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03360 80B56710 AFBF001C */ sw $ra, 0x001C($sp) -/* 03364 80B56714 AFB00018 */ sw $s0, 0x0018($sp) -/* 03368 80B56718 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0336C 80B5671C 0C2D5378 */ jal func_80B54DE0 -/* 03370 80B56720 AFA50024 */ sw $a1, 0x0024($sp) -/* 03374 80B56724 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03378 80B56728 0C2D4D9B */ jal func_80B5366C -/* 0337C 80B5672C 8FA50024 */ lw $a1, 0x0024($sp) -/* 03380 80B56730 0C2D4D33 */ jal func_80B534CC -/* 03384 80B56734 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03388 80B56738 0C2D4E53 */ jal func_80B5394C -/* 0338C 80B5673C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03390 80B56740 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03394 80B56744 0C2D56DE */ jal func_80B55B78 -/* 03398 80B56748 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 0339C 80B5674C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 033A0 80B56750 0C2D592A */ jal func_80B564A8 -/* 033A4 80B56754 8FA50024 */ lw $a1, 0x0024($sp) -/* 033A8 80B56758 8FBF001C */ lw $ra, 0x001C($sp) -/* 033AC 80B5675C 8FB00018 */ lw $s0, 0x0018($sp) -/* 033B0 80B56760 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 033B4 80B56764 03E00008 */ jr $ra -/* 033B8 80B56768 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5676C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5676C.s deleted file mode 100644 index ec83f1fc8a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5676C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B5676C -/* 033BC 80B5676C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 033C0 80B56770 AFBF001C */ sw $ra, 0x001C($sp) -/* 033C4 80B56774 AFB00018 */ sw $s0, 0x0018($sp) -/* 033C8 80B56778 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 033CC 80B5677C 0C2D5378 */ jal func_80B54DE0 -/* 033D0 80B56780 AFA5002C */ sw $a1, 0x002C($sp) -/* 033D4 80B56784 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 033D8 80B56788 0C2D4D9B */ jal func_80B5366C -/* 033DC 80B5678C 8FA5002C */ lw $a1, 0x002C($sp) -/* 033E0 80B56790 0C2D4D33 */ jal func_80B534CC -/* 033E4 80B56794 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 033E8 80B56798 0C2D4E53 */ jal func_80B5394C -/* 033EC 80B5679C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 033F0 80B567A0 AFA20024 */ sw $v0, 0x0024($sp) -/* 033F4 80B567A4 0C2D5671 */ jal func_80B559C4 -/* 033F8 80B567A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 033FC 80B567AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03400 80B567B0 0C2D5713 */ jal func_80B55C4C -/* 03404 80B567B4 8FA50024 */ lw $a1, 0x0024($sp) -/* 03408 80B567B8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0340C 80B567BC 8FB00018 */ lw $s0, 0x0018($sp) -/* 03410 80B567C0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03414 80B567C4 03E00008 */ jr $ra -/* 03418 80B567C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B567CC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B567CC.s deleted file mode 100644 index ad490ed294..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B567CC.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B567CC -/* 0341C 80B567CC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03420 80B567D0 AFBF001C */ sw $ra, 0x001C($sp) -/* 03424 80B567D4 AFB00018 */ sw $s0, 0x0018($sp) -/* 03428 80B567D8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0342C 80B567DC 0C2D5378 */ jal func_80B54DE0 -/* 03430 80B567E0 AFA50024 */ sw $a1, 0x0024($sp) -/* 03434 80B567E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03438 80B567E8 0C2D4CFF */ jal func_80B533FC -/* 0343C 80B567EC 8FA50024 */ lw $a1, 0x0024($sp) -/* 03440 80B567F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03444 80B567F4 0C2D4D9B */ jal func_80B5366C -/* 03448 80B567F8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0344C 80B567FC 0C2D4D33 */ jal func_80B534CC -/* 03450 80B56800 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03454 80B56804 0C2D4E53 */ jal func_80B5394C -/* 03458 80B56808 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0345C 80B5680C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03460 80B56810 0C2D592A */ jal func_80B564A8 -/* 03464 80B56814 8FA50024 */ lw $a1, 0x0024($sp) -/* 03468 80B56818 8FBF001C */ lw $ra, 0x001C($sp) -/* 0346C 80B5681C 8FB00018 */ lw $s0, 0x0018($sp) -/* 03470 80B56820 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03474 80B56824 03E00008 */ jr $ra -/* 03478 80B56828 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5682C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5682C.s deleted file mode 100644 index 0f42e8773b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5682C.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80B5682C -/* 0347C 80B5682C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03480 80B56830 AFBF001C */ sw $ra, 0x001C($sp) -/* 03484 80B56834 AFB10018 */ sw $s1, 0x0018($sp) -/* 03488 80B56838 AFB00014 */ sw $s0, 0x0014($sp) -/* 0348C 80B5683C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03490 80B56840 0C2D5378 */ jal func_80B54DE0 -/* 03494 80B56844 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 03498 80B56848 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0349C 80B5684C 0C2D5696 */ jal func_80B55A58 -/* 034A0 80B56850 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 034A4 80B56854 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 034A8 80B56858 0C2D4CFF */ jal func_80B533FC -/* 034AC 80B5685C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 034B0 80B56860 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 034B4 80B56864 0C2D4D9B */ jal func_80B5366C -/* 034B8 80B56868 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 034BC 80B5686C 0C2D4D33 */ jal func_80B534CC -/* 034C0 80B56870 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 034C4 80B56874 0C2D4E53 */ jal func_80B5394C -/* 034C8 80B56878 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 034CC 80B5687C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 034D0 80B56880 0C2D5733 */ jal func_80B55CCC -/* 034D4 80B56884 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 034D8 80B56888 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 034DC 80B5688C 0C2D592A */ jal func_80B564A8 -/* 034E0 80B56890 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 034E4 80B56894 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 034E8 80B56898 0C2D5740 */ jal func_80B55D00 -/* 034EC 80B5689C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 034F0 80B568A0 8FBF001C */ lw $ra, 0x001C($sp) -/* 034F4 80B568A4 8FB00014 */ lw $s0, 0x0014($sp) -/* 034F8 80B568A8 8FB10018 */ lw $s1, 0x0018($sp) -/* 034FC 80B568AC 03E00008 */ jr $ra -/* 03500 80B568B0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B568B4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B568B4.s deleted file mode 100644 index 8da7121b20..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B568B4.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80B568B4 -/* 03504 80B568B4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03508 80B568B8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0350C 80B568BC AFB00018 */ sw $s0, 0x0018($sp) -/* 03510 80B568C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03514 80B568C4 0C2D5378 */ jal func_80B54DE0 -/* 03518 80B568C8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0351C 80B568CC 0C2D4DFA */ jal func_80B537E8 -/* 03520 80B568D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03524 80B568D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03528 80B568D8 0C2D4CFF */ jal func_80B533FC -/* 0352C 80B568DC 8FA50024 */ lw $a1, 0x0024($sp) -/* 03530 80B568E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03534 80B568E4 0C2D4D9B */ jal func_80B5366C -/* 03538 80B568E8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0353C 80B568EC 0C2D4D33 */ jal func_80B534CC -/* 03540 80B568F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03544 80B568F4 0C2D4E53 */ jal func_80B5394C -/* 03548 80B568F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0354C 80B568FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03550 80B56900 0C2D576C */ jal func_80B55DB0 -/* 03554 80B56904 8FA50024 */ lw $a1, 0x0024($sp) -/* 03558 80B56908 8FBF001C */ lw $ra, 0x001C($sp) -/* 0355C 80B5690C 8FB00018 */ lw $s0, 0x0018($sp) -/* 03560 80B56910 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03564 80B56914 03E00008 */ jr $ra -/* 03568 80B56918 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5691C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5691C.s deleted file mode 100644 index 1b2f994756..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5691C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B5691C -/* 0356C 80B5691C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03570 80B56920 AFBF001C */ sw $ra, 0x001C($sp) -/* 03574 80B56924 AFB00018 */ sw $s0, 0x0018($sp) -/* 03578 80B56928 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0357C 80B5692C 0C2D5378 */ jal func_80B54DE0 -/* 03580 80B56930 AFA50024 */ sw $a1, 0x0024($sp) -/* 03584 80B56934 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03588 80B56938 0C2D4D9B */ jal func_80B5366C -/* 0358C 80B5693C 8FA50024 */ lw $a1, 0x0024($sp) -/* 03590 80B56940 0C2D4D33 */ jal func_80B534CC -/* 03594 80B56944 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03598 80B56948 0C2D4E53 */ jal func_80B5394C -/* 0359C 80B5694C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 035A0 80B56950 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 035A4 80B56954 0C2D5792 */ jal func_80B55E48 -/* 035A8 80B56958 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 035AC 80B5695C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 035B0 80B56960 0C2D592A */ jal func_80B564A8 -/* 035B4 80B56964 8FA50024 */ lw $a1, 0x0024($sp) -/* 035B8 80B56968 8FBF001C */ lw $ra, 0x001C($sp) -/* 035BC 80B5696C 8FB00018 */ lw $s0, 0x0018($sp) -/* 035C0 80B56970 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 035C4 80B56974 03E00008 */ jr $ra -/* 035C8 80B56978 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5697C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5697C.s deleted file mode 100644 index 862ad4e3ab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5697C.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80B5697C -/* 035CC 80B5697C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 035D0 80B56980 AFBF001C */ sw $ra, 0x001C($sp) -/* 035D4 80B56984 AFB00018 */ sw $s0, 0x0018($sp) -/* 035D8 80B56988 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 035DC 80B5698C 0C2D5378 */ jal func_80B54DE0 -/* 035E0 80B56990 AFA50024 */ sw $a1, 0x0024($sp) -/* 035E4 80B56994 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 035E8 80B56998 0C2D4D9B */ jal func_80B5366C -/* 035EC 80B5699C 8FA50024 */ lw $a1, 0x0024($sp) -/* 035F0 80B569A0 0C2D4D33 */ jal func_80B534CC -/* 035F4 80B569A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 035F8 80B569A8 0C2D4E53 */ jal func_80B5394C -/* 035FC 80B569AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03600 80B569B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03604 80B569B4 0C2D57AF */ jal func_80B55EBC -/* 03608 80B569B8 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 0360C 80B569BC 0C2D5617 */ jal func_80B5585C -/* 03610 80B569C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03614 80B569C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03618 80B569C8 0C2D592A */ jal func_80B564A8 -/* 0361C 80B569CC 8FA50024 */ lw $a1, 0x0024($sp) -/* 03620 80B569D0 8FBF001C */ lw $ra, 0x001C($sp) -/* 03624 80B569D4 8FB00018 */ lw $s0, 0x0018($sp) -/* 03628 80B569D8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0362C 80B569DC 03E00008 */ jr $ra -/* 03630 80B569E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B569E4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B569E4.s deleted file mode 100644 index eb0ce887b7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B569E4.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80B569E4 -/* 03634 80B569E4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03638 80B569E8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0363C 80B569EC AFB10018 */ sw $s1, 0x0018($sp) -/* 03640 80B569F0 AFB00014 */ sw $s0, 0x0014($sp) -/* 03644 80B569F4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03648 80B569F8 0C2D5378 */ jal func_80B54DE0 -/* 0364C 80B569FC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 03650 80B56A00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03654 80B56A04 0C2D4CFF */ jal func_80B533FC -/* 03658 80B56A08 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0365C 80B56A0C 0C2D4DFA */ jal func_80B537E8 -/* 03660 80B56A10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03664 80B56A14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03668 80B56A18 0C2D4D9B */ jal func_80B5366C -/* 0366C 80B56A1C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03670 80B56A20 0C2D4D33 */ jal func_80B534CC -/* 03674 80B56A24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03678 80B56A28 0C2D4E53 */ jal func_80B5394C -/* 0367C 80B56A2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03680 80B56A30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03684 80B56A34 0C2D57CE */ jal func_80B55F38 -/* 03688 80B56A38 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 0368C 80B56A3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03690 80B56A40 0C2D592A */ jal func_80B564A8 -/* 03694 80B56A44 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03698 80B56A48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0369C 80B56A4C 0C2D57DB */ jal func_80B55F6C -/* 036A0 80B56A50 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 036A4 80B56A54 8FBF001C */ lw $ra, 0x001C($sp) -/* 036A8 80B56A58 8FB00014 */ lw $s0, 0x0014($sp) -/* 036AC 80B56A5C 8FB10018 */ lw $s1, 0x0018($sp) -/* 036B0 80B56A60 03E00008 */ jr $ra -/* 036B4 80B56A64 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56A68.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56A68.s deleted file mode 100644 index 32a9d36664..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56A68.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80B56A68 -/* 036B8 80B56A68 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 036BC 80B56A6C AFBF001C */ sw $ra, 0x001C($sp) -/* 036C0 80B56A70 AFB00018 */ sw $s0, 0x0018($sp) -/* 036C4 80B56A74 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 036C8 80B56A78 0C2D5378 */ jal func_80B54DE0 -/* 036CC 80B56A7C AFA5002C */ sw $a1, 0x002C($sp) -/* 036D0 80B56A80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 036D4 80B56A84 0C2D4CFF */ jal func_80B533FC -/* 036D8 80B56A88 8FA5002C */ lw $a1, 0x002C($sp) -/* 036DC 80B56A8C 0C2D4DFA */ jal func_80B537E8 -/* 036E0 80B56A90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 036E4 80B56A94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 036E8 80B56A98 0C2D4D9B */ jal func_80B5366C -/* 036EC 80B56A9C 8FA5002C */ lw $a1, 0x002C($sp) -/* 036F0 80B56AA0 0C2D4D33 */ jal func_80B534CC -/* 036F4 80B56AA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 036F8 80B56AA8 0C2D4E53 */ jal func_80B5394C -/* 036FC 80B56AAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03700 80B56AB0 AFA20024 */ sw $v0, 0x0024($sp) -/* 03704 80B56AB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03708 80B56AB8 0C2D592A */ jal func_80B564A8 -/* 0370C 80B56ABC 8FA5002C */ lw $a1, 0x002C($sp) -/* 03710 80B56AC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03714 80B56AC4 0C2D5824 */ jal func_80B56090 -/* 03718 80B56AC8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0371C 80B56ACC 8FBF001C */ lw $ra, 0x001C($sp) -/* 03720 80B56AD0 8FB00018 */ lw $s0, 0x0018($sp) -/* 03724 80B56AD4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03728 80B56AD8 03E00008 */ jr $ra -/* 0372C 80B56ADC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56AE0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56AE0.s deleted file mode 100644 index 88f221bedc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56AE0.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80B56AE0 -/* 03730 80B56AE0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03734 80B56AE4 AFBF001C */ sw $ra, 0x001C($sp) -/* 03738 80B56AE8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0373C 80B56AEC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03740 80B56AF0 0C2D5378 */ jal func_80B54DE0 -/* 03744 80B56AF4 AFA50024 */ sw $a1, 0x0024($sp) -/* 03748 80B56AF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0374C 80B56AFC 0C2D4CFF */ jal func_80B533FC -/* 03750 80B56B00 8FA50024 */ lw $a1, 0x0024($sp) -/* 03754 80B56B04 0C2D4DFA */ jal func_80B537E8 -/* 03758 80B56B08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0375C 80B56B0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03760 80B56B10 0C2D4D9B */ jal func_80B5366C -/* 03764 80B56B14 8FA50024 */ lw $a1, 0x0024($sp) -/* 03768 80B56B18 0C2D4D33 */ jal func_80B534CC -/* 0376C 80B56B1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03770 80B56B20 0C2D4E53 */ jal func_80B5394C -/* 03774 80B56B24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03778 80B56B28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0377C 80B56B2C 0C2D57CE */ jal func_80B55F38 -/* 03780 80B56B30 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 03784 80B56B34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03788 80B56B38 0C2D5842 */ jal func_80B56108 -/* 0378C 80B56B3C 8FA50024 */ lw $a1, 0x0024($sp) -/* 03790 80B56B40 8FBF001C */ lw $ra, 0x001C($sp) -/* 03794 80B56B44 8FB00018 */ lw $s0, 0x0018($sp) -/* 03798 80B56B48 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0379C 80B56B4C 03E00008 */ jr $ra -/* 037A0 80B56B50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56B54.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56B54.s deleted file mode 100644 index e7f7de3e28..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56B54.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B56B54 -/* 037A4 80B56B54 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 037A8 80B56B58 AFBF001C */ sw $ra, 0x001C($sp) -/* 037AC 80B56B5C AFB00018 */ sw $s0, 0x0018($sp) -/* 037B0 80B56B60 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 037B4 80B56B64 0C2D5378 */ jal func_80B54DE0 -/* 037B8 80B56B68 AFA50024 */ sw $a1, 0x0024($sp) -/* 037BC 80B56B6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 037C0 80B56B70 0C2D4D9B */ jal func_80B5366C -/* 037C4 80B56B74 8FA50024 */ lw $a1, 0x0024($sp) -/* 037C8 80B56B78 0C2D4D33 */ jal func_80B534CC -/* 037CC 80B56B7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 037D0 80B56B80 0C2D4E53 */ jal func_80B5394C -/* 037D4 80B56B84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 037D8 80B56B88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 037DC 80B56B8C 0C2D592A */ jal func_80B564A8 -/* 037E0 80B56B90 8FA50024 */ lw $a1, 0x0024($sp) -/* 037E4 80B56B94 8FBF001C */ lw $ra, 0x001C($sp) -/* 037E8 80B56B98 8FB00018 */ lw $s0, 0x0018($sp) -/* 037EC 80B56B9C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 037F0 80B56BA0 03E00008 */ jr $ra -/* 037F4 80B56BA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56BA8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56BA8.s deleted file mode 100644 index 69d2a05e4b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56BA8.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80B56BA8 -/* 037F8 80B56BA8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 037FC 80B56BAC AFBF001C */ sw $ra, 0x001C($sp) -/* 03800 80B56BB0 AFB10018 */ sw $s1, 0x0018($sp) -/* 03804 80B56BB4 AFB00014 */ sw $s0, 0x0014($sp) -/* 03808 80B56BB8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0380C 80B56BBC 0C2D5378 */ jal func_80B54DE0 -/* 03810 80B56BC0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 03814 80B56BC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03818 80B56BC8 0C2D4CFF */ jal func_80B533FC -/* 0381C 80B56BCC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03820 80B56BD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03824 80B56BD4 0C2D4D9B */ jal func_80B5366C -/* 03828 80B56BD8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0382C 80B56BDC 0C2D4D33 */ jal func_80B534CC -/* 03830 80B56BE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03834 80B56BE4 0C2D4E53 */ jal func_80B5394C -/* 03838 80B56BE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0383C 80B56BEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03840 80B56BF0 0C2D5878 */ jal func_80B561E0 -/* 03844 80B56BF4 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 03848 80B56BF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0384C 80B56BFC 0C2D592A */ jal func_80B564A8 -/* 03850 80B56C00 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03854 80B56C04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03858 80B56C08 0C2D5885 */ jal func_80B56214 -/* 0385C 80B56C0C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03860 80B56C10 8FBF001C */ lw $ra, 0x001C($sp) -/* 03864 80B56C14 8FB00014 */ lw $s0, 0x0014($sp) -/* 03868 80B56C18 8FB10018 */ lw $s1, 0x0018($sp) -/* 0386C 80B56C1C 03E00008 */ jr $ra -/* 03870 80B56C20 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56C24.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56C24.s deleted file mode 100644 index f0854e74fa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56C24.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B56C24 -/* 03874 80B56C24 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03878 80B56C28 AFBF001C */ sw $ra, 0x001C($sp) -/* 0387C 80B56C2C AFB00018 */ sw $s0, 0x0018($sp) -/* 03880 80B56C30 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03884 80B56C34 0C2D5378 */ jal func_80B54DE0 -/* 03888 80B56C38 AFA50024 */ sw $a1, 0x0024($sp) -/* 0388C 80B56C3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03890 80B56C40 0C2D4CFF */ jal func_80B533FC -/* 03894 80B56C44 8FA50024 */ lw $a1, 0x0024($sp) -/* 03898 80B56C48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0389C 80B56C4C 0C2D4D9B */ jal func_80B5366C -/* 038A0 80B56C50 8FA50024 */ lw $a1, 0x0024($sp) -/* 038A4 80B56C54 0C2D4D33 */ jal func_80B534CC -/* 038A8 80B56C58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 038AC 80B56C5C 0C2D4E53 */ jal func_80B5394C -/* 038B0 80B56C60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 038B4 80B56C64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 038B8 80B56C68 0C2D58BD */ jal func_80B562F4 -/* 038BC 80B56C6C 8FA50024 */ lw $a1, 0x0024($sp) -/* 038C0 80B56C70 8FBF001C */ lw $ra, 0x001C($sp) -/* 038C4 80B56C74 8FB00018 */ lw $s0, 0x0018($sp) -/* 038C8 80B56C78 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 038CC 80B56C7C 03E00008 */ jr $ra -/* 038D0 80B56C80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56C84.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56C84.s deleted file mode 100644 index 2885e11335..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56C84.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B56C84 -/* 038D4 80B56C84 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 038D8 80B56C88 AFBF001C */ sw $ra, 0x001C($sp) -/* 038DC 80B56C8C AFB00018 */ sw $s0, 0x0018($sp) -/* 038E0 80B56C90 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 038E4 80B56C94 0C2D5378 */ jal func_80B54DE0 -/* 038E8 80B56C98 AFA50024 */ sw $a1, 0x0024($sp) -/* 038EC 80B56C9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 038F0 80B56CA0 0C2D4D9B */ jal func_80B5366C -/* 038F4 80B56CA4 8FA50024 */ lw $a1, 0x0024($sp) -/* 038F8 80B56CA8 0C2D4D33 */ jal func_80B534CC -/* 038FC 80B56CAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03900 80B56CB0 0C2D4E53 */ jal func_80B5394C -/* 03904 80B56CB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03908 80B56CB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0390C 80B56CBC 0C2D58E3 */ jal func_80B5638C -/* 03910 80B56CC0 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 03914 80B56CC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03918 80B56CC8 0C2D592A */ jal func_80B564A8 -/* 0391C 80B56CCC 8FA50024 */ lw $a1, 0x0024($sp) -/* 03920 80B56CD0 8FBF001C */ lw $ra, 0x001C($sp) -/* 03924 80B56CD4 8FB00018 */ lw $s0, 0x0018($sp) -/* 03928 80B56CD8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0392C 80B56CDC 03E00008 */ jr $ra -/* 03930 80B56CE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56CE4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56CE4.s deleted file mode 100644 index a72c73ae87..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56CE4.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B56CE4 -/* 03934 80B56CE4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03938 80B56CE8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0393C 80B56CEC AFB00018 */ sw $s0, 0x0018($sp) -/* 03940 80B56CF0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03944 80B56CF4 0C2D5378 */ jal func_80B54DE0 -/* 03948 80B56CF8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0394C 80B56CFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03950 80B56D00 0C2D4D9B */ jal func_80B5366C -/* 03954 80B56D04 8FA50024 */ lw $a1, 0x0024($sp) -/* 03958 80B56D08 0C2D4D33 */ jal func_80B534CC -/* 0395C 80B56D0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03960 80B56D10 0C2D4E53 */ jal func_80B5394C -/* 03964 80B56D14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03968 80B56D18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0396C 80B56D1C 0C2D5900 */ jal func_80B56400 -/* 03970 80B56D20 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 03974 80B56D24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03978 80B56D28 0C2D592A */ jal func_80B564A8 -/* 0397C 80B56D2C 8FA50024 */ lw $a1, 0x0024($sp) -/* 03980 80B56D30 8FBF001C */ lw $ra, 0x001C($sp) -/* 03984 80B56D34 8FB00018 */ lw $s0, 0x0018($sp) -/* 03988 80B56D38 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0398C 80B56D3C 03E00008 */ jr $ra -/* 03990 80B56D40 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56D44.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56D44.s deleted file mode 100644 index a6117a4873..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56D44.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B56D44 -/* 03994 80B56D44 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03998 80B56D48 AFBF001C */ sw $ra, 0x001C($sp) -/* 0399C 80B56D4C AFB00018 */ sw $s0, 0x0018($sp) -/* 039A0 80B56D50 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 039A4 80B56D54 0C2D5378 */ jal func_80B54DE0 -/* 039A8 80B56D58 AFA50024 */ sw $a1, 0x0024($sp) -/* 039AC 80B56D5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 039B0 80B56D60 0C2D4D9B */ jal func_80B5366C -/* 039B4 80B56D64 8FA50024 */ lw $a1, 0x0024($sp) -/* 039B8 80B56D68 0C2D4D33 */ jal func_80B534CC -/* 039BC 80B56D6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 039C0 80B56D70 0C2D4E53 */ jal func_80B5394C -/* 039C4 80B56D74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 039C8 80B56D78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 039CC 80B56D7C 0C2D591D */ jal func_80B56474 -/* 039D0 80B56D80 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 039D4 80B56D84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 039D8 80B56D88 0C2D592A */ jal func_80B564A8 -/* 039DC 80B56D8C 8FA50024 */ lw $a1, 0x0024($sp) -/* 039E0 80B56D90 8FBF001C */ lw $ra, 0x001C($sp) -/* 039E4 80B56D94 8FB00018 */ lw $s0, 0x0018($sp) -/* 039E8 80B56D98 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 039EC 80B56D9C 03E00008 */ jr $ra -/* 039F0 80B56DA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56DA4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56DA4.s deleted file mode 100644 index 222e8b4347..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56DA4.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B56DA4 -/* 039F4 80B56DA4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 039F8 80B56DA8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 039FC 80B56DAC AFA40018 */ sw $a0, 0x0018($sp) -/* 03A00 80B56DB0 0C01E233 */ jal func_800788CC -/* 03A04 80B56DB4 240428D9 */ addiu $a0, $zero, 0x28D9 ## $a0 = 000028D9 -/* 03A08 80B56DB8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03A0C 80B56DBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03A10 80B56DC0 03E00008 */ jr $ra -/* 03A14 80B56DC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56DC8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56DC8.s deleted file mode 100644 index ba077f4905..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56DC8.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B56DC8 -/* 03A18 80B56DC8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03A1C 80B56DCC AFBF0014 */ sw $ra, 0x0014($sp) -/* 03A20 80B56DD0 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 03A24 80B56DD4 0C01E245 */ jal func_80078914 -/* 03A28 80B56DD8 24056879 */ addiu $a1, $zero, 0x6879 ## $a1 = 00006879 -/* 03A2C 80B56DDC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03A30 80B56DE0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03A34 80B56DE4 03E00008 */ jr $ra -/* 03A38 80B56DE8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56DEC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56DEC.s deleted file mode 100644 index 1f53646c79..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56DEC.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80B56DEC -/* 03A3C 80B56DEC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03A40 80B56DF0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03A44 80B56DF4 908E014D */ lbu $t6, 0x014D($a0) ## 0000014D -/* 03A48 80B56DF8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 03A4C 80B56DFC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 03A50 80B56E00 15C10009 */ bne $t6, $at, .L80B56E28 -/* 03A54 80B56E04 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03A58 80B56E08 3C054110 */ lui $a1, 0x4110 ## $a1 = 41100000 -/* 03A5C 80B56E0C 0C0295B2 */ jal func_800A56C8 -/* 03A60 80B56E10 AFA60018 */ sw $a2, 0x0018($sp) -/* 03A64 80B56E14 10400004 */ beq $v0, $zero, .L80B56E28 -/* 03A68 80B56E18 8FA60018 */ lw $a2, 0x0018($sp) -/* 03A6C 80B56E1C 24C400E4 */ addiu $a0, $a2, 0x00E4 ## $a0 = 000000E4 -/* 03A70 80B56E20 0C01E245 */ jal func_80078914 -/* 03A74 80B56E24 24056877 */ addiu $a1, $zero, 0x6877 ## $a1 = 00006877 -.L80B56E28: -/* 03A78 80B56E28 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03A7C 80B56E2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03A80 80B56E30 03E00008 */ jr $ra -/* 03A84 80B56E34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56E38.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56E38.s deleted file mode 100644 index 9be1bf262a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56E38.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80B56E38 -/* 03A88 80B56E38 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 03A8C 80B56E3C AFB00018 */ sw $s0, 0x0018($sp) -/* 03A90 80B56E40 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03A94 80B56E44 AFBF001C */ sw $ra, 0x001C($sp) -/* 03A98 80B56E48 AFA5003C */ sw $a1, 0x003C($sp) -/* 03A9C 80B56E4C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03AA0 80B56E50 AFA40020 */ sw $a0, 0x0020($sp) -/* 03AA4 80B56E54 0C0295B2 */ jal func_800A56C8 -/* 03AA8 80B56E58 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 -/* 03AAC 80B56E5C 14400005 */ bne $v0, $zero, .L80B56E74 -/* 03AB0 80B56E60 8FA40020 */ lw $a0, 0x0020($sp) -/* 03AB4 80B56E64 0C0295B2 */ jal func_800A56C8 -/* 03AB8 80B56E68 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 03ABC 80B56E6C 5040000E */ beql $v0, $zero, .L80B56EA8 -/* 03AC0 80B56E70 8FBF001C */ lw $ra, 0x001C($sp) -.L80B56E74: -/* 03AC4 80B56E74 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 -/* 03AC8 80B56E78 8FA4003C */ lw $a0, 0x003C($sp) -/* 03ACC 80B56E7C 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 03AD0 80B56E80 11E00008 */ beq $t7, $zero, .L80B56EA4 -/* 03AD4 80B56E84 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 03AD8 80B56E88 8E050078 */ lw $a1, 0x0078($s0) ## 00000078 -/* 03ADC 80B56E8C 0C0107CD */ jal func_80041F34 -/* 03AE0 80B56E90 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D -/* 03AE4 80B56E94 24430800 */ addiu $v1, $v0, 0x0800 ## $v1 = 00000800 -/* 03AE8 80B56E98 3065FFFF */ andi $a1, $v1, 0xFFFF ## $a1 = 00000800 -/* 03AEC 80B56E9C 0C01E245 */ jal func_80078914 -/* 03AF0 80B56EA0 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 -.L80B56EA4: -/* 03AF4 80B56EA4 8FBF001C */ lw $ra, 0x001C($sp) -.L80B56EA8: -/* 03AF8 80B56EA8 8FB00018 */ lw $s0, 0x0018($sp) -/* 03AFC 80B56EAC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 03B00 80B56EB0 03E00008 */ jr $ra -/* 03B04 80B56EB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56EB8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56EB8.s deleted file mode 100644 index b5c995d5c1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56EB8.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80B56EB8 -/* 03B08 80B56EB8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03B0C 80B56EBC AFBF0014 */ sw $ra, 0x0014($sp) -/* 03B10 80B56EC0 0C2D536D */ jal func_80B54DB4 -/* 03B14 80B56EC4 AFA5001C */ sw $a1, 0x001C($sp) -/* 03B18 80B56EC8 8FA4001C */ lw $a0, 0x001C($sp) -/* 03B1C 80B56ECC 0C00B2DD */ jal Flags_SetSwitch - -/* 03B20 80B56ED0 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 03B24 80B56ED4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03B28 80B56ED8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03B2C 80B56EDC 03E00008 */ jr $ra -/* 03B30 80B56EE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56EE4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56EE4.s deleted file mode 100644 index 3083c70165..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56EE4.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80B56EE4 -/* 03B34 80B56EE4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03B38 80B56EE8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03B3C 80B56EEC 0C2D536D */ jal func_80B54DB4 -/* 03B40 80B56EF0 AFA5001C */ sw $a1, 0x001C($sp) -/* 03B44 80B56EF4 8FA4001C */ lw $a0, 0x001C($sp) -/* 03B48 80B56EF8 0C00B2D0 */ jal Flags_GetSwitch - -/* 03B4C 80B56EFC 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 03B50 80B56F00 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03B54 80B56F04 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03B58 80B56F08 03E00008 */ jr $ra -/* 03B5C 80B56F0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56F10.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56F10.s deleted file mode 100644 index 999aa869d5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56F10.s +++ /dev/null @@ -1,46 +0,0 @@ -.rdata -glabel D_80B5A7A0 - .asciz "En_Zl3_Get_path_info レールデータをゲットだぜ = %d!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80B5A7E4 - .asciz "En_Zl3_Get_path_info レールデータが無い!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.text -glabel func_80B56F10 -/* 03B60 80B56F10 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03B64 80B56F14 3C030001 */ lui $v1, 0x0001 ## $v1 = 00010000 -/* 03B68 80B56F18 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03B6C 80B56F1C 00651821 */ addu $v1, $v1, $a1 -/* 03B70 80B56F20 8C631E08 */ lw $v1, 0x1E08($v1) ## 00011E08 -/* 03B74 80B56F24 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 03B78 80B56F28 10600011 */ beq $v1, $zero, .L80B56F70 -/* 03B7C 80B56F2C 00000000 */ nop -/* 03B80 80B56F30 AFA30018 */ sw $v1, 0x0018($sp) -/* 03B84 80B56F34 0C2D5371 */ jal func_80B54DC4 -/* 03B88 80B56F38 AFA60020 */ sw $a2, 0x0020($sp) -/* 03B8C 80B56F3C 8FA30018 */ lw $v1, 0x0018($sp) -/* 03B90 80B56F40 8FA60020 */ lw $a2, 0x0020($sp) -/* 03B94 80B56F44 000270C0 */ sll $t6, $v0, 3 -/* 03B98 80B56F48 006E1821 */ addu $v1, $v1, $t6 -/* 03B9C 80B56F4C ACC3030C */ sw $v1, 0x030C($a2) ## 0000030C -/* 03BA0 80B56F50 906F0000 */ lbu $t7, 0x0000($v1) ## 00000000 -/* 03BA4 80B56F54 3C0480B6 */ lui $a0, %hi(D_80B5A7A0) ## $a0 = 80B60000 -/* 03BA8 80B56F58 2484A7A0 */ addiu $a0, $a0, %lo(D_80B5A7A0) ## $a0 = 80B5A7A0 -/* 03BAC 80B56F5C 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 03BB0 80B56F60 0C00084C */ jal osSyncPrintf - -/* 03BB4 80B56F64 ACCF0310 */ sw $t7, 0x0310($a2) ## 00000310 -/* 03BB8 80B56F68 10000005 */ beq $zero, $zero, .L80B56F80 -/* 03BBC 80B56F6C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B56F70: -/* 03BC0 80B56F70 3C0480B6 */ lui $a0, %hi(D_80B5A7E4) ## $a0 = 80B60000 -/* 03BC4 80B56F74 0C00084C */ jal osSyncPrintf - -/* 03BC8 80B56F78 2484A7E4 */ addiu $a0, $a0, %lo(D_80B5A7E4) ## $a0 = 80B5A7E4 -/* 03BCC 80B56F7C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B56F80: -/* 03BD0 80B56F80 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03BD4 80B56F84 03E00008 */ jr $ra -/* 03BD8 80B56F88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56F8C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56F8C.s deleted file mode 100644 index 732ea15b13..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56F8C.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80B56F8C -/* 03BDC 80B56F8C 8C820310 */ lw $v0, 0x0310($a0) ## 00000310 -/* 03BE0 80B56F90 00A2082A */ slt $at, $a1, $v0 -/* 03BE4 80B56F94 10200003 */ beq $at, $zero, .L80B56FA4 -/* 03BE8 80B56F98 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03BEC 80B56F9C 03E00008 */ jr $ra -/* 03BF0 80B56FA0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B56FA4: -/* 03BF4 80B56FA4 03E00008 */ jr $ra -/* 03BF8 80B56FA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56FAC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56FAC.s deleted file mode 100644 index baec7de095..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56FAC.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80B56FAC -/* 03BFC 80B56FAC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03C00 80B56FB0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03C04 80B56FB4 AFA50024 */ sw $a1, 0x0024($sp) -/* 03C08 80B56FB8 8C86030C */ lw $a2, 0x030C($a0) ## 0000030C -/* 03C0C 80B56FBC 50C00019 */ beql $a2, $zero, .L80B57024 -/* 03C10 80B56FC0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03C14 80B56FC4 0C2D5BE3 */ jal func_80B56F8C -/* 03C18 80B56FC8 AFA60018 */ sw $a2, 0x0018($sp) -/* 03C1C 80B56FCC 10400014 */ beq $v0, $zero, .L80B57020 -/* 03C20 80B56FD0 8FA60018 */ lw $a2, 0x0018($sp) -/* 03C24 80B56FD4 8CC30004 */ lw $v1, 0x0004($a2) ## 00000004 -/* 03C28 80B56FD8 8FAA0024 */ lw $t2, 0x0024($sp) -/* 03C2C 80B56FDC 3C198016 */ lui $t9, %hi(gSegments) -/* 03C30 80B56FE0 00037100 */ sll $t6, $v1, 4 -/* 03C34 80B56FE4 000E7F02 */ srl $t7, $t6, 28 -/* 03C38 80B56FE8 000FC080 */ sll $t8, $t7, 2 -/* 03C3C 80B56FEC 0338C821 */ addu $t9, $t9, $t8 -/* 03C40 80B56FF0 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* 03C44 80B56FF4 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 03C48 80B56FF8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 03C4C 80B56FFC 000A5880 */ sll $t3, $t2, 2 -/* 03C50 80B57000 00614024 */ and $t0, $v1, $at -/* 03C54 80B57004 016A5823 */ subu $t3, $t3, $t2 -/* 03C58 80B57008 000B5840 */ sll $t3, $t3, 1 -/* 03C5C 80B5700C 03284821 */ addu $t1, $t9, $t0 -/* 03C60 80B57010 012B2021 */ addu $a0, $t1, $t3 -/* 03C64 80B57014 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03C68 80B57018 10000002 */ beq $zero, $zero, .L80B57024 -/* 03C6C 80B5701C 00811021 */ addu $v0, $a0, $at -.L80B57020: -/* 03C70 80B57020 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B57024: -/* 03C74 80B57024 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03C78 80B57028 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03C7C 80B5702C 03E00008 */ jr $ra -/* 03C80 80B57030 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57034.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57034.s deleted file mode 100644 index 482df951bd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57034.s +++ /dev/null @@ -1,61 +0,0 @@ -.late_rodata -glabel D_80B5AB84 - .word 0x4622F983 - -.text -glabel func_80B57034 -/* 03C84 80B57034 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03C88 80B57038 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03C8C 80B5703C AFA40020 */ sw $a0, 0x0020($sp) -/* 03C90 80B57040 0C2D5BEB */ jal func_80B56FAC -/* 03C94 80B57044 AFA60028 */ sw $a2, 0x0028($sp) -/* 03C98 80B57048 8FA40020 */ lw $a0, 0x0020($sp) -/* 03C9C 80B5704C 8FA50028 */ lw $a1, 0x0028($sp) -/* 03CA0 80B57050 0C2D5BEB */ jal func_80B56FAC -/* 03CA4 80B57054 AFA2001C */ sw $v0, 0x001C($sp) -/* 03CA8 80B57058 10400025 */ beq $v0, $zero, .L80B570F0 -/* 03CAC 80B5705C 8FA3001C */ lw $v1, 0x001C($sp) -/* 03CB0 80B57060 50600024 */ beql $v1, $zero, .L80B570F4 -/* 03CB4 80B57064 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03CB8 80B57068 844E0000 */ lh $t6, 0x0000($v0) ## 00000000 -/* 03CBC 80B5706C 846F0000 */ lh $t7, 0x0000($v1) ## 00000000 -/* 03CC0 80B57070 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 03CC4 80B57074 84590004 */ lh $t9, 0x0004($v0) ## 00000004 -/* 03CC8 80B57078 01CFC023 */ subu $t8, $t6, $t7 -/* 03CCC 80B5707C 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 03CD0 80B57080 84680004 */ lh $t0, 0x0004($v1) ## 00000004 -/* 03CD4 80B57084 46802320 */ cvt.s.w $f12, $f4 -/* 03CD8 80B57088 03284823 */ subu $t1, $t9, $t0 -/* 03CDC 80B5708C 44893000 */ mtc1 $t1, $f6 ## $f6 = 0.00 -/* 03CE0 80B57090 00000000 */ nop -/* 03CE4 80B57094 468033A0 */ cvt.s.w $f14, $f6 -/* 03CE8 80B57098 46006032 */ c.eq.s $f12, $f0 -/* 03CEC 80B5709C 00000000 */ nop -/* 03CF0 80B570A0 45000007 */ bc1f .L80B570C0 -/* 03CF4 80B570A4 00000000 */ nop -/* 03CF8 80B570A8 46007032 */ c.eq.s $f14, $f0 -/* 03CFC 80B570AC 00000000 */ nop -/* 03D00 80B570B0 45000003 */ bc1f .L80B570C0 -/* 03D04 80B570B4 00000000 */ nop -/* 03D08 80B570B8 1000000E */ beq $zero, $zero, .L80B570F4 -/* 03D0C 80B570BC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B570C0: -/* 03D10 80B570C0 0C03F494 */ jal Math_atan2f -/* 03D14 80B570C4 00000000 */ nop -/* 03D18 80B570C8 3C0180B6 */ lui $at, %hi(D_80B5AB84) ## $at = 80B60000 -/* 03D1C 80B570CC C428AB84 */ lwc1 $f8, %lo(D_80B5AB84)($at) -/* 03D20 80B570D0 46080282 */ mul.s $f10, $f0, $f8 -/* 03D24 80B570D4 4600540D */ trunc.w.s $f16, $f10 -/* 03D28 80B570D8 44038000 */ mfc1 $v1, $f16 -/* 03D2C 80B570DC 00000000 */ nop -/* 03D30 80B570E0 00031C00 */ sll $v1, $v1, 16 -/* 03D34 80B570E4 00031C03 */ sra $v1, $v1, 16 -/* 03D38 80B570E8 10000002 */ beq $zero, $zero, .L80B570F4 -/* 03D3C 80B570EC 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L80B570F0: -/* 03D40 80B570F0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B570F4: -/* 03D44 80B570F4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03D48 80B570F8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03D4C 80B570FC 03E00008 */ jr $ra -/* 03D50 80B57100 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57104.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57104.s deleted file mode 100644 index d6160488be..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57104.s +++ /dev/null @@ -1,50 +0,0 @@ -.late_rodata -glabel D_80B5AB88 - .word 0x4622F983 - -.text -glabel func_80B57104 -/* 03D54 80B57104 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03D58 80B57108 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03D5C 80B5710C 0C2D5BEB */ jal func_80B56FAC -/* 03D60 80B57110 AFA40018 */ sw $a0, 0x0018($sp) -/* 03D64 80B57114 1040001F */ beq $v0, $zero, .L80B57194 -/* 03D68 80B57118 8FA40018 */ lw $a0, 0x0018($sp) -/* 03D6C 80B5711C 844E0000 */ lh $t6, 0x0000($v0) ## 00000000 -/* 03D70 80B57120 C4880024 */ lwc1 $f8, 0x0024($a0) ## 00000024 -/* 03D74 80B57124 844F0004 */ lh $t7, 0x0004($v0) ## 00000004 -/* 03D78 80B57128 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 03D7C 80B5712C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 03D80 80B57130 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 03D84 80B57134 468021A0 */ cvt.s.w $f6, $f4 -/* 03D88 80B57138 C492002C */ lwc1 $f18, 0x002C($a0) ## 0000002C -/* 03D8C 80B5713C 46805420 */ cvt.s.w $f16, $f10 -/* 03D90 80B57140 46083301 */ sub.s $f12, $f6, $f8 -/* 03D94 80B57144 46128381 */ sub.s $f14, $f16, $f18 -/* 03D98 80B57148 46006032 */ c.eq.s $f12, $f0 -/* 03D9C 80B5714C 00000000 */ nop -/* 03DA0 80B57150 45000005 */ bc1f .L80B57168 -/* 03DA4 80B57154 00000000 */ nop -/* 03DA8 80B57158 46007032 */ c.eq.s $f14, $f0 -/* 03DAC 80B5715C 00000000 */ nop -/* 03DB0 80B57160 4503000D */ bc1tl .L80B57198 -/* 03DB4 80B57164 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B57168: -/* 03DB8 80B57168 0C03F494 */ jal Math_atan2f -/* 03DBC 80B5716C 00000000 */ nop -/* 03DC0 80B57170 3C0180B6 */ lui $at, %hi(D_80B5AB88) ## $at = 80B60000 -/* 03DC4 80B57174 C424AB88 */ lwc1 $f4, %lo(D_80B5AB88)($at) -/* 03DC8 80B57178 46040182 */ mul.s $f6, $f0, $f4 -/* 03DCC 80B5717C 4600320D */ trunc.w.s $f8, $f6 -/* 03DD0 80B57180 44024000 */ mfc1 $v0, $f8 -/* 03DD4 80B57184 00000000 */ nop -/* 03DD8 80B57188 00021400 */ sll $v0, $v0, 16 -/* 03DDC 80B5718C 10000002 */ beq $zero, $zero, .L80B57198 -/* 03DE0 80B57190 00021403 */ sra $v0, $v0, 16 -.L80B57194: -/* 03DE4 80B57194 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B57198: -/* 03DE8 80B57198 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03DEC 80B5719C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03DF0 80B571A0 03E00008 */ jr $ra -/* 03DF4 80B571A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B571A8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B571A8.s deleted file mode 100644 index ac0c62fb2b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B571A8.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B571A8 -/* 03DF8 80B571A8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03DFC 80B571AC AFBF0014 */ sw $ra, 0x0014($sp) -/* 03E00 80B571B0 8C870314 */ lw $a3, 0x0314($a0) ## 00000314 -/* 03E04 80B571B4 AFA40028 */ sw $a0, 0x0028($sp) -/* 03E08 80B571B8 24E60001 */ addiu $a2, $a3, 0x0001 ## $a2 = 00000001 -/* 03E0C 80B571BC 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000001 -/* 03E10 80B571C0 AFA60018 */ sw $a2, 0x0018($sp) -/* 03E14 80B571C4 0C2D5BE3 */ jal func_80B56F8C -/* 03E18 80B571C8 AFA70020 */ sw $a3, 0x0020($sp) -/* 03E1C 80B571CC 8FA40028 */ lw $a0, 0x0028($sp) -/* 03E20 80B571D0 8FA60018 */ lw $a2, 0x0018($sp) -/* 03E24 80B571D4 14400003 */ bne $v0, $zero, .L80B571E4 -/* 03E28 80B571D8 8FA70020 */ lw $a3, 0x0020($sp) -/* 03E2C 80B571DC 10000003 */ beq $zero, $zero, .L80B571EC -/* 03E30 80B571E0 848200B6 */ lh $v0, 0x00B6($a0) ## 000000B6 -.L80B571E4: -/* 03E34 80B571E4 0C2D5C0D */ jal func_80B57034 -/* 03E38 80B571E8 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -.L80B571EC: -/* 03E3C 80B571EC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03E40 80B571F0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03E44 80B571F4 03E00008 */ jr $ra -/* 03E48 80B571F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B571FC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B571FC.s deleted file mode 100644 index dadc4aaa1b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B571FC.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B571FC -/* 03E4C 80B571FC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03E50 80B57200 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03E54 80B57204 8C850314 */ lw $a1, 0x0314($a0) ## 00000314 -/* 03E58 80B57208 AFA40020 */ sw $a0, 0x0020($sp) -/* 03E5C 80B5720C 0C2D5BE3 */ jal func_80B56F8C -/* 03E60 80B57210 AFA50018 */ sw $a1, 0x0018($sp) -/* 03E64 80B57214 8FA40020 */ lw $a0, 0x0020($sp) -/* 03E68 80B57218 14400003 */ bne $v0, $zero, .L80B57228 -/* 03E6C 80B5721C 8FA50018 */ lw $a1, 0x0018($sp) -/* 03E70 80B57220 10000003 */ beq $zero, $zero, .L80B57230 -/* 03E74 80B57224 848200B6 */ lh $v0, 0x00B6($a0) ## 000000B6 -.L80B57228: -/* 03E78 80B57228 0C2D5C41 */ jal func_80B57104 -/* 03E7C 80B5722C 00000000 */ nop -.L80B57230: -/* 03E80 80B57230 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03E84 80B57234 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03E88 80B57238 03E00008 */ jr $ra -/* 03E8C 80B5723C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57240.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57240.s deleted file mode 100644 index c3bbe6d60c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57240.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B57240 -/* 03E90 80B57240 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 03E94 80B57244 AFBF001C */ sw $ra, 0x001C($sp) -/* 03E98 80B57248 0C2D5C7F */ jal func_80B571FC -/* 03E9C 80B5724C AFA40030 */ sw $a0, 0x0030($sp) -/* 03EA0 80B57250 8FA40030 */ lw $a0, 0x0030($sp) -/* 03EA4 80B57254 00022C00 */ sll $a1, $v0, 16 -/* 03EA8 80B57258 240E03E8 */ addiu $t6, $zero, 0x03E8 ## $t6 = 000003E8 -/* 03EAC 80B5725C 24840032 */ addiu $a0, $a0, 0x0032 ## $a0 = 00000032 -/* 03EB0 80B57260 AFA40024 */ sw $a0, 0x0024($sp) -/* 03EB4 80B57264 AFAE0010 */ sw $t6, 0x0010($sp) -/* 03EB8 80B57268 00052C03 */ sra $a1, $a1, 16 -/* 03EBC 80B5726C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 03EC0 80B57270 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 03EC4 80B57274 24071900 */ addiu $a3, $zero, 0x1900 ## $a3 = 00001900 -/* 03EC8 80B57278 8FA40024 */ lw $a0, 0x0024($sp) -/* 03ECC 80B5727C 8FB80030 */ lw $t8, 0x0030($sp) -/* 03ED0 80B57280 848F0000 */ lh $t7, 0x0000($a0) ## 00000000 -/* 03ED4 80B57284 A70F00B6 */ sh $t7, 0x00B6($t8) ## 000000B6 -/* 03ED8 80B57288 8FBF001C */ lw $ra, 0x001C($sp) -/* 03EDC 80B5728C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 03EE0 80B57290 03E00008 */ jr $ra -/* 03EE4 80B57294 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57298.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57298.s deleted file mode 100644 index f54ec21308..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57298.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B57298 -/* 03EE8 80B57298 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 03EEC 80B5729C AFBF001C */ sw $ra, 0x001C($sp) -/* 03EF0 80B572A0 0C2D5C6A */ jal func_80B571A8 -/* 03EF4 80B572A4 AFA40030 */ sw $a0, 0x0030($sp) -/* 03EF8 80B572A8 8FA40030 */ lw $a0, 0x0030($sp) -/* 03EFC 80B572AC 00022C00 */ sll $a1, $v0, 16 -/* 03F00 80B572B0 240E03E8 */ addiu $t6, $zero, 0x03E8 ## $t6 = 000003E8 -/* 03F04 80B572B4 24840032 */ addiu $a0, $a0, 0x0032 ## $a0 = 00000032 -/* 03F08 80B572B8 AFA40024 */ sw $a0, 0x0024($sp) -/* 03F0C 80B572BC AFAE0010 */ sw $t6, 0x0010($sp) -/* 03F10 80B572C0 00052C03 */ sra $a1, $a1, 16 -/* 03F14 80B572C4 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 03F18 80B572C8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 03F1C 80B572CC 24071900 */ addiu $a3, $zero, 0x1900 ## $a3 = 00001900 -/* 03F20 80B572D0 8FA40024 */ lw $a0, 0x0024($sp) -/* 03F24 80B572D4 8FB80030 */ lw $t8, 0x0030($sp) -/* 03F28 80B572D8 848F0000 */ lh $t7, 0x0000($a0) ## 00000000 -/* 03F2C 80B572DC A70F00B6 */ sh $t7, 0x00B6($t8) ## 000000B6 -/* 03F30 80B572E0 8FBF001C */ lw $ra, 0x001C($sp) -/* 03F34 80B572E4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 03F38 80B572E8 03E00008 */ jr $ra -/* 03F3C 80B572EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B572F0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B572F0.s deleted file mode 100644 index cc5a8fad53..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B572F0.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B572F0 -/* 03F40 80B572F0 848200A4 */ lh $v0, 0x00A4($a0) ## 000000A4 -/* 03F44 80B572F4 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 03F48 80B572F8 54410004 */ bnel $v0, $at, .L80B5730C -/* 03F4C 80B572FC 2401001A */ addiu $at, $zero, 0x001A ## $at = 0000001A -/* 03F50 80B57300 03E00008 */ jr $ra -/* 03F54 80B57304 240271A8 */ addiu $v0, $zero, 0x71A8 ## $v0 = 000071A8 -.L80B57308: -/* 03F58 80B57308 2401001A */ addiu $at, $zero, 0x001A ## $at = 0000001A -.L80B5730C: -/* 03F5C 80B5730C 14410003 */ bne $v0, $at, .L80B5731C -/* 03F60 80B57310 240371AB */ addiu $v1, $zero, 0x71AB ## $v1 = 000071AB -/* 03F64 80B57314 03E00008 */ jr $ra -/* 03F68 80B57318 240271A9 */ addiu $v0, $zero, 0x71A9 ## $v0 = 000071A9 -.L80B5731C: -/* 03F6C 80B5731C 03E00008 */ jr $ra -/* 03F70 80B57320 00601025 */ or $v0, $v1, $zero ## $v0 = 000071AB diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57324.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57324.s deleted file mode 100644 index 73571a475c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57324.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80B57324 -/* 03F74 80B57324 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03F78 80B57328 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03F7C 80B5732C 0C00BC65 */ jal func_8002F194 -/* 03F80 80B57330 00000000 */ nop -/* 03F84 80B57334 10400003 */ beq $v0, $zero, .L80B57344 -/* 03F88 80B57338 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03F8C 80B5733C 10000002 */ beq $zero, $zero, .L80B57348 -/* 03F90 80B57340 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B57344: -/* 03F94 80B57344 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B57348: -/* 03F98 80B57348 03E00008 */ jr $ra -/* 03F9C 80B5734C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57350.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57350.s deleted file mode 100644 index b45f6a85a7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57350.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80B57350 -/* 03FA0 80B57350 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03FA4 80B57354 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03FA8 80B57358 AFA5001C */ sw $a1, 0x001C($sp) -/* 03FAC 80B5735C 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 -/* 03FB0 80B57360 848E008A */ lh $t6, 0x008A($a0) ## 0000008A -/* 03FB4 80B57364 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 03FB8 80B57368 01CF1023 */ subu $v0, $t6, $t7 -/* 03FBC 80B5736C 00021400 */ sll $v0, $v0, 16 -/* 03FC0 80B57370 00021403 */ sra $v0, $v0, 16 -/* 03FC4 80B57374 04400003 */ bltz $v0, .L80B57384 -/* 03FC8 80B57378 00021823 */ subu $v1, $zero, $v0 -/* 03FCC 80B5737C 10000001 */ beq $zero, $zero, .L80B57384 -/* 03FD0 80B57380 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80B57384: -/* 03FD4 80B57384 28614301 */ slti $at, $v1, 0x4301 -/* 03FD8 80B57388 5020000C */ beql $at, $zero, .L80B573BC -/* 03FDC 80B5738C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03FE0 80B57390 8CD80004 */ lw $t8, 0x0004($a2) ## 00000004 -/* 03FE4 80B57394 37190009 */ ori $t9, $t8, 0x0009 ## $t9 = 00000009 -/* 03FE8 80B57398 ACD90004 */ sw $t9, 0x0004($a2) ## 00000004 -/* 03FEC 80B5739C AFA60018 */ sw $a2, 0x0018($sp) -/* 03FF0 80B573A0 0C2D5CBC */ jal func_80B572F0 -/* 03FF4 80B573A4 8FA4001C */ lw $a0, 0x001C($sp) -/* 03FF8 80B573A8 8FA40018 */ lw $a0, 0x0018($sp) -/* 03FFC 80B573AC A482010E */ sh $v0, 0x010E($a0) ## 0000010E -/* 04000 80B573B0 0C00BCBD */ jal func_8002F2F4 -/* 04004 80B573B4 8FA5001C */ lw $a1, 0x001C($sp) -/* 04008 80B573B8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B573BC: -/* 0400C 80B573BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04010 80B573C0 03E00008 */ jr $ra -/* 04014 80B573C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B573C8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B573C8.s deleted file mode 100644 index 108f6dbc85..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B573C8.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80B573C8 -/* 04018 80B573C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0401C 80B573CC AFBF0014 */ sw $ra, 0x0014($sp) -/* 04020 80B573D0 AFA40018 */ sw $a0, 0x0018($sp) -/* 04024 80B573D4 0C042F6F */ jal func_8010BDBC -/* 04028 80B573D8 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 0402C 80B573DC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 04030 80B573E0 14410003 */ bne $v0, $at, .L80B573F0 -/* 04034 80B573E4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04038 80B573E8 10000002 */ beq $zero, $zero, .L80B573F4 -/* 0403C 80B573EC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B573F0: -/* 04040 80B573F0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B573F4: -/* 04044 80B573F4 03E00008 */ jr $ra -/* 04048 80B573F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B573FC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B573FC.s deleted file mode 100644 index 993c882bc4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B573FC.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B573FC -/* 0404C 80B573FC AFA60008 */ sw $a2, 0x0008($sp) -/* 04050 80B57400 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 04054 80B57404 C48C0024 */ lwc1 $f12, 0x0024($a0) ## 00000024 -/* 04058 80B57408 C48E002C */ lwc1 $f14, 0x002C($a0) ## 0000002C -/* 0405C 80B5740C C4400024 */ lwc1 $f0, 0x0024($v0) ## 00000024 -/* 04060 80B57410 C442002C */ lwc1 $f2, 0x002C($v0) ## 0000002C -/* 04064 80B57414 C7AA0008 */ lwc1 $f10, 0x0008($sp) -/* 04068 80B57418 460C0401 */ sub.s $f16, $f0, $f12 -/* 0406C 80B5741C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 04070 80B57420 460E1481 */ sub.s $f18, $f2, $f14 -/* 04074 80B57424 46108102 */ mul.s $f4, $f16, $f16 -/* 04078 80B57428 00000000 */ nop -/* 0407C 80B5742C 46129182 */ mul.s $f6, $f18, $f18 -/* 04080 80B57430 46062200 */ add.s $f8, $f4, $f6 -/* 04084 80B57434 460A5102 */ mul.s $f4, $f10, $f10 -/* 04088 80B57438 4604403C */ c.lt.s $f8, $f4 -/* 0408C 80B5743C 00000000 */ nop -/* 04090 80B57440 45000003 */ bc1f .L80B57450 -/* 04094 80B57444 00000000 */ nop -/* 04098 80B57448 03E00008 */ jr $ra -/* 0409C 80B5744C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B57450: -/* 040A0 80B57450 03E00008 */ jr $ra -/* 040A4 80B57454 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57458.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57458.s deleted file mode 100644 index 85e073f80b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57458.s +++ /dev/null @@ -1,77 +0,0 @@ -.late_rodata -glabel D_80B5AB8C - .word 0x4622F983 - -.text -glabel func_80B57458 -/* 040A8 80B57458 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 040AC 80B5745C AFBF0014 */ sw $ra, 0x0014($sp) -/* 040B0 80B57460 AFA5004C */ sw $a1, 0x004C($sp) -/* 040B4 80B57464 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 040B8 80B57468 E7A40040 */ swc1 $f4, 0x0040($sp) -/* 040BC 80B5746C 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 040C0 80B57470 C480002C */ lwc1 $f0, 0x002C($a0) ## 0000002C -/* 040C4 80B57474 C4460024 */ lwc1 $f6, 0x0024($v0) ## 00000024 -/* 040C8 80B57478 E7A6002C */ swc1 $f6, 0x002C($sp) -/* 040CC 80B5747C C442002C */ lwc1 $f2, 0x002C($v0) ## 0000002C -/* 040D0 80B57480 AFA40048 */ sw $a0, 0x0048($sp) -/* 040D4 80B57484 E7A0003C */ swc1 $f0, 0x003C($sp) -/* 040D8 80B57488 0C2D5C6A */ jal func_80B571A8 -/* 040DC 80B5748C E7A20028 */ swc1 $f2, 0x0028($sp) -/* 040E0 80B57490 C7A8002C */ lwc1 $f8, 0x002C($sp) -/* 040E4 80B57494 C7AA0040 */ lwc1 $f10, 0x0040($sp) -/* 040E8 80B57498 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 040EC 80B5749C 00021C00 */ sll $v1, $v0, 16 -/* 040F0 80B574A0 460A4301 */ sub.s $f12, $f8, $f10 -/* 040F4 80B574A4 00031C03 */ sra $v1, $v1, 16 -/* 040F8 80B574A8 8FA40048 */ lw $a0, 0x0048($sp) -/* 040FC 80B574AC C7A0003C */ lwc1 $f0, 0x003C($sp) -/* 04100 80B574B0 460E6032 */ c.eq.s $f12, $f14 -/* 04104 80B574B4 C7A20028 */ lwc1 $f2, 0x0028($sp) -/* 04108 80B574B8 45020009 */ bc1fl .L80B574E0 -/* 0410C 80B574BC 46001381 */ sub.s $f14, $f2, $f0 -/* 04110 80B574C0 46001401 */ sub.s $f16, $f2, $f0 -/* 04114 80B574C4 460E8032 */ c.eq.s $f16, $f14 -/* 04118 80B574C8 00000000 */ nop -/* 0411C 80B574CC 45020004 */ bc1fl .L80B574E0 -/* 04120 80B574D0 46001381 */ sub.s $f14, $f2, $f0 -/* 04124 80B574D4 1000001F */ beq $zero, $zero, .L80B57554 -/* 04128 80B574D8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0412C 80B574DC 46001381 */ sub.s $f14, $f2, $f0 -.L80B574E0: -/* 04130 80B574E0 A7A3001C */ sh $v1, 0x001C($sp) -/* 04134 80B574E4 0C03F494 */ jal Math_atan2f -/* 04138 80B574E8 AFA40048 */ sw $a0, 0x0048($sp) -/* 0413C 80B574EC 3C0180B6 */ lui $at, %hi(D_80B5AB8C) ## $at = 80B60000 -/* 04140 80B574F0 C432AB8C */ lwc1 $f18, %lo(D_80B5AB8C)($at) -/* 04144 80B574F4 87A3001C */ lh $v1, 0x001C($sp) -/* 04148 80B574F8 8FA40048 */ lw $a0, 0x0048($sp) -/* 0414C 80B574FC 46120102 */ mul.s $f4, $f0, $f18 -/* 04150 80B57500 4600218D */ trunc.w.s $f6, $f4 -/* 04154 80B57504 44083000 */ mfc1 $t0, $f6 -/* 04158 80B57508 00000000 */ nop -/* 0415C 80B5750C 00681023 */ subu $v0, $v1, $t0 -/* 04160 80B57510 00021400 */ sll $v0, $v0, 16 -/* 04164 80B57514 00021403 */ sra $v0, $v0, 16 -/* 04168 80B57518 28411555 */ slti $at, $v0, 0x1555 -/* 0416C 80B5751C 50200004 */ beql $at, $zero, .L80B57530 -/* 04170 80B57520 28414000 */ slti $at, $v0, 0x4000 -/* 04174 80B57524 1000000B */ beq $zero, $zero, .L80B57554 -/* 04178 80B57528 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0417C 80B5752C 28414000 */ slti $at, $v0, 0x4000 -.L80B57530: -/* 04180 80B57530 10200007 */ beq $at, $zero, .L80B57550 -/* 04184 80B57534 8FA5004C */ lw $a1, 0x004C($sp) -/* 04188 80B57538 0C2D5CFF */ jal func_80B573FC -/* 0418C 80B5753C 3C064316 */ lui $a2, 0x4316 ## $a2 = 43160000 -/* 04190 80B57540 50400004 */ beql $v0, $zero, .L80B57554 -/* 04194 80B57544 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 04198 80B57548 10000002 */ beq $zero, $zero, .L80B57554 -/* 0419C 80B5754C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B57550: -/* 041A0 80B57550 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B57554: -/* 041A4 80B57554 8FBF0014 */ lw $ra, 0x0014($sp) -/* 041A8 80B57558 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 041AC 80B5755C 03E00008 */ jr $ra -/* 041B0 80B57560 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57564.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57564.s deleted file mode 100644 index ec5e14b6a9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57564.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B57564 -/* 041B4 80B57564 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 041B8 80B57568 AFBF0014 */ sw $ra, 0x0014($sp) -/* 041BC 80B5756C AFA40018 */ sw $a0, 0x0018($sp) -/* 041C0 80B57570 AFA5001C */ sw $a1, 0x001C($sp) -/* 041C4 80B57574 0C2D5CFF */ jal func_80B573FC -/* 041C8 80B57578 3C064248 */ lui $a2, 0x4248 ## $a2 = 42480000 -/* 041CC 80B5757C 14400005 */ bne $v0, $zero, .L80B57594 -/* 041D0 80B57580 8FA40018 */ lw $a0, 0x0018($sp) -/* 041D4 80B57584 0C2D5D16 */ jal func_80B57458 -/* 041D8 80B57588 8FA5001C */ lw $a1, 0x001C($sp) -/* 041DC 80B5758C 50400004 */ beql $v0, $zero, .L80B575A0 -/* 041E0 80B57590 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B57594: -/* 041E4 80B57594 10000002 */ beq $zero, $zero, .L80B575A0 -/* 041E8 80B57598 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 041EC 80B5759C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B575A0: -/* 041F0 80B575A0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 041F4 80B575A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 041F8 80B575A8 03E00008 */ jr $ra -/* 041FC 80B575AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B575B0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B575B0.s deleted file mode 100644 index a8025e7711..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B575B0.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80B575B0 -/* 04200 80B575B0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04204 80B575B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04208 80B575B8 0C2D5CFF */ jal func_80B573FC -/* 0420C 80B575BC 3C064316 */ lui $a2, 0x4316 ## $a2 = 43160000 -/* 04210 80B575C0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04214 80B575C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04218 80B575C8 03E00008 */ jr $ra -/* 0421C 80B575CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B575D0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B575D0.s deleted file mode 100644 index 45652e2403..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B575D0.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80B575D0 -/* 04220 80B575D0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04224 80B575D4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04228 80B575D8 0C2D5CFF */ jal func_80B573FC -/* 0422C 80B575DC 3C064248 */ lui $a2, 0x4248 ## $a2 = 42480000 -/* 04230 80B575E0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04234 80B575E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04238 80B575E8 03E00008 */ jr $ra -/* 0423C 80B575EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B575F0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B575F0.s deleted file mode 100644 index 393a77b711..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B575F0.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80B575F0 -/* 04240 80B575F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04244 80B575F4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04248 80B575F8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0424C 80B575FC 84A200A4 */ lh $v0, 0x00A4($a1) ## 000000A4 -/* 04250 80B57600 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 04254 80B57604 5441000D */ bnel $v0, $at, .L80B5763C -/* 04258 80B57608 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0425C 80B5760C 0C2D536D */ jal func_80B54DB4 -/* 04260 80B57610 00000000 */ nop -/* 04264 80B57614 24010026 */ addiu $at, $zero, 0x0026 ## $at = 00000026 -/* 04268 80B57618 14410007 */ bne $v0, $at, .L80B57638 -/* 0426C 80B5761C 8FAE0018 */ lw $t6, 0x0018($sp) -/* 04270 80B57620 8DC20314 */ lw $v0, 0x0314($t6) ## 00000314 -/* 04274 80B57624 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 04278 80B57628 54410004 */ bnel $v0, $at, .L80B5763C -/* 0427C 80B5762C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 04280 80B57630 10000002 */ beq $zero, $zero, .L80B5763C -/* 04284 80B57634 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B57638: -/* 04288 80B57638 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B5763C: -/* 0428C 80B5763C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04290 80B57640 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04294 80B57644 03E00008 */ jr $ra -/* 04298 80B57648 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5764C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5764C.s deleted file mode 100644 index 34fbcd96fd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5764C.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80B5764C -/* 0429C 80B5764C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 042A0 80B57650 AFBF001C */ sw $ra, 0x001C($sp) -/* 042A4 80B57654 AFA40020 */ sw $a0, 0x0020($sp) -/* 042A8 80B57658 AFA50024 */ sw $a1, 0x0024($sp) -/* 042AC 80B5765C 84A200A4 */ lh $v0, 0x00A4($a1) ## 000000A4 -/* 042B0 80B57660 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 042B4 80B57664 54410015 */ bnel $v0, $at, .L80B576BC -/* 042B8 80B57668 8FBF001C */ lw $ra, 0x001C($sp) -/* 042BC 80B5766C 0C2D536D */ jal func_80B54DB4 -/* 042C0 80B57670 00000000 */ nop -/* 042C4 80B57674 24010026 */ addiu $at, $zero, 0x0026 ## $at = 00000026 -/* 042C8 80B57678 1441000F */ bne $v0, $at, .L80B576B8 -/* 042CC 80B5767C 8FAF0020 */ lw $t7, 0x0020($sp) -/* 042D0 80B57680 8DE20314 */ lw $v0, 0x0314($t7) ## 00000314 -/* 042D4 80B57684 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 042D8 80B57688 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 042DC 80B5768C 5441000B */ bnel $v0, $at, .L80B576BC -/* 042E0 80B57690 8FBF001C */ lw $ra, 0x001C($sp) -/* 042E4 80B57694 0C02FF21 */ jal Gameplay_InCsMode -/* 042E8 80B57698 8FA40024 */ lw $a0, 0x0024($sp) -/* 042EC 80B5769C 14400006 */ bne $v0, $zero, .L80B576B8 -/* 042F0 80B576A0 8FA40024 */ lw $a0, 0x0024($sp) -/* 042F4 80B576A4 240503E8 */ addiu $a1, $zero, 0x03E8 ## $a1 = 000003E8 -/* 042F8 80B576A8 24060028 */ addiu $a2, $zero, 0x0028 ## $a2 = 00000028 -/* 042FC 80B576AC 8FA70020 */ lw $a3, 0x0020($sp) -/* 04300 80B576B0 0C02003E */ jal func_800800F8 -/* 04304 80B576B4 AFA00010 */ sw $zero, 0x0010($sp) -.L80B576B8: -/* 04308 80B576B8 8FBF001C */ lw $ra, 0x001C($sp) -.L80B576BC: -/* 0430C 80B576BC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04310 80B576C0 03E00008 */ jr $ra -/* 04314 80B576C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B576C8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B576C8.s deleted file mode 100644 index fe3d633dbc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B576C8.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80B576C8 -/* 04318 80B576C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0431C 80B576CC AFBF0014 */ sw $ra, 0x0014($sp) -/* 04320 80B576D0 0C2D5D7C */ jal func_80B575F0 -/* 04324 80B576D4 AFA40018 */ sw $a0, 0x0018($sp) -/* 04328 80B576D8 10400007 */ beq $v0, $zero, .L80B576F8 -/* 0432C 80B576DC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04330 80B576E0 8FAE0018 */ lw $t6, 0x0018($sp) -/* 04334 80B576E4 8DCF03D8 */ lw $t7, 0x03D8($t6) ## 000003D8 -/* 04338 80B576E8 55E00004 */ bnel $t7, $zero, .L80B576FC -/* 0433C 80B576EC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 04340 80B576F0 10000002 */ beq $zero, $zero, .L80B576FC -/* 04344 80B576F4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B576F8: -/* 04348 80B576F8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B576FC: -/* 0434C 80B576FC 03E00008 */ jr $ra -/* 04350 80B57700 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57704.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57704.s deleted file mode 100644 index 6c9b467800..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57704.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80B57704 -/* 04354 80B57704 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04358 80B57708 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0435C 80B5770C 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 04360 80B57710 8C8503C4 */ lw $a1, 0x03C4($a0) ## 000003C4 -/* 04364 80B57714 0C00B2DD */ jal Flags_SetSwitch - -/* 04368 80B57718 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0436C 80B5771C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04370 80B57720 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04374 80B57724 03E00008 */ jr $ra -/* 04378 80B57728 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5772C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5772C.s deleted file mode 100644 index a37f03e340..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5772C.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80B5772C -/* 0437C 80B5772C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04380 80B57730 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04384 80B57734 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 04388 80B57738 8C8503C4 */ lw $a1, 0x03C4($a0) ## 000003C4 -/* 0438C 80B5773C 0C00B2ED */ jal Flags_UnsetSwitch - -/* 04390 80B57740 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 04394 80B57744 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04398 80B57748 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0439C 80B5774C 03E00008 */ jr $ra -/* 043A0 80B57750 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57754.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57754.s deleted file mode 100644 index a8910270cf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57754.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80B57754 -/* 043A4 80B57754 3C0E8016 */ lui $t6, %hi(gSaveContext+0x13f0) -/* 043A8 80B57758 85CEFA50 */ lh $t6, %lo(gSaveContext+0x13f0)($t6) -/* 043AC 80B5775C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 043B0 80B57760 AFBF002C */ sw $ra, 0x002C($sp) -/* 043B4 80B57764 15C00011 */ bne $t6, $zero, .L80B577AC -/* 043B8 80B57768 AFA40030 */ sw $a0, 0x0030($sp) -/* 043BC 80B5776C 8FAF0030 */ lw $t7, 0x0030($sp) -/* 043C0 80B57770 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 043C4 80B57774 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 043C8 80B57778 C5E40028 */ lwc1 $f4, 0x0028($t7) ## 00000028 -/* 043CC 80B5777C 8DE70024 */ lw $a3, 0x0024($t7) ## 00000024 -/* 043D0 80B57780 240601CB */ addiu $a2, $zero, 0x01CB ## $a2 = 000001CB -/* 043D4 80B57784 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 043D8 80B57788 C5E6002C */ lwc1 $f6, 0x002C($t7) ## 0000002C -/* 043DC 80B5778C AFB80024 */ sw $t8, 0x0024($sp) -/* 043E0 80B57790 AFA00020 */ sw $zero, 0x0020($sp) -/* 043E4 80B57794 AFA0001C */ sw $zero, 0x001C($sp) -/* 043E8 80B57798 AFA00018 */ sw $zero, 0x0018($sp) -/* 043EC 80B5779C 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 043F0 80B577A0 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 043F4 80B577A4 0C2D5B69 */ jal func_80B56DA4 -/* 043F8 80B577A8 8FA40030 */ lw $a0, 0x0030($sp) -.L80B577AC: -/* 043FC 80B577AC 8FBF002C */ lw $ra, 0x002C($sp) -/* 04400 80B577B0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 04404 80B577B4 03E00008 */ jr $ra -/* 04408 80B577B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B577BC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B577BC.s deleted file mode 100644 index e3eddfa5bb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B577BC.s +++ /dev/null @@ -1,46 +0,0 @@ -.late_rodata -glabel D_80B5AB90 - .word 0x4622F983 - -.text -glabel func_80B577BC -/* 0440C 80B577BC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 04410 80B577C0 AFBF002C */ sw $ra, 0x002C($sp) -/* 04414 80B577C4 AFA40048 */ sw $a0, 0x0048($sp) -/* 04418 80B577C8 C4B20004 */ lwc1 $f18, 0x0004($a1) ## 00000004 -/* 0441C 80B577CC 8C821C44 */ lw $v0, 0x1C44($a0) ## 00001C44 -/* 04420 80B577D0 C4B00000 */ lwc1 $f16, 0x0000($a1) ## 00000000 -/* 04424 80B577D4 E7B20034 */ swc1 $f18, 0x0034($sp) -/* 04428 80B577D8 C4B20008 */ lwc1 $f18, 0x0008($a1) ## 00000008 -/* 0442C 80B577DC C44A0024 */ lwc1 $f10, 0x0024($v0) ## 00000024 -/* 04430 80B577E0 C448002C */ lwc1 $f8, 0x002C($v0) ## 0000002C -/* 04434 80B577E4 E7B00038 */ swc1 $f16, 0x0038($sp) -/* 04438 80B577E8 46105301 */ sub.s $f12, $f10, $f16 -/* 0443C 80B577EC E7B20030 */ swc1 $f18, 0x0030($sp) -/* 04440 80B577F0 0C03F494 */ jal Math_atan2f -/* 04444 80B577F4 46124381 */ sub.s $f14, $f8, $f18 -/* 04448 80B577F8 3C0180B6 */ lui $at, %hi(D_80B5AB90) ## $at = 80B60000 -/* 0444C 80B577FC C432AB90 */ lwc1 $f18, %lo(D_80B5AB90)($at) -/* 04450 80B57800 C7A20038 */ lwc1 $f2, 0x0038($sp) -/* 04454 80B57804 8FA50048 */ lw $a1, 0x0048($sp) -/* 04458 80B57808 46120102 */ mul.s $f4, $f0, $f18 -/* 0445C 80B5780C C7B00030 */ lwc1 $f16, 0x0030($sp) -/* 04460 80B57810 C7AA0034 */ lwc1 $f10, 0x0034($sp) -/* 04464 80B57814 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 -/* 04468 80B57818 44071000 */ mfc1 $a3, $f2 -/* 0446C 80B5781C AFB90024 */ sw $t9, 0x0024($sp) -/* 04470 80B57820 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 04474 80B57824 4600218D */ trunc.w.s $f6, $f4 -/* 04478 80B57828 AFA00018 */ sw $zero, 0x0018($sp) -/* 0447C 80B5782C AFA00020 */ sw $zero, 0x0020($sp) -/* 04480 80B57830 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 04484 80B57834 44183000 */ mfc1 $t8, $f6 -/* 04488 80B57838 E7B00014 */ swc1 $f16, 0x0014($sp) -/* 0448C 80B5783C E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 04490 80B57840 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 04494 80B57844 AFB8001C */ sw $t8, 0x001C($sp) -/* 04498 80B57848 8FBF002C */ lw $ra, 0x002C($sp) -/* 0449C 80B5784C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 044A0 80B57850 03E00008 */ jr $ra -/* 044A4 80B57854 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57858.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57858.s deleted file mode 100644 index 077b4f6ce3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57858.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B57858 -/* 044A8 80B57858 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 044AC 80B5785C AFBF0014 */ sw $ra, 0x0014($sp) -/* 044B0 80B57860 3C0580B6 */ lui $a1, %hi(D_80B5A498) ## $a1 = 80B60000 -/* 044B4 80B57864 AFA40018 */ sw $a0, 0x0018($sp) -/* 044B8 80B57868 0C2D5DEF */ jal func_80B577BC -/* 044BC 80B5786C 24A5A498 */ addiu $a1, $a1, %lo(D_80B5A498) ## $a1 = 80B5A498 -/* 044C0 80B57870 3C0580B6 */ lui $a1, %hi(D_80B5A4A4) ## $a1 = 80B60000 -/* 044C4 80B57874 24A5A4A4 */ addiu $a1, $a1, %lo(D_80B5A4A4) ## $a1 = 80B5A4A4 -/* 044C8 80B57878 0C2D5DEF */ jal func_80B577BC -/* 044CC 80B5787C 8FA40018 */ lw $a0, 0x0018($sp) -/* 044D0 80B57880 8FBF0014 */ lw $ra, 0x0014($sp) -/* 044D4 80B57884 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 044D8 80B57888 03E00008 */ jr $ra -/* 044DC 80B5788C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57890.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57890.s deleted file mode 100644 index 68fa2ecd5c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57890.s +++ /dev/null @@ -1,142 +0,0 @@ -glabel func_80B57890 -/* 044E0 80B57890 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 044E4 80B57894 AFBF0014 */ sw $ra, 0x0014($sp) -/* 044E8 80B57898 3C070001 */ lui $a3, 0x0001 ## $a3 = 00010000 -/* 044EC 80B5789C 00E53821 */ addu $a3, $a3, $a1 -/* 044F0 80B578A0 90E71DEA */ lbu $a3, 0x1DEA($a3) ## 00011DEA -/* 044F4 80B578A4 84A300A4 */ lh $v1, 0x00A4($a1) ## 000000A4 -/* 044F8 80B578A8 AFA5002C */ sw $a1, 0x002C($sp) -/* 044FC 80B578AC A3A70023 */ sb $a3, 0x0023($sp) -/* 04500 80B578B0 0C2D536D */ jal func_80B54DB4 -/* 04504 80B578B4 A7A30020 */ sh $v1, 0x0020($sp) -/* 04508 80B578B8 87A30020 */ lh $v1, 0x0020($sp) -/* 0450C 80B578BC 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 04510 80B578C0 8FA6002C */ lw $a2, 0x002C($sp) -/* 04514 80B578C4 93A70023 */ lbu $a3, 0x0023($sp) -/* 04518 80B578C8 14610024 */ bne $v1, $at, .L80B5795C -/* 0451C 80B578CC 00404025 */ or $t0, $v0, $zero ## $t0 = 00000000 -/* 04520 80B578D0 24010024 */ addiu $at, $zero, 0x0024 ## $at = 00000024 -/* 04524 80B578D4 54410006 */ bnel $v0, $at, .L80B578F0 -/* 04528 80B578D8 24010025 */ addiu $at, $zero, 0x0025 ## $at = 00000025 -/* 0452C 80B578DC 54E00004 */ bnel $a3, $zero, .L80B578F0 -/* 04530 80B578E0 24010025 */ addiu $at, $zero, 0x0025 ## $at = 00000025 -/* 04534 80B578E4 1000005F */ beq $zero, $zero, .L80B57A64 -/* 04538 80B578E8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0453C 80B578EC 24010025 */ addiu $at, $zero, 0x0025 ## $at = 00000025 -.L80B578F0: -/* 04540 80B578F0 14410005 */ bne $v0, $at, .L80B57908 -/* 04544 80B578F4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 04548 80B578F8 54E10004 */ bnel $a3, $at, .L80B5790C -/* 0454C 80B578FC 24010026 */ addiu $at, $zero, 0x0026 ## $at = 00000026 -/* 04550 80B57900 10000058 */ beq $zero, $zero, .L80B57A64 -/* 04554 80B57904 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B57908: -/* 04558 80B57908 24010026 */ addiu $at, $zero, 0x0026 ## $at = 00000026 -.L80B5790C: -/* 0455C 80B5790C 14410005 */ bne $v0, $at, .L80B57924 -/* 04560 80B57910 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 04564 80B57914 54E10004 */ bnel $a3, $at, .L80B57928 -/* 04568 80B57918 24010027 */ addiu $at, $zero, 0x0027 ## $at = 00000027 -/* 0456C 80B5791C 10000051 */ beq $zero, $zero, .L80B57A64 -/* 04570 80B57920 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B57924: -/* 04574 80B57924 24010027 */ addiu $at, $zero, 0x0027 ## $at = 00000027 -.L80B57928: -/* 04578 80B57928 14410005 */ bne $v0, $at, .L80B57940 -/* 0457C 80B5792C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 04580 80B57930 54E10004 */ bnel $a3, $at, .L80B57944 -/* 04584 80B57934 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 04588 80B57938 1000004A */ beq $zero, $zero, .L80B57A64 -/* 0458C 80B5793C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B57940: -/* 04590 80B57940 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -.L80B57944: -/* 04594 80B57944 14410046 */ bne $v0, $at, .L80B57A60 -/* 04598 80B57948 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0459C 80B5794C 54E10045 */ bnel $a3, $at, .L80B57A64 -/* 045A0 80B57950 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 045A4 80B57954 10000043 */ beq $zero, $zero, .L80B57A64 -/* 045A8 80B57958 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B5795C: -/* 045AC 80B5795C 2401001A */ addiu $at, $zero, 0x001A ## $at = 0000001A -/* 045B0 80B57960 1461002F */ bne $v1, $at, .L80B57A20 -/* 045B4 80B57964 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 -/* 045B8 80B57968 54410019 */ bnel $v0, $at, .L80B579D0 -/* 045BC 80B5796C 24010021 */ addiu $at, $zero, 0x0021 ## $at = 00000021 -/* 045C0 80B57970 14E00016 */ bne $a3, $zero, .L80B579CC -/* 045C4 80B57974 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 045C8 80B57978 24050037 */ addiu $a1, $zero, 0x0037 ## $a1 = 00000037 -/* 045CC 80B5797C AFA6002C */ sw $a2, 0x002C($sp) -/* 045D0 80B57980 A3A70023 */ sb $a3, 0x0023($sp) -/* 045D4 80B57984 0C00B2D0 */ jal Flags_GetSwitch - -/* 045D8 80B57988 AFA8001C */ sw $t0, 0x001C($sp) -/* 045DC 80B5798C 8FA6002C */ lw $a2, 0x002C($sp) -/* 045E0 80B57990 93A70023 */ lbu $a3, 0x0023($sp) -/* 045E4 80B57994 1040000D */ beq $v0, $zero, .L80B579CC -/* 045E8 80B57998 8FA8001C */ lw $t0, 0x001C($sp) -/* 045EC 80B5799C 84C200A4 */ lh $v0, 0x00A4($a2) ## 000000A4 -/* 045F0 80B579A0 2401004F */ addiu $at, $zero, 0x004F ## $at = 0000004F -/* 045F4 80B579A4 10410007 */ beq $v0, $at, .L80B579C4 -/* 045F8 80B579A8 2401001A */ addiu $at, $zero, 0x001A ## $at = 0000001A -/* 045FC 80B579AC 10410005 */ beq $v0, $at, .L80B579C4 -/* 04600 80B579B0 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 04604 80B579B4 10410003 */ beq $v0, $at, .L80B579C4 -/* 04608 80B579B8 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 0460C 80B579BC 54410004 */ bnel $v0, $at, .L80B579D0 -/* 04610 80B579C0 24010021 */ addiu $at, $zero, 0x0021 ## $at = 00000021 -.L80B579C4: -/* 04614 80B579C4 10000027 */ beq $zero, $zero, .L80B57A64 -/* 04618 80B579C8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B579CC: -/* 0461C 80B579CC 24010021 */ addiu $at, $zero, 0x0021 ## $at = 00000021 -.L80B579D0: -/* 04620 80B579D0 15010005 */ bne $t0, $at, .L80B579E8 -/* 04624 80B579D4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 04628 80B579D8 54E10004 */ bnel $a3, $at, .L80B579EC -/* 0462C 80B579DC 24010022 */ addiu $at, $zero, 0x0022 ## $at = 00000022 -/* 04630 80B579E0 10000020 */ beq $zero, $zero, .L80B57A64 -/* 04634 80B579E4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B579E8: -/* 04638 80B579E8 24010022 */ addiu $at, $zero, 0x0022 ## $at = 00000022 -.L80B579EC: -/* 0463C 80B579EC 15010005 */ bne $t0, $at, .L80B57A04 -/* 04640 80B579F0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 04644 80B579F4 54E10004 */ bnel $a3, $at, .L80B57A08 -/* 04648 80B579F8 24010023 */ addiu $at, $zero, 0x0023 ## $at = 00000023 -/* 0464C 80B579FC 10000019 */ beq $zero, $zero, .L80B57A64 -/* 04650 80B57A00 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B57A04: -/* 04654 80B57A04 24010023 */ addiu $at, $zero, 0x0023 ## $at = 00000023 -.L80B57A08: -/* 04658 80B57A08 15010015 */ bne $t0, $at, .L80B57A60 -/* 0465C 80B57A0C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 04660 80B57A10 54E10014 */ bnel $a3, $at, .L80B57A64 -/* 04664 80B57A14 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 04668 80B57A18 10000012 */ beq $zero, $zero, .L80B57A64 -/* 0466C 80B57A1C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B57A20: -/* 04670 80B57A20 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 04674 80B57A24 1461000E */ bne $v1, $at, .L80B57A60 -/* 04678 80B57A28 24010029 */ addiu $at, $zero, 0x0029 ## $at = 00000029 -/* 0467C 80B57A2C 54410006 */ bnel $v0, $at, .L80B57A48 -/* 04680 80B57A30 2401002A */ addiu $at, $zero, 0x002A ## $at = 0000002A -/* 04684 80B57A34 54E00004 */ bnel $a3, $zero, .L80B57A48 -/* 04688 80B57A38 2401002A */ addiu $at, $zero, 0x002A ## $at = 0000002A -/* 0468C 80B57A3C 10000009 */ beq $zero, $zero, .L80B57A64 -/* 04690 80B57A40 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 04694 80B57A44 2401002A */ addiu $at, $zero, 0x002A ## $at = 0000002A -.L80B57A48: -/* 04698 80B57A48 54410006 */ bnel $v0, $at, .L80B57A64 -/* 0469C 80B57A4C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 046A0 80B57A50 54E00004 */ bnel $a3, $zero, .L80B57A64 -/* 046A4 80B57A54 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 046A8 80B57A58 10000002 */ beq $zero, $zero, .L80B57A64 -/* 046AC 80B57A5C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B57A60: -/* 046B0 80B57A60 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B57A64: -/* 046B4 80B57A64 8FBF0014 */ lw $ra, 0x0014($sp) -/* 046B8 80B57A68 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 046BC 80B57A6C 03E00008 */ jr $ra -/* 046C0 80B57A70 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57A74.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57A74.s deleted file mode 100644 index fbf9007cf0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57A74.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80B57A74 -/* 046C4 80B57A74 8C821C64 */ lw $v0, 0x1C64($a0) ## 00001C64 -/* 046C8 80B57A78 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 046CC 80B57A7C 240300B4 */ addiu $v1, $zero, 0x00B4 ## $v1 = 000000B4 -/* 046D0 80B57A80 10400008 */ beq $v0, $zero, .L80B57AA4 -/* 046D4 80B57A84 00000000 */ nop -/* 046D8 80B57A88 844E0000 */ lh $t6, 0x0000($v0) ## 00000000 -.L80B57A8C: -/* 046DC 80B57A8C 546E0003 */ bnel $v1, $t6, .L80B57A9C -/* 046E0 80B57A90 8C420124 */ lw $v0, 0x0124($v0) ## 00000124 -/* 046E4 80B57A94 A444015C */ sh $a0, 0x015C($v0) ## 0000015C -/* 046E8 80B57A98 8C420124 */ lw $v0, 0x0124($v0) ## 00000124 -.L80B57A9C: -/* 046EC 80B57A9C 5440FFFB */ bnel $v0, $zero, .L80B57A8C -/* 046F0 80B57AA0 844E0000 */ lh $t6, 0x0000($v0) ## 00000000 -.L80B57AA4: -/* 046F4 80B57AA4 03E00008 */ jr $ra -/* 046F8 80B57AA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57AAC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57AAC.s deleted file mode 100644 index 5af0a7495c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57AAC.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B57AAC -/* 046FC 80B57AAC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04700 80B57AB0 AFBF001C */ sw $ra, 0x001C($sp) -/* 04704 80B57AB4 10A00006 */ beq $a1, $zero, .L80B57AD0 -/* 04708 80B57AB8 AFA60028 */ sw $a2, 0x0028($sp) -/* 0470C 80B57ABC 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 04710 80B57AC0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 04714 80B57AC4 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 04718 80B57AC8 0C2D5385 */ jal func_80B54E14 -/* 0471C 80B57ACC AFA00010 */ sw $zero, 0x0010($sp) -.L80B57AD0: -/* 04720 80B57AD0 8FBF001C */ lw $ra, 0x001C($sp) -/* 04724 80B57AD4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04728 80B57AD8 03E00008 */ jr $ra -/* 0472C 80B57ADC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57AE0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57AE0.s deleted file mode 100644 index 97e0d89a7d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57AE0.s +++ /dev/null @@ -1,98 +0,0 @@ -glabel func_80B57AE0 -/* 04730 80B57AE0 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 04734 80B57AE4 AFBF001C */ sw $ra, 0x001C($sp) -/* 04738 80B57AE8 AFB10018 */ sw $s1, 0x0018($sp) -/* 0473C 80B57AEC AFB00014 */ sw $s0, 0x0014($sp) -/* 04740 80B57AF0 AFA5004C */ sw $a1, 0x004C($sp) -/* 04744 80B57AF4 848E00B6 */ lh $t6, 0x00B6($a0) ## 000000B6 -/* 04748 80B57AF8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0474C 80B57AFC 24910348 */ addiu $s1, $a0, 0x0348 ## $s1 = 00000348 -/* 04750 80B57B00 A7AE0042 */ sh $t6, 0x0042($sp) -/* 04754 80B57B04 8C8F0314 */ lw $t7, 0x0314($a0) ## 00000314 -/* 04758 80B57B08 8C880024 */ lw $t0, 0x0024($a0) ## 00000024 -/* 0475C 80B57B0C A4800344 */ sh $zero, 0x0344($a0) ## 00000344 -/* 04760 80B57B10 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 04764 80B57B14 AC980314 */ sw $t8, 0x0314($a0) ## 00000314 -/* 04768 80B57B18 E4800360 */ swc1 $f0, 0x0360($a0) ## 00000360 -/* 0476C 80B57B1C E4800364 */ swc1 $f0, 0x0364($a0) ## 00000364 -/* 04770 80B57B20 E4800368 */ swc1 $f0, 0x0368($a0) ## 00000368 -/* 04774 80B57B24 AE280000 */ sw $t0, 0x0000($s1) ## 00000348 -/* 04778 80B57B28 8C990028 */ lw $t9, 0x0028($a0) ## 00000028 -/* 0477C 80B57B2C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04780 80B57B30 AE390004 */ sw $t9, 0x0004($s1) ## 0000034C -/* 04784 80B57B34 8C88002C */ lw $t0, 0x002C($a0) ## 0000002C -/* 04788 80B57B38 AE280008 */ sw $t0, 0x0008($s1) ## 00000350 -/* 0478C 80B57B3C 0C2D5BEB */ jal func_80B56FAC -/* 04790 80B57B40 8E050314 */ lw $a1, 0x0314($s0) ## 00000314 -/* 04794 80B57B44 10400012 */ beq $v0, $zero, .L80B57B90 -/* 04798 80B57B48 00000000 */ nop -/* 0479C 80B57B4C 84490000 */ lh $t1, 0x0000($v0) ## 00000000 -/* 047A0 80B57B50 26030354 */ addiu $v1, $s0, 0x0354 ## $v1 = 00000354 -/* 047A4 80B57B54 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 047A8 80B57B58 00000000 */ nop -/* 047AC 80B57B5C 468021A0 */ cvt.s.w $f6, $f4 -/* 047B0 80B57B60 E4660000 */ swc1 $f6, 0x0000($v1) ## 00000354 -/* 047B4 80B57B64 844A0002 */ lh $t2, 0x0002($v0) ## 00000002 -/* 047B8 80B57B68 448A4000 */ mtc1 $t2, $f8 ## $f8 = 0.00 -/* 047BC 80B57B6C 00000000 */ nop -/* 047C0 80B57B70 468042A0 */ cvt.s.w $f10, $f8 -/* 047C4 80B57B74 E46A0004 */ swc1 $f10, 0x0004($v1) ## 00000358 -/* 047C8 80B57B78 844B0004 */ lh $t3, 0x0004($v0) ## 00000004 -/* 047CC 80B57B7C 448B8000 */ mtc1 $t3, $f16 ## $f16 = 0.00 -/* 047D0 80B57B80 00000000 */ nop -/* 047D4 80B57B84 468084A0 */ cvt.s.w $f18, $f16 -/* 047D8 80B57B88 10000016 */ beq $zero, $zero, .L80B57BE4 -/* 047DC 80B57B8C E4720008 */ swc1 $f18, 0x0008($v1) ## 0000035C -.L80B57B90: -/* 047E0 80B57B90 0C01DE1C */ jal Math_Sins - ## sins? -/* 047E4 80B57B94 87A40042 */ lh $a0, 0x0042($sp) -/* 047E8 80B57B98 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 047EC 80B57B9C 44812000 */ mtc1 $at, $f4 ## $f4 = 200.00 -/* 047F0 80B57BA0 C6280000 */ lwc1 $f8, 0x0000($s1) ## 00000348 -/* 047F4 80B57BA4 26030354 */ addiu $v1, $s0, 0x0354 ## $v1 = 00000354 -/* 047F8 80B57BA8 46040182 */ mul.s $f6, $f0, $f4 -/* 047FC 80B57BAC 46083280 */ add.s $f10, $f6, $f8 -/* 04800 80B57BB0 E46A0000 */ swc1 $f10, 0x0000($v1) ## 00000354 -/* 04804 80B57BB4 C6300004 */ lwc1 $f16, 0x0004($s1) ## 0000034C -/* 04808 80B57BB8 E4700004 */ swc1 $f16, 0x0004($v1) ## 00000358 -/* 0480C 80B57BBC AFA30020 */ sw $v1, 0x0020($sp) -/* 04810 80B57BC0 0C01DE0D */ jal Math_Coss - ## coss? -/* 04814 80B57BC4 87A40042 */ lh $a0, 0x0042($sp) -/* 04818 80B57BC8 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 0481C 80B57BCC 44819000 */ mtc1 $at, $f18 ## $f18 = 200.00 -/* 04820 80B57BD0 C6260008 */ lwc1 $f6, 0x0008($s1) ## 00000350 -/* 04824 80B57BD4 8FA30020 */ lw $v1, 0x0020($sp) -/* 04828 80B57BD8 46120102 */ mul.s $f4, $f0, $f18 -/* 0482C 80B57BDC 46062200 */ add.s $f8, $f4, $f6 -/* 04830 80B57BE0 E4680008 */ swc1 $f8, 0x0008($v1) ## 00000008 -.L80B57BE4: -/* 04834 80B57BE4 C46A0000 */ lwc1 $f10, 0x0000($v1) ## 00000000 -/* 04838 80B57BE8 C6300000 */ lwc1 $f16, 0x0000($s1) ## 00000348 -/* 0483C 80B57BEC C4720008 */ lwc1 $f18, 0x0008($v1) ## 00000008 -/* 04840 80B57BF0 C6240008 */ lwc1 $f4, 0x0008($s1) ## 00000350 -/* 04844 80B57BF4 46105081 */ sub.s $f2, $f10, $f16 -/* 04848 80B57BF8 3C0C8016 */ lui $t4, %hi(gGameInfo) -/* 0484C 80B57BFC 8D8CFA90 */ lw $t4, %lo(gGameInfo)($t4) -/* 04850 80B57C00 46049301 */ sub.s $f12, $f18, $f4 -/* 04854 80B57C04 46021182 */ mul.s $f6, $f2, $f2 -/* 04858 80B57C08 858D1460 */ lh $t5, 0x1460($t4) ## 80161460 -/* 0485C 80B57C0C 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 04860 80B57C10 460C6202 */ mul.s $f8, $f12, $f12 -/* 04864 80B57C14 448D5000 */ mtc1 $t5, $f10 ## $f10 = 0.00 -/* 04868 80B57C18 44819000 */ mtc1 $at, $f18 ## $f18 = 8.00 -/* 0486C 80B57C1C 46805420 */ cvt.s.w $f16, $f10 -/* 04870 80B57C20 46083000 */ add.s $f0, $f6, $f8 -/* 04874 80B57C24 46128100 */ add.s $f4, $f16, $f18 -/* 04878 80B57C28 46000004 */ sqrt.s $f0, $f0 -/* 0487C 80B57C2C 46040183 */ div.s $f6, $f0, $f4 -/* 04880 80B57C30 4600320D */ trunc.w.s $f8, $f6 -/* 04884 80B57C34 440F4000 */ mfc1 $t7, $f8 -/* 04888 80B57C38 00000000 */ nop -/* 0488C 80B57C3C A60F0346 */ sh $t7, 0x0346($s0) ## 00000346 -/* 04890 80B57C40 8FBF001C */ lw $ra, 0x001C($sp) -/* 04894 80B57C44 8FB10018 */ lw $s1, 0x0018($sp) -/* 04898 80B57C48 8FB00014 */ lw $s0, 0x0014($sp) -/* 0489C 80B57C4C 03E00008 */ jr $ra -/* 048A0 80B57C50 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57C54.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57C54.s deleted file mode 100644 index 0b1e072a47..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57C54.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80B57C54 -/* 048A4 80B57C54 948E0344 */ lhu $t6, 0x0344($a0) ## 00000344 -/* 048A8 80B57C58 948F0346 */ lhu $t7, 0x0346($a0) ## 00000346 -/* 048AC 80B57C5C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 048B0 80B57C60 01CF082A */ slt $at, $t6, $t7 -/* 048B4 80B57C64 14200003 */ bne $at, $zero, .L80B57C74 -/* 048B8 80B57C68 00000000 */ nop -/* 048BC 80B57C6C 03E00008 */ jr $ra -/* 048C0 80B57C70 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B57C74: -/* 048C4 80B57C74 03E00008 */ jr $ra -/* 048C8 80B57C78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57C7C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57C7C.s deleted file mode 100644 index 16b252474e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57C7C.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80B57C7C -/* 048CC 80B57C7C AFA40000 */ sw $a0, 0x0000($sp) -/* 048D0 80B57C80 AFA50004 */ sw $a1, 0x0004($sp) -/* 048D4 80B57C84 03E00008 */ jr $ra -/* 048D8 80B57C88 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57C8C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57C8C.s deleted file mode 100644 index f36cf81b1e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57C8C.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B57C8C -/* 048DC 80B57C8C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 048E0 80B57C90 AFBF0014 */ sw $ra, 0x0014($sp) -/* 048E4 80B57C94 8C850314 */ lw $a1, 0x0314($a0) ## 00000314 -/* 048E8 80B57C98 0C2D5BE3 */ jal func_80B56F8C -/* 048EC 80B57C9C 24A50002 */ addiu $a1, $a1, 0x0002 ## $a1 = 00000002 -/* 048F0 80B57CA0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 048F4 80B57CA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 048F8 80B57CA8 2C420001 */ sltiu $v0, $v0, 0x0001 -/* 048FC 80B57CAC 03E00008 */ jr $ra -/* 04900 80B57CB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57CB4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57CB4.s deleted file mode 100644 index d4df7b8fcb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57CB4.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80B57CB4 -/* 04904 80B57CB4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04908 80B57CB8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0490C 80B57CBC AFB00020 */ sw $s0, 0x0020($sp) -/* 04910 80B57CC0 AFA5002C */ sw $a1, 0x002C($sp) -/* 04914 80B57CC4 948E0344 */ lhu $t6, 0x0344($a0) ## 00000344 -/* 04918 80B57CC8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0491C 80B57CCC 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 04920 80B57CD0 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 04924 80B57CD4 A48F0344 */ sh $t7, 0x0344($a0) ## 00000344 -/* 04928 80B57CD8 96060344 */ lhu $a2, 0x0344($s0) ## 00000344 -/* 0492C 80B57CDC 94840346 */ lhu $a0, 0x0346($a0) ## 00000346 -/* 04930 80B57CE0 AFB80010 */ sw $t8, 0x0010($sp) -/* 04934 80B57CE4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 04938 80B57CE8 0C01BE6F */ jal func_8006F9BC -/* 0493C 80B57CEC 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 04940 80B57CF0 26020348 */ addiu $v0, $s0, 0x0348 ## $v0 = 00000348 -/* 04944 80B57CF4 26030354 */ addiu $v1, $s0, 0x0354 ## $v1 = 00000354 -/* 04948 80B57CF8 C4640000 */ lwc1 $f4, 0x0000($v1) ## 00000354 -/* 0494C 80B57CFC C4420000 */ lwc1 $f2, 0x0000($v0) ## 00000348 -/* 04950 80B57D00 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 04954 80B57D04 46022181 */ sub.s $f6, $f4, $f2 -/* 04958 80B57D08 46060202 */ mul.s $f8, $f0, $f6 -/* 0495C 80B57D0C 46081280 */ add.s $f10, $f2, $f8 -/* 04960 80B57D10 E48A0000 */ swc1 $f10, 0x0000($a0) ## 00000024 -/* 04964 80B57D14 C4700004 */ lwc1 $f16, 0x0004($v1) ## 00000358 -/* 04968 80B57D18 C44C0004 */ lwc1 $f12, 0x0004($v0) ## 0000034C -/* 0496C 80B57D1C C6080360 */ lwc1 $f8, 0x0360($s0) ## 00000360 -/* 04970 80B57D20 460C8481 */ sub.s $f18, $f16, $f12 -/* 04974 80B57D24 46120102 */ mul.s $f4, $f0, $f18 -/* 04978 80B57D28 46046180 */ add.s $f6, $f12, $f4 -/* 0497C 80B57D2C 46083280 */ add.s $f10, $f6, $f8 -/* 04980 80B57D30 E48A0004 */ swc1 $f10, 0x0004($a0) ## 00000028 -/* 04984 80B57D34 C4700008 */ lwc1 $f16, 0x0008($v1) ## 0000035C -/* 04988 80B57D38 C44E0008 */ lwc1 $f14, 0x0008($v0) ## 00000350 -/* 0498C 80B57D3C 460E8481 */ sub.s $f18, $f16, $f14 -/* 04990 80B57D40 46120102 */ mul.s $f4, $f0, $f18 -/* 04994 80B57D44 46047180 */ add.s $f6, $f14, $f4 -/* 04998 80B57D48 E4860008 */ swc1 $f6, 0x0008($a0) ## 0000002C -/* 0499C 80B57D4C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 049A0 80B57D50 8FB00020 */ lw $s0, 0x0020($sp) -/* 049A4 80B57D54 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 049A8 80B57D58 03E00008 */ jr $ra -/* 049AC 80B57D5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57D60.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57D60.s deleted file mode 100644 index 2a000d4ffb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57D60.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80B57D60 -/* 049B0 80B57D60 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 049B4 80B57D64 AFBF0014 */ sw $ra, 0x0014($sp) -/* 049B8 80B57D68 0C2D5C90 */ jal func_80B57240 -/* 049BC 80B57D6C AFA5001C */ sw $a1, 0x001C($sp) -/* 049C0 80B57D70 8FBF0014 */ lw $ra, 0x0014($sp) -/* 049C4 80B57D74 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 049C8 80B57D78 03E00008 */ jr $ra -/* 049CC 80B57D7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57D80.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57D80.s deleted file mode 100644 index 201d896ed4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57D80.s +++ /dev/null @@ -1,81 +0,0 @@ -glabel func_80B57D80 -/* 049D0 80B57D80 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 049D4 80B57D84 AFBF001C */ sw $ra, 0x001C($sp) -/* 049D8 80B57D88 AFB00018 */ sw $s0, 0x0018($sp) -/* 049DC 80B57D8C 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 049E0 80B57D90 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 049E4 80B57D94 AFAE0038 */ sw $t6, 0x0038($sp) -/* 049E8 80B57D98 0C2D5C41 */ jal func_80B57104 -/* 049EC 80B57D9C 8C850314 */ lw $a1, 0x0314($a0) ## 00000314 -/* 049F0 80B57DA0 8FAF0038 */ lw $t7, 0x0038($sp) -/* 049F4 80B57DA4 A7A20032 */ sh $v0, 0x0032($sp) -/* 049F8 80B57DA8 260503F8 */ addiu $a1, $s0, 0x03F8 ## $a1 = 000003F8 -/* 049FC 80B57DAC C5E40028 */ lwc1 $f4, 0x0028($t7) ## 00000028 -/* 04A00 80B57DB0 00022400 */ sll $a0, $v0, 16 -/* 04A04 80B57DB4 00042403 */ sra $a0, $a0, 16 -/* 04A08 80B57DB8 E4A4001C */ swc1 $f4, 0x001C($a1) ## 00000414 -/* 04A0C 80B57DBC 0C01DE1C */ jal Math_Sins - ## sins? -/* 04A10 80B57DC0 AFA50024 */ sw $a1, 0x0024($sp) -/* 04A14 80B57DC4 C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 -/* 04A18 80B57DC8 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 04A1C 80B57DCC 8FA50024 */ lw $a1, 0x0024($sp) -/* 04A20 80B57DD0 46060202 */ mul.s $f8, $f0, $f6 -/* 04A24 80B57DD4 460A4400 */ add.s $f16, $f8, $f10 -/* 04A28 80B57DD8 E4B00018 */ swc1 $f16, 0x0018($a1) ## 00000018 -/* 04A2C 80B57DDC 0C01DE0D */ jal Math_Coss - ## coss? -/* 04A30 80B57DE0 87A40032 */ lh $a0, 0x0032($sp) -/* 04A34 80B57DE4 C6120090 */ lwc1 $f18, 0x0090($s0) ## 00000090 -/* 04A38 80B57DE8 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 04A3C 80B57DEC 8FA50024 */ lw $a1, 0x0024($sp) -/* 04A40 80B57DF0 46120102 */ mul.s $f4, $f0, $f18 -/* 04A44 80B57DF4 3C028016 */ lui $v0, %hi(gGameInfo) -/* 04A48 80B57DF8 2442FA90 */ addiu $v0, %lo(gGameInfo) -/* 04A4C 80B57DFC 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 04A50 80B57E00 44819000 */ mtc1 $at, $f18 ## $f18 = 16.00 -/* 04A54 80B57E04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04A58 80B57E08 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 04A5C 80B57E0C 46062200 */ add.s $f8, $f4, $f6 -/* 04A60 80B57E10 E4A80020 */ swc1 $f8, 0x0020($a1) ## 00000020 -/* 04A64 80B57E14 8C580000 */ lw $t8, 0x0000($v0) ## 8015FA90 -/* 04A68 80B57E18 87191474 */ lh $t9, 0x1474($t8) ## 00001474 -/* 04A6C 80B57E1C 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 04A70 80B57E20 00000000 */ nop -/* 04A74 80B57E24 46805420 */ cvt.s.w $f16, $f10 -/* 04A78 80B57E28 46128101 */ sub.s $f4, $f16, $f18 -/* 04A7C 80B57E2C E4A40014 */ swc1 $f4, 0x0014($a1) ## 00000014 -/* 04A80 80B57E30 8C480000 */ lw $t0, 0x0000($v0) ## 8015FA90 -/* 04A84 80B57E34 85061476 */ lh $a2, 0x1476($t0) ## 00001476 -/* 04A88 80B57E38 24C6000C */ addiu $a2, $a2, 0x000C ## $a2 = 0000000C -/* 04A8C 80B57E3C 00063400 */ sll $a2, $a2, 16 -/* 04A90 80B57E40 0C00D285 */ jal func_80034A14 -/* 04A94 80B57E44 00063403 */ sra $a2, $a2, 16 -/* 04A98 80B57E48 260200B6 */ addiu $v0, $s0, 0x00B6 ## $v0 = 000000B6 -/* 04A9C 80B57E4C 87A60032 */ lh $a2, 0x0032($sp) -/* 04AA0 80B57E50 84450000 */ lh $a1, 0x0000($v0) ## 000000B6 -/* 04AA4 80B57E54 00C52023 */ subu $a0, $a2, $a1 -/* 04AA8 80B57E58 04800004 */ bltz $a0, .L80B57E6C -/* 04AAC 80B57E5C 00041823 */ subu $v1, $zero, $a0 -/* 04AB0 80B57E60 00041C00 */ sll $v1, $a0, 16 -/* 04AB4 80B57E64 10000003 */ beq $zero, $zero, .L80B57E74 -/* 04AB8 80B57E68 00031C03 */ sra $v1, $v1, 16 -.L80B57E6C: -/* 04ABC 80B57E6C 00031C00 */ sll $v1, $v1, 16 -/* 04AC0 80B57E70 00031C03 */ sra $v1, $v1, 16 -.L80B57E74: -/* 04AC4 80B57E74 28610321 */ slti $at, $v1, 0x0321 -/* 04AC8 80B57E78 50200007 */ beql $at, $zero, .L80B57E98 -/* 04ACC 80B57E7C A6050032 */ sh $a1, 0x0032($s0) ## 00000032 -/* 04AD0 80B57E80 A4460000 */ sh $a2, 0x0000($v0) ## 000000B6 -/* 04AD4 80B57E84 84490000 */ lh $t1, 0x0000($v0) ## 000000B6 -/* 04AD8 80B57E88 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 04ADC 80B57E8C A6090032 */ sh $t1, 0x0032($s0) ## 00000032 -/* 04AE0 80B57E90 84450000 */ lh $a1, 0x0000($v0) ## 000000B6 -/* 04AE4 80B57E94 A6050032 */ sh $a1, 0x0032($s0) ## 00000032 -.L80B57E98: -/* 04AE8 80B57E98 8FBF001C */ lw $ra, 0x001C($sp) -/* 04AEC 80B57E9C 8FB00018 */ lw $s0, 0x0018($sp) -/* 04AF0 80B57EA0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 04AF4 80B57EA4 03E00008 */ jr $ra -/* 04AF8 80B57EA8 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57EAC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57EAC.s deleted file mode 100644 index 6df342219f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57EAC.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80B57EAC -/* 04AFC 80B57EAC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04B00 80B57EB0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04B04 80B57EB4 AFA5001C */ sw $a1, 0x001C($sp) -/* 04B08 80B57EB8 0C2D5CC9 */ jal func_80B57324 -/* 04B0C 80B57EBC AFA40018 */ sw $a0, 0x0018($sp) -/* 04B10 80B57EC0 10400004 */ beq $v0, $zero, .L80B57ED4 -/* 04B14 80B57EC4 8FA40018 */ lw $a0, 0x0018($sp) -/* 04B18 80B57EC8 240E001A */ addiu $t6, $zero, 0x001A ## $t6 = 0000001A -/* 04B1C 80B57ECC 10000003 */ beq $zero, $zero, .L80B57EDC -/* 04B20 80B57ED0 AC8E024C */ sw $t6, 0x024C($a0) ## 0000024C -.L80B57ED4: -/* 04B24 80B57ED4 0C2D5CD4 */ jal func_80B57350 -/* 04B28 80B57ED8 8FA5001C */ lw $a1, 0x001C($sp) -.L80B57EDC: -/* 04B2C 80B57EDC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04B30 80B57EE0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04B34 80B57EE4 03E00008 */ jr $ra -/* 04B38 80B57EE8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57EEC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57EEC.s deleted file mode 100644 index 584afd4ce0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57EEC.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80B57EEC -/* 04B3C 80B57EEC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04B40 80B57EF0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04B44 80B57EF4 0C2D5CF2 */ jal func_80B573C8 -/* 04B48 80B57EF8 AFA40018 */ sw $a0, 0x0018($sp) -/* 04B4C 80B57EFC 10400003 */ beq $v0, $zero, .L80B57F0C -/* 04B50 80B57F00 8FAF0018 */ lw $t7, 0x0018($sp) -/* 04B54 80B57F04 240E001B */ addiu $t6, $zero, 0x001B ## $t6 = 0000001B -/* 04B58 80B57F08 ADEE024C */ sw $t6, 0x024C($t7) ## 0000024C -.L80B57F0C: -/* 04B5C 80B57F0C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04B60 80B57F10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04B64 80B57F14 03E00008 */ jr $ra -/* 04B68 80B57F18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57F1C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57F1C.s deleted file mode 100644 index 0ddf4c4972..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57F1C.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80B57F1C -/* 04B6C 80B57F1C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04B70 80B57F20 AFBF001C */ sw $ra, 0x001C($sp) -/* 04B74 80B57F24 AFA50024 */ sw $a1, 0x0024($sp) -/* 04B78 80B57F28 0C2D5F60 */ jal func_80B57D80 -/* 04B7C 80B57F2C AFA40020 */ sw $a0, 0x0020($sp) -/* 04B80 80B57F30 14400010 */ bne $v0, $zero, .L80B57F74 -/* 04B84 80B57F34 8FA40020 */ lw $a0, 0x0020($sp) -/* 04B88 80B57F38 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 04B8C 80B57F3C 24A59BE4 */ addiu $a1, $a1, 0x9BE4 ## $a1 = 06009BE4 -/* 04B90 80B57F40 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 04B94 80B57F44 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 04B98 80B57F48 AFA00010 */ sw $zero, 0x0010($sp) -/* 04B9C 80B57F4C 0C2D5385 */ jal func_80B54E14 -/* 04BA0 80B57F50 AFA40020 */ sw $a0, 0x0020($sp) -/* 04BA4 80B57F54 8FA40020 */ lw $a0, 0x0020($sp) -/* 04BA8 80B57F58 240E0022 */ addiu $t6, $zero, 0x0022 ## $t6 = 00000022 -/* 04BAC 80B57F5C 8C8F0314 */ lw $t7, 0x0314($a0) ## 00000314 -/* 04BB0 80B57F60 AC8E024C */ sw $t6, 0x024C($a0) ## 0000024C -/* 04BB4 80B57F64 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 04BB8 80B57F68 AC980314 */ sw $t8, 0x0314($a0) ## 00000314 -/* 04BBC 80B57F6C 0C2D5EB8 */ jal func_80B57AE0 -/* 04BC0 80B57F70 8FA50024 */ lw $a1, 0x0024($sp) -.L80B57F74: -/* 04BC4 80B57F74 8FBF001C */ lw $ra, 0x001C($sp) -/* 04BC8 80B57F78 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04BCC 80B57F7C 03E00008 */ jr $ra -/* 04BD0 80B57F80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57F84.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57F84.s deleted file mode 100644 index 5edb16d677..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57F84.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_80B57F84 -/* 04BD4 80B57F84 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04BD8 80B57F88 AFBF0024 */ sw $ra, 0x0024($sp) -/* 04BDC 80B57F8C AFB00020 */ sw $s0, 0x0020($sp) -/* 04BE0 80B57F90 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04BE4 80B57F94 0C2D5D74 */ jal func_80B575D0 -/* 04BE8 80B57F98 AFA5002C */ sw $a1, 0x002C($sp) -/* 04BEC 80B57F9C 10400017 */ beq $v0, $zero, .L80B57FFC -/* 04BF0 80B57FA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04BF4 80B57FA4 0C2D5F1F */ jal func_80B57C7C -/* 04BF8 80B57FA8 8FA5002C */ lw $a1, 0x002C($sp) -/* 04BFC 80B57FAC 50400014 */ beql $v0, $zero, .L80B58000 -/* 04C00 80B57FB0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 04C04 80B57FB4 0C02FF21 */ jal Gameplay_InCsMode -/* 04C08 80B57FB8 8FA4002C */ lw $a0, 0x002C($sp) -/* 04C0C 80B57FBC 1440000F */ bne $v0, $zero, .L80B57FFC -/* 04C10 80B57FC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04C14 80B57FC4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 04C18 80B57FC8 24A59FBC */ addiu $a1, $a1, 0x9FBC ## $a1 = 06009FBC -/* 04C1C 80B57FCC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 04C20 80B57FD0 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 04C24 80B57FD4 0C2D5385 */ jal func_80B54E14 -/* 04C28 80B57FD8 AFA00010 */ sw $zero, 0x0010($sp) -/* 04C2C 80B57FDC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 04C30 80B57FE0 240E0024 */ addiu $t6, $zero, 0x0024 ## $t6 = 00000024 -/* 04C34 80B57FE4 AE0E024C */ sw $t6, 0x024C($s0) ## 0000024C -/* 04C38 80B57FE8 E60402EC */ swc1 $f4, 0x02EC($s0) ## 000002EC -/* 04C3C 80B57FEC 0C2D5E9D */ jal func_80B57A74 -/* 04C40 80B57FF0 8FA4002C */ lw $a0, 0x002C($sp) -/* 04C44 80B57FF4 10000002 */ beq $zero, $zero, .L80B58000 -/* 04C48 80B57FF8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B57FFC: -/* 04C4C 80B57FFC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B58000: -/* 04C50 80B58000 8FBF0024 */ lw $ra, 0x0024($sp) -/* 04C54 80B58004 8FB00020 */ lw $s0, 0x0020($sp) -/* 04C58 80B58008 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04C5C 80B5800C 03E00008 */ jr $ra -/* 04C60 80B58010 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58014.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58014.s deleted file mode 100644 index 910a1cdfe3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58014.s +++ /dev/null @@ -1,137 +0,0 @@ -glabel func_80B58014 -/* 04C64 80B58014 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 04C68 80B58018 AFBF0024 */ sw $ra, 0x0024($sp) -/* 04C6C 80B5801C AFB10020 */ sw $s1, 0x0020($sp) -/* 04C70 80B58020 AFB0001C */ sw $s0, 0x001C($sp) -/* 04C74 80B58024 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 04C78 80B58028 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04C7C 80B5802C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 04C80 80B58030 804E0A78 */ lb $t6, 0x0A78($v0) ## 00000A78 -/* 04C84 80B58034 AFA20030 */ sw $v0, 0x0030($sp) -/* 04C88 80B58038 0C2D5CC9 */ jal func_80B57324 -/* 04C8C 80B5803C A3AE002F */ sb $t6, 0x002F($sp) -/* 04C90 80B58040 1040000D */ beq $v0, $zero, .L80B58078 -/* 04C94 80B58044 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04C98 80B58048 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 04C9C 80B5804C 24A53FF8 */ addiu $a1, $a1, 0x3FF8 ## $a1 = 06003FF8 -/* 04CA0 80B58050 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 04CA4 80B58054 3C07C130 */ lui $a3, 0xC130 ## $a3 = C1300000 -/* 04CA8 80B58058 0C2D5385 */ jal func_80B54E14 -/* 04CAC 80B5805C AFA00010 */ sw $zero, 0x0010($sp) -/* 04CB0 80B58060 240F001D */ addiu $t7, $zero, 0x001D ## $t7 = 0000001D -/* 04CB4 80B58064 AE0F024C */ sw $t7, 0x024C($s0) ## 0000024C -/* 04CB8 80B58068 0C2D4E2C */ jal func_80B538B0 -/* 04CBC 80B5806C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04CC0 80B58070 10000064 */ beq $zero, $zero, .L80B58204 -/* 04CC4 80B58074 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B58078: -/* 04CC8 80B58078 0C2D5F23 */ jal func_80B57C8C -/* 04CCC 80B5807C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04CD0 80B58080 1040000C */ beq $v0, $zero, .L80B580B4 -/* 04CD4 80B58084 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04CD8 80B58088 0C2D5FE1 */ jal func_80B57F84 -/* 04CDC 80B5808C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 04CE0 80B58090 10400008 */ beq $v0, $zero, .L80B580B4 -/* 04CE4 80B58094 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 04CE8 80B58098 24050FA0 */ addiu $a1, $zero, 0x0FA0 ## $a1 = 00000FA0 -/* 04CEC 80B5809C 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 04CF0 80B580A0 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 04CF4 80B580A4 0C02003E */ jal func_800800F8 -/* 04CF8 80B580A8 AFA00010 */ sw $zero, 0x0010($sp) -/* 04CFC 80B580AC 10000054 */ beq $zero, $zero, .L80B58200 -/* 04D00 80B580B0 A60003D0 */ sh $zero, 0x03D0($s0) ## 000003D0 -.L80B580B4: -/* 04D04 80B580B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04D08 80B580B8 0C2D5DB2 */ jal func_80B576C8 -/* 04D0C 80B580BC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 04D10 80B580C0 10400018 */ beq $v0, $zero, .L80B58124 -/* 04D14 80B580C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04D18 80B580C8 0C2D5D6C */ jal func_80B575B0 -/* 04D1C 80B580CC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 04D20 80B580D0 10400014 */ beq $v0, $zero, .L80B58124 -/* 04D24 80B580D4 00000000 */ nop -/* 04D28 80B580D8 0C02FF21 */ jal Gameplay_InCsMode -/* 04D2C 80B580DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 04D30 80B580E0 14400010 */ bne $v0, $zero, .L80B58124 -/* 04D34 80B580E4 2418001F */ addiu $t8, $zero, 0x001F ## $t8 = 0000001F -/* 04D38 80B580E8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 04D3C 80B580EC AE18024C */ sw $t8, 0x024C($s0) ## 0000024C -/* 04D40 80B580F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04D44 80B580F4 0C2D4DFA */ jal func_80B537E8 -/* 04D48 80B580F8 E60403CC */ swc1 $f4, 0x03CC($s0) ## 000003CC -/* 04D4C 80B580FC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 04D50 80B58100 AE1903D8 */ sw $t9, 0x03D8($s0) ## 000003D8 -/* 04D54 80B58104 AFA00010 */ sw $zero, 0x0010($sp) -/* 04D58 80B58108 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 04D5C 80B5810C 24050FAA */ addiu $a1, $zero, 0x0FAA ## $a1 = 00000FAA -/* 04D60 80B58110 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 04D64 80B58114 0C02003E */ jal func_800800F8 -/* 04D68 80B58118 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 04D6C 80B5811C 10000039 */ beq $zero, $zero, .L80B58204 -/* 04D70 80B58120 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B58124: -/* 04D74 80B58124 0C2D5F23 */ jal func_80B57C8C -/* 04D78 80B58128 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04D7C 80B5812C 1440001A */ bne $v0, $zero, .L80B58198 -/* 04D80 80B58130 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04D84 80B58134 0C2D5DB2 */ jal func_80B576C8 -/* 04D88 80B58138 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 04D8C 80B5813C 14400016 */ bne $v0, $zero, .L80B58198 -/* 04D90 80B58140 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04D94 80B58144 0C2D5D59 */ jal func_80B57564 -/* 04D98 80B58148 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 04D9C 80B5814C 10400012 */ beq $v0, $zero, .L80B58198 -/* 04DA0 80B58150 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04DA4 80B58154 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 04DA8 80B58158 24A59BE4 */ addiu $a1, $a1, 0x9BE4 ## $a1 = 06009BE4 -/* 04DAC 80B5815C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 04DB0 80B58160 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 04DB4 80B58164 0C2D5385 */ jal func_80B54E14 -/* 04DB8 80B58168 AFA00010 */ sw $zero, 0x0010($sp) -/* 04DBC 80B5816C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04DC0 80B58170 0C2D5D93 */ jal func_80B5764C -/* 04DC4 80B58174 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 04DC8 80B58178 24080022 */ addiu $t0, $zero, 0x0022 ## $t0 = 00000022 -/* 04DCC 80B5817C AE08024C */ sw $t0, 0x024C($s0) ## 0000024C -/* 04DD0 80B58180 A60003D0 */ sh $zero, 0x03D0($s0) ## 000003D0 -/* 04DD4 80B58184 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04DD8 80B58188 0C2D5EB8 */ jal func_80B57AE0 -/* 04DDC 80B5818C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 04DE0 80B58190 1000001C */ beq $zero, $zero, .L80B58204 -/* 04DE4 80B58194 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B58198: -/* 04DE8 80B58198 83A9002F */ lb $t1, 0x002F($sp) -/* 04DEC 80B5819C 8FAA0030 */ lw $t2, 0x0030($sp) -/* 04DF0 80B581A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04DF4 80B581A4 1D200004 */ bgtz $t1, .L80B581B8 -/* 04DF8 80B581A8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 04DFC 80B581AC 854B0896 */ lh $t3, 0x0896($t2) ## 00000896 -/* 04E00 80B581B0 29610033 */ slti $at, $t3, 0x0033 -/* 04E04 80B581B4 1420000D */ bne $at, $zero, .L80B581EC -.L80B581B8: -/* 04E08 80B581B8 24A57664 */ addiu $a1, $a1, 0x7664 ## $a1 = 06007664 -/* 04E0C 80B581BC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 04E10 80B581C0 3C07C130 */ lui $a3, 0xC130 ## $a3 = C1300000 -/* 04E14 80B581C4 0C2D5385 */ jal func_80B54E14 -/* 04E18 80B581C8 AFA00010 */ sw $zero, 0x0010($sp) -/* 04E1C 80B581CC 240C001E */ addiu $t4, $zero, 0x001E ## $t4 = 0000001E -/* 04E20 80B581D0 AE0C024C */ sw $t4, 0x024C($s0) ## 0000024C -/* 04E24 80B581D4 0C2D4DFA */ jal func_80B537E8 -/* 04E28 80B581D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04E2C 80B581DC 0C2D5B72 */ jal func_80B56DC8 -/* 04E30 80B581E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04E34 80B581E4 10000007 */ beq $zero, $zero, .L80B58204 -/* 04E38 80B581E8 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B581EC: -/* 04E3C 80B581EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04E40 80B581F0 0C2D5CD4 */ jal func_80B57350 -/* 04E44 80B581F4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 04E48 80B581F8 0C2D4E2C */ jal func_80B538B0 -/* 04E4C 80B581FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B58200: -/* 04E50 80B58200 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B58204: -/* 04E54 80B58204 8FB0001C */ lw $s0, 0x001C($sp) -/* 04E58 80B58208 8FB10020 */ lw $s1, 0x0020($sp) -/* 04E5C 80B5820C 03E00008 */ jr $ra -/* 04E60 80B58210 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58214.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58214.s deleted file mode 100644 index be350d83ff..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58214.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B58214 -/* 04E64 80B58214 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04E68 80B58218 AFBF001C */ sw $ra, 0x001C($sp) -/* 04E6C 80B5821C 0C2D5CF2 */ jal func_80B573C8 -/* 04E70 80B58220 AFA40020 */ sw $a0, 0x0020($sp) -/* 04E74 80B58224 1040000C */ beq $v0, $zero, .L80B58258 -/* 04E78 80B58228 8FA40020 */ lw $a0, 0x0020($sp) -/* 04E7C 80B5822C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 04E80 80B58230 24A59FBC */ addiu $a1, $a1, 0x9FBC ## $a1 = 06009FBC -/* 04E84 80B58234 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 04E88 80B58238 3C07C130 */ lui $a3, 0xC130 ## $a3 = C1300000 -/* 04E8C 80B5823C 0C2D5385 */ jal func_80B54E14 -/* 04E90 80B58240 AFA00010 */ sw $zero, 0x0010($sp) -/* 04E94 80B58244 8FAF0020 */ lw $t7, 0x0020($sp) -/* 04E98 80B58248 240E001C */ addiu $t6, $zero, 0x001C ## $t6 = 0000001C -/* 04E9C 80B5824C ADEE024C */ sw $t6, 0x024C($t7) ## 0000024C -/* 04EA0 80B58250 8FB80020 */ lw $t8, 0x0020($sp) -/* 04EA4 80B58254 A70003D0 */ sh $zero, 0x03D0($t8) ## 000003D0 -.L80B58258: -/* 04EA8 80B58258 8FBF001C */ lw $ra, 0x001C($sp) -/* 04EAC 80B5825C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04EB0 80B58260 03E00008 */ jr $ra -/* 04EB4 80B58264 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58268.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58268.s deleted file mode 100644 index ca73f20a92..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58268.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80B58268 -/* 04EB8 80B58268 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04EBC 80B5826C AFBF001C */ sw $ra, 0x001C($sp) -/* 04EC0 80B58270 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 04EC4 80B58274 80620A78 */ lb $v0, 0x0A78($v1) ## 00000A78 -/* 04EC8 80B58278 5C400010 */ bgtzl $v0, .L80B582BC -/* 04ECC 80B5827C 8FBF001C */ lw $ra, 0x001C($sp) -/* 04ED0 80B58280 846E0896 */ lh $t6, 0x0896($v1) ## 00000896 -/* 04ED4 80B58284 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 04ED8 80B58288 24A59FBC */ addiu $a1, $a1, 0x9FBC ## $a1 = 06009FBC -/* 04EDC 80B5828C 29C10033 */ slti $at, $t6, 0x0033 -/* 04EE0 80B58290 10200009 */ beq $at, $zero, .L80B582B8 -/* 04EE4 80B58294 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 04EE8 80B58298 3C07C130 */ lui $a3, 0xC130 ## $a3 = C1300000 -/* 04EEC 80B5829C AFA00010 */ sw $zero, 0x0010($sp) -/* 04EF0 80B582A0 0C2D5385 */ jal func_80B54E14 -/* 04EF4 80B582A4 AFA40020 */ sw $a0, 0x0020($sp) -/* 04EF8 80B582A8 8FA40020 */ lw $a0, 0x0020($sp) -/* 04EFC 80B582AC 240F001C */ addiu $t7, $zero, 0x001C ## $t7 = 0000001C -/* 04F00 80B582B0 AC8F024C */ sw $t7, 0x024C($a0) ## 0000024C -/* 04F04 80B582B4 A48003D0 */ sh $zero, 0x03D0($a0) ## 000003D0 -.L80B582B8: -/* 04F08 80B582B8 8FBF001C */ lw $ra, 0x001C($sp) -.L80B582BC: -/* 04F0C 80B582BC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04F10 80B582C0 03E00008 */ jr $ra -/* 04F14 80B582C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B582C8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B582C8.s deleted file mode 100644 index beb388dd99..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B582C8.s +++ /dev/null @@ -1,131 +0,0 @@ -glabel func_80B582C8 -/* 04F18 80B582C8 3C038016 */ lui $v1, %hi(gGameInfo) -/* 04F1C 80B582CC 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) -/* 04F20 80B582D0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 04F24 80B582D4 AFBF001C */ sw $ra, 0x001C($sp) -/* 04F28 80B582D8 AFA50034 */ sw $a1, 0x0034($sp) -/* 04F2C 80B582DC 846E1470 */ lh $t6, 0x1470($v1) ## 80161470 -/* 04F30 80B582E0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 04F34 80B582E4 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 04F38 80B582E8 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 -/* 04F3C 80B582EC C48403CC */ lwc1 $f4, 0x03CC($a0) ## 000003CC -/* 04F40 80B582F0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 04F44 80B582F4 46803220 */ cvt.s.w $f8, $f6 -/* 04F48 80B582F8 248203CC */ addiu $v0, $a0, 0x03CC ## $v0 = 000003CC -/* 04F4C 80B582FC 460A4400 */ add.s $f16, $f8, $f10 -/* 04F50 80B58300 46102032 */ c.eq.s $f4, $f16 -/* 04F54 80B58304 00000000 */ nop -/* 04F58 80B58308 45020012 */ bc1fl .L80B58354 -/* 04F5C 80B5830C 846F1472 */ lh $t7, 0x1472($v1) ## 80161472 -/* 04F60 80B58310 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 04F64 80B58314 C4520000 */ lwc1 $f18, 0x0000($v0) ## 000003CC -/* 04F68 80B58318 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 04F6C 80B5831C 24A58050 */ addiu $a1, $a1, 0x8050 ## $a1 = 06008050 -/* 04F70 80B58320 460C9180 */ add.s $f6, $f18, $f12 -/* 04F74 80B58324 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 04F78 80B58328 3C07C140 */ lui $a3, 0xC140 ## $a3 = C1400000 -/* 04F7C 80B5832C E4460000 */ swc1 $f6, 0x0000($v0) ## 000003CC -/* 04F80 80B58330 AFA40030 */ sw $a0, 0x0030($sp) -/* 04F84 80B58334 0C2D5385 */ jal func_80B54E14 -/* 04F88 80B58338 AFA00010 */ sw $zero, 0x0010($sp) -/* 04F8C 80B5833C 8FA40030 */ lw $a0, 0x0030($sp) -/* 04F90 80B58340 0C2D5DC1 */ jal func_80B57704 -/* 04F94 80B58344 8FA50034 */ lw $a1, 0x0034($sp) -/* 04F98 80B58348 10000057 */ beq $zero, $zero, .L80B584A8 -/* 04F9C 80B5834C 8FBF001C */ lw $ra, 0x001C($sp) -/* 04FA0 80B58350 846F1472 */ lh $t7, 0x1472($v1) ## 00001472 -.L80B58354: -/* 04FA4 80B58354 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 04FA8 80B58358 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 -/* 04FAC 80B5835C 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 04FB0 80B58360 248203CC */ addiu $v0, $a0, 0x03CC ## $v0 = 000003CC -/* 04FB4 80B58364 C4400000 */ lwc1 $f0, 0x0000($v0) ## 000003CC -/* 04FB8 80B58368 468042A0 */ cvt.s.w $f10, $f8 -/* 04FBC 80B5836C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 04FC0 80B58370 46045400 */ add.s $f16, $f10, $f4 -/* 04FC4 80B58374 46100032 */ c.eq.s $f0, $f16 -/* 04FC8 80B58378 00000000 */ nop -/* 04FCC 80B5837C 45020011 */ bc1fl .L80B583C4 -/* 04FD0 80B58380 84781474 */ lh $t8, 0x1474($v1) ## 00001474 -/* 04FD4 80B58384 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 04FD8 80B58388 00000000 */ nop -/* 04FDC 80B5838C 460C0480 */ add.s $f18, $f0, $f12 -/* 04FE0 80B58390 E4520000 */ swc1 $f18, 0x0000($v0) ## 000003CC -/* 04FE4 80B58394 0C2D5B72 */ jal func_80B56DC8 -/* 04FE8 80B58398 AFA40030 */ sw $a0, 0x0030($sp) -/* 04FEC 80B5839C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 04FF0 80B583A0 8FA40030 */ lw $a0, 0x0030($sp) -/* 04FF4 80B583A4 24A53FF8 */ addiu $a1, $a1, 0x3FF8 ## $a1 = 06003FF8 -/* 04FF8 80B583A8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 04FFC 80B583AC 3C07C140 */ lui $a3, 0xC140 ## $a3 = C1400000 -/* 05000 80B583B0 0C2D5385 */ jal func_80B54E14 -/* 05004 80B583B4 AFA00010 */ sw $zero, 0x0010($sp) -/* 05008 80B583B8 1000003B */ beq $zero, $zero, .L80B584A8 -/* 0500C 80B583BC 8FBF001C */ lw $ra, 0x001C($sp) -/* 05010 80B583C0 84781474 */ lh $t8, 0x1474($v1) ## 00001474 -.L80B583C4: -/* 05014 80B583C4 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 05018 80B583C8 44815000 */ mtc1 $at, $f10 ## $f10 = 30.00 -/* 0501C 80B583CC 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 -/* 05020 80B583D0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 05024 80B583D4 46803220 */ cvt.s.w $f8, $f6 -/* 05028 80B583D8 460A4100 */ add.s $f4, $f8, $f10 -/* 0502C 80B583DC 46040032 */ c.eq.s $f0, $f4 -/* 05030 80B583E0 00000000 */ nop -/* 05034 80B583E4 4502000A */ bc1fl .L80B58410 -/* 05038 80B583E8 84791476 */ lh $t9, 0x1476($v1) ## 00001476 -/* 0503C 80B583EC 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 05040 80B583F0 00000000 */ nop -/* 05044 80B583F4 460C0400 */ add.s $f16, $f0, $f12 -/* 05048 80B583F8 E4500000 */ swc1 $f16, 0x0000($v0) ## 00000000 -/* 0504C 80B583FC 0C2D5E16 */ jal func_80B57858 -/* 05050 80B58400 8FA40034 */ lw $a0, 0x0034($sp) -/* 05054 80B58404 10000028 */ beq $zero, $zero, .L80B584A8 -/* 05058 80B58408 8FBF001C */ lw $ra, 0x001C($sp) -/* 0505C 80B5840C 84791476 */ lh $t9, 0x1476($v1) ## 00001476 -.L80B58410: -/* 05060 80B58410 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 05064 80B58414 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 -/* 05068 80B58418 44999000 */ mtc1 $t9, $f18 ## $f18 = 0.00 -/* 0506C 80B5841C 8FA80034 */ lw $t0, 0x0034($sp) -/* 05070 80B58420 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 05074 80B58424 468091A0 */ cvt.s.w $f6, $f18 -/* 05078 80B58428 46083080 */ add.s $f2, $f6, $f8 -/* 0507C 80B5842C 46020032 */ c.eq.s $f0, $f2 -/* 05080 80B58430 00000000 */ nop -/* 05084 80B58434 4502000F */ bc1fl .L80B58474 -/* 05088 80B58438 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 0508C 80B5843C 850907A0 */ lh $t1, 0x07A0($t0) ## 000007A0 -/* 05090 80B58440 00095080 */ sll $t2, $t1, 2 -/* 05094 80B58444 010A5821 */ addu $t3, $t0, $t2 -/* 05098 80B58448 8D640790 */ lw $a0, 0x0790($t3) ## 00000790 -/* 0509C 80B5844C 0C016C69 */ jal func_8005B1A4 -/* 050A0 80B58450 AFA20024 */ sw $v0, 0x0024($sp) -/* 050A4 80B58454 8FA20024 */ lw $v0, 0x0024($sp) -/* 050A8 80B58458 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 050AC 80B5845C 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 050B0 80B58460 C44A0000 */ lwc1 $f10, 0x0000($v0) ## 00000000 -/* 050B4 80B58464 460C5100 */ add.s $f4, $f10, $f12 -/* 050B8 80B58468 1000000E */ beq $zero, $zero, .L80B584A4 -/* 050BC 80B5846C E4440000 */ swc1 $f4, 0x0000($v0) ## 00000000 -/* 050C0 80B58470 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -.L80B58474: -/* 050C4 80B58474 240C0020 */ addiu $t4, $zero, 0x0020 ## $t4 = 00000020 -/* 050C8 80B58478 460C1400 */ add.s $f16, $f2, $f12 -/* 050CC 80B5847C 4600803E */ c.le.s $f16, $f0 -/* 050D0 80B58480 00000000 */ nop -/* 050D4 80B58484 45020006 */ bc1fl .L80B584A0 -/* 050D8 80B58488 460C0180 */ add.s $f6, $f0, $f12 -/* 050DC 80B5848C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 050E0 80B58490 AC8C024C */ sw $t4, 0x024C($a0) ## 0000024C -/* 050E4 80B58494 10000003 */ beq $zero, $zero, .L80B584A4 -/* 050E8 80B58498 E4520000 */ swc1 $f18, 0x0000($v0) ## 00000000 -/* 050EC 80B5849C 460C0180 */ add.s $f6, $f0, $f12 -.L80B584A0: -/* 050F0 80B584A0 E4460000 */ swc1 $f6, 0x0000($v0) ## 00000000 -.L80B584A4: -/* 050F4 80B584A4 8FBF001C */ lw $ra, 0x001C($sp) -.L80B584A8: -/* 050F8 80B584A8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 050FC 80B584AC 03E00008 */ jr $ra -/* 05100 80B584B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B584B4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B584B4.s deleted file mode 100644 index d004640ba2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B584B4.s +++ /dev/null @@ -1,101 +0,0 @@ -glabel func_80B584B4 -/* 05104 80B584B4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 05108 80B584B8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0510C 80B584BC AFB10020 */ sw $s1, 0x0020($sp) -/* 05110 80B584C0 AFB0001C */ sw $s0, 0x001C($sp) -/* 05114 80B584C4 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 05118 80B584C8 3C0145FA */ lui $at, 0x45FA ## $at = 45FA0000 -/* 0511C 80B584CC 44812000 */ mtc1 $at, $f4 ## $f4 = 8000.00 -/* 05120 80B584D0 804E0A78 */ lb $t6, 0x0A78($v0) ## 00000A78 -/* 05124 80B584D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05128 80B584D8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0512C 80B584DC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 05130 80B584E0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05134 80B584E4 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 05138 80B584E8 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 0513C 80B584EC A3AE002F */ sb $t6, 0x002F($sp) -/* 05140 80B584F0 0C00D4FD */ jal Actor_FindNearby - -/* 05144 80B584F4 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 05148 80B584F8 3C0F80B6 */ lui $t7, %hi(D_80B5A4BC) ## $t7 = 80B60000 -/* 0514C 80B584FC 8DEFA4BC */ lw $t7, %lo(D_80B5A4BC)($t7) -/* 05150 80B58500 15E00020 */ bne $t7, $zero, .L80B58584 -/* 05154 80B58504 00000000 */ nop -/* 05158 80B58508 5440000F */ bnel $v0, $zero, .L80B58548 -/* 0515C 80B5850C 83B9002F */ lb $t9, 0x002F($sp) -/* 05160 80B58510 0C02FF21 */ jal Gameplay_InCsMode -/* 05164 80B58514 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 05168 80B58518 1440000A */ bne $v0, $zero, .L80B58544 -/* 0516C 80B5851C 24180021 */ addiu $t8, $zero, 0x0021 ## $t8 = 00000021 -/* 05170 80B58520 AE18024C */ sw $t8, 0x024C($s0) ## 0000024C -/* 05174 80B58524 AFA00010 */ sw $zero, 0x0010($sp) -/* 05178 80B58528 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0517C 80B5852C 24050FAB */ addiu $a1, $zero, 0x0FAB ## $a1 = 00000FAB -/* 05180 80B58530 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 05184 80B58534 0C02003E */ jal func_800800F8 -/* 05188 80B58538 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 0518C 80B5853C 10000035 */ beq $zero, $zero, .L80B58614 -/* 05190 80B58540 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B58544: -/* 05194 80B58544 83B9002F */ lb $t9, 0x002F($sp) -.L80B58548: -/* 05198 80B58548 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0519C 80B5854C 24A53FF8 */ addiu $a1, $a1, 0x3FF8 ## $a1 = 06003FF8 -/* 051A0 80B58550 1B20002F */ blez $t9, .L80B58610 -/* 051A4 80B58554 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 051A8 80B58558 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 051AC 80B5855C 3C07C140 */ lui $a3, 0xC140 ## $a3 = C1400000 -/* 051B0 80B58560 0C2D5385 */ jal func_80B54E14 -/* 051B4 80B58564 AFA00010 */ sw $zero, 0x0010($sp) -/* 051B8 80B58568 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 051BC 80B5856C 3C0180B6 */ lui $at, %hi(D_80B5A4BC) ## $at = 80B60000 -/* 051C0 80B58570 AC28A4BC */ sw $t0, %lo(D_80B5A4BC)($at) -/* 051C4 80B58574 0C2D5B72 */ jal func_80B56DC8 -/* 051C8 80B58578 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 051CC 80B5857C 10000025 */ beq $zero, $zero, .L80B58614 -/* 051D0 80B58580 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B58584: -/* 051D4 80B58584 54400018 */ bnel $v0, $zero, .L80B585E8 -/* 051D8 80B58588 83AA002F */ lb $t2, 0x002F($sp) -/* 051DC 80B5858C 0C02FF21 */ jal Gameplay_InCsMode -/* 051E0 80B58590 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 051E4 80B58594 14400013 */ bne $v0, $zero, .L80B585E4 -/* 051E8 80B58598 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 051EC 80B5859C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 051F0 80B585A0 24A57664 */ addiu $a1, $a1, 0x7664 ## $a1 = 06007664 -/* 051F4 80B585A4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 051F8 80B585A8 3C07C140 */ lui $a3, 0xC140 ## $a3 = C1400000 -/* 051FC 80B585AC 0C2D5385 */ jal func_80B54E14 -/* 05200 80B585B0 AFA00010 */ sw $zero, 0x0010($sp) -/* 05204 80B585B4 3C0180B6 */ lui $at, %hi(D_80B5A4BC) ## $at = 80B60000 -/* 05208 80B585B8 AC20A4BC */ sw $zero, %lo(D_80B5A4BC)($at) -/* 0520C 80B585BC 24090021 */ addiu $t1, $zero, 0x0021 ## $t1 = 00000021 -/* 05210 80B585C0 AE09024C */ sw $t1, 0x024C($s0) ## 0000024C -/* 05214 80B585C4 AFA00010 */ sw $zero, 0x0010($sp) -/* 05218 80B585C8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0521C 80B585CC 24050FAB */ addiu $a1, $zero, 0x0FAB ## $a1 = 00000FAB -/* 05220 80B585D0 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 05224 80B585D4 0C02003E */ jal func_800800F8 -/* 05228 80B585D8 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 0522C 80B585DC 1000000D */ beq $zero, $zero, .L80B58614 -/* 05230 80B585E0 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B585E4: -/* 05234 80B585E4 83AA002F */ lb $t2, 0x002F($sp) -.L80B585E8: -/* 05238 80B585E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0523C 80B585EC 24A57664 */ addiu $a1, $a1, 0x7664 ## $a1 = 06007664 -/* 05240 80B585F0 1D400007 */ bgtz $t2, .L80B58610 -/* 05244 80B585F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05248 80B585F8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0524C 80B585FC 3C07C140 */ lui $a3, 0xC140 ## $a3 = C1400000 -/* 05250 80B58600 0C2D5385 */ jal func_80B54E14 -/* 05254 80B58604 AFA00010 */ sw $zero, 0x0010($sp) -/* 05258 80B58608 3C0180B6 */ lui $at, %hi(D_80B5A4BC) ## $at = 80B60000 -/* 0525C 80B5860C AC20A4BC */ sw $zero, %lo(D_80B5A4BC)($at) -.L80B58610: -/* 05260 80B58610 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B58614: -/* 05264 80B58614 8FB0001C */ lw $s0, 0x001C($sp) -/* 05268 80B58618 8FB10020 */ lw $s1, 0x0020($sp) -/* 0526C 80B5861C 03E00008 */ jr $ra -/* 05270 80B58620 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58624.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58624.s deleted file mode 100644 index 893064563b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58624.s +++ /dev/null @@ -1,145 +0,0 @@ -glabel func_80B58624 -/* 05274 80B58624 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 05278 80B58628 3C028016 */ lui $v0, %hi(gGameInfo) -/* 0527C 80B5862C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 05280 80B58630 AFBF0024 */ sw $ra, 0x0024($sp) -/* 05284 80B58634 AFB10020 */ sw $s1, 0x0020($sp) -/* 05288 80B58638 AFB0001C */ sw $s0, 0x001C($sp) -/* 0528C 80B5863C 844E1478 */ lh $t6, 0x1478($v0) ## 80161478 -/* 05290 80B58640 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 05294 80B58644 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 05298 80B58648 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 -/* 0529C 80B5864C C48403CC */ lwc1 $f4, 0x03CC($a0) ## 000003CC -/* 052A0 80B58650 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 052A4 80B58654 46803220 */ cvt.s.w $f8, $f6 -/* 052A8 80B58658 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 052AC 80B5865C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 052B0 80B58660 248303CC */ addiu $v1, $a0, 0x03CC ## $v1 = 000003CC -/* 052B4 80B58664 460A4400 */ add.s $f16, $f8, $f10 -/* 052B8 80B58668 46102032 */ c.eq.s $f4, $f16 -/* 052BC 80B5866C 00000000 */ nop -/* 052C0 80B58670 45020011 */ bc1fl .L80B586B8 -/* 052C4 80B58674 844F147A */ lh $t7, 0x147A($v0) ## 8016147A -/* 052C8 80B58678 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 052CC 80B5867C C4720000 */ lwc1 $f18, 0x0000($v1) ## 000003CC -/* 052D0 80B58680 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 052D4 80B58684 24A58050 */ addiu $a1, $a1, 0x8050 ## $a1 = 06008050 -/* 052D8 80B58688 460C9180 */ add.s $f6, $f18, $f12 -/* 052DC 80B5868C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 052E0 80B58690 3C07C140 */ lui $a3, 0xC140 ## $a3 = C1400000 -/* 052E4 80B58694 E4660000 */ swc1 $f6, 0x0000($v1) ## 000003CC -/* 052E8 80B58698 0C2D5385 */ jal func_80B54E14 -/* 052EC 80B5869C AFA00010 */ sw $zero, 0x0010($sp) -/* 052F0 80B586A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 052F4 80B586A4 0C2D5DCB */ jal func_80B5772C -/* 052F8 80B586A8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 052FC 80B586AC 10000063 */ beq $zero, $zero, .L80B5883C -/* 05300 80B586B0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 05304 80B586B4 844F147A */ lh $t7, 0x147A($v0) ## 0000147A -.L80B586B8: -/* 05308 80B586B8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 0530C 80B586BC 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 -/* 05310 80B586C0 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 05314 80B586C4 260303CC */ addiu $v1, $s0, 0x03CC ## $v1 = 000003CC -/* 05318 80B586C8 C4600000 */ lwc1 $f0, 0x0000($v1) ## 000003CC -/* 0531C 80B586CC 468042A0 */ cvt.s.w $f10, $f8 -/* 05320 80B586D0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 05324 80B586D4 46045080 */ add.s $f2, $f10, $f4 -/* 05328 80B586D8 46020032 */ c.eq.s $f0, $f2 -/* 0532C 80B586DC 00000000 */ nop -/* 05330 80B586E0 45020015 */ bc1fl .L80B58738 -/* 05334 80B586E4 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 05338 80B586E8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0533C 80B586EC 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 05340 80B586F0 241871AC */ addiu $t8, $zero, 0x71AC ## $t8 = 000071AC -/* 05344 80B586F4 3305FFFF */ andi $a1, $t8, 0xFFFF ## $a1 = 000071AC -/* 05348 80B586F8 460C0400 */ add.s $f16, $f0, $f12 -/* 0534C 80B586FC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 05350 80B58700 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 05354 80B58704 E4700000 */ swc1 $f16, 0x0000($v1) ## 000003CC -/* 05358 80B58708 0C042DA0 */ jal func_8010B680 -/* 0535C 80B5870C A618010E */ sh $t8, 0x010E($s0) ## 0000010E -/* 05360 80B58710 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 05364 80B58714 24A53FF8 */ addiu $a1, $a1, 0x3FF8 ## $a1 = 06003FF8 -/* 05368 80B58718 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0536C 80B5871C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 05370 80B58720 3C07C140 */ lui $a3, 0xC140 ## $a3 = C1400000 -/* 05374 80B58724 0C2D5385 */ jal func_80B54E14 -/* 05378 80B58728 AFA00010 */ sw $zero, 0x0010($sp) -/* 0537C 80B5872C 10000043 */ beq $zero, $zero, .L80B5883C -/* 05380 80B58730 8FBF0024 */ lw $ra, 0x0024($sp) -/* 05384 80B58734 44816000 */ mtc1 $at, $f12 ## $f12 = 0.00 -.L80B58738: -/* 05388 80B58738 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 0538C 80B5873C 460C1480 */ add.s $f18, $f2, $f12 -/* 05390 80B58740 46120032 */ c.eq.s $f0, $f18 -/* 05394 80B58744 00000000 */ nop -/* 05398 80B58748 4502001D */ bc1fl .L80B587C0 -/* 0539C 80B5874C 8459147C */ lh $t9, 0x147C($v0) ## 0000147C -/* 053A0 80B58750 0C042F6F */ jal func_8010BDBC -/* 053A4 80B58754 AFA30028 */ sw $v1, 0x0028($sp) -/* 053A8 80B58758 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 053AC 80B5875C 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 053B0 80B58760 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 053B4 80B58764 14410034 */ bne $v0, $at, .L80B58838 -/* 053B8 80B58768 8FA30028 */ lw $v1, 0x0028($sp) -/* 053BC 80B5876C C4660000 */ lwc1 $f6, 0x0000($v1) ## 00000000 -/* 053C0 80B58770 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 053C4 80B58774 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 053C8 80B58778 460C3200 */ add.s $f8, $f6, $f12 -/* 053CC 80B5877C 0C2D4D5F */ jal func_80B5357C -/* 053D0 80B58780 E4680000 */ swc1 $f8, 0x0000($v1) ## 00000000 -/* 053D4 80B58784 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 053D8 80B58788 0C2D4D5F */ jal func_80B5357C -/* 053DC 80B5878C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 053E0 80B58790 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 053E4 80B58794 0C2D4D5F */ jal func_80B5357C -/* 053E8 80B58798 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 053EC 80B5879C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 053F0 80B587A0 0C2D4D5F */ jal func_80B5357C -/* 053F4 80B587A4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 053F8 80B587A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 053FC 80B587AC 0C2D4D5F */ jal func_80B5357C -/* 05400 80B587B0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05404 80B587B4 10000021 */ beq $zero, $zero, .L80B5883C -/* 05408 80B587B8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0540C 80B587BC 8459147C */ lh $t9, 0x147C($v0) ## 0000147C -.L80B587C0: -/* 05410 80B587C0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 05414 80B587C4 44818000 */ mtc1 $at, $f16 ## $f16 = 30.00 -/* 05418 80B587C8 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 0541C 80B587CC 2408001C */ addiu $t0, $zero, 0x001C ## $t0 = 0000001C -/* 05420 80B587D0 46805120 */ cvt.s.w $f4, $f10 -/* 05424 80B587D4 46102480 */ add.s $f18, $f4, $f16 -/* 05428 80B587D8 4600903E */ c.le.s $f18, $f0 -/* 0542C 80B587DC 00000000 */ nop -/* 05430 80B587E0 45020014 */ bc1fl .L80B58834 -/* 05434 80B587E4 460C0200 */ add.s $f8, $f0, $f12 -/* 05438 80B587E8 AE08024C */ sw $t0, 0x024C($s0) ## 0000024C -/* 0543C 80B587EC 862907A0 */ lh $t1, 0x07A0($s1) ## 000007A0 -/* 05440 80B587F0 00095080 */ sll $t2, $t1, 2 -/* 05444 80B587F4 022A5821 */ addu $t3, $s1, $t2 -/* 05448 80B587F8 8D640790 */ lw $a0, 0x0790($t3) ## 00000790 -/* 0544C 80B587FC 0C016C69 */ jal func_8005B1A4 -/* 05450 80B58800 AFA30028 */ sw $v1, 0x0028($sp) -/* 05454 80B58804 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 05458 80B58808 24A59FBC */ addiu $a1, $a1, 0x9FBC ## $a1 = 06009FBC -/* 0545C 80B5880C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05460 80B58810 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 05464 80B58814 3C07C140 */ lui $a3, 0xC140 ## $a3 = C1400000 -/* 05468 80B58818 0C2D5385 */ jal func_80B54E14 -/* 0546C 80B5881C AFA00010 */ sw $zero, 0x0010($sp) -/* 05470 80B58820 8FA30028 */ lw $v1, 0x0028($sp) -/* 05474 80B58824 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 05478 80B58828 10000003 */ beq $zero, $zero, .L80B58838 -/* 0547C 80B5882C E4660000 */ swc1 $f6, 0x0000($v1) ## 00000000 -/* 05480 80B58830 460C0200 */ add.s $f8, $f0, $f12 -.L80B58834: -/* 05484 80B58834 E4680000 */ swc1 $f8, 0x0000($v1) ## 00000000 -.L80B58838: -/* 05488 80B58838 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B5883C: -/* 0548C 80B5883C 8FB0001C */ lw $s0, 0x001C($sp) -/* 05490 80B58840 8FB10020 */ lw $s1, 0x0020($sp) -/* 05494 80B58844 03E00008 */ jr $ra -/* 05498 80B58848 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5884C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5884C.s deleted file mode 100644 index 47d49b9879..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5884C.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B5884C -/* 0549C 80B5884C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 054A0 80B58850 AFA50024 */ sw $a1, 0x0024($sp) -/* 054A4 80B58854 AFBF001C */ sw $ra, 0x001C($sp) -/* 054A8 80B58858 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 054AC 80B5885C 24A538C0 */ addiu $a1, $a1, 0x38C0 ## $a1 = 060038C0 -/* 054B0 80B58860 AFA00010 */ sw $zero, 0x0010($sp) -/* 054B4 80B58864 AFA40020 */ sw $a0, 0x0020($sp) -/* 054B8 80B58868 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 054BC 80B5886C 0C2D5385 */ jal func_80B54E14 -/* 054C0 80B58870 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 054C4 80B58874 8FA40020 */ lw $a0, 0x0020($sp) -/* 054C8 80B58878 240E0025 */ addiu $t6, $zero, 0x0025 ## $t6 = 00000025 -/* 054CC 80B5887C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 054D0 80B58880 AC8E024C */ sw $t6, 0x024C($a0) ## 0000024C -/* 054D4 80B58884 AC8F036C */ sw $t7, 0x036C($a0) ## 0000036C -/* 054D8 80B58888 8FBF001C */ lw $ra, 0x001C($sp) -/* 054DC 80B5888C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 054E0 80B58890 03E00008 */ jr $ra -/* 054E4 80B58894 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58898.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58898.s deleted file mode 100644 index 273dfa4921..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58898.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80B58898 -/* 054E8 80B58898 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 054EC 80B5889C AFA50024 */ sw $a1, 0x0024($sp) -/* 054F0 80B588A0 AFBF001C */ sw $ra, 0x001C($sp) -/* 054F4 80B588A4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 054F8 80B588A8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 054FC 80B588AC AFAE0010 */ sw $t6, 0x0010($sp) -/* 05500 80B588B0 24A538C0 */ addiu $a1, $a1, 0x38C0 ## $a1 = 060038C0 -/* 05504 80B588B4 AFA40020 */ sw $a0, 0x0020($sp) -/* 05508 80B588B8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 0550C 80B588BC 0C2D5385 */ jal func_80B54E14 -/* 05510 80B588C0 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 05514 80B588C4 8FA40020 */ lw $a0, 0x0020($sp) -/* 05518 80B588C8 240F0026 */ addiu $t7, $zero, 0x0026 ## $t7 = 00000026 -/* 0551C 80B588CC 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 05520 80B588D0 AC8F024C */ sw $t7, 0x024C($a0) ## 0000024C -/* 05524 80B588D4 AC980374 */ sw $t8, 0x0374($a0) ## 00000374 -/* 05528 80B588D8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0552C 80B588DC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 05530 80B588E0 03E00008 */ jr $ra -/* 05534 80B588E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B588E8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B588E8.s deleted file mode 100644 index e1a47fee92..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B588E8.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80B588E8 -/* 05538 80B588E8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0553C 80B588EC AFA50024 */ sw $a1, 0x0024($sp) -/* 05540 80B588F0 AFBF001C */ sw $ra, 0x001C($sp) -/* 05544 80B588F4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 05548 80B588F8 AFA40020 */ sw $a0, 0x0020($sp) -/* 0554C 80B588FC 24A59BE4 */ addiu $a1, $a1, 0x9BE4 ## $a1 = 06009BE4 -/* 05550 80B58900 AFA00010 */ sw $zero, 0x0010($sp) -/* 05554 80B58904 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 05558 80B58908 0C2D5385 */ jal func_80B54E14 -/* 0555C 80B5890C 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 05560 80B58910 8FA40020 */ lw $a0, 0x0020($sp) -/* 05564 80B58914 0C2D5EB8 */ jal func_80B57AE0 -/* 05568 80B58918 8FA50024 */ lw $a1, 0x0024($sp) -/* 0556C 80B5891C 8FAF0020 */ lw $t7, 0x0020($sp) -/* 05570 80B58920 240E0027 */ addiu $t6, $zero, 0x0027 ## $t6 = 00000027 -/* 05574 80B58924 ADEE024C */ sw $t6, 0x024C($t7) ## 0000024C -/* 05578 80B58928 8FBF001C */ lw $ra, 0x001C($sp) -/* 0557C 80B5892C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 05580 80B58930 03E00008 */ jr $ra -/* 05584 80B58934 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58938.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58938.s deleted file mode 100644 index e4c2356409..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58938.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80B58938 -/* 05588 80B58938 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0558C 80B5893C AFBF001C */ sw $ra, 0x001C($sp) -/* 05590 80B58940 AFA40020 */ sw $a0, 0x0020($sp) -/* 05594 80B58944 0C2D5F15 */ jal func_80B57C54 -/* 05598 80B58948 AFA50024 */ sw $a1, 0x0024($sp) -/* 0559C 80B5894C 1040000E */ beq $v0, $zero, .L80B58988 -/* 055A0 80B58950 8FA40020 */ lw $a0, 0x0020($sp) -/* 055A4 80B58954 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 055A8 80B58958 24A59FBC */ addiu $a1, $a1, 0x9FBC ## $a1 = 06009FBC -/* 055AC 80B5895C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 055B0 80B58960 3C07C100 */ lui $a3, 0xC100 ## $a3 = C1000000 -/* 055B4 80B58964 0C2D5385 */ jal func_80B54E14 -/* 055B8 80B58968 AFA00010 */ sw $zero, 0x0010($sp) -/* 055BC 80B5896C 8FAF0020 */ lw $t7, 0x0020($sp) -/* 055C0 80B58970 240E001C */ addiu $t6, $zero, 0x001C ## $t6 = 0000001C -/* 055C4 80B58974 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 055C8 80B58978 ADEE024C */ sw $t6, 0x024C($t7) ## 0000024C -/* 055CC 80B5897C 8FB80020 */ lw $t8, 0x0020($sp) -/* 055D0 80B58980 10000002 */ beq $zero, $zero, .L80B5898C -/* 055D4 80B58984 A70003D0 */ sh $zero, 0x03D0($t8) ## 000003D0 -.L80B58988: -/* 055D8 80B58988 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B5898C: -/* 055DC 80B5898C 8FBF001C */ lw $ra, 0x001C($sp) -/* 055E0 80B58990 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 055E4 80B58994 03E00008 */ jr $ra -/* 055E8 80B58998 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5899C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5899C.s deleted file mode 100644 index c719e7fa02..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5899C.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80B5899C -/* 055EC 80B5899C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 055F0 80B589A0 AFBF001C */ sw $ra, 0x001C($sp) -/* 055F4 80B589A4 948E0088 */ lhu $t6, 0x0088($a0) ## 00000088 -/* 055F8 80B589A8 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 055FC 80B589AC 51E00017 */ beql $t7, $zero, .L80B58A0C -/* 05600 80B589B0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 05604 80B589B4 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 05608 80B589B8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0560C 80B589BC 24A57664 */ addiu $a1, $a1, 0x7664 ## $a1 = 06007664 -/* 05610 80B589C0 80620A78 */ lb $v0, 0x0A78($v1) ## 00000A78 -/* 05614 80B589C4 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 05618 80B589C8 3C07C130 */ lui $a3, 0xC130 ## $a3 = C1300000 -/* 0561C 80B589CC 5C400006 */ bgtzl $v0, .L80B589E8 -/* 05620 80B589D0 AFA00010 */ sw $zero, 0x0010($sp) -/* 05624 80B589D4 84780896 */ lh $t8, 0x0896($v1) ## 00000896 -/* 05628 80B589D8 2B010033 */ slti $at, $t8, 0x0033 -/* 0562C 80B589DC 5420000B */ bnel $at, $zero, .L80B58A0C -/* 05630 80B589E0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 05634 80B589E4 AFA00010 */ sw $zero, 0x0010($sp) -.L80B589E8: -/* 05638 80B589E8 0C2D5385 */ jal func_80B54E14 -/* 0563C 80B589EC AFA40020 */ sw $a0, 0x0020($sp) -/* 05640 80B589F0 8FA40020 */ lw $a0, 0x0020($sp) -/* 05644 80B589F4 24190023 */ addiu $t9, $zero, 0x0023 ## $t9 = 00000023 -/* 05648 80B589F8 0C2D5B72 */ jal func_80B56DC8 -/* 0564C 80B589FC AC99024C */ sw $t9, 0x024C($a0) ## 0000024C -/* 05650 80B58A00 10000002 */ beq $zero, $zero, .L80B58A0C -/* 05654 80B58A04 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 05658 80B58A08 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B58A0C: -/* 0565C 80B58A0C 8FBF001C */ lw $ra, 0x001C($sp) -/* 05660 80B58A10 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 05664 80B58A14 03E00008 */ jr $ra -/* 05668 80B58A18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58A1C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58A1C.s deleted file mode 100644 index a6199939f1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58A1C.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B58A1C -/* 0566C 80B58A1C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05670 80B58A20 AFBF0014 */ sw $ra, 0x0014($sp) -/* 05674 80B58A24 AFA40018 */ sw $a0, 0x0018($sp) -/* 05678 80B58A28 0C2D624E */ jal func_80B58938 -/* 0567C 80B58A2C AFA5001C */ sw $a1, 0x001C($sp) -/* 05680 80B58A30 14400003 */ bne $v0, $zero, .L80B58A40 -/* 05684 80B58A34 8FA40018 */ lw $a0, 0x0018($sp) -/* 05688 80B58A38 0C2D6267 */ jal func_80B5899C -/* 0568C 80B58A3C 8FA5001C */ lw $a1, 0x001C($sp) -.L80B58A40: -/* 05690 80B58A40 8FBF0014 */ lw $ra, 0x0014($sp) -/* 05694 80B58A44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05698 80B58A48 03E00008 */ jr $ra -/* 0569C 80B58A4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58A50.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58A50.s deleted file mode 100644 index 3e80c9436f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58A50.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80B58A50 -/* 056A0 80B58A50 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 056A4 80B58A54 AFBF001C */ sw $ra, 0x001C($sp) -/* 056A8 80B58A58 AFA40020 */ sw $a0, 0x0020($sp) -/* 056AC 80B58A5C 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 056B0 80B58A60 80620A78 */ lb $v0, 0x0A78($v1) ## 00000A78 -/* 056B4 80B58A64 5C40000E */ bgtzl $v0, .L80B58AA0 -/* 056B8 80B58A68 8FBF001C */ lw $ra, 0x001C($sp) -/* 056BC 80B58A6C 846E0896 */ lh $t6, 0x0896($v1) ## 00000896 -/* 056C0 80B58A70 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 056C4 80B58A74 24A59BE4 */ addiu $a1, $a1, 0x9BE4 ## $a1 = 06009BE4 -/* 056C8 80B58A78 29C10033 */ slti $at, $t6, 0x0033 -/* 056CC 80B58A7C 10200007 */ beq $at, $zero, .L80B58A9C -/* 056D0 80B58A80 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 056D4 80B58A84 3C07C130 */ lui $a3, 0xC130 ## $a3 = C1300000 -/* 056D8 80B58A88 0C2D5385 */ jal func_80B54E14 -/* 056DC 80B58A8C AFA00010 */ sw $zero, 0x0010($sp) -/* 056E0 80B58A90 8FB80020 */ lw $t8, 0x0020($sp) -/* 056E4 80B58A94 240F0022 */ addiu $t7, $zero, 0x0022 ## $t7 = 00000022 -/* 056E8 80B58A98 AF0F024C */ sw $t7, 0x024C($t8) ## 0000024C -.L80B58A9C: -/* 056EC 80B58A9C 8FBF001C */ lw $ra, 0x001C($sp) -.L80B58AA0: -/* 056F0 80B58AA0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 056F4 80B58AA4 03E00008 */ jr $ra -/* 056F8 80B58AA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58AAC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58AAC.s deleted file mode 100644 index f481ececc0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58AAC.s +++ /dev/null @@ -1,93 +0,0 @@ -glabel func_80B58AAC -/* 056FC 80B58AAC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05700 80B58AB0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 05704 80B58AB4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 05708 80B58AB8 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 0570C 80B58ABC C48402EC */ lwc1 $f4, 0x02EC($a0) ## 000002EC -/* 05710 80B58AC0 3C028016 */ lui $v0, %hi(gGameInfo) -/* 05714 80B58AC4 3C0141C0 */ lui $at, 0x41C0 ## $at = 41C00000 -/* 05718 80B58AC8 46062200 */ add.s $f8, $f4, $f6 -/* 0571C 80B58ACC 44812000 */ mtc1 $at, $f4 ## $f4 = 24.00 -/* 05720 80B58AD0 E48802EC */ swc1 $f8, 0x02EC($a0) ## 000002EC -/* 05724 80B58AD4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 05728 80B58AD8 C48A02EC */ lwc1 $f10, 0x02EC($a0) ## 000002EC -/* 0572C 80B58ADC 844E1462 */ lh $t6, 0x1462($v0) ## 80161462 -/* 05730 80B58AE0 448E8000 */ mtc1 $t6, $f16 ## $f16 = 0.00 -/* 05734 80B58AE4 00000000 */ nop -/* 05738 80B58AE8 468084A0 */ cvt.s.w $f18, $f16 -/* 0573C 80B58AEC 46049180 */ add.s $f6, $f18, $f4 -/* 05740 80B58AF0 460A303E */ c.le.s $f6, $f10 -/* 05744 80B58AF4 00000000 */ nop -/* 05748 80B58AF8 4502000D */ bc1fl .L80B58B30 -/* 0574C 80B58AFC 84581464 */ lh $t8, 0x1464($v0) ## 80161464 -/* 05750 80B58B00 8C8F036C */ lw $t7, 0x036C($a0) ## 0000036C -/* 05754 80B58B04 55E0000A */ bnel $t7, $zero, .L80B58B30 -/* 05758 80B58B08 84581464 */ lh $t8, 0x1464($v0) ## 80161464 -/* 0575C 80B58B0C AFA40018 */ sw $a0, 0x0018($sp) -/* 05760 80B58B10 0C2D5DD5 */ jal func_80B57754 -/* 05764 80B58B14 AFA5001C */ sw $a1, 0x001C($sp) -/* 05768 80B58B18 8FA40018 */ lw $a0, 0x0018($sp) -/* 0576C 80B58B1C 0C2D6213 */ jal func_80B5884C -/* 05770 80B58B20 8FA5001C */ lw $a1, 0x001C($sp) -/* 05774 80B58B24 10000035 */ beq $zero, $zero, .L80B58BFC -/* 05778 80B58B28 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0577C 80B58B2C 84581464 */ lh $t8, 0x1464($v0) ## 00001464 -.L80B58B30: -/* 05780 80B58B30 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 05784 80B58B34 44819000 */ mtc1 $at, $f18 ## $f18 = 50.00 -/* 05788 80B58B38 44984000 */ mtc1 $t8, $f8 ## $f8 = 0.00 -/* 0578C 80B58B3C C48002EC */ lwc1 $f0, 0x02EC($a0) ## 000002EC -/* 05790 80B58B40 46804420 */ cvt.s.w $f16, $f8 -/* 05794 80B58B44 46128100 */ add.s $f4, $f16, $f18 -/* 05798 80B58B48 4600203E */ c.le.s $f4, $f0 -/* 0579C 80B58B4C 00000000 */ nop -/* 057A0 80B58B50 4502000B */ bc1fl .L80B58B80 -/* 057A4 80B58B54 84491466 */ lh $t1, 0x1466($v0) ## 00001466 -/* 057A8 80B58B58 8C990370 */ lw $t9, 0x0370($a0) ## 00000370 -/* 057AC 80B58B5C 57200008 */ bnel $t9, $zero, .L80B58B80 -/* 057B0 80B58B60 84491466 */ lh $t1, 0x1466($v0) ## 00001466 -/* 057B4 80B58B64 0C2D5BAE */ jal func_80B56EB8 -/* 057B8 80B58B68 AFA40018 */ sw $a0, 0x0018($sp) -/* 057BC 80B58B6C 8FA40018 */ lw $a0, 0x0018($sp) -/* 057C0 80B58B70 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 057C4 80B58B74 10000020 */ beq $zero, $zero, .L80B58BF8 -/* 057C8 80B58B78 AC880370 */ sw $t0, 0x0370($a0) ## 00000370 -/* 057CC 80B58B7C 84491466 */ lh $t1, 0x1466($v0) ## 00001466 -.L80B58B80: -/* 057D0 80B58B80 3C014260 */ lui $at, 0x4260 ## $at = 42600000 -/* 057D4 80B58B84 44814000 */ mtc1 $at, $f8 ## $f8 = 56.00 -/* 057D8 80B58B88 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 -/* 057DC 80B58B8C 00000000 */ nop -/* 057E0 80B58B90 468051A0 */ cvt.s.w $f6, $f10 -/* 057E4 80B58B94 46083400 */ add.s $f16, $f6, $f8 -/* 057E8 80B58B98 4600803E */ c.le.s $f16, $f0 -/* 057EC 80B58B9C 00000000 */ nop -/* 057F0 80B58BA0 45020009 */ bc1fl .L80B58BC8 -/* 057F4 80B58BA4 844B1468 */ lh $t3, 0x1468($v0) ## 00001468 -/* 057F8 80B58BA8 8C8A0374 */ lw $t2, 0x0374($a0) ## 00000374 -/* 057FC 80B58BAC 55400006 */ bnel $t2, $zero, .L80B58BC8 -/* 05800 80B58BB0 844B1468 */ lh $t3, 0x1468($v0) ## 00001468 -/* 05804 80B58BB4 0C2D6226 */ jal func_80B58898 -/* 05808 80B58BB8 00000000 */ nop -/* 0580C 80B58BBC 1000000F */ beq $zero, $zero, .L80B58BFC -/* 05810 80B58BC0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 05814 80B58BC4 844B1468 */ lh $t3, 0x1468($v0) ## 00001468 -.L80B58BC8: -/* 05818 80B58BC8 3C0142A4 */ lui $at, 0x42A4 ## $at = 42A40000 -/* 0581C 80B58BCC 44815000 */ mtc1 $at, $f10 ## $f10 = 82.00 -/* 05820 80B58BD0 448B9000 */ mtc1 $t3, $f18 ## $f18 = 0.00 -/* 05824 80B58BD4 00000000 */ nop -/* 05828 80B58BD8 46809120 */ cvt.s.w $f4, $f18 -/* 0582C 80B58BDC 460A2180 */ add.s $f6, $f4, $f10 -/* 05830 80B58BE0 4600303E */ c.le.s $f6, $f0 -/* 05834 80B58BE4 00000000 */ nop -/* 05838 80B58BE8 45020004 */ bc1fl .L80B58BFC -/* 0583C 80B58BEC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 05840 80B58BF0 0C2D623A */ jal func_80B588E8 -/* 05844 80B58BF4 00000000 */ nop -.L80B58BF8: -/* 05848 80B58BF8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B58BFC: -/* 0584C 80B58BFC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05850 80B58C00 03E00008 */ jr $ra -/* 05854 80B58C04 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58C08.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58C08.s deleted file mode 100644 index 7024e3cd5d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58C08.s +++ /dev/null @@ -1,86 +0,0 @@ -glabel func_80B58C08 -/* 05858 80B58C08 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 0585C 80B58C0C AFBF0024 */ sw $ra, 0x0024($sp) -/* 05860 80B58C10 AFB00020 */ sw $s0, 0x0020($sp) -/* 05864 80B58C14 AFA5004C */ sw $a1, 0x004C($sp) -/* 05868 80B58C18 948E0344 */ lhu $t6, 0x0344($a0) ## 00000344 -/* 0586C 80B58C1C 3C188016 */ lui $t8, %hi(gGameInfo) -/* 05870 80B58C20 94890346 */ lhu $t1, 0x0346($a0) ## 00000346 -/* 05874 80B58C24 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 05878 80B58C28 A48F0344 */ sh $t7, 0x0344($a0) ## 00000344 -/* 0587C 80B58C2C 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) -/* 05880 80B58C30 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05884 80B58C34 31E8FFFF */ andi $t0, $t7, 0xFFFF ## $t0 = 00000001 -/* 05888 80B58C38 8719146A */ lh $t9, 0x146A($t8) ## 8016146A -/* 0588C 80B58C3C AFA80030 */ sw $t0, 0x0030($sp) -/* 05890 80B58C40 AFA00010 */ sw $zero, 0x0010($sp) -/* 05894 80B58C44 01395023 */ subu $t2, $t1, $t9 -/* 05898 80B58C48 254BFFFE */ addiu $t3, $t2, 0xFFFE ## $t3 = FFFFFFFE -/* 0589C 80B58C4C AFAB0028 */ sw $t3, 0x0028($sp) -/* 058A0 80B58C50 3106FFFF */ andi $a2, $t0, 0xFFFF ## $a2 = 00000001 -/* 058A4 80B58C54 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 058A8 80B58C58 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 058AC 80B58C5C AFA9002C */ sw $t1, 0x002C($sp) -/* 058B0 80B58C60 0C01BE6F */ jal func_8006F9BC -/* 058B4 80B58C64 3124FFFF */ andi $a0, $t1, 0xFFFF ## $a0 = 00000000 -/* 058B8 80B58C68 26020348 */ addiu $v0, $s0, 0x0348 ## $v0 = 00000348 -/* 058BC 80B58C6C 26030354 */ addiu $v1, $s0, 0x0354 ## $v1 = 00000354 -/* 058C0 80B58C70 C4640000 */ lwc1 $f4, 0x0000($v1) ## 00000354 -/* 058C4 80B58C74 C4420000 */ lwc1 $f2, 0x0000($v0) ## 00000348 -/* 058C8 80B58C78 8FA80030 */ lw $t0, 0x0030($sp) -/* 058CC 80B58C7C 8FA9002C */ lw $t1, 0x002C($sp) -/* 058D0 80B58C80 46022181 */ sub.s $f6, $f4, $f2 -/* 058D4 80B58C84 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 058D8 80B58C88 3C0F8016 */ lui $t7, %hi(gGameInfo) -/* 058DC 80B58C8C 46060202 */ mul.s $f8, $f0, $f6 -/* 058E0 80B58C90 46081280 */ add.s $f10, $f2, $f8 -/* 058E4 80B58C94 E48A0000 */ swc1 $f10, 0x0000($a0) ## 00000024 -/* 058E8 80B58C98 C4700004 */ lwc1 $f16, 0x0004($v1) ## 00000358 -/* 058EC 80B58C9C C44C0004 */ lwc1 $f12, 0x0004($v0) ## 0000034C -/* 058F0 80B58CA0 C6080360 */ lwc1 $f8, 0x0360($s0) ## 00000360 -/* 058F4 80B58CA4 460C8481 */ sub.s $f18, $f16, $f12 -/* 058F8 80B58CA8 46120102 */ mul.s $f4, $f0, $f18 -/* 058FC 80B58CAC 46046180 */ add.s $f6, $f12, $f4 -/* 05900 80B58CB0 46083280 */ add.s $f10, $f6, $f8 -/* 05904 80B58CB4 E48A0004 */ swc1 $f10, 0x0004($a0) ## 00000028 -/* 05908 80B58CB8 C4700008 */ lwc1 $f16, 0x0008($v1) ## 0000035C -/* 0590C 80B58CBC C44E0008 */ lwc1 $f14, 0x0008($v0) ## 00000350 -/* 05910 80B58CC0 460E8481 */ sub.s $f18, $f16, $f14 -/* 05914 80B58CC4 46120102 */ mul.s $f4, $f0, $f18 -/* 05918 80B58CC8 46047180 */ add.s $f6, $f14, $f4 -/* 0591C 80B58CCC E4860008 */ swc1 $f6, 0x0008($a0) ## 0000002C -/* 05920 80B58CD0 8FAC0028 */ lw $t4, 0x0028($sp) -/* 05924 80B58CD4 010C6823 */ subu $t5, $t0, $t4 -/* 05928 80B58CD8 05A20014 */ bltzl $t5, .L80B58D2C -/* 0592C 80B58CDC 01286823 */ subu $t5, $t1, $t0 -/* 05930 80B58CE0 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) -/* 05934 80B58CE4 01287023 */ subu $t6, $t1, $t0 -/* 05938 80B58CE8 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 0593C 80B58CEC 85F8146A */ lh $t8, 0x146A($t7) ## 8016146A -/* 05940 80B58CF0 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 05944 80B58CF4 468042A0 */ cvt.s.w $f10, $f8 -/* 05948 80B58CF8 27190002 */ addiu $t9, $t8, 0x0002 ## $t9 = 00000002 -/* 0594C 80B58CFC 44998000 */ mtc1 $t9, $f16 ## $f16 = 0.00 -/* 05950 80B58D00 44813000 */ mtc1 $at, $f6 ## $f6 = 255.00 -/* 05954 80B58D04 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 05958 80B58D08 468084A0 */ cvt.s.w $f18, $f16 -/* 0595C 80B58D0C AE0C0250 */ sw $t4, 0x0250($s0) ## 00000250 -/* 05960 80B58D10 46125103 */ div.s $f4, $f10, $f18 -/* 05964 80B58D14 46062202 */ mul.s $f8, $f4, $f6 -/* 05968 80B58D18 4600440D */ trunc.w.s $f16, $f8 -/* 0596C 80B58D1C 440B8000 */ mfc1 $t3, $f16 -/* 05970 80B58D20 00000000 */ nop -/* 05974 80B58D24 AE0B0258 */ sw $t3, 0x0258($s0) ## 00000258 -/* 05978 80B58D28 01286823 */ subu $t5, $t1, $t0 -.L80B58D2C: -/* 0597C 80B58D2C 5DA00004 */ bgtzl $t5, .L80B58D40 -/* 05980 80B58D30 8FBF0024 */ lw $ra, 0x0024($sp) -/* 05984 80B58D34 0C00B55C */ jal Actor_Kill - -/* 05988 80B58D38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0598C 80B58D3C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B58D40: -/* 05990 80B58D40 8FB00020 */ lw $s0, 0x0020($sp) -/* 05994 80B58D44 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 05998 80B58D48 03E00008 */ jr $ra -/* 0599C 80B58D4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58D50.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58D50.s deleted file mode 100644 index 4e6a81fd46..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58D50.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B58D50 -/* 059A0 80B58D50 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 059A4 80B58D54 AFBF001C */ sw $ra, 0x001C($sp) -/* 059A8 80B58D58 AFB00018 */ sw $s0, 0x0018($sp) -/* 059AC 80B58D5C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 059B0 80B58D60 0C2D5378 */ jal func_80B54DE0 -/* 059B4 80B58D64 AFA50024 */ sw $a1, 0x0024($sp) -/* 059B8 80B58D68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 059BC 80B58D6C 0C2D4CFF */ jal func_80B533FC -/* 059C0 80B58D70 8FA50024 */ lw $a1, 0x0024($sp) -/* 059C4 80B58D74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 059C8 80B58D78 0C2D4D9B */ jal func_80B5366C -/* 059CC 80B58D7C 8FA50024 */ lw $a1, 0x0024($sp) -/* 059D0 80B58D80 0C2D4D33 */ jal func_80B534CC -/* 059D4 80B58D84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 059D8 80B58D88 0C2D4E53 */ jal func_80B5394C -/* 059DC 80B58D8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 059E0 80B58D90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 059E4 80B58D94 0C2D5FAB */ jal func_80B57EAC -/* 059E8 80B58D98 8FA50024 */ lw $a1, 0x0024($sp) -/* 059EC 80B58D9C 8FBF001C */ lw $ra, 0x001C($sp) -/* 059F0 80B58DA0 8FB00018 */ lw $s0, 0x0018($sp) -/* 059F4 80B58DA4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 059F8 80B58DA8 03E00008 */ jr $ra -/* 059FC 80B58DAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58DB0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58DB0.s deleted file mode 100644 index d8128e96a9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58DB0.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B58DB0 -/* 05A00 80B58DB0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 05A04 80B58DB4 AFBF001C */ sw $ra, 0x001C($sp) -/* 05A08 80B58DB8 AFB00018 */ sw $s0, 0x0018($sp) -/* 05A0C 80B58DBC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05A10 80B58DC0 0C2D5378 */ jal func_80B54DE0 -/* 05A14 80B58DC4 AFA50024 */ sw $a1, 0x0024($sp) -/* 05A18 80B58DC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05A1C 80B58DCC 0C2D4CFF */ jal func_80B533FC -/* 05A20 80B58DD0 8FA50024 */ lw $a1, 0x0024($sp) -/* 05A24 80B58DD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05A28 80B58DD8 0C2D4D9B */ jal func_80B5366C -/* 05A2C 80B58DDC 8FA50024 */ lw $a1, 0x0024($sp) -/* 05A30 80B58DE0 0C2D4D33 */ jal func_80B534CC -/* 05A34 80B58DE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05A38 80B58DE8 0C2D4E53 */ jal func_80B5394C -/* 05A3C 80B58DEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05A40 80B58DF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05A44 80B58DF4 0C2D5FBB */ jal func_80B57EEC -/* 05A48 80B58DF8 8FA50024 */ lw $a1, 0x0024($sp) -/* 05A4C 80B58DFC 8FBF001C */ lw $ra, 0x001C($sp) -/* 05A50 80B58E00 8FB00018 */ lw $s0, 0x0018($sp) -/* 05A54 80B58E04 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 05A58 80B58E08 03E00008 */ jr $ra -/* 05A5C 80B58E0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58E10.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58E10.s deleted file mode 100644 index 6601819bd4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58E10.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80B58E10 -/* 05A60 80B58E10 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 05A64 80B58E14 AFBF001C */ sw $ra, 0x001C($sp) -/* 05A68 80B58E18 AFB00018 */ sw $s0, 0x0018($sp) -/* 05A6C 80B58E1C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05A70 80B58E20 0C2D5378 */ jal func_80B54DE0 -/* 05A74 80B58E24 AFA50024 */ sw $a1, 0x0024($sp) -/* 05A78 80B58E28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05A7C 80B58E2C 0C00B56E */ jal Actor_SetHeight - -/* 05A80 80B58E30 3C054270 */ lui $a1, 0x4270 ## $a1 = 42700000 -/* 05A84 80B58E34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05A88 80B58E38 0C2D4CFF */ jal func_80B533FC -/* 05A8C 80B58E3C 8FA50024 */ lw $a1, 0x0024($sp) -/* 05A90 80B58E40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05A94 80B58E44 0C2D4D9B */ jal func_80B5366C -/* 05A98 80B58E48 8FA50024 */ lw $a1, 0x0024($sp) -/* 05A9C 80B58E4C 0C2D4D33 */ jal func_80B534CC -/* 05AA0 80B58E50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05AA4 80B58E54 0C2D4E53 */ jal func_80B5394C -/* 05AA8 80B58E58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05AAC 80B58E5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05AB0 80B58E60 0C2D5FC7 */ jal func_80B57F1C -/* 05AB4 80B58E64 8FA50024 */ lw $a1, 0x0024($sp) -/* 05AB8 80B58E68 8FBF001C */ lw $ra, 0x001C($sp) -/* 05ABC 80B58E6C 8FB00018 */ lw $s0, 0x0018($sp) -/* 05AC0 80B58E70 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 05AC4 80B58E74 03E00008 */ jr $ra -/* 05AC8 80B58E78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58E7C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58E7C.s deleted file mode 100644 index 7f1e4ce17b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58E7C.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80B58E7C -/* 05ACC 80B58E7C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 05AD0 80B58E80 AFBF001C */ sw $ra, 0x001C($sp) -/* 05AD4 80B58E84 AFB10018 */ sw $s1, 0x0018($sp) -/* 05AD8 80B58E88 AFB00014 */ sw $s0, 0x0014($sp) -/* 05ADC 80B58E8C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05AE0 80B58E90 0C2D5378 */ jal func_80B54DE0 -/* 05AE4 80B58E94 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 05AE8 80B58E98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05AEC 80B58E9C 0C2D4DD9 */ jal func_80B53764 -/* 05AF0 80B58EA0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05AF4 80B58EA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05AF8 80B58EA8 0C2D4CFF */ jal func_80B533FC -/* 05AFC 80B58EAC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05B00 80B58EB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05B04 80B58EB4 0C2D4D9B */ jal func_80B5366C -/* 05B08 80B58EB8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05B0C 80B58EBC 0C2D4D33 */ jal func_80B534CC -/* 05B10 80B58EC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05B14 80B58EC4 0C2D4E53 */ jal func_80B5394C -/* 05B18 80B58EC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05B1C 80B58ECC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05B20 80B58ED0 0C2D6005 */ jal func_80B58014 -/* 05B24 80B58ED4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05B28 80B58ED8 0C2D4DAD */ jal func_80B536B4 -/* 05B2C 80B58EDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05B30 80B58EE0 8FBF001C */ lw $ra, 0x001C($sp) -/* 05B34 80B58EE4 8FB00014 */ lw $s0, 0x0014($sp) -/* 05B38 80B58EE8 8FB10018 */ lw $s1, 0x0018($sp) -/* 05B3C 80B58EEC 03E00008 */ jr $ra -/* 05B40 80B58EF0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58EF4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58EF4.s deleted file mode 100644 index 70cdc2b455..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58EF4.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80B58EF4 -/* 05B44 80B58EF4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 05B48 80B58EF8 AFBF001C */ sw $ra, 0x001C($sp) -/* 05B4C 80B58EFC AFB10018 */ sw $s1, 0x0018($sp) -/* 05B50 80B58F00 AFB00014 */ sw $s0, 0x0014($sp) -/* 05B54 80B58F04 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05B58 80B58F08 0C2D5378 */ jal func_80B54DE0 -/* 05B5C 80B58F0C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 05B60 80B58F10 0C2D4E2C */ jal func_80B538B0 -/* 05B64 80B58F14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05B68 80B58F18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05B6C 80B58F1C 0C2D4DD9 */ jal func_80B53764 -/* 05B70 80B58F20 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05B74 80B58F24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05B78 80B58F28 0C2D4CFF */ jal func_80B533FC -/* 05B7C 80B58F2C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05B80 80B58F30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05B84 80B58F34 0C2D4D9B */ jal func_80B5366C -/* 05B88 80B58F38 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05B8C 80B58F3C 0C2D4D33 */ jal func_80B534CC -/* 05B90 80B58F40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05B94 80B58F44 0C2D4E53 */ jal func_80B5394C -/* 05B98 80B58F48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05B9C 80B58F4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05BA0 80B58F50 0C2D6085 */ jal func_80B58214 -/* 05BA4 80B58F54 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05BA8 80B58F58 8FBF001C */ lw $ra, 0x001C($sp) -/* 05BAC 80B58F5C 8FB00014 */ lw $s0, 0x0014($sp) -/* 05BB0 80B58F60 8FB10018 */ lw $s1, 0x0018($sp) -/* 05BB4 80B58F64 03E00008 */ jr $ra -/* 05BB8 80B58F68 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58F6C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58F6C.s deleted file mode 100644 index 1d83750d93..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58F6C.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80B58F6C -/* 05BBC 80B58F6C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 05BC0 80B58F70 AFBF001C */ sw $ra, 0x001C($sp) -/* 05BC4 80B58F74 AFB00018 */ sw $s0, 0x0018($sp) -/* 05BC8 80B58F78 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05BCC 80B58F7C 0C2D5378 */ jal func_80B54DE0 -/* 05BD0 80B58F80 AFA50024 */ sw $a1, 0x0024($sp) -/* 05BD4 80B58F84 0C2D4DFA */ jal func_80B537E8 -/* 05BD8 80B58F88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05BDC 80B58F8C 0C2D4DB1 */ jal func_80B536C4 -/* 05BE0 80B58F90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05BE4 80B58F94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05BE8 80B58F98 0C2D4CFF */ jal func_80B533FC -/* 05BEC 80B58F9C 8FA50024 */ lw $a1, 0x0024($sp) -/* 05BF0 80B58FA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05BF4 80B58FA4 0C2D4D9B */ jal func_80B5366C -/* 05BF8 80B58FA8 8FA50024 */ lw $a1, 0x0024($sp) -/* 05BFC 80B58FAC 0C2D4D33 */ jal func_80B534CC -/* 05C00 80B58FB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05C04 80B58FB4 0C2D4E53 */ jal func_80B5394C -/* 05C08 80B58FB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05C0C 80B58FBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05C10 80B58FC0 0C2D609A */ jal func_80B58268 -/* 05C14 80B58FC4 8FA50024 */ lw $a1, 0x0024($sp) -/* 05C18 80B58FC8 8FBF001C */ lw $ra, 0x001C($sp) -/* 05C1C 80B58FCC 8FB00018 */ lw $s0, 0x0018($sp) -/* 05C20 80B58FD0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 05C24 80B58FD4 03E00008 */ jr $ra -/* 05C28 80B58FD8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58FDC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58FDC.s deleted file mode 100644 index 6026d95c5d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58FDC.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80B58FDC -/* 05C2C 80B58FDC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 05C30 80B58FE0 AFBF001C */ sw $ra, 0x001C($sp) -/* 05C34 80B58FE4 AFB00018 */ sw $s0, 0x0018($sp) -/* 05C38 80B58FE8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05C3C 80B58FEC 0C2D5378 */ jal func_80B54DE0 -/* 05C40 80B58FF0 AFA50024 */ sw $a1, 0x0024($sp) -/* 05C44 80B58FF4 0C2D4DFA */ jal func_80B537E8 -/* 05C48 80B58FF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05C4C 80B58FFC 0C2D4DB1 */ jal func_80B536C4 -/* 05C50 80B59000 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05C54 80B59004 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05C58 80B59008 0C2D4CFF */ jal func_80B533FC -/* 05C5C 80B5900C 8FA50024 */ lw $a1, 0x0024($sp) -/* 05C60 80B59010 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05C64 80B59014 0C2D4D9B */ jal func_80B5366C -/* 05C68 80B59018 8FA50024 */ lw $a1, 0x0024($sp) -/* 05C6C 80B5901C 0C2D4D33 */ jal func_80B534CC -/* 05C70 80B59020 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05C74 80B59024 0C2D4E53 */ jal func_80B5394C -/* 05C78 80B59028 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05C7C 80B5902C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05C80 80B59030 0C2D60B2 */ jal func_80B582C8 -/* 05C84 80B59034 8FA50024 */ lw $a1, 0x0024($sp) -/* 05C88 80B59038 8FBF001C */ lw $ra, 0x001C($sp) -/* 05C8C 80B5903C 8FB00018 */ lw $s0, 0x0018($sp) -/* 05C90 80B59040 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 05C94 80B59044 03E00008 */ jr $ra -/* 05C98 80B59048 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5904C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5904C.s deleted file mode 100644 index 64af2217ff..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5904C.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80B5904C -/* 05C9C 80B5904C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 05CA0 80B59050 AFBF001C */ sw $ra, 0x001C($sp) -/* 05CA4 80B59054 AFB00018 */ sw $s0, 0x0018($sp) -/* 05CA8 80B59058 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05CAC 80B5905C 0C2D5378 */ jal func_80B54DE0 -/* 05CB0 80B59060 AFA50024 */ sw $a1, 0x0024($sp) -/* 05CB4 80B59064 0C2D4DFA */ jal func_80B537E8 -/* 05CB8 80B59068 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05CBC 80B5906C 0C2D4DB1 */ jal func_80B536C4 -/* 05CC0 80B59070 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05CC4 80B59074 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05CC8 80B59078 0C2D4CFF */ jal func_80B533FC -/* 05CCC 80B5907C 8FA50024 */ lw $a1, 0x0024($sp) -/* 05CD0 80B59080 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05CD4 80B59084 0C2D4D9B */ jal func_80B5366C -/* 05CD8 80B59088 8FA50024 */ lw $a1, 0x0024($sp) -/* 05CDC 80B5908C 0C2D4D33 */ jal func_80B534CC -/* 05CE0 80B59090 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05CE4 80B59094 0C2D4E53 */ jal func_80B5394C -/* 05CE8 80B59098 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05CEC 80B5909C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05CF0 80B590A0 0C2D612D */ jal func_80B584B4 -/* 05CF4 80B590A4 8FA50024 */ lw $a1, 0x0024($sp) -/* 05CF8 80B590A8 8FBF001C */ lw $ra, 0x001C($sp) -/* 05CFC 80B590AC 8FB00018 */ lw $s0, 0x0018($sp) -/* 05D00 80B590B0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 05D04 80B590B4 03E00008 */ jr $ra -/* 05D08 80B590B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B590BC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B590BC.s deleted file mode 100644 index 6b073ffbdb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B590BC.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80B590BC -/* 05D0C 80B590BC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 05D10 80B590C0 AFBF001C */ sw $ra, 0x001C($sp) -/* 05D14 80B590C4 AFB00018 */ sw $s0, 0x0018($sp) -/* 05D18 80B590C8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05D1C 80B590CC 0C2D5378 */ jal func_80B54DE0 -/* 05D20 80B590D0 AFA50024 */ sw $a1, 0x0024($sp) -/* 05D24 80B590D4 0C2D4DFA */ jal func_80B537E8 -/* 05D28 80B590D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05D2C 80B590DC 0C2D4DB1 */ jal func_80B536C4 -/* 05D30 80B590E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05D34 80B590E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05D38 80B590E8 0C2D4CFF */ jal func_80B533FC -/* 05D3C 80B590EC 8FA50024 */ lw $a1, 0x0024($sp) -/* 05D40 80B590F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05D44 80B590F4 0C2D4D9B */ jal func_80B5366C -/* 05D48 80B590F8 8FA50024 */ lw $a1, 0x0024($sp) -/* 05D4C 80B590FC 0C2D4D33 */ jal func_80B534CC -/* 05D50 80B59100 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05D54 80B59104 0C2D4E53 */ jal func_80B5394C -/* 05D58 80B59108 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05D5C 80B5910C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05D60 80B59110 0C2D6189 */ jal func_80B58624 -/* 05D64 80B59114 8FA50024 */ lw $a1, 0x0024($sp) -/* 05D68 80B59118 8FBF001C */ lw $ra, 0x001C($sp) -/* 05D6C 80B5911C 8FB00018 */ lw $s0, 0x0018($sp) -/* 05D70 80B59120 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 05D74 80B59124 03E00008 */ jr $ra -/* 05D78 80B59128 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5912C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5912C.s deleted file mode 100644 index 3a92594be2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5912C.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80B5912C -/* 05D7C 80B5912C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 05D80 80B59130 AFBF001C */ sw $ra, 0x001C($sp) -/* 05D84 80B59134 AFB10018 */ sw $s1, 0x0018($sp) -/* 05D88 80B59138 AFB00014 */ sw $s0, 0x0014($sp) -/* 05D8C 80B5913C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05D90 80B59140 0C2D5378 */ jal func_80B54DE0 -/* 05D94 80B59144 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 05D98 80B59148 0C2D4DB1 */ jal func_80B536C4 -/* 05D9C 80B5914C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05DA0 80B59150 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05DA4 80B59154 0C2D4CFF */ jal func_80B533FC -/* 05DA8 80B59158 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05DAC 80B5915C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05DB0 80B59160 0C2D4D9B */ jal func_80B5366C -/* 05DB4 80B59164 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05DB8 80B59168 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05DBC 80B5916C 0C2D5B8E */ jal func_80B56E38 -/* 05DC0 80B59170 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05DC4 80B59174 0C2D4D33 */ jal func_80B534CC -/* 05DC8 80B59178 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05DCC 80B5917C 0C2D4E53 */ jal func_80B5394C -/* 05DD0 80B59180 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05DD4 80B59184 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05DD8 80B59188 0C2D5F2D */ jal func_80B57CB4 -/* 05DDC 80B5918C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05DE0 80B59190 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05DE4 80B59194 0C2D5F58 */ jal func_80B57D60 -/* 05DE8 80B59198 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05DEC 80B5919C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05DF0 80B591A0 0C2D6287 */ jal func_80B58A1C -/* 05DF4 80B591A4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05DF8 80B591A8 8FBF001C */ lw $ra, 0x001C($sp) -/* 05DFC 80B591AC 8FB00014 */ lw $s0, 0x0014($sp) -/* 05E00 80B591B0 8FB10018 */ lw $s1, 0x0018($sp) -/* 05E04 80B591B4 03E00008 */ jr $ra -/* 05E08 80B591B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B591BC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B591BC.s deleted file mode 100644 index 75978f7b6f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B591BC.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80B591BC -/* 05E0C 80B591BC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 05E10 80B591C0 AFBF001C */ sw $ra, 0x001C($sp) -/* 05E14 80B591C4 AFB00018 */ sw $s0, 0x0018($sp) -/* 05E18 80B591C8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05E1C 80B591CC 0C2D5378 */ jal func_80B54DE0 -/* 05E20 80B591D0 AFA50024 */ sw $a1, 0x0024($sp) -/* 05E24 80B591D4 0C2D4DB1 */ jal func_80B536C4 -/* 05E28 80B591D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05E2C 80B591DC 0C2D4E2C */ jal func_80B538B0 -/* 05E30 80B591E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05E34 80B591E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05E38 80B591E8 0C2D4CFF */ jal func_80B533FC -/* 05E3C 80B591EC 8FA50024 */ lw $a1, 0x0024($sp) -/* 05E40 80B591F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05E44 80B591F4 0C2D4D9B */ jal func_80B5366C -/* 05E48 80B591F8 8FA50024 */ lw $a1, 0x0024($sp) -/* 05E4C 80B591FC 0C2D4D33 */ jal func_80B534CC -/* 05E50 80B59200 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05E54 80B59204 0C2D4E53 */ jal func_80B5394C -/* 05E58 80B59208 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05E5C 80B5920C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05E60 80B59210 0C2D6294 */ jal func_80B58A50 -/* 05E64 80B59214 8FA50024 */ lw $a1, 0x0024($sp) -/* 05E68 80B59218 8FBF001C */ lw $ra, 0x001C($sp) -/* 05E6C 80B5921C 8FB00018 */ lw $s0, 0x0018($sp) -/* 05E70 80B59220 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 05E74 80B59224 03E00008 */ jr $ra -/* 05E78 80B59228 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5922C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5922C.s deleted file mode 100644 index b968744607..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5922C.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80B5922C -/* 05E7C 80B5922C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 05E80 80B59230 AFBF001C */ sw $ra, 0x001C($sp) -/* 05E84 80B59234 AFB00018 */ sw $s0, 0x0018($sp) -/* 05E88 80B59238 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05E8C 80B5923C 0C2D5378 */ jal func_80B54DE0 -/* 05E90 80B59240 AFA50024 */ sw $a1, 0x0024($sp) -/* 05E94 80B59244 0C2D4DB1 */ jal func_80B536C4 -/* 05E98 80B59248 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05E9C 80B5924C 0C2D5CA6 */ jal func_80B57298 -/* 05EA0 80B59250 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05EA4 80B59254 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05EA8 80B59258 0C00B56E */ jal Actor_SetHeight - -/* 05EAC 80B5925C 3C054270 */ lui $a1, 0x4270 ## $a1 = 42700000 -/* 05EB0 80B59260 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05EB4 80B59264 0C2D4CFF */ jal func_80B533FC -/* 05EB8 80B59268 8FA50024 */ lw $a1, 0x0024($sp) -/* 05EBC 80B5926C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05EC0 80B59270 0C2D4D9B */ jal func_80B5366C -/* 05EC4 80B59274 8FA50024 */ lw $a1, 0x0024($sp) -/* 05EC8 80B59278 0C2D4D33 */ jal func_80B534CC -/* 05ECC 80B5927C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05ED0 80B59280 0C2D4E53 */ jal func_80B5394C -/* 05ED4 80B59284 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05ED8 80B59288 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05EDC 80B5928C 0C2D62AB */ jal func_80B58AAC -/* 05EE0 80B59290 8FA50024 */ lw $a1, 0x0024($sp) -/* 05EE4 80B59294 8FBF001C */ lw $ra, 0x001C($sp) -/* 05EE8 80B59298 8FB00018 */ lw $s0, 0x0018($sp) -/* 05EEC 80B5929C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 05EF0 80B592A0 03E00008 */ jr $ra -/* 05EF4 80B592A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B592A8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B592A8.s deleted file mode 100644 index 77afe4bea0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B592A8.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80B592A8 -/* 05EF8 80B592A8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 05EFC 80B592AC AFBF001C */ sw $ra, 0x001C($sp) -/* 05F00 80B592B0 AFB00018 */ sw $s0, 0x0018($sp) -/* 05F04 80B592B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05F08 80B592B8 0C2D5378 */ jal func_80B54DE0 -/* 05F0C 80B592BC AFA50024 */ sw $a1, 0x0024($sp) -/* 05F10 80B592C0 0C2D4DB1 */ jal func_80B536C4 -/* 05F14 80B592C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05F18 80B592C8 0C2D5CA6 */ jal func_80B57298 -/* 05F1C 80B592CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05F20 80B592D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05F24 80B592D4 0C00B56E */ jal Actor_SetHeight - -/* 05F28 80B592D8 3C054270 */ lui $a1, 0x4270 ## $a1 = 42700000 -/* 05F2C 80B592DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05F30 80B592E0 0C2D4CFF */ jal func_80B533FC -/* 05F34 80B592E4 8FA50024 */ lw $a1, 0x0024($sp) -/* 05F38 80B592E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05F3C 80B592EC 0C2D4D9B */ jal func_80B5366C -/* 05F40 80B592F0 8FA50024 */ lw $a1, 0x0024($sp) -/* 05F44 80B592F4 0C2D4D33 */ jal func_80B534CC -/* 05F48 80B592F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05F4C 80B592FC 0C2D4E53 */ jal func_80B5394C -/* 05F50 80B59300 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05F54 80B59304 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 05F58 80B59308 24C63D20 */ addiu $a2, $a2, 0x3D20 ## $a2 = 06003D20 -/* 05F5C 80B5930C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05F60 80B59310 0C2D5EAB */ jal func_80B57AAC -/* 05F64 80B59314 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 05F68 80B59318 0C2D5B7B */ jal func_80B56DEC -/* 05F6C 80B5931C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05F70 80B59320 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05F74 80B59324 0C2D62AB */ jal func_80B58AAC -/* 05F78 80B59328 8FA50024 */ lw $a1, 0x0024($sp) -/* 05F7C 80B5932C 8FBF001C */ lw $ra, 0x001C($sp) -/* 05F80 80B59330 8FB00018 */ lw $s0, 0x0018($sp) -/* 05F84 80B59334 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 05F88 80B59338 03E00008 */ jr $ra -/* 05F8C 80B5933C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59340.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59340.s deleted file mode 100644 index 04101d4bcc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59340.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80B59340 -/* 05F90 80B59340 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 05F94 80B59344 AFBF001C */ sw $ra, 0x001C($sp) -/* 05F98 80B59348 AFB00018 */ sw $s0, 0x0018($sp) -/* 05F9C 80B5934C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05FA0 80B59350 0C2D5378 */ jal func_80B54DE0 -/* 05FA4 80B59354 AFA50024 */ sw $a1, 0x0024($sp) -/* 05FA8 80B59358 0C2D4DB1 */ jal func_80B536C4 -/* 05FAC 80B5935C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05FB0 80B59360 0C2D5CA6 */ jal func_80B57298 -/* 05FB4 80B59364 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05FB8 80B59368 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05FBC 80B5936C 0C00B56E */ jal Actor_SetHeight - -/* 05FC0 80B59370 3C054270 */ lui $a1, 0x4270 ## $a1 = 42700000 -/* 05FC4 80B59374 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05FC8 80B59378 0C2D4CFF */ jal func_80B533FC -/* 05FCC 80B5937C 8FA50024 */ lw $a1, 0x0024($sp) -/* 05FD0 80B59380 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05FD4 80B59384 0C2D4D9B */ jal func_80B5366C -/* 05FD8 80B59388 8FA50024 */ lw $a1, 0x0024($sp) -/* 05FDC 80B5938C 0C2D4D33 */ jal func_80B534CC -/* 05FE0 80B59390 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05FE4 80B59394 0C2D4E53 */ jal func_80B5394C -/* 05FE8 80B59398 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05FEC 80B5939C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 05FF0 80B593A0 24C69FBC */ addiu $a2, $a2, 0x9FBC ## $a2 = 06009FBC -/* 05FF4 80B593A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05FF8 80B593A8 0C2D5EAB */ jal func_80B57AAC -/* 05FFC 80B593AC 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 06000 80B593B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06004 80B593B4 0C2D62AB */ jal func_80B58AAC -/* 06008 80B593B8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0600C 80B593BC 8FBF001C */ lw $ra, 0x001C($sp) -/* 06010 80B593C0 8FB00018 */ lw $s0, 0x0018($sp) -/* 06014 80B593C4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 06018 80B593C8 03E00008 */ jr $ra -/* 0601C 80B593CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B593D0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B593D0.s deleted file mode 100644 index f9115c517e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B593D0.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80B593D0 -/* 06020 80B593D0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 06024 80B593D4 AFBF001C */ sw $ra, 0x001C($sp) -/* 06028 80B593D8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0602C 80B593DC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 06030 80B593E0 0C2D5378 */ jal func_80B54DE0 -/* 06034 80B593E4 AFA50024 */ sw $a1, 0x0024($sp) -/* 06038 80B593E8 0C2D4DB1 */ jal func_80B536C4 -/* 0603C 80B593EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06040 80B593F0 0C2D5CA6 */ jal func_80B57298 -/* 06044 80B593F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06048 80B593F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0604C 80B593FC 0C2D4D9B */ jal func_80B5366C -/* 06050 80B59400 8FA50024 */ lw $a1, 0x0024($sp) -/* 06054 80B59404 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06058 80B59408 0C2D5B8E */ jal func_80B56E38 -/* 0605C 80B5940C 8FA50024 */ lw $a1, 0x0024($sp) -/* 06060 80B59410 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06064 80B59414 0C00B56E */ jal Actor_SetHeight - -/* 06068 80B59418 3C054270 */ lui $a1, 0x4270 ## $a1 = 42700000 -/* 0606C 80B5941C 0C2D4D33 */ jal func_80B534CC -/* 06070 80B59420 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06074 80B59424 0C2D4E53 */ jal func_80B5394C -/* 06078 80B59428 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0607C 80B5942C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06080 80B59430 0C2D6302 */ jal func_80B58C08 -/* 06084 80B59434 8FA50024 */ lw $a1, 0x0024($sp) -/* 06088 80B59438 8FBF001C */ lw $ra, 0x001C($sp) -/* 0608C 80B5943C 8FB00018 */ lw $s0, 0x0018($sp) -/* 06090 80B59440 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 06094 80B59444 03E00008 */ jr $ra -/* 06098 80B59448 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5944C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5944C.s deleted file mode 100644 index 376b1d0cec..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5944C.s +++ /dev/null @@ -1,186 +0,0 @@ -.rdata -glabel D_80B5A824 - .asciz "../z_en_zl3_inEscape.c" - .balign 4 - -glabel D_80B5A83C - .asciz "../z_en_zl3_inEscape.c" - .balign 4 - -glabel D_80B5A854 - .asciz "../z_en_zl3_inEscape.c" - .balign 4 - -glabel D_80B5A86C - .asciz "../z_en_zl3_inEscape.c" - .balign 4 - -glabel D_80B5A884 - .asciz "../z_en_zl3_inEscape.c" - .balign 4 - -glabel D_80B5A89C - .asciz "../z_en_zl3_inEscape.c" - .balign 4 - -glabel D_80B5A8B4 - .asciz "../z_en_zl3_inEscape.c" - .balign 4 - -.late_rodata -glabel D_80B5AB94 - .word 0xC39E8000 -glabel D_80B5AB98 - .word 0xC47EC000 - -.text -glabel func_80B5944C -/* 0609C 80B5944C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 060A0 80B59450 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 060A4 80B59454 AFBF001C */ sw $ra, 0x001C($sp) -/* 060A8 80B59458 AFB00018 */ sw $s0, 0x0018($sp) -/* 060AC 80B5945C AFA40020 */ sw $a0, 0x0020($sp) -/* 060B0 80B59460 AFA60028 */ sw $a2, 0x0028($sp) -/* 060B4 80B59464 14A10087 */ bne $a1, $at, .L80B59684 -/* 060B8 80B59468 AFA7002C */ sw $a3, 0x002C($sp) -/* 060BC 80B5946C 8C840000 */ lw $a0, 0x0000($a0) ## 00000000 -/* 060C0 80B59470 0C031A73 */ jal Graph_Alloc - -/* 060C4 80B59474 240501C0 */ addiu $a1, $zero, 0x01C0 ## $a1 = 000001C0 -/* 060C8 80B59478 8FA50038 */ lw $a1, 0x0038($sp) -/* 060CC 80B5947C 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 060D0 80B59480 35EF0030 */ ori $t7, $t7, 0x0030 ## $t7 = DB060030 -/* 060D4 80B59484 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 060D8 80B59488 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 060DC 80B5948C 248E0008 */ addiu $t6, $a0, 0x0008 ## $t6 = 00000008 -/* 060E0 80B59490 ACAE0000 */ sw $t6, 0x0000($a1) ## 00000000 -/* 060E4 80B59494 AC820004 */ sw $v0, 0x0004($a0) ## 00000004 -/* 060E8 80B59498 AC8F0000 */ sw $t7, 0x0000($a0) ## 00000000 -/* 060EC 80B5949C 8FA30030 */ lw $v1, 0x0030($sp) -/* 060F0 80B594A0 8FA20034 */ lw $v0, 0x0034($sp) -/* 060F4 80B594A4 84780000 */ lh $t8, 0x0000($v1) ## 00000000 -/* 060F8 80B594A8 84590402 */ lh $t9, 0x0402($v0) ## 00000402 -/* 060FC 80B594AC 846A0004 */ lh $t2, 0x0004($v1) ## 00000004 -/* 06100 80B594B0 24420400 */ addiu $v0, $v0, 0x0400 ## $v0 = 00000400 -/* 06104 80B594B4 03194821 */ addu $t1, $t8, $t9 -/* 06108 80B594B8 A4690000 */ sh $t1, 0x0000($v1) ## 00000000 -/* 0610C 80B594BC 844B0000 */ lh $t3, 0x0000($v0) ## 00000400 -/* 06110 80B594C0 014B6021 */ addu $t4, $t2, $t3 -/* 06114 80B594C4 0C034213 */ jal Matrix_Push -/* 06118 80B594C8 A46C0004 */ sh $t4, 0x0004($v1) ## 00000004 -/* 0611C 80B594CC 8FA8002C */ lw $t0, 0x002C($sp) -/* 06120 80B594D0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 06124 80B594D4 C50C0000 */ lwc1 $f12, 0x0000($t0) ## 00000000 -/* 06128 80B594D8 C50E0004 */ lwc1 $f14, 0x0004($t0) ## 00000004 -/* 0612C 80B594DC 0C034261 */ jal Matrix_Translate -/* 06130 80B594E0 8D060008 */ lw $a2, 0x0008($t0) ## 00000008 -/* 06134 80B594E4 8FA30030 */ lw $v1, 0x0030($sp) -/* 06138 80B594E8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0613C 80B594EC 84640000 */ lh $a0, 0x0000($v1) ## 00000000 -/* 06140 80B594F0 84650002 */ lh $a1, 0x0002($v1) ## 00000002 -/* 06144 80B594F4 0C034421 */ jal Matrix_RotateRPY -/* 06148 80B594F8 84660004 */ lh $a2, 0x0004($v1) ## 00000004 -/* 0614C 80B594FC 0C034213 */ jal Matrix_Push -/* 06150 80B59500 00000000 */ nop -/* 06154 80B59504 3C01432E */ lui $at, 0x432E ## $at = 432E0000 -/* 06158 80B59508 44816000 */ mtc1 $at, $f12 ## $f12 = 174.00 -/* 0615C 80B5950C 3C0180B6 */ lui $at, %hi(D_80B5AB94) ## $at = 80B60000 -/* 06160 80B59510 C42EAB94 */ lwc1 $f14, %lo(D_80B5AB94)($at) -/* 06164 80B59514 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 06168 80B59518 0C034261 */ jal Matrix_Translate -/* 0616C 80B5951C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 06170 80B59520 3C0580B6 */ lui $a1, %hi(D_80B5A824) ## $a1 = 80B60000 -/* 06174 80B59524 24A5A824 */ addiu $a1, $a1, %lo(D_80B5A824) ## $a1 = 80B5A824 -/* 06178 80B59528 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0617C 80B5952C 0C034695 */ jal Matrix_ToMtx -/* 06180 80B59530 240609A7 */ addiu $a2, $zero, 0x09A7 ## $a2 = 000009A7 -/* 06184 80B59534 3C01C3CD */ lui $at, 0xC3CD ## $at = C3CD0000 -/* 06188 80B59538 44816000 */ mtc1 $at, $f12 ## $f12 = -410.00 -/* 0618C 80B5953C 3C01C338 */ lui $at, 0xC338 ## $at = C3380000 -/* 06190 80B59540 44817000 */ mtc1 $at, $f14 ## $f14 = -184.00 -/* 06194 80B59544 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 06198 80B59548 0C034261 */ jal Matrix_Translate -/* 0619C 80B5954C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 061A0 80B59550 3C0580B6 */ lui $a1, %hi(D_80B5A83C) ## $a1 = 80B60000 -/* 061A4 80B59554 24A5A83C */ addiu $a1, $a1, %lo(D_80B5A83C) ## $a1 = 80B5A83C -/* 061A8 80B59558 26040040 */ addiu $a0, $s0, 0x0040 ## $a0 = 00000040 -/* 061AC 80B5955C 0C034695 */ jal Matrix_ToMtx -/* 061B0 80B59560 240609AA */ addiu $a2, $zero, 0x09AA ## $a2 = 000009AA -/* 061B4 80B59564 3C0180B6 */ lui $at, %hi(D_80B5AB98) ## $at = 80B60000 -/* 061B8 80B59568 C42CAB98 */ lwc1 $f12, %lo(D_80B5AB98)($at) -/* 061BC 80B5956C 3C01C1D0 */ lui $at, 0xC1D0 ## $at = C1D00000 -/* 061C0 80B59570 44817000 */ mtc1 $at, $f14 ## $f14 = -26.00 -/* 061C4 80B59574 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 061C8 80B59578 0C034261 */ jal Matrix_Translate -/* 061CC 80B5957C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 061D0 80B59580 3C0580B6 */ lui $a1, %hi(D_80B5A854) ## $a1 = 80B60000 -/* 061D4 80B59584 24A5A854 */ addiu $a1, $a1, %lo(D_80B5A854) ## $a1 = 80B5A854 -/* 061D8 80B59588 26040080 */ addiu $a0, $s0, 0x0080 ## $a0 = 00000080 -/* 061DC 80B5958C 0C034695 */ jal Matrix_ToMtx -/* 061E0 80B59590 240609AD */ addiu $a2, $zero, 0x09AD ## $a2 = 000009AD -/* 061E4 80B59594 0C034221 */ jal Matrix_Pull -/* 061E8 80B59598 00000000 */ nop -/* 061EC 80B5959C 0C034213 */ jal Matrix_Push -/* 061F0 80B595A0 00000000 */ nop -/* 061F4 80B595A4 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 061F8 80B595A8 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 -/* 061FC 80B595AC 3C014384 */ lui $at, 0x4384 ## $at = 43840000 -/* 06200 80B595B0 44817000 */ mtc1 $at, $f14 ## $f14 = 264.00 -/* 06204 80B595B4 3C0643C1 */ lui $a2, 0x43C1 ## $a2 = 43C10000 -/* 06208 80B595B8 0C034261 */ jal Matrix_Translate -/* 0620C 80B595BC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 06210 80B595C0 3C0580B6 */ lui $a1, %hi(D_80B5A86C) ## $a1 = 80B60000 -/* 06214 80B595C4 24A5A86C */ addiu $a1, $a1, %lo(D_80B5A86C) ## $a1 = 80B5A86C -/* 06218 80B595C8 260400C0 */ addiu $a0, $s0, 0x00C0 ## $a0 = 000000C0 -/* 0621C 80B595CC 0C034695 */ jal Matrix_ToMtx -/* 06220 80B595D0 240609B3 */ addiu $a2, $zero, 0x09B3 ## $a2 = 000009B3 -/* 06224 80B595D4 3C01C3DF */ lui $at, 0xC3DF ## $at = C3DF0000 -/* 06228 80B595D8 44816000 */ mtc1 $at, $f12 ## $f12 = -446.00 -/* 0622C 80B595DC 3C01C250 */ lui $at, 0xC250 ## $at = C2500000 -/* 06230 80B595E0 44817000 */ mtc1 $at, $f14 ## $f14 = -52.00 -/* 06234 80B595E4 3C0642A8 */ lui $a2, 0x42A8 ## $a2 = 42A80000 -/* 06238 80B595E8 0C034261 */ jal Matrix_Translate -/* 0623C 80B595EC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 06240 80B595F0 3C0580B6 */ lui $a1, %hi(D_80B5A884) ## $a1 = 80B60000 -/* 06244 80B595F4 24A5A884 */ addiu $a1, $a1, %lo(D_80B5A884) ## $a1 = 80B5A884 -/* 06248 80B595F8 26040100 */ addiu $a0, $s0, 0x0100 ## $a0 = 00000100 -/* 0624C 80B595FC 0C034695 */ jal Matrix_ToMtx -/* 06250 80B59600 240609B6 */ addiu $a2, $zero, 0x09B6 ## $a2 = 000009B6 -/* 06254 80B59604 0C034221 */ jal Matrix_Pull -/* 06258 80B59608 00000000 */ nop -/* 0625C 80B5960C 0C034213 */ jal Matrix_Push -/* 06260 80B59610 00000000 */ nop -/* 06264 80B59614 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 06268 80B59618 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 -/* 0626C 80B5961C 3C014384 */ lui $at, 0x4384 ## $at = 43840000 -/* 06270 80B59620 44817000 */ mtc1 $at, $f14 ## $f14 = 264.00 -/* 06274 80B59624 3C06C3C1 */ lui $a2, 0xC3C1 ## $a2 = C3C10000 -/* 06278 80B59628 0C034261 */ jal Matrix_Translate -/* 0627C 80B5962C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 06280 80B59630 3C0580B6 */ lui $a1, %hi(D_80B5A89C) ## $a1 = 80B60000 -/* 06284 80B59634 24A5A89C */ addiu $a1, $a1, %lo(D_80B5A89C) ## $a1 = 80B5A89C -/* 06288 80B59638 26040140 */ addiu $a0, $s0, 0x0140 ## $a0 = 00000140 -/* 0628C 80B5963C 0C034695 */ jal Matrix_ToMtx -/* 06290 80B59640 240609BC */ addiu $a2, $zero, 0x09BC ## $a2 = 000009BC -/* 06294 80B59644 3C01C3DF */ lui $at, 0xC3DF ## $at = C3DF0000 -/* 06298 80B59648 44816000 */ mtc1 $at, $f12 ## $f12 = -446.00 -/* 0629C 80B5964C 3C01C250 */ lui $at, 0xC250 ## $at = C2500000 -/* 062A0 80B59650 44817000 */ mtc1 $at, $f14 ## $f14 = -52.00 -/* 062A4 80B59654 3C06C2A8 */ lui $a2, 0xC2A8 ## $a2 = C2A80000 -/* 062A8 80B59658 0C034261 */ jal Matrix_Translate -/* 062AC 80B5965C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 062B0 80B59660 3C0580B6 */ lui $a1, %hi(D_80B5A8B4) ## $a1 = 80B60000 -/* 062B4 80B59664 24A5A8B4 */ addiu $a1, $a1, %lo(D_80B5A8B4) ## $a1 = 80B5A8B4 -/* 062B8 80B59668 26040180 */ addiu $a0, $s0, 0x0180 ## $a0 = 00000180 -/* 062BC 80B5966C 0C034695 */ jal Matrix_ToMtx -/* 062C0 80B59670 240609BF */ addiu $a2, $zero, 0x09BF ## $a2 = 000009BF -/* 062C4 80B59674 0C034221 */ jal Matrix_Pull -/* 062C8 80B59678 00000000 */ nop -/* 062CC 80B5967C 0C034221 */ jal Matrix_Pull -/* 062D0 80B59680 00000000 */ nop -.L80B59684: -/* 062D4 80B59684 8FBF001C */ lw $ra, 0x001C($sp) -/* 062D8 80B59688 8FB00018 */ lw $s0, 0x0018($sp) -/* 062DC 80B5968C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 062E0 80B59690 03E00008 */ jr $ra -/* 062E4 80B59694 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59698.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59698.s deleted file mode 100644 index 608f71b669..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59698.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel func_80B59698 -/* 062E8 80B59698 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 062EC 80B5969C AFA40020 */ sw $a0, 0x0020($sp) -/* 062F0 80B596A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 062F4 80B596A4 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 062F8 80B596A8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 062FC 80B596AC 24050037 */ addiu $a1, $zero, 0x0037 ## $a1 = 00000037 -/* 06300 80B596B0 0C00B2D0 */ jal Flags_GetSwitch - -/* 06304 80B596B4 AFA60024 */ sw $a2, 0x0024($sp) -/* 06308 80B596B8 0002182B */ sltu $v1, $zero, $v0 -/* 0630C 80B596BC 10600010 */ beq $v1, $zero, .L80B59700 -/* 06310 80B596C0 8FA60024 */ lw $a2, 0x0024($sp) -/* 06314 80B596C4 84C200A4 */ lh $v0, 0x00A4($a2) ## 000000A4 -/* 06318 80B596C8 3843004F */ xori $v1, $v0, 0x004F ## $v1 = 0000004F -/* 0631C 80B596CC 2C630001 */ sltiu $v1, $v1, 0x0001 -/* 06320 80B596D0 1460000B */ bne $v1, $zero, .L80B59700 -/* 06324 80B596D4 00000000 */ nop -/* 06328 80B596D8 3843001A */ xori $v1, $v0, 0x001A ## $v1 = 0000001A -/* 0632C 80B596DC 2C630001 */ sltiu $v1, $v1, 0x0001 -/* 06330 80B596E0 14600007 */ bne $v1, $zero, .L80B59700 -/* 06334 80B596E4 00000000 */ nop -/* 06338 80B596E8 3843000E */ xori $v1, $v0, 0x000E ## $v1 = 0000000E -/* 0633C 80B596EC 2C630001 */ sltiu $v1, $v1, 0x0001 -/* 06340 80B596F0 14600003 */ bne $v1, $zero, .L80B59700 -/* 06344 80B596F4 00000000 */ nop -/* 06348 80B596F8 3843000F */ xori $v1, $v0, 0x000F ## $v1 = 0000000F -/* 0634C 80B596FC 2C630001 */ sltiu $v1, $v1, 0x0001 -.L80B59700: -/* 06350 80B59700 10600014 */ beq $v1, $zero, .L80B59754 -/* 06354 80B59704 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 06358 80B59708 01C67021 */ addu $t6, $t6, $a2 -/* 0635C 80B5970C 91CE1DEA */ lbu $t6, 0x1DEA($t6) ## 00011DEA -/* 06360 80B59710 8FA40020 */ lw $a0, 0x0020($sp) -/* 06364 80B59714 0C2D536D */ jal func_80B54DB4 -/* 06368 80B59718 A3AE001B */ sb $t6, 0x001B($sp) -/* 0636C 80B5971C 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 -/* 06370 80B59720 1441000C */ bne $v0, $at, .L80B59754 -/* 06374 80B59724 93AF001B */ lbu $t7, 0x001B($sp) -/* 06378 80B59728 15E0000A */ bne $t7, $zero, .L80B59754 -/* 0637C 80B5972C 3C028016 */ lui $v0, %hi(gSaveContext) -/* 06380 80B59730 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 06384 80B59734 845813D4 */ lh $t8, 0x13D4($v0) ## 8015FA34 -/* 06388 80B59738 1B000004 */ blez $t8, .L80B5974C -/* 0638C 80B5973C 00000000 */ nop -/* 06390 80B59740 845913D2 */ lh $t9, 0x13D2($v0) ## 8015FA32 -/* 06394 80B59744 57200004 */ bnel $t9, $zero, .L80B59758 -/* 06398 80B59748 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B5974C: -/* 0639C 80B5974C 10000002 */ beq $zero, $zero, .L80B59758 -/* 063A0 80B59750 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B59754: -/* 063A4 80B59754 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B59758: -/* 063A8 80B59758 8FBF0014 */ lw $ra, 0x0014($sp) -/* 063AC 80B5975C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 063B0 80B59760 03E00008 */ jr $ra -/* 063B4 80B59764 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59768.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59768.s deleted file mode 100644 index 74829dc8bc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59768.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_80B59768 -/* 063B8 80B59768 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 063BC 80B5976C AFA40020 */ sw $a0, 0x0020($sp) -/* 063C0 80B59770 AFBF0014 */ sw $ra, 0x0014($sp) -/* 063C4 80B59774 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 063C8 80B59778 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 063CC 80B5977C 24050037 */ addiu $a1, $zero, 0x0037 ## $a1 = 00000037 -/* 063D0 80B59780 0C00B2D0 */ jal Flags_GetSwitch - -/* 063D4 80B59784 AFA60024 */ sw $a2, 0x0024($sp) -/* 063D8 80B59788 0002182B */ sltu $v1, $zero, $v0 -/* 063DC 80B5978C 10600010 */ beq $v1, $zero, .L80B597D0 -/* 063E0 80B59790 8FA60024 */ lw $a2, 0x0024($sp) -/* 063E4 80B59794 84C200A4 */ lh $v0, 0x00A4($a2) ## 000000A4 -/* 063E8 80B59798 3843004F */ xori $v1, $v0, 0x004F ## $v1 = 0000004F -/* 063EC 80B5979C 2C630001 */ sltiu $v1, $v1, 0x0001 -/* 063F0 80B597A0 1460000B */ bne $v1, $zero, .L80B597D0 -/* 063F4 80B597A4 00000000 */ nop -/* 063F8 80B597A8 3843001A */ xori $v1, $v0, 0x001A ## $v1 = 0000001A -/* 063FC 80B597AC 2C630001 */ sltiu $v1, $v1, 0x0001 -/* 06400 80B597B0 14600007 */ bne $v1, $zero, .L80B597D0 -/* 06404 80B597B4 00000000 */ nop -/* 06408 80B597B8 3843000E */ xori $v1, $v0, 0x000E ## $v1 = 0000000E -/* 0640C 80B597BC 2C630001 */ sltiu $v1, $v1, 0x0001 -/* 06410 80B597C0 14600003 */ bne $v1, $zero, .L80B597D0 -/* 06414 80B597C4 00000000 */ nop -/* 06418 80B597C8 3843000F */ xori $v1, $v0, 0x000F ## $v1 = 0000000F -/* 0641C 80B597CC 2C630001 */ sltiu $v1, $v1, 0x0001 -.L80B597D0: -/* 06420 80B597D0 10600010 */ beq $v1, $zero, .L80B59814 -/* 06424 80B597D4 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 06428 80B597D8 01C67021 */ addu $t6, $t6, $a2 -/* 0642C 80B597DC 91CE1DEA */ lbu $t6, 0x1DEA($t6) ## 00011DEA -/* 06430 80B597E0 8FA40020 */ lw $a0, 0x0020($sp) -/* 06434 80B597E4 0C2D536D */ jal func_80B54DB4 -/* 06438 80B597E8 A3AE001B */ sb $t6, 0x001B($sp) -/* 0643C 80B597EC 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 -/* 06440 80B597F0 14410008 */ bne $v0, $at, .L80B59814 -/* 06444 80B597F4 93AF001B */ lbu $t7, 0x001B($sp) -/* 06448 80B597F8 15E00006 */ bne $t7, $zero, .L80B59814 -/* 0644C 80B597FC 3C188016 */ lui $t8, %hi(gSaveContext+0x13d4) -/* 06450 80B59800 8718FA34 */ lh $t8, %lo(gSaveContext+0x13d4)($t8) -/* 06454 80B59804 5F000004 */ bgtzl $t8, .L80B59818 -/* 06458 80B59808 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0645C 80B5980C 10000002 */ beq $zero, $zero, .L80B59818 -/* 06460 80B59810 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B59814: -/* 06464 80B59814 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B59818: -/* 06468 80B59818 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0646C 80B5981C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 06470 80B59820 03E00008 */ jr $ra -/* 06474 80B59824 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59828.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59828.s deleted file mode 100644 index ce0f327178..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59828.s +++ /dev/null @@ -1,179 +0,0 @@ -.late_rodata -glabel D_80B5AB9C - .word 0x455D8000 - -.text -glabel func_80B59828 -/* 06478 80B59828 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0647C 80B5982C AFBF0034 */ sw $ra, 0x0034($sp) -/* 06480 80B59830 AFB10030 */ sw $s1, 0x0030($sp) -/* 06484 80B59834 AFB0002C */ sw $s0, 0x002C($sp) -/* 06488 80B59838 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0648C 80B5983C 0C2D65A6 */ jal func_80B59698 -/* 06490 80B59840 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 06494 80B59844 14400008 */ bne $v0, $zero, .L80B59868 -/* 06498 80B59848 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0649C 80B5984C 0C2D5BB9 */ jal func_80B56EE4 -/* 064A0 80B59850 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 064A4 80B59854 1440001F */ bne $v0, $zero, .L80B598D4 -/* 064A8 80B59858 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 064AC 80B5985C 0C2D5E24 */ jal func_80B57890 -/* 064B0 80B59860 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 064B4 80B59864 1040001B */ beq $v0, $zero, .L80B598D4 -.L80B59868: -/* 064B8 80B59868 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 064BC 80B5986C 24A59FBC */ addiu $a1, $a1, 0x9FBC ## $a1 = 06009FBC -/* 064C0 80B59870 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 064C4 80B59874 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 064C8 80B59878 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 064CC 80B5987C 0C2D5385 */ jal func_80B54E14 -/* 064D0 80B59880 AFA00010 */ sw $zero, 0x0010($sp) -/* 064D4 80B59884 8E2E0004 */ lw $t6, 0x0004($s1) ## 00000004 -/* 064D8 80B59888 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 064DC 80B5988C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 064E0 80B59890 35CF0009 */ ori $t7, $t6, 0x0009 ## $t7 = 00000009 -/* 064E4 80B59894 0C2D5BC4 */ jal func_80B56F10 -/* 064E8 80B59898 AE2F0004 */ sw $t7, 0x0004($s1) ## 00000004 -/* 064EC 80B5989C 0C2D5C6A */ jal func_80B571A8 -/* 064F0 80B598A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 064F4 80B598A4 A62000B8 */ sh $zero, 0x00B8($s1) ## 000000B8 -/* 064F8 80B598A8 86380034 */ lh $t8, 0x0034($s1) ## 00000034 -/* 064FC 80B598AC 863900B8 */ lh $t9, 0x00B8($s1) ## 000000B8 -/* 06500 80B598B0 2408001C */ addiu $t0, $zero, 0x001C ## $t0 = 0000001C -/* 06504 80B598B4 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 06508 80B598B8 A62200B6 */ sh $v0, 0x00B6($s1) ## 000000B6 -/* 0650C 80B598BC A6220032 */ sh $v0, 0x0032($s1) ## 00000032 -/* 06510 80B598C0 AE28024C */ sw $t0, 0x024C($s1) ## 0000024C -/* 06514 80B598C4 AE290250 */ sw $t1, 0x0250($s1) ## 00000250 -/* 06518 80B598C8 AE3803C4 */ sw $t8, 0x03C4($s1) ## 000003C4 -/* 0651C 80B598CC 10000003 */ beq $zero, $zero, .L80B598DC -/* 06520 80B598D0 A6390034 */ sh $t9, 0x0034($s1) ## 00000034 -.L80B598D4: -/* 06524 80B598D4 0C00B55C */ jal Actor_Kill - -/* 06528 80B598D8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80B598DC: -/* 0652C 80B598DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 06530 80B598E0 0C2D65A6 */ jal func_80B59698 -/* 06534 80B598E4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 06538 80B598E8 10400040 */ beq $v0, $zero, .L80B599EC -/* 0653C 80B598EC 00000000 */ nop -/* 06540 80B598F0 0C0222A8 */ jal func_80088AA0 -/* 06544 80B598F4 240400B4 */ addiu $a0, $zero, 0x00B4 ## $a0 = 000000B4 -/* 06548 80B598F8 0C2D4D1A */ jal func_80B53468 -/* 0654C 80B598FC 00000000 */ nop -/* 06550 80B59900 240A0140 */ addiu $t2, $zero, 0x0140 ## $t2 = 00000140 -/* 06554 80B59904 3C018016 */ lui $at, %hi(gSaveContext+0x1424) -/* 06558 80B59908 A42AFA84 */ sh $t2, %lo(gSaveContext+0x1424)($at) -/* 0655C 80B5990C 0C021DA0 */ jal Magic_Fill -/* 06560 80B59910 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06564 80B59914 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06568 80B59918 0C00B2D0 */ jal Flags_GetSwitch - -/* 0656C 80B5991C 24050020 */ addiu $a1, $zero, 0x0020 ## $a1 = 00000020 -/* 06570 80B59920 10400014 */ beq $v0, $zero, .L80B59974 -/* 06574 80B59924 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06578 80B59928 0C00B2ED */ jal Flags_UnsetSwitch - -/* 0657C 80B5992C 24050020 */ addiu $a1, $zero, 0x0020 ## $a1 = 00000020 -/* 06580 80B59930 3C0180B6 */ lui $at, %hi(D_80B5AB9C) ## $at = 80B60000 -/* 06584 80B59934 C424AB9C */ lwc1 $f4, %lo(D_80B5AB9C)($at) -/* 06588 80B59938 3C01C22C */ lui $at, 0xC22C ## $at = C22C0000 -/* 0658C 80B5993C 44813000 */ mtc1 $at, $f6 ## $f6 = -43.00 -/* 06590 80B59940 240B2000 */ addiu $t3, $zero, 0x2000 ## $t3 = 00002000 -/* 06594 80B59944 240C2000 */ addiu $t4, $zero, 0x2000 ## $t4 = 00002000 -/* 06598 80B59948 AFAC0024 */ sw $t4, 0x0024($sp) -/* 0659C 80B5994C AFAB001C */ sw $t3, 0x001C($sp) -/* 065A0 80B59950 26041C24 */ addiu $a0, $s0, 0x1C24 ## $a0 = 00001C24 -/* 065A4 80B59954 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 065A8 80B59958 24060177 */ addiu $a2, $zero, 0x0177 ## $a2 = 00000177 -/* 065AC 80B5995C 3C07C310 */ lui $a3, 0xC310 ## $a3 = C3100000 -/* 065B0 80B59960 AFA00018 */ sw $zero, 0x0018($sp) -/* 065B4 80B59964 AFA00020 */ sw $zero, 0x0020($sp) -/* 065B8 80B59968 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 065BC 80B5996C 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 065C0 80B59970 E7A60014 */ swc1 $f6, 0x0014($sp) -.L80B59974: -/* 065C4 80B59974 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 065C8 80B59978 0C00B2ED */ jal Flags_UnsetSwitch - -/* 065CC 80B5997C 24050021 */ addiu $a1, $zero, 0x0021 ## $a1 = 00000021 -/* 065D0 80B59980 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 065D4 80B59984 0C00B2ED */ jal Flags_UnsetSwitch - -/* 065D8 80B59988 24050022 */ addiu $a1, $zero, 0x0022 ## $a1 = 00000022 -/* 065DC 80B5998C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 065E0 80B59990 0C00B2ED */ jal Flags_UnsetSwitch - -/* 065E4 80B59994 24050023 */ addiu $a1, $zero, 0x0023 ## $a1 = 00000023 -/* 065E8 80B59998 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 065EC 80B5999C 0C00B2ED */ jal Flags_UnsetSwitch - -/* 065F0 80B599A0 24050024 */ addiu $a1, $zero, 0x0024 ## $a1 = 00000024 -/* 065F4 80B599A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 065F8 80B599A8 0C00B2ED */ jal Flags_UnsetSwitch - -/* 065FC 80B599AC 24050025 */ addiu $a1, $zero, 0x0025 ## $a1 = 00000025 -/* 06600 80B599B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06604 80B599B4 0C00B2ED */ jal Flags_UnsetSwitch - -/* 06608 80B599B8 24050026 */ addiu $a1, $zero, 0x0026 ## $a1 = 00000026 -/* 0660C 80B599BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06610 80B599C0 0C00B2ED */ jal Flags_UnsetSwitch - -/* 06614 80B599C4 24050027 */ addiu $a1, $zero, 0x0027 ## $a1 = 00000027 -/* 06618 80B599C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0661C 80B599CC 0C00B2ED */ jal Flags_UnsetSwitch - -/* 06620 80B599D0 24050028 */ addiu $a1, $zero, 0x0028 ## $a1 = 00000028 -/* 06624 80B599D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06628 80B599D8 0C00B2ED */ jal Flags_UnsetSwitch - -/* 0662C 80B599DC 24050029 */ addiu $a1, $zero, 0x0029 ## $a1 = 00000029 -/* 06630 80B599E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06634 80B599E4 0C00B2ED */ jal Flags_UnsetSwitch - -/* 06638 80B599E8 2405002A */ addiu $a1, $zero, 0x002A ## $a1 = 0000002A -.L80B599EC: -/* 0663C 80B599EC 0C2D536D */ jal func_80B54DB4 -/* 06640 80B599F0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 06644 80B599F4 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 -/* 06648 80B599F8 1441001C */ bne $v0, $at, .L80B59A6C -/* 0664C 80B599FC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 06650 80B59A00 0C2D53A9 */ jal func_80B54EA4 -/* 06654 80B59A04 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 06658 80B59A08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0665C 80B59A0C 0C00B2D0 */ jal Flags_GetSwitch - -/* 06660 80B59A10 24050037 */ addiu $a1, $zero, 0x0037 ## $a1 = 00000037 -/* 06664 80B59A14 0002202B */ sltu $a0, $zero, $v0 -/* 06668 80B59A18 10800010 */ beq $a0, $zero, .L80B59A5C -/* 0666C 80B59A1C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 06670 80B59A20 860200A4 */ lh $v0, 0x00A4($s0) ## 000000A4 -/* 06674 80B59A24 3844004F */ xori $a0, $v0, 0x004F ## $a0 = 0000004F -/* 06678 80B59A28 2C840001 */ sltiu $a0, $a0, 0x0001 -/* 0667C 80B59A2C 1480000B */ bne $a0, $zero, .L80B59A5C -/* 06680 80B59A30 00000000 */ nop -/* 06684 80B59A34 3844001A */ xori $a0, $v0, 0x001A ## $a0 = 0000001A -/* 06688 80B59A38 2C840001 */ sltiu $a0, $a0, 0x0001 -/* 0668C 80B59A3C 14800007 */ bne $a0, $zero, .L80B59A5C -/* 06690 80B59A40 00000000 */ nop -/* 06694 80B59A44 3844000E */ xori $a0, $v0, 0x000E ## $a0 = 0000000E -/* 06698 80B59A48 2C840001 */ sltiu $a0, $a0, 0x0001 -/* 0669C 80B59A4C 14800003 */ bne $a0, $zero, .L80B59A5C -/* 066A0 80B59A50 00000000 */ nop -/* 066A4 80B59A54 3844000F */ xori $a0, $v0, 0x000F ## $a0 = 0000000F -/* 066A8 80B59A58 2C840001 */ sltiu $a0, $a0, 0x0001 -.L80B59A5C: -/* 066AC 80B59A5C 50800004 */ beql $a0, $zero, .L80B59A70 -/* 066B0 80B59A60 8FBF0034 */ lw $ra, 0x0034($sp) -/* 066B4 80B59A64 0C2D4D85 */ jal func_80B53614 -/* 066B8 80B59A68 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80B59A6C: -/* 066BC 80B59A6C 8FBF0034 */ lw $ra, 0x0034($sp) -.L80B59A70: -/* 066C0 80B59A70 8FB0002C */ lw $s0, 0x002C($sp) -/* 066C4 80B59A74 8FB10030 */ lw $s1, 0x0030($sp) -/* 066C8 80B59A78 03E00008 */ jr $ra -/* 066CC 80B59A7C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59A80.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59A80.s deleted file mode 100644 index 6d071e3d13..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59A80.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B59A80 -/* 066D0 80B59A80 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 066D4 80B59A84 AFBF001C */ sw $ra, 0x001C($sp) -/* 066D8 80B59A88 0C2D65DA */ jal func_80B59768 -/* 066DC 80B59A8C 00000000 */ nop -/* 066E0 80B59A90 1040000B */ beq $v0, $zero, .L80B59AC0 -/* 066E4 80B59A94 3C078013 */ lui $a3, %hi(D_801333E0) -/* 066E8 80B59A98 3C0E8013 */ lui $t6, %hi(D_801333E8) -/* 066EC 80B59A9C 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 066F0 80B59AA0 25CE33E8 */ addiu $t6, %lo(D_801333E8) -/* 066F4 80B59AA4 3C058013 */ lui $a1, %hi(D_801333D4) -/* 066F8 80B59AA8 24A533D4 */ addiu $a1, %lo(D_801333D4) -/* 066FC 80B59AAC AFAE0014 */ sw $t6, 0x0014($sp) -/* 06700 80B59AB0 AFA70010 */ sw $a3, 0x0010($sp) -/* 06704 80B59AB4 24045806 */ addiu $a0, $zero, 0x5806 ## $a0 = 00005806 -/* 06708 80B59AB8 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 0670C 80B59ABC 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -.L80B59AC0: -/* 06710 80B59AC0 8FBF001C */ lw $ra, 0x001C($sp) -/* 06714 80B59AC4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 06718 80B59AC8 03E00008 */ jr $ra -/* 0671C 80B59ACC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59AD0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59AD0.s deleted file mode 100644 index 44b9b8071a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59AD0.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80B59AD0 -/* 06720 80B59AD0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 06724 80B59AD4 AFB00014 */ sw $s0, 0x0014($sp) -/* 06728 80B59AD8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0672C 80B59ADC AFB10018 */ sw $s1, 0x0018($sp) -/* 06730 80B59AE0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 06734 80B59AE4 AFBF001C */ sw $ra, 0x001C($sp) -/* 06738 80B59AE8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0673C 80B59AEC 0C00B2DD */ jal Flags_SetSwitch - -/* 06740 80B59AF0 24050036 */ addiu $a1, $zero, 0x0036 ## $a1 = 00000036 -/* 06744 80B59AF4 0C0222A8 */ jal func_80088AA0 -/* 06748 80B59AF8 240400B4 */ addiu $a0, $zero, 0x00B4 ## $a0 = 000000B4 -/* 0674C 80B59AFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06750 80B59B00 0C2D53A9 */ jal func_80B54EA4 -/* 06754 80B59B04 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 06758 80B59B08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0675C 80B59B0C 0C2D4D85 */ jal func_80B53614 -/* 06760 80B59B10 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 06764 80B59B14 3C028016 */ lui $v0, %hi(gSaveContext) -/* 06768 80B59B18 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 0676C 80B59B1C 944E0EEC */ lhu $t6, 0x0EEC($v0) ## 8015F54C -/* 06770 80B59B20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06774 80B59B24 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 06778 80B59B28 31CFFF7F */ andi $t7, $t6, 0xFF7F ## $t7 = 00000000 -/* 0677C 80B59B2C 0C2D5BC4 */ jal func_80B56F10 -/* 06780 80B59B30 A44F0EEC */ sh $t7, 0x0EEC($v0) ## 8015F54C -/* 06784 80B59B34 24180140 */ addiu $t8, $zero, 0x0140 ## $t8 = 00000140 -/* 06788 80B59B38 3C018016 */ lui $at, %hi(gSaveContext+0x1424) -/* 0678C 80B59B3C A438FA84 */ sh $t8, %lo(gSaveContext+0x1424)($at) -/* 06790 80B59B40 0C021DA0 */ jal Magic_Fill -/* 06794 80B59B44 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 06798 80B59B48 2419001B */ addiu $t9, $zero, 0x001B ## $t9 = 0000001B -/* 0679C 80B59B4C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 067A0 80B59B50 AE19024C */ sw $t9, 0x024C($s0) ## 0000024C -/* 067A4 80B59B54 AE080250 */ sw $t0, 0x0250($s0) ## 00000250 -/* 067A8 80B59B58 8FBF001C */ lw $ra, 0x001C($sp) -/* 067AC 80B59B5C 8FB10018 */ lw $s1, 0x0018($sp) -/* 067B0 80B59B60 8FB00014 */ lw $s0, 0x0014($sp) -/* 067B4 80B59B64 03E00008 */ jr $ra -/* 067B8 80B59B68 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59B6C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59B6C.s deleted file mode 100644 index f3de015b3d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59B6C.s +++ /dev/null @@ -1,168 +0,0 @@ -.rdata -glabel D_80B5A8CC - .asciz "\x1b[31m En_Oa3 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.text -glabel func_80B59B6C -/* 067BC 80B59B6C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 067C0 80B59B70 AFBF0024 */ sw $ra, 0x0024($sp) -/* 067C4 80B59B74 AFB00014 */ sw $s0, 0x0014($sp) -/* 067C8 80B59B78 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 067CC 80B59B7C AFB30020 */ sw $s3, 0x0020($sp) -/* 067D0 80B59B80 AFB2001C */ sw $s2, 0x001C($sp) -/* 067D4 80B59B84 AFB10018 */ sw $s1, 0x0018($sp) -/* 067D8 80B59B88 0C2D5375 */ jal func_80B54DD4 -/* 067DC 80B59B8C AFA50034 */ sw $a1, 0x0034($sp) -/* 067E0 80B59B90 3C030601 */ lui $v1, 0x0601 ## $v1 = 06010000 -/* 067E4 80B59B94 246391D8 */ addiu $v1, $v1, 0x91D8 ## $v1 = 060091D8 -/* 067E8 80B59B98 00037100 */ sll $t6, $v1, 4 -/* 067EC 80B59B9C 3C118016 */ lui $s1, %hi(gSegments) -/* 067F0 80B59BA0 000E7F02 */ srl $t7, $t6, 28 -/* 067F4 80B59BA4 26316FA8 */ addiu $s1, %lo(gSegments) -/* 067F8 80B59BA8 000FC080 */ sll $t8, $t7, 2 -/* 067FC 80B59BAC 0238C821 */ addu $t9, $s1, $t8 -/* 06800 80B59BB0 8F280000 */ lw $t0, 0x0000($t9) ## 00000000 -/* 06804 80B59BB4 3C1200FF */ lui $s2, 0x00FF ## $s2 = 00FF0000 -/* 06808 80B59BB8 3652FFFF */ ori $s2, $s2, 0xFFFF ## $s2 = 00FFFFFF -/* 0680C 80B59BBC 00724824 */ and $t1, $v1, $s2 -/* 06810 80B59BC0 3C138000 */ lui $s3, 0x8000 ## $s3 = 80000000 -/* 06814 80B59BC4 01095021 */ addu $t2, $t0, $t1 -/* 06818 80B59BC8 AFA2002C */ sw $v0, 0x002C($sp) -/* 0681C 80B59BCC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 06820 80B59BD0 01532021 */ addu $a0, $t2, $s3 -/* 06824 80B59BD4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 06828 80B59BD8 3C030601 */ lui $v1, 0x0601 ## $v1 = 06010000 -/* 0682C 80B59BDC 2463A598 */ addiu $v1, $v1, 0xA598 ## $v1 = 0600A598 -/* 06830 80B59BE0 468021A0 */ cvt.s.w $f6, $f4 -/* 06834 80B59BE4 00035900 */ sll $t3, $v1, 4 -/* 06838 80B59BE8 000B6702 */ srl $t4, $t3, 28 -/* 0683C 80B59BEC 000C6880 */ sll $t5, $t4, 2 -/* 06840 80B59BF0 022D7021 */ addu $t6, $s1, $t5 -/* 06844 80B59BF4 0072C024 */ and $t8, $v1, $s2 -/* 06848 80B59BF8 E60603DC */ swc1 $f6, 0x03DC($s0) ## 000003DC -/* 0684C 80B59BFC 8DCF0000 */ lw $t7, 0x0000($t6) ## 00000000 -/* 06850 80B59C00 01F8C821 */ addu $t9, $t7, $t8 -/* 06854 80B59C04 0C028800 */ jal SkelAnime_GetFrameCount - -/* 06858 80B59C08 03332021 */ addu $a0, $t9, $s3 -/* 0685C 80B59C0C 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 06860 80B59C10 3C030601 */ lui $v1, 0x0601 ## $v1 = 06010000 -/* 06864 80B59C14 2463A334 */ addiu $v1, $v1, 0xA334 ## $v1 = 0600A334 -/* 06868 80B59C18 468042A0 */ cvt.s.w $f10, $f8 -/* 0686C 80B59C1C 00034100 */ sll $t0, $v1, 4 -/* 06870 80B59C20 00084F02 */ srl $t1, $t0, 28 -/* 06874 80B59C24 00095080 */ sll $t2, $t1, 2 -/* 06878 80B59C28 022A5821 */ addu $t3, $s1, $t2 -/* 0687C 80B59C2C 00726824 */ and $t5, $v1, $s2 -/* 06880 80B59C30 E60A03E0 */ swc1 $f10, 0x03E0($s0) ## 000003E0 -/* 06884 80B59C34 8D6C0000 */ lw $t4, 0x0000($t3) ## 00000000 -/* 06888 80B59C38 018D7021 */ addu $t6, $t4, $t5 -/* 0688C 80B59C3C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 06890 80B59C40 01D32021 */ addu $a0, $t6, $s3 -/* 06894 80B59C44 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 06898 80B59C48 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 -/* 0689C 80B59C4C 24631110 */ addiu $v1, $v1, 0x1110 ## $v1 = 06001110 -/* 068A0 80B59C50 468084A0 */ cvt.s.w $f18, $f16 -/* 068A4 80B59C54 00037900 */ sll $t7, $v1, 4 -/* 068A8 80B59C58 000FC702 */ srl $t8, $t7, 28 -/* 068AC 80B59C5C 0018C880 */ sll $t9, $t8, 2 -/* 068B0 80B59C60 02394021 */ addu $t0, $s1, $t9 -/* 068B4 80B59C64 00725024 */ and $t2, $v1, $s2 -/* 068B8 80B59C68 E61203E4 */ swc1 $f18, 0x03E4($s0) ## 000003E4 -/* 068BC 80B59C6C 8D090000 */ lw $t1, 0x0000($t0) ## 00000000 -/* 068C0 80B59C70 012A5821 */ addu $t3, $t1, $t2 -/* 068C4 80B59C74 0C028800 */ jal SkelAnime_GetFrameCount - -/* 068C8 80B59C78 01732021 */ addu $a0, $t3, $s3 -/* 068CC 80B59C7C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 068D0 80B59C80 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 -/* 068D4 80B59C84 24632348 */ addiu $v1, $v1, 0x2348 ## $v1 = 06002348 -/* 068D8 80B59C88 468021A0 */ cvt.s.w $f6, $f4 -/* 068DC 80B59C8C 00036100 */ sll $t4, $v1, 4 -/* 068E0 80B59C90 000C6F02 */ srl $t5, $t4, 28 -/* 068E4 80B59C94 000D7080 */ sll $t6, $t5, 2 -/* 068E8 80B59C98 022E7821 */ addu $t7, $s1, $t6 -/* 068EC 80B59C9C 0072C824 */ and $t9, $v1, $s2 -/* 068F0 80B59CA0 E60603F4 */ swc1 $f6, 0x03F4($s0) ## 000003F4 -/* 068F4 80B59CA4 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 -/* 068F8 80B59CA8 03194021 */ addu $t0, $t8, $t9 -/* 068FC 80B59CAC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 06900 80B59CB0 01132021 */ addu $a0, $t0, $s3 -/* 06904 80B59CB4 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 06908 80B59CB8 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 -/* 0690C 80B59CBC 24632E54 */ addiu $v1, $v1, 0x2E54 ## $v1 = 06002E54 -/* 06910 80B59CC0 468042A0 */ cvt.s.w $f10, $f8 -/* 06914 80B59CC4 00034900 */ sll $t1, $v1, 4 -/* 06918 80B59CC8 00095702 */ srl $t2, $t1, 28 -/* 0691C 80B59CCC 000A5880 */ sll $t3, $t2, 2 -/* 06920 80B59CD0 022B6021 */ addu $t4, $s1, $t3 -/* 06924 80B59CD4 00727024 */ and $t6, $v1, $s2 -/* 06928 80B59CD8 E60A03EC */ swc1 $f10, 0x03EC($s0) ## 000003EC -/* 0692C 80B59CDC 8D8D0000 */ lw $t5, 0x0000($t4) ## 00000000 -/* 06930 80B59CE0 01AE7821 */ addu $t7, $t5, $t6 -/* 06934 80B59CE4 0C028800 */ jal SkelAnime_GetFrameCount - -/* 06938 80B59CE8 01F32021 */ addu $a0, $t7, $s3 -/* 0693C 80B59CEC 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 06940 80B59CF0 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 -/* 06944 80B59CF4 24631D8C */ addiu $v1, $v1, 0x1D8C ## $v1 = 06001D8C -/* 06948 80B59CF8 468084A0 */ cvt.s.w $f18, $f16 -/* 0694C 80B59CFC 0003C100 */ sll $t8, $v1, 4 -/* 06950 80B59D00 0018CF02 */ srl $t9, $t8, 28 -/* 06954 80B59D04 00194080 */ sll $t0, $t9, 2 -/* 06958 80B59D08 02284821 */ addu $t1, $s1, $t0 -/* 0695C 80B59D0C 00725824 */ and $t3, $v1, $s2 -/* 06960 80B59D10 E61203F0 */ swc1 $f18, 0x03F0($s0) ## 000003F0 -/* 06964 80B59D14 8D2A0000 */ lw $t2, 0x0000($t1) ## 00000000 -/* 06968 80B59D18 014B6021 */ addu $t4, $t2, $t3 -/* 0696C 80B59D1C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 06970 80B59D20 01932021 */ addu $a0, $t4, $s3 -/* 06974 80B59D24 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 06978 80B59D28 8FA3002C */ lw $v1, 0x002C($sp) -/* 0697C 80B59D2C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 06980 80B59D30 468021A0 */ cvt.s.w $f6, $f4 -/* 06984 80B59D34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06988 80B59D38 10600008 */ beq $v1, $zero, .L80B59D5C -/* 0698C 80B59D3C E60603E8 */ swc1 $f6, 0x03E8($s0) ## 000003E8 -/* 06990 80B59D40 1061000A */ beq $v1, $at, .L80B59D6C -/* 06994 80B59D44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06998 80B59D48 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0699C 80B59D4C 1061000B */ beq $v1, $at, .L80B59D7C -/* 069A0 80B59D50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 069A4 80B59D54 1000000D */ beq $zero, $zero, .L80B59D8C -/* 069A8 80B59D58 3C0480B6 */ lui $a0, %hi(D_80B5A8CC) ## $a0 = 80B60000 -.L80B59D5C: -/* 069AC 80B59D5C 0C2D53ED */ jal func_80B54FB4 -/* 069B0 80B59D60 8FA50034 */ lw $a1, 0x0034($sp) -/* 069B4 80B59D64 1000000E */ beq $zero, $zero, .L80B59DA0 -/* 069B8 80B59D68 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B59D6C: -/* 069BC 80B59D6C 0C2D55E0 */ jal func_80B55780 -/* 069C0 80B59D70 8FA50034 */ lw $a1, 0x0034($sp) -/* 069C4 80B59D74 1000000A */ beq $zero, $zero, .L80B59DA0 -/* 069C8 80B59D78 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B59D7C: -/* 069CC 80B59D7C 0C2D660A */ jal func_80B59828 -/* 069D0 80B59D80 8FA50034 */ lw $a1, 0x0034($sp) -/* 069D4 80B59D84 10000006 */ beq $zero, $zero, .L80B59DA0 -/* 069D8 80B59D88 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B59D8C: -/* 069DC 80B59D8C 0C00084C */ jal osSyncPrintf - -/* 069E0 80B59D90 2484A8CC */ addiu $a0, $a0, %lo(D_80B5A8CC) ## $a0 = FFFFA8CC -/* 069E4 80B59D94 0C00B55C */ jal Actor_Kill - -/* 069E8 80B59D98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 069EC 80B59D9C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B59DA0: -/* 069F0 80B59DA0 8FB00014 */ lw $s0, 0x0014($sp) -/* 069F4 80B59DA4 8FB10018 */ lw $s1, 0x0018($sp) -/* 069F8 80B59DA8 8FB2001C */ lw $s2, 0x001C($sp) -/* 069FC 80B59DAC 8FB30020 */ lw $s3, 0x0020($sp) -/* 06A00 80B59DB0 03E00008 */ jr $ra -/* 06A04 80B59DB4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59DB8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59DB8.s deleted file mode 100644 index be5d3f1c93..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59DB8.s +++ /dev/null @@ -1,47 +0,0 @@ -.rdata -glabel D_80B5A910 - .asciz "\x1b[31mEn_Zl3_main_bankアニメーションのバンクを読めない!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.text -glabel func_80B59DB8 -/* 06A08 80B59DB8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 06A0C 80B59DBC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 06A10 80B59DC0 AFA40030 */ sw $a0, 0x0030($sp) -/* 06A14 80B59DC4 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 06A18 80B59DC8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 06A1C 80B59DCC AFA50034 */ sw $a1, 0x0034($sp) -/* 06A20 80B59DD0 00A12021 */ addu $a0, $a1, $at -/* 06A24 80B59DD4 AFA4001C */ sw $a0, 0x001C($sp) -/* 06A28 80B59DD8 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 06A2C 80B59DDC 2405014F */ addiu $a1, $zero, 0x014F ## $a1 = 0000014F -/* 06A30 80B59DE0 8FA4001C */ lw $a0, 0x001C($sp) -/* 06A34 80B59DE4 04410006 */ bgez $v0, .L80B59E00 -/* 06A38 80B59DE8 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 06A3C 80B59DEC 3C0480B6 */ lui $a0, %hi(D_80B5A910) ## $a0 = 80B60000 -/* 06A40 80B59DF0 0C00084C */ jal osSyncPrintf - -/* 06A44 80B59DF4 2484A910 */ addiu $a0, $a0, %lo(D_80B5A910) ## $a0 = 80B5A910 -/* 06A48 80B59DF8 1000000E */ beq $zero, $zero, .L80B59E34 -/* 06A4C 80B59DFC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B59E00: -/* 06A50 80B59E00 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 06A54 80B59E04 0C026062 */ jal Object_IsLoaded - -/* 06A58 80B59E08 AFA60024 */ sw $a2, 0x0024($sp) -/* 06A5C 80B59E0C 10400008 */ beq $v0, $zero, .L80B59E30 -/* 06A60 80B59E10 8FA60024 */ lw $a2, 0x0024($sp) -/* 06A64 80B59E14 8FA40030 */ lw $a0, 0x0030($sp) -/* 06A68 80B59E18 AC860318 */ sw $a2, 0x0318($a0) ## 00000318 -/* 06A6C 80B59E1C 0C2D5378 */ jal func_80B54DE0 -/* 06A70 80B59E20 8FA50034 */ lw $a1, 0x0034($sp) -/* 06A74 80B59E24 8FA40030 */ lw $a0, 0x0030($sp) -/* 06A78 80B59E28 0C2D66DB */ jal func_80B59B6C -/* 06A7C 80B59E2C 8FA50034 */ lw $a1, 0x0034($sp) -.L80B59E30: -/* 06A80 80B59E30 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B59E34: -/* 06A84 80B59E34 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 06A88 80B59E38 03E00008 */ jr $ra -/* 06A8C 80B59E3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59F74.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59F74.s deleted file mode 100644 index e8fd43c34e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59F74.s +++ /dev/null @@ -1,40 +0,0 @@ -.rdata -glabel D_80B5AA0C - .asciz "\x1b[31m描画前処理モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.text -glabel func_80B59F74 -/* 06BC4 80B59F74 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 06BC8 80B59F78 8FAE003C */ lw $t6, 0x003C($sp) -/* 06BCC 80B59F7C AFBF0024 */ sw $ra, 0x0024($sp) -/* 06BD0 80B59F80 8DC20308 */ lw $v0, 0x0308($t6) ## 00000308 -/* 06BD4 80B59F84 04400009 */ bltz $v0, .L80B59FAC -/* 06BD8 80B59F88 28410002 */ slti $at, $v0, 0x0002 -/* 06BDC 80B59F8C 10200007 */ beq $at, $zero, .L80B59FAC -/* 06BE0 80B59F90 00027880 */ sll $t7, $v0, 2 -/* 06BE4 80B59F94 3C0380B6 */ lui $v1, %hi(D_80B5A560) ## $v1 = 80B60000 -/* 06BE8 80B59F98 006F1821 */ addu $v1, $v1, $t7 -/* 06BEC 80B59F9C 8C63A560 */ lw $v1, %lo(D_80B5A560)($v1) -/* 06BF0 80B59FA0 8FB80038 */ lw $t8, 0x0038($sp) -/* 06BF4 80B59FA4 54600007 */ bnel $v1, $zero, .L80B59FC4 -/* 06BF8 80B59FA8 8FB9003C */ lw $t9, 0x003C($sp) -.L80B59FAC: -/* 06BFC 80B59FAC 3C0480B6 */ lui $a0, %hi(D_80B5AA0C) ## $a0 = 80B60000 -/* 06C00 80B59FB0 0C00084C */ jal osSyncPrintf - -/* 06C04 80B59FB4 2484AA0C */ addiu $a0, $a0, %lo(D_80B5AA0C) ## $a0 = 80B5AA0C -/* 06C08 80B59FB8 10000007 */ beq $zero, $zero, .L80B59FD8 -/* 06C0C 80B59FBC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 06C10 80B59FC0 8FB9003C */ lw $t9, 0x003C($sp) -.L80B59FC4: -/* 06C14 80B59FC4 8FA80040 */ lw $t0, 0x0040($sp) -/* 06C18 80B59FC8 AFB80010 */ sw $t8, 0x0010($sp) -/* 06C1C 80B59FCC AFB90014 */ sw $t9, 0x0014($sp) -/* 06C20 80B59FD0 0060F809 */ jalr $ra, $v1 -/* 06C24 80B59FD4 AFA80018 */ sw $t0, 0x0018($sp) -.L80B59FD8: -/* 06C28 80B59FD8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 06C2C 80B59FDC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 06C30 80B59FE0 03E00008 */ jr $ra -/* 06C34 80B59FE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FE8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FE8.s deleted file mode 100644 index fdaf7eab77..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FE8.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80B59FE8 -/* 06C38 80B59FE8 AFA40000 */ sw $a0, 0x0000($sp) -/* 06C3C 80B59FEC 03E00008 */ jr $ra -/* 06C40 80B59FF0 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FF4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FF4.s deleted file mode 100644 index 60e1a34411..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FF4.s +++ /dev/null @@ -1,130 +0,0 @@ -.rdata -glabel D_80B5AA4C - .asciz "../z_en_zl3.c" - .balign 4 - -glabel D_80B5AA5C - .asciz "../z_en_zl3.c" - .balign 4 - -.text -glabel func_80B59FF4 -/* 06C44 80B59FF4 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 06C48 80B59FF8 AFBF002C */ sw $ra, 0x002C($sp) -/* 06C4C 80B59FFC AFB00028 */ sw $s0, 0x0028($sp) -/* 06C50 80B5A000 AFA40088 */ sw $a0, 0x0088($sp) -/* 06C54 80B5A004 AFA5008C */ sw $a1, 0x008C($sp) -/* 06C58 80B5A008 84820244 */ lh $v0, 0x0244($a0) ## 00000244 -/* 06C5C 80B5A00C 3C1880B6 */ lui $t8, %hi(D_80B5A43C) ## $t8 = 80B60000 -/* 06C60 80B5A010 3C0A80B6 */ lui $t2, %hi(D_80B5A45C) ## $t2 = 80B60000 -/* 06C64 80B5A014 00027880 */ sll $t7, $v0, 2 -/* 06C68 80B5A018 030FC021 */ addu $t8, $t8, $t7 -/* 06C6C 80B5A01C 8F18A43C */ lw $t8, %lo(D_80B5A43C)($t8) -/* 06C70 80B5A020 3C0680B6 */ lui $a2, %hi(D_80B5AA4C) ## $a2 = 80B60000 -/* 06C74 80B5A024 24C6AA4C */ addiu $a2, $a2, %lo(D_80B5AA4C) ## $a2 = 80B5AA4C -/* 06C78 80B5A028 AFB80078 */ sw $t8, 0x0078($sp) -/* 06C7C 80B5A02C 84830248 */ lh $v1, 0x0248($a0) ## 00000248 -/* 06C80 80B5A030 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC -/* 06C84 80B5A034 24070875 */ addiu $a3, $zero, 0x0875 ## $a3 = 00000875 -/* 06C88 80B5A038 0003C880 */ sll $t9, $v1, 2 -/* 06C8C 80B5A03C 01595021 */ addu $t2, $t2, $t9 -/* 06C90 80B5A040 8D4AA45C */ lw $t2, %lo(D_80B5A45C)($t2) -/* 06C94 80B5A044 AFAA006C */ sw $t2, 0x006C($sp) -/* 06C98 80B5A048 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 06C9C 80B5A04C 0C031AB1 */ jal Graph_OpenDisps -/* 06CA0 80B5A050 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 06CA4 80B5A054 8FAC008C */ lw $t4, 0x008C($sp) -/* 06CA8 80B5A058 0C024F46 */ jal func_80093D18 -/* 06CAC 80B5A05C 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 06CB0 80B5A060 8FA90078 */ lw $t1, 0x0078($sp) -/* 06CB4 80B5A064 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 06CB8 80B5A068 3C078016 */ lui $a3, %hi(gSegments) -/* 06CBC 80B5A06C 0009C100 */ sll $t8, $t1, 4 -/* 06CC0 80B5A070 00187702 */ srl $t6, $t8, 28 -/* 06CC4 80B5A074 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 06CC8 80B5A078 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 06CCC 80B5A07C AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 06CD0 80B5A080 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 06CD4 80B5A084 000EC880 */ sll $t9, $t6, 2 -/* 06CD8 80B5A088 24E76FA8 */ addiu $a3, %lo(gSegments) -/* 06CDC 80B5A08C 00F92021 */ addu $a0, $a3, $t9 -/* 06CE0 80B5A090 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 06CE4 80B5A094 8C8A0000 */ lw $t2, 0x0000($a0) ## 00000000 -/* 06CE8 80B5A098 3C0800FF */ lui $t0, 0x00FF ## $t0 = 00FF0000 -/* 06CEC 80B5A09C 3508FFFF */ ori $t0, $t0, 0xFFFF ## $t0 = 00FFFFFF -/* 06CF0 80B5A0A0 01282824 */ and $a1, $t1, $t0 -/* 06CF4 80B5A0A4 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 06CF8 80B5A0A8 01455821 */ addu $t3, $t2, $a1 -/* 06CFC 80B5A0AC 01666021 */ addu $t4, $t3, $a2 -/* 06D00 80B5A0B0 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 06D04 80B5A0B4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 06D08 80B5A0B8 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 06D0C 80B5A0BC 35EF0024 */ ori $t7, $t7, 0x0024 ## $t7 = DB060024 -/* 06D10 80B5A0C0 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 06D14 80B5A0C4 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 06D18 80B5A0C8 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 06D1C 80B5A0CC 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 -/* 06D20 80B5A0D0 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 06D24 80B5A0D4 356B0028 */ ori $t3, $t3, 0x0028 ## $t3 = DB060028 -/* 06D28 80B5A0D8 03057021 */ addu $t6, $t8, $a1 -/* 06D2C 80B5A0DC 01C6C821 */ addu $t9, $t6, $a2 -/* 06D30 80B5A0E0 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 06D34 80B5A0E4 8FA4006C */ lw $a0, 0x006C($sp) -/* 06D38 80B5A0E8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 06D3C 80B5A0EC 00046100 */ sll $t4, $a0, 4 -/* 06D40 80B5A0F0 000C6F02 */ srl $t5, $t4, 28 -/* 06D44 80B5A0F4 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 06D48 80B5A0F8 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 06D4C 80B5A0FC 000D7880 */ sll $t7, $t5, 2 -/* 06D50 80B5A100 00EFC021 */ addu $t8, $a3, $t7 -/* 06D54 80B5A104 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 06D58 80B5A108 8F0E0000 */ lw $t6, 0x0000($t8) ## 00000000 -/* 06D5C 80B5A10C 0088C824 */ and $t9, $a0, $t0 -/* 06D60 80B5A110 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 06D64 80B5A114 01D95021 */ addu $t2, $t6, $t9 -/* 06D68 80B5A118 01465821 */ addu $t3, $t2, $a2 -/* 06D6C 80B5A11C AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 06D70 80B5A120 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 06D74 80B5A124 3C0DFB00 */ lui $t5, 0xFB00 ## $t5 = FB000000 -/* 06D78 80B5A128 3C198011 */ lui $t9, %hi(D_80116280+0x10) -/* 06D7C 80B5A12C 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 06D80 80B5A130 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 06D84 80B5A134 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 06D88 80B5A138 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 06D8C 80B5A13C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 06D90 80B5A140 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 06D94 80B5A144 35CE002C */ ori $t6, $t6, 0x002C ## $t6 = DB06002C -/* 06D98 80B5A148 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 06D9C 80B5A14C AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 06DA0 80B5A150 27396290 */ addiu $t9, %lo(D_80116280+0x10) -/* 06DA4 80B5A154 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 06DA8 80B5A158 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 06DAC 80B5A15C 8FA30088 */ lw $v1, 0x0088($sp) -/* 06DB0 80B5A160 3C0B80B5 */ lui $t3, %hi(func_80B54CE8) ## $t3 = 80B50000 -/* 06DB4 80B5A164 3C0A80B6 */ lui $t2, %hi(func_80B59F74) ## $t2 = 80B60000 -/* 06DB8 80B5A168 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C -/* 06DBC 80B5A16C 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 06DC0 80B5A170 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 06DC4 80B5A174 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 06DC8 80B5A178 254A9F74 */ addiu $t2, $t2, %lo(func_80B59F74) ## $t2 = 80B59F74 -/* 06DCC 80B5A17C 256B4CE8 */ addiu $t3, $t3, %lo(func_80B54CE8) ## $t3 = 80B54CE8 -/* 06DD0 80B5A180 AFAB0014 */ sw $t3, 0x0014($sp) -/* 06DD4 80B5A184 AFAA0010 */ sw $t2, 0x0010($sp) -/* 06DD8 80B5A188 AFA30018 */ sw $v1, 0x0018($sp) -/* 06DDC 80B5A18C 8E0C02C0 */ lw $t4, 0x02C0($s0) ## 000002C0 -/* 06DE0 80B5A190 8FA4008C */ lw $a0, 0x008C($sp) -/* 06DE4 80B5A194 0C0289CF */ jal SkelAnime_DrawSV2 -/* 06DE8 80B5A198 AFAC001C */ sw $t4, 0x001C($sp) -/* 06DEC 80B5A19C AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 -/* 06DF0 80B5A1A0 8FAD008C */ lw $t5, 0x008C($sp) -/* 06DF4 80B5A1A4 3C0680B6 */ lui $a2, %hi(D_80B5AA5C) ## $a2 = 80B60000 -/* 06DF8 80B5A1A8 24C6AA5C */ addiu $a2, $a2, %lo(D_80B5AA5C) ## $a2 = 80B5AA5C -/* 06DFC 80B5A1AC 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC -/* 06E00 80B5A1B0 2407088E */ addiu $a3, $zero, 0x088E ## $a3 = 0000088E -/* 06E04 80B5A1B4 0C031AD5 */ jal Graph_CloseDisps -/* 06E08 80B5A1B8 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 -/* 06E0C 80B5A1BC 8FBF002C */ lw $ra, 0x002C($sp) -/* 06E10 80B5A1C0 8FB00028 */ lw $s0, 0x0028($sp) -/* 06E14 80B5A1C4 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 06E18 80B5A1C8 03E00008 */ jr $ra -/* 06E1C 80B5A1CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5A1D0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5A1D0.s deleted file mode 100644 index 585907bf2a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5A1D0.s +++ /dev/null @@ -1,129 +0,0 @@ -.rdata -glabel D_80B5AA6C - .asciz "../z_en_zl3.c" - .balign 4 - -glabel D_80B5AA7C - .asciz "../z_en_zl3.c" - .balign 4 - -.text -glabel func_80B5A1D0 -/* 06E20 80B5A1D0 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 06E24 80B5A1D4 AFBF002C */ sw $ra, 0x002C($sp) -/* 06E28 80B5A1D8 AFB10028 */ sw $s1, 0x0028($sp) -/* 06E2C 80B5A1DC AFB00024 */ sw $s0, 0x0024($sp) -/* 06E30 80B5A1E0 AFA5008C */ sw $a1, 0x008C($sp) -/* 06E34 80B5A1E4 84820244 */ lh $v0, 0x0244($a0) ## 00000244 -/* 06E38 80B5A1E8 3C0F80B6 */ lui $t7, %hi(D_80B5A43C) ## $t7 = 80B60000 -/* 06E3C 80B5A1EC 3C1980B6 */ lui $t9, %hi(D_80B5A45C) ## $t9 = 80B60000 -/* 06E40 80B5A1F0 00027080 */ sll $t6, $v0, 2 -/* 06E44 80B5A1F4 01EE7821 */ addu $t7, $t7, $t6 -/* 06E48 80B5A1F8 8DEFA43C */ lw $t7, %lo(D_80B5A43C)($t7) -/* 06E4C 80B5A1FC 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 06E50 80B5A200 3C0680B6 */ lui $a2, %hi(D_80B5AA6C) ## $a2 = 80B60000 -/* 06E54 80B5A204 AFAF0078 */ sw $t7, 0x0078($sp) -/* 06E58 80B5A208 84830248 */ lh $v1, 0x0248($a0) ## 00000248 -/* 06E5C 80B5A20C 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC -/* 06E60 80B5A210 24C6AA6C */ addiu $a2, $a2, %lo(D_80B5AA6C) ## $a2 = 80B5AA6C -/* 06E64 80B5A214 0003C080 */ sll $t8, $v1, 2 -/* 06E68 80B5A218 0338C821 */ addu $t9, $t9, $t8 -/* 06E6C 80B5A21C 8F39A45C */ lw $t9, %lo(D_80B5A45C)($t9) -/* 06E70 80B5A220 2407089D */ addiu $a3, $zero, 0x089D ## $a3 = 0000089D -/* 06E74 80B5A224 AFB9006C */ sw $t9, 0x006C($sp) -/* 06E78 80B5A228 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 06E7C 80B5A22C 0C031AB1 */ jal Graph_OpenDisps -/* 06E80 80B5A230 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 06E84 80B5A234 8FAB008C */ lw $t3, 0x008C($sp) -/* 06E88 80B5A238 0C024F61 */ jal func_80093D84 -/* 06E8C 80B5A23C 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 06E90 80B5A240 8FA90078 */ lw $t1, 0x0078($sp) -/* 06E94 80B5A244 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 06E98 80B5A248 3C078016 */ lui $a3, %hi(gSegments) -/* 06E9C 80B5A24C 00097100 */ sll $t6, $t1, 4 -/* 06EA0 80B5A250 000E7F02 */ srl $t7, $t6, 28 -/* 06EA4 80B5A254 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 06EA8 80B5A258 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 06EAC 80B5A25C AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 06EB0 80B5A260 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 06EB4 80B5A264 000FC080 */ sll $t8, $t7, 2 -/* 06EB8 80B5A268 24E76FA8 */ addiu $a3, %lo(gSegments) -/* 06EBC 80B5A26C 00F82021 */ addu $a0, $a3, $t8 -/* 06EC0 80B5A270 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 06EC4 80B5A274 8C990000 */ lw $t9, 0x0000($a0) ## 00000000 -/* 06EC8 80B5A278 3C0800FF */ lui $t0, 0x00FF ## $t0 = 00FF0000 -/* 06ECC 80B5A27C 3508FFFF */ ori $t0, $t0, 0xFFFF ## $t0 = 00FFFFFF -/* 06ED0 80B5A280 01282824 */ and $a1, $t1, $t0 -/* 06ED4 80B5A284 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 06ED8 80B5A288 03255021 */ addu $t2, $t9, $a1 -/* 06EDC 80B5A28C 01465821 */ addu $t3, $t2, $a2 -/* 06EE0 80B5A290 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 06EE4 80B5A294 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 06EE8 80B5A298 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 06EEC 80B5A29C 35AD0024 */ ori $t5, $t5, 0x0024 ## $t5 = DB060024 -/* 06EF0 80B5A2A0 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 06EF4 80B5A2A4 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 06EF8 80B5A2A8 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 06EFC 80B5A2AC 8C8E0000 */ lw $t6, 0x0000($a0) ## 00000000 -/* 06F00 80B5A2B0 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 06F04 80B5A2B4 354A0028 */ ori $t2, $t2, 0x0028 ## $t2 = DB060028 -/* 06F08 80B5A2B8 01C57821 */ addu $t7, $t6, $a1 -/* 06F0C 80B5A2BC 01E6C021 */ addu $t8, $t7, $a2 -/* 06F10 80B5A2C0 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 06F14 80B5A2C4 8FA4006C */ lw $a0, 0x006C($sp) -/* 06F18 80B5A2C8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 06F1C 80B5A2CC 00045900 */ sll $t3, $a0, 4 -/* 06F20 80B5A2D0 000B6702 */ srl $t4, $t3, 28 -/* 06F24 80B5A2D4 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 06F28 80B5A2D8 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 06F2C 80B5A2DC 000C6880 */ sll $t5, $t4, 2 -/* 06F30 80B5A2E0 00ED7021 */ addu $t6, $a3, $t5 -/* 06F34 80B5A2E4 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 06F38 80B5A2E8 8DCF0000 */ lw $t7, 0x0000($t6) ## 00000000 -/* 06F3C 80B5A2EC 0088C024 */ and $t8, $a0, $t0 -/* 06F40 80B5A2F0 3C0CFB00 */ lui $t4, 0xFB00 ## $t4 = FB000000 -/* 06F44 80B5A2F4 01F8C821 */ addu $t9, $t7, $t8 -/* 06F48 80B5A2F8 03265021 */ addu $t2, $t9, $a2 -/* 06F4C 80B5A2FC AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 06F50 80B5A300 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 06F54 80B5A304 3C198011 */ lui $t9, %hi(D_80116280) -/* 06F58 80B5A308 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 06F5C 80B5A30C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 06F60 80B5A310 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 06F64 80B5A314 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 06F68 80B5A318 8E2D0258 */ lw $t5, 0x0258($s1) ## 00000258 -/* 06F6C 80B5A31C 3718002C */ ori $t8, $t8, 0x002C ## $t8 = DB06002C -/* 06F70 80B5A320 27396280 */ addiu $t9, %lo(D_80116280) -/* 06F74 80B5A324 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000024 -/* 06F78 80B5A328 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 06F7C 80B5A32C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 06F80 80B5A330 3C0A80B6 */ lui $t2, %hi(func_80B59F74) ## $t2 = 80B60000 -/* 06F84 80B5A334 254A9F74 */ addiu $t2, $t2, %lo(func_80B59F74) ## $t2 = 80B59F74 -/* 06F88 80B5A338 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 06F8C 80B5A33C AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 06F90 80B5A340 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 06F94 80B5A344 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 06F98 80B5A348 2622014C */ addiu $v0, $s1, 0x014C ## $v0 = 0000014C -/* 06F9C 80B5A34C 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 06FA0 80B5A350 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 06FA4 80B5A354 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 06FA8 80B5A358 AFB10018 */ sw $s1, 0x0018($sp) -/* 06FAC 80B5A35C AFA00014 */ sw $zero, 0x0014($sp) -/* 06FB0 80B5A360 AFAA0010 */ sw $t2, 0x0010($sp) -/* 06FB4 80B5A364 8E0B02D0 */ lw $t3, 0x02D0($s0) ## 000002D0 -/* 06FB8 80B5A368 8FA4008C */ lw $a0, 0x008C($sp) -/* 06FBC 80B5A36C 0C0289CF */ jal SkelAnime_DrawSV2 -/* 06FC0 80B5A370 AFAB001C */ sw $t3, 0x001C($sp) -/* 06FC4 80B5A374 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 06FC8 80B5A378 8FAC008C */ lw $t4, 0x008C($sp) -/* 06FCC 80B5A37C 3C0680B6 */ lui $a2, %hi(D_80B5AA7C) ## $a2 = 80B60000 -/* 06FD0 80B5A380 24C6AA7C */ addiu $a2, $a2, %lo(D_80B5AA7C) ## $a2 = 80B5AA7C -/* 06FD4 80B5A384 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC -/* 06FD8 80B5A388 240708BA */ addiu $a3, $zero, 0x08BA ## $a3 = 000008BA -/* 06FDC 80B5A38C 0C031AD5 */ jal Graph_CloseDisps -/* 06FE0 80B5A390 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 06FE4 80B5A394 8FBF002C */ lw $ra, 0x002C($sp) -/* 06FE8 80B5A398 8FB00024 */ lw $s0, 0x0024($sp) -/* 06FEC 80B5A39C 8FB10028 */ lw $s1, 0x0028($sp) -/* 06FF0 80B5A3A0 03E00008 */ jr $ra -/* 06FF4 80B5A3A4 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/data/overlays/actors/z_en_zl3.data.s b/data/overlays/actors/z_en_zl3.data.s deleted file mode 100644 index a0cc2edcb0..0000000000 --- a/data/overlays/actors/z_en_zl3.data.s +++ /dev/null @@ -1,91 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_80B5A410 - .word 0x00000009, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00190050, 0x00000000, 0x00000000 -glabel D_80B5A43C - .word 0x060030C8, 0x06003C48, 0x06004048, 0x06004548, 0x06004948, 0x06004D48, 0x06005148, 0x00000000 -glabel D_80B5A45C - .word 0x06003508, 0x06005548, 0x06005948 -glabel D_80B5A468 - .word 0x00000000 -glabel D_80B5A46C - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80B5A478 - .word 0x00000000, 0x41200000, 0x00000000 -glabel D_80B5A484 - .word 0x00000000 -glabel D_80B5A488 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80B5A494 - .word 0xFFFFFFFF -glabel D_80B5A498 - .word 0x43140000, 0x43820000, 0xC2AE0000 -glabel D_80B5A4A4 - .word 0xC1400000, 0x43820000, 0xC3130000, 0x42280000, 0x43820000, 0x41500000 -glabel D_80B5A4BC - .word 0x00000000 -glabel D_80B5A4C0 - .word func_80B59DB8 -.word func_80B55550 -.word func_80B555A4 -.word func_80B55604 -.word func_80B5566C -.word func_80B556CC -.word func_80B5572C -.word func_80B56658 -.word func_80B566AC -.word func_80B5670C -.word func_80B5676C -.word func_80B567CC -.word func_80B5682C -.word func_80B568B4 -.word func_80B5691C -.word func_80B5697C -.word func_80B569E4 -.word func_80B56A68 -.word func_80B56AE0 -.word func_80B56B54 -.word func_80B56BA8 -.word func_80B56C24 -.word func_80B56C84 -.word func_80B56CE4 -.word func_80B56D44 -.word func_80B58D50 -.word func_80B58DB0 -.word func_80B58E10 -.word func_80B58E7C -.word func_80B58EF4 -.word func_80B58F6C -.word func_80B58FDC -.word func_80B5904C -.word func_80B590BC -.word func_80B5912C -.word func_80B591BC -.word func_80B5922C -.word func_80B592A8 -.word func_80B59340 -.word func_80B593D0 -glabel D_80B5A560 - .word func_80B5458C -.word func_80B5944C -glabel D_80B5A568 - .word func_80B59FE8 -.word func_80B59FF4 -.word func_80B5A1D0 -glabel En_Zl3_InitVars - .word 0x01790400, 0x00000010, 0x00600000, 0x00000420 -.word EnZl3_Init -.word EnZl3_Destroy -.word EnZl3_Update -.word EnZl3_Draw -.word 0x00000000, 0x00000000, 0x00000000 - diff --git a/include/functions.h b/include/functions.h index 8bd2e3eccd..eca3cb4f5b 100644 --- a/include/functions.h +++ b/include/functions.h @@ -2265,6 +2265,7 @@ void func_800F3A08(u8, u8, u8); void func_800F3F3C(u8); // ? func_800F3F84(?); void func_800F4010(Vec3f*, u16, f32); +void func_800F41E0(Vec3f*, u16, u8); void func_800F4138(Vec3f*, u16, f32); void func_800F4190(Vec3f*, u16); void func_800F436C(UNK_TYPE arg0, s16 arg1, f32 arg2); diff --git a/spec b/spec index 3387f78e99..c08fa6c5e9 100644 --- a/spec +++ b/spec @@ -3292,8 +3292,11 @@ endseg beginseg name "ovl_En_Zl3" include "build/src/overlays/actors/ovl_En_Zl3/z_en_zl3.o" - include "build/data/overlays/actors/z_en_zl3.data.o" +#ifdef NON_MATCHING + include "build/src/overlays/actors/ovl_En_Zl3/ovl_En_Zl3_reloc.o" +#else include "build/data/overlays/actors/z_en_zl3.reloc.o" +#endif endseg beginseg diff --git a/src/code/z_sram.c b/src/code/z_sram.c index f0a61bb5d8..1145bd9b36 100644 --- a/src/code/z_sram.c +++ b/src/code/z_sram.c @@ -221,23 +221,20 @@ ItemEquips sDebugSaveEquips = { 0x1122, // equipment }; -Inventory - sDebugSaveInventory = - { - { ITEM_STICK, ITEM_NUT, ITEM_BOMB, ITEM_BOW, ITEM_ARROW_FIRE, - ITEM_DINS_FIRE, ITEM_SLINGSHOT, ITEM_OCARINA_FAIRY, ITEM_BOMBCHU, ITEM_HOOKSHOT, - ITEM_ARROW_ICE, ITEM_FARORES_WIND, ITEM_BOOMERANG, ITEM_LENS, ITEM_BEAN, - ITEM_HAMMER, ITEM_ARROW_LIGHT, ITEM_NAYRUS_LOVE, ITEM_BOTTLE, ITEM_POTION_RED, - ITEM_POTION_GREEN, ITEM_POTION_BLUE, ITEM_POCKET_EGG, ITEM_WEIRD_EGG }, // items - { 50, 50, 10, 30, 1, 1, 30, 1, 50, 1, 1, 1, 1, 1, 1, 1 }, // ammo - 0x7777, // equipment - 0x125249, // upgrades - 0x1E3FFFF, // questItems - { 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // dungeonItems - { 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8 }, // dungeonKeys - 0, // defenseHearts - 0, // gsTokens - }; +Inventory sDebugSaveInventory = { + { ITEM_STICK, ITEM_NUT, ITEM_BOMB, ITEM_BOW, ITEM_ARROW_FIRE, ITEM_DINS_FIRE, + ITEM_SLINGSHOT, ITEM_OCARINA_FAIRY, ITEM_BOMBCHU, ITEM_HOOKSHOT, ITEM_ARROW_ICE, ITEM_FARORES_WIND, + ITEM_BOOMERANG, ITEM_LENS, ITEM_BEAN, ITEM_HAMMER, ITEM_ARROW_LIGHT, ITEM_NAYRUS_LOVE, + ITEM_BOTTLE, ITEM_POTION_RED, ITEM_POTION_GREEN, ITEM_POTION_BLUE, ITEM_POCKET_EGG, ITEM_WEIRD_EGG }, // items + { 50, 50, 10, 30, 1, 1, 30, 1, 50, 1, 1, 1, 1, 1, 1, 1 }, // ammo + 0x7777, // equipment + 0x125249, // upgrades + 0x1E3FFFF, // questItems + { 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // dungeonItems + { 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8 }, // dungeonKeys + 0, // defenseHearts + 0, // gsTokens +}; u16 sDebugSaveChecksum = 0; diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h index c062ef9143..8b3a1c44fe 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h @@ -8,7 +8,9 @@ struct BossGanon2; typedef struct BossGanon2 { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x798]; + /* 0x014C */ char unk_14C[0x1D8]; + /* 0x0324 */ f32 unk_324; + /* 0x0328 */ char unk_328[0x5BC]; } BossGanon2; // size = 0x08E4 extern const ActorInit Boss_Ganon2_InitVars; diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h index 41e89c7247..84cef3ace0 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h @@ -8,7 +8,9 @@ struct EnEncount2; typedef struct EnEncount2 { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x8D4]; + /* 0x014C */ char unk_14C[0x10]; + /* 0x015C */ u16 unk_15C; + /* 0x015E */ char unk_15E[0x8C2]; } EnEncount2; // size = 0x0A20 extern const ActorInit En_Encount2_InitVars; diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c index 099ea8a236..e2e1c78888 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -272,7 +272,7 @@ void func_80B4EE38(EnZl2* this, s16 arg1, s32 arg2) { phi_a3 = arg1 - this->unk_20C[phi_v0]; phi_v0 = this->unk_1AC[phi_v0]; - if ((s32)fabsf((f32)phi_a3) >= 0x8001) { + if ((s32)fabsf((f32)phi_a3) > 0x8000) { if (arg1 > 0) { phi_a3 -= 0x10000; } else { @@ -289,7 +289,7 @@ void func_80B4EE38(EnZl2* this, s16 arg1, s32 arg2) { phi_v0 -= ((s16)(temp_v1 - arg1) / 50); } temp_v1 += phi_v0; - if (((this->unk_1AC[arg2] * phi_v0) <= 0) && ((s16)(temp_v1 - arg1) >= -0x63) && + if (((this->unk_1AC[arg2] * phi_v0) <= 0) && ((s16)(temp_v1 - arg1) > -0x64) && ((s16)(temp_v1 - arg1) < 0x64)) { temp_v1 = arg1; phi_v0 = 0; @@ -340,7 +340,7 @@ void func_80B4EF64(EnZl2* this, s16 arg1, s32 arg2) { temp_t2 = arg1 - this->unk_20C[temp_t0]; phi_v0 = this->unk_1AC[temp_t0]; - if ((s32)fabsf((f32)temp_t2) >= 0x8001) { + if ((s32)fabsf((f32)temp_t2) > 0x8000) { if (arg1 > 0) { temp_t2 -= 0x10000; } else { @@ -361,7 +361,7 @@ void func_80B4EF64(EnZl2* this, s16 arg1, s32 arg2) { } temp_v1 += phi_v0; - if (((this->unk_1AC[arg2] * phi_v0) <= 0) && ((s16)(temp_v1 - phi_a0) >= -0x63) && + if (((this->unk_1AC[arg2] * phi_v0) <= 0) && ((s16)(temp_v1 - phi_a0) > -0x64) && ((s16)(temp_v1 - phi_a0) < 0x64)) { temp_v1 = phi_a0; phi_v0 = 0; @@ -412,7 +412,6 @@ void func_80B4F230(EnZl2* this, s16 arg1, s32 arg2) { s32 temp_t2; s32 temp_t3; s32 phi_v0; - s32 temp_1AC; s32 index1AC; s32 phi_t5; @@ -422,7 +421,6 @@ void func_80B4F230(EnZl2* this, s16 arg1, s32 arg2) { temp_t2 = temp_t0; temp_t3 = this->unk_1AC[arg2]; phi_v0 = temp_t3; - temp_1AC = phi_v0; temp_t3 = arg1 - this->unk_20C[arg2]; if (arg2 == 1) { @@ -469,7 +467,7 @@ void func_80B4F230(EnZl2* this, s16 arg1, s32 arg2) { phi_v0 -= temp_t0 / 50; } temp_v1 += phi_v0; - if (((this->unk_1AC[arg2] * phi_v0) <= 0) && (temp_t2 >= -0x63) && (temp_t2 < 0x64)) { + if (((this->unk_1AC[arg2] * phi_v0) <= 0) && (temp_t2 > -0x64) && (temp_t2 < 0x64)) { temp_v1 = 0; phi_v0 = 0; } @@ -489,7 +487,7 @@ s32 func_80B4F45C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p s16 pad2; s16* unk_1DC = this->unk_1DC; - if (limbIndex == 0xE) { + if (limbIndex == 14) { sp74 = Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Mtx) * 7); gSPSegment((*gfx)++, 0x0C, sp74); @@ -500,7 +498,7 @@ s32 func_80B4F45C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p Matrix_Translate(362.0f, -133.0f, 0.0f, MTXMODE_APPLY); Matrix_Get(&sp34); func_800D20CC(&sp34, &sp2C, 0); - if (func_800C0D28(globalCtx) == 0) { + if (!func_800C0D28(globalCtx)) { func_80B4EE38(this, sp2C.y, 0); func_80B4F230(this, sp2C.x, 1); func_80B4EF64(this, sp2C.z, 2); @@ -510,7 +508,7 @@ s32 func_80B4F45C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p Matrix_ToMtx(&sp74[0], "../z_en_zl2.c", 1056); Matrix_Get(&sp34); func_800D20CC(&sp34, &sp2C, 0); - if (func_800C0D28(globalCtx) == 0) { + if (!func_800C0D28(globalCtx)) { func_80B4EE38(this, sp2C.y, 3); func_80B4F230(this, sp2C.x, 4); } @@ -519,7 +517,7 @@ s32 func_80B4F45C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p Matrix_ToMtx(&sp74[1], "../z_en_zl2.c", 1100); Matrix_Get(&sp34); func_800D20CC(&sp34, &sp2C, 0); - if (func_800C0D28(globalCtx) == 0) { + if (!func_800C0D28(globalCtx)) { func_80B4EE38(this, sp2C.y, 6); func_80B4F230(this, sp2C.x, 7); } @@ -531,7 +529,7 @@ s32 func_80B4F45C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p Matrix_Translate(467.0f, 265.0f, 389.0f, MTXMODE_APPLY); Matrix_Get(&sp34); func_800D20CC(&sp34, &sp2C, 0); - if (func_800C0D28(globalCtx) == 0) { + if (!func_800C0D28(globalCtx)) { func_80B4EE38(this, sp2C.y, 9); func_80B4F230(this, sp2C.x, 10); func_80B4EF64(this, sp2C.z, 11); @@ -541,7 +539,7 @@ s32 func_80B4F45C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p Matrix_ToMtx(&sp74[3], "../z_en_zl2.c", 1145); Matrix_Get(&sp34); func_800D20CC(&sp34, &sp2C, 0); - if (func_800C0D28(globalCtx) == 0) { + if (!func_800C0D28(globalCtx)) { func_80B4EE38(this, sp2C.y, 12); func_80B4F230(this, sp2C.x, 13); func_80B4EF64(this, sp2C.z, 14); @@ -554,7 +552,7 @@ s32 func_80B4F45C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p Matrix_Translate(467.0f, 265.0f, -389.0f, MTXMODE_APPLY); Matrix_Get(&sp34); func_800D20CC(&sp34, &sp2C, 0); - if (func_800C0D28(globalCtx) == 0) { + if (!func_800C0D28(globalCtx)) { func_80B4EE38(this, sp2C.y, 15); func_80B4F230(this, sp2C.x, 16); func_80B4EF64(this, sp2C.z, 17); @@ -564,7 +562,7 @@ s32 func_80B4F45C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p Matrix_ToMtx(&sp74[5], "../z_en_zl2.c", 1189); Matrix_Get(&sp34); func_800D20CC(&sp34, &sp2C, 0); - if (func_800C0D28(globalCtx) == 0) { + if (!func_800C0D28(globalCtx)) { func_80B4EE38(this, sp2C.y, 18); func_80B4F230(this, sp2C.x, 19); func_80B4EF64(this, sp2C.z, 20); diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index e545cd98f4..c4b9ebea60 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -6,6 +6,10 @@ #include "z_en_zl3.h" +#include "vt.h" +#include "overlays/actors/ovl_En_Encount2/z_en_encount2.h" +#include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" + #define FLAGS 0x00000010 #define THIS ((EnZl3*)thisx) @@ -14,8 +18,2774 @@ void EnZl3_Init(Actor* thisx, GlobalContext* globalCtx); void EnZl3_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnZl3_Update(Actor* thisx, GlobalContext* globalCtx); void EnZl3_Draw(Actor* thisx, GlobalContext* globalCtx); +void func_80B59AD0(EnZl3* this, GlobalContext* globalCtx); + +static ColliderCylinderInit_Set3 sCylinderInit = { + { COLTYPE_UNK0, 0x00, 0x00, 0x09, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x00, 0x00, 0x01 }, + { 25, 80, 0, { 0, 0, 0 } }, +}; + +UNK_TYPE D_80B5A43C[] = { + 0x060030C8, 0x06003C48, 0x06004048, 0x06004548, 0x06004948, 0x06004D48, 0x06005148, 0x00000000 +}; + +UNK_TYPE D_80B5A45C[] = { 0x06003508, 0x06005548, 0x06005948 }; + +s32 D_80B5A468 = 0; + +Vec3f D_80B5A46C = { 0.0f, 0.0f, 0.0f }; + +Vec3f D_80B5A478 = { 0.0f, 10.0f, 0.0f }; + +f32 D_80B5A484 = 0.0f; + +Vec3f D_80B5A488 = { 0.0f, 0.0f, 0.0f }; + +s32 D_80B5A494 = -1; + +Vec3f D_80B5A498 = { 148.0f, 260.0f, -87.0f }; + +Vec3f D_80B5A4A4 = { -12.0f, 260.0f, -147.0f }; + +Vec3f D_80B5A4B0 = { 42.0f, 260.0f, 13.0f }; + +u32 D_80B5A4BC = 0; + +extern AnimationHeader D_060001D8; +extern AnimationHeader D_060004F4; +extern AnimationHeader D_060014DC; +extern AnimationHeader D_0600210C; +extern AnimationHeader D_06002710; +extern AnimationHeader D_060038C0; +extern AnimationHeader D_06003D20; +extern AnimationHeader D_06003FF8; +extern AnimationHeader D_06004408; +extern AnimationHeader D_0600499C; +extern AnimationHeader D_06005248; +extern AnimationHeader D_060054E0; +extern AnimationHeader D_06005A0C; +extern AnimationHeader D_060061C4; +extern AnimationHeader D_06006508; +extern AnimationHeader D_06006AB0; +extern AnimationHeader D_06006F04; +extern AnimationHeader D_06007664; +extern AnimationHeader D_06007A78; +extern AnimationHeader D_06007C84; +extern AnimationHeader D_06008050; +extern AnimationHeader D_060082F8; +extern AnimationHeader D_06008684; +extern AnimationHeader D_06008AD0; +extern AnimationHeader D_060091D8; +extern AnimationHeader D_060099A0; +extern AnimationHeader D_06009BE4; +extern AnimationHeader D_06009FBC; +extern AnimationHeader D_0600A334; +extern AnimationHeader D_0600A598; +extern AnimationHeader D_0600AACC; +extern SkeletonHeader D_06010D70; +extern AnimationHeader D_06001110; +extern AnimationHeader D_06001D8C; +extern AnimationHeader D_06002348; +extern AnimationHeader D_06002E54; + +void func_80B533B0(Actor* thisx, GlobalContext* globalCtx) { + EnZl3* this = THIS; + + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder_Set3(globalCtx, &this->collider, &this->actor, &sCylinderInit); +} + +void func_80B533FC(EnZl3* this, GlobalContext* globalCtx) { + ColliderCylinder* collider = &this->collider; + s32 pad[4]; + + Collider_CylinderUpdate(&this->actor, collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &collider->base); +} + +void EnZl3_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnZl3* this = THIS; + + Collider_DestroyCylinder(globalCtx, &this->collider); +} + +void func_80B53468(void) { + Audio_SetBGM(0x62); +} + +BossGanon2* func_80B53488(EnZl3* this, GlobalContext* globalCtx) { + if (this->unk_3D4 == NULL) { + Actor* actorIt = globalCtx->actorCtx.actorList[ACTORTYPE_BOSS].first; + + while (actorIt != NULL) { + if (actorIt->id == ACTOR_BOSS_GANON2) { + this->unk_3D4 = (BossGanon2*)actorIt; + break; + } + actorIt = actorIt->next; + } + } + return this->unk_3D4; +} + +void func_80B534CC(EnZl3* this) { + s32 pad[2]; + s16* unk_244 = &this->unk_244; + s16* unk_246 = &this->unk_246; + + if (DECR(*unk_246) == 0) { + *unk_246 = Math_Rand_S16Offset(0x3C, 0x3C); + } + *unk_244 = *unk_246; + if (*unk_244 >= 3) { + *unk_244 = 0; + } +} + +void func_80B53554(EnZl3* this, s16 arg1) { + this->unk_244 = arg1; +} + +void func_80B53568(EnZl3* this, s16 arg1) { + this->unk_248 = arg1; +} + +void func_80B5357C(EnZl3* this, GlobalContext* globalCtx) { + Vec3f* thisPos = &this->actor.posRot.pos; + Vec3f sp20; + + sp20.x = thisPos->x + ((Math_Rand_ZeroOne() - 0.5f) * 10.0f); + sp20.y = thisPos->y; + sp20.z = thisPos->z + ((Math_Rand_ZeroOne() - 0.5f) * 10.0f); + Item_DropCollectible(globalCtx, &sp20, 3); +} + +void func_80B53614(EnZl3* this, GlobalContext* globalCtx) { + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_RIVER_SOUND, -442.0f, 4102.0f, -371.0f, 0, 0, 0, 0x12); +} + +void func_80B5366C(EnZl3* this, GlobalContext* globalCtx) { + func_8002E4B4(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 5); +} + +void func_80B536B4(EnZl3* this) { + this->actor.bgCheckFlags &= ~0x9; +} + +void func_80B536C4(EnZl3* this) { + s32 pad[2]; + Vec3s* vec1 = &this->unk_3F8.unk_08; + Vec3s* vec2 = &this->unk_3F8.unk_0E; + + Math_SmoothScaleMaxMinS(&vec1->x, 0, 20, 6200, 100); + Math_SmoothScaleMaxMinS(&vec1->y, 0, 20, 6200, 100); + Math_SmoothScaleMaxMinS(&vec2->x, 0, 20, 6200, 100); + Math_SmoothScaleMaxMinS(&vec2->y, 0, 20, 6200, 100); +} + +void func_80B53764(EnZl3* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + this->unk_3F8.unk_18 = player->actor.posRot.pos; + this->unk_3F8.unk_14 = kREG(16) - 16.0f; + func_80034A14(&this->actor, &this->unk_3F8, kREG(17) + 0xC, 2); +} + +s32 func_80B537E8(EnZl3* this) { + s16 yawTowardsLink = this->actor.yawTowardsLink; + s16* rotY = &this->actor.posRot.rot.y; + s16* unk_3D0 = &this->unk_3D0; + s16 pad[3]; + + Math_SmoothScaleMaxMinS(unk_3D0, ABS((s16)(yawTowardsLink - *rotY)), 5, 6200, 100); + Math_SmoothScaleMaxMinS(rotY, yawTowardsLink, 5, *unk_3D0, 100); + this->actor.shape.rot.y = *rotY; + // no return statement despite being of type s32 + // the function directly below needs this to not be void I guess +} + +void func_80B538B0(EnZl3* this) { + s16 yawTowardsLink = this->actor.yawTowardsLink; + s16* rotY = &this->actor.posRot.rot.y; + + if (ABS((s16)(yawTowardsLink - *rotY)) >= 0x1556) { + D_80B5A468 = 1; + } + + if (D_80B5A468 != 0) { + if (!func_80B537E8(this)) { + D_80B5A468 = 0; + } + } else { + this->unk_3D0 = 0; + } +} + +s32 EnZl3_FrameUpdateMatrix(EnZl3* this) { + return SkelAnime_FrameUpdateMatrix(&this->skelAnime); +} + +s32 func_80B5396C(EnZl3* this) { + return this->unk_3C8; +} + +void func_80B53974(EnZl3* this, u8 arg1) { + this->unk_3C8 = arg1; +} + +#ifdef NON_MATCHING +void func_80B53980(EnZl3* this, s16 y, s32 idx) { + SkelAnime* skelAnime = &this->skelAnime; + s32 action = this->action; + EnZl3* this2 = this; + s16 y2 = y; + s32 yTemp; + f32 animCurrentFrame; + f32 unk_3DC; + + if (this->unk_2FC != 0) { + s32 temp25C = this2->unk_25C[idx]; + s32 temp28C = (s16)(y + this2->unk_28C[idx]); + s32 temp2BC = y - this2->unk_2BC[idx]; + + if ((s32)fabsf(temp2BC) > 0x8000) { + if (y2 > 0) { + temp2BC -= 0x10000; + } else { + temp2BC += 0x10000; + } + } + + if ((idx != 0 || action != 4) && (temp2BC != 0)) { + temp25C += (temp2BC - temp25C) / 16; + } + + if (temp25C != 0) { + temp25C -= temp25C / 10; + } + + if ((s16)(temp28C - y) != 0) { + temp25C -= (s16)(temp28C - y) / 50; + } + + temp28C += temp25C; + if (((this->unk_25C[idx] * temp25C) <= 0) && (((s16)(temp28C - y) > -0x64) && ((s16)(temp28C - y) < 0x64))) { + temp28C = y; + temp25C = 0; + } + + if (idx == 0 && action == 3) { + yTemp = y + -11000; + if (skelAnime->mode == 2) { + animCurrentFrame = skelAnime->animCurrentFrame; + unk_3DC = this->unk_3DC; + yTemp = (s32)((animCurrentFrame / unk_3DC) * -11000) + y; + if (0) {}; + if (temp28C >= yTemp) { + temp28C = yTemp; + if (temp25C > 0) { + temp25C /= -2; + } + } + } else { + if (temp28C >= yTemp) { + temp28C = yTemp; + if (temp25C > 0) { + temp25C /= -2; + } + } + } + } + this->unk_25C[idx] = temp25C; + this->unk_28C[idx] = temp28C - y; + } + this->unk_2BC[idx] = y; +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53980.s") +#endif + +// Assorted regalloc issues +#ifdef NON_MATCHING +void func_80B53B64(EnZl3* this, s16 z, s32 idx) { + SkelAnime* skelAnime = &this->skelAnime; + s32 action = this->action; + s32 phi_a1; + s32 idx25C; + s16 temp_t1; + s32 temp_a0; + s32 temp_a3_2; + s32 temp_a3_3; + s32 temp_a3_4; + s32 temp_a3_5; + s32 temp_a3_6; + s32 temp_a3_7; + s32 temp_a3_8; + s32 temp_v1_3; + s32 phi_v1; + s32 phi_v0; + s32 phi_v1_2; + + if (idx == 2) { + phi_a1 = 15000; + idx25C = 0; + } else if (idx == 5) { + phi_a1 = 13000; + idx25C = 3; + } else if (idx == 8) { + phi_a1 = 12000; + idx25C = 6; + } else if (idx == 11) { + phi_a1 = 0x4000; + idx25C = 9; + } else if (idx == 14) { + phi_a1 = 0x4000; + idx25C = 12; + } else if (idx == 17) { + phi_a1 = 0x4000; + idx25C = 15; + } else { + phi_a1 = 0x4000; + idx25C = 18; + } + + if (this->unk_2FC != 0) { + temp_t1 = this->unk_25C[idx]; + temp_a3_3 = this->unk_28C[idx] + z; + phi_v1 = z - this->unk_2BC[idx]; + temp_a0 = (s16)(temp_a3_3); + phi_v0 = temp_t1; + + if ((s32)fabsf(phi_v1) > 0x8000) { + if (z > 0) { + phi_v1 -= 0x10000; + } else { + phi_v1 += 0x10000; + } + } + + if (idx25C >= 0) { + phi_v0 = this->unk_25C[idx25C]; + phi_v1 += ABS(phi_v0) / 3; + } + + if (idx == 2 && (action == 5 || action == 24)) { + if (phi_v1 != 0) { + phi_v0 -= (phi_v1 - phi_v0) / 10; + } + } else if (idx == 2 && action == 22 && skelAnime->mode == 2) { + if (phi_v1 != 0) { + phi_v0 -= (phi_v1 - phi_v0) / 10; + } + } else if (idx == 2 && (action == 20 || action == 21) && skelAnime->mode == 2) { + if (phi_v1 != 0) { + phi_v0 -= (phi_v1 - phi_v0) / 10; + } + } else { + if (phi_v1 != 0) { + phi_v0 += (phi_v1 - phi_v0) / 16; + } + } + + if (phi_v0 != 0) { + phi_v0 -= phi_v0 / 10; + } + + if ((s16)(temp_a0 - phi_a1) != 0) { + phi_v0 -= (s16)(temp_a0 - phi_a1) / 50; + } + + temp_a0 += phi_v0; + temp_v1_3 = (s16)(temp_a0 - phi_a1); + + if (((temp_t1 * phi_v0) <= 0) && (temp_v1_3 > -100) && (temp_v1_3 < 100)) { + phi_v0 = 0; + } + + if (idx == 2) { + if (action == 4) { + if (skelAnime->mode == 2) { + f32 animCurrentFrame = skelAnime->animCurrentFrame; + + temp_a3_2 = (s32)(((this->unk_3E0 - animCurrentFrame) / this->unk_3E0) * -2000.0f) + phi_a1; + if (temp_a3_2 >= phi_a1) { + phi_a1 = temp_a3_2; + if (phi_v0 < 0) { + phi_v0 /= -2; + } + } + } + } else if (action == 5) { + if (skelAnime->mode == 2) { + temp_a3_3 = (s32)((skelAnime->animCurrentFrame / this->unk_3E4) * -2000.0f) + phi_a1; + if (temp_a3_3 >= phi_a1) { + phi_a1 = temp_a3_3; + if (phi_v0 < 0) { + phi_v0 /= -2; + } + } + } else { + if (phi_a1 - 2000 >= phi_a1) { + phi_a1 -= 2000; + if (phi_v0 < 0) { + phi_v0 /= -2; + } + } + } + } else if ((action == 20) || (action == 21)) { + if (skelAnime->mode == 2) { + f32 unk_3F4 = this->unk_3F4; + + if (skelAnime->animCurrentFrame <= 42.0f) { + phi_v1_2 = phi_a1 - 2000; + } else { + phi_v1_2 = + (s32)((((skelAnime->animCurrentFrame - 42.0f) * 6200.0f) / (unk_3F4 - 42.0f)) + -2000.0f) + + phi_a1; + } + + if (phi_v1_2 >= phi_a1) { + phi_a1 = phi_v1_2; + if (phi_v0 < 0) { + phi_v0 /= -2; + } + } + } else { + if (phi_a1 + 4200 >= phi_a1) { + phi_a1 += 4200; + if (phi_v0 < 0) { + phi_v0 /= -2; + } + } + } + } else if (action == 22) { + if (skelAnime->mode == 2) { + temp_a3_4 = (s32)(((skelAnime->animCurrentFrame / this->unk_3EC) * -5200.0f) + 4200.0f) + phi_a1; + if (temp_a3_4 >= phi_a1) { + phi_a1 = temp_a3_4; + if (phi_v0 < 0) { + phi_v0 /= -2; + } + } + } else { + if (phi_a1 - 2000 >= phi_a1) { + phi_a1 -= 2000; + if (phi_v0 < 0) { + phi_v0 /= -2; + } + } + } + } else if (action == 23) { + if (skelAnime->mode == 2) { + temp_a3_5 = (s32)(((skelAnime->animCurrentFrame / this->unk_3F0) * -7600.0f) + -2000.0f) + phi_a1; + if (temp_a3_5 >= phi_a1) { + phi_a1 = temp_a3_5; + if (phi_v0 < 0) { + phi_v0 /= -2; + } + } + } else { + if (phi_a1 - 9600 >= phi_a1) { + phi_a1 -= 9600; + if (phi_v0 < 0) { + phi_v0 /= -2; + } + } + } + } else if (action == 24) { + if (skelAnime->mode == 2) { + temp_a3_6 = (s32)(((skelAnime->animCurrentFrame / this->unk_3E8) * 21000.0f) + -9600.0f) + phi_a1; + if (temp_a3_6 >= phi_a1) { + phi_a1 = temp_a3_6; + if (phi_v0 < 0) { + phi_v0 /= -2; + } + } + } else { + if (phi_a1 + 11400 >= phi_a1) { + phi_a1 += 11400; + if (phi_v0 < 0) { + phi_v0 /= -2; + } + } + } + } + } else if (idx == 11 || idx == 17) { + if (action == 4) { + if (skelAnime->mode == 2) { + temp_a3_7 = (s32)((skelAnime->animCurrentFrame / this->unk_3E0) * -7000.0f) + phi_a1; + if (phi_a1 >= temp_a3_7) { + phi_a1 = temp_a3_7; + if (phi_v0 > 0) { + phi_v0 /= -2; + } + } + } else { + if (phi_a1 >= phi_a1 - 7000) { + phi_a1 -= 7000; + if (phi_v0 > 0) { + phi_v0 /= -2; + } + } + } + } else if (action == 5) { + if (skelAnime->mode == 2) { + f32 animCurrentFrame = skelAnime->animCurrentFrame; + + temp_a3_8 = (s32)(((this->unk_3E4 - animCurrentFrame) / this->unk_3E4) * -7000.0f) + phi_a1; + if (phi_a1 >= temp_a3_8) { + phi_a1 = temp_a3_8; + if (phi_v0 > 0) { + phi_v0 /= -2; + } + } + } + } + } + this->unk_25C[idx] = phi_v0; + this->unk_28C[idx] = phi_a1 - z; + } + this->unk_2BC[idx] = z; +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53B64.s") +#endif + +void func_80B54360(EnZl3* this, s16 arg1, s32 arg2) { + if (this->unk_2FC != 0) { + s32 temp_v1 = this->unk_28C[arg2] - arg1; + s16 temp_t0 = temp_v1; + s32 temp_t2 = temp_t0; + s32 temp_t3 = this->unk_25C[arg2]; + s32 phi_v0 = temp_t3; + s32 index25C; + s32 phi_t5; + + temp_t3 = arg1 - this->unk_2BC[arg2]; + + if (arg2 == 1) { + index25C = 0; + phi_t5 = this->unk_25C[index25C]; + } else if (arg2 == 4) { + index25C = 3; + phi_t5 = this->unk_25C[index25C]; + } else if (arg2 == 7) { + index25C = 6; + phi_t5 = this->unk_25C[index25C]; + } else if (arg2 == 10) { + index25C = 9; + phi_t5 = ABS(this->unk_25C[index25C]); + } else if (arg2 == 13) { + index25C = 12; + phi_t5 = ABS(this->unk_25C[index25C]); + } else if (arg2 == 16) { + index25C = 15; + phi_t5 = -ABS(this->unk_25C[index25C]); + } else { + index25C = 18; + phi_t5 = -ABS(this->unk_25C[index25C]); + } + + if ((s32)fabsf(temp_t3) > 0x8000) { + if (arg1 > 0) { + temp_t3 -= 0x10000; + } else { + temp_t3 += 0x10000; + } + } + if (index25C >= 0) { + temp_t3 += phi_t5 / 3; + } + + if (temp_t3 != 0) { + phi_v0 += (temp_t3 - phi_v0) / 16; + } + if (phi_v0 != 0) { + phi_v0 -= phi_v0 / 10; + } + if (temp_t0 != 0) { + phi_v0 -= temp_t0 / 50; + } + temp_v1 += phi_v0; + if (((this->unk_25C[arg2] * phi_v0) <= 0) && (temp_t2 > -0x64) && (temp_t2 < 0x64)) { + temp_v1 = 0; + phi_v0 = 0; + } + this->unk_25C[arg2] = phi_v0; + this->unk_28C[arg2] = arg1 + temp_v1; + } + this->unk_2BC[arg2] = arg1; +} + +s32 func_80B5458C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx, + Gfx** gfx) { + s32 pad[3]; + EnZl3* this = THIS; + s16* unk_28C = this->unk_28C; + Mtx* sp78; + MtxF sp38; + Vec3s sp30; + Vec3s* unk_3F8_unk_08 = &this->unk_3F8.unk_08; + Vec3s* unk_3F8_unk_0E = &this->unk_3F8.unk_0E; + + if (limbIndex == 14) { + sp78 = Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Mtx) * 7); + rot->x += unk_3F8_unk_08->y; + rot->z += unk_3F8_unk_08->x; + gSPSegment((*gfx)++, 0x0C, sp78); + + Matrix_Push(); + Matrix_Translate(pos->x, pos->y, pos->z, MTXMODE_APPLY); + Matrix_RotateRPY(rot->x, rot->y, rot->z, MTXMODE_APPLY); + Matrix_Push(); + Matrix_Translate(362.0f, -133.0f, 0.0f, MTXMODE_APPLY); + Matrix_Get(&sp38); + func_800D20CC(&sp38, &sp30, 0); + if (!func_800C0D28(globalCtx)) { + func_80B53980(this, sp30.y, 0); + func_80B54360(this, sp30.x, 1); + func_80B53B64(this, sp30.z, 2); + } + Matrix_RotateRPY(unk_28C[0] + kREG(31), unk_28C[1] + kREG(32), unk_28C[2] + kREG(33), MTXMODE_APPLY); + Matrix_Translate(-188.0f, -184.0f, 0.0f, MTXMODE_APPLY); + Matrix_ToMtx(&sp78[0], "../z_en_zl3.c", 1490); + Matrix_Get(&sp38); + func_800D20CC(&sp38, &sp30, 0); + if (!func_800C0D28(globalCtx)) { + func_80B53980(this, sp30.y, 3); + } + Matrix_RotateRPY(unk_28C[3] + kREG(34), unk_28C[4] + kREG(35), unk_28C[5] + kREG(36), MTXMODE_APPLY); + Matrix_Translate(-410.0f, -184.0f, 0.0f, MTXMODE_APPLY); + Matrix_ToMtx(&sp78[1], "../z_en_zl3.c", 1534); + Matrix_Get(&sp38); + func_800D20CC(&sp38, &sp30, 0); + if (!func_800C0D28(globalCtx)) { + func_80B54360(this, sp30.x, 7); + } + Matrix_RotateRPY(unk_28C[6] + kREG(37), unk_28C[7] + kREG(38), unk_28C[8] + kREG(39), MTXMODE_APPLY); + Matrix_Translate(-1019.0f, -26.0f, 0.0f, MTXMODE_APPLY); + Matrix_ToMtx(&sp78[2], "../z_en_zl3.c", 1554); + Matrix_Pull(); + Matrix_Push(); + Matrix_Translate(467.0f, 265.0f, 389.0f, MTXMODE_APPLY); + Matrix_Get(&sp38); + func_800D20CC(&sp38, &sp30, 0); + if (!func_800C0D28(globalCtx)) { + func_80B53980(this, sp30.y, 9); + func_80B54360(this, sp30.x, 10); + func_80B53B64(this, sp30.z, 11); + } + Matrix_RotateRPY(unk_28C[9] + kREG(40), unk_28C[10] + kREG(41), unk_28C[11] + kREG(42), MTXMODE_APPLY); + Matrix_Translate(-427.0f, -1.0f, -3.0f, MTXMODE_APPLY); + Matrix_ToMtx(&sp78[3], "../z_en_zl3.c", 1579); + Matrix_Get(&sp38); + func_800D20CC(&sp38, &sp30, 0); + if (!func_800C0D28(globalCtx)) { + func_80B53980(this, sp30.y, 12); + func_80B54360(this, sp30.x, 13); + func_80B53B64(this, sp30.z, 14); + } + Matrix_RotateRPY(unk_28C[12] + kREG(43), unk_28C[13] + kREG(44), unk_28C[14] + kREG(45), MTXMODE_APPLY); + Matrix_Translate(-446.0f, -52.0f, 84.0f, MTXMODE_APPLY); + Matrix_ToMtx(&sp78[4], "../z_en_zl3.c", 1598); + Matrix_Pull(); + Matrix_Push(); + Matrix_Translate(467.0f, 265.0f, -389.0f, MTXMODE_APPLY); + Matrix_Get(&sp38); + func_800D20CC(&sp38, &sp30, 0); + if (!func_800C0D28(globalCtx)) { + func_80B53980(this, sp30.y, 15); + func_80B54360(this, sp30.x, 16); + func_80B53B64(this, sp30.z, 17); + } + Matrix_RotateRPY(unk_28C[15] + kREG(46), unk_28C[16] + kREG(47), unk_28C[17] + kREG(48), MTXMODE_APPLY); + Matrix_Translate(-427.0f, -1.0f, 3.0f, MTXMODE_APPLY); + Matrix_ToMtx(&sp78[5], "../z_en_zl3.c", 1623); + Matrix_Get(&sp38); + func_800D20CC(&sp38, &sp30, 0); + if (!func_800C0D28(globalCtx)) { + func_80B53980(this, sp30.y, 18); + func_80B54360(this, sp30.x, 19); + func_80B53B64(this, sp30.z, 20); + } + Matrix_RotateRPY(unk_28C[18] + kREG(49), unk_28C[19] + kREG(50), unk_28C[20] + kREG(51), MTXMODE_APPLY); + Matrix_Translate(-446.0f, -52.0f, -84.0f, MTXMODE_APPLY); + Matrix_ToMtx(&sp78[6], "../z_en_zl3.c", 1642); + Matrix_Pull(); + Matrix_Pull(); + this->unk_2FC = 1; + } else if (limbIndex == 7) { + rot->x += unk_3F8_unk_0E->y; + rot->y -= unk_3F8_unk_0E->x; + } + return 0; +} + +void EnZl3_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx, Gfx** gfx) { + EnZl3* this = THIS; + s32 pad; + Vec3f sp34; + s32 pad2; + Vec3f sp24; + Vec3f sp18; + + if (limbIndex == 13) { + sp34 = D_80B5A46C; + Matrix_MultVec3f(&sp34, &this->unk_31C); + } else if (limbIndex == 14) { + sp24 = D_80B5A478; + Matrix_MultVec3f(&sp24, &sp18); + this->actor.posRot2.pos.x = sp18.x; + this->actor.posRot2.pos.y = sp18.y; + this->actor.posRot2.pos.z = sp18.z; + this->actor.posRot2.rot.x = this->actor.posRot.rot.x; + this->actor.posRot2.rot.y = this->actor.posRot.rot.y; + this->actor.posRot2.rot.z = this->actor.posRot.rot.z; + } +} + +s32 func_80B54DB4(EnZl3* this) { + s32 params = this->actor.params >> 8; + + return params & 0xFF; +} + +s32 func_80B54DC4(EnZl3* this) { + s32 params = this->actor.params >> 4; + + return params & 0xF; +} + +s32 func_80B54DD4(EnZl3* this) { + s32 params = this->actor.params; + + return params & 0xF; +} + +void func_80B54DE0(EnZl3* this, GlobalContext* globalCtx) { + s32 idx = this->unk_318; + + gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[idx].segment); +} + +void func_80B54E14(EnZl3* this, AnimationHeader* animation, u8 arg2, f32 transitionRate, s32 arg4) { + f32 frameCount = SkelAnime_GetFrameCount(&animation->genericHeader); + f32 playbackSpeed; + f32 unk0; + f32 fc; + + if (arg4 == 0) { + unk0 = 0.0f; + fc = frameCount; + playbackSpeed = 1.0f; + } else { + unk0 = frameCount; + fc = 0.0f; + playbackSpeed = -1.0f; + } + + SkelAnime_ChangeAnim(&this->skelAnime, animation, playbackSpeed, unk0, fc, arg2, transitionRate); +} + +void func_80B54EA4(EnZl3* this, GlobalContext* globalCtx) { + f32 posX = this->actor.posRot.pos.x; + f32 posY = this->actor.posRot.pos.y; + f32 posZ = this->actor.posRot.pos.z; + + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_EG, posX, posY, posZ, 0, 0, 0, 0); +} + +void func_80B54EF4(EnZl3* this) { + func_80078914(&this->actor.projectedPos, NA_SE_VO_Z1_PAIN); +} + +void func_80B54F18(EnZl3* this, GlobalContext* globalCtx) { + if (this->unk_2F8 == 0) { + f32 posX = this->actor.posRot.pos.x; + f32 posY = this->actor.posRot.pos.y + (kREG(5) + -26.0f); + f32 posZ = this->actor.posRot.pos.z; + + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0x4000, + 0, 3); + this->unk_2F8 = 1; + } +} + +void func_80B54FB4(EnZl3* this, GlobalContext* globalCtx) { + osSyncPrintf("ゼルダ姫のEn_Zl3_Actor_inFinal_Init通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + func_80B54E14(this, &D_06008AD0, 0, 0.0f, 0); + func_80B53554(this, 4); + func_80B53568(this, 2); + this->action = 1; + this->drawConfig = 1; + func_80B54F18(this, globalCtx); + this->actor.shape.rot.z = 0; + this->unk_3C4 = this->actor.posRot.rot.z; + this->actor.posRot.rot.z = this->actor.shape.rot.z; + osSyncPrintf("ゼルダ姫のEn_Zl3_Actor_inFinal_Initは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n"); +} + +void func_80B55054(EnZl3* this) { + if (this->unk_328 != 0) { + Actor* child = this->actor.child; + + if (child != NULL) { + f32* temp_v0 = &this->unk_2EC; + + if (*temp_v0 < 19.0f) { + ((DoorWarp1*)child)->alpha = (20.0f - *temp_v0) * 12.75f; + *temp_v0 += 1.0f; + } else { + Actor_Kill(child); + this->actor.child = NULL; + } + } + } +} + +void func_80B550F0(EnZl3* this) { + Actor* child = this->actor.child; + + if (child != NULL) { + child->posRot.pos.x = this->actor.posRot.pos.x; + child->posRot.pos.y = this->actor.posRot.pos.y + (kREG(5) + -26.0f); + child->posRot.pos.z = this->actor.posRot.pos.z; + } +} + +void func_80B55144(EnZl3* this) { + f32* fl = &D_80B5A484; + + if (1) {} // necessary to match + + if (*fl < 2.0f) { + *fl += 1.0f; + func_80B53554(this, 2); + } else if (*fl < 4.0f) { + *fl += 1.0f; + func_80B53554(this, 1); + } else { + func_80B534CC(this); + } +} + +void func_80B551E0(EnZl3* this) { + func_80B54E14(this, &D_06008AD0, 0, 0.0f, 0); + this->action = 1; +} + +void func_80B55220(EnZl3* this) { + func_80B54E14(this, &D_060091D8, 2, 0.0f, 0); + this->action = 2; + func_80B53568(this, 0); +} + +void func_80B55268(EnZl3* this) { + func_80B54E14(this, &D_060091D8, 2, 0.0f, 0); + this->action = 3; +} + +void func_80B552A8(EnZl3* this, s32 arg1) { + if (arg1 != 0) { + func_80B54E14(this, &D_060099A0, 0, 0.0f, 0); + } +} + +void func_80B552DC(EnZl3* this) { + func_80B54E14(this, &D_0600A598, 2, -8.0f, 0); + func_80B54EF4(this); + func_80B53568(this, 2); + this->action = 4; + func_80B53468(); +} + +void func_80B55334(EnZl3* this, s32 arg1) { + if (arg1 != 0) { + func_80B54E14(this, &D_0600AACC, 0, 0.0f, 0); + } +} + +void func_80B55368(EnZl3* this) { + func_80B54E14(this, &D_0600A334, 2, -8.0f, 0); + func_80B53568(this, 0); + this->action = 5; +} + +void func_80B553B4(EnZl3* this, s32 arg1) { + if (arg1 != 0) { + func_80B54E14(this, &D_06009FBC, 0, 0.0f, 0); + } +} + +void func_80B553E8(EnZl3* this, GlobalContext* globalCtx) { + func_80B59AD0(this, globalCtx); +} + +void func_80B55408(EnZl3* this) { + Actor* child = this->actor.child; + + if (child != NULL) { + Actor_Kill(child); + } + Actor_Kill(&this->actor); +} + +void func_80B55444(EnZl3* this, GlobalContext* globalCtx) { + s32 temp_v0 = func_80B5396C(this); + + if (temp_v0 >= 0) { + s32 unk_2F0 = this->unk_2F0; + + if (temp_v0 != unk_2F0) { + switch (temp_v0) { + case 0: + func_80B551E0(this); + break; + case 1: + func_80B53554(this, 3); + func_80B54EF4(this); + break; + case 3: + func_80B55220(this); + break; + case 4: + func_80B55268(this); + break; + case 5: + func_80B552DC(this); + break; + case 6: + func_80B55368(this); + break; + case 7: + func_80B553E8(this, globalCtx); + break; + case 2: + func_80B55408(this); + break; + case 8: + this->unk_328 = 1; + default: + osSyncPrintf("En_Zl3_inFinal_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + } + this->unk_2F0 = temp_v0; + } + } +} + +void func_80B55550(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B5366C(this, globalCtx); + EnZl3_FrameUpdateMatrix(this); + func_80B550F0(this); + func_80B55444(this, globalCtx); +} + +void func_80B555A4(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B53554(this, 2); + func_80B550F0(this); + func_80B55054(this); + func_80B55444(this, globalCtx); +} + +void func_80B55604(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B55144(this); + func_80B552A8(this, EnZl3_FrameUpdateMatrix(this)); + func_80B55054(this); + func_80B55444(this, globalCtx); +} + +void func_80B5566C(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + func_80B55334(this, EnZl3_FrameUpdateMatrix(this)); + func_80B55444(this, globalCtx); +} + +void func_80B556CC(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + func_80B553B4(this, EnZl3_FrameUpdateMatrix(this)); + func_80B55444(this, globalCtx); +} + +void func_80B5572C(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + EnZl3_FrameUpdateMatrix(this); + func_80B55444(this, globalCtx); +} + +void func_80B55780(EnZl3* this, GlobalContext* globalCtx) { + osSyncPrintf("ゼルダ姫のEn_Zl3_Actor_inFinal2_Init通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + func_80B54E14(this, &D_06005A0C, 0, 0.0f, 0); + this->action = 7; + this->drawConfig = 1; + osSyncPrintf("ゼルダ姫のEn_Zl3_Actor_inFinal2_Initは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + func_80B53568(this, 1); + this->actor.flags &= ~1; +} + +void func_80B55808(EnZl3* this) { + func_80078914(&this->actor.projectedPos, NA_SE_VO_Z1_PAIN); +} + +void func_80B5582C(EnZl3* this) { + func_800F41E0(&D_80B5A488, NA_SE_VO_Z1_CRY_0, 2); +} + +void func_80B5585C(EnZl3* this) { + SkelAnime* skelAnime = &this->skelAnime; + + if ((skelAnime->mode == 2) && func_800A56C8(skelAnime, 4.0f)) { + func_80078914(&this->actor.projectedPos, NA_SE_VO_Z1_PAIN); + } +} + +void func_80B558A8(EnZl3* this) { + s32 pad[4]; + s16 thisRotY = this->actor.posRot.rot.y; + Vec3f* unk_338 = &this->unk_338; + Vec3f thisPos = this->actor.posRot.pos; + + this->unk_32C = thisPos; + *unk_338 = thisPos; + + unk_338->z += ((-1.6073999404907227f) * Math_Coss(thisRotY)) - (3.1620006561279297f * Math_Sins(thisRotY)); + unk_338->x += ((-1.6073999404907227f) * Math_Sins(thisRotY)) + (3.1620006561279297f * Math_Coss(thisRotY)); + unk_338->y += -0.01219940185546875f; +} + +void func_80B559C4(EnZl3* this) { + Vec3f* thisPos = &this->actor.posRot.pos; + Vec3f* unk_32C = &this->unk_32C; + Vec3f* unk_338 = &this->unk_338; + f32 temp_f0 = func_8006F9BC(SkelAnime_GetFrameCount(&D_06005248.genericHeader), 0, + (s32)this->skelAnime.animCurrentFrame, 3, 3); + + thisPos->x = unk_32C->x + (temp_f0 * (unk_338->x - unk_32C->x)); + thisPos->z = unk_32C->z + (temp_f0 * (unk_338->z - unk_32C->z)); +} + +void func_80B55A58(EnZl3* this, GlobalContext* globalCtx) { + if (globalCtx->activeCamera == 0) { + func_80B537E8(this); + } +} + +void func_80B55A84(EnZl3* this) { + func_80B54E14(this, &D_06005A0C, 0, 0.0f, 0); + this->action = 7; +} + +void func_80B55AC4(EnZl3* this) { + func_80B54E14(this, &D_0600499C, 2, -8.0f, 0); + this->action = 8; +} + +void func_80B55B04(EnZl3* this, s32 arg1) { + if (arg1 != 0) { + func_80B54E14(this, &D_06004408, 0, 0.0f, 0); + } +} + +void func_80B55B38(EnZl3* this) { + func_80B54E14(this, &D_06006508, 2, -8.0f, 0); + this->action = 9; +} + +void func_80B55B78(EnZl3* this, s32 arg1) { + if (arg1 != 0) { + func_80B54E14(this, &D_060061C4, 0, 0.0f, 0); + } +} + +void func_80B55BAC(EnZl3* this) { + func_80B54E14(this, &D_06005248, 2, -8.0f, 0); + func_80B558A8(this); + func_80B55808(this); + func_80B53568(this, 2); + this->action = 10; +} + +void func_80B55C0C(EnZl3* this) { + func_80B54E14(this, &D_060054E0, 0, 0.0f, 0); + this->action = 11; +} + +void func_80B55C4C(EnZl3* this, s32 arg1) { + if (arg1 != 0) { + func_80B55C0C(this); + } +} + +void func_80B55C70(EnZl3* this) { + func_80B54E14(this, &D_06008684, 2, -8.0f, 0); + this->action = 12; + this->actor.flags &= ~0x9; + this->actor.flags &= ~0x1; +} + +void func_80B55CCC(EnZl3* this, s32 arg1) { + if (arg1 != 0) { + func_80B54E14(this, &D_06006F04, 0, 0.0f, 0); + } +} + +void func_80B55D00(EnZl3* this, GlobalContext* globalCtx) { + if (func_8002F194(&this->actor, globalCtx)) { + this->action = 13; + } else if (ABS((s16)(this->actor.yawTowardsLink - this->actor.shape.rot.y)) <= 0x4300) { + this->actor.flags |= 9; + this->actor.flags |= 1; + this->actor.textId = 0x70D5; + func_8002F2F4(&this->actor, globalCtx); + } else { + this->actor.flags &= ~9; + this->actor.flags &= ~1; + } +} + +void func_80B55DB0(EnZl3* this, GlobalContext* globalCtx) { + if (func_8010BDBC(&globalCtx->msgCtx) == 2) { + this->actor.flags &= ~0x9; + this->actor.flags &= ~0x1; + this->action = 12; + } +} + +void func_80B55E08(EnZl3* this) { + func_80B54E14(this, &D_06006AB0, 2, -8.0f, 0); + this->action = 14; +} + +void func_80B55E48(EnZl3* this, s32 arg1) { + if (arg1 != 0) { + func_80B54E14(this, &D_06008050, 0, 0.0f, 0); + } +} + +void func_80B55E7C(EnZl3* this) { + func_80B54E14(this, &D_06007A78, 2, -8.0f, 0); + this->action = 15; +} + +void func_80B55EBC(EnZl3* this, s32 arg1) { + if (arg1 != 0) { + func_80B54E14(this, &D_06007C84, 0, 0.0f, 0); + } +} + +void func_80B55EF0(EnZl3* this) { + func_80B54E14(this, &D_060082F8, 2, -8.0f, 0); + this->action = 16; + func_80B53568(this, 0); +} + +void func_80B55F38(EnZl3* this, s32 arg1) { + if (arg1 != 0) { + func_80B54E14(this, &D_06003FF8, 0, 0.0f, 0); + } +} + +void func_80B55F6C(EnZl3* this, GlobalContext* globalCtx) { + if (func_8002F194(&this->actor, globalCtx)) { + this->action = 0x12; + } else if (ABS((s16)(this->actor.yawTowardsLink - this->actor.shape.rot.y)) <= 0x4300) { + BossGanon2* bossGanon2 = func_80B53488(this, globalCtx); + + if ((bossGanon2 != NULL) && (bossGanon2->unk_324 <= 0.12345679104328156f)) { + this->actor.flags |= 9; + this->actor.flags |= 1; + this->actor.textId = 0x7059; + func_8002F2F4(&this->actor, globalCtx); + } + } else { + this->actor.flags &= ~9; + this->actor.flags &= ~1; + } +} + +void func_80B5604C(EnZl3* this) { + func_80B54E14(this, &D_06007664, 2, -8.0f, 0); + this->action = 17; + func_80B5582C(this); +} + +void func_80B56090(EnZl3* this, s32 arg1) { + s32* unk_2F0 = &this->unk_2F0; + + if (func_80B5396C(this) == *unk_2F0) { + if (arg1 != 0) { + func_80B54E14(this, &D_06003FF8, 0, 0.0f, 0); + this->action = 16; + func_80B53974(this, 7); + this->unk_2F0 = 7; + } + } +} + +void func_80B56108(EnZl3* this, GlobalContext* globalCtx) { + if (func_8010BDBC(&globalCtx->msgCtx) == 2) { + this->actor.flags &= ~0x9; + this->actor.flags &= ~0x1; + this->action = 16; + } +} + +void func_80B56160(EnZl3* this) { + func_80B54E14(this, &D_060001D8, 0, 0.0f, 0); + this->action = 19; +} + +void func_80B561A0(EnZl3* this) { + func_80B54E14(this, &D_06001110, 2, -8.0f, 0); + this->action = 20; +} + +void func_80B561E0(EnZl3* this, s32 arg1) { + if (arg1 != 0) { + func_80B54E14(this, &D_060004F4, 0, 0.0f, 0); + } +} + +void func_80B56214(EnZl3* this, GlobalContext* globalCtx) { + if (func_8002F194(&this->actor, globalCtx)) { + this->action = 21; + } else if (ABS((s16)(this->actor.yawTowardsLink - this->actor.shape.rot.y)) <= 0x4300) { + BossGanon2* bossGanon2 = func_80B53488(this, globalCtx); + + if (bossGanon2 != NULL) { + if (bossGanon2->unk_324 <= 0.12345679104328156f) { + this->actor.flags |= 9; + this->actor.flags |= 1; + this->actor.textId = 0x7059; + func_8002F2F4(&this->actor, globalCtx); + } + } + } else { + this->actor.flags &= ~9; + this->actor.flags &= ~1; + } +} + +void func_80B562F4(EnZl3* this, GlobalContext* globalCtx) { + if (func_8010BDBC(&globalCtx->msgCtx) == 2) { + this->actor.flags &= ~0x9; + this->actor.flags &= ~0x1; + this->action = 20; + } +} + +void func_80B5634C(EnZl3* this) { + func_80B54E14(this, &D_06002348, 2, -8.0f, 0); + this->action = 22; +} + +void func_80B5638C(EnZl3* this, s32 arg1) { + if (arg1 != 0) { + func_80B54E14(this, &D_0600210C, 0, 0.0f, 0); + } +} + +void func_80B563C0(EnZl3* this) { + func_80B54E14(this, &D_06002E54, 2, -8.0f, 0); + this->action = 23; +} + +void func_80B56400(EnZl3* this, s32 arg1) { + if (arg1 != 0) { + func_80B54E14(this, &D_06002710, 0, 0.0f, 0); + } +} + +void func_80B56434(EnZl3* this) { + func_80B54E14(this, &D_06001D8C, 2, -8.0f, 0); + this->action = 24; +} + +void func_80B56474(EnZl3* this, s32 arg1) { + if (arg1 != 0) { + func_80B54E14(this, &D_060014DC, 0, 0.0f, 0); + } +} + +void func_80B564A8(EnZl3* this, GlobalContext* globalCtx) { + s32 temp_v0; + s32* val = &D_80B5A494; + + temp_v0 = func_80B5396C(this); + + if (*val > 0) { + *val -= 1; + } else if (*val == 0) { + *val -= 1; + if (temp_v0 == 8) { + func_80B5604C(this); + } + } + + if (temp_v0 >= 0) { + s32 unk_2F0 = this->unk_2F0; + + if (temp_v0 != unk_2F0) { + switch (temp_v0) { + case 0: + func_80B55A84(this); + break; + case 1: + func_80B55AC4(this); + break; + case 2: + func_80B55B38(this); + break; + case 3: + func_80B55BAC(this); + break; + case 4: + func_80B55C70(this); + break; + case 5: + func_80B55E08(this); + break; + case 6: + func_80B55E7C(this); + break; + case 7: + func_80B55EF0(this); + break; + case 8: + *val = 10; + break; + case 9: + func_80B56160(this); + break; + case 10: + func_80B561A0(this); + break; + case 11: + func_80B5634C(this); + break; + case 12: + func_80B563C0(this); + break; + case 13: + func_80B56434(this); + break; + case 14: + Actor_Kill(&this->actor); + break; + default: + osSyncPrintf("En_Zl3_inFinal2_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + } + this->unk_2F0 = temp_v0; + } + } +} + +void func_80B56658(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + EnZl3_FrameUpdateMatrix(this); + func_80B564A8(this, globalCtx); +} + +void func_80B566AC(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + func_80B55B04(this, EnZl3_FrameUpdateMatrix(this)); + func_80B564A8(this, globalCtx); +} + +void func_80B5670C(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + func_80B55B78(this, EnZl3_FrameUpdateMatrix(this)); + func_80B564A8(this, globalCtx); +} + +void func_80B5676C(EnZl3* this, GlobalContext* globalCtx) { + s32 something; + + func_80B54DE0(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + something = EnZl3_FrameUpdateMatrix(this); + func_80B559C4(this); + func_80B55C4C(this, something); +} + +void func_80B567CC(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B533FC(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + EnZl3_FrameUpdateMatrix(this); + func_80B564A8(this, globalCtx); +} + +void func_80B5682C(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B55A58(this, globalCtx); + func_80B533FC(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + func_80B55CCC(this, EnZl3_FrameUpdateMatrix(this)); + func_80B564A8(this, globalCtx); + func_80B55D00(this, globalCtx); +} + +void func_80B568B4(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B537E8(this); + func_80B533FC(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + EnZl3_FrameUpdateMatrix(this); + func_80B55DB0(this, globalCtx); +} + +void func_80B5691C(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + func_80B55E48(this, EnZl3_FrameUpdateMatrix(this)); + func_80B564A8(this, globalCtx); +} + +void func_80B5697C(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + func_80B55EBC(this, EnZl3_FrameUpdateMatrix(this)); + func_80B5585C(this); + func_80B564A8(this, globalCtx); +} + +void func_80B569E4(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B533FC(this, globalCtx); + func_80B537E8(this); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + func_80B55F38(this, EnZl3_FrameUpdateMatrix(this)); + func_80B564A8(this, globalCtx); + func_80B55F6C(this, globalCtx); +} + +void func_80B56A68(EnZl3* this, GlobalContext* globalCtx) { + s32 something; + + func_80B54DE0(this, globalCtx); + func_80B533FC(this, globalCtx); + func_80B537E8(this); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + something = EnZl3_FrameUpdateMatrix(this); + func_80B564A8(this, globalCtx); + func_80B56090(this, something); +} + +void func_80B56AE0(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B533FC(this, globalCtx); + func_80B537E8(this); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + func_80B55F38(this, EnZl3_FrameUpdateMatrix(this)); + func_80B56108(this, globalCtx); +} + +void func_80B56B54(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + EnZl3_FrameUpdateMatrix(this); + func_80B564A8(this, globalCtx); +} + +void func_80B56BA8(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B533FC(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + func_80B561E0(this, EnZl3_FrameUpdateMatrix(this)); + func_80B564A8(this, globalCtx); + func_80B56214(this, globalCtx); +} + +void func_80B56C24(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B533FC(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + EnZl3_FrameUpdateMatrix(this); + func_80B562F4(this, globalCtx); +} + +void func_80B56C84(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + func_80B5638C(this, EnZl3_FrameUpdateMatrix(this)); + func_80B564A8(this, globalCtx); +} + +void func_80B56CE4(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + func_80B56400(this, EnZl3_FrameUpdateMatrix(this)); + func_80B564A8(this, globalCtx); +} + +void func_80B56D44(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + func_80B56474(this, EnZl3_FrameUpdateMatrix(this)); + func_80B564A8(this, globalCtx); +} + +void func_80B56DA4(EnZl3* this) { + func_800788CC(NA_SE_EV_ZELDA_POWER); +} + +void func_80B56DC8(EnZl3* this) { + func_80078914(&this->actor.projectedPos, NA_SE_VO_Z1_PAIN); +} + +void func_80B56DEC(EnZl3* this) { + SkelAnime* skelAnime = &this->skelAnime; + + if ((skelAnime->mode == 2) && func_800A56C8(skelAnime, 9.0f) != 0) { + func_80078914(&this->actor.projectedPos, NA_SE_VO_Z1_OPENDOOR); + } +} + +void func_80B56E38(EnZl3* this, GlobalContext* globalCtx) { + s32 pad[2]; + s32 sfxId; + SkelAnime* sp20 = &this->skelAnime; + + if ((func_800A56C8(sp20, 6.0f) || func_800A56C8(sp20, 0.0f)) && (this->actor.bgCheckFlags & 1)) { + sfxId = 0x800; + sfxId += func_80041F34(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorPolySource); + func_80078914(&this->actor.projectedPos, sfxId); + } +} + +void func_80B56EB8(EnZl3* this, GlobalContext* globalCtx) { + Flags_SetSwitch(globalCtx, func_80B54DB4(this)); +} + +s32 func_80B56EE4(EnZl3* this, GlobalContext* globalCtx) { + return Flags_GetSwitch(globalCtx, func_80B54DB4(this)); +} + +void func_80B56F10(EnZl3* this, GlobalContext* globalCtx) { + s32 waypoint; + Path* pathHead = globalCtx->setupPathList; + + if (pathHead != NULL) { + waypoint = func_80B54DC4(this); + pathHead += waypoint; + this->unk_30C = pathHead; + this->unk_310 = pathHead->count; + osSyncPrintf("En_Zl3_Get_path_info レールデータをゲットだぜ = %d!!!!!!!!!!!!!!\n", waypoint); + } else { + osSyncPrintf("En_Zl3_Get_path_info レールデータが無い!!!!!!!!!!!!!!!!!!!!\n"); + } +} + +s32 func_80B56F8C(EnZl3* this, s32 arg1) { + s32 unk_310 = this->unk_310; + + if (unk_310 > arg1) { + return 1; + } + return 0; +} + +Vec3s* func_80B56FAC(EnZl3* this, s32 arg1) { + Vec3s* point; + Path* pathList = this->unk_30C; + + if ((pathList != NULL) && func_80B56F8C(this, arg1)) { + point = &((Vec3s*)SEGMENTED_TO_VIRTUAL(pathList->points))[arg1]; + return point; + } + return NULL; +} + +s32 func_80B57034(EnZl3* this, s32 arg1, s32 arg2) { + Vec3s* vec1 = func_80B56FAC(this, arg1); + Vec3s* vec2 = func_80B56FAC(this, arg2); + + if ((vec2 != NULL) && (vec1 != NULL)) { + f32 xDiff = vec2->x - vec1->x; + f32 zDiff = vec2->z - vec1->z; + + return ((xDiff == 0.0f) && (zDiff == 0.0f)) ? 0 : (s16)(Math_atan2f(xDiff, zDiff) * 10430.3779296875f); + } + return 0; +} + +s16 func_80B57104(EnZl3* this, s32 arg1) { + Vec3s* point = func_80B56FAC(this, arg1); + + if (point != NULL) { + f32 xDiff = point->x - this->actor.posRot.pos.x; + f32 zDiff = point->z - this->actor.posRot.pos.z; + + if ((xDiff != 0.0f) || (zDiff != 0.0f)) { + return Math_atan2f(xDiff, zDiff) * (0x8000 / M_PI); + } + } + return 0; +} + +s32 func_80B571A8(EnZl3* this) { + s32 pad; + s32 unk_314 = this->unk_314; + s32 pad2; + + if (func_80B56F8C(this, unk_314 + 1) == 0) { + return this->actor.shape.rot.y; + } else { + return func_80B57034(this, unk_314, unk_314 + 1); + } +} + +s32 func_80B571FC(EnZl3* this) { + s32 pad; + s32 unk_314 = this->unk_314; + + if (func_80B56F8C(this, unk_314) == 0) { + return this->actor.shape.rot.y; + } else { + return func_80B57104(this, unk_314); + } +} + +void func_80B57240(EnZl3* this) { + s32 temp_a1 = func_80B571FC(this); + s16* rotY = &this->actor.posRot.rot.y; + + Math_SmoothScaleMaxMinS(rotY, temp_a1, 2, 6400, 1000); + this->actor.shape.rot.y = *rotY; +} + +void func_80B57298(EnZl3* this) { + s16* rotY = &this->actor.posRot.rot.y; + s16 temp_a1 = func_80B571A8(this); + + Math_SmoothScaleMaxMinS(rotY, temp_a1, 2, 6400, 1000); + this->actor.shape.rot.y = *rotY; +} + +u16 func_80B572F0(GlobalContext* globalCtx) { + s16 sceneNum = globalCtx->sceneNum; + u16 ret; + + if (sceneNum == SCENE_GANON_SONOGO) { + ret = 0x71A8; + } else if (sceneNum == SCENE_GANON_FINAL) { + ret = 0x71A9; + } else { + ret = 0x71AB; + } + return ret; +} + +s32 func_80B57324(EnZl3* this, GlobalContext* globalCtx) { + if (func_8002F194(&this->actor, globalCtx)) { + return 1; + } + return 0; +} + +void func_80B57350(EnZl3* this, GlobalContext* globalCtx) { + s16 temp_v0 = this->actor.yawTowardsLink - this->actor.shape.rot.y; + + if (ABS(temp_v0) <= 0x4300) { + this->actor.flags |= 9; + this->actor.textId = func_80B572F0(globalCtx); + func_8002F2F4(&this->actor, globalCtx); + } +} + +s32 func_80B573C8(EnZl3* this, GlobalContext* globalCtx) { + if (func_8010BDBC(&globalCtx->msgCtx) == 2) { + return 1; + } + return 0; +} + +s32 func_80B573FC(EnZl3* this, GlobalContext* globalCtx, f32 arg2) { + Player* player = PLAYER; + f32 playerX = player->actor.posRot.pos.x; + f32 playerZ = player->actor.posRot.pos.z; + f32 thisX = this->actor.posRot.pos.x; + f32 thisZ = this->actor.posRot.pos.z; + + if (SQ(playerX - thisX) + SQ(playerZ - thisZ) < SQ(arg2)) { + return 1; + } + return 0; +} + +s32 func_80B57458(EnZl3* this, GlobalContext* globalCtx) { + Vec3f* thisPos = &this->actor.posRot.pos; + f32 thisX = thisPos->x; + f32 thisZ = thisPos->z; + Player* player = PLAYER; + Vec3f* playerPos = &player->actor.posRot.pos; + s32 pad; + f32 playerX = playerPos->x; + f32 playerZ = playerPos->z; + f32 temp_f12 = playerX - thisX; + f32 temp_f13 = playerZ - thisZ; + s16 temp_v0; + s16 temp_v1 = func_80B571A8(this); + + if (temp_f12 == 0.0f && temp_f13 == 0.0f) { + return 1; + } + + temp_v0 = (s16)(temp_v1 - (s16)(Math_atan2f(temp_f12, temp_f13) * 10430.3779296875f)); + + if (temp_v0 < 0x1555) { + return 1; + } else if ((temp_v0 < 0x4000) && func_80B573FC(this, globalCtx, 150.0f)) { + return 1; + } else { + return 0; + } +} + +s32 func_80B57564(EnZl3* this, GlobalContext* globalCtx) { + if (func_80B573FC(this, globalCtx, 50.0f) || func_80B57458(this, globalCtx)) { + return 1; + } + return 0; +} + +s32 func_80B575B0(EnZl3* this, GlobalContext* globalCtx) { + return func_80B573FC(this, globalCtx, 150.0f); +} + +s32 func_80B575D0(EnZl3* this, GlobalContext* globalCtx) { + return func_80B573FC(this, globalCtx, 50.0f); +} + +s32 func_80B575F0(EnZl3* this, GlobalContext* globalCtx) { + s16 sceneNum = globalCtx->sceneNum; + + if ((sceneNum == SCENE_GANON_SONOGO) && (func_80B54DB4(this) == 0x26)) { + s32 unk_314 = this->unk_314; + if (unk_314 == 1) { + return 1; + } + } + return 0; +} + +void func_80B5764C(EnZl3* this, GlobalContext* globalCtx) { + s16 sceneNum = globalCtx->sceneNum; + + if ((sceneNum == SCENE_GANON_SONOGO) && (func_80B54DB4(this) == 0x26)) { + s32 unk_314 = this->unk_314 + 1; + if (unk_314 == 1) { + if (!Gameplay_InCsMode(globalCtx)) { + func_800800F8(globalCtx, 0x3E8, 0x28, &this->actor, 0); + } + } + } +} + +s32 func_80B576C8(EnZl3* this, GlobalContext* globalCtx) { + if (func_80B575F0(this, globalCtx) && (this->unk_3D8 == 0)) { + return 1; + } + return 0; +} + +void func_80B57704(EnZl3* this, GlobalContext* globalCtx) { + s32 unk_3C4 = this->unk_3C4; + + Flags_SetSwitch(globalCtx, unk_3C4); +} + +void func_80B5772C(EnZl3* this, GlobalContext* globalCtx) { + s32 unk_3C4 = this->unk_3C4; + + Flags_UnsetSwitch(globalCtx, unk_3C4); +} + +void func_80B57754(EnZl3* this, GlobalContext* globalCtx) { + if (gSaveContext.unk_13F0 == 0) { + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_OCEFF_WIPE4, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 1); + func_80B56DA4(this); + } +} + +void func_80B577BC(GlobalContext* globalCtx, Vec3f* vec) { + s32 pad; + Player* player = PLAYER; + Vec3f* playerPos = &player->actor.posRot.pos; + f32 posX = vec->x; + f32 posY = vec->y; + f32 posZ = vec->z; + + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_TEST, posX, posY, posZ, 0, + (Math_atan2f(playerPos->x - posX, playerPos->z - posZ) * 10430.3779296875f), 0, 5); +} + +void func_80B57858(GlobalContext* globalCtx) { + func_80B577BC(globalCtx, &D_80B5A498); + func_80B577BC(globalCtx, &D_80B5A4A4); +} + +s32 func_80B57890(EnZl3* this, GlobalContext* globalCtx) { + s8 pad[2]; + u8 curSpawn = globalCtx->curSpawn; + s16 sceneNum = globalCtx->sceneNum; + s32 result = func_80B54DB4(this); + + if (globalCtx) {} // Needed to match, this if can be almost anywhere and it still matches + + if (sceneNum == SCENE_GANON_SONOGO) { + if ((result == 0x24) && (curSpawn == 0)) { + return 1; + } + if ((result == 0x25) && (curSpawn == 2)) { + return 1; + } + if ((result == 0x26) && (curSpawn == 4)) { + return 1; + } + if ((result == 0x27) && (curSpawn == 6)) { + return 1; + } + if ((result == 0x28) && (curSpawn == 6)) { + return 1; + } + } else if (sceneNum == SCENE_GANON_FINAL) { + if ((result == 0x20) && (curSpawn == 0) && Flags_GetSwitch(globalCtx, 0x37)) { + if ((globalCtx->sceneNum == SCENE_GANON_DEMO) || (globalCtx->sceneNum == SCENE_GANON_FINAL) || + (globalCtx->sceneNum == SCENE_GANON_SONOGO) || (globalCtx->sceneNum == SCENE_GANONTIKA_SONOGO)) { + return 1; + } + } + if ((result == 0x21) && (curSpawn == 2)) { + return 1; + } + if ((result == 0x22) && (curSpawn == 4)) { + return 1; + } + if ((result == 0x23) && (curSpawn == 6)) { + return 1; + } + } else if (sceneNum == SCENE_GANONTIKA_SONOGO) { + if ((result == 0x29) && (curSpawn == 0)) { + return 1; + } + if ((result == 0x2A) && (curSpawn == 0)) { + return 1; + } + } + return 0; +} + +void func_80B57A74(GlobalContext* globalCtx) { + Actor* actorIt = globalCtx->actorCtx.actorList[ACTORTYPE_PROP].first; + + while (actorIt != NULL) { + if (actorIt->id == ACTOR_EN_ENCOUNT2) { + ((EnEncount2*)actorIt)->unk_15C = 1; + } + actorIt = actorIt->next; + } +} + +void func_80B57AAC(EnZl3* this, s32 arg1, AnimationHeader* arg2) { + if (arg1 != 0) { + func_80B54E14(this, arg2, 0, -8.0f, 0); + } +} + +void func_80B57AE0(EnZl3* this, GlobalContext* globalCtx) { + s32 pad; + s16 shapeRotY = this->actor.shape.rot.y; + s32 pad2; + Vec3f* unk_354 = &this->unk_354; + Vec3f* unk_348 = &this->unk_348; + Vec3s* temp_v0; + f32 xDiff; + f32 zDiff; + + this->unk_344 = 0; + this->unk_314 += 1; + this->unk_360 = 0.0f; + this->unk_364 = 0.0f; + this->unk_368 = 0.0f; + *unk_348 = this->actor.posRot.pos; + temp_v0 = func_80B56FAC(this, this->unk_314); + + if (temp_v0 != NULL) { + unk_354->x = temp_v0->x; + unk_354->y = temp_v0->y; + unk_354->z = temp_v0->z; + } else { + unk_354->x = unk_348->x + (Math_Sins(shapeRotY) * 200.0f); + unk_354->y = unk_348->y; + unk_354->z = unk_348->z + (Math_Coss(shapeRotY) * 200.0f); + } + + xDiff = unk_354->x - unk_348->x; + zDiff = unk_354->z - unk_348->z; + this->unk_346 = (s32)(sqrtf(SQ(xDiff) + SQ(zDiff)) / (kREG(6) + 8.0f)); +} + +s32 func_80B57C54(EnZl3* this) { + if (this->unk_344 >= this->unk_346) { + return 1; + } + return 0; +} + +s32 func_80B57C7C(EnZl3* this, GlobalContext* globalCtx) { + return 1; +} + +s32 func_80B57C8C(EnZl3* this) { + return !func_80B56F8C(this, this->unk_314 + 2); +} + +void func_80B57CB4(EnZl3* this, GlobalContext* globalCtx) { + Vec3f* unk_348 = &this->unk_348; + Vec3f* unk_354 = &this->unk_354; + Vec3f* thisPos = &this->actor.posRot.pos; + f32 temp_f0; + + this->unk_344 += 1; + temp_f0 = func_8006F9BC(this->unk_346, 0, this->unk_344, 3, 3); + thisPos->x = unk_348->x + (temp_f0 * (unk_354->x - unk_348->x)); + thisPos->y = (unk_348->y + (temp_f0 * (unk_354->y - unk_348->y))) + this->unk_360; + thisPos->z = unk_348->z + (temp_f0 * (unk_354->z - unk_348->z)); +} + +void func_80B57D60(EnZl3* this, GlobalContext* globalCtx) { + func_80B57240(this); +} + +s32 func_80B57D80(EnZl3* this, GlobalContext* globalCtx) { + s32 pad; + s16* sp32 = &this->actor.shape.rot.y; + struct_80034A14_arg1* unk_3F8 = &this->unk_3F8; + Player* player = PLAYER; + s32 unk_314 = this->unk_314; + s16 temp_v0 = func_80B57104(this, unk_314); + s32 pad2; + s16 phi_v1; + + unk_3F8->unk_18.y = player->actor.posRot.pos.y; + unk_3F8->unk_18.x = (Math_Sins(temp_v0) * this->actor.xzDistFromLink) + this->actor.posRot.pos.x; + unk_3F8->unk_18.z = (Math_Coss(temp_v0) * this->actor.xzDistFromLink) + this->actor.posRot.pos.z; + unk_3F8->unk_14 = kREG(16) - 16.0f; + func_80034A14(&this->actor, unk_3F8, kREG(17) + 0xC, 4); + + phi_v1 = ABS(temp_v0 - *sp32); + if (phi_v1 <= 0x320) { + *sp32 = temp_v0; + this->actor.posRot.rot.y = *sp32; + phi_v1 = 0; + } + this->actor.posRot.rot.y = *sp32; + return phi_v1; +} + +void func_80B57EAC(EnZl3* this, GlobalContext* globalCtx) { + if (func_80B57324(this, globalCtx)) { + this->action = 26; + } else { + func_80B57350(this, globalCtx); + } +} + +void func_80B57EEC(EnZl3* this, GlobalContext* globalCtx) { + if (func_80B573C8(this, globalCtx)) { + this->action = 27; + } +} + +void func_80B57F1C(EnZl3* this, GlobalContext* globalCtx) { + if (func_80B57D80(this, globalCtx) == 0) { + func_80B54E14(this, &D_06009BE4, 0, -8.0f, 0); + this->action = 34; + this->unk_314 -= 1; + func_80B57AE0(this, globalCtx); + } +} + +s32 func_80B57F84(EnZl3* this, GlobalContext* globalCtx) { + if (func_80B575D0(this, globalCtx) && func_80B57C7C(this, globalCtx) && !Gameplay_InCsMode(globalCtx)) { + func_80B54E14(this, &D_06009FBC, 0, -8.0f, 0); + this->action = 36; + this->unk_2EC = 0.0f; + func_80B57A74(globalCtx); + return 1; + } + return 0; +} + +void func_80B58014(EnZl3* this, GlobalContext* globalCtx) { + s32 pad; + Player* player = PLAYER; + s8 invincibilityTimer = player->invincibilityTimer; + + if (func_80B57324(this, globalCtx)) { + func_80B54E14(this, &D_06003FF8, 0, -11.0f, 0); + this->action = 29; + func_80B538B0(this); + } else if (func_80B57C8C(this) && func_80B57F84(this, globalCtx)) { + func_800800F8(globalCtx, 0xFA0, -0x63, &this->actor, 0); + this->unk_3D0 = 0; + } else if (func_80B576C8(this, globalCtx) && func_80B575B0(this, globalCtx) && !Gameplay_InCsMode(globalCtx)) { + this->action = 0x1F; + this->unk_3CC = 0.0f; + func_80B537E8(this); + this->unk_3D8 = 1; + func_800800F8(globalCtx, 0xFAA, -0x63, &this->actor, 0); + } else if (!func_80B57C8C(this) && !func_80B576C8(this, globalCtx) && func_80B57564(this, globalCtx)) { + func_80B54E14(this, &D_06009BE4, 0, -8.0f, 0); + func_80B5764C(this, globalCtx); + this->action = 34; + this->unk_3D0 = 0; + func_80B57AE0(this, globalCtx); + } else if ((invincibilityTimer > 0) || (player->fallDistance >= 0x33)) { + func_80B54E14(this, &D_06007664, 0, -11.0f, 0); + this->action = 30; + func_80B537E8(this); + func_80B56DC8(this); + } else { + func_80B57350(this, globalCtx); + func_80B538B0(this); + } +} + +void func_80B58214(EnZl3* this, GlobalContext* globalCtx) { + if (func_80B573C8(this, globalCtx)) { + func_80B54E14(this, &D_06009FBC, 0, -11.0f, 0); + this->action = 28; + this->unk_3D0 = 0; + } +} + +void func_80B58268(EnZl3* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s8 invincibilityTimer = player->invincibilityTimer; + + if ((invincibilityTimer <= 0) && (player->fallDistance <= 50)) { + func_80B54E14(this, &D_06009FBC, 0, -11.0f, 0); + this->action = 28; + this->unk_3D0 = 0; + } +} + +void func_80B582C8(EnZl3* this, GlobalContext* globalCtx) { + f32* unk_3CC = &this->unk_3CC; + s32 pad; + + if (*unk_3CC == kREG(14) + 10.0f) { + *unk_3CC += 1.0f; + func_80B54E14(this, &D_06008050, 0, -12.0f, 0); + func_80B57704(this, globalCtx); + } else if (*unk_3CC == kREG(15) + 20.0f) { + *unk_3CC += 1.0f; + func_80B56DC8(this); + func_80B54E14(this, &D_06003FF8, 0, -12.0f, 0); + } else if (*unk_3CC == kREG(16) + 30.0f) { + *unk_3CC += 1.0f; + func_80B57858(globalCtx); + } else if (*unk_3CC == kREG(17) + 40.0f) { + func_8005B1A4(ACTIVE_CAM); + *unk_3CC += 1.0f; + } else if (*unk_3CC >= ((kREG(17) + 40.0f) + 1.0f)) { + this->action = 32; + *unk_3CC = 0.0f; + } else { + *unk_3CC += 1.0f; + } +} + +void func_80B584B4(EnZl3* this, GlobalContext* globalCtx) { + s32 pad; + Player* player = PLAYER; + s8 invincibilityTimer = player->invincibilityTimer; + Actor* nearbyEnTest = Actor_FindNearby(globalCtx, &this->actor, ACTOR_EN_TEST, ACTORTYPE_ENEMY, 8000.0f); + + if (D_80B5A4BC == 0) { + if ((nearbyEnTest == NULL) && (!Gameplay_InCsMode(globalCtx))) { + this->action = 33; + func_800800F8(globalCtx, 0xFAB, -0x63, &this->actor, 0); + } else if (invincibilityTimer > 0) { + func_80B54E14(this, &D_06003FF8, 0, -12.0f, 0); + D_80B5A4BC = 1; + func_80B56DC8(this); + } + } else { + if ((nearbyEnTest == NULL) && (!Gameplay_InCsMode(globalCtx))) { + func_80B54E14(this, &D_06007664, 0, -12.0f, 0); + D_80B5A4BC = 0; + this->action = 33; + func_800800F8(globalCtx, 0xFAB, -0x63, &this->actor, 0); + } else if (invincibilityTimer <= 0) { + func_80B54E14(this, &D_06007664, 0, -12.0f, 0); + D_80B5A4BC = 0; + } + } +} + +void func_80B58624(EnZl3* this, GlobalContext* globalCtx) { + s32 pad[4]; + f32* unk_3CC = &this->unk_3CC; + + if (*unk_3CC == (kREG(18) + 10.0f)) { + *unk_3CC += 1.0f; + func_80B54E14(this, &D_06008050, 0, -12.0f, 0); + func_80B5772C(this, globalCtx); + } else if (*unk_3CC == kREG(19) + 20.0f) { + *unk_3CC += 1.0f; + this->actor.textId = 0x71AC; + func_8010B680(globalCtx, this->actor.textId, 0); + func_80B54E14(this, &D_06003FF8, 0, -12.0f, 0); + } else if (*unk_3CC == ((kREG(19) + 20.0f) + 1.0f)) { + if (func_8010BDBC(&globalCtx->msgCtx) == 2) { + *unk_3CC += 1.0f; + func_80B5357C(this, globalCtx); + func_80B5357C(this, globalCtx); + func_80B5357C(this, globalCtx); + func_80B5357C(this, globalCtx); + func_80B5357C(this, globalCtx); + } + } else { + if (*unk_3CC >= kREG(20) + 30.0f) { + this->action = 28; + func_8005B1A4(ACTIVE_CAM); + func_80B54E14(this, &D_06009FBC, 0, -12.0f, 0); + *unk_3CC = 0.0f; + } else { + *unk_3CC += 1.0f; + } + } +} + +void func_80B5884C(EnZl3* this, GlobalContext* globalCtx) { + func_80B54E14(this, &D_060038C0, 2, -8.0f, 0); + this->action = 37; + this->unk_36C = 1; +} + +void func_80B58898(EnZl3* this, GlobalContext* globalCtx) { + func_80B54E14(this, &D_060038C0, 2, -8.0f, 1); + this->action = 38; + this->unk_374 = 1; +} + +void func_80B588E8(EnZl3* this, GlobalContext* globalCtx) { + func_80B54E14(this, &D_06009BE4, 0, -8.0f, 0); + func_80B57AE0(this, globalCtx); + this->action = 39; +} + +s32 func_80B58938(EnZl3* this, GlobalContext* globalCtx) { + if (func_80B57C54(this)) { + func_80B54E14(this, &D_06009FBC, 0, -8.0f, 0); + this->action = 28; + this->unk_3D0 = 0; + return 1; + } + return 0; +} + +s32 func_80B5899C(EnZl3* this, GlobalContext* globalCtx) { + if ((this->actor.bgCheckFlags & 1)) { + Player* player = PLAYER; + s8 invincibilityTimer = player->invincibilityTimer; + + if ((invincibilityTimer > 0) || (player->fallDistance >= 0x33)) { + func_80B54E14(this, &D_06007664, 2, -11.0f, 0); + this->action = 35; + func_80B56DC8(this); + return 1; + } + } + return 0; +} + +void func_80B58A1C(EnZl3* this, GlobalContext* globalCtx) { + if (!func_80B58938(this, globalCtx)) { + func_80B5899C(this, globalCtx); + } +} + +void func_80B58A50(EnZl3* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s8 invincibilityTimer = player->invincibilityTimer; + + if ((invincibilityTimer <= 0) && (player->fallDistance <= 50)) { + func_80B54E14(this, &D_06009BE4, 0, -11.0f, 0); + this->action = 34; + } +} + +void func_80B58AAC(EnZl3* this, GlobalContext* globalCtx) { + f32* unk_2EC = &this->unk_2EC; + + *unk_2EC += 1.0f; + if ((*unk_2EC >= kREG(7) + 24.0f) && (this->unk_36C == 0)) { + func_80B57754(this, globalCtx); + func_80B5884C(this, globalCtx); + } else if ((*unk_2EC >= kREG(8) + 50.0f) && (this->unk_370 == 0)) { + func_80B56EB8(this, globalCtx); + this->unk_370 = 1; + } else if ((*unk_2EC >= kREG(9) + 56.0f) && (this->unk_374 == 0)) { + func_80B58898(this, globalCtx); + } else if (*unk_2EC >= kREG(10) + 82.0f) { + func_80B588E8(this, globalCtx); + } +} + +void func_80B58C08(EnZl3* this, GlobalContext* globalCtx) { + s32 pad[2]; + Vec3f* unk_348 = &this->unk_348; + Vec3f* unk_354 = &this->unk_354; + Vec3f* thisPos = &this->actor.posRot.pos; + s32 unk_344; + s32 unk_346; + s32 sp28; + f32 temp_f0; + + this->unk_344 += 1; + + unk_344 = this->unk_344; + unk_346 = this->unk_346; + sp28 = unk_346 - kREG(11) - 2; + temp_f0 = func_8006F9BC(unk_346, 0, unk_344, 3, 0); + + thisPos->x = unk_348->x + (temp_f0 * (unk_354->x - unk_348->x)); + thisPos->y = (unk_348->y + (temp_f0 * (unk_354->y - unk_348->y))) + this->unk_360; + thisPos->z = unk_348->z + (temp_f0 * (unk_354->z - unk_348->z)); + + if ((unk_344 - sp28) >= 0) { + this->unk_258 = ((f32)(unk_346 - unk_344) / (kREG(11) + 2)) * 255.0f; + this->drawConfig = 2; + } + + if ((unk_346 - unk_344) <= 0) { + Actor_Kill(&this->actor); + } +} + +void func_80B58D50(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B533FC(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + EnZl3_FrameUpdateMatrix(this); + func_80B57EAC(this, globalCtx); +} + +void func_80B58DB0(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B533FC(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + EnZl3_FrameUpdateMatrix(this); + func_80B57EEC(this, globalCtx); +} + +void func_80B58E10(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + Actor_SetHeight(&this->actor, 60.0f); + func_80B533FC(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + EnZl3_FrameUpdateMatrix(this); + func_80B57F1C(this, globalCtx); +} + +void func_80B58E7C(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B53764(this, globalCtx); + func_80B533FC(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + EnZl3_FrameUpdateMatrix(this); + func_80B58014(this, globalCtx); + func_80B536B4(this); +} + +void func_80B58EF4(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B538B0(this); + func_80B53764(this, globalCtx); + func_80B533FC(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + EnZl3_FrameUpdateMatrix(this); + func_80B58214(this, globalCtx); +} + +void func_80B58F6C(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B537E8(this); + func_80B536C4(this); + func_80B533FC(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + EnZl3_FrameUpdateMatrix(this); + func_80B58268(this, globalCtx); +} + +void func_80B58FDC(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B537E8(this); + func_80B536C4(this); + func_80B533FC(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + EnZl3_FrameUpdateMatrix(this); + func_80B582C8(this, globalCtx); +} + +void func_80B5904C(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B537E8(this); + func_80B536C4(this); + func_80B533FC(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + EnZl3_FrameUpdateMatrix(this); + func_80B584B4(this, globalCtx); +} + +void func_80B590BC(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B537E8(this); + func_80B536C4(this); + func_80B533FC(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + EnZl3_FrameUpdateMatrix(this); + func_80B58624(this, globalCtx); +} + +void func_80B5912C(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B536C4(this); + func_80B533FC(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B56E38(this, globalCtx); + func_80B534CC(this); + EnZl3_FrameUpdateMatrix(this); + func_80B57CB4(this, globalCtx); + func_80B57D60(this, globalCtx); + func_80B58A1C(this, globalCtx); +} + +void func_80B591BC(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B536C4(this); + func_80B538B0(this); + func_80B533FC(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + EnZl3_FrameUpdateMatrix(this); + func_80B58A50(this, globalCtx); +} + +void func_80B5922C(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B536C4(this); + func_80B57298(this); + Actor_SetHeight(&this->actor, 60.0f); + func_80B533FC(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + EnZl3_FrameUpdateMatrix(this); + func_80B58AAC(this, globalCtx); +} + +void func_80B592A8(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B536C4(this); + func_80B57298(this); + Actor_SetHeight(&this->actor, 60.0f); + func_80B533FC(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + func_80B57AAC(this, EnZl3_FrameUpdateMatrix(this), &D_06003D20); + func_80B56DEC(this); + func_80B58AAC(this, globalCtx); +} + +void func_80B59340(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B536C4(this); + func_80B57298(this); + Actor_SetHeight(&this->actor, 60.0f); + func_80B533FC(this, globalCtx); + func_80B5366C(this, globalCtx); + func_80B534CC(this); + func_80B57AAC(this, EnZl3_FrameUpdateMatrix(this), &D_06009FBC); + func_80B58AAC(this, globalCtx); +} + +void func_80B593D0(EnZl3* this, GlobalContext* globalCtx) { + func_80B54DE0(this, globalCtx); + func_80B536C4(this); + func_80B57298(this); + func_80B5366C(this, globalCtx); + func_80B56E38(this, globalCtx); + Actor_SetHeight(&this->actor, 60.0f); + func_80B534CC(this); + EnZl3_FrameUpdateMatrix(this); + func_80B58C08(this, globalCtx); +} + +s32 func_80B5944C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx, + Gfx** gfx) { + if (limbIndex == 14) { + Mtx* mtx = Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Mtx) * 7); + EnZl3* this = THIS; + Vec3s* vec = &this->unk_3F8.unk_08; + + gSPSegment(gfx[0]++, 0x0C, mtx); + + rot->x += vec->y; + rot->z += vec->x; + Matrix_Push(); + Matrix_Translate(pos->x, pos->y, pos->z, MTXMODE_APPLY); + Matrix_RotateRPY(rot->x, rot->y, rot->z, MTXMODE_APPLY); + Matrix_Push(); + Matrix_Translate(174.0f, -317.0f, 0.0f, MTXMODE_APPLY); + Matrix_ToMtx(&mtx[0], "../z_en_zl3_inEscape.c", 2471); + Matrix_Translate(-410.0f, -184.0f, 0.0f, MTXMODE_APPLY); + Matrix_ToMtx(&mtx[1], "../z_en_zl3_inEscape.c", 2474); + Matrix_Translate(-1019.0f, -26.0f, 0.0f, MTXMODE_APPLY); + Matrix_ToMtx(&mtx[2], "../z_en_zl3_inEscape.c", 2477); + Matrix_Pull(); + Matrix_Push(); + Matrix_Translate(40.0f, 264.0f, 386.0f, MTXMODE_APPLY); + Matrix_ToMtx(&mtx[3], "../z_en_zl3_inEscape.c", 2483); + Matrix_Translate(-446.0f, -52.0f, 84.0f, MTXMODE_APPLY); + Matrix_ToMtx(&mtx[4], "../z_en_zl3_inEscape.c", 2486); + Matrix_Pull(); + Matrix_Push(); + Matrix_Translate(40.0f, 264.0f, -386.0f, MTXMODE_APPLY); + Matrix_ToMtx(&mtx[5], "../z_en_zl3_inEscape.c", 2492); + Matrix_Translate(-446.0f, -52.0f, -84.0f, MTXMODE_APPLY); + Matrix_ToMtx(&mtx[6], "../z_en_zl3_inEscape.c", 2495); + Matrix_Pull(); + Matrix_Pull(); + } + return 0; +} + +s32 func_80B59698(EnZl3* this, GlobalContext* globalCtx) { + s32 cond = Flags_GetSwitch(globalCtx, 0x37) && + ((globalCtx->sceneNum == SCENE_GANON_DEMO) || (globalCtx->sceneNum == SCENE_GANON_FINAL) || + (globalCtx->sceneNum == SCENE_GANON_SONOGO) || (globalCtx->sceneNum == SCENE_GANONTIKA_SONOGO)); + + if (cond) { + u8 curSpawn = globalCtx->curSpawn; + if ((func_80B54DB4(this) == 0x20) && (curSpawn == 0) && + ((gSaveContext.timer2Value <= 0) || (gSaveContext.timer2State == 0))) { + return 1; + } + } + return 0; +} + +s32 func_80B59768(EnZl3* this, GlobalContext* globalCtx) { + s32 cond = Flags_GetSwitch(globalCtx, 0x37) && + ((globalCtx->sceneNum == SCENE_GANON_DEMO) || (globalCtx->sceneNum == SCENE_GANON_FINAL) || + (globalCtx->sceneNum == SCENE_GANON_SONOGO) || (globalCtx->sceneNum == SCENE_GANONTIKA_SONOGO)); + + if (cond) { + u8 curSpawn = globalCtx->curSpawn; + + if ((func_80B54DB4(this) == 0x20) && (curSpawn == 0) && (gSaveContext.timer2Value <= 0)) { + return 1; + } + } + return 0; +} + +void func_80B59828(EnZl3* this, GlobalContext* globalCtx) { + if (func_80B59698(this, globalCtx) || (!func_80B56EE4(this, globalCtx) && func_80B57890(this, globalCtx))) { + s16 newRotY; + + func_80B54E14(this, &D_06009FBC, 0, 0.0f, 0); + this->actor.flags |= 9; + func_80B56F10(this, globalCtx); + newRotY = func_80B571A8(this); + this->actor.shape.rot.y = newRotY; + this->actor.posRot.rot.y = newRotY; + this->unk_3C4 = this->actor.posRot.rot.z; + this->actor.shape.rot.z = 0; + this->actor.posRot.rot.z = this->actor.shape.rot.z; + this->action = 28; + this->drawConfig = 1; + } else { + Actor_Kill(&this->actor); + } + + if (func_80B59698(this, globalCtx) != 0) { + func_80088AA0(180); + func_80B53468(); + gSaveContext.healthAccumulator = 320; + Magic_Fill(globalCtx); + if (Flags_GetSwitch(globalCtx, 0x20)) { + Flags_UnsetSwitch(globalCtx, 0x20); + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_BG_ZG, -144.0f, 3544.0f, -43.0f, 0, 0x2000, 0, 0x2000); + } + Flags_UnsetSwitch(globalCtx, 0x21); + Flags_UnsetSwitch(globalCtx, 0x22); + Flags_UnsetSwitch(globalCtx, 0x23); + Flags_UnsetSwitch(globalCtx, 0x24); + Flags_UnsetSwitch(globalCtx, 0x25); + Flags_UnsetSwitch(globalCtx, 0x26); + Flags_UnsetSwitch(globalCtx, 0x27); + Flags_UnsetSwitch(globalCtx, 0x28); + Flags_UnsetSwitch(globalCtx, 0x29); + Flags_UnsetSwitch(globalCtx, 0x2A); + } + + if (func_80B54DB4(this) == 0x20) { + s32 cond; + + func_80B54EA4(this, globalCtx); + cond = Flags_GetSwitch(globalCtx, 0x37) && + ((globalCtx->sceneNum == SCENE_GANON_DEMO) || (globalCtx->sceneNum == SCENE_GANON_FINAL) || + (globalCtx->sceneNum == SCENE_GANON_SONOGO) || (globalCtx->sceneNum == SCENE_GANONTIKA_SONOGO)); + if (cond) { + func_80B53614(this, globalCtx); + } + } +} + +void func_80B59A80(EnZl3* this, GlobalContext* globalCtx) { + if (func_80B59768(this, globalCtx)) { + Audio_PlaySoundGeneral(NA_SE_OC_REVENGE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } +} + +void func_80B59AD0(EnZl3* this, GlobalContext* globalCtx) { + // todo look into + Actor* thisx = &this->actor; // unused, necessary to use 'this' first to fix regalloc + + Flags_SetSwitch(globalCtx, 0x36); + func_80088AA0(180); + func_80B54EA4(this, globalCtx); + func_80B53614(this, globalCtx); + gSaveContext.eventChkInf[12] &= ~0x80; + func_80B56F10(this, globalCtx); + gSaveContext.healthAccumulator = 320; + Magic_Fill(globalCtx); + this->action = 27; + this->drawConfig = 1; +} + +void func_80B59B6C(EnZl3* this, GlobalContext* globalCtx) { + s32 sp2C = func_80B54DD4(this); + + this->unk_3DC = SkelAnime_GetFrameCount(SEGMENTED_TO_VIRTUAL(&D_060091D8)); + this->unk_3E0 = SkelAnime_GetFrameCount(SEGMENTED_TO_VIRTUAL(&D_0600A598)); + this->unk_3E4 = SkelAnime_GetFrameCount(SEGMENTED_TO_VIRTUAL(&D_0600A334)); + this->unk_3F4 = SkelAnime_GetFrameCount(SEGMENTED_TO_VIRTUAL(&D_06001110)); + this->unk_3EC = SkelAnime_GetFrameCount(SEGMENTED_TO_VIRTUAL(&D_06002348)); + this->unk_3F0 = SkelAnime_GetFrameCount(SEGMENTED_TO_VIRTUAL(&D_06002E54)); + this->unk_3E8 = SkelAnime_GetFrameCount(SEGMENTED_TO_VIRTUAL(&D_06001D8C)); + + switch (sp2C) { + case 0: + func_80B54FB4(this, globalCtx); + break; + case 1: + func_80B55780(this, globalCtx); + break; + case 3: + func_80B59828(this, globalCtx); + break; + default: + osSyncPrintf(VT_FGCOL(RED) " En_Oa3 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + Actor_Kill(&this->actor); + } +} + +void func_80B59DB8(EnZl3* this, GlobalContext* globalCtx) { + s32 pad; + ObjectContext* objCtx = &globalCtx->objectCtx; + s32 objIndex = Object_GetIndex(objCtx, OBJECT_ZL2_ANIME2); + s32 pad2; + + if (objIndex < 0) { + osSyncPrintf(VT_FGCOL(RED) "En_Zl3_main_bankアニメーションのバンクを読めない!!!!!!!!!!!!\n" VT_RST); + return; + } + + if (Object_IsLoaded(objCtx, objIndex)) { + this->unk_318 = objIndex; + func_80B54DE0(this, globalCtx); + func_80B59B6C(this, globalCtx); + } +} + +static EnZl3ActionFunc sActionFuncs[] = { + func_80B59DB8, func_80B55550, func_80B555A4, func_80B55604, func_80B5566C, func_80B556CC, func_80B5572C, + func_80B56658, func_80B566AC, func_80B5670C, func_80B5676C, func_80B567CC, func_80B5682C, func_80B568B4, + func_80B5691C, func_80B5697C, func_80B569E4, func_80B56A68, func_80B56AE0, func_80B56B54, func_80B56BA8, + func_80B56C24, func_80B56C84, func_80B56CE4, func_80B56D44, func_80B58D50, func_80B58DB0, func_80B58E10, + func_80B58E7C, func_80B58EF4, func_80B58F6C, func_80B58FDC, func_80B5904C, func_80B590BC, func_80B5912C, + func_80B591BC, func_80B5922C, func_80B592A8, func_80B59340, func_80B593D0, +}; + +void EnZl3_Update(Actor* thisx, GlobalContext* globalCtx) { + EnZl3* this = THIS; + + if (this->action < 0 || this->action >= ARRAY_COUNT(sActionFuncs) || sActionFuncs[this->action] == NULL) { + osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + sActionFuncs[this->action](this, globalCtx); +} + +void EnZl3_Init(Actor* thisx, GlobalContext* globalCtx) { + EnZl3* this = THIS; + ActorShape* shape = &this->actor.shape; + s32 pad; + + osSyncPrintf("ゼルダ姫のEn_Zl3_Actor_ct通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + ActorShape_Init(shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + shape->unk_14 = 0; + func_80B533B0(thisx, globalCtx); + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06010D70, NULL, this->limbDrawTable, this->transitionDrawTable, + 15); + + switch (func_80B54DD4(this)) { + case 1: + gSaveContext.timer2State = 0; + break; + case 3: + func_80B59A80(this, globalCtx); + break; + } + + osSyncPrintf("ゼルダ姫のEn_Zl3_Actor_ctは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n"); +} + +static OverrideLimbDraw2 sOverrideLimbDrawFuncs[] = { + func_80B5458C, + func_80B5944C, +}; + +s32 EnZl3_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx, + Gfx** gfx) { + EnZl3* this = THIS; + + if (this->unk_308 < 0 || this->unk_308 >= ARRAY_COUNT(sOverrideLimbDrawFuncs) || + sOverrideLimbDrawFuncs[this->unk_308] == NULL) { + osSyncPrintf(VT_FGCOL(RED) "描画前処理モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return 0; + } + return sOverrideLimbDrawFuncs[this->unk_308](globalCtx, limbIndex, dList, pos, rot, thisx, gfx); +} + +void func_80B59FE8(EnZl3* this, GlobalContext* globalCtx) { +} + +void func_80B59FF4(EnZl3* this, GlobalContext* globalCtx) { + s32 pad[2]; + s16 unk_244 = this->unk_244; + u32 sp78 = D_80B5A43C[unk_244]; + s16 unk_248 = this->unk_248; + SkelAnime* skelAnime = &this->skelAnime; + u32 sp6C = D_80B5A45C[unk_248]; + s32 pad2; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_zl3.c", 2165); + + func_80093D18(globalCtx->state.gfxCtx); + + gSPSegment(POLY_OPA_DISP++, 8, SEGMENTED_TO_VIRTUAL(sp78)); + gSPSegment(POLY_OPA_DISP++, 9, SEGMENTED_TO_VIRTUAL(sp78)); + gSPSegment(POLY_OPA_DISP++, 10, SEGMENTED_TO_VIRTUAL(sp6C)); + gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255); + gSPSegment(POLY_OPA_DISP++, 11, &D_80116280[2]); + + POLY_OPA_DISP = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, + EnZl3_OverrideLimbDraw, EnZl3_PostLimbDraw, &this->actor, POLY_OPA_DISP); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_zl3.c", 2190); +} + +void func_80B5A1D0(EnZl3* this, GlobalContext* globalCtx) { + s32 pad[2]; + s16 unk_244 = this->unk_244; + u32 sp78 = D_80B5A43C[unk_244]; + s16 unk_248 = this->unk_248; + SkelAnime* skelAnime = &this->skelAnime; + u32 sp6C = D_80B5A45C[unk_248]; + s32 pad2; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_zl3.c", 2205); + + func_80093D84(globalCtx->state.gfxCtx); + + gSPSegment(POLY_XLU_DISP++, 8, SEGMENTED_TO_VIRTUAL(sp78)); + gSPSegment(POLY_XLU_DISP++, 9, SEGMENTED_TO_VIRTUAL(sp78)); + gSPSegment(POLY_XLU_DISP++, 10, SEGMENTED_TO_VIRTUAL(sp6C)); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->unk_258); + gSPSegment(POLY_XLU_DISP++, 11, &D_80116280[0]); + + POLY_XLU_DISP = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, + EnZl3_OverrideLimbDraw, NULL, &this->actor, POLY_XLU_DISP); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_zl3.c", 2234); +} + +static EnZl3DrawFunc sDrawFuncs[] = { + func_80B59FE8, + func_80B59FF4, + func_80B5A1D0, +}; + +void EnZl3_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnZl3* this = THIS; + + if (this->drawConfig < 0 || this->drawConfig >= 3 || sDrawFuncs[this->drawConfig] == NULL) { + osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + sDrawFuncs[this->drawConfig](this, globalCtx); +} -/* const ActorInit En_Zl3_InitVars = { ACTOR_EN_ZL3, ACTORTYPE_NPC, @@ -27,409 +2797,3 @@ const ActorInit En_Zl3_InitVars = { (ActorFunc)EnZl3_Update, (ActorFunc)EnZl3_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B533B0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B533FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Destroy.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53468.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53488.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B534CC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53554.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53568.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5357C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53614.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5366C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B536B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B536C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53764.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B537E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B538B0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5394C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5396C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53974.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53980.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B53B64.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54360.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5458C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54CE8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DB4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DC4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DD4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54DE0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54E14.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54EA4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54EF4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54F18.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54FB4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55054.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B550F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55144.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B551E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55220.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55268.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B552A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B552DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55334.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55368.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B553B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B553E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55408.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55444.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55550.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B555A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55604.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5566C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B556CC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5572C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55780.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55808.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5582C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5585C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B558A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B559C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55A58.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55A84.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55AC4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55B04.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55B38.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55B78.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55BAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55C0C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55C4C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55C70.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55CCC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55D00.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55DB0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55E08.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55E48.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55E7C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55EBC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55EF0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55F38.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B55F6C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5604C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56090.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56108.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56160.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B561A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B561E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56214.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B562F4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5634C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5638C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B563C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56400.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56434.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56474.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B564A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56658.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B566AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5670C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5676C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B567CC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5682C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B568B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5691C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5697C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B569E4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56A68.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56AE0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56B54.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56BA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56C24.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56C84.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56CE4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56D44.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56DA4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56DC8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56DEC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56E38.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56EB8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56EE4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56F10.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56F8C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B56FAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57034.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57104.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B571A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B571FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57240.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57298.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B572F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57324.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57350.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B573C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B573FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57458.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57564.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B575B0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B575D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B575F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5764C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B576C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57704.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5772C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57754.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B577BC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57858.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57890.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57A74.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57AAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57AE0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57C54.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57C7C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57C8C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57CB4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57D60.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57D80.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57EAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57EEC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57F1C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57F84.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58014.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58214.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58268.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B582C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B584B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58624.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5884C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58898.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B588E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58938.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5899C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58A1C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58A50.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58AAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58C08.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58D50.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58DB0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58E10.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58E7C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58EF4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58F6C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B58FDC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5904C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B590BC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5912C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B591BC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5922C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B592A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59340.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B593D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5944C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59698.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59768.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59828.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59A80.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59AD0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59B6C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59DB8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Update.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Init.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59F74.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FE8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FF4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5A1D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Draw.s") diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.h b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.h index d5a19812ec..2b2d79b328 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.h +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.h @@ -4,11 +4,68 @@ #include "ultra64.h" #include "global.h" +#include "overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h" + struct EnZl3; +typedef void (*EnZl3ActionFunc)(struct EnZl3*, GlobalContext*); +typedef void (*EnZl3DrawFunc)(struct EnZl3*, GlobalContext*); + typedef struct EnZl3 { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x2D4]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ Vec3s limbDrawTable[15]; + /* 0x01EA */ Vec3s transitionDrawTable[15]; + /* 0x0244 */ s16 unk_244; + /* 0x0246 */ s16 unk_246; + /* 0x0248 */ s16 unk_248; + /* 0x024C */ s32 action; + /* 0x0250 */ s32 drawConfig; + /* 0x0254 */ char unk_254[0x4]; + /* 0x0258 */ s32 unk_258; + /* 0x025C */ s16 unk_25C[24]; + /* 0x028C */ s16 unk_28C[24]; + /* 0x02BC */ s16 unk_2BC[24]; + /* 0x02EC */ f32 unk_2EC; + /* 0x02F0 */ s32 unk_2F0; + /* 0x02F4 */ char unk_2F4[0x4]; + /* 0x02F8 */ s32 unk_2F8; + /* 0x02FC */ s32 unk_2FC; + /* 0x0300 */ char unk_300[0x8]; + /* 0x0308 */ s32 unk_308; + /* 0x030C */ Path* unk_30C; + /* 0x0310 */ s32 unk_310; + /* 0x0314 */ s32 unk_314; + /* 0x0318 */ s32 unk_318; + /* 0x031C */ Vec3f unk_31C; + /* 0x0328 */ s32 unk_328; + /* 0x032C */ Vec3f unk_32C; + /* 0x0338 */ Vec3f unk_338; + /* 0x0344 */ u16 unk_344; + /* 0x0346 */ u16 unk_346; + /* 0x0348 */ Vec3f unk_348; + /* 0x0354 */ Vec3f unk_354; + /* 0x0360 */ f32 unk_360; + /* 0x0364 */ f32 unk_364; + /* 0x0368 */ f32 unk_368; + /* 0x036C */ s32 unk_36C; + /* 0x0370 */ s32 unk_370; + /* 0x0374 */ s32 unk_374; + /* 0x0378 */ ColliderCylinder collider; + /* 0x03C4 */ s32 unk_3C4; + /* 0x03C8 */ u8 unk_3C8; + /* 0x03CC */ f32 unk_3CC; + /* 0x03D0 */ s16 unk_3D0; + /* 0x03D4 */ BossGanon2* unk_3D4; + /* 0x03D8 */ s32 unk_3D8; + /* 0x03DC */ f32 unk_3DC; + /* 0x03E0 */ f32 unk_3E0; + /* 0x03E4 */ f32 unk_3E4; + /* 0x03E8 */ f32 unk_3E8; + /* 0x03EC */ f32 unk_3EC; + /* 0x03F0 */ f32 unk_3F0; + /* 0x03F4 */ f32 unk_3F4; + /* 0x03F8 */ struct_80034A14_arg1 unk_3F8; } EnZl3; // size = 0x0420 extern const ActorInit En_Zl3_InitVars; diff --git a/tools/get_actor_sizes.py b/tools/get_actor_sizes.py new file mode 100755 index 0000000000..984303a11e --- /dev/null +++ b/tools/get_actor_sizes.py @@ -0,0 +1,49 @@ +#!/usr/bin/python3 + +import os +import pprint + +script_dir = os.path.dirname(os.path.realpath(__file__)) +root_dir = script_dir + "/../" +asm_dir = root_dir + "asm/non_matchings/overlays/actors" + +overlays = {} + + +def get_num_instructions(f_path): + with open(f_path) as f: + f_lines = f.readlines() + sum = 0 + for line in f_lines: + if line.startswith("/* "): + sum += 1 + return sum + + +def main(): + for root, dirs, files in os.walk(asm_dir): + for dir in dirs: + total_size = 0 + max_size = -1 + ovl_path = os.path.join(root, dir) + num_files = 0 + for root2, dirs2, files2 in os.walk(ovl_path): + for f_name in files2: + num_files += 1 + file_size = get_num_instructions( + os.path.join(ovl_path, f_name)) + total_size += file_size + if file_size > max_size: + max_size = file_size + overlays[dir] = (num_files, max_size, total_size, + total_size / num_files) + + sorted_actors = {k: v for k, v in sorted( + overlays.items(), key=lambda item: item[1][2]) + } + for actor in sorted_actors.items(): + print( + f"{actor[0]}, {actor[1][0]}, {actor[1][1]}, {actor[1][2]}, {actor[1][3]}") + + +main() diff --git a/tools/get_overlay_stats.py b/tools/get_overlay_stats.py deleted file mode 100644 index 91e83c91d2..0000000000 --- a/tools/get_overlay_stats.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/python3 - -import os -import pprint - -script_dir = os.path.dirname(os.path.realpath(__file__)) -root_dir = script_dir + "/../" -asm_dir = root_dir + "asm/non_matchings/overlays/actors" - -overlays = {} - - -def main(): - for root, dirs, files in os.walk(asm_dir): - for dir in dirs: - if dir.startswith("ovl_"): - avg_size = 0 - max_size = -1 - ovl_path = os.path.join(root, dir) - count = 0 - for root2, dirs2, files2 in os.walk(ovl_path): - for file in files2: - count += 1 - file_size = os.path.getsize(os.path.join(ovl_path, file)) - avg_size += file_size - if file_size > max_size: - max_size = file_size - overlays[dir] = (max_size, count, avg_size / count) - print({k: v for k, v in sorted(overlays.items(), key=lambda item: item[1][2])}) - - -main() diff --git a/undefined_syms.txt b/undefined_syms.txt index 7753216514..072fe0bc6d 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -477,6 +477,44 @@ D_060138E0 = 0x060138E0; D_06013F10 = 0x06013F10; D_060143A8 = 0x060143A8; +// z_en_zl3 +D_060001D8 = 0x060001D8; +D_060004F4 = 0x060004F4; +D_060014DC = 0x060014DC; +D_0600210C = 0x0600210C; +D_06002710 = 0x06002710; +D_060038C0 = 0x060038C0; +D_06003D20 = 0x06003D20; +D_06003FF8 = 0x06003FF8; +D_06004408 = 0x06004408; +D_0600499C = 0x0600499C; +D_06005248 = 0x06005248; +D_060054E0 = 0x060054E0; +D_06005A0C = 0x06005A0C; +D_060061C4 = 0x060061C4; +D_06006508 = 0x06006508; +D_06006AB0 = 0x06006AB0; +D_06006F04 = 0x06006F04; +D_06007664 = 0x06007664; +D_06007A78 = 0x06007A78; +D_06007C84 = 0x06007C84; +D_06008050 = 0x06008050; +D_060082F8 = 0x060082F8; +D_06008684 = 0x06008684; +D_06008AD0 = 0x06008AD0; +D_060091D8 = 0x060091D8; +D_060099A0 = 0x060099A0; +D_06009BE4 = 0x06009BE4; +D_06009FBC = 0x06009FBC; +D_0600A334 = 0x0600A334; +D_0600A598 = 0x0600A598; +D_0600AACC = 0x0600AACC; +D_06010D70 = 0x06010D70; +D_06001110 = 0x06001110; +D_06001D8C = 0x06001D8C; +D_06002348 = 0x06002348; +D_06002E54 = 0x06002E54; + // z_bg_spot17_funen D_06000B40 = 0x06000B40;