From 2810aa2b9c4298b45bcc7ac9c8a8faa58d5f5efb Mon Sep 17 00:00:00 2001 From: krimtonz <33664508+krimtonz@users.noreply.github.com> Date: Thu, 14 Jan 2021 14:17:03 -0600 Subject: [PATCH] ovl_En_Owl (#573) * begin En_Owl * EnOwl wip * fix conflicts * owl wip * wip * cleanup * more cleanup * remove unused asm * run formatter * match EnOwl_Init * formatting * pr updates * forgot the enum values in WaitZoraRiver * merge fixes * Fix merge issues * review changes + more * name Co-authored-by: fig --- .../actors/ovl_En_Owl/EnOwl_Destroy.s | 12 - .../overlays/actors/ovl_En_Owl/EnOwl_Draw.s | 75 - .../overlays/actors/ovl_En_Owl/EnOwl_Init.s | 395 ----- .../overlays/actors/ovl_En_Owl/EnOwl_Update.s | 366 ++--- .../actors/ovl_En_Owl/func_80ACA3B8.s | 17 - .../actors/ovl_En_Owl/func_80ACA3F4.s | 100 -- .../actors/ovl_En_Owl/func_80ACA558.s | 31 - .../actors/ovl_En_Owl/func_80ACA5C8.s | 27 - .../actors/ovl_En_Owl/func_80ACA62C.s | 36 - .../actors/ovl_En_Owl/func_80ACA690.s | 14 - .../actors/ovl_En_Owl/func_80ACA6C0.s | 27 - .../actors/ovl_En_Owl/func_80ACA71C.s | 21 - .../actors/ovl_En_Owl/func_80ACA76C.s | 32 - .../actors/ovl_En_Owl/func_80ACA7E0.s | 48 - .../actors/ovl_En_Owl/func_80ACA88C.s | 44 - .../actors/ovl_En_Owl/func_80ACA928.s | 30 - .../actors/ovl_En_Owl/func_80ACA998.s | 53 - .../actors/ovl_En_Owl/func_80ACAA54.s | 30 - .../actors/ovl_En_Owl/func_80ACAAC0.s | 30 - .../actors/ovl_En_Owl/func_80ACAB2C.s | 25 - .../actors/ovl_En_Owl/func_80ACAB88.s | 65 - .../actors/ovl_En_Owl/func_80ACAC6C.s | 30 - .../actors/ovl_En_Owl/func_80ACACD8.s | 25 - .../actors/ovl_En_Owl/func_80ACAD34.s | 53 - .../actors/ovl_En_Owl/func_80ACADF0.s | 30 - .../actors/ovl_En_Owl/func_80ACAE5C.s | 25 - .../actors/ovl_En_Owl/func_80ACAEB8.s | 53 - .../actors/ovl_En_Owl/func_80ACAF74.s | 30 - .../actors/ovl_En_Owl/func_80ACAFE0.s | 25 - .../actors/ovl_En_Owl/func_80ACB03C.s | 32 - .../actors/ovl_En_Owl/func_80ACB0B0.s | 43 - .../actors/ovl_En_Owl/func_80ACB148.s | 26 - .../actors/ovl_En_Owl/func_80ACB1A0.s | 39 - .../actors/ovl_En_Owl/func_80ACB22C.s | 21 - .../actors/ovl_En_Owl/func_80ACB274.s | 19 - .../actors/ovl_En_Owl/func_80ACB2B4.s | 40 - .../actors/ovl_En_Owl/func_80ACB344.s | 44 - .../actors/ovl_En_Owl/func_80ACB3E0.s | 26 - .../actors/ovl_En_Owl/func_80ACB440.s | 53 - .../actors/ovl_En_Owl/func_80ACB4FC.s | 30 - .../actors/ovl_En_Owl/func_80ACB568.s | 25 - .../actors/ovl_En_Owl/func_80ACB5C4.s | 53 - .../actors/ovl_En_Owl/func_80ACB680.s | 30 - .../actors/ovl_En_Owl/func_80ACB6EC.s | 25 - .../actors/ovl_En_Owl/func_80ACB748.s | 124 -- .../actors/ovl_En_Owl/func_80ACB904.s | 40 - .../actors/ovl_En_Owl/func_80ACB994.s | 40 - .../actors/ovl_En_Owl/func_80ACBA24.s | 42 - .../actors/ovl_En_Owl/func_80ACBAB8.s | 102 -- .../actors/ovl_En_Owl/func_80ACBC0C.s | 99 -- .../actors/ovl_En_Owl/func_80ACBD4C.s | 93 -- .../actors/ovl_En_Owl/func_80ACBEA0.s | 47 - .../actors/ovl_En_Owl/func_80ACBF50.s | 50 - .../actors/ovl_En_Owl/func_80ACC00C.s | 191 --- .../actors/ovl_En_Owl/func_80ACC23C.s | 57 - .../actors/ovl_En_Owl/func_80ACC30C.s | 40 - .../actors/ovl_En_Owl/func_80ACC390.s | 59 - .../actors/ovl_En_Owl/func_80ACC460.s | 64 - .../actors/ovl_En_Owl/func_80ACC540.s | 41 - .../actors/ovl_En_Owl/func_80ACC5CC.s | 27 - .../actors/ovl_En_Owl/func_80ACC624.s | 39 - .../actors/ovl_En_Owl/func_80ACCE00.s | 83 - .../actors/ovl_En_Owl/func_80ACCF34.s | 37 - .../actors/ovl_En_Owl/func_80ACD0B8.s | 33 - .../actors/ovl_En_Owl/func_80ACD130.s | 38 - .../actors/ovl_En_Owl/func_80ACD1C4.s | 25 - .../actors/ovl_En_Owl/func_80ACD220.s | 46 - .../actors/ovl_En_Owl/func_80ACD2CC.s | 140 -- .../actors/ovl_En_Owl/func_80ACD4D4.s | 64 - data/overlays/actors/z_en_owl.data.s | 26 - include/functions.h | 5 +- spec | 5 +- src/overlays/actors/ovl_En_Owl/z_en_owl.c | 1429 ++++++++++++++++- src/overlays/actors/ovl_En_Owl/z_en_owl.h | 34 +- undefined_syms.txt | 11 + 75 files changed, 1584 insertions(+), 3802 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA3B8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA3F4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA558.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA5C8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA62C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA690.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA6C0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA71C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA76C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA7E0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA88C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA928.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA998.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAA54.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAAC0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAB2C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAB88.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAC6C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACACD8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAD34.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACADF0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAE5C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAEB8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAF74.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAFE0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB03C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB0B0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB148.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB1A0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB22C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB274.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB2B4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB344.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB3E0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB440.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB4FC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB568.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB5C4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB680.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB6EC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB748.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB904.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB994.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBA24.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBAB8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBC0C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBD4C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBEA0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBF50.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC00C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC23C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC30C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC390.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC460.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC540.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC5CC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC624.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACCE00.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACCF34.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD0B8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD130.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD1C4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD220.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD2CC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD4D4.s delete mode 100644 data/overlays/actors/z_en_owl.data.s diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Destroy.s deleted file mode 100644 index 85a7e676a0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Destroy.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel EnOwl_Destroy -/* 00470 80ACA390 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00474 80ACA394 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00478 80ACA398 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0047C 80ACA39C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00480 80ACA3A0 0C0170EB */ jal Collider_DestroyCylinder - -/* 00484 80ACA3A4 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C -/* 00488 80ACA3A8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0048C 80ACA3AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00490 80ACA3B0 03E00008 */ jr $ra -/* 00494 80ACA3B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Draw.s deleted file mode 100644 index 66ab8fc4da..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Draw.s +++ /dev/null @@ -1,75 +0,0 @@ -.rdata -glabel D_80ACD7DC - .asciz "../z_en_owl.c" - .balign 4 - -glabel D_80ACD7EC - .asciz "../z_en_owl.c" - .balign 4 - -.text -glabel EnOwl_Draw -/* 03098 80ACCFB8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 0309C 80ACCFBC AFBF0024 */ sw $ra, 0x0024($sp) -/* 030A0 80ACCFC0 AFA40050 */ sw $a0, 0x0050($sp) -/* 030A4 80ACCFC4 AFA50054 */ sw $a1, 0x0054($sp) -/* 030A8 80ACCFC8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 030AC 80ACCFCC 3C0680AD */ lui $a2, %hi(D_80ACD7DC) ## $a2 = 80AD0000 -/* 030B0 80ACCFD0 24C6D7DC */ addiu $a2, $a2, %lo(D_80ACD7DC) ## $a2 = 80ACD7DC -/* 030B4 80ACCFD4 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 030B8 80ACCFD8 240708C7 */ addiu $a3, $zero, 0x08C7 ## $a3 = 000008C7 -/* 030BC 80ACCFDC 0C031AB1 */ jal Graph_OpenDisps -/* 030C0 80ACCFE0 AFA50044 */ sw $a1, 0x0044($sp) -/* 030C4 80ACCFE4 8FAF0054 */ lw $t7, 0x0054($sp) -/* 030C8 80ACCFE8 0C0250F2 */ jal func_800943C8 -/* 030CC 80ACCFEC 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 030D0 80ACCFF0 8FA50044 */ lw $a1, 0x0044($sp) -/* 030D4 80ACCFF4 8FA80050 */ lw $t0, 0x0050($sp) -/* 030D8 80ACCFF8 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 030DC 80ACCFFC 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 -/* 030E0 80ACD000 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 -/* 030E4 80ACD004 3C0480AD */ lui $a0, %hi(D_80ACD638) ## $a0 = 80AD0000 -/* 030E8 80ACD008 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 -/* 030EC 80ACD00C ACB802C0 */ sw $t8, 0x02C0($a1) ## 000002C0 -/* 030F0 80ACD010 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 -/* 030F4 80ACD014 850903F4 */ lh $t1, 0x03F4($t0) ## 000003F4 -/* 030F8 80ACD018 3C0F8016 */ lui $t7, %hi(gSegments) -/* 030FC 80ACD01C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 03100 80ACD020 00095080 */ sll $t2, $t1, 2 -/* 03104 80ACD024 008A2021 */ addu $a0, $a0, $t2 -/* 03108 80ACD028 8C84D638 */ lw $a0, %lo(D_80ACD638)($a0) -/* 0310C 80ACD02C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 03110 80ACD030 3C0A80AD */ lui $t2, %hi(func_80ACCF34) ## $t2 = 80AD0000 -/* 03114 80ACD034 00046100 */ sll $t4, $a0, 4 -/* 03118 80ACD038 000C6F02 */ srl $t5, $t4, 28 -/* 0311C 80ACD03C 000D7080 */ sll $t6, $t5, 2 -/* 03120 80ACD040 01EE7821 */ addu $t7, $t7, $t6 -/* 03124 80ACD044 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) -/* 03128 80ACD048 00815824 */ and $t3, $a0, $at -/* 0312C 80ACD04C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03130 80ACD050 016FC021 */ addu $t8, $t3, $t7 -/* 03134 80ACD054 0301C821 */ addu $t9, $t8, $at -/* 03138 80ACD058 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 -/* 0313C 80ACD05C 8D0203DC */ lw $v0, 0x03DC($t0) ## 000003DC -/* 03140 80ACD060 3C0980AD */ lui $t1, %hi(func_80ACCE00) ## $t1 = 80AD0000 -/* 03144 80ACD064 2529CE00 */ addiu $t1, $t1, %lo(func_80ACCE00) ## $t1 = 80ACCE00 -/* 03148 80ACD068 8C450004 */ lw $a1, 0x0004($v0) ## 00000004 -/* 0314C 80ACD06C 8C460020 */ lw $a2, 0x0020($v0) ## 00000020 -/* 03150 80ACD070 90470002 */ lbu $a3, 0x0002($v0) ## 00000002 -/* 03154 80ACD074 254ACF34 */ addiu $t2, $t2, %lo(func_80ACCF34) ## $t2 = 80ACCF34 -/* 03158 80ACD078 AFAA0014 */ sw $t2, 0x0014($sp) -/* 0315C 80ACD07C AFA90010 */ sw $t1, 0x0010($sp) -/* 03160 80ACD080 8FA40054 */ lw $a0, 0x0054($sp) -/* 03164 80ACD084 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 03168 80ACD088 AFA80018 */ sw $t0, 0x0018($sp) -/* 0316C 80ACD08C 8FAC0054 */ lw $t4, 0x0054($sp) -/* 03170 80ACD090 3C0680AD */ lui $a2, %hi(D_80ACD7EC) ## $a2 = 80AD0000 -/* 03174 80ACD094 24C6D7EC */ addiu $a2, $a2, %lo(D_80ACD7EC) ## $a2 = 80ACD7EC -/* 03178 80ACD098 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 0317C 80ACD09C 240708D8 */ addiu $a3, $zero, 0x08D8 ## $a3 = 000008D8 -/* 03180 80ACD0A0 0C031AD5 */ jal Graph_CloseDisps -/* 03184 80ACD0A4 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 03188 80ACD0A8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0318C 80ACD0AC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 03190 80ACD0B0 03E00008 */ jr $ra -/* 03194 80ACD0B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Init.s deleted file mode 100644 index 53543e9161..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Init.s +++ /dev/null @@ -1,395 +0,0 @@ -.rdata -glabel D_80ACD650 - .asciz "\x1b[36m 会話フクロウ %4x no = %d, sv = %d\n\x1b[m" - .balign 4 - -glabel D_80ACD67C - .asciz "savebitでフクロウ退避\n" - .balign 4 - -glabel D_80ACD694 - .asciz "フクロウ退避\n" - .balign 4 - -glabel D_80ACD6A4 - .asciz "フクロウ退避\n" - .balign 4 - -glabel D_80ACD6B4 - .asciz "フクロウ退避\n" - .balign 4 - -glabel D_80ACD6C4 - .asciz "フクロウ退避\n" - .balign 4 - -glabel D_80ACD6D4 - .asciz "フクロウ退避\n" - .balign 4 - -glabel D_80ACD6E4 - .asciz "\x1b[36m" - .balign 4 - -glabel D_80ACD6EC - .asciz "no = %d \n" - .balign 4 - -glabel D_80ACD6F8 - .asciz "未完成のフクロウ未完成のフクロウ未完成のフクロウ\n" - .balign 4 - -glabel D_80ACD72C - .asciz "\x1b[m" - .balign 4 - -.late_rodata -glabel jtbl_80ACD7FC -.word L80ACA110 -.word L80ACA12C -.word L80ACA13C -.word L80ACA160 -.word L80ACA1A0 -.word L80ACA1E0 -.word L80ACA1F0 -.word L80ACA244 -.word L80ACA264 -.word L80ACA274 -.word L80ACA284 -.word L80ACA294 -.word L80ACA2DC - -.text -glabel EnOwl_Init -/* 00000 80AC9F20 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00004 80AC9F24 AFA50054 */ sw $a1, 0x0054($sp) -/* 00008 80AC9F28 AFBF002C */ sw $ra, 0x002C($sp) -/* 0000C 80AC9F2C AFB00028 */ sw $s0, 0x0028($sp) -/* 00010 80AC9F30 3C0580AD */ lui $a1, %hi(D_80ACD61C) ## $a1 = 80AD0000 -/* 00014 80AC9F34 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00018 80AC9F38 0C01E037 */ jal Actor_ProcessInitChain - -/* 0001C 80AC9F3C 24A5D61C */ addiu $a1, $a1, %lo(D_80ACD61C) ## $a1 = 80ACD61C -/* 00020 80AC9F40 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 00024 80AC9F44 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 00028 80AC9F48 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 0002C 80AC9F4C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00030 80AC9F50 0C00AC78 */ jal ActorShape_Init - -/* 00034 80AC9F54 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 -/* 00038 80AC9F58 3C060601 */ lui $a2, %hi(D_0600C0E8) ## $a2 = 06010000 -/* 0003C 80AC9F5C 3C070600 */ lui $a3, %hi(D_060015CC) ## $a3 = 06000000 -/* 00040 80AC9F60 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC -/* 00044 80AC9F64 260F025A */ addiu $t7, $s0, 0x025A ## $t7 = 0000025A -/* 00048 80AC9F68 24180015 */ addiu $t8, $zero, 0x0015 ## $t8 = 00000015 -/* 0004C 80AC9F6C AFB80018 */ sw $t8, 0x0018($sp) -/* 00050 80AC9F70 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00054 80AC9F74 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00058 80AC9F78 24E715CC */ addiu $a3, $a3, %lo(D_060015CC) ## $a3 = 060015CC -/* 0005C 80AC9F7C 24C6C0E8 */ addiu $a2, $a2, %lo(D_0600C0E8) ## $a2 = 0600C0E8 -/* 00060 80AC9F80 8FA40054 */ lw $a0, 0x0054($sp) -/* 00064 80AC9F84 0C0291BE */ jal SkelAnime_InitFlex -/* 00068 80AC9F88 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 -/* 0006C 80AC9F8C 260502D8 */ addiu $a1, $s0, 0x02D8 ## $a1 = 000002D8 -/* 00070 80AC9F90 3C060601 */ lui $a2, %hi(D_060100B0) ## $a2 = 06010000 -/* 00074 80AC9F94 3C070601 */ lui $a3, %hi(D_0600C8A0) ## $a3 = 06010000 -/* 00078 80AC9F98 2619031C */ addiu $t9, $s0, 0x031C ## $t9 = 0000031C -/* 0007C 80AC9F9C 2608037C */ addiu $t0, $s0, 0x037C ## $t0 = 0000037C -/* 00080 80AC9FA0 24090010 */ addiu $t1, $zero, 0x0010 ## $t1 = 00000010 -/* 00084 80AC9FA4 AFA90018 */ sw $t1, 0x0018($sp) -/* 00088 80AC9FA8 AFA80014 */ sw $t0, 0x0014($sp) -/* 0008C 80AC9FAC AFB90010 */ sw $t9, 0x0010($sp) -/* 00090 80AC9FB0 24E7C8A0 */ addiu $a3, $a3, %lo(D_0600C8A0) ## $a3 = 0600C8A0 -/* 00094 80AC9FB4 24C600B0 */ addiu $a2, $a2, %lo(D_060100B0) ## $a2 = 060100B0 -/* 00098 80AC9FB8 AFA50034 */ sw $a1, 0x0034($sp) -/* 0009C 80AC9FBC 0C0291BE */ jal SkelAnime_InitFlex -/* 000A0 80AC9FC0 8FA40054 */ lw $a0, 0x0054($sp) -/* 000A4 80AC9FC4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 000A8 80AC9FC8 AFA50038 */ sw $a1, 0x0038($sp) -/* 000AC 80AC9FCC 0C0170D9 */ jal Collider_InitCylinder - -/* 000B0 80AC9FD0 8FA40054 */ lw $a0, 0x0054($sp) -/* 000B4 80AC9FD4 3C0780AD */ lui $a3, %hi(D_80ACD5F0) ## $a3 = 80AD0000 -/* 000B8 80AC9FD8 8FA50038 */ lw $a1, 0x0038($sp) -/* 000BC 80AC9FDC 24E7D5F0 */ addiu $a3, $a3, %lo(D_80ACD5F0) ## $a3 = 80ACD5F0 -/* 000C0 80AC9FE0 8FA40054 */ lw $a0, 0x0054($sp) -/* 000C4 80AC9FE4 0C01712B */ jal Collider_SetCylinder - -/* 000C8 80AC9FE8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 000CC 80AC9FEC 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 000D0 80AC9FF0 44812000 */ mtc1 $at, $f4 ## $f4 = -10.00 -/* 000D4 80AC9FF4 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 -/* 000D8 80AC9FF8 44813000 */ mtc1 $at, $f6 ## $f6 = 500.00 -/* 000DC 80AC9FFC 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 000E0 80ACA000 A20A00AE */ sb $t2, 0x00AE($s0) ## 000000AE -/* 000E4 80ACA004 E6040070 */ swc1 $f4, 0x0070($s0) ## 00000070 -/* 000E8 80ACA008 E606004C */ swc1 $f6, 0x004C($s0) ## 0000004C -/* 000EC 80ACA00C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 000F0 80ACA010 3C0580AD */ lui $a1, %hi(func_80ACBA24) ## $a1 = 80AD0000 -/* 000F4 80ACA014 3C0B0601 */ lui $t3, %hi(D_0600C8A0) ## $t3 = 06010000 -/* 000F8 80ACA018 256BC8A0 */ addiu $t3, $t3, %lo(D_0600C8A0) ## $t3 = 0600C8A0 -/* 000FC 80ACA01C 24A5BA24 */ addiu $a1, $a1, %lo(func_80ACBA24) ## $a1 = 80ACBA24 -/* 00100 80ACA020 3C0680AD */ lui $a2, %hi(func_80ACC540) ## $a2 = 80AD0000 -/* 00104 80ACA024 24C6C540 */ addiu $a2, $a2, %lo(func_80ACC540) ## $a2 = 80ACC540 -/* 00108 80ACA028 AFA50038 */ sw $a1, 0x0038($sp) -/* 0010C 80ACA02C AFAB0010 */ sw $t3, 0x0010($sp) -/* 00110 80ACA030 8FA70034 */ lw $a3, 0x0034($sp) -/* 00114 80ACA034 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00118 80ACA038 0C2B342E */ jal func_80ACD0B8 -/* 0011C 80ACA03C E7A80014 */ swc1 $f8, 0x0014($sp) -/* 00120 80ACA040 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00124 80ACA044 24030004 */ addiu $v1, $zero, 0x0004 ## $v1 = 00000004 -/* 00128 80ACA048 300200FF */ andi $v0, $zero, 0x00FF ## $v0 = 00000000 -/* 0012C 80ACA04C 24010FFF */ addiu $at, $zero, 0x0FFF ## $at = 00000FFF -/* 00130 80ACA050 30A60FC0 */ andi $a2, $a1, 0x0FC0 ## $a2 = 00000000 -/* 00134 80ACA054 A2020406 */ sb $v0, 0x0406($s0) ## 00000406 -/* 00138 80ACA058 A60203FC */ sh $v0, 0x03FC($s0) ## 000003FC -/* 0013C 80ACA05C A2000409 */ sb $zero, 0x0409($s0) ## 00000409 -/* 00140 80ACA060 A2030405 */ sb $v1, 0x0405($s0) ## 00000405 -/* 00144 80ACA064 A2000407 */ sb $zero, 0x0407($s0) ## 00000407 -/* 00148 80ACA068 A2000404 */ sb $zero, 0x0404($s0) ## 00000404 -/* 0014C 80ACA06C A2030408 */ sb $v1, 0x0408($s0) ## 00000408 -/* 00150 80ACA070 00063183 */ sra $a2, $a2, 6 -/* 00154 80ACA074 14A10003 */ bne $a1, $at, .L80ACA084 -/* 00158 80ACA078 30A7003F */ andi $a3, $a1, 0x003F ## $a3 = 00000000 -/* 0015C 80ACA07C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00160 80ACA080 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 -.L80ACA084: -/* 00164 80ACA084 3C0480AD */ lui $a0, %hi(D_80ACD650) ## $a0 = 80AD0000 -/* 00168 80ACA088 2484D650 */ addiu $a0, $a0, %lo(D_80ACD650) ## $a0 = 80ACD650 -/* 0016C 80ACA08C AFA60044 */ sw $a2, 0x0044($sp) -/* 00170 80ACA090 0C00084C */ jal osSyncPrintf - -/* 00174 80ACA094 AFA70040 */ sw $a3, 0x0040($sp) -/* 00178 80ACA098 8FA60044 */ lw $a2, 0x0044($sp) -/* 0017C 80ACA09C 8FA70040 */ lw $a3, 0x0040($sp) -/* 00180 80ACA0A0 10C00010 */ beq $a2, $zero, .L80ACA0E4 -/* 00184 80ACA0A4 28E10020 */ slti $at, $a3, 0x0020 -/* 00188 80ACA0A8 5020000F */ beql $at, $zero, .L80ACA0E8 -/* 0018C 80ACA0AC 860D0032 */ lh $t5, 0x0032($s0) ## 00000032 -/* 00190 80ACA0B0 8FA40054 */ lw $a0, 0x0054($sp) -/* 00194 80ACA0B4 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00198 80ACA0B8 0C00B2D0 */ jal Flags_GetSwitch - -/* 0019C 80ACA0BC AFA60044 */ sw $a2, 0x0044($sp) -/* 001A0 80ACA0C0 10400008 */ beq $v0, $zero, .L80ACA0E4 -/* 001A4 80ACA0C4 8FA60044 */ lw $a2, 0x0044($sp) -/* 001A8 80ACA0C8 3C0480AD */ lui $a0, %hi(D_80ACD67C) ## $a0 = 80AD0000 -/* 001AC 80ACA0CC 0C00084C */ jal osSyncPrintf - -/* 001B0 80ACA0D0 2484D67C */ addiu $a0, $a0, %lo(D_80ACD67C) ## $a0 = 80ACD67C -/* 001B4 80ACA0D4 0C00B55C */ jal Actor_Kill - -/* 001B8 80ACA0D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001BC 80ACA0DC 100000A8 */ beq $zero, $zero, .L80ACA380 -/* 001C0 80ACA0E0 8FBF002C */ lw $ra, 0x002C($sp) -.L80ACA0E4: -/* 001C4 80ACA0E4 860D0032 */ lh $t5, 0x0032($s0) ## 00000032 -.L80ACA0E8: -/* 001C8 80ACA0E8 2CC1000D */ sltiu $at, $a2, 0x000D -/* 001CC 80ACA0EC A60003EE */ sh $zero, 0x03EE($s0) ## 000003EE -/* 001D0 80ACA0F0 1020008C */ beq $at, $zero, .L80ACA324 -/* 001D4 80ACA0F4 A60D0400 */ sh $t5, 0x0400($s0) ## 00000400 -/* 001D8 80ACA0F8 00067080 */ sll $t6, $a2, 2 -/* 001DC 80ACA0FC 3C0180AD */ lui $at, %hi(jtbl_80ACD7FC) ## $at = 80AD0000 -/* 001E0 80ACA100 002E0821 */ addu $at, $at, $t6 -/* 001E4 80ACA104 8C2ED7FC */ lw $t6, %lo(jtbl_80ACD7FC)($at) -/* 001E8 80ACA108 01C00008 */ jr $t6 -/* 001EC 80ACA10C 00000000 */ nop -glabel L80ACA110 -/* 001F0 80ACA110 3C01457A */ lui $at, 0x457A ## $at = 457A0000 -/* 001F4 80ACA114 8FAF0038 */ lw $t7, 0x0038($sp) -/* 001F8 80ACA118 44815000 */ mtc1 $at, $f10 ## $f10 = 4000.00 -/* 001FC 80ACA11C A200040A */ sb $zero, 0x040A($s0) ## 0000040A -/* 00200 80ACA120 AE0F040C */ sw $t7, 0x040C($s0) ## 0000040C -/* 00204 80ACA124 10000095 */ beq $zero, $zero, .L80ACA37C -/* 00208 80ACA128 E60A00F4 */ swc1 $f10, 0x00F4($s0) ## 000000F4 -glabel L80ACA12C -/* 0020C 80ACA12C 3C1880AD */ lui $t8, %hi(func_80ACA928) ## $t8 = 80AD0000 -/* 00210 80ACA130 2718A928 */ addiu $t8, $t8, %lo(func_80ACA928) ## $t8 = 80ACA928 -/* 00214 80ACA134 10000091 */ beq $zero, $zero, .L80ACA37C -/* 00218 80ACA138 AE18040C */ sw $t8, 0x040C($s0) ## 0000040C -glabel L80ACA13C -/* 0021C 80ACA13C 961903FC */ lhu $t9, 0x03FC($s0) ## 000003FC -/* 00220 80ACA140 3C0A80AD */ lui $t2, %hi(func_80ACAB2C) ## $t2 = 80AD0000 -/* 00224 80ACA144 24090020 */ addiu $t1, $zero, 0x0020 ## $t1 = 00000020 -/* 00228 80ACA148 254AAB2C */ addiu $t2, $t2, %lo(func_80ACAB2C) ## $t2 = 80ACAB2C -/* 0022C 80ACA14C 37280002 */ ori $t0, $t9, 0x0002 ## $t0 = 00000002 -/* 00230 80ACA150 A60803FC */ sh $t0, 0x03FC($s0) ## 000003FC -/* 00234 80ACA154 A60903EE */ sh $t1, 0x03EE($s0) ## 000003EE -/* 00238 80ACA158 10000088 */ beq $zero, $zero, .L80ACA37C -/* 0023C 80ACA15C AE0A040C */ sw $t2, 0x040C($s0) ## 0000040C -glabel L80ACA160 -/* 00240 80ACA160 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00244 80ACA164 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00248 80ACA168 944B0EDC */ lhu $t3, 0x0EDC($v0) ## 8015F53C -/* 0024C 80ACA16C 3C0D80AD */ lui $t5, %hi(func_80ACACD8) ## $t5 = 80AD0000 -/* 00250 80ACA170 3C0480AD */ lui $a0, %hi(D_80ACD694) ## $a0 = 80AD0000 -/* 00254 80ACA174 316C0001 */ andi $t4, $t3, 0x0001 ## $t4 = 00000000 -/* 00258 80ACA178 11800007 */ beq $t4, $zero, .L80ACA198 -/* 0025C 80ACA17C 25ADACD8 */ addiu $t5, $t5, %lo(func_80ACACD8) ## $t5 = 80ACACD8 -/* 00260 80ACA180 0C00084C */ jal osSyncPrintf - -/* 00264 80ACA184 2484D694 */ addiu $a0, $a0, %lo(D_80ACD694) ## $a0 = 80ACD694 -/* 00268 80ACA188 0C00B55C */ jal Actor_Kill - -/* 0026C 80ACA18C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00270 80ACA190 1000007B */ beq $zero, $zero, .L80ACA380 -/* 00274 80ACA194 8FBF002C */ lw $ra, 0x002C($sp) -.L80ACA198: -/* 00278 80ACA198 10000078 */ beq $zero, $zero, .L80ACA37C -/* 0027C 80ACA19C AE0D040C */ sw $t5, 0x040C($s0) ## 0000040C -glabel L80ACA1A0 -/* 00280 80ACA1A0 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00284 80ACA1A4 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00288 80ACA1A8 944E0EDC */ lhu $t6, 0x0EDC($v0) ## 8015F53C -/* 0028C 80ACA1AC 3C1880AD */ lui $t8, %hi(func_80ACAE5C) ## $t8 = 80AD0000 -/* 00290 80ACA1B0 3C0480AD */ lui $a0, %hi(D_80ACD6A4) ## $a0 = 80AD0000 -/* 00294 80ACA1B4 31CF0008 */ andi $t7, $t6, 0x0008 ## $t7 = 00000000 -/* 00298 80ACA1B8 11E00007 */ beq $t7, $zero, .L80ACA1D8 -/* 0029C 80ACA1BC 2718AE5C */ addiu $t8, $t8, %lo(func_80ACAE5C) ## $t8 = 80ACAE5C -/* 002A0 80ACA1C0 0C00084C */ jal osSyncPrintf - -/* 002A4 80ACA1C4 2484D6A4 */ addiu $a0, $a0, %lo(D_80ACD6A4) ## $a0 = 80ACD6A4 -/* 002A8 80ACA1C8 0C00B55C */ jal Actor_Kill - -/* 002AC 80ACA1CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002B0 80ACA1D0 1000006B */ beq $zero, $zero, .L80ACA380 -/* 002B4 80ACA1D4 8FBF002C */ lw $ra, 0x002C($sp) -.L80ACA1D8: -/* 002B8 80ACA1D8 10000068 */ beq $zero, $zero, .L80ACA37C -/* 002BC 80ACA1DC AE18040C */ sw $t8, 0x040C($s0) ## 0000040C -glabel L80ACA1E0 -/* 002C0 80ACA1E0 3C1980AD */ lui $t9, %hi(func_80ACAFE0) ## $t9 = 80AD0000 -/* 002C4 80ACA1E4 2739AFE0 */ addiu $t9, $t9, %lo(func_80ACAFE0) ## $t9 = 80ACAFE0 -/* 002C8 80ACA1E8 10000064 */ beq $zero, $zero, .L80ACA37C -/* 002CC 80ACA1EC AE19040C */ sw $t9, 0x040C($s0) ## 0000040C -glabel L80ACA1F0 -/* 002D0 80ACA1F0 3C028016 */ lui $v0, %hi(gSaveContext) -/* 002D4 80ACA1F4 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 002D8 80ACA1F8 94480EDA */ lhu $t0, 0x0EDA($v0) ## 8015F53A -/* 002DC 80ACA1FC 3C0480AD */ lui $a0, %hi(D_80ACD6B4) ## $a0 = 80AD0000 -/* 002E0 80ACA200 31090200 */ andi $t1, $t0, 0x0200 ## $t1 = 00000000 -/* 002E4 80ACA204 15200007 */ bne $t1, $zero, .L80ACA224 -/* 002E8 80ACA208 00000000 */ nop -/* 002EC 80ACA20C 944A0EDC */ lhu $t2, 0x0EDC($v0) ## 8015F53C -/* 002F0 80ACA210 3C0C80AD */ lui $t4, %hi(func_80ACB0B0) ## $t4 = 80AD0000 -/* 002F4 80ACA214 258CB0B0 */ addiu $t4, $t4, %lo(func_80ACB0B0) ## $t4 = 80ACB0B0 -/* 002F8 80ACA218 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 -/* 002FC 80ACA21C 15600007 */ bne $t3, $zero, .L80ACA23C -/* 00300 80ACA220 00000000 */ nop -.L80ACA224: -/* 00304 80ACA224 0C00084C */ jal osSyncPrintf - -/* 00308 80ACA228 2484D6B4 */ addiu $a0, $a0, %lo(D_80ACD6B4) ## $a0 = 80ACD6B4 -/* 0030C 80ACA22C 0C00B55C */ jal Actor_Kill - -/* 00310 80ACA230 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00314 80ACA234 10000052 */ beq $zero, $zero, .L80ACA380 -/* 00318 80ACA238 8FBF002C */ lw $ra, 0x002C($sp) -.L80ACA23C: -/* 0031C 80ACA23C 1000004F */ beq $zero, $zero, .L80ACA37C -/* 00320 80ACA240 AE0C040C */ sw $t4, 0x040C($s0) ## 0000040C -glabel L80ACA244 -/* 00324 80ACA244 3C0D80AD */ lui $t5, %hi(func_80ACB1A0) ## $t5 = 80AD0000 -/* 00328 80ACA248 25ADB1A0 */ addiu $t5, $t5, %lo(func_80ACB1A0) ## $t5 = 80ACB1A0 -/* 0032C 80ACA24C AE0D040C */ sw $t5, 0x040C($s0) ## 0000040C -/* 00330 80ACA250 8FA40054 */ lw $a0, 0x0054($sp) -/* 00334 80ACA254 0C00B2ED */ jal Flags_UnsetSwitch - -/* 00338 80ACA258 24050023 */ addiu $a1, $zero, 0x0023 ## $a1 = 00000023 -/* 0033C 80ACA25C 10000048 */ beq $zero, $zero, .L80ACA380 -/* 00340 80ACA260 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80ACA264 -/* 00344 80ACA264 3C0E80AD */ lui $t6, %hi(func_80ACB2B4) ## $t6 = 80AD0000 -/* 00348 80ACA268 25CEB2B4 */ addiu $t6, $t6, %lo(func_80ACB2B4) ## $t6 = 80ACB2B4 -/* 0034C 80ACA26C 10000043 */ beq $zero, $zero, .L80ACA37C -/* 00350 80ACA270 AE0E040C */ sw $t6, 0x040C($s0) ## 0000040C -glabel L80ACA274 -/* 00354 80ACA274 3C0F80AD */ lui $t7, %hi(func_80ACB2B4) ## $t7 = 80AD0000 -/* 00358 80ACA278 25EFB2B4 */ addiu $t7, $t7, %lo(func_80ACB2B4) ## $t7 = 80ACB2B4 -/* 0035C 80ACA27C 1000003F */ beq $zero, $zero, .L80ACA37C -/* 00360 80ACA280 AE0F040C */ sw $t7, 0x040C($s0) ## 0000040C -glabel L80ACA284 -/* 00364 80ACA284 3C1880AD */ lui $t8, %hi(func_80ACB3E0) ## $t8 = 80AD0000 -/* 00368 80ACA288 2718B3E0 */ addiu $t8, $t8, %lo(func_80ACB3E0) ## $t8 = 80ACB3E0 -/* 0036C 80ACA28C 1000003B */ beq $zero, $zero, .L80ACA37C -/* 00370 80ACA290 AE18040C */ sw $t8, 0x040C($s0) ## 0000040C -glabel L80ACA294 -/* 00374 80ACA294 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00378 80ACA298 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 0037C 80ACA29C 3C198012 */ lui $t9, %hi(gBitFlags+0x30) -/* 00380 80ACA2A0 8F397150 */ lw $t9, %lo(gBitFlags+0x30)($t9) -/* 00384 80ACA2A4 8C4800A4 */ lw $t0, 0x00A4($v0) ## 8015E704 -/* 00388 80ACA2A8 3C0A80AD */ lui $t2, %hi(func_80ACB568) ## $t2 = 80AD0000 -/* 0038C 80ACA2AC 3C0480AD */ lui $a0, %hi(D_80ACD6C4) ## $a0 = 80AD0000 -/* 00390 80ACA2B0 03284824 */ and $t1, $t9, $t0 -/* 00394 80ACA2B4 15200007 */ bne $t1, $zero, .L80ACA2D4 -/* 00398 80ACA2B8 254AB568 */ addiu $t2, $t2, %lo(func_80ACB568) ## $t2 = 80ACB568 -/* 0039C 80ACA2BC 0C00084C */ jal osSyncPrintf - -/* 003A0 80ACA2C0 2484D6C4 */ addiu $a0, $a0, %lo(D_80ACD6C4) ## $a0 = 80ACD6C4 -/* 003A4 80ACA2C4 0C00B55C */ jal Actor_Kill - -/* 003A8 80ACA2C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003AC 80ACA2CC 1000002C */ beq $zero, $zero, .L80ACA380 -/* 003B0 80ACA2D0 8FBF002C */ lw $ra, 0x002C($sp) -.L80ACA2D4: -/* 003B4 80ACA2D4 10000029 */ beq $zero, $zero, .L80ACA37C -/* 003B8 80ACA2D8 AE0A040C */ sw $t2, 0x040C($s0) ## 0000040C -glabel L80ACA2DC -/* 003BC 80ACA2DC 3C028016 */ lui $v0, %hi(gSaveContext) -/* 003C0 80ACA2E0 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 003C4 80ACA2E4 3C0B8012 */ lui $t3, %hi(gBitFlags+0x38) -/* 003C8 80ACA2E8 8D6B7158 */ lw $t3, %lo(gBitFlags+0x38)($t3) -/* 003CC 80ACA2EC 8C4C00A4 */ lw $t4, 0x00A4($v0) ## 8015E704 -/* 003D0 80ACA2F0 3C0E80AD */ lui $t6, %hi(func_80ACB6EC) ## $t6 = 80AD0000 -/* 003D4 80ACA2F4 3C0480AD */ lui $a0, %hi(D_80ACD6D4) ## $a0 = 80AD0000 -/* 003D8 80ACA2F8 016C6824 */ and $t5, $t3, $t4 -/* 003DC 80ACA2FC 15A00007 */ bne $t5, $zero, .L80ACA31C -/* 003E0 80ACA300 25CEB6EC */ addiu $t6, $t6, %lo(func_80ACB6EC) ## $t6 = 80ACB6EC -/* 003E4 80ACA304 0C00084C */ jal osSyncPrintf - -/* 003E8 80ACA308 2484D6D4 */ addiu $a0, $a0, %lo(D_80ACD6D4) ## $a0 = 80ACD6D4 -/* 003EC 80ACA30C 0C00B55C */ jal Actor_Kill - -/* 003F0 80ACA310 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003F4 80ACA314 1000001A */ beq $zero, $zero, .L80ACA380 -/* 003F8 80ACA318 8FBF002C */ lw $ra, 0x002C($sp) -.L80ACA31C: -/* 003FC 80ACA31C 10000017 */ beq $zero, $zero, .L80ACA37C -/* 00400 80ACA320 AE0E040C */ sw $t6, 0x040C($s0) ## 0000040C -.L80ACA324: -/* 00404 80ACA324 3C0480AD */ lui $a0, %hi(D_80ACD6E4) ## $a0 = 80AD0000 -/* 00408 80ACA328 2484D6E4 */ addiu $a0, $a0, %lo(D_80ACD6E4) ## $a0 = 80ACD6E4 -/* 0040C 80ACA32C 0C00084C */ jal osSyncPrintf - -/* 00410 80ACA330 AFA60044 */ sw $a2, 0x0044($sp) -/* 00414 80ACA334 3C0480AD */ lui $a0, %hi(D_80ACD6EC) ## $a0 = 80AD0000 -/* 00418 80ACA338 8FA50044 */ lw $a1, 0x0044($sp) -/* 0041C 80ACA33C 0C00084C */ jal osSyncPrintf - -/* 00420 80ACA340 2484D6EC */ addiu $a0, $a0, %lo(D_80ACD6EC) ## $a0 = 80ACD6EC -/* 00424 80ACA344 3C0480AD */ lui $a0, %hi(D_80ACD6F8) ## $a0 = 80AD0000 -/* 00428 80ACA348 0C00084C */ jal osSyncPrintf - -/* 0042C 80ACA34C 2484D6F8 */ addiu $a0, $a0, %lo(D_80ACD6F8) ## $a0 = 80ACD6F8 -/* 00430 80ACA350 3C0480AD */ lui $a0, %hi(D_80ACD72C) ## $a0 = 80AD0000 -/* 00434 80ACA354 0C00084C */ jal osSyncPrintf - -/* 00438 80ACA358 2484D72C */ addiu $a0, $a0, %lo(D_80ACD72C) ## $a0 = 80ACD72C -/* 0043C 80ACA35C 960F03FC */ lhu $t7, 0x03FC($s0) ## 000003FC -/* 00440 80ACA360 3C0880AD */ lui $t0, %hi(func_80ACA928) ## $t0 = 80AD0000 -/* 00444 80ACA364 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 -/* 00448 80ACA368 2508A928 */ addiu $t0, $t0, %lo(func_80ACA928) ## $t0 = 80ACA928 -/* 0044C 80ACA36C 35F80002 */ ori $t8, $t7, 0x0002 ## $t8 = 00000002 -/* 00450 80ACA370 A61803FC */ sh $t8, 0x03FC($s0) ## 000003FC -/* 00454 80ACA374 A61903EE */ sh $t9, 0x03EE($s0) ## 000003EE -/* 00458 80ACA378 AE08040C */ sw $t0, 0x040C($s0) ## 0000040C -.L80ACA37C: -/* 0045C 80ACA37C 8FBF002C */ lw $ra, 0x002C($sp) -.L80ACA380: -/* 00460 80ACA380 8FB00028 */ lw $s0, 0x0028($sp) -/* 00464 80ACA384 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00468 80ACA388 03E00008 */ jr $ra -/* 0046C 80ACA38C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Update.s index add50d470d..218d92d2a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Update.s @@ -19,61 +19,61 @@ glabel D_80ACD860 .text glabel EnOwl_Update /* 02780 80ACC6A0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 02784 80ACC6A4 AFB00020 */ sw $s0, 0x0020($sp) +/* 02784 80ACC6A4 AFB00020 */ sw $s0, 0x0020($sp) /* 02788 80ACC6A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0278C 80ACC6AC AFBF0024 */ sw $ra, 0x0024($sp) -/* 02790 80ACC6B0 AFA50044 */ sw $a1, 0x0044($sp) +/* 0278C 80ACC6AC AFBF0024 */ sw $ra, 0x0024($sp) +/* 02790 80ACC6B0 AFA50044 */ sw $a1, 0x0044($sp) /* 02794 80ACC6B4 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C /* 02798 80ACC6B8 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000014C /* 0279C 80ACC6BC 0C0189B7 */ jal Collider_CylinderUpdate - -/* 027A0 80ACC6C0 AFA6002C */ sw $a2, 0x002C($sp) -/* 027A4 80ACC6C4 8FA40044 */ lw $a0, 0x0044($sp) + +/* 027A0 80ACC6C0 AFA6002C */ sw $a2, 0x002C($sp) +/* 027A4 80ACC6C4 8FA40044 */ lw $a0, 0x0044($sp) /* 027A8 80ACC6C8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 027AC 80ACC6CC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 027B0 80ACC6D0 8FA6002C */ lw $a2, 0x002C($sp) +/* 027B0 80ACC6D0 8FA6002C */ lw $a2, 0x002C($sp) /* 027B4 80ACC6D4 0C017713 */ jal CollisionCheck_SetOC ## CollisionCheck_setOT -/* 027B8 80ACC6D8 00812821 */ addu $a1, $a0, $at +/* 027B8 80ACC6D8 00812821 */ addu $a1, $a0, $at /* 027BC 80ACC6DC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 027C0 80ACC6E0 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 /* 027C4 80ACC6E4 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 027C8 80ACC6E8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 027CC 80ACC6EC 44060000 */ mfc1 $a2, $f0 -/* 027D0 80ACC6F0 44070000 */ mfc1 $a3, $f0 -/* 027D4 80ACC6F4 8FA40044 */ lw $a0, 0x0044($sp) +/* 027C8 80ACC6E8 AFAE0014 */ sw $t6, 0x0014($sp) +/* 027CC 80ACC6EC 44060000 */ mfc1 $a2, $f0 +/* 027D0 80ACC6F0 44070000 */ mfc1 $a3, $f0 +/* 027D4 80ACC6F4 8FA40044 */ lw $a0, 0x0044($sp) /* 027D8 80ACC6F8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 027DC 80ACC6FC 0C00B92D */ jal func_8002E4B4 -/* 027E0 80ACC700 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 027DC 80ACC6FC 0C00B92D */ jal func_8002E4B4 +/* 027E0 80ACC700 E7A00010 */ swc1 $f0, 0x0010($sp) /* 027E4 80ACC704 8E190410 */ lw $t9, 0x0410($s0) ## 00000410 /* 027E8 80ACC708 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 027EC 80ACC70C 0320F809 */ jalr $ra, $t9 +/* 027EC 80ACC70C 0320F809 */ jalr $ra, $t9 /* 027F0 80ACC710 00000000 */ nop /* 027F4 80ACC714 960F03FC */ lhu $t7, 0x03FC($s0) ## 000003FC /* 027F8 80ACC718 8E19040C */ lw $t9, 0x040C($s0) ## 0000040C /* 027FC 80ACC71C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02800 80ACC720 31F8FFF7 */ andi $t8, $t7, 0xFFF7 ## $t8 = 00000000 /* 02804 80ACC724 A61803FC */ sh $t8, 0x03FC($s0) ## 000003FC -/* 02808 80ACC728 0320F809 */ jalr $ra, $t9 -/* 0280C 80ACC72C 8FA50044 */ lw $a1, 0x0044($sp) +/* 02808 80ACC728 0320F809 */ jalr $ra, $t9 +/* 0280C 80ACC72C 8FA50044 */ lw $a1, 0x0044($sp) /* 02810 80ACC730 8E080130 */ lw $t0, 0x0130($s0) ## 00000130 /* 02814 80ACC734 3C0480AD */ lui $a0, %hi(D_80ACD7AC) ## $a0 = 80AD0000 -/* 02818 80ACC738 55000006 */ bnel $t0, $zero, .L80ACC754 +/* 02818 80ACC738 55000006 */ bnel $t0, $zero, .L80ACC754 /* 0281C 80ACC73C 960903FC */ lhu $t1, 0x03FC($s0) ## 000003FC /* 02820 80ACC740 0C00084C */ jal osSyncPrintf - + /* 02824 80ACC744 2484D7AC */ addiu $a0, $a0, %lo(D_80ACD7AC) ## $a0 = 80ACD7AC -/* 02828 80ACC748 100001A9 */ beq $zero, $zero, .L80ACCDF0 -/* 0282C 80ACC74C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 02828 80ACC748 100001A9 */ beq $zero, $zero, .L80ACCDF0 +/* 0282C 80ACC74C 8FBF0024 */ lw $ra, 0x0024($sp) /* 02830 80ACC750 960903FC */ lhu $t1, 0x03FC($s0) ## 000003FC .L80ACC754: /* 02834 80ACC754 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02838 80ACC758 312A0080 */ andi $t2, $t1, 0x0080 ## $t2 = 00000000 -/* 0283C 80ACC75C 55400035 */ bnel $t2, $zero, .L80ACC834 +/* 0283C 80ACC75C 55400035 */ bnel $t2, $zero, .L80ACC834 /* 02840 80ACC760 8E0D0134 */ lw $t5, 0x0134($s0) ## 00000134 -/* 02844 80ACC764 0C2B3189 */ jal func_80ACC624 -/* 02848 80ACC768 8FA50044 */ lw $a1, 0x0044($sp) -/* 0284C 80ACC76C 50400031 */ beql $v0, $zero, .L80ACC834 +/* 02844 80ACC764 0C2B3189 */ jal func_80ACC624 +/* 02848 80ACC768 8FA50044 */ lw $a1, 0x0044($sp) +/* 0284C 80ACC76C 50400031 */ beql $v0, $zero, .L80ACC834 /* 02850 80ACC770 8E0D0134 */ lw $t5, 0x0134($s0) ## 00000134 /* 02854 80ACC774 8E0201A0 */ lw $v0, 0x01A0($s0) ## 000001A0 /* 02858 80ACC778 3C0B0600 */ lui $t3, %hi(D_06001168) ## $t3 = 06000000 @@ -83,33 +83,33 @@ glabel EnOwl_Update /* 02868 80ACC788 C60001B0 */ lwc1 $f0, 0x01B0($s0) ## 000001B0 /* 0286C 80ACC78C 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 /* 02870 80ACC790 3C014110 */ lui $at, 0x4110 ## $at = 41100000 -/* 02874 80ACC794 46002032 */ c.eq.s $f4, $f0 +/* 02874 80ACC794 46002032 */ c.eq.s $f4, $f0 /* 02878 80ACC798 00000000 */ nop -/* 0287C 80ACC79C 45030022 */ bc1tl .L80ACC828 +/* 0287C 80ACC79C 45030022 */ bc1tl .L80ACC828 /* 02880 80ACC7A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02884 80ACC7A4 44813000 */ mtc1 $at, $f6 ## $f6 = 9.00 /* 02888 80ACC7A8 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 -/* 0288C 80ACC7AC 46003032 */ c.eq.s $f6, $f0 +/* 0288C 80ACC7AC 46003032 */ c.eq.s $f6, $f0 /* 02890 80ACC7B0 00000000 */ nop -/* 02894 80ACC7B4 4503001C */ bc1tl .L80ACC828 +/* 02894 80ACC7B4 4503001C */ bc1tl .L80ACC828 /* 02898 80ACC7B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0289C 80ACC7BC 44814000 */ mtc1 $at, $f8 ## $f8 = 23.00 /* 028A0 80ACC7C0 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 028A4 80ACC7C4 46004032 */ c.eq.s $f8, $f0 +/* 028A4 80ACC7C4 46004032 */ c.eq.s $f8, $f0 /* 028A8 80ACC7C8 00000000 */ nop -/* 028AC 80ACC7CC 45030016 */ bc1tl .L80ACC828 +/* 028AC 80ACC7CC 45030016 */ bc1tl .L80ACC828 /* 028B0 80ACC7D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 028B4 80ACC7D4 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 /* 028B8 80ACC7D8 3C014268 */ lui $at, 0x4268 ## $at = 42680000 -/* 028BC 80ACC7DC 46005032 */ c.eq.s $f10, $f0 +/* 028BC 80ACC7DC 46005032 */ c.eq.s $f10, $f0 /* 028C0 80ACC7E0 00000000 */ nop -/* 028C4 80ACC7E4 45030010 */ bc1tl .L80ACC828 +/* 028C4 80ACC7E4 45030010 */ bc1tl .L80ACC828 /* 028C8 80ACC7E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 028CC 80ACC7EC 44818000 */ mtc1 $at, $f16 ## $f16 = 58.00 /* 028D0 80ACC7F0 00000000 */ nop -/* 028D4 80ACC7F4 46008032 */ c.eq.s $f16, $f0 +/* 028D4 80ACC7F4 46008032 */ c.eq.s $f16, $f0 /* 028D8 80ACC7F8 00000000 */ nop -/* 028DC 80ACC7FC 45010009 */ bc1t .L80ACC824 +/* 028DC 80ACC7FC 45010009 */ bc1t .L80ACC824 .L80ACC800: /* 028E0 80ACC800 3C0C0600 */ lui $t4, %hi(D_060015CC) ## $t4 = 06000000 /* 028E4 80ACC804 258C15CC */ addiu $t4, $t4, %lo(D_060015CC) ## $t4 = 060015CC @@ -117,44 +117,44 @@ glabel EnOwl_Update /* 028EC 80ACC80C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 028F0 80ACC810 44819000 */ mtc1 $at, $f18 ## $f18 = 4.00 /* 028F4 80ACC814 C60401B0 */ lwc1 $f4, 0x01B0($s0) ## 000001B0 -/* 028F8 80ACC818 46049032 */ c.eq.s $f18, $f4 +/* 028F8 80ACC818 46049032 */ c.eq.s $f18, $f4 /* 028FC 80ACC81C 00000000 */ nop -/* 02900 80ACC820 45000003 */ bc1f .L80ACC830 +/* 02900 80ACC820 45000003 */ bc1f .L80ACC830 .L80ACC824: /* 02904 80ACC824 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80ACC828: /* 02908 80ACC828 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0290C 80ACC82C 24053926 */ addiu $a1, $zero, 0x3926 ## $a1 = 00003926 .L80ACC830: /* 02910 80ACC830 8E0D0134 */ lw $t5, 0x0134($s0) ## 00000134 .L80ACC834: -/* 02914 80ACC834 51A00004 */ beql $t5, $zero, .L80ACC848 +/* 02914 80ACC834 51A00004 */ beql $t5, $zero, .L80ACC848 /* 02918 80ACC838 960E03FC */ lhu $t6, 0x03FC($s0) ## 000003FC /* 0291C 80ACC83C 0C00B638 */ jal Actor_MoveForward - + /* 02920 80ACC840 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02924 80ACC844 960E03FC */ lhu $t6, 0x03FC($s0) ## 000003FC .L80ACC848: /* 02928 80ACC848 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 0292C 80ACC84C 31CF0002 */ andi $t7, $t6, 0x0002 ## $t7 = 00000000 -/* 02930 80ACC850 51E00004 */ beql $t7, $zero, .L80ACC864 +/* 02930 80ACC850 51E00004 */ beql $t7, $zero, .L80ACC864 /* 02934 80ACC854 860303F6 */ lh $v1, 0x03F6($s0) ## 000003F6 -/* 02938 80ACC858 10000016 */ beq $zero, $zero, .L80ACC8B4 +/* 02938 80ACC858 10000016 */ beq $zero, $zero, .L80ACC8B4 /* 0293C 80ACC85C A61803F4 */ sh $t8, 0x03F4($s0) ## 000003F4 /* 02940 80ACC860 860303F6 */ lh $v1, 0x03F6($s0) ## 000003F6 .L80ACC864: /* 02944 80ACC864 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 02948 80ACC868 14600003 */ bne $v1, $zero, .L80ACC878 +/* 02948 80ACC868 14600003 */ bne $v1, $zero, .L80ACC878 /* 0294C 80ACC86C 2479FFFF */ addiu $t9, $v1, 0xFFFF ## $t9 = FFFFFFFF -/* 02950 80ACC870 10000004 */ beq $zero, $zero, .L80ACC884 +/* 02950 80ACC870 10000004 */ beq $zero, $zero, .L80ACC884 /* 02954 80ACC874 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80ACC878: /* 02958 80ACC878 A61903F6 */ sh $t9, 0x03F6($s0) ## 000003F6 /* 0295C 80ACC87C 860303F6 */ lh $v1, 0x03F6($s0) ## 000003F6 /* 02960 80ACC880 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L80ACC884: -/* 02964 80ACC884 54400006 */ bnel $v0, $zero, .L80ACC8A0 +/* 02964 80ACC884 54400006 */ bnel $v0, $zero, .L80ACC8A0 /* 02968 80ACC888 A60303F4 */ sh $v1, 0x03F4($s0) ## 000003F4 /* 0296C 80ACC88C 0C01DF64 */ jal Rand_S16Offset @@ -164,72 +164,72 @@ glabel EnOwl_Update /* 0297C 80ACC89C A60303F4 */ sh $v1, 0x03F4($s0) ## 000003F4 .L80ACC8A0: /* 02980 80ACC8A0 860803F4 */ lh $t0, 0x03F4($s0) ## 000003F4 -/* 02984 80ACC8A4 29010003 */ slti $at, $t0, 0x0003 -/* 02988 80ACC8A8 54200003 */ bnel $at, $zero, .L80ACC8B8 +/* 02984 80ACC8A4 29010003 */ slti $at, $t0, 0x0003 +/* 02988 80ACC8A8 54200003 */ bnel $at, $zero, .L80ACC8B8 /* 0298C 80ACC8AC 960203FC */ lhu $v0, 0x03FC($s0) ## 000003FC /* 02990 80ACC8B0 A60003F4 */ sh $zero, 0x03F4($s0) ## 000003F4 .L80ACC8B4: /* 02994 80ACC8B4 960203FC */ lhu $v0, 0x03FC($s0) ## 000003FC .L80ACC8B8: /* 02998 80ACC8B8 30490008 */ andi $t1, $v0, 0x0008 ## $t1 = 00000000 -/* 0299C 80ACC8BC 1520013E */ bne $t1, $zero, .L80ACCDB8 +/* 0299C 80ACC8BC 1520013E */ bne $t1, $zero, .L80ACCDB8 /* 029A0 80ACC8C0 304F0002 */ andi $t7, $v0, 0x0002 ## $t7 = 00000000 /* 029A4 80ACC8C4 304A0010 */ andi $t2, $v0, 0x0010 ## $t2 = 00000000 -/* 029A8 80ACC8C8 11400055 */ beq $t2, $zero, .L80ACCA20 +/* 029A8 80ACC8C8 11400055 */ beq $t2, $zero, .L80ACCA20 /* 029AC 80ACC8CC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 029B0 80ACC8D0 92020404 */ lbu $v0, 0x0404($s0) ## 00000404 /* 029B4 80ACC8D4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 029B8 80ACC8D8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 029BC 80ACC8DC 10400007 */ beq $v0, $zero, .L80ACC8FC +/* 029BC 80ACC8DC 10400007 */ beq $v0, $zero, .L80ACC8FC /* 029C0 80ACC8E0 240C0006 */ addiu $t4, $zero, 0x0006 ## $t4 = 00000006 -/* 029C4 80ACC8E4 10410008 */ beq $v0, $at, .L80ACC908 +/* 029C4 80ACC8E4 10410008 */ beq $v0, $at, .L80ACC908 /* 029C8 80ACC8E8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 029CC 80ACC8EC 10410037 */ beq $v0, $at, .L80ACC9CC +/* 029CC 80ACC8EC 10410037 */ beq $v0, $at, .L80ACC9CC /* 029D0 80ACC8F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 029D4 80ACC8F4 10000125 */ beq $zero, $zero, .L80ACCD8C +/* 029D4 80ACC8F4 10000125 */ beq $zero, $zero, .L80ACCD8C /* 029D8 80ACC8F8 860A03EE */ lh $t2, 0x03EE($s0) ## 000003EE .L80ACC8FC: /* 029DC 80ACC8FC A20B0404 */ sb $t3, 0x0404($s0) ## 00000404 -/* 029E0 80ACC900 10000121 */ beq $zero, $zero, .L80ACCD88 +/* 029E0 80ACC900 10000121 */ beq $zero, $zero, .L80ACCD88 /* 029E4 80ACC904 A20C0405 */ sb $t4, 0x0405($s0) ## 00000405 .L80ACC908: /* 029E8 80ACC908 920D0405 */ lbu $t5, 0x0405($s0) ## 00000405 /* 029EC 80ACC90C 25AEFFFF */ addiu $t6, $t5, 0xFFFF ## $t6 = FFFFFFFF /* 029F0 80ACC910 31C200FF */ andi $v0, $t6, 0x00FF ## $v0 = 000000FF -/* 029F4 80ACC914 1040000F */ beq $v0, $zero, .L80ACC954 +/* 029F4 80ACC914 1040000F */ beq $v0, $zero, .L80ACC954 /* 029F8 80ACC918 A20E0405 */ sb $t6, 0x0405($s0) ## 00000405 /* 029FC 80ACC91C 00402025 */ or $a0, $v0, $zero ## $a0 = 000000FF /* 02A00 80ACC920 00042740 */ sll $a0, $a0, 29 /* 02A04 80ACC924 0C01DE0D */ jal Math_CosS ## coss? -/* 02A08 80ACC928 00042403 */ sra $a0, $a0, 16 +/* 02A08 80ACC928 00042403 */ sra $a0, $a0, 16 /* 02A0C 80ACC92C 3C014580 */ lui $at, 0x4580 ## $at = 45800000 /* 02A10 80ACC930 44813000 */ mtc1 $at, $f6 ## $f6 = 4096.00 /* 02A14 80ACC934 00000000 */ nop -/* 02A18 80ACC938 46060202 */ mul.s $f8, $f0, $f6 -/* 02A1C 80ACC93C 4600428D */ trunc.w.s $f10, $f8 -/* 02A20 80ACC940 44055000 */ mfc1 $a1, $f10 +/* 02A18 80ACC938 46060202 */ mul.s $f8, $f0, $f6 +/* 02A1C 80ACC93C 4600428D */ trunc.w.s $f10, $f8 +/* 02A20 80ACC940 44055000 */ mfc1 $a1, $f10 /* 02A24 80ACC944 00000000 */ nop -/* 02A28 80ACC948 00052C00 */ sll $a1, $a1, 16 -/* 02A2C 80ACC94C 10000017 */ beq $zero, $zero, .L80ACC9AC -/* 02A30 80ACC950 00052C03 */ sra $a1, $a1, 16 +/* 02A28 80ACC948 00052C00 */ sll $a1, $a1, 16 +/* 02A2C 80ACC94C 10000017 */ beq $zero, $zero, .L80ACC9AC +/* 02A30 80ACC950 00052C03 */ sra $a1, $a1, 16 .L80ACC954: /* 02A34 80ACC954 961803FC */ lhu $t8, 0x03FC($s0) ## 000003FC /* 02A38 80ACC958 24080020 */ addiu $t0, $zero, 0x0020 ## $t0 = 00000020 /* 02A3C 80ACC95C 33190002 */ andi $t9, $t8, 0x0002 ## $t9 = 00000000 -/* 02A40 80ACC960 53200004 */ beql $t9, $zero, .L80ACC974 +/* 02A40 80ACC960 53200004 */ beql $t9, $zero, .L80ACC974 /* 02A44 80ACC964 A60803EE */ sh $t0, 0x03EE($s0) ## 000003EE -/* 02A48 80ACC968 10000002 */ beq $zero, $zero, .L80ACC974 +/* 02A48 80ACC968 10000002 */ beq $zero, $zero, .L80ACC974 /* 02A4C 80ACC96C A60003EE */ sh $zero, 0x03EE($s0) ## 000003EE /* 02A50 80ACC970 A60803EE */ sh $t0, 0x03EE($s0) ## 000003EE .L80ACC974: /* 02A54 80ACC974 960903FC */ lhu $t1, 0x03FC($s0) ## 000003FC /* 02A58 80ACC978 312A0020 */ andi $t2, $t1, 0x0020 ## $t2 = 00000000 -/* 02A5C 80ACC97C 51400006 */ beql $t2, $zero, .L80ACC998 +/* 02A5C 80ACC97C 51400006 */ beql $t2, $zero, .L80ACC998 /* 02A60 80ACC980 860D03EE */ lh $t5, 0x03EE($s0) ## 000003EE /* 02A64 80ACC984 860B03EE */ lh $t3, 0x03EE($s0) ## 000003EE /* 02A68 80ACC988 256CFFFC */ addiu $t4, $t3, 0xFFFC ## $t4 = FFFFFFFC -/* 02A6C 80ACC98C 10000004 */ beq $zero, $zero, .L80ACC9A0 +/* 02A6C 80ACC98C 10000004 */ beq $zero, $zero, .L80ACC9A0 /* 02A70 80ACC990 A60C03EE */ sh $t4, 0x03EE($s0) ## 000003EE /* 02A74 80ACC994 860D03EE */ lh $t5, 0x03EE($s0) ## 000003EE .L80ACC998: @@ -242,17 +242,17 @@ glabel EnOwl_Update .L80ACC9AC: /* 02A8C 80ACC9AC 961903FC */ lhu $t9, 0x03FC($s0) ## 000003FC /* 02A90 80ACC9B0 33280020 */ andi $t0, $t9, 0x0020 ## $t0 = 00000000 -/* 02A94 80ACC9B4 510000F5 */ beql $t0, $zero, .L80ACCD8C +/* 02A94 80ACC9B4 510000F5 */ beql $t0, $zero, .L80ACCD8C /* 02A98 80ACC9B8 860A03EE */ lh $t2, 0x03EE($s0) ## 000003EE -/* 02A9C 80ACC9BC 00052823 */ subu $a1, $zero, $a1 -/* 02AA0 80ACC9C0 00052C00 */ sll $a1, $a1, 16 -/* 02AA4 80ACC9C4 100000F0 */ beq $zero, $zero, .L80ACCD88 -/* 02AA8 80ACC9C8 00052C03 */ sra $a1, $a1, 16 +/* 02A9C 80ACC9BC 00052823 */ subu $a1, $zero, $a1 +/* 02AA0 80ACC9C0 00052C00 */ sll $a1, $a1, 16 +/* 02AA4 80ACC9C4 100000F0 */ beq $zero, $zero, .L80ACCD88 +/* 02AA8 80ACC9C8 00052C03 */ sra $a1, $a1, 16 .L80ACC9CC: -/* 02AAC 80ACC9CC 0C2B3173 */ jal func_80ACC5CC -/* 02AB0 80ACC9D0 A7A50036 */ sh $a1, 0x0036($sp) -/* 02AB4 80ACC9D4 104000EC */ beq $v0, $zero, .L80ACCD88 -/* 02AB8 80ACC9D8 87A50036 */ lh $a1, 0x0036($sp) +/* 02AAC 80ACC9CC 0C2B3173 */ jal func_80ACC5CC +/* 02AB0 80ACC9D0 A7A50036 */ sh $a1, 0x0036($sp) +/* 02AB4 80ACC9D4 104000EC */ beq $v0, $zero, .L80ACCD88 +/* 02AB8 80ACC9D8 87A50036 */ lh $a1, 0x0036($sp) /* 02ABC 80ACC9DC 960903FC */ lhu $t1, 0x03FC($s0) ## 000003FC /* 02AC0 80ACC9E0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 02AC4 80ACC9E4 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 @@ -264,39 +264,39 @@ glabel EnOwl_Update /* 02AD8 80ACC9F8 4600040D */ trunc.w.s $f16, $f0 /* 02ADC 80ACC9FC A2000404 */ sb $zero, 0x0404($s0) ## 00000404 /* 02AE0 80ACCA00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02AE4 80ACCA04 440C8000 */ mfc1 $t4, $f16 +/* 02AE4 80ACCA04 440C8000 */ mfc1 $t4, $f16 /* 02AE8 80ACCA08 00000000 */ nop /* 02AEC 80ACCA0C 258D003C */ addiu $t5, $t4, 0x003C ## $t5 = 0000003C -/* 02AF0 80ACCA10 0C2B29B0 */ jal func_80ACA6C0 +/* 02AF0 80ACCA10 0C2B29B0 */ jal func_80ACA6C0 /* 02AF4 80ACCA14 A20D0406 */ sb $t5, 0x0406($s0) ## 00000406 -/* 02AF8 80ACCA18 100000DB */ beq $zero, $zero, .L80ACCD88 -/* 02AFC 80ACCA1C 87A50036 */ lh $a1, 0x0036($sp) +/* 02AF8 80ACCA18 100000DB */ beq $zero, $zero, .L80ACCD88 +/* 02AFC 80ACCA1C 87A50036 */ lh $a1, 0x0036($sp) .L80ACCA20: /* 02B00 80ACCA20 92020406 */ lbu $v0, 0x0406($s0) ## 00000406 -/* 02B04 80ACCA24 18400003 */ blez $v0, .L80ACCA34 +/* 02B04 80ACCA24 18400003 */ blez $v0, .L80ACCA34 /* 02B08 80ACCA28 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 02B0C 80ACCA2C 1000008B */ beq $zero, $zero, .L80ACCC5C +/* 02B0C 80ACCA2C 1000008B */ beq $zero, $zero, .L80ACCC5C /* 02B10 80ACCA30 A20E0406 */ sb $t6, 0x0406($s0) ## 00000406 .L80ACCA34: /* 02B14 80ACCA34 92030404 */ lbu $v1, 0x0404($s0) ## 00000404 -/* 02B18 80ACCA38 54600014 */ bnel $v1, $zero, .L80ACCA8C +/* 02B18 80ACCA38 54600014 */ bnel $v1, $zero, .L80ACCA8C /* 02B1C 80ACCA3C 92090405 */ lbu $t1, 0x0405($s0) ## 00000405 /* 02B20 80ACCA40 0C03F66B */ jal Rand_ZeroOne ## Rand.Next() float -/* 02B24 80ACCA44 A7A50036 */ sh $a1, 0x0036($sp) +/* 02B24 80ACCA44 A7A50036 */ sh $a1, 0x0036($sp) /* 02B28 80ACCA48 3C0180AD */ lui $at, %hi(D_80ACD854) ## $at = 80AD0000 -/* 02B2C 80ACCA4C C432D854 */ lwc1 $f18, %lo(D_80ACD854)($at) +/* 02B2C 80ACCA4C C432D854 */ lwc1 $f18, %lo(D_80ACD854)($at) /* 02B30 80ACCA50 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 02B34 80ACCA54 87A50036 */ lh $a1, 0x0036($sp) -/* 02B38 80ACCA58 4612003C */ c.lt.s $f0, $f18 +/* 02B34 80ACCA54 87A50036 */ lh $a1, 0x0036($sp) +/* 02B38 80ACCA58 4612003C */ c.lt.s $f0, $f18 /* 02B3C 80ACCA5C 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 /* 02B40 80ACCA60 2418000C */ addiu $t8, $zero, 0x000C ## $t8 = 0000000C /* 02B44 80ACCA64 332300FF */ andi $v1, $t9, 0x00FF ## $v1 = 00000001 -/* 02B48 80ACCA68 45000005 */ bc1f .L80ACCA80 +/* 02B48 80ACCA68 45000005 */ bc1f .L80ACCA80 /* 02B4C 80ACCA6C 24080004 */ addiu $t0, $zero, 0x0004 ## $t0 = 00000004 /* 02B50 80ACCA70 A20F0404 */ sb $t7, 0x0404($s0) ## 00000404 /* 02B54 80ACCA74 A2180405 */ sb $t8, 0x0405($s0) ## 00000405 -/* 02B58 80ACCA78 10000003 */ beq $zero, $zero, .L80ACCA88 +/* 02B58 80ACCA78 10000003 */ beq $zero, $zero, .L80ACCA88 /* 02B5C 80ACCA7C 31E300FF */ andi $v1, $t7, 0x00FF ## $v1 = 00000004 .L80ACCA80: /* 02B60 80ACCA80 A2190404 */ sb $t9, 0x0404($s0) ## 00000404 @@ -306,59 +306,59 @@ glabel EnOwl_Update .L80ACCA8C: /* 02B6C 80ACCA8C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 02B70 80ACCA90 252AFFFF */ addiu $t2, $t1, 0xFFFF ## $t2 = FFFFFFFF -/* 02B74 80ACCA94 1061000A */ beq $v1, $at, .L80ACCAC0 +/* 02B74 80ACCA94 1061000A */ beq $v1, $at, .L80ACCAC0 /* 02B78 80ACCA98 A20A0405 */ sb $t2, 0x0405($s0) ## 00000405 /* 02B7C 80ACCA9C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02B80 80ACCAA0 10610026 */ beq $v1, $at, .L80ACCB3C +/* 02B80 80ACCAA0 10610026 */ beq $v1, $at, .L80ACCB3C /* 02B84 80ACCAA4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 02B88 80ACCAA8 1061002C */ beq $v1, $at, .L80ACCB5C +/* 02B88 80ACCAA8 1061002C */ beq $v1, $at, .L80ACCB5C /* 02B8C 80ACCAAC 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 02B90 80ACCAB0 50610048 */ beql $v1, $at, .L80ACCBD4 +/* 02B90 80ACCAB0 50610048 */ beql $v1, $at, .L80ACCBD4 /* 02B94 80ACCAB4 92040405 */ lbu $a0, 0x0405($s0) ## 00000405 -/* 02B98 80ACCAB8 10000062 */ beq $zero, $zero, .L80ACCC44 +/* 02B98 80ACCAB8 10000062 */ beq $zero, $zero, .L80ACCC44 /* 02B9C 80ACCABC 960903FC */ lhu $t1, 0x03FC($s0) ## 000003FC .L80ACCAC0: /* 02BA0 80ACCAC0 92040405 */ lbu $a0, 0x0405($s0) ## 00000405 -/* 02BA4 80ACCAC4 00042023 */ subu $a0, $zero, $a0 -/* 02BA8 80ACCAC8 00042300 */ sll $a0, $a0, 12 +/* 02BA4 80ACCAC4 00042023 */ subu $a0, $zero, $a0 +/* 02BA8 80ACCAC8 00042300 */ sll $a0, $a0, 12 /* 02BAC 80ACCACC 24844000 */ addiu $a0, $a0, 0x4000 ## $a0 = 00004000 /* 02BB0 80ACCAD0 00042400 */ sll $a0, $a0, 16 /* 02BB4 80ACCAD4 0C01DE1C */ jal Math_SinS ## sins? -/* 02BB8 80ACCAD8 00042403 */ sra $a0, $a0, 16 +/* 02BB8 80ACCAD8 00042403 */ sra $a0, $a0, 16 /* 02BBC 80ACCADC 3C0180AD */ lui $at, %hi(D_80ACD858) ## $at = 80AD0000 -/* 02BC0 80ACCAE0 C424D858 */ lwc1 $f4, %lo(D_80ACD858)($at) +/* 02BC0 80ACCAE0 C424D858 */ lwc1 $f4, %lo(D_80ACD858)($at) /* 02BC4 80ACCAE4 920C0405 */ lbu $t4, 0x0405($s0) ## 00000405 /* 02BC8 80ACCAE8 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 02BCC 80ACCAEC 46040182 */ mul.s $f6, $f0, $f4 -/* 02BD0 80ACCAF0 4600320D */ trunc.w.s $f8, $f6 -/* 02BD4 80ACCAF4 44054000 */ mfc1 $a1, $f8 +/* 02BCC 80ACCAEC 46040182 */ mul.s $f6, $f0, $f4 +/* 02BD0 80ACCAF0 4600320D */ trunc.w.s $f8, $f6 +/* 02BD4 80ACCAF4 44054000 */ mfc1 $a1, $f8 /* 02BD8 80ACCAF8 00000000 */ nop -/* 02BDC 80ACCAFC 00052C00 */ sll $a1, $a1, 16 -/* 02BE0 80ACCB00 1D80004F */ bgtz $t4, .L80ACCC40 -/* 02BE4 80ACCB04 00052C03 */ sra $a1, $a1, 16 +/* 02BDC 80ACCAFC 00052C00 */ sll $a1, $a1, 16 +/* 02BE0 80ACCB00 1D80004F */ bgtz $t4, .L80ACCC40 +/* 02BE4 80ACCB04 00052C03 */ sra $a1, $a1, 16 /* 02BE8 80ACCB08 44816000 */ mtc1 $at, $f12 ## $f12 = 15.00 /* 02BEC 80ACCB0C 0C00CFBE */ jal Rand_ZeroFloat /* 02BF0 80ACCB10 A7A50036 */ sh $a1, 0x0036($sp) /* 02BF4 80ACCB14 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 02BF8 80ACCB18 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 02BFC 80ACCB1C 87A50036 */ lh $a1, 0x0036($sp) +/* 02BFC 80ACCB1C 87A50036 */ lh $a1, 0x0036($sp) /* 02C00 80ACCB20 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 02C04 80ACCB24 460A0400 */ add.s $f16, $f0, $f10 +/* 02C04 80ACCB24 460A0400 */ add.s $f16, $f0, $f10 /* 02C08 80ACCB28 A20F0404 */ sb $t7, 0x0404($s0) ## 00000404 -/* 02C0C 80ACCB2C 4600848D */ trunc.w.s $f18, $f16 -/* 02C10 80ACCB30 440E9000 */ mfc1 $t6, $f18 -/* 02C14 80ACCB34 10000042 */ beq $zero, $zero, .L80ACCC40 +/* 02C0C 80ACCB2C 4600848D */ trunc.w.s $f18, $f16 +/* 02C10 80ACCB30 440E9000 */ mfc1 $t6, $f18 +/* 02C14 80ACCB34 10000042 */ beq $zero, $zero, .L80ACCC40 /* 02C18 80ACCB38 A20E0405 */ sb $t6, 0x0405($s0) ## 00000405 .L80ACCB3C: /* 02C1C 80ACCB3C 92180405 */ lbu $t8, 0x0405($s0) ## 00000405 /* 02C20 80ACCB40 24051388 */ addiu $a1, $zero, 0x1388 ## $a1 = 00001388 /* 02C24 80ACCB44 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -/* 02C28 80ACCB48 1F00003D */ bgtz $t8, .L80ACCC40 +/* 02C28 80ACCB48 1F00003D */ bgtz $t8, .L80ACCC40 /* 02C2C 80ACCB4C 24080004 */ addiu $t0, $zero, 0x0004 ## $t0 = 00000004 /* 02C30 80ACCB50 A2190404 */ sb $t9, 0x0404($s0) ## 00000404 -/* 02C34 80ACCB54 1000003A */ beq $zero, $zero, .L80ACCC40 +/* 02C34 80ACCB54 1000003A */ beq $zero, $zero, .L80ACCC40 /* 02C38 80ACCB58 A2080405 */ sb $t0, 0x0405($s0) ## 00000405 .L80ACCB5C: /* 02C3C 80ACCB5C 92040405 */ lbu $a0, 0x0405($s0) ## 00000405 @@ -366,18 +366,18 @@ glabel EnOwl_Update /* 02C44 80ACCB64 00042400 */ sll $a0, $a0, 16 /* 02C48 80ACCB68 0C01DE1C */ jal Math_SinS ## sins? -/* 02C4C 80ACCB6C 00042403 */ sra $a0, $a0, 16 +/* 02C4C 80ACCB6C 00042403 */ sra $a0, $a0, 16 /* 02C50 80ACCB70 3C0180AD */ lui $at, %hi(D_80ACD85C) ## $at = 80AD0000 -/* 02C54 80ACCB74 C424D85C */ lwc1 $f4, %lo(D_80ACD85C)($at) +/* 02C54 80ACCB74 C424D85C */ lwc1 $f4, %lo(D_80ACD85C)($at) /* 02C58 80ACCB78 920A0405 */ lbu $t2, 0x0405($s0) ## 00000405 /* 02C5C 80ACCB7C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 02C60 80ACCB80 46040182 */ mul.s $f6, $f0, $f4 -/* 02C64 80ACCB84 4600320D */ trunc.w.s $f8, $f6 -/* 02C68 80ACCB88 44054000 */ mfc1 $a1, $f8 +/* 02C60 80ACCB80 46040182 */ mul.s $f6, $f0, $f4 +/* 02C64 80ACCB84 4600320D */ trunc.w.s $f8, $f6 +/* 02C68 80ACCB88 44054000 */ mfc1 $a1, $f8 /* 02C6C 80ACCB8C 00000000 */ nop -/* 02C70 80ACCB90 00052C00 */ sll $a1, $a1, 16 -/* 02C74 80ACCB94 1D40002A */ bgtz $t2, .L80ACCC40 -/* 02C78 80ACCB98 00052C03 */ sra $a1, $a1, 16 +/* 02C70 80ACCB90 00052C00 */ sll $a1, $a1, 16 +/* 02C74 80ACCB94 1D40002A */ bgtz $t2, .L80ACCC40 +/* 02C78 80ACCB98 00052C03 */ sra $a1, $a1, 16 /* 02C7C 80ACCB9C 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 02C80 80ACCBA0 0C00CFBE */ jal Rand_ZeroFloat @@ -385,31 +385,31 @@ glabel EnOwl_Update /* 02C88 80ACCBA8 4600028D */ trunc.w.s $f10, $f0 /* 02C8C 80ACCBAC A2000404 */ sb $zero, 0x0404($s0) ## 00000404 /* 02C90 80ACCBB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02C94 80ACCBB4 440C5000 */ mfc1 $t4, $f10 +/* 02C94 80ACCBB4 440C5000 */ mfc1 $t4, $f10 /* 02C98 80ACCBB8 00000000 */ nop /* 02C9C 80ACCBBC 258D003C */ addiu $t5, $t4, 0x003C ## $t5 = 0000003C -/* 02CA0 80ACCBC0 0C2B29B0 */ jal func_80ACA6C0 +/* 02CA0 80ACCBC0 0C2B29B0 */ jal func_80ACA6C0 /* 02CA4 80ACCBC4 A20D0406 */ sb $t5, 0x0406($s0) ## 00000406 -/* 02CA8 80ACCBC8 1000001D */ beq $zero, $zero, .L80ACCC40 -/* 02CAC 80ACCBCC 87A50036 */ lh $a1, 0x0036($sp) +/* 02CA8 80ACCBC8 1000001D */ beq $zero, $zero, .L80ACCC40 +/* 02CAC 80ACCBCC 87A50036 */ lh $a1, 0x0036($sp) /* 02CB0 80ACCBD0 92040405 */ lbu $a0, 0x0405($s0) ## 00000405 .L80ACCBD4: /* 02CB4 80ACCBD4 00042340 */ sll $a0, $a0, 13 /* 02CB8 80ACCBD8 00042400 */ sll $a0, $a0, 16 /* 02CBC 80ACCBDC 0C01DE1C */ jal Math_SinS ## sins? -/* 02CC0 80ACCBE0 00042403 */ sra $a0, $a0, 16 +/* 02CC0 80ACCBE0 00042403 */ sra $a0, $a0, 16 /* 02CC4 80ACCBE4 3C0180AD */ lui $at, %hi(D_80ACD860) ## $at = 80AD0000 -/* 02CC8 80ACCBE8 C430D860 */ lwc1 $f16, %lo(D_80ACD860)($at) +/* 02CC8 80ACCBE8 C430D860 */ lwc1 $f16, %lo(D_80ACD860)($at) /* 02CCC 80ACCBEC 920F0405 */ lbu $t7, 0x0405($s0) ## 00000405 /* 02CD0 80ACCBF0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 02CD4 80ACCBF4 46100482 */ mul.s $f18, $f0, $f16 -/* 02CD8 80ACCBF8 4600910D */ trunc.w.s $f4, $f18 -/* 02CDC 80ACCBFC 44052000 */ mfc1 $a1, $f4 +/* 02CD4 80ACCBF4 46100482 */ mul.s $f18, $f0, $f16 +/* 02CD8 80ACCBF8 4600910D */ trunc.w.s $f4, $f18 +/* 02CDC 80ACCBFC 44052000 */ mfc1 $a1, $f4 /* 02CE0 80ACCC00 00000000 */ nop -/* 02CE4 80ACCC04 00052C00 */ sll $a1, $a1, 16 -/* 02CE8 80ACCC08 1DE0000D */ bgtz $t7, .L80ACCC40 -/* 02CEC 80ACCC0C 00052C03 */ sra $a1, $a1, 16 +/* 02CE4 80ACCC04 00052C00 */ sll $a1, $a1, 16 +/* 02CE8 80ACCC08 1DE0000D */ bgtz $t7, .L80ACCC40 +/* 02CEC 80ACCC0C 00052C03 */ sra $a1, $a1, 16 /* 02CF0 80ACCC10 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 02CF4 80ACCC14 0C00CFBE */ jal Rand_ZeroFloat @@ -417,55 +417,55 @@ glabel EnOwl_Update /* 02CFC 80ACCC1C 4600018D */ trunc.w.s $f6, $f0 /* 02D00 80ACCC20 A2000404 */ sb $zero, 0x0404($s0) ## 00000404 /* 02D04 80ACCC24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02D08 80ACCC28 44193000 */ mfc1 $t9, $f6 +/* 02D08 80ACCC28 44193000 */ mfc1 $t9, $f6 /* 02D0C 80ACCC2C 00000000 */ nop /* 02D10 80ACCC30 2728003C */ addiu $t0, $t9, 0x003C ## $t0 = 0000003C -/* 02D14 80ACCC34 0C2B29B0 */ jal func_80ACA6C0 +/* 02D14 80ACCC34 0C2B29B0 */ jal func_80ACA6C0 /* 02D18 80ACCC38 A2080406 */ sb $t0, 0x0406($s0) ## 00000406 -/* 02D1C 80ACCC3C 87A50036 */ lh $a1, 0x0036($sp) +/* 02D1C 80ACCC3C 87A50036 */ lh $a1, 0x0036($sp) .L80ACCC40: /* 02D20 80ACCC40 960903FC */ lhu $t1, 0x03FC($s0) ## 000003FC .L80ACCC44: /* 02D24 80ACCC44 312A0020 */ andi $t2, $t1, 0x0020 ## $t2 = 00000000 -/* 02D28 80ACCC48 51400005 */ beql $t2, $zero, .L80ACCC60 +/* 02D28 80ACCC48 51400005 */ beql $t2, $zero, .L80ACCC60 /* 02D2C 80ACCC4C 92020409 */ lbu $v0, 0x0409($s0) ## 00000409 -/* 02D30 80ACCC50 00052823 */ subu $a1, $zero, $a1 -/* 02D34 80ACCC54 00052C00 */ sll $a1, $a1, 16 -/* 02D38 80ACCC58 00052C03 */ sra $a1, $a1, 16 +/* 02D30 80ACCC50 00052823 */ subu $a1, $zero, $a1 +/* 02D34 80ACCC54 00052C00 */ sll $a1, $a1, 16 +/* 02D38 80ACCC58 00052C03 */ sra $a1, $a1, 16 .L80ACCC5C: /* 02D3C 80ACCC5C 92020409 */ lbu $v0, 0x0409($s0) ## 00000409 .L80ACCC60: -/* 02D40 80ACCC60 18400003 */ blez $v0, .L80ACCC70 +/* 02D40 80ACCC60 18400003 */ blez $v0, .L80ACCC70 /* 02D44 80ACCC64 244BFFFF */ addiu $t3, $v0, 0xFFFF ## $t3 = FFFFFFFF -/* 02D48 80ACCC68 10000047 */ beq $zero, $zero, .L80ACCD88 +/* 02D48 80ACCC68 10000047 */ beq $zero, $zero, .L80ACCD88 /* 02D4C 80ACCC6C A20B0409 */ sb $t3, 0x0409($s0) ## 00000409 .L80ACCC70: /* 02D50 80ACCC70 920C0408 */ lbu $t4, 0x0408($s0) ## 00000408 /* 02D54 80ACCC74 92020407 */ lbu $v0, 0x0407($s0) ## 00000407 /* 02D58 80ACCC78 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 02D5C 80ACCC7C 258DFFFF */ addiu $t5, $t4, 0xFFFF ## $t5 = FFFFFFFF -/* 02D60 80ACCC80 10400007 */ beq $v0, $zero, .L80ACCCA0 +/* 02D60 80ACCC80 10400007 */ beq $v0, $zero, .L80ACCCA0 /* 02D64 80ACCC84 A20D0408 */ sb $t5, 0x0408($s0) ## 00000408 -/* 02D68 80ACCC88 1041001F */ beq $v0, $at, .L80ACCD08 +/* 02D68 80ACCC88 1041001F */ beq $v0, $at, .L80ACCD08 /* 02D6C 80ACCC8C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02D70 80ACCC90 50410027 */ beql $v0, $at, .L80ACCD30 +/* 02D70 80ACCC90 50410027 */ beql $v0, $at, .L80ACCD30 /* 02D74 80ACCC94 92020408 */ lbu $v0, 0x0408($s0) ## 00000408 -/* 02D78 80ACCC98 1000003C */ beq $zero, $zero, .L80ACCD8C +/* 02D78 80ACCC98 1000003C */ beq $zero, $zero, .L80ACCD8C /* 02D7C 80ACCC9C 860A03EE */ lh $t2, 0x03EE($s0) ## 000003EE .L80ACCCA0: /* 02D80 80ACCCA0 92020408 */ lbu $v0, 0x0408($s0) ## 00000408 /* 02D84 80ACCCA4 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 02D88 80ACCCA8 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 02D8C 80ACCCAC 00027023 */ subu $t6, $zero, $v0 -/* 02D90 80ACCCB0 000E7880 */ sll $t7, $t6, 2 -/* 02D94 80ACCCB4 01EE7823 */ subu $t7, $t7, $t6 -/* 02D98 80ACCCB8 000F7900 */ sll $t7, $t7, 4 -/* 02D9C 80ACCCBC 01EE7823 */ subu $t7, $t7, $t6 -/* 02DA0 80ACCCC0 000F78C0 */ sll $t7, $t7, 3 -/* 02DA4 80ACCCC4 01EE7823 */ subu $t7, $t7, $t6 -/* 02DA8 80ACCCC8 000F7880 */ sll $t7, $t7, 2 +/* 02D8C 80ACCCAC 00027023 */ subu $t6, $zero, $v0 +/* 02D90 80ACCCB0 000E7880 */ sll $t7, $t6, 2 +/* 02D94 80ACCCB4 01EE7823 */ subu $t7, $t7, $t6 +/* 02D98 80ACCCB8 000F7900 */ sll $t7, $t7, 4 +/* 02D9C 80ACCCBC 01EE7823 */ subu $t7, $t7, $t6 +/* 02DA0 80ACCCC0 000F78C0 */ sll $t7, $t7, 3 +/* 02DA4 80ACCCC4 01EE7823 */ subu $t7, $t7, $t6 +/* 02DA8 80ACCCC8 000F7880 */ sll $t7, $t7, 2 /* 02DAC 80ACCCCC 25F81770 */ addiu $t8, $t7, 0x1770 ## $t8 = 00001770 -/* 02DB0 80ACCCD0 1C40002D */ bgtz $v0, .L80ACCD88 +/* 02DB0 80ACCCD0 1C40002D */ bgtz $v0, .L80ACCD88 /* 02DB4 80ACCCD4 A61803F2 */ sh $t8, 0x03F2($s0) ## 000003F2 /* 02DB8 80ACCCD8 A2190407 */ sb $t9, 0x0407($s0) ## 00000407 /* 02DBC 80ACCCDC 44816000 */ mtc1 $at, $f12 ## $f12 = 15.00 @@ -474,34 +474,34 @@ glabel EnOwl_Update /* 02DC4 80ACCCE4 A7A50036 */ sh $a1, 0x0036($sp) /* 02DC8 80ACCCE8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 02DCC 80ACCCEC 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 02DD0 80ACCCF0 87A50036 */ lh $a1, 0x0036($sp) -/* 02DD4 80ACCCF4 46080280 */ add.s $f10, $f0, $f8 -/* 02DD8 80ACCCF8 4600540D */ trunc.w.s $f16, $f10 -/* 02DDC 80ACCCFC 44098000 */ mfc1 $t1, $f16 -/* 02DE0 80ACCD00 10000021 */ beq $zero, $zero, .L80ACCD88 +/* 02DD0 80ACCCF0 87A50036 */ lh $a1, 0x0036($sp) +/* 02DD4 80ACCCF4 46080280 */ add.s $f10, $f0, $f8 +/* 02DD8 80ACCCF8 4600540D */ trunc.w.s $f16, $f10 +/* 02DDC 80ACCCFC 44098000 */ mfc1 $t1, $f16 +/* 02DE0 80ACCD00 10000021 */ beq $zero, $zero, .L80ACCD88 /* 02DE4 80ACCD04 A2090408 */ sb $t1, 0x0408($s0) ## 00000408 .L80ACCD08: /* 02DE8 80ACCD08 920B0408 */ lbu $t3, 0x0408($s0) ## 00000408 /* 02DEC 80ACCD0C 240A1770 */ addiu $t2, $zero, 0x1770 ## $t2 = 00001770 /* 02DF0 80ACCD10 A60A03F2 */ sh $t2, 0x03F2($s0) ## 000003F2 -/* 02DF4 80ACCD14 1D60001C */ bgtz $t3, .L80ACCD88 +/* 02DF4 80ACCD14 1D60001C */ bgtz $t3, .L80ACCD88 /* 02DF8 80ACCD18 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 /* 02DFC 80ACCD1C 240D0004 */ addiu $t5, $zero, 0x0004 ## $t5 = 00000004 /* 02E00 80ACCD20 A20C0407 */ sb $t4, 0x0407($s0) ## 00000407 -/* 02E04 80ACCD24 10000018 */ beq $zero, $zero, .L80ACCD88 +/* 02E04 80ACCD24 10000018 */ beq $zero, $zero, .L80ACCD88 /* 02E08 80ACCD28 A20D0408 */ sb $t5, 0x0408($s0) ## 00000408 /* 02E0C 80ACCD2C 92020408 */ lbu $v0, 0x0408($s0) ## 00000408 .L80ACCD30: /* 02E10 80ACCD30 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 /* 02E14 80ACCD34 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 02E18 80ACCD38 00027080 */ sll $t6, $v0, 2 -/* 02E1C 80ACCD3C 01C27023 */ subu $t6, $t6, $v0 -/* 02E20 80ACCD40 000E7100 */ sll $t6, $t6, 4 -/* 02E24 80ACCD44 01C27023 */ subu $t6, $t6, $v0 -/* 02E28 80ACCD48 000E70C0 */ sll $t6, $t6, 3 -/* 02E2C 80ACCD4C 01C27023 */ subu $t6, $t6, $v0 -/* 02E30 80ACCD50 000E7080 */ sll $t6, $t6, 2 -/* 02E34 80ACCD54 1C40000C */ bgtz $v0, .L80ACCD88 +/* 02E18 80ACCD38 00027080 */ sll $t6, $v0, 2 +/* 02E1C 80ACCD3C 01C27023 */ subu $t6, $t6, $v0 +/* 02E20 80ACCD40 000E7100 */ sll $t6, $t6, 4 +/* 02E24 80ACCD44 01C27023 */ subu $t6, $t6, $v0 +/* 02E28 80ACCD48 000E70C0 */ sll $t6, $t6, 3 +/* 02E2C 80ACCD4C 01C27023 */ subu $t6, $t6, $v0 +/* 02E30 80ACCD50 000E7080 */ sll $t6, $t6, 2 +/* 02E34 80ACCD54 1C40000C */ bgtz $v0, .L80ACCD88 /* 02E38 80ACCD58 A60E03F2 */ sh $t6, 0x03F2($s0) ## 000003F2 /* 02E3C 80ACCD5C A2000407 */ sb $zero, 0x0407($s0) ## 00000407 /* 02E40 80ACCD60 A20F0408 */ sb $t7, 0x0408($s0) ## 00000408 @@ -518,39 +518,39 @@ glabel EnOwl_Update .L80ACCD88: /* 02E68 80ACCD88 860A03EE */ lh $t2, 0x03EE($s0) ## 000003EE .L80ACCD8C: -/* 02E6C 80ACCD8C 000A6280 */ sll $t4, $t2, 10 -/* 02E70 80ACCD90 01856821 */ addu $t5, $t4, $a1 +/* 02E6C 80ACCD8C 000A6280 */ sll $t4, $t2, 10 +/* 02E70 80ACCD90 01856821 */ addu $t5, $t4, $a1 /* 02E74 80ACCD94 A60D03F0 */ sh $t5, 0x03F0($s0) ## 000003F0 /* 02E78 80ACCD98 860303F0 */ lh $v1, 0x03F0($s0) ## 000003F0 -/* 02E7C 80ACCD9C 04600003 */ bltz $v1, .L80ACCDAC -/* 02E80 80ACCDA0 00031023 */ subu $v0, $zero, $v1 -/* 02E84 80ACCDA4 10000001 */ beq $zero, $zero, .L80ACCDAC +/* 02E7C 80ACCD9C 04600003 */ bltz $v1, .L80ACCDAC +/* 02E80 80ACCDA0 00031023 */ subu $v0, $zero, $v1 +/* 02E84 80ACCDA4 10000001 */ beq $zero, $zero, .L80ACCDAC /* 02E88 80ACCDA8 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L80ACCDAC: -/* 02E8C 80ACCDAC 000270C3 */ sra $t6, $v0, 3 -/* 02E90 80ACCDB0 1000000E */ beq $zero, $zero, .L80ACCDEC +/* 02E8C 80ACCDAC 000270C3 */ sra $t6, $v0, 3 +/* 02E90 80ACCDB0 1000000E */ beq $zero, $zero, .L80ACCDEC /* 02E94 80ACCDB4 A60E03EC */ sh $t6, 0x03EC($s0) ## 000003EC .L80ACCDB8: -/* 02E98 80ACCDB8 11E00004 */ beq $t7, $zero, .L80ACCDCC +/* 02E98 80ACCDB8 11E00004 */ beq $t7, $zero, .L80ACCDCC /* 02E9C 80ACCDBC A60003F2 */ sh $zero, 0x03F2($s0) ## 000003F2 /* 02EA0 80ACCDC0 24188000 */ addiu $t8, $zero, 0x8000 ## $t8 = FFFF8000 -/* 02EA4 80ACCDC4 10000002 */ beq $zero, $zero, .L80ACCDD0 +/* 02EA4 80ACCDC4 10000002 */ beq $zero, $zero, .L80ACCDD0 /* 02EA8 80ACCDC8 A61803F0 */ sh $t8, 0x03F0($s0) ## 000003F0 .L80ACCDCC: /* 02EAC 80ACCDCC A60003F0 */ sh $zero, 0x03F0($s0) ## 000003F0 .L80ACCDD0: /* 02EB0 80ACCDD0 860303F0 */ lh $v1, 0x03F0($s0) ## 000003F0 -/* 02EB4 80ACCDD4 04600003 */ bltz $v1, .L80ACCDE4 -/* 02EB8 80ACCDD8 00031023 */ subu $v0, $zero, $v1 -/* 02EBC 80ACCDDC 10000001 */ beq $zero, $zero, .L80ACCDE4 +/* 02EB4 80ACCDD4 04600003 */ bltz $v1, .L80ACCDE4 +/* 02EB8 80ACCDD8 00031023 */ subu $v0, $zero, $v1 +/* 02EBC 80ACCDDC 10000001 */ beq $zero, $zero, .L80ACCDE4 /* 02EC0 80ACCDE0 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L80ACCDE4: -/* 02EC4 80ACCDE4 0002C8C3 */ sra $t9, $v0, 3 +/* 02EC4 80ACCDE4 0002C8C3 */ sra $t9, $v0, 3 /* 02EC8 80ACCDE8 A61903EC */ sh $t9, 0x03EC($s0) ## 000003EC .L80ACCDEC: -/* 02ECC 80ACCDEC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 02ECC 80ACCDEC 8FBF0024 */ lw $ra, 0x0024($sp) .L80ACCDF0: -/* 02ED0 80ACCDF0 8FB00020 */ lw $s0, 0x0020($sp) +/* 02ED0 80ACCDF0 8FB00020 */ lw $s0, 0x0020($sp) /* 02ED4 80ACCDF4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 02ED8 80ACCDF8 03E00008 */ jr $ra +/* 02ED8 80ACCDF8 03E00008 */ jr $ra /* 02EDC 80ACCDFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA3B8.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA3B8.s deleted file mode 100644 index 7402050a0a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA3B8.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80ACA3B8 -/* 00498 80ACA3B8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0049C 80ACA3BC AFBF0014 */ sw $ra, 0x0014($sp) -/* 004A0 80ACA3C0 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 004A4 80ACA3C4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 004A8 80ACA3C8 AFA60018 */ sw $a2, 0x0018($sp) -/* 004AC 80ACA3CC 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 -/* 004B0 80ACA3D0 0C01E01A */ jal Math_Vec3f_Yaw - -/* 004B4 80ACA3D4 24450024 */ addiu $a1, $v0, 0x0024 ## $a1 = 00000024 -/* 004B8 80ACA3D8 8FA60018 */ lw $a2, 0x0018($sp) -/* 004BC 80ACA3DC A4C20032 */ sh $v0, 0x0032($a2) ## 00000032 -/* 004C0 80ACA3E0 A4C200B6 */ sh $v0, 0x00B6($a2) ## 000000B6 -/* 004C4 80ACA3E4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 004C8 80ACA3E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004CC 80ACA3EC 03E00008 */ jr $ra -/* 004D0 80ACA3F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA3F4.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA3F4.s deleted file mode 100644 index df08f6cce4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA3F4.s +++ /dev/null @@ -1,100 +0,0 @@ -glabel func_80ACA3F4 -/* 004D4 80ACA3F4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 004D8 80ACA3F8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 004DC 80ACA3FC AFB00020 */ sw $s0, 0x0020($sp) -/* 004E0 80ACA400 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 004E4 80ACA404 AFA5002C */ sw $a1, 0x002C($sp) -/* 004E8 80ACA408 AFA60030 */ sw $a2, 0x0030($sp) -/* 004EC 80ACA40C 0C00BC65 */ jal func_8002F194 -/* 004F0 80ACA410 AFA70034 */ sw $a3, 0x0034($sp) -/* 004F4 80ACA414 1040002E */ beq $v0, $zero, .L80ACA4D0 -/* 004F8 80ACA418 C7A20034 */ lwc1 $f2, 0x0034($sp) -/* 004FC 80ACA41C 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00500 80ACA420 24010FFF */ addiu $at, $zero, 0x0FFF ## $at = 00000FFF -/* 00504 80ACA424 15C10006 */ bne $t6, $at, .L80ACA440 -/* 00508 80ACA428 00000000 */ nop -/* 0050C 80ACA42C 960F03FC */ lhu $t7, 0x03FC($s0) ## 000003FC -/* 00510 80ACA430 2402FF9C */ addiu $v0, $zero, 0xFF9C ## $v0 = FFFFFF9C -/* 00514 80ACA434 35F80040 */ ori $t8, $t7, 0x0040 ## $t8 = 00000040 -/* 00518 80ACA438 1000001B */ beq $zero, $zero, .L80ACA4A8 -/* 0051C 80ACA43C A61803FC */ sh $t8, 0x03FC($s0) ## 000003FC -.L80ACA440: -/* 00520 80ACA440 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00524 80ACA444 00000000 */ nop -/* 00528 80ACA448 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0052C 80ACA44C 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 00530 80ACA450 97B9003A */ lhu $t9, 0x003A($sp) -/* 00534 80ACA454 97AB003A */ lhu $t3, 0x003A($sp) -/* 00538 80ACA458 4604003C */ c.lt.s $f0, $f4 -/* 0053C 80ACA45C 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 -/* 00540 80ACA460 316C0001 */ andi $t4, $t3, 0x0001 ## $t4 = 00000000 -/* 00544 80ACA464 45000009 */ bc1f .L80ACA48C -/* 00548 80ACA468 00000000 */ nop -/* 0054C 80ACA46C 11000003 */ beq $t0, $zero, .L80ACA47C -/* 00550 80ACA470 2402FF9D */ addiu $v0, $zero, 0xFF9D ## $v0 = FFFFFF9D -/* 00554 80ACA474 10000001 */ beq $zero, $zero, .L80ACA47C -/* 00558 80ACA478 2402FF9F */ addiu $v0, $zero, 0xFF9F ## $v0 = FFFFFF9F -.L80ACA47C: -/* 0055C 80ACA47C 960903FC */ lhu $t1, 0x03FC($s0) ## 000003FC -/* 00560 80ACA480 352A0040 */ ori $t2, $t1, 0x0040 ## $t2 = 00000040 -/* 00564 80ACA484 10000008 */ beq $zero, $zero, .L80ACA4A8 -/* 00568 80ACA488 A60A03FC */ sh $t2, 0x03FC($s0) ## 000003FC -.L80ACA48C: -/* 0056C 80ACA48C 11800003 */ beq $t4, $zero, .L80ACA49C -/* 00570 80ACA490 2402FF9E */ addiu $v0, $zero, 0xFF9E ## $v0 = FFFFFF9E -/* 00574 80ACA494 10000001 */ beq $zero, $zero, .L80ACA49C -/* 00578 80ACA498 2402FFA0 */ addiu $v0, $zero, 0xFFA0 ## $v0 = FFFFFFA0 -.L80ACA49C: -/* 0057C 80ACA49C 960D03FC */ lhu $t5, 0x03FC($s0) ## 000003FC -/* 00580 80ACA4A0 31AEFFBF */ andi $t6, $t5, 0xFFBF ## $t6 = 00000000 -/* 00584 80ACA4A4 A60E03FC */ sh $t6, 0x03FC($s0) ## 000003FC -.L80ACA4A8: -/* 00588 80ACA4A8 00023400 */ sll $a2, $v0, 16 -/* 0058C 80ACA4AC 00063403 */ sra $a2, $a2, 16 -/* 00590 80ACA4B0 8FA4002C */ lw $a0, 0x002C($sp) -/* 00594 80ACA4B4 240521FC */ addiu $a1, $zero, 0x21FC ## $a1 = 000021FC -/* 00598 80ACA4B8 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 0059C 80ACA4BC 0C02003E */ jal func_800800F8 -/* 005A0 80ACA4C0 AFA00010 */ sw $zero, 0x0010($sp) -/* 005A4 80ACA4C4 A6020402 */ sh $v0, 0x0402($s0) ## 00000402 -/* 005A8 80ACA4C8 1000001E */ beq $zero, $zero, .L80ACA544 -/* 005AC 80ACA4CC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80ACA4D0: -/* 005B0 80ACA4D0 97AF0032 */ lhu $t7, 0x0032($sp) -/* 005B4 80ACA4D4 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 005B8 80ACA4D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005BC 80ACA4DC A60F010E */ sh $t7, 0x010E($s0) ## 0000010E -/* 005C0 80ACA4E0 97B8003A */ lhu $t8, 0x003A($sp) -/* 005C4 80ACA4E4 33190002 */ andi $t9, $t8, 0x0002 ## $t9 = 00000000 -/* 005C8 80ACA4E8 53200006 */ beql $t9, $zero, .L80ACA504 -/* 005CC 80ACA4EC 44810000 */ mtc1 $at, $f0 ## $f0 = 1000.00 -/* 005D0 80ACA4F0 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 005D4 80ACA4F4 44810000 */ mtc1 $at, $f0 ## $f0 = 200.00 -/* 005D8 80ACA4F8 10000004 */ beq $zero, $zero, .L80ACA50C -/* 005DC 80ACA4FC C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 -/* 005E0 80ACA500 44810000 */ mtc1 $at, $f0 ## $f0 = 200.00 -.L80ACA504: -/* 005E4 80ACA504 00000000 */ nop -/* 005E8 80ACA508 C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 -.L80ACA50C: -/* 005EC 80ACA50C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 005F0 80ACA510 4602303C */ c.lt.s $f6, $f2 -/* 005F4 80ACA514 00000000 */ nop -/* 005F8 80ACA518 4502000A */ bc1fl .L80ACA544 -/* 005FC 80ACA51C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00600 80ACA520 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 -/* 00604 80ACA524 44061000 */ mfc1 $a2, $f2 -/* 00608 80ACA528 44070000 */ mfc1 $a3, $f0 -/* 0060C 80ACA52C 01014825 */ or $t1, $t0, $at ## $t1 = 00010000 -/* 00610 80ACA530 AE090004 */ sw $t1, 0x0004($s0) ## 00000004 -/* 00614 80ACA534 AFA00010 */ sw $zero, 0x0010($sp) -/* 00618 80ACA538 0C00BC71 */ jal func_8002F1C4 -/* 0061C 80ACA53C 8FA5002C */ lw $a1, 0x002C($sp) -/* 00620 80ACA540 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80ACA544: -/* 00624 80ACA544 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00628 80ACA548 8FB00020 */ lw $s0, 0x0020($sp) -/* 0062C 80ACA54C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00630 80ACA550 03E00008 */ jr $ra -/* 00634 80ACA554 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA558.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA558.s deleted file mode 100644 index 43fedf9df4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA558.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80ACA558 -/* 00638 80ACA558 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0063C 80ACA55C AFBF001C */ sw $ra, 0x001C($sp) -/* 00640 80ACA560 AFA50024 */ sw $a1, 0x0024($sp) -/* 00644 80ACA564 AFA60028 */ sw $a2, 0x0028($sp) -/* 00648 80ACA568 0C00BC65 */ jal func_8002F194 -/* 0064C 80ACA56C AFA40020 */ sw $a0, 0x0020($sp) -/* 00650 80ACA570 10400003 */ beq $v0, $zero, .L80ACA580 -/* 00654 80ACA574 8FA40020 */ lw $a0, 0x0020($sp) -/* 00658 80ACA578 1000000F */ beq $zero, $zero, .L80ACA5B8 -/* 0065C 80ACA57C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80ACA580: -/* 00660 80ACA580 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 00664 80ACA584 44813000 */ mtc1 $at, $f6 ## $f6 = 120.00 -/* 00668 80ACA588 C4840090 */ lwc1 $f4, 0x0090($a0) ## 00000090 -/* 0066C 80ACA58C 97AE002A */ lhu $t6, 0x002A($sp) -/* 00670 80ACA590 3C0643AF */ lui $a2, 0x43AF ## $a2 = 43AF0000 -/* 00674 80ACA594 4606203C */ c.lt.s $f4, $f6 -/* 00678 80ACA598 A48E010E */ sh $t6, 0x010E($a0) ## 0000010E -/* 0067C 80ACA59C 8FA50024 */ lw $a1, 0x0024($sp) -/* 00680 80ACA5A0 3C07447A */ lui $a3, 0x447A ## $a3 = 447A0000 -/* 00684 80ACA5A4 45020004 */ bc1fl .L80ACA5B8 -/* 00688 80ACA5A8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0068C 80ACA5AC 0C00BC71 */ jal func_8002F1C4 -/* 00690 80ACA5B0 AFA00010 */ sw $zero, 0x0010($sp) -/* 00694 80ACA5B4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80ACA5B8: -/* 00698 80ACA5B8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0069C 80ACA5BC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 006A0 80ACA5C0 03E00008 */ jr $ra -/* 006A4 80ACA5C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA5C8.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA5C8.s deleted file mode 100644 index f245466211..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA5C8.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80ACA5C8 -/* 006A8 80ACA5C8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 006AC 80ACA5CC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 006B0 80ACA5D0 3C0E0601 */ lui $t6, %hi(D_0600C684) ## $t6 = 06010000 -/* 006B4 80ACA5D4 AFBF001C */ sw $ra, 0x001C($sp) -/* 006B8 80ACA5D8 25CEC684 */ addiu $t6, $t6, %lo(D_0600C684) ## $t6 = 0600C684 -/* 006BC 80ACA5DC 3C0580AD */ lui $a1, %hi(func_80ACBEA0) ## $a1 = 80AD0000 -/* 006C0 80ACA5E0 3C0680AD */ lui $a2, %hi(func_80ACC540) ## $a2 = 80AD0000 -/* 006C4 80ACA5E4 24C6C540 */ addiu $a2, $a2, %lo(func_80ACC540) ## $a2 = 80ACC540 -/* 006C8 80ACA5E8 24A5BEA0 */ addiu $a1, $a1, %lo(func_80ACBEA0) ## $a1 = 80ACBEA0 -/* 006CC 80ACA5EC AFAE0010 */ sw $t6, 0x0010($sp) -/* 006D0 80ACA5F0 AFA40020 */ sw $a0, 0x0020($sp) -/* 006D4 80ACA5F4 24870198 */ addiu $a3, $a0, 0x0198 ## $a3 = 00000198 -/* 006D8 80ACA5F8 0C2B342E */ jal func_80ACD0B8 -/* 006DC 80ACA5FC E7A40014 */ swc1 $f4, 0x0014($sp) -/* 006E0 80ACA600 8FAF0020 */ lw $t7, 0x0020($sp) -/* 006E4 80ACA604 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 006E8 80ACA608 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 006EC 80ACA60C 0C01DF64 */ jal Rand_S16Offset - -/* 006F0 80ACA610 A5E003F4 */ sh $zero, 0x03F4($t7) ## 000003F4 -/* 006F4 80ACA614 8FB80020 */ lw $t8, 0x0020($sp) -/* 006F8 80ACA618 A70203F6 */ sh $v0, 0x03F6($t8) ## 000003F6 -/* 006FC 80ACA61C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00700 80ACA620 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00704 80ACA624 03E00008 */ jr $ra -/* 00708 80ACA628 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA62C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA62C.s deleted file mode 100644 index dcb7f2a536..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA62C.s +++ /dev/null @@ -1,36 +0,0 @@ -.rdata -glabel D_80ACD730 - .asciz "\x1b[36m Actor_Environment_sw = %d\n\x1b[m" - .balign 4 - -.text -glabel func_80ACA62C -/* 0070C 80ACA62C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00710 80ACA630 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00714 80ACA634 AFA40020 */ sw $a0, 0x0020($sp) -/* 00718 80ACA638 AFA50024 */ sw $a1, 0x0024($sp) -/* 0071C 80ACA63C 8486001C */ lh $a2, 0x001C($a0) ## 0000001C -/* 00720 80ACA640 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00724 80ACA644 30C6003F */ andi $a2, $a2, 0x003F ## $a2 = 00000000 -/* 00728 80ACA648 28C10020 */ slti $at, $a2, 0x0020 -/* 0072C 80ACA64C 1020000A */ beq $at, $zero, .L80ACA678 -/* 00730 80ACA650 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 00734 80ACA654 0C00B2DD */ jal Flags_SetSwitch - -/* 00738 80ACA658 AFA6001C */ sw $a2, 0x001C($sp) -/* 0073C 80ACA65C 8FA5001C */ lw $a1, 0x001C($sp) -/* 00740 80ACA660 0C00B2D0 */ jal Flags_GetSwitch - -/* 00744 80ACA664 8FA40024 */ lw $a0, 0x0024($sp) -/* 00748 80ACA668 3C0480AD */ lui $a0, %hi(D_80ACD730) ## $a0 = 80AD0000 -/* 0074C 80ACA66C 2484D730 */ addiu $a0, $a0, %lo(D_80ACD730) ## $a0 = 80ACD730 -/* 00750 80ACA670 0C00084C */ jal osSyncPrintf - -/* 00754 80ACA674 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -.L80ACA678: -/* 00758 80ACA678 0C2B2972 */ jal func_80ACA5C8 -/* 0075C 80ACA67C 8FA40020 */ lw $a0, 0x0020($sp) -/* 00760 80ACA680 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00764 80ACA684 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00768 80ACA688 03E00008 */ jr $ra -/* 0076C 80ACA68C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA690.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA690.s deleted file mode 100644 index b44dc9f1c1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA690.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80ACA690 -/* 00770 80ACA690 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00774 80ACA694 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00778 80ACA698 848E03EE */ lh $t6, 0x03EE($a0) ## 000003EE -/* 0077C 80ACA69C 31CF003F */ andi $t7, $t6, 0x003F ## $t7 = 00000000 -/* 00780 80ACA6A0 55E00004 */ bnel $t7, $zero, .L80ACA6B4 -/* 00784 80ACA6A4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00788 80ACA6A8 0C2B298B */ jal func_80ACA62C -/* 0078C 80ACA6AC 00000000 */ nop -/* 00790 80ACA6B0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ACA6B4: -/* 00794 80ACA6B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00798 80ACA6B8 03E00008 */ jr $ra -/* 0079C 80ACA6BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA6C0.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA6C0.s deleted file mode 100644 index 74e1c22773..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA6C0.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80ACA6C0 -/* 007A0 80ACA6C0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007A4 80ACA6C4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 007A8 80ACA6C8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 007AC 80ACA6CC 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 007B0 80ACA6D0 0C00CFC8 */ jal Rand_CenteredFloat - -/* 007B4 80ACA6D4 AFA40018 */ sw $a0, 0x0018($sp) -/* 007B8 80ACA6D8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 007BC 80ACA6DC 8FA40018 */ lw $a0, 0x0018($sp) -/* 007C0 80ACA6E0 4604003C */ c.lt.s $f0, $f4 -/* 007C4 80ACA6E4 00000000 */ nop -/* 007C8 80ACA6E8 45020006 */ bc1fl .L80ACA704 -/* 007CC 80ACA6EC 949803FC */ lhu $t8, 0x03FC($a0) ## 000003FC -/* 007D0 80ACA6F0 948E03FC */ lhu $t6, 0x03FC($a0) ## 000003FC -/* 007D4 80ACA6F4 35CF0020 */ ori $t7, $t6, 0x0020 ## $t7 = 00000020 -/* 007D8 80ACA6F8 10000004 */ beq $zero, $zero, .L80ACA70C -/* 007DC 80ACA6FC A48F03FC */ sh $t7, 0x03FC($a0) ## 000003FC -/* 007E0 80ACA700 949803FC */ lhu $t8, 0x03FC($a0) ## 000003FC -.L80ACA704: -/* 007E4 80ACA704 3319FFDF */ andi $t9, $t8, 0xFFDF ## $t9 = 00000000 -/* 007E8 80ACA708 A49903FC */ sh $t9, 0x03FC($a0) ## 000003FC -.L80ACA70C: -/* 007EC 80ACA70C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 007F0 80ACA710 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007F4 80ACA714 03E00008 */ jr $ra -/* 007F8 80ACA718 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA71C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA71C.s deleted file mode 100644 index 22b6f3c98e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA71C.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80ACA71C -/* 007FC 80ACA71C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00800 80ACA720 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00804 80ACA724 0C2B29B0 */ jal func_80ACA6C0 -/* 00808 80ACA728 AFA40018 */ sw $a0, 0x0018($sp) -/* 0080C 80ACA72C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00810 80ACA730 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -/* 00814 80ACA734 948E03FC */ lhu $t6, 0x03FC($a0) ## 000003FC -/* 00818 80ACA738 A48003F2 */ sh $zero, 0x03F2($a0) ## 000003F2 -/* 0081C 80ACA73C 849803F2 */ lh $t8, 0x03F2($a0) ## 000003F2 -/* 00820 80ACA740 35CF0010 */ ori $t7, $t6, 0x0010 ## $t7 = 00000010 -/* 00824 80ACA744 A48F03FC */ sh $t7, 0x03FC($a0) ## 000003FC -/* 00828 80ACA748 A0820408 */ sb $v0, 0x0408($a0) ## 00000408 -/* 0082C 80ACA74C A0800404 */ sb $zero, 0x0404($a0) ## 00000404 -/* 00830 80ACA750 A0800406 */ sb $zero, 0x0406($a0) ## 00000406 -/* 00834 80ACA754 A0820405 */ sb $v0, 0x0405($a0) ## 00000405 -/* 00838 80ACA758 A0980407 */ sb $t8, 0x0407($a0) ## 00000407 -/* 0083C 80ACA75C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00840 80ACA760 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00844 80ACA764 03E00008 */ jr $ra -/* 00848 80ACA768 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA76C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA76C.s deleted file mode 100644 index 51462ee370..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA76C.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80ACA76C -/* 0084C 80ACA76C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00850 80ACA770 AFB00018 */ sw $s0, 0x0018($sp) -/* 00854 80ACA774 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00858 80ACA778 AFBF001C */ sw $ra, 0x001C($sp) -/* 0085C 80ACA77C AFA50024 */ sw $a1, 0x0024($sp) -/* 00860 80ACA780 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00864 80ACA784 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00868 80ACA788 0C00B7D5 */ jal func_8002DF54 -/* 0086C 80ACA78C 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 00870 80ACA790 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00874 80ACA794 0C00BCCD */ jal func_8002F334 -/* 00878 80ACA798 8FA50024 */ lw $a1, 0x0024($sp) -/* 0087C 80ACA79C 1040000B */ beq $v0, $zero, .L80ACA7CC -/* 00880 80ACA7A0 3C041100 */ lui $a0, 0x1100 ## $a0 = 11000000 -/* 00884 80ACA7A4 0C03E803 */ jal Audio_SetBGM - -/* 00888 80ACA7A8 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 110000FF -/* 0088C 80ACA7AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00890 80ACA7B0 0C2B298B */ jal func_80ACA62C -/* 00894 80ACA7B4 8FA50024 */ lw $a1, 0x0024($sp) -/* 00898 80ACA7B8 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 0089C 80ACA7BC 3C01FFFE */ lui $at, 0xFFFE ## $at = FFFE0000 -/* 008A0 80ACA7C0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFEFFFF -/* 008A4 80ACA7C4 01C17824 */ and $t7, $t6, $at -/* 008A8 80ACA7C8 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -.L80ACA7CC: -/* 008AC 80ACA7CC 8FBF001C */ lw $ra, 0x001C($sp) -/* 008B0 80ACA7D0 8FB00018 */ lw $s0, 0x0018($sp) -/* 008B4 80ACA7D4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 008B8 80ACA7D8 03E00008 */ jr $ra -/* 008BC 80ACA7DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA7E0.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA7E0.s deleted file mode 100644 index f60e153e24..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA7E0.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80ACA7E0 -/* 008C0 80ACA7E0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 008C4 80ACA7E4 AFB00018 */ sw $s0, 0x0018($sp) -/* 008C8 80ACA7E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 008CC 80ACA7EC AFBF001C */ sw $ra, 0x001C($sp) -/* 008D0 80ACA7F0 AFA50024 */ sw $a1, 0x0024($sp) -/* 008D4 80ACA7F4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 008D8 80ACA7F8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 008DC 80ACA7FC 0C00B7D5 */ jal func_8002DF54 -/* 008E0 80ACA800 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 008E4 80ACA804 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008E8 80ACA808 0C00BCCD */ jal func_8002F334 -/* 008EC 80ACA80C 8FA50024 */ lw $a1, 0x0024($sp) -/* 008F0 80ACA810 10400019 */ beq $v0, $zero, .L80ACA878 -/* 008F4 80ACA814 3C041100 */ lui $a0, 0x1100 ## $a0 = 11000000 -/* 008F8 80ACA818 0C03E803 */ jal Audio_SetBGM - -/* 008FC 80ACA81C 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 110000FF -/* 00900 80ACA820 860E03EE */ lh $t6, 0x03EE($s0) ## 000003EE -/* 00904 80ACA824 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00908 80ACA828 31CF003F */ andi $t7, $t6, 0x003F ## $t7 = 00000000 -/* 0090C 80ACA82C 55E00006 */ bnel $t7, $zero, .L80ACA848 -/* 00910 80ACA830 961803FC */ lhu $t8, 0x03FC($s0) ## 000003FC -/* 00914 80ACA834 0C2B298B */ jal func_80ACA62C -/* 00918 80ACA838 8FA50024 */ lw $a1, 0x0024($sp) -/* 0091C 80ACA83C 1000000A */ beq $zero, $zero, .L80ACA868 -/* 00920 80ACA840 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 -/* 00924 80ACA844 961803FC */ lhu $t8, 0x03FC($s0) ## 000003FC -.L80ACA848: -/* 00928 80ACA848 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0092C 80ACA84C 3319FFFD */ andi $t9, $t8, 0xFFFD ## $t9 = 00000000 -/* 00930 80ACA850 0C2B29C7 */ jal func_80ACA71C -/* 00934 80ACA854 A61903FC */ sh $t9, 0x03FC($s0) ## 000003FC -/* 00938 80ACA858 3C0880AD */ lui $t0, %hi(func_80ACA690) ## $t0 = 80AD0000 -/* 0093C 80ACA85C 2508A690 */ addiu $t0, $t0, %lo(func_80ACA690) ## $t0 = 80ACA690 -/* 00940 80ACA860 AE08040C */ sw $t0, 0x040C($s0) ## 0000040C -/* 00944 80ACA864 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 -.L80ACA868: -/* 00948 80ACA868 3C01FFFE */ lui $at, 0xFFFE ## $at = FFFE0000 -/* 0094C 80ACA86C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFEFFFF -/* 00950 80ACA870 01215024 */ and $t2, $t1, $at -/* 00954 80ACA874 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 -.L80ACA878: -/* 00958 80ACA878 8FBF001C */ lw $ra, 0x001C($sp) -/* 0095C 80ACA87C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00960 80ACA880 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00964 80ACA884 03E00008 */ jr $ra -/* 00968 80ACA888 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA88C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA88C.s deleted file mode 100644 index 4635d5f746..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA88C.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80ACA88C -/* 0096C 80ACA88C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00970 80ACA890 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00974 80ACA894 AFA40018 */ sw $a0, 0x0018($sp) -/* 00978 80ACA898 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 0097C 80ACA89C 0C042F6F */ jal func_8010BDBC -/* 00980 80ACA8A0 AFA5001C */ sw $a1, 0x001C($sp) -/* 00984 80ACA8A4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00988 80ACA8A8 1441001B */ bne $v0, $at, .L80ACA918 -/* 0098C 80ACA8AC 8FA6001C */ lw $a2, 0x001C($sp) -/* 00990 80ACA8B0 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00994 80ACA8B4 0C041AF2 */ jal func_80106BC8 -/* 00998 80ACA8B8 AFA6001C */ sw $a2, 0x001C($sp) -/* 0099C 80ACA8BC 10400016 */ beq $v0, $zero, .L80ACA918 -/* 009A0 80ACA8C0 8FA6001C */ lw $a2, 0x001C($sp) -/* 009A4 80ACA8C4 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 009A8 80ACA8C8 00461021 */ addu $v0, $v0, $a2 -/* 009AC 80ACA8CC 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 009B0 80ACA8D0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 009B4 80ACA8D4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 009B8 80ACA8D8 10400005 */ beq $v0, $zero, .L80ACA8F0 -/* 009BC 80ACA8DC 00000000 */ nop -/* 009C0 80ACA8E0 10410007 */ beq $v0, $at, .L80ACA900 -/* 009C4 80ACA8E4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 009C8 80ACA8E8 1000000C */ beq $zero, $zero, .L80ACA91C -/* 009CC 80ACA8EC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ACA8F0: -/* 009D0 80ACA8F0 0C042DC8 */ jal func_8010B720 -/* 009D4 80ACA8F4 24052065 */ addiu $a1, $zero, 0x2065 ## $a1 = 00002065 -/* 009D8 80ACA8F8 10000008 */ beq $zero, $zero, .L80ACA91C -/* 009DC 80ACA8FC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ACA900: -/* 009E0 80ACA900 0C042DC8 */ jal func_8010B720 -/* 009E4 80ACA904 24052067 */ addiu $a1, $zero, 0x2067 ## $a1 = 00002067 -/* 009E8 80ACA908 8FAF0018 */ lw $t7, 0x0018($sp) -/* 009EC 80ACA90C 3C0E80AD */ lui $t6, %hi(func_80ACA76C) ## $t6 = 80AD0000 -/* 009F0 80ACA910 25CEA76C */ addiu $t6, $t6, %lo(func_80ACA76C) ## $t6 = 80ACA76C -/* 009F4 80ACA914 ADEE040C */ sw $t6, 0x040C($t7) ## 0000040C -.L80ACA918: -/* 009F8 80ACA918 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ACA91C: -/* 009FC 80ACA91C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A00 80ACA920 03E00008 */ jr $ra -/* 00A04 80ACA924 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA928.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA928.s deleted file mode 100644 index 44d204f00d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA928.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80ACA928 -/* 00A08 80ACA928 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00A0C 80ACA92C AFBF001C */ sw $ra, 0x001C($sp) -/* 00A10 80ACA930 AFA40020 */ sw $a0, 0x0020($sp) -/* 00A14 80ACA934 0C2B28EE */ jal func_80ACA3B8 -/* 00A18 80ACA938 AFA50024 */ sw $a1, 0x0024($sp) -/* 00A1C 80ACA93C 8FA40020 */ lw $a0, 0x0020($sp) -/* 00A20 80ACA940 8FA50024 */ lw $a1, 0x0024($sp) -/* 00A24 80ACA944 24062064 */ addiu $a2, $zero, 0x2064 ## $a2 = 00002064 -/* 00A28 80ACA948 3C0743B4 */ lui $a3, 0x43B4 ## $a3 = 43B40000 -/* 00A2C 80ACA94C 0C2B28FD */ jal func_80ACA3F4 -/* 00A30 80ACA950 AFA00010 */ sw $zero, 0x0010($sp) -/* 00A34 80ACA954 5040000D */ beql $v0, $zero, .L80ACA98C -/* 00A38 80ACA958 8FBF001C */ lw $ra, 0x001C($sp) -/* 00A3C 80ACA95C 0C03D719 */ jal func_800F5C64 -/* 00A40 80ACA960 2404005A */ addiu $a0, $zero, 0x005A ## $a0 = 0000005A -/* 00A44 80ACA964 8FAF0020 */ lw $t7, 0x0020($sp) -/* 00A48 80ACA968 3C0E80AD */ lui $t6, %hi(func_80ACA88C) ## $t6 = 80AD0000 -/* 00A4C 80ACA96C 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00A50 80ACA970 25CEA88C */ addiu $t6, $t6, %lo(func_80ACA88C) ## $t6 = 80ACA88C -/* 00A54 80ACA974 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00A58 80ACA978 ADEE040C */ sw $t6, 0x040C($t7) ## 0000040C -/* 00A5C 80ACA97C 94580EE0 */ lhu $t8, 0x0EE0($v0) ## 8015F540 -/* 00A60 80ACA980 37198000 */ ori $t9, $t8, 0x8000 ## $t9 = 00008000 -/* 00A64 80ACA984 A4590EE0 */ sh $t9, 0x0EE0($v0) ## 8015F540 -/* 00A68 80ACA988 8FBF001C */ lw $ra, 0x001C($sp) -.L80ACA98C: -/* 00A6C 80ACA98C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00A70 80ACA990 03E00008 */ jr $ra -/* 00A74 80ACA994 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA998.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA998.s deleted file mode 100644 index b753c467d4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA998.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_80ACA998 -/* 00A78 80ACA998 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00A7C 80ACA99C AFB00018 */ sw $s0, 0x0018($sp) -/* 00A80 80ACA9A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A84 80ACA9A4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00A88 80ACA9A8 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 00A8C 80ACA9AC 0C042F6F */ jal func_8010BDBC -/* 00A90 80ACA9B0 AFA50024 */ sw $a1, 0x0024($sp) -/* 00A94 80ACA9B4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00A98 80ACA9B8 14410021 */ bne $v0, $at, .L80ACAA40 -/* 00A9C 80ACA9BC 8FA60024 */ lw $a2, 0x0024($sp) -/* 00AA0 80ACA9C0 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00AA4 80ACA9C4 0C041AF2 */ jal func_80106BC8 -/* 00AA8 80ACA9C8 AFA60024 */ sw $a2, 0x0024($sp) -/* 00AAC 80ACA9CC 1040001C */ beq $v0, $zero, .L80ACAA40 -/* 00AB0 80ACA9D0 8FA60024 */ lw $a2, 0x0024($sp) -/* 00AB4 80ACA9D4 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 00AB8 80ACA9D8 00461021 */ addu $v0, $v0, $a2 -/* 00ABC 80ACA9DC 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 00AC0 80ACA9E0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00AC4 80ACA9E4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00AC8 80ACA9E8 10400005 */ beq $v0, $zero, .L80ACAA00 -/* 00ACC 80ACA9EC 00000000 */ nop -/* 00AD0 80ACA9F0 10410009 */ beq $v0, $at, .L80ACAA18 -/* 00AD4 80ACA9F4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00AD8 80ACA9F8 1000000D */ beq $zero, $zero, .L80ACAA30 -/* 00ADC 80ACA9FC 961803FC */ lhu $t8, 0x03FC($s0) ## 000003FC -.L80ACAA00: -/* 00AE0 80ACAA00 0C042DC8 */ jal func_8010B720 -/* 00AE4 80ACAA04 24052069 */ addiu $a1, $zero, 0x2069 ## $a1 = 00002069 -/* 00AE8 80ACAA08 3C0E80AD */ lui $t6, %hi(func_80ACAA54) ## $t6 = 80AD0000 -/* 00AEC 80ACAA0C 25CEAA54 */ addiu $t6, $t6, %lo(func_80ACAA54) ## $t6 = 80ACAA54 -/* 00AF0 80ACAA10 10000006 */ beq $zero, $zero, .L80ACAA2C -/* 00AF4 80ACAA14 AE0E040C */ sw $t6, 0x040C($s0) ## 0000040C -.L80ACAA18: -/* 00AF8 80ACAA18 0C042DC8 */ jal func_8010B720 -/* 00AFC 80ACAA1C 2405206B */ addiu $a1, $zero, 0x206B ## $a1 = 0000206B -/* 00B00 80ACAA20 3C0F80AD */ lui $t7, %hi(func_80ACA7E0) ## $t7 = 80AD0000 -/* 00B04 80ACAA24 25EFA7E0 */ addiu $t7, $t7, %lo(func_80ACA7E0) ## $t7 = 80ACA7E0 -/* 00B08 80ACAA28 AE0F040C */ sw $t7, 0x040C($s0) ## 0000040C -.L80ACAA2C: -/* 00B0C 80ACAA2C 961803FC */ lhu $t8, 0x03FC($s0) ## 000003FC -.L80ACAA30: -/* 00B10 80ACAA30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B14 80ACAA34 3319FFFD */ andi $t9, $t8, 0xFFFD ## $t9 = 00000000 -/* 00B18 80ACAA38 0C2B29C7 */ jal func_80ACA71C -/* 00B1C 80ACAA3C A61903FC */ sh $t9, 0x03FC($s0) ## 000003FC -.L80ACAA40: -/* 00B20 80ACAA40 8FBF001C */ lw $ra, 0x001C($sp) -/* 00B24 80ACAA44 8FB00018 */ lw $s0, 0x0018($sp) -/* 00B28 80ACAA48 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00B2C 80ACAA4C 03E00008 */ jr $ra -/* 00B30 80ACAA50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAA54.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAA54.s deleted file mode 100644 index a13ad79c4c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAA54.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80ACAA54 -/* 00B34 80ACAA54 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B38 80ACAA58 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B3C 80ACAA5C AFA40018 */ sw $a0, 0x0018($sp) -/* 00B40 80ACAA60 AFA5001C */ sw $a1, 0x001C($sp) -/* 00B44 80ACAA64 0C042F6F */ jal func_8010BDBC -/* 00B48 80ACAA68 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 00B4C 80ACAA6C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00B50 80ACAA70 54410010 */ bnel $v0, $at, .L80ACAAB4 -/* 00B54 80ACAA74 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B58 80ACAA78 0C041AF2 */ jal func_80106BC8 -/* 00B5C 80ACAA7C 8FA4001C */ lw $a0, 0x001C($sp) -/* 00B60 80ACAA80 1040000B */ beq $v0, $zero, .L80ACAAB0 -/* 00B64 80ACAA84 8FA4001C */ lw $a0, 0x001C($sp) -/* 00B68 80ACAA88 0C042DC8 */ jal func_8010B720 -/* 00B6C 80ACAA8C 2405206A */ addiu $a1, $zero, 0x206A ## $a1 = 0000206A -/* 00B70 80ACAA90 8FA40018 */ lw $a0, 0x0018($sp) -/* 00B74 80ACAA94 3C0E80AD */ lui $t6, %hi(func_80ACA998) ## $t6 = 80AD0000 -/* 00B78 80ACAA98 25CEA998 */ addiu $t6, $t6, %lo(func_80ACA998) ## $t6 = 80ACA998 -/* 00B7C 80ACAA9C 948F03FC */ lhu $t7, 0x03FC($a0) ## 000003FC -/* 00B80 80ACAAA0 AC8E040C */ sw $t6, 0x040C($a0) ## 0000040C -/* 00B84 80ACAAA4 35F80002 */ ori $t8, $t7, 0x0002 ## $t8 = 00000002 -/* 00B88 80ACAAA8 0C2B29C7 */ jal func_80ACA71C -/* 00B8C 80ACAAAC A49803FC */ sh $t8, 0x03FC($a0) ## 000003FC -.L80ACAAB0: -/* 00B90 80ACAAB0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ACAAB4: -/* 00B94 80ACAAB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B98 80ACAAB8 03E00008 */ jr $ra -/* 00B9C 80ACAABC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAAC0.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAAC0.s deleted file mode 100644 index 79802af1c9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAAC0.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80ACAAC0 -/* 00BA0 80ACAAC0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00BA4 80ACAAC4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00BA8 80ACAAC8 AFA40018 */ sw $a0, 0x0018($sp) -/* 00BAC 80ACAACC AFA5001C */ sw $a1, 0x001C($sp) -/* 00BB0 80ACAAD0 0C042F6F */ jal func_8010BDBC -/* 00BB4 80ACAAD4 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 00BB8 80ACAAD8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00BBC 80ACAADC 54410010 */ bnel $v0, $at, .L80ACAB20 -/* 00BC0 80ACAAE0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00BC4 80ACAAE4 0C041AF2 */ jal func_80106BC8 -/* 00BC8 80ACAAE8 8FA4001C */ lw $a0, 0x001C($sp) -/* 00BCC 80ACAAEC 1040000B */ beq $v0, $zero, .L80ACAB1C -/* 00BD0 80ACAAF0 8FA4001C */ lw $a0, 0x001C($sp) -/* 00BD4 80ACAAF4 0C042DC8 */ jal func_8010B720 -/* 00BD8 80ACAAF8 24052069 */ addiu $a1, $zero, 0x2069 ## $a1 = 00002069 -/* 00BDC 80ACAAFC 8FA40018 */ lw $a0, 0x0018($sp) -/* 00BE0 80ACAB00 3C0E80AD */ lui $t6, %hi(func_80ACAA54) ## $t6 = 80AD0000 -/* 00BE4 80ACAB04 25CEAA54 */ addiu $t6, $t6, %lo(func_80ACAA54) ## $t6 = 80ACAA54 -/* 00BE8 80ACAB08 948F03FC */ lhu $t7, 0x03FC($a0) ## 000003FC -/* 00BEC 80ACAB0C AC8E040C */ sw $t6, 0x040C($a0) ## 0000040C -/* 00BF0 80ACAB10 31F8FFFD */ andi $t8, $t7, 0xFFFD ## $t8 = 00000000 -/* 00BF4 80ACAB14 0C2B29C7 */ jal func_80ACA71C -/* 00BF8 80ACAB18 A49803FC */ sh $t8, 0x03FC($a0) ## 000003FC -.L80ACAB1C: -/* 00BFC 80ACAB1C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ACAB20: -/* 00C00 80ACAB20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C04 80ACAB24 03E00008 */ jr $ra -/* 00C08 80ACAB28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAB2C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAB2C.s deleted file mode 100644 index ae392ab0a0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAB2C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80ACAB2C -/* 00C0C 80ACAB2C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00C10 80ACAB30 AFBF001C */ sw $ra, 0x001C($sp) -/* 00C14 80ACAB34 AFA40020 */ sw $a0, 0x0020($sp) -/* 00C18 80ACAB38 0C2B28EE */ jal func_80ACA3B8 -/* 00C1C 80ACAB3C AFA50024 */ sw $a1, 0x0024($sp) -/* 00C20 80ACAB40 8FA40020 */ lw $a0, 0x0020($sp) -/* 00C24 80ACAB44 8FA50024 */ lw $a1, 0x0024($sp) -/* 00C28 80ACAB48 24062068 */ addiu $a2, $zero, 0x2068 ## $a2 = 00002068 -/* 00C2C 80ACAB4C 3C074407 */ lui $a3, 0x4407 ## $a3 = 44070000 -/* 00C30 80ACAB50 0C2B28FD */ jal func_80ACA3F4 -/* 00C34 80ACAB54 AFA00010 */ sw $zero, 0x0010($sp) -/* 00C38 80ACAB58 50400008 */ beql $v0, $zero, .L80ACAB7C -/* 00C3C 80ACAB5C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00C40 80ACAB60 0C03D719 */ jal func_800F5C64 -/* 00C44 80ACAB64 2404005A */ addiu $a0, $zero, 0x005A ## $a0 = 0000005A -/* 00C48 80ACAB68 8FAF0020 */ lw $t7, 0x0020($sp) -/* 00C4C 80ACAB6C 3C0E80AD */ lui $t6, %hi(func_80ACAAC0) ## $t6 = 80AD0000 -/* 00C50 80ACAB70 25CEAAC0 */ addiu $t6, $t6, %lo(func_80ACAAC0) ## $t6 = 80ACAAC0 -/* 00C54 80ACAB74 ADEE040C */ sw $t6, 0x040C($t7) ## 0000040C -/* 00C58 80ACAB78 8FBF001C */ lw $ra, 0x001C($sp) -.L80ACAB7C: -/* 00C5C 80ACAB7C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00C60 80ACAB80 03E00008 */ jr $ra -/* 00C64 80ACAB84 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAB88.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAB88.s deleted file mode 100644 index 9e13f2febe..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAB88.s +++ /dev/null @@ -1,65 +0,0 @@ -glabel func_80ACAB88 -/* 00C68 80ACAB88 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00C6C 80ACAB8C AFB00018 */ sw $s0, 0x0018($sp) -/* 00C70 80ACAB90 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C74 80ACAB94 AFBF001C */ sw $ra, 0x001C($sp) -/* 00C78 80ACAB98 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 00C7C 80ACAB9C 0C042F6F */ jal func_8010BDBC -/* 00C80 80ACABA0 AFA50024 */ sw $a1, 0x0024($sp) -/* 00C84 80ACABA4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00C88 80ACABA8 1441002B */ bne $v0, $at, .L80ACAC58 -/* 00C8C 80ACABAC 8FA60024 */ lw $a2, 0x0024($sp) -/* 00C90 80ACABB0 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00C94 80ACABB4 0C041AF2 */ jal func_80106BC8 -/* 00C98 80ACABB8 AFA60024 */ sw $a2, 0x0024($sp) -/* 00C9C 80ACABBC 10400026 */ beq $v0, $zero, .L80ACAC58 -/* 00CA0 80ACABC0 8FA60024 */ lw $a2, 0x0024($sp) -/* 00CA4 80ACABC4 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 00CA8 80ACABC8 00461021 */ addu $v0, $v0, $a2 -/* 00CAC 80ACABCC 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 00CB0 80ACABD0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00CB4 80ACABD4 3C0E8016 */ lui $t6, %hi(gSaveContext+0xedc) -/* 00CB8 80ACABD8 10400005 */ beq $v0, $zero, .L80ACABF0 -/* 00CBC 80ACABDC 00000000 */ nop -/* 00CC0 80ACABE0 10410013 */ beq $v0, $at, .L80ACAC30 -/* 00CC4 80ACABE4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00CC8 80ACABE8 10000017 */ beq $zero, $zero, .L80ACAC48 -/* 00CCC 80ACABEC 960803FC */ lhu $t0, 0x03FC($s0) ## 000003FC -.L80ACABF0: -/* 00CD0 80ACABF0 95CEF53C */ lhu $t6, %lo(gSaveContext+0xedc)($t6) -/* 00CD4 80ACABF4 2405206D */ addiu $a1, $zero, 0x206D ## $a1 = 0000206D -/* 00CD8 80ACABF8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00CDC 80ACABFC 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 00CE0 80ACAC00 11E00005 */ beq $t7, $zero, .L80ACAC18 -/* 00CE4 80ACAC04 00000000 */ nop -/* 00CE8 80ACAC08 0C042DC8 */ jal func_8010B720 -/* 00CEC 80ACAC0C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00CF0 80ACAC10 10000003 */ beq $zero, $zero, .L80ACAC20 -/* 00CF4 80ACAC14 00000000 */ nop -.L80ACAC18: -/* 00CF8 80ACAC18 0C042DC8 */ jal func_8010B720 -/* 00CFC 80ACAC1C 2405206C */ addiu $a1, $zero, 0x206C ## $a1 = 0000206C -.L80ACAC20: -/* 00D00 80ACAC20 3C1880AD */ lui $t8, %hi(func_80ACAC6C) ## $t8 = 80AD0000 -/* 00D04 80ACAC24 2718AC6C */ addiu $t8, $t8, %lo(func_80ACAC6C) ## $t8 = 80ACAC6C -/* 00D08 80ACAC28 10000006 */ beq $zero, $zero, .L80ACAC44 -/* 00D0C 80ACAC2C AE18040C */ sw $t8, 0x040C($s0) ## 0000040C -.L80ACAC30: -/* 00D10 80ACAC30 0C042DC8 */ jal func_8010B720 -/* 00D14 80ACAC34 2405206E */ addiu $a1, $zero, 0x206E ## $a1 = 0000206E -/* 00D18 80ACAC38 3C1980AD */ lui $t9, %hi(func_80ACA7E0) ## $t9 = 80AD0000 -/* 00D1C 80ACAC3C 2739A7E0 */ addiu $t9, $t9, %lo(func_80ACA7E0) ## $t9 = 80ACA7E0 -/* 00D20 80ACAC40 AE19040C */ sw $t9, 0x040C($s0) ## 0000040C -.L80ACAC44: -/* 00D24 80ACAC44 960803FC */ lhu $t0, 0x03FC($s0) ## 000003FC -.L80ACAC48: -/* 00D28 80ACAC48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D2C 80ACAC4C 3109FFFD */ andi $t1, $t0, 0xFFFD ## $t1 = 00000000 -/* 00D30 80ACAC50 0C2B29C7 */ jal func_80ACA71C -/* 00D34 80ACAC54 A60903FC */ sh $t1, 0x03FC($s0) ## 000003FC -.L80ACAC58: -/* 00D38 80ACAC58 8FBF001C */ lw $ra, 0x001C($sp) -/* 00D3C 80ACAC5C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00D40 80ACAC60 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00D44 80ACAC64 03E00008 */ jr $ra -/* 00D48 80ACAC68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAC6C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAC6C.s deleted file mode 100644 index 2774b0d638..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAC6C.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80ACAC6C -/* 00D4C 80ACAC6C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00D50 80ACAC70 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00D54 80ACAC74 AFA40018 */ sw $a0, 0x0018($sp) -/* 00D58 80ACAC78 AFA5001C */ sw $a1, 0x001C($sp) -/* 00D5C 80ACAC7C 0C042F6F */ jal func_8010BDBC -/* 00D60 80ACAC80 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 00D64 80ACAC84 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00D68 80ACAC88 54410010 */ bnel $v0, $at, .L80ACACCC -/* 00D6C 80ACAC8C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00D70 80ACAC90 0C041AF2 */ jal func_80106BC8 -/* 00D74 80ACAC94 8FA4001C */ lw $a0, 0x001C($sp) -/* 00D78 80ACAC98 1040000B */ beq $v0, $zero, .L80ACACC8 -/* 00D7C 80ACAC9C 8FA4001C */ lw $a0, 0x001C($sp) -/* 00D80 80ACACA0 0C042DC8 */ jal func_8010B720 -/* 00D84 80ACACA4 2405206A */ addiu $a1, $zero, 0x206A ## $a1 = 0000206A -/* 00D88 80ACACA8 8FA40018 */ lw $a0, 0x0018($sp) -/* 00D8C 80ACACAC 3C0E80AD */ lui $t6, %hi(func_80ACAB88) ## $t6 = 80AD0000 -/* 00D90 80ACACB0 25CEAB88 */ addiu $t6, $t6, %lo(func_80ACAB88) ## $t6 = 80ACAB88 -/* 00D94 80ACACB4 948F03FC */ lhu $t7, 0x03FC($a0) ## 000003FC -/* 00D98 80ACACB8 AC8E040C */ sw $t6, 0x040C($a0) ## 0000040C -/* 00D9C 80ACACBC 35F80002 */ ori $t8, $t7, 0x0002 ## $t8 = 00000002 -/* 00DA0 80ACACC0 0C2B29C7 */ jal func_80ACA71C -/* 00DA4 80ACACC4 A49803FC */ sh $t8, 0x03FC($a0) ## 000003FC -.L80ACACC8: -/* 00DA8 80ACACC8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ACACCC: -/* 00DAC 80ACACCC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00DB0 80ACACD0 03E00008 */ jr $ra -/* 00DB4 80ACACD4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACACD8.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACACD8.s deleted file mode 100644 index b6ca7fbd09..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACACD8.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80ACACD8 -/* 00DB8 80ACACD8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00DBC 80ACACDC AFBF001C */ sw $ra, 0x001C($sp) -/* 00DC0 80ACACE0 AFA40020 */ sw $a0, 0x0020($sp) -/* 00DC4 80ACACE4 0C2B28EE */ jal func_80ACA3B8 -/* 00DC8 80ACACE8 AFA50024 */ sw $a1, 0x0024($sp) -/* 00DCC 80ACACEC 8FA40020 */ lw $a0, 0x0020($sp) -/* 00DD0 80ACACF0 8FA50024 */ lw $a1, 0x0024($sp) -/* 00DD4 80ACACF4 2406206C */ addiu $a2, $zero, 0x206C ## $a2 = 0000206C -/* 00DD8 80ACACF8 3C0743F0 */ lui $a3, 0x43F0 ## $a3 = 43F00000 -/* 00DDC 80ACACFC 0C2B28FD */ jal func_80ACA3F4 -/* 00DE0 80ACAD00 AFA00010 */ sw $zero, 0x0010($sp) -/* 00DE4 80ACAD04 50400008 */ beql $v0, $zero, .L80ACAD28 -/* 00DE8 80ACAD08 8FBF001C */ lw $ra, 0x001C($sp) -/* 00DEC 80ACAD0C 0C03D719 */ jal func_800F5C64 -/* 00DF0 80ACAD10 2404005A */ addiu $a0, $zero, 0x005A ## $a0 = 0000005A -/* 00DF4 80ACAD14 8FAF0020 */ lw $t7, 0x0020($sp) -/* 00DF8 80ACAD18 3C0E80AD */ lui $t6, %hi(func_80ACAC6C) ## $t6 = 80AD0000 -/* 00DFC 80ACAD1C 25CEAC6C */ addiu $t6, $t6, %lo(func_80ACAC6C) ## $t6 = 80ACAC6C -/* 00E00 80ACAD20 ADEE040C */ sw $t6, 0x040C($t7) ## 0000040C -/* 00E04 80ACAD24 8FBF001C */ lw $ra, 0x001C($sp) -.L80ACAD28: -/* 00E08 80ACAD28 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00E0C 80ACAD2C 03E00008 */ jr $ra -/* 00E10 80ACAD30 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAD34.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAD34.s deleted file mode 100644 index 7fc976cac3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAD34.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_80ACAD34 -/* 00E14 80ACAD34 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00E18 80ACAD38 AFB00018 */ sw $s0, 0x0018($sp) -/* 00E1C 80ACAD3C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E20 80ACAD40 AFBF001C */ sw $ra, 0x001C($sp) -/* 00E24 80ACAD44 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 00E28 80ACAD48 0C042F6F */ jal func_8010BDBC -/* 00E2C 80ACAD4C AFA50024 */ sw $a1, 0x0024($sp) -/* 00E30 80ACAD50 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00E34 80ACAD54 14410021 */ bne $v0, $at, .L80ACADDC -/* 00E38 80ACAD58 8FA60024 */ lw $a2, 0x0024($sp) -/* 00E3C 80ACAD5C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00E40 80ACAD60 0C041AF2 */ jal func_80106BC8 -/* 00E44 80ACAD64 AFA60024 */ sw $a2, 0x0024($sp) -/* 00E48 80ACAD68 1040001C */ beq $v0, $zero, .L80ACADDC -/* 00E4C 80ACAD6C 8FA60024 */ lw $a2, 0x0024($sp) -/* 00E50 80ACAD70 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 00E54 80ACAD74 00461021 */ addu $v0, $v0, $a2 -/* 00E58 80ACAD78 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 00E5C 80ACAD7C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00E60 80ACAD80 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00E64 80ACAD84 10400005 */ beq $v0, $zero, .L80ACAD9C -/* 00E68 80ACAD88 00000000 */ nop -/* 00E6C 80ACAD8C 10410009 */ beq $v0, $at, .L80ACADB4 -/* 00E70 80ACAD90 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00E74 80ACAD94 1000000D */ beq $zero, $zero, .L80ACADCC -/* 00E78 80ACAD98 961803FC */ lhu $t8, 0x03FC($s0) ## 000003FC -.L80ACAD9C: -/* 00E7C 80ACAD9C 0C042DC8 */ jal func_8010B720 -/* 00E80 80ACADA0 2405206F */ addiu $a1, $zero, 0x206F ## $a1 = 0000206F -/* 00E84 80ACADA4 3C0E80AD */ lui $t6, %hi(func_80ACADF0) ## $t6 = 80AD0000 -/* 00E88 80ACADA8 25CEADF0 */ addiu $t6, $t6, %lo(func_80ACADF0) ## $t6 = 80ACADF0 -/* 00E8C 80ACADAC 10000006 */ beq $zero, $zero, .L80ACADC8 -/* 00E90 80ACADB0 AE0E040C */ sw $t6, 0x040C($s0) ## 0000040C -.L80ACADB4: -/* 00E94 80ACADB4 0C042DC8 */ jal func_8010B720 -/* 00E98 80ACADB8 24052070 */ addiu $a1, $zero, 0x2070 ## $a1 = 00002070 -/* 00E9C 80ACADBC 3C0F80AD */ lui $t7, %hi(func_80ACA7E0) ## $t7 = 80AD0000 -/* 00EA0 80ACADC0 25EFA7E0 */ addiu $t7, $t7, %lo(func_80ACA7E0) ## $t7 = 80ACA7E0 -/* 00EA4 80ACADC4 AE0F040C */ sw $t7, 0x040C($s0) ## 0000040C -.L80ACADC8: -/* 00EA8 80ACADC8 961803FC */ lhu $t8, 0x03FC($s0) ## 000003FC -.L80ACADCC: -/* 00EAC 80ACADCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00EB0 80ACADD0 3319FFFD */ andi $t9, $t8, 0xFFFD ## $t9 = 00000000 -/* 00EB4 80ACADD4 0C2B29C7 */ jal func_80ACA71C -/* 00EB8 80ACADD8 A61903FC */ sh $t9, 0x03FC($s0) ## 000003FC -.L80ACADDC: -/* 00EBC 80ACADDC 8FBF001C */ lw $ra, 0x001C($sp) -/* 00EC0 80ACADE0 8FB00018 */ lw $s0, 0x0018($sp) -/* 00EC4 80ACADE4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00EC8 80ACADE8 03E00008 */ jr $ra -/* 00ECC 80ACADEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACADF0.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACADF0.s deleted file mode 100644 index b8697c3747..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACADF0.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80ACADF0 -/* 00ED0 80ACADF0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00ED4 80ACADF4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00ED8 80ACADF8 AFA40018 */ sw $a0, 0x0018($sp) -/* 00EDC 80ACADFC AFA5001C */ sw $a1, 0x001C($sp) -/* 00EE0 80ACAE00 0C042F6F */ jal func_8010BDBC -/* 00EE4 80ACAE04 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 00EE8 80ACAE08 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00EEC 80ACAE0C 54410010 */ bnel $v0, $at, .L80ACAE50 -/* 00EF0 80ACAE10 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00EF4 80ACAE14 0C041AF2 */ jal func_80106BC8 -/* 00EF8 80ACAE18 8FA4001C */ lw $a0, 0x001C($sp) -/* 00EFC 80ACAE1C 1040000B */ beq $v0, $zero, .L80ACAE4C -/* 00F00 80ACAE20 8FA4001C */ lw $a0, 0x001C($sp) -/* 00F04 80ACAE24 0C042DC8 */ jal func_8010B720 -/* 00F08 80ACAE28 2405206A */ addiu $a1, $zero, 0x206A ## $a1 = 0000206A -/* 00F0C 80ACAE2C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00F10 80ACAE30 3C0E80AD */ lui $t6, %hi(func_80ACAD34) ## $t6 = 80AD0000 -/* 00F14 80ACAE34 25CEAD34 */ addiu $t6, $t6, %lo(func_80ACAD34) ## $t6 = 80ACAD34 -/* 00F18 80ACAE38 948F03FC */ lhu $t7, 0x03FC($a0) ## 000003FC -/* 00F1C 80ACAE3C AC8E040C */ sw $t6, 0x040C($a0) ## 0000040C -/* 00F20 80ACAE40 35F80002 */ ori $t8, $t7, 0x0002 ## $t8 = 00000002 -/* 00F24 80ACAE44 0C2B29C7 */ jal func_80ACA71C -/* 00F28 80ACAE48 A49803FC */ sh $t8, 0x03FC($a0) ## 000003FC -.L80ACAE4C: -/* 00F2C 80ACAE4C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ACAE50: -/* 00F30 80ACAE50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00F34 80ACAE54 03E00008 */ jr $ra -/* 00F38 80ACAE58 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAE5C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAE5C.s deleted file mode 100644 index 57ba8f96b9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAE5C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80ACAE5C -/* 00F3C 80ACAE5C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00F40 80ACAE60 AFBF001C */ sw $ra, 0x001C($sp) -/* 00F44 80ACAE64 AFA40020 */ sw $a0, 0x0020($sp) -/* 00F48 80ACAE68 0C2B28EE */ jal func_80ACA3B8 -/* 00F4C 80ACAE6C AFA50024 */ sw $a1, 0x0024($sp) -/* 00F50 80ACAE70 8FA40020 */ lw $a0, 0x0020($sp) -/* 00F54 80ACAE74 8FA50024 */ lw $a1, 0x0024($sp) -/* 00F58 80ACAE78 2406206F */ addiu $a2, $zero, 0x206F ## $a2 = 0000206F -/* 00F5C 80ACAE7C 3C0743B4 */ lui $a3, 0x43B4 ## $a3 = 43B40000 -/* 00F60 80ACAE80 0C2B28FD */ jal func_80ACA3F4 -/* 00F64 80ACAE84 AFA00010 */ sw $zero, 0x0010($sp) -/* 00F68 80ACAE88 50400008 */ beql $v0, $zero, .L80ACAEAC -/* 00F6C 80ACAE8C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00F70 80ACAE90 0C03D719 */ jal func_800F5C64 -/* 00F74 80ACAE94 2404005A */ addiu $a0, $zero, 0x005A ## $a0 = 0000005A -/* 00F78 80ACAE98 8FAF0020 */ lw $t7, 0x0020($sp) -/* 00F7C 80ACAE9C 3C0E80AD */ lui $t6, %hi(func_80ACADF0) ## $t6 = 80AD0000 -/* 00F80 80ACAEA0 25CEADF0 */ addiu $t6, $t6, %lo(func_80ACADF0) ## $t6 = 80ACADF0 -/* 00F84 80ACAEA4 ADEE040C */ sw $t6, 0x040C($t7) ## 0000040C -/* 00F88 80ACAEA8 8FBF001C */ lw $ra, 0x001C($sp) -.L80ACAEAC: -/* 00F8C 80ACAEAC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00F90 80ACAEB0 03E00008 */ jr $ra -/* 00F94 80ACAEB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAEB8.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAEB8.s deleted file mode 100644 index 43667b0b02..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAEB8.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_80ACAEB8 -/* 00F98 80ACAEB8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00F9C 80ACAEBC AFB00018 */ sw $s0, 0x0018($sp) -/* 00FA0 80ACAEC0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00FA4 80ACAEC4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00FA8 80ACAEC8 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 00FAC 80ACAECC 0C042F6F */ jal func_8010BDBC -/* 00FB0 80ACAED0 AFA50024 */ sw $a1, 0x0024($sp) -/* 00FB4 80ACAED4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00FB8 80ACAED8 14410021 */ bne $v0, $at, .L80ACAF60 -/* 00FBC 80ACAEDC 8FA60024 */ lw $a2, 0x0024($sp) -/* 00FC0 80ACAEE0 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00FC4 80ACAEE4 0C041AF2 */ jal func_80106BC8 -/* 00FC8 80ACAEE8 AFA60024 */ sw $a2, 0x0024($sp) -/* 00FCC 80ACAEEC 1040001C */ beq $v0, $zero, .L80ACAF60 -/* 00FD0 80ACAEF0 8FA60024 */ lw $a2, 0x0024($sp) -/* 00FD4 80ACAEF4 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 00FD8 80ACAEF8 00461021 */ addu $v0, $v0, $a2 -/* 00FDC 80ACAEFC 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 00FE0 80ACAF00 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00FE4 80ACAF04 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00FE8 80ACAF08 10400005 */ beq $v0, $zero, .L80ACAF20 -/* 00FEC 80ACAF0C 00000000 */ nop -/* 00FF0 80ACAF10 10410009 */ beq $v0, $at, .L80ACAF38 -/* 00FF4 80ACAF14 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00FF8 80ACAF18 1000000D */ beq $zero, $zero, .L80ACAF50 -/* 00FFC 80ACAF1C 961803FC */ lhu $t8, 0x03FC($s0) ## 000003FC -.L80ACAF20: -/* 01000 80ACAF20 0C042DC8 */ jal func_8010B720 -/* 01004 80ACAF24 24052071 */ addiu $a1, $zero, 0x2071 ## $a1 = 00002071 -/* 01008 80ACAF28 3C0E80AD */ lui $t6, %hi(func_80ACAF74) ## $t6 = 80AD0000 -/* 0100C 80ACAF2C 25CEAF74 */ addiu $t6, $t6, %lo(func_80ACAF74) ## $t6 = 80ACAF74 -/* 01010 80ACAF30 10000006 */ beq $zero, $zero, .L80ACAF4C -/* 01014 80ACAF34 AE0E040C */ sw $t6, 0x040C($s0) ## 0000040C -.L80ACAF38: -/* 01018 80ACAF38 0C042DC8 */ jal func_8010B720 -/* 0101C 80ACAF3C 24052072 */ addiu $a1, $zero, 0x2072 ## $a1 = 00002072 -/* 01020 80ACAF40 3C0F80AD */ lui $t7, %hi(func_80ACA7E0) ## $t7 = 80AD0000 -/* 01024 80ACAF44 25EFA7E0 */ addiu $t7, $t7, %lo(func_80ACA7E0) ## $t7 = 80ACA7E0 -/* 01028 80ACAF48 AE0F040C */ sw $t7, 0x040C($s0) ## 0000040C -.L80ACAF4C: -/* 0102C 80ACAF4C 961803FC */ lhu $t8, 0x03FC($s0) ## 000003FC -.L80ACAF50: -/* 01030 80ACAF50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01034 80ACAF54 3319FFFD */ andi $t9, $t8, 0xFFFD ## $t9 = 00000000 -/* 01038 80ACAF58 0C2B29C7 */ jal func_80ACA71C -/* 0103C 80ACAF5C A61903FC */ sh $t9, 0x03FC($s0) ## 000003FC -.L80ACAF60: -/* 01040 80ACAF60 8FBF001C */ lw $ra, 0x001C($sp) -/* 01044 80ACAF64 8FB00018 */ lw $s0, 0x0018($sp) -/* 01048 80ACAF68 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0104C 80ACAF6C 03E00008 */ jr $ra -/* 01050 80ACAF70 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAF74.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAF74.s deleted file mode 100644 index ac546ec398..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAF74.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80ACAF74 -/* 01054 80ACAF74 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01058 80ACAF78 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0105C 80ACAF7C AFA40018 */ sw $a0, 0x0018($sp) -/* 01060 80ACAF80 AFA5001C */ sw $a1, 0x001C($sp) -/* 01064 80ACAF84 0C042F6F */ jal func_8010BDBC -/* 01068 80ACAF88 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 0106C 80ACAF8C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01070 80ACAF90 54410010 */ bnel $v0, $at, .L80ACAFD4 -/* 01074 80ACAF94 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01078 80ACAF98 0C041AF2 */ jal func_80106BC8 -/* 0107C 80ACAF9C 8FA4001C */ lw $a0, 0x001C($sp) -/* 01080 80ACAFA0 1040000B */ beq $v0, $zero, .L80ACAFD0 -/* 01084 80ACAFA4 8FA4001C */ lw $a0, 0x001C($sp) -/* 01088 80ACAFA8 0C042DC8 */ jal func_8010B720 -/* 0108C 80ACAFAC 2405206A */ addiu $a1, $zero, 0x206A ## $a1 = 0000206A -/* 01090 80ACAFB0 8FA40018 */ lw $a0, 0x0018($sp) -/* 01094 80ACAFB4 3C0E80AD */ lui $t6, %hi(func_80ACAEB8) ## $t6 = 80AD0000 -/* 01098 80ACAFB8 25CEAEB8 */ addiu $t6, $t6, %lo(func_80ACAEB8) ## $t6 = 80ACAEB8 -/* 0109C 80ACAFBC 948F03FC */ lhu $t7, 0x03FC($a0) ## 000003FC -/* 010A0 80ACAFC0 AC8E040C */ sw $t6, 0x040C($a0) ## 0000040C -/* 010A4 80ACAFC4 35F80002 */ ori $t8, $t7, 0x0002 ## $t8 = 00000002 -/* 010A8 80ACAFC8 0C2B29C7 */ jal func_80ACA71C -/* 010AC 80ACAFCC A49803FC */ sh $t8, 0x03FC($a0) ## 000003FC -.L80ACAFD0: -/* 010B0 80ACAFD0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ACAFD4: -/* 010B4 80ACAFD4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 010B8 80ACAFD8 03E00008 */ jr $ra -/* 010BC 80ACAFDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAFE0.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAFE0.s deleted file mode 100644 index a3b05b3566..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAFE0.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80ACAFE0 -/* 010C0 80ACAFE0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 010C4 80ACAFE4 AFBF001C */ sw $ra, 0x001C($sp) -/* 010C8 80ACAFE8 AFA40020 */ sw $a0, 0x0020($sp) -/* 010CC 80ACAFEC 0C2B28EE */ jal func_80ACA3B8 -/* 010D0 80ACAFF0 AFA50024 */ sw $a1, 0x0024($sp) -/* 010D4 80ACAFF4 8FA40020 */ lw $a0, 0x0020($sp) -/* 010D8 80ACAFF8 8FA50024 */ lw $a1, 0x0024($sp) -/* 010DC 80ACAFFC 24062071 */ addiu $a2, $zero, 0x2071 ## $a2 = 00002071 -/* 010E0 80ACB000 3C0743B4 */ lui $a3, 0x43B4 ## $a3 = 43B40000 -/* 010E4 80ACB004 0C2B28FD */ jal func_80ACA3F4 -/* 010E8 80ACB008 AFA00010 */ sw $zero, 0x0010($sp) -/* 010EC 80ACB00C 50400008 */ beql $v0, $zero, .L80ACB030 -/* 010F0 80ACB010 8FBF001C */ lw $ra, 0x001C($sp) -/* 010F4 80ACB014 0C03D719 */ jal func_800F5C64 -/* 010F8 80ACB018 2404005A */ addiu $a0, $zero, 0x005A ## $a0 = 0000005A -/* 010FC 80ACB01C 8FAF0020 */ lw $t7, 0x0020($sp) -/* 01100 80ACB020 3C0E80AD */ lui $t6, %hi(func_80ACAF74) ## $t6 = 80AD0000 -/* 01104 80ACB024 25CEAF74 */ addiu $t6, $t6, %lo(func_80ACAF74) ## $t6 = 80ACAF74 -/* 01108 80ACB028 ADEE040C */ sw $t6, 0x040C($t7) ## 0000040C -/* 0110C 80ACB02C 8FBF001C */ lw $ra, 0x001C($sp) -.L80ACB030: -/* 01110 80ACB030 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01114 80ACB034 03E00008 */ jr $ra -/* 01118 80ACB038 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB03C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB03C.s deleted file mode 100644 index 2253d447e6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB03C.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80ACB03C -/* 0111C 80ACB03C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01120 80ACB040 AFB00018 */ sw $s0, 0x0018($sp) -/* 01124 80ACB044 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01128 80ACB048 AFBF001C */ sw $ra, 0x001C($sp) -/* 0112C 80ACB04C AFA50024 */ sw $a1, 0x0024($sp) -/* 01130 80ACB050 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01134 80ACB054 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01138 80ACB058 0C00B7D5 */ jal func_8002DF54 -/* 0113C 80ACB05C 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 01140 80ACB060 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01144 80ACB064 0C00BCCD */ jal func_8002F334 -/* 01148 80ACB068 8FA50024 */ lw $a1, 0x0024($sp) -/* 0114C 80ACB06C 1040000B */ beq $v0, $zero, .L80ACB09C -/* 01150 80ACB070 3C041100 */ lui $a0, 0x1100 ## $a0 = 11000000 -/* 01154 80ACB074 0C03E803 */ jal Audio_SetBGM - -/* 01158 80ACB078 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 110000FF -/* 0115C 80ACB07C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01160 80ACB080 0C2B298B */ jal func_80ACA62C -/* 01164 80ACB084 8FA50024 */ lw $a1, 0x0024($sp) -/* 01168 80ACB088 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 0116C 80ACB08C 3C01FFFE */ lui $at, 0xFFFE ## $at = FFFE0000 -/* 01170 80ACB090 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFEFFFF -/* 01174 80ACB094 01C17824 */ and $t7, $t6, $at -/* 01178 80ACB098 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -.L80ACB09C: -/* 0117C 80ACB09C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01180 80ACB0A0 8FB00018 */ lw $s0, 0x0018($sp) -/* 01184 80ACB0A4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01188 80ACB0A8 03E00008 */ jr $ra -/* 0118C 80ACB0AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB0B0.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB0B0.s deleted file mode 100644 index c57b18776c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB0B0.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80ACB0B0 -/* 01190 80ACB0B0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01194 80ACB0B4 AFBF001C */ sw $ra, 0x001C($sp) -/* 01198 80ACB0B8 AFA40020 */ sw $a0, 0x0020($sp) -/* 0119C 80ACB0BC 0C2B28EE */ jal func_80ACA3B8 -/* 011A0 80ACB0C0 AFA50024 */ sw $a1, 0x0024($sp) -/* 011A4 80ACB0C4 3C038012 */ lui $v1, %hi(gBitFlags) -/* 011A8 80ACB0C8 24637120 */ addiu $v1, %lo(gBitFlags) -/* 011AC 80ACB0CC 3C028016 */ lui $v0, %hi(gSaveContext+0xa4) -/* 011B0 80ACB0D0 8C42E704 */ lw $v0, %lo(gSaveContext+0xa4)($v0) -/* 011B4 80ACB0D4 8C6E0038 */ lw $t6, 0x0038($v1) ## 80127158 -/* 011B8 80ACB0D8 8FA40020 */ lw $a0, 0x0020($sp) -/* 011BC 80ACB0DC 8FA50024 */ lw $a1, 0x0024($sp) -/* 011C0 80ACB0E0 01C27824 */ and $t7, $t6, $v0 -/* 011C4 80ACB0E4 11E00009 */ beq $t7, $zero, .L80ACB10C -/* 011C8 80ACB0E8 3C0743B4 */ lui $a3, 0x43B4 ## $a3 = 43B40000 -/* 011CC 80ACB0EC 8C780030 */ lw $t8, 0x0030($v1) ## 80127150 -/* 011D0 80ACB0F0 0302C824 */ and $t9, $t8, $v0 -/* 011D4 80ACB0F4 13200003 */ beq $t9, $zero, .L80ACB104 -/* 011D8 80ACB0F8 00000000 */ nop -/* 011DC 80ACB0FC 10000004 */ beq $zero, $zero, .L80ACB110 -/* 011E0 80ACB100 24064031 */ addiu $a2, $zero, 0x4031 ## $a2 = 00004031 -.L80ACB104: -/* 011E4 80ACB104 10000002 */ beq $zero, $zero, .L80ACB110 -/* 011E8 80ACB108 24064017 */ addiu $a2, $zero, 0x4017 ## $a2 = 00004017 -.L80ACB10C: -/* 011EC 80ACB10C 24064002 */ addiu $a2, $zero, 0x4002 ## $a2 = 00004002 -.L80ACB110: -/* 011F0 80ACB110 0C2B28FD */ jal func_80ACA3F4 -/* 011F4 80ACB114 AFA00010 */ sw $zero, 0x0010($sp) -/* 011F8 80ACB118 50400008 */ beql $v0, $zero, .L80ACB13C -/* 011FC 80ACB11C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01200 80ACB120 0C03D719 */ jal func_800F5C64 -/* 01204 80ACB124 2404005A */ addiu $a0, $zero, 0x005A ## $a0 = 0000005A -/* 01208 80ACB128 8FA90020 */ lw $t1, 0x0020($sp) -/* 0120C 80ACB12C 3C0880AD */ lui $t0, %hi(func_80ACB03C) ## $t0 = 80AD0000 -/* 01210 80ACB130 2508B03C */ addiu $t0, $t0, %lo(func_80ACB03C) ## $t0 = 80ACB03C -/* 01214 80ACB134 AD28040C */ sw $t0, 0x040C($t1) ## 0000040C -/* 01218 80ACB138 8FBF001C */ lw $ra, 0x001C($sp) -.L80ACB13C: -/* 0121C 80ACB13C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01220 80ACB140 03E00008 */ jr $ra -/* 01224 80ACB144 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB148.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB148.s deleted file mode 100644 index d034d97c8e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB148.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80ACB148 -/* 01228 80ACB148 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0122C 80ACB14C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01230 80ACB150 AFA40018 */ sw $a0, 0x0018($sp) -/* 01234 80ACB154 0C00BCCD */ jal func_8002F334 -/* 01238 80ACB158 AFA5001C */ sw $a1, 0x001C($sp) -/* 0123C 80ACB15C 1040000C */ beq $v0, $zero, .L80ACB190 -/* 01240 80ACB160 3C041100 */ lui $a0, 0x1100 ## $a0 = 11000000 -/* 01244 80ACB164 0C03E803 */ jal Audio_SetBGM - -/* 01248 80ACB168 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 110000FF -/* 0124C 80ACB16C 0C2B2972 */ jal func_80ACA5C8 -/* 01250 80ACB170 8FA40018 */ lw $a0, 0x0018($sp) -/* 01254 80ACB174 8FAF0018 */ lw $t7, 0x0018($sp) -/* 01258 80ACB178 3C0E80AD */ lui $t6, %hi(func_80ACC30C) ## $t6 = 80AD0000 -/* 0125C 80ACB17C 25CEC30C */ addiu $t6, $t6, %lo(func_80ACC30C) ## $t6 = 80ACC30C -/* 01260 80ACB180 ADEE040C */ sw $t6, 0x040C($t7) ## 0000040C -/* 01264 80ACB184 8FA4001C */ lw $a0, 0x001C($sp) -/* 01268 80ACB188 0C00B2DD */ jal Flags_SetSwitch - -/* 0126C 80ACB18C 24050023 */ addiu $a1, $zero, 0x0023 ## $a1 = 00000023 -.L80ACB190: -/* 01270 80ACB190 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01274 80ACB194 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01278 80ACB198 03E00008 */ jr $ra -/* 0127C 80ACB19C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB1A0.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB1A0.s deleted file mode 100644 index e80a09cffc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB1A0.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_80ACB1A0 -/* 01280 80ACB1A0 3C0E8016 */ lui $t6, %hi(gSaveContext+0xf2a) -/* 01284 80ACB1A4 95CEF58A */ lhu $t6, %lo(gSaveContext+0xf2a)($t6) -/* 01288 80ACB1A8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0128C 80ACB1AC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01290 80ACB1B0 31CF0020 */ andi $t7, $t6, 0x0020 ## $t7 = 00000000 -/* 01294 80ACB1B4 AFA40020 */ sw $a0, 0x0020($sp) -/* 01298 80ACB1B8 11E00003 */ beq $t7, $zero, .L80ACB1C8 -/* 0129C 80ACB1BC AFA50024 */ sw $a1, 0x0024($sp) -/* 012A0 80ACB1C0 10000002 */ beq $zero, $zero, .L80ACB1CC -/* 012A4 80ACB1C4 24064004 */ addiu $a2, $zero, 0x4004 ## $a2 = 00004004 -.L80ACB1C8: -/* 012A8 80ACB1C8 24064003 */ addiu $a2, $zero, 0x4003 ## $a2 = 00004003 -.L80ACB1CC: -/* 012AC 80ACB1CC 8FA40020 */ lw $a0, 0x0020($sp) -/* 012B0 80ACB1D0 8FA50024 */ lw $a1, 0x0024($sp) -/* 012B4 80ACB1D4 0C2B28EE */ jal func_80ACA3B8 -/* 012B8 80ACB1D8 A7A6001E */ sh $a2, 0x001E($sp) -/* 012BC 80ACB1DC 97A6001E */ lhu $a2, 0x001E($sp) -/* 012C0 80ACB1E0 8FA40020 */ lw $a0, 0x0020($sp) -/* 012C4 80ACB1E4 0C2B2956 */ jal func_80ACA558 -/* 012C8 80ACB1E8 8FA50024 */ lw $a1, 0x0024($sp) -/* 012CC 80ACB1EC 1040000B */ beq $v0, $zero, .L80ACB21C -/* 012D0 80ACB1F0 3C028016 */ lui $v0, %hi(gSaveContext) -/* 012D4 80ACB1F4 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 012D8 80ACB1F8 94580F2A */ lhu $t8, 0x0F2A($v0) ## 8015F58A -/* 012DC 80ACB1FC 2404005A */ addiu $a0, $zero, 0x005A ## $a0 = 0000005A -/* 012E0 80ACB200 37190020 */ ori $t9, $t8, 0x0020 ## $t9 = 00000020 -/* 012E4 80ACB204 0C03D719 */ jal func_800F5C64 -/* 012E8 80ACB208 A4590F2A */ sh $t9, 0x0F2A($v0) ## 8015F58A -/* 012EC 80ACB20C 8FA90020 */ lw $t1, 0x0020($sp) -/* 012F0 80ACB210 3C0880AD */ lui $t0, %hi(func_80ACB148) ## $t0 = 80AD0000 -/* 012F4 80ACB214 2508B148 */ addiu $t0, $t0, %lo(func_80ACB148) ## $t0 = 80ACB148 -/* 012F8 80ACB218 AD28040C */ sw $t0, 0x040C($t1) ## 0000040C -.L80ACB21C: -/* 012FC 80ACB21C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01300 80ACB220 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01304 80ACB224 03E00008 */ jr $ra -/* 01308 80ACB228 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB22C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB22C.s deleted file mode 100644 index a5f0bd395a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB22C.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80ACB22C -/* 0130C 80ACB22C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01310 80ACB230 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01314 80ACB234 0C00BCCD */ jal func_8002F334 -/* 01318 80ACB238 AFA40018 */ sw $a0, 0x0018($sp) -/* 0131C 80ACB23C 10400009 */ beq $v0, $zero, .L80ACB264 -/* 01320 80ACB240 3C041100 */ lui $a0, 0x1100 ## $a0 = 11000000 -/* 01324 80ACB244 0C03E803 */ jal Audio_SetBGM - -/* 01328 80ACB248 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 110000FF -/* 0132C 80ACB24C 0C2B2972 */ jal func_80ACA5C8 -/* 01330 80ACB250 8FA40018 */ lw $a0, 0x0018($sp) -/* 01334 80ACB254 8FAF0018 */ lw $t7, 0x0018($sp) -/* 01338 80ACB258 3C0E80AD */ lui $t6, %hi(func_80ACC30C) ## $t6 = 80AD0000 -/* 0133C 80ACB25C 25CEC30C */ addiu $t6, $t6, %lo(func_80ACC30C) ## $t6 = 80ACC30C -/* 01340 80ACB260 ADEE040C */ sw $t6, 0x040C($t7) ## 0000040C -.L80ACB264: -/* 01344 80ACB264 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01348 80ACB268 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0134C 80ACB26C 03E00008 */ jr $ra -/* 01350 80ACB270 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB274.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB274.s deleted file mode 100644 index 1e8ad363ae..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB274.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80ACB274 -/* 01354 80ACB274 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01358 80ACB278 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0135C 80ACB27C 0C00BCCD */ jal func_8002F334 -/* 01360 80ACB280 AFA40018 */ sw $a0, 0x0018($sp) -/* 01364 80ACB284 10400007 */ beq $v0, $zero, .L80ACB2A4 -/* 01368 80ACB288 3C041100 */ lui $a0, 0x1100 ## $a0 = 11000000 -/* 0136C 80ACB28C 0C03E803 */ jal Audio_SetBGM - -/* 01370 80ACB290 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 110000FF -/* 01374 80ACB294 8FAF0018 */ lw $t7, 0x0018($sp) -/* 01378 80ACB298 3C0E80AD */ lui $t6, %hi(func_80ACB2B4) ## $t6 = 80AD0000 -/* 0137C 80ACB29C 25CEB2B4 */ addiu $t6, $t6, %lo(func_80ACB2B4) ## $t6 = 80ACB2B4 -/* 01380 80ACB2A0 ADEE040C */ sw $t6, 0x040C($t7) ## 0000040C -.L80ACB2A4: -/* 01384 80ACB2A4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01388 80ACB2A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0138C 80ACB2AC 03E00008 */ jr $ra -/* 01390 80ACB2B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB2B4.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB2B4.s deleted file mode 100644 index 6d461f9bba..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB2B4.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80ACB2B4 -/* 01394 80ACB2B4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01398 80ACB2B8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0139C 80ACB2BC AFB00018 */ sw $s0, 0x0018($sp) -/* 013A0 80ACB2C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 013A4 80ACB2C4 0C2B28EE */ jal func_80ACA3B8 -/* 013A8 80ACB2C8 AFA50024 */ sw $a1, 0x0024($sp) -/* 013AC 80ACB2CC 3C0E8016 */ lui $t6, %hi(gSaveContext+0x3a) -/* 013B0 80ACB2D0 91CEE69A */ lbu $t6, %lo(gSaveContext+0x3a)($t6) -/* 013B4 80ACB2D4 8FA50024 */ lw $a1, 0x0024($sp) -/* 013B8 80ACB2D8 24063062 */ addiu $a2, $zero, 0x3062 ## $a2 = 00003062 -/* 013BC 80ACB2DC 15C0000B */ bne $t6, $zero, .L80ACB30C -/* 013C0 80ACB2E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013C4 80ACB2E4 0C2B2956 */ jal func_80ACA558 -/* 013C8 80ACB2E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013CC 80ACB2EC 50400011 */ beql $v0, $zero, .L80ACB334 -/* 013D0 80ACB2F0 8FBF001C */ lw $ra, 0x001C($sp) -/* 013D4 80ACB2F4 0C03D719 */ jal func_800F5C64 -/* 013D8 80ACB2F8 2404005A */ addiu $a0, $zero, 0x005A ## $a0 = 0000005A -/* 013DC 80ACB2FC 3C0F80AD */ lui $t7, %hi(func_80ACB274) ## $t7 = 80AD0000 -/* 013E0 80ACB300 25EFB274 */ addiu $t7, $t7, %lo(func_80ACB274) ## $t7 = 80ACB274 -/* 013E4 80ACB304 1000000A */ beq $zero, $zero, .L80ACB330 -/* 013E8 80ACB308 AE0F040C */ sw $t7, 0x040C($s0) ## 0000040C -.L80ACB30C: -/* 013EC 80ACB30C 0C2B2956 */ jal func_80ACA558 -/* 013F0 80ACB310 24063063 */ addiu $a2, $zero, 0x3063 ## $a2 = 00003063 -/* 013F4 80ACB314 50400007 */ beql $v0, $zero, .L80ACB334 -/* 013F8 80ACB318 8FBF001C */ lw $ra, 0x001C($sp) -/* 013FC 80ACB31C 0C03D719 */ jal func_800F5C64 -/* 01400 80ACB320 2404005A */ addiu $a0, $zero, 0x005A ## $a0 = 0000005A -/* 01404 80ACB324 3C1880AD */ lui $t8, %hi(func_80ACB22C) ## $t8 = 80AD0000 -/* 01408 80ACB328 2718B22C */ addiu $t8, $t8, %lo(func_80ACB22C) ## $t8 = 80ACB22C -/* 0140C 80ACB32C AE18040C */ sw $t8, 0x040C($s0) ## 0000040C -.L80ACB330: -/* 01410 80ACB330 8FBF001C */ lw $ra, 0x001C($sp) -.L80ACB334: -/* 01414 80ACB334 8FB00018 */ lw $s0, 0x0018($sp) -/* 01418 80ACB338 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0141C 80ACB33C 03E00008 */ jr $ra -/* 01420 80ACB340 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB344.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB344.s deleted file mode 100644 index 15ba7413d4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB344.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80ACB344 -/* 01424 80ACB344 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01428 80ACB348 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0142C 80ACB34C AFA40018 */ sw $a0, 0x0018($sp) -/* 01430 80ACB350 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 01434 80ACB354 0C042F6F */ jal func_8010BDBC -/* 01438 80ACB358 AFA5001C */ sw $a1, 0x001C($sp) -/* 0143C 80ACB35C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01440 80ACB360 1441001B */ bne $v0, $at, .L80ACB3D0 -/* 01444 80ACB364 8FA6001C */ lw $a2, 0x001C($sp) -/* 01448 80ACB368 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0144C 80ACB36C 0C041AF2 */ jal func_80106BC8 -/* 01450 80ACB370 AFA6001C */ sw $a2, 0x001C($sp) -/* 01454 80ACB374 10400016 */ beq $v0, $zero, .L80ACB3D0 -/* 01458 80ACB378 8FA6001C */ lw $a2, 0x001C($sp) -/* 0145C 80ACB37C 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 01460 80ACB380 00461021 */ addu $v0, $v0, $a2 -/* 01464 80ACB384 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 01468 80ACB388 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0146C 80ACB38C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 01470 80ACB390 10400005 */ beq $v0, $zero, .L80ACB3A8 -/* 01474 80ACB394 00000000 */ nop -/* 01478 80ACB398 10410007 */ beq $v0, $at, .L80ACB3B8 -/* 0147C 80ACB39C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 01480 80ACB3A0 1000000C */ beq $zero, $zero, .L80ACB3D4 -/* 01484 80ACB3A4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ACB3A8: -/* 01488 80ACB3A8 0C042DC8 */ jal func_8010B720 -/* 0148C 80ACB3AC 2405607A */ addiu $a1, $zero, 0x607A ## $a1 = 0000607A -/* 01490 80ACB3B0 10000008 */ beq $zero, $zero, .L80ACB3D4 -/* 01494 80ACB3B4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ACB3B8: -/* 01498 80ACB3B8 0C042DC8 */ jal func_8010B720 -/* 0149C 80ACB3BC 2405607C */ addiu $a1, $zero, 0x607C ## $a1 = 0000607C -/* 014A0 80ACB3C0 8FAF0018 */ lw $t7, 0x0018($sp) -/* 014A4 80ACB3C4 3C0E80AD */ lui $t6, %hi(func_80ACA7E0) ## $t6 = 80AD0000 -/* 014A8 80ACB3C8 25CEA7E0 */ addiu $t6, $t6, %lo(func_80ACA7E0) ## $t6 = 80ACA7E0 -/* 014AC 80ACB3CC ADEE040C */ sw $t6, 0x040C($t7) ## 0000040C -.L80ACB3D0: -/* 014B0 80ACB3D0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ACB3D4: -/* 014B4 80ACB3D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 014B8 80ACB3D8 03E00008 */ jr $ra -/* 014BC 80ACB3DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB3E0.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB3E0.s deleted file mode 100644 index 7ead1ae6a9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB3E0.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80ACB3E0 -/* 014C0 80ACB3E0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 014C4 80ACB3E4 AFBF001C */ sw $ra, 0x001C($sp) -/* 014C8 80ACB3E8 AFA40020 */ sw $a0, 0x0020($sp) -/* 014CC 80ACB3EC 0C2B28EE */ jal func_80ACA3B8 -/* 014D0 80ACB3F0 AFA50024 */ sw $a1, 0x0024($sp) -/* 014D4 80ACB3F4 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 014D8 80ACB3F8 AFAE0010 */ sw $t6, 0x0010($sp) -/* 014DC 80ACB3FC 8FA40020 */ lw $a0, 0x0020($sp) -/* 014E0 80ACB400 8FA50024 */ lw $a1, 0x0024($sp) -/* 014E4 80ACB404 24066079 */ addiu $a2, $zero, 0x6079 ## $a2 = 00006079 -/* 014E8 80ACB408 0C2B28FD */ jal func_80ACA3F4 -/* 014EC 80ACB40C 3C0743B4 */ lui $a3, 0x43B4 ## $a3 = 43B40000 -/* 014F0 80ACB410 50400008 */ beql $v0, $zero, .L80ACB434 -/* 014F4 80ACB414 8FBF001C */ lw $ra, 0x001C($sp) -/* 014F8 80ACB418 0C03D719 */ jal func_800F5C64 -/* 014FC 80ACB41C 2404005A */ addiu $a0, $zero, 0x005A ## $a0 = 0000005A -/* 01500 80ACB420 8FB80020 */ lw $t8, 0x0020($sp) -/* 01504 80ACB424 3C0F80AD */ lui $t7, %hi(func_80ACB344) ## $t7 = 80AD0000 -/* 01508 80ACB428 25EFB344 */ addiu $t7, $t7, %lo(func_80ACB344) ## $t7 = 80ACB344 -/* 0150C 80ACB42C AF0F040C */ sw $t7, 0x040C($t8) ## 0000040C -/* 01510 80ACB430 8FBF001C */ lw $ra, 0x001C($sp) -.L80ACB434: -/* 01514 80ACB434 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01518 80ACB438 03E00008 */ jr $ra -/* 0151C 80ACB43C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB440.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB440.s deleted file mode 100644 index b29991735f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB440.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_80ACB440 -/* 01520 80ACB440 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01524 80ACB444 AFB00018 */ sw $s0, 0x0018($sp) -/* 01528 80ACB448 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0152C 80ACB44C AFBF001C */ sw $ra, 0x001C($sp) -/* 01530 80ACB450 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 01534 80ACB454 0C042F6F */ jal func_8010BDBC -/* 01538 80ACB458 AFA50024 */ sw $a1, 0x0024($sp) -/* 0153C 80ACB45C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01540 80ACB460 14410021 */ bne $v0, $at, .L80ACB4E8 -/* 01544 80ACB464 8FA60024 */ lw $a2, 0x0024($sp) -/* 01548 80ACB468 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0154C 80ACB46C 0C041AF2 */ jal func_80106BC8 -/* 01550 80ACB470 AFA60024 */ sw $a2, 0x0024($sp) -/* 01554 80ACB474 1040001C */ beq $v0, $zero, .L80ACB4E8 -/* 01558 80ACB478 8FA60024 */ lw $a2, 0x0024($sp) -/* 0155C 80ACB47C 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 01560 80ACB480 00461021 */ addu $v0, $v0, $a2 -/* 01564 80ACB484 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 01568 80ACB488 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0156C 80ACB48C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 01570 80ACB490 10400005 */ beq $v0, $zero, .L80ACB4A8 -/* 01574 80ACB494 00000000 */ nop -/* 01578 80ACB498 10410009 */ beq $v0, $at, .L80ACB4C0 -/* 0157C 80ACB49C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 01580 80ACB4A0 1000000D */ beq $zero, $zero, .L80ACB4D8 -/* 01584 80ACB4A4 961803FC */ lhu $t8, 0x03FC($s0) ## 000003FC -.L80ACB4A8: -/* 01588 80ACB4A8 0C042DC8 */ jal func_8010B720 -/* 0158C 80ACB4AC 240510C1 */ addiu $a1, $zero, 0x10C1 ## $a1 = 000010C1 -/* 01590 80ACB4B0 3C0E80AD */ lui $t6, %hi(func_80ACB4FC) ## $t6 = 80AD0000 -/* 01594 80ACB4B4 25CEB4FC */ addiu $t6, $t6, %lo(func_80ACB4FC) ## $t6 = 80ACB4FC -/* 01598 80ACB4B8 10000006 */ beq $zero, $zero, .L80ACB4D4 -/* 0159C 80ACB4BC AE0E040C */ sw $t6, 0x040C($s0) ## 0000040C -.L80ACB4C0: -/* 015A0 80ACB4C0 0C042DC8 */ jal func_8010B720 -/* 015A4 80ACB4C4 240510C3 */ addiu $a1, $zero, 0x10C3 ## $a1 = 000010C3 -/* 015A8 80ACB4C8 3C0F80AD */ lui $t7, %hi(func_80ACA7E0) ## $t7 = 80AD0000 -/* 015AC 80ACB4CC 25EFA7E0 */ addiu $t7, $t7, %lo(func_80ACA7E0) ## $t7 = 80ACA7E0 -/* 015B0 80ACB4D0 AE0F040C */ sw $t7, 0x040C($s0) ## 0000040C -.L80ACB4D4: -/* 015B4 80ACB4D4 961803FC */ lhu $t8, 0x03FC($s0) ## 000003FC -.L80ACB4D8: -/* 015B8 80ACB4D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015BC 80ACB4DC 3319FFFD */ andi $t9, $t8, 0xFFFD ## $t9 = 00000000 -/* 015C0 80ACB4E0 0C2B29C7 */ jal func_80ACA71C -/* 015C4 80ACB4E4 A61903FC */ sh $t9, 0x03FC($s0) ## 000003FC -.L80ACB4E8: -/* 015C8 80ACB4E8 8FBF001C */ lw $ra, 0x001C($sp) -/* 015CC 80ACB4EC 8FB00018 */ lw $s0, 0x0018($sp) -/* 015D0 80ACB4F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 015D4 80ACB4F4 03E00008 */ jr $ra -/* 015D8 80ACB4F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB4FC.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB4FC.s deleted file mode 100644 index 476cb77ce2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB4FC.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80ACB4FC -/* 015DC 80ACB4FC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 015E0 80ACB500 AFBF0014 */ sw $ra, 0x0014($sp) -/* 015E4 80ACB504 AFA40018 */ sw $a0, 0x0018($sp) -/* 015E8 80ACB508 AFA5001C */ sw $a1, 0x001C($sp) -/* 015EC 80ACB50C 0C042F6F */ jal func_8010BDBC -/* 015F0 80ACB510 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 015F4 80ACB514 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 015F8 80ACB518 54410010 */ bnel $v0, $at, .L80ACB55C -/* 015FC 80ACB51C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01600 80ACB520 0C041AF2 */ jal func_80106BC8 -/* 01604 80ACB524 8FA4001C */ lw $a0, 0x001C($sp) -/* 01608 80ACB528 1040000B */ beq $v0, $zero, .L80ACB558 -/* 0160C 80ACB52C 8FA4001C */ lw $a0, 0x001C($sp) -/* 01610 80ACB530 0C042DC8 */ jal func_8010B720 -/* 01614 80ACB534 240510C2 */ addiu $a1, $zero, 0x10C2 ## $a1 = 000010C2 -/* 01618 80ACB538 8FA40018 */ lw $a0, 0x0018($sp) -/* 0161C 80ACB53C 3C0E80AD */ lui $t6, %hi(func_80ACB440) ## $t6 = 80AD0000 -/* 01620 80ACB540 25CEB440 */ addiu $t6, $t6, %lo(func_80ACB440) ## $t6 = 80ACB440 -/* 01624 80ACB544 948F03FC */ lhu $t7, 0x03FC($a0) ## 000003FC -/* 01628 80ACB548 AC8E040C */ sw $t6, 0x040C($a0) ## 0000040C -/* 0162C 80ACB54C 35F80002 */ ori $t8, $t7, 0x0002 ## $t8 = 00000002 -/* 01630 80ACB550 0C2B29C7 */ jal func_80ACA71C -/* 01634 80ACB554 A49803FC */ sh $t8, 0x03FC($a0) ## 000003FC -.L80ACB558: -/* 01638 80ACB558 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ACB55C: -/* 0163C 80ACB55C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01640 80ACB560 03E00008 */ jr $ra -/* 01644 80ACB564 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB568.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB568.s deleted file mode 100644 index d71d42faea..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB568.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80ACB568 -/* 01648 80ACB568 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0164C 80ACB56C AFBF001C */ sw $ra, 0x001C($sp) -/* 01650 80ACB570 AFA40020 */ sw $a0, 0x0020($sp) -/* 01654 80ACB574 0C2B28EE */ jal func_80ACA3B8 -/* 01658 80ACB578 AFA50024 */ sw $a1, 0x0024($sp) -/* 0165C 80ACB57C 8FA40020 */ lw $a0, 0x0020($sp) -/* 01660 80ACB580 8FA50024 */ lw $a1, 0x0024($sp) -/* 01664 80ACB584 240610C0 */ addiu $a2, $zero, 0x10C0 ## $a2 = 000010C0 -/* 01668 80ACB588 3C07433E */ lui $a3, 0x433E ## $a3 = 433E0000 -/* 0166C 80ACB58C 0C2B28FD */ jal func_80ACA3F4 -/* 01670 80ACB590 AFA00010 */ sw $zero, 0x0010($sp) -/* 01674 80ACB594 50400008 */ beql $v0, $zero, .L80ACB5B8 -/* 01678 80ACB598 8FBF001C */ lw $ra, 0x001C($sp) -/* 0167C 80ACB59C 0C03D719 */ jal func_800F5C64 -/* 01680 80ACB5A0 2404005A */ addiu $a0, $zero, 0x005A ## $a0 = 0000005A -/* 01684 80ACB5A4 8FAF0020 */ lw $t7, 0x0020($sp) -/* 01688 80ACB5A8 3C0E80AD */ lui $t6, %hi(func_80ACB4FC) ## $t6 = 80AD0000 -/* 0168C 80ACB5AC 25CEB4FC */ addiu $t6, $t6, %lo(func_80ACB4FC) ## $t6 = 80ACB4FC -/* 01690 80ACB5B0 ADEE040C */ sw $t6, 0x040C($t7) ## 0000040C -/* 01694 80ACB5B4 8FBF001C */ lw $ra, 0x001C($sp) -.L80ACB5B8: -/* 01698 80ACB5B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0169C 80ACB5BC 03E00008 */ jr $ra -/* 016A0 80ACB5C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB5C4.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB5C4.s deleted file mode 100644 index ea386a0f52..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB5C4.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_80ACB5C4 -/* 016A4 80ACB5C4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 016A8 80ACB5C8 AFB00018 */ sw $s0, 0x0018($sp) -/* 016AC 80ACB5CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 016B0 80ACB5D0 AFBF001C */ sw $ra, 0x001C($sp) -/* 016B4 80ACB5D4 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 016B8 80ACB5D8 0C042F6F */ jal func_8010BDBC -/* 016BC 80ACB5DC AFA50024 */ sw $a1, 0x0024($sp) -/* 016C0 80ACB5E0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 016C4 80ACB5E4 14410021 */ bne $v0, $at, .L80ACB66C -/* 016C8 80ACB5E8 8FA60024 */ lw $a2, 0x0024($sp) -/* 016CC 80ACB5EC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 016D0 80ACB5F0 0C041AF2 */ jal func_80106BC8 -/* 016D4 80ACB5F4 AFA60024 */ sw $a2, 0x0024($sp) -/* 016D8 80ACB5F8 1040001C */ beq $v0, $zero, .L80ACB66C -/* 016DC 80ACB5FC 8FA60024 */ lw $a2, 0x0024($sp) -/* 016E0 80ACB600 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 016E4 80ACB604 00461021 */ addu $v0, $v0, $a2 -/* 016E8 80ACB608 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 016EC 80ACB60C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 016F0 80ACB610 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 016F4 80ACB614 10400005 */ beq $v0, $zero, .L80ACB62C -/* 016F8 80ACB618 00000000 */ nop -/* 016FC 80ACB61C 10410009 */ beq $v0, $at, .L80ACB644 -/* 01700 80ACB620 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 01704 80ACB624 1000000D */ beq $zero, $zero, .L80ACB65C -/* 01708 80ACB628 961803FC */ lhu $t8, 0x03FC($s0) ## 000003FC -.L80ACB62C: -/* 0170C 80ACB62C 0C042DC8 */ jal func_8010B720 -/* 01710 80ACB630 240510C5 */ addiu $a1, $zero, 0x10C5 ## $a1 = 000010C5 -/* 01714 80ACB634 3C0E80AD */ lui $t6, %hi(func_80ACB680) ## $t6 = 80AD0000 -/* 01718 80ACB638 25CEB680 */ addiu $t6, $t6, %lo(func_80ACB680) ## $t6 = 80ACB680 -/* 0171C 80ACB63C 10000006 */ beq $zero, $zero, .L80ACB658 -/* 01720 80ACB640 AE0E040C */ sw $t6, 0x040C($s0) ## 0000040C -.L80ACB644: -/* 01724 80ACB644 0C042DC8 */ jal func_8010B720 -/* 01728 80ACB648 240510C7 */ addiu $a1, $zero, 0x10C7 ## $a1 = 000010C7 -/* 0172C 80ACB64C 3C0F80AD */ lui $t7, %hi(func_80ACA7E0) ## $t7 = 80AD0000 -/* 01730 80ACB650 25EFA7E0 */ addiu $t7, $t7, %lo(func_80ACA7E0) ## $t7 = 80ACA7E0 -/* 01734 80ACB654 AE0F040C */ sw $t7, 0x040C($s0) ## 0000040C -.L80ACB658: -/* 01738 80ACB658 961803FC */ lhu $t8, 0x03FC($s0) ## 000003FC -.L80ACB65C: -/* 0173C 80ACB65C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01740 80ACB660 3319FFFD */ andi $t9, $t8, 0xFFFD ## $t9 = 00000000 -/* 01744 80ACB664 0C2B29C7 */ jal func_80ACA71C -/* 01748 80ACB668 A61903FC */ sh $t9, 0x03FC($s0) ## 000003FC -.L80ACB66C: -/* 0174C 80ACB66C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01750 80ACB670 8FB00018 */ lw $s0, 0x0018($sp) -/* 01754 80ACB674 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01758 80ACB678 03E00008 */ jr $ra -/* 0175C 80ACB67C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB680.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB680.s deleted file mode 100644 index 64ee1edafa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB680.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80ACB680 -/* 01760 80ACB680 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01764 80ACB684 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01768 80ACB688 AFA40018 */ sw $a0, 0x0018($sp) -/* 0176C 80ACB68C AFA5001C */ sw $a1, 0x001C($sp) -/* 01770 80ACB690 0C042F6F */ jal func_8010BDBC -/* 01774 80ACB694 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 01778 80ACB698 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0177C 80ACB69C 54410010 */ bnel $v0, $at, .L80ACB6E0 -/* 01780 80ACB6A0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01784 80ACB6A4 0C041AF2 */ jal func_80106BC8 -/* 01788 80ACB6A8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0178C 80ACB6AC 1040000B */ beq $v0, $zero, .L80ACB6DC -/* 01790 80ACB6B0 8FA4001C */ lw $a0, 0x001C($sp) -/* 01794 80ACB6B4 0C042DC8 */ jal func_8010B720 -/* 01798 80ACB6B8 240510C6 */ addiu $a1, $zero, 0x10C6 ## $a1 = 000010C6 -/* 0179C 80ACB6BC 8FA40018 */ lw $a0, 0x0018($sp) -/* 017A0 80ACB6C0 3C0E80AD */ lui $t6, %hi(func_80ACB5C4) ## $t6 = 80AD0000 -/* 017A4 80ACB6C4 25CEB5C4 */ addiu $t6, $t6, %lo(func_80ACB5C4) ## $t6 = 80ACB5C4 -/* 017A8 80ACB6C8 948F03FC */ lhu $t7, 0x03FC($a0) ## 000003FC -/* 017AC 80ACB6CC AC8E040C */ sw $t6, 0x040C($a0) ## 0000040C -/* 017B0 80ACB6D0 35F80002 */ ori $t8, $t7, 0x0002 ## $t8 = 00000002 -/* 017B4 80ACB6D4 0C2B29C7 */ jal func_80ACA71C -/* 017B8 80ACB6D8 A49803FC */ sh $t8, 0x03FC($a0) ## 000003FC -.L80ACB6DC: -/* 017BC 80ACB6DC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ACB6E0: -/* 017C0 80ACB6E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 017C4 80ACB6E4 03E00008 */ jr $ra -/* 017C8 80ACB6E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB6EC.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB6EC.s deleted file mode 100644 index abf1873b18..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB6EC.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80ACB6EC -/* 017CC 80ACB6EC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 017D0 80ACB6F0 AFBF001C */ sw $ra, 0x001C($sp) -/* 017D4 80ACB6F4 AFA40020 */ sw $a0, 0x0020($sp) -/* 017D8 80ACB6F8 0C2B28EE */ jal func_80ACA3B8 -/* 017DC 80ACB6FC AFA50024 */ sw $a1, 0x0024($sp) -/* 017E0 80ACB700 8FA40020 */ lw $a0, 0x0020($sp) -/* 017E4 80ACB704 8FA50024 */ lw $a1, 0x0024($sp) -/* 017E8 80ACB708 240610C4 */ addiu $a2, $zero, 0x10C4 ## $a2 = 000010C4 -/* 017EC 80ACB70C 3C0743B4 */ lui $a3, 0x43B4 ## $a3 = 43B40000 -/* 017F0 80ACB710 0C2B28FD */ jal func_80ACA3F4 -/* 017F4 80ACB714 AFA00010 */ sw $zero, 0x0010($sp) -/* 017F8 80ACB718 50400008 */ beql $v0, $zero, .L80ACB73C -/* 017FC 80ACB71C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01800 80ACB720 0C03D719 */ jal func_800F5C64 -/* 01804 80ACB724 2404005A */ addiu $a0, $zero, 0x005A ## $a0 = 0000005A -/* 01808 80ACB728 8FAF0020 */ lw $t7, 0x0020($sp) -/* 0180C 80ACB72C 3C0E80AD */ lui $t6, %hi(func_80ACB680) ## $t6 = 80AD0000 -/* 01810 80ACB730 25CEB680 */ addiu $t6, $t6, %lo(func_80ACB680) ## $t6 = 80ACB680 -/* 01814 80ACB734 ADEE040C */ sw $t6, 0x040C($t7) ## 0000040C -/* 01818 80ACB738 8FBF001C */ lw $ra, 0x001C($sp) -.L80ACB73C: -/* 0181C 80ACB73C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01820 80ACB740 03E00008 */ jr $ra -/* 01824 80ACB744 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB748.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB748.s deleted file mode 100644 index bbcf3c9c95..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB748.s +++ /dev/null @@ -1,124 +0,0 @@ -glabel func_80ACB748 -/* 01828 80ACB748 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0182C 80ACB74C AFBF001C */ sw $ra, 0x001C($sp) -/* 01830 80ACB750 F7B40010 */ sdc1 $f20, 0x0010($sp) -/* 01834 80ACB754 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 01838 80ACB758 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0183C 80ACB75C 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 01840 80ACB760 30420FC0 */ andi $v0, $v0, 0x0FC0 ## $v0 = 00000000 -/* 01844 80ACB764 00021183 */ sra $v0, $v0, 6 -/* 01848 80ACB768 AFA20024 */ sw $v0, 0x0024($sp) -/* 0184C 80ACB76C AFA70034 */ sw $a3, 0x0034($sp) -/* 01850 80ACB770 24A500E0 */ addiu $a1, $a1, 0x00E0 ## $a1 = 000000E0 -/* 01854 80ACB774 AFA60030 */ sw $a2, 0x0030($sp) -/* 01858 80ACB778 0C032D9E */ jal Math3D_Vec3f_DistXYZ -/* 0185C 80ACB77C 248403E0 */ addiu $a0, $a0, 0x03E0 ## $a0 = 000003E0 -/* 01860 80ACB780 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01864 80ACB784 44817000 */ mtc1 $at, $f14 ## $f14 = 1.00 -/* 01868 80ACB788 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 0186C 80ACB78C 44815000 */ mtc1 $at, $f10 ## $f10 = 45.00 -/* 01870 80ACB790 8FA70034 */ lw $a3, 0x0034($sp) -/* 01874 80ACB794 8FA60030 */ lw $a2, 0x0030($sp) -/* 01878 80ACB798 460A0303 */ div.s $f12, $f0, $f10 -/* 0187C 80ACB79C C4E400E0 */ lwc1 $f4, 0x00E0($a3) ## 000000E0 -/* 01880 80ACB7A0 8FA20024 */ lw $v0, 0x0024($sp) -/* 01884 80ACB7A4 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01888 80ACB7A8 E4C403E0 */ swc1 $f4, 0x03E0($a2) ## 000003E0 -/* 0188C 80ACB7AC C4E600E4 */ lwc1 $f6, 0x00E4($a3) ## 000000E4 -/* 01890 80ACB7B0 E4C603E4 */ swc1 $f6, 0x03E4($a2) ## 000003E4 -/* 01894 80ACB7B4 C4E800E8 */ lwc1 $f8, 0x00E8($a3) ## 000000E8 -/* 01898 80ACB7B8 E4C803E8 */ swc1 $f8, 0x03E8($a2) ## 000003E8 -/* 0189C 80ACB7BC 460C703C */ c.lt.s $f14, $f12 -/* 018A0 80ACB7C0 00000000 */ nop -/* 018A4 80ACB7C4 45000002 */ bc1f .L80ACB7D0 -/* 018A8 80ACB7C8 00000000 */ nop -/* 018AC 80ACB7CC 46007306 */ mov.s $f12, $f14 -.L80ACB7D0: -/* 018B0 80ACB7D0 10410007 */ beq $v0, $at, .L80ACB7F0 -/* 018B4 80ACB7D4 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 018B8 80ACB7D8 10410026 */ beq $v0, $at, .L80ACB874 -/* 018BC 80ACB7DC 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 018C0 80ACB7E0 50410025 */ beql $v0, $at, .L80ACB878 -/* 018C4 80ACB7E4 460C6500 */ add.s $f20, $f12, $f12 -/* 018C8 80ACB7E8 10000042 */ beq $zero, $zero, .L80ACB8F4 -/* 018CC 80ACB7EC 8FBF001C */ lw $ra, 0x001C($sp) -.L80ACB7F0: -/* 018D0 80ACB7F0 460C6500 */ add.s $f20, $f12, $f12 -/* 018D4 80ACB7F4 3C0480AD */ lui $a0, %hi(D_80ACD62C) ## $a0 = 80AD0000 -/* 018D8 80ACB7F8 2484D62C */ addiu $a0, $a0, %lo(D_80ACD62C) ## $a0 = 80ACD62C -/* 018DC 80ACB7FC 240520BD */ addiu $a1, $zero, 0x20BD ## $a1 = 000020BD -/* 018E0 80ACB800 4406A000 */ mfc1 $a2, $f20 -/* 018E4 80ACB804 0C03D0DB */ jal func_800F436C -/* 018E8 80ACB808 AFA70034 */ sw $a3, 0x0034($sp) -/* 018EC 80ACB80C 8FA70034 */ lw $a3, 0x0034($sp) -/* 018F0 80ACB810 3C0480AD */ lui $a0, %hi(D_80ACD62C) ## $a0 = 80AD0000 -/* 018F4 80ACB814 2484D62C */ addiu $a0, $a0, %lo(D_80ACD62C) ## $a0 = 80ACD62C -/* 018F8 80ACB818 94E21D74 */ lhu $v0, 0x1D74($a3) ## 00001D74 -/* 018FC 80ACB81C 24053926 */ addiu $a1, $zero, 0x3926 ## $a1 = 00003926 -/* 01900 80ACB820 28410145 */ slti $at, $v0, 0x0145 -/* 01904 80ACB824 10200005 */ beq $at, $zero, .L80ACB83C -/* 01908 80ACB828 2841008E */ slti $at, $v0, 0x008E -/* 0190C 80ACB82C 14200008 */ bne $at, $zero, .L80ACB850 -/* 01910 80ACB830 2841010B */ slti $at, $v0, 0x010B -/* 01914 80ACB834 50200007 */ beql $at, $zero, .L80ACB854 -/* 01918 80ACB838 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -.L80ACB83C: -/* 0191C 80ACB83C 4406A000 */ mfc1 $a2, $f20 -/* 01920 80ACB840 0C03D105 */ jal func_800F4414 -/* 01924 80ACB844 AFA70034 */ sw $a3, 0x0034($sp) -/* 01928 80ACB848 8FA70034 */ lw $a3, 0x0034($sp) -/* 0192C 80ACB84C 94E21D74 */ lhu $v0, 0x1D74($a3) ## 00001D74 -.L80ACB850: -/* 01930 80ACB850 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -.L80ACB854: -/* 01934 80ACB854 14410026 */ bne $v0, $at, .L80ACB8F0 -/* 01938 80ACB858 3C0480AD */ lui $a0, %hi(D_80ACD62C) ## $a0 = 80AD0000 -/* 0193C 80ACB85C 4406A000 */ mfc1 $a2, $f20 -/* 01940 80ACB860 2484D62C */ addiu $a0, $a0, %lo(D_80ACD62C) ## $a0 = 80ACD62C -/* 01944 80ACB864 0C03D0DB */ jal func_800F436C -/* 01948 80ACB868 240528BE */ addiu $a1, $zero, 0x28BE ## $a1 = 000028BE -/* 0194C 80ACB86C 10000021 */ beq $zero, $zero, .L80ACB8F4 -/* 01950 80ACB870 8FBF001C */ lw $ra, 0x001C($sp) -.L80ACB874: -/* 01954 80ACB874 460C6500 */ add.s $f20, $f12, $f12 -.L80ACB878: -/* 01958 80ACB878 3C0480AD */ lui $a0, %hi(D_80ACD62C) ## $a0 = 80AD0000 -/* 0195C 80ACB87C 2484D62C */ addiu $a0, $a0, %lo(D_80ACD62C) ## $a0 = 80ACD62C -/* 01960 80ACB880 240520BD */ addiu $a1, $zero, 0x20BD ## $a1 = 000020BD -/* 01964 80ACB884 4406A000 */ mfc1 $a2, $f20 -/* 01968 80ACB888 0C03D0DB */ jal func_800F436C -/* 0196C 80ACB88C AFA70034 */ sw $a3, 0x0034($sp) -/* 01970 80ACB890 8FA70034 */ lw $a3, 0x0034($sp) -/* 01974 80ACB894 3C0480AD */ lui $a0, %hi(D_80ACD62C) ## $a0 = 80AD0000 -/* 01978 80ACB898 2484D62C */ addiu $a0, $a0, %lo(D_80ACD62C) ## $a0 = 80ACD62C -/* 0197C 80ACB89C 94E21D74 */ lhu $v0, 0x1D74($a3) ## 00001D74 -/* 01980 80ACB8A0 24053926 */ addiu $a1, $zero, 0x3926 ## $a1 = 00003926 -/* 01984 80ACB8A4 284101A4 */ slti $at, $v0, 0x01A4 -/* 01988 80ACB8A8 10200005 */ beq $at, $zero, .L80ACB8C0 -/* 0198C 80ACB8AC 284100C2 */ slti $at, $v0, 0x00C2 -/* 01990 80ACB8B0 14200008 */ bne $at, $zero, .L80ACB8D4 -/* 01994 80ACB8B4 28410119 */ slti $at, $v0, 0x0119 -/* 01998 80ACB8B8 50200007 */ beql $at, $zero, .L80ACB8D8 -/* 0199C 80ACB8BC 240100D9 */ addiu $at, $zero, 0x00D9 ## $at = 000000D9 -.L80ACB8C0: -/* 019A0 80ACB8C0 4406A000 */ mfc1 $a2, $f20 -/* 019A4 80ACB8C4 0C03D105 */ jal func_800F4414 -/* 019A8 80ACB8C8 AFA70034 */ sw $a3, 0x0034($sp) -/* 019AC 80ACB8CC 8FA70034 */ lw $a3, 0x0034($sp) -/* 019B0 80ACB8D0 94E21D74 */ lhu $v0, 0x1D74($a3) ## 00001D74 -.L80ACB8D4: -/* 019B4 80ACB8D4 240100D9 */ addiu $at, $zero, 0x00D9 ## $at = 000000D9 -.L80ACB8D8: -/* 019B8 80ACB8D8 14410005 */ bne $v0, $at, .L80ACB8F0 -/* 019BC 80ACB8DC 3C0480AD */ lui $a0, %hi(D_80ACD62C) ## $a0 = 80AD0000 -/* 019C0 80ACB8E0 4406A000 */ mfc1 $a2, $f20 -/* 019C4 80ACB8E4 2484D62C */ addiu $a0, $a0, %lo(D_80ACD62C) ## $a0 = 80ACD62C -/* 019C8 80ACB8E8 0C03D0DB */ jal func_800F436C -/* 019CC 80ACB8EC 240528BE */ addiu $a1, $zero, 0x28BE ## $a1 = 000028BE -.L80ACB8F0: -/* 019D0 80ACB8F0 8FBF001C */ lw $ra, 0x001C($sp) -.L80ACB8F4: -/* 019D4 80ACB8F4 D7B40010 */ ldc1 $f20, 0x0010($sp) -/* 019D8 80ACB8F8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 019DC 80ACB8FC 03E00008 */ jr $ra -/* 019E0 80ACB900 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB904.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB904.s deleted file mode 100644 index 13fe0b5d19..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB904.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80ACB904 -/* 019E4 80ACB904 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 019E8 80ACB908 AFBF001C */ sw $ra, 0x001C($sp) -/* 019EC 80ACB90C AFB10018 */ sw $s1, 0x0018($sp) -/* 019F0 80ACB910 AFB00014 */ sw $s0, 0x0014($sp) -/* 019F4 80ACB914 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 019F8 80ACB918 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 019FC 80ACB91C 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 01A00 80ACB920 51C00011 */ beql $t6, $zero, .L80ACB968 -/* 01A04 80ACB924 963903FC */ lhu $t9, 0x03FC($s1) ## 000003FC -/* 01A08 80ACB928 8CA21DA8 */ lw $v0, 0x1DA8($a1) ## 00001DA8 -/* 01A0C 80ACB92C 5040000E */ beql $v0, $zero, .L80ACB968 -/* 01A10 80ACB930 963903FC */ lhu $t9, 0x03FC($s1) ## 000003FC -/* 01A14 80ACB934 908F040A */ lbu $t7, 0x040A($a0) ## 0000040A -/* 01A18 80ACB938 94580000 */ lhu $t8, 0x0000($v0) ## 00000000 -/* 01A1C 80ACB93C 51F80007 */ beql $t7, $t8, .L80ACB95C -/* 01A20 80ACB940 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01A24 80ACB944 0C2B344C */ jal func_80ACD130 -/* 01A28 80ACB948 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 01A2C 80ACB94C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01A30 80ACB950 0C2B2EAE */ jal func_80ACBAB8 -/* 01A34 80ACB954 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01A38 80ACB958 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80ACB95C: -/* 01A3C 80ACB95C 0C2B34B3 */ jal func_80ACD2CC -/* 01A40 80ACB960 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01A44 80ACB964 963903FC */ lhu $t9, 0x03FC($s1) ## 000003FC -.L80ACB968: -/* 01A48 80ACB968 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01A4C 80ACB96C 33280080 */ andi $t0, $t9, 0x0080 ## $t0 = 00000000 -/* 01A50 80ACB970 51000004 */ beql $t0, $zero, .L80ACB984 -/* 01A54 80ACB974 8FBF001C */ lw $ra, 0x001C($sp) -/* 01A58 80ACB978 0C2B2DD2 */ jal func_80ACB748 -/* 01A5C 80ACB97C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01A60 80ACB980 8FBF001C */ lw $ra, 0x001C($sp) -.L80ACB984: -/* 01A64 80ACB984 8FB00014 */ lw $s0, 0x0014($sp) -/* 01A68 80ACB988 8FB10018 */ lw $s1, 0x0018($sp) -/* 01A6C 80ACB98C 03E00008 */ jr $ra -/* 01A70 80ACB990 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB994.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB994.s deleted file mode 100644 index e3b8a5090e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB994.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80ACB994 -/* 01A74 80ACB994 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01A78 80ACB998 AFBF001C */ sw $ra, 0x001C($sp) -/* 01A7C 80ACB99C AFB10018 */ sw $s1, 0x0018($sp) -/* 01A80 80ACB9A0 AFB00014 */ sw $s0, 0x0014($sp) -/* 01A84 80ACB9A4 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 01A88 80ACB9A8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 01A8C 80ACB9AC 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 01A90 80ACB9B0 51C00011 */ beql $t6, $zero, .L80ACB9F8 -/* 01A94 80ACB9B4 963903FC */ lhu $t9, 0x03FC($s1) ## 000003FC -/* 01A98 80ACB9B8 8CA21DA8 */ lw $v0, 0x1DA8($a1) ## 00001DA8 -/* 01A9C 80ACB9BC 5040000E */ beql $v0, $zero, .L80ACB9F8 -/* 01AA0 80ACB9C0 963903FC */ lhu $t9, 0x03FC($s1) ## 000003FC -/* 01AA4 80ACB9C4 908F040A */ lbu $t7, 0x040A($a0) ## 0000040A -/* 01AA8 80ACB9C8 94580000 */ lhu $t8, 0x0000($v0) ## 00000000 -/* 01AAC 80ACB9CC 51F80007 */ beql $t7, $t8, .L80ACB9EC -/* 01AB0 80ACB9D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01AB4 80ACB9D4 0C2B344C */ jal func_80ACD130 -/* 01AB8 80ACB9D8 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 01ABC 80ACB9DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01AC0 80ACB9E0 0C2B2EAE */ jal func_80ACBAB8 -/* 01AC4 80ACB9E4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01AC8 80ACB9E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80ACB9EC: -/* 01ACC 80ACB9EC 0C2B3535 */ jal func_80ACD4D4 -/* 01AD0 80ACB9F0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01AD4 80ACB9F4 963903FC */ lhu $t9, 0x03FC($s1) ## 000003FC -.L80ACB9F8: -/* 01AD8 80ACB9F8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01ADC 80ACB9FC 33280080 */ andi $t0, $t9, 0x0080 ## $t0 = 00000000 -/* 01AE0 80ACBA00 51000004 */ beql $t0, $zero, .L80ACBA14 -/* 01AE4 80ACBA04 8FBF001C */ lw $ra, 0x001C($sp) -/* 01AE8 80ACBA08 0C2B2DD2 */ jal func_80ACB748 -/* 01AEC 80ACBA0C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01AF0 80ACBA10 8FBF001C */ lw $ra, 0x001C($sp) -.L80ACBA14: -/* 01AF4 80ACBA14 8FB00014 */ lw $s0, 0x0014($sp) -/* 01AF8 80ACBA18 8FB10018 */ lw $s1, 0x0018($sp) -/* 01AFC 80ACBA1C 03E00008 */ jr $ra -/* 01B00 80ACBA20 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBA24.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBA24.s deleted file mode 100644 index 890231469b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBA24.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80ACBA24 -/* 01B04 80ACBA24 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01B08 80ACBA28 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01B0C 80ACBA2C 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 01B10 80ACBA30 51C00018 */ beql $t6, $zero, .L80ACBA94 -/* 01B14 80ACBA34 948A03FC */ lhu $t2, 0x03FC($a0) ## 000003FC -/* 01B18 80ACBA38 8CA21DA8 */ lw $v0, 0x1DA8($a1) ## 00001DA8 -/* 01B1C 80ACBA3C 50400015 */ beql $v0, $zero, .L80ACBA94 -/* 01B20 80ACBA40 948A03FC */ lhu $t2, 0x03FC($a0) ## 000003FC -/* 01B24 80ACBA44 908F040A */ lbu $t7, 0x040A($a0) ## 0000040A -/* 01B28 80ACBA48 94580000 */ lhu $t8, 0x0000($v0) ## 00000000 -/* 01B2C 80ACBA4C 51F8000F */ beql $t7, $t8, .L80ACBA8C -/* 01B30 80ACBA50 94490008 */ lhu $t1, 0x0008($v0) ## 00000008 -/* 01B34 80ACBA54 949903FC */ lhu $t9, 0x03FC($a0) ## 000003FC -/* 01B38 80ACBA58 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 01B3C 80ACBA5C 37280004 */ ori $t0, $t9, 0x0004 ## $t0 = 00000004 -/* 01B40 80ACBA60 A48803FC */ sh $t0, 0x03FC($a0) ## 000003FC -/* 01B44 80ACBA64 AFA5001C */ sw $a1, 0x001C($sp) -/* 01B48 80ACBA68 0C2B344C */ jal func_80ACD130 -/* 01B4C 80ACBA6C AFA40018 */ sw $a0, 0x0018($sp) -/* 01B50 80ACBA70 8FA40018 */ lw $a0, 0x0018($sp) -/* 01B54 80ACBA74 0C2B2EAE */ jal func_80ACBAB8 -/* 01B58 80ACBA78 8FA5001C */ lw $a1, 0x001C($sp) -/* 01B5C 80ACBA7C 8FA40018 */ lw $a0, 0x0018($sp) -/* 01B60 80ACBA80 10000003 */ beq $zero, $zero, .L80ACBA90 -/* 01B64 80ACBA84 8FA5001C */ lw $a1, 0x001C($sp) -/* 01B68 80ACBA88 94490008 */ lhu $t1, 0x0008($v0) ## 00000008 -.L80ACBA8C: -/* 01B6C 80ACBA8C A4890034 */ sh $t1, 0x0034($a0) ## 00000034 -.L80ACBA90: -/* 01B70 80ACBA90 948A03FC */ lhu $t2, 0x03FC($a0) ## 000003FC -.L80ACBA94: -/* 01B74 80ACBA94 314B0080 */ andi $t3, $t2, 0x0080 ## $t3 = 00000000 -/* 01B78 80ACBA98 51600004 */ beql $t3, $zero, .L80ACBAAC -/* 01B7C 80ACBA9C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01B80 80ACBAA0 0C2B2DD2 */ jal func_80ACB748 -/* 01B84 80ACBAA4 00000000 */ nop -/* 01B88 80ACBAA8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ACBAAC: -/* 01B8C 80ACBAAC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01B90 80ACBAB0 03E00008 */ jr $ra -/* 01B94 80ACBAB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBAB8.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBAB8.s deleted file mode 100644 index 90c1eda0b4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBAB8.s +++ /dev/null @@ -1,102 +0,0 @@ -.late_rodata -glabel jtbl_80ACD830 -.word L80ACBAFC -.word L80ACBB38 -.word L80ACBB80 -.word L80ACBBC8 -.word L80ACBBE4 - -.text -glabel func_80ACBAB8 -/* 01B98 80ACBAB8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01B9C 80ACBABC AFBF0024 */ sw $ra, 0x0024($sp) -/* 01BA0 80ACBAC0 AFB10020 */ sw $s1, 0x0020($sp) -/* 01BA4 80ACBAC4 AFB0001C */ sw $s0, 0x001C($sp) -/* 01BA8 80ACBAC8 8CAE1DA8 */ lw $t6, 0x1DA8($a1) ## 00001DA8 -/* 01BAC 80ACBACC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01BB0 80ACBAD0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01BB4 80ACBAD4 95C20000 */ lhu $v0, 0x0000($t6) ## 00000000 -/* 01BB8 80ACBAD8 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 01BBC 80ACBADC 2DE10005 */ sltiu $at, $t7, 0x0005 -/* 01BC0 80ACBAE0 10200044 */ beq $at, $zero, .L80ACBBF4 -/* 01BC4 80ACBAE4 000F7880 */ sll $t7, $t7, 2 -/* 01BC8 80ACBAE8 3C0180AD */ lui $at, %hi(jtbl_80ACD830) ## $at = 80AD0000 -/* 01BCC 80ACBAEC 002F0821 */ addu $at, $at, $t7 -/* 01BD0 80ACBAF0 8C2FD830 */ lw $t7, %lo(jtbl_80ACD830)($at) -/* 01BD4 80ACBAF4 01E00008 */ jr $t7 -/* 01BD8 80ACBAF8 00000000 */ nop -glabel L80ACBAFC -/* 01BDC 80ACBAFC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01BE0 80ACBB00 3C180600 */ lui $t8, %hi(D_060015CC) ## $t8 = 06000000 -/* 01BE4 80ACBB04 271815CC */ addiu $t8, $t8, %lo(D_060015CC) ## $t8 = 060015CC -/* 01BE8 80ACBB08 3C0580AD */ lui $a1, %hi(func_80ACB904) ## $a1 = 80AD0000 -/* 01BEC 80ACBB0C 3C0680AD */ lui $a2, %hi(func_80ACC540) ## $a2 = 80AD0000 -/* 01BF0 80ACBB10 24C6C540 */ addiu $a2, $a2, %lo(func_80ACC540) ## $a2 = 80ACC540 -/* 01BF4 80ACBB14 24A5B904 */ addiu $a1, $a1, %lo(func_80ACB904) ## $a1 = 80ACB904 -/* 01BF8 80ACBB18 AFB80010 */ sw $t8, 0x0010($sp) -/* 01BFC 80ACBB1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C00 80ACBB20 26070198 */ addiu $a3, $s0, 0x0198 ## $a3 = 00000198 -/* 01C04 80ACBB24 0C2B342E */ jal func_80ACD0B8 -/* 01C08 80ACBB28 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 01C0C 80ACBB2C 8E391DA8 */ lw $t9, 0x1DA8($s1) ## 00001DA8 -/* 01C10 80ACBB30 10000030 */ beq $zero, $zero, .L80ACBBF4 -/* 01C14 80ACBB34 97220000 */ lhu $v0, 0x0000($t9) ## 00000000 -glabel L80ACBB38 -/* 01C18 80ACBB38 3C0880AD */ lui $t0, %hi(EnOwl_Draw) ## $t0 = 80AD0000 -/* 01C1C 80ACBB3C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01C20 80ACBB40 2508CFB8 */ addiu $t0, $t0, %lo(EnOwl_Draw) ## $t0 = 80ACCFB8 -/* 01C24 80ACBB44 3C090601 */ lui $t1, %hi(D_0600C8A0) ## $t1 = 06010000 -/* 01C28 80ACBB48 AE080134 */ sw $t0, 0x0134($s0) ## 00000134 -/* 01C2C 80ACBB4C 2529C8A0 */ addiu $t1, $t1, %lo(D_0600C8A0) ## $t1 = 0600C8A0 -/* 01C30 80ACBB50 3C0580AD */ lui $a1, %hi(func_80ACBA24) ## $a1 = 80AD0000 -/* 01C34 80ACBB54 3C0680AD */ lui $a2, %hi(func_80ACC540) ## $a2 = 80AD0000 -/* 01C38 80ACBB58 24C6C540 */ addiu $a2, $a2, %lo(func_80ACC540) ## $a2 = 80ACC540 -/* 01C3C 80ACBB5C 24A5BA24 */ addiu $a1, $a1, %lo(func_80ACBA24) ## $a1 = 80ACBA24 -/* 01C40 80ACBB60 AFA90010 */ sw $t1, 0x0010($sp) -/* 01C44 80ACBB64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C48 80ACBB68 26070198 */ addiu $a3, $s0, 0x0198 ## $a3 = 00000198 -/* 01C4C 80ACBB6C 0C2B342E */ jal func_80ACD0B8 -/* 01C50 80ACBB70 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 01C54 80ACBB74 8E2A1DA8 */ lw $t2, 0x1DA8($s1) ## 00001DA8 -/* 01C58 80ACBB78 1000001E */ beq $zero, $zero, .L80ACBBF4 -/* 01C5C 80ACBB7C 95420000 */ lhu $v0, 0x0000($t2) ## 00000000 -glabel L80ACBB80 -/* 01C60 80ACBB80 3C0B80AD */ lui $t3, %hi(EnOwl_Draw) ## $t3 = 80AD0000 -/* 01C64 80ACBB84 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 01C68 80ACBB88 256BCFB8 */ addiu $t3, $t3, %lo(EnOwl_Draw) ## $t3 = 80ACCFB8 -/* 01C6C 80ACBB8C 3C0C0600 */ lui $t4, %hi(D_060015CC) ## $t4 = 06000000 -/* 01C70 80ACBB90 AE0B0134 */ sw $t3, 0x0134($s0) ## 00000134 -/* 01C74 80ACBB94 258C15CC */ addiu $t4, $t4, %lo(D_060015CC) ## $t4 = 060015CC -/* 01C78 80ACBB98 3C0580AD */ lui $a1, %hi(func_80ACB994) ## $a1 = 80AD0000 -/* 01C7C 80ACBB9C 3C0680AD */ lui $a2, %hi(func_80ACC540) ## $a2 = 80AD0000 -/* 01C80 80ACBBA0 24C6C540 */ addiu $a2, $a2, %lo(func_80ACC540) ## $a2 = 80ACC540 -/* 01C84 80ACBBA4 24A5B994 */ addiu $a1, $a1, %lo(func_80ACB994) ## $a1 = 80ACB994 -/* 01C88 80ACBBA8 AFAC0010 */ sw $t4, 0x0010($sp) -/* 01C8C 80ACBBAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C90 80ACBBB0 26070198 */ addiu $a3, $s0, 0x0198 ## $a3 = 00000198 -/* 01C94 80ACBBB4 0C2B342E */ jal func_80ACD0B8 -/* 01C98 80ACBBB8 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 01C9C 80ACBBBC 8E2D1DA8 */ lw $t5, 0x1DA8($s1) ## 00001DA8 -/* 01CA0 80ACBBC0 1000000C */ beq $zero, $zero, .L80ACBBF4 -/* 01CA4 80ACBBC4 95A20000 */ lhu $v0, 0x0000($t5) ## 00000000 -glabel L80ACBBC8 -/* 01CA8 80ACBBC8 3C0E80AD */ lui $t6, %hi(func_80ACBA24) ## $t6 = 80AD0000 -/* 01CAC 80ACBBCC 25CEBA24 */ addiu $t6, $t6, %lo(func_80ACBA24) ## $t6 = 80ACBA24 -/* 01CB0 80ACBBD0 AE000134 */ sw $zero, 0x0134($s0) ## 00000134 -/* 01CB4 80ACBBD4 AE0E040C */ sw $t6, 0x040C($s0) ## 0000040C -/* 01CB8 80ACBBD8 8E2F1DA8 */ lw $t7, 0x1DA8($s1) ## 00001DA8 -/* 01CBC 80ACBBDC 10000005 */ beq $zero, $zero, .L80ACBBF4 -/* 01CC0 80ACBBE0 95E20000 */ lhu $v0, 0x0000($t7) ## 00000000 -glabel L80ACBBE4 -/* 01CC4 80ACBBE4 0C00B55C */ jal Actor_Kill - -/* 01CC8 80ACBBE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01CCC 80ACBBEC 8E381DA8 */ lw $t8, 0x1DA8($s1) ## 00001DA8 -/* 01CD0 80ACBBF0 97020000 */ lhu $v0, 0x0000($t8) ## 00000000 -.L80ACBBF4: -/* 01CD4 80ACBBF4 A202040A */ sb $v0, 0x040A($s0) ## 0000040A -/* 01CD8 80ACBBF8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01CDC 80ACBBFC 8FB10020 */ lw $s1, 0x0020($sp) -/* 01CE0 80ACBC00 8FB0001C */ lw $s0, 0x001C($sp) -/* 01CE4 80ACBC04 03E00008 */ jr $ra -/* 01CE8 80ACBC08 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBC0C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBC0C.s deleted file mode 100644 index 809247364d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBC0C.s +++ /dev/null @@ -1,99 +0,0 @@ -.late_rodata -glabel D_80ACD844 - .float 6000.0 - -glabel D_80ACD848 - .float 0.4 - -glabel D_80ACD84C - .float 0.2 - -.text -glabel func_80ACBC0C -/* 01CEC 80ACBC0C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01CF0 80ACBC10 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01CF4 80ACBC14 AFB00020 */ sw $s0, 0x0020($sp) -/* 01CF8 80ACBC18 AFA5002C */ sw $a1, 0x002C($sp) -/* 01CFC 80ACBC1C 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 01D00 80ACBC20 3C0180AD */ lui $at, %hi(D_80ACD844) ## $at = 80AD0000 -/* 01D04 80ACBC24 C4860090 */ lwc1 $f6, 0x0090($a0) ## 00000090 -/* 01D08 80ACBC28 35CF0020 */ ori $t7, $t6, 0x0020 ## $t7 = 00000020 -/* 01D0C 80ACBC2C AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 01D10 80ACBC30 C424D844 */ lwc1 $f4, %lo(D_80ACD844)($at) -/* 01D14 80ACBC34 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01D18 80ACBC38 4606203C */ c.lt.s $f4, $f6 -/* 01D1C 80ACBC3C 00000000 */ nop -/* 01D20 80ACBC40 45020008 */ bc1fl .L80ACBC64 -/* 01D24 80ACBC44 86050400 */ lh $a1, 0x0400($s0) ## 00000400 -/* 01D28 80ACBC48 949803FC */ lhu $t8, 0x03FC($a0) ## 000003FC -/* 01D2C 80ACBC4C 33190080 */ andi $t9, $t8, 0x0080 ## $t9 = 00000000 -/* 01D30 80ACBC50 57200004 */ bnel $t9, $zero, .L80ACBC64 -/* 01D34 80ACBC54 86050400 */ lh $a1, 0x0400($s0) ## 00000400 -/* 01D38 80ACBC58 0C00B55C */ jal Actor_Kill - -/* 01D3C 80ACBC5C 00000000 */ nop -/* 01D40 80ACBC60 86050400 */ lh $a1, 0x0400($s0) ## 00000400 -.L80ACBC64: -/* 01D44 80ACBC64 24080040 */ addiu $t0, $zero, 0x0040 ## $t0 = 00000040 -/* 01D48 80ACBC68 AFA80010 */ sw $t0, 0x0010($sp) -/* 01D4C 80ACBC6C 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 01D50 80ACBC70 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01D54 80ACBC74 0C01E1A7 */ jal Math_SmoothStepToS - -/* 01D58 80ACBC78 24070080 */ addiu $a3, $zero, 0x0080 ## $a3 = 00000080 -/* 01D5C 80ACBC7C 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 01D60 80ACBC80 44814000 */ mtc1 $at, $f8 ## $f8 = 16.00 -/* 01D64 80ACBC84 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 01D68 80ACBC88 86090032 */ lh $t1, 0x0032($s0) ## 00000032 -/* 01D6C 80ACBC8C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01D70 80ACBC90 4608003C */ c.lt.s $f0, $f8 -/* 01D74 80ACBC94 A60900B6 */ sh $t1, 0x00B6($s0) ## 000000B6 -/* 01D78 80ACBC98 45020006 */ bc1fl .L80ACBCB4 -/* 01D7C 80ACBC9C 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 01D80 80ACBCA0 44815000 */ mtc1 $at, $f10 ## $f10 = 1000.00 -/* 01D84 80ACBCA4 00000000 */ nop -/* 01D88 80ACBCA8 460A0400 */ add.s $f16, $f0, $f10 -/* 01D8C 80ACBCAC E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 01D90 80ACBCB0 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -.L80ACBCB4: -/* 01D94 80ACBCB4 44812000 */ mtc1 $at, $f4 ## $f4 = 1000.00 -/* 01D98 80ACBCB8 C61203F8 */ lwc1 $f18, 0x03F8($s0) ## 000003F8 -/* 01D9C 80ACBCBC C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 01DA0 80ACBCC0 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 01DA4 80ACBCC4 46049180 */ add.s $f6, $f18, $f4 -/* 01DA8 80ACBCC8 4608303C */ c.lt.s $f6, $f8 -/* 01DAC 80ACBCCC 00000000 */ nop -/* 01DB0 80ACBCD0 4502000D */ bc1fl .L80ACBD08 -/* 01DB4 80ACBCD4 C6000060 */ lwc1 $f0, 0x0060($s0) ## 00000060 -/* 01DB8 80ACBCD8 C6000060 */ lwc1 $f0, 0x0060($s0) ## 00000060 -/* 01DBC 80ACBCDC 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 01DC0 80ACBCE0 3C0180AD */ lui $at, %hi(D_80ACD848) ## $at = 80AD0000 -/* 01DC4 80ACBCE4 4600503C */ c.lt.s $f10, $f0 -/* 01DC8 80ACBCE8 00000000 */ nop -/* 01DCC 80ACBCEC 45020010 */ bc1fl .L80ACBD30 -/* 01DD0 80ACBCF0 960A03FC */ lhu $t2, 0x03FC($s0) ## 000003FC -/* 01DD4 80ACBCF4 C430D848 */ lwc1 $f16, %lo(D_80ACD848)($at) -/* 01DD8 80ACBCF8 46100481 */ sub.s $f18, $f0, $f16 -/* 01DDC 80ACBCFC 1000000B */ beq $zero, $zero, .L80ACBD2C -/* 01DE0 80ACBD00 E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060 -/* 01DE4 80ACBD04 C6000060 */ lwc1 $f0, 0x0060($s0) ## 00000060 -.L80ACBD08: -/* 01DE8 80ACBD08 44812000 */ mtc1 $at, $f4 ## $f4 = -0.00 -/* 01DEC 80ACBD0C 3C0180AD */ lui $at, %hi(D_80ACD84C) ## $at = 80AD0000 -/* 01DF0 80ACBD10 4604003C */ c.lt.s $f0, $f4 -/* 01DF4 80ACBD14 00000000 */ nop -/* 01DF8 80ACBD18 45020005 */ bc1fl .L80ACBD30 -/* 01DFC 80ACBD1C 960A03FC */ lhu $t2, 0x03FC($s0) ## 000003FC -/* 01E00 80ACBD20 C426D84C */ lwc1 $f6, %lo(D_80ACD84C)($at) -/* 01E04 80ACBD24 46060200 */ add.s $f8, $f0, $f6 -/* 01E08 80ACBD28 E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 -.L80ACBD2C: -/* 01E0C 80ACBD2C 960A03FC */ lhu $t2, 0x03FC($s0) ## 000003FC -.L80ACBD30: -/* 01E10 80ACBD30 354B0008 */ ori $t3, $t2, 0x0008 ## $t3 = 00000008 -/* 01E14 80ACBD34 A60B03FC */ sh $t3, 0x03FC($s0) ## 000003FC -/* 01E18 80ACBD38 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01E1C 80ACBD3C 8FB00020 */ lw $s0, 0x0020($sp) -/* 01E20 80ACBD40 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01E24 80ACBD44 03E00008 */ jr $ra -/* 01E28 80ACBD48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBD4C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBD4C.s deleted file mode 100644 index 3b88605c7e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBD4C.s +++ /dev/null @@ -1,93 +0,0 @@ -glabel func_80ACBD4C -/* 01E2C 80ACBD4C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01E30 80ACBD50 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01E34 80ACBD54 AFB00020 */ sw $s0, 0x0020($sp) -/* 01E38 80ACBD58 AFA5002C */ sw $a1, 0x002C($sp) -/* 01E3C 80ACBD5C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01E40 80ACBD60 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 01E44 80ACBD64 C48001B0 */ lwc1 $f0, 0x01B0($a0) ## 000001B0 -/* 01E48 80ACBD68 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01E4C 80ACBD6C 24840032 */ addiu $a0, $a0, 0x0032 ## $a0 = 00000032 -/* 01E50 80ACBD70 4600203C */ c.lt.s $f4, $f0 -/* 01E54 80ACBD74 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 01E58 80ACBD78 24070400 */ addiu $a3, $zero, 0x0400 ## $a3 = 00000400 -/* 01E5C 80ACBD7C 240E0040 */ addiu $t6, $zero, 0x0040 ## $t6 = 00000040 -/* 01E60 80ACBD80 45020008 */ bc1fl .L80ACBDA4 -/* 01E64 80ACBD84 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 01E68 80ACBD88 86050400 */ lh $a1, 0x0400($s0) ## 00000400 -/* 01E6C 80ACBD8C 0C01E1A7 */ jal Math_SmoothStepToS - -/* 01E70 80ACBD90 AFAE0010 */ sw $t6, 0x0010($sp) -/* 01E74 80ACBD94 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 -/* 01E78 80ACBD98 C60001B0 */ lwc1 $f0, 0x01B0($s0) ## 000001B0 -/* 01E7C 80ACBD9C A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B6 -/* 01E80 80ACBDA0 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -.L80ACBDA4: -/* 01E84 80ACBDA4 44813000 */ mtc1 $at, $f6 ## $f6 = 45.00 -/* 01E88 80ACBDA8 3C0580AD */ lui $a1, %hi(func_80ACBC0C) ## $a1 = 80AD0000 -/* 01E8C 80ACBDAC 3C0680AD */ lui $a2, %hi(func_80ACC460) ## $a2 = 80AD0000 -/* 01E90 80ACBDB0 4600303C */ c.lt.s $f6, $f0 -/* 01E94 80ACBDB4 3C014188 */ lui $at, 0x4188 ## $at = 41880000 -/* 01E98 80ACBDB8 24C6C460 */ addiu $a2, $a2, %lo(func_80ACC460) ## $a2 = 80ACC460 -/* 01E9C 80ACBDBC 24A5BC0C */ addiu $a1, $a1, %lo(func_80ACBC0C) ## $a1 = 80ACBC0C -/* 01EA0 80ACBDC0 4500000A */ bc1f .L80ACBDEC -/* 01EA4 80ACBDC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01EA8 80ACBDC8 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 01EAC 80ACBDCC 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 -/* 01EB0 80ACBDD0 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 01EB4 80ACBDD4 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 01EB8 80ACBDD8 44818000 */ mtc1 $at, $f16 ## $f16 = 8.00 -/* 01EBC 80ACBDDC E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 -/* 01EC0 80ACBDE0 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C -/* 01EC4 80ACBDE4 1000000E */ beq $zero, $zero, .L80ACBE20 -/* 01EC8 80ACBDE8 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -.L80ACBDEC: -/* 01ECC 80ACBDEC 44819000 */ mtc1 $at, $f18 ## $f18 = 8.00 -/* 01ED0 80ACBDF0 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 01ED4 80ACBDF4 4600903C */ c.lt.s $f18, $f0 -/* 01ED8 80ACBDF8 00000000 */ nop -/* 01EDC 80ACBDFC 45020009 */ bc1fl .L80ACBE24 -/* 01EE0 80ACBE00 960203FC */ lhu $v0, 0x03FC($s0) ## 000003FC -/* 01EE4 80ACBE04 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 -/* 01EE8 80ACBE08 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 01EEC 80ACBE0C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01EF0 80ACBE10 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 -/* 01EF4 80ACBE14 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 -/* 01EF8 80ACBE18 E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C -/* 01EFC 80ACBE1C E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -.L80ACBE20: -/* 01F00 80ACBE20 960203FC */ lhu $v0, 0x03FC($s0) ## 000003FC -.L80ACBE24: -/* 01F04 80ACBE24 3C190600 */ lui $t9, %hi(D_060015CC) ## $t9 = 06000000 -/* 01F08 80ACBE28 273915CC */ addiu $t9, $t9, %lo(D_060015CC) ## $t9 = 060015CC -/* 01F0C 80ACBE2C 30580001 */ andi $t8, $v0, 0x0001 ## $t8 = 00000000 -/* 01F10 80ACBE30 13000014 */ beq $t8, $zero, .L80ACBE84 -/* 01F14 80ACBE34 26070198 */ addiu $a3, $s0, 0x0198 ## $a3 = 00000198 -/* 01F18 80ACBE38 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 01F1C 80ACBE3C AFB90010 */ sw $t9, 0x0010($sp) -/* 01F20 80ACBE40 0C2B342E */ jal func_80ACD0B8 -/* 01F24 80ACBE44 E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 01F28 80ACBE48 960903FC */ lhu $t1, 0x03FC($s0) ## 000003FC -/* 01F2C 80ACBE4C 24080006 */ addiu $t0, $zero, 0x0006 ## $t0 = 00000006 -/* 01F30 80ACBE50 A60803FE */ sh $t0, 0x03FE($s0) ## 000003FE -/* 01F34 80ACBE54 312A0040 */ andi $t2, $t1, 0x0040 ## $t2 = 00000000 -/* 01F38 80ACBE58 51400007 */ beql $t2, $zero, .L80ACBE78 -/* 01F3C 80ACBE5C 860D0400 */ lh $t5, 0x0400($s0) ## 00000400 -/* 01F40 80ACBE60 860B0400 */ lh $t3, 0x0400($s0) ## 00000400 -/* 01F44 80ACBE64 960203FC */ lhu $v0, 0x03FC($s0) ## 000003FC -/* 01F48 80ACBE68 256C2000 */ addiu $t4, $t3, 0x2000 ## $t4 = 00002000 -/* 01F4C 80ACBE6C 10000005 */ beq $zero, $zero, .L80ACBE84 -/* 01F50 80ACBE70 A60C0400 */ sh $t4, 0x0400($s0) ## 00000400 -/* 01F54 80ACBE74 860D0400 */ lh $t5, 0x0400($s0) ## 00000400 -.L80ACBE78: -/* 01F58 80ACBE78 960203FC */ lhu $v0, 0x03FC($s0) ## 000003FC -/* 01F5C 80ACBE7C 25AEE000 */ addiu $t6, $t5, 0xE000 ## $t6 = FFFFE000 -/* 01F60 80ACBE80 A60E0400 */ sh $t6, 0x0400($s0) ## 00000400 -.L80ACBE84: -/* 01F64 80ACBE84 344F0008 */ ori $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 01F68 80ACBE88 A60F03FC */ sh $t7, 0x03FC($s0) ## 000003FC -/* 01F6C 80ACBE8C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01F70 80ACBE90 8FB00020 */ lw $s0, 0x0020($sp) -/* 01F74 80ACBE94 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01F78 80ACBE98 03E00008 */ jr $ra -/* 01F7C 80ACBE9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBEA0.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBEA0.s deleted file mode 100644 index d96b4fea10..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBEA0.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80ACBEA0 -/* 01F80 80ACBEA0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01F84 80ACBEA4 AFBF001C */ sw $ra, 0x001C($sp) -/* 01F88 80ACBEA8 AFA50024 */ sw $a1, 0x0024($sp) -/* 01F8C 80ACBEAC 948203FC */ lhu $v0, 0x03FC($a0) ## 000003FC -/* 01F90 80ACBEB0 3C0580AD */ lui $a1, %hi(func_80ACBD4C) ## $a1 = 80AD0000 -/* 01F94 80ACBEB4 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 01F98 80ACBEB8 304E0001 */ andi $t6, $v0, 0x0001 ## $t6 = 00000000 -/* 01F9C 80ACBEBC 11C0001E */ beq $t6, $zero, .L80ACBF38 -/* 01FA0 80ACBEC0 24A5BD4C */ addiu $a1, $a1, %lo(func_80ACBD4C) ## $a1 = 80ACBD4C -/* 01FA4 80ACBEC4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01FA8 80ACBEC8 A48F03FE */ sh $t7, 0x03FE($a0) ## 000003FE -/* 01FAC 80ACBECC 3C180600 */ lui $t8, %hi(D_06001168) ## $t8 = 06000000 -/* 01FB0 80ACBED0 27181168 */ addiu $t8, $t8, %lo(D_06001168) ## $t8 = 06001168 -/* 01FB4 80ACBED4 3C0680AD */ lui $a2, %hi(func_80ACC540) ## $a2 = 80AD0000 -/* 01FB8 80ACBED8 24C6C540 */ addiu $a2, $a2, %lo(func_80ACC540) ## $a2 = 80ACC540 -/* 01FBC 80ACBEDC AFB80010 */ sw $t8, 0x0010($sp) -/* 01FC0 80ACBEE0 AFA40020 */ sw $a0, 0x0020($sp) -/* 01FC4 80ACBEE4 24870198 */ addiu $a3, $a0, 0x0198 ## $a3 = 00000198 -/* 01FC8 80ACBEE8 0C2B342E */ jal func_80ACD0B8 -/* 01FCC 80ACBEEC E7A40014 */ swc1 $f4, 0x0014($sp) -/* 01FD0 80ACBEF0 8FA40020 */ lw $a0, 0x0020($sp) -/* 01FD4 80ACBEF4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 01FD8 80ACBEF8 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 -/* 01FDC 80ACBEFC 949903FC */ lhu $t9, 0x03FC($a0) ## 000003FC -/* 01FE0 80ACBF00 C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 -/* 01FE4 80ACBF04 E4880060 */ swc1 $f8, 0x0060($a0) ## 00000060 -/* 01FE8 80ACBF08 33280040 */ andi $t0, $t9, 0x0040 ## $t0 = 00000000 -/* 01FEC 80ACBF0C 11000006 */ beq $t0, $zero, .L80ACBF28 -/* 01FF0 80ACBF10 E48603F8 */ swc1 $f6, 0x03F8($a0) ## 000003F8 -/* 01FF4 80ACBF14 84890032 */ lh $t1, 0x0032($a0) ## 00000032 -/* 01FF8 80ACBF18 948203FC */ lhu $v0, 0x03FC($a0) ## 000003FC -/* 01FFC 80ACBF1C 252A4000 */ addiu $t2, $t1, 0x4000 ## $t2 = 00004000 -/* 02000 80ACBF20 10000005 */ beq $zero, $zero, .L80ACBF38 -/* 02004 80ACBF24 A48A0400 */ sh $t2, 0x0400($a0) ## 00000400 -.L80ACBF28: -/* 02008 80ACBF28 848B0032 */ lh $t3, 0x0032($a0) ## 00000032 -/* 0200C 80ACBF2C 948203FC */ lhu $v0, 0x03FC($a0) ## 000003FC -/* 02010 80ACBF30 256CC000 */ addiu $t4, $t3, 0xC000 ## $t4 = FFFFC000 -/* 02014 80ACBF34 A48C0400 */ sh $t4, 0x0400($a0) ## 00000400 -.L80ACBF38: -/* 02018 80ACBF38 344D0008 */ ori $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 0201C 80ACBF3C A48D03FC */ sh $t5, 0x03FC($a0) ## 000003FC -/* 02020 80ACBF40 8FBF001C */ lw $ra, 0x001C($sp) -/* 02024 80ACBF44 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02028 80ACBF48 03E00008 */ jr $ra -/* 0202C 80ACBF4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBF50.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBF50.s deleted file mode 100644 index 2714d79678..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBF50.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_80ACBF50 -/* 02030 80ACBF50 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02034 80ACBF54 AFB00020 */ sw $s0, 0x0020($sp) -/* 02038 80ACBF58 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0203C 80ACBF5C AFBF0024 */ sw $ra, 0x0024($sp) -/* 02040 80ACBF60 AFA5002C */ sw $a1, 0x002C($sp) -/* 02044 80ACBF64 86050400 */ lh $a1, 0x0400($s0) ## 00000400 -/* 02048 80ACBF68 240E0258 */ addiu $t6, $zero, 0x0258 ## $t6 = 00000258 -/* 0204C 80ACBF6C AFAE0010 */ sw $t6, 0x0010($sp) -/* 02050 80ACBF70 24840032 */ addiu $a0, $a0, 0x0032 ## $a0 = 00000032 -/* 02054 80ACBF74 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02058 80ACBF78 0C01E1A7 */ jal Math_SmoothStepToS - -/* 0205C 80ACBF7C 24070384 */ addiu $a3, $zero, 0x0384 ## $a3 = 00000384 -/* 02060 80ACBF80 960203FC */ lhu $v0, 0x03FC($s0) ## 000003FC -/* 02064 80ACBF84 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 -/* 02068 80ACBF88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0206C 80ACBF8C 30580001 */ andi $t8, $v0, 0x0001 ## $t8 = 00000000 -/* 02070 80ACBF90 13000017 */ beq $t8, $zero, .L80ACBFF0 -/* 02074 80ACBF94 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B6 -/* 02078 80ACBF98 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0207C 80ACBF9C 3C190600 */ lui $t9, %hi(D_060015CC) ## $t9 = 06000000 -/* 02080 80ACBFA0 273915CC */ addiu $t9, $t9, %lo(D_060015CC) ## $t9 = 060015CC -/* 02084 80ACBFA4 3C0580AD */ lui $a1, %hi(func_80ACBC0C) ## $a1 = 80AD0000 -/* 02088 80ACBFA8 3C0680AD */ lui $a2, %hi(func_80ACC460) ## $a2 = 80AD0000 -/* 0208C 80ACBFAC 24C6C460 */ addiu $a2, $a2, %lo(func_80ACC460) ## $a2 = 80ACC460 -/* 02090 80ACBFB0 24A5BC0C */ addiu $a1, $a1, %lo(func_80ACBC0C) ## $a1 = 80ACBC0C -/* 02094 80ACBFB4 AFB90010 */ sw $t9, 0x0010($sp) -/* 02098 80ACBFB8 26070198 */ addiu $a3, $s0, 0x0198 ## $a3 = 00000198 -/* 0209C 80ACBFBC 0C2B342E */ jal func_80ACD0B8 -/* 020A0 80ACBFC0 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 020A4 80ACBFC4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 020A8 80ACBFC8 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 -/* 020AC 80ACBFCC 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 020B0 80ACBFD0 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 020B4 80ACBFD4 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 -/* 020B8 80ACBFD8 24080006 */ addiu $t0, $zero, 0x0006 ## $t0 = 00000006 -/* 020BC 80ACBFDC A60803FE */ sh $t0, 0x03FE($s0) ## 000003FE -/* 020C0 80ACBFE0 960203FC */ lhu $v0, 0x03FC($s0) ## 000003FC -/* 020C4 80ACBFE4 E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 -/* 020C8 80ACBFE8 E608006C */ swc1 $f8, 0x006C($s0) ## 0000006C -/* 020CC 80ACBFEC E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -.L80ACBFF0: -/* 020D0 80ACBFF0 34490008 */ ori $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 020D4 80ACBFF4 A60903FC */ sh $t1, 0x03FC($s0) ## 000003FC -/* 020D8 80ACBFF8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 020DC 80ACBFFC 8FB00020 */ lw $s0, 0x0020($sp) -/* 020E0 80ACC000 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 020E4 80ACC004 03E00008 */ jr $ra -/* 020E8 80ACC008 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC00C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC00C.s deleted file mode 100644 index 07f6c6deed..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC00C.s +++ /dev/null @@ -1,191 +0,0 @@ -.rdata -glabel D_80ACD754 - .asciz "\x1b[36m" - .balign 4 - -glabel D_80ACD75C - .asciz "%dのフクロウ\n" - .balign 4 - -glabel D_80ACD76C - .asciz "\x1b[m" - .balign 4 - -glabel D_80ACD770 - .asciz "\x1b[36m" - .balign 4 - -glabel D_80ACD778 - .asciz "SPOT 06 の デモがはしった\n" - .balign 4 - -glabel D_80ACD794 - .asciz "\x1b[m" - .balign 4 - -glabel D_80ACD798 - .asciz "0" - .balign 4 - -glabel D_80ACD79C - .asciz "../z_en_owl.c" - .balign 4 - -.text -glabel func_80ACC00C -/* 020EC 80ACC00C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 020F0 80ACC010 AFB00020 */ sw $s0, 0x0020($sp) -/* 020F4 80ACC014 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 020F8 80ACC018 AFBF0024 */ sw $ra, 0x0024($sp) -/* 020FC 80ACC01C AFA50034 */ sw $a1, 0x0034($sp) -/* 02100 80ACC020 86050400 */ lh $a1, 0x0400($s0) ## 00000400 -/* 02104 80ACC024 240E0258 */ addiu $t6, $zero, 0x0258 ## $t6 = 00000258 -/* 02108 80ACC028 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0210C 80ACC02C 24840032 */ addiu $a0, $a0, 0x0032 ## $a0 = 00000032 -/* 02110 80ACC030 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02114 80ACC034 0C01E1A7 */ jal Math_SmoothStepToS - -/* 02118 80ACC038 24070384 */ addiu $a3, $zero, 0x0384 ## $a3 = 00000384 -/* 0211C 80ACC03C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 02120 80ACC040 44813000 */ mtc1 $at, $f6 ## $f6 = 50.00 -/* 02124 80ACC044 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 02128 80ACC048 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 -/* 0212C 80ACC04C 4606203C */ c.lt.s $f4, $f6 -/* 02130 80ACC050 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B6 -/* 02134 80ACC054 45020060 */ bc1fl .L80ACC1D8 -/* 02138 80ACC058 3C014214 */ lui $at, 0x4214 ## $at = 42140000 -/* 0213C 80ACC05C 0C02FF21 */ jal Gameplay_InCsMode -/* 02140 80ACC060 8FA40034 */ lw $a0, 0x0034($sp) -/* 02144 80ACC064 5440005C */ bnel $v0, $zero, .L80ACC1D8 -/* 02148 80ACC068 3C014214 */ lui $at, 0x4214 ## $at = 42140000 -/* 0214C 80ACC06C 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 02150 80ACC070 3C0480AD */ lui $a0, %hi(D_80ACD754) ## $a0 = 80AD0000 -/* 02154 80ACC074 2484D754 */ addiu $a0, $a0, %lo(D_80ACD754) ## $a0 = 80ACD754 -/* 02158 80ACC078 33190FC0 */ andi $t9, $t8, 0x0FC0 ## $t9 = 00000000 -/* 0215C 80ACC07C 00194183 */ sra $t0, $t9, 6 -/* 02160 80ACC080 0C00084C */ jal osSyncPrintf - -/* 02164 80ACC084 AFA8002C */ sw $t0, 0x002C($sp) -/* 02168 80ACC088 3C0480AD */ lui $a0, %hi(D_80ACD75C) ## $a0 = 80AD0000 -/* 0216C 80ACC08C 2484D75C */ addiu $a0, $a0, %lo(D_80ACD75C) ## $a0 = 80ACD75C -/* 02170 80ACC090 0C00084C */ jal osSyncPrintf - -/* 02174 80ACC094 8FA5002C */ lw $a1, 0x002C($sp) -/* 02178 80ACC098 3C0480AD */ lui $a0, %hi(D_80ACD76C) ## $a0 = 80AD0000 -/* 0217C 80ACC09C 0C00084C */ jal osSyncPrintf - -/* 02180 80ACC0A0 2484D76C */ addiu $a0, $a0, %lo(D_80ACD76C) ## $a0 = 80ACD76C -/* 02184 80ACC0A4 8FA2002C */ lw $v0, 0x002C($sp) -/* 02188 80ACC0A8 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 0218C 80ACC0AC 3C0480AD */ lui $a0, %hi(D_80ACD770) ## $a0 = 80AD0000 -/* 02190 80ACC0B0 10410008 */ beq $v0, $at, .L80ACC0D4 -/* 02194 80ACC0B4 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 02198 80ACC0B8 10410020 */ beq $v0, $at, .L80ACC13C -/* 0219C 80ACC0BC 3C0A8016 */ lui $t2, %hi(gSegments) -/* 021A0 80ACC0C0 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 021A4 80ACC0C4 1041001D */ beq $v0, $at, .L80ACC13C -/* 021A8 80ACC0C8 3C0480AD */ lui $a0, %hi(D_80ACD798) ## $a0 = 80AD0000 -/* 021AC 80ACC0CC 1000002C */ beq $zero, $zero, .L80ACC180 -/* 021B0 80ACC0D0 2484D798 */ addiu $a0, $a0, %lo(D_80ACD798) ## $a0 = 80ACD798 -.L80ACC0D4: -/* 021B4 80ACC0D4 0C00084C */ jal osSyncPrintf - -/* 021B8 80ACC0D8 2484D770 */ addiu $a0, $a0, %lo(D_80ACD770) ## $a0 = 80ACAF08 -/* 021BC 80ACC0DC 3C0480AD */ lui $a0, %hi(D_80ACD778) ## $a0 = 80AD0000 -/* 021C0 80ACC0E0 0C00084C */ jal osSyncPrintf - -/* 021C4 80ACC0E4 2484D778 */ addiu $a0, $a0, %lo(D_80ACD778) ## $a0 = 80ACD778 -/* 021C8 80ACC0E8 3C0480AD */ lui $a0, %hi(D_80ACD794) ## $a0 = 80AD0000 -/* 021CC 80ACC0EC 0C00084C */ jal osSyncPrintf - -/* 021D0 80ACC0F0 2484D794 */ addiu $a0, $a0, %lo(D_80ACD794) ## $a0 = 80ACD794 -/* 021D4 80ACC0F4 3C020202 */ lui $v0, %hi(D_0201B0C0) ## $v0 = 02020000 -/* 021D8 80ACC0F8 2442B0C0 */ addiu $v0, $v0, %lo(D_0201B0C0) ## $v0 = 0201B0C0 -/* 021DC 80ACC0FC 00024900 */ sll $t1, $v0, 4 -/* 021E0 80ACC100 00095702 */ srl $t2, $t1, 28 -/* 021E4 80ACC104 000A5880 */ sll $t3, $t2, 2 -/* 021E8 80ACC108 3C0C8016 */ lui $t4, %hi(gSegments) -/* 021EC 80ACC10C 018B6021 */ addu $t4, $t4, $t3 -/* 021F0 80ACC110 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 021F4 80ACC114 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) -/* 021F8 80ACC118 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 021FC 80ACC11C 00416824 */ and $t5, $v0, $at -/* 02200 80ACC120 8FB80034 */ lw $t8, 0x0034($sp) -/* 02204 80ACC124 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02208 80ACC128 018D7021 */ addu $t6, $t4, $t5 -/* 0220C 80ACC12C 01C17821 */ addu $t7, $t6, $at -/* 02210 80ACC130 AF0F1D68 */ sw $t7, 0x1D68($t8) ## 00001D68 -/* 02214 80ACC134 10000016 */ beq $zero, $zero, .L80ACC190 -/* 02218 80ACC138 AE000134 */ sw $zero, 0x0134($s0) ## 00000134 -.L80ACC13C: -/* 0221C 80ACC13C 3C020202 */ lui $v0, %hi(D_0201E6A0) ## $v0 = 02020000 -/* 02220 80ACC140 2442E6A0 */ addiu $v0, $v0, %lo(D_0201E6A0) ## $v0 = 0201E6A0 -/* 02224 80ACC144 0002C900 */ sll $t9, $v0, 4 -/* 02228 80ACC148 00194702 */ srl $t0, $t9, 28 -/* 0222C 80ACC14C 00084880 */ sll $t1, $t0, 2 -/* 02230 80ACC150 01495021 */ addu $t2, $t2, $t1 -/* 02234 80ACC154 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 02238 80ACC158 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) -/* 0223C 80ACC15C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 02240 80ACC160 00415824 */ and $t3, $v0, $at -/* 02244 80ACC164 8FAE0034 */ lw $t6, 0x0034($sp) -/* 02248 80ACC168 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0224C 80ACC16C 014B6021 */ addu $t4, $t2, $t3 -/* 02250 80ACC170 01816821 */ addu $t5, $t4, $at -/* 02254 80ACC174 ADCD1D68 */ sw $t5, 0x1D68($t6) ## 00001D68 -/* 02258 80ACC178 10000005 */ beq $zero, $zero, .L80ACC190 -/* 0225C 80ACC17C AE000134 */ sw $zero, 0x0134($s0) ## 00000134 -.L80ACC180: -/* 02260 80ACC180 3C0580AD */ lui $a1, %hi(D_80ACD79C) ## $a1 = 80AD0000 -/* 02264 80ACC184 24A5D79C */ addiu $a1, $a1, %lo(D_80ACD79C) ## $a1 = 80ACD79C -/* 02268 80ACC188 0C0007FC */ jal __assert - -/* 0226C 80ACC18C 2406069D */ addiu $a2, $zero, 0x069D ## $a2 = 0000069D -.L80ACC190: -/* 02270 80ACC190 0C01E221 */ jal func_80078884 -/* 02274 80ACC194 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 -/* 02278 80ACC198 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 0227C 80ACC19C 3C018016 */ lui $at, %hi(gSaveContext+0x1414) -/* 02280 80ACC1A0 A02FFA74 */ sb $t7, %lo(gSaveContext+0x1414)($at) -/* 02284 80ACC1A4 24040014 */ addiu $a0, $zero, 0x0014 ## $a0 = 00000014 -/* 02288 80ACC1A8 0C03D13B */ jal func_800F44EC -/* 0228C 80ACC1AC 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A -/* 02290 80ACC1B0 961903FC */ lhu $t9, 0x03FC($s0) ## 000003FC -/* 02294 80ACC1B4 3C1880AD */ lui $t8, %hi(func_80ACBA24) ## $t8 = 80AD0000 -/* 02298 80ACC1B8 2718BA24 */ addiu $t8, $t8, %lo(func_80ACBA24) ## $t8 = 80ACBA24 -/* 0229C 80ACC1BC 37280080 */ ori $t0, $t9, 0x0080 ## $t0 = 00000080 -/* 022A0 80ACC1C0 AE18040C */ sw $t8, 0x040C($s0) ## 0000040C -/* 022A4 80ACC1C4 A200040A */ sb $zero, 0x040A($s0) ## 0000040A -/* 022A8 80ACC1C8 A60803FC */ sh $t0, 0x03FC($s0) ## 000003FC -/* 022AC 80ACC1CC 3C018012 */ lui $at, %hi(D_8011FB40) -/* 022B0 80ACC1D0 A420FB40 */ sh $zero, %lo(D_8011FB40)($at) -/* 022B4 80ACC1D4 3C014214 */ lui $at, 0x4214 ## $at = 42140000 -.L80ACC1D8: -/* 022B8 80ACC1D8 44815000 */ mtc1 $at, $f10 ## $f10 = 37.00 -/* 022BC 80ACC1DC C60801B0 */ lwc1 $f8, 0x01B0($s0) ## 000001B0 -/* 022C0 80ACC1E0 4608503E */ c.le.s $f10, $f8 -/* 022C4 80ACC1E4 00000000 */ nop -/* 022C8 80ACC1E8 4502000D */ bc1fl .L80ACC220 -/* 022CC 80ACC1EC 960B03FC */ lhu $t3, 0x03FC($s0) ## 000003FC -/* 022D0 80ACC1F0 960203FE */ lhu $v0, 0x03FE($s0) ## 000003FE -/* 022D4 80ACC1F4 3C0A80AD */ lui $t2, %hi(func_80ACBF50) ## $t2 = 80AD0000 -/* 022D8 80ACC1F8 3C0141A8 */ lui $at, 0x41A8 ## $at = 41A80000 -/* 022DC 80ACC1FC 18400006 */ blez $v0, .L80ACC218 -/* 022E0 80ACC200 254ABF50 */ addiu $t2, $t2, %lo(func_80ACBF50) ## $t2 = 80ACBF50 -/* 022E4 80ACC204 44818000 */ mtc1 $at, $f16 ## $f16 = 21.00 -/* 022E8 80ACC208 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = FFFFFFFF -/* 022EC 80ACC20C A60903FE */ sh $t1, 0x03FE($s0) ## 000003FE -/* 022F0 80ACC210 10000002 */ beq $zero, $zero, .L80ACC21C -/* 022F4 80ACC214 E61001B0 */ swc1 $f16, 0x01B0($s0) ## 000001B0 -.L80ACC218: -/* 022F8 80ACC218 AE0A040C */ sw $t2, 0x040C($s0) ## 0000040C -.L80ACC21C: -/* 022FC 80ACC21C 960B03FC */ lhu $t3, 0x03FC($s0) ## 000003FC -.L80ACC220: -/* 02300 80ACC220 356C0008 */ ori $t4, $t3, 0x0008 ## $t4 = 00000008 -/* 02304 80ACC224 A60C03FC */ sh $t4, 0x03FC($s0) ## 000003FC -/* 02308 80ACC228 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0230C 80ACC22C 8FB00020 */ lw $s0, 0x0020($sp) -/* 02310 80ACC230 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02314 80ACC234 03E00008 */ jr $ra -/* 02318 80ACC238 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC23C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC23C.s deleted file mode 100644 index 94207ad036..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC23C.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel func_80ACC23C -/* 0231C 80ACC23C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02320 80ACC240 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02324 80ACC244 AFB00020 */ sw $s0, 0x0020($sp) -/* 02328 80ACC248 AFA5002C */ sw $a1, 0x002C($sp) -/* 0232C 80ACC24C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 02330 80ACC250 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 -/* 02334 80ACC254 C48401B0 */ lwc1 $f4, 0x01B0($a0) ## 000001B0 -/* 02338 80ACC258 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0233C 80ACC25C 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 02340 80ACC260 4606203C */ c.lt.s $f4, $f6 -/* 02344 80ACC264 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02348 80ACC268 24070384 */ addiu $a3, $zero, 0x0384 ## $a3 = 00000384 -/* 0234C 80ACC26C 240E0258 */ addiu $t6, $zero, 0x0258 ## $t6 = 00000258 -/* 02350 80ACC270 45020005 */ bc1fl .L80ACC288 -/* 02354 80ACC274 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 02358 80ACC278 44814000 */ mtc1 $at, $f8 ## $f8 = 1.50 -/* 0235C 80ACC27C 10000009 */ beq $zero, $zero, .L80ACC2A4 -/* 02360 80ACC280 E4880068 */ swc1 $f8, 0x0068($a0) ## 00000068 -/* 02364 80ACC284 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -.L80ACC288: -/* 02368 80ACC288 86050400 */ lh $a1, 0x0400($s0) ## 00000400 -/* 0236C 80ACC28C 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 02370 80ACC290 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 02374 80ACC294 0C01E1A7 */ jal Math_SmoothStepToS - -/* 02378 80ACC298 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0237C 80ACC29C 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 -/* 02380 80ACC2A0 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B6 -.L80ACC2A4: -/* 02384 80ACC2A4 3C014214 */ lui $at, 0x4214 ## $at = 42140000 -/* 02388 80ACC2A8 44819000 */ mtc1 $at, $f18 ## $f18 = 37.00 -/* 0238C 80ACC2AC C61001B0 */ lwc1 $f16, 0x01B0($s0) ## 000001B0 -/* 02390 80ACC2B0 3C1880AD */ lui $t8, %hi(func_80ACC00C) ## $t8 = 80AD0000 -/* 02394 80ACC2B4 3C0141A8 */ lui $at, 0x41A8 ## $at = 41A80000 -/* 02398 80ACC2B8 4610903E */ c.le.s $f18, $f16 -/* 0239C 80ACC2BC 2718C00C */ addiu $t8, $t8, %lo(func_80ACC00C) ## $t8 = 80ACC00C -/* 023A0 80ACC2C0 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 -/* 023A4 80ACC2C4 4502000A */ bc1fl .L80ACC2F0 -/* 023A8 80ACC2C8 960803FC */ lhu $t0, 0x03FC($s0) ## 000003FC -/* 023AC 80ACC2CC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 023B0 80ACC2D0 44812000 */ mtc1 $at, $f4 ## $f4 = 21.00 -/* 023B4 80ACC2D4 AE18040C */ sw $t8, 0x040C($s0) ## 0000040C -/* 023B8 80ACC2D8 A61903FE */ sh $t9, 0x03FE($s0) ## 000003FE -/* 023BC 80ACC2DC E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 -/* 023C0 80ACC2E0 E600006C */ swc1 $f0, 0x006C($s0) ## 0000006C -/* 023C4 80ACC2E4 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 023C8 80ACC2E8 E60401B0 */ swc1 $f4, 0x01B0($s0) ## 000001B0 -/* 023CC 80ACC2EC 960803FC */ lhu $t0, 0x03FC($s0) ## 000003FC -.L80ACC2F0: -/* 023D0 80ACC2F0 35090008 */ ori $t1, $t0, 0x0008 ## $t1 = 00000008 -/* 023D4 80ACC2F4 A60903FC */ sh $t1, 0x03FC($s0) ## 000003FC -/* 023D8 80ACC2F8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 023DC 80ACC2FC 8FB00020 */ lw $s0, 0x0020($sp) -/* 023E0 80ACC300 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 023E4 80ACC304 03E00008 */ jr $ra -/* 023E8 80ACC308 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC30C.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC30C.s deleted file mode 100644 index 1041f84d31..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC30C.s +++ /dev/null @@ -1,40 +0,0 @@ -.late_rodata -glabel D_80ACD850 - .float 0.2 - -.text -glabel func_80ACC30C -/* 023EC 80ACC30C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 023F0 80ACC310 AFBF001C */ sw $ra, 0x001C($sp) -/* 023F4 80ACC314 AFA50024 */ sw $a1, 0x0024($sp) -/* 023F8 80ACC318 948203FC */ lhu $v0, 0x03FC($a0) ## 000003FC -/* 023FC 80ACC31C 3C0580AD */ lui $a1, %hi(func_80ACC23C) ## $a1 = 80AD0000 -/* 02400 80ACC320 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 02404 80ACC324 304E0001 */ andi $t6, $v0, 0x0001 ## $t6 = 00000000 -/* 02408 80ACC328 11C00013 */ beq $t6, $zero, .L80ACC378 -/* 0240C 80ACC32C 24A5C23C */ addiu $a1, $a1, %lo(func_80ACC23C) ## $a1 = 80ACC23C -/* 02410 80ACC330 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02414 80ACC334 A48F03FE */ sh $t7, 0x03FE($a0) ## 000003FE -/* 02418 80ACC338 3C180600 */ lui $t8, %hi(D_06001168) ## $t8 = 06000000 -/* 0241C 80ACC33C 27181168 */ addiu $t8, $t8, %lo(D_06001168) ## $t8 = 06001168 -/* 02420 80ACC340 3C0680AD */ lui $a2, %hi(func_80ACC540) ## $a2 = 80AD0000 -/* 02424 80ACC344 24C6C540 */ addiu $a2, $a2, %lo(func_80ACC540) ## $a2 = 80ACC540 -/* 02428 80ACC348 AFB80010 */ sw $t8, 0x0010($sp) -/* 0242C 80ACC34C AFA40020 */ sw $a0, 0x0020($sp) -/* 02430 80ACC350 24870198 */ addiu $a3, $a0, 0x0198 ## $a3 = 00000198 -/* 02434 80ACC354 0C2B342E */ jal func_80ACD0B8 -/* 02438 80ACC358 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 0243C 80ACC35C 8FA40020 */ lw $a0, 0x0020($sp) -/* 02440 80ACC360 3C0180AD */ lui $at, %hi(D_80ACD850) ## $at = 80AD0000 -/* 02444 80ACC364 C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 -/* 02448 80ACC368 948203FC */ lhu $v0, 0x03FC($a0) ## 000003FC -/* 0244C 80ACC36C E48603F8 */ swc1 $f6, 0x03F8($a0) ## 000003F8 -/* 02450 80ACC370 C428D850 */ lwc1 $f8, %lo(D_80ACD850)($at) -/* 02454 80ACC374 E4880060 */ swc1 $f8, 0x0060($a0) ## 00000060 -.L80ACC378: -/* 02458 80ACC378 34590008 */ ori $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 0245C 80ACC37C A49903FC */ sh $t9, 0x03FC($a0) ## 000003FC -/* 02460 80ACC380 8FBF001C */ lw $ra, 0x001C($sp) -/* 02464 80ACC384 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02468 80ACC388 03E00008 */ jr $ra -/* 0246C 80ACC38C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC390.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC390.s deleted file mode 100644 index e01b789576..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC390.s +++ /dev/null @@ -1,59 +0,0 @@ -glabel func_80ACC390 -/* 02470 80ACC390 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02474 80ACC394 AFB00028 */ sw $s0, 0x0028($sp) -/* 02478 80ACC398 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0247C 80ACC39C AFBF002C */ sw $ra, 0x002C($sp) -/* 02480 80ACC3A0 0C02927F */ jal SkelAnime_Update - -/* 02484 80ACC3A4 8C8403DC */ lw $a0, 0x03DC($a0) ## 000003DC -/* 02488 80ACC3A8 960303FE */ lhu $v1, 0x03FE($s0) ## 000003FE -/* 0248C 80ACC3AC 3C1980AD */ lui $t9, %hi(func_80ACC460) ## $t9 = 80AD0000 -/* 02490 80ACC3B0 2739C460 */ addiu $t9, $t9, %lo(func_80ACC460) ## $t9 = 80ACC460 -/* 02494 80ACC3B4 18600012 */ blez $v1, .L80ACC400 -/* 02498 80ACC3B8 24080006 */ addiu $t0, $zero, 0x0006 ## $t0 = 00000006 -/* 0249C 80ACC3BC 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 024A0 80ACC3C0 31C4FFFF */ andi $a0, $t6, 0xFFFF ## $a0 = 0000FFFF -/* 024A4 80ACC3C4 24010333 */ addiu $at, $zero, 0x0333 ## $at = 00000333 -/* 024A8 80ACC3C8 00810019 */ multu $a0, $at -/* 024AC 80ACC3CC A60E03FE */ sh $t6, 0x03FE($s0) ## 000003FE -/* 024B0 80ACC3D0 00002012 */ mflo $a0 -/* 024B4 80ACC3D4 00042400 */ sll $a0, $a0, 16 -/* 024B8 80ACC3D8 0C01DE1C */ jal Math_SinS - ## sins? -/* 024BC 80ACC3DC 00042403 */ sra $a0, $a0, 16 -/* 024C0 80ACC3E0 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 024C4 80ACC3E4 44812000 */ mtc1 $at, $f4 ## $f4 = 1000.00 -/* 024C8 80ACC3E8 00000000 */ nop -/* 024CC 80ACC3EC 46040182 */ mul.s $f6, $f0, $f4 -/* 024D0 80ACC3F0 4600320D */ trunc.w.s $f8, $f6 -/* 024D4 80ACC3F4 44184000 */ mfc1 $t8, $f8 -/* 024D8 80ACC3F8 10000014 */ beq $zero, $zero, .L80ACC44C -/* 024DC 80ACC3FC A61800B8 */ sh $t8, 0x00B8($s0) ## 000000B8 -.L80ACC400: -/* 024E0 80ACC400 3C040600 */ lui $a0, %hi(D_060015CC) ## $a0 = 06000000 -/* 024E4 80ACC404 AE190410 */ sw $t9, 0x0410($s0) ## 00000410 -/* 024E8 80ACC408 A60803FE */ sh $t0, 0x03FE($s0) ## 000003FE -/* 024EC 80ACC40C 0C028800 */ jal Animation_GetLastFrame - -/* 024F0 80ACC410 248415CC */ addiu $a0, $a0, %lo(D_060015CC) ## $a0 = 060015CC -/* 024F4 80ACC414 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 024F8 80ACC418 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 024FC 80ACC41C 44819000 */ mtc1 $at, $f18 ## $f18 = 5.00 -/* 02500 80ACC420 46805420 */ cvt.s.w $f16, $f10 -/* 02504 80ACC424 8E0403DC */ lw $a0, 0x03DC($s0) ## 000003DC -/* 02508 80ACC428 3C050600 */ lui $a1, %hi(D_060015CC) ## $a1 = 06000000 -/* 0250C 80ACC42C 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 02510 80ACC430 AFA90014 */ sw $t1, 0x0014($sp) -/* 02514 80ACC434 24A515CC */ addiu $a1, $a1, %lo(D_060015CC) ## $a1 = 060015CC -/* 02518 80ACC438 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 0251C 80ACC43C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02520 80ACC440 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02524 80ACC444 0C029468 */ jal Animation_Change - -/* 02528 80ACC448 E7B20018 */ swc1 $f18, 0x0018($sp) -.L80ACC44C: -/* 0252C 80ACC44C 8FBF002C */ lw $ra, 0x002C($sp) -/* 02530 80ACC450 8FB00028 */ lw $s0, 0x0028($sp) -/* 02534 80ACC454 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02538 80ACC458 03E00008 */ jr $ra -/* 0253C 80ACC45C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC460.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC460.s deleted file mode 100644 index 1dfbed2b8d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC460.s +++ /dev/null @@ -1,64 +0,0 @@ -glabel func_80ACC460 -/* 02540 80ACC460 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02544 80ACC464 AFB00028 */ sw $s0, 0x0028($sp) -/* 02548 80ACC468 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0254C 80ACC46C AFBF002C */ sw $ra, 0x002C($sp) -/* 02550 80ACC470 0C02927F */ jal SkelAnime_Update - -/* 02554 80ACC474 8C8403DC */ lw $a0, 0x03DC($a0) ## 000003DC -/* 02558 80ACC478 5040002D */ beql $v0, $zero, .L80ACC530 -/* 0255C 80ACC47C 8FBF002C */ lw $ra, 0x002C($sp) -/* 02560 80ACC480 960203FE */ lhu $v0, 0x03FE($s0) ## 000003FE -/* 02564 80ACC484 3C0880AD */ lui $t0, %hi(func_80ACC390) ## $t0 = 80AD0000 -/* 02568 80ACC488 241900A0 */ addiu $t9, $zero, 0x00A0 ## $t9 = 000000A0 -/* 0256C 80ACC48C 18400014 */ blez $v0, .L80ACC4E0 -/* 02570 80ACC490 2508C390 */ addiu $t0, $t0, %lo(func_80ACC390) ## $t0 = 80ACC390 -/* 02574 80ACC494 8E0F03DC */ lw $t7, 0x03DC($s0) ## 000003DC -/* 02578 80ACC498 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 0257C 80ACC49C A60E03FE */ sh $t6, 0x03FE($s0) ## 000003FE -/* 02580 80ACC4A0 0C028800 */ jal Animation_GetLastFrame - -/* 02584 80ACC4A4 8DE40008 */ lw $a0, 0x0008($t7) ## 00000008 -/* 02588 80ACC4A8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0258C 80ACC4AC 8E0403DC */ lw $a0, 0x03DC($s0) ## 000003DC -/* 02590 80ACC4B0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 02594 80ACC4B4 468021A0 */ cvt.s.w $f6, $f4 -/* 02598 80ACC4B8 8C850008 */ lw $a1, 0x0008($a0) ## 00000008 -/* 0259C 80ACC4BC 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 025A0 80ACC4C0 44070000 */ mfc1 $a3, $f0 -/* 025A4 80ACC4C4 AFB80014 */ sw $t8, 0x0014($sp) -/* 025A8 80ACC4C8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 025AC 80ACC4CC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 025B0 80ACC4D0 0C029468 */ jal Animation_Change - -/* 025B4 80ACC4D4 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 025B8 80ACC4D8 10000015 */ beq $zero, $zero, .L80ACC530 -/* 025BC 80ACC4DC 8FBF002C */ lw $ra, 0x002C($sp) -.L80ACC4E0: -/* 025C0 80ACC4E0 3C040601 */ lui $a0, %hi(D_0600C1C4) ## $a0 = 06010000 -/* 025C4 80ACC4E4 A61903FE */ sh $t9, 0x03FE($s0) ## 000003FE -/* 025C8 80ACC4E8 AE080410 */ sw $t0, 0x0410($s0) ## 00000410 -/* 025CC 80ACC4EC 0C028800 */ jal Animation_GetLastFrame - -/* 025D0 80ACC4F0 2484C1C4 */ addiu $a0, $a0, %lo(D_0600C1C4) ## $a0 = 0600C1C4 -/* 025D4 80ACC4F4 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 025D8 80ACC4F8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 025DC 80ACC4FC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 025E0 80ACC500 468042A0 */ cvt.s.w $f10, $f8 -/* 025E4 80ACC504 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 -/* 025E8 80ACC508 8E0403DC */ lw $a0, 0x03DC($s0) ## 000003DC -/* 025EC 80ACC50C 3C050601 */ lui $a1, %hi(D_0600C1C4) ## $a1 = 06010000 -/* 025F0 80ACC510 44070000 */ mfc1 $a3, $f0 -/* 025F4 80ACC514 24A5C1C4 */ addiu $a1, $a1, %lo(D_0600C1C4) ## $a1 = 0600C1C4 -/* 025F8 80ACC518 AFA00014 */ sw $zero, 0x0014($sp) -/* 025FC 80ACC51C E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 02600 80ACC520 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02604 80ACC524 0C029468 */ jal Animation_Change - -/* 02608 80ACC528 E7B00018 */ swc1 $f16, 0x0018($sp) -/* 0260C 80ACC52C 8FBF002C */ lw $ra, 0x002C($sp) -.L80ACC530: -/* 02610 80ACC530 8FB00028 */ lw $s0, 0x0028($sp) -/* 02614 80ACC534 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02618 80ACC538 03E00008 */ jr $ra -/* 0261C 80ACC53C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC540.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC540.s deleted file mode 100644 index 529ed6148a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC540.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80ACC540 -/* 02620 80ACC540 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02624 80ACC544 AFB00028 */ sw $s0, 0x0028($sp) -/* 02628 80ACC548 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0262C 80ACC54C AFBF002C */ sw $ra, 0x002C($sp) -/* 02630 80ACC550 0C02927F */ jal SkelAnime_Update - -/* 02634 80ACC554 8C8403DC */ lw $a0, 0x03DC($a0) ## 000003DC -/* 02638 80ACC558 50400015 */ beql $v0, $zero, .L80ACC5B0 -/* 0263C 80ACC55C 960803FC */ lhu $t0, 0x03FC($s0) ## 000003FC -/* 02640 80ACC560 8E0E03DC */ lw $t6, 0x03DC($s0) ## 000003DC -/* 02644 80ACC564 0C028800 */ jal Animation_GetLastFrame - -/* 02648 80ACC568 8DC40008 */ lw $a0, 0x0008($t6) ## 00000008 -/* 0264C 80ACC56C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 02650 80ACC570 8E0403DC */ lw $a0, 0x03DC($s0) ## 000003DC -/* 02654 80ACC574 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 02658 80ACC578 468021A0 */ cvt.s.w $f6, $f4 -/* 0265C 80ACC57C 8C850008 */ lw $a1, 0x0008($a0) ## 00000008 -/* 02660 80ACC580 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 02664 80ACC584 44070000 */ mfc1 $a3, $f0 -/* 02668 80ACC588 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0266C 80ACC58C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02670 80ACC590 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 02674 80ACC594 0C029468 */ jal Animation_Change - -/* 02678 80ACC598 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 0267C 80ACC59C 961803FC */ lhu $t8, 0x03FC($s0) ## 000003FC -/* 02680 80ACC5A0 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 02684 80ACC5A4 10000004 */ beq $zero, $zero, .L80ACC5B8 -/* 02688 80ACC5A8 A61903FC */ sh $t9, 0x03FC($s0) ## 000003FC -/* 0268C 80ACC5AC 960803FC */ lhu $t0, 0x03FC($s0) ## 000003FC -.L80ACC5B0: -/* 02690 80ACC5B0 3109FFFE */ andi $t1, $t0, 0xFFFE ## $t1 = 00000000 -/* 02694 80ACC5B4 A60903FC */ sh $t1, 0x03FC($s0) ## 000003FC -.L80ACC5B8: -/* 02698 80ACC5B8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0269C 80ACC5BC 8FB00028 */ lw $s0, 0x0028($sp) -/* 026A0 80ACC5C0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 026A4 80ACC5C4 03E00008 */ jr $ra -/* 026A8 80ACC5C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC5CC.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC5CC.s deleted file mode 100644 index eae0e3f851..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC5CC.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80ACC5CC -/* 026AC 80ACC5CC 948203FC */ lhu $v0, 0x03FC($a0) ## 000003FC -/* 026B0 80ACC5D0 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 026B4 80ACC5D4 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 026B8 80ACC5D8 11C00003 */ beq $t6, $zero, .L80ACC5E8 -/* 026BC 80ACC5DC 30580020 */ andi $t8, $v0, 0x0020 ## $t8 = 00000000 -/* 026C0 80ACC5E0 10000001 */ beq $zero, $zero, .L80ACC5E8 -/* 026C4 80ACC5E4 24030020 */ addiu $v1, $zero, 0x0020 ## $v1 = 00000020 -.L80ACC5E8: -/* 026C8 80ACC5E8 848503EE */ lh $a1, 0x03EE($a0) ## 000003EE -/* 026CC 80ACC5EC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 026D0 80ACC5F0 30AF003F */ andi $t7, $a1, 0x003F ## $t7 = 00000000 -/* 026D4 80ACC5F4 146F0003 */ bne $v1, $t7, .L80ACC604 -/* 026D8 80ACC5F8 00000000 */ nop -/* 026DC 80ACC5FC 03E00008 */ jr $ra -/* 026E0 80ACC600 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80ACC604: -/* 026E4 80ACC604 13000004 */ beq $t8, $zero, .L80ACC618 -/* 026E8 80ACC608 24A8FFFC */ addiu $t0, $a1, 0xFFFC ## $t0 = FFFFFFFC -/* 026EC 80ACC60C 24B90004 */ addiu $t9, $a1, 0x0004 ## $t9 = 00000004 -/* 026F0 80ACC610 10000002 */ beq $zero, $zero, .L80ACC61C -/* 026F4 80ACC614 A49903EE */ sh $t9, 0x03EE($a0) ## 000003EE -.L80ACC618: -/* 026F8 80ACC618 A48803EE */ sh $t0, 0x03EE($a0) ## 000003EE -.L80ACC61C: -/* 026FC 80ACC61C 03E00008 */ jr $ra -/* 02700 80ACC620 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC624.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC624.s deleted file mode 100644 index a663b7d21e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC624.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_80ACC624 -/* 02704 80ACC624 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 02708 80ACC628 84AE00A4 */ lh $t6, 0x00A4($a1) ## 000000A4 -/* 0270C 80ACC62C 2401005C */ addiu $at, $zero, 0x005C ## $at = 0000005C -/* 02710 80ACC630 30420FC0 */ andi $v0, $v0, 0x0FC0 ## $v0 = 00000000 -/* 02714 80ACC634 11C10003 */ beq $t6, $at, .L80ACC644 -/* 02718 80ACC638 00021183 */ sra $v0, $v0, 6 -/* 0271C 80ACC63C 03E00008 */ jr $ra -/* 02720 80ACC640 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80ACC644: -/* 02724 80ACC644 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 02728 80ACC648 54410004 */ bnel $v0, $at, .L80ACC65C -/* 0272C 80ACC64C 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 02730 80ACC650 03E00008 */ jr $ra -/* 02734 80ACC654 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80ACC658: -/* 02738 80ACC658 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -.L80ACC65C: -/* 0273C 80ACC65C 2841012C */ slti $at, $v0, 0x012C -/* 02740 80ACC660 14200005 */ bne $at, $zero, .L80ACC678 -/* 02744 80ACC664 284101AF */ slti $at, $v0, 0x01AF -/* 02748 80ACC668 50200004 */ beql $at, $zero, .L80ACC67C -/* 0274C 80ACC66C 28410438 */ slti $at, $v0, 0x0438 -/* 02750 80ACC670 03E00008 */ jr $ra -/* 02754 80ACC674 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80ACC678: -/* 02758 80ACC678 28410438 */ slti $at, $v0, 0x0438 -.L80ACC67C: -/* 0275C 80ACC67C 14200005 */ bne $at, $zero, .L80ACC694 -/* 02760 80ACC680 28410493 */ slti $at, $v0, 0x0493 -/* 02764 80ACC684 50200004 */ beql $at, $zero, .L80ACC698 -/* 02768 80ACC688 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0276C 80ACC68C 03E00008 */ jr $ra -/* 02770 80ACC690 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80ACC694: -/* 02774 80ACC694 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80ACC698: -/* 02778 80ACC698 03E00008 */ jr $ra -/* 0277C 80ACC69C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACCE00.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACCE00.s deleted file mode 100644 index 89a6966018..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACCE00.s +++ /dev/null @@ -1,83 +0,0 @@ -glabel func_80ACCE00 -/* 02EE0 80ACCE00 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02EE4 80ACCE04 AFA40000 */ sw $a0, 0x0000($sp) -/* 02EE8 80ACCE08 AFA60008 */ sw $a2, 0x0008($sp) -/* 02EEC 80ACCE0C 10A1001B */ beq $a1, $at, .L80ACCE7C -/* 02EF0 80ACCE10 AFA7000C */ sw $a3, 0x000C($sp) -/* 02EF4 80ACCE14 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 02EF8 80ACCE18 10A10009 */ beq $a1, $at, .L80ACCE40 -/* 02EFC 80ACCE1C 8FA20014 */ lw $v0, 0x0014($sp) -/* 02F00 80ACCE20 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 02F04 80ACCE24 10A1001D */ beq $a1, $at, .L80ACCE9C -/* 02F08 80ACCE28 8FA20014 */ lw $v0, 0x0014($sp) -/* 02F0C 80ACCE2C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 02F10 80ACCE30 10A1002D */ beq $a1, $at, .L80ACCEE8 -/* 02F14 80ACCE34 8FA20014 */ lw $v0, 0x0014($sp) -/* 02F18 80ACCE38 03E00008 */ jr $ra -/* 02F1C 80ACCE3C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80ACCE40: -/* 02F20 80ACCE40 8FA30010 */ lw $v1, 0x0010($sp) -/* 02F24 80ACCE44 844F03F0 */ lh $t7, 0x03F0($v0) ## 000003F0 -/* 02F28 80ACCE48 846E0000 */ lh $t6, 0x0000($v1) ## 00000000 -/* 02F2C 80ACCE4C 84790004 */ lh $t9, 0x0004($v1) ## 00000004 -/* 02F30 80ACCE50 01CFC021 */ addu $t8, $t6, $t7 -/* 02F34 80ACCE54 A4780000 */ sh $t8, 0x0000($v1) ## 00000000 -/* 02F38 80ACCE58 844803EC */ lh $t0, 0x03EC($v0) ## 000003EC -/* 02F3C 80ACCE5C 03284821 */ addu $t1, $t9, $t0 -/* 02F40 80ACCE60 A4690004 */ sh $t1, 0x0004($v1) ## 00000004 -/* 02F44 80ACCE64 844B03F2 */ lh $t3, 0x03F2($v0) ## 000003F2 -/* 02F48 80ACCE68 846A0004 */ lh $t2, 0x0004($v1) ## 00000004 -/* 02F4C 80ACCE6C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 02F50 80ACCE70 014B6023 */ subu $t4, $t2, $t3 -/* 02F54 80ACCE74 03E00008 */ jr $ra -/* 02F58 80ACCE78 A46C0004 */ sh $t4, 0x0004($v1) ## 00000004 -.L80ACCE7C: -/* 02F5C 80ACCE7C 8FA20014 */ lw $v0, 0x0014($sp) -/* 02F60 80ACCE80 8FA30010 */ lw $v1, 0x0010($sp) -/* 02F64 80ACCE84 844E03F2 */ lh $t6, 0x03F2($v0) ## 000003F2 -/* 02F68 80ACCE88 846D0004 */ lh $t5, 0x0004($v1) ## 00000004 -/* 02F6C 80ACCE8C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 02F70 80ACCE90 01AE7821 */ addu $t7, $t5, $t6 -/* 02F74 80ACCE94 03E00008 */ jr $ra -/* 02F78 80ACCE98 A46F0004 */ sh $t7, 0x0004($v1) ## 00000004 -.L80ACCE9C: -/* 02F7C 80ACCE9C 945803FC */ lhu $t8, 0x03FC($v0) ## 000003FC -/* 02F80 80ACCEA0 33190008 */ andi $t9, $t8, 0x0008 ## $t9 = 00000000 -/* 02F84 80ACCEA4 17200021 */ bne $t9, $zero, .L80ACCF2C -/* 02F88 80ACCEA8 00000000 */ nop -/* 02F8C 80ACCEAC 844803EC */ lh $t0, 0x03EC($v0) ## 000003EC -/* 02F90 80ACCEB0 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 02F94 80ACCEB4 44814000 */ mtc1 $at, $f8 ## $f8 = 1.50 -/* 02F98 80ACCEB8 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 02F9C 80ACCEBC 8FA30010 */ lw $v1, 0x0010($sp) -/* 02FA0 80ACCEC0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 02FA4 80ACCEC4 468021A0 */ cvt.s.w $f6, $f4 -/* 02FA8 80ACCEC8 846D0002 */ lh $t5, 0x0002($v1) ## 00000002 -/* 02FAC 80ACCECC 46083282 */ mul.s $f10, $f6, $f8 -/* 02FB0 80ACCED0 4600540D */ trunc.w.s $f16, $f10 -/* 02FB4 80ACCED4 440C8000 */ mfc1 $t4, $f16 -/* 02FB8 80ACCED8 00000000 */ nop -/* 02FBC 80ACCEDC 01AC7023 */ subu $t6, $t5, $t4 -/* 02FC0 80ACCEE0 03E00008 */ jr $ra -/* 02FC4 80ACCEE4 A46E0002 */ sh $t6, 0x0002($v1) ## 00000002 -.L80ACCEE8: -/* 02FC8 80ACCEE8 944F03FC */ lhu $t7, 0x03FC($v0) ## 000003FC -/* 02FCC 80ACCEEC 31F80008 */ andi $t8, $t7, 0x0008 ## $t8 = 00000000 -/* 02FD0 80ACCEF0 1700000E */ bne $t8, $zero, .L80ACCF2C -/* 02FD4 80ACCEF4 00000000 */ nop -/* 02FD8 80ACCEF8 845903EC */ lh $t9, 0x03EC($v0) ## 000003EC -/* 02FDC 80ACCEFC 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 02FE0 80ACCF00 44813000 */ mtc1 $at, $f6 ## $f6 = 1.50 -/* 02FE4 80ACCF04 44999000 */ mtc1 $t9, $f18 ## $f18 = 0.00 -/* 02FE8 80ACCF08 8FA30010 */ lw $v1, 0x0010($sp) -/* 02FEC 80ACCF0C 46809120 */ cvt.s.w $f4, $f18 -/* 02FF0 80ACCF10 846D0002 */ lh $t5, 0x0002($v1) ## 00000002 -/* 02FF4 80ACCF14 46062202 */ mul.s $f8, $f4, $f6 -/* 02FF8 80ACCF18 4600428D */ trunc.w.s $f10, $f8 -/* 02FFC 80ACCF1C 440B5000 */ mfc1 $t3, $f10 -/* 03000 80ACCF20 00000000 */ nop -/* 03004 80ACCF24 01AB6021 */ addu $t4, $t5, $t3 -/* 03008 80ACCF28 A46C0002 */ sh $t4, 0x0002($v1) ## 00000002 -.L80ACCF2C: -/* 0300C 80ACCF2C 03E00008 */ jr $ra -/* 03010 80ACCF30 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACCF34.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACCF34.s deleted file mode 100644 index fca78d9964..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACCF34.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80ACCF34 -/* 03014 80ACCF34 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03018 80ACCF38 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0301C 80ACCF3C AFA60030 */ sw $a2, 0x0030($sp) -/* 03020 80ACCF40 8FA60038 */ lw $a2, 0x0038($sp) -/* 03024 80ACCF44 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03028 80ACCF48 AFA40028 */ sw $a0, 0x0028($sp) -/* 0302C 80ACCF4C AFA70034 */ sw $a3, 0x0034($sp) -/* 03030 80ACCF50 E7A00020 */ swc1 $f0, 0x0020($sp) -/* 03034 80ACCF54 94CE03FC */ lhu $t6, 0x03FC($a2) ## 000003FC -/* 03038 80ACCF58 3C0144AF */ lui $at, 0x44AF ## $at = 44AF0000 -/* 0303C 80ACCF5C 27A40018 */ addiu $a0, $sp, 0x0018 ## $a0 = FFFFFFF0 -/* 03040 80ACCF60 31CF0002 */ andi $t7, $t6, 0x0002 ## $t7 = 00000000 -/* 03044 80ACCF64 51E00009 */ beql $t7, $zero, .L80ACCF8C -/* 03048 80ACCF68 44814000 */ mtc1 $at, $f8 ## $f8 = 1400.00 -/* 0304C 80ACCF6C 3C01442F */ lui $at, 0x442F ## $at = 442F0000 -/* 03050 80ACCF70 44812000 */ mtc1 $at, $f4 ## $f4 = 700.00 -/* 03054 80ACCF74 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 03058 80ACCF78 44813000 */ mtc1 $at, $f6 ## $f6 = 400.00 -/* 0305C 80ACCF7C E7A40018 */ swc1 $f4, 0x0018($sp) -/* 03060 80ACCF80 10000004 */ beq $zero, $zero, .L80ACCF94 -/* 03064 80ACCF84 E7A6001C */ swc1 $f6, 0x001C($sp) -/* 03068 80ACCF88 44814000 */ mtc1 $at, $f8 ## $f8 = 400.00 -.L80ACCF8C: -/* 0306C 80ACCF8C E7A0001C */ swc1 $f0, 0x001C($sp) -/* 03070 80ACCF90 E7A80018 */ swc1 $f8, 0x0018($sp) -.L80ACCF94: -/* 03074 80ACCF94 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 03078 80ACCF98 54A10004 */ bnel $a1, $at, .L80ACCFAC -/* 0307C 80ACCF9C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03080 80ACCFA0 0C0346BD */ jal Matrix_MultVec3f -/* 03084 80ACCFA4 24C50038 */ addiu $a1, $a2, 0x0038 ## $a1 = 00000038 -/* 03088 80ACCFA8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ACCFAC: -/* 0308C 80ACCFAC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03090 80ACCFB0 03E00008 */ jr $ra -/* 03094 80ACCFB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD0B8.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD0B8.s deleted file mode 100644 index 45f0ca74ff..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD0B8.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80ACD0B8 -/* 03198 80ACD0B8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0319C 80ACD0BC AFBF0024 */ sw $ra, 0x0024($sp) -/* 031A0 80ACD0C0 AFA40028 */ sw $a0, 0x0028($sp) -/* 031A4 80ACD0C4 AFA5002C */ sw $a1, 0x002C($sp) -/* 031A8 80ACD0C8 AFA60030 */ sw $a2, 0x0030($sp) -/* 031AC 80ACD0CC AC8703DC */ sw $a3, 0x03DC($a0) ## 000003DC -/* 031B0 80ACD0D0 0C028800 */ jal Animation_GetLastFrame - -/* 031B4 80ACD0D4 8FA40038 */ lw $a0, 0x0038($sp) -/* 031B8 80ACD0D8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 031BC 80ACD0DC 8FAF0028 */ lw $t7, 0x0028($sp) -/* 031C0 80ACD0E0 C7A8003C */ lwc1 $f8, 0x003C($sp) -/* 031C4 80ACD0E4 468021A0 */ cvt.s.w $f6, $f4 -/* 031C8 80ACD0E8 8DE403DC */ lw $a0, 0x03DC($t7) ## 000003DC -/* 031CC 80ACD0EC 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 031D0 80ACD0F0 AFB80014 */ sw $t8, 0x0014($sp) -/* 031D4 80ACD0F4 8FA50038 */ lw $a1, 0x0038($sp) -/* 031D8 80ACD0F8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 031DC 80ACD0FC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 031E0 80ACD100 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 031E4 80ACD104 0C029468 */ jal Animation_Change - -/* 031E8 80ACD108 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 031EC 80ACD10C 8FA20028 */ lw $v0, 0x0028($sp) -/* 031F0 80ACD110 8FB9002C */ lw $t9, 0x002C($sp) -/* 031F4 80ACD114 AC59040C */ sw $t9, 0x040C($v0) ## 0000040C -/* 031F8 80ACD118 8FA80030 */ lw $t0, 0x0030($sp) -/* 031FC 80ACD11C AC480410 */ sw $t0, 0x0410($v0) ## 00000410 -/* 03200 80ACD120 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03204 80ACD124 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03208 80ACD128 03E00008 */ jr $ra -/* 0320C 80ACD12C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD130.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD130.s deleted file mode 100644 index b58a7914d1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD130.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80ACD130 -/* 03210 80ACD130 00067080 */ sll $t6, $a2, 2 -/* 03214 80ACD134 00AE1021 */ addu $v0, $a1, $t6 -/* 03218 80ACD138 8C4F1D8C */ lw $t7, 0x1D8C($v0) ## 00001D8C -/* 0321C 80ACD13C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03220 80ACD140 27AB000C */ addiu $t3, $sp, 0x000C ## $t3 = FFFFFFF4 -/* 03224 80ACD144 8DF8000C */ lw $t8, 0x000C($t7) ## 0000000C -/* 03228 80ACD148 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 0322C 80ACD14C 00000000 */ nop -/* 03230 80ACD150 468021A0 */ cvt.s.w $f6, $f4 -/* 03234 80ACD154 E7A6000C */ swc1 $f6, 0x000C($sp) -/* 03238 80ACD158 8C591D8C */ lw $t9, 0x1D8C($v0) ## 00001D8C -/* 0323C 80ACD15C 8F280010 */ lw $t0, 0x0010($t9) ## 00000010 -/* 03240 80ACD160 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 -/* 03244 80ACD164 00000000 */ nop -/* 03248 80ACD168 468042A0 */ cvt.s.w $f10, $f8 -/* 0324C 80ACD16C E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 03250 80ACD170 8C491D8C */ lw $t1, 0x1D8C($v0) ## 00001D8C -/* 03254 80ACD174 8D2A0014 */ lw $t2, 0x0014($t1) ## 00000014 -/* 03258 80ACD178 448A8000 */ mtc1 $t2, $f16 ## $f16 = 0.00 -/* 0325C 80ACD17C 00000000 */ nop -/* 03260 80ACD180 468084A0 */ cvt.s.w $f18, $f16 -/* 03264 80ACD184 E7B20014 */ swc1 $f18, 0x0014($sp) -/* 03268 80ACD188 8D6D0000 */ lw $t5, 0x0000($t3) ## FFFFFFF4 -/* 0326C 80ACD18C AC8D0024 */ sw $t5, 0x0024($a0) ## 00000024 -/* 03270 80ACD190 8D6C0004 */ lw $t4, 0x0004($t3) ## FFFFFFF8 -/* 03274 80ACD194 AC8C0028 */ sw $t4, 0x0028($a0) ## 00000028 -/* 03278 80ACD198 8D6D0008 */ lw $t5, 0x0008($t3) ## FFFFFFFC -/* 0327C 80ACD19C AC8D002C */ sw $t5, 0x002C($a0) ## 0000002C -/* 03280 80ACD1A0 8C4E1D8C */ lw $t6, 0x1D8C($v0) ## 00001D8C -/* 03284 80ACD1A4 85C30008 */ lh $v1, 0x0008($t6) ## 00000008 -/* 03288 80ACD1A8 A48300B6 */ sh $v1, 0x00B6($a0) ## 000000B6 -/* 0328C 80ACD1AC A4830032 */ sh $v1, 0x0032($a0) ## 00000032 -/* 03290 80ACD1B0 8C4F1D8C */ lw $t7, 0x1D8C($v0) ## 00001D8C -/* 03294 80ACD1B4 95F8000A */ lhu $t8, 0x000A($t7) ## 0000000A -/* 03298 80ACD1B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0329C 80ACD1BC 03E00008 */ jr $ra -/* 032A0 80ACD1C0 A49800B8 */ sh $t8, 0x00B8($a0) ## 000000B8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD1C4.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD1C4.s deleted file mode 100644 index 341762f61c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD1C4.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80ACD1C4 -/* 032A4 80ACD1C4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 032A8 80ACD1C8 00057880 */ sll $t7, $a1, 2 -/* 032AC 80ACD1CC AFBF0014 */ sw $ra, 0x0014($sp) -/* 032B0 80ACD1D0 AFA5001C */ sw $a1, 0x001C($sp) -/* 032B4 80ACD1D4 008FC021 */ addu $t8, $a0, $t7 -/* 032B8 80ACD1D8 8F021D8C */ lw $v0, 0x1D8C($t8) ## 00001D8C -/* 032BC 80ACD1DC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 032C0 80ACD1E0 94E61D74 */ lhu $a2, 0x1D74($a3) ## 00001D74 -/* 032C4 80ACD1E4 94440004 */ lhu $a0, 0x0004($v0) ## 00000004 -/* 032C8 80ACD1E8 0C01BE4F */ jal func_8006F93C -/* 032CC 80ACD1EC 94450002 */ lhu $a1, 0x0002($v0) ## 00000002 -/* 032D0 80ACD1F0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 032D4 80ACD1F4 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 032D8 80ACD1F8 46000086 */ mov.s $f2, $f0 -/* 032DC 80ACD1FC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 032E0 80ACD200 4600603C */ c.lt.s $f12, $f0 -/* 032E4 80ACD204 00000000 */ nop -/* 032E8 80ACD208 45020003 */ bc1fl .L80ACD218 -/* 032EC 80ACD20C 46001006 */ mov.s $f0, $f2 -/* 032F0 80ACD210 46006086 */ mov.s $f2, $f12 -/* 032F4 80ACD214 46001006 */ mov.s $f0, $f2 -.L80ACD218: -/* 032F8 80ACD218 03E00008 */ jr $ra -/* 032FC 80ACD21C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD220.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD220.s deleted file mode 100644 index 2d5208176d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD220.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80ACD220 -/* 03300 80ACD220 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03304 80ACD224 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03308 80ACD228 AFA5002C */ sw $a1, 0x002C($sp) -/* 0330C 80ACD22C C4860024 */ lwc1 $f6, 0x0024($a0) ## 00000024 -/* 03310 80ACD230 C4A40000 */ lwc1 $f4, 0x0000($a1) ## 00000000 -/* 03314 80ACD234 C4900028 */ lwc1 $f16, 0x0028($a0) ## 00000028 -/* 03318 80ACD238 C4AA0004 */ lwc1 $f10, 0x0004($a1) ## 00000004 -/* 0331C 80ACD23C 46062201 */ sub.s $f8, $f4, $f6 -/* 03320 80ACD240 44866000 */ mtc1 $a2, $f12 ## $f12 = 0.00 -/* 03324 80ACD244 C486002C */ lwc1 $f6, 0x002C($a0) ## 0000002C -/* 03328 80ACD248 46105481 */ sub.s $f18, $f10, $f16 -/* 0332C 80ACD24C C4A40008 */ lwc1 $f4, 0x0008($a1) ## 00000008 -/* 03330 80ACD250 460C4082 */ mul.s $f2, $f8, $f12 -/* 03334 80ACD254 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 03338 80ACD258 46062201 */ sub.s $f8, $f4, $f6 -/* 0333C 80ACD25C 460C9002 */ mul.s $f0, $f18, $f12 -/* 03340 80ACD260 AFA70028 */ sw $a3, 0x0028($sp) -/* 03344 80ACD264 24840060 */ addiu $a0, $a0, 0x0060 ## $a0 = 00000060 -/* 03348 80ACD268 460C4382 */ mul.s $f14, $f8, $f12 -/* 0334C 80ACD26C E7A2001C */ swc1 $f2, 0x001C($sp) -/* 03350 80ACD270 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03354 80ACD274 44050000 */ mfc1 $a1, $f0 -/* 03358 80ACD278 0C01DE80 */ jal Math_StepToF - -/* 0335C 80ACD27C E7AE0024 */ swc1 $f14, 0x0024($sp) -/* 03360 80ACD280 C7A2001C */ lwc1 $f2, 0x001C($sp) -/* 03364 80ACD284 C7AE0024 */ lwc1 $f14, 0x0024($sp) -/* 03368 80ACD288 8FA70028 */ lw $a3, 0x0028($sp) -/* 0336C 80ACD28C 46021282 */ mul.s $f10, $f2, $f2 -/* 03370 80ACD290 24E40024 */ addiu $a0, $a3, 0x0024 ## $a0 = 00000024 -/* 03374 80ACD294 460E7402 */ mul.s $f16, $f14, $f14 -/* 03378 80ACD298 46105000 */ add.s $f0, $f10, $f16 -/* 0337C 80ACD29C 46000004 */ sqrt.s $f0, $f0 -/* 03380 80ACD2A0 E4E00068 */ swc1 $f0, 0x0068($a3) ## 00000068 -/* 03384 80ACD2A4 0C01E01A */ jal Math_Vec3f_Yaw - -/* 03388 80ACD2A8 8FA5002C */ lw $a1, 0x002C($sp) -/* 0338C 80ACD2AC 8FA70028 */ lw $a3, 0x0028($sp) -/* 03390 80ACD2B0 A4E20032 */ sh $v0, 0x0032($a3) ## 00000032 -/* 03394 80ACD2B4 84EF0032 */ lh $t7, 0x0032($a3) ## 00000032 -/* 03398 80ACD2B8 A4EF00B6 */ sh $t7, 0x00B6($a3) ## 000000B6 -/* 0339C 80ACD2BC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 033A0 80ACD2C0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 033A4 80ACD2C4 03E00008 */ jr $ra -/* 033A8 80ACD2C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD2CC.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD2CC.s deleted file mode 100644 index 213546eea0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD2CC.s +++ /dev/null @@ -1,140 +0,0 @@ -glabel func_80ACD2CC -/* 033AC 80ACD2CC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 033B0 80ACD2D0 AFB00018 */ sw $s0, 0x0018($sp) -/* 033B4 80ACD2D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 033B8 80ACD2D8 AFBF001C */ sw $ra, 0x001C($sp) -/* 033BC 80ACD2DC 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 033C0 80ACD2E0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 033C4 80ACD2E4 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 -/* 033C8 80ACD2E8 0C2B3471 */ jal func_80ACD1C4 -/* 033CC 80ACD2EC AFA6004C */ sw $a2, 0x004C($sp) -/* 033D0 80ACD2F0 8FA6004C */ lw $a2, 0x004C($sp) -/* 033D4 80ACD2F4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 033D8 80ACD2F8 8CCE1DA8 */ lw $t6, 0x1DA8($a2) ## 00001DA8 -/* 033DC 80ACD2FC 8DCF000C */ lw $t7, 0x000C($t6) ## 0000000C -/* 033E0 80ACD300 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 033E4 80ACD304 00000000 */ nop -/* 033E8 80ACD308 468021A0 */ cvt.s.w $f6, $f4 -/* 033EC 80ACD30C E7A6003C */ swc1 $f6, 0x003C($sp) -/* 033F0 80ACD310 8CD81DA8 */ lw $t8, 0x1DA8($a2) ## 00001DA8 -/* 033F4 80ACD314 8F190010 */ lw $t9, 0x0010($t8) ## 00000010 -/* 033F8 80ACD318 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 -/* 033FC 80ACD31C 00000000 */ nop -/* 03400 80ACD320 468042A0 */ cvt.s.w $f10, $f8 -/* 03404 80ACD324 E7AA0040 */ swc1 $f10, 0x0040($sp) -/* 03408 80ACD328 8CC81DA8 */ lw $t0, 0x1DA8($a2) ## 00001DA8 -/* 0340C 80ACD32C 8D090014 */ lw $t1, 0x0014($t0) ## 00000014 -/* 03410 80ACD330 44898000 */ mtc1 $t1, $f16 ## $f16 = 0.00 -/* 03414 80ACD334 00000000 */ nop -/* 03418 80ACD338 468084A0 */ cvt.s.w $f18, $f16 -/* 0341C 80ACD33C E7B20044 */ swc1 $f18, 0x0044($sp) -/* 03420 80ACD340 8CC31DA8 */ lw $v1, 0x1DA8($a2) ## 00001DA8 -/* 03424 80ACD344 86040034 */ lh $a0, 0x0034($s0) ## 00000034 -/* 03428 80ACD348 846A0008 */ lh $t2, 0x0008($v1) ## 00000008 -/* 0342C 80ACD34C 01441023 */ subu $v0, $t2, $a0 -/* 03430 80ACD350 04430003 */ bgezl $v0, .L80ACD360 -/* 03434 80ACD354 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 03438 80ACD358 00411021 */ addu $v0, $v0, $at -/* 0343C 80ACD35C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -.L80ACD360: -/* 03440 80ACD360 44845000 */ mtc1 $a0, $f10 ## $f10 = 0.00 -/* 03444 80ACD364 960C03FC */ lhu $t4, 0x03FC($s0) ## 000003FC -/* 03448 80ACD368 468021A0 */ cvt.s.w $f6, $f4 -/* 0344C 80ACD36C 318D0004 */ andi $t5, $t4, 0x0004 ## $t5 = 00000000 -/* 03450 80ACD370 46805420 */ cvt.s.w $f16, $f10 -/* 03454 80ACD374 46003202 */ mul.s $f8, $f6, $f0 -/* 03458 80ACD378 46104480 */ add.s $f18, $f8, $f16 -/* 0345C 80ACD37C 4600910D */ trunc.w.s $f4, $f18 -/* 03460 80ACD380 44022000 */ mfc1 $v0, $f4 -/* 03464 80ACD384 00000000 */ nop -/* 03468 80ACD388 00021400 */ sll $v0, $v0, 16 -/* 0346C 80ACD38C 00021403 */ sra $v0, $v0, 16 -/* 03470 80ACD390 11A00037 */ beq $t5, $zero, .L80ACD470 -/* 03474 80ACD394 3042FFFF */ andi $v0, $v0, 0xFFFF ## $v0 = 00000000 -/* 03478 80ACD398 946E0006 */ lhu $t6, 0x0006($v1) ## 00000006 -/* 0347C 80ACD39C 00022400 */ sll $a0, $v0, 16 -/* 03480 80ACD3A0 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 03484 80ACD3A4 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 -/* 03488 80ACD3A8 00042403 */ sra $a0, $a0, 16 -/* 0348C 80ACD3AC 05C10004 */ bgez $t6, .L80ACD3C0 -/* 03490 80ACD3B0 468030A0 */ cvt.s.w $f2, $f6 -/* 03494 80ACD3B4 44815000 */ mtc1 $at, $f10 ## $f10 = 4294967296.00 -/* 03498 80ACD3B8 00000000 */ nop -/* 0349C 80ACD3BC 460A1080 */ add.s $f2, $f2, $f10 -.L80ACD3C0: -/* 034A0 80ACD3C0 3C013D61 */ lui $at, 0x3D61 ## $at = 3D610000 -/* 034A4 80ACD3C4 44814000 */ mtc1 $at, $f8 ## $f8 = 0.05 -/* 034A8 80ACD3C8 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 034AC 80ACD3CC 3C0143B4 */ lui $at, 0x43B4 ## $at = 43B40000 -/* 034B0 80ACD3D0 46081082 */ mul.s $f2, $f2, $f8 -/* 034B4 80ACD3D4 4610103C */ c.lt.s $f2, $f16 -/* 034B8 80ACD3D8 00000000 */ nop -/* 034BC 80ACD3DC 45020005 */ bc1fl .L80ACD3F4 -/* 034C0 80ACD3E0 AFA40028 */ sw $a0, 0x0028($sp) -/* 034C4 80ACD3E4 44819000 */ mtc1 $at, $f18 ## $f18 = 360.00 -/* 034C8 80ACD3E8 00000000 */ nop -/* 034CC 80ACD3EC 46121080 */ add.s $f2, $f2, $f18 -/* 034D0 80ACD3F0 AFA40028 */ sw $a0, 0x0028($sp) -.L80ACD3F4: -/* 034D4 80ACD3F4 0C01DE1C */ jal Math_SinS - ## sins? -/* 034D8 80ACD3F8 E7A20030 */ swc1 $f2, 0x0030($sp) -/* 034DC 80ACD3FC C7A20030 */ lwc1 $f2, 0x0030($sp) -/* 034E0 80ACD400 C7A4003C */ lwc1 $f4, 0x003C($sp) -/* 034E4 80ACD404 8FA40028 */ lw $a0, 0x0028($sp) -/* 034E8 80ACD408 46020182 */ mul.s $f6, $f0, $f2 -/* 034EC 80ACD40C 46062281 */ sub.s $f10, $f4, $f6 -/* 034F0 80ACD410 0C01DE0D */ jal Math_CosS - ## coss? -/* 034F4 80ACD414 E7AA003C */ swc1 $f10, 0x003C($sp) -/* 034F8 80ACD418 C7A20030 */ lwc1 $f2, 0x0030($sp) -/* 034FC 80ACD41C C7A80044 */ lwc1 $f8, 0x0044($sp) -/* 03500 80ACD420 27AF003C */ addiu $t7, $sp, 0x003C ## $t7 = FFFFFFF4 -/* 03504 80ACD424 46020402 */ mul.s $f16, $f0, $f2 -/* 03508 80ACD428 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0350C 80ACD42C 3C0880AD */ lui $t0, %hi(EnOwl_Draw) ## $t0 = 80AD0000 -/* 03510 80ACD430 2508CFB8 */ addiu $t0, $t0, %lo(EnOwl_Draw) ## $t0 = 80ACCFB8 -/* 03514 80ACD434 46104480 */ add.s $f18, $f8, $f16 -/* 03518 80ACD438 E7B20044 */ swc1 $f18, 0x0044($sp) -/* 0351C 80ACD43C E60203F8 */ swc1 $f2, 0x03F8($s0) ## 000003F8 -/* 03520 80ACD440 8DF90000 */ lw $t9, 0x0000($t7) ## FFFFFFF4 -/* 03524 80ACD444 960903FC */ lhu $t1, 0x03FC($s0) ## 000003FC -/* 03528 80ACD448 AE190024 */ sw $t9, 0x0024($s0) ## 00000024 -/* 0352C 80ACD44C 8DF80004 */ lw $t8, 0x0004($t7) ## FFFFFFF8 -/* 03530 80ACD450 312AFFFB */ andi $t2, $t1, 0xFFFB ## $t2 = 00000000 -/* 03534 80ACD454 AE180028 */ sw $t8, 0x0028($s0) ## 00000028 -/* 03538 80ACD458 8DF90008 */ lw $t9, 0x0008($t7) ## FFFFFFFC -/* 0353C 80ACD45C AE080134 */ sw $t0, 0x0134($s0) ## 00000134 -/* 03540 80ACD460 A60A03FC */ sh $t2, 0x03FC($s0) ## 000003FC -/* 03544 80ACD464 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 03548 80ACD468 10000015 */ beq $zero, $zero, .L80ACD4C0 -/* 0354C 80ACD46C AE19002C */ sw $t9, 0x002C($s0) ## 0000002C -.L80ACD470: -/* 03550 80ACD470 00022400 */ sll $a0, $v0, 16 -/* 03554 80ACD474 00042403 */ sra $a0, $a0, 16 -/* 03558 80ACD478 0C01DE1C */ jal Math_SinS - ## sins? -/* 0355C 80ACD47C AFA40028 */ sw $a0, 0x0028($sp) -/* 03560 80ACD480 C60A03F8 */ lwc1 $f10, 0x03F8($s0) ## 000003F8 -/* 03564 80ACD484 C7A6003C */ lwc1 $f6, 0x003C($sp) -/* 03568 80ACD488 8FA40028 */ lw $a0, 0x0028($sp) -/* 0356C 80ACD48C 460A0202 */ mul.s $f8, $f0, $f10 -/* 03570 80ACD490 46083401 */ sub.s $f16, $f6, $f8 -/* 03574 80ACD494 0C01DE0D */ jal Math_CosS - ## coss? -/* 03578 80ACD498 E7B0003C */ swc1 $f16, 0x003C($sp) -/* 0357C 80ACD49C C60403F8 */ lwc1 $f4, 0x03F8($s0) ## 000003F8 -/* 03580 80ACD4A0 C7B20044 */ lwc1 $f18, 0x0044($sp) -/* 03584 80ACD4A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03588 80ACD4A8 46040282 */ mul.s $f10, $f0, $f4 -/* 0358C 80ACD4AC 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFF4 -/* 03590 80ACD4B0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03594 80ACD4B4 460A9180 */ add.s $f6, $f18, $f10 -/* 03598 80ACD4B8 0C2B3488 */ jal func_80ACD220 -/* 0359C 80ACD4BC E7A60044 */ swc1 $f6, 0x0044($sp) -.L80ACD4C0: -/* 035A0 80ACD4C0 8FBF001C */ lw $ra, 0x001C($sp) -/* 035A4 80ACD4C4 8FB00018 */ lw $s0, 0x0018($sp) -/* 035A8 80ACD4C8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 035AC 80ACD4CC 03E00008 */ jr $ra -/* 035B0 80ACD4D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD4D4.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD4D4.s deleted file mode 100644 index 1a8f376dbc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD4D4.s +++ /dev/null @@ -1,64 +0,0 @@ -glabel func_80ACD4D4 -/* 035B4 80ACD4D4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 035B8 80ACD4D8 AFA40038 */ sw $a0, 0x0038($sp) -/* 035BC 80ACD4DC AFBF0014 */ sw $ra, 0x0014($sp) -/* 035C0 80ACD4E0 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 035C4 80ACD4E4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 035C8 80ACD4E8 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 -/* 035CC 80ACD4EC 0C2B3471 */ jal func_80ACD1C4 -/* 035D0 80ACD4F0 AFA7003C */ sw $a3, 0x003C($sp) -/* 035D4 80ACD4F4 8FA7003C */ lw $a3, 0x003C($sp) -/* 035D8 80ACD4F8 8FA40038 */ lw $a0, 0x0038($sp) -/* 035DC 80ACD4FC 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4 -/* 035E0 80ACD500 8CEE1DA8 */ lw $t6, 0x1DA8($a3) ## 00001DA8 -/* 035E4 80ACD504 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 035E8 80ACD508 8DCF000C */ lw $t7, 0x000C($t6) ## 0000000C -/* 035EC 80ACD50C 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 035F0 80ACD510 00000000 */ nop -/* 035F4 80ACD514 468021A0 */ cvt.s.w $f6, $f4 -/* 035F8 80ACD518 E7A6002C */ swc1 $f6, 0x002C($sp) -/* 035FC 80ACD51C 8CF81DA8 */ lw $t8, 0x1DA8($a3) ## 00001DA8 -/* 03600 80ACD520 8F190010 */ lw $t9, 0x0010($t8) ## 00000010 -/* 03604 80ACD524 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 -/* 03608 80ACD528 00000000 */ nop -/* 0360C 80ACD52C 468042A0 */ cvt.s.w $f10, $f8 -/* 03610 80ACD530 E7AA0030 */ swc1 $f10, 0x0030($sp) -/* 03614 80ACD534 8CE81DA8 */ lw $t0, 0x1DA8($a3) ## 00001DA8 -/* 03618 80ACD538 C7AA002C */ lwc1 $f10, 0x002C($sp) -/* 0361C 80ACD53C 8D090014 */ lw $t1, 0x0014($t0) ## 00000014 -/* 03620 80ACD540 44898000 */ mtc1 $t1, $f16 ## $f16 = 0.00 -/* 03624 80ACD544 00000000 */ nop -/* 03628 80ACD548 468084A0 */ cvt.s.w $f18, $f16 -/* 0362C 80ACD54C E7B20034 */ swc1 $f18, 0x0034($sp) -/* 03630 80ACD550 8CE21DA8 */ lw $v0, 0x1DA8($a3) ## 00001DA8 -/* 03634 80ACD554 8C4A0018 */ lw $t2, 0x0018($v0) ## 00000018 -/* 03638 80ACD558 8C4B001C */ lw $t3, 0x001C($v0) ## 0000001C -/* 0363C 80ACD55C 8C4C0020 */ lw $t4, 0x0020($v0) ## 00000020 -/* 03640 80ACD560 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 03644 80ACD564 448B3000 */ mtc1 $t3, $f6 ## $f6 = 0.00 -/* 03648 80ACD568 448C4000 */ mtc1 $t4, $f8 ## $f8 = 0.00 -/* 0364C 80ACD56C 468020A0 */ cvt.s.w $f2, $f4 -/* 03650 80ACD570 46803320 */ cvt.s.w $f12, $f6 -/* 03654 80ACD574 C7A60030 */ lwc1 $f6, 0x0030($sp) -/* 03658 80ACD578 460A1401 */ sub.s $f16, $f2, $f10 -/* 0365C 80ACD57C 468043A0 */ cvt.s.w $f14, $f8 -/* 03660 80ACD580 46008482 */ mul.s $f18, $f16, $f0 -/* 03664 80ACD584 46066201 */ sub.s $f8, $f12, $f6 -/* 03668 80ACD588 460A9100 */ add.s $f4, $f18, $f10 -/* 0366C 80ACD58C C7AA0034 */ lwc1 $f10, 0x0034($sp) -/* 03670 80ACD590 46004402 */ mul.s $f16, $f8, $f0 -/* 03674 80ACD594 E7A4002C */ swc1 $f4, 0x002C($sp) -/* 03678 80ACD598 460A7101 */ sub.s $f4, $f14, $f10 -/* 0367C 80ACD59C 46068480 */ add.s $f18, $f16, $f6 -/* 03680 80ACD5A0 46002202 */ mul.s $f8, $f4, $f0 -/* 03684 80ACD5A4 E7B20030 */ swc1 $f18, 0x0030($sp) -/* 03688 80ACD5A8 460A4400 */ add.s $f16, $f8, $f10 -/* 0368C 80ACD5AC 0C2B3488 */ jal func_80ACD220 -/* 03690 80ACD5B0 E7B00034 */ swc1 $f16, 0x0034($sp) -/* 03694 80ACD5B4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03698 80ACD5B8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0369C 80ACD5BC 03E00008 */ jr $ra -/* 036A0 80ACD5C0 00000000 */ nop -/* 036A4 80ACD5C4 00000000 */ nop -/* 036A8 80ACD5C8 00000000 */ nop -/* 036AC 80ACD5CC 00000000 */ nop diff --git a/data/overlays/actors/z_en_owl.data.s b/data/overlays/actors/z_en_owl.data.s deleted file mode 100644 index 0ae8bb2f0c..0000000000 --- a/data/overlays/actors/z_en_owl.data.s +++ /dev/null @@ -1,26 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel En_Owl_InitVars - .word 0x014D0400, 0x00000019, 0x01310000, 0x00000414 -.word EnOwl_Init -.word EnOwl_Destroy -.word EnOwl_Update -.word EnOwl_Draw -glabel D_80ACD5F0 - .word 0x0A001139, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00010100, 0x001E0028, 0x00000000, 0x00000000 -glabel D_80ACD61C - .word 0xC8500019, 0xB0F40578, 0xB0F807D0, 0x30FC0960 -glabel D_80ACD62C - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80ACD638 - .word 0x060089A8, 0x06008DA8, 0x060091A8, 0x00000000, 0x00000000, 0x00000000 - diff --git a/include/functions.h b/include/functions.h index 46833a75eb..f8c3ead76c 100644 --- a/include/functions.h +++ b/include/functions.h @@ -2256,8 +2256,9 @@ void func_800F4010(Vec3f*, u16 sfxId, f32); void func_800F41E0(Vec3f*, u16 sfxId, u8); void func_800F4138(Vec3f*, u16 sfxId, f32); void func_800F4190(Vec3f*, u16 sfxId); -void func_800F436C(UNK_TYPE arg0, s16 arg1, f32 arg2); -// ? func_800F4414(?); +void func_800F436C(Vec3f*, s16 arg1, f32 arg2); +void func_800F4414(Vec3f*, u16, f32); +void func_800F44EC(UNK_TYPE arg0, UNK_TYPE arg1); void func_800F4524(Vec3f*, u16 sfxId, u8); void func_800F46E0(Vec3f* pos, f32 arg0); // ? func_800F4784(?); diff --git a/spec b/spec index 9aa5802176..5785fc9105 100644 --- a/spec +++ b/spec @@ -2784,8 +2784,11 @@ endseg beginseg name "ovl_En_Owl" include "build/src/overlays/actors/ovl_En_Owl/z_en_owl.o" - include "build/data/overlays/actors/z_en_owl.data.o" +#ifdef NON_MATCHING + include "build/src/overlays/actors/ovl_En_Owl/ovl_En_Owl_reloc.o" +#else include "build/data/overlays/actors/z_en_owl.reloc.o" +#endif endseg beginseg diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c index 8276e8fec5..bfd901ae48 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -1,25 +1,79 @@ +/* + * File: z_en_owl.c + * Overlay: ovl_En_Owl + * Description: Owl + */ + #include "z_en_owl.h" +#include "vt.h" #define FLAGS 0x00000019 #define THIS ((EnOwl*)thisx) +extern AnimationHeader D_0600C1C4; +extern CsCmdActorAction D_0201E6A0; +extern CsCmdActorAction D_0201B0C0; +extern AnimationHeader D_06001168; +extern FlexSkeletonHeader D_0600C0E8; +extern FlexSkeletonHeader D_060100B0; +extern AnimationHeader D_060015CC; +extern AnimationHeader D_0600C8A0; +extern AnimationHeader D_0600C684; + void EnOwl_Init(Actor* thisx, GlobalContext* globalCtx); void EnOwl_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnOwl_Update(Actor* thisx, GlobalContext* globalCtx); void EnOwl_Draw(Actor* thisx, GlobalContext* globalCtx); +void EnOwl_ChangeMode(EnOwl* this, EnOwlActionFunc, OwlFunc, SkelAnime*, AnimationHeader*, f32); +void EnOwl_WaitDefault(EnOwl* this, GlobalContext* globalCtx); +void func_80ACC540(EnOwl* this); +void EnOwl_WaitOutsideKokiri(EnOwl* this, GlobalContext* globalCtx); +void EnOwl_WaitHyruleCastle(EnOwl* this, GlobalContext* globalCtx); +void EnOwl_WaitKakariko(EnOwl* this, GlobalContext* globalCtx); +void EnOwl_WaitGerudo(EnOwl* this, GlobalContext* globalCtx); +void EnOwl_WaitLakeHylia(EnOwl* this, GlobalContext* globalCtx); +void EnOwl_WaitZoraRiver(EnOwl* this, GlobalContext* globalCtx); +void EnOwl_WaitHyliaShortcut(EnOwl* this, GlobalContext* globalCtx); +void EnOwl_WaitDeathMountainShortcut(EnOwl* this, GlobalContext* globalCtx); +void func_80ACB3E0(EnOwl* this, GlobalContext* globalCtx); +void EnOwl_WaitLWPreSaria(EnOwl* this, GlobalContext* globalCtx); +void EnOwl_WaitLWPostSaria(EnOwl* this, GlobalContext* globalCtx); +void func_80ACD4D4(EnOwl* this, GlobalContext* globalCtx); +void func_80ACD130(EnOwl* this, GlobalContext* globalCtx, s32 arg2); +void func_80ACBAB8(EnOwl* this, GlobalContext* globalCtx); +void func_80ACD2CC(EnOwl* this, GlobalContext* globalCtx); +void func_80ACAA54(EnOwl* this, GlobalContext* globalCtx); +void func_80ACAC6C(EnOwl* this, GlobalContext* globalCtx); +void func_80ACADF0(EnOwl* this, GlobalContext* globalCtx); +void func_80ACAF74(EnOwl* this, GlobalContext* globalCtx); +void func_80ACC30C(EnOwl* this, GlobalContext* globalCtx); +void func_80ACB4FC(EnOwl* this, GlobalContext* globalCtx); +void func_80ACB680(EnOwl* this, GlobalContext* globalCtx); +void func_80ACC460(EnOwl* this); +void func_80ACBEA0(EnOwl*, GlobalContext*); -extern UNK_TYPE D_0201B0C0; -extern UNK_TYPE D_0201E6A0; -extern UNK_TYPE D_06001168; -extern UNK_TYPE D_060015CC; -extern UNK_TYPE D_0600C0E8; -extern UNK_TYPE D_0600C1C4; -extern UNK_TYPE D_0600C684; -extern UNK_TYPE D_0600C8A0; -extern UNK_TYPE D_060100B0; +typedef enum { + /* 0x00 */ OWL_DEFAULT, + /* 0x01 */ OWL_OUTSIDE_KOKIRI, + /* 0x02 */ OWL_HYRULE_CASTLE, + /* 0x03 */ OWL_KAKARIKO, + /* 0x04 */ OWL_HYLIA_GERUDO, + /* 0x05 */ OWL_LAKE_HYLIA, + /* 0x06 */ OWL_ZORA_RIVER, + /* 0x07 */ OWL_HYLIA_SHORTCUT, + /* 0x08 */ OWL_DEATH_MOUNTAIN, + /* 0x09 */ OWL_DEATH_MOUNTAIN2, + /* 0x0A */ OWL_DESSERT_COLOSSUS, + /* 0x0B */ OWL_LOST_WOODS_PRESARIA, + /* 0x0C */ OWL_LOST_WOODS_POSTSARIA +} EnOwlType; + +typedef enum { + /* 0x00 */ OWL_REPEAT, + /* 0x01 */ OWL_OK +} EnOwlMessageChoice; -/* const ActorInit En_Owl_InitVars = { ACTOR_EN_OWL, ACTORTYPE_NPC, @@ -31,141 +85,1358 @@ const ActorInit En_Owl_InitVars = { (ActorFunc)EnOwl_Update, (ActorFunc)EnOwl_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Destroy.s") +ColliderCylinderInit sOwlCylinderInit = { + { COLTYPE_UNK10, 0x00, 0x11, 0x39, 0x10, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, + { 30, 40, 0, { 0, 0, 0 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA3B8.s") +InitChainEntry sOwlInitChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 25, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneForward, 1400, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 2400, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA3F4.s") +void EnOwl_Init(Actor* thisx, GlobalContext* globalCtx) { + EnOwl* this = THIS; + ColliderCylinder* collider; + s32 owlType; + s32 switchFlag; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA558.s") + Actor_ProcessInitChain(&this->actor, sOwlInitChain); + ActorShape_Init(&this->actor.shape, 0, ActorShadow_DrawFunc_Circle, 36.0f); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600C0E8, &D_060015CC, this->jointTable, this->morphTable, 21); + SkelAnime_InitFlex(globalCtx, &this->skelAnime2, &D_060100B0, &D_0600C8A0, this->jointTable2, this->morphTable2, + 16); + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sOwlCylinderInit); + this->actor.colChkInfo.mass = 0xFF; + this->actor.minVelocityY = -10.0f; + this->actor.unk_4C = 500.0f; + EnOwl_ChangeMode(this, EnOwl_WaitDefault, func_80ACC540, &this->skelAnime2, &D_0600C8A0, 0.0f); + this->actionFlags = this->unk_406 = this->unk_409 = 0; + this->unk_405 = 4; + this->unk_404 = this->unk_407 = 0; + this->unk_408 = 4; + owlType = (this->actor.params & 0xFC0) >> 6; + switchFlag = (this->actor.params & 0x3F); + if (this->actor.params == 0xFFF) { + owlType = OWL_OUTSIDE_KOKIRI; + switchFlag = 0x20; + } + osSyncPrintf(VT_FGCOL(CYAN) " 会話フクロウ %4x no = %d, sv = %d\n" VT_RST, this->actor.params, owlType, + switchFlag); // conversation owl %4x no = %d, sv = %d -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA5C8.s") + if ((owlType != OWL_DEFAULT) && (switchFlag < 0x20) && Flags_GetSwitch(globalCtx, switchFlag)) { + osSyncPrintf("savebitでフクロウ退避\n"); // Save owl with savebit + Actor_Kill(&this->actor); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA62C.s") + this->unk_3EE = 0; + this->unk_400 = this->actor.posRot.rot.y; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA690.s") + switch (owlType) { + case OWL_DEFAULT: + this->actionFunc = EnOwl_WaitDefault; + this->actor.uncullZoneForward = 4000.0f; + this->unk_40A = 0; + break; + case OWL_OUTSIDE_KOKIRI: + this->actionFunc = EnOwl_WaitOutsideKokiri; + break; + case OWL_HYRULE_CASTLE: + this->actionFlags |= 2; + this->unk_3EE = 0x20; + this->actionFunc = EnOwl_WaitHyruleCastle; + break; + case OWL_KAKARIKO: + if (gSaveContext.eventChkInf[4] & 1) { + // has zelda's letter + osSyncPrintf("フクロウ退避\n"); // Owl evacuation + Actor_Kill(&this->actor); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA6C0.s") + this->actionFunc = EnOwl_WaitKakariko; + break; + case OWL_HYLIA_GERUDO: + if (gSaveContext.eventChkInf[4] & 8) { + // has ocarina of time + osSyncPrintf("フクロウ退避\n"); // Owl evacuation + Actor_Kill(&this->actor); + return; + } + this->actionFunc = EnOwl_WaitGerudo; + break; + case OWL_LAKE_HYLIA: + this->actionFunc = EnOwl_WaitLakeHylia; + break; + case OWL_ZORA_RIVER: + if ((gSaveContext.eventChkInf[3] & 0x200) || !(gSaveContext.eventChkInf[4] & 1)) { + // opened zora's domain or has zelda's letter + osSyncPrintf("フクロウ退避\n"); // Owl evacuation + Actor_Kill(&this->actor); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA71C.s") + this->actionFunc = EnOwl_WaitZoraRiver; + break; + case OWL_HYLIA_SHORTCUT: + this->actionFunc = EnOwl_WaitHyliaShortcut; + Flags_UnsetSwitch(globalCtx, 0x23); + return; + case OWL_DEATH_MOUNTAIN: + this->actionFunc = EnOwl_WaitDeathMountainShortcut; + break; + case OWL_DEATH_MOUNTAIN2: + this->actionFunc = EnOwl_WaitDeathMountainShortcut; + break; + case OWL_DESSERT_COLOSSUS: + this->actionFunc = func_80ACB3E0; + break; + case OWL_LOST_WOODS_PRESARIA: + if (!CHECK_QUEST_ITEM(QUEST_SONG_LULLABY)) { + osSyncPrintf("フクロウ退避\n"); // Owl evacuation + Actor_Kill(&this->actor); + return; + } + this->actionFunc = EnOwl_WaitLWPreSaria; + break; + case OWL_LOST_WOODS_POSTSARIA: + if (!CHECK_QUEST_ITEM(QUEST_SONG_SARIA)) { + osSyncPrintf("フクロウ退避\n"); // Owl evacuation + Actor_Kill(&this->actor); + return; + } + this->actionFunc = EnOwl_WaitLWPostSaria; + break; + default: + // Outside kokiri forest + osSyncPrintf(VT_FGCOL(CYAN)); + osSyncPrintf("no = %d \n", owlType); + osSyncPrintf( + "未完成のフクロウ未完成のフクロウ未完成のフクロウ\n"); // Unfinished owl unfinished owl unfinished owl + osSyncPrintf(VT_RST); + this->actionFlags |= 2; + this->unk_3EE = 0x20; + this->actionFunc = EnOwl_WaitOutsideKokiri; + break; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA76C.s") +void EnOwl_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnOwl* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA7E0.s") + Collider_DestroyCylinder(globalCtx, &this->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA88C.s") +/** + * Rotates this to the player instance + */ +void EnOwl_LookAtLink(EnOwl* this, GlobalContext* globalCtx) { + s16 yaw; + Player* player = PLAYER; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA928.s") + yaw = Math_Vec3f_Yaw(&this->actor.posRot.pos, &player->actor.posRot.pos); + this->actor.posRot.rot.y = yaw; + this->actor.shape.rot.y = yaw; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACA998.s") +/** + * Checks if link is within `targetDist` units, initalize the camera for the owl. + * returns 0 if the link is not within `targetDistance`, returns 1 once link is within + * the distance, and the camera has been initalized. + */ +s32 EnOwl_CheckInitTalk(EnOwl* this, GlobalContext* globalCtx, u16 textId, f32 targetDist, u16 flags) { + s32 timer; + f32 distCheck; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAA54.s") + if (func_8002F194(&this->actor, globalCtx) != 0) { + if (this->actor.params == 0xFFF) { + this->actionFlags |= 0x40; + timer = -100; + } else { + if (Rand_ZeroOne() < 0.5f) { + timer = (flags & 1) ? -97 : -99; + this->actionFlags |= 0x40; + } else { + timer = (flags & 1) ? -96 : -98; + this->actionFlags &= ~0x40; + } + } + this->cameraIdx = func_800800F8(globalCtx, 0x21FC, timer, &this->actor, 0); + return true; + } else { + this->actor.textId = textId; + distCheck = (flags & 2) ? 200.0f : 1000.0f; + if (this->actor.xzDistToLink < targetDist) { + this->actor.flags |= 0x10000; + func_8002F1C4(&this->actor, globalCtx, targetDist, distCheck, 0); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAAC0.s") + return false; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAB2C.s") +s32 func_80ACA558(EnOwl* this, GlobalContext* globalCtx, u16 textId) { + if (func_8002F194(&this->actor, globalCtx)) { + return true; + } else { + this->actor.textId = textId; + if (this->actor.xzDistToLink < 120.0f) { + func_8002F1C4(&this->actor, globalCtx, 350.0f, 1000.0f, 0); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAB88.s") + return false; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAC6C.s") +void func_80ACA5C8(EnOwl* this) { + EnOwl_ChangeMode(this, func_80ACBEA0, func_80ACC540, &this->skelAnime, &D_0600C684, 0.0f); + this->eyeTexIndex = 0; + this->blinkTimer = Rand_S16Offset(60, 60); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACACD8.s") +void func_80ACA62C(EnOwl* this, GlobalContext* globalCtx) { + s32 switchFlag; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAD34.s") + switchFlag = this->actor.params & 0x3F; + if (switchFlag < 0x20) { + Flags_SetSwitch(globalCtx, switchFlag); + osSyncPrintf(VT_FGCOL(CYAN) " Actor_Environment_sw = %d\n" VT_RST, Flags_GetSwitch(globalCtx, switchFlag)); + } + func_80ACA5C8(this); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACADF0.s") +void func_80ACA690(EnOwl* this, GlobalContext* globalCtx) { + if ((this->unk_3EE & 0x3F) == 0) { + func_80ACA62C(this, globalCtx); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAE5C.s") +void func_80ACA6C0(EnOwl* this) { + if (Rand_CenteredFloat(1.0f) < 0.0f) { + this->actionFlags |= 0x20; + } else { + this->actionFlags &= ~0x20; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAEB8.s") +void func_80ACA71C(EnOwl* this) { + func_80ACA6C0(this); + this->unk_3F2 = 0; + this->actionFlags |= 0x10; + this->unk_408 = 4; + this->unk_404 = 0; + this->unk_406 = 0; + this->unk_405 = 4; + this->unk_407 = this->unk_3F2; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAF74.s") +void func_80ACA76C(EnOwl* this, GlobalContext* globalCtx) { + func_8002DF54(globalCtx, &this->actor, 8); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACAFE0.s") + if (func_8002F334(&this->actor, globalCtx) != 0) { + Audio_SetBGM(0x110000FF); + func_80ACA62C(this, globalCtx); + this->actor.flags &= ~0x10000; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB03C.s") +void func_80ACA7E0(EnOwl* this, GlobalContext* globalCtx) { + func_8002DF54(globalCtx, &this->actor, 8); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB0B0.s") + if (func_8002F334(&this->actor, globalCtx) != 0) { + Audio_SetBGM(0x110000FF); + if ((this->unk_3EE & 0x3F) == 0) { + func_80ACA62C(this, globalCtx); + } else { + this->actionFlags &= ~2; + func_80ACA71C(this); + this->actionFunc = func_80ACA690; + } + this->actor.flags &= ~0x10000; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB148.s") +void EnOwl_ConfirmKokiriMessage(EnOwl* this, GlobalContext* globalCtx) { + if (func_8010BDBC(&globalCtx->msgCtx) == 4 && func_80106BC8(globalCtx) != 0) { + switch (globalCtx->msgCtx.choiceIndex) { + case OWL_REPEAT: + func_8010B720(globalCtx, 0x2065); + break; + case OWL_OK: + func_8010B720(globalCtx, 0x2067); + this->actionFunc = func_80ACA76C; + break; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB1A0.s") +void EnOwl_WaitOutsideKokiri(EnOwl* this, GlobalContext* globalCtx) { + EnOwl_LookAtLink(this, globalCtx); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB22C.s") + if (EnOwl_CheckInitTalk(this, globalCtx, 0x2064, 360.0f, 0) != 0) { + // Sets BGM + func_800F5C64(0x5A); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB274.s") + this->actionFunc = EnOwl_ConfirmKokiriMessage; + // spoke to owl by lost woods + gSaveContext.eventChkInf[6] |= 0x8000; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB2B4.s") +void func_80ACA998(EnOwl* this, GlobalContext* globalCtx) { + if (func_8010BDBC(&globalCtx->msgCtx) == 4 && func_80106BC8(globalCtx) != 0) { + switch (globalCtx->msgCtx.choiceIndex) { + case OWL_REPEAT: + func_8010B720(globalCtx, 0x2069); + this->actionFunc = func_80ACAA54; + break; + case OWL_OK: + func_8010B720(globalCtx, 0x206B); + this->actionFunc = func_80ACA7E0; + break; + } + this->actionFlags &= ~2; + func_80ACA71C(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB344.s") +void func_80ACAA54(EnOwl* this, GlobalContext* globalCtx) { + if (func_8010BDBC(&globalCtx->msgCtx) == 5 && func_80106BC8(globalCtx) != 0) { + func_8010B720(globalCtx, 0x206A); + this->actionFunc = func_80ACA998; + this->actionFlags |= 2; + func_80ACA71C(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB3E0.s") +void func_80ACAAC0(EnOwl* this, GlobalContext* globalCtx) { + if (func_8010BDBC(&globalCtx->msgCtx) == 5 && func_80106BC8(globalCtx) != 0) { + func_8010B720(globalCtx, 0x2069); + this->actionFunc = func_80ACAA54; + this->actionFlags &= ~2; + func_80ACA71C(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB440.s") +void EnOwl_WaitHyruleCastle(EnOwl* this, GlobalContext* globalCtx) { + EnOwl_LookAtLink(this, globalCtx); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB4FC.s") + if (EnOwl_CheckInitTalk(this, globalCtx, 0x2068, 540.0f, 0) != 0) { + func_800F5C64(0x5A); + this->actionFunc = func_80ACAAC0; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB568.s") +void func_80ACAB88(EnOwl* this, GlobalContext* globalCtx) { + if (func_8010BDBC(&globalCtx->msgCtx) == 4 && func_80106BC8(globalCtx) != 0) { + switch (globalCtx->msgCtx.choiceIndex) { + case OWL_REPEAT: + // obtained zelda's letter + if (gSaveContext.eventChkInf[4] & 1) { + func_8010B720(globalCtx, 0x206D); + } else { + func_8010B720(globalCtx, 0x206C); + } + this->actionFunc = func_80ACAC6C; + break; + case OWL_OK: + func_8010B720(globalCtx, 0x206E); + this->actionFunc = func_80ACA7E0; + break; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB5C4.s") + this->actionFlags &= ~2; + func_80ACA71C(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB680.s") +void func_80ACAC6C(EnOwl* this, GlobalContext* globalCtx) { + if (func_8010BDBC(&globalCtx->msgCtx) == 5 && func_80106BC8(globalCtx) != 0) { + func_8010B720(globalCtx, 0x206A); + this->actionFunc = func_80ACAB88; + this->actionFlags |= 2; + func_80ACA71C(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB6EC.s") +void EnOwl_WaitKakariko(EnOwl* this, GlobalContext* globalCtx) { + EnOwl_LookAtLink(this, globalCtx); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB748.s") + if (EnOwl_CheckInitTalk(this, globalCtx, 0x206C, 480.0f, 0) != 0) { + func_800F5C64(0x5A); + this->actionFunc = func_80ACAC6C; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB904.s") +void func_80ACAD34(EnOwl* this, GlobalContext* globalCtx) { + if (func_8010BDBC(&globalCtx->msgCtx) == 4 && func_80106BC8(globalCtx) != 0) { + switch (globalCtx->msgCtx.choiceIndex) { + case OWL_REPEAT: + func_8010B720(globalCtx, 0x206F); + this->actionFunc = func_80ACADF0; + break; + case OWL_OK: + func_8010B720(globalCtx, 0x2070); + this->actionFunc = func_80ACA7E0; + break; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACB994.s") + this->actionFlags &= ~2; + func_80ACA71C(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBA24.s") +void func_80ACADF0(EnOwl* this, GlobalContext* globalCtx) { + if (func_8010BDBC(&globalCtx->msgCtx) == 5 && func_80106BC8(globalCtx) != 0) { + func_8010B720(globalCtx, 0x206A); + this->actionFunc = func_80ACAD34; + this->actionFlags |= 2; + func_80ACA71C(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBAB8.s") +void EnOwl_WaitGerudo(EnOwl* this, GlobalContext* globalCtx) { + EnOwl_LookAtLink(this, globalCtx); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBC0C.s") + if (EnOwl_CheckInitTalk(this, globalCtx, 0x206F, 360.0f, 0) != 0) { + func_800F5C64(0x5A); + this->actionFunc = func_80ACADF0; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBD4C.s") +void func_80ACAEB8(EnOwl* this, GlobalContext* globalCtx) { + if (func_8010BDBC(&globalCtx->msgCtx) == 4 && func_80106BC8(globalCtx) != 0) { + switch (globalCtx->msgCtx.choiceIndex) { + case OWL_REPEAT: + func_8010B720(globalCtx, 0x2071); + this->actionFunc = func_80ACAF74; + break; + case OWL_OK: + func_8010B720(globalCtx, 0x2072); + this->actionFunc = func_80ACA7E0; + break; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBEA0.s") + this->actionFlags &= ~2; + func_80ACA71C(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACBF50.s") +void func_80ACAF74(EnOwl* this, GlobalContext* globalCtx) { + if (func_8010BDBC(&globalCtx->msgCtx) == 5 && func_80106BC8(globalCtx) != 0) { + func_8010B720(globalCtx, 0x206A); + this->actionFunc = func_80ACAEB8; + this->actionFlags |= 2; + func_80ACA71C(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC00C.s") +void EnOwl_WaitLakeHylia(EnOwl* this, GlobalContext* globalCtx) { + EnOwl_LookAtLink(this, globalCtx); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC23C.s") + if (EnOwl_CheckInitTalk(this, globalCtx, 0x2071, 360.0f, 0) != 0) { + func_800F5C64(0x5A); + this->actionFunc = func_80ACAF74; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC30C.s") +void func_80ACB03C(EnOwl* this, GlobalContext* globalCtx) { + func_8002DF54(globalCtx, &this->actor, 8); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC390.s") + if (func_8002F334(&this->actor, globalCtx) != 0) { + Audio_SetBGM(0x110000FF); + func_80ACA62C(this, globalCtx); + this->actor.flags &= ~0x10000; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC460.s") +void EnOwl_WaitZoraRiver(EnOwl* this, GlobalContext* globalCtx) { + u16 textId; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC540.s") + EnOwl_LookAtLink(this, globalCtx); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC5CC.s") + if (CHECK_QUEST_ITEM(QUEST_SONG_SARIA)) { + if (CHECK_QUEST_ITEM(QUEST_SONG_LULLABY)) { + textId = 0x4031; + } else { + textId = 0x4017; + } + } else { + textId = 0x4002; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC624.s") + if (EnOwl_CheckInitTalk(this, globalCtx, textId, 360.0f, 0) != 0) { + func_800F5C64(0x5A); + this->actionFunc = func_80ACB03C; + } +} +void func_80ACB148(EnOwl* this, GlobalContext* globalCtx) { + if (func_8002F334(&this->actor, globalCtx) != 0) { + Audio_SetBGM(0x110000FF); + func_80ACA5C8(this); + this->actionFunc = func_80ACC30C; + Flags_SetSwitch(globalCtx, 0x23); + } +} + +void EnOwl_WaitHyliaShortcut(EnOwl* this, GlobalContext* globalCtx) { + u16 textId; + // Spoke to Owl in Lake Hylia + if (gSaveContext.infTable[25] & 0x20) { + textId = 0x4004; + } else { + textId = 0x4003; + } + + EnOwl_LookAtLink(this, globalCtx); + if (func_80ACA558(this, globalCtx, textId) != 0) { + gSaveContext.infTable[25] |= 0x20; + func_800F5C64(0x5A); + this->actionFunc = func_80ACB148; + } +} + +void func_80ACB22C(EnOwl* this, GlobalContext* globalCtx) { + if (func_8002F334(&this->actor, globalCtx) != 0) { + Audio_SetBGM(0x110000FF); + func_80ACA5C8(this); + this->actionFunc = func_80ACC30C; + } +} + +void func_80ACB274(EnOwl* this, GlobalContext* globalCtx) { + if (func_8002F334(&this->actor, globalCtx) != 0) { + Audio_SetBGM(0x110000FF); + this->actionFunc = EnOwl_WaitDeathMountainShortcut; + } +} + +void EnOwl_WaitDeathMountainShortcut(EnOwl* this, GlobalContext* globalCtx) { + EnOwl_LookAtLink(this, globalCtx); + + if (!gSaveContext.magicAcquired) { + if (func_80ACA558(this, globalCtx, 0x3062) != 0) { + func_800F5C64(0x5A); + this->actionFunc = func_80ACB274; + return; + } + } else { + if (func_80ACA558(this, globalCtx, 0x3063) != 0) { + func_800F5C64(0x5A); + this->actionFunc = func_80ACB22C; + } + } +} + +void func_80ACB344(EnOwl* this, GlobalContext* globalCtx) { + if (func_8010BDBC(&globalCtx->msgCtx) == 4 && func_80106BC8(globalCtx) != 0) { + switch (globalCtx->msgCtx.choiceIndex) { + case OWL_REPEAT: + func_8010B720(globalCtx, 0x607A); + break; + case OWL_OK: + func_8010B720(globalCtx, 0x607C); + this->actionFunc = func_80ACA7E0; + break; + } + } +} + +void func_80ACB3E0(EnOwl* this, GlobalContext* globalCtx) { + EnOwl_LookAtLink(this, globalCtx); + + if (EnOwl_CheckInitTalk(this, globalCtx, 0x6079, 360.0f, 2) != 0) { + func_800F5C64(0x5A); + this->actionFunc = func_80ACB344; + } +} + +void func_80ACB440(EnOwl* this, GlobalContext* globalCtx) { + if (func_8010BDBC(&globalCtx->msgCtx) == 4 && func_80106BC8(globalCtx) != 0) { + switch (globalCtx->msgCtx.choiceIndex) { + case OWL_REPEAT: + func_8010B720(globalCtx, 0x10C1); + this->actionFunc = func_80ACB4FC; + break; + case OWL_OK: + func_8010B720(globalCtx, 0x10C3); + this->actionFunc = func_80ACA7E0; + } + + this->actionFlags &= ~2; + func_80ACA71C(this); + } +} + +void func_80ACB4FC(EnOwl* this, GlobalContext* globalCtx) { + if (func_8010BDBC(&globalCtx->msgCtx) == 5 && func_80106BC8(globalCtx) != 0) { + func_8010B720(globalCtx, 0x10C2); + this->actionFunc = func_80ACB440; + this->actionFlags |= 2; + func_80ACA71C(this); + } +} + +void EnOwl_WaitLWPreSaria(EnOwl* this, GlobalContext* globalCtx) { + EnOwl_LookAtLink(this, globalCtx); + + if (EnOwl_CheckInitTalk(this, globalCtx, 0x10C0, 190.0f, 0) != 0) { + func_800F5C64(0x5A); + this->actionFunc = func_80ACB4FC; + } +} + +void func_80ACB5C4(EnOwl* this, GlobalContext* globalCtx) { + if (func_8010BDBC(&globalCtx->msgCtx) == 4 && func_80106BC8(globalCtx) != 0) { + switch (globalCtx->msgCtx.choiceIndex) { + case OWL_REPEAT: + func_8010B720(globalCtx, 0x10C5); + this->actionFunc = func_80ACB680; + break; + case OWL_OK: + func_8010B720(globalCtx, 0x10C7); + this->actionFunc = func_80ACA7E0; + break; + } + + this->actionFlags &= ~2; + func_80ACA71C(this); + } +} + +void func_80ACB680(EnOwl* this, GlobalContext* globalCtx) { + if (func_8010BDBC(&globalCtx->msgCtx) == 5 && func_80106BC8(globalCtx) != 0) { + func_8010B720(globalCtx, 0x10C6); + this->actionFunc = func_80ACB5C4; + this->actionFlags |= 2; + func_80ACA71C(this); + } +} + +void EnOwl_WaitLWPostSaria(EnOwl* this, GlobalContext* globalCtx) { + EnOwl_LookAtLink(this, globalCtx); + + if (EnOwl_CheckInitTalk(this, globalCtx, 0x10C4, 360.0f, 0) != 0) { + func_800F5C64(0x5A); + this->actionFunc = func_80ACB680; + } +} + +void func_80ACB748(EnOwl* this, GlobalContext* globalCtx) { + static Vec3f D_80ACD62C = { 0.0f, 0.0f, 0.0f }; + f32 unkf2; + f32 xyzDist; + u32 owlType; + + owlType = (this->actor.params & 0xFC0) >> 6; + xyzDist = Math3D_Vec3f_DistXYZ(&this->eye, &globalCtx->view.eye) / 45.0f; + this->eye.x = globalCtx->view.eye.x; + this->eye.y = globalCtx->view.eye.y; + this->eye.z = globalCtx->view.eye.z; + xyzDist = xyzDist; + + if (xyzDist > 1.0f) { + xyzDist = 1.0f; + } + + switch (owlType) { + case 7: + unkf2 = xyzDist * 2.f; + func_800F436C(&D_80ACD62C, NA_SE_EV_FLYING_AIR - SFX_FLAG, unkf2); + if ((globalCtx->csCtx.frames > 324) || + ((globalCtx->csCtx.frames >= 142 && (globalCtx->csCtx.frames <= 266)))) { + func_800F4414(&D_80ACD62C, NA_SE_EN_OWL_FLUTTER, unkf2); + } + if (globalCtx->csCtx.frames == 85) { + func_800F436C(&D_80ACD62C, NA_SE_EV_PASS_AIR, unkf2); + } + break; + case 8: + case 9: + unkf2 = xyzDist * 2.f; + func_800F436C(&D_80ACD62C, NA_SE_EV_FLYING_AIR - SFX_FLAG, unkf2); + if ((globalCtx->csCtx.frames >= 420) || + ((0xC1 < globalCtx->csCtx.frames && (globalCtx->csCtx.frames <= 280)))) { + func_800F4414(&D_80ACD62C, NA_SE_EN_OWL_FLUTTER, unkf2); + } + if (globalCtx->csCtx.frames == 217) { + func_800F436C(&D_80ACD62C, NA_SE_EV_PASS_AIR, unkf2); + } + break; + } +} + +void func_80ACB904(EnOwl* this, GlobalContext* globalCtx) { + if (globalCtx->csCtx.state != CS_STATE_IDLE && (globalCtx->csCtx.npcActions[7] != NULL)) { + if (this->unk_40A != globalCtx->csCtx.npcActions[7]->action) { + func_80ACD130(this, globalCtx, 7); + func_80ACBAB8(this, globalCtx); + } + func_80ACD2CC(this, globalCtx); + } + + if (this->actionFlags & 0x80) { + func_80ACB748(this, globalCtx); + } +} + +void func_80ACB994(EnOwl* this, GlobalContext* globalCtx) { + if (globalCtx->csCtx.state != CS_STATE_IDLE && (globalCtx->csCtx.npcActions[7] != NULL)) { + if (this->unk_40A != globalCtx->csCtx.npcActions[7]->action) { + func_80ACD130(this, globalCtx, 7); + func_80ACBAB8(this, globalCtx); + } + func_80ACD4D4(this, globalCtx); + } + + if (this->actionFlags & 0x80) { + func_80ACB748(this, globalCtx); + } +} + +void EnOwl_WaitDefault(EnOwl* this, GlobalContext* globalCtx) { + u16 angle; + + if (globalCtx->csCtx.state != CS_STATE_IDLE && (globalCtx->csCtx.npcActions[7] != NULL)) { + if (this->unk_40A != globalCtx->csCtx.npcActions[7]->action) { + this->actionFlags |= 4; + func_80ACD130(this, globalCtx, 7); + func_80ACBAB8(this, globalCtx); + } else { + this->actor.posRot.rot.z = globalCtx->csCtx.npcActions[7]->urot.y; + } + } + + if (this->actionFlags & 0x80) { + func_80ACB748(this, globalCtx); + } +} + +void func_80ACBAB8(EnOwl* this, GlobalContext* globalCtx) { + switch (globalCtx->csCtx.npcActions[7]->action - 1) { + case 0: + EnOwl_ChangeMode(this, func_80ACB904, func_80ACC540, &this->skelAnime, &D_060015CC, 0.0f); + break; + case 1: + this->actor.draw = EnOwl_Draw; + EnOwl_ChangeMode(this, EnOwl_WaitDefault, func_80ACC540, &this->skelAnime, &D_0600C8A0, 0.0f); + break; + case 2: + this->actor.draw = EnOwl_Draw; + EnOwl_ChangeMode(this, func_80ACB994, func_80ACC540, &this->skelAnime, &D_060015CC, 0.0f); + break; + case 3: + this->actor.draw = NULL; + this->actionFunc = EnOwl_WaitDefault; + break; + case 4: + Actor_Kill(&this->actor); + break; + } + + this->unk_40A = globalCtx->csCtx.npcActions[7]->action; +} + +void func_80ACBC0C(EnOwl* this, GlobalContext* globalCtx) { + this->actor.flags |= 0x20; + + if (this->actor.xzDistToLink > 6000.0f && !(this->actionFlags & 0x80)) { + Actor_Kill(&this->actor); + } + + Math_SmoothStepToS(&this->actor.posRot.rot.y, this->unk_400, 2, 0x80, 0x40); + this->actor.shape.rot.y = this->actor.posRot.rot.y; + + if (this->actor.speedXZ < 16.0f) { + this->actor.speedXZ += 0.5f; + } + + if ((this->unk_3F8 + 1000.0f) < this->actor.posRot.pos.y) { + if (this->actor.velocity.y > 0.0f) { + this->actor.velocity.y -= 0.4f; + } + } else if (this->actor.velocity.y < 4.0f) { + this->actor.velocity.y += 0.2f; + } + + this->actionFlags |= 8; +} + +void func_80ACBD4C(EnOwl* this, GlobalContext* globalCtx) { + if (this->skelAnime.curFrame > 10.0f) { + Math_SmoothStepToS(&this->actor.posRot.rot.y, this->unk_400, 2, 0x400, 0x40); + this->actor.shape.rot.y = this->actor.posRot.rot.y; + } + + if (this->skelAnime.curFrame > 45.0f) { + this->actor.velocity.y = 2.0f; + this->actor.gravity = 0.0f; + this->actor.speedXZ = 8.0f; + } else if (this->skelAnime.curFrame > 17.0f) { + this->actor.velocity.y = 6.0f; + this->actor.gravity = 0.0f; + this->actor.speedXZ = 4.0f; + } + + if (this->actionFlags & 1) { + EnOwl_ChangeMode(this, func_80ACBC0C, func_80ACC460, &this->skelAnime, &D_060015CC, 0.0f); + this->unk_3FE = 6; + if (this->actionFlags & 0x40) { + this->unk_400 += 0x2000; + } else { + this->unk_400 -= 0x2000; + } + } + + this->actionFlags |= 8; +} + +void func_80ACBEA0(EnOwl* this, GlobalContext* GlobalContext) { + if (this->actionFlags & 1) { + this->unk_3FE = 3; + EnOwl_ChangeMode(this, func_80ACBD4C, func_80ACC540, &this->skelAnime, &D_06001168, 0.0f); + this->unk_3F8 = this->actor.posRot.pos.y; + this->actor.velocity.y = 2.0f; + if (this->actionFlags & 0x40) { + this->unk_400 = this->actor.posRot.rot.y + 0x4000; + } else { + this->unk_400 = this->actor.posRot.rot.y - 0x4000; + } + } + + this->actionFlags |= 8; +} + +void func_80ACBF50(EnOwl* this, GlobalContext* globalCtx) { + Math_SmoothStepToS(&this->actor.posRot.rot.y, this->unk_400, 2, 0x384, 0x258); + this->actor.shape.rot.y = this->actor.posRot.rot.y; + + if (this->actionFlags & 1) { + EnOwl_ChangeMode(this, func_80ACBC0C, func_80ACC460, &this->skelAnime, &D_060015CC, 0.0f); + this->unk_3FE = 6; + this->actor.velocity.y = 2.0f; + this->actor.gravity = 0.0f; + this->actor.speedXZ = 4.0f; + } + this->actionFlags |= 8; +} + +void func_80ACC00C(EnOwl* this, GlobalContext* globalCtx) { + s32 owlType; + s32 temp_v0; + s32 temp_v0_2; + + Math_SmoothStepToS(&this->actor.posRot.rot.y, this->unk_400, 2, 0x384, 0x258); + this->actor.shape.rot.y = this->actor.posRot.rot.y; + + if (this->actor.xzDistToLink < 50.0f) { + if (!Gameplay_InCsMode(globalCtx)) { + owlType = (this->actor.params & 0xFC0) >> 6; + osSyncPrintf(VT_FGCOL(CYAN)); + osSyncPrintf("%dのフクロウ\n", owlType); // "%d owl" + osSyncPrintf(VT_RST); + switch (owlType) { + case 7: + osSyncPrintf(VT_FGCOL(CYAN)); + osSyncPrintf("SPOT 06 の デモがはしった\n"); // Demo of SPOT 06 + osSyncPrintf(VT_RST); + globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(&D_0201B0C0); + this->actor.draw = NULL; + break; + case 8: + case 9: + globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(&D_0201E6A0); + this->actor.draw = NULL; + break; + default: + __assert("0", "../z_en_owl.c", 1693); + break; + } + + func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + gSaveContext.cutsceneTrigger = 1; + func_800F44EC(0x14, 0xA); + this->actionFunc = EnOwl_WaitDefault; + this->unk_40A = 0; + this->actionFlags |= 0x80; + D_8011FB40 = 0; + } + } + + if (this->skelAnime.curFrame >= 37.0f) { + if (this->unk_3FE > 0) { + this->skelAnime.curFrame = 21.0f; + this->unk_3FE--; + } else { + this->actionFunc = func_80ACBF50; + } + } + + this->actionFlags |= 8; +} + +void func_80ACC23C(EnOwl* this, GlobalContext* globalCtx) { + if (this->skelAnime.curFrame < 20.0f) { + this->actor.speedXZ = 1.5f; + } else { + this->actor.speedXZ = 0.0f; + Math_SmoothStepToS(&this->actor.posRot.rot.y, this->unk_400, 2, 0x384, 0x258); + this->actor.shape.rot.y = this->actor.posRot.rot.y; + } + + if (this->skelAnime.curFrame >= 37.0f) { + this->skelAnime.curFrame = 21.0f; + this->actionFunc = func_80ACC00C; + this->unk_3FE = 5; + this->actor.velocity.y = 0.0f; + this->actor.gravity = 0.0f; + this->actor.speedXZ = 0.0f; + } + + this->actionFlags |= 8; +} + +void func_80ACC30C(EnOwl* this, GlobalContext* globalCtx) { + if (this->actionFlags & 1) { + this->unk_3FE = 3; + EnOwl_ChangeMode(this, func_80ACC23C, func_80ACC540, &this->skelAnime, &D_06001168, 0.0f); + this->unk_3F8 = this->actor.posRot.pos.y; + this->actor.velocity.y = 0.2f; + } + + this->actionFlags |= 8; +} + +void func_80ACC390(EnOwl* this) { + SkelAnime_Update(this->curSkelAnime); + + if (this->unk_3FE > 0) { + this->unk_3FE--; + this->actor.shape.rot.z = Math_SinS(this->unk_3FE * 0x333) * 1000.0f; + } else { + this->unk_410 = &func_80ACC460; + this->unk_3FE = 6; + Animation_Change(this->curSkelAnime, &D_060015CC, 1.0f, 0.0f, Animation_GetLastFrame(&D_060015CC), 2, 5.0f); + } +} + +void func_80ACC460(EnOwl* this) { + if (SkelAnime_Update(this->curSkelAnime) != 0) { + if (this->unk_3FE > 0) { + this->unk_3FE--; + Animation_Change(this->curSkelAnime, this->curSkelAnime->animation, 1.0f, 0.0f, + Animation_GetLastFrame(this->curSkelAnime->animation), 2, 0.0f); + } else { + this->unk_3FE = 0xA0; + this->unk_410 = func_80ACC390; + Animation_Change(this->curSkelAnime, &D_0600C1C4, 1.0f, 0.0f, Animation_GetLastFrame(&D_0600C1C4), 0, 5.0f); + } + } +} + +void func_80ACC540(EnOwl* this) { + if (SkelAnime_Update(this->curSkelAnime) != 0) { + Animation_Change(this->curSkelAnime, this->curSkelAnime->animation, 1.0f, 0.0f, + Animation_GetLastFrame(this->curSkelAnime->animation), 2, 0.0f); + this->actionFlags |= 1; + } else { + this->actionFlags &= ~1; + } +} + +s32 func_80ACC5CC(EnOwl* this) { + s32 phi_v1; + s32 ret; + + phi_v1 = (this->actionFlags & 2) ? 0x20 : 0; + + if (phi_v1 == (this->unk_3EE & 0x3F)) { + return true; + } else { + if (this->actionFlags & 0x20) { + this->unk_3EE += 4; + } else { + this->unk_3EE -= 4; + } + + return false; + } +} + +s32 func_80ACC624(EnOwl* this, GlobalContext* globalCtx) { + s32 switchFlag = (this->actor.params & 0xFC0) >> 6; + + if (globalCtx->sceneNum != SCENE_SPOT11) { + return true; + } else if (switchFlag == 0xA) { + return true; + } else if (globalCtx->csCtx.frames >= 300 && globalCtx->csCtx.frames <= 430) { + return true; + } else if (globalCtx->csCtx.frames >= 1080 && globalCtx->csCtx.frames <= 1170) { + return true; + } else { + return false; + } +} + +#ifdef NON_MATCHING +// Minor regalloc surrounding the unk_3EE at the end of the function. +void EnOwl_Update(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + EnOwl* this = THIS; + s16 phi_a1; + + Collider_CylinderUpdate(&this->actor, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + func_8002E4B4(globalCtx, &this->actor, 10.0f, 10.0f, 10.0f, 5); + this->unk_410(this); + this->actionFlags &= ~8; + this->actionFunc(this, globalCtx); + if (this->actor.update == NULL) { + // Owl disappears + osSyncPrintf("フクロウ消滅!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + return; + } + + if (!(this->actionFlags & 0x80) && func_80ACC624(this, globalCtx)) { + if ((this->skelAnime.animation == &D_06001168 && + (this->skelAnime.curFrame == 2.0f || this->skelAnime.curFrame == 9.0f || + this->skelAnime.curFrame == 23.0f || this->skelAnime.curFrame == 40.0f || + this->skelAnime.curFrame == 58.0f)) || + (this->skelAnime.animation == &D_060015CC && this->skelAnime.curFrame == 4.0f)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_OWL_FLUTTER); + } + } + + if (this->actor.draw != NULL) { + Actor_MoveForward(&this->actor); + } + + if (this->actionFlags & 2) { + this->eyeTexIndex = 2; + } else { + if (DECR(this->blinkTimer) == 0) { + this->blinkTimer = Rand_S16Offset(60, 60); + } + + this->eyeTexIndex = this->blinkTimer; + + if (this->eyeTexIndex >= 3) { + this->eyeTexIndex = 0; + } + } + + if (!(this->actionFlags & 8)) { + phi_a1 = 0; + if (this->actionFlags & 0x10) { + switch (this->unk_404) { + case 0: + this->unk_404 = 1; + this->unk_405 = 6; + break; + case 1: + this->unk_405--; + + if (this->unk_405 != 0) { + phi_a1 = Math_CosS(this->unk_405 * 8192) * 4096.0f; + } else { + if (this->actionFlags & 2) { + this->unk_3EE = 0; + } else { + this->unk_3EE = 0x20; + } + + if (this->actionFlags & 0x20) { + this->unk_3EE -= 4; + } else { + this->unk_3EE += 4; + } + this->unk_404++; + } + + if (this->actionFlags & 0x20) { + phi_a1 = -phi_a1; + } + break; + case 2: + if (func_80ACC5CC(this)) { + this->actionFlags &= ~0x10; + this->unk_406 = (s32)Rand_ZeroFloat(20.0f) + 0x3C; + this->unk_404 = 0; + func_80ACA6C0(this); + } + break; + default: + break; + } + } else { + if (this->unk_406 > 0) { + this->unk_406--; + } else { + if (this->unk_404 == 0) { + if (Rand_ZeroOne() < 0.3f) { + this->unk_404 = 4; + this->unk_405 = 0xC; + } else { + this->unk_404 = 1; + this->unk_405 = 4; + } + } + + this->unk_405--; + + switch (this->unk_404) { + case 1: + phi_a1 = Math_SinS((-this->unk_405 * 4096) + 0x4000) * 5000.0f; + if (this->unk_405 <= 0) { + this->unk_405 = (s32)(Rand_ZeroFloat(15.0f) + 5.0f); + this->unk_404 = 2; + } + break; + case 2: + phi_a1 = 0x1388; + if (this->unk_405 <= 0) { + this->unk_404 = 3; + this->unk_405 = 4; + } + break; + case 3: + phi_a1 = Math_SinS(this->unk_405 * 4096) * 5000.0f; + if (this->unk_405 <= 0) { + this->unk_406 = (s32)Rand_ZeroFloat(20.0f) + 0x3C; + this->unk_404 = 0; + func_80ACA6C0(this); + } + break; + case 4: + phi_a1 = Math_SinS(this->unk_405 * 8192) * 5000.0f; + if (this->unk_405 <= 0) { + this->unk_406 = (s32)Rand_ZeroFloat(20.0f) + 0x3C; + this->unk_404 = 0; + func_80ACA6C0(this); + } + break; + default: + break; + } + + if (this->actionFlags & 0x20) { + phi_a1 = -phi_a1; + } + } + + if (this->unk_409 > 0) { + this->unk_409--; + } else { + this->unk_408--; + switch (this->unk_407) { + case 0: + this->unk_3F2 = (-this->unk_408 * 0x5DC) + 0x1770; + if (this->unk_408 <= 0) { + this->unk_407 = 1; + this->unk_408 = (s32)(Rand_ZeroFloat(15.0f) + 5.0f); + } + break; + case 1: + this->unk_3F2 = 0x1770; + if (this->unk_408 <= 0) { + this->unk_407 = 2; + this->unk_408 = 4; + } + break; + case 2: + this->unk_3F2 = this->unk_408 * 0x5DC; + if (this->unk_408 <= 0) { + this->unk_407 = 0; + this->unk_408 = 4; + this->unk_409 = (s32)Rand_ZeroFloat(40.0f) + 0xA0; + } + break; + default: + break; + } + } + } + if (phi_a1) {} + this->unk_3F0 = (s16)(this->unk_3EE * 1024) + phi_a1; + this->unk_3EC = ABS(this->unk_3F0) >> 3; + } else { + this->unk_3F2 = 0; + if (this->actionFlags & 2) { + this->unk_3F0 = -0x8000; + } else { + this->unk_3F0 = 0; + } + + this->unk_3EC = ABS(this->unk_3F0) >> 3; + } +} +#else #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Update.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACCE00.s") +s32 EnOwl_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** gfx, Vec3f* pos, Vec3s* rot, void* thisx) { + EnOwl* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACCF34.s") + switch (limbIndex) { + case 3: + rot->x += this->unk_3F0; + rot->z += this->unk_3EC; + rot->z -= this->unk_3F2; + break; + case 2: + rot->z += this->unk_3F2; + break; + case 4: + if (!(this->actionFlags & 8)) { + rot->y -= (s16)(this->unk_3EC * 1.5f); + } + break; + case 5: + if (!(this->actionFlags & 8)) { + rot->y += (s16)(this->unk_3EC * 1.5f); + } + break; + default: + break; + } + return 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Draw.s") +void EnOwl_PostLimbUpdate(GlobalContext* globalCtx, s32 limbIndex, Gfx** gfx, Vec3s* rot, void* thisx) { + EnOwl* this = THIS; + Vec3f vec; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD0B8.s") + vec.z = 0.0f; + if (this->actionFlags & 2) { + vec.x = 700.0f; + vec.y = 400.0f; + } else { + vec.y = 0.0f; + vec.x = 1400.0f; + } + if (limbIndex == 3) { + Matrix_MultVec3f(&vec, &this->actor.posRot2.pos); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD130.s") +void EnOwl_Draw(Actor* thisx, GlobalContext* globalCtx) { + static u64* eyeTextures[] = { 0x060089A8, 0x06008DA8, 0x060091A8 }; + EnOwl* this = THIS; + s32 pad; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD1C4.s") + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_owl.c", 2247); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD220.s") + func_800943C8(globalCtx->state.gfxCtx); + gSPSegment(POLY_OPA_DISP++, 8, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeTexIndex])); + SkelAnime_DrawFlexOpa(globalCtx, this->curSkelAnime->skeleton, this->curSkelAnime->jointTable, + this->curSkelAnime->dListCount, EnOwl_OverrideLimbDraw, EnOwl_PostLimbUpdate, this); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD2CC.s") + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_owl.c", 2264); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD4D4.s") +void EnOwl_ChangeMode(EnOwl* this, EnOwlActionFunc actionFunc, OwlFunc arg2, SkelAnime* skelAnime, + AnimationHeader* animation, f32 transitionRate) { + this->curSkelAnime = skelAnime; + Animation_Change(this->curSkelAnime, animation, 1.0f, 0.0f, Animation_GetLastFrame(animation), 2, transitionRate); + this->actionFunc = actionFunc; + this->unk_410 = arg2; +} + +void func_80ACD130(EnOwl* this, GlobalContext* globalCtx, s32 idx) { + Vec3f startPos; + + startPos.x = globalCtx->csCtx.npcActions[idx]->startPos.x; + startPos.y = globalCtx->csCtx.npcActions[idx]->startPos.y; + startPos.z = globalCtx->csCtx.npcActions[idx]->startPos.z; + this->actor.posRot.pos = startPos; + this->actor.posRot.rot.y = this->actor.shape.rot.y = globalCtx->csCtx.npcActions[idx]->rot.y; + this->actor.shape.rot.z = globalCtx->csCtx.npcActions[idx]->urot.z; +} + +f32 func_80ACD1C4(GlobalContext* globalCtx, s32 idx) { + f32 ret; + + ret = func_8006F93C(globalCtx->csCtx.npcActions[idx]->endFrame, globalCtx->csCtx.npcActions[idx]->startFrame, + globalCtx->csCtx.frames); + if (ret > 1.0f) { + ret = 1.0f; + } + return ret; +} + +void func_80ACD220(EnOwl* this, Vec3f* arg1, f32 arg2) { + Vec3f rpy; + + rpy.x = (arg1->x - this->actor.posRot.pos.x) * arg2; + rpy.y = (arg1->y - this->actor.posRot.pos.y) * arg2; + rpy.z = (arg1->z - this->actor.posRot.pos.z) * arg2; + + Math_StepToF(&this->actor.velocity.y, rpy.y, 1.0f); + this->actor.speedXZ = sqrtf(SQ(rpy.x) + SQ(rpy.z)); + this->actor.posRot.rot.y = Math_Vec3f_Yaw(&this->actor.posRot.pos, arg1); + this->actor.shape.rot.y = this->actor.posRot.rot.y; +} + +void func_80ACD2CC(EnOwl* this, GlobalContext* globalCtx) { + Vec3f pos; + s32 angle; + f32 t; + f32 phi_f2; + + t = func_80ACD1C4(globalCtx, 7); + pos.x = globalCtx->csCtx.npcActions[7]->startPos.x; + pos.y = globalCtx->csCtx.npcActions[7]->startPos.y; + pos.z = globalCtx->csCtx.npcActions[7]->startPos.z; + angle = (s16)globalCtx->csCtx.npcActions[7]->rot.y - this->actor.posRot.rot.z; + if (angle < 0) { + angle += 0x10000; + } + angle = (s16)((t * angle) + this->actor.posRot.rot.z); + angle = (u16)angle; + if (this->actionFlags & 4) { + phi_f2 = globalCtx->csCtx.npcActions[7]->urot.x; + phi_f2 *= 0.054931640625f; + if (phi_f2 < 0.0f) { + phi_f2 += 360.0f; + } + pos.x -= Math_SinS(angle) * phi_f2; + pos.z += Math_CosS(angle) * phi_f2; + this->unk_3F8 = phi_f2; + this->actor.posRot.pos = pos; + this->actor.draw = &EnOwl_Draw; + this->actionFlags &= ~4; + this->actor.speedXZ = 0.0f; + return; + } + pos.x -= Math_SinS(angle) * this->unk_3F8; + pos.z += Math_CosS(angle) * this->unk_3F8; + func_80ACD220(this, &pos, 1.0f); +} + +void func_80ACD4D4(EnOwl* this, GlobalContext* globalCtx) { + Vec3f pos; + Vec3f endPosf; + f32 temp_ret; + CsCmdActorAction* actorCmd; + + temp_ret = func_80ACD1C4(globalCtx, 7); + pos.x = globalCtx->csCtx.npcActions[7]->startPos.x; + pos.y = globalCtx->csCtx.npcActions[7]->startPos.y; + pos.z = globalCtx->csCtx.npcActions[7]->startPos.z; + actorCmd = globalCtx->csCtx.npcActions[7]; + endPosf.x = actorCmd->endPos.x; + endPosf.y = actorCmd->endPos.y; + endPosf.z = actorCmd->endPos.z; + pos.x = (endPosf.x - pos.x) * temp_ret + pos.x; + pos.y = (endPosf.y - pos.y) * temp_ret + pos.y; + pos.z = (endPosf.z - pos.z) * temp_ret + pos.z; + func_80ACD220(this, &pos, 1.0f); +} diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.h b/src/overlays/actors/ovl_En_Owl/z_en_owl.h index f36a82090b..2f79499654 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.h +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.h @@ -6,9 +6,41 @@ struct EnOwl; +typedef void (*EnOwlActionFunc)(struct EnOwl*, GlobalContext*); +typedef void (*OwlFunc)(struct EnOwl*); + typedef struct EnOwl { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x2C8]; + /* 0x014C */ ColliderCylinder collider; + /* 0x0198 */ SkelAnime skelAnime; + /* 0x01DC */ Vec3s jointTable[21]; + /* 0x025A */ Vec3s morphTable[21]; + /* 0x02D8 */ SkelAnime skelAnime2; + /* 0x031C */ Vec3s jointTable2[16]; + /* 0x037C */ Vec3s morphTable2[16]; + /* 0x03DC */ SkelAnime* curSkelAnime; + /* 0x03E0 */ Vec3f eye; + /* 0x03EC */ s16 unk_3EC; + /* 0x03EE */ s16 unk_3EE; + /* 0x03F0 */ s16 unk_3F0; + /* 0x03F2 */ s16 unk_3F2; + /* 0x03F4 */ s16 eyeTexIndex; + /* 0x03F6 */ s16 blinkTimer; + /* 0x03F8 */ f32 unk_3F8; + /* 0x03FC */ u16 actionFlags; + /* 0x03FE */ u16 unk_3FE; + /* 0x0400 */ s16 unk_400; + /* 0x0402 */ s16 cameraIdx; + /* 0x0404 */ u8 unk_404; + /* 0x0405 */ u8 unk_405; + /* 0x0406 */ u8 unk_406; + /* 0x0407 */ u8 unk_407; + /* 0x0408 */ u8 unk_408; + /* 0x0409 */ u8 unk_409; + /* 0x040A */ u8 unk_40A; + /* 0x040B */ u8 unk_40B; + /* 0x040C */ EnOwlActionFunc actionFunc; + /* 0x0410 */ OwlFunc unk_410; } EnOwl; // size = 0x0414 extern const ActorInit En_Owl_InitVars; diff --git a/undefined_syms.txt b/undefined_syms.txt index 032d9ee7ae..ba8ccf8eae 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -1044,6 +1044,17 @@ D_06001080 = 0x06001080; D_06004768 = 0x06004768; D_0600039C = 0x0600039C; +// z_en_owl +D_0600C1C4 = 0x0600C1C4; +D_0201E6A0 = 0x0201E6A0; +D_0201B0C0 = 0x0201B0C0; +D_06001168 = 0x06001168; +D_06003F18 = 0x06003F18; +D_060100B0 = 0x060100B0; +D_060015CC = 0x060015CC; +D_0600C8A0 = 0x0600C8A0; +D_0600C684 = 0x0600C684; + // z_en_kakasi // z_en_kakasi2 // z_en_kakasi3