From 13a94482e546217a245f914c1b5b49be0da0e592 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 30 May 2020 09:33:29 -0400 Subject: [PATCH] Decompiled ovl_En_Zl1 (#169) * Some progress * progs * More * 1 more * Init * Slightly better score on one function * 1 down! * some progress * Prep for PR * PR suggestions * OK! * Formatting * formatting again * PR comments * updating ZAP2 --- .../actors/ovl_En_Zl1/EnZl1_Destroy.s | 16 - .../overlays/actors/ovl_En_Zl1/EnZl1_Draw.s | 104 --- .../overlays/actors/ovl_En_Zl1/EnZl1_Init.s | 194 ------ .../overlays/actors/ovl_En_Zl1/EnZl1_Update.s | 82 --- .../actors/ovl_En_Zl1/func_80B4AB40.s | 5 - .../actors/ovl_En_Zl1/func_80B4AE18.s | 73 --- .../actors/ovl_En_Zl1/func_80B4AF18.s | 69 -- .../actors/ovl_En_Zl1/func_80B4B010.s | 147 ----- .../actors/ovl_En_Zl1/func_80B4B240.s | 406 ------------ .../actors/ovl_En_Zl1/func_80B4B7F4.s | 17 - .../actors/ovl_En_Zl1/func_80B4B834.s | 17 - .../actors/ovl_En_Zl1/func_80B4B874.s | 17 - .../actors/ovl_En_Zl1/func_80B4B8B4.s | 207 ------ .../actors/ovl_En_Zl1/func_80B4BBC4.s | 48 -- .../actors/ovl_En_Zl1/func_80B4BC78.s | 187 ------ .../actors/ovl_En_Zl1/func_80B4BF2C.s | 215 ------- .../actors/ovl_En_Zl1/func_80B4C340.s | 53 -- .../actors/ovl_En_Zl1/func_80B4C400.s | 25 - data/overlays/actors/z_en_zl1.data.s | 135 ---- data/overlays/actors/z_en_zl1.reloc.s | 13 - include/functions.h | 2 +- include/z64.h | 2 +- spec | 3 +- src/code/z_en_item00.c | 3 +- src/code/z_play.c | 6 +- src/overlays/actors/ovl_En_Zl1/z_en_zl1.c | 600 +++++++++++++++++- src/overlays/actors/ovl_En_Zl1/z_en_zl1.h | 21 +- .../ovl_En_Zl1/z_en_zl1_cutscene_data.c | 286 +++++++++ undefined_syms.txt | 15 + 29 files changed, 909 insertions(+), 2059 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AB40.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AE18.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AF18.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B010.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B240.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B7F4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B834.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B874.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B8B4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BBC4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BC78.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BF2C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4C340.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4C400.s delete mode 100644 data/overlays/actors/z_en_zl1.data.s delete mode 100644 data/overlays/actors/z_en_zl1.reloc.s create mode 100644 src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Destroy.s deleted file mode 100644 index 79e826a387..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Destroy.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel EnZl1_Destroy -/* 002A0 80B4ADE0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002A4 80B4ADE4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 002A8 80B4ADE8 AFA40018 */ sw $a0, 0x0018($sp) -/* 002AC 80B4ADEC AFA5001C */ sw $a1, 0x001C($sp) -/* 002B0 80B4ADF0 0C0295BC */ jal SkelAnime_Free -/* 002B4 80B4ADF4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 002B8 80B4ADF8 8FA50018 */ lw $a1, 0x0018($sp) -/* 002BC 80B4ADFC 8FA4001C */ lw $a0, 0x001C($sp) -/* 002C0 80B4AE00 0C0170EB */ jal Collider_DestroyCylinder - -/* 002C4 80B4AE04 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 00000194 -/* 002C8 80B4AE08 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002CC 80B4AE0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002D0 80B4AE10 03E00008 */ jr $ra -/* 002D4 80B4AE14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Draw.s deleted file mode 100644 index c6ac0ac65c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Draw.s +++ /dev/null @@ -1,104 +0,0 @@ -.rdata -glabel D_80B4E720 - .asciz "../z_en_girlB.c" - .balign 4 - -glabel D_80B4E730 - .asciz "../z_en_girlB.c" - .balign 4 - -.text -glabel EnZl1_Draw -/* 0191C 80B4C45C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 01920 80B4C460 AFBF002C */ sw $ra, 0x002C($sp) -/* 01924 80B4C464 AFB00028 */ sw $s0, 0x0028($sp) -/* 01928 80B4C468 AFA5005C */ sw $a1, 0x005C($sp) -/* 0192C 80B4C46C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01930 80B4C470 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01934 80B4C474 3C0680B5 */ lui $a2, %hi(D_80B4E720) ## $a2 = 80B50000 -/* 01938 80B4C478 24C6E720 */ addiu $a2, $a2, %lo(D_80B4E720) ## $a2 = 80B4E720 -/* 0193C 80B4C47C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 -/* 01940 80B4C480 240707DB */ addiu $a3, $zero, 0x07DB ## $a3 = 000007DB -/* 01944 80B4C484 0C031AB1 */ jal Graph_OpenDisps -/* 01948 80B4C488 AFA50050 */ sw $a1, 0x0050($sp) -/* 0194C 80B4C48C 8FA80050 */ lw $t0, 0x0050($sp) -/* 01950 80B4C490 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 01954 80B4C494 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 01958 80B4C498 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 0195C 80B4C49C 3C058016 */ lui $a1, %hi(gSegments) -/* 01960 80B4C4A0 24A56FA8 */ addiu $a1, %lo(gSegments) -/* 01964 80B4C4A4 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 01968 80B4C4A8 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 0196C 80B4C4AC AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 01970 80B4C4B0 8E0401F4 */ lw $a0, 0x01F4($s0) ## 000001F4 -/* 01974 80B4C4B4 3C0600FF */ lui $a2, 0x00FF ## $a2 = 00FF0000 -/* 01978 80B4C4B8 34C6FFFF */ ori $a2, $a2, 0xFFFF ## $a2 = 00FFFFFF -/* 0197C 80B4C4BC 0004C900 */ sll $t9, $a0, 4 -/* 01980 80B4C4C0 00194F02 */ srl $t1, $t9, 28 -/* 01984 80B4C4C4 00095080 */ sll $t2, $t1, 2 -/* 01988 80B4C4C8 00AA5821 */ addu $t3, $a1, $t2 -/* 0198C 80B4C4CC 8D6C0000 */ lw $t4, 0x0000($t3) ## 00000000 -/* 01990 80B4C4D0 00866824 */ and $t5, $a0, $a2 -/* 01994 80B4C4D4 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 01998 80B4C4D8 018D7021 */ addu $t6, $t4, $t5 -/* 0199C 80B4C4DC 01C77821 */ addu $t7, $t6, $a3 -/* 019A0 80B4C4E0 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 019A4 80B4C4E4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 019A8 80B4C4E8 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 019AC 80B4C4EC 37390024 */ ori $t9, $t9, 0x0024 ## $t9 = DB060024 -/* 019B0 80B4C4F0 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 019B4 80B4C4F4 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 019B8 80B4C4F8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 019BC 80B4C4FC 8E0401F8 */ lw $a0, 0x01F8($s0) ## 000001F8 -/* 019C0 80B4C500 00044900 */ sll $t1, $a0, 4 -/* 019C4 80B4C504 00095702 */ srl $t2, $t1, 28 -/* 019C8 80B4C508 000A5880 */ sll $t3, $t2, 2 -/* 019CC 80B4C50C 00AB6021 */ addu $t4, $a1, $t3 -/* 019D0 80B4C510 8D8D0000 */ lw $t5, 0x0000($t4) ## 00000000 -/* 019D4 80B4C514 00867024 */ and $t6, $a0, $a2 -/* 019D8 80B4C518 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 -/* 019DC 80B4C51C 01AE7821 */ addu $t7, $t5, $t6 -/* 019E0 80B4C520 01E7C021 */ addu $t8, $t7, $a3 -/* 019E4 80B4C524 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 019E8 80B4C528 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 019EC 80B4C52C 35290028 */ ori $t1, $t1, 0x0028 ## $t1 = DB060028 -/* 019F0 80B4C530 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 019F4 80B4C534 AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 -/* 019F8 80B4C538 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 019FC 80B4C53C 8E0401EC */ lw $a0, 0x01EC($s0) ## 000001EC -/* 01A00 80B4C540 00045100 */ sll $t2, $a0, 4 -/* 01A04 80B4C544 000A5F02 */ srl $t3, $t2, 28 -/* 01A08 80B4C548 000B6080 */ sll $t4, $t3, 2 -/* 01A0C 80B4C54C 00AC6821 */ addu $t5, $a1, $t4 -/* 01A10 80B4C550 8DAE0000 */ lw $t6, 0x0000($t5) ## 00000000 -/* 01A14 80B4C554 00867824 */ and $t7, $a0, $a2 -/* 01A18 80B4C558 01CFC021 */ addu $t8, $t6, $t7 -/* 01A1C 80B4C55C 0307C821 */ addu $t9, $t8, $a3 -/* 01A20 80B4C560 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 01A24 80B4C564 8FA9005C */ lw $t1, 0x005C($sp) -/* 01A28 80B4C568 0C024F46 */ jal func_80093D18 -/* 01A2C 80B4C56C 8D240000 */ lw $a0, 0x0000($t1) ## DB060028 -/* 01A30 80B4C570 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 01A34 80B4C574 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 01A38 80B4C578 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 01A3C 80B4C57C 3C0A80B5 */ lui $t2, %hi(func_80B4C340) ## $t2 = 80B50000 -/* 01A40 80B4C580 3C0B80B5 */ lui $t3, %hi(func_80B4C400) ## $t3 = 80B50000 -/* 01A44 80B4C584 256BC400 */ addiu $t3, $t3, %lo(func_80B4C400) ## $t3 = 80B4C400 -/* 01A48 80B4C588 254AC340 */ addiu $t2, $t2, %lo(func_80B4C340) ## $t2 = 80B4C340 -/* 01A4C 80B4C58C AFAA0010 */ sw $t2, 0x0010($sp) -/* 01A50 80B4C590 AFAB0014 */ sw $t3, 0x0014($sp) -/* 01A54 80B4C594 AFB00018 */ sw $s0, 0x0018($sp) -/* 01A58 80B4C598 0C0286B2 */ jal SkelAnime_DrawSV -/* 01A5C 80B4C59C 8FA4005C */ lw $a0, 0x005C($sp) -/* 01A60 80B4C5A0 8FAC005C */ lw $t4, 0x005C($sp) -/* 01A64 80B4C5A4 3C0680B5 */ lui $a2, %hi(D_80B4E730) ## $a2 = 80B50000 -/* 01A68 80B4C5A8 24C6E730 */ addiu $a2, $a2, %lo(D_80B4E730) ## $a2 = 80B4E730 -/* 01A6C 80B4C5AC 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 -/* 01A70 80B4C5B0 240707FE */ addiu $a3, $zero, 0x07FE ## $a3 = 000007FE -/* 01A74 80B4C5B4 0C031AD5 */ jal Graph_CloseDisps -/* 01A78 80B4C5B8 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 01A7C 80B4C5BC 8FBF002C */ lw $ra, 0x002C($sp) -/* 01A80 80B4C5C0 8FB00028 */ lw $s0, 0x0028($sp) -/* 01A84 80B4C5C4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 01A88 80B4C5C8 03E00008 */ jr $ra -/* 01A8C 80B4C5CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Init.s deleted file mode 100644 index dc1761a602..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Init.s +++ /dev/null @@ -1,194 +0,0 @@ -glabel EnZl1_Init -/* 00010 80B4AB50 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00014 80B4AB54 AFB00028 */ sw $s0, 0x0028($sp) -/* 00018 80B4AB58 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0001C 80B4AB5C AFBF002C */ sw $ra, 0x002C($sp) -/* 00020 80B4AB60 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00024 80B4AB64 AFA50044 */ sw $a1, 0x0044($sp) -/* 00028 80B4AB68 0C028800 */ jal SkelAnime_GetFrameCount - -/* 0002C 80B4AB6C 24842118 */ addiu $a0, $a0, 0x2118 ## $a0 = 06012118 -/* 00030 80B4AB70 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00034 80B4AB74 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00038 80B4AB78 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 0003C 80B4AB7C 468021A0 */ cvt.s.w $f6, $f4 -/* 00040 80B4AB80 24C6F5D8 */ addiu $a2, $a2, 0xF5D8 ## $a2 = 0600F5D8 -/* 00044 80B4AB84 AFA50034 */ sw $a1, 0x0034($sp) -/* 00048 80B4AB88 8FA40044 */ lw $a0, 0x0044($sp) -/* 0004C 80B4AB8C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00050 80B4AB90 AFA00010 */ sw $zero, 0x0010($sp) -/* 00054 80B4AB94 E7A6003C */ swc1 $f6, 0x003C($sp) -/* 00058 80B4AB98 AFA00014 */ sw $zero, 0x0014($sp) -/* 0005C 80B4AB9C 0C0291BE */ jal SkelAnime_InitSV -/* 00060 80B4ABA0 AFA00018 */ sw $zero, 0x0018($sp) -/* 00064 80B4ABA4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00068 80B4ABA8 C7A8003C */ lwc1 $f8, 0x003C($sp) -/* 0006C 80B4ABAC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00070 80B4ABB0 44070000 */ mfc1 $a3, $f0 -/* 00074 80B4ABB4 24A52118 */ addiu $a1, $a1, 0x2118 ## $a1 = 06012118 -/* 00078 80B4ABB8 8FA40034 */ lw $a0, 0x0034($sp) -/* 0007C 80B4ABBC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00080 80B4ABC0 AFA00014 */ sw $zero, 0x0014($sp) -/* 00084 80B4ABC4 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 00088 80B4ABC8 0C029468 */ jal SkelAnime_ChangeAnim - -/* 0008C 80B4ABCC E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00090 80B4ABD0 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00094 80B4ABD4 AFA50030 */ sw $a1, 0x0030($sp) -/* 00098 80B4ABD8 0C0170D9 */ jal Collider_InitCylinder - -/* 0009C 80B4ABDC 8FA40044 */ lw $a0, 0x0044($sp) -/* 000A0 80B4ABE0 3C0780B5 */ lui $a3, %hi(D_80B4E5F0) ## $a3 = 80B50000 -/* 000A4 80B4ABE4 8FA50030 */ lw $a1, 0x0030($sp) -/* 000A8 80B4ABE8 24E7E5F0 */ addiu $a3, $a3, %lo(D_80B4E5F0) ## $a3 = 80B4E5F0 -/* 000AC 80B4ABEC 8FA40044 */ lw $a0, 0x0044($sp) -/* 000B0 80B4ABF0 0C01712B */ jal Collider_SetCylinder - -/* 000B4 80B4ABF4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 000B8 80B4ABF8 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 000BC 80B4ABFC 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 000C0 80B4AC00 0C00B58B */ jal Actor_SetScale - -/* 000C4 80B4AC04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000C8 80B4AC08 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 000CC 80B4AC0C 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 000D0 80B4AC10 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 000D4 80B4AC14 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 000D8 80B4AC18 0C00AC78 */ jal ActorShape_Init - -/* 000DC 80B4AC1C 3C0741C0 */ lui $a3, 0x41C0 ## $a3 = 41C00000 -/* 000E0 80B4AC20 A200001F */ sb $zero, 0x001F($s0) ## 0000001F -/* 000E4 80B4AC24 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1360) -/* 000E8 80B4AC28 8DCEF9C0 */ lw $t6, %lo(gSaveContext+0x1360)($t6) -/* 000EC 80B4AC2C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 000F0 80B4AC30 29C10004 */ slti $at, $t6, 0x0004 -/* 000F4 80B4AC34 14200014 */ bne $at, $zero, .L80B4AC88 -/* 000F8 80B4AC38 00000000 */ nop -/* 000FC 80B4AC3C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00100 80B4AC40 24840438 */ addiu $a0, $a0, 0x0438 ## $a0 = 06000438 -/* 00104 80B4AC44 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 00108 80B4AC48 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0010C 80B4AC4C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00110 80B4AC50 46805420 */ cvt.s.w $f16, $f10 -/* 00114 80B4AC54 44070000 */ mfc1 $a3, $f0 -/* 00118 80B4AC58 24A50438 */ addiu $a1, $a1, 0x0438 ## $a1 = 06000438 -/* 0011C 80B4AC5C 8FA40034 */ lw $a0, 0x0034($sp) -/* 00120 80B4AC60 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00124 80B4AC64 AFA00014 */ sw $zero, 0x0014($sp) -/* 00128 80B4AC68 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 0012C 80B4AC6C 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00130 80B4AC70 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00134 80B4AC74 3C0F80B5 */ lui $t7, %hi(func_80B4BC78) ## $t7 = 80B50000 -/* 00138 80B4AC78 25EFBC78 */ addiu $t7, $t7, %lo(func_80B4BC78) ## $t7 = 80B4BC78 -/* 0013C 80B4AC7C A60001E6 */ sh $zero, 0x01E6($s0) ## 000001E6 -/* 00140 80B4AC80 10000052 */ beq $zero, $zero, .L80B4ADCC -/* 00144 80B4AC84 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 -.L80B4AC88: -/* 00148 80B4AC88 0C00D6D3 */ jal Flags_GetEventChkInf - -/* 0014C 80B4AC8C 24040009 */ addiu $a0, $zero, 0x0009 ## $a0 = 00000009 -/* 00150 80B4AC90 1040000D */ beq $v0, $zero, .L80B4ACC8 -/* 00154 80B4AC94 00000000 */ nop -/* 00158 80B4AC98 0C00D6D3 */ jal Flags_GetEventChkInf - -/* 0015C 80B4AC9C 24040025 */ addiu $a0, $zero, 0x0025 ## $a0 = 00000025 -/* 00160 80B4ACA0 10400009 */ beq $v0, $zero, .L80B4ACC8 -/* 00164 80B4ACA4 00000000 */ nop -/* 00168 80B4ACA8 0C00D6D3 */ jal Flags_GetEventChkInf - -/* 0016C 80B4ACAC 24040037 */ addiu $a0, $zero, 0x0037 ## $a0 = 00000037 -/* 00170 80B4ACB0 10400005 */ beq $v0, $zero, .L80B4ACC8 -/* 00174 80B4ACB4 00000000 */ nop -/* 00178 80B4ACB8 0C00B55C */ jal Actor_Kill - -/* 0017C 80B4ACBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00180 80B4ACC0 10000043 */ beq $zero, $zero, .L80B4ADD0 -/* 00184 80B4ACC4 8FBF002C */ lw $ra, 0x002C($sp) -.L80B4ACC8: -/* 00188 80B4ACC8 0C00D6D3 */ jal Flags_GetEventChkInf - -/* 0018C 80B4ACCC 24040009 */ addiu $a0, $zero, 0x0009 ## $a0 = 00000009 -/* 00190 80B4ACD0 10400005 */ beq $v0, $zero, .L80B4ACE8 -/* 00194 80B4ACD4 00000000 */ nop -/* 00198 80B4ACD8 0C00D6D3 */ jal Flags_GetEventChkInf - -/* 0019C 80B4ACDC 24040025 */ addiu $a0, $zero, 0x0025 ## $a0 = 00000025 -/* 001A0 80B4ACE0 14400008 */ bne $v0, $zero, .L80B4AD04 -/* 001A4 80B4ACE4 00000000 */ nop -.L80B4ACE8: -/* 001A8 80B4ACE8 0C00D6D3 */ jal Flags_GetEventChkInf - -/* 001AC 80B4ACEC 24040009 */ addiu $a0, $zero, 0x0009 ## $a0 = 00000009 -/* 001B0 80B4ACF0 10400019 */ beq $v0, $zero, .L80B4AD58 -/* 001B4 80B4ACF4 00000000 */ nop -/* 001B8 80B4ACF8 0C00D6D3 */ jal Flags_GetEventChkInf - -/* 001BC 80B4ACFC 24040037 */ addiu $a0, $zero, 0x0037 ## $a0 = 00000037 -/* 001C0 80B4AD00 10400015 */ beq $v0, $zero, .L80B4AD58 -.L80B4AD04: -/* 001C4 80B4AD04 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 001C8 80B4AD08 0C028800 */ jal SkelAnime_GetFrameCount - -/* 001CC 80B4AD0C 24840438 */ addiu $a0, $a0, 0x0438 ## $a0 = 06000438 -/* 001D0 80B4AD10 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 -/* 001D4 80B4AD14 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 001D8 80B4AD18 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 001DC 80B4AD1C 46809120 */ cvt.s.w $f4, $f18 -/* 001E0 80B4AD20 44070000 */ mfc1 $a3, $f0 -/* 001E4 80B4AD24 24A50438 */ addiu $a1, $a1, 0x0438 ## $a1 = 06000438 -/* 001E8 80B4AD28 8FA40034 */ lw $a0, 0x0034($sp) -/* 001EC 80B4AD2C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 001F0 80B4AD30 AFA00014 */ sw $zero, 0x0014($sp) -/* 001F4 80B4AD34 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 001F8 80B4AD38 0C029468 */ jal SkelAnime_ChangeAnim - -/* 001FC 80B4AD3C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00200 80B4AD40 3C1980B5 */ lui $t9, %hi(func_80B4AF18) ## $t9 = 80B50000 -/* 00204 80B4AD44 2418703D */ addiu $t8, $zero, 0x703D ## $t8 = 0000703D -/* 00208 80B4AD48 2739AF18 */ addiu $t9, $t9, %lo(func_80B4AF18) ## $t9 = 80B4AF18 -/* 0020C 80B4AD4C A618010E */ sh $t8, 0x010E($s0) ## 0000010E -/* 00210 80B4AD50 1000001E */ beq $zero, $zero, .L80B4ADCC -/* 00214 80B4AD54 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -.L80B4AD58: -/* 00218 80B4AD58 0C00D6D3 */ jal Flags_GetEventChkInf - -/* 0021C 80B4AD5C 24040040 */ addiu $a0, $zero, 0x0040 ## $a0 = 00000040 -/* 00220 80B4AD60 10400016 */ beq $v0, $zero, .L80B4ADBC -/* 00224 80B4AD64 340AFFFF */ ori $t2, $zero, 0xFFFF ## $t2 = 0000FFFF -/* 00228 80B4AD68 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0022C 80B4AD6C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00230 80B4AD70 24840438 */ addiu $a0, $a0, 0x0438 ## $a0 = 06000438 -/* 00234 80B4AD74 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 00238 80B4AD78 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 0023C 80B4AD7C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00240 80B4AD80 46803220 */ cvt.s.w $f8, $f6 -/* 00244 80B4AD84 24A50438 */ addiu $a1, $a1, 0x0438 ## $a1 = 06000438 -/* 00248 80B4AD88 8FA40034 */ lw $a0, 0x0034($sp) -/* 0024C 80B4AD8C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00250 80B4AD90 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00254 80B4AD94 AFA00014 */ sw $zero, 0x0014($sp) -/* 00258 80B4AD98 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 0025C 80B4AD9C 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00260 80B4ADA0 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 00264 80B4ADA4 3C0980B5 */ lui $t1, %hi(func_80B4AF18) ## $t1 = 80B50000 -/* 00268 80B4ADA8 2408703C */ addiu $t0, $zero, 0x703C ## $t0 = 0000703C -/* 0026C 80B4ADAC 2529AF18 */ addiu $t1, $t1, %lo(func_80B4AF18) ## $t1 = 80B4AF18 -/* 00270 80B4ADB0 A608010E */ sh $t0, 0x010E($s0) ## 0000010E -/* 00274 80B4ADB4 10000005 */ beq $zero, $zero, .L80B4ADCC -/* 00278 80B4ADB8 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 -.L80B4ADBC: -/* 0027C 80B4ADBC 3C0B80B5 */ lui $t3, %hi(func_80B4B010) ## $t3 = 80B50000 -/* 00280 80B4ADC0 256BB010 */ addiu $t3, $t3, %lo(func_80B4B010) ## $t3 = 80B4B010 -/* 00284 80B4ADC4 A60A010E */ sh $t2, 0x010E($s0) ## 0000010E -/* 00288 80B4ADC8 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 -.L80B4ADCC: -/* 0028C 80B4ADCC 8FBF002C */ lw $ra, 0x002C($sp) -.L80B4ADD0: -/* 00290 80B4ADD0 8FB00028 */ lw $s0, 0x0028($sp) -/* 00294 80B4ADD4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00298 80B4ADD8 03E00008 */ jr $ra -/* 0029C 80B4ADDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Update.s deleted file mode 100644 index ad654ef48e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Update.s +++ /dev/null @@ -1,82 +0,0 @@ -glabel EnZl1_Update -/* 016E0 80B4C220 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 016E4 80B4C224 3C0E80B5 */ lui $t6, %hi(func_80B4B8B4) ## $t6 = 80B50000 -/* 016E8 80B4C228 25CEB8B4 */ addiu $t6, $t6, %lo(func_80B4B8B4) ## $t6 = 80B4B8B4 -/* 016EC 80B4C22C AFBF0024 */ sw $ra, 0x0024($sp) -/* 016F0 80B4C230 AFB00020 */ sw $s0, 0x0020($sp) -/* 016F4 80B4C234 AFA5003C */ sw $a1, 0x003C($sp) -/* 016F8 80B4C238 AFAE002C */ sw $t6, 0x002C($sp) -/* 016FC 80B4C23C 8C820190 */ lw $v0, 0x0190($a0) ## 00000190 -/* 01700 80B4C240 3C0F80B5 */ lui $t7, %hi(func_80B4BC78) ## $t7 = 80B50000 -/* 01704 80B4C244 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01708 80B4C248 11C20005 */ beq $t6, $v0, .L80B4C260 -/* 0170C 80B4C24C 25EFBC78 */ addiu $t7, $t7, %lo(func_80B4BC78) ## $t7 = 80B4BC78 -/* 01710 80B4C250 51E20004 */ beql $t7, $v0, .L80B4C264 -/* 01714 80B4C254 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01718 80B4C258 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 0171C 80B4C25C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -.L80B4C260: -/* 01720 80B4C260 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -.L80B4C264: -/* 01724 80B4C264 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 -/* 01728 80B4C268 AFB80014 */ sw $t8, 0x0014($sp) -/* 0172C 80B4C26C 44060000 */ mfc1 $a2, $f0 -/* 01730 80B4C270 44070000 */ mfc1 $a3, $f0 -/* 01734 80B4C274 8FA4003C */ lw $a0, 0x003C($sp) -/* 01738 80B4C278 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0173C 80B4C27C 0C00B92D */ jal func_8002E4B4 -/* 01740 80B4C280 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01744 80B4C284 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 -/* 01748 80B4C288 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0174C 80B4C28C 8FA5003C */ lw $a1, 0x003C($sp) -/* 01750 80B4C290 0320F809 */ jalr $ra, $t9 -/* 01754 80B4C294 00000000 */ nop -/* 01758 80B4C298 8FA8002C */ lw $t0, 0x002C($sp) -/* 0175C 80B4C29C 8E090190 */ lw $t1, 0x0190($s0) ## 00000190 -/* 01760 80B4C2A0 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 -/* 01764 80B4C2A4 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 -/* 01768 80B4C2A8 11090009 */ beq $t0, $t1, .L80B4C2D0 -/* 0176C 80B4C2AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01770 80B4C2B0 0C0189B7 */ jal Collider_CylinderUpdate - -/* 01774 80B4C2B4 AFA6002C */ sw $a2, 0x002C($sp) -/* 01778 80B4C2B8 8FA4003C */ lw $a0, 0x003C($sp) -/* 0177C 80B4C2BC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01780 80B4C2C0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 01784 80B4C2C4 8FA6002C */ lw $a2, 0x002C($sp) -/* 01788 80B4C2C8 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 0178C 80B4C2CC 00812821 */ addu $a1, $a0, $at -.L80B4C2D0: -/* 01790 80B4C2D0 86050030 */ lh $a1, 0x0030($s0) ## 00000030 -/* 01794 80B4C2D4 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 01798 80B4C2D8 AFAB0010 */ sw $t3, 0x0010($sp) -/* 0179C 80B4C2DC 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 017A0 80B4C2E0 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 017A4 80B4C2E4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 017A8 80B4C2E8 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 017AC 80B4C2EC 86050032 */ lh $a1, 0x0032($s0) ## 00000032 -/* 017B0 80B4C2F0 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 017B4 80B4C2F4 AFAC0010 */ sw $t4, 0x0010($sp) -/* 017B8 80B4C2F8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 017BC 80B4C2FC 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 017C0 80B4C300 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 017C4 80B4C304 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 017C8 80B4C308 86050034 */ lh $a1, 0x0034($s0) ## 00000034 -/* 017CC 80B4C30C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 017D0 80B4C310 AFAD0010 */ sw $t5, 0x0010($sp) -/* 017D4 80B4C314 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 -/* 017D8 80B4C318 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 017DC 80B4C31C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 017E0 80B4C320 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 017E4 80B4C324 0C2D2B86 */ jal func_80B4AE18 -/* 017E8 80B4C328 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017EC 80B4C32C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 017F0 80B4C330 8FB00020 */ lw $s0, 0x0020($sp) -/* 017F4 80B4C334 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 017F8 80B4C338 03E00008 */ jr $ra -/* 017FC 80B4C33C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AB40.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AB40.s deleted file mode 100644 index f1d3d4dc3f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AB40.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80B4AB40 -/* 00000 80B4AB40 03E00008 */ jr $ra -/* 00004 80B4AB44 00000000 */ nop -/* 00008 80B4AB48 03E00008 */ jr $ra -/* 0000C 80B4AB4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AE18.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AE18.s deleted file mode 100644 index 4625c83338..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AE18.s +++ /dev/null @@ -1,73 +0,0 @@ -glabel func_80B4AE18 -/* 002D8 80B4AE18 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002DC 80B4AE1C AFBF0014 */ sw $ra, 0x0014($sp) -/* 002E0 80B4AE20 8C8F0154 */ lw $t7, 0x0154($a0) ## 00000154 -/* 002E4 80B4AE24 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 -/* 002E8 80B4AE28 25CE0B38 */ addiu $t6, $t6, 0x0B38 ## $t6 = 06010B38 -/* 002EC 80B4AE2C 15CF0010 */ bne $t6, $t7, .L80B4AE70 -/* 002F0 80B4AE30 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 002F4 80B4AE34 3C0141D0 */ lui $at, 0x41D0 ## $at = 41D00000 -/* 002F8 80B4AE38 44813000 */ mtc1 $at, $f6 ## $f6 = 26.00 -/* 002FC 80B4AE3C C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 -/* 00300 80B4AE40 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 -/* 00304 80B4AE44 3C190601 */ lui $t9, 0x0601 ## $t9 = 06010000 -/* 00308 80B4AE48 4606203C */ c.lt.s $f4, $f6 -/* 0030C 80B4AE4C 27188C48 */ addiu $t8, $t8, 0x8C48 ## $t8 = 06008C48 -/* 00310 80B4AE50 27398848 */ addiu $t9, $t9, 0x8848 ## $t9 = 06008848 -/* 00314 80B4AE54 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 00318 80B4AE58 45020006 */ bc1fl .L80B4AE74 -/* 0031C 80B4AE5C 84C301FC */ lh $v1, 0x01FC($a2) ## 000001FC -/* 00320 80B4AE60 AC9801F4 */ sw $t8, 0x01F4($a0) ## 000001F4 -/* 00324 80B4AE64 AC9901F8 */ sw $t9, 0x01F8($a0) ## 000001F8 -/* 00328 80B4AE68 10000027 */ beq $zero, $zero, .L80B4AF08 -/* 0032C 80B4AE6C A48801FC */ sh $t0, 0x01FC($a0) ## 000001FC -.L80B4AE70: -/* 00330 80B4AE70 84C301FC */ lh $v1, 0x01FC($a2) ## 000001FC -.L80B4AE74: -/* 00334 80B4AE74 2404001E */ addiu $a0, $zero, 0x001E ## $a0 = 0000001E -/* 00338 80B4AE78 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A -/* 0033C 80B4AE7C 14600003 */ bne $v1, $zero, .L80B4AE8C -/* 00340 80B4AE80 2469FFFF */ addiu $t1, $v1, 0xFFFF ## $t1 = FFFFFFFF -/* 00344 80B4AE84 10000004 */ beq $zero, $zero, .L80B4AE98 -/* 00348 80B4AE88 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B4AE8C: -/* 0034C 80B4AE8C A4C901FC */ sh $t1, 0x01FC($a2) ## 000001FC -/* 00350 80B4AE90 84C301FC */ lh $v1, 0x01FC($a2) ## 000001FC -/* 00354 80B4AE94 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L80B4AE98: -/* 00358 80B4AE98 54400007 */ bnel $v0, $zero, .L80B4AEB8 -/* 0035C 80B4AE9C 28610004 */ slti $at, $v1, 0x0004 -/* 00360 80B4AEA0 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00364 80B4AEA4 AFA60018 */ sw $a2, 0x0018($sp) -/* 00368 80B4AEA8 8FA60018 */ lw $a2, 0x0018($sp) -/* 0036C 80B4AEAC A4C201FC */ sh $v0, 0x01FC($a2) ## 000001FC -/* 00370 80B4AEB0 84C301FC */ lh $v1, 0x01FC($a2) ## 000001FC -/* 00374 80B4AEB4 28610004 */ slti $at, $v1, 0x0004 -.L80B4AEB8: -/* 00378 80B4AEB8 50200004 */ beql $at, $zero, .L80B4AECC -/* 0037C 80B4AEBC A4C001FE */ sh $zero, 0x01FE($a2) ## 000001FE -/* 00380 80B4AEC0 10000002 */ beq $zero, $zero, .L80B4AECC -/* 00384 80B4AEC4 A4C301FE */ sh $v1, 0x01FE($a2) ## 000001FE -/* 00388 80B4AEC8 A4C001FE */ sh $zero, 0x01FE($a2) ## 000001FE -.L80B4AECC: -/* 0038C 80B4AECC 84CA01FE */ lh $t2, 0x01FE($a2) ## 000001FE -/* 00390 80B4AED0 3C0C80B5 */ lui $t4, %hi(D_80B4E61C) ## $t4 = 80B50000 -/* 00394 80B4AED4 258CE61C */ addiu $t4, $t4, %lo(D_80B4E61C) ## $t4 = 80B4E61C -/* 00398 80B4AED8 000A5880 */ sll $t3, $t2, 2 -/* 0039C 80B4AEDC 016C1021 */ addu $v0, $t3, $t4 -/* 003A0 80B4AEE0 8C4D0000 */ lw $t5, 0x0000($v0) ## 00000000 -/* 003A4 80B4AEE4 84CF01F2 */ lh $t7, 0x01F2($a2) ## 000001F2 -/* 003A8 80B4AEE8 3C1980B5 */ lui $t9, %hi(D_80B4E62C) ## $t9 = 80B50000 -/* 003AC 80B4AEEC ACCD01F4 */ sw $t5, 0x01F4($a2) ## 000001F4 -/* 003B0 80B4AEF0 8C4E0000 */ lw $t6, 0x0000($v0) ## 00000000 -/* 003B4 80B4AEF4 000FC080 */ sll $t8, $t7, 2 -/* 003B8 80B4AEF8 0338C821 */ addu $t9, $t9, $t8 -/* 003BC 80B4AEFC ACCE01F8 */ sw $t6, 0x01F8($a2) ## 000001F8 -/* 003C0 80B4AF00 8F39E62C */ lw $t9, %lo(D_80B4E62C)($t9) -/* 003C4 80B4AF04 ACD901EC */ sw $t9, 0x01EC($a2) ## 000001EC -.L80B4AF08: -/* 003C8 80B4AF08 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003CC 80B4AF0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003D0 80B4AF10 03E00008 */ jr $ra -/* 003D4 80B4AF14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AF18.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AF18.s deleted file mode 100644 index 2c98dee515..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AF18.s +++ /dev/null @@ -1,69 +0,0 @@ -glabel func_80B4AF18 -/* 003D8 80B4AF18 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 003DC 80B4AF1C AFBF002C */ sw $ra, 0x002C($sp) -/* 003E0 80B4AF20 AFB10028 */ sw $s1, 0x0028($sp) -/* 003E4 80B4AF24 AFB00024 */ sw $s0, 0x0024($sp) -/* 003E8 80B4AF28 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 003EC 80B4AF2C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 003F0 80B4AF30 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 003F4 80B4AF34 AFAE003C */ sw $t6, 0x003C($sp) -/* 003F8 80B4AF38 8E180038 */ lw $t8, 0x0038($s0) ## 00000038 -/* 003FC 80B4AF3C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00400 80B4AF40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00404 80B4AF44 AFB80010 */ sw $t8, 0x0010($sp) -/* 00408 80B4AF48 8E0F003C */ lw $t7, 0x003C($s0) ## 0000003C -/* 0040C 80B4AF4C 26060200 */ addiu $a2, $s0, 0x0200 ## $a2 = 00000200 -/* 00410 80B4AF50 26070206 */ addiu $a3, $s0, 0x0206 ## $a3 = 00000206 -/* 00414 80B4AF54 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00418 80B4AF58 8E180040 */ lw $t8, 0x0040($s0) ## 00000040 -/* 0041C 80B4AF5C 0C00E0A4 */ jal func_80038290 -/* 00420 80B4AF60 AFB80018 */ sw $t8, 0x0018($sp) -/* 00424 80B4AF64 861901E6 */ lh $t9, 0x01E6($s0) ## 000001E6 -/* 00428 80B4AF68 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0042C 80B4AF6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00430 80B4AF70 13200007 */ beq $t9, $zero, .L80B4AF90 -/* 00434 80B4AF74 00000000 */ nop -/* 00438 80B4AF78 0C00BCCD */ jal func_8002F334 -/* 0043C 80B4AF7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00440 80B4AF80 50400014 */ beql $v0, $zero, .L80B4AFD4 -/* 00444 80B4AF84 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 -/* 00448 80B4AF88 10000011 */ beq $zero, $zero, .L80B4AFD0 -/* 0044C 80B4AF8C A60001E6 */ sh $zero, 0x01E6($s0) ## 000001E6 -.L80B4AF90: -/* 00450 80B4AF90 0C00BC65 */ jal func_8002F194 -/* 00454 80B4AF94 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00458 80B4AF98 10400004 */ beq $v0, $zero, .L80B4AFAC -/* 0045C 80B4AF9C 8FA9003C */ lw $t1, 0x003C($sp) -/* 00460 80B4AFA0 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00464 80B4AFA4 1000000A */ beq $zero, $zero, .L80B4AFD0 -/* 00468 80B4AFA8 A60801E6 */ sh $t0, 0x01E6($s0) ## 000001E6 -.L80B4AFAC: -/* 0046C 80B4AFAC C5240028 */ lwc1 $f4, 0x0028($t1) ## 00000028 -/* 00470 80B4AFB0 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 00474 80B4AFB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00478 80B4AFB8 4604303E */ c.le.s $f6, $f4 -/* 0047C 80B4AFBC 00000000 */ nop -/* 00480 80B4AFC0 45020004 */ bc1fl .L80B4AFD4 -/* 00484 80B4AFC4 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 -/* 00488 80B4AFC8 0C00BCBD */ jal func_8002F2F4 -/* 0048C 80B4AFCC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -.L80B4AFD0: -/* 00490 80B4AFD0 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 -.L80B4AFD4: -/* 00494 80B4AFD4 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 -/* 00498 80B4AFD8 AFA60034 */ sw $a2, 0x0034($sp) -/* 0049C 80B4AFDC 0C0189B7 */ jal Collider_CylinderUpdate - -/* 004A0 80B4AFE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004A4 80B4AFE4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 004A8 80B4AFE8 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 004AC 80B4AFEC 8FA60034 */ lw $a2, 0x0034($sp) -/* 004B0 80B4AFF0 02212821 */ addu $a1, $s1, $at -/* 004B4 80B4AFF4 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 004B8 80B4AFF8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 004BC 80B4AFFC 8FBF002C */ lw $ra, 0x002C($sp) -/* 004C0 80B4B000 8FB00024 */ lw $s0, 0x0024($sp) -/* 004C4 80B4B004 8FB10028 */ lw $s1, 0x0028($sp) -/* 004C8 80B4B008 03E00008 */ jr $ra -/* 004CC 80B4B00C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B010.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B010.s deleted file mode 100644 index d1eb37ac01..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B010.s +++ /dev/null @@ -1,147 +0,0 @@ -glabel func_80B4B010 -/* 004D0 80B4B010 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 004D4 80B4B014 AFBF002C */ sw $ra, 0x002C($sp) -/* 004D8 80B4B018 AFB10028 */ sw $s1, 0x0028($sp) -/* 004DC 80B4B01C AFB00024 */ sw $s0, 0x0024($sp) -/* 004E0 80B4B020 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 004E4 80B4B024 3C1880B5 */ lui $t8, %hi(D_80B4E630) ## $t8 = 80B50000 -/* 004E8 80B4B028 2718E630 */ addiu $t8, $t8, %lo(D_80B4E630) ## $t8 = 80B4E630 -/* 004EC 80B4B02C AFAE006C */ sw $t6, 0x006C($sp) -/* 004F0 80B4B030 8F090000 */ lw $t1, 0x0000($t8) ## 80B4E630 -/* 004F4 80B4B034 27AF0054 */ addiu $t7, $sp, 0x0054 ## $t7 = FFFFFFE4 -/* 004F8 80B4B038 8F190004 */ lw $t9, 0x0004($t8) ## 80B4E634 -/* 004FC 80B4B03C ADE90000 */ sw $t1, 0x0000($t7) ## FFFFFFE4 -/* 00500 80B4B040 8F090008 */ lw $t1, 0x0008($t8) ## 80B4E638 -/* 00504 80B4B044 3C0B80B5 */ lui $t3, %hi(D_80B4E63C) ## $t3 = 80B50000 -/* 00508 80B4B048 256BE63C */ addiu $t3, $t3, %lo(D_80B4E63C) ## $t3 = 80B4E63C -/* 0050C 80B4B04C ADF90004 */ sw $t9, 0x0004($t7) ## FFFFFFE8 -/* 00510 80B4B050 ADE90008 */ sw $t1, 0x0008($t7) ## FFFFFFEC -/* 00514 80B4B054 8D6D0000 */ lw $t5, 0x0000($t3) ## 80B4E63C -/* 00518 80B4B058 27AA0048 */ addiu $t2, $sp, 0x0048 ## $t2 = FFFFFFD8 -/* 0051C 80B4B05C 8D6C0004 */ lw $t4, 0x0004($t3) ## 80B4E640 -/* 00520 80B4B060 AD4D0000 */ sw $t5, 0x0000($t2) ## FFFFFFD8 -/* 00524 80B4B064 8D6D0008 */ lw $t5, 0x0008($t3) ## 80B4E644 -/* 00528 80B4B068 3C0F80B5 */ lui $t7, %hi(D_80B4E648) ## $t7 = 80B50000 -/* 0052C 80B4B06C 25EFE648 */ addiu $t7, $t7, %lo(D_80B4E648) ## $t7 = 80B4E648 -/* 00530 80B4B070 AD4C0004 */ sw $t4, 0x0004($t2) ## FFFFFFDC -/* 00534 80B4B074 AD4D0008 */ sw $t5, 0x0008($t2) ## FFFFFFE0 -/* 00538 80B4B078 8DF90000 */ lw $t9, 0x0000($t7) ## 80B4E648 -/* 0053C 80B4B07C 27AE003C */ addiu $t6, $sp, 0x003C ## $t6 = FFFFFFCC -/* 00540 80B4B080 8DF80004 */ lw $t8, 0x0004($t7) ## 80B4E64C -/* 00544 80B4B084 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFCC -/* 00548 80B4B088 8DF90008 */ lw $t9, 0x0008($t7) ## 80B4E650 -/* 0054C 80B4B08C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00550 80B4B090 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00554 80B4B094 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFD0 -/* 00558 80B4B098 0C00BC65 */ jal func_8002F194 -/* 0055C 80B4B09C ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFD4 -/* 00560 80B4B0A0 1040004B */ beq $v0, $zero, .L80B4B1D0 -/* 00564 80B4B0A4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00568 80B4B0A8 0C028800 */ jal SkelAnime_GetFrameCount - -/* 0056C 80B4B0AC 24840B38 */ addiu $a0, $a0, 0x0B38 ## $a0 = 06010B38 -/* 00570 80B4B0B0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00574 80B4B0B4 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00578 80B4B0B8 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 0057C 80B4B0BC 468021A0 */ cvt.s.w $f6, $f4 -/* 00580 80B4B0C0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00584 80B4B0C4 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 -/* 00588 80B4B0C8 AFA90014 */ sw $t1, 0x0014($sp) -/* 0058C 80B4B0CC 24A50B38 */ addiu $a1, $a1, 0x0B38 ## $a1 = 06010B38 -/* 00590 80B4B0D0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00594 80B4B0D4 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00598 80B4B0D8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0059C 80B4B0DC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 005A0 80B4B0E0 0C029468 */ jal SkelAnime_ChangeAnim - -/* 005A4 80B4B0E4 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 005A8 80B4B0E8 0C03008C */ jal Gameplay_CreateSubCamera -/* 005AC 80B4B0EC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 005B0 80B4B0F0 A60201E8 */ sh $v0, 0x01E8($s0) ## 000001E8 -/* 005B4 80B4B0F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 005B8 80B4B0F8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 005BC 80B4B0FC 0C0300C5 */ jal Gameplay_ChangeCameraStatus -/* 005C0 80B4B100 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 005C4 80B4B104 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 005C8 80B4B108 860501E8 */ lh $a1, 0x01E8($s0) ## 000001E8 -/* 005CC 80B4B10C 0C0300C5 */ jal Gameplay_ChangeCameraStatus -/* 005D0 80B4B110 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 005D4 80B4B114 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 005D8 80B4B118 860501E8 */ lh $a1, 0x01E8($s0) ## 000001E8 -/* 005DC 80B4B11C 8FA6006C */ lw $a2, 0x006C($sp) -/* 005E0 80B4B120 0C030202 */ jal func_800C0808 -/* 005E4 80B4B124 24070021 */ addiu $a3, $zero, 0x0021 ## $a3 = 00000021 -/* 005E8 80B4B128 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 005EC 80B4B12C 02211821 */ addu $v1, $s1, $at -/* 005F0 80B4B130 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 005F4 80B4B134 240A0018 */ addiu $t2, $zero, 0x0018 ## $t2 = 00000018 -/* 005F8 80B4B138 A0680B06 */ sb $t0, 0x0B06($v1) ## 00000B06 -/* 005FC 80B4B13C A0680B07 */ sb $t0, 0x0B07($v1) ## 00000B07 -/* 00600 80B4B140 A0680B08 */ sb $t0, 0x0B08($v1) ## 00000B08 -/* 00604 80B4B144 A06A0B09 */ sb $t2, 0x0B09($v1) ## 00000B09 -/* 00608 80B4B148 00310821 */ addu $at, $at, $s1 -/* 0060C 80B4B14C 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00610 80B4B150 A02B0B05 */ sb $t3, 0x0B05($at) ## 00010B05 -/* 00614 80B4B154 860501E8 */ lh $a1, 0x01E8($s0) ## 000001E8 -/* 00618 80B4B158 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0061C 80B4B15C 27A60054 */ addiu $a2, $sp, 0x0054 ## $a2 = FFFFFFE4 -/* 00620 80B4B160 0C030136 */ jal func_800C04D8 -/* 00624 80B4B164 27A70048 */ addiu $a3, $sp, 0x0048 ## $a3 = FFFFFFD8 -/* 00628 80B4B168 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0062C 80B4B16C 860501E8 */ lh $a1, 0x01E8($s0) ## 000001E8 -/* 00630 80B4B170 0C0301C1 */ jal func_800C0704 -/* 00634 80B4B174 3C0641F0 */ lui $a2, 0x41F0 ## $a2 = 41F00000 -/* 00638 80B4B178 0C02CE10 */ jal func_800B3840 ## letterbox_target_addr -/* 0063C 80B4B17C 24040020 */ addiu $a0, $zero, 0x0020 ## $a0 = 00000020 -/* 00640 80B4B180 0C020978 */ jal Interface_ChangeAlpha -/* 00644 80B4B184 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 -/* 00648 80B4B188 27AC003C */ addiu $t4, $sp, 0x003C ## $t4 = FFFFFFCC -/* 0064C 80B4B18C 8FA2006C */ lw $v0, 0x006C($sp) -/* 00650 80B4B190 8D8E0000 */ lw $t6, 0x0000($t4) ## FFFFFFCC -/* 00654 80B4B194 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 00658 80B4B198 3C0F80B5 */ lui $t7, %hi(func_80B4B240) ## $t7 = 80B50000 -/* 0065C 80B4B19C AC4E0024 */ sw $t6, 0x0024($v0) ## 00000024 -/* 00660 80B4B1A0 8D8D0004 */ lw $t5, 0x0004($t4) ## FFFFFFD0 -/* 00664 80B4B1A4 25EFB240 */ addiu $t7, $t7, %lo(func_80B4B240) ## $t7 = 80B4B240 -/* 00668 80B4B1A8 24040051 */ addiu $a0, $zero, 0x0051 ## $a0 = 00000051 -/* 0066C 80B4B1AC AC4D0028 */ sw $t5, 0x0028($v0) ## 00000028 -/* 00670 80B4B1B0 8D8E0008 */ lw $t6, 0x0008($t4) ## FFFFFFD4 -/* 00674 80B4B1B4 E44A0068 */ swc1 $f10, 0x0068($v0) ## 00000068 -/* 00678 80B4B1B8 AC4E002C */ sw $t6, 0x002C($v0) ## 0000002C -/* 0067C 80B4B1BC A60001E2 */ sh $zero, 0x01E2($s0) ## 000001E2 -/* 00680 80B4B1C0 0C03D719 */ jal func_800F5C64 -/* 00684 80B4B1C4 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 -/* 00688 80B4B1C8 10000019 */ beq $zero, $zero, .L80B4B230 -/* 0068C 80B4B1CC 8FBF002C */ lw $ra, 0x002C($sp) -.L80B4B1D0: -/* 00690 80B4B1D0 8618008A */ lh $t8, 0x008A($s0) ## 0000008A -/* 00694 80B4B1D4 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -/* 00698 80B4B1D8 8FA9006C */ lw $t1, 0x006C($sp) -/* 0069C 80B4B1DC 03191023 */ subu $v0, $t8, $t9 -/* 006A0 80B4B1E0 04400004 */ bltz $v0, .L80B4B1F4 -/* 006A4 80B4B1E4 00021823 */ subu $v1, $zero, $v0 -/* 006A8 80B4B1E8 00021C00 */ sll $v1, $v0, 16 -/* 006AC 80B4B1EC 10000003 */ beq $zero, $zero, .L80B4B1FC -/* 006B0 80B4B1F0 00031C03 */ sra $v1, $v1, 16 -.L80B4B1F4: -/* 006B4 80B4B1F4 00031C00 */ sll $v1, $v1, 16 -/* 006B8 80B4B1F8 00031C03 */ sra $v1, $v1, 16 -.L80B4B1FC: -/* 006BC 80B4B1FC 2861238E */ slti $at, $v1, 0x238E -/* 006C0 80B4B200 5020000B */ beql $at, $zero, .L80B4B230 -/* 006C4 80B4B204 8FBF002C */ lw $ra, 0x002C($sp) -/* 006C8 80B4B208 C5300028 */ lwc1 $f16, 0x0028($t1) ## 00000028 -/* 006CC 80B4B20C C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 006D0 80B4B210 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006D4 80B4B214 4612803C */ c.lt.s $f16, $f18 -/* 006D8 80B4B218 00000000 */ nop -/* 006DC 80B4B21C 45030004 */ bc1tl .L80B4B230 -/* 006E0 80B4B220 8FBF002C */ lw $ra, 0x002C($sp) -/* 006E4 80B4B224 0C00BCBD */ jal func_8002F2F4 -/* 006E8 80B4B228 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 006EC 80B4B22C 8FBF002C */ lw $ra, 0x002C($sp) -.L80B4B230: -/* 006F0 80B4B230 8FB00024 */ lw $s0, 0x0024($sp) -/* 006F4 80B4B234 8FB10028 */ lw $s1, 0x0028($sp) -/* 006F8 80B4B238 03E00008 */ jr $ra -/* 006FC 80B4B23C 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B240.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B240.s deleted file mode 100644 index 43b788bfcc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B240.s +++ /dev/null @@ -1,406 +0,0 @@ -.late_rodata -glabel jtbl_80B4E740 -.word L80B4B308 -.word L80B4B3B8 -.word L80B4B44C -.word L80B4B4C4 -.word L80B4B524 -.word L80B4B59C -.word L80B4B5E0 -.word L80B4B640 -.word L80B4B684 -.word L80B4B6FC - -.text -glabel func_80B4B240 -/* 00700 80B4B240 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 00704 80B4B244 3C0F80B5 */ lui $t7, %hi(D_80B4E654) ## $t7 = 80B50000 -/* 00708 80B4B248 AFBF002C */ sw $ra, 0x002C($sp) -/* 0070C 80B4B24C AFB10028 */ sw $s1, 0x0028($sp) -/* 00710 80B4B250 AFB00024 */ sw $s0, 0x0024($sp) -/* 00714 80B4B254 25EFE654 */ addiu $t7, $t7, %lo(D_80B4E654) ## $t7 = 80B4E654 -/* 00718 80B4B258 8DF90000 */ lw $t9, 0x0000($t7) ## 80B4E654 -/* 0071C 80B4B25C 27AE0074 */ addiu $t6, $sp, 0x0074 ## $t6 = FFFFFFF4 -/* 00720 80B4B260 8DF80004 */ lw $t8, 0x0004($t7) ## 80B4E658 -/* 00724 80B4B264 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF4 -/* 00728 80B4B268 8DF90008 */ lw $t9, 0x0008($t7) ## 80B4E65C -/* 0072C 80B4B26C 3C0980B5 */ lui $t1, %hi(D_80B4E660) ## $t1 = 80B50000 -/* 00730 80B4B270 2529E660 */ addiu $t1, $t1, %lo(D_80B4E660) ## $t1 = 80B4E660 -/* 00734 80B4B274 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF8 -/* 00738 80B4B278 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFFC -/* 0073C 80B4B27C 8D2B0000 */ lw $t3, 0x0000($t1) ## 80B4E660 -/* 00740 80B4B280 27A80068 */ addiu $t0, $sp, 0x0068 ## $t0 = FFFFFFE8 -/* 00744 80B4B284 8D2A0004 */ lw $t2, 0x0004($t1) ## 80B4E664 -/* 00748 80B4B288 AD0B0000 */ sw $t3, 0x0000($t0) ## FFFFFFE8 -/* 0074C 80B4B28C 8D2B0008 */ lw $t3, 0x0008($t1) ## 80B4E668 -/* 00750 80B4B290 3C0D80B5 */ lui $t5, %hi(D_80B4E66C) ## $t5 = 80B50000 -/* 00754 80B4B294 25ADE66C */ addiu $t5, $t5, %lo(D_80B4E66C) ## $t5 = 80B4E66C -/* 00758 80B4B298 AD0A0004 */ sw $t2, 0x0004($t0) ## FFFFFFEC -/* 0075C 80B4B29C AD0B0008 */ sw $t3, 0x0008($t0) ## FFFFFFF0 -/* 00760 80B4B2A0 8DAF0000 */ lw $t7, 0x0000($t5) ## 80B4E66C -/* 00764 80B4B2A4 27AC0058 */ addiu $t4, $sp, 0x0058 ## $t4 = FFFFFFD8 -/* 00768 80B4B2A8 8DAE0004 */ lw $t6, 0x0004($t5) ## 80B4E670 -/* 0076C 80B4B2AC AD8F0000 */ sw $t7, 0x0000($t4) ## FFFFFFD8 -/* 00770 80B4B2B0 8DAF0008 */ lw $t7, 0x0008($t5) ## 80B4E674 -/* 00774 80B4B2B4 3C1980B5 */ lui $t9, %hi(D_80B4E678) ## $t9 = 80B50000 -/* 00778 80B4B2B8 2739E678 */ addiu $t9, $t9, %lo(D_80B4E678) ## $t9 = 80B4E678 -/* 0077C 80B4B2BC AD8E0004 */ sw $t6, 0x0004($t4) ## FFFFFFDC -/* 00780 80B4B2C0 AD8F0008 */ sw $t7, 0x0008($t4) ## FFFFFFE0 -/* 00784 80B4B2C4 9B290002 */ lwr $t1, 0x0002($t9) ## 80B4E67A -/* 00788 80B4B2C8 27B80054 */ addiu $t8, $sp, 0x0054 ## $t8 = FFFFFFD4 -/* 0078C 80B4B2CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00790 80B4B2D0 BB090002 */ swr $t1, 0x0002($t8) ## FFFFFFD6 -/* 00794 80B4B2D4 8CAA1C44 */ lw $t2, 0x1C44($a1) ## 00001C44 -/* 00798 80B4B2D8 AFA0003C */ sw $zero, 0x003C($sp) -/* 0079C 80B4B2DC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 007A0 80B4B2E0 AFAA004C */ sw $t2, 0x004C($sp) -/* 007A4 80B4B2E4 948B01E2 */ lhu $t3, 0x01E2($a0) ## 000001E2 -/* 007A8 80B4B2E8 2D61000A */ sltiu $at, $t3, 0x000A -/* 007AC 80B4B2EC 1020011D */ beq $at, $zero, .L80B4B764 -/* 007B0 80B4B2F0 000B5880 */ sll $t3, $t3, 2 -/* 007B4 80B4B2F4 3C0180B5 */ lui $at, %hi(jtbl_80B4E740) ## $at = 80B50000 -/* 007B8 80B4B2F8 002B0821 */ addu $at, $at, $t3 -/* 007BC 80B4B2FC 8C2BE740 */ lw $t3, %lo(jtbl_80B4E740)($at) -/* 007C0 80B4B300 01600008 */ jr $t3 -/* 007C4 80B4B304 00000000 */ nop -glabel L80B4B308 -/* 007C8 80B4B308 C6040164 */ lwc1 $f4, 0x0164($s0) ## 00000164 -/* 007CC 80B4B30C 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 007D0 80B4B310 4600218D */ trunc.w.s $f6, $f4 -/* 007D4 80B4B314 44023000 */ mfc1 $v0, $f6 -/* 007D8 80B4B318 00000000 */ nop -/* 007DC 80B4B31C 00021400 */ sll $v0, $v0, 16 -/* 007E0 80B4B320 00021403 */ sra $v0, $v0, 16 -/* 007E4 80B4B324 10410007 */ beq $v0, $at, .L80B4B344 -/* 007E8 80B4B328 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 007EC 80B4B32C 10410007 */ beq $v0, $at, .L80B4B34C -/* 007F0 80B4B330 24010040 */ addiu $at, $zero, 0x0040 ## $at = 00000040 -/* 007F4 80B4B334 10410012 */ beq $v0, $at, .L80B4B380 -/* 007F8 80B4B338 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 -/* 007FC 80B4B33C 1000010A */ beq $zero, $zero, .L80B4B768 -/* 00800 80B4B340 8FAE003C */ lw $t6, 0x003C($sp) -.L80B4B344: -/* 00804 80B4B344 10000107 */ beq $zero, $zero, .L80B4B764 -/* 00808 80B4B348 A60001E4 */ sh $zero, 0x01E4($s0) ## 000001E4 -.L80B4B34C: -/* 0080C 80B4B34C 860301E4 */ lh $v1, 0x01E4($s0) ## 000001E4 -/* 00810 80B4B350 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 00814 80B4B354 14600003 */ bne $v1, $zero, .L80B4B364 -/* 00818 80B4B358 246DFFFF */ addiu $t5, $v1, 0xFFFF ## $t5 = FFFFFFFF -/* 0081C 80B4B35C 10000003 */ beq $zero, $zero, .L80B4B36C -/* 00820 80B4B360 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B4B364: -/* 00824 80B4B364 A60D01E4 */ sh $t5, 0x01E4($s0) ## 000001E4 -/* 00828 80B4B368 860201E4 */ lh $v0, 0x01E4($s0) ## 000001E4 -.L80B4B36C: -/* 0082C 80B4B36C 504000FE */ beql $v0, $zero, .L80B4B768 -/* 00830 80B4B370 8FAE003C */ lw $t6, 0x003C($sp) -/* 00834 80B4B374 44814000 */ mtc1 $at, $f8 ## $f8 = 15.00 -/* 00838 80B4B378 100000FA */ beq $zero, $zero, .L80B4B764 -/* 0083C 80B4B37C E6080164 */ swc1 $f8, 0x0164($s0) ## 00000164 -.L80B4B380: -/* 00840 80B4B380 25CE1348 */ addiu $t6, $t6, 0x1348 ## $t6 = 06011348 -/* 00844 80B4B384 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00848 80B4B388 AFAE0048 */ sw $t6, 0x0048($sp) -/* 0084C 80B4B38C AFAF003C */ sw $t7, 0x003C($sp) -/* 00850 80B4B390 2418702E */ addiu $t8, $zero, 0x702E ## $t8 = 0000702E -/* 00854 80B4B394 A618010E */ sh $t8, 0x010E($s0) ## 0000010E -/* 00858 80B4B398 3305FFFF */ andi $a1, $t8, 0xFFFF ## $a1 = 0000702E -/* 0085C 80B4B39C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00860 80B4B3A0 0C042DA0 */ jal func_8010B680 -/* 00864 80B4B3A4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00868 80B4B3A8 861901E2 */ lh $t9, 0x01E2($s0) ## 000001E2 -/* 0086C 80B4B3AC 27280001 */ addiu $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 00870 80B4B3B0 100000EC */ beq $zero, $zero, .L80B4B764 -/* 00874 80B4B3B4 A60801E2 */ sh $t0, 0x01E2($s0) ## 000001E2 -glabel L80B4B3B8 -/* 00878 80B4B3B8 0C042F6F */ jal func_8010BDBC -/* 0087C 80B4B3BC 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 00880 80B4B3C0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00884 80B4B3C4 544100E8 */ bnel $v0, $at, .L80B4B768 -/* 00888 80B4B3C8 8FAE003C */ lw $t6, 0x003C($sp) -/* 0088C 80B4B3CC 0C041AF2 */ jal func_80106BC8 -/* 00890 80B4B3D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00894 80B4B3D4 104000E3 */ beq $v0, $zero, .L80B4B764 -/* 00898 80B4B3D8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0089C 80B4B3DC 00310821 */ addu $at, $at, $s1 -/* 008A0 80B4B3E0 A0200B05 */ sb $zero, 0x0B05($at) ## 00010B05 -/* 008A4 80B4B3E4 860501E8 */ lh $a1, 0x01E8($s0) ## 000001E8 -/* 008A8 80B4B3E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 008AC 80B4B3EC 27A60074 */ addiu $a2, $sp, 0x0074 ## $a2 = FFFFFFF4 -/* 008B0 80B4B3F0 0C030136 */ jal func_800C04D8 -/* 008B4 80B4B3F4 27A70068 */ addiu $a3, $sp, 0x0068 ## $a3 = FFFFFFE8 -/* 008B8 80B4B3F8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 008BC 80B4B3FC 860501E8 */ lh $a1, 0x01E8($s0) ## 000001E8 -/* 008C0 80B4B400 0C0301C1 */ jal func_800C0704 -/* 008C4 80B4B404 3C0641C8 */ lui $a2, 0x41C8 ## $a2 = 41C80000 -/* 008C8 80B4B408 27AA0058 */ addiu $t2, $sp, 0x0058 ## $t2 = FFFFFFD8 -/* 008CC 80B4B40C 8D4C0000 */ lw $t4, 0x0000($t2) ## FFFFFFD8 -/* 008D0 80B4B410 8FA9004C */ lw $t1, 0x004C($sp) -/* 008D4 80B4B414 240D702F */ addiu $t5, $zero, 0x702F ## $t5 = 0000702F -/* 008D8 80B4B418 31A5FFFF */ andi $a1, $t5, 0xFFFF ## $a1 = 0000702F -/* 008DC 80B4B41C AD2C0024 */ sw $t4, 0x0024($t1) ## 00000024 -/* 008E0 80B4B420 8D4B0004 */ lw $t3, 0x0004($t2) ## FFFFFFDC -/* 008E4 80B4B424 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 008E8 80B4B428 AD2B0028 */ sw $t3, 0x0028($t1) ## 00000028 -/* 008EC 80B4B42C 8D4C0008 */ lw $t4, 0x0008($t2) ## FFFFFFE0 -/* 008F0 80B4B430 AD2C002C */ sw $t4, 0x002C($t1) ## 0000002C -/* 008F4 80B4B434 0C042DC8 */ jal func_8010B720 -/* 008F8 80B4B438 A60D010E */ sh $t5, 0x010E($s0) ## 0000010E -/* 008FC 80B4B43C 860E01E2 */ lh $t6, 0x01E2($s0) ## 000001E2 -/* 00900 80B4B440 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00904 80B4B444 100000C7 */ beq $zero, $zero, .L80B4B764 -/* 00908 80B4B448 A60F01E2 */ sh $t7, 0x01E2($s0) ## 000001E2 -glabel L80B4B44C -/* 0090C 80B4B44C 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 00910 80B4B450 0C042F6F */ jal func_8010BDBC -/* 00914 80B4B454 AFA40034 */ sw $a0, 0x0034($sp) -/* 00918 80B4B458 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0091C 80B4B45C 544100C2 */ bnel $v0, $at, .L80B4B768 -/* 00920 80B4B460 8FAE003C */ lw $t6, 0x003C($sp) -/* 00924 80B4B464 0C041AF2 */ jal func_80106BC8 -/* 00928 80B4B468 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0092C 80B4B46C 104000BD */ beq $v0, $zero, .L80B4B764 -/* 00930 80B4B470 8FB80034 */ lw $t8, 0x0034($sp) -/* 00934 80B4B474 27197FFF */ addiu $t9, $t8, 0x7FFF ## $t9 = 00007FFF -/* 00938 80B4B478 933963E6 */ lbu $t9, 0x63E6($t9) ## 0000E3E5 -/* 0093C 80B4B47C 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 -/* 00940 80B4B480 258C16E4 */ addiu $t4, $t4, 0x16E4 ## $t4 = 060116E4 -/* 00944 80B4B484 1720000A */ bne $t9, $zero, .L80B4B4B0 -/* 00948 80B4B488 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 0094C 80B4B48C 3C080601 */ lui $t0, 0x0601 ## $t0 = 06010000 -/* 00950 80B4B490 25083F10 */ addiu $t0, $t0, 0x3F10 ## $t0 = 06013F10 -/* 00954 80B4B494 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 00958 80B4B498 AFA80048 */ sw $t0, 0x0048($sp) -/* 0095C 80B4B49C AFA9003C */ sw $t1, 0x003C($sp) -/* 00960 80B4B4A0 860A01E2 */ lh $t2, 0x01E2($s0) ## 000001E2 -/* 00964 80B4B4A4 254B0001 */ addiu $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 00968 80B4B4A8 100000AE */ beq $zero, $zero, .L80B4B764 -/* 0096C 80B4B4AC A60B01E2 */ sh $t3, 0x01E2($s0) ## 000001E2 -.L80B4B4B0: -/* 00970 80B4B4B0 AFAC0048 */ sw $t4, 0x0048($sp) -/* 00974 80B4B4B4 AFAD003C */ sw $t5, 0x003C($sp) -/* 00978 80B4B4B8 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 -/* 0097C 80B4B4BC 100000A9 */ beq $zero, $zero, .L80B4B764 -/* 00980 80B4B4C0 A60E01E2 */ sh $t6, 0x01E2($s0) ## 000001E2 -glabel L80B4B4C4 -/* 00984 80B4B4C4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00988 80B4B4C8 0C028800 */ jal SkelAnime_GetFrameCount - -/* 0098C 80B4B4CC 24843F10 */ addiu $a0, $a0, 0x3F10 ## $a0 = 06013F10 -/* 00990 80B4B4D0 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 00994 80B4B4D4 C6120164 */ lwc1 $f18, 0x0164($s0) ## 00000164 -/* 00998 80B4B4D8 3C0F0601 */ lui $t7, 0x0601 ## $t7 = 06010000 -/* 0099C 80B4B4DC 46805420 */ cvt.s.w $f16, $f10 -/* 009A0 80B4B4E0 24197032 */ addiu $t9, $zero, 0x7032 ## $t9 = 00007032 -/* 009A4 80B4B4E4 25EF43A8 */ addiu $t7, $t7, 0x43A8 ## $t7 = 060143A8 -/* 009A8 80B4B4E8 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 009AC 80B4B4EC 3325FFFF */ andi $a1, $t9, 0xFFFF ## $a1 = 00007032 -/* 009B0 80B4B4F0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 009B4 80B4B4F4 46128032 */ c.eq.s $f16, $f18 -/* 009B8 80B4B4F8 00000000 */ nop -/* 009BC 80B4B4FC 4502009A */ bc1fl .L80B4B768 -/* 009C0 80B4B500 8FAE003C */ lw $t6, 0x003C($sp) -/* 009C4 80B4B504 AFAF0048 */ sw $t7, 0x0048($sp) -/* 009C8 80B4B508 AFB8003C */ sw $t8, 0x003C($sp) -/* 009CC 80B4B50C 0C042DC8 */ jal func_8010B720 -/* 009D0 80B4B510 A619010E */ sh $t9, 0x010E($s0) ## 0000010E -/* 009D4 80B4B514 860801E2 */ lh $t0, 0x01E2($s0) ## 000001E2 -/* 009D8 80B4B518 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 009DC 80B4B51C 10000091 */ beq $zero, $zero, .L80B4B764 -/* 009E0 80B4B520 A60901E2 */ sh $t1, 0x01E2($s0) ## 000001E2 -glabel L80B4B524 -/* 009E4 80B4B524 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 009E8 80B4B528 0C042F6F */ jal func_8010BDBC -/* 009EC 80B4B52C AFA40034 */ sw $a0, 0x0034($sp) -/* 009F0 80B4B530 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 009F4 80B4B534 5441008C */ bnel $v0, $at, .L80B4B768 -/* 009F8 80B4B538 8FAE003C */ lw $t6, 0x003C($sp) -/* 009FC 80B4B53C 0C041AF2 */ jal func_80106BC8 -/* 00A00 80B4B540 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00A04 80B4B544 10400087 */ beq $v0, $zero, .L80B4B764 -/* 00A08 80B4B548 8FAA0034 */ lw $t2, 0x0034($sp) -/* 00A0C 80B4B54C 254B7FFF */ addiu $t3, $t2, 0x7FFF ## $t3 = 00007FFF -/* 00A10 80B4B550 916B63E6 */ lbu $t3, 0x63E6($t3) ## 0000E3E5 -/* 00A14 80B4B554 240F7034 */ addiu $t7, $zero, 0x7034 ## $t7 = 00007034 -/* 00A18 80B4B558 31E5FFFF */ andi $a1, $t7, 0xFFFF ## $a1 = 00007034 -/* 00A1C 80B4B55C 15600009 */ bne $t3, $zero, .L80B4B584 -/* 00A20 80B4B560 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00A24 80B4B564 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 -/* 00A28 80B4B568 258C32D8 */ addiu $t4, $t4, 0x32D8 ## $t4 = 060132D8 -/* 00A2C 80B4B56C 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 00A30 80B4B570 AFAC0048 */ sw $t4, 0x0048($sp) -/* 00A34 80B4B574 AFAD003C */ sw $t5, 0x003C($sp) -/* 00A38 80B4B578 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 -/* 00A3C 80B4B57C 10000079 */ beq $zero, $zero, .L80B4B764 -/* 00A40 80B4B580 A60E01E2 */ sh $t6, 0x01E2($s0) ## 000001E2 -.L80B4B584: -/* 00A44 80B4B584 0C042DC8 */ jal func_8010B720 -/* 00A48 80B4B588 A60F010E */ sh $t7, 0x010E($s0) ## 0000010E -/* 00A4C 80B4B58C 861801E2 */ lh $t8, 0x01E2($s0) ## 000001E2 -/* 00A50 80B4B590 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 00A54 80B4B594 10000073 */ beq $zero, $zero, .L80B4B764 -/* 00A58 80B4B598 A61901E2 */ sh $t9, 0x01E2($s0) ## 000001E2 -glabel L80B4B59C -/* 00A5C 80B4B59C 0C042F6F */ jal func_8010BDBC -/* 00A60 80B4B5A0 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 00A64 80B4B5A4 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00A68 80B4B5A8 5441006F */ bnel $v0, $at, .L80B4B768 -/* 00A6C 80B4B5AC 8FAE003C */ lw $t6, 0x003C($sp) -/* 00A70 80B4B5B0 0C041AF2 */ jal func_80106BC8 -/* 00A74 80B4B5B4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00A78 80B4B5B8 1040006A */ beq $v0, $zero, .L80B4B764 -/* 00A7C 80B4B5BC 24087033 */ addiu $t0, $zero, 0x7033 ## $t0 = 00007033 -/* 00A80 80B4B5C0 A608010E */ sh $t0, 0x010E($s0) ## 0000010E -/* 00A84 80B4B5C4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00A88 80B4B5C8 0C042DC8 */ jal func_8010B720 -/* 00A8C 80B4B5CC 3105FFFF */ andi $a1, $t0, 0xFFFF ## $a1 = 00007033 -/* 00A90 80B4B5D0 860901E2 */ lh $t1, 0x01E2($s0) ## 000001E2 -/* 00A94 80B4B5D4 252AFFFF */ addiu $t2, $t1, 0xFFFF ## $t2 = FFFFFFFF -/* 00A98 80B4B5D8 10000062 */ beq $zero, $zero, .L80B4B764 -/* 00A9C 80B4B5DC A60A01E2 */ sh $t2, 0x01E2($s0) ## 000001E2 -glabel L80B4B5E0 -/* 00AA0 80B4B5E0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00AA4 80B4B5E4 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00AA8 80B4B5E8 248416E4 */ addiu $a0, $a0, 0x16E4 ## $a0 = 060116E4 -/* 00AAC 80B4B5EC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00AB0 80B4B5F0 C6080164 */ lwc1 $f8, 0x0164($s0) ## 00000164 -/* 00AB4 80B4B5F4 3C0B0601 */ lui $t3, 0x0601 ## $t3 = 06010000 -/* 00AB8 80B4B5F8 468021A0 */ cvt.s.w $f6, $f4 -/* 00ABC 80B4B5FC 240D7031 */ addiu $t5, $zero, 0x7031 ## $t5 = 00007031 -/* 00AC0 80B4B600 256B1B88 */ addiu $t3, $t3, 0x1B88 ## $t3 = 06011B88 -/* 00AC4 80B4B604 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 00AC8 80B4B608 31A5FFFF */ andi $a1, $t5, 0xFFFF ## $a1 = 00007031 -/* 00ACC 80B4B60C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00AD0 80B4B610 46083032 */ c.eq.s $f6, $f8 -/* 00AD4 80B4B614 00000000 */ nop -/* 00AD8 80B4B618 45020053 */ bc1fl .L80B4B768 -/* 00ADC 80B4B61C 8FAE003C */ lw $t6, 0x003C($sp) -/* 00AE0 80B4B620 AFAB0048 */ sw $t3, 0x0048($sp) -/* 00AE4 80B4B624 AFAC003C */ sw $t4, 0x003C($sp) -/* 00AE8 80B4B628 0C042DC8 */ jal func_8010B720 -/* 00AEC 80B4B62C A60D010E */ sh $t5, 0x010E($s0) ## 0000010E -/* 00AF0 80B4B630 860E01E2 */ lh $t6, 0x01E2($s0) ## 000001E2 -/* 00AF4 80B4B634 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00AF8 80B4B638 1000004A */ beq $zero, $zero, .L80B4B764 -/* 00AFC 80B4B63C A60F01E2 */ sh $t7, 0x01E2($s0) ## 000001E2 -glabel L80B4B640 -/* 00B00 80B4B640 0C042F6F */ jal func_8010BDBC -/* 00B04 80B4B644 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 00B08 80B4B648 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00B0C 80B4B64C 54410046 */ bnel $v0, $at, .L80B4B768 -/* 00B10 80B4B650 8FAE003C */ lw $t6, 0x003C($sp) -/* 00B14 80B4B654 0C041AF2 */ jal func_80106BC8 -/* 00B18 80B4B658 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00B1C 80B4B65C 10400041 */ beq $v0, $zero, .L80B4B764 -/* 00B20 80B4B660 24187030 */ addiu $t8, $zero, 0x7030 ## $t8 = 00007030 -/* 00B24 80B4B664 A618010E */ sh $t8, 0x010E($s0) ## 0000010E -/* 00B28 80B4B668 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00B2C 80B4B66C 0C042DC8 */ jal func_8010B720 -/* 00B30 80B4B670 3305FFFF */ andi $a1, $t8, 0xFFFF ## $a1 = 00007030 -/* 00B34 80B4B674 861901E2 */ lh $t9, 0x01E2($s0) ## 000001E2 -/* 00B38 80B4B678 27280001 */ addiu $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 00B3C 80B4B67C 10000039 */ beq $zero, $zero, .L80B4B764 -/* 00B40 80B4B680 A60801E2 */ sh $t0, 0x01E2($s0) ## 000001E2 -glabel L80B4B684 -/* 00B44 80B4B684 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 00B48 80B4B688 0C042F6F */ jal func_8010BDBC -/* 00B4C 80B4B68C AFA40034 */ sw $a0, 0x0034($sp) -/* 00B50 80B4B690 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00B54 80B4B694 54410034 */ bnel $v0, $at, .L80B4B768 -/* 00B58 80B4B698 8FAE003C */ lw $t6, 0x003C($sp) -/* 00B5C 80B4B69C 0C041AF2 */ jal func_80106BC8 -/* 00B60 80B4B6A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00B64 80B4B6A4 1040002F */ beq $v0, $zero, .L80B4B764 -/* 00B68 80B4B6A8 8FA90034 */ lw $t1, 0x0034($sp) -/* 00B6C 80B4B6AC 252A7FFF */ addiu $t2, $t1, 0x7FFF ## $t2 = 00007FFF -/* 00B70 80B4B6B0 914A63E6 */ lbu $t2, 0x63E6($t2) ## 0000E3E5 -/* 00B74 80B4B6B4 240E7031 */ addiu $t6, $zero, 0x7031 ## $t6 = 00007031 -/* 00B78 80B4B6B8 31C5FFFF */ andi $a1, $t6, 0xFFFF ## $a1 = 00007031 -/* 00B7C 80B4B6BC 15400009 */ bne $t2, $zero, .L80B4B6E4 -/* 00B80 80B4B6C0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00B84 80B4B6C4 3C0B0601 */ lui $t3, 0x0601 ## $t3 = 06010000 -/* 00B88 80B4B6C8 256B38E0 */ addiu $t3, $t3, 0x38E0 ## $t3 = 060138E0 -/* 00B8C 80B4B6CC 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 00B90 80B4B6D0 AFAB0048 */ sw $t3, 0x0048($sp) -/* 00B94 80B4B6D4 AFAC003C */ sw $t4, 0x003C($sp) -/* 00B98 80B4B6D8 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 -/* 00B9C 80B4B6DC 10000021 */ beq $zero, $zero, .L80B4B764 -/* 00BA0 80B4B6E0 A60D01E2 */ sh $t5, 0x01E2($s0) ## 000001E2 -.L80B4B6E4: -/* 00BA4 80B4B6E4 0C042DC8 */ jal func_8010B720 -/* 00BA8 80B4B6E8 A60E010E */ sh $t6, 0x010E($s0) ## 0000010E -/* 00BAC 80B4B6EC 860F01E2 */ lh $t7, 0x01E2($s0) ## 000001E2 -/* 00BB0 80B4B6F0 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 00BB4 80B4B6F4 1000001B */ beq $zero, $zero, .L80B4B764 -/* 00BB8 80B4B6F8 A61801E2 */ sh $t8, 0x01E2($s0) ## 000001E2 -glabel L80B4B6FC -/* 00BBC 80B4B6FC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00BC0 80B4B700 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00BC4 80B4B704 248432D8 */ addiu $a0, $a0, 0x32D8 ## $a0 = 060132D8 -/* 00BC8 80B4B708 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 00BCC 80B4B70C C6120164 */ lwc1 $f18, 0x0164($s0) ## 00000164 -/* 00BD0 80B4B710 3C190600 */ lui $t9, 0x0600 ## $t9 = 06000000 -/* 00BD4 80B4B714 46805420 */ cvt.s.w $f16, $f10 -/* 00BD8 80B4B718 3C0980B5 */ lui $t1, %hi(D_80B4C5D0) ## $t1 = 80B50000 -/* 00BDC 80B4B71C 27390438 */ addiu $t9, $t9, 0x0438 ## $t9 = 06000438 -/* 00BE0 80B4B720 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00BE4 80B4B724 2529C5D0 */ addiu $t1, $t1, %lo(D_80B4C5D0) ## $t1 = 80B4C5D0 -/* 00BE8 80B4B728 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00BEC 80B4B72C 46128032 */ c.eq.s $f16, $f18 -/* 00BF0 80B4B730 3C018016 */ lui $at, %hi(gSaveContext+0x1414) -/* 00BF4 80B4B734 3C0B80B5 */ lui $t3, %hi(func_80B4B8B4) ## $t3 = 80B50000 -/* 00BF8 80B4B738 4502000B */ bc1fl .L80B4B768 -/* 00BFC 80B4B73C 8FAE003C */ lw $t6, 0x003C($sp) -/* 00C00 80B4B740 AFB90048 */ sw $t9, 0x0048($sp) -/* 00C04 80B4B744 AFA8003C */ sw $t0, 0x003C($sp) -/* 00C08 80B4B748 AE291D68 */ sw $t1, 0x1D68($s1) ## 00001D68 -/* 00C0C 80B4B74C A02AFA74 */ sb $t2, %lo(gSaveContext+0x1414)($at) -/* 00C10 80B4B750 860C01E2 */ lh $t4, 0x01E2($s0) ## 000001E2 -/* 00C14 80B4B754 256BB8B4 */ addiu $t3, $t3, %lo(func_80B4B8B4) ## $t3 = 80B4B8B4 -/* 00C18 80B4B758 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 -/* 00C1C 80B4B75C 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 00C20 80B4B760 A60D01E2 */ sh $t5, 0x01E2($s0) ## 000001E2 -.L80B4B764: -/* 00C24 80B4B764 8FAE003C */ lw $t6, 0x003C($sp) -.L80B4B768: -/* 00C28 80B4B768 51C00013 */ beql $t6, $zero, .L80B4B7B8 -/* 00C2C 80B4B76C 8E080038 */ lw $t0, 0x0038($s0) ## 00000038 -/* 00C30 80B4B770 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00C34 80B4B774 8FA40048 */ lw $a0, 0x0048($sp) -/* 00C38 80B4B778 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00C3C 80B4B77C 8FAF003C */ lw $t7, 0x003C($sp) -/* 00C40 80B4B780 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00C44 80B4B784 468021A0 */ cvt.s.w $f6, $f4 -/* 00C48 80B4B788 03AFC021 */ addu $t8, $sp, $t7 -/* 00C4C 80B4B78C 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 00C50 80B4B790 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00C54 80B4B794 8FA50048 */ lw $a1, 0x0048($sp) -/* 00C58 80B4B798 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00C5C 80B4B79C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00C60 80B4B7A0 93180054 */ lbu $t8, 0x0054($t8) ## 00000054 -/* 00C64 80B4B7A4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00C68 80B4B7A8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00C6C 80B4B7AC 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00C70 80B4B7B0 AFB80014 */ sw $t8, 0x0014($sp) -/* 00C74 80B4B7B4 8E080038 */ lw $t0, 0x0038($s0) ## 00000038 -.L80B4B7B8: -/* 00C78 80B4B7B8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00C7C 80B4B7BC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00C80 80B4B7C0 AFA80010 */ sw $t0, 0x0010($sp) -/* 00C84 80B4B7C4 8E19003C */ lw $t9, 0x003C($s0) ## 0000003C -/* 00C88 80B4B7C8 26060200 */ addiu $a2, $s0, 0x0200 ## $a2 = 00000200 -/* 00C8C 80B4B7CC 26070206 */ addiu $a3, $s0, 0x0206 ## $a3 = 00000206 -/* 00C90 80B4B7D0 AFB90014 */ sw $t9, 0x0014($sp) -/* 00C94 80B4B7D4 8E080040 */ lw $t0, 0x0040($s0) ## 00000040 -/* 00C98 80B4B7D8 0C00E0A4 */ jal func_80038290 -/* 00C9C 80B4B7DC AFA80018 */ sw $t0, 0x0018($sp) -/* 00CA0 80B4B7E0 8FBF002C */ lw $ra, 0x002C($sp) -/* 00CA4 80B4B7E4 8FB00024 */ lw $s0, 0x0024($sp) -/* 00CA8 80B4B7E8 8FB10028 */ lw $s1, 0x0028($sp) -/* 00CAC 80B4B7EC 03E00008 */ jr $ra -/* 00CB0 80B4B7F0 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B7F4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B7F4.s deleted file mode 100644 index 463231693d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B7F4.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B4B7F4 -/* 00CB4 80B4B7F4 8C8E000C */ lw $t6, 0x000C($a0) ## 0000000C -/* 00CB8 80B4B7F8 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00CBC 80B4B7FC 00000000 */ nop -/* 00CC0 80B4B800 468021A0 */ cvt.s.w $f6, $f4 -/* 00CC4 80B4B804 E4A60000 */ swc1 $f6, 0x0000($a1) ## 00000000 -/* 00CC8 80B4B808 8C8F0010 */ lw $t7, 0x0010($a0) ## 00000010 -/* 00CCC 80B4B80C 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 00CD0 80B4B810 00000000 */ nop -/* 00CD4 80B4B814 468042A0 */ cvt.s.w $f10, $f8 -/* 00CD8 80B4B818 E4AA0004 */ swc1 $f10, 0x0004($a1) ## 00000004 -/* 00CDC 80B4B81C 8C980014 */ lw $t8, 0x0014($a0) ## 00000014 -/* 00CE0 80B4B820 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 00CE4 80B4B824 00000000 */ nop -/* 00CE8 80B4B828 468084A0 */ cvt.s.w $f18, $f16 -/* 00CEC 80B4B82C 03E00008 */ jr $ra -/* 00CF0 80B4B830 E4B20008 */ swc1 $f18, 0x0008($a1) ## 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B834.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B834.s deleted file mode 100644 index f1cf978e13..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B834.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B4B834 -/* 00CF4 80B4B834 8C8E0018 */ lw $t6, 0x0018($a0) ## 00000018 -/* 00CF8 80B4B838 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00CFC 80B4B83C 00000000 */ nop -/* 00D00 80B4B840 468021A0 */ cvt.s.w $f6, $f4 -/* 00D04 80B4B844 E4A60000 */ swc1 $f6, 0x0000($a1) ## 00000000 -/* 00D08 80B4B848 8C8F001C */ lw $t7, 0x001C($a0) ## 0000001C -/* 00D0C 80B4B84C 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 00D10 80B4B850 00000000 */ nop -/* 00D14 80B4B854 468042A0 */ cvt.s.w $f10, $f8 -/* 00D18 80B4B858 E4AA0004 */ swc1 $f10, 0x0004($a1) ## 00000004 -/* 00D1C 80B4B85C 8C980020 */ lw $t8, 0x0020($a0) ## 00000020 -/* 00D20 80B4B860 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 00D24 80B4B864 00000000 */ nop -/* 00D28 80B4B868 468084A0 */ cvt.s.w $f18, $f16 -/* 00D2C 80B4B86C 03E00008 */ jr $ra -/* 00D30 80B4B870 E4B20008 */ swc1 $f18, 0x0008($a1) ## 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B874.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B874.s deleted file mode 100644 index e06d28df46..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B874.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80B4B874 -/* 00D34 80B4B874 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00D38 80B4B878 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00D3C 80B4B87C AFA40018 */ sw $a0, 0x0018($sp) -/* 00D40 80B4B880 AFA5001C */ sw $a1, 0x001C($sp) -/* 00D44 80B4B884 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 -/* 00D48 80B4B888 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00D4C 80B4B88C 24A6014C */ addiu $a2, $a1, 0x014C ## $a2 = 0000014C -/* 00D50 80B4B890 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00D54 80B4B894 A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 -/* 00D58 80B4B898 8FA4001C */ lw $a0, 0x001C($sp) -/* 00D5C 80B4B89C 0C028D88 */ jal SkelAnime_LoadAnimationType5 -/* 00D60 80B4B8A0 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00D64 80B4B8A4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00D68 80B4B8A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00D6C 80B4B8AC 03E00008 */ jr $ra -/* 00D70 80B4B8B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B8B4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B8B4.s deleted file mode 100644 index db7cae79d1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B8B4.s +++ /dev/null @@ -1,207 +0,0 @@ -glabel func_80B4B8B4 -/* 00D74 80B4B8B4 27BDFF28 */ addiu $sp, $sp, 0xFF28 ## $sp = FFFFFF28 -/* 00D78 80B4B8B8 3C0F80B5 */ lui $t7, %hi(D_80B4E67C) ## $t7 = 80B50000 -/* 00D7C 80B4B8BC AFB20030 */ sw $s2, 0x0030($sp) -/* 00D80 80B4B8C0 AFB00028 */ sw $s0, 0x0028($sp) -/* 00D84 80B4B8C4 25EFE67C */ addiu $t7, $t7, %lo(D_80B4E67C) ## $t7 = 80B4E67C -/* 00D88 80B4B8C8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00D8C 80B4B8CC 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 00D90 80B4B8D0 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00D94 80B4B8D4 AFB1002C */ sw $s1, 0x002C($sp) -/* 00D98 80B4B8D8 25E80024 */ addiu $t0, $t7, 0x0024 ## $t0 = 80B4E6A0 -/* 00D9C 80B4B8DC 27AE00B0 */ addiu $t6, $sp, 0x00B0 ## $t6 = FFFFFFD8 -.L80B4B8E0: -/* 00DA0 80B4B8E0 8DF90000 */ lw $t9, 0x0000($t7) ## 80B4E67C -/* 00DA4 80B4B8E4 25EF000C */ addiu $t7, $t7, 0x000C ## $t7 = 80B4E688 -/* 00DA8 80B4B8E8 25CE000C */ addiu $t6, $t6, 0x000C ## $t6 = FFFFFFE4 -/* 00DAC 80B4B8EC ADD9FFF4 */ sw $t9, -0x000C($t6) ## FFFFFFD8 -/* 00DB0 80B4B8F0 8DF8FFF8 */ lw $t8, -0x0008($t7) ## 80B4E680 -/* 00DB4 80B4B8F4 ADD8FFF8 */ sw $t8, -0x0008($t6) ## FFFFFFDC -/* 00DB8 80B4B8F8 8DF9FFFC */ lw $t9, -0x0004($t7) ## 80B4E684 -/* 00DBC 80B4B8FC 15E8FFF8 */ bne $t7, $t0, .L80B4B8E0 -/* 00DC0 80B4B900 ADD9FFFC */ sw $t9, -0x0004($t6) ## FFFFFFE0 -/* 00DC4 80B4B904 8DF90000 */ lw $t9, 0x0000($t7) ## 80B4E688 -/* 00DC8 80B4B908 3C0A80B5 */ lui $t2, %hi(D_80B4E6A4) ## $t2 = 80B50000 -/* 00DCC 80B4B90C 254AE6A4 */ addiu $t2, $t2, %lo(D_80B4E6A4) ## $t2 = 80B4E6A4 -/* 00DD0 80B4B910 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFE4 -/* 00DD4 80B4B914 8D4C0000 */ lw $t4, 0x0000($t2) ## 80B4E6A4 -/* 00DD8 80B4B918 27A900A4 */ addiu $t1, $sp, 0x00A4 ## $t1 = FFFFFFCC -/* 00DDC 80B4B91C 8D4B0004 */ lw $t3, 0x0004($t2) ## 80B4E6A8 -/* 00DE0 80B4B920 AD2C0000 */ sw $t4, 0x0000($t1) ## FFFFFFCC -/* 00DE4 80B4B924 954C0008 */ lhu $t4, 0x0008($t2) ## 80B4E6AC -/* 00DE8 80B4B928 3C0880B5 */ lui $t0, %hi(D_80B4E6B0) ## $t0 = 80B50000 -/* 00DEC 80B4B92C 2508E6B0 */ addiu $t0, $t0, %lo(D_80B4E6B0) ## $t0 = 80B4E6B0 -/* 00DF0 80B4B930 AD2B0004 */ sw $t3, 0x0004($t1) ## FFFFFFD0 -/* 00DF4 80B4B934 A52C0008 */ sh $t4, 0x0008($t1) ## FFFFFFD4 -/* 00DF8 80B4B938 8D0E0000 */ lw $t6, 0x0000($t0) ## 80B4E6B0 -/* 00DFC 80B4B93C 27AD0098 */ addiu $t5, $sp, 0x0098 ## $t5 = FFFFFFC0 -/* 00E00 80B4B940 8D0F0004 */ lw $t7, 0x0004($t0) ## 80B4E6B4 -/* 00E04 80B4B944 ADAE0000 */ sw $t6, 0x0000($t5) ## FFFFFFC0 -/* 00E08 80B4B948 8D0E0008 */ lw $t6, 0x0008($t0) ## 80B4E6B8 -/* 00E0C 80B4B94C 3C1980B5 */ lui $t9, %hi(D_80B4E6BC) ## $t9 = 80B50000 -/* 00E10 80B4B950 2739E6BC */ addiu $t9, $t9, %lo(D_80B4E6BC) ## $t9 = 80B4E6BC -/* 00E14 80B4B954 ADAF0004 */ sw $t7, 0x0004($t5) ## FFFFFFC4 -/* 00E18 80B4B958 ADAE0008 */ sw $t6, 0x0008($t5) ## FFFFFFC8 -/* 00E1C 80B4B95C 8F2A0000 */ lw $t2, 0x0000($t9) ## 80B4E6BC -/* 00E20 80B4B960 27B8008C */ addiu $t8, $sp, 0x008C ## $t8 = FFFFFFB4 -/* 00E24 80B4B964 8F290004 */ lw $t1, 0x0004($t9) ## 80B4E6C0 -/* 00E28 80B4B968 AF0A0000 */ sw $t2, 0x0000($t8) ## FFFFFFB4 -/* 00E2C 80B4B96C 8F2A0008 */ lw $t2, 0x0008($t9) ## 80B4E6C4 -/* 00E30 80B4B970 3C0C80B5 */ lui $t4, %hi(D_80B4E6C8) ## $t4 = 80B50000 -/* 00E34 80B4B974 258CE6C8 */ addiu $t4, $t4, %lo(D_80B4E6C8) ## $t4 = 80B4E6C8 -/* 00E38 80B4B978 AF090004 */ sw $t1, 0x0004($t8) ## FFFFFFB8 -/* 00E3C 80B4B97C AF0A0008 */ sw $t2, 0x0008($t8) ## FFFFFFBC -/* 00E40 80B4B980 8D880000 */ lw $t0, 0x0000($t4) ## 80B4E6C8 -/* 00E44 80B4B984 27AB005C */ addiu $t3, $sp, 0x005C ## $t3 = FFFFFF84 -/* 00E48 80B4B988 8D8D0004 */ lw $t5, 0x0004($t4) ## 80B4E6CC -/* 00E4C 80B4B98C AD680000 */ sw $t0, 0x0000($t3) ## FFFFFF84 -/* 00E50 80B4B990 8D880008 */ lw $t0, 0x0008($t4) ## 80B4E6D0 -/* 00E54 80B4B994 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00E58 80B4B998 AD6D0004 */ sw $t5, 0x0004($t3) ## FFFFFF88 -/* 00E5C 80B4B99C AD680008 */ sw $t0, 0x0008($t3) ## FFFFFF8C -/* 00E60 80B4B9A0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00E64 80B4B9A4 AFA40044 */ sw $a0, 0x0044($sp) -/* 00E68 80B4B9A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E6C 80B4B9AC 0C2D2E1D */ jal func_80B4B874 -/* 00E70 80B4B9B0 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 00E74 80B4B9B4 924F1D6C */ lbu $t7, 0x1D6C($s2) ## 00001D6C -/* 00E78 80B4B9B8 3C0E80B5 */ lui $t6, %hi(func_80B4BBC4) ## $t6 = 80B50000 -/* 00E7C 80B4B9BC 25CEBBC4 */ addiu $t6, $t6, %lo(func_80B4BBC4) ## $t6 = 80B4BBC4 -/* 00E80 80B4B9C0 55E00004 */ bnel $t7, $zero, .L80B4B9D4 -/* 00E84 80B4B9C4 8E511D8C */ lw $s1, 0x1D8C($s2) ## 00001D8C -/* 00E88 80B4B9C8 10000078 */ beq $zero, $zero, .L80B4BBAC -/* 00E8C 80B4B9CC AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 -/* 00E90 80B4B9D0 8E511D8C */ lw $s1, 0x1D8C($s2) ## 00001D8C -.L80B4B9D4: -/* 00E94 80B4B9D4 12200075 */ beq $s1, $zero, .L80B4BBAC -/* 00E98 80B4B9D8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00E9C 80B4B9DC 0C2D2DFD */ jal func_80B4B7F4 -/* 00EA0 80B4B9E0 27A50074 */ addiu $a1, $sp, 0x0074 ## $a1 = FFFFFF9C -/* 00EA4 80B4B9E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00EA8 80B4B9E8 0C2D2E0D */ jal func_80B4B834 -/* 00EAC 80B4B9EC 27A50068 */ addiu $a1, $sp, 0x0068 ## $a1 = FFFFFF90 -/* 00EB0 80B4B9F0 860201E6 */ lh $v0, 0x01E6($s0) ## 000001E6 -/* 00EB4 80B4B9F4 27B80074 */ addiu $t8, $sp, 0x0074 ## $t8 = FFFFFF9C -/* 00EB8 80B4B9F8 54400016 */ bnel $v0, $zero, .L80B4BA54 -/* 00EBC 80B4B9FC 96230000 */ lhu $v1, 0x0000($s1) ## 00000000 -/* 00EC0 80B4BA00 8F090000 */ lw $t1, 0x0000($t8) ## FFFFFF9C -/* 00EC4 80B4BA04 27A30048 */ addiu $v1, $sp, 0x0048 ## $v1 = FFFFFF70 -/* 00EC8 80B4BA08 AC690000 */ sw $t1, 0x0000($v1) ## FFFFFF70 -/* 00ECC 80B4BA0C 8F190004 */ lw $t9, 0x0004($t8) ## FFFFFFA0 -/* 00ED0 80B4BA10 8C6B0000 */ lw $t3, 0x0000($v1) ## FFFFFF70 -/* 00ED4 80B4BA14 AC790004 */ sw $t9, 0x0004($v1) ## FFFFFF74 -/* 00ED8 80B4BA18 8F090008 */ lw $t1, 0x0008($t8) ## FFFFFFA4 -/* 00EDC 80B4BA1C AC690008 */ sw $t1, 0x0008($v1) ## FFFFFF78 -/* 00EE0 80B4BA20 AE0B0008 */ sw $t3, 0x0008($s0) ## 00000008 -/* 00EE4 80B4BA24 8C6A0004 */ lw $t2, 0x0004($v1) ## FFFFFF74 -/* 00EE8 80B4BA28 860201E6 */ lh $v0, 0x01E6($s0) ## 000001E6 -/* 00EEC 80B4BA2C AE0A000C */ sw $t2, 0x000C($s0) ## 0000000C -/* 00EF0 80B4BA30 8C6B0008 */ lw $t3, 0x0008($v1) ## FFFFFF78 -/* 00EF4 80B4BA34 AE0B0010 */ sw $t3, 0x0010($s0) ## 00000010 -/* 00EF8 80B4BA38 8C6D0000 */ lw $t5, 0x0000($v1) ## FFFFFF70 -/* 00EFC 80B4BA3C AE0D0024 */ sw $t5, 0x0024($s0) ## 00000024 -/* 00F00 80B4BA40 8C6C0004 */ lw $t4, 0x0004($v1) ## FFFFFF74 -/* 00F04 80B4BA44 AE0C0028 */ sw $t4, 0x0028($s0) ## 00000028 -/* 00F08 80B4BA48 8C6D0008 */ lw $t5, 0x0008($v1) ## FFFFFF78 -/* 00F0C 80B4BA4C AE0D002C */ sw $t5, 0x002C($s0) ## 0000002C -/* 00F10 80B4BA50 96230000 */ lhu $v1, 0x0000($s1) ## 00000000 -.L80B4BA54: -/* 00F14 80B4BA54 10620017 */ beq $v1, $v0, .L80B4BAB4 -/* 00F18 80B4BA58 00034080 */ sll $t0, $v1, 2 -/* 00F1C 80B4BA5C 03A82021 */ addu $a0, $sp, $t0 -/* 00F20 80B4BA60 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00F24 80B4BA64 8C8400B0 */ lw $a0, 0x00B0($a0) ## 000000B0 -/* 00F28 80B4BA68 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00F2C 80B4BA6C 96230000 */ lhu $v1, 0x0000($s1) ## 00000000 -/* 00F30 80B4BA70 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00F34 80B4BA74 468021A0 */ cvt.s.w $f6, $f4 -/* 00F38 80B4BA78 00037880 */ sll $t7, $v1, 2 -/* 00F3C 80B4BA7C 03AF2821 */ addu $a1, $sp, $t7 -/* 00F40 80B4BA80 8CA500B0 */ lw $a1, 0x00B0($a1) ## 000000B0 -/* 00F44 80B4BA84 03A37021 */ addu $t6, $sp, $v1 -/* 00F48 80B4BA88 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 00F4C 80B4BA8C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00F50 80B4BA90 91CE00A4 */ lbu $t6, 0x00A4($t6) ## 000000A4 -/* 00F54 80B4BA94 8FA40044 */ lw $a0, 0x0044($sp) -/* 00F58 80B4BA98 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00F5C 80B4BA9C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00F60 80B4BAA0 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00F64 80B4BAA4 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00F68 80B4BAA8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00F6C 80B4BAAC 96380000 */ lhu $t8, 0x0000($s1) ## 00000000 -/* 00F70 80B4BAB0 A61801E6 */ sh $t8, 0x01E6($s0) ## 000001E6 -.L80B4BAB4: -/* 00F74 80B4BAB4 27B9005C */ addiu $t9, $sp, 0x005C ## $t9 = FFFFFF84 -/* 00F78 80B4BAB8 8F2A0000 */ lw $t2, 0x0000($t9) ## FFFFFF84 -/* 00F7C 80B4BABC AE0A005C */ sw $t2, 0x005C($s0) ## 0000005C -/* 00F80 80B4BAC0 8F290004 */ lw $t1, 0x0004($t9) ## FFFFFF88 -/* 00F84 80B4BAC4 AE090060 */ sw $t1, 0x0060($s0) ## 00000060 -/* 00F88 80B4BAC8 8F2A0008 */ lw $t2, 0x0008($t9) ## FFFFFF8C -/* 00F8C 80B4BACC AE0A0064 */ sw $t2, 0x0064($s0) ## 00000064 -/* 00F90 80B4BAD0 964B1D74 */ lhu $t3, 0x1D74($s2) ## 00001D74 -/* 00F94 80B4BAD4 96220004 */ lhu $v0, 0x0004($s1) ## 00000004 -/* 00F98 80B4BAD8 0162082A */ slt $at, $t3, $v0 -/* 00F9C 80B4BADC 50200020 */ beql $at, $zero, .L80B4BB60 -/* 00FA0 80B4BAE0 8E0F0038 */ lw $t7, 0x0038($s0) ## 00000038 -/* 00FA4 80B4BAE4 962C0002 */ lhu $t4, 0x0002($s1) ## 00000002 -/* 00FA8 80B4BAE8 C7B00068 */ lwc1 $f16, 0x0068($sp) -/* 00FAC 80B4BAEC C7B20074 */ lwc1 $f18, 0x0074($sp) -/* 00FB0 80B4BAF0 004C6823 */ subu $t5, $v0, $t4 -/* 00FB4 80B4BAF4 448D5000 */ mtc1 $t5, $f10 ## $f10 = 0.00 -/* 00FB8 80B4BAF8 46128101 */ sub.s $f4, $f16, $f18 -/* 00FBC 80B4BAFC C6020070 */ lwc1 $f2, 0x0070($s0) ## 00000070 -/* 00FC0 80B4BB00 46805020 */ cvt.s.w $f0, $f10 -/* 00FC4 80B4BB04 46002183 */ div.s $f6, $f4, $f0 -/* 00FC8 80B4BB08 E606005C */ swc1 $f6, 0x005C($s0) ## 0000005C -/* 00FCC 80B4BB0C C7AA0078 */ lwc1 $f10, 0x0078($sp) -/* 00FD0 80B4BB10 C7A8006C */ lwc1 $f8, 0x006C($sp) -/* 00FD4 80B4BB14 C606006C */ lwc1 $f6, 0x006C($s0) ## 0000006C -/* 00FD8 80B4BB18 460A4401 */ sub.s $f16, $f8, $f10 -/* 00FDC 80B4BB1C 46008483 */ div.s $f18, $f16, $f0 -/* 00FE0 80B4BB20 E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060 -/* 00FE4 80B4BB24 C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 -/* 00FE8 80B4BB28 46062200 */ add.s $f8, $f4, $f6 -/* 00FEC 80B4BB2C E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 -/* 00FF0 80B4BB30 C60A0060 */ lwc1 $f10, 0x0060($s0) ## 00000060 -/* 00FF4 80B4BB34 4602503C */ c.lt.s $f10, $f2 -/* 00FF8 80B4BB38 00000000 */ nop -/* 00FFC 80B4BB3C 45020003 */ bc1fl .L80B4BB4C -/* 01000 80B4BB40 C7B00070 */ lwc1 $f16, 0x0070($sp) -/* 01004 80B4BB44 E6020060 */ swc1 $f2, 0x0060($s0) ## 00000060 -/* 01008 80B4BB48 C7B00070 */ lwc1 $f16, 0x0070($sp) -.L80B4BB4C: -/* 0100C 80B4BB4C C7B2007C */ lwc1 $f18, 0x007C($sp) -/* 01010 80B4BB50 46128101 */ sub.s $f4, $f16, $f18 -/* 01014 80B4BB54 46002183 */ div.s $f6, $f4, $f0 -/* 01018 80B4BB58 E6060064 */ swc1 $f6, 0x0064($s0) ## 00000064 -/* 0101C 80B4BB5C 8E0F0038 */ lw $t7, 0x0038($s0) ## 00000038 -.L80B4BB60: -/* 01020 80B4BB60 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01024 80B4BB64 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01028 80B4BB68 AFAF0010 */ sw $t7, 0x0010($sp) -/* 0102C 80B4BB6C 8E08003C */ lw $t0, 0x003C($s0) ## 0000003C -/* 01030 80B4BB70 26060200 */ addiu $a2, $s0, 0x0200 ## $a2 = 00000200 -/* 01034 80B4BB74 26070206 */ addiu $a3, $s0, 0x0206 ## $a3 = 00000206 -/* 01038 80B4BB78 AFA80014 */ sw $t0, 0x0014($sp) -/* 0103C 80B4BB7C 8E0F0040 */ lw $t7, 0x0040($s0) ## 00000040 -/* 01040 80B4BB80 0C00E0A4 */ jal func_80038290 -/* 01044 80B4BB84 AFAF0018 */ sw $t7, 0x0018($sp) -/* 01048 80B4BB88 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0104C 80B4BB8C 860501E8 */ lh $a1, 0x01E8($s0) ## 000001E8 -/* 01050 80B4BB90 27A60098 */ addiu $a2, $sp, 0x0098 ## $a2 = FFFFFFC0 -/* 01054 80B4BB94 0C030136 */ jal func_800C04D8 -/* 01058 80B4BB98 27A7008C */ addiu $a3, $sp, 0x008C ## $a3 = FFFFFFB4 -/* 0105C 80B4BB9C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01060 80B4BBA0 860501E8 */ lh $a1, 0x01E8($s0) ## 000001E8 -/* 01064 80B4BBA4 0C0301C1 */ jal func_800C0704 -/* 01068 80B4BBA8 3C06428C */ lui $a2, 0x428C ## $a2 = 428C0000 -.L80B4BBAC: -/* 0106C 80B4BBAC 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01070 80B4BBB0 8FB00028 */ lw $s0, 0x0028($sp) -/* 01074 80B4BBB4 8FB1002C */ lw $s1, 0x002C($sp) -/* 01078 80B4BBB8 8FB20030 */ lw $s2, 0x0030($sp) -/* 0107C 80B4BBBC 03E00008 */ jr $ra -/* 01080 80B4BBC0 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BBC4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BBC4.s deleted file mode 100644 index 12d4851112..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BBC4.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80B4BBC4 -/* 01084 80B4BBC4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01088 80B4BBC8 AFB00028 */ sw $s0, 0x0028($sp) -/* 0108C 80B4BBCC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01090 80B4BBD0 AFBF002C */ sw $ra, 0x002C($sp) -/* 01094 80B4BBD4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01098 80B4BBD8 AFA50044 */ sw $a1, 0x0044($sp) -/* 0109C 80B4BBDC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 010A0 80B4BBE0 24840438 */ addiu $a0, $a0, 0x0438 ## $a0 = 06000438 -/* 010A4 80B4BBE4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 010A8 80B4BBE8 8FAE0044 */ lw $t6, 0x0044($sp) -/* 010AC 80B4BBEC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 010B0 80B4BBF0 468021A0 */ cvt.s.w $f6, $f4 -/* 010B4 80B4BBF4 8DCF1C44 */ lw $t7, 0x1C44($t6) ## 00001C44 -/* 010B8 80B4BBF8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 010BC 80B4BBFC 44070000 */ mfc1 $a3, $f0 -/* 010C0 80B4BC00 24A50438 */ addiu $a1, $a1, 0x0438 ## $a1 = 06000438 -/* 010C4 80B4BC04 AFA00014 */ sw $zero, 0x0014($sp) -/* 010C8 80B4BC08 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 010CC 80B4BC0C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 010D0 80B4BC10 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 010D4 80B4BC14 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 010D8 80B4BC18 0C029468 */ jal SkelAnime_ChangeAnim - -/* 010DC 80B4BC1C AFAF0034 */ sw $t7, 0x0034($sp) -/* 010E0 80B4BC20 8FA40044 */ lw $a0, 0x0044($sp) -/* 010E4 80B4BC24 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 010E8 80B4BC28 0C00B7D5 */ jal func_8002DF54 -/* 010EC 80B4BC2C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 010F0 80B4BC30 8FA40034 */ lw $a0, 0x0034($sp) -/* 010F4 80B4BC34 0C00BDF7 */ jal func_8002F7DC -/* 010F8 80B4BC38 24056836 */ addiu $a1, $zero, 0x6836 ## $a1 = 00006836 -/* 010FC 80B4BC3C 24187039 */ addiu $t8, $zero, 0x7039 ## $t8 = 00007039 -/* 01100 80B4BC40 A618010E */ sh $t8, 0x010E($s0) ## 0000010E -/* 01104 80B4BC44 8FA40044 */ lw $a0, 0x0044($sp) -/* 01108 80B4BC48 3305FFFF */ andi $a1, $t8, 0xFFFF ## $a1 = 00007039 -/* 0110C 80B4BC4C 0C042DA0 */ jal func_8010B680 -/* 01110 80B4BC50 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01114 80B4BC54 3C1980B5 */ lui $t9, %hi(func_80B4BF2C) ## $t9 = 80B50000 -/* 01118 80B4BC58 2739BF2C */ addiu $t9, $t9, %lo(func_80B4BF2C) ## $t9 = 80B4BF2C -/* 0111C 80B4BC5C A60001E2 */ sh $zero, 0x01E2($s0) ## 000001E2 -/* 01120 80B4BC60 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -/* 01124 80B4BC64 8FBF002C */ lw $ra, 0x002C($sp) -/* 01128 80B4BC68 8FB00028 */ lw $s0, 0x0028($sp) -/* 0112C 80B4BC6C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 01130 80B4BC70 03E00008 */ jr $ra -/* 01134 80B4BC74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BC78.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BC78.s deleted file mode 100644 index dbe498ebe6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BC78.s +++ /dev/null @@ -1,187 +0,0 @@ -glabel func_80B4BC78 -/* 01138 80B4BC78 27BDFF48 */ addiu $sp, $sp, 0xFF48 ## $sp = FFFFFF48 -/* 0113C 80B4BC7C 3C0F80B5 */ lui $t7, %hi(D_80B4E6D4) ## $t7 = 80B50000 -/* 01140 80B4BC80 AFB00024 */ sw $s0, 0x0024($sp) -/* 01144 80B4BC84 25EFE6D4 */ addiu $t7, $t7, %lo(D_80B4E6D4) ## $t7 = 80B4E6D4 -/* 01148 80B4BC88 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0114C 80B4BC8C AFBF002C */ sw $ra, 0x002C($sp) -/* 01150 80B4BC90 AFB10028 */ sw $s1, 0x0028($sp) -/* 01154 80B4BC94 AFA500BC */ sw $a1, 0x00BC($sp) -/* 01158 80B4BC98 25E80024 */ addiu $t0, $t7, 0x0024 ## $t0 = 80B4E6F8 -/* 0115C 80B4BC9C 27AE0090 */ addiu $t6, $sp, 0x0090 ## $t6 = FFFFFFD8 -.L80B4BCA0: -/* 01160 80B4BCA0 8DF90000 */ lw $t9, 0x0000($t7) ## 80B4E6D4 -/* 01164 80B4BCA4 25EF000C */ addiu $t7, $t7, 0x000C ## $t7 = 80B4E6E0 -/* 01168 80B4BCA8 25CE000C */ addiu $t6, $t6, 0x000C ## $t6 = FFFFFFE4 -/* 0116C 80B4BCAC ADD9FFF4 */ sw $t9, -0x000C($t6) ## FFFFFFD8 -/* 01170 80B4BCB0 8DF8FFF8 */ lw $t8, -0x0008($t7) ## 80B4E6D8 -/* 01174 80B4BCB4 ADD8FFF8 */ sw $t8, -0x0008($t6) ## FFFFFFDC -/* 01178 80B4BCB8 8DF9FFFC */ lw $t9, -0x0004($t7) ## 80B4E6DC -/* 0117C 80B4BCBC 15E8FFF8 */ bne $t7, $t0, .L80B4BCA0 -/* 01180 80B4BCC0 ADD9FFFC */ sw $t9, -0x0004($t6) ## FFFFFFE0 -/* 01184 80B4BCC4 8DF90000 */ lw $t9, 0x0000($t7) ## 80B4E6E0 -/* 01188 80B4BCC8 3C0A80B5 */ lui $t2, %hi(D_80B4E6FC) ## $t2 = 80B50000 -/* 0118C 80B4BCCC 254AE6FC */ addiu $t2, $t2, %lo(D_80B4E6FC) ## $t2 = 80B4E6FC -/* 01190 80B4BCD0 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFE4 -/* 01194 80B4BCD4 8D4C0000 */ lw $t4, 0x0000($t2) ## 80B4E6FC -/* 01198 80B4BCD8 27A90084 */ addiu $t1, $sp, 0x0084 ## $t1 = FFFFFFCC -/* 0119C 80B4BCDC 8D4B0004 */ lw $t3, 0x0004($t2) ## 80B4E700 -/* 011A0 80B4BCE0 AD2C0000 */ sw $t4, 0x0000($t1) ## FFFFFFCC -/* 011A4 80B4BCE4 954C0008 */ lhu $t4, 0x0008($t2) ## 80B4E704 -/* 011A8 80B4BCE8 3C0880B5 */ lui $t0, %hi(D_80B4E708) ## $t0 = 80B50000 -/* 011AC 80B4BCEC 2508E708 */ addiu $t0, $t0, %lo(D_80B4E708) ## $t0 = 80B4E708 -/* 011B0 80B4BCF0 AD2B0004 */ sw $t3, 0x0004($t1) ## FFFFFFD0 -/* 011B4 80B4BCF4 A52C0008 */ sh $t4, 0x0008($t1) ## FFFFFFD4 -/* 011B8 80B4BCF8 8D0E0000 */ lw $t6, 0x0000($t0) ## 80B4E708 -/* 011BC 80B4BCFC 27AD0058 */ addiu $t5, $sp, 0x0058 ## $t5 = FFFFFFA0 -/* 011C0 80B4BD00 8D0F0004 */ lw $t7, 0x0004($t0) ## 80B4E70C -/* 011C4 80B4BD04 ADAE0000 */ sw $t6, 0x0000($t5) ## FFFFFFA0 -/* 011C8 80B4BD08 8D0E0008 */ lw $t6, 0x0008($t0) ## 80B4E710 -/* 011CC 80B4BD0C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 011D0 80B4BD10 ADAF0004 */ sw $t7, 0x0004($t5) ## FFFFFFA4 -/* 011D4 80B4BD14 ADAE0008 */ sw $t6, 0x0008($t5) ## FFFFFFA8 -/* 011D8 80B4BD18 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 011DC 80B4BD1C AFA4003C */ sw $a0, 0x003C($sp) -/* 011E0 80B4BD20 50400016 */ beql $v0, $zero, .L80B4BD7C -/* 011E4 80B4BD24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011E8 80B4BD28 8E190154 */ lw $t9, 0x0154($s0) ## 00000154 -/* 011EC 80B4BD2C 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 -/* 011F0 80B4BD30 27180B38 */ addiu $t8, $t8, 0x0B38 ## $t8 = 06010B38 -/* 011F4 80B4BD34 17190010 */ bne $t8, $t9, .L80B4BD78 -/* 011F8 80B4BD38 3C110601 */ lui $s1, 0x0601 ## $s1 = 06010000 -/* 011FC 80B4BD3C 26311348 */ addiu $s1, $s1, 0x1348 ## $s1 = 06011348 -/* 01200 80B4BD40 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01204 80B4BD44 02202025 */ or $a0, $s1, $zero ## $a0 = 06011348 -/* 01208 80B4BD48 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0120C 80B4BD4C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01210 80B4BD50 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 01214 80B4BD54 468021A0 */ cvt.s.w $f6, $f4 -/* 01218 80B4BD58 8FA4003C */ lw $a0, 0x003C($sp) -/* 0121C 80B4BD5C 02202825 */ or $a1, $s1, $zero ## $a1 = 06011348 -/* 01220 80B4BD60 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01224 80B4BD64 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01228 80B4BD68 AFA00014 */ sw $zero, 0x0014($sp) -/* 0122C 80B4BD6C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01230 80B4BD70 0C029468 */ jal SkelAnime_ChangeAnim - -/* 01234 80B4BD74 E7A80018 */ swc1 $f8, 0x0018($sp) -.L80B4BD78: -/* 01238 80B4BD78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B4BD7C: -/* 0123C 80B4BD7C 0C2D2E1D */ jal func_80B4B874 -/* 01240 80B4BD80 8FA500BC */ lw $a1, 0x00BC($sp) -/* 01244 80B4BD84 8FA900BC */ lw $t1, 0x00BC($sp) -/* 01248 80B4BD88 8D311D8C */ lw $s1, 0x1D8C($t1) ## 00001D8C -/* 0124C 80B4BD8C 12200062 */ beq $s1, $zero, .L80B4BF18 -/* 01250 80B4BD90 02202025 */ or $a0, $s1, $zero ## $a0 = 06011348 -/* 01254 80B4BD94 0C2D2DFD */ jal func_80B4B7F4 -/* 01258 80B4BD98 27A50070 */ addiu $a1, $sp, 0x0070 ## $a1 = FFFFFFB8 -/* 0125C 80B4BD9C 02202025 */ or $a0, $s1, $zero ## $a0 = 06011348 -/* 01260 80B4BDA0 0C2D2E0D */ jal func_80B4B834 -/* 01264 80B4BDA4 27A50064 */ addiu $a1, $sp, 0x0064 ## $a1 = FFFFFFAC -/* 01268 80B4BDA8 860201E6 */ lh $v0, 0x01E6($s0) ## 000001E6 -/* 0126C 80B4BDAC 27AA0070 */ addiu $t2, $sp, 0x0070 ## $t2 = FFFFFFB8 -/* 01270 80B4BDB0 54400016 */ bnel $v0, $zero, .L80B4BE0C -/* 01274 80B4BDB4 96230000 */ lhu $v1, 0x0000($s1) ## 06011348 -/* 01278 80B4BDB8 8D4C0000 */ lw $t4, 0x0000($t2) ## FFFFFFB8 -/* 0127C 80B4BDBC 27A30040 */ addiu $v1, $sp, 0x0040 ## $v1 = FFFFFF88 -/* 01280 80B4BDC0 AC6C0000 */ sw $t4, 0x0000($v1) ## FFFFFF88 -/* 01284 80B4BDC4 8D4B0004 */ lw $t3, 0x0004($t2) ## FFFFFFBC -/* 01288 80B4BDC8 8C680000 */ lw $t0, 0x0000($v1) ## FFFFFF88 -/* 0128C 80B4BDCC AC6B0004 */ sw $t3, 0x0004($v1) ## FFFFFF8C -/* 01290 80B4BDD0 8D4C0008 */ lw $t4, 0x0008($t2) ## FFFFFFC0 -/* 01294 80B4BDD4 AC6C0008 */ sw $t4, 0x0008($v1) ## FFFFFF90 -/* 01298 80B4BDD8 AE080008 */ sw $t0, 0x0008($s0) ## 00000008 -/* 0129C 80B4BDDC 8C6D0004 */ lw $t5, 0x0004($v1) ## FFFFFF8C -/* 012A0 80B4BDE0 860201E6 */ lh $v0, 0x01E6($s0) ## 000001E6 -/* 012A4 80B4BDE4 AE0D000C */ sw $t5, 0x000C($s0) ## 0000000C -/* 012A8 80B4BDE8 8C680008 */ lw $t0, 0x0008($v1) ## FFFFFF90 -/* 012AC 80B4BDEC AE080010 */ sw $t0, 0x0010($s0) ## 00000010 -/* 012B0 80B4BDF0 8C6E0000 */ lw $t6, 0x0000($v1) ## FFFFFF88 -/* 012B4 80B4BDF4 AE0E0024 */ sw $t6, 0x0024($s0) ## 00000024 -/* 012B8 80B4BDF8 8C6F0004 */ lw $t7, 0x0004($v1) ## FFFFFF8C -/* 012BC 80B4BDFC AE0F0028 */ sw $t7, 0x0028($s0) ## 00000028 -/* 012C0 80B4BE00 8C6E0008 */ lw $t6, 0x0008($v1) ## FFFFFF90 -/* 012C4 80B4BE04 AE0E002C */ sw $t6, 0x002C($s0) ## 0000002C -/* 012C8 80B4BE08 96230000 */ lhu $v1, 0x0000($s1) ## 06011348 -.L80B4BE0C: -/* 012CC 80B4BE0C 10620017 */ beq $v1, $v0, .L80B4BE6C -/* 012D0 80B4BE10 0003C080 */ sll $t8, $v1, 2 -/* 012D4 80B4BE14 03B82021 */ addu $a0, $sp, $t8 -/* 012D8 80B4BE18 0C028800 */ jal SkelAnime_GetFrameCount - -/* 012DC 80B4BE1C 8C840090 */ lw $a0, 0x0090($a0) ## 00000090 -/* 012E0 80B4BE20 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 012E4 80B4BE24 96230000 */ lhu $v1, 0x0000($s1) ## 06011348 -/* 012E8 80B4BE28 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 012EC 80B4BE2C 46805420 */ cvt.s.w $f16, $f10 -/* 012F0 80B4BE30 0003C880 */ sll $t9, $v1, 2 -/* 012F4 80B4BE34 03B92821 */ addu $a1, $sp, $t9 -/* 012F8 80B4BE38 8CA50090 */ lw $a1, 0x0090($a1) ## 00000090 -/* 012FC 80B4BE3C 03A34821 */ addu $t1, $sp, $v1 -/* 01300 80B4BE40 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 01304 80B4BE44 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 01308 80B4BE48 91290084 */ lbu $t1, 0x0084($t1) ## 00000084 -/* 0130C 80B4BE4C 8FA4003C */ lw $a0, 0x003C($sp) -/* 01310 80B4BE50 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01314 80B4BE54 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01318 80B4BE58 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 0131C 80B4BE5C 0C029468 */ jal SkelAnime_ChangeAnim - -/* 01320 80B4BE60 AFA90014 */ sw $t1, 0x0014($sp) -/* 01324 80B4BE64 962A0000 */ lhu $t2, 0x0000($s1) ## 06011348 -/* 01328 80B4BE68 A60A01E6 */ sh $t2, 0x01E6($s0) ## 000001E6 -.L80B4BE6C: -/* 0132C 80B4BE6C 27AB0058 */ addiu $t3, $sp, 0x0058 ## $t3 = FFFFFFA0 -/* 01330 80B4BE70 8D6D0000 */ lw $t5, 0x0000($t3) ## FFFFFFA0 -/* 01334 80B4BE74 AE0D005C */ sw $t5, 0x005C($s0) ## 0000005C -/* 01338 80B4BE78 8D6C0004 */ lw $t4, 0x0004($t3) ## FFFFFFA4 -/* 0133C 80B4BE7C AE0C0060 */ sw $t4, 0x0060($s0) ## 00000060 -/* 01340 80B4BE80 8D6D0008 */ lw $t5, 0x0008($t3) ## FFFFFFA8 -/* 01344 80B4BE84 AE0D0064 */ sw $t5, 0x0064($s0) ## 00000064 -/* 01348 80B4BE88 8FA800BC */ lw $t0, 0x00BC($sp) -/* 0134C 80B4BE8C 96220004 */ lhu $v0, 0x0004($s1) ## 0601134C -/* 01350 80B4BE90 950F1D74 */ lhu $t7, 0x1D74($t0) ## 00001D74 -/* 01354 80B4BE94 01E2082A */ slt $at, $t7, $v0 -/* 01358 80B4BE98 50200020 */ beql $at, $zero, .L80B4BF1C -/* 0135C 80B4BE9C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01360 80B4BEA0 962E0002 */ lhu $t6, 0x0002($s1) ## 0601134A -/* 01364 80B4BEA4 C7A60064 */ lwc1 $f6, 0x0064($sp) -/* 01368 80B4BEA8 C7A80070 */ lwc1 $f8, 0x0070($sp) -/* 0136C 80B4BEAC 004EC023 */ subu $t8, $v0, $t6 -/* 01370 80B4BEB0 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 01374 80B4BEB4 46083281 */ sub.s $f10, $f6, $f8 -/* 01378 80B4BEB8 C6020070 */ lwc1 $f2, 0x0070($s0) ## 00000070 -/* 0137C 80B4BEBC 46802020 */ cvt.s.w $f0, $f4 -/* 01380 80B4BEC0 46005403 */ div.s $f16, $f10, $f0 -/* 01384 80B4BEC4 E610005C */ swc1 $f16, 0x005C($s0) ## 0000005C -/* 01388 80B4BEC8 C7A40074 */ lwc1 $f4, 0x0074($sp) -/* 0138C 80B4BECC C7B20068 */ lwc1 $f18, 0x0068($sp) -/* 01390 80B4BED0 C610006C */ lwc1 $f16, 0x006C($s0) ## 0000006C -/* 01394 80B4BED4 46049181 */ sub.s $f6, $f18, $f4 -/* 01398 80B4BED8 46003203 */ div.s $f8, $f6, $f0 -/* 0139C 80B4BEDC E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 -/* 013A0 80B4BEE0 C60A0060 */ lwc1 $f10, 0x0060($s0) ## 00000060 -/* 013A4 80B4BEE4 46105480 */ add.s $f18, $f10, $f16 -/* 013A8 80B4BEE8 E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060 -/* 013AC 80B4BEEC C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 -/* 013B0 80B4BEF0 4602203C */ c.lt.s $f4, $f2 -/* 013B4 80B4BEF4 00000000 */ nop -/* 013B8 80B4BEF8 45020003 */ bc1fl .L80B4BF08 -/* 013BC 80B4BEFC C7A6006C */ lwc1 $f6, 0x006C($sp) -/* 013C0 80B4BF00 E6020060 */ swc1 $f2, 0x0060($s0) ## 00000060 -/* 013C4 80B4BF04 C7A6006C */ lwc1 $f6, 0x006C($sp) -.L80B4BF08: -/* 013C8 80B4BF08 C7A80078 */ lwc1 $f8, 0x0078($sp) -/* 013CC 80B4BF0C 46083281 */ sub.s $f10, $f6, $f8 -/* 013D0 80B4BF10 46005403 */ div.s $f16, $f10, $f0 -/* 013D4 80B4BF14 E6100064 */ swc1 $f16, 0x0064($s0) ## 00000064 -.L80B4BF18: -/* 013D8 80B4BF18 8FBF002C */ lw $ra, 0x002C($sp) -.L80B4BF1C: -/* 013DC 80B4BF1C 8FB00024 */ lw $s0, 0x0024($sp) -/* 013E0 80B4BF20 8FB10028 */ lw $s1, 0x0028($sp) -/* 013E4 80B4BF24 03E00008 */ jr $ra -/* 013E8 80B4BF28 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BF2C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BF2C.s deleted file mode 100644 index 5bf3aae701..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BF2C.s +++ /dev/null @@ -1,215 +0,0 @@ -.late_rodata -glabel jtbl_80B4E768 -.word L80B4BF6C -.word L80B4BFE0 -.word L80B4C070 -.word L80B4C0E8 -.word L80B4C130 -.word L80B4C17C -.word L80B4C1A0 -.word 0x00000000, 0x00000000, 0x00000000 - -.text -glabel func_80B4BF2C -/* 013EC 80B4BF2C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 013F0 80B4BF30 AFBF002C */ sw $ra, 0x002C($sp) -/* 013F4 80B4BF34 AFB10028 */ sw $s1, 0x0028($sp) -/* 013F8 80B4BF38 AFB00024 */ sw $s0, 0x0024($sp) -/* 013FC 80B4BF3C 948E01E2 */ lhu $t6, 0x01E2($a0) ## 000001E2 -/* 01400 80B4BF40 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01404 80B4BF44 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01408 80B4BF48 2DC10007 */ sltiu $at, $t6, 0x0007 -/* 0140C 80B4BF4C 102000A4 */ beq $at, $zero, .L80B4C1E0 -/* 01410 80B4BF50 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 01414 80B4BF54 000E7080 */ sll $t6, $t6, 2 -/* 01418 80B4BF58 3C0180B5 */ lui $at, %hi(jtbl_80B4E768) ## $at = 80B50000 -/* 0141C 80B4BF5C 002E0821 */ addu $at, $at, $t6 -/* 01420 80B4BF60 8C2EE768 */ lw $t6, %lo(jtbl_80B4E768)($at) -/* 01424 80B4BF64 01C00008 */ jr $t6 -/* 01428 80B4BF68 00000000 */ nop -glabel L80B4BF6C -/* 0142C 80B4BF6C 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 01430 80B4BF70 0C042F6F */ jal func_8010BDBC -/* 01434 80B4BF74 AFA40030 */ sw $a0, 0x0030($sp) -/* 01438 80B4BF78 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0143C 80B4BF7C 54410099 */ bnel $v0, $at, .L80B4C1E4 -/* 01440 80B4BF80 8E090038 */ lw $t1, 0x0038($s0) ## 00000038 -/* 01444 80B4BF84 0C041AF2 */ jal func_80106BC8 -/* 01448 80B4BF88 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0144C 80B4BF8C 10400094 */ beq $v0, $zero, .L80B4C1E0 -/* 01450 80B4BF90 8FAF0030 */ lw $t7, 0x0030($sp) -/* 01454 80B4BF94 25F87FFF */ addiu $t8, $t7, 0x7FFF ## $t8 = 00007FFF -/* 01458 80B4BF98 931863E6 */ lbu $t8, 0x63E6($t8) ## 0000E3E5 -/* 0145C 80B4BF9C 240A703A */ addiu $t2, $zero, 0x703A ## $t2 = 0000703A -/* 01460 80B4BFA0 3145FFFF */ andi $a1, $t2, 0xFFFF ## $a1 = 0000703A -/* 01464 80B4BFA4 1700000A */ bne $t8, $zero, .L80B4BFD0 -/* 01468 80B4BFA8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0146C 80B4BFAC 2419703B */ addiu $t9, $zero, 0x703B ## $t9 = 0000703B -/* 01470 80B4BFB0 A619010E */ sh $t9, 0x010E($s0) ## 0000010E -/* 01474 80B4BFB4 3325FFFF */ andi $a1, $t9, 0xFFFF ## $a1 = 0000703B -/* 01478 80B4BFB8 0C042DC8 */ jal func_8010B720 -/* 0147C 80B4BFBC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01480 80B4BFC0 860801E2 */ lh $t0, 0x01E2($s0) ## 000001E2 -/* 01484 80B4BFC4 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 01488 80B4BFC8 10000085 */ beq $zero, $zero, .L80B4C1E0 -/* 0148C 80B4BFCC A60901E2 */ sh $t1, 0x01E2($s0) ## 000001E2 -.L80B4BFD0: -/* 01490 80B4BFD0 0C042DC8 */ jal func_8010B720 -/* 01494 80B4BFD4 A60A010E */ sh $t2, 0x010E($s0) ## 0000010E -/* 01498 80B4BFD8 10000081 */ beq $zero, $zero, .L80B4C1E0 -/* 0149C 80B4BFDC A60001E2 */ sh $zero, 0x01E2($s0) ## 000001E2 -glabel L80B4BFE0 -/* 014A0 80B4BFE0 0C042F6F */ jal func_8010BDBC -/* 014A4 80B4BFE4 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 014A8 80B4BFE8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 014AC 80B4BFEC 5441007D */ bnel $v0, $at, .L80B4C1E4 -/* 014B0 80B4BFF0 8E090038 */ lw $t1, 0x0038($s0) ## 00000038 -/* 014B4 80B4BFF4 0C041AF2 */ jal func_80106BC8 -/* 014B8 80B4BFF8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 014BC 80B4BFFC 10400078 */ beq $v0, $zero, .L80B4C1E0 -/* 014C0 80B4C000 340BFFFF */ ori $t3, $zero, 0xFFFF ## $t3 = 0000FFFF -/* 014C4 80B4C004 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 014C8 80B4C008 A60B010E */ sh $t3, 0x010E($s0) ## 0000010E -/* 014CC 80B4C00C 0331C821 */ addu $t9, $t9, $s1 -/* 014D0 80B4C010 8F391D5C */ lw $t9, 0x1D5C($t9) ## 00011D5C -/* 014D4 80B4C014 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 014D8 80B4C018 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 014DC 80B4C01C 0320F809 */ jalr $ra, $t9 -/* 014E0 80B4C020 00000000 */ nop -/* 014E4 80B4C024 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 014E8 80B4C028 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 014EC 80B4C02C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014F0 80B4C030 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 014F4 80B4C034 2406000B */ addiu $a2, $zero, 0x000B ## $a2 = 0000000B -/* 014F8 80B4C038 3C0742F0 */ lui $a3, 0x42F0 ## $a3 = 42F00000 -/* 014FC 80B4C03C 0C00BD0D */ jal func_8002F434 -/* 01500 80B4C040 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01504 80B4C044 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01508 80B4C048 00310821 */ addu $at, $at, $s1 -/* 0150C 80B4C04C 240C0036 */ addiu $t4, $zero, 0x0036 ## $t4 = 00000036 -/* 01510 80B4C050 A02C03DC */ sb $t4, 0x03DC($at) ## 000103DC -/* 01514 80B4C054 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01518 80B4C058 00310821 */ addu $at, $at, $s1 -/* 0151C 80B4C05C 240D0004 */ addiu $t5, $zero, 0x0004 ## $t5 = 00000004 -/* 01520 80B4C060 A02D04BF */ sb $t5, 0x04BF($at) ## 000104BF -/* 01524 80B4C064 860E01E2 */ lh $t6, 0x01E2($s0) ## 000001E2 -/* 01528 80B4C068 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 0152C 80B4C06C A60F01E2 */ sh $t7, 0x01E2($s0) ## 000001E2 -glabel L80B4C070 -/* 01530 80B4C070 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01534 80B4C074 0C00BD04 */ jal func_8002F410 -/* 01538 80B4C078 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0153C 80B4C07C 10400011 */ beq $v0, $zero, .L80B4C0C4 -/* 01540 80B4C080 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01544 80B4C084 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01548 80B4C088 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0154C 80B4C08C 0C0301E3 */ jal func_800C078C -/* 01550 80B4C090 860601E8 */ lh $a2, 0x01E8($s0) ## 000001E8 -/* 01554 80B4C094 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01558 80B4C098 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0155C 80B4C09C 0C0300C5 */ jal Gameplay_ChangeCameraStatus -/* 01560 80B4C0A0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 01564 80B4C0A4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01568 80B4C0A8 0C0300E1 */ jal Gameplay_ClearCamera -/* 0156C 80B4C0AC 860501E8 */ lh $a1, 0x01E8($s0) ## 000001E8 -/* 01570 80B4C0B0 861801E2 */ lh $t8, 0x01E2($s0) ## 000001E2 -/* 01574 80B4C0B4 AE000118 */ sw $zero, 0x0118($s0) ## 00000118 -/* 01578 80B4C0B8 27080001 */ addiu $t0, $t8, 0x0001 ## $t0 = 00000001 -/* 0157C 80B4C0BC 10000048 */ beq $zero, $zero, .L80B4C1E0 -/* 01580 80B4C0C0 A60801E2 */ sh $t0, 0x01E2($s0) ## 000001E2 -.L80B4C0C4: -/* 01584 80B4C0C4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01588 80B4C0C8 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 0158C 80B4C0CC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01590 80B4C0D0 2406000B */ addiu $a2, $zero, 0x000B ## $a2 = 0000000B -/* 01594 80B4C0D4 3C0742F0 */ lui $a3, 0x42F0 ## $a3 = 42F00000 -/* 01598 80B4C0D8 0C00BD0D */ jal func_8002F434 -/* 0159C 80B4C0DC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 015A0 80B4C0E0 10000040 */ beq $zero, $zero, .L80B4C1E4 -/* 015A4 80B4C0E4 8E090038 */ lw $t1, 0x0038($s0) ## 00000038 -glabel L80B4C0E8 -/* 015A8 80B4C0E8 0C042F6F */ jal func_8010BDBC -/* 015AC 80B4C0EC 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 015B0 80B4C0F0 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 015B4 80B4C0F4 5441003B */ bnel $v0, $at, .L80B4C1E4 -/* 015B8 80B4C0F8 8E090038 */ lw $t1, 0x0038($s0) ## 00000038 -/* 015BC 80B4C0FC 0C041AF2 */ jal func_80106BC8 -/* 015C0 80B4C100 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 015C4 80B4C104 10400036 */ beq $v0, $zero, .L80B4C1E0 -/* 015C8 80B4C108 2409703C */ addiu $t1, $zero, 0x703C ## $t1 = 0000703C -/* 015CC 80B4C10C A609010E */ sh $t1, 0x010E($s0) ## 0000010E -/* 015D0 80B4C110 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 015D4 80B4C114 0C042DC8 */ jal func_8010B720 -/* 015D8 80B4C118 3125FFFF */ andi $a1, $t1, 0xFFFF ## $a1 = 0000703C -/* 015DC 80B4C11C 0C00D6DD */ jal Flags_SetEventChkInf - -/* 015E0 80B4C120 24040040 */ addiu $a0, $zero, 0x0040 ## $a0 = 00000040 -/* 015E4 80B4C124 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 -/* 015E8 80B4C128 1000002D */ beq $zero, $zero, .L80B4C1E0 -/* 015EC 80B4C12C A60A01E2 */ sh $t2, 0x01E2($s0) ## 000001E2 -glabel L80B4C130 -/* 015F0 80B4C130 C4480028 */ lwc1 $f8, 0x0028($v0) ## 00000028 -/* 015F4 80B4C134 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 015F8 80B4C138 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015FC 80B4C13C 460A403C */ c.lt.s $f8, $f10 -/* 01600 80B4C140 00000000 */ nop -/* 01604 80B4C144 45030027 */ bc1tl .L80B4C1E4 -/* 01608 80B4C148 8E090038 */ lw $t1, 0x0038($s0) ## 00000038 -/* 0160C 80B4C14C 0C00BC65 */ jal func_8002F194 -/* 01610 80B4C150 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01614 80B4C154 10400005 */ beq $v0, $zero, .L80B4C16C -/* 01618 80B4C158 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0161C 80B4C15C 860B01E2 */ lh $t3, 0x01E2($s0) ## 000001E2 -/* 01620 80B4C160 25790001 */ addiu $t9, $t3, 0x0001 ## $t9 = 00000001 -/* 01624 80B4C164 1000001E */ beq $zero, $zero, .L80B4C1E0 -/* 01628 80B4C168 A61901E2 */ sh $t9, 0x01E2($s0) ## 000001E2 -.L80B4C16C: -/* 0162C 80B4C16C 0C00BCBD */ jal func_8002F2F4 -/* 01630 80B4C170 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01634 80B4C174 1000001B */ beq $zero, $zero, .L80B4C1E4 -/* 01638 80B4C178 8E090038 */ lw $t1, 0x0038($s0) ## 00000038 -glabel L80B4C17C -/* 0163C 80B4C17C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01640 80B4C180 0C00BCCD */ jal func_8002F334 -/* 01644 80B4C184 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01648 80B4C188 50400016 */ beql $v0, $zero, .L80B4C1E4 -/* 0164C 80B4C18C 8E090038 */ lw $t1, 0x0038($s0) ## 00000038 -/* 01650 80B4C190 860C01E2 */ lh $t4, 0x01E2($s0) ## 000001E2 -/* 01654 80B4C194 258DFFFF */ addiu $t5, $t4, 0xFFFF ## $t5 = FFFFFFFF -/* 01658 80B4C198 10000011 */ beq $zero, $zero, .L80B4C1E0 -/* 0165C 80B4C19C A60D01E2 */ sh $t5, 0x01E2($s0) ## 000001E2 -glabel L80B4C1A0 -/* 01660 80B4C1A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01664 80B4C1A4 0C00BCCD */ jal func_8002F334 -/* 01668 80B4C1A8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0166C 80B4C1AC 1040000C */ beq $v0, $zero, .L80B4C1E0 -/* 01670 80B4C1B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01674 80B4C1B4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01678 80B4C1B8 0C00B7D5 */ jal func_8002DF54 -/* 0167C 80B4C1BC 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 01680 80B4C1C0 0C020978 */ jal Interface_ChangeAlpha -/* 01684 80B4C1C4 24040032 */ addiu $a0, $zero, 0x0032 ## $a0 = 00000032 -/* 01688 80B4C1C8 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 0168C 80B4C1CC 2401FEFF */ addiu $at, $zero, 0xFEFF ## $at = FFFFFEFF -/* 01690 80B4C1D0 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 -/* 01694 80B4C1D4 01C17824 */ and $t7, $t6, $at -/* 01698 80B4C1D8 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 0169C 80B4C1DC A61801E2 */ sh $t8, 0x01E2($s0) ## 000001E2 -.L80B4C1E0: -/* 016A0 80B4C1E0 8E090038 */ lw $t1, 0x0038($s0) ## 00000038 -.L80B4C1E4: -/* 016A4 80B4C1E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 016A8 80B4C1E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 016AC 80B4C1EC AFA90010 */ sw $t1, 0x0010($sp) -/* 016B0 80B4C1F0 8E08003C */ lw $t0, 0x003C($s0) ## 0000003C -/* 016B4 80B4C1F4 26060200 */ addiu $a2, $s0, 0x0200 ## $a2 = 00000200 -/* 016B8 80B4C1F8 26070206 */ addiu $a3, $s0, 0x0206 ## $a3 = 00000206 -/* 016BC 80B4C1FC AFA80014 */ sw $t0, 0x0014($sp) -/* 016C0 80B4C200 8E090040 */ lw $t1, 0x0040($s0) ## 00000040 -/* 016C4 80B4C204 0C00E0A4 */ jal func_80038290 -/* 016C8 80B4C208 AFA90018 */ sw $t1, 0x0018($sp) -/* 016CC 80B4C20C 8FBF002C */ lw $ra, 0x002C($sp) -/* 016D0 80B4C210 8FB00024 */ lw $s0, 0x0024($sp) -/* 016D4 80B4C214 8FB10028 */ lw $s1, 0x0028($sp) -/* 016D8 80B4C218 03E00008 */ jr $ra -/* 016DC 80B4C21C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4C340.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4C340.s deleted file mode 100644 index 5be83fbcc7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4C340.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_80B4C340 -/* 01800 80B4C340 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01804 80B4C344 AFA40000 */ sw $a0, 0x0000($sp) -/* 01808 80B4C348 10A10008 */ beq $a1, $at, .L80B4C36C -/* 0180C 80B4C34C AFA7000C */ sw $a3, 0x000C($sp) -/* 01810 80B4C350 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01814 80B4C354 10A10005 */ beq $a1, $at, .L80B4C36C -/* 01818 80B4C358 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0181C 80B4C35C 10A10003 */ beq $a1, $at, .L80B4C36C -/* 01820 80B4C360 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01824 80B4C364 54A10003 */ bnel $a1, $at, .L80B4C374 -/* 01828 80B4C368 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -.L80B4C36C: -/* 0182C 80B4C36C ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 -/* 01830 80B4C370 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -.L80B4C374: -/* 01834 80B4C374 10A10013 */ beq $a1, $at, .L80B4C3C4 -/* 01838 80B4C378 8FA20014 */ lw $v0, 0x0014($sp) -/* 0183C 80B4C37C 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 01840 80B4C380 14A1001D */ bne $a1, $at, .L80B4C3F8 -/* 01844 80B4C384 8FA20014 */ lw $v0, 0x0014($sp) -/* 01848 80B4C388 8FA30010 */ lw $v1, 0x0010($sp) -/* 0184C 80B4C38C 844F0202 */ lh $t7, 0x0202($v0) ## 00000202 -/* 01850 80B4C390 846E0000 */ lh $t6, 0x0000($v1) ## 00000000 -/* 01854 80B4C394 84790002 */ lh $t9, 0x0002($v1) ## 00000002 -/* 01858 80B4C398 846A0004 */ lh $t2, 0x0004($v1) ## 00000004 -/* 0185C 80B4C39C 01CFC021 */ addu $t8, $t6, $t7 -/* 01860 80B4C3A0 A4780000 */ sh $t8, 0x0000($v1) ## 00000000 -/* 01864 80B4C3A4 84480204 */ lh $t0, 0x0204($v0) ## 00000204 -/* 01868 80B4C3A8 03284821 */ addu $t1, $t9, $t0 -/* 0186C 80B4C3AC A4690002 */ sh $t1, 0x0002($v1) ## 00000002 -/* 01870 80B4C3B0 844B0200 */ lh $t3, 0x0200($v0) ## 00000200 -/* 01874 80B4C3B4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01878 80B4C3B8 014B6021 */ addu $t4, $t2, $t3 -/* 0187C 80B4C3BC 03E00008 */ jr $ra -/* 01880 80B4C3C0 A46C0004 */ sh $t4, 0x0004($v1) ## 00000004 -.L80B4C3C4: -/* 01884 80B4C3C4 8FA30010 */ lw $v1, 0x0010($sp) -/* 01888 80B4C3C8 844E0208 */ lh $t6, 0x0208($v0) ## 00000208 -/* 0188C 80B4C3CC 846D0000 */ lh $t5, 0x0000($v1) ## 00000000 -/* 01890 80B4C3D0 84780002 */ lh $t8, 0x0002($v1) ## 00000002 -/* 01894 80B4C3D4 84690004 */ lh $t1, 0x0004($v1) ## 00000004 -/* 01898 80B4C3D8 01AE7821 */ addu $t7, $t5, $t6 -/* 0189C 80B4C3DC A46F0000 */ sh $t7, 0x0000($v1) ## 00000000 -/* 018A0 80B4C3E0 84590206 */ lh $t9, 0x0206($v0) ## 00000206 -/* 018A4 80B4C3E4 03194021 */ addu $t0, $t8, $t9 -/* 018A8 80B4C3E8 A4680002 */ sh $t0, 0x0002($v1) ## 00000002 -/* 018AC 80B4C3EC 844A020A */ lh $t2, 0x020A($v0) ## 0000020A -/* 018B0 80B4C3F0 012A5821 */ addu $t3, $t1, $t2 -/* 018B4 80B4C3F4 A46B0004 */ sh $t3, 0x0004($v1) ## 00000004 -.L80B4C3F8: -/* 018B8 80B4C3F8 03E00008 */ jr $ra -/* 018BC 80B4C3FC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4C400.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4C400.s deleted file mode 100644 index 9bb1835daa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4C400.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B4C400 -/* 018C0 80B4C400 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 018C4 80B4C404 3C0E80B5 */ lui $t6, %hi(D_80B4E714) ## $t6 = 80B50000 -/* 018C8 80B4C408 AFBF0014 */ sw $ra, 0x0014($sp) -/* 018CC 80B4C40C AFA40028 */ sw $a0, 0x0028($sp) -/* 018D0 80B4C410 AFA60030 */ sw $a2, 0x0030($sp) -/* 018D4 80B4C414 AFA70034 */ sw $a3, 0x0034($sp) -/* 018D8 80B4C418 25CEE714 */ addiu $t6, $t6, %lo(D_80B4E714) ## $t6 = 80B4E714 -/* 018DC 80B4C41C 8DD80000 */ lw $t8, 0x0000($t6) ## 80B4E714 -/* 018E0 80B4C420 27A4001C */ addiu $a0, $sp, 0x001C ## $a0 = FFFFFFF4 -/* 018E4 80B4C424 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 018E8 80B4C428 AC980000 */ sw $t8, 0x0000($a0) ## FFFFFFF4 -/* 018EC 80B4C42C 8DCF0004 */ lw $t7, 0x0004($t6) ## 80B4E718 -/* 018F0 80B4C430 AC8F0004 */ sw $t7, 0x0004($a0) ## FFFFFFF8 -/* 018F4 80B4C434 8DD80008 */ lw $t8, 0x0008($t6) ## 80B4E71C -/* 018F8 80B4C438 14A10004 */ bne $a1, $at, .L80B4C44C -/* 018FC 80B4C43C AC980008 */ sw $t8, 0x0008($a0) ## FFFFFFFC -/* 01900 80B4C440 8FA50038 */ lw $a1, 0x0038($sp) -/* 01904 80B4C444 0C0346BD */ jal Matrix_MultVec3f -/* 01908 80B4C448 24A50038 */ addiu $a1, $a1, 0x0038 ## $a1 = 00000038 -.L80B4C44C: -/* 0190C 80B4C44C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01910 80B4C450 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01914 80B4C454 03E00008 */ jr $ra -/* 01918 80B4C458 00000000 */ nop diff --git a/data/overlays/actors/z_en_zl1.data.s b/data/overlays/actors/z_en_zl1.data.s deleted file mode 100644 index 2179e628b6..0000000000 --- a/data/overlays/actors/z_en_zl1.data.s +++ /dev/null @@ -1,135 +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_80B4C5D0 - .word 0x0000001C, 0x00000BB8, 0x0000000A, 0x00000003, 0x00050190, 0x04BB0000, 0xC0000000, 0xFFFFFE5A, 0x00000054, 0x00000001, 0xFFFFFE5A, 0x00000054, 0x00000001, 0x0F6484E4, 0x00000000, 0x00000001, 0x000104BB, 0x04D90000, 0xC0000000, 0xFFFFFE5A, 0x00000054, 0x00000001, 0xFFFFFE1D, 0x00000054, 0x00000000, 0x0F6484E4, 0x00000000, 0x00000001, 0x002904D9, 0x051F0000, 0xC0000000, 0xFFFFFE1D, 0x00000054, 0x00000000, 0xFFFFFE1D, 0x00000054, 0x00000000, 0x0F6484E4, 0x00000000, 0x00000001, 0x00000012, 0x00000001, 0x00070492, 0x05247477, 0x00000000, 0xFFFFFE1B, 0x00000054, 0x00000000, 0xFFFFFE2B, 0x00000055, 0xFFFFFFC9, 0x3DE07038, 0x3BE07038, 0xBDE07038, 0x00000049, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFE8, 0x00000003, 0x00000000, 0xFFFFFFE8, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000003, 0x000904C4, 0x051E8000, 0x00000000, 0xFFFFFC86, 0x0000005A, 0x00000096, 0xFFFFFC86, 0x0000005A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000A051E, 0x05A90000, 0x00000000, 0xFFFFFC86, 0x0000005A, 0x00000000, 0xFFFFFC86, 0x0000005A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000405A9, 0x05B10000, 0x00000000, 0xFFFFFC86, 0x0000005A, 0x00000000, 0xFFFFFC86, 0x0000005A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x000C05B4, 0x05B50000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000002, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x0000001D, 0x00000001, 0x0002014A, 0x02FB0000, 0x00000000, 0xFFFFFB1E, 0x00000096, 0x00000000, 0xFFFFFB1E, 0x00000096, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000002D, 0x00000001, 0x000100C8, 0x00E700E7, 0x0000002D, 0x00000001, 0x000500E6, 0x010F010F, 0x0000002D, 0x00000001, 0x0001035C, 0x03660366, 0x0000002D, 0x00000001, 0x0005036B, 0x03840384, 0x00000001, 0x00010000, 0x014B0000, 0x00000000, 0x42733334, 0xFE410080, 0x00012031, 0x00000000, 0x42733334, 0xFE410080, 0x00013533, 0x00000000, 0x42733334, 0xFE410080, 0x00013833, 0x00000000, 0x42733334, 0xFE410080, 0x00012C20, 0x00000000, 0x42733334, 0xFE780091, 0x00012032, 0x00000000, 0x42733334, 0xFEC200A8, 0x00013533, 0x00000000, 0x42733334, 0xFF2200C6, 0x00013639, 0x00000000, 0x42733334, 0xFF6E00DD, 0x0001392C, 0x00000000, 0x42733334, 0xFF7C00DE, 0x00012032, 0x00000000, 0x42733334, 0xFFBE010B, 0x00013632, 0x00000000, 0x42733334, 0xFFBE010B, 0x00013639, 0x00000000, 0x42733334, 0xFFBE010B, 0x0001392C, 0x00000000, 0x42733334, 0xFFBE010B, 0x00012031, 0x00000000, 0x42733334, 0xFFBE010B, 0x00013533, 0xFF000000, 0x42733334, 0xFFBE010B, 0x00013336, 0x00000001, 0x000100E6, 0x065F0000, 0x00000000, 0x42700000, 0xFB3C01BD, 0x00182031, 0x00000000, 0x42700000, 0xFB3C01BD, 0x00183533, 0x00000000, 0x42700000, 0xFB3C01BD, 0x00183833, 0x00000000, 0x42700000, 0xFB3C01BD, 0x00182C20, 0x00000000, 0x42700000, 0xFB3C01BD, 0x00182032, 0x00000000, 0x42700000, 0xFB3C01BD, 0x00183533, 0x00000000, 0x42700000, 0xFB3C01BD, 0x00183639, 0x00000000, 0x42700000, 0xFB3C01BD, 0x0018392C, 0x00000000, 0x42700000, 0xFB3C01BD, 0x00182032, 0x00000000, 0x42700000, 0xFB3C0103, 0x00183632, 0x00000000, 0x42700000, 0xFB3C00BD, 0x00183639, 0x00000000, 0x42700000, 0xFB9100C6, 0x0051392C, 0x00000000, 0x42700000, 0xFB940077, 0x00542031, 0x00000000, 0x42726667, 0xFB510089, 0x00243533, 0x00000000, 0x42726667, 0xFB3E007F, 0x00163336, 0x00000000, 0x42726667, 0xFB3E007F, 0x0016332C, 0x00000000, 0x42726667, 0xFB3E007F, 0x00162032, 0x00000000, 0x42726667, 0xFB3E007F, 0x00163231, 0x00000000, 0x42726667, 0xFB3E007F, 0x00163232, 0x00000000, 0x42726667, 0xFB3E007F, 0x0016392C, 0x00000000, 0x42726667, 0xFB3E007F, 0x00162034, 0x00000000, 0x42726667, 0xFB3E007F, 0x00163331, 0x00000000, 0x42726667, 0xFB3E007F, 0x00163434, 0x00000000, 0x42726667, 0xFB3E007F, 0x0016312C, 0x00000000, 0x42726667, 0xFB3E007F, 0x00162032, 0x00000000, 0x42726667, 0xFB3E007F, 0x00163136, 0x00000000, 0x42726667, 0xFB3E007F, 0x00163336, 0x00000000, 0x42726667, 0xFB3E007F, 0x0016332C, 0x00000000, 0x42726667, 0xFB3E007F, 0x0016200A, 0x00000000, 0x42726667, 0xFB3E007F, 0x00163136, 0xFF000000, 0x42726667, 0xFB3E007F, 0x00163336, 0x00000001, 0x0001032A, 0x04110000, 0x00000000, 0x42726668, 0xFB3E007F, 0x00162031, 0x00000000, 0x42726668, 0xFB3E007F, 0x00163533, 0x00000000, 0x42726668, 0xFB3E007F, 0x00163833, 0x00000000, 0x42726668, 0xFB3E0058, 0x00152C20, 0x00000000, 0x42726668, 0xFB48FFCC, 0x00172032, 0x00000000, 0x42726668, 0xFB4FFF8E, 0x001A3533, 0x00000000, 0x42726668, 0xFB4FFF8E, 0x001A3639, 0x00000000, 0x42726668, 0xFB4FFF8E, 0x001A392C, 0x00000000, 0x42726668, 0xFB4FFF8E, 0x001A2032, 0x00000000, 0x42726668, 0xFB4FFF8E, 0x001A3632, 0xFF000000, 0x42726668, 0xFB4FFF8E, 0x001A3639, 0x00000001, 0x00010366, 0x04ED0000, 0x00000000, 0x42A08C84, 0xFFC500A0, 0x01402031, 0x00000000, 0x42704C78, 0xFFC500A0, 0x01403533, 0x00000000, 0x42704C78, 0xFFC500A0, 0x01403833, 0x00000000, 0x42704C78, 0xFFC500A0, 0x01402C20, 0x00000000, 0x42704C78, 0xFF8D0094, 0x00F92032, 0x00000000, 0x42704C78, 0xFF42007E, 0x00C03533, 0x00000000, 0x42704C78, 0xFEE20069, 0x00873639, 0x00000000, 0x42704C78, 0xFE9B006C, 0x0057392C, 0x00000000, 0x42704C78, 0xFE760068, 0x00352032, 0x00000000, 0x42704C78, 0xFE760068, 0x00353632, 0x00000000, 0x42704C78, 0xFE760068, 0x00353639, 0x00000000, 0x42704C78, 0xFE760068, 0x0035392C, 0x00000000, 0x42704C78, 0xFE760068, 0x00352031, 0xFF000000, 0x42704C78, 0xFE760068, 0x00353533, 0x00000001, 0x00010488, 0x05790000, 0x00000000, 0x42700000, 0xFE3500AF, 0x00502031, 0x00000000, 0x42700000, 0xFE3500AF, 0x00503533, 0x00000000, 0x42700000, 0xFE3500AF, 0x00503833, 0x00000000, 0x42700000, 0xFE3500AF, 0x00502C20, 0x00000000, 0x42700000, 0xFE3500AF, 0x00502032, 0x00000000, 0x42700000, 0xFE3500AF, 0x00503533, 0x00000000, 0x42700000, 0xFE3500AF, 0x00503639, 0x00000000, 0x42700000, 0xFE3500AF, 0x0050392C, 0xFF000000, 0x42700000, 0xFE3500AF, 0x00502032, 0x00000001, 0x000104EC, 0x05830000, 0x00000000, 0x4234CCBE, 0xFE330085, 0x00002031, 0x00000000, 0x4234CCBE, 0xFE330085, 0x00003533, 0x00000000, 0x4234CCBE, 0xFE330085, 0x00003833, 0x00000000, 0x4234CCBE, 0xFE330085, 0x00002C20, 0x00000000, 0x4234CCBE, 0xFE330085, 0x00002032, 0xFF000000, 0x4234CCBE, 0xFE330085, 0x00003533, 0x00000001, 0x00010528, 0x05FB0000, 0x00000000, 0x412FFF56, 0xFE18007C, 0xFFFA2031, 0x00000000, 0x412FFF56, 0xFE18007C, 0xFFFA3533, 0x00000000, 0x412FFF56, 0xFE18007C, 0xFFFA3833, 0x00000000, 0x412FFF56, 0xFE18007C, 0xFFFA2C20, 0x00000000, 0x412FFF56, 0xFE18007C, 0xFFFA2032, 0x00000000, 0x412FFF56, 0xFE18007C, 0xFFFA3533, 0x00000000, 0x412FFF56, 0xFE18007C, 0xFFFA3639, 0xFF000000, 0x412FFF56, 0xFE18007C, 0xFFFA392C, 0x00000002, 0x00010000, 0x01680000, 0x0000001E, 0x42726667, 0xFE06006E, 0x00012031, 0x0000001E, 0x42733334, 0xFE06006E, 0x00013533, 0x0000001E, 0x42733334, 0xFE06006E, 0x00013833, 0x0000001E, 0x42733334, 0xFE06006E, 0x00012C20, 0x00000019, 0x42733334, 0xFE3D007F, 0x00012032, 0x00000019, 0x42733334, 0xFE840095, 0x00013533, 0x00000014, 0x42733334, 0xFEDD00B1, 0x00013639, 0x00000014, 0x42733334, 0xFF2000D2, 0x0001392C, 0x00000014, 0x42733334, 0xFF2B00E6, 0x00012032, 0x00000014, 0x42733334, 0xFF710123, 0x00013632, 0x00000014, 0x42733334, 0xFF790134, 0x00013639, 0x00000014, 0x42733334, 0xFF81013F, 0x0001392C, 0x00000014, 0x42733334, 0xFF880146, 0x00012031, 0x00000014, 0x42733334, 0xFF880146, 0x00013533, 0xFF00001E, 0x42733334, 0xFF880146, 0x00013336, 0x00000002, 0x000100E6, 0x06AE0000, 0x0000001E, 0x42700000, 0xFB22019D, 0x00052031, 0x0000001E, 0x42700000, 0xFB22019D, 0x00053533, 0x0000001E, 0x42700000, 0xFB22019D, 0x00053833, 0x0000001E, 0x42700000, 0xFB22019D, 0x00052C20, 0x0000001E, 0x42700000, 0xFB22019D, 0x00052032, 0x0000001E, 0x42700000, 0xFB22019D, 0x00053533, 0x0000001E, 0x42700000, 0xFB22019D, 0x00053639, 0x0000001E, 0x42700000, 0xFB22019D, 0x0005392C, 0x0000001E, 0x42700000, 0xFB22019D, 0x00052032, 0x0000001E, 0x42700000, 0xFB2300E3, 0x00053632, 0x0000001E, 0x42700000, 0xFB23009E, 0x00053639, 0x0000001E, 0x42700000, 0xFB6400B2, 0x0032392C, 0x00000050, 0x42700000, 0xFB660083, 0x00332031, 0x00000050, 0x42726667, 0xFB280092, 0x00063533, 0x0000001E, 0x42726667, 0xFB1B0099, 0xFFFD3336, 0x0000001E, 0x42726667, 0xFB1B0099, 0xFFFD332C, 0x0000001E, 0x42726667, 0xFB1B0099, 0xFFFD2032, 0x0000001E, 0x42726667, 0xFB1B0099, 0xFFFD3231, 0x0000001E, 0x42726667, 0xFB1B0099, 0xFFFD3232, 0x0000001E, 0x42726667, 0xFB1C0098, 0xFFFE392C, 0x0000001E, 0x42726667, 0xFB1C0098, 0xFFFE2034, 0x00000050, 0x42726667, 0xFB1C0098, 0xFFFE3331, 0x00000050, 0x42726667, 0xFB1C0098, 0xFFFE3434, 0x00000050, 0x42726667, 0xFB1C0098, 0xFFFE312C, 0x00000050, 0x42726667, 0xFB1D0097, 0xFFFF2032, 0x00000050, 0x42726667, 0xFB1D0097, 0xFFFF3136, 0x00000050, 0x42726667, 0xFB1D0097, 0xFFFF3336, 0x00000050, 0x42726667, 0xFB1D0097, 0xFFFF332C, 0x00000050, 0x42726667, 0xFB1D0097, 0xFFFF200A, 0x0000001E, 0x42726667, 0xFB1D0097, 0xFFFF3136, 0xFF000050, 0x42726667, 0xFB1D0097, 0xFFFF3336, 0x00000002, 0x0001032A, 0x042E0000, 0x0000001E, 0x42726668, 0xFB1D0097, 0xFFFF2031, 0x0000001E, 0x42726668, 0xFB1D0097, 0xFFFF3533, 0x00000014, 0x42726668, 0xFB1E0096, 0x00003833, 0x0000000A, 0x42726668, 0xFB27007D, 0x00052C20, 0x0000000A, 0x42726668, 0xFB36FFF3, 0x000A2032, 0x0000000A, 0x42726668, 0xFB3EFFB7, 0x001A3533, 0x0000001E, 0x42726668, 0xFB3EFFB7, 0x001A3639, 0x0000001E, 0x42726668, 0xFB3EFFB7, 0x001A392C, 0x0000001E, 0x42726668, 0xFB3EFFB7, 0x001A2032, 0x0000001E, 0x42726668, 0xFB3EFFB7, 0x001A3632, 0xFF00001E, 0x42726668, 0xFB3EFFB7, 0x001A3639, 0x00000002, 0x00010366, 0x050A0000, 0x0000001E, 0x42704C78, 0xFFD300F0, 0x00F12031, 0x0000001E, 0x42704C78, 0xFFD300F0, 0x00F13533, 0x0000001E, 0x42704C78, 0xFFC800DB, 0x00E03833, 0x0000001E, 0x42704C78, 0xFFAB00B7, 0x00D42C20, 0x0000001E, 0x42704C78, 0xFF340086, 0x00B72032, 0x0000001E, 0x42704C78, 0xFEE80074, 0x007D3533, 0x0000001E, 0x42704C78, 0xFE880068, 0x00453639, 0x0000001E, 0x42704C78, 0xFE48006B, 0x000D392C, 0x0000001E, 0x42704C78, 0xFE2D006E, 0xFFE72032, 0x0000001E, 0x42704C78, 0xFE2D006E, 0xFFE73632, 0x0000001E, 0x42704C78, 0xFE2D006E, 0xFFE73639, 0x0000001E, 0x42704C78, 0xFE2D006E, 0xFFE7392C, 0x0000001E, 0x42704C78, 0xFE2D006E, 0xFFE72031, 0xFF00001E, 0x42704C78, 0xFE2D006E, 0xFFE73533, 0x00000002, 0x00010488, 0x05960000, 0x0000001E, 0x42700000, 0xFE38008A, 0x00102031, 0x0000001E, 0x42700000, 0xFE38008A, 0x00103533, 0x0000001E, 0x42700000, 0xFE38008A, 0x00103833, 0x0000001E, 0x42700000, 0xFE38008A, 0x00102C20, 0x0000001E, 0x42700000, 0xFE38008A, 0x00102032, 0x0000001E, 0x42700000, 0xFE38008A, 0x00103533, 0x0000001E, 0x42700000, 0xFE38008A, 0x00103639, 0x0000001E, 0x42700000, 0xFE38008A, 0x0010392C, 0xFF00001E, 0x42700000, 0xFE38008A, 0x00102032, 0x00000002, 0x000104EC, 0x05A00000, 0x0000001E, 0x4234CCBE, 0xFDE90085, 0x00002031, 0x0000001E, 0x4234CCBE, 0xFDE90085, 0x00003533, 0x0000001E, 0x4234CCBE, 0xFDE90085, 0x00003833, 0x0000001E, 0x4234CCBE, 0xFDE90085, 0x00002C20, 0x0000001E, 0x4234CCBE, 0xFDE90085, 0x00002032, 0xFF00001E, 0x4234CCBE, 0xFDE90085, 0x00003533, 0x00000002, 0x00010528, 0x06180000, 0x0000001E, 0x412FFF56, 0xFABB007C, 0xFFFA2031, 0x0000001E, 0x412FFF56, 0xFABB007C, 0xFFFA3533, 0x0000001E, 0x412FFF56, 0xFABB007C, 0xFFFA3833, 0x0000001E, 0x412FFF56, 0xFABB007C, 0xFFFA2C20, 0x0000001E, 0x412FFF56, 0xFABB007C, 0xFFFA2032, 0x0000001E, 0x412FFF56, 0xFABB007C, 0xFFFA3533, 0x0000001E, 0x412FFF56, 0xFABB007C, 0xFFFA3639, 0xFF00001E, 0x412FFF56, 0xFABB007C, 0xFFFA392C, 0x00000013, 0x0000000A, 0xFFFF0000, 0x0032FFFF, 0xFFFFFFFF, 0x70350032, 0x00BE0000, 0xFFFFFFFF, 0xFFFF00BE, 0x012CFFFF, 0xFFFFFFFF, 0x7036012C, 0x03200000, 0xFFFFFFFF, 0xFFFF0320, 0x03CAFFFF, 0xFFFFFFFF, 0x703703CA, 0x047E0000, 0xFFFF7038, 0xFFFF047E, 0x04A6FFFF, 0xFFFFFFFF, 0x700504A6, 0x04B00000, 0xFFFF700B, 0xFFFF04B0, 0x053CFFFF, 0xFFFFFFFF, 0x7009053C, 0x058C0000, 0xFFFFFFFF, 0x00000056, 0x00000001, 0x004E00E6, 0x00E70000, 0x00000000, 0x00000003, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000001, 0x002A0366, 0x03670000, 0x00000000, 0xFFFFFFFE, 0x00000000, 0xFFFFFFFD, 0xFFFFFFFE, 0x00000000, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000001, 0x0001006E, 0x006F0000, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000001, 0xFFFFFFFE, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0xC3DC0000, 0x42EA0000, 0x00000000, 0xC3F50000, 0x42F00000, 0x00000000, 0x0000002D, 0xC3F20000, 0x42F40000, 0xC1E80000, 0xC3F00000, 0x42E80000, 0x41900000, 0x00000050, 0xC3CE8000, 0x43080000, 0xC2900000, 0xC3C98000, 0x430D0000, 0xC2B20000, 0x00000019, 0xC3E30000, 0x42F00000, 0x00000000, 0xC3D90000, 0x42F20000, 0x00000000, 0x00000014, 0xC3E30000, 0x42F00000, 0x00000000, 0xC3D70000, 0x42CE0000, 0xC2140000, 0x00000014, 0xC3E30000, 0x42D20000, 0x42480000, 0xC3E28000, 0x42D20000, 0x42840000, 0x0000003C, 0xC3FA8000, 0x42F40000, 0x00000000, 0xC3E08000, 0x42EE0000, 0x00000000, 0x0000002D, 0xC3E70000, 0x42F20000, 0x00000000, 0xC3D18000, 0x42FA0000, 0x00000000, 0x00000014, 0xC409C000, 0x42EE0000, 0x40E00000, 0xC412C000, 0x42E60000, 0x41600000, 0x00000014, 0xC3F48000, 0x43010000, 0x00000000, 0xC3EB0000, 0x43000000, 0x00000000, 0x00000028, 0xC4034000, 0x42FC0000, 0x00000000, 0xC3FE8000, 0x42FC0000, 0x00000000, 0x0000000A, 0xC3F58000, 0x42F00000, 0xC0E00000, 0xC3FE8000, 0x42E60000, 0xC0E00000, 0x0000004B, 0xC3F28000, 0x42F00000, 0xC2280000, 0xC3F20000, 0x42F00000, 0x41200000, 0x0000002D -glabel D_80B4D72C - .word 0x00000014, 0x42A19989, 0xFE1C007A, 0xFFE30000, 0x00000014, 0x42A19989, 0xFE1C007A, 0xFFE30000, 0x00000014, 0x42A19989, 0xFE1C007A, 0xFFE30000, 0x00000014, 0x42A19989, 0xFE3C0079, 0xFFEB0000, 0x00000014, 0x42A19989, 0xFE3C0079, 0xFFEB0000, 0x00000014, 0x42A19989, 0xFE3C0079, 0xFFEB0000, 0xFF000014, 0x42A19989, 0xFE3C0079, 0xFFEB0000, 0xFF00001E, 0x42A19989, 0xFE3C0079, 0xFFEB0000 -glabel D_80B4D7AC - .word 0x00000000, 0x42A19989, 0xFE200074, 0x00120000, 0x00000000, 0x42A19989, 0xFE200074, 0x00120000, 0x00000000, 0x42A19989, 0xFE200074, 0x00120000, 0x00000000, 0x42A19989, 0xFE200074, 0x00120000, 0x00000000, 0x42A19989, 0xFE200074, 0x00120000, 0x00000000, 0x42A19989, 0xFE200074, 0x00120000, 0xFF000000, 0x42A19989, 0xFE200074, 0x00120000, 0xFF000000, 0x42A19989, 0xFE200074, 0x00120000 -glabel D_80B4D82C - .word 0x00000014, 0x4234CCDC, 0xFE490074, 0x00000000, 0x00000014, 0x4234CCDC, 0xFE490074, 0x00000000, 0x00000014, 0x424A667B, 0xFE4F0074, 0x00000000, 0x00000014, 0x425E6680, 0xFE510074, 0x00000000, 0x00000014, 0x4270001E, 0xFE550074, 0x00000000, 0x00000014, 0x4282000F, 0xFE580074, 0x00000000, 0x00000014, 0x428D999D, 0xFE5A0074, 0x00000000, 0x00000014, 0x4297332D, 0xFE5D0073, 0x00000000, 0xFF000014, 0x4297332D, 0xFE5D0074, 0x00000000, 0xFF00001E, 0x4297332D, 0xFE5D0073, 0x00000000 -glabel D_80B4D8CC - .word 0x00000000, 0x427199B8, 0xFE200072, 0x00000000, 0x00000000, 0x4234CCDC, 0xFE200072, 0x00000000, 0x00000000, 0x4234CCDC, 0xFE260072, 0x00000000, 0x00000000, 0x424A667B, 0xFE280072, 0x00000000, 0x00000000, 0x425E6680, 0xFE2C0072, 0x00000000, 0x00000000, 0x4270001E, 0xFE2F0072, 0x00000000, 0x00000000, 0x4282000F, 0xFE310072, 0x00000000, 0x00000000, 0x428D999D, 0xFE340072, 0x00000000, 0xFF000000, 0x4297332D, 0xFE340072, 0x00000000, 0xFF000000, 0x4297332D, 0xFE340072, 0x00000000 -glabel D_80B4D96C - .word 0x00000019, 0x4270001E, 0xFF8C0032, 0x01D50000, 0x00000019, 0x4270001E, 0xFF8C0032, 0x01D50000, 0x00000019, 0x4270001E, 0xFF8A0032, 0x01D30000, 0x00000019, 0x4270001E, 0xFF880032, 0x01D10000, 0x00000019, 0x4270001E, 0xFF850032, 0x01D00000, 0x00000019, 0x4270001E, 0xFF820032, 0x01CF0000, 0x00000019, 0x4270001E, 0xFF7F0032, 0x01CE0000, 0x00000019, 0x4270001E, 0xFF7D0032, 0x01CE0000, 0x00000019, 0x4270001E, 0xFF7A0032, 0x01CF0000, 0x00000019, 0x4270001E, 0xFF770032, 0x01D00000, 0x00000019, 0x4270001E, 0xFF740032, 0x01D20000, 0x00000019, 0x4270001E, 0xFF740032, 0x01D20000, 0xFF000019, 0x4270001E, 0xFF740032, 0x01D20000, 0xFF000019, 0x4270001E, 0xFF740032, 0x01D20000 -glabel D_80B4DA4C - .word 0x00000000, 0x41A33320, 0xFF7E0032, 0x01E00000, 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, 0xFF000000, 0x4270001E, 0xFF7E0032, 0x01E00000, 0xFF000000, 0x4270001E, 0xFF7E0032, 0x01E00000 -glabel D_80B4DB2C - .word 0x0000001E, 0x41A66654, 0xFE550074, 0x00040000, 0x0000001E, 0x41A66654, 0xFE560073, 0x00040000, 0x0000001E, 0x41A66654, 0xFE530073, 0x00070000, 0x0000001E, 0x41A66654, 0xFE540072, 0x000C0000, 0x0000001E, 0x41A66654, 0xFE520072, 0x000E0000, 0x0000001E, 0x41A66654, 0xFE520072, 0x000E0000, 0x0000001E, 0x41A66654, 0xFE520072, 0x000E0000, 0xFF00001E, 0x41A66654, 0xFE520070, 0x000E0000, 0xFF00001E, 0x41A66654, 0xFE520070, 0x000E0000 -glabel D_80B4DBBC - .word 0x00000000, 0x41A66654, 0xFE7B006D, 0x00240000, 0x00000000, 0x41A66654, 0xFE7B006D, 0x00240000, 0x00000000, 0x41A66654, 0xFE7B006D, 0x00240000, 0x00000000, 0x41A66654, 0xFE7B006D, 0x00240000, 0x00000000, 0x41A66654, 0xFE7B006D, 0x00240000, 0x00000000, 0x41A66654, 0xFE7B006D, 0x00240000, 0x00000000, 0x41A66654, 0xFE7B006D, 0x00240000, 0xFF000000, 0x41A66654, 0xFE7B006D, 0x00240000, 0xFF000000, 0x41A66654, 0xFE7B006D, 0x00240000 -glabel D_80B4DC4C - .word 0x0000001E, 0x42340000, 0xFE100077, 0x00000000, 0x0000001E, 0x42340000, 0xFE100077, 0x00000000, 0x0000001E, 0x42340000, 0xFE100077, 0x00000000, 0x0000000F, 0x42340000, 0xFE100077, 0x00000000, 0x0000000F, 0x42373343, 0xFE29007A, 0x00000000, 0x0000000F, 0x42373343, 0xFE75008B, 0x00000000, 0x0000000F, 0x42373343, 0xFF3F00B7, 0x00000000, 0x0000000F, 0x42373343, 0x001D00E8, 0x00000000, 0x0000001E, 0x42373343, 0x01680130, 0x00000000, 0x0000001E, 0x42373343, 0x01AD0148, 0x00000000, 0x0000001E, 0x42373343, 0x01AD0148, 0x00000000, 0x0000001E, 0x42373343, 0x01AD0148, 0x00000000, 0x0000001E, 0x42373343, 0x01AD0148, 0x00000000, 0xFF00001E, 0x42373343, 0x01AD0148, 0x00000000, 0xFF00001E, 0x42373343, 0x01AD0148, 0x00000000 -glabel D_80B4DD3C - .word 0x00000000, 0x42340000, 0xFE450073, 0x00000000, 0x00000000, 0x42340000, 0xFE450073, 0x00000000, 0x00000000, 0x42340000, 0xFE450073, 0x00000000, 0x00000000, 0x42340000, 0xFE450073, 0x00000000, 0x00000000, 0x42373343, 0xFE5C0085, 0x00000000, 0x00000000, 0x42373343, 0xFEA80096, 0x00000000, 0x00000000, 0x42373343, 0xFF7100C2, 0x00000000, 0x00000000, 0x42373343, 0x005000F3, 0x00000000, 0x00000000, 0x42373343, 0x019C013B, 0x00000000, 0x00000000, 0x42373343, 0x01E2014C, 0x00000000, 0x00000000, 0x42373343, 0x01E2014C, 0x00000000, 0x00000000, 0x42373343, 0x01E2014C, 0x00000000, 0x00000000, 0x42373343, 0x01E2014C, 0x00000000, 0xFF000000, 0x42373343, 0x01E2014C, 0x00000000, 0xFF000000, 0x42373343, 0x01E2014C, 0x00000000 -glabel D_80B4DE2C - .word 0x00000019, 0x42726685, 0x00420194, 0x01A90000, 0x00000019, 0x427199B8, 0x00420194, 0x01A90000, 0x00000019, 0x425E6680, 0x00420194, 0x01AA0000, 0x00000019, 0x425CCCE6, 0x003F0175, 0x019D0000, 0x00000019, 0x424999AE, 0x001A0161, 0x01980000, 0x00000019, 0x424999AE, 0x00110145, 0x018D0000, 0x00000019, 0x423599A9, 0x00110146, 0x018D0000, 0x00000019, 0x4234CCDC, 0xFF7800B1, 0x01030000, 0x00000019, 0x422199A4, 0xFEFE006F, 0x00A90000, 0x00000019, 0x4220CCD7, 0xFE87006C, 0x00410000, 0x00000019, 0x420CCCD2, 0xFE87006C, 0x00410000, 0x00000019, 0x420CCCD2, 0xFE87006C, 0x00410000, 0xFF00001E, 0x41F1999A, 0xFE88006C, 0x00410000, 0xFF00001E, 0x41F1999A, 0xFE88006C, 0x00410000 -glabel D_80B4DF0C - .word 0x00000000, 0x42373343, 0x001D017F, 0x01BD0000, 0x00000000, 0x42373343, 0x001D017F, 0x01BD0000, 0x00000000, 0x42373343, 0x001D017F, 0x01BD0000, 0x00000000, 0x42373343, 0x001D017F, 0x01BD0000, 0x00000000, 0x42373343, 0x001D017F, 0x01BD0000, 0x00000000, 0x42373343, 0x0031015B, 0x01A80000, 0x00000000, 0x42373343, 0x0031015B, 0x01A80000, 0x00000000, 0x41F1999A, 0xFF9900C0, 0x011E0000, 0x00000000, 0x41F1999A, 0xFF200071, 0x00C60000, 0x00000000, 0x41F1999A, 0xFEA7006D, 0x00600000, 0x00000000, 0x41F1999A, 0xFEA7006D, 0x00600000, 0x00000000, 0x41F1999A, 0xFEA7006D, 0x00600000, 0xFF000000, 0x41F1999A, 0xFEA7006D, 0x00600000, 0xFF000000, 0x41F1999A, 0xFEA7006D, 0x00600000 -glabel D_80B4DFEC - .word 0x0000000A, 0x41F00000, 0xFE1E0077, 0x00000000, 0x0000000A, 0x41F00000, 0xFE1E0077, 0x00000000, 0x0000000A, 0x41F00000, 0xFE1E0077, 0x00000000, 0x0000000A, 0x41F66668, 0xFE1E0077, 0x00000000, 0x0000000A, 0x41F66668, 0xFE1E0077, 0x00000000, 0x0000000A, 0x41F66668, 0xFE32007E, 0x00000000, 0x0000001E, 0x41F66668, 0xFE750096, 0x00000000, 0x0000001E, 0x41F66668, 0xFE750096, 0x00000000, 0xFF00001E, 0x41F66668, 0xFE750096, 0x00000000, 0xFF00001E, 0x41F66668, 0xFE750096, 0x00000000 -glabel D_80B4E08C - .word 0x00000000, 0x41F00000, 0xFE480073, 0x00000000, 0x00000000, 0x41F00000, 0xFE480073, 0x00000000, 0x00000000, 0x41F00000, 0xFE480073, 0x00000000, 0x00000000, 0x41F66668, 0xFE480073, 0x00000000, 0x00000000, 0x41F66668, 0xFE480073, 0x00000000, 0x00000000, 0x41F66668, 0xFE59008E, 0x00000000, 0x00000000, 0x41F66668, 0xFE9A00AB, 0x00000000, 0x00000000, 0x41F66668, 0xFE9A00AB, 0x00000000, 0xFF000000, 0x41F66668, 0xFE9A00AB, 0x00000000, 0xFF000000, 0x41F66668, 0xFE9A00AB, 0x00000000 -glabel D_80B4E12C - .word 0x0000001E, 0x41C80000, 0xFDD90077, 0x00070000, 0x0000001E, 0x41C80000, 0xFDD90077, 0x00070000, 0x0000000F, 0x41C80000, 0xFDD90077, 0x00070000, 0x0000000F, 0x42700000, 0xFE1B0078, 0xFFF90000, 0x0000001E, 0x42700000, 0xFE1B0078, 0xFFF90000, 0x0000001E, 0x42700000, 0xFE1B0078, 0xFFF90000, 0x0000001E, 0x42700000, 0xFE1B0076, 0xFFFB0000, 0xFF00001E, 0x42700000, 0xFE1B0077, 0xFFFA0000, 0xFF00001E, 0x42700000, 0xFE1B0077, 0xFFFA0000 -glabel D_80B4E1BC - .word 0x00000000, 0x4234CCDC, 0xFDB50073, 0x000E0000, 0x00000000, 0x41CB3366, 0xFDB50073, 0x000E0000, 0x00000000, 0x41CB3366, 0xFDB50073, 0x000E0000, 0x00000000, 0x4270CD09, 0xFDF70075, 0xFFFF0000, 0x00000000, 0x4270CD09, 0xFDF70075, 0xFFFF0000, 0x00000000, 0x4270CD09, 0xFDF70075, 0xFFFF0000, 0x00000000, 0x4270CD09, 0xFDF70075, 0xFFFF0000, 0xFF000000, 0x4270CD09, 0xFDF70074, 0x00000000, 0xFF000000, 0x4270CC08, 0xFDF70074, 0x00000000 -glabel D_80B4E24C - .word 0x0000001E, 0x4270001E, 0x004B0034, 0x00320000, 0x0000001E, 0x4270001E, 0x004B0034, 0x00300000, 0x0000003C, 0x4270001E, 0x004A0034, 0x002D0000, 0x0000003C, 0x4270001E, 0x00310033, 0xFFD50000, 0x0000001E, 0x4270001E, 0x00310033, 0xFFD50000, 0x0000001E, 0x4270001E, 0x00310033, 0xFFD50000, 0xFF00001E, 0x4270001E, 0x00310033, 0xFFD50000, 0xFF00001E, 0x4270001E, 0x00310033, 0xFFD50000 -glabel D_80B4E2CC - .word 0x00000000, 0x4270001E, 0x005A0034, 0x00350000, 0x00000000, 0x4270001E, 0x005A0034, 0x00320000, 0x00000000, 0x4270001E, 0x005A0034, 0x002D0000, 0x00000000, 0x4270001E, 0x00410033, 0xFFD40000, 0x00000000, 0x4270001E, 0x00410033, 0xFFD40000, 0x00000000, 0x4270001E, 0x00410033, 0xFFD40000, 0xFF000000, 0x4270001E, 0x00410033, 0xFFD40000, 0xFF000000, 0x4270001E, 0x00410033, 0xFFD40000 -glabel D_80B4E34C - .word 0x0000001F, 0x4270001E, 0xFE3F0079, 0xFFED0000, 0x0000001E, 0x4270001E, 0xFE3F0079, 0xFFED0000, 0x0000001E, 0x4270001E, 0xFE3F0079, 0xFFED0000, 0x0000001E, 0x4270001E, 0xFE38006E, 0xFFEF0000, 0x0000001E, 0x4270001E, 0xFE38006E, 0xFFEF0000, 0x0000001E, 0x4270001E, 0xFE38006E, 0xFFEF0000, 0xFF00001E, 0x4270001E, 0xFE38006E, 0xFFEF0000, 0xFF00001E, 0x4270001E, 0xFE38006E, 0xFFEF0000 -glabel D_80B4E3CC - .word 0x00000000, 0x4270001E, 0xFE47006B, 0xFFEA0000, 0x00000000, 0x4270001E, 0xFE47006B, 0xFFEA0000, 0x00000000, 0x4270001E, 0xFE47006B, 0xFFEA0000, 0x00000000, 0x4270001E, 0xFE47006B, 0xFFEA0000, 0x00000000, 0x4270001E, 0xFE47006B, 0xFFEA0000, 0x00000000, 0x4270001E, 0xFE47006B, 0xFFEA0000, 0xFF000000, 0x4270001E, 0xFE47006B, 0xFFEA0000, 0xFF000000, 0x4270001E, 0xFE47006B, 0xFFEA0000 -glabel D_80B4E44C - .word 0x0000001E, 0x41A66654, 0xFEB5006E, 0xFFA50000, 0x0000001E, 0x41A66654, 0xFEB5006E, 0xFFA50000, 0x0000001E, 0x41A66654, 0xFEB5006E, 0xFFA50000, 0x0000001E, 0x41A66654, 0xFE010079, 0x00070000, 0x0000001E, 0x41A66654, 0xFE010079, 0x00070000, 0x0000001E, 0x41A66654, 0xFE010079, 0x00070000, 0xFF00001E, 0x41A66654, 0xFE010079, 0x00070000, 0xFF00001E, 0x41A66654, 0xFE010079, 0x00070000 -glabel D_80B4E4CC - .word 0x00000000, 0x41A66654, 0xFE8F006E, 0xFFBA0000, 0x00000000, 0x41A66654, 0xFE8F006E, 0xFFBA0000, 0x00000000, 0x41A66654, 0xFE8F006E, 0xFFBA0000, 0x00000000, 0x41A66654, 0xFDDB007C, 0x001D0000, 0x00000000, 0x41A66654, 0xFDDB007C, 0x001D0000, 0x00000000, 0x41A66654, 0xFDDB007C, 0x001D0000, 0xFF000000, 0x41A66654, 0xFDDB007C, 0x001D0000, 0xFF000000, 0x41A66654, 0xFDDB007C, 0x001D0000 -.word D_80B4D72C -.word D_80B4D7AC -.word 0x00000000 -.word D_80B4D82C -.word D_80B4D8CC -.word 0x00000000 -.word D_80B4D96C -.word D_80B4DA4C -.word 0x00000000 -.word D_80B4DB2C -.word D_80B4DBBC -.word 0x00000000 -.word D_80B4DC4C -.word D_80B4DD3C -.word 0x00000000 -.word D_80B4DE2C -.word D_80B4DF0C -.word 0x00000000 -.word D_80B4DFEC -.word D_80B4E08C -.word 0x00000000 -.word D_80B4E12C -.word D_80B4E1BC -.word 0x00000000 -.word D_80B4E24C -.word D_80B4E2CC -.word 0x00000000 -.word D_80B4E34C -.word D_80B4E3CC -.word 0x00000000 -.word D_80B4E44C -.word D_80B4E4CC -.word 0x00000000 -glabel En_Zl1_InitVars - .word 0x00290400, 0x00000019, 0x001D0000, 0x0000020C -.word EnZl1_Init -.word EnZl1_Destroy -.word EnZl1_Update -.word EnZl1_Draw -glabel D_80B4E5F0 - .word 0x00000039, 0x20010000, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x0014002E, 0x00000000, 0x00000000 -glabel D_80B4E61C - .word 0x06007208, 0x06009848, 0x06009C48, 0x06009848 -glabel D_80B4E62C - .word 0x06007608 -glabel D_80B4E630 - .word 0xC3E60000, 0x42EC0000, 0x00000000 -glabel D_80B4E63C - .word 0xC3CB0000, 0x42DC0000, 0x00000000 -glabel D_80B4E648 - .word 0xC3C70000, 0x42A80000, 0x00000000 -glabel D_80B4E654 - .word 0xC3D58000, 0x42D80000, 0x41D00000 -glabel D_80B4E660 - .word 0xC3AA0000, 0x42D80000, 0x42C40000 -glabel D_80B4E66C - .word 0xC3D90000, 0x42A80000, 0x00000000 -glabel D_80B4E678 - .word 0x00000200 -glabel D_80B4E67C - .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x06012B04, 0x06012118, 0x06010B38 -glabel D_80B4E6A4 - .word 0x00000000, 0x00000002, 0x00020000 -glabel D_80B4E6B0 - .word 0xC3D28000, 0x430F0000, 0xC0A00000 -glabel D_80B4E6BC - .word 0xC4000000, 0x42D20000, 0xC0800000 -glabel D_80B4E6C8 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80B4E6D4 - .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x06012B04, 0x06012118, 0x06010B38 -glabel D_80B4E6FC - .word 0x00000000, 0x00000002, 0x00020000 -glabel D_80B4E708 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80B4E714 - .word 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_zl1.reloc.s b/data/overlays/actors/z_en_zl1.reloc.s deleted file mode 100644 index 7b08c0cbba..0000000000 --- a/data/overlays/actors/z_en_zl1.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_80B4E790 - .incbin "baserom/ovl_En_Zl1", 0x3C50, 0x00000200 diff --git a/include/functions.h b/include/functions.h index c7c0066d52..603d788793 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1510,7 +1510,7 @@ s32 func_800C05E4(GlobalContext* globalCtx, s16 camId, Vec3f* arg2, Vec3f* arg3, s32 func_800C0704(GlobalContext* globalCtx, s16 camId, f32 arg2); s32 func_800C0744(GlobalContext* globalCtx, s16 camId, s16 arg2); void func_800C078C(GlobalContext* globalCtx, s16 camId1, s16 camId2); -void func_800C0808(GlobalContext* globalCtx, s16 camId, s32 arg2, s16 arg3); +s32 func_800C0808(GlobalContext* globalCtx, s16 camId, Player* player, s16 arg3); void func_800C0874(GlobalContext* globalCtx, s16 camId, s16 arg2); void func_800C08AC(GlobalContext* globalCtx, s16 camId, s16 arg2); void Gameplay_SaveSceneFlags(GlobalContext* globalCtx); diff --git a/include/z64.h b/include/z64.h index 8450753e59..ad45324707 100644 --- a/include/z64.h +++ b/include/z64.h @@ -1073,7 +1073,7 @@ typedef struct GlobalContext { /* 0x11D4C */ s32 (*unk_11D4C)(struct GlobalContext*, Actor*); /* 0x11D50 */ char unk_11D50[0x8]; /* 0x11D58 */ void (*unk_11D58)(struct GlobalContext*, s32); - /* 0x11D5C */ char unk_11D5C[0x4]; + /* 0x11D5C */ void (*unk_11D5C)(struct GlobalContext*, Actor*); /* 0x11D60 */ MtxF mf_11D60; /* 0x11DA0 */ MtxF mf_11DA0; /* 0x11DE0 */ Mtx* unk_11DE0; diff --git a/spec b/spec index fb12f035d7..37c0ceb1c5 100644 --- a/spec +++ b/spec @@ -3482,8 +3482,7 @@ endseg beginseg name "ovl_En_Zl1" include "build/src/overlays/actors/ovl_En_Zl1/z_en_zl1.o" - include "build/data/overlays/actors/z_en_zl1.data.o" - include "build/data/overlays/actors/z_en_zl1.reloc.o" + include "build/src/overlays/actors/ovl_En_Zl1/z_en_zl1_reloc.o" endseg beginseg diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index bc3ff73d8a..871102f56c 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -478,8 +478,9 @@ void func_8001E5C8(EnItem00* this, GlobalContext* globalCtx) { this->actor.posRot.pos.y += 40.0f + Math_Sins(this->unk_15A * 15000) * (this->unk_15A * 0.3f); - if LINK_IS_ADULT + if (LINK_IS_ADULT) { this->actor.posRot.pos.y += 20.0f; + } } extern s32 D_80157D90; diff --git a/src/code/z_play.c b/src/code/z_play.c index fcb0ae1362..41726cb110 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -1690,13 +1690,13 @@ void func_800C078C(GlobalContext* globalCtx, s16 camId1, s16 camId2) { func_8005AE64(globalCtx->cameraPtrs[camIdx1], globalCtx->cameraPtrs[camIdx2]); } -void func_800C0808(GlobalContext* globalCtx, s16 camId, s32 arg2, s16 arg3) { +s32 func_800C0808(GlobalContext* globalCtx, s16 camId, Player* player, s16 arg3) { Camera* camera; s16 camIdx = (camId == -1) ? globalCtx->activeCamera : camId; camera = globalCtx->cameraPtrs[camIdx]; - func_80058148(camera, arg2); - func_8005A77C(camera, arg3); + func_80058148(camera, player); + return func_8005A77C(camera, arg3); } void func_800C0874(GlobalContext* globalCtx, s16 camId, s16 arg2) { diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c index f0b9de9f66..e229d5e5f2 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -15,7 +15,17 @@ void EnZl1_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnZl1_Update(Actor* thisx, GlobalContext* globalCtx); void EnZl1_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void func_80B4AE18(EnZl1* this); +void func_80B4AF18(EnZl1* this, GlobalContext* globalCtx); +void func_80B4B010(EnZl1* this, GlobalContext* globalCtx); +void func_80B4B240(EnZl1* this, GlobalContext* globalCtx); +void func_80B4B8B4(EnZl1* this, GlobalContext* globalCtx); +void func_80B4BBC4(EnZl1* this, GlobalContext* globalCtx); +void func_80B4BC78(EnZl1* this, GlobalContext* globalCtx); +void func_80B4BF2C(EnZl1* this, GlobalContext* globalCtx); + +#include "z_en_zl1_cutscene_data.c" + const ActorInit En_Zl1_InitVars = { ACTOR_EN_ZL1, ACTORTYPE_NPC, @@ -27,39 +37,589 @@ const ActorInit En_Zl1_InitVars = { (ActorFunc)EnZl1_Update, (ActorFunc)EnZl1_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AB40.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Init.s") +ColliderCylinderInit sCylinderInit = { + { COLTYPE_UNK0, 0x00, 0x00, 0x39, 0x20, COLSHAPE_CYLINDER }, + { 0x01, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x00, 0x00, 0x01 }, + { 20, 46, 0, { 0, 0, 0 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Destroy.s") +UNK_PTR D_80B4E61C[] = { 0x06007208, 0x06009848, 0x06009C48, 0x06009848 }; +UNK_PTR D_80B4E62C[] = { 0x06007608 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AE18.s") +extern AnimationHeader D_06000438; +extern UNK_TYPE D_06008848; +extern UNK_TYPE D_06008C48; +extern SkeletonHeader D_0600F5D8; +extern AnimationHeader D_06010B38; +extern AnimationHeader D_06011348; +extern AnimationHeader D_060116E4; +extern AnimationHeader D_06011B88; +extern AnimationHeader D_06012118; +extern AnimationHeader D_060132D8; +extern AnimationHeader D_060138E0; +extern AnimationHeader D_06013F10; +extern AnimationHeader D_060143A8; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4AF18.s") +void func_80B4AB40(void) { +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B010.s") +void func_80B4AB48(void) { +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B240.s") +void EnZl1_Init(Actor* thisx, GlobalContext* globalCtx) { + f32 frameCount; + EnZl1* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B7F4.s") + frameCount = SkelAnime_GetFrameCount(&D_06012118.genericHeader); + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600F5D8, NULL, NULL, NULL, 0); + SkelAnime_ChangeAnim(&this->skelAnime, &D_06012118, 1.0f, 0.0f, frameCount, 0, 0.0f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B834.s") + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + Actor_SetScale(&this->actor, 0.01f); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 24.0f); + this->actor.unk_1F = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B874.s") + if (gSaveContext.sceneSetupIndex >= 4) { + frameCount = SkelAnime_GetFrameCount(&D_06000438.genericHeader); + SkelAnime_ChangeAnim(&this->skelAnime, &D_06000438, 1.0f, 0.0f, frameCount, 0, 0.0f); + this->unk_1E6 = 0; + this->actionFunc = func_80B4BC78; + } else if ((Flags_GetEventChkInf(9)) && (Flags_GetEventChkInf(0x25)) && (Flags_GetEventChkInf(0x37))) { + Actor_Kill(&this->actor); + } else if (((Flags_GetEventChkInf(9)) && (Flags_GetEventChkInf(0x25))) || + ((Flags_GetEventChkInf(9)) && (Flags_GetEventChkInf(0x37)))) { + frameCount = SkelAnime_GetFrameCount(&D_06000438.genericHeader); + SkelAnime_ChangeAnim(&this->skelAnime, &D_06000438, 1.0f, 0.0f, frameCount, 0, 0.0f); + this->actor.textId = 0x703D; + this->actionFunc = func_80B4AF18; + } else if (Flags_GetEventChkInf(0x40)) { + frameCount = SkelAnime_GetFrameCount(&D_06000438.genericHeader); + SkelAnime_ChangeAnim(&this->skelAnime, &D_06000438, 1.0f, 0.0f, frameCount, 0, 0.0f); + this->actor.textId = 0x703C; + this->actionFunc = func_80B4AF18; + } else { + this->actor.textId = 0xFFFF; + this->actionFunc = func_80B4B010; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B8B4.s") +void EnZl1_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnZl1* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BBC4.s") + SkelAnime_Free(&this->skelAnime, globalCtx); + Collider_DestroyCylinder(globalCtx, &this->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BC78.s") +void func_80B4AE18(EnZl1* this) { + if ((this->skelAnime.animCurrentSeg == &D_06010B38) && (this->skelAnime.animCurrentFrame < 26.0f)) { + this->unk_1F4 = &D_06008C48; + this->unk_1F8 = &D_06008848; + this->unk_1FC = 2; + } else { + if (DECR(this->unk_1FC) == 0) { + this->unk_1FC = Math_Rand_S16Offset(0x1E, 0xA); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BF2C.s") + if (this->unk_1FC < 4) { + this->unk_1FE = this->unk_1FC; + } else { + this->unk_1FE = 0; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Update.s") + this->unk_1F4 = D_80B4E61C[this->unk_1FE]; + this->unk_1F8 = D_80B4E61C[this->unk_1FE]; + this->unk_1EC = D_80B4E62C[this->unk_1F2]; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4C340.s") +void func_80B4AF18(EnZl1* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s32 pad; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4C400.s") + func_80038290(globalCtx, &this->actor, &this->unk_200, &this->unk_206, this->actor.posRot2.pos); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Draw.s") + if (this->unk_1E6 != 0) { + if (func_8002F334(this, globalCtx) != 0) { + this->unk_1E6 = 0; + } + } else { + if (func_8002F194(this, globalCtx)) { + this->unk_1E6 = 1; + } else { + if (this->actor.posRot.pos.y <= player->actor.posRot.pos.y) { + func_8002F2F4(this, globalCtx); + } + } + } + + Collider_CylinderUpdate(&this->actor, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); +} + +void func_80B4B010(EnZl1* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s32 pad2; + AnimationHeader* animationHeader; + s32 pad; + Vec3f vec1 = { -460.0f, 118.0f, 0.0f }; + Vec3f vec2 = { -406.0f, 110.0f, 0.0f }; + Vec3f playerPos = { -398.0f, 84.0f, 0.0f }; + s16 rotDiff; + + if (func_8002F194(&this->actor, globalCtx)) { + animationHeader = &D_06010B38; + SkelAnime_ChangeAnim(&this->skelAnime, animationHeader, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&animationHeader->genericHeader), 3, -10.0f); + this->unk_1E8 = Gameplay_CreateSubCamera(globalCtx); + Gameplay_ChangeCameraStatus(globalCtx, 0, 1); + Gameplay_ChangeCameraStatus(globalCtx, this->unk_1E8, 7); + func_800C0808(globalCtx, this->unk_1E8, player, 0x21); + globalCtx->envCtx.unk_E2[0] = 0xFF; + globalCtx->envCtx.unk_E2[1] = 0xFF; + globalCtx->envCtx.unk_E2[2] = 0xFF; + globalCtx->envCtx.unk_E2[3] = 0x18; + globalCtx->envCtx.unk_E1 = 1; + func_800C04D8(globalCtx, this->unk_1E8, &vec1, &vec2); + func_800C0704(globalCtx, this->unk_1E8, 30.0f); + func_800B3840(0x20); + Interface_ChangeAlpha(2); + player->actor.posRot.pos = playerPos; + player->actor.speedXZ = 0.0f; + this->unk_1E2 = 0; + this->actionFunc = func_80B4B240; + func_800F5C64(0x51); + } else { + if (1) {}; // necessary to match + rotDiff = ABS(this->actor.rotTowardsLinkY - this->actor.shape.rot.y); + if (rotDiff < 0x238E) { + if (!(player->actor.posRot.pos.y < this->actor.posRot.pos.y)) { + func_8002F2F4(this, globalCtx); + } + } + } +} + +void func_80B4B240(EnZl1* this, GlobalContext* globalCtx) { + Vec3f sp74 = { -427.0f, 108.0, 26.0 }; + Vec3f sp68 = { -340.0f, 108.0f, 98.0f }; + s32 pad; + Vec3f sp58 = { -434.0f, 84.0f, 0.0f }; + u8 sp54[] = { 0x00, 0x00, 0x02 }; + s32 pad2; + Player* player = PLAYER; + AnimationHeader* animationHeader; + MessageContext* msgCtx = &globalCtx->msgCtx; + f32 frameCount; + s32 sp3C = 0; + + switch (this->unk_1E2) { + case 0: + switch ((s16)this->skelAnime.animCurrentFrame) { + case 14: + this->unk_1E4 = 0; + break; + case 15: + if (DECR(this->unk_1E4) != 0) { + this->skelAnime.animCurrentFrame = 15.0f; + } + break; + case 64: + animationHeader = &D_06011348; + sp3C = 1; + this->actor.textId = 0x702E; + func_8010B680(globalCtx, this->actor.textId, 0); + this->unk_1E2 += 1; + break; + } + break; + case 1: + if ((func_8010BDBC(msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { + globalCtx->envCtx.unk_E1 = 0; + func_800C04D8(globalCtx, this->unk_1E8, &sp74, &sp68); + func_800C0704(globalCtx, this->unk_1E8, 25.0f); + player->actor.posRot.pos = sp58; + this->actor.textId = 0x702F; + func_8010B720(globalCtx, this->actor.textId); + this->unk_1E2 += 1; + } + break; + case 2: + if ((func_8010BDBC(msgCtx) == 4) && (func_80106BC8(globalCtx) != 0)) { + if (msgCtx->choiceIndex == 0) { + animationHeader = &D_06013F10; + sp3C = 2; + this->unk_1E2 += 1; + } else { + animationHeader = &D_060116E4; + sp3C = 2; + this->unk_1E2 = 6; + } + } + break; + case 3: + frameCount = SkelAnime_GetFrameCount(&D_06013F10.genericHeader); + if (this->skelAnime.animCurrentFrame == frameCount) { + animationHeader = &D_060143A8; + sp3C = 1; + this->actor.textId = 0x7032; + func_8010B720(globalCtx, this->actor.textId); + this->unk_1E2 += 1; + } + break; + case 4: + if ((func_8010BDBC(msgCtx) == 4) && (func_80106BC8(globalCtx) != 0)) { + if (msgCtx->choiceIndex == 0) { + animationHeader = &D_060132D8; + sp3C = 2; + this->unk_1E2 = 9; + } else { + this->actor.textId = 0x7034; + func_8010B720(globalCtx, this->actor.textId); + this->unk_1E2 += 1; + } + } + break; + case 5: + if ((func_8010BDBC(msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { + this->actor.textId = 0x7033; + func_8010B720(globalCtx, this->actor.textId); + this->unk_1E2 -= 1; + } + break; + case 6: + frameCount = SkelAnime_GetFrameCount(&D_060116E4.genericHeader); + if (this->skelAnime.animCurrentFrame == frameCount) { + animationHeader = &D_06011B88; + sp3C = 1; + this->actor.textId = 0x7031; + func_8010B720(globalCtx, this->actor.textId); + this->unk_1E2 += 1; + } + break; + case 7: + if ((func_8010BDBC(msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { + this->actor.textId = 0x7030; + func_8010B720(globalCtx, this->actor.textId); + this->unk_1E2 += 1; + } + break; + case 8: + if ((func_8010BDBC(msgCtx) == 4) && (func_80106BC8(globalCtx) != 0)) { + if (msgCtx->choiceIndex == 0) { + animationHeader = &D_060138E0; + sp3C = 2; + this->unk_1E2 = 3; + } else { + this->actor.textId = 0x7031; + func_8010B720(globalCtx, this->actor.textId); + this->unk_1E2 -= 1; + } + } + break; + case 9: + frameCount = SkelAnime_GetFrameCount(&D_060132D8.genericHeader); + if (this->skelAnime.animCurrentFrame == frameCount) { + animationHeader = &D_06000438; + sp3C = 1; + globalCtx->csCtx.segment = D_80B4C5D0; + gSaveContext.cutsceneTrigger = 1; + this->actionFunc = func_80B4B8B4; + this->unk_1E2 += 1; + } + break; + } + if (sp3C != 0) { + frameCount = SkelAnime_GetFrameCount(&animationHeader->genericHeader); + SkelAnime_ChangeAnim(&this->skelAnime, animationHeader, 1.0f, 0.0f, frameCount, sp54[sp3C], -10.0f); + } + func_80038290(globalCtx, &this->actor, &this->unk_200, &this->unk_206, this->actor.posRot2.pos); +} + +void func_80B4B7F4(CsCmdActorAction* npcAction, Vec3f* pos) { + pos->x = npcAction->startPos.x; + pos->y = npcAction->startPos.y; + pos->z = npcAction->startPos.z; +} + +void func_80B4B834(CsCmdActorAction* npcAction, Vec3f* pos) { + pos->x = npcAction->endPos.x; + pos->y = npcAction->endPos.y; + pos->z = npcAction->endPos.z; +} + +void func_80B4B874(EnZl1* this, GlobalContext* globalCtx) { + this->skelAnime.flags |= 1; + SkelAnime_LoadAnimationType5(globalCtx, &this->actor, &this->skelAnime, 1.0f); +} + +void func_80B4B8B4(EnZl1* this, GlobalContext* globalCtx) { + AnimationHeader* spB0[] = { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x06012B04, 0x06012118, 0x06010B38, + }; + u8 spA4[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, + }; + Vec3f sp98 = { -421.0f, 143.0f, -5.0f }; + Vec3f sp8C = { -512.0f, 105.0f, -4.0f }; + s32 pad2; + f32 actionLength; + CsCmdActorAction* npcAction; + Vec3f sp74; + Vec3f sp68; + Vec3f velocity = { 0.0f, 0.0f, 0.0f }; + s32 pad; + f32 frameCount; + Vec3f sp48; + + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + func_80B4B874(this, globalCtx); + if (globalCtx->csCtx.state == 0) { + this->actionFunc = func_80B4BBC4; + return; + } + + npcAction = globalCtx->csCtx.npcActions[0]; + if (npcAction != NULL) { + func_80B4B7F4(npcAction, &sp74); + func_80B4B834(npcAction, &sp68); + if (this->unk_1E6 == 0) { + sp48 = sp74; + this->actor.initPosRot.pos = sp48; + this->actor.posRot.pos = sp48; + } + if (this->unk_1E6 != npcAction->action) { + frameCount = SkelAnime_GetFrameCount(&spB0[npcAction->action]->genericHeader); + SkelAnime_ChangeAnim(&this->skelAnime, spB0[npcAction->action], 1.0f, 0.0f, frameCount, + spA4[npcAction->action], -10.0f); + this->unk_1E6 = npcAction->action; + } + this->actor.velocity = velocity; + if (globalCtx->csCtx.frames < npcAction->endFrame) { + actionLength = npcAction->endFrame - npcAction->startFrame; + this->actor.velocity.x = (sp68.x - sp74.x) / actionLength; + this->actor.velocity.y = (sp68.y - sp74.y) / actionLength; + this->actor.velocity.y += this->actor.gravity; + if (this->actor.velocity.y < this->actor.minVelocityY) { + this->actor.velocity.y = this->actor.minVelocityY; + } + this->actor.velocity.z = (sp68.z - sp74.z) / actionLength; + } + func_80038290(globalCtx, &this->actor, &this->unk_200, &this->unk_206, this->actor.posRot2.pos); + func_800C04D8(globalCtx, this->unk_1E8, &sp98, &sp8C); + func_800C0704(globalCtx, this->unk_1E8, 70.0f); + } +} + +void func_80B4BBC4(EnZl1* this, GlobalContext* globalCtx) { + s32 pad; + f32 frameCount = SkelAnime_GetFrameCount(&D_06000438.genericHeader); + Player* player = PLAYER; + + SkelAnime_ChangeAnim(&this->skelAnime, &D_06000438, 1.0f, 0.0f, frameCount, 0, 0.0f); + func_8002DF54(globalCtx, &this->actor, 1); + func_8002F7DC(&player->actor, 0x6836); + this->actor.textId = 0x7039; + func_8010B680(globalCtx, this->actor.textId, 0); + this->unk_1E2 = 0; + this->actionFunc = func_80B4BF2C; +} + +void func_80B4BC78(EnZl1* this, GlobalContext* globalCtx) { + AnimationHeader* sp90[] = { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x06012B04, 0x06012118, 0x06010B38, + }; + u8 sp84[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, + }; + s32 pad2; + f32 actionLength; + Vec3f sp70; + Vec3f sp64; + Vec3f velocity = { 0.0f, 0.0f, 0.0f }; + CsCmdActorAction* npcAction; + s32 pad; + f32 frameCount; + Vec3f sp40; + + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { + if (this->skelAnime.animCurrentSeg == &D_06010B38) { + frameCount = SkelAnime_GetFrameCount(&D_06011348.genericHeader); + SkelAnime_ChangeAnim(&this->skelAnime, &D_06011348, 1.0f, 0.0f, frameCount, 0, -10.0f); + } + } + func_80B4B874(this, globalCtx); + npcAction = globalCtx->csCtx.npcActions[0]; + if (npcAction != NULL) { + func_80B4B7F4(npcAction, &sp70); + func_80B4B834(npcAction, &sp64); + if (this->unk_1E6 == 0) { + sp40 = sp70; + this->actor.initPosRot.pos = sp40; + this->actor.posRot.pos = sp40; + } + + if (this->unk_1E6 != npcAction->action) { + frameCount = SkelAnime_GetFrameCount(&sp90[npcAction->action]->genericHeader); + SkelAnime_ChangeAnim(&this->skelAnime, sp90[npcAction->action], 1.0f, 0.0f, frameCount, + sp84[npcAction->action], -10.0f); + this->unk_1E6 = npcAction->action; + } + this->actor.velocity = velocity; + if (globalCtx->csCtx.frames < npcAction->endFrame) { + actionLength = npcAction->endFrame - npcAction->startFrame; + this->actor.velocity.x = (sp64.x - sp70.x) / actionLength; + this->actor.velocity.y = (sp64.y - sp70.y) / actionLength; + this->actor.velocity.y += this->actor.gravity; + if (this->actor.velocity.y < this->actor.minVelocityY) { + this->actor.velocity.y = this->actor.minVelocityY; + } + this->actor.velocity.z = (sp64.z - sp70.z) / actionLength; + } + } +} + +void func_80B4BF2C(EnZl1* this, GlobalContext* globalCtx) { + s32 pad; + MessageContext* msgCtx = &globalCtx->msgCtx; + Player* player = PLAYER; + + switch (this->unk_1E2) { + case 0: + if ((func_8010BDBC(msgCtx) == 4) && (func_80106BC8(globalCtx) != 0)) { + if (msgCtx->choiceIndex == 0) { + this->actor.textId = 0x703B; + func_8010B720(globalCtx, this->actor.textId); + this->unk_1E2 += 1; + } else { + this->actor.textId = 0x703A; + func_8010B720(globalCtx, this->actor.textId); + this->unk_1E2 = 0; + } + } + break; + case 1: + if ((func_8010BDBC(msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { + this->actor.textId = 0xFFFF; + globalCtx->unk_11D5C(globalCtx, &this->actor); + func_8002F434(&this->actor, globalCtx, GI_LETTER_ZELDA, 120.0f, 10.0f); + globalCtx->msgCtx.msgMode = 0x36; + globalCtx->msgCtx.unk_E3E7 = 4; + this->unk_1E2 += 1; + } else { + break; + } + case 2: + if (func_8002F410(this, globalCtx) != 0) { + func_800C078C(globalCtx, 0, this->unk_1E8); + Gameplay_ChangeCameraStatus(globalCtx, 0, 7); + Gameplay_ClearCamera(globalCtx, this->unk_1E8); + this->actor.attachedA = NULL; + this->unk_1E2 += 1; + } else { + func_8002F434(this, globalCtx, GI_LETTER_ZELDA, 120.0f, 10.0f); + } + break; + case 3: + if ((func_8010BDBC(msgCtx) == 6) && (func_80106BC8(globalCtx) != 0)) { + this->actor.textId = 0x703C; + func_8010B720(globalCtx, this->actor.textId); + Flags_SetEventChkInf(0x40); + this->unk_1E2 = 6; + } + break; + case 4: + if (player->actor.posRot.pos.y < this->actor.posRot.pos.y) { + break; + } else { + if (func_8002F194(this, globalCtx) != 0) { + this->unk_1E2 += 1; + } else { + func_8002F2F4(this, globalCtx); + } + } + break; + case 5: + if (func_8002F334(this, globalCtx) != 0) { + this->unk_1E2 -= 1; + } + break; + case 6: + if (func_8002F334(this, globalCtx) != 0) { + func_8002DF54(globalCtx, &this->actor, 7); + Interface_ChangeAlpha(50); + this->actor.flags &= ~0x100; + this->unk_1E2 = 4; + } + break; + } + func_80038290(globalCtx, &this->actor, &this->unk_200, &this->unk_206, this->actor.posRot2.pos); +} + +void EnZl1_Update(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + EnZl1* this = THIS; + + if ((this->actionFunc != func_80B4B8B4) && (this->actionFunc != func_80B4BC78)) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + } + func_8002E4B4(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 5); + this->actionFunc(this, globalCtx); + if (this->actionFunc != func_80B4B8B4) { + Collider_CylinderUpdate(&this->actor, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.x, this->actor.posRot.rot.x, 0xA, 0x3E8, 1); + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.posRot.rot.y, 0xA, 0x3E8, 1); + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.z, this->actor.posRot.rot.z, 0xA, 0x3E8, 1); + func_80B4AE18(this); +} + +s32 func_80B4C340(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) { + EnZl1* this = THIS; + + if ((limbIndex == 4) || (limbIndex == 3) || (limbIndex == 6) || (limbIndex == 5)) { + *dList = NULL; + } + + if (limbIndex != 10) { + if (limbIndex == 17) { + rot->x += this->unk_200.y; + rot->y += this->unk_200.z; + rot->z += this->unk_200.x; + } + } else { + rot->x += this->unk_206.y; + rot->y += this->unk_206.x; + rot->z += this->unk_206.z; + } + return 0; +} + +void func_80B4C400(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* this) { + Vec3f vec = { 0.0f, 0.0f, 0.0f }; + + if (limbIndex == 17) { + Matrix_MultVec3f(&vec, &this->posRot2.pos); + } +} + +void EnZl1_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnZl1* this = THIS; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* dispRefs[4]; + + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_girlB.c", 2011); + + gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(this->unk_1F4)); + gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(this->unk_1F8)); + gSPSegment(gfxCtx->polyOpa.p++, 0x0A, SEGMENTED_TO_VIRTUAL(this->unk_1EC)); + + func_80093D18(globalCtx->state.gfxCtx); + SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, + func_80B4C340, func_80B4C400, &this->actor); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_girlB.c", 2046); +} diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h index 81288f659f..340bfb67d2 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h @@ -6,9 +6,28 @@ struct EnZl1; +typedef void (*EnZl1ActionFunc)(struct EnZl1*, GlobalContext*); + typedef struct EnZl1 { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0xC0]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ EnZl1ActionFunc actionFunc; + /* 0x0194 */ ColliderCylinder collider; + /* 0x01E0 */ char unk_1E0[0x2]; + /* 0x01E2 */ s16 unk_1E2; + /* 0x01E4 */ s16 unk_1E4; + /* 0x01E6 */ s16 unk_1E6; + /* 0x01E8 */ s16 unk_1E8; + /* 0x01EA */ char unk_1EA[0x2]; + /* 0x01EC */ UNK_PTR unk_1EC; + /* 0x01F0 */ char unk_1F0[0x2]; + /* 0x01F2 */ s16 unk_1F2; + /* 0x01F4 */ UNK_PTR unk_1F4; + /* 0x01F8 */ UNK_PTR unk_1F8; + /* 0x01FC */ s16 unk_1FC; + /* 0x01FE */ s16 unk_1FE; + /* 0x0200 */ Vec3s unk_200; + /* 0x0206 */ Vec3s unk_206; } EnZl1; // size = 0x020C extern const ActorInit En_Zl1_InitVars; diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c new file mode 100644 index 0000000000..8af79752a7 --- /dev/null +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c @@ -0,0 +1,286 @@ +#include "z_en_zl1.h" + +CutsceneData D_80B4C5D0[] = { + 0x0000001C, 0x00000BB8, 0x0000000A, 0x00000003, 0x00050190, 0x04BB0000, 0xC0000000, 0xFFFFFE5A, 0x00000054, + 0x00000001, 0xFFFFFE5A, 0x00000054, 0x00000001, 0x0F6484E4, 0x00000000, 0x00000001, 0x000104BB, 0x04D90000, + 0xC0000000, 0xFFFFFE5A, 0x00000054, 0x00000001, 0xFFFFFE1D, 0x00000054, 0x00000000, 0x0F6484E4, 0x00000000, + 0x00000001, 0x002904D9, 0x051F0000, 0xC0000000, 0xFFFFFE1D, 0x00000054, 0x00000000, 0xFFFFFE1D, 0x00000054, + 0x00000000, 0x0F6484E4, 0x00000000, 0x00000001, 0x00000012, 0x00000001, 0x00070492, 0x05247477, 0x00000000, + 0xFFFFFE1B, 0x00000054, 0x00000000, 0xFFFFFE2B, 0x00000055, 0xFFFFFFC9, 0x3DE07038, 0x3BE07038, 0xBDE07038, + 0x00000049, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFE8, 0x00000003, 0x00000000, + 0xFFFFFFE8, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000003, 0x000904C4, 0x051E8000, + 0x00000000, 0xFFFFFC86, 0x0000005A, 0x00000096, 0xFFFFFC86, 0x0000005A, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x000A051E, 0x05A90000, 0x00000000, 0xFFFFFC86, 0x0000005A, 0x00000000, 0xFFFFFC86, 0x0000005A, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000405A9, 0x05B10000, 0x00000000, 0xFFFFFC86, 0x0000005A, + 0x00000000, 0xFFFFFC86, 0x0000005A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000001, + 0x000C05B4, 0x05B50000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000002, 0xFFFFFFFF, 0x00000000, 0x00000002, + 0x00000000, 0x00000000, 0x00000000, 0x0000001D, 0x00000001, 0x0002014A, 0x02FB0000, 0x00000000, 0xFFFFFB1E, + 0x00000096, 0x00000000, 0xFFFFFB1E, 0x00000096, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000002D, + 0x00000001, 0x000100C8, 0x00E700E7, 0x0000002D, 0x00000001, 0x000500E6, 0x010F010F, 0x0000002D, 0x00000001, + 0x0001035C, 0x03660366, 0x0000002D, 0x00000001, 0x0005036B, 0x03840384, 0x00000001, 0x00010000, 0x014B0000, + 0x00000000, 0x42733334, 0xFE410080, 0x00012031, 0x00000000, 0x42733334, 0xFE410080, 0x00013533, 0x00000000, + 0x42733334, 0xFE410080, 0x00013833, 0x00000000, 0x42733334, 0xFE410080, 0x00012C20, 0x00000000, 0x42733334, + 0xFE780091, 0x00012032, 0x00000000, 0x42733334, 0xFEC200A8, 0x00013533, 0x00000000, 0x42733334, 0xFF2200C6, + 0x00013639, 0x00000000, 0x42733334, 0xFF6E00DD, 0x0001392C, 0x00000000, 0x42733334, 0xFF7C00DE, 0x00012032, + 0x00000000, 0x42733334, 0xFFBE010B, 0x00013632, 0x00000000, 0x42733334, 0xFFBE010B, 0x00013639, 0x00000000, + 0x42733334, 0xFFBE010B, 0x0001392C, 0x00000000, 0x42733334, 0xFFBE010B, 0x00012031, 0x00000000, 0x42733334, + 0xFFBE010B, 0x00013533, 0xFF000000, 0x42733334, 0xFFBE010B, 0x00013336, 0x00000001, 0x000100E6, 0x065F0000, + 0x00000000, 0x42700000, 0xFB3C01BD, 0x00182031, 0x00000000, 0x42700000, 0xFB3C01BD, 0x00183533, 0x00000000, + 0x42700000, 0xFB3C01BD, 0x00183833, 0x00000000, 0x42700000, 0xFB3C01BD, 0x00182C20, 0x00000000, 0x42700000, + 0xFB3C01BD, 0x00182032, 0x00000000, 0x42700000, 0xFB3C01BD, 0x00183533, 0x00000000, 0x42700000, 0xFB3C01BD, + 0x00183639, 0x00000000, 0x42700000, 0xFB3C01BD, 0x0018392C, 0x00000000, 0x42700000, 0xFB3C01BD, 0x00182032, + 0x00000000, 0x42700000, 0xFB3C0103, 0x00183632, 0x00000000, 0x42700000, 0xFB3C00BD, 0x00183639, 0x00000000, + 0x42700000, 0xFB9100C6, 0x0051392C, 0x00000000, 0x42700000, 0xFB940077, 0x00542031, 0x00000000, 0x42726667, + 0xFB510089, 0x00243533, 0x00000000, 0x42726667, 0xFB3E007F, 0x00163336, 0x00000000, 0x42726667, 0xFB3E007F, + 0x0016332C, 0x00000000, 0x42726667, 0xFB3E007F, 0x00162032, 0x00000000, 0x42726667, 0xFB3E007F, 0x00163231, + 0x00000000, 0x42726667, 0xFB3E007F, 0x00163232, 0x00000000, 0x42726667, 0xFB3E007F, 0x0016392C, 0x00000000, + 0x42726667, 0xFB3E007F, 0x00162034, 0x00000000, 0x42726667, 0xFB3E007F, 0x00163331, 0x00000000, 0x42726667, + 0xFB3E007F, 0x00163434, 0x00000000, 0x42726667, 0xFB3E007F, 0x0016312C, 0x00000000, 0x42726667, 0xFB3E007F, + 0x00162032, 0x00000000, 0x42726667, 0xFB3E007F, 0x00163136, 0x00000000, 0x42726667, 0xFB3E007F, 0x00163336, + 0x00000000, 0x42726667, 0xFB3E007F, 0x0016332C, 0x00000000, 0x42726667, 0xFB3E007F, 0x0016200A, 0x00000000, + 0x42726667, 0xFB3E007F, 0x00163136, 0xFF000000, 0x42726667, 0xFB3E007F, 0x00163336, 0x00000001, 0x0001032A, + 0x04110000, 0x00000000, 0x42726668, 0xFB3E007F, 0x00162031, 0x00000000, 0x42726668, 0xFB3E007F, 0x00163533, + 0x00000000, 0x42726668, 0xFB3E007F, 0x00163833, 0x00000000, 0x42726668, 0xFB3E0058, 0x00152C20, 0x00000000, + 0x42726668, 0xFB48FFCC, 0x00172032, 0x00000000, 0x42726668, 0xFB4FFF8E, 0x001A3533, 0x00000000, 0x42726668, + 0xFB4FFF8E, 0x001A3639, 0x00000000, 0x42726668, 0xFB4FFF8E, 0x001A392C, 0x00000000, 0x42726668, 0xFB4FFF8E, + 0x001A2032, 0x00000000, 0x42726668, 0xFB4FFF8E, 0x001A3632, 0xFF000000, 0x42726668, 0xFB4FFF8E, 0x001A3639, + 0x00000001, 0x00010366, 0x04ED0000, 0x00000000, 0x42A08C84, 0xFFC500A0, 0x01402031, 0x00000000, 0x42704C78, + 0xFFC500A0, 0x01403533, 0x00000000, 0x42704C78, 0xFFC500A0, 0x01403833, 0x00000000, 0x42704C78, 0xFFC500A0, + 0x01402C20, 0x00000000, 0x42704C78, 0xFF8D0094, 0x00F92032, 0x00000000, 0x42704C78, 0xFF42007E, 0x00C03533, + 0x00000000, 0x42704C78, 0xFEE20069, 0x00873639, 0x00000000, 0x42704C78, 0xFE9B006C, 0x0057392C, 0x00000000, + 0x42704C78, 0xFE760068, 0x00352032, 0x00000000, 0x42704C78, 0xFE760068, 0x00353632, 0x00000000, 0x42704C78, + 0xFE760068, 0x00353639, 0x00000000, 0x42704C78, 0xFE760068, 0x0035392C, 0x00000000, 0x42704C78, 0xFE760068, + 0x00352031, 0xFF000000, 0x42704C78, 0xFE760068, 0x00353533, 0x00000001, 0x00010488, 0x05790000, 0x00000000, + 0x42700000, 0xFE3500AF, 0x00502031, 0x00000000, 0x42700000, 0xFE3500AF, 0x00503533, 0x00000000, 0x42700000, + 0xFE3500AF, 0x00503833, 0x00000000, 0x42700000, 0xFE3500AF, 0x00502C20, 0x00000000, 0x42700000, 0xFE3500AF, + 0x00502032, 0x00000000, 0x42700000, 0xFE3500AF, 0x00503533, 0x00000000, 0x42700000, 0xFE3500AF, 0x00503639, + 0x00000000, 0x42700000, 0xFE3500AF, 0x0050392C, 0xFF000000, 0x42700000, 0xFE3500AF, 0x00502032, 0x00000001, + 0x000104EC, 0x05830000, 0x00000000, 0x4234CCBE, 0xFE330085, 0x00002031, 0x00000000, 0x4234CCBE, 0xFE330085, + 0x00003533, 0x00000000, 0x4234CCBE, 0xFE330085, 0x00003833, 0x00000000, 0x4234CCBE, 0xFE330085, 0x00002C20, + 0x00000000, 0x4234CCBE, 0xFE330085, 0x00002032, 0xFF000000, 0x4234CCBE, 0xFE330085, 0x00003533, 0x00000001, + 0x00010528, 0x05FB0000, 0x00000000, 0x412FFF56, 0xFE18007C, 0xFFFA2031, 0x00000000, 0x412FFF56, 0xFE18007C, + 0xFFFA3533, 0x00000000, 0x412FFF56, 0xFE18007C, 0xFFFA3833, 0x00000000, 0x412FFF56, 0xFE18007C, 0xFFFA2C20, + 0x00000000, 0x412FFF56, 0xFE18007C, 0xFFFA2032, 0x00000000, 0x412FFF56, 0xFE18007C, 0xFFFA3533, 0x00000000, + 0x412FFF56, 0xFE18007C, 0xFFFA3639, 0xFF000000, 0x412FFF56, 0xFE18007C, 0xFFFA392C, 0x00000002, 0x00010000, + 0x01680000, 0x0000001E, 0x42726667, 0xFE06006E, 0x00012031, 0x0000001E, 0x42733334, 0xFE06006E, 0x00013533, + 0x0000001E, 0x42733334, 0xFE06006E, 0x00013833, 0x0000001E, 0x42733334, 0xFE06006E, 0x00012C20, 0x00000019, + 0x42733334, 0xFE3D007F, 0x00012032, 0x00000019, 0x42733334, 0xFE840095, 0x00013533, 0x00000014, 0x42733334, + 0xFEDD00B1, 0x00013639, 0x00000014, 0x42733334, 0xFF2000D2, 0x0001392C, 0x00000014, 0x42733334, 0xFF2B00E6, + 0x00012032, 0x00000014, 0x42733334, 0xFF710123, 0x00013632, 0x00000014, 0x42733334, 0xFF790134, 0x00013639, + 0x00000014, 0x42733334, 0xFF81013F, 0x0001392C, 0x00000014, 0x42733334, 0xFF880146, 0x00012031, 0x00000014, + 0x42733334, 0xFF880146, 0x00013533, 0xFF00001E, 0x42733334, 0xFF880146, 0x00013336, 0x00000002, 0x000100E6, + 0x06AE0000, 0x0000001E, 0x42700000, 0xFB22019D, 0x00052031, 0x0000001E, 0x42700000, 0xFB22019D, 0x00053533, + 0x0000001E, 0x42700000, 0xFB22019D, 0x00053833, 0x0000001E, 0x42700000, 0xFB22019D, 0x00052C20, 0x0000001E, + 0x42700000, 0xFB22019D, 0x00052032, 0x0000001E, 0x42700000, 0xFB22019D, 0x00053533, 0x0000001E, 0x42700000, + 0xFB22019D, 0x00053639, 0x0000001E, 0x42700000, 0xFB22019D, 0x0005392C, 0x0000001E, 0x42700000, 0xFB22019D, + 0x00052032, 0x0000001E, 0x42700000, 0xFB2300E3, 0x00053632, 0x0000001E, 0x42700000, 0xFB23009E, 0x00053639, + 0x0000001E, 0x42700000, 0xFB6400B2, 0x0032392C, 0x00000050, 0x42700000, 0xFB660083, 0x00332031, 0x00000050, + 0x42726667, 0xFB280092, 0x00063533, 0x0000001E, 0x42726667, 0xFB1B0099, 0xFFFD3336, 0x0000001E, 0x42726667, + 0xFB1B0099, 0xFFFD332C, 0x0000001E, 0x42726667, 0xFB1B0099, 0xFFFD2032, 0x0000001E, 0x42726667, 0xFB1B0099, + 0xFFFD3231, 0x0000001E, 0x42726667, 0xFB1B0099, 0xFFFD3232, 0x0000001E, 0x42726667, 0xFB1C0098, 0xFFFE392C, + 0x0000001E, 0x42726667, 0xFB1C0098, 0xFFFE2034, 0x00000050, 0x42726667, 0xFB1C0098, 0xFFFE3331, 0x00000050, + 0x42726667, 0xFB1C0098, 0xFFFE3434, 0x00000050, 0x42726667, 0xFB1C0098, 0xFFFE312C, 0x00000050, 0x42726667, + 0xFB1D0097, 0xFFFF2032, 0x00000050, 0x42726667, 0xFB1D0097, 0xFFFF3136, 0x00000050, 0x42726667, 0xFB1D0097, + 0xFFFF3336, 0x00000050, 0x42726667, 0xFB1D0097, 0xFFFF332C, 0x00000050, 0x42726667, 0xFB1D0097, 0xFFFF200A, + 0x0000001E, 0x42726667, 0xFB1D0097, 0xFFFF3136, 0xFF000050, 0x42726667, 0xFB1D0097, 0xFFFF3336, 0x00000002, + 0x0001032A, 0x042E0000, 0x0000001E, 0x42726668, 0xFB1D0097, 0xFFFF2031, 0x0000001E, 0x42726668, 0xFB1D0097, + 0xFFFF3533, 0x00000014, 0x42726668, 0xFB1E0096, 0x00003833, 0x0000000A, 0x42726668, 0xFB27007D, 0x00052C20, + 0x0000000A, 0x42726668, 0xFB36FFF3, 0x000A2032, 0x0000000A, 0x42726668, 0xFB3EFFB7, 0x001A3533, 0x0000001E, + 0x42726668, 0xFB3EFFB7, 0x001A3639, 0x0000001E, 0x42726668, 0xFB3EFFB7, 0x001A392C, 0x0000001E, 0x42726668, + 0xFB3EFFB7, 0x001A2032, 0x0000001E, 0x42726668, 0xFB3EFFB7, 0x001A3632, 0xFF00001E, 0x42726668, 0xFB3EFFB7, + 0x001A3639, 0x00000002, 0x00010366, 0x050A0000, 0x0000001E, 0x42704C78, 0xFFD300F0, 0x00F12031, 0x0000001E, + 0x42704C78, 0xFFD300F0, 0x00F13533, 0x0000001E, 0x42704C78, 0xFFC800DB, 0x00E03833, 0x0000001E, 0x42704C78, + 0xFFAB00B7, 0x00D42C20, 0x0000001E, 0x42704C78, 0xFF340086, 0x00B72032, 0x0000001E, 0x42704C78, 0xFEE80074, + 0x007D3533, 0x0000001E, 0x42704C78, 0xFE880068, 0x00453639, 0x0000001E, 0x42704C78, 0xFE48006B, 0x000D392C, + 0x0000001E, 0x42704C78, 0xFE2D006E, 0xFFE72032, 0x0000001E, 0x42704C78, 0xFE2D006E, 0xFFE73632, 0x0000001E, + 0x42704C78, 0xFE2D006E, 0xFFE73639, 0x0000001E, 0x42704C78, 0xFE2D006E, 0xFFE7392C, 0x0000001E, 0x42704C78, + 0xFE2D006E, 0xFFE72031, 0xFF00001E, 0x42704C78, 0xFE2D006E, 0xFFE73533, 0x00000002, 0x00010488, 0x05960000, + 0x0000001E, 0x42700000, 0xFE38008A, 0x00102031, 0x0000001E, 0x42700000, 0xFE38008A, 0x00103533, 0x0000001E, + 0x42700000, 0xFE38008A, 0x00103833, 0x0000001E, 0x42700000, 0xFE38008A, 0x00102C20, 0x0000001E, 0x42700000, + 0xFE38008A, 0x00102032, 0x0000001E, 0x42700000, 0xFE38008A, 0x00103533, 0x0000001E, 0x42700000, 0xFE38008A, + 0x00103639, 0x0000001E, 0x42700000, 0xFE38008A, 0x0010392C, 0xFF00001E, 0x42700000, 0xFE38008A, 0x00102032, + 0x00000002, 0x000104EC, 0x05A00000, 0x0000001E, 0x4234CCBE, 0xFDE90085, 0x00002031, 0x0000001E, 0x4234CCBE, + 0xFDE90085, 0x00003533, 0x0000001E, 0x4234CCBE, 0xFDE90085, 0x00003833, 0x0000001E, 0x4234CCBE, 0xFDE90085, + 0x00002C20, 0x0000001E, 0x4234CCBE, 0xFDE90085, 0x00002032, 0xFF00001E, 0x4234CCBE, 0xFDE90085, 0x00003533, + 0x00000002, 0x00010528, 0x06180000, 0x0000001E, 0x412FFF56, 0xFABB007C, 0xFFFA2031, 0x0000001E, 0x412FFF56, + 0xFABB007C, 0xFFFA3533, 0x0000001E, 0x412FFF56, 0xFABB007C, 0xFFFA3833, 0x0000001E, 0x412FFF56, 0xFABB007C, + 0xFFFA2C20, 0x0000001E, 0x412FFF56, 0xFABB007C, 0xFFFA2032, 0x0000001E, 0x412FFF56, 0xFABB007C, 0xFFFA3533, + 0x0000001E, 0x412FFF56, 0xFABB007C, 0xFFFA3639, 0xFF00001E, 0x412FFF56, 0xFABB007C, 0xFFFA392C, 0x00000013, + 0x0000000A, 0xFFFF0000, 0x0032FFFF, 0xFFFFFFFF, 0x70350032, 0x00BE0000, 0xFFFFFFFF, 0xFFFF00BE, 0x012CFFFF, + 0xFFFFFFFF, 0x7036012C, 0x03200000, 0xFFFFFFFF, 0xFFFF0320, 0x03CAFFFF, 0xFFFFFFFF, 0x703703CA, 0x047E0000, + 0xFFFF7038, 0xFFFF047E, 0x04A6FFFF, 0xFFFFFFFF, 0x700504A6, 0x04B00000, 0xFFFF700B, 0xFFFF04B0, 0x053CFFFF, + 0xFFFFFFFF, 0x7009053C, 0x058C0000, 0xFFFFFFFF, 0x00000056, 0x00000001, 0x004E00E6, 0x00E70000, 0x00000000, + 0x00000003, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000056, 0x00000001, 0x002A0366, 0x03670000, 0x00000000, 0xFFFFFFFE, 0x00000000, 0xFFFFFFFD, 0xFFFFFFFE, + 0x00000000, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000001, 0x0001006E, 0x006F0000, + 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000001, 0xFFFFFFFE, 0x00000000, 0x00000001, 0x00000000, 0x00000000, + 0x00000000, 0xFFFFFFFF, 0x00000000, 0xC3DC0000, 0x42EA0000, 0x00000000, 0xC3F50000, 0x42F00000, 0x00000000, + 0x0000002D, 0xC3F20000, 0x42F40000, 0xC1E80000, 0xC3F00000, 0x42E80000, 0x41900000, 0x00000050, 0xC3CE8000, + 0x43080000, 0xC2900000, 0xC3C98000, 0x430D0000, 0xC2B20000, 0x00000019, 0xC3E30000, 0x42F00000, 0x00000000, + 0xC3D90000, 0x42F20000, 0x00000000, 0x00000014, 0xC3E30000, 0x42F00000, 0x00000000, 0xC3D70000, 0x42CE0000, + 0xC2140000, 0x00000014, 0xC3E30000, 0x42D20000, 0x42480000, 0xC3E28000, 0x42D20000, 0x42840000, 0x0000003C, + 0xC3FA8000, 0x42F40000, 0x00000000, 0xC3E08000, 0x42EE0000, 0x00000000, 0x0000002D, 0xC3E70000, 0x42F20000, + 0x00000000, 0xC3D18000, 0x42FA0000, 0x00000000, 0x00000014, 0xC409C000, 0x42EE0000, 0x40E00000, 0xC412C000, + 0x42E60000, 0x41600000, 0x00000014, 0xC3F48000, 0x43010000, 0x00000000, 0xC3EB0000, 0x43000000, 0x00000000, + 0x00000028, 0xC4034000, 0x42FC0000, 0x00000000, 0xC3FE8000, 0x42FC0000, 0x00000000, 0x0000000A, 0xC3F58000, + 0x42F00000, 0xC0E00000, 0xC3FE8000, 0x42E60000, 0xC0E00000, 0x0000004B, 0xC3F28000, 0x42F00000, 0xC2280000, + 0xC3F20000, 0x42F00000, 0x41200000, 0x0000002D, +}; +CutsceneData D_80B4D72C[] = { + 0x00000014, 0x42A19989, 0xFE1C007A, 0xFFE30000, 0x00000014, 0x42A19989, 0xFE1C007A, 0xFFE30000, + 0x00000014, 0x42A19989, 0xFE1C007A, 0xFFE30000, 0x00000014, 0x42A19989, 0xFE3C0079, 0xFFEB0000, + 0x00000014, 0x42A19989, 0xFE3C0079, 0xFFEB0000, 0x00000014, 0x42A19989, 0xFE3C0079, 0xFFEB0000, + 0xFF000014, 0x42A19989, 0xFE3C0079, 0xFFEB0000, 0xFF00001E, 0x42A19989, 0xFE3C0079, 0xFFEB0000, +}; +CutsceneData D_80B4D7AC[] = { + 0x00000000, 0x42A19989, 0xFE200074, 0x00120000, 0x00000000, 0x42A19989, 0xFE200074, 0x00120000, + 0x00000000, 0x42A19989, 0xFE200074, 0x00120000, 0x00000000, 0x42A19989, 0xFE200074, 0x00120000, + 0x00000000, 0x42A19989, 0xFE200074, 0x00120000, 0x00000000, 0x42A19989, 0xFE200074, 0x00120000, + 0xFF000000, 0x42A19989, 0xFE200074, 0x00120000, 0xFF000000, 0x42A19989, 0xFE200074, 0x00120000, +}; +CutsceneData D_80B4D82C[] = { + 0x00000014, 0x4234CCDC, 0xFE490074, 0x00000000, 0x00000014, 0x4234CCDC, 0xFE490074, 0x00000000, + 0x00000014, 0x424A667B, 0xFE4F0074, 0x00000000, 0x00000014, 0x425E6680, 0xFE510074, 0x00000000, + 0x00000014, 0x4270001E, 0xFE550074, 0x00000000, 0x00000014, 0x4282000F, 0xFE580074, 0x00000000, + 0x00000014, 0x428D999D, 0xFE5A0074, 0x00000000, 0x00000014, 0x4297332D, 0xFE5D0073, 0x00000000, + 0xFF000014, 0x4297332D, 0xFE5D0074, 0x00000000, 0xFF00001E, 0x4297332D, 0xFE5D0073, 0x00000000, +}; +CutsceneData D_80B4D8CC[] = { + 0x00000000, 0x427199B8, 0xFE200072, 0x00000000, 0x00000000, 0x4234CCDC, 0xFE200072, 0x00000000, + 0x00000000, 0x4234CCDC, 0xFE260072, 0x00000000, 0x00000000, 0x424A667B, 0xFE280072, 0x00000000, + 0x00000000, 0x425E6680, 0xFE2C0072, 0x00000000, 0x00000000, 0x4270001E, 0xFE2F0072, 0x00000000, + 0x00000000, 0x4282000F, 0xFE310072, 0x00000000, 0x00000000, 0x428D999D, 0xFE340072, 0x00000000, + 0xFF000000, 0x4297332D, 0xFE340072, 0x00000000, 0xFF000000, 0x4297332D, 0xFE340072, 0x00000000, +}; +CutsceneData D_80B4D96C[] = { + 0x00000019, 0x4270001E, 0xFF8C0032, 0x01D50000, 0x00000019, 0x4270001E, 0xFF8C0032, 0x01D50000, + 0x00000019, 0x4270001E, 0xFF8A0032, 0x01D30000, 0x00000019, 0x4270001E, 0xFF880032, 0x01D10000, + 0x00000019, 0x4270001E, 0xFF850032, 0x01D00000, 0x00000019, 0x4270001E, 0xFF820032, 0x01CF0000, + 0x00000019, 0x4270001E, 0xFF7F0032, 0x01CE0000, 0x00000019, 0x4270001E, 0xFF7D0032, 0x01CE0000, + 0x00000019, 0x4270001E, 0xFF7A0032, 0x01CF0000, 0x00000019, 0x4270001E, 0xFF770032, 0x01D00000, + 0x00000019, 0x4270001E, 0xFF740032, 0x01D20000, 0x00000019, 0x4270001E, 0xFF740032, 0x01D20000, + 0xFF000019, 0x4270001E, 0xFF740032, 0x01D20000, 0xFF000019, 0x4270001E, 0xFF740032, 0x01D20000, +}; +CutsceneData D_80B4DA4C[] = { + 0x00000000, 0x41A33320, 0xFF7E0032, 0x01E00000, 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, + 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, + 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, + 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, + 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, + 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, 0x00000000, 0x4270001E, 0xFF7E0032, 0x01E00000, + 0xFF000000, 0x4270001E, 0xFF7E0032, 0x01E00000, 0xFF000000, 0x4270001E, 0xFF7E0032, 0x01E00000, +}; +CutsceneData D_80B4DB2C[] = { + 0x0000001E, 0x41A66654, 0xFE550074, 0x00040000, 0x0000001E, 0x41A66654, 0xFE560073, 0x00040000, 0x0000001E, + 0x41A66654, 0xFE530073, 0x00070000, 0x0000001E, 0x41A66654, 0xFE540072, 0x000C0000, 0x0000001E, 0x41A66654, + 0xFE520072, 0x000E0000, 0x0000001E, 0x41A66654, 0xFE520072, 0x000E0000, 0x0000001E, 0x41A66654, 0xFE520072, + 0x000E0000, 0xFF00001E, 0x41A66654, 0xFE520070, 0x000E0000, 0xFF00001E, 0x41A66654, 0xFE520070, 0x000E0000, +}; +CutsceneData D_80B4DBBC[] = { + 0x00000000, 0x41A66654, 0xFE7B006D, 0x00240000, 0x00000000, 0x41A66654, 0xFE7B006D, 0x00240000, 0x00000000, + 0x41A66654, 0xFE7B006D, 0x00240000, 0x00000000, 0x41A66654, 0xFE7B006D, 0x00240000, 0x00000000, 0x41A66654, + 0xFE7B006D, 0x00240000, 0x00000000, 0x41A66654, 0xFE7B006D, 0x00240000, 0x00000000, 0x41A66654, 0xFE7B006D, + 0x00240000, 0xFF000000, 0x41A66654, 0xFE7B006D, 0x00240000, 0xFF000000, 0x41A66654, 0xFE7B006D, 0x00240000, +}; +CutsceneData D_80B4DC4C[] = { + 0x0000001E, 0x42340000, 0xFE100077, 0x00000000, 0x0000001E, 0x42340000, 0xFE100077, 0x00000000, 0x0000001E, + 0x42340000, 0xFE100077, 0x00000000, 0x0000000F, 0x42340000, 0xFE100077, 0x00000000, 0x0000000F, 0x42373343, + 0xFE29007A, 0x00000000, 0x0000000F, 0x42373343, 0xFE75008B, 0x00000000, 0x0000000F, 0x42373343, 0xFF3F00B7, + 0x00000000, 0x0000000F, 0x42373343, 0x001D00E8, 0x00000000, 0x0000001E, 0x42373343, 0x01680130, 0x00000000, + 0x0000001E, 0x42373343, 0x01AD0148, 0x00000000, 0x0000001E, 0x42373343, 0x01AD0148, 0x00000000, 0x0000001E, + 0x42373343, 0x01AD0148, 0x00000000, 0x0000001E, 0x42373343, 0x01AD0148, 0x00000000, 0xFF00001E, 0x42373343, + 0x01AD0148, 0x00000000, 0xFF00001E, 0x42373343, 0x01AD0148, 0x00000000, +}; +CutsceneData D_80B4DD3C[] = { + 0x00000000, 0x42340000, 0xFE450073, 0x00000000, 0x00000000, 0x42340000, 0xFE450073, 0x00000000, 0x00000000, + 0x42340000, 0xFE450073, 0x00000000, 0x00000000, 0x42340000, 0xFE450073, 0x00000000, 0x00000000, 0x42373343, + 0xFE5C0085, 0x00000000, 0x00000000, 0x42373343, 0xFEA80096, 0x00000000, 0x00000000, 0x42373343, 0xFF7100C2, + 0x00000000, 0x00000000, 0x42373343, 0x005000F3, 0x00000000, 0x00000000, 0x42373343, 0x019C013B, 0x00000000, + 0x00000000, 0x42373343, 0x01E2014C, 0x00000000, 0x00000000, 0x42373343, 0x01E2014C, 0x00000000, 0x00000000, + 0x42373343, 0x01E2014C, 0x00000000, 0x00000000, 0x42373343, 0x01E2014C, 0x00000000, 0xFF000000, 0x42373343, + 0x01E2014C, 0x00000000, 0xFF000000, 0x42373343, 0x01E2014C, 0x00000000, +}; +CutsceneData D_80B4DE2C[] = { + 0x00000019, 0x42726685, 0x00420194, 0x01A90000, 0x00000019, 0x427199B8, 0x00420194, 0x01A90000, + 0x00000019, 0x425E6680, 0x00420194, 0x01AA0000, 0x00000019, 0x425CCCE6, 0x003F0175, 0x019D0000, + 0x00000019, 0x424999AE, 0x001A0161, 0x01980000, 0x00000019, 0x424999AE, 0x00110145, 0x018D0000, + 0x00000019, 0x423599A9, 0x00110146, 0x018D0000, 0x00000019, 0x4234CCDC, 0xFF7800B1, 0x01030000, + 0x00000019, 0x422199A4, 0xFEFE006F, 0x00A90000, 0x00000019, 0x4220CCD7, 0xFE87006C, 0x00410000, + 0x00000019, 0x420CCCD2, 0xFE87006C, 0x00410000, 0x00000019, 0x420CCCD2, 0xFE87006C, 0x00410000, + 0xFF00001E, 0x41F1999A, 0xFE88006C, 0x00410000, 0xFF00001E, 0x41F1999A, 0xFE88006C, 0x00410000, +}; +CutsceneData D_80B4DF0C[] = { + 0x00000000, 0x42373343, 0x001D017F, 0x01BD0000, 0x00000000, 0x42373343, 0x001D017F, 0x01BD0000, + 0x00000000, 0x42373343, 0x001D017F, 0x01BD0000, 0x00000000, 0x42373343, 0x001D017F, 0x01BD0000, + 0x00000000, 0x42373343, 0x001D017F, 0x01BD0000, 0x00000000, 0x42373343, 0x0031015B, 0x01A80000, + 0x00000000, 0x42373343, 0x0031015B, 0x01A80000, 0x00000000, 0x41F1999A, 0xFF9900C0, 0x011E0000, + 0x00000000, 0x41F1999A, 0xFF200071, 0x00C60000, 0x00000000, 0x41F1999A, 0xFEA7006D, 0x00600000, + 0x00000000, 0x41F1999A, 0xFEA7006D, 0x00600000, 0x00000000, 0x41F1999A, 0xFEA7006D, 0x00600000, + 0xFF000000, 0x41F1999A, 0xFEA7006D, 0x00600000, 0xFF000000, 0x41F1999A, 0xFEA7006D, 0x00600000, +}; +CutsceneData D_80B4DFEC[] = { + 0x0000000A, 0x41F00000, 0xFE1E0077, 0x00000000, 0x0000000A, 0x41F00000, 0xFE1E0077, 0x00000000, + 0x0000000A, 0x41F00000, 0xFE1E0077, 0x00000000, 0x0000000A, 0x41F66668, 0xFE1E0077, 0x00000000, + 0x0000000A, 0x41F66668, 0xFE1E0077, 0x00000000, 0x0000000A, 0x41F66668, 0xFE32007E, 0x00000000, + 0x0000001E, 0x41F66668, 0xFE750096, 0x00000000, 0x0000001E, 0x41F66668, 0xFE750096, 0x00000000, + 0xFF00001E, 0x41F66668, 0xFE750096, 0x00000000, 0xFF00001E, 0x41F66668, 0xFE750096, 0x00000000, +}; +CutsceneData D_80B4E08C[] = { + 0x00000000, 0x41F00000, 0xFE480073, 0x00000000, 0x00000000, 0x41F00000, 0xFE480073, 0x00000000, + 0x00000000, 0x41F00000, 0xFE480073, 0x00000000, 0x00000000, 0x41F66668, 0xFE480073, 0x00000000, + 0x00000000, 0x41F66668, 0xFE480073, 0x00000000, 0x00000000, 0x41F66668, 0xFE59008E, 0x00000000, + 0x00000000, 0x41F66668, 0xFE9A00AB, 0x00000000, 0x00000000, 0x41F66668, 0xFE9A00AB, 0x00000000, + 0xFF000000, 0x41F66668, 0xFE9A00AB, 0x00000000, 0xFF000000, 0x41F66668, 0xFE9A00AB, 0x00000000, +}; +CutsceneData D_80B4E12C[] = { + 0x0000001E, 0x41C80000, 0xFDD90077, 0x00070000, 0x0000001E, 0x41C80000, 0xFDD90077, 0x00070000, 0x0000000F, + 0x41C80000, 0xFDD90077, 0x00070000, 0x0000000F, 0x42700000, 0xFE1B0078, 0xFFF90000, 0x0000001E, 0x42700000, + 0xFE1B0078, 0xFFF90000, 0x0000001E, 0x42700000, 0xFE1B0078, 0xFFF90000, 0x0000001E, 0x42700000, 0xFE1B0076, + 0xFFFB0000, 0xFF00001E, 0x42700000, 0xFE1B0077, 0xFFFA0000, 0xFF00001E, 0x42700000, 0xFE1B0077, 0xFFFA0000, +}; +CutsceneData D_80B4E1BC[] = { + 0x00000000, 0x4234CCDC, 0xFDB50073, 0x000E0000, 0x00000000, 0x41CB3366, 0xFDB50073, 0x000E0000, 0x00000000, + 0x41CB3366, 0xFDB50073, 0x000E0000, 0x00000000, 0x4270CD09, 0xFDF70075, 0xFFFF0000, 0x00000000, 0x4270CD09, + 0xFDF70075, 0xFFFF0000, 0x00000000, 0x4270CD09, 0xFDF70075, 0xFFFF0000, 0x00000000, 0x4270CD09, 0xFDF70075, + 0xFFFF0000, 0xFF000000, 0x4270CD09, 0xFDF70074, 0x00000000, 0xFF000000, 0x4270CC08, 0xFDF70074, 0x00000000, +}; +CutsceneData D_80B4E24C[] = { + 0x0000001E, 0x4270001E, 0x004B0034, 0x00320000, 0x0000001E, 0x4270001E, 0x004B0034, 0x00300000, + 0x0000003C, 0x4270001E, 0x004A0034, 0x002D0000, 0x0000003C, 0x4270001E, 0x00310033, 0xFFD50000, + 0x0000001E, 0x4270001E, 0x00310033, 0xFFD50000, 0x0000001E, 0x4270001E, 0x00310033, 0xFFD50000, + 0xFF00001E, 0x4270001E, 0x00310033, 0xFFD50000, 0xFF00001E, 0x4270001E, 0x00310033, 0xFFD50000, +}; +CutsceneData D_80B4E2CC[] = { + 0x00000000, 0x4270001E, 0x005A0034, 0x00350000, 0x00000000, 0x4270001E, 0x005A0034, 0x00320000, + 0x00000000, 0x4270001E, 0x005A0034, 0x002D0000, 0x00000000, 0x4270001E, 0x00410033, 0xFFD40000, + 0x00000000, 0x4270001E, 0x00410033, 0xFFD40000, 0x00000000, 0x4270001E, 0x00410033, 0xFFD40000, + 0xFF000000, 0x4270001E, 0x00410033, 0xFFD40000, 0xFF000000, 0x4270001E, 0x00410033, 0xFFD40000, +}; +CutsceneData D_80B4E34C[] = { + 0x0000001F, 0x4270001E, 0xFE3F0079, 0xFFED0000, 0x0000001E, 0x4270001E, 0xFE3F0079, 0xFFED0000, + 0x0000001E, 0x4270001E, 0xFE3F0079, 0xFFED0000, 0x0000001E, 0x4270001E, 0xFE38006E, 0xFFEF0000, + 0x0000001E, 0x4270001E, 0xFE38006E, 0xFFEF0000, 0x0000001E, 0x4270001E, 0xFE38006E, 0xFFEF0000, + 0xFF00001E, 0x4270001E, 0xFE38006E, 0xFFEF0000, 0xFF00001E, 0x4270001E, 0xFE38006E, 0xFFEF0000, +}; +CutsceneData D_80B4E3CC[] = { + 0x00000000, 0x4270001E, 0xFE47006B, 0xFFEA0000, 0x00000000, 0x4270001E, 0xFE47006B, 0xFFEA0000, + 0x00000000, 0x4270001E, 0xFE47006B, 0xFFEA0000, 0x00000000, 0x4270001E, 0xFE47006B, 0xFFEA0000, + 0x00000000, 0x4270001E, 0xFE47006B, 0xFFEA0000, 0x00000000, 0x4270001E, 0xFE47006B, 0xFFEA0000, + 0xFF000000, 0x4270001E, 0xFE47006B, 0xFFEA0000, 0xFF000000, 0x4270001E, 0xFE47006B, 0xFFEA0000, +}; +CutsceneData D_80B4E44C[] = { + 0x0000001E, 0x41A66654, 0xFEB5006E, 0xFFA50000, 0x0000001E, 0x41A66654, 0xFEB5006E, 0xFFA50000, + 0x0000001E, 0x41A66654, 0xFEB5006E, 0xFFA50000, 0x0000001E, 0x41A66654, 0xFE010079, 0x00070000, + 0x0000001E, 0x41A66654, 0xFE010079, 0x00070000, 0x0000001E, 0x41A66654, 0xFE010079, 0x00070000, + 0xFF00001E, 0x41A66654, 0xFE010079, 0x00070000, 0xFF00001E, 0x41A66654, 0xFE010079, 0x00070000, +}; +CutsceneData D_80B4E4CC[] = { + 0x00000000, 0x41A66654, 0xFE8F006E, 0xFFBA0000, 0x00000000, 0x41A66654, 0xFE8F006E, 0xFFBA0000, 0x00000000, + 0x41A66654, 0xFE8F006E, 0xFFBA0000, 0x00000000, 0x41A66654, 0xFDDB007C, 0x001D0000, 0x00000000, 0x41A66654, + 0xFDDB007C, 0x001D0000, 0x00000000, 0x41A66654, 0xFDDB007C, 0x001D0000, 0xFF000000, 0x41A66654, 0xFDDB007C, + 0x001D0000, 0xFF000000, 0x41A66654, 0xFDDB007C, 0x001D0000, D_80B4D72C, D_80B4D7AC, 0x00000000, D_80B4D82C, + D_80B4D8CC, 0x00000000, D_80B4D96C, D_80B4DA4C, 0x00000000, D_80B4DB2C, D_80B4DBBC, 0x00000000, D_80B4DC4C, + D_80B4DD3C, 0x00000000, D_80B4DE2C, D_80B4DF0C, 0x00000000, D_80B4DFEC, D_80B4E08C, 0x00000000, D_80B4E12C, + D_80B4E1BC, 0x00000000, D_80B4E24C, D_80B4E2CC, 0x00000000, D_80B4E34C, D_80B4E3CC, 0x00000000, D_80B4E44C, + D_80B4E4CC, 0x00000000, +}; diff --git a/undefined_syms.txt b/undefined_syms.txt index def8cdf771..5530049ef2 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -238,6 +238,21 @@ D_06009EE0 = 0x06009EE0; D_060005EC = 0x060005EC; D_06003DC0 = 0x06003DC0; +// z_en_zl1 +D_06000438 = 0x06000438; +D_06008848 = 0x06008848; +D_06008C48 = 0x06008C48; +D_0600F5D8 = 0x0600F5D8; +D_06010B38 = 0x06010B38; +D_06011348 = 0x06011348; +D_060116E4 = 0x060116E4; +D_06011B88 = 0x06011B88; +D_06012118 = 0x06012118; +D_060132D8 = 0x060132D8; +D_060138E0 = 0x060138E0; +D_06013F10 = 0x06013F10; +D_060143A8 = 0x060143A8; + // z_bg_spot17_funen D_06000B40 = 0x06000B40;