From 33ce2c977b9350ce936a700c9c4b9f7a5ec29c6b Mon Sep 17 00:00:00 2001 From: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Date: Wed, 3 Feb 2021 00:29:40 +0000 Subject: [PATCH] BgDyYoseizo OK and documented (#634) * OK, data imported * naming * spec, more naming * more naming, in EnDyExtra too * more naming * deleat asm * change one function name * addressed review comments * Actor changes * Address review comments * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> --- .../ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Destroy.s | 4 - .../ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Init.s | 89 -- .../ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Update.s | 165 --- .../actors/ovl_Bg_Dy_Yoseizo/func_80872960.s | 221 ---- .../actors/ovl_Bg_Dy_Yoseizo/func_80872C58.s | 62 - .../actors/ovl_Bg_Dy_Yoseizo/func_80872D20.s | 57 - .../actors/ovl_Bg_Dy_Yoseizo/func_80872DE4.s | 346 ------ .../actors/ovl_Bg_Dy_Yoseizo/func_8087328C.s | 69 -- .../actors/ovl_Bg_Dy_Yoseizo/func_80873380.s | 103 -- .../actors/ovl_Bg_Dy_Yoseizo/func_808734DC.s | 53 - .../actors/ovl_Bg_Dy_Yoseizo/func_8087358C.s | 77 -- .../actors/ovl_Bg_Dy_Yoseizo/func_808736A4.s | 64 - .../actors/ovl_Bg_Dy_Yoseizo/func_80873780.s | 66 - .../actors/ovl_Bg_Dy_Yoseizo/func_80873868.s | 209 ---- .../actors/ovl_Bg_Dy_Yoseizo/func_80873B3C.s | 58 - .../actors/ovl_Bg_Dy_Yoseizo/func_80873C14.s | 73 -- .../actors/ovl_Bg_Dy_Yoseizo/func_80873D14.s | 74 -- .../actors/ovl_Bg_Dy_Yoseizo/func_80873E04.s | 50 - .../actors/ovl_Bg_Dy_Yoseizo/func_80873EA4.s | 87 -- .../actors/ovl_Bg_Dy_Yoseizo/func_80873FD8.s | 234 ---- .../actors/ovl_Bg_Dy_Yoseizo/func_80874304.s | 451 ------- .../actors/ovl_Bg_Dy_Yoseizo/func_80874B7C.s | 28 - .../actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s | 123 -- .../actors/ovl_Bg_Dy_Yoseizo/func_80874D9C.s | 78 -- .../actors/ovl_Bg_Dy_Yoseizo/func_80874EAC.s | 219 ---- .../actors/ovl_Bg_Dy_Yoseizo/func_808751A0.s | 186 --- data/overlays/actors/z_bg_dy_yoseizo.data.s | 35 - data/overlays/actors/z_bg_dy_yoseizo.reloc.s | 13 - spec | 3 +- .../ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c | 1061 +++++++++++++++-- .../ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h | 57 +- .../actors/ovl_En_Dy_Extra/z_en_dy_extra.c | 36 +- .../actors/ovl_En_Dy_Extra/z_en_dy_extra.h | 8 +- 33 files changed, 1069 insertions(+), 3390 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872960.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872C58.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872D20.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872DE4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087328C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873380.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808734DC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087358C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808736A4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873780.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873868.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873B3C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873C14.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873D14.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873E04.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873EA4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873FD8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874304.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874B7C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874D9C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874EAC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808751A0.s delete mode 100644 data/overlays/actors/z_bg_dy_yoseizo.data.s delete mode 100644 data/overlays/actors/z_bg_dy_yoseizo.reloc.s diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Destroy.s deleted file mode 100644 index 639427f7cc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Destroy.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel BgDyYoseizo_Destroy -/* 00124 80872954 AFA40000 */ sw $a0, 0x0000($sp) -/* 00128 80872958 03E00008 */ jr $ra -/* 0012C 8087295C AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Init.s deleted file mode 100644 index e3b81d9bcd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Init.s +++ /dev/null @@ -1,89 +0,0 @@ -.rdata -glabel D_808754E0 - .asciz "\x1b[32m☆☆☆☆☆ 大妖精の泉 ☆☆☆☆☆ %d\n\x1b[m" - .balign 4 - -glabel D_80875510 - .asciz "\x1b[32m☆☆☆☆☆ 石妖精の泉 ☆☆☆☆☆ %d\n\x1b[m" - .balign 4 - -.text -glabel BgDyYoseizo_Init -/* 00000 80872830 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00004 80872834 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00008 80872838 AFBF002C */ sw $ra, 0x002C($sp) -/* 0000C 8087283C AFB10028 */ sw $s1, 0x0028($sp) -/* 00010 80872840 AFB00024 */ sw $s0, 0x0024($sp) -/* 00014 80872844 00A11021 */ addu $v0, $a1, $at -/* 00018 80872848 904E1DEA */ lbu $t6, 0x1DEA($v0) ## 00001DEA -/* 0001C 8087284C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00020 80872850 44812000 */ mtc1 $at, $f4 ## $f4 = 40.00 -/* 00024 80872854 A48E02EC */ sh $t6, 0x02EC($a0) ## 000002EC -/* 00028 80872858 848F02EC */ lh $t7, 0x02EC($a0) ## 000002EC -/* 0002C 8087285C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00030 80872860 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00034 80872864 05E30003 */ bgezl $t7, .L80872874 -/* 00038 80872868 C6000028 */ lwc1 $f0, 0x0028($s0) ## 00000028 -/* 0003C 8087286C A48002EC */ sh $zero, 0x02EC($a0) ## 000002EC -/* 00040 80872870 C6000028 */ lwc1 $f0, 0x0028($s0) ## 00000028 -.L80872874: -/* 00044 80872874 8E190024 */ lw $t9, 0x0024($s0) ## 00000024 -/* 00048 80872878 8E180028 */ lw $t8, 0x0028($s0) ## 00000028 -/* 0004C 8087287C 46040180 */ add.s $f6, $f0, $f4 -/* 00050 80872880 AE190038 */ sw $t9, 0x0038($s0) ## 00000038 -/* 00054 80872884 8E19002C */ lw $t9, 0x002C($s0) ## 0000002C -/* 00058 80872888 E6000310 */ swc1 $f0, 0x0310($s0) ## 00000310 -/* 0005C 8087288C E606030C */ swc1 $f6, 0x030C($s0) ## 0000030C -/* 00060 80872890 AE18003C */ sw $t8, 0x003C($s0) ## 0000003C -/* 00064 80872894 AE190040 */ sw $t9, 0x0040($s0) ## 00000040 -/* 00068 80872898 862800A4 */ lh $t0, 0x00A4($s1) ## 000000A4 -/* 0006C 8087289C 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 00070 808728A0 3C048087 */ lui $a0, %hi(D_80875510) ## $a0 = 80870000 -/* 00074 808728A4 15010014 */ bne $t0, $at, .L808728F8 -/* 00078 808728A8 24845510 */ addiu $a0, $a0, %lo(D_80875510) ## $a0 = 80875510 -/* 0007C 808728AC 3C048087 */ lui $a0, %hi(D_808754E0) ## $a0 = 80870000 -/* 00080 808728B0 248454E0 */ addiu $a0, $a0, %lo(D_808754E0) ## $a0 = 808754E0 -/* 00084 808728B4 0C00084C */ jal osSyncPrintf - -/* 00088 808728B8 90451DEA */ lbu $a1, 0x1DEA($v0) ## 00001DEA -/* 0008C 808728BC 3C060602 */ lui $a2, %hi(D_0601C450) ## $a2 = 06020000 -/* 00090 808728C0 3C070601 */ lui $a3, %hi(D_06008698) ## $a3 = 06010000 -/* 00094 808728C4 26090194 */ addiu $t1, $s0, 0x0194 ## $t1 = 00000194 -/* 00098 808728C8 260A023C */ addiu $t2, $s0, 0x023C ## $t2 = 0000023C -/* 0009C 808728CC 240B001C */ addiu $t3, $zero, 0x001C ## $t3 = 0000001C -/* 000A0 808728D0 AFAB0018 */ sw $t3, 0x0018($sp) -/* 000A4 808728D4 AFAA0014 */ sw $t2, 0x0014($sp) -/* 000A8 808728D8 AFA90010 */ sw $t1, 0x0010($sp) -/* 000AC 808728DC 24E78698 */ addiu $a3, $a3, %lo(D_06008698) ## $a3 = 06008698 -/* 000B0 808728E0 24C6C450 */ addiu $a2, $a2, %lo(D_0601C450) ## $a2 = 0601C450 -/* 000B4 808728E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000B8 808728E8 0C0291BE */ jal SkelAnime_InitFlex -/* 000BC 808728EC 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 000C0 808728F0 10000010 */ beq $zero, $zero, .L80872934 -/* 000C4 808728F4 00000000 */ nop -.L808728F8: -/* 000C8 808728F8 0C00084C */ jal osSyncPrintf - -/* 000CC 808728FC 90451DEA */ lbu $a1, 0x1DEA($v0) ## 00001DEA -/* 000D0 80872900 3C060602 */ lui $a2, %hi(D_0601C450) ## $a2 = 06020000 -/* 000D4 80872904 3C070600 */ lui $a3, %hi(D_060031C0) ## $a3 = 06000000 -/* 000D8 80872908 260C0194 */ addiu $t4, $s0, 0x0194 ## $t4 = 00000194 -/* 000DC 8087290C 260D023C */ addiu $t5, $s0, 0x023C ## $t5 = 0000023C -/* 000E0 80872910 240E001C */ addiu $t6, $zero, 0x001C ## $t6 = 0000001C -/* 000E4 80872914 AFAE0018 */ sw $t6, 0x0018($sp) -/* 000E8 80872918 AFAD0014 */ sw $t5, 0x0014($sp) -/* 000EC 8087291C AFAC0010 */ sw $t4, 0x0010($sp) -/* 000F0 80872920 24E731C0 */ addiu $a3, $a3, %lo(D_060031C0) ## $a3 = 060031C0 -/* 000F4 80872924 24C6C450 */ addiu $a2, $a2, %lo(D_0601C450) ## $a2 = 0601C450 -/* 000F8 80872928 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000FC 8087292C 0C0291BE */ jal SkelAnime_InitFlex -/* 00100 80872930 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -.L80872934: -/* 00104 80872934 3C0F8087 */ lui $t7, %hi(func_80872D20) ## $t7 = 80870000 -/* 00108 80872938 25EF2D20 */ addiu $t7, $t7, %lo(func_80872D20) ## $t7 = 80872D20 -/* 0010C 8087293C AE0F014C */ sw $t7, 0x014C($s0) ## 0000014C -/* 00110 80872940 8FBF002C */ lw $ra, 0x002C($sp) -/* 00114 80872944 8FB10028 */ lw $s1, 0x0028($sp) -/* 00118 80872948 8FB00024 */ lw $s0, 0x0024($sp) -/* 0011C 8087294C 03E00008 */ jr $ra -/* 00120 80872950 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Update.s deleted file mode 100644 index a4f2832e8d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Update.s +++ /dev/null @@ -1,165 +0,0 @@ -.late_rodata -glabel D_808756B4 - .float 7500.0 - -.text -glabel BgDyYoseizo_Update -/* 02120 80874950 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 02124 80874954 AFBF002C */ sw $ra, 0x002C($sp) -/* 02128 80874958 AFB10028 */ sw $s1, 0x0028($sp) -/* 0212C 8087495C AFB00024 */ sw $s0, 0x0024($sp) -/* 02130 80874960 848E02F0 */ lh $t6, 0x02F0($a0) ## 000002F0 -/* 02134 80874964 848202E8 */ lh $v0, 0x02E8($a0) ## 000002E8 -/* 02138 80874968 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0213C 8087496C 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 02140 80874970 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02144 80874974 10400003 */ beq $v0, $zero, .L80874984 -/* 02148 80874978 A48F02F0 */ sh $t7, 0x02F0($a0) ## 000002F0 -/* 0214C 8087497C 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 02150 80874980 A49802E8 */ sh $t8, 0x02E8($a0) ## 000002E8 -.L80874984: -/* 02154 80874984 860202F8 */ lh $v0, 0x02F8($s0) ## 000002F8 -/* 02158 80874988 10400002 */ beq $v0, $zero, .L80874994 -/* 0215C 8087498C 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF -/* 02160 80874990 A61902F8 */ sh $t9, 0x02F8($s0) ## 000002F8 -.L80874994: -/* 02164 80874994 860202FA */ lh $v0, 0x02FA($s0) ## 000002FA -/* 02168 80874998 10400002 */ beq $v0, $zero, .L808749A4 -/* 0216C 8087499C 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF -/* 02170 808749A0 A60802FA */ sh $t0, 0x02FA($s0) ## 000002FA -.L808749A4: -/* 02174 808749A4 8E19014C */ lw $t9, 0x014C($s0) ## 0000014C -/* 02178 808749A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0217C 808749AC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02180 808749B0 0320F809 */ jalr $ra, $t9 -/* 02184 808749B4 00000000 */ nop -/* 02188 808749B8 92291D6C */ lbu $t1, 0x1D6C($s1) ## 00001D6C -/* 0218C 808749BC 51200031 */ beql $t1, $zero, .L80874A84 -/* 02190 808749C0 860B02F8 */ lh $t3, 0x02F8($s0) ## 000002F8 -/* 02194 808749C4 862A00A4 */ lh $t2, 0x00A4($s1) ## 000000A4 -/* 02198 808749C8 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 0219C 808749CC 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 021A0 808749D0 15410011 */ bne $t2, $at, .L80874A18 -/* 021A4 808749D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021A8 808749D8 96221D74 */ lhu $v0, 0x1D74($s1) ## 00001D74 -/* 021AC 808749DC 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 -/* 021B0 808749E0 10410007 */ beq $v0, $at, .L80874A00 -/* 021B4 808749E4 24010123 */ addiu $at, $zero, 0x0123 ## $at = 00000123 -/* 021B8 808749E8 10410005 */ beq $v0, $at, .L80874A00 -/* 021BC 808749EC 240101AA */ addiu $at, $zero, 0x01AA ## $at = 000001AA -/* 021C0 808749F0 10410003 */ beq $v0, $at, .L80874A00 -/* 021C4 808749F4 24010353 */ addiu $at, $zero, 0x0353 ## $at = 00000353 -/* 021C8 808749F8 54410003 */ bnel $v0, $at, .L80874A08 -/* 021CC 808749FC 24010065 */ addiu $at, $zero, 0x0065 ## $at = 00000065 -.L80874A00: -/* 021D0 80874A00 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 021D4 80874A04 24010065 */ addiu $at, $zero, 0x0065 ## $at = 00000065 -.L80874A08: -/* 021D8 80874A08 54410013 */ bnel $v0, $at, .L80874A58 -/* 021DC 80874A0C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 021E0 80874A10 10000010 */ beq $zero, $zero, .L80874A54 -/* 021E4 80874A14 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -.L80874A18: -/* 021E8 80874A18 96221D74 */ lhu $v0, 0x1D74($s1) ## 00001D74 -/* 021EC 80874A1C 24010023 */ addiu $at, $zero, 0x0023 ## $at = 00000023 -/* 021F0 80874A20 10410007 */ beq $v0, $at, .L80874A40 -/* 021F4 80874A24 240100B5 */ addiu $at, $zero, 0x00B5 ## $at = 000000B5 -/* 021F8 80874A28 10410005 */ beq $v0, $at, .L80874A40 -/* 021FC 80874A2C 240101CE */ addiu $at, $zero, 0x01CE ## $at = 000001CE -/* 02200 80874A30 10410003 */ beq $v0, $at, .L80874A40 -/* 02204 80874A34 2401031B */ addiu $at, $zero, 0x031B ## $at = 0000031B -/* 02208 80874A38 54410003 */ bnel $v0, $at, .L80874A48 -/* 0220C 80874A3C 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A -.L80874A40: -/* 02210 80874A40 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 02214 80874A44 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A -.L80874A48: -/* 02218 80874A48 54410003 */ bnel $v0, $at, .L80874A58 -/* 0221C 80874A4C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02220 80874A50 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -.L80874A54: -/* 02224 80874A54 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -.L80874A58: -/* 02228 80874A58 14610004 */ bne $v1, $at, .L80874A6C -/* 0222C 80874A5C 24056859 */ addiu $a1, $zero, 0x6859 ## $a1 = 00006859 -/* 02230 80874A60 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02234 80874A64 AFA30034 */ sw $v1, 0x0034($sp) -/* 02238 80874A68 8FA30034 */ lw $v1, 0x0034($sp) -.L80874A6C: -/* 0223C 80874A6C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02240 80874A70 14610003 */ bne $v1, $at, .L80874A80 -/* 02244 80874A74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02248 80874A78 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0224C 80874A7C 24056858 */ addiu $a1, $zero, 0x6858 ## $a1 = 00006858 -.L80874A80: -/* 02250 80874A80 860B02F8 */ lh $t3, 0x02F8($s0) ## 000002F8 -.L80874A84: -/* 02254 80874A84 1560001B */ bne $t3, $zero, .L80874AF4 -/* 02258 80874A88 00000000 */ nop -/* 0225C 80874A8C 8E0D014C */ lw $t5, 0x014C($s0) ## 0000014C -/* 02260 80874A90 3C0C8087 */ lui $t4, %hi(func_80873868) ## $t4 = 80870000 -/* 02264 80874A94 258C3868 */ addiu $t4, $t4, %lo(func_80873868) ## $t4 = 80873868 -/* 02268 80874A98 118D0016 */ beq $t4, $t5, .L80874AF4 -/* 0226C 80874A9C 00000000 */ nop -/* 02270 80874AA0 860E02F2 */ lh $t6, 0x02F2($s0) ## 000002F2 -/* 02274 80874AA4 861802F4 */ lh $t8, 0x02F4($s0) ## 000002F4 -/* 02278 80874AA8 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 0227C 80874AAC A60F02F2 */ sh $t7, 0x02F2($s0) ## 000002F2 -/* 02280 80874AB0 861902F2 */ lh $t9, 0x02F2($s0) ## 000002F2 -/* 02284 80874AB4 27080001 */ addiu $t0, $t8, 0x0001 ## $t0 = 00000001 -/* 02288 80874AB8 A60802F4 */ sh $t0, 0x02F4($s0) ## 000002F4 -/* 0228C 80874ABC 2B210003 */ slti $at, $t9, 0x0003 -/* 02290 80874AC0 1420000C */ bne $at, $zero, .L80874AF4 -/* 02294 80874AC4 00000000 */ nop -/* 02298 80874AC8 A60002F4 */ sh $zero, 0x02F4($s0) ## 000002F4 -/* 0229C 80874ACC 860902F4 */ lh $t1, 0x02F4($s0) ## 000002F4 -/* 022A0 80874AD0 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 022A4 80874AD4 44816000 */ mtc1 $at, $f12 ## $f12 = 60.00 -/* 022A8 80874AD8 0C00CFBE */ jal Rand_ZeroFloat - -/* 022AC 80874ADC A60902F2 */ sh $t1, 0x02F2($s0) ## 000002F2 -/* 022B0 80874AE0 4600010D */ trunc.w.s $f4, $f0 -/* 022B4 80874AE4 440D2000 */ mfc1 $t5, $f4 -/* 022B8 80874AE8 00000000 */ nop -/* 022BC 80874AEC 25AE0014 */ addiu $t6, $t5, 0x0014 ## $t6 = 00000014 -/* 022C0 80874AF0 A60E02F8 */ sh $t6, 0x02F8($s0) ## 000002F8 -.L80874AF4: -/* 022C4 80874AF4 0C00B638 */ jal Actor_MoveForward - -/* 022C8 80874AF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022CC 80874AFC 3C018087 */ lui $at, %hi(D_808756B4) ## $at = 80870000 -/* 022D0 80874B00 C42856B4 */ lwc1 $f8, %lo(D_808756B4)($at) -/* 022D4 80874B04 C6060308 */ lwc1 $f6, 0x0308($s0) ## 00000308 -/* 022D8 80874B08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022DC 80874B0C 46083002 */ mul.s $f0, $f6, $f8 -/* 022E0 80874B10 44050000 */ mfc1 $a1, $f0 -/* 022E4 80874B14 0C00B56E */ jal Actor_SetFocus - -/* 022E8 80874B18 E6000328 */ swc1 $f0, 0x0328($s0) ## 00000328 -/* 022EC 80874B1C C60A0328 */ lwc1 $f10, 0x0328($s0) ## 00000328 -/* 022F0 80874B20 8E180038 */ lw $t8, 0x0038($s0) ## 00000038 -/* 022F4 80874B24 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 022F8 80874B28 E60A003C */ swc1 $f10, 0x003C($s0) ## 0000003C -/* 022FC 80874B2C AFB80010 */ sw $t8, 0x0010($sp) -/* 02300 80874B30 8E0F003C */ lw $t7, 0x003C($s0) ## 0000003C -/* 02304 80874B34 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02308 80874B38 26060334 */ addiu $a2, $s0, 0x0334 ## $a2 = 00000334 -/* 0230C 80874B3C AFAF0014 */ sw $t7, 0x0014($sp) -/* 02310 80874B40 8E180040 */ lw $t8, 0x0040($s0) ## 00000040 -/* 02314 80874B44 2607033A */ addiu $a3, $s0, 0x033A ## $a3 = 0000033A -/* 02318 80874B48 0C00E0A4 */ jal func_80038290 -/* 0231C 80874B4C AFB80018 */ sw $t8, 0x0018($sp) -/* 02320 80874B50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02324 80874B54 0C21D3AB */ jal func_80874EAC -/* 02328 80874B58 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0232C 80874B5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02330 80874B60 0C00B58B */ jal Actor_SetScale - -/* 02334 80874B64 8E050308 */ lw $a1, 0x0308($s0) ## 00000308 -/* 02338 80874B68 8FBF002C */ lw $ra, 0x002C($sp) -/* 0233C 80874B6C 8FB00024 */ lw $s0, 0x0024($sp) -/* 02340 80874B70 8FB10028 */ lw $s1, 0x0028($sp) -/* 02344 80874B74 03E00008 */ jr $ra -/* 02348 80874B78 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872960.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872960.s deleted file mode 100644 index 5dfec9d40c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872960.s +++ /dev/null @@ -1,221 +0,0 @@ -.late_rodata -glabel D_80875680 - .float 0.01 - -glabel D_80875684 - .float 3500.0 - -glabel D_80875688 - .float 0.4 - -glabel D_8087568C - .float 0.2 - -glabel D_80875690 - .float 0.1 - -.text -glabel func_80872960 -/* 00130 80872960 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 -/* 00134 80872964 3C0F8087 */ lui $t7, %hi(D_808754A4) ## $t7 = 80870000 -/* 00138 80872968 AFBF0084 */ sw $ra, 0x0084($sp) -/* 0013C 8087296C AFBE0080 */ sw $s8, 0x0080($sp) -/* 00140 80872970 AFB7007C */ sw $s7, 0x007C($sp) -/* 00144 80872974 AFB60078 */ sw $s6, 0x0078($sp) -/* 00148 80872978 AFB50074 */ sw $s5, 0x0074($sp) -/* 0014C 8087297C AFB40070 */ sw $s4, 0x0070($sp) -/* 00150 80872980 AFB3006C */ sw $s3, 0x006C($sp) -/* 00154 80872984 AFB20068 */ sw $s2, 0x0068($sp) -/* 00158 80872988 AFB10064 */ sw $s1, 0x0064($sp) -/* 0015C 8087298C AFB00060 */ sw $s0, 0x0060($sp) -/* 00160 80872990 F7BE0058 */ sdc1 $f30, 0x0058($sp) -/* 00164 80872994 F7BC0050 */ sdc1 $f28, 0x0050($sp) -/* 00168 80872998 F7BA0048 */ sdc1 $f26, 0x0048($sp) -/* 0016C 8087299C F7B80040 */ sdc1 $f24, 0x0040($sp) -/* 00170 808729A0 F7B60038 */ sdc1 $f22, 0x0038($sp) -/* 00174 808729A4 F7B40030 */ sdc1 $f20, 0x0030($sp) -/* 00178 808729A8 AFA500D4 */ sw $a1, 0x00D4($sp) -/* 0017C 808729AC AFA600D8 */ sw $a2, 0x00D8($sp) -/* 00180 808729B0 25EF54A4 */ addiu $t7, $t7, %lo(D_808754A4) ## $t7 = 808754A4 -/* 00184 808729B4 8DF90000 */ lw $t9, 0x0000($t7) ## 808754A4 -/* 00188 808729B8 27AE00C4 */ addiu $t6, $sp, 0x00C4 ## $t6 = FFFFFFF4 -/* 0018C 808729BC 8DF80004 */ lw $t8, 0x0004($t7) ## 808754A8 -/* 00190 808729C0 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF4 -/* 00194 808729C4 8DF90008 */ lw $t9, 0x0008($t7) ## 808754AC -/* 00198 808729C8 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF8 -/* 0019C 808729CC 3C018087 */ lui $at, %hi(D_80875680) ## $at = 80870000 -/* 001A0 808729D0 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFFC -/* 001A4 808729D4 C4245680 */ lwc1 $f4, %lo(D_80875680)($at) -/* 001A8 808729D8 C4800308 */ lwc1 $f0, 0x0308($a0) ## 00000308 -/* 001AC 808729DC 0006A400 */ sll $s4, $a2, 16 -/* 001B0 808729E0 0014A403 */ sra $s4, $s4, 16 -/* 001B4 808729E4 4604003C */ c.lt.s $f0, $f4 -/* 001B8 808729E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 001BC 808729EC 3C018087 */ lui $at, %hi(D_80875684) ## $at = 80870000 -/* 001C0 808729F0 45030088 */ bc1tl .L80872C14 -/* 001C4 808729F4 8FBF0084 */ lw $ra, 0x0084($sp) -/* 001C8 808729F8 C4265684 */ lwc1 $f6, %lo(D_80875684)($at) -/* 001CC 808729FC 46060502 */ mul.s $f20, $f0, $f6 -/* 001D0 80872A00 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 001D4 80872A04 00000000 */ nop -/* 001D8 80872A08 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 001DC 80872A0C 4481E000 */ mtc1 $at, $f28 ## $f28 = 0.50 -/* 001E0 80872A10 00000000 */ nop -/* 001E4 80872A14 461C0201 */ sub.s $f8, $f0, $f28 -/* 001E8 80872A18 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 001EC 80872A1C E7A800B8 */ swc1 $f8, 0x00B8($sp) -/* 001F0 80872A20 461C0281 */ sub.s $f10, $f0, $f28 -/* 001F4 80872A24 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 001F8 80872A28 E7AA00BC */ swc1 $f10, 0x00BC($sp) -/* 001FC 80872A2C 461C0401 */ sub.s $f16, $f0, $f28 -/* 00200 80872A30 3C018087 */ lui $at, %hi(D_80875688) ## $at = 80870000 -/* 00204 80872A34 C43E5688 */ lwc1 $f30, %lo(D_80875688)($at) -/* 00208 80872A38 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 0020C 80872A3C 3C178087 */ lui $s7, %hi(D_80875488) ## $s7 = 80870000 -/* 00210 80872A40 3C158087 */ lui $s5, %hi(D_8087546C) ## $s5 = 80870000 -/* 00214 80872A44 4481D000 */ mtc1 $at, $f26 ## $f26 = 30.00 -/* 00218 80872A48 E7B000C0 */ swc1 $f16, 0x00C0($sp) -/* 0021C 80872A4C 26B5546C */ addiu $s5, $s5, %lo(D_8087546C) ## $s5 = 8087546C -/* 00220 80872A50 26F75488 */ addiu $s7, $s7, %lo(D_80875488) ## $s7 = 80875488 -/* 00224 80872A54 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 -/* 00228 80872A58 27BE00AC */ addiu $s8, $sp, 0x00AC ## $s8 = FFFFFFDC -/* 0022C 80872A5C 24160003 */ addiu $s6, $zero, 0x0003 ## $s6 = 00000003 -.L80872A60: -/* 00230 80872A60 16800012 */ bne $s4, $zero, .L80872AAC -/* 00234 80872A64 3C018087 */ lui $at, %hi(D_8087568C) ## $at = 80870000 -/* 00238 80872A68 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 -/* 0023C 80872A6C 461CA582 */ mul.s $f22, $f20, $f28 -/* 00240 80872A70 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 00244 80872A74 4600F606 */ mov.s $f24, $f30 -/* 00248 80872A78 2412005A */ addiu $s2, $zero, 0x005A ## $s2 = 0000005A -/* 0024C 80872A7C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00250 80872A80 E7B200AC */ swc1 $f18, 0x00AC($sp) -/* 00254 80872A84 461C0101 */ sub.s $f4, $f0, $f28 -/* 00258 80872A88 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 0025C 80872A8C 46162182 */ mul.s $f6, $f4, $f22 -/* 00260 80872A90 46144280 */ add.s $f10, $f8, $f20 -/* 00264 80872A94 460A3400 */ add.s $f16, $f6, $f10 -/* 00268 80872A98 E7B000B0 */ swc1 $f16, 0x00B0($sp) -/* 0026C 80872A9C C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 00270 80872AA0 461A9100 */ add.s $f4, $f18, $f26 -/* 00274 80872AA4 1000003A */ beq $zero, $zero, .L80872B90 -/* 00278 80872AA8 E7A400B4 */ swc1 $f4, 0x00B4($sp) -.L80872AAC: -/* 0027C 80872AAC C438568C */ lwc1 $f24, %lo(D_8087568C)($at) -/* 00280 80872AB0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00284 80872AB4 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 00288 80872AB8 3C018087 */ lui $at, %hi(D_80875690) ## $at = 80870000 -/* 0028C 80872ABC C4285690 */ lwc1 $f8, %lo(D_80875690)($at) -/* 00290 80872AC0 24120032 */ addiu $s2, $zero, 0x0032 ## $s2 = 00000032 -/* 00294 80872AC4 02808825 */ or $s1, $s4, $zero ## $s1 = 00000000 -/* 00298 80872AC8 4608A582 */ mul.s $f22, $f20, $f8 -/* 0029C 80872ACC 0C00CFC8 */ jal Rand_CenteredFloat - -/* 002A0 80872AD0 00000000 */ nop -/* 002A4 80872AD4 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 002A8 80872AD8 8FA900D4 */ lw $t1, 0x00D4($sp) -/* 002AC 80872ADC 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 002B0 80872AE0 46060280 */ add.s $f10, $f0, $f6 -/* 002B4 80872AE4 E7AA00AC */ swc1 $f10, 0x00AC($sp) -/* 002B8 80872AE8 852A00A4 */ lh $t2, 0x00A4($t1) ## 000000A4 -/* 002BC 80872AEC 15410010 */ bne $t2, $at, .L80872B30 -/* 002C0 80872AF0 00000000 */ nop -/* 002C4 80872AF4 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 002C8 80872AF8 00000000 */ nop -/* 002CC 80872AFC 461C0181 */ sub.s $f6, $f0, $f28 -/* 002D0 80872B00 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 002D4 80872B04 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 002D8 80872B08 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 002DC 80872B0C 46148480 */ add.s $f18, $f16, $f20 -/* 002E0 80872B10 46163282 */ mul.s $f10, $f6, $f22 -/* 002E4 80872B14 46049200 */ add.s $f8, $f18, $f4 -/* 002E8 80872B18 46085400 */ add.s $f16, $f10, $f8 -/* 002EC 80872B1C E7B000B0 */ swc1 $f16, 0x00B0($sp) -/* 002F0 80872B20 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 002F4 80872B24 461A9100 */ add.s $f4, $f18, $f26 -/* 002F8 80872B28 1000000F */ beq $zero, $zero, .L80872B68 -/* 002FC 80872B2C E7A400B4 */ swc1 $f4, 0x00B4($sp) -.L80872B30: -/* 00300 80872B30 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 00304 80872B34 00000000 */ nop -/* 00308 80872B38 461C0181 */ sub.s $f6, $f0, $f28 -/* 0030C 80872B3C C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 00310 80872B40 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 00314 80872B44 46144400 */ add.s $f16, $f8, $f20 -/* 00318 80872B48 46163282 */ mul.s $f10, $f6, $f22 -/* 0031C 80872B4C 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 -/* 00320 80872B50 461A8481 */ sub.s $f18, $f16, $f26 -/* 00324 80872B54 46125100 */ add.s $f4, $f10, $f18 -/* 00328 80872B58 E7A400B0 */ swc1 $f4, 0x00B0($sp) -/* 0032C 80872B5C C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 00330 80872B60 46083400 */ add.s $f16, $f6, $f8 -/* 00334 80872B64 E7B000B4 */ swc1 $f16, 0x00B4($sp) -.L80872B68: -/* 00338 80872B68 3C0B8016 */ lui $t3, %hi(gSaveContext+4) -/* 0033C 80872B6C 8D6BE664 */ lw $t3, %lo(gSaveContext+4)($t3) -/* 00340 80872B70 C7AA00B0 */ lwc1 $f10, 0x00B0($sp) -/* 00344 80872B74 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00348 80872B78 15600005 */ bne $t3, $zero, .L80872B90 -/* 0034C 80872B7C 00000000 */ nop -/* 00350 80872B80 44819000 */ mtc1 $at, $f18 ## $f18 = 20.00 -/* 00354 80872B84 00000000 */ nop -/* 00358 80872B88 46125100 */ add.s $f4, $f10, $f18 -/* 0035C 80872B8C E7A400B0 */ swc1 $f4, 0x00B0($sp) -.L80872B90: -/* 00360 80872B90 02360019 */ multu $s1, $s6 -/* 00364 80872B94 27A900A8 */ addiu $t1, $sp, 0x00A8 ## $t1 = FFFFFFD8 -/* 00368 80872B98 27AA00A4 */ addiu $t2, $sp, 0x00A4 ## $t2 = FFFFFFD4 -/* 0036C 80872B9C AFAA0014 */ sw $t2, 0x0014($sp) -/* 00370 80872BA0 AFA90010 */ sw $t1, 0x0010($sp) -/* 00374 80872BA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00378 80872BA8 03C02825 */ or $a1, $s8, $zero ## $a1 = FFFFFFDC -/* 0037C 80872BAC 27A600C4 */ addiu $a2, $sp, 0x00C4 ## $a2 = FFFFFFF4 -/* 00380 80872BB0 27A700B8 */ addiu $a3, $sp, 0x00B8 ## $a3 = FFFFFFE8 -/* 00384 80872BB4 E7B80018 */ swc1 $f24, 0x0018($sp) -/* 00388 80872BB8 00004012 */ mflo $t0 -/* 0038C 80872BBC 02A81021 */ addu $v0, $s5, $t0 -/* 00390 80872BC0 02E81821 */ addu $v1, $s7, $t0 -/* 00394 80872BC4 904C0000 */ lbu $t4, 0x0000($v0) ## 00000000 -/* 00398 80872BC8 904D0001 */ lbu $t5, 0x0001($v0) ## 00000001 -/* 0039C 80872BCC 904E0002 */ lbu $t6, 0x0002($v0) ## 00000002 -/* 003A0 80872BD0 906F0000 */ lbu $t7, 0x0000($v1) ## 00000000 -/* 003A4 80872BD4 90780001 */ lbu $t8, 0x0001($v1) ## 00000001 -/* 003A8 80872BD8 90790002 */ lbu $t9, 0x0002($v1) ## 00000002 -/* 003AC 80872BDC AFB2001C */ sw $s2, 0x001C($sp) -/* 003B0 80872BE0 AFB10020 */ sw $s1, 0x0020($sp) -/* 003B4 80872BE4 A3AC00A8 */ sb $t4, 0x00A8($sp) -/* 003B8 80872BE8 A3AD00A9 */ sb $t5, 0x00A9($sp) -/* 003BC 80872BEC A3AE00AA */ sb $t6, 0x00AA($sp) -/* 003C0 80872BF0 A3AF00A4 */ sb $t7, 0x00A4($sp) -/* 003C4 80872BF4 A3B800A5 */ sb $t8, 0x00A5($sp) -/* 003C8 80872BF8 0C21D367 */ jal func_80874D9C -/* 003CC 80872BFC A3B900A6 */ sb $t9, 0x00A6($sp) -/* 003D0 80872C00 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 003D4 80872C04 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 003D8 80872C08 1661FF95 */ bne $s3, $at, .L80872A60 -/* 003DC 80872C0C 00000000 */ nop -/* 003E0 80872C10 8FBF0084 */ lw $ra, 0x0084($sp) -.L80872C14: -/* 003E4 80872C14 D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 003E8 80872C18 D7B60038 */ ldc1 $f22, 0x0038($sp) -/* 003EC 80872C1C D7B80040 */ ldc1 $f24, 0x0040($sp) -/* 003F0 80872C20 D7BA0048 */ ldc1 $f26, 0x0048($sp) -/* 003F4 80872C24 D7BC0050 */ ldc1 $f28, 0x0050($sp) -/* 003F8 80872C28 D7BE0058 */ ldc1 $f30, 0x0058($sp) -/* 003FC 80872C2C 8FB00060 */ lw $s0, 0x0060($sp) -/* 00400 80872C30 8FB10064 */ lw $s1, 0x0064($sp) -/* 00404 80872C34 8FB20068 */ lw $s2, 0x0068($sp) -/* 00408 80872C38 8FB3006C */ lw $s3, 0x006C($sp) -/* 0040C 80872C3C 8FB40070 */ lw $s4, 0x0070($sp) -/* 00410 80872C40 8FB50074 */ lw $s5, 0x0074($sp) -/* 00414 80872C44 8FB60078 */ lw $s6, 0x0078($sp) -/* 00418 80872C48 8FB7007C */ lw $s7, 0x007C($sp) -/* 0041C 80872C4C 8FBE0080 */ lw $s8, 0x0080($sp) -/* 00420 80872C50 03E00008 */ jr $ra -/* 00424 80872C54 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872C58.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872C58.s deleted file mode 100644 index e97ad65752..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872C58.s +++ /dev/null @@ -1,62 +0,0 @@ -.late_rodata -glabel D_80875694 - .float 0.4 - - .text -glabel func_80872C58 -/* 00428 80872C58 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0042C 80872C5C AFBF001C */ sw $ra, 0x001C($sp) -/* 00430 80872C60 AFB00018 */ sw $s0, 0x0018($sp) -/* 00434 80872C64 AFA50024 */ sw $a1, 0x0024($sp) -/* 00438 80872C68 C4860320 */ lwc1 $f6, 0x0320($a0) ## 00000320 -/* 0043C 80872C6C C484030C */ lwc1 $f4, 0x030C($a0) ## 0000030C -/* 00440 80872C70 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00444 80872C74 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 00448 80872C78 46062000 */ add.s $f0, $f4, $f6 -/* 0044C 80872C7C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00450 80872C80 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 -/* 00454 80872C84 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 00458 80872C88 44050000 */ mfc1 $a1, $f0 -/* 0045C 80872C8C 0C01E107 */ jal Math_ApproachF - -/* 00460 80872C90 E48002F4 */ swc1 $f0, 0x02F4($a0) ## 0000031C -/* 00464 80872C94 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 00468 80872C98 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 0046C 80872C9C 26040320 */ addiu $a0, $s0, 0x0320 ## $a0 = 00000320 -/* 00470 80872CA0 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 00474 80872CA4 0C01E107 */ jal Math_ApproachF - -/* 00478 80872CA8 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 0047C 80872CAC 8FAE0024 */ lw $t6, 0x0024($sp) -/* 00480 80872CB0 91CF1D6C */ lbu $t7, 0x1D6C($t6) ## 00001D6C -/* 00484 80872CB4 55E0000B */ bnel $t7, $zero, .L80872CE4 -/* 00488 80872CB8 C6100324 */ lwc1 $f16, 0x0324($s0) ## 00000324 -/* 0048C 80872CBC C6080324 */ lwc1 $f8, 0x0324($s0) ## 00000324 -/* 00490 80872CC0 4600428D */ trunc.w.s $f10, $f8 -/* 00494 80872CC4 44045000 */ mfc1 $a0, $f10 -/* 00498 80872CC8 00000000 */ nop -/* 0049C 80872CCC 00042400 */ sll $a0, $a0, 16 -/* 004A0 80872CD0 0C01DE1C */ jal Math_SinS - ## sins? -/* 004A4 80872CD4 00042403 */ sra $a0, $a0, 16 -/* 004A8 80872CD8 1000000C */ beq $zero, $zero, .L80872D0C -/* 004AC 80872CDC E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 -/* 004B0 80872CE0 C6100324 */ lwc1 $f16, 0x0324($s0) ## 00000324 -.L80872CE4: -/* 004B4 80872CE4 4600848D */ trunc.w.s $f18, $f16 -/* 004B8 80872CE8 44049000 */ mfc1 $a0, $f18 -/* 004BC 80872CEC 00000000 */ nop -/* 004C0 80872CF0 00042400 */ sll $a0, $a0, 16 -/* 004C4 80872CF4 0C01DE1C */ jal Math_SinS - ## sins? -/* 004C8 80872CF8 00042403 */ sra $a0, $a0, 16 -/* 004CC 80872CFC 3C018087 */ lui $at, %hi(D_80875694) ## $at = 80870000 -/* 004D0 80872D00 C4245694 */ lwc1 $f4, %lo(D_80875694)($at) -/* 004D4 80872D04 46040182 */ mul.s $f6, $f0, $f4 -/* 004D8 80872D08 E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 -.L80872D0C: -/* 004DC 80872D0C 8FBF001C */ lw $ra, 0x001C($sp) -/* 004E0 80872D10 8FB00018 */ lw $s0, 0x0018($sp) -/* 004E4 80872D14 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 004E8 80872D18 03E00008 */ jr $ra -/* 004EC 80872D1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872D20.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872D20.s deleted file mode 100644 index b9b9d06b7b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872D20.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel func_80872D20 -/* 004F0 80872D20 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 004F4 80872D24 AFB00018 */ sw $s0, 0x0018($sp) -/* 004F8 80872D28 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 004FC 80872D2C AFBF001C */ sw $ra, 0x001C($sp) -/* 00500 80872D30 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00504 80872D34 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00508 80872D38 24050038 */ addiu $a1, $zero, 0x0038 ## $a1 = 00000038 -/* 0050C 80872D3C 0C00B2D0 */ jal Flags_GetSwitch - -/* 00510 80872D40 AFA70024 */ sw $a3, 0x0024($sp) -/* 00514 80872D44 10400022 */ beq $v0, $zero, .L80872DD0 -/* 00518 80872D48 8FA70024 */ lw $a3, 0x0024($sp) -/* 0051C 80872D4C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00520 80872D50 00270821 */ addu $at, $at, $a3 -/* 00524 80872D54 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 00528 80872D58 A42E04C6 */ sh $t6, 0x04C6($at) ## 000104C6 -/* 0052C 80872D5C 84EF00A4 */ lh $t7, 0x00A4($a3) ## 000000A4 -/* 00530 80872D60 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 00534 80872D64 3C188016 */ lui $t8, %hi(gSaveContext+0x3a) -/* 00538 80872D68 15E1000B */ bne $t7, $at, .L80872D98 -/* 0053C 80872D6C 3C088016 */ lui $t0, %hi(gSaveContext+0x3a) -/* 00540 80872D70 9318E69A */ lbu $t8, %lo(gSaveContext+0x3a)($t8) -/* 00544 80872D74 57000010 */ bnel $t8, $zero, .L80872DB8 -/* 00548 80872D78 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0054C 80872D7C 861902EC */ lh $t9, 0x02EC($s0) ## 000002EC -/* 00550 80872D80 5320000D */ beql $t9, $zero, .L80872DB8 -/* 00554 80872D84 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00558 80872D88 0C00B55C */ jal Actor_Kill - -/* 0055C 80872D8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00560 80872D90 10000010 */ beq $zero, $zero, .L80872DD4 -/* 00564 80872D94 8FBF001C */ lw $ra, 0x001C($sp) -.L80872D98: -/* 00568 80872D98 9108E69A */ lbu $t0, %lo(gSaveContext+0x3a)($t0) -/* 0056C 80872D9C 55000006 */ bnel $t0, $zero, .L80872DB8 -/* 00570 80872DA0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00574 80872DA4 0C00B55C */ jal Actor_Kill - -/* 00578 80872DA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0057C 80872DAC 10000009 */ beq $zero, $zero, .L80872DD4 -/* 00580 80872DB0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00584 80872DB4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -.L80872DB8: -/* 00588 80872DB8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0058C 80872DBC 0C00B7D5 */ jal func_8002DF54 -/* 00590 80872DC0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00594 80872DC4 3C098087 */ lui $t1, %hi(func_80872DE4) ## $t1 = 80870000 -/* 00598 80872DC8 25292DE4 */ addiu $t1, $t1, %lo(func_80872DE4) ## $t1 = 80872DE4 -/* 0059C 80872DCC AE09014C */ sw $t1, 0x014C($s0) ## 0000014C -.L80872DD0: -/* 005A0 80872DD0 8FBF001C */ lw $ra, 0x001C($sp) -.L80872DD4: -/* 005A4 80872DD4 8FB00018 */ lw $s0, 0x0018($sp) -/* 005A8 80872DD8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 005AC 80872DDC 03E00008 */ jr $ra -/* 005B0 80872DE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872DE4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872DE4.s deleted file mode 100644 index 130d153bc8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872DE4.s +++ /dev/null @@ -1,346 +0,0 @@ -.rdata - -glabel D_80875540 - .asciz "\x1b[33m☆☆☆☆☆ もうど ☆☆☆☆☆ %d\n\x1b[m" - .balign 4 - -glabel D_8087556C - .asciz "\x1b[32m ☆☆☆☆☆ 回転切り速度ＵＰ ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -glabel D_808755A0 - .asciz "\x1b[33m ☆☆☆☆☆ 魔法ゲージメーター倍増 ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -glabel D_808755D8 - .asciz "\x1b[35m ☆☆☆☆☆ ダメージ半減 ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -.text -glabel func_80872DE4 -/* 005B4 80872DE4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 005B8 80872DE8 AFA40020 */ sw $a0, 0x0020($sp) -/* 005BC 80872DEC AFBF001C */ sw $ra, 0x001C($sp) -/* 005C0 80872DF0 AFA50024 */ sw $a1, 0x0024($sp) -/* 005C4 80872DF4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 005C8 80872DF8 8FA50020 */ lw $a1, 0x0020($sp) -/* 005CC 80872DFC 0C00B7D5 */ jal func_8002DF54 -/* 005D0 80872E00 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 005D4 80872E04 8FAE0024 */ lw $t6, 0x0024($sp) -/* 005D8 80872E08 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 -/* 005DC 80872E0C 3C048087 */ lui $a0, %hi(D_80875540) ## $a0 = 80870000 -/* 005E0 80872E10 00AE2821 */ addu $a1, $a1, $t6 -/* 005E4 80872E14 94A504C6 */ lhu $a1, 0x04C6($a1) ## 000104C6 -/* 005E8 80872E18 0C00084C */ jal osSyncPrintf - -/* 005EC 80872E1C 24845540 */ addiu $a0, $a0, %lo(D_80875540) ## $a0 = 80875540 -/* 005F0 80872E20 8FAF0024 */ lw $t7, 0x0024($sp) -/* 005F4 80872E24 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 005F8 80872E28 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 005FC 80872E2C 85F800A4 */ lh $t8, 0x00A4($t7) ## 000000A4 -/* 00600 80872E30 8FA80020 */ lw $t0, 0x0020($sp) -/* 00604 80872E34 53010023 */ beql $t8, $at, .L80872EC4 -/* 00608 80872E38 8FAE0020 */ lw $t6, 0x0020($sp) -/* 0060C 80872E3C 850202EC */ lh $v0, 0x02EC($t0) ## 000002EC -/* 00610 80872E40 3C058016 */ lui $a1, %hi(gSaveContext) -/* 00614 80872E44 24A5E660 */ addiu $a1, %lo(gSaveContext) -/* 00618 80872E48 10400009 */ beq $v0, $zero, .L80872E70 -/* 0061C 80872E4C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00620 80872E50 1041000D */ beq $v0, $at, .L80872E88 -/* 00624 80872E54 3C058016 */ lui $a1, %hi(gSaveContext) -/* 00628 80872E58 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0062C 80872E5C 10410011 */ beq $v0, $at, .L80872EA4 -/* 00630 80872E60 3C058016 */ lui $a1, %hi(gSaveContext) -/* 00634 80872E64 3C058016 */ lui $a1, %hi(gSaveContext) -/* 00638 80872E68 10000054 */ beq $zero, $zero, .L80872FBC -/* 0063C 80872E6C 24A5E660 */ addiu $a1, %lo(gSaveContext) -.L80872E70: -/* 00640 80872E70 94B90EF2 */ lhu $t9, 0x0EF2($a1) ## 8015F552 -/* 00644 80872E74 33290100 */ andi $t1, $t9, 0x0100 ## $t1 = 00000000 -/* 00648 80872E78 15200050 */ bne $t1, $zero, .L80872FBC -/* 0064C 80872E7C 00000000 */ nop -/* 00650 80872E80 1000004E */ beq $zero, $zero, .L80872FBC -/* 00654 80872E84 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L80872E88: -/* 00658 80872E88 24A5E660 */ addiu $a1, %lo(gSaveContext) -/* 0065C 80872E8C 94AA0EF2 */ lhu $t2, 0x0EF2($a1) ## 8015DBB2 -/* 00660 80872E90 314B0200 */ andi $t3, $t2, 0x0200 ## $t3 = 00000000 -/* 00664 80872E94 15600049 */ bne $t3, $zero, .L80872FBC -/* 00668 80872E98 00000000 */ nop -/* 0066C 80872E9C 10000047 */ beq $zero, $zero, .L80872FBC -/* 00670 80872EA0 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L80872EA4: -/* 00674 80872EA4 24A5E660 */ addiu $a1, %lo(gSaveContext) -/* 00678 80872EA8 94AC0EF2 */ lhu $t4, 0x0EF2($a1) ## 8015C212 -/* 0067C 80872EAC 318D0400 */ andi $t5, $t4, 0x0400 ## $t5 = 00000000 -/* 00680 80872EB0 15A00042 */ bne $t5, $zero, .L80872FBC -/* 00684 80872EB4 00000000 */ nop -/* 00688 80872EB8 10000040 */ beq $zero, $zero, .L80872FBC -/* 0068C 80872EBC 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 00690 80872EC0 8FAE0020 */ lw $t6, 0x0020($sp) -.L80872EC4: -/* 00694 80872EC4 85C202EC */ lh $v0, 0x02EC($t6) ## 000002EC -/* 00698 80872EC8 1040000A */ beq $v0, $zero, .L80872EF4 -/* 0069C 80872ECC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 006A0 80872ED0 1041001D */ beq $v0, $at, .L80872F48 -/* 006A4 80872ED4 3C058016 */ lui $a1, %hi(gSaveContext) -/* 006A8 80872ED8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 006AC 80872EDC 10410029 */ beq $v0, $at, .L80872F84 -/* 006B0 80872EE0 3C058016 */ lui $a1, %hi(gSaveContext) -/* 006B4 80872EE4 3C058016 */ lui $a1, %hi(gSaveContext) -/* 006B8 80872EE8 24A5E660 */ addiu $a1, %lo(gSaveContext) -/* 006BC 80872EEC 10000033 */ beq $zero, $zero, .L80872FBC -/* 006C0 80872EF0 01C04025 */ or $t0, $t6, $zero ## $t0 = 00000000 -.L80872EF4: -/* 006C4 80872EF4 3C058016 */ lui $a1, %hi(gSaveContext) -/* 006C8 80872EF8 24A5E660 */ addiu $a1, %lo(gSaveContext) -/* 006CC 80872EFC 90AF003A */ lbu $t7, 0x003A($a1) ## 8015E69A -/* 006D0 80872F00 3C188016 */ lui $t8, %hi(gGameInfo) -/* 006D4 80872F04 3C048087 */ lui $a0, %hi(D_8087556C) ## $a0 = 80870000 -/* 006D8 80872F08 11E00005 */ beq $t7, $zero, .L80872F20 -/* 006DC 80872F0C 00000000 */ nop -/* 006E0 80872F10 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) -/* 006E4 80872F14 871912D8 */ lh $t9, 0x12D8($t8) ## 801612D8 -/* 006E8 80872F18 13200009 */ beq $t9, $zero, .L80872F40 -/* 006EC 80872F1C 00000000 */ nop -.L80872F20: -/* 006F0 80872F20 0C00084C */ jal osSyncPrintf - -/* 006F4 80872F24 2484556C */ addiu $a0, $a0, %lo(D_8087556C) ## $a0 = 8087556C -/* 006F8 80872F28 8FAA0020 */ lw $t2, 0x0020($sp) -/* 006FC 80872F2C 3C058016 */ lui $a1, %hi(gSaveContext) -/* 00700 80872F30 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 00704 80872F34 24A5E660 */ addiu $a1, %lo(gSaveContext) -/* 00708 80872F38 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 0070C 80872F3C A54902EA */ sh $t1, 0x02EA($t2) ## 000002EA -.L80872F40: -/* 00710 80872F40 1000001E */ beq $zero, $zero, .L80872FBC -/* 00714 80872F44 8FA80020 */ lw $t0, 0x0020($sp) -.L80872F48: -/* 00718 80872F48 24A5E660 */ addiu $a1, %lo(gSaveContext) -/* 0071C 80872F4C 90AB003C */ lbu $t3, 0x003C($a1) ## 8015CCFC -/* 00720 80872F50 3C048087 */ lui $a0, %hi(D_808755A0) ## $a0 = 80870000 -/* 00724 80872F54 15600009 */ bne $t3, $zero, .L80872F7C -/* 00728 80872F58 00000000 */ nop -/* 0072C 80872F5C 0C00084C */ jal osSyncPrintf - -/* 00730 80872F60 248455A0 */ addiu $a0, $a0, %lo(D_808755A0) ## $a0 = 808755A0 -/* 00734 80872F64 8FAD0020 */ lw $t5, 0x0020($sp) -/* 00738 80872F68 3C058016 */ lui $a1, %hi(gSaveContext) -/* 0073C 80872F6C 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 00740 80872F70 24A5E660 */ addiu $a1, %lo(gSaveContext) -/* 00744 80872F74 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 00748 80872F78 A5AC02EA */ sh $t4, 0x02EA($t5) ## 000002EA -.L80872F7C: -/* 0074C 80872F7C 1000000F */ beq $zero, $zero, .L80872FBC -/* 00750 80872F80 8FA80020 */ lw $t0, 0x0020($sp) -.L80872F84: -/* 00754 80872F84 24A5E660 */ addiu $a1, %lo(gSaveContext) -/* 00758 80872F88 90AE003D */ lbu $t6, 0x003D($a1) ## 8015CCFD -/* 0075C 80872F8C 3C048087 */ lui $a0, %hi(D_808755D8) ## $a0 = 80870000 -/* 00760 80872F90 55C0000A */ bnel $t6, $zero, .L80872FBC -/* 00764 80872F94 8FA80020 */ lw $t0, 0x0020($sp) -/* 00768 80872F98 0C00084C */ jal osSyncPrintf - -/* 0076C 80872F9C 248455D8 */ addiu $a0, $a0, %lo(D_808755D8) ## $a0 = 808755D8 -/* 00770 80872FA0 8FB80020 */ lw $t8, 0x0020($sp) -/* 00774 80872FA4 3C058016 */ lui $a1, %hi(gSaveContext) -/* 00778 80872FA8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 0077C 80872FAC 24A5E660 */ addiu $a1, %lo(gSaveContext) -/* 00780 80872FB0 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 00784 80872FB4 A70F02EA */ sh $t7, 0x02EA($t8) ## 000002EA -/* 00788 80872FB8 8FA80020 */ lw $t0, 0x0020($sp) -.L80872FBC: -/* 0078C 80872FBC 5060008F */ beql $v1, $zero, .L808731FC -/* 00790 80872FC0 8FAD0024 */ lw $t5, 0x0024($sp) -/* 00794 80872FC4 8CB91360 */ lw $t9, 0x1360($a1) ## 8015F9C0 -/* 00798 80872FC8 8FA90024 */ lw $t1, 0x0024($sp) -/* 0079C 80872FCC 2B210004 */ slti $at, $t9, 0x0004 -/* 007A0 80872FD0 10200085 */ beq $at, $zero, .L808731E8 -/* 007A4 80872FD4 00000000 */ nop -/* 007A8 80872FD8 852A00A4 */ lh $t2, 0x00A4($t1) ## 000000A4 -/* 007AC 80872FDC 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 007B0 80872FE0 850202EC */ lh $v0, 0x02EC($t0) ## 000002EC -/* 007B4 80872FE4 11410041 */ beq $t2, $at, .L808730EC -/* 007B8 80872FE8 00000000 */ nop -/* 007BC 80872FEC 10400009 */ beq $v0, $zero, .L80873014 -/* 007C0 80872FF0 3C0E8016 */ lui $t6, %hi(gSegments) -/* 007C4 80872FF4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 007C8 80872FF8 10410018 */ beq $v0, $at, .L8087305C -/* 007CC 80872FFC 3C0E8016 */ lui $t6, %hi(gSegments) -/* 007D0 80873000 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 007D4 80873004 10410027 */ beq $v0, $at, .L808730A4 -/* 007D8 80873008 3C0E8016 */ lui $t6, %hi(gSegments) -/* 007DC 8087300C 10000076 */ beq $zero, $zero, .L808731E8 -/* 007E0 80873010 00000000 */ nop -.L80873014: -/* 007E4 80873014 3C020200 */ lui $v0, %hi(D_02000160) ## $v0 = 02000000 -/* 007E8 80873018 24420160 */ addiu $v0, $v0, %lo(D_02000160) ## $v0 = 02000160 -/* 007EC 8087301C 00025900 */ sll $t3, $v0, 4 -/* 007F0 80873020 000B6702 */ srl $t4, $t3, 28 -/* 007F4 80873024 000C6880 */ sll $t5, $t4, 2 -/* 007F8 80873028 01CD7021 */ addu $t6, $t6, $t5 -/* 007FC 8087302C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00800 80873030 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) -/* 00804 80873034 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00808 80873038 00417824 */ and $t7, $v0, $at -/* 0080C 8087303C 8FA90024 */ lw $t1, 0x0024($sp) -/* 00810 80873040 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00814 80873044 01CFC021 */ addu $t8, $t6, $t7 -/* 00818 80873048 0301C821 */ addu $t9, $t8, $at -/* 0081C 8087304C 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00820 80873050 AD391D68 */ sw $t9, 0x1D68($t1) ## 00001D68 -/* 00824 80873054 10000064 */ beq $zero, $zero, .L808731E8 -/* 00828 80873058 A0AA1414 */ sb $t2, 0x1414($a1) ## 8015FA74 -.L8087305C: -/* 0082C 8087305C 3C020200 */ lui $v0, %hi(D_02001020) ## $v0 = 02000000 -/* 00830 80873060 24421020 */ addiu $v0, $v0, %lo(D_02001020) ## $v0 = 02001020 -/* 00834 80873064 00025900 */ sll $t3, $v0, 4 -/* 00838 80873068 000B6702 */ srl $t4, $t3, 28 -/* 0083C 8087306C 000C6880 */ sll $t5, $t4, 2 -/* 00840 80873070 01CD7021 */ addu $t6, $t6, $t5 -/* 00844 80873074 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00848 80873078 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) -/* 0084C 8087307C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00850 80873080 00417824 */ and $t7, $v0, $at -/* 00854 80873084 8FA90024 */ lw $t1, 0x0024($sp) -/* 00858 80873088 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0085C 8087308C 01CFC021 */ addu $t8, $t6, $t7 -/* 00860 80873090 0301C821 */ addu $t9, $t8, $at -/* 00864 80873094 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00868 80873098 AD391D68 */ sw $t9, 0x1D68($t1) ## 00001D68 -/* 0086C 8087309C 10000052 */ beq $zero, $zero, .L808731E8 -/* 00870 808730A0 A0AA1414 */ sb $t2, 0x1414($a1) ## 8015FA74 -.L808730A4: -/* 00874 808730A4 3C020200 */ lui $v0, %hi(D_02001F40) ## $v0 = 02000000 -/* 00878 808730A8 24421F40 */ addiu $v0, $v0, %lo(D_02001F40) ## $v0 = 02001F40 -/* 0087C 808730AC 00025900 */ sll $t3, $v0, 4 -/* 00880 808730B0 000B6702 */ srl $t4, $t3, 28 -/* 00884 808730B4 000C6880 */ sll $t5, $t4, 2 -/* 00888 808730B8 01CD7021 */ addu $t6, $t6, $t5 -/* 0088C 808730BC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00890 808730C0 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) -/* 00894 808730C4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00898 808730C8 00417824 */ and $t7, $v0, $at -/* 0089C 808730CC 8FA90024 */ lw $t1, 0x0024($sp) -/* 008A0 808730D0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 008A4 808730D4 01CFC021 */ addu $t8, $t6, $t7 -/* 008A8 808730D8 0301C821 */ addu $t9, $t8, $at -/* 008AC 808730DC 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 008B0 808730E0 AD391D68 */ sw $t9, 0x1D68($t1) ## 00001D68 -/* 008B4 808730E4 10000040 */ beq $zero, $zero, .L808731E8 -/* 008B8 808730E8 A0AA1414 */ sb $t2, 0x1414($a1) ## 8015FA74 -.L808730EC: -/* 008BC 808730EC 10400009 */ beq $v0, $zero, .L80873114 -/* 008C0 808730F0 3C0E8016 */ lui $t6, %hi(gSegments) -/* 008C4 808730F4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 008C8 808730F8 10410018 */ beq $v0, $at, .L8087315C -/* 008CC 808730FC 3C0E8016 */ lui $t6, %hi(gSegments) -/* 008D0 80873100 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 008D4 80873104 10410027 */ beq $v0, $at, .L808731A4 -/* 008D8 80873108 3C0E8016 */ lui $t6, %hi(gSegments) -/* 008DC 8087310C 10000036 */ beq $zero, $zero, .L808731E8 -/* 008E0 80873110 00000000 */ nop -.L80873114: -/* 008E4 80873114 3C020200 */ lui $v0, %hi(D_02000130) ## $v0 = 02000000 -/* 008E8 80873118 24420130 */ addiu $v0, $v0, %lo(D_02000130) ## $v0 = 02000130 -/* 008EC 8087311C 00025900 */ sll $t3, $v0, 4 -/* 008F0 80873120 000B6702 */ srl $t4, $t3, 28 -/* 008F4 80873124 000C6880 */ sll $t5, $t4, 2 -/* 008F8 80873128 01CD7021 */ addu $t6, $t6, $t5 -/* 008FC 8087312C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00900 80873130 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) -/* 00904 80873134 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00908 80873138 00417824 */ and $t7, $v0, $at -/* 0090C 8087313C 8FA90024 */ lw $t1, 0x0024($sp) -/* 00910 80873140 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00914 80873144 01CFC021 */ addu $t8, $t6, $t7 -/* 00918 80873148 0301C821 */ addu $t9, $t8, $at -/* 0091C 8087314C 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00920 80873150 AD391D68 */ sw $t9, 0x1D68($t1) ## 00001D68 -/* 00924 80873154 10000024 */ beq $zero, $zero, .L808731E8 -/* 00928 80873158 A0AA1414 */ sb $t2, 0x1414($a1) ## 8015FA74 -.L8087315C: -/* 0092C 8087315C 3C020200 */ lui $v0, %hi(D_020013E0) ## $v0 = 02000000 -/* 00930 80873160 244213E0 */ addiu $v0, $v0, %lo(D_020013E0) ## $v0 = 020013E0 -/* 00934 80873164 00025900 */ sll $t3, $v0, 4 -/* 00938 80873168 000B6702 */ srl $t4, $t3, 28 -/* 0093C 8087316C 000C6880 */ sll $t5, $t4, 2 -/* 00940 80873170 01CD7021 */ addu $t6, $t6, $t5 -/* 00944 80873174 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00948 80873178 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) -/* 0094C 8087317C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00950 80873180 00417824 */ and $t7, $v0, $at -/* 00954 80873184 8FA90024 */ lw $t1, 0x0024($sp) -/* 00958 80873188 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0095C 8087318C 01CFC021 */ addu $t8, $t6, $t7 -/* 00960 80873190 0301C821 */ addu $t9, $t8, $at -/* 00964 80873194 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00968 80873198 AD391D68 */ sw $t9, 0x1D68($t1) ## 00001D68 -/* 0096C 8087319C 10000012 */ beq $zero, $zero, .L808731E8 -/* 00970 808731A0 A0AA1414 */ sb $t2, 0x1414($a1) ## 8015FA74 -.L808731A4: -/* 00974 808731A4 3C020200 */ lui $v0, %hi(D_020025D0) ## $v0 = 02000000 -/* 00978 808731A8 244225D0 */ addiu $v0, $v0, %lo(D_020025D0) ## $v0 = 020025D0 -/* 0097C 808731AC 00025900 */ sll $t3, $v0, 4 -/* 00980 808731B0 000B6702 */ srl $t4, $t3, 28 -/* 00984 808731B4 000C6880 */ sll $t5, $t4, 2 -/* 00988 808731B8 01CD7021 */ addu $t6, $t6, $t5 -/* 0098C 808731BC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00990 808731C0 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) -/* 00994 808731C4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00998 808731C8 00417824 */ and $t7, $v0, $at -/* 0099C 808731CC 8FA90024 */ lw $t1, 0x0024($sp) -/* 009A0 808731D0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 009A4 808731D4 01CFC021 */ addu $t8, $t6, $t7 -/* 009A8 808731D8 0301C821 */ addu $t9, $t8, $at -/* 009AC 808731DC 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 009B0 808731E0 AD391D68 */ sw $t9, 0x1D68($t1) ## 00001D68 -/* 009B4 808731E4 A0AA1414 */ sb $t2, 0x1414($a1) ## 8015FA74 -.L808731E8: -/* 009B8 808731E8 3C0B8087 */ lui $t3, %hi(func_80873EA4) ## $t3 = 80870000 -/* 009BC 808731EC 256B3EA4 */ addiu $t3, $t3, %lo(func_80873EA4) ## $t3 = 80873EA4 -/* 009C0 808731F0 10000022 */ beq $zero, $zero, .L8087327C -/* 009C4 808731F4 AD0B014C */ sw $t3, 0x014C($t0) ## 0000014C -/* 009C8 808731F8 8FAD0024 */ lw $t5, 0x0024($sp) -.L808731FC: -/* 009CC 808731FC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 009D0 80873200 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 009D4 80873204 002D0821 */ addu $at, $at, $t5 -/* 009D8 80873208 A02C0AE3 */ sb $t4, 0x0AE3($at) ## 00010AE3 -/* 009DC 8087320C 8FAE0024 */ lw $t6, 0x0024($sp) -/* 009E0 80873210 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 009E4 80873214 8FA40024 */ lw $a0, 0x0024($sp) -/* 009E8 80873218 85CF00A4 */ lh $t7, 0x00A4($t6) ## 801600A4 -/* 009EC 8087321C 2405219C */ addiu $a1, $zero, 0x219C ## $a1 = 0000219C -/* 009F0 80873220 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 009F4 80873224 15E10009 */ bne $t7, $at, .L8087324C -/* 009F8 80873228 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 009FC 8087322C 01C02025 */ or $a0, $t6, $zero ## $a0 = 80160000 -/* 00A00 80873230 2405219B */ addiu $a1, $zero, 0x219B ## $a1 = 0000219B -/* 00A04 80873234 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 00A08 80873238 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00A0C 8087323C 0C02003E */ jal func_800800F8 -/* 00A10 80873240 AFA00010 */ sw $zero, 0x0010($sp) -/* 00A14 80873244 10000004 */ beq $zero, $zero, .L80873258 -/* 00A18 80873248 8FA40020 */ lw $a0, 0x0020($sp) -.L8087324C: -/* 00A1C 8087324C 0C02003E */ jal func_800800F8 -/* 00A20 80873250 AFA00010 */ sw $zero, 0x0010($sp) -/* 00A24 80873254 8FA40020 */ lw $a0, 0x0020($sp) -.L80873258: -/* 00A28 80873258 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00A2C 8087325C 2405287F */ addiu $a1, $zero, 0x287F ## $a1 = 0000287F -/* 00A30 80873260 8FA20020 */ lw $v0, 0x0020($sp) -/* 00A34 80873264 3C188087 */ lui $t8, %hi(func_80874BE0) ## $t8 = 80870000 -/* 00A38 80873268 3C198087 */ lui $t9, %hi(func_8087328C) ## $t9 = 80870000 -/* 00A3C 8087326C 27184BE0 */ addiu $t8, $t8, %lo(func_80874BE0) ## $t8 = 80874BE0 -/* 00A40 80873270 2739328C */ addiu $t9, $t9, %lo(func_8087328C) ## $t9 = 8087328C -/* 00A44 80873274 AC580134 */ sw $t8, 0x0134($v0) ## 00000134 -/* 00A48 80873278 AC59014C */ sw $t9, 0x014C($v0) ## 0000014C -.L8087327C: -/* 00A4C 8087327C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00A50 80873280 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00A54 80873284 03E00008 */ jr $ra -/* 00A58 80873288 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087328C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087328C.s deleted file mode 100644 index 4c82cabcba..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087328C.s +++ /dev/null @@ -1,69 +0,0 @@ -glabel func_8087328C -/* 00A5C 8087328C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00A60 80873290 AFBF002C */ sw $ra, 0x002C($sp) -/* 00A64 80873294 AFB00028 */ sw $s0, 0x0028($sp) -/* 00A68 80873298 AFA50034 */ sw $a1, 0x0034($sp) -/* 00A6C 8087329C 84AF00A4 */ lh $t7, 0x00A4($a1) ## 000000A4 -/* 00A70 808732A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A74 808732A4 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 00A78 808732A8 15E10015 */ bne $t7, $at, .L80873300 -/* 00A7C 808732AC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00A80 808732B0 3C040601 */ lui $a0, %hi(D_06008698) ## $a0 = 06010000 -/* 00A84 808732B4 0C028800 */ jal Animation_GetLastFrame - -/* 00A88 808732B8 24848698 */ addiu $a0, $a0, %lo(D_06008698) ## $a0 = 06008698 -/* 00A8C 808732BC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00A90 808732C0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00A94 808732C4 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 00A98 808732C8 46802020 */ cvt.s.w $f0, $f4 -/* 00A9C 808732CC 3C050601 */ lui $a1, %hi(D_06008698) ## $a1 = 06010000 -/* 00AA0 808732D0 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00AA4 808732D4 24A58698 */ addiu $a1, $a1, %lo(D_06008698) ## $a1 = 06008698 -/* 00AA8 808732D8 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 00AAC 808732DC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00AB0 808732E0 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 00AB4 808732E4 AFB80014 */ sw $t8, 0x0014($sp) -/* 00AB8 808732E8 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00ABC 808732EC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00AC0 808732F0 0C029468 */ jal Animation_Change - -/* 00AC4 808732F4 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00AC8 808732F8 10000013 */ beq $zero, $zero, .L80873348 -/* 00ACC 808732FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80873300: -/* 00AD0 80873300 0C028800 */ jal Animation_GetLastFrame - -/* 00AD4 80873304 248431C0 */ addiu $a0, $a0, 0x31C0 ## $a0 = 000031C0 -/* 00AD8 80873308 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 00ADC 8087330C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00AE0 80873310 44815000 */ mtc1 $at, $f10 ## $f10 = -10.00 -/* 00AE4 80873314 46804020 */ cvt.s.w $f0, $f8 -/* 00AE8 80873318 3C050600 */ lui $a1, %hi(D_060031C0) ## $a1 = 06000000 -/* 00AEC 8087331C 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 00AF0 80873320 24A531C0 */ addiu $a1, $a1, %lo(D_060031C0) ## $a1 = 060031C0 -/* 00AF4 80873324 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 00AF8 80873328 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00AFC 8087332C E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 00B00 80873330 AFB90014 */ sw $t9, 0x0014($sp) -/* 00B04 80873334 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00B08 80873338 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00B0C 8087333C 0C029468 */ jal Animation_Change - -/* 00B10 80873340 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 00B14 80873344 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80873348: -/* 00B18 80873348 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00B1C 8087334C 24056858 */ addiu $a1, $zero, 0x6858 ## $a1 = 00006858 -/* 00B20 80873350 8FA40034 */ lw $a0, 0x0034($sp) -/* 00B24 80873354 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00B28 80873358 0C00B7D5 */ jal func_8002DF54 -/* 00B2C 8087335C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00B30 80873360 3C088087 */ lui $t0, %hi(func_80873380) ## $t0 = 80870000 -/* 00B34 80873364 25083380 */ addiu $t0, $t0, %lo(func_80873380) ## $t0 = 80873380 -/* 00B38 80873368 AE08014C */ sw $t0, 0x014C($s0) ## 0000014C -/* 00B3C 8087336C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00B40 80873370 8FB00028 */ lw $s0, 0x0028($sp) -/* 00B44 80873374 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00B48 80873378 03E00008 */ jr $ra -/* 00B4C 8087337C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873380.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873380.s deleted file mode 100644 index 7f6591f91b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873380.s +++ /dev/null @@ -1,103 +0,0 @@ -.late_rodata -glabel D_80875698 - .float 0.03400000184774399 - -.text -glabel func_80873380 -/* 00B50 80873380 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00B54 80873384 AFB00020 */ sw $s0, 0x0020($sp) -/* 00B58 80873388 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B5C 8087338C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00B60 80873390 AFA5002C */ sw $a1, 0x002C($sp) -/* 00B64 80873394 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00B68 80873398 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00B6C 8087339C 0C00B7D5 */ jal func_8002DF54 -/* 00B70 808733A0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00B74 808733A4 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 00B78 808733A8 8E05030C */ lw $a1, 0x030C($s0) ## 0000030C -/* 00B7C 808733AC 8E060314 */ lw $a2, 0x0314($s0) ## 00000314 -/* 00B80 808733B0 0C01E107 */ jal Math_ApproachF - -/* 00B84 808733B4 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 00B88 808733B8 3C053D0F */ lui $a1, 0x3D0F ## $a1 = 3D0F0000 -/* 00B8C 808733BC 3C073BA3 */ lui $a3, 0x3BA3 ## $a3 = 3BA30000 -/* 00B90 808733C0 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A -/* 00B94 808733C4 34A55C29 */ ori $a1, $a1, 0x5C29 ## $a1 = 3D0F5C29 -/* 00B98 808733C8 26040308 */ addiu $a0, $s0, 0x0308 ## $a0 = 00000308 -/* 00B9C 808733CC 0C01E107 */ jal Math_ApproachF - -/* 00BA0 808733D0 8E060318 */ lw $a2, 0x0318($s0) ## 00000318 -/* 00BA4 808733D4 3C053F4C */ lui $a1, 0x3F4C ## $a1 = 3F4C0000 -/* 00BA8 808733D8 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 00BAC 808733DC 3C073CA3 */ lui $a3, 0x3CA3 ## $a3 = 3CA30000 -/* 00BB0 808733E0 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A -/* 00BB4 808733E4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00BB8 808733E8 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3F4CCCCD -/* 00BBC 808733EC 0C01E107 */ jal Math_ApproachF - -/* 00BC0 808733F0 26040314 */ addiu $a0, $s0, 0x0314 ## $a0 = 00000314 -/* 00BC4 808733F4 3C053E4C */ lui $a1, 0x3E4C ## $a1 = 3E4C0000 -/* 00BC8 808733F8 3C063CF5 */ lui $a2, 0x3CF5 ## $a2 = 3CF50000 -/* 00BCC 808733FC 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 -/* 00BD0 80873400 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD -/* 00BD4 80873404 34C6C28F */ ori $a2, $a2, 0xC28F ## $a2 = 3CF5C28F -/* 00BD8 80873408 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3E4CCCCD -/* 00BDC 8087340C 0C01E107 */ jal Math_ApproachF - -/* 00BE0 80873410 26040318 */ addiu $a0, $s0, 0x0318 ## $a0 = 00000318 -/* 00BE4 80873414 3C018087 */ lui $at, %hi(D_80875698) ## $at = 80870000 -/* 00BE8 80873418 C4265698 */ lwc1 $f6, %lo(D_80875698)($at) -/* 00BEC 8087341C C6040308 */ lwc1 $f4, 0x0308($s0) ## 00000308 -/* 00BF0 80873420 4604303E */ c.le.s $f6, $f4 -/* 00BF4 80873424 00000000 */ nop -/* 00BF8 80873428 45020021 */ bc1fl .L808734B0 -/* 00BFC 8087342C 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -/* 00C00 80873430 860200B6 */ lh $v0, 0x00B6($s0) ## 000000B6 -/* 00C04 80873434 2841E0C1 */ slti $at, $v0, 0xE0C1 -/* 00C08 80873438 1420001A */ bne $at, $zero, .L808734A4 -/* 00C0C 8087343C 24580BB8 */ addiu $t8, $v0, 0x0BB8 ## $t8 = 00000BB8 -/* 00C10 80873440 284103E8 */ slti $at, $v0, 0x03E8 -/* 00C14 80873444 10200017 */ beq $at, $zero, .L808734A4 -/* 00C18 80873448 00000000 */ nop -/* 00C1C 8087344C 0C02927F */ jal SkelAnime_Update - -/* 00C20 80873450 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 00C24 80873454 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 00C28 80873458 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00C2C 8087345C 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 00C30 80873460 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 00C34 80873464 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00C38 80873468 AFA00010 */ sw $zero, 0x0010($sp) -/* 00C3C 8087346C 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 00C40 80873470 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00C44 80873474 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 -/* 00C48 80873478 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 00C4C 8087347C 3C0F8087 */ lui $t7, %hi(func_808734DC) ## $t7 = 80870000 -/* 00C50 80873480 25EF34DC */ addiu $t7, $t7, %lo(func_808734DC) ## $t7 = 808734DC -/* 00C54 80873484 46804020 */ cvt.s.w $f0, $f8 -/* 00C58 80873488 46000005 */ abs.s $f0, $f0 -/* 00C5C 8087348C 460A003C */ c.lt.s $f0, $f10 -/* 00C60 80873490 00000000 */ nop -/* 00C64 80873494 45020009 */ bc1fl .L808734BC -/* 00C68 80873498 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C6C 8087349C 10000006 */ beq $zero, $zero, .L808734B8 -/* 00C70 808734A0 AE0F014C */ sw $t7, 0x014C($s0) ## 0000014C -.L808734A4: -/* 00C74 808734A4 10000004 */ beq $zero, $zero, .L808734B8 -/* 00C78 808734A8 A61800B6 */ sh $t8, 0x00B6($s0) ## 000000B6 -/* 00C7C 808734AC 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -.L808734B0: -/* 00C80 808734B0 27280BB8 */ addiu $t0, $t9, 0x0BB8 ## $t0 = 00000BB8 -/* 00C84 808734B4 A60800B6 */ sh $t0, 0x00B6($s0) ## 000000B6 -.L808734B8: -/* 00C88 808734B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L808734BC: -/* 00C8C 808734BC 8FA5002C */ lw $a1, 0x002C($sp) -/* 00C90 808734C0 0C21CA58 */ jal func_80872960 -/* 00C94 808734C4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00C98 808734C8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00C9C 808734CC 8FB00020 */ lw $s0, 0x0020($sp) -/* 00CA0 808734D0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00CA4 808734D4 03E00008 */ jr $ra -/* 00CA8 808734D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808734DC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808734DC.s deleted file mode 100644 index 847ab7f752..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808734DC.s +++ /dev/null @@ -1,53 +0,0 @@ -.late_rodata -glabel D_8087569C - .float 1273.0 - -.text -glabel func_808734DC -/* 00CAC 808734DC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00CB0 808734E0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00CB4 808734E4 AFA40020 */ sw $a0, 0x0020($sp) -/* 00CB8 808734E8 C4840168 */ lwc1 $f4, 0x0168($a0) ## 00000168 -/* 00CBC 808734EC 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00CC0 808734F0 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00CC4 808734F4 AFA50020 */ sw $a1, 0x0020($sp) -/* 00CC8 808734F8 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00CCC 808734FC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00CD0 80873500 0C00B7D5 */ jal func_8002DF54 -/* 00CD4 80873504 E7A4001C */ swc1 $f4, 0x001C($sp) -/* 00CD8 80873508 8FA50020 */ lw $a1, 0x0020($sp) -/* 00CDC 8087350C 3C018087 */ lui $at, %hi(D_8087569C) ## $at = 80870000 -/* 00CE0 80873510 C42A569C */ lwc1 $f10, %lo(D_8087569C)($at) -/* 00CE4 80873514 C4A8032C */ lwc1 $f8, 0x032C($a1) ## 0000032C -/* 00CE8 80873518 C4A60324 */ lwc1 $f6, 0x0324($a1) ## 00000324 -/* 00CEC 8087351C 24A40150 */ addiu $a0, $a1, 0x0150 ## $a0 = 00000150 -/* 00CF0 80873520 460A4402 */ mul.s $f16, $f8, $f10 -/* 00CF4 80873524 4606803E */ c.le.s $f16, $f6 -/* 00CF8 80873528 00000000 */ nop -/* 00CFC 8087352C 45000004 */ bc1f .L80873540 -/* 00D00 80873530 00000000 */ nop -/* 00D04 80873534 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 00D08 80873538 00000000 */ nop -/* 00D0C 8087353C E4B20324 */ swc1 $f18, 0x0324($a1) ## 00000324 -.L80873540: -/* 00D10 80873540 0C02927F */ jal SkelAnime_Update - -/* 00D14 80873544 AFA50020 */ sw $a1, 0x0020($sp) -/* 00D18 80873548 8FA50020 */ lw $a1, 0x0020($sp) -/* 00D1C 8087354C C7A4001C */ lwc1 $f4, 0x001C($sp) -/* 00D20 80873550 C4A8032C */ lwc1 $f8, 0x032C($a1) ## 0000032C -/* 00D24 80873554 4604403E */ c.le.s $f8, $f4 -/* 00D28 80873558 00000000 */ nop -/* 00D2C 8087355C 45020008 */ bc1fl .L80873580 -/* 00D30 80873560 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00D34 80873564 84AE02FC */ lh $t6, 0x02FC($a1) ## 000002FC -/* 00D38 80873568 3C0F8087 */ lui $t7, %hi(func_8087358C) ## $t7 = 80870000 -/* 00D3C 8087356C 25EF358C */ addiu $t7, $t7, %lo(func_8087358C) ## $t7 = 8087358C -/* 00D40 80873570 55C00003 */ bnel $t6, $zero, .L80873580 -/* 00D44 80873574 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00D48 80873578 ACAF014C */ sw $t7, 0x014C($a1) ## 0000014C -/* 00D4C 8087357C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80873580: -/* 00D50 80873580 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00D54 80873584 03E00008 */ jr $ra -/* 00D58 80873588 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087358C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087358C.s deleted file mode 100644 index 5685571f25..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087358C.s +++ /dev/null @@ -1,77 +0,0 @@ -glabel func_8087358C -/* 00D5C 8087358C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00D60 80873590 AFB00028 */ sw $s0, 0x0028($sp) -/* 00D64 80873594 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00D68 80873598 AFBF002C */ sw $ra, 0x002C($sp) -/* 00D6C 8087359C AFA50034 */ sw $a1, 0x0034($sp) -/* 00D70 808735A0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00D74 808735A4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00D78 808735A8 0C00B7D5 */ jal func_8002DF54 -/* 00D7C 808735AC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00D80 808735B0 8FAE0034 */ lw $t6, 0x0034($sp) -/* 00D84 808735B4 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 00D88 808735B8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00D8C 808735BC 85CF00A4 */ lh $t7, 0x00A4($t6) ## 000000A4 -/* 00D90 808735C0 15E10014 */ bne $t7, $at, .L80873614 -/* 00D94 808735C4 00000000 */ nop -/* 00D98 808735C8 3C040602 */ lui $a0, %hi(D_0601D514) ## $a0 = 06020000 -/* 00D9C 808735CC 0C028800 */ jal Animation_GetLastFrame - -/* 00DA0 808735D0 2484D514 */ addiu $a0, $a0, %lo(D_0601D514) ## $a0 = 0601D514 -/* 00DA4 808735D4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00DA8 808735D8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00DAC 808735DC 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 00DB0 808735E0 46802020 */ cvt.s.w $f0, $f4 -/* 00DB4 808735E4 3C050602 */ lui $a1, %hi(D_0601D514) ## $a1 = 06020000 -/* 00DB8 808735E8 24A5D514 */ addiu $a1, $a1, %lo(D_0601D514) ## $a1 = 0601D514 -/* 00DBC 808735EC 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 00DC0 808735F0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00DC4 808735F4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00DC8 808735F8 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 00DCC 808735FC AFA00014 */ sw $zero, 0x0014($sp) -/* 00DD0 80873600 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00DD4 80873604 0C029468 */ jal Animation_Change - -/* 00DD8 80873608 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00DDC 8087360C 10000012 */ beq $zero, $zero, .L80873658 -/* 00DE0 80873610 241800DB */ addiu $t8, $zero, 0x00DB ## $t8 = 000000DB -.L80873614: -/* 00DE4 80873614 0C028800 */ jal Animation_GetLastFrame - -/* 00DE8 80873618 24841DF0 */ addiu $a0, $a0, 0x1DF0 ## $a0 = 00001DF0 -/* 00DEC 8087361C 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 00DF0 80873620 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00DF4 80873624 44815000 */ mtc1 $at, $f10 ## $f10 = -10.00 -/* 00DF8 80873628 46804020 */ cvt.s.w $f0, $f8 -/* 00DFC 8087362C 3C050600 */ lui $a1, %hi(D_06001DF0) ## $a1 = 06000000 -/* 00E00 80873630 24A51DF0 */ addiu $a1, $a1, %lo(D_06001DF0) ## $a1 = 06001DF0 -/* 00E04 80873634 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 00E08 80873638 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00E0C 8087363C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00E10 80873640 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 00E14 80873644 AFA00014 */ sw $zero, 0x0014($sp) -/* 00E18 80873648 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00E1C 8087364C 0C029468 */ jal Animation_Change - -/* 00E20 80873650 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 00E24 80873654 241800DB */ addiu $t8, $zero, 0x00DB ## $t8 = 000000DB -.L80873658: -/* 00E28 80873658 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 -/* 00E2C 8087365C A618010E */ sh $t8, 0x010E($s0) ## 0000010E -/* 00E30 80873660 A61902EE */ sh $t9, 0x02EE($s0) ## 000002EE -/* 00E34 80873664 8FA40034 */ lw $a0, 0x0034($sp) -/* 00E38 80873668 3305FFFF */ andi $a1, $t8, 0xFFFF ## $a1 = 000000DB -/* 00E3C 8087366C 0C042DA0 */ jal func_8010B680 -/* 00E40 80873670 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00E44 80873674 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E48 80873678 8FA50034 */ lw $a1, 0x0034($sp) -/* 00E4C 8087367C 0C21CA58 */ jal func_80872960 -/* 00E50 80873680 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00E54 80873684 3C088087 */ lui $t0, %hi(func_808736A4) ## $t0 = 80870000 -/* 00E58 80873688 250836A4 */ addiu $t0, $t0, %lo(func_808736A4) ## $t0 = 808736A4 -/* 00E5C 8087368C AE08014C */ sw $t0, 0x014C($s0) ## 0000014C -/* 00E60 80873690 8FBF002C */ lw $ra, 0x002C($sp) -/* 00E64 80873694 8FB00028 */ lw $s0, 0x0028($sp) -/* 00E68 80873698 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00E6C 8087369C 03E00008 */ jr $ra -/* 00E70 808736A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808736A4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808736A4.s deleted file mode 100644 index 68ba94a848..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808736A4.s +++ /dev/null @@ -1,64 +0,0 @@ -.late_rodata -glabel D_808756A0 - .word 0x449F2000 - -.text -glabel func_808736A4 -/* 00E74 808736A4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00E78 808736A8 AFB00014 */ sw $s0, 0x0014($sp) -/* 00E7C 808736AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E80 808736B0 AFB10018 */ sw $s1, 0x0018($sp) -/* 00E84 808736B4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00E88 808736B8 AFBF001C */ sw $ra, 0x001C($sp) -/* 00E8C 808736BC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00E90 808736C0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00E94 808736C4 0C00B7D5 */ jal func_8002DF54 -/* 00E98 808736C8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00E9C 808736CC 3C018087 */ lui $at, %hi(D_808756A0) ## $at = 80870000 -/* 00EA0 808736D0 C42256A0 */ lwc1 $f2, %lo(D_808756A0)($at) -/* 00EA4 808736D4 C6040168 */ lwc1 $f4, 0x0168($s0) ## 00000168 -/* 00EA8 808736D8 C606032C */ lwc1 $f6, 0x032C($s0) ## 0000032C -/* 00EAC 808736DC 46022002 */ mul.s $f0, $f4, $f2 -/* 00EB0 808736E0 00000000 */ nop -/* 00EB4 808736E4 46023202 */ mul.s $f8, $f6, $f2 -/* 00EB8 808736E8 E6000324 */ swc1 $f0, 0x0324($s0) ## 00000324 -/* 00EBC 808736EC 4600403E */ c.le.s $f8, $f0 -/* 00EC0 808736F0 00000000 */ nop -/* 00EC4 808736F4 45000004 */ bc1f .L80873708 -/* 00EC8 808736F8 00000000 */ nop -/* 00ECC 808736FC 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 00ED0 80873700 00000000 */ nop -/* 00ED4 80873704 E60A0324 */ swc1 $f10, 0x0324($s0) ## 00000324 -.L80873708: -/* 00ED8 80873708 0C02927F */ jal SkelAnime_Update - -/* 00EDC 8087370C 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 00EE0 80873710 0C042F6F */ jal func_8010BDBC -/* 00EE4 80873714 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 00EE8 80873718 860E02EE */ lh $t6, 0x02EE($s0) ## 000002EE -/* 00EEC 8087371C 55C2000D */ bnel $t6, $v0, .L80873754 -/* 00EF0 80873720 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00EF4 80873724 0C041AF2 */ jal func_80106BC8 -/* 00EF8 80873728 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00EFC 8087372C 50400009 */ beql $v0, $zero, .L80873754 -/* 00F00 80873730 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F04 80873734 0C041B33 */ jal func_80106CCC -/* 00F08 80873738 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00F0C 8087373C 0C020978 */ jal Interface_ChangeAlpha -/* 00F10 80873740 24040005 */ addiu $a0, $zero, 0x0005 ## $a0 = 00000005 -/* 00F14 80873744 3C0F8087 */ lui $t7, %hi(func_80873780) ## $t7 = 80870000 -/* 00F18 80873748 25EF3780 */ addiu $t7, $t7, %lo(func_80873780) ## $t7 = 80873780 -/* 00F1C 8087374C AE0F014C */ sw $t7, 0x014C($s0) ## 0000014C -/* 00F20 80873750 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80873754: -/* 00F24 80873754 0C21CB16 */ jal func_80872C58 -/* 00F28 80873758 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00F2C 8087375C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F30 80873760 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00F34 80873764 0C21CA58 */ jal func_80872960 -/* 00F38 80873768 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00F3C 8087376C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00F40 80873770 8FB00014 */ lw $s0, 0x0014($sp) -/* 00F44 80873774 8FB10018 */ lw $s1, 0x0018($sp) -/* 00F48 80873778 03E00008 */ jr $ra -/* 00F4C 8087377C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873780.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873780.s deleted file mode 100644 index 6fd0eb7565..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873780.s +++ /dev/null @@ -1,66 +0,0 @@ -glabel func_80873780 -/* 00F50 80873780 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00F54 80873784 AFBF002C */ sw $ra, 0x002C($sp) -/* 00F58 80873788 AFB00028 */ sw $s0, 0x0028($sp) -/* 00F5C 8087378C 84AE00A4 */ lh $t6, 0x00A4($a1) ## 000000A4 -/* 00F60 80873790 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00F64 80873794 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 00F68 80873798 15C10015 */ bne $t6, $at, .L808737F0 -/* 00F6C 8087379C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00F70 808737A0 3C040600 */ lui $a0, %hi(D_060069E8) ## $a0 = 06000000 -/* 00F74 808737A4 0C028800 */ jal Animation_GetLastFrame - -/* 00F78 808737A8 248469E8 */ addiu $a0, $a0, %lo(D_060069E8) ## $a0 = 060069E8 -/* 00F7C 808737AC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00F80 808737B0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00F84 808737B4 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 00F88 808737B8 46802020 */ cvt.s.w $f0, $f4 -/* 00F8C 808737BC 3C050600 */ lui $a1, %hi(D_060069E8) ## $a1 = 06000000 -/* 00F90 808737C0 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00F94 808737C4 24A569E8 */ addiu $a1, $a1, %lo(D_060069E8) ## $a1 = 060069E8 -/* 00F98 808737C8 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 00F9C 808737CC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00FA0 808737D0 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 00FA4 808737D4 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00FA8 808737D8 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00FAC 808737DC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00FB0 808737E0 0C029468 */ jal Animation_Change - -/* 00FB4 808737E4 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00FB8 808737E8 10000013 */ beq $zero, $zero, .L80873838 -/* 00FBC 808737EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L808737F0: -/* 00FC0 808737F0 0C028800 */ jal Animation_GetLastFrame - -/* 00FC4 808737F4 24845810 */ addiu $a0, $a0, 0x5810 ## $a0 = 00005810 -/* 00FC8 808737F8 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 00FCC 808737FC 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00FD0 80873800 44815000 */ mtc1 $at, $f10 ## $f10 = -10.00 -/* 00FD4 80873804 46804020 */ cvt.s.w $f0, $f8 -/* 00FD8 80873808 3C050600 */ lui $a1, %hi(D_06005810) ## $a1 = 06000000 -/* 00FDC 8087380C 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00FE0 80873810 24A55810 */ addiu $a1, $a1, %lo(D_06005810) ## $a1 = 06005810 -/* 00FE4 80873814 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 00FE8 80873818 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00FEC 8087381C E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 00FF0 80873820 AFB80014 */ sw $t8, 0x0014($sp) -/* 00FF4 80873824 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00FF8 80873828 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00FFC 8087382C 0C029468 */ jal Animation_Change - -/* 01000 80873830 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 01004 80873834 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80873838: -/* 01008 80873838 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0100C 8087383C 24056859 */ addiu $a1, $zero, 0x6859 ## $a1 = 00006859 -/* 01010 80873840 3C088087 */ lui $t0, %hi(func_80873868) ## $t0 = 80870000 -/* 01014 80873844 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 01018 80873848 25083868 */ addiu $t0, $t0, %lo(func_80873868) ## $t0 = 80873868 -/* 0101C 8087384C A61902F6 */ sh $t9, 0x02F6($s0) ## 000002F6 -/* 01020 80873850 AE08014C */ sw $t0, 0x014C($s0) ## 0000014C -/* 01024 80873854 8FBF002C */ lw $ra, 0x002C($sp) -/* 01028 80873858 8FB00028 */ lw $s0, 0x0028($sp) -/* 0102C 8087385C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01030 80873860 03E00008 */ jr $ra -/* 01034 80873864 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873868.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873868.s deleted file mode 100644 index 53b03ad4c0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873868.s +++ /dev/null @@ -1,209 +0,0 @@ -.late_rodata -glabel D_808756A4 - .float 1300.0 - - .text -glabel func_80873868 -/* 01038 80873868 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 0103C 8087386C AFBF003C */ sw $ra, 0x003C($sp) -/* 01040 80873870 AFB00038 */ sw $s0, 0x0038($sp) -/* 01044 80873874 AFA50064 */ sw $a1, 0x0064($sp) -/* 01048 80873878 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 0104C 8087387C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01050 80873880 3C018087 */ lui $at, %hi(D_808756A4) ## $at = 80870000 -/* 01054 80873884 AFAF005C */ sw $t7, 0x005C($sp) -/* 01058 80873888 849802FC */ lh $t8, 0x02FC($a0) ## 000002FC -/* 0105C 8087388C C4820168 */ lwc1 $f2, 0x0168($a0) ## 00000168 -/* 01060 80873890 1300000E */ beq $t8, $zero, .L808738CC -/* 01064 80873894 46001306 */ mov.s $f12, $f2 -/* 01068 80873898 C42E56A4 */ lwc1 $f14, %lo(D_808756A4)($at) -/* 0106C 8087389C C484032C */ lwc1 $f4, 0x032C($a0) ## 0000032C -/* 01070 808738A0 460E1002 */ mul.s $f0, $f2, $f14 -/* 01074 808738A4 00000000 */ nop -/* 01078 808738A8 460E2182 */ mul.s $f6, $f4, $f14 -/* 0107C 808738AC E4800324 */ swc1 $f0, 0x0324($a0) ## 00000324 -/* 01080 808738B0 4600303E */ c.le.s $f6, $f0 -/* 01084 808738B4 00000000 */ nop -/* 01088 808738B8 45000004 */ bc1f .L808738CC -/* 0108C 808738BC 00000000 */ nop -/* 01090 808738C0 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 01094 808738C4 00000000 */ nop -/* 01098 808738C8 E4880324 */ swc1 $f8, 0x0324($a0) ## 00000324 -.L808738CC: -/* 0109C 808738CC 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 010A0 808738D0 AFA40044 */ sw $a0, 0x0044($sp) -/* 010A4 808738D4 0C02927F */ jal SkelAnime_Update - -/* 010A8 808738D8 E7AC0058 */ swc1 $f12, 0x0058($sp) -/* 010AC 808738DC C7AC0058 */ lwc1 $f12, 0x0058($sp) -/* 010B0 808738E0 C60A032C */ lwc1 $f10, 0x032C($s0) ## 0000032C -/* 010B4 808738E4 460C503E */ c.le.s $f10, $f12 -/* 010B8 808738E8 00000000 */ nop -/* 010BC 808738EC 4502004F */ bc1fl .L80873A2C -/* 010C0 808738F0 86020306 */ lh $v0, 0x0306($s0) ## 00000306 -/* 010C4 808738F4 861902FC */ lh $t9, 0x02FC($s0) ## 000002FC -/* 010C8 808738F8 8FA90064 */ lw $t1, 0x0064($sp) -/* 010CC 808738FC 5720004B */ bnel $t9, $zero, .L80873A2C -/* 010D0 80873900 86020306 */ lh $v0, 0x0306($s0) ## 00000306 -/* 010D4 80873904 852A00A4 */ lh $t2, 0x00A4($t1) ## 000000A4 -/* 010D8 80873908 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 010DC 8087390C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 010E0 80873910 15410014 */ bne $t2, $at, .L80873964 -/* 010E4 80873914 00000000 */ nop -/* 010E8 80873918 3C040600 */ lui $a0, %hi(D_06007CA8) ## $a0 = 06000000 -/* 010EC 8087391C 0C028800 */ jal Animation_GetLastFrame - -/* 010F0 80873920 24847CA8 */ addiu $a0, $a0, %lo(D_06007CA8) ## $a0 = 06007CA8 -/* 010F4 80873924 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 010F8 80873928 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 010FC 8087392C 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 01100 80873930 46808020 */ cvt.s.w $f0, $f16 -/* 01104 80873934 3C050600 */ lui $a1, %hi(D_06007CA8) ## $a1 = 06000000 -/* 01108 80873938 24A57CA8 */ addiu $a1, $a1, %lo(D_06007CA8) ## $a1 = 06007CA8 -/* 0110C 8087393C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01110 80873940 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01114 80873944 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 01118 80873948 AFA00014 */ sw $zero, 0x0014($sp) -/* 0111C 8087394C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01120 80873950 8FA40044 */ lw $a0, 0x0044($sp) -/* 01124 80873954 0C029468 */ jal Animation_Change - -/* 01128 80873958 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 0112C 8087395C 10000012 */ beq $zero, $zero, .L808739A8 -/* 01130 80873960 860C02EA */ lh $t4, 0x02EA($s0) ## 000002EA -.L80873964: -/* 01134 80873964 0C028800 */ jal Animation_GetLastFrame - -/* 01138 80873968 24844344 */ addiu $a0, $a0, 0x4344 ## $a0 = 00004344 -/* 0113C 8087396C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01140 80873970 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01144 80873974 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 01148 80873978 46802020 */ cvt.s.w $f0, $f4 -/* 0114C 8087397C 3C050600 */ lui $a1, %hi(D_06004344) ## $a1 = 06000000 -/* 01150 80873980 24A54344 */ addiu $a1, $a1, %lo(D_06004344) ## $a1 = 06004344 -/* 01154 80873984 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01158 80873988 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0115C 8087398C E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 01160 80873990 AFA00014 */ sw $zero, 0x0014($sp) -/* 01164 80873994 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01168 80873998 8FA40044 */ lw $a0, 0x0044($sp) -/* 0116C 8087399C 0C029468 */ jal Animation_Change - -/* 01170 808739A0 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 01174 808739A4 860C02EA */ lh $t4, 0x02EA($s0) ## 000002EA -.L808739A8: -/* 01178 808739A8 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 0117C 808739AC 240B0096 */ addiu $t3, $zero, 0x0096 ## $t3 = 00000096 -/* 01180 808739B0 A60B0302 */ sh $t3, 0x0302($s0) ## 00000302 -/* 01184 808739B4 1580001C */ bne $t4, $zero, .L80873A28 -/* 01188 808739B8 A60802FC */ sh $t0, 0x02FC($s0) ## 000002FC -/* 0118C 808739BC 8FA60064 */ lw $a2, 0x0064($sp) -/* 01190 808739C0 8FA2005C */ lw $v0, 0x005C($sp) -/* 01194 808739C4 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 01198 808739C8 44815000 */ mtc1 $at, $f10 ## $f10 = 200.00 -/* 0119C 808739CC 84CD00A4 */ lh $t5, 0x00A4($a2) ## 000000A4 -/* 011A0 808739D0 C4480028 */ lwc1 $f8, 0x0028($v0) ## 00000028 -/* 011A4 808739D4 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 011A8 808739D8 C4400024 */ lwc1 $f0, 0x0024($v0) ## 00000024 -/* 011AC 808739DC C44C002C */ lwc1 $f12, 0x002C($v0) ## 0000002C -/* 011B0 808739E0 15A10003 */ bne $t5, $at, .L808739F0 -/* 011B4 808739E4 460A4080 */ add.s $f2, $f8, $f10 -/* 011B8 808739E8 10000003 */ beq $zero, $zero, .L808739F8 -/* 011BC 808739EC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L808739F0: -/* 011C0 808739F0 00081400 */ sll $v0, $t0, 16 -/* 011C4 808739F4 00021403 */ sra $v0, $v0, 16 -.L808739F8: -/* 011C8 808739F8 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 011CC 808739FC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 011D0 80873A00 24070184 */ addiu $a3, $zero, 0x0184 ## $a3 = 00000184 -/* 011D4 80873A04 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 011D8 80873A08 E7A20014 */ swc1 $f2, 0x0014($sp) -/* 011DC 80873A0C E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 011E0 80873A10 AFA0001C */ sw $zero, 0x001C($sp) -/* 011E4 80873A14 AFA00020 */ sw $zero, 0x0020($sp) -/* 011E8 80873A18 AFA00024 */ sw $zero, 0x0024($sp) -/* 011EC 80873A1C 0C00C916 */ jal Actor_SpawnAsChild - -/* 011F0 80873A20 AFA20028 */ sw $v0, 0x0028($sp) -/* 011F4 80873A24 AE020340 */ sw $v0, 0x0340($s0) ## 00000340 -.L80873A28: -/* 011F8 80873A28 86020306 */ lh $v0, 0x0306($s0) ## 00000306 -.L80873A2C: -/* 011FC 80873A2C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 01200 80873A30 3C038016 */ lui $v1, %hi(gSaveContext) -/* 01204 80873A34 28410002 */ slti $at, $v0, 0x0002 -/* 01208 80873A38 14200002 */ bne $at, $zero, .L80873A44 -/* 0120C 80873A3C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01210 80873A40 A60E0306 */ sh $t6, 0x0306($s0) ## 00000306 -.L80873A44: -/* 01214 80873A44 86020302 */ lh $v0, 0x0302($s0) ## 00000302 -/* 01218 80873A48 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 0121C 80873A4C 24180140 */ addiu $t8, $zero, 0x0140 ## $t8 = 00000140 -/* 01220 80873A50 2841006E */ slti $at, $v0, 0x006E -/* 01224 80873A54 14200003 */ bne $at, $zero, .L80873A64 -/* 01228 80873A58 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 0122C 80873A5C A60F0302 */ sh $t7, 0x0302($s0) ## 00000302 -/* 01230 80873A60 86020302 */ lh $v0, 0x0302($s0) ## 00000302 -.L80873A64: -/* 01234 80873A64 2401006E */ addiu $at, $zero, 0x006E ## $at = 0000006E -/* 01238 80873A68 14410008 */ bne $v0, $at, .L80873A8C -/* 0123C 80873A6C 00000000 */ nop -/* 01240 80873A70 A4781424 */ sh $t8, 0x1424($v1) ## 8015FA84 -/* 01244 80873A74 0C021DA0 */ jal Magic_Fill -/* 01248 80873A78 8FA40064 */ lw $a0, 0x0064($sp) -/* 0124C 80873A7C 241900C8 */ addiu $t9, $zero, 0x00C8 ## $t9 = 000000C8 -/* 01250 80873A80 A6190306 */ sh $t9, 0x0306($s0) ## 00000306 -/* 01254 80873A84 86020302 */ lh $v0, 0x0302($s0) ## 00000302 -/* 01258 80873A88 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -.L80873A8C: -/* 0125C 80873A8C 3C038016 */ lui $v1, %hi(gSaveContext) -/* 01260 80873A90 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 01264 80873A94 84690030 */ lh $t1, 0x0030($v1) ## 8015E690 -/* 01268 80873A98 846A002E */ lh $t2, 0x002E($v1) ## 8015E68E -/* 0126C 80873A9C 241900DA */ addiu $t9, $zero, 0x00DA ## $t9 = 000000DA -/* 01270 80873AA0 3325FFFF */ andi $a1, $t9, 0xFFFF ## $a1 = 000000DA -/* 01274 80873AA4 152A0005 */ bne $t1, $t2, .L80873ABC -/* 01278 80873AA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0127C 80873AAC 846B13F4 */ lh $t3, 0x13F4($v1) ## 8015FA54 -/* 01280 80873AB0 806C0033 */ lb $t4, 0x0033($v1) ## 8015E693 -/* 01284 80873AB4 516C0004 */ beql $t3, $t4, .L80873AC8 -/* 01288 80873AB8 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -.L80873ABC: -/* 0128C 80873ABC 860D0306 */ lh $t5, 0x0306($s0) ## 00000306 -/* 01290 80873AC0 150D000D */ bne $t0, $t5, .L80873AF8 -/* 01294 80873AC4 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -.L80873AC8: -/* 01298 80873AC8 A60E0302 */ sh $t6, 0x0302($s0) ## 00000302 -/* 0129C 80873ACC 86020302 */ lh $v0, 0x0302($s0) ## 00000302 -/* 012A0 80873AD0 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A -/* 012A4 80873AD4 14410008 */ bne $v0, $at, .L80873AF8 -/* 012A8 80873AD8 00000000 */ nop -/* 012AC 80873ADC 860F02EA */ lh $t7, 0x02EA($s0) ## 000002EA -/* 012B0 80873AE0 55E00004 */ bnel $t7, $zero, .L80873AF4 -/* 012B4 80873AE4 A60002EA */ sh $zero, 0x02EA($s0) ## 000002EA -/* 012B8 80873AE8 8E180340 */ lw $t8, 0x0340($s0) ## 00000340 -/* 012BC 80873AEC A7080152 */ sh $t0, 0x0152($t8) ## 00000152 -/* 012C0 80873AF0 A60002EA */ sh $zero, 0x02EA($s0) ## 000002EA -.L80873AF4: -/* 012C4 80873AF4 86020302 */ lh $v0, 0x0302($s0) ## 00000302 -.L80873AF8: -/* 012C8 80873AF8 15020009 */ bne $t0, $v0, .L80873B20 -/* 012CC 80873AFC 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 -/* 012D0 80873B00 A619010E */ sh $t9, 0x010E($s0) ## 0000010E -/* 012D4 80873B04 A60902EE */ sh $t1, 0x02EE($s0) ## 000002EE -/* 012D8 80873B08 0C042DC8 */ jal func_8010B720 -/* 012DC 80873B0C 8FA40064 */ lw $a0, 0x0064($sp) -/* 012E0 80873B10 3C0A8087 */ lui $t2, %hi(func_80873B3C) ## $t2 = 80870000 -/* 012E4 80873B14 254A3B3C */ addiu $t2, $t2, %lo(func_80873B3C) ## $t2 = 80873B3C -/* 012E8 80873B18 10000003 */ beq $zero, $zero, .L80873B28 -/* 012EC 80873B1C AE0A014C */ sw $t2, 0x014C($s0) ## 0000014C -.L80873B20: -/* 012F0 80873B20 0C21CB16 */ jal func_80872C58 -/* 012F4 80873B24 8FA50064 */ lw $a1, 0x0064($sp) -.L80873B28: -/* 012F8 80873B28 8FBF003C */ lw $ra, 0x003C($sp) -/* 012FC 80873B2C 8FB00038 */ lw $s0, 0x0038($sp) -/* 01300 80873B30 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 01304 80873B34 03E00008 */ jr $ra -/* 01308 80873B38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873B3C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873B3C.s deleted file mode 100644 index c05d7ba0a2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873B3C.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel func_80873B3C -/* 0130C 80873B3C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01310 80873B40 AFBF001C */ sw $ra, 0x001C($sp) -/* 01314 80873B44 AFB10018 */ sw $s1, 0x0018($sp) -/* 01318 80873B48 AFB00014 */ sw $s0, 0x0014($sp) -/* 0131C 80873B4C 3C0144AF */ lui $at, 0x44AF ## $at = 44AF0000 -/* 01320 80873B50 44811000 */ mtc1 $at, $f2 ## $f2 = 1400.00 -/* 01324 80873B54 C4840168 */ lwc1 $f4, 0x0168($a0) ## 00000168 -/* 01328 80873B58 C486032C */ lwc1 $f6, 0x032C($a0) ## 0000032C -/* 0132C 80873B5C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01330 80873B60 46022002 */ mul.s $f0, $f4, $f2 -/* 01334 80873B64 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01338 80873B68 46023202 */ mul.s $f8, $f6, $f2 -/* 0133C 80873B6C E4800324 */ swc1 $f0, 0x0324($a0) ## 00000324 -/* 01340 80873B70 4600403E */ c.le.s $f8, $f0 -/* 01344 80873B74 00000000 */ nop -/* 01348 80873B78 45000004 */ bc1f .L80873B8C -/* 0134C 80873B7C 00000000 */ nop -/* 01350 80873B80 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 01354 80873B84 00000000 */ nop -/* 01358 80873B88 E48A0324 */ swc1 $f10, 0x0324($a0) ## 00000324 -.L80873B8C: -/* 0135C 80873B8C 0C02927F */ jal SkelAnime_Update - -/* 01360 80873B90 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 01364 80873B94 0C042F6F */ jal func_8010BDBC -/* 01368 80873B98 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 0136C 80873B9C 860E02EE */ lh $t6, 0x02EE($s0) ## 000002EE -/* 01370 80873BA0 55C20011 */ bnel $t6, $v0, .L80873BE8 -/* 01374 80873BA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01378 80873BA8 0C041AF2 */ jal func_80106BC8 -/* 0137C 80873BAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01380 80873BB0 5040000D */ beql $v0, $zero, .L80873BE8 -/* 01384 80873BB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01388 80873BB8 0C041B33 */ jal func_80106CCC -/* 0138C 80873BBC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01390 80873BC0 3C0F8087 */ lui $t7, %hi(func_80873C14) ## $t7 = 80870000 -/* 01394 80873BC4 25EF3C14 */ addiu $t7, $t7, %lo(func_80873C14) ## $t7 = 80873C14 -/* 01398 80873BC8 A60002F6 */ sh $zero, 0x02F6($s0) ## 000002F6 -/* 0139C 80873BCC AE0F014C */ sw $t7, 0x014C($s0) ## 0000014C -/* 013A0 80873BD0 863807A0 */ lh $t8, 0x07A0($s1) ## 000007A0 -/* 013A4 80873BD4 0018C880 */ sll $t9, $t8, 2 -/* 013A8 80873BD8 02394021 */ addu $t0, $s1, $t9 -/* 013AC 80873BDC 0C016C69 */ jal func_8005B1A4 -/* 013B0 80873BE0 8D040790 */ lw $a0, 0x0790($t0) ## 00000790 -/* 013B4 80873BE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80873BE8: -/* 013B8 80873BE8 0C21CB16 */ jal func_80872C58 -/* 013BC 80873BEC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 013C0 80873BF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013C4 80873BF4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 013C8 80873BF8 0C21CA58 */ jal func_80872960 -/* 013CC 80873BFC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 013D0 80873C00 8FBF001C */ lw $ra, 0x001C($sp) -/* 013D4 80873C04 8FB00014 */ lw $s0, 0x0014($sp) -/* 013D8 80873C08 8FB10018 */ lw $s1, 0x0018($sp) -/* 013DC 80873C0C 03E00008 */ jr $ra -/* 013E0 80873C10 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873C14.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873C14.s deleted file mode 100644 index c790ada826..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873C14.s +++ /dev/null @@ -1,73 +0,0 @@ -glabel func_80873C14 -/* 013E4 80873C14 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 013E8 80873C18 AFBF002C */ sw $ra, 0x002C($sp) -/* 013EC 80873C1C AFB00028 */ sw $s0, 0x0028($sp) -/* 013F0 80873C20 84AE00A4 */ lh $t6, 0x00A4($a1) ## 000000A4 -/* 013F4 80873C24 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 013F8 80873C28 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 013FC 80873C2C 15C10015 */ bne $t6, $at, .L80873C84 -/* 01400 80873C30 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01404 80873C34 3C040600 */ lui $a0, %hi(D_06005E60) ## $a0 = 06000000 -/* 01408 80873C38 0C028800 */ jal Animation_GetLastFrame - -/* 0140C 80873C3C 24845E60 */ addiu $a0, $a0, %lo(D_06005E60) ## $a0 = 06005E60 -/* 01410 80873C40 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01414 80873C44 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01418 80873C48 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 0141C 80873C4C 46802020 */ cvt.s.w $f0, $f4 -/* 01420 80873C50 3C050600 */ lui $a1, %hi(D_06005E60) ## $a1 = 06000000 -/* 01424 80873C54 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 01428 80873C58 24A55E60 */ addiu $a1, $a1, %lo(D_06005E60) ## $a1 = 06005E60 -/* 0142C 80873C5C 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 01430 80873C60 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01434 80873C64 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 01438 80873C68 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0143C 80873C6C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01440 80873C70 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01444 80873C74 0C029468 */ jal Animation_Change - -/* 01448 80873C78 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 0144C 80873C7C 10000013 */ beq $zero, $zero, .L80873CCC -/* 01450 80873C80 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -.L80873C84: -/* 01454 80873C84 0C028800 */ jal Animation_GetLastFrame - -/* 01458 80873C88 2484092C */ addiu $a0, $a0, 0x092C ## $a0 = 0000092C -/* 0145C 80873C8C 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 01460 80873C90 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01464 80873C94 44815000 */ mtc1 $at, $f10 ## $f10 = -10.00 -/* 01468 80873C98 46804020 */ cvt.s.w $f0, $f8 -/* 0146C 80873C9C 3C050600 */ lui $a1, %hi(D_0600092C) ## $a1 = 06000000 -/* 01470 80873CA0 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 01474 80873CA4 24A5092C */ addiu $a1, $a1, %lo(D_0600092C) ## $a1 = 0600092C -/* 01478 80873CA8 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 0147C 80873CAC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01480 80873CB0 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 01484 80873CB4 AFB80014 */ sw $t8, 0x0014($sp) -/* 01488 80873CB8 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 0148C 80873CBC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01490 80873CC0 0C029468 */ jal Animation_Change - -/* 01494 80873CC4 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 01498 80873CC8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -.L80873CCC: -/* 0149C 80873CCC 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 -/* 014A0 80873CD0 A61902E8 */ sh $t9, 0x02E8($s0) ## 000002E8 -/* 014A4 80873CD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014A8 80873CD8 24056858 */ addiu $a1, $zero, 0x6858 ## $a1 = 00006858 -/* 014AC 80873CDC E6000318 */ swc1 $f0, 0x0318($s0) ## 00000318 -/* 014B0 80873CE0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 014B4 80873CE4 E6000314 */ swc1 $f0, 0x0314($s0) ## 00000314 -/* 014B8 80873CE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014BC 80873CEC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 014C0 80873CF0 24052880 */ addiu $a1, $zero, 0x2880 ## $a1 = 00002880 -/* 014C4 80873CF4 3C088087 */ lui $t0, %hi(func_80873D14) ## $t0 = 80870000 -/* 014C8 80873CF8 25083D14 */ addiu $t0, $t0, %lo(func_80873D14) ## $t0 = 80873D14 -/* 014CC 80873CFC AE08014C */ sw $t0, 0x014C($s0) ## 0000014C -/* 014D0 80873D00 8FBF002C */ lw $ra, 0x002C($sp) -/* 014D4 80873D04 8FB00028 */ lw $s0, 0x0028($sp) -/* 014D8 80873D08 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 014DC 80873D0C 03E00008 */ jr $ra -/* 014E0 80873D10 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873D14.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873D14.s deleted file mode 100644 index 7df03b2165..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873D14.s +++ /dev/null @@ -1,74 +0,0 @@ -.late_rodata -glabel D_808756A8 - .float 0.003000000026077032 - -.text -glabel func_80873D14 -/* 014E4 80873D14 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 014E8 80873D18 AFB00018 */ sw $s0, 0x0018($sp) -/* 014EC 80873D1C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 014F0 80873D20 AFBF001C */ sw $ra, 0x001C($sp) -/* 014F4 80873D24 AFA50024 */ sw $a1, 0x0024($sp) -/* 014F8 80873D28 0C02927F */ jal SkelAnime_Update - -/* 014FC 80873D2C 24840150 */ addiu $a0, $a0, 0x0150 ## $a0 = 00000150 -/* 01500 80873D30 860E02E8 */ lh $t6, 0x02E8($s0) ## 000002E8 -/* 01504 80873D34 3C018087 */ lui $at, %hi(D_808756A8) ## $at = 80870000 -/* 01508 80873D38 55C0002E */ bnel $t6, $zero, .L80873DF4 -/* 0150C 80873D3C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01510 80873D40 C6040308 */ lwc1 $f4, 0x0308($s0) ## 00000308 -/* 01514 80873D44 C42656A8 */ lwc1 $f6, %lo(D_808756A8)($at) -/* 01518 80873D48 3C188087 */ lui $t8, %hi(func_80873E04) ## $t8 = 80870000 -/* 0151C 80873D4C 240F001E */ addiu $t7, $zero, 0x001E ## $t7 = 0000001E -/* 01520 80873D50 4606203C */ c.lt.s $f4, $f6 -/* 01524 80873D54 27183E04 */ addiu $t8, $t8, %lo(func_80873E04) ## $t8 = 80873E04 -/* 01528 80873D58 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 0152C 80873D5C 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 01530 80873D60 45020005 */ bc1fl .L80873D78 -/* 01534 80873D64 8E050310 */ lw $a1, 0x0310($s0) ## 00000310 -/* 01538 80873D68 A60F02E8 */ sh $t7, 0x02E8($s0) ## 000002E8 -/* 0153C 80873D6C 10000020 */ beq $zero, $zero, .L80873DF0 -/* 01540 80873D70 AE18014C */ sw $t8, 0x014C($s0) ## 0000014C -/* 01544 80873D74 8E050310 */ lw $a1, 0x0310($s0) ## 00000310 -.L80873D78: -/* 01548 80873D78 0C01E107 */ jal Math_ApproachF - -/* 0154C 80873D7C 8E060314 */ lw $a2, 0x0314($s0) ## 00000314 -/* 01550 80873D80 3C063BA3 */ lui $a2, 0x3BA3 ## $a2 = 3BA30000 -/* 01554 80873D84 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3BA3D70A -/* 01558 80873D88 26040308 */ addiu $a0, $s0, 0x0308 ## $a0 = 00000308 -/* 0155C 80873D8C 0C01E123 */ jal Math_ApproachZeroF - -/* 01560 80873D90 8E050318 */ lw $a1, 0x0318($s0) ## 00000318 -/* 01564 80873D94 3C053F4C */ lui $a1, 0x3F4C ## $a1 = 3F4C0000 -/* 01568 80873D98 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 0156C 80873D9C 3C073CA3 */ lui $a3, 0x3CA3 ## $a3 = 3CA30000 -/* 01570 80873DA0 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A -/* 01574 80873DA4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01578 80873DA8 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3F4CCCCD -/* 0157C 80873DAC 0C01E107 */ jal Math_ApproachF - -/* 01580 80873DB0 26040314 */ addiu $a0, $s0, 0x0314 ## $a0 = 00000314 -/* 01584 80873DB4 3C053E4C */ lui $a1, 0x3E4C ## $a1 = 3E4C0000 -/* 01588 80873DB8 3C063CF5 */ lui $a2, 0x3CF5 ## $a2 = 3CF50000 -/* 0158C 80873DBC 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 -/* 01590 80873DC0 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD -/* 01594 80873DC4 34C6C28F */ ori $a2, $a2, 0xC28F ## $a2 = 3CF5C28F -/* 01598 80873DC8 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3E4CCCCD -/* 0159C 80873DCC 0C01E107 */ jal Math_ApproachF - -/* 015A0 80873DD0 26040318 */ addiu $a0, $s0, 0x0318 ## $a0 = 00000318 -/* 015A4 80873DD4 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -/* 015A8 80873DD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015AC 80873DDC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 015B0 80873DE0 27280BB8 */ addiu $t0, $t9, 0x0BB8 ## $t0 = 00000BB8 -/* 015B4 80873DE4 A60800B6 */ sh $t0, 0x00B6($s0) ## 000000B6 -/* 015B8 80873DE8 0C21CA58 */ jal func_80872960 -/* 015BC 80873DEC 8FA50024 */ lw $a1, 0x0024($sp) -.L80873DF0: -/* 015C0 80873DF0 8FBF001C */ lw $ra, 0x001C($sp) -.L80873DF4: -/* 015C4 80873DF4 8FB00018 */ lw $s0, 0x0018($sp) -/* 015C8 80873DF8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 015CC 80873DFC 03E00008 */ jr $ra -/* 015D0 80873E00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873E04.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873E04.s deleted file mode 100644 index b550b676a1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873E04.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_80873E04 -/* 015D4 80873E04 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 015D8 80873E08 AFBF0014 */ sw $ra, 0x0014($sp) -/* 015DC 80873E0C AFA40018 */ sw $a0, 0x0018($sp) -/* 015E0 80873E10 848F02E8 */ lh $t7, 0x02E8($a0) ## 000002E8 -/* 015E4 80873E14 00807025 */ or $t6, $a0, $zero ## $t6 = 00000000 -/* 015E8 80873E18 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 015EC 80873E1C 15E0001D */ bne $t7, $zero, .L80873E94 -/* 015F0 80873E20 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 015F4 80873E24 01C02825 */ or $a1, $t6, $zero ## $a1 = 00000000 -/* 015F8 80873E28 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 015FC 80873E2C 0C00B7D5 */ jal func_8002DF54 -/* 01600 80873E30 AFA7001C */ sw $a3, 0x001C($sp) -/* 01604 80873E34 8FA7001C */ lw $a3, 0x001C($sp) -/* 01608 80873E38 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0160C 80873E3C 2402012E */ addiu $v0, $zero, 0x012E ## $v0 = 0000012E -/* 01610 80873E40 00270821 */ addu $at, $at, $a3 -/* 01614 80873E44 A0200AE3 */ sb $zero, 0x0AE3($at) ## 00010AE3 -/* 01618 80873E48 8CE41C64 */ lw $a0, 0x1C64($a3) ## 00001C64 -/* 0161C 80873E4C 5080000D */ beql $a0, $zero, .L80873E84 -/* 01620 80873E50 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 01624 80873E54 84980000 */ lh $t8, 0x0000($a0) ## 00000000 -.L80873E58: -/* 01628 80873E58 10580003 */ beq $v0, $t8, .L80873E68 -/* 0162C 80873E5C 00000000 */ nop -/* 01630 80873E60 10000005 */ beq $zero, $zero, .L80873E78 -/* 01634 80873E64 8C840124 */ lw $a0, 0x0124($a0) ## 00000124 -.L80873E68: -/* 01638 80873E68 0C00B55C */ jal Actor_Kill - -/* 0163C 80873E6C AFA7001C */ sw $a3, 0x001C($sp) -/* 01640 80873E70 10000003 */ beq $zero, $zero, .L80873E80 -/* 01644 80873E74 8FA7001C */ lw $a3, 0x001C($sp) -.L80873E78: -/* 01648 80873E78 5480FFF7 */ bnel $a0, $zero, .L80873E58 -/* 0164C 80873E7C 84980000 */ lh $t8, 0x0000($a0) ## 00000000 -.L80873E80: -/* 01650 80873E80 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -.L80873E84: -/* 01654 80873E84 0C00B2ED */ jal Flags_UnsetSwitch - -/* 01658 80873E88 24050038 */ addiu $a1, $zero, 0x0038 ## $a1 = 00000038 -/* 0165C 80873E8C 0C00B55C */ jal Actor_Kill - -/* 01660 80873E90 8FA40018 */ lw $a0, 0x0018($sp) -.L80873E94: -/* 01664 80873E94 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01668 80873E98 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0166C 80873E9C 03E00008 */ jr $ra -/* 01670 80873EA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873EA4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873EA4.s deleted file mode 100644 index fc8697abe3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873EA4.s +++ /dev/null @@ -1,87 +0,0 @@ -glabel func_80873EA4 -/* 01674 80873EA4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01678 80873EA8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0167C 80873EAC AFB00028 */ sw $s0, 0x0028($sp) -/* 01680 80873EB0 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 01684 80873EB4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01688 80873EB8 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 0168C 80873EBC 51C00042 */ beql $t6, $zero, .L80873FC8 -/* 01690 80873EC0 8FBF002C */ lw $ra, 0x002C($sp) -/* 01694 80873EC4 8CA21D8C */ lw $v0, 0x1D8C($a1) ## 00001D8C -/* 01698 80873EC8 5040003F */ beql $v0, $zero, .L80873FC8 -/* 0169C 80873ECC 8FBF002C */ lw $ra, 0x002C($sp) -/* 016A0 80873ED0 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 016A4 80873ED4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 016A8 80873ED8 3C188087 */ lui $t8, %hi(func_80874BE0) ## $t8 = 80870000 -/* 016AC 80873EDC 15E10039 */ bne $t7, $at, .L80873FC4 -/* 016B0 80873EE0 27184BE0 */ addiu $t8, $t8, %lo(func_80874BE0) ## $t8 = 80874BE0 -/* 016B4 80873EE4 AC980134 */ sw $t8, 0x0134($a0) ## 00000134 -/* 016B8 80873EE8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 016BC 80873EEC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 016C0 80873EF0 AFA70034 */ sw $a3, 0x0034($sp) -/* 016C4 80873EF4 0C00B7D5 */ jal func_8002DF54 -/* 016C8 80873EF8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 016CC 80873EFC 8FA70034 */ lw $a3, 0x0034($sp) -/* 016D0 80873F00 A60002FE */ sh $zero, 0x02FE($s0) ## 000002FE -/* 016D4 80873F04 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 016D8 80873F08 84F900A4 */ lh $t9, 0x00A4($a3) ## 000000A4 -/* 016DC 80873F0C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 016E0 80873F10 17210015 */ bne $t9, $at, .L80873F68 -/* 016E4 80873F14 00000000 */ nop -/* 016E8 80873F18 3C040601 */ lui $a0, %hi(D_06008698) ## $a0 = 06010000 -/* 016EC 80873F1C 0C028800 */ jal Animation_GetLastFrame - -/* 016F0 80873F20 24848698 */ addiu $a0, $a0, %lo(D_06008698) ## $a0 = 06008698 -/* 016F4 80873F24 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 016F8 80873F28 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 016FC 80873F2C 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 01700 80873F30 46802020 */ cvt.s.w $f0, $f4 -/* 01704 80873F34 3C050601 */ lui $a1, %hi(D_06008698) ## $a1 = 06010000 -/* 01708 80873F38 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 0170C 80873F3C 24A58698 */ addiu $a1, $a1, %lo(D_06008698) ## $a1 = 06008698 -/* 01710 80873F40 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 01714 80873F44 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01718 80873F48 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 0171C 80873F4C AFA80014 */ sw $t0, 0x0014($sp) -/* 01720 80873F50 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01724 80873F54 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01728 80873F58 0C029468 */ jal Animation_Change - -/* 0172C 80873F5C E7A60018 */ swc1 $f6, 0x0018($sp) -/* 01730 80873F60 10000013 */ beq $zero, $zero, .L80873FB0 -/* 01734 80873F64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80873F68: -/* 01738 80873F68 0C028800 */ jal Animation_GetLastFrame - -/* 0173C 80873F6C 248431C0 */ addiu $a0, $a0, 0x31C0 ## $a0 = 000031C0 -/* 01740 80873F70 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 01744 80873F74 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01748 80873F78 44815000 */ mtc1 $at, $f10 ## $f10 = -10.00 -/* 0174C 80873F7C 46804020 */ cvt.s.w $f0, $f8 -/* 01750 80873F80 3C050600 */ lui $a1, %hi(D_060031C0) ## $a1 = 06000000 -/* 01754 80873F84 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 01758 80873F88 24A531C0 */ addiu $a1, $a1, %lo(D_060031C0) ## $a1 = 060031C0 -/* 0175C 80873F8C 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 01760 80873F90 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01764 80873F94 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 01768 80873F98 AFA90014 */ sw $t1, 0x0014($sp) -/* 0176C 80873F9C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01770 80873FA0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01774 80873FA4 0C029468 */ jal Animation_Change - -/* 01778 80873FA8 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 0177C 80873FAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80873FB0: -/* 01780 80873FB0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01784 80873FB4 2405287F */ addiu $a1, $zero, 0x287F ## $a1 = 0000287F -/* 01788 80873FB8 3C0A8087 */ lui $t2, %hi(func_80873FD8) ## $t2 = 80870000 -/* 0178C 80873FBC 254A3FD8 */ addiu $t2, $t2, %lo(func_80873FD8) ## $t2 = 80873FD8 -/* 01790 80873FC0 AE0A014C */ sw $t2, 0x014C($s0) ## 0000014C -.L80873FC4: -/* 01794 80873FC4 8FBF002C */ lw $ra, 0x002C($sp) -.L80873FC8: -/* 01798 80873FC8 8FB00028 */ lw $s0, 0x0028($sp) -/* 0179C 80873FCC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 017A0 80873FD0 03E00008 */ jr $ra -/* 017A4 80873FD4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873FD8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873FD8.s deleted file mode 100644 index 06c039586b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873FD8.s +++ /dev/null @@ -1,234 +0,0 @@ -.late_rodata -glabel D_808756AC - .float 0.03400000184774399 - - .text -glabel func_80873FD8 -/* 017A8 80873FD8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 017AC 80873FDC AFBF002C */ sw $ra, 0x002C($sp) -/* 017B0 80873FE0 AFB00028 */ sw $s0, 0x0028($sp) -/* 017B4 80873FE4 AFA5003C */ sw $a1, 0x003C($sp) -/* 017B8 80873FE8 848E02FE */ lh $t6, 0x02FE($a0) ## 000002FE -/* 017BC 80873FEC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 017C0 80873FF0 C4800168 */ lwc1 $f0, 0x0168($a0) ## 00000168 -/* 017C4 80873FF4 15C00044 */ bne $t6, $zero, .L80874108 -/* 017C8 80873FF8 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 -/* 017CC 80873FFC 8E05030C */ lw $a1, 0x030C($s0) ## 0000030C -/* 017D0 80874000 8E060314 */ lw $a2, 0x0314($s0) ## 00000314 -/* 017D4 80874004 0C01E107 */ jal Math_ApproachF - -/* 017D8 80874008 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 017DC 8087400C 3C053D0F */ lui $a1, 0x3D0F ## $a1 = 3D0F0000 -/* 017E0 80874010 3C073BA3 */ lui $a3, 0x3BA3 ## $a3 = 3BA30000 -/* 017E4 80874014 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A -/* 017E8 80874018 34A55C29 */ ori $a1, $a1, 0x5C29 ## $a1 = 3D0F5C29 -/* 017EC 8087401C 26040308 */ addiu $a0, $s0, 0x0308 ## $a0 = 00000308 -/* 017F0 80874020 0C01E107 */ jal Math_ApproachF - -/* 017F4 80874024 8E060318 */ lw $a2, 0x0318($s0) ## 00000318 -/* 017F8 80874028 3C053F4C */ lui $a1, 0x3F4C ## $a1 = 3F4C0000 -/* 017FC 8087402C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 01800 80874030 3C073CA3 */ lui $a3, 0x3CA3 ## $a3 = 3CA30000 -/* 01804 80874034 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A -/* 01808 80874038 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 0180C 8087403C 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3F4CCCCD -/* 01810 80874040 0C01E107 */ jal Math_ApproachF - -/* 01814 80874044 26040314 */ addiu $a0, $s0, 0x0314 ## $a0 = 00000314 -/* 01818 80874048 3C053E4C */ lui $a1, 0x3E4C ## $a1 = 3E4C0000 -/* 0181C 8087404C 3C063CF5 */ lui $a2, 0x3CF5 ## $a2 = 3CF50000 -/* 01820 80874050 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 -/* 01824 80874054 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD -/* 01828 80874058 34C6C28F */ ori $a2, $a2, 0xC28F ## $a2 = 3CF5C28F -/* 0182C 8087405C 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3E4CCCCD -/* 01830 80874060 0C01E107 */ jal Math_ApproachF - -/* 01834 80874064 26040318 */ addiu $a0, $s0, 0x0318 ## $a0 = 00000318 -/* 01838 80874068 3C018087 */ lui $at, %hi(D_808756AC) ## $at = 80870000 -/* 0183C 8087406C C42656AC */ lwc1 $f6, %lo(D_808756AC)($at) -/* 01840 80874070 C6040308 */ lwc1 $f4, 0x0308($s0) ## 00000308 -/* 01844 80874074 4604303E */ c.le.s $f6, $f4 -/* 01848 80874078 00000000 */ nop -/* 0184C 8087407C 4502001F */ bc1fl .L808740FC -/* 01850 80874080 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 01854 80874084 860200B6 */ lh $v0, 0x00B6($s0) ## 000000B6 -/* 01858 80874088 2841E0C1 */ slti $at, $v0, 0xE0C1 -/* 0185C 8087408C 14200018 */ bne $at, $zero, .L808740F0 -/* 01860 80874090 24590BB8 */ addiu $t9, $v0, 0x0BB8 ## $t9 = 00000BB8 -/* 01864 80874094 284103E8 */ slti $at, $v0, 0x03E8 -/* 01868 80874098 10200015 */ beq $at, $zero, .L808740F0 -/* 0186C 8087409C 00000000 */ nop -/* 01870 808740A0 0C02927F */ jal SkelAnime_Update - -/* 01874 808740A4 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 01878 808740A8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 0187C 808740AC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01880 808740B0 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 01884 808740B4 0C01E1EF */ jal Math_ApproachS - -/* 01888 808740B8 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 0188C 808740BC 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 01890 808740C0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 01894 808740C4 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 -/* 01898 808740C8 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 0189C 808740CC 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 018A0 808740D0 46804020 */ cvt.s.w $f0, $f8 -/* 018A4 808740D4 46000005 */ abs.s $f0, $f0 -/* 018A8 808740D8 460A003C */ c.lt.s $f0, $f10 -/* 018AC 808740DC 00000000 */ nop -/* 018B0 808740E0 45020080 */ bc1fl .L808742E4 -/* 018B4 808740E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018B8 808740E8 1000007D */ beq $zero, $zero, .L808742E0 -/* 018BC 808740EC A61802FE */ sh $t8, 0x02FE($s0) ## 000002FE -.L808740F0: -/* 018C0 808740F0 1000007B */ beq $zero, $zero, .L808742E0 -/* 018C4 808740F4 A61900B6 */ sh $t9, 0x00B6($s0) ## 000000B6 -/* 018C8 808740F8 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -.L808740FC: -/* 018CC 808740FC 25090BB8 */ addiu $t1, $t0, 0x0BB8 ## $t1 = 00000BB8 -/* 018D0 80874100 10000077 */ beq $zero, $zero, .L808742E0 -/* 018D4 80874104 A60900B6 */ sh $t1, 0x00B6($s0) ## 000000B6 -.L80874108: -/* 018D8 80874108 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 018DC 8087410C AFA40030 */ sw $a0, 0x0030($sp) -/* 018E0 80874110 0C02927F */ jal SkelAnime_Update - -/* 018E4 80874114 E7A00034 */ swc1 $f0, 0x0034($sp) -/* 018E8 80874118 C7A00034 */ lwc1 $f0, 0x0034($sp) -/* 018EC 8087411C C610032C */ lwc1 $f16, 0x032C($s0) ## 0000032C -/* 018F0 80874120 4600803E */ c.le.s $f16, $f0 -/* 018F4 80874124 00000000 */ nop -/* 018F8 80874128 45020030 */ bc1fl .L808741EC -/* 018FC 8087412C 8FAE003C */ lw $t6, 0x003C($sp) -/* 01900 80874130 860A02FC */ lh $t2, 0x02FC($s0) ## 000002FC -/* 01904 80874134 8FAB003C */ lw $t3, 0x003C($sp) -/* 01908 80874138 5540002C */ bnel $t2, $zero, .L808741EC -/* 0190C 8087413C 8FAE003C */ lw $t6, 0x003C($sp) -/* 01910 80874140 856C00A4 */ lh $t4, 0x00A4($t3) ## 000000A4 -/* 01914 80874144 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 01918 80874148 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0191C 8087414C 15810014 */ bne $t4, $at, .L808741A0 -/* 01920 80874150 00000000 */ nop -/* 01924 80874154 3C040602 */ lui $a0, %hi(D_0601D514) ## $a0 = 06020000 -/* 01928 80874158 0C028800 */ jal Animation_GetLastFrame - -/* 0192C 8087415C 2484D514 */ addiu $a0, $a0, %lo(D_0601D514) ## $a0 = 0601D514 -/* 01930 80874160 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 -/* 01934 80874164 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01938 80874168 44812000 */ mtc1 $at, $f4 ## $f4 = -10.00 -/* 0193C 8087416C 46809020 */ cvt.s.w $f0, $f18 -/* 01940 80874170 3C050602 */ lui $a1, %hi(D_0601D514) ## $a1 = 06020000 -/* 01944 80874174 24A5D514 */ addiu $a1, $a1, %lo(D_0601D514) ## $a1 = 0601D514 -/* 01948 80874178 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0194C 8087417C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01950 80874180 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 01954 80874184 AFA00014 */ sw $zero, 0x0014($sp) -/* 01958 80874188 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 0195C 8087418C 8FA40030 */ lw $a0, 0x0030($sp) -/* 01960 80874190 0C029468 */ jal Animation_Change - -/* 01964 80874194 E7A40018 */ swc1 $f4, 0x0018($sp) -/* 01968 80874198 10000012 */ beq $zero, $zero, .L808741E4 -/* 0196C 8087419C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -.L808741A0: -/* 01970 808741A0 0C028800 */ jal Animation_GetLastFrame - -/* 01974 808741A4 24841DF0 */ addiu $a0, $a0, 0x1DF0 ## $a0 = 00001DF0 -/* 01978 808741A8 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 0197C 808741AC 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01980 808741B0 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 01984 808741B4 46803020 */ cvt.s.w $f0, $f6 -/* 01988 808741B8 3C050600 */ lui $a1, %hi(D_06001DF0) ## $a1 = 06000000 -/* 0198C 808741BC 24A51DF0 */ addiu $a1, $a1, %lo(D_06001DF0) ## $a1 = 06001DF0 -/* 01990 808741C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01994 808741C4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01998 808741C8 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 0199C 808741CC AFA00014 */ sw $zero, 0x0014($sp) -/* 019A0 808741D0 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 019A4 808741D4 8FA40030 */ lw $a0, 0x0030($sp) -/* 019A8 808741D8 0C029468 */ jal Animation_Change - -/* 019AC 808741DC E7A80018 */ swc1 $f8, 0x0018($sp) -/* 019B0 808741E0 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -.L808741E4: -/* 019B4 808741E4 A60D02FC */ sh $t5, 0x02FC($s0) ## 000002FC -/* 019B8 808741E8 8FAE003C */ lw $t6, 0x003C($sp) -.L808741EC: -/* 019BC 808741EC 91CF1D6C */ lbu $t7, 0x1D6C($t6) ## 00001D6C -/* 019C0 808741F0 51E0003C */ beql $t7, $zero, .L808742E4 -/* 019C4 808741F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 019C8 808741F8 8DC21D8C */ lw $v0, 0x1D8C($t6) ## 00001D8C -/* 019CC 808741FC 50400039 */ beql $v0, $zero, .L808742E4 -/* 019D0 80874200 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 019D4 80874204 94580000 */ lhu $t8, 0x0000($v0) ## 00000000 -/* 019D8 80874208 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 019DC 8087420C 57010035 */ bnel $t8, $at, .L808742E4 -/* 019E0 80874210 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 019E4 80874214 A60002FC */ sh $zero, 0x02FC($s0) ## 000002FC -/* 019E8 80874218 861902FC */ lh $t9, 0x02FC($s0) ## 000002FC -/* 019EC 8087421C 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 019F0 80874220 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 019F4 80874224 A61902FE */ sh $t9, 0x02FE($s0) ## 000002FE -/* 019F8 80874228 8FA8003C */ lw $t0, 0x003C($sp) -/* 019FC 8087422C 850900A4 */ lh $t1, 0x00A4($t0) ## 000000A4 -/* 01A00 80874230 15210015 */ bne $t1, $at, .L80874288 -/* 01A04 80874234 00000000 */ nop -/* 01A08 80874238 3C040600 */ lui $a0, %hi(D_060069E8) ## $a0 = 06000000 -/* 01A0C 8087423C 0C028800 */ jal Animation_GetLastFrame - -/* 01A10 80874240 248469E8 */ addiu $a0, $a0, %lo(D_060069E8) ## $a0 = 060069E8 -/* 01A14 80874244 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 01A18 80874248 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01A1C 8087424C 44818000 */ mtc1 $at, $f16 ## $f16 = -10.00 -/* 01A20 80874250 46805020 */ cvt.s.w $f0, $f10 -/* 01A24 80874254 3C050600 */ lui $a1, %hi(D_060069E8) ## $a1 = 06000000 -/* 01A28 80874258 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 01A2C 8087425C 24A569E8 */ addiu $a1, $a1, %lo(D_060069E8) ## $a1 = 060069E8 -/* 01A30 80874260 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01A34 80874264 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01A38 80874268 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 01A3C 8087426C AFAA0014 */ sw $t2, 0x0014($sp) -/* 01A40 80874270 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01A44 80874274 8FA40030 */ lw $a0, 0x0030($sp) -/* 01A48 80874278 0C029468 */ jal Animation_Change - -/* 01A4C 8087427C E7B00018 */ swc1 $f16, 0x0018($sp) -/* 01A50 80874280 10000012 */ beq $zero, $zero, .L808742CC -/* 01A54 80874284 00000000 */ nop -.L80874288: -/* 01A58 80874288 0C028800 */ jal Animation_GetLastFrame - -/* 01A5C 8087428C 24845810 */ addiu $a0, $a0, 0x5810 ## $a0 = 00005810 -/* 01A60 80874290 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 -/* 01A64 80874294 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01A68 80874298 44812000 */ mtc1 $at, $f4 ## $f4 = -10.00 -/* 01A6C 8087429C 46809020 */ cvt.s.w $f0, $f18 -/* 01A70 808742A0 3C050600 */ lui $a1, %hi(D_06005810) ## $a1 = 06000000 -/* 01A74 808742A4 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 01A78 808742A8 24A55810 */ addiu $a1, $a1, %lo(D_06005810) ## $a1 = 06005810 -/* 01A7C 808742AC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01A80 808742B0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01A84 808742B4 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 01A88 808742B8 AFAB0014 */ sw $t3, 0x0014($sp) -/* 01A8C 808742BC E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01A90 808742C0 8FA40030 */ lw $a0, 0x0030($sp) -/* 01A94 808742C4 0C029468 */ jal Animation_Change - -/* 01A98 808742C8 E7A40018 */ swc1 $f4, 0x0018($sp) -.L808742CC: -/* 01A9C 808742CC 3C0D8087 */ lui $t5, %hi(func_80874304) ## $t5 = 80870000 -/* 01AA0 808742D0 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 01AA4 808742D4 25AD4304 */ addiu $t5, $t5, %lo(func_80874304) ## $t5 = 80874304 -/* 01AA8 808742D8 A60C02F6 */ sh $t4, 0x02F6($s0) ## 000002F6 -/* 01AAC 808742DC AE0D014C */ sw $t5, 0x014C($s0) ## 0000014C -.L808742E0: -/* 01AB0 808742E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L808742E4: -/* 01AB4 808742E4 8FA5003C */ lw $a1, 0x003C($sp) -/* 01AB8 808742E8 0C21CA58 */ jal func_80872960 -/* 01ABC 808742EC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01AC0 808742F0 8FBF002C */ lw $ra, 0x002C($sp) -/* 01AC4 808742F4 8FB00028 */ lw $s0, 0x0028($sp) -/* 01AC8 808742F8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01ACC 808742FC 03E00008 */ jr $ra -/* 01AD0 80874300 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874304.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874304.s deleted file mode 100644 index 54744f03b9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874304.s +++ /dev/null @@ -1,451 +0,0 @@ -.late_rodata -glabel D_808756B0 - .float 0.3 - - .text -glabel func_80874304 -/* 01AD4 80874304 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 01AD8 80874308 AFBF003C */ sw $ra, 0x003C($sp) -/* 01ADC 8087430C AFB10038 */ sw $s1, 0x0038($sp) -/* 01AE0 80874310 AFB00034 */ sw $s0, 0x0034($sp) -/* 01AE4 80874314 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 01AE8 80874318 C4820168 */ lwc1 $f2, 0x0168($a0) ## 00000168 -/* 01AEC 8087431C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01AF0 80874320 AFAE0058 */ sw $t6, 0x0058($sp) -/* 01AF4 80874324 848F02FC */ lh $t7, 0x02FC($a0) ## 000002FC -/* 01AF8 80874328 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01AFC 8087432C 3C0144AF */ lui $at, 0x44AF ## $at = 44AF0000 -/* 01B00 80874330 11E0000E */ beq $t7, $zero, .L8087436C -/* 01B04 80874334 46001306 */ mov.s $f12, $f2 -/* 01B08 80874338 44817000 */ mtc1 $at, $f14 ## $f14 = 1400.00 -/* 01B0C 8087433C C484032C */ lwc1 $f4, 0x032C($a0) ## 0000032C -/* 01B10 80874340 460E1002 */ mul.s $f0, $f2, $f14 -/* 01B14 80874344 00000000 */ nop -/* 01B18 80874348 460E2182 */ mul.s $f6, $f4, $f14 -/* 01B1C 8087434C E4800324 */ swc1 $f0, 0x0324($a0) ## 00000324 -/* 01B20 80874350 4600303E */ c.le.s $f6, $f0 -/* 01B24 80874354 00000000 */ nop -/* 01B28 80874358 45000004 */ bc1f .L8087436C -/* 01B2C 8087435C 00000000 */ nop -/* 01B30 80874360 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 01B34 80874364 00000000 */ nop -/* 01B38 80874368 E4880324 */ swc1 $f8, 0x0324($a0) ## 00000324 -.L8087436C: -/* 01B3C 8087436C 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 01B40 80874370 AFA40040 */ sw $a0, 0x0040($sp) -/* 01B44 80874374 0C02927F */ jal SkelAnime_Update - -/* 01B48 80874378 E7AC005C */ swc1 $f12, 0x005C($sp) -/* 01B4C 8087437C C7AC005C */ lwc1 $f12, 0x005C($sp) -/* 01B50 80874380 C60A032C */ lwc1 $f10, 0x032C($s0) ## 0000032C -/* 01B54 80874384 460C503E */ c.le.s $f10, $f12 -/* 01B58 80874388 00000000 */ nop -/* 01B5C 8087438C 4502002F */ bc1fl .L8087444C -/* 01B60 80874390 8E2B1D8C */ lw $t3, 0x1D8C($s1) ## 00001D8C -/* 01B64 80874394 861802FC */ lh $t8, 0x02FC($s0) ## 000002FC -/* 01B68 80874398 5700002C */ bnel $t8, $zero, .L8087444C -/* 01B6C 8087439C 8E2B1D8C */ lw $t3, 0x1D8C($s1) ## 00001D8C -/* 01B70 808743A0 863900A4 */ lh $t9, 0x00A4($s1) ## 000000A4 -/* 01B74 808743A4 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 01B78 808743A8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01B7C 808743AC 17210014 */ bne $t9, $at, .L80874400 -/* 01B80 808743B0 00000000 */ nop -/* 01B84 808743B4 3C040600 */ lui $a0, %hi(D_06007CA8) ## $a0 = 06000000 -/* 01B88 808743B8 0C028800 */ jal Animation_GetLastFrame - -/* 01B8C 808743BC 24847CA8 */ addiu $a0, $a0, %lo(D_06007CA8) ## $a0 = 06007CA8 -/* 01B90 808743C0 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 01B94 808743C4 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01B98 808743C8 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 01B9C 808743CC 46808020 */ cvt.s.w $f0, $f16 -/* 01BA0 808743D0 3C050600 */ lui $a1, %hi(D_06007CA8) ## $a1 = 06000000 -/* 01BA4 808743D4 24A57CA8 */ addiu $a1, $a1, %lo(D_06007CA8) ## $a1 = 06007CA8 -/* 01BA8 808743D8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01BAC 808743DC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01BB0 808743E0 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 01BB4 808743E4 AFA00014 */ sw $zero, 0x0014($sp) -/* 01BB8 808743E8 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01BBC 808743EC 8FA40040 */ lw $a0, 0x0040($sp) -/* 01BC0 808743F0 0C029468 */ jal Animation_Change - -/* 01BC4 808743F4 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 01BC8 808743F8 10000012 */ beq $zero, $zero, .L80874444 -/* 01BCC 808743FC 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -.L80874400: -/* 01BD0 80874400 0C028800 */ jal Animation_GetLastFrame - -/* 01BD4 80874404 24844344 */ addiu $a0, $a0, 0x4344 ## $a0 = 00004344 -/* 01BD8 80874408 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01BDC 8087440C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01BE0 80874410 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 01BE4 80874414 46802020 */ cvt.s.w $f0, $f4 -/* 01BE8 80874418 3C050600 */ lui $a1, %hi(D_06004344) ## $a1 = 06000000 -/* 01BEC 8087441C 24A54344 */ addiu $a1, $a1, %lo(D_06004344) ## $a1 = 06004344 -/* 01BF0 80874420 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01BF4 80874424 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01BF8 80874428 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 01BFC 8087442C AFA00014 */ sw $zero, 0x0014($sp) -/* 01C00 80874430 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01C04 80874434 8FA40040 */ lw $a0, 0x0040($sp) -/* 01C08 80874438 0C029468 */ jal Animation_Change - -/* 01C0C 8087443C E7A60018 */ swc1 $f6, 0x0018($sp) -/* 01C10 80874440 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -.L80874444: -/* 01C14 80874444 A60A02FC */ sh $t2, 0x02FC($s0) ## 000002FC -/* 01C18 80874448 8E2B1D8C */ lw $t3, 0x1D8C($s1) ## 00001D8C -.L8087444C: -/* 01C1C 8087444C 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 01C20 80874450 3C0C8087 */ lui $t4, %hi(func_80873C14) ## $t4 = 80870000 -/* 01C24 80874454 95620000 */ lhu $v0, 0x0000($t3) ## 00000000 -/* 01C28 80874458 258C3C14 */ addiu $t4, $t4, %lo(func_80873C14) ## $t4 = 80873C14 -/* 01C2C 8087445C 54410004 */ bnel $v0, $at, .L80874470 -/* 01C30 80874460 28410004 */ slti $at, $v0, 0x0004 -/* 01C34 80874464 10000135 */ beq $zero, $zero, .L8087493C -/* 01C38 80874468 AE0C014C */ sw $t4, 0x014C($s0) ## 0000014C -/* 01C3C 8087446C 28410004 */ slti $at, $v0, 0x0004 -.L80874470: -/* 01C40 80874470 14200030 */ bne $at, $zero, .L80874534 -/* 01C44 80874474 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C48 80874478 28410007 */ slti $at, $v0, 0x0007 -/* 01C4C 8087447C 1020002D */ beq $at, $zero, .L80874534 -/* 01C50 80874480 244DFFFC */ addiu $t5, $v0, 0xFFFC ## $t5 = FFFFFFFC -/* 01C54 80874484 A7AD0056 */ sh $t5, 0x0056($sp) -/* 01C58 80874488 862300A4 */ lh $v1, 0x00A4($s1) ## 000000A4 -/* 01C5C 8087448C 87AE0056 */ lh $t6, 0x0056($sp) -/* 01C60 80874490 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 01C64 80874494 14610009 */ bne $v1, $at, .L808744BC -/* 01C68 80874498 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 01C6C 8087449C 000F3400 */ sll $a2, $t7, 16 -/* 01C70 808744A0 A7AF0056 */ sh $t7, 0x0056($sp) -/* 01C74 808744A4 00063403 */ sra $a2, $a2, 16 -/* 01C78 808744A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C7C 808744AC 0C21CA58 */ jal func_80872960 -/* 01C80 808744B0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01C84 808744B4 10000023 */ beq $zero, $zero, .L80874544 -/* 01C88 808744B8 862300A4 */ lh $v1, 0x00A4($s1) ## 000000A4 -.L808744BC: -/* 01C8C 808744BC 921802E4 */ lbu $t8, 0x02E4($s0) ## 000002E4 -/* 01C90 808744C0 87B90056 */ lh $t9, 0x0056($sp) -/* 01C94 808744C4 3C028087 */ lui $v0, %hi(D_808754B0) ## $v0 = 80870000 -/* 01C98 808744C8 1700001E */ bne $t8, $zero, .L80874544 -/* 01C9C 808744CC 00195040 */ sll $t2, $t9, 1 -/* 01CA0 808744D0 004A1021 */ addu $v0, $v0, $t2 -/* 01CA4 808744D4 844254B0 */ lh $v0, %lo(D_808754B0)($v0) -/* 01CA8 808744D8 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 01CAC 808744DC 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 01CB0 808744E0 00021300 */ sll $v0, $v0, 12 -/* 01CB4 808744E4 00021400 */ sll $v0, $v0, 16 -/* 01CB8 808744E8 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01CBC 808744EC C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 01CC0 808744F0 00021403 */ sra $v0, $v0, 16 -/* 01CC4 808744F4 34420012 */ ori $v0, $v0, 0x0012 ## $v0 = 80870012 -/* 01CC8 808744F8 00021400 */ sll $v0, $v0, 16 -/* 01CCC 808744FC 00021403 */ sra $v0, $v0, 16 -/* 01CD0 80874500 AFA20024 */ sw $v0, 0x0024($sp) -/* 01CD4 80874504 AFA00020 */ sw $zero, 0x0020($sp) -/* 01CD8 80874508 AFA0001C */ sw $zero, 0x001C($sp) -/* 01CDC 8087450C AFA00018 */ sw $zero, 0x0018($sp) -/* 01CE0 80874510 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 01CE4 80874514 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01CE8 80874518 2406008B */ addiu $a2, $zero, 0x008B ## $a2 = 0000008B -/* 01CEC 8087451C 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 01CF0 80874520 E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 01CF4 80874524 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 01CF8 80874528 A20B02E4 */ sb $t3, 0x02E4($s0) ## 000002E4 -/* 01CFC 8087452C 10000005 */ beq $zero, $zero, .L80874544 -/* 01D00 80874530 862300A4 */ lh $v1, 0x00A4($s1) ## 000000A4 -.L80874534: -/* 01D04 80874534 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01D08 80874538 0C21CA58 */ jal func_80872960 -/* 01D0C 8087453C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01D10 80874540 862300A4 */ lh $v1, 0x00A4($s1) ## 000000A4 -.L80874544: -/* 01D14 80874544 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 01D18 80874548 54610043 */ bnel $v1, $at, .L80874658 -/* 01D1C 8087454C 862300A4 */ lh $v1, 0x00A4($s1) ## 000000A4 -/* 01D20 80874550 8E2C1D8C */ lw $t4, 0x1D8C($s1) ## 00001D8C -/* 01D24 80874554 95820000 */ lhu $v0, 0x0000($t4) ## 00000000 -/* 01D28 80874558 2841000A */ slti $at, $v0, 0x000A -/* 01D2C 8087455C 1420003D */ bne $at, $zero, .L80874654 -/* 01D30 80874560 2841000D */ slti $at, $v0, 0x000D -/* 01D34 80874564 1020003B */ beq $at, $zero, .L80874654 -/* 01D38 80874568 2443FFF6 */ addiu $v1, $v0, 0xFFF6 ## $v1 = FFFFFFF6 -/* 01D3C 8087456C 00031C00 */ sll $v1, $v1, 16 -/* 01D40 80874570 00031C03 */ sra $v1, $v1, 16 -/* 01D44 80874574 10600009 */ beq $v1, $zero, .L8087459C -/* 01D48 80874578 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 01D4C 8087457C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01D50 80874580 10610010 */ beq $v1, $at, .L808745C4 -/* 01D54 80874584 3C0F8016 */ lui $t7, %hi(gSaveContext+0x3a) -/* 01D58 80874588 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01D5C 8087458C 1061001F */ beq $v1, $at, .L8087460C -/* 01D60 80874590 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 01D64 80874594 10000024 */ beq $zero, $zero, .L80874628 -/* 01D68 80874598 920C02E6 */ lbu $t4, 0x02E6($s0) ## 000002E6 -.L8087459C: -/* 01D6C 8087459C 3C018016 */ lui $at, %hi(gSaveContext+0x3a) -/* 01D70 808745A0 A02DE69A */ sb $t5, %lo(gSaveContext+0x3a)($at) -/* 01D74 808745A4 3C018016 */ lui $at, %hi(gSaveContext+0x13f6) -/* 01D78 808745A8 240E0030 */ addiu $t6, $zero, 0x0030 ## $t6 = 00000030 -/* 01D7C 808745AC A42EFA56 */ sh $t6, %lo(gSaveContext+0x13f6)($at) -/* 01D80 808745B0 24040009 */ addiu $a0, $zero, 0x0009 ## $a0 = 00000009 -/* 01D84 808745B4 0C020978 */ jal Interface_ChangeAlpha -/* 01D88 808745B8 A7A30056 */ sh $v1, 0x0056($sp) -/* 01D8C 808745BC 10000019 */ beq $zero, $zero, .L80874624 -/* 01D90 808745C0 87A30056 */ lh $v1, 0x0056($sp) -.L808745C4: -/* 01D94 808745C4 91EFE69A */ lbu $t7, %lo(gSaveContext+0x3a)($t7) -/* 01D98 808745C8 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 01D9C 808745CC 240A0060 */ addiu $t2, $zero, 0x0060 ## $t2 = 00000060 -/* 01DA0 808745D0 15E00004 */ bne $t7, $zero, .L808745E4 -/* 01DA4 808745D4 24040009 */ addiu $a0, $zero, 0x0009 ## $a0 = 00000009 -/* 01DA8 808745D8 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 01DAC 808745DC 3C018016 */ lui $at, %hi(gSaveContext+0x3a) -/* 01DB0 808745E0 A038E69A */ sb $t8, %lo(gSaveContext+0x3a)($at) -.L808745E4: -/* 01DB4 808745E4 3C018016 */ lui $at, %hi(gSaveContext+0x3c) -/* 01DB8 808745E8 A039E69C */ sb $t9, %lo(gSaveContext+0x3c)($at) -/* 01DBC 808745EC 3C018016 */ lui $at, %hi(gSaveContext+0x13f6) -/* 01DC0 808745F0 A42AFA56 */ sh $t2, %lo(gSaveContext+0x13f6)($at) -/* 01DC4 808745F4 3C018016 */ lui $at, %hi(gSaveContext+0x32) -/* 01DC8 808745F8 A020E692 */ sb $zero, %lo(gSaveContext+0x32)($at) -/* 01DCC 808745FC 0C020978 */ jal Interface_ChangeAlpha -/* 01DD0 80874600 A7A30056 */ sh $v1, 0x0056($sp) -/* 01DD4 80874604 10000007 */ beq $zero, $zero, .L80874624 -/* 01DD8 80874608 87A30056 */ lh $v1, 0x0056($sp) -.L8087460C: -/* 01DDC 8087460C 3C018016 */ lui $at, %hi(gSaveContext+0x3d) -/* 01DE0 80874610 A02BE69D */ sb $t3, %lo(gSaveContext+0x3d)($at) -/* 01DE4 80874614 24040009 */ addiu $a0, $zero, 0x0009 ## $a0 = 00000009 -/* 01DE8 80874618 0C020978 */ jal Interface_ChangeAlpha -/* 01DEC 8087461C A7A30056 */ sh $v1, 0x0056($sp) -/* 01DF0 80874620 87A30056 */ lh $v1, 0x0056($sp) -.L80874624: -/* 01DF4 80874624 920C02E6 */ lbu $t4, 0x02E6($s0) ## 000002E6 -.L80874628: -/* 01DF8 80874628 3C098016 */ lui $t1, %hi(gSaveContext) -/* 01DFC 8087462C 2529E660 */ addiu $t1, %lo(gSaveContext) -/* 01E00 80874630 15800008 */ bne $t4, $zero, .L80874654 -/* 01E04 80874634 240D0140 */ addiu $t5, $zero, 0x0140 ## $t5 = 00000140 -/* 01E08 80874638 A52D1424 */ sh $t5, 0x1424($t1) ## 8015FA84 -/* 01E0C 8087463C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 01E10 80874640 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01E14 80874644 14610003 */ bne $v1, $at, .L80874654 -/* 01E18 80874648 A20E02E6 */ sb $t6, 0x02E6($s0) ## 000002E6 -/* 01E1C 8087464C 0C021DA0 */ jal Magic_Fill -/* 01E20 80874650 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80874654: -/* 01E24 80874654 862300A4 */ lh $v1, 0x00A4($s1) ## 000000A4 -.L80874658: -/* 01E28 80874658 3C098016 */ lui $t1, %hi(gSaveContext) -/* 01E2C 8087465C 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 01E30 80874660 10610074 */ beq $v1, $at, .L80874834 -/* 01E34 80874664 2529E660 */ addiu $t1, %lo(gSaveContext) -/* 01E38 80874668 8E2F1D8C */ lw $t7, 0x1D8C($s1) ## 00001D8C -/* 01E3C 8087466C 95E20000 */ lhu $v0, 0x0000($t7) ## 00000000 -/* 01E40 80874670 2841000E */ slti $at, $v0, 0x000E -/* 01E44 80874674 1420006F */ bne $at, $zero, .L80874834 -/* 01E48 80874678 28410011 */ slti $at, $v0, 0x0011 -/* 01E4C 8087467C 5020006E */ beql $at, $zero, .L80874838 -/* 01E50 80874680 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 01E54 80874684 86180300 */ lh $t8, 0x0300($s0) ## 00000300 -/* 01E58 80874688 2443FFF2 */ addiu $v1, $v0, 0xFFF2 ## $v1 = FFFFFFF2 -/* 01E5C 8087468C 00031C00 */ sll $v1, $v1, 16 -/* 01E60 80874690 1700004C */ bne $t8, $zero, .L808747C4 -/* 01E64 80874694 00031C03 */ sra $v1, $v1, 16 -/* 01E68 80874698 8D390004 */ lw $t9, 0x0004($t1) ## 8015E664 -/* 01E6C 8087469C 8FA80058 */ lw $t0, 0x0058($sp) -/* 01E70 808746A0 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 01E74 808746A4 17200006 */ bne $t9, $zero, .L808746C0 -/* 01E78 808746A8 C50C0024 */ lwc1 $f12, 0x0024($t0) ## 00000024 -/* 01E7C 808746AC 3C014292 */ lui $at, 0x4292 ## $at = 42920000 -/* 01E80 808746B0 44819000 */ mtc1 $at, $f18 ## $f18 = 73.00 -/* 01E84 808746B4 C5100028 */ lwc1 $f16, 0x0028($t0) ## 00000028 -/* 01E88 808746B8 10000005 */ beq $zero, $zero, .L808746D0 -/* 01E8C 808746BC 46128080 */ add.s $f2, $f16, $f18 -.L808746C0: -/* 01E90 808746C0 3C014254 */ lui $at, 0x4254 ## $at = 42540000 -/* 01E94 808746C4 44813000 */ mtc1 $at, $f6 ## $f6 = 53.00 -/* 01E98 808746C8 C5040028 */ lwc1 $f4, 0x0028($t0) ## 00000028 -/* 01E9C 808746CC 46062080 */ add.s $f2, $f4, $f6 -.L808746D0: -/* 01EA0 808746D0 C500002C */ lwc1 $f0, 0x002C($t0) ## 0000002C -/* 01EA4 808746D4 00031040 */ sll $v0, $v1, 1 -/* 01EA8 808746D8 3C0A8087 */ lui $t2, %hi(D_808754B8) ## $t2 = 80870000 -/* 01EAC 808746DC 01425021 */ addu $t2, $t2, $v0 -/* 01EB0 808746E0 854A54B8 */ lh $t2, %lo(D_808754B8)($t2) -/* 01EB4 808746E4 AFA20040 */ sw $v0, 0x0040($sp) -/* 01EB8 808746E8 A7A30056 */ sh $v1, 0x0056($sp) -/* 01EBC 808746EC AFA00024 */ sw $zero, 0x0024($sp) -/* 01EC0 808746F0 AFA00020 */ sw $zero, 0x0020($sp) -/* 01EC4 808746F4 AFA0001C */ sw $zero, 0x001C($sp) -/* 01EC8 808746F8 E7A20014 */ swc1 $f2, 0x0014($sp) -/* 01ECC 808746FC E7AC0010 */ swc1 $f12, 0x0010($sp) -/* 01ED0 80874700 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01ED4 80874704 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -/* 01ED8 80874708 24070168 */ addiu $a3, $zero, 0x0168 ## $a3 = 00000168 -/* 01EDC 8087470C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01EE0 80874710 0C00C916 */ jal Actor_SpawnAsChild - -/* 01EE4 80874714 AFAA0028 */ sw $t2, 0x0028($sp) -/* 01EE8 80874718 87A30056 */ lh $v1, 0x0056($sp) -/* 01EEC 8087471C 10400025 */ beq $v0, $zero, .L808747B4 -/* 01EF0 80874720 AE020344 */ sw $v0, 0x0344($s0) ## 00000344 -/* 01EF4 80874724 3C028016 */ lui $v0, %hi(gSaveContext) -/* 01EF8 80874728 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01EFC 8087472C 904B003A */ lbu $t3, 0x003A($v0) ## 8015E69A -/* 01F00 80874730 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 01F04 80874734 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01F08 80874738 15600003 */ bne $t3, $zero, .L80874748 -/* 01F0C 8087473C 00000000 */ nop -/* 01F10 80874740 10000006 */ beq $zero, $zero, .L8087475C -/* 01F14 80874744 A04C003A */ sb $t4, 0x003A($v0) ## 8015E69A -.L80874748: -/* 01F18 80874748 0C021DA0 */ jal Magic_Fill -/* 01F1C 8087474C A7A30056 */ sh $v1, 0x0056($sp) -/* 01F20 80874750 3C028016 */ lui $v0, %hi(gSaveContext) -/* 01F24 80874754 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01F28 80874758 87A30056 */ lh $v1, 0x0056($sp) -.L8087475C: -/* 01F2C 8087475C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 01F30 80874760 A60D0300 */ sh $t5, 0x0300($s0) ## 00000300 -/* 01F34 80874764 240E0140 */ addiu $t6, $zero, 0x0140 ## $t6 = 00000140 -/* 01F38 80874768 A44E1424 */ sh $t6, 0x1424($v0) ## 8015FA84 -/* 01F3C 8087476C A7A30056 */ sh $v1, 0x0056($sp) -/* 01F40 80874770 0C020978 */ jal Interface_ChangeAlpha -/* 01F44 80874774 24040009 */ addiu $a0, $zero, 0x0009 ## $a0 = 00000009 -/* 01F48 80874778 8FB80040 */ lw $t8, 0x0040($sp) -/* 01F4C 8087477C 3C028016 */ lui $v0, %hi(gSaveContext) -/* 01F50 80874780 3C198087 */ lui $t9, %hi(D_808754C0) ## $t9 = 80870000 -/* 01F54 80874784 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01F58 80874788 0338C821 */ addu $t9, $t9, $t8 -/* 01F5C 8087478C 873954C0 */ lh $t9, %lo(D_808754C0)($t9) -/* 01F60 80874790 944F0EF2 */ lhu $t7, 0x0EF2($v0) ## 8015F552 -/* 01F64 80874794 87A30056 */ lh $v1, 0x0056($sp) -/* 01F68 80874798 3C058087 */ lui $a1, %hi(D_808754C8) ## $a1 = 80870000 -/* 01F6C 8087479C 01F95025 */ or $t2, $t7, $t9 ## $t2 = 80870000 -/* 01F70 808747A0 A44A0EF2 */ sh $t2, 0x0EF2($v0) ## 8015F552 -/* 01F74 808747A4 00A32821 */ addu $a1, $a1, $v1 -/* 01F78 808747A8 90A554C8 */ lbu $a1, %lo(D_808754C8)($a1) -/* 01F7C 808747AC 0C021344 */ jal Item_Give -/* 01F80 808747B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L808747B4: -/* 01F84 808747B4 3C098016 */ lui $t1, %hi(gSaveContext) -/* 01F88 808747B8 2529E660 */ addiu $t1, %lo(gSaveContext) -/* 01F8C 808747BC 1000001D */ beq $zero, $zero, .L80874834 -/* 01F90 808747C0 862300A4 */ lh $v1, 0x00A4($s1) ## 000000A4 -.L808747C4: -/* 01F94 808747C4 8FA50058 */ lw $a1, 0x0058($sp) -/* 01F98 808747C8 8E0B0344 */ lw $t3, 0x0344($s0) ## 00000344 -/* 01F9C 808747CC 3C014254 */ lui $at, 0x4254 ## $at = 42540000 -/* 01FA0 808747D0 C4A80024 */ lwc1 $f8, 0x0024($a1) ## 00000024 -/* 01FA4 808747D4 E5680024 */ swc1 $f8, 0x0024($t3) ## 00000024 -/* 01FA8 808747D8 8D2C0004 */ lw $t4, 0x0004($t1) ## 8015E664 -/* 01FAC 808747DC 55800009 */ bnel $t4, $zero, .L80874804 -/* 01FB0 808747E0 C4A40028 */ lwc1 $f4, 0x0028($a1) ## 00000028 -/* 01FB4 808747E4 3C014292 */ lui $at, 0x4292 ## $at = 42920000 -/* 01FB8 808747E8 44818000 */ mtc1 $at, $f16 ## $f16 = 73.00 -/* 01FBC 808747EC C4AA0028 */ lwc1 $f10, 0x0028($a1) ## 00000028 -/* 01FC0 808747F0 8E0D0344 */ lw $t5, 0x0344($s0) ## 00000344 -/* 01FC4 808747F4 46105480 */ add.s $f18, $f10, $f16 -/* 01FC8 808747F8 10000006 */ beq $zero, $zero, .L80874814 -/* 01FCC 808747FC E5B20028 */ swc1 $f18, 0x0028($t5) ## 00000028 -/* 01FD0 80874800 C4A40028 */ lwc1 $f4, 0x0028($a1) ## 00000028 -.L80874804: -/* 01FD4 80874804 44813000 */ mtc1 $at, $f6 ## $f6 = 73.00 -/* 01FD8 80874808 8E0E0344 */ lw $t6, 0x0344($s0) ## 00000344 -/* 01FDC 8087480C 46062200 */ add.s $f8, $f4, $f6 -/* 01FE0 80874810 E5C80028 */ swc1 $f8, 0x0028($t6) ## 00000028 -.L80874814: -/* 01FE4 80874814 C4AA002C */ lwc1 $f10, 0x002C($a1) ## 0000002C -/* 01FE8 80874818 8E180344 */ lw $t8, 0x0344($s0) ## 00000344 -/* 01FEC 8087481C 3C018087 */ lui $at, %hi(D_808756B0) ## $at = 80870000 -/* 01FF0 80874820 E70A002C */ swc1 $f10, 0x002C($t8) ## 0000002C -/* 01FF4 80874824 8E0F0344 */ lw $t7, 0x0344($s0) ## 00000344 -/* 01FF8 80874828 C43056B0 */ lwc1 $f16, %lo(D_808756B0)($at) -/* 01FFC 8087482C E5F00164 */ swc1 $f16, 0x0164($t7) ## 00000164 -/* 02000 80874830 862300A4 */ lh $v1, 0x00A4($s1) ## 000000A4 -.L80874834: -/* 02004 80874834 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -.L80874838: -/* 02008 80874838 50610010 */ beql $v1, $at, .L8087487C -/* 0200C 8087483C 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 02010 80874840 8E391D8C */ lw $t9, 0x1D8C($s1) ## 00001D8C -/* 02014 80874844 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 02018 80874848 972A0000 */ lhu $t2, 0x0000($t9) ## 00000000 -/* 0201C 8087484C 5541000B */ bnel $t2, $at, .L8087487C -/* 02020 80874850 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 02024 80874854 8E040344 */ lw $a0, 0x0344($s0) ## 00000344 -/* 02028 80874858 50800008 */ beql $a0, $zero, .L8087487C -/* 0202C 8087485C 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 02030 80874860 0C00B55C */ jal Actor_Kill - -/* 02034 80874864 00000000 */ nop -/* 02038 80874868 AE000344 */ sw $zero, 0x0344($s0) ## 00000344 -/* 0203C 8087486C 3C098016 */ lui $t1, %hi(gSaveContext) -/* 02040 80874870 2529E660 */ addiu $t1, %lo(gSaveContext) -/* 02044 80874874 862300A4 */ lh $v1, 0x00A4($s1) ## 000000A4 -/* 02048 80874878 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -.L8087487C: -/* 0204C 8087487C 54610009 */ bnel $v1, $at, .L808748A4 -/* 02050 80874880 920E02E5 */ lbu $t6, 0x02E5($s0) ## 000002E5 -/* 02054 80874884 8E2B1D8C */ lw $t3, 0x1D8C($s1) ## 00001D8C -/* 02058 80874888 24010012 */ addiu $at, $zero, 0x0012 ## $at = 00000012 -/* 0205C 8087488C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 02060 80874890 956C0000 */ lhu $t4, 0x0000($t3) ## 00000000 -/* 02064 80874894 55810003 */ bnel $t4, $at, .L808748A4 -/* 02068 80874898 920E02E5 */ lbu $t6, 0x02E5($s0) ## 000002E5 -/* 0206C 8087489C A20D02E5 */ sb $t5, 0x02E5($s0) ## 000002E5 -/* 02070 808748A0 920E02E5 */ lbu $t6, 0x02E5($s0) ## 000002E5 -.L808748A4: -/* 02074 808748A4 51C00007 */ beql $t6, $zero, .L808748C4 -/* 02078 808748A8 8E2F1D8C */ lw $t7, 0x1D8C($s1) ## 00001D8C -/* 0207C 808748AC 812200CF */ lb $v0, 0x00CF($t1) ## 8015E72F -/* 02080 808748B0 28410014 */ slti $at, $v0, 0x0014 -/* 02084 808748B4 10200002 */ beq $at, $zero, .L808748C0 -/* 02088 808748B8 24580001 */ addiu $t8, $v0, 0x0001 ## $t8 = 00000001 -/* 0208C 808748BC A13800CF */ sb $t8, 0x00CF($t1) ## 8015E72F -.L808748C0: -/* 02090 808748C0 8E2F1D8C */ lw $t7, 0x1D8C($s1) ## 00001D8C -.L808748C4: -/* 02094 808748C4 95E20000 */ lhu $v0, 0x0000($t7) ## 00000000 -/* 02098 808748C8 28410013 */ slti $at, $v0, 0x0013 -/* 0209C 808748CC 14200018 */ bne $at, $zero, .L80874930 -/* 020A0 808748D0 28410016 */ slti $at, $v0, 0x0016 -/* 020A4 808748D4 50200017 */ beql $at, $zero, .L80874934 -/* 020A8 808748D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 020AC 808748DC 86190304 */ lh $t9, 0x0304($s0) ## 00000304 -/* 020B0 808748E0 2443FFF5 */ addiu $v1, $v0, 0xFFF5 ## $v1 = FFFFFFF5 -/* 020B4 808748E4 8FA80058 */ lw $t0, 0x0058($sp) -/* 020B8 808748E8 17200011 */ bne $t9, $zero, .L80874930 -/* 020BC 808748EC 00031C00 */ sll $v1, $v1, 16 -/* 020C0 808748F0 C5120028 */ lwc1 $f18, 0x0028($t0) ## 00000028 -/* 020C4 808748F4 8D070024 */ lw $a3, 0x0024($t0) ## 00000024 -/* 020C8 808748F8 00031C03 */ sra $v1, $v1, 16 -/* 020CC 808748FC E7B20010 */ swc1 $f18, 0x0010($sp) -/* 020D0 80874900 C504002C */ lwc1 $f4, 0x002C($t0) ## 0000002C -/* 020D4 80874904 AFA30024 */ sw $v1, 0x0024($sp) -/* 020D8 80874908 AFA00020 */ sw $zero, 0x0020($sp) -/* 020DC 8087490C AFA0001C */ sw $zero, 0x001C($sp) -/* 020E0 80874910 AFA00018 */ sw $zero, 0x0018($sp) -/* 020E4 80874914 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 020E8 80874918 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 020EC 8087491C 2406005D */ addiu $a2, $zero, 0x005D ## $a2 = 0000005D -/* 020F0 80874920 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 020F4 80874924 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 020F8 80874928 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 020FC 8087492C A60A0304 */ sh $t2, 0x0304($s0) ## 00000304 -.L80874930: -/* 02100 80874930 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80874934: -/* 02104 80874934 0C21CB16 */ jal func_80872C58 -/* 02108 80874938 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -.L8087493C: -/* 0210C 8087493C 8FBF003C */ lw $ra, 0x003C($sp) -/* 02110 80874940 8FB00034 */ lw $s0, 0x0034($sp) -/* 02114 80874944 8FB10038 */ lw $s1, 0x0038($sp) -/* 02118 80874948 03E00008 */ jr $ra -/* 0211C 8087494C 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874B7C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874B7C.s deleted file mode 100644 index a4b963d76b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874B7C.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80874B7C -/* 0234C 80874B7C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 02350 80874B80 AFA40000 */ sw $a0, 0x0000($sp) -/* 02354 80874B84 AFA60008 */ sw $a2, 0x0008($sp) -/* 02358 80874B88 14A10007 */ bne $a1, $at, .L80874BA8 -/* 0235C 80874B8C AFA7000C */ sw $a3, 0x000C($sp) -/* 02360 80874B90 8FA20014 */ lw $v0, 0x0014($sp) -/* 02364 80874B94 8FA30010 */ lw $v1, 0x0010($sp) -/* 02368 80874B98 844F033C */ lh $t7, 0x033C($v0) ## 0000033C -/* 0236C 80874B9C 846E0000 */ lh $t6, 0x0000($v1) ## 00000000 -/* 02370 80874BA0 01CFC021 */ addu $t8, $t6, $t7 -/* 02374 80874BA4 A4780000 */ sh $t8, 0x0000($v1) ## 00000000 -.L80874BA8: -/* 02378 80874BA8 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 0237C 80874BAC 8FA20014 */ lw $v0, 0x0014($sp) -/* 02380 80874BB0 14A10009 */ bne $a1, $at, .L80874BD8 -/* 02384 80874BB4 8FA30010 */ lw $v1, 0x0010($sp) -/* 02388 80874BB8 84790000 */ lh $t9, 0x0000($v1) ## 00000000 -/* 0238C 80874BBC 84480336 */ lh $t0, 0x0336($v0) ## 00000336 -/* 02390 80874BC0 846A0004 */ lh $t2, 0x0004($v1) ## 00000004 -/* 02394 80874BC4 03284821 */ addu $t1, $t9, $t0 -/* 02398 80874BC8 A4690000 */ sh $t1, 0x0000($v1) ## 00000000 -/* 0239C 80874BCC 844B0338 */ lh $t3, 0x0338($v0) ## 00000338 -/* 023A0 80874BD0 014B6021 */ addu $t4, $t2, $t3 -/* 023A4 80874BD4 A46C0004 */ sh $t4, 0x0004($v1) ## 00000004 -.L80874BD8: -/* 023A8 80874BD8 03E00008 */ jr $ra -/* 023AC 80874BDC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s deleted file mode 100644 index 4b2985eb73..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s +++ /dev/null @@ -1,123 +0,0 @@ -.rdata -glabel D_80875608 - .asciz "../z_bg_dy_yoseizo.c" - .balign 4 - -glabel D_80875620 - .asciz "../z_bg_dy_yoseizo.c" - .balign 4 - -.text -glabel func_80874BE0 -/* 023B0 80874BE0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 023B4 80874BE4 AFB10028 */ sw $s1, 0x0028($sp) -/* 023B8 80874BE8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 023BC 80874BEC AFBF002C */ sw $ra, 0x002C($sp) -/* 023C0 80874BF0 AFB00024 */ sw $s0, 0x0024($sp) -/* 023C4 80874BF4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 023C8 80874BF8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 023CC 80874BFC 3C068087 */ lui $a2, %hi(D_80875608) ## $a2 = 80870000 -/* 023D0 80874C00 24C65608 */ addiu $a2, $a2, %lo(D_80875608) ## $a2 = 80875608 -/* 023D4 80874C04 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 -/* 023D8 80874C08 24070649 */ addiu $a3, $zero, 0x0649 ## $a3 = 00000649 -/* 023DC 80874C0C 0C031AB1 */ jal Graph_OpenDisps -/* 023E0 80874C10 AFA50050 */ sw $a1, 0x0050($sp) -/* 023E4 80874C14 8E0F014C */ lw $t7, 0x014C($s0) ## 0000014C -/* 023E8 80874C18 3C0E8087 */ lui $t6, %hi(func_80873E04) ## $t6 = 80870000 -/* 023EC 80874C1C 25CE3E04 */ addiu $t6, $t6, %lo(func_80873E04) ## $t6 = 80873E04 -/* 023F0 80874C20 11CF0050 */ beq $t6, $t7, .L80874D64 -/* 023F4 80874C24 8FA80050 */ lw $t0, 0x0050($sp) -/* 023F8 80874C28 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 023FC 80874C2C 0C024F46 */ jal func_80093D18 -/* 02400 80874C30 AFA80050 */ sw $t0, 0x0050($sp) -/* 02404 80874C34 8FA80050 */ lw $t0, 0x0050($sp) -/* 02408 80874C38 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 0240C 80874C3C 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 -/* 02410 80874C40 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 02414 80874C44 3C098087 */ lui $t1, %hi(D_808754CC) ## $t1 = 80870000 -/* 02418 80874C48 252954CC */ addiu $t1, $t1, %lo(D_808754CC) ## $t1 = 808754CC -/* 0241C 80874C4C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 02420 80874C50 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 02424 80874C54 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 02428 80874C58 860A02F2 */ lh $t2, 0x02F2($s0) ## 000002F2 -/* 0242C 80874C5C 3C068016 */ lui $a2, %hi(gSegments) -/* 02430 80874C60 24C66FA8 */ addiu $a2, %lo(gSegments) -/* 02434 80874C64 000A5880 */ sll $t3, $t2, 2 -/* 02438 80874C68 012B6021 */ addu $t4, $t1, $t3 -/* 0243C 80874C6C 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 02440 80874C70 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 02444 80874C74 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF -/* 02448 80874C78 00047100 */ sll $t6, $a0, 4 -/* 0244C 80874C7C 000E7F02 */ srl $t7, $t6, 28 -/* 02450 80874C80 000FC080 */ sll $t8, $t7, 2 -/* 02454 80874C84 00D8C821 */ addu $t9, $a2, $t8 -/* 02458 80874C88 8F2A0000 */ lw $t2, 0x0000($t9) ## DB060020 -/* 0245C 80874C8C 00856824 */ and $t5, $a0, $a1 -/* 02460 80874C90 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 02464 80874C94 01AA5821 */ addu $t3, $t5, $t2 -/* 02468 80874C98 01676021 */ addu $t4, $t3, $a3 -/* 0246C 80874C9C AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 02470 80874CA0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 02474 80874CA4 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 02478 80874CA8 35EF0024 */ ori $t7, $t7, 0x0024 ## $t7 = DB060024 -/* 0247C 80874CAC 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 02480 80874CB0 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 -/* 02484 80874CB4 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 02488 80874CB8 861802F4 */ lh $t8, 0x02F4($s0) ## 000002F4 -/* 0248C 80874CBC 0018C880 */ sll $t9, $t8, 2 -/* 02490 80874CC0 01396821 */ addu $t5, $t1, $t9 -/* 02494 80874CC4 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 02498 80874CC8 00045900 */ sll $t3, $a0, 4 -/* 0249C 80874CCC 000B6702 */ srl $t4, $t3, 28 -/* 024A0 80874CD0 000C7080 */ sll $t6, $t4, 2 -/* 024A4 80874CD4 00CE7821 */ addu $t7, $a2, $t6 -/* 024A8 80874CD8 8DF80000 */ lw $t8, 0x0000($t7) ## DB060024 -/* 024AC 80874CDC 00855024 */ and $t2, $a0, $a1 -/* 024B0 80874CE0 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 024B4 80874CE4 0158C821 */ addu $t9, $t2, $t8 -/* 024B8 80874CE8 03276821 */ addu $t5, $t9, $a3 -/* 024BC 80874CEC AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 024C0 80874CF0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 024C4 80874CF4 358C0028 */ ori $t4, $t4, 0x0028 ## $t4 = DB060028 -/* 024C8 80874CF8 3C048087 */ lui $a0, %hi(D_808754D8) ## $a0 = 80870000 -/* 024CC 80874CFC 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 024D0 80874D00 AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 -/* 024D4 80874D04 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 024D8 80874D08 860E02F6 */ lh $t6, 0x02F6($s0) ## 000002F6 -/* 024DC 80874D0C 000E7880 */ sll $t7, $t6, 2 -/* 024E0 80874D10 008F2021 */ addu $a0, $a0, $t7 -/* 024E4 80874D14 8C8454D8 */ lw $a0, %lo(D_808754D8)($a0) -/* 024E8 80874D18 0004C100 */ sll $t8, $a0, 4 -/* 024EC 80874D1C 0018CF02 */ srl $t9, $t8, 28 -/* 024F0 80874D20 00196880 */ sll $t5, $t9, 2 -/* 024F4 80874D24 00CD5821 */ addu $t3, $a2, $t5 -/* 024F8 80874D28 8D6C0000 */ lw $t4, 0x0000($t3) ## 00000008 -/* 024FC 80874D2C 00855024 */ and $t2, $a0, $a1 -/* 02500 80874D30 3C188087 */ lui $t8, %hi(func_80874B7C) ## $t8 = 80870000 -/* 02504 80874D34 014C7021 */ addu $t6, $t2, $t4 -/* 02508 80874D38 01C77821 */ addu $t7, $t6, $a3 -/* 0250C 80874D3C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 02510 80874D40 92070152 */ lbu $a3, 0x0152($s0) ## 00000152 -/* 02514 80874D44 8E060170 */ lw $a2, 0x0170($s0) ## 00000170 -/* 02518 80874D48 8E050154 */ lw $a1, 0x0154($s0) ## 00000154 -/* 0251C 80874D4C 27184B7C */ addiu $t8, $t8, %lo(func_80874B7C) ## $t8 = 80874B7C -/* 02520 80874D50 AFB80010 */ sw $t8, 0x0010($sp) -/* 02524 80874D54 AFB00018 */ sw $s0, 0x0018($sp) -/* 02528 80874D58 AFA00014 */ sw $zero, 0x0014($sp) -/* 0252C 80874D5C 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 02530 80874D60 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80874D64: -/* 02534 80874D64 3C068087 */ lui $a2, %hi(D_80875620) ## $a2 = 80870000 -/* 02538 80874D68 24C65620 */ addiu $a2, $a2, %lo(D_80875620) ## $a2 = 80875620 -/* 0253C 80874D6C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 -/* 02540 80874D70 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 02544 80874D74 0C031AD5 */ jal Graph_CloseDisps -/* 02548 80874D78 2407065D */ addiu $a3, $zero, 0x065D ## $a3 = 0000065D -/* 0254C 80874D7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02550 80874D80 0C21D468 */ jal func_808751A0 -/* 02554 80874D84 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02558 80874D88 8FBF002C */ lw $ra, 0x002C($sp) -/* 0255C 80874D8C 8FB00024 */ lw $s0, 0x0024($sp) -/* 02560 80874D90 8FB10028 */ lw $s1, 0x0028($sp) -/* 02564 80874D94 03E00008 */ jr $ra -/* 02568 80874D98 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874D9C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874D9C.s deleted file mode 100644 index 58040fd39c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874D9C.s +++ /dev/null @@ -1,78 +0,0 @@ -.late_rodata -glabel D_808756B8 - .float 30000.0 - - .text -glabel func_80874D9C -/* 0256C 80874D9C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02570 80874DA0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02574 80874DA4 24820394 */ addiu $v0, $a0, 0x0394 ## $v0 = 00000394 -/* 02578 80874DA8 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80874DAC: -/* 0257C 80874DAC 904E0000 */ lbu $t6, 0x0000($v0) ## 00000394 -/* 02580 80874DB0 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = 00000001 -/* 02584 80874DB4 00031C00 */ sll $v1, $v1, 16 -/* 02588 80874DB8 15C00035 */ bne $t6, $zero, .L80874E90 -/* 0258C 80874DBC 00031C03 */ sra $v1, $v1, 16 -/* 02590 80874DC0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02594 80874DC4 A04F0000 */ sb $t7, 0x0000($v0) ## 00000394 -/* 02598 80874DC8 8CB90000 */ lw $t9, 0x0000($a1) ## 00000000 -/* 0259C 80874DCC 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 025A0 80874DD0 3C018087 */ lui $at, %hi(D_808756B8) ## $at = 80870000 -/* 025A4 80874DD4 AC590004 */ sw $t9, 0x0004($v0) ## 00000398 -/* 025A8 80874DD8 8CB80004 */ lw $t8, 0x0004($a1) ## 00000004 -/* 025AC 80874DDC AC580008 */ sw $t8, 0x0008($v0) ## 0000039C -/* 025B0 80874DE0 8CB90008 */ lw $t9, 0x0008($a1) ## 00000008 -/* 025B4 80874DE4 AC59000C */ sw $t9, 0x000C($v0) ## 000003A0 -/* 025B8 80874DE8 8CC90000 */ lw $t1, 0x0000($a2) ## 00000000 -/* 025BC 80874DEC AC490010 */ sw $t1, 0x0010($v0) ## 000003A4 -/* 025C0 80874DF0 8CC80004 */ lw $t0, 0x0004($a2) ## 00000004 -/* 025C4 80874DF4 AC480014 */ sw $t0, 0x0014($v0) ## 000003A8 -/* 025C8 80874DF8 8CC90008 */ lw $t1, 0x0008($a2) ## 00000008 -/* 025CC 80874DFC AC490018 */ sw $t1, 0x0018($v0) ## 000003AC -/* 025D0 80874E00 8CEB0000 */ lw $t3, 0x0000($a3) ## 00000000 -/* 025D4 80874E04 AC4B001C */ sw $t3, 0x001C($v0) ## 000003B0 -/* 025D8 80874E08 8CEA0004 */ lw $t2, 0x0004($a3) ## 00000004 -/* 025DC 80874E0C AC4A0020 */ sw $t2, 0x0020($v0) ## 000003B4 -/* 025E0 80874E10 8CEB0008 */ lw $t3, 0x0008($a3) ## 00000008 -/* 025E4 80874E14 AC4B0024 */ sw $t3, 0x0024($v0) ## 000003B8 -/* 025E8 80874E18 8FAC0030 */ lw $t4, 0x0030($sp) -/* 025EC 80874E1C 918E0000 */ lbu $t6, 0x0000($t4) ## 00000000 -/* 025F0 80874E20 A04E0028 */ sb $t6, 0x0028($v0) ## 000003BC -/* 025F4 80874E24 918D0001 */ lbu $t5, 0x0001($t4) ## 00000001 -/* 025F8 80874E28 A04D0029 */ sb $t5, 0x0029($v0) ## 000003BD -/* 025FC 80874E2C 918E0002 */ lbu $t6, 0x0002($t4) ## 00000002 -/* 02600 80874E30 A440002E */ sh $zero, 0x002E($v0) ## 000003C2 -/* 02604 80874E34 A04E002A */ sb $t6, 0x002A($v0) ## 000003BE -/* 02608 80874E38 8FAF0034 */ lw $t7, 0x0034($sp) -/* 0260C 80874E3C 91F90000 */ lbu $t9, 0x0000($t7) ## 00000001 -/* 02610 80874E40 A059002B */ sb $t9, 0x002B($v0) ## 000003BF -/* 02614 80874E44 91F80001 */ lbu $t8, 0x0001($t7) ## 00000002 -/* 02618 80874E48 A058002C */ sb $t8, 0x002C($v0) ## 000003C0 -/* 0261C 80874E4C 91F90002 */ lbu $t9, 0x0002($t7) ## 00000003 -/* 02620 80874E50 A059002D */ sb $t9, 0x002D($v0) ## 000003C1 -/* 02624 80874E54 C7A40038 */ lwc1 $f4, 0x0038($sp) -/* 02628 80874E58 E4440030 */ swc1 $f4, 0x0030($v0) ## 000003C4 -/* 0262C 80874E5C 87A8003E */ lh $t0, 0x003E($sp) -/* 02630 80874E60 A4480034 */ sh $t0, 0x0034($v0) ## 000003C8 -/* 02634 80874E64 87A90042 */ lh $t1, 0x0042($sp) -/* 02638 80874E68 E4460038 */ swc1 $f6, 0x0038($v0) ## 000003CC -/* 0263C 80874E6C A4490036 */ sh $t1, 0x0036($v0) ## 000003CA -/* 02640 80874E70 AFA2001C */ sw $v0, 0x001C($sp) -/* 02644 80874E74 0C00CFC8 */ jal Rand_CenteredFloat - -/* 02648 80874E78 C42C56B8 */ lwc1 $f12, %lo(D_808756B8)($at) -/* 0264C 80874E7C 8FA2001C */ lw $v0, 0x001C($sp) -/* 02650 80874E80 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 02654 80874E84 E440003C */ swc1 $f0, 0x003C($v0) ## 0000003C -/* 02658 80874E88 10000004 */ beq $zero, $zero, .L80874E9C -/* 0265C 80874E8C E4480040 */ swc1 $f8, 0x0040($v0) ## 00000040 -.L80874E90: -/* 02660 80874E90 286100C8 */ slti $at, $v1, 0x00C8 -/* 02664 80874E94 1420FFC5 */ bne $at, $zero, .L80874DAC -/* 02668 80874E98 24420044 */ addiu $v0, $v0, 0x0044 ## $v0 = 00000044 -.L80874E9C: -/* 0266C 80874E9C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02670 80874EA0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02674 80874EA4 03E00008 */ jr $ra -/* 02678 80874EA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874EAC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874EAC.s deleted file mode 100644 index d45c616543..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874EAC.s +++ /dev/null @@ -1,219 +0,0 @@ -.late_rodata -glabel D_808756BC - .float 5000.0 - - glabel D_808756C0 - .float 0.9 - - glabel D_808756C4 - .float 3000.0 - - glabel D_808756C8 - .float 3.14159274101 - - glabel D_808756CC - .float 3.14159274101 - - .text -glabel func_80874EAC -/* 0267C 80874EAC 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 -/* 02680 80874EB0 F7BE0040 */ sdc1 $f30, 0x0040($sp) -/* 02684 80874EB4 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 02688 80874EB8 4481F000 */ mtc1 $at, $f30 ## $f30 = 32768.00 -/* 0268C 80874EBC F7BC0038 */ sdc1 $f28, 0x0038($sp) -/* 02690 80874EC0 3C018087 */ lui $at, %hi(D_808756BC) ## $at = 80870000 -/* 02694 80874EC4 C43C56BC */ lwc1 $f28, %lo(D_808756BC)($at) -/* 02698 80874EC8 F7BA0030 */ sdc1 $f26, 0x0030($sp) -/* 0269C 80874ECC 3C018087 */ lui $at, %hi(D_808756C0) ## $at = 80870000 -/* 026A0 80874ED0 C43A56C0 */ lwc1 $f26, %lo(D_808756C0)($at) -/* 026A4 80874ED4 AFBE0068 */ sw $s8, 0x0068($sp) -/* 026A8 80874ED8 AFB70064 */ sw $s7, 0x0064($sp) -/* 026AC 80874EDC AFB60060 */ sw $s6, 0x0060($sp) -/* 026B0 80874EE0 AFB5005C */ sw $s5, 0x005C($sp) -/* 026B4 80874EE4 AFB30054 */ sw $s3, 0x0054($sp) -/* 026B8 80874EE8 AFB00048 */ sw $s0, 0x0048($sp) -/* 026BC 80874EEC F7B80028 */ sdc1 $f24, 0x0028($sp) -/* 026C0 80874EF0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 026C4 80874EF4 AFBF006C */ sw $ra, 0x006C($sp) -/* 026C8 80874EF8 AFB40058 */ sw $s4, 0x0058($sp) -/* 026CC 80874EFC AFB20050 */ sw $s2, 0x0050($sp) -/* 026D0 80874F00 AFB1004C */ sw $s1, 0x004C($sp) -/* 026D4 80874F04 F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 026D8 80874F08 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 026DC 80874F0C 4481C000 */ mtc1 $at, $f24 ## $f24 = 3.00 -/* 026E0 80874F10 0080F025 */ or $s8, $a0, $zero ## $s8 = 00000000 -/* 026E4 80874F14 24900394 */ addiu $s0, $a0, 0x0394 ## $s0 = 00000394 -/* 026E8 80874F18 8CB41C44 */ lw $s4, 0x1C44($a1) ## 00001C44 -/* 026EC 80874F1C 27B30094 */ addiu $s3, $sp, 0x0094 ## $s3 = FFFFFFEC -/* 026F0 80874F20 0000A825 */ or $s5, $zero, $zero ## $s5 = 00000000 -/* 026F4 80874F24 241600FF */ addiu $s6, $zero, 0x00FF ## $s6 = 000000FF -/* 026F8 80874F28 27B70088 */ addiu $s7, $sp, 0x0088 ## $s7 = FFFFFFE0 -.L80874F2C: -/* 026FC 80874F2C 920E0000 */ lbu $t6, 0x0000($s0) ## 00000394 -/* 02700 80874F30 3C018087 */ lui $at, %hi(D_808756C4) ## $at = 80870000 -/* 02704 80874F34 51C0006D */ beql $t6, $zero, .L808750EC -/* 02708 80874F38 86020034 */ lh $v0, 0x0034($s0) ## 000003C8 -/* 0270C 80874F3C C6040040 */ lwc1 $f4, 0x0040($s0) ## 000003D4 -/* 02710 80874F40 C42656C4 */ lwc1 $f6, %lo(D_808756C4)($at) -/* 02714 80874F44 860F0036 */ lh $t7, 0x0036($s0) ## 000003CA -/* 02718 80874F48 03C02025 */ or $a0, $s8, $zero ## $a0 = 00000000 -/* 0271C 80874F4C 46062200 */ add.s $f8, $f4, $f6 -/* 02720 80874F50 2405207E */ addiu $a1, $zero, 0x207E ## $a1 = 0000207E -/* 02724 80874F54 15E00017 */ bne $t7, $zero, .L80874FB4 -/* 02728 80874F58 E6080040 */ swc1 $f8, 0x0040($s0) ## 000003D4 -/* 0272C 80874F5C C6000010 */ lwc1 $f0, 0x0010($s0) ## 000003A4 -/* 02730 80874F60 C60A0004 */ lwc1 $f10, 0x0004($s0) ## 00000398 -/* 02734 80874F64 C6020014 */ lwc1 $f2, 0x0014($s0) ## 000003A8 -/* 02738 80874F68 C6120008 */ lwc1 $f18, 0x0008($s0) ## 0000039C -/* 0273C 80874F6C C60C0018 */ lwc1 $f12, 0x0018($s0) ## 000003AC -/* 02740 80874F70 C606000C */ lwc1 $f6, 0x000C($s0) ## 000003A0 -/* 02744 80874F74 46005400 */ add.s $f16, $f10, $f0 -/* 02748 80874F78 C60A001C */ lwc1 $f10, 0x001C($s0) ## 000003B0 -/* 0274C 80874F7C 46029100 */ add.s $f4, $f18, $f2 -/* 02750 80874F80 C6120020 */ lwc1 $f18, 0x0020($s0) ## 000003B4 -/* 02754 80874F84 E6100004 */ swc1 $f16, 0x0004($s0) ## 00000398 -/* 02758 80874F88 460C3200 */ add.s $f8, $f6, $f12 -/* 0275C 80874F8C C6060024 */ lwc1 $f6, 0x0024($s0) ## 000003B8 -/* 02760 80874F90 E6040008 */ swc1 $f4, 0x0008($s0) ## 0000039C -/* 02764 80874F94 460A0400 */ add.s $f16, $f0, $f10 -/* 02768 80874F98 E608000C */ swc1 $f8, 0x000C($s0) ## 000003A0 -/* 0276C 80874F9C 46121100 */ add.s $f4, $f2, $f18 -/* 02770 80874FA0 E6100010 */ swc1 $f16, 0x0010($s0) ## 000003A4 -/* 02774 80874FA4 46066200 */ add.s $f8, $f12, $f6 -/* 02778 80874FA8 E6040014 */ swc1 $f4, 0x0014($s0) ## 000003A8 -/* 0277C 80874FAC 1000004E */ beq $zero, $zero, .L808750E8 -/* 02780 80874FB0 E6080018 */ swc1 $f8, 0x0018($s0) ## 000003AC -.L80874FB4: -/* 02784 80874FB4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02788 80874FB8 26920024 */ addiu $s2, $s4, 0x0024 ## $s2 = 00000024 -/* 0278C 80874FBC 8E590000 */ lw $t9, 0x0000($s2) ## 00000024 -/* 02790 80874FC0 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 02794 80874FC4 44818000 */ mtc1 $at, $f16 ## $f16 = 150.00 -/* 02798 80874FC8 AE790000 */ sw $t9, 0x0000($s3) ## FFFFFFEC -/* 0279C 80874FCC 8E580004 */ lw $t8, 0x0004($s2) ## 00000028 -/* 027A0 80874FD0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 027A4 80874FD4 44813000 */ mtc1 $at, $f6 ## $f6 = 50.00 -/* 027A8 80874FD8 AE780004 */ sw $t8, 0x0004($s3) ## FFFFFFF0 -/* 027AC 80874FDC 8E590008 */ lw $t9, 0x0008($s2) ## 0000002C -/* 027B0 80874FE0 26110004 */ addiu $s1, $s0, 0x0004 ## $s1 = 00000398 -/* 027B4 80874FE4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000398 -/* 027B8 80874FE8 AE790008 */ sw $t9, 0x0008($s3) ## FFFFFFF4 -/* 027BC 80874FEC C68A0028 */ lwc1 $f10, 0x0028($s4) ## 00000028 -/* 027C0 80874FF0 02602825 */ or $a1, $s3, $zero ## $a1 = FFFFFFEC -/* 027C4 80874FF4 46105481 */ sub.s $f18, $f10, $f16 -/* 027C8 80874FF8 E7B20098 */ swc1 $f18, 0x0098($sp) -/* 027CC 80874FFC C684002C */ lwc1 $f4, 0x002C($s4) ## 0000002C -/* 027D0 80875000 46062201 */ sub.s $f8, $f4, $f6 -/* 027D4 80875004 0C01E027 */ jal Math_Vec3f_Pitch - -/* 027D8 80875008 E7A8009C */ swc1 $f8, 0x009C($sp) -/* 027DC 8087500C 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 027E0 80875010 02202025 */ or $a0, $s1, $zero ## $a0 = 00000398 -/* 027E4 80875014 02602825 */ or $a1, $s3, $zero ## $a1 = FFFFFFEC -/* 027E8 80875018 0C01E01A */ jal Math_Vec3f_Yaw - -/* 027EC 8087501C 46805520 */ cvt.s.w $f20, $f10 -/* 027F0 80875020 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 027F4 80875024 4405A000 */ mfc1 $a1, $f20 -/* 027F8 80875028 4406D000 */ mfc1 $a2, $f26 -/* 027FC 8087502C 4407E000 */ mfc1 $a3, $f28 -/* 02800 80875030 26040038 */ addiu $a0, $s0, 0x0038 ## $a0 = 000003CC -/* 02804 80875034 0C01E107 */ jal Math_ApproachF - -/* 02808 80875038 468085A0 */ cvt.s.w $f22, $f16 -/* 0280C 8087503C 4405B000 */ mfc1 $a1, $f22 -/* 02810 80875040 4406D000 */ mfc1 $a2, $f26 -/* 02814 80875044 4407E000 */ mfc1 $a3, $f28 -/* 02818 80875048 0C01E107 */ jal Math_ApproachF - -/* 0281C 8087504C 2604003C */ addiu $a0, $s0, 0x003C ## $a0 = 000003D0 -/* 02820 80875050 0C034213 */ jal Matrix_Push -/* 02824 80875054 00000000 */ nop -/* 02828 80875058 C612003C */ lwc1 $f18, 0x003C($s0) ## 000003D0 -/* 0282C 8087505C 3C018087 */ lui $at, %hi(D_808756C8) ## $at = 80870000 -/* 02830 80875060 C42656C8 */ lwc1 $f6, %lo(D_808756C8)($at) -/* 02834 80875064 461E9103 */ div.s $f4, $f18, $f30 -/* 02838 80875068 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0283C 8087506C 46062302 */ mul.s $f12, $f4, $f6 -/* 02840 80875070 0C034348 */ jal Matrix_RotateY -/* 02844 80875074 00000000 */ nop -/* 02848 80875078 C6080038 */ lwc1 $f8, 0x0038($s0) ## 000003CC -/* 0284C 8087507C 3C018087 */ lui $at, %hi(D_808756CC) ## $at = 80870000 -/* 02850 80875080 C43056CC */ lwc1 $f16, %lo(D_808756CC)($at) -/* 02854 80875084 461E4283 */ div.s $f10, $f8, $f30 -/* 02858 80875088 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0285C 8087508C 46105302 */ mul.s $f12, $f10, $f16 -/* 02860 80875090 0C0342DC */ jal Matrix_RotateX -/* 02864 80875094 00000000 */ nop -/* 02868 80875098 E7B8009C */ swc1 $f24, 0x009C($sp) -/* 0286C 8087509C E7B80098 */ swc1 $f24, 0x0098($sp) -/* 02870 808750A0 E7B80094 */ swc1 $f24, 0x0094($sp) -/* 02874 808750A4 02602025 */ or $a0, $s3, $zero ## $a0 = FFFFFFEC -/* 02878 808750A8 0C0346BD */ jal Matrix_MultVec3f -/* 0287C 808750AC 02E02825 */ or $a1, $s7, $zero ## $a1 = FFFFFFE0 -/* 02880 808750B0 0C034221 */ jal Matrix_Pull -/* 02884 808750B4 00000000 */ nop -/* 02888 808750B8 C6120004 */ lwc1 $f18, 0x0004($s0) ## 00000398 -/* 0288C 808750BC C7A40088 */ lwc1 $f4, 0x0088($sp) -/* 02890 808750C0 C6080008 */ lwc1 $f8, 0x0008($s0) ## 0000039C -/* 02894 808750C4 46049180 */ add.s $f6, $f18, $f4 -/* 02898 808750C8 C612000C */ lwc1 $f18, 0x000C($s0) ## 000003A0 -/* 0289C 808750CC E6060004 */ swc1 $f6, 0x0004($s0) ## 00000398 -/* 028A0 808750D0 C7AA008C */ lwc1 $f10, 0x008C($sp) -/* 028A4 808750D4 460A4400 */ add.s $f16, $f8, $f10 -/* 028A8 808750D8 E6100008 */ swc1 $f16, 0x0008($s0) ## 0000039C -/* 028AC 808750DC C7A40090 */ lwc1 $f4, 0x0090($sp) -/* 028B0 808750E0 46049180 */ add.s $f6, $f18, $f4 -/* 028B4 808750E4 E606000C */ swc1 $f6, 0x000C($s0) ## 000003A0 -.L808750E8: -/* 028B8 808750E8 86020034 */ lh $v0, 0x0034($s0) ## 000003C8 -.L808750EC: -/* 028BC 808750EC 26B50001 */ addiu $s5, $s5, 0x0001 ## $s5 = 00000001 -/* 028C0 808750F0 0015AC00 */ sll $s5, $s5, 16 -/* 028C4 808750F4 1040000C */ beq $v0, $zero, .L80875128 -/* 028C8 808750F8 0015AC03 */ sra $s5, $s5, 16 -/* 028CC 808750FC 8609002E */ lh $t1, 0x002E($s0) ## 000003C2 -/* 028D0 80875100 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF -/* 028D4 80875104 A6080034 */ sh $t0, 0x0034($s0) ## 000003C8 -/* 028D8 80875108 252A001E */ addiu $t2, $t1, 0x001E ## $t2 = 0000001E -/* 028DC 8087510C A60A002E */ sh $t2, 0x002E($s0) ## 000003C2 -/* 028E0 80875110 860B002E */ lh $t3, 0x002E($s0) ## 000003C2 -/* 028E4 80875114 29610100 */ slti $at, $t3, 0x0100 -/* 028E8 80875118 5420000D */ bnel $at, $zero, .L80875150 -/* 028EC 8087511C 2AA100C8 */ slti $at, $s5, 0x00C8 -/* 028F0 80875120 1000000A */ beq $zero, $zero, .L8087514C -/* 028F4 80875124 A616002E */ sh $s6, 0x002E($s0) ## 000003C2 -.L80875128: -/* 028F8 80875128 860C002E */ lh $t4, 0x002E($s0) ## 000003C2 -/* 028FC 8087512C 300F00FF */ andi $t7, $zero, 0x00FF ## $t7 = 00000000 -/* 02900 80875130 258DFFE2 */ addiu $t5, $t4, 0xFFE2 ## $t5 = FFFFFFE2 -/* 02904 80875134 A60D002E */ sh $t5, 0x002E($s0) ## 000003C2 -/* 02908 80875138 860E002E */ lh $t6, 0x002E($s0) ## 000003C2 -/* 0290C 8087513C 5DC00004 */ bgtzl $t6, .L80875150 -/* 02910 80875140 2AA100C8 */ slti $at, $s5, 0x00C8 -/* 02914 80875144 A2000000 */ sb $zero, 0x0000($s0) ## 00000394 -/* 02918 80875148 A60F002E */ sh $t7, 0x002E($s0) ## 000003C2 -.L8087514C: -/* 0291C 8087514C 2AA100C8 */ slti $at, $s5, 0x00C8 -.L80875150: -/* 02920 80875150 1420FF76 */ bne $at, $zero, .L80874F2C -/* 02924 80875154 26100044 */ addiu $s0, $s0, 0x0044 ## $s0 = 000003D8 -/* 02928 80875158 8FBF006C */ lw $ra, 0x006C($sp) -/* 0292C 8087515C D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 02930 80875160 D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 02934 80875164 D7B80028 */ ldc1 $f24, 0x0028($sp) -/* 02938 80875168 D7BA0030 */ ldc1 $f26, 0x0030($sp) -/* 0293C 8087516C D7BC0038 */ ldc1 $f28, 0x0038($sp) -/* 02940 80875170 D7BE0040 */ ldc1 $f30, 0x0040($sp) -/* 02944 80875174 8FB00048 */ lw $s0, 0x0048($sp) -/* 02948 80875178 8FB1004C */ lw $s1, 0x004C($sp) -/* 0294C 8087517C 8FB20050 */ lw $s2, 0x0050($sp) -/* 02950 80875180 8FB30054 */ lw $s3, 0x0054($sp) -/* 02954 80875184 8FB40058 */ lw $s4, 0x0058($sp) -/* 02958 80875188 8FB5005C */ lw $s5, 0x005C($sp) -/* 0295C 8087518C 8FB60060 */ lw $s6, 0x0060($sp) -/* 02960 80875190 8FB70064 */ lw $s7, 0x0064($sp) -/* 02964 80875194 8FBE0068 */ lw $s8, 0x0068($sp) -/* 02968 80875198 03E00008 */ jr $ra -/* 0296C 8087519C 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808751A0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808751A0.s deleted file mode 100644 index e5ff14cdb5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808751A0.s +++ /dev/null @@ -1,186 +0,0 @@ -.rdata -glabel D_80875638 - .asciz "../z_bg_dy_yoseizo.c" - .balign 4 - -glabel D_80875650 - .asciz "../z_bg_dy_yoseizo.c" - .balign 4 - -glabel D_80875668 - .asciz "../z_bg_dy_yoseizo.c" - .balign 4 - -.text -glabel func_808751A0 -/* 02970 808751A0 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 -/* 02974 808751A4 AFBF0044 */ sw $ra, 0x0044($sp) -/* 02978 808751A8 AFBE0040 */ sw $s8, 0x0040($sp) -/* 0297C 808751AC AFB7003C */ sw $s7, 0x003C($sp) -/* 02980 808751B0 AFB60038 */ sw $s6, 0x0038($sp) -/* 02984 808751B4 AFB50034 */ sw $s5, 0x0034($sp) -/* 02988 808751B8 AFB40030 */ sw $s4, 0x0030($sp) -/* 0298C 808751BC AFB3002C */ sw $s3, 0x002C($sp) -/* 02990 808751C0 AFB20028 */ sw $s2, 0x0028($sp) -/* 02994 808751C4 AFB10024 */ sw $s1, 0x0024($sp) -/* 02998 808751C8 AFB00020 */ sw $s0, 0x0020($sp) -/* 0299C 808751CC F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 029A0 808751D0 AFA500A4 */ sw $a1, 0x00A4($sp) -/* 029A4 808751D4 8CB10000 */ lw $s1, 0x0000($a1) ## 00000000 -/* 029A8 808751D8 24900394 */ addiu $s0, $a0, 0x0394 ## $s0 = 00000394 -/* 029AC 808751DC 3C068087 */ lui $a2, %hi(D_80875638) ## $a2 = 80870000 -/* 029B0 808751E0 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 -/* 029B4 808751E4 24C65638 */ addiu $a2, $a2, %lo(D_80875638) ## $a2 = 80875638 -/* 029B8 808751E8 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFDC -/* 029BC 808751EC 240706E7 */ addiu $a3, $zero, 0x06E7 ## $a3 = 000006E7 -/* 029C0 808751F0 0C031AB1 */ jal Graph_OpenDisps -/* 029C4 808751F4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 029C8 808751F8 8FAF00A4 */ lw $t7, 0x00A4($sp) -/* 029CC 808751FC 0C024F61 */ jal func_80093D84 -/* 029D0 80875200 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 029D4 80875204 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 029D8 80875208 4481A000 */ mtc1 $at, $f20 ## $f20 = 1.00 -/* 029DC 8087520C 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 029E0 80875210 3C1E8000 */ lui $s8, 0x8000 ## $s8 = 80000000 -/* 029E4 80875214 3C17DE00 */ lui $s7, 0xDE00 ## $s7 = DE000000 -.L80875218: -/* 029E8 80875218 92180000 */ lbu $t8, 0x0000($s0) ## 00000394 -/* 029EC 8087521C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 029F0 80875220 8FB200A4 */ lw $s2, 0x00A4($sp) -/* 029F4 80875224 1701006B */ bne $t8, $at, .L808753D4 -/* 029F8 80875228 3C020600 */ lui $v0, %hi(D_060058D8) ## $v0 = 06000000 -/* 029FC 8087522C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02A00 80875230 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 02A04 80875234 244258D8 */ addiu $v0, $v0, %lo(D_060058D8) ## $v0 = 060058D8 -/* 02A08 80875238 0002C900 */ sll $t9, $v0, 4 -/* 02A0C 8087523C 02419021 */ addu $s2, $s2, $at -/* 02A10 80875240 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 02A14 80875244 00194702 */ srl $t0, $t9, 28 -/* 02A18 80875248 3C0A8016 */ lui $t2, %hi(gSegments) -/* 02A1C 8087524C 254A6FA8 */ addiu $t2, %lo(gSegments) -/* 02A20 80875250 00084880 */ sll $t1, $t0, 2 -/* 02A24 80875254 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 02A28 80875258 0041B024 */ and $s6, $v0, $at -/* 02A2C 8087525C 1660001A */ bne $s3, $zero, .L808752C8 -/* 02A30 80875260 012AA821 */ addu $s5, $t1, $t2 -/* 02A34 80875264 3C020600 */ lui $v0, %hi(D_06005860) ## $v0 = 06000000 -/* 02A38 80875268 24425860 */ addiu $v0, $v0, %lo(D_06005860) ## $v0 = 06005860 -/* 02A3C 8087526C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 02A40 80875270 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 02A44 80875274 00412824 */ and $a1, $v0, $at -/* 02A48 80875278 00025900 */ sll $t3, $v0, 4 -/* 02A4C 8087527C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 02A50 80875280 000B6702 */ srl $t4, $t3, 28 -/* 02A54 80875284 000C6880 */ sll $t5, $t4, 2 -/* 02A58 80875288 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 06005868 -/* 02A5C 8087528C AE2E02D0 */ sw $t6, 0x02D0($s1) ## 000002D0 -/* 02A60 80875290 01AA2021 */ addu $a0, $t5, $t2 -/* 02A64 80875294 AC570000 */ sw $s7, 0x0000($v0) ## 06005860 -/* 02A68 80875298 8C8F0000 */ lw $t7, 0x0000($a0) ## 00000000 -/* 02A6C 8087529C 3C09E700 */ lui $t1, 0xE700 ## $t1 = E7000000 -/* 02A70 808752A0 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 02A74 808752A4 01E5C021 */ addu $t8, $t7, $a1 -/* 02A78 808752A8 031EC821 */ addu $t9, $t8, $s8 -/* 02A7C 808752AC AC590004 */ sw $t9, 0x0004($v0) ## 06005864 -/* 02A80 808752B0 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 02A84 808752B4 327300FF */ andi $s3, $s3, 0x00FF ## $s3 = 00000001 -/* 02A88 808752B8 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 06005868 -/* 02A8C 808752BC AE2802D0 */ sw $t0, 0x02D0($s1) ## 000002D0 -/* 02A90 808752C0 AC400004 */ sw $zero, 0x0004($v0) ## 06005864 -/* 02A94 808752C4 AC490000 */ sw $t1, 0x0000($v0) ## 06005860 -.L808752C8: -/* 02A98 808752C8 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 02A9C 808752CC 3C0CFA00 */ lui $t4, 0xFA00 ## $t4 = FA000000 -/* 02AA0 808752D0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02AA4 808752D4 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 06005868 -/* 02AA8 808752D8 AE2B02D0 */ sw $t3, 0x02D0($s1) ## 000002D0 -/* 02AAC 808752DC AC4C0000 */ sw $t4, 0x0000($v0) ## 06005860 -/* 02AB0 808752E0 920A0028 */ lbu $t2, 0x0028($s0) ## 000003BC -/* 02AB4 808752E4 92180029 */ lbu $t8, 0x0029($s0) ## 000003BD -/* 02AB8 808752E8 920B002A */ lbu $t3, 0x002A($s0) ## 000003BE -/* 02ABC 808752EC 000A7600 */ sll $t6, $t2, 24 -/* 02AC0 808752F0 860A002E */ lh $t2, 0x002E($s0) ## 000003C2 -/* 02AC4 808752F4 0018CC00 */ sll $t9, $t8, 16 -/* 02AC8 808752F8 01D94025 */ or $t0, $t6, $t9 ## $t0 = 06005868 -/* 02ACC 808752FC 000B6200 */ sll $t4, $t3, 8 -/* 02AD0 80875300 010C6825 */ or $t5, $t0, $t4 ## $t5 = FE005868 -/* 02AD4 80875304 314F00FF */ andi $t7, $t2, 0x00FF ## $t7 = 000000A8 -/* 02AD8 80875308 01AFC025 */ or $t8, $t5, $t7 ## $t8 = FE0058E8 -/* 02ADC 8087530C AC580004 */ sw $t8, 0x0004($v0) ## 06005864 -/* 02AE0 80875310 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 02AE4 80875314 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 02AE8 80875318 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 06005868 -/* 02AEC 8087531C AE2E02D0 */ sw $t6, 0x02D0($s1) ## 000002D0 -/* 02AF0 80875320 AC590000 */ sw $t9, 0x0000($v0) ## 06005860 -/* 02AF4 80875324 920A002C */ lbu $t2, 0x002C($s0) ## 000003C0 -/* 02AF8 80875328 920B002B */ lbu $t3, 0x002B($s0) ## 000003BF -/* 02AFC 8087532C 920E002D */ lbu $t6, 0x002D($s0) ## 000003C1 -/* 02B00 80875330 000A6C00 */ sll $t5, $t2, 16 -/* 02B04 80875334 000B4600 */ sll $t0, $t3, 24 -/* 02B08 80875338 010D7825 */ or $t7, $t0, $t5 ## $t7 = FE005868 -/* 02B0C 8087533C 000ECA00 */ sll $t9, $t6, 8 -/* 02B10 80875340 01F94825 */ or $t1, $t7, $t9 ## $t1 = FF005868 -/* 02B14 80875344 AC490004 */ sw $t1, 0x0004($v0) ## 06005864 -/* 02B18 80875348 8E06000C */ lw $a2, 0x000C($s0) ## 000003A0 -/* 02B1C 8087534C C60E0008 */ lwc1 $f14, 0x0008($s0) ## 0000039C -/* 02B20 80875350 0C034261 */ jal Matrix_Translate -/* 02B24 80875354 C60C0004 */ lwc1 $f12, 0x0004($s0) ## 00000398 -/* 02B28 80875358 0C0347F5 */ jal func_800D1FD4 -/* 02B2C 8087535C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02B30 80875360 C60C0030 */ lwc1 $f12, 0x0030($s0) ## 000003C4 -/* 02B34 80875364 4406A000 */ mfc1 $a2, $f20 -/* 02B38 80875368 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02B3C 8087536C 0C0342A3 */ jal Matrix_Scale -/* 02B40 80875370 46006386 */ mov.s $f14, $f12 -/* 02B44 80875374 C60C0040 */ lwc1 $f12, 0x0040($s0) ## 000003D4 -/* 02B48 80875378 0C0343B5 */ jal Matrix_RotateZ -/* 02B4C 8087537C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02B50 80875380 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 02B54 80875384 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 -/* 02B58 80875388 358C0003 */ ori $t4, $t4, 0x0003 ## $t4 = DA380003 -/* 02B5C 8087538C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 02B60 80875390 AE2B02D0 */ sw $t3, 0x02D0($s1) ## 000002D0 -/* 02B64 80875394 3C058087 */ lui $a1, %hi(D_80875650) ## $a1 = 80870000 -/* 02B68 80875398 24A55650 */ addiu $a1, $a1, %lo(D_80875650) ## $a1 = 80875650 -/* 02B6C 8087539C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02B70 808753A0 24060712 */ addiu $a2, $zero, 0x0712 ## $a2 = 00000712 -/* 02B74 808753A4 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 02B78 808753A8 0C0346A2 */ jal Matrix_NewMtx -/* 02B7C 808753AC 00409025 */ or $s2, $v0, $zero ## $s2 = 00000000 -/* 02B80 808753B0 AE420004 */ sw $v0, 0x0004($s2) ## 00000004 -/* 02B84 808753B4 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 02B88 808753B8 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 02B8C 808753BC AE2A02D0 */ sw $t2, 0x02D0($s1) ## 000002D0 -/* 02B90 808753C0 AC570000 */ sw $s7, 0x0000($v0) ## 00000000 -/* 02B94 808753C4 8EA80000 */ lw $t0, 0x0000($s5) ## 00000000 -/* 02B98 808753C8 01166821 */ addu $t5, $t0, $s6 -/* 02B9C 808753CC 01BEC021 */ addu $t8, $t5, $s8 -/* 02BA0 808753D0 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -.L808753D4: -/* 02BA4 808753D4 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000001 -/* 02BA8 808753D8 0014A400 */ sll $s4, $s4, 16 -/* 02BAC 808753DC 0014A403 */ sra $s4, $s4, 16 -/* 02BB0 808753E0 2A8100C8 */ slti $at, $s4, 0x00C8 -/* 02BB4 808753E4 1420FF8C */ bne $at, $zero, .L80875218 -/* 02BB8 808753E8 26100044 */ addiu $s0, $s0, 0x0044 ## $s0 = 000003D8 -/* 02BBC 808753EC 3C068087 */ lui $a2, %hi(D_80875668) ## $a2 = 80870000 -/* 02BC0 808753F0 24C65668 */ addiu $a2, $a2, %lo(D_80875668) ## $a2 = 80875668 -/* 02BC4 808753F4 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFDC -/* 02BC8 808753F8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02BCC 808753FC 0C031AD5 */ jal Graph_CloseDisps -/* 02BD0 80875400 2407071B */ addiu $a3, $zero, 0x071B ## $a3 = 0000071B -/* 02BD4 80875404 8FBF0044 */ lw $ra, 0x0044($sp) -/* 02BD8 80875408 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 02BDC 8087540C 8FB00020 */ lw $s0, 0x0020($sp) -/* 02BE0 80875410 8FB10024 */ lw $s1, 0x0024($sp) -/* 02BE4 80875414 8FB20028 */ lw $s2, 0x0028($sp) -/* 02BE8 80875418 8FB3002C */ lw $s3, 0x002C($sp) -/* 02BEC 8087541C 8FB40030 */ lw $s4, 0x0030($sp) -/* 02BF0 80875420 8FB50034 */ lw $s5, 0x0034($sp) -/* 02BF4 80875424 8FB60038 */ lw $s6, 0x0038($sp) -/* 02BF8 80875428 8FB7003C */ lw $s7, 0x003C($sp) -/* 02BFC 8087542C 8FBE0040 */ lw $s8, 0x0040($sp) -/* 02C00 80875430 03E00008 */ jr $ra -/* 02C04 80875434 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 -/* 02C08 80875438 00000000 */ nop -/* 02C0C 8087543C 00000000 */ nop diff --git a/data/overlays/actors/z_bg_dy_yoseizo.data.s b/data/overlays/actors/z_bg_dy_yoseizo.data.s deleted file mode 100644 index 5022dea094..0000000000 --- a/data/overlays/actors/z_bg_dy_yoseizo.data.s +++ /dev/null @@ -1,35 +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 - -.word 0x0000005D, 0x0000005E, 0x0000005C -glabel Bg_Dy_Yoseizo_InitVars - .word 0x000B0600, 0x02000030, 0x000A0000, 0x000038B4 -.word BgDyYoseizo_Init -.word BgDyYoseizo_Destroy -.word BgDyYoseizo_Update -.word 0x00000000 -glabel D_8087546C - .word 0xFFFFFFFF, 0xFF6464FF, 0x64FF6464, 0xFFFFAAFF, 0xFF6464FF, 0x64FF6464, 0xFFFFAA00 -glabel D_80875488 - .word 0x9BFFFFFF, 0xFF6464FF, 0x64FF6464, 0xFF64FFFF, 0xFF6464FF, 0x64FF6464, 0x64FFFF00 -glabel D_808754A4 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_808754B0 - .word 0x00020000, 0x00010000 -glabel D_808754B8 - .word 0x00110010, 0x00120000 -glabel D_808754C0 - .word 0x01000200, 0x04000000 -glabel D_808754C8 - .word 0x0D051300 -glabel D_808754CC - .word 0x06017930, 0x06018130, 0x06018930 -glabel D_808754D8 - .word 0x06019130, 0x0601A130 - diff --git a/data/overlays/actors/z_bg_dy_yoseizo.reloc.s b/data/overlays/actors/z_bg_dy_yoseizo.reloc.s deleted file mode 100644 index ded20df03b..0000000000 --- a/data/overlays/actors/z_bg_dy_yoseizo.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_808756D0 - .incbin "baserom/ovl_Bg_Dy_Yoseizo", 0x2EA0, 0x00000250 diff --git a/spec b/spec index 2ef790b837..24e8548ac0 100644 --- a/spec +++ b/spec @@ -667,8 +667,7 @@ endseg beginseg name "ovl_Bg_Dy_Yoseizo" include "build/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.o" - include "build/data/overlays/actors/z_bg_dy_yoseizo.data.o" - include "build/data/overlays/actors/z_bg_dy_yoseizo.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Dy_Yoseizo/ovl_Bg_Dy_Yoseizo_reloc.o" endseg beginseg diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c index e892972eac..da42aad1d9 100644 --- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c +++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c @@ -5,61 +5,54 @@ */ #include "z_bg_dy_yoseizo.h" +#include "vt.h" +#include "overlays/actors/ovl_Demo_Effect/z_demo_effect.h" #define FLAGS 0x02000030 #define THIS ((BgDyYoseizo*)thisx) +typedef enum { + /* 0 */ FAIRY_UPGRADE_SPIN_ATTACK, + /* 1 */ FAIRY_UPGRADE_DOUBLE_MAGIC, + /* 2 */ FAIRY_UPGRADE_HALF_DAMAGE +} BgDyYoseizoRewardType; + +typedef enum { + /* 0 */ FAIRY_SPELL_FARORES_WIND, + /* 1 */ FAIRY_SPELL_DINS_FIRE, + /* 2 */ FAIRY_SPELL_NAYRUS_LOVE +} BgDyYoseizoSpellType; + void BgDyYoseizo_Init(Actor* thisx, GlobalContext* globalCtx); void BgDyYoseizo_Destroy(Actor* thisx, GlobalContext* globalCtx); void BgDyYoseizo_Update(Actor* thisx, GlobalContext* globalCtx); +void BgDyYoseizo_Draw(Actor* thisx, GlobalContext* globalCtx); -void func_80872960(BgDyYoseizo* this, GlobalContext* globalCtx, s16 arg2); -void func_80872C58(BgDyYoseizo* this, GlobalContext* globalCtx); -void func_80872D20(BgDyYoseizo* this, GlobalContext* globalCtx); -void func_80872DE4(BgDyYoseizo* this, GlobalContext* globalCtx); -void func_8087328C(BgDyYoseizo* this, GlobalContext* globalCtx); -void func_80873380(BgDyYoseizo* this, GlobalContext* globalCtx); -void func_808734DC(BgDyYoseizo* this, GlobalContext* globalCtx); -void func_8087358C(BgDyYoseizo* this, GlobalContext* globalCtx); -void func_808736A4(BgDyYoseizo* this, GlobalContext* globalCtx); -void func_80873780(BgDyYoseizo* this, GlobalContext* globalCtx); -void func_80873868(BgDyYoseizo* this, GlobalContext* globalCtx); -void func_80873B3C(BgDyYoseizo* this, GlobalContext* globalCtx); -void func_80873C14(BgDyYoseizo* this, GlobalContext* globalCtx); -void func_80873D14(BgDyYoseizo* this, GlobalContext* globalCtx); -void func_80873E04(BgDyYoseizo* this, GlobalContext* globalCtx); -void func_80873EA4(BgDyYoseizo* this, GlobalContext* globalCtx); -void func_80873FD8(BgDyYoseizo* this, GlobalContext* globalCtx); -void func_80874304(BgDyYoseizo* this, GlobalContext* globalCtx); -s32 func_80874B7C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, BgDyYoseizo* this); -void func_80874BE0(BgDyYoseizo* this, GlobalContext* globalCtx); -// func_80874D9C -void func_80874EAC(BgDyYoseizo* this, GlobalContext* globalCtx); -void func_808751A0(BgDyYoseizo* this, GlobalContext* globalCtx); - -extern UNK_TYPE D_02000130; -extern UNK_TYPE D_02000160; -extern UNK_TYPE D_02001020; -extern UNK_TYPE D_020013E0; -extern UNK_TYPE D_02001F40; -extern UNK_TYPE D_020025D0; -extern UNK_TYPE D_0600092C; -extern UNK_TYPE D_06001DF0; -extern UNK_TYPE D_060031C0; -extern UNK_TYPE D_06004344; -extern UNK_TYPE D_06005810; -extern UNK_TYPE D_06005860; -extern UNK_TYPE D_06005868; -extern UNK_TYPE D_060058D8; -extern UNK_TYPE D_06005E60; -extern UNK_TYPE D_060069E8; -extern UNK_TYPE D_06007CA8; -extern UNK_TYPE D_06008698; -extern UNK_TYPE D_0601C450; -extern UNK_TYPE D_0601D514; +void BgDyYoseizo_CheckMagicAcquired(BgDyYoseizo* this, GlobalContext* globalCtx); +void BgDyYoseizo_ChooseType(BgDyYoseizo* this, GlobalContext* globalCtx); +void BgDyYoseizo_SetupSpinGrow_NoReward(BgDyYoseizo* this, GlobalContext* globalCtx); +void BgDyYoseizo_SpinGrow_NoReward(BgDyYoseizo* this, GlobalContext* globalCtx); +void BgDyYoseizo_CompleteSpinGrow_NoReward(BgDyYoseizo* this, GlobalContext* globalCtx); +void BgDyYoseizo_SetupGreetPlayer_NoReward(BgDyYoseizo* this, GlobalContext* globalCtx); +void BgDyYoseizo_GreetPlayer_NoReward(BgDyYoseizo* this, GlobalContext* globalCtx); +void BgDyYoseizo_SetupHealPlayer_NoReward(BgDyYoseizo* this, GlobalContext* globalCtx); +void BgDyYoseizo_HealPlayer_NoReward(BgDyYoseizo* this, GlobalContext* globalCtx); +void BgDyYoseizo_SayFarewell_NoReward(BgDyYoseizo* this, GlobalContext* globalCtx); +void BgDyYoseizo_SetupSpinShrink(BgDyYoseizo* this, GlobalContext* globalCtx); +void BgDyYoseizo_SpinShrink(BgDyYoseizo* this, GlobalContext* globalCtx); +void BgDyYoseizo_Vanish(BgDyYoseizo* this, GlobalContext* globalCtx); +void BgDyYoseizo_SetupSpinGrow_Reward(BgDyYoseizo* this, GlobalContext* globalCtx); +void BgDyYoseizo_SpinGrowSetupGive_Reward(BgDyYoseizo* this, GlobalContext* globalCtx); +void BgDyYoseizo_Give_Reward(BgDyYoseizo* this, GlobalContext* globalCtx); + +void BgDyYoseizo_ParticleInit(BgDyYoseizo* this, Vec3f* initPos, Vec3f* initVelocity, Vec3f* accel, + Color_RGB8* primColor, Color_RGB8* envColor, f32 scale, s16 life, s16 type); +void BgDyYoseizo_ParticleUpdate(BgDyYoseizo* this, GlobalContext* globalCtx); +void BgDyYoseizo_ParticleDraw(BgDyYoseizo* this, GlobalContext* globalCtx); + +static s32 sUnusedGetItemIds[] = { GI_FARORES_WIND, GI_NAYRUS_LOVE, GI_DINS_FIRE }; -/* const ActorInit Bg_Dy_Yoseizo_InitVars = { ACTOR_BG_DY_YOSEIZO, ACTORCAT_PROP, @@ -71,55 +64,979 @@ const ActorInit Bg_Dy_Yoseizo_InitVars = { (ActorFunc)BgDyYoseizo_Update, NULL, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Destroy.s") +extern CutsceneData D_02000130; +extern CutsceneData D_02000160; +extern CutsceneData D_02001020; +extern CutsceneData D_020013E0; +extern CutsceneData D_02001F40; +extern CutsceneData D_020025D0; +extern AnimationHeader D_0600092C; // Giving spell to spin-shrink, arms, leg, hair up +extern AnimationHeader D_06001DF0; // Lounging +extern AnimationHeader D_060031C0; // Upright to Lounging +extern AnimationHeader D_06004344; // Horizontal, giving spell +extern AnimationHeader D_06005810; // Lounging to horizontal +extern u64 D_06005860[]; +extern UNK_TYPE D_06005868; +extern u64 D_060058D8[]; +extern AnimationHeader D_06005E60; // Upright, arms out, disappearing after giving magic +extern AnimationHeader D_060069E8; // Blowing kiss: cross-legged to giving magic +extern AnimationHeader D_06007CA8; // Upright, arms forward, giving magic +extern AnimationHeader D_06008698; // Spin-grow to cross-legged +extern FlexSkeletonHeader D_0601C450; +extern AnimationHeader D_0601D514; // Cross-legged, resting on right arm + +void BgDyYoseizo_Init(Actor* thisx, GlobalContext* globalCtx2) { + GlobalContext* globalCtx = globalCtx2; + BgDyYoseizo* this = THIS; + + this->fountainType = globalCtx->curSpawn; + + if (this->fountainType < 0) { + this->fountainType = 0; + } + + this->vanishHeight = this->actor.world.pos.y; + this->grownHeight = this->vanishHeight + 40.0f; + this->actor.focus.pos = this->actor.world.pos; + + if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) { + // Great Fairy Fountain + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 大妖精の泉 ☆☆☆☆☆ %d\n" VT_RST, globalCtx->curSpawn); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0601C450, &D_06008698, this->jointTable, this->morphTable, + 28); + } else { + // Stone/Jewel Fairy Fountain + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 石妖精の泉 ☆☆☆☆☆ %d\n" VT_RST, globalCtx->curSpawn); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0601C450, &D_060031C0, this->jointTable, this->morphTable, + 28); + } + this->actionFunc = BgDyYoseizo_CheckMagicAcquired; +} + +void BgDyYoseizo_Destroy(Actor* this, GlobalContext* globalCtx) { +} + +static Color_RGB8 sParticlePrimColors[] = { + { 255, 255, 255 }, { 255, 255, 100 }, { 100, 255, 100 }, { 255, 100, 100 }, { 255, 255, 170 }, + { 255, 255, 100 }, { 100, 255, 100 }, { 255, 100, 100 }, { 255, 255, 170 }, +}; + +static Color_RGB8 sParticleEnvColors[] = { + { 155, 255, 255 }, { 255, 255, 100 }, { 100, 255, 100 }, { 255, 100, 100 }, { 255, 100, 255 }, + { 255, 255, 100 }, { 100, 255, 100 }, { 255, 100, 100 }, { 100, 255, 255 }, +}; + +void BgDyYoseizo_SpawnParticles(BgDyYoseizo* this, GlobalContext* globalCtx, s16 type) { + Vec3f particleInitVelocity = { 0.0f, 0.0f, 0.0f }; + Vec3f particleAccel; + Vec3f particleInitPos; + Color_RGB8 particlePrimColor; + Color_RGB8 particleEnvColor; + f32 spawnPosVariation; + s32 particleType; + f32 particleScale; + s32 i; + s16 particleLife; + + if (!(this->scale < 0.01f)) { + spawnPosVariation = this->scale * 3500.0f; + particleAccel.x = Rand_ZeroOne() - 0.5f; + particleAccel.y = Rand_ZeroOne() - 0.5f; + particleAccel.z = Rand_ZeroOne() - 0.5f; + for (i = 0; i < 2; i++) { + if (type == 0) { + particleType = 0; + particleScale = 0.4f; + particleLife = 90; + particleInitPos.x = this->actor.world.pos.x; + particleInitPos.y = this->actor.world.pos.y + spawnPosVariation + + ((Rand_ZeroOne() - 0.5f) * (spawnPosVariation * 0.5f)); + particleInitPos.z = this->actor.world.pos.z + 30.0f; + } else { + particleLife = 50; + particleType = type; + particleScale = 0.2f; + particleInitPos.x = this->actor.world.pos.x + Rand_CenteredFloat(10.0f); + + if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) { + particleInitPos.y = this->actor.world.pos.y + spawnPosVariation + 50.0f + + ((Rand_ZeroOne() - 0.5f) * (spawnPosVariation * 0.1f)); + particleInitPos.z = this->actor.world.pos.z + 30.0f; + } else { + particleInitPos.y = this->actor.world.pos.y + spawnPosVariation - 30.0f + + ((Rand_ZeroOne() - 0.5f) * (spawnPosVariation * 0.1f)); + particleInitPos.z = this->actor.world.pos.z + 60.0f; + } + + if (LINK_IS_ADULT) { + particleInitPos.y += 20.0f; + } + } + + particlePrimColor.r = sParticlePrimColors[particleType].r; + particlePrimColor.g = sParticlePrimColors[particleType].g; + particlePrimColor.b = sParticlePrimColors[particleType].b; + particleEnvColor.r = sParticleEnvColors[particleType].r; + particleEnvColor.g = sParticleEnvColors[particleType].g; + particleEnvColor.b = sParticleEnvColors[particleType].b; + BgDyYoseizo_ParticleInit(this, &particleInitPos, &particleInitVelocity, &particleAccel, &particlePrimColor, + &particleEnvColor, particleScale, particleLife, particleType); + } + } +} + +void BgDyYoseizo_Bob(BgDyYoseizo* this, GlobalContext* globalCtx) { + this->targetHeight = this->grownHeight + this->bobOffset; + Math_ApproachF(&this->actor.world.pos.y, this->targetHeight, 0.1f, 10.0f); + Math_ApproachF(&this->bobOffset, 10.0f, 0.1f, 0.5f); + + if (globalCtx->csCtx.state == 0) { + this->actor.velocity.y = Math_SinS(this->bobTimer); + } else { + this->actor.velocity.y = Math_SinS(this->bobTimer) * 0.4f; + } +} + +void BgDyYoseizo_CheckMagicAcquired(BgDyYoseizo* this, GlobalContext* globalCtx) { + if (Flags_GetSwitch(globalCtx, 0x38)) { + globalCtx->msgCtx.unk_E3EE = 4; + if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) { + if (!gSaveContext.magicAcquired && (this->fountainType != FAIRY_UPGRADE_SPIN_ATTACK)) { + Actor_Kill(&this->actor); + return; + } + } else { + if (!gSaveContext.magicAcquired) { + Actor_Kill(&this->actor); + return; + } + } + func_8002DF54(globalCtx, &this->actor, 1); + this->actionFunc = BgDyYoseizo_ChooseType; + } +} + +void BgDyYoseizo_ChooseType(BgDyYoseizo* this, GlobalContext* globalCtx) { + s32 givingReward; + + func_8002DF54(globalCtx, &this->actor, 1); + // Mode + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ もうど ☆☆☆☆☆ %d\n" VT_RST, globalCtx->msgCtx.unk_E3EE); + givingReward = false; + + if (globalCtx->sceneNum != SCENE_DAIYOUSEI_IZUMI) { + switch (this->fountainType) { + case FAIRY_SPELL_FARORES_WIND: + if (!(gSaveContext.itemGetInf[1] & 0x100)) { + givingReward = true; + } + break; + case FAIRY_SPELL_DINS_FIRE: + if (!(gSaveContext.itemGetInf[1] & 0x200)) { + givingReward = true; + } + break; + case FAIRY_SPELL_NAYRUS_LOVE: + if (!(gSaveContext.itemGetInf[1] & 0x400)) { + givingReward = true; + } + break; + } + } else { + switch (this->fountainType) { + case FAIRY_UPGRADE_SPIN_ATTACK: + if (!gSaveContext.magicAcquired || BREG(2)) { + // Spin Attack speed UP + osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ 回転切り速度ＵＰ ☆☆☆☆☆ \n" VT_RST, &gSaveContext); + this->givingSpell = true; + givingReward = true; + } + break; + case FAIRY_UPGRADE_DOUBLE_MAGIC: + if (!gSaveContext.doubleMagic) { + // Magic Meter doubled + osSyncPrintf(VT_FGCOL(YELLOW) " ☆☆☆☆☆ 魔法ゲージメーター倍増 ☆☆☆☆☆ \n" VT_RST, &gSaveContext); + this->givingSpell = true; + givingReward = true; + } + break; + case FAIRY_UPGRADE_HALF_DAMAGE: + if (!gSaveContext.doubleDefense) { + // Damage halved + osSyncPrintf(VT_FGCOL(PURPLE) " ☆☆☆☆☆ ダメージ半減 ☆☆☆☆☆ \n" VT_RST, &gSaveContext); + this->givingSpell = true; + givingReward = true; + } + break; + } + } + + if (givingReward) { + if (gSaveContext.sceneSetupIndex < 4) { + if (globalCtx->sceneNum != SCENE_DAIYOUSEI_IZUMI) { + switch (this->fountainType) { + case FAIRY_SPELL_FARORES_WIND: + globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(&D_02000160); + gSaveContext.cutsceneTrigger = 1; + break; + case FAIRY_SPELL_DINS_FIRE: + globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(&D_02001020); + gSaveContext.cutsceneTrigger = 1; + break; + case FAIRY_SPELL_NAYRUS_LOVE: + globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(&D_02001F40); + gSaveContext.cutsceneTrigger = 1; + break; + } + } else { + switch (this->fountainType) { + case FAIRY_UPGRADE_SPIN_ATTACK: + globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(&D_02000130); + gSaveContext.cutsceneTrigger = 1; + break; + case FAIRY_UPGRADE_DOUBLE_MAGIC: + globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(&D_020013E0); + gSaveContext.cutsceneTrigger = 1; + break; + case FAIRY_UPGRADE_HALF_DAMAGE: + globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(&D_020025D0); + gSaveContext.cutsceneTrigger = 1; + break; + } + } + } + this->actionFunc = BgDyYoseizo_SetupSpinGrow_Reward; + return; + } + + globalCtx->envCtx.unk_BF = 2; + + if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) { + func_800800F8(globalCtx, 0x219B, -99, NULL, 0); + } else { + func_800800F8(globalCtx, 0x219C, -99, NULL, 0); + }; + + Audio_PlayActorSound2(&this->actor, NA_SE_EV_GREAT_FAIRY_APPEAR); + this->actor.draw = BgDyYoseizo_Draw; + this->actionFunc = BgDyYoseizo_SetupSpinGrow_NoReward; +} + +// Sets animations for spingrow +void BgDyYoseizo_SetupSpinGrow_NoReward(BgDyYoseizo* this, GlobalContext* globalCtx) { + if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) { + this->frameCount = Animation_GetLastFrame(&D_06008698); + Animation_Change(&this->skelAnime, &D_06008698, 1.0f, 0.0f, this->frameCount, 2, -10.0f); + } else { + this->frameCount = Animation_GetLastFrame(&D_060031C0); + Animation_Change(&this->skelAnime, &D_060031C0, 1.0f, 0.0f, this->frameCount, 2, -10.0f); + } + + Audio_PlayActorSound2(&this->actor, NA_SE_VO_FR_LAUGH_0); + func_8002DF54(globalCtx, &this->actor, 1); + this->actionFunc = BgDyYoseizo_SpinGrow_NoReward; +} + +void BgDyYoseizo_SpinGrow_NoReward(BgDyYoseizo* this, GlobalContext* globalCtx) { + func_8002DF54(globalCtx, &this->actor, 1); + Math_ApproachF(&this->actor.world.pos.y, this->grownHeight, this->heightFraction, 100.0f); + Math_ApproachF(&this->scale, 0.035f, this->scaleFraction, 0.005f); + Math_ApproachF(&this->heightFraction, 0.8f, 0.1f, 0.02f); + Math_ApproachF(&this->scaleFraction, 0.2f, 0.03f, 0.05f); + // Finished growing + if (this->scale >= 0.034f) { + if ((this->actor.shape.rot.y > -8000) && (this->actor.shape.rot.y < 1000)) { + SkelAnime_Update(&this->skelAnime); + // Turn to front + Math_SmoothStepToS(&this->actor.shape.rot.y, 0, 5, 1000, 0); + if (fabsf(this->actor.shape.rot.y) < 50.0f) { + this->actionFunc = BgDyYoseizo_CompleteSpinGrow_NoReward; + } + } else { + this->actor.shape.rot.y += 3000; + } + } else { + this->actor.shape.rot.y += 3000; + } + BgDyYoseizo_SpawnParticles(this, globalCtx, 0); +} + +void BgDyYoseizo_CompleteSpinGrow_NoReward(BgDyYoseizo* this, GlobalContext* globalCtx) { + f32 curFrame = this->skelAnime.curFrame; + + func_8002DF54(globalCtx, &this->actor, 1); + + if ((this->frameCount * 1273.0f) <= this->bobTimer) { + this->bobTimer = 0.0f; + } + + SkelAnime_Update(&this->skelAnime); + + if ((this->frameCount <= curFrame) && !this->animationChanged) { + this->actionFunc = BgDyYoseizo_SetupGreetPlayer_NoReward; + } +} + +void BgDyYoseizo_SetupGreetPlayer_NoReward(BgDyYoseizo* this, GlobalContext* globalCtx) { + func_8002DF54(globalCtx, &this->actor, 1); + + if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) { + this->frameCount = Animation_GetLastFrame(&D_0601D514); + Animation_Change(&this->skelAnime, &D_0601D514, 1.0f, 0.0f, this->frameCount, 0, -10.0f); + } else { + this->frameCount = Animation_GetLastFrame(&D_06001DF0); + Animation_Change(&this->skelAnime, &D_06001DF0, 1.0f, 0.0f, this->frameCount, 0, -10.0f); + } + + this->actor.textId = 0xDB; + this->dialogState = 5; + func_8010B680(globalCtx, this->actor.textId, NULL); + BgDyYoseizo_SpawnParticles(this, globalCtx, 0); + this->actionFunc = BgDyYoseizo_GreetPlayer_NoReward; +} + +void BgDyYoseizo_GreetPlayer_NoReward(BgDyYoseizo* this, GlobalContext* globalCtx) { + func_8002DF54(globalCtx, &this->actor, 1); + this->bobTimer = this->skelAnime.curFrame * 1273.0f; + + if ((this->frameCount * 1273.0f) <= this->bobTimer) { + this->bobTimer = 0.0f; + } + + SkelAnime_Update(&this->skelAnime); + + if ((this->dialogState == func_8010BDBC(&globalCtx->msgCtx)) && (func_80106BC8(globalCtx) != 0)) { + func_80106CCC(globalCtx); + Interface_ChangeAlpha(5); + this->actionFunc = BgDyYoseizo_SetupHealPlayer_NoReward; + } + + BgDyYoseizo_Bob(this, globalCtx); + BgDyYoseizo_SpawnParticles(this, globalCtx, 0); +} + +void BgDyYoseizo_SetupHealPlayer_NoReward(BgDyYoseizo* this, GlobalContext* globalCtx) { + if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) { + this->frameCount = Animation_GetLastFrame(&D_060069E8); + Animation_Change(&this->skelAnime, &D_060069E8, 1.0f, 0.0f, this->frameCount, 2, -10.0f); + } else { + this->frameCount = Animation_GetLastFrame(&D_06005810); + Animation_Change(&this->skelAnime, &D_06005810, 1.0f, 0.0f, this->frameCount, 2, -10.0f); + } + + Audio_PlayActorSound2(&this->actor, NA_SE_VO_FR_SMILE_0); + this->mouthState = 1; + this->actionFunc = BgDyYoseizo_HealPlayer_NoReward; +} + +void BgDyYoseizo_HealPlayer_NoReward(BgDyYoseizo* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 curFrame = this->skelAnime.curFrame; + Vec3f beamPos; + s16 beamParams; + + if (this->animationChanged) { + this->bobTimer = this->skelAnime.curFrame * 1300.0f; + if ((this->frameCount * 1300.0f) <= this->bobTimer) { + this->bobTimer = 0.0f; + } + } + + SkelAnime_Update(&this->skelAnime); + if ((this->frameCount <= curFrame) && !(this->animationChanged)) { + if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) { + this->frameCount = Animation_GetLastFrame(&D_06007CA8); + Animation_Change(&this->skelAnime, &D_06007CA8, 1.0f, 0.0f, this->frameCount, 0, -10.0f); + } else { + this->frameCount = Animation_GetLastFrame(&D_06004344); + Animation_Change(&this->skelAnime, &D_06004344, 1.0f, 0.0f, this->frameCount, 0, -10.0f); + } + this->healingTimer = 150; + this->animationChanged = true; + if (!this->givingSpell) { + beamPos.x = player->actor.world.pos.x; + beamPos.y = player->actor.world.pos.y + 200.0f; + beamPos.z = player->actor.world.pos.z; + + beamParams = ((globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) ? 0 : 1); + + this->beam = + (EnDyExtra*)Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_DY_EXTRA, + beamPos.x, beamPos.y, beamPos.z, 0, 0, 0, beamParams); + } + } + if (this->refillTimer > 1) { + this->refillTimer--; + } + + if (this->healingTimer >= 110) { + this->healingTimer--; + } + + if (this->healingTimer == 110) { + gSaveContext.healthAccumulator = 0x140; + Magic_Fill(globalCtx); + this->refillTimer = 200; + } + + if (((gSaveContext.healthCapacity == gSaveContext.health) && (gSaveContext.magic == gSaveContext.unk_13F4)) || + (this->refillTimer == 1)) { + this->healingTimer--; + if (this->healingTimer == 90) { + if (!this->givingSpell) { + this->beam->trigger = 1; + } + this->givingSpell = false; + } + } + + if (this->healingTimer == 1) { + this->actor.textId = 0xDA; + this->dialogState = 5; + func_8010B720(globalCtx, this->actor.textId); + this->actionFunc = BgDyYoseizo_SayFarewell_NoReward; + return; + } + BgDyYoseizo_Bob(this, globalCtx); +} + +void BgDyYoseizo_SayFarewell_NoReward(BgDyYoseizo* this, GlobalContext* globalCtx) { + this->bobTimer = this->skelAnime.curFrame * 1400.0f; + + if (this->bobTimer >= (this->frameCount * 1400.0f)) { + this->bobTimer = 0.0f; + } + + SkelAnime_Update(&this->skelAnime); + + if ((this->dialogState == func_8010BDBC(&globalCtx->msgCtx)) && (func_80106BC8(globalCtx) != 0)) { + func_80106CCC(globalCtx); + this->mouthState = 0; + this->actionFunc = BgDyYoseizo_SetupSpinShrink; + func_8005B1A4(ACTIVE_CAM); + } + + BgDyYoseizo_Bob(this, globalCtx); + BgDyYoseizo_SpawnParticles(this, globalCtx, 0); +} + +void BgDyYoseizo_SetupSpinShrink(BgDyYoseizo* this, GlobalContext* globalCtx) { + if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) { + this->frameCount = Animation_GetLastFrame(&D_06005E60); + Animation_Change(&this->skelAnime, &D_06005E60, 1.0f, 0.0f, this->frameCount, 2, -10.0f); + } else { + this->frameCount = Animation_GetLastFrame(&D_0600092C); + Animation_Change(&this->skelAnime, &D_0600092C, 1.0f, 0.0f, this->frameCount, 2, -10.0f); + } + + this->vanishTimer = 5; + this->scaleFraction = 0.0f; + this->heightFraction = 0.0f; + Audio_PlayActorSound2(&this->actor, NA_SE_VO_FR_LAUGH_0); + Audio_PlayActorSound2(&this->actor, NA_SE_EV_GREAT_FAIRY_VANISH); + this->actionFunc = BgDyYoseizo_SpinShrink; +} + +void BgDyYoseizo_SpinShrink(BgDyYoseizo* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (this->vanishTimer == 0) { + if (this->scale < 0.003f) { + this->vanishTimer = 30; + this->actionFunc = BgDyYoseizo_Vanish; + } else { + Math_ApproachF(&this->actor.world.pos.y, this->vanishHeight, this->heightFraction, 100.0f); + Math_ApproachZeroF(&this->scale, this->scaleFraction, 0.005f); + Math_ApproachF(&this->heightFraction, 0.8f, 0.1f, 0.02f); + Math_ApproachF(&this->scaleFraction, 0.2f, 0.03f, 0.05f); + this->actor.shape.rot.y += 3000; + BgDyYoseizo_SpawnParticles(this, globalCtx, 0); + } + } +} + +void BgDyYoseizo_Vanish(BgDyYoseizo* this, GlobalContext* globalCtx) { + Actor* findOcarinaSpot; + + if (this->vanishTimer == 0) { + func_8002DF54(globalCtx, &this->actor, 7); + globalCtx->envCtx.unk_BF = 0; + findOcarinaSpot = globalCtx->actorCtx.actorLists[ACTORCAT_PROP].head; + + while (findOcarinaSpot != NULL) { + if (findOcarinaSpot->id != ACTOR_EN_OKARINA_TAG) { + findOcarinaSpot = findOcarinaSpot->next; + continue; + } + Actor_Kill(findOcarinaSpot); + break; + } + + Flags_UnsetSwitch(globalCtx, 0x38); + Actor_Kill(&this->actor); + } +} + +void BgDyYoseizo_SetupSpinGrow_Reward(BgDyYoseizo* this, GlobalContext* globalCtx) { + if (globalCtx->csCtx.state != 0) { + if ((globalCtx->csCtx.npcActions[0] != NULL) && (globalCtx->csCtx.npcActions[0]->action == 2)) { + this->actor.draw = BgDyYoseizo_Draw; + func_8002DF54(globalCtx, &this->actor, 1); + this->finishedSpinGrow = false; + + if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) { + this->frameCount = Animation_GetLastFrame(&D_06008698); + Animation_Change(&this->skelAnime, &D_06008698, 1.0f, 0.0f, this->frameCount, 2, -10.0f); + } else { + this->frameCount = Animation_GetLastFrame(&D_060031C0); + Animation_Change(&this->skelAnime, &D_060031C0, 1.0f, 0.0f, this->frameCount, 2, -10.0f); + } + + Audio_PlayActorSound2(&this->actor, NA_SE_EV_GREAT_FAIRY_APPEAR); + this->actionFunc = BgDyYoseizo_SpinGrowSetupGive_Reward; + } + } +} + +void BgDyYoseizo_SpinGrowSetupGive_Reward(BgDyYoseizo* this, GlobalContext* globalCtx) { + f32 curFrame = this->skelAnime.curFrame; + + if (!this->finishedSpinGrow) { + Math_ApproachF(&this->actor.world.pos.y, this->grownHeight, this->heightFraction, 100.0f); + Math_ApproachF(&this->scale, 0.035f, this->scaleFraction, 0.005f); + Math_ApproachF(&this->heightFraction, 0.8f, 0.1f, 0.02f); + Math_ApproachF(&this->scaleFraction, 0.2f, 0.03f, 0.05f); + // Finished growing + if (this->scale >= 0.034f) { + if ((this->actor.shape.rot.y > -8000) && (this->actor.shape.rot.y < 1000)) { + SkelAnime_Update(&this->skelAnime); + // Spin until facing front + Math_ApproachS(&this->actor.shape.rot.y, 0, 5, 1000); + if (fabsf(this->actor.shape.rot.y) < 50.0f) { + this->finishedSpinGrow = true; + } + } else { + this->actor.shape.rot.y += 3000; + } + } else { + this->actor.shape.rot.y += 3000; + } + } else { + SkelAnime_Update(&this->skelAnime); + + if ((this->frameCount <= curFrame) && !this->animationChanged) { + if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) { + this->frameCount = Animation_GetLastFrame(&D_0601D514); + Animation_Change(&this->skelAnime, &D_0601D514, 1.0f, 0.0f, this->frameCount, 0, -10.0f); + } else { + this->frameCount = Animation_GetLastFrame(&D_06001DF0); + Animation_Change(&this->skelAnime, &D_06001DF0, 1.0f, 0.0f, this->frameCount, 0, -10.0f); + } + this->animationChanged = true; + } + + if ((globalCtx->csCtx.state != 0) && + ((globalCtx->csCtx.npcActions[0] != NULL) && (globalCtx->csCtx.npcActions[0]->action == 3))) { + this->finishedSpinGrow = this->animationChanged = false; + if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) { + this->frameCount = Animation_GetLastFrame(&D_060069E8); + Animation_Change(&this->skelAnime, &D_060069E8, 1.0f, 0.0f, this->frameCount, 2, -10.0f); + } else { + this->frameCount = Animation_GetLastFrame(&D_06005810); + Animation_Change(&this->skelAnime, &D_06005810, 1.0f, 0.0f, this->frameCount, 2, -10.0f); + } + this->mouthState = 1; + this->actionFunc = BgDyYoseizo_Give_Reward; + } + } + BgDyYoseizo_SpawnParticles(this, globalCtx, 0); +} + +static s16 sDemoEffectLightColors[] = { DEMO_EFFECT_LIGHT_GREEN, DEMO_EFFECT_LIGHT_RED, DEMO_EFFECT_LIGHT_BLUE }; + +static s16 sExItemTypes[] = { EXITEM_MAGIC_WIND, EXITEM_MAGIC_FIRE, EXITEM_MAGIC_DARK }; + +static s16 sItemGetFlags[] = { 0x100, 0x200, 0x400 }; + +static u8 sItemIds[] = { ITEM_FARORES_WIND, ITEM_DINS_FIRE, ITEM_NAYRUS_LOVE }; + +void BgDyYoseizo_Give_Reward(BgDyYoseizo* this, GlobalContext* globalCtx) { + f32 curFrame = this->skelAnime.curFrame; + Player* player = PLAYER; + s16 actionIndex; + s16 demoEffectParams; + Vec3f itemPos; + + if (this->animationChanged) { + this->bobTimer = this->skelAnime.curFrame * 1400.0f; + if ((this->frameCount * 1400.0f) <= this->bobTimer) { + this->bobTimer = 0.0f; + } + } + SkelAnime_Update(&this->skelAnime); + + if ((this->frameCount <= curFrame) && !this->animationChanged) { + if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) { + this->frameCount = Animation_GetLastFrame(&D_06007CA8); + Animation_Change(&this->skelAnime, &D_06007CA8, 1.0f, 0.0f, this->frameCount, 0, -10.0f); + } else { + this->frameCount = Animation_GetLastFrame(&D_06004344); + Animation_Change(&this->skelAnime, &D_06004344, 1.0f, 0.0f, this->frameCount, 0, -10.0f); + } + this->animationChanged = true; + } + + if (globalCtx->csCtx.npcActions[0]->action == 13) { + this->actionFunc = BgDyYoseizo_SetupSpinShrink; + return; + } + + if ((globalCtx->csCtx.npcActions[0]->action >= 4) && (globalCtx->csCtx.npcActions[0]->action < 7)) { + actionIndex = globalCtx->csCtx.npcActions[0]->action - 4; + if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) { + actionIndex++; + BgDyYoseizo_SpawnParticles(this, globalCtx, actionIndex); + + } else if (!this->lightBallSpawned) { + demoEffectParams = ((s16)(sDemoEffectLightColors[actionIndex] << 0xC) | DEMO_EFFECT_LIGHT); + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_DEMO_EFFECT, this->actor.world.pos.x, + this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, (s32)demoEffectParams); + this->lightBallSpawned = true; + } + } else { + BgDyYoseizo_SpawnParticles(this, globalCtx, 0); + } + + if ((globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) && (globalCtx->csCtx.npcActions[0]->action >= 10) && + (globalCtx->csCtx.npcActions[0]->action < 13)) { + actionIndex = globalCtx->csCtx.npcActions[0]->action - 10; + + switch (actionIndex) { + case FAIRY_UPGRADE_SPIN_ATTACK: + gSaveContext.magicAcquired = true; + gSaveContext.unk_13F6 = 0x30; + Interface_ChangeAlpha(9); + break; + case FAIRY_UPGRADE_DOUBLE_MAGIC: + if (!gSaveContext.magicAcquired) { + gSaveContext.magicAcquired = true; + } + gSaveContext.doubleMagic = true; + gSaveContext.unk_13F6 = 0x60; + gSaveContext.magicLevel = 0; + Interface_ChangeAlpha(9); + break; + case FAIRY_UPGRADE_HALF_DAMAGE: + gSaveContext.doubleDefense = true; + Interface_ChangeAlpha(9); + break; + } + + if (!this->healing) { + gSaveContext.healthAccumulator = 0x140; + this->healing = true; + if (actionIndex == 2) { + Magic_Fill(globalCtx); + } + } + } + + if ((globalCtx->sceneNum != SCENE_DAIYOUSEI_IZUMI) && (globalCtx->csCtx.npcActions[0]->action >= 14) && + (globalCtx->csCtx.npcActions[0]->action < 17)) { + actionIndex = globalCtx->csCtx.npcActions[0]->action - 14; + + if (!this->itemSpawned) { + itemPos.x = player->actor.world.pos.x; + itemPos.y = (LINK_IS_ADULT ? player->actor.world.pos.y + 73.0f : player->actor.world.pos.y + 53.0f); + itemPos.z = player->actor.world.pos.z; + + this->item = + (EnExItem*)Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_EX_ITEM, + itemPos.x, itemPos.y, itemPos.z, 0, 0, 0, sExItemTypes[actionIndex]); + + if (this->item != NULL) { + if (gSaveContext.magicAcquired == 0) { + gSaveContext.magicAcquired = 1; + } else { + Magic_Fill(globalCtx); + } + + this->itemSpawned = true; + gSaveContext.healthAccumulator = 0x140; + Interface_ChangeAlpha(9); + gSaveContext.itemGetInf[1] |= sItemGetFlags[actionIndex]; + Item_Give(globalCtx, sItemIds[actionIndex]); + } + } else { + this->item->actor.world.pos.x = player->actor.world.pos.x; + this->item->actor.world.pos.y = + (LINK_IS_ADULT ? player->actor.world.pos.y + 73.0f : player->actor.world.pos.y + 53.0f); + this->item->actor.world.pos.z = player->actor.world.pos.z; + this->item->scale = 0.3f; + } + } + + if ((globalCtx->sceneNum != SCENE_DAIYOUSEI_IZUMI) && (globalCtx->csCtx.npcActions[0]->action == 17) && + (this->item != NULL)) { + Actor_Kill(&this->item->actor); + this->item = NULL; + } + + if ((globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) && (globalCtx->csCtx.npcActions[0]->action == 18)) { + this->giveDefenseHearts = true; + } + + if (this->giveDefenseHearts) { + if (gSaveContext.inventory.defenseHearts < 20) { + gSaveContext.inventory.defenseHearts++; + } + } + + if ((globalCtx->csCtx.npcActions[0]->action >= 19) && (globalCtx->csCtx.npcActions[0]->action < 22) && + !this->warpEffectSpawned) { + actionIndex = globalCtx->csCtx.npcActions[0]->action - 11; + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_DOOR_WARP1, player->actor.world.pos.x, + player->actor.world.pos.y, player->actor.world.pos.z, 0, 0, 0, actionIndex); + this->warpEffectSpawned = true; + } + BgDyYoseizo_Bob(this, globalCtx); +} + +void BgDyYoseizo_Update(Actor* thisx, GlobalContext* globalCtx2) { + GlobalContext* globalCtx = globalCtx2; + BgDyYoseizo* this = THIS; + s32 phi_v1; + + this->absoluteTimer++; + + if (this->vanishTimer != 0) { + this->vanishTimer--; + } + if (this->blinkTimer != 0) { + this->blinkTimer--; + } + if (this->unusedTimer != 0) { + this->unusedTimer--; + } + + this->actionFunc(this, globalCtx); + + if (globalCtx->csCtx.state != 0) { + phi_v1 = 0; + if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) { + if ((globalCtx->csCtx.frames == 32) || (globalCtx->csCtx.frames == 291) || + (globalCtx->csCtx.frames == 426) || (globalCtx->csCtx.frames == 851)) { + phi_v1 = 1; + } + if (globalCtx->csCtx.frames == 101) { + phi_v1 = 2; + } + } else { + if ((globalCtx->csCtx.frames == 35) || (globalCtx->csCtx.frames == 181) || + (globalCtx->csCtx.frames == 462) || (globalCtx->csCtx.frames == 795)) { + phi_v1 = 1; + } + if (globalCtx->csCtx.frames == 90) { + phi_v1 = 2; + } + } + + if (phi_v1 == 1) { + Audio_PlayActorSound2(&this->actor, NA_SE_VO_FR_SMILE_0); + } + if (phi_v1 == 2) { + Audio_PlayActorSound2(&this->actor, NA_SE_VO_FR_LAUGH_0); + } + } + + if ((this->blinkTimer == 0) && (this->actionFunc != BgDyYoseizo_HealPlayer_NoReward)) { + this->eyeState++; + this->eyeState2++; + if (this->eyeState >= 3) { + this->eyeState = this->eyeState2 = 0; + this->blinkTimer = (s16)Rand_ZeroFloat(60.0f) + 20; + } + } + + Actor_MoveForward(&this->actor); + this->heightOffset = this->scale * 7500.0f; + Actor_SetFocus(&this->actor, this->heightOffset); + this->actor.focus.pos.y = this->heightOffset; + func_80038290(globalCtx, &this->actor, &this->headRot, &this->torsoRot, this->actor.focus.pos); + BgDyYoseizo_ParticleUpdate(this, globalCtx); + Actor_SetScale(&this->actor, this->scale); +} + +s32 BgDyYoseizo_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + void* thisx) { + BgDyYoseizo* this = THIS; + + if (limbIndex == 8) { // Torso + rot->x += this->torsoRot.y; + } + if (limbIndex == 15) { // Head + rot->x += this->headRot.y; + rot->z += this->headRot.z; + } + return 0; +} + +static u64* sEyeTextures[] = { + 0x06017930, // Open + 0x06018130, // Half + 0x06018930, // Closed +}; + +static u64* sMouthTextures[] = { + 0x06019130, // Closed + 0x0601A130, // Open +}; + +void BgDyYoseizo_Draw(Actor* thisx, GlobalContext* globalCtx) { + BgDyYoseizo* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_dy_yoseizo.c", 1609); + if (this->actionFunc != BgDyYoseizo_Vanish) { + func_80093D18(globalCtx->state.gfxCtx); + + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeState])); + + // This was probably intended to allow this actor to wink, but segment 09 is not used in the dList for the head, + // so it can only blink + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeState2])); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872960.s") + gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(sMouthTextures[this->mouthState])); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872C58.s") + SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, + this->skelAnime.dListCount, BgDyYoseizo_OverrideLimbDraw, NULL, this); + } + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_dy_yoseizo.c", 1629); + BgDyYoseizo_ParticleDraw(this, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872D20.s") +void BgDyYoseizo_ParticleInit(BgDyYoseizo* this, Vec3f* initPos, Vec3f* initVelocity, Vec3f* accel, + Color_RGB8* primColor, Color_RGB8* envColor, f32 scale, s16 life, s16 type) { + BgDyYoseizoParticle* particle; + s16 i; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80872DE4.s") + particle = this->particles; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087328C.s") + for (i = 0; i < 200; i++, particle++) { + if (particle->alive == 0) { + particle->alive = 1; + particle->pos = *initPos; + particle->velocity = *initVelocity; + particle->accel = *accel; + particle->primColor = *primColor; + particle->alpha = 0; + particle->envColor = *envColor; + particle->scale = scale; + particle->timer = life; + particle->type = type; + particle->pitch = 0.0f; + particle->yaw = Rand_CenteredFloat(30000.0f); + particle->roll = 0.0f; + return; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873380.s") +void BgDyYoseizo_ParticleUpdate(BgDyYoseizo* this, GlobalContext* globalCtx) { + BgDyYoseizoParticle* particle = this->particles; + Player* player = PLAYER; + Vec3f sp94; + Vec3f sp88; + f32 goalPitch; + f32 goalYaw; + s16 i = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808734DC.s") + for (i = 0; i < 200; i++, particle++) { + if (particle->alive != 0) { + particle->roll += 3000.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087358C.s") + if (particle->type == 0) { + particle->pos.x += particle->velocity.x; + particle->pos.y += particle->velocity.y; + particle->pos.z += particle->velocity.z; + particle->velocity.x += particle->accel.x; + particle->velocity.y += particle->accel.y; + particle->velocity.z += particle->accel.z; + } else { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_HEALING - SFX_FLAG); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808736A4.s") + sp94 = player->actor.world.pos; + sp94.y = player->actor.world.pos.y - 150.0f; + sp94.z = player->actor.world.pos.z - 50.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873780.s") + goalPitch = Math_Vec3f_Pitch(&particle->pos, &sp94); + goalYaw = Math_Vec3f_Yaw(&particle->pos, &sp94); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873868.s") + Math_ApproachF(&particle->pitch, goalPitch, 0.9f, 5000.0f); + Math_ApproachF(&particle->yaw, goalYaw, 0.9f, 5000.0f); + Matrix_Push(); + Matrix_RotateY(BINANG_TO_RAD(particle->yaw), MTXMODE_NEW); + Matrix_RotateX(BINANG_TO_RAD(particle->pitch), MTXMODE_APPLY); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873B3C.s") + sp94.x = sp94.y = sp94.z = 3.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873C14.s") + Matrix_MultVec3f(&sp94, &sp88); + Matrix_Pull(); + particle->pos.x += sp88.x; + particle->pos.y += sp88.y; + particle->pos.z += sp88.z; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873D14.s") + // fade up, fade down, vanish and reset + if (particle->timer != 0) { + particle->timer--; + particle->alpha += 30; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873E04.s") + if (particle->alpha > 255) { + particle->alpha = 255; + } + } else { + particle->alpha -= 30; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873EA4.s") + if (particle->alpha <= 0) { + particle->alpha = particle->alive = 0; + } + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873FD8.s") +void BgDyYoseizo_ParticleDraw(BgDyYoseizo* this, GlobalContext* globalCtx) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + u8 phi_s3 = 0; + BgDyYoseizoParticle* particle = this->particles; + s16 i; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874304.s") + OPEN_DISPS(gfxCtx, "../z_bg_dy_yoseizo.c", 1767); + func_80093D84(globalCtx->state.gfxCtx); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Update.s") + for (i = 0; i < 200; i++, particle++) { + if (particle->alive == 1) { + if (phi_s3 == 0) { + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(&D_06005860)); + gDPPipeSync(POLY_XLU_DISP++); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874B7C.s") + phi_s3++; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s") + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, particle->primColor.r, particle->primColor.g, particle->primColor.b, + particle->alpha); + gDPSetEnvColor(POLY_XLU_DISP++, particle->envColor.r, particle->envColor.g, particle->envColor.b, 0); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874D9C.s") + Matrix_Translate(particle->pos.x, particle->pos.y, particle->pos.z, MTXMODE_NEW); + func_800D1FD4(&globalCtx->mf_11DA0); + Matrix_Scale(particle->scale, particle->scale, 1.0f, MTXMODE_APPLY); + Matrix_RotateZ(particle->roll, MTXMODE_APPLY); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874EAC.s") + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_bg_dy_yoseizo.c", 1810), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(&D_060058D8)); + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808751A0.s") + CLOSE_DISPS(gfxCtx, "../z_bg_dy_yoseizo.c", 1819); +} diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h index b4f77712df..9398e5777e 100644 --- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h +++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h @@ -3,16 +3,71 @@ #include "ultra64.h" #include "global.h" +#include "overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h" +#include "overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h" struct BgDyYoseizo; typedef void (*BgDyYoseizoActionFunc)(struct BgDyYoseizo*, GlobalContext*); +typedef struct { + /* 0x00 */ u8 alive; // drawn if 1, respawn if 0 + /* 0x04 */ Vec3f pos; + /* 0x10 */ Vec3f velocity; + /* 0x1C */ Vec3f accel; + /* 0x28 */ Color_RGB8 primColor; + /* 0x2B */ Color_RGB8 envColor; + /* 0x2E */ s16 alpha; + /* 0x30 */ f32 scale; + /* 0x34 */ s16 timer; // lifetime + /* 0x36 */ s16 type; // 0 is general radiance, else is directed towards Player + /* 0x36 */ f32 pitch; + /* 0x36 */ f32 yaw; + /* 0x40 */ f32 roll; +} BgDyYoseizoParticle; // size = 0x44 + typedef struct BgDyYoseizo { /* 0x0000 */ Actor actor; /* 0x014C */ BgDyYoseizoActionFunc actionFunc; /* 0x0150 */ SkelAnime skelAnime; - /* 0x0194 */ char unk_194[0x3720]; + /* 0x0194 */ Vec3s jointTable[28]; + /* 0x023C */ Vec3s morphTable[28]; + /* 0x02E4 */ u8 lightBallSpawned; + /* 0x02E5 */ u8 giveDefenseHearts; + /* 0x02E6 */ u8 healing; + /* 0x02E8 */ s16 vanishTimer; + /* 0x02EA */ s16 givingSpell; + /* 0x02EC */ s16 fountainType; + /* 0x02EE */ s16 dialogState; + /* 0x02F0 */ s16 absoluteTimer; + /* 0x02F2 */ s16 eyeState; + /* 0x02F4 */ s16 eyeState2; // Used, but does not actually change the actor's eyes + /* 0x02F6 */ s16 mouthState; + /* 0x02F8 */ s16 blinkTimer; + /* 0x02FA */ s16 unusedTimer; + /* 0x02FC */ s16 animationChanged; + /* 0x02FE */ s16 finishedSpinGrow; + /* 0x02FE */ s16 itemSpawned; + /* 0x0302 */ s16 healingTimer; + /* 0x0304 */ s16 warpEffectSpawned; + /* 0x0306 */ s16 refillTimer; + /* 0x0308 */ f32 scale; + /* 0x030C */ f32 grownHeight; + /* 0x0310 */ f32 vanishHeight; + /* 0x0314 */ f32 heightFraction; + /* 0x0318 */ f32 scaleFraction; + /* 0x031C */ f32 targetHeight; + /* 0x0320 */ f32 bobOffset; + /* 0x0324 */ f32 bobTimer; + /* 0x0328 */ f32 heightOffset; + /* 0x032C */ f32 frameCount; + /* 0x0330 */ char unk_330[4]; + /* 0x0334 */ Vec3s headRot; + /* 0x033A */ Vec3s torsoRot; + /* 0x0340 */ EnDyExtra* beam; + /* 0x0344 */ EnExItem* item; + /* 0x0348 */ char unk_348[0x4C]; + /* 0x0394 */ BgDyYoseizoParticle particles[200]; } BgDyYoseizo; // size = 0x38B4 extern const ActorInit Bg_Dy_Yoseizo_InitVars; diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c index fd5f3b2c29..63fc23739d 100644 --- a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c +++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c @@ -16,8 +16,8 @@ void EnDyExtra_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnDyExtra_Update(Actor* thisx, GlobalContext* globalCtx); void EnDyExtra_Draw(Actor* thisx, GlobalContext* globalCtx); -void func_809FF7AC(EnDyExtra* this, GlobalContext* globalCtx); -void func_809FF840(EnDyExtra* this, GlobalContext* globalCtx); +void EnDyExtra_WaitForTrigger(EnDyExtra* this, GlobalContext* globalCtx); +void EnDyExtra_FallAndKill(EnDyExtra* this, GlobalContext* globalCtx); const ActorInit En_Dy_Extra_InitVars = { ACTOR_EN_DY_EXTRA, @@ -44,30 +44,30 @@ void EnDyExtra_Init(Actor* thisx, GlobalContext* globalCtx) { // "Big fairy effect" osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 大妖精効果 ☆☆☆☆☆ %d\n" VT_RST, this->actor.params); this->type = this->actor.params; - this->unk_15C.x = 0.025f; - this->unk_15C.y = 0.039f; - this->unk_15C.z = 0.025f; + this->scale.x = 0.025f; + this->scale.y = 0.039f; + this->scale.z = 0.025f; this->unk_168 = this->actor.world.pos; this->actor.gravity = -0.2f; this->unk_158 = 1.0f; - this->unk_154 = 0x3C; - this->actionFunc = func_809FF7AC; + this->timer = 60; + this->actionFunc = EnDyExtra_WaitForTrigger; } -void func_809FF7AC(EnDyExtra* this, GlobalContext* globalCtx) { +void EnDyExtra_WaitForTrigger(EnDyExtra* this, GlobalContext* globalCtx) { Math_ApproachF(&this->actor.gravity, 0.0f, 0.1f, 0.005f); if (this->actor.world.pos.y < -55.0f) { this->actor.velocity.y = 0.0f; } - if (this->unk_154 == 0 && this->unk_152 != 0) { - this->unk_154 = 0xC8; - this->actionFunc = func_809FF840; + if (this->timer == 0 && this->trigger != 0) { + this->timer = 200; + this->actionFunc = EnDyExtra_FallAndKill; } } -void func_809FF840(EnDyExtra* this, GlobalContext* globalCtx) { +void EnDyExtra_FallAndKill(EnDyExtra* this, GlobalContext* globalCtx) { Math_ApproachF(&this->actor.gravity, 0.0f, 0.1f, 0.005f); - if (this->unk_154 == 0 || this->unk_158 < 0.02f) { + if (this->timer == 0 || this->unk_158 < 0.02f) { Actor_Kill(&this->actor); return; } @@ -80,10 +80,12 @@ void func_809FF840(EnDyExtra* this, GlobalContext* globalCtx) { void EnDyExtra_Update(Actor* thisx, GlobalContext* globalCtx) { EnDyExtra* this = THIS; - DECR(this->unk_154); - this->actor.scale.x = this->unk_15C.x; - this->actor.scale.y = this->unk_15C.y; - this->actor.scale.z = this->unk_15C.z; + if (this->timer != 0) { + this->timer--; + } + this->actor.scale.x = this->scale.x; + this->actor.scale.y = this->scale.y; + this->actor.scale.z = this->scale.z; Audio_PlayActorSound2(&this->actor, NA_SE_PL_SPIRAL_HEAL_BEAM - SFX_FLAG); this->actionFunc(this, globalCtx); Actor_MoveForward(&this->actor); diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h index cd56529f8c..334ee1d3aa 100644 --- a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h +++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h @@ -12,11 +12,11 @@ typedef struct EnDyExtra { /* 0x0000 */ Actor actor; /* 0x014C */ EnDyExtraActionFunc actionFunc; /* 0x0150 */ s16 type; - /* 0x0152 */ s16 unk_152; - /* 0x0154 */ s16 unk_154; + /* 0x0152 */ s16 trigger; + /* 0x0154 */ s16 timer; /* 0x0158 */ f32 unk_158; - /* 0x015C */ Vec3f unk_15C; - /* 0x0168 */ Vec3f unk_168; + /* 0x015C */ Vec3f scale; + /* 0x0168 */ Vec3f unk_168; // Set and not used } EnDyExtra; // size = 0x0174 extern const ActorInit En_Dy_Extra_InitVars;