From e8f93099d13005232cae047e3608324e1d01ca49 Mon Sep 17 00:00:00 2001 From: mzxrules Date: Thu, 29 Jul 2021 18:15:18 -0400 Subject: [PATCH] z_en_bigokuta OK (#878) * start * Did some more * Progress * More * IDK * Chip away a little * im done * func_809BEBBC OK! * get rid of graphovl * revert random changes * Big Okuta OK! * more clean-ups * implement dragorn's suggestions * implement fig and louist's suggestions Co-authored-by: Louis <35883445+louist103@users.noreply.github.com> --- .../ovl_En_Bigokuta/EnBigokuta_Destroy.s | 32 - .../actors/ovl_En_Bigokuta/EnBigokuta_Draw.s | 228 ----- .../actors/ovl_En_Bigokuta/EnBigokuta_Init.s | 103 -- .../ovl_En_Bigokuta/EnBigokuta_Update.s | 140 --- .../actors/ovl_En_Bigokuta/func_809BCE3C.s | 42 - .../actors/ovl_En_Bigokuta/func_809BCEBC.s | 45 - .../actors/ovl_En_Bigokuta/func_809BCF68.s | 169 ---- .../actors/ovl_En_Bigokuta/func_809BD1C8.s | 77 -- .../actors/ovl_En_Bigokuta/func_809BD2E4.s | 16 - .../actors/ovl_En_Bigokuta/func_809BD318.s | 28 - .../actors/ovl_En_Bigokuta/func_809BD370.s | 17 - .../actors/ovl_En_Bigokuta/func_809BD3AC.s | 19 - .../actors/ovl_En_Bigokuta/func_809BD3E0.s | 7 - .../actors/ovl_En_Bigokuta/func_809BD3F8.s | 34 - .../actors/ovl_En_Bigokuta/func_809BD47C.s | 11 - .../actors/ovl_En_Bigokuta/func_809BD4A4.s | 33 - .../actors/ovl_En_Bigokuta/func_809BD524.s | 51 - .../actors/ovl_En_Bigokuta/func_809BD5E0.s | 31 - .../actors/ovl_En_Bigokuta/func_809BD658.s | 26 - .../actors/ovl_En_Bigokuta/func_809BD6B8.s | 50 - .../actors/ovl_En_Bigokuta/func_809BD768.s | 38 - .../actors/ovl_En_Bigokuta/func_809BD7F0.s | 24 - .../actors/ovl_En_Bigokuta/func_809BD84C.s | 43 - .../actors/ovl_En_Bigokuta/func_809BD8DC.s | 154 --- .../actors/ovl_En_Bigokuta/func_809BDAE8.s | 48 - .../actors/ovl_En_Bigokuta/func_809BDB90.s | 35 - .../actors/ovl_En_Bigokuta/func_809BDC08.s | 237 ----- .../actors/ovl_En_Bigokuta/func_809BDF34.s | 47 - .../actors/ovl_En_Bigokuta/func_809BDFC8.s | 44 - .../actors/ovl_En_Bigokuta/func_809BE058.s | 84 -- .../actors/ovl_En_Bigokuta/func_809BE180.s | 72 -- .../actors/ovl_En_Bigokuta/func_809BE26C.s | 108 --- .../actors/ovl_En_Bigokuta/func_809BE3E4.s | 54 -- .../actors/ovl_En_Bigokuta/func_809BE4A4.s | 31 - .../actors/ovl_En_Bigokuta/func_809BE518.s | 23 - .../actors/ovl_En_Bigokuta/func_809BE568.s | 145 --- .../actors/ovl_En_Bigokuta/func_809BE798.s | 90 -- .../actors/ovl_En_Bigokuta/func_809BE8DC.s | 70 -- .../actors/ovl_En_Bigokuta/func_809BEBBC.s | 375 -------- data/overlays/actors/z_en_bigokuta.data.s | 37 - data/overlays/actors/z_en_bigokuta.reloc.s | 13 - spec | 3 +- .../actors/ovl_En_Bigokuta/z_en_bigokuta.c | 885 ++++++++++++++++-- .../actors/ovl_En_Bigokuta/z_en_bigokuta.h | 15 +- 44 files changed, 831 insertions(+), 3003 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCE3C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCEBC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCF68.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD1C8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD2E4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD318.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD370.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3AC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3E0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3F8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD47C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD4A4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD524.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD5E0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD658.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD6B8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD768.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD7F0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD84C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD8DC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDAE8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDB90.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDC08.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDF34.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDFC8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE058.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE180.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE26C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE3E4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE4A4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE518.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE568.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE798.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE8DC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BEBBC.s delete mode 100644 data/overlays/actors/z_en_bigokuta.data.s delete mode 100644 data/overlays/actors/z_en_bigokuta.reloc.s diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Destroy.s deleted file mode 100644 index 076c4e1bce..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Destroy.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel EnBigokuta_Destroy -/* 00168 809BCDC8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0016C 809BCDCC AFB20020 */ sw $s2, 0x0020($sp) -/* 00170 809BCDD0 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 00174 809BCDD4 AFB30024 */ sw $s3, 0x0024($sp) -/* 00178 809BCDD8 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 -/* 0017C 809BCDDC AFBF002C */ sw $ra, 0x002C($sp) -/* 00180 809BCDE0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00184 809BCDE4 AFB40028 */ sw $s4, 0x0028($sp) -/* 00188 809BCDE8 AFB1001C */ sw $s1, 0x001C($sp) -/* 0018C 809BCDEC AFB00018 */ sw $s0, 0x0018($sp) -/* 00190 809BCDF0 0C016F32 */ jal Collider_DestroyJntSph -/* 00194 809BCDF4 2645028C */ addiu $a1, $s2, 0x028C ## $a1 = 0000028C -/* 00198 809BCDF8 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 0019C 809BCDFC 265102EC */ addiu $s1, $s2, 0x02EC ## $s1 = 000002EC -/* 001A0 809BCE00 24140098 */ addiu $s4, $zero, 0x0098 ## $s4 = 00000098 -.L809BCE04: -/* 001A4 809BCE04 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 001A8 809BCE08 0C0170EB */ jal Collider_DestroyCylinder - -/* 001AC 809BCE0C 02202825 */ or $a1, $s1, $zero ## $a1 = 000002EC -/* 001B0 809BCE10 2610004C */ addiu $s0, $s0, 0x004C ## $s0 = 0000004C -/* 001B4 809BCE14 1614FFFB */ bne $s0, $s4, .L809BCE04 -/* 001B8 809BCE18 2631004C */ addiu $s1, $s1, 0x004C ## $s1 = 00000338 -/* 001BC 809BCE1C 8FBF002C */ lw $ra, 0x002C($sp) -/* 001C0 809BCE20 8FB00018 */ lw $s0, 0x0018($sp) -/* 001C4 809BCE24 8FB1001C */ lw $s1, 0x001C($sp) -/* 001C8 809BCE28 8FB20020 */ lw $s2, 0x0020($sp) -/* 001CC 809BCE2C 8FB30024 */ lw $s3, 0x0024($sp) -/* 001D0 809BCE30 8FB40028 */ lw $s4, 0x0028($sp) -/* 001D4 809BCE34 03E00008 */ jr $ra -/* 001D8 809BCE38 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s deleted file mode 100644 index 0732b0ef79..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s +++ /dev/null @@ -1,228 +0,0 @@ -.rdata -glabel D_809BF500 - .asciz "../z_en_bigokuta.c" - .balign 4 - -glabel D_809BF514 - .asciz "../z_en_bigokuta.c" - .balign 4 - -.late_rodata -glabel D_809BF580 - .float 6.28318548203 - -glabel D_809BF584 - .float 6.28318548203 - -glabel D_809BF588 - .word 0x3F4A3D70 -glabel D_809BF58C - .float 1.3 - -glabel D_809BF590 - .word 0x45F17A2F, 0x00000000, 0x00000000, 0x00000000 - -.text -glabel EnBigokuta_Draw -/* 0244C 809BF0AC 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 02450 809BF0B0 AFBF002C */ sw $ra, 0x002C($sp) -/* 02454 809BF0B4 AFB00028 */ sw $s0, 0x0028($sp) -/* 02458 809BF0B8 AFA50074 */ sw $a1, 0x0074($sp) -/* 0245C 809BF0BC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 02460 809BF0C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02464 809BF0C4 3C06809C */ lui $a2, %hi(D_809BF500) ## $a2 = 809C0000 -/* 02468 809BF0C8 24C6F500 */ addiu $a2, $a2, %lo(D_809BF500) ## $a2 = 809BF500 -/* 0246C 809BF0CC 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 02470 809BF0D0 240707E1 */ addiu $a3, $zero, 0x07E1 ## $a3 = 000007E1 -/* 02474 809BF0D4 0C031AB1 */ jal Graph_OpenDisps -/* 02478 809BF0D8 AFA50068 */ sw $a1, 0x0068($sp) -/* 0247C 809BF0DC 8E0F0190 */ lw $t7, 0x0190($s0) ## 00000190 -/* 02480 809BF0E0 3C05809C */ lui $a1, %hi(func_809BE26C) ## $a1 = 809C0000 -/* 02484 809BF0E4 24A5E26C */ addiu $a1, $a1, %lo(func_809BE26C) ## $a1 = 809BE26C -/* 02488 809BF0E8 14AF0008 */ bne $a1, $t7, .L809BF10C -/* 0248C 809BF0EC 8FA80068 */ lw $t0, 0x0068($sp) -/* 02490 809BF0F0 86180196 */ lh $t8, 0x0196($s0) ## 00000196 -/* 02494 809BF0F4 57000006 */ bnel $t8, $zero, .L809BF110 -/* 02498 809BF0F8 8FA90074 */ lw $t1, 0x0074($sp) -/* 0249C 809BF0FC 86190198 */ lh $t9, 0x0198($s0) ## 00000198 -/* 024A0 809BF100 8FAA0074 */ lw $t2, 0x0074($sp) -/* 024A4 809BF104 53200053 */ beql $t9, $zero, .L809BF254 -/* 024A8 809BF108 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -.L809BF10C: -/* 024AC 809BF10C 8FA90074 */ lw $t1, 0x0074($sp) -.L809BF110: -/* 024B0 809BF110 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 024B4 809BF114 AFA80068 */ sw $t0, 0x0068($sp) -/* 024B8 809BF118 0C024F46 */ jal func_80093D18 -/* 024BC 809BF11C AFA5003C */ sw $a1, 0x003C($sp) -/* 024C0 809BF120 8FA80068 */ lw $t0, 0x0068($sp) -/* 024C4 809BF124 8FA5003C */ lw $a1, 0x003C($sp) -/* 024C8 809BF128 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 024CC 809BF12C 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 024D0 809BF130 3C0C8011 */ lui $t4, %hi(D_80116280+0x10) -/* 024D4 809BF134 258C6290 */ addiu $t4, %lo(D_80116280+0x10) -/* 024D8 809BF138 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 -/* 024DC 809BF13C AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 024E0 809BF140 356B0030 */ ori $t3, $t3, 0x0030 ## $t3 = DB060030 -/* 024E4 809BF144 AC6B0000 */ sw $t3, 0x0000($v1) ## 00000000 -/* 024E8 809BF148 AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 -/* 024EC 809BF14C 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 024F0 809BF150 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 024F4 809BF154 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 024F8 809BF158 246D0008 */ addiu $t5, $v1, 0x0008 ## $t5 = 00000008 -/* 024FC 809BF15C AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 -/* 02500 809BF160 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 -/* 02504 809BF164 AC6E0000 */ sw $t6, 0x0000($v1) ## 00000000 -/* 02508 809BF168 86030196 */ lh $v1, 0x0196($s0) ## 00000196 -/* 0250C 809BF16C 30780001 */ andi $t8, $v1, 0x0001 ## $t8 = 00000000 -/* 02510 809BF170 5300002C */ beql $t8, $zero, .L809BF224 -/* 02514 809BF174 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 02518 809BF178 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -/* 0251C 809BF17C 3C19809C */ lui $t9, %hi(func_809BE180) ## $t9 = 809C0000 -/* 02520 809BF180 2739E180 */ addiu $t9, $t9, %lo(func_809BE180) ## $t9 = 809BE180 -/* 02524 809BF184 17220003 */ bne $t9, $v0, .L809BF194 -/* 02528 809BF188 28610008 */ slti $at, $v1, 0x0008 -/* 0252C 809BF18C 10200005 */ beq $at, $zero, .L809BF1A4 -/* 02530 809BF190 00000000 */ nop -.L809BF194: -/* 02534 809BF194 14A20022 */ bne $a1, $v0, .L809BF220 -/* 02538 809BF198 2861000A */ slti $at, $v1, 0x000A -/* 0253C 809BF19C 54200021 */ bnel $at, $zero, .L809BF224 -/* 02540 809BF1A0 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -.L809BF1A4: -/* 02544 809BF1A4 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 02548 809BF1A8 00000000 */ nop -/* 0254C 809BF1AC 3C01809C */ lui $at, %hi(D_809BF580) ## $at = 809C0000 -/* 02550 809BF1B0 C424F580 */ lwc1 $f4, %lo(D_809BF580)($at) -/* 02554 809BF1B4 46040182 */ mul.s $f6, $f0, $f4 -/* 02558 809BF1B8 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0255C 809BF1BC E7A6004C */ swc1 $f6, 0x004C($sp) -/* 02560 809BF1C0 3C01809C */ lui $at, %hi(D_809BF584) ## $at = 809C0000 -/* 02564 809BF1C4 C428F584 */ lwc1 $f8, %lo(D_809BF584)($at) -/* 02568 809BF1C8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0256C 809BF1CC 46080302 */ mul.s $f12, $f0, $f8 -/* 02570 809BF1D0 0C034348 */ jal Matrix_RotateY -/* 02574 809BF1D4 E7AC0048 */ swc1 $f12, 0x0048($sp) -/* 02578 809BF1D8 C7AC004C */ lwc1 $f12, 0x004C($sp) -/* 0257C 809BF1DC 0C0342DC */ jal Matrix_RotateX -/* 02580 809BF1E0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02584 809BF1E4 3C01809C */ lui $at, %hi(D_809BF588) ## $at = 809C0000 -/* 02588 809BF1E8 C42CF588 */ lwc1 $f12, %lo(D_809BF588)($at) -/* 0258C 809BF1EC 3C01809C */ lui $at, %hi(D_809BF58C) ## $at = 809C0000 -/* 02590 809BF1F0 C42EF58C */ lwc1 $f14, %lo(D_809BF58C)($at) -/* 02594 809BF1F4 44066000 */ mfc1 $a2, $f12 -/* 02598 809BF1F8 0C0342A3 */ jal Matrix_Scale -/* 0259C 809BF1FC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 025A0 809BF200 C7AC004C */ lwc1 $f12, 0x004C($sp) -/* 025A4 809BF204 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 025A8 809BF208 0C0342DC */ jal Matrix_RotateX -/* 025AC 809BF20C 46006307 */ neg.s $f12, $f12 -/* 025B0 809BF210 C7AC0048 */ lwc1 $f12, 0x0048($sp) -/* 025B4 809BF214 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 025B8 809BF218 0C034348 */ jal Matrix_RotateY -/* 025BC 809BF21C 46006307 */ neg.s $f12, $f12 -.L809BF220: -/* 025C0 809BF220 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -.L809BF224: -/* 025C4 809BF224 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 025C8 809BF228 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 025CC 809BF22C 3C09809C */ lui $t1, %hi(func_809BEBBC) ## $t1 = 809C0000 -/* 025D0 809BF230 2529EBBC */ addiu $t1, $t1, %lo(func_809BEBBC) ## $t1 = 809BEBBC -/* 025D4 809BF234 AFA90010 */ sw $t1, 0x0010($sp) -/* 025D8 809BF238 AFB00018 */ sw $s0, 0x0018($sp) -/* 025DC 809BF23C AFA00014 */ sw $zero, 0x0014($sp) -/* 025E0 809BF240 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 025E4 809BF244 8FA40074 */ lw $a0, 0x0074($sp) -/* 025E8 809BF248 10000048 */ beq $zero, $zero, .L809BF36C -/* 025EC 809BF24C 8FAB0074 */ lw $t3, 0x0074($sp) -/* 025F0 809BF250 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -.L809BF254: -/* 025F4 809BF254 0C024F61 */ jal func_80093D84 -/* 025F8 809BF258 AFA80068 */ sw $t0, 0x0068($sp) -/* 025FC 809BF25C 8FA80068 */ lw $t0, 0x0068($sp) -/* 02600 809BF260 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 02604 809BF264 3C0D8011 */ lui $t5, %hi(D_80116280) -/* 02608 809BF268 8D0302D0 */ lw $v1, 0x02D0($t0) ## 000002D0 -/* 0260C 809BF26C 25AD6280 */ addiu $t5, %lo(D_80116280) -/* 02610 809BF270 358C0030 */ ori $t4, $t4, 0x0030 ## $t4 = DB060030 -/* 02614 809BF274 246B0008 */ addiu $t3, $v1, 0x0008 ## $t3 = 00000008 -/* 02618 809BF278 AD0B02D0 */ sw $t3, 0x02D0($t0) ## 000002D0 -/* 0261C 809BF27C AC6D0004 */ sw $t5, 0x0004($v1) ## 00000004 -/* 02620 809BF280 AC6C0000 */ sw $t4, 0x0000($v1) ## 00000000 -/* 02624 809BF284 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 -/* 02628 809BF288 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 -/* 0262C 809BF28C 3C01809C */ lui $at, %hi(D_809BF590) ## $at = 809C0000 -/* 02630 809BF290 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 02634 809BF294 AD0E02D0 */ sw $t6, 0x02D0($t0) ## 000002D0 -/* 02638 809BF298 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 0263C 809BF29C C430F590 */ lwc1 $f16, %lo(D_809BF590)($at) -/* 02640 809BF2A0 C60A0054 */ lwc1 $f10, 0x0054($s0) ## 00000054 -/* 02644 809BF2A4 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 02648 809BF2A8 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 0264C 809BF2AC 46105482 */ mul.s $f18, $f10, $f16 -/* 02650 809BF2B0 4458F800 */ cfc1 $t8, $31 -/* 02654 809BF2B4 44D9F800 */ ctc1 $t9, $31 -/* 02658 809BF2B8 00000000 */ nop -/* 0265C 809BF2BC 46009124 */ cvt.w.s $f4, $f18 -/* 02660 809BF2C0 4459F800 */ cfc1 $t9, $31 -/* 02664 809BF2C4 00000000 */ nop -/* 02668 809BF2C8 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 0266C 809BF2CC 53200013 */ beql $t9, $zero, .L809BF31C -/* 02670 809BF2D0 44192000 */ mfc1 $t9, $f4 -/* 02674 809BF2D4 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 -/* 02678 809BF2D8 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 0267C 809BF2DC 46049101 */ sub.s $f4, $f18, $f4 -/* 02680 809BF2E0 44D9F800 */ ctc1 $t9, $31 -/* 02684 809BF2E4 00000000 */ nop -/* 02688 809BF2E8 46002124 */ cvt.w.s $f4, $f4 -/* 0268C 809BF2EC 4459F800 */ cfc1 $t9, $31 -/* 02690 809BF2F0 00000000 */ nop -/* 02694 809BF2F4 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 02698 809BF2F8 17200005 */ bne $t9, $zero, .L809BF310 -/* 0269C 809BF2FC 00000000 */ nop -/* 026A0 809BF300 44192000 */ mfc1 $t9, $f4 -/* 026A4 809BF304 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 026A8 809BF308 10000007 */ beq $zero, $zero, .L809BF328 -/* 026AC 809BF30C 0321C825 */ or $t9, $t9, $at ## $t9 = 80000000 -.L809BF310: -/* 026B0 809BF310 10000005 */ beq $zero, $zero, .L809BF328 -/* 026B4 809BF314 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 026B8 809BF318 44192000 */ mfc1 $t9, $f4 -.L809BF31C: -/* 026BC 809BF31C 00000000 */ nop -/* 026C0 809BF320 0720FFFB */ bltz $t9, .L809BF310 -/* 026C4 809BF324 00000000 */ nop -.L809BF328: -/* 026C8 809BF328 332900FF */ andi $t1, $t9, 0x00FF ## $t1 = 000000FF -/* 026CC 809BF32C AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 026D0 809BF330 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 026D4 809BF334 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 026D8 809BF338 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 026DC 809BF33C AFA00018 */ sw $zero, 0x0018($sp) -/* 026E0 809BF340 AFA00014 */ sw $zero, 0x0014($sp) -/* 026E4 809BF344 AFA00010 */ sw $zero, 0x0010($sp) -/* 026E8 809BF348 8D0A02D0 */ lw $t2, 0x02D0($t0) ## 000002D0 -/* 026EC 809BF34C 44D8F800 */ ctc1 $t8, $31 -/* 026F0 809BF350 AFA80068 */ sw $t0, 0x0068($sp) -/* 026F4 809BF354 8FA40074 */ lw $a0, 0x0074($sp) -/* 026F8 809BF358 0C0289CF */ jal SkelAnime_DrawFlex -/* 026FC 809BF35C AFAA001C */ sw $t2, 0x001C($sp) -/* 02700 809BF360 8FA80068 */ lw $t0, 0x0068($sp) -/* 02704 809BF364 AD0202D0 */ sw $v0, 0x02D0($t0) ## 000002D0 -/* 02708 809BF368 8FAB0074 */ lw $t3, 0x0074($sp) -.L809BF36C: -/* 0270C 809BF36C 3C06809C */ lui $a2, %hi(D_809BF514) ## $a2 = 809C0000 -/* 02710 809BF370 24C6F514 */ addiu $a2, $a2, %lo(D_809BF514) ## $a2 = 809BF514 -/* 02714 809BF374 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 02718 809BF378 2407081C */ addiu $a3, $zero, 0x081C ## $a3 = 0000081C -/* 0271C 809BF37C 0C031AD5 */ jal Graph_CloseDisps -/* 02720 809BF380 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 -/* 02724 809BF384 8FBF002C */ lw $ra, 0x002C($sp) -/* 02728 809BF388 8FB00028 */ lw $s0, 0x0028($sp) -/* 0272C 809BF38C 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 02730 809BF390 03E00008 */ jr $ra -/* 02734 809BF394 00000000 */ nop -/* 02738 809BF398 00000000 */ nop -/* 0273C 809BF39C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Init.s deleted file mode 100644 index a6092f133c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Init.s +++ /dev/null @@ -1,103 +0,0 @@ -.late_rodata -glabel D_809BF528 - .word 0xC4802000 - -.text -glabel EnBigokuta_Init -/* 00000 809BCC60 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 809BCC64 AFB30034 */ sw $s3, 0x0034($sp) -/* 00008 809BCC68 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 -/* 0000C 809BCC6C AFBF003C */ sw $ra, 0x003C($sp) -/* 00010 809BCC70 AFB20030 */ sw $s2, 0x0030($sp) -/* 00014 809BCC74 3C05809C */ lui $a1, %hi(D_809BF488) ## $a1 = 809C0000 -/* 00018 809BCC78 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 0001C 809BCC7C AFB40038 */ sw $s4, 0x0038($sp) -/* 00020 809BCC80 AFB1002C */ sw $s1, 0x002C($sp) -/* 00024 809BCC84 AFB00028 */ sw $s0, 0x0028($sp) -/* 00028 809BCC88 0C01E037 */ jal Actor_ProcessInitChain - -/* 0002C 809BCC8C 24A5F488 */ addiu $a1, $a1, %lo(D_809BF488) ## $a1 = 809BF488 -/* 00030 809BCC90 3C060600 */ lui $a2, %hi(D_06006BC0) ## $a2 = 06000000 -/* 00034 809BCC94 3C070600 */ lui $a3, %hi(D_060014B8) ## $a3 = 06000000 -/* 00038 809BCC98 264E019C */ addiu $t6, $s2, 0x019C ## $t6 = 0000019C -/* 0003C 809BCC9C 264F0214 */ addiu $t7, $s2, 0x0214 ## $t7 = 00000214 -/* 00040 809BCCA0 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 00044 809BCCA4 AFB80018 */ sw $t8, 0x0018($sp) -/* 00048 809BCCA8 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0004C 809BCCAC AFAE0010 */ sw $t6, 0x0010($sp) -/* 00050 809BCCB0 24E714B8 */ addiu $a3, $a3, %lo(D_060014B8) ## $a3 = 060014B8 -/* 00054 809BCCB4 24C66BC0 */ addiu $a2, $a2, %lo(D_06006BC0) ## $a2 = 06006BC0 -/* 00058 809BCCB8 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 0005C 809BCCBC 0C0291BE */ jal SkelAnime_InitFlex -/* 00060 809BCCC0 2645014C */ addiu $a1, $s2, 0x014C ## $a1 = 0000014C -/* 00064 809BCCC4 2650028C */ addiu $s0, $s2, 0x028C ## $s0 = 0000028C -/* 00068 809BCCC8 02002825 */ or $a1, $s0, $zero ## $a1 = 0000028C -/* 0006C 809BCCCC 0C016EFE */ jal Collider_InitJntSph -/* 00070 809BCCD0 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00074 809BCCD4 3C07809C */ lui $a3, %hi(D_809BF3F8) ## $a3 = 809C0000 -/* 00078 809BCCD8 265902AC */ addiu $t9, $s2, 0x02AC ## $t9 = 000002AC -/* 0007C 809BCCDC AFB90010 */ sw $t9, 0x0010($sp) -/* 00080 809BCCE0 24E7F3F8 */ addiu $a3, $a3, %lo(D_809BF3F8) ## $a3 = 809BF3F8 -/* 00084 809BCCE4 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00088 809BCCE8 02002825 */ or $a1, $s0, $zero ## $a1 = 0000028C -/* 0008C 809BCCEC 0C017014 */ jal Collider_SetJntSph -/* 00090 809BCCF0 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 -/* 00094 809BCCF4 8E4202A8 */ lw $v0, 0x02A8($s2) ## 000002A8 -/* 00098 809BCCF8 3C10809C */ lui $s0, %hi(D_809BF408) ## $s0 = 809C0000 -/* 0009C 809BCCFC 3C14809C */ lui $s4, %hi(D_809BF460) ## $s4 = 809C0000 -/* 000A0 809BCD00 8448002E */ lh $t0, 0x002E($v0) ## 0000002E -/* 000A4 809BCD04 2694F460 */ addiu $s4, $s4, %lo(D_809BF460) ## $s4 = 809BF460 -/* 000A8 809BCD08 2610F408 */ addiu $s0, $s0, %lo(D_809BF408) ## $s0 = 809BF408 -/* 000AC 809BCD0C 265102EC */ addiu $s1, $s2, 0x02EC ## $s1 = 000002EC -/* 000B0 809BCD10 A4480036 */ sh $t0, 0x0036($v0) ## 00000036 -.L809BCD14: -/* 000B4 809BCD14 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 000B8 809BCD18 0C0170D9 */ jal Collider_InitCylinder - -/* 000BC 809BCD1C 02202825 */ or $a1, $s1, $zero ## $a1 = 000002EC -/* 000C0 809BCD20 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 000C4 809BCD24 02202825 */ or $a1, $s1, $zero ## $a1 = 000002EC -/* 000C8 809BCD28 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 -/* 000CC 809BCD2C 0C01712B */ jal Collider_SetCylinder - -/* 000D0 809BCD30 02003825 */ or $a3, $s0, $zero ## $a3 = 809BF408 -/* 000D4 809BCD34 2610002C */ addiu $s0, $s0, 0x002C ## $s0 = 809BF434 -/* 000D8 809BCD38 1614FFF6 */ bne $s0, $s4, .L809BCD14 -/* 000DC 809BCD3C 2631004C */ addiu $s1, $s1, 0x004C ## $s1 = 00000338 -/* 000E0 809BCD40 3C05809C */ lui $a1, %hi(D_809BF468) ## $a1 = 809C0000 -/* 000E4 809BCD44 3C06809C */ lui $a2, %hi(D_809BF460) ## $a2 = 809C0000 -/* 000E8 809BCD48 24C6F460 */ addiu $a2, $a2, %lo(D_809BF460) ## $a2 = 809BF460 -/* 000EC 809BCD4C 24A5F468 */ addiu $a1, $a1, %lo(D_809BF468) ## $a1 = 809BF468 -/* 000F0 809BCD50 0C0187B5 */ jal CollisionCheck_SetInfo -/* 000F4 809BCD54 26440098 */ addiu $a0, $s2, 0x0098 ## $a0 = 00000098 -/* 000F8 809BCD58 8649001C */ lh $t1, 0x001C($s2) ## 0000001C -/* 000FC 809BCD5C 24100001 */ addiu $s0, $zero, 0x0001 ## $s0 = 00000001 -/* 00100 809BCD60 A2500194 */ sb $s0, 0x0194($s2) ## 00000194 -/* 00104 809BCD64 15200009 */ bne $t1, $zero, .L809BCD8C -/* 00108 809BCD68 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 0010C 809BCD6C 26651C24 */ addiu $a1, $s3, 0x1C24 ## $a1 = 00001C24 -/* 00110 809BCD70 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 -/* 00114 809BCD74 0C00CDD2 */ jal Actor_ChangeCategory - -/* 00118 809BCD78 24070006 */ addiu $a3, $zero, 0x0006 ## $a3 = 00000006 -/* 0011C 809BCD7C 0C26F4C6 */ jal func_809BD318 -/* 00120 809BCD80 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 00124 809BCD84 10000009 */ beq $zero, $zero, .L809BCDAC -/* 00128 809BCD88 8FBF003C */ lw $ra, 0x003C($sp) -.L809BCD8C: -/* 0012C 809BCD8C 0C26F4F8 */ jal func_809BD3E0 -/* 00130 809BCD90 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 00134 809BCD94 A640019A */ sh $zero, 0x019A($s2) ## 0000019A -/* 00138 809BCD98 A6500196 */ sh $s0, 0x0196($s2) ## 00000196 -/* 0013C 809BCD9C 3C01809C */ lui $at, %hi(D_809BF528) ## $at = 809C0000 -/* 00140 809BCDA0 C424F528 */ lwc1 $f4, %lo(D_809BF528)($at) -/* 00144 809BCDA4 E644000C */ swc1 $f4, 0x000C($s2) ## 0000000C -/* 00148 809BCDA8 8FBF003C */ lw $ra, 0x003C($sp) -.L809BCDAC: -/* 0014C 809BCDAC 8FB00028 */ lw $s0, 0x0028($sp) -/* 00150 809BCDB0 8FB1002C */ lw $s1, 0x002C($sp) -/* 00154 809BCDB4 8FB20030 */ lw $s2, 0x0030($sp) -/* 00158 809BCDB8 8FB30034 */ lw $s3, 0x0034($sp) -/* 0015C 809BCDBC 8FB40038 */ lw $s4, 0x0038($sp) -/* 00160 809BCDC0 03E00008 */ jr $ra -/* 00164 809BCDC4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Update.s deleted file mode 100644 index e1f1338844..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Update.s +++ /dev/null @@ -1,140 +0,0 @@ -glabel EnBigokuta_Update -/* 01D6C 809BE9CC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01D70 809BE9D0 AFBF002C */ sw $ra, 0x002C($sp) -/* 01D74 809BE9D4 AFB40024 */ sw $s4, 0x0024($sp) -/* 01D78 809BE9D8 AFB2001C */ sw $s2, 0x001C($sp) -/* 01D7C 809BE9DC 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 01D80 809BE9E0 0080A025 */ or $s4, $a0, $zero ## $s4 = 00000000 -/* 01D84 809BE9E4 AFB50028 */ sw $s5, 0x0028($sp) -/* 01D88 809BE9E8 AFB30020 */ sw $s3, 0x0020($sp) -/* 01D8C 809BE9EC AFB10018 */ sw $s1, 0x0018($sp) -/* 01D90 809BE9F0 0C26F9E6 */ jal func_809BE798 -/* 01D94 809BE9F4 AFB00014 */ sw $s0, 0x0014($sp) -/* 01D98 809BE9F8 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 01D9C 809BE9FC 0C26FA37 */ jal func_809BE8DC -/* 01DA0 809BEA00 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 01DA4 809BEA04 8E990190 */ lw $t9, 0x0190($s4) ## 00000190 -/* 01DA8 809BEA08 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 01DAC 809BEA0C 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 01DB0 809BEA10 0320F809 */ jalr $ra, $t9 -/* 01DB4 809BEA14 00000000 */ nop -/* 01DB8 809BEA18 0C26F4B9 */ jal func_809BD2E4 -/* 01DBC 809BEA1C 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 01DC0 809BEA20 0C26F95A */ jal func_809BE568 -/* 01DC4 809BEA24 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 01DC8 809BEA28 8E440790 */ lw $a0, 0x0790($s2) ## 00000790 -/* 01DCC 809BEA2C 0C0169DF */ jal Camera_ChangeSetting -/* 01DD0 809BEA30 24050034 */ addiu $a1, $zero, 0x0034 ## $a1 = 00000034 -/* 01DD4 809BEA34 8E440790 */ lw $a0, 0x0790($s2) ## 00000790 -/* 01DD8 809BEA38 0C016B47 */ jal func_8005AD1C -/* 01DDC 809BEA3C 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 01DE0 809BEA40 928E02FC */ lbu $t6, 0x02FC($s4) ## 000002FC -/* 01DE4 809BEA44 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 01DE8 809BEA48 51E00037 */ beql $t7, $zero, .L809BEB28 -/* 01DEC 809BEA4C 928D029D */ lbu $t5, 0x029D($s4) ## 0000029D -/* 01DF0 809BEA50 8E880190 */ lw $t0, 0x0190($s4) ## 00000190 -/* 01DF4 809BEA54 3C18809C */ lui $t8, %hi(func_809BE058) ## $t8 = 809C0000 -/* 01DF8 809BEA58 2718E058 */ addiu $t8, $t8, %lo(func_809BE058) ## $t8 = 809BE058 -/* 01DFC 809BEA5C 13080013 */ beq $t8, $t0, .L809BEAAC -/* 01E00 809BEA60 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 01E04 809BEA64 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01E08 809BEA68 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 01E0C 809BEA6C 02419821 */ addu $s3, $s2, $at -/* 01E10 809BEA70 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 01E14 809BEA74 269102EC */ addiu $s1, $s4, 0x02EC ## $s1 = 000002EC -/* 01E18 809BEA78 24150098 */ addiu $s5, $zero, 0x0098 ## $s5 = 00000098 -.L809BEA7C: -/* 01E1C 809BEA7C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01E20 809BEA80 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 01E24 809BEA84 0C0175E7 */ jal CollisionCheck_SetAT - ## CollisionCheck_setAT -/* 01E28 809BEA88 02203025 */ or $a2, $s1, $zero ## $a2 = 000002EC -/* 01E2C 809BEA8C 2610004C */ addiu $s0, $s0, 0x004C ## $s0 = 0000004C -/* 01E30 809BEA90 1615FFFA */ bne $s0, $s5, .L809BEA7C -/* 01E34 809BEA94 2631004C */ addiu $s1, $s1, 0x004C ## $s1 = 00000338 -/* 01E38 809BEA98 8E890004 */ lw $t1, 0x0004($s4) ## 00000004 -/* 01E3C 809BEA9C 3C010100 */ lui $at, 0x0100 ## $at = 01000000 -/* 01E40 809BEAA0 01215025 */ or $t2, $t1, $at ## $t2 = 01000000 -/* 01E44 809BEAA4 1000000D */ beq $zero, $zero, .L809BEADC -/* 01E48 809BEAA8 AE8A0004 */ sw $t2, 0x0004($s4) ## 00000004 -.L809BEAAC: -/* 01E4C 809BEAAC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01E50 809BEAB0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 01E54 809BEAB4 02419821 */ addu $s3, $s2, $at -/* 01E58 809BEAB8 269102EC */ addiu $s1, $s4, 0x02EC ## $s1 = 000002EC -/* 01E5C 809BEABC 24150098 */ addiu $s5, $zero, 0x0098 ## $s5 = 00000098 -.L809BEAC0: -/* 01E60 809BEAC0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01E64 809BEAC4 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 01E68 809BEAC8 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 01E6C 809BEACC 02203025 */ or $a2, $s1, $zero ## $a2 = 000002EC -/* 01E70 809BEAD0 2610004C */ addiu $s0, $s0, 0x004C ## $s0 = 00000098 -/* 01E74 809BEAD4 1615FFFA */ bne $s0, $s5, .L809BEAC0 -/* 01E78 809BEAD8 2631004C */ addiu $s1, $s1, 0x004C ## $s1 = 00000338 -.L809BEADC: -/* 01E7C 809BEADC 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 01E80 809BEAE0 269102EC */ addiu $s1, $s4, 0x02EC ## $s1 = 000002EC -/* 01E84 809BEAE4 24150098 */ addiu $s5, $zero, 0x0098 ## $s5 = 00000098 -.L809BEAE8: -/* 01E88 809BEAE8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01E8C 809BEAEC 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 01E90 809BEAF0 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 01E94 809BEAF4 02203025 */ or $a2, $s1, $zero ## $a2 = 000002EC -/* 01E98 809BEAF8 2610004C */ addiu $s0, $s0, 0x004C ## $s0 = 0000004C -/* 01E9C 809BEAFC 1615FFFA */ bne $s0, $s5, .L809BEAE8 -/* 01EA0 809BEB00 2631004C */ addiu $s1, $s1, 0x004C ## $s1 = 00000338 -/* 01EA4 809BEB04 928B029D */ lbu $t3, 0x029D($s4) ## 0000029D -/* 01EA8 809BEB08 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01EAC 809BEB0C 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 01EB0 809BEB10 316C0001 */ andi $t4, $t3, 0x0001 ## $t4 = 00000000 -/* 01EB4 809BEB14 51800004 */ beql $t4, $zero, .L809BEB28 -/* 01EB8 809BEB18 928D029D */ lbu $t5, 0x029D($s4) ## 0000029D -/* 01EBC 809BEB1C 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 01EC0 809BEB20 2686028C */ addiu $a2, $s4, 0x028C ## $a2 = 0000028C -/* 01EC4 809BEB24 928D029D */ lbu $t5, 0x029D($s4) ## 0000029D -.L809BEB28: -/* 01EC8 809BEB28 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01ECC 809BEB2C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 01ED0 809BEB30 31B90001 */ andi $t9, $t5, 0x0001 ## $t9 = 00000000 -/* 01ED4 809BEB34 02419821 */ addu $s3, $s2, $at -/* 01ED8 809BEB38 13200006 */ beq $t9, $zero, .L809BEB54 -/* 01EDC 809BEB3C 2686028C */ addiu $a2, $s4, 0x028C ## $a2 = 0000028C -/* 01EE0 809BEB40 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01EE4 809BEB44 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 01EE8 809BEB48 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 01EEC 809BEB4C 10000005 */ beq $zero, $zero, .L809BEB64 -/* 01EF0 809BEB50 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -.L809BEB54: -/* 01EF4 809BEB54 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01EF8 809BEB58 0C0175E7 */ jal CollisionCheck_SetAT - ## CollisionCheck_setAT -/* 01EFC 809BEB5C 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 01F00 809BEB60 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -.L809BEB64: -/* 01F04 809BEB64 44813000 */ mtc1 $at, $f6 ## $f6 = 25.00 -/* 01F08 809BEB68 C6840054 */ lwc1 $f4, 0x0054($s4) ## 00000054 -/* 01F0C 809BEB6C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 01F10 809BEB70 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 -/* 01F14 809BEB74 46062202 */ mul.s $f8, $f4, $f6 -/* 01F18 809BEB78 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 01F1C 809BEB7C 460A4402 */ mul.s $f16, $f8, $f10 -/* 01F20 809BEB80 44058000 */ mfc1 $a1, $f16 -/* 01F24 809BEB84 0C00B56E */ jal Actor_SetFocus - -/* 01F28 809BEB88 00000000 */ nop -/* 01F2C 809BEB8C 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 01F30 809BEB90 0C26F3AF */ jal func_809BCEBC -/* 01F34 809BEB94 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 01F38 809BEB98 8FBF002C */ lw $ra, 0x002C($sp) -/* 01F3C 809BEB9C 8FB00014 */ lw $s0, 0x0014($sp) -/* 01F40 809BEBA0 8FB10018 */ lw $s1, 0x0018($sp) -/* 01F44 809BEBA4 8FB2001C */ lw $s2, 0x001C($sp) -/* 01F48 809BEBA8 8FB30020 */ lw $s3, 0x0020($sp) -/* 01F4C 809BEBAC 8FB40024 */ lw $s4, 0x0024($sp) -/* 01F50 809BEBB0 8FB50028 */ lw $s5, 0x0028($sp) -/* 01F54 809BEBB4 03E00008 */ jr $ra -/* 01F58 809BEBB8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCE3C.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCE3C.s deleted file mode 100644 index 5d9fb12a67..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCE3C.s +++ /dev/null @@ -1,42 +0,0 @@ -.late_rodata -glabel D_809BF52C - .word 0x43838000 -glabel D_809BF530 - .word 0x43838000 - -.text -glabel func_809BCE3C -/* 001DC 809BCE3C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001E0 809BCE40 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001E4 809BCE44 808F0194 */ lb $t7, 0x0194($a0) ## 00000194 -/* 001E8 809BCE48 848E00B6 */ lh $t6, 0x00B6($a0) ## 000000B6 -/* 001EC 809BCE4C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 001F0 809BCE50 000F0823 */ subu $at, $zero, $t7 -/* 001F4 809BCE54 0001C380 */ sll $t8, $at, 14 -/* 001F8 809BCE58 01D8C821 */ addu $t9, $t6, $t8 -/* 001FC 809BCE5C A4990032 */ sh $t9, 0x0032($a0) ## 00000032 -/* 00200 809BCE60 84840032 */ lh $a0, 0x0032($a0) ## 00000032 -/* 00204 809BCE64 0C01DE1C */ jal Math_SinS - ## sins? -/* 00208 809BCE68 AFA50018 */ sw $a1, 0x0018($sp) -/* 0020C 809BCE6C 3C01809C */ lui $at, %hi(D_809BF52C) ## $at = 809C0000 -/* 00210 809BCE70 C424F52C */ lwc1 $f4, %lo(D_809BF52C)($at) -/* 00214 809BCE74 8FA50018 */ lw $a1, 0x0018($sp) -/* 00218 809BCE78 46040182 */ mul.s $f6, $f0, $f4 -/* 0021C 809BCE7C C4A80008 */ lwc1 $f8, 0x0008($a1) ## 00000008 -/* 00220 809BCE80 84A40032 */ lh $a0, 0x0032($a1) ## 00000032 -/* 00224 809BCE84 46083280 */ add.s $f10, $f6, $f8 -/* 00228 809BCE88 0C01DE0D */ jal Math_CosS - ## coss? -/* 0022C 809BCE8C E4AA0024 */ swc1 $f10, 0x0024($a1) ## 00000024 -/* 00230 809BCE90 3C01809C */ lui $at, %hi(D_809BF530) ## $at = 809C0000 -/* 00234 809BCE94 C430F530 */ lwc1 $f16, %lo(D_809BF530)($at) -/* 00238 809BCE98 8FA50018 */ lw $a1, 0x0018($sp) -/* 0023C 809BCE9C 46100482 */ mul.s $f18, $f0, $f16 -/* 00240 809BCEA0 C4A40010 */ lwc1 $f4, 0x0010($a1) ## 00000010 -/* 00244 809BCEA4 46049180 */ add.s $f6, $f18, $f4 -/* 00248 809BCEA8 E4A6002C */ swc1 $f6, 0x002C($a1) ## 0000002C -/* 0024C 809BCEAC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00250 809BCEB0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00254 809BCEB4 03E00008 */ jr $ra -/* 00258 809BCEB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCEBC.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCEBC.s deleted file mode 100644 index a206896bc3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCEBC.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_809BCEBC -/* 0025C 809BCEBC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00260 809BCEC0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00264 809BCEC4 AFA50034 */ sw $a1, 0x0034($sp) -/* 00268 809BCEC8 C4880024 */ lwc1 $f8, 0x0024($a0) ## 00000024 -/* 0026C 809BCECC C486000C */ lwc1 $f6, 0x000C($a0) ## 0000000C -/* 00270 809BCED0 C4840028 */ lwc1 $f4, 0x0028($a0) ## 00000028 -/* 00274 809BCED4 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00278 809BCED8 E7A80024 */ swc1 $f8, 0x0024($sp) -/* 0027C 809BCEDC C48A000C */ lwc1 $f10, 0x000C($a0) ## 0000000C -/* 00280 809BCEE0 44818000 */ mtc1 $at, $f16 ## $f16 = 3.00 -/* 00284 809BCEE4 46062001 */ sub.s $f0, $f4, $f6 -/* 00288 809BCEE8 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 0028C 809BCEEC 01E57821 */ addu $t7, $t7, $a1 -/* 00290 809BCEF0 46105480 */ add.s $f18, $f10, $f16 -/* 00294 809BCEF4 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 00298 809BCEF8 E7B20028 */ swc1 $f18, 0x0028($sp) -/* 0029C 809BCEFC C484002C */ lwc1 $f4, 0x002C($a0) ## 0000002C -/* 002A0 809BCF00 E7A4002C */ swc1 $f4, 0x002C($sp) -/* 002A4 809BCF04 8DEF1DE4 */ lw $t7, 0x1DE4($t7) ## 00011DE4 -/* 002A8 809BCF08 01E1001B */ divu $zero, $t7, $at -/* 002AC 809BCF0C 0000C010 */ mfhi $t8 -/* 002B0 809BCF10 57000012 */ bnel $t8, $zero, .L809BCF5C -/* 002B4 809BCF14 8FBF001C */ lw $ra, 0x001C($sp) -/* 002B8 809BCF18 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 002BC 809BCF1C 3C01C2C8 */ lui $at, 0xC2C8 ## $at = C2C80000 -/* 002C0 809BCF20 4606003E */ c.le.s $f0, $f6 -/* 002C4 809BCF24 00000000 */ nop -/* 002C8 809BCF28 4502000C */ bc1fl .L809BCF5C -/* 002CC 809BCF2C 8FBF001C */ lw $ra, 0x001C($sp) -/* 002D0 809BCF30 44814000 */ mtc1 $at, $f8 ## $f8 = -100.00 -/* 002D4 809BCF34 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002D8 809BCF38 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 -/* 002DC 809BCF3C 4600403C */ c.lt.s $f8, $f0 -/* 002E0 809BCF40 24060320 */ addiu $a2, $zero, 0x0320 ## $a2 = 00000320 -/* 002E4 809BCF44 24070514 */ addiu $a3, $zero, 0x0514 ## $a3 = 00000514 -/* 002E8 809BCF48 45020004 */ bc1fl .L809BCF5C -/* 002EC 809BCF4C 8FBF001C */ lw $ra, 0x001C($sp) -/* 002F0 809BCF50 0C00A511 */ jal EffectSsGRipple_Spawn -/* 002F4 809BCF54 AFA00010 */ sw $zero, 0x0010($sp) -/* 002F8 809BCF58 8FBF001C */ lw $ra, 0x001C($sp) -.L809BCF5C: -/* 002FC 809BCF5C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00300 809BCF60 03E00008 */ jr $ra -/* 00304 809BCF64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCF68.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCF68.s deleted file mode 100644 index 07081351db..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCF68.s +++ /dev/null @@ -1,169 +0,0 @@ -glabel func_809BCF68 -/* 00308 809BCF68 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 0030C 809BCF6C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00310 809BCF70 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00314 809BCF74 AFB00020 */ sw $s0, 0x0020($sp) -/* 00318 809BCF78 AFA5004C */ sw $a1, 0x004C($sp) -/* 0031C 809BCF7C 00A11821 */ addu $v1, $a1, $at -/* 00320 809BCF80 8C6E1DE4 */ lw $t6, 0x1DE4($v1) ## 00001DE4 -/* 00324 809BCF84 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00328 809BCF88 24041200 */ addiu $a0, $zero, 0x1200 ## $a0 = 00001200 -/* 0032C 809BCF8C 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 00330 809BCF90 11E00010 */ beq $t7, $zero, .L809BCFD4 -/* 00334 809BCF94 24050C00 */ addiu $a1, $zero, 0x0C00 ## $a1 = 00000C00 -/* 00338 809BCF98 24041200 */ addiu $a0, $zero, 0x1200 ## $a0 = 00001200 -/* 0033C 809BCF9C 24050C00 */ addiu $a1, $zero, 0x0C00 ## $a1 = 00000C00 -/* 00340 809BCFA0 0C01DF64 */ jal Rand_S16Offset - -/* 00344 809BCFA4 AFA30034 */ sw $v1, 0x0034($sp) -/* 00348 809BCFA8 82080194 */ lb $t0, 0x0194($s0) ## 00000194 -/* 0034C 809BCFAC 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 -/* 00350 809BCFB0 8FA30034 */ lw $v1, 0x0034($sp) -/* 00354 809BCFB4 00084880 */ sll $t1, $t0, 2 -/* 00358 809BCFB8 01284821 */ addu $t1, $t1, $t0 -/* 0035C 809BCFBC 00094A40 */ sll $t1, $t1, 9 -/* 00360 809BCFC0 0058C821 */ addu $t9, $v0, $t8 -/* 00364 809BCFC4 03292023 */ subu $a0, $t9, $t1 -/* 00368 809BCFC8 00042400 */ sll $a0, $a0, 16 -/* 0036C 809BCFCC 1000000D */ beq $zero, $zero, .L809BD004 -/* 00370 809BCFD0 00042403 */ sra $a0, $a0, 16 -.L809BCFD4: -/* 00374 809BCFD4 0C01DF64 */ jal Rand_S16Offset - -/* 00378 809BCFD8 AFA30034 */ sw $v1, 0x0034($sp) -/* 0037C 809BCFDC 820B0194 */ lb $t3, 0x0194($s0) ## 00000194 -/* 00380 809BCFE0 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 -/* 00384 809BCFE4 8FA30034 */ lw $v1, 0x0034($sp) -/* 00388 809BCFE8 000B6080 */ sll $t4, $t3, 2 -/* 0038C 809BCFEC 018B6021 */ addu $t4, $t4, $t3 -/* 00390 809BCFF0 000C6240 */ sll $t4, $t4, 9 -/* 00394 809BCFF4 014C6823 */ subu $t5, $t2, $t4 -/* 00398 809BCFF8 01A22023 */ subu $a0, $t5, $v0 -/* 0039C 809BCFFC 00042400 */ sll $a0, $a0, 16 -/* 003A0 809BD000 00042403 */ sra $a0, $a0, 16 -.L809BD004: -/* 003A4 809BD004 3C0E809C */ lui $t6, %hi(func_809BE4A4) ## $t6 = 809C0000 -/* 003A8 809BD008 25CEE4A4 */ addiu $t6, $t6, %lo(func_809BE4A4) ## $t6 = 809BE4A4 -/* 003AC 809BD00C AFAE0030 */ sw $t6, 0x0030($sp) -/* 003B0 809BD010 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -/* 003B4 809BD014 3C0F809C */ lui $t7, %hi(func_809BE3E4) ## $t7 = 809C0000 -/* 003B8 809BD018 25EFE3E4 */ addiu $t7, $t7, %lo(func_809BE3E4) ## $t7 = 809BE3E4 -/* 003BC 809BD01C 11C2003A */ beq $t6, $v0, .L809BD108 -/* 003C0 809BD020 00000000 */ nop -/* 003C4 809BD024 11E20005 */ beq $t7, $v0, .L809BD03C -/* 003C8 809BD028 00000000 */ nop -/* 003CC 809BD02C 8C781DE4 */ lw $t8, 0x1DE4($v1) ## 00001DE4 -/* 003D0 809BD030 33080002 */ andi $t0, $t8, 0x0002 ## $t0 = 00000000 -/* 003D4 809BD034 1100001E */ beq $t0, $zero, .L809BD0B0 -/* 003D8 809BD038 00000000 */ nop -.L809BD03C: -/* 003DC 809BD03C 0C01DE1C */ jal Math_SinS - ## sins? -/* 003E0 809BD040 A7A4003A */ sh $a0, 0x003A($sp) -/* 003E4 809BD044 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 003E8 809BD048 44813000 */ mtc1 $at, $f6 ## $f6 = 80.00 -/* 003EC 809BD04C C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 003F0 809BD050 87A4003A */ lh $a0, 0x003A($sp) -/* 003F4 809BD054 46060202 */ mul.s $f8, $f0, $f6 -/* 003F8 809BD058 46082281 */ sub.s $f10, $f4, $f8 -/* 003FC 809BD05C 0C01DE0D */ jal Math_CosS - ## coss? -/* 00400 809BD060 E7AA003C */ swc1 $f10, 0x003C($sp) -/* 00404 809BD064 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 00408 809BD068 44819000 */ mtc1 $at, $f18 ## $f18 = 80.00 -/* 0040C 809BD06C C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 00410 809BD070 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00414 809BD074 46120182 */ mul.s $f6, $f0, $f18 -/* 00418 809BD078 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 0041C 809BD07C 8FA4004C */ lw $a0, 0x004C($sp) -/* 00420 809BD080 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFF4 -/* 00424 809BD084 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 -/* 00428 809BD088 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 -/* 0042C 809BD08C 46068101 */ sub.s $f4, $f16, $f6 -/* 00430 809BD090 E7A40044 */ swc1 $f4, 0x0044($sp) -/* 00434 809BD094 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C -/* 00438 809BD098 AFA00010 */ sw $zero, 0x0010($sp) -/* 0043C 809BD09C 460A4480 */ add.s $f18, $f8, $f10 -/* 00440 809BD0A0 0C00A511 */ jal EffectSsGRipple_Spawn -/* 00444 809BD0A4 E7B20040 */ swc1 $f18, 0x0040($sp) -/* 00448 809BD0A8 10000033 */ beq $zero, $zero, .L809BD178 -/* 0044C 809BD0AC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -.L809BD0B0: -/* 00450 809BD0B0 0C01DE1C */ jal Math_SinS - ## sins? -/* 00454 809BD0B4 A7A4003A */ sh $a0, 0x003A($sp) -/* 00458 809BD0B8 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 0045C 809BD0BC 44813000 */ mtc1 $at, $f6 ## $f6 = 120.00 -/* 00460 809BD0C0 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 00464 809BD0C4 87A4003A */ lh $a0, 0x003A($sp) -/* 00468 809BD0C8 46060102 */ mul.s $f4, $f0, $f6 -/* 0046C 809BD0CC 46048201 */ sub.s $f8, $f16, $f4 -/* 00470 809BD0D0 0C01DE0D */ jal Math_CosS - ## coss? -/* 00474 809BD0D4 E7A8003C */ swc1 $f8, 0x003C($sp) -/* 00478 809BD0D8 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 0047C 809BD0DC 44819000 */ mtc1 $at, $f18 ## $f18 = 120.00 -/* 00480 809BD0E0 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 00484 809BD0E4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00488 809BD0E8 46120182 */ mul.s $f6, $f0, $f18 -/* 0048C 809BD0EC 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 00490 809BD0F0 46065401 */ sub.s $f16, $f10, $f6 -/* 00494 809BD0F4 E7B00044 */ swc1 $f16, 0x0044($sp) -/* 00498 809BD0F8 C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C -/* 0049C 809BD0FC 46082480 */ add.s $f18, $f4, $f8 -/* 004A0 809BD100 1000001C */ beq $zero, $zero, .L809BD174 -/* 004A4 809BD104 E7B20040 */ swc1 $f18, 0x0040($sp) -.L809BD108: -/* 004A8 809BD108 0C01DE1C */ jal Math_SinS - ## sins? -/* 004AC 809BD10C A7A4003A */ sh $a0, 0x003A($sp) -/* 004B0 809BD110 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 004B4 809BD114 44813000 */ mtc1 $at, $f6 ## $f6 = 50.00 -/* 004B8 809BD118 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 004BC 809BD11C 87A4003A */ lh $a0, 0x003A($sp) -/* 004C0 809BD120 46060402 */ mul.s $f16, $f0, $f6 -/* 004C4 809BD124 46105101 */ sub.s $f4, $f10, $f16 -/* 004C8 809BD128 0C01DE0D */ jal Math_CosS - ## coss? -/* 004CC 809BD12C E7A4003C */ swc1 $f4, 0x003C($sp) -/* 004D0 809BD130 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 004D4 809BD134 44819000 */ mtc1 $at, $f18 ## $f18 = 50.00 -/* 004D8 809BD138 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 004DC 809BD13C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 004E0 809BD140 46120182 */ mul.s $f6, $f0, $f18 -/* 004E4 809BD144 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 004E8 809BD148 8FA4004C */ lw $a0, 0x004C($sp) -/* 004EC 809BD14C 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFF4 -/* 004F0 809BD150 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 -/* 004F4 809BD154 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 -/* 004F8 809BD158 46064281 */ sub.s $f10, $f8, $f6 -/* 004FC 809BD15C E7AA0044 */ swc1 $f10, 0x0044($sp) -/* 00500 809BD160 C610000C */ lwc1 $f16, 0x000C($s0) ## 0000000C -/* 00504 809BD164 AFA00010 */ sw $zero, 0x0010($sp) -/* 00508 809BD168 46048480 */ add.s $f18, $f16, $f4 -/* 0050C 809BD16C 0C00A511 */ jal EffectSsGRipple_Spawn -/* 00510 809BD170 E7B20040 */ swc1 $f18, 0x0040($sp) -.L809BD174: -/* 00514 809BD174 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -.L809BD178: -/* 00518 809BD178 24090320 */ addiu $t1, $zero, 0x0320 ## $t1 = 00000320 -/* 0051C 809BD17C AFA90014 */ sw $t1, 0x0014($sp) -/* 00520 809BD180 AFB90010 */ sw $t9, 0x0010($sp) -/* 00524 809BD184 8FA4004C */ lw $a0, 0x004C($sp) -/* 00528 809BD188 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFF4 -/* 0052C 809BD18C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00530 809BD190 0C00A527 */ jal EffectSsGSplash_Spawn -/* 00534 809BD194 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00538 809BD198 8FAB0030 */ lw $t3, 0x0030($sp) -/* 0053C 809BD19C 8E0A0190 */ lw $t2, 0x0190($s0) ## 00000190 -/* 00540 809BD1A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00544 809BD1A4 516A0004 */ beql $t3, $t2, .L809BD1B8 -/* 00548 809BD1A8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0054C 809BD1AC 0C00BE5D */ jal func_8002F974 -/* 00550 809BD1B0 24053105 */ addiu $a1, $zero, 0x3105 ## $a1 = 00003105 -/* 00554 809BD1B4 8FBF0024 */ lw $ra, 0x0024($sp) -.L809BD1B8: -/* 00558 809BD1B8 8FB00020 */ lw $s0, 0x0020($sp) -/* 0055C 809BD1BC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00560 809BD1C0 03E00008 */ jr $ra -/* 00564 809BD1C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD1C8.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD1C8.s deleted file mode 100644 index 576b051238..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD1C8.s +++ /dev/null @@ -1,77 +0,0 @@ -glabel func_809BD1C8 -/* 00568 809BD1C8 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 0056C 809BD1CC AFBF003C */ sw $ra, 0x003C($sp) -/* 00570 809BD1D0 AFB40038 */ sw $s4, 0x0038($sp) -/* 00574 809BD1D4 AFB30034 */ sw $s3, 0x0034($sp) -/* 00578 809BD1D8 AFB20030 */ sw $s2, 0x0030($sp) -/* 0057C 809BD1DC AFB1002C */ sw $s1, 0x002C($sp) -/* 00580 809BD1E0 AFB00028 */ sw $s0, 0x0028($sp) -/* 00584 809BD1E4 F7B40020 */ sdc1 $f20, 0x0020($sp) -/* 00588 809BD1E8 C4840028 */ lwc1 $f4, 0x0028($a0) ## 00000028 -/* 0058C 809BD1EC 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 00590 809BD1F0 4481A000 */ mtc1 $at, $f20 ## $f20 = 60.00 -/* 00594 809BD1F4 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 00598 809BD1F8 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 0059C 809BD1FC 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 005A0 809BD200 27B20048 */ addiu $s2, $sp, 0x0048 ## $s2 = FFFFFFF0 -/* 005A4 809BD204 24130004 */ addiu $s3, $zero, 0x0004 ## $s3 = 00000004 -/* 005A8 809BD208 E7A4004C */ swc1 $f4, 0x004C($sp) -/* 005AC 809BD20C 2A010002 */ slti $at, $s0, 0x0002 -.L809BD210: -/* 005B0 809BD210 14200003 */ bne $at, $zero, .L809BD220 -/* 005B4 809BD214 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -/* 005B8 809BD218 10000001 */ beq $zero, $zero, .L809BD220 -/* 005BC 809BD21C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L809BD220: -/* 005C0 809BD220 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 005C4 809BD224 C6300024 */ lwc1 $f16, 0x0024($s1) ## 00000024 -/* 005C8 809BD228 320E0001 */ andi $t6, $s0, 0x0001 ## $t6 = 00000000 -/* 005CC 809BD22C 46803220 */ cvt.s.w $f8, $f6 -/* 005D0 809BD230 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -/* 005D4 809BD234 46144282 */ mul.s $f10, $f8, $f20 -/* 005D8 809BD238 46105480 */ add.s $f18, $f10, $f16 -/* 005DC 809BD23C 11C00003 */ beq $t6, $zero, .L809BD24C -/* 005E0 809BD240 E7B20048 */ swc1 $f18, 0x0048($sp) -/* 005E4 809BD244 10000001 */ beq $zero, $zero, .L809BD24C -/* 005E8 809BD248 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L809BD24C: -/* 005EC 809BD24C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 005F0 809BD250 C62A002C */ lwc1 $f10, 0x002C($s1) ## 0000002C -/* 005F4 809BD254 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 005F8 809BD258 468021A0 */ cvt.s.w $f6, $f4 -/* 005FC 809BD25C 241807D0 */ addiu $t8, $zero, 0x07D0 ## $t8 = 000007D0 -/* 00600 809BD260 AFB80014 */ sw $t8, 0x0014($sp) -/* 00604 809BD264 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00608 809BD268 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 0060C 809BD26C 02402825 */ or $a1, $s2, $zero ## $a1 = FFFFFFF0 -/* 00610 809BD270 46143202 */ mul.s $f8, $f6, $f20 -/* 00614 809BD274 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00618 809BD278 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0061C 809BD27C 460A4400 */ add.s $f16, $f8, $f10 -/* 00620 809BD280 0C00A527 */ jal EffectSsGSplash_Spawn -/* 00624 809BD284 E7B00050 */ swc1 $f16, 0x0050($sp) -/* 00628 809BD288 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 0062C 809BD28C 5613FFE0 */ bnel $s0, $s3, .L809BD210 -/* 00630 809BD290 2A010002 */ slti $at, $s0, 0x0002 -/* 00634 809BD294 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00638 809BD298 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0063C 809BD29C 240539ED */ addiu $a1, $zero, 0x39ED ## $a1 = 000039ED -/* 00640 809BD2A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00644 809BD2A4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00648 809BD2A8 24053879 */ addiu $a1, $zero, 0x3879 ## $a1 = 00003879 -/* 0064C 809BD2AC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00650 809BD2B0 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 -/* 00654 809BD2B4 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 00658 809BD2B8 0C00CFA2 */ jal func_80033E88 -/* 0065C 809BD2BC 24070008 */ addiu $a3, $zero, 0x0008 ## $a3 = 00000008 -/* 00660 809BD2C0 8FBF003C */ lw $ra, 0x003C($sp) -/* 00664 809BD2C4 D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 00668 809BD2C8 8FB00028 */ lw $s0, 0x0028($sp) -/* 0066C 809BD2CC 8FB1002C */ lw $s1, 0x002C($sp) -/* 00670 809BD2D0 8FB20030 */ lw $s2, 0x0030($sp) -/* 00674 809BD2D4 8FB30034 */ lw $s3, 0x0034($sp) -/* 00678 809BD2D8 8FB40038 */ lw $s4, 0x0038($sp) -/* 0067C 809BD2DC 03E00008 */ jr $ra -/* 00680 809BD2E0 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD2E4.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD2E4.s deleted file mode 100644 index 138290cec9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD2E4.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_809BD2E4 -/* 00684 809BD2E4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00688 809BD2E8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0068C 809BD2EC 8C820118 */ lw $v0, 0x0118($a0) ## 00000118 -/* 00690 809BD2F0 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00694 809BD2F4 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 -/* 00698 809BD2F8 10400003 */ beq $v0, $zero, .L809BD308 -/* 0069C 809BD2FC 24440032 */ addiu $a0, $v0, 0x0032 ## $a0 = 00000032 -/* 006A0 809BD300 0C01DE2B */ jal Math_ScaledStepToS - -/* 006A4 809BD304 84E5019A */ lh $a1, 0x019A($a3) ## 0000019A -.L809BD308: -/* 006A8 809BD308 8FBF0014 */ lw $ra, 0x0014($sp) -/* 006AC 809BD30C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 006B0 809BD310 03E00008 */ jr $ra -/* 006B4 809BD314 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD318.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD318.s deleted file mode 100644 index 4a00a20597..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD318.s +++ /dev/null @@ -1,28 +0,0 @@ -.late_rodata -glabel D_809BF534 - .word 0xC4802000 - -.text -glabel func_809BD318 -/* 006B8 809BD318 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 006BC 809BD31C AFBF0014 */ sw $ra, 0x0014($sp) -/* 006C0 809BD320 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 006C4 809BD324 3C050600 */ lui $a1, %hi(D_060014B8) ## $a1 = 06000000 -/* 006C8 809BD328 24A514B8 */ addiu $a1, $a1, %lo(D_060014B8) ## $a1 = 060014B8 -/* 006CC 809BD32C AFA60018 */ sw $a2, 0x0018($sp) -/* 006D0 809BD330 0C0294BE */ jal Animation_PlayLoop -/* 006D4 809BD334 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006D8 809BD338 8FA60018 */ lw $a2, 0x0018($sp) -/* 006DC 809BD33C 3C01809C */ lui $at, %hi(D_809BF534) ## $at = 809C0000 -/* 006E0 809BD340 3C0F809C */ lui $t7, %hi(func_809BD84C) ## $t7 = 809C0000 -/* 006E4 809BD344 A4C0019A */ sh $zero, 0x019A($a2) ## 0000019A -/* 006E8 809BD348 C424F534 */ lwc1 $f4, %lo(D_809BF534)($at) -/* 006EC 809BD34C 240E0079 */ addiu $t6, $zero, 0x0079 ## $t6 = 00000079 -/* 006F0 809BD350 25EFD84C */ addiu $t7, $t7, %lo(func_809BD84C) ## $t7 = 809BD84C -/* 006F4 809BD354 A4CE0196 */ sh $t6, 0x0196($a2) ## 00000196 -/* 006F8 809BD358 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 -/* 006FC 809BD35C E4C4000C */ swc1 $f4, 0x000C($a2) ## 0000000C -/* 00700 809BD360 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00704 809BD364 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00708 809BD368 03E00008 */ jr $ra -/* 0070C 809BD36C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD370.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD370.s deleted file mode 100644 index f3e27b7267..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD370.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_809BD370 -/* 00710 809BD370 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00714 809BD374 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00718 809BD378 240E0015 */ addiu $t6, $zero, 0x0015 ## $t6 = 00000015 -/* 0071C 809BD37C A48E0196 */ sh $t6, 0x0196($a0) ## 00000196 -/* 00720 809BD380 AFA40018 */ sw $a0, 0x0018($sp) -/* 00724 809BD384 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00728 809BD388 2405386C */ addiu $a1, $zero, 0x386C ## $a1 = 0000386C -/* 0072C 809BD38C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00730 809BD390 3C0F809C */ lui $t7, %hi(func_809BD8DC) ## $t7 = 809C0000 -/* 00734 809BD394 25EFD8DC */ addiu $t7, $t7, %lo(func_809BD8DC) ## $t7 = 809BD8DC -/* 00738 809BD398 AC8F0190 */ sw $t7, 0x0190($a0) ## 00000190 -/* 0073C 809BD39C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00740 809BD3A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00744 809BD3A4 03E00008 */ jr $ra -/* 00748 809BD3A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3AC.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3AC.s deleted file mode 100644 index 50cd5cb17c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3AC.s +++ /dev/null @@ -1,19 +0,0 @@ -.late_rodata -glabel D_809BF538 - .word 0x43838000 - -.text -glabel func_809BD3AC -/* 0074C 809BD3AC 3C01809C */ lui $at, %hi(D_809BF538) ## $at = 809C0000 -/* 00750 809BD3B0 C426F538 */ lwc1 $f6, %lo(D_809BF538)($at) -/* 00754 809BD3B4 C4840008 */ lwc1 $f4, 0x0008($a0) ## 00000008 -/* 00758 809BD3B8 C48A000C */ lwc1 $f10, 0x000C($a0) ## 0000000C -/* 0075C 809BD3BC 3C0F809C */ lui $t7, %hi(func_809BDAE8) ## $t7 = 809C0000 -/* 00760 809BD3C0 46062200 */ add.s $f8, $f4, $f6 -/* 00764 809BD3C4 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 00768 809BD3C8 25EFDAE8 */ addiu $t7, $t7, %lo(func_809BDAE8) ## $t7 = 809BDAE8 -/* 0076C 809BD3CC A48E0196 */ sh $t6, 0x0196($a0) ## 00000196 -/* 00770 809BD3D0 E4880024 */ swc1 $f8, 0x0024($a0) ## 00000024 -/* 00774 809BD3D4 AC8F0190 */ sw $t7, 0x0190($a0) ## 00000190 -/* 00778 809BD3D8 03E00008 */ jr $ra -/* 0077C 809BD3DC E48A0028 */ swc1 $f10, 0x0028($a0) ## 00000028 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3E0.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3E0.s deleted file mode 100644 index 1a867f2f5a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3E0.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_809BD3E0 -/* 00780 809BD3E0 3C0F809C */ lui $t7, %hi(func_809BDB90) ## $t7 = 809C0000 -/* 00784 809BD3E4 240E0028 */ addiu $t6, $zero, 0x0028 ## $t6 = 00000028 -/* 00788 809BD3E8 25EFDB90 */ addiu $t7, $t7, %lo(func_809BDB90) ## $t7 = 809BDB90 -/* 0078C 809BD3EC A48E0196 */ sh $t6, 0x0196($a0) ## 00000196 -/* 00790 809BD3F0 03E00008 */ jr $ra -/* 00794 809BD3F4 AC8F0190 */ sw $t7, 0x0190($a0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3F8.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3F8.s deleted file mode 100644 index baffb707a8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3F8.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_809BD3F8 -/* 00798 809BD3F8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0079C 809BD3FC AFBF0014 */ sw $ra, 0x0014($sp) -/* 007A0 809BD400 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 007A4 809BD404 3C050600 */ lui $a1, %hi(D_06001CA4) ## $a1 = 06000000 -/* 007A8 809BD408 24A51CA4 */ addiu $a1, $a1, %lo(D_06001CA4) ## $a1 = 06001CA4 -/* 007AC 809BD40C AFA70018 */ sw $a3, 0x0018($sp) -/* 007B0 809BD410 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 007B4 809BD414 0C0294D3 */ jal Animation_MorphToLoop -/* 007B8 809BD418 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 007BC 809BD41C 8FA40018 */ lw $a0, 0x0018($sp) -/* 007C0 809BD420 240E015E */ addiu $t6, $zero, 0x015E ## $t6 = 0000015E -/* 007C4 809BD424 240F0050 */ addiu $t7, $zero, 0x0050 ## $t7 = 00000050 -/* 007C8 809BD428 80980194 */ lb $t8, 0x0194($a0) ## 00000194 -/* 007CC 809BD42C A48E0196 */ sh $t6, 0x0196($a0) ## 00000196 -/* 007D0 809BD430 A48F0198 */ sh $t7, 0x0198($a0) ## 00000198 -/* 007D4 809BD434 00180823 */ subu $at, $zero, $t8 -/* 007D8 809BD438 0001CA40 */ sll $t9, $at, 9 -/* 007DC 809BD43C 0C26F38F */ jal func_809BCE3C -/* 007E0 809BD440 A499019A */ sh $t9, 0x019A($a0) ## 0000019A -/* 007E4 809BD444 8FA70018 */ lw $a3, 0x0018($sp) -/* 007E8 809BD448 3C0C809C */ lui $t4, %hi(func_809BDC08) ## $t4 = 809C0000 -/* 007EC 809BD44C 258CDC08 */ addiu $t4, $t4, %lo(func_809BDC08) ## $t4 = 809BDC08 -/* 007F0 809BD450 90E802FC */ lbu $t0, 0x02FC($a3) ## 000002FC -/* 007F4 809BD454 90EA029D */ lbu $t2, 0x029D($a3) ## 0000029D -/* 007F8 809BD458 ACEC0190 */ sw $t4, 0x0190($a3) ## 00000190 -/* 007FC 809BD45C 35090001 */ ori $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 00800 809BD460 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 00804 809BD464 A0E902FC */ sb $t1, 0x02FC($a3) ## 000002FC -/* 00808 809BD468 A0EB029D */ sb $t3, 0x029D($a3) ## 0000029D -/* 0080C 809BD46C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00810 809BD470 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00814 809BD474 03E00008 */ jr $ra -/* 00818 809BD478 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD47C.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD47C.s deleted file mode 100644 index 2f5c3438a3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD47C.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_809BD47C -/* 0081C 809BD47C 908F029D */ lbu $t7, 0x029D($a0) ## 0000029D -/* 00820 809BD480 3C19809C */ lui $t9, %hi(func_809BDF34) ## $t9 = 809C0000 -/* 00824 809BD484 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 00828 809BD488 2739DF34 */ addiu $t9, $t9, %lo(func_809BDF34) ## $t9 = 809BDF34 -/* 0082C 809BD48C 31F8FFFE */ andi $t8, $t7, 0xFFFE ## $t8 = 00000000 -/* 00830 809BD490 A48E0196 */ sh $t6, 0x0196($a0) ## 00000196 -/* 00834 809BD494 A098029D */ sb $t8, 0x029D($a0) ## 0000029D -/* 00838 809BD498 A0800114 */ sb $zero, 0x0114($a0) ## 00000114 -/* 0083C 809BD49C 03E00008 */ jr $ra -/* 00840 809BD4A0 AC990190 */ sw $t9, 0x0190($a0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD4A4.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD4A4.s deleted file mode 100644 index b9baa8e643..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD4A4.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_809BD4A4 -/* 00844 809BD4A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00848 809BD4A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0084C 809BD4AC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00850 809BD4B0 3C050600 */ lui $a1, %hi(D_060014B8) ## $a1 = 06000000 -/* 00854 809BD4B4 24A514B8 */ addiu $a1, $a1, %lo(D_060014B8) ## $a1 = 060014B8 -/* 00858 809BD4B8 AFA70018 */ sw $a3, 0x0018($sp) -/* 0085C 809BD4BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00860 809BD4C0 0C0294D3 */ jal Animation_MorphToLoop -/* 00864 809BD4C4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 00868 809BD4C8 8FA70018 */ lw $a3, 0x0018($sp) -/* 0086C 809BD4CC 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00870 809BD4D0 3C0D809C */ lui $t5, %hi(func_809BDFC8) ## $t5 = 809C0000 -/* 00874 809BD4D4 84EF00B6 */ lh $t7, 0x00B6($a3) ## 000000B6 -/* 00878 809BD4D8 80F90194 */ lb $t9, 0x0194($a3) ## 00000194 -/* 0087C 809BD4DC 90E9029D */ lbu $t1, 0x029D($a3) ## 0000029D -/* 00880 809BD4E0 90EB02FC */ lbu $t3, 0x02FC($a3) ## 000002FC -/* 00884 809BD4E4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00888 809BD4E8 25ADDFC8 */ addiu $t5, $t5, %lo(func_809BDFC8) ## $t5 = 809BDFC8 -/* 0088C 809BD4EC 01E1C021 */ addu $t8, $t7, $at -/* 00890 809BD4F0 00194240 */ sll $t0, $t9, 9 -/* 00894 809BD4F4 312AFFFE */ andi $t2, $t1, 0xFFFE ## $t2 = 00000000 -/* 00898 809BD4F8 356C0001 */ ori $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 0089C 809BD4FC A0EE0195 */ sb $t6, 0x0195($a3) ## 00000195 -/* 008A0 809BD500 A4F80030 */ sh $t8, 0x0030($a3) ## 00000030 -/* 008A4 809BD504 A4E8019A */ sh $t0, 0x019A($a3) ## 0000019A -/* 008A8 809BD508 A0EA029D */ sb $t2, 0x029D($a3) ## 0000029D -/* 008AC 809BD50C A0EC02FC */ sb $t4, 0x02FC($a3) ## 000002FC -/* 008B0 809BD510 ACED0190 */ sw $t5, 0x0190($a3) ## 00000190 -/* 008B4 809BD514 8FBF0014 */ lw $ra, 0x0014($sp) -/* 008B8 809BD518 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 008BC 809BD51C 03E00008 */ jr $ra -/* 008C0 809BD520 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD524.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD524.s deleted file mode 100644 index 7a49f77167..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD524.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_809BD524 -/* 008C4 809BD524 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 008C8 809BD528 AFB00020 */ sw $s0, 0x0020($sp) -/* 008CC 809BD52C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 008D0 809BD530 AFBF0024 */ sw $ra, 0x0024($sp) -/* 008D4 809BD534 3C050600 */ lui $a1, %hi(D_06000D1C) ## $a1 = 06000000 -/* 008D8 809BD538 24A50D1C */ addiu $a1, $a1, %lo(D_06000D1C) ## $a1 = 06000D1C -/* 008DC 809BD53C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 008E0 809BD540 0C029490 */ jal Animation_MorphToPlayOnce -/* 008E4 809BD544 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 008E8 809BD548 920F02FC */ lbu $t7, 0x02FC($s0) ## 000002FC -/* 008EC 809BD54C 240E0050 */ addiu $t6, $zero, 0x0050 ## $t6 = 00000050 -/* 008F0 809BD550 A60E0196 */ sh $t6, 0x0196($s0) ## 00000196 -/* 008F4 809BD554 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 008F8 809BD558 A600019A */ sh $zero, 0x019A($s0) ## 0000019A -/* 008FC 809BD55C A21802FC */ sb $t8, 0x02FC($s0) ## 000002FC -/* 00900 809BD560 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00904 809BD564 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00908 809BD568 24053904 */ addiu $a1, $zero, 0x3904 ## $a1 = 00003904 -/* 0090C 809BD56C 8E1902A8 */ lw $t9, 0x02A8($s0) ## 000002A8 -/* 00910 809BD570 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00914 809BD574 240C0014 */ addiu $t4, $zero, 0x0014 ## $t4 = 00000014 -/* 00918 809BD578 8F280024 */ lw $t0, 0x0024($t9) ## 00000024 -/* 0091C 809BD57C 240D0050 */ addiu $t5, $zero, 0x0050 ## $t5 = 00000050 -/* 00920 809BD580 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00924 809BD584 8D090000 */ lw $t1, 0x0000($t0) ## 00000000 -/* 00928 809BD588 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0092C 809BD58C 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 00930 809BD590 312A0001 */ andi $t2, $t1, 0x0001 ## $t2 = 00000000 -/* 00934 809BD594 51400005 */ beql $t2, $zero, .L809BD5AC -/* 00938 809BD598 A2000195 */ sb $zero, 0x0195($s0) ## 00000195 -/* 0093C 809BD59C A20B0195 */ sb $t3, 0x0195($s0) ## 00000195 -/* 00940 809BD5A0 10000003 */ beq $zero, $zero, .L809BD5B0 -/* 00944 809BD5A4 A60C0196 */ sh $t4, 0x0196($s0) ## 00000196 -/* 00948 809BD5A8 A2000195 */ sb $zero, 0x0195($s0) ## 00000195 -.L809BD5AC: -/* 0094C 809BD5AC A60D0196 */ sh $t5, 0x0196($s0) ## 00000196 -.L809BD5B0: -/* 00950 809BD5B0 860E0196 */ lh $t6, 0x0196($s0) ## 00000196 -/* 00954 809BD5B4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00958 809BD5B8 0C00D09B */ jal Actor_SetColorFilter -/* 0095C 809BD5BC AFAE0010 */ sw $t6, 0x0010($sp) -/* 00960 809BD5C0 3C0F809C */ lui $t7, %hi(func_809BE058) ## $t7 = 809C0000 -/* 00964 809BD5C4 25EFE058 */ addiu $t7, $t7, %lo(func_809BE058) ## $t7 = 809BE058 -/* 00968 809BD5C8 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 -/* 0096C 809BD5CC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00970 809BD5D0 8FB00020 */ lw $s0, 0x0020($sp) -/* 00974 809BD5D4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00978 809BD5D8 03E00008 */ jr $ra -/* 0097C 809BD5DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD5E0.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD5E0.s deleted file mode 100644 index 6a782be651..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD5E0.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_809BD5E0 -/* 00980 809BD5E0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00984 809BD5E4 AFB00020 */ sw $s0, 0x0020($sp) -/* 00988 809BD5E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0098C 809BD5EC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00990 809BD5F0 3C050600 */ lui $a1, %hi(D_06000444) ## $a1 = 06000000 -/* 00994 809BD5F4 24A50444 */ addiu $a1, $a1, %lo(D_06000444) ## $a1 = 06000444 -/* 00998 809BD5F8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0099C 809BD5FC 0C029490 */ jal Animation_MorphToPlayOnce -/* 009A0 809BD600 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 009A4 809BD604 920F02FC */ lbu $t7, 0x02FC($s0) ## 000002FC -/* 009A8 809BD608 240E0018 */ addiu $t6, $zero, 0x0018 ## $t6 = 00000018 -/* 009AC 809BD60C A60E0196 */ sh $t6, 0x0196($s0) ## 00000196 -/* 009B0 809BD610 31F8FFFE */ andi $t8, $t7, 0xFFFE ## $t8 = 00000000 -/* 009B4 809BD614 A600019A */ sh $zero, 0x019A($s0) ## 0000019A -/* 009B8 809BD618 A21802FC */ sb $t8, 0x02FC($s0) ## 000002FC -/* 009BC 809BD61C 24190018 */ addiu $t9, $zero, 0x0018 ## $t9 = 00000018 -/* 009C0 809BD620 AFB90010 */ sw $t9, 0x0010($sp) -/* 009C4 809BD624 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 009C8 809BD628 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 009CC 809BD62C 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 009D0 809BD630 0C00D09B */ jal Actor_SetColorFilter -/* 009D4 809BD634 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 009D8 809BD638 3C08809C */ lui $t0, %hi(func_809BE180) ## $t0 = 809C0000 -/* 009DC 809BD63C 2508E180 */ addiu $t0, $t0, %lo(func_809BE180) ## $t0 = 809BE180 -/* 009E0 809BD640 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 -/* 009E4 809BD644 8FBF0024 */ lw $ra, 0x0024($sp) -/* 009E8 809BD648 8FB00020 */ lw $s0, 0x0020($sp) -/* 009EC 809BD64C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 009F0 809BD650 03E00008 */ jr $ra -/* 009F4 809BD654 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD658.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD658.s deleted file mode 100644 index 473b5e75eb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD658.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_809BD658 -/* 009F8 809BD658 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 009FC 809BD65C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A00 809BD660 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00A04 809BD664 3C050600 */ lui $a1, %hi(D_06000A74) ## $a1 = 06000000 -/* 00A08 809BD668 24A50A74 */ addiu $a1, $a1, %lo(D_06000A74) ## $a1 = 06000A74 -/* 00A0C 809BD66C AFA70018 */ sw $a3, 0x0018($sp) -/* 00A10 809BD670 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00A14 809BD674 0C029490 */ jal Animation_MorphToPlayOnce -/* 00A18 809BD678 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 00A1C 809BD67C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00A20 809BD680 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00A24 809BD684 2405390A */ addiu $a1, $zero, 0x390A ## $a1 = 0000390A -/* 00A28 809BD688 8FA70018 */ lw $a3, 0x0018($sp) -/* 00A2C 809BD68C 3C18809C */ lui $t8, %hi(func_809BE26C) ## $t8 = 809C0000 -/* 00A30 809BD690 240E0026 */ addiu $t6, $zero, 0x0026 ## $t6 = 00000026 -/* 00A34 809BD694 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A -/* 00A38 809BD698 2718E26C */ addiu $t8, $t8, %lo(func_809BE26C) ## $t8 = 809BE26C -/* 00A3C 809BD69C A4EE0196 */ sh $t6, 0x0196($a3) ## 00000196 -/* 00A40 809BD6A0 A4EF0198 */ sh $t7, 0x0198($a3) ## 00000198 -/* 00A44 809BD6A4 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -/* 00A48 809BD6A8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00A4C 809BD6AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A50 809BD6B0 03E00008 */ jr $ra -/* 00A54 809BD6B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD6B8.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD6B8.s deleted file mode 100644 index 506c8aa8d5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD6B8.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_809BD6B8 -/* 00A58 809BD6B8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A5C 809BD6BC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A60 809BD6C0 908E0195 */ lbu $t6, 0x0195($a0) ## 00000195 -/* 00A64 809BD6C4 55C00010 */ bnel $t6, $zero, .L809BD708 -/* 00A68 809BD6C8 849900B6 */ lh $t9, 0x00B6($a0) ## 000000B6 -/* 00A6C 809BD6CC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00A70 809BD6D0 AFA40018 */ sw $a0, 0x0018($sp) -/* 00A74 809BD6D4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00A78 809BD6D8 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 00A7C 809BD6DC 8FA40018 */ lw $a0, 0x0018($sp) -/* 00A80 809BD6E0 240F0018 */ addiu $t7, $zero, 0x0018 ## $t7 = 00000018 -/* 00A84 809BD6E4 4604003C */ c.lt.s $f0, $f4 -/* 00A88 809BD6E8 2418001C */ addiu $t8, $zero, 0x001C ## $t8 = 0000001C -/* 00A8C 809BD6EC 45000003 */ bc1f .L809BD6FC -/* 00A90 809BD6F0 00000000 */ nop -/* 00A94 809BD6F4 10000011 */ beq $zero, $zero, .L809BD73C -/* 00A98 809BD6F8 A48F0196 */ sh $t7, 0x0196($a0) ## 00000196 -.L809BD6FC: -/* 00A9C 809BD6FC 1000000F */ beq $zero, $zero, .L809BD73C -/* 00AA0 809BD700 A4980196 */ sh $t8, 0x0196($a0) ## 00000196 -/* 00AA4 809BD704 849900B6 */ lh $t9, 0x00B6($a0) ## 000000B6 -.L809BD708: -/* 00AA8 809BD708 8488008A */ lh $t0, 0x008A($a0) ## 0000008A -/* 00AAC 809BD70C 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 -/* 00AB0 809BD710 03281023 */ subu $v0, $t9, $t0 -/* 00AB4 809BD714 04400003 */ bltz $v0, .L809BD724 -/* 00AB8 809BD718 00021823 */ subu $v1, $zero, $v0 -/* 00ABC 809BD71C 10000001 */ beq $zero, $zero, .L809BD724 -/* 00AC0 809BD720 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L809BD724: -/* 00AC4 809BD724 28614000 */ slti $at, $v1, 0x4000 -/* 00AC8 809BD728 54200004 */ bnel $at, $zero, .L809BD73C -/* 00ACC 809BD72C A4800196 */ sh $zero, 0x0196($a0) ## 00000196 -/* 00AD0 809BD730 10000002 */ beq $zero, $zero, .L809BD73C -/* 00AD4 809BD734 A4890196 */ sh $t1, 0x0196($a0) ## 00000196 -/* 00AD8 809BD738 A4800196 */ sh $zero, 0x0196($a0) ## 00000196 -.L809BD73C: -/* 00ADC 809BD73C 908A029D */ lbu $t2, 0x029D($a0) ## 0000029D -/* 00AE0 809BD740 3C0C809C */ lui $t4, %hi(func_809BE3E4) ## $t4 = 809C0000 -/* 00AE4 809BD744 258CE3E4 */ addiu $t4, $t4, %lo(func_809BE3E4) ## $t4 = 809BE3E4 -/* 00AE8 809BD748 314BFFFE */ andi $t3, $t2, 0xFFFE ## $t3 = 00000000 -/* 00AEC 809BD74C A480019A */ sh $zero, 0x019A($a0) ## 0000019A -/* 00AF0 809BD750 A08B029D */ sb $t3, 0x029D($a0) ## 0000029D -/* 00AF4 809BD754 AC8C0190 */ sw $t4, 0x0190($a0) ## 00000190 -/* 00AF8 809BD758 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00AFC 809BD75C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B00 809BD760 03E00008 */ jr $ra -/* 00B04 809BD764 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD768.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD768.s deleted file mode 100644 index f97f6b4224..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD768.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_809BD768 -/* 00B08 809BD768 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B0C 809BD76C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B10 809BD770 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00B14 809BD774 AFA40018 */ sw $a0, 0x0018($sp) -/* 00B18 809BD778 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00B1C 809BD77C 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 00B20 809BD780 8FA40018 */ lw $a0, 0x0018($sp) -/* 00B24 809BD784 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00B28 809BD788 4604003C */ c.lt.s $f0, $f4 -/* 00B2C 809BD78C 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF -/* 00B30 809BD790 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00B34 809BD794 24053908 */ addiu $a1, $zero, 0x3908 ## $a1 = 00003908 -/* 00B38 809BD798 45020004 */ bc1fl .L809BD7AC -/* 00B3C 809BD79C A08F0194 */ sb $t7, 0x0194($a0) ## 00000194 -/* 00B40 809BD7A0 10000002 */ beq $zero, $zero, .L809BD7AC -/* 00B44 809BD7A4 A08E0194 */ sb $t6, 0x0194($a0) ## 00000194 -/* 00B48 809BD7A8 A08F0194 */ sb $t7, 0x0194($a0) ## 00000194 -.L809BD7AC: -/* 00B4C 809BD7AC 8C980004 */ lw $t8, 0x0004($a0) ## 00000004 -/* 00B50 809BD7B0 908802FC */ lbu $t0, 0x02FC($a0) ## 000002FC -/* 00B54 809BD7B4 A480019A */ sh $zero, 0x019A($a0) ## 0000019A -/* 00B58 809BD7B8 0301C824 */ and $t9, $t8, $at -/* 00B5C 809BD7BC 01014824 */ and $t1, $t0, $at -/* 00B60 809BD7C0 AC990004 */ sw $t9, 0x0004($a0) ## 00000004 -/* 00B64 809BD7C4 A08902FC */ sb $t1, 0x02FC($a0) ## 000002FC -/* 00B68 809BD7C8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00B6C 809BD7CC AFA40018 */ sw $a0, 0x0018($sp) -/* 00B70 809BD7D0 8FA40018 */ lw $a0, 0x0018($sp) -/* 00B74 809BD7D4 3C0A809C */ lui $t2, %hi(func_809BE4A4) ## $t2 = 809C0000 -/* 00B78 809BD7D8 254AE4A4 */ addiu $t2, $t2, %lo(func_809BE4A4) ## $t2 = 809BE4A4 -/* 00B7C 809BD7DC AC8A0190 */ sw $t2, 0x0190($a0) ## 00000190 -/* 00B80 809BD7E0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B84 809BD7E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B88 809BD7E8 03E00008 */ jr $ra -/* 00B8C 809BD7EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD7F0.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD7F0.s deleted file mode 100644 index 4022cc9260..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD7F0.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_809BD7F0 -/* 00B90 809BD7F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B94 809BD7F4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B98 809BD7F8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00B9C 809BD7FC 8CA41C44 */ lw $a0, 0x1C44($a1) ## 00001C44 -/* 00BA0 809BD800 AFA60018 */ sw $a2, 0x0018($sp) -/* 00BA4 809BD804 0C00B6B0 */ jal Actor_WorldYawTowardPoint -/* 00BA8 809BD808 24C50008 */ addiu $a1, $a2, 0x0008 ## $a1 = 00000008 -/* 00BAC 809BD80C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00BB0 809BD810 808F0194 */ lb $t7, 0x0194($a0) ## 00000194 -/* 00BB4 809BD814 A4820032 */ sh $v0, 0x0032($a0) ## 00000032 -/* 00BB8 809BD818 848E0032 */ lh $t6, 0x0032($a0) ## 00000032 -/* 00BBC 809BD81C 000FC380 */ sll $t8, $t7, 14 -/* 00BC0 809BD820 01D8C821 */ addu $t9, $t6, $t8 -/* 00BC4 809BD824 0C26F38F */ jal func_809BCE3C -/* 00BC8 809BD828 A49900B6 */ sh $t9, 0x00B6($a0) ## 000000B6 -/* 00BCC 809BD82C 8FA60018 */ lw $a2, 0x0018($sp) -/* 00BD0 809BD830 3C08809C */ lui $t0, %hi(func_809BE518) ## $t0 = 809C0000 -/* 00BD4 809BD834 2508E518 */ addiu $t0, $t0, %lo(func_809BE518) ## $t0 = 809BE518 -/* 00BD8 809BD838 ACC80190 */ sw $t0, 0x0190($a2) ## 00000190 -/* 00BDC 809BD83C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00BE0 809BD840 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00BE4 809BD844 03E00008 */ jr $ra -/* 00BE8 809BD848 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD84C.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD84C.s deleted file mode 100644 index 2f065867d9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD84C.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_809BD84C -/* 00BEC 809BD84C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00BF0 809BD850 AFB00018 */ sw $s0, 0x0018($sp) -/* 00BF4 809BD854 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00BF8 809BD858 AFBF001C */ sw $ra, 0x001C($sp) -/* 00BFC 809BD85C AFA50024 */ sw $a1, 0x0024($sp) -/* 00C00 809BD860 0C02927F */ jal SkelAnime_Update - -/* 00C04 809BD864 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00C08 809BD868 860E0196 */ lh $t6, 0x0196($s0) ## 00000196 -/* 00C0C 809BD86C 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 00C10 809BD870 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C14 809BD874 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 00C18 809BD878 A60F0196 */ sh $t7, 0x0196($s0) ## 00000196 -/* 00C1C 809BD87C 86020196 */ lh $v0, 0x0196($s0) ## 00000196 -/* 00C20 809BD880 10410003 */ beq $v0, $at, .L809BD890 -/* 00C24 809BD884 2401FFEC */ addiu $at, $zero, 0xFFEC ## $at = FFFFFFEC -/* 00C28 809BD888 54410005 */ bnel $v0, $at, .L809BD8A0 -/* 00C2C 809BD88C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -.L809BD890: -/* 00C30 809BD890 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00C34 809BD894 24053906 */ addiu $a1, $zero, 0x3906 ## $a1 = 00003906 -/* 00C38 809BD898 86020196 */ lh $v0, 0x0196($s0) ## 00000196 -/* 00C3C 809BD89C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -.L809BD8A0: -/* 00C40 809BD8A0 54410004 */ bnel $v0, $at, .L809BD8B4 -/* 00C44 809BD8A4 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 00C48 809BD8A8 0C03D6B3 */ jal func_800F5ACC -/* 00C4C 809BD8AC 24040038 */ addiu $a0, $zero, 0x0038 ## $a0 = 00000038 -/* 00C50 809BD8B0 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -.L809BD8B4: -/* 00C54 809BD8B4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00C58 809BD8B8 57010004 */ bnel $t8, $at, .L809BD8CC -/* 00C5C 809BD8BC 8FBF001C */ lw $ra, 0x001C($sp) -/* 00C60 809BD8C0 0C26F4DC */ jal func_809BD370 -/* 00C64 809BD8C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C68 809BD8C8 8FBF001C */ lw $ra, 0x001C($sp) -.L809BD8CC: -/* 00C6C 809BD8CC 8FB00018 */ lw $s0, 0x0018($sp) -/* 00C70 809BD8D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00C74 809BD8D4 03E00008 */ jr $ra -/* 00C78 809BD8D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD8DC.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD8DC.s deleted file mode 100644 index 2e7fcf1581..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD8DC.s +++ /dev/null @@ -1,154 +0,0 @@ -.late_rodata -glabel D_809BF53C - .word 0x43838000 -glabel D_809BF540 - .word 0x3DE5C8FA -glabel D_809BF544 - .word 0x3E65C8FA -glabel D_809BF548 - .word 0x3EA0D97C - -.text -glabel func_809BD8DC -/* 00C7C 809BD8DC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00C80 809BD8E0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00C84 809BD8E4 AFB00020 */ sw $s0, 0x0020($sp) -/* 00C88 809BD8E8 AFA5003C */ sw $a1, 0x003C($sp) -/* 00C8C 809BD8EC 848E0196 */ lh $t6, 0x0196($a0) ## 00000196 -/* 00C90 809BD8F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C94 809BD8F4 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 00C98 809BD8F8 A48F0196 */ sh $t7, 0x0196($a0) ## 00000196 -/* 00C9C 809BD8FC 84820196 */ lh $v0, 0x0196($a0) ## 00000196 -/* 00CA0 809BD900 04400060 */ bltz $v0, .L809BDA84 -/* 00CA4 809BD904 2841FFFF */ slti $at, $v0, 0xFFFF -/* 00CA8 809BD908 3C01809C */ lui $at, %hi(D_809BF53C) ## $at = 809C0000 -/* 00CAC 809BD90C C426F53C */ lwc1 $f6, %lo(D_809BF53C)($at) -/* 00CB0 809BD910 C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 -/* 00CB4 809BD914 3C064148 */ lui $a2, 0x4148 ## $a2 = 41480000 -/* 00CB8 809BD918 34C66186 */ ori $a2, $a2, 0x6186 ## $a2 = 41486186 -/* 00CBC 809BD91C 46062200 */ add.s $f8, $f4, $f6 -/* 00CC0 809BD920 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 -/* 00CC4 809BD924 44054000 */ mfc1 $a1, $f8 -/* 00CC8 809BD928 0C01DE80 */ jal Math_StepToF - -/* 00CCC 809BD92C 00000000 */ nop -/* 00CD0 809BD930 86020196 */ lh $v0, 0x0196($s0) ## 00000196 -/* 00CD4 809BD934 2841000E */ slti $at, $v0, 0x000E -/* 00CD8 809BD938 1020000F */ beq $at, $zero, .L809BD978 -/* 00CDC 809BD93C 2458FFF9 */ addiu $t8, $v0, 0xFFF9 ## $t8 = FFFFFFF9 -/* 00CE0 809BD940 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 00CE4 809BD944 3C01809C */ lui $at, %hi(D_809BF540) ## $at = 809C0000 -/* 00CE8 809BD948 C432F540 */ lwc1 $f18, %lo(D_809BF540)($at) -/* 00CEC 809BD94C 46805420 */ cvt.s.w $f16, $f10 -/* 00CF0 809BD950 46128302 */ mul.s $f12, $f16, $f18 -/* 00CF4 809BD954 0C0400A4 */ jal sinf - -/* 00CF8 809BD958 00000000 */ nop -/* 00CFC 809BD95C 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00D00 809BD960 44812000 */ mtc1 $at, $f4 ## $f4 = 200.00 -/* 00D04 809BD964 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C -/* 00D08 809BD968 46040182 */ mul.s $f6, $f0, $f4 -/* 00D0C 809BD96C 46083280 */ add.s $f10, $f6, $f8 -/* 00D10 809BD970 10000011 */ beq $zero, $zero, .L809BD9B8 -/* 00D14 809BD974 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -.L809BD978: -/* 00D18 809BD978 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 00D1C 809BD97C 3C01809C */ lui $at, %hi(D_809BF544) ## $at = 809C0000 -/* 00D20 809BD980 C424F544 */ lwc1 $f4, %lo(D_809BF544)($at) -/* 00D24 809BD984 468084A0 */ cvt.s.w $f18, $f16 -/* 00D28 809BD988 46049302 */ mul.s $f12, $f18, $f4 -/* 00D2C 809BD98C 0C0400A4 */ jal sinf - -/* 00D30 809BD990 00000000 */ nop -/* 00D34 809BD994 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 00D38 809BD998 44814000 */ mtc1 $at, $f8 ## $f8 = 70.00 -/* 00D3C 809BD99C 3C014302 */ lui $at, 0x4302 ## $at = 43020000 -/* 00D40 809BD9A0 44818000 */ mtc1 $at, $f16 ## $f16 = 130.00 -/* 00D44 809BD9A4 C606000C */ lwc1 $f6, 0x000C($s0) ## 0000000C -/* 00D48 809BD9A8 46100482 */ mul.s $f18, $f0, $f16 -/* 00D4C 809BD9AC 46083280 */ add.s $f10, $f6, $f8 -/* 00D50 809BD9B0 460A9100 */ add.s $f4, $f18, $f10 -/* 00D54 809BD9B4 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 -.L809BD9B8: -/* 00D58 809BD9B8 86190196 */ lh $t9, 0x0196($s0) ## 00000196 -/* 00D5C 809BD9BC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00D60 809BD9C0 57200045 */ bnel $t9, $zero, .L809BDAD8 -/* 00D64 809BD9C4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00D68 809BD9C8 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 00D6C 809BD9CC 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 -/* 00D70 809BD9D0 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 00D74 809BD9D4 44812000 */ mtc1 $at, $f4 ## $f4 = 70.00 -/* 00D78 809BD9D8 46083400 */ add.s $f16, $f6, $f8 -/* 00D7C 809BD9DC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00D80 809BD9E0 240907D0 */ addiu $t1, $zero, 0x07D0 ## $t1 = 000007D0 -/* 00D84 809BD9E4 8FA4003C */ lw $a0, 0x003C($sp) -/* 00D88 809BD9E8 E7B0002C */ swc1 $f16, 0x002C($sp) -/* 00D8C 809BD9EC C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 00D90 809BD9F0 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4 -/* 00D94 809BD9F4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00D98 809BD9F8 E7B20030 */ swc1 $f18, 0x0030($sp) -/* 00D9C 809BD9FC C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 00DA0 809BDA00 AFA90014 */ sw $t1, 0x0014($sp) -/* 00DA4 809BDA04 AFA80010 */ sw $t0, 0x0010($sp) -/* 00DA8 809BDA08 46045181 */ sub.s $f6, $f10, $f4 -/* 00DAC 809BDA0C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00DB0 809BDA10 0C00A527 */ jal EffectSsGSplash_Spawn -/* 00DB4 809BDA14 E7A60034 */ swc1 $f6, 0x0034($sp) -/* 00DB8 809BDA18 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00DBC 809BDA1C 44818000 */ mtc1 $at, $f16 ## $f16 = 40.00 -/* 00DC0 809BDA20 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 00DC4 809BDA24 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00DC8 809BDA28 240B07D0 */ addiu $t3, $zero, 0x07D0 ## $t3 = 000007D0 -/* 00DCC 809BDA2C 46104481 */ sub.s $f18, $f8, $f16 -/* 00DD0 809BDA30 AFAB0014 */ sw $t3, 0x0014($sp) -/* 00DD4 809BDA34 AFAA0010 */ sw $t2, 0x0010($sp) -/* 00DD8 809BDA38 8FA4003C */ lw $a0, 0x003C($sp) -/* 00DDC 809BDA3C E7B2002C */ swc1 $f18, 0x002C($sp) -/* 00DE0 809BDA40 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4 -/* 00DE4 809BDA44 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00DE8 809BDA48 0C00A527 */ jal EffectSsGSplash_Spawn -/* 00DEC 809BDA4C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00DF0 809BDA50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DF4 809BDA54 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00DF8 809BDA58 240539ED */ addiu $a1, $zero, 0x39ED ## $a1 = 000039ED -/* 00DFC 809BDA5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E00 809BDA60 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00E04 809BDA64 24053879 */ addiu $a1, $zero, 0x3879 ## $a1 = 00003879 -/* 00E08 809BDA68 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 00E0C 809BDA6C 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 00E10 809BDA70 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 00E14 809BDA74 0C02A800 */ jal func_800AA000 -/* 00E18 809BDA78 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 00E1C 809BDA7C 10000016 */ beq $zero, $zero, .L809BDAD8 -/* 00E20 809BDA80 8FBF0024 */ lw $ra, 0x0024($sp) -.L809BDA84: -/* 00E24 809BDA84 10200013 */ beq $at, $zero, .L809BDAD4 -/* 00E28 809BDA88 244C0001 */ addiu $t4, $v0, 0x0001 ## $t4 = 00000001 -/* 00E2C 809BDA8C 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 -/* 00E30 809BDA90 3C01809C */ lui $at, %hi(D_809BF548) ## $at = 809C0000 -/* 00E34 809BDA94 C426F548 */ lwc1 $f6, %lo(D_809BF548)($at) -/* 00E38 809BDA98 46805120 */ cvt.s.w $f4, $f10 -/* 00E3C 809BDA9C 46062302 */ mul.s $f12, $f4, $f6 -/* 00E40 809BDAA0 0C0400A4 */ jal sinf - -/* 00E44 809BDAA4 00000000 */ nop -/* 00E48 809BDAA8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00E4C 809BDAAC 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 -/* 00E50 809BDAB0 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C -/* 00E54 809BDAB4 860D0196 */ lh $t5, 0x0196($s0) ## 00000196 -/* 00E58 809BDAB8 46100482 */ mul.s $f18, $f0, $f16 -/* 00E5C 809BDABC 2401FFF6 */ addiu $at, $zero, 0xFFF6 ## $at = FFFFFFF6 -/* 00E60 809BDAC0 46124281 */ sub.s $f10, $f8, $f18 -/* 00E64 809BDAC4 15A10003 */ bne $t5, $at, .L809BDAD4 -/* 00E68 809BDAC8 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 00E6C 809BDACC 0C26F4EB */ jal func_809BD3AC -/* 00E70 809BDAD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L809BDAD4: -/* 00E74 809BDAD4 8FBF0024 */ lw $ra, 0x0024($sp) -.L809BDAD8: -/* 00E78 809BDAD8 8FB00020 */ lw $s0, 0x0020($sp) -/* 00E7C 809BDADC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00E80 809BDAE0 03E00008 */ jr $ra -/* 00E84 809BDAE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDAE8.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDAE8.s deleted file mode 100644 index b9d367f237..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDAE8.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_809BDAE8 -/* 00E88 809BDAE8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00E8C 809BDAEC AFB00018 */ sw $s0, 0x0018($sp) -/* 00E90 809BDAF0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E94 809BDAF4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00E98 809BDAF8 AFA50024 */ sw $a1, 0x0024($sp) -/* 00E9C 809BDAFC 86050016 */ lh $a1, 0x0016($s0) ## 00000016 -/* 00EA0 809BDB00 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 -/* 00EA4 809BDB04 24060400 */ addiu $a2, $zero, 0x0400 ## $a2 = 00000400 -/* 00EA8 809BDB08 24A54000 */ addiu $a1, $a1, 0x4000 ## $a1 = 00004000 -/* 00EAC 809BDB0C 00052C00 */ sll $a1, $a1, 16 -/* 00EB0 809BDB10 0C01DE2B */ jal Math_ScaledStepToS - -/* 00EB4 809BDB14 00052C03 */ sra $a1, $a1, 16 -/* 00EB8 809BDB18 50400019 */ beql $v0, $zero, .L809BDB80 -/* 00EBC 809BDB1C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00EC0 809BDB20 86020196 */ lh $v0, 0x0196($s0) ## 00000196 -/* 00EC4 809BDB24 10400003 */ beq $v0, $zero, .L809BDB34 -/* 00EC8 809BDB28 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00ECC 809BDB2C A60E0196 */ sh $t6, 0x0196($s0) ## 00000196 -/* 00ED0 809BDB30 86020196 */ lh $v0, 0x0196($s0) ## 00000196 -.L809BDB34: -/* 00ED4 809BDB34 54400012 */ bnel $v0, $zero, .L809BDB80 -/* 00ED8 809BDB38 8FBF001C */ lw $ra, 0x001C($sp) -/* 00EDC 809BDB3C 0C26F38F */ jal func_809BCE3C -/* 00EE0 809BDB40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00EE4 809BDB44 8FA40024 */ lw $a0, 0x0024($sp) -/* 00EE8 809BDB48 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 00EEC 809BDB4C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00EF0 809BDB50 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 00EF4 809BDB54 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 -/* 00EF8 809BDB58 0C00CDD2 */ jal Actor_ChangeCategory - -/* 00EFC 809BDB5C E604000C */ swc1 $f4, 0x000C($s0) ## 0000000C -/* 00F00 809BDB60 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00F04 809BDB64 A60F001C */ sh $t7, 0x001C($s0) ## 0000001C -/* 00F08 809BDB68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F0C 809BDB6C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00F10 809BDB70 24053906 */ addiu $a1, $zero, 0x3906 ## $a1 = 00003906 -/* 00F14 809BDB74 0C26F4F8 */ jal func_809BD3E0 -/* 00F18 809BDB78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F1C 809BDB7C 8FBF001C */ lw $ra, 0x001C($sp) -.L809BDB80: -/* 00F20 809BDB80 8FB00018 */ lw $s0, 0x0018($sp) -/* 00F24 809BDB84 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00F28 809BDB88 03E00008 */ jr $ra -/* 00F2C 809BDB8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDB90.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDB90.s deleted file mode 100644 index 2457ad2e4a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDB90.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_809BDB90 -/* 00F30 809BDB90 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00F34 809BDB94 AFA5001C */ sw $a1, 0x001C($sp) -/* 00F38 809BDB98 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00F3C 809BDB9C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00F40 809BDBA0 AFA40018 */ sw $a0, 0x0018($sp) -/* 00F44 809BDBA4 AFA50018 */ sw $a1, 0x0018($sp) -/* 00F48 809BDBA8 0C02927F */ jal SkelAnime_Update - -/* 00F4C 809BDBAC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00F50 809BDBB0 8FA50018 */ lw $a1, 0x0018($sp) -/* 00F54 809BDBB4 84A20196 */ lh $v0, 0x0196($a1) ## 00000196 -/* 00F58 809BDBB8 10400003 */ beq $v0, $zero, .L809BDBC8 -/* 00F5C 809BDBBC 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00F60 809BDBC0 A4AE0196 */ sh $t6, 0x0196($a1) ## 00000196 -/* 00F64 809BDBC4 84A20196 */ lh $v0, 0x0196($a1) ## 00000196 -.L809BDBC8: -/* 00F68 809BDBC8 5440000C */ bnel $v0, $zero, .L809BDBFC -/* 00F6C 809BDBCC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00F70 809BDBD0 84AF001C */ lh $t7, 0x001C($a1) ## 0000001C -/* 00F74 809BDBD4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00F78 809BDBD8 24040038 */ addiu $a0, $zero, 0x0038 ## $a0 = 00000038 -/* 00F7C 809BDBDC 15E10004 */ bne $t7, $at, .L809BDBF0 -/* 00F80 809BDBE0 00000000 */ nop -/* 00F84 809BDBE4 0C03D6B3 */ jal func_800F5ACC -/* 00F88 809BDBE8 AFA50018 */ sw $a1, 0x0018($sp) -/* 00F8C 809BDBEC 8FA50018 */ lw $a1, 0x0018($sp) -.L809BDBF0: -/* 00F90 809BDBF0 0C26F4FE */ jal func_809BD3F8 -/* 00F94 809BDBF4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00F98 809BDBF8 8FBF0014 */ lw $ra, 0x0014($sp) -.L809BDBFC: -/* 00F9C 809BDBFC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00FA0 809BDC00 03E00008 */ jr $ra -/* 00FA4 809BDC04 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDC08.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDC08.s deleted file mode 100644 index d5bc177663..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDC08.s +++ /dev/null @@ -1,237 +0,0 @@ -.late_rodata -glabel D_809BF54C - .word 0x3F088889 -glabel D_809BF550 - .word 0x43838000 -glabel D_809BF554 - .float 1.1 - -glabel D_809BF558 - .float 0.6 - -.text -glabel func_809BDC08 -/* 00FA8 809BDC08 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00FAC 809BDC0C AFB00018 */ sw $s0, 0x0018($sp) -/* 00FB0 809BDC10 AFBF001C */ sw $ra, 0x001C($sp) -/* 00FB4 809BDC14 AFA50044 */ sw $a1, 0x0044($sp) -/* 00FB8 809BDC18 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 00FBC 809BDC1C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00FC0 809BDC20 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00FC4 809BDC24 AFA40024 */ sw $a0, 0x0024($sp) -/* 00FC8 809BDC28 0C02927F */ jal SkelAnime_Update - -/* 00FCC 809BDC2C AFAF003C */ sw $t7, 0x003C($sp) -/* 00FD0 809BDC30 8FA40024 */ lw $a0, 0x0024($sp) -/* 00FD4 809BDC34 0C0295B2 */ jal Animation_OnFrame -/* 00FD8 809BDC38 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00FDC 809BDC3C 10400003 */ beq $v0, $zero, .L809BDC4C -/* 00FE0 809BDC40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FE4 809BDC44 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00FE8 809BDC48 240538C5 */ addiu $a1, $zero, 0x38C5 ## $a1 = 000038C5 -.L809BDC4C: -/* 00FEC 809BDC4C 86180196 */ lh $t8, 0x0196($s0) ## 00000196 -/* 00FF0 809BDC50 8FA4003C */ lw $a0, 0x003C($sp) -/* 00FF4 809BDC54 07010015 */ bgez $t8, .L809BDCAC -/* 00FF8 809BDC58 00000000 */ nop -/* 00FFC 809BDC5C 82080194 */ lb $t0, 0x0194($s0) ## 00000194 -/* 01000 809BDC60 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -/* 01004 809BDC64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01008 809BDC68 00084A40 */ sll $t1, $t0, 9 -/* 0100C 809BDC6C 03295021 */ addu $t2, $t9, $t1 -/* 01010 809BDC70 0C26F38F */ jal func_809BCE3C -/* 01014 809BDC74 A60A00B6 */ sh $t2, 0x00B6($s0) ## 000000B6 -/* 01018 809BDC78 860B0196 */ lh $t3, 0x0196($s0) ## 00000196 -/* 0101C 809BDC7C 240E015E */ addiu $t6, $zero, 0x015E ## $t6 = 0000015E -/* 01020 809BDC80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01024 809BDC84 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 01028 809BDC88 A60C0196 */ sh $t4, 0x0196($s0) ## 00000196 -/* 0102C 809BDC8C 860D0196 */ lh $t5, 0x0196($s0) ## 00000196 -/* 01030 809BDC90 15A00002 */ bne $t5, $zero, .L809BDC9C -/* 01034 809BDC94 00000000 */ nop -/* 01038 809BDC98 A60E0196 */ sh $t6, 0x0196($s0) ## 00000196 -.L809BDC9C: -/* 0103C 809BDC9C 0C26F3DA */ jal func_809BCF68 -/* 01040 809BDCA0 8FA50044 */ lw $a1, 0x0044($sp) -/* 01044 809BDCA4 1000009F */ beq $zero, $zero, .L809BDF24 -/* 01048 809BDCA8 8FBF001C */ lw $ra, 0x001C($sp) -.L809BDCAC: -/* 0104C 809BDCAC 0C00B6EC */ jal Actor_WorldDistXZToPoint -/* 01050 809BDCB0 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 -/* 01054 809BDCB4 3C014334 */ lui $at, 0x4334 ## $at = 43340000 -/* 01058 809BDCB8 44812000 */ mtc1 $at, $f4 ## $f4 = 180.00 -/* 0105C 809BDCBC 3C01809C */ lui $at, %hi(D_809BF54C) ## $at = 809C0000 -/* 01060 809BDCC0 C428F54C */ lwc1 $f8, %lo(D_809BF54C)($at) -/* 01064 809BDCC4 46040181 */ sub.s $f6, $f0, $f4 -/* 01068 809BDCC8 8FA6003C */ lw $a2, 0x003C($sp) -/* 0106C 809BDCCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01070 809BDCD0 27A50028 */ addiu $a1, $sp, 0x0028 ## $a1 = FFFFFFE8 -/* 01074 809BDCD4 46083282 */ mul.s $f10, $f6, $f8 -/* 01078 809BDCD8 24C60024 */ addiu $a2, $a2, 0x0024 ## $a2 = 00000024 -/* 0107C 809BDCDC 4600540D */ trunc.w.s $f16, $f10 -/* 01080 809BDCE0 44038000 */ mfc1 $v1, $f16 -/* 01084 809BDCE4 00000000 */ nop -/* 01088 809BDCE8 00031C00 */ sll $v1, $v1, 16 -/* 0108C 809BDCEC 00031C03 */ sra $v1, $v1, 16 -/* 01090 809BDCF0 0C00B6F4 */ jal func_8002DBD0 -/* 01094 809BDCF4 A7A30036 */ sh $v1, 0x0036($sp) -/* 01098 809BDCF8 C7A00028 */ lwc1 $f0, 0x0028($sp) -/* 0109C 809BDCFC 3C01809C */ lui $at, %hi(D_809BF550) ## $at = 809C0000 -/* 010A0 809BDD00 C432F550 */ lwc1 $f18, %lo(D_809BF550)($at) -/* 010A4 809BDD04 46000005 */ abs.s $f0, $f0 -/* 010A8 809BDD08 87A30036 */ lh $v1, 0x0036($sp) -/* 010AC 809BDD0C 4600903C */ c.lt.s $f18, $f0 -/* 010B0 809BDD10 C7A60030 */ lwc1 $f6, 0x0030($sp) -/* 010B4 809BDD14 45030014 */ bc1tl .L809BDD68 -/* 010B8 809BDD18 86020196 */ lh $v0, 0x0196($s0) ## 00000196 -/* 010BC 809BDD1C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 010C0 809BDD20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010C4 809BDD24 24051B00 */ addiu $a1, $zero, 0x1B00 ## $a1 = 00001B00 -/* 010C8 809BDD28 4606203C */ c.lt.s $f4, $f6 -/* 010CC 809BDD2C 00000000 */ nop -/* 010D0 809BDD30 45020014 */ bc1fl .L809BDD84 -/* 010D4 809BDD34 3C01437A */ lui $at, 0x437A ## $at = 437A0000 -/* 010D8 809BDD38 0C00B821 */ jal Actor_IsFacingPlayer -/* 010DC 809BDD3C A7A30036 */ sh $v1, 0x0036($sp) -/* 010E0 809BDD40 1440000F */ bne $v0, $zero, .L809BDD80 -/* 010E4 809BDD44 87A30036 */ lh $v1, 0x0036($sp) -/* 010E8 809BDD48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010EC 809BDD4C 24052000 */ addiu $a1, $zero, 0x2000 ## $a1 = 00002000 -/* 010F0 809BDD50 8FA60044 */ lw $a2, 0x0044($sp) -/* 010F4 809BDD54 0C00B7F2 */ jal Player_IsFacingActor -/* 010F8 809BDD58 A7A30036 */ sh $v1, 0x0036($sp) -/* 010FC 809BDD5C 14400008 */ bne $v0, $zero, .L809BDD80 -/* 01100 809BDD60 87A30036 */ lh $v1, 0x0036($sp) -/* 01104 809BDD64 86020196 */ lh $v0, 0x0196($s0) ## 00000196 -.L809BDD68: -/* 01108 809BDD68 2463FF80 */ addiu $v1, $v1, 0xFF80 ## $v1 = FFFFFF80 -/* 0110C 809BDD6C 00031C00 */ sll $v1, $v1, 16 -/* 01110 809BDD70 10400003 */ beq $v0, $zero, .L809BDD80 -/* 01114 809BDD74 00031C03 */ sra $v1, $v1, 16 -/* 01118 809BDD78 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 0111C 809BDD7C A6180196 */ sh $t8, 0x0196($s0) ## 00000196 -.L809BDD80: -/* 01120 809BDD80 3C01437A */ lui $at, 0x437A ## $at = 437A0000 -.L809BDD84: -/* 01124 809BDD84 44815000 */ mtc1 $at, $f10 ## $f10 = 250.00 -/* 01128 809BDD88 C6080090 */ lwc1 $f8, 0x0090($s0) ## 00000090 -/* 0112C 809BDD8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01130 809BDD90 24056000 */ addiu $a1, $zero, 0x6000 ## $a1 = 00006000 -/* 01134 809BDD94 460A403C */ c.lt.s $f8, $f10 -/* 01138 809BDD98 00000000 */ nop -/* 0113C 809BDD9C 45020015 */ bc1fl .L809BDDF4 -/* 01140 809BDDA0 24190050 */ addiu $t9, $zero, 0x0050 ## $t9 = 00000050 -/* 01144 809BDDA4 0C00B821 */ jal Actor_IsFacingPlayer -/* 01148 809BDDA8 A7A30036 */ sh $v1, 0x0036($sp) -/* 0114C 809BDDAC 14400010 */ bne $v0, $zero, .L809BDDF0 -/* 01150 809BDDB0 87A30036 */ lh $v1, 0x0036($sp) -/* 01154 809BDDB4 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 01158 809BDDB8 3C014334 */ lui $at, 0x4334 ## $at = 43340000 -/* 0115C 809BDDBC 44819000 */ mtc1 $at, $f18 ## $f18 = 180.00 -/* 01160 809BDDC0 10400002 */ beq $v0, $zero, .L809BDDCC -/* 01164 809BDDC4 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF -/* 01168 809BDDC8 A6080198 */ sh $t0, 0x0198($s0) ## 00000198 -.L809BDDCC: -/* 0116C 809BDDCC C6100090 */ lwc1 $f16, 0x0090($s0) ## 00000090 -/* 01170 809BDDD0 4612803C */ c.lt.s $f16, $f18 -/* 01174 809BDDD4 00000000 */ nop -/* 01178 809BDDD8 45020008 */ bc1fl .L809BDDFC -/* 0117C 809BDDDC 920900AF */ lbu $t1, 0x00AF($s0) ## 000000AF -/* 01180 809BDDE0 24630020 */ addiu $v1, $v1, 0x0020 ## $v1 = 00000020 -/* 01184 809BDDE4 00031C00 */ sll $v1, $v1, 16 -/* 01188 809BDDE8 10000003 */ beq $zero, $zero, .L809BDDF8 -/* 0118C 809BDDEC 00031C03 */ sra $v1, $v1, 16 -.L809BDDF0: -/* 01190 809BDDF0 24190050 */ addiu $t9, $zero, 0x0050 ## $t9 = 00000050 -.L809BDDF4: -/* 01194 809BDDF4 A6190198 */ sh $t9, 0x0198($s0) ## 00000198 -.L809BDDF8: -/* 01198 809BDDF8 920900AF */ lbu $t1, 0x00AF($s0) ## 000000AF -.L809BDDFC: -/* 0119C 809BDDFC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 011A0 809BDE00 246A0130 */ addiu $t2, $v1, 0x0130 ## $t2 = 00000150 -/* 011A4 809BDE04 5521000D */ bnel $t1, $at, .L809BDE3C -/* 011A8 809BDE08 24630130 */ addiu $v1, $v1, 0x0130 ## $v1 = 00000150 -/* 011AC 809BDE0C 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 011B0 809BDE10 3C01809C */ lui $at, %hi(D_809BF554) ## $at = 809C0000 -/* 011B4 809BDE14 C428F554 */ lwc1 $f8, %lo(D_809BF554)($at) -/* 011B8 809BDE18 468021A0 */ cvt.s.w $f6, $f4 -/* 011BC 809BDE1C 46083282 */ mul.s $f10, $f6, $f8 -/* 011C0 809BDE20 4600540D */ trunc.w.s $f16, $f10 -/* 011C4 809BDE24 44038000 */ mfc1 $v1, $f16 -/* 011C8 809BDE28 00000000 */ nop -/* 011CC 809BDE2C 00031C00 */ sll $v1, $v1, 16 -/* 011D0 809BDE30 10000004 */ beq $zero, $zero, .L809BDE44 -/* 011D4 809BDE34 00031C03 */ sra $v1, $v1, 16 -/* 011D8 809BDE38 24630130 */ addiu $v1, $v1, 0x0130 ## $v1 = 00000280 -.L809BDE3C: -/* 011DC 809BDE3C 00031C00 */ sll $v1, $v1, 16 -/* 011E0 809BDE40 00031C03 */ sra $v1, $v1, 16 -.L809BDE44: -/* 011E4 809BDE44 820D0194 */ lb $t5, 0x0194($s0) ## 00000194 -/* 011E8 809BDE48 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 -/* 011EC 809BDE4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011F0 809BDE50 006D0019 */ multu $v1, $t5 -/* 011F4 809BDE54 00007012 */ mflo $t6 -/* 011F8 809BDE58 018E7821 */ addu $t7, $t4, $t6 -/* 011FC 809BDE5C 0C26F38F */ jal func_809BCE3C -/* 01200 809BDE60 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B6 -/* 01204 809BDE64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01208 809BDE68 0C26F3DA */ jal func_809BCF68 -/* 0120C 809BDE6C 8FA50044 */ lw $a1, 0x0044($sp) -/* 01210 809BDE70 86180198 */ lh $t8, 0x0198($s0) ## 00000198 -/* 01214 809BDE74 57000006 */ bnel $t8, $zero, .L809BDE90 -/* 01218 809BDE78 86080196 */ lh $t0, 0x0196($s0) ## 00000196 -/* 0121C 809BDE7C 0C26F5DA */ jal func_809BD768 -/* 01220 809BDE80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01224 809BDE84 10000027 */ beq $zero, $zero, .L809BDF24 -/* 01228 809BDE88 8FBF001C */ lw $ra, 0x001C($sp) -/* 0122C 809BDE8C 86080196 */ lh $t0, 0x0196($s0) ## 00000196 -.L809BDE90: -/* 01230 809BDE90 55000006 */ bnel $t0, $zero, .L809BDEAC -/* 01234 809BDE94 92190195 */ lbu $t9, 0x0195($s0) ## 00000195 -/* 01238 809BDE98 0C26F529 */ jal func_809BD4A4 -/* 0123C 809BDE9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01240 809BDEA0 10000020 */ beq $zero, $zero, .L809BDF24 -/* 01244 809BDEA4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01248 809BDEA8 92190195 */ lbu $t9, 0x0195($s0) ## 00000195 -.L809BDEAC: -/* 0124C 809BDEAC 5320001D */ beql $t9, $zero, .L809BDF24 -/* 01250 809BDEB0 8FBF001C */ lw $ra, 0x001C($sp) -/* 01254 809BDEB4 8609008A */ lh $t1, 0x008A($s0) ## 0000008A -/* 01258 809BDEB8 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 -/* 0125C 809BDEBC 012A1023 */ subu $v0, $t1, $t2 -/* 01260 809BDEC0 00021400 */ sll $v0, $v0, 16 -/* 01264 809BDEC4 00021403 */ sra $v0, $v0, 16 -/* 01268 809BDEC8 04430005 */ bgezl $v0, .L809BDEE0 -/* 0126C 809BDECC 28414100 */ slti $at, $v0, 0x4100 -/* 01270 809BDED0 00021023 */ subu $v0, $zero, $v0 -/* 01274 809BDED4 00021400 */ sll $v0, $v0, 16 -/* 01278 809BDED8 00021403 */ sra $v0, $v0, 16 -/* 0127C 809BDEDC 28414100 */ slti $at, $v0, 0x4100 -.L809BDEE0: -/* 01280 809BDEE0 1020000F */ beq $at, $zero, .L809BDF20 -/* 01284 809BDEE4 28413F01 */ slti $at, $v0, 0x3F01 -/* 01288 809BDEE8 5420000E */ bnel $at, $zero, .L809BDF24 -/* 0128C 809BDEEC 8FBF001C */ lw $ra, 0x001C($sp) -/* 01290 809BDEF0 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 01294 809BDEF4 00000000 */ nop -/* 01298 809BDEF8 3C01809C */ lui $at, %hi(D_809BF558) ## $at = 809C0000 -/* 0129C 809BDEFC C432F558 */ lwc1 $f18, %lo(D_809BF558)($at) -/* 012A0 809BDF00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012A4 809BDF04 4612003C */ c.lt.s $f0, $f18 -/* 012A8 809BDF08 00000000 */ nop -/* 012AC 809BDF0C 45020004 */ bc1fl .L809BDF20 -/* 012B0 809BDF10 A2000195 */ sb $zero, 0x0195($s0) ## 00000195 -/* 012B4 809BDF14 0C26F529 */ jal func_809BD4A4 -/* 012B8 809BDF18 A6000196 */ sh $zero, 0x0196($s0) ## 00000196 -/* 012BC 809BDF1C A2000195 */ sb $zero, 0x0195($s0) ## 00000195 -.L809BDF20: -/* 012C0 809BDF20 8FBF001C */ lw $ra, 0x001C($sp) -.L809BDF24: -/* 012C4 809BDF24 8FB00018 */ lw $s0, 0x0018($sp) -/* 012C8 809BDF28 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 012CC 809BDF2C 03E00008 */ jr $ra -/* 012D0 809BDF30 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDF34.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDF34.s deleted file mode 100644 index 7bd81886af..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDF34.s +++ /dev/null @@ -1,47 +0,0 @@ -.late_rodata -glabel D_809BF55C - .word 0x3E490FDB - -.text -glabel func_809BDF34 -/* 012D4 809BDF34 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 012D8 809BDF38 AFB00018 */ sw $s0, 0x0018($sp) -/* 012DC 809BDF3C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 012E0 809BDF40 AFBF001C */ sw $ra, 0x001C($sp) -/* 012E4 809BDF44 AFA50024 */ sw $a1, 0x0024($sp) -/* 012E8 809BDF48 0C02927F */ jal SkelAnime_Update - -/* 012EC 809BDF4C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 012F0 809BDF50 86020196 */ lh $v0, 0x0196($s0) ## 00000196 -/* 012F4 809BDF54 10400003 */ beq $v0, $zero, .L809BDF64 -/* 012F8 809BDF58 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 012FC 809BDF5C A60E0196 */ sh $t6, 0x0196($s0) ## 00000196 -/* 01300 809BDF60 86020196 */ lh $v0, 0x0196($s0) ## 00000196 -.L809BDF64: -/* 01304 809BDF64 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01308 809BDF68 3C01809C */ lui $at, %hi(D_809BF55C) ## $at = 809C0000 -/* 0130C 809BDF6C C428F55C */ lwc1 $f8, %lo(D_809BF55C)($at) -/* 01310 809BDF70 468021A0 */ cvt.s.w $f6, $f4 -/* 01314 809BDF74 46083302 */ mul.s $f12, $f6, $f8 -/* 01318 809BDF78 0C0400A4 */ jal sinf - -/* 0131C 809BDF7C 00000000 */ nop -/* 01320 809BDF80 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 01324 809BDF84 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 -/* 01328 809BDF88 C612000C */ lwc1 $f18, 0x000C($s0) ## 0000000C -/* 0132C 809BDF8C 860F0196 */ lh $t7, 0x0196($s0) ## 00000196 -/* 01330 809BDF90 460A0402 */ mul.s $f16, $f0, $f10 -/* 01334 809BDF94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01338 809BDF98 46128100 */ add.s $f4, $f16, $f18 -/* 0133C 809BDF9C 15E00005 */ bne $t7, $zero, .L809BDFB4 -/* 01340 809BDFA0 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 -/* 01344 809BDFA4 0C26F472 */ jal func_809BD1C8 -/* 01348 809BDFA8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0134C 809BDFAC 0C26F4FE */ jal func_809BD3F8 -/* 01350 809BDFB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L809BDFB4: -/* 01354 809BDFB4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01358 809BDFB8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0135C 809BDFBC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01360 809BDFC0 03E00008 */ jr $ra -/* 01364 809BDFC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDFC8.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDFC8.s deleted file mode 100644 index f60acd3102..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDFC8.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_809BDFC8 -/* 01368 809BDFC8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0136C 809BDFCC AFB00018 */ sw $s0, 0x0018($sp) -/* 01370 809BDFD0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01374 809BDFD4 AFBF001C */ sw $ra, 0x001C($sp) -/* 01378 809BDFD8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0137C 809BDFDC 0C02927F */ jal SkelAnime_Update - -/* 01380 809BDFE0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01384 809BDFE4 86030196 */ lh $v1, 0x0196($s0) ## 00000196 -/* 01388 809BDFE8 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 0138C 809BDFEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01390 809BDFF0 10600003 */ beq $v1, $zero, .L809BE000 -/* 01394 809BDFF4 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 01398 809BDFF8 A60E0196 */ sh $t6, 0x0196($s0) ## 00000196 -/* 0139C 809BDFFC 86030196 */ lh $v1, 0x0196($s0) ## 00000196 -.L809BE000: -/* 013A0 809BE000 14610004 */ bne $v1, $at, .L809BE014 -/* 013A4 809BE004 00000000 */ nop -/* 013A8 809BE008 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 013AC 809BE00C 24053906 */ addiu $a1, $zero, 0x3906 ## $a1 = 00003906 -/* 013B0 809BE010 86030196 */ lh $v1, 0x0196($s0) ## 00000196 -.L809BE014: -/* 013B4 809BE014 1460000B */ bne $v1, $zero, .L809BE044 -/* 013B8 809BE018 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 013BC 809BE01C 86050030 */ lh $a1, 0x0030($s0) ## 00000030 -/* 013C0 809BE020 0C01DE2B */ jal Math_ScaledStepToS - -/* 013C4 809BE024 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 -/* 013C8 809BE028 50400007 */ beql $v0, $zero, .L809BE048 -/* 013CC 809BE02C 8FBF001C */ lw $ra, 0x001C($sp) -/* 013D0 809BE030 820F0194 */ lb $t7, 0x0194($s0) ## 00000194 -/* 013D4 809BE034 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013D8 809BE038 000FC023 */ subu $t8, $zero, $t7 -/* 013DC 809BE03C 0C26F4FE */ jal func_809BD3F8 -/* 013E0 809BE040 A2180194 */ sb $t8, 0x0194($s0) ## 00000194 -.L809BE044: -/* 013E4 809BE044 8FBF001C */ lw $ra, 0x001C($sp) -.L809BE048: -/* 013E8 809BE048 8FB00018 */ lw $s0, 0x0018($sp) -/* 013EC 809BE04C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 013F0 809BE050 03E00008 */ jr $ra -/* 013F4 809BE054 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE058.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE058.s deleted file mode 100644 index 630e113221..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE058.s +++ /dev/null @@ -1,84 +0,0 @@ -glabel func_809BE058 -/* 013F8 809BE058 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 013FC 809BE05C AFBF001C */ sw $ra, 0x001C($sp) -/* 01400 809BE060 AFB00018 */ sw $s0, 0x0018($sp) -/* 01404 809BE064 84820196 */ lh $v0, 0x0196($a0) ## 00000196 -/* 01408 809BE068 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0140C 809BE06C 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 01410 809BE070 10400002 */ beq $v0, $zero, .L809BE07C -/* 01414 809BE074 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01418 809BE078 A48E0196 */ sh $t6, 0x0196($a0) ## 00000196 -.L809BE07C: -/* 0141C 809BE07C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01420 809BE080 0C02927F */ jal SkelAnime_Update - -/* 01424 809BE084 AFA30024 */ sw $v1, 0x0024($sp) -/* 01428 809BE088 9202029E */ lbu $v0, 0x029E($s0) ## 0000029E -/* 0142C 809BE08C 8FA30024 */ lw $v1, 0x0024($sp) -/* 01430 809BE090 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01434 809BE094 30420002 */ andi $v0, $v0, 0x0002 ## $v0 = 00000000 -/* 01438 809BE098 5440000A */ bnel $v0, $zero, .L809BE0C4 -/* 0143C 809BE09C 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 01440 809BE0A0 920F02FE */ lbu $t7, 0x02FE($s0) ## 000002FE -/* 01444 809BE0A4 31F80002 */ andi $t8, $t7, 0x0002 ## $t8 = 00000000 -/* 01448 809BE0A8 57000006 */ bnel $t8, $zero, .L809BE0C4 -/* 0144C 809BE0AC 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 01450 809BE0B0 9219034A */ lbu $t9, 0x034A($s0) ## 0000034A -/* 01454 809BE0B4 33280002 */ andi $t0, $t9, 0x0002 ## $t0 = 00000000 -/* 01458 809BE0B8 51000028 */ beql $t0, $zero, .L809BE15C -/* 0145C 809BE0BC 860D0196 */ lh $t5, 0x0196($s0) ## 00000196 -/* 01460 809BE0C0 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -.L809BE0C4: -/* 01464 809BE0C4 C4600068 */ lwc1 $f0, 0x0068($v1) ## 00000068 -/* 01468 809BE0C8 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 0146C 809BE0CC 460C003C */ c.lt.s $f0, $f12 -/* 01470 809BE0D0 00000000 */ nop -/* 01474 809BE0D4 45020004 */ bc1fl .L809BE0E8 -/* 01478 809BE0D8 46000086 */ mov.s $f2, $f0 -/* 0147C 809BE0DC 10000002 */ beq $zero, $zero, .L809BE0E8 -/* 01480 809BE0E0 46006086 */ mov.s $f2, $f12 -/* 01484 809BE0E4 46000086 */ mov.s $f2, $f0 -.L809BE0E8: -/* 01488 809BE0E8 5440000A */ bnel $v0, $zero, .L809BE114 -/* 0148C 809BE0EC 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 01490 809BE0F0 920902FE */ lbu $t1, 0x02FE($s0) ## 000002FE -/* 01494 809BE0F4 920B034A */ lbu $t3, 0x034A($s0) ## 0000034A -/* 01498 809BE0F8 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 0149C 809BE0FC 312AFFFD */ andi $t2, $t1, 0xFFFD ## $t2 = 00000000 -/* 014A0 809BE100 316CFFFD */ andi $t4, $t3, 0xFFFD ## $t4 = 00000000 -/* 014A4 809BE104 46041082 */ mul.s $f2, $f2, $f4 -/* 014A8 809BE108 A20A02FE */ sb $t2, 0x02FE($s0) ## 000002FE -/* 014AC 809BE10C A20C034A */ sb $t4, 0x034A($s0) ## 0000034A -/* 014B0 809BE110 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -.L809BE114: -/* 014B4 809BE114 E7A20020 */ swc1 $f2, 0x0020($sp) -/* 014B8 809BE118 0C01DE1C */ jal Math_SinS - ## sins? -/* 014BC 809BE11C AFA30024 */ sw $v1, 0x0024($sp) -/* 014C0 809BE120 C7A20020 */ lwc1 $f2, 0x0020($sp) -/* 014C4 809BE124 8FA30024 */ lw $v1, 0x0024($sp) -/* 014C8 809BE128 46001202 */ mul.s $f8, $f2, $f0 -/* 014CC 809BE12C C4660024 */ lwc1 $f6, 0x0024($v1) ## 00000024 -/* 014D0 809BE130 46083281 */ sub.s $f10, $f6, $f8 -/* 014D4 809BE134 E46A0024 */ swc1 $f10, 0x0024($v1) ## 00000024 -/* 014D8 809BE138 0C01DE0D */ jal Math_CosS - ## coss? -/* 014DC 809BE13C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 014E0 809BE140 C7A20020 */ lwc1 $f2, 0x0020($sp) -/* 014E4 809BE144 8FA30024 */ lw $v1, 0x0024($sp) -/* 014E8 809BE148 46001482 */ mul.s $f18, $f2, $f0 -/* 014EC 809BE14C C470002C */ lwc1 $f16, 0x002C($v1) ## 0000002C -/* 014F0 809BE150 46128101 */ sub.s $f4, $f16, $f18 -/* 014F4 809BE154 E464002C */ swc1 $f4, 0x002C($v1) ## 0000002C -/* 014F8 809BE158 860D0196 */ lh $t5, 0x0196($s0) ## 00000196 -.L809BE15C: -/* 014FC 809BE15C 55A00004 */ bnel $t5, $zero, .L809BE170 -/* 01500 809BE160 8FBF001C */ lw $ra, 0x001C($sp) -/* 01504 809BE164 0C26F5AE */ jal func_809BD6B8 -/* 01508 809BE168 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0150C 809BE16C 8FBF001C */ lw $ra, 0x001C($sp) -.L809BE170: -/* 01510 809BE170 8FB00018 */ lw $s0, 0x0018($sp) -/* 01514 809BE174 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01518 809BE178 03E00008 */ jr $ra -/* 0151C 809BE17C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE180.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE180.s deleted file mode 100644 index fa76ff7975..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE180.s +++ /dev/null @@ -1,72 +0,0 @@ -.late_rodata -glabel D_809BF560 - .word 0x3E490FDB - -.text -glabel func_809BE180 -/* 01520 809BE180 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01524 809BE184 AFB00018 */ sw $s0, 0x0018($sp) -/* 01528 809BE188 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0152C 809BE18C AFBF001C */ sw $ra, 0x001C($sp) -/* 01530 809BE190 AFA50024 */ sw $a1, 0x0024($sp) -/* 01534 809BE194 0C02927F */ jal SkelAnime_Update - -/* 01538 809BE198 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0153C 809BE19C 86020196 */ lh $v0, 0x0196($s0) ## 00000196 -/* 01540 809BE1A0 10400003 */ beq $v0, $zero, .L809BE1B0 -/* 01544 809BE1A4 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01548 809BE1A8 A60E0196 */ sh $t6, 0x0196($s0) ## 00000196 -/* 0154C 809BE1AC 86020196 */ lh $v0, 0x0196($s0) ## 00000196 -.L809BE1B0: -/* 01550 809BE1B0 1440000C */ bne $v0, $zero, .L809BE1E4 -/* 01554 809BE1B4 28410008 */ slti $at, $v0, 0x0008 -/* 01558 809BE1B8 920F00AF */ lbu $t7, 0x00AF($s0) ## 000000AF -/* 0155C 809BE1BC 11E00005 */ beq $t7, $zero, .L809BE1D4 -/* 01560 809BE1C0 00000000 */ nop -/* 01564 809BE1C4 0C26F529 */ jal func_809BD4A4 -/* 01568 809BE1C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0156C 809BE1CC 10000023 */ beq $zero, $zero, .L809BE25C -/* 01570 809BE1D0 8FBF001C */ lw $ra, 0x001C($sp) -.L809BE1D4: -/* 01574 809BE1D4 0C26F596 */ jal func_809BD658 -/* 01578 809BE1D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0157C 809BE1DC 1000001F */ beq $zero, $zero, .L809BE25C -/* 01580 809BE1E0 8FBF001C */ lw $ra, 0x001C($sp) -.L809BE1E4: -/* 01584 809BE1E4 1420001C */ bne $at, $zero, .L809BE258 -/* 01588 809BE1E8 244AFFF8 */ addiu $t2, $v0, 0xFFF8 ## $t2 = FFFFFFF8 -/* 0158C 809BE1EC 82190194 */ lb $t9, 0x0194($s0) ## 00000194 -/* 01590 809BE1F0 448A2000 */ mtc1 $t2, $f4 ## $f4 = NaN -/* 01594 809BE1F4 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 -/* 01598 809BE1F8 00194240 */ sll $t0, $t9, 9 -/* 0159C 809BE1FC 468021A0 */ cvt.s.w $f6, $f4 -/* 015A0 809BE200 03084821 */ addu $t1, $t8, $t0 -/* 015A4 809BE204 A60900B6 */ sh $t1, 0x00B6($s0) ## 000000B6 -/* 015A8 809BE208 3C01809C */ lui $at, %hi(D_809BF560) ## $at = 809C0000 -/* 015AC 809BE20C C428F560 */ lwc1 $f8, %lo(D_809BF560)($at) -/* 015B0 809BE210 46083302 */ mul.s $f12, $f6, $f8 -/* 015B4 809BE214 0C0400A4 */ jal sinf - -/* 015B8 809BE218 00000000 */ nop -/* 015BC 809BE21C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 015C0 809BE220 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 -/* 015C4 809BE224 C612000C */ lwc1 $f18, 0x000C($s0) ## 0000000C -/* 015C8 809BE228 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015CC 809BE22C 460A0402 */ mul.s $f16, $f0, $f10 -/* 015D0 809BE230 46128100 */ add.s $f4, $f16, $f18 -/* 015D4 809BE234 0C26F38F */ jal func_809BCE3C -/* 015D8 809BE238 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 -/* 015DC 809BE23C 860B0196 */ lh $t3, 0x0196($s0) ## 00000196 -/* 015E0 809BE240 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 015E4 809BE244 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015E8 809BE248 55610004 */ bnel $t3, $at, .L809BE25C -/* 015EC 809BE24C 8FBF001C */ lw $ra, 0x001C($sp) -/* 015F0 809BE250 0C26F472 */ jal func_809BD1C8 -/* 015F4 809BE254 8FA50024 */ lw $a1, 0x0024($sp) -.L809BE258: -/* 015F8 809BE258 8FBF001C */ lw $ra, 0x001C($sp) -.L809BE25C: -/* 015FC 809BE25C 8FB00018 */ lw $s0, 0x0018($sp) -/* 01600 809BE260 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01604 809BE264 03E00008 */ jr $ra -/* 01608 809BE268 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE26C.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE26C.s deleted file mode 100644 index 87d9f56392..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE26C.s +++ /dev/null @@ -1,108 +0,0 @@ -glabel func_809BE26C -/* 0160C 809BE26C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01610 809BE270 AFBF002C */ sw $ra, 0x002C($sp) -/* 01614 809BE274 AFB00028 */ sw $s0, 0x0028($sp) -/* 01618 809BE278 AFA50044 */ sw $a1, 0x0044($sp) -/* 0161C 809BE27C 84820196 */ lh $v0, 0x0196($a0) ## 00000196 -/* 01620 809BE280 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01624 809BE284 1040000C */ beq $v0, $zero, .L809BE2B8 -/* 01628 809BE288 00000000 */ nop -/* 0162C 809BE28C 10400003 */ beq $v0, $zero, .L809BE29C -/* 01630 809BE290 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01634 809BE294 A48E0196 */ sh $t6, 0x0196($a0) ## 00000196 -/* 01638 809BE298 84820196 */ lh $v0, 0x0196($a0) ## 00000196 -.L809BE29C: -/* 0163C 809BE29C 2841000A */ slti $at, $v0, 0x000A -/* 01640 809BE2A0 5420004C */ bnel $at, $zero, .L809BE3D4 -/* 01644 809BE2A4 8FBF002C */ lw $ra, 0x002C($sp) -/* 01648 809BE2A8 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 0164C 809BE2AC 25F82000 */ addiu $t8, $t7, 0x2000 ## $t8 = 00002000 -/* 01650 809BE2B0 10000047 */ beq $zero, $zero, .L809BE3D0 -/* 01654 809BE2B4 A61800B6 */ sh $t8, 0x00B6($s0) ## 000000B6 -.L809BE2B8: -/* 01658 809BE2B8 0C02927F */ jal SkelAnime_Update - -/* 0165C 809BE2BC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01660 809BE2C0 10400043 */ beq $v0, $zero, .L809BE3D0 -/* 01664 809BE2C4 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 01668 809BE2C8 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 0166C 809BE2CC 3C06809C */ lui $a2, %hi(D_809BF3A8) ## $a2 = 809C0000 -/* 01670 809BE2D0 24C6F3A8 */ addiu $a2, $a2, %lo(D_809BF3A8) ## $a2 = 809BF3A8 -/* 01674 809BE2D4 10400003 */ beq $v0, $zero, .L809BE2E4 -/* 01678 809BE2D8 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF -/* 0167C 809BE2DC A6190198 */ sh $t9, 0x0198($s0) ## 00000198 -/* 01680 809BE2E0 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -.L809BE2E4: -/* 01684 809BE2E4 1441001B */ bne $v0, $at, .L809BE354 -/* 01688 809BE2E8 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFF4 -/* 0168C 809BE2EC C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 01690 809BE2F0 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 01694 809BE2F4 44814000 */ mtc1 $at, $f8 ## $f8 = 150.00 -/* 01698 809BE2F8 E7A40034 */ swc1 $f4, 0x0034($sp) -/* 0169C 809BE2FC C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 016A0 809BE300 3C08809C */ lui $t0, %hi(D_809BF3A0) ## $t0 = 809C0000 -/* 016A4 809BE304 3C09809C */ lui $t1, %hi(D_809BF3A4) ## $t1 = 809C0000 -/* 016A8 809BE308 46083280 */ add.s $f10, $f6, $f8 -/* 016AC 809BE30C 2529F3A4 */ addiu $t1, $t1, %lo(D_809BF3A4) ## $t1 = 809BF3A4 -/* 016B0 809BE310 2508F3A0 */ addiu $t0, $t0, %lo(D_809BF3A0) ## $t0 = 809BF3A0 -/* 016B4 809BE314 240A04B0 */ addiu $t2, $zero, 0x04B0 ## $t2 = 000004B0 -/* 016B8 809BE318 E7AA0038 */ swc1 $f10, 0x0038($sp) -/* 016BC 809BE31C C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 016C0 809BE320 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 016C4 809BE324 AFAB001C */ sw $t3, 0x001C($sp) -/* 016C8 809BE328 AFAA0018 */ sw $t2, 0x0018($sp) -/* 016CC 809BE32C AFA90014 */ sw $t1, 0x0014($sp) -/* 016D0 809BE330 AFA80010 */ sw $t0, 0x0010($sp) -/* 016D4 809BE334 8FA40044 */ lw $a0, 0x0044($sp) -/* 016D8 809BE338 00C03825 */ or $a3, $a2, $zero ## $a3 = 809BF3A8 -/* 016DC 809BE33C 0C00A0A7 */ jal func_8002829C -/* 016E0 809BE340 E7B0003C */ swc1 $f16, 0x003C($sp) -/* 016E4 809BE344 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016E8 809BE348 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 016EC 809BE34C 240538C7 */ addiu $a1, $zero, 0x38C7 ## $a1 = 000038C7 -/* 016F0 809BE350 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -.L809BE354: -/* 016F4 809BE354 1440001E */ bne $v0, $zero, .L809BE3D0 -/* 016F8 809BE358 26040054 */ addiu $a0, $s0, 0x0054 ## $a0 = 00000054 -/* 016FC 809BE35C 3C063A83 */ lui $a2, 0x3A83 ## $a2 = 3A830000 -/* 01700 809BE360 34C6126F */ ori $a2, $a2, 0x126F ## $a2 = 3A83126F -/* 01704 809BE364 0C01DE80 */ jal Math_StepToF - -/* 01708 809BE368 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0170C 809BE36C 10400018 */ beq $v0, $zero, .L809BE3D0 -/* 01710 809BE370 8FA40044 */ lw $a0, 0x0044($sp) -/* 01714 809BE374 0C00B33C */ jal Flags_SetClear - -/* 01718 809BE378 82050003 */ lb $a1, 0x0003($s0) ## 00000003 -/* 0171C 809BE37C 8FAC0044 */ lw $t4, 0x0044($sp) -/* 01720 809BE380 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 01724 809BE384 0C0169DF */ jal Camera_ChangeSetting -/* 01728 809BE388 8D840790 */ lw $a0, 0x0790($t4) ## 00000790 -/* 0172C 809BE38C 8FAD0044 */ lw $t5, 0x0044($sp) -/* 01730 809BE390 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 01734 809BE394 0C016B3F */ jal func_8005ACFC -/* 01738 809BE398 8DA40790 */ lw $a0, 0x0790($t5) ## 00000790 -/* 0173C 809BE39C 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 01740 809BE3A0 AFA50030 */ sw $a1, 0x0030($sp) -/* 01744 809BE3A4 8FA40044 */ lw $a0, 0x0044($sp) -/* 01748 809BE3A8 24060032 */ addiu $a2, $zero, 0x0032 ## $a2 = 00000032 -/* 0174C 809BE3AC 0C01AEB6 */ jal Audio_PlaySoundAtPosition - -/* 01750 809BE3B0 240738C5 */ addiu $a3, $zero, 0x38C5 ## $a3 = 000038C5 -/* 01754 809BE3B4 8FA40044 */ lw $a0, 0x0044($sp) -/* 01758 809BE3B8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0175C 809BE3BC 8FA60030 */ lw $a2, 0x0030($sp) -/* 01760 809BE3C0 0C007E50 */ jal Item_DropCollectibleRandom - -/* 01764 809BE3C4 240700B0 */ addiu $a3, $zero, 0x00B0 ## $a3 = 000000B0 -/* 01768 809BE3C8 0C00B55C */ jal Actor_Kill - -/* 0176C 809BE3CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L809BE3D0: -/* 01770 809BE3D0 8FBF002C */ lw $ra, 0x002C($sp) -.L809BE3D4: -/* 01774 809BE3D4 8FB00028 */ lw $s0, 0x0028($sp) -/* 01778 809BE3D8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 0177C 809BE3DC 03E00008 */ jr $ra -/* 01780 809BE3E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE3E4.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE3E4.s deleted file mode 100644 index 6e06bfb61e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE3E4.s +++ /dev/null @@ -1,54 +0,0 @@ -glabel func_809BE3E4 -/* 01784 809BE3E4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01788 809BE3E8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0178C 809BE3EC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01790 809BE3F0 AFA5001C */ sw $a1, 0x001C($sp) -/* 01794 809BE3F4 AFA60018 */ sw $a2, 0x0018($sp) -/* 01798 809BE3F8 0C02927F */ jal SkelAnime_Update - -/* 0179C 809BE3FC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 017A0 809BE400 8FA60018 */ lw $a2, 0x0018($sp) -/* 017A4 809BE404 84C20196 */ lh $v0, 0x0196($a2) ## 00000196 -/* 017A8 809BE408 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 017AC 809BE40C 10400008 */ beq $v0, $zero, .L809BE430 -/* 017B0 809BE410 00000000 */ nop -/* 017B4 809BE414 10400002 */ beq $v0, $zero, .L809BE420 -/* 017B8 809BE418 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 017BC 809BE41C A4CE0196 */ sh $t6, 0x0196($a2) ## 00000196 -.L809BE420: -/* 017C0 809BE420 84CF00B6 */ lh $t7, 0x00B6($a2) ## 000000B6 -/* 017C4 809BE424 84C20196 */ lh $v0, 0x0196($a2) ## 00000196 -/* 017C8 809BE428 25F82000 */ addiu $t8, $t7, 0x2000 ## $t8 = 00002000 -/* 017CC 809BE42C A4D800B6 */ sh $t8, 0x00B6($a2) ## 000000B6 -.L809BE430: -/* 017D0 809BE430 54400016 */ bnel $v0, $zero, .L809BE48C -/* 017D4 809BE434 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 017D8 809BE438 84D900B6 */ lh $t9, 0x00B6($a2) ## 000000B6 -/* 017DC 809BE43C 84C80032 */ lh $t0, 0x0032($a2) ## 00000032 -/* 017E0 809BE440 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 017E4 809BE444 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF -/* 017E8 809BE448 03284823 */ subu $t1, $t9, $t0 -/* 017EC 809BE44C 00095400 */ sll $t2, $t1, 16 -/* 017F0 809BE450 000A5C03 */ sra $t3, $t2, 16 -/* 017F4 809BE454 59600004 */ blezl $t3, .L809BE468 -/* 017F8 809BE458 A0CD0194 */ sb $t5, 0x0194($a2) ## 00000194 -/* 017FC 809BE45C 10000002 */ beq $zero, $zero, .L809BE468 -/* 01800 809BE460 A0CC0194 */ sb $t4, 0x0194($a2) ## 00000194 -/* 01804 809BE464 A0CD0194 */ sb $t5, 0x0194($a2) ## 00000194 -.L809BE468: -/* 01808 809BE468 0C26F4FE */ jal func_809BD3F8 -/* 0180C 809BE46C AFA60018 */ sw $a2, 0x0018($sp) -/* 01810 809BE470 8FA60018 */ lw $a2, 0x0018($sp) -/* 01814 809BE474 240FFFD8 */ addiu $t7, $zero, 0xFFD8 ## $t7 = FFFFFFD8 -/* 01818 809BE478 90CE0195 */ lbu $t6, 0x0195($a2) ## 00000195 -/* 0181C 809BE47C 55C00003 */ bnel $t6, $zero, .L809BE48C -/* 01820 809BE480 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 01824 809BE484 A4CF0196 */ sh $t7, 0x0196($a2) ## 00000196 -/* 01828 809BE488 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -.L809BE48C: -/* 0182C 809BE48C 0C26F3DA */ jal func_809BCF68 -/* 01830 809BE490 8FA5001C */ lw $a1, 0x001C($sp) -/* 01834 809BE494 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01838 809BE498 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0183C 809BE49C 03E00008 */ jr $ra -/* 01840 809BE4A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE4A4.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE4A4.s deleted file mode 100644 index 5fd18d74d1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE4A4.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_809BE4A4 -/* 01844 809BE4A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01848 809BE4A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0184C 809BE4AC AFA5001C */ sw $a1, 0x001C($sp) -/* 01850 809BE4B0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01854 809BE4B4 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 01858 809BE4B8 C4840028 */ lwc1 $f4, 0x0028($a0) ## 00000028 -/* 0185C 809BE4BC 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 -/* 01860 809BE4C0 44819000 */ mtc1 $at, $f18 ## $f18 = -200.00 -/* 01864 809BE4C4 46062201 */ sub.s $f8, $f4, $f6 -/* 01868 809BE4C8 C490000C */ lwc1 $f16, 0x000C($a0) ## 0000000C -/* 0186C 809BE4CC 848E00B6 */ lh $t6, 0x00B6($a0) ## 000000B6 -/* 01870 809BE4D0 46128100 */ add.s $f4, $f16, $f18 -/* 01874 809BE4D4 E4880028 */ swc1 $f8, 0x0028($a0) ## 00000028 -/* 01878 809BE4D8 C48A0028 */ lwc1 $f10, 0x0028($a0) ## 00000028 -/* 0187C 809BE4DC 25CF2000 */ addiu $t7, $t6, 0x2000 ## $t7 = 00002000 -/* 01880 809BE4E0 A48F00B6 */ sh $t7, 0x00B6($a0) ## 000000B6 -/* 01884 809BE4E4 4604503C */ c.lt.s $f10, $f4 -/* 01888 809BE4E8 8FA5001C */ lw $a1, 0x001C($sp) -/* 0188C 809BE4EC 45000004 */ bc1f .L809BE500 -/* 01890 809BE4F0 00000000 */ nop -/* 01894 809BE4F4 0C26F5FC */ jal func_809BD7F0 -/* 01898 809BE4F8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0189C 809BE4FC 8FA40018 */ lw $a0, 0x0018($sp) -.L809BE500: -/* 018A0 809BE500 0C26F3DA */ jal func_809BCF68 -/* 018A4 809BE504 8FA5001C */ lw $a1, 0x001C($sp) -/* 018A8 809BE508 8FBF0014 */ lw $ra, 0x0014($sp) -/* 018AC 809BE50C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018B0 809BE510 03E00008 */ jr $ra -/* 018B4 809BE514 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE518.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE518.s deleted file mode 100644 index 87ffca0d34..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE518.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_809BE518 -/* 018B8 809BE518 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 018BC 809BE51C AFBF0014 */ sw $ra, 0x0014($sp) -/* 018C0 809BE520 AFA5001C */ sw $a1, 0x001C($sp) -/* 018C4 809BE524 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 018C8 809BE528 8CE5000C */ lw $a1, 0x000C($a3) ## 0000000C -/* 018CC 809BE52C AFA70018 */ sw $a3, 0x0018($sp) -/* 018D0 809BE530 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 -/* 018D4 809BE534 0C01DE80 */ jal Math_StepToF - -/* 018D8 809BE538 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 018DC 809BE53C 10400006 */ beq $v0, $zero, .L809BE558 -/* 018E0 809BE540 8FA70018 */ lw $a3, 0x0018($sp) -/* 018E4 809BE544 8CEE0004 */ lw $t6, 0x0004($a3) ## 00000004 -/* 018E8 809BE548 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 018EC 809BE54C 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 018F0 809BE550 0C26F4FE */ jal func_809BD3F8 -/* 018F4 809BE554 ACEF0004 */ sw $t7, 0x0004($a3) ## 00000004 -.L809BE558: -/* 018F8 809BE558 8FBF0014 */ lw $ra, 0x0014($sp) -/* 018FC 809BE55C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01900 809BE560 03E00008 */ jr $ra -/* 01904 809BE564 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE568.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE568.s deleted file mode 100644 index 0c3ccbc2e8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE568.s +++ /dev/null @@ -1,145 +0,0 @@ -glabel func_809BE568 -/* 01908 809BE568 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0190C 809BE56C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01910 809BE570 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 01914 809BE574 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 -/* 01918 809BE578 0C01DE1C */ jal Math_SinS - ## sins? -/* 0191C 809BE57C AFA50020 */ sw $a1, 0x0020($sp) -/* 01920 809BE580 8FA50020 */ lw $a1, 0x0020($sp) -/* 01924 809BE584 84A400B6 */ lh $a0, 0x00B6($a1) ## 000000B6 -/* 01928 809BE588 0C01DE0D */ jal Math_CosS - ## coss? -/* 0192C 809BE58C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01930 809BE590 8FA50020 */ lw $a1, 0x0020($sp) -/* 01934 809BE594 C7A20018 */ lwc1 $f2, 0x0018($sp) -/* 01938 809BE598 3C02809C */ lui $v0, %hi(D_809BF408) ## $v0 = 809C0000 -/* 0193C 809BE59C 8CA402A8 */ lw $a0, 0x02A8($a1) ## 000002A8 -/* 01940 809BE5A0 C4A40024 */ lwc1 $f4, 0x0024($a1) ## 00000024 -/* 01944 809BE5A4 2442F408 */ addiu $v0, $v0, %lo(D_809BF408) ## $v0 = 809BF408 -/* 01948 809BE5A8 848E0028 */ lh $t6, 0x0028($a0) ## 00000028 -/* 0194C 809BE5AC 848F002C */ lh $t7, 0x002C($a0) ## 0000002C -/* 01950 809BE5B0 00A01825 */ or $v1, $a1, $zero ## $v1 = 00000000 -/* 01954 809BE5B4 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 -/* 01958 809BE5B8 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 0195C 809BE5BC 46803220 */ cvt.s.w $f8, $f6 -/* 01960 809BE5C0 468091A0 */ cvt.s.w $f6, $f18 -/* 01964 809BE5C4 46004282 */ mul.s $f10, $f8, $f0 -/* 01968 809BE5C8 460A2400 */ add.s $f16, $f4, $f10 -/* 0196C 809BE5CC 46023202 */ mul.s $f8, $f6, $f2 -/* 01970 809BE5D0 46104100 */ add.s $f4, $f8, $f16 -/* 01974 809BE5D4 4600228D */ trunc.w.s $f10, $f4 -/* 01978 809BE5D8 44195000 */ mfc1 $t9, $f10 -/* 0197C 809BE5DC 00000000 */ nop -/* 01980 809BE5E0 A4990030 */ sh $t9, 0x0030($a0) ## 00000030 -/* 01984 809BE5E4 8CA402A8 */ lw $a0, 0x02A8($a1) ## 000002A8 -/* 01988 809BE5E8 C4B2002C */ lwc1 $f18, 0x002C($a1) ## 0000002C -/* 0198C 809BE5EC 8488002C */ lh $t0, 0x002C($a0) ## 0000002C -/* 01990 809BE5F0 84890028 */ lh $t1, 0x0028($a0) ## 00000028 -/* 01994 809BE5F4 44883000 */ mtc1 $t0, $f6 ## $f6 = 0.00 -/* 01998 809BE5F8 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 -/* 0199C 809BE5FC 46803220 */ cvt.s.w $f8, $f6 -/* 019A0 809BE600 468051A0 */ cvt.s.w $f6, $f10 -/* 019A4 809BE604 46004402 */ mul.s $f16, $f8, $f0 -/* 019A8 809BE608 46109100 */ add.s $f4, $f18, $f16 -/* 019AC 809BE60C 46023202 */ mul.s $f8, $f6, $f2 -/* 019B0 809BE610 46082481 */ sub.s $f18, $f4, $f8 -/* 019B4 809BE614 4600940D */ trunc.w.s $f16, $f18 -/* 019B8 809BE618 440B8000 */ mfc1 $t3, $f16 -/* 019BC 809BE61C 00000000 */ nop -/* 019C0 809BE620 A48B0034 */ sh $t3, 0x0034($a0) ## 00000034 -/* 019C4 809BE624 8CA402A8 */ lw $a0, 0x02A8($a1) ## 000002A8 -/* 019C8 809BE628 C4A40028 */ lwc1 $f4, 0x0028($a1) ## 00000028 -/* 019CC 809BE62C 848C002A */ lh $t4, 0x002A($a0) ## 0000002A -/* 019D0 809BE630 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 -/* 019D4 809BE634 00000000 */ nop -/* 019D8 809BE638 468051A0 */ cvt.s.w $f6, $f10 -/* 019DC 809BE63C 46043200 */ add.s $f8, $f6, $f4 -/* 019E0 809BE640 4600448D */ trunc.w.s $f18, $f8 -/* 019E4 809BE644 440E9000 */ mfc1 $t6, $f18 -/* 019E8 809BE648 00000000 */ nop -/* 019EC 809BE64C A48E0032 */ sh $t6, 0x0032($a0) ## 00000032 -/* 019F0 809BE650 3C04809C */ lui $a0, %hi(D_809BF460) ## $a0 = 809C0000 -/* 019F4 809BE654 2484F460 */ addiu $a0, $a0, %lo(D_809BF460) ## $a0 = 809BF460 -/* 019F8 809BE658 2442002C */ addiu $v0, $v0, 0x002C ## $v0 = 809BF434 -/* 019FC 809BE65C 10440027 */ beq $v0, $a0, .L809BE6FC -/* 01A00 809BE660 844FFFFE */ lh $t7, -0x0002($v0) ## 809BF432 -.L809BE664: -/* 01A04 809BE664 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 01A08 809BE668 8458FFFA */ lh $t8, -0x0006($v0) ## 809BF42E -/* 01A0C 809BE66C C4B00024 */ lwc1 $f16, 0x0024($a1) ## 00000024 -/* 01A10 809BE670 468094A0 */ cvt.s.w $f18, $f18 -/* 01A14 809BE674 44987000 */ mtc1 $t8, $f14 ## $f14 = 0.00 -/* 01A18 809BE678 2442002C */ addiu $v0, $v0, 0x002C ## $v0 = 809BF460 -/* 01A1C 809BE67C 2463004C */ addiu $v1, $v1, 0x004C ## $v1 = 0000004C -/* 01A20 809BE680 468073A0 */ cvt.s.w $f14, $f14 -/* 01A24 809BE684 46029482 */ mul.s $f18, $f18, $f2 -/* 01A28 809BE688 46128480 */ add.s $f18, $f16, $f18 -/* 01A2C 809BE68C 46007382 */ mul.s $f14, $f14, $f0 -/* 01A30 809BE690 46127480 */ add.s $f18, $f14, $f18 -/* 01A34 809BE694 4600948D */ trunc.w.s $f18, $f18 -/* 01A38 809BE698 44089000 */ mfc1 $t0, $f18 -/* 01A3C 809BE69C 00000000 */ nop -/* 01A40 809BE6A0 A46802E6 */ sh $t0, 0x02E6($v1) ## 00000332 -/* 01A44 809BE6A4 8449FFD2 */ lh $t1, -0x002E($v0) ## 809BF432 -/* 01A48 809BE6A8 844AFFCE */ lh $t2, -0x0032($v0) ## 809BF42E -/* 01A4C 809BE6AC C4B2002C */ lwc1 $f18, 0x002C($a1) ## 0000002C -/* 01A50 809BE6B0 44897000 */ mtc1 $t1, $f14 ## $f14 = 0.00 -/* 01A54 809BE6B4 448A8000 */ mtc1 $t2, $f16 ## $f16 = 0.00 -/* 01A58 809BE6B8 468073A0 */ cvt.s.w $f14, $f14 -/* 01A5C 809BE6BC 46808420 */ cvt.s.w $f16, $f16 -/* 01A60 809BE6C0 46007382 */ mul.s $f14, $f14, $f0 -/* 01A64 809BE6C4 460E9380 */ add.s $f14, $f18, $f14 -/* 01A68 809BE6C8 46028402 */ mul.s $f16, $f16, $f2 -/* 01A6C 809BE6CC 46107401 */ sub.s $f16, $f14, $f16 -/* 01A70 809BE6D0 4600840D */ trunc.w.s $f16, $f16 -/* 01A74 809BE6D4 440C8000 */ mfc1 $t4, $f16 -/* 01A78 809BE6D8 00000000 */ nop -/* 01A7C 809BE6DC A46C02EA */ sh $t4, 0x02EA($v1) ## 00000336 -/* 01A80 809BE6E0 C4B00028 */ lwc1 $f16, 0x0028($a1) ## 00000028 -/* 01A84 809BE6E4 4600840D */ trunc.w.s $f16, $f16 -/* 01A88 809BE6E8 440E8000 */ mfc1 $t6, $f16 -/* 01A8C 809BE6EC 00000000 */ nop -/* 01A90 809BE6F0 A46E02E8 */ sh $t6, 0x02E8($v1) ## 00000334 -/* 01A94 809BE6F4 1444FFDB */ bne $v0, $a0, .L809BE664 -/* 01A98 809BE6F8 844FFFFE */ lh $t7, -0x0002($v0) ## 809BF45E -.L809BE6FC: -/* 01A9C 809BE6FC 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 01AA0 809BE700 8458FFFA */ lh $t8, -0x0006($v0) ## 809BF45A -/* 01AA4 809BE704 C4B00024 */ lwc1 $f16, 0x0024($a1) ## 00000024 -/* 01AA8 809BE708 468094A0 */ cvt.s.w $f18, $f18 -/* 01AAC 809BE70C 44987000 */ mtc1 $t8, $f14 ## $f14 = 0.00 -/* 01AB0 809BE710 2463004C */ addiu $v1, $v1, 0x004C ## $v1 = 00000098 -/* 01AB4 809BE714 468073A0 */ cvt.s.w $f14, $f14 -/* 01AB8 809BE718 46029482 */ mul.s $f18, $f18, $f2 -/* 01ABC 809BE71C 46128480 */ add.s $f18, $f16, $f18 -/* 01AC0 809BE720 46007382 */ mul.s $f14, $f14, $f0 -/* 01AC4 809BE724 46127480 */ add.s $f18, $f14, $f18 -/* 01AC8 809BE728 4600948D */ trunc.w.s $f18, $f18 -/* 01ACC 809BE72C 44089000 */ mfc1 $t0, $f18 -/* 01AD0 809BE730 00000000 */ nop -/* 01AD4 809BE734 A46802E6 */ sh $t0, 0x02E6($v1) ## 0000037E -/* 01AD8 809BE738 8449FFFE */ lh $t1, -0x0002($v0) ## 809BF45E -/* 01ADC 809BE73C 844AFFFA */ lh $t2, -0x0006($v0) ## 809BF45A -/* 01AE0 809BE740 C4B2002C */ lwc1 $f18, 0x002C($a1) ## 0000002C -/* 01AE4 809BE744 44897000 */ mtc1 $t1, $f14 ## $f14 = 0.00 -/* 01AE8 809BE748 448A8000 */ mtc1 $t2, $f16 ## $f16 = 0.00 -/* 01AEC 809BE74C 468073A0 */ cvt.s.w $f14, $f14 -/* 01AF0 809BE750 46808420 */ cvt.s.w $f16, $f16 -/* 01AF4 809BE754 46007382 */ mul.s $f14, $f14, $f0 -/* 01AF8 809BE758 460E9380 */ add.s $f14, $f18, $f14 -/* 01AFC 809BE75C 46028402 */ mul.s $f16, $f16, $f2 -/* 01B00 809BE760 46107401 */ sub.s $f16, $f14, $f16 -/* 01B04 809BE764 4600840D */ trunc.w.s $f16, $f16 -/* 01B08 809BE768 440C8000 */ mfc1 $t4, $f16 -/* 01B0C 809BE76C 00000000 */ nop -/* 01B10 809BE770 A46C02EA */ sh $t4, 0x02EA($v1) ## 00000382 -/* 01B14 809BE774 C4B00028 */ lwc1 $f16, 0x0028($a1) ## 00000028 -/* 01B18 809BE778 4600840D */ trunc.w.s $f16, $f16 -/* 01B1C 809BE77C 440E8000 */ mfc1 $t6, $f16 -/* 01B20 809BE780 00000000 */ nop -/* 01B24 809BE784 A46E02E8 */ sh $t6, 0x02E8($v1) ## 00000380 -/* 01B28 809BE788 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01B2C 809BE78C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01B30 809BE790 03E00008 */ jr $ra -/* 01B34 809BE794 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE798.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE798.s deleted file mode 100644 index b5542b82f5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE798.s +++ /dev/null @@ -1,90 +0,0 @@ -glabel func_809BE798 -/* 01B38 809BE798 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01B3C 809BE79C AFBF0024 */ sw $ra, 0x0024($sp) -/* 01B40 809BE7A0 AFB00020 */ sw $s0, 0x0020($sp) -/* 01B44 809BE7A4 AFA50034 */ sw $a1, 0x0034($sp) -/* 01B48 809BE7A8 908602FC */ lbu $a2, 0x02FC($a0) ## 000002FC -/* 01B4C 809BE7AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01B50 809BE7B0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01B54 809BE7B4 30CE0002 */ andi $t6, $a2, 0x0002 ## $t6 = 00000000 -/* 01B58 809BE7B8 15C00009 */ bne $t6, $zero, .L809BE7E0 -/* 01B5C 809BE7BC 30CAFFFD */ andi $t2, $a2, 0xFFFD ## $t2 = 00000000 -/* 01B60 809BE7C0 908F0348 */ lbu $t7, 0x0348($a0) ## 00000348 -/* 01B64 809BE7C4 31F80002 */ andi $t8, $t7, 0x0002 ## $t8 = 00000000 -/* 01B68 809BE7C8 57000006 */ bnel $t8, $zero, .L809BE7E4 -/* 01B6C 809BE7CC 86080032 */ lh $t0, 0x0032($s0) ## 00000032 -/* 01B70 809BE7D0 9099029C */ lbu $t9, 0x029C($a0) ## 0000029C -/* 01B74 809BE7D4 33290002 */ andi $t1, $t9, 0x0002 ## $t1 = 00000000 -/* 01B78 809BE7D8 5120003C */ beql $t1, $zero, .L809BE8CC -/* 01B7C 809BE7DC 8FBF0024 */ lw $ra, 0x0024($sp) -.L809BE7E0: -/* 01B80 809BE7E0 86080032 */ lh $t0, 0x0032($s0) ## 00000032 -.L809BE7E4: -/* 01B84 809BE7E4 860F008A */ lh $t7, 0x008A($s0) ## 0000008A -/* 01B88 809BE7E8 920B0348 */ lbu $t3, 0x0348($s0) ## 00000348 -/* 01B8C 809BE7EC 920D029C */ lbu $t5, 0x029C($s0) ## 0000029C -/* 01B90 809BE7F0 01E81023 */ subu $v0, $t7, $t0 -/* 01B94 809BE7F4 00021400 */ sll $v0, $v0, 16 -/* 01B98 809BE7F8 00021403 */ sra $v0, $v0, 16 -/* 01B9C 809BE7FC 28414001 */ slti $at, $v0, 0x4001 -/* 01BA0 809BE800 316CFFFD */ andi $t4, $t3, 0xFFFD ## $t4 = 00000000 -/* 01BA4 809BE804 31AEFFFD */ andi $t6, $t5, 0xFFFD ## $t6 = 00000000 -/* 01BA8 809BE808 A20A02FC */ sb $t2, 0x02FC($s0) ## 000002FC -/* 01BAC 809BE80C A20C0348 */ sb $t4, 0x0348($s0) ## 00000348 -/* 01BB0 809BE810 14200003 */ bne $at, $zero, .L809BE820 -/* 01BB4 809BE814 A20E029C */ sb $t6, 0x029C($s0) ## 0000029C -/* 01BB8 809BE818 10000009 */ beq $zero, $zero, .L809BE840 -/* 01BBC 809BE81C 24024000 */ addiu $v0, $zero, 0x4000 ## $v0 = 00004000 -.L809BE820: -/* 01BC0 809BE820 18400003 */ blez $v0, .L809BE830 -/* 01BC4 809BE824 2841C000 */ slti $at, $v0, 0xC000 -/* 01BC8 809BE828 10000005 */ beq $zero, $zero, .L809BE840 -/* 01BCC 809BE82C 24026000 */ addiu $v0, $zero, 0x6000 ## $v0 = 00006000 -.L809BE830: -/* 01BD0 809BE830 10200003 */ beq $at, $zero, .L809BE840 -/* 01BD4 809BE834 2402A000 */ addiu $v0, $zero, 0xA000 ## $v0 = FFFFA000 -/* 01BD8 809BE838 10000001 */ beq $zero, $zero, .L809BE840 -/* 01BDC 809BE83C 2402C000 */ addiu $v0, $zero, 0xC000 ## $v0 = FFFFC000 -.L809BE840: -/* 01BE0 809BE840 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 01BE4 809BE844 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 01BE8 809BE848 01023821 */ addu $a3, $t0, $v0 -/* 01BEC 809BE84C 00073C00 */ sll $a3, $a3, 16 -/* 01BF0 809BE850 00073C03 */ sra $a3, $a3, 16 -/* 01BF4 809BE854 8FA40034 */ lw $a0, 0x0034($sp) -/* 01BF8 809BE858 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 01BFC 809BE85C A7A2002E */ sh $v0, 0x002E($sp) -/* 01C00 809BE860 0C00BDC7 */ jal func_8002F71C -/* 01C04 809BE864 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01C08 809BE868 8E030190 */ lw $v1, 0x0190($s0) ## 00000190 -/* 01C0C 809BE86C 3C18809C */ lui $t8, %hi(func_809BDC08) ## $t8 = 809C0000 -/* 01C10 809BE870 2718DC08 */ addiu $t8, $t8, %lo(func_809BDC08) ## $t8 = 809BDC08 -/* 01C14 809BE874 17030006 */ bne $t8, $v1, .L809BE890 -/* 01C18 809BE878 87A2002E */ lh $v0, 0x002E($sp) -/* 01C1C 809BE87C 0C26F529 */ jal func_809BD4A4 -/* 01C20 809BE880 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C24 809BE884 24190028 */ addiu $t9, $zero, 0x0028 ## $t9 = 00000028 -/* 01C28 809BE888 1000000F */ beq $zero, $zero, .L809BE8C8 -/* 01C2C 809BE88C A6190196 */ sh $t9, 0x0196($s0) ## 00000196 -.L809BE890: -/* 01C30 809BE890 3C09809C */ lui $t1, %hi(func_809BE3E4) ## $t1 = 809C0000 -/* 01C34 809BE894 2529E3E4 */ addiu $t1, $t1, %lo(func_809BE3E4) ## $t1 = 809BE3E4 -/* 01C38 809BE898 5523000C */ bnel $t1, $v1, .L809BE8CC -/* 01C3C 809BE89C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01C40 809BE8A0 82030194 */ lb $v1, 0x0194($s0) ## 00000194 -/* 01C44 809BE8A4 00430019 */ multu $v0, $v1 -/* 01C48 809BE8A8 00005012 */ mflo $t2 -/* 01C4C 809BE8AC 59400007 */ blezl $t2, .L809BE8CC -/* 01C50 809BE8B0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01C54 809BE8B4 860C0196 */ lh $t4, 0x0196($s0) ## 00000196 -/* 01C58 809BE8B8 00035823 */ subu $t3, $zero, $v1 -/* 01C5C 809BE8BC A20B0194 */ sb $t3, 0x0194($s0) ## 00000194 -/* 01C60 809BE8C0 258D0004 */ addiu $t5, $t4, 0x0004 ## $t5 = 00000004 -/* 01C64 809BE8C4 A60D0196 */ sh $t5, 0x0196($s0) ## 00000196 -.L809BE8C8: -/* 01C68 809BE8C8 8FBF0024 */ lw $ra, 0x0024($sp) -.L809BE8CC: -/* 01C6C 809BE8CC 8FB00020 */ lw $s0, 0x0020($sp) -/* 01C70 809BE8D0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01C74 809BE8D4 03E00008 */ jr $ra -/* 01C78 809BE8D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE8DC.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE8DC.s deleted file mode 100644 index feedc651d3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE8DC.s +++ /dev/null @@ -1,70 +0,0 @@ -glabel func_809BE8DC -/* 01C7C 809BE8DC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01C80 809BE8E0 AFBF001C */ sw $ra, 0x001C($sp) -/* 01C84 809BE8E4 AFB00018 */ sw $s0, 0x0018($sp) -/* 01C88 809BE8E8 AFA50024 */ sw $a1, 0x0024($sp) -/* 01C8C 809BE8EC 9083029D */ lbu $v1, 0x029D($a0) ## 0000029D -/* 01C90 809BE8F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01C94 809BE8F4 306E0002 */ andi $t6, $v1, 0x0002 ## $t6 = 00000000 -/* 01C98 809BE8F8 51C00030 */ beql $t6, $zero, .L809BE9BC -/* 01C9C 809BE8FC 8FBF001C */ lw $ra, 0x001C($sp) -/* 01CA0 809BE900 908200B1 */ lbu $v0, 0x00B1($a0) ## 000000B1 -/* 01CA4 809BE904 306FFFFD */ andi $t7, $v1, 0xFFFD ## $t7 = 00000000 -/* 01CA8 809BE908 A08F029D */ sb $t7, 0x029D($a0) ## 0000029D -/* 01CAC 809BE90C 14400004 */ bne $v0, $zero, .L809BE920 -/* 01CB0 809BE910 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01CB4 809BE914 909800B0 */ lbu $t8, 0x00B0($a0) ## 000000B0 -/* 01CB8 809BE918 53000028 */ beql $t8, $zero, .L809BE9BC -/* 01CBC 809BE91C 8FBF001C */ lw $ra, 0x001C($sp) -.L809BE920: -/* 01CC0 809BE920 5441000B */ bnel $v0, $at, .L809BE950 -/* 01CC4 809BE924 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 01CC8 809BE928 8E080190 */ lw $t0, 0x0190($s0) ## 00000190 -/* 01CCC 809BE92C 3C19809C */ lui $t9, %hi(func_809BE058) ## $t9 = 809C0000 -/* 01CD0 809BE930 2739E058 */ addiu $t9, $t9, %lo(func_809BE058) ## $t9 = 809BE058 -/* 01CD4 809BE934 53280021 */ beql $t9, $t0, .L809BE9BC -/* 01CD8 809BE938 8FBF001C */ lw $ra, 0x001C($sp) -/* 01CDC 809BE93C 0C26F549 */ jal func_809BD524 -/* 01CE0 809BE940 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01CE4 809BE944 1000001D */ beq $zero, $zero, .L809BE9BC -/* 01CE8 809BE948 8FBF001C */ lw $ra, 0x001C($sp) -/* 01CEC 809BE94C 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -.L809BE950: -/* 01CF0 809BE950 14410005 */ bne $v0, $at, .L809BE968 -/* 01CF4 809BE954 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01CF8 809BE958 0C26F51F */ jal func_809BD47C -/* 01CFC 809BE95C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D00 809BE960 10000016 */ beq $zero, $zero, .L809BE9BC -/* 01D04 809BE964 8FBF001C */ lw $ra, 0x001C($sp) -.L809BE968: -/* 01D08 809BE968 0C00B821 */ jal Actor_IsFacingPlayer -/* 01D0C 809BE96C 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 01D10 809BE970 54400012 */ bnel $v0, $zero, .L809BE9BC -/* 01D14 809BE974 8FBF001C */ lw $ra, 0x001C($sp) -/* 01D18 809BE978 0C00D58A */ jal Actor_ApplyDamage - -/* 01D1C 809BE97C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D20 809BE980 14400009 */ bne $v0, $zero, .L809BE9A8 -/* 01D24 809BE984 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D28 809BE988 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D2C 809BE98C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01D30 809BE990 24053909 */ addiu $a1, $zero, 0x3909 ## $a1 = 00003909 -/* 01D34 809BE994 8FA40024 */ lw $a0, 0x0024($sp) -/* 01D38 809BE998 0C00CB1F */ jal Enemy_StartFinishingBlow -/* 01D3C 809BE99C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01D40 809BE9A0 10000003 */ beq $zero, $zero, .L809BE9B0 -/* 01D44 809BE9A4 00000000 */ nop -.L809BE9A8: -/* 01D48 809BE9A8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01D4C 809BE9AC 24053907 */ addiu $a1, $zero, 0x3907 ## $a1 = 00003907 -.L809BE9B0: -/* 01D50 809BE9B0 0C26F578 */ jal func_809BD5E0 -/* 01D54 809BE9B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D58 809BE9B8 8FBF001C */ lw $ra, 0x001C($sp) -.L809BE9BC: -/* 01D5C 809BE9BC 8FB00018 */ lw $s0, 0x0018($sp) -/* 01D60 809BE9C0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01D64 809BE9C4 03E00008 */ jr $ra -/* 01D68 809BE9C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BEBBC.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BEBBC.s deleted file mode 100644 index b3600b2dd3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BEBBC.s +++ /dev/null @@ -1,375 +0,0 @@ -.rdata -glabel D_809BF4B0 - .asciz "../z_en_bigokuta.c" - .balign 4 - -glabel D_809BF4C4 - .asciz "../z_en_bigokuta.c" - .balign 4 - -glabel D_809BF4D8 - .asciz "../z_en_bigokuta.c" - .balign 4 - -glabel D_809BF4EC - .asciz "../z_en_bigokuta.c" - .balign 4 - -.late_rodata -glabel D_809BF564 - .word 0x3EC90FDB -glabel D_809BF568 - .word 0x3E490FDB -glabel D_809BF56C - .word 0x3F490FDB -glabel D_809BF570 - .word 0x3EC90FDB -glabel D_809BF574 - .word 0x40D6BCA2 -glabel D_809BF578 - .float 0.2 - -glabel D_809BF57C - .word 0x3DAAAAAB - -.text -glabel func_809BEBBC -/* 01F5C 809BEBBC 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 01F60 809BEBC0 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 01F64 809BEBC4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01F68 809BEBC8 AFA40068 */ sw $a0, 0x0068($sp) -/* 01F6C 809BEBCC AFA60070 */ sw $a2, 0x0070($sp) -/* 01F70 809BEBD0 14A10098 */ bne $a1, $at, .L809BEE34 -/* 01F74 809BEBD4 AFA70074 */ sw $a3, 0x0074($sp) -/* 01F78 809BEBD8 8FA3007C */ lw $v1, 0x007C($sp) -/* 01F7C 809BEBDC 3C02809C */ lui $v0, %hi(func_809BE058) ## $v0 = 809C0000 -/* 01F80 809BEBE0 2442E058 */ addiu $v0, $v0, %lo(func_809BE058) ## $v0 = 809BE058 -/* 01F84 809BEBE4 8C640190 */ lw $a0, 0x0190($v1) ## 00000190 -/* 01F88 809BEBE8 3C0E809C */ lui $t6, %hi(func_809BE180) ## $t6 = 809C0000 -/* 01F8C 809BEBEC 25CEE180 */ addiu $t6, $t6, %lo(func_809BE180) ## $t6 = 809BE180 -/* 01F90 809BEBF0 10440003 */ beq $v0, $a0, .L809BEC00 -/* 01F94 809BEBF4 8FAF0068 */ lw $t7, 0x0068($sp) -/* 01F98 809BEBF8 55C40128 */ bnel $t6, $a0, .L809BF09C -/* 01F9C 809BEBFC 8FBF0014 */ lw $ra, 0x0014($sp) -.L809BEC00: -/* 01FA0 809BEC00 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 01FA4 809BEC04 3C06809C */ lui $a2, %hi(D_809BF4B0) ## $a2 = 809C0000 -/* 01FA8 809BEC08 24C6F4B0 */ addiu $a2, $a2, %lo(D_809BF4B0) ## $a2 = 809BF4B0 -/* 01FAC 809BEC0C AFA2001C */ sw $v0, 0x001C($sp) -/* 01FB0 809BEC10 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC -/* 01FB4 809BEC14 2407077A */ addiu $a3, $zero, 0x077A ## $a3 = 0000077A -/* 01FB8 809BEC18 0C031AB1 */ jal Graph_OpenDisps -/* 01FBC 809BEC1C AFA50054 */ sw $a1, 0x0054($sp) -/* 01FC0 809BEC20 8FA3007C */ lw $v1, 0x007C($sp) -/* 01FC4 809BEC24 8FA2001C */ lw $v0, 0x001C($sp) -/* 01FC8 809BEC28 8FA80054 */ lw $t0, 0x0054($sp) -/* 01FCC 809BEC2C 8C780190 */ lw $t8, 0x0190($v1) ## 00000190 -/* 01FD0 809BEC30 54580020 */ bnel $v0, $t8, .L809BECB4 -/* 01FD4 809BEC34 846A0196 */ lh $t2, 0x0196($v1) ## 00000196 -/* 01FD8 809BEC38 84790196 */ lh $t9, 0x0196($v1) ## 00000196 -/* 01FDC 809BEC3C 2404000C */ addiu $a0, $zero, 0x000C ## $a0 = 0000000C -/* 01FE0 809BEC40 0324001A */ div $zero, $t9, $a0 -/* 01FE4 809BEC44 14800002 */ bne $a0, $zero, .L809BEC50 -/* 01FE8 809BEC48 00000000 */ nop -/* 01FEC 809BEC4C 0007000D */ break 7 -.L809BEC50: -/* 01FF0 809BEC50 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 01FF4 809BEC54 14810004 */ bne $a0, $at, .L809BEC68 -/* 01FF8 809BEC58 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01FFC 809BEC5C 17210002 */ bne $t9, $at, .L809BEC68 -/* 02000 809BEC60 00000000 */ nop -/* 02004 809BEC64 0006000D */ break 6 -.L809BEC68: -/* 02008 809BEC68 00001010 */ mfhi $v0 -/* 0200C 809BEC6C 28410008 */ slti $at, $v0, 0x0008 -/* 02010 809BEC70 14200008 */ bne $at, $zero, .L809BEC94 -/* 02014 809BEC74 00824823 */ subu $t1, $a0, $v0 -/* 02018 809BEC78 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 0201C 809BEC7C 3C01809C */ lui $at, %hi(D_809BF564) ## $at = 809C0000 -/* 02020 809BEC80 C428F564 */ lwc1 $f8, %lo(D_809BF564)($at) -/* 02024 809BEC84 468021A0 */ cvt.s.w $f6, $f4 -/* 02028 809BEC88 46083282 */ mul.s $f10, $f6, $f8 -/* 0202C 809BEC8C 10000025 */ beq $zero, $zero, .L809BED24 -/* 02030 809BEC90 E7AA005C */ swc1 $f10, 0x005C($sp) -.L809BEC94: -/* 02034 809BEC94 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 02038 809BEC98 3C01809C */ lui $at, %hi(D_809BF568) ## $at = 809C0000 -/* 0203C 809BEC9C C424F568 */ lwc1 $f4, %lo(D_809BF568)($at) -/* 02040 809BECA0 468084A0 */ cvt.s.w $f18, $f16 -/* 02044 809BECA4 46049002 */ mul.s $f0, $f18, $f4 -/* 02048 809BECA8 1000001E */ beq $zero, $zero, .L809BED24 -/* 0204C 809BECAC E7A0005C */ swc1 $f0, 0x005C($sp) -/* 02050 809BECB0 846A0196 */ lh $t2, 0x0196($v1) ## 00000196 -.L809BECB4: -/* 02054 809BECB4 24040006 */ addiu $a0, $zero, 0x0006 ## $a0 = 00000006 -/* 02058 809BECB8 0144001A */ div $zero, $t2, $a0 -/* 0205C 809BECBC 14800002 */ bne $a0, $zero, .L809BECC8 -/* 02060 809BECC0 00000000 */ nop -/* 02064 809BECC4 0007000D */ break 7 -.L809BECC8: -/* 02068 809BECC8 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 0206C 809BECCC 14810004 */ bne $a0, $at, .L809BECE0 -/* 02070 809BECD0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02074 809BECD4 15410002 */ bne $t2, $at, .L809BECE0 -/* 02078 809BECD8 00000000 */ nop -/* 0207C 809BECDC 0006000D */ break 6 -.L809BECE0: -/* 02080 809BECE0 00001010 */ mfhi $v0 -/* 02084 809BECE4 28410004 */ slti $at, $v0, 0x0004 -/* 02088 809BECE8 14200008 */ bne $at, $zero, .L809BED0C -/* 0208C 809BECEC 00825823 */ subu $t3, $a0, $v0 -/* 02090 809BECF0 448B3000 */ mtc1 $t3, $f6 ## $f6 = 0.00 -/* 02094 809BECF4 3C01809C */ lui $at, %hi(D_809BF56C) ## $at = 809C0000 -/* 02098 809BECF8 C42AF56C */ lwc1 $f10, %lo(D_809BF56C)($at) -/* 0209C 809BECFC 46803220 */ cvt.s.w $f8, $f6 -/* 020A0 809BED00 460A4002 */ mul.s $f0, $f8, $f10 -/* 020A4 809BED04 10000007 */ beq $zero, $zero, .L809BED24 -/* 020A8 809BED08 E7A0005C */ swc1 $f0, 0x005C($sp) -.L809BED0C: -/* 020AC 809BED0C 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 020B0 809BED10 3C01809C */ lui $at, %hi(D_809BF570) ## $at = 809C0000 -/* 020B4 809BED14 C424F570 */ lwc1 $f4, %lo(D_809BF570)($at) -/* 020B8 809BED18 468084A0 */ cvt.s.w $f18, $f16 -/* 020BC 809BED1C 46049002 */ mul.s $f0, $f18, $f4 -/* 020C0 809BED20 E7A0005C */ swc1 $f0, 0x005C($sp) -.L809BED24: -/* 020C4 809BED24 C7AC005C */ lwc1 $f12, 0x005C($sp) -/* 020C8 809BED28 0C0400A4 */ jal sinf - -/* 020CC 809BED2C AFA80054 */ sw $t0, 0x0054($sp) -/* 020D0 809BED30 3C0142FA */ lui $at, 0x42FA ## $at = 42FA0000 -/* 020D4 809BED34 44813000 */ mtc1 $at, $f6 ## $f6 = 125.00 -/* 020D8 809BED38 3C014302 */ lui $at, 0x4302 ## $at = 43020000 -/* 020DC 809BED3C 44815000 */ mtc1 $at, $f10 ## $f10 = 130.00 -/* 020E0 809BED40 46060202 */ mul.s $f8, $f0, $f6 -/* 020E4 809BED44 8FA80054 */ lw $t0, 0x0054($sp) -/* 020E8 809BED48 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 020EC 809BED4C 3C0DE700 */ lui $t5, 0xE700 ## $t5 = E7000000 -/* 020F0 809BED50 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 020F4 809BED54 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 -/* 020F8 809BED58 3C06809C */ lui $a2, %hi(D_809BF4C4) ## $a2 = 809C0000 -/* 020FC 809BED5C 460A4400 */ add.s $f16, $f8, $f10 -/* 02100 809BED60 246C0008 */ addiu $t4, $v1, 0x0008 ## $t4 = 00000008 -/* 02104 809BED64 AD0C02C0 */ sw $t4, 0x02C0($t0) ## 000002C0 -/* 02108 809BED68 AC600004 */ sw $zero, 0x0004($v1) ## 00000004 -/* 0210C 809BED6C 4458F800 */ cfc1 $t8, $31 -/* 02110 809BED70 44C2F800 */ ctc1 $v0, $31 -/* 02114 809BED74 AC6D0000 */ sw $t5, 0x0000($v1) ## 00000000 -/* 02118 809BED78 8D0402C0 */ lw $a0, 0x02C0($t0) ## 000002C0 -/* 0211C 809BED7C 460084A4 */ cvt.w.s $f18, $f16 -/* 02120 809BED80 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02124 809BED84 248E0008 */ addiu $t6, $a0, 0x0008 ## $t6 = 00000008 -/* 02128 809BED88 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 -/* 0212C 809BED8C 4442F800 */ cfc1 $v0, $31 -/* 02130 809BED90 24C6F4C4 */ addiu $a2, $a2, %lo(D_809BF4C4) ## $a2 = 809BF4C4 -/* 02134 809BED94 24070799 */ addiu $a3, $zero, 0x0799 ## $a3 = 00000799 -/* 02138 809BED98 30420078 */ andi $v0, $v0, 0x0078 ## $v0 = 00000000 -/* 0213C 809BED9C 10400012 */ beq $v0, $zero, .L809BEDE8 -/* 02140 809BEDA0 AC8F0000 */ sw $t7, 0x0000($a0) ## 00000000 -/* 02144 809BEDA4 44819000 */ mtc1 $at, $f18 ## $f18 = 2147483648.00 -/* 02148 809BEDA8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0214C 809BEDAC 46128481 */ sub.s $f18, $f16, $f18 -/* 02150 809BEDB0 44C2F800 */ ctc1 $v0, $31 -/* 02154 809BEDB4 00000000 */ nop -/* 02158 809BEDB8 460094A4 */ cvt.w.s $f18, $f18 -/* 0215C 809BEDBC 4442F800 */ cfc1 $v0, $31 -/* 02160 809BEDC0 00000000 */ nop -/* 02164 809BEDC4 30420078 */ andi $v0, $v0, 0x0078 ## $v0 = 00000000 -/* 02168 809BEDC8 14400005 */ bne $v0, $zero, .L809BEDE0 -/* 0216C 809BEDCC 00000000 */ nop -/* 02170 809BEDD0 44029000 */ mfc1 $v0, $f18 -/* 02174 809BEDD4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02178 809BEDD8 10000007 */ beq $zero, $zero, .L809BEDF8 -/* 0217C 809BEDDC 00411025 */ or $v0, $v0, $at ## $v0 = 80000000 -.L809BEDE0: -/* 02180 809BEDE0 10000005 */ beq $zero, $zero, .L809BEDF8 -/* 02184 809BEDE4 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -.L809BEDE8: -/* 02188 809BEDE8 44029000 */ mfc1 $v0, $f18 -/* 0218C 809BEDEC 00000000 */ nop -/* 02190 809BEDF0 0440FFFB */ bltz $v0, .L809BEDE0 -/* 02194 809BEDF4 00000000 */ nop -.L809BEDF8: -/* 02198 809BEDF8 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 000000FF -/* 0219C 809BEDFC 0002CE00 */ sll $t9, $v0, 24 -/* 021A0 809BEE00 00024C00 */ sll $t1, $v0, 16 -/* 021A4 809BEE04 03295025 */ or $t2, $t9, $t1 ## $t2 = 00000000 -/* 021A8 809BEE08 00025A00 */ sll $t3, $v0, 8 -/* 021AC 809BEE0C 014B6025 */ or $t4, $t2, $t3 ## $t4 = 00000000 -/* 021B0 809BEE10 358D00FF */ ori $t5, $t4, 0x00FF ## $t5 = 000000FF -/* 021B4 809BEE14 AC8D0004 */ sw $t5, 0x0004($a0) ## 00000004 -/* 021B8 809BEE18 8FAE0068 */ lw $t6, 0x0068($sp) -/* 021BC 809BEE1C 44D8F800 */ ctc1 $t8, $31 -/* 021C0 809BEE20 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC -/* 021C4 809BEE24 0C031AD5 */ jal Graph_CloseDisps -/* 021C8 809BEE28 8DC50000 */ lw $a1, 0x0000($t6) ## 00000008 -/* 021CC 809BEE2C 1000009B */ beq $zero, $zero, .L809BF09C -/* 021D0 809BEE30 8FBF0014 */ lw $ra, 0x0014($sp) -.L809BEE34: -/* 021D4 809BEE34 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 021D8 809BEE38 14A10058 */ bne $a1, $at, .L809BEF9C -/* 021DC 809BEE3C 8FAF0068 */ lw $t7, 0x0068($sp) -/* 021E0 809BEE40 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 021E4 809BEE44 3C06809C */ lui $a2, %hi(D_809BF4D8) ## $a2 = 809C0000 -/* 021E8 809BEE48 24C6F4D8 */ addiu $a2, $a2, %lo(D_809BF4D8) ## $a2 = 809BF4D8 -/* 021EC 809BEE4C 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFC0 -/* 021F0 809BEE50 2407079E */ addiu $a3, $zero, 0x079E ## $a3 = 0000079E -/* 021F4 809BEE54 0C031AB1 */ jal Graph_OpenDisps -/* 021F8 809BEE58 AFA50038 */ sw $a1, 0x0038($sp) -/* 021FC 809BEE5C 8FA3007C */ lw $v1, 0x007C($sp) -/* 02200 809BEE60 3C18809C */ lui $t8, %hi(func_809BE26C) ## $t8 = 809C0000 -/* 02204 809BEE64 2718E26C */ addiu $t8, $t8, %lo(func_809BE26C) ## $t8 = 809BE26C -/* 02208 809BEE68 8C790190 */ lw $t9, 0x0190($v1) ## 00000190 -/* 0220C 809BEE6C 8FA80038 */ lw $t0, 0x0038($sp) -/* 02210 809BEE70 3C0CE700 */ lui $t4, 0xE700 ## $t4 = E7000000 -/* 02214 809BEE74 1719002E */ bne $t8, $t9, .L809BEF30 -/* 02218 809BEE78 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 0221C 809BEE7C 84690196 */ lh $t1, 0x0196($v1) ## 00000196 -/* 02220 809BEE80 3C01809C */ lui $at, %hi(D_809BF574) ## $at = 809C0000 -/* 02224 809BEE84 C428F574 */ lwc1 $f8, %lo(D_809BF574)($at) -/* 02228 809BEE88 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 0222C 809BEE8C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02230 809BEE90 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02234 809BEE94 468021A0 */ cvt.s.w $f6, $f4 -/* 02238 809BEE98 46083282 */ mul.s $f10, $f6, $f8 -/* 0223C 809BEE9C 444AF800 */ cfc1 $t2, $31 -/* 02240 809BEEA0 44C5F800 */ ctc1 $a1, $31 -/* 02244 809BEEA4 00000000 */ nop -/* 02248 809BEEA8 46005424 */ cvt.w.s $f16, $f10 -/* 0224C 809BEEAC 4445F800 */ cfc1 $a1, $31 -/* 02250 809BEEB0 00000000 */ nop -/* 02254 809BEEB4 30A50078 */ andi $a1, $a1, 0x0078 ## $a1 = 00000000 -/* 02258 809BEEB8 50A00017 */ beql $a1, $zero, .L809BEF18 -/* 0225C 809BEEBC 44058000 */ mfc1 $a1, $f16 -/* 02260 809BEEC0 44818000 */ mtc1 $at, $f16 ## $f16 = 2147483648.00 -/* 02264 809BEEC4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02268 809BEEC8 46105401 */ sub.s $f16, $f10, $f16 -/* 0226C 809BEECC 44C5F800 */ ctc1 $a1, $31 -/* 02270 809BEED0 00000000 */ nop -/* 02274 809BEED4 46008424 */ cvt.w.s $f16, $f16 -/* 02278 809BEED8 4445F800 */ cfc1 $a1, $31 -/* 0227C 809BEEDC 00000000 */ nop -/* 02280 809BEEE0 30A50078 */ andi $a1, $a1, 0x0078 ## $a1 = 00000000 -/* 02284 809BEEE4 54A00008 */ bnel $a1, $zero, .L809BEF08 -/* 02288 809BEEE8 2405FFFF */ addiu $a1, $zero, 0xFFFF ## $a1 = FFFFFFFF -/* 0228C 809BEEEC 44058000 */ mfc1 $a1, $f16 -/* 02290 809BEEF0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02294 809BEEF4 44CAF800 */ ctc1 $t2, $31 -/* 02298 809BEEF8 00A12825 */ or $a1, $a1, $at ## $a1 = FFFFFFFF -/* 0229C 809BEEFC 1000000D */ beq $zero, $zero, .L809BEF34 -/* 022A0 809BEF00 30A500FF */ andi $a1, $a1, 0x00FF ## $a1 = 000000FF -/* 022A4 809BEF04 2405FFFF */ addiu $a1, $zero, 0xFFFF ## $a1 = FFFFFFFF -.L809BEF08: -/* 022A8 809BEF08 44CAF800 */ ctc1 $t2, $31 -/* 022AC 809BEF0C 10000009 */ beq $zero, $zero, .L809BEF34 -/* 022B0 809BEF10 30A500FF */ andi $a1, $a1, 0x00FF ## $a1 = 000000FF -/* 022B4 809BEF14 44058000 */ mfc1 $a1, $f16 -.L809BEF18: -/* 022B8 809BEF18 00000000 */ nop -/* 022BC 809BEF1C 04A2FFFA */ bltzl $a1, .L809BEF08 -/* 022C0 809BEF20 2405FFFF */ addiu $a1, $zero, 0xFFFF ## $a1 = FFFFFFFF -/* 022C4 809BEF24 44CAF800 */ ctc1 $t2, $31 -/* 022C8 809BEF28 10000002 */ beq $zero, $zero, .L809BEF34 -/* 022CC 809BEF2C 30A500FF */ andi $a1, $a1, 0x00FF ## $a1 = 000000FF -.L809BEF30: -/* 022D0 809BEF30 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -.L809BEF34: -/* 022D4 809BEF34 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 022D8 809BEF38 30A200FF */ andi $v0, $a1, 0x00FF ## $v0 = 000000FF -/* 022DC 809BEF3C 00027E00 */ sll $t7, $v0, 24 -/* 022E0 809BEF40 246B0008 */ addiu $t3, $v1, 0x0008 ## $t3 = 00000008 -/* 022E4 809BEF44 AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 -/* 022E8 809BEF48 AC600004 */ sw $zero, 0x0004($v1) ## 00000004 -/* 022EC 809BEF4C AC6C0000 */ sw $t4, 0x0000($v1) ## 00000000 -/* 022F0 809BEF50 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 022F4 809BEF54 0002C400 */ sll $t8, $v0, 16 -/* 022F8 809BEF58 01F8C825 */ or $t9, $t7, $t8 ## $t9 = 809BE26C -/* 022FC 809BEF5C 00024A00 */ sll $t1, $v0, 8 -/* 02300 809BEF60 246D0008 */ addiu $t5, $v1, 0x0008 ## $t5 = 00000008 -/* 02304 809BEF64 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 -/* 02308 809BEF68 03295025 */ or $t2, $t9, $t1 ## $t2 = 809BE26C -/* 0230C 809BEF6C 01425825 */ or $t3, $t2, $v0 ## $t3 = 809BE2FF -/* 02310 809BEF70 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 -/* 02314 809BEF74 AC6E0000 */ sw $t6, 0x0000($v1) ## 00000000 -/* 02318 809BEF78 8FAC0068 */ lw $t4, 0x0068($sp) -/* 0231C 809BEF7C 3C06809C */ lui $a2, %hi(D_809BF4EC) ## $a2 = 809C0000 -/* 02320 809BEF80 24C6F4EC */ addiu $a2, $a2, %lo(D_809BF4EC) ## $a2 = 809BF4EC -/* 02324 809BEF84 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFC0 -/* 02328 809BEF88 240707B4 */ addiu $a3, $zero, 0x07B4 ## $a3 = 000007B4 -/* 0232C 809BEF8C 0C031AD5 */ jal Graph_CloseDisps -/* 02330 809BEF90 8D850000 */ lw $a1, 0x0000($t4) ## E7000000 -/* 02334 809BEF94 10000041 */ beq $zero, $zero, .L809BF09C -/* 02338 809BEF98 8FBF0014 */ lw $ra, 0x0014($sp) -.L809BEF9C: -/* 0233C 809BEF9C 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 02340 809BEFA0 14A1003D */ bne $a1, $at, .L809BF098 -/* 02344 809BEFA4 8FA3007C */ lw $v1, 0x007C($sp) -/* 02348 809BEFA8 8C6E0190 */ lw $t6, 0x0190($v1) ## 00000190 -/* 0234C 809BEFAC 3C0D809C */ lui $t5, %hi(func_809BE26C) ## $t5 = 809C0000 -/* 02350 809BEFB0 25ADE26C */ addiu $t5, $t5, %lo(func_809BE26C) ## $t5 = 809BE26C -/* 02354 809BEFB4 55AE0039 */ bnel $t5, $t6, .L809BF09C -/* 02358 809BEFB8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0235C 809BEFBC 84620198 */ lh $v0, 0x0198($v1) ## 00000198 -/* 02360 809BEFC0 28410005 */ slti $at, $v0, 0x0005 -/* 02364 809BEFC4 50200012 */ beql $at, $zero, .L809BF010 -/* 02368 809BEFC8 28410008 */ slti $at, $v0, 0x0008 -/* 0236C 809BEFCC 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 -/* 02370 809BEFD0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 02374 809BEFD4 44817000 */ mtc1 $at, $f14 ## $f14 = 1.00 -/* 02378 809BEFD8 46809120 */ cvt.s.w $f4, $f18 -/* 0237C 809BEFDC 3C01809C */ lui $at, %hi(D_809BF578) ## $at = 809C0000 -/* 02380 809BEFE0 C426F578 */ lwc1 $f6, %lo(D_809BF578)($at) -/* 02384 809BEFE4 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 02388 809BEFE8 44815000 */ mtc1 $at, $f10 ## $f10 = 0.25 -/* 0238C 809BEFEC 44067000 */ mfc1 $a2, $f14 -/* 02390 809BEFF0 46062202 */ mul.s $f8, $f4, $f6 -/* 02394 809BEFF4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02398 809BEFF8 460A4402 */ mul.s $f16, $f8, $f10 -/* 0239C 809BEFFC 0C0342A3 */ jal Matrix_Scale -/* 023A0 809BF000 460E8300 */ add.s $f12, $f16, $f14 -/* 023A4 809BF004 10000025 */ beq $zero, $zero, .L809BF09C -/* 023A8 809BF008 8FBF0014 */ lw $ra, 0x0014($sp) -/* 023AC 809BF00C 28410008 */ slti $at, $v0, 0x0008 -.L809BF010: -/* 023B0 809BF010 10200013 */ beq $at, $zero, .L809BF060 -/* 023B4 809BF014 2458FFF8 */ addiu $t8, $v0, 0xFFF8 ## $t8 = FFFFFFF8 -/* 023B8 809BF018 244FFFFB */ addiu $t7, $v0, 0xFFFB ## $t7 = FFFFFFFB -/* 023BC 809BF01C 448F9000 */ mtc1 $t7, $f18 ## $f18 = NaN -/* 023C0 809BF020 3C01809C */ lui $at, %hi(D_809BF57C) ## $at = 809C0000 -/* 023C4 809BF024 C426F57C */ lwc1 $f6, %lo(D_809BF57C)($at) -/* 023C8 809BF028 46809120 */ cvt.s.w $f4, $f18 -/* 023CC 809BF02C 3C013FA0 */ lui $at, 0x3FA0 ## $at = 3FA00000 -/* 023D0 809BF030 44814000 */ mtc1 $at, $f8 ## $f8 = 1.25 -/* 023D4 809BF034 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 023D8 809BF038 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 023DC 809BF03C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 023E0 809BF040 46062002 */ mul.s $f0, $f4, $f6 -/* 023E4 809BF044 46005380 */ add.s $f14, $f10, $f0 -/* 023E8 809BF048 46004301 */ sub.s $f12, $f8, $f0 -/* 023EC 809BF04C 44067000 */ mfc1 $a2, $f14 -/* 023F0 809BF050 0C0342A3 */ jal Matrix_Scale -/* 023F4 809BF054 00000000 */ nop -/* 023F8 809BF058 10000010 */ beq $zero, $zero, .L809BF09C -/* 023FC 809BF05C 8FBF0014 */ lw $ra, 0x0014($sp) -.L809BF060: -/* 02400 809BF060 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 02404 809BF064 3C013E00 */ lui $at, 0x3E00 ## $at = 3E000000 -/* 02408 809BF068 44812000 */ mtc1 $at, $f4 ## $f4 = 0.12 -/* 0240C 809BF06C 468084A0 */ cvt.s.w $f18, $f16 -/* 02410 809BF070 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 02414 809BF074 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 02418 809BF078 3C013FA0 */ lui $at, 0x3FA0 ## $at = 3FA00000 -/* 0241C 809BF07C 44813000 */ mtc1 $at, $f6 ## $f6 = 1.25 -/* 02420 809BF080 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02424 809BF084 46049002 */ mul.s $f0, $f18, $f4 -/* 02428 809BF088 46003381 */ sub.s $f14, $f6, $f0 -/* 0242C 809BF08C 44067000 */ mfc1 $a2, $f14 -/* 02430 809BF090 0C0342A3 */ jal Matrix_Scale -/* 02434 809BF094 00000000 */ nop -.L809BF098: -/* 02438 809BF098 8FBF0014 */ lw $ra, 0x0014($sp) -.L809BF09C: -/* 0243C 809BF09C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 02440 809BF0A0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 02444 809BF0A4 03E00008 */ jr $ra -/* 02448 809BF0A8 00000000 */ nop diff --git a/data/overlays/actors/z_en_bigokuta.data.s b/data/overlays/actors/z_en_bigokuta.data.s deleted file mode 100644 index 3add6103db..0000000000 --- a/data/overlays/actors/z_en_bigokuta.data.s +++ /dev/null @@ -1,37 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_809BF3A0 - .word 0xFFFFFFFF -glabel D_809BF3A4 - .word 0x64FFFFFF -glabel D_809BF3A8 - .word 0x00000000, 0x00000000, 0x00000000 -glabel En_Bigokuta_InitVars - .word 0x00C60500, 0x00000035, 0x015F0000, 0x00000384 -.word EnBigokuta_Init -.word EnBigokuta_Destroy -.word EnBigokuta_Update -.word EnBigokuta_Draw -glabel D_809BF3D4 - .word 0x01000000, 0x20000000, 0x00080000, 0xFFCFFFFF, 0x00000000, 0x09010100, 0x01000000, 0x002DFFE2, 0x004B0064 -glabel D_809BF3F8 - .word 0x00110939, 0x10000000, 0x00000001 -.word D_809BF3D4 -glabel D_809BF408 - .word 0x0C110D39, 0x10010000, 0x01000000, 0x20000000, 0x00080000, 0xFFCFFFE7, 0x00000000, 0x09010100, 0x00320064, 0x0000001E, 0x0000000C, 0x0C110D39, 0x10010000, 0x01000000, 0x20000000, 0x00080000, 0xFFCFFFE7, 0x00000000, 0x09010100, 0x00320064, 0x0000FFE2, 0x0000000C -glabel D_809BF460 - .word 0x04000082, 0x0078C800 -glabel D_809BF468 - .word 0x100200F0, 0x10000000, 0x01000000, 0x00000000, 0x00000000, 0x00000100, 0x00020004, 0x00000000 -glabel D_809BF488 - .word 0xB04C07D0, 0x801F0002, 0xB06CFFFF, 0x89170059, 0x48500021, 0xFFFFFFFF, 0x969696FF, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_bigokuta.reloc.s b/data/overlays/actors/z_en_bigokuta.reloc.s deleted file mode 100644 index 4515107e30..0000000000 --- a/data/overlays/actors/z_en_bigokuta.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_809BF5A0 - .incbin "baserom/ovl_En_Bigokuta", 0x2940, 0x00000300 diff --git a/spec b/spec index 7ea16b1a22..372dcf24bc 100644 --- a/spec +++ b/spec @@ -1893,8 +1893,7 @@ endseg beginseg name "ovl_En_Bigokuta" include "build/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.o" - include "build/data/overlays/actors/z_en_bigokuta.data.o" - include "build/data/overlays/actors/z_en_bigokuta.reloc.o" + include "build/src/overlays/actors/ovl_En_Bigokuta/ovl_En_Bigokuta_reloc.o" endseg beginseg diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c index 8dbad73d8a..53f37b611c 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -1,4 +1,5 @@ #include "z_en_bigokuta.h" +#include "objects/object_bigokuta/object_bigokuta.h" #define FLAGS 0x00000035 @@ -9,14 +10,28 @@ void EnBigokuta_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnBigokuta_Update(Actor* thisx, GlobalContext* globalCtx); void EnBigokuta_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_06000444; -extern UNK_TYPE D_06000A74; -extern UNK_TYPE D_06000D1C; -extern UNK_TYPE D_060014B8; -extern UNK_TYPE D_06001CA4; -extern UNK_TYPE D_06006BC0; +void func_809BD318(EnBigokuta* this); +void func_809BD3E0(EnBigokuta* this); +void func_809BDF34(EnBigokuta* this, GlobalContext* globalCtx); +void func_809BD84C(EnBigokuta* this, GlobalContext* globalCtx); +void func_809BD8DC(EnBigokuta* this, GlobalContext* globalCtx); +void func_809BDAE8(EnBigokuta* this, GlobalContext* globalCtx); +void func_809BDB90(EnBigokuta* this, GlobalContext* globalCtx); +void func_809BDC08(EnBigokuta* this, GlobalContext* globalCtx); +void func_809BE3E4(EnBigokuta* this, GlobalContext* globalCtx); +void func_809BE4A4(EnBigokuta* this, GlobalContext* globalCtx); +void func_809BE518(EnBigokuta* this, GlobalContext* globalCtx); +void func_809BCF68(EnBigokuta* this, GlobalContext* globalCtx); +void func_809BDFC8(EnBigokuta* this, GlobalContext* globalCtx); +void func_809BE26C(EnBigokuta* this, GlobalContext* globalCtx); +void func_809BE180(EnBigokuta* this, GlobalContext* globalCtx); +void func_809BE058(EnBigokuta* this, GlobalContext* globalCtx); +void func_809BD1C8(EnBigokuta* this, GlobalContext* globalCtx); + +static Color_RGBA8 sEffectPrimColor = { 255, 255, 255, 255 }; +static Color_RGBA8 sEffectEnvColor = { 100, 255, 255, 255 }; +static Vec3f sEffectPosAccel = { 0.0f, 0.0f, 0.0f }; -/* const ActorInit En_Bigokuta_InitVars = { ACTOR_EN_BIGOKUTA, ACTORCAT_ENEMY, @@ -29,7 +44,7 @@ const ActorInit En_Bigokuta_InitVars = { (ActorFunc)EnBigokuta_Draw, }; -static ColliderJntSphElementInit D_809BF3D4[1] = { +static ColliderJntSphElementInit sJntSphElementInit[1] = { { { ELEMTYPE_UNK1, @@ -43,7 +58,7 @@ static ColliderJntSphElementInit D_809BF3D4[1] = { }, }; -static ColliderJntSphInit D_809BF3F8 = { +static ColliderJntSphInit sJntSphInit = { { COLTYPE_HIT0, AT_ON | AT_TYPE_ENEMY, @@ -52,104 +67,836 @@ static ColliderJntSphInit D_809BF3F8 = { OC2_TYPE_1, COLSHAPE_JNTSPH, }, - 1, - D_809BF3D4, + ARRAY_COUNT(sJntSphElementInit), + sJntSphElementInit, }; -static ColliderCylinderInit D_809BF408 = { - { - COLTYPE_HARD, - AT_ON | AT_TYPE_ENEMY, - AC_ON | AC_HARD | AC_TYPE_PLAYER, - OC1_ON | OC1_TYPE_ALL, - OC2_TYPE_1, - COLSHAPE_CYLINDER, - }, - { - ELEMTYPE_UNK1, - { 0x20000000, 0x00, 0x08 }, - { 0xFFCFFFE7, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_ON, - OCELEM_ON, - }, - { 50, 100, 0, { 30, 0, 12 } }, +static ColliderCylinderInit sCylinderInit[] = { + { { + COLTYPE_HARD, + AT_ON | AT_TYPE_ENEMY, + AC_ON | AC_HARD | AC_TYPE_PLAYER, + OC1_ON | OC1_TYPE_ALL, + OC2_TYPE_1, + COLSHAPE_CYLINDER, + }, + { + ELEMTYPE_UNK1, + { 0x20000000, 0x00, 0x08 }, + { 0xFFCFFFE7, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_HARD, + BUMP_ON, + OCELEM_ON, + }, + { 50, 100, 0, { 30, 0, 12 } } }, + { { + COLTYPE_HARD, + AT_ON | AT_TYPE_ENEMY, + AC_ON | AC_HARD | AC_TYPE_PLAYER, + OC1_ON | OC1_TYPE_ALL, + OC2_TYPE_1, + COLSHAPE_CYLINDER, + }, + { + ELEMTYPE_UNK1, + { 0x20000000, 0x00, 0x08 }, + { 0xFFCFFFE7, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_HARD, + BUMP_ON, + OCELEM_ON, + }, + { 50, 100, 0, { -30, 0, 12 } } }, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Destroy.s") +static CollisionCheckInfoInit sColChkInfoInit[] = { 4, 130, 120, 200 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCE3C.s") +static DamageTable sDamageTable = { + /* Deku nut */ DMG_ENTRY(0, 0x1), + /* Deku stick */ DMG_ENTRY(2, 0x0), + /* Slingshot */ DMG_ENTRY(0, 0x0), + /* Explosive */ DMG_ENTRY(0, 0xF), + /* Boomerang */ DMG_ENTRY(0, 0x1), + /* Normal arrow */ DMG_ENTRY(0, 0x0), + /* Hammer swing */ DMG_ENTRY(0, 0x0), + /* Hookshot */ DMG_ENTRY(0, 0x0), + /* Kokiri sword */ DMG_ENTRY(1, 0x0), + /* Master sword */ DMG_ENTRY(0, 0x0), + /* Giant's Knife */ DMG_ENTRY(0, 0x0), + /* Fire arrow */ DMG_ENTRY(0, 0x0), + /* Ice arrow */ DMG_ENTRY(0, 0x0), + /* Light arrow */ DMG_ENTRY(0, 0x0), + /* Unk arrow 1 */ DMG_ENTRY(0, 0x0), + /* Unk arrow 2 */ DMG_ENTRY(0, 0x0), + /* Unk arrow 3 */ DMG_ENTRY(0, 0x0), + /* Fire magic */ DMG_ENTRY(0, 0x0), + /* Ice magic */ DMG_ENTRY(0, 0x0), + /* Light magic */ DMG_ENTRY(0, 0x0), + /* Shield */ DMG_ENTRY(0, 0x0), + /* Mirror Ray */ DMG_ENTRY(0, 0x0), + /* Kokiri spin */ DMG_ENTRY(1, 0x0), + /* Giant spin */ DMG_ENTRY(0, 0x0), + /* Master spin */ DMG_ENTRY(0, 0x0), + /* Kokiri jump */ DMG_ENTRY(2, 0x0), + /* Giant jump */ DMG_ENTRY(0, 0x0), + /* Master jump */ DMG_ENTRY(4, 0x0), + /* Unknown 1 */ DMG_ENTRY(0, 0x0), + /* Unblockable */ DMG_ENTRY(0, 0x0), + /* Hammer jump */ DMG_ENTRY(0, 0x0), + /* Unknown 2 */ DMG_ENTRY(0, 0x0), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCEBC.s") +static InitChainEntry sInitChain[] = { + ICHAIN_F32(targetArrowOffset, 2000, ICHAIN_CONTINUE), + ICHAIN_U8(targetMode, 2, ICHAIN_CONTINUE), + ICHAIN_F32(gravity, -1, ICHAIN_CONTINUE), + ICHAIN_S8(naviEnemyId, 0x59, ICHAIN_CONTINUE), + ICHAIN_VEC3F_DIV1000(scale, 33, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCF68.s") +// possibly color data +static s32 sUnused[] = { 0xFFFFFFFF, 0x969696FF }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD1C8.s") +void EnBigokuta_Init(Actor* thisx, GlobalContext* globalCtx) { + EnBigokuta* this = THIS; + s32 i; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD2E4.s") + Actor_ProcessInitChain(&this->actor, sInitChain); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_bigokuta_Skel_006BC0, &object_bigokuta_Anim_0014B8, + this->jointTable, this->morphTable, 20); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD318.s") + Collider_InitJntSph(globalCtx, &this->collider); + Collider_SetJntSph(globalCtx, &this->collider, &this->actor, &sJntSphInit, &this->element); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD370.s") + this->collider.elements->dim.worldSphere.radius = this->collider.elements->dim.modelSphere.radius; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3AC.s") + for (i = 0; i < ARRAY_COUNT(sCylinderInit); i++) { + Collider_InitCylinder(globalCtx, &this->cylinder[i]); + Collider_SetCylinder(globalCtx, &this->cylinder[i], &this->actor, &sCylinderInit[i]); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3E0.s") + CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, sColChkInfoInit); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3F8.s") + this->unk_194 = 1; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD47C.s") + if (this->actor.params == 0) { + Actor_ChangeCategory(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORCAT_PROP); + func_809BD318(this); + } else { + func_809BD3E0(this); + this->unk_19A = 0; + this->unk_196 = 1; + this->actor.home.pos.y = -1025.0f; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD4A4.s") +void EnBigokuta_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnBigokuta* this = THIS; + s32 i; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD524.s") + Collider_DestroyJntSph(globalCtx, &this->collider); + for (i = 0; i < ARRAY_COUNT(this->cylinder); i++) { + Collider_DestroyCylinder(globalCtx, &this->cylinder[i]); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD5E0.s") +void func_809BCE3C(EnBigokuta* this) { + this->actor.world.rot.y = this->actor.shape.rot.y + this->unk_194 * -0x4000; + this->actor.world.pos.x = Math_SinS(this->actor.world.rot.y) * 263.0f + this->actor.home.pos.x; + this->actor.world.pos.z = Math_CosS(this->actor.world.rot.y) * 263.0f + this->actor.home.pos.z; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD658.s") +void func_809BCEBC(EnBigokuta* this, GlobalContext* globalCtx) { + Vec3f pos; + f32 yDistFromHome = this->actor.world.pos.y - this->actor.home.pos.y; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD6B8.s") + pos.x = this->actor.world.pos.x; + pos.y = this->actor.home.pos.y + 3.0f; + pos.z = this->actor.world.pos.z; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD768.s") + if (((globalCtx->gameplayFrames % 7) == 0) && (yDistFromHome <= 0.0f) && (yDistFromHome > -100.0f)) { + EffectSsGRipple_Spawn(globalCtx, &pos, 800, 1300, 0); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD7F0.s") +void func_809BCF68(EnBigokuta* this, GlobalContext* globalCtx) { + Vec3f effectPos; + s16 rot; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD84C.s") + if (globalCtx->gameplayFrames & 1) { + rot = Rand_S16Offset(0x1200, 0xC00) + this->actor.shape.rot.y - this->unk_194 * 0xA00; + } else { + rot = this->actor.shape.rot.y - this->unk_194 * 0xA00 - Rand_S16Offset(0x1200, 0xC00); + } + if (this->actionFunc != func_809BE4A4) { + if (this->actionFunc == func_809BE3E4 || (globalCtx->gameplayFrames & 2)) { + effectPos.x = this->actor.world.pos.x - Math_SinS(rot) * 80.0f; + effectPos.z = this->actor.world.pos.z - Math_CosS(rot) * 80.0f; + effectPos.y = this->actor.home.pos.y + 1.0f; + EffectSsGRipple_Spawn(globalCtx, &effectPos, 100, 500, 0); + } else { + effectPos.x = this->actor.world.pos.x - Math_SinS(rot) * 120.0f; + effectPos.z = this->actor.world.pos.z - Math_CosS(rot) * 120.0f; + effectPos.y = this->actor.home.pos.y + 5.0f; + } + } else { + effectPos.x = this->actor.world.pos.x - Math_SinS(rot) * 50.0f; + effectPos.z = this->actor.world.pos.z - Math_CosS(rot) * 50.0f; + effectPos.y = this->actor.home.pos.y + 1.0f; + EffectSsGRipple_Spawn(globalCtx, &effectPos, 100, 500, 0); + } + EffectSsGSplash_Spawn(globalCtx, &effectPos, NULL, NULL, 1, 800); + if (this->actionFunc != func_809BE4A4) { + func_8002F974(&this->actor, NA_SE_EN_DAIOCTA_SPLASH - SFX_FLAG); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD8DC.s") +void func_809BD1C8(EnBigokuta* this, GlobalContext* globalCtx) { + s32 i; + Vec3f effectPos; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDAE8.s") + effectPos.y = this->actor.world.pos.y; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDB90.s") + for (i = 0; i < 4; i++) { + effectPos.x = ((i >= 2) ? 1 : -1) * 60.0f + this->actor.world.pos.x; + effectPos.z = ((i & 1) ? 1 : -1) * 60.0f + this->actor.world.pos.z; + EffectSsGSplash_Spawn(globalCtx, &effectPos, NULL, NULL, 1, 2000); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDC08.s") + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DAIOCTA_LAND_WATER); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOLON_LAND_BIG); + func_80033E88(&this->actor, globalCtx, 0xA, 8); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDF34.s") +void func_809BD2E4(EnBigokuta* this) { + Actor* parent = this->actor.parent; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BDFC8.s") + if (parent != NULL) { + Math_ScaledStepToS(&parent->world.rot.y, this->unk_19A, 0x10); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE058.s") +void func_809BD318(EnBigokuta* this) { + Animation_PlayLoop(&this->skelAnime, &object_bigokuta_Anim_0014B8); + this->unk_19A = 0; + this->actor.home.pos.y = -1025.0f; + this->unk_196 = 121; + this->actionFunc = func_809BD84C; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE180.s") +void func_809BD370(EnBigokuta* this) { + this->unk_196 = 21; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_STAL_JUMP); + this->actionFunc = func_809BD8DC; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE26C.s") +void func_809BD3AC(EnBigokuta* this) { + this->actor.world.pos.x = this->actor.home.pos.x + 263.0f; + this->unk_196 = 10; + this->actionFunc = func_809BDAE8; + this->actor.world.pos.y = this->actor.home.pos.y; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE3E4.s") +void func_809BD3E0(EnBigokuta* this) { + this->unk_196 = 40; + this->actionFunc = func_809BDB90; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE4A4.s") +void func_809BD3F8(EnBigokuta* this) { + Animation_MorphToLoop(&this->skelAnime, &object_bigokuta_Anim_001CA4, -5.0f); + this->unk_196 = 350; + this->unk_198 = 80; + this->unk_19A = this->unk_194 * -0x200; + func_809BCE3C(this); + this->cylinder[0].base.atFlags |= AT_ON; + this->collider.base.acFlags |= AC_ON; + this->actionFunc = func_809BDC08; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE518.s") +void func_809BD47C(EnBigokuta* this) { + this->unk_196 = 16; + this->collider.base.acFlags &= ~AC_ON; + this->actor.colorFilterTimer = 0; + this->actionFunc = func_809BDF34; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE568.s") +void func_809BD4A4(EnBigokuta* this) { + Animation_MorphToLoop(&this->skelAnime, &object_bigokuta_Anim_0014B8, -5.0f); + this->unk_195 = true; + this->actor.world.rot.x = this->actor.shape.rot.y + 0x8000; + this->unk_19A = this->unk_194 * 0x200; + this->collider.base.acFlags &= ~AC_ON; + this->cylinder[0].base.atFlags |= AT_ON; + this->actionFunc = func_809BDFC8; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE798.s") +void func_809BD524(EnBigokuta* this) { + Animation_MorphToPlayOnce(&this->skelAnime, &object_bigokuta_Anim_000D1C, -5.0f); + this->unk_196 = 80; + this->unk_19A = 0; + this->cylinder[0].base.atFlags |= AT_ON; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DAIOCTA_MAHI); + if (this->collider.elements->info.acHitInfo->toucher.dmgFlags & 1) { + this->unk_195 = true; + this->unk_196 = 20; + } else { + this->unk_195 = false; + this->unk_196 = 80; + } + Actor_SetColorFilter(&this->actor, 0, 255, 0, this->unk_196); + this->actionFunc = func_809BE058; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BE8DC.s") +void func_809BD5E0(EnBigokuta* this) { + Animation_MorphToPlayOnce(&this->skelAnime, &object_bigokuta_Anim_000444, -5.0f); + this->unk_196 = 24; + this->unk_19A = 0; + this->cylinder[0].base.atFlags &= ~AT_ON; + Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 24); + this->actionFunc = func_809BE180; +} +void func_809BD658(EnBigokuta* this) { -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Update.s") + Animation_MorphToPlayOnce(&this->skelAnime, &object_bigokuta_Anim_000A74, -5.0f); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DAIOCTA_DEAD2); + this->unk_196 = 38; + this->unk_198 = 10; + this->actionFunc = func_809BE26C; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BEBBC.s") +void func_809BD6B8(EnBigokuta* this) { + if (!this->unk_195) { + if (Rand_ZeroOne() < 0.5f) { + this->unk_196 = 24; + } else { + this->unk_196 = 28; + } + } else { + if (ABS(this->actor.shape.rot.y - this->actor.yawTowardsPlayer) >= 0x4000) { + this->unk_196 = 4; + } else { + this->unk_196 = 0; + } + } + this->unk_19A = 0; + this->collider.base.acFlags &= ~AC_ON; + this->actionFunc = func_809BE3E4; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s") +void func_809BD768(EnBigokuta* this) { + this->unk_194 = Rand_ZeroOne() < 0.5f ? -1 : 1; + this->unk_19A = 0; + this->actor.flags &= ~1; + this->cylinder[0].base.atFlags &= ~AT_ON; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DAIOCTA_SINK); + this->actionFunc = func_809BE4A4; +} + +void func_809BD7F0(EnBigokuta* this, GlobalContext* globalCtx) { + this->actor.world.rot.y = Actor_WorldYawTowardPoint(globalCtx->actorCtx.actorLists[2].head, &this->actor.home.pos); + this->actor.shape.rot.y = this->actor.world.rot.y + (this->unk_194 * 0x4000); + func_809BCE3C(this); + this->actionFunc = func_809BE518; +} + +void func_809BD84C(EnBigokuta* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + + this->unk_196--; + + if (this->unk_196 == 13 || this->unk_196 == -20) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DAIOCTA_VOICE); + } + if (this->unk_196 == 1) { + func_800F5ACC(0x38); + } + if (this->actor.params == 1) { + func_809BD370(this); + } +} + +void func_809BD8DC(EnBigokuta* this, GlobalContext* globalCtx) { + Vec3f effectPos; + + this->unk_196--; + + if (this->unk_196 >= 0) { + Math_StepToF(&this->actor.world.pos.x, this->actor.home.pos.x + 263.0f, 263.0f / 21); + + if (this->unk_196 < 14) { + this->actor.world.pos.y = sinf(this->unk_196 * (M_PI / 28)) * 200.0f + this->actor.home.pos.y; + } else { + this->actor.world.pos.y = + sinf((this->unk_196 - 7) * (M_PI / 14)) * 130.0f + (this->actor.home.pos.y + 70.0f); + } + if (this->unk_196 == 0) { + effectPos.x = this->actor.world.pos.x + 40.0f; + effectPos.y = this->actor.world.pos.y; + effectPos.z = this->actor.world.pos.z - 70.0f; + EffectSsGSplash_Spawn(globalCtx, &effectPos, NULL, NULL, 1, 2000); + effectPos.x = this->actor.world.pos.x - 40.0f; + EffectSsGSplash_Spawn(globalCtx, &effectPos, NULL, NULL, 1, 2000); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DAIOCTA_LAND_WATER); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOLON_LAND_BIG); + func_800AA000(0.0f, 0xFF, 0x14, 0x96); + } + } else if (this->unk_196 < -1) { + this->actor.world.pos.y = this->actor.home.pos.y - (sinf((this->unk_196 + 1) * (M_PI / 10)) * 20.0f); + if (this->unk_196 == -10) { + func_809BD3AC(this); + } + } +} + +void func_809BDAE8(EnBigokuta* this, GlobalContext* globalCtx) { + if (Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.home.rot.y + 0x4000, 0x400)) { + if (this->unk_196 != 0) { + this->unk_196--; + } + if (this->unk_196 == 0) { + func_809BCE3C(this); + this->actor.home.pos.y = this->actor.world.pos.y; + Actor_ChangeCategory(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORCAT_ENEMY); + this->actor.params = 2; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DAIOCTA_VOICE); + func_809BD3E0(this); + } + } +} + +void func_809BDB90(EnBigokuta* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (this->unk_196 != 0) { + this->unk_196--; + } + if (this->unk_196 == 0) { + if (this->actor.params == 3) { + func_800F5ACC(0x38); + } + func_809BD3F8(this); + } +} + +void func_809BDC08(EnBigokuta* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s16 phi_v0; + s16 pad; + s16 phi_v1; + Vec3f sp28; + + SkelAnime_Update(&this->skelAnime); + if (Animation_OnFrame(&this->skelAnime, 0.0f)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_OCTAROCK_BUBLE); + } + + if (this->unk_196 < 0) { + this->actor.shape.rot.y += this->unk_194 * 0x200; + func_809BCE3C(this); + this->unk_196++; + if (this->unk_196 == 0) { + this->unk_196 = 350; + } + func_809BCF68(this, globalCtx); + return; + } + + phi_v1 = (Actor_WorldDistXZToPoint(&player->actor, &this->actor.home.pos) - 180.0f) * (8.0f / 15); + func_8002DBD0(&this->actor, &sp28, &player->actor.world.pos); + if (fabsf(sp28.x) > 263.0f || ((sp28.z > 0.0f) && !Actor_IsFacingPlayer(&this->actor, 0x1B00) && + !Player_IsFacingActor(&this->actor, 0x2000, globalCtx))) { + phi_v1 -= 0x80; + if (this->unk_196 != 0) { + this->unk_196--; + } + } + + if ((this->actor.xzDistToPlayer < 250.0f) && !Actor_IsFacingPlayer(&this->actor, 0x6000)) { + if (this->unk_198 != 0) { + this->unk_198--; + } + if (this->actor.xzDistToPlayer < 180.0f) { + phi_v1 += 0x20; + } + } else { + this->unk_198 = 80; + } + if (this->actor.colChkInfo.health == 1) { + phi_v1 = (phi_v1 + 0x130) * 1.1f; + } else { + phi_v1 += 0x130; + } + this->actor.shape.rot.y += phi_v1 * this->unk_194; + func_809BCE3C(this); + func_809BCF68(this, globalCtx); + if (this->unk_198 == 0) { + func_809BD768(this); + } else if (this->unk_196 == 0) { + func_809BD4A4(this); + } else if (this->unk_195) { + phi_v0 = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; + if (phi_v0 < 0) { + phi_v0 = -phi_v0; + } + if (phi_v0 < 0x4100 && phi_v0 > 0x3F00) { + if (Rand_ZeroOne() < 0.6f) { + this->unk_196 = 0; + func_809BD4A4(this); + } + this->unk_195 = false; + } + } +} + +void func_809BDF34(EnBigokuta* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (this->unk_196 != 0) { + this->unk_196--; + } + this->actor.world.pos.y = (sinf(this->unk_196 * (M_PI / 16)) * 100.0f) + this->actor.home.pos.y; + if (this->unk_196 == 0) { + func_809BD1C8(this, globalCtx); + func_809BD3F8(this); + } +} + +void func_809BDFC8(EnBigokuta* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (this->unk_196 != 0) { + this->unk_196--; + } + if (this->unk_196 == 20) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DAIOCTA_VOICE); + } + if ((this->unk_196 == 0) && Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.world.rot.x, 0x800)) { + this->unk_194 = -this->unk_194; + func_809BD3F8(this); + } +} + +void func_809BE058(EnBigokuta* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 speedXZ; + + if (this->unk_196 != 0) { + this->unk_196--; + } + + SkelAnime_Update(&this->skelAnime); + + if ((this->collider.base.ocFlags1 & OC1_HIT) || (this->cylinder[0].base.ocFlags1 & OC1_HIT) || + (this->cylinder[1].base.ocFlags1 & OC1_HIT)) { + speedXZ = CLAMP_MIN(player->actor.speedXZ, 1.0f); + if (!(this->collider.base.ocFlags1 & OC1_HIT)) { + this->cylinder[0].base.ocFlags1 &= ~OC1_HIT; + this->cylinder[1].base.ocFlags1 &= ~OC1_HIT; + speedXZ *= -1.0f; + } + player->actor.world.pos.x -= speedXZ * Math_SinS(this->actor.shape.rot.y); + player->actor.world.pos.z -= speedXZ * Math_CosS(this->actor.shape.rot.y); + } + if (this->unk_196 == 0) { + func_809BD6B8(this); + } +} + +void func_809BE180(EnBigokuta* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (this->unk_196 != 0) { + this->unk_196--; + } + if (this->unk_196 == 0) { + if (this->actor.colChkInfo.health != 0) { + func_809BD4A4(this); + } else { + func_809BD658(this); + } + } else if (this->unk_196 >= 8) { + this->actor.shape.rot.y += this->unk_194 * 0x200; + this->actor.world.pos.y = sinf((this->unk_196 - 8) * (M_PI / 16)) * 100.0f + this->actor.home.pos.y; + func_809BCE3C(this); + if (this->unk_196 == 8) { + func_809BD1C8(this, globalCtx); + } + } +} +void func_809BE26C(EnBigokuta* this, GlobalContext* globalCtx) { + Vec3f effectPos; + + if (this->unk_196 != 0) { + if (this->unk_196 != 0) { + this->unk_196--; + } + if (this->unk_196 >= 10) { + this->actor.shape.rot.y += 0x2000; + } + } else if (SkelAnime_Update(&this->skelAnime)) { + if (this->unk_198 != 0) { + this->unk_198--; + } + if (this->unk_198 == 6) { + effectPos.x = this->actor.world.pos.x; + effectPos.y = this->actor.world.pos.y + 150.0f; + effectPos.z = this->actor.world.pos.z; + func_8002829C(globalCtx, &effectPos, &sEffectPosAccel, &sEffectPosAccel, &sEffectPrimColor, + &sEffectEnvColor, 1200, 20); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_OCTAROCK_DEAD2); + } + if (this->unk_198 == 0 && Math_StepToF(&this->actor.scale.y, 0.0f, 0.001f)) { + Flags_SetClear(globalCtx, this->actor.room); + Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_DUNGEON0); + func_8005ACFC(globalCtx->cameraPtrs[MAIN_CAM], 4); + Audio_PlaySoundAtPosition(globalCtx, &this->actor.world.pos, 50, NA_SE_EN_OCTAROCK_BUBLE); + Item_DropCollectibleRandom(globalCtx, &this->actor, &this->actor.world.pos, 0xB0); + Actor_Kill(&this->actor); + } + } +} + +void func_809BE3E4(EnBigokuta* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + + if (this->unk_196 != 0) { + if (this->unk_196 != 0) { + this->unk_196--; + } + this->actor.shape.rot.y += 0x2000; + } + if (this->unk_196 == 0) { + if ((s16)(this->actor.shape.rot.y - this->actor.world.rot.y) > 0) { + this->unk_194 = 1; + } else { + this->unk_194 = -1; + } + + func_809BD3F8(this); + if (!this->unk_195) { + this->unk_196 = -40; + } + } + func_809BCF68(this, globalCtx); +} + +void func_809BE4A4(EnBigokuta* this, GlobalContext* globalCtx) { + this->actor.world.pos.y -= 10.0f; + this->actor.shape.rot.y += 0x2000; + if (this->actor.world.pos.y < (this->actor.home.pos.y + -200.0f)) { + func_809BD7F0(this, globalCtx); + } + func_809BCF68(this, globalCtx); +} + +void func_809BE518(EnBigokuta* this, GlobalContext* globalCtx) { + if (Math_StepToF(&this->actor.world.pos.y, this->actor.home.pos.y, 10.0f)) { + this->actor.flags |= 1; + func_809BD3F8(this); + } +} + +void func_809BE568(EnBigokuta* this) { + s32 i; + f32 sin = Math_SinS(this->actor.shape.rot.y); + f32 cos = Math_CosS(this->actor.shape.rot.y); + + this->collider.elements->dim.worldSphere.center.x = + (this->collider.elements->dim.modelSphere.center.z * sin) + + (this->actor.world.pos.x + (this->collider.elements->dim.modelSphere.center.x * cos)); + this->collider.elements->dim.worldSphere.center.z = + (this->actor.world.pos.z + (this->collider.elements->dim.modelSphere.center.z * cos)) - + (this->collider.elements->dim.modelSphere.center.x * sin); + this->collider.elements->dim.worldSphere.center.y = + this->collider.elements->dim.modelSphere.center.y + this->actor.world.pos.y; + + for (i = 0; i < ARRAY_COUNT(this->cylinder); i++) { + this->cylinder[i].dim.pos.x = + this->actor.world.pos.x + sCylinderInit[i].dim.pos.z * sin + sCylinderInit[i].dim.pos.x * cos; + this->cylinder[i].dim.pos.z = + this->actor.world.pos.z + sCylinderInit[i].dim.pos.z * cos - sCylinderInit[i].dim.pos.x * sin; + this->cylinder[i].dim.pos.y = this->actor.world.pos.y; + } +} + +void func_809BE798(EnBigokuta* this, GlobalContext* globalCtx) { + s16 effectRot; + s16 yawDiff; + + if ((this->cylinder[0].base.atFlags & AT_HIT) || (this->cylinder[1].base.atFlags & AT_HIT) || + (this->collider.base.atFlags & AT_HIT)) { + this->cylinder[0].base.atFlags &= ~AT_HIT; + this->cylinder[1].base.atFlags &= ~AT_HIT; + this->collider.base.atFlags &= ~AT_HIT; + yawDiff = this->actor.yawTowardsPlayer - this->actor.world.rot.y; + if (yawDiff > 0x4000) { + effectRot = 0x4000; + } else if (yawDiff > 0) { + effectRot = 0x6000; + } else if (yawDiff < -0x4000) { + effectRot = -0x4000; + } else { + effectRot = -0x6000; + } + func_8002F71C(globalCtx, &this->actor, 10.0f, this->actor.world.rot.y + effectRot, 5.0f); + if (this->actionFunc == func_809BDC08) { + func_809BD4A4(this); + this->unk_196 = 40; + } else if (this->actionFunc == func_809BE3E4) { + if ((effectRot * this->unk_194) > 0) { + this->unk_194 = 0 - this->unk_194; + this->unk_196 += 4; + } + } + } +} + +void EnBigokuta_UpdateDamage(EnBigokuta* this, GlobalContext* globalCtx) { + if (this->collider.base.acFlags & AC_HIT) { + this->collider.base.acFlags &= ~AC_HIT; + if (this->actor.colChkInfo.damageEffect != 0 || this->actor.colChkInfo.damage != 0) { + if (this->actor.colChkInfo.damageEffect == 1) { + if (this->actionFunc != func_809BE058) { + func_809BD524(this); + } + } else if (this->actor.colChkInfo.damageEffect == 0xF) { + func_809BD47C(this); + } else if (!Actor_IsFacingPlayer(&this->actor, 0x4000)) { + if (Actor_ApplyDamage(&this->actor) == 0) { // Dead + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DAIOCTA_DEAD); + Enemy_StartFinishingBlow(globalCtx, &this->actor); + } else { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DAIOCTA_DAMAGE); + } + func_809BD5E0(this); + } + } + } +} + +void EnBigokuta_Update(Actor* thisx, GlobalContext* globalCtx2) { + EnBigokuta* this = THIS; + s32 i; + GlobalContext* globalCtx = globalCtx2; + + func_809BE798(this, globalCtx); + EnBigokuta_UpdateDamage(this, globalCtx); + this->actionFunc(this, globalCtx); + func_809BD2E4(this); + func_809BE568(this); + Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_TAKO); + func_8005AD1C(globalCtx->cameraPtrs[MAIN_CAM], 4); + + if (this->cylinder[0].base.atFlags & AT_ON) { + if (this->actionFunc != func_809BE058) { + for (i = 0; i < ARRAY_COUNT(this->cylinder); i++) { + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->cylinder[i].base); + } + this->actor.flags |= 0x1000000; + } else { + for (i = 0; i < ARRAY_COUNT(this->cylinder); i++) { + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->cylinder[i].base); + } + } + for (i = 0; i < ARRAY_COUNT(this->cylinder); i++) { + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->cylinder[i].base); + } + if (this->collider.base.acFlags & AC_ON) { + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } + } + if (this->collider.base.acFlags & AC_ON) { + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } else { + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } + Actor_SetFocus(&this->actor, this->actor.scale.y * 25.0f * 100.0f); + func_809BCEBC(this, globalCtx); +} + +s32 EnBigokuta_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + void* thisx) { + EnBigokuta* this = THIS; + u8 intensity; + f32 temp_f0; + s32 temp_hi; + + if (limbIndex == 15) { + if (this->actionFunc == func_809BE058 || this->actionFunc == func_809BE180) { + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_bigokuta.c", 1914); + + if (this->actionFunc == func_809BE058) { + temp_hi = this->unk_196 % 12; + if (temp_hi >= 8) { + temp_f0 = (12 - temp_hi) * (M_PI / 8); + } else { + temp_f0 = temp_hi * (M_PI / 16); + } + } else { + temp_hi = this->unk_196 % 6; + if (temp_hi >= 4) { + temp_f0 = (6 - temp_hi) * (M_PI / 4); + } else { + temp_f0 = temp_hi * (M_PI / 8); + } + } + + temp_f0 = sinf(temp_f0) * 125.0f + 130.0f; + gDPPipeSync(POLY_OPA_DISP++); + + gDPSetEnvColor(POLY_OPA_DISP++, temp_f0, temp_f0, temp_f0, 255); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_bigokuta.c", 1945); + } + } else if (limbIndex == 10) { + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_bigokuta.c", 1950); + if (this->actionFunc == func_809BE26C) { + intensity = this->unk_196 * (255.0f / 38); + } else { + intensity = 255; + } + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, intensity, intensity, intensity, intensity); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_bigokuta.c", 1972); + } else if (limbIndex == 17 && this->actionFunc == func_809BE26C) { + if (this->unk_198 < 5) { + Matrix_Scale((this->unk_198 * 0.2f * 0.25f) + 1.0f, 1.0f, 1.0f, MTXMODE_APPLY); + } else if (this->unk_198 < 8) { + temp_f0 = (this->unk_198 - 5) * (1.0f / 12); + Matrix_Scale(1.25f - temp_f0, 1.0f + temp_f0, 1.0f + temp_f0, MTXMODE_APPLY); + } else { + temp_f0 = ((this->unk_198 - 8) * 0.125f); + Matrix_Scale(1.0f, 1.25f - temp_f0, 1.25f - temp_f0, MTXMODE_APPLY); + } + } + return false; +} + +void EnBigokuta_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnBigokuta* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_bigokuta.c", 2017); + + if ((this->actionFunc != func_809BE26C) || (this->unk_196 != 0) || (this->unk_198 != 0)) { + func_80093D18(globalCtx->state.gfxCtx); + gSPSegment(POLY_OPA_DISP++, 0x0C, &D_80116280[2]); + gDPSetEnvColor(POLY_OPA_DISP++, 255, 255, 255, 255); + if (this->unk_196 & 1) { + if ((this->actionFunc == func_809BE180 && this->unk_196 >= 8) || + (this->actionFunc == func_809BE26C && this->unk_196 >= 10)) { + f32 rotX = Rand_ZeroOne() * (M_PI * 2.0f); + f32 rotY = Rand_ZeroOne() * (M_PI * 2.0f); + + Matrix_RotateY(rotY, MTXMODE_APPLY); + Matrix_RotateX(rotX, MTXMODE_APPLY); + Matrix_Scale(0.78999996f, 1.3f, 0.78999996f, MTXMODE_APPLY); + Matrix_RotateX(-rotX, MTXMODE_APPLY); + Matrix_RotateY(-rotY, MTXMODE_APPLY); + } + } + SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, + this->skelAnime.dListCount, EnBigokuta_OverrideLimbDraw, NULL, this); + } else { + func_80093D84(globalCtx->state.gfxCtx); + gSPSegment(POLY_XLU_DISP++, 0x0C, D_80116280); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, (this->actor.scale.y * 7727.273f)); + POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, + this->skelAnime.dListCount, NULL, NULL, NULL, POLY_XLU_DISP); + } + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_bigokuta.c", 2076); +} diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h index a35552521e..f807e75bf5 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h @@ -6,9 +6,22 @@ struct EnBigokuta; +typedef void (*EnBigokutaActionFunc)(struct EnBigokuta*, GlobalContext*); + typedef struct EnBigokuta { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x238]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ EnBigokutaActionFunc actionFunc; + /* 0x0194 */ s8 unk_194; + /* 0x0195 */ u8 unk_195; + /* 0x0196 */ s16 unk_196; + /* 0x0198 */ s16 unk_198; + /* 0x019A */ s16 unk_19A; + /* 0x019C */ Vec3s jointTable[20]; + /* 0x0214 */ Vec3s morphTable[20]; + /* 0x028C */ ColliderJntSph collider; + /* 0x02AC */ ColliderJntSphElement element; + /* 0x02EC */ ColliderCylinder cylinder[2]; } EnBigokuta; // size = 0x0384 extern const ActorInit En_Bigokuta_InitVars;